Implemented Edit/Delete Per diem rates by shubham1206agra · Pull Request #53625 · Expensify/App

shubham1206agra · 2024-12-05T08:57:14Z

Explanation of Change

Fixed Issues

$ #50867
PROPOSAL:

Tests

Select a single Per diem rate and confirm the drop-down from the Settings button shows the option to Delete rates
Delete a single rate and confirm it is deleted
Repeat for a group of rates
Click into a single rate and confirm the right-hand pane opens up with the following configurable options:

Destination
Subrate
Amount
Currency
Delete

Click into Destination and confirm you see a free-text field to edit the Destination name
Change the name and confirm it is updated on the main list of rates
Confirm the Destination name changes for all substrates associated with that destination
Click into Subrate and confirm you see a free-text field to edit the Subrate name
Change the name and confirm it is updated on the main list of rates
Click into Amount and confirm you are able to edit the amount
Change the amount and confirm it is updated on the main list of rates
Click into Currency and confirm you see a list of all available currencies
Change the currency and confirm it is updated on the main list of rates
Click into the Settings menu and confirm you are able to change the Default per diem category
Confirm the list of available categories matches the list of enabled categories for that workspace

Verify that no errors appear in the JS console

Offline tests

Same as Tests

QA Steps

Same as Tests

PR Author Checklist

Screenshots/Videos

Android: Native

Screen.Recording.2024-12-18.at.9.25.03.PM.mov

Android: mWeb Chrome

Screen.Recording.2024-12-18.at.8.56.16.PM.mov

iOS: Native

Screen.Recording.2024-12-18.at.9.13.23.PM.mov

iOS: mWeb Safari

Screen.Recording.2024-12-18.at.8.52.11.PM.mov

MacOS: Chrome / Safari

Screen.Recording.2024-12-18.at.8.49.04.PM.mov

MacOS: Desktop

Screen.Recording.2024-12-18.at.9.04.06.PM.mov

src/components/AmountWithoutCurrencyForm.tsx

melvin-bot · 2024-12-18T16:04:31Z

@rojiphil 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-12-18T16:05:02Z

@rojiphil Please ignore this PR.

@c3024 Please start review ASAP.

Thanks

src/languages/es.ts

c3024 · 2024-12-18T17:02:38Z

Can two rows have the same destination and subrate (Breakfast etc.) field?

canDestinationAndSubrateBeSameForTwoRates.mov

NIT: Deleting/backspace at -0 does not remove the negative sign.

zeroValueRemains.mov

src/pages/workspace/perDiem/EditPerDiemAmountPage.tsx

c3024 · 2024-12-18T17:07:00Z

When all categories are disabled the per diem settings page is blank. Should there be a message here for this case?

shubham1206agra · 2024-12-18T17:10:56Z

Can two rows have the same destination and subrate (Breakfast etc.) field?

Yes for now. Since OD allows that too.

shubham1206agra · 2024-12-18T17:11:34Z

When all categories are disabled the per diem settings page is blank. Should there be a message here for this case?

I will disable the page in this case in the cleanup.

shubham1206agra · 2024-12-18T17:12:32Z

NIT: Deleting/backspace at -0 does not remove the negative sign.

Only - is not a valid input, that's why its happening like this.

src/languages/es.ts

c3024 · 2024-12-18T17:21:21Z

Perdiem currency page header overlaps with device top bar on iOS.

c3024 · 2024-12-18T17:48:42Z

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 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.ts 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.
For any bug fix or new feature in this PR, I verified that sufficient unit tests are included to prevent regressions in this flow.
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

editAndroid.mov

Android: mWeb Chrome

editAndroidmWeb.mp4

iOS: Native

editiOS.mov

editCurrencyiOS.mov

iOS: mWeb Safari

editiOSmWeb.MP4

MacOS: Chrome / Safari

editChrome.mov

MacOS: Desktop

editDesktop.mov

shubham1206agra · 2024-12-19T12:15:50Z

@Gonals We can merge since it checks for new files only.

Gonals · 2024-12-19T12:26:02Z

@Gonals We can merge since it checks for new files only.

True, but regardless, it is not a good practice to merge with lint errors if we can avoid it (and we should try to always avoid it). Let's get the code in merge state in this PR and merge afterwards.

OSBotify · 2024-12-19T14:55:39Z

✋ 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-12-23T20:57:22Z

🚀 Deployed to staging by https://github.com/Gonals in version: 9.0.78-0 🚀

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

github-actions · 2024-12-23T21:41:18Z

🚀 Deployed to staging by https://github.com/Gonals in version: 9.0.78-0 🚀

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

github-actions · 2024-12-23T21:48:48Z

🚀 Deployed to staging by https://github.com/Gonals in version: 9.0.78-0 🚀

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

github-actions · 2024-12-24T00:04:33Z

🚀 Deployed to staging by https://github.com/Gonals in version: 9.0.78-0 🚀

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

github-actions · 2024-12-24T00:52:12Z

🚀 Deployed to staging by https://github.com/Gonals in version: 9.0.78-0 🚀

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

github-actions · 2024-12-24T19:42:19Z

🚀 Deployed to staging by https://github.com/Gonals in version: 9.0.78-0 🚀

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

github-actions · 2024-12-24T19:59:15Z

🚀 Deployed to staging by https://github.com/Gonals in version: 9.0.78-0 🚀

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

github-actions · 2024-12-26T20:26:30Z

🚀 Deployed to production by https://github.com/jasperhuangg in version: 9.0.78-6 🚀

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

ikevin127 · 2025-01-08T23:09:57Z

src/libs/MoneyRequestUtils.ts

 * Check if amount is a decimal up to 3 digits
 */
-function validateAmount(amount: string, decimals: number, amountMaxLength: number = CONST.IOU.AMOUNT_MAX_LENGTH): boolean {
+function validateAmount(amount: string, decimals: number, amountMaxLength: number = CONST.IOU.AMOUNT_MAX_LENGTH, shouldAllowNegative = false): boolean {


Looks like this function was missing some logic which led to this issue:

[HOLD for payment 2025-01-13] Per diem - Amount cannot be cleared when there is negative sign #54500

which was fixed in PR #54654.

suneox · 2025-02-25T16:29:33Z

src/pages/workspace/perDiem/WorkspacePerDiemDetailsPage.tsx

+    const selectedRate = customUnit?.rates?.[rateID];
+    const selectedSubRate = selectedRate?.subRates?.find((subRate) => subRate.id === subRateID);
+
+    const amountValue = selectedSubRate?.rate ? convertToFrontendAmountAsString(Number(selectedSubRate.rate)) : undefined;


Coming from #55955 checklist: This page displays the value that isn’t the frontend value, so we should use the same approach to display the value on WorkspacePerDiemPage without currency

shubham1206agra and others added 6 commits December 5, 2024 14:26

Implemented Edit/Delete Per diem rates

e671307

Fix style

d3d1e8d

Fix onyx update when doing delete operation

6514566

Fix ts lint

7203e2e

Fix parameters

014995e

Merge branch 'main' into per-diem-4

6773cd2

shubham1206agra commented Dec 16, 2024

View reviewed changes

src/components/AmountWithoutCurrencyForm.tsx Outdated Show resolved Hide resolved

shubham1206agra added 2 commits December 16, 2024 19:48

Apply suggestions from code review

b0aafa3

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

a1558bb

shubham1206agra marked this pull request as ready for review December 18, 2024 16:04

shubham1206agra requested a review from a team as a code owner December 18, 2024 16:04

melvin-bot bot requested review from rojiphil and removed request for a team December 18, 2024 16:04

shubham1206agra commented Dec 18, 2024

View reviewed changes

src/languages/es.ts Outdated Show resolved Hide resolved

shubham1206agra commented Dec 18, 2024

View reviewed changes

src/languages/es.ts Outdated Show resolved Hide resolved

Apply suggestions from code review

442a16a

c3024 reviewed Dec 18, 2024

View reviewed changes

src/pages/workspace/perDiem/EditPerDiemAmountPage.tsx Show resolved Hide resolved

shubham1206agra commented Dec 18, 2024

View reviewed changes

src/languages/es.ts Outdated Show resolved Hide resolved

Apply suggestions from code review

48ee5fd

Merge branch 'main' into per-diem-4

f123aa6

Fix wrong padding settings in currency page

ac5b65c

shubham1206agra added 9 commits December 19, 2024 18:11

Fixed most of the lint errors

10870ac

Fixed lint errors

878f88f

Trying to fix lint

8d15dd6

Trying to fix lint part 2

e703ca5

Trying to fix lint part 3

daabedd

Trying to fix lint part 3

f2fc96d

Trying to fix lint part 4

94f4bbb

Trying to fix lint part 5

c045b01

Trying to fix lint part 6

89a2c5a

Gonals assigned shubham1206agra Dec 19, 2024

Gonals approved these changes Dec 19, 2024

View reviewed changes

Gonals merged commit 1e6a70e into Expensify:main Dec 19, 2024

github-actions bot mentioned this pull request Dec 23, 2024

Deploy Checklist: New Expensify 2024-12-23 #54476

Closed

daledah mentioned this pull request Dec 24, 2024

[Due for payment 2025-02-25] Per diem - RHP shows offline view when deleted, fields are not grayed out when edited offline #54488

Closed

8 tasks

NJ-2020 mentioned this pull request Dec 24, 2024

[HOLD for payment 2025-01-13] Per diem - Amount cannot be cleared when there is negative sign #54500

Closed

8 tasks

melvin-bot bot mentioned this pull request Dec 26, 2024

[$250] [HOLD for payment 2025-01-02] [Per Diem] Frontend - Edit/delete rates for Per Diem in Newdot #50867

Closed

ikevin127 reviewed Jan 8, 2025

View reviewed changes

shubham1206agra deleted the per-diem-4 branch February 3, 2025 17:50

suneox reviewed Feb 25, 2025

View reviewed changes

Conversation

shubham1206agra commented Dec 5, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

Uh oh!

melvin-bot bot commented Dec 18, 2024

Uh oh!

shubham1206agra commented Dec 18, 2024

Uh oh!

Uh oh!

Uh oh!

c3024 commented Dec 18, 2024

Uh oh!

Uh oh!

c3024 commented Dec 18, 2024

Uh oh!

shubham1206agra commented Dec 18, 2024

Uh oh!

shubham1206agra commented Dec 18, 2024

Uh oh!

shubham1206agra commented Dec 18, 2024

Uh oh!

Uh oh!

c3024 commented Dec 18, 2024

Uh oh!

c3024 commented Dec 18, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

shubham1206agra commented Dec 19, 2024

Uh oh!

Gonals commented Dec 19, 2024

Uh oh!

OSBotify commented Dec 19, 2024

Uh oh!

github-actions bot commented Dec 23, 2024

Uh oh!

github-actions bot commented Dec 23, 2024

Uh oh!

github-actions bot commented Dec 23, 2024

Uh oh!

github-actions bot commented Dec 24, 2024

Uh oh!

github-actions bot commented Dec 24, 2024

Uh oh!

github-actions bot commented Dec 24, 2024

Uh oh!

github-actions bot commented Dec 24, 2024

Uh oh!

github-actions bot commented Dec 26, 2024

Uh oh!

ikevin127 Jan 8, 2025

Choose a reason for hiding this comment

Uh oh!

suneox Feb 25, 2025

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

shubham1206agra commented Dec 5, 2024 •

edited

Loading

c3024 commented Dec 18, 2024 •

edited

Loading