From 51eb431c8c968dfe576308bdf9acd6297862e4c9 Mon Sep 17 00:00:00 2001 From: Deep Panchal Date: Fri, 1 Sep 2023 17:17:01 -0500 Subject: [PATCH] fix(auth): pass forgotPasswordScreen & emailLoginLinkScreen as nestedGraph in loginWithEmailScreen to fix broken forgot password button --- .../navigation/CrisisCleanupAuthNavHost.kt | 10 ++++++++++ .../navigation/LoginWithEmailNavigation.kt | 2 ++ 2 files changed, 12 insertions(+) diff --git a/app/src/main/java/com/crisiscleanup/navigation/CrisisCleanupAuthNavHost.kt b/app/src/main/java/com/crisiscleanup/navigation/CrisisCleanupAuthNavHost.kt index c2ac2e0c..2b53e42c 100644 --- a/app/src/main/java/com/crisiscleanup/navigation/CrisisCleanupAuthNavHost.kt +++ b/app/src/main/java/com/crisiscleanup/navigation/CrisisCleanupAuthNavHost.kt @@ -7,6 +7,8 @@ import androidx.navigation.NavHostController import androidx.navigation.compose.NavHost import com.crisiscleanup.core.appnav.RouteConstant import com.crisiscleanup.feature.authentication.navigation.authGraph +import com.crisiscleanup.feature.authentication.navigation.emailLoginLinkScreen +import com.crisiscleanup.feature.authentication.navigation.forgotPasswordScreen import com.crisiscleanup.feature.authentication.navigation.loginWithEmailScreen import com.crisiscleanup.feature.authentication.navigation.navigateToEmailLoginLink import com.crisiscleanup.feature.authentication.navigation.navigateToForgotPassword @@ -41,6 +43,14 @@ fun CrisisCleanupAuthNavHost( closeAuthentication = closeAuthentication, openForgotPassword = navToForgotPassword, openEmailMagicLink = navToEmailMagicLink, + nestedGraphs = { + forgotPasswordScreen( + onBack = onBack, + ) + emailLoginLinkScreen( + onBack = onBack, + ) + }, ) }, openLoginWithEmail = navToLoginWithEmail, diff --git a/feature/authentication/src/main/java/com/crisiscleanup/feature/authentication/navigation/LoginWithEmailNavigation.kt b/feature/authentication/src/main/java/com/crisiscleanup/feature/authentication/navigation/LoginWithEmailNavigation.kt index 6ec081c6..d1e3547f 100644 --- a/feature/authentication/src/main/java/com/crisiscleanup/feature/authentication/navigation/LoginWithEmailNavigation.kt +++ b/feature/authentication/src/main/java/com/crisiscleanup/feature/authentication/navigation/LoginWithEmailNavigation.kt @@ -12,6 +12,7 @@ fun NavController.navigateToLoginWithEmail() { fun NavGraphBuilder.loginWithEmailScreen( enableBackHandler: Boolean, + nestedGraphs: NavGraphBuilder.() -> Unit, onBack: () -> Unit, closeAuthentication: () -> Unit, openForgotPassword: () -> Unit, @@ -26,4 +27,5 @@ fun NavGraphBuilder.loginWithEmailScreen( closeAuthentication = closeAuthentication, ) } + nestedGraphs() }