[PM-41100] fix: Complete the VFO-1 organization-to-vault revert

[andrebispo5]

🎟️ Tracking

https://bitwarden.atlassian.net/browse/PM-41100

📔 Objective

The revert of the VFO-1 naming changes (#7195) squashed three separate PRs (#7183 Owner, #7189 Collections, #7192 Organization→Vault) into one commit. It correctly reverted the Owner and Collections wording everywhere, but missed every hunk belonging to the Organization→Vault rename — including two files (VaultMoveToOrganizationContent.kt, VaultMoveToOrganizationEmpty.kt) that PR #7192 was the only one of the three to touch, so they never surfaced while resolving the other two.

As a result, main was still unconditionally showing "Move to vault" (menu item, app-bar title, dropdown label, description, empty-state) regardless of any feature flag — exactly what QA caught in this ticket.

This PR completes the revert: restores move_to_organization, move_to_org_desc, and no_orgs_to_list, points the affected screens/ViewModel back at them, and removes the leftover move_to_vault/move_to_vault_desc/no_vaults_to_list strings — so the app matches its pre-VFO1 baseline again until the flag-gated version (already stacked behind vfo1-foundation in #7219) lands.

📸 Screenshots

[codecov]

Codecov Report

❌ Patch coverage is 83.33333% with 1 line in your changes missing coverage. Please review.
✅ Project coverage is 86.21%. Comparing base (b0daf66) to head (a086c69).

Files with missing lines	Patch %	Lines
...movetoorganization/VaultMoveToOrganizationEmpty.kt	0.00%	1 Missing ⚠️

Additional details and impacted files

@@            Coverage Diff             @@
##             main    #7220      +/-   ##
==========================================
- Coverage   86.36%   86.21%   -0.15%     
==========================================
  Files         916      888      -28     
  Lines       65833    64820    -1013     
  Branches     9718     9706      -12     
==========================================
- Hits        56854    55883     -971     
+ Misses       5509     5468      -41     
+ Partials     3470     3469       -1     

Flag	Coverage Δ
app-data	17.77% <0.00%> (+0.19%)	⬆️
app-ui-auth-tools	18.73% <0.00%> (-0.03%)	⬇️
app-ui-platform	16.51% <0.00%> (ø)
app-ui-vault	27.31% <83.33%> (-0.56%)	⬇️
authenticator	6.10% <0.00%> (ø)
lib-core-network-bridge	4.12% <0.00%> (ø)
lib-data-ui	1.18% <0.00%> (+<0.01%)	⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Harness.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

• ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
• 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

[github-actions]

🤖 Bitwarden Claude Code Review

Overall Assessment: APPROVE

Reviewed the completion of the VFO-1 organization-to-vault revert across five production files, three Compose test files, and ui/src/main/res/values/strings.xml. The changed files match PR #7192's file list exactly, and the restored move_to_organization / no_orgs_to_list / move_to_org_desc values are byte-identical to their pre-VFO1 text; no references to move_to_vault, no_vaults_to_list, or move_to_vault_desc remain in Kotlin or in the default resources. Test assertions were updated in lockstep with the string values ("Move to Organization", "Choose an organization that", "mockOrganizationName-N. Organization"), and the stray duplicate composeTestRule line removed in #7192 was correctly not reintroduced. Localized values-* files still carry the move_to_vault keys, but those are Crowdin-managed (never hand-edited in this repo) and MissingTranslation/ExtraTranslation are disabled in the module lint configs, so the next translation sync resolves the gap without breaking the build.

Code Review Details

No findings. The revert is faithful to the pre-VFO1 baseline and self-consistent between production code, string resources, and tests.

[Copilot]

Pull request overview

This PR completes the revert of the VFO-1 “Organization → Vault” terminology changes by restoring the original “Organization” wording and associated string resources in the “Move to Organization” flow, aligning main back to the pre-VFO1 baseline until the feature-flagged work lands.

Changes:

• Restores move_to_organization, move_to_org_desc, and no_orgs_to_list usage in the Move-to-Organization UI/ViewModel and removes the default move_to_vault* strings from values/strings.xml.
• Updates Compose UI and ViewModel logic to reference the restored organization strings.
• Updates Compose UI tests to assert “Move to Organization” and related accessibility/text content.

Reviewed changes

Copilot reviewed 9 out of 9 changed files in this pull request and generated 1 comment.

Show a summary per file

File	Description
ui/src/main/res/values/strings.xml	Restores organization-based strings in the default locale resources.
app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/movetoorganization/VaultMoveToOrganizationViewModel.kt	Switches app bar title text back to move_to_organization.
app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/movetoorganization/VaultMoveToOrganizationEmpty.kt	Switches empty-state string back to no_orgs_to_list.
app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/movetoorganization/VaultMoveToOrganizationContent.kt	Switches dropdown label/supporting text back to organization terminology.
app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemScreen.kt	Updates overflow action label back to move_to_organization.
app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditScreen.kt	Updates overflow action label back to move_to_organization.
app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/movetoorganization/VaultMoveToOrganizationScreenTest.kt	Updates UI test assertions to match “Organization” wording.
app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemScreenTest.kt	Updates UI test assertions to match “Move to Organization”.
app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditScreenTest.kt	Updates UI test assertions to match “Move to Organization”.

---

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.