Fix: WS switcher and LHN are not reset to Expensify after leaving #45285

truph01 · 2024-07-11T14:23:41Z

Details

Fixed Issues

$ #43981
PROPOSAL: #43981 (comment)

Tests

Precondition:

User is invited to a workspace.

Go to staging.new.expensify.com
Open workspace switcher.
Select the invited workspace.
Go to Account settings > Workspaces.
Click 3-dot menu on the invited workspace > Leave.
Return to LHN.
Verify workspace switcher will switch to Expensify.
LHN will show all the chats because Expensify is selected.

Verify that no errors appear in the JS console

Offline tests

QA Steps

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Screen.Recording.2024-07-11.at.22.52.34.mov

Android: mWeb Chrome

Screen.Recording.2024-07-11.at.23.11.28.mov

iOS: Native

Screen.Recording.2024-07-11.at.23.03.51.mov

iOS: mWeb Safari

Screen.Recording.2024-07-11.at.22.56.08.mov

MacOS: Chrome / Safari

Screen.Recording.2024-07-11.at.22.39.18.mov

MacOS: Desktop

Screen.Recording.2024-07-11.at.22.41.42.mov

melvin-bot · 2024-07-11T16:13:35Z

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

s77rt · 2024-07-11T17:02:04Z

src/libs/Navigation/AppNavigator/Navigators/BottomTabNavigator.tsx

@@ -20,6 +26,19 @@ const screenOptions: StackNavigationOptions = {

 function BottomTabNavigator() {
    const activeRoute = useNavigationState<RootStackParamList, NavigationPartialRoute<CentralPaneName> | undefined>(getTopmostCentralPaneRoute);
+    const [policies] = useOnyx(ONYXKEYS.COLLECTION.POLICY);


Subscribe only to the active workspace

I updated PR

s77rt · 2024-07-16T12:08:33Z

src/libs/Navigation/AppNavigator/Navigators/BottomTabNavigator.tsx

Wasn't this changed supposed to be on the SidebarScreen?

Currently, the SidebarScreen is always mounted again once we leave the workspace then return to LHN. Because it is mounted again, so the logic:

!selectedPolicy && !prevSelectedPolicy

that used in my solution is always false because both of them are undefined when we leave the workspace then return to LHN.

Move the logic back to the Sidebar and in the useEffect only check for the current selected policy

@s77rt As I said above, we cannot move the logic to Sidebar. Can you help check again?

Can you explain why we can't go with the suggested solution above?

I explained above

both of them are undefined

You should check only the current selected policy

Ah you mean we should !selectedPolicy instead of !selectedPolicy && !prevSelectedPolicy, right?

s77rt · 2024-07-19T14:31:14Z

src/libs/Navigation/AppNavigator/Navigators/BottomTabNavigator.tsx

Move the logic back to the Sidebar and in the useEffect only check for the current selected policy

truph01 · 2024-07-22T15:10:04Z

Working on it now

truph01 · 2024-07-24T16:14:28Z

@s77rt I updated PR

s77rt · 2024-07-24T21:07:22Z

src/pages/home/sidebar/SidebarScreen/BaseSidebarScreen.tsx


    useEffect(() => {
        Performance.markStart(CONST.TIMING.SIDEBAR_LOADED);
        Timing.start(CONST.TIMING.SIDEBAR_LOADED, true);
    }, []);

+    const [selectedPolicy] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${activeWorkspaceID ?? -1}`);


Suggested change

const [selectedPolicy] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${activeWorkspaceID ?? -1}`);

const [activeWorkspace] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${activeWorkspaceID ?? -1}`);

NAB. Naming consistency

src/pages/home/sidebar/SidebarScreen/BaseSidebarScreen.tsx

truph01 · 2024-07-25T15:41:12Z

I updated PR

src/pages/home/sidebar/SidebarScreen/BaseSidebarScreen.tsx

s77rt · 2024-07-30T16:44:12Z

@truph01 In testing step 7 can you please add "Verify" before the sentence for clarity

s77rt · 2024-07-30T16:47:56Z

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 the left part of a conditional rendering a React component is a boolean and NOT a string, e.g. myBool && <MyComponent />.
- 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.js 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.
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

mweb-chrome.mov

iOS: Native

ios.mov

iOS: mWeb Safari

mweb-safari.mov

MacOS: Chrome / Safari

web.mov

MacOS: Desktop

desktop.mov

truph01 · 2024-07-30T16:52:27Z

@s77rt I addressed all your comments.

s77rt

Thank you!

OSBotify · 2024-07-31T11:41:35Z

✋ 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 · 2024-07-31T19:30:39Z

🚀 Deployed to staging by https://github.com/cristipaval in version: 9.0.15-0 🚀

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

OSBotify · 2024-08-02T02:18:34Z

🚀 Deployed to production by https://github.com/roryabraham in version: 9.0.15-9 🚀

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

truph01 added 2 commits July 11, 2024 21:20

Fix: WS switcher and LHN are not reset to Expensify after leaving

bc0168d

Fix: Move effect to BottomTabNavigator

f306ab2

truph01 marked this pull request as ready for review July 11, 2024 16:13

truph01 requested a review from a team as a code owner July 11, 2024 16:13

melvin-bot bot removed the request for review from a team July 11, 2024 16:13

melvin-bot bot requested a review from s77rt July 11, 2024 16:13

s77rt suggested changes Jul 11, 2024

View reviewed changes

Fix: Only subscribe active workspace ID

d554f68

s77rt suggested changes Jul 16, 2024

View reviewed changes

merge main

f490e28

s77rt suggested changes Jul 19, 2024

View reviewed changes

truph01 added 3 commits July 23, 2024 17:58

Fix: Resolve conflict

2778283

merge main

ddd1819

Fix: Move useEffect to BaseSidebarScreen

6c2550f

truph01 added 3 commits July 24, 2024 23:22

Fix: Lint

6885046

Fix: Lint

9253a2c

Fix: Lint

92bb5aa

s77rt suggested changes Jul 24, 2024

View reviewed changes

rename variable

08f2deb

truph01 added 2 commits July 30, 2024 17:21

Feat: Merge latest main

6e76a9d

Feat: Remove didResetActiveWorkspaceIDRef

baaca67

s77rt suggested changes Jul 30, 2024

View reviewed changes

src/pages/home/sidebar/SidebarScreen/BaseSidebarScreen.tsx Outdated Show resolved Hide resolved

Feat: Move useOnyx before useEffect

e1c650d

s77rt approved these changes Jul 30, 2024

View reviewed changes

melvin-bot bot requested a review from cristipaval July 30, 2024 17:07

cristipaval approved these changes Jul 31, 2024

View reviewed changes

cristipaval merged commit 4d62be9 into Expensify:main Jul 31, 2024
15 of 16 checks passed

github-actions bot mentioned this pull request Jul 31, 2024

Deploy Checklist: New Expensify 2024-07-31 #46607

Closed

melvin-bot bot mentioned this pull request Aug 2, 2024

[HOLD for payment 2024-08-09] [$250] Workspace switcher - WS switcher and LHN are not reset to Expensify after leaving workspace #43981

Closed

6 tasks

Nodebrute mentioned this pull request Nov 5, 2024

[Hold for #49539][$250] Android - Workspace - User is redirected to previous page when deleting current workspace #51986

Open

8 tasks

bernhardoj mentioned this pull request Dec 11, 2024

Android - Inbox - WS filters are not reseted to "All Chats" when deleting actual workspace. #53879

Open

8 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix: WS switcher and LHN are not reset to Expensify after leaving #45285

Fix: WS switcher and LHN are not reset to Expensify after leaving #45285

truph01 commented Jul 11, 2024 •

edited

Loading

melvin-bot bot commented Jul 11, 2024

s77rt Jul 11, 2024

truph01 Jul 16, 2024

s77rt Jul 16, 2024

truph01 Jul 18, 2024

s77rt Jul 19, 2024

truph01 Jul 23, 2024

s77rt Jul 23, 2024

truph01 Jul 23, 2024

s77rt Jul 23, 2024

truph01 Jul 23, 2024

s77rt Jul 23, 2024

s77rt Jul 19, 2024

truph01 commented Jul 22, 2024

truph01 commented Jul 24, 2024

s77rt Jul 24, 2024

truph01 commented Jul 25, 2024

s77rt commented Jul 30, 2024

s77rt commented Jul 30, 2024 •

edited

Loading

truph01 commented Jul 30, 2024

s77rt left a comment

OSBotify commented Jul 31, 2024

OSBotify commented Jul 31, 2024

OSBotify commented Aug 2, 2024

	const [selectedPolicy] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${activeWorkspaceID ?? -1}`);
	const [activeWorkspace] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${activeWorkspaceID ?? -1}`);

Fix: WS switcher and LHN are not reset to Expensify after leaving #45285

Fix: WS switcher and LHN are not reset to Expensify after leaving #45285

Conversation

truph01 commented Jul 11, 2024 • edited Loading

Details

Fixed Issues

Tests

Precondition:

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Jul 11, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

truph01 commented Jul 22, 2024

truph01 commented Jul 24, 2024

Choose a reason for hiding this comment

truph01 commented Jul 25, 2024

s77rt commented Jul 30, 2024

s77rt commented Jul 30, 2024 • edited Loading

Reviewer Checklist

Screenshots/Videos

truph01 commented Jul 30, 2024

s77rt left a comment

Choose a reason for hiding this comment

OSBotify commented Jul 31, 2024

OSBotify commented Jul 31, 2024

OSBotify commented Aug 2, 2024

truph01 commented Jul 11, 2024 •

edited

Loading

s77rt commented Jul 30, 2024 •

edited

Loading