Skip to content

[CP staging] prevent trial payment reminder modal flicker on login #97212

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Valforte merged 1 commit into from
Jul 28, 2026
+5 −1
Merged

[CP staging] prevent trial payment reminder modal flicker on login #97212

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion src/hooks/useTrialPaymentReminder.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,7 @@ function useTrialPaymentReminder() {
const [lastDayFreeTrial] = useOnyx(ONYXKEYS.NVP_LAST_DAY_FREE_TRIAL);
const [billingFundID, billingFundIDResult] = useOnyx(ONYXKEYS.NVP_BILLING_FUND_ID);
const [dismissedTimestamp, dismissedTimestampResult] = useOnyx(ONYXKEYS.NVP_DISMISSED_TRIAL_PAYMENT_REMINDER);
const [hasLoadedApp] = useOnyx(ONYXKEYS.HAS_LOADED_APP);

const [readinessState, setReadinessState] = useState<ReadinessState>(READINESS_STATE.LOADING);

Expand Down Expand Up @@ -219,6 +220,9 @@ function useTrialPaymentReminder() {
}, [firstDayFreeTrial, lastDayFreeTrial, billingFundID]);

const isEligibleToShow = useMemo(() => {
if (!hasLoadedApp) {
return false;
}
if (!isUserOnFreeTrial(firstDayFreeTrial, lastDayFreeTrial)) {
return false;
}
Expand All @@ -245,7 +249,7 @@ function useTrialPaymentReminder() {
}
}
return true;
}, [firstDayFreeTrial, lastDayFreeTrial, billingFundID, billingFundIDResult, readinessState, currentVariation, dismissedTimestamp, dismissedTimestampResult]);
}, [hasLoadedApp, firstDayFreeTrial, lastDayFreeTrial, billingFundID, billingFundIDResult, readinessState, currentVariation, dismissedTimestamp, dismissedTimestampResult]);

// Run the 1s countdown only while the countdown modal is actually eligible to show, so we don't tick every
// second in the background when it isn't rendered.
Expand Down
Loading