From 70935749019fe3837dff411c5e35df0e39cb68e2 Mon Sep 17 00:00:00 2001 From: Oliver Wilks Date: Fri, 16 Jun 2023 11:55:26 +0100 Subject: [PATCH 1/5] Set iouPreviewBoxCheckmark marginLeft to 8 --- src/styles/styles.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/styles/styles.js b/src/styles/styles.js index c42c1a77c07f..e4e32298ea1c 100644 --- a/src/styles/styles.js +++ b/src/styles/styles.js @@ -2547,7 +2547,7 @@ const styles = { }, iouPreviewBoxCheckmark: { - marginLeft: 4, + marginLeft: 8, alignSelf: 'center', }, From 4fa338eb74263ad08eafd40933c2fbbbf4dc0ce5 Mon Sep 17 00:00:00 2001 From: Oliver Wilks Date: Fri, 16 Jun 2023 11:56:01 +0100 Subject: [PATCH 2/5] Set moneyRequestHeaderCheckmark marginLeft to 8 --- src/styles/styles.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/styles/styles.js b/src/styles/styles.js index e4e32298ea1c..3e3a35f1b9d4 100644 --- a/src/styles/styles.js +++ b/src/styles/styles.js @@ -3342,7 +3342,7 @@ const styles = { }, moneyRequestHeaderCheckmark: { - marginLeft: 5, + marginLeft: 8, alignSelf: 'center', }, From 8e08ac5b8aa4fb49777782af615c10bf59c4a44b Mon Sep 17 00:00:00 2001 From: Oliver Wilks Date: Fri, 16 Jun 2023 11:58:05 +0100 Subject: [PATCH 3/5] Removed paid IOU checkMark from ReportPreview --- src/components/ReportActionItem/ReportPreview.js | 9 --------- 1 file changed, 9 deletions(-) diff --git a/src/components/ReportActionItem/ReportPreview.js b/src/components/ReportActionItem/ReportPreview.js index 585e91c3f559..17041efd29cb 100644 --- a/src/components/ReportActionItem/ReportPreview.js +++ b/src/components/ReportActionItem/ReportPreview.js @@ -124,15 +124,6 @@ function ReportPreview(props) { {lodashGet(message, 'html', props.translate('iou.payerSettled', {amount: reportAmount}))} - {!props.iouReport.hasOutstandingIOU && ( - - - - )} )} From 0bb182a0c3474e37d63c831159d292d29907b288 Mon Sep 17 00:00:00 2001 From: Oliver Wilks Date: Fri, 16 Jun 2023 12:36:24 +0100 Subject: [PATCH 4/5] Remove unnecessary import --- src/components/ReportActionItem/ReportPreview.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/components/ReportActionItem/ReportPreview.js b/src/components/ReportActionItem/ReportPreview.js index 17041efd29cb..5065f3171955 100644 --- a/src/components/ReportActionItem/ReportPreview.js +++ b/src/components/ReportActionItem/ReportPreview.js @@ -21,7 +21,6 @@ import * as ReportUtils from '../../libs/ReportUtils'; import Navigation from '../../libs/Navigation/Navigation'; import ROUTES from '../../ROUTES'; import SettlementButton from '../SettlementButton'; -import themeColors from '../../styles/themes/default'; import getButtonState from '../../libs/getButtonState'; import * as IOU from '../../libs/actions/IOU'; import refPropTypes from '../refPropTypes'; From 70f5878829d5fddfa1ed77fbfe5ba7456afd7d88 Mon Sep 17 00:00:00 2001 From: Oliver Wilks Date: Sun, 18 Jun 2023 10:56:14 +0100 Subject: [PATCH 5/5] Consolidate checkMark styles into single style --- src/components/MoneyRequestHeader.js | 2 +- src/components/ReportActionItem/IOUPreview.js | 2 +- src/components/TaskHeader.js | 2 +- src/styles/styles.js | 7 +------ 4 files changed, 4 insertions(+), 9 deletions(-) diff --git a/src/components/MoneyRequestHeader.js b/src/components/MoneyRequestHeader.js index af79fd2b8132..0976818f9545 100644 --- a/src/components/MoneyRequestHeader.js +++ b/src/components/MoneyRequestHeader.js @@ -141,7 +141,7 @@ function MoneyRequestHeader(props) { {!props.isSingleTransactionView && {formattedAmount}} {!props.isSingleTransactionView && isSettled && ( - + {CurrencyUtils.convertToDisplayString(requestAmount, requestCurrency)} {!props.iouReport.hasOutstandingIOU && !props.isBillSplit && ( - + {props.translate('task.completed')} - +