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

nkdengineer · 2024-05-22T07:43:44Z

Details

Fixed Issues

$ #41610
PROPOSAL: #41610 (comment)

Tests

=== Mobile ===

Enable Workflows
Tap Workflows -- tap connect bank account
Tap help question mark on top left
On the Get Assistance page, tap "chat with concierge" and tap device back button
Verify that: user is directed to get assistance page

=== Web/Desktop ===

Enable Workflows
Tap Workflows -- tap connect bank account
Tap help question mark on top left
On the Get Assistance page, tap "chat with concierge"
Verify the composer is focused (only on web/desktop)

Verify that no errors appear in the JS console

Offline tests

QA Steps

=== Mobile ===

Enable Workflows
Tap Workflows -- tap connect bank account
Tap help question mark on top left
On the Get Assistance page, tap "chat with concierge" and tap device back button
Verify that: user is directed to get assistance page

=== Web/Desktop ===

Enable Workflows
Tap Workflows -- tap connect bank account
Tap help question mark on top left
On the Get Assistance page, tap "chat with concierge"
Verify the composer is focused (only on web/desktop)

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

android.mov

Android: mWeb Chrome

android-mweb.mov

iOS: Native

ios.mov

iOS: mWeb Safari

ios-mweb.mov

MacOS: Chrome / Safari

web.mov

MacOS: Desktop

desktop.mov

…ce page

melvin-bot · 2024-05-22T08:39:06Z

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

eh2077 · 2024-05-22T17:33:58Z

I'll review this tmr as it's end of day for me

eh2077 · 2024-05-23T15:41:37Z

src/pages/GetAssistancePage.tsx

@@ -34,10 +35,11 @@ function GetAssistancePage({route, account}: GetAssistancePageProps) {
    const styles = useThemeStyles();
    const {translate} = useLocalize();
    const navigateBackTo = route?.params.backTo || ROUTES.SETTINGS_CONTACT_METHODS.getRoute();
+    const canUseTouchScreen = DeviceCapabilities.canUseTouchScreen();


Should we use const {isLargeScreenWidth} = useWindowDimensions(); instead? As devices with touchscreen possibly have large screens.

Note: we only want to dismiss modal on large screens.

Previously, we call Report.navigateToConciergeChat(true) to fix this bug.
So I think we should use DeviceCapabilities.canUseTouchScreen() because: In here:

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

Lines 283 to 284 in 8375abe

const shouldAutoFocus =

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

we also use it to check the shouldAutoFocus.

@nkdengineer Sorry, I'm not following you. Or can you just share your concerns about my suggestion?

Should we use const {isLargeScreenWidth} = useWindowDimensions(); instead? As devices with touchscreen possibly have large screens.
Note: we only want to dismiss modal on large screens.

I just concern that your suggestion use isLargeScreenWidth but here:

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

Lines 283 to 284 in 8375abe

const shouldAutoFocus =

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

we use DeviceCapabilities.canUseTouchScreen(), so it is inconsistency and afraid that it can lead to this bug in the future (but now I cannot find any bug with your suggestion).

You mean canFocusInputOnScreenFocus is also determined by DeviceCapabilities.canUseTouchScreen() right? Yes I understand that your consideration to ensure consistent auto focus behavior on touch devices.

While I think as we’re fixing regression from
#40708, we should fix the root cause - dismiss modal when there’s a RHP page. There’s a RHP page only if it’s wide screen right?

Yes, it makes sense. I will update the PR based on your suggestion here

@eh2077 I updated, please check again

eh2077 · 2024-05-27T15:55:30Z

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

0-android.mp4

Android: mWeb Chrome

0-mobile-chrome.mp4

iOS: Native

0-ios.mp4

iOS: mWeb Safari

0-mobile-safari.mp4

MacOS: Chrome / Safari

0-web.mp4

MacOS: Desktop

0-desktop.mp4

eh2077 · 2024-05-27T16:04:29Z

@nkdengineer I think test steps are different between mobile devices and Web/Desktop.

=== Mobile ===

Enable Workflows
Tap Workflows -- tap connect bank account
Tap help question mark on top left
On the Get Assistance page, tap "chat with concierge" and tap device back button
Verify that: user is directed to get assistance page

=== Web/Desktop ===

Enable Workflows
Tap Workflows -- tap connect bank account
Tap help question mark on top left
On the Get Assistance page, tap "chat with concierge"
Verify the composer is focused (only on web/desktop)

Can you help to update them?

nkdengineer · 2024-05-28T03:00:27Z

@eh2077 thanks your suggestion, i updated

eh2077 · 2024-05-29T15:50:41Z

Hey @roryabraham , kindly take a look when you get a chance

OSBotify · 2024-05-29T19:14:37Z

✋ 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-05-30T21:55:17Z

🚀 Deployed to staging by https://github.com/roryabraham in version: 1.4.77-11 🚀

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

OSBotify · 2024-05-30T22:31:47Z

🚀 Deployed to staging by https://github.com/roryabraham in version: 1.4.77-11 🚀

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

OSBotify · 2024-06-04T13:57:49Z

🚀 Deployed to production by https://github.com/mountiny in version: 1.4.78-5 🚀

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

nkdengineer added 3 commits May 22, 2024 14:40

fix: navigate back directed to Workflows page instead of Get assistan…

c9b793a

…ce page

fix logic in get assistance page

bf2ad0b

revert version pod file

7cf8181

nkdengineer marked this pull request as ready for review May 22, 2024 08:39

nkdengineer requested a review from a team as a code owner May 22, 2024 08:39

melvin-bot bot requested review from eh2077 and removed request for a team May 22, 2024 08:39

nkdengineer mentioned this pull request May 22, 2024

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

Closed

6 tasks

eh2077 reviewed May 23, 2024

View reviewed changes

update logic show assistance page

4f745fa

eh2077 approved these changes May 28, 2024

View reviewed changes

melvin-bot bot requested a review from roryabraham May 28, 2024 04:52

roryabraham approved these changes May 29, 2024

View reviewed changes

roryabraham merged commit df0173e into Expensify:main May 29, 2024
17 of 18 checks passed

github-actions bot mentioned this pull request May 30, 2024

Deploy Checklist: New Expensify 2024-05-30 #42872

Closed

95 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

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

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

nkdengineer commented May 22, 2024 •

edited

Loading

melvin-bot bot commented May 22, 2024

eh2077 commented May 22, 2024

eh2077 May 23, 2024

nkdengineer May 24, 2024

eh2077 May 26, 2024

nkdengineer May 27, 2024

eh2077 May 27, 2024

nkdengineer May 27, 2024

nkdengineer May 27, 2024

eh2077 commented May 27, 2024 •

edited

Loading

eh2077 commented May 27, 2024

nkdengineer commented May 28, 2024

eh2077 commented May 29, 2024

OSBotify commented May 29, 2024

OSBotify commented May 30, 2024

OSBotify commented May 30, 2024

OSBotify commented Jun 4, 2024

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

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

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

Conversation

nkdengineer commented May 22, 2024 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented May 22, 2024

eh2077 commented May 22, 2024

eh2077 May 23, 2024

Choose a reason for hiding this comment

nkdengineer May 24, 2024

Choose a reason for hiding this comment

eh2077 May 26, 2024

Choose a reason for hiding this comment

nkdengineer May 27, 2024

Choose a reason for hiding this comment

eh2077 May 27, 2024

Choose a reason for hiding this comment

nkdengineer May 27, 2024

Choose a reason for hiding this comment

nkdengineer May 27, 2024

Choose a reason for hiding this comment

eh2077 commented May 27, 2024 • edited Loading

Reviewer Checklist

Screenshots/Videos

eh2077 commented May 27, 2024

nkdengineer commented May 28, 2024

eh2077 commented May 29, 2024

OSBotify commented May 29, 2024

OSBotify commented May 30, 2024

OSBotify commented May 30, 2024

OSBotify commented Jun 4, 2024

nkdengineer commented May 22, 2024 •

edited

Loading

eh2077 commented May 27, 2024 •

edited

Loading