[PM-25825] Add ImportItems navigation #5915

SaintPatrck · 2025-09-19T18:41:55Z

🎟️ Tracking

PM-25825

📔 Objective

Implement navigation for the Import items screen.

Upon completion of the import process a Snackbar or Dialog is displayed to inform the user of the result.

If the import and re-sync is successful a Snackbar is displayed, informing the user how many items were imported.

If the import is successful but sync fails, a Snackbar is displayed, along with an option to retry sync.

If the import process cannot complete, a dialog is displayed prompting the user to try again or contact support.

Additionally, the VAULT_SYNC_FAILED Snackbar relay has been removed as it is no longer necessary.

📸 Screenshots

Screen_recording_20250922_152043.mp4

github-actions · 2025-09-19T18:46:57Z

Checkmarx One – Scan Summary & Details – d14970f2-3bf6-4714-be56-4a96d6c289ae

Great job! No new security vulnerabilities introduced in this pull request

…Vault screen This commit refactors the navigation flow by removing the direct navigation options to "My Vault" and "Import Items" from the main Vault screen and related areas. Specific changes include: - Removed `onNavigateToMyVault` and `onNavigateToImportItems` parameters and their usages from `VaultNavigation.kt`, `VaultScreen.kt`, `VaultGraphNavigation.kt`, and `VaultUnlockedNavBarScreen.kt`. - Removed `NavigateToMyVault` and `NavigateToImportItems` events from `VaultViewModel.kt`. - Updated `ImportItemsNavigation.kt` to rename `navigateToImportItemsGraph` to `navigateToImportItemsScreen` and removed `onNavigateToMyVault` from `importItemsDestination`. - Modified `ImportItemsViewModel.kt` and `ImportItemsScreen.kt` to handle sync failures with a "Try Again" option and display snackbars for import/sync status, removing the automatic navigation to the vault after import. - Adjusted tests in `ImportItemsViewModelTest.kt`, `ImportItemsScreenTest.kt`, and `VaultUnlockedNavBarScreenTest.kt` to reflect these navigation and UI changes. - Updated `SettingsNavigation.kt` to remove `onNavigateToMyVault` parameter from `settingsGraph`. - Removed `navigateToVaultGraphRoot` from `VaultGraphNavigation.kt`.

…-navigation

This commit refactors the navigation to the import logins screen. The `onNavigateToImportLogins` parameter is now passed down from the `settingsGraph` to the `importItemsDestination`. This makes the navigation more explicit and easier to follow.

This commit removes an unused import of `NavHostController` from `VaultUnlockedNavBarNavigation.kt`.

david-livefront · 2025-09-22T19:34:16Z

app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/importitems/ImportItemsViewModel.kt

+                    data = BitwardenSnackbarData(
+                        message = BitwardenString.syncing_complete.asText(),
+                    ),
+                    relay = SnackbarRelay.LOGINS_IMPORTED,


Is this VM sending this to itself?

Can we just send the ShowBasicSnackbar event here?

david-livefront · 2025-09-22T19:34:51Z

...est/kotlin/com/x8bit/bitwarden/ui/platform/feature/settings/vault/VaultSettingsScreenTest.kt

                onNavigateToFolders = { onNavigateToFoldersCalled = true },
                onNavigateToImportLogins = { onNavigateToImportLoginsCalled = true },
+                onNavigateToImportItems = { onNavigateToImportItemsCalled = true },
+


Can we drop this newline

david-livefront · 2025-09-22T19:36:14Z

.../kotlin/com/x8bit/bitwarden/ui/platform/feature/settings/vault/VaultSettingsViewModelTest.kt

    private fun createViewModel(): VaultSettingsViewModel = VaultSettingsViewModel(
        firstTimeActionManager = firstTimeActionManager,
        snackbarRelayManager = snackbarRelayManager,
+        featureFlagManager = featureFlagManager,


Should we have a test for when the flag is set or not set?

david-livefront · 2025-09-22T19:40:38Z

app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/importitems/ImportItemsViewModel.kt

+                message = BitwardenString
+                    .your_items_have_been_successfully_imported_but_could_not_sync_vault
+                    .asText(),
+                actionLabel = BitwardenString.try_again.asText(),


Same thing here, would this event be needed anywhere. I assume that if the import process fails, we would not navigate?

You're right. Now that we're not navigating we can trigger these locally. 🚀

Sweet, same thing for the failure too, right?

Correct. We no longer need the snackbar relay manager or the VAULT_SYNC_FAILURE either, since everything is contained in the VM.

This commit refactors the `ImportItemsViewModel` to remove its dependency on `SnackbarRelayManager`. Snackbar events are now sent directly as `ImportItemsEvent`s. This change simplifies the ViewModel's logic and removes the need for `SnackbarRelayManager` in this context. Tests have been updated to reflect these changes. #5915 (comment)

The `ImportItemsClick` action in `VaultSettingsViewModelTest` now checks the `CredentialExchangeProtocolImport` feature flag. - If the flag is disabled, it emits `NavigateToImportVault`. - If the flag is enabled, it emits `NavigateToImportItems`. #5915 (comment)

This commit removes an unnecessary blank line from the `VaultSettingsScreenTest.kt` file. #5915 (comment)

david-livefront · 2025-09-22T20:31:49Z

app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/manager/snackbar/SnackbarRelay.kt

    LOGINS_IMPORTED,
    SEND_DELETED,
    SEND_UPDATED,
-    VAULT_SYNC_FAILED,


codecov · 2025-09-22T21:32:38Z

Codecov Report

❌ Patch coverage is 85.52632% with 11 lines in your changes missing coverage. Please review.
✅ Project coverage is 84.25%. Comparing base (ad46d8d) to head (7fda17d).
⚠️ Report is 3 commits behind head on main.

Files with missing lines	Patch %	Lines
.../ui/vault/feature/importitems/ImportItemsScreen.kt	41.66%	7 Missing ⚠️
...ui/platform/feature/settings/SettingsNavigation.kt	75.00%	1 Missing ⚠️
.../feature/settings/vault/VaultSettingsNavigation.kt	0.00%	1 Missing ⚠️
...form/feature/settings/vault/VaultSettingsScreen.kt	0.00%	0 Missing and 1 partial ⚠️
...e/vaultunlockednavbar/VaultUnlockedNavBarScreen.kt	0.00%	1 Missing ⚠️

Additional details and impacted files

@@            Coverage Diff             @@
##             main    #5915      +/-   ##
==========================================
+ Coverage   84.23%   84.25%   +0.01%     
==========================================
  Files         729      713      -16     
  Lines       54011    53671     -340     
  Branches     7389     7395       +6     
==========================================
- Hits        45497    45221     -276     
+ Misses       5912     5854      -58     
+ Partials     2602     2596       -6

☔ View full report in Codecov by Sentry.
📢 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.

Add ImportItems navigation

f8277f2

SaintPatrck added the hold do not merge yet label Sep 19, 2025

david-livefront and others added 7 commits September 19, 2025 13:58

Testing 123

6e0835c

Testing 456

9243f78

Merge remote-tracking branch 'origin/main' into cxf/app/import-logins…

de96c0e

…-navigation

Refactor import logins navigation

98ea780

This commit refactors the navigation to the import logins screen. The `onNavigateToImportLogins` parameter is now passed down from the `settingsGraph` to the `importItemsDestination`. This makes the navigation more explicit and easier to follow.

Rename ImportItemsGraphRoute to ImportItemsRoute

eed0270

Remove unused NavHostController import

c740b1d

This commit removes an unused import of `NavHostController` from `VaultUnlockedNavBarNavigation.kt`.

SaintPatrck marked this pull request as ready for review September 22, 2025 19:27

SaintPatrck requested review from a team, brian-livefront and david-livefront as code owners September 22, 2025 19:27

SaintPatrck changed the title ~~Add ImportItems navigation~~ [PM-25825] Add ImportItems navigation Sep 22, 2025

david-livefront reviewed Sep 22, 2025

View reviewed changes

SaintPatrck added 4 commits September 22, 2025 16:20

Refactor: Remove blank line in VaultSettingsScreenTest

72709d6

This commit removes an unnecessary blank line from the `VaultSettingsScreenTest.kt` file. #5915 (comment)

Remove VAULT_SYNC_FAILED from SnackbarRelay

344619f

SaintPatrck requested a review from david-livefront September 22, 2025 20:27

SaintPatrck removed the hold do not merge yet label Sep 22, 2025

david-livefront reviewed Sep 22, 2025

View reviewed changes

david-livefront previously approved these changes Sep 22, 2025

View reviewed changes

SaintPatrck enabled auto-merge September 22, 2025 20:34

Fix failing test

7fda17d

SaintPatrck dismissed david-livefront’s stale review via 7fda17d September 22, 2025 21:03

david-livefront approved these changes Sep 22, 2025

View reviewed changes

SaintPatrck added this pull request to the merge queue Sep 22, 2025

Merged via the queue into main with commit 8a2bcfa Sep 22, 2025
9 checks passed

SaintPatrck deleted the cxf/app/import-logins-navigation branch September 22, 2025 22:00

[PM-25825] Add ImportItems navigation #5915

[PM-25825] Add ImportItems navigation #5915

Uh oh!

Conversation

SaintPatrck commented Sep 19, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

🎟️ Tracking

📔 Objective

📸 Screenshots

Uh oh!

github-actions bot commented Sep 19, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Great job! No new security vulnerabilities introduced in this pull request

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

codecov bot commented Sep 22, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

SaintPatrck commented Sep 19, 2025 •

edited

Loading

github-actions bot commented Sep 19, 2025 •

edited

Loading

codecov bot commented Sep 22, 2025 •

edited

Loading