Changes : Added Pro paywall and AI usage gates#56
Merged
Merged
Conversation
- Added RevenueCat subscription provider, paywall screens, plan cards, and feature access hooks
- Gated AI chat, entry reflections, and insight reports behind free/Pro monthly limits
- Added Supabase subscription status and AI usage ledger migration plus Edge Function enforcement
- Added RevenueCat environment keys, billing permission, app version bump, and setup docs
- Added Maestro smoke flows, test IDs, and E2E selector documentation
- Improved App Lock controls and fixed preview logout crash during auth navigation
|
Warning Review limit reached
Next review available in: 48 seconds Enable usage-based reviews in Billing to review now. Otherwise, wait until the next included review is available. How can I continue?After more reviews become available, a review can be triggered using the To avoid repeated limits, reduce automatic review volume by pausing incremental auto-reviews earlier, using label-based review opt-in, excluding WIP or generated PR titles, or requesting reviews manually when the PR is ready. If your team needs uninterrupted high-volume reviews, an organization admin can enable usage-based reviews. How do review limits work?CodeRabbit enforces per-developer PR review limits for each organization. Most developers receive the normal plan review availability. For paid Pro and Pro+ PR reviews, CodeRabbit uses adaptive limits for sustained high-volume activity. When a developer's recent PR review activity reaches the 95th percentile or higher among CodeRabbit users, additional reviews become available more gradually as earlier reviews age out of the rolling window. Please refer docs for additional details. Review details⚙️ Run configurationConfiguration used: Repository UI Review profile: ASSERTIVE Plan: Pro Plus Run ID: 📒 Files selected for processing (22)
📝 WalkthroughWalkthroughThis PR adds RevenueCat subscriptions, client and server-side AI feature gating, monthly usage tracking, a paywall, subscription documentation, and extensive E2E test identifiers and accessibility metadata across the app. ChangesSubscription and AI access
E2E selectors and accessibility
Estimated code review effort: 5 (Critical) | ~120 minutes Possibly related PRs
🚥 Pre-merge checks | ✅ 4 | ❌ 1❌ Failed checks (1 warning)
✅ Passed checks (4 passed)
✨ Finishing Touches🧪 Generate unit tests (beta)
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
There was a problem hiding this comment.
Actionable comments posted: 15
Caution
Some comments are outside the diff and can’t be posted inline due to platform limitations.
⚠️ Outside diff range comments (2)
components/profile/profile-screen.tsx (1)
189-216: 📐 Maintainability & Code Quality | 🟠 Major | ⚡ Quick winExtract shared sign-out logic to a custom hook.
The sign-out cleanup logic (clearing the active user ID, sync state, and Supabase token alongside Clerk's
signOut) is duplicated here and incomponents/app-lock/AppLockScreen.tsx. To ensure state is cleared consistently across the app and to simplify future cleanup additions, extract this into a shared hook (e.g.,useAppSignOut).🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the rest with a brief reason, keep changes minimal, and validate. In `@components/profile/profile-screen.tsx` around lines 189 - 216, Extract the Clerk sign-out and cleanup sequence from handleSignOut into a shared useAppSignOut hook, including clearing the active user ID, per-user sync state, and Supabase access-token provider. Update both ProfileScreen’s handleSignOut and AppLockScreen to use the hook, while preserving their existing loading, error-dialog, and failed-sign-out state behavior.components/auth/auth-screen.tsx (1)
104-106: 🎯 Functional Correctness | 🟡 Minor | ⚡ Quick winPrevent concurrent authentication flows.
Currently,
isAuthActionDisableddoes not checksocialStrategy, andisSocialActionDisableddoes not checkisSubmitting. This allows a user to trigger a social SSO flow and a password auth flow simultaneously, which could lead to race conditions or unexpected state overlapping.Consider combining the busy states so that any active authentication request disables all authentication buttons on the screen.
💡 Proposed fix
- const isAuthActionDisabled = !isClerkReady || isOffline || isSubmitting; - const isSocialActionDisabled = - !isClerkReady || isOffline || socialStrategy !== null; + const isBusy = isSubmitting || socialStrategy !== null; + const isAuthActionDisabled = !isClerkReady || isOffline || isBusy; + const isSocialActionDisabled = !isClerkReady || isOffline || isBusy;🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the rest with a brief reason, keep changes minimal, and validate. In `@components/auth/auth-screen.tsx` around lines 104 - 106, Update the isAuthActionDisabled and isSocialActionDisabled calculations in the auth screen to share both active-request states, isSubmitting and socialStrategy, so any ongoing password or social authentication flow disables every authentication action while preserving the existing Clerk-readiness and offline checks.
🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
Inline comments:
In @.maestro/00-smoke-launch.yaml:
- Around line 6-36: Require at least one stable launch invariant: in
.maestro/00-smoke-launch.yaml lines 6-36, retain the optional branching checks
but make one final expected screen or stable launch element mandatory; in
.maestro/00-launch.yaml lines 6-28, make one expected app-shell assertion
mandatory instead of leaving every assertion optional.
In `@app/insights/report/`[periodType].tsx:
- Around line 173-202: Update the monthly access branch in the report component
to show the paywall only when reportAccess indicates subscription-required
access, excluding Pro_fair_use_exhausted. For exhausted fair use, preserve the
existing monthly report and display the established fair-use message instead of
the Pro upsell.
- Around line 75-141: The report screen currently contains report-access gating
and generation orchestration that should be reusable. Extract
canUseReportAccess, handleGenerate, handleRegenerate, handleConfirmedRegenerate,
including paywall navigation, dialogs, and usage bookkeeping, into a dedicated
report-access hook; expose the resulting actions/state and update the screen to
compose the hook and invoke them without retaining this business logic.
- Around line 177-182: Update the Text component containing “Monthly AI reports
are included with DearDiary Pro.” to use the required leading-6 typography
instead of leading-8, while preserving its other styling and content.
In `@components/app-lock/BiometricLockSwitch.tsx`:
- Around line 38-39: Update the animated value initialization in
BiometricLockSwitch by replacing the useRef(...).current patterns for progress
and thumbScale with lazy useState initialization. Preserve the existing initial
values based on value for progress and 1 for thumbScale, and continue using the
resulting state values with the existing animation logic.
In `@components/onboarding/onboarding-progress-header.tsx`:
- Around line 34-37: Update the View identified by testID
"onboarding-page-indicator" to set it as accessible so VoiceOver and TalkBack
announce its existing accessibilityLabel. Preserve the current label and layout
behavior.
In `@components/paywall/PaywallScreen.tsx`:
- Around line 177-193: Normalize all paywall text to leading-6: update the
affected text elements in components/paywall/PaywallScreen.tsx at lines 177-193
and 333-355, replacing leading-5, leading-10, and leading-7; also update the
text elements in components/paywall/PlanCard.tsx at lines 47-60, replacing
leading-5, leading-4, and leading-8. Preserve all other styling and content.
In `@components/paywall/PremiumFeatureList.tsx`:
- Around line 4-11: Move the hardcoded benefits collection out of
PremiumFeatureList into a typed export in the data module, then import and use
that export from the component. Preserve the existing benefit text and ordering,
and remove the local benefits declaration.
In `@components/profile/profile-screen.tsx`:
- Around line 483-490: Update the managementUrl handling in the profile screen
so Linking.openURL is wrapped in try/catch; only return after a successful open,
and allow both canOpenURL=false and openURL rejection to continue to the
existing fallback dialog.
In `@lib/ai/entryReflectionService.ts`:
- Around line 300-302: Update the response handling in the entry reflection
service to parse the HTTP 402 response body and distinguish QUOTA_EXHAUSTED from
PRO_FAIR_USE_EXHAUSTED, following the parsing approach used by the report/chat
services. Keep the free-quota upgrade message only for QUOTA_EXHAUSTED and
provide the appropriate Pro fair-use exhaustion message for
PRO_FAIR_USE_EXHAUSTED instead of relying solely on response.status.
In `@lib/subscription/featureGates.ts`:
- Around line 30-32: Update the Pro-only gating branch in the feature-gate
evaluation flow to deny users without Pro access before entering free-quota
checks, including cases where subscriptionAvailable is true. Return the
established Pro-specific denial reason for these features, while preserving free
quota handling for non-Pro-only features.
In `@store/useAIUsageStore.ts`:
- Around line 78-95: Update the onRehydrateStorage callback in useAIUsageStore
to replace direct mutations of state.hasHydrated and state.hydrationError with
useAIUsageStore.setState, preserving the existing values and error-reporting
behavior so subscribed consumers are notified.
In `@supabase/config.toml`:
- Around line 10-11: Update the generate-daily-reflection-prompts configuration
to keep verify_jwt enabled, or replace the current parseJwtClaims validation
with genuine JWT signature verification before accepting the sub claim. Ensure
forged token-like payloads cannot authorize the function.
In `@supabase/functions/_shared/subscriptionAccess.ts`:
- Around line 93-103: AI usage is consumed before downstream work succeeds, so
replace the immediate increment in subscription access with an atomic
reservation/finalization or compensating-release contract. Update
supabase/functions/_shared/subscriptionAccess.ts lines 93-103 to expose that
contract; finalize only after successful generation and persistence in
supabase/functions/generate-insight-report/index.ts lines 355-364, finalize
after a usable reflection in supabase/functions/reflect-on-entry/index.ts lines
304-312, and release reservations on every unsuccessful provider path in
supabase/functions/journal-ai-chat/index.ts lines 485-494 and 583-592.
- Around line 181-197: Update resolveServerSideProEntitlement so the RevenueCat
fallback is protected by a bounded timeout and a short-lived cache, including
for mirrored statuses other than true and missing rows. Reuse existing
timeout/cache utilities or symbols if available, cache the resolved fallback
entitlement per user, and preserve the current false result when RevenueCat
returns null.
---
Outside diff comments:
In `@components/auth/auth-screen.tsx`:
- Around line 104-106: Update the isAuthActionDisabled and
isSocialActionDisabled calculations in the auth screen to share both
active-request states, isSubmitting and socialStrategy, so any ongoing password
or social authentication flow disables every authentication action while
preserving the existing Clerk-readiness and offline checks.
In `@components/profile/profile-screen.tsx`:
- Around line 189-216: Extract the Clerk sign-out and cleanup sequence from
handleSignOut into a shared useAppSignOut hook, including clearing the active
user ID, per-user sync state, and Supabase access-token provider. Update both
ProfileScreen’s handleSignOut and AppLockScreen to use the hook, while
preserving their existing loading, error-dialog, and failed-sign-out state
behavior.
🪄 Autofix (Beta)
Fix all unresolved CodeRabbit comments on this PR:
- Push a commit to this branch (recommended)
- Create a new PR with the fixes
ℹ️ Review info
⚙️ Run configuration
Configuration used: Repository UI
Review profile: ASSERTIVE
Plan: Pro Plus
Run ID: d08ed944-b709-476f-a38a-31a41628751d
⛔ Files ignored due to path filters (2)
assets/images/landing-page.pngis excluded by!**/*.pngpackage-lock.jsonis excluded by!**/package-lock.json
📒 Files selected for processing (81)
.env.example.env.preview.example.env.production.example.gitignore.maestro/00-launch.yaml.maestro/00-smoke-launch.yamlapp.jsonapp/(onboarding)/onboarding-screen-1.tsxapp/(onboarding)/onboarding-screen-2.tsxapp/(onboarding)/onboarding-screen-3.tsxapp/(onboarding)/onboarding-screen-4.tsxapp/(onboarding)/onboarding-screen-5.tsxapp/(tabs)/_layout.tsxapp/_layout.tsxapp/insights/report/[periodType].tsxapp/paywall.tsxapp/settings/app-lock/setup.tsxapp/settings/privacy.tsxapp/sso.tsxcomponents/ai-chat/ai-chat-screen.tsxcomponents/app-lock/AppLockScreen.tsxcomponents/app-lock/AppLockSettingsComponents.tsxcomponents/app-lock/BiometricLockSwitch.tsxcomponents/app-lock/PinInput.tsxcomponents/auth/auth-screen.tsxcomponents/auth/auth-text-field.tsxcomponents/home/home-screen.tsxcomponents/home/mood/HomeMoodCheckInCard.tsxcomponents/home/mood/MoodCheckInAction.tsxcomponents/home/mood/MoodOption.tsxcomponents/home/mood/MoodSpectrumSelector.tsxcomponents/insights/insights-screen.tsxcomponents/insights/report/ReportScreenStates.tsxcomponents/journal-editor/entry-ai-reflection-card.tsxcomponents/journal-editor/journal-editor-screen.tsxcomponents/journal-history/journal-calendar-view.tsxcomponents/journal-history/journal-history-screen.tsxcomponents/navigation/bottom-tab-bar.tsxcomponents/onboarding/onboarding-progress-header.tsxcomponents/paywall/PaywallScreen.tsxcomponents/paywall/PlanCard.tsxcomponents/paywall/PremiumFeatureList.tsxcomponents/profile/notification-settings-screen.tsxcomponents/profile/profile-screen.tsxcomponents/states/ScreenEmptyState.tsxcomponents/tags/tag-input-modal.tsxcomponents/ui/animated-icon-button.tsxconstants/app-lock-theme.tscontent/legal/privacyPolicy.tscontent/legal/termsAndConditions.tsdata/profile.tsdocs/e2e-testid-audit.mddocs/e2e-testid-map.mddocs/environment-matrix.mddocs/privacy.mddocs/subscription-feature-gating-audit.mddocs/subscription-paywall-test.mddocs/subscription-setup.mddocs/subscription-store-setup.mdhooks/useAIInsightReport.tshooks/useEntryReflection.tshooks/useFeatureAccess.tshooks/useSubscription.tslib/ai/dailyReflectionPromptService.tslib/ai/entryReflectionService.tslib/ai/remoteJournalAssistant.tslib/environment.tslib/insights/aiInsightReportService.tslib/subscription/constants.tslib/subscription/featureGates.tslib/subscription/revenueCat.tspackage.jsonproviders/SubscriptionProvider.tsxstore/useAIUsageStore.tssupabase/config.tomlsupabase/functions/_shared/subscriptionAccess.tssupabase/functions/generate-insight-report/index.tssupabase/functions/journal-ai-chat/index.tssupabase/functions/reflect-on-entry/index.tssupabase/migrations/20260712080005_add_ai_usage_subscription_gates.sqltests/environment.test.ts
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
1 participant
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.
Summary by CodeRabbit