Fix: Money request skeleton is shown when delete IOU in offline mode #27753

tienifr · 2023-09-19T08:01:15Z

Details

Money request skeleton is shown when delete IOU in offline mode. This PR fixes that.

Fixed Issues

$ #26939
PROPOSAL: #26939 (comment)

Tests

Go to any report with money requests
Go to Expense report >> IOU details
Go offline
Delete the request
Verify that the deleted money request preview is shown greyed out (not skeleton)
Verify that the total IOU amount in chat report is updated

Verify that no errors appear in the JS console

Offline tests

Same above

QA Steps

Go to any report with money requests
Go to Expense report >> IOU details
Go offline
Delete the request
Verify that the deleted money request preview is shown greyed out (not skeleton)
Verify that the total IOU amount in chat report is updated

Verify that no errors appear in the JS console

PR Author Checklist

I linked the correct issue in the ### Fixed Issues section above
I wrote clear testing steps that cover the changes made in this PR
- I added steps for local testing in the Tests section
- I added steps for the expected offline behavior in the Offline steps section
- I added steps for Staging and/or Production testing in the QA steps section
- I added steps to cover 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 tested this PR with a High Traffic account against the staging or production API to ensure there are no regressions (e.g. long loading states that impact usability).
I included screenshots or videos for tests on all platforms
I ran the tests on all platforms & verified they passed on:
- Android / native
- Android / Chrome
- iOS / native
- iOS / Safari
- MacOS / Chrome / Safari
- MacOS / Desktop
I verified there are no console errors (if there's a console error not related to the PR, report it or open an issue for it to be fixed)
I followed proper code patterns (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
  - If any non-english text was added/modified, I verified the translation was requested/reviewed in #expensify-open-source and it was approved by an internal Expensify engineer. Link to Slack message:
- 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 followed the guidelines as stated in the Review Guidelines
I tested other components that can be impacted by my changes (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar are working as expected)
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
I verified that if a function's arguments changed that all usages have also been updated correctly
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 author checklist, including those that don't apply to this PR.

Screenshots/Videos

Web

skeleton-compressed.mov

Mobile Web - Chrome

skeleton-chrome-compressed.mov

Mobile Web - Safari

skelton-safari-compressed.mov

Desktop

skeleton-desktop-compressed.mov

iOS

skeleton-ios-compressed.mov

Android

Screen.Recording.2023-09-22.at.13.43.28.mov

…6939

melvin-bot · 2023-09-19T08:22:39Z

@0xmiroslav 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]

0xmiros · 2023-09-20T21:18:08Z

src/components/ReportActionItem/MoneyRequestPreview.js

@@ -239,7 +239,7 @@ function MoneyRequestPreview(props) {
                            isHovered={isScanning}
                        />
                    )}
-                    {_.isEmpty(props.transaction) ? (
+                    {_.isEmpty(props.transaction) && props.action.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE ? (


Suggested change

{_.isEmpty(props.transaction) && props.action.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE ? (

{_.isEmpty(props.transaction) && lodashGet(props.action, 'pendingAction') !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE ? (

0xmiros · 2023-09-20T21:34:02Z

I am seeing the case where pendingAction is not 'delete' but 'update' instead

0xmiros · 2023-09-20T21:37:35Z

Current main is very buggy at the moment. After delete offline, money request preview disappears. And instead when online, it shows broken preview instead of disappearing after refresh app.

Screen.Recording.2023-09-20.at.11.31.26.PM.mov

0xmiros · 2023-09-20T21:54:00Z

Above are existing bugs on main, not related to PR so can be out of scope

0xmiros · 2023-09-21T04:40:32Z

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 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 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

iou request:

iou.mov

expense request:

Screen.Recording.2023-09-20.at.11.41.01.PM.mov

Screen.Recording.2023-09-20.at.11.41.59.PM.mov

Mobile Web - Chrome

Mobile Web - Safari

Desktop

iOS

Android

0xmiros · 2023-09-21T04:40:48Z

@tienifr are you able to reproduce this? #27753 (comment)

0xmiros · 2023-09-21T06:45:54Z

@tienifr that case exists so the current condition is not correct

App/src/libs/actions/IOU.js

Line 1275 in 04215cb

    
           pendingAction: shouldShowDeletedRequestMessage ? CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE : CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE,

tienifr · 2023-09-21T06:55:55Z

I'm checking it.

tienifr · 2023-09-21T07:38:02Z

@eVoloshchak Updated the condition to include pending UPDATE action.

0xmiros · 2023-09-21T07:38:58Z

@tienifr please test both cases and share videos for web in new comment

0xmiros · 2023-09-21T07:41:26Z

src/components/ReportActionItem/MoneyRequestPreview.js

@@ -239,7 +239,8 @@ function MoneyRequestPreview(props) {
                            isHovered={isScanning}
                        />
                    )}
-                    {_.isEmpty(props.transaction) ? (
+                    {_.isEmpty(props.transaction) &&
+                    !_.contains([CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE, CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE], lodashGet(props.action, 'pendingAction')) ? (


I was thinking message.isDeletedParentAction || pendingAction === 'delete'

tienifr · 2023-09-21T11:12:41Z

@0xmiroslav In case of UPDATE, it would show [Deleted request]. But it already showed that without our additional check. I wonder how you could reproduce the skeleton in UPDATE case 🤔 .

update-pending-action-compressed.mov

0xmiros · 2023-09-21T11:20:06Z

I don't have clear repro step but I also don't want to make regression because of this. So adding that condition works for me and is no harm.

0xmiros

LGTM!

I think $0 issue (due to empty transaction after delete) is out of scope for this PR

cead22 · 2023-09-22T05:21:25Z

@tienifr @0xmiroslav it looks like we're missing videos/screenshots for some platforms, can you add them?

tienifr · 2023-09-22T05:23:17Z

Miroslav combined them all in Web section. I'm adding the Android now.

tienifr · 2023-09-22T06:46:31Z

I've updated the screenshots @cead22

cead22 · 2023-09-22T12:17:00Z

Miroslav combined them all in Web section. I'm adding the Android now.

I see only 3 and all for web, but I think that's ok if you tested in all platforms as the reviewer

OSBotify · 2023-09-22T12:22:51Z

✋ 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-09-22T13:58:21Z

🚀 Deployed to staging by https://github.com/cead22 in version: 1.3.73-0 🚀

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

OSBotify · 2023-09-25T09:33:12Z

🚀 Deployed to production by https://github.com/mountiny in version: 1.3.73-1 🚀

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

OSBotify · 2023-09-25T10:05:09Z

🚀 Deployed to staging by https://github.com/cead22 in version: 1.3.74-0 🚀

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

OSBotify · 2023-09-28T18:47:30Z

🚀 Deployed to production by https://github.com/chiragsalian in version: 1.3.74-3 🚀

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

tienifr added 3 commits September 10, 2023 20:47

fix: 26939

2725fb9

Merge branch 'fix/26939' of https://github.com/tienifr/App into fix/2…

f36e68c

…6939

fix lint

80dda53

tienifr marked this pull request as ready for review September 19, 2023 08:22

tienifr requested a review from a team as a code owner September 19, 2023 08:22

melvin-bot bot requested review from 0xmiros and removed request for a team September 19, 2023 08:22

tienifr mentioned this pull request Sep 19, 2023

[HOLD for payment 2023-10-02] [$500] Web/Desktop - Request skeleton is shown grayed out instead the IOU details. #26939

Closed

6 tasks

0xmiros reviewed Sep 20, 2023

View reviewed changes

tienifr added 2 commits September 21, 2023 11:35

Merge branch 'main' of https://github.com/tienifr/App into fix/26939

22b9de7

use lodashGet

f199b8e

tienifr added 2 commits September 21, 2023 14:17

Merge branch 'main' of https://github.com/tienifr/App into fix/26939

02a7563

update skeleton condition

1235d8b

0xmiros reviewed Sep 21, 2023

View reviewed changes

update condition

7168e09

This comment was marked as resolved.

Sign in to view

0xmiros approved these changes Sep 21, 2023

View reviewed changes

melvin-bot bot requested a review from cead22 September 21, 2023 11:22

Merge branch 'main' of https://github.com/tienifr/App into fix/26939

013b314

cead22 approved these changes Sep 22, 2023

View reviewed changes

cead22 merged commit bfb9ae8 into Expensify:main Sep 22, 2023
12 checks passed

OSBotify mentioned this pull request Sep 22, 2023

Deploy Checklist: New Expensify 2023-09-22 #28013

Closed

96 tasks

This was referenced Sep 25, 2023

Deploy Checklist: New Expensify DUPE 2023-09-25 #28118

Closed

Deploy Checklist: New Expensify 2023-09-25 #28119

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix: Money request skeleton is shown when delete IOU in offline mode #27753

Fix: Money request skeleton is shown when delete IOU in offline mode #27753

tienifr commented Sep 19, 2023 •

edited

Loading

melvin-bot bot commented Sep 19, 2023

0xmiros Sep 20, 2023

tienifr Sep 21, 2023

0xmiros commented Sep 20, 2023

0xmiros commented Sep 20, 2023

0xmiros commented Sep 20, 2023

0xmiros commented Sep 21, 2023

0xmiros commented Sep 21, 2023

0xmiros commented Sep 21, 2023

tienifr commented Sep 21, 2023

tienifr commented Sep 21, 2023

0xmiros commented Sep 21, 2023

0xmiros Sep 21, 2023

This comment was marked as resolved.

tienifr commented Sep 21, 2023

0xmiros commented Sep 21, 2023

0xmiros left a comment

cead22 commented Sep 22, 2023

tienifr commented Sep 22, 2023

tienifr commented Sep 22, 2023

cead22 commented Sep 22, 2023

OSBotify commented Sep 22, 2023

OSBotify commented Sep 22, 2023

OSBotify commented Sep 25, 2023

OSBotify commented Sep 25, 2023

OSBotify commented Sep 28, 2023

	{_.isEmpty(props.transaction) && props.action.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE ? (
	{_.isEmpty(props.transaction) && lodashGet(props.action, 'pendingAction') !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE ? (

Fix: Money request skeleton is shown when delete IOU in offline mode #27753

Fix: Money request skeleton is shown when delete IOU in offline mode #27753

Conversation

tienifr commented Sep 19, 2023 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Sep 19, 2023

0xmiros Sep 20, 2023

Choose a reason for hiding this comment

tienifr Sep 21, 2023

Choose a reason for hiding this comment

0xmiros commented Sep 20, 2023

0xmiros commented Sep 20, 2023

0xmiros commented Sep 20, 2023

0xmiros commented Sep 21, 2023

Reviewer Checklist

Screenshots/Videos

0xmiros commented Sep 21, 2023

0xmiros commented Sep 21, 2023

tienifr commented Sep 21, 2023

tienifr commented Sep 21, 2023

0xmiros commented Sep 21, 2023

0xmiros Sep 21, 2023

Choose a reason for hiding this comment

This comment was marked as resolved.

tienifr commented Sep 21, 2023

0xmiros commented Sep 21, 2023

0xmiros left a comment

Choose a reason for hiding this comment

cead22 commented Sep 22, 2023

tienifr commented Sep 22, 2023

tienifr commented Sep 22, 2023

cead22 commented Sep 22, 2023

OSBotify commented Sep 22, 2023

OSBotify commented Sep 22, 2023

OSBotify commented Sep 25, 2023

OSBotify commented Sep 25, 2023

OSBotify commented Sep 28, 2023

tienifr commented Sep 19, 2023 •

edited

Loading