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

[andrebispo5]

Cherry-pick of #7220 onto release/2026.7-rc59.

🎟️ 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, the app 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 on rc builds.

This 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.

📸 Screenshots

[vvolkgang]

[github-actions]

🤖 Bitwarden Claude Code Review

Overall Assessment: APPROVE

This is a cherry-pick of #7220 onto release/2026.7-rc59, restoring the move_to_organization, move_to_org_desc, and no_orgs_to_list strings and repointing VaultAddEditScreen, VaultItemScreen, VaultMoveToOrganizationContent/Empty, and VaultMoveToOrganizationViewModel at them. I verified the patch is byte-for-byte the same change set as the commit merged to main (same 9 files, same 30/30 line counts) and that it exactly inverts the string hunks from #7192. No references to the removed move_to_vault, move_to_vault_desc, or no_vaults_to_list keys remain in either the base or the localized strings.xml files, and every restored resource (move_to_organization, move_to_org_desc, no_orgs_to_list, organization) resolves in ui/src/main/res/values/strings.xml, so the build and the updated Compose assertions line up.

Code Review Details

No findings. Test assertions were updated in lockstep with the string changes ("Move to Organization", "Choose an organization that", "mockOrganizationName-1. Organization"), and the surrounding collections/shared_folders wording on the release branch is untouched and correct for the flag-off path.

[Copilot]

Pull request overview

Completes the release-branch revert of the VFO-1 “Organization → Vault” terminology changes so the UI again shows “Organization” wording (and related descriptions/empty states) until the flag-gated version lands.

Changes:

• Restores move_to_organization, move_to_org_desc, and no_orgs_to_list string resources and removes the leftover “vault” variants.
• Updates Move-to-Organization screen/ViewModel and related UI to reference the restored organization strings.
• Updates Compose UI tests to assert the reverted “Organization” copy.

Reviewed changes

Copilot reviewed 9 out of 9 changed files in this pull request and generated no comments.

Show a summary per file

File	Description
ui/src/main/res/values/strings.xml	Restores organization-focused string keys and removes the vault-focused keys.
app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/movetoorganization/VaultMoveToOrganizationViewModel.kt	Updates app bar title to use move_to_organization.
app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/movetoorganization/VaultMoveToOrganizationEmpty.kt	Uses no_orgs_to_list for the empty state message.
app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/movetoorganization/VaultMoveToOrganizationContent.kt	Reverts dropdown label/supporting text to organization wording.
app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemScreen.kt	Reverts overflow menu item text to move_to_organization.
app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditScreen.kt	Reverts overflow menu item text to move_to_organization.
app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/movetoorganization/VaultMoveToOrganizationScreenTest.kt	Updates assertions from “vault” to “Organization” text/content descriptions.
app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemScreenTest.kt	Updates overflow/menu assertions to “Move to Organization”.
app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditScreenTest.kt	Updates overflow/menu assertions to “Move to Organization”.

---

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

[codecov]

Codecov Report

❌ Patch coverage is 83.33333% with 1 line in your changes missing coverage. Please review.
✅ Project coverage is 86.08%. Comparing base (445f2dd) to head (97c986f).
⚠️ Report is 1 commits behind head on release/2026.7-rc59.

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

Additional details and impacted files

@@                   Coverage Diff                   @@
##           release/2026.7-rc59    #7221      +/-   ##
=======================================================
+ Coverage                85.54%   86.08%   +0.54%     
=======================================================
  Files                     1051      891     -160     
  Lines                    67658    64855    -2803     
  Branches                  9797     9690     -107     
=======================================================
- Hits                     57875    55833    -2042     
+ Misses                    6287     5552     -735     
+ Partials                  3496     3470      -26     

Flag	Coverage Δ
app-data	17.70% <0.00%> (-0.03%)	⬇️
app-ui-auth-tools	18.75% <0.00%> (-0.30%)	⬇️
app-ui-platform	16.52% <0.00%> (-0.54%)	⬇️
app-ui-vault	27.33% <83.33%> (-0.55%)	⬇️
authenticator	6.10% <0.00%> (ø)
lib-core-network-bridge	4.11% <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.