fix: moving expense to selfDM message not correct by linhvovan29546 · Pull Request #56202 · Expensify/App

linhvovan29546 · 2025-02-01T01:31:15Z

Explanation of Change

The "Move report" flow only supports moving expenses from selfDM to:

A policy expense chat
A 1:1 DM

However, in the olddot, expenses could be moved back to a self-DM. To maintain consistency and handle this case, we provide a correct message.

Fixed Issues

$ #55864
PROPOSAL: #55864 (comment)

Tests

Create a report in OD and add expense to it.
Notice report is created in ND in the WS chat.
in OD change the expense to unreported(remove from the report)
Go to ND selfDM > Expense
Verify that the system message displayed at the bottom and in the LHN is is 'moved expense to self DM' for the English version and 'movió el gasto a su propio mensaje directo' for the Spanish version

Verify that no errors appear in the JS console

Offline tests

Same above

QA Steps

Create a report in OD and add expense to it.
Notice report is created in ND in the WS chat.
in OD change the expense to unreported(remove from the report)
Go to ND selfDM > Expense
Verify that the system message displayed at the bottom and in the LHN is is 'moved expense to self DM' for the English version and 'movió el gasto a su propio mensaje directo' for the Spanish version

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

melvin-bot · 2025-02-01T05:23:13Z

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

linhvovan29546 · 2025-02-01T05:25:07Z

The unit tests failed in Job 3, but the failure is unrelated to this change. I'm not sure why this happened

paultsimura · 2025-02-01T15:53:41Z

@MarioExpensify @neil-marcellini when moving an expense to self-DM via OD, do we want to display the default "changed the expense" message, or should we add a new copy: moved expense to self DM similar to the existing moved expense from self DM to ${reportName}?

paultsimura

Thanks for adding the tests. Could you please also add 2 tests for the following cases?

when both reportName and policyName are present
when only reportName is present

tests/unit/ModifiedExpenseMessageTest.ts

paultsimura · 2025-02-01T16:43:38Z

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

![Screenshot_1738428179](https://github.com/user-attachments/assets/b201b525-5992-4161-9225-9f88fd0a2b04)

Android: mWeb Chrome

![Screenshot_1738427524](https://github.com/user-attachments/assets/98bf72eb-4e07-4abd-aaf4-257f35b75ccc)

iOS: Native

![Simulator Screenshot - iPhone 15 Pro - 2025-02-01 at 17 27 59](https://github.com/user-attachments/assets/bb02e0e7-b0f4-4474-8b8c-041e2462abcf)

iOS: mWeb Safari

![Simulator Screenshot - iPhone 15 Pro - 2025-02-01 at 17 28 25](https://github.com/user-attachments/assets/5477ff3c-0898-473b-abd0-8f4e14f56381)

MacOS: Chrome / Safari

MacOS: Desktop

linhvovan29546 · 2025-02-02T08:54:40Z

Updated

paultsimura

I'll wait with the approval to hear about the expected message.

tests/unit/ModifiedExpenseMessageTest.ts

linhvovan29546 · 2025-02-02T21:34:26Z

Thank you! I'll wait for confirmation

MarioExpensify · 2025-02-03T12:53:57Z

@paultsimura I believe changed the expense is too generic. As we already have the moved from self DM version, a new message following the same pattern would be a better fit. I would go with moved expense to self DM as you proposed.

CC: @garrettmknight

linhvovan29546 · 2025-02-03T12:59:42Z

@MarioExpensify FYI: I would like to confirm the translated text for Spanish as wellmovió el gasto a su propio mensaje directo

MarioExpensify · 2025-02-03T13:06:41Z

@linhvovan29546 do you mind posting it in #expensify-open-source slack channel? Here's an example of a translation check request.

linhvovan29546 · 2025-02-03T13:07:56Z

I don't have access to slack channel.

MarioExpensify · 2025-02-03T13:10:23Z

Whoops! Sorry about that. I'll send it and circle back here.

MarioExpensify · 2025-02-03T13:16:42Z

@linhvovan29546 I just took a look at the ES version for movedFromSelfDM and looks like the version you sent is good! You can move forward with movió el gasto a su propio mensaje directo. Thanks.

linhvovan29546 · 2025-02-03T13:30:25Z

@paultsimura I've updated it. Waiting for the next step from you

paultsimura

Looks mostly good to me. Now that we've added a new message, let's change the comment to be more suitable for the scenarios.

src/libs/ModifiedExpenseMessage.ts

linhvovan29546 · 2025-02-03T13:49:37Z

Updated

src/languages/es.ts

linhvovan29546 · 2025-02-03T14:10:45Z

Updated

paultsimura

LGTM ✔️

MarioExpensify · 2025-02-03T14:17:23Z

Regarding the failing test (job 3) we're seeing, there is already a discussion and a PR on its way to fix it. I think we're better off waiting for the fix to be merged and then merging further PRs.

@linhvovan29546 When this PR hits main, please merge main to your branch and we should be good to go!

linhvovan29546 · 2025-02-03T14:20:31Z

Thank you for letting me know

…essage

linhvovan29546 · 2025-02-03T17:03:51Z

The test is successful after merging the main branch, and the code works well.

MarioExpensify · 2025-02-03T17:33:24Z

Awesome, reviewing it!

MarioExpensify

LGTM! Appreciate all the unit tests, thank you!

OSBotify · 2025-02-03T17:44:37Z

✋ 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-02-03T23:35:08Z

🚀 Deployed to staging by https://github.com/MarioExpensify in version: 9.0.94-0 🚀

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

github-actions · 2025-02-06T21:58:09Z

🚀 Deployed to production by https://github.com/AndrewGable in version: 9.0.94-25 🚀

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

github-actions · 2025-02-06T22:40:00Z

🚀 Deployed to production by https://github.com/AndrewGable in version: 9.0.94-25 🚀

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

linhvovan29546 added 3 commits February 1, 2025 08:22

fix: moving expense to selfDM message not correct

30e4bde

test: implement test for move expense to selfDM

5f1d3ff

fix: eslint fail

54cd424

linhvovan29546 marked this pull request as ready for review February 1, 2025 05:23

linhvovan29546 requested a review from a team as a code owner February 1, 2025 05:23

melvin-bot bot requested review from paultsimura and removed request for a team February 1, 2025 05:23

paultsimura reviewed Feb 1, 2025

View reviewed changes

tests/unit/ModifiedExpenseMessageTest.ts Outdated Show resolved Hide resolved

tests/unit/ModifiedExpenseMessageTest.ts Outdated Show resolved Hide resolved

tests/unit/ModifiedExpenseMessageTest.ts Outdated Show resolved Hide resolved

linhvovan29546 added 3 commits February 2, 2025 14:33

fix: correct grammar in comment

cba621d

test: implement test when the expense is moved from an expense chat

7699f89

fix: eslint fail

6375413

paultsimura reviewed Feb 2, 2025

View reviewed changes

resolve request chagne

d05f309

fix: update the text to moved to self DM

e0b0248

paultsimura suggested changes Feb 3, 2025

View reviewed changes

src/libs/ModifiedExpenseMessage.ts Outdated Show resolved Hide resolved

src/libs/ModifiedExpenseMessage.ts Show resolved Hide resolved

fix: change comment to be more suitable for the scenarios

cb33aa2

paultsimura suggested changes Feb 3, 2025

View reviewed changes

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

fix: incorrect message

53e148a

paultsimura approved these changes Feb 3, 2025

View reviewed changes

melvin-bot bot requested a review from MarioExpensify February 3, 2025 14:11

Merge branch 'Expensify:main' into fix/55864-move-expense-to-selfDM-m…

cd76242

…essage

MarioExpensify approved these changes Feb 3, 2025

View reviewed changes

MarioExpensify merged commit 6d97fae into Expensify:main Feb 3, 2025
15 checks passed

github-actions bot mentioned this pull request Feb 3, 2025

Deploy Checklist: New Expensify 2025-02-03 #56280

Closed

95 tasks

dominictb mentioned this pull request Feb 4, 2025

[Due for payment 2025-02-19] [$250] Incorrect System Message Displayed When Deleting a Report #56322

Closed

8 tasks

IuliiaHerets mentioned this pull request Feb 4, 2025

LHN - Expense with a report changed in OD is not displayed unless refreshed or navigated to #56338

Closed

8 tasks

melvin-bot bot mentioned this pull request Feb 6, 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 mentioned this pull request Feb 12, 2025

fix: distance request sharing #54669

Merged

48 tasks

linhvovan29546 deleted the fix/55864-move-expense-to-selfDM-message branch February 13, 2025 10:32

Conversation

linhvovan29546 commented Feb 1, 2025 • 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 Feb 1, 2025

Uh oh!

linhvovan29546 commented Feb 1, 2025

Uh oh!

paultsimura commented Feb 1, 2025

Uh oh!

paultsimura left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

paultsimura commented Feb 1, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

linhvovan29546 commented Feb 2, 2025

Uh oh!

paultsimura left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

linhvovan29546 commented Feb 2, 2025

Uh oh!

MarioExpensify commented Feb 3, 2025

Uh oh!

linhvovan29546 commented Feb 3, 2025

Uh oh!

MarioExpensify commented Feb 3, 2025

Uh oh!

linhvovan29546 commented Feb 3, 2025

Uh oh!

MarioExpensify commented Feb 3, 2025

Uh oh!

MarioExpensify commented Feb 3, 2025

Uh oh!

linhvovan29546 commented Feb 3, 2025

Uh oh!

paultsimura left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

linhvovan29546 commented Feb 3, 2025

Uh oh!

Uh oh!

linhvovan29546 commented Feb 3, 2025

Uh oh!

paultsimura left a comment

Choose a reason for hiding this comment

Uh oh!

MarioExpensify commented Feb 3, 2025

Uh oh!

linhvovan29546 commented Feb 3, 2025

Uh oh!

linhvovan29546 commented Feb 3, 2025

Uh oh!

MarioExpensify commented Feb 3, 2025

Uh oh!

MarioExpensify left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

OSBotify commented Feb 3, 2025

Uh oh!

linhvovan29546 commented Feb 1, 2025 •

edited

Loading

paultsimura commented Feb 1, 2025 •

edited

Loading