Fix can't open the workspace after closing the workspace not found (unaccessible) page #35980

bernhardoj · 2024-02-07T06:49:48Z

Details

We can't open the workspace because the bottom tab navigator state is the same workspace that we are trying to open, so it does nothing.

Fixed Issues

$ #35690
PROPOSAL: #35690 (comment)

Tests

Same as QA Steps

Verify that no errors appear in the JS console

Offline tests

Same as QA Steps

QA Steps

Open a workspace members page that you don't have access to
staging.new.expensify.com/workspace/{policyID}/members
policyID = workspace/policy ID that you are only a member, not admin
Verify you see a not found page
Press the back/Go back to home page button
Verify you are navigated to the workspace list
Find the workspace that you use in step 1 and press it to open
Verify you are navigated to the workspace overview

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Screen.Recording.2024-02-07.at.14.40.06.mov

Android: mWeb Chrome

Screen.Recording.2024-02-07.at.14.36.44.mov

iOS: Native

Screen.Recording.2024-02-07.at.14.35.05.mov

iOS: mWeb Safari

Screen.Recording.2024-02-07.at.14.29.44.mov

MacOS: Chrome / Safari

Screen.Recording.2024-02-07.at.14.28.20.mov

MacOS: Desktop

Screen.Recording.2024-02-07.at.14.33.47.1.mov

melvin-bot · 2024-02-07T06:49:53Z

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

shubham1206agra · 2024-02-08T12:37:55Z

@bernhardoj Please apply the same changes in WorkspaceInviteMessagePage, and WorkspaceInvitePage also.

bernhardoj · 2024-02-08T15:38:48Z

So, I added the fix to all workspace pages that navigate back to SETTINGS_WORKSPACES, but I left this one

App/src/pages/ReimbursementAccount/ReimbursementAccountPage.js

Lines 442 to 456 in 342da2e

    
           if (userHasPhonePrimaryEmail) { 
        
               errorText = translate('bankAccount.hasPhoneLoginError'); 
        
           } else if (throttledDate) { 
        
               errorText = translate('bankAccount.hasBeenThrottledError'); 
        
           } else if (hasUnsupportedCurrency) { 
        
               errorText = translate('bankAccount.hasCurrencyError'); 
        
           } 
        
           if (errorText) { 
        
               return ( 
        
                   <ScreenWrapper testID={ReimbursementAccountPage.displayName}> 
        
                       <HeaderWithBackButton 
        
                           title={translate('workspace.common.connectBankAccount')} 
        
                           subtitle={policyName} 
        
                           onBackButtonPress={() => Navigation.goBack(ROUTES.SETTINGS_WORKSPACES)}

because the bank account page is valid, but has an error, such as the currency is not USD. I think we should just go back without any fall back route, but I keep it as it is for now.

shubham1206agra · 2024-02-20T01:47:29Z

@bernhardoj Please check why test are failing.

bernhardoj · 2024-02-20T05:54:07Z

@shubham1206agra error gone

bernhardoj · 2024-02-20T05:54:27Z

Whoops, wrong pressed

shubham1206agra · 2024-02-22T05:37:15Z

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 approved by marketing by adding the Waiting for Copy label for a copy review on the original GH to get the correct copy.
- 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 form input styles:
- I verified that all the inputs inside a form are aligned with each other.
- I added Design label 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: mWeb Chrome

Screen.Recording.2024-02-22.at.10.56.53.AM.mov

iOS: Native

iOS: mWeb Safari

Screen.Recording.2024-02-22.at.10.52.43.AM.mov

MacOS: Chrome / Safari

Screen.Recording.2024-02-22.at.10.49.25.AM.mov

MacOS: Desktop

Screen.Recording.2024-02-22.at.11.05.06.AM.mov

blimpich

Nice job!

blimpich · 2024-02-22T17:07:39Z

Need to resolve some conflicts and then we can merge.

bernhardoj · 2024-02-23T03:11:19Z

@blimpich conflicts solved

OSBotify · 2024-02-23T17:50:16Z

✋ 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-02-26T21:06:11Z

🚀 Deployed to staging by https://github.com/blimpich in version: 1.4.44-0 🚀

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

OSBotify · 2024-02-28T23:54:47Z

🚀 Deployed to production by https://github.com/puneetlath in version: 1.4.44-13 🚀

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

update bottom tab when nvaigating to settings

4451052

bernhardoj requested a review from a team as a code owner February 7, 2024 06:49

melvin-bot bot requested review from shubham1206agra and removed request for a team February 7, 2024 06:49

bernhardoj added 3 commits February 7, 2024 15:04

rename

4ed993b

rename

a21821a

prettier

d002fa2

bernhardoj mentioned this pull request Feb 7, 2024

[$500] Workspace-Tapping "Home" does not trigger action & WSavatar changed into placeholder #36005

Closed

6 tasks

move the code to util and use it on other pages too

78a61fb

Merge branch 'main' into fix/35690-workspace-navigation

0efbb08

Merge branch 'main' into fix/35690-workspace-navigation

d5062c1

bernhardoj closed this Feb 20, 2024

bernhardoj reopened this Feb 20, 2024

shubham1206agra approved these changes Feb 22, 2024

View reviewed changes

melvin-bot bot requested a review from blimpich February 22, 2024 05:38

blimpich previously approved these changes Feb 22, 2024

View reviewed changes

Merge branch 'main' into fix/35690-workspace-navigation

9a2ea5b

bernhardoj dismissed blimpich’s stale review via 9a2ea5b February 23, 2024 03:06

move the util code to new file

bf3b8b8

blimpich approved these changes Feb 23, 2024

View reviewed changes

blimpich merged commit a2409f5 into Expensify:main Feb 23, 2024
14 checks passed

github-actions bot mentioned this pull request Feb 26, 2024

Deploy Checklist: New Expensify 2024-02-26 #37224

Closed

bfitzexpensify mentioned this pull request Mar 4, 2024

PAY on 06/03 - [$500] [Wave Collect] [Ideal Nav] Workspace - Workspace is not clickable after returning from error page #35690

Closed

6 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix can't open the workspace after closing the workspace not found (unaccessible) page #35980

Fix can't open the workspace after closing the workspace not found (unaccessible) page #35980

bernhardoj commented Feb 7, 2024

melvin-bot bot commented Feb 7, 2024

shubham1206agra commented Feb 8, 2024

bernhardoj commented Feb 8, 2024

shubham1206agra commented Feb 20, 2024

bernhardoj commented Feb 20, 2024

bernhardoj commented Feb 20, 2024

shubham1206agra commented Feb 22, 2024

blimpich left a comment

blimpich commented Feb 22, 2024

bernhardoj commented Feb 23, 2024

OSBotify commented Feb 23, 2024

OSBotify commented Feb 26, 2024

OSBotify commented Feb 28, 2024

Fix can't open the workspace after closing the workspace not found (unaccessible) page #35980

Fix can't open the workspace after closing the workspace not found (unaccessible) page #35980

Conversation

bernhardoj commented Feb 7, 2024

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Feb 7, 2024

shubham1206agra commented Feb 8, 2024

bernhardoj commented Feb 8, 2024

shubham1206agra commented Feb 20, 2024

bernhardoj commented Feb 20, 2024

bernhardoj commented Feb 20, 2024

shubham1206agra commented Feb 22, 2024

Reviewer Checklist

Screenshots/Videos

blimpich left a comment

Choose a reason for hiding this comment

blimpich commented Feb 22, 2024

bernhardoj commented Feb 23, 2024

OSBotify commented Feb 23, 2024

OSBotify commented Feb 26, 2024

OSBotify commented Feb 28, 2024