Merge pull request #1134 from Foundation-Devices/invertedx/env-850-rb…

…f-boosting-a-transaction-from-a-passport-account-does-not fix missing confirmation screen in passport RBF
Foundation-Devices · May 21, 2024 · 8e5a995 · 8e5a995
2 parents ccd1ad4 + cc5bd1e
commit 8e5a995
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 9 deletions.
diff --git a/lib/ui/home/cards/accounts/spend/rbf/rbf_button.dart b/lib/ui/home/cards/accounts/spend/rbf/rbf_button.dart
@@ -174,14 +174,18 @@ class _TxRBFButtonState extends ConsumerState<TxRBFButton> {
         });
       }
     } catch (e) {
-      setState(() {
-        _isLoading = false;
-      });
+      if (mounted) {
+        setState(() {
+          _isLoading = false;
+        });
+      }
       kPrint(e);
     } finally {
-      setState(() {
-        _isLoading = false;
-      });
+      if (mounted) {
+        setState(() {
+          _isLoading = false;
+        });
+      }
     }
   }
 

diff --git a/lib/ui/home/cards/accounts/spend/rbf/rbf_spend_screen.dart b/lib/ui/home/cards/accounts/spend/rbf/rbf_spend_screen.dart
@@ -65,6 +65,7 @@ class _RBFSpendScreenState extends ConsumerState<RBFSpendScreen> {
   bool _warningShown = false;
   bool _inputsChanged = false;
   RawTransaction? _rawTransaction;
+  Psbt? finalizedPsbt;
 
   @override
   void initState() {
@@ -179,8 +180,7 @@ class _RBFSpendScreenState extends ConsumerState<RBFSpendScreen> {
                                       Opacity(
                                         opacity: _rebuildingTx ? 0.3 : 1,
                                         child: EnvoyButton(
-                                          label: S()
-                                              .replaceByFee_coindetails_overlay_modal_heading,
+                                          label: getButtonText(context),
                                           state: ButtonState.defaultState,
                                           onTap: !_rebuildingTx
                                               ? () => _boostTx(context)
@@ -566,14 +566,22 @@ class _RBFSpendScreenState extends ConsumerState<RBFSpendScreen> {
     if (account.wallet.hot) {
       broadcastTx(account, psbt, context);
     } else {
+      if (finalizedPsbt != null) {
+        broadcastTx(account, psbt, context);
+        return;
+      }
       await Navigator.of(context, rootNavigator: false).push(MaterialPageRoute(
           builder: (context) => background(
               child: PsbtCard(
                 psbt,
                 account,
                 onSignedPsbtScanned: (psbt) {
                   Navigator.pop(context);
-                  broadcastTx(account, psbt, context);
+                  if (mounted) {
+                    setState(() {
+                      finalizedPsbt = psbt;
+                    });
+                  }
                 },
               ),
               context: context)));
@@ -967,9 +975,33 @@ class _RBFSpendScreenState extends ConsumerState<RBFSpendScreen> {
               ),
             ).show(context);
             return;
+          } else {
+            if (context.mounted) {
+              EnvoyToast(
+                backgroundColor: EnvoyColors.danger,
+                replaceExisting: true,
+                duration: const Duration(seconds: 4),
+                message: "Error: Unable to construct transaction.",
+                // TODO: Figma
+                icon: const Icon(
+                  Icons.info_outline,
+                  color: EnvoyColors.solidWhite,
+                ),
+              ).show(context);
+            }
           }
         }
       }
     }
   }
+
+  String getButtonText(BuildContext context) {
+    Account? account = ref.read(selectedAccountProvider);
+    if (account != null && !account.wallet.hot) {
+      if (finalizedPsbt == null) {
+        return S().coincontrol_txDetail_cta1_passport;
+      }
+    }
+    return S().replaceByFee_coindetails_overlay_modal_heading;
+  }
 }