Repository navigation
The Trial status sheet offers a pack owner the upgrade, not full Pro (#962) - #967
Merged
Merged
Conversation
…962) TrialStatusSheet always offered full Pro. It now asks PackOffer.items, as the paywall and Settings do, and offers upgradeProduct to someone who bought a pack. The button stays disabled until that product loads, and anyone without a bought pack sees what they saw before. Assisted-by: Claude Code:claude-opus-5-5
Skeyelab
enabled auto-merge (squash)
October 27, 2026 02:49
Closed
2 tasks
Codecov Report✅ All modified and coverable lines are covered by tests. 📢 Thoughts on this report? Let us know! |
Skeyelab
added a commit
that referenced
this pull request
Oct 27, 2026
…) (#970) Since #967 the sheet's button offers a pack owner the upgrade, but the notice above it still read "Pro is a one-time purchase of <full price>". TrialStatusNotice takes an upgrade flag, and the sheet passes the offered product's price, so the line reads "The upgrade to Pro is a one-time purchase of <upgrade price>". Everyone else reads what they read before. Assisted-by: Claude Code:claude-opus-5-5
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
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.
Fixes #962.
The Trial status sheet now offers
ProStore.upgradeProduct("Upgrade to Pro, ") to someone who bought a mixer pack, when packs are offered in this build. It decides withPackOffer.items, the same logic PaywallSheet and ProSection use, through a newTrialStatusSheet.offer(_:). If the upgrade product isn't loaded, the button shows but is disabled, as in ProSection, and the footnote says "The upgrade isn't available right now." Anyone without a bought pack (including a pack shared only through Family Sharing) sees what they saw before, and the Pro button still callsbuyPro().Branched from main, not stacked on #966: the two touch different code.
Tests (AppTests/TrialSheetTests)
packOwnerInTheTrialIsOfferedTheUpgrade: red first. Withofferreturning today's behavior (.pro):✘ ... Expectation failed: TrialStatusSheet.offer(store(owning: [pack])) == .upgrade. It passes after the fix.trialWithoutAPackIsOfferedProandtrialWithOnlyASharedPackIsOfferedPro: passed on their first run. They are regression guards.The tests cover the offer decision, not the SwiftUI button's disabled state or the dismiss after buying.
Full
./scripts/verify.shpassed: macOS build and AppTests, iOS Simulator build, 94s.Not checked or left out