Feature: Import/Export Per Diem Rates #52209

shubham1206agra · 2024-11-07T18:16:09Z

Explanation of Change

Fixed Issues

Tests

Go to a workspace where per diem is enabled.
Go to Per diem page.

(If rates are empty)
3. Click on import spreadsheet from either empty modal or three dot menu.
4. Upload a valid spreadsheet for per diem rates.
5. Click on Import.

(If there are rates available)
3. Click on Download CSV to download the rates.

Verify that no errors appear in the JS console

Offline tests

NA

QA Steps

Same as Tests

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

Screen.Recording.2024-11-21.at.3.54.20.PM.mov

iOS: Native

Screen.Recording.2024-11-21.at.4.04.48.PM.mov

iOS: mWeb Safari

Screen.Recording.2024-11-21.at.3.43.53.PM.mov

MacOS: Chrome / Safari

Screen.Recording.2024-11-21.at.3.32.46.PM.mov

MacOS: Desktop

Screen.Recording.2024-11-21.at.4.00.54.PM.mov

shubham1206agra · 2024-11-14T05:10:48Z

@Gonals Can you please let me know when export command is deployed for testing?

melvin-bot · 2024-11-21T10:54:59Z

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

shubham1206agra · 2024-11-21T10:55:26Z

@thesahindia Please ignore this PR.

@c3024 Can you please do the review here?

c3024

Commenting so that it appears on my K2.

Gonals · 2024-11-22T15:06:26Z

Lots of conflicts!

shubham1206agra · 2024-11-22T17:03:14Z

@c3024 @Gonals Conflicts fixed

c3024

If one of the currencies in the rates in spreadsheet is not valid the app crashes

Screen.Recording.2024-11-23.at.3.13.42.PM.mov

because of this

App/src/libs/NumberFormatUtils/index.ts

Line 8 in 3ebe852

    
           const MemoizedNumberFormat = memoize(Intl.NumberFormat, {maxSize: 10, monitoringName: 'NumberFormatUtils'});

One way to fix this is sanitize the currency here

App/src/libs/NumberFormatUtils/index.ts

Lines 9 to 16 in 3ebe852

    
           function format(locale: ValueOf<typeof CONST.LOCALES>, number: number, options?: Intl.NumberFormatOptions): string { 
        
               return new MemoizedNumberFormat(locale, options).format(number); 
        
           } 
        
           function formatToParts(locale: ValueOf<typeof CONST.LOCALES>, number: number, options?: Intl.NumberFormatOptions): Intl.NumberFormatPart[] { 
        
               return new MemoizedNumberFormat(locale, options).formatToParts(number); 
        
           }

with

const sanitizedCurrency = (currency: string): string => Intl.supportedValuesOf('currency').includes(currency) ? currency : CONSTANT.CURRENCY.USD;

function format(locale: ValueOf<typeof CONST.LOCALES>, number: number, options?: Intl.NumberFormatOptions): string {
    if (options?.style === 'currency') {
        options.currency = sanitizedCurrency(options.currency ?? CONSTANT.CURRENCY.USD);
    }
    return new MemoizedNumberFormat(locale, options).format(number);
}

function formatToParts(locale: ValueOf<typeof CONST.LOCALES>, number: number, options?: Intl.NumberFormatOptions): Intl.NumberFormatPart[] {
    if (options?.style === 'currency') {
        options.currency = sanitizedCurrency(options.currency ?? CONSTANT.CURRENCY.USD);
    }
    return new MemoizedNumberFormat(locale, options).formatToParts(number);
}

shubham1206agra · 2024-11-24T14:09:03Z

@c3024 Have you checked the flow with iOS/Android native device? Can you please check if not yet checked?

c3024 · 2024-11-25T06:05:10Z

It fails on iOS too and this suggestion of using Intl.supportedValuesOf also fails on iOS and it throws an error because it is not supported. I think we can use ONYXKEYS.CURRENCY_LIST to check if the currency is a valid string instead of Intl.supportedValuesOf.

shubham1206agra · 2024-11-25T06:42:20Z

src/pages/workspace/perDiem/ImportedPerDiemPage.tsx

+                errors={isValidationEnabled ? validate() : undefined}
+                columnRoles={columnRoles}
+                isButtonLoading={isImportingPerDiemRates}
+                learnMoreLink={CONST.IMPORT_SPREADSHEET.CATEGORIES_ARTICLE_LINK}


@Gonals Can you provide me a link to put in learn more when importing spreadsheet?

shubham1206agra · 2024-11-25T07:01:46Z

@c3024 Fixed the crash.

c3024 · 2024-11-25T11:38:06Z

src/pages/workspace/perDiem/ImportedPerDiemPage.tsx

+
+    const spreadsheetColumns = spreadsheet?.data;
+    if (!spreadsheetColumns) {
+        return;


Deeplinking to this page shows an empty page. A NotFound page with suitable title and subtitle with providing a link directing the user to the import page might be better?

@c3024 I will use Not Found Page that was used throughout the App here.

Sorry, but if we use this, we will encounter the “Not Found” page when the RHP gets dismissed on clicking ok on the confirmation modal. This page is not meant to be accessed via a deeplink anyway. So, leaving it as it was might be better, especially since I just noticed that the import tag and categories page also use the same null return.

Screen.Recording.2024-11-25.at.6.47.32.PM.mov

Gonals · 2024-11-27T01:25:50Z

@shubham1206agra, is this ready for re-review by @c3024?

c3024 · 2024-11-27T11:37:24Z

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

spreadAndroid.mp4

Android: mWeb Chrome

Screenrecorder-2024-11-27-16-22-58-226.mp4

Screenrecorder-2024-11-27-16-23-25-876.mp4

iOS: Native

spreadiOS.mp4

iOS: mWeb Safari

spreadiOSmWeb-compressed.mp4

MacOS: Chrome / Safari

spreadChrome.mp4

MacOS: Desktop

spreadDesktop.mp4

c3024

LGTM!

OSBotify · 2024-11-28T14:52:25Z

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

github-actions · 2024-11-30T14:23:32Z

🚀 Deployed to staging by https://github.com/Gonals in version: 9.0.69-1 🚀

platform	result
🤖 android 🤖	false ❌
🖥 desktop 🖥	success ✅
🍎 iOS 🍎	success ✅
🕸 web 🕸	success ✅
🤖🔄 android HybridApp 🤖🔄	success ✅
🍎🔄 iOS HybridApp 🍎🔄	success ✅

github-actions · 2024-12-02T21:34:13Z

🚀 Deployed to production by https://github.com/puneetlath in version: 9.0.69-4 🚀

platform	result
🤖 android 🤖	skipped 🚫
🖥 desktop 🖥	success ✅
🍎 iOS 🍎	success ✅
🕸 web 🕸	success ✅
🤖🔄 android HybridApp 🤖🔄	failure ❌
🍎🔄 iOS HybridApp 🍎🔄	failure ❌

shubham1206agra and others added 2 commits November 7, 2024 23:44

Feature: Import/Export Per Diem Rates

039fc64

Merge branch 'main' into per-diem-2

d551a8d

shubham1206agra and others added 2 commits November 21, 2024 15:22

Merge branch 'Expensify:main' into per-diem-2

6917e07

Fix rows number on successful import

6334588

shubham1206agra marked this pull request as ready for review November 21, 2024 10:54

shubham1206agra requested a review from a team as a code owner November 21, 2024 10:54

melvin-bot bot requested review from thesahindia and removed request for a team November 21, 2024 10:54

c3024 reviewed Nov 22, 2024

View reviewed changes

Gonals requested review from Gonals and removed request for thesahindia November 22, 2024 15:05

Merge main

a01d449

shubham1206agra requested a review from c3024 November 22, 2024 17:02

c3024 suggested changes Nov 23, 2024

View reviewed changes

Fix function naming

821bde5

shubham1206agra commented Nov 25, 2024

View reviewed changes

Fix crash when using invalid currency code

a20132e

c3024 suggested changes Nov 25, 2024

View reviewed changes

shubham1206agra added 3 commits November 25, 2024 17:48

Fix blank import per diem page

95cffc9

Fix lint

b3f7d89

Revert: Fix blank import per diem page

e95e4cd

Gonals assigned shubham1206agra Nov 27, 2024

c3024 approved these changes Nov 27, 2024

View reviewed changes

Gonals approved these changes Nov 28, 2024

View reviewed changes

Gonals merged commit 64eaf2f into Expensify:main Nov 28, 2024
17 checks passed

github-actions bot mentioned this pull request Nov 30, 2024

Deploy Checklist: New Expensify 2024-11-30 #53334

Closed

41 tasks

This was referenced Dec 2, 2024

[$250] [HOLD for payment 2024-12-09] [Per Diem] Frontend - Importing rates for Per Diem in Newdot #50863

Closed

[HOLD for payment 2024-12-09] [Per Diem] Frontend - Exporting rates for Per Diem in Newdot #50865

Closed

shubham1206agra deleted the per-diem-2 branch February 3, 2025 17:49

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Feature: Import/Export Per Diem Rates #52209

Feature: Import/Export Per Diem Rates #52209

shubham1206agra commented Nov 7, 2024 •

edited

Loading

shubham1206agra commented Nov 14, 2024

melvin-bot bot commented Nov 21, 2024

shubham1206agra commented Nov 21, 2024

c3024 left a comment

Gonals commented Nov 22, 2024

shubham1206agra commented Nov 22, 2024

c3024 left a comment •

edited

Loading

shubham1206agra commented Nov 24, 2024

c3024 commented Nov 25, 2024

shubham1206agra Nov 25, 2024

shubham1206agra commented Nov 25, 2024

c3024 Nov 25, 2024

shubham1206agra Nov 25, 2024

shubham1206agra Nov 25, 2024

c3024 Nov 25, 2024

c3024 Nov 25, 2024

Gonals commented Nov 27, 2024

c3024 commented Nov 27, 2024 •

edited

Loading

c3024 left a comment

OSBotify commented Nov 28, 2024

github-actions bot commented Nov 30, 2024

github-actions bot commented Dec 2, 2024


	function format(locale: ValueOf<typeof CONST.LOCALES>, number: number, options?: Intl.NumberFormatOptions): string {
	return new MemoizedNumberFormat(locale, options).format(number);
	}

	function formatToParts(locale: ValueOf<typeof CONST.LOCALES>, number: number, options?: Intl.NumberFormatOptions): Intl.NumberFormatPart[] {
	return new MemoizedNumberFormat(locale, options).formatToParts(number);
	}

Feature: Import/Export Per Diem Rates #52209

Feature: Import/Export Per Diem Rates #52209

Conversation

shubham1206agra commented Nov 7, 2024 • edited Loading

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

shubham1206agra commented Nov 14, 2024

melvin-bot bot commented Nov 21, 2024

shubham1206agra commented Nov 21, 2024

c3024 left a comment

Choose a reason for hiding this comment

Gonals commented Nov 22, 2024

shubham1206agra commented Nov 22, 2024

c3024 left a comment • edited Loading

Choose a reason for hiding this comment

shubham1206agra commented Nov 24, 2024

c3024 commented Nov 25, 2024

shubham1206agra Nov 25, 2024

Choose a reason for hiding this comment

shubham1206agra commented Nov 25, 2024

c3024 Nov 25, 2024

Choose a reason for hiding this comment

shubham1206agra Nov 25, 2024

Choose a reason for hiding this comment

shubham1206agra Nov 25, 2024

Choose a reason for hiding this comment

c3024 Nov 25, 2024

Choose a reason for hiding this comment

c3024 Nov 25, 2024

Choose a reason for hiding this comment

Gonals commented Nov 27, 2024

c3024 commented Nov 27, 2024 • edited Loading

Reviewer Checklist

Screenshots/Videos

c3024 left a comment

Choose a reason for hiding this comment

OSBotify commented Nov 28, 2024

github-actions bot commented Nov 30, 2024

github-actions bot commented Dec 2, 2024

shubham1206agra commented Nov 7, 2024 •

edited

Loading

c3024 left a comment •

edited

Loading

c3024 commented Nov 27, 2024 •

edited

Loading