From 381a6b7b4bb9c833da1cce348407e5e069e99177 Mon Sep 17 00:00:00 2001
From: julian <julian@cypherstack.com>
Date: Wed, 25 Oct 2023 09:57:25 -0600
Subject: [PATCH] desktop fixes

---
 .../cashfusion/sub_widgets/fusion_dialog.dart     | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

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 b269b19ac..ca9067129 100644
--- a/lib/pages_desktop_specific/cashfusion/sub_widgets/fusion_dialog.dart
+++ b/lib/pages_desktop_specific/cashfusion/sub_widgets/fusion_dialog.dart
@@ -232,7 +232,7 @@ class _FusionDialogViewState extends ConsumerState<FusionDialogView> {
                           child: PrimaryButton(
                             buttonHeight: ButtonHeight.m,
                             label: "Fuse again",
-                            onPressed: () => _fuseAgain,
+                            onPressed: _fuseAgain,
                           ),
                         ),
                       if (_succeeded)
@@ -244,7 +244,7 @@ class _FusionDialogViewState extends ConsumerState<FusionDialogView> {
                           child: PrimaryButton(
                             buttonHeight: ButtonHeight.m,
                             label: "Try again",
-                            onPressed: () => _fuseAgain,
+                            onPressed: _fuseAgain,
                           ),
                         ),
                       if (_failed)
@@ -290,6 +290,17 @@ class _FusionDialogViewState extends ConsumerState<FusionDialogView> {
 
     final fusionInfo = ref.read(prefsChangeNotifierProvider).fusionServerInfo;
 
+    try {
+      fusionWallet.uiState = ref.read(
+        fusionProgressUIStateProvider(widget.walletId),
+      );
+    } catch (e) {
+      if (!e.toString().contains(
+          "FusionProgressUIState was already set for ${widget.walletId}")) {
+        rethrow;
+      }
+    }
+
     unawaited(fusionWallet.fuse(fusionInfo: fusionInfo));
   }
 }