Skip to content

Fix for: No consistency in margin left for green tick besides amount #20895

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
grgia merged 5 commits into from
Jun 20, 2023
Merged

Fix for: No consistency in margin left for green tick besides amount #20895

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7093574
Set iouPreviewBoxCheckmark marginLeft to 8
Ollyws Jun 16, 2023
4fa338e
Set moneyRequestHeaderCheckmark marginLeft to 8
Ollyws Jun 16, 2023
8e08ac5
Removed paid IOU checkMark from ReportPreview
Ollyws Jun 16, 2023
0bb182a
Remove unnecessary import
Ollyws Jun 16, 2023
70f5878
Consolidate checkMark styles into single style
Ollyws Jun 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/components/MoneyRequestHeader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
2 changes: 1 addition & 1 deletion src/components/ReportActionItem/IOUPreview.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
10 changes: 0 additions & 10 deletions src/components/ReportActionItem/ReportPreview.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -124,15 +123,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>
Expand Down
2 changes: 1 addition & 1 deletion src/components/TaskHeader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,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}
Expand Down
9 changes: 2 additions & 7 deletions src/styles/styles.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2546,8 +2546,8 @@ const styles = {
marginBottom: 0,
},

iouPreviewBoxCheckmark: {
marginLeft: 4,
defaultCheckmarkWrapper: {
marginLeft: 8,
alignSelf: 'center',
},

Expand Down Expand Up @@ -3341,11 +3341,6 @@ const styles = {
lineHeight: variables.lineHeightXXLarge,
},

moneyRequestHeaderCheckmark: {
marginLeft: 5,
alignSelf: 'center',
},

loginHeroBody: {
fontFamily: fontFamily.EXP_NEUE,
fontSize: variables.fontSizeSignInHeroBody,
Expand Down