Handle customUnitOutOfPolicy violation #47136

paultsimura · 2024-08-09T06:58:58Z

Details

Implement the plan in this design doc section to add RBR logic for the bottom-up flow.

Fixed Issues

$ #46753
PROPOSAL: N/A

Tests

Create a distance expense on NewDot and submit it to a new account
Update the default USD rate for workspaces
Comment out the allowed writes check in Web-E because CreateWorkspaceFromIOUPayment already does too many on main
Log in to NewDot as the payer account
Choose to pay the expense with a business bank account, which will set up a new workspace. After clicking the button you can close out of the bank account flow since all we care about is moving the expense to a new workspace.
Verify there is an unread workspace chat with a green dot, open it
Verify there is a red dot on the expense report preview, open it
Verify there is a red dot and violation message on the rate row
Update the rate to the default on the policy
Verify the rate updates successfully and all red dots are cleared

Run the same test but for tracking an expense

Offline tests

Run the same flow as above, but go offline before updating to the workspace rate.
Verify it looks good optimistically.
Go online and verify the rest of the test steps above.

Run the same test but for tracking an expense

QA Steps

No QA

Verify

PR Author Checklist

Screenshots/Videos

I (Neil) only tested on Mac Chrome because all the changes are platform independent.

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

Online test

Offline test

MacOS: Desktop

paultsimura · 2024-08-10T16:05:14Z

@neil-marcellini potential bug: when performing the bottom-up flow, both requester and payer can modify the distance request (all the editable fields):

2024-08-10.-.18.04.-.Screen.Recording.2024-08-10.at.18.03.40.mp4

Based on the RBR logic, the payer should be able to change the rate to get rid of that violation.
But is it ok that they can modify all the fields?

# Conflicts: # src/libs/Violations/ViolationsUtils.ts # tests/unit/ViolationUtilsTest.ts

paultsimura · 2024-09-09T13:33:51Z

Hey @neil-marcellini are you taking over this PR? Do you need any assistance from my side?

neil-marcellini · 2024-09-09T19:05:10Z

Hi yeah, I'm taking it over since I think it's easiest to test if you can modify the backend rate while testing.

melvin-bot · 2024-09-10T04:23:11Z

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

neil-marcellini · 2024-09-10T04:24:20Z

Ok, I think this is ready to go. It's a (hopefully) beautiful collaboration between @paultsimura and I!

brunovjk · 2024-09-10T11:28:14Z

Hi yeah, I'm taking it over since I think it's easiest to test if you can modify the backend rate while testing.

Can/Should I test @neil-marcellini? For the checklist.

neil-marcellini · 2024-09-11T21:19:30Z

Ah right, you won't be able to test very easily due to the need to change the backend. I'll request only an internal review.

youssef-lr · 2024-09-12T17:50:17Z

Testing now, can we resolve conflicts?

youssef-lr · 2024-09-13T19:53:21Z

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

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

youssef-lr

LGTM and test well!

OSBotify · 2024-09-13T20:07:46Z

✋ 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 · 2024-09-13T23:05:21Z

🚀 Deployed to staging by https://github.com/youssef-lr in version: 9.0.35-0 🚀

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

mvtglobally · 2024-09-14T00:36:46Z

@neil-marcellini @youssef-lr Can you pls confirm if we need to QA it? There are steps but also no QA note

grgia · 2024-09-16T11:41:32Z

bump on #47136 (comment)
@neil-marcellini @youssef-lr

OSBotify · 2024-09-16T18:21:18Z

🚀 Deployed to production by https://github.com/grgia in version: 9.0.35-7 🚀

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

neil-marcellini · 2024-09-18T17:34:55Z

@neil-marcellini @youssef-lr Can you pls confirm if we need to QA it? There are steps but also no QA note

Yes it is no qa. I'll put it in the title next time.

s77rt · 2024-11-17T11:06:38Z

src/libs/ReportUtils.ts

        originalMessage.oldAmount = TransactionUtils.getAmount(oldTransaction, isFromExpenseReport);
        originalMessage.oldCurrency = TransactionUtils.getCurrency(oldTransaction);
        originalMessage.oldMerchant = TransactionUtils.getMerchant(oldTransaction);

-        const modifiedDistanceFields = TransactionUtils.calculateAmountForUpdatedWaypointOrRate(oldTransaction, transactionChanges, policy, isFromExpenseReport);
+        const modifiedDistanceFields = TransactionUtils.calculateAmountForUpdatedWaypointOrRate(updatedTransaction, transactionChanges, policy, isFromExpenseReport);


Passing the updated transaction instead of the old transaction caused a regression due to a bug in getUpdatedTransaction.

paultsimura added 4 commits August 9, 2024 08:57

Handle customUnitOutOfPolicy violation

6b4cb7a

Merge branch 'refs/heads/main' into feat/46753-p2p-violation

50c9050

Lint

927879b

Lint

cc472a2

paultsimura added 2 commits August 11, 2024 21:04

Revert accidental change

742d1a3

Merge branch 'refs/heads/main' into feat/46753-p2p-violation

6e8f62b

# Conflicts: # src/libs/Violations/ViolationsUtils.ts # tests/unit/ViolationUtilsTest.ts

ntdiary mentioned this pull request Aug 14, 2024

[HOLD for payment 2024-08-27][$250] [P2P Distance] - Unable to dismiss error "The selected rate has been deleted" in the expense report #47279

Closed

6 tasks

paultsimura mentioned this pull request Aug 16, 2024

[HOLD for payment 2025-02-05] [$250] Expense shared with accountant shows incorrect rate #46897

Closed

6 tasks

s77rt mentioned this pull request Aug 16, 2024

[$250] Distance - Inconsistency in showing unit in preview and transaction thread after updating unit #43588

Closed

6 tasks

Merge branch 'main' into feat/46753-p2p-violation

8ad415a

neil-marcellini mentioned this pull request Sep 6, 2024

Payment due 2024-09-23[$250] [P2P Distance] Add RBR logic for the bottom up flow #46753

Closed

neil-marcellini added 3 commits September 6, 2024 16:56

WIP fix optimistic rate update

ce53514

Frontend only modifiedCustomUnitRateID is unnecessary

cc97528

Fix optimistic amount update when rate changes

6445f4d

WIP fix optimistic rate modified expense message

02e5e69

neil-marcellini added 7 commits September 9, 2024 12:23

Fix optimistic modified rate in modified expense message

517d0ba

WIP modified distance or rate message matching backend

af551f3

Implement updated the distance translations

32c73a9

The field is the merchant specific to distance expenses

f994254

Make sure translatedChangedField is lowercase

967460b

Fix matching currency symbols in distance merchant

929e687

Fix style and clean up

3b944bf

neil-marcellini self-assigned this Sep 10, 2024

neil-marcellini added 4 commits September 9, 2024 20:45

Clarify that changedField must be translated

1f4c348

Move distance merchant regex to CONST

dd14a19

Small cleanup and test distance rate message

d454c2f

Test modified expense for distance changed

0461782

neil-marcellini marked this pull request as ready for review September 10, 2024 04:23

neil-marcellini requested a review from a team as a code owner September 10, 2024 04:23

melvin-bot bot requested review from brunovjk and removed request for a team September 10, 2024 04:23

neil-marcellini requested review from youssef-lr and removed request for brunovjk September 11, 2024 21:19

neil-marcellini changed the title ~~Handle customUnitOutOfPolicy violation~~ [HOLD Auth 12208] Handle customUnitOutOfPolicy violation Sep 11, 2024

Merge branch 'main' into feat/46753-p2p-violation

1000dba

neil-marcellini changed the title ~~[HOLD Auth 12208] Handle customUnitOutOfPolicy violation~~ Handle customUnitOutOfPolicy violation Sep 12, 2024

youssef-lr approved these changes Sep 13, 2024

View reviewed changes

youssef-lr merged commit d14b48b into Expensify:main Sep 13, 2024
17 checks passed

github-actions bot mentioned this pull request Sep 13, 2024

Deploy Checklist: New Expensify 2024-09-13 #49195

Closed

55 tasks

CyberAndrii mentioned this pull request Sep 16, 2024

[HOLD for payment 2024-11-21] [$250] Workspace chat - Report header shows "0.00 for Pending... @1.00 / mi" when changing distance & rate offline #49278

Closed

6 tasks

s77rt reviewed Nov 17, 2024

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Handle customUnitOutOfPolicy violation #47136

Handle customUnitOutOfPolicy violation #47136

paultsimura commented Aug 9, 2024 •

edited by neil-marcellini

Loading

paultsimura commented Aug 10, 2024 •

edited

Loading

paultsimura commented Sep 9, 2024

neil-marcellini commented Sep 9, 2024

melvin-bot bot commented Sep 10, 2024

neil-marcellini commented Sep 10, 2024

brunovjk commented Sep 10, 2024 •

edited

Loading

neil-marcellini commented Sep 11, 2024 •

edited

Loading

youssef-lr commented Sep 12, 2024

youssef-lr commented Sep 13, 2024

youssef-lr left a comment

OSBotify commented Sep 13, 2024

OSBotify commented Sep 13, 2024

mvtglobally commented Sep 14, 2024

grgia commented Sep 16, 2024

OSBotify commented Sep 16, 2024

neil-marcellini commented Sep 18, 2024

s77rt Nov 17, 2024 •

edited

Loading

Handle customUnitOutOfPolicy violation #47136

Handle customUnitOutOfPolicy violation #47136

Conversation

paultsimura commented Aug 9, 2024 • edited by neil-marcellini Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

paultsimura commented Aug 10, 2024 • edited Loading

paultsimura commented Sep 9, 2024

neil-marcellini commented Sep 9, 2024

melvin-bot bot commented Sep 10, 2024

neil-marcellini commented Sep 10, 2024

brunovjk commented Sep 10, 2024 • edited Loading

neil-marcellini commented Sep 11, 2024 • edited Loading

youssef-lr commented Sep 12, 2024

youssef-lr commented Sep 13, 2024

Reviewer Checklist

Screenshots/Videos

youssef-lr left a comment

Choose a reason for hiding this comment

OSBotify commented Sep 13, 2024

OSBotify commented Sep 13, 2024

mvtglobally commented Sep 14, 2024

grgia commented Sep 16, 2024

OSBotify commented Sep 16, 2024

neil-marcellini commented Sep 18, 2024

s77rt Nov 17, 2024 • edited Loading

Choose a reason for hiding this comment

paultsimura commented Aug 9, 2024 •

edited by neil-marcellini

Loading

paultsimura commented Aug 10, 2024 •

edited

Loading

brunovjk commented Sep 10, 2024 •

edited

Loading

neil-marcellini commented Sep 11, 2024 •

edited

Loading

s77rt Nov 17, 2024 •

edited

Loading