diff --git a/src/components/dms/ConvoMenu.tsx b/src/components/dms/ConvoMenu.tsx
index 8ff4cf55bc..9d41a92bd0 100644
--- a/src/components/dms/ConvoMenu.tsx
+++ b/src/components/dms/ConvoMenu.tsx
@@ -1,9 +1,7 @@
import {memo, useCallback} from 'react'
import {Keyboard, View} from 'react-native'
-import {type ChatBskyConvoDefs, type ModerationCause} from '@atproto/api'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
-import {Trans} from '@lingui/react/macro'
+import {ChatBskyConvoDefs, type ModerationCause} from '@atproto/api'
+import {Trans, useLingui} from '@lingui/react/macro'
import {useNavigation} from '@react-navigation/native'
import {useQueryClient} from '@tanstack/react-query'
@@ -66,7 +64,7 @@ let ConvoMenu = ({
latestReportableMessage?: ChatBskyConvoDefs.MessageView
style?: ViewStyleProp['style']
}): React.ReactNode => {
- const {_} = useLingui()
+ const {t: l} = useLingui()
const queryClient = useQueryClient()
const leaveConvoControl = Prompt.usePromptControl()
@@ -81,7 +79,7 @@ let ConvoMenu = ({
{!hideTrigger && (
-
+
{({props}) => (
-
)}
-
()
- const {_} = useLingui()
+ const {t: l} = useLingui()
const {mutate: markAsRead} = useMarkAsReadMutation()
const {listBlocks, userBlock} = blockInfo
const isBlocking = userBlock || !!listBlocks.length
const isDeletedAccount = profile.handle === 'missing.invalid'
+ const isGroupConvo = ChatBskyConvoDefs.isGroupConvo(initialConvo.kind)
const convoId = initialConvo.id
const {data: convo} = useConvoQuery({convoId})
@@ -199,13 +196,13 @@ function MenuContent({
const {mutate: muteConvo} = useMuteConvo(convoId, {
onSuccess: data => {
if (data.convo.muted) {
- Toast.show(_(msg({message: 'Chat muted', context: 'toast'})))
+ Toast.show(l({message: 'Chat muted', context: 'toast'}))
} else {
- Toast.show(_(msg({message: 'Chat unmuted', context: 'toast'})))
+ Toast.show(l({message: 'Chat unmuted', context: 'toast'}))
}
},
onError: () => {
- Toast.show(_(msg`Could not mute chat`), {
+ Toast.show(l`Could not mute chat`, {
type: 'error',
})
},
@@ -228,37 +225,41 @@ function MenuContent({
return isDeletedAccount ? (
leaveConvoControl.open()}>
+ destructive
+ label={l`Leave conversation`}
+ onPress={leaveConvoControl.open}>
+
Leave conversation
-
) : (
<>
{showMarkAsRead && (
markAsRead({convoId})}>
+
Mark as read
-
+
+ )}
+ {isGroupConvo ? null : (
+
+
+
+ Go to profile
+
)}
-
- Go to profile
-
-
-
- muteConvo({mute: !convo?.muted})}>
+
{convo?.muted ? (
Unmute conversation
@@ -266,37 +267,41 @@ function MenuContent({
Mute conversation
)}
-
+ {isGroupConvo ? null : (
+
+
+
+ {isBlocking ? l`Unblock account` : l`Block account`}
+
+
+ )}
-
- {isBlocking ? _(msg`Unblock account`) : _(msg`Block account`)}
-
-
-
- reportControl.open()}>
+ destructive
+ label={l`Report conversation`}
+ onPress={reportControl.open}>
+
Report conversation
-
leaveConvoControl.open()}>
+ destructive
+ label={l`Leave conversation`}
+ onPress={leaveConvoControl.open}>
+
Leave conversation
-
>