diff --git a/app/feature/feature-insurances/src/main/kotlin/com/hedvig/android/feature/insurances/ui/InsuranceContractExt.kt b/app/feature/feature-insurances/src/main/kotlin/com/hedvig/android/feature/insurances/ui/InsuranceContractExt.kt index c1f1e547af..fd58ab29e1 100644 --- a/app/feature/feature-insurances/src/main/kotlin/com/hedvig/android/feature/insurances/ui/InsuranceContractExt.kt +++ b/app/feature/feature-insurances/src/main/kotlin/com/hedvig/android/feature/insurances/ui/InsuranceContractExt.kt @@ -48,6 +48,17 @@ internal fun InsuranceContract.createChips(): List { tierName?.let { ChipUiData(chipText = it, chipType = TIER) }, + inceptionDate.let { inceptionDate -> + if (inceptionDate > today) { + val text = stringResource(Res.string.CONTRACT_STATUS_ACTIVE_IN_FUTURE, inceptionDate) + ChipUiData(text, GENERAL) + } else if (terminationDate == null) { + val text = stringResource(Res.string.DASHBOARD_INSURANCE_STATUS_ACTIVE) + ChipUiData(text, GENERAL) + } else { + null + } + }, terminationDate?.let { terminationDate -> val text = if (terminationDate == today) { if (currentInsuranceAgreement.productVariant.contractType.isTrialContract()) { @@ -70,17 +81,6 @@ internal fun InsuranceContract.createChips(): List { val text = stringResource(Res.string.DASHBOARD_INSURANCE_STATUS_ACTIVE_UPDATE_DATE, activeFromDate) ChipUiData(text, GENERAL) }, - inceptionDate.let { inceptionDate -> - if (inceptionDate > today) { - val text = stringResource(Res.string.CONTRACT_STATUS_ACTIVE_IN_FUTURE, inceptionDate) - ChipUiData(text, GENERAL) - } else if (terminationDate == null) { - val text = stringResource(Res.string.DASHBOARD_INSURANCE_STATUS_ACTIVE) - ChipUiData(text, GENERAL) - } else { - null - } - }, ) } }