[CP Staging] Revert "Merge pull request #82764 from refactor/freeze-non-top-screens" by VickyStash · Pull Request #85198 · Expensify/App

VickyStash · 2026-03-13T07:44:49Z

Explanation of Change

This reverts PR #82764.

Fixed Issues

$ #85184
$ #85185
$ #85149
$ #85250
PROPOSAL: N/A

Tests

Verify that no errors appear in the JS console

DB #85184

Open the web app
2.Go to workspace settings > More features > Workflows
Click on the locked toggle switch
Click on the "Go to Expensify Cards" button
App redirects to the Expensify Card tab and is fully functional.

DB #85185

Preconditions: account set a copilot.

Open the ios app
Go to Account > Security > Copilot
Tap the 3-dot menu near the copilot
Tap Change access level
The user should be able to change Copilot access or tap the back button, and the app should remain responsive

Offline tests

Same, as in 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 Tests section

PR Author Checklist

Screenshots/Videos

Fix IOS - Copilot - App becomes unresponsive when trying to change the Copilot access

ios.mov

Fix Web-Ecard-App freezes when clicking on the Go to Expensify cards button

web.mp4

…ckyStash/refactor/freeze-non-top-screens" This reverts commit 556c257, reversing changes made to 6f4d45e.

github-actions · 2026-03-13T07:44:56Z

⚠️ 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-13T07:54:25Z

Codecov Report

❌ Looks like you've decreased code coverage for some files. Please write tests to increase, or at least maintain, the existing level of code coverage. See our documentation here for how to interpret this table.

Files with missing lines	Coverage Δ
...gation/AppNavigator/createSplitNavigator/index.tsx	`100.00% <ø> (ø)`
...on/createPlatformStackNavigatorComponent/index.tsx	`0.00% <ø> (ø)`
src/setup/index.ts	`100.00% <ø> (ø)`
...kspace/members/WorkspaceInviteMessageComponent.tsx	`0.00% <0.00%> (ø)`
...ntModalScreen/AttachmentModalBaseContent/index.tsx	`88.63% <0.00%> (-1.02%)`	⬇️
... and 17 files with indirect coverage changes

melvin-bot · 2026-03-13T08:11:57Z

@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]

trjExpensify

Just a revert. 👍

Julesssss · 2026-03-13T17:23:05Z

Reviewer Checklist

I have verified the author checklist is complete (all boxes are checked off).
I verified the correct issue is linked in the ### Fixed Issues section above
I verified testing steps are clear and they cover the changes made in this PR
- I verified the steps for local testing are in the Tests section
- I verified the steps for Staging and/or Production testing are in the QA steps section
- I verified the steps cover any possible failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
- I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
I checked that screenshots or videos are included for tests on all platforms
I included screenshots or videos for tests on all platforms
I verified that the composer does not automatically focus or open the keyboard on mobile unless explicitly intended. This includes checking that returning the app from the background does not unexpectedly open the keyboard.
I verified tests pass on all platforms & I tested again on:
- Android: HybridApp
- Android: mWeb Chrome
- iOS: HybridApp
- iOS: mWeb Safari
- MacOS: Chrome / Safari
If there are any errors in the console that are unrelated to this PR, I either fixed them (preferred) or linked to where I reported them in Slack
I verified proper code patterns were followed (see Reviewing the code)
- I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e. toggleReport and not onIconClick).
- I verified that comments were added to code that is not self explanatory
- I verified that any new or modified comments were clear, correct English, and explained "why" the code was doing something instead of only explaining "what" the code was doing.
- I verified any copy / text shown in the product is localized by adding it to src/languages/* files and using the translation method
- I verified all numbers, amounts, dates and phone numbers shown in the product are using the localization methods
- I verified any copy / text that was added to the app is grammatically correct in English. It adheres to proper capitalization guidelines (note: only the first word of header/labels should be capitalized), and is either coming verbatim from figma or has been approved by marketing (in order to get marketing approval, ask the Bug Zero team member to add the Waiting for copy label to the issue)
- I verified proper file naming conventions were followed for any new files or renamed files. All non-platform specific files are named after what they export and are not named "index.js". All platform-specific files are named for the platform the code supports as outlined in the README.
- I verified the JSDocs style guidelines (in STYLE.md) were followed
If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
I verified that this PR follows the guidelines as stated in the Review Guidelines
I verified other components that can be impacted by these changes have been tested, and I retested again (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar have been tested & I retested again)
I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)
I verified any variables that can be defined as constants (ie. in CONST.ts or at the top of the file that uses the constant) are defined as such
If a new component is created I verified that:
- A similar component doesn't exist in the codebase
- All props are defined accurately and each prop has a /** comment above it */
- The file is named correctly
- The component has a clear name that is non-ambiguous and the purpose of the component can be inferred from the name alone
- The only data being stored in the state is data necessary for rendering and nothing else
- For Class Components, any internal methods passed to components event handlers are bound to this properly so there are no scoping issues (i.e. for onClick={this.submit} the method this.submit should be bound to this in the constructor)
- Any internal methods bound to this are necessary to be bound (i.e. avoid this.submit = this.submit.bind(this); if this.submit is never passed to a component event handler like onClick)
- All JSX used for rendering exists in the render method
- The component has the minimum amount of code necessary for its purpose, and it is broken down into smaller components in order to separate concerns and functions
If any new file was added I verified that:
- The file has a description of what it does and/or why is needed at the top of the file if the code is not self explanatory
If a new CSS style is added I verified that:
- A similar style doesn't already exist
- The style can't be created with an existing StyleUtils function (i.e. StyleUtils.getBackgroundAndBorderStyle(theme.componentBG)
If the PR modifies code that runs when editing or sending messages, I tested and verified there is no unexpected behavior for all supported markdown - URLs, single line code, code blocks, quotes, headings, bold, strikethrough, and italic.
If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like Avatar is modified, I verified that Avatar is working as expected in all cases)
If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
If the PR modifies a component or page that can be accessed by a direct deeplink, I verified that the code functions as expected when the deeplink is used - from a logged in and logged out account.
If the PR modifies the UI (e.g. new buttons, new UI components, changing the padding/spacing/sizing, moving components, etc) or modifies the form input styles:
- I verified that all the inputs inside a form are aligned with each other.
- I added Design label and/or tagged @Expensify/design so the design team can review the changes.
If a new page is added, I verified it's using the ScrollView component to make it scrollable when more elements are added to the page.
For any bug fix or new feature in this PR, I verified that sufficient unit tests are included to prevent regressions in this flow.
If the main branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to the Test steps.
I have checked off every checkbox in the PR reviewer checklist, including those that don't apply to this PR.

Screenshots/Videos

Android: HybridApp

Android: mWeb Chrome

iOS: HybridApp

iOS: mWeb Safari

MacOS: Chrome / Safari

…-non-top-screens [CP Staging] Revert "Merge pull request #82764 from refactor/freeze-non-top-screens" (cherry picked from commit c43fe34) (cherry-picked to staging by luacmartins)

github-actions · 2026-03-13T17:43:43Z

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

OSBotify · 2026-03-13T17:49:59Z

🚀 Cherry-picked to staging by https://github.com/luacmartins in version: 9.3.37-2 🚀

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

github-actions · 2026-03-13T17:50:36Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-c43fe34-471caa7-0dc7978c5e819041ce03fa4822516bfe242f0be9/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-c43fe34-471caa7-313bd38696722a9180a3b2d62bffb3b467af9d5d/index.html

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

👀 View the workflow run that generated this build 👀

OSBotify · 2026-03-13T22:08:49Z

✋ 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-03-16T10:08:28Z

🚀 Deployed to production by https://github.com/cristipaval in version: 9.3.37-10 🚀

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

OSBotify · 2026-03-16T10:33:14Z

🚀 Cherry-picked to staging by https://github.com/luacmartins in version: 9.3.38-0 🚀

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

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

OSBotify · 2026-03-17T11:29:19Z

🚀 Deployed to production by https://github.com/cristipaval in version: 9.3.38-4 🚀

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

Revert "Merge pull request Expensify#82764 from callstack-internal/Vi…

3c0f9b3

…ckyStash/refactor/freeze-non-top-screens" This reverts commit 556c257, reversing changes made to 6f4d45e.

melvin-bot bot assigned VickyStash Mar 13, 2026

VickyStash marked this pull request as ready for review March 13, 2026 08:11

VickyStash requested review from a team as code owners March 13, 2026 08:11

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

melvin-bot bot requested review from trjExpensify and removed request for a team March 13, 2026 08:11

This was referenced Mar 13, 2026

IOS - Copilot - App becomes unresponsive when trying to change the Copilot access #85185

Closed

Web-Ecard-App freezes when clicking on the Go to Expensify cards button #85184

Closed

trjExpensify approved these changes Mar 13, 2026

View reviewed changes

stitesExpensify mentioned this pull request Mar 13, 2026

Create expenses - ENTER on Merchant opens Schedule call after opening #admins and creating expense #85149

Closed

7 tasks

luacmartins approved these changes Mar 13, 2026

View reviewed changes

luacmartins changed the title ~~Revert "Merge pull request #82764 from refactor/freeze-non-top-screens"~~ [CP Staging] Revert "Merge pull request #82764 from refactor/freeze-non-top-screens" Mar 13, 2026

VickyStash mentioned this pull request Mar 13, 2026

[Due for payment 2026-03-30] [Due for payment 2026-03-24] Migrate the main chat list to FlashList #33725

Open

Julesssss approved these changes Mar 13, 2026

View reviewed changes

Julesssss merged commit c43fe34 into Expensify:main Mar 13, 2026
57 of 63 checks passed

OSBotify added the CP Staging marks PRs that have been CP'd to staging label Mar 13, 2026

OSBotify mentioned this pull request Mar 13, 2026

Deploy Checklist: New Expensify 2026-03-12 #85146

Closed

87 tasks

luacmartins mentioned this pull request Mar 13, 2026

Subscription - App freezes on downgrade workspace page #85250

Closed

7 tasks

github-actions bot mentioned this pull request Mar 13, 2026

Investigate workflow job failing on main: test / test (job 8) #85258

Closed

VickyStash mentioned this pull request Mar 16, 2026

[$250] iOS - Workspace - Workspace settings gray out briefly after swiping back #85170

Closed

7 tasks

VickyStash mentioned this pull request Mar 16, 2026

Freeze non top screens to prevent extra-rerenders 2 #85443

Open

52 tasks

collectioneur mentioned this pull request Mar 18, 2026

Fix employee lands on wallet page after adding PBA from expense details page #85212

Merged

52 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

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

[CP Staging] Revert "Merge pull request #82764 from refactor/freeze-non-top-screens"#85198
Julesssss merged 1 commit intoExpensify:mainfrom
callstack-internal:revert-82764-freeze-non-top-screens

VickyStash commented Mar 13, 2026 •

edited by luacmartins

Loading

Uh oh!

github-actions bot commented Mar 13, 2026

Uh oh!

codecov bot commented Mar 13, 2026 •

edited by github-actions bot

Loading

Uh oh!

melvin-bot bot commented Mar 13, 2026

Uh oh!

trjExpensify left a comment

Uh oh!

Julesssss commented Mar 13, 2026

Uh oh!

Uh oh!

github-actions bot commented Mar 13, 2026

Uh oh!

OSBotify commented Mar 13, 2026

Uh oh!

github-actions bot commented Mar 13, 2026

Uh oh!

OSBotify commented Mar 13, 2026

Uh oh!

OSBotify commented Mar 16, 2026

Uh oh!

OSBotify commented Mar 16, 2026

Uh oh!

OSBotify commented Mar 17, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Conversation

VickyStash commented Mar 13, 2026 • edited by luacmartins 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 13, 2026

Uh oh!

codecov bot commented Mar 13, 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!

melvin-bot bot commented Mar 13, 2026

Uh oh!

trjExpensify left a comment

Choose a reason for hiding this comment

Uh oh!

Julesssss commented Mar 13, 2026

Reviewer Checklist

Screenshots/Videos

Uh oh!

Uh oh!

github-actions bot commented Mar 13, 2026

Uh oh!

OSBotify commented Mar 13, 2026

Uh oh!

github-actions bot commented Mar 13, 2026

Uh oh!

OSBotify commented Mar 13, 2026

Uh oh!

OSBotify commented Mar 16, 2026

Uh oh!

OSBotify commented Mar 16, 2026

Uh oh!

OSBotify commented Mar 17, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

VickyStash commented Mar 13, 2026 •

edited by luacmartins

Loading

codecov bot commented Mar 13, 2026 •

edited by github-actions bot

Loading