From e30e0ffbb4401ddbb72b20ea5720fff58958d5a4 Mon Sep 17 00:00:00 2001 From: aj-rosado <109146700+aj-rosado@users.noreply.github.com> Date: Fri, 15 Aug 2025 17:05:37 +0100 Subject: [PATCH] [PM-23723] Fix close and cancel text on Match detection dialogs (#5707) --- .../bitwarden/ui/vault/feature/addedit/VaultAddEditUriItem.kt | 4 ++-- .../ui/vault/feature/addedit/VaultAddEditScreenTest.kt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditUriItem.kt b/app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditUriItem.kt index ffe0682a8f..af8ce01a44 100644 --- a/app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditUriItem.kt +++ b/app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditUriItem.kt @@ -216,7 +216,7 @@ private fun AdvancedMatchDetectionWarning( formatArgs = arrayOf(nameOfSelectedMatchDisplayType), ), confirmButtonText = stringResource(id = BitwardenString.yes), - dismissButtonText = stringResource(id = BitwardenString.close), + dismissButtonText = stringResource(id = BitwardenString.cancel), onConfirmClick = onDialogConfirm, onDismissClick = onDialogDismiss, onDismissRequest = onDialogDismiss, @@ -243,7 +243,7 @@ private fun LearnMoreAboutMatchDetectionDialog( ), ), confirmButtonText = stringResource(id = BitwardenString.learn_more), - dismissButtonText = stringResource(id = BitwardenString.cancel), + dismissButtonText = stringResource(id = BitwardenString.close), onConfirmClick = onDialogConfirm, onDismissClick = onDialogDismiss, onDismissRequest = onDialogDismiss, diff --git a/app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditScreenTest.kt b/app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditScreenTest.kt index cd268081e0..f4a9e4b4d1 100644 --- a/app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditScreenTest.kt +++ b/app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditScreenTest.kt @@ -1556,7 +1556,7 @@ class VaultAddEditScreenTest : BitwardenComposeTest() { .performClick() composeTestRule - .onAllNodesWithText("Close") + .onAllNodesWithText("Cancel") .filterToOne(hasAnyAncestor(isDialog())) .performClick()