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
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ const ConnectAppField = () => {
numberOfLines: 1,
style: {
color: theme.colors.textPrimary,
// fontFamily: theme.textVariants.defaults.fontFamily,
fontFamily: theme.textVariants.defaults.fontFamily,
},
}}
containerProps={{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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" }}
Expand Down
2 changes: 1 addition & 1 deletion packages/react-native/src/evm/components/PasswordInput.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
26 changes: 19 additions & 7 deletions packages/react-native/src/evm/styles/textVariants.ts
Original file line number Diff line number Diff line change
@@ -1,72 +1,84 @@
// 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,
color: "linkPrimary",
letterSpacing: -0.02,
},
bodyLarge: {
fontFamily: undefined as string | undefined,
color: "textPrimary",
textAlign: "center",
fontWeight: "600",
fontSize: 16,
lineHeight: 24,
},
bodyLargeBold: {
fontFamily: undefined as string | undefined,
color: "textPrimary",
textAlign: "center",
fontWeight: "700",
fontSize: 16,
lineHeight: 24,
},
bodySmall: {
fontFamily: undefined as string | undefined,
color: "textPrimary",
textAlign: "center",
fontWeight: "600",
fontSize: 14,
lineHeight: 16,
},
bodySmallBold: {
fontFamily: undefined as string | undefined,
color: "textPrimary",
textAlign: "center",
fontWeight: "700",
fontSize: 14,
lineHeight: 16,
},
bodySmallSecondary: {
fontFamily: undefined as string | undefined,
color: "textSecondary",
textAlign: "left",
fontWeight: "600",
fontSize: 14,
lineHeight: 16,
},
error: {
fontFamily: undefined as string | undefined,
color: "error",
fontWeight: "500",
fontSize: 12,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ const MagicSelectionUI: React.FC<SelectUIProps<MagicLink>> = (props) => {
style: {
fontSize: 14,
color: theme.colors.textPrimary,
// fontFamily: theme.textVariants.defaults.fontFamily,
fontFamily: theme.textVariants.defaults.fontFamily,
lineHeight: 16,
padding: 0,
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ export function WalletConnectUI({
style={{
...styles.textInput,
color: theme.colors.textSecondary,
// fontFamily: theme.textVariants.defaults.fontFamily,
fontFamily: theme.textVariants.defaults.fontFamily,
}}
/>
</Box>
Expand Down