Skip to content

Commit 7ab4bed

Browse files
OGPoyrazOGPoyraz
authored
Merge branch 'main' into ogp/22135
2 parents a497254 + 3b40cb0 commit 7ab4bed

File tree

10 files changed

+288
-178
lines changed

10 files changed

+288
-178
lines changed

‎app/components/Nav/App/App.tsx‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -611,6 +611,11 @@ const ImportSRPView = () => (
611611
component={SeedphraseModal}
612612
options={{
613613
cardStyle: { backgroundColor: 'transparent' },
614+
cardStyleInterpolator: () => ({
615+
overlayStyle: {
616+
opacity: 0,
617+
},
618+
}),
614619
}}
615620
/>
616621
</Stack.Navigator>

‎app/components/Views/WalletRecovery/__snapshots__/index.test.tsx.snap‎

Lines changed: 141 additions & 126 deletions
Original file line numberDiff line numberDiff line change
@@ -1,183 +1,198 @@
11
// Jest Snapshot v1, https://goo.gl/fbAQLP
22

33
exports[`WalletRecovery render matches snapshot 1`] = `
4-
<RCTScrollView>
5-
<View>
6-
<View
7-
style={
8-
{
9-
"flex": 1,
10-
"flexDirection": "column",
11-
"paddingVertical": 8,
12-
"rowGap": 24,
13-
}
14-
}
15-
>
4+
<RNCSafeAreaView
5+
edges={
6+
{
7+
"bottom": "additive",
8+
"left": "off",
9+
"right": "off",
10+
"top": "off",
11+
}
12+
}
13+
style={
14+
{
15+
"flex": 1,
16+
}
17+
}
18+
>
19+
<RCTScrollView>
20+
<View>
1621
<View
1722
style={
1823
{
19-
"display": "flex",
2024
"flexDirection": "column",
21-
"paddingHorizontal": 16,
22-
"rowGap": 8,
25+
"paddingVertical": 8,
26+
"rowGap": 24,
2327
}
2428
}
2529
>
26-
<Text
27-
accessibilityRole="text"
28-
style={
29-
{
30-
"color": "#686e7d",
31-
"fontFamily": "Geist Medium",
32-
"fontSize": 14,
33-
"letterSpacing": 0,
34-
"lineHeight": 22,
35-
}
36-
}
37-
>
38-
GOOGLE RECOVERY
39-
</Text>
4030
<View
4131
style={
4232
{
43-
"width": "100%",
33+
"display": "flex",
34+
"flexDirection": "column",
35+
"paddingHorizontal": 16,
36+
"rowGap": 8,
4437
}
4538
}
4639
>
47-
<View
40+
<Text
41+
accessibilityRole="text"
4842
style={
4943
{
50-
"alignItems": "center",
51-
"backgroundColor": "#3c4d9d0f",
52-
"borderRadius": 8,
53-
"columnGap": 8,
54-
"flexDirection": "row",
55-
"justifyContent": "flex-start",
56-
"padding": 16,
44+
"color": "#686e7d",
45+
"fontFamily": "Geist Medium",
46+
"fontSize": 14,
47+
"letterSpacing": 0,
48+
"lineHeight": 22,
5749
}
5850
}
5951
>
60-
<View
61-
style={
62-
{
63-
"marginRight": 8,
64-
}
52+
GOOGLE RECOVERY
53+
</Text>
54+
<View
55+
style={
56+
{
57+
"width": "100%",
6558
}
66-
>
67-
<AppleIcon
68-
color="#121314"
69-
fill="currentColor"
70-
height={24}
71-
name="google"
72-
width={24}
73-
/>
74-
</View>
59+
}
60+
>
7561
<View
7662
style={
7763
{
78-
"alignItems": "flex-start",
79-
"display": "flex",
80-
"flexDirection": "column",
81-
"justifyContent": "center",
64+
"alignItems": "center",
65+
"backgroundColor": "#3c4d9d0f",
66+
"borderRadius": 8,
67+
"columnGap": 8,
68+
"flexDirection": "row",
69+
"justifyContent": "flex-start",
70+
"padding": 16,
8271
}
8372
}
8473
>
85-
<Text
86-
accessibilityRole="text"
74+
<View
8775
style={
8876
{
89-
"color": "#121314",
90-
"fontFamily": "Geist Medium",
91-
"fontSize": 16,
92-
"letterSpacing": 0,
93-
"lineHeight": 24,
77+
"marginRight": 8,
9478
}
9579
}
9680
>
97-
Enabled
98-
</Text>
99-
<Text
100-
accessibilityRole="text"
81+
<AppleIcon
82+
color="#121314"
83+
fill="currentColor"
84+
height={24}
85+
name="google"
86+
width={24}
87+
/>
88+
</View>
89+
<View
10190
style={
10291
{
103-
"color": "#686e7d",
104-
"fontFamily": "Geist Regular",
105-
"fontSize": 14,
106-
"letterSpacing": 0,
107-
"lineHeight": 22,
108-
"width": "100%",
92+
"alignItems": "flex-start",
93+
"display": "flex",
94+
"flexDirection": "column",
95+
"justifyContent": "center",
10996
}
11097
}
11198
>
112-
t********@example.com
113-
</Text>
99+
<Text
100+
accessibilityRole="text"
101+
style={
102+
{
103+
"color": "#121314",
104+
"fontFamily": "Geist Medium",
105+
"fontSize": 16,
106+
"letterSpacing": 0,
107+
"lineHeight": 24,
108+
}
109+
}
110+
>
111+
Enabled
112+
</Text>
113+
<Text
114+
accessibilityRole="text"
115+
style={
116+
{
117+
"color": "#686e7d",
118+
"fontFamily": "Geist Regular",
119+
"fontSize": 14,
120+
"letterSpacing": 0,
121+
"lineHeight": 22,
122+
"width": "100%",
123+
}
124+
}
125+
>
126+
t********@example.com
127+
</Text>
128+
</View>
114129
</View>
115130
</View>
116-
</View>
117-
<Text
118-
accessibilityRole="text"
119-
style={
120-
{
121-
"color": "#686e7d",
122-
"fontFamily": "Geist Regular",
123-
"fontSize": 14,
124-
"letterSpacing": 0,
125-
"lineHeight": 22,
131+
<Text
132+
accessibilityRole="text"
133+
style={
134+
{
135+
"color": "#686e7d",
136+
"fontFamily": "Geist Regular",
137+
"fontSize": 14,
138+
"letterSpacing": 0,
139+
"lineHeight": 22,
140+
}
126141
}
127-
}
128-
>
129-
Use your Google login and MetaMask password to recover your account and secret recovery phrases.
130-
</Text>
131-
</View>
132-
<View
133-
style={
134-
{
135-
"paddingHorizontal": 16,
136-
}
137-
}
138-
>
142+
>
143+
Use your Google login and MetaMask password to recover your account and secret recovery phrases.
144+
</Text>
145+
</View>
139146
<View
140147
style={
141148
{
142-
"backgroundColor": "#b7bbc866",
143-
"height": 1,
144149
"paddingHorizontal": 16,
145150
}
146151
}
147-
/>
148-
</View>
149-
<View
150-
style={
151-
{
152-
"flexDirection": "column",
153-
"rowGap": 6,
154-
}
155-
}
156-
>
157-
<Text
158-
accessibilityRole="text"
152+
>
153+
<View
154+
style={
155+
{
156+
"backgroundColor": "#b7bbc866",
157+
"height": 1,
158+
"paddingHorizontal": 16,
159+
}
160+
}
161+
/>
162+
</View>
163+
<View
159164
style={
160165
{
161-
"color": "#686e7d",
162-
"fontFamily": "Geist Medium",
163-
"fontSize": 14,
164-
"letterSpacing": 0,
165-
"lineHeight": 22,
166-
"paddingHorizontal": 16,
166+
"flexDirection": "column",
167+
"rowGap": 6,
167168
}
168169
}
169170
>
170-
SECRET RECOVERY PHRASES
171-
</Text>
172-
<View
173-
testID="select-srp"
174-
>
175-
<Text>
176-
SelectSRP Component
171+
<Text
172+
accessibilityRole="text"
173+
style={
174+
{
175+
"color": "#686e7d",
176+
"fontFamily": "Geist Medium",
177+
"fontSize": 14,
178+
"letterSpacing": 0,
179+
"lineHeight": 22,
180+
"paddingHorizontal": 16,
181+
}
182+
}
183+
>
184+
SECRET RECOVERY PHRASES
177185
</Text>
186+
<View
187+
testID="select-srp"
188+
>
189+
<Text>
190+
SelectSRP Component
191+
</Text>
192+
</View>
178193
</View>
179194
</View>
180195
</View>
181-
</View>
182-
</RCTScrollView>
196+
</RCTScrollView>
197+
</RNCSafeAreaView>
183198
`;

0 commit comments

Comments
 (0)