Skip to content

Commit

Permalink
PM-14621 update the copy for step three instruction and cta button (#…
Browse files Browse the repository at this point in the history
  • Loading branch information
dseverns-livefront authored Nov 8, 2024
1 parent 7ccba88 commit b76f720
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -460,6 +460,7 @@ private fun ImportLoginsStepThreeContent(
),
),
onBackClick = onBackClick,
ctaText = stringResource(R.string.done_text),
onContinueClick = onContinueClick,
onHelpClick = onHelpClick,
modifier = modifier,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ import kotlinx.collections.immutable.persistentListOf
fun ImportLoginsInstructionStep(
stepText: String,
stepTitle: String,
ctaText: String = stringResource(R.string.continue_text),
instructions: ImmutableList<InstructionStep>,
onBackClick: () -> Unit,
onContinueClick: () -> Unit,
Expand Down Expand Up @@ -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()
Expand Down
3 changes: 2 additions & 1 deletion app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1035,7 +1035,7 @@ Do you want to switch to this account?</string>
<string name="log_in_to_your_current_browser_or_password_manager_highlight">log in to your current browser or password manager.</string>
<string name="export_your_passwords_this_option_is_usually_found_in_your_settings">Export your passwords. This option is usually found in your settings.</string>
<string name="export_your_passwords_highlight">Export your passwords.</string>
<string name="select_import_data_in_the_web_app_then_done_to_finish_syncing">Select Import data in the web app, then Done to finish syncing.</string>
<string name="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.</string>
<string name="select_import_data_highlight">Select Import data</string>
<string name="step_1_of_3">Step 1 of 3</string>
<string name="export_your_saved_logins">Export your saved logins</string>
Expand Down Expand Up @@ -1086,4 +1086,5 @@ Do you want to switch to this account?</string>
<string name="log_in_quickly_and_easily_across_devices">Log in quickly and easily across devices</string>
<string name="bitwarden_can_notify_you_each_time_you_receive_a_new_login_request_from_another_device">Bitwarden can notify you each time you receive a new login request from another device.</string>
<string name="skip_for_now">Skip for now</string>
<string name="done_text">Done</string>
</resources>
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,7 @@ class ImportLoginsScreenTest : BaseComposeTest() {
.performClick()
verifyActionSent(ImportLoginsAction.MoveToStepTwo)
composeTestRule
.onNodeWithText("Continue")
.onNodeWithText("Done")
.performClick()
verifyActionSent(ImportLoginsAction.MoveToSyncInProgress)
}
Expand Down

0 comments on commit b76f720

Please sign in to comment.