fix: distance request sharing #54669

paultsimura · 2024-12-30T20:16:12Z

Explanation of Change

This PR is intended to fix several issues with the tracked distance expenses shared with accountants.

Fixed Issues

$ #46897
PROPOSAL: #46897 (comment)

Tests

Same as QA

Offline tests

Same as QA

QA Steps

Violation flow

Create a workspace if needed
Enable distance rates in settings from more features
Add a custom rate
Edit the default rate to a different value
Open the chat with yourself
Track a Distance expense
In the Concierge prompt, click "Share it with my accountant"
Select a workspace
Verify there's an error on the rate field instructing you to choose a workspace rate
Verify you can't submit the expense with the error present
Select a workspace rate
Verify the error clears
Submit the expense
Verify it's moved to the workspace
Verify it uses with the proper rate and distance, and the receipt image is updated

Auto-select rate flow

Open the chat with yourself
Track a Distance expense
Check the mileage rate automatically set on the request
Create a workspace if needed
Enable distance rates in settings from more features
Add a custom rate with the exact same value as in the step 3
Go back to the chat with yourself
In the Concierge prompt, click "Share it with my accountant"
Select a workspace
Verify there is no error on the rate field
Click the "Rate" field
Verify the custom rate which you've added in step 6 is automatically marked as "Selected"
Submit the expense
Verify it's moved to the workspace
Verify it uses with the proper rate and distance, and the receipt image is updated

PR Author Checklist

Screenshots/Videos

Android: Native

Android: mWeb Chrome

chrome.webm

iOS: Native

2025-01-16.-.20.05.-.Simulator.Screen.Recording.-.iPhone.15.Pro.-.2025-01-16.at.20.04.17.mp4

iOS: mWeb Safari

Simulator.Screen.Recording.-.iPhone.15.Pro.-.2025-01-16.at.19.50.26.mp4

MacOS: Chrome / Safari

Screen.Recording.2025-01-16.at.19.42.48.mov

MacOS: Desktop

Screen.Recording.2025-01-16.at.19.54.44.mov

paultsimura · 2024-12-30T21:43:59Z

@neil-marcellini the #53995 is still reproducible. From what I see – it looks like a BE issue. It happens only when sharing with a workspace created automatically if you click "Share with accountant" while not having any workspaces created.

Could you please check on the BE side?

Screen.Recording.2024-12-30.at.22.39.45.mov

paultsimura · 2025-01-02T23:22:48Z

@neil-marcellini bump on #54669 (comment)

# Conflicts: # src/languages/en.ts # src/languages/es.ts # src/pages/iou/request/step/IOURequestStepParticipants.tsx

paultsimura · 2025-01-14T21:22:22Z

@neil-marcellini bump on #54669 (comment)

neil-marcellini · 2025-01-16T15:20:29Z

@paultsimura I'm not able to reproduce this problem with this branch checked out locally. I think it has been fixed.

# Conflicts: # src/libs/actions/IOU.ts # src/pages/iou/request/step/IOURequestStepParticipants.tsx

melvin-bot · 2025-01-16T19:14:11Z

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

paultsimura · 2025-01-16T19:15:20Z

@Pujan92 please test this one carefully because the flow is quite diverse, and there were some regressions last time.

paultsimura · 2025-01-20T17:17:44Z

@Pujan92 bump for review.

# Conflicts: # src/components/MoneyRequestConfirmationListFooter.tsx

Pujan92 · 2025-01-20T18:56:56Z

I will review this tomorrow

paultsimura · 2025-01-22T19:11:44Z

@Pujan92 what's the review status? Every day I have to fix new conflicts...

# Conflicts: # src/libs/API/parameters/ShareTrackedExpenseParams.ts # src/libs/actions/IOU.ts # src/pages/iou/request/step/IOURequestStepParticipants.tsx

Pujan92 · 2025-01-23T14:20: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

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

#46897

Screen.Recording.2025-01-23.at.22.31.07.mp4

#53995

Screen.Recording.2025-01-23.at.22.24.47.mov

#53991

Screen.Recording.2025-01-23.at.22.45.06.mov

#54066

Screen.Recording.2025-01-23.at.22.36.12.mov

MacOS: Desktop

Pujan92

LGTM and tested
#46897
#53995
#53991
#54066

neil-marcellini

Great work on round #2. It looks like we verified it's not causing any of the blockers that occurred before so that's great, thanks for the testing.

I want to make some of the comments more clear before we merge this, because the code can be pretty confusing without them IMO.

src/libs/actions/IOU.ts

src/pages/iou/request/step/IOURequestStepParticipants.tsx

neil-marcellini

Looks great now, thanks for the updates!

OSBotify · 2025-01-23T22:29:36Z

✋ 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 · 2025-01-28T02:15:49Z

🚀 Deployed to staging by https://github.com/neil-marcellini in version: 9.0.90-0 🚀

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

github-actions · 2025-01-29T06:23:38Z

🚀 Deployed to production by https://github.com/yuwenmemon in version: 9.0.90-6 🚀

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

paultsimura · 2025-02-12T15:17:21Z

src/libs/ModifiedExpenseMessage.ts

+function getForExpenseMovedFromSelfDM(destinationReportID: string) {
+    const destinationReport = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${destinationReportID}`];
+    const rootParentReport = getRootParentReport(destinationReport);
+


We've ended up adding another message for the case when the destination chat in Self DM: #56202

Distance sharing: init

ce923a5

paultsimura force-pushed the fix/46897-distance-accountant-2 branch from 3f63e4c to ce923a5 Compare December 30, 2024 21:41

Lint

52f9fe5

This was referenced Jan 3, 2025

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

Closed

[Due for payment 2025-02-19] [$250] Track - Amount on the expense preview does not update when track distance expense is submitted #53988

Closed

Merge branch 'refs/heads/main' into fix/46897-distance-accountant-2

8f66ee3

# Conflicts: # src/languages/en.ts # src/languages/es.ts # src/pages/iou/request/step/IOURequestStepParticipants.tsx

paultsimura added 4 commits January 16, 2025 18:17

Merge branch 'main' into fix/46897-distance-accountant-2

e4503a8

# Conflicts: # src/libs/actions/IOU.ts # src/pages/iou/request/step/IOURequestStepParticipants.tsx

Add nullable transactionID handling

aa9e738

Handle type errors

c9f06a9

Lint

d58ca18

paultsimura changed the title ~~WIP: distance sharing~~ fix: distance request sharing Jan 16, 2025

paultsimura marked this pull request as ready for review January 16, 2025 19:14

paultsimura requested a review from a team as a code owner January 16, 2025 19:14

melvin-bot bot requested review from Pujan92 and removed request for a team January 16, 2025 19:14

paultsimura added 2 commits January 20, 2025 18:21

Merge branch 'main' into fix/46897-distance-accountant-2

37c6f08

# Conflicts: # src/components/MoneyRequestConfirmationListFooter.tsx

Lint

922eb25

paultsimura added 2 commits January 22, 2025 21:41

Merge branch 'main' into fix/46897-distance-accountant-2

7a8206c

# Conflicts: # src/libs/API/parameters/ShareTrackedExpenseParams.ts # src/libs/actions/IOU.ts # src/pages/iou/request/step/IOURequestStepParticipants.tsx

Merge fix

b3d5a20

Pujan92 approved these changes Jan 23, 2025

View reviewed changes

melvin-bot bot requested a review from neil-marcellini January 23, 2025 17:18

neil-marcellini requested changes Jan 23, 2025

View reviewed changes

src/libs/actions/IOU.ts Outdated Show resolved Hide resolved

src/pages/iou/request/step/IOURequestStepParticipants.tsx Outdated Show resolved Hide resolved

src/pages/iou/request/step/IOURequestStepParticipants.tsx Outdated Show resolved Hide resolved

Comments updates

4130ef5

paultsimura requested a review from neil-marcellini January 23, 2025 21:04

neil-marcellini approved these changes Jan 23, 2025

View reviewed changes

neil-marcellini merged commit 62b85e8 into Expensify:main Jan 23, 2025
17 checks passed

linhvovan29546 mentioned this pull request Jan 24, 2025

[$250] Expense - Unexpected error when editing distance in a distance track expense. #55540

Closed

8 tasks

FitseTLT mentioned this pull request Jan 27, 2025

Fix - Submit expense RHP doesn't include workspaces from Track flow #52061

Merged

50 tasks

github-actions bot mentioned this pull request Jan 28, 2025

Deploy Checklist: New Expensify 2025-01-28 #55824

Closed

82 tasks

linhvovan29546 mentioned this pull request Jan 29, 2025

[Due for payment 2025-02-13] [$250] "moved expense from self DM ...." message is shown after moving Expense to selfDM #55864

Closed

8 tasks

paultsimura commented Feb 12, 2025

View reviewed changes

fix: distance request sharing #54669

fix: distance request sharing #54669

Uh oh!

Conversation

paultsimura commented Dec 30, 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!

paultsimura commented Dec 30, 2024

Uh oh!

paultsimura commented Jan 2, 2025

Uh oh!

paultsimura commented Jan 14, 2025

Uh oh!

neil-marcellini commented Jan 16, 2025

Uh oh!

melvin-bot bot commented Jan 16, 2025

Uh oh!

paultsimura commented Jan 16, 2025

Uh oh!

paultsimura commented Jan 20, 2025

Uh oh!

Pujan92 commented Jan 20, 2025

Uh oh!

paultsimura commented Jan 22, 2025

Uh oh!

Pujan92 commented Jan 23, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

Pujan92 left a comment

Choose a reason for hiding this comment

Uh oh!

neil-marcellini left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

neil-marcellini left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

OSBotify commented Jan 23, 2025

Uh oh!

github-actions bot commented Jan 28, 2025

Uh oh!

github-actions bot commented Jan 29, 2025

Uh oh!

paultsimura Feb 12, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

paultsimura commented Dec 30, 2024 •

edited

Loading

Pujan92 commented Jan 23, 2025 •

edited

Loading