diff --git a/fusiondart b/fusiondart index 4f1e5f2e5..64a78efc4 160000 --- a/fusiondart +++ b/fusiondart @@ -1 +1 @@ -Subproject commit 4f1e5f2e50972fe12ab501c002cf3c9ce685b4b5 +Subproject commit 64a78efc4a2f874f16975e2aa7fca564444e4aae diff --git a/lib/pages_desktop_specific/cashfusion/sub_widgets/fusion_dialog.dart b/lib/pages_desktop_specific/cashfusion/sub_widgets/fusion_dialog.dart index 88394410b..ac3a115d8 100644 --- a/lib/pages_desktop_specific/cashfusion/sub_widgets/fusion_dialog.dart +++ b/lib/pages_desktop_specific/cashfusion/sub_widgets/fusion_dialog.dart @@ -11,7 +11,7 @@ import 'package:stackwallet/widgets/desktop/desktop_dialog_close_button.dart'; import 'package:stackwallet/widgets/desktop/secondary_button.dart'; import 'package:stackwallet/widgets/rounded_container.dart'; -enum CashFusionStatus { waiting, fusing, success, failed } +enum CashFusionStatus { waiting, running, success, failed } class FusionDialog extends StatelessWidget { const FusionDialog({ @@ -31,7 +31,7 @@ class FusionDialog extends StatelessWidget { color: Theme.of(context).extension()!.buttonBackSecondary, ); - case CashFusionStatus.fusing: + case CashFusionStatus.running: return SvgPicture.asset( Assets.svg.loader, color: Theme.of(context).extension()!.accentColorGreen, diff --git a/lib/services/mixins/fusion_wallet_interface.dart b/lib/services/mixins/fusion_wallet_interface.dart index 295fbaf8f..49598471e 100644 --- a/lib/services/mixins/fusion_wallet_interface.dart +++ b/lib/services/mixins/fusion_wallet_interface.dart @@ -89,9 +89,10 @@ mixin FusionWalletInterface { void _updateStatus(fusion.FusionStatus fusionStatus) { switch (fusionStatus) { case fusion.FusionStatus.setup: - _uiState?.outputs = CashFusionStatus.waiting; + _uiState?.connecting = CashFusionStatus.running; break; case fusion.FusionStatus.waiting: + _uiState?.connecting = CashFusionStatus.success; _uiState?.outputs = CashFusionStatus.success; break; case fusion.FusionStatus.connecting: @@ -99,7 +100,7 @@ mixin FusionWalletInterface { break; case fusion.FusionStatus.running: _uiState?.connecting = CashFusionStatus.success; - _uiState?.fusing = CashFusionStatus.fusing; + _uiState?.fusing = CashFusionStatus.running; break; case fusion.FusionStatus.complete: _uiState?.fusing = CashFusionStatus.success;