Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 app/components/UI/DeleteWalletModal/styles.ts
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ export const createStyles = (colors: any) =>
warningText: {
textAlign: 'left',
width: '100%',
fontFamily: 'Geist Medium',
fontFamily: 'Geist-Medium',
},
warningTextContainer: {
flexDirection: 'column',
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Platform, StyleSheet } from 'react-native';
import { StyleSheet } from 'react-native';
import type { Theme } from '../../../../../util/theme/models';

export const styleSheet = (params: { theme: Theme }) => {
Expand All @@ -24,8 +24,7 @@ export const styleSheet = (params: { theme: Theme }) => {
},
heading: {
marginBottom: 8,
fontFamily:
Platform.OS === 'android' ? 'MM Sans Regular' : 'MMSans-Regular',
fontFamily: 'MMSans-Regular',
},
bodyText: {
marginBottom: 32,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,21 +71,19 @@
fontSize: titleFontSize || scaleFont(useSystemFont ? 44 : 47), // Slightly smaller base for system fonts
lineHeight: titleFontSize
? titleFontSize + 1
: scaleFont(useSystemFont ? 46 : 48),

Check warning on line 74 in app/components/UI/Perps/components/PerpsGTMModal/PerpsGTMModal.styles.ts

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Extract this nested ternary operation into an independent statement.

See more on https://sonarcloud.io/project/issues?id=metamask-mobile&issues=AZrm5pElAy6Bgu6nLPWa&open=AZrm5pElAy6Bgu6nLPWa&pullRequest=23650
textAlign: 'center',
paddingTop: scaleVertical(12),
fontFamily: useSystemFont
? Platform.OS === 'ios'
? 'System'
: 'Roboto'

Check warning on line 80 in app/components/UI/Perps/components/PerpsGTMModal/PerpsGTMModal.styles.ts

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Extract this nested ternary operation into an independent statement.

See more on https://sonarcloud.io/project/issues?id=metamask-mobile&issues=AZrm5pElAy6Bgu6nLPWb&open=AZrm5pElAy6Bgu6nLPWb&pullRequest=23650
: Platform.OS === 'ios'
? 'MM Poly'
: 'MM Poly Regular',
: 'MMPoly-Regular',
fontWeight: useSystemFont
? '700'
: Platform.OS === 'ios'
? '900'
: 'normal',

Check warning on line 86 in app/components/UI/Perps/components/PerpsGTMModal/PerpsGTMModal.styles.ts

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Extract this nested ternary operation into an independent statement.

See more on https://sonarcloud.io/project/issues?id=metamask-mobile&issues=AZrm5pElAy6Bgu6nLPWc&open=AZrm5pElAy6Bgu6nLPWc&pullRequest=23650
},
titleDescription: {
paddingTop: scaleVertical(10),
Expand All @@ -94,9 +92,9 @@
fontSize: subtitleFontSize || scaleFont(16),
lineHeight: subtitleFontSize ? subtitleFontSize + 4 : scaleFont(20),
fontFamily: useSystemFont
? Platform.OS === 'ios'
? 'System'
: 'Roboto'

Check warning on line 97 in app/components/UI/Perps/components/PerpsGTMModal/PerpsGTMModal.styles.ts

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Extract this nested ternary operation into an independent statement.

See more on https://sonarcloud.io/project/issues?id=metamask-mobile&issues=AZrm5pElAy6Bgu6nLPWd&open=AZrm5pElAy6Bgu6nLPWd&pullRequest=23650
: 'Geist-Regular',
fontWeight: '500',
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ const createStyles = (theme: Theme) =>
flex: 1,
},
title: {
fontFamily: Platform.OS === 'ios' ? 'MM Poly' : 'MM Poly Regular',
fontFamily: 'MMPoly-Regular',
fontWeight: '400',
// make it smaller on smaller screens
fontSize:
Expand Down
6 changes: 3 additions & 3 deletions app/components/UI/ReviewModal/styles.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ export const createStyles = (colors: any) =>
optionIcon: { fontSize: 24 },
optionLabel: {
fontSize: 14,
fontFamily: 'Geist Regular',
fontFamily: 'Geist-Regular',
color: colors.primary.default,
},
helpOption: { marginVertical: 12 },
Expand All @@ -29,14 +29,14 @@ export const createStyles = (colors: any) =>
questionLabel: {
fontSize: 18,
paddingHorizontal: 30,
fontFamily: 'Geist Bold',
fontFamily: 'Geist-Bold',
textAlign: 'center',
color: colors.text.default,
lineHeight: 26,
},
description: {
fontSize: 14,
fontFamily: 'Geist Regular',
fontFamily: 'Geist-Regular',
color: colors.text.alternative,
textAlign: 'center',
lineHeight: 20,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import React, {
useRef,
useState,
} from 'react';
import { Image, ImageBackground, Platform, Text as RNText } from 'react-native';
import { Image, ImageBackground, Text as RNText } from 'react-native';
import { useNavigation, useFocusEffect } from '@react-navigation/native';
import { useDispatch, useSelector } from 'react-redux';
import { useTailwind } from '@metamask/design-system-twrnc-preset';
Expand Down Expand Up @@ -318,7 +318,7 @@ const OnboardingIntroStep: React.FC<{
tw.style('text-center text-white text-12 leading-1 pt-1'),
// eslint-disable-next-line react-native/no-inline-styles
{
fontFamily: Platform.OS === 'ios' ? 'MM Poly' : 'MM Poly Regular',
fontFamily: 'MMPoly-Regular',
},
]}
>
Expand Down
5 changes: 2 additions & 3 deletions app/components/Views/Onboarding/styles.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { StyleSheet, Platform } from 'react-native';
import { StyleSheet } from 'react-native';
import Device from '../../../util/device';
import { colors as importedColors } from '../../../styles/common';
import type { Theme } from '../../../util/theme/models';
Expand Down Expand Up @@ -64,8 +64,7 @@ export const createStyles = (colors: Theme['colors']) =>
lineHeight: Device.isMediumDevice() ? 30 : 40,
textAlign: 'center',
paddingHorizontal: Device.isMediumDevice() ? 40 : 60,
fontFamily:
Platform.OS === 'android' ? 'MM Sans Regular' : 'MMSans-Regular',
fontFamily: 'MMSans-Regular',
color: importedColors.gettingStartedTextColor,
width: '100%',
marginVertical: 16,
Expand Down
5 changes: 2 additions & 3 deletions app/components/Views/OnboardingSuccess/index.styles.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { StyleSheet, Platform } from 'react-native';
import { StyleSheet } from 'react-native';
import { ThemeColors } from '@metamask/design-tokens';

const createStyles = (colors: ThemeColors) =>
Expand Down Expand Up @@ -26,8 +26,7 @@ const createStyles = (colors: ThemeColors) =>
marginBottom: 16,
marginHorizontal: 16,
textAlign: 'center',
fontFamily:
Platform.OS === 'android' ? 'MM Sans Regular' : 'MMSans-Regular',
fontFamily: 'MMSans-Regular',
},
footerLink: {
paddingVertical: 8,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ export const styleSheet = (params: {
inputText: {
fontSize: getFontSizeForInputLength(contentLength),
lineHeight: 75,
fontFamily: 'Geist Medium',
fontFamily: 'Geist-Medium',
},
inputWrapper: {
alignItems: 'center',
Expand Down
Loading