Fix: Current currency is not highlighted and not marked #18059

dukenv0307 · 2023-04-27T03:15:19Z

Details

Current currency is not highlighted and not marked

Fixed Issues

$ #17372
PROPOSAL: #17372 (comment)

Tests

Login with any account
Click on plus icon button
Select send money option
Click on currency to go to select currency page
Verify that current currency is highlighted, marked with ✔️ and focused

Verify that no errors appear in the JS console

Offline tests

QA Steps

Login with any account
Click on plus icon button
Select send money option
Click on currency to go to select currency page
Verify that current currency is highlighted, marked with ✔️ and focused

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 / Chrome
- iOS / native
- iOS / 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 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 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 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 author checklist, including those that don't apply to this PR.

Screenshots/Videos

Web

Screencast.2023-04-27.10.26.47.mp4

Mobile Web - Chrome

Record_2023-04-27-10-28-54.mp4

Mobile Web - Safari

processed-2B8DF3FF-BC97-465A-9681-167E10A470DC-992FC4B4-A6FB-45B3-A234-B9205555477C.mp4

Desktop

Screen.Recording.2023-04-27.at.16.29.22.mov

iOS

Screen.Recording.2023-04-27.at.16.27.10.mov

Android

17372.mp4

MelvinBot · 2023-04-27T04:01:35Z

@iwiznia @rushatgabhane One of you needs to 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]

dukenv0307 · 2023-04-27T04:04:40Z

src/pages/iou/IOUCurrencySelection.js

@@ -127,6 +145,7 @@ class IOUCurrencySelection extends Component {
                            placeholderText={this.props.translate('common.search')}
                            headerMessage={headerMessage}
                            safeAreaPaddingBottomStyle={safeAreaPaddingBottomStyle}
+                            initiallyFocusedOptionKey={_.get(_.find(this.state.currencyData, crc => crc.currencyCode === this.props.iou.selectedCurrencyCode), 'keyForList')}


@iwiznia @rushatgabhane I added initiallyFocusedOptionKey prop to OptionsSelector to focus to the current currency instead of the first currency in list when we go to this page

nice touch!

rushatgabhane · 2023-04-27T06:45:43Z

src/pages/iou/IOUCurrencySelection.js

@@ -79,6 +95,8 @@ class IOUCurrencySelection extends Component {
            text: `${currencyCode} - ${CurrencySymbolUtils.getLocalizedCurrencySymbol(this.props.preferredLocale, currencyCode)}`,
            currencyCode,
            keyForList: currencyCode,
+            customIcon: currencyCode === this.props.iou.selectedCurrencyCode ? greenCheckmark : undefined,
+            boldStyle: currencyCode === this.props.iou.selectedCurrencyCode,


NAB (polish): create a variable isSelectedCurrency and use that instead.

Suggested change

boldStyle: currencyCode === this.props.iou.selectedCurrencyCode,

customIcon: isSelectedCurrency ? greenCheckmark : undefined

boldStyle: isSelectedCurrency,

rushatgabhane · 2023-04-27T06:49:40Z

src/pages/iou/IOUCurrencySelection.js

@@ -127,6 +145,7 @@ class IOUCurrencySelection extends Component {
                            placeholderText={this.props.translate('common.search')}
                            headerMessage={headerMessage}
                            safeAreaPaddingBottomStyle={safeAreaPaddingBottomStyle}
+                            initiallyFocusedOptionKey={_.get(_.find(this.state.currencyData, crc => crc.currencyCode === this.props.iou.selectedCurrencyCode), 'keyForList')}


crc => crc.currencyCode
nitpick: @dukenv0307 could you please rename crc to something more descriptive and meaningful? 🙇

I don't have a suggestion because I don't know what crc means

@rushatgabhane crc means currency

cool, let's rename it to currency

dukenv0307 · 2023-04-27T07:04:19Z

@rushatgabhane I just updated, please help to check again

rushatgabhane · 2023-04-27T21:50:33Z

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 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

Mobile Web - Chrome

Mobile Web - Safari

Desktop

iOS

Android

rushatgabhane

@iwiznia LGTM!

OSBotify · 2023-04-28T16:30:27Z

✋ 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-05-03T00:08:14Z

🚀 Deployed to staging by https://github.com/iwiznia in version: 1.3.9-12 🚀

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

OSBotify · 2023-05-09T04:08:13Z

🚀 Deployed to production by https://github.com/roryabraham in version: 1.3.12-0 🚀

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

dukenv0307 added 2 commits April 27, 2023 10:09

highlight and mark current currency

cb98417

use find instead of filter

b0c03d0

dukenv0307 marked this pull request as ready for review April 27, 2023 04:01

dukenv0307 requested a review from a team as a code owner April 27, 2023 04:01

melvin-bot bot requested review from iwiznia and rushatgabhane and removed request for a team April 27, 2023 04:01

dukenv0307 commented Apr 27, 2023

View reviewed changes

rushatgabhane reviewed Apr 27, 2023

View reviewed changes

rename crc variable

3673785

iwiznia approved these changes Apr 27, 2023

View reviewed changes

rushatgabhane approved these changes Apr 27, 2023

View reviewed changes

iwiznia merged commit f7f7480 into Expensify:main Apr 28, 2023

OSBotify mentioned this pull request May 2, 2023

Deploy Checklist: New Expensify 2023-05-02 #18315

Closed

marcaaron mentioned this pull request May 3, 2023

Deploy Checklist: New Expensify 2023-05-02 #18322

Closed

59 tasks

melvin-bot bot mentioned this pull request May 9, 2023

[HOLD for BugZero Checklist] [$1000] current currency is not highlighted and not marked with ✔️ #17372

Closed

6 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix: Current currency is not highlighted and not marked #18059

Fix: Current currency is not highlighted and not marked #18059

dukenv0307 commented Apr 27, 2023 •

edited

Loading

MelvinBot commented Apr 27, 2023

dukenv0307 Apr 27, 2023

rushatgabhane Apr 27, 2023

rushatgabhane Apr 27, 2023

rushatgabhane Apr 27, 2023 •

edited

Loading

dukenv0307 Apr 27, 2023

rushatgabhane Apr 27, 2023

dukenv0307 commented Apr 27, 2023

rushatgabhane commented Apr 27, 2023 •

edited

Loading

rushatgabhane left a comment

OSBotify commented Apr 28, 2023

OSBotify commented May 3, 2023

OSBotify commented May 9, 2023

	boldStyle: currencyCode === this.props.iou.selectedCurrencyCode,
	customIcon: isSelectedCurrency ? greenCheckmark : undefined
	boldStyle: isSelectedCurrency,

Fix: Current currency is not highlighted and not marked #18059

Fix: Current currency is not highlighted and not marked #18059

Conversation

dukenv0307 commented Apr 27, 2023 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

MelvinBot commented Apr 27, 2023

dukenv0307 Apr 27, 2023

Choose a reason for hiding this comment

rushatgabhane Apr 27, 2023

Choose a reason for hiding this comment

rushatgabhane Apr 27, 2023

Choose a reason for hiding this comment

rushatgabhane Apr 27, 2023 • edited Loading

Choose a reason for hiding this comment

dukenv0307 Apr 27, 2023

Choose a reason for hiding this comment

rushatgabhane Apr 27, 2023

Choose a reason for hiding this comment

dukenv0307 commented Apr 27, 2023

rushatgabhane commented Apr 27, 2023 • edited Loading

Reviewer Checklist

Screenshots/Videos

rushatgabhane left a comment

Choose a reason for hiding this comment

OSBotify commented Apr 28, 2023

OSBotify commented May 3, 2023

OSBotify commented May 9, 2023

dukenv0307 commented Apr 27, 2023 •

edited

Loading

rushatgabhane Apr 27, 2023 •

edited

Loading

rushatgabhane commented Apr 27, 2023 •

edited

Loading