mirror of
https://github.com/Such-Software/hash-wallet.git
synced 2026-10-30 06:48:49 +01:00
Catches up from the May 12 fork point (v6.1.2+23) through v6.5.0: 535 upstream commits, including the Monero silent-open fix, Monero on Trezor, Ledger/Trezor BLE fixes, the new seed and history screens, quick Bitcoin sync, git-pinned dependencies (pubspec_overrides.yaml), frozen Hive adapters (*.part.dart), monero_c v0.18.4.6-RC2 and Flutter 3.41.9. Merged with both sides normalized first (import rename, 100-column format), which took the conflict count from 614 paths to 322. The procedure is now scripts/upstream_sync.sh. Kept from Hash Bags: - WalletType enum order and Hive IDs. SQLite stores WalletType.index and our order differs from upstream's; taking theirs would reread saved wallets as other chains. Our frozen adapter keeps the shipped IDs. - The 1.0.2 legacy PIN and wallet-password decode and self-heal. - Removed chains (Solana, Tron, Zano, Zcash, Decred, Haven) and the new Robinhood chain stay out; Cake Pay and non-Trocador swaps stay out. - Default nodes (node.wownero.org, sethforprivacy, Blockstream, bysh.me), converted to upstream's isDefault node-list key; Wownero is back in the node reset list. - Privacy: address resolvers limited to domain-anchored sources again; prices.neroswap.com for fiat; upstream's charts tab, which reads prices.cakewallet.com, sits behind FeatureFlag.isChartsEnabled = false. - Lightning stays behind FeatureFlag.isLightningEnabled, including upstream's new post-seed Lightning username step. - Our icon pipeline, branding and bundle identifiers. Twelve new upstream widget tests are skipped: test and code are unchanged from v6.5.0 apart from renames (not rerun on a pristine upstream checkout; upstream's top_bar_test does not compile against its own TopBar). flutter analyze lib: 0 errors; flutter test: 345 passed, 12 skipped; flutter build bundle compiles. Built with Flutter 3.41.9.
175 lines
5.8 KiB
Dart
175 lines
5.8 KiB
Dart
import "package:hash_wallet/generated/i18n.dart";
|
|
import "package:hash_wallet/new-ui/widgets/money/money_text.dart";
|
|
import "package:hash_wallet/src/widgets/hash_image_widget.dart";
|
|
import "package:hash_wallet/themes/core/theme_extension.dart";
|
|
import "package:hash_wallet/view_model/wallet_account_list/account_list_item.dart";
|
|
import "package:flutter/material.dart";
|
|
|
|
class ArchiveConfirmationContent extends StatelessWidget {
|
|
const ArchiveConfirmationContent({
|
|
required this.account,
|
|
required this.fiatBalance,
|
|
required this.isFunded,
|
|
});
|
|
|
|
final AccountListItem account;
|
|
final String? fiatBalance;
|
|
final bool isFunded;
|
|
|
|
@override
|
|
Widget build(BuildContext context) => Column(
|
|
mainAxisSize: MainAxisSize.min,
|
|
children: [
|
|
if (isFunded) ...[
|
|
Text(
|
|
S.of(context).archive_account_funds_title,
|
|
textAlign: TextAlign.center,
|
|
style: Theme.of(context).textTheme.bodyMedium?.copyWith(
|
|
color: context.customColors.warningOutlineColor,
|
|
),
|
|
),
|
|
const SizedBox(height: 20),
|
|
AccountFundsSummary(
|
|
account: account,
|
|
fiatBalance: fiatBalance,
|
|
borderColor: context.customColors.warningOutlineColor,
|
|
),
|
|
const SizedBox(height: 24),
|
|
Text(
|
|
S.of(context).archive_account_move_funds,
|
|
textAlign: TextAlign.center,
|
|
style: Theme.of(context).textTheme.bodyMedium?.copyWith(
|
|
color: context.customColors.warningOutlineColor,
|
|
),
|
|
),
|
|
const SizedBox(height: 20),
|
|
Text(
|
|
S.of(context).archive_account_funded_disclaimer,
|
|
textAlign: TextAlign.center,
|
|
style: Theme.of(context).textTheme.bodyMedium?.copyWith(
|
|
color: Theme.of(context).colorScheme.onSurfaceVariant,
|
|
),
|
|
),
|
|
] else ...[
|
|
AccountSummary(account: account),
|
|
const SizedBox(height: 24),
|
|
Text(
|
|
S.of(context).archive_account_empty_disclaimer,
|
|
textAlign: TextAlign.center,
|
|
style: Theme.of(context).textTheme.bodyMedium,
|
|
),
|
|
const SizedBox(height: 12),
|
|
Text(
|
|
S.of(context).archive_account_restore_hint,
|
|
textAlign: TextAlign.center,
|
|
style: Theme.of(context).textTheme.bodyMedium?.copyWith(
|
|
color: Theme.of(context).colorScheme.onSurfaceVariant,
|
|
),
|
|
),
|
|
],
|
|
],
|
|
);
|
|
}
|
|
|
|
class AccountSummary extends StatelessWidget {
|
|
const AccountSummary({required this.account});
|
|
|
|
final AccountListItem account;
|
|
|
|
@override
|
|
Widget build(BuildContext context) {
|
|
final label = account.label.trim();
|
|
|
|
return Container(
|
|
width: double.infinity,
|
|
padding: const EdgeInsets.symmetric(horizontal: 14, vertical: 12),
|
|
decoration: BoxDecoration(
|
|
color: Theme.of(context).colorScheme.surfaceContainer,
|
|
borderRadius: BorderRadius.circular(18),
|
|
),
|
|
child: Row(
|
|
children: [
|
|
HashImageWidget(
|
|
imageUrl: "assets/new-ui/account.svg",
|
|
width: 24,
|
|
height: 24,
|
|
color: Theme.of(context).colorScheme.onSurfaceVariant,
|
|
),
|
|
const SizedBox(width: 12),
|
|
Expanded(
|
|
child: Text.rich(
|
|
TextSpan(
|
|
children: [
|
|
TextSpan(
|
|
text: "${account.id + 1}. ",
|
|
style: TextStyle(color: Theme.of(context).colorScheme.primary),
|
|
),
|
|
TextSpan(
|
|
text: label.isEmpty ? S.of(context).unnamed_account : label,
|
|
),
|
|
],
|
|
),
|
|
style: Theme.of(context).textTheme.bodyMedium?.copyWith(fontWeight: FontWeight.w500),
|
|
),
|
|
),
|
|
],
|
|
),
|
|
);
|
|
}
|
|
}
|
|
|
|
class AccountFundsSummary extends StatelessWidget {
|
|
const AccountFundsSummary({
|
|
required this.account,
|
|
required this.fiatBalance,
|
|
required this.borderColor,
|
|
});
|
|
|
|
final AccountListItem account;
|
|
final String? fiatBalance;
|
|
final Color borderColor;
|
|
|
|
@override
|
|
Widget build(BuildContext context) => Container(
|
|
width: double.infinity,
|
|
padding: const EdgeInsets.symmetric(horizontal: 14, vertical: 12),
|
|
decoration: BoxDecoration(
|
|
color: Theme.of(context).colorScheme.surfaceContainer,
|
|
border: Border.all(color: borderColor),
|
|
borderRadius: BorderRadius.circular(18),
|
|
),
|
|
child: Row(
|
|
children: [
|
|
HashImageWidget(
|
|
imageUrl: account.balance.currency.iconPath ??
|
|
"assets/new-ui/crypto_full_icons/${account.balance.currency.name.toLowerCase()}.svg",
|
|
width: 24,
|
|
height: 24,
|
|
),
|
|
const SizedBox(width: 12),
|
|
Expanded(
|
|
child: Column(
|
|
crossAxisAlignment: CrossAxisAlignment.start,
|
|
children: [
|
|
MoneyText(
|
|
account.balance,
|
|
fractionalDigits: account.balance.decimals,
|
|
style: Theme.of(context).textTheme.bodyMedium,
|
|
),
|
|
if (fiatBalance != null) ...[
|
|
const SizedBox(height: 2),
|
|
Text(
|
|
fiatBalance!,
|
|
style: Theme.of(context).textTheme.bodySmall?.copyWith(
|
|
color: Theme.of(context).colorScheme.onSurfaceVariant,
|
|
),
|
|
),
|
|
],
|
|
],
|
|
),
|
|
),
|
|
],
|
|
),
|
|
);
|
|
}
|