fix: WS switcher blank screen, keep workspace history #54030

chrispader · 2024-12-12T12:43:06Z

Explanation of Change

Reverts 8e78f30 (#49937) applied in the Native Stack PR to fix the home screen from re-mounting.

My assumption was that we don't need to keep the navigation state of the WS switcher routes. We've recently discussed that we still want to keep the navigation state in #53533 (comment).

This PR fixes the issue with the blank HomeScreen by running dispatching the navigation action in InteractionManager.runAfterInteractions. This delays the navigation change until after the WS switcher has un-mounted, therefore we will see a fade animation to the new HomeScreen.

Fixed Issues

$ #53533
$ #53359
PROPOSAL: #53533 (comment)

Tests

Verify that no errors appear in the JS console

Blank HomeScreen fix

Open the app
Go to the WS switcher
Switch to/Filter by a workspace
Make sure that there is no blank screen when navigating back to the HomeScreen.

App closing when going back after switching workspace

Open the app
Go to the WS switcher
Switch to/Filter by a workspace
Use device back button/gesture
Make sure the app doesn't close but the app navigates to the previous workspace

Search page briefly goes blank when switching workspace

Open the app
Go to the search tab
Go to the WS switcher
Switch to/Filter by a workspace
Make sure that there is no blank screen when navigating back to the SearchScreen.

Offline tests

QA Steps

Same as in Tests.

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Blank HomeScreen fix

Screen.Recording.2024-12-15.at.21.42.00.mov

Search page briefly goes blank when switching workspace

Screen.Recording.2024-12-15.at.21.42.19.mov

Android: mWeb Chrome

Not affected, same as web.

iOS: Native

Blank HomeScreen fix

Simulator.Screen.Recording.-.iPhone.16.Pro.-.2024-12-15.at.21.31.09.mp4

Search page briefly goes blank when switching workspace

Screen.Recording.2024-12-15.at.21.48.38.mov

iOS: mWeb Safari

Not affected, same as web.

MacOS: Chrome / Safari

Blank HomeScreen fix

Screen.Recording.2024-12-15.at.21.46.15.mov

Screen.Recording.2024-12-15.at.21.46.53.mov

MacOS: Desktop

Not affected, same as web.

github-actions · 2024-12-12T15:23:31Z

🚧 @mountiny has triggered a test build. You can view the workflow run here.

github-actions · 2024-12-12T15:48:02Z

🧪🧪 Use the links below to test this adhoc build on Android, iOS, Desktop, and Web. Happy testing! 🧪🧪

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.amazonaws.com/android/54030/index.html	❌ FAILED ❌
	The QR code can't be generated, because the iOS build failed
Desktop 💻	Web 🕸️
https://ad-hoc-expensify-cash.s3.amazonaws.com/desktop/54030/NewExpensify.dmg	https://54030.pr-testing.expensify.com

👀 View the workflow run that generated this build 👀

melvin-bot · 2024-12-13T09:18:04Z

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

chrispader · 2024-12-13T13:02:02Z

While working on this i've found another issue on iOS. It seems that animation: "none" always ends up being displayed as a fade animation, idk why yet. In a clean repro project it works just fine, so this has to have something do to with either the PlatformStackNavigation code or something in Expensify app.

chrispader · 2024-12-15T20:23:31Z

While working on this i've found another issue on iOS. It seems that animation: "none" always ends up being displayed as a fade animation, idk why yet. In a clean repro project it works just fine, so this has to have something do to with either the PlatformStackNavigation code or something in Expensify app.

This is being fixed in #53754. To prevent the fade animation on iOS already, i included a change to a RNS patch from the other PR

chrispader · 2024-12-15T20:56:33Z

@fedirjh @mountiny ready for review!

fedirjh · 2024-12-17T08:27:23Z

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 tests pass on all platforms & I tested again on:
- Android: Native
- Android: mWeb Chrome
- iOS: Native
- iOS: mWeb Safari
- MacOS: Chrome / Safari
- MacOS: Desktop
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.

fedirjh · 2024-12-17T08:27:28Z

Screenshots/Videos

Android: Native

CleanShot.2024-12-17.at.10.03.32.mp4

Android: mWeb Chrome

CleanShot.2024-12-17.at.10.07.06.mp4

iOS: Native

CleanShot.2024-12-17.at.09.30.08.mp4

CleanShot.2024-12-17.at.09.41.56.mp4

iOS: mWeb Safari

CleanShot.2024-12-17.at.09.46.42.mp4

CleanShot.2024-12-17.at.09.47.31.mp4

CleanShot.2024-12-17.at.09.52.58.mp4

MacOS: Chrome / Safari

CleanShot.2024-12-17.at.10.08.48.mp4

MacOS: Desktop

CleanShot.2024-12-17.at.10.11.56.mp4

mountiny

Small request

src/pages/WorkspaceSwitcherPage/index.tsx

mountiny

@chrispader thanks! I think we can skip fixing the default ids on this PR

mountiny · 2024-12-19T00:20:49Z

@mjasikowski feel free to merge

mjasikowski · 2024-12-19T09:36:40Z

@chrispader please fix the remaining conflicts and I will merge ASAP

chrispader · 2024-12-19T10:47:10Z

@chrispader please fix the remaining conflicts and I will merge ASAP

@mjasikowski merge conflicts resolved!

@chrispader thanks! I think we can skip fixing the default ids on this PR

i fixed those issues too

mjasikowski · 2024-12-19T11:04:49Z

Thanks @chrispader, approving and merging

OSBotify · 2024-12-19T11:13:48Z

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

github-actions · 2024-12-23T20:58:07Z

🚀 Deployed to staging by https://github.com/mjasikowski in version: 9.0.78-0 🚀

platform	result
🤖 android 🤖	cancelled 🔪
🖥 desktop 🖥	cancelled 🔪
🍎 iOS 🍎	cancelled 🔪
🕸 web 🕸	success ✅
🤖🔄 android HybridApp 🤖🔄	cancelled 🔪
🍎🔄 iOS HybridApp 🍎🔄	cancelled 🔪

github-actions · 2024-12-23T21:42:03Z

🚀 Deployed to staging by https://github.com/mjasikowski in version: 9.0.78-0 🚀

platform	result
🤖 android 🤖	success ✅
🖥 desktop 🖥	success ✅
🍎 iOS 🍎	success ✅
🕸 web 🕸	success ✅
🤖🔄 android HybridApp 🤖🔄	failure ❌
🍎🔄 iOS HybridApp 🍎🔄	success ✅

github-actions · 2024-12-23T21:49:33Z

🚀 Deployed to staging by https://github.com/mjasikowski in version: 9.0.78-0 🚀

platform	result
🤖 android 🤖	success ✅
🖥 desktop 🖥	success ✅
🍎 iOS 🍎	success ✅
🕸 web 🕸	success ✅
🤖🔄 android HybridApp 🤖🔄	failure ❌
🍎🔄 iOS HybridApp 🍎🔄	success ✅

github-actions · 2024-12-24T00:05:18Z

🚀 Deployed to staging by https://github.com/mjasikowski in version: 9.0.78-0 🚀

platform	result
🤖 android 🤖	success ✅
🖥 desktop 🖥	success ✅
🍎 iOS 🍎	success ✅
🕸 web 🕸	success ✅
🤖🔄 android HybridApp 🤖🔄	failure ❌
🍎🔄 iOS HybridApp 🍎🔄	success ✅

github-actions · 2024-12-24T00:52:57Z

🚀 Deployed to staging by https://github.com/mjasikowski in version: 9.0.78-0 🚀

platform	result
🤖 android 🤖	success ✅
🖥 desktop 🖥	success ✅
🍎 iOS 🍎	success ✅
🕸 web 🕸	success ✅
🤖🔄 android HybridApp 🤖🔄	success ✅
🍎🔄 iOS HybridApp 🍎🔄	success ✅

IuliiaHerets · 2024-12-24T12:54:54Z

This PR is failing for mWeb/Safari because of issue #54527

github-actions · 2024-12-24T19:43:04Z

🚀 Deployed to staging by https://github.com/mjasikowski in version: 9.0.78-0 🚀

platform	result
🤖 android 🤖	success ✅
🖥 desktop 🖥	success ✅
🍎 iOS 🍎	success ✅
🕸 web 🕸	success ✅
🤖🔄 android HybridApp 🤖🔄	success ✅
🍎🔄 iOS HybridApp 🍎🔄	success ✅

github-actions · 2024-12-24T20:00:00Z

🚀 Deployed to staging by https://github.com/mjasikowski in version: 9.0.78-0 🚀

platform	result
🤖 android 🤖	failure ❌
🖥 desktop 🖥	success ✅
🍎 iOS 🍎	success ✅
🕸 web 🕸	success ✅
🤖🔄 android HybridApp 🤖🔄	success ✅
🍎🔄 iOS HybridApp 🍎🔄	success ✅

github-actions · 2024-12-26T20:27:15Z

🚀 Deployed to production by https://github.com/jasperhuangg in version: 9.0.78-6 🚀

platform	result
🤖 android 🤖	true ❌
🖥 desktop 🖥	success ✅
🍎 iOS 🍎	success ✅
🕸 web 🕸	success ✅
🤖🔄 android HybridApp 🤖🔄	failure ❌
🍎🔄 iOS HybridApp 🍎🔄	success ✅

chrispader added 2 commits December 12, 2024 12:49

revert: ws switcher home route setParams changes

6b4078c

fix: blank screen when navigating back from WS Switcher

a64553e

chrispader mentioned this pull request Dec 12, 2024

[HOLD for payment 2025-01-02] [$250] Hybrid - Android - WS Switcher - App is closed when switching workspace and using device back button. #53533

Open

8 tasks

mountiny assigned chrispader Dec 12, 2024

mountiny added the Ready To Build label Dec 12, 2024

Merge branch 'main' into @chrispader/fix-ws-switcher-back-gesture-route

99f817d

chrispader marked this pull request as ready for review December 13, 2024 09:17

chrispader requested a review from a team as a code owner December 13, 2024 09:17

melvin-bot bot requested a review from fedirjh December 13, 2024 09:18

melvin-bot bot removed the request for review from a team December 13, 2024 09:18

chrispader added 2 commits December 13, 2024 10:33

fix: only run InteractionManager on iOS

30f55fe

fix: ios 'none' screen animation not working

abed839

fix: ios fade animation

3aa698d

chrispader added 7 commits December 15, 2024 21:25

remove fade_from_bottom animation

6e3b566

rename file

9665162

docs: add comment

4ddab5d

fix: also apply change on Android

70a19d6

fix: use getPlatform

05a5512

refactor: replace none animation hardcoded strings

0eda66d

update comment

6c7218f

kirillzyusko mentioned this pull request Dec 16, 2024

[NoQA] fix: bottom tab transitions duration #53754

Merged

48 tasks

fedirjh approved these changes Dec 17, 2024

View reviewed changes

mjasikowski previously approved these changes Dec 17, 2024

View reviewed changes

mountiny requested changes Dec 17, 2024

View reviewed changes

src/pages/WorkspaceSwitcherPage/index.tsx Outdated Show resolved Hide resolved

fix: move to platform specific code

8f7ef9f

chrispader dismissed mjasikowski’s stale review via 8f7ef9f December 18, 2024 14:32

chrispader requested a review from mountiny December 18, 2024 18:22

mountiny previously approved these changes Dec 19, 2024

View reviewed changes

chrispader added 2 commits December 19, 2024 11:45

fix: default-value-for-inexistent-IDs issues

55b7ab4

Merge branch 'main' into @chrispader/fix-ws-switcher-back-gesture-route

805d4bf

chrispader dismissed mountiny’s stale review via 805d4bf December 19, 2024 10:46

mjasikowski approved these changes Dec 19, 2024

View reviewed changes

mjasikowski merged commit 49e623e into Expensify:main Dec 19, 2024
17 checks passed

github-actions bot mentioned this pull request Dec 23, 2024

Deploy Checklist: New Expensify 2024-12-23 #54476

Closed

IuliiaHerets mentioned this pull request Dec 24, 2024

mWeb/Safari - WS Switcher - The back button does not respond when switching between workspaces #54527

Open

8 tasks

parasharrajat mentioned this pull request Dec 24, 2024

Web - LHN - Workspace switcher resets to Expensify when sending invoice for the first time #54509

Open

8 tasks

bernhardoj mentioned this pull request Dec 26, 2024

Android - Previously selected workspace is shown briefly while navigating via workspace switcher #54554

Open

8 tasks

melvin-bot bot mentioned this pull request Dec 26, 2024

[HOLD for payment 2025-01-02] [$250] iOS - Search - Search page briefly goes blank when switching workspace filter #53359

Open

8 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: WS switcher blank screen, keep workspace history #54030

fix: WS switcher blank screen, keep workspace history #54030

chrispader commented Dec 12, 2024 •

edited

Loading

github-actions bot commented Dec 12, 2024

github-actions bot commented Dec 12, 2024

melvin-bot bot commented Dec 13, 2024

chrispader commented Dec 13, 2024

chrispader commented Dec 15, 2024

chrispader commented Dec 15, 2024

fedirjh commented Dec 17, 2024 •

edited

Loading

fedirjh commented Dec 17, 2024 •

edited

Loading

mountiny left a comment

mountiny left a comment

mountiny commented Dec 19, 2024

mjasikowski commented Dec 19, 2024

chrispader commented Dec 19, 2024

mjasikowski commented Dec 19, 2024

OSBotify commented Dec 19, 2024

github-actions bot commented Dec 23, 2024

github-actions bot commented Dec 23, 2024

github-actions bot commented Dec 23, 2024

github-actions bot commented Dec 24, 2024

github-actions bot commented Dec 24, 2024

IuliiaHerets commented Dec 24, 2024

github-actions bot commented Dec 24, 2024

github-actions bot commented Dec 24, 2024

github-actions bot commented Dec 26, 2024

fix: WS switcher blank screen, keep workspace history #54030

fix: WS switcher blank screen, keep workspace history #54030

Conversation

chrispader commented Dec 12, 2024 • edited Loading

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

github-actions bot commented Dec 12, 2024

github-actions bot commented Dec 12, 2024

melvin-bot bot commented Dec 13, 2024

chrispader commented Dec 13, 2024

chrispader commented Dec 15, 2024

chrispader commented Dec 15, 2024

fedirjh commented Dec 17, 2024 • edited Loading

Reviewer Checklist

fedirjh commented Dec 17, 2024 • edited Loading

Screenshots/Videos

mountiny left a comment

Choose a reason for hiding this comment

mountiny left a comment

Choose a reason for hiding this comment

mountiny commented Dec 19, 2024

mjasikowski commented Dec 19, 2024

chrispader commented Dec 19, 2024

mjasikowski commented Dec 19, 2024

OSBotify commented Dec 19, 2024

github-actions bot commented Dec 23, 2024

github-actions bot commented Dec 23, 2024

github-actions bot commented Dec 23, 2024

github-actions bot commented Dec 24, 2024

github-actions bot commented Dec 24, 2024

IuliiaHerets commented Dec 24, 2024

github-actions bot commented Dec 24, 2024

github-actions bot commented Dec 24, 2024

github-actions bot commented Dec 26, 2024

chrispader commented Dec 12, 2024 •

edited

Loading

fedirjh commented Dec 17, 2024 •

edited

Loading

fedirjh commented Dec 17, 2024 •

edited

Loading