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

Add caret icon next to currency select button #35637

Merged
merged 5 commits into from
Feb 9, 2024

Conversation

BryceAltman
Copy link
Contributor

Details

Added caret icon next to currency select button

Fixed Issues

$ #35170
PROPOSAL: #35170 (comment)

Tests

Same as QA

  • Verify that no errors appear in the JS console

Offline tests

Same as QA

QA Steps

  1. Click actions
  2. Select request money
  3. Select manual
  4. Confirm caret icon is shown in the correct location next to currency select
  5. Change theme and repeat steps
  6. Repeat with split bill action
  • 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 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 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 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.

Screenshots/Videos

Android: Native Screenshot 2024-02-02 at 3 51 27 pm Screenshot 2024-02-02 at 3 50 47 pm
Android: mWeb Chrome Screenshot 2024-02-02 at 4 45 23 pm Screenshot 2024-02-02 at 4 44 58 pm
iOS: Native Screenshot 2024-02-02 at 2 23 14 pm Screenshot 2024-02-02 at 2 22 41 pm
iOS: mWeb Safari Screenshot 2024-02-02 at 2 23 14 pm Screenshot 2024-02-02 at 2 22 41 pm
MacOS: Chrome / Safari Screenshot 2024-02-02 at 4 02 00 pm
MacOS: Desktop Screenshot 2024-02-02 at 4 03 32 pm

@BryceAltman BryceAltman requested a review from a team as a code owner February 2, 2024 05:59
@melvin-bot melvin-bot bot removed the request for review from a team February 2, 2024 05:59
Copy link

melvin-bot bot commented Feb 2, 2024

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

@melvin-bot melvin-bot bot requested a review from jjcoffee February 2, 2024 05:59
Copy link
Contributor

github-actions bot commented Feb 2, 2024

CLA Assistant Lite bot All contributors have signed the CLA ✍️ ✅

@BryceAltman
Copy link
Contributor Author

I have read the CLA Document and I hereby sign the CLA

@jjcoffee
Copy link
Contributor

jjcoffee commented Feb 2, 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

image
image

Android: mWeb Chrome

image
image

iOS: Native

image image

iOS: mWeb Safari

image
image

MacOS: Chrome / Safari

image image

MacOS: Desktop

image

desktop-app-2024-02-02_15.14.27.mp4

@jjcoffee

This comment was marked as outdated.

@jjcoffee
Copy link
Contributor

jjcoffee commented Feb 2, 2024

@BryceAltman Thanks for raising the PR! I think the caret is a little too tight up against the currency symbol, especially here:

image

Could you add a bit of spacing to match closer to the designs in the issue?

@dannymcclain
Copy link
Contributor

I think it's lookin' pretty good!

Just for reference re: the spacing, I have 4px of space between the caret and the currency symbol.

@BryceAltman
Copy link
Contributor Author

Made suggested changes @jjcoffee

Removed the view and added the spacing :)

@jjcoffee
Copy link
Contributor

jjcoffee commented Feb 5, 2024

@BryceAltman Sorry, just noticed your commits are not signed. Per our contributing guide we require all commits to be signed. Can you do that please?

@BryceAltman
Copy link
Contributor Author

@BryceAltman Sorry, just noticed your commits are not signed. Per our contributing guide we require all commits to be signed. Can you do that please?

Apologies, didn't realise my signing wasn't working. All fixed now :)

@jjcoffee
Copy link
Contributor

jjcoffee commented Feb 5, 2024

@BryceAltman All previous commits need to be signed too.

@BryceAltman
Copy link
Contributor Author

@BryceAltman All previous commits need to be signed too.

I'm not aware of a way to sign old commits without needing to force push, which the contributing guide advises against to keep all review history. But if you're happy for me to I can rebase and commit again with a signed commit.

Or if you know another method let me know :)

@jjcoffee
Copy link
Contributor

jjcoffee commented Feb 6, 2024

@BryceAltman I think we'll allow it in this case 😄

@jjcoffee
Copy link
Contributor

jjcoffee commented Feb 6, 2024

@BryceAltman Or you can try this.

@BryceAltman
Copy link
Contributor Author

@BryceAltman Or you can try this.

Still haven't been accepted to the slack, emailed last week and just bumped again

@jjcoffee
Copy link
Contributor

jjcoffee commented Feb 7, 2024

Ah apologies I hadn't realised. It's fine for you to force push anyway in this case, but here are the instructions in case you're curious!

I added this alias to my ~/.gitconfig and it worked like a charm:

retro-sign = -c core.editor=true rebase --exec 'git commit --amend --no-edit -n -S' -i

Then (once you have commit signing configured) use it like this:

git retro-sign COMMIT_HASH

That will retroactively sign all the commits between the COMMIT_HASH you specified and the current HEAD, all automatically without having to open any editors

@BryceAltman
Copy link
Contributor Author

Ah apologies I hadn't realised. It's fine for you to force push anyway in this case, but here are the instructions in case you're curious!

I added this alias to my ~/.gitconfig and it worked like a charm:

retro-sign = -c core.editor=true rebase --exec 'git commit --amend --no-edit -n -S' -i

Then (once you have commit signing configured) use it like this:

git retro-sign COMMIT_HASH

That will retroactively sign all the commits between the COMMIT_HASH you specified and the current HEAD, all automatically without having to open any editors

Awesome that worked! Thanks :)

@jjcoffee
Copy link
Contributor

jjcoffee commented Feb 8, 2024

Hmm the commits tab is still showing one initial commit as unverified, can you check you resigned all commits? @BryceAltman

@BryceAltman
Copy link
Contributor Author

@jjcoffee Yep, all good now?

Copy link
Contributor

@jjcoffee jjcoffee left a comment

Choose a reason for hiding this comment

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

LGTM!

@melvin-bot melvin-bot bot requested a review from dangrous February 8, 2024 13:16
dangrous
dangrous previously approved these changes Feb 8, 2024
Copy link
Contributor

@dangrous dangrous left a comment

Choose a reason for hiding this comment

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

Looks great!

@dangrous
Copy link
Contributor

dangrous commented Feb 8, 2024

oops, @BryceAltman can you run npm run prettier so the linter is happy? My guess is it's those spaces inside the brackets but I'm not sure. Thanks!

@BryceAltman
Copy link
Contributor Author

oops, @BryceAltman can you run npm run prettier so the linter is happy? My guess is it's those spaces inside the brackets but I'm not sure. Thanks!

Yep done!

@BryceAltman
Copy link
Contributor Author

Updated

Copy link
Contributor

@dangrous dangrous left a comment

Choose a reason for hiding this comment

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

Great!

@dangrous dangrous merged commit 7defd02 into Expensify:main Feb 9, 2024
16 checks passed
@OSBotify
Copy link
Contributor

OSBotify commented Feb 9, 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.

@OSBotify
Copy link
Contributor

🚀 Deployed to staging by https://github.com/dangrous in version: 1.4.40-0 🚀

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

@OSBotify
Copy link
Contributor

🚀 Deployed to production by https://github.com/mountiny in version: 1.4.40-5 🚀

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

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