2FA flow scroll fixes #27885

neonbhai · 2023-09-20T19:24:06Z

Details

This PR fixes button padding and places it below the content in Two Factor Authentication flow

Fixed Issues

$ #26212
PROPOSAL: #26212 (comment)

Tests

Use an account that does not have two factor authentication. (Or create new using a temp email)

Login
Click on profile pic (opens settings)
Click on Security
Click on Two Factor Authentication
Codes Step: Verify that the bottom button is below text, and padded nicely
Click Next
Verify Step: Verify that button does not appear over content, We can scroll the content to see the button.

Verify that no errors appear in the JS console

Offline tests

These pages are not accessible when offline

QA Steps

Login
Click on profile pic (opens settings)
Click on Security
Click on Two Factor Authentication
Codes Step: Verify that the bottom button is below text, and padded nicely
Click Next
Verify Step: Verify that button does not appear over content, We can scroll the content to see the button.

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Web

2FA.web.full.mov

2fa_web.mov

contact.methods.on.really.small.screen.webm

Mobile Web - Chrome

Android.mWeb.mp4

Mobile Web - Safari

safari.mweb.mov

Desktop

video6080150794517088761.mp4

iOS

ios.iPhone.14.mov

Android

https://github.com/Expensify/App/assets/64629613/dcb4b8b2-6135-4af0-b323-8cffd0zcf410

This makes the Footer button a child of the ScrollView container. The footer button will now be scrollable below the content.

This is achieved by adding the container style flexGrow1 to the ScrollView. This makes the footer button sit at the bottom of the page for large screens.

This adds a top padding of 20px to the footer button (it already has a bottom padding of 20px) This mirrors the padding of other buttons in the App

This makes the Footer button a child of the ScrollView container. The effect will be that the footer button will now be scrollable below the content.

This adds a top padding of 20 px to footer button, mirroring the padding of other buttons in the App

… Step We achieve this by adding the container style flexGrow1 to the ScrollView

melvin-bot · 2023-09-20T19:24:43Z

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

This was achieved by adding the button to the parent ScrollView (and changing the style to styles.mtAuto (this aligns it to the end of the container. The parent ScrollView is given a style of flexGrow1 to make sure it takes up all the space available.

neonbhai · 2023-09-20T20:15:25Z

@mananjadhav Hi, the PR is ready for review!

mananjadhav · 2023-09-21T17:51:09Z

@neonbhai Can you resolved the conflicts? And I am wondering why I didn't get assigned to the PR.

neonbhai · 2023-09-21T17:52:06Z

@mananjadhav on it

neonbhai · 2023-09-21T18:12:44Z

@mananjadhav done!

mananjadhav

Change looks good. Working through the checklist now.

melvin-bot · 2023-09-22T04:34:17Z

🎯 @mananjadhav, thanks for reviewing and testing this PR! 🎉

An E/App issue has been created to issue payment here: #27980.

mananjadhav · 2023-09-22T04:36:50Z

I can see the correct issue is tagged and I don't see any link, yet a new issue is created. @neonbhai can you confirm if you've linked the issue in the correct format.

mananjadhav · 2023-09-22T04:58:19Z

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

web-2fa-scroll-fix.mov

Mobile Web - Chrome

mweb-chrome-2fa-scroll-fix.mov

Mobile Web - Safari

mweb-safari-2fa-scroll-fix.mov

Desktop

desktop-2fa-scroll-fix.mov

iOS

ios-2fa-scroll-fix.mov

Android

android-2fa-scroll-fix.mov

mananjadhav · 2023-09-22T04:59:20Z

@neonbhai I tested the space related changes and that's fine. One thing I noticed between the staging & your screencasts vs my screencasts is that the button in my video isn't disabled by default. Can you verify if that isn't because of our change?

neonbhai · 2023-09-22T09:01:34Z

@mananjadhav this behaviour is in the lastest main. This PR linked to this issue added it.

neonbhai · 2023-09-22T09:12:14Z

I can see the correct issue is tagged and I don't see any link, yet a new issue is created. @neonbhai can you confirm if you've linked the issue in the correct format.

I checked again and the issue is linked correctly 🤔

mananjadhav · 2023-09-22T09:21:46Z

Thanks for the confirmation @neonbhai

neonbhai · 2023-09-22T14:15:03Z

@marcochavezf all yours!

marcochavezf

LGTM

OSBotify · 2023-09-22T15:19: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 · 2023-09-25T10:05:03Z

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

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

OSBotify · 2023-09-28T18:47:24Z

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

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

neonbhai added 7 commits September 18, 2023 05:17

Make the footer button part of the ScrollView in 2FA Verify Step

5671e36

This makes the Footer button a child of the ScrollView container. The footer button will now be scrollable below the content.

Make ScrollView take all the available space on the page

c278d80

This is achieved by adding the container style flexGrow1 to the ScrollView. This makes the footer button sit at the bottom of the page for large screens.

Remove bottom padding of scrollView

877cb2a

Adjust padding of the footer button

8c02953

This adds a top padding of 20px to the footer button (it already has a bottom padding of 20px) This mirrors the padding of other buttons in the App

Make the footer button part of the ScrollView in 2FA Codes Step

079b594

This makes the Footer button a child of the ScrollView container. The effect will be that the footer button will now be scrollable below the content.

Adjust padding of footer button in 2FA Codes Step

4db8374

This adds a top padding of 20 px to footer button, mirroring the padding of other buttons in the App

Make ScrollView take all the available space on the page in 2FA Codes…

08b3e44

… Step We achieve this by adding the container style flexGrow1 to the ScrollView

neonbhai requested a review from a team as a code owner September 20, 2023 19:24

melvin-bot bot requested review from marcochavezf and removed request for a team September 20, 2023 19:24

neonbhai mentioned this pull request Sep 20, 2023

[HOLD for payment 2023-10-05] [$500] IOS - Inconsistent margin above Next button in 2FA Step 2 #26212

Closed

6 tasks

Merge branch 'main' into 2FAScrollFixes

5453660

mananjadhav approved these changes Sep 22, 2023

View reviewed changes

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

Payment issue for E/App PR#27885 #27980

Closed

marcochavezf approved these changes Sep 22, 2023

View reviewed changes

marcochavezf merged commit b57f6d2 into Expensify:main Sep 22, 2023
13 checks passed

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

2FA flow scroll fixes #27885

2FA flow scroll fixes #27885

neonbhai commented Sep 20, 2023 •

edited

Loading

melvin-bot bot commented Sep 20, 2023

neonbhai commented Sep 20, 2023

mananjadhav commented Sep 21, 2023

neonbhai commented Sep 21, 2023

neonbhai commented Sep 21, 2023

mananjadhav left a comment

melvin-bot bot commented Sep 22, 2023

mananjadhav commented Sep 22, 2023

mananjadhav commented Sep 22, 2023 •

edited

Loading

mananjadhav commented Sep 22, 2023

neonbhai commented Sep 22, 2023

neonbhai commented Sep 22, 2023

mananjadhav commented Sep 22, 2023

neonbhai commented Sep 22, 2023

marcochavezf left a comment

OSBotify commented Sep 22, 2023

OSBotify commented Sep 25, 2023

OSBotify commented Sep 28, 2023

2FA flow scroll fixes #27885

2FA flow scroll fixes #27885

Conversation

neonbhai commented Sep 20, 2023 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Sep 20, 2023

neonbhai commented Sep 20, 2023

mananjadhav commented Sep 21, 2023

neonbhai commented Sep 21, 2023

neonbhai commented Sep 21, 2023

mananjadhav left a comment

Choose a reason for hiding this comment

melvin-bot bot commented Sep 22, 2023

mananjadhav commented Sep 22, 2023

mananjadhav commented Sep 22, 2023 • edited Loading

Reviewer Checklist

Screenshots/Videos

mananjadhav commented Sep 22, 2023

neonbhai commented Sep 22, 2023

neonbhai commented Sep 22, 2023

mananjadhav commented Sep 22, 2023

neonbhai commented Sep 22, 2023

marcochavezf left a comment

Choose a reason for hiding this comment

OSBotify commented Sep 22, 2023

OSBotify commented Sep 25, 2023

OSBotify commented Sep 28, 2023

neonbhai commented Sep 20, 2023 •

edited

Loading

mananjadhav commented Sep 22, 2023 •

edited

Loading