Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ sealed interface AppRoute : NavKey, Parcelable {
val seed: String? = null,
val fromDeeplink: Boolean = false,
val resumeAt: ResumePoint = ResumePoint.Login,
val skipContacts: Boolean = false,
val skipContacts: Boolean = true,
) : AppRoute, FlowRoute {
enum class Phase { Account, Permissions }
enum class ResumePoint { Login, AccessKey, AccessKeyThenPurchase, PostAccessKey }
Expand All @@ -86,7 +86,10 @@ sealed interface AppRoute : NavKey, Parcelable {
listOf(OnboardingStep.Start(), OnboardingStep.AccessKey, OnboardingStep.Purchase)
ResumePoint.PostAccessKey -> emptyList()
}
Phase.Permissions -> listOf(OnboardingStep.ContactPermission, OnboardingStep.NotificationPermission)
Phase.Permissions -> buildList {
if (!skipContacts) add(OnboardingStep.ContactPermission)
add(OnboardingStep.NotificationPermission)
}
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ private fun AccountPhaseFlowHost(

internal fun resolvePostAccountRoute(
result: OnboardingResult,
skipContacts: Boolean = false,
skipContacts: Boolean = true,
): AppRoute? {
val permissionsRoute = AppRoute.OnboardingFlow(
phase = AppRoute.OnboardingFlow.Phase.Permissions,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ class OnboardingRoutingTest {
)
val flow = assertIs<AppRoute.OnboardingFlow>(route)
assertEquals(AppRoute.OnboardingFlow.Phase.Permissions, flow.phase)
assertEquals(false, flow.skipContacts)
assertEquals(true, flow.skipContacts)
}

// -- LoggedIn routes to permissions --
Expand All @@ -30,7 +30,7 @@ class OnboardingRoutingTest {
)
val flow = assertIs<AppRoute.OnboardingFlow>(route)
assertEquals(AppRoute.OnboardingFlow.Phase.Permissions, flow.phase)
assertEquals(false, flow.skipContacts)
assertEquals(true, flow.skipContacts)
}

// -- skipContacts is forwarded --
Expand All @@ -39,11 +39,11 @@ class OnboardingRoutingTest {
fun `skipContacts is forwarded to permissions route`() {
val route = resolvePostAccountRoute(
result = OnboardingResult.ProceedToVerification,
skipContacts = true,
skipContacts = false,
)
val flow = assertIs<AppRoute.OnboardingFlow>(route)
assertEquals(AppRoute.OnboardingFlow.Phase.Permissions, flow.phase)
assertEquals(true, flow.skipContacts)
assertEquals(false, flow.skipContacts)
}

// -- Completed (no-op) --
Expand Down
Loading