forked from
jollywhoppers.com/witchsky.app
Bluesky app fork with some witchin' additions 💫
Make whole verifier clickable, no nested interactives (#8249)
authored by
Eric Bailey
and committed by
GitHub
d5dc065a
0278c7a0
+29
-9
+14
-2
src/components/ProfileCard.tsx
+14
-2
src/components/ProfileCard.tsx
···
16
16
import {useProfileFollowMutationQueue} from '#/state/queries/profile'
17
17
import {useSession} from '#/state/session'
18
18
import * as Toast from '#/view/com/util/Toast'
19
-
import {PreviewableUserAvatar} from '#/view/com/util/UserAvatar'
19
+
import {PreviewableUserAvatar, UserAvatar} from '#/view/com/util/UserAvatar'
20
20
import {atoms as a, useTheme} from '#/alf'
21
21
import {
22
22
Button,
···
130
130
export function Avatar({
131
131
profile,
132
132
moderationOpts,
133
+
onPress,
134
+
disabledPreview,
133
135
}: {
134
136
profile: bsky.profile.AnyProfileView
135
137
moderationOpts: ModerationOpts
138
+
onPress?: () => void
139
+
disabledPreview?: boolean
136
140
}) {
137
141
const moderation = moderateProfile(profile, moderationOpts)
138
142
139
-
return (
143
+
return disabledPreview ? (
144
+
<UserAvatar
145
+
size={40}
146
+
avatar={profile.avatar}
147
+
type={profile.associated?.labeler ? 'labeler' : 'user'}
148
+
moderation={moderation.ui('avatar')}
149
+
/>
150
+
) : (
140
151
<PreviewableUserAvatar
141
152
size={40}
142
153
profile={profile}
143
154
moderation={moderation.ui('avatar')}
155
+
onBeforePress={onPress}
144
156
/>
145
157
)
146
158
}
+15
-7
src/components/verification/VerificationsDialog.tsx
+15
-7
src/components/verification/VerificationsDialog.tsx
···
211
211
</>
212
212
) : profile && moderationOpts ? (
213
213
<>
214
-
<ProfileCard.Avatar
214
+
<ProfileCard.Link
215
215
profile={profile}
216
-
moderationOpts={moderationOpts}
217
-
/>
218
-
<ProfileCard.NameAndHandle
219
-
profile={profile}
220
-
moderationOpts={moderationOpts}
221
-
/>
216
+
style={[a.flex_row, a.align_center, a.gap_sm, a.flex_1]}
217
+
onPress={() => {
218
+
outerDialogControl.close()
219
+
}}>
220
+
<ProfileCard.Avatar
221
+
profile={profile}
222
+
moderationOpts={moderationOpts}
223
+
disabledPreview
224
+
/>
225
+
<ProfileCard.NameAndHandle
226
+
profile={profile}
227
+
moderationOpts={moderationOpts}
228
+
/>
229
+
</ProfileCard.Link>
222
230
{canAdminister && (
223
231
<View>
224
232
<Button