From 2725fb9736104f0d6fe97984e23b99888184b747 Mon Sep 17 00:00:00 2001 From: tienifr Date: Sun, 10 Sep 2023 20:47:18 +0700 Subject: [PATCH 1/5] fix: 26939 --- src/components/ReportActionItem/MoneyRequestPreview.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/ReportActionItem/MoneyRequestPreview.js b/src/components/ReportActionItem/MoneyRequestPreview.js index 05c3463538c6..a76226e210c8 100644 --- a/src/components/ReportActionItem/MoneyRequestPreview.js +++ b/src/components/ReportActionItem/MoneyRequestPreview.js @@ -237,7 +237,7 @@ function MoneyRequestPreview(props) { isHovered={isScanning} /> )} - {_.isEmpty(props.transaction) ? ( + {(_.isEmpty(props.transaction) && props.action.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE) ? ( ) : ( From 80dda5307bba62b8eb552d2db58b33fd20a821b4 Mon Sep 17 00:00:00 2001 From: tienifr Date: Tue, 19 Sep 2023 15:11:01 +0700 Subject: [PATCH 2/5] fix lint --- src/components/ReportActionItem/MoneyRequestPreview.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/ReportActionItem/MoneyRequestPreview.js b/src/components/ReportActionItem/MoneyRequestPreview.js index b02f449f2bd1..52ba971a4e1e 100644 --- a/src/components/ReportActionItem/MoneyRequestPreview.js +++ b/src/components/ReportActionItem/MoneyRequestPreview.js @@ -239,7 +239,7 @@ function MoneyRequestPreview(props) { isHovered={isScanning} /> )} - {(_.isEmpty(props.transaction) && props.action.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE) ? ( + {_.isEmpty(props.transaction) && props.action.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE ? ( ) : ( From f199b8e5577c7d4f651f20bebe36942b2fd65cc7 Mon Sep 17 00:00:00 2001 From: tienifr Date: Thu, 21 Sep 2023 11:37:39 +0700 Subject: [PATCH 3/5] use lodashGet --- src/components/ReportActionItem/MoneyRequestPreview.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/ReportActionItem/MoneyRequestPreview.js b/src/components/ReportActionItem/MoneyRequestPreview.js index 5bc399f954cc..04582634a8d4 100644 --- a/src/components/ReportActionItem/MoneyRequestPreview.js +++ b/src/components/ReportActionItem/MoneyRequestPreview.js @@ -239,7 +239,7 @@ function MoneyRequestPreview(props) { isHovered={isScanning} /> )} - {_.isEmpty(props.transaction) && props.action.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE ? ( + {_.isEmpty(props.transaction) && lodashGet(props.transaction, 'pendingAction') !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE ? ( ) : ( From 1235d8b1fc020b2c4a98d4a1057ed9fcdb7c3d66 Mon Sep 17 00:00:00 2001 From: tienifr Date: Thu, 21 Sep 2023 14:37:31 +0700 Subject: [PATCH 4/5] update skeleton condition --- src/components/ReportActionItem/MoneyRequestPreview.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/components/ReportActionItem/MoneyRequestPreview.js b/src/components/ReportActionItem/MoneyRequestPreview.js index 66d78c8302ae..d98de5ff7b1d 100644 --- a/src/components/ReportActionItem/MoneyRequestPreview.js +++ b/src/components/ReportActionItem/MoneyRequestPreview.js @@ -239,7 +239,8 @@ function MoneyRequestPreview(props) { isHovered={isScanning} /> )} - {_.isEmpty(props.transaction) && lodashGet(props.transaction, 'pendingAction') !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE ? ( + {_.isEmpty(props.transaction) && + !_.contains([CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE, CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE], lodashGet(props.action, 'pendingAction')) ? ( ) : ( From 7168e09025259e4436e4025cc11db32539639bbf Mon Sep 17 00:00:00 2001 From: tienifr Date: Thu, 21 Sep 2023 17:32:38 +0700 Subject: [PATCH 5/5] update condition --- src/components/ReportActionItem/MoneyRequestPreview.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/components/ReportActionItem/MoneyRequestPreview.js b/src/components/ReportActionItem/MoneyRequestPreview.js index d98de5ff7b1d..c0dde899ad8e 100644 --- a/src/components/ReportActionItem/MoneyRequestPreview.js +++ b/src/components/ReportActionItem/MoneyRequestPreview.js @@ -23,6 +23,7 @@ import * as DeviceCapabilities from '../../libs/DeviceCapabilities'; import reportActionPropTypes from '../../pages/home/report/reportActionPropTypes'; import {showContextMenuForReport} from '../ShowContextMenuContext'; import * as OptionsListUtils from '../../libs/OptionsListUtils'; +import * as ReportActionsUtils from '../../libs/ReportActionsUtils'; import * as CurrencyUtils from '../../libs/CurrencyUtils'; import * as IOUUtils from '../../libs/IOUUtils'; import * as ReportUtils from '../../libs/ReportUtils'; @@ -240,7 +241,8 @@ function MoneyRequestPreview(props) { /> )} {_.isEmpty(props.transaction) && - !_.contains([CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE, CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE], lodashGet(props.action, 'pendingAction')) ? ( + !ReportActionsUtils.isMessageDeleted(props.action) && + lodashGet(props.action, 'pendingAction') !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE ? ( ) : (