From 01edd325f3f96220991e7ab5908def04dbcae3e3 Mon Sep 17 00:00:00 2001 From: KJ21-ENG Date: Wed, 5 Aug 2026 14:11:28 +0530 Subject: [PATCH 1/5] Fix product marketing window rehydration flicker --- src/ONYXKEYS.ts | 4 + .../ProductMarketingWindowManager.tsx | 18 ++- src/libs/ExportOnyxState/common.ts | 1 + src/libs/ImportOnyxStateUtils.ts | 1 + src/libs/actions/App.ts | 42 +++++- src/libs/actions/Delegate.ts | 10 +- .../actions/clearOnyxAndSeedFullReconnect.ts | 8 +- src/setup/index.ts | 2 + tests/actions/AppTest.ts | 121 ++++++++++++++++++ tests/actions/DelegateTest.ts | 14 ++ tests/actions/IsLoadingAppStrandedTest.ts | 113 +++++++++++++++- tests/unit/ExportOnyxStateTest.ts | 2 + tests/unit/ImportOnyxStateTest.ts | 2 + tests/unit/ProductMarketingWindowTest.tsx | 47 +++++++ 14 files changed, 374 insertions(+), 11 deletions(-) diff --git a/src/ONYXKEYS.ts b/src/ONYXKEYS.ts index b4aab8d930f9..ff9dfa5e819a 100755 --- a/src/ONYXKEYS.ts +++ b/src/ONYXKEYS.ts @@ -43,6 +43,9 @@ const ONYXKEYS = { /** Whether a semantic modal is covering the product marketing window in this app instance */ RAM_ONLY_IS_PRODUCT_MARKETING_WINDOW_COVERED: 'isProductMarketingWindowCovered', + /** Tracks which account-reset generation the product marketing window data has finished rehydrating */ + PRODUCT_MARKETING_WINDOW_DATA_STATE: 'productMarketingWindowDataState', + /** Boolean flag set whenever we are searching for reports in the server */ RAM_ONLY_IS_SEARCHING_FOR_REPORTS: 'isSearchingForReports', @@ -1548,6 +1551,7 @@ type OnyxValuesMapping = { [ONYXKEYS.DEVICE_ID]: string; [ONYXKEYS.RAM_ONLY_IS_SIDEBAR_LOADED]: boolean; [ONYXKEYS.RAM_ONLY_IS_PRODUCT_MARKETING_WINDOW_COVERED]: boolean; + [ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE]: {resetID: string; readyIDs: Record}; [ONYXKEYS.PERSISTED_REQUESTS]: OnyxTypes.AnyRequest[]; [ONYXKEYS.PERSISTED_ONGOING_REQUESTS]: OnyxTypes.AnyRequest; [ONYXKEYS.CURRENT_DATE]: string; diff --git a/src/components/ProductMarketingWindow/ProductMarketingWindowManager.tsx b/src/components/ProductMarketingWindow/ProductMarketingWindowManager.tsx index b4393abd3d98..5319d3bd5b7d 100644 --- a/src/components/ProductMarketingWindow/ProductMarketingWindowManager.tsx +++ b/src/components/ProductMarketingWindow/ProductMarketingWindowManager.tsx @@ -53,6 +53,9 @@ function ProductMarketingWindowManager({topmostRouteName}: ProductMarketingWindo // Semantically covering overlays take precedence over the marketing window from pre-show through final hide. // Responsive popover sheets and route-backed right-docked navigation remain exempt. const [isProductMarketingWindowCovered = false] = useOnyx(ONYXKEYS.RAM_ONLY_IS_PRODUCT_MARKETING_WINDOW_COVERED); + // Account-scoped resets clear Onyx concurrently. A request only marks the generation it began + // under as ready, so an older in-flight response cannot expose the replacement account's gap. + const [productMarketingWindowDataState] = useOnyx(ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE); const [isAnonymousSession = false] = useOnyx(ONYXKEYS.SESSION, {selector: isAnonymousSessionSelector}); const [isActingAsDelegate = false, accountMetadata] = useOnyx(ONYXKEYS.ACCOUNT, {selector: isActingAsDelegateSelector}); const [lastDismissedMarketingWindow, lastDismissedMarketingWindowMetadata] = useOnyx(ONYXKEYS.NVP_LAST_DISMISSED_MARKETING_WINDOW); @@ -68,8 +71,19 @@ function ProductMarketingWindowManager({topmostRouteName}: ProductMarketingWindo const variant = getProductMarketingAnnouncementVariant(announcement, !!targetAdminPolicyID, lastDismissedMarketingWindow); const isCoveredByCenteredModalScreen = !!topmostRouteName && CENTERED_MODAL_SCREEN_NAVIGATORS.has(topmostRouteName); const isLoading = isLoadingOnyxValue(lastDismissedMarketingWindowMetadata, activeAdminPoliciesMetadata, activePolicyIDMetadata, isLoadingAppMetadata, accountMetadata) || isLoadingApp; - - if (!announcement || !variant || isLoading || isProductMarketingWindowCovered || isAnonymousSession || isActingAsDelegate || isCoveredByCenteredModalScreen) { + const currentProductMarketingWindowDataResetID = productMarketingWindowDataState?.resetID; + const isProductMarketingWindowDataReady = !currentProductMarketingWindowDataResetID || !!productMarketingWindowDataState?.readyIDs?.[currentProductMarketingWindowDataResetID]; + + if ( + !announcement || + !variant || + isLoading || + !isProductMarketingWindowDataReady || + isProductMarketingWindowCovered || + isAnonymousSession || + isActingAsDelegate || + isCoveredByCenteredModalScreen + ) { return null; } diff --git a/src/libs/ExportOnyxState/common.ts b/src/libs/ExportOnyxState/common.ts index a52b384abbea..f4c03f344096 100644 --- a/src/libs/ExportOnyxState/common.ts +++ b/src/libs/ExportOnyxState/common.ts @@ -27,6 +27,7 @@ const onyxKeysToRemove = new Set | ValueOf { + productMarketingWindowDataResetID = value?.resetID ?? ''; + }, +}); + // hasLoadedAppPromise is used in the "reconnectApp" function and is not directly associated with the View, // so retrieving it using Onyx.connectWithoutView is correct. let resolveHasLoadedAppPromise: () => void; @@ -299,7 +309,12 @@ function getPolicyParamsForOpenOrReconnect(): PolicyParamsForOpenOrReconnect { return {policyIDList: getNonOptimisticPolicyIDs(allPolicies)}; } -type OnyxDataForOpenOrReconnectKeys = typeof ONYXKEYS.COLLECTION.REPORT | typeof ONYXKEYS.IS_LOADING_REPORT_DATA | typeof ONYXKEYS.HAS_LOADED_APP | typeof ONYXKEYS.IS_LOADING_APP; +type OnyxDataForOpenOrReconnectKeys = + | typeof ONYXKEYS.COLLECTION.REPORT + | typeof ONYXKEYS.IS_LOADING_REPORT_DATA + | typeof ONYXKEYS.HAS_LOADED_APP + | typeof ONYXKEYS.IS_LOADING_APP + | typeof ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE; /** * Returns the Onyx data that is used for both the OpenApp and ReconnectApp API commands. @@ -310,6 +325,7 @@ function getOnyxDataForOpenOrReconnect( shouldKeepPublicRooms = false, allReportsWithDraftComments?: Record, shouldClearAppLoading = false, + shouldApplyProductMarketingWindowDataReadyOnSuccess = false, ): OnyxData { let commandName: string; if (isOpenApp) { @@ -354,6 +370,22 @@ function getOnyxDataForOpenOrReconnect( }); } + // Every account-scoped reset through clearOnyxAndSeedFullReconnect starts a new generation. Queued + // requests mark their captured generation ready after the complete queue flush. Full side-effect + // reconnects bypass that queue, so their successData does the same after the HTTPS payload is applied. + if (isOpenApp || isFullReconnect) { + const productMarketingWindowDataReadyUpdate: OnyxUpdate = { + onyxMethod: Onyx.METHOD.MERGE, + key: ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE, + value: {readyIDs: {[productMarketingWindowDataResetID]: true}}, + }; + if (shouldApplyProductMarketingWindowDataReadyOnSuccess) { + result.successData?.push(productMarketingWindowDataReadyUpdate); + } else { + result.queueFlushedData?.push(productMarketingWindowDataReadyUpdate); + } + } + // Clear IS_LOADING_APP in finallyData for OpenApp and ReconnectApp, not just OpenApp. The optimistic `true` // above persists immediately, while finallyData for write commands is held in memory until the sequential // queue flushes (see QueuedOnyxUpdates), so an interrupted session can leave `true` persisted with no OpenApp @@ -420,6 +452,10 @@ function openApp(shouldKeepPublicRooms = false, allReportsWithDraftComments?: Re Onyx.multiSet({ [ONYXKEYS.IS_LOADING_APP]: false, [ONYXKEYS.HAS_LOADED_APP]: true, + [ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE]: { + resetID: productMarketingWindowDataResetID, + readyIDs: {[productMarketingWindowDataResetID]: true}, + }, }); return Promise.resolve(); } @@ -537,7 +573,7 @@ function finalReconnectAppAfterActivatingReliableUpdates(): Promise { return clearOnyxAndSeedFullReconnect(KEYS_TO_PRESERVE_DELEGATE_ACCESS, { diff --git a/src/libs/actions/clearOnyxAndSeedFullReconnect.ts b/src/libs/actions/clearOnyxAndSeedFullReconnect.ts index 35748063bd47..aeeda6b50c7f 100644 --- a/src/libs/actions/clearOnyxAndSeedFullReconnect.ts +++ b/src/libs/actions/clearOnyxAndSeedFullReconnect.ts @@ -5,6 +5,7 @@ import ONYXKEYS from '@src/ONYXKEYS'; import type {OnyxKey, OnyxMultiSetInput} from 'react-native-onyx'; +import {Str} from 'expensify-common'; import Onyx from 'react-native-onyx'; /** @@ -15,7 +16,11 @@ import Onyx from 'react-native-onyx'; * response.onyxData before successData, so without the seed the timestamp would * still be empty when the comparison runs and trigger a duplicate reconnect. * - * Pass `extraSeeds` to seed additional keys atomically with the timestamp (e.g. + * Every account-scoped reset also starts a new product marketing data generation before + * account data is removed. OpenApp marks that generation ready after the successful + * sequential-queue flush, once the destination account's dismissal NVP has landed. + * + * Pass `extraSeeds` to seed additional keys atomically with these shared seeds (e.g. * IS_LOADING_APP=true for delegate transitions). Seeded keys are appended to the * preserve list automatically so they survive the clear. */ @@ -26,6 +31,7 @@ async function clearOnyxAndSeedFullReconnect(keysToPreserve: OnyxKey[], extraSee const seeds: OnyxMultiSetInput = { ...extraSeeds, + [ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE]: {resetID: Str.guid(), readyIDs: {}}, [ONYXKEYS.LAST_FULL_RECONNECT_TIME]: DateUtils.getDBTime(), }; await Onyx.multiSet(seeds); diff --git a/src/setup/index.ts b/src/setup/index.ts index bd1533bdcb66..365f18b3c54d 100644 --- a/src/setup/index.ts +++ b/src/setup/index.ts @@ -55,6 +55,8 @@ export default function () { willAlertModalBecomeVisible: false, }, [ONYXKEYS.RAM_ONLY_IS_PRODUCT_MARKETING_WINDOW_COVERED]: false, + // PRODUCT_MARKETING_WINDOW_DATA_STATE intentionally has no default. Onyx initial defaults + // overwrite stored fields, but a persisted reset-without-readiness must survive a restart. // Ensure the Supportal permission modal doesn't persist across reloads [ONYXKEYS.SUPPORTAL_PERMISSION_DENIED]: null, [ONYXKEYS.IS_OPEN_APP_FAILURE_MODAL_OPEN]: false, diff --git a/tests/actions/AppTest.ts b/tests/actions/AppTest.ts index 985aad29ee47..c396faea016a 100644 --- a/tests/actions/AppTest.ts +++ b/tests/actions/AppTest.ts @@ -2,6 +2,7 @@ import {waitFor} from '@testing-library/react-native'; import DateUtils from '@libs/DateUtils'; import Navigation from '@libs/Navigation/Navigation'; +import {waitForIdle} from '@libs/Network/SequentialQueue'; import OnyxUpdateManager from '@src/libs/actions/OnyxUpdateManager'; import '@libs/Navigation/AppNavigator/AuthScreens'; @@ -101,6 +102,103 @@ describe('actions/App', () => { expect(mockFetch).not.toHaveBeenCalled(); }); + test('reconnectAppWithSideEffects reopens product marketing readiness only after a full reconnect', async () => { + await Onyx.multiSet({ + [ONYXKEYS.HAS_LOADED_APP]: true, + [ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE]: {resetID: 'side-effect-reset', readyIDs: {}}, + }); + await waitForBatchedUpdates(); + + await App.reconnectAppWithSideEffects(123); + await waitForBatchedUpdates(); + let dataState = await getOnyxValue(ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE); + expect(dataState?.readyIDs?.[dataState?.resetID ?? '']).not.toBe(true); + + await App.reconnectAppWithSideEffects(); + await waitForBatchedUpdates(); + dataState = await getOnyxValue(ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE); + expect(dataState?.readyIDs?.[dataState?.resetID ?? '']).toBe(true); + }); + + test('a full side-effect reconnect cannot mark a newer account-reset generation ready', async () => { + await Onyx.multiSet({ + [ONYXKEYS.HAS_LOADED_APP]: true, + [ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE]: {resetID: 'old-side-effect-reset', readyIDs: {'old-side-effect-reset': true}}, + }); + await waitForBatchedUpdates(); + mockFetch.pause(); + + const reconnectPromise = App.reconnectAppWithSideEffects(); + await waitForBatchedUpdates(); + // Simulate the replacement generation finishing before this older side-effect response. + await Onyx.set(ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE, {resetID: 'new-side-effect-reset', readyIDs: {'new-side-effect-reset': true}}); + await waitForBatchedUpdates(); + + await mockFetch.resume(); + await reconnectPromise; + await waitForBatchedUpdates(); + + const dataState = await getOnyxValue(ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE); + expect(dataState?.resetID).toBe('new-side-effect-reset'); + expect(dataState?.readyIDs?.['new-side-effect-reset']).toBe(true); + }); + + test('a stale full side-effect reconnect leaves a newer generation pending until its own full reconnect succeeds', async () => { + await Onyx.multiSet({ + [ONYXKEYS.HAS_LOADED_APP]: true, + [ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE]: {resetID: 'old-pending-reset', readyIDs: {'old-pending-reset': true}}, + }); + await waitForBatchedUpdates(); + mockFetch.pause(); + + const staleReconnectPromise = App.reconnectAppWithSideEffects(); + await waitForBatchedUpdates(); + await Onyx.set(ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE, {resetID: 'new-pending-reset', readyIDs: {}}); + await waitForBatchedUpdates(); + + await mockFetch.resume(); + await staleReconnectPromise; + await waitForBatchedUpdates(); + + let dataState = await getOnyxValue(ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE); + expect(dataState?.readyIDs?.['new-pending-reset']).not.toBe(true); + + await App.reconnectAppWithSideEffects(); + await waitForBatchedUpdates(); + dataState = await getOnyxValue(ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE); + expect(dataState?.readyIDs?.['new-pending-reset']).toBe(true); + }); + + test('a failed full side-effect reconnect leaves the current product marketing generation pending', async () => { + const failedFetch = TestHelper.createGlobalFetchMock(); + failedFetch.fail(); + global.fetch = failedFetch; + await Onyx.multiSet({ + [ONYXKEYS.HAS_LOADED_APP]: true, + [ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE]: {resetID: 'failed-side-effect-reset', readyIDs: {}}, + }); + await waitForBatchedUpdates(); + + await App.reconnectAppWithSideEffects(); + await waitForBatchedUpdates(); + + const dataState = await getOnyxValue(ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE); + expect(dataState?.readyIDs?.['failed-side-effect-reset']).not.toBe(true); + }); + + test('openApp immediately marks product marketing data ready when using imported state', async () => { + await Onyx.set(ONYXKEYS.IS_USING_IMPORTED_STATE, true); + await Onyx.set(ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE, {resetID: 'imported-reset', readyIDs: {}}); + await waitForBatchedUpdates(); + + await App.openApp(); + await waitForBatchedUpdates(); + + expect(mockFetch).not.toHaveBeenCalled(); + const dataState = await getOnyxValue(ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE); + expect(dataState?.readyIDs?.[dataState?.resetID ?? '']).toBe(true); + }); + test('trigger full reconnect', async () => { const triggerFullReconnect = jest.spyOn(App, 'triggerFullReconnect'); @@ -177,6 +275,29 @@ describe('actions/App', () => { }); }); + test('clearOnyxAndResetApp keeps product marketing gated while account data is rehydrating', async () => { + jest.spyOn(Navigation, 'clearPreloadedRoutes').mockImplementation(() => {}); + await Onyx.set(ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE, {resetID: 'loaded-reset', readyIDs: {'loaded-reset': true}}); + mockFetch.pause(); + + try { + await App.clearOnyxAndResetApp(); + await waitForBatchedUpdates(); + + const dataState = await getOnyxValue(ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE); + expect(dataState?.resetID).not.toBe('loaded-reset'); + expect(dataState?.readyIDs?.[dataState?.resetID ?? '']).not.toBe(true); + } finally { + await mockFetch.resume(); + } + + await waitForIdle(); + await waitFor(async () => { + const dataState = await getOnyxValue(ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE); + expect(dataState?.readyIDs?.[dataState?.resetID ?? '']).toBe(true); + }); + }); + describe('getNonOptimisticPolicyIDs', () => { it('should return empty array when policies is empty object', () => { const result = App.getNonOptimisticPolicyIDs({}); diff --git a/tests/actions/DelegateTest.ts b/tests/actions/DelegateTest.ts index e35f8bd37b93..ae29b0b485c4 100644 --- a/tests/actions/DelegateTest.ts +++ b/tests/actions/DelegateTest.ts @@ -273,6 +273,20 @@ describe('actions/Delegate', () => { }); }); + // The marketing window must remain gated while destination-account keys are rehydrating. + await new Promise((resolve) => { + const conn = Onyx.connect({ + key: ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE, + callback: (value) => { + expect(value?.resetID).toEqual(expect.any(String)); + expect(value?.resetID).not.toBe(''); + expect(value?.readyIDs?.[value?.resetID ?? '']).not.toBe(true); + Onyx.disconnect(conn); + resolve(); + }, + }); + }); + // HAS_LOADED_APP is in the preserve list and should remain true. await new Promise((resolve) => { const conn = Onyx.connect({ diff --git a/tests/actions/IsLoadingAppStrandedTest.ts b/tests/actions/IsLoadingAppStrandedTest.ts index 5d239511440f..05b56c49f55c 100644 --- a/tests/actions/IsLoadingAppStrandedTest.ts +++ b/tests/actions/IsLoadingAppStrandedTest.ts @@ -1,6 +1,7 @@ import * as App from '@libs/actions/App'; +import clearOnyxAndSeedFullReconnect from '@libs/actions/clearOnyxAndSeedFullReconnect'; import {WRITE_COMMANDS} from '@libs/API/types'; -import {resetQueue} from '@libs/Network/SequentialQueue'; +import {resetQueue, waitForIdle} from '@libs/Network/SequentialQueue'; import OnyxUpdateManager from '@src/libs/actions/OnyxUpdateManager'; import * as PersistedRequests from '@src/libs/actions/PersistedRequests'; @@ -76,4 +77,114 @@ describe('IS_LOADING_APP stranded true', () => { expect(await getOnyxValue(ONYXKEYS.IS_LOADING_APP)).toBe(false); }); + + it('marks product marketing data ready after a successful OpenApp queue flush', async () => { + await Onyx.set(ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE, {resetID: 'open-app-reset', readyIDs: {}}); + await waitForBatchedUpdates(); + + App.openApp(); + await waitForIdle(); + await waitForBatchedUpdates(); + + const dataState = await getOnyxValue(ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE); + expect(dataState?.readyIDs?.[dataState?.resetID ?? '']).toBe(true); + }); + + it('stays gated when OpenApp fails and reopens after a successful full ReconnectApp', async () => { + const failedFetch = TestHelper.createGlobalFetchMock(); + failedFetch.fail(); + global.fetch = failedFetch; + + await clearOnyxAndSeedFullReconnect([]); + await Onyx.set(ONYXKEYS.HAS_LOADED_APP, true); + await waitForBatchedUpdates(); + + App.openApp(); + await waitForIdle(); + await waitForBatchedUpdates(); + + let dataState = await getOnyxValue(ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE); + expect(dataState?.readyIDs?.[dataState?.resetID ?? '']).not.toBe(true); + + failedFetch.succeed(); + App.reconnectApp(); + await waitForBatchedUpdates(); + await waitForIdle(); + await waitForBatchedUpdates(); + + dataState = await getOnyxValue(ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE); + expect(dataState?.readyIDs?.[dataState?.resetID ?? '']).toBe(true); + }); + + it('keeps product marketing gated after a successful partial ReconnectApp', async () => { + await Onyx.multiSet({ + [ONYXKEYS.HAS_LOADED_APP]: true, + [ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE]: {resetID: 'partial-reset', readyIDs: {}}, + }); + await waitForBatchedUpdates(); + + App.reconnectApp(123); + await waitForBatchedUpdates(); + await waitForIdle(); + await waitForBatchedUpdates(); + + const dataState = await getOnyxValue(ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE); + expect(dataState?.readyIDs?.[dataState?.resetID ?? '']).not.toBe(true); + }); + + it('does not let an OpenApp from before a reset ready the pending generation, which recovers through its own OpenApp', async () => { + const delayedFetch = TestHelper.createGlobalFetchMock(); + delayedFetch.pause(); + global.fetch = delayedFetch; + await Onyx.set(ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE, {resetID: 'old-pending-reset', readyIDs: {'old-pending-reset': true}}); + await waitForBatchedUpdates(); + + App.openApp(); + await waitForBatchedUpdates(); + await clearOnyxAndSeedFullReconnect([]); + await waitForBatchedUpdates(); + const stateAfterReset = await getOnyxValue(ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE); + expect(stateAfterReset?.resetID).toEqual(expect.any(String)); + expect(stateAfterReset?.resetID).not.toBe(''); + expect(stateAfterReset?.readyIDs?.[stateAfterReset?.resetID ?? '']).not.toBe(true); + + await delayedFetch.resume(); + await waitForIdle(); + await waitForBatchedUpdates(); + let dataState = await getOnyxValue(ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE); + expect(dataState?.readyIDs?.[stateAfterReset?.resetID ?? '']).not.toBe(true); + + App.openApp(); + await waitForIdle(); + await waitForBatchedUpdates(); + dataState = await getOnyxValue(ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE); + expect(dataState?.readyIDs?.[stateAfterReset?.resetID ?? '']).toBe(true); + }); + + it('does not let an OpenApp that began before an account reset close a newer ready generation', async () => { + const delayedFetch = TestHelper.createGlobalFetchMock(); + delayedFetch.pause(); + global.fetch = delayedFetch; + await Onyx.set(ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE, {resetID: 'old-reset', readyIDs: {'old-reset': true}}); + await waitForBatchedUpdates(); + + App.openApp(); + await waitForBatchedUpdates(); + await clearOnyxAndSeedFullReconnect([]); + await waitForBatchedUpdates(); + const stateAfterReset = await getOnyxValue(ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE); + expect(stateAfterReset?.resetID).toEqual(expect.any(String)); + expect(stateAfterReset?.resetID).not.toBe(''); + expect(stateAfterReset?.resetID).not.toBe('old-reset'); + await Onyx.merge(ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE, {readyIDs: {[stateAfterReset?.resetID ?? '']: true}}); + await waitForBatchedUpdates(); + + await delayedFetch.resume(); + await waitForIdle(); + await waitForBatchedUpdates(); + + const stateAfterStaleSuccess = await getOnyxValue(ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE); + expect(stateAfterStaleSuccess?.resetID).toBe(stateAfterReset?.resetID); + expect(stateAfterStaleSuccess?.readyIDs?.[stateAfterStaleSuccess?.resetID ?? '']).toBe(true); + }); }); diff --git a/tests/unit/ExportOnyxStateTest.ts b/tests/unit/ExportOnyxStateTest.ts index 52243010d30a..c318047d9ad9 100644 --- a/tests/unit/ExportOnyxStateTest.ts +++ b/tests/unit/ExportOnyxStateTest.ts @@ -136,6 +136,7 @@ describe('maskOnyxState', () => { [ONYXKEYS.NVP_PRIVATE_STRIPE_CUSTOMER_ID]: 'stripe-id', [ONYXKEYS.RAM_ONLY_PLAID_LINK_TOKEN]: 'plaid-token', [ONYXKEYS.RAM_ONLY_IS_PRODUCT_MARKETING_WINDOW_COVERED]: true, + [ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE]: {resetID: 'reset', readyIDs: {}}, [ONYXKEYS.ONFIDO_TOKEN]: 'onfido-token', }; const result = maskOnyxState(input); @@ -145,6 +146,7 @@ describe('maskOnyxState', () => { expect(result[ONYXKEYS.NVP_PRIVATE_STRIPE_CUSTOMER_ID]).toBeUndefined(); expect(result[ONYXKEYS.RAM_ONLY_PLAID_LINK_TOKEN]).toBeUndefined(); expect(result[ONYXKEYS.RAM_ONLY_IS_PRODUCT_MARKETING_WINDOW_COVERED]).toBeUndefined(); + expect(result[ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE]).toBeUndefined(); expect(result[ONYXKEYS.ONFIDO_TOKEN]).toBeUndefined(); // Session should still be present diff --git a/tests/unit/ImportOnyxStateTest.ts b/tests/unit/ImportOnyxStateTest.ts index c0b283207d50..7c5b99ad3050 100644 --- a/tests/unit/ImportOnyxStateTest.ts +++ b/tests/unit/ImportOnyxStateTest.ts @@ -90,6 +90,7 @@ describe('cleanAndTransformState', () => { [ONYXKEYS.CREDENTIALS]: 'remove4', [ONYXKEYS.PREFERRED_THEME]: 'remove5', [ONYXKEYS.RAM_ONLY_IS_PRODUCT_MARKETING_WINDOW_COVERED]: true, + [ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE]: {resetID: 'reset', readyIDs: {}}, keepThis: 'value', }); @@ -106,5 +107,6 @@ describe('cleanAndTransformState', () => { expect(result).not.toHaveProperty(ONYXKEYS.CREDENTIALS); expect(result).not.toHaveProperty(ONYXKEYS.PREFERRED_THEME); expect(result).not.toHaveProperty(ONYXKEYS.RAM_ONLY_IS_PRODUCT_MARKETING_WINDOW_COVERED); + expect(result).not.toHaveProperty(ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE); }); }); diff --git a/tests/unit/ProductMarketingWindowTest.tsx b/tests/unit/ProductMarketingWindowTest.tsx index 5bdd5a587a84..abd032e19ad7 100644 --- a/tests/unit/ProductMarketingWindowTest.tsx +++ b/tests/unit/ProductMarketingWindowTest.tsx @@ -205,6 +205,53 @@ describe('ProductMarketingWindowManager', () => { expect(screen.queryByText(adminHeading)).toBeNull(); }); + it('does not flash a dismissed announcement while delegate-return account data is rehydrating', async () => { + await act(async () => { + await setupOnyxBaseline({isAdmin: true}); + await Onyx.set(ONYXKEYS.NVP_LAST_DISMISSED_MARKETING_WINDOW, announcement.updateKey); + await waitForBatchedUpdatesWithAct(); + }); + + renderManager(); + await waitForBatchedUpdatesWithAct(); + expect(screen.queryByText(adminHeading)).toBeNull(); + + await act(async () => { + // Match the deployed race: policies and IS_LOADING_APP can become usable before this NVP + // finishes rehydrating. The transition gate must keep the missing key from meaning "show". + await Onyx.set(ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE, {resetID: 'delegate-reset', readyIDs: {}}); + await Onyx.set(ONYXKEYS.NVP_LAST_DISMISSED_MARKETING_WINDOW, null); + await Onyx.set(ONYXKEYS.IS_LOADING_APP, false); + await waitForBatchedUpdatesWithAct(); + }); + expect(screen.queryByText(adminHeading)).toBeNull(); + + await act(async () => { + await Onyx.set(ONYXKEYS.NVP_LAST_DISMISSED_MARKETING_WINDOW, announcement.updateKey); + await Onyx.merge(ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE, {readyIDs: {'delegate-reset': true}}); + await waitForBatchedUpdatesWithAct(); + }); + expect(screen.queryByText(adminHeading)).toBeNull(); + }); + + it('shows an eligible announcement only after the current account-reset generation becomes ready', async () => { + await act(async () => { + await setupOnyxBaseline({isAdmin: true}); + await Onyx.set(ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE, {resetID: 'eligible-reset', readyIDs: {}}); + await waitForBatchedUpdatesWithAct(); + }); + + renderManager(); + await waitForBatchedUpdatesWithAct(); + expect(screen.queryByText(adminHeading)).toBeNull(); + + await act(async () => { + await Onyx.merge(ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE, {readyIDs: {'eligible-reset': true}}); + await waitForBatchedUpdatesWithAct(); + }); + expect(screen.getByText(adminHeading)).toBeOnTheScreen(); + }); + it('renders nothing when the initial app load state was never written, as on a fresh sign-in', async () => { await act(async () => { // Deliberately do not write IS_LOADING_APP: the manager must treat the never-written key as still loading. From 08d937adeb5dc3e0b699f58eee99d8c130d21ce4 Mon Sep 17 00:00:00 2001 From: KJ21-ENG Date: Wed, 5 Aug 2026 14:39:42 +0530 Subject: [PATCH 2/5] Fix product marketing readiness validation --- src/libs/actions/App.ts | 29 ++++++++----- tests/actions/AppTest.ts | 50 ++++++++++++----------- tests/actions/DelegateTest.ts | 5 ++- tests/actions/IsLoadingAppStrandedTest.ts | 48 ++++++++++++++-------- tests/unit/AuthPrefetchTest.ts | 3 +- tests/unit/ProductMarketingWindowTest.tsx | 8 ++-- 6 files changed, 86 insertions(+), 57 deletions(-) diff --git a/src/libs/actions/App.ts b/src/libs/actions/App.ts index 852d8090848f..9f6b3955b382 100644 --- a/src/libs/actions/App.ts +++ b/src/libs/actions/App.ts @@ -83,11 +83,11 @@ Onyx.connectWithoutView({ // Full account requests capture this generation when they are created. Their success handoff only // marks that captured generation ready, so a response that finishes after another reset stays stale. -let productMarketingWindowDataResetID = ''; +let productMarketingWindowDataResetID: string | undefined; Onyx.connectWithoutView({ key: ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE, callback: (value) => { - productMarketingWindowDataResetID = value?.resetID ?? ''; + productMarketingWindowDataResetID = value?.resetID; }, }); @@ -373,7 +373,7 @@ function getOnyxDataForOpenOrReconnect( // Every account-scoped reset through clearOnyxAndSeedFullReconnect starts a new generation. Queued // requests mark their captured generation ready after the complete queue flush. Full side-effect // reconnects bypass that queue, so their successData does the same after the HTTPS payload is applied. - if (isOpenApp || isFullReconnect) { + if ((isOpenApp || isFullReconnect) && productMarketingWindowDataResetID) { const productMarketingWindowDataReadyUpdate: OnyxUpdate = { onyxMethod: Onyx.METHOD.MERGE, key: ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE, @@ -449,14 +449,21 @@ function openApp(shouldKeepPublicRooms = false, allReportsWithDraftComments?: Re // The imported state already contains all the data, so we just need to mark the app as loaded // Exception: When forceRun is true (exiting imported state), always make the API call if (isUsingImportedState && !forceRun) { - Onyx.multiSet({ - [ONYXKEYS.IS_LOADING_APP]: false, - [ONYXKEYS.HAS_LOADED_APP]: true, - [ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE]: { - resetID: productMarketingWindowDataResetID, - readyIDs: {[productMarketingWindowDataResetID]: true}, - }, - }); + if (productMarketingWindowDataResetID) { + Onyx.multiSet({ + [ONYXKEYS.IS_LOADING_APP]: false, + [ONYXKEYS.HAS_LOADED_APP]: true, + [ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE]: { + resetID: productMarketingWindowDataResetID, + readyIDs: {[productMarketingWindowDataResetID]: true}, + }, + }); + } else { + Onyx.multiSet({ + [ONYXKEYS.IS_LOADING_APP]: false, + [ONYXKEYS.HAS_LOADED_APP]: true, + }); + } return Promise.resolve(); } diff --git a/tests/actions/AppTest.ts b/tests/actions/AppTest.ts index c396faea016a..3c5f448bcb7e 100644 --- a/tests/actions/AppTest.ts +++ b/tests/actions/AppTest.ts @@ -10,7 +10,7 @@ import '@libs/Navigation/AppNavigator/AuthScreens'; import ONYXKEYS from '@src/ONYXKEYS'; import type {Policy} from '@src/types/onyx'; -import type {OnyxCollection} from 'react-native-onyx'; +import type {OnyxCollection, OnyxValue} from 'react-native-onyx'; import Onyx from 'react-native-onyx'; @@ -27,6 +27,13 @@ jest.mock('@src/components/ConfirmedRoute.tsx'); OnyxUpdateManager(); +function isCurrentProductMarketingWindowDataReady(dataState: OnyxValue): boolean { + if (!dataState?.resetID) { + throw new Error('Expected a product marketing data generation'); + } + return dataState.readyIDs?.[dataState.resetID] === true; +} + describe('actions/App', () => { let mockFetch: MockFetch; @@ -105,25 +112,25 @@ describe('actions/App', () => { test('reconnectAppWithSideEffects reopens product marketing readiness only after a full reconnect', async () => { await Onyx.multiSet({ [ONYXKEYS.HAS_LOADED_APP]: true, - [ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE]: {resetID: 'side-effect-reset', readyIDs: {}}, + [ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE]: {resetID: 'sideEffectReset', readyIDs: {}}, }); await waitForBatchedUpdates(); await App.reconnectAppWithSideEffects(123); await waitForBatchedUpdates(); let dataState = await getOnyxValue(ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE); - expect(dataState?.readyIDs?.[dataState?.resetID ?? '']).not.toBe(true); + expect(isCurrentProductMarketingWindowDataReady(dataState)).toBe(false); await App.reconnectAppWithSideEffects(); await waitForBatchedUpdates(); dataState = await getOnyxValue(ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE); - expect(dataState?.readyIDs?.[dataState?.resetID ?? '']).toBe(true); + expect(isCurrentProductMarketingWindowDataReady(dataState)).toBe(true); }); test('a full side-effect reconnect cannot mark a newer account-reset generation ready', async () => { await Onyx.multiSet({ [ONYXKEYS.HAS_LOADED_APP]: true, - [ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE]: {resetID: 'old-side-effect-reset', readyIDs: {'old-side-effect-reset': true}}, + [ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE]: {resetID: 'oldSideEffectReset', readyIDs: {oldSideEffectReset: true}}, }); await waitForBatchedUpdates(); mockFetch.pause(); @@ -131,7 +138,7 @@ describe('actions/App', () => { const reconnectPromise = App.reconnectAppWithSideEffects(); await waitForBatchedUpdates(); // Simulate the replacement generation finishing before this older side-effect response. - await Onyx.set(ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE, {resetID: 'new-side-effect-reset', readyIDs: {'new-side-effect-reset': true}}); + await Onyx.set(ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE, {resetID: 'newSideEffectReset', readyIDs: {newSideEffectReset: true}}); await waitForBatchedUpdates(); await mockFetch.resume(); @@ -139,21 +146,21 @@ describe('actions/App', () => { await waitForBatchedUpdates(); const dataState = await getOnyxValue(ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE); - expect(dataState?.resetID).toBe('new-side-effect-reset'); - expect(dataState?.readyIDs?.['new-side-effect-reset']).toBe(true); + expect(dataState?.resetID).toBe('newSideEffectReset'); + expect(dataState?.readyIDs?.newSideEffectReset).toBe(true); }); test('a stale full side-effect reconnect leaves a newer generation pending until its own full reconnect succeeds', async () => { await Onyx.multiSet({ [ONYXKEYS.HAS_LOADED_APP]: true, - [ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE]: {resetID: 'old-pending-reset', readyIDs: {'old-pending-reset': true}}, + [ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE]: {resetID: 'oldPendingReset', readyIDs: {oldPendingReset: true}}, }); await waitForBatchedUpdates(); mockFetch.pause(); const staleReconnectPromise = App.reconnectAppWithSideEffects(); await waitForBatchedUpdates(); - await Onyx.set(ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE, {resetID: 'new-pending-reset', readyIDs: {}}); + await Onyx.set(ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE, {resetID: 'newPendingReset', readyIDs: {}}); await waitForBatchedUpdates(); await mockFetch.resume(); @@ -161,12 +168,12 @@ describe('actions/App', () => { await waitForBatchedUpdates(); let dataState = await getOnyxValue(ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE); - expect(dataState?.readyIDs?.['new-pending-reset']).not.toBe(true); + expect(dataState?.readyIDs?.newPendingReset).not.toBe(true); await App.reconnectAppWithSideEffects(); await waitForBatchedUpdates(); dataState = await getOnyxValue(ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE); - expect(dataState?.readyIDs?.['new-pending-reset']).toBe(true); + expect(dataState?.readyIDs?.newPendingReset).toBe(true); }); test('a failed full side-effect reconnect leaves the current product marketing generation pending', async () => { @@ -175,7 +182,7 @@ describe('actions/App', () => { global.fetch = failedFetch; await Onyx.multiSet({ [ONYXKEYS.HAS_LOADED_APP]: true, - [ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE]: {resetID: 'failed-side-effect-reset', readyIDs: {}}, + [ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE]: {resetID: 'failedSideEffectReset', readyIDs: {}}, }); await waitForBatchedUpdates(); @@ -183,12 +190,12 @@ describe('actions/App', () => { await waitForBatchedUpdates(); const dataState = await getOnyxValue(ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE); - expect(dataState?.readyIDs?.['failed-side-effect-reset']).not.toBe(true); + expect(dataState?.readyIDs?.failedSideEffectReset).not.toBe(true); }); test('openApp immediately marks product marketing data ready when using imported state', async () => { await Onyx.set(ONYXKEYS.IS_USING_IMPORTED_STATE, true); - await Onyx.set(ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE, {resetID: 'imported-reset', readyIDs: {}}); + await Onyx.set(ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE, {resetID: 'importedReset', readyIDs: {}}); await waitForBatchedUpdates(); await App.openApp(); @@ -196,7 +203,7 @@ describe('actions/App', () => { expect(mockFetch).not.toHaveBeenCalled(); const dataState = await getOnyxValue(ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE); - expect(dataState?.readyIDs?.[dataState?.resetID ?? '']).toBe(true); + expect(isCurrentProductMarketingWindowDataReady(dataState)).toBe(true); }); test('trigger full reconnect', async () => { @@ -277,7 +284,7 @@ describe('actions/App', () => { test('clearOnyxAndResetApp keeps product marketing gated while account data is rehydrating', async () => { jest.spyOn(Navigation, 'clearPreloadedRoutes').mockImplementation(() => {}); - await Onyx.set(ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE, {resetID: 'loaded-reset', readyIDs: {'loaded-reset': true}}); + await Onyx.set(ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE, {resetID: 'loadedReset', readyIDs: {loadedReset: true}}); mockFetch.pause(); try { @@ -285,17 +292,12 @@ describe('actions/App', () => { await waitForBatchedUpdates(); const dataState = await getOnyxValue(ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE); - expect(dataState?.resetID).not.toBe('loaded-reset'); - expect(dataState?.readyIDs?.[dataState?.resetID ?? '']).not.toBe(true); + expect(dataState?.resetID).not.toBe('loadedReset'); + expect(isCurrentProductMarketingWindowDataReady(dataState)).toBe(false); } finally { await mockFetch.resume(); } - await waitForIdle(); - await waitFor(async () => { - const dataState = await getOnyxValue(ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE); - expect(dataState?.readyIDs?.[dataState?.resetID ?? '']).toBe(true); - }); }); describe('getNonOptimisticPolicyIDs', () => { diff --git a/tests/actions/DelegateTest.ts b/tests/actions/DelegateTest.ts index ae29b0b485c4..22e9cc4541d1 100644 --- a/tests/actions/DelegateTest.ts +++ b/tests/actions/DelegateTest.ts @@ -280,7 +280,10 @@ describe('actions/Delegate', () => { callback: (value) => { expect(value?.resetID).toEqual(expect.any(String)); expect(value?.resetID).not.toBe(''); - expect(value?.readyIDs?.[value?.resetID ?? '']).not.toBe(true); + if (!value?.resetID) { + throw new Error('Expected the delegate transition to create a product marketing data generation'); + } + expect(value.readyIDs?.[value.resetID]).not.toBe(true); Onyx.disconnect(conn); resolve(); }, diff --git a/tests/actions/IsLoadingAppStrandedTest.ts b/tests/actions/IsLoadingAppStrandedTest.ts index 05b56c49f55c..5cde3b628877 100644 --- a/tests/actions/IsLoadingAppStrandedTest.ts +++ b/tests/actions/IsLoadingAppStrandedTest.ts @@ -7,6 +7,8 @@ import OnyxUpdateManager from '@src/libs/actions/OnyxUpdateManager'; import * as PersistedRequests from '@src/libs/actions/PersistedRequests'; import ONYXKEYS from '@src/ONYXKEYS'; +import type {OnyxValue} from 'react-native-onyx'; + import Onyx from 'react-native-onyx'; import getOnyxValue from '../utils/getOnyxValue'; @@ -15,6 +17,13 @@ import waitForBatchedUpdates from '../utils/waitForBatchedUpdates'; OnyxUpdateManager(); +function isCurrentProductMarketingWindowDataReady(dataState: OnyxValue): boolean { + if (!dataState?.resetID) { + throw new Error('Expected a product marketing data generation'); + } + return dataState.readyIDs?.[dataState.resetID] === true; +} + describe('IS_LOADING_APP stranded true', () => { beforeAll(() => { Onyx.init({keys: ONYXKEYS}); @@ -79,7 +88,7 @@ describe('IS_LOADING_APP stranded true', () => { }); it('marks product marketing data ready after a successful OpenApp queue flush', async () => { - await Onyx.set(ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE, {resetID: 'open-app-reset', readyIDs: {}}); + await Onyx.set(ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE, {resetID: 'openAppReset', readyIDs: {}}); await waitForBatchedUpdates(); App.openApp(); @@ -87,7 +96,7 @@ describe('IS_LOADING_APP stranded true', () => { await waitForBatchedUpdates(); const dataState = await getOnyxValue(ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE); - expect(dataState?.readyIDs?.[dataState?.resetID ?? '']).toBe(true); + expect(isCurrentProductMarketingWindowDataReady(dataState)).toBe(true); }); it('stays gated when OpenApp fails and reopens after a successful full ReconnectApp', async () => { @@ -104,7 +113,7 @@ describe('IS_LOADING_APP stranded true', () => { await waitForBatchedUpdates(); let dataState = await getOnyxValue(ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE); - expect(dataState?.readyIDs?.[dataState?.resetID ?? '']).not.toBe(true); + expect(isCurrentProductMarketingWindowDataReady(dataState)).toBe(false); failedFetch.succeed(); App.reconnectApp(); @@ -113,13 +122,13 @@ describe('IS_LOADING_APP stranded true', () => { await waitForBatchedUpdates(); dataState = await getOnyxValue(ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE); - expect(dataState?.readyIDs?.[dataState?.resetID ?? '']).toBe(true); + expect(isCurrentProductMarketingWindowDataReady(dataState)).toBe(true); }); it('keeps product marketing gated after a successful partial ReconnectApp', async () => { await Onyx.multiSet({ [ONYXKEYS.HAS_LOADED_APP]: true, - [ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE]: {resetID: 'partial-reset', readyIDs: {}}, + [ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE]: {resetID: 'partialReset', readyIDs: {}}, }); await waitForBatchedUpdates(); @@ -129,14 +138,14 @@ describe('IS_LOADING_APP stranded true', () => { await waitForBatchedUpdates(); const dataState = await getOnyxValue(ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE); - expect(dataState?.readyIDs?.[dataState?.resetID ?? '']).not.toBe(true); + expect(isCurrentProductMarketingWindowDataReady(dataState)).toBe(false); }); it('does not let an OpenApp from before a reset ready the pending generation, which recovers through its own OpenApp', async () => { const delayedFetch = TestHelper.createGlobalFetchMock(); delayedFetch.pause(); global.fetch = delayedFetch; - await Onyx.set(ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE, {resetID: 'old-pending-reset', readyIDs: {'old-pending-reset': true}}); + await Onyx.set(ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE, {resetID: 'oldPendingReset', readyIDs: {oldPendingReset: true}}); await waitForBatchedUpdates(); App.openApp(); @@ -144,28 +153,32 @@ describe('IS_LOADING_APP stranded true', () => { await clearOnyxAndSeedFullReconnect([]); await waitForBatchedUpdates(); const stateAfterReset = await getOnyxValue(ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE); - expect(stateAfterReset?.resetID).toEqual(expect.any(String)); - expect(stateAfterReset?.resetID).not.toBe(''); - expect(stateAfterReset?.readyIDs?.[stateAfterReset?.resetID ?? '']).not.toBe(true); + const pendingResetID = stateAfterReset?.resetID; + expect(pendingResetID).toEqual(expect.any(String)); + expect(pendingResetID).not.toBe(''); + expect(isCurrentProductMarketingWindowDataReady(stateAfterReset)).toBe(false); + if (!pendingResetID) { + throw new Error('Expected the account reset to create a product marketing data generation'); + } await delayedFetch.resume(); await waitForIdle(); await waitForBatchedUpdates(); let dataState = await getOnyxValue(ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE); - expect(dataState?.readyIDs?.[stateAfterReset?.resetID ?? '']).not.toBe(true); + expect(dataState?.readyIDs?.[pendingResetID]).not.toBe(true); App.openApp(); await waitForIdle(); await waitForBatchedUpdates(); dataState = await getOnyxValue(ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE); - expect(dataState?.readyIDs?.[stateAfterReset?.resetID ?? '']).toBe(true); + expect(dataState?.readyIDs?.[pendingResetID]).toBe(true); }); it('does not let an OpenApp that began before an account reset close a newer ready generation', async () => { const delayedFetch = TestHelper.createGlobalFetchMock(); delayedFetch.pause(); global.fetch = delayedFetch; - await Onyx.set(ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE, {resetID: 'old-reset', readyIDs: {'old-reset': true}}); + await Onyx.set(ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE, {resetID: 'oldReset', readyIDs: {oldReset: true}}); await waitForBatchedUpdates(); App.openApp(); @@ -175,8 +188,11 @@ describe('IS_LOADING_APP stranded true', () => { const stateAfterReset = await getOnyxValue(ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE); expect(stateAfterReset?.resetID).toEqual(expect.any(String)); expect(stateAfterReset?.resetID).not.toBe(''); - expect(stateAfterReset?.resetID).not.toBe('old-reset'); - await Onyx.merge(ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE, {readyIDs: {[stateAfterReset?.resetID ?? '']: true}}); + expect(stateAfterReset?.resetID).not.toBe('oldReset'); + if (!stateAfterReset?.resetID) { + throw new Error('Expected the account reset to create a product marketing data generation'); + } + await Onyx.merge(ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE, {readyIDs: {[stateAfterReset.resetID]: true}}); await waitForBatchedUpdates(); await delayedFetch.resume(); @@ -185,6 +201,6 @@ describe('IS_LOADING_APP stranded true', () => { const stateAfterStaleSuccess = await getOnyxValue(ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE); expect(stateAfterStaleSuccess?.resetID).toBe(stateAfterReset?.resetID); - expect(stateAfterStaleSuccess?.readyIDs?.[stateAfterStaleSuccess?.resetID ?? '']).toBe(true); + expect(isCurrentProductMarketingWindowDataReady(stateAfterStaleSuccess)).toBe(true); }); }); diff --git a/tests/unit/AuthPrefetchTest.ts b/tests/unit/AuthPrefetchTest.ts index 379e7a1fc2b1..48c04f0789cd 100644 --- a/tests/unit/AuthPrefetchTest.ts +++ b/tests/unit/AuthPrefetchTest.ts @@ -60,9 +60,10 @@ describe('auth startup prefetch cleanup', () => { expect(mockClearPrefetchOnAppStart).toHaveBeenCalledTimes(2); expect(mockMultiSet).toHaveBeenCalledWith({ [ONYXKEYS.IS_LOADING_APP]: true, + [ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE]: {resetID: expect.any(String), readyIDs: {}}, [ONYXKEYS.LAST_FULL_RECONNECT_TIME]: '2026-07-16 12:00:00.000', }); - expect(mockClear).toHaveBeenCalledWith([ONYXKEYS.SESSION, ONYXKEYS.IS_LOADING_APP, ONYXKEYS.LAST_FULL_RECONNECT_TIME]); + expect(mockClear).toHaveBeenCalledWith([ONYXKEYS.SESSION, ONYXKEYS.IS_LOADING_APP, ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE, ONYXKEYS.LAST_FULL_RECONNECT_TIME]); expect(mockClearPrefetchOnAppStart.mock.invocationCallOrder.at(0)).toBeLessThan(mockMultiSet.mock.invocationCallOrder.at(0) ?? 0); expect(mockClearPrefetchOnAppStart.mock.invocationCallOrder.at(1)).toBeGreaterThan(mockClear.mock.invocationCallOrder.at(0) ?? 0); }); diff --git a/tests/unit/ProductMarketingWindowTest.tsx b/tests/unit/ProductMarketingWindowTest.tsx index abd032e19ad7..dddf43d77322 100644 --- a/tests/unit/ProductMarketingWindowTest.tsx +++ b/tests/unit/ProductMarketingWindowTest.tsx @@ -219,7 +219,7 @@ describe('ProductMarketingWindowManager', () => { await act(async () => { // Match the deployed race: policies and IS_LOADING_APP can become usable before this NVP // finishes rehydrating. The transition gate must keep the missing key from meaning "show". - await Onyx.set(ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE, {resetID: 'delegate-reset', readyIDs: {}}); + await Onyx.set(ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE, {resetID: 'delegateReset', readyIDs: {}}); await Onyx.set(ONYXKEYS.NVP_LAST_DISMISSED_MARKETING_WINDOW, null); await Onyx.set(ONYXKEYS.IS_LOADING_APP, false); await waitForBatchedUpdatesWithAct(); @@ -228,7 +228,7 @@ describe('ProductMarketingWindowManager', () => { await act(async () => { await Onyx.set(ONYXKEYS.NVP_LAST_DISMISSED_MARKETING_WINDOW, announcement.updateKey); - await Onyx.merge(ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE, {readyIDs: {'delegate-reset': true}}); + await Onyx.merge(ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE, {readyIDs: {delegateReset: true}}); await waitForBatchedUpdatesWithAct(); }); expect(screen.queryByText(adminHeading)).toBeNull(); @@ -237,7 +237,7 @@ describe('ProductMarketingWindowManager', () => { it('shows an eligible announcement only after the current account-reset generation becomes ready', async () => { await act(async () => { await setupOnyxBaseline({isAdmin: true}); - await Onyx.set(ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE, {resetID: 'eligible-reset', readyIDs: {}}); + await Onyx.set(ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE, {resetID: 'eligibleReset', readyIDs: {}}); await waitForBatchedUpdatesWithAct(); }); @@ -246,7 +246,7 @@ describe('ProductMarketingWindowManager', () => { expect(screen.queryByText(adminHeading)).toBeNull(); await act(async () => { - await Onyx.merge(ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE, {readyIDs: {'eligible-reset': true}}); + await Onyx.merge(ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE, {readyIDs: {eligibleReset: true}}); await waitForBatchedUpdatesWithAct(); }); expect(screen.getByText(adminHeading)).toBeOnTheScreen(); From 0984cb4040678962bebc290d9b8d5e64e38c125c Mon Sep 17 00:00:00 2001 From: KJ21-ENG Date: Wed, 5 Aug 2026 14:55:26 +0530 Subject: [PATCH 3/5] Stabilize product marketing reset test --- tests/unit/AuthPrefetchTest.ts | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tests/unit/AuthPrefetchTest.ts b/tests/unit/AuthPrefetchTest.ts index 48c04f0789cd..33f8b5145be4 100644 --- a/tests/unit/AuthPrefetchTest.ts +++ b/tests/unit/AuthPrefetchTest.ts @@ -16,6 +16,11 @@ jest.mock('@libs/Log', () => ({ jest.mock('@libs/DateUtils', () => ({ getDBTime: mockGetDBTime, })); +jest.mock('expensify-common', () => ({ + Str: { + guid: () => 'productMarketingResetID', + }, +})); jest.mock('react-native-onyx', () => ({ __esModule: true, default: { @@ -60,7 +65,7 @@ describe('auth startup prefetch cleanup', () => { expect(mockClearPrefetchOnAppStart).toHaveBeenCalledTimes(2); expect(mockMultiSet).toHaveBeenCalledWith({ [ONYXKEYS.IS_LOADING_APP]: true, - [ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE]: {resetID: expect.any(String), readyIDs: {}}, + [ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE]: {resetID: 'productMarketingResetID', readyIDs: {}}, [ONYXKEYS.LAST_FULL_RECONNECT_TIME]: '2026-07-16 12:00:00.000', }); expect(mockClear).toHaveBeenCalledWith([ONYXKEYS.SESSION, ONYXKEYS.IS_LOADING_APP, ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE, ONYXKEYS.LAST_FULL_RECONNECT_TIME]); From 18539bd32de31b4c762c6647d6b7ae9ec8de692a Mon Sep 17 00:00:00 2001 From: KJ21-ENG Date: Wed, 5 Aug 2026 17:34:15 +0530 Subject: [PATCH 4/5] Address product marketing review feedback --- .../ProductMarketingWindowManager.tsx | 12 +++++++-- src/libs/actions/App.ts | 27 +++++++++---------- 2 files changed, 22 insertions(+), 17 deletions(-) diff --git a/src/components/ProductMarketingWindow/ProductMarketingWindowManager.tsx b/src/components/ProductMarketingWindow/ProductMarketingWindowManager.tsx index 5319d3bd5b7d..89a146ced492 100644 --- a/src/components/ProductMarketingWindow/ProductMarketingWindowManager.tsx +++ b/src/components/ProductMarketingWindow/ProductMarketingWindowManager.tsx @@ -55,7 +55,7 @@ function ProductMarketingWindowManager({topmostRouteName}: ProductMarketingWindo const [isProductMarketingWindowCovered = false] = useOnyx(ONYXKEYS.RAM_ONLY_IS_PRODUCT_MARKETING_WINDOW_COVERED); // Account-scoped resets clear Onyx concurrently. A request only marks the generation it began // under as ready, so an older in-flight response cannot expose the replacement account's gap. - const [productMarketingWindowDataState] = useOnyx(ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE); + const [productMarketingWindowDataState, productMarketingWindowDataStateMetadata] = useOnyx(ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE); const [isAnonymousSession = false] = useOnyx(ONYXKEYS.SESSION, {selector: isAnonymousSessionSelector}); const [isActingAsDelegate = false, accountMetadata] = useOnyx(ONYXKEYS.ACCOUNT, {selector: isActingAsDelegateSelector}); const [lastDismissedMarketingWindow, lastDismissedMarketingWindowMetadata] = useOnyx(ONYXKEYS.NVP_LAST_DISMISSED_MARKETING_WINDOW); @@ -70,7 +70,15 @@ function ProductMarketingWindowManager({topmostRouteName}: ProductMarketingWindo const targetAdminPolicyID = activeAdminPolicies?.find((policy) => policy.id === activePolicyID)?.id ?? activeAdminPolicies?.at(0)?.id; const variant = getProductMarketingAnnouncementVariant(announcement, !!targetAdminPolicyID, lastDismissedMarketingWindow); const isCoveredByCenteredModalScreen = !!topmostRouteName && CENTERED_MODAL_SCREEN_NAVIGATORS.has(topmostRouteName); - const isLoading = isLoadingOnyxValue(lastDismissedMarketingWindowMetadata, activeAdminPoliciesMetadata, activePolicyIDMetadata, isLoadingAppMetadata, accountMetadata) || isLoadingApp; + const isLoading = + isLoadingOnyxValue( + lastDismissedMarketingWindowMetadata, + activeAdminPoliciesMetadata, + activePolicyIDMetadata, + productMarketingWindowDataStateMetadata, + isLoadingAppMetadata, + accountMetadata, + ) || isLoadingApp; const currentProductMarketingWindowDataResetID = productMarketingWindowDataState?.resetID; const isProductMarketingWindowDataReady = !currentProductMarketingWindowDataResetID || !!productMarketingWindowDataState?.readyIDs?.[currentProductMarketingWindowDataResetID]; diff --git a/src/libs/actions/App.ts b/src/libs/actions/App.ts index 9f6b3955b382..52a50ac61e3c 100644 --- a/src/libs/actions/App.ts +++ b/src/libs/actions/App.ts @@ -449,21 +449,18 @@ function openApp(shouldKeepPublicRooms = false, allReportsWithDraftComments?: Re // The imported state already contains all the data, so we just need to mark the app as loaded // Exception: When forceRun is true (exiting imported state), always make the API call if (isUsingImportedState && !forceRun) { - if (productMarketingWindowDataResetID) { - Onyx.multiSet({ - [ONYXKEYS.IS_LOADING_APP]: false, - [ONYXKEYS.HAS_LOADED_APP]: true, - [ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE]: { - resetID: productMarketingWindowDataResetID, - readyIDs: {[productMarketingWindowDataResetID]: true}, - }, - }); - } else { - Onyx.multiSet({ - [ONYXKEYS.IS_LOADING_APP]: false, - [ONYXKEYS.HAS_LOADED_APP]: true, - }); - } + Onyx.multiSet({ + [ONYXKEYS.IS_LOADING_APP]: false, + [ONYXKEYS.HAS_LOADED_APP]: true, + ...(productMarketingWindowDataResetID + ? { + [ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE]: { + resetID: productMarketingWindowDataResetID, + readyIDs: {[productMarketingWindowDataResetID]: true}, + }, + } + : {}), + }); return Promise.resolve(); } From 7f7409f34da0e67d587282475ea91c97df121742 Mon Sep 17 00:00:00 2001 From: KJ21-ENG Date: Wed, 5 Aug 2026 22:37:37 +0530 Subject: [PATCH 5/5] Simplify product marketing rehydration fix --- src/ONYXKEYS.ts | 4 - .../ProductMarketingWindowManager.tsx | 28 +--- src/libs/ExportOnyxState/common.ts | 1 - src/libs/ImportOnyxStateUtils.ts | 1 - src/libs/actions/App.ts | 48 +------ src/libs/actions/Delegate.ts | 14 +- .../actions/clearOnyxAndSeedFullReconnect.ts | 8 +- src/setup/index.ts | 2 - tests/actions/AppTest.ts | 125 +---------------- tests/actions/DelegateTest.ts | 17 --- tests/actions/IsLoadingAppStrandedTest.ts | 129 +----------------- tests/unit/AuthPrefetchTest.ts | 8 +- tests/unit/ExportOnyxStateTest.ts | 2 - tests/unit/ImportOnyxStateTest.ts | 2 - tests/unit/ProductMarketingWindowTest.tsx | 47 ------- 15 files changed, 19 insertions(+), 417 deletions(-) diff --git a/src/ONYXKEYS.ts b/src/ONYXKEYS.ts index c4f5bde58085..62f3d937a907 100755 --- a/src/ONYXKEYS.ts +++ b/src/ONYXKEYS.ts @@ -43,9 +43,6 @@ const ONYXKEYS = { /** Whether a semantic modal is covering the product marketing window in this app instance */ RAM_ONLY_IS_PRODUCT_MARKETING_WINDOW_COVERED: 'isProductMarketingWindowCovered', - /** Tracks which account-reset generation the product marketing window data has finished rehydrating */ - PRODUCT_MARKETING_WINDOW_DATA_STATE: 'productMarketingWindowDataState', - /** Boolean flag set whenever we are searching for reports in the server */ RAM_ONLY_IS_SEARCHING_FOR_REPORTS: 'isSearchingForReports', @@ -1549,7 +1546,6 @@ type OnyxValuesMapping = { [ONYXKEYS.DEVICE_ID]: string; [ONYXKEYS.RAM_ONLY_IS_SIDEBAR_LOADED]: boolean; [ONYXKEYS.RAM_ONLY_IS_PRODUCT_MARKETING_WINDOW_COVERED]: boolean; - [ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE]: {resetID: string; readyIDs: Record}; [ONYXKEYS.PERSISTED_REQUESTS]: OnyxTypes.AnyRequest[]; [ONYXKEYS.PERSISTED_ONGOING_REQUESTS]: OnyxTypes.AnyRequest; [ONYXKEYS.CURRENT_DATE]: string; diff --git a/src/components/ProductMarketingWindow/ProductMarketingWindowManager.tsx b/src/components/ProductMarketingWindow/ProductMarketingWindowManager.tsx index 89a146ced492..b4393abd3d98 100644 --- a/src/components/ProductMarketingWindow/ProductMarketingWindowManager.tsx +++ b/src/components/ProductMarketingWindow/ProductMarketingWindowManager.tsx @@ -53,9 +53,6 @@ function ProductMarketingWindowManager({topmostRouteName}: ProductMarketingWindo // Semantically covering overlays take precedence over the marketing window from pre-show through final hide. // Responsive popover sheets and route-backed right-docked navigation remain exempt. const [isProductMarketingWindowCovered = false] = useOnyx(ONYXKEYS.RAM_ONLY_IS_PRODUCT_MARKETING_WINDOW_COVERED); - // Account-scoped resets clear Onyx concurrently. A request only marks the generation it began - // under as ready, so an older in-flight response cannot expose the replacement account's gap. - const [productMarketingWindowDataState, productMarketingWindowDataStateMetadata] = useOnyx(ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE); const [isAnonymousSession = false] = useOnyx(ONYXKEYS.SESSION, {selector: isAnonymousSessionSelector}); const [isActingAsDelegate = false, accountMetadata] = useOnyx(ONYXKEYS.ACCOUNT, {selector: isActingAsDelegateSelector}); const [lastDismissedMarketingWindow, lastDismissedMarketingWindowMetadata] = useOnyx(ONYXKEYS.NVP_LAST_DISMISSED_MARKETING_WINDOW); @@ -70,28 +67,9 @@ function ProductMarketingWindowManager({topmostRouteName}: ProductMarketingWindo const targetAdminPolicyID = activeAdminPolicies?.find((policy) => policy.id === activePolicyID)?.id ?? activeAdminPolicies?.at(0)?.id; const variant = getProductMarketingAnnouncementVariant(announcement, !!targetAdminPolicyID, lastDismissedMarketingWindow); const isCoveredByCenteredModalScreen = !!topmostRouteName && CENTERED_MODAL_SCREEN_NAVIGATORS.has(topmostRouteName); - const isLoading = - isLoadingOnyxValue( - lastDismissedMarketingWindowMetadata, - activeAdminPoliciesMetadata, - activePolicyIDMetadata, - productMarketingWindowDataStateMetadata, - isLoadingAppMetadata, - accountMetadata, - ) || isLoadingApp; - const currentProductMarketingWindowDataResetID = productMarketingWindowDataState?.resetID; - const isProductMarketingWindowDataReady = !currentProductMarketingWindowDataResetID || !!productMarketingWindowDataState?.readyIDs?.[currentProductMarketingWindowDataResetID]; - - if ( - !announcement || - !variant || - isLoading || - !isProductMarketingWindowDataReady || - isProductMarketingWindowCovered || - isAnonymousSession || - isActingAsDelegate || - isCoveredByCenteredModalScreen - ) { + const isLoading = isLoadingOnyxValue(lastDismissedMarketingWindowMetadata, activeAdminPoliciesMetadata, activePolicyIDMetadata, isLoadingAppMetadata, accountMetadata) || isLoadingApp; + + if (!announcement || !variant || isLoading || isProductMarketingWindowCovered || isAnonymousSession || isActingAsDelegate || isCoveredByCenteredModalScreen) { return null; } diff --git a/src/libs/ExportOnyxState/common.ts b/src/libs/ExportOnyxState/common.ts index b7da677026b6..49f542a3e67b 100644 --- a/src/libs/ExportOnyxState/common.ts +++ b/src/libs/ExportOnyxState/common.ts @@ -27,7 +27,6 @@ const onyxKeysToRemove = new Set | ValueOf { - productMarketingWindowDataResetID = value?.resetID; - }, -}); - // hasLoadedAppPromise is used in the "reconnectApp" function and is not directly associated with the View, // so retrieving it using Onyx.connectWithoutView is correct. let resolveHasLoadedAppPromise: () => void; @@ -169,7 +159,7 @@ const KEYS_TO_PRESERVE: OnyxKey[] = [ ONYXKEYS.COLLECTION.DEVICE_BIOMETRICS, ONYXKEYS.STASHED_SESSION, ONYXKEYS.STASHED_CREDENTIALS, - + ONYXKEYS.NVP_LAST_DISMISSED_MARKETING_WINDOW, // Preserve IS_USING_IMPORTED_STATE so that when the app restarts (especially in HybridApp mode), // we know if we're in imported state mode and should skip API calls that would cause infinite loading ONYXKEYS.IS_USING_IMPORTED_STATE, @@ -309,12 +299,7 @@ function getPolicyParamsForOpenOrReconnect(): PolicyParamsForOpenOrReconnect { return {policyIDList: getNonOptimisticPolicyIDs(allPolicies)}; } -type OnyxDataForOpenOrReconnectKeys = - | typeof ONYXKEYS.COLLECTION.REPORT - | typeof ONYXKEYS.IS_LOADING_REPORT_DATA - | typeof ONYXKEYS.HAS_LOADED_APP - | typeof ONYXKEYS.IS_LOADING_APP - | typeof ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE; +type OnyxDataForOpenOrReconnectKeys = typeof ONYXKEYS.COLLECTION.REPORT | typeof ONYXKEYS.IS_LOADING_REPORT_DATA | typeof ONYXKEYS.HAS_LOADED_APP | typeof ONYXKEYS.IS_LOADING_APP; /** * Returns the Onyx data that is used for both the OpenApp and ReconnectApp API commands. @@ -325,7 +310,6 @@ function getOnyxDataForOpenOrReconnect( shouldKeepPublicRooms = false, allReportsWithDraftComments?: Record, shouldClearAppLoading = false, - shouldApplyProductMarketingWindowDataReadyOnSuccess = false, ): OnyxData { let commandName: string; if (isOpenApp) { @@ -370,22 +354,6 @@ function getOnyxDataForOpenOrReconnect( }); } - // Every account-scoped reset through clearOnyxAndSeedFullReconnect starts a new generation. Queued - // requests mark their captured generation ready after the complete queue flush. Full side-effect - // reconnects bypass that queue, so their successData does the same after the HTTPS payload is applied. - if ((isOpenApp || isFullReconnect) && productMarketingWindowDataResetID) { - const productMarketingWindowDataReadyUpdate: OnyxUpdate = { - onyxMethod: Onyx.METHOD.MERGE, - key: ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE, - value: {readyIDs: {[productMarketingWindowDataResetID]: true}}, - }; - if (shouldApplyProductMarketingWindowDataReadyOnSuccess) { - result.successData?.push(productMarketingWindowDataReadyUpdate); - } else { - result.queueFlushedData?.push(productMarketingWindowDataReadyUpdate); - } - } - // Clear IS_LOADING_APP in finallyData for OpenApp and ReconnectApp, not just OpenApp. The optimistic `true` // above persists immediately, while finallyData for write commands is held in memory until the sequential // queue flushes (see QueuedOnyxUpdates), so an interrupted session can leave `true` persisted with no OpenApp @@ -452,14 +420,6 @@ function openApp(shouldKeepPublicRooms = false, allReportsWithDraftComments?: Re Onyx.multiSet({ [ONYXKEYS.IS_LOADING_APP]: false, [ONYXKEYS.HAS_LOADED_APP]: true, - ...(productMarketingWindowDataResetID - ? { - [ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE]: { - resetID: productMarketingWindowDataResetID, - readyIDs: {[productMarketingWindowDataResetID]: true}, - }, - } - : {}), }); return Promise.resolve(); } @@ -577,7 +537,7 @@ function finalReconnectAppAfterActivatingReliableUpdates(): Promise { return clearOnyxAndSeedFullReconnect(KEYS_TO_PRESERVE_DELEGATE_ACCESS, { diff --git a/src/libs/actions/clearOnyxAndSeedFullReconnect.ts b/src/libs/actions/clearOnyxAndSeedFullReconnect.ts index aeeda6b50c7f..35748063bd47 100644 --- a/src/libs/actions/clearOnyxAndSeedFullReconnect.ts +++ b/src/libs/actions/clearOnyxAndSeedFullReconnect.ts @@ -5,7 +5,6 @@ import ONYXKEYS from '@src/ONYXKEYS'; import type {OnyxKey, OnyxMultiSetInput} from 'react-native-onyx'; -import {Str} from 'expensify-common'; import Onyx from 'react-native-onyx'; /** @@ -16,11 +15,7 @@ import Onyx from 'react-native-onyx'; * response.onyxData before successData, so without the seed the timestamp would * still be empty when the comparison runs and trigger a duplicate reconnect. * - * Every account-scoped reset also starts a new product marketing data generation before - * account data is removed. OpenApp marks that generation ready after the successful - * sequential-queue flush, once the destination account's dismissal NVP has landed. - * - * Pass `extraSeeds` to seed additional keys atomically with these shared seeds (e.g. + * Pass `extraSeeds` to seed additional keys atomically with the timestamp (e.g. * IS_LOADING_APP=true for delegate transitions). Seeded keys are appended to the * preserve list automatically so they survive the clear. */ @@ -31,7 +26,6 @@ async function clearOnyxAndSeedFullReconnect(keysToPreserve: OnyxKey[], extraSee const seeds: OnyxMultiSetInput = { ...extraSeeds, - [ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE]: {resetID: Str.guid(), readyIDs: {}}, [ONYXKEYS.LAST_FULL_RECONNECT_TIME]: DateUtils.getDBTime(), }; await Onyx.multiSet(seeds); diff --git a/src/setup/index.ts b/src/setup/index.ts index 365f18b3c54d..bd1533bdcb66 100644 --- a/src/setup/index.ts +++ b/src/setup/index.ts @@ -55,8 +55,6 @@ export default function () { willAlertModalBecomeVisible: false, }, [ONYXKEYS.RAM_ONLY_IS_PRODUCT_MARKETING_WINDOW_COVERED]: false, - // PRODUCT_MARKETING_WINDOW_DATA_STATE intentionally has no default. Onyx initial defaults - // overwrite stored fields, but a persisted reset-without-readiness must survive a restart. // Ensure the Supportal permission modal doesn't persist across reloads [ONYXKEYS.SUPPORTAL_PERMISSION_DENIED]: null, [ONYXKEYS.IS_OPEN_APP_FAILURE_MODAL_OPEN]: false, diff --git a/tests/actions/AppTest.ts b/tests/actions/AppTest.ts index 3c5f448bcb7e..985aad29ee47 100644 --- a/tests/actions/AppTest.ts +++ b/tests/actions/AppTest.ts @@ -2,7 +2,6 @@ import {waitFor} from '@testing-library/react-native'; import DateUtils from '@libs/DateUtils'; import Navigation from '@libs/Navigation/Navigation'; -import {waitForIdle} from '@libs/Network/SequentialQueue'; import OnyxUpdateManager from '@src/libs/actions/OnyxUpdateManager'; import '@libs/Navigation/AppNavigator/AuthScreens'; @@ -10,7 +9,7 @@ import '@libs/Navigation/AppNavigator/AuthScreens'; import ONYXKEYS from '@src/ONYXKEYS'; import type {Policy} from '@src/types/onyx'; -import type {OnyxCollection, OnyxValue} from 'react-native-onyx'; +import type {OnyxCollection} from 'react-native-onyx'; import Onyx from 'react-native-onyx'; @@ -27,13 +26,6 @@ jest.mock('@src/components/ConfirmedRoute.tsx'); OnyxUpdateManager(); -function isCurrentProductMarketingWindowDataReady(dataState: OnyxValue): boolean { - if (!dataState?.resetID) { - throw new Error('Expected a product marketing data generation'); - } - return dataState.readyIDs?.[dataState.resetID] === true; -} - describe('actions/App', () => { let mockFetch: MockFetch; @@ -109,103 +101,6 @@ describe('actions/App', () => { expect(mockFetch).not.toHaveBeenCalled(); }); - test('reconnectAppWithSideEffects reopens product marketing readiness only after a full reconnect', async () => { - await Onyx.multiSet({ - [ONYXKEYS.HAS_LOADED_APP]: true, - [ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE]: {resetID: 'sideEffectReset', readyIDs: {}}, - }); - await waitForBatchedUpdates(); - - await App.reconnectAppWithSideEffects(123); - await waitForBatchedUpdates(); - let dataState = await getOnyxValue(ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE); - expect(isCurrentProductMarketingWindowDataReady(dataState)).toBe(false); - - await App.reconnectAppWithSideEffects(); - await waitForBatchedUpdates(); - dataState = await getOnyxValue(ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE); - expect(isCurrentProductMarketingWindowDataReady(dataState)).toBe(true); - }); - - test('a full side-effect reconnect cannot mark a newer account-reset generation ready', async () => { - await Onyx.multiSet({ - [ONYXKEYS.HAS_LOADED_APP]: true, - [ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE]: {resetID: 'oldSideEffectReset', readyIDs: {oldSideEffectReset: true}}, - }); - await waitForBatchedUpdates(); - mockFetch.pause(); - - const reconnectPromise = App.reconnectAppWithSideEffects(); - await waitForBatchedUpdates(); - // Simulate the replacement generation finishing before this older side-effect response. - await Onyx.set(ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE, {resetID: 'newSideEffectReset', readyIDs: {newSideEffectReset: true}}); - await waitForBatchedUpdates(); - - await mockFetch.resume(); - await reconnectPromise; - await waitForBatchedUpdates(); - - const dataState = await getOnyxValue(ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE); - expect(dataState?.resetID).toBe('newSideEffectReset'); - expect(dataState?.readyIDs?.newSideEffectReset).toBe(true); - }); - - test('a stale full side-effect reconnect leaves a newer generation pending until its own full reconnect succeeds', async () => { - await Onyx.multiSet({ - [ONYXKEYS.HAS_LOADED_APP]: true, - [ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE]: {resetID: 'oldPendingReset', readyIDs: {oldPendingReset: true}}, - }); - await waitForBatchedUpdates(); - mockFetch.pause(); - - const staleReconnectPromise = App.reconnectAppWithSideEffects(); - await waitForBatchedUpdates(); - await Onyx.set(ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE, {resetID: 'newPendingReset', readyIDs: {}}); - await waitForBatchedUpdates(); - - await mockFetch.resume(); - await staleReconnectPromise; - await waitForBatchedUpdates(); - - let dataState = await getOnyxValue(ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE); - expect(dataState?.readyIDs?.newPendingReset).not.toBe(true); - - await App.reconnectAppWithSideEffects(); - await waitForBatchedUpdates(); - dataState = await getOnyxValue(ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE); - expect(dataState?.readyIDs?.newPendingReset).toBe(true); - }); - - test('a failed full side-effect reconnect leaves the current product marketing generation pending', async () => { - const failedFetch = TestHelper.createGlobalFetchMock(); - failedFetch.fail(); - global.fetch = failedFetch; - await Onyx.multiSet({ - [ONYXKEYS.HAS_LOADED_APP]: true, - [ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE]: {resetID: 'failedSideEffectReset', readyIDs: {}}, - }); - await waitForBatchedUpdates(); - - await App.reconnectAppWithSideEffects(); - await waitForBatchedUpdates(); - - const dataState = await getOnyxValue(ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE); - expect(dataState?.readyIDs?.failedSideEffectReset).not.toBe(true); - }); - - test('openApp immediately marks product marketing data ready when using imported state', async () => { - await Onyx.set(ONYXKEYS.IS_USING_IMPORTED_STATE, true); - await Onyx.set(ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE, {resetID: 'importedReset', readyIDs: {}}); - await waitForBatchedUpdates(); - - await App.openApp(); - await waitForBatchedUpdates(); - - expect(mockFetch).not.toHaveBeenCalled(); - const dataState = await getOnyxValue(ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE); - expect(isCurrentProductMarketingWindowDataReady(dataState)).toBe(true); - }); - test('trigger full reconnect', async () => { const triggerFullReconnect = jest.spyOn(App, 'triggerFullReconnect'); @@ -282,24 +177,6 @@ describe('actions/App', () => { }); }); - test('clearOnyxAndResetApp keeps product marketing gated while account data is rehydrating', async () => { - jest.spyOn(Navigation, 'clearPreloadedRoutes').mockImplementation(() => {}); - await Onyx.set(ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE, {resetID: 'loadedReset', readyIDs: {loadedReset: true}}); - mockFetch.pause(); - - try { - await App.clearOnyxAndResetApp(); - await waitForBatchedUpdates(); - - const dataState = await getOnyxValue(ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE); - expect(dataState?.resetID).not.toBe('loadedReset'); - expect(isCurrentProductMarketingWindowDataReady(dataState)).toBe(false); - } finally { - await mockFetch.resume(); - } - await waitForIdle(); - }); - describe('getNonOptimisticPolicyIDs', () => { it('should return empty array when policies is empty object', () => { const result = App.getNonOptimisticPolicyIDs({}); diff --git a/tests/actions/DelegateTest.ts b/tests/actions/DelegateTest.ts index 22e9cc4541d1..e35f8bd37b93 100644 --- a/tests/actions/DelegateTest.ts +++ b/tests/actions/DelegateTest.ts @@ -273,23 +273,6 @@ describe('actions/Delegate', () => { }); }); - // The marketing window must remain gated while destination-account keys are rehydrating. - await new Promise((resolve) => { - const conn = Onyx.connect({ - key: ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE, - callback: (value) => { - expect(value?.resetID).toEqual(expect.any(String)); - expect(value?.resetID).not.toBe(''); - if (!value?.resetID) { - throw new Error('Expected the delegate transition to create a product marketing data generation'); - } - expect(value.readyIDs?.[value.resetID]).not.toBe(true); - Onyx.disconnect(conn); - resolve(); - }, - }); - }); - // HAS_LOADED_APP is in the preserve list and should remain true. await new Promise((resolve) => { const conn = Onyx.connect({ diff --git a/tests/actions/IsLoadingAppStrandedTest.ts b/tests/actions/IsLoadingAppStrandedTest.ts index 5cde3b628877..5d239511440f 100644 --- a/tests/actions/IsLoadingAppStrandedTest.ts +++ b/tests/actions/IsLoadingAppStrandedTest.ts @@ -1,14 +1,11 @@ import * as App from '@libs/actions/App'; -import clearOnyxAndSeedFullReconnect from '@libs/actions/clearOnyxAndSeedFullReconnect'; import {WRITE_COMMANDS} from '@libs/API/types'; -import {resetQueue, waitForIdle} from '@libs/Network/SequentialQueue'; +import {resetQueue} from '@libs/Network/SequentialQueue'; import OnyxUpdateManager from '@src/libs/actions/OnyxUpdateManager'; import * as PersistedRequests from '@src/libs/actions/PersistedRequests'; import ONYXKEYS from '@src/ONYXKEYS'; -import type {OnyxValue} from 'react-native-onyx'; - import Onyx from 'react-native-onyx'; import getOnyxValue from '../utils/getOnyxValue'; @@ -17,13 +14,6 @@ import waitForBatchedUpdates from '../utils/waitForBatchedUpdates'; OnyxUpdateManager(); -function isCurrentProductMarketingWindowDataReady(dataState: OnyxValue): boolean { - if (!dataState?.resetID) { - throw new Error('Expected a product marketing data generation'); - } - return dataState.readyIDs?.[dataState.resetID] === true; -} - describe('IS_LOADING_APP stranded true', () => { beforeAll(() => { Onyx.init({keys: ONYXKEYS}); @@ -86,121 +76,4 @@ describe('IS_LOADING_APP stranded true', () => { expect(await getOnyxValue(ONYXKEYS.IS_LOADING_APP)).toBe(false); }); - - it('marks product marketing data ready after a successful OpenApp queue flush', async () => { - await Onyx.set(ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE, {resetID: 'openAppReset', readyIDs: {}}); - await waitForBatchedUpdates(); - - App.openApp(); - await waitForIdle(); - await waitForBatchedUpdates(); - - const dataState = await getOnyxValue(ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE); - expect(isCurrentProductMarketingWindowDataReady(dataState)).toBe(true); - }); - - it('stays gated when OpenApp fails and reopens after a successful full ReconnectApp', async () => { - const failedFetch = TestHelper.createGlobalFetchMock(); - failedFetch.fail(); - global.fetch = failedFetch; - - await clearOnyxAndSeedFullReconnect([]); - await Onyx.set(ONYXKEYS.HAS_LOADED_APP, true); - await waitForBatchedUpdates(); - - App.openApp(); - await waitForIdle(); - await waitForBatchedUpdates(); - - let dataState = await getOnyxValue(ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE); - expect(isCurrentProductMarketingWindowDataReady(dataState)).toBe(false); - - failedFetch.succeed(); - App.reconnectApp(); - await waitForBatchedUpdates(); - await waitForIdle(); - await waitForBatchedUpdates(); - - dataState = await getOnyxValue(ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE); - expect(isCurrentProductMarketingWindowDataReady(dataState)).toBe(true); - }); - - it('keeps product marketing gated after a successful partial ReconnectApp', async () => { - await Onyx.multiSet({ - [ONYXKEYS.HAS_LOADED_APP]: true, - [ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE]: {resetID: 'partialReset', readyIDs: {}}, - }); - await waitForBatchedUpdates(); - - App.reconnectApp(123); - await waitForBatchedUpdates(); - await waitForIdle(); - await waitForBatchedUpdates(); - - const dataState = await getOnyxValue(ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE); - expect(isCurrentProductMarketingWindowDataReady(dataState)).toBe(false); - }); - - it('does not let an OpenApp from before a reset ready the pending generation, which recovers through its own OpenApp', async () => { - const delayedFetch = TestHelper.createGlobalFetchMock(); - delayedFetch.pause(); - global.fetch = delayedFetch; - await Onyx.set(ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE, {resetID: 'oldPendingReset', readyIDs: {oldPendingReset: true}}); - await waitForBatchedUpdates(); - - App.openApp(); - await waitForBatchedUpdates(); - await clearOnyxAndSeedFullReconnect([]); - await waitForBatchedUpdates(); - const stateAfterReset = await getOnyxValue(ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE); - const pendingResetID = stateAfterReset?.resetID; - expect(pendingResetID).toEqual(expect.any(String)); - expect(pendingResetID).not.toBe(''); - expect(isCurrentProductMarketingWindowDataReady(stateAfterReset)).toBe(false); - if (!pendingResetID) { - throw new Error('Expected the account reset to create a product marketing data generation'); - } - - await delayedFetch.resume(); - await waitForIdle(); - await waitForBatchedUpdates(); - let dataState = await getOnyxValue(ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE); - expect(dataState?.readyIDs?.[pendingResetID]).not.toBe(true); - - App.openApp(); - await waitForIdle(); - await waitForBatchedUpdates(); - dataState = await getOnyxValue(ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE); - expect(dataState?.readyIDs?.[pendingResetID]).toBe(true); - }); - - it('does not let an OpenApp that began before an account reset close a newer ready generation', async () => { - const delayedFetch = TestHelper.createGlobalFetchMock(); - delayedFetch.pause(); - global.fetch = delayedFetch; - await Onyx.set(ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE, {resetID: 'oldReset', readyIDs: {oldReset: true}}); - await waitForBatchedUpdates(); - - App.openApp(); - await waitForBatchedUpdates(); - await clearOnyxAndSeedFullReconnect([]); - await waitForBatchedUpdates(); - const stateAfterReset = await getOnyxValue(ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE); - expect(stateAfterReset?.resetID).toEqual(expect.any(String)); - expect(stateAfterReset?.resetID).not.toBe(''); - expect(stateAfterReset?.resetID).not.toBe('oldReset'); - if (!stateAfterReset?.resetID) { - throw new Error('Expected the account reset to create a product marketing data generation'); - } - await Onyx.merge(ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE, {readyIDs: {[stateAfterReset.resetID]: true}}); - await waitForBatchedUpdates(); - - await delayedFetch.resume(); - await waitForIdle(); - await waitForBatchedUpdates(); - - const stateAfterStaleSuccess = await getOnyxValue(ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE); - expect(stateAfterStaleSuccess?.resetID).toBe(stateAfterReset?.resetID); - expect(isCurrentProductMarketingWindowDataReady(stateAfterStaleSuccess)).toBe(true); - }); }); diff --git a/tests/unit/AuthPrefetchTest.ts b/tests/unit/AuthPrefetchTest.ts index 33f8b5145be4..379e7a1fc2b1 100644 --- a/tests/unit/AuthPrefetchTest.ts +++ b/tests/unit/AuthPrefetchTest.ts @@ -16,11 +16,6 @@ jest.mock('@libs/Log', () => ({ jest.mock('@libs/DateUtils', () => ({ getDBTime: mockGetDBTime, })); -jest.mock('expensify-common', () => ({ - Str: { - guid: () => 'productMarketingResetID', - }, -})); jest.mock('react-native-onyx', () => ({ __esModule: true, default: { @@ -65,10 +60,9 @@ describe('auth startup prefetch cleanup', () => { expect(mockClearPrefetchOnAppStart).toHaveBeenCalledTimes(2); expect(mockMultiSet).toHaveBeenCalledWith({ [ONYXKEYS.IS_LOADING_APP]: true, - [ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE]: {resetID: 'productMarketingResetID', readyIDs: {}}, [ONYXKEYS.LAST_FULL_RECONNECT_TIME]: '2026-07-16 12:00:00.000', }); - expect(mockClear).toHaveBeenCalledWith([ONYXKEYS.SESSION, ONYXKEYS.IS_LOADING_APP, ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE, ONYXKEYS.LAST_FULL_RECONNECT_TIME]); + expect(mockClear).toHaveBeenCalledWith([ONYXKEYS.SESSION, ONYXKEYS.IS_LOADING_APP, ONYXKEYS.LAST_FULL_RECONNECT_TIME]); expect(mockClearPrefetchOnAppStart.mock.invocationCallOrder.at(0)).toBeLessThan(mockMultiSet.mock.invocationCallOrder.at(0) ?? 0); expect(mockClearPrefetchOnAppStart.mock.invocationCallOrder.at(1)).toBeGreaterThan(mockClear.mock.invocationCallOrder.at(0) ?? 0); }); diff --git a/tests/unit/ExportOnyxStateTest.ts b/tests/unit/ExportOnyxStateTest.ts index 55c4b5610f86..0b7e1cb95a5d 100644 --- a/tests/unit/ExportOnyxStateTest.ts +++ b/tests/unit/ExportOnyxStateTest.ts @@ -136,7 +136,6 @@ describe('maskOnyxState', () => { [ONYXKEYS.NVP_PRIVATE_STRIPE_CUSTOMER_ID]: 'stripe-id', [ONYXKEYS.RAM_ONLY_PLAID_LINK_TOKEN]: 'plaid-token', [ONYXKEYS.RAM_ONLY_IS_PRODUCT_MARKETING_WINDOW_COVERED]: true, - [ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE]: {resetID: 'reset', readyIDs: {}}, [ONYXKEYS.ONFIDO_TOKEN]: 'onfido-token', }; const result = maskOnyxState(input); @@ -146,7 +145,6 @@ describe('maskOnyxState', () => { expect(result[ONYXKEYS.NVP_PRIVATE_STRIPE_CUSTOMER_ID]).toBeUndefined(); expect(result[ONYXKEYS.RAM_ONLY_PLAID_LINK_TOKEN]).toBeUndefined(); expect(result[ONYXKEYS.RAM_ONLY_IS_PRODUCT_MARKETING_WINDOW_COVERED]).toBeUndefined(); - expect(result[ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE]).toBeUndefined(); expect(result[ONYXKEYS.ONFIDO_TOKEN]).toBeUndefined(); // Session should still be present diff --git a/tests/unit/ImportOnyxStateTest.ts b/tests/unit/ImportOnyxStateTest.ts index 7c5b99ad3050..c0b283207d50 100644 --- a/tests/unit/ImportOnyxStateTest.ts +++ b/tests/unit/ImportOnyxStateTest.ts @@ -90,7 +90,6 @@ describe('cleanAndTransformState', () => { [ONYXKEYS.CREDENTIALS]: 'remove4', [ONYXKEYS.PREFERRED_THEME]: 'remove5', [ONYXKEYS.RAM_ONLY_IS_PRODUCT_MARKETING_WINDOW_COVERED]: true, - [ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE]: {resetID: 'reset', readyIDs: {}}, keepThis: 'value', }); @@ -107,6 +106,5 @@ describe('cleanAndTransformState', () => { expect(result).not.toHaveProperty(ONYXKEYS.CREDENTIALS); expect(result).not.toHaveProperty(ONYXKEYS.PREFERRED_THEME); expect(result).not.toHaveProperty(ONYXKEYS.RAM_ONLY_IS_PRODUCT_MARKETING_WINDOW_COVERED); - expect(result).not.toHaveProperty(ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE); }); }); diff --git a/tests/unit/ProductMarketingWindowTest.tsx b/tests/unit/ProductMarketingWindowTest.tsx index dddf43d77322..5bdd5a587a84 100644 --- a/tests/unit/ProductMarketingWindowTest.tsx +++ b/tests/unit/ProductMarketingWindowTest.tsx @@ -205,53 +205,6 @@ describe('ProductMarketingWindowManager', () => { expect(screen.queryByText(adminHeading)).toBeNull(); }); - it('does not flash a dismissed announcement while delegate-return account data is rehydrating', async () => { - await act(async () => { - await setupOnyxBaseline({isAdmin: true}); - await Onyx.set(ONYXKEYS.NVP_LAST_DISMISSED_MARKETING_WINDOW, announcement.updateKey); - await waitForBatchedUpdatesWithAct(); - }); - - renderManager(); - await waitForBatchedUpdatesWithAct(); - expect(screen.queryByText(adminHeading)).toBeNull(); - - await act(async () => { - // Match the deployed race: policies and IS_LOADING_APP can become usable before this NVP - // finishes rehydrating. The transition gate must keep the missing key from meaning "show". - await Onyx.set(ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE, {resetID: 'delegateReset', readyIDs: {}}); - await Onyx.set(ONYXKEYS.NVP_LAST_DISMISSED_MARKETING_WINDOW, null); - await Onyx.set(ONYXKEYS.IS_LOADING_APP, false); - await waitForBatchedUpdatesWithAct(); - }); - expect(screen.queryByText(adminHeading)).toBeNull(); - - await act(async () => { - await Onyx.set(ONYXKEYS.NVP_LAST_DISMISSED_MARKETING_WINDOW, announcement.updateKey); - await Onyx.merge(ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE, {readyIDs: {delegateReset: true}}); - await waitForBatchedUpdatesWithAct(); - }); - expect(screen.queryByText(adminHeading)).toBeNull(); - }); - - it('shows an eligible announcement only after the current account-reset generation becomes ready', async () => { - await act(async () => { - await setupOnyxBaseline({isAdmin: true}); - await Onyx.set(ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE, {resetID: 'eligibleReset', readyIDs: {}}); - await waitForBatchedUpdatesWithAct(); - }); - - renderManager(); - await waitForBatchedUpdatesWithAct(); - expect(screen.queryByText(adminHeading)).toBeNull(); - - await act(async () => { - await Onyx.merge(ONYXKEYS.PRODUCT_MARKETING_WINDOW_DATA_STATE, {readyIDs: {eligibleReset: true}}); - await waitForBatchedUpdatesWithAct(); - }); - expect(screen.getByText(adminHeading)).toBeOnTheScreen(); - }); - it('renders nothing when the initial app load state was never written, as on a fresh sign-in', async () => { await act(async () => { // Deliberately do not write IS_LOADING_APP: the manager must treat the never-written key as still loading.