diff --git a/packages/react-native/src/evm/components/ConnectWalletDetails/ConnectAppField.tsx b/packages/react-native/src/evm/components/ConnectWalletDetails/ConnectAppField.tsx index fb0ef0ed962..ef55a6db297 100644 --- a/packages/react-native/src/evm/components/ConnectWalletDetails/ConnectAppField.tsx +++ b/packages/react-native/src/evm/components/ConnectWalletDetails/ConnectAppField.tsx @@ -13,9 +13,11 @@ import { WalletIcon } from "../base/WalletIcon"; import WalletConnectIcon from "../../assets/wallet-connect"; import QrCodeIcon from "../../assets/qr-code"; import { QRCodeScan } from "./QRCodeScan"; +import { useLocale } from "../../providers/ui-context-provider"; const ConnectAppField = () => { const theme = useTheme(); + const l = useLocale(); const [showWCInput, setShowWCInput] = useState(false); const [wcUri, setWCUri] = useState(); const [appMeta, setAppMeta] = useState<{ name: string; iconUrl: string }>(); @@ -132,7 +134,7 @@ const ConnectAppField = () => { numberOfLines: 1, style: { color: theme.colors.textPrimary, - fontFamily: theme.textVariants.defaults.fontFamily, + // fontFamily: theme.textVariants.defaults.fontFamily, }, }} containerProps={{ @@ -181,7 +183,7 @@ const ConnectAppField = () => { )} - {appMeta ? appMeta.name : "Connect app"} + {appMeta ? appMeta.name : l.common.connect_app} diff --git a/packages/react-native/src/evm/components/ConnectWalletFlow/ChooseWallet/ChooseWallet.tsx b/packages/react-native/src/evm/components/ConnectWalletFlow/ChooseWallet/ChooseWallet.tsx index 1a026627d96..7b16b87b405 100644 --- a/packages/react-native/src/evm/components/ConnectWalletFlow/ChooseWallet/ChooseWallet.tsx +++ b/packages/react-native/src/evm/components/ConnectWalletFlow/ChooseWallet/ChooseWallet.tsx @@ -188,7 +188,7 @@ export function ChooseWallet({ > - OR + {l.common.or} diff --git a/packages/react-native/src/evm/components/ConnectWalletFlow/LocalWalletImportModal.tsx b/packages/react-native/src/evm/components/ConnectWalletFlow/LocalWalletImportModal.tsx index 1aadd89ede7..662504a78b8 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 93de1b3dd77..eeb698f54f6 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 d5687b77099..e4fa9dacb60 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 44251c646a3..5c29f0a3f89 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/i18n/types.ts b/packages/react-native/src/evm/i18n/types.ts index 10b6e381174..d26bdd07432 100644 --- a/packages/react-native/src/evm/i18n/types.ts +++ b/packages/react-native/src/evm/i18n/types.ts @@ -77,12 +77,14 @@ export const _en = { request_new_code: "Request new code", sign_in: "Sign In", sign_in_google: "Sign in with Google", + enter_your_email: "Enter your email address", }, wallet_connect: { no_results_found: "No results found", search_wallets: "Search Wallets", }, common: { + connect_app: "Connect app", unknown_network: "Unknown Network", fetching: "Fetching...", password: "Password", diff --git a/packages/react-native/src/evm/styles/textVariants.ts b/packages/react-native/src/evm/styles/textVariants.ts index 9121becc06b..75ad6d47b7a 100644 --- a/packages/react-native/src/evm/styles/textVariants.ts +++ b/packages/react-native/src/evm/styles/textVariants.ts @@ -1,13 +1,11 @@ -import { Platform } from "react-native"; - export const textVariants = { - defaults: { - fontFamily: Platform.OS === "ios" ? "san Francisco" : "Roboto", - fontSize: 24, - fontWeight: "700", - lineHeight: 32, - color: "textPrimary", - }, + // defaults: { + // fontFamily: "ShopifySans", //Platform.OS === "ios" ? "San Francisco" : "Roboto", + // fontSize: 24, + // fontWeight: "700", + // lineHeight: 32, + // color: "textPrimary", + // }, header: { fontSize: 24, fontWeight: "600", 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 fe7cb9e5862..a3510166d03 100644 --- a/packages/react-native/src/evm/wallets/wallets/embedded/EmbeddedSelectionUI.tsx +++ b/packages/react-native/src/evm/wallets/wallets/embedded/EmbeddedSelectionUI.tsx @@ -120,7 +120,7 @@ export const EmailSelectionUI: React.FC< textAlign="center" marginHorizontal="xxs" > - OR + {l.common.or} @@ -131,13 +131,13 @@ export const EmailSelectionUI: React.FC< <> > = (props) => { { setEmail(text); @@ -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 acfc3cbce0b..93893d1e485 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, }} />