Merge pull request #2351 from HedvigInsurance/feature/2-home-insuranc…

…es-error-screen add go to chat button to error screen in the addon purchase flow
HedvigInsurance · Dec 12, 2024 · cbef7fc · cbef7fc
2 parents 9be2bb2 + c87c6d0
commit cbef7fc
Show file tree

Hide file tree

Showing 8 changed files with 47 additions and 13 deletions.
diff --git a/app/app/src/main/kotlin/com/hedvig/android/app/navigation/HedvigNavHost.kt b/app/app/src/main/kotlin/com/hedvig/android/app/navigation/HedvigNavHost.kt
@@ -330,6 +330,7 @@ internal fun HedvigNavHost(
     addonPurchaseNavGraph(
       navigator = navigator,
       navController = hedvigAppState.navController,
+      onNavigateToNewConversation = { navigateToNewConversation() },
     )
     changeTierGraph(
       navigator = navigator,

diff --git a/...main/kotlin/com/hedvig/android/feature/addon/purchase/navigation/AddonPurchaseNavGraph.kt b/...main/kotlin/com/hedvig/android/feature/addon/purchase/navigation/AddonPurchaseNavGraph.kt
@@ -1,6 +1,7 @@
 package com.hedvig.android.feature.addon.purchase.navigation
 
 import androidx.compose.runtime.LaunchedEffect
+import androidx.navigation.NavBackStackEntry
 import androidx.navigation.NavController
 import androidx.navigation.NavGraphBuilder
 import com.hedvig.android.feature.addon.purchase.navigation.AddonPurchaseDestination.ChooseInsuranceToAddAddonDestination
@@ -25,7 +26,11 @@ import com.hedvig.android.navigation.core.Navigator
 import org.koin.androidx.compose.koinViewModel
 import org.koin.core.parameter.parametersOf
 
-fun NavGraphBuilder.addonPurchaseNavGraph(navigator: Navigator, navController: NavController) {
+fun NavGraphBuilder.addonPurchaseNavGraph(
+  navigator: Navigator,
+  navController: NavController,
+  onNavigateToNewConversation: (NavBackStackEntry) -> Unit,
+) {
   navgraph<AddonPurchaseGraphDestination>(
     startDestination = ChooseInsuranceToAddAddonDestination::class,
   ) {
@@ -72,6 +77,10 @@ fun NavGraphBuilder.addonPurchaseNavGraph(navigator: Navigator, navController: N
         navigateToSummary = { summaryParameters: SummaryParameters ->
           navigator.navigateUnsafe(Summary(summaryParameters))
         },
+        onNavigateToNewConversation = {
+          navController.typedPopBackStack<AddonPurchaseGraphDestination>(inclusive = true) // todo: is this the right thing?
+          onNavigateToNewConversation(backStackEntry)
+        },
       )
     }
 

diff --git a/...com/hedvig/android/feature/addon/purchase/ui/customize/CustomizeTravelAddonDestination.kt b/...com/hedvig/android/feature/addon/purchase/ui/customize/CustomizeTravelAddonDestination.kt
@@ -82,6 +82,7 @@ internal fun CustomizeTravelAddonDestination(
   popBackStack: () -> Unit,
   popAddonFlow: () -> Unit,
   navigateToSummary: (summaryParameters: SummaryParameters) -> Unit,
+  onNavigateToNewConversation: () -> Unit,
 ) {
   val uiState: CustomizeTravelAddonState by viewModel.uiState.collectAsStateWithLifecycle()
   CustomizeTravelAddonScreen(
@@ -104,6 +105,7 @@ internal fun CustomizeTravelAddonDestination(
     onSetOptionBackToPreviouslyChosen = {
       viewModel.emit(CustomizeTravelAddonEvent.SetOptionBackToPreviouslyChosen)
     },
+    navigateToChat = onNavigateToNewConversation,
   )
 }
 
@@ -118,12 +120,19 @@ private fun CustomizeTravelAddonScreen(
   onSetOptionBackToPreviouslyChosen: () -> Unit,
   reload: () -> Unit,
   popAddonFlow: () -> Unit,
+  navigateToChat: () -> Unit,
 ) {
   Box(
     Modifier.fillMaxSize(),
   ) {
     when (val state = uiState) {
-      is CustomizeTravelAddonState.Failure -> FailureScreen(state.errorMessage, reload, popBackStack)
+      is CustomizeTravelAddonState.Failure -> FailureScreen(
+        errorMessage = state.errorMessage,
+        reload = reload,
+        popBackStack = popBackStack,
+        navigateToChat = navigateToChat,
+      )
+
       CustomizeTravelAddonState.Loading -> HedvigFullScreenCenterAlignedProgress()
       is CustomizeTravelAddonState.Success -> CustomizeTravelAddonScreenContent(
         uiState = state,
@@ -147,7 +156,12 @@ private fun CustomizeTravelAddonScreen(
 }
 
 @Composable
-private fun FailureScreen(errorMessage: String?, reload: () -> Unit, popBackStack: () -> Unit) {
+private fun FailureScreen(
+  errorMessage: String?,
+  reload: () -> Unit,
+  popBackStack: () -> Unit,
+  navigateToChat: () -> Unit,
+) {
   Box(Modifier.fillMaxSize()) {
     Column(
       modifier = Modifier
@@ -161,10 +175,16 @@ private fun FailureScreen(errorMessage: String?, reload: () -> Unit, popBackStac
         ),
     ) {
       Spacer(Modifier.weight(1f))
+      val buttonText = if (errorMessage == null) {
+        stringResource(R.string.GENERAL_RETRY)
+      } else {
+        stringResource(R.string.open_chat)
+      }
       HedvigErrorSection(
-        onButtonClick = reload,
+        onButtonClick = if (errorMessage == null) reload else navigateToChat,
         subTitle = errorMessage ?: stringResource(R.string.GENERAL_ERROR_BODY),
         modifier = Modifier.fillMaxSize(),
+        buttonText = buttonText,
       )
       Spacer(Modifier.weight(1f))
       HedvigTextButton(
@@ -500,6 +520,7 @@ private fun SelectTierScreenPreview(
         {},
         {},
         {},
+        {},
       )
     }
   }

diff --git a/...in/com/hedvig/android/feature/odyssey/step/informdeflect/DeflectGlassDamageDestination.kt b/...in/com/hedvig/android/feature/odyssey/step/informdeflect/DeflectGlassDamageDestination.kt
@@ -112,7 +112,9 @@ private fun DeflectGlassDamageScreen(
             .fillMaxWidth(),
         ) {
           Surface(
-            color = HedvigTheme.colorScheme.backgroundPrimary.copy(0.95f).compositeOver(HedvigTheme.colorScheme.fillWhite),
+            color = HedvigTheme.colorScheme.backgroundPrimary.copy(
+              0.95f,
+            ).compositeOver(HedvigTheme.colorScheme.fillWhite),
             contentColor = HedvigTheme.colorScheme.fillPrimary,
           ) {
             Column(Modifier.padding(16.dp)) {

diff --git a/...n/kotlin/com/hedvig/android/feature/odyssey/step/informdeflect/DeflectPestsDestination.kt b/...n/kotlin/com/hedvig/android/feature/odyssey/step/informdeflect/DeflectPestsDestination.kt
@@ -136,7 +136,7 @@ private fun DeflectPestsScreen(
                     """
                   |Partner URL was null for DeflectPestsDestination! Deflect partner:[$this]. 
                   |This is problematic because the UI offers no real help to the member, the CTA button does nothing.
-                      """.trimMargin()
+                    """.trimMargin()
                   }
                 }
               },

diff --git a/.../kotlin/com/hedvig/android/feature/odyssey/step/informdeflect/DeflectTowingDestination.kt b/.../kotlin/com/hedvig/android/feature/odyssey/step/informdeflect/DeflectTowingDestination.kt
@@ -112,7 +112,7 @@ private fun DeflectTowingScreen(
           modifier = Modifier
             .fillMaxWidth()
             .padding(horizontal = 16.dp),
-          ) {
+        ) {
           Column(Modifier.padding(16.dp)) {
             AsyncImage(
               model = partner.imageUrl,

diff --git a/...om/hedvig/android/feature/terminateinsurance/data/TerminateInsuranceRepositoryImplTest.kt b/...om/hedvig/android/feature/terminateinsurance/data/TerminateInsuranceRepositoryImplTest.kt
@@ -140,7 +140,7 @@ class TerminateInsuranceRepositoryImplTest {
         fixedMap = mapOf(
           Feature.TIER to false,
           Feature.TRAVEL_ADDON to false,
-        )
+        ),
       )
 
       val repo = TerminateInsuranceRepositoryImpl(
@@ -185,7 +185,7 @@ class TerminateInsuranceRepositoryImplTest {
         fixedMap = mapOf(
           Feature.TIER to true,
           Feature.TRAVEL_ADDON to false,
-        )
+        ),
       )
 
       val repo = TerminateInsuranceRepositoryImpl(
@@ -230,7 +230,7 @@ class TerminateInsuranceRepositoryImplTest {
         fixedMap = mapOf(
           Feature.TIER to false,
           Feature.TRAVEL_ADDON to false,
-        )
+        ),
       )
 
       val repo = TerminateInsuranceRepositoryImpl(
@@ -261,7 +261,7 @@ class TerminateInsuranceRepositoryImplTest {
         fixedMap = mapOf(
           Feature.TIER to true,
           Feature.TRAVEL_ADDON to false,
-        )
+        ),
       )
 
       val repo = TerminateInsuranceRepositoryImpl(

diff --git a/app/ui/ui-emergency/src/main/kotlin/com/hedvig/android/ui/emergency/EmergencyScreen.kt b/app/ui/ui-emergency/src/main/kotlin/com/hedvig/android/ui/emergency/EmergencyScreen.kt
@@ -15,7 +15,6 @@ import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.LineBreak
 import androidx.compose.ui.text.style.TextAlign
-import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import com.hedvig.android.design.system.hedvig.AccordionData
 import com.hedvig.android.design.system.hedvig.AccordionList
@@ -62,7 +61,9 @@ fun EmergencyScreen(
       Spacer(Modifier.height(8.dp))
       HedvigTheme(darkTheme = true) {
         Surface(
-          color = HedvigTheme.colorScheme.backgroundPrimary.copy(0.95f).compositeOver(HedvigTheme.colorScheme.fillWhite),
+          color = HedvigTheme.colorScheme.backgroundPrimary.copy(
+            0.95f,
+          ).compositeOver(HedvigTheme.colorScheme.fillWhite),
           contentColor = HedvigTheme.colorScheme.fillPrimary,
           shape = HedvigTheme.shapes.cornerXLarge,
           modifier = Modifier