[PM-34773] Fix storage addition during active Phase 2 of schedule#7420
Merged
amorask-bitwarden merged 2 commits intoApr 8, 2026
Merged
Conversation
|
Contributor
|
New Issues (121)Checkmarx found the following issues in this Pull Request
|
cyprain-okeke
approved these changes
Apr 8, 2026
amorask-bitwarden
deleted the
billing/PM-34773/fix-phase2-storage-addition
branch
Codecov Report❌ Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #7420 +/- ##
==========================================
+ Coverage 58.49% 58.50% +0.01%
==========================================
Files 2063 2063
Lines 91190 91241 +51
Branches 8130 8130
==========================================
+ Hits 53343 53383 +40
- Misses 35948 35959 +11
Partials 1899 1899 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
amorask-bitwarden
added a commit
that referenced
this pull request
Apr 8, 2026
(cherry picked from commit a5052d8)
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
🎟️ Tracking
https://bitwarden.atlassian.net/browse/PM-34773
📔 Objective
Fixes a 500 error when adding or removing storage for Premium users or Families organizations whose subscription schedule has transitioned to Phase 2 (the migrated price is active).
The schedule-aware storage commands (introduced in PM-33898) reconstructed both schedule phases when updating storage. After Phase 2 activates, Phase 1's dates are in the past and Stripe rejects updates to ended phases. This PR:
EndDatehas passed, sending only the active phase(s) to Stripesubscription.TestClock.FrozenTimefor accurate phase-ended detection in test clock environments📸 Screenshots
Screen.Recording.2026-04-08.at.9.22.00.AM.mov