Fixes #1232

breez · Oct 17, 2023 · a850fb1 · a850fb1
1 parent 43fa7f2
commit a850fb1
Showing 1 changed file with 15 additions and 7 deletions.
diff --git a/lib/routes/transfer_funds_in_progress_dialog.dart b/lib/routes/transfer_funds_in_progress_dialog.dart
@@ -29,15 +29,26 @@ class _TransferFundsInProgressDialog extends StatefulWidget {
 class _TransferFundsInProgressDialogState
     extends State<_TransferFundsInProgressDialog> {
   StreamSubscription<AccountModel> _stateSubscription;
+  ModalRoute _currentRoute;
 
   @override
   void initState() {
     super.initState();
     _stateSubscription = widget.accountStream.listen((state) {
-      if (state.transferringOnChainDeposit != true) {
-        _pop();
+      if (state.transferringOnChainDeposit != true && _currentRoute.isActive) {
+        Navigator.of(context).removeRoute(_currentRoute);
       }
-    }, onError: (err) => _pop());
+    }, onError: (err) {
+      if (_currentRoute.isActive) {
+        Navigator.of(context).removeRoute(_currentRoute);
+      }
+    });
+  }
+
+  @override
+  void didChangeDependencies() {
+    super.didChangeDependencies();
+    _currentRoute ??= ModalRoute.of(context);
   }
 
   @override
@@ -46,13 +57,10 @@ class _TransferFundsInProgressDialogState
     super.dispose();
   }
 
-  _pop() {
-    Navigator.of(context).pop();
-  }
-
   @override
   Widget build(BuildContext context) {
     final texts = context.texts();
+
     return createAnimatedLoaderDialog(
       context,
       texts.transferring_funds_title,