Fix composer won't focus after visiting concierge from get assistance page by bernhardoj · Pull Request #40708 · Expensify/App

bernhardoj · 2024-04-22T16:09:22Z

Details

If we open concierge chat from the any RHP page, the composer auto focus won't work anymore because the modal.isVisible is still true because we don't close the RHP. This PR fix it by dismiss the modal before navigating to concierge.

Fixed Issues

$ #21401
PROPOSAL: #21401 (comment)

Tests

Same as QA Steps

Verify that no errors appear in the JS console

Offline tests

Same as QA Steps

QA Steps

Go to settings > workspaces > select your own workspace > members
Press the invite member
Press the "?" icon button to open the get assistance page
Press Chat with Concierge option
Verify you are navigated to the concierge chat
Verify the composer is focused (only on web/desktop)
Go to another chat
Verify the composer is focused

NOTE:
For small screen, the composer will be focused only if the chat is really empty, that is when you open the chat a full screen skeleton loader is shown

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Screen.Recording.2024-04-22.at.23.48.11.mov

Android: mWeb Chrome

Screen.Recording.2024-04-22.at.23.43.45.mov

iOS: Native

Screen.Recording.2024-04-22.at.23.49.25.mov

iOS: mWeb Safari

Screen.Recording.2024-04-22.at.23.42.24.mov

MacOS: Chrome / Safari

Screen.Recording.2024-04-22.at.23.39.24.mov

MacOS: Desktop

desktop.mov

melvin-bot · 2024-04-22T16:09:28Z

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

bernhardoj · 2024-04-22T16:16:12Z

Additional video of other page fixes:

Screen.Recording.2024-04-22.at.23.56.34.mov

Here is how I find which page has the same issue:
I search for navigateToConciergeChat usage and see whether the page/component is being used in an RHP page. If it's, then we need to pass true to navigateToConciergeChat to dismiss the RHP modal.

GetAssistancePage
~~ManageTeamsExpensesPage (manually access to /onboard/manage-expenses)~~ removed
FinishChatCard (complete the bank account step until you reach validation page)
WalletStatementModal (no video)
BaseOnboardingPersonalDetails (no need fix)
BaseOnboardingWork (no need fix)

I don't apply the fix for 5 and 6 because we already dismiss the modal here.

App/src/pages/OnboardingPersonalDetails/BaseOnboardingPersonalDetails.tsx

Lines 63 to 71 in 6abd9fd

    
           Navigation.dismissModal(); 
        
           // Only navigate to concierge chat when central pane is visible 
        
           // Otherwise stay on the chats screen. 
        
           if (isSmallScreenWidth) { 
        
               Navigation.navigate(ROUTES.HOME); 
        
           } else { 
        
               Report.navigateToConciergeChat(); 
        
           }

App/src/pages/OnboardingWork/BaseOnboardingWork.tsx

Lines 59 to 67 in 6abd9fd

    
           Navigation.dismissModal(); 
        
           // Only navigate to concierge chat when central pane is visible 
        
           // Otherwise stay on the chats screen. 
        
           if (isSmallScreenWidth) { 
        
               Navigation.navigate(ROUTES.HOME); 
        
           } else { 
        
               Report.navigateToConciergeChat(); 
        
           }

I don't record for WalletStatementModal because I don't know how to show the page normally and the page isn't being used anymore but I still applied the fix.

fedirjh · 2024-04-24T00:34:46Z

NOTE:
For small screen, the composer will be focused only if the chat is really empty, that is when you open the chat a full screen skeleton loader is shown

@bernhardoj Why does this affect small screens? also could you please merge main?

…g-concierge-from-rhp

bernhardoj · 2024-04-24T01:52:15Z

Merged with main, ManageTeamsExpensesPage is removed.

Why does this affect small screens?

It's the auto-focus condition.

App/src/pages/home/report/ReportActionCompose/ComposerWithSuggestions/ComposerWithSuggestions.tsx

Lines 286 to 287 in fd8ef99

    
           const shouldAutoFocus = 
        
               !modal?.isVisible && isFocused && (shouldFocusInputOnScreenFocus || (isEmptyChat && !ReportActionsUtils.isTransactionThread(parentReportAction))) && shouldShowComposeInput;

shouldFocusInputOnScreenFocus is false for a small screen.

fedirjh · 2024-04-24T06:11:01Z

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

CleanShot.2024-04-24.at.08.40.29.mp4

Android: mWeb Chrome

CleanShot.2024-04-24.at.08.36.24.mp4

iOS: Native

CleanShot.2024-04-24.at.03.11.20.mp4

iOS: mWeb Safari

CleanShot.2024-04-24.at.03.14.31.mp4

MacOS: Chrome / Safari

CleanShot.2024-04-24.at.07.12.27.mp4

MacOS: Desktop

CleanShot.2024-04-24.at.08.43.20.mp4

fedirjh

MariaHCD · 2024-04-25T07:39:42Z

@bernhardoj we've got some conflicts

…g-concierge-from-rhp

bernhardoj · 2024-04-25T13:28:15Z

Conflicts solved, the live markdown version is updated to 0.1.64 in main

OSBotify · 2024-04-25T14:02: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-04-26T23:21:35Z

🚀 Deployed to staging by https://github.com/MariaHCD in version: 1.4.67-0 🚀

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

OSBotify · 2024-04-29T23:13:22Z

🚀 Deployed to production by https://github.com/francoisl in version: 1.4.67-7 🚀

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

OSBotify · 2024-04-30T00:40:51Z

🚀 Deployed to production by https://github.com/francoisl in version: 1.4.67-7 🚀

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

eh2077 · 2024-06-11T06:53:46Z

src/pages/GetAssistancePage.tsx

        {
            title: translate('getAssistancePage.chatWithConcierge'),
-            onPress: () => Report.navigateToConciergeChat(),
+            onPress: () => Report.navigateToConciergeChat(true),


This caused a regression of #41610. We should only dismiss modal when there’s a RHP page.

bernhardoj added 2 commits April 22, 2024 23:47

update live markdown

20b5d24

dismiss modal when navigating to concierge chat

f5fcdd1

bernhardoj requested a review from a team as a code owner April 22, 2024 16:09

melvin-bot bot removed the request for review from a team April 22, 2024 16:09

melvin-bot bot requested a review from fedirjh April 22, 2024 16:09

Merge branch 'main' into fix/21401-textinput-wont-focus-after-visitin…

130d426

…g-concierge-from-rhp

fedirjh approved these changes Apr 24, 2024

View reviewed changes

melvin-bot bot requested a review from MariaHCD April 24, 2024 07:49

bernhardoj mentioned this pull request Apr 24, 2024

[Hold on #40708] Web - Composer - Navigating to an invalid merchant edit URL makes composer active while RHP is open #40795

Closed

6 tasks

MariaHCD previously approved these changes Apr 25, 2024

View reviewed changes

Merge branch 'main' into fix/21401-textinput-wont-focus-after-visitin…

58576fb

…g-concierge-from-rhp

bernhardoj dismissed MariaHCD’s stale review via 58576fb April 25, 2024 13:27

MariaHCD approved these changes Apr 25, 2024

View reviewed changes

MariaHCD merged commit 4d5c0a4 into Expensify:main Apr 25, 2024

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

Deploy Checklist: New Expensify 2024-04-26 #41122

Closed

63 tasks

melvin-bot bot mentioned this pull request Apr 29, 2024

[HOLD for payment 2024-05-06] [HOLD #36071] [$1000] Textinput is not focused in chat after visiting conceirge help #21401

Closed

6 tasks

nkdengineer mentioned this pull request May 24, 2024

fix: navigate back directed to Workflows page instead of Get assistance page #42459

Merged

50 tasks

eh2077 reviewed Jun 11, 2024

View reviewed changes

eh2077 mentioned this pull request Jun 11, 2024

[HOLD for payment 2024-06-11] [$250] Get Assistance workflow from bank account page doesn't match other workflows #41610

Closed

6 tasks

Conversation

bernhardoj commented Apr 22, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

melvin-bot bot commented Apr 22, 2024

Uh oh!

bernhardoj commented Apr 22, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

fedirjh commented Apr 24, 2024

Uh oh!

bernhardoj commented Apr 24, 2024

Uh oh!

fedirjh commented Apr 24, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

fedirjh left a comment

Choose a reason for hiding this comment

Uh oh!

MariaHCD commented Apr 25, 2024

Uh oh!

bernhardoj commented Apr 25, 2024

Uh oh!

OSBotify commented Apr 25, 2024

Uh oh!

OSBotify commented Apr 26, 2024

Uh oh!

OSBotify commented Apr 29, 2024

Uh oh!

OSBotify commented Apr 30, 2024

Uh oh!

eh2077 Jun 11, 2024

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

bernhardoj commented Apr 22, 2024 •

edited

Loading

bernhardoj commented Apr 22, 2024 •

edited

Loading

fedirjh commented Apr 24, 2024 •

edited

Loading