fix: pressable on group

Signed-off-by: Sakul <sakulbudhathoki977@gmail.com>
berty · Apr 22, 2021 · 132737a · 132737a
1 parent 536fb77
commit 132737a
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 4 deletions.
diff --git a/js/packages/components/avatars.tsx b/js/packages/components/avatars.tsx
@@ -249,14 +249,16 @@ export const MemberAvatar: React.FC<{
 	publicKey: Maybe<string>
 	conversationPublicKey: Maybe<string>
 	size: number
-}> = ({ publicKey, conversationPublicKey, size }) => {
+	pressable?: boolean
+}> = ({ publicKey, conversationPublicKey, size, pressable }) => {
 	const member = useMember({ publicKey, conversationPublicKey })
 	return (
 		<GenericAvatar
 			cid={member?.avatarCid}
 			size={size}
 			colorSeed={publicKey}
 			nameSeed={member?.displayName}
+			pressable={pressable}
 		/>
 	)
 }
@@ -266,15 +268,23 @@ export const MultiMemberAvatar: React.FC<{
 	style?: AvatarStyle
 	publicKey?: Maybe<string>
 	fallbackNameSeed?: Maybe<string>
-}> = ({ size, style, publicKey, fallbackNameSeed }) => {
+	pressable?: boolean
+}> = ({ size, style, publicKey, fallbackNameSeed, pressable }) => {
 	const ctx = useMsgrContext()
 	const conv = useConversation(publicKey)
 	const suggestion = Object.values(ctx.persistentOptions?.suggestions).find(
 		(v) => v.pk === publicKey,
 	)
 	let content: React.ReactElement
 	if (suggestion) {
-		content = <HardcodedAvatar size={size} style={style} name={suggestion.icon as any} />
+		content = (
+			<HardcodedAvatar
+				size={size}
+				style={style}
+				name={suggestion.icon as any}
+				pressable={pressable}
+			/>
+		)
 	} else {
 		content = (
 			<GenericAvatar
@@ -283,6 +293,7 @@ export const MultiMemberAvatar: React.FC<{
 				cid={conv?.avatarCid}
 				colorSeed={publicKey}
 				nameSeed={conv?.displayName || fallbackNameSeed}
+				pressable={pressable}
 			/>
 		)
 	}

diff --git a/js/packages/components/chat/MultiMemberSettings.tsx b/js/packages/components/chat/MultiMemberSettings.tsx
@@ -74,7 +74,7 @@ const GroupChatSettingsHeader: React.FC<{ publicKey: Maybe<string> }> = ({ publi
 	return (
 		<View>
 			<View style={[row.center]}>
-				<MultiMemberAvatar publicKey={publicKey} size={80} />
+				<MultiMemberAvatar publicKey={publicKey} size={80} pressable />
 			</View>
 			<Text
 				numberOfLines={1}

diff --git a/js/packages/components/chat/message/UserMessage.tsx b/js/packages/components/chat/message/UserMessage.tsx
@@ -190,6 +190,7 @@ export const UserMessage: React.FC<{
 						publicKey={inte.memberPublicKey}
 						conversationPublicKey={inte.conversationPublicKey}
 						size={30 * scaleSize}
+						pressable
 					/>
 				</View>
 			)}