Merge branch 'bluesky-social:main' into patch-3
This commit is contained in:
		
						commit
						4813f26158
					
				
					 20 changed files with 210 additions and 42 deletions
				
			
		|  | @ -13,13 +13,18 @@ export function FollowButton({ | |||
|   followedType = 'default', | ||||
|   profile, | ||||
|   labelStyle, | ||||
|   logContext, | ||||
| }: { | ||||
|   unfollowedType?: ButtonType | ||||
|   followedType?: ButtonType | ||||
|   profile: Shadow<AppBskyActorDefs.ProfileViewBasic> | ||||
|   labelStyle?: StyleProp<TextStyle> | ||||
|   logContext: 'ProfileCard' | ||||
| }) { | ||||
|   const [queueFollow, queueUnfollow] = useProfileFollowMutationQueue(profile) | ||||
|   const [queueFollow, queueUnfollow] = useProfileFollowMutationQueue( | ||||
|     profile, | ||||
|     logContext, | ||||
|   ) | ||||
|   const {_} = useLingui() | ||||
| 
 | ||||
|   const onPressFollow = async () => { | ||||
|  |  | |||
|  | @ -230,7 +230,9 @@ export function ProfileCardWithFollowBtn({ | |||
|       renderButton={ | ||||
|         isMe | ||||
|           ? undefined | ||||
|           : profileShadow => <FollowButton profile={profileShadow} /> | ||||
|           : profileShadow => ( | ||||
|               <FollowButton profile={profileShadow} logContext="ProfileCard" /> | ||||
|             ) | ||||
|       } | ||||
|     /> | ||||
|   ) | ||||
|  |  | |||
|  | @ -103,7 +103,10 @@ let ProfileHeader = ({ | |||
|   const invalidHandle = isInvalidHandle(profile.handle) | ||||
|   const {isDesktop} = useWebMediaQueries() | ||||
|   const [showSuggestedFollows, setShowSuggestedFollows] = React.useState(false) | ||||
|   const [queueFollow, queueUnfollow] = useProfileFollowMutationQueue(profile) | ||||
|   const [queueFollow, queueUnfollow] = useProfileFollowMutationQueue( | ||||
|     profile, | ||||
|     'ProfileHeader', | ||||
|   ) | ||||
|   const [__, queueUnblock] = useProfileBlockMutationQueue(profile) | ||||
|   const unblockPromptControl = Prompt.usePromptControl() | ||||
|   const moderation = useMemo( | ||||
|  |  | |||
|  | @ -172,7 +172,10 @@ function SuggestedFollow({ | |||
|   const {_} = useLingui() | ||||
|   const moderationOpts = useModerationOpts() | ||||
|   const profile = useProfileShadow(profileUnshadowed) | ||||
|   const [queueFollow, queueUnfollow] = useProfileFollowMutationQueue(profile) | ||||
|   const [queueFollow, queueUnfollow] = useProfileFollowMutationQueue( | ||||
|     profile, | ||||
|     'ProfileHeaderSuggestedFollows', | ||||
|   ) | ||||
| 
 | ||||
|   const onPressFollow = React.useCallback(async () => { | ||||
|     try { | ||||
|  |  | |||
|  | @ -52,7 +52,10 @@ let ProfileMenu = ({ | |||
| 
 | ||||
|   const [queueMute, queueUnmute] = useProfileMuteMutationQueue(profile) | ||||
|   const [queueBlock, queueUnblock] = useProfileBlockMutationQueue(profile) | ||||
|   const [, queueUnfollow] = useProfileFollowMutationQueue(profile) | ||||
|   const [, queueUnfollow] = useProfileFollowMutationQueue( | ||||
|     profile, | ||||
|     'ProfileMenu', | ||||
|   ) | ||||
| 
 | ||||
|   const blockPromptControl = Prompt.usePromptControl() | ||||
| 
 | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue