Fix couple of manual request bugs #19194

mountiny · 2023-05-18T12:49:09Z

Details

Couple of issues fixed here:

Error when settling request from header without viewing chat report first ✅
Pay button shouldn't exist in the expense view header, only the expenseReport view header ✅
[HOLD for payment 2023-06-01] [HOLD for payment 2023-05-29] Fix the settled IOUPreview showing incorrectly #19191 ✅
[HOLD for payment 2023-06-01] [HOLD for payment 2023-05-29] ReportPreview total is reset to $0.00 after signing out #19189 ✅

Fixed Issues

$ #19191
$ #19189

Tests

Verify that no errors appear in the JS console

Correct settled message

Create couple of requests between accounts
Settle the iou report
Sign out and sign back in
Make sure that on the DM chat you can see the correct settled message with correct amount

No payment button on transaction thread

Create workspace
Invite a member
as a member request money from the workspace
ad admin go to the expense report
Verify there is a payment button at the header
click on the iouPreview to navigate to the transaction thread
Verify there is no Payment button in the header

Settling up requests

Request money from another account
as the other account navigate to the iou report
Settle the request using the button in the header
Verify it was settled fine

Offline tests

N/A

QA Steps

Same as the test above

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Web

admin cant see the button on transaction thread

Mobile Web - Chrome

Cannot log in

Mobile Web - Safari

Desktop

iOS

Correct settled message

Android

github-actions · 2023-05-18T12:49:25Z

⚠️ ⚠️ Heads up! This pull request has the CP Staging label ⚠️ ⚠️
If you applied the CP Staging label before the PR was merged, the PR will be be immediately deployed to staging even if the open StagingDeployCash deploy checklist is locked.
However if you applied the CP Staging after the PR was merged it's possible it won't be CP'ed automatically. If you need it to be CP'ed to staging, tag a member of @Expensify/mobile-deployers to CP it manually, otherwise you can wait for it to go out with the next deploy.

melvin-bot · 2023-05-18T12:49:41Z

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

Julesssss

Please add the fixes and tests when you have a moment. It's looking good though. Here's what I tested:

Error when settling request from header without viewing chat report first ✅
Pay button shouldn't exist in the expense view header, only the expenseReport view header ✅
Settled IOUPreview added to expense/iouReport ✅
ReportPreview total is reset to $0.00 after signing out ✅

Julesssss · 2023-05-18T15:21:02Z

src/components/MoneyRequestHeader.js

-        !isSettled && (Policy.isAdminOfFreePolicy([policy]) || (ReportUtils.isMoneyRequestReport(props.report) && lodashGet(props.session, 'email', null) === props.report.managerEmail));
+        !isSettled &&
+        !props.isSingleTransactionView &&
+        (Policy.isAdminOfFreePolicy([policy]) || (ReportUtils.isMoneyRequestReport(props.report) && lodashGet(props.session, 'email', null) === props.report.managerEmail));


That's a whole lotta logic. Maybe consider a helper or separate condition within the component for the final line

split it up a bit!

Julesssss · 2023-05-18T15:23:04Z

src/components/ReportActionItem/ReportPreview.js

@@ -114,10 +114,12 @@ const ReportPreview = (props) => {
                >
                    <View style={[styles.flexShrink1]}>
                        {props.iouReport.hasOutstandingIOU ? (
-                            <Text style={[styles.chatItemMessage, styles.cursorPointer]}>{props.translate('iou.payerOwesAmount', {payer: managerName, amount: reportAmount})}</Text>
+                            <Text style={[styles.chatItemMessage, styles.cursorPointer]}>
+                                {lodashGet(message, 'html', props.translate('iou.payerOwesAmount', {payer: managerName, amount: reportAmount}))}


Ah one small issue with using the HTML is that the 'settled up' String should be lower case. But we can fix that here later 👍

handling it here https://github.com/Expensify/Web-Expensify/pull/37494/files#r1198024625

The html message is not translated. Should we translate the default message in this case?

luacmartins

Left a couple of comments. Thanks for working on these.

luacmartins · 2023-05-18T17:09:57Z

src/components/ReportActionItem/ReportPreview.js

@@ -114,10 +114,12 @@ const ReportPreview = (props) => {
                >
                    <View style={[styles.flexShrink1]}>
                        {props.iouReport.hasOutstandingIOU ? (
-                            <Text style={[styles.chatItemMessage, styles.cursorPointer]}>{props.translate('iou.payerOwesAmount', {payer: managerName, amount: reportAmount})}</Text>
+                            <Text style={[styles.chatItemMessage, styles.cursorPointer]}>
+                                {lodashGet(message, 'html', props.translate('iou.payerOwesAmount', {payer: managerName, amount: reportAmount}))}


The html message is not translated. Should we translate the default message in this case?

luacmartins · 2023-05-18T17:10:07Z

src/components/ReportActionItem/ReportPreview.js

                        ) : (
                            <View style={[styles.flexRow]}>
-                                <Text style={[styles.chatItemMessage, styles.cursorPointer]}>{props.translate('iou.payerSettled', {amount: reportAmount})}</Text>
+                                <Text style={[styles.chatItemMessage, styles.cursorPointer]}>{lodashGet(message, 'html', props.translate('iou.payerSettled', {amount: reportAmount}))}</Text>


Lets just translate it, I dont think it causes any harm. Again, we should not get to the point we will need the default there

luacmartins · 2023-05-18T17:11:22Z

src/libs/actions/IOU.js

@@ -1014,7 +1016,6 @@ function getSendMoneyParams(report, amount, currency, comment, paymentMethodType
 * @returns {Object}
 */
 function getPayMoneyRequestParams(chatReport, iouReport, recipient, paymentMethodType) {
-    const reportPreviewAction = ReportActionsUtils.getReportPreviewAction(chatReport.reportID, iouReport.reportID);


Why are we removing the optimistic action?

This is what was in the end causing the bugs with payment. if you sign in and navigate dirrectly to the IOU report and click pay, we dont have the report preview action as it was not treated as the parent report action -> hence the auth change. So the app crashed here/ you could not pay.

Julesssss · 2023-05-19T09:45:57Z

src/components/MoneyRequestHeader.js

-    const shouldShowSettlementButton =
-        !isSettled && (Policy.isAdminOfFreePolicy([policy]) || (ReportUtils.isMoneyRequestReport(props.report) && lodashGet(props.session, 'email', null) === props.report.managerEmail));
+    const isPayer = Policy.isAdminOfFreePolicy([policy]) || (ReportUtils.isMoneyRequestReport(props.report) && lodashGet(props.session, 'email', null) === props.report.managerEmail);
+    const shouldShowSettlementButton = !isSettled && !props.isSingleTransactionView && isPayer;


NAB: isPayer being the first condition here would be a bit more readable. But only do this if you need to make other changes!

mountiny · 2023-05-19T10:18:15Z

@Julesssss @mollfpr is doing the testing right now

Julesssss · 2023-05-19T10:21:16Z

Okay, I'll stop. Tested everything apart from the native apps.

mollfpr · 2023-05-19T10:50:25Z

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 / Chrome
- iOS / native
- iOS / 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(themeColors.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 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

Web

Correct settled message

Payment button on admin money request report header

No payment button on transaction thread

Settling up requests

19194.Web.-.Settling.up.requests.mov

Mobile Web - Chrome

Correct settled message

Payment button on admin

19194.mWeb.Chrome.-.Payment.button.on.admin.mov

Settling up requests

19194.mWeb.Chrome.-.Settling.up.requests.mov

Mobile Web - Safari

Correct settled message

Payment button on admin

19194.mWeb.Safari.-.Payment.button.on.admin.mp4

Settling up requests

19194.mWeb.Safari.-.Settling.up.requests.mp4

Desktop

Correct settled message

Payment button on admin header and no payment button on money request thread

19194.Desktop.-.Payment.button.on.admin.mov

Settling up requests

19194.Desktop.-.Settling.up.requests.mov

iOS

Android

mollfpr · 2023-05-19T10:52:15Z

I got this error when building the Android app. It's also happening in the latest main.
.

mollfpr

Tests well 👍

Fix couple of manual request bugs (cherry picked from commit 40d992f)

…-19194 🍒 Cherry pick PR #19194 to staging 🍒

OSBotify · 2023-05-19T13:08:50Z

🚀 Cherry-picked to staging by https://github.com/mountiny in version: 1.3.16-5 🚀

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

@Expensify/applauseleads please QA this PR and check it off on the deploy checklist if it passes.

OSBotify · 2023-05-22T23:39:24Z

🚀 Deployed to production by https://github.com/chiragsalian in version: 1.3.16-7 🚀

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

OSBotify · 2023-05-23T00:15:19Z

🚀 Deployed to production by https://github.com/chiragsalian in version: 1.3.16-7 🚀

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

OSBotify · 2023-05-23T19:53:13Z

🚀 Deployed to production by https://github.com/chiragsalian in version: 1.3.16-7 🚀

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

OSBotify · 2023-05-23T21:51:57Z

🚀 Deployed to production by https://github.com/chiragsalian in version: 1.3.16-7 🚀

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

OSBotify · 2023-06-15T01:28:03Z

🚀 Cherry-picked to staging by https://github.com/AndrewGable in version: 1.3.28-2 🚀

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

@Expensify/applauseleads please QA this PR and check it off on the deploy checklist if it passes.

OSBotify · 2023-06-16T18:45:52Z

🚀 Deployed to production by https://github.com/AndrewGable in version: 1.3.28-5 🚀

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

mountiny added 6 commits May 18, 2023 11:35

Make sure to use the chat reportID

6761446

Remove the optimistic update of report preview

a29f4bb

Hide the pay button on the transaction view

387a176

Fix styles

c4df4b3

Remove the report preview action from failure data

d81c6d8

Fix pay money request optimistic data

4201994

mountiny added the CP Staging label May 18, 2023

mountiny self-assigned this May 18, 2023

mountiny requested a review from a team as a code owner May 18, 2023 12:49

melvin-bot bot requested review from srikarparsi and removed request for a team May 18, 2023 12:49

mountiny requested review from Julesssss and luacmartins May 18, 2023 12:54

Make sure there is no settled 0 messages showing

4d41619

Julesssss reviewed May 18, 2023

View reviewed changes

Refactor code for cleaner condition

326e0e4

luacmartins reviewed May 18, 2023

View reviewed changes

luacmartins approved these changes May 18, 2023

View reviewed changes

mountiny requested a review from mollfpr May 19, 2023 09:23

Merge branch 'main' into vit-fixHeaderPaymentButton

f21c9bc

Julesssss reviewed May 19, 2023

View reviewed changes

Julesssss approved these changes May 19, 2023

View reviewed changes

mollfpr approved these changes May 19, 2023

View reviewed changes

mountiny merged commit 40d992f into main May 19, 2023

mountiny deleted the vit-fixHeaderPaymentButton branch May 19, 2023 11:50

OSBotify mentioned this pull request May 19, 2023

🍒 Cherry pick PR #19194 to staging 🍒 #19262

Merged

OSBotify pushed a commit that referenced this pull request May 19, 2023

Merge pull request #19194 from Expensify/vit-fixHeaderPaymentButton

0397b6e

Fix couple of manual request bugs (cherry picked from commit 40d992f)

OSBotify added a commit that referenced this pull request May 19, 2023

Merge pull request #19262 from Expensify/OSBotify-cherry-pick-staging…

c2a5888

…-19194 🍒 Cherry pick PR #19194 to staging 🍒

OSBotify mentioned this pull request May 19, 2023

Deploy Checklist: New Expensify 2023-05-18 #19175

Closed

39 tasks

This was referenced May 22, 2023

[HOLD for payment 2023-06-01] [HOLD for payment 2023-05-29] Fix the settled IOUPreview showing incorrectly #19191

Closed

[HOLD for payment 2023-06-01] [HOLD for payment 2023-05-29] ReportPreview total is reset to $0.00 after signing out #19189

Closed

OSBotify mentioned this pull request May 23, 2023

Deploy Checklist: New Expensify 2023-05-22 #19422

Closed

62 tasks

OSBotify mentioned this pull request Jun 15, 2023

Deploy Checklist: New Expensify 2023-06-14 #20782

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix couple of manual request bugs #19194

Fix couple of manual request bugs #19194

mountiny commented May 18, 2023 •

edited

Loading

github-actions bot commented May 18, 2023

melvin-bot bot commented May 18, 2023

Julesssss left a comment

Julesssss May 18, 2023

mountiny May 18, 2023

Julesssss May 18, 2023

mountiny May 18, 2023

luacmartins May 18, 2023

luacmartins left a comment

luacmartins May 18, 2023

luacmartins May 18, 2023

mountiny May 18, 2023

luacmartins May 18, 2023

mountiny May 18, 2023

Julesssss May 19, 2023

mountiny commented May 19, 2023

Julesssss commented May 19, 2023

mollfpr commented May 19, 2023 •

edited

Loading

mollfpr commented May 19, 2023

mollfpr left a comment

OSBotify commented May 19, 2023

OSBotify commented May 22, 2023

OSBotify commented May 23, 2023

OSBotify commented May 23, 2023

OSBotify commented May 23, 2023

OSBotify commented Jun 15, 2023

OSBotify commented Jun 16, 2023

Fix couple of manual request bugs #19194

Fix couple of manual request bugs #19194

Conversation

mountiny commented May 18, 2023 • edited Loading

Details

Fixed Issues

Tests

Correct settled message

No payment button on transaction thread

Settling up requests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

github-actions bot commented May 18, 2023

melvin-bot bot commented May 18, 2023

Julesssss 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

Choose a reason for hiding this comment

luacmartins 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

Choose a reason for hiding this comment

Choose a reason for hiding this comment

mountiny commented May 19, 2023

Julesssss commented May 19, 2023

mollfpr commented May 19, 2023 • edited Loading

Reviewer Checklist

Screenshots/Videos

mollfpr commented May 19, 2023

mollfpr left a comment

Choose a reason for hiding this comment

OSBotify commented May 19, 2023

OSBotify commented May 22, 2023

OSBotify commented May 23, 2023

OSBotify commented May 23, 2023

OSBotify commented May 23, 2023

OSBotify commented Jun 15, 2023

OSBotify commented Jun 16, 2023

mountiny commented May 18, 2023 •

edited

Loading

mollfpr commented May 19, 2023 •

edited

Loading