Fix the incorrect payer name on the non-reimbursable transaction #37773

mollfpr · 2024-03-05T16:52:27Z

Details

Change the logic on defining the payer name for a non-reimbursable transaction to show the requestor name instead of the manager/approver name of the workspace.

Fixed Issues

$ #36186
PROPOSAL: #36186 (comment)

Tests

Contributor can't get access to the Expensify Card transaction, so instead we can create a manual request data and merge the data with the dummy Expensify card data via the console. For speed things up, you can put the above code in the component (e.g., ReportScreen).

Onyx.merge('cardList',
{
  4: {
    "bank": "Expensify Card",
    "lastFourPAN": 3458,
  }
}
);

Onyx.merge('transactions_<TRANSACTIONID>', {amount: 1000, currency: 'USD', cardID: 4,  modifiedMerchant: null, merchant: "Test ECard Transaction", mccGroup: "Airlines", status:"Posted", hasEReceipt: true, receipt: {}, reimbursable: false });

Login with an account that an employee of a collect policy
Go to the workspace report and create a manual request
Take a note on the transactionID for the manual request you just created
Merge the dummy data with the transactionID
Verify the text on 3 places below correctly showing <requestor's name> spent

5a. Alternate text on LHN

5b. Report preview

5c. Money report preview header

Verify that no errors appear in the JS console

Offline tests

Same as the tests.

QA Steps

Log in to your account with the Expensify Card transaction ([email protected])
Go to the workspace chat with the transaction (https://staging.new.expensify.com/r/4612388815642526. If the transaction is settled, please create another Expensify Card transaction)
Verify the text on 3 places below correctly showing <requestor's name> spent

3a. Alternate text on LHN

3b. Report preview

3c. Money report preview header

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

…view

…alternate text and IOU report header

melvin-bot · 2024-03-05T16:52:32Z

@aimane-chnaif 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]

mollfpr

While working on the PR, I tried to create a util function to return the payer name based on the IOU report, but I noticed it's hard to read the code because we have separate checks for the verb key to combine them with the payer name.

To make matters things simple, I just update the variable that holds the payer name to correctly use the ownerAccountID in the individual function to give more idea and align with the logic for the verb key.

Also, I noticed that we don't need to check if it's a card transaction because I believe the check is already covered in hasNonReimbursableTransactions.

mollfpr · 2024-03-05T16:54:31Z

src/components/ReportActionItem/ReportPreview.tsx

        if (isApproved) {
            return translate('iou.managerApproved', {manager: payerOrApproverName});
        }
-        const managerName = isPolicyExpenseChat && !hasNonReimbursableTransactions ? ReportUtils.getPolicyName(chatReport) : ReportUtils.getDisplayNameForParticipant(managerID, true);


The check !hasNonReimbursableTransactions is not needed here, so that's why I using the previous variable to get the payer name.

mollfpr · 2024-03-05T16:59:07Z

src/libs/ReportUtils.ts

@@ -2090,7 +2089,8 @@ function getMoneyRequestReportName(report: OnyxEntry<Report>, policy: OnyxEntry<
        return `${payerPaidAmountMessage} • ${Localize.translateLocal('iou.pending')}`;
    }

-    if (hasNonReimbursableTransactions(report?.reportID)) {
+    if (!isSettled(report?.reportID) && hasNonReimbursableTransactions(report?.reportID)) {


An issue I stumbled upon while working on the PR is that after the non-reimbursable transaction is paid and clicking on the report preview, the money report header still shows <name> spent instead of <name> paid.

Screen.Recording.2024-03-05.at.21.33.16.mp4

So adding the check if the transaction paid shows the spent verb.

aimane-chnaif · 2024-03-10T17:35: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 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.

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

payee.mov

payer.mov

MacOS: Desktop

aimane-chnaif · 2024-03-10T17:11:39Z

src/libs/ReportUtils.ts

@@ -2374,7 +2374,7 @@ function getReportPreviewMessage(
    const containsNonReimbursable = hasNonReimbursableTransactions(report.reportID);
    const totalAmount = getMoneyRequestSpendBreakdown(report).totalDisplaySpend;
    const policyName = getPolicyName(report, false, policy);
-    const payerName = isExpenseReport(report) && !containsNonReimbursable ? policyName : getDisplayNameForParticipant(report.managerID, !isPreviewMessageForParentChatReport);
+    const payerName = isExpenseReport(report) ? policyName : getDisplayNameForParticipant(report.managerID, !isPreviewMessageForParentChatReport);


{workspace name} approved $xxx. (this branch)

{payer name} approved $xxx. (main)

I think {payer name} was existing bug (regression from #35529) and {workspace name} is correct.
@mollfpr can you confirm?

Yes, I believe so!

@grgia Do you mind confirming if the above result is correct?

mollfpr · 2024-03-14T13:55:34Z

Friendly bump @grgia

grgia

I triggered a test build so we can more quickly test various cases of headers

grgia · 2024-03-18T10:18:04Z

@mollfpr @aimane-chnaif could you confirm if this case is also fixed by this PR?

#37838

github-actions · 2024-03-18T10:34:55Z

🧪🧪 Use the links below to test this adhoc build on Android, iOS, Desktop, and Web. Happy testing! 🧪🧪

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.amazonaws.com/android/37773/index.html	https://ad-hoc-expensify-cash.s3.amazonaws.com/ios/37773/index.html

Desktop 💻	Web 🕸️
https://ad-hoc-expensify-cash.s3.amazonaws.com/desktop/37773/NewExpensify.dmg	https://37773.pr-testing.expensify.com

👀 View the workflow run that generated this build 👀

aimane-chnaif · 2024-03-19T17:25:21Z

@mollfpr @aimane-chnaif could you confirm if this case is also fixed by this PR?

#37838

yes exactly. It's 3c. Money report preview header in QA Steps

grgia · 2024-03-20T10:34:34Z

@mollfpr could you merge main?

…x-36186

mollfpr · 2024-03-20T12:37:40Z

Fixed the conflict!

grgia · 2024-03-22T11:20:42Z

Thank you @mollfpr, I'm just going to have a second pair of eyes take a look at the adhoc build before I merge :)

grgia

code LGTM, holding merge on extra internal testing

kevinksullivan · 2024-03-22T20:56:06Z

Hmm how do I use the links here? It seems I don't have access

kevinksullivan · 2024-03-22T21:14:06Z

I tested a card transaction on staging / reported on a free workspace and I see the correct person in the title ("Kevin"). Is that all we need to do to confirm this is working as expected?

melvin-bot · 2024-03-25T16:43:06Z

@grgia looks like this was merged without a test passing. Please add a note explaining why this was done and remove the Emergency label if this is not an emergency.

grgia · 2024-03-25T16:43:51Z

not sure what happened there

OSBotify · 2024-03-25T16:49:15Z

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

mollfpr added 2 commits March 5, 2024 23:19

show the requestor name for non-reimbursable transaction on ReportPre…

3f7d952

…view

show the requestor name for non-reimburseable transaction on the LHN …

e043a78

…alternate text and IOU report header

mollfpr requested a review from a team as a code owner March 5, 2024 16:52

melvin-bot bot requested review from aimane-chnaif and removed request for a team March 5, 2024 16:52

mollfpr commented Mar 5, 2024

View reviewed changes

aimane-chnaif reviewed Mar 10, 2024

View reviewed changes

aimane-chnaif approved these changes Mar 12, 2024

View reviewed changes

melvin-bot bot requested a review from grgia March 12, 2024 12:37

grgia added the Ready To Build label Mar 18, 2024

grgia reviewed Mar 18, 2024

View reviewed changes

Merge branch 'main' of https://github.com/mollfpr/App into mollfpr-fi…

38c263d

…x-36186

grgia approved these changes Mar 22, 2024

View reviewed changes

mollfpr mentioned this pull request Mar 22, 2024

[HOLD for payment 2024-04-05] [$500] [MEDIUM] Expensify Cards: Wrong report header for the money spent #36186

Closed

6 tasks

grgia merged commit f2e4f55 into Expensify:main Mar 25, 2024
15 checks passed

melvin-bot bot added the Emergency label Mar 25, 2024

grgia removed the Emergency label Mar 25, 2024

github-actions bot mentioned this pull request Mar 27, 2024

Deploy Checklist: New Expensify 2024-03-27 #39033

Closed

FitseTLT mentioned this pull request Mar 28, 2024

[HOLD for payment 2024-04-15] [$500] Expense - LHN preview does not show request description for request with description #39158

Closed

6 tasks

mollfpr mentioned this pull request Mar 28, 2024

Fix LHN preview does not show request description for request with description #39208

Merged

50 tasks

bernhardoj mentioned this pull request Apr 3, 2024

[HOLD for payment 2024-04-15] [$500] IOU - Multiline IOU description from 1:1 DM in LHN is not truncated #39437

Closed

6 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix the incorrect payer name on the non-reimbursable transaction #37773

Fix the incorrect payer name on the non-reimbursable transaction #37773

mollfpr commented Mar 5, 2024

melvin-bot bot commented Mar 5, 2024

mollfpr left a comment

mollfpr Mar 5, 2024

mollfpr Mar 5, 2024

aimane-chnaif commented Mar 10, 2024

aimane-chnaif Mar 10, 2024

mollfpr Mar 12, 2024 •

edited

Loading

mollfpr commented Mar 14, 2024

grgia left a comment

grgia commented Mar 18, 2024

github-actions bot commented Mar 18, 2024

aimane-chnaif commented Mar 19, 2024 •

edited

Loading

grgia commented Mar 20, 2024

mollfpr commented Mar 20, 2024

grgia commented Mar 22, 2024

grgia left a comment

kevinksullivan commented Mar 22, 2024

kevinksullivan commented Mar 22, 2024

melvin-bot bot commented Mar 25, 2024

grgia commented Mar 25, 2024

OSBotify commented Mar 25, 2024

Fix the incorrect payer name on the non-reimbursable transaction #37773

Fix the incorrect payer name on the non-reimbursable transaction #37773

Conversation

mollfpr commented Mar 5, 2024

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Mar 5, 2024

mollfpr left a comment

Choose a reason for hiding this comment

mollfpr Mar 5, 2024

Choose a reason for hiding this comment

mollfpr Mar 5, 2024

Choose a reason for hiding this comment

aimane-chnaif commented Mar 10, 2024

Reviewer Checklist

Screenshots/Videos

aimane-chnaif Mar 10, 2024

Choose a reason for hiding this comment

mollfpr Mar 12, 2024 • edited Loading

Choose a reason for hiding this comment

mollfpr commented Mar 14, 2024

grgia left a comment

Choose a reason for hiding this comment

grgia commented Mar 18, 2024

github-actions bot commented Mar 18, 2024

aimane-chnaif commented Mar 19, 2024 • edited Loading

grgia commented Mar 20, 2024

mollfpr commented Mar 20, 2024

grgia commented Mar 22, 2024

grgia left a comment

Choose a reason for hiding this comment

kevinksullivan commented Mar 22, 2024

kevinksullivan commented Mar 22, 2024

melvin-bot bot commented Mar 25, 2024

grgia commented Mar 25, 2024

OSBotify commented Mar 25, 2024

mollfpr Mar 12, 2024 •

edited

Loading

aimane-chnaif commented Mar 19, 2024 •

edited

Loading