backup ux fixes

BullishNode · May 2, 2024 · 792cc92 · 792cc92
1 parent 4431e5a
commit 792cc92
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 27 deletions.
diff --git a/lib/wallet_settings/backup.dart b/lib/wallet_settings/backup.dart
@@ -18,8 +18,11 @@ class InfoRead extends Cubit<bool> {
 }
 
 class BackupPage extends StatelessWidget {
-  const BackupPage(
-      {super.key, required this.walletBloc, required this.walletSettings});
+  const BackupPage({
+    super.key,
+    required this.walletBloc,
+    required this.walletSettings,
+  });
 
   final WalletBloc walletBloc;
   final WalletSettingsCubit walletSettings;
@@ -36,22 +39,28 @@ class BackupPage extends StatelessWidget {
       ],
       child: BlocBuilder<InfoRead, bool>(
         builder: (context, state) {
-          return Scaffold(
-            appBar: AppBar(
-              automaticallyImplyLeading: false,
-              flexibleSpace: BBAppBar(
-                text: 'Backup',
-                onBack: () {
-                  if (state) context.read<InfoRead>().unread();
-                  context.read<WalletSettingsCubit>().clearSensitive();
-                  // context.pop();
-                  context.go('/home');
-                },
+          return PopScope(
+            canPop: false,
+            onPopInvoked: (canPop) {
+              context.go('/home');
+            },
+            child: Scaffold(
+              appBar: AppBar(
+                automaticallyImplyLeading: false,
+                flexibleSpace: BBAppBar(
+                  text: 'Backup',
+                  onBack: () {
+                    if (state) context.read<InfoRead>().unread();
+                    context.read<WalletSettingsCubit>().clearSensitive();
+                    // context.pop();
+                    context.go('/home');
+                  },
+                ),
+              ),
+              body: AnimatedSwitcher(
+                duration: const Duration(milliseconds: 300),
+                child: state ? const BackupScreen() : const BackUpInfoScreen(),
               ),
-            ),
-            body: AnimatedSwitcher(
-              duration: const Duration(milliseconds: 300),
-              child: state ? const BackupScreen() : const BackUpInfoScreen(),
             ),
           );
         },

diff --git a/lib/wallet_settings/test-backup.dart b/lib/wallet_settings/test-backup.dart
@@ -36,18 +36,24 @@ class TestBackupPage extends StatelessWidget {
       child: TestBackupListener(
         child: Builder(
           builder: (context) {
-            return Scaffold(
-              appBar: AppBar(
-                automaticallyImplyLeading: false,
-                flexibleSpace: BBAppBar(
-                  text: 'Test Backup',
-                  onBack: () {
-                    context.pop();
-                    context.read<WalletSettingsCubit>().resetBackupTested();
-                  },
+            return PopScope(
+              canPop: false,
+              onPopInvoked: (canPop) {
+                context.go('/home');
+              },
+              child: Scaffold(
+                appBar: AppBar(
+                  automaticallyImplyLeading: false,
+                  flexibleSpace: BBAppBar(
+                    text: 'Test Backup',
+                    onBack: () {
+                      context.pop();
+                      context.read<WalletSettingsCubit>().resetBackupTested();
+                    },
+                  ),
                 ),
+                body: const TestBackupScreen(),
               ),
-              body: const TestBackupScreen(),
             );
           },
         ),