IMPORT - screen freezing after recovering words

SatoshiPortal · Dec 26, 2024 · 4383ab7 · 4383ab7
1 parent 69ba5a4
commit 4383ab7
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 23 deletions.
diff --git a/lib/import/page.dart b/lib/import/page.dart
@@ -148,31 +148,24 @@ class _Screen extends StatelessWidget {
   Widget build(BuildContext context) {
     final step =
         context.select((ImportWalletCubit cubit) => cubit.state.importStep);
+
+    final page = switch (step) {
+      ImportSteps.selectCreateType ||
+      ImportSteps.selectImportType ||
+      ImportSteps.scanningNFC ||
+      ImportSteps.importXpub ||
+      ImportSteps.import12Words ||
+      ImportSteps.import24Words =>
+        const ImportEnterWordsScreen(),
+      ImportSteps.selectWalletFormat ||
+      ImportSteps.scanningWallets =>
+        const ImportSelectWalletTypeScreen(),
+      ImportSteps.advancedOptions => const AdvancedOptions(),
+    };
+
     return PopScope(
       // canPop: step == ImportSteps.selectCreateType,
-      child: () {
-        switch (step) {
-          // return const ImportScanning(isColdCard: true);
-
-          case ImportSteps.selectCreateType:
-          // return const _CreateSelectionScreen();
-
-          case ImportSteps.selectImportType:
-          case ImportSteps.importXpub:
-          // return const ImportXpubScreen();
-          case ImportSteps.scanningNFC:
-          case ImportSteps.import12Words:
-          case ImportSteps.import24Words:
-            return const ImportEnterWordsScreen();
-
-          case ImportSteps.scanningWallets:
-          case ImportSteps.selectWalletFormat:
-            return const ImportSelectWalletTypeScreen();
-
-          case ImportSteps.advancedOptions:
-            return const AdvancedOptions();
-        }
-      }(),
+      child: page,
     );
   }
 }

diff --git a/lib/import/recover.dart b/lib/import/recover.dart
@@ -266,13 +266,19 @@ class _ImportWordTextFieldState extends State<ImportWordTextField> {
 
   @override
   void dispose() {
+    entry?.remove();
+    entry = null;
     controller.dispose();
     widget.focusNode.dispose();
 
     super.dispose();
   }
 
   void showOverLay() {
+    if (!context.mounted) {
+      hideOverlay();
+      return;
+    }
     final overlay = Overlay.of(context);
     final renderBox = context.findRenderObject()! as RenderBox;
     final size = renderBox.size;
@@ -302,6 +308,7 @@ class _ImportWordTextFieldState extends State<ImportWordTextField> {
   }
 
   Widget buildOverlay() {
+    if (!context.mounted) return const SizedBox.shrink();
     if (suggestions.isEmpty) {
       hideOverlay();
       return Container();
@@ -337,6 +344,10 @@ class _ImportWordTextFieldState extends State<ImportWordTextField> {
 
   @override
   Widget build(BuildContext context) {
+    if (!context.mounted) {
+      hideOverlay();
+      return const SizedBox.shrink();
+    }
     final is12 =
         context.select((ImportWalletCubit cubit) => cubit.state.is12());