Fix Inconsistency in the security page and Request money page #23712

dukenv0307 · 2023-07-27T08:20:01Z

Details

Fix Inconsistency in the security page and Request money page

Fixed Issues

$ #22660
PROPOSAL: #22660 (comment)

Tests

Go to settings > security > Two factor authentication
Verify that next button is highlighted and clickable
Click it without copying or downloading the codes
Verify that an error message show up
Click FAB, choose Request money
Verify that next button is highlighted and clickable
Click it without entering a valid number
Verify that an error message show up

Verify that no errors appear in the JS console

Offline tests

QA Steps

Go to settings > security > Two factor authentication
Verify that next button is highlighted and clickable
Click it without copying or downloading the codes
Verify that an error message show up
Click FAB, choose Request money
Verify that next button is highlighted and clickable
Click it without entering a valid number
Verify that an error message show up

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Web

Screencast.from.01-09-2023.00.11.24.webm

Mobile Web - Chrome

Record_2023-09-01-00-12-59.mp4

Mobile Web - Safari

Screen.Recording.2023-09-01.at.00.16.06.mp4

Desktop

Screen.Recording.2023-09-01.at.00.21.59.mov

iOS

Screen.Recording.2023-09-01.at.00.20.57.mp4

Android

22660.webm

melvin-bot · 2023-07-27T08:28:29Z

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

thesahindia · 2023-07-28T17:43:55Z

Waiting for the copy.

dukenv0307 · 2023-08-10T02:45:02Z

@thesahindia The translation key is confirmed and updated. Please help to review when you have a chance.

dukenv0307 · 2023-08-11T03:11:49Z

@thesahindia Friendly bump.

dukenv0307 · 2023-08-14T03:20:33Z

@thesahindia ICYMI. Friendly bump. Please help to review the PR when you have time.

Ollyws · 2023-08-21T15:27:59Z

src/pages/iou/steps/MoneyRequestAmountForm.js

@@ -124,6 +129,8 @@ function MoneyRequestAmountForm({amount, currency, isEditing, forwardedRef, onCu
            setSelection((prevSelection) => ({...prevSelection}));
            return;
        }
+        setIsInvalidAmount(checkAmount(newAmountWithoutSpaces));
+        setFormError('');


I'm thinking that maybe in order to be congruent with the Form pages we should only clear the error once the user has input a valid amount. Example:

Screen.Recording.2023-08-21.at.16.27.08.mov

@Ollyws I just updated.

Ollyws · 2023-08-22T14:52:26Z

src/pages/iou/steps/MoneyRequestAmountForm.js

-                    isDisabled={!currentAmount.length || parseFloat(currentAmount) < 0.01}
-                    text={buttonText}
-                />
+                <View style={[styles.w100, styles.mt5]}>


Could we update the alignment to match the other Form pages? Thanks.

Also I'm wondering if we can stop the input from moving up when the error is added, it's a bit jarring:

Screen.Recording.2023-08-22.at.15.57.19.mov

@Ollyws I think it's hard to prevent jumping because the input has style flex:1.
@shawnborton I think we should confirm here again. Should we disable the next button of money request flow?

What does this look like on mobile where we show the full keypad too?

it looks like this.

Some UI could be broken as @Ollyws commented here So I think we should only not disable the button in CodesSteps of TwoFactor

I feel like we should consider moving that error message to be below the green button for consistency. I think it's probably okay if the UI jumps slightly because the alternatives aren't really too great. We'd have to give a an area a fixed height to prevent jumping, which kind of feels like we'd be optimizing for the less common case.

Also, we should make the error text use our text.Supporting color, but keep the dot red.

I feel like we should consider moving that error message to be below the green button for consistency

What does that mean? I saw the error message is always above the confirm button.

@shawnborton please help me in the comment above when you have a chance.

But then that makes an awkward gap between the green button and the keypad. So I think for this one, we should move the error message to be below the green submit button.

dukenv0307 · 2023-08-30T03:22:41Z

@Ollyws Updated @shawnborton suggestion, please help to review again.

shawnborton · 2023-08-30T16:24:47Z

Are the screenshots updated?

dukenv0307 · 2023-08-30T16:57:13Z

@shawnborton I just updated all screenshots, please help to check again.

shawnborton · 2023-08-30T19:07:05Z

Cool, that works for me. Real quickly though, have we considered putting the error message directly below the area that holds the amount? Like this area here:

Basically directly above all of the numperpad buttons. I wonder if that would actually make this feel better because:

the green button won't jump around, nor would the numberpad buttons
on desktop, the red error message would just fall towards the bottom and above the green button since there is no numberpad

Could we just see a quick version of that and then we can decide which we like better?

dukenv0307 · 2023-08-31T02:19:14Z

@shawnborton Is it your suggestion?

dukenv0307 · 2023-09-15T03:05:09Z

Updated.

dukenv0307 · 2023-09-15T03:12:46Z

@Ollyws Do you think we should show the error if the input is blurred and the amount is invalid.

Ollyws · 2023-09-15T11:08:25Z

@dukenv0307 Thanks for the update. No I don't think it's necessary to show the error when the input is blurred.

Ollyws · 2023-09-15T13:02:23Z

@dukenv0307 Could we also please get #23712 (comment) aligned on the CodesPage too, thanks.

dukenv0307 · 2023-09-17T07:44:44Z

@Ollyws I updated.

Ollyws · 2023-09-19T10:08:23Z

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 / Chrome
- iOS / native
- iOS / 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(themeColors.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 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

Web

MacOS_Web.mp4

Mobile Web - Chrome

Android_Chrome.mp4

Mobile Web - Safari

iOS_Safari.mp4

Desktop

MacOS_Desktop.mp4

iOS

iOS_Native.mp4

Android

Android_Native.mp4

Ollyws

LGTM

src/pages/iou/steps/MoneyRequestAmountForm.js

dukenv0307 · 2023-09-20T02:44:32Z

@tgolen I updated.

OSBotify · 2023-09-21T02:23:24Z

✋ 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 · 2023-09-22T14:01:02Z

🚀 Deployed to staging by https://github.com/tgolen in version: 1.3.73-0 🚀

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

OSBotify · 2023-09-25T09:35:53Z

🚀 Deployed to production by https://github.com/mountiny in version: 1.3.73-1 🚀

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

OSBotify · 2023-09-25T10:08:00Z

🚀 Deployed to staging by https://github.com/tgolen in version: 1.3.74-0 🚀

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

OSBotify · 2023-09-28T18:50:21Z

🚀 Deployed to production by https://github.com/chiragsalian in version: 1.3.74-3 🚀

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

situchan · 2023-11-09T14:49:59Z

src/pages/iou/steps/MoneyRequestAmountForm.js

+            {!_.isEmpty(formError) && firstPress && (
+                <FormHelpMessage
+                    style={[styles.ph5]}
+                    isError
+                    message={translate(formError)}
+                />
+            )}


I'd say #29204 is a regression as it could have been handled as part of this PR.

dukenv0307 added 2 commits July 27, 2023 10:21

not disable next button

cd43eb7

fix: change error message

704f2c4

dukenv0307 marked this pull request as ready for review July 27, 2023 08:28

dukenv0307 requested a review from a team as a code owner July 27, 2023 08:28

melvin-bot bot requested review from thesahindia and removed request for a team July 27, 2023 08:28

dukenv0307 added 2 commits July 27, 2023 15:48

create a common to check amount

ba129c4

fix prettier

d08e690

dukenv0307 added 4 commits August 3, 2023 10:35

merge main

3e3db82

merge main

9036fc6

Merge branch 'main' into fix/22660

b6783cb

update translation key

d0dedfa

merge main

fb5fe6c

Ollyws reviewed Aug 21, 2023

View reviewed changes

refactor after merge main

ffeb57e

Ollyws reviewed Aug 22, 2023

View reviewed changes

merge main

0edc5a0

dukenv0307 added 2 commits August 30, 2023 23:58

Merge branch 'main' into fix/22660

e088bdb

fix lint

22ff035

Merge branch 'main' into fix/22660

5a9f99b

fix bug error

71e8fe1

dukenv0307 added 2 commits September 17, 2023 14:41

Merge branch 'main' into fix/22660

05db4e3

fix align of error in code step

43478ce

Ollyws approved these changes Sep 19, 2023

View reviewed changes

melvin-bot bot requested a review from tgolen September 19, 2023 10:23

tgolen requested changes Sep 19, 2023

View reviewed changes

src/pages/iou/steps/MoneyRequestAmountForm.js Outdated Show resolved Hide resolved

src/pages/iou/steps/MoneyRequestAmountForm.js Outdated Show resolved Hide resolved

src/pages/iou/steps/MoneyRequestAmountForm.js Outdated Show resolved Hide resolved

dukenv0307 added 2 commits September 20, 2023 09:36

Merge branch 'main' into fix/22660

b0ceccf

fix typo

06619d0

tgolen approved these changes Sep 21, 2023

View reviewed changes

tgolen merged commit b00e8a0 into Expensify:main Sep 21, 2023
11 checks passed

neonbhai mentioned this pull request Sep 22, 2023

2FA flow scroll fixes #27885

Merged

59 tasks

OSBotify mentioned this pull request Sep 22, 2023

Deploy Checklist: New Expensify 2023-09-22 #28013

Closed

96 tasks

Ollyws mentioned this pull request Sep 24, 2023

[HOLD for payment 2023-10-12] [$500] Request money - Inappropriate Error message show up when going back #28086

Closed

6 tasks

melvin-bot bot mentioned this pull request Sep 25, 2023

[HOLD for payment 2023-10-02] [$1000] Inconsistency in the security page #22660

Closed

6 tasks

This was referenced Sep 25, 2023

Deploy Checklist: New Expensify DUPE 2023-09-25 #28118

Closed

Deploy Checklist: New Expensify 2023-09-25 #28119

Closed

situchan reviewed Nov 9, 2023

View reviewed changes

situchan mentioned this pull request Nov 9, 2023

[HOLD for payment 2023-11-07] [$500] Request Money - Amount input getting displaced if there is an error #29204

Closed

6 tasks

Fix Inconsistency in the security page and Request money page #23712

Fix Inconsistency in the security page and Request money page #23712

Conversation

dukenv0307 commented Jul 27, 2023 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Jul 27, 2023

thesahindia commented Jul 28, 2023

dukenv0307 commented Aug 10, 2023

dukenv0307 commented Aug 11, 2023

dukenv0307 commented Aug 14, 2023 • edited Loading

Choose a reason for hiding this comment

dukenv0307 Aug 21, 2023 • edited Loading

Choose a reason for hiding this comment

Ollyws Aug 22, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

dukenv0307 commented Aug 30, 2023

shawnborton commented Aug 30, 2023

dukenv0307 commented Aug 30, 2023

shawnborton commented Aug 30, 2023

dukenv0307 commented Aug 31, 2023 • edited Loading

dukenv0307 commented Sep 15, 2023

dukenv0307 commented Sep 15, 2023

Ollyws commented Sep 15, 2023

Ollyws commented Sep 15, 2023

dukenv0307 commented Sep 17, 2023

Ollyws commented Sep 19, 2023

Reviewer Checklist

Screenshots/Videos

Ollyws left a comment

Choose a reason for hiding this comment

dukenv0307 commented Sep 20, 2023

OSBotify commented Sep 21, 2023

OSBotify commented Sep 22, 2023

OSBotify commented Sep 25, 2023

OSBotify commented Sep 25, 2023

OSBotify commented Sep 28, 2023

Choose a reason for hiding this comment

dukenv0307 commented Jul 27, 2023 •

edited

Loading

dukenv0307 commented Aug 14, 2023 •

edited

Loading

dukenv0307 Aug 21, 2023 •

edited

Loading

Ollyws Aug 22, 2023 •

edited

Loading

dukenv0307 commented Aug 31, 2023 •

edited

Loading