diff --git a/features/config/public-api/src/main/kotlin/uk/gov/onelogin/criorchestrator/features/config/publicapi/SdkConfigKey.kt b/features/config/public-api/src/main/kotlin/uk/gov/onelogin/criorchestrator/features/config/publicapi/SdkConfigKey.kt index 59f254506..9ecb27743 100644 --- a/features/config/public-api/src/main/kotlin/uk/gov/onelogin/criorchestrator/features/config/publicapi/SdkConfigKey.kt +++ b/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 } diff --git a/features/config/public-api/src/testFixtures/kotlin/uk/gov/onelogin/criorchestrator/features/config/publicapi/FakeConfig.kt b/features/config/public-api/src/testFixtures/kotlin/uk/gov/onelogin/criorchestrator/features/config/publicapi/FakeConfig.kt index 6e03705d5..36330e5cd 100644 --- a/features/config/public-api/src/testFixtures/kotlin/uk/gov/onelogin/criorchestrator/features/config/publicapi/FakeConfig.kt +++ b/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( - key = SdkConfigKey.EnableExpiredDrivingLicences, - value = Config.Value.BooleanValue(true), - ), ), ) } diff --git a/features/id-check-wrapper/internal/src/main/kotlin/uk/gov/onelogin/criorchestrator/features/idcheckwrapper/internal/activity/IdCheckSdkActivityParameters.kt b/features/id-check-wrapper/internal/src/main/kotlin/uk/gov/onelogin/criorchestrator/features/idcheckwrapper/internal/activity/IdCheckSdkActivityParameters.kt index 6dc9e527e..7ab19cca7 100644 --- a/features/id-check-wrapper/internal/src/main/kotlin/uk/gov/onelogin/criorchestrator/features/idcheckwrapper/internal/activity/IdCheckSdkActivityParameters.kt +++ b/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, ), ) diff --git a/features/id-check-wrapper/internal/src/main/kotlin/uk/gov/onelogin/criorchestrator/features/idcheckwrapper/internal/data/LauncherDataReader.kt b/features/id-check-wrapper/internal/src/main/kotlin/uk/gov/onelogin/criorchestrator/features/idcheckwrapper/internal/data/LauncherDataReader.kt index 1417a9d7a..49735679a 100644 --- a/features/id-check-wrapper/internal/src/main/kotlin/uk/gov/onelogin/criorchestrator/features/idcheckwrapper/internal/data/LauncherDataReader.kt +++ b/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, ), ) } diff --git a/features/id-check-wrapper/internal/src/main/kotlin/uk/gov/onelogin/criorchestrator/features/idcheckwrapper/internal/model/LauncherData.kt b/features/id-check-wrapper/internal/src/main/kotlin/uk/gov/onelogin/criorchestrator/features/idcheckwrapper/internal/model/LauncherData.kt index a64816649..2c2292c47 100644 --- a/features/id-check-wrapper/internal/src/main/kotlin/uk/gov/onelogin/criorchestrator/features/idcheckwrapper/internal/model/LauncherData.kt +++ b/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; diff --git a/features/id-check-wrapper/internal/src/main/kotlin/uk/gov/onelogin/criorchestrator/features/idcheckwrapper/internal/screen/SyncIdCheckScreenManualLauncherContent.kt b/features/id-check-wrapper/internal/src/main/kotlin/uk/gov/onelogin/criorchestrator/features/idcheckwrapper/internal/screen/SyncIdCheckScreenManualLauncherContent.kt index dff0efc2b..f7c3990a0 100644 --- a/features/id-check-wrapper/internal/src/main/kotlin/uk/gov/onelogin/criorchestrator/features/idcheckwrapper/internal/screen/SyncIdCheckScreenManualLauncherContent.kt +++ b/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, diff --git a/features/id-check-wrapper/internal/src/test/kotlin/uk/gov/onelogin/criorchestrator/features/idcheckwrapper/internal/data/LauncherDataReaderTest.kt b/features/id-check-wrapper/internal/src/test/kotlin/uk/gov/onelogin/criorchestrator/features/idcheckwrapper/internal/data/LauncherDataReaderTest.kt index 6b1b2d79b..677376c7f 100644 --- a/features/id-check-wrapper/internal/src/test/kotlin/uk/gov/onelogin/criorchestrator/features/idcheckwrapper/internal/data/LauncherDataReaderTest.kt +++ b/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( - 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( - 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 { diff --git a/features/id-check-wrapper/internal/src/testFixtures/kotlin/uk/gov/onelogin/criorchestrator/features/idcheckwrapper/internal/config/StubIdCheckWrapperConfig.kt b/features/id-check-wrapper/internal/src/testFixtures/kotlin/uk/gov/onelogin/criorchestrator/features/idcheckwrapper/internal/config/StubIdCheckWrapperConfig.kt index 918ac45ca..2011159b1 100644 --- a/features/id-check-wrapper/internal/src/testFixtures/kotlin/uk/gov/onelogin/criorchestrator/features/idcheckwrapper/internal/config/StubIdCheckWrapperConfig.kt +++ b/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( - key = SdkConfigKey.EnableExpiredDrivingLicences, - value = Config.Value.BooleanValue(enableExpiredDrivingLicences), - ), ), ) diff --git a/features/id-check-wrapper/internal/src/testFixtures/kotlin/uk/gov/onelogin/criorchestrator/features/idcheckwrapper/internal/model/StubLauncherData.kt b/features/id-check-wrapper/internal/src/testFixtures/kotlin/uk/gov/onelogin/criorchestrator/features/idcheckwrapper/internal/model/StubLauncherData.kt index 52d054010..e60f9b0ab 100644 --- a/features/id-check-wrapper/internal/src/testFixtures/kotlin/uk/gov/onelogin/criorchestrator/features/idcheckwrapper/internal/model/StubLauncherData.kt +++ b/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, ) diff --git a/features/select-doc/internal/src/main/kotlin/uk/gov/onelogin/criorchestrator/features/selectdoc/internal/drivinglicence/confirm/ConfirmDrivingLicenceScreen.kt b/features/select-doc/internal/src/main/kotlin/uk/gov/onelogin/criorchestrator/features/selectdoc/internal/drivinglicence/confirm/ConfirmDrivingLicenceScreen.kt index c5243c908..2090ae1d8 100644 --- a/features/select-doc/internal/src/main/kotlin/uk/gov/onelogin/criorchestrator/features/selectdoc/internal/drivinglicence/confirm/ConfirmDrivingLicenceScreen.kt +++ b/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 = { }, ) } diff --git a/features/select-doc/internal/src/main/kotlin/uk/gov/onelogin/criorchestrator/features/selectdoc/internal/drivinglicence/confirm/ConfirmDrivingLicenceState.kt b/features/select-doc/internal/src/main/kotlin/uk/gov/onelogin/criorchestrator/features/selectdoc/internal/drivinglicence/confirm/ConfirmDrivingLicenceState.kt index 252ca2f29..fdb186724 100644 --- a/features/select-doc/internal/src/main/kotlin/uk/gov/onelogin/criorchestrator/features/selectdoc/internal/drivinglicence/confirm/ConfirmDrivingLicenceState.kt +++ b/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, ) diff --git a/features/select-doc/internal/src/main/kotlin/uk/gov/onelogin/criorchestrator/features/selectdoc/internal/drivinglicence/confirm/ConfirmDrivingLicenceViewModel.kt b/features/select-doc/internal/src/main/kotlin/uk/gov/onelogin/criorchestrator/features/selectdoc/internal/drivinglicence/confirm/ConfirmDrivingLicenceViewModel.kt index 28e86bf72..bc131d1a0 100644 --- a/features/select-doc/internal/src/main/kotlin/uk/gov/onelogin/criorchestrator/features/selectdoc/internal/drivinglicence/confirm/ConfirmDrivingLicenceViewModel.kt +++ b/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 = _state diff --git a/features/select-doc/internal/src/main/kotlin/uk/gov/onelogin/criorchestrator/features/selectdoc/internal/drivinglicence/select/SelectDrivingLicenceScreen.kt b/features/select-doc/internal/src/main/kotlin/uk/gov/onelogin/criorchestrator/features/selectdoc/internal/drivinglicence/select/SelectDrivingLicenceScreen.kt index efbccd913..6d2cc1ffc 100644 --- a/features/select-doc/internal/src/main/kotlin/uk/gov/onelogin/criorchestrator/features/selectdoc/internal/drivinglicence/select/SelectDrivingLicenceScreen.kt +++ b/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(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 = {}, ) } diff --git a/features/select-doc/internal/src/main/kotlin/uk/gov/onelogin/criorchestrator/features/selectdoc/internal/drivinglicence/select/SelectDrivingLicenceViewModel.kt b/features/select-doc/internal/src/main/kotlin/uk/gov/onelogin/criorchestrator/features/selectdoc/internal/drivinglicence/select/SelectDrivingLicenceViewModel.kt index c285ac37b..a8b244b6b 100644 --- a/features/select-doc/internal/src/main/kotlin/uk/gov/onelogin/criorchestrator/features/selectdoc/internal/drivinglicence/select/SelectDrivingLicenceViewModel.kt +++ b/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() val actions: Flow = _actions @@ -34,8 +31,6 @@ class SelectDrivingLicenceViewModel( SelectDrivingLicenseState( displayReadMoreButton = nfcChecker.hasNfc(), earliestExpiryDate = earliestAcceptableExpiryDate(), - enableExpiredDrivingLicences = - configStore.readSingle(SdkConfigKey.EnableExpiredDrivingLicences).value, ), ) val state: StateFlow = _state diff --git a/features/select-doc/internal/src/main/kotlin/uk/gov/onelogin/criorchestrator/features/selectdoc/internal/drivinglicence/select/SelectDrivingLicenseState.kt b/features/select-doc/internal/src/main/kotlin/uk/gov/onelogin/criorchestrator/features/selectdoc/internal/drivinglicence/select/SelectDrivingLicenseState.kt index af361fb19..f73dd6bce 100644 --- a/features/select-doc/internal/src/main/kotlin/uk/gov/onelogin/criorchestrator/features/selectdoc/internal/drivinglicence/select/SelectDrivingLicenseState.kt +++ b/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, ) diff --git a/features/select-doc/internal/src/main/kotlin/uk/gov/onelogin/criorchestrator/features/selectdoc/internal/photoid/TypesOfPhotoIDScreen.kt b/features/select-doc/internal/src/main/kotlin/uk/gov/onelogin/criorchestrator/features/selectdoc/internal/photoid/TypesOfPhotoIDScreen.kt index 63847e63e..d4f8b4f82 100644 --- a/features/select-doc/internal/src/main/kotlin/uk/gov/onelogin/criorchestrator/features/selectdoc/internal/photoid/TypesOfPhotoIDScreen.kt +++ b/features/select-doc/internal/src/main/kotlin/uk/gov/onelogin/criorchestrator/features/selectdoc/internal/photoid/TypesOfPhotoIDScreen.kt @@ -48,7 +48,6 @@ internal fun TypesOfPhotoIDScreen( TypesOfPhotoIDScreenContent( drivingLicenceExpiryDateText = state.earliestExpiryDate.formatFullDate(), - enableExpiredDrivingLicences = state.enableExpiredDrivingLicences, modifier = modifier, ) } @@ -58,7 +57,6 @@ internal fun TypesOfPhotoIDScreen( @OptIn(UnstableDesignSystemAPI::class) internal fun TypesOfPhotoIDScreenContent( drivingLicenceExpiryDateText: String, - enableExpiredDrivingLicences: Boolean, modifier: Modifier = Modifier, ) { Surface( @@ -94,7 +92,6 @@ internal fun TypesOfPhotoIDScreenContent( ukPhotoCardDrivingLicenceItems( horizontalPadding = horizontalPadding, earliestExpiryDateText = drivingLicenceExpiryDateText, - enableExpiredDrivingLicences = enableExpiredDrivingLicences, ) }, ) @@ -201,7 +198,6 @@ private fun LazyListScope.ukBiometricPermitOrCardItems(horizontalPadding: Dp) { private fun LazyListScope.ukPhotoCardDrivingLicenceItems( horizontalPadding: Dp, earliestExpiryDateText: String, - enableExpiredDrivingLicences: Boolean, ) { item { Heading( @@ -210,62 +206,37 @@ private fun LazyListScope.ukPhotoCardDrivingLicenceItems( ) } - if (enableExpiredDrivingLicences) { - item { - Text( - text = stringResource(R.string.typesofphotoid_drivinglicence_body_1), - modifier = Modifier.padding(horizontal = horizontalPadding), - ) - } + item { + Text( + text = stringResource(R.string.typesofphotoid_drivinglicence_body_1), + modifier = Modifier.padding(horizontal = horizontalPadding), + ) + } - item { - Text( - text = stringResource(R.string.typesofphotoid_drivinglicence_body_2), - modifier = Modifier.padding(horizontal = horizontalPadding), - ) - } + item { + Text( + text = stringResource(R.string.typesofphotoid_drivinglicence_body_2), + modifier = Modifier.padding(horizontal = horizontalPadding), + ) + } - item { - GdsBulletedList( - title = listTitle(stringResource(R.string.typesofphotoid_drivinglicence_bulletbody)), - bulletListItems = - persistentListOf( - ListItem( - stringResource( - R.string.typesofphotoid_drivinglicence_bullet1, - earliestExpiryDateText, - ), - ), - ListItem( - stringResource(R.string.typesofphotoid_drivinglicence_bullet2), + item { + GdsBulletedList( + title = listTitle(stringResource(R.string.typesofphotoid_drivinglicence_bulletbody)), + bulletListItems = + persistentListOf( + ListItem( + stringResource( + R.string.typesofphotoid_drivinglicence_bullet1, + earliestExpiryDateText, ), ), - modifier = Modifier.padding(horizontal = horizontalPadding), - ) - } - } else { - item { - GdsBulletedList( - title = listTitle(stringResource(R.string.typesofphotoid_drivinglicence_no_expired_bulletbody)), - bulletListItems = - persistentListOf( - ListItem( - stringResource(R.string.typesofphotoid_drivinglicence_no_expired_bullet1), - ), - ListItem( - stringResource(R.string.typesofphotoid_drivinglicence_no_expired_bullet2), - ), + ListItem( + stringResource(R.string.typesofphotoid_drivinglicence_bullet2), ), - modifier = Modifier.padding(horizontal = horizontalPadding), - ) - } - - item { - Text( - text = stringResource(R.string.typesofphotoid_drivinglicence_no_expired_body), - modifier = Modifier.padding(horizontal = horizontalPadding), - ) - } + ), + modifier = Modifier.padding(horizontal = horizontalPadding), + ) } item { @@ -304,7 +275,6 @@ internal fun PreviewTypesOfPhotoIDScreen() { GdsTheme { TypesOfPhotoIDScreenContent( drivingLicenceExpiryDateText = previewEarliestAcceptableDrivingLicenceExpiryDateText(), - enableExpiredDrivingLicences = true, ) } } @@ -317,7 +287,6 @@ internal fun PreviewTypesOfPhotoIDScreenNoExpired() { GdsTheme { TypesOfPhotoIDScreenContent( drivingLicenceExpiryDateText = previewEarliestAcceptableDrivingLicenceExpiryDateText(), - enableExpiredDrivingLicences = false, ) } } diff --git a/features/select-doc/internal/src/main/kotlin/uk/gov/onelogin/criorchestrator/features/selectdoc/internal/photoid/TypesOfPhotoIDState.kt b/features/select-doc/internal/src/main/kotlin/uk/gov/onelogin/criorchestrator/features/selectdoc/internal/photoid/TypesOfPhotoIDState.kt index dc3426e94..9e7fad131 100644 --- a/features/select-doc/internal/src/main/kotlin/uk/gov/onelogin/criorchestrator/features/selectdoc/internal/photoid/TypesOfPhotoIDState.kt +++ b/features/select-doc/internal/src/main/kotlin/uk/gov/onelogin/criorchestrator/features/selectdoc/internal/photoid/TypesOfPhotoIDState.kt @@ -4,5 +4,4 @@ import java.time.LocalDate data class TypesOfPhotoIDState( val earliestExpiryDate: LocalDate, - val enableExpiredDrivingLicences: Boolean, ) diff --git a/features/select-doc/internal/src/main/kotlin/uk/gov/onelogin/criorchestrator/features/selectdoc/internal/photoid/TypesOfPhotoIDViewModel.kt b/features/select-doc/internal/src/main/kotlin/uk/gov/onelogin/criorchestrator/features/selectdoc/internal/photoid/TypesOfPhotoIDViewModel.kt index 77f7bd584..30ec5f05f 100644 --- a/features/select-doc/internal/src/main/kotlin/uk/gov/onelogin/criorchestrator/features/selectdoc/internal/photoid/TypesOfPhotoIDViewModel.kt +++ b/features/select-doc/internal/src/main/kotlin/uk/gov/onelogin/criorchestrator/features/selectdoc/internal/photoid/TypesOfPhotoIDViewModel.kt @@ -5,8 +5,6 @@ import dev.zacsweers.metro.ContributesIntoMap import dev.zacsweers.metrox.viewmodel.ViewModelKey import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow -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 @@ -17,14 +15,11 @@ import uk.gov.onelogin.criorchestrator.libraries.di.CriOrchestratorScope class TypesOfPhotoIDViewModel( private val analytics: SelectDocAnalytics, earliestAcceptableDrivingLicenceExpiryDate: EarliestAcceptableDrivingLicenceExpiryDate, - configStore: ConfigStore, ) : ViewModel() { private val _state = MutableStateFlow( TypesOfPhotoIDState( earliestExpiryDate = earliestAcceptableDrivingLicenceExpiryDate(), - enableExpiredDrivingLicences = - configStore.readSingle(SdkConfigKey.EnableExpiredDrivingLicences).value, ), ) val state: StateFlow = _state diff --git a/features/select-doc/internal/src/test/kotlin/uk/gov/onelogin/criorchestrator/features/selectdoc/internal/drivinglicence/confirm/ConfirmDrivingLicenceScreenAnalyticsTest.kt b/features/select-doc/internal/src/test/kotlin/uk/gov/onelogin/criorchestrator/features/selectdoc/internal/drivinglicence/confirm/ConfirmDrivingLicenceScreenAnalyticsTest.kt index 028192976..67e552abd 100644 --- a/features/select-doc/internal/src/test/kotlin/uk/gov/onelogin/criorchestrator/features/selectdoc/internal/drivinglicence/confirm/ConfirmDrivingLicenceScreenAnalyticsTest.kt +++ b/features/select-doc/internal/src/test/kotlin/uk/gov/onelogin/criorchestrator/features/selectdoc/internal/drivinglicence/confirm/ConfirmDrivingLicenceScreenAnalyticsTest.kt @@ -14,7 +14,6 @@ import org.junit.runner.RunWith import uk.gov.logging.api.v3dot1.logger.asLegacyEvent import uk.gov.logging.api.v3dot1.model.TrackEvent import uk.gov.logging.api.v3dot1.model.ViewEvent -import uk.gov.onelogin.criorchestrator.features.config.internalapi.FakeConfigStore import uk.gov.onelogin.criorchestrator.features.selectdoc.internal.R import uk.gov.onelogin.criorchestrator.features.selectdoc.internal.analytics.SelectDocAnalytics import uk.gov.onelogin.criorchestrator.features.selectdoc.internal.analytics.SelectDocScreenId @@ -55,7 +54,6 @@ class ConfirmDrivingLicenceScreenAnalyticsTest { ConfirmDrivingLicenceViewModel( analytics = analytics, earliestAcceptableExpiryDate = earliestAcceptableExpiryDate, - configStore = FakeConfigStore(), ) @Test diff --git a/features/select-doc/internal/src/test/kotlin/uk/gov/onelogin/criorchestrator/features/selectdoc/internal/drivinglicence/confirm/ConfirmDrivingLicenceScreenTest.kt b/features/select-doc/internal/src/test/kotlin/uk/gov/onelogin/criorchestrator/features/selectdoc/internal/drivinglicence/confirm/ConfirmDrivingLicenceScreenTest.kt index 2055fc233..b56e57424 100644 --- a/features/select-doc/internal/src/test/kotlin/uk/gov/onelogin/criorchestrator/features/selectdoc/internal/drivinglicence/confirm/ConfirmDrivingLicenceScreenTest.kt +++ b/features/select-doc/internal/src/test/kotlin/uk/gov/onelogin/criorchestrator/features/selectdoc/internal/drivinglicence/confirm/ConfirmDrivingLicenceScreenTest.kt @@ -17,7 +17,6 @@ import org.junit.runner.RunWith import org.mockito.Mockito.mock import org.mockito.Mockito.spy import org.mockito.kotlin.verify -import uk.gov.onelogin.criorchestrator.features.config.internalapi.FakeConfigStore import uk.gov.onelogin.criorchestrator.features.idcheckwrapper.internalapi.DocumentVariety import uk.gov.onelogin.criorchestrator.features.idcheckwrapper.internalapi.nav.IdCheckWrapperDestinations import uk.gov.onelogin.criorchestrator.features.selectdoc.internal.R @@ -42,7 +41,6 @@ class ConfirmDrivingLicenceScreenTest { ConfirmDrivingLicenceViewModel( analytics = mock(), earliestAcceptableExpiryDate = earliestAcceptableExpiryDate, - configStore = FakeConfigStore(), ), ) diff --git a/features/select-doc/internal/src/test/kotlin/uk/gov/onelogin/criorchestrator/features/selectdoc/internal/drivinglicence/confirm/ConfirmDrivingLicenceViewModelTest.kt b/features/select-doc/internal/src/test/kotlin/uk/gov/onelogin/criorchestrator/features/selectdoc/internal/drivinglicence/confirm/ConfirmDrivingLicenceViewModelTest.kt index 48f1a57cd..564edddb5 100644 --- a/features/select-doc/internal/src/test/kotlin/uk/gov/onelogin/criorchestrator/features/selectdoc/internal/drivinglicence/confirm/ConfirmDrivingLicenceViewModelTest.kt +++ b/features/select-doc/internal/src/test/kotlin/uk/gov/onelogin/criorchestrator/features/selectdoc/internal/drivinglicence/confirm/ConfirmDrivingLicenceViewModelTest.kt @@ -7,9 +7,6 @@ import org.junit.jupiter.api.Test import org.junit.jupiter.api.extension.ExtendWith import org.mockito.kotlin.mock import org.mockito.kotlin.verify -import uk.gov.onelogin.criorchestrator.features.config.internalapi.FakeConfigStore -import uk.gov.onelogin.criorchestrator.features.config.publicapi.Config -import uk.gov.onelogin.criorchestrator.features.config.publicapi.SdkConfigKey import uk.gov.onelogin.criorchestrator.features.selectdoc.internal.R import uk.gov.onelogin.criorchestrator.features.selectdoc.internal.analytics.SelectDocAnalytics import uk.gov.onelogin.criorchestrator.features.selectdoc.internal.analytics.SelectDocScreenId @@ -22,13 +19,10 @@ import java.time.LocalDate class ConfirmDrivingLicenceViewModelTest { private val analyticsLogger = mock() private val earliestAcceptableExpiryDate = EarliestAcceptableDrivingLicenceExpiryDate(testClock()) - private val configStore = FakeConfigStore() - private val viewModel by lazy { ConfirmDrivingLicenceViewModel( analytics = analyticsLogger, earliestAcceptableExpiryDate = earliestAcceptableExpiryDate, - configStore = configStore, ) } @@ -39,27 +33,6 @@ class ConfirmDrivingLicenceViewModelTest { assertEquals( ConfirmDrivingLicenceState( earliestExpiryDate = LocalDate.of(2025, 12, 26), - enableExpiredDrivingLicences = true, - ), - awaitItem(), - ) - } - } - - fun `given expired driving licences disabled, it emits an initial state`() = - runTest { - configStore.write( - Config.Entry( - key = SdkConfigKey.EnableExpiredDrivingLicences, - value = Config.Value.BooleanValue(false), - ), - ) - - viewModel.state.test { - assertEquals( - ConfirmDrivingLicenceState( - earliestExpiryDate = LocalDate.of(2025, 12, 26), - enableExpiredDrivingLicences = false, ), awaitItem(), ) diff --git a/features/select-doc/internal/src/test/kotlin/uk/gov/onelogin/criorchestrator/features/selectdoc/internal/drivinglicence/select/SelectDrivingLicenceAnalyticsTest.kt b/features/select-doc/internal/src/test/kotlin/uk/gov/onelogin/criorchestrator/features/selectdoc/internal/drivinglicence/select/SelectDrivingLicenceAnalyticsTest.kt index 029831bd1..8e321f0f1 100644 --- a/features/select-doc/internal/src/test/kotlin/uk/gov/onelogin/criorchestrator/features/selectdoc/internal/drivinglicence/select/SelectDrivingLicenceAnalyticsTest.kt +++ b/features/select-doc/internal/src/test/kotlin/uk/gov/onelogin/criorchestrator/features/selectdoc/internal/drivinglicence/select/SelectDrivingLicenceAnalyticsTest.kt @@ -18,7 +18,6 @@ import org.mockito.kotlin.mock import uk.gov.logging.api.v3dot1.logger.asLegacyEvent import uk.gov.logging.api.v3dot1.model.TrackEvent import uk.gov.logging.api.v3dot1.model.ViewEvent -import uk.gov.onelogin.criorchestrator.features.config.internalapi.FakeConfigStore import uk.gov.onelogin.criorchestrator.features.idcheckwrapper.internalapi.nfc.NfcChecker import uk.gov.onelogin.criorchestrator.features.selectdoc.internal.R import uk.gov.onelogin.criorchestrator.features.selectdoc.internal.analytics.SelectDocAnalytics @@ -65,7 +64,6 @@ class SelectDrivingLicenceAnalyticsTest { analytics = analytics, nfcChecker = nfcChecker, earliestAcceptableExpiryDate = earliestAcceptableExpiryDate, - configStore = FakeConfigStore(), ), ) } diff --git a/features/select-doc/internal/src/test/kotlin/uk/gov/onelogin/criorchestrator/features/selectdoc/internal/drivinglicence/select/SelectDrivingLicenceScreenTest.kt b/features/select-doc/internal/src/test/kotlin/uk/gov/onelogin/criorchestrator/features/selectdoc/internal/drivinglicence/select/SelectDrivingLicenceScreenTest.kt index a004903e8..c04886bba 100644 --- a/features/select-doc/internal/src/test/kotlin/uk/gov/onelogin/criorchestrator/features/selectdoc/internal/drivinglicence/select/SelectDrivingLicenceScreenTest.kt +++ b/features/select-doc/internal/src/test/kotlin/uk/gov/onelogin/criorchestrator/features/selectdoc/internal/drivinglicence/select/SelectDrivingLicenceScreenTest.kt @@ -27,7 +27,6 @@ import org.mockito.kotlin.mock import org.mockito.kotlin.never import org.mockito.kotlin.verify import org.mockito.kotlin.verifyNoInteractions -import uk.gov.onelogin.criorchestrator.features.config.internalapi.FakeConfigStore import uk.gov.onelogin.criorchestrator.features.idcheckwrapper.internalapi.nfc.NfcChecker import uk.gov.onelogin.criorchestrator.features.selectdoc.internal.R import uk.gov.onelogin.criorchestrator.features.selectdoc.internal.drivinglicence.expiry.EarliestAcceptableDrivingLicenceExpiryDate @@ -55,7 +54,6 @@ class SelectDrivingLicenceScreenTest { analytics = mock(), nfcChecker = nfcChecker, earliestAcceptableExpiryDate = earliestAcceptableExpiryDate, - configStore = FakeConfigStore(), ), ) } diff --git a/features/select-doc/internal/src/test/kotlin/uk/gov/onelogin/criorchestrator/features/selectdoc/internal/drivinglicence/select/SelectDrivingLicenceViewModelTest.kt b/features/select-doc/internal/src/test/kotlin/uk/gov/onelogin/criorchestrator/features/selectdoc/internal/drivinglicence/select/SelectDrivingLicenceViewModelTest.kt index 8e2915e0e..4f1374315 100644 --- a/features/select-doc/internal/src/test/kotlin/uk/gov/onelogin/criorchestrator/features/selectdoc/internal/drivinglicence/select/SelectDrivingLicenceViewModelTest.kt +++ b/features/select-doc/internal/src/test/kotlin/uk/gov/onelogin/criorchestrator/features/selectdoc/internal/drivinglicence/select/SelectDrivingLicenceViewModelTest.kt @@ -11,9 +11,6 @@ import org.junit.jupiter.params.provider.ValueSource import org.mockito.kotlin.given import org.mockito.kotlin.mock import org.mockito.kotlin.verify -import uk.gov.onelogin.criorchestrator.features.config.internalapi.FakeConfigStore -import uk.gov.onelogin.criorchestrator.features.config.publicapi.Config -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.R import uk.gov.onelogin.criorchestrator.features.selectdoc.internal.analytics.SelectDocAnalytics @@ -28,14 +25,11 @@ class SelectDrivingLicenceViewModelTest { private val analyticsLogger: SelectDocAnalytics = mock() private val nfcChecker = mock() private val earliestAcceptableExpiryDate = EarliestAcceptableDrivingLicenceExpiryDate(testClock()) - private val configStore = FakeConfigStore() - private val viewModel by lazy { SelectDrivingLicenceViewModel( analytics = analyticsLogger, nfcChecker = nfcChecker, earliestAcceptableExpiryDate = earliestAcceptableExpiryDate, - configStore = configStore, ) } @@ -52,28 +46,6 @@ class SelectDrivingLicenceViewModelTest { SelectDrivingLicenseState( displayReadMoreButton = false, earliestExpiryDate = LocalDate.of(2025, 12, 26), - enableExpiredDrivingLicences = true, - ), - awaitItem(), - ) - } - } - - @Test - fun `given expired driving licences are disabled, it emits the initial state`() = - runTest { - configStore.write( - Config.Entry( - key = SdkConfigKey.EnableExpiredDrivingLicences, - value = Config.Value.BooleanValue(false), - ), - ) - viewModel.state.test { - assertEquals( - SelectDrivingLicenseState( - displayReadMoreButton = false, - earliestExpiryDate = LocalDate.of(2025, 12, 26), - enableExpiredDrivingLicences = false, ), awaitItem(), ) diff --git a/features/select-doc/internal/src/test/kotlin/uk/gov/onelogin/criorchestrator/features/selectdoc/internal/photoid/TypesOfPhotoIDScreenAnalyticsTest.kt b/features/select-doc/internal/src/test/kotlin/uk/gov/onelogin/criorchestrator/features/selectdoc/internal/photoid/TypesOfPhotoIDScreenAnalyticsTest.kt index d17ab9c51..d81a80d15 100644 --- a/features/select-doc/internal/src/test/kotlin/uk/gov/onelogin/criorchestrator/features/selectdoc/internal/photoid/TypesOfPhotoIDScreenAnalyticsTest.kt +++ b/features/select-doc/internal/src/test/kotlin/uk/gov/onelogin/criorchestrator/features/selectdoc/internal/photoid/TypesOfPhotoIDScreenAnalyticsTest.kt @@ -10,7 +10,6 @@ import org.junit.Test import org.junit.runner.RunWith import uk.gov.logging.api.v3dot1.logger.asLegacyEvent import uk.gov.logging.api.v3dot1.model.ViewEvent -import uk.gov.onelogin.criorchestrator.features.config.internalapi.FakeConfigStore import uk.gov.onelogin.criorchestrator.features.selectdoc.internal.R import uk.gov.onelogin.criorchestrator.features.selectdoc.internal.analytics.SelectDocAnalytics import uk.gov.onelogin.criorchestrator.features.selectdoc.internal.analytics.SelectDocScreenId @@ -48,7 +47,6 @@ class TypesOfPhotoIDScreenAnalyticsTest { TypesOfPhotoIDViewModel( analytics = analytics, earliestAcceptableDrivingLicenceExpiryDate = earliestAcceptableDrivingLicenceExpiryDate, - configStore = FakeConfigStore(), ) @Before diff --git a/features/select-doc/internal/src/test/kotlin/uk/gov/onelogin/criorchestrator/features/selectdoc/internal/photoid/TypesOfPhotoIDScreenTest.kt b/features/select-doc/internal/src/test/kotlin/uk/gov/onelogin/criorchestrator/features/selectdoc/internal/photoid/TypesOfPhotoIDScreenTest.kt index 179e06c10..4a9ccac73 100644 --- a/features/select-doc/internal/src/test/kotlin/uk/gov/onelogin/criorchestrator/features/selectdoc/internal/photoid/TypesOfPhotoIDScreenTest.kt +++ b/features/select-doc/internal/src/test/kotlin/uk/gov/onelogin/criorchestrator/features/selectdoc/internal/photoid/TypesOfPhotoIDScreenTest.kt @@ -14,7 +14,6 @@ import org.junit.Test import org.junit.runner.RunWith import org.mockito.Mockito.mock import org.mockito.Mockito.spy -import uk.gov.onelogin.criorchestrator.features.config.internalapi.FakeConfigStore import uk.gov.onelogin.criorchestrator.features.selectdoc.internal.R import uk.gov.onelogin.criorchestrator.features.selectdoc.internal.drivinglicence.expiry.EarliestAcceptableDrivingLicenceExpiryDate import uk.gov.onelogin.criorchestrator.libraries.testing.time.testClock @@ -35,7 +34,6 @@ class TypesOfPhotoIDScreenTest { TypesOfPhotoIDViewModel( analytics = mock(), earliestAcceptableDrivingLicenceExpiryDate = earliestAcceptableDrivingLicenceExpiryDate, - configStore = FakeConfigStore(), ), ) diff --git a/features/select-doc/internal/src/test/kotlin/uk/gov/onelogin/criorchestrator/features/selectdoc/internal/photoid/TypesOfPhotoIDViewModelTest.kt b/features/select-doc/internal/src/test/kotlin/uk/gov/onelogin/criorchestrator/features/selectdoc/internal/photoid/TypesOfPhotoIDViewModelTest.kt index bac27f141..271967a1b 100644 --- a/features/select-doc/internal/src/test/kotlin/uk/gov/onelogin/criorchestrator/features/selectdoc/internal/photoid/TypesOfPhotoIDViewModelTest.kt +++ b/features/select-doc/internal/src/test/kotlin/uk/gov/onelogin/criorchestrator/features/selectdoc/internal/photoid/TypesOfPhotoIDViewModelTest.kt @@ -6,9 +6,6 @@ import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Test import org.junit.jupiter.api.extension.ExtendWith import org.mockito.kotlin.mock -import uk.gov.onelogin.criorchestrator.features.config.internalapi.FakeConfigStore -import uk.gov.onelogin.criorchestrator.features.config.publicapi.Config -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.drivinglicence.expiry.EarliestAcceptableDrivingLicenceExpiryDate import uk.gov.onelogin.criorchestrator.libraries.testing.MainDispatcherExtension @@ -19,13 +16,10 @@ import java.time.LocalDate class TypesOfPhotoIDViewModelTest { private val analyticsLogger = mock() private val earliestAcceptableExpiryDate = EarliestAcceptableDrivingLicenceExpiryDate(testClock()) - - private val configStore = FakeConfigStore() private val viewModel by lazy { TypesOfPhotoIDViewModel( analytics = analyticsLogger, earliestAcceptableDrivingLicenceExpiryDate = earliestAcceptableExpiryDate, - configStore = configStore, ) } @@ -36,27 +30,6 @@ class TypesOfPhotoIDViewModelTest { assertEquals( TypesOfPhotoIDState( earliestExpiryDate = LocalDate.of(2025, 12, 26), - enableExpiredDrivingLicences = true, - ), - awaitItem(), - ) - } - } - - @Test - fun `given expired driving licences are disabled, it emits the initial state`() = - runTest { - configStore.write( - Config.Entry( - key = SdkConfigKey.EnableExpiredDrivingLicences, - value = Config.Value.BooleanValue(false), - ), - ) - viewModel.state.test { - assertEquals( - TypesOfPhotoIDState( - earliestExpiryDate = LocalDate.of(2025, 12, 26), - enableExpiredDrivingLicences = false, ), awaitItem(), ) diff --git a/features/select-doc/internal/src/test/snapshots/images/features.selectdoc.internal.drivinglicence.confirm_ConfirmDrivingLicenceScreenKt_PreviewConfirmDrivingLicenceScreenNoExpired_Dark_NIGHT.png b/features/select-doc/internal/src/test/snapshots/images/features.selectdoc.internal.drivinglicence.confirm_ConfirmDrivingLicenceScreenKt_PreviewConfirmDrivingLicenceScreenNoExpired_Dark_NIGHT.png index 05f7d24dc..1e3831780 100644 --- a/features/select-doc/internal/src/test/snapshots/images/features.selectdoc.internal.drivinglicence.confirm_ConfirmDrivingLicenceScreenKt_PreviewConfirmDrivingLicenceScreenNoExpired_Dark_NIGHT.png +++ b/features/select-doc/internal/src/test/snapshots/images/features.selectdoc.internal.drivinglicence.confirm_ConfirmDrivingLicenceScreenKt_PreviewConfirmDrivingLicenceScreenNoExpired_Dark_NIGHT.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bb610bc7da5ff279241b08ccd4d54eb0e2811d01f68bb00f2ca486880e96701f -size 61003 +oid sha256:605ed34101fcf951625f175bd792215de98c437d78b627647a2834e4b04cb9d0 +size 73673 diff --git a/features/select-doc/internal/src/test/snapshots/images/features.selectdoc.internal.drivinglicence.confirm_ConfirmDrivingLicenceScreenKt_PreviewConfirmDrivingLicenceScreenNoExpired_Light.png b/features/select-doc/internal/src/test/snapshots/images/features.selectdoc.internal.drivinglicence.confirm_ConfirmDrivingLicenceScreenKt_PreviewConfirmDrivingLicenceScreenNoExpired_Light.png index a0e974c45..bd63c55b0 100644 --- a/features/select-doc/internal/src/test/snapshots/images/features.selectdoc.internal.drivinglicence.confirm_ConfirmDrivingLicenceScreenKt_PreviewConfirmDrivingLicenceScreenNoExpired_Light.png +++ b/features/select-doc/internal/src/test/snapshots/images/features.selectdoc.internal.drivinglicence.confirm_ConfirmDrivingLicenceScreenKt_PreviewConfirmDrivingLicenceScreenNoExpired_Light.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7e7d36f944ca3228bd37b8addb7505b4a20698ab1fca28421f448bf4cd0c18e8 -size 60918 +oid sha256:8a74b67c5d9bf65b1176c3cf99d8ccd48f7ef43ebfceaf727373337f2b6c8bfa +size 73437 diff --git a/features/select-doc/internal/src/test/snapshots/images/features.selectdoc.internal.drivinglicence.confirm_ConfirmDrivingLicenceScreenKt_PreviewConfirmDrivingLicenceScreenNoExpired_cy.png b/features/select-doc/internal/src/test/snapshots/images/features.selectdoc.internal.drivinglicence.confirm_ConfirmDrivingLicenceScreenKt_PreviewConfirmDrivingLicenceScreenNoExpired_cy.png index 83debc9ee..ca4bc2fc1 100644 --- a/features/select-doc/internal/src/test/snapshots/images/features.selectdoc.internal.drivinglicence.confirm_ConfirmDrivingLicenceScreenKt_PreviewConfirmDrivingLicenceScreenNoExpired_cy.png +++ b/features/select-doc/internal/src/test/snapshots/images/features.selectdoc.internal.drivinglicence.confirm_ConfirmDrivingLicenceScreenKt_PreviewConfirmDrivingLicenceScreenNoExpired_cy.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cc3e3f8e4178bba88946736e636771356459ec59f6f15e495940010cf33388b3 -size 64625 +oid sha256:41ddf9ad10c017964f91f16e9957d407e1c080e1b6b32b82fe860cb09aa4025f +size 80696 diff --git a/features/select-doc/internal/src/test/snapshots/images/features.selectdoc.internal.drivinglicence.select_SelectDrivingLicenceScreenKt_PreviewDrivingLicenceSelectionScreenNoExpired_Dark_NIGHT.png b/features/select-doc/internal/src/test/snapshots/images/features.selectdoc.internal.drivinglicence.select_SelectDrivingLicenceScreenKt_PreviewDrivingLicenceSelectionScreenNoExpired_Dark_NIGHT.png index 05dea77d1..78d62f47e 100644 --- a/features/select-doc/internal/src/test/snapshots/images/features.selectdoc.internal.drivinglicence.select_SelectDrivingLicenceScreenKt_PreviewDrivingLicenceSelectionScreenNoExpired_Dark_NIGHT.png +++ b/features/select-doc/internal/src/test/snapshots/images/features.selectdoc.internal.drivinglicence.select_SelectDrivingLicenceScreenKt_PreviewDrivingLicenceSelectionScreenNoExpired_Dark_NIGHT.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:df5d42782a6a20e539c8b57a177363cb4681da5ab14a34658f1e9b47940f4361 -size 56782 +oid sha256:9a96395a0f2920cdefea01003a062eb7f2d50a90ac3698f19bea51fc06c555be +size 62924 diff --git a/features/select-doc/internal/src/test/snapshots/images/features.selectdoc.internal.drivinglicence.select_SelectDrivingLicenceScreenKt_PreviewDrivingLicenceSelectionScreenNoExpired_Light.png b/features/select-doc/internal/src/test/snapshots/images/features.selectdoc.internal.drivinglicence.select_SelectDrivingLicenceScreenKt_PreviewDrivingLicenceSelectionScreenNoExpired_Light.png index b1108fbda..8205ac42c 100644 --- a/features/select-doc/internal/src/test/snapshots/images/features.selectdoc.internal.drivinglicence.select_SelectDrivingLicenceScreenKt_PreviewDrivingLicenceSelectionScreenNoExpired_Light.png +++ b/features/select-doc/internal/src/test/snapshots/images/features.selectdoc.internal.drivinglicence.select_SelectDrivingLicenceScreenKt_PreviewDrivingLicenceSelectionScreenNoExpired_Light.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1e42a4d151dbdd33cb9877bd75f0cb3e01346e665757ddeb29a19e009103e44e -size 57007 +oid sha256:e6bcf04875177ab11b8780e9e88aafaf40f3ec4dfcdfe738bc3648e4b2ec780f +size 63222 diff --git a/features/select-doc/internal/src/test/snapshots/images/features.selectdoc.internal.drivinglicence.select_SelectDrivingLicenceScreenKt_PreviewDrivingLicenceSelectionScreenNoExpired_cy.png b/features/select-doc/internal/src/test/snapshots/images/features.selectdoc.internal.drivinglicence.select_SelectDrivingLicenceScreenKt_PreviewDrivingLicenceSelectionScreenNoExpired_cy.png index cfb235bc0..ab1fe5a57 100644 --- a/features/select-doc/internal/src/test/snapshots/images/features.selectdoc.internal.drivinglicence.select_SelectDrivingLicenceScreenKt_PreviewDrivingLicenceSelectionScreenNoExpired_cy.png +++ b/features/select-doc/internal/src/test/snapshots/images/features.selectdoc.internal.drivinglicence.select_SelectDrivingLicenceScreenKt_PreviewDrivingLicenceSelectionScreenNoExpired_cy.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f99f1ec0eadd908e80e2a3e6f5065d6f2dbb2ab74f5df28e2df16d73c989ee8f -size 63293 +oid sha256:537c24e41b13772cbd31be5d943ac7876200136eefb92ed26effef8c5e7d1b10 +size 71688 diff --git a/features/select-doc/internal/src/test/snapshots/images/features.selectdoc.internal.photoid_TypesOfPhotoIDScreenKt_PreviewTypesOfPhotoIDScreenNoExpired_H1700dp.png b/features/select-doc/internal/src/test/snapshots/images/features.selectdoc.internal.photoid_TypesOfPhotoIDScreenKt_PreviewTypesOfPhotoIDScreenNoExpired_H1700dp.png index 2052eba7d..334a9465c 100644 --- a/features/select-doc/internal/src/test/snapshots/images/features.selectdoc.internal.photoid_TypesOfPhotoIDScreenKt_PreviewTypesOfPhotoIDScreenNoExpired_H1700dp.png +++ b/features/select-doc/internal/src/test/snapshots/images/features.selectdoc.internal.photoid_TypesOfPhotoIDScreenKt_PreviewTypesOfPhotoIDScreenNoExpired_H1700dp.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3ad304e35fe1cf96cb4d6c27891124ed1c8ba4abe85b7199e836a0a477008a2f -size 62549 +oid sha256:577da298d55e2bd14b16f2dbc72561f9234dd4dac04fbc4aa48b99ee4b532338 +size 67094 diff --git a/features/select-doc/internal/src/test/snapshots/images/features.selectdoc.internal.photoid_TypesOfPhotoIDScreenKt_PreviewTypesOfPhotoIDScreenNoExpired_H1700dp_NIGHT.png b/features/select-doc/internal/src/test/snapshots/images/features.selectdoc.internal.photoid_TypesOfPhotoIDScreenKt_PreviewTypesOfPhotoIDScreenNoExpired_H1700dp_NIGHT.png index 588f7f1d7..51c363371 100644 --- a/features/select-doc/internal/src/test/snapshots/images/features.selectdoc.internal.photoid_TypesOfPhotoIDScreenKt_PreviewTypesOfPhotoIDScreenNoExpired_H1700dp_NIGHT.png +++ b/features/select-doc/internal/src/test/snapshots/images/features.selectdoc.internal.photoid_TypesOfPhotoIDScreenKt_PreviewTypesOfPhotoIDScreenNoExpired_H1700dp_NIGHT.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4f4788073f8548273d2a696a17a4ab755d76b784569d66d26a6de130be2a6c61 -size 63416 +oid sha256:e0cdfa65daa6c4c516a5b9e895e3edfa2fc4e42b071999188576afa752be4362 +size 68085 diff --git a/features/select-doc/internal/src/test/snapshots/images/features.selectdoc.internal.photoid_TypesOfPhotoIDScreenKt_PreviewTypesOfPhotoIDScreenNoExpired_H1700dp_cy.png b/features/select-doc/internal/src/test/snapshots/images/features.selectdoc.internal.photoid_TypesOfPhotoIDScreenKt_PreviewTypesOfPhotoIDScreenNoExpired_H1700dp_cy.png index cf6e33d80..25d314200 100644 --- a/features/select-doc/internal/src/test/snapshots/images/features.selectdoc.internal.photoid_TypesOfPhotoIDScreenKt_PreviewTypesOfPhotoIDScreenNoExpired_H1700dp_cy.png +++ b/features/select-doc/internal/src/test/snapshots/images/features.selectdoc.internal.photoid_TypesOfPhotoIDScreenKt_PreviewTypesOfPhotoIDScreenNoExpired_H1700dp_cy.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2acc7380d8836f0af3d319b80542a324e1dc9a937f64626dade5d8e95a0b3833 -size 69619 +oid sha256:2157bcbd489c4c2b58b14c3f426749b641e3901e869c8520b933b642c9409051 +size 75160 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index ea8ca3899..bbd97c875 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -34,7 +34,7 @@ turbine = "1.2.1" uk-gov-logging = "0.39.15" # https://github.com/orgs/govuk-one-login/packages?repo_name=mobile-android-logging uk-gov-networking = "0.11.0" uk-gov-ui = "16.7.0" -gov-uk-idcheck = "0.39.1" # https://github.com/govuk-one-login/mobile-id-check-android-sdk/releases +gov-uk-idcheck = "0.40.0" # https://github.com/govuk-one-login/mobile-id-check-android-sdk/releases [libraries] android-build-tool = { group = "com.android.tools.build", name = "gradle", version.ref = "agp" } diff --git a/sdk/internal/src/main/kotlin/uk/gov/onelogin/criorchestrator/sdk/internal/config/DefaultConfig.kt b/sdk/internal/src/main/kotlin/uk/gov/onelogin/criorchestrator/sdk/internal/config/DefaultConfig.kt index 585ad54a7..37518e882 100644 --- a/sdk/internal/src/main/kotlin/uk/gov/onelogin/criorchestrator/sdk/internal/config/DefaultConfig.kt +++ b/sdk/internal/src/main/kotlin/uk/gov/onelogin/criorchestrator/sdk/internal/config/DefaultConfig.kt @@ -38,10 +38,6 @@ private val defaultConfig = key = NfcConfigKey.NfcAvailability, Config.Value.StringValue(NfcConfigKey.NfcAvailability.OPTION_DEVICE), ), - Config.Entry( - key = SdkConfigKey.EnableExpiredDrivingLicences, - Config.Value.BooleanValue(true), - ), ), ) diff --git a/sdk/internal/src/test/kotlin/uk/gov/onelogin/criorchestrator/sdk/internal/CriOrchestratorSingletonImplTest.kt b/sdk/internal/src/test/kotlin/uk/gov/onelogin/criorchestrator/sdk/internal/CriOrchestratorSingletonImplTest.kt index 3cf4c4ba7..07f041bee 100644 --- a/sdk/internal/src/test/kotlin/uk/gov/onelogin/criorchestrator/sdk/internal/CriOrchestratorSingletonImplTest.kt +++ b/sdk/internal/src/test/kotlin/uk/gov/onelogin/criorchestrator/sdk/internal/CriOrchestratorSingletonImplTest.kt @@ -78,10 +78,6 @@ class CriOrchestratorSingletonImplTest { key = NfcConfigKey.NfcAvailability, Config.Value.StringValue(NfcConfigKey.NfcAvailability.OPTION_DEVICE), ), - Config.Entry( - key = SdkConfigKey.EnableExpiredDrivingLicences, - Config.Value.BooleanValue(true), - ), customEntry, ), ),