From 8923013d199720a359ce4049ecc49c364dcbd39f Mon Sep 17 00:00:00 2001 From: Agata Kosior Date: Fri, 25 Aug 2023 17:26:22 +0200 Subject: [PATCH 1/2] fix: change styles for the requestee --- src/components/ReportActionItem/MoneyRequestView.js | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/components/ReportActionItem/MoneyRequestView.js b/src/components/ReportActionItem/MoneyRequestView.js index 306adf6bdc39..f31302157242 100644 --- a/src/components/ReportActionItem/MoneyRequestView.js +++ b/src/components/ReportActionItem/MoneyRequestView.js @@ -92,6 +92,8 @@ function MoneyRequestView({report, parentReport, shouldShowHorizontalRule, trans const isDistanceRequest = TransactionUtils.isDistanceRequest(transaction); + const isInteractive = canEdit && !isSettled; + return ( @@ -117,7 +119,7 @@ function MoneyRequestView({report, parentReport, shouldShowHorizontalRule, trans titleIcon={Expensicons.Checkmark} description={description} titleStyle={styles.newKansasLarge} - disabled={isSettled || !canEdit} + interactive={isInteractive} shouldShowRightIcon={canEdit} onPress={() => Navigation.navigate(ROUTES.getEditRequestRoute(report.reportID, CONST.EDIT_REQUEST_FIELD.AMOUNT))} /> @@ -126,7 +128,7 @@ function MoneyRequestView({report, parentReport, shouldShowHorizontalRule, trans Navigation.navigate(ROUTES.getEditRequestRoute(report.reportID, CONST.EDIT_REQUEST_FIELD.DESCRIPTION))} @@ -136,7 +138,7 @@ function MoneyRequestView({report, parentReport, shouldShowHorizontalRule, trans Navigation.navigate(ROUTES.getEditRequestRoute(report.reportID, CONST.EDIT_REQUEST_FIELD.DATE))} @@ -146,7 +148,7 @@ function MoneyRequestView({report, parentReport, shouldShowHorizontalRule, trans Navigation.navigate(ROUTES.getEditRequestRoute(report.reportID, CONST.EDIT_REQUEST_FIELD.MERCHANT))} From 2bd2f485a0dfc3270ee98077b7af59a40de8de00 Mon Sep 17 00:00:00 2001 From: Agata Kosior Date: Mon, 28 Aug 2023 10:32:08 +0200 Subject: [PATCH 2/2] fix: apply requested changes --- src/components/ReportActionItem/MoneyRequestView.js | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/components/ReportActionItem/MoneyRequestView.js b/src/components/ReportActionItem/MoneyRequestView.js index f31302157242..5745aee2637c 100644 --- a/src/components/ReportActionItem/MoneyRequestView.js +++ b/src/components/ReportActionItem/MoneyRequestView.js @@ -92,8 +92,6 @@ function MoneyRequestView({report, parentReport, shouldShowHorizontalRule, trans const isDistanceRequest = TransactionUtils.isDistanceRequest(transaction); - const isInteractive = canEdit && !isSettled; - return ( @@ -119,7 +117,7 @@ function MoneyRequestView({report, parentReport, shouldShowHorizontalRule, trans titleIcon={Expensicons.Checkmark} description={description} titleStyle={styles.newKansasLarge} - interactive={isInteractive} + interactive={canEdit} shouldShowRightIcon={canEdit} onPress={() => Navigation.navigate(ROUTES.getEditRequestRoute(report.reportID, CONST.EDIT_REQUEST_FIELD.AMOUNT))} /> @@ -128,7 +126,7 @@ function MoneyRequestView({report, parentReport, shouldShowHorizontalRule, trans Navigation.navigate(ROUTES.getEditRequestRoute(report.reportID, CONST.EDIT_REQUEST_FIELD.DESCRIPTION))} @@ -138,7 +136,7 @@ function MoneyRequestView({report, parentReport, shouldShowHorizontalRule, trans Navigation.navigate(ROUTES.getEditRequestRoute(report.reportID, CONST.EDIT_REQUEST_FIELD.DATE))} @@ -148,7 +146,7 @@ function MoneyRequestView({report, parentReport, shouldShowHorizontalRule, trans Navigation.navigate(ROUTES.getEditRequestRoute(report.reportID, CONST.EDIT_REQUEST_FIELD.MERCHANT))}