github-starred/android
2
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2026-05-07 19:39:41 -05:00
Code Issues 1.1k Packages Projects Releases 122 Wiki Activity

[PR #6796] [PM-33519] feat: Rewire upgrade CTAs to use conditional routing #19628

New Issue
Open
opened 2026-04-15 03:56:23 -05:00 by GiteaMirror · 0 comments
GiteaMirror commented 2026-04-15 03:56:23 -05:00
Owner
Copy Link

📋 Pull Request Information

Original PR: https://github.com/bitwarden/android/pull/6796
Author: @SaintPatrck
Created: 4/14/2026
Status: 🔄 Open

Base: premium-upgrade/PM-33518-upgrade-available-flow ← Head: premium-upgrade/PM-33519-rewire-ctas

📝 Commits (1)

  • 6dc994e [PM-33519] feat: Rewire existing upgrade CTAs to use conditional routing

📊 Changes

30 files changed (+384 additions, -104 deletions)

View changed files

📝 app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/feature/search/SearchNavigation.kt (+3 -0)
📝 app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/feature/search/SearchScreen.kt (+2 -0)
📝 app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/feature/search/SearchViewModel.kt (+17 -3)
📝 app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/feature/vaultunlocked/VaultUnlockedNavigation.kt (+5 -0)
📝 app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/feature/vaultunlockednavbar/VaultUnlockedNavBarScreen.kt (+1 -0)
📝 app/src/main/kotlin/com/x8bit/bitwarden/ui/tools/feature/send/SendGraphNavigation.kt (+2 -0)
📝 app/src/main/kotlin/com/x8bit/bitwarden/ui/tools/feature/send/addedit/AddEditSendNavigation.kt (+2 -0)
📝 app/src/main/kotlin/com/x8bit/bitwarden/ui/tools/feature/send/addedit/AddEditSendScreen.kt (+3 -0)
📝 app/src/main/kotlin/com/x8bit/bitwarden/ui/tools/feature/send/addedit/AddEditSendViewModel.kt (+20 -9)
📝 app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditNavigation.kt (+2 -0)
📝 app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditScreen.kt (+3 -0)
📝 app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditViewModel.kt (+20 -6)
📝 app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemNavigation.kt (+2 -0)
📝 app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemScreen.kt (+3 -0)
📝 app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemViewModel.kt (+17 -3)
📝 app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingNavigation.kt (+8 -0)
📝 app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingScreen.kt (+3 -0)
📝 app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingViewModel.kt (+17 -3)
📝 app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/vault/VaultGraphNavigation.kt (+1 -0)
📝 app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/vault/VaultViewModel.kt (+10 -3)

...and 10 more files

📄 Description

🎟️ Tracking

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

📔 Objective

Rewire all existing premium upgrade CTAs across the app to conditionally route to either the in-app PlanScreen (modal) or the external web vault URL based on isInAppUpgradeAvailableFlow.

Stacked on PM-33518 PR (upgrade available flow)

Changes

  • Inject PremiumStateManager into ViewModels that have upgrade CTAs: VaultViewModel, VaultItemViewModel, VaultItemListingViewModel, VaultAddEditViewModel, AddEditSendViewModel, SearchViewModel
  • Add NavigateToPlanModal event and onNavigateToPlan callback to affected screens and navigation graphs
  • Conditionally route: if in-app upgrade available → navigate to PlanScreen modal; otherwise → launch web vault URL as before
  • Thread onNavigateToPlan through VaultUnlockedNavigation, VaultGraphNavigation, SendGraphNavigation, and all affected screen destinations
  • Full test coverage for conditional routing in all affected ViewModels and Screens

🔄 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/6796 **Author:** [@SaintPatrck](https://github.com/SaintPatrck) **Created:** 4/14/2026 **Status:** 🔄 Open **Base:** `premium-upgrade/PM-33518-upgrade-available-flow` ← **Head:** `premium-upgrade/PM-33519-rewire-ctas` --- ### 📝 Commits (1) - [`6dc994e`](https://github.com/bitwarden/android/commit/6dc994e755dd843308c4dd14981e4c83c56a1d5b) [PM-33519] feat: Rewire existing upgrade CTAs to use conditional routing ### 📊 Changes **30 files changed** (+384 additions, -104 deletions) <details> <summary>View changed files</summary> 📝 `app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/feature/search/SearchNavigation.kt` (+3 -0) 📝 `app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/feature/search/SearchScreen.kt` (+2 -0) 📝 `app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/feature/search/SearchViewModel.kt` (+17 -3) 📝 `app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/feature/vaultunlocked/VaultUnlockedNavigation.kt` (+5 -0) 📝 `app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/feature/vaultunlockednavbar/VaultUnlockedNavBarScreen.kt` (+1 -0) 📝 `app/src/main/kotlin/com/x8bit/bitwarden/ui/tools/feature/send/SendGraphNavigation.kt` (+2 -0) 📝 `app/src/main/kotlin/com/x8bit/bitwarden/ui/tools/feature/send/addedit/AddEditSendNavigation.kt` (+2 -0) 📝 `app/src/main/kotlin/com/x8bit/bitwarden/ui/tools/feature/send/addedit/AddEditSendScreen.kt` (+3 -0) 📝 `app/src/main/kotlin/com/x8bit/bitwarden/ui/tools/feature/send/addedit/AddEditSendViewModel.kt` (+20 -9) 📝 `app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditNavigation.kt` (+2 -0) 📝 `app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditScreen.kt` (+3 -0) 📝 `app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditViewModel.kt` (+20 -6) 📝 `app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemNavigation.kt` (+2 -0) 📝 `app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemScreen.kt` (+3 -0) 📝 `app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemViewModel.kt` (+17 -3) 📝 `app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingNavigation.kt` (+8 -0) 📝 `app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingScreen.kt` (+3 -0) 📝 `app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingViewModel.kt` (+17 -3) 📝 `app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/vault/VaultGraphNavigation.kt` (+1 -0) 📝 `app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/vault/VaultViewModel.kt` (+10 -3) _...and 10 more files_ </details> ### 📄 Description ## 🎟️ Tracking https://bitwarden.atlassian.net/browse/PM-33519 ## 📔 Objective Rewire all existing premium upgrade CTAs across the app to conditionally route to either the in-app PlanScreen (modal) or the external web vault URL based on `isInAppUpgradeAvailableFlow`. **Stacked on PM-33518 PR** (upgrade available flow) ### Changes - Inject `PremiumStateManager` into ViewModels that have upgrade CTAs: VaultViewModel, VaultItemViewModel, VaultItemListingViewModel, VaultAddEditViewModel, AddEditSendViewModel, SearchViewModel - Add `NavigateToPlanModal` event and `onNavigateToPlan` callback to affected screens and navigation graphs - Conditionally route: if in-app upgrade available → navigate to PlanScreen modal; otherwise → launch web vault URL as before - Thread `onNavigateToPlan` through VaultUnlockedNavigation, VaultGraphNavigation, SendGraphNavigation, and all affected screen destinations - Full test coverage for conditional routing in all affected ViewModels and Screens --- <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-15 03:56:23 -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#19628
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?