forked from
jollywhoppers.com/witchsky.app
Bluesky app fork with some witchin' additions 💫
Fix avatar shape in Account switch menu (#7388)
authored by
Samuel Newman
and committed by
GitHub
d10cbb8f
a0393fcd
+28
-5
+5
-1
src/components/AccountList.tsx
+5
-1
src/components/AccountList.tsx
···
131
131
(hovered || pressed || isPendingAccount) && t.atoms.bg_contrast_25,
132
132
]}>
133
133
<View style={a.p_md}>
134
-
<UserAvatar avatar={profile?.avatar} size={24} />
134
+
<UserAvatar
135
+
avatar={profile?.avatar}
136
+
size={24}
137
+
type={profile?.associated?.labeler ? 'labeler' : 'user'}
138
+
/>
135
139
</View>
136
140
<Text style={[a.align_baseline, a.flex_1, a.flex_row, a.py_sm]}>
137
141
<Text emoji style={[a.font_bold]}>
+1
src/components/AvatarStack.tsx
+1
src/components/AvatarStack.tsx
+1
src/components/KnownFollowers.tsx
+1
src/components/KnownFollowers.tsx
+1
-1
src/components/Pills.tsx
+1
-1
src/components/Pills.tsx
+2
src/screens/Settings/Settings.tsx
+2
src/screens/Settings/Settings.tsx
···
284
284
size={80}
285
285
avatar={shadow.avatar}
286
286
moderation={moderation.ui('avatar')}
287
+
type={shadow.associated?.labeler ? 'labeler' : 'user'}
287
288
/>
288
289
<ProfileHeaderDisplayName profile={shadow} moderation={moderation} />
289
290
<ProfileHeaderHandle profile={shadow} />
···
414
415
size={28}
415
416
avatar={profile.avatar}
416
417
moderation={moderateProfile(profile, moderationOpts).ui('avatar')}
418
+
type={profile.associated?.labeler ? 'labeler' : 'user'}
417
419
/>
418
420
) : (
419
421
<View style={[{width: 28}]} />
+10
-2
src/view/com/post-thread/PostThreadLoadMore.tsx
+10
-2
src/view/com/post-thread/PostThreadLoadMore.tsx
···
33
33
backgroundColor: t.atoms.bg.backgroundColor,
34
34
marginRight: -20,
35
35
}}>
36
-
<UserAvatar avatar={post.author.avatar} size={30} />
36
+
<UserAvatar
37
+
avatar={post.author.avatar}
38
+
size={30}
39
+
type={post.author.associated?.labeler ? 'labeler' : 'user'}
40
+
/>
37
41
</View>
38
42
<View
39
43
style={{
···
44
48
borderRadius: 18,
45
49
backgroundColor: t.atoms.bg.backgroundColor,
46
50
}}>
47
-
<UserAvatar avatar={post.author.avatar} size={30} />
51
+
<UserAvatar
52
+
avatar={post.author.avatar}
53
+
size={30}
54
+
type={post.author.associated?.labeler ? 'labeler' : 'user'}
55
+
/>
48
56
</View>
49
57
</View>
50
58
<View style={[a.px_sm]}>
+7
-1
src/view/com/util/UserAvatar.tsx
+7
-1
src/view/com/util/UserAvatar.tsx
···
43
43
}
44
44
45
45
interface UserAvatarProps extends BaseUserAvatarProps {
46
+
type: UserAvatarType
46
47
moderation?: ModerationUI
47
48
usePlainRNImage?: boolean
48
49
onLoad?: () => void
···
439
440
handle: profile.handle,
440
441
})}
441
442
onPress={onPress}>
442
-
<UserAvatar avatar={profile.avatar} moderation={moderation} {...rest} />
443
+
<UserAvatar
444
+
avatar={profile.avatar}
445
+
moderation={moderation}
446
+
type={profile.associated?.labeler ? 'labeler' : 'user'}
447
+
{...rest}
448
+
/>
443
449
</Link>
444
450
</ProfileHoverCard>
445
451
)