Payment details are not greyed out while offline by sketchydroide · Pull Request #13756 · Expensify/App

sketchydroide · 2022-12-21T15:45:53Z

Details

The details of an offline payment should be greyed out until online again (and the transaction goes through)

Fixed Issues

$ https://github.com/Expensify/Expensify/issues/250551

Online tests

Go to a chat with another user and press the + button
Select send money
Go through with the transaction
Verify that the details in the chat are NOT Greyed out
Press the IOU and go to the details
Verify that the details of the IOU are NOT Greyed out

Verify that no errors appear in the JS console

Offline tests

Go to a chat with another user and press the + button
Select send money
Go through with the transaction
Verify that the details in the chat are Greyed out
Press the IOU and go to the details
Verify that the details of the IOU are Greyed out

QA Steps

Follow online and offline tests
Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Web

Mobile Web - Chrome

Mobile Web - Safari

Desktop

iOS

Android

…ated for some reason.

mountiny · 2022-12-21T17:06:09Z

    IOU_DETAILS_WITH_IOU_REPORT_ID: `${IOU_DETAILS}/:chatReportID/:iouReportID/`,
-    getIouDetailsRoute: (chatReportID, iouReportID) => `iou/details/${chatReportID}/${iouReportID}`,
+    getIouDetailsRoute: (chatReportID, iouReportID) => `iou/details/${chatReportID}/${iouReportID}/`,
+    getIouDetailsWithActionRoute: (chatReportID, iouReportID, iouReportAction) => `iou/details/${chatReportID}/${iouReportID}/${encodeURIComponent(iouReportAction)}/`,


I am not sure if I understand, what if you have multiple pending actions? It seems like this page https://user-images.githubusercontent.com/242568/208656289-9d902401-af0b-42c8-8339-35fd93ce6de3.png already knows that the action is pending, we should wrap the IOUPreview.

This is nested in the IOUDetailsPage

App/src/components/ReportTransaction.js

Lines 58 to 72 in 2585cef

<OfflineWithFeedback

onClose={() => {

if (this.props.action.actionName === CONST.REPORT.ACTIONS.TYPE.IOU) {

ReportActions.clearSendMoneyErrors(this.props.chatReportID, this.props.action.reportActionID);

}

if (this.props.action.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD) {

ReportActions.deleteOptimisticReportAction(this.props.chatReportID, this.props.action.sequenceNumber);

} else {

ReportActions.clearReportActionErrors(this.props.chatReportID, this.props.action.sequenceNumber);

}

}}

pendingAction={this.props.action.pendingAction}

errors={this.props.action.errors}

errorRowStyles={[styles.ml10, styles.mr2]}

>

, we could wrap this IOUPreview in offline with Feedback as well and get the action in there.

Thoughts?

need to look at this, so maybe, but I also need to check if the Chat Report action Items are not affected.
TBH I think one of them is getting opacity: 0.5 twice atm

Not sure, what I mean is that in the IOUDetailsPage we already have an information that the reportAction is pending, and also we have this information for the preview in another view so I think there should be some other way, I know this is not very helpful haha, I would have to explore more on my own and dont want to duplicate work

melvin-bot · 2022-12-22T17:08:44Z

@sobitneupane @deetergp 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]

mountiny · 2022-12-22T19:22:10Z

@sobitneupane sorry for the ping, I can handle this testing just fine, worked on this with Andre before.

techievivek · 2022-12-29T14:12:24Z

@sketchydroide Can you please add the Screenshots/Videos for the PR?

Co-authored-by: Youssef Lourayad <youssef@expensify.com>

youssef-lr

LGTM and tests well!

sketchydroide · 2022-12-29T14:43:02Z

@techievivek

Can you please add the Screenshots/Videos for the PR?

Done

techievivek · 2022-12-29T15:05:37Z

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 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 correct English and 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 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.
I have checked off every checkbox in the PR reviewer checklist, including those that don't apply to this PR.

Screenshots/Videos

Web

Mobile Web - Chrome

Mobile Web - Safari

Desktop

iOS

Android

techievivek

Looks good and tests well.

OSBotify · 2022-12-29T15:21:19Z

✋ 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 · 2022-12-29T20:23:56Z

🚀 Deployed to staging by @techievivek in version: 1.2.46-0 🚀

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

OSBotify · 2023-01-02T17:42:16Z

🚀 Deployed to production by @roryabraham in version: 1.2.46-0 🚀

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

aldo-expensify · 2023-03-01T01:20:06Z

+    findPendingAction() {
+        return _.find(this.props.reportActions, reportAction => reportAction.originalMessage
+            && Number(reportAction.originalMessage.IOUReportID) === Number(this.props.route.params.iouReportID)
+            && !_.isEmpty(reportAction.pendingAction));
+    }
+
    render() {
        const sessionEmail = lodashGet(this.props.session, 'email', null);
        const reportIsLoading = _.isUndefined(this.props.iouReport);
+        const pendingAction = this.findPendingAction();


Bug:

findPendingAction is returning a reportAction.

const pendingAction holds a reportAction, not a string pendingAction string like 'add'

We pass pendingAction to <IOUPreview> which is expecting an string, not a reportAction object.

I'll put a small PR correcting it.

A bit late, but I just remembered this. PR up: #16019

sketchydroide added 3 commits December 21, 2022 15:08

adding the style method

d5ffd89

using the style method

3bc5fbd

this should work, but it does not, I don't think the IOU has been upd…

6a82747

…ated for some reason.

sketchydroide self-assigned this Dec 21, 2022

sketchydroide changed the title ~~Afonseca grey out payment details~~ Payment details are not greyed out while offline Dec 21, 2022

no idea if this works but saving it for now

f6b0b7b

mountiny reviewed Dec 21, 2022

View reviewed changes

sketchydroide added 11 commits December 22, 2022 14:59

Merge branch 'main' into afonseca_grey_out_payment_details

9a086aa

adding reportActions

5daf294

reseting this

add942b

adding method to find a pending action

27272be

using method

0d798ab

removing routes

5f0f0c1

cleaning

85d4eaa

missed one

5a21478

linter

54d78ea

fixing the condition

84ec74e

this is no longer used

94f84e9

sketchydroide commented Dec 22, 2022

View reviewed changes

Comment thread src/components/ReportActionItem/IOUAction.js

sketchydroide marked this pull request as ready for review December 22, 2022 17:08

sketchydroide requested a review from a team as a code owner December 22, 2022 17:08

melvin-bot Bot requested review from deetergp and sobitneupane and removed request for a team December 22, 2022 17:08

linter

90e0067

mountiny removed the request for review from sobitneupane December 22, 2022 19:21

sketchydroide requested a review from mountiny December 27, 2022 10:33

techievivek reviewed Dec 29, 2022

View reviewed changes

Comment thread src/pages/iou/IOUDetailsModal.js

youssef-lr reviewed Dec 29, 2022

View reviewed changes

Comment thread src/pages/iou/IOUDetailsModal.js Outdated

Update src/pages/iou/IOUDetailsModal.js

f0dea50

Co-authored-by: Youssef Lourayad <youssef@expensify.com>

youssef-lr approved these changes Dec 29, 2022

View reviewed changes

techievivek approved these changes Dec 29, 2022

View reviewed changes

techievivek merged commit f2f6890 into main Dec 29, 2022

techievivek deleted the afonseca_grey_out_payment_details branch December 29, 2022 15:17

OSBotify mentioned this pull request Dec 29, 2022

Deploy Checklist: New Expensify 2022-12-29 #13891

Closed

7 tasks

aldo-expensify reviewed Mar 1, 2023

View reviewed changes

aldo-expensify mentioned this pull request Mar 15, 2023

Pass pendingAction string instead of reportAction #16019

Merged

55 tasks

	<OfflineWithFeedback
	onClose={() => {
	if (this.props.action.actionName === CONST.REPORT.ACTIONS.TYPE.IOU) {
	ReportActions.clearSendMoneyErrors(this.props.chatReportID, this.props.action.reportActionID);
	}
	if (this.props.action.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD) {
	ReportActions.deleteOptimisticReportAction(this.props.chatReportID, this.props.action.sequenceNumber);
	} else {
	ReportActions.clearReportActionErrors(this.props.chatReportID, this.props.action.sequenceNumber);
	}
	}}
	pendingAction={this.props.action.pendingAction}
	errors={this.props.action.errors}
	errorRowStyles={[styles.ml10, styles.mr2]}
	>

Uh oh!

Conversation

sketchydroide commented Dec 21, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Details

Fixed Issues

Online tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

mountiny Dec 21, 2022

Choose a reason for hiding this comment

Uh oh!

sketchydroide Dec 21, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

mountiny Dec 21, 2022

Choose a reason for hiding this comment

Uh oh!

Uh oh!

melvin-bot Bot commented Dec 22, 2022

Uh oh!

mountiny commented Dec 22, 2022

Uh oh!

Uh oh!

techievivek commented Dec 29, 2022

Uh oh!

Uh oh!

youssef-lr left a comment

Choose a reason for hiding this comment

Uh oh!

sketchydroide commented Dec 29, 2022

Uh oh!

techievivek commented Dec 29, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

techievivek left a comment

Choose a reason for hiding this comment

Uh oh!

OSBotify commented Dec 29, 2022

Uh oh!

OSBotify commented Dec 29, 2022

Uh oh!

OSBotify commented Jan 2, 2023

Uh oh!

aldo-expensify Mar 1, 2023

Choose a reason for hiding this comment

Uh oh!

aldo-expensify Mar 1, 2023

Choose a reason for hiding this comment

Uh oh!

mountiny Mar 1, 2023

Choose a reason for hiding this comment

Uh oh!

aldo-expensify Mar 15, 2023

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

sketchydroide commented Dec 21, 2022 •

edited

Loading

sketchydroide Dec 21, 2022 •

edited

Loading

techievivek commented Dec 29, 2022 •

edited

Loading