From dc2d0e6f5c141d9802d3a656a6e22ad8a7400c7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Bispo?= Date: Wed, 22 Jul 2026 15:07:00 +0000 Subject: [PATCH] [PM-40638] feat: Rename "organization" to "vault" (#7192) --- .../feature/addedit/VaultAddEditScreen.kt | 2 +- .../ui/vault/feature/item/VaultItemScreen.kt | 2 +- .../VaultMoveToOrganizationContent.kt | 4 ++-- .../VaultMoveToOrganizationEmpty.kt | 2 +- .../VaultMoveToOrganizationViewModel.kt | 2 +- .../feature/addedit/VaultAddEditScreenTest.kt | 12 ++++++------ .../vault/feature/item/VaultItemScreenTest.kt | 12 ++++++------ .../VaultMoveToOrganizationScreenTest.kt | 19 +++++++++---------- ui/src/main/res/values/strings.xml | 6 +++--- 9 files changed, 30 insertions(+), 31 deletions(-) diff --git a/app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditScreen.kt b/app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditScreen.kt index c08c7c372f..9e358ec963 100644 --- a/app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditScreen.kt +++ b/app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditScreen.kt @@ -372,7 +372,7 @@ fun VaultAddEditScreen( .takeUnless { state.isAddItemMode }, OverflowMenuItemData( text = stringResource( - id = BitwardenString.move_to_organization, + id = BitwardenString.move_to_vault, ), onClick = { viewModel.trySendAction( diff --git a/app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemScreen.kt b/app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemScreen.kt index e6761082c6..0aaaa4d169 100644 --- a/app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemScreen.kt +++ b/app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemScreen.kt @@ -202,7 +202,7 @@ fun VaultItemScreen( ) .takeUnless { state.isCipherInCollection }, OverflowMenuItemData( - text = stringResource(id = BitwardenString.move_to_organization), + text = stringResource(id = BitwardenString.move_to_vault), onClick = { viewModel.trySendAction( VaultItemAction.Common.MoveToOrganizationClick, diff --git a/app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/movetoorganization/VaultMoveToOrganizationContent.kt b/app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/movetoorganization/VaultMoveToOrganizationContent.kt index fe6d58163f..7017efc94d 100644 --- a/app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/movetoorganization/VaultMoveToOrganizationContent.kt +++ b/app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/movetoorganization/VaultMoveToOrganizationContent.kt @@ -39,7 +39,7 @@ fun VaultMoveToOrganizationContent( if (!showOnlyCollections) { item { BitwardenMultiSelectButton( - label = stringResource(id = BitwardenString.organization), + label = stringResource(id = BitwardenString.vault), options = state .organizations .map { it.name } @@ -52,7 +52,7 @@ fun VaultMoveToOrganizationContent( .first { it.name == selectedString }, ) }, - supportingText = stringResource(id = BitwardenString.move_to_org_desc), + supportingText = stringResource(id = BitwardenString.move_to_vault_desc), cardStyle = CardStyle.Full, modifier = Modifier .testTag("OrganizationListDropdown") diff --git a/app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/movetoorganization/VaultMoveToOrganizationEmpty.kt b/app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/movetoorganization/VaultMoveToOrganizationEmpty.kt index bfc7bcde0f..0bcb62b5ea 100644 --- a/app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/movetoorganization/VaultMoveToOrganizationEmpty.kt +++ b/app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/movetoorganization/VaultMoveToOrganizationEmpty.kt @@ -26,7 +26,7 @@ fun VaultMoveToOrganizationEmpty(modifier: Modifier = Modifier) { ) { Spacer(modifier = Modifier.height(8.dp)) Text( - text = stringResource(id = BitwardenString.no_orgs_to_list), + text = stringResource(id = BitwardenString.no_vaults_to_list), style = BitwardenTheme.typography.bodyMedium, color = BitwardenTheme.colorScheme.text.secondary, textAlign = TextAlign.Center, diff --git a/app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/movetoorganization/VaultMoveToOrganizationViewModel.kt b/app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/movetoorganization/VaultMoveToOrganizationViewModel.kt index 4f10f845b1..fab657fafc 100644 --- a/app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/movetoorganization/VaultMoveToOrganizationViewModel.kt +++ b/app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/movetoorganization/VaultMoveToOrganizationViewModel.kt @@ -351,7 +351,7 @@ data class VaultMoveToOrganizationState( get() = if (onlyShowCollections) { BitwardenString.shared_folders.asText() } else { - BitwardenString.move_to_organization.asText() + BitwardenString.move_to_vault.asText() } val appBarButtonText: Text 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 2fe3457ba2..6c63143098 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 @@ -4422,7 +4422,7 @@ class VaultAddEditScreenTest : BitwardenComposeTest() { .assertIsDisplayed() composeTestRule - .onAllNodesWithText("Move to Organization") + .onAllNodesWithText("Move to vault") .filterToOne(hasAnyAncestor(isPopup())) .assertDoesNotExist() @@ -4510,7 +4510,7 @@ class VaultAddEditScreenTest : BitwardenComposeTest() { .assertIsDisplayed() composeTestRule - .onAllNodesWithText("Move to Organization") + .onAllNodesWithText("Move to vault") .filterToOne(hasAnyAncestor(isPopup())) .assertIsDisplayed() @@ -5181,7 +5181,7 @@ class VaultAddEditScreenTest : BitwardenComposeTest() { // Confirm dropdown version of item is absent composeTestRule - .onAllNodesWithText("Move to Organization") + .onAllNodesWithText("Move to vault") .filter(hasAnyAncestor(isPopup())) .assertCountEquals(0) // Open the overflow menu @@ -5191,7 +5191,7 @@ class VaultAddEditScreenTest : BitwardenComposeTest() { // Confirm it does not exist composeTestRule - .onAllNodesWithText("Move to Organization") + .onAllNodesWithText("Move to vault") .filterToOne(hasAnyAncestor(isPopup())) .assertIsNotDisplayed() } @@ -5216,7 +5216,7 @@ class VaultAddEditScreenTest : BitwardenComposeTest() { // Confirm dropdown version of item is absent composeTestRule - .onAllNodesWithText("Move to Organization") + .onAllNodesWithText("Move to vault") .filter(hasAnyAncestor(isPopup())) .assertCountEquals(0) @@ -5225,7 +5225,7 @@ class VaultAddEditScreenTest : BitwardenComposeTest() { .performClick() composeTestRule - .onAllNodesWithText("Move to Organization") + .onAllNodesWithText("Move to vault") .filterToOne(hasAnyAncestor(isPopup())) .assertIsDisplayed() } diff --git a/app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemScreenTest.kt b/app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemScreenTest.kt index 034c4b9e8c..539d5033f9 100644 --- a/app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemScreenTest.kt +++ b/app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemScreenTest.kt @@ -1547,14 +1547,14 @@ class VaultItemScreenTest : BitwardenComposeTest() { // Confirm dropdown version of item is absent composeTestRule - .onAllNodesWithText("Move to Organization") + .onAllNodesWithText("Move to vault") .filter(hasAnyAncestor(isPopup())) .assertCountEquals(0) // Open the overflow menu composeTestRule.onNodeWithContentDescription("More options").performClick() // Click on the move to organization hint item in the dropdown composeTestRule - .onAllNodesWithText("Move to Organization") + .onAllNodesWithText("Move to vault") .filterToOne(hasAnyAncestor(isPopup())) .performClick() verify { @@ -1574,14 +1574,14 @@ class VaultItemScreenTest : BitwardenComposeTest() { // Confirm dropdown version of item is absent composeTestRule - .onAllNodesWithText("Move to Organization") + .onAllNodesWithText("Move to vault") .filter(hasAnyAncestor(isPopup())) .assertCountEquals(0) // Open the overflow menu composeTestRule.onNodeWithContentDescription("More options").performClick() // Confirm it does not exist composeTestRule - .onAllNodesWithText("Move to Organization") + .onAllNodesWithText("Move to vault") .filterToOne(hasAnyAncestor(isPopup())) .assertDoesNotExist() } @@ -1696,7 +1696,7 @@ class VaultItemScreenTest : BitwardenComposeTest() { .assertIsDisplayed() composeTestRule - .onAllNodesWithText("Move to Organization") + .onAllNodesWithText("Move to vault") .filterToOne(hasAnyAncestor(isPopup())) .assertDoesNotExist() @@ -1724,7 +1724,7 @@ class VaultItemScreenTest : BitwardenComposeTest() { .assertIsDisplayed() composeTestRule - .onAllNodesWithText("Move to Organization") + .onAllNodesWithText("Move to vault") .filterToOne(hasAnyAncestor(isPopup())) .assertIsDisplayed() diff --git a/app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/movetoorganization/VaultMoveToOrganizationScreenTest.kt b/app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/movetoorganization/VaultMoveToOrganizationScreenTest.kt index d629fb20f2..dfca141ba9 100644 --- a/app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/movetoorganization/VaultMoveToOrganizationScreenTest.kt +++ b/app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/movetoorganization/VaultMoveToOrganizationScreenTest.kt @@ -60,7 +60,7 @@ class VaultMoveToOrganizationScreenTest : BitwardenComposeTest() { .onNodeWithText(text = "Shared folders") .assertIsNotDisplayed() composeTestRule - .onNodeWithText(text = "Move to Organization") + .onNodeWithText(text = "Move to vault") .assertIsDisplayed() mutableStateFlow.update { currentState -> @@ -68,7 +68,7 @@ class VaultMoveToOrganizationScreenTest : BitwardenComposeTest() { } composeTestRule - .onNodeWithText(text = "Move to Organization") + .onNodeWithText(text = "Move to vault") .assertIsNotDisplayed() composeTestRule .onNodeWithText(text = "Shared folders") @@ -104,7 +104,7 @@ class VaultMoveToOrganizationScreenTest : BitwardenComposeTest() { fun `the organization option field should update according to state`() { composeTestRule .onNodeWithContentDescription( - label = "mockOrganizationName-1. Organization", + label = "mockOrganizationName-1. Vault", substring = true, ) .assertIsDisplayed() @@ -114,14 +114,14 @@ class VaultMoveToOrganizationScreenTest : BitwardenComposeTest() { } composeTestRule - .onNodeWithContentDescription(label = "mockOrganizationName-1. Organization") + .onNodeWithContentDescription(label = "mockOrganizationName-1. Vault") .assertIsNotDisplayed() } @Test fun `the organization option field description should update according to state`() { composeTestRule - .onNodeWithText(text = "Choose an organization that", substring = true) + .onNodeWithText(text = "Choose a vault that", substring = true) .assertIsDisplayed() mutableStateFlow.update { currentState -> @@ -129,8 +129,7 @@ class VaultMoveToOrganizationScreenTest : BitwardenComposeTest() { } composeTestRule - composeTestRule - .onNodeWithText(text = "Choose an organization that", substring = true) + .onNodeWithText(text = "Choose a vault that", substring = true) .assertIsNotDisplayed() } @@ -169,7 +168,7 @@ class VaultMoveToOrganizationScreenTest : BitwardenComposeTest() { @Test fun `selecting an organization should send OrganizationSelect action`() { composeTestRule - .onNodeWithContentDescriptionAfterScroll(label = "mockOrganizationName-1. Organization") + .onNodeWithContentDescriptionAfterScroll(label = "mockOrganizationName-1. Vault") .performClick() // Choose the option from the menu composeTestRule @@ -201,7 +200,7 @@ class VaultMoveToOrganizationScreenTest : BitwardenComposeTest() { @Test fun `the organization option field should display according to state`() { composeTestRule - .onNodeWithContentDescriptionAfterScroll(label = "mockOrganizationName-1. Organization") + .onNodeWithContentDescriptionAfterScroll(label = "mockOrganizationName-1. Vault") .assertIsDisplayed() mutableStateFlow.update { currentState -> @@ -214,7 +213,7 @@ class VaultMoveToOrganizationScreenTest : BitwardenComposeTest() { } composeTestRule - .onNodeWithContentDescriptionAfterScroll(label = "mockOrganizationName-2. Organization") + .onNodeWithContentDescriptionAfterScroll(label = "mockOrganizationName-2. Vault") .assertIsDisplayed() } diff --git a/ui/src/main/res/values/strings.xml b/ui/src/main/res/values/strings.xml index 2a186878f1..9ccd65afcf 100644 --- a/ui/src/main/res/values/strings.xml +++ b/ui/src/main/res/values/strings.xml @@ -341,9 +341,9 @@ Scanning will happen automatically. %1$s moved to %2$s. You must select at least one shared folder. Share - Move to Organization - No organizations to list. - Choose an organization that you wish to move this item to. Moving to an organization transfers ownership of the item to that organization. You will no longer be the direct owner of this item once it has been moved. + Move to vault + No vaults to list. + Choose a vault that you wish to move this item to. Moving to another vault transfers ownership of the item to that organization. You will no longer be the direct owner of this item once it has been moved. Number of words Passphrase Word separator