diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/importlogins/ImportLoginsScreen.kt b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/importlogins/ImportLoginsScreen.kt index e41ddeae4..2f8ed1e3b 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/importlogins/ImportLoginsScreen.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/importlogins/ImportLoginsScreen.kt @@ -460,6 +460,7 @@ private fun ImportLoginsStepThreeContent( ), ), onBackClick = onBackClick, + ctaText = stringResource(R.string.done_text), onContinueClick = onContinueClick, onHelpClick = onHelpClick, modifier = modifier, diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/importlogins/components/ImportLoginsInstructionStep.kt b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/importlogins/components/ImportLoginsInstructionStep.kt index 3c846e1b1..ac60bd3e3 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/importlogins/components/ImportLoginsInstructionStep.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/importlogins/components/ImportLoginsInstructionStep.kt @@ -40,6 +40,7 @@ import kotlinx.collections.immutable.persistentListOf fun ImportLoginsInstructionStep( stepText: String, stepTitle: String, + ctaText: String = stringResource(R.string.continue_text), instructions: ImmutableList, onBackClick: () -> Unit, onContinueClick: () -> Unit, @@ -88,7 +89,7 @@ fun ImportLoginsInstructionStep( ) Spacer(Modifier.height(24.dp)) BitwardenFilledButton( - label = stringResource(R.string.continue_text), + label = ctaText, onClick = onContinueClick, modifier = Modifier .fillMaxWidth() diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index efd7faf15..934e4da65 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1035,7 +1035,7 @@ Do you want to switch to this account? log in to your current browser or password manager. Export your passwords. This option is usually found in your settings. Export your passwords. - Select Import data in the web app, then Done to finish syncing. + Select Import data in the web app, then Done below to finish syncing. Select Import data Step 1 of 3 Export your saved logins @@ -1086,4 +1086,5 @@ Do you want to switch to this account? Log in quickly and easily across devices Bitwarden can notify you each time you receive a new login request from another device. Skip for now + Done diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/importlogins/ImportLoginsScreenTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/importlogins/ImportLoginsScreenTest.kt index 344c1fbdc..1ecbcfd34 100644 --- a/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/importlogins/ImportLoginsScreenTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/importlogins/ImportLoginsScreenTest.kt @@ -332,7 +332,7 @@ class ImportLoginsScreenTest : BaseComposeTest() { .performClick() verifyActionSent(ImportLoginsAction.MoveToStepTwo) composeTestRule - .onNodeWithText("Continue") + .onNodeWithText("Done") .performClick() verifyActionSent(ImportLoginsAction.MoveToSyncInProgress) }