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

[PR #6239] [MERGED] [PM-29297] Add MigrateToMyItemsScreen #120324

New Issue
Closed
opened 2026-06-09 18:13:53 -05:00 by GiteaMirror · 0 comments
GiteaMirror commented 2026-06-09 18:13:53 -05:00
Owner
Copy Link
Copy Source

📋 Pull Request Information

Original PR: https://github.com/bitwarden/android/pull/6239
Author: @SaintPatrck
Created: 12/5/2025
Status: ✅ Merged
Merged: 12/15/2025
Merged by: @david-livefront

Base: main ← Head: PM-28469/vault-takeover-screen

📝 Commits (10+)

  • e11f20c Add string resources for VaultTakeoverScreen
  • 430baa2 Add VaultTakeoverScreen and ViewModel
  • 67bea18 Add VaultTakeover navigation
  • 2f81483 Add VaultTakeover tests
  • 9bf3d2b Remove duplicate continue_label string resource
  • 341a693 Update Vault Takeover screen illustration
  • 2908fc2 Update TODOs for VaultTakeoverViewModel
  • 7fa3f50 Rename VaultTakeover feature to MigrateToMyItems
  • e059c3a Implement initialization and logic for MigrateToMyItemsViewModel
  • bd59fb5 Merge remote-tracking branch 'origin/main' into PM-28469/vault-takeover-screen

📊 Changes

8 files changed (+1037 additions, -0 deletions)

View changed files

➕ app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/migratetomyitems/MigrateToMyItemsNavigation.kt (+82 -0)
➕ app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/migratetomyitems/MigrateToMyItemsScreen.kt (+221 -0)
➕ app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/migratetomyitems/MigrateToMyItemsViewModel.kt (+214 -0)
➕ app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/migratetomyitems/handler/MigrateToMyItemsHandler.kt (+52 -0)
➕ app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/migratetomyitems/MigrateToMyItemsScreenTest.kt (+176 -0)
➕ app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/migratetomyitems/MigrateToMyItemsViewModelTest.kt (+167 -0)
➕ ui/src/main/res/drawable/ill_migrate_to_my_items.xml (+119 -0)
📝 ui/src/main/res/values/strings.xml (+6 -0)

📄 Description

🎟️ Tracking

PM-29297

📔 Objective

This PR implements a new "Migrate to My Items" screen that prompts users when an organization requires ownership of all vault items for security and compliance purposes.

The screen presents users with three options: accept the transfer and continue using the organization vault, decline the requirement and navigate to the leave organization flow, or view help documentation explaining why they're seeing this prompt. The implementation includes a new MigrateToMyItemsScreen composable, corresponding ViewModel with full MVVM+UDF patterns, navigation integration, and comprehensive
test coverage for both UI and business logic.

The UI features a custom illustration drawable and localized string resources to clearly communicate the organization's requirement and user choices.

📸 Screenshots

Design: https://www.figma.com/design/WjD06w9dFlA67Ba27d1OSu/Dev-Ready--Bitwarden-Android?node-id=40008795-1368&t=vscIYrLP822BsrkZ-0

⏰ Reminders before review

  • Contributor guidelines followed
  • All formatters and local linters executed and passed
  • Written new unit and / or integration tests where applicable
  • Protected functional changes with optionality (feature flags)
  • Used internationalization (i18n) for all UI strings
  • CI builds passed
  • Communicated to DevOps any deployment requirements
  • Updated any necessary documentation (Confluence, contributing docs) or informed the documentation team

🦮 Reviewer guidelines

  • 👍 (:+1:) or similar for great changes
  • 📝 (:memo:) or ℹ️ (:information_source:) for notes or general info
  • ❓ (:question:) for questions
  • 🤔 (:thinking:) or 💭 (:thought_balloon:) for more open inquiry that's not quite a confirmed issue and could potentially benefit from discussion
  • 🎨 (:art:) for suggestions / improvements
  • ❌ (:x:) or ⚠️ (:warning:) for more significant problems or concerns needing attention
  • 🌱 (:seedling:) or ♻️ (:recycle:) for future improvements or indications of technical debt
  • ⛏ (:pick:) for minor or nitpick changes

🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.

## 📋 Pull Request Information **Original PR:** https://github.com/bitwarden/android/pull/6239 **Author:** [@SaintPatrck](https://github.com/SaintPatrck) **Created:** 12/5/2025 **Status:** ✅ Merged **Merged:** 12/15/2025 **Merged by:** [@david-livefront](https://github.com/david-livefront) **Base:** `main` ← **Head:** `PM-28469/vault-takeover-screen` --- ### 📝 Commits (10+) - [`e11f20c`](https://github.com/bitwarden/android/commit/e11f20c4663f85627c237e461559e98ba445cca3) Add string resources for VaultTakeoverScreen - [`430baa2`](https://github.com/bitwarden/android/commit/430baa2ff88b239bf888896522eec55d23f6bf0c) Add VaultTakeoverScreen and ViewModel - [`67bea18`](https://github.com/bitwarden/android/commit/67bea18a846fd5e0a0bfed5a92b440905523cd19) Add VaultTakeover navigation - [`2f81483`](https://github.com/bitwarden/android/commit/2f81483db330627fd7c8f11069b6ca606ba6889c) Add VaultTakeover tests - [`9bf3d2b`](https://github.com/bitwarden/android/commit/9bf3d2bd1450fc4c51bb41ba9615bee245caf72b) Remove duplicate continue_label string resource - [`341a693`](https://github.com/bitwarden/android/commit/341a6935554d2f71b0be2ba8bea0f66eaa2c2734) Update Vault Takeover screen illustration - [`2908fc2`](https://github.com/bitwarden/android/commit/2908fc252789408bfdb3953ad311c6d456e710be) Update TODOs for VaultTakeoverViewModel - [`7fa3f50`](https://github.com/bitwarden/android/commit/7fa3f50f51f879e6d0adf0cc42f80d3df25eed58) Rename VaultTakeover feature to MigrateToMyItems - [`e059c3a`](https://github.com/bitwarden/android/commit/e059c3a499935479c043fd57c81282204af14a03) Implement initialization and logic for MigrateToMyItemsViewModel - [`bd59fb5`](https://github.com/bitwarden/android/commit/bd59fb513cb22f415bbd4b523d84bc094e96a0d0) Merge remote-tracking branch 'origin/main' into PM-28469/vault-takeover-screen ### 📊 Changes **8 files changed** (+1037 additions, -0 deletions) <details> <summary>View changed files</summary> ➕ `app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/migratetomyitems/MigrateToMyItemsNavigation.kt` (+82 -0) ➕ `app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/migratetomyitems/MigrateToMyItemsScreen.kt` (+221 -0) ➕ `app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/migratetomyitems/MigrateToMyItemsViewModel.kt` (+214 -0) ➕ `app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/migratetomyitems/handler/MigrateToMyItemsHandler.kt` (+52 -0) ➕ `app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/migratetomyitems/MigrateToMyItemsScreenTest.kt` (+176 -0) ➕ `app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/migratetomyitems/MigrateToMyItemsViewModelTest.kt` (+167 -0) ➕ `ui/src/main/res/drawable/ill_migrate_to_my_items.xml` (+119 -0) 📝 `ui/src/main/res/values/strings.xml` (+6 -0) </details> ### 📄 Description ## 🎟️ Tracking PM-29297 ## 📔 Objective This PR implements a new "Migrate to My Items" screen that prompts users when an organization requires ownership of all vault items for security and compliance purposes. The screen presents users with three options: accept the transfer and continue using the organization vault, decline the requirement and navigate to the leave organization flow, or view help documentation explaining why they're seeing this prompt. The implementation includes a new `MigrateToMyItemsScreen` composable, corresponding ViewModel with full MVVM+UDF patterns, navigation integration, and comprehensive test coverage for both UI and business logic. The UI features a custom illustration drawable and localized string resources to clearly communicate the organization's requirement and user choices. ## 📸 Screenshots Design: https://www.figma.com/design/WjD06w9dFlA67Ba27d1OSu/Dev-Ready--Bitwarden-Android?node-id=40008795-1368&t=vscIYrLP822BsrkZ-0 <img width="365" src="https://github.com/user-attachments/assets/960a58ec-ec09-41c1-9c00-897c5a5dcb7b" /> ## ⏰ Reminders before review - Contributor guidelines followed - All formatters and local linters executed and passed - Written new unit and / or integration tests where applicable - Protected functional changes with optionality (feature flags) - Used internationalization (i18n) for all UI strings - CI builds passed - Communicated to DevOps any deployment requirements - Updated any necessary documentation (Confluence, contributing docs) or informed the documentation team ## 🦮 Reviewer guidelines <!-- Suggested interactions but feel free to use (or not) as you desire! --> - 👍 (`:+1:`) or similar for great changes - 📝 (`:memo:`) or ℹ️ (`:information_source:`) for notes or general info - ❓ (`:question:`) for questions - 🤔 (`:thinking:`) or 💭 (`:thought_balloon:`) for more open inquiry that's not quite a confirmed issue and could potentially benefit from discussion - 🎨 (`:art:`) for suggestions / improvements - ❌ (`:x:`) or ⚠️ (`:warning:`) for more significant problems or concerns needing attention - 🌱 (`:seedling:`) or ♻️ (`:recycle:`) for future improvements or indications of technical debt - ⛏ (`:pick:`) for minor or nitpick changes --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
GiteaMirror added the pull-request label 2026-06-09 18:13:53 -05:00
Sign in to join this conversation.
No Branch/Tag Specified
Branches Tags
Labels
Clear labels
app:authenticator
app:password-manager
bug
bug-passkey
customer-support
duplicate
enhancement
good first issue
help wanted
needs-reply
needs-response
pull-request
Mirrored from GitHub Pull Request
 question
No labels pull-request
Milestone
No items
No Milestone
Projects
Clear projects
No projects
Assignees
Clear assignees
GiteaMirror ninjasurge (Kaehlen Rog)
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: github-starred/android#120324