forked from
jollywhoppers.com/witchsky.app
Bluesky app fork with some witchin' additions 💫
remove unnecessary group component
+17
-33
+17
-33
src/screens/Login/ChooseAccountForm.tsx
+17
-33
src/screens/Login/ChooseAccountForm.tsx
···
2
2
import {View} from 'react-native'
3
3
import {Trans, msg} from '@lingui/macro'
4
4
import {useLingui} from '@lingui/react'
5
-
import flattenReactChildren from 'react-keyed-flatten-children'
6
5
7
6
import {useAnalytics} from 'lib/analytics/analytics'
8
7
import {UserAvatar} from '../../view/com/util/UserAvatar'
···
19
18
import * as TextField from '#/components/forms/TextField'
20
19
import {FormContainer} from './FormContainer'
21
20
import {logEvent} from '#/lib/statsig/statsig'
22
-
23
-
function Group({children}: {children: React.ReactNode}) {
24
-
const t = useTheme()
25
-
return (
26
-
<View
27
-
style={[
28
-
a.rounded_md,
29
-
a.overflow_hidden,
30
-
a.border,
31
-
t.atoms.border_contrast_low,
32
-
]}>
33
-
{flattenReactChildren(children).map((child, i) => {
34
-
return React.isValidElement(child) ? (
35
-
<React.Fragment key={i}>
36
-
{i > 0 ? (
37
-
<View style={[a.border_b, t.atoms.border_contrast_low]} />
38
-
) : null}
39
-
{child}
40
-
</React.Fragment>
41
-
) : null
42
-
})}
43
-
</View>
44
-
)
45
-
}
46
21
47
22
function AccountItem({
48
23
account,
···
150
125
<TextField.Label>
151
126
<Trans>Sign in as...</Trans>
152
127
</TextField.Label>
153
-
<Group>
128
+
<View
129
+
style={[
130
+
a.rounded_md,
131
+
a.overflow_hidden,
132
+
a.border,
133
+
t.atoms.border_contrast_low,
134
+
]}>
154
135
{accounts.map(account => (
155
-
<AccountItem
156
-
key={account.did}
157
-
account={account}
158
-
onSelect={onSelect}
159
-
isCurrentAccount={account.did === currentAccount?.did}
160
-
/>
136
+
<>
137
+
<AccountItem
138
+
key={account.did}
139
+
account={account}
140
+
onSelect={onSelect}
141
+
isCurrentAccount={account.did === currentAccount?.did}
142
+
/>
143
+
<View style={[a.border_b, t.atoms.border_contrast_low]} />
144
+
</>
161
145
))}
162
146
<Button
163
147
testID="chooseNewAccountBtn"
···
188
172
</View>
189
173
)}
190
174
</Button>
191
-
</Group>
175
+
</View>
192
176
</View>
193
177
<View style={[a.flex_row]}>
194
178
<Button