Skip to content
Draft
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
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,7 @@ import BottomSheet, {
} from '../../../../../component-library/components/BottomSheets/BottomSheet';
import BottomSheetHeader from '../../../../../component-library/components/BottomSheets/BottomSheetHeader';
import BottomSheetFooter from '../../../../../component-library/components/BottomSheets/BottomSheetFooter';
import Text, {
TextVariant,
} from '../../../../../component-library/components/Texts/Text';
import { Text, TextVariant } from '@metamask/design-system-react-native';
import {
ButtonSize,
ButtonVariants,
Expand All @@ -25,9 +23,6 @@ const createStyles = () =>
paddingVertical: 20,
paddingHorizontal: 16,
},
errorMessage: {
textAlign: 'center',
},
});

interface BlockaidModalRouteParams {
Expand Down Expand Up @@ -62,7 +57,7 @@ const BlockaidModal = () => {
{strings(`blockaid_modal.${errorType}_title`)}
</BottomSheetHeader>
<View style={styles.container}>
<Text variant={TextVariant.BodyMD} style={styles.errorMessage}>
<Text variant={TextVariant.BodyMd} twClassName="text-center">
{errorMessage}
</Text>
</View>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
import React, { useState, useEffect } from 'react';
import { useSelector } from 'react-redux';
import Text, {
import {
Box,
Text,
TextColor,
TextVariant,
} from '../../../../../component-library/components/Texts/Text';
import { Box } from '@metamask/design-system-react-native';
} from '@metamask/design-system-react-native';
import {
selectBridgeControllerState,
selectBridgeFeatureFlags,
Expand Down Expand Up @@ -68,7 +69,7 @@ const QuoteCountdownTimer: React.FC = () => {

return (
<Box style={styles.container}>
<Text variant={TextVariant.BodyMD} color={TextColor.Alternative}>
<Text variant={TextVariant.BodyMd} color={TextColor.TextAlternative}>
{`0:${formattedSeconds}`}
</Text>
</Box>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -406,13 +406,17 @@ exports[`QuoteDetailsCard renders initial state 1`] = `
<Text
accessibilityRole="text"
style={
{
"color": "#66676a",
"fontFamily": "Geist-Regular",
"fontSize": 16,
"letterSpacing": 0,
"lineHeight": 24,
}
[
{
"color": "#66676a",
"fontFamily": "Geist-Regular",
"fontSize": 16,
"fontWeight": 400,
"letterSpacing": 0,
"lineHeight": 24,
},
undefined,
]
}
>
0:30
Expand Down
13 changes: 5 additions & 8 deletions app/components/UI/Bridge/components/TokenButton.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,11 @@ import {
ImageSourcePropType,
TouchableOpacity,
} from 'react-native';
import Text, {
import {
FontWeight,
Text,
TextVariant,
} from '../../../../component-library/components/Texts/Text';
} from '@metamask/design-system-react-native';
import { useStyles } from '../../../../component-library/hooks';
import { Theme } from '../../../../util/theme/models';
import { Box } from '../../Box/Box';
Expand Down Expand Up @@ -49,11 +51,6 @@ const createStyles = (params: StylesParams) => {
paddingRight: 11,
...shadows.size.xs,
},
tokenSymbol: {
color: theme.colors.text.default,
fontSize: theme.typography.sHeadingLG.fontSize,
fontWeight: 500,
},
});
};

Expand Down Expand Up @@ -88,7 +85,7 @@ export const TokenButton: React.FC<TokenProps> = ({
<TokenIcon symbol={symbol} icon={iconUrl} style={styles.icon} />
</BadgeWrapper>

<Text style={styles.tokenSymbol} variant={TextVariant.HeadingLG}>
<Text variant={TextVariant.HeadingLg} fontWeight={FontWeight.Medium}>
{symbol}
</Text>
</Box>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
import React from 'react';
import Text, {
import {
FontWeight,
TextColor,
Text,
TextVariant,
} from '../../../../../component-library/components/Texts/Text';
} from '@metamask/design-system-react-native';
import {
AlignItems,
FlexDirection,
Expand Down Expand Up @@ -110,13 +112,14 @@ const TransactionAsset = ({
flexDirection={FlexDirection.Column}
gap={2}
>
<Text variant={TextVariant.BodyLGMedium}>
<Text variant={TextVariant.BodyLg} fontWeight={FontWeight.Medium}>
{tokenAmount} {token.symbol}
</Text>
{txType === TransactionType.bridge && (
<Text
variant={TextVariant.BodyMDMedium}
color={TextColor.Alternative}
variant={TextVariant.BodyMd}
fontWeight={FontWeight.Medium}
color={TextColor.TextAlternative}
style={styles.networkName}
>
{networkName}
Expand Down
Loading