mirror of
https://github.com/Such-Software/hash-wallet.git
synced 2026-11-12 08:53:57 +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/new_primary_button.dart";
|
|
import "package:hash_wallet/new-ui/widgets/receive_page/receive_top_bar.dart";
|
|
import "package:hash_wallet/src/widgets/hash_image_widget.dart";
|
|
import "package:cw_core/currency_for_wallet_type.dart";
|
|
import "package:flutter/material.dart";
|
|
|
|
class NetworkDecisionPage extends StatelessWidget {
|
|
const NetworkDecisionPage({
|
|
required this.title,
|
|
required this.description,
|
|
required this.destinationIconPath,
|
|
required this.primaryText,
|
|
required this.onPrimary,
|
|
required this.secondaryText,
|
|
this.currentIconPath,
|
|
this.primaryIconPath,
|
|
this.secondaryIconPath,
|
|
this.onSecondary,
|
|
super.key,
|
|
});
|
|
|
|
final String title;
|
|
final String description;
|
|
final String destinationIconPath;
|
|
final String? currentIconPath;
|
|
final String primaryText;
|
|
final VoidCallback onPrimary;
|
|
final String? primaryIconPath;
|
|
final String secondaryText;
|
|
final String? secondaryIconPath;
|
|
final VoidCallback? onSecondary;
|
|
|
|
@override
|
|
Widget build(BuildContext context) {
|
|
final colors = Theme.of(context).colorScheme;
|
|
final primaryIcon = primaryIconPath;
|
|
final secondaryIcon = secondaryIconPath;
|
|
return Material(
|
|
color: colors.surface,
|
|
child: SafeArea(
|
|
child: Column(
|
|
children: [
|
|
ModalTopBar(
|
|
title: "",
|
|
leadingIcon: const Icon(Icons.arrow_back_ios_new),
|
|
leadingSemanticLabel: S.of(context).seed_alert_back,
|
|
onLeadingPressed: () => Navigator.of(context).maybePop(),
|
|
),
|
|
Expanded(
|
|
child: Center(
|
|
child: Padding(
|
|
padding: const EdgeInsets.symmetric(horizontal: 24),
|
|
child: Column(
|
|
mainAxisSize: MainAxisSize.min,
|
|
children: [
|
|
ExcludeSemantics(
|
|
child: _DecisionHeader(
|
|
destinationIconPath: destinationIconPath,
|
|
currentIconPath: currentIconPath,
|
|
),
|
|
),
|
|
const SizedBox(height: 24),
|
|
Text(
|
|
title,
|
|
textAlign: TextAlign.center,
|
|
style: Theme.of(context).textTheme.titleLarge?.copyWith(
|
|
fontSize: 20,
|
|
fontWeight: FontWeight.w500,
|
|
letterSpacing: -0.1,
|
|
),
|
|
),
|
|
const SizedBox(height: 16),
|
|
Text(
|
|
description,
|
|
textAlign: TextAlign.center,
|
|
style: Theme.of(context)
|
|
.textTheme
|
|
.bodyMedium
|
|
?.copyWith(color: colors.onSurfaceVariant, letterSpacing: -0.07),
|
|
),
|
|
],
|
|
),
|
|
),
|
|
),
|
|
),
|
|
Padding(
|
|
padding: const EdgeInsets.fromLTRB(16, 0, 16, 16),
|
|
child: Column(
|
|
mainAxisSize: MainAxisSize.min,
|
|
children: [
|
|
NewPrimaryButton(
|
|
onPressed: onPrimary,
|
|
image: primaryIcon != null
|
|
? HashImageWidget(
|
|
imageUrl: primaryIcon,
|
|
width: 24,
|
|
height: 24,
|
|
colorFilter: ColorFilter.mode(colors.onPrimary, BlendMode.srcIn),
|
|
)
|
|
: null,
|
|
text: primaryText,
|
|
color: colors.primary,
|
|
textColor: colors.onPrimary,
|
|
),
|
|
const SizedBox(height: 12),
|
|
NewPrimaryButton(
|
|
onPressed: onSecondary ?? () => Navigator.of(context).maybePop(),
|
|
image: secondaryIcon != null
|
|
? HashImageWidget(
|
|
imageUrl: secondaryIcon,
|
|
width: 24,
|
|
height: 24,
|
|
colorFilter: ColorFilter.mode(colors.primary, BlendMode.srcIn),
|
|
)
|
|
: null,
|
|
text: secondaryText,
|
|
color: colors.surfaceContainer,
|
|
textColor: colors.primary,
|
|
),
|
|
],
|
|
),
|
|
),
|
|
],
|
|
),
|
|
),
|
|
);
|
|
}
|
|
}
|
|
|
|
class _DecisionHeader extends StatelessWidget {
|
|
const _DecisionHeader({required this.destinationIconPath, this.currentIconPath});
|
|
|
|
final String destinationIconPath;
|
|
final String? currentIconPath;
|
|
|
|
@override
|
|
Widget build(BuildContext context) {
|
|
final colors = Theme.of(context).colorScheme;
|
|
final current = currentIconPath;
|
|
|
|
if (current == null) {
|
|
return HashImageWidget(
|
|
imageUrl: destinationIconPath,
|
|
width: 75,
|
|
height: 75,
|
|
fit: BoxFit.contain,
|
|
color: isMonochromeSymbolIcon(destinationIconPath) ? colors.primary : null,
|
|
);
|
|
}
|
|
|
|
return Row(
|
|
mainAxisSize: MainAxisSize.min,
|
|
spacing: 12,
|
|
children: [
|
|
HashImageWidget(
|
|
imageUrl: current,
|
|
width: 50,
|
|
height: 50,
|
|
fit: BoxFit.contain,
|
|
color: isMonochromeSymbolIcon(current) ? colors.primary : null,
|
|
),
|
|
Icon(Icons.arrow_forward, color: colors.primary, size: 28),
|
|
HashImageWidget(
|
|
imageUrl: destinationIconPath,
|
|
width: 50,
|
|
height: 50,
|
|
fit: BoxFit.contain,
|
|
color: isMonochromeSymbolIcon(destinationIconPath) ? colors.primary : null,
|
|
),
|
|
],
|
|
);
|
|
}
|
|
}
|