fix complex cases

src/components/Post/Embed/VideoEmbed/VideoEmbedInner/web-controls/VideoControls.tsx

@@ -312,13 +312,13 @@ export function Controls({
         onPointerEnter={onPointerMoveEmptySpace}
         onPointerMove={onPointerMoveEmptySpace}
         onPointerLeave={onPointerLeaveEmptySpace}
-        accessibilityLabel={_(
+        accessibilityLabel={
           !focused
-            ? msg`Unmute video`
+            ? _(msg`Unmute video`)
             : playing
-              ? msg`Pause video`
+              ? _(msg`Pause video`)
-              : msg`Play video`,
+              : _(msg`Play video`)
-        )}
+        }
         accessibilityHint=""
         style={[
           a.flex_1,

src/components/dms/LeaveConvoPrompt.tsx

@@ -40,11 +40,13 @@ export function LeaveConvoPrompt({
     <Prompt.Basic
       control={control}
       title={_(msg`Leave conversation`)}
-      description={_(
+      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?`,
+              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?`)
+      }
       confirmButtonCta={_(msg`Leave`)}
       confirmButtonColor="negative"
       onConfirm={() => leaveConvo()}

src/view/com/feeds/FeedSourceCard.tsx

@@ -182,11 +182,15 @@ export function FeedSourceCardLoaded({
     return (
       <Link
         testID={`feed-${feed.displayName}`}
-        label={_(
+        label={
           feed.type === 'feed'
-            ? msg`${feed.displayName}, a feed by ${sanitizeHandle(feed.creatorHandle, '@')}, liked by ${feed.likeCount || 0}`
+            ? _(
-            : msg`${feed.displayName}, a list by ${sanitizeHandle(feed.creatorHandle, '@')}`,
+                msg`${feed.displayName}, a feed by ${sanitizeHandle(feed.creatorHandle, '@')}, liked by ${feed.likeCount || 0}`,
-        )}
+              )
+            : _(
+                msg`${feed.displayName}, a list by ${sanitizeHandle(feed.creatorHandle, '@')}`,
+              )
+        }
         to={{
           screen: feed.type === 'feed' ? 'ProfileFeed' : 'ProfileList',
           params: {name: feed.creatorDid, rkey: new AtUri(feed.uri).rkey},

src/view/shell/Drawer.tsx

@@ -39,8 +39,10 @@ import {
   HomeOpen_Filled_Corner0_Rounded as HomeFilled,
   HomeOpen_Stoke2_Corner0_Rounded as Home,
 } from '#/components/icons/HomeOpen'
-import {MagnifyingGlass_Filled_Stroke2_Corner0_Rounded as MagnifyingGlassFilled} from '#/components/icons/MagnifyingGlass'
+import {
-import {MagnifyingGlass_Stroke2_Corner0_Rounded as MagnifyingGlass} from '#/components/icons/MagnifyingGlass'
+  MagnifyingGlass_Filled_Stroke2_Corner0_Rounded as MagnifyingGlassFilled,
+  MagnifyingGlass_Stroke2_Corner0_Rounded as MagnifyingGlass,
+} from '#/components/icons/MagnifyingGlass'
 import {
   Message_Stroke2_Corner0_Rounded as Message,
   Message_Stroke2_Corner0_Rounded_Filled as MessageFilled,
@@ -495,10 +497,10 @@ let NotificationsMenuItem = ({
         numUnreadNotifications === ''
           ? ''
           : _(
-              msg`${plural(numUnreadNotifications ?? 0, {
+              plural(numUnreadNotifications ?? 0, {
                 one: '# unread item',
                 other: '# unread items',
-              })}` || '',
+              }),
             )
       }
       count={numUnreadNotifications}

src/view/shell/bottom-bar/BottomBar.tsx

@@ -219,10 +219,10 @@ export function BottomBar({navigation}: BottomTabBarProps) {
               accessibilityHint={
                 numUnreadMessages.count > 0
                   ? _(
-                      msg`${plural(numUnreadMessages.numUnread ?? 0, {
+                      plural(numUnreadMessages.numUnread ?? 0, {
                         one: '# unread item',
                         other: '# unread items',
-                      })}` || '',
+                      }),
                     )
                   : ''
               }
@@ -251,10 +251,10 @@ export function BottomBar({navigation}: BottomTabBarProps) {
                 numUnreadNotifications === ''
                   ? ''
                   : _(
-                      msg`${plural(numUnreadNotifications ?? 0, {
+                      plural(numUnreadNotifications ?? 0, {
                         one: '# unread item',
                         other: '# unread items',
-                      })}` || '',
+                      }),
                     )
               }
             />