From 277e4d8d6f6fccb097bfc0d27bab033785c21e02 Mon Sep 17 00:00:00 2001 From: David Perez Date: Tue, 19 Aug 2025 16:27:17 -0500 Subject: [PATCH] PM-20198: Update generator modal 'Save' button to 'Apply' (#5745) --- .../ui/tools/feature/generator/GeneratorScreen.kt | 2 +- .../ui/tools/feature/generator/GeneratorScreenTest.kt | 8 ++++---- ui/src/main/res/values/strings.xml | 1 + 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/app/src/main/kotlin/com/x8bit/bitwarden/ui/tools/feature/generator/GeneratorScreen.kt b/app/src/main/kotlin/com/x8bit/bitwarden/ui/tools/feature/generator/GeneratorScreen.kt index 59d5f76325..b6fd017d6c 100644 --- a/app/src/main/kotlin/com/x8bit/bitwarden/ui/tools/feature/generator/GeneratorScreen.kt +++ b/app/src/main/kotlin/com/x8bit/bitwarden/ui/tools/feature/generator/GeneratorScreen.kt @@ -345,7 +345,7 @@ private fun ModalAppBar( }, actions = { BitwardenTextButton( - label = stringResource(id = BitwardenString.save), + label = stringResource(id = BitwardenString.apply), onClick = onSaveClick, modifier = Modifier.testTag("SaveButton"), ) diff --git a/app/src/test/kotlin/com/x8bit/bitwarden/ui/tools/feature/generator/GeneratorScreenTest.kt b/app/src/test/kotlin/com/x8bit/bitwarden/ui/tools/feature/generator/GeneratorScreenTest.kt index 093ca19317..7f37acbb50 100644 --- a/app/src/test/kotlin/com/x8bit/bitwarden/ui/tools/feature/generator/GeneratorScreenTest.kt +++ b/app/src/test/kotlin/com/x8bit/bitwarden/ui/tools/feature/generator/GeneratorScreenTest.kt @@ -87,7 +87,7 @@ class GeneratorScreenTest : BitwardenComposeTest() { .assertIsDisplayed() composeTestRule - .onNodeWithText(text = "Save") + .onNodeWithText(text = "Apply") .assertIsDisplayed() } @@ -104,7 +104,7 @@ class GeneratorScreenTest : BitwardenComposeTest() { .assertIsDisplayed() composeTestRule - .onNodeWithText(text = "Save") + .onNodeWithText(text = "Apply") .assertIsDisplayed() } @@ -126,7 +126,7 @@ class GeneratorScreenTest : BitwardenComposeTest() { } @Test - fun `on save click should send SaveClick`() { + fun `on Apply click should send SaveClick`() { updateState( DEFAULT_STATE.copy( generatorMode = GeneratorMode.Modal.Username(website = null), @@ -134,7 +134,7 @@ class GeneratorScreenTest : BitwardenComposeTest() { ) composeTestRule - .onNodeWithText(text = "Save") + .onNodeWithText(text = "Apply") .performClick() verify { diff --git a/ui/src/main/res/values/strings.xml b/ui/src/main/res/values/strings.xml index 6300734ec5..3b7924e27a 100644 --- a/ui/src/main/res/values/strings.xml +++ b/ui/src/main/res/values/strings.xml @@ -4,6 +4,7 @@ Add folder Add Item An error has occurred + Apply Back Bitwarden Cancel