From 889457ae9624d78fae83d6082ee6eb4877449600 Mon Sep 17 00:00:00 2001 From: Dave Severns <149429124+dseverns-livefront@users.noreply.github.com> Date: Mon, 16 Dec 2024 13:27:06 -0500 Subject: [PATCH] PM-15037 Correct the text for the confirm error dialog on import logins screen (#4478) --- .../ui/vault/feature/importlogins/ImportLoginsScreen.kt | 2 +- .../ui/vault/feature/importlogins/ImportLoginsScreenTest.kt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) 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 6e9faee301..a303fe9852 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 @@ -212,7 +212,7 @@ private fun ImportLoginsDialogContent( message = dialogState.message(), onDismissRequest = handler.onDismissDialog, confirmButtonText = stringResource(R.string.try_again), - dismissButtonText = stringResource(R.string.ok), + dismissButtonText = stringResource(R.string.import_logins_later), onConfirmClick = handler.onRetrySync, onDismissClick = handler.onFailedSyncAcknowledged, ) 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 1ecbcfd342..3428bf7be7 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 @@ -385,7 +385,7 @@ class ImportLoginsScreenTest : BaseComposeTest() { verifyActionSent(ImportLoginsAction.RetryVaultSync) composeTestRule - .onAllNodesWithText("Ok") + .onAllNodesWithText("Import logins later") .filterToOne(hasAnyAncestor(isDialog())) .assertIsDisplayed() .performClick() @@ -420,7 +420,7 @@ class ImportLoginsScreenTest : BaseComposeTest() { verifyActionSent(ImportLoginsAction.RetryVaultSync) composeTestRule - .onAllNodesWithText("Ok") + .onAllNodesWithText("Import logins later") .filterToOne(hasAnyAncestor(isDialog())) .assertIsDisplayed() .performClick()