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.
196 lines
6.6 KiB
Dart
196 lines
6.6 KiB
Dart
import 'package:hash_wallet/core/execution_state.dart';
|
|
import 'package:hash_wallet/generated/i18n.dart';
|
|
import 'package:hash_wallet/new-ui/widgets/confirm_swiper.dart';
|
|
import 'package:hash_wallet/new-ui/widgets/hardware_wallet/proceed_on_device_message.dart';
|
|
import 'package:hash_wallet/new-ui/widgets/new_primary_button.dart';
|
|
import 'package:hash_wallet/src/widgets/hash_image_widget.dart';
|
|
import 'package:hash_wallet/view_model/send/send_view_model.dart';
|
|
import 'package:hash_wallet/view_model/send/send_view_model_state.dart';
|
|
import 'package:cw_core/wallet_info.dart';
|
|
import 'package:cw_core/wallet_type.dart';
|
|
import 'package:flutter/cupertino.dart';
|
|
import 'package:flutter/material.dart';
|
|
import 'package:flutter_mobx/flutter_mobx.dart';
|
|
|
|
class SendConfirmBottomWidget extends StatelessWidget {
|
|
const SendConfirmBottomWidget({super.key, required this.sendViewModel});
|
|
|
|
final SendViewModel sendViewModel;
|
|
|
|
@override
|
|
Widget build(BuildContext context) {
|
|
return Observer(builder: (_) {
|
|
return Center(
|
|
child: AnimatedSize(
|
|
alignment: Alignment.bottomCenter,
|
|
duration: Duration(milliseconds: 150),
|
|
curve: Curves.easeOutCubic,
|
|
child: AnimatedSwitcher(
|
|
duration: Duration(milliseconds: 150),
|
|
switchInCurve: Curves.easeOutCubic,
|
|
switchOutCurve: Curves.easeInCubic,
|
|
child: Container(
|
|
key: ValueKey(sendViewModel.state.runtimeType),
|
|
child: _buildBottomWidget(
|
|
context,
|
|
sendViewModel.state.runtimeType,
|
|
),
|
|
),
|
|
),
|
|
),
|
|
);
|
|
});
|
|
}
|
|
|
|
Widget _buildBottomWidget(BuildContext context, Type state) {
|
|
switch (state) {
|
|
case ExecutedSuccessfullyState:
|
|
return ConfirmSwiper(
|
|
key: ValueKey("send_page_confirm_swiper_key"),
|
|
onConfirmed: () {
|
|
sendViewModel.commitTransaction(context);
|
|
},
|
|
swiperText: "${S.of(context).swipe_to_send}",
|
|
accessibleNavigationModeButtonText: S.of(context).send);
|
|
case IsExecutingState:
|
|
return LoadingBottomWidget(
|
|
text: "${S.of(context).generating_transaction}...",
|
|
);
|
|
case FailureState:
|
|
return TransactionErrorActions(errorText: (sendViewModel.state as FailureState).error);
|
|
case IsDeviceSigningResponseState:
|
|
return LoadingBottomWidget(
|
|
text: "${S.of(context).signing_transaction}...",
|
|
);
|
|
case IsAwaitingDeviceResponseState:
|
|
return HardwareWalletProceedOnDeviceMessage(
|
|
hardwareWalletType: sendViewModel.wallet.hardwareWalletType!,
|
|
note: sendViewModel.walletType == WalletType.bitcoin &&
|
|
sendViewModel.wallet.hardwareWalletType == HardwareWalletType.trezor
|
|
? S.of(context).trezor_locktime_notice
|
|
: null,
|
|
);
|
|
case TransactionCommitting:
|
|
return LoadingBottomWidget(
|
|
text: "${S.of(context).sending}...",
|
|
);
|
|
case TransactionCommitted:
|
|
return SizedBox.shrink();
|
|
default:
|
|
return SizedBox.shrink();
|
|
}
|
|
}
|
|
}
|
|
|
|
class LoadingBottomWidget extends StatelessWidget {
|
|
const LoadingBottomWidget({super.key, required this.text});
|
|
|
|
final String text;
|
|
|
|
@override
|
|
Widget build(BuildContext context) {
|
|
// One node per state so each step of the send is announced exactly once.
|
|
return Semantics(
|
|
container: true,
|
|
liveRegion: true,
|
|
label: text,
|
|
excludeSemantics: true,
|
|
child: Row(
|
|
mainAxisAlignment: MainAxisAlignment.center,
|
|
spacing: 12,
|
|
children: [
|
|
CupertinoActivityIndicator(
|
|
color: Theme.of(context).colorScheme.onSurfaceVariant,
|
|
),
|
|
Text(
|
|
text,
|
|
style: TextStyle(color: Theme.of(context).colorScheme.onSurfaceVariant),
|
|
)
|
|
],
|
|
),
|
|
);
|
|
}
|
|
}
|
|
|
|
class TransactionErrorActions extends StatelessWidget {
|
|
const TransactionErrorActions({super.key, required this.errorText});
|
|
|
|
final String errorText;
|
|
|
|
@override
|
|
Widget build(BuildContext context) {
|
|
return Column(
|
|
spacing: 12,
|
|
children: [
|
|
Semantics(
|
|
container: true,
|
|
liveRegion: true,
|
|
label: "${S.of(context).transaction_error}\n$errorText",
|
|
excludeSemantics: true,
|
|
child: Container(
|
|
decoration: BoxDecoration(
|
|
color: Theme.of(context).colorScheme.errorContainer.withAlpha(64),
|
|
borderRadius: BorderRadius.circular(16),
|
|
),
|
|
child: Padding(
|
|
padding: const EdgeInsets.all(12.0),
|
|
child: Column(
|
|
spacing: 12,
|
|
children: [
|
|
Row(
|
|
mainAxisAlignment: MainAxisAlignment.center,
|
|
spacing: 8,
|
|
children: [
|
|
HashImageWidget(
|
|
imageUrl: "assets/new-ui/warning.svg",
|
|
height: 24,
|
|
width: 24,
|
|
colorFilter:
|
|
ColorFilter.mode(Theme.of(context).colorScheme.error, BlendMode.srcIn),
|
|
),
|
|
Text(
|
|
S.of(context).transaction_error,
|
|
style: TextStyle(
|
|
fontSize: 16,
|
|
fontWeight: FontWeight.w400,
|
|
color: Theme.of(context).colorScheme.error),
|
|
)
|
|
],
|
|
),
|
|
Text(
|
|
errorText,
|
|
style: TextStyle(
|
|
fontSize: 14,
|
|
fontWeight: FontWeight.w400,
|
|
color: Theme.of(context).colorScheme.error),
|
|
textAlign: TextAlign.center,
|
|
),
|
|
],
|
|
),
|
|
),
|
|
),
|
|
),
|
|
Row(
|
|
spacing: 8,
|
|
children: [
|
|
// Flexible(
|
|
// child: NewPrimaryButton(
|
|
// onPressed: () {},
|
|
// text: S.of(context).more_details,
|
|
// color: Theme.of(context).colorScheme.surfaceContainer,
|
|
// textColor: Theme.of(context).colorScheme.primary),
|
|
// ),
|
|
Flexible(
|
|
child: NewPrimaryButton(
|
|
onPressed: Navigator.of(context).maybePop,
|
|
text: S.of(context).close,
|
|
color: Theme.of(context).colorScheme.primary,
|
|
textColor: Theme.of(context).colorScheme.onPrimary),
|
|
),
|
|
],
|
|
)
|
|
],
|
|
);
|
|
}
|
|
}
|