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: Incorrect numpad horizontal padding on the native and mweb devices. #38542

Merged
merged 5 commits into from
Apr 4, 2024

Conversation

Krishna2323
Copy link
Contributor

Details

Fixed Issues

$ #38523
PROPOSAL: #38523 (comment)

Tests

  1. Have Collect workspace supported in NewDot
  2. Go to Settings
  3. More feature
  4. Turn on Tax feature
  5. Go to taxes
  6. Add new tax rate
  7. Add value
  8. Verify that the number pad takes up the same width as the Save button.
  • Verify that no errors appear in the JS console

Offline tests

  1. Have Collect workspace supported in NewDot
  2. Go to Settings
  3. More feature
  4. Turn on Tax feature
  5. Go to taxes
  6. Add new tax rate
  7. Add value
  8. Verify that the number pad takes up the same width as the Save button.

QA Steps

  1. Have Collect workspace supported in NewDot
  2. Go to Settings
  3. More feature
  4. Turn on Tax feature
  5. Go to taxes
  6. Add new tax rate
  7. Add value
  8. Verify that the number pad takes up the same width as the Save button.
  • 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_native_MR_form android_native_tax_form
Android: mWeb Chrome android_chrome_MR_form android_chrome_tax_form
iOS: Native ios_native_MR_form ios_native_tax_form
iOS: mWeb Safari ios_safari_MR_form ios_safari_tax_form
MacOS: Chrome / Safari web_chrom_MR_form web_chrome_tax_form
MacOS: Desktop desktop_app_MR_form desktop_app_tax_form

@Krishna2323 Krishna2323 requested a review from a team as a code owner March 18, 2024 22:54
@melvin-bot melvin-bot bot requested review from abdulrahuman5196 and removed request for a team March 18, 2024 22:54
Copy link

melvin-bot bot commented Mar 18, 2024

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

@mountiny
Copy link
Contributor

cc @Expensify/design can you please double check? I mean this PR should fix the tax value modal to mach request money

@dubielzyk-expensify
Copy link
Contributor

They look identical to me, but is there a reason why the offline indicator is in a separate spot? Let's fix that by putting it in the same spot. I prefer the "tax numpad" placement, but given the "request money numpad" is likely canonical, I'd say use that as the guide.

CleanShot 2024-03-19 at 10 03 18@2x
(left: request money, right: tax)

@mountiny
Copy link
Contributor

@Krishna2323 Can you look into that too?

@Krishna2323
Copy link
Contributor Author

updating in a hour.

@shawnborton
Copy link
Contributor

Good catch @dubielzyk-expensify!

@Krishna2323
Copy link
Contributor Author

@mountiny, I need sometime to investigate the other issue, it seems like the modals (pickers) doesn't take the full height.

The empty space at the bottom shouldn't be there.
Monosnap iPhone 15 Plus 2024-03-19 19-41-46

@Krishna2323
Copy link
Contributor Author

@shawnborton @dubielzyk-expensify, could you please confirm which of them is expected? It seems like the tax amount form isn't the expected one since we display the offline text at the very bottom of the page on almost every page.

@shawnborton
Copy link
Contributor

Hmm, hard to say. Perhaps the version on tax is correct because it has the correct amount of space for the safe area above the iOS home bar? Or perhaps the request money flow has that gap there for form validation?

@abdulrahuman5196
Copy link
Contributor

Seems we need to confirm if the screenshots added are accepted from design. Will continue review once the same is done.

@Krishna2323
Copy link
Contributor Author

Krishna2323 commented Mar 23, 2024

Hey @mountiny, @shawnborton @dubielzyk-expensify @abdulrahuman5196, I've been diving deep into the code and stumbled upon something interesting. So, there's this component called AvatarCropModal, kind of like AmountSelectorModal, which uses modals as well. What caught my attention is how it uses style={[styles.pb0]} to fill up the whole height. And when I applied the same style to AmountSelectorModal within the ScreenWrapper, the offline message ended up aligning at the bottom, just like in RequestMoneyForm.

While checking things out, I noticed that the submit buttons/forms within modals don't have enough bottom padding in offline mode. Took a closer look and found out that most forms, including RequestMoneyForm, make use of SafeAreaConsumer to set up that padding bottom. But these modal forms, like AmountSelectorModal, TextSelectorModal, & AvatarCropModal, don't use it. So, there's this inconsistency we gotta address. Thoughts?

Online/Offline Request Money Tax Amount Input Avatar Crop Modal Text Selector Modal
Online 23M_request_money_form 23M_tax_form avatar_picker_modal text_selector
Offline 23M_request_money_form_offline 23M_tax_form_offline avatar_picker_modal_offline text_selector_offline

@dubielzyk-expensify
Copy link
Contributor

This is awesome investigation, @Krishna2323 👏 ! I definitely think we should apply SafeArea to the ones that don't have it, but the spacing here is still awkward to me:
image

Here's my take on what it should ideally look like:
CleanShot 2024-03-25 at 09 40 07@2x

Which gives us with some outlines:
CleanShot 2024-03-25 at 09 40 30@2x

I'm not sure what the spacing is on our offline component at the moment though?

Keen to hear what @Expensify/design thinks before we go and change anything

@shawnborton
Copy link
Contributor

Yeah, I like Jon's mocks above as it reduces the extra space below the green button and above the offline indicator.

@dannymcclain
Copy link
Contributor

Same here. I like what Jon has proposed.

@Krishna2323
Copy link
Contributor Author

@mountiny, I believe the above issue will require a lot of changes and testing. Can we create a new issue for the second design bug with a regular bounty? I've already spent a lot of time on investigation.

@mountiny
Copy link
Contributor

@Krishna2323 Alright, can you prepare only the horizontal problem fix in this PR and we will look into the rest on separate issue for $250.

@mountiny
Copy link
Contributor

@abdulrahuman5196 can you complete the review on this one please?

@Krishna2323
Copy link
Contributor Author

Krishna2323 commented Mar 29, 2024

@mountiny sure, Thanks!
This PR is ready for C+ review.

@abdulrahuman5196
Copy link
Contributor

Checking now

@abdulrahuman5196
Copy link
Contributor

@Krishna2323 The horizontal padding is fixed. But I am now seeing more padding between numpad and the action button and with action button and bottom. The space is high compared to request money and as well as pre-existing padding.

Screen.Recording.2024-04-01.at.5.17.09.PM.mov

@shawnborton
Copy link
Contributor

Good catch @abdulrahuman5196 - I agree with that

@mountiny
Copy link
Contributor

mountiny commented Apr 2, 2024

@Krishna2323 can you please address this comment?

@Krishna2323
Copy link
Contributor Author

@abdulrahuman5196 thanks for the testing. I mistakenly added vertical margin while fixing the second issue. Pushed the updated code.

@mountiny
Copy link
Contributor

mountiny commented Apr 3, 2024

@abdulrahuman5196 can you please complete the testing and checklist on this one?

@abdulrahuman5196
Copy link
Contributor

Hi, will check in an hour.

@abdulrahuman5196
Copy link
Contributor

abdulrahuman5196 commented Apr 3, 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 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(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 form input styles:
    • I verified that all the inputs inside a form are aligned with each other.
    • I added Design label 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 Screenshot 2024-04-04 at 12 28 09 AM
Android: mWeb Chrome Screenshot 2024-04-04 at 12 30 07 AM
iOS: Native Screenshot 2024-04-04 at 12 26 29 AM
iOS: mWeb Safari Screenshot 2024-04-04 at 12 27 20 AM
MacOS: Chrome / Safari Screenshot 2024-04-04 at 12 20 36 AM
MacOS: Desktop Screenshot 2024-04-04 at 12 22 53 AM

Copy link
Contributor

@abdulrahuman5196 abdulrahuman5196 left a comment

Choose a reason for hiding this comment

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

Changes looks good and works well. Reviewers checklist is also complete.

All yours. @mountiny

🎀 👀 🎀
C+ Reviewed

@melvin-bot melvin-bot bot requested a review from mountiny April 3, 2024 19:03
@mountiny
Copy link
Contributor

mountiny commented Apr 3, 2024

@dubielzyk-expensify @shawnborton do you want to give this a final approval before I merge it?

Copy link
Contributor

@dubielzyk-expensify dubielzyk-expensify left a comment

Choose a reason for hiding this comment

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

Looks good on the design end. Good work!

Copy link
Contributor

@mountiny mountiny left a comment

Choose a reason for hiding this comment

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

thanks everyone!

@mountiny mountiny merged commit 3644018 into Expensify:main Apr 4, 2024
17 checks passed
@OSBotify
Copy link
Contributor

OSBotify commented Apr 8, 2024

🚀 Deployed to staging by https://github.com/mountiny in version: 1.4.61-0 🚀

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

@OSBotify
Copy link
Contributor

OSBotify commented Apr 8, 2024

🚀 Deployed to staging by https://github.com/mountiny in version: 1.4.61-0 🚀

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

@OSBotify
Copy link
Contributor

🚀 Deployed to production by https://github.com/Julesssss in version: 1.4.61-8 🚀

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.

7 participants