Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: The continue button has some extra bottom padding #48179

Merged

Conversation

BhuvaneshPatil
Copy link
Contributor

@BhuvaneshPatil BhuvaneshPatil commented Aug 28, 2024

Details

Continue button on the page where we add personal details while on-boarding has extra bottom padding

Fixed Issues

$ #47087
PROPOSAL: #47087 (comment)

Tests

  1. Create a new account

  2. In on boarding modal select, Manage my team's expenses

  3. Check bottom padding for continue button. Both in online and offline mode

  4. Fill details and go to next page

  5. Check bottom padding bottom for continue button. Both in online and offline mode

  6. Create a new account

  7. Select track my expenses option

  8. Check bottom padding for continue button. Both in online and offline mode

  • Verify that no errors appear in the JS console

Offline tests

QA Steps

  • Verify that no errors appear in the JS console

PR Author Checklist

  • I linked the correct issue in the ### Fixed Issues section above
  • I wrote clear testing steps that cover the changes made in this PR
    • I added steps for local testing in the Tests section
    • I added steps for the expected offline behavior in the Offline steps section
    • I added steps for Staging and/or Production testing in the QA steps section
    • I added steps to cover 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 tested this PR with a High Traffic account against the staging or production API to ensure there are no regressions (e.g. long loading states that impact usability).
  • I included screenshots or videos for tests on all platforms
  • I ran the tests on all platforms & verified they passed on:
    • Android: Native
    • Android: mWeb Chrome
    • iOS: Native
    • iOS: mWeb Safari
    • MacOS: Chrome / Safari
    • MacOS: Desktop
  • I verified there are no console errors (if there's a console error not related to the PR, report it or open an issue for it to be fixed)
  • I followed proper code patterns (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
      • If any non-english text was added/modified, I verified the translation was requested/reviewed in #expensify-open-source and it was approved by an internal Expensify engineer. Link to Slack message:
    • 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 followed the guidelines as stated in the Review Guidelines
  • I tested other components that can be impacted by my changes (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar are working as expected)
  • 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
  • I verified that if a function's arguments changed that all usages have also been updated correctly
  • 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.

Screenshots/Videos

Android: Native
Android: mWeb Chrome Screenshot 2024-09-25 at 12 12 37 AM Screenshot 2024-09-25 at 12 12 28 AM Screenshot 2024-09-25 at 12 10 45 AM Screenshot 2024-09-25 at 12 10 32 AM
iOS: Native Screenshot 2024-09-25 at 12 16 00 AM Screenshot 2024-09-25 at 12 15 34 AM Screenshot 2024-09-25 at 12 15 05 AM Screenshot 2024-09-25 at 12 14 55 AM
iOS: mWeb Safari Screenshot 2024-09-25 at 12 19 41 AM Screenshot 2024-09-25 at 12 19 32 AM Screenshot 2024-09-25 at 12 17 51 AM Screenshot 2024-09-25 at 12 17 40 AM
MacOS: Chrome / Safari Screenshot 2024-09-25 at 12 20 44 AM Screenshot 2024-09-25 at 12 20 36 AM
MacOS: Desktop Screenshot 2024-09-25 at 12 26 41 AM Screenshot 2024-09-25 at 12 26 34 AM

@BhuvaneshPatil BhuvaneshPatil requested a review from a team as a code owner August 28, 2024 14:04
@melvin-bot melvin-bot bot requested review from allgandalf and removed request for a team August 28, 2024 14:04
Copy link

melvin-bot bot commented Aug 28, 2024

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

@allgandalf
Copy link
Contributor

c.c. @shawnborton , can you check the screenshot from the contributor once, I see them just fine, want to get 🟢 from you

@shawnborton
Copy link
Contributor

This feels like there is too much space above the offline indicator:
CleanShot 2024-08-29 at 07 55 40@2x

Can you check what's going on there?

The other screenshots seem good though.

@allgandalf
Copy link
Contributor

@BhuvaneshPatil can you address the comments ^

@BhuvaneshPatil
Copy link
Contributor Author

Looking into it

@BhuvaneshPatil
Copy link
Contributor Author

The problem is on ios native. I am trying to build using npm run ios, but it's stuck in ⠼ Building the app... stage for long time

@allgandalf
Copy link
Contributor

were you able to build @BhuvaneshPatil ?

@allgandalf
Copy link
Contributor

any update here @BhuvaneshPatil ?

@BhuvaneshPatil
Copy link
Contributor Author

we are applying safe area bottom padding to button
Screenshot 2024-09-06 at 5 43 54 PM

I am trying different ways how we can use that padding

@BhuvaneshPatil
Copy link
Contributor Author

@allgandalf @shawnborton Does this look good -

offline -

View 1 View 2

online -

View 1 View 2

@shawnborton
Copy link
Contributor

This one doesn't quite look right:
CleanShot 2024-09-06 at 15 08 33@2x

There should be the same gap between the button and offline indicator as there is in this screenshot:
CleanShot 2024-09-06 at 15 09 07@2x

Is that possible?

@BhuvaneshPatil
Copy link
Contributor Author

Sure. Let me check if that can be done.
Thanks

@BhuvaneshPatil
Copy link
Contributor Author

This is a solution I came up with, but it has slight delay

Screen.Recording.2024-09-06.at.8.38.09.PM.mov

@shawnborton
Copy link
Contributor

Hmm the delay feels a bit odd, anything we can do about that?

@allgandalf
Copy link
Contributor

@BhuvaneshPatil can you address ^ comments and also resolve conflicts, lets act quick here, this is pending for a long time now

@BhuvaneshPatil
Copy link
Contributor Author

I checked on other pages as well on IOS.

Example Description page for Track Expense option we have that extra padding there as well. It is also due to safe are padding.

What do you think shall we continue having that padding here as well?

@allgandalf
Copy link
Contributor

bump @shawnborton on the ^ question

@shawnborton
Copy link
Contributor

That works for me if this already exists elsewhere.

@allgandalf
Copy link
Contributor

@BhuvaneshPatil is this ready for final review ?

@BhuvaneshPatil
Copy link
Contributor Author

Yes

@allgandalf
Copy link
Contributor

allgandalf commented Sep 11, 2024

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
Screen.Recording.2024-09-30.at.2.26.31.PM.mov
Android: mWeb Chrome
Screen.Recording.2024-09-30.at.2.29.58.PM.mov
iOS: Native
Screen.Recording.2024-09-30.at.2.13.46.PM.mov
iOS: mWeb Safari
Screen.Recording.2024-09-30.at.2.13.46.PM.mov
MacOS: Chrome / Safari
Screen.Recording.2024-09-30.at.2.03.35.PM.mov
MacOS: Desktop
Screen.Recording.2024-09-30.at.2.07.50.PM.mov

@allgandalf
Copy link
Contributor

@BhuvaneshPatil why is there so much padding in offline mode?

Screenshot 2024-09-15 at 2 19 14 PM

@BhuvaneshPatil
Copy link
Contributor Author

#48179 (comment)

I checked on other pages as well on IOS. Example Description page for Track Expense option we have that extra padding there as well. It is also due to safe are padding. What do you think shall we continue having that padding here as well?

Screenshot 2024-09-15 at 3 59 58 PM

We add padding bottom to button on IOS

@allgandalf
Copy link
Contributor

@BhuvaneshPatil this has conflicts

@BhuvaneshPatil
Copy link
Contributor Author

yes, resolving.

@allgandalf
Copy link
Contributor

@BhuvaneshPatil is this ready for review again?

@BhuvaneshPatil
Copy link
Contributor Author

Yes

@@ -2,12 +2,12 @@ import React from 'react';
import BaseOnboardingWork from './BaseOnboardingWork';
import type {OnboardingWorkProps} from './types';

function OnboardingWork({...rest}: Omit<OnboardingWorkProps, 'shouldUseNativeStyles'>) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't understand why are these changes required ?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was getting lint failure because of withOnyx so I migrated that. After that it started giving lint error for this line. So I solved it. Let me know if I should undo the changes for withOnyx hook

@@ -5,15 +5,15 @@ import useThemeStyles from '@hooks/useThemeStyles';
import BaseOnboardingWork from './BaseOnboardingWork';
import type {OnboardingWorkProps} from './types';

function OnboardingWork({...rest}: Omit<OnboardingWorkProps, 'shouldUseNativeStyles'>) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same as ^

const styles = useThemeStyles();
return (
<FocusTrapForScreens>
<View style={styles.h100}>
<BaseOnboardingWork
shouldUseNativeStyles={false}
// eslint-disable-next-line react/jsx-props-no-spreading
{...rest}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same as ^

@allgandalf
Copy link
Contributor

I was getting lint failure because of withOnyx so I migrated that. After that it started giving lint error for this line. So I solved it. Let me know if I should undo the changes for withOnyx hook

oh is it then i guess its fine, but we need to make sure we have the latest videos attached, can you update videos on all platforms as this PR has changed a lot from the initial PR, we need to make sure there are no regressions here

@BhuvaneshPatil
Copy link
Contributor Author

I have updated latest screenshots on all platforms

@BhuvaneshPatil
Copy link
Contributor Author

@allgandalf ^^

@allgandalf
Copy link
Contributor

sorry, I was super occupied in the co-pilot, workspace feed, and Onboarding refactor work this week, I will surely complete the checklist over the weekend. thanks for understanding @BhuvaneshPatil .

Copy link
Contributor

@allgandalf allgandalf left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM and tests well !

@melvin-bot melvin-bot bot requested a review from aldo-expensify September 30, 2024 09:01
@aldo-expensify aldo-expensify merged commit 61e1cdb into Expensify:main Oct 1, 2024
18 of 20 checks passed
@OSBotify
Copy link
Contributor

OSBotify commented Oct 1, 2024

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

Copy link
Contributor

github-actions bot commented Oct 2, 2024

🚀 Deployed to staging by https://github.com/aldo-expensify in version: 9.0.43-0 🚀

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

1 similar comment
Copy link
Contributor

github-actions bot commented Oct 2, 2024

🚀 Deployed to staging by https://github.com/aldo-expensify in version: 9.0.43-0 🚀

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

Copy link
Contributor

github-actions bot commented Oct 3, 2024

🚀 Deployed to production by https://github.com/jasperhuangg in version: 9.0.43-6 🚀

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants