Fix keyboard appears briefly when opening concierge page from a chat by bernhardoj · Pull Request #37002 · Expensify/App

bernhardoj · 2024-02-21T07:58:04Z

Details

The keyboard appears when the concierge page utility is closed before navigating to the real concierge chat, triggering composer refocus logic.

Fixed Issues

$ #35239
PROPOSAL: #35239 (comment)

Tests

Same as QA Steps

Verify that no errors appear in the JS console

Offline tests

Same as QA Steps

QA Steps

Open any chat
Send staging.new.expensify.com/concierge to the chat
Close the keyboard
Press the concierge link
Verify the concierge chat is shown and the keyboard doesn't show at all

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Screen.Recording.2024-02-21.at.15.52.17.mov

Android: mWeb Chrome

Screen.Recording.2024-02-21.at.15.38.53.mov

iOS: Native

Screen.Recording.2024-02-21.at.15.41.48.mov

iOS: mWeb Safari

Screen.Recording.2024-02-21.at.15.39.44.mov

MacOS: Chrome / Safari

MacOS: Desktop

melvin-bot · 2024-02-21T07:58:09Z

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

bernhardoj · 2024-02-21T08:09:23Z

        case SCREENS.NOT_FOUND:
        case SCREENS.REPORT_ATTACHMENTS:
+        case SCREENS.CONCIERGE:
            // If we are not in the target report, we need to navigate to it after dismissing the modal


I decided to use the alternative solution. Here is why:

I have another PR here that is related to the concierge page too. When working on the PR, I tried to smoothen the navigation by replacing GO BACK with REPLACE, just like what we want to do here, but found out that it can open multiple consecutive concierge chats.

For example, when you have chat A and concierge chat.
[A, Concierge Chat]
Then, you open another concierge page.
[A, Concierge Chat, Concierge Page]
If we just use the REPLACE, we will have 2 concierge chats.
[A, Concierge Chat, Concierge Chat]

But if we use dismissModal, it will check first whether the topmost report is the same as the target report. If it's the same, it will just pop the concierge page out, otherwise, it will replace the concierge page with the concierge chat.

This will conflict with the PR I linked above, so we can wait a bit.

This will conflict with the PR I linked above, so we can wait a bit.

Are you suggesting waiting for the other PR to be merged and deployed? Or do you think it's safe now to merge these changes now that the other PR has been merged?

shubham1206agra · 2024-02-25T13:55:33Z

@bernhardoj Just fix conflicts and we can proceed here.

bernhardoj · 2024-02-26T05:57:20Z

            }
-            if (shouldPopCurrentScreen && !shouldDismissModal) {
-                Navigation.goBack();
-            }


Why I remove this? It's related to my comment above. I added this from the linked PR above. This is only being used in ConciergePage, but since we decided to use dismiss modal, this param is not needed anymore.

bernhardoj · 2024-02-26T05:57:31Z


        Report.completeEngagementModal(message, choice);
-        Report.navigateToConciergeChat(false, true);
+        Report.navigateToConciergeChat(true);


Fixing the param conflict

The param to dismiss the modal was added in #36283 to solve #36265.

Still works fine.

Screen.Recording.2024-02-26.at.14.05.17.mov

bernhardoj · 2024-02-26T05:57:39Z

    const {translate} = useLocalize();

-    const handleNavigateToConciergeChat = () => Report.navigateToConciergeChat(false, true);
+    const handleNavigateToConciergeChat = () => Report.navigateToConciergeChat(true);


Fixing the param conflict

The param to dismiss the modal was added in bank account refactor.

Still works fine

Screen.Recording.2024-02-26.at.14.09.47.mov

shubham1206agra · 2024-02-27T08:52: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

Screen.Recording.2024-02-27.at.2.11.29.PM.mov

Android: mWeb Chrome

Screen.Recording.2024-02-27.at.1.16.08.PM.mov

iOS: Native

Screen.Recording.2024-02-27.at.1.23.23.PM.mov

iOS: mWeb Safari

Screen.Recording.2024-02-27.at.12.48.31.PM.mov

MacOS: Chrome / Safari

NA

MacOS: Desktop

NA

marcochavezf

LGTM, just waiting to confirm if we still need to wait for the other PR to makes changes here

marcochavezf · 2024-02-27T17:56:36Z

        case SCREENS.NOT_FOUND:
        case SCREENS.REPORT_ATTACHMENTS:
+        case SCREENS.CONCIERGE:
            // If we are not in the target report, we need to navigate to it after dismissing the modal


This will conflict with the PR I linked above, so we can wait a bit.

Are you suggesting waiting for the other PR to be merged and deployed? Or do you think it's safe now to merge these changes now that the other PR has been merged?

bernhardoj · 2024-02-28T02:42:21Z

@marcochavezf the other PR was merged and I already fixed the conflict.

OSBotify · 2024-02-28T16:49:25Z

✋ 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-29T00:07:10Z

🚀 Deployed to staging by https://github.com/marcochavezf in version: 1.4.45-0 🚀

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

OSBotify · 2024-02-29T23:31:38Z

🚀 Deployed to production by https://github.com/puneetlath in version: 1.4.45-6 🚀

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

add concierge page to dismiss modal case

5bcba77

bernhardoj requested a review from a team as a code owner February 21, 2024 07:58

melvin-bot Bot requested review from shubham1206agra and removed request for a team February 21, 2024 07:58

bernhardoj commented Feb 21, 2024

View reviewed changes

bernhardoj added 3 commits February 26, 2024 13:55

Merge branch 'main' into fix/35239-keyboard-shows-when-open-concierge

c42e84b

remove unused param

637af8a

fix param

f5a0bd4

bernhardoj commented Feb 26, 2024

View reviewed changes

shubham1206agra approved these changes Feb 27, 2024

View reviewed changes

melvin-bot Bot requested a review from marcochavezf February 27, 2024 08:52

marcochavezf approved these changes Feb 27, 2024

View reviewed changes

marcochavezf merged commit 7f7f440 into Expensify:main Feb 28, 2024

github-actions Bot mentioned this pull request Feb 28, 2024

Deploy Checklist: New Expensify 2024-02-28 #37459

Closed

91 tasks

melvin-bot Bot mentioned this pull request Feb 29, 2024

[HOLD for payment 2024-03-07] [$500] mWeb - Chat - A keyboard briefly appears when navigating to Concierge chat via direct link #35239

Closed

6 tasks

Uh oh!

Conversation

bernhardoj commented Feb 21, 2024

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

melvin-bot Bot commented Feb 21, 2024

Uh oh!

bernhardoj Feb 21, 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!

marcochavezf Feb 27, 2024

Choose a reason for hiding this comment

Uh oh!

shubham1206agra commented Feb 25, 2024

Uh oh!

bernhardoj Feb 26, 2024

Choose a reason for hiding this comment

Uh oh!

bernhardoj Feb 26, 2024

Choose a reason for hiding this comment

Uh oh!

bernhardoj Feb 26, 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!

bernhardoj Feb 26, 2024

Choose a reason for hiding this comment

Uh oh!

bernhardoj Feb 26, 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!

shubham1206agra commented Feb 27, 2024

Reviewer Checklist

Screenshots/Videos

Uh oh!

marcochavezf left a comment

Choose a reason for hiding this comment

Uh oh!

marcochavezf Feb 27, 2024

Choose a reason for hiding this comment

Uh oh!

bernhardoj commented Feb 28, 2024

Uh oh!

OSBotify commented Feb 28, 2024

Uh oh!

OSBotify commented Feb 29, 2024

Uh oh!

OSBotify commented Feb 29, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

bernhardoj Feb 21, 2024 •

edited

Loading

bernhardoj Feb 26, 2024 •

edited

Loading

bernhardoj Feb 26, 2024 •

edited

Loading