github-starred/android
2
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2026-05-08 21:10:40 -05:00
Code Issues 1.1k Packages Projects Releases 122 Wiki Activity

[PR #5965] [MERGED] [PM-26355] Improve SelectAccountScreen state handling #47793

New Issue
Closed
opened 2026-04-26 15:21:10 -05:00 by GiteaMirror · 0 comments
GiteaMirror commented 2026-04-26 15:21:10 -05:00
Owner
Copy Link

📋 Pull Request Information

Original PR: https://github.com/bitwarden/android/pull/5965
Author: @SaintPatrck
Created: 9/30/2025
Status: ✅ Merged
Merged: 10/2/2025
Merged by: @SaintPatrck

Base: main ← Head: cxf/app/no-accounts-screen

📝 Commits (1)

  • 4f46b09 [PM-26355] Improve SelectAccountScreen state handling

📊 Changes

7 files changed (+313 additions, -96 deletions)

View changed files

📝 app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/exportitems/selectaccount/SelectAccountScreen.kt (+127 -45)
📝 app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/exportitems/selectaccount/SelectAccountViewModel.kt (+66 -28)
📝 app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/exportitems/SelectAccountScreenTest.kt (+53 -14)
📝 app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/exportitems/SelectAccountViewModelTest.kt (+12 -9)
📝 ui/src/main/kotlin/com/bitwarden/ui/platform/components/content/BitwardenEmptyContent.kt (+36 -0)
📝 ui/src/main/kotlin/com/bitwarden/ui/platform/components/content/BitwardenLoadingContent.kt (+17 -0)
📝 ui/src/main/res/values/strings.xml (+2 -0)

📄 Description

🎟️ Tracking

PM-26355

📔 Objective

This commit refactors the SelectAccountScreen to better handle different states (Loading, Content, NoItems) by introducing a sealed ViewState class within SelectAccountState.

This change also includes:

  • Updating SelectAccountViewModel to emit the new ViewState.
  • Modifying SelectAccountScreen to display UI based on the ViewState.
  • Adding new string resources for the "No accounts available" state.
  • Updating unit tests to reflect these state handling improvements.
  • Using ImportCredentialsCancellationException when the user cancels the import flow.

📸 Screenshots

image

⏰ 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/5965 **Author:** [@SaintPatrck](https://github.com/SaintPatrck) **Created:** 9/30/2025 **Status:** ✅ Merged **Merged:** 10/2/2025 **Merged by:** [@SaintPatrck](https://github.com/SaintPatrck) **Base:** `main` ← **Head:** `cxf/app/no-accounts-screen` --- ### 📝 Commits (1) - [`4f46b09`](https://github.com/bitwarden/android/commit/4f46b09f8c3ed72bfa323959e1b5e0d1478233e4) [PM-26355] Improve SelectAccountScreen state handling ### 📊 Changes **7 files changed** (+313 additions, -96 deletions) <details> <summary>View changed files</summary> 📝 `app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/exportitems/selectaccount/SelectAccountScreen.kt` (+127 -45) 📝 `app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/exportitems/selectaccount/SelectAccountViewModel.kt` (+66 -28) 📝 `app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/exportitems/SelectAccountScreenTest.kt` (+53 -14) 📝 `app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/exportitems/SelectAccountViewModelTest.kt` (+12 -9) 📝 `ui/src/main/kotlin/com/bitwarden/ui/platform/components/content/BitwardenEmptyContent.kt` (+36 -0) 📝 `ui/src/main/kotlin/com/bitwarden/ui/platform/components/content/BitwardenLoadingContent.kt` (+17 -0) 📝 `ui/src/main/res/values/strings.xml` (+2 -0) </details> ### 📄 Description ## 🎟️ Tracking PM-26355 ## 📔 Objective This commit refactors the `SelectAccountScreen` to better handle different states (Loading, Content, NoItems) by introducing a sealed `ViewState` class within `SelectAccountState`. This change also includes: - Updating `SelectAccountViewModel` to emit the new `ViewState`. - Modifying `SelectAccountScreen` to display UI based on the `ViewState`. - Adding new string resources for the "No accounts available" state. - Updating unit tests to reflect these state handling improvements. - Using `ImportCredentialsCancellationException` when the user cancels the import flow. ## 📸 Screenshots <img width="365" alt="image" src="https://github.com/user-attachments/assets/20f59963-d50b-46b8-b038-61fe7b2d9fcf" /> ## ⏰ 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-04-26 15:21:10 -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 Label pull-request
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
GiteaMirror ninjasurge
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: github-starred/android#47793
Delete Branch "%!s()"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?