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

[PR #6961] [MERGED] [PM-37916] chore: Align Premium subscription card line items with Web #86798

New Issue
Closed
opened 2026-05-23 01:02:24 -05:00 by GiteaMirror · 0 comments
GiteaMirror commented 2026-05-23 01:02:24 -05:00
Owner
Copy Link

📋 Pull Request Information

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

Base: main ← Head: premium-upgrade/align-subscription-card-with-web

📝 Commits (4)

  • 7a64dab [PM-37916] feat: Align Premium subscription card line items with Web
  • c4a16f3 [PM-37916] feat: Style Total row per design spec
  • 48b4b01 [PM-37916] feat: Refine Total row and description emphasis
  • 690cb3f [PM-37916] refactor: Default the common SubscriptionLineItem styles

📊 Changes

7 files changed (+293 additions, -55 deletions)

View changed files

📝 app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/feature/premium/plan/PlanScreen.kt (+85 -21)
📝 app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/feature/premium/plan/PlanViewModel.kt (+38 -14)
📝 app/src/test/kotlin/com/x8bit/bitwarden/ui/platform/feature/premium/plan/PlanScreenTest.kt (+81 -9)
📝 app/src/test/kotlin/com/x8bit/bitwarden/ui/platform/feature/premium/plan/PlanViewModelTest.kt (+75 -11)
📝 ui/src/main/kotlin/com/bitwarden/ui/platform/theme/type/BitwardenTypography.kt (+1 -0)
📝 ui/src/main/kotlin/com/bitwarden/ui/platform/theme/type/Typography.kt (+12 -0)
📝 ui/src/main/res/values/strings.xml (+1 -0)

📄 Description

🎟️ Tracking

PM-37916

📔 Objective

Align the Premium plan screen's subscription card with the canonical Web cart-summary contract: hide Discount and Storage rows when zero/absent (instead of rendering --), always render Estimated Tax ($0.00 when zero), and add a discrete Total row below Tax that carries the cadence suffix.

The header sentence summarizing the next charge is unchanged. The previous -- defaults are never user-visible — a DialogState.Loading overlay covers the screen during the subscription fetch.

📸 Screenshots

Figma Actual

🔄 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/6961 **Author:** [@SaintPatrck](https://github.com/SaintPatrck) **Created:** 5/21/2026 **Status:** ✅ Merged **Merged:** 5/22/2026 **Merged by:** [@SaintPatrck](https://github.com/SaintPatrck) **Base:** `main` ← **Head:** `premium-upgrade/align-subscription-card-with-web` --- ### 📝 Commits (4) - [`7a64dab`](https://github.com/bitwarden/android/commit/7a64dab25a4581be8d924940357f8549af4c39b9) [PM-37916] feat: Align Premium subscription card line items with Web - [`c4a16f3`](https://github.com/bitwarden/android/commit/c4a16f3fe3f01ce046d40de7f99e8f5dd8c52cb9) [PM-37916] feat: Style Total row per design spec - [`48b4b01`](https://github.com/bitwarden/android/commit/48b4b0189bedd11acabccb4627865344c31c4309) [PM-37916] feat: Refine Total row and description emphasis - [`690cb3f`](https://github.com/bitwarden/android/commit/690cb3fd16080c7f2092ad05692be11440379f74) [PM-37916] refactor: Default the common SubscriptionLineItem styles ### 📊 Changes **7 files changed** (+293 additions, -55 deletions) <details> <summary>View changed files</summary> 📝 `app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/feature/premium/plan/PlanScreen.kt` (+85 -21) 📝 `app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/feature/premium/plan/PlanViewModel.kt` (+38 -14) 📝 `app/src/test/kotlin/com/x8bit/bitwarden/ui/platform/feature/premium/plan/PlanScreenTest.kt` (+81 -9) 📝 `app/src/test/kotlin/com/x8bit/bitwarden/ui/platform/feature/premium/plan/PlanViewModelTest.kt` (+75 -11) 📝 `ui/src/main/kotlin/com/bitwarden/ui/platform/theme/type/BitwardenTypography.kt` (+1 -0) 📝 `ui/src/main/kotlin/com/bitwarden/ui/platform/theme/type/Typography.kt` (+12 -0) 📝 `ui/src/main/res/values/strings.xml` (+1 -0) </details> ### 📄 Description ## 🎟️ Tracking PM-37916 ## 📔 Objective Align the Premium plan screen's subscription card with the canonical Web cart-summary contract: hide Discount and Storage rows when zero/absent (instead of rendering `--`), always render Estimated Tax (`$0.00` when zero), and add a discrete Total row below Tax that carries the cadence suffix. The header sentence summarizing the next charge is unchanged. The previous `--` defaults are never user-visible — a `DialogState.Loading` overlay covers the screen during the subscription fetch. ## 📸 Screenshots | Figma | Actual | |--------|--------| | <img width="365" src="https://github.com/user-attachments/assets/20ecfbe5-b79c-458b-977c-94e338617dc9" /> | <img width="365" src="https://github.com/user-attachments/assets/3639a38d-5958-40b6-912b-44c8838d15fe" /> | | <img width="365" src="https://github.com/user-attachments/assets/99b30c62-73f3-4bf8-b103-55cdb11cf2a8" /> | <img width="365" src="https://github.com/user-attachments/assets/b131eb61-ea74-4efd-887d-44ce1fa2f5a4" /> | --- <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-05-23 01:02:24 -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#86798
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?