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 implement recently used currencies #41834

Merged
merged 31 commits into from
Sep 12, 2024
Merged

Conversation

DylanDylann
Copy link
Contributor

@DylanDylann DylanDylann commented May 8, 2024

Details

Fixed Issues

$ #34874
PROPOSAL: #34874 (comment)

Tests

Test 1

  1. Open app.
  2. Open any workspace and create a manual expense with any currency.
  3. Open the above workspace and click on "Submit expense" then "Manual".
  4. On the amount page, click on the current.
  5. Verify that the currency in step 2 is displayed in "Recents" section.

Test 2

  1. Open app.
  2. Open FAB then "Submit expense", choose "Manual" then submit an expense with any user.
  3. Open FAB then "Submit expense", choose "Manual".
  4. On the amount page, click on the current.
  5. Verify that the currency in step 2 is displayed in "Recents" section.
  • 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
Screen.Recording.2024-05-09.at.11.24.44.mov
Android: mWeb Chrome
Screen.Recording.2024-05-09.at.11.05.22.mov
iOS: Native
Screen.Recording.2024-05-09.at.11.16.32.mov
iOS: mWeb Safari
Screen.Recording.2024-05-09.at.11.02.21.mov
MacOS: Chrome / Safari
Screen.Recording.2024-05-09.at.10.50.39.mov
MacOS: Desktop
output.mp4

@DylanDylann DylanDylann requested a review from a team as a code owner May 8, 2024 12:00
@melvin-bot melvin-bot bot requested review from getusha and removed request for a team May 8, 2024 12:00
Copy link

melvin-bot bot commented May 8, 2024

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

@getusha
Copy link
Contributor

getusha commented May 12, 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
  • [ x 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-08-14.at.12.54.00.in.the.afternoon.mov
Android: mWeb Chrome
Screen.Recording.2024-08-14.at.12.34.04.in.the.afternoon.mov
iOS: Native
Screen.Recording.2024-08-14.at.12.45.25.in.the.afternoon.mov
iOS: mWeb Safari
Screen.Recording.2024-08-14.at.12.41.35.in.the.afternoon.mov
MacOS: Chrome / Safari
Screen.Recording.2024-09-06.at.12.33.16.in.the.afternoon.mov
Screen.Recording.2024-08-14.at.11.59.43.in.the.morning.mov
MacOS: Desktop
Screen.Recording.2024-09-06.at.1.06.55.in.the.afternoon.mov

@getusha
Copy link
Contributor

getusha commented May 14, 2024

@DylanDylann the currency is not showing in recents if i don't change the default one, could you check?

Screen.Recording.2024-05-14.at.6.53.43.in.the.evening.mov

@DylanDylann
Copy link
Contributor Author

@getusha The recentlyUsedCurrencies are stored for each policy. I see in your video, in the 2nd creating expense, we cannot define the policy so there is no recentlyUsedCurrencies.

@DylanDylann
Copy link
Contributor Author

@getusha Do you have any feedback about comment here?

@getusha
Copy link
Contributor

getusha commented May 19, 2024

@DylanDylann could you please expand your statement?

it means we can't have recently used currencies on a p2p requests?

@DylanDylann
Copy link
Contributor Author

we can't have recently used currencies on a p2p requests?

Yes, I think so

@getusha
Copy link
Contributor

getusha commented May 20, 2024

@thienlnam i think we should handle this case too, wdyt?

@DylanDylann
Copy link
Contributor Author

@thienlnam Do you have any feedback about comment?

@DylanDylann
Copy link
Contributor Author

@thienlnam Can you help check this?

@thienlnam
Copy link
Contributor

Just came back from OOO, I also think we should support it for P2P payments - is there a specific reason we wouldn't? There are still some cases in the BE that need to be updated to actually update the recently used currency but we should support it in the FE

@DylanDylann
Copy link
Contributor Author

@thienlnam

There are still some cases in the BE that need to be updated

Can you provide the structure of the recently used currencies that will be returned by the backend? This will allow me to make the necessary changes on the frontend accordingly.

@thienlnam
Copy link
Contributor

It will be the same as before as mentioned here #34874 (comment)

@DylanDylann
Copy link
Contributor Author

@thienlnam I mean with the P2p request, which key do we use to get the recently used currencies? In case the workspace, we use policyID.

@DylanDylann
Copy link
Contributor Author

@thienlnam Can you check my question?

@thienlnam
Copy link
Contributor

Ah good question, the current plan is to prefix the onyx key with the personal policy ID so it remains in that format for P2P requests

@DylanDylann
Copy link
Contributor Author

@getusha I addressed this #41834 (comment), please help review the PR.

@getusha
Copy link
Contributor

getusha commented Jun 13, 2024

@DylanDylann ts check is failing

@getusha
Copy link
Contributor

getusha commented Jun 13, 2024

@DylanDylann it's not working for me, is there any pre-requisite could you check again?

Screen.Recording.2024-06-13.at.11.10.44.in.the.morning.mov

@getusha
Copy link
Contributor

getusha commented Jun 18, 2024

Bump @DylanDylann, we also have a conflict and ts check failing.

@DylanDylann
Copy link
Contributor Author

Thanks for bump. I missed the notification. I will try to update asap

@DylanDylann
Copy link
Contributor Author

@getusha I updated PR to fix the conflict and applied your suggestion codes.

lets update the testing steps since you need to have 2 recently selected currencies for the Recents section to appear.

Updated test steps.

should we add recently used currencies section when submitting expense from the global create?

This has already been handled and I updated test steps to cover this case.

@DylanDylann
Copy link
Contributor Author

@getusha In case you miss it, PR is ready to review again.

@getusha
Copy link
Contributor

getusha commented Aug 25, 2024

This has already been handled and I updated test steps to cover this case.

@DylanDylann i am not able to see the recents section when i submit from global action

Screen.Recording.2024-08-25.at.1.58.29.in.the.afternoon.mov

@DylanDylann
Copy link
Contributor Author

@getusha I noticed in your video that you created an expense from the global action, which was then sent to a workspace. As a result, the recently used currency applies to the target workspace, not the personal workspace.

To apply the recently used currency to your personal workspace, you can create and submit the expense directly to an individual user instead of a workspace.

@DylanDylann
Copy link
Contributor Author

@getusha PR is updated

Copy link
Contributor

@getusha getusha 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, one minor comment

Comment on lines 4256 to 4257
// Add currency to optimistic policy recently used currencies when a participant is a workspace
const optimisticPolicyRecentlyUsedCurrencies = isPolicyExpenseChat ? Policy.buildOptimisticPolicyRecentlyUsedCurrencies(currency) : [];
Copy link
Contributor

Choose a reason for hiding this comment

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

do we need this condition? and i think it's better to rename the function

Copy link
Contributor Author

Choose a reason for hiding this comment

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

You are correct, I removed that condition and renamed the function

Copy link
Contributor

Choose a reason for hiding this comment

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

thanks!

@melvin-bot melvin-bot bot requested a review from thienlnam September 10, 2024 14:25
mountiny
mountiny previously approved these changes Sep 10, 2024
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.

Small NAB comments

src/libs/actions/IOU.ts Outdated Show resolved Hide resolved
src/libs/actions/IOU.ts Outdated Show resolved Hide resolved
src/components/CurrencySelectionList/index.tsx Outdated Show resolved Hide resolved
? [{data: filteredCurrencies.filter((currency) => currency.isSelected)}, {data: filteredCurrencies.filter((currency) => !currency.isSelected)}]
: [{data: filteredCurrencies}];
if (shouldDisplayRecentlyOptions) {
const cutPolicyRecentlyUsedCurrencyOptions = policyRecentlyUsedCurrencyOptions.slice(0, CONST.IOU.MAX_RECENT_REPORTS_TO_SHOW);
Copy link
Contributor

Choose a reason for hiding this comment

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

You can remove this - this is limited in the BE and will only grow to 5

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 think we still need this logic in case of offline mode.

Copy link
Contributor

Choose a reason for hiding this comment

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

If that's the case, we should handle that in buildOptimisticRecentlyUsedCurrencies so we don't have to keep this logic so anywhere that uses / shows the recently used currency option can just use it directly

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

Copy link
Contributor

@thienlnam thienlnam left a comment

Choose a reason for hiding this comment

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

Great, thanks!

@thienlnam thienlnam merged commit ef6a64c into Expensify:main Sep 12, 2024
15 checks passed
@OSBotify
Copy link
Contributor

✋ 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/thienlnam in version: 9.0.34-0 🚀

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

@OSBotify
Copy link
Contributor

🚀 Deployed to production by https://github.com/luacmartins in version: 9.0.34-3 🚀

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.

8 participants