Display submitted message in report action #41040

marcochavezf · 2024-04-25T22:06:05Z

Details

We display the message submitted %amount% using the existing submittedAmount copy. In this way, we show the same message even if the expense report is submitted by the admin (where originally we were showing the message You (on behalf of marco@expensify.com via admin-submit) submitted this report to you).

Fixed Issues

$ #35263

Tests

Create a workspace and invite a member
Enable Delay submissions and set the frequency to Daily
Enable Add approvals.
[Member] Create a few expenses but don't submit them
[Admin] Submit the expense report
Verify the message submitted %amount% is displayed in both accounts

Verify that no errors appear in the JS console

Offline tests

N/A

QA Steps

Same steps from test section

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 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
  - If any non-english text was added/modified, I verified the translation was requested/reviewed 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.js 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.
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: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

melvin-bot · 2024-04-25T22:06:10Z

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

marcochavezf · 2024-04-25T22:14:52Z

src/pages/home/report/ReportActionItem.tsx

@@ -580,6 +581,9 @@ function ReportActionItem({
        } else if (ReportActionsUtils.isOldDotReportAction(action)) {
            // This handles all historical actions from OldDot that we just want to display the message text
            children = <ReportActionItemBasicMessage message={ReportActionsUtils.getMessageOfOldDotReportAction(action)} />;
+        } else if (action.actionName === CONST.REPORT.ACTIONS.TYPE.SUBMITTED) {
+            const formattedAmount = CurrencyUtils.convertToDisplayString(Math.abs(report?.total ?? 0), report.currency);


Added report?.total ?? 0 to pass the ts check, but total will be always present if the report action is submitted, since that action only exists in expense reports.

parasharrajat · 2024-04-28T20:14:30Z

I don't know what is correct here. But I believe you when you say that it should be submitted x.x as it is when we submit the report. But then it raises a question why backend is sending that A (on behalf of you via admin-submit) submitted this report to A.

parasharrajat · 2024-04-28T20:15:04Z

BUG: Web: Copy to clipboard does not copy submitted x.x. Instead whole string messages is copied.

parasharrajat

Bugs above.

parasharrajat · 2024-04-30T18:48:31Z

Bump @marcochavezf

marcochavezf · 2024-05-01T21:32:18Z

why backend is sending that A (on behalf of you via admin-submit) submitted this report to A.

Ah, this is an old hardcoded message that we use for OldDot, and now we want to change it to submitted x.x. Also if we change the hardcoded message, we wouldn't be able to translate it in NewDot.

marcochavezf · 2024-05-01T21:33:04Z

BUG: Web: Copy to clipboard does not copy submitted x.x. Instead whole string messages is copied.

Thanks for catching that, fixed and ready for another review

marcochavezf · 2024-05-03T16:50:00Z

Friendly bump @parasharrajat

parasharrajat · 2024-05-06T11:19:49Z

Requested to extend trial for testing.

parasharrajat · 2024-05-07T10:02:18Z

BUG: LHN: Shows long message instead of submitted

parasharrajat · 2024-05-07T10:17:07Z

I think this is the last issue. Sorry for not finding this earlier. On Search page, the report shows No activity which is same for other reports as well so no issue there.

parasharrajat · 2024-05-07T10:21:47Z

BUG: thread title is not correct for the message.

BUG: Unrelated: I see another submitted message at the bottom of thread which seems wrong. But this is also present on staging.

parasharrajat · 2024-05-07T10:22:43Z

Possible Bug: I think we should update the email being sent to the users as well. That might still be showing the whole string to the user.

marcochavezf · 2024-05-07T18:12:17Z

Oh cool, thanks for finding those issues. We're working on other high-priority items this week, and then I will look at them. Seems most of them are backend bugs

marcochavezf · 2024-05-14T20:01:39Z

Backend PRs are in review, I will post again here when those are deployed

marcochavezf · 2024-07-01T20:12:44Z

Thanks for catching that @parasharrajat! Fixed:

Screen.Recording.2024-07-01.at.2.09.29.p.m.mov

parasharrajat · 2024-07-02T10:44:22Z

@marcochavezf I have a question about the avatar for the submitted message on the report header. Should this be the actor of the message or the user who created the report?

02.07.2024_16.09.42_REC.mp4

parasharrajat · 2024-07-02T10:46:05Z

Similarly, shouldn't LHN subtitle message be from Admin?

parasharrajat · 2024-07-02T19:08:16Z

@marcochavezf Thoughts?

marcochavezf · 2024-07-02T19:45:09Z

@marcochavezf I have a question about the avatar for the submitted message on the report header. Should this be the actor of the message or the user who created the report?

02.07.2024_16.09.42_REC.mp4

Yeah, in this case we should display the avatar of the user that submitted the report. I will check it out in a moment

marcochavezf · 2024-07-02T19:46:51Z

Similarly, shouldn't LHN subtitle message be from Admin?

Ah good point, @trjExpensify what are your thoughts about this one? I see we have the same pattern for approved messages

marcochavezf · 2024-07-02T20:22:59Z

The avatar issue is fixed now

Screen.Recording.2024-07-02.at.2.21.32.p.m.mov

parasharrajat · 2024-07-03T07:41:29Z

Thanks for the changes. I think we can look into the LHN-related discussion on a separate issue #41040 (comment). Better to have a separate PR for this. I can help review this too if needed. We have already extended the scope of this PR so let's target our testing on the main issue.

@marcochavezf What do you think?

parasharrajat · 2024-07-03T08:07:47Z

Screenshots

🔲 iOS / native

04.07.2024_19.51.06_REC.mp4

🔲 iOS / Safari

04.07.2024_19.33.42_REC.mp4

🔲 MacOS / Desktop

04.07.2024_15.30.18_REC.mp4

🔲 MacOS / Chrome

04.07.2024_15.18.18_REC.mp4

🔲 Android / Chrome

04.07.2024_19.35.40_REC.mp4

🔲 Android / native

04.07.2024_15.23.50_REC.mp4

marcochavezf · 2024-07-03T17:20:43Z

Yeah, I agree that we can consider the LHN-related issue out of scope. Thanks!

parasharrajat

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 approved by marketing by adding the Waiting for Copy label for a copy review on the original GH to get the correct copy.
- 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 form input styles:
- I verified that all the inputs inside a form are aligned with each other.
- I added Design label 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.

🎀 👀 🎀 C+ reviewed

melvin-bot · 2024-07-04T14:23:02Z

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

blimpich

LGTM

OSBotify · 2024-07-04T19:01:27Z

✋ 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-07-08T09:57:10Z

🚀 Deployed to staging by https://github.com/blimpich in version: 9.0.5-0 🚀

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

OSBotify · 2024-07-08T10:53:30Z

🚀 Deployed to staging by https://github.com/blimpich in version: 9.0.5-2 🚀

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

OSBotify · 2024-07-10T10:54:17Z

🚀 Deployed to production by https://github.com/Julesssss in version: 9.0.5-13 🚀

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

OSBotify · 2024-07-15T20:17:53Z

🚀 Deployed to production by https://github.com/thienlnam in version: 9.0.6-8 🚀

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

Display submitted message in report action

6ab6a13

marcochavezf self-assigned this Apr 25, 2024

marcochavezf requested a review from a team as a code owner April 25, 2024 22:06

melvin-bot bot removed the request for review from a team April 25, 2024 22:06

melvin-bot bot requested a review from parasharrajat April 25, 2024 22:06

marcochavezf mentioned this pull request Apr 25, 2024

[HOLD for payment 2024-07-22] [HOLD for payment 2024-07-17] [Collect approvers] [$500] Expense - Owner of submission message changes from admin to employee when admin submits it #35263

Closed

6 tasks

Fix ts error

8388c28

marcochavezf commented Apr 25, 2024

View reviewed changes

parasharrajat suggested changes Apr 28, 2024

View reviewed changes

marcochavezf added 2 commits May 1, 2024 15:11

Merge branch 'main' into marco-updateSubmittedAdminMessage

d636db2

Set SUBMITTED message to clipboard

39d7f11

marcochavezf requested a review from parasharrajat May 1, 2024 21:33

Fix linting

e7bb153

marcochavezf added 3 commits May 8, 2024 17:53

Merge branch 'main' into marco-updateSubmittedAdminMessage

8c3a7d4

Merge branch 'main' into marco-updateSubmittedAdminMessage

ff7db35

Merge branch 'main' into marco-updateSubmittedAdminMessage

c69fbdb

marcochavezf added 3 commits July 1, 2024 13:24

Merge branch 'main' into marco-updateSubmittedAdminMessage

05a779f

Display correct submitted message optimistically

6a1300f

Use parentReport in thread reports

6ade994

marcochavezf added 4 commits July 1, 2024 14:44

Restore getIOUSubmittedMessage and update it

b2fc3e0

Re-use getIOUSubmittedMessage in ReportActionItem

cf856b2

Remove CurrencyUtils

026bdd5

Remove CurrencyUtils from ContextMenuAction

d736969

refactor: Update getIcons function to use getReportActionActorAccountID

1e67f73

parasharrajat approved these changes Jul 4, 2024

View reviewed changes

melvin-bot bot requested a review from blimpich July 4, 2024 14:23

blimpich approved these changes Jul 4, 2024

View reviewed changes

blimpich merged commit 21f74e9 into main Jul 4, 2024
15 checks passed

blimpich deleted the marco-updateSubmittedAdminMessage branch July 4, 2024 18:53

github-actions bot mentioned this pull request Jul 8, 2024

Deploy Checklist: New Expensify 2024-07-08 #44947

Closed

86 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Display submitted message in report action #41040

Display submitted message in report action #41040

marcochavezf commented Apr 25, 2024

melvin-bot bot commented Apr 25, 2024

marcochavezf Apr 25, 2024

parasharrajat commented Apr 28, 2024 •

edited

Loading

parasharrajat commented Apr 28, 2024 •

edited

Loading

parasharrajat left a comment

parasharrajat commented Apr 30, 2024

marcochavezf commented May 1, 2024

marcochavezf commented May 1, 2024

marcochavezf commented May 3, 2024

parasharrajat commented May 6, 2024

parasharrajat commented May 7, 2024

parasharrajat commented May 7, 2024 •

edited

Loading

parasharrajat commented May 7, 2024

parasharrajat commented May 7, 2024

marcochavezf commented May 7, 2024

marcochavezf commented May 14, 2024

marcochavezf commented Jul 1, 2024

parasharrajat commented Jul 2, 2024

parasharrajat commented Jul 2, 2024

parasharrajat commented Jul 2, 2024

marcochavezf commented Jul 2, 2024

marcochavezf commented Jul 2, 2024

marcochavezf commented Jul 2, 2024

parasharrajat commented Jul 3, 2024

parasharrajat commented Jul 3, 2024 •

edited

Loading

marcochavezf commented Jul 3, 2024

parasharrajat left a comment

melvin-bot bot commented Jul 4, 2024

blimpich left a comment

OSBotify commented Jul 4, 2024

OSBotify commented Jul 8, 2024

OSBotify commented Jul 8, 2024

OSBotify commented Jul 10, 2024

OSBotify commented Jul 15, 2024

Display submitted message in report action #41040

Display submitted message in report action #41040

Conversation

marcochavezf commented Apr 25, 2024

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Apr 25, 2024

marcochavezf Apr 25, 2024

Choose a reason for hiding this comment

parasharrajat commented Apr 28, 2024 • edited Loading

parasharrajat commented Apr 28, 2024 • edited Loading

parasharrajat left a comment

Choose a reason for hiding this comment

parasharrajat commented Apr 30, 2024

marcochavezf commented May 1, 2024

marcochavezf commented May 1, 2024

marcochavezf commented May 3, 2024

parasharrajat commented May 6, 2024

parasharrajat commented May 7, 2024

parasharrajat commented May 7, 2024 • edited Loading

parasharrajat commented May 7, 2024

parasharrajat commented May 7, 2024

marcochavezf commented May 7, 2024

marcochavezf commented May 14, 2024

marcochavezf commented Jul 1, 2024

parasharrajat commented Jul 2, 2024

parasharrajat commented Jul 2, 2024

parasharrajat commented Jul 2, 2024

marcochavezf commented Jul 2, 2024

marcochavezf commented Jul 2, 2024

marcochavezf commented Jul 2, 2024

parasharrajat commented Jul 3, 2024

parasharrajat commented Jul 3, 2024 • edited Loading

Screenshots

🔲 iOS / native

🔲 iOS / Safari

🔲 MacOS / Desktop

🔲 MacOS / Chrome

🔲 Android / Chrome

🔲 Android / native

marcochavezf commented Jul 3, 2024

parasharrajat left a comment

Choose a reason for hiding this comment

Reviewer Checklist

melvin-bot bot commented Jul 4, 2024

blimpich left a comment

Choose a reason for hiding this comment

OSBotify commented Jul 4, 2024

OSBotify commented Jul 8, 2024

OSBotify commented Jul 8, 2024

OSBotify commented Jul 10, 2024

OSBotify commented Jul 15, 2024

parasharrajat commented Apr 28, 2024 •

edited

Loading

parasharrajat commented Apr 28, 2024 •

edited

Loading

parasharrajat commented May 7, 2024 •

edited

Loading

parasharrajat commented Jul 3, 2024 •

edited

Loading