Merge pull request #2390 from HedvigInsurance/fix/excluded-addons-sho…

…uld-stay-shrinked

Fix: Excluded addons should stay shrinked and non-interactive

app/apollo/apollo-octopus-public/src/main/graphql/com/hedvig/android/apollo/octopus/graphql/AddonVariantFragment.graphql

@@ -10,11 +10,6 @@ fragment AddonVariantFragment on AddonVariant {
     exceptions
     colorCode
   }
-  insurableLimits {
-    label
-    limit
-    description
-  }
   documents {
     displayName
     url

app/data/data-product-variant/data-product-variant-public/src/main/kotlin/com/hedvig/android/data/productvariant/AddonVariant.kt

@@ -10,7 +10,6 @@ data class AddonVariant(
   val product: String,
   val documents: List<InsuranceVariantDocument>,
   val perils: List<ProductVariantPeril>,
-  val insurableLimits: List<InsurableLimit>,
 )
 
 fun AddonVariantFragment.toAddonVariant() = AddonVariant(
@@ -34,11 +33,4 @@ fun AddonVariantFragment.toAddonVariant() = AddonVariant(
       colorCode = peril.colorCode,
     )
   },
-  insurableLimits = this.insurableLimits.map { insurableLimit ->
-    InsurableLimit(
-      label = insurableLimit.label,
-      limit = insurableLimit.limit,
-      description = insurableLimit.description,
-    )
-  },
 )

app/design-system/design-system-hedvig/src/main/kotlin/com/hedvig/android/design/system/hedvig/HedvigScaffold.kt

@@ -8,7 +8,6 @@ import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.WindowInsetsSides
 import androidx.compose.foundation.layout.consumeWindowInsets
 import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.only
 import androidx.compose.foundation.layout.safeDrawing
 import androidx.compose.foundation.layout.windowInsetsBottomHeight

app/feature/feature-addon-purchase/src/main/kotlin/com/hedvig/android/feature/addon/purchase/ui/customize/CustomizeTravelAddonDestination.kt

@@ -546,7 +546,6 @@ private val fakeTravelAddonQuote1 = TravelAddonQuote(
     perils = listOf(),
     displayName = "45 days",
     product = "",
-    insurableLimits = listOf(),
   ),
   price = UiMoney(
     49.0,
@@ -564,7 +563,6 @@ private val fakeTravelAddonQuote2 = TravelAddonQuote(
     perils = listOf(),
     displayName = "60 days",
     product = "",
-    insurableLimits = listOf(),
   ),
   price = UiMoney(
     60.0,

app/feature/feature-addon-purchase/src/main/kotlin/com/hedvig/android/feature/addon/purchase/ui/summary/AddonSummaryDestination.kt

@@ -354,7 +354,6 @@ private class ChooseInsuranceForAddonUiStateProvider :
             perils = listOf(),
             displayName = "45 days",
             product = "",
-            insurableLimits = listOf(),
           ),
           price = UiMoney(
             60.0,

app/feature/feature-addon-purchase/src/main/kotlin/com/hedvig/android/feature/addon/purchase/ui/travelinsuranceplusexplanation/TravelInsurancePlusExplanationDestination.kt

@@ -1,12 +1,9 @@
 package com.hedvig.android.feature.addon.purchase.ui.travelinsuranceplusexplanation
 
 import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.safeDrawing
-import androidx.compose.foundation.layout.windowInsetsBottomHeight
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier

app/feature/feature-addon-purchase/src/test/kotlin/data/GetTravelAddonOfferUseCaseImplTest.kt

@@ -317,7 +317,6 @@ private val mockWithoutUpgrade = TravelAddonOffer(
         displayName = "45 days",
         product = "",
         perils = listOf(),
-        insurableLimits = listOf(),
       ),
       price = UiMoney(
         49.0,
@@ -335,7 +334,6 @@ private val mockWithoutUpgrade = TravelAddonOffer(
         displayName = "60 days",
         product = "",
         perils = listOf(),
-        insurableLimits = listOf(),
       ),
       price = UiMoney(
         60.0,
@@ -362,7 +360,6 @@ private val mockWithUpgrade = TravelAddonOffer(
         displayName = "45 days",
         product = "",
         perils = listOf(),
-        insurableLimits = listOf(),
       ),
       price = UiMoney(
         60.0,

app/feature/feature-addon-purchase/src/test/kotlin/ui/AddonSummaryPresenterTest.kt

@@ -111,7 +111,6 @@ private val newQuote = TravelAddonQuote(
     displayName = "45 days",
     product = "",
     perils = listOf(),
-    insurableLimits = listOf(),
     documents = listOf(
       InsuranceVariantDocument(
         "Terms and Conditions",
@@ -139,7 +138,6 @@ private val newQuote2 = TravelAddonQuote(
     displayName = "60 days",
     product = "",
     perils = listOf(),
-    insurableLimits = listOf(),
     documents = listOf(
       InsuranceVariantDocument(
         "Terms and Conditions",

app/feature/feature-addon-purchase/src/test/kotlin/ui/CustomizeTravelAddonPresenterTest.kt

@@ -165,7 +165,6 @@ private val fakeTravelAddonQuote1 = TravelAddonQuote(
     displayName = "45 days",
     product = "",
     perils = listOf(),
-    insurableLimits = listOf(),
     documents = listOf(
       InsuranceVariantDocument(
         "Terms and Conditions",
@@ -188,7 +187,6 @@ private val fakeTravelAddonQuote2 = TravelAddonQuote(
     displayName = "60 days",
     product = "",
     perils = listOf(),
-    insurableLimits = listOf(),
     documents = listOf(
       InsuranceVariantDocument(
         "Terms and Conditions",

app/feature/feature-choose-tier/src/main/kotlin/com/hedvig/android/feature/change/tier/ui/stepsummary/SummaryDestination.kt

@@ -64,6 +64,7 @@ import com.hedvig.android.feature.change.tier.ui.stepsummary.SummaryState.Making
 import com.hedvig.android.feature.change.tier.ui.stepsummary.SummaryState.Success
 import com.hedvig.android.tiersandaddons.QuoteCard
 import com.hedvig.android.tiersandaddons.QuoteDisplayItem
+import com.hedvig.android.tiersandaddons.rememberQuoteCardState
 import hedvig.resources.R
 import kotlinx.datetime.LocalDate
 import kotlinx.datetime.toJavaLocalDate
@@ -320,6 +321,7 @@ private fun AddonCard(
   val startDate = formatStartDate(activationDate)
   val subtitle = stringResource(R.string.CHANGE_ADDRESS_ACTIVATION_DATE, startDate)
   QuoteCard(
+    quoteCardState = rememberQuoteCardState(),
     displayName = addonQuote.addonVariant.displayName,
     contractGroup = null,
     insurableLimits = emptyList(),
@@ -440,7 +442,6 @@ private class ChooseInsuranceUiStateProvider :
               addonVariant = AddonVariant(
                 displayName = "Addon Name",
                 perils = listOf(),
-                insurableLimits = listOf(),
                 documents = listOf(
                   InsuranceVariantDocument(
                     "Document name",

app/feature/feature-insurances/src/main/kotlin/com/hedvig/android/feature/insurances/insurancedetail/ContractDetailDestination.kt

@@ -400,7 +400,6 @@ private fun PreviewContractDetailScreen() {
                       ),
                     ),
                     perils = listOf(),
-                    insurableLimits = listOf(),
                   ),
                 ),
               ),

app/feature/feature-insurances/src/main/kotlin/com/hedvig/android/feature/insurances/insurancedetail/coverage/CoverageTab.kt

@@ -242,7 +242,6 @@ private val fakeAddonVariant = AddonVariant(
   ),
   displayName = "Travel Insurance Plus",
   product = "",
-  insurableLimits = listOf(),
 )
 
 private val previewInsurableLimits: List<InsurableLimit> = listOf(

app/feature/feature-insurances/src/main/kotlin/com/hedvig/android/feature/insurances/insurancedetail/documents/DocumentsTab.kt

@@ -159,7 +159,6 @@ private fun PreviewDocumentsScreen() {
                   InsuranceVariantDocument.InsuranceDocumentType.GENERAL_TERMS,
                 ),
               ),
-              insurableLimits = listOf(),
             ),
           ),
         ),

app/feature/feature-movingflow/src/main/kotlin/com/hedvig/android/feature/movingflow/ui/summary/SummaryDestination.kt

@@ -95,6 +95,7 @@ import com.hedvig.android.tiersandaddons.QuoteCard
 import com.hedvig.android.tiersandaddons.QuoteCardDefaults
 import com.hedvig.android.tiersandaddons.QuoteCardState
 import com.hedvig.android.tiersandaddons.QuoteDisplayItem
+import com.hedvig.android.tiersandaddons.rememberQuoteCardState
 import hedvig.resources.R
 import kotlinx.datetime.LocalDate
 import kotlinx.datetime.toJavaLocalDate
@@ -354,12 +355,17 @@ private fun AddonQuoteCard(
     quote = quote,
     modifier = modifier,
     underDetailsContent = { state ->
+      LaunchedEffect(quote.isExcludedByUser) {
+        if (quote.isExcludedByUser) {
+          state.showDetails = false
+        }
+      }
       Column {
+        Spacer(Modifier.height(16.dp))
         AnimatedVisibility(
           visible = canExcludeAddons && state.showDetails && !quote.isExcludedByUser,
           enter = expandVertically(expandFrom = Alignment.Top),
           exit = shrinkVertically(shrinkTowards = Alignment.Top),
-          modifier = Modifier.padding(bottom = 8.dp),
         ) {
           HedvigButton(
             text = stringResource(R.string.GENERAL_REMOVE),
@@ -368,7 +374,9 @@ private fun AddonQuoteCard(
             buttonStyle = Ghost,
             buttonSize = Medium,
             border = HedvigTheme.colorScheme.borderPrimary,
-            modifier = Modifier.fillMaxWidth(),
+            modifier = Modifier
+              .fillMaxWidth()
+              .padding(bottom = 8.dp),
           )
         }
         if (quote.isExcludedByUser) {
@@ -378,10 +386,21 @@ private fun AddonQuoteCard(
             enabled = true,
             buttonStyle = Secondary,
             buttonSize = Medium,
-            modifier = Modifier.fillMaxWidth().padding(top = 16.dp),
+            modifier = Modifier.fillMaxWidth(),
           )
         } else {
-          QuoteCardDefaults.UnderDetailsContent(state)
+          HedvigButton(
+            text = if (state.showDetails) {
+              stringResource(R.string.TIER_FLOW_SUMMARY_HIDE_DETAILS_BUTTON)
+            } else {
+              stringResource(R.string.TIER_FLOW_SUMMARY_SHOW_DETAILS)
+            },
+            onClick = state::toggleState,
+            enabled = true,
+            buttonStyle = Secondary,
+            buttonSize = Medium,
+            modifier = Modifier.fillMaxWidth(),
+          )
         }
       }
     },
@@ -409,11 +428,21 @@ private fun AddonQuoteCard(
   } else {
     stringResource(R.string.CHANGE_ADDRESS_ACTIVATION_DATE, startDate)
   }
+  val quoteCardState = rememberQuoteCardState()
   QuoteCard(
+    quoteCardState = object : QuoteCardState {
+      override var showDetails: Boolean
+        get() = if (quote is HomeAddonQuote && quote.isExcludedByUser) false else quoteCardState.showDetails
+        set(value) {
+          if (quote is HomeAddonQuote && quote.isExcludedByUser) return
+          quoteCardState.showDetails = value
+        }
+      override val isEnabled: Boolean
+        get() = if (quote is HomeAddonQuote && quote.isExcludedByUser) false else quoteCardState.isEnabled
+    },
     displayName = quote.addonVariant.displayName,
     contractGroup = null,
     insurableLimits = emptyList(),
-    // todo: here we don't want to show insurable limits for addons, that may change later
     documents = quote.addonVariant.documents,
     subtitle = subtitle,
     premium = quote.premium.toString(),
@@ -538,7 +567,6 @@ private class SummaryUiStateProvider : PreviewParameterProvider<SummaryUiState>
       ),
     ),
     perils = listOf(),
-    insurableLimits = listOf(),
   )
   val startDate = LocalDate.parse("2025-01-01")