[PM-40761] feat: Rename "Folders" to "My folders" by andrebispo5 · Pull Request #7213 · bitwarden/android

andrebispo5 · 2026-07-27T11:50:44Z

⚠️ Note

Stacked on #7200

🎟️ Tracking

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

📔 Objective

Renames the plural "Folders" label to "My folders" across the app to disambiguate it from "Shared folders" (the renamed Collections concept). Scope is limited to the shared folders string resource, covering: the Vault screen's "Folders (N)" section header, the item-listing "Folders (N)" filter header, the Settings > Vault "Folders" row, the Folders screen's top app bar title, and the "Move to Folder" bottom sheet title. Singular/derived strings (e.g. "Folder" field label, "Add folder"/"Edit folder", "No folder") are intentionally left unchanged, matching the Figma designs.

📸 Screenshots

Repoints the overflow menu item and the destination screen's app-bar title to the existing "move" string resource instead of the removed "move_to_vault" one. The confirm button already read "Move" and needed no change.

Adds an optional dialogTitle param to BitwardenMultiSelectButton so the selection dialog's title can differ from the field's own label, defaulting to the existing behavior for all other call sites. The Move screen's "Vault" field now shows "Filter items by vault" as the dialog title, matching the Figma design.

Adds a new my_folders string and cuts over the Vault list header, item-listing filter header, Settings row, Folders screen title, and the "Move to Folder" bottom sheet title to use it. The old folders string is left in place for now to avoid invalidating in-flight translations.

Deletes the folders string entry now that all references have been repointed to my_folders — verified zero remaining references repo-wide before removing.

github-actions · 2026-07-27T11:56:09Z

🤖 Bitwarden Claude Code Review

Overall Assessment: APPROVE

Reviewed the rename of the shared folders string resource to my_folders ("My folders"). The change touches five UI usage sites (Vault screen header, item-listing filter header, Settings > Vault row, Folders screen top bar, and the Move-to-Folder bottom sheet), removes the old folders string from the default strings.xml, adds the new my_folders string, and updates the corresponding compose tests. Verified no remaining references to BitwardenString.folders in Kotlin code and that all affected test assertions were updated (including the uppercased "MY FOLDERS (N)" list-header variants).

Code Review Details

No findings.

Notes verified during review:

New string my_folders is named per the codebase convention (derived from its own content) and placed alphabetically alongside my_vault.
Remaining folders entries in the localized values-XX/strings.xml files are handled by the translation (Crowdin) pipeline and are not a review concern; the default values/strings.xml is the source of truth.
Other "folders" matches in the codebase are unrelated (API endpoint, Room table name, JSON serialization keys).
Singular/derived strings ("Folder", "Add folder", "No folder") were intentionally left unchanged, matching the stated Figma scope.

codecov · 2026-07-27T11:56:48Z

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 85.95%. Comparing base (8af3d44) to head (fb05fc9).

Additional details and impacted files

@@                        Coverage Diff                         @@
##           PM-40805-move-to-vault-to-move    #7213      +/-   ##
==================================================================
- Coverage                           86.09%   85.95%   -0.14%     
==================================================================
  Files                                 887     1019     +132     
  Lines                               64751    67257    +2506     
  Branches                             9674     9748      +74     
==================================================================
+ Hits                                55747    57814    +2067     
- Misses                               5538     5944     +406     
- Partials                             3466     3499      +33

Flag	Coverage Δ
app-data	`17.90% <0.00%> (+0.14%)`	⬆️
app-ui-auth-tools	`19.10% <0.00%> (+0.31%)`	⬆️
app-ui-platform	`17.08% <33.33%> (+0.53%)`	⬆️
app-ui-vault	`27.90% <66.66%> (+0.53%)`	⬆️
authenticator	`6.11% <0.00%> (+<0.01%)`	⬆️
lib-core-network-bridge	`4.02% <0.00%> (+0.01%)`	⬆️
lib-data-ui	`1.15% <0.00%> (ø)`

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.

Copilot

Pull request overview

Renames the UI label for personal folders from “Folders” to “My folders” to disambiguate it from “Shared folders” (collections) across vault-related screens.

Changes:

Adds a new string resource my_folders (“My folders”) and updates UI call sites to use it.
Updates Compose UI tests to assert the new label (“My folders” / “MY FOLDERS (N)”).

Reviewed changes

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

Show a summary per file

File	Description
ui/src/main/res/values/strings.xml	Replaces the old folders label by introducing `my_folders`.
app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/vault/VaultContent.kt	Updates vault folders section header to use `my_folders`.
app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingContent.kt	Updates item listing folders header to use `my_folders`.
app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditScreen.kt	Updates “Move to folder” bottom sheet title to use `my_folders`.
app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/feature/settings/vault/VaultSettingsScreen.kt	Updates Settings > Vault row label to use `my_folders`.
app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/feature/settings/folders/FoldersScreen.kt	Updates Folders screen top app bar title to use `my_folders`.
app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingScreenTest.kt	Updates folder header assertions for the new label.
app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditScreenTest.kt	Updates bottom sheet title assertions for the new label.

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

    <string name="master_password_required">Master password (required)</string>
    <string name="new_master_password_required">New master password (required)</string>
    <string name="more_options">More options</string>
+    <string name="my_folders">My folders</string>


Adds a new my_folder string and cuts over the Add/Edit item screen's folder selection field to use it. The "Folder" item-type entry in the create-new picker (CreateVaultItemType) keeps the original folder string since it names a type, not a possessive field.

andrebispo5 added 4 commits July 23, 2026 11:51

PM-40805: feat: Rename "Move to vault" to "Move"

62e0ff7

Repoints the overflow menu item and the destination screen's app-bar title to the existing "move" string resource instead of the removed "move_to_vault" one. The confirm button already read "Move" and needed no change.

PM-40761: chore: Remove unused folders string

da1e9ff

Deletes the folders string entry now that all references have been repointed to my_folders — verified zero remaining references repo-wide before removing.

github-actions Bot added app:password-manager Bitwarden Password Manager app context app:authenticator Bitwarden Authenticator app context t:feature Change Type - Feature Development labels Jul 27, 2026

andrebispo5 marked this pull request as ready for review July 27, 2026 11:55

andrebispo5 requested review from a team and david-livefront as code owners July 27, 2026 11:55

Copilot AI review requested due to automatic review settings July 27, 2026 11:55

Copilot started reviewing on behalf of andrebispo5 July 27, 2026 11:55 View session

Copilot AI reviewed Jul 27, 2026

View reviewed changes

david-livefront approved these changes Jul 27, 2026

View reviewed changes

Base automatically changed from PM-40805-move-to-vault-to-move to readd-vfo1-naming-changes July 27, 2026 15:07

andrebispo5 merged commit 3c5de4a into readd-vfo1-naming-changes Jul 27, 2026
22 checks passed

andrebispo5 deleted the PM-40761-update-folders-to-my-folders branch July 27, 2026 15:08

andrebispo5 mentioned this pull request Jul 27, 2026

feat: VFO-1 naming changes feature branch #7196

Draft

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

[PM-40761] feat: Rename "Folders" to "My folders" - #7213

[PM-40761] feat: Rename "Folders" to "My folders"#7213
andrebispo5 merged 5 commits into
readd-vfo1-naming-changesfrom
PM-40761-update-folders-to-my-folders

andrebispo5 commented Jul 27, 2026 •

edited

Loading

Uh oh!

github-actions Bot commented Jul 27, 2026 •

edited

Loading

Uh oh!

codecov Bot commented Jul 27, 2026 •

edited

Loading

Uh oh!

Copilot AI left a comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Uh oh!

Conversation

andrebispo5 commented Jul 27, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

⚠️ Note

🎟️ Tracking

📔 Objective

📸 Screenshots

Uh oh!

github-actions Bot commented Jul 27, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

🤖 Bitwarden Claude Code Review

Uh oh!

codecov Bot commented Jul 27, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

andrebispo5 commented Jul 27, 2026 •

edited

Loading

github-actions Bot commented Jul 27, 2026 •

edited

Loading

codecov Bot commented Jul 27, 2026 •

edited

Loading