github-starred/android
2
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2026-08-01 03:05:47 -05:00
Code Issues 2.4k Packages Projects Releases 129 Wiki Activity

[PM-41100] fix: Complete the VFO-1 organization-to-vault revert (#7220)

Browse Source
This commit is contained in:
André Bispo
2026-07-29 16:48:59 +00:00
committed by GitHub
parent b0daf6631d
commit 214b777ac9
9 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditScreen.kt
+1 -1
View File
@@ -372,7 +372,7 @@ fun VaultAddEditScreen(
.takeUnless { state.isAddItemMode },
OverflowMenuItemData(
text = stringResource(
id = BitwardenString.move_to_vault,
id = BitwardenString.move_to_organization,
),
onClick = {
viewModel.trySendAction(
app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemScreen.kt
+1 -1
View File
@@ -202,7 +202,7 @@ fun VaultItemScreen(
)
.takeUnless { state.isCipherInCollection },
OverflowMenuItemData(
text = stringResource(id = BitwardenString.move_to_vault),
text = stringResource(id = BitwardenString.move_to_organization),
onClick = {
viewModel.trySendAction(
VaultItemAction.Common.MoveToOrganizationClick,
app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/movetoorganization/VaultMoveToOrganizationContent.kt
+2 -2
View File
@@ -39,7 +39,7 @@ fun VaultMoveToOrganizationContent(
if (!showOnlyCollections) {
item {
BitwardenMultiSelectButton(
label = stringResource(id = BitwardenString.vault),
label = stringResource(id = BitwardenString.organization),
options = state
.organizations
.map { it.name }
@@ -52,7 +52,7 @@ fun VaultMoveToOrganizationContent(
.first { it.name == selectedString },
)
},
supportingText = stringResource(id = BitwardenString.move_to_vault_desc),
supportingText = stringResource(id = BitwardenString.move_to_org_desc),
cardStyle = CardStyle.Full,
modifier = Modifier
.testTag("OrganizationListDropdown")
app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/movetoorganization/VaultMoveToOrganizationEmpty.kt
+1 -1
View File
@@ -26,7 +26,7 @@ fun VaultMoveToOrganizationEmpty(modifier: Modifier = Modifier) {
) {
Spacer(modifier = Modifier.height(8.dp))
Text(
text = stringResource(id = BitwardenString.no_vaults_to_list),
text = stringResource(id = BitwardenString.no_orgs_to_list),
style = BitwardenTheme.typography.bodyMedium,
color = BitwardenTheme.colorScheme.text.secondary,
textAlign = TextAlign.Center,
app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/movetoorganization/VaultMoveToOrganizationViewModel.kt
+1 -1
View File
@@ -351,7 +351,7 @@ data class VaultMoveToOrganizationState(
get() = if (onlyShowCollections) {
BitwardenString.collections.asText()
} else {
BitwardenString.move_to_vault.asText()
BitwardenString.move_to_organization.asText()
}
val appBarButtonText: Text
app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditScreenTest.kt
+6 -6
View File
@@ -4416,7 +4416,7 @@ class VaultAddEditScreenTest : BitwardenComposeTest() {
.assertIsDisplayed()
composeTestRule
.onAllNodesWithText("Move to vault")
.onAllNodesWithText("Move to Organization")
.filterToOne(hasAnyAncestor(isPopup()))
.assertDoesNotExist()
@@ -4504,7 +4504,7 @@ class VaultAddEditScreenTest : BitwardenComposeTest() {
.assertIsDisplayed()
composeTestRule
.onAllNodesWithText("Move to vault")
.onAllNodesWithText("Move to Organization")
.filterToOne(hasAnyAncestor(isPopup()))
.assertIsDisplayed()
@@ -5175,7 +5175,7 @@ class VaultAddEditScreenTest : BitwardenComposeTest() {
// Confirm dropdown version of item is absent
composeTestRule
.onAllNodesWithText("Move to vault")
.onAllNodesWithText("Move to Organization")
.filter(hasAnyAncestor(isPopup()))
.assertCountEquals(0)
// Open the overflow menu
@@ -5185,7 +5185,7 @@ class VaultAddEditScreenTest : BitwardenComposeTest() {
// Confirm it does not exist
composeTestRule
.onAllNodesWithText("Move to vault")
.onAllNodesWithText("Move to Organization")
.filterToOne(hasAnyAncestor(isPopup()))
.assertIsNotDisplayed()
}
@@ -5210,7 +5210,7 @@ class VaultAddEditScreenTest : BitwardenComposeTest() {
// Confirm dropdown version of item is absent
composeTestRule
.onAllNodesWithText("Move to vault")
.onAllNodesWithText("Move to Organization")
.filter(hasAnyAncestor(isPopup()))
.assertCountEquals(0)
@@ -5219,7 +5219,7 @@ class VaultAddEditScreenTest : BitwardenComposeTest() {
.performClick()
composeTestRule
.onAllNodesWithText("Move to vault")
.onAllNodesWithText("Move to Organization")
.filterToOne(hasAnyAncestor(isPopup()))
.assertIsDisplayed()
}
app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemScreenTest.kt
+6 -6
View File
@@ -1547,14 +1547,14 @@ class VaultItemScreenTest : BitwardenComposeTest() {
// Confirm dropdown version of item is absent
composeTestRule
.onAllNodesWithText("Move to vault")
.onAllNodesWithText("Move to Organization")
.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 vault")
.onAllNodesWithText("Move to Organization")
.filterToOne(hasAnyAncestor(isPopup()))
.performClick()
verify {
@@ -1574,14 +1574,14 @@ class VaultItemScreenTest : BitwardenComposeTest() {
// Confirm dropdown version of item is absent
composeTestRule
.onAllNodesWithText("Move to vault")
.onAllNodesWithText("Move to Organization")
.filter(hasAnyAncestor(isPopup()))
.assertCountEquals(0)
// Open the overflow menu
composeTestRule.onNodeWithContentDescription("More options").performClick()
// Confirm it does not exist
composeTestRule
.onAllNodesWithText("Move to vault")
.onAllNodesWithText("Move to Organization")
.filterToOne(hasAnyAncestor(isPopup()))
.assertDoesNotExist()
}
@@ -1696,7 +1696,7 @@ class VaultItemScreenTest : BitwardenComposeTest() {
.assertIsDisplayed()
composeTestRule
.onAllNodesWithText("Move to vault")
.onAllNodesWithText("Move to Organization")
.filterToOne(hasAnyAncestor(isPopup()))
.assertDoesNotExist()
@@ -1724,7 +1724,7 @@ class VaultItemScreenTest : BitwardenComposeTest() {
.assertIsDisplayed()
composeTestRule
.onAllNodesWithText("Move to vault")
.onAllNodesWithText("Move to Organization")
.filterToOne(hasAnyAncestor(isPopup()))
.assertIsDisplayed()
app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/movetoorganization/VaultMoveToOrganizationScreenTest.kt
+9 -9
View File
@@ -60,7 +60,7 @@ class VaultMoveToOrganizationScreenTest : BitwardenComposeTest() {
.onNodeWithText(text = "Collections")
.assertIsNotDisplayed()
composeTestRule
.onNodeWithText(text = "Move to vault")
.onNodeWithText(text = "Move to Organization")
.assertIsDisplayed()
mutableStateFlow.update { currentState ->
@@ -68,7 +68,7 @@ class VaultMoveToOrganizationScreenTest : BitwardenComposeTest() {
}
composeTestRule
.onNodeWithText(text = "Move to vault")
.onNodeWithText(text = "Move to Organization")
.assertIsNotDisplayed()
composeTestRule
.onNodeWithText(text = "Collections")
@@ -104,7 +104,7 @@ class VaultMoveToOrganizationScreenTest : BitwardenComposeTest() {
fun `the organization option field should update according to state`() {
composeTestRule
.onNodeWithContentDescription(
label = "mockOrganizationName-1. Vault",
label = "mockOrganizationName-1. Organization",
substring = true,
)
.assertIsDisplayed()
@@ -114,14 +114,14 @@ class VaultMoveToOrganizationScreenTest : BitwardenComposeTest() {
}
composeTestRule
.onNodeWithContentDescription(label = "mockOrganizationName-1. Vault")
.onNodeWithContentDescription(label = "mockOrganizationName-1. Organization")
.assertIsNotDisplayed()
}
@Test
fun `the organization option field description should update according to state`() {
composeTestRule
.onNodeWithText(text = "Choose a vault that", substring = true)
.onNodeWithText(text = "Choose an organization that", substring = true)
.assertIsDisplayed()
mutableStateFlow.update { currentState ->
@@ -129,7 +129,7 @@ class VaultMoveToOrganizationScreenTest : BitwardenComposeTest() {
}
composeTestRule
.onNodeWithText(text = "Choose a vault that", substring = true)
.onNodeWithText(text = "Choose an organization that", substring = true)
.assertIsNotDisplayed()
}
@@ -168,7 +168,7 @@ class VaultMoveToOrganizationScreenTest : BitwardenComposeTest() {
@Test
fun `selecting an organization should send OrganizationSelect action`() {
composeTestRule
.onNodeWithContentDescriptionAfterScroll(label = "mockOrganizationName-1. Vault")
.onNodeWithContentDescriptionAfterScroll(label = "mockOrganizationName-1. Organization")
.performClick()
// Choose the option from the menu
composeTestRule
@@ -200,7 +200,7 @@ class VaultMoveToOrganizationScreenTest : BitwardenComposeTest() {
@Test
fun `the organization option field should display according to state`() {
composeTestRule
.onNodeWithContentDescriptionAfterScroll(label = "mockOrganizationName-1. Vault")
.onNodeWithContentDescriptionAfterScroll(label = "mockOrganizationName-1. Organization")
.assertIsDisplayed()
mutableStateFlow.update { currentState ->
@@ -213,7 +213,7 @@ class VaultMoveToOrganizationScreenTest : BitwardenComposeTest() {
}
composeTestRule
.onNodeWithContentDescriptionAfterScroll(label = "mockOrganizationName-2. Vault")
.onNodeWithContentDescriptionAfterScroll(label = "mockOrganizationName-2. Organization")
.assertIsDisplayed()
}
ui/src/main/res/values/strings.xml
+3 -3
View File
@@ -341,9 +341,9 @@ Scanning will happen automatically.</string>
<string name="moved_item_to_org">%1$s moved to %2$s.</string>
<string name="select_one_collection">You must select at least one collection.</string>
<string name="share">Share</string>
<string name="move_to_vault">Move to vault</string>
<string name="no_vaults_to_list">No vaults to list.</string>
<string name="move_to_vault_desc">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.</string>
<string name="move_to_organization">Move to Organization</string>
<string name="no_orgs_to_list">No organizations to list.</string>
<string name="move_to_org_desc">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.</string>
<string name="number_of_words">Number of words</string>
<string name="passphrase">Passphrase</string>
<string name="word_separator">Word separator</string>