Fix chat navigation #42684

abzokhattab · 2024-05-28T09:40:38Z

Details

Fixed Issues

$ #42153
PROPOSAL: #42153 (comment)

Tests

Verify that no errors appear in the JS console

Click on the chats tab
Switch to a different workspace
Click the avatar in the bottom tab bar
Refresh the page
Click the chats tab in the bottom tab
Ensure that the workspace switch is on the same workspace as selected in point 2

Offline tests

Same as in Tests

QA Steps

Same as in Tests

PR Author Checklist

I linked the correct issue in the ### Fixed Issues section above
I wrote clear testing steps that cover the changes made in this PR
- I added steps for local testing in the Tests section
- I added steps for the expected offline behavior in the Offline steps section
- I added steps for Staging and/or Production testing in the QA steps section
- I added steps to cover 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 tested this PR with a High Traffic account against the staging or production API to ensure there are no regressions (e.g. long loading states that impact usability).
I included screenshots or videos for tests on all platforms
I ran the tests on all platforms & verified they passed on:
- Android: Native
- Android: mWeb Chrome
- iOS: Native
- iOS: mWeb Safari
- MacOS: Chrome / Safari
- MacOS: Desktop
I verified there are no console errors (if there's a console error not related to the PR, report it or open an issue for it to be fixed)
I followed proper code patterns (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
  - If any non-english text was added/modified, I verified the translation was requested/reviewed in #expensify-open-source and it was approved by an internal Expensify engineer. Link to Slack message:
- 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 followed the guidelines as stated in the Review Guidelines
I tested other components that can be impacted by my changes (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar are working as expected)
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
I verified that if a function's arguments changed that all usages have also been updated correctly
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.

Screenshots/Videos

Android: Native

Screen.Recording.2024-06-04.at.3.40.10.PM.mov

Android: mWeb Chrome

Screen.Recording.2024-06-04.at.3.42.25.PM.mov

iOS: Native

Screen.Recording.2024-06-04.at.2.59.46.PM.mov

iOS: mWeb Safari

Screen.Recording.2024-06-04.at.3.49.02.PM.mov

MacOS: Chrome / Safari

Screen.Recording.2024-05-21.at.12.31.14.PM.mov

MacOS: Desktop

Screen.Recording.2024-06-04.at.3.41.39.PM.mov

melvin-bot · 2024-05-28T09:40:43Z

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

abzokhattab · 2024-05-28T09:42:36Z

Hi @c3024 there seems to be a problem with mobile platforms when using the sessionStorage

it seems that the sessionStorage is only defined on web

here is the log of the ios:

any ideas how to proceed?

cc @WojtekBoman

abzokhattab · 2024-05-28T13:56:07Z

Should we use the ONYXKEYS.SESSION object instead ?

c3024 · 2024-05-28T16:47:30Z

This bug happens only when we refresh, right? So, is it applicable for native apps?

abzokhattab · 2024-05-29T12:49:33Z

This bug happens only when we refresh, right? So, is it applicable for native apps?

just made a test .. yes its not applicable for native apps.

now should i create two new components specifically for the web in both the ActiveWorkspaceProvider and the BottomTab ? or is there an alternative way ?

c3024 · 2024-05-30T10:13:42Z

I think that is what we should do. Platform specific code within a single file is against guidelines.

c3024 · 2024-06-01T14:22:50Z

Bump on this @abzokhattab

c3024 · 2024-06-04T12:30:03Z

how is this going? @abzokhattab

abzokhattab · 2024-06-04T13:55:17Z

Sorry @c3024 for the delay .. i had some problems running the project on ios ..

The PR is ready.

Please let me know if you have any comments.

c3024 · 2024-06-05T07:12:37Z

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

42684-android.mp4

Android: mWeb Chrome

42684-androidmWeb.mp4

iOS: Native

42684-iOS.mp4

iOS: mWeb Safari

42684-iOSmWeb.mp4

MacOS: Chrome / Safari

42684-webChrome.mp4

MacOS: Desktop

42684-desktop.mp4

c3024

LGTM!

c3024 · 2024-06-07T08:23:25Z

@abzokhattab Can you please fix the conflicts?

NikkiWines

Sorry for the delay!

NikkiWines · 2024-06-07T22:30:04Z

(Ooh, althought you've got conflicts now @abzokhattab, sorry!)

abzokhattab · 2024-06-10T09:35:29Z

just merged into main again @NikkiWines

NikkiWines

Looks good - though I noticed that the order of the workspaces differs each time as we're moving the currently selected workspace to the top of the list. I'm not sure if that's our expected behavior but it's not really a bug at this time so let's

NikkiWines · 2024-06-10T18:24:24Z

sike, conflicts again

abzokhattab · 2024-06-10T18:51:02Z

ops ... just merged again @NikkiWines

NikkiWines

OSBotify · 2024-06-10T19:19:26Z

✋ 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-06-11T22:28:11Z

🚀 Deployed to staging by https://github.com/NikkiWines in version: 1.4.82-0 🚀

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

OSBotify · 2024-06-13T15:30:47Z

🚀 Deployed to production by https://github.com/mountiny in version: 1.4.82-4 🚀

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

kosmydel · 2024-06-18T09:50:38Z

Hey, I noticed that we split the BottomTabBar into two files: .tsx and .website.tsx, with only two lines of difference between them. Could you explain the reason behind this decision, as it seems to make the codebase less maintainable?

If we've already split the ActiveWorkspaceProvider component, perhaps we should consider adding these changes to that component instead of splitting another one.

cc @abzokhattab, @c3024, @NikkiWines

alitoshmatov · 2024-07-17T15:59:25Z

src/libs/Navigation/AppNavigator/createCustomBottomTabNavigator/BottomTabBar/index.tsx

+    const navigateToChats = useCallback(() => {
+        const route = activeWorkspaceID ? (`/w/${activeWorkspaceID}/home` as Route) : ROUTES.HOME;
+        Navigation.navigate(route);
+    }, [activeWorkspaceID]);


Might be related, when user is already in home and presses the home tab page blinks #43585

abzokhattab added 3 commits May 21, 2024 12:32

Fixing the chat icon navigation

ce10020

Merge remote-tracking branch 'origin/main' into fix-chat-navigation

809dcda

Use session storage to save the current active workspace

1a6199d

abzokhattab requested a review from a team as a code owner May 28, 2024 09:40

melvin-bot bot removed the request for review from a team May 28, 2024 09:40

melvin-bot bot requested a review from c3024 May 28, 2024 09:40

abzokhattab marked this pull request as draft May 28, 2024 09:40

abzokhattab mentioned this pull request May 28, 2024

[HOLD for payment 2024-06-20] [$250] Workspace switcher resets to All (Expensify) after page refresh #42153

Closed

6 tasks

abzokhattab added 3 commits June 3, 2024 08:53

Merge remote-tracking branch 'origin/main' into fix-chat-navigation

c83f7ce

fix sessionStorage not found for mobile

0d68d3d

Fix sessionStorage not found error for native devices

6b063e8

abzokhattab added 2 commits June 4, 2024 15:19

navigate to home in native devices

9b431fa

refactoring

7f647fb

abzokhattab marked this pull request as ready for review June 4, 2024 13:54

Merge remote-tracking branch 'origin/main' into fix-chat-navigation

ac03bdb

c3024 approved these changes Jun 5, 2024

View reviewed changes

melvin-bot bot requested a review from NikkiWines June 5, 2024 07:33

NikkiWines previously approved these changes Jun 7, 2024

View reviewed changes

Merge remote-tracking branch 'origin/main' into fix-chat-navigation

4e64093

abzokhattab dismissed NikkiWines’s stale review via 4e64093 June 10, 2024 09:34

abzokhattab added 3 commits June 10, 2024 11:40

merging into main

d948537

minor change

40d9c24

eslint fix

57d77e3

abzokhattab requested a review from NikkiWines June 10, 2024 09:59

NikkiWines previously approved these changes Jun 10, 2024

View reviewed changes

abzokhattab added 2 commits June 10, 2024 20:48

Merge remote-tracking branch 'origin/main' into fix-chat-navigation

f6deb18

merge to main

191f197

abzokhattab dismissed NikkiWines’s stale review via 191f197 June 10, 2024 18:50

NikkiWines approved these changes Jun 10, 2024

View reviewed changes

NikkiWines merged commit 2929a91 into Expensify:main Jun 10, 2024
16 checks passed

github-actions bot mentioned this pull request Jun 11, 2024

Deploy Checklist: New Expensify 2024-06-11 #43515

Closed

59 tasks

c3024 referenced this pull request in abzokhattab/App Jun 21, 2024

Add context for storing active workspacegp

7c7f8fa

alitoshmatov reviewed Jul 17, 2024

View reviewed changes

alitoshmatov mentioned this pull request Jul 17, 2024

[HOLD for payment 2024-07-17] [$250] Inbox - The entire page blinks when clicking Inbox on Inbox page #43585

Closed

6 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix chat navigation #42684

Fix chat navigation #42684

abzokhattab commented May 28, 2024 •

edited

Loading

melvin-bot bot commented May 28, 2024

abzokhattab commented May 28, 2024 •

edited

Loading

abzokhattab commented May 28, 2024

c3024 commented May 28, 2024

abzokhattab commented May 29, 2024

c3024 commented May 30, 2024

c3024 commented Jun 1, 2024

c3024 commented Jun 4, 2024

abzokhattab commented Jun 4, 2024 •

edited

Loading

c3024 commented Jun 5, 2024 •

edited

Loading

c3024 left a comment

c3024 commented Jun 7, 2024

NikkiWines left a comment

NikkiWines commented Jun 7, 2024

abzokhattab commented Jun 10, 2024

NikkiWines left a comment

NikkiWines commented Jun 10, 2024

abzokhattab commented Jun 10, 2024

NikkiWines left a comment

OSBotify commented Jun 10, 2024

OSBotify commented Jun 11, 2024

OSBotify commented Jun 13, 2024

kosmydel commented Jun 18, 2024

alitoshmatov Jul 17, 2024

Fix chat navigation #42684

Fix chat navigation #42684

Conversation

abzokhattab commented May 28, 2024 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented May 28, 2024

abzokhattab commented May 28, 2024 • edited Loading

abzokhattab commented May 28, 2024

c3024 commented May 28, 2024

abzokhattab commented May 29, 2024

c3024 commented May 30, 2024

c3024 commented Jun 1, 2024

c3024 commented Jun 4, 2024

abzokhattab commented Jun 4, 2024 • edited Loading

c3024 commented Jun 5, 2024 • edited Loading

Reviewer Checklist

Screenshots/Videos

c3024 left a comment

Choose a reason for hiding this comment

c3024 commented Jun 7, 2024

NikkiWines left a comment

Choose a reason for hiding this comment

NikkiWines commented Jun 7, 2024

abzokhattab commented Jun 10, 2024

NikkiWines left a comment

Choose a reason for hiding this comment

NikkiWines commented Jun 10, 2024

abzokhattab commented Jun 10, 2024

NikkiWines left a comment

Choose a reason for hiding this comment

OSBotify commented Jun 10, 2024

OSBotify commented Jun 11, 2024

OSBotify commented Jun 13, 2024

kosmydel commented Jun 18, 2024

alitoshmatov Jul 17, 2024

Choose a reason for hiding this comment

abzokhattab commented May 28, 2024 •

edited

Loading

abzokhattab commented May 28, 2024 •

edited

Loading

abzokhattab commented Jun 4, 2024 •

edited

Loading

c3024 commented Jun 5, 2024 •

edited

Loading