Fix extra space on AdditionalDetailsPage #11257

roryabraham · 2022-09-24T00:34:19Z

Details

The parent component of AdditionalDetailsPage, EnablePaymentsPage, already has a ScreenWrapper here.

We should never have nested ScreenWrapper components. This is what was causing the extra space bug.

The same bug existed on the ActivatePage.

Fixed Issues

$ #10367

Tests

Run the app
Sign into a new account
Deep-link into the enable-payments page:
- Android: adb shell am start -a android.intent.action.VIEW -d new-expensify://enable-payments
- iOS: xcrun simctl openurl booted new-expensify://enable-payments
- Web/mWeb: go to /enable-payments in the browser
- There's no deeplinking set up for the desktop app yet, so we'll just trust that the layout will be the same

Verify that no errors appear in the JS console

PR Review Checklist

Contributor (PR Author) Checklist

PR Reviewer Checklist

The Contributor+ will copy/paste it into a new comment and complete it after the author checklist is completed

QA Steps

Verify that no errors appear in the JS console

Screenshots

Web

Mobile Web - Chrome

Mobile Web - Safari

Desktop

iOS

Before	After

Android

Before	After

AndrewGable · 2022-09-29T14:28:16Z

Looks good but lint is failing

roryabraham · 2022-09-29T16:53:49Z

Updated, ready for another review

AndrewGable · 2022-09-29T17:06:50Z

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 verified tests pass on all platforms & I tested again on:
- iOS / native
- Android / native
- iOS / Safari
- Android / Chrome
- MacOS / Chrome
- 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 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 was added in all src/languages/* files
- I verified any copy / text that was added to the app is correct English and approved by marketing by tagging the marketing team 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 */
- Any functional components have the displayName property
- 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 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 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.
I have checked off every checkbox in the PR reviewer checklist, including those that don't apply to this PR.

AndrewGable · 2022-09-29T17:09:05Z

Tests were passing

OSBotify · 2022-09-29T17:12:20Z

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

parasharrajat · 2022-09-29T18:52:16Z

src/pages/EnablePayments/EnablePaymentsPage.js

-                {currentStep === CONST.WALLET.STEP.ONFIDO && <OnfidoStep walletAdditionalDetailsDraft={this.props.walletAdditionalDetailsDraft} />}
-                {currentStep === CONST.WALLET.STEP.TERMS && <TermsStep />}
-                {currentStep === CONST.WALLET.STEP.ACTIVATE && <ActivateStep userWallet={this.props.userWallet} />}
+                {(() => {


IIFE is looking very awkward here.

You don't like? I would review another refactor if you feel strongly – I thought this was pretty readable and like having only one parent <ScreenWrapper>

Yeah, combined statements are good but IIFE in JSX is not very common.

Came across this randomly, but yeah I think I don't like either. Feels like an anti-pattern and an alternate approach would be to create a new component for all the logic like:

<ScreenWrapper> <EnablePaymentsContent {...props} /> </ScreenWrapper>

I'm not opposed and that sounds like a good alternative @marcaaron. Feel free to create an issue if you want 👍🏼

OSBotify · 2022-09-29T19:26:03Z

🚀 Deployed to staging by @AndrewGable in version: 1.2.10-0 🚀

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

OSBotify · 2022-09-29T21:52:21Z

🚀 Deployed to staging by @AndrewGable in version: 1.2.10-0 🚀

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

OSBotify · 2022-09-30T22:04:18Z

🚀 Deployed to production by @roryabraham in version: 1.2.10-1 🚀

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

…tionalDetails Fix extra space on AdditionalDetailsPage

Remove nested ScreenWrapper

f32cb7b

roryabraham self-assigned this Sep 24, 2022

roryabraham added 3 commits September 23, 2022 18:06

Fix on ActivateStep as well

4bd9c07

Standardize ScreenWrapper in parent

b55a89e

Fix JS style

b851310

roryabraham marked this pull request as ready for review September 24, 2022 01:13

roryabraham requested a review from a team as a code owner September 24, 2022 01:13

melvin-bot bot requested review from AndrewGable and removed request for a team September 24, 2022 01:13

roryabraham mentioned this pull request Sep 24, 2022

IOS / Android - Extra spacing above the header at additional details page #10367

Closed

roryabraham added 2 commits September 29, 2022 09:52

Merge branch 'main' into Rory-ExtraSpaceAdditionalDetails

7245c63

Remove unused import

da98b2e

AndrewGable approved these changes Sep 29, 2022

View reviewed changes

AndrewGable merged commit 60d933e into main Sep 29, 2022

AndrewGable deleted the Rory-ExtraSpaceAdditionalDetails branch September 29, 2022 17:08

This comment was marked as off-topic.

Sign in to view

melvin-bot bot added the Emergency label Sep 29, 2022

AndrewGable removed the Emergency label Sep 29, 2022

parasharrajat reviewed Sep 29, 2022

View reviewed changes

OSBotify mentioned this pull request Sep 29, 2022

Deploy Checklist: New Expensify 2022-09-29 #11446

Closed

17 tasks

smrutiparida pushed a commit to autosave-app/App that referenced this pull request Oct 13, 2022

Merge pull request Expensify#11257 from Expensify/Rory-ExtraSpaceAddi…

72bb5d1

…tionalDetails Fix extra space on AdditionalDetailsPage

payal-lathidadiya mentioned this pull request Jul 13, 2023

[NoQA] refactor: migrate RadioButtons to function component #22770

Merged

57 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix extra space on AdditionalDetailsPage #11257

Fix extra space on AdditionalDetailsPage #11257

roryabraham commented Sep 24, 2022 •

edited

Loading

AndrewGable commented Sep 29, 2022

roryabraham commented Sep 29, 2022

AndrewGable commented Sep 29, 2022

This comment was marked as off-topic.

AndrewGable commented Sep 29, 2022

OSBotify commented Sep 29, 2022

parasharrajat Sep 29, 2022

roryabraham Sep 30, 2022

parasharrajat Sep 30, 2022

marcaaron Dec 15, 2022

roryabraham Dec 17, 2022

OSBotify commented Sep 29, 2022

OSBotify commented Sep 29, 2022

OSBotify commented Sep 30, 2022

Fix extra space on AdditionalDetailsPage #11257

Fix extra space on AdditionalDetailsPage #11257

Conversation

roryabraham commented Sep 24, 2022 • edited Loading

Details

Fixed Issues

Tests

PR Review Checklist

Contributor (PR Author) Checklist

PR Reviewer Checklist

QA Steps

Screenshots

Web

Mobile Web - Chrome

Mobile Web - Safari

Desktop

iOS

Android

AndrewGable commented Sep 29, 2022

roryabraham commented Sep 29, 2022

AndrewGable commented Sep 29, 2022

This comment was marked as off-topic.

AndrewGable commented Sep 29, 2022

OSBotify commented Sep 29, 2022

parasharrajat Sep 29, 2022

Choose a reason for hiding this comment

roryabraham Sep 30, 2022

Choose a reason for hiding this comment

parasharrajat Sep 30, 2022

Choose a reason for hiding this comment

marcaaron Dec 15, 2022

Choose a reason for hiding this comment

roryabraham Dec 17, 2022

Choose a reason for hiding this comment

OSBotify commented Sep 29, 2022

OSBotify commented Sep 29, 2022

OSBotify commented Sep 30, 2022

roryabraham commented Sep 24, 2022 •

edited

Loading