fix: Distance rate- WS owner can create multiple distance rate with same amount. by Krishna2323 · Pull Request #53104 · Expensify/App

Krishna2323 · 2024-11-26T01:06:29Z

Explanation of Change

Users were able to create multiple rates with the same value. This PR updates the validation function validateRateValue to also check for existing rates with the same value and return error message if true.

Fixed Issues

$ #51769
PROPOSAL: #51769 (comment)

Tests

Navigate to workspace editor
Navigate to "More features"
Enable the distance rates toggle
Navigate to distance rates
Click on "Add rate" > Enter any rate with or without decimals and save
Click on "Add rate" > Enter the same rate added in previous step
Click "Save" > Verify error message is shown A rate with value ${rate} already exists.
Create new rate with different value
Edit the new rate > Enter the same rate added in step 5
Verify error message is shown A rate with value ${rate} already exists.

Verify that no errors appear in the JS console

Offline tests

Navigate to workspace editor
Navigate to "More features"
Enable the distance rates toggle
Navigate to distance rates
Click on "Add rate" > Enter any rate with or without decimals and save
Click on "Add rate" > Enter the same rate added in previous step
Click "Save" > Verify error message is shown A rate with value ${rate} already exists.
Create new rate with different value
Edit the new rate > Enter the same rate added in step 5
Verify error message is shown A rate with value ${rate} already exists.

QA Steps

Navigate to workspace editor
Navigate to "More features"
Enable the distance rates toggle
Navigate to distance rates
Click on "Add rate" > Enter any rate with or without decimals and save
Click on "Add rate" > Enter the same rate added in previous step
Click "Save" > Verify error message is shown A rate with value ${rate} already exists.
Create new rate with different value
Edit the new rate > Enter the same rate added in step 5
Verify error message is shown A rate with value ${rate} already exists.

// TODO: These must be filled out, or the issue title must include "[No QA]."

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

android_native.mp4

Android: mWeb Chrome

android_chrome.mp4

iOS: Native

ios_native.mp4

iOS: mWeb Safari

ios_safari.mp4

MacOS: Chrome / Safari

web_chrome.mp4

MacOS: Desktop

desktop_app.mp4

…ame amount. Signed-off-by: krishna2323 <belivethatkg@gmail.com>

melvin-bot · 2024-11-26T01:06:33Z

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

Signed-off-by: krishna2323 <belivethatkg@gmail.com>

DylanDylann · 2024-11-28T03:36:46Z

@Krishna2323 Please merge the new main

DylanDylann · 2024-11-28T03:59:48Z

src/libs/PolicyDistanceRatesUtils.ts

+function validateRateValue(
+    values: FormOnyxValues<RateValueForm>,
+    customUnitRates: Record<string, Rate>,
+    currency: string,


Suggested change

currency: string,

DylanDylann · 2024-11-28T04:04:26Z

src/libs/PolicyDistanceRatesUtils.ts

    // Allow one more decimal place for accuracy
    const rateValueRegex = RegExp(String.raw`^-?\d{0,8}([${getPermittedDecimalSeparator(decimalSeparator)}]\d{0,${CONST.MAX_TAX_RATE_DECIMAL_PLACES}})?$`, 'i');
-    if (!rateValueRegex.test(parsedRate) || parsedRate === '') {
+    if (ratesList.some((r) => r.rate === convertedRate && !(currentRateValue && currentRateValue === r.rate))) {


Let's remove !(currentRateValue && currentRateValue === r.rate and filter currentRateValue out from convertedRate

@DylanDylann, sorry I haven't understood what you mean, can you please explain once again?

Ahh I made a mistake. I mean that we should remove currentRateValue from ratesList and don't need to check !(currentRateValue && currentRateValue === r.rate

DylanDylann · 2024-11-28T04:04:48Z

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

Screen.Recording.2024-11-28.at.11.12.28.mov

Android: mWeb Chrome

Screen.Recording.2024-11-28.at.11.08.41.mov

iOS: Native

Screen.Recording.2024-11-28.at.11.13.12.mov

iOS: mWeb Safari

Screen.Recording.2024-11-28.at.11.12.51.mov

MacOS: Chrome / Safari

Screen.Recording.2024-11-28.at.11.05.06.mov

MacOS: Desktop

Screen.Recording.2024-11-28.at.11.13.33.mov

Signed-off-by: krishna2323 <belivethatkg@gmail.com>

DylanDylann · 2024-11-29T02:17:37Z

@Krishna2323 ES lint failed

Krishna2323 · 2024-12-02T15:15:11Z

@danieldoglas friendly bump for a review.

OSBotify · 2024-12-02T18:41:43Z

✋ 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-02T22:02:36Z

🚀 Deployed to staging by https://github.com/danieldoglas in version: 9.0.70-0 🚀

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

izarutskaya · 2024-12-03T10:26:22Z

@Krishna2323 PR is fail with #53427

https://utest-dl.s3-accelerate.amazonaws.com/12102/26469/484909/6682525/bugAttachment/Bug6682525_1733189538583%2120241203_092434.mp4?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Date=20241203T102602Z&X-Amz-SignedHeaders=host&X-Amz-Credential=AKIAJ2UIWMJ2OMC3UCQQ%2F20241203%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Expires=86400&X-Amz-Signature=d2aec4c3e81a72e8c565c46dae61168df40f8da8aaffe6d0334e90d5780a1bb4

github-actions · 2024-12-04T01:11:50Z

🚀 Deployed to production by https://github.com/AndrewGable in version: 9.0.70-9 🚀

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

parasharrajat · 2025-09-29T08:02:48Z

It is allowed in OD to create multiple rates with the same amount, so it should be in ND. #55851

fix: Distance rate- WS owner can create multiple distance rate with s…

a6dbf38

…ame amount. Signed-off-by: krishna2323 <belivethatkg@gmail.com>

Krishna2323 requested a review from a team as a code owner November 26, 2024 01:06

melvin-bot bot requested a review from DylanDylann November 26, 2024 01:06

melvin-bot bot removed the request for review from a team November 26, 2024 01:06

Krishna2323 added 3 commits November 26, 2024 06:56

update validation.

644aac7

Signed-off-by: krishna2323 <belivethatkg@gmail.com>

update validation function to covert rate like done in BE.

022a7c2

Signed-off-by: krishna2323 <belivethatkg@gmail.com>

minor update.

955f9d6

Signed-off-by: krishna2323 <belivethatkg@gmail.com>

Krishna2323 mentioned this pull request Nov 26, 2024

[PAID] [$250] Distance rate- WS owner can create multiple distance rate with same amount #51769

Closed

8 tasks

DylanDylann reviewed Nov 28, 2024

View reviewed changes

Krishna2323 added 6 commits November 28, 2024 10:29

Merge branch 'main' into krishna2323/issue/51769

9931630

merge main.

90770ad

Signed-off-by: krishna2323 <belivethatkg@gmail.com>

remove currency param.

b0cebbc

Signed-off-by: krishna2323 <belivethatkg@gmail.com>

minor fix.

4c547c8

Signed-off-by: krishna2323 <belivethatkg@gmail.com>

minor update.

36b1004

Signed-off-by: krishna2323 <belivethatkg@gmail.com>

Merge branch 'main' into krishna2323/issue/51769

cfe8f26

Merge branch 'Expensify:main' into krishna2323/issue/51769

dcabaad

DylanDylann approved these changes Nov 29, 2024

View reviewed changes

melvin-bot bot requested a review from danieldoglas November 29, 2024 08:55

danieldoglas approved these changes Dec 2, 2024

View reviewed changes

danieldoglas merged commit 0a6803d into Expensify:main Dec 2, 2024

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

Deploy Checklist: New Expensify 2024-12-02 #53406

Closed

48 tasks

IuliiaHerets mentioned this pull request Dec 3, 2024

[HOLD for payment 2024-12-17] Distance - No error when editing the default rate to 4 decimal places and creating a same one #53427

Closed

7 tasks

Krishna2323 mentioned this pull request Dec 4, 2024

fix: Distance - No error when editing the default rate to 4 decimal places and creating a same one. #53610

Merged

48 tasks

parasharrajat mentioned this pull request Sep 29, 2025

[Due for payment 2025-10-01] Workspace - Duplicate distance rates are present when secondary login add same rate offline #55851

Closed

8 tasks

Conversation

Krishna2323 commented Nov 26, 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!

melvin-bot bot commented Nov 26, 2024

Uh oh!

DylanDylann commented Nov 28, 2024

Uh oh!

DylanDylann Nov 28, 2024

Choose a reason for hiding this comment

Uh oh!

DylanDylann Nov 28, 2024

Choose a reason for hiding this comment

Uh oh!

Krishna2323 Nov 28, 2024

Choose a reason for hiding this comment

Uh oh!

DylanDylann Nov 28, 2024

Choose a reason for hiding this comment

Uh oh!

Krishna2323 Nov 28, 2024

Choose a reason for hiding this comment

Uh oh!

DylanDylann commented Nov 28, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

DylanDylann commented Nov 29, 2024

Uh oh!

Krishna2323 commented Dec 2, 2024

Uh oh!

OSBotify commented Dec 2, 2024

Uh oh!

github-actions bot commented Dec 2, 2024

Uh oh!

izarutskaya commented Dec 3, 2024

Uh oh!

github-actions bot commented Dec 4, 2024

Uh oh!

parasharrajat commented Sep 29, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

Krishna2323 commented Nov 26, 2024 •

edited

Loading

DylanDylann commented Nov 28, 2024 •

edited

Loading