fix: WillPopScope migration

Migrate the deprecated WillPopScope widget to PopScope across the app.
Simple barrier dialogs become canPop: false/true. Cases that ran side
effects or conditionally gated the pop move that work into
onPopInvokedWithResult.

Author: sneurlax

lib/pages/add_wallet_views/new_wallet_recovery_phrase_view/new_wallet_recovery_phrase_view.dart

@@ -76,9 +76,11 @@ class _NewWalletRecoveryPhraseViewState
     super.initState();
   }
 
-  Future<bool> onWillPop() async {
+  Future<void> onPopInvoked() async {
     await delete();
-    return true;
+    if (mounted) {
+      Navigator.of(context).pop();
+    }
   }
 
   Future<void> delete() async {
@@ -104,8 +106,14 @@ class _NewWalletRecoveryPhraseViewState
   @override
   Widget build(BuildContext context) {
     debugPrint("BUILD: $runtimeType");
-    return WillPopScope(
-      onWillPop: onWillPop,
+    return PopScope(
+      canPop: false,
+      onPopInvokedWithResult: (bool didPop, dynamic result) async {
+        if (didPop) {
+          return;
+        }
+        await onPopInvoked();
+      },
       child: MasterScaffold(
         isDesktop: isDesktop,
         appBar: isDesktop

lib/pages/add_wallet_views/restore_wallet_view/confirm_recovery_dialog.dart

@@ -92,10 +92,8 @@ class ConfirmRecoveryDialog extends StatelessWidget {
         ),
       );
     } else {
-      return WillPopScope(
-        onWillPop: () async {
-          return true;
-        },
+      return PopScope(
+        canPop: true,
         child: StackDialog(
           title: "Are you ready?",
           message:

lib/pages/add_wallet_views/restore_wallet_view/sub_widgets/mnemonic_word_count_select_sheet.dart

@@ -23,11 +23,14 @@ class MnemonicWordCountSelectSheet extends ConsumerWidget {
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
-    return WillPopScope(
-      onWillPop: () async {
+    return PopScope(
+      canPop: false,
+      onPopInvokedWithResult: (bool didPop, dynamic result) {
+        if (didPop) {
+          return;
+        }
         final length = ref.read(mnemonicWordCountStateProvider.state).state;
         Navigator.of(context).pop(length);
-        return false;
       },
       child: Container(
         decoration: BoxDecoration(

lib/pages/add_wallet_views/restore_wallet_view/sub_widgets/restore_failed_dialog.dart

@@ -51,10 +51,8 @@ class _RestoreFailedDialogState extends ConsumerState<RestoreFailedDialog> {
 
   @override
   Widget build(BuildContext context) {
-    return WillPopScope(
-      onWillPop: () async {
-        return false;
-      },
+    return PopScope(
+      canPop: false,
       child: StackDialog(
         title: "Restore failed",
         message: errorMessage,

lib/pages/add_wallet_views/restore_wallet_view/sub_widgets/restoring_dialog.dart

@@ -102,10 +102,8 @@ class _RestoringDialogState extends State<RestoringDialog> {
         ),
       );
     } else {
-      return WillPopScope(
-        onWillPop: () async {
-          return false;
-        },
+      return PopScope(
+        canPop: false,
         child: StackDialog(
           title: "Restoring wallet",
           message: "This may take a while. Please do not exit this screen.",

lib/pages/add_wallet_views/select_wallet_for_sol_token_view.dart

@@ -91,10 +91,10 @@ class _SelectWalletForSolTokenViewState
       }
     }
 
-    return WillPopScope(
-      onWillPop: () async {
+    return PopScope(
+      canPop: true,
+      onPopInvokedWithResult: (bool didPop, dynamic result) {
         ref.read(newSolWalletTriggerTempUntilHiveCompletelyDeleted.notifier).state = false;
-        return true;
       },
       child: ConditionalParent(
         condition: !isDesktop,

lib/pages/add_wallet_views/select_wallet_for_token_view.dart

@@ -92,10 +92,10 @@ class _SelectWalletForTokenViewState
       }
     }
 
-    return WillPopScope(
-      onWillPop: () async {
+    return PopScope(
+      canPop: true,
+      onPopInvokedWithResult: (bool didPop, dynamic result) {
         ref.read(createSpecialEthWalletRoutingFlag.notifier).state = false;
-        return true;
       },
       child: ConditionalParent(
         condition: !isDesktop,

lib/pages/add_wallet_views/verify_recovery_phrase_view/verify_recovery_phrase_view.dart

@@ -458,15 +458,14 @@ class _VerifyRecoveryPhraseViewState
     return Tuple2(result, chosenWord);
   }
 
-  Future<bool> onWillPop() async {
+  Future<void> onPopInvoked() async {
     // await delete();
     Navigator.of(context).popUntil(
       ModalRoute.withName(
         // NewWalletRecoveryPhraseWarningView.routeName,
         NewWalletRecoveryPhraseView.routeName,
       ),
     );
-    return false;
   }
 
   Future<void> delete() async {
@@ -482,8 +481,14 @@ class _VerifyRecoveryPhraseViewState
         .watch(verifyMnemonicWordIndexStateProvider.state)
         .state;
 
-    return WillPopScope(
-      onWillPop: onWillPop,
+    return PopScope(
+      canPop: false,
+      onPopInvokedWithResult: (bool didPop, dynamic result) async {
+        if (didPop) {
+          return;
+        }
+        await onPopInvoked();
+      },
       child: MasterScaffold(
         isDesktop: isDesktop,
         appBar: isDesktop

lib/pages/buy_view/buy_form.dart

@@ -159,21 +159,19 @@ class _BuyFormState extends ConsumerState<BuyForm> {
 
   void selectCrypto() async {
     if (ref.read(simplexProvider).supportedCryptos.isEmpty) {
-      bool shouldPop = false;
       unawaited(
         showDialog(
           context: context,
-          builder: (context) => WillPopScope(
-            child: const CustomLoadingOverlay(
+          builder: (context) => const PopScope(
+            canPop: false,
+            child: CustomLoadingOverlay(
               message: "Loading currency data",
               eventBus: null,
             ),
-            onWillPop: () async => shouldPop,
           ),
         ),
       );
       await _loadSimplexCryptos();
-      shouldPop = true;
       if (mounted) {
         Navigator.of(context, rootNavigator: isDesktop).pop();
       }
@@ -265,21 +263,19 @@ class _BuyFormState extends ConsumerState<BuyForm> {
 
   Future<void> selectFiat() async {
     if (ref.read(simplexProvider).supportedFiats.isEmpty) {
-      bool shouldPop = false;
       unawaited(
         showDialog(
           context: context,
-          builder: (context) => WillPopScope(
-            child: const CustomLoadingOverlay(
+          builder: (context) => const PopScope(
+            canPop: false,
+            child: CustomLoadingOverlay(
               message: "Loading currency data",
               eventBus: null,
             ),
-            onWillPop: () async => shouldPop,
           ),
         ),
       );
       await _loadSimplexFiats();
-      shouldPop = true;
       if (mounted) {
         Navigator.of(context, rootNavigator: isDesktop).pop();
       }
@@ -396,16 +392,15 @@ class _BuyFormState extends ConsumerState<BuyForm> {
   // }
 
   Future<void> previewQuote(SimplexQuote quote) async {
-    bool shouldPop = false;
     unawaited(
       showDialog(
         context: context,
-        builder: (context) => WillPopScope(
-          child: const CustomLoadingOverlay(
+        builder: (context) => const PopScope(
+          canPop: false,
+          child: CustomLoadingOverlay(
             message: "Loading quote data",
             eventBus: null,
           ),
-          onWillPop: () async => shouldPop,
         ),
       ),
     );
@@ -425,7 +420,6 @@ class _BuyFormState extends ConsumerState<BuyForm> {
     );
 
     final BuyResponse<SimplexQuote> quoteResponse = await _loadQuote(quote);
-    shouldPop = true;
     if (mounted) {
       Navigator.of(context, rootNavigator: isDesktop).pop();
     }

lib/pages/cashfusion/fusion_progress_view.dart

@@ -118,9 +118,17 @@ class _FusionProgressViewState extends ConsumerState<FusionProgressView> {
 
     WakelockPlus.enable();
 
-    return WillPopScope(
-      onWillPop: () async {
-        return await _requestAndProcessCancel();
+    return PopScope(
+      canPop: false,
+      onPopInvokedWithResult: (bool didPop, dynamic result) async {
+        if (didPop) {
+          return;
+        }
+        if (await _requestAndProcessCancel()) {
+          if (mounted) {
+            Navigator.of(context).pop();
+          }
+        }
       },
       child: Background(
         child: Scaffold(