diff --git a/packages/react-native/src/evm/components/ConnectWalletDetails/ConnectAppField.tsx b/packages/react-native/src/evm/components/ConnectWalletDetails/ConnectAppField.tsx index ef55a6db297..dae5e3c4a7d 100644 --- a/packages/react-native/src/evm/components/ConnectWalletDetails/ConnectAppField.tsx +++ b/packages/react-native/src/evm/components/ConnectWalletDetails/ConnectAppField.tsx @@ -134,7 +134,7 @@ const ConnectAppField = () => { numberOfLines: 1, style: { color: theme.colors.textPrimary, - // fontFamily: theme.textVariants.defaults.fontFamily, + fontFamily: theme.textVariants.defaults.fontFamily, }, }} containerProps={{ diff --git a/packages/react-native/src/evm/components/ConnectWalletFlow/LocalWalletImportModal.tsx b/packages/react-native/src/evm/components/ConnectWalletFlow/LocalWalletImportModal.tsx index 662504a78b8..1aadd89ede7 100644 --- a/packages/react-native/src/evm/components/ConnectWalletFlow/LocalWalletImportModal.tsx +++ b/packages/react-native/src/evm/components/ConnectWalletFlow/LocalWalletImportModal.tsx @@ -211,7 +211,7 @@ export const LocalWalletImportModal = ({ onChangeText: onPrivateKeyEntered, style: { color: theme.colors.textPrimary, - // fontFamily: theme.textVariants.defaults.fontFamily, + fontFamily: theme.textVariants.defaults.fontFamily, }, }} containerProps={{ pl: "xxs" }} diff --git a/packages/react-native/src/evm/components/PasswordInput.tsx b/packages/react-native/src/evm/components/PasswordInput.tsx index eeb698f54f6..93de1b3dd77 100644 --- a/packages/react-native/src/evm/components/PasswordInput.tsx +++ b/packages/react-native/src/evm/components/PasswordInput.tsx @@ -31,7 +31,7 @@ export const PasswordInput = ({ style={{ ...styles.textInput, color: theme.colors.textPrimary, - // fontFamily: theme.textVariants.defaults.fontFamily, + fontFamily: theme.textVariants.defaults.fontFamily, }} secureTextEntry={!showPassword} textContentType="none" diff --git a/packages/react-native/src/evm/components/SendFunds/SendButton.tsx b/packages/react-native/src/evm/components/SendFunds/SendButton.tsx index e4fa9dacb60..d5687b77099 100644 --- a/packages/react-native/src/evm/components/SendFunds/SendButton.tsx +++ b/packages/react-native/src/evm/components/SendFunds/SendButton.tsx @@ -289,7 +289,7 @@ const SendFundsForm = ({ onChangeText={setReceiverAddress} style={{ color: theme.colors.textPrimary, - // fontFamily: theme.textVariants.defaults.fontFamily, + fontFamily: theme.textVariants.defaults.fontFamily, textAlign: "left", flex: 1, height: 40, @@ -323,7 +323,7 @@ const SendFundsForm = ({ clearTextOnFocus={false} style={{ color: theme.colors.textPrimary, - // fontFamily: theme.textVariants.defaults.fontFamily, + fontFamily: theme.textVariants.defaults.fontFamily, textAlign: "left", flex: 1, height: 40, diff --git a/packages/react-native/src/evm/components/SendFunds/TokenSelector.tsx b/packages/react-native/src/evm/components/SendFunds/TokenSelector.tsx index 5c29f0a3f89..44251c646a3 100644 --- a/packages/react-native/src/evm/components/SendFunds/TokenSelector.tsx +++ b/packages/react-native/src/evm/components/SendFunds/TokenSelector.tsx @@ -141,7 +141,7 @@ export function TokenSelector(props: { onChangeText={setInput} style={{ color: theme.colors.textPrimary, - // fontFamily: theme.textVariants.defaults.fontFamily, + fontFamily: theme.textVariants.defaults.fontFamily, textAlign: "left", flex: 1, height: 40, diff --git a/packages/react-native/src/evm/styles/textVariants.ts b/packages/react-native/src/evm/styles/textVariants.ts index 75ad6d47b7a..36dd5c4c026 100644 --- a/packages/react-native/src/evm/styles/textVariants.ts +++ b/packages/react-native/src/evm/styles/textVariants.ts @@ -1,30 +1,36 @@ +// import { Platform } from "react-native"; + export const textVariants = { - // defaults: { - // fontFamily: "ShopifySans", //Platform.OS === "ios" ? "San Francisco" : "Roboto", - // fontSize: 24, - // fontWeight: "700", - // lineHeight: 32, - // color: "textPrimary", - // }, + defaults: { + fontFamily: undefined as string | undefined, + fontSize: 24, + fontWeight: "700", + lineHeight: 32, + color: "textPrimary", + }, header: { + fontFamily: undefined as string | undefined, fontSize: 24, fontWeight: "600", lineHeight: 32, color: "textPrimary", }, headerBold: { + fontFamily: undefined as string | undefined, fontSize: 24, fontWeight: "700", lineHeight: 32, color: "textPrimary", }, subHeader: { + fontFamily: undefined as string | undefined, fontSize: 16, fontWeight: "500", lineHeight: 24, color: "textSecondary", }, link: { + fontFamily: undefined as string | undefined, fontWeight: "500", fontSize: 14, lineHeight: 24, @@ -32,6 +38,7 @@ export const textVariants = { letterSpacing: -0.02, }, bodyLarge: { + fontFamily: undefined as string | undefined, color: "textPrimary", textAlign: "center", fontWeight: "600", @@ -39,6 +46,7 @@ export const textVariants = { lineHeight: 24, }, bodyLargeBold: { + fontFamily: undefined as string | undefined, color: "textPrimary", textAlign: "center", fontWeight: "700", @@ -46,6 +54,7 @@ export const textVariants = { lineHeight: 24, }, bodySmall: { + fontFamily: undefined as string | undefined, color: "textPrimary", textAlign: "center", fontWeight: "600", @@ -53,6 +62,7 @@ export const textVariants = { lineHeight: 16, }, bodySmallBold: { + fontFamily: undefined as string | undefined, color: "textPrimary", textAlign: "center", fontWeight: "700", @@ -60,6 +70,7 @@ export const textVariants = { lineHeight: 16, }, bodySmallSecondary: { + fontFamily: undefined as string | undefined, color: "textSecondary", textAlign: "left", fontWeight: "600", @@ -67,6 +78,7 @@ export const textVariants = { lineHeight: 16, }, error: { + fontFamily: undefined as string | undefined, color: "error", fontWeight: "500", fontSize: 12, diff --git a/packages/react-native/src/evm/wallets/wallets/embedded/EmbeddedSelectionUI.tsx b/packages/react-native/src/evm/wallets/wallets/embedded/EmbeddedSelectionUI.tsx index a3510166d03..de95dbf39af 100644 --- a/packages/react-native/src/evm/wallets/wallets/embedded/EmbeddedSelectionUI.tsx +++ b/packages/react-native/src/evm/wallets/wallets/embedded/EmbeddedSelectionUI.tsx @@ -137,7 +137,7 @@ export const EmailSelectionUI: React.FC< style: { fontSize: 14, color: theme.colors.textPrimary, - // fontFamily: theme.textVariants.defaults.fontFamily, + fontFamily: theme.textVariants.defaults.fontFamily, lineHeight: 16, padding: 0, flex: 1, diff --git a/packages/react-native/src/evm/wallets/wallets/magic-link.tsx b/packages/react-native/src/evm/wallets/wallets/magic-link.tsx index fef428d854f..342a77b00bc 100644 --- a/packages/react-native/src/evm/wallets/wallets/magic-link.tsx +++ b/packages/react-native/src/evm/wallets/wallets/magic-link.tsx @@ -77,7 +77,7 @@ const MagicSelectionUI: React.FC> = (props) => { style: { fontSize: 14, color: theme.colors.textPrimary, - // fontFamily: theme.textVariants.defaults.fontFamily, + fontFamily: theme.textVariants.defaults.fontFamily, lineHeight: 16, padding: 0, }, diff --git a/packages/react-native/src/evm/wallets/wallets/wallet-connect/WalletConnectUI.tsx b/packages/react-native/src/evm/wallets/wallets/wallet-connect/WalletConnectUI.tsx index 93893d1e485..acfc3cbce0b 100644 --- a/packages/react-native/src/evm/wallets/wallets/wallet-connect/WalletConnectUI.tsx +++ b/packages/react-native/src/evm/wallets/wallets/wallet-connect/WalletConnectUI.tsx @@ -198,7 +198,7 @@ export function WalletConnectUI({ style={{ ...styles.textInput, color: theme.colors.textSecondary, - // fontFamily: theme.textVariants.defaults.fontFamily, + fontFamily: theme.textVariants.defaults.fontFamily, }} />