Skip to content

Skip module-level reset on initial SESSION load in HybridApp #88244

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
Julesssss merged 1 commit into from
May 4, 2026
Merged

Skip module-level reset on initial SESSION load in HybridApp #88244

Show file tree
Hide file tree
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: 6 additions & 0 deletions src/libs/actions/HybridApp/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,13 @@ Onyx.connectWithoutView({
return;
}

const isInitialSessionLoad = currentSessionAccountID === undefined;
currentSessionAccountID = nextSessionAccountID;

if (isInitialSessionLoad) {
return;
}

currentTryNewDot = undefined;
hasReceivedTryNewDotUpdate = false;
isLoadingTryNewDot = nextSessionAccountID !== undefined || isLoadingApp !== false;
Expand Down
25 changes: 25 additions & 0 deletions tests/unit/HybridAppActionsTest.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,31 @@ describe('HybridApp actions', () => {
expect(closeNativeAppSpy).toHaveBeenCalledWith({shouldSetNVP: true});
});

it('allows shouldSetNVP exits when NVP_TRY_NEW_DOT arrives before SESSION on initial app start', async () => {
await Onyx.set(ONYXKEYS.IS_LOADING_APP, false);
await waitForBatchedUpdatesWithAct();

// Simulate mobile ordering: NVP fires before SESSION
await Onyx.set(ONYXKEYS.NVP_TRY_NEW_DOT, {
classicRedirect: {
dismissed: false,
},
});
await waitForBatchedUpdatesWithAct();

// SESSION fires after NVP — this is the initial undefined → accountID transition
await Onyx.set(ONYXKEYS.SESSION, {
accountID: 1,
authToken: 'auth-token',
});
await waitForBatchedUpdatesWithAct();

// closeReactNativeApp should still work because the initial session load
// must not blank the already-populated currentTryNewDot
closeReactNativeApp({shouldSetNVP: true, isTrackingGPS: false});
expect(closeNativeAppSpy).toHaveBeenCalledWith({shouldSetNVP: true});
});

it('preserves shouldSetNVP exits when the auth token rotates for the same session', async () => {
await Onyx.multiSet({
[ONYXKEYS.IS_LOADING_APP]: false,
Expand Down
Loading