[Due for payment 2026-05-20] [$250] [Quality] Generalize seed-full-reconnect helper across Onyx clear flows

[mountiny]

This issue tracks the fix for duplicate `ReconnectApp` requests being fired in multiple Onyx clear flows beyond the delegate account switch.

The same `Onyx.clear` → `openApp` race that was fixed in the delegate-account-switch path (#89262) also exists in three other flows that go through `subscribeToFullReconnect`:

• `src/libs/actions/Session/index.ts` — supportal restore stashed session
• `src/libs/actions/App.ts` (`RESET_REQUIRED` listener) — Troubleshoot/Reset Onyx
• `src/libs/actions/App.ts` (`clearOnyxAndResetApp`) — exit imported state

This PR extracts a generalized helper `clearOnyxAndSeedFullReconnect(keysToPreserve, extraSeeds?)` that always seeds `LAST_FULL_RECONNECT_TIME=now` atomically and clears with the preserve list + the seeded keys, preventing unnecessary `ReconnectApp` calls in all these flows.

PR: #89980

---

cc @mountiny @TMisiukiewicz @abzokhattab

Upwork Automation - Do Not Edit

• Upwork Job URL: https://www.upwork.com/jobs/~022049849402501236092
• Upwork Job ID: 2049849402501236092
• Last Price Increase: 2026-05-08
  Issue Owner

Current Issue Owner: @mallenexpensify

Issue Owner

Current Issue Owner: @mallenexpensify

Upwork Automation - Do Not Edit

• Upwork Job URL: https://www.upwork.com/jobs/~022052704237221521842
• Upwork Job ID: 2052704237221521842
• Last Price Increase: 2026-05-08

[melvin-bot]

Current assignee @abzokhattab is eligible for the External assigner, not assigning anyone new.

[melvin-bot]

Job added to Upwork: https://www.upwork.com/jobs/~022052704237221521842

[trasnake87]

Proposal

When Onyx is cleared during supportal restore, troubleshoot/reset Onyx, or exit-imported-state, the very next OpenApp is followed by a redundant ReconnectApp request — the same race that #89262 already fixed for delegate-account-switch.

Root cause

The full-reconnect safety net at src/libs/subscribeToFullReconnect.ts:6-35 is a pair of Onyx.connectWithoutView callbacks that compare the local LAST_FULL_RECONNECT_TIME to the server-side NVP_RECONNECT_APP_IF_FULL_RECONNECT_BEFORE:

// src/libs/subscribeToFullReconnect.ts
let lastFullReconnectTime = '';
// ...
function doFullReconnectIfNecessary() {
    if (lastFullReconnectTime >= reconnectAppIfFullReconnectBefore) {
        return;
    }
    Log.info('Full reconnect triggered', false, {lastFullReconnectTime, reconnectAppIfFullReconnectBefore});
    reconnectApp();
}

After Onyx.clear(KEYS_TO_PRESERVE), LAST_FULL_RECONNECT_TIME is wiped to ''. The follow-up openApp() response carries NVP_RECONNECT_APP_IF_FULL_RECONNECT_BEFORE in response.onyxData, and applyHTTPSOnyxUpdates applies response.onyxData before successData. So when the NVP lands, lastFullReconnectTime === '' while reconnectAppIfFullReconnectBefore is a non-empty timestamp, the '' >= 'YYYY-MM-DD …' check is false, and the subscriber synchronously fires a duplicate reconnectApp(). The refresh that lands later in successData at src/libs/actions/App.ts:369-375 only updates the timestamp after the duplicate request is already in flight.

#89262 patched the delegate path by atomically seeding LAST_FULL_RECONNECT_TIME=now ahead of the clear at src/libs/actions/Delegate.ts:60-65:

// src/libs/actions/Delegate.ts (current)
function clearOnyxForDelegateTransition(): Promise<void> {
    return Onyx.multiSet({
        [ONYXKEYS.IS_LOADING_APP]: true,
        [ONYXKEYS.LAST_FULL_RECONNECT_TIME]: DateUtils.getDBTime(),
    }).then(() => Onyx.clear([...KEYS_TO_PRESERVE_DELEGATE_ACCESS, ONYXKEYS.IS_LOADING_APP, ONYXKEYS.LAST_FULL_RECONNECT_TIME]));
}

The same race exists in three other clear-then-openApp flows that were never patched:

1 — Supportal restore stashed session at src/libs/actions/Session/index.ts:449-468. Onyx.clear(KEYS_TO_PRESERVE_SUPPORTAL) is called, then confirmReadyToOpenApp(); openApp(); runs unconditionally — no seed:

// src/libs/actions/Session/index.ts:449-457 (current)
} else if (shouldRestoreStashedSession && !shouldStashSession && hasStashedSession(stashedSession, stashedCredentials)) {
    Onyx.clear(KEYS_TO_PRESERVE_SUPPORTAL).then(() => {
        Onyx.multiSet(onyxSetParams).then(() => {
            Onyx.set(ONYXKEYS.STASHED_CREDENTIALS, {});
            Onyx.set(ONYXKEYS.STASHED_SESSION, {});
            confirmReadyToOpenApp();
            openApp();

2 — Troubleshoot / Reset Onyx at src/libs/actions/App.ts:156-168. The RESET_REQUIRED listener calls clearOnyxAndResetApp():

// src/libs/actions/App.ts:156-168 (current)
Onyx.connectWithoutView({
    key: ONYXKEYS.RESET_REQUIRED,
    callback: (isResetRequired) => {
        if (!isResetRequired) {
            return;
        }
        clearOnyxAndResetApp().finally(() => {
            Onyx.set(ONYXKEYS.RESET_REQUIRED, false);
        });
    },
});

3 — Exit imported state at src/libs/actions/App.ts:845-895. clearOnyxAndResetApp clears with KEYS_TO_PRESERVE then calls openApp(false, undefined, isStateImported) — no seed:

// src/libs/actions/App.ts:845-892 (current, abridged)
function clearOnyxAndResetApp(shouldNavigateToHomepage?: boolean) {
    // …
    Navigation.clearPreloadedRoutes();
    const resetPromise = Onyx.clear(KEYS_TO_PRESERVE)
        .then(() => { /* … */ })
        .then(() => {
            openApp(false, undefined, isStateImported).then(() => { /* … */ });
        });

All three suffer the identical '' >= 'YYYY-MM-DD …' mis-comparison the moment openApp's response.onyxData lands.

Proposed fix

Extract the seed-and-clear pattern from Delegate.ts into a single helper at src/libs/actions/clearOnyxAndSeedFullReconnect.ts, then reuse it in all four flows. The helper accepts an optional extraSeeds map so the delegate path can keep its IS_LOADING_APP=true seed without diverging.

// src/libs/actions/clearOnyxAndSeedFullReconnect.ts (new)
import Onyx from 'react-native-onyx';
import type {OnyxKey} from 'react-native-onyx';
import type {OnyxMultiSetInput} from 'react-native-onyx/dist/types';
import DateUtils from '@libs/DateUtils';
import ONYXKEYS from '@src/ONYXKEYS';

function clearOnyxAndSeedFullReconnect(keysToPreserve: OnyxKey[], extraSeeds?: OnyxMultiSetInput): Promise<void> {
    const seeds: OnyxMultiSetInput = {
        ...extraSeeds,
        [ONYXKEYS.LAST_FULL_RECONNECT_TIME]: DateUtils.getDBTime(),
    };
    return Onyx.multiSet(seeds).then(() => Onyx.clear([...keysToPreserve, ...(Object.keys(seeds) as OnyxKey[])]));
}

export default clearOnyxAndSeedFullReconnect;

Replace the body of clearOnyxForDelegateTransition at src/libs/actions/Delegate.ts:60-65 with a delegating call so the existing fix still works and the special IS_LOADING_APP=true seed (which prevents DelegateAccessHandler's recovery effect from queueing yet another openApp) is preserved:

// src/libs/actions/Delegate.ts (replace lines 60-65)
function clearOnyxForDelegateTransition(): Promise<void> {
    return clearOnyxAndSeedFullReconnect(KEYS_TO_PRESERVE_DELEGATE_ACCESS, {
        [ONYXKEYS.IS_LOADING_APP]: true,
    });
}

In src/libs/actions/Session/index.ts, swap the bare Onyx.clear at line 451 for the helper:

// src/libs/actions/Session/index.ts (replace line 451)
clearOnyxAndSeedFullReconnect(KEYS_TO_PRESERVE_SUPPORTAL).then(() => {
    Onyx.multiSet(onyxSetParams).then(() => {
        Onyx.set(ONYXKEYS.STASHED_CREDENTIALS, {});
        Onyx.set(ONYXKEYS.STASHED_SESSION, {});
        confirmReadyToOpenApp();
        openApp();
        // …
    });
});

In src/libs/actions/App.ts, swap the Onyx.clear(KEYS_TO_PRESERVE) at line 852 for the helper. This single change covers both the RESET_REQUIRED listener path and the exit-imported-state path because both funnel through clearOnyxAndResetApp:

// src/libs/actions/App.ts (replace line 852)
const resetPromise = clearOnyxAndSeedFullReconnect(KEYS_TO_PRESERVE)
    .then(() => {
        if (isStateImported) {
            setShouldForceOffline(false);
            Onyx.set(ONYXKEYS.IS_USING_IMPORTED_STATE, false);
            Log.info('[ImportedState] Exiting imported state mode, restoring original session');
        }
        // …
    })
    .then(() => {
        openApp(false, undefined, isStateImported).then(() => { /* … */ });
    });

Note: the helper appends seeded keys to the preserve list automatically, so existing call sites do not need to extend KEYS_TO_PRESERVE_* themselves.

Why this approach

The seed-then-clear sequence is the same precedent already merged for the delegate path in clearOnyxForDelegateTransition (#89262), and it's the only fix that closes the race deterministically — LAST_FULL_RECONNECT_TIME must be a non-empty value at the instant applyHTTPSOnyxUpdates writes the NVP, otherwise the subscriber callback fires before successData ever runs. Centralizing it in clearOnyxAndSeedFullReconnect.ts keeps the four sites consistent and prevents the next contributor from adding a fifth bare Onyx.clear that re-introduces the bug. Two alternatives were rejected: (a) gating the subscriber on a non-empty lastFullReconnectTime would silently swallow the very first reconnect after a fresh login, defeating the safety net; (b) reordering applyHTTPSOnyxUpdates to apply successData before response.onyxData is a much wider blast radius and would change ordering guarantees relied on elsewhere.