Merge pull request #20895 from Ollyws/issue-19953

Fix for: No consistency in margin left for green tick besides amount
Expensify · Jun 20, 2023 · e6c2704 · e6c2704
2 parents b274dbd + 70f5878
commit e6c2704
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 20 deletions.
diff --git a/src/components/MoneyRequestHeader.js b/src/components/MoneyRequestHeader.js
@@ -141,7 +141,7 @@ function MoneyRequestHeader(props) {
                     <View style={[styles.flexRow, styles.alignItemsCenter]}>
                         {!props.isSingleTransactionView && <Text style={[styles.newKansasLarge]}>{formattedAmount}</Text>}
                         {!props.isSingleTransactionView && isSettled && (
-                            <View style={styles.moneyRequestHeaderCheckmark}>
+                            <View style={styles.defaultCheckmarkWrapper}>
                                 <Icon
                                     src={Expensicons.Checkmark}
                                     fill={themeColors.iconSuccessFill}

diff --git a/src/components/ReportActionItem/IOUPreview.js b/src/components/ReportActionItem/IOUPreview.js
@@ -207,7 +207,7 @@ function IOUPreview(props) {
                         <View style={[styles.flex1, styles.flexRow, styles.alignItemsCenter]}>
                             <Text style={styles.textHeadline}>{CurrencyUtils.convertToDisplayString(requestAmount, requestCurrency)}</Text>
                             {!props.iouReport.hasOutstandingIOU && !props.isBillSplit && (
-                                <View style={styles.iouPreviewBoxCheckmark}>
+                                <View style={styles.defaultCheckmarkWrapper}>
                                     <Icon
                                         src={Expensicons.Checkmark}
                                         fill={themeColors.iconSuccessFill}

diff --git 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';
@@ -126,15 +125,6 @@ function ReportPreview(props) {
                                 <Text style={[styles.chatItemMessage, styles.cursorPointer, styles.colorMuted]}>
                                     {lodashGet(message, 'html', props.translate('iou.payerSettled', {amount: reportAmount}))}
                                 </Text>
-                                {!props.iouReport.hasOutstandingIOU && (
-                                    <View style={styles.iouPreviewBoxCheckmark}>
-                                        <Icon
-                                            style={[styles.ml10]}
-                                            src={Expensicons.Checkmark}
-                                            fill={themeColors.iconSuccessFill}
-                                        />
-                                    </View>
-                                )}
                             </View>
                         )}
                     </View>

diff --git a/src/components/TaskHeader.js b/src/components/TaskHeader.js
@@ -96,7 +96,7 @@ function TaskHeader(props) {
                                 {isCompleted ? (
                                     <>
                                         <Text>{props.translate('task.completed')}</Text>
-                                        <View style={styles.moneyRequestHeaderCheckmark}>
+                                        <View style={styles.defaultCheckmarkWrapper}>
                                             <Icon
                                                 src={Expensicons.Checkmark}
                                                 fill={themeColors.iconSuccessFill}

diff --git a/src/styles/styles.js b/src/styles/styles.js
@@ -2542,8 +2542,8 @@ const styles = {
         marginBottom: 0,
     },
 
-    iouPreviewBoxCheckmark: {
-        marginLeft: 4,
+    defaultCheckmarkWrapper: {
+        marginLeft: 8,
         alignSelf: 'center',
     },
 
@@ -3333,11 +3333,6 @@ const styles = {
         lineHeight: variables.lineHeightXXLarge,
     },
 
-    moneyRequestHeaderCheckmark: {
-        marginLeft: 5,
-        alignSelf: 'center',
-    },
-
     loginHeroBody: {
         fontFamily: fontFamily.EXP_NEUE,
         fontSize: variables.fontSizeSignInHeroBody,