Merge pull request #130 from code-payments/chore/prevent-broken-nav-when-using-virtual-back

fix(nav): move AuthCheck inside Navigator root

Author: bmc08gt

app/src/main/java/com/getcode/CodeApp.kt

@@ -88,23 +88,23 @@ fun CodeApp() {
                             StackEvent.Replace -> CurrentScreen()
                         }
                     }
-                }
-            }
 
-            //Listen for authentication changes here
-            AuthCheck(
-                navigator = codeNavigator,
-                onNavigate = { screens ->
-                    codeNavigator.replaceAll(screens, inSheet = false)
-                },
-                onSwitchAccounts = { seed ->
-                    activity?.let {
-                        tlvm.logout(it) {
-                            appState.navigator.replaceAll(LoginScreen(seed))
+                    //Listen for authentication changes here
+                    AuthCheck(
+                        navigator = codeNavigator,
+                        onNavigate = { screens ->
+                            codeNavigator.replaceAll(screens, inSheet = false)
+                        },
+                        onSwitchAccounts = { seed ->
+                            activity?.let {
+                                tlvm.logout(it) {
+                                    appState.navigator.replaceAll(LoginScreen(seed))
+                                }
+                            }
                         }
-                    }
+                    )
                 }
-            )
+            }
         }
 
         TopBarContainer(appState)

app/src/main/java/com/getcode/view/components/AuthCheck.kt

@@ -91,9 +91,9 @@ fun AuthCheck(
         deeplinkHandler.intent
             .flatMapLatest { combine(flowOf(deeplinkHandler.handle(it)), SessionManager.authState) { a, b -> a to b } }
             .filter { (result, authState) ->
-                startupLog("checking auth state=${authState.isAuthenticated}")
-                // wait for authentication
                 if (result == null) return@filter false
+                // wait for authentication
+                startupLog("checking auth state=${authState.isAuthenticated}")
                 if( authState.isAuthenticated == null) {
                     startupLog("awaiting auth state confirmation")
                     return@filter false

app/src/main/java/com/getcode/view/main/home/HomeScan.kt

@@ -143,7 +143,7 @@ private fun HomeScan(
     val navigator = LocalCodeNavigator.current
     val scope = rememberCoroutineScope()
 
-    var isPaused by rememberSaveable { mutableStateOf(false) }
+    var isPaused by remember { mutableStateOf(false) }
 
     var kikCodeScannerView: KikCodeScannerView? by remember { mutableStateOf(null) }