Fix useActiveWorkspaceFromNavigationState by adamgrzybowski · Pull Request #53576 · Expensify/App

adamgrzybowski · 2024-12-04T16:41:18Z

Explanation of Change

The useActiveWorkspaceFromNavigationState could return undefined even when the policyID was defined. It should work well now.

One of the effects of broken useActiveWorkspaceFromNavigationState was a problem with going back after series of specific navigation actions.

Fixed Issues

$ #53377
PROPOSAL:

Tests

Verify that no errors appear in the JS console

Offline tests

QA Steps

Launch ND or hybrid app.
Create a new workspace.
Go to workspace settings > More features.
Enable Report fields and upgrade to Control plan.
Close and reopen the app (important).
Open workspace switcher and select the upgraded Control workspace.
Go to #admins.
Tap "here" link in the whisper message.
Tap app back button three times.
Verify that the app will return to #admins.

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

android.mp4

Android: mWeb Chrome

androidWeb.mp4

iOS: Native

ios.mp4

iOS: mWeb Safari

iosWeb.mp4

MacOS: Chrome / Safari

web.mp4

MacOS: Desktop

melvin-bot · 2024-12-04T16:41:24Z

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

ZhenjaHorbach · 2024-12-04T16:44:45Z

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.

Screenshots/Videos

Android: Native

android.mov

Android: mWeb Chrome

android-web.mov

iOS: Native

ios.mov

iOS: mWeb Safari

ios-web.mov

MacOS: Chrome / Safari

web.mov

MacOS: Desktop

NA

ZhenjaHorbach · 2024-12-05T10:46:40Z

src/hooks/useActiveWorkspaceFromNavigationState.ts

        }

-        const params = state.routes.at(-1)?.params ?? {};
+        const lastHomeParams = state.routes.findLast((route) => route.name === SCREENS.HOME)?.params ?? {};


I'm wondering if this will break the deep links?
If we open the app ignoring home screen
Maybe we should update code like:
state.routes.findLast((route) => route.name === SCREENS.HOME)?.params ?? state.routes.at(-1)?.params ?? {};

Hi! That's a good question. Could you please be a little more specific about the case when it could break? I am not sure if I understand it correctly. Thanks! 🙇

I'm not sure this is a problem 😅
But let's say we open a screen which is not related to Home using a deep link when the app is closed
In theory, we shouldn't have params from Home screen in that case

So in that case I would use params from the last screen using state.routes.at(-1)

I think in that case we should get undefined right? The bottom tab settings screen doesn't have the workspace switcher anymore. And search has a different way of keeping policyID (inside the search query)

Hmm
Yeah
That makes sense
Thanks for the explanation !

ZhenjaHorbach · 2024-12-05T21:07:10Z

LGTM !

adamgrzybowski · 2024-12-06T14:43:33Z

bump @mountiny

mountiny

Thanks!

OSBotify · 2024-12-06T16:36:14Z

✋ 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-09T16:29:35Z

🚀 Deployed to staging by https://github.com/mountiny in version: 9.0.73-0 🚀

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

github-actions · 2024-12-10T22:47:49Z

🚀 Deployed to production by https://github.com/luacmartins in version: 9.0.73-8 🚀

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

fix useActiveWorkspaceFromNavigationState

466b285

adamgrzybowski requested a review from a team as a code owner December 4, 2024 16:41

melvin-bot bot requested review from ZhenjaHorbach and removed request for a team December 4, 2024 16:41

ZhenjaHorbach reviewed Dec 5, 2024

View reviewed changes

ZhenjaHorbach approved these changes Dec 5, 2024

View reviewed changes

melvin-bot bot requested a review from mountiny December 5, 2024 21:07

mountiny assigned adamgrzybowski Dec 6, 2024

mountiny approved these changes Dec 6, 2024

View reviewed changes

mountiny merged commit 96f7fdd into Expensify:main Dec 6, 2024

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

Deploy Checklist: New Expensify 2024-12-09 #53762

Closed

70 tasks

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

[HOLD for payment 2024-12-17] [$250] Android - Report auto closes when opening WS settings via deep link and returning to chat #53377

Closed

7 tasks

Conversation

adamgrzybowski commented Dec 4, 2024

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

melvin-bot bot commented Dec 4, 2024

Uh oh!

ZhenjaHorbach commented Dec 4, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

ZhenjaHorbach Dec 5, 2024

Choose a reason for hiding this comment

Uh oh!

adamgrzybowski Dec 5, 2024

Choose a reason for hiding this comment

Uh oh!

ZhenjaHorbach Dec 5, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

adamgrzybowski Dec 5, 2024

Choose a reason for hiding this comment

Uh oh!

ZhenjaHorbach Dec 5, 2024

Choose a reason for hiding this comment

Uh oh!

ZhenjaHorbach commented Dec 5, 2024

Uh oh!

adamgrzybowski commented Dec 6, 2024

Uh oh!

mountiny left a comment

Choose a reason for hiding this comment

Uh oh!

OSBotify commented Dec 6, 2024

Uh oh!

github-actions bot commented Dec 9, 2024

Uh oh!

github-actions bot commented Dec 10, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

ZhenjaHorbach commented Dec 4, 2024 •

edited

Loading

ZhenjaHorbach Dec 5, 2024 •

edited

Loading