Freeze non top screens to prevent extra-rerenders 2 by VickyStash · Pull Request #85443 · Expensify/App

VickyStash · 2026-03-16T16:58:48Z

Explanation of Change

Freezes non-top screens in the navigation stack to prevent unnecessary re-renders, using a ScreenFreezeWrapper.

Previous PR #82764 was reverted #85198 with the next blockers:

$ #85184
$ #85185
$ #85149
$ #85170
$ #85250

Fixed Issues

$ #33725
PROPOSAL: https://expensify.slack.com/archives/C05LX9D6E07/p1771428903641059
$ #9402

Tests

Verify that no errors appear in the JS console

Open the app
Go to the Inbox tab
WEB: switch between several reports, make sure it works as expected, no lagging
Open any chat with a couple of expenses
Open expenses overview
Create one more expense there
Swipe/Go back to the chat, see if the chat is updated
WEB: Open chat details by tapping on the header, make sure the underlying chat screen is visible. Return back.
MOBILE: Open emoji modal, make sure underlying chat screen is visible. Return back.
Go to Settings > Workspace > Members > Member details and all the way back. Make sure it works as expected

#85184 — Web: App freezes when clicking "Go to Expensify Cards" button

Preconditions: Have a workspace with Expensify cards enabled. At least one Expensify card is assigned with the limit type set to Smart limit.

Navigate to the app
Go to workspace settings > More features > Workflows
Click on the locked toggle switch
Click on the "Go to Expensify Cards" button
Verify the app redirects to the Expensify Card tab and is fully functional (no freeze)

#85185 — iOS: App becomes unresponsive when changing Copilot access

Preconditions: Account has a copilot set.

Open the app
Go to Account > Security > Copilot
Tap the 3-dot menu near the copilot
Tap "Change access level"
Verify the app remains responsive and you can change access or tap back

#85149 — Web: ENTER on Merchant opens Schedule Call after visiting #admins

Log in with a new Gmail account
Create a workspace
Go to #admins
Go to workspace chat
Click + > Create expense > Manual
Enter amount
Click Merchant
Enter merchant and press Enter
Verify RHP returns to the confirm page (not Schedule Call)

Additional keboard shortcuts to check:

Attachment modal ESC — Open any attachment in a chat → press ESC → modal should close
Attachment carousel arrows — Open an attachment in a chat with multiple images → press Left/Right arrow keys → should navigate between images
Copy selection — Select text in a chat message → press Ctrl/Cmd+C → text should copy to the clipboard

#85170 — iOS: Workspace settings gray out briefly after swiping back

Launch Expensify app
Go to workspace settings > More features (or any page in workspace settings)
Swipe back to return to workspace settings
Verify workspace settings do not gray out briefly

#85250 — iOS: App freezes on downgrade workspace page

Launch Hybrid app
Create a new Gmail account
On onboarding, select "Manage my team's expenses" > 1-10 option
Select either NetSuite, Sage Intacct, or QBD accounting software (upgrades to Control WS)
Tap Continue & finish onboarding
Go to Account > Subscriptions > "Explore all plans" button
Select "Downgrade to Collect"
Tap "Downgrade Workspace" or try tapping the back button
Verify the app does not freeze and the downgrade proceeds normally

Offline tests

Same, as in the Tests section

QA Steps

// TODO: These must be filled out, or the issue title must include "[No QA]."

Verify that no errors appear in the JS console

Same, as in the Tests section

PR Author Checklist

Screenshots/Videos

Android: Native

android.mp4

Android: mWeb Chrome

android_web.mp4

iOS: Native

ios.mov

ios-85250.mov

ios-85170.mov

ios-85185.mp4

iOS: mWeb Safari

ios_web.mov

MacOS: Chrome / Safari

web.mp4

web-85149.mp4

web-85184.mp4

…vert-82764-freeze-non-top-screens" This reverts commit c43fe34, reversing changes made to b2b5ac1.

github-actions · 2026-03-16T16:58:59Z

⚠️ This PR is possibly changing native code and/or updating libraries, it may cause problems with HybridApp. Please check if any patch updates are required in the HybridApp repo and run an AdHoc build to verify that HybridApp will not break. Ask Contributor Plus for help if you are not sure how to handle this. ⚠️

codecov · 2026-03-16T17:07:55Z

Codecov Report

✅ Changes either increased or maintained existing code coverage, great job!

Files with missing lines	Coverage Δ
...cPressable/implementation/BaseGenericPressable.tsx	`79.09% <100.00%> (+1.21%)`	⬆️
src/hooks/useCopySelectionHelper.ts	`100.00% <100.00%> (ø)`
src/hooks/useKeyboardShortcut.ts	`100.00% <100.00%> (ø)`
...gation/AppNavigator/createSplitNavigator/index.tsx	`100.00% <ø> (ø)`
...mponent/ScreenFreezeWrapper/ScreenFreezeContext.ts	`100.00% <100.00%> (ø)`
...tePlatformStackNavigatorComponent/index.native.tsx	`100.00% <100.00%> (ø)`
...ckNavigatorComponent/wrapDescriptorsWithFreeze.tsx	`100.00% <100.00%> (ø)`
...atorComponent/ScreenFreezeWrapper/index.native.tsx	`90.00% <90.00%> (ø)`
...ntModalScreen/AttachmentModalBaseContent/index.tsx	`89.53% <50.00%> (+0.89%)`	⬆️
...on/createPlatformStackNavigatorComponent/index.tsx	`0.00% <0.00%> (ø)`
... and 2 more
... and 14 files with indirect coverage changes

VickyStash · 2026-03-17T13:40:02Z

FYI, there is a bug with newly created account for gmail user - I can't pass through the onboarding modal. This happens on main too, so it's not related to current pr:

main-bug-onboarding.mp4

melvin-bot · 2026-03-17T13:40:26Z

@situchan Please copy/paste the Reviewer Checklist from here into a new comment on this PR and complete it. If you have the K2 extension, you can simply click: [this button]

situchan · 2026-03-17T13:43:20Z

@MelvinBot please post summary of new changes which fix regressions from v1 PR.

.../PlatformStackNavigation/createPlatformStackNavigatorComponent/ScreenFreezeWrapper/index.tsx

MelvinBot · 2026-03-17T13:46:24Z

Summary of New Changes Fixing v1 Regressions

This PR re-applies the original v1 PR (#82764) and adds three fix commits on top to address the five regressions that caused the revert. Here's what each fix does:

1. Fix for #85184 — Web: App freezes when clicking "Go to Expensify Cards" button

Commit: 611e70e | File: ScreenFreezeWrapper.tsx

The original ScreenFreezeWrapper only deferred freezing when a tooltip was active. It didn't account for modals. When a modal was still open during a navigation transition, the screen behind it would freeze, causing the app to become unresponsive.

Fix: Added an areAllModalsHidden() check. Now freezing is deferred by one frame whenever a modal or tooltip is still open, giving them time to dismiss before the tree is suspended. Also restructured the logic to always unfreeze immediately (no deferral needed when making a screen visible).

2. Fix for #85170, #85185, #85250 — iOS: Gray-out on swipe-back, Copilot unresponsive, Downgrade freeze

Commit: 390daa4 | File: react-native-screens patch (DelayedFreeze)

All three iOS issues shared the same root cause: on Fabric, the DelayedFreeze in react-native-screens was freezing screens too soon — before transition/dismiss animations finished. The original v1 patch used setTimeout(0) + requestAnimationFrame, which wasn't enough delay for iOS animations.

Fix: Introduced a FREEZE_DELAY_MS = 400 ms delay before the requestAnimationFrame. This ensures that screen transition animations, popover dismissals, and swipe-back gestures have enough time to complete before React suspends the tree.

3. Fix for #85149 — Web: ENTER on Merchant opens Schedule Call after visiting #admins

Commit: 2c92405 | Files: useKeyboardShortcut.ts, ScreenFreezeContext.ts (new), ScreenFreezeWrapper.tsx

When a screen was frozen, its keyboard shortcuts were supposed to unsubscribe via cleanup effects. But the freeze happened before cleanup could run, leaving stale shortcuts from a previously visited screen (e.g., #admins' "Schedule Call" shortcut) still active. Pressing Enter would trigger that stale shortcut instead of the expected action.

Fix: Introduced a freeze defer mechanism:

New ScreenFreezeContext provides a registerFreezeDefer() API
useKeyboardShortcut registers a defer while its shortcut is active
ScreenFreezeWrapper checks for active defers before freezing — if any exist, it delays freezing by one frame so cleanup effects (shortcut unsubscription) can run first

TL;DR: The three fix commits address: (1) modal-awareness in freeze logic, (2) a longer delay for iOS native animations before freezing, and (3) a defer mechanism so keyboard shortcut cleanup runs before screens are frozen.

MelvinBot · 2026-03-17T13:57:18Z

Code Review: Freeze non-top screens v2

Overall this is a well-structured approach to preventing unnecessary re-renders. The ScreenFreezeWrapper for web and the react-native-screens/react-navigation patches for native are a clean separation. I found a few issues worth discussing:

1. `contextValue` not memoized in `ScreenFreezeWrapper` (Performance)

File: ScreenFreezeWrapper.tsx:19-27

registerFreezeDefer and contextValue are recreated on every render without useCallback/useMemo:

const registerFreezeDefer = () => { ... };
const contextValue = {registerFreezeDefer};

Since contextValue is a new object reference every render, all consumers of useScreenFreezeContext() (currently every useKeyboardShortcut call inside split navigator screens) will re-render whenever ScreenFreezeWrapper renders — even if nothing meaningful changed. This is counterproductive for a component whose purpose is to prevent unnecessary re-renders.

Suggested fix:

const registerFreezeDefer = useCallback(() => {
    freezeDeferCountRef.current++;
    return () => { freezeDeferCountRef.current--; };
}, []);

const contextValue = useMemo(() => ({registerFreezeDefer}), [registerFreezeDefer]);

2. Potential timing race in `AttachmentModalBaseContent` on native (Correctness)

File: AttachmentModalBaseContent/index.tsx:169-173

onClose?.();
requestAnimationFrame(() => {
    onConfirm?.(Object.assign(files ?? {}, {source} as FileObject));
});

The comment says the rAF deferral gives "the target screen time to unfreeze and re-mount its refs." However, the DelayedFreeze patch delays both freezing and unfreezing by FREEZE_DELAY_MS (400ms) + 1 rAF (~416ms total). When onClose triggers goBack(), the report screen below starts unfreezing — but that takes ~416ms. The requestAnimationFrame fires in ~16ms, well before the screen unfreezes.

If the report screen was frozen by the native stack (since the react-navigation patch now freezes all non-focused screens on Fabric), composerRef.current could still be null when addAttachment runs, which throws: "The composerRef.clearWorklet function is not set yet."

Could you verify this doesn't happen on iOS/Android? The navigation hierarchy may prevent this (if the attachment modal and report screen are in different navigators), but the timing math is concerning.

Also: there is no cancelAnimationFrame cleanup — if the component unmounts before the rAF fires, onConfirm still executes with potentially stale closures.

3. `wrappedDescriptors` computed inline without `useMemo` (Performance)

File: createPlatformStackNavigatorComponent/index.tsx:108-122

The for loop creates new descriptor objects and new render arrow functions on every render. Since wrappedDescriptors is in the Content useMemo dependency array, the memo never caches — it recomputes every render.

Note: descriptors from React Navigation's useDescriptors is also unstable (rebuilt with reduce() every render), so this isn't strictly worse than the baseline. But wrapping in useMemo would still avoid unnecessary object allocations:

const wrappedDescriptors = useMemo(() => {
    if (!freezeNonTopScreens) return descriptors;
    const topRouteKey = state.routes[state.index]?.key;
    // ... wrapping logic
}, [descriptors, state.index, persistentScreens]);

4. `DelayedFreeze` delays unfreezing too (Design question)

File: react-native-screens+4.15.4+001+delay-freeze-until-paint.patch

The effect uses the same FREEZE_DELAY_MS = 400 for both freeze and unfreeze transitions:

React.useEffect(() => {
    const id = setTimeout(() => {
        rafID = requestAnimationFrame(() => setFreezeState(freeze));
    }, FREEZE_DELAY_MS);
    ...
}, [freeze]);

When navigating back to a frozen screen, the unfreeze is delayed by ~416ms. Is this intentional? The 400ms delay was motivated by needing animations to complete before freezing, but for unfreezing, the user is navigating TO this screen and would benefit from immediate responsiveness.

Consider only applying the delay when freeze is true:

React.useEffect(() => {
    if (!freeze) {
        setFreezeState(false); // Unfreeze immediately
        return;
    }
    const id = setTimeout(() => {
        rafID = requestAnimationFrame(() => setFreezeState(true));
    }, FREEZE_DELAY_MS);
    return () => { clearTimeout(id); cancelAnimationFrame(rafID); };
}, [freeze]);

This mirrors the approach in ScreenFreezeWrapper on web, which already unfreezes immediately.

5. Minor observations

FREEZE_DELAY_MS = 400: This is a heuristic that assumes all animations complete within 400ms. React Navigation's default iOS animation is 350ms, so 400ms has a 50ms margin. On slower devices this could be tight. Consider whether InteractionManager.runAfterInteractions would be more deterministic.
registerFreezeDefer not in useEffect deps (useKeyboardShortcut.ts:71): The eslint-disable already covers this, and it's harmless since the function identity changes but the behavior is the same. Just noting it for awareness.
freezeNonTopScreens silently ignored on native: index.native.tsx doesn't read this option. The native path uses the react-native-screens/react-navigation patches instead. This separation is correct but may confuse future contributors — a brief comment in the type definition would help.

Summary

#	Issue	Severity	Type
1	`contextValue` not memoized — causes re-renders of all keyboard shortcut consumers in split screens	Medium	Performance
2	rAF timing in `submitAndClose` may fire before native `DelayedFreeze` unfreezes target screen	Medium	Correctness
3	`wrappedDescriptors` not memoized	Low	Performance
4	`DelayedFreeze` delays unfreezing by 400ms — should unfreeze immediately	Medium	Design
5	Minor: magic number, missing dep, missing comment	Low	Code quality

Items 1 and 4 seem most actionable. The rest are worth discussing but may be acceptable tradeoffs.

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: e5450de216

ℹ️ About Codex in GitHub

Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

chatgpt-codex-connector · 2026-03-17T14:02:11Z

patches/react-native-screens/react-native-screens+4.15.4+001+delay-freeze-until-paint.patch

+    const id = setTimeout(() => {
+      rafID = requestAnimationFrame(() => setFreezeState(freeze));
+    }, FREEZE_DELAY_MS);


Unfreeze screens immediately when focus returns

This effect now waits FREEZE_DELAY_MS for all freeze transitions, not just when entering the frozen state. When a route becomes focused again (freeze flips true -> false), setFreezeState(false) is delayed by ~400ms, so the newly focused screen can remain suspended and miss immediate UI updates/taps after back/pop navigation. The delay should only apply when freeze is true, while unfreezing should happen immediately.

Useful? React with 👍 / 👎.

In DelayedFreeze if freeze is false it always applied right away, https://github.com/software-mansion/react-native-screens/blob/63b3baab65a1fd36da04ae426f98ad460217e1e0/src/components/helpers/DelayedFreeze.tsx#L24

return <Freeze freeze={freeze ? freezeState : false}>{children}</Freeze>;

VickyStash · 2026-03-17T14:26:22Z

Melvin's comments don't look accurate to me, as it thinks that unfreezing is delayed too, but it's not, as I've mentioned here #85443 (comment).
Also, we don't memoize the values anymore as it handled by react compiler

situchan · 2026-03-17T15:00:41Z

Currently blocked hybrid iOS testing https://expensify.slack.com/archives/C05LX9D6E07/p1773753991898119

joekaufmanexpensify · 2026-03-17T21:46:46Z

No product review needed

situchan

@MelvinBot review

Find any possible regressions. Especially from useKeyboardShortcut migration

MelvinBot · 2026-04-02T13:24:20Z

🔍 Regression Review: `useKeyboardShortcut` Migration & Screen Freeze

I analyzed the PR for regressions from the useKeyboardShortcut migration and the screen freeze integration. Here are my findings:

1. `captureOnInputs` Default Mismatch in `CarouselActions` ⚠️

Risk: Medium

KeyboardShortcut.subscribe defaults captureOnInputs to false (source), while useKeyboardShortcut defaults it to true (source).

In CarouselActions.tsx, the old code called subscribe(shortcutKey, callback, descriptionKey, modifiers) with only 4 args, so captureOnInputs defaulted to false. The new code calls useKeyboardShortcut(CONST.KEYBOARD_SHORTCUTS.ARROW_LEFT, callback) without a config, so captureOnInputs now defaults to true.

Impact: Arrow Left/Right keys in the attachment carousel will now be captured even when an input element is focused. If there is ever a text input visible alongside the carousel (unlikely but possible), arrow keys would cycle attachments instead of moving the cursor in the input.

Fix: Add {captureOnInputs: false} to both useKeyboardShortcut calls in CarouselActions to preserve the original behavior, or confirm the true default is intentionally desired here.

2. `AttachmentModalBaseContent` — `onConfirm`/`onClose` Reorder & RAF Deferral ⚠️

Risk: Medium (iOS-specific)

The submitAndClose callback was changed from:

onConfirm(files) → onClose()

to:

onClose() → requestAnimationFrame(() => onConfirm(files))

On iOS, onClose routes through InteractionManager.runAfterInteractions() (index.ios.ts), meaning the actual Navigation.goBack() is deferred until after animations. The requestAnimationFrame for onConfirm may fire before the screen unfreezes.

onConfirm → addAttachment accesses composerRef.current?.clearWorklet, and if the composer is still frozen, clearWorklet could be undefined, triggering the throw new Error('The composerRef.clearWorklet function is not set yet').

On web/Android this is likely safe — web's closeModal is synchronous, and Android's handleModalClose calls the callback directly.

Suggestion: Consider whether a single requestAnimationFrame is sufficient on iOS, or if the deferral should use a longer delay or wait for navigation completion.

3. `BaseGenericPressable` — Migration Looks Correct ✅

The old code passed captureOnInputs=true, shouldBubble=false, shouldPreventDefault=false explicitly. The new code uses useKeyboardShortcut with {isActive: !!keyboardShortcut, shouldBubble: false, shouldPreventDefault: false}, and captureOnInputs defaults to true in the hook. All parameters match.

The as ValueOf<typeof CONST.KEYBOARD_SHORTCUTS> type assertion is needed because keyboardShortcut ?? {} can produce undefined fields. The isActive: !!keyboardShortcut guard prevents the subscription when the shortcut is undefined.

4. `useCopySelectionHelper` — Migration Looks Correct ✅

The old code explicitly passed captureOnInputs=false. The new code passes {captureOnInputs: false}. The behavior is preserved.

5. `modifiers?.join()` in Dependency Array — Actually Fixes a Latent Bug ✅

The change from shortcut.modifiers.join() to shortcut.modifiers?.join() is correct. BaseGenericPressable can pass {modifiers: undefined} when keyboardShortcut is undefined. React evaluates the dependency array regardless of whether the effect body runs (i.e., even when isActive=false causes an early return). Without the optional chaining, undefined.join() would throw a runtime error during dependency comparison.

6. ScreenFreezeContext — Native Doesn't Provide the Context (Intentional) ✅

The native ScreenFreezeWrapper does not render a ScreenFreezeContext.Provider — it uses a 500ms timeout delay instead. All useKeyboardShortcut calls on native get the default no-op registerFreezeDefer. This is safe and intentional.

Components outside any ScreenFreezeWrapper (e.g., SidePanel, EmojiPicker in GlobalModals) also get the no-op default. This is safe because these components cannot be frozen.

7. `WorkspaceInviteMessageComponent` — `setNavigationActionToMicrotaskQueue` Removal ℹ️

Risk: Low

The change from setNavigationActionToMicrotaskQueue(() => Navigation.dismissModal()) to Navigation.dismissModal() removes a timing safety net. setNavigationActionToMicrotaskQueue ensured Onyx's optimistic updates settled before navigation (per issue #37785).

However, dismissModal() itself uses isNavigationReady().then(...) which is already a microtask deferral. For this specific path (navigating back to the members list after sending invites), the destination screen is unlikely to be affected by stale Onyx data. The other path at line 179-181 (wide layout) still uses setNavigationActionToMicrotaskQueue.

8. Minor: Unmemoized `contextValue` in Web `ScreenFreezeWrapper` ℹ️

Risk: Negligible

In ScreenFreezeWrapper/index.tsx, contextValue is created as a new object each render without useMemo. This causes context consumers to re-render on every parent re-render. However, since registerFreezeDefer is not in useKeyboardShortcut's dependency array (intentionally), this doesn't cause effect re-runs. The re-render is limited to the hook body re-executing, which is lightweight.

Summary

Finding	Risk	Action Suggested
`captureOnInputs` mismatch in `CarouselActions`	Medium	Add `{captureOnInputs: false}` or confirm new default is intended
`onConfirm` RAF deferral timing on iOS	Medium	Verify on iOS that composerRef is available after one frame
`BaseGenericPressable` migration	None	Correct
`useCopySelectionHelper` migration	None	Correct
`modifiers?.join()` change	None	Fixes latent bug
ScreenFreezeContext native no-op	None	Intentional design
`setNavigationActionToMicrotaskQueue` removal	Low	Monitor for navigation race conditions
Unmemoized contextValue	Negligible	Optional optimization

situchan · 2026-04-02T13:45:01Z

Bug: Not able to move cursor in password input of protected pdf

Screen.Recording.2026-04-02.at.7.44.03.PM.mov

VickyStash · 2026-04-02T13:46:23Z

@situchan I think my latest commit should fix it

github-actions · 2026-04-02T17:59:53Z

🚧 @Julesssss has triggered a test Expensify/App build. You can view the workflow run here.

github-actions · 2026-04-02T18:04:48Z

🧪🧪 Use the links below to test this adhoc build on Android, iOS, and Web. Happy testing! 🧪🧪
Built from App PR #85443.

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-753f6d2-dddefdc-ef841087b7d423e089b8149f38acb93f570c3c41/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-753f6d2-dddefdc-aa8336b7b7495968e59d8dfa12f5223008839841/index.html

Web 🕸️
https://85443.pr-testing.expensify.com

👀 View the workflow run that generated this build 👀

...bs/Navigation/PlatformStackNavigation/createPlatformStackNavigatorComponent/index.native.tsx

...rmStackNavigation/createPlatformStackNavigatorComponent/ScreenFreezeWrapper/index.native.tsx

src/pages/workspace/members/WorkspaceInviteMessageComponent.tsx

…eMessageComponent

situchan · 2026-04-03T08:15:19Z

@VickyStash
Return back setNavigationActionToMicrotaskQueue inside WorkspaceInvit…

Won't this reintroduce iOS issue anymore?

VickyStash · 2026-04-03T08:18:43Z

Won't this reintroduce iOS issue anymore?

Initally, I've added this update to fix this reported issue.

Test steps:

Launch the app
Sign in with a new account
Create a new workspace
Navigate to members tab > Invite member
Enter an email address > Next
Tap on invite in the confirmation page

But with latest updates I wasn't able to reproduce it anymore.
It would be good to check it over the ad-hoc build too, just in case.

github-actions · 2026-04-03T17:14:59Z

🚧 @Julesssss has triggered a test Expensify/App build. You can view the workflow run here.

github-actions · 2026-04-03T17:19:56Z

🧪🧪 Use the links below to test this adhoc build on Android, iOS, and Web. Happy testing! 🧪🧪
Built from App PR #85443.

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-1bf4a95-be549fc-6aa0e078b41cadeb17793c1141a96dd1731d7db9/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-1bf4a95-be549fc-b9fcb4f05e53392224df3b03e2da6b95497d8d4d/index.html

Web 🕸️
https://85443.pr-testing.expensify.com

👀 View the workflow run that generated this build 👀

VickyStash · 2026-04-07T05:15:34Z

@Julesssss @situchan kind bump here!

situchan · 2026-04-07T05:16:34Z

from me

github-actions · 2026-04-07T18:30:44Z

🚧 @Julesssss has triggered a test Expensify/App build. You can view the workflow run here.

github-actions · 2026-04-07T18:35:34Z

🧪🧪 Use the links below to test this adhoc build on Android, iOS, and Web. Happy testing! 🧪🧪
Built from App PR #85443.

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-b47156a-c55fd38-c6ee6fd7f772485045f1c85b226ef1659ba3dbd6/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-b47156a-c55fd38-3e8921ae0c4155aa2d3e4412d8a82759cd2dc8b8/index.html

Web 🕸️
https://85443.pr-testing.expensify.com

👀 View the workflow run that generated this build 👀

OSBotify · 2026-04-07T18:36:02Z

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

OSBotify · 2026-04-08T00:18:33Z

🚀 Deployed to staging by https://github.com/Julesssss in version: 9.3.54-0 🚀

platform	result
🕸 web 🕸	success ✅
🤖 android 🤖	success ✅
🍎 iOS 🍎	success ✅

Bundle Size Analysis (Sentry):

Android
iOS

MelvinBot · 2026-04-08T00:20:55Z

No help site changes required.

This PR is a purely internal performance optimization that freezes non-top screens in the navigation stack to prevent unnecessary re-renders. It introduces a ScreenFreezeWrapper, refactors keyboard shortcut subscriptions to use useKeyboardShortcut, and wraps navigation descriptors with freeze behavior.

No user-facing features, settings, labels, buttons, or workflows were added, changed, or removed — so no updates to docs/articles are needed.

VickyStash added 4 commits March 16, 2026 14:01

Revert "Merge pull request Expensify#85198 from callstack-internal/re…

1f66947

…vert-82764-freeze-non-top-screens" This reverts commit c43fe34, reversing changes made to b2b5ac1.

Fix DB 85184

611e70e

Fix DB 85170, 85185, 85250

390daa4

Fix DB 85149

2c92405

melvin-bot bot assigned VickyStash Mar 16, 2026

VickyStash changed the title ~~Vicky stash/refactor/freeze non top screens 2~~ Freeze non top screens to prevent extra-rerenders 2 Mar 16, 2026

VickyStash mentioned this pull request Mar 16, 2026

Migrate the main chat list to FlashList #33725

Open

VickyStash added 2 commits March 17, 2026 10:33

Merge branch 'main' into VickyStash/refactor/freeze-non-top-screens-2

0da1bdd

Fix spell check

e5450de

VickyStash marked this pull request as ready for review March 17, 2026 13:40

VickyStash requested review from a team as code owners March 17, 2026 13:40

melvin-bot bot requested review from situchan and removed request for a team March 17, 2026 13:40

melvin-bot bot requested review from joekaufmanexpensify and removed request for a team March 17, 2026 13:40

github-actions bot reviewed Mar 17, 2026

View reviewed changes

.../PlatformStackNavigation/createPlatformStackNavigatorComponent/ScreenFreezeWrapper/index.tsx Show resolved Hide resolved

github-actions bot reviewed Mar 17, 2026

View reviewed changes

.../PlatformStackNavigation/createPlatformStackNavigatorComponent/ScreenFreezeWrapper/index.tsx Show resolved Hide resolved

chatgpt-codex-connector bot reviewed Mar 17, 2026

View reviewed changes

joekaufmanexpensify removed their request for review March 17, 2026 21:46

situchan reviewed Apr 2, 2026

View reviewed changes

Apply feedback

753f6d2

situchan approved these changes Apr 2, 2026

View reviewed changes

melvin-bot bot requested a review from mountiny April 2, 2026 13:49

Julesssss reviewed Apr 2, 2026

View reviewed changes

...bs/Navigation/PlatformStackNavigation/createPlatformStackNavigatorComponent/index.native.tsx Show resolved Hide resolved

Julesssss reviewed Apr 2, 2026

View reviewed changes

...rmStackNavigation/createPlatformStackNavigatorComponent/ScreenFreezeWrapper/index.native.tsx Show resolved Hide resolved

Julesssss reviewed Apr 2, 2026

View reviewed changes

src/pages/workspace/members/WorkspaceInviteMessageComponent.tsx Outdated Show resolved Hide resolved

VickyStash added 2 commits April 3, 2026 09:00

Merge branch 'main' into VickyStash/refactor/freeze-non-top-screens-2

1934f7d

Return back setNavigationActionToMicrotaskQueue inside WorkspaceInvit…

1bf4a95

…eMessageComponent

Merge branch 'main' into VickyStash/refactor/freeze-non-top-screens-2

1f792a9

Julesssss approved these changes Apr 7, 2026

View reviewed changes

Julesssss merged commit b47156a into Expensify:main Apr 7, 2026
31 checks passed

OSBotify mentioned this pull request Apr 7, 2026

Deploy Checklist: New Expensify 2026-04-07 #87294

Open

65 tasks

VickyStash mentioned this pull request Apr 8, 2026

[CP Staging] Revert "Merge pull request #82764 from refactor/freeze-non-top-screens" #85198

Merged

52 tasks

Conversation

VickyStash commented Mar 16, 2026 • edited by Julesssss Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

github-actions bot commented Mar 16, 2026

Uh oh!

codecov bot commented Mar 16, 2026 • edited by github-actions bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

VickyStash commented Mar 17, 2026

Uh oh!

melvin-bot bot commented Mar 17, 2026

Uh oh!

situchan commented Mar 17, 2026

Uh oh!

Uh oh!

Uh oh!

MelvinBot commented Mar 17, 2026

Summary of New Changes Fixing v1 Regressions

1. Fix for #85184 — Web: App freezes when clicking "Go to Expensify Cards" button

2. Fix for #85170, #85185, #85250 — iOS: Gray-out on swipe-back, Copilot unresponsive, Downgrade freeze

3. Fix for #85149 — Web: ENTER on Merchant opens Schedule Call after visiting #admins

Uh oh!

MelvinBot commented Mar 17, 2026

Code Review: Freeze non-top screens v2

1. contextValue not memoized in ScreenFreezeWrapper (Performance)

2. Potential timing race in AttachmentModalBaseContent on native (Correctness)

3. wrappedDescriptors computed inline without useMemo (Performance)

4. DelayedFreeze delays unfreezing too (Design question)

5. Minor observations

Summary

Uh oh!

chatgpt-codex-connector bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

chatgpt-codex-connector bot Mar 17, 2026

Choose a reason for hiding this comment

Uh oh!

VickyStash Mar 17, 2026

Choose a reason for hiding this comment

Uh oh!

VickyStash commented Mar 17, 2026

Uh oh!

situchan commented Mar 17, 2026

Uh oh!

joekaufmanexpensify commented Mar 17, 2026

Uh oh!

situchan left a comment

Choose a reason for hiding this comment

Uh oh!

MelvinBot commented Apr 2, 2026

🔍 Regression Review: useKeyboardShortcut Migration & Screen Freeze

1. captureOnInputs Default Mismatch in CarouselActions ⚠️

2. AttachmentModalBaseContent — onConfirm/onClose Reorder & RAF Deferral ⚠️

3. BaseGenericPressable — Migration Looks Correct ✅

4. useCopySelectionHelper — Migration Looks Correct ✅

5. modifiers?.join() in Dependency Array — Actually Fixes a Latent Bug ✅

6. ScreenFreezeContext — Native Doesn't Provide the Context (Intentional) ✅

7. WorkspaceInviteMessageComponent — setNavigationActionToMicrotaskQueue Removal ℹ️

8. Minor: Unmemoized contextValue in Web ScreenFreezeWrapper ℹ️

Summary

Uh oh!

situchan commented Apr 2, 2026

Uh oh!

VickyStash commented Apr 2, 2026

Uh oh!

github-actions bot commented Apr 2, 2026

Uh oh!

github-actions bot commented Apr 2, 2026

Uh oh!

Uh oh!

VickyStash commented Mar 16, 2026 •

edited by Julesssss

Loading

codecov bot commented Mar 16, 2026 •

edited by github-actions bot

Loading

1. `contextValue` not memoized in `ScreenFreezeWrapper` (Performance)

2. Potential timing race in `AttachmentModalBaseContent` on native (Correctness)

3. `wrappedDescriptors` computed inline without `useMemo` (Performance)

4. `DelayedFreeze` delays unfreezing too (Design question)

🔍 Regression Review: `useKeyboardShortcut` Migration & Screen Freeze

1. `captureOnInputs` Default Mismatch in `CarouselActions` ⚠️

2. `AttachmentModalBaseContent` — `onConfirm`/`onClose` Reorder & RAF Deferral ⚠️

3. `BaseGenericPressable` — Migration Looks Correct ✅

4. `useCopySelectionHelper` — Migration Looks Correct ✅

5. `modifiers?.join()` in Dependency Array — Actually Fixes a Latent Bug ✅

7. `WorkspaceInviteMessageComponent` — `setNavigationActionToMicrotaskQueue` Removal ℹ️

8. Minor: Unmemoized `contextValue` in Web `ScreenFreezeWrapper` ℹ️