mirror of https://git.lenooby09.tech/LeNooby09/social-app.git
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

Fix avatar shape in Account switch menu (#7388)

authored by samuel.fm and committed by

GitHub d10cbb8f a0393fcd

+28 -5
+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
··· 65 65 <UserAvatar 66 66 size={size - 2} 67 67 avatar={item.profile.avatar} 68 + type={item.profile.associated?.labeler ? 'labeler' : 'user'} 68 69 moderation={item.moderation.ui('avatar')} 69 70 /> 70 71 )}
+1
src/components/KnownFollowers.tsx
··· 163 163 size={SIZE} 164 164 avatar={prof.avatar} 165 165 moderation={moderation.ui('avatar')} 166 + type={prof.associated?.labeler ? 'labeler' : 'user'} 166 167 /> 167 168 </View> 168 169 ))}
+1 -1
src/components/Pills.tsx
··· 126 126 fill={t.atoms.text_contrast_medium.color} 127 127 /> 128 128 ) : ( 129 - <UserAvatar avatar={desc.sourceAvi} size={avi} /> 129 + <UserAvatar avatar={desc.sourceAvi} type="user" size={avi} /> 130 130 )} 131 131 132 132 <Text
+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
··· 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
··· 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 )
+1
src/view/screens/Search/Explore.tsx
··· 194 194 size={28} 195 195 avatar={_item.avatar} 196 196 moderation={_item.moderation.ui('avatar')} 197 + type="user" 197 198 /> 198 199 ) : _item.type === 'feed' ? ( 199 200 <UserAvatar