fix(paywalls): skip workflow fetch for offerings with no mapped workflow by facumenzella · Pull Request #7002 · RevenueCat/purchases-ios

facumenzella · 2026-06-15T11:57:19Z

Checklist

If applicable, unit tests
If applicable, create follow-up issues for purchases-android and hybrids

Motivation

With workflows enabled, presenting a paywall for an offering that only has a legacy paywall (no workflow on the backend) threw the user into an error state instead of just rendering the legacy paywall.

Port of RevenueCat/purchases-android#3598

Description

Route an offering to the workflows endpoint only when offering.paywall == nil (the durable marker of a non-legacy paywall). A legacy offering (paywall != nil) renders its own paywall directly, no workflow fetch. Same gate is applied to the synchronous cache seed so it stays consistent with the async path.

AI session context

AI Context

Metadata

PR: fix(paywalls): skip workflow fetch for offerings with no mapped workflow #7002 (draft)
Branch: port/android-3598
Author / human owner: facumenzella
Agent(s): Claude Code (Opus 4.8 1M), codex review + adversarial-review, /simplify
Session source: current conversation
Generated: 2026-06-15
Context document version: 2

Goal

Port purchases-android #3598 to iOS: when workflows are enabled and an offering only has a legacy paywall, render it directly instead of firing a workflow fetch that 404s into an error state.

Initial Prompt

"We need to port RevenueCat/purchases-android#3598 to iOS. Do it, then run /codex-review-fix-loop."

Key Implementation Decisions

Decision: gate on offering.paywall == nil (route to workflows endpoint only for non-legacy offerings).
- Rationale: offering.paywall is the durable, intrinsic marker of a legacy v1 paywall; it doesn't depend on the timing of the workflows-list fetch. Matches the final merged Android Prepare next version: 4.33.0-SNAPSHOT #3598.
- Rejected: gating on the offeringId → workflowId map presence (an earlier Android iteration, ported first). An offering not yet migrated to workflows is missing from the map, so a real workflow offering could be wrongly treated as legacy on a cold/stale cache. Switched after @vegaro's review pointed at the .paywall approach.
Decision: keep Purchases.workflow(forOfferingIdentifier:)'s map-or-?? offeringID resolution.
- Rationale: matches Android's workflowIdForOfferingId(id) ?: id; the backend lazily converts an offering id into a workflow for paywalls not yet migrated.
Decision: apply the same paywall == nil guard to the synchronous cache seed (cachedInitialWorkflowContext).
- Rationale: keep the sync seed consistent with the async gate so a legacy offering never briefly seeds a workflow paywall.

Files / Symbols Touched

RevenueCatUI/Purchasing/PurchaseHandler.swift — resolvePaywallViewData gate (offering.paywall == nil), unified per-content resolution, cachedInitialWorkflowContext guard.
RevenueCatUI/Purchasing/PaywallPurchasesType.swift, Sources/Purchasing/Purchases/Purchases.swift, RevenueCatUI/Purchasing/MockPurchases.swift, RevenueCatUI/Views/LoadingPaywallView.swift — removed the interim cachedWorkflowId(forOfferingIdentifier:) surface.
RevenueCatUI/Data/Strings.swift — removed the interim warning string.
Tests/RevenueCatUITests/Data/PaywallViewConfigurationTests.swift — workflow tests use paywall: nil trigger offerings; new legacy-render + sync-seed-guard tests.

API Impact

No consumer-facing public API change. No new @_spi(Internal) surface (the interim cachedWorkflowId addition was removed during the rework).

Validation

Commands run:
- swift build: build complete.
- xcodebuild test over PaywallViewConfigurationTests (18), PurchaseHandlerTests, WorkflowPaywallViewTests, PaywallViewControllerExitOfferTests: all pass, 0 failures.
- swiftlint: no violations.
Branch rebased on current main. check-api-changes-revenuecatui AVFoundation drift was an unrelated main-wide issue fixed upstream by Update baseline swiftinterface files for main #7004.
CI: not yet green end-to-end on this revision (draft).

Review Focus

Confirm the iOS offering.paywall == nil semantics match Android (v1 legacy carries paywall; workflow / V2-components offerings have paywall == nil and route through the endpoint).

Risks / Reviewer Notes

Risk: an offering carrying both a legacy paywall and a configured workflow would render legacy (paywall wins). Matches Android's deliberate choice; paywall is the durable marker.

Omitted Context

Raw transcript, tool logs, and chain-of-thought were omitted.

Under workflows-enabled, presenting a paywall for an offering with only a legacy paywall (no workflow on the backend) fired a workflow fetch that 404'd and surfaced an error state instead of rendering the legacy paywall. Gate the workflow path on the offeringId -> workflowId map: no mapping renders the legacy paywall with no network call. Offerings are fetched first so the map is populated before the decision, avoiding a cold-cache downgrade of real workflow offerings. Port of RevenueCat/purchases-android#3598 Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

cursor

Cursor Bugbot has reviewed your changes and found 2 potential issues.

^{❌ Bugbot Autofix is OFF. To automatically fix reported issues with cloud agents, have a team admin enable autofix in the Cursor dashboard.}

^{Reviewed by Cursor Bugbot for commit e6a9a39. Configure here.}

Aligns with the merged purchases-android #3598: route an offering to the workflows endpoint only when `offering.paywall == nil` (the durable marker of a non-legacy paywall), instead of checking the offeringId -> workflowId map. The map check was an intermediate approach the Android PR abandoned: an offering not yet migrated to workflows is missing from the map, which would wrongly fall back to legacy for a real workflow offering. Reading offering.paywall is authoritative and removes the timing dependency on the map. Drops the cachedWorkflowId plumbing (no longer needed; Purchases.workflow already resolves the workflow id with an offering-id fallback) and the now-unused warning string. Applies the same gate to the synchronous cache seed for consistency. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

vegaro

looks great and the code is easier to follow

* fix(paywalls): skip workflow fetch for offerings with no mapped workflow (#7002) * fix(paywalls): skip workflow fetch for offerings with no mapped workflow Under workflows-enabled, presenting a paywall for an offering with only a legacy paywall (no workflow on the backend) fired a workflow fetch that 404'd and surfaced an error state instead of rendering the legacy paywall. Gate the workflow path on the offeringId -> workflowId map: no mapping renders the legacy paywall with no network call. Offerings are fetched first so the map is populated before the decision, avoiding a cold-cache downgrade of real workflow offerings. Port of RevenueCat/purchases-android#3598 Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * Gate legacy-vs-workflow on offering.paywall, not the workflows map Aligns with the merged purchases-android #3598: route an offering to the workflows endpoint only when `offering.paywall == nil` (the durable marker of a non-legacy paywall), instead of checking the offeringId -> workflowId map. The map check was an intermediate approach the Android PR abandoned: an offering not yet migrated to workflows is missing from the map, which would wrongly fall back to legacy for a real workflow offering. Reading offering.paywall is authoritative and removes the timing dependency on the map. Drops the cachedWorkflowId plumbing (no longer needed; Purchases.workflow already resolves the workflow id with an offering-id fallback) and the now-unused warning string. Applies the same gate to the synchronous cache seed for consistency. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * Rename PaywallComponentsData.state → stateDeclarations --------- Co-authored-by: Facundo Menzella <facumenzella@users.noreply.github.com> Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

…low (#7002) * fix(paywalls): skip workflow fetch for offerings with no mapped workflow Under workflows-enabled, presenting a paywall for an offering with only a legacy paywall (no workflow on the backend) fired a workflow fetch that 404'd and surfaced an error state instead of rendering the legacy paywall. Gate the workflow path on the offeringId -> workflowId map: no mapping renders the legacy paywall with no network call. Offerings are fetched first so the map is populated before the decision, avoiding a cold-cache downgrade of real workflow offerings. Port of RevenueCat/purchases-android#3598 Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * Gate legacy-vs-workflow on offering.paywall, not the workflows map Aligns with the merged purchases-android #3598: route an offering to the workflows endpoint only when `offering.paywall == nil` (the durable marker of a non-legacy paywall), instead of checking the offeringId -> workflowId map. The map check was an intermediate approach the Android PR abandoned: an offering not yet migrated to workflows is missing from the map, which would wrongly fall back to legacy for a real workflow offering. Reading offering.paywall is authoritative and removes the timing dependency on the map. Drops the cachedWorkflowId plumbing (no longer needed; Purchases.workflow already resolves the workflow id with an offering-id fallback) and the now-unused warning string. Applies the same gate to the synchronous cache seed for consistency. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

* feat(RevenueCatUI): evaluate state conditions in the override resolver * fix(paywalls): skip workflow fetch for offerings with no mapped workflow (#7002) * fix(paywalls): skip workflow fetch for offerings with no mapped workflow Under workflows-enabled, presenting a paywall for an offering with only a legacy paywall (no workflow on the backend) fired a workflow fetch that 404'd and surfaced an error state instead of rendering the legacy paywall. Gate the workflow path on the offeringId -> workflowId map: no mapping renders the legacy paywall with no network call. Offerings are fetched first so the map is populated before the decision, avoiding a cold-cache downgrade of real workflow offerings. Port of RevenueCat/purchases-android#3598 Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * Gate legacy-vs-workflow on offering.paywall, not the workflows map Aligns with the merged purchases-android #3598: route an offering to the workflows endpoint only when `offering.paywall == nil` (the durable marker of a non-legacy paywall), instead of checking the offeringId -> workflowId map. The map check was an intermediate approach the Android PR abandoned: an offering not yet migrated to workflows is missing from the map, which would wrongly fall back to legacy for a real workflow offering. Reading offering.paywall is authoritative and removes the timing dependency on the map. Drops the cachedWorkflowId plumbing (no longer needed; Purchases.workflow already resolves the workflow id with an offering-id fallback) and the now-unused warning string. Applies the same gate to the synchronous cache seed for consistency. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * feat(RevenueCatUI): broadcast paywall state snapshot via environment values * feat(RevenueCatUI): re-resolve component overrides from paywall state * feat(RevenueCatUI): publish Tabs selected state into the store * test(RevenueCatUI): add PaywallsTester sample for state-driven tabs * Use state declarations as decoding key * fix(paywalls): seed workflow state store with page declarations * Revert "fix(paywalls): seed workflow state store with page declarations" This reverts commit b555709. * fix(paywalls): stop stale state env from overriding workflow values * Use stateDeclarations wire key in state decoding tests * Revert Package.resolved to main --------- Co-authored-by: Facundo Menzella <facumenzella@users.noreply.github.com> Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

facumenzella added the pr:other label Jun 15, 2026

facumenzella force-pushed the port/android-3598 branch from 86fd449 to b440a0a Compare June 15, 2026 12:43

Merge remote-tracking branch 'origin/main' into port/android-3598

17608fe

facumenzella marked this pull request as ready for review June 15, 2026 12:47

facumenzella requested review from a team as code owners June 15, 2026 12:47

vegaro reviewed Jun 15, 2026

View reviewed changes

Comment thread RevenueCatUI/Purchasing/PurchaseHandler.swift Outdated

Merge branch 'main' into port/android-3598

e6a9a39

cursor Bot reviewed Jun 15, 2026

View reviewed changes

Comment thread RevenueCatUI/Purchasing/PurchaseHandler.swift

Comment thread RevenueCatUI/Purchasing/PurchaseHandler.swift

facumenzella and others added 2 commits June 15, 2026 15:53

Merge branch 'main' into port/android-3598

89f3924

facumenzella requested a review from vegaro June 15, 2026 14:06

vegaro approved these changes Jun 15, 2026

View reviewed changes

facumenzella merged commit ba9380f into main Jun 15, 2026
18 of 20 checks passed

facumenzella deleted the port/android-3598 branch June 15, 2026 15:06

facumenzella mentioned this pull request Jun 16, 2026

Enable workflows by default #6947

Draft

RCGitBot mentioned this pull request Jun 17, 2026

[AUTOMATIC] Release/5.79.0 #7031

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

fix(paywalls): skip workflow fetch for offerings with no mapped workflow#7002

fix(paywalls): skip workflow fetch for offerings with no mapped workflow#7002
facumenzella merged 5 commits into
mainfrom
port/android-3598

facumenzella commented Jun 15, 2026 •

edited

Loading

Uh oh!

Uh oh!

cursor Bot left a comment

Uh oh!

Uh oh!

Uh oh!

vegaro left a comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Uh oh!

Conversation

facumenzella commented Jun 15, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Checklist

Motivation

Description

AI Context

Metadata

Goal

Initial Prompt

Key Implementation Decisions

Files / Symbols Touched

API Impact

Validation

Review Focus

Risks / Reviewer Notes

Omitted Context

Uh oh!

Uh oh!

cursor Bot left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

vegaro left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

facumenzella commented Jun 15, 2026 •

edited

Loading