mirror of
https://github.com/Such-Software/hash-wallet.git
synced 2026-10-30 06:48:49 +01:00
jwinterm
dd449f2594
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.
62 lines
1.9 KiB
Dart
62 lines
1.9 KiB
Dart
import "package:hash_wallet/new-ui/widgets/new_primary_button.dart";
|
|
import "package:flutter/material.dart";
|
|
|
|
class StackedButtons extends StatelessWidget {
|
|
const StackedButtons({
|
|
required this.primaryText,
|
|
required this.onPrimary,
|
|
required this.secondaryText,
|
|
required this.onSecondary,
|
|
this.secondaryAsLink = false,
|
|
this.primaryKey,
|
|
this.secondaryKey,
|
|
super.key,
|
|
});
|
|
|
|
final String primaryText;
|
|
final VoidCallback onPrimary;
|
|
final String secondaryText;
|
|
final VoidCallback onSecondary;
|
|
final bool secondaryAsLink;
|
|
final Key? primaryKey;
|
|
final Key? secondaryKey;
|
|
|
|
@override
|
|
Widget build(BuildContext context) => Column(
|
|
mainAxisSize: MainAxisSize.min,
|
|
children: [
|
|
NewPrimaryButton(
|
|
key: primaryKey,
|
|
onPressed: onPrimary,
|
|
text: primaryText,
|
|
color: Theme.of(context).colorScheme.primary,
|
|
textColor: Theme.of(context).colorScheme.onPrimary,
|
|
),
|
|
if (secondaryAsLink) ...[
|
|
const SizedBox(height: 9),
|
|
TextButton(
|
|
key: secondaryKey,
|
|
onPressed: onSecondary,
|
|
style: TextButton.styleFrom(minimumSize: const Size(48, 48)),
|
|
child: Text(
|
|
secondaryText,
|
|
style: Theme.of(context).textTheme.labelLarge?.copyWith(
|
|
color: Theme.of(context).colorScheme.primary,
|
|
letterSpacing: -0.07,
|
|
),
|
|
),
|
|
),
|
|
] else ...[
|
|
const SizedBox(height: 12),
|
|
NewPrimaryButton(
|
|
key: secondaryKey,
|
|
onPressed: onSecondary,
|
|
text: secondaryText,
|
|
color: Theme.of(context).colorScheme.surfaceContainer,
|
|
textColor: Theme.of(context).colorScheme.primary,
|
|
),
|
|
],
|
|
],
|
|
);
|
|
}
|