From 11a5e9771197496ac08b72972daf25108c47707b Mon Sep 17 00:00:00 2001
From: OmarHatem <omarh.ismail1@gmail.com>
Date: Sat, 3 Dec 2022 23:34:23 +0200
Subject: [PATCH] Fix navigation error when state is changed to denied at app
 first start [skip_ci]

---
 lib/main.dart                                     | 2 +-
 lib/reactions/bootstrap.dart                      | 6 +++---
 lib/reactions/on_authentication_state_change.dart | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/main.dart b/lib/main.dart
index e1fade7b4..11eee146b 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -261,7 +261,7 @@ class AppState extends State<App> with SingleTickerProviderStateMixin {
       final statusBarColor = Colors.transparent;
       final authenticationStore = getIt.get<AuthenticationStore>();
       final initialRoute =
-      authenticationStore.state == AuthenticationState.denied
+      authenticationStore.state == AuthenticationState.uninitialized
           ? Routes.disclaimer
           : Routes.login;
       final currentTheme = settingsStore.currentTheme;
diff --git a/lib/reactions/bootstrap.dart b/lib/reactions/bootstrap.dart
index 8d9950e64..a40a17088 100644
--- a/lib/reactions/bootstrap.dart
+++ b/lib/reactions/bootstrap.dart
@@ -22,9 +22,9 @@ Future<void> bootstrap(GlobalKey<NavigatorState> navigatorKey) async {
   final currentWalletName = getIt
       .get<SharedPreferences>()
       .getString(PreferencesKey.currentWalletName);
-  authenticationStore.state = currentWalletName == null
-      ? AuthenticationState.denied
-      : AuthenticationState.installed;
+  if (currentWalletName != null) {
+    authenticationStore.state = AuthenticationState.installed;
+  }
 
   startAuthenticationStateChange(authenticationStore, navigatorKey);
   startCurrentWalletChangeReaction(
diff --git a/lib/reactions/on_authentication_state_change.dart b/lib/reactions/on_authentication_state_change.dart
index 560326cb5..c91f5277e 100644
--- a/lib/reactions/on_authentication_state_change.dart
+++ b/lib/reactions/on_authentication_state_change.dart
@@ -23,12 +23,12 @@ void startAuthenticationStateChange(AuthenticationStore authenticationStore,
     }
 
     if (state == AuthenticationState.allowed) {
-      await navigatorKey.currentState?.pushNamedAndRemoveUntil(Routes.dashboard, (route) => false);
+      await navigatorKey.currentState!.pushNamedAndRemoveUntil(Routes.dashboard, (route) => false);
       return;
     }
 
     if (state == AuthenticationState.denied) {
-      await navigatorKey.currentState?.pushNamedAndRemoveUntil(Routes.welcome, (_) => false);
+      await navigatorKey.currentState!.pushNamedAndRemoveUntil(Routes.welcome, (_) => false);
       return;
     }
   });