From a2134548771f3417d7ae271fcf81736e7709528c Mon Sep 17 00:00:00 2001 From: Antony Kithinzi Date: Sun, 14 Jan 2024 05:35:12 +0100 Subject: [PATCH 1/7] fix: Report preview more grayed when two money requests are created offline --- src/components/ReportActionItem/ReportPreview.js | 2 +- src/pages/home/report/ReportActionItem.js | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/components/ReportActionItem/ReportPreview.js b/src/components/ReportActionItem/ReportPreview.js index abc7e3954200..6af662c90539 100644 --- a/src/components/ReportActionItem/ReportPreview.js +++ b/src/components/ReportActionItem/ReportPreview.js @@ -258,7 +258,7 @@ function ReportPreview(props) { }, [isPaidGroupPolicy, isCurrentUserManager, isDraftExpenseReport, isApproved, iouSettled]); const shouldShowSettlementButton = shouldShowPayButton || shouldShowApproveButton; return ( - + { diff --git a/src/pages/home/report/ReportActionItem.js b/src/pages/home/report/ReportActionItem.js index e490c4601d10..60327adc444c 100644 --- a/src/pages/home/report/ReportActionItem.js +++ b/src/pages/home/report/ReportActionItem.js @@ -730,6 +730,7 @@ function ReportActionItem(props) { shouldHideOnDelete={!ReportActionsUtils.isThreadParentMessage(props.action, props.report.reportID)} errors={props.action.errors} errorRowStyles={[styles.ml10, styles.mr2]} + // shouldDisableOpacity={props.action.actionName === CONST.REPORT.ACTIONS.TYPE.REPORTPREVIEW} needsOffscreenAlphaCompositing={ReportActionsUtils.isMoneyRequestAction(props.action)} shouldDisableStrikeThrough > From 501bd344382b3fa0072fa5b95937c0f4faae545c Mon Sep 17 00:00:00 2001 From: Antony Kithinzi Date: Thu, 18 Jan 2024 18:35:46 +0000 Subject: [PATCH 2/7] Revert "fix: Report preview more grayed when two money requests are created offline" This reverts commit a2134548771f3417d7ae271fcf81736e7709528c. --- src/components/ReportActionItem/ReportPreview.js | 2 +- src/pages/home/report/ReportActionItem.js | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/components/ReportActionItem/ReportPreview.js b/src/components/ReportActionItem/ReportPreview.js index 6af662c90539..abc7e3954200 100644 --- a/src/components/ReportActionItem/ReportPreview.js +++ b/src/components/ReportActionItem/ReportPreview.js @@ -258,7 +258,7 @@ function ReportPreview(props) { }, [isPaidGroupPolicy, isCurrentUserManager, isDraftExpenseReport, isApproved, iouSettled]); const shouldShowSettlementButton = shouldShowPayButton || shouldShowApproveButton; return ( - + { diff --git a/src/pages/home/report/ReportActionItem.js b/src/pages/home/report/ReportActionItem.js index 60327adc444c..e490c4601d10 100644 --- a/src/pages/home/report/ReportActionItem.js +++ b/src/pages/home/report/ReportActionItem.js @@ -730,7 +730,6 @@ function ReportActionItem(props) { shouldHideOnDelete={!ReportActionsUtils.isThreadParentMessage(props.action, props.report.reportID)} errors={props.action.errors} errorRowStyles={[styles.ml10, styles.mr2]} - // shouldDisableOpacity={props.action.actionName === CONST.REPORT.ACTIONS.TYPE.REPORTPREVIEW} needsOffscreenAlphaCompositing={ReportActionsUtils.isMoneyRequestAction(props.action)} shouldDisableStrikeThrough > From 52143a0b0ee4ad41c16806fc286bcb3761b68dfe Mon Sep 17 00:00:00 2001 From: Antony Kithinzi Date: Thu, 18 Jan 2024 18:37:19 +0000 Subject: [PATCH 3/7] fix: Report preview more grayed when two money requests are created offline --- src/components/ReportActionItem/ReportPreview.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/components/ReportActionItem/ReportPreview.js b/src/components/ReportActionItem/ReportPreview.js index abc7e3954200..baea7fb00d70 100644 --- a/src/components/ReportActionItem/ReportPreview.js +++ b/src/components/ReportActionItem/ReportPreview.js @@ -258,7 +258,10 @@ function ReportPreview(props) { }, [isPaidGroupPolicy, isCurrentUserManager, isDraftExpenseReport, isApproved, iouSettled]); const shouldShowSettlementButton = shouldShowPayButton || shouldShowApproveButton; return ( - + { From 64697c6cb76edddad5fc234cd46cdc6c12ea1b32 Mon Sep 17 00:00:00 2001 From: Antony Kithinzi Date: Fri, 26 Jan 2024 04:47:05 +0100 Subject: [PATCH 4/7] prettier --- src/components/ReportActionItem/ReportPreview.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/ReportActionItem/ReportPreview.js b/src/components/ReportActionItem/ReportPreview.js index 0755434eb73f..f67622455faf 100644 --- a/src/components/ReportActionItem/ReportPreview.js +++ b/src/components/ReportActionItem/ReportPreview.js @@ -260,7 +260,7 @@ function ReportPreview(props) { }, [isPaidGroupPolicy, isCurrentUserManager, isDraftExpenseReport, isApproved, iouSettled]); const shouldShowSettlementButton = shouldShowPayButton || shouldShowApproveButton; return ( - From 40c979c99065e128832e5bd383555719e9fc72de Mon Sep 17 00:00:00 2001 From: Antony Kithinzi Date: Wed, 31 Jan 2024 03:07:32 +0100 Subject: [PATCH 5/7] fix --- src/components/ReportActionItem/ReportPreview.tsx | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/components/ReportActionItem/ReportPreview.tsx b/src/components/ReportActionItem/ReportPreview.tsx index b2fece085f57..712dd6e56760 100644 --- a/src/components/ReportActionItem/ReportPreview.tsx +++ b/src/components/ReportActionItem/ReportPreview.tsx @@ -229,7 +229,10 @@ function ReportPreview({ }, [isPaidGroupPolicy, isCurrentUserManager, isDraftExpenseReport, isApproved, iouSettled]); const shouldShowSettlementButton = shouldShowPayButton || shouldShowApproveButton; return ( - + { From 5b6cf79f404cb5d6a3677871622e62f7e0badd7a Mon Sep 17 00:00:00 2001 From: Antony Kithinzi Date: Wed, 31 Jan 2024 17:33:14 +0100 Subject: [PATCH 6/7] prettier --- src/components/ReportActionItem/ReportPreview.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/ReportActionItem/ReportPreview.tsx b/src/components/ReportActionItem/ReportPreview.tsx index 712dd6e56760..d9146c25edcf 100644 --- a/src/components/ReportActionItem/ReportPreview.tsx +++ b/src/components/ReportActionItem/ReportPreview.tsx @@ -229,7 +229,7 @@ function ReportPreview({ }, [isPaidGroupPolicy, isCurrentUserManager, isDraftExpenseReport, isApproved, iouSettled]); const shouldShowSettlementButton = shouldShowPayButton || shouldShowApproveButton; return ( - From e3823c12be0ddf94cdde25d5ce26214f6affb465 Mon Sep 17 00:00:00 2001 From: Antony Kithinzi Date: Wed, 31 Jan 2024 21:18:39 +0300 Subject: [PATCH 7/7] Update ReportPreview.tsx --- src/components/ReportActionItem/ReportPreview.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/ReportActionItem/ReportPreview.tsx b/src/components/ReportActionItem/ReportPreview.tsx index 163392f4baa2..bdb3bbd2bb33 100644 --- a/src/components/ReportActionItem/ReportPreview.tsx +++ b/src/components/ReportActionItem/ReportPreview.tsx @@ -231,7 +231,7 @@ function ReportPreview({ return (