Adjust copy for various report actions #60171

nyomanjyotisa · 2025-04-14T06:22:19Z

Explanation of Change

Fixed Issues

$ #60035
PROPOSAL: #60035 (comment)

Tests

Same as QA Steps

Verify that no errors appear in the JS console

Offline tests

Same as QA Steps

QA Steps

Test 1 (Submitting Expense):

Go to Settings > Workspaces > Workflows
Adjust the Submission frequency
Create an expense on the workspace and wait for it to be submitted automatically
Verify that the copy should read "submitted via delay submissions"
Create an expense on the workspace and submit it manually
Verify that the copy should read "submitted"

Test 2 (Approving Expense):

Go to Settings > Workspaces > Rules
Turn on the "Auto-approve compliant reports" option
Create an expense on the workspace, submit and wait for it to be approved automatically
Verify that the copy should read "approved via workspace rules"
Turn off "Auto-approve compliant reports" or create an expense on another workspace and approve it manually
Verify that the copy should read "approved"

Test 3 (Paying Expense):

Go to Settings > Workspaces > Rules
Turn on the "Auto-pay approved reports" option
Create an expense on the workspace, submit, approve wait for it to be paid automatically
Verify that the copy should read "paid with Expensify via workspace rules"
Turn off "Auto-pay approved reports" or create an expense on another workspace and pay it manually
Verify that the copy should read "paid with Expensify" and "paid elsewhere" if paid elsewhere

Test 4 (Exporting Expense):

Go to Settings > Workspaces > More feature > Enable Accounting
Connect to one of the accounting systems
Go to Export > Export date > Change it to Submitted date
Create an expense on the workspace, submit, approve it manually and wait for it to be exported automatically
Verify that the copy should read "exported to %Accouting integration% via accounting settings and successfully created a record for [%type of expense% expenses]"
Export it manually
Verify that the copy should read "exported to %Accounting integration% and successfully created a record for [%type of expense% expenses](link to expenses in accounting integration)."
Note: for both manual and automatic exports, if the report has both out of pocket and company card expenses, the system message will be:
"exported to %Accounting integration% and successfully created a record for [out of pocket expenses](link to out of pocket expenses in accounting integration) and [company card expenses](link to company card expenses in accounting integration)."

Test 5 (Manual export to export file):

Create an expense on a workspace
Click on the expense header
Click on "Download as CSV"
Verify that the copy should read "exported to CSV"

Test 6 (Canceling Payment):

Create an expense on a workspace and pay the expense
Click on More > Cancel payment
Verify that the copy should read "canceled the payment"

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Automatically	Manually

Automatically Submit	Canceling Payment

Android: mWeb Chrome

Automatically	Manually

Automatically Submit	Canceling Payment

iOS: Native

Automatically	Manually

Automatically Submit	Canceling Payment

iOS: mWeb Safari

Automatically	Manually

Automatically Submit	Canceling Payment

MacOS: Chrome / Safari

Automatically	Manually

Automatically Submit	Canceling Payment

MacOS: Desktop

Automatically	Manually

Automatically Submit	Canceling Payment

melvin-bot · 2025-04-15T03:30:01Z

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

nyomanjyotisa · 2025-04-15T03:32:49Z

@ahmedGaber93 I'm unable to test auto submit, payment, and export to accounting integration for company card expenses at the moment. But I think all the copy displays correctly

nyomanjyotisa · 2025-04-15T03:48:11Z

I've started a new Slack discussion here to confirm the translation

ahmedGaber93 · 2025-04-21T01:22:26Z

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 that the composer does not automatically focus or open the keyboard on mobile unless explicitly intended. This includes checking that returning the app from the background does not unexpectedly open the keyboard.
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

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

ahmedGaber93 · 2025-04-21T03:11:58Z

src/CONST.ts

@@ -1057,6 +1057,8 @@ const CONST = {
    COMPANY_CARDS_CONNECT_CREDIT_CARDS_HELP_URL: 'https://help.expensify.com/new-expensify/hubs/connect-credit-cards/',
    CUSTOM_REPORT_NAME_HELP_URL: 'https://help.expensify.com/articles/expensify-classic/spending-insights/Custom-Templates',
    CONFIGURE_REIMBURSEMENT_SETTINGS_HELP_URL: 'https://help.expensify.com/articles/expensify-classic/workspaces/Configure-Reimbursement-Settings',
+    CONFIGURE_EXPENSE_REPORT_RULES_HELP_URL: 'https://help.expensify.com/articles/new-expensify/workspaces/Set-up-rules#configure-expense-report-rules',
+    SELECT_WORKFLOWS_HELP_URL: 'https://help.expensify.com/articles/new-expensify/workspaces/Set-up-workflows#select-workflows',


I think DELAYED_SUBMISSION_HELP_URL will be unused after declaring this, let's remove it if it is unused.

ahmedGaber93 · 2025-04-21T03:12:30Z

src/languages/en.ts

@@ -1003,7 +1003,7 @@ const translations = {
        submitAmount: ({amount}: RequestAmountParams) => `Submit ${amount}`,
        submittedAmount: ({formattedAmount, comment}: RequestedAmountMessageParams) => `submitted ${formattedAmount}${comment ? ` for ${comment}` : ''}`,
        automaticallySubmittedAmount: ({formattedAmount}: RequestedAmountMessageParams) =>
-            `automatically submitted ${formattedAmount} via <a href="${CONST.DELAYED_SUBMISSION_HELP_URL}">delayed submission</a>`,
+            `submitted ${formattedAmount} via <a href="${CONST.SELECT_WORKFLOWS_HELP_URL}">delayed submissions</a>`,


Suggested change

`submitted ${formattedAmount} via <a href="${CONST.SELECT_WORKFLOWS_HELP_URL}">delayed submissions</a>`,

`submitted ${formattedAmount} via <a href="${CONST.SELECT_WORKFLOWS_HELP_URL}">delay submissions</a>`,

Could you also update the Spanish translation and the translation post on slack?

ahmedGaber93 · 2025-04-21T03:32:47Z

src/libs/ReportActionsUtils.ts

+    if (!isPending) {
+        result.push({
+            text: translateLocal('report.actions.type.exportedToIntegration.automaticActionThree'),
+            url: '',
+        });
+    }


I think the condition reimbursableUrls.length || nonReimbursableUrls.length may be accurate than !isPending, this will confirm that 'and successfully created a record for' will always follow by a link.

nyomanjyotisa · 2025-04-21T08:33:27Z

PR updated

ahmedGaber93 · 2025-04-21T22:35:14Z

Screenshots/Videos

Exporting to file

Before:

After:

automatically exporting to accounting integration

Before:

After:

automatically approved

automatically submitting

ahmedGaber93 · 2025-04-21T22:45:58Z

@nyomanjyotisa could you ask again for translation on slack and link the old post for details?

nyomanjyotisa · 2025-04-22T05:55:23Z

Sure, I've bumped the discussion here
Could you help me tag someone from the internal team to forward it to the translation room? @ahmedGaber93

ahmedGaber93

LGTM! We just still need to confirm Spanish translation.

ahmedGaber93 · 2025-04-22T19:50:22Z

Could you help me tag someone from the internal team to forward it to the translation room? @ahmedGaber93

Maybe @joekaufmanexpensify @Julesssss can help 🙏

Julesssss · 2025-04-22T20:28:14Z

src/languages/en.ts

-                    reimburseableLink: 'View out-of-pocket expenses.',
-                    nonReimbursableLink: 'View company card expenses.',
+                    automaticActionThree: 'and successfully created a record for',
+                    and: 'and',


Lets use 'and' from a different string. We can use or make a common string for this.

Julesssss · 2025-04-22T20:42:07Z

Maybe @joekaufmanexpensify @Julesssss can help 🙏

I have requests copy review internally here.

nyomanjyotisa · 2025-04-23T05:29:58Z

PR updated

Julesssss

Thanks for holding. I'll share the final translations below

Julesssss · 2025-04-30T16:34:15Z

submitted ${formattedAmount} via delay submissions
- envió ${formattedAmount} mediante retrasar envíos
approved ${amount} via workspace rules
- aprobó ${amount} mediante reglas del espacio de trabajo
paid ${amount} with Expensify via workspace rules
- pagó ${amount} con Expensify via reglas del espacio de trabajo
exported to CSV
- exportado a CSV
exported to
- exportado a
exported to ${label} via
- exportado a ${label} mediante
and successfully created a record for
- y creó un registro con éxito para
out-of-pocket expenses
- Exportar gastos por cuenta propia como
company card expenses.
- gastos de la tarjeta de empresa.

nyomanjyotisa · 2025-05-01T02:04:28Z

The amount ($XX.XX) on approved and submitted translations has been removed in this PR
cc @Julesssss @ahmedGaber93

joekaufmanexpensify · 2025-05-01T15:06:05Z

@nyomanjyotisa @Julesssss @ahmedGaber93 We had a discussion on the removing of the $xx.xx here. We want to proceed with doing that, but are reverting #59706 because it caused a different bug.

Could you guys just fold removing the $xx.xx from the report actions here? We want to remove it from any manual/automatic report actions related to submitting/approving/paying/unapproving/canceling payment.

ahmedGaber93 · 2025-05-01T15:24:39Z

Could you guys just fold removing the $xx.xx from the report actions here?

Yes, sure.

nyomanjyotisa · 2025-05-21T02:33:17Z

Fixed! @Julesssss

OSBotify · 2025-05-21T16:30:22Z

✋ 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-05-21T18:29:25Z

🚀 Deployed to staging by https://github.com/Julesssss in version: 9.1.48-0 🚀

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

github-actions · 2025-05-21T21:00:06Z

🚀 Deployed to staging by https://github.com/Julesssss in version: 9.1.48-0 🚀

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

nlemma · 2025-05-22T09:17:30Z

@nyomanjyotisa Testers are not seeing amounts when submitting, approving and paying expenses. Is this expected?

Bug6839035_1747904315029.bandicam_2025-05-22_11-39-55-769.mp4

github-actions · 2025-05-22T10:52:05Z

🚀 Deployed to staging by https://github.com/Julesssss in version: 9.1.49-5 🚀

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

Julesssss · 2025-05-22T16:33:05Z

@nyomanjyotisa Testers are not seeing amounts when submitting, approving and paying expenses. Is this expected?

Thanks for raising, no that's not expected.

nlemma · 2025-05-22T16:38:11Z

The issue is not reproducible on prod. There was a similar occurrence over here and I wanted to make sure before creating a new ticket.

bandicam.2025-05-22.12-09-51-909.mp4

ahmedGaber93 · 2025-05-22T16:38:28Z

@Julesssss this is expected, we remove amount from from some system actions. I am afk, give me 10 minutes and I will share the context.

Julesssss · 2025-05-22T16:39:49Z

Thnks. I'm just looking at the desired comments from @joekaufmanexpensify here, and I thought we still wanted the amount to show for submitting and approving, but not export.

ahmedGaber93 · 2025-05-22T16:50:21Z

Sorry, I was away from the keyboard. Here is the comment #60171 (comment)

Could you guys just fold removing the $xx.xx from the report actions here? We want to remove it from any manual/automatic report actions related to submitting/approving/paying/unapproving/canceling payment.

ahmedGaber93 · 2025-05-22T16:52:07Z

But it looks we missed updating the Test steps after the context changed.

@nyomanjyotisa Please update Test steps to include this change.

Julesssss · 2025-05-22T16:52:49Z

Ah I see. Thank you for sharing, I wasn't able to find that requirement 👍

This reverts commit 7abe4cd, reversing changes made to e9cdd22.

[CP Staging] Revert #60171 "Adjust copy for various report actions"

[CP Staging] Revert #60171 "Adjust copy for various report actions" (cherry picked from commit 60b83cd) (cherry-picked to staging by francoisl)

Jdwang23 · 2025-05-23T02:49:08Z

Hi,it seems like the action which submitted without amount is expected.But your upwork job is still here

github-actions · 2025-05-23T19:04:16Z

🚀 Deployed to production by https://github.com/arosiclair in version: 9.1.50-0 🚀

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

github-actions · 2025-05-23T19:29:58Z

🚀 Deployed to staging by https://github.com/Julesssss in version: 9.1.51-0 🚀

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

Adjust copy for various report actions

1b96e67

nyomanjyotisa marked this pull request as ready for review April 15, 2025 03:29

nyomanjyotisa requested a review from a team as a code owner April 15, 2025 03:29

melvin-bot bot requested review from ahmedGaber93 and removed request for a team April 15, 2025 03:30

ahmedGaber93 suggested changes Apr 21, 2025

View reviewed changes

minor fix

3aa87ed

ahmedGaber93 approved these changes Apr 22, 2025

View reviewed changes

melvin-bot bot requested a review from Julesssss April 22, 2025 19:48

Julesssss reviewed Apr 22, 2025

View reviewed changes

Julesssss mentioned this pull request Apr 22, 2025

[Due for payment 2025-05-30] [$250] Adjust copy for various report actions #60035

Open

minor fix

6a2c41e

Julesssss reviewed Apr 30, 2025

View reviewed changes

nyomanjyotisa added 2 commits May 1, 2025 08:26

en translation update

2c13b4e

Merge branch 'main' into issue-60035

05acc5b

Merge branch 'main' into issue-60035

1e2cc81

Julesssss approved these changes May 21, 2025

View reviewed changes

Julesssss merged commit 7abe4cd into Expensify:main May 21, 2025
16 checks passed

github-actions bot mentioned this pull request May 21, 2025

Deploy Checklist: New Expensify 2025-05-21 #62497

Closed

nyomanjyotisa mentioned this pull request May 22, 2025

[$250] Expense Report - Submitted "<amount>" message is not displayed #62546

Closed

8 tasks

lanitochka17 mentioned this pull request May 22, 2025

[$250] Rules - "Auto-pay approved reports" feature does not work #62606

Open

16 tasks

gijoe0295 mentioned this pull request May 22, 2025

[Due for payment 2025-05-30] Incorrecty system message for approved reports #62616

Closed

16 tasks

francoisl added a commit that referenced this pull request May 22, 2025

Revert "Merge pull request #60171 from nyomanjyotisa/issue-60035"

3cc03ed

This reverts commit 7abe4cd, reversing changes made to e9cdd22.

francoisl mentioned this pull request May 22, 2025

[CP Staging] Revert #60171 "Adjust copy for various report actions" #62622

Merged

51 tasks

JS00001 added a commit that referenced this pull request May 23, 2025

Merge pull request #62622 from Expensify/francois-revert-60171

60b83cd

[CP Staging] Revert #60171 "Adjust copy for various report actions"

francoisl pushed a commit that referenced this pull request May 23, 2025

Merge pull request #62622 from Expensify/francois-revert-60171

2732223

[CP Staging] Revert #60171 "Adjust copy for various report actions" (cherry picked from commit 60b83cd) (cherry-picked to staging by francoisl)

nyomanjyotisa mentioned this pull request May 23, 2025

Revert #62622 #62628

Open

51 tasks

jponikarchuk mentioned this pull request May 23, 2025

Copy of the paying automatically report is wrong #62635

Closed

8 tasks

github-actions bot mentioned this pull request May 23, 2025

Deploy Checklist: New Expensify 2025-05-23 #62662

Open

84 tasks

	`submitted ${formattedAmount} via <a href="${CONST.SELECT_WORKFLOWS_HELP_URL}">delayed submissions</a>`,
	`submitted ${formattedAmount} via <a href="${CONST.SELECT_WORKFLOWS_HELP_URL}">delay submissions</a>`,

Adjust copy for various report actions #60171

Adjust copy for various report actions #60171

Uh oh!

Conversation

nyomanjyotisa commented Apr 14, 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 Apr 15, 2025

Uh oh!

nyomanjyotisa commented Apr 15, 2025

Uh oh!

nyomanjyotisa commented Apr 15, 2025

Uh oh!

ahmedGaber93 commented Apr 21, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

ahmedGaber93 Apr 21, 2025

Choose a reason for hiding this comment

Uh oh!

ahmedGaber93 Apr 21, 2025

Choose a reason for hiding this comment

Uh oh!

ahmedGaber93 Apr 21, 2025

Choose a reason for hiding this comment

Uh oh!

ahmedGaber93 Apr 21, 2025

Choose a reason for hiding this comment

Uh oh!

ahmedGaber93 Apr 21, 2025

Choose a reason for hiding this comment

Uh oh!

nyomanjyotisa commented Apr 21, 2025

Uh oh!

ahmedGaber93 commented Apr 21, 2025

Screenshots/Videos

Uh oh!

ahmedGaber93 commented Apr 21, 2025

Uh oh!

nyomanjyotisa commented Apr 22, 2025

Uh oh!

ahmedGaber93 left a comment

Choose a reason for hiding this comment

Uh oh!

ahmedGaber93 commented Apr 22, 2025

Uh oh!

Julesssss Apr 22, 2025

Choose a reason for hiding this comment

Uh oh!

Julesssss commented Apr 22, 2025

Uh oh!

nyomanjyotisa commented Apr 23, 2025

Uh oh!

Julesssss left a comment

Choose a reason for hiding this comment

Uh oh!

Julesssss commented Apr 30, 2025

Uh oh!

nyomanjyotisa commented May 1, 2025

Uh oh!

joekaufmanexpensify commented May 1, 2025

Uh oh!

ahmedGaber93 commented May 1, 2025

Uh oh!

nyomanjyotisa commented May 21, 2025

Uh oh!

Uh oh!

OSBotify commented May 21, 2025

Uh oh!

github-actions bot commented May 21, 2025

Uh oh!

github-actions bot commented May 21, 2025

nyomanjyotisa commented Apr 14, 2025 •

edited

Loading

ahmedGaber93 commented Apr 21, 2025 •

edited

Loading

ahmedGaber93 commented May 22, 2025 •

edited

Loading

Jdwang23 commented May 23, 2025 •

edited

Loading