feat: DCMAW-20397 Remove expired DL feature flag

features/config/public-api/src/main/kotlin/uk/gov/onelogin/criorchestrator/features/config/publicapi/SdkConfigKey.kt

@@ -64,10 +64,4 @@ sealed interface SdkConfigKey {
             name = "Debug app review prompts",
         ),
         SdkConfigKey
-
-    data object EnableExpiredDrivingLicences :
-        BooleanConfigKey(
-            name = "Enable expired driving licences",
-        ),
-        SdkConfigKey
 }

features/config/public-api/src/testFixtures/kotlin/uk/gov/onelogin/criorchestrator/features/config/publicapi/FakeConfig.kt

@@ -36,10 +36,6 @@ object FakeConfig {
                         key = NfcConfigKey.NfcAvailability,
                         value = Config.Value.StringValue(NfcConfigKey.NfcAvailability.OPTION_DEVICE),
                     ),
-                    Config.Entry<Config.Value.BooleanValue>(
-                        key = SdkConfigKey.EnableExpiredDrivingLicences,
-                        value = Config.Value.BooleanValue(true),
-                    ),
                 ),
         )
 }

features/id-check-wrapper/internal/src/main/kotlin/uk/gov/onelogin/criorchestrator/features/idcheckwrapper/internal/activity/IdCheckSdkActivityParameters.kt

@@ -15,6 +15,5 @@ internal fun LauncherData.toIdCheckSdkActivityParameters() =
                 backendMode = this.backendMode,
                 experimentalComposeNavigation = this.experimentalComposeNavigation,
                 nfcAvailability = this.nfcAvailability,
-                enableExpiredDrivingLicences = this.enableExpiredDrivingLicences,
             ),
     )

features/id-check-wrapper/internal/src/main/kotlin/uk/gov/onelogin/criorchestrator/features/idcheckwrapper/internal/data/LauncherDataReader.kt

@@ -36,9 +36,6 @@ class LauncherDataReader(
                 configStore.readSingle(NfcConfigKey.NfcAvailability).value,
             )
 
-        val enableExpiredDrivingLicences: Boolean =
-            configStore.readSingle(SdkConfigKey.EnableExpiredDrivingLicences).value
-
         if (result is BiometricTokenResult.Success) {
             sessionStore.updateToDocumentSelected()
         }
@@ -83,7 +80,6 @@ class LauncherDataReader(
                         backendMode = backendMode,
                         experimentalComposeNavigation = experimentalComposeNavigation,
                         nfcAvailability = nfcAvailability,
-                        enableExpiredDrivingLicences = enableExpiredDrivingLicences,
                     ),
                 )
             }

features/id-check-wrapper/internal/src/main/kotlin/uk/gov/onelogin/criorchestrator/features/idcheckwrapper/internal/model/LauncherData.kt

@@ -16,7 +16,6 @@ data class LauncherData(
     val backendMode: BackendMode,
     val experimentalComposeNavigation: Boolean,
     val nfcAvailability: NfcAvailability,
-    val enableExpiredDrivingLicences: Boolean,
 ) {
     companion object;
 

features/id-check-wrapper/internal/src/main/kotlin/uk/gov/onelogin/criorchestrator/features/idcheckwrapper/internal/screen/SyncIdCheckScreenManualLauncherContent.kt

@@ -145,7 +145,6 @@ internal fun PreviewSyncIdCheckManualLauncherContent() {
                     backendMode = BackendMode.V2,
                     experimentalComposeNavigation = false,
                     nfcAvailability = NfcAvailability.Device,
-                    enableExpiredDrivingLicences = false,
                 ),
             exitStateOptions = ExitStateOption.entries.map { it.displayName }.toPersistentList(),
             selectedExitState = 0,

features/id-check-wrapper/internal/src/test/kotlin/uk/gov/onelogin/criorchestrator/features/idcheckwrapper/internal/data/LauncherDataReaderTest.kt

@@ -59,11 +59,6 @@ class LauncherDataReaderTest {
                         value =
                             Config.Value.StringValue(NfcConfigKey.NfcAvailability.OPTION_DEVICE),
                     ),
-                    Config.Entry<Config.Value.BooleanValue>(
-                        key = SdkConfigKey.EnableExpiredDrivingLicences,
-                        value =
-                            Config.Value.BooleanValue(false),
-                    ),
                 ),
         )
     private val configStore by lazy {
@@ -86,7 +81,6 @@ class LauncherDataReaderTest {
                     backendMode = BackendMode.V2,
                     experimentalComposeNavigation = false,
                     nfcAvailability = NfcAvailability.Device,
-                    enableExpiredDrivingLicences = false,
                 ),
             )
 
@@ -175,39 +169,6 @@ class LauncherDataReaderTest {
             )
         }
 
-    @Test
-    fun `given different expired driving licences config, read gets the launcher data`() =
-        runTest {
-            initialConfig =
-                initialConfig.combinedWith(
-                    Config(
-                        entries =
-                            persistentListOf(
-                                Config.Entry<Config.Value.BooleanValue>(
-                                    key = SdkConfigKey.EnableExpiredDrivingLicences,
-                                    value = Config.Value.BooleanValue(true),
-                                ),
-                            ),
-                    ),
-                )
-
-            val launcherDataReader = createLauncherDataReader()
-            val launcherDataResult =
-                launcherDataReader.read(
-                    documentVariety = documentVariety,
-                )
-
-            assertEquals(
-                expectedLauncherDataResult.copy(
-                    launcherData =
-                        expectedLauncherDataResult.launcherData.copy(
-                            enableExpiredDrivingLicences = true,
-                        ),
-                ),
-                launcherDataResult,
-            )
-        }
-
     @Test
     fun `given mobile-app-mobile journey, read gets the launcher data`() =
         runTest {

features/id-check-wrapper/internal/src/testFixtures/kotlin/uk/gov/onelogin/criorchestrator/features/idcheckwrapper/internal/config/StubIdCheckWrapperConfig.kt

@@ -10,7 +10,6 @@ fun Config.Companion.createTestInstance(
     enableManualLauncher: Boolean = false,
     bypassIdCheckAsyncBackend: Boolean = false,
     experimentalComposeNavigation: Boolean = false,
-    enableExpiredDrivingLicences: Boolean = false,
 ): Config =
     Config(
         entries =
@@ -31,9 +30,5 @@ fun Config.Companion.createTestInstance(
                     key = NfcConfigKey.NfcAvailability,
                     value = Config.Value.StringValue(NfcConfigKey.NfcAvailability.OPTION_DEVICE),
                 ),
-                Config.Entry<Config.Value.BooleanValue>(
-                    key = SdkConfigKey.EnableExpiredDrivingLicences,
-                    value = Config.Value.BooleanValue(enableExpiredDrivingLicences),
-                ),
             ),
     )

features/id-check-wrapper/internal/src/testFixtures/kotlin/uk/gov/onelogin/criorchestrator/features/idcheckwrapper/internal/model/StubLauncherData.kt

@@ -20,5 +20,4 @@ fun LauncherData.Companion.createTestInstance(
     backendMode = BackendMode.V2,
     experimentalComposeNavigation = experimentalComposeNavigation,
     nfcAvailability = NfcAvailability.Device,
-    enableExpiredDrivingLicences = false,
 )

features/select-doc/internal/src/main/kotlin/uk/gov/onelogin/criorchestrator/features/selectdoc/internal/drivinglicence/confirm/ConfirmDrivingLicenceScreen.kt

@@ -57,7 +57,6 @@ internal fun ConfirmDrivingLicenceScreen(
         title = stringResource(ConfirmDrivingLicenceConstants.titleId),
         confirmButtonText = stringResource(ConfirmDrivingLicenceConstants.buttonTextId),
         earliestExpiryDateText = state.earliestExpiryDate.formatFullDate(),
-        enableExpiredDrivingLicences = state.enableExpiredDrivingLicences,
         onPrimaryClick = viewModel::onConfirmClick,
         modifier = modifier,
     )
@@ -69,7 +68,6 @@ internal fun ConfirmDrivingLicenceScreenContent(
     title: String,
     confirmButtonText: String,
     earliestExpiryDateText: String,
-    enableExpiredDrivingLicences: Boolean,
     onPrimaryClick: () -> Unit,
     modifier: Modifier = Modifier,
 ) {
@@ -92,16 +90,14 @@ internal fun ConfirmDrivingLicenceScreenContent(
                         modifier = Modifier.padding(horizontal = horizontalPadding),
                     )
                 }
-                if (enableExpiredDrivingLicences) {
-                    item {
-                        GdsWarningText(
-                            stringResource(
-                                R.string.drivinglicence_expired_warning,
-                                earliestExpiryDateText,
-                            ),
-                            modifier = Modifier.padding(horizontal = horizontalPadding),
-                        )
-                    }
+                item {
+                    GdsWarningText(
+                        stringResource(
+                            R.string.drivinglicence_expired_warning,
+                            earliestExpiryDateText,
+                        ),
+                        modifier = Modifier.padding(horizontal = horizontalPadding),
+                    )
                 }
                 item {
                     Text(
@@ -141,7 +137,6 @@ internal fun PreviewConfirmDrivingLicenceScreen() {
             title = stringResource(ConfirmDrivingLicenceConstants.titleId),
             confirmButtonText = stringResource(ConfirmDrivingLicenceConstants.buttonTextId),
             earliestExpiryDateText = previewEarliestAcceptableDrivingLicenceExpiryDateText(),
-            enableExpiredDrivingLicences = true,
             onPrimaryClick = { },
         )
     }
@@ -155,7 +150,6 @@ internal fun PreviewConfirmDrivingLicenceScreenNoExpired() {
             title = stringResource(ConfirmDrivingLicenceConstants.titleId),
             confirmButtonText = stringResource(ConfirmDrivingLicenceConstants.buttonTextId),
             earliestExpiryDateText = previewEarliestAcceptableDrivingLicenceExpiryDateText(),
-            enableExpiredDrivingLicences = false,
             onPrimaryClick = { },
         )
     }

features/select-doc/internal/src/main/kotlin/uk/gov/onelogin/criorchestrator/features/selectdoc/internal/drivinglicence/confirm/ConfirmDrivingLicenceState.kt

@@ -4,5 +4,4 @@ import java.time.LocalDate
 
 data class ConfirmDrivingLicenceState(
     val earliestExpiryDate: LocalDate,
-    val enableExpiredDrivingLicences: Boolean,
 )

features/select-doc/internal/src/main/kotlin/uk/gov/onelogin/criorchestrator/features/selectdoc/internal/drivinglicence/confirm/ConfirmDrivingLicenceViewModel.kt

@@ -9,8 +9,6 @@ import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.launch
-import uk.gov.onelogin.criorchestrator.features.config.internalapi.ConfigStore
-import uk.gov.onelogin.criorchestrator.features.config.publicapi.SdkConfigKey
 import uk.gov.onelogin.criorchestrator.features.selectdoc.internal.analytics.SelectDocAnalytics
 import uk.gov.onelogin.criorchestrator.features.selectdoc.internal.analytics.SelectDocScreenId
 import uk.gov.onelogin.criorchestrator.features.selectdoc.internal.drivinglicence.expiry.EarliestAcceptableDrivingLicenceExpiryDate
@@ -21,14 +19,11 @@ import uk.gov.onelogin.criorchestrator.libraries.di.CriOrchestratorScope
 class ConfirmDrivingLicenceViewModel(
     private val analytics: SelectDocAnalytics,
     earliestAcceptableExpiryDate: EarliestAcceptableDrivingLicenceExpiryDate,
-    configStore: ConfigStore,
 ) : ViewModel() {
     private val _state =
         MutableStateFlow(
             ConfirmDrivingLicenceState(
                 earliestExpiryDate = earliestAcceptableExpiryDate(),
-                enableExpiredDrivingLicences =
-                    configStore.readSingle(SdkConfigKey.EnableExpiredDrivingLicences).value,
             ),
         )
     val state: StateFlow<ConfirmDrivingLicenceState> = _state

features/select-doc/internal/src/main/kotlin/uk/gov/onelogin/criorchestrator/features/selectdoc/internal/drivinglicence/select/SelectDrivingLicenceScreen.kt

@@ -82,7 +82,6 @@ internal fun SelectDrivingLicenceScreen(
         onReadMoreClick = viewModel::onReadMoreClick,
         displayReadMoreButton = state.displayReadMoreButton,
         earliestExpiryDateText = state.earliestExpiryDate.formatFullDate(),
-        enableExpiredDrivingLicences = state.enableExpiredDrivingLicences,
     )
 }
 
@@ -94,7 +93,6 @@ internal fun SelectDrivingLicenceScreenContent(
     onReadMoreClick: () -> Unit,
     displayReadMoreButton: Boolean,
     earliestExpiryDateText: String,
-    enableExpiredDrivingLicences: Boolean,
     modifier: Modifier = Modifier,
 ) {
     var selectedItem by rememberSaveable { mutableStateOf<Int?>(null) }
@@ -115,27 +113,19 @@ internal fun SelectDrivingLicenceScreenContent(
                 item {
                     Text(
                         text =
-                            stringResource(
-                                if (enableExpiredDrivingLicences) {
-                                    R.string.selectdocument_drivinglicence_body
-                                } else {
-                                    R.string.selectdocument_drivinglicence_no_expired_body
-                                },
-                            ),
+                            stringResource(R.string.selectdocument_drivinglicence_body),
                         style = MaterialTheme.typography.bodyLarge,
                         modifier = Modifier.padding(horizontal = horizontalPadding),
                     )
                 }
-                if (enableExpiredDrivingLicences) {
-                    item {
-                        GdsWarningText(
-                            stringResource(
-                                R.string.drivinglicence_expired_warning,
-                                earliestExpiryDateText,
-                            ),
-                            modifier = Modifier.padding(horizontal = horizontalPadding),
-                        )
-                    }
+                item {
+                    GdsWarningText(
+                        stringResource(
+                            R.string.drivinglicence_expired_warning,
+                            earliestExpiryDateText,
+                        ),
+                        modifier = Modifier.padding(horizontal = horizontalPadding),
+                    )
                 }
                 if (displayReadMoreButton) {
                     item {
@@ -211,7 +201,6 @@ internal fun PreviewDrivingLicenceSelectionScreen(
             onReadMoreClick = { },
             displayReadMoreButton = params.displayReadMoreButton,
             earliestExpiryDateText = previewEarliestAcceptableDrivingLicenceExpiryDateText(),
-            enableExpiredDrivingLicences = true,
             onContinueClicked = {},
         )
     }
@@ -225,7 +214,6 @@ internal fun PreviewDrivingLicenceSelectionScreenNoExpired() {
             onReadMoreClick = { },
             displayReadMoreButton = true,
             earliestExpiryDateText = previewEarliestAcceptableDrivingLicenceExpiryDateText(),
-            enableExpiredDrivingLicences = false,
             onContinueClicked = {},
         )
     }

features/select-doc/internal/src/main/kotlin/uk/gov/onelogin/criorchestrator/features/selectdoc/internal/drivinglicence/select/SelectDrivingLicenceViewModel.kt

@@ -10,8 +10,6 @@ import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
-import uk.gov.onelogin.criorchestrator.features.config.internalapi.ConfigStore
-import uk.gov.onelogin.criorchestrator.features.config.publicapi.SdkConfigKey
 import uk.gov.onelogin.criorchestrator.features.idcheckwrapper.internalapi.nfc.NfcChecker
 import uk.gov.onelogin.criorchestrator.features.selectdoc.internal.analytics.SelectDocAnalytics
 import uk.gov.onelogin.criorchestrator.features.selectdoc.internal.analytics.SelectDocScreenId
@@ -24,7 +22,6 @@ class SelectDrivingLicenceViewModel(
     private val analytics: SelectDocAnalytics,
     private val nfcChecker: NfcChecker,
     private val earliestAcceptableExpiryDate: EarliestAcceptableDrivingLicenceExpiryDate,
-    configStore: ConfigStore,
 ) : ViewModel() {
     private val _actions = MutableSharedFlow<SelectDrivingLicenceAction>()
     val actions: Flow<SelectDrivingLicenceAction> = _actions
@@ -34,8 +31,6 @@ class SelectDrivingLicenceViewModel(
             SelectDrivingLicenseState(
                 displayReadMoreButton = nfcChecker.hasNfc(),
                 earliestExpiryDate = earliestAcceptableExpiryDate(),
-                enableExpiredDrivingLicences =
-                    configStore.readSingle(SdkConfigKey.EnableExpiredDrivingLicences).value,
             ),
         )
     val state: StateFlow<SelectDrivingLicenseState> = _state

features/select-doc/internal/src/main/kotlin/uk/gov/onelogin/criorchestrator/features/selectdoc/internal/drivinglicence/select/SelectDrivingLicenseState.kt

@@ -5,5 +5,4 @@ import java.time.LocalDate
 data class SelectDrivingLicenseState(
     val displayReadMoreButton: Boolean,
     val earliestExpiryDate: LocalDate,
-    val enableExpiredDrivingLicences: Boolean,
 )