github-starred/android
2
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2026-06-20 20:47:48 -05:00
Code Issues 2.4k Packages Projects Releases 129 Wiki Activity

[PR #6989] [MERGED] [PM-38279] fix: Hide Cancel Premium action for Update payment status #107242

New Issue
Closed
opened 2026-06-03 13:46:36 -05:00 by GiteaMirror · 0 comments
GiteaMirror commented 2026-06-03 13:46:36 -05:00
Owner
Copy Link

📋 Pull Request Information

Original PR: https://github.com/bitwarden/android/pull/6989
Author: @SaintPatrck
Created: 5/28/2026
Status: ✅ Merged
Merged: 5/28/2026
Merged by: @SaintPatrck

Base: main ← Head: premium-upgrade/pm-38279-hide-cancel-update-payment

📝 Commits (2)

  • 84a081c [PM-38279] fix: Hide Cancel Premium action for Update payment status
  • 6cc1752 Remove duplicate UpdatePayment cancel-button test

📊 Changes

2 files changed (+5 additions, -3 deletions)

View changed files

📝 app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/feature/premium/plan/PlanViewModel.kt (+4 -3)
📝 app/src/test/kotlin/com/x8bit/bitwarden/ui/platform/feature/premium/plan/PlanViewModelTest.kt (+1 -0)

📄 Description

🎟️ Tracking

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

📔 Objective

When a subscription is in the Update payment state (mapped from the INCOMPLETE/UNPAID Stripe substates), the member's path back to a healthy subscription is updating their payment method — not canceling. Offering a "Cancel Premium" action in that state is misleading and works against recovery.

This moves UPDATE_PAYMENT into the non-cancelable arm of canBeCanceled(), so the Plan screen no longer renders the "Cancel Premium" button for that status. It now sits alongside the other non-cancelable states (CANCELED, PENDING_CANCELLATION). All other live states (ACTIVE, PAST_DUE, PAUSED) are unchanged.

📸 Screenshots

Before After

🔄 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/6989 **Author:** [@SaintPatrck](https://github.com/SaintPatrck) **Created:** 5/28/2026 **Status:** ✅ Merged **Merged:** 5/28/2026 **Merged by:** [@SaintPatrck](https://github.com/SaintPatrck) **Base:** `main` ← **Head:** `premium-upgrade/pm-38279-hide-cancel-update-payment` --- ### 📝 Commits (2) - [`84a081c`](https://github.com/bitwarden/android/commit/84a081c1b241f31dcbe9a9e3f3752d28785672cd) [PM-38279] fix: Hide Cancel Premium action for Update payment status - [`6cc1752`](https://github.com/bitwarden/android/commit/6cc1752fdb6b7d0db17cd93ba8840557f67c46a7) Remove duplicate UpdatePayment cancel-button test ### 📊 Changes **2 files changed** (+5 additions, -3 deletions) <details> <summary>View changed files</summary> 📝 `app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/feature/premium/plan/PlanViewModel.kt` (+4 -3) 📝 `app/src/test/kotlin/com/x8bit/bitwarden/ui/platform/feature/premium/plan/PlanViewModelTest.kt` (+1 -0) </details> ### 📄 Description ## 🎟️ Tracking https://bitwarden.atlassian.net/browse/PM-38279 ## 📔 Objective When a subscription is in the **Update payment** state (mapped from the `INCOMPLETE`/`UNPAID` Stripe substates), the member's path back to a healthy subscription is updating their payment method — not canceling. Offering a "Cancel Premium" action in that state is misleading and works against recovery. This moves `UPDATE_PAYMENT` into the non-cancelable arm of `canBeCanceled()`, so the Plan screen no longer renders the "Cancel Premium" button for that status. It now sits alongside the other non-cancelable states (`CANCELED`, `PENDING_CANCELLATION`). All other live states (`ACTIVE`, `PAST_DUE`, `PAUSED`) are unchanged. ## 📸 Screenshots | Before | After | |--------|--------| | <img width="365" src="https://github.com/user-attachments/assets/809eacef-b7d8-4f3b-8f37-07b4bace4193" /> | <img width="365" src="https://github.com/user-attachments/assets/abfb5436-607d-4d4e-bddb-f785d3f699d2" /> | --- <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-03 13:46:36 -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#107242
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?