fix: finish setup not returning to home page

jeffsieu · Oct 29, 2024 · f222857 · f222857
1 parent 9052aae
commit f222857
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/lib/database/database.dart b/lib/database/database.dart
@@ -102,7 +102,7 @@ class BusStopList extends _$BusStopList {
   }
 
   Future<void> fetchFromApi() async {
-    final busStopList = await ref.read(apiBusStopListProvider.future);
+    final busStopList = await ref.refresh(apiBusStopListProvider.future);
 
     await _cacheBusStops(busStopList);
 

diff --git a/lib/pages/fetch_data_page.dart b/lib/pages/fetch_data_page.dart
@@ -30,14 +30,15 @@ class _FetchDataPageState extends ConsumerState<FetchDataPage> {
       );
     } else {
       return FetchDataPage2(
-          isSetup: widget.isSetup,
-          onFinish: () {
-            if (Navigator.canPop(context)) {
-              Navigator.pop(context);
-            } else {
-              SavedRoute().go(context);
-            }
-          });
+        isSetup: widget.isSetup,
+        onFinish: () {
+          if (widget.isSetup) {
+            SavedRoute().go(context);
+          } else {
+            Navigator.pop(context);
+          }
+        },
+      );
     }
   }
 }