refactor fusing to running and update fusiondart ref

This commit is contained in:
sneurlax 2023-10-13 13:05:53 -05:00
parent 20dde81da1
commit 6877c00a49
3 changed files with 6 additions and 5 deletions
fusiondart
lib
pages_desktop_specific/cashfusion/sub_widgets
services/mixins

@ -1 +1 @@
Subproject commit 4f1e5f2e50972fe12ab501c002cf3c9ce685b4b5 Subproject commit 64a78efc4a2f874f16975e2aa7fca564444e4aae

View file

@ -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/desktop/secondary_button.dart';
import 'package:stackwallet/widgets/rounded_container.dart'; import 'package:stackwallet/widgets/rounded_container.dart';
enum CashFusionStatus { waiting, fusing, success, failed } enum CashFusionStatus { waiting, running, success, failed }
class FusionDialog extends StatelessWidget { class FusionDialog extends StatelessWidget {
const FusionDialog({ const FusionDialog({
@ -31,7 +31,7 @@ class FusionDialog extends StatelessWidget {
color: color:
Theme.of(context).extension<StackColors>()!.buttonBackSecondary, Theme.of(context).extension<StackColors>()!.buttonBackSecondary,
); );
case CashFusionStatus.fusing: case CashFusionStatus.running:
return SvgPicture.asset( return SvgPicture.asset(
Assets.svg.loader, Assets.svg.loader,
color: Theme.of(context).extension<StackColors>()!.accentColorGreen, color: Theme.of(context).extension<StackColors>()!.accentColorGreen,

View file

@ -89,9 +89,10 @@ mixin FusionWalletInterface {
void _updateStatus(fusion.FusionStatus fusionStatus) { void _updateStatus(fusion.FusionStatus fusionStatus) {
switch (fusionStatus) { switch (fusionStatus) {
case fusion.FusionStatus.setup: case fusion.FusionStatus.setup:
_uiState?.outputs = CashFusionStatus.waiting; _uiState?.connecting = CashFusionStatus.running;
break; break;
case fusion.FusionStatus.waiting: case fusion.FusionStatus.waiting:
_uiState?.connecting = CashFusionStatus.success;
_uiState?.outputs = CashFusionStatus.success; _uiState?.outputs = CashFusionStatus.success;
break; break;
case fusion.FusionStatus.connecting: case fusion.FusionStatus.connecting:
@ -99,7 +100,7 @@ mixin FusionWalletInterface {
break; break;
case fusion.FusionStatus.running: case fusion.FusionStatus.running:
_uiState?.connecting = CashFusionStatus.success; _uiState?.connecting = CashFusionStatus.success;
_uiState?.fusing = CashFusionStatus.fusing; _uiState?.fusing = CashFusionStatus.running;
break; break;
case fusion.FusionStatus.complete: case fusion.FusionStatus.complete:
_uiState?.fusing = CashFusionStatus.success; _uiState?.fusing = CashFusionStatus.success;