Skip to content

Add system message on report with bottom up flow#60482

Merged
lakchote merged 19 commits intoExpensify:mainfrom
nkdengineer:fix/59752
Jul 1, 2025
Merged

Add system message on report with bottom up flow#60482
lakchote merged 19 commits intoExpensify:mainfrom
nkdengineer:fix/59752

Conversation

@nkdengineer
Copy link
Contributor

@nkdengineer nkdengineer commented Apr 18, 2025

Explanation of Change

Fixed Issues

$ #59752
PROPOSAL: #59752 (comment)

Tests

  1. Submit an IOU from user B to user A in 1:1 DM.
  2. As user A, pay the IOU via business bank account.
  3. This moves the IOU to a workspace (via the bottom-up flow).
  4. Navigate to Reports and click on the expense report
  5. Verify that: We should show a system message in both the 1:1 DM so the users know where the report went
  • Verify that no errors appear in the JS console

Offline tests

Same as tests

QA Steps

Same as tests

  • Verify that no errors appear in the JS console

PR Author Checklist

  • I linked the correct issue in the ### Fixed Issues section above
  • I wrote clear testing steps that cover the changes made in this PR
    • I added steps for local testing in the Tests section
    • I added steps for the expected offline behavior in the Offline steps section
    • I added steps for Staging and/or Production testing in the QA steps section
    • I added steps to cover 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 tested this PR with a High Traffic account against the staging or production API to ensure there are no regressions (e.g. long loading states that impact usability).
  • I included screenshots or videos for tests on all platforms
  • I ran the tests on all platforms & verified they passed on:
    • Android: Native
    • Android: mWeb Chrome
    • iOS: Native
    • iOS: mWeb Safari
    • MacOS: Chrome / Safari
    • MacOS: Desktop
  • I verified there are no console errors (if there's a console error not related to the PR, report it or open an issue for it to be fixed)
  • I followed proper code patterns (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
      • If any non-english text was added/modified, I used JaimeGPT to get English > Spanish translation. I then posted it in #expensify-open-source and it was approved by an internal Expensify engineer. Link to Slack message:
    • 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 followed the guidelines as stated in the Review Guidelines
  • I tested other components that can be impacted by my changes (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar are working as expected)
  • 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
  • I verified that if a function's arguments changed that all usages have also been updated correctly
  • 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.
  • I added unit tests for any new feature or bug fix in this PR to help automatically prevent regressions in this user 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.

Screenshots/Videos

Android: Native
android.mov
Android: mWeb Chrome
android-mweb.mov
iOS: Native
ios.mp4
iOS: mWeb Safari
ios-mweb.mov
MacOS: Chrome / Safari
web.mov
MacOS: Desktop
desktop.mov

@nkdengineer nkdengineer changed the title Add system message on report with bottom up flow [HOLD BE] Add system message on report with bottom up flow Apr 18, 2025
@nkdengineer nkdengineer changed the title [HOLD BE] Add system message on report with bottom up flow Add system message on report with bottom up flow May 7, 2025
@nkdengineer nkdengineer marked this pull request as ready for review May 7, 2025 18:41
@nkdengineer nkdengineer requested a review from a team as a code owner May 7, 2025 18:41
@melvin-bot melvin-bot bot requested review from shubham1206agra and removed request for a team May 7, 2025 18:41
@melvin-bot
Copy link

melvin-bot bot commented May 7, 2025

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

nkdengineer and others added 2 commits May 12, 2025 10:31
Co-authored-by: Lucien Akchoté <lucien@expensify.com>
Co-authored-by: Lucien Akchoté <lucien@expensify.com>
@nkdengineer
Copy link
Contributor Author

@shubham1206agra friendly bump

@shubham1206agra
Copy link
Contributor

Screen.Recording.2025-05-22.at.10.40.12.PM.mov

@nkdengineer BE issue

Comment on lines +6083 to +6085
html: isIouReport
? `moved this <a href='${CONST.NEW_EXPENSIFY_URL}r/${reportID}/${reportActionID}' target='_blank' rel='noreferrer noopener'>report</a> to the ${policyName} workspace`
: `moved this report to the <a href='${CONST.NEW_EXPENSIFY_URL}r/${newParentReportID}' target='_blank' rel='noreferrer noopener'>${policyName}</a> workspace`,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@lakchote The message we are getting has different html

See Request ID - 943ded0a7811ffab-SJC

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

friendly bump here @lakchote

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry, I had urgent priorities to handle. Which message are you getting exactly?

The message returned in the backend for the MOVED report action will be:

"moved this report to" + policyNameText + "workspace");

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@lakchote See #60482 (comment)

Okay, I've been starting to work on it.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@lakchote Can you please update us here when the BE is fixed?

Copy link
Contributor

@lakchote lakchote Jun 9, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@shubham1206agra @nkdengineer it should be good now.

@shubham1206agra
Copy link
Contributor

@nkdengineer Can you merge main please?

@shubham1206agra
Copy link
Contributor

shubham1206agra commented Jun 11, 2025

Screen.Recording.2025-06-11.at.8.32.18.PM.mov

@lakchote Still not working correctly. The link for report is missing on 1:1 report's report action.

nkdengineer and others added 3 commits June 12, 2025 14:59
Co-authored-by: Shubham Agrawal <58412969+shubham1206agra@users.noreply.github.com>
Co-authored-by: Shubham Agrawal <58412969+shubham1206agra@users.noreply.github.com>
@lakchote
Copy link
Contributor

@lakchote Still not working correctly. The link for report is missing on 1:1 report's report action.

PRs (https://github.com/Expensify/Auth/pull/15747, https://github.com/Expensify/Web-Expensify/pull/47198) to fix this are under review.

@shubham1206agra
Copy link
Contributor

@nkdengineer Fix lint please

@shubham1206agra
Copy link
Contributor

@lakchote Can you please give status update here for the PRs?

@getusha
Copy link
Contributor

getusha commented Jun 26, 2025

We already added this, seems duplicate.

@shubham1206agra
Copy link
Contributor

@getusha Your message is wrong. So, you haven't really implemented this.

@getusha
Copy link
Contributor

getusha commented Jun 26, 2025

@getusha Your message is wrong. So, you haven't really implemented this.

Can you elaborate? I don't see the code we added getting removed. and createWorkspaceFromIOUPayment already had a system message before.

@shubham1206agra
Copy link
Contributor

@getusha Your message is wrong. So, you haven't really implemented this.

Can you elaborate? I don't see the code we added getting removed. and createWorkspaceFromIOUPayment already had a system message before.

I mean see the message we are implementing. Plus, the message was present in the 1:1 DM, but was not present in the IOU report earlier. Plus, your PR only covers if the workspace is present.

nkdengineer and others added 2 commits June 27, 2025 13:33
Co-authored-by: Shubham Agrawal <58412969+shubham1206agra@users.noreply.github.com>
@nkdengineer
Copy link
Contributor Author

@shubham1206agra thanks for your review. I updated

@shubham1206agra
Copy link
Contributor

@nkdengineer You need to fix other cases due to #56838

const movedReportAction = buildOptimisticMovedReportAction(iouReport.policyID, policyID, expenseChatReportId, iouReportID, policyName);

const movedReportAction = buildOptimisticMovedReportAction(iouReport.policyID, policyID, optimisticPolicyExpenseChatReportID, iouReportID, policy.name);

@nkdengineer You have not addressed this yet

@nkdengineer
Copy link
Contributor Author

I'm checking now

@nkdengineer
Copy link
Contributor Author

@nkdengineer You need to fix other cases due to #56838

@shubham1206agra I updated, It seems we also need to update the API MOVE_IOU_REPORT_TO_POLICY_AND_INVITE_SUBMITTER and MOVE_IOU_REPORT_TO_EXISTING_POLICY similar to what we did here @lakchote

@shubham1206agra
Copy link
Contributor

@nkdengineer You need to fix other cases due to #56838

@shubham1206agra I updated, It seems we also need to update the API MOVE_IOU_REPORT_TO_POLICY_AND_INVITE_SUBMITTER and MOVE_IOU_REPORT_TO_EXISTING_POLICY similar to what we did here @lakchote

@nkdengineer I don't think you have done this correctly. You just needed to update the parameter of the function correctly there.

@nkdengineer
Copy link
Contributor Author

@shubham1206agra, These places you mentioned are the moved action we added to the old chat report and I don't think it should be the same with the new action we add to the iou report.

@shubham1206agra
Copy link
Contributor

What? I am confused here

@nkdengineer
Copy link
Contributor Author

nkdengineer commented Jun 27, 2025

You mean we can add isIOUReport param as true here, right?

But from what I see, it's the action we added to the old chat report. It's not the same with the new action we added to the iou report in this issue. (The expectation of this PR is that we add a new moved action to the iou report).

const movedReportAction = buildOptimisticMovedReportAction(iouReport.policyID, policyID, expenseChatReportId, iouReportID, policyName);

const movedReportAction = buildOptimisticMovedReportAction(iouReport.policyID, policyID, optimisticPolicyExpenseChatReportID, iouReportID, policy.name);

@ikevin127
Copy link
Contributor

Hardcoded strings from ReportUtils.ts should be dynamically translated for all languages, you missed that during checklist completion.

@shubham1206agra
Copy link
Contributor

Hardcoded strings from ReportUtils.ts should be dynamically translated for all languages, you missed that during checklist completion.

These cannot be translated since there are 2 different version for same action. Plus, we should never translate the action since these are always in English.

@nkdengineer
Copy link
Contributor Author

@shubham1206agra i updated. It seems that we’ve removed all usages of the buildOptimisticMovedReportAction function except for the createWorkspaceFromIOUPayment function.

@melvin-bot melvin-bot bot requested a review from lakchote July 1, 2025 08:41
@lakchote lakchote merged commit 66cbac1 into Expensify:main Jul 1, 2025
19 checks passed
@OSBotify
Copy link
Contributor

OSBotify commented Jul 1, 2025

✋ 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
Copy link
Contributor

github-actions bot commented Jul 2, 2025

🚀 Deployed to staging by https://github.com/lakchote in version: 9.1.74-2 🚀

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

@github-actions
Copy link
Contributor

github-actions bot commented Jul 3, 2025

🚀 Deployed to production by https://github.com/puneetlath in version: 9.1.74-10 🚀

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants