Skip to content

Commit 8ececee

Browse files
clegirarclegirar
authored
fix: font weight multisig screen (#1493)
Signed-off-by: clegirar <clemntgirard@gmail.com>
1 parent 1909854 commit 8ececee

File tree

12 files changed

+59
-96
lines changed

12 files changed

+59
-96
lines changed

‎packages/components/EmptyList.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { AnimationFadeIn } from "./animations/AnimationFadeIn";
66
import { SpacerColumn } from "./spacer";
77
import emptyListSVG from "../../assets/icons/empty-list.svg";
88
import { neutral77 } from "../utils/style/colors";
9-
import { fontSemibold16 } from "../utils/style/fonts";
9+
import { fontRegular16 } from "../utils/style/fonts";
1010

1111
interface EmptyListProps {
1212
text: string;
@@ -24,7 +24,7 @@ export const EmptyList: React.FC<EmptyListProps> = ({ text, size = 250 }) => {
2424
>
2525
<SVG source={emptyListSVG} width={size} height={size} />
2626
<SpacerColumn size={2} />
27-
<BrandText style={[fontSemibold16, { color: neutral77 }]}>
27+
<BrandText style={[fontRegular16, { color: neutral77 }]}>
2828
{text}
2929
</BrandText>
3030
</AnimationFadeIn>

‎packages/components/ErrorText.tsx‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import Animated, {
88

99
import { BrandText } from "./BrandText";
1010
import { errorColor } from "../utils/style/colors";
11-
import { fontSemibold14 } from "../utils/style/fonts";
11+
import { fontRegular14 } from "../utils/style/fonts";
1212

1313
interface ErrorTextProps extends TextProps {
1414
center?: boolean;
@@ -66,10 +66,7 @@ export const ErrorText: React.FC<ErrorTextProps> = ({
6666
// eslint-disable-next-line no-restricted-syntax
6767
const styles = StyleSheet.create({
6868
text: StyleSheet.flatten([
69-
fontSemibold14,
70-
{
71-
marginTop: 6,
72-
color: errorColor,
73-
},
69+
fontRegular14,
70+
{ marginTop: 6, color: errorColor },
7471
]),
7572
});

‎packages/components/inputs/TextInputOutsideLabel.tsx‎

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { TextStyle, View, ViewStyle } from "react-native";
22

33
import asteriskSignSVG from "../../../assets/icons/asterisk-sign.svg";
44
import { neutral77 } from "../../utils/style/colors";
5-
import { fontSemibold13, fontSemibold14 } from "../../utils/style/fonts";
5+
import { fontRegular13, fontRegular14 } from "../../utils/style/fonts";
66
import { BrandText } from "../BrandText";
77
import { SVG } from "../SVG";
88
import { SpacerColumn, SpacerRow } from "../spacer";
@@ -23,15 +23,7 @@ export const TextInputOutsideLabel: React.FC<TextInputLabelProps> = ({
2323
<>
2424
<View style={rowEndCStyle}>
2525
<View style={rowCStyle}>
26-
<BrandText
27-
style={[
28-
{
29-
color: neutral77,
30-
},
31-
fontSemibold14,
32-
labelStyle,
33-
]}
34-
>
26+
<BrandText style={[{ color: neutral77 }, fontRegular14, labelStyle]}>
3527
{label}
3628
</BrandText>
3729
{isAsterickSign && (
@@ -41,7 +33,7 @@ export const TextInputOutsideLabel: React.FC<TextInputLabelProps> = ({
4133
</>
4234
)}
4335
</View>
44-
{!!subtitle && <BrandText style={fontSemibold13}>{subtitle}</BrandText>}
36+
{!!subtitle && <BrandText style={fontRegular13}>{subtitle}</BrandText>}
4537
</View>
4638
<SpacerColumn size={1} />
4739
</>

‎packages/components/multisig/MultisigTransactions.tsx‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import {
1414
import { useMultisigTransactions } from "../../hooks/multisig/useMultisigTransactions";
1515
import { useMultisigTransactionsCounts } from "../../hooks/multisig/useMultisigTransactionsCounts";
1616
import { secondaryColor } from "../../utils/style/colors";
17-
import { fontSemibold28 } from "../../utils/style/fonts";
17+
import { fontRegular28 } from "../../utils/style/fonts";
1818
import { headerHeight, layout } from "../../utils/style/layout";
1919
import { BrandText } from "../BrandText";
2020
import { EmptyList } from "../EmptyList";
@@ -111,7 +111,7 @@ export const MultisigTransactions: FC<{
111111
<View>
112112
{title && (
113113
<>
114-
<BrandText style={fontSemibold28}>{title}</BrandText>
114+
<BrandText style={fontRegular28}>{title}</BrandText>
115115
<SpacerColumn size={1.5} />
116116
</>
117117
)}
@@ -120,9 +120,7 @@ export const MultisigTransactions: FC<{
120120
items={tabs}
121121
onSelect={setSelectedTab}
122122
selected={selectedTab}
123-
tabContainerStyle={{
124-
height: 64,
125-
}}
123+
tabContainerStyle={{ height: 64 }}
126124
/>
127125
</View>
128126

‎packages/screens/Multisig/MultisigCreateScreen.tsx‎

Lines changed: 12 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@ import {
3737
trashBackground,
3838
} from "@/utils/style/colors";
3939
import {
40-
fontSemibold13,
41-
fontSemibold14,
42-
fontSemibold28,
40+
fontRegular13,
41+
fontRegular14,
42+
fontRegular28,
4343
} from "@/utils/style/fonts";
4444
import { layout } from "@/utils/style/layout";
4545

@@ -188,33 +188,22 @@ export const MultisigCreateScreen = () => {
188188
? navigation.goBack()
189189
: navigation.navigate("Multisig")
190190
}
191-
footerChildren={<></>}
192-
noMargin
193-
fullWidth
194-
noScroll
191+
isLarge
195192
forceNetworkKind={NetworkKind.Cosmos}
196193
>
197194
<ScrollView
198195
contentContainerStyle={{
199-
padding: layout.contentSpacing,
200196
paddingTop: layout.topContentSpacingWithHeading,
201197
}}
202198
>
203-
<View
204-
style={{
205-
height: "100%",
206-
maxWidth: 793,
207-
}}
208-
>
209-
<BrandText style={fontSemibold28}>Create a Legacy Multisig</BrandText>
199+
<View style={{ height: "100%", maxWidth: 793 }}>
200+
<BrandText style={fontRegular28}>Create a Legacy Multisig</BrandText>
210201
<SpacerColumn size={2.5} />
211202
<MultisigSection
212203
title="What is a Multisignature Wallet?"
213-
containerStyle={{
214-
maxWidth: 487,
215-
}}
204+
containerStyle={{ maxWidth: 487 }}
216205
>
217-
<BrandText style={[fontSemibold13, { color: neutralA3 }]}>
206+
<BrandText style={[fontRegular13, { color: neutralA3 }]}>
218207
This wallet adress is owned managed by at least 2 different
219208
addresses and require signatures from co-owners to execute a
220209
transaction.
@@ -227,9 +216,7 @@ export const MultisigCreateScreen = () => {
227216
variant="labelOutside"
228217
noBrokenCorners
229218
label="Multisig name"
230-
rules={{
231-
required: true,
232-
}}
219+
rules={{ required: true }}
233220
placeHolder="Type the name of the multisig"
234221
iconSVG={walletInputSVG}
235222
/>
@@ -308,12 +295,7 @@ export const MultisigCreateScreen = () => {
308295
label="Number of Signatures required"
309296
isAsterickSign
310297
/>
311-
<View
312-
style={{
313-
flexDirection: "row",
314-
alignItems: "center",
315-
}}
316-
>
298+
<View style={{ flexDirection: "row", alignItems: "center" }}>
317299
<TextInputCustom<CreateMultisigWalletFormType>
318300
defaultValue={defaultNbSignaturesRequired}
319301
control={control}
@@ -331,7 +313,7 @@ export const MultisigCreateScreen = () => {
331313
errorStyle={{ paddingLeft: layout.spacing_x1_5 }}
332314
/>
333315
<SpacerRow size={2} />
334-
<BrandText style={[fontSemibold14, { color: neutral77 }]}>
316+
<BrandText style={[fontRegular14, { color: neutral77 }]}>
335317
signatures required on total of
336318
</BrandText>
337319
<SpacerRow size={2} />
@@ -348,7 +330,7 @@ export const MultisigCreateScreen = () => {
348330
</View>
349331
</View>
350332

351-
<BrandText style={[fontSemibold14, { color: neutral77 }]}>
333+
<BrandText style={[fontRegular14, { color: neutral77 }]}>
352334
This means that each transaction this multisig makes will require{" "}
353335
{signatureRequiredValue || defaultNbSignaturesRequired} of the
354336
members to sign it for it to be accepted by the validators.

‎packages/screens/Multisig/MultisigScreen.tsx‎

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import { useUserMultisigs } from "@/hooks/multisig/useUserMultisigs";
2626
import { getUserId, NetworkKind } from "@/networks";
2727
import { ScreenFC, useAppNavigation } from "@/utils/navigation";
2828
import { neutral33, neutral77, secondaryColor } from "@/utils/style/colors";
29-
import { fontSemibold16, fontSemibold28 } from "@/utils/style/fonts";
29+
import { fontRegular16, fontRegular28 } from "@/utils/style/fonts";
3030
import { layout } from "@/utils/style/layout";
3131
import { tinyAddress } from "@/utils/text";
3232

@@ -49,28 +49,25 @@ export const MultisigScreen: ScreenFC<"Multisig"> = () => {
4949
return (
5050
<ScreenContainer
5151
headerChildren={<ScreenTitle>Multisig Wallets</ScreenTitle>}
52-
footerChildren={<></>}
53-
noMargin
54-
fullWidth
52+
isLarge
5553
onBackPress={() => navigation.navigate("Multisig")}
56-
noScroll
5754
forceNetworkKind={NetworkKind.Cosmos}
5855
>
5956
<ScrollView>
6057
<View style={containerCStyle}>
61-
<View style={horizontalContentPaddingCStyle}>
58+
<View>
6259
<View
6360
style={{
6461
flexDirection: "row",
6562
justifyContent: "space-between",
6663
alignItems: "center",
6764
}}
6865
>
69-
<BrandText style={fontSemibold28}>My Multisigs</BrandText>
66+
<BrandText style={fontRegular28}>My Multisigs</BrandText>
7067
<LoginButton userId={selectedWallet?.userId} />
7168
</View>
7269
<SpacerColumn size={1.5} />
73-
<BrandText style={[fontSemibold16, { color: neutral77 }]}>
70+
<BrandText style={[fontRegular16, { color: neutral77 }]}>
7471
Overview of your Multisignatures Wallets
7572
</BrandText>
7673
<SpacerColumn size={2.5} />
@@ -119,10 +116,10 @@ export const MultisigScreen: ScreenFC<"Multisig"> = () => {
119116
<SpacerColumn size={3} />
120117
{!!invitations?.length && (
121118
<>
122-
<View style={horizontalContentPaddingCStyle}>
123-
<BrandText style={fontSemibold28}>Invitations</BrandText>
119+
<View>
120+
<BrandText style={fontRegular28}>Invitations</BrandText>
124121
<SpacerColumn size={1.5} />
125-
<BrandText style={[fontSemibold16, { color: neutral77 }]}>
122+
<BrandText style={[fontRegular16, { color: neutral77 }]}>
126123
Multisignatures Wallets you did not join yet
127124
</BrandText>
128125
<SpacerColumn size={2.5} />
@@ -166,7 +163,7 @@ export const MultisigScreen: ScreenFC<"Multisig"> = () => {
166163
</>
167164
)}
168165
{!!authToken && (
169-
<View style={horizontalContentPaddingCStyle}>
166+
<View>
170167
<Separator color={neutral33} />
171168
<SpacerColumn size={3} />
172169
<MultisigTransactions
@@ -186,10 +183,6 @@ const containerCStyle: ViewStyle = {
186183
paddingTop: layout.topContentSpacingWithHeading,
187184
};
188185

189-
const horizontalContentPaddingCStyle: ViewStyle = {
190-
paddingHorizontal: layout.contentSpacing,
191-
};
192-
193186
const contentCenterCStyle: ViewStyle = {
194187
flex: 1,
195188
justifyContent: "center",

‎packages/screens/Multisig/MultisigWalletDashboardScreen.tsx‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import { getUserId, parseUserId } from "@/networks";
1919
import { validateAddress } from "@/utils/formRules";
2020
import { ScreenFC, useAppNavigation } from "@/utils/navigation";
2121
import { neutral33 } from "@/utils/style/colors";
22-
import { fontSemibold28 } from "@/utils/style/fonts";
22+
import { fontRegular28 } from "@/utils/style/fonts";
2323
import { layout } from "@/utils/style/layout";
2424

2525
type MultisigFormType = {
@@ -43,10 +43,8 @@ export const MultisigWalletDashboardScreen: ScreenFC<
4343
return (
4444
<ScreenContainer
4545
headerChildren={<ScreenTitle>Dashboard {walletName}</ScreenTitle>}
46+
isLarge
4647
onBackPress={() => navigation.navigate("Multisig")}
47-
footerChildren={<></>}
48-
noMargin
49-
fullWidth
5048
forceNetworkId={network?.id}
5149
>
5250
<View
@@ -60,13 +58,9 @@ export const MultisigWalletDashboardScreen: ScreenFC<
6058
key={multisigUserId}
6159
>
6260
<View
63-
style={{
64-
flex: 1,
65-
padding: layout.contentSpacing,
66-
paddingTop: layout.topContentSpacingWithHeading,
67-
}}
61+
style={{ flex: 1, paddingTop: layout.topContentSpacingWithHeading }}
6862
>
69-
<BrandText style={fontSemibold28}>General information</BrandText>
63+
<BrandText style={fontRegular28}>General information</BrandText>
7064
<SpacerColumn size={2.5} />
7165
<MultisigSection title="Multisig Address">
7266
<MultisigFormInput<MultisigFormType>

‎packages/screens/Multisig/components/GetStartedOption.tsx‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ import {
1212
secondaryColor,
1313
} from "@/utils/style/colors";
1414
import {
15-
fontSemibold12,
16-
fontSemibold14,
17-
fontSemibold9,
15+
fontRegular12,
16+
fontRegular14,
17+
fontRegular9,
1818
} from "@/utils/style/fonts";
1919
import { layout } from "@/utils/style/layout";
2020

@@ -61,7 +61,7 @@ export const GetStartedOption: React.FC<GetStartedOptionProps> = ({
6161
<View>
6262
<BrandText
6363
style={[
64-
fontSemibold14,
64+
fontRegular14,
6565
{ color: styleDarker ? neutral55 : secondaryColor },
6666
variant === "small" && smallTextCStyle,
6767
titleStyle,
@@ -73,7 +73,7 @@ export const GetStartedOption: React.FC<GetStartedOptionProps> = ({
7373
{subtitle && (
7474
<BrandText
7575
style={[
76-
fontSemibold9,
76+
fontRegular9,
7777
{ color: neutral55 },
7878
variant === "small" && smallTextCStyle,
7979
]}
@@ -111,7 +111,7 @@ const smallContainerCStyle: ViewStyle = {
111111
const smallTextCStyle: TextStyle = { textAlign: "center" };
112112

113113
const topTextCStyle: TextStyle = {
114-
...fontSemibold12,
114+
...fontRegular12,
115115
position: "absolute",
116116
top: 0,
117117
right: 0,

‎packages/screens/Multisig/components/MultisigFormInput.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import {
1414
} from "@/components/inputs/TextInputCustom";
1515
import { SpacerRow } from "@/components/spacer";
1616
import { neutral55, neutral77, neutralA3 } from "@/utils/style/colors";
17-
import { fontSemibold14 } from "@/utils/style/fonts";
17+
import { fontRegular14 } from "@/utils/style/fonts";
1818

1919
interface MultisigFormInputProps<T extends FieldValues>
2020
extends TextInputCustomProps<T> {
@@ -70,7 +70,7 @@ export const MultisigFormInput = <T extends FieldValues>({
7070
<SpacerRow size={3} />
7171
<BrandText
7272
style={[
73-
fontSemibold14,
73+
fontRegular14,
7474
{ color: neutral77, textTransform: "uppercase" },
7575
]}
7676
>

‎packages/screens/Multisig/components/MultisigRightSection.tsx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ import {
4949
neutral77,
5050
primaryColor,
5151
} from "@/utils/style/colors";
52-
import { fontSemibold12, fontSemibold13 } from "@/utils/style/fonts";
52+
import { fontRegular12, fontRegular13 } from "@/utils/style/fonts";
5353
import { layout } from "@/utils/style/layout";
5454

5555
export const MultisigRightSection: React.FC = () => {
@@ -251,7 +251,7 @@ export const MultisigRightSection: React.FC = () => {
251251
return (
252252
<View style={containerCStyle}>
253253
<SpacerColumn size={5} />
254-
<BrandText style={[fontSemibold12, { color: neutral55 }]}>
254+
<BrandText style={[fontRegular12, { color: neutral55 }]}>
255255
ACTIONS
256256
</BrandText>
257257
<SpacerColumn size={2} />
@@ -327,9 +327,9 @@ const BurnModal: React.FC<{
327327
placeHolder="0"
328328
defaultValue=""
329329
subtitle={
330-
<BrandText style={[fontSemibold13, { color: neutral77 }]}>
330+
<BrandText style={[fontRegular13, { color: neutral77 }]}>
331331
Available:{" "}
332-
<BrandText style={[fontSemibold13, { color: primaryColor }]}>
332+
<BrandText style={[fontRegular13, { color: primaryColor }]}>
333333
{max}
334334
</BrandText>
335335
</BrandText>

0 commit comments

Comments
 (0)