fix(fc): handle possible race conditions handling deep links from cold boot

Signed-off-by: Brandon McAnsh <git@bmcreations.dev>

Author: bmc08gt

flipchatApp/src/main/kotlin/xyz/flipchat/app/App.kt

@@ -15,21 +15,14 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
 import androidx.lifecycle.Lifecycle
 import cafe.adriel.voyager.core.registry.ScreenRegistry
-import cafe.adriel.voyager.core.stack.StackEvent
-import cafe.adriel.voyager.hilt.getViewModel
-import cafe.adriel.voyager.navigator.CurrentScreen
 import cafe.adriel.voyager.navigator.Navigator
 import cafe.adriel.voyager.transitions.SlideTransition
 import com.getcode.navigation.NavScreenProvider
-import xyz.flipchat.app.features.payments.PaymentScaffold
 import com.getcode.navigation.core.BottomSheetNavigator
 import com.getcode.navigation.core.CombinedNavigator
 import com.getcode.navigation.core.LocalCodeNavigator
 import com.getcode.navigation.extensions.getActivityScopedViewModel
 import com.getcode.navigation.transitions.SheetSlideTransition
-import xyz.flipchat.app.theme.FlipchatTheme
-import xyz.flipchat.app.ui.navigation.AppScreenContent
-import xyz.flipchat.app.ui.navigation.MainRoot
 import com.getcode.theme.LocalCodeColors
 import com.getcode.ui.components.OnLifecycleEvent
 import com.getcode.ui.components.bars.BottomBarContainer
@@ -43,6 +36,10 @@ import dev.bmcreations.tipkit.engines.TipsEngine
 import dev.theolm.rinku.DeepLink
 import dev.theolm.rinku.compose.ext.DeepLinkListener
 import xyz.flipchat.app.features.home.HomeViewModel
+import xyz.flipchat.app.features.payments.PaymentScaffold
+import xyz.flipchat.app.theme.FlipchatTheme
+import xyz.flipchat.app.ui.navigation.AppScreenContent
+import xyz.flipchat.app.ui.navigation.MainRoot
 import xyz.flipchat.app.util.DeeplinkType
 
 @Composable
@@ -92,7 +89,7 @@ fun App(
                         CodeScaffold { innerPaddingModifier ->
                             PaymentScaffold {
                                 Navigator(
-                                    screen = MainRoot,
+                                    screen = MainRoot { deepLink },
                                 ) { navigator ->
                                     LaunchedEffect(navigator.lastItem) {
                                         // update global navigator for platform access to support push/pop from a single
@@ -108,9 +105,11 @@ fun App(
                                     }
 
                                     LaunchedEffect(deepLink) {
-                                        if (deepLink != null) {
-                                            val screenSet = router.processDestination(deepLink)
-                                            codeNavigator.replaceAll(screenSet)
+                                        if (codeNavigator.lastItem !is MainRoot) {
+                                            if (deepLink != null) {
+                                                val screenSet = router.processDestination(deepLink)
+                                                codeNavigator.replaceAll(screenSet)
+                                            }
                                         }
                                     }
 

flipchatApp/src/main/kotlin/xyz/flipchat/app/features/home/TabbedHomeScreen.kt

@@ -68,8 +68,6 @@ class TabbedHomeScreen(private val deepLink: @RawValue DeepLink?) : Screen, Parc
         val viewModel = getActivityScopedViewModel<HomeViewModel>()
         val router = viewModel.router
 
-        val codeNavigator = LocalCodeNavigator.current
-
         val isLoggedIn by viewModel.isLoggedIn.collectAsState()
 
         val initialTab = remember(deepLink) { router.getInitialTabIndex(deepLink) }
@@ -93,13 +91,6 @@ class TabbedHomeScreen(private val deepLink: @RawValue DeepLink?) : Screen, Parc
                 )
             }
         ) { tabNavigator ->
-            LaunchedEffect(deepLink) {
-                if (deepLink != null) {
-                    val screenSet = router.processDestination(deepLink)
-                    tabNavigator.current = router.rootTabs[initialTab]
-                    codeNavigator.replaceAll(screenSet)
-                }
-            }
             Column(
                 modifier = Modifier
                     .statusBarsPadding()

flipchatApp/src/main/kotlin/xyz/flipchat/app/ui/navigation/MainRoot.kt

@@ -33,6 +33,7 @@ import cafe.adriel.voyager.navigator.LocalNavigator
 import cafe.adriel.voyager.navigator.currentOrThrow
 import xyz.flipchat.app.R
 import com.getcode.navigation.NavScreenProvider
+import com.getcode.navigation.extensions.getActivityScopedViewModel
 import xyz.flipchat.app.ui.LocalUserManager
 import com.getcode.theme.CodeTheme
 import com.getcode.theme.White
@@ -45,9 +46,10 @@ import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.onEach
 import timber.log.Timber
+import xyz.flipchat.app.features.home.HomeViewModel
 import xyz.flipchat.services.user.AuthState
 
-internal object MainRoot : Screen {
+internal class MainRoot(private val deepLink: () -> DeepLink?) : Screen {
 
     override val key: ScreenKey = uniqueScreenKey
 
@@ -58,13 +60,8 @@ internal object MainRoot : Screen {
         val navigator = LocalNavigator.currentOrThrow
         val userManager = LocalUserManager.currentOrThrow
         var showLoading by remember { mutableStateOf(false) }
-
-        //We are obtaining deep link here, in case we want to allow for some amount of deep linking when not
-        //authenticated. Currently we will require authentication to see anything, but can be changed in future.
-        var deeplink by remember { mutableStateOf<DeepLink?>(null) }
-        DeepLinkListener {
-            deeplink = it
-        }
+        val homeViewModel = getActivityScopedViewModel<HomeViewModel>()
+        val router = homeViewModel.router
 
         Box(
             modifier = Modifier
@@ -98,6 +95,7 @@ internal object MainRoot : Screen {
             }
         }
 
+
         LaunchedEffect(userManager) {
             userManager.state
                 .map { it.authState }
@@ -111,7 +109,13 @@ internal object MainRoot : Screen {
                         }
                         AuthState.Unregistered,
                         AuthState.LoggedIn -> {
-                            navigator.replace(ScreenRegistry.get(NavScreenProvider.AppHomeScreen(deeplink)))
+                            val screens = router.processDestination(deepLink())
+
+                            if (screens.isNotEmpty()) {
+                                navigator.replaceAll(screens)
+                            } else {
+                                navigator.replace(ScreenRegistry.get(NavScreenProvider.AppHomeScreen()))
+                            }
                         }
                         AuthState.LoggedOut -> {
                             navigator.replace(ScreenRegistry.get(NavScreenProvider.Login.Home()))

flipchatApp/src/main/kotlin/xyz/flipchat/app/util/Router.kt

@@ -89,6 +89,7 @@ class RouterImpl(
             when {
                 deeplink.pathSegments.isEmpty() -> tabIndexResolver(FcTab.Chat)
                 chats.contains(deeplink.pathSegments[0]) -> tabIndexResolver(FcTab.Chat)
+                room.contains(deeplink.pathSegments[0]) -> tabIndexResolver(FcTab.Chat)
                 cash.contains(deeplink.pathSegments[0]) -> tabIndexResolver(FcTab.Cash)
                 settings.contains(deeplink.pathSegments[0]) -> tabIndexResolver(FcTab.Settings)
                 else -> 0