Update presentation of chat requests (#10417)

src/components/KnownFollowers.tsx

@@ -5,9 +5,7 @@ import {
   moderateProfile,
   type ModerationOpts,
 } from '@atproto/api'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
-import {Plural, Trans} from '@lingui/react/macro'
+import {Plural, Trans, useLingui} from '@lingui/react/macro'
 
 import {makeProfileLink} from '#/lib/routes/links'
 import {sanitizeDisplayName} from '#/lib/strings/display-names'
@@ -93,7 +91,7 @@ function KnownFollowersInner({
   showIfEmpty?: boolean
 }) {
   const t = useTheme()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
 
   const textStyle = [a.text_sm, a.leading_snug, t.atoms.text_contrast_medium]
 
@@ -124,9 +122,7 @@ function KnownFollowersInner({
 
   return (
     <Link
-      label={_(
-        msg`Press to view followers of this account that you also follow`,
-      )}
+      label={l`Press to view followers of this account that you also follow`}
       onPress={onLinkPress}
       to={makeProfileLink(profile, 'known-followers')}
       style={[
@@ -188,7 +184,8 @@ function KnownFollowersInner({
             numberOfLines={2}>
             {slice.length >= 2 ? (
               // 2-n followers, including blocks
-              serverCount > 2 ? ( // only 2
+              // only 2
+              serverCount > 2 ? (
                 <Trans>
                   Followed by{' '}
                   <Text emoji key={slice[0].profile.did} style={textStyle}>
@@ -254,7 +251,7 @@ function EmptyFallback({show}: {show?: boolean}) {
 
   return (
     <Text style={[a.text_sm, a.leading_snug, t.atoms.text_contrast_medium]}>
-      <Trans>Not followed by anyone you're following</Trans>
+      <Trans>Not followed by anyone you’re following</Trans>
     </Text>
   )
 }

src/components/dms/LeaveConvoPrompt.tsx

@@ -1,5 +1,4 @@
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {StackActions, useNavigation} from '@react-navigation/native'
 
 import {type NavigationProp} from '#/lib/routes/types'
@@ -20,7 +19,7 @@ export function LeaveConvoPrompt({
   currentScreen: 'list' | 'conversation'
   hasMessages?: boolean
 }) {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const navigation = useNavigation<NavigationProp>()
 
   const {mutate: leaveConvo} = useLeaveConvo(convoId, {
@@ -32,7 +31,7 @@ export function LeaveConvoPrompt({
       }
     },
     onError: () => {
-      Toast.show(_(msg`Could not leave chat`), {
+      Toast.show(l`Could not leave chat`, {
         type: 'error',
       })
     },
@@ -41,15 +40,13 @@ export function LeaveConvoPrompt({
   return (
     <Prompt.Basic
       control={control}
-      title={_(msg`Leave conversation`)}
+      title={l`Leave conversation`}
       description={
         hasMessages
-          ? _(
-              msg`Are you sure you want to leave this conversation? Your messages will be deleted for you, but not for the other participant.`,
-            )
-          : _(msg`Are you sure you want to leave this conversation?`)
+          ? l`Are you sure you want to leave this conversation? Your messages will be deleted for you, but not for the other participant.`
+          : l`Are you sure you want to leave this conversation?`
       }
-      confirmButtonCta={_(msg`Leave`)}
+      confirmButtonCta={l`Leave`}
       confirmButtonColor="negative"
       onConfirm={() => leaveConvo()}
     />