Fix/30042 fix lhn previews and report actions v2 #33346

koko57 · 2023-12-20T12:20:00Z

Details

Fixed Issues

$ #30042
PROPOSAL: #30042 (comment)

Tests

Create an iouReport

Global Create > Request Money > $50 > choose a person > Confirm
Land in the DM
Look at the LHN row to observe the preview

request action preview (requestor view)

Tom Rhys Jones owes $50.00
requested 10.00

request action preview (payer view)

Tom Rhys Jones owes $50.00
Agata: requested 10.00

DMs:
owed iouReport being previewed (Agata view - DM)

Tom Rhys Jones
Tom Rhys Jones owes $50.00

owed iouReport being previewed (Tom view - DM)

Agata Kosior
Tom Rhys Jones owes $50.00

Create an expenseReport

Create a workspace if you need to
Global Create > Request Money > $50 > choose the workspace > confirm
Land in the workspace chat
Look at the LHN row to observe the preview

Request action preview (admin viewer)

Duraflame owes $100.00
Tom: requested $50.00

Request action preview (requestor viewer)

Duraflame owes $100.00
requested $50.00

owed expenseReport being previewed (member view - workspace chat)

Duraflame
Duraflame owes $50.00

owed expenseReport being previewed (admin view - workspace chat)

Tom Rhys Jones
Duraflame owes $50.00

Pay an iouReport

Navigate to the iouReport view
Click Pay elsewhere green button at the top right of the report

paid action preview (requestor view)

Tom Rhys Jones paid $50.00
Tom: paid $50.00 elsewhere

paid action preview (payer view)

Tom Rhys Jones paid $50.00
paid $50.00 elsewhere

paid iouReport being previewed (Agata view - DM)

Tom Rhys Jones
Tom Rhys Jones paid $50.00

paid iouReport being previewed (Tom view - DM)

Agata Kosior
Tom Rhys Jones paid $50.00

Pay an expenseReport

Navigate to the expenseReport view
Click Pay elsewhere green button at the top right of the report
Observe the system message added to the expenseReport
Observe the LHN preview

Paid action preview (admin viewer)

Duraflame paid $100.00
paid $100.00 elsewhere

paid action preview (requestor viewer)

Duraflame paid $100.00
Agata: paid $100.00 elsewhere

paid expenseReport being previewed (member view - workspace chat)

Duraflame
Duraflame paid $50.00

paid expenseReport being previewed (admin view - workspace chat)

Tom Rhys Jones
Duraflame paid $50.00

Add a comment

comment preview (sender view)

Tom Rhys Jones owes $50.00 <--- note: this is obviously variable dependent on if the report title is owed or paid
blah, blah, I love apples!

comment preview (receiver view)

Tom Rhys Jones owes $50.00 <--- note: this is obviously variable dependent on if the report title is owed or paid
Tom: blah, blah, I love apples!

comment preview (comment sender viewer)

Duraflame owes $100.00 <--- note: this is obviously variable dependent on if the report title is owed or paid
blah blah, I love bananas!

comment preview (comment receiver viewer)

Duraflame owes $100.00 <--- note: this is obviously variable dependent on if the report title is owed or paid
Tom: blah blah, I love bananas!

Verify that other previews are not affected
Verify that the amount changes properly (i.e. when requesting in other currency)

Go to 1:1 DM.
Click + > Request money.
Create a manual request using a different currency.
Click on the IOU preview to open IOU report.
Note that the amount for the IOU report in LHN shows the local currency instead of the requested currency.

or when changing the amount

Go to 1:1 DM.
Click + > Request money.
Create a manual request.
Click on the IOU preview twice to open IOU details page.
Click Amount and change the amount.
Save the new amount.

Verify that app doesn't crash on requesting money, going offline/online
Verify that the preview is displaying correctly for the workspace member

Create a workspace in admin and invite a member
In member account , Global Create > Request Money > $50 > choose the workspace > confirm
As a admin navigate to the expenseReport view
Click Pay elsewhere green button at the top right of the report
Observe the system message added to the expenseReport
Login to member account and observe the LHN preview

Verify that the app doesn't crash when requesting from workspace second time

Request 1:1 money as employee from the admin
Do second request 1:1 money as employee from the admin

Verify that no errors appear in the JS console

Offline tests

Create a request offline and verify the it's displayed correctly
Pay for a request offline and verify the it's displayed correctly

QA Steps

Same as in Test Steps

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

I don't know why but I'm having problem with opening the app on iOS Safari

EXPENSE REPORT

Request action preview (admin viewer)

Duraflame owes $100.00
Tom: requested $50.00

Request action preview (requestor viewer)

Duraflame owes $100.00
requested $50.00

Paid action preview (admin viewer)

Duraflame paid $100.00
paid $100.00 elsewhere

paid action preview (requestor viewer)

Duraflame paid $100.00
Agata: paid $100.00 elsewhere

comment preview (comment sender viewer)

Duraflame owes $100.00 <--- note: this is obviously variable dependent on if the report title is owed or paid
blah blah, I love bananas!

comment preview (comment receiver viewer)

Duraflame owes $100.00 <--- note: this is obviously variable dependent on if the report title is owed or paid
Tom: blah blah, I love bananas!

IOU REPORT So that same logic will apply to iouReports as well. For brevity, the below examples are just Agata looking at a variety of actions Tom took only to highlight the : in use.

request action preview

Tom Rhys Jones owes $50.00
Tom: requested 10.00

paid action preview

Tom Rhys Jones paid $50.00
Tom: paid $50.00 elsewhere

comment preview

Tom Rhys Jones owes $50.00 <--- note: this is obviously variable dependent on if the report title is owed or paid
Tom: blah, blah, I love apples!

receiver

sender

DM / WORKSPACE CHAT

As for the DM/Workspace Chat LHN preview message when the expense/iouReport is the lastMessage being previewed, those don't use a colon separator because none of the chat participants are the "author" of the report preview component being previewed. So those just use the report title of the expense/iouReport being previewed.

owed iouReport being previewed (Agata view - DM)

Tom Rhys Jones
Tom Rhys Jones owes $50.00

owed iouReport being previewed (Tom view - DM)

Agata Kosior
Tom Rhys Jones owes $50.00

paid iouReport being previewed (Agata view - DM)

Tom Rhys Jones
Tom Rhys Jones paid $50.00

paid iouReport being previewed (Tom view - DM)

Agata Kosior
Tom Rhys Jones paid $50.00

owed expenseReport being previewed (member view - workspace chat)

Duraflame
Duraflame owes $50.00

owed expenseReport being previewed (admin view - workspace chat)

Tom Rhys Jones
Duraflame owes $50.00

paid expenseReport being previewed (member view - workspace chat)

Duraflame
Duraflame paid $50.00

paid expenseReport being previewed (admin view - workspace chat)

Tom Rhys Jones
Duraflame paid $50.00

MacOS: Desktop

…s-v2

src/libs/ReportUtils.ts

adhorodyski · 2023-12-21T09:18:17Z

src/libs/SidebarUtils.ts

@@ -331,7 +333,11 @@ function getOptionData(
              }
            : null;
    }
-    const lastActorDisplayName = hasMultipleParticipants && lastActorDetails?.accountID && Number(lastActorDetails.accountID) !== currentUserAccountID ? lastActorDetails.displayName : '';
+
+    const lastActorDisplayName =


Having these inline makes it more and more hard to follow - have you considered abstracting these checks away to a few functions? You can even colocate them nearby if they're not really reusable, but having eg. isCurrentActorLast() etc will be less cognitively demanding. Not a blocker though, this lgtm :)

adhorodyski · 2023-12-21T09:19:06Z

src/libs/SidebarUtils.ts

-    if ((result.isChatRoom || result.isPolicyExpenseChat || result.isThread || result.isTaskReport) && !result.isArchivedRoom) {
+    const isThreadMessage = ReportUtils.isThread(report) && reportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.ADDCOMMENT;
+
+    if ((result.isChatRoom || result.isPolicyExpenseChat || result.isThread || result.isTaskReport || isThreadMessage) && !result.isArchivedRoom) {


this raises pretty much the same concerns

This one I'll leave for another refactor

…s-v2

melvin-bot · 2023-12-27T08:27:55Z

@mananjadhav @mountiny One of you needs to 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]

github-actions · 2023-12-27T12:19:02Z

🧪🧪 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/33346/index.html	https://ad-hoc-expensify-cash.s3.amazonaws.com/ios/33346/index.html

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

👀 View the workflow run that generated this build 👀

mountiny · 2023-12-27T13:12:33Z

I have done some testing and its working great imho! did not notice any issues long video ahead:

Screen.Recording.2023-12-27.at.13.45.20.mp4

mountiny

looking good, one comment

mountiny · 2023-12-27T13:21:56Z

src/libs/ReportUtils.ts

+    if (originalMessage?.amount !== undefined && lastActorID && !isPreviewMessageForParentChatReport) {
+        const amount = originalMessage?.amount;
+        const currency = originalMessage?.currency ?? report.currency ?? '';
+        const amountToDisplay = CurrencyUtils.convertToDisplayString(Math.abs(amount), currency);


In theory the expense report total or request could be negative value, so we should not use Abs here but more so invert the value if expense.

However, I think its not a concern for now

@mountiny so can I leave it for now as it is?

Yes, just noting

mountiny · 2023-12-27T13:22:56Z

src/libs/ReportUtils.ts

+        const requestorName = lastActorID && lastActorID !== currentUserAccountID ? getDisplayNameForParticipant(lastActorID, !isPreviewMessageForParentChatReport) : '';
+        return `${requestorName ? `${requestorName}: ` : ''}${Localize.translateLocal('iou.requestedAmount', {formattedAmount: amountToDisplay})}`;


Suggested change

const requestorName = lastActorID && lastActorID !== currentUserAccountID ? getDisplayNameForParticipant(lastActorID, !isPreviewMessageForParentChatReport) : '';

return `${requestorName ? `${requestorName}: ` : ''}${Localize.translateLocal('iou.requestedAmount', {formattedAmount: amountToDisplay})}`;

// We only want to show the actor name in the preview if its not the current user who took the action

const requestorName = lastActorID && lastActorID !== currentUserAccountID ? getDisplayNameForParticipant(lastActorID, !isPreviewMessageForParentChatReport) : '';

return `${requestorName ? `${requestorName}: ` : ''}${Localize.translateLocal('iou.requestedAmount', {formattedAmount: amountToDisplay})}`;

mananjadhav · 2023-12-27T15:46:40Z

Starting review now

mountiny · 2023-12-27T16:19:09Z

@koko57 One change requested, there is an extra space in the IOU/ expense report in front of the paid message because there used to be name

You can see it in the video above too

…s-v2

koko57 · 2023-12-27T16:40:52Z

@mountiny as even in this snippet the payer's name could be an empty string and we're using it for this 3 translation keys I will add condition to display them with or without additional space

mananjadhav

Took a bit of time but the code changes and Tests look fine. I'll need a day to finish the whole checklist, but approving due to urgency @mountiny

mananjadhav · 2023-12-28T18:55:51Z

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

MacOS: Desktop

mountiny

Thank you!

mountiny · 2023-12-28T19:45:49Z

src/libs/ReportUtils.ts

+    if (originalMessage?.amount !== undefined && lastActorID && !isPreviewMessageForParentChatReport) {
+        const amount = originalMessage?.amount;
+        const currency = originalMessage?.currency ?? report.currency ?? '';
+        const amountToDisplay = CurrencyUtils.convertToDisplayString(Math.abs(amount), currency);


Yes, just noting

mountiny

These changes are platform agnostic and I have tested thoroughly on web and we should be ready to move on, I am merging now before the deploy so we can have Staging QA done on this overnight

Thank you @koko57 for sticking with this one

OSBotify · 2023-12-28T21:05:47Z

✋ 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 · 2023-12-28T21:37:10Z

🚀 Deployed to staging by https://github.com/mountiny in version: 1.4.19-0 🚀

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

OSBotify · 2023-12-29T18:14:03Z

🚀 Deployed to production by https://github.com/mountiny in version: 1.4.19-2 🚀

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

koko57 added 9 commits December 13, 2023 15:54

fix: wip

ce96a3b

Merge branch 'main' into fix/30042-fix-lhn-previews-and-report-action…

5e8450f

…s-v2

Merge branch 'main' into fix/30042-fix-lhn-previews-and-report-action…

e0c9c72

…s-v2

Merge branch 'main' into fix/30042-fix-lhn-previews-and-report-action…

685d379

…s-v2

fix: fix for thread messages

9f26c72

Merge branch 'main' into fix/30042-fix-lhn-previews-and-report-action…

0bedb15

…s-v2

fix: change displayName for firstName

3e9ff5d

fix: minor fix

b74e537

fix: run prettier

b5df09f

rezkiy37 reviewed Dec 20, 2023

View reviewed changes

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

koko57 added 2 commits December 20, 2023 16:42

fix: minor fix

3773595

fix: remove console.logs

45bb39f

koko57 requested a review from rezkiy37 December 20, 2023 16:44

koko57 added 2 commits December 20, 2023 18:23

fix: display a proper payer for workspaces

d573329

fix: fix for deleted action

e471e3b

adhorodyski reviewed Dec 21, 2023

View reviewed changes

koko57 added 2 commits December 21, 2023 10:43

Merge branch 'main' into fix/30042-fix-lhn-previews-and-report-action…

244f223

…s-v2

fix: minor fix

1756a0f

mountiny assigned koko57 Dec 25, 2023

mountiny added the Ready To Build label Dec 25, 2023

This comment has been minimized.

Sign in to view

Merge branch 'main' into fix/30042-fix-lhn-previews-and-report-action…

9692e48

…s-v2

koko57 marked this pull request as ready for review December 27, 2023 08:27

koko57 requested a review from a team as a code owner December 27, 2023 08:27

melvin-bot bot requested review from mananjadhav and mountiny and removed request for a team and rezkiy37 December 27, 2023 08:27

koko57 mentioned this pull request Dec 27, 2023

[Awaiting C+ payment confo] Fix issues with the LHN previews and report actions surrounding iou/expenseReports when owed and paid. #30042

Closed

6 tasks

mountiny reviewed Dec 27, 2023

View reviewed changes

Merge branch 'main' into fix/30042-fix-lhn-previews-and-report-action…

9ae31c8

…s-v2

fix: apply requested changes

8432563

mananjadhav approved these changes Dec 27, 2023

View reviewed changes

melvin-bot bot requested a review from mountiny December 27, 2023 18:19

mountiny approved these changes Dec 28, 2023

View reviewed changes

mountiny merged commit 0ae6f0f into Expensify:main Dec 28, 2023

github-actions bot mentioned this pull request Dec 28, 2023

Deploy Checklist: New Expensify 2023-12-28 #33727

Closed

22 tasks

namhihi237 mentioned this pull request Dec 29, 2023

[HOLD for payment 2024-01-09] [HOLD for payment 2024-01-05] IOU - A colon is shown between payer and paid elsewhere message in IOU report of the requester #33741

Closed

6 tasks

koko57 deleted the fix/30042-fix-lhn-previews-and-report-actions-v2 branch January 17, 2024 18:40

koko57 restored the fix/30042-fix-lhn-previews-and-report-actions-v2 branch January 17, 2024 18:40

situchan mentioned this pull request Jan 18, 2024

[$500] [HOLD for payment 2024-01-18] Web - Double <Payer:> for IOU report preview in Search #33760

Closed

6 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix/30042 fix lhn previews and report actions v2 #33346

Fix/30042 fix lhn previews and report actions v2 #33346

koko57 commented Dec 20, 2023 •

edited

Loading

adhorodyski Dec 21, 2023

adhorodyski Dec 21, 2023

koko57 Dec 21, 2023

This comment has been minimized.

melvin-bot bot commented Dec 27, 2023

github-actions bot commented Dec 27, 2023

mountiny commented Dec 27, 2023

mountiny left a comment

mountiny Dec 27, 2023

koko57 Dec 27, 2023

mountiny Dec 28, 2023

mountiny Dec 27, 2023

mananjadhav commented Dec 27, 2023

mountiny commented Dec 27, 2023

koko57 commented Dec 27, 2023

mananjadhav left a comment

mananjadhav commented Dec 28, 2023 •

edited by mountiny

Loading

mountiny left a comment

mountiny Dec 28, 2023

mountiny left a comment

OSBotify commented Dec 28, 2023

OSBotify commented Dec 28, 2023

OSBotify commented Dec 29, 2023

		const requestorName = lastActorID && lastActorID !== currentUserAccountID ? getDisplayNameForParticipant(lastActorID, !isPreviewMessageForParentChatReport) : '';
		return `${requestorName ? `${requestorName}: ` : ''}${Localize.translateLocal('iou.requestedAmount', {formattedAmount: amountToDisplay})}`;

Fix/30042 fix lhn previews and report actions v2 #33346

Fix/30042 fix lhn previews and report actions v2 #33346

Conversation

koko57 commented Dec 20, 2023 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

This comment has been minimized.

melvin-bot bot commented Dec 27, 2023

github-actions bot commented Dec 27, 2023

mountiny commented Dec 27, 2023

mountiny left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

mananjadhav commented Dec 27, 2023

mountiny commented Dec 27, 2023

koko57 commented Dec 27, 2023

mananjadhav left a comment

Choose a reason for hiding this comment

mananjadhav commented Dec 28, 2023 • edited by mountiny Loading

Reviewer Checklist

Screenshots/Videos

mountiny left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

mountiny left a comment

Choose a reason for hiding this comment

OSBotify commented Dec 28, 2023

OSBotify commented Dec 28, 2023

OSBotify commented Dec 29, 2023

koko57 commented Dec 20, 2023 •

edited

Loading

mananjadhav commented Dec 28, 2023 •

edited by mountiny

Loading