Skip to content
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

Jump to bottom

[Fix 20678] Values cropped on terms and fees page. #21015

Merged
merged 8 commits into from
Jun 21, 2023
Merged

[Fix 20678] Values cropped on terms and fees page. #21015

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f76ae1e
[FIX 20678] Some values were cropped in On Terms and Fees page.
DanutGavrus Jun 16, 2023
873ee78
Removed custom style and used StyleUtils.
DanutGavrus Jun 16, 2023
70a3c11
Merge branch 'main' into fix/20678-values-cropped-on-terms-and-fees-page
DanutGavrus Jun 19, 2023
7e53f66
Run prettier.
DanutGavrus Jun 19, 2023
be08629
Replaced with custom style.
DanutGavrus Jun 19, 2023
30b3da2
Merge branch 'main' into fix/20678-values-cropped-on-terms-and-fees-page
DanutGavrus Jun 19, 2023
d3a63de
Merge branch 'main' into fix/20678-values-cropped-on-terms-and-fees-page
DanutGavrus Jun 20, 2023
5273039
Increased margin top to 16px for outOfNetwork.
DanutGavrus Jun 20, 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
10 changes: 5 additions & 5 deletions src/pages/EnablePayments/TermsPage/ShortTermsForm.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ function ShortTermsForm() {
<Text style={styles.textLarge}>{Localize.translateLocal('termsStep.monthlyFee')}</Text>
</View>
<View style={styles.flexRow}>
<Text style={[styles.textHeadline, styles.textXXXLarge]}>{Localize.translateLocal('termsStep.feeAmountZero')}</Text>
<Text style={styles.shortTermsHeadline}>{Localize.translateLocal('termsStep.feeAmountZero')}</Text>
</View>
</View>
<View style={[styles.flex2]}>
Expand All @@ -27,7 +27,7 @@ function ShortTermsForm() {
<Text style={styles.textLarge}>{Localize.translateLocal('termsStep.shortTermsForm.perPurchase')}</Text>
</View>
<View style={styles.flexRow}>
<Text style={[styles.textHeadline, styles.textXXXLarge]}>{Localize.translateLocal('termsStep.feeAmountZero')}</Text>
<Text style={styles.shortTermsHeadline}>{Localize.translateLocal('termsStep.feeAmountZero')}</Text>
</View>
</View>
</View>
Expand All @@ -39,13 +39,13 @@ function ShortTermsForm() {
<Text style={styles.textLarge}>{Localize.translateLocal('termsStep.shortTermsForm.atmWithdrawal')}</Text>
</View>
<View style={styles.flexRow}>
<Text style={[styles.textHeadline, styles.textXXXLarge]}>{Localize.translateLocal('common.na')}</Text>
<Text style={styles.shortTermsHeadline}>{Localize.translateLocal('common.na')}</Text>
</View>
<View style={styles.flexRow}>
<Text style={styles.textLabelSupporting}>{Localize.translateLocal('termsStep.shortTermsForm.inNetwork')}</Text>
</View>
<View style={[styles.flexRow, styles.mt1]}>
<Text style={[styles.textHeadline, styles.textXXXLarge]}>{Localize.translateLocal('common.na')}</Text>
<Text style={styles.shortTermsHeadline}>{Localize.translateLocal('common.na')}</Text>
</View>
<View style={styles.flexRow}>
<Text style={styles.textLabelSupporting}>{Localize.translateLocal('termsStep.shortTermsForm.outOfNetwork')}</Text>
Expand All @@ -57,7 +57,7 @@ function ShortTermsForm() {
<Text style={styles.textLarge}>{Localize.translateLocal('termsStep.shortTermsForm.cashReload')}</Text>
</View>
<View style={styles.flexRow}>
<Text style={[styles.textHeadline, styles.textXXXLarge]}>{Localize.translateLocal('common.na')}</Text>
<Text style={styles.shortTermsHeadline}>{Localize.translateLocal('common.na')}</Text>
</View>
</View>
</View>
Expand Down
8 changes: 8 additions & 0 deletions src/styles/styles.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2894,6 +2894,14 @@ const styles = {
marginTop: 12,
},

shortTermsHeadline: {
...headlineFont,
...whiteSpace.preWrap,
color: themeColors.heading,
fontSize: variables.fontSizeXXXLarge,
lineHeight: variables.lineHeightXXXLarge,
},

longTermsRow: {
flexDirection: 'row',
marginTop: 20,
Expand Down
1 change: 1 addition & 0 deletions src/styles/variables.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ export default {
lineHeightLarge: getValueUsingPixelRatio(18, 24),
lineHeightXLarge: getValueUsingPixelRatio(20, 24),
lineHeightXXLarge: getValueUsingPixelRatio(27, 32),
lineHeightXXXLarge: getValueUsingPixelRatio(32, 37),
lineHeightSizeh1: getValueUsingPixelRatio(23, 28),
lineHeightSignInHeroXSmall: getValueUsingPixelRatio(32, 37),
inputHeight: getValueUsingPixelRatio(52, 72),
Expand Down