Merge branch 'main' of https://github.com/bluesky-social/social-app

.github/workflows/bundle-deploy-eas-update.yml

···
   push:
     branches:
       - main
+      - hailey/eas-fab
   workflow_dispatch:
     inputs:
       channel:
···
 
       - name: 🏗️ Create Bundle
         if: ${{ !steps.fingerprint.outputs.includes-changes }}
-        run: SENTRY_DIST=${{ steps.sentry.outputs.SENTRY_DIST }} SENTRY_RELEASE=${{ steps.sentry.outputs.SENTRY_RELEASE }} SENTRY_AUTH_TOKEN=${{ secrets.SENTRY_AUTH_TOKEN }} SENTRY_DSN=${{ secrets.SENTRY_DSN }} EXPO_PUBLIC_ENV="${{ inputs.channel || 'testflight' }}" yarn export
+        run: |
+          SENTRY_DIST=${{ steps.sentry.outputs.SENTRY_DIST }} SENTRY_RELEASE=${{ steps.sentry.outputs.SENTRY_RELEASE }} SENTRY_AUTH_TOKEN=${{ secrets.SENTRY_AUTH_TOKEN }} SENTRY_DSN=${{ secrets.SENTRY_DSN }} EXPO_PUBLIC_ENV="${{ inputs.channel || 'testflight' }}" yarn export-ios
+          mv ./dist ./ios-dist
+          sed -i 's/"react-native-mmkv": "\^2\.12\.2"/"react-native-mmkv": "^3.3.0"/' package.json
+          yarn install
+          SENTRY_DIST=${{ steps.sentry.outputs.SENTRY_DIST }} SENTRY_RELEASE=${{ steps.sentry.outputs.SENTRY_RELEASE }} SENTRY_AUTH_TOKEN=${{ secrets.SENTRY_AUTH_TOKEN }} SENTRY_DSN=${{ secrets.SENTRY_DSN }} EXPO_PUBLIC_ENV="${{ inputs.channel || 'testflight' }}" yarn export-android
+          mv ./dist ./android-dist
+
 
       - name: 📦 Package Bundle and 🚀 Deploy
         if: ${{ !steps.fingerprint.outputs.includes-changes }}

modules/expo-background-notification-handler/android/src/main/java/expo/modules/backgroundnotificationhandler/BackgroundNotificationHandler.kt

···
 
     if (remoteMessage.data["reason"] == "chat-message") {
       mutateWithChatMessage(remoteMessage)
+    } else {
+      mutateWithOtherReason(remoteMessage)
     }
 
     notifInterface.showMessage(remoteMessage)
···
 
     // TODO - Remove this once we have more backend capability
     remoteMessage.data["badge"] = null
+  }
+
+  private fun mutateWithOtherReason(remoteMessage: RemoteMessage) {
+    // If oreo or higher
+    if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.O) {
+      // If one of "like", "repost", "follow", "mention", "reply", "quote", "like-via-repost", "repost-via-repost"
+      // assign to it's eponymous channel. otherwise do nothing, let expo handle it
+      when (remoteMessage.data["reason"]) {
+        "like", "repost", "follow", "mention", "reply", "quote", "like-via-repost", "repost-via-repost" -> {
+          remoteMessage.data["channelId"] = remoteMessage.data["reason"]
+        }
+      }
+    }
   }
 }

package.json

···
     "intl:push": "crowdin push translations --verbose -b main",
     "nuke": "rm -rf ./node_modules && rm -rf ./ios && rm -rf ./android",
     "update-extensions": "bash scripts/updateExtensions.sh",
-    "export": "npx expo export --dump-sourcemap && yarn upload-native-sourcemaps",
+    "export-ios": "npx expo export --platform ios --dump-sourcemap && yarn upload-native-sourcemaps",
+    "export-android": "npx expo export --platform android --dump-sourcemap && yarn upload-native-sourcemaps",
     "upload-native-sourcemaps": "npx sentry-expo-upload-sourcemaps dist",
     "make-deploy-bundle": "bash scripts/bundleUpdate.sh",
     "generate-webpack-stats-file": "EXPO_PUBLIC_GENERATE_STATS=1 yarn build-web",
···
     "react-native-gesture-handler": "2.25.0",
     "react-native-get-random-values": "~1.11.0",
     "react-native-ios-context-menu": "^1.15.3",
-    "react-native-keyboard-controller": "^1.17.1",
+    "react-native-keyboard-controller": "^1.17.5",
     "react-native-mmkv": "^2.12.2",
     "react-native-pager-view": "^6.7.1",
     "react-native-progress": "bluesky-social/react-native-progress",

scripts/bundleUpdate.js

···
 const fsp = fs.promises
 const path = require('path')
 
-const DIST_DIR = './dist'
+const IOS_DIST_DIR = './ios-dist'
+const ANDROID_DIST_DIR = './android-dist'
+
 const BUNDLES_DIR = '/_expo/static/js'
-const IOS_BUNDLE_DIR = path.join(DIST_DIR, BUNDLES_DIR, '/ios')
-const ANDROID_BUNDLE_DIR = path.join(DIST_DIR, BUNDLES_DIR, '/android')
-const METADATA_PATH = path.join(DIST_DIR, '/metadata.json')
+
+const IOS_BUNDLE_DIR = path.join(IOS_DIST_DIR, BUNDLES_DIR, '/ios')
+const ANDROID_BUNDLE_DIR = path.join(ANDROID_DIST_DIR, BUNDLES_DIR, '/android')
+
+const IOS_METADATA_PATH = path.join(IOS_DIST_DIR, '/metadata.json')
+const ANDROID_METADATA_PATH = path.join(ANDROID_DIST_DIR, '/metadata.json')
+
 const DEST_DIR = './bundleTempDir'
 
 // Weird, don't feel like figuring out _why_ it wants this
-const METADATA = require(`../${METADATA_PATH}`)
-const IOS_METADATA_ASSETS = METADATA.fileMetadata.ios.assets
-const ANDROID_METADATA_ASSETS = METADATA.fileMetadata.android.assets
+const IOS_METADATA = require(`../${IOS_METADATA_PATH}`)
+const ANDROID_METADATA = require(`../${ANDROID_METADATA_PATH}`)
+
+const IOS_METADATA_ASSETS = IOS_METADATA.fileMetadata.ios.assets
+const ANDROID_METADATA_ASSETS = ANDROID_METADATA.fileMetadata.android.assets
 
 const getMd5 = async path => {
   return new Promise(res => {
···
 
   console.log('Getting ios asset md5s and moving them...')
   for (const asset of IOS_METADATA_ASSETS) {
-    const currPath = path.join(DIST_DIR, asset.path)
+    const currPath = path.join(IOS_DIST_DIR, asset.path)
     const md5 = await getMd5(currPath)
     const withExtPath = `assets/${md5}.${asset.ext}`
     iosAssets.push(withExtPath)
···
 
   console.log('Getting android asset md5s and moving them...')
   for (const asset of ANDROID_METADATA_ASSETS) {
-    const currPath = path.join(DIST_DIR, asset.path)
+    const currPath = path.join(ANDROID_DIST_DIR, asset.path)
     const md5 = await getMd5(currPath)
     const withExtPath = `assets/${md5}.${asset.ext}`
     androidAssets.push(withExtPath)

src/App.native.tsx

···
 import {ThemeProvider as Alf} from '#/alf'
 import {useColorModeTheme} from '#/alf/util/useColorModeTheme'
 import {Provider as ContextMenuProvider} from '#/components/ContextMenu'
+import {NuxDialogs} from '#/components/dialogs/nuxs'
 import {useStarterPackEntry} from '#/components/hooks/useStarterPackEntry'
 import {Provider as IntentDialogProvider} from '#/components/intents/IntentDialogs'
 import {Provider as PortalProvider} from '#/components/Portal'
···
                                                     <IntentDialogProvider>
                                                       <TestCtrls />
                                                       <Shell />
+                                                      <NuxDialogs />
                                                     </IntentDialogProvider>
                                                   </GestureHandlerRootView>
                                                 </HideBottomBarBorderProvider>

src/App.web.tsx

···
 import {ThemeProvider as Alf} from '#/alf'
 import {useColorModeTheme} from '#/alf/util/useColorModeTheme'
 import {Provider as ContextMenuProvider} from '#/components/ContextMenu'
+import {NuxDialogs} from '#/components/dialogs/nuxs'
 import {useStarterPackEntry} from '#/components/hooks/useStarterPackEntry'
 import {Provider as IntentDialogProvider} from '#/components/intents/IntentDialogs'
 import {Provider as PortalProvider} from '#/components/Portal'
···
                                                   <HideBottomBarBorderProvider>
                                                     <IntentDialogProvider>
                                                       <Shell />
+                                                      <NuxDialogs />
                                                     </IntentDialogProvider>
                                                   </HideBottomBarBorderProvider>
                                                 </ServiceConfigProvider>

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

···
 import {type RefObject, useCallback, useEffect, useRef, useState} from 'react'
 
 import {isSafari} from '#/lib/browser'
+import {logger} from '#/logger'
 import {useVideoVolumeState} from '#/components/Post/Embed/VideoEmbed/VideoVolumeContext'
 
 export function useVideoElement(ref: RefObject<HTMLVideoElement>) {
···
           await ref.current.play()
         } catch (e: any) {
           if (
-            !e.message?.includes(`The request is not allowed by the user agent`)
+            !e.message?.includes(
+              `The request is not allowed by the user agent`,
+            ) &&
+            !e.message?.includes(
+              `The play() request was interrupted by a call to pause()`,
+            )
           ) {
             throw e
           }
···
     } else {
       const promise = ref.current.play()
       if (promise !== undefined) {
-        promise.catch(err => {
-          console.error('Error playing video:', err)
+        promise.catch((err: any) => {
+          if (
+            // ignore this common error. it's fine
+            !err.message?.includes(
+              `The play() request was interrupted by a call to pause()`,
+            )
+          ) {
+            logger.error('Error playing video:', {message: err})
+          }
         })
       }
     }

src/components/ProfileHoverCard/index.web.tsx

···
     return props.children
   } else {
     return (
-      <View onPointerMove={onPointerMove} style={[a.flex_shrink]}>
+      <View onPointerMove={onPointerMove} style={[a.flex_shrink, props.style]}>
         <ProfileHoverCardInner {...props} />
       </View>
     )

src/components/ProfileHoverCard/types.ts

···
 import type React from 'react'
 
-export type ProfileHoverCardProps = {
-  children: React.ReactElement
+import {type ViewStyleProp} from '#/alf'
+
+export type ProfileHoverCardProps = ViewStyleProp & {
+  children: React.ReactNode
   did: string
   disable?: boolean
 }

src/components/dialogs/PostInteractionSettingsDialog.tsx

···
 import React from 'react'
-import {StyleProp, View, ViewStyle} from 'react-native'
-import {AppBskyFeedDefs, AppBskyFeedPostgate, AtUri} from '@atproto/api'
+import {type StyleProp, View, type ViewStyle} from 'react-native'
+import {
+  type AppBskyFeedDefs,
+  type AppBskyFeedPostgate,
+  AtUri,
+} from '@atproto/api'
 import {msg, Trans} from '@lingui/macro'
 import {useLingui} from '@lingui/react'
 import {useQueryClient} from '@tanstack/react-query'
···
 import {
   createThreadgateViewQueryKey,
   getThreadgateView,
-  ThreadgateAllowUISetting,
+  type ThreadgateAllowUISetting,
   threadgateViewToAllowUISetting,
   useSetThreadgateAllowMutation,
   useThreadgateViewQuery,
···
       await Promise.all([
         queryClient.prefetchQuery({
           queryKey: createPostgateQueryKey(postUri),
-          queryFn: () => getPostgateRecord({agent, postUri}),
+          queryFn: () =>
+            getPostgateRecord({agent, postUri}).then(res => res ?? null),
           staleTime: STALE.SECONDS.THIRTY,
         }),
         queryClient.prefetchQuery({

src/lib/hooks/useNotificationHandler.ts

···
-import React from 'react'
+import {useEffect} from 'react'
 import * as Notifications from 'expo-notifications'
+import {type AppBskyNotificationListNotifications} from '@atproto/api'
+import {msg} from '@lingui/macro'
+import {useLingui} from '@lingui/react'
 import {CommonActions, useNavigation} from '@react-navigation/native'
 import {useQueryClient} from '@tanstack/react-query'
 
···
   | 'quote'
   | 'chat-message'
   | 'starterpack-joined'
+  | 'like-via-repost'
+  | 'repost-via-repost'
+  | 'verified'
+  | 'unverified'
 
 /**
  * Manually overridden type, but retains the possibility of
···
   const {currentConvoId} = useCurrentConvoId()
   const {setShowLoggedOut} = useLoggedOutViewControls()
   const closeAllActiveElements = useCloseAllActiveElements()
+  const {_} = useLingui()
 
   // On Android, we cannot control which sound is used for a notification on Android
   // 28 or higher. Instead, we have to configure a notification channel ahead of time
   // which has the sounds we want in the configuration for that channel. These two
   // channels allow for the mute/unmute functionality we want for the background
   // handler.
-  React.useEffect(() => {
+  useEffect(() => {
     if (!isAndroid) return
+    // assign both chat notifications to a group
+    // NOTE: I don't think that it will retroactively move them into the group
+    // if the channels already exist. no big deal imo -sfn
+    const CHAT_GROUP = 'chat'
+    Notifications.setNotificationChannelGroupAsync(CHAT_GROUP, {
+      name: _(msg`Chat`),
+      description: _(
+        msg`You can choose whether chat notifications have sound in the chat settings within the app`,
+      ),
+    })
     Notifications.setNotificationChannelAsync('chat-messages', {
-      name: 'Chat',
+      name: _(msg`Chat messages - sound`),
+      groupId: CHAT_GROUP,
       importance: Notifications.AndroidImportance.MAX,
       sound: 'dm.mp3',
       showBadge: true,
       vibrationPattern: [250],
       lockscreenVisibility: Notifications.AndroidNotificationVisibility.PRIVATE,
     })
-
     Notifications.setNotificationChannelAsync('chat-messages-muted', {
-      name: 'Chat - Muted',
+      name: _(msg`Chat messages - silent`),
+      groupId: CHAT_GROUP,
       importance: Notifications.AndroidImportance.MAX,
       sound: null,
       showBadge: true,
       vibrationPattern: [250],
       lockscreenVisibility: Notifications.AndroidNotificationVisibility.PRIVATE,
     })
-  }, [])
 
-  React.useEffect(() => {
+    Notifications.setNotificationChannelAsync(
+      'like' satisfies AppBskyNotificationListNotifications.Notification['reason'],
+      {
+        name: _(msg`Likes`),
+        importance: Notifications.AndroidImportance.HIGH,
+      },
+    )
+    Notifications.setNotificationChannelAsync(
+      'repost' satisfies AppBskyNotificationListNotifications.Notification['reason'],
+      {
+        name: _(msg`Reposts`),
+        importance: Notifications.AndroidImportance.HIGH,
+      },
+    )
+    Notifications.setNotificationChannelAsync(
+      'reply' satisfies AppBskyNotificationListNotifications.Notification['reason'],
+      {
+        name: _(msg`Replies`),
+        importance: Notifications.AndroidImportance.HIGH,
+      },
+    )
+    Notifications.setNotificationChannelAsync(
+      'mention' satisfies AppBskyNotificationListNotifications.Notification['reason'],
+      {
+        name: _(msg`Mentions`),
+        importance: Notifications.AndroidImportance.HIGH,
+      },
+    )
+    Notifications.setNotificationChannelAsync(
+      'quote' satisfies AppBskyNotificationListNotifications.Notification['reason'],
+      {
+        name: _(msg`Quotes`),
+        importance: Notifications.AndroidImportance.HIGH,
+      },
+    )
+    Notifications.setNotificationChannelAsync(
+      'follow' satisfies AppBskyNotificationListNotifications.Notification['reason'],
+      {
+        name: _(msg`New followers`),
+        importance: Notifications.AndroidImportance.HIGH,
+      },
+    )
+    Notifications.setNotificationChannelAsync(
+      'like-via-repost' satisfies AppBskyNotificationListNotifications.Notification['reason'],
+      {
+        name: _(msg`Likes of your reposts`),
+        importance: Notifications.AndroidImportance.HIGH,
+      },
+    )
+    Notifications.setNotificationChannelAsync(
+      'repost-via-repost' satisfies AppBskyNotificationListNotifications.Notification['reason'],
+      {
+        name: _(msg`Reposts of your reposts`),
+        importance: Notifications.AndroidImportance.HIGH,
+      },
+    )
+  }, [_])
+
+  useEffect(() => {
     const handleNotification = (payload?: NotificationPayload) => {
       if (!payload) return
 
···
           case 'quote':
           case 'reply':
           case 'starterpack-joined':
+          case 'like-via-repost':
+          case 'repost-via-repost':
+          case 'verified':
+          case 'unverified':
             resetToTab('NotificationsTab')
             break
           // TODO implement these after we have an idea of how to handle each individual case
···
           const payload = e.notification.request.trigger
             .payload as NotificationPayload
 
-          if (!payload) return
+          if (!payload) {
+            logger.error('useNotificationsHandler: received no payload', {
+              identifier: e.notification.request.identifier,
+            })
+            return
+          }
+          if (!payload.reason) {
+            logger.error('useNotificationsHandler: received unknown payload', {
+              payload,
+              identifier: e.notification.request.identifier,
+            })
+            return
+          }
 
           logger.debug(
             'User pressed a notification, opening notifications tab',

src/lib/hooks/useOpenLink.ts

···
   isRelativeUrl,
   toNiceDomain,
 } from '#/lib/strings/url-helpers'
+import {logger} from '#/logger'
 import {isNative} from '#/platform/detection'
 import {useInAppBrowser} from '#/state/preferences/in-app-browser'
 import {useTheme} from '#/alf'
···
               toolbarColor: t.atoms.bg.backgroundColor,
               controlsColor: t.palette.primary_500,
               createTask: false,
+            }).catch(err => {
+              if (__DEV__)
+                logger.error('Could not open web browser', {message: err})
+              Linking.openURL(url)
             }),
           )
           return

src/lib/statsig/gates.ts

···
   | 'old_postonboarding'
   | 'onboarding_add_video_feed'
   | 'post_threads_v2_unspecced'
+  | 'reengagement_features'
   | 'remove_show_latest_button'
   | 'test_gate_1'
   | 'test_gate_2'

src/locale/locales/en/messages.po

···
 msgid "{0, plural, one {following} other {following}}"
 msgstr ""
 
-#: src/screens/PostThread/components/ThreadItemAnchor.tsx:474
+#: src/screens/PostThread/components/ThreadItemAnchor.tsx:468
 #: src/view/com/post-thread/PostThreadItem.tsx:541
 msgid "{0, plural, one {like} other {likes}}"
 msgstr ""
···
 msgid "{0, plural, one {post} other {posts}}"
 msgstr ""
 
-#: src/screens/PostThread/components/ThreadItemAnchor.tsx:458
+#: src/screens/PostThread/components/ThreadItemAnchor.tsx:452
 #: src/view/com/post-thread/PostThreadItem.tsx:525
 msgid "{0, plural, one {quote} other {quotes}}"
 msgstr ""
 
-#: src/screens/PostThread/components/ThreadItemAnchor.tsx:440
+#: src/screens/PostThread/components/ThreadItemAnchor.tsx:434
 #: src/view/com/post-thread/PostThreadItem.tsx:507
 msgid "{0, plural, one {repost} other {reposts}}"
 msgstr ""
···
 
 #: src/Navigation.tsx:490
 #: src/screens/Settings/AboutSettings.tsx:75
-#: src/screens/Settings/Settings.tsx:234
-#: src/screens/Settings/Settings.tsx:237
+#: src/screens/Settings/Settings.tsx:238
+#: src/screens/Settings/Settings.tsx:241
 msgid "About"
 msgstr ""
 
···
 msgstr ""
 
 #: src/screens/Settings/AccessibilitySettings.tsx:46
-#: src/screens/Settings/Settings.tsx:210
-#: src/screens/Settings/Settings.tsx:213
+#: src/screens/Settings/Settings.tsx:214
+#: src/screens/Settings/Settings.tsx:217
 msgid "Accessibility"
 msgstr ""
 
···
 #: src/Navigation.tsx:381
 #: src/screens/Login/LoginForm.tsx:194
 #: src/screens/Settings/AccountSettings.tsx:48
-#: src/screens/Settings/Settings.tsx:164
-#: src/screens/Settings/Settings.tsx:167
+#: src/screens/Settings/Settings.tsx:166
+#: src/screens/Settings/Settings.tsx:169
 msgid "Account"
 msgstr ""
 
···
 msgid "Account Muted by List"
 msgstr ""
 
-#: src/screens/Settings/Settings.tsx:514
+#: src/screens/Settings/Settings.tsx:518
 msgid "Account options"
 msgstr ""
 
-#: src/screens/Settings/Settings.tsx:550
+#: src/screens/Settings/Settings.tsx:554
 msgid "Account removed from quick access"
 msgstr ""
 
···
 msgid "Add alt text (optional)"
 msgstr ""
 
-#: src/screens/Settings/Settings.tsx:454
-#: src/screens/Settings/Settings.tsx:457
+#: src/screens/Settings/Settings.tsx:458
+#: src/screens/Settings/Settings.tsx:461
 #: src/view/shell/desktop/LeftNav.tsx:260
 #: src/view/shell/desktop/LeftNav.tsx:264
 msgid "Add another account"
···
 msgid "[e-mail]"
 msgstr ""
 
-#: src/view/screens/Notifications.tsx:86
+#: src/view/screens/Notifications.tsx:88
 msgid "All"
 msgstr ""
 
···
 msgid "Allow new messages from"
 msgstr ""
 
-#: src/components/dialogs/PostInteractionSettingsDialog.tsx:344
+#: src/components/dialogs/PostInteractionSettingsDialog.tsx:348
 msgid "Allow quote posts"
 msgstr ""
 
-#: src/components/dialogs/PostInteractionSettingsDialog.tsx:389
+#: src/components/dialogs/PostInteractionSettingsDialog.tsx:393
 msgid "Allow replies from:"
 msgstr ""
 
···
 
 #: src/Navigation.tsx:373
 #: src/screens/Settings/AppearanceSettings.tsx:85
-#: src/screens/Settings/Settings.tsx:202
-#: src/screens/Settings/Settings.tsx:205
+#: src/screens/Settings/Settings.tsx:206
+#: src/screens/Settings/Settings.tsx:209
 msgid "Appearance"
 msgstr ""
 
···
 msgid "Apply default recommended feeds"
 msgstr ""
 
-#: src/screens/PostThread/components/ThreadItemAnchor.tsx:640
+#: src/screens/PostThread/components/ThreadItemAnchor.tsx:634
 #: src/view/com/post-thread/PostThreadItem.tsx:955
 msgid "Archived from {0}"
 msgstr ""
 
-#: src/screens/PostThread/components/ThreadItemAnchor.tsx:609
-#: src/screens/PostThread/components/ThreadItemAnchor.tsx:648
+#: src/screens/PostThread/components/ThreadItemAnchor.tsx:603
+#: src/screens/PostThread/components/ThreadItemAnchor.tsx:642
 #: src/view/com/post-thread/PostThreadItem.tsx:924
 #: src/view/com/post-thread/PostThreadItem.tsx:963
 msgid "Archived post"
···
 msgid "Bluesky"
 msgstr ""
 
-#: src/screens/PostThread/components/ThreadItemAnchor.tsx:665
+#: src/screens/PostThread/components/ThreadItemAnchor.tsx:659
 #: src/view/com/post-thread/PostThreadItem.tsx:980
 msgid "Bluesky cannot confirm the authenticity of the claimed date."
 msgstr ""
···
 #: src/screens/Settings/AppIconSettings/index.tsx:225
 #: src/screens/Settings/components/ChangeHandleDialog.tsx:78
 #: src/screens/Settings/components/ChangeHandleDialog.tsx:85
-#: src/screens/Settings/Settings.tsx:279
+#: src/screens/Settings/Settings.tsx:283
 #: src/screens/Takendown.tsx:99
 #: src/screens/Takendown.tsx:102
 #: src/view/com/composer/Composer.tsx:960
···
 #: src/view/com/modals/ChangePassword.tsx:282
 #: src/view/com/modals/CreateOrEditList.tsx:333
 #: src/view/com/modals/CropImage.web.tsx:97
-#: src/view/com/modals/LinkWarning.tsx:105
-#: src/view/com/modals/LinkWarning.tsx:107
 #: src/view/shell/desktop/LeftNav.tsx:213
 msgid "Cancel"
 msgstr ""
···
 
 #: src/screens/Search/Shell.tsx:341
 msgid "Cancel search"
-msgstr ""
-
-#: src/view/com/modals/LinkWarning.tsx:106
-msgid "Cancels opening the linked website"
 msgstr ""
 
 #: src/components/PostControls/index.tsx:101
···
 msgid "Changes hosting provider"
 msgstr ""
 
+#: src/lib/hooks/useNotificationHandler.ts:90
 #: src/Navigation.tsx:515
 #: src/view/shell/bottom-bar/BottomBar.tsx:221
 #: src/view/shell/desktop/LeftNav.tsx:553
···
 msgid "Chat deleted"
 msgstr ""
 
+#: src/lib/hooks/useNotificationHandler.ts:105
+msgid "Chat messages - silent"
+msgstr ""
+
+#: src/lib/hooks/useNotificationHandler.ts:96
+msgid "Chat messages - sound"
+msgstr ""
+
 #: src/components/dms/ConvoMenu.tsx:176
 msgctxt "toast"
 msgid "Chat muted"
···
 msgid "Choose your username"
 msgstr ""
 
-#: src/screens/Settings/Settings.tsx:432
+#: src/screens/Settings/Settings.tsx:436
 msgid "Clear all storage data"
 msgstr ""
 
-#: src/screens/Settings/Settings.tsx:434
+#: src/screens/Settings/Settings.tsx:438
 msgid "Clear all storage data (restart after this)"
 msgstr ""
 
···
 msgid "Click here to update your email"
 msgstr ""
 
-#: src/components/dialogs/PostInteractionSettingsDialog.tsx:337
+#: src/components/dialogs/PostInteractionSettingsDialog.tsx:341
 msgid "Click to disable quote posts of this post."
 msgstr ""
 
-#: src/components/dialogs/PostInteractionSettingsDialog.tsx:338
+#: src/components/dialogs/PostInteractionSettingsDialog.tsx:342
 msgid "Click to enable quote posts of this post."
 msgstr ""
 
···
 msgid "Close dialog"
 msgstr ""
 
-#: src/view/shell/index.web.tsx:85
+#: src/view/shell/index.web.tsx:87
 msgid "Close drawer menu"
 msgstr ""
 
···
 msgstr ""
 
 #: src/screens/Settings/AccessibilitySettings.tsx:109
-#: src/screens/Settings/Settings.tsx:194
-#: src/screens/Settings/Settings.tsx:197
+#: src/screens/Settings/Settings.tsx:198
+#: src/screens/Settings/Settings.tsx:201
 msgid "Content and media"
 msgstr ""
 
···
 msgid "Could not process your video"
 msgstr ""
 
-#: src/state/queries/notifications/settings.ts:47
+#: src/state/queries/notifications/settings.ts:50
 msgid "Could not update notification settings"
 msgstr ""
 
···
 msgid "Customization options"
 msgstr ""
 
-#: src/components/dialogs/PostInteractionSettingsDialog.tsx:103
+#: src/components/dialogs/PostInteractionSettingsDialog.tsx:107
 msgid "Customize who can interact with this post."
 msgstr ""
 
···
 msgid "Deactivate account"
 msgstr ""
 
-#: src/screens/Settings/Settings.tsx:406
+#: src/screens/Settings/Settings.tsx:410
 msgid "Debug Moderation"
 msgstr ""
 
···
 msgid "Delete chat"
 msgstr ""
 
-#: src/screens/Settings/Settings.tsx:413
+#: src/screens/Settings/Settings.tsx:417
 msgid "Delete chat declaration record"
 msgstr ""
 
···
 msgid "Developer mode enabled"
 msgstr ""
 
-#: src/screens/Settings/Settings.tsx:261
-#: src/screens/Settings/Settings.tsx:264
+#: src/screens/Settings/Settings.tsx:265
+#: src/screens/Settings/Settings.tsx:268
 msgid "Developer options"
 msgstr ""
 
···
 msgid "Edit People"
 msgstr ""
 
-#: src/components/dialogs/PostInteractionSettingsDialog.tsx:69
-#: src/components/dialogs/PostInteractionSettingsDialog.tsx:239
+#: src/components/dialogs/PostInteractionSettingsDialog.tsx:73
+#: src/components/dialogs/PostInteractionSettingsDialog.tsx:243
 msgid "Edit post interaction settings"
 msgstr ""
 
···
 msgid "Error: {error}"
 msgstr ""
 
-#: src/components/dialogs/PostInteractionSettingsDialog.tsx:394
+#: src/components/dialogs/PostInteractionSettingsDialog.tsx:398
 msgid "Everybody"
 msgstr ""
 
···
 
 #: src/screens/Messages/Settings.tsx:83
 #: src/screens/Messages/Settings.tsx:86
-#: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:153
-#: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:167
+#: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:160
+#: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:174
 msgid "Everyone"
 msgstr ""
 
···
 msgid "Failed to save settings. Please try again."
 msgstr ""
 
-#: src/screens/Settings/InterestsSettings.tsx:136
+#: src/screens/Settings/InterestsSettings.tsx:132
 msgctxt "toast"
 msgid "Failed to save your interests."
 msgstr ""
···
 
 #: src/screens/Search/components/SearchLanguageDropdown.tsx:70
 msgid "Filter search by language (currently: {currentLanguageLabel})"
+msgstr ""
+
+#: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:154
+msgid "Filter who you receive notifications from"
 msgstr ""
 
 #: src/screens/Onboarding/StepFinished.tsx:314
···
 msgid "Frequently Posts Unwanted Content"
 msgstr ""
 
+#: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:150
+msgid "From"
+msgstr ""
+
 #: src/screens/Hashtag.tsx:120
 msgid "From @{sanitizedAuthor}"
 msgstr ""
···
 msgid "Glaring violations of law or terms of service"
 msgstr ""
 
+#: src/components/dialogs/LinkWarning.tsx:111
+#: src/components/dialogs/LinkWarning.tsx:117
 #: src/components/Layout/Header/index.tsx:127
 #: src/components/moderation/ScreenHider.tsx:154
 #: src/components/moderation/ScreenHider.tsx:163
···
 msgid "Having trouble?"
 msgstr ""
 
-#: src/screens/Settings/Settings.tsx:226
 #: src/screens/Settings/Settings.tsx:230
+#: src/screens/Settings/Settings.tsx:234
 #: src/view/shell/desktop/RightNav.tsx:120
 #: src/view/shell/desktop/RightNav.tsx:121
 #: src/view/shell/Drawer.tsx:370
···
 msgid "In-app"
 msgstr ""
 
-#: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:134
+#: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:139
 msgid "In-app notifications"
 msgstr ""
 
···
 msgstr ""
 
 #: src/screens/Settings/LanguageSettings.tsx:78
-#: src/screens/Settings/Settings.tsx:218
-#: src/screens/Settings/Settings.tsx:221
+#: src/screens/Settings/Settings.tsx:222
+#: src/screens/Settings/Settings.tsx:225
 msgid "Languages"
 msgstr ""
 
···
 msgid "Leave them all unchecked to see any language."
 msgstr ""
 
-#: src/view/com/modals/LinkWarning.tsx:65
+#: src/components/dialogs/LinkWarning.tsx:67
+#: src/components/dialogs/LinkWarning.tsx:75
 msgid "Leaving Bluesky"
 msgstr ""
 
···
 msgid "Liked by {likeCount, plural, one {# user} other {# users}}"
 msgstr ""
 
-#: src/screens/Settings/NotificationSettings/index.tsx:159
+#: src/lib/hooks/useNotificationHandler.ts:117
+#: src/screens/Settings/NotificationSettings/index.tsx:126
 #: src/screens/Settings/NotificationSettings/LikeNotificationSettings.tsx:41
 #: src/view/screens/Profile.tsx:229
 msgid "Likes"
 msgstr ""
 
+#: src/lib/hooks/useNotificationHandler.ts:159
 #: src/screens/Settings/NotificationSettings/index.tsx:208
 #: src/screens/Settings/NotificationSettings/LikesOnRepostsNotificationSettings.tsx:41
 msgid "Likes of your reposts"
···
 msgid "Likes of your reposts notifications"
 msgstr ""
 
-#: src/screens/PostThread/components/ThreadItemAnchor.tsx:467
+#: src/screens/PostThread/components/ThreadItemAnchor.tsx:461
 #: src/view/com/post-thread/PostThreadItem.tsx:243
 msgid "Likes on this post"
 msgstr ""
···
 msgid "Load more suggested feeds"
 msgstr ""
 
-#: src/view/screens/Notifications.tsx:270
+#: src/view/screens/Notifications.tsx:278
 msgid "Load new notifications"
 msgstr ""
 
···
 msgid "Make one for me"
 msgstr ""
 
-#: src/view/com/modals/LinkWarning.tsx:79
+#: src/components/dialogs/LinkWarning.tsx:85
 msgid "Make sure this is where you intend to go!"
 msgstr ""
 
···
 msgid "mentioned users"
 msgstr ""
 
-#: src/components/dialogs/PostInteractionSettingsDialog.tsx:423
+#: src/components/dialogs/PostInteractionSettingsDialog.tsx:427
 msgid "Mentioned users"
 msgstr ""
 
-#: src/screens/Settings/NotificationSettings/index.tsx:137
+#: src/lib/hooks/useNotificationHandler.ts:138
+#: src/screens/Settings/NotificationSettings/index.tsx:159
 #: src/screens/Settings/NotificationSettings/MentionNotificationSettings.tsx:41
-#: src/view/screens/Notifications.tsx:99
+#: src/view/screens/Notifications.tsx:101
 msgid "Mentions"
 msgstr ""
 
···
 
 #: src/Navigation.tsx:159
 #: src/screens/Moderation/index.tsx:93
-#: src/screens/Settings/Settings.tsx:178
-#: src/screens/Settings/Settings.tsx:181
+#: src/screens/Settings/Settings.tsx:180
+#: src/screens/Settings/Settings.tsx:183
 msgid "Moderation"
 msgstr ""
 
···
 msgid "New follower notifications"
 msgstr ""
 
-#: src/screens/Settings/NotificationSettings/index.tsx:181
+#: src/lib/hooks/useNotificationHandler.ts:152
+#: src/screens/Settings/NotificationSettings/index.tsx:137
 #: src/screens/Settings/NotificationSettings/NewFollowerNotificationSettings.tsx:41
 msgid "New followers"
 msgstr ""
···
 
 #: src/screens/Profile/ProfileFeed/index.tsx:241
 #: src/view/screens/Feeds.tsx:552
-#: src/view/screens/Notifications.tsx:165
+#: src/view/screens/Notifications.tsx:167
 #: src/view/screens/Profile.tsx:510
 #: src/view/screens/ProfileList.tsx:250
 #: src/view/screens/ProfileList.tsx:288
···
 msgid "No thanks"
 msgstr ""
 
-#: src/components/dialogs/PostInteractionSettingsDialog.tsx:405
+#: src/components/dialogs/PostInteractionSettingsDialog.tsx:409
 msgid "Nobody"
 msgstr ""
 
···
 
 #: src/Navigation.tsx:396
 #: src/Navigation.tsx:530
-#: src/view/screens/Notifications.tsx:134
+#: src/view/screens/Notifications.tsx:136
 msgid "Notification settings"
 msgstr ""
 
···
 #: src/screens/Settings/NotificationSettings/ReplyNotificationSettings.tsx:30
 #: src/screens/Settings/NotificationSettings/RepostNotificationSettings.tsx:30
 #: src/screens/Settings/NotificationSettings/RepostsOnRepostsNotificationSettings.tsx:30
-#: src/screens/Settings/Settings.tsx:186
 #: src/screens/Settings/Settings.tsx:189
-#: src/view/screens/Notifications.tsx:128
+#: src/screens/Settings/Settings.tsx:192
+#: src/view/screens/Notifications.tsx:130
 #: src/view/shell/bottom-bar/BottomBar.tsx:252
 #: src/view/shell/desktop/LeftNav.tsx:654
 #: src/view/shell/Drawer.tsx:482
···
 msgstr ""
 
 #: src/screens/Login/PasswordUpdatedForm.tsx:37
-#: src/screens/PostThread/components/ThreadItemAnchor.tsx:670
+#: src/screens/PostThread/components/ThreadItemAnchor.tsx:664
 #: src/view/com/post-thread/PostThreadItem.tsx:985
 msgid "Okay"
 msgstr ""
···
 msgid "on<0><1/><2><3/></2></0>"
 msgstr ""
 
-#: src/screens/Settings/Settings.tsx:367
+#: src/screens/Settings/Settings.tsx:371
 msgid "Onboarding reset"
 msgstr ""
 
···
 msgid "Open message options"
 msgstr ""
 
-#: src/screens/Settings/Settings.tsx:404
+#: src/screens/Settings/Settings.tsx:408
 msgid "Open moderation debug page"
 msgstr ""
 
···
 msgid "Open starter pack menu"
 msgstr ""
 
-#: src/screens/Settings/Settings.tsx:397
-#: src/screens/Settings/Settings.tsx:411
+#: src/screens/Settings/Settings.tsx:401
+#: src/screens/Settings/Settings.tsx:415
 msgid "Open storybook page"
 msgstr ""
 
-#: src/screens/Settings/Settings.tsx:390
+#: src/screens/Settings/Settings.tsx:394
 msgid "Open system log"
 msgstr ""
 
···
 msgid "Opens GIF select dialog"
 msgstr ""
 
-#: src/screens/Settings/Settings.tsx:227
+#: src/screens/Settings/Settings.tsx:231
 msgid "Opens helpdesk in browser"
+msgstr ""
+
+#: src/components/dialogs/LinkWarning.tsx:97
+msgid "Opens link {0}"
 msgstr ""
 
 #: src/view/com/modals/InviteCodes.tsx:173
···
 msgid "Opens password reset form"
 msgstr ""
 
-#: src/view/com/modals/LinkWarning.tsx:93
-msgid "Opens the linked website"
-msgstr ""
-
 #: src/view/com/notifications/NotificationFeedItem.tsx:850
 #: src/view/com/util/UserAvatar.tsx:581
 msgid "Opens this profile"
···
 msgid "Options:"
 msgstr ""
 
-#: src/components/dialogs/PostInteractionSettingsDialog.tsx:418
+#: src/components/dialogs/PostInteractionSettingsDialog.tsx:422
 msgid "Or combine these options:"
 msgstr ""
 
···
 msgid "People following @{0}"
 msgstr ""
 
-#: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:171
-#: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:185
+#: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:178
+#: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:192
 msgid "People I follow"
 msgstr ""
 
···
 msgid "Porn"
 msgstr ""
 
-#: src/screens/PostThread/index.tsx:490
+#: src/screens/PostThread/index.tsx:495
 #: src/view/com/post-thread/PostThread.tsx:561
 msgctxt "description"
 msgid "Post"
···
 msgid "Post Hidden by You"
 msgstr ""
 
-#: src/components/dialogs/PostInteractionSettingsDialog.tsx:100
+#: src/components/dialogs/PostInteractionSettingsDialog.tsx:104
 msgid "Post interaction settings"
 msgstr ""
 
···
 msgid "Posts hidden"
 msgstr ""
 
-#: src/view/com/modals/LinkWarning.tsx:60
-msgid "Potentially Misleading Link"
+#: src/components/dialogs/LinkWarning.tsx:73
+msgid "Potentially misleading link"
+msgstr ""
+
+#: src/components/dialogs/LinkWarning.tsx:66
+msgid "Potentially misleading link warning"
 msgstr ""
 
 #: src/screens/Messages/components/MessageListError.tsx:19
···
 msgid "Privacy"
 msgstr ""
 
-#: src/screens/Settings/Settings.tsx:172
-#: src/screens/Settings/Settings.tsx:175
+#: src/screens/Settings/Settings.tsx:174
+#: src/screens/Settings/Settings.tsx:177
 msgid "Privacy and security"
 msgstr ""
 
···
 msgid "Push"
 msgstr ""
 
-#: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:117
+#: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:122
 msgid "Push notifications"
 msgstr ""
 
···
 msgid "Quote posts disabled"
 msgstr ""
 
-#: src/components/dialogs/PostInteractionSettingsDialog.tsx:329
+#: src/components/dialogs/PostInteractionSettingsDialog.tsx:333
 msgid "Quote settings"
 msgstr ""
 
+#: src/lib/hooks/useNotificationHandler.ts:145
 #: src/screens/Post/PostQuotes.tsx:38
-#: src/screens/Settings/NotificationSettings/index.tsx:148
+#: src/screens/Settings/NotificationSettings/index.tsx:170
 #: src/screens/Settings/NotificationSettings/QuoteNotificationSettings.tsx:41
 msgid "Quotes"
 msgstr ""
 
-#: src/screens/PostThread/components/ThreadItemAnchor.tsx:451
+#: src/screens/PostThread/components/ThreadItemAnchor.tsx:445
 #: src/view/com/post-thread/PostThreadItem.tsx:269
 msgid "Quotes of this post"
 msgstr ""
···
 msgid "Reason:"
 msgstr ""
 
-#: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:123
+#: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:128
 msgid "Receive in-app notifications"
 msgstr ""
 
-#: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:106
+#: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:111
 msgid "Receive push notifications"
 msgstr ""
 
···
 #: src/components/FeedCard.tsx:343
 #: src/components/StarterPack/Wizard/WizardListCard.tsx:102
 #: src/components/StarterPack/Wizard/WizardListCard.tsx:109
-#: src/screens/Settings/Settings.tsx:552
+#: src/screens/Settings/Settings.tsx:556
 #: src/view/com/feeds/FeedSourceCard.tsx:322
 #: src/view/com/modals/UserAddRemoveLists.tsx:235
 #: src/view/com/posts/PostFeedErrorMessage.tsx:213
···
 msgid "Remove {historyItem}"
 msgstr ""
 
-#: src/screens/Settings/Settings.tsx:531
-#: src/screens/Settings/Settings.tsx:534
+#: src/screens/Settings/Settings.tsx:535
+#: src/screens/Settings/Settings.tsx:538
 msgid "Remove account"
 msgstr ""
 
···
 msgid "Remove from my feeds"
 msgstr ""
 
-#: src/screens/Settings/Settings.tsx:544
+#: src/screens/Settings/Settings.tsx:548
 msgid "Remove from quick access?"
 msgstr ""
 
···
 msgid "Replace with Discover"
 msgstr ""
 
-#: src/screens/Settings/NotificationSettings/index.tsx:126
+#: src/lib/hooks/useNotificationHandler.ts:131
+#: src/screens/Settings/NotificationSettings/index.tsx:148
 #: src/screens/Settings/NotificationSettings/ReplyNotificationSettings.tsx:41
 #: src/view/screens/Profile.tsx:226
 msgid "Replies"
···
 msgid "Reply notifications"
 msgstr ""
 
-#: src/components/dialogs/PostInteractionSettingsDialog.tsx:385
+#: src/components/dialogs/PostInteractionSettingsDialog.tsx:389
 msgid "Reply settings"
 msgstr ""
 
-#: src/components/dialogs/PostInteractionSettingsDialog.tsx:370
+#: src/components/dialogs/PostInteractionSettingsDialog.tsx:374
 msgid "Reply settings are chosen by the author of the thread"
 msgstr ""
 
···
 msgid "Reposted by you"
 msgstr ""
 
-#: src/screens/Settings/NotificationSettings/index.tsx:170
+#: src/lib/hooks/useNotificationHandler.ts:124
+#: src/screens/Settings/NotificationSettings/index.tsx:181
 #: src/screens/Settings/NotificationSettings/RepostNotificationSettings.tsx:41
 msgid "Reposts"
 msgstr ""
 
-#: src/screens/PostThread/components/ThreadItemAnchor.tsx:433
+#: src/screens/PostThread/components/ThreadItemAnchor.tsx:427
 #: src/view/com/post-thread/PostThreadItem.tsx:248
 msgid "Reposts of this post"
 msgstr ""
 
+#: src/lib/hooks/useNotificationHandler.ts:166
 #: src/screens/Settings/NotificationSettings/index.tsx:223
 #: src/screens/Settings/NotificationSettings/RepostsOnRepostsNotificationSettings.tsx:41
 msgid "Reposts of your reposts"
···
 msgid "Reset Code"
 msgstr ""
 
-#: src/screens/Settings/Settings.tsx:418
-#: src/screens/Settings/Settings.tsx:420
+#: src/screens/Settings/Settings.tsx:422
+#: src/screens/Settings/Settings.tsx:424
 msgid "Reset onboarding state"
 msgstr ""
 
···
 msgstr ""
 
 #: src/components/dialogs/BirthDateSettings.tsx:121
-#: src/components/dialogs/PostInteractionSettingsDialog.tsx:479
-#: src/components/dialogs/PostInteractionSettingsDialog.tsx:485
+#: src/components/dialogs/PostInteractionSettingsDialog.tsx:483
+#: src/components/dialogs/PostInteractionSettingsDialog.tsx:489
 #: src/components/live/EditLiveDialog.tsx:216
 #: src/components/live/EditLiveDialog.tsx:223
 #: src/components/StarterPack/QrCodeDialog.tsx:192
···
 msgstr ""
 
 #: src/screens/Onboarding/StepInterests/index.tsx:192
-#: src/screens/Settings/InterestsSettings.tsx:165
+#: src/screens/Settings/InterestsSettings.tsx:161
 msgid "Select your interests from the options below"
 msgstr ""
 
 #: src/screens/Settings/LanguageSettings.tsx:124
 msgid "Select your preferred language for translations in your feed."
+msgstr ""
+
+#: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:106
+msgid "Select your preferred notification channels"
 msgstr ""
 
 #: src/view/com/util/forms/DropdownButton.tsx:297
···
 msgstr ""
 
 #: src/Navigation.tsx:195
-#: src/screens/Settings/Settings.tsx:91
+#: src/screens/Settings/Settings.tsx:93
 #: src/view/shell/desktop/LeftNav.tsx:727
 #: src/view/shell/Drawer.tsx:572
 msgid "Settings"
 msgstr ""
 
-#: src/screens/Settings/NotificationSettings/index.tsx:154
+#: src/screens/Settings/NotificationSettings/index.tsx:121
 msgid "Settings for like notifications"
 msgstr ""
 
-#: src/screens/Settings/NotificationSettings/index.tsx:132
+#: src/screens/Settings/NotificationSettings/index.tsx:154
 msgid "Settings for mention notifications"
 msgstr ""
 
-#: src/screens/Settings/NotificationSettings/index.tsx:176
+#: src/screens/Settings/NotificationSettings/index.tsx:132
 msgid "Settings for new follower notifications"
 msgstr ""
 
···
 msgid "Settings for notifications for reposts of your reposts"
 msgstr ""
 
-#: src/screens/Settings/NotificationSettings/index.tsx:143
+#: src/screens/Settings/NotificationSettings/index.tsx:165
 msgid "Settings for quote notifications"
 msgstr ""
 
-#: src/screens/Settings/NotificationSettings/index.tsx:121
+#: src/screens/Settings/NotificationSettings/index.tsx:143
 msgid "Settings for reply notifications"
 msgstr ""
 
-#: src/screens/Settings/NotificationSettings/index.tsx:165
+#: src/screens/Settings/NotificationSettings/index.tsx:176
 msgid "Settings for repost notifications"
 msgstr ""
 
···
 msgid "Share author DID"
 msgstr ""
 
+#: src/components/dialogs/LinkWarning.tsx:96
+#: src/components/dialogs/LinkWarning.tsx:104
 #: src/components/StarterPack/ShareDialog.tsx:104
 #: src/components/StarterPack/ShareDialog.tsx:111
 msgid "Share link"
 msgstr ""
 
-#: src/view/com/modals/LinkWarning.tsx:89
-#: src/view/com/modals/LinkWarning.tsx:95
-msgid "Share Link"
-msgstr ""
-
 #: src/components/StarterPack/ShareDialog.tsx:68
 msgid "Share link dialog"
 msgstr ""
···
 msgid "Shared Preferences Tester"
 msgstr ""
 
-#: src/view/com/modals/LinkWarning.tsx:92
-msgid "Shares the linked website"
-msgstr ""
-
 #: src/components/moderation/ContentHider.tsx:200
 #: src/components/moderation/LabelPreference.tsx:137
 #: src/components/moderation/PostHider.tsx:134
···
 msgid "Show warning and filter from feeds"
 msgstr ""
 
-#: src/screens/PostThread/components/ThreadItemAnchor.tsx:611
+#: src/screens/PostThread/components/ThreadItemAnchor.tsx:605
 #: src/view/com/post-thread/PostThreadItem.tsx:926
 msgid "Shows information about when this post was created"
 msgstr ""
 
-#: src/screens/Settings/Settings.tsx:115
+#: src/screens/Settings/Settings.tsx:117
 msgid "Shows other accounts you can switch to"
 msgstr ""
 
···
 msgid "Sign in to view post"
 msgstr ""
 
-#: src/screens/Settings/Settings.tsx:244
-#: src/screens/Settings/Settings.tsx:246
-#: src/screens/Settings/Settings.tsx:278
+#: src/screens/Settings/Settings.tsx:248
+#: src/screens/Settings/Settings.tsx:250
+#: src/screens/Settings/Settings.tsx:282
 #: src/screens/SignupQueued.tsx:93
 #: src/screens/SignupQueued.tsx:96
 #: src/screens/Takendown.tsx:85
···
 msgid "Sign Out"
 msgstr ""
 
-#: src/screens/Settings/Settings.tsx:275
+#: src/screens/Settings/Settings.tsx:279
 #: src/view/shell/desktop/LeftNav.tsx:209
 msgid "Sign out?"
 msgstr ""
···
 msgid "Step {0} of {1}"
 msgstr ""
 
-#: src/screens/Settings/Settings.tsx:372
+#: src/screens/Settings/Settings.tsx:376
 msgid "Storage cleared, you need to restart the app now."
 msgstr ""
 
 #: src/Navigation.tsx:288
-#: src/screens/Settings/Settings.tsx:399
+#: src/screens/Settings/Settings.tsx:403
 msgid "Storybook"
 msgstr ""
 
···
 msgid "Support"
 msgstr ""
 
-#: src/screens/Settings/Settings.tsx:113
-#: src/screens/Settings/Settings.tsx:127
-#: src/screens/Settings/Settings.tsx:494
+#: src/screens/Settings/Settings.tsx:115
+#: src/screens/Settings/Settings.tsx:129
+#: src/screens/Settings/Settings.tsx:498
 #: src/view/shell/desktop/LeftNav.tsx:246
 msgid "Switch account"
 msgstr ""
···
 
 #: src/screens/Settings/AboutSettings.tsx:107
 #: src/screens/Settings/AboutSettings.tsx:110
-#: src/screens/Settings/Settings.tsx:392
+#: src/screens/Settings/Settings.tsx:396
 msgid "System log"
 msgstr ""
 
···
 msgid "There was an issue! {0}"
 msgstr ""
 
-#: src/components/dialogs/PostInteractionSettingsDialog.tsx:217
+#: src/components/dialogs/PostInteractionSettingsDialog.tsx:221
 #: src/screens/List/ListHiddenScreen.tsx:63
 #: src/screens/List/ListHiddenScreen.tsx:77
 #: src/screens/List/ListHiddenScreen.tsx:99
···
 msgid "This labeler hasn't declared what labels it publishes, and may not be active."
 msgstr ""
 
-#: src/view/com/modals/LinkWarning.tsx:72
+#: src/components/dialogs/LinkWarning.tsx:79
 msgid "This link is taking you to the following website:"
 msgstr ""
 
···
 msgid "This moderation service is unavailable. See below for more details. If this issue persists, contact us."
 msgstr ""
 
-#: src/screens/PostThread/components/ThreadItemAnchor.tsx:651
+#: src/screens/PostThread/components/ThreadItemAnchor.tsx:645
 #: src/view/com/post-thread/PostThreadItem.tsx:966
 msgid "This post claims to have been created on <0>{0}</0>, but was first seen by Bluesky on <1>{1}</1>."
 msgstr ""
···
 msgid "This will delete \"{0}\" from your muted words. You can always add it back later."
 msgstr ""
 
-#: src/screens/Settings/Settings.tsx:546
+#: src/screens/Settings/Settings.tsx:550
 msgid "This will remove @{0} from the quick access list."
 msgstr ""
 
···
 #: src/components/dms/MessageContextMenu.tsx:145
 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:444
 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:446
-#: src/screens/PostThread/components/ThreadItemAnchor.tsx:573
-#: src/screens/PostThread/components/ThreadItemAnchor.tsx:576
+#: src/screens/PostThread/components/ThreadItemAnchor.tsx:567
+#: src/screens/PostThread/components/ThreadItemAnchor.tsx:570
 #: src/view/com/post-thread/PostThreadItem.tsx:888
 #: src/view/com/post-thread/PostThreadItem.tsx:891
 msgid "Translate"
···
 msgid "Unpinned from your feeds"
 msgstr ""
 
-#: src/screens/Settings/Settings.tsx:425
-#: src/screens/Settings/Settings.tsx:427
+#: src/screens/Settings/Settings.tsx:429
+#: src/screens/Settings/Settings.tsx:431
 msgid "Unsnooze email reminder"
 msgstr ""
 
···
 msgid "Users I follow"
 msgstr ""
 
-#: src/components/dialogs/PostInteractionSettingsDialog.tsx:456
+#: src/components/dialogs/PostInteractionSettingsDialog.tsx:460
 msgid "Users in \"{0}\""
 msgstr ""
 
-#: src/components/dialogs/PostInteractionSettingsDialog.tsx:433
+#: src/components/dialogs/PostInteractionSettingsDialog.tsx:437
 msgid "Users you follow"
 msgstr ""
 
···
 msgid "Views video in immersive mode"
 msgstr ""
 
-#: src/view/com/modals/LinkWarning.tsx:89
-#: src/view/com/modals/LinkWarning.tsx:95
-msgid "Visit Site"
+#: src/components/dialogs/LinkWarning.tsx:96
+#: src/components/dialogs/LinkWarning.tsx:106
+msgid "Visit site"
+msgstr ""
+
+#: src/view/screens/Notifications.tsx:303
+msgid "Visit your notification settings"
 msgstr ""
 
 #: src/components/Post/Embed/VideoEmbed/VideoEmbedInner/web-controls/VolumeControl.tsx:81
···
 msgid "We ran out of posts from your follows. Here's the latest from <0/>."
 msgstr ""
 
-#: src/screens/Settings/InterestsSettings.tsx:158
+#: src/screens/Settings/InterestsSettings.tsx:154
 msgid "We recommend selecting at least two interests."
 msgstr ""
 
···
 msgid "You can also temporarily deactivate your account instead, and reactivate it at any time."
 msgstr ""
 
+#: src/lib/hooks/useNotificationHandler.ts:92
+msgid "You can choose whether chat notifications have sound in the chat settings within the app"
+msgstr ""
+
 #: src/screens/Messages/Settings.tsx:111
 msgid "You can continue ongoing conversations regardless of which setting you choose."
 msgstr ""
···
 msgid "You can reactivate your account to continue logging in. Your profile and posts will be visible to other users."
 msgstr ""
 
-#: src/components/dialogs/PostInteractionSettingsDialog.tsx:81
+#: src/components/dialogs/PostInteractionSettingsDialog.tsx:85
 msgid "You can set default interaction settings in <0>Settings → Moderation → Interaction settings</0>."
 msgstr ""
 
···
 msgid "You have blocked this user. You cannot view their content."
 msgstr ""
 
+#: src/view/screens/Notifications.tsx:298
+msgid "You have completely disabled reply, quote, and mention notifications, so this tab will no longer update. To adjust this, visit your <0>notification settings</0>."
+msgstr ""
+
 #: src/screens/Login/SetNewPasswordForm.tsx:49
 #: src/screens/Login/SetNewPasswordForm.tsx:95
 #: src/view/com/modals/ChangePassword.tsx:87
···
 msgid "You previously deactivated @{0}."
 msgstr ""
 
-#: src/screens/Settings/Settings.tsx:383
+#: src/screens/Settings/Settings.tsx:387
 msgid "You probably want to restart the app now."
 msgstr ""
 
···
 msgid "You reacted {0} to {1}"
 msgstr ""
 
-#: src/screens/Settings/Settings.tsx:276
+#: src/screens/Settings/Settings.tsx:280
 #: src/view/shell/desktop/LeftNav.tsx:210
 msgid "You will be signed out of all your accounts."
 msgstr ""
···
 msgid "Your first like!"
 msgstr ""
 
-#: src/components/dialogs/PostInteractionSettingsDialog.tsx:443
+#: src/components/dialogs/PostInteractionSettingsDialog.tsx:447
 msgid "Your followers"
 msgstr ""
 
···
 msgid "Your interests"
 msgstr ""
 
-#: src/screens/Settings/InterestsSettings.tsx:127
+#: src/screens/Settings/InterestsSettings.tsx:123
 msgctxt "toast"
 msgid "Your interests have been updated!"
 msgstr ""

src/logger/__tests__/logger.test.ts

···
     const timestamp = Date.now()
     const sentryTimestamp = timestamp / 1000
 
+    /*
     sentryTransport(
       LogLevel.Debug,
       Logger.Context.Default,
···
       level: LogLevel.Debug,
       timestamp: sentryTimestamp,
     })
+    */
 
     sentryTransport(
       LogLevel.Info,
···
       message,
       data: {__context__: 'logger'},
       type: 'default',
-      level: 'debug', // Sentry bug, log becomes debug
+      level: 'log',
       timestamp: sentryTimestamp,
     })
     jest.runAllTimers()
···
     const sentryTimestamp = timestamp / 1000
 
     sentryTransport(
-      LogLevel.Debug,
+      LogLevel.Info,
       undefined,
       message,
       {error: new Error('foo')},
···
       message,
       data: {error: 'Error: foo'},
       type: 'default',
-      level: LogLevel.Debug,
+      level: LogLevel.Info,
       timestamp: sentryTimestamp,
     })
   })

src/logger/transports/sentry.ts

···
 import {isNetworkError} from '#/lib/strings/errors'
 import {Sentry} from '#/logger/sentry/lib'
-import {LogLevel, Transport} from '#/logger/types'
+import {LogLevel, type Transport} from '#/logger/types'
 import {prepareMetadata} from '#/logger/util'
 
 export const sentryTransport: Transport = (
···
   {type, tags, ...metadata},
   timestamp,
 ) => {
+  // Skip debug messages entirely for now - esb
+  if (level === LogLevel.Debug) return
+
   const meta = {
     __context__: context,
     ...prepareMetadata(metadata),

src/screens/PostThread/components/ThreadItemAnchor.tsx

···
           isRoot && [a.pt_lg],
         ]}>
         <View style={[a.flex_row, a.gap_md, a.pb_md]}>
-          <PreviewableUserAvatar
-            size={42}
-            profile={post.author}
-            moderation={moderation.ui('avatar')}
-            type={post.author.associated?.labeler ? 'labeler' : 'user'}
-            live={live}
-            onBeforePress={onOpenAuthor}
-          />
-          <View style={[a.flex_1, a.align_start]}>
-            <ProfileHoverCard did={post.author.did}>
-              <View style={[a.flex_1]}>
+          <View collapsable={false}>
+            <PreviewableUserAvatar
+              size={42}
+              profile={post.author}
+              moderation={moderation.ui('avatar')}
+              type={post.author.associated?.labeler ? 'labeler' : 'user'}
+              live={live}
+              onBeforePress={onOpenAuthor}
+            />
+          </View>
+          <Link
+            to={authorHref}
+            style={[a.flex_1]}
+            label={sanitizeDisplayName(
+              post.author.displayName || sanitizeHandle(post.author.handle),
+              moderation.ui('displayName'),
+            )}
+            onPress={onOpenAuthor}>
+            <View style={[a.flex_1, a.align_start]}>
+              <ProfileHoverCard did={post.author.did} style={[a.w_full]}>
                 <View style={[a.flex_row, a.align_center]}>
-                  <Link
-                    to={authorHref}
-                    style={[a.flex_shrink]}
-                    label={sanitizeDisplayName(
+                  <Text
+                    emoji
+                    style={[
+                      a.flex_shrink,
+                      a.text_lg,
+                      a.font_bold,
+                      a.leading_snug,
+                    ]}
+                    numberOfLines={1}>
+                    {sanitizeDisplayName(
                       post.author.displayName ||
                         sanitizeHandle(post.author.handle),
                       moderation.ui('displayName'),
                     )}
-                    onPress={onOpenAuthor}>
-                    <Text
-                      emoji
-                      style={[
-                        a.text_lg,
-                        a.font_bold,
-                        a.leading_snug,
-                        a.self_start,
-                      ]}
-                      numberOfLines={1}>
-                      {sanitizeDisplayName(
-                        post.author.displayName ||
-                          sanitizeHandle(post.author.handle),
-                        moderation.ui('displayName'),
-                      )}
-                    </Text>
-                  </Link>
+                  </Text>
 
                   <View style={[{paddingLeft: 3, top: -1}]}>
                     <VerificationCheckButton profile={authorShadow} size="md" />
                   </View>
                 </View>
-                <View style={[a.align_start]}>
-                  <Link
-                    style={[a.flex_shrink]}
-                    to={authorHref}
-                    label={sanitizeHandle(post.author.handle, '@')}>
-                    <Text
-                      style={[
-                        a.text_md,
-                        a.leading_snug,
-                        t.atoms.text_contrast_medium,
-                      ]}
-                      numberOfLines={1}>
-                      {sanitizeHandle(post.author.handle, '@')}
-                    </Text>
-                  </Link>
-                </View>
-              </View>
-            </ProfileHoverCard>
-          </View>
+                <Text
+                  style={[
+                    a.text_md,
+                    a.leading_snug,
+                    t.atoms.text_contrast_medium,
+                  ]}
+                  numberOfLines={1}>
+                  {sanitizeHandle(post.author.handle, '@')}
+                </Text>
+              </ProfileHoverCard>
+            </View>
+          </Link>
           {showFollowButton && (
-            <View>
+            <View collapsable={false}>
               <PostThreadFollowBtn did={post.author.did} />
             </View>
           )}

src/screens/PostThread/index.tsx

···
    * One query to rule them all
    */
   const thread = usePostThread({anchor: uri})
-  const anchor = useMemo(() => {
+  const {anchor, hasParents} = useMemo(() => {
+    // eslint-disable-next-line @typescript-eslint/no-shadow
+    let hasParents = false
     for (const item of thread.data.items) {
       if (item.type === 'threadPost' && item.depth === 0) {
-        return item
+        return {anchor: item, hasParents}
       }
+      hasParents = true
     }
-    return
+    return {hasParents}
   }, [thread.data.items])
 
   const {openComposer} = useOpenComposer()
···
     ],
   )
 
+  const defaultListFooterHeight = hasParents ? windowHeight - 200 : undefined
+
   return (
     <>
       <Layout.Header.Outer headerRef={headerRef}>
···
                * back to the top of the screen when handling scroll.
                */
               height={platform({
-                web: windowHeight - 200,
-                default: deferParents ? windowHeight * 2 : windowHeight - 200,
+                web: defaultListFooterHeight,
+                default: deferParents
+                  ? windowHeight * 2
+                  : defaultListFooterHeight,
               })}
               style={isTombstoneView ? {borderTopWidth: 0} : undefined}
             />

src/screens/Settings/NotificationSettings/ReplyNotificationSettings.tsx

···
               </Admonition>
             </View>
           ) : (
-            <PreferenceControls
-              name="reply"
-              preference={preferences?.reply}
-              allowDisableInApp={false}
-            />
+            <PreferenceControls name="reply" preference={preferences?.reply} />
           )}
         </SettingsList.Container>
       </Layout.Content>

src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx

···
 import {msg, Trans} from '@lingui/macro'
 import {useLingui} from '@lingui/react'
 
+import {useGate} from '#/lib/statsig/statsig'
 import {useNotificationSettingsUpdateMutation} from '#/state/queries/notifications/settings'
 import {atoms as a, platform, useTheme} from '#/alf'
 import * as Toggle from '#/components/forms/Toggle'
···
   preference?: AppBskyNotificationDefs.Preference | FilterablePreference
   allowDisableInApp?: boolean
 }) {
+  const gate = useGate()
+
+  if (!gate('reengagement_features')) return null
+
   if (!preference)
     return (
       <View style={[a.w_full, a.pt_5xl, a.align_center]}>

src/screens/Settings/Settings.tsx

···
   type CommonNavigatorParams,
   type NavigationProp,
 } from '#/lib/routes/types'
+import {useGate} from '#/lib/statsig/statsig'
 import {sanitizeDisplayName} from '#/lib/strings/display-names'
 import {sanitizeHandle} from '#/lib/strings/handles'
 import {useProfileShadow} from '#/state/cache/profile-shadow'
···
   const {pendingDid, onPressSwitchAccount} = useAccountSwitcher()
   const [showAccounts, setShowAccounts] = useState(false)
   const [showDevOptions, setShowDevOptions] = useState(false)
+  const gate = useGate()
 
   return (
     <Layout.Screen>
···
               <Trans>Moderation</Trans>
             </SettingsList.ItemText>
           </SettingsList.LinkItem>
-          <SettingsList.LinkItem
-            to="/settings/notifications"
-            label={_(msg`Notifications`)}>
-            <SettingsList.ItemIcon icon={NotificationIcon} />
-            <SettingsList.ItemText>
-              <Trans>Notifications</Trans>
-            </SettingsList.ItemText>
-          </SettingsList.LinkItem>
+          {gate('reengagement_features') && (
+            <SettingsList.LinkItem
+              to="/settings/notifications"
+              label={_(msg`Notifications`)}>
+              <SettingsList.ItemIcon icon={NotificationIcon} />
+              <SettingsList.ItemText>
+                <Trans>Notifications</Trans>
+              </SettingsList.ItemText>
+            </SettingsList.LinkItem>
+          )}
           <SettingsList.LinkItem
             to="/settings/content-and-media"
             label={_(msg`Content and media`)}>

src/state/messages/convo/agent.ts

···
 import {nanoid} from 'nanoid/non-secure'
 
 import {networkRetry} from '#/lib/async/retry'
+import {isNetworkError} from '#/lib/strings/errors'
 import {Logger} from '#/logger'
 import {isNative} from '#/platform/detection'
 import {
···
 
   getSnapshot(): ConvoState {
     if (!this.snapshot) this.snapshot = this.generateSnapshot()
-    // logger.debug('Convo: snapshotted', {})
+    // logger.debug('snapshotted', {})
     return this.snapshot
   }
 
···
         break
     }
 
-    logger.debug(`Convo: dispatch '${action.event}'`, {
+    logger.debug(`dispatch '${action.event}'`, {
       id: this.id,
       prev: prevStatus,
       next: this.status,
···
        * Some validation prior to `Ready` status
        */
       if (!this.convo) {
-        throw new Error('Convo: could not find convo')
+        throw new Error('could not find convo')
       }
       if (!this.sender) {
-        throw new Error('Convo: could not find sender in convo')
+        throw new Error('could not find sender in convo')
       }
       if (!this.recipients) {
-        throw new Error('Convo: could not find recipients in convo')
+        throw new Error('could not find recipients in convo')
       }
 
       const userIsDisabled = Boolean(this.sender.chatDisabled)
···
         this.dispatch({event: ConvoDispatchEvent.Ready})
       }
     } catch (e: any) {
-      logger.error(e, {message: 'Convo: setup failed'})
+      if (!isNetworkError(e)) {
+        logger.error('setup failed', {
+          safeMessage: e.message,
+        })
+      }
 
       this.dispatch({
         event: ConvoDispatchEvent.Error,
···
       this.sender = sender || this.sender
       this.recipients = recipients || this.recipients
     } catch (e: any) {
-      logger.error(e, {message: `Convo: failed to refresh convo`})
+      if (!isNetworkError(e)) {
+        logger.error(`failed to refresh convo`, {
+          safeMessage: e.message,
+        })
+      }
     }
   }
 
···
       }
     | undefined
   async fetchMessageHistory() {
-    logger.debug('Convo: fetch message history', {})
+    logger.debug('fetch message history', {})
 
     /*
      * If oldestRev is null, we've fetched all history.
···
         }
       }
     } catch (e: any) {
-      logger.error('Convo: failed to fetch message history')
+      if (!isNetworkError(e)) {
+        logger.error('failed to fetch message history', {
+          safeMessage: e.message,
+        })
+      }
 
       this.fetchMessageHistoryError = {
         retry: () => {
···
     // Ignore empty messages for now since they have no other purpose atm
     if (!message.text.trim() && !message.embed) return
 
-    logger.debug('Convo: send message', {})
+    logger.debug('send message', {})
 
     const tempId = nanoid()
 
···
 
   async processPendingMessages() {
     logger.debug(
-      `Convo: processing messages (${this.pendingMessages.size} remaining)`,
+      `processing messages (${this.pendingMessages.size} remaining)`,
       {},
     )
 
···
       // continue queue processing
       await this.processPendingMessages()
     } catch (e: any) {
-      logger.error(e, {message: `Convo: failed to send message`})
       this.handleSendMessageFailure(e)
       this.isProcessingPendingMessages = false
     }
···
           case 'recipient has disabled incoming messages':
             break
           default:
-            logger.warn(
-              `Convo handleSendMessageFailure could not handle error`,
-              {
+            if (!isNetworkError(e)) {
+              logger.warn(`handleSendMessageFailure could not handle error`, {
                 status: e.status,
                 message: e.message,
-              },
-            )
+              })
+            }
             break
         }
       }
     } else {
       this.pendingMessageFailure = 'unrecoverable'
-      logger.error(e, {
-        message: `Convo handleSendMessageFailure received unknown error`,
-      })
+
+      if (!isNetworkError(e)) {
+        logger.error(`handleSendMessageFailure received unknown error`, {
+          safeMessage: e.message,
+        })
+      }
     }
 
     this.commit()
···
     this.commit()
 
     logger.debug(
-      `Convo: batch retrying ${this.pendingMessages.size} pending messages`,
+      `batch retrying ${this.pendingMessages.size} pending messages`,
       {},
     )
 
···
 
       this.commit()
 
-      logger.debug(
-        `Convo: sent ${this.pendingMessages.size} pending messages`,
-        {},
-      )
+      logger.debug(`sent ${this.pendingMessages.size} pending messages`, {})
     } catch (e: any) {
-      logger.error(e, {message: `Convo: failed to batch retry messages`})
       this.handleSendMessageFailure(e)
     }
   }
 
   async deleteMessage(messageId: string) {
-    logger.debug('Convo: delete message', {})
+    logger.debug('delete message', {})
 
     this.deletedMessages.add(messageId)
     this.commit()
···
         )
       })
     } catch (e: any) {
-      logger.error(e, {message: `Convo: failed to delete message`})
+      if (!isNetworkError(e)) {
+        logger.error(`failed to delete message`, {
+          safeMessage: e.message,
+        })
+      }
       this.deletedMessages.delete(messageId)
       this.commit()
       throw e
···
     }
 
     try {
-      logger.info(`Adding reaction ${emoji} to message ${messageId}`)
+      logger.debug(`Adding reaction ${emoji} to message ${messageId}`)
       const {data} = await this.agent.chat.bsky.convo.addReaction(
         {messageId, value: emoji, convoId: this.convoId},
         {encoding: 'application/json', headers: DM_SERVICE_HEADERS},
···
     }
 
     try {
-      logger.info(`Removing reaction ${emoji} from message ${messageId}`)
+      logger.debug(`Removing reaction ${emoji} from message ${messageId}`)
       await this.agent.chat.bsky.convo.removeReaction(
         {messageId, value: emoji, convoId: this.convoId},
         {encoding: 'application/json', headers: DM_SERVICE_HEADERS},

src/state/messages/events/agent.ts

···
 import {nanoid} from 'nanoid/non-secure'
 
 import {networkRetry} from '#/lib/async/retry'
+import {isNetworkError} from '#/lib/strings/errors'
 import {Logger} from '#/logger'
 import {
   BACKGROUND_POLL_INTERVAL,
···
 } from '#/state/messages/events/types'
 import {DM_SERVICE_HEADERS} from '#/state/queries/messages/const'
 
-const LOGGER_CONTEXT = 'MessagesEventBus'
 const logger = Logger.create(Logger.Context.DMsAgent)
 
 export class MessagesEventBus {
···
   }
 
   background() {
-    logger.debug(`${LOGGER_CONTEXT}: background`, {})
+    logger.debug(`background`, {})
     this.dispatch({event: MessagesEventBusDispatchEvent.Background})
   }
 
   suspend() {
-    logger.debug(`${LOGGER_CONTEXT}: suspend`, {})
+    logger.debug(`suspend`, {})
     this.dispatch({event: MessagesEventBusDispatchEvent.Suspend})
   }
 
   resume() {
-    logger.debug(`${LOGGER_CONTEXT}: resume`, {})
+    logger.debug(`resume`, {})
     this.dispatch({event: MessagesEventBusDispatchEvent.Resume})
   }
 
···
         break
     }
 
-    logger.debug(`${LOGGER_CONTEXT}: dispatch '${action.event}'`, {
+    logger.debug(`dispatch '${action.event}'`, {
       id: this.id,
       prev: prevStatus,
       next: this.status,
···
   }
 
   private async init() {
-    logger.debug(`${LOGGER_CONTEXT}: init`, {})
+    logger.debug(`init`, {})
 
     try {
       const response = await networkRetry(2, () => {
···
 
       this.dispatch({event: MessagesEventBusDispatchEvent.Ready})
     } catch (e: any) {
-      logger.error(e, {
-        message: `${LOGGER_CONTEXT}: init failed`,
-      })
+      if (!isNetworkError(e)) {
+        logger.error(`init failed`, {
+          safeMessage: e.message,
+        })
+      }
 
       this.dispatch({
         event: MessagesEventBusDispatchEvent.Error,
···
     this.isPolling = true
 
     // logger.debug(
-    //   `${LOGGER_CONTEXT}: poll`,
+    //   `poll`,
     //   {
     //     requestedPollIntervals: Array.from(
     //       this.requestedPollIntervals.values(),
···
       }
 
       if (needsEmit) {
-        try {
-          this.emitter.emit('event', {type: 'logs', logs: batch})
-        } catch (e: any) {
-          logger.error(e, {
-            message: `${LOGGER_CONTEXT}: process latest events`,
-          })
-        }
+        this.emitter.emit('event', {type: 'logs', logs: batch})
       }
     } catch (e: any) {
-      logger.error(e, {message: `${LOGGER_CONTEXT}: poll events failed`})
+      if (!isNetworkError(e)) {
+        logger.error(`poll events failed`, {
+          safeMessage: e.message,
+        })
+      }
 
       this.dispatch({
         event: MessagesEventBusDispatchEvent.Error,

src/state/queries/notifications/settings.ts

···
 const RQKEY_ROOT = 'notification-settings'
 const RQKEY = [RQKEY_ROOT]
 
-export function useNotificationSettingsQuery() {
+export function useNotificationSettingsQuery({
+  enabled,
+}: {enabled?: boolean} = {}) {
   const agent = useAgent()
 
   return useQuery({
···
       const response = await agent.app.bsky.notification.getPreferences()
       return response.data.preferences
     },
+    enabled,
   })
 }
 export function useNotificationSettingsUpdateMutation() {

src/state/queries/postgate/index.ts

···
 import {
   AppBskyEmbedRecord,
   AppBskyEmbedRecordWithMedia,
-  AppBskyFeedDefs,
+  type AppBskyFeedDefs,
   AppBskyFeedPostgate,
   AtUri,
-  BskyAgent,
+  type BskyAgent,
 } from '@atproto/api'
 import {useMutation, useQuery, useQueryClient} from '@tanstack/react-query'
 
···
     staleTime: STALE.SECONDS.THIRTY,
     queryKey: createPostgateQueryKey(postUri),
     async queryFn() {
-      return (await getPostgateRecord({agent, postUri})) ?? null
+      return await getPostgateRecord({agent, postUri}).then(res => res ?? null)
     },
   })
 }

src/view/com/notifications/NotificationFeed.tsx

···
 import {useNotificationFeedQuery} from '#/state/queries/notifications/feed'
 import {EmptyState} from '#/view/com/util/EmptyState'
 import {ErrorMessage} from '#/view/com/util/error/ErrorMessage'
-import {List, type ListRef} from '#/view/com/util/List'
+import {List, type ListProps, type ListRef} from '#/view/com/util/List'
 import {NotificationFeedLoadingPlaceholder} from '#/view/com/util/LoadingPlaceholder'
 import {LoadMoreRetryBtn} from '#/view/com/util/LoadMoreRetryBtn'
 import {NotificationFeedItem} from './NotificationFeedItem'
···
   scrollElRef?: ListRef
   onPressTryAgain?: () => void
   onScrolledDownChange: (isScrolledDown: boolean) => void
-  ListHeaderComponent?: () => JSX.Element
+  ListHeaderComponent?: ListProps['ListHeaderComponent']
   refreshNotifications: () => Promise<void>
 }) {
   const initialNumToRender = useInitialNumToRender()

src/view/com/util/List.tsx

···
 import React, {memo} from 'react'
-import {RefreshControl, ViewToken} from 'react-native'
+import {RefreshControl, type ViewToken} from 'react-native'
 import {
-  FlatListPropsWithLayout,
+  type FlatListPropsWithLayout,
   runOnJS,
   useSharedValue,
 } from 'react-native-reanimated'
···
 import {useDedupe} from '#/lib/hooks/useDedupe'
 import {useScrollHandlers} from '#/lib/ScrollContext'
 import {addStyle} from '#/lib/styles'
-import {isAndroid, isIOS} from '#/platform/detection'
+import {isIOS} from '#/platform/detection'
 import {useLightbox} from '#/state/lightbox'
 import {useTheme} from '#/alf'
 import {FlatList_INTERNAL} from './Views'
···
 
     return (
       <FlatList_INTERNAL
-        showsVerticalScrollIndicator={!isAndroid} // overridable
+        showsVerticalScrollIndicator // overridable
         onViewableItemsChanged={onViewableItemsChanged}
         viewabilityConfig={viewabilityConfig}
         {...props}

src/view/screens/Notifications.tsx

···
-import React from 'react'
+import {useCallback, useEffect, useMemo, useRef, useState} from 'react'
 import {View} from 'react-native'
 import {msg, Trans} from '@lingui/macro'
 import {useLingui} from '@lingui/react'
···
 import {isNative} from '#/platform/detection'
 import {emitSoftReset, listenSoftReset} from '#/state/events'
 import {RQKEY as NOTIFS_RQKEY} from '#/state/queries/notifications/feed'
+import {useNotificationSettingsQuery} from '#/state/queries/notifications/settings'
 import {
   useUnreadNotifications,
   useUnreadNotificationsApi,
···
 import {type ListMethods} from '#/view/com/util/List'
 import {LoadLatestBtn} from '#/view/com/util/load-latest/LoadLatestBtn'
 import {MainScrollProvider} from '#/view/com/util/MainScrollProvider'
-import {atoms as a} from '#/alf'
+import {atoms as a, useTheme} from '#/alf'
 import {web} from '#/alf'
+import {Admonition} from '#/components/Admonition'
 import {ButtonIcon} from '#/components/Button'
 import {SettingsGear2_Stroke2_Corner0_Rounded as SettingsIcon} from '#/components/icons/SettingsGear2'
 import * as Layout from '#/components/Layout'
-import {Link} from '#/components/Link'
+import {InlineLinkText, Link} from '#/components/Link'
 import {Loader} from '#/components/Loader'
 
 // We don't currently persist this across reloads since
···
   const unreadNotifs = useUnreadNotifications()
   const hasNew = !!unreadNotifs
   const {checkUnread: checkUnreadAll} = useUnreadNotificationsApi()
-  const [isLoadingAll, setIsLoadingAll] = React.useState(false)
-  const [isLoadingMentions, setIsLoadingMentions] = React.useState(false)
+  const [isLoadingAll, setIsLoadingAll] = useState(false)
+  const [isLoadingMentions, setIsLoadingMentions] = useState(false)
   const initialActiveTab = lastActiveTab
-  const [activeTab, setActiveTab] = React.useState(initialActiveTab)
+  const [activeTab, setActiveTab] = useState(initialActiveTab)
   const isLoading = activeTab === 0 ? isLoadingAll : isLoadingMentions
 
-  const onPageSelected = React.useCallback(
+  const onPageSelected = useCallback(
     (index: number) => {
       setActiveTab(index)
       lastActiveTab = index
···
   )
 
   const queryClient = useQueryClient()
-  const checkUnreadMentions = React.useCallback(
+  const checkUnreadMentions = useCallback(
     async ({invalidate}: {invalidate: boolean}) => {
       if (invalidate) {
         return truncateAndInvalidate(queryClient, NOTIFS_RQKEY('mentions'))
···
     [queryClient],
   )
 
-  const sections = React.useMemo(() => {
+  const sections = useMemo(() => {
     return [
       {
         title: _(msg`All`),
···
 }) {
   const {_} = useLingui()
   const setMinimalShellMode = useSetMinimalShellMode()
-  const [isScrolledDown, setIsScrolledDown] = React.useState(false)
-  const scrollElRef = React.useRef<ListMethods>(null)
+  const [isScrolledDown, setIsScrolledDown] = useState(false)
+  const scrollElRef = useRef<ListMethods>(null)
   const queryClient = useQueryClient()
   const isScreenFocused = useIsFocused()
   const isFocusedAndActive = isScreenFocused && isActive
 
   // event handlers
   // =
-  const scrollToTop = React.useCallback(() => {
+  const scrollToTop = useCallback(() => {
     scrollElRef.current?.scrollToOffset({animated: isNative, offset: 0})
     setMinimalShellMode(false)
   }, [scrollElRef, setMinimalShellMode])
 
-  const onPressLoadLatest = React.useCallback(() => {
+  const onPressLoadLatest = useCallback(() => {
     scrollToTop()
     if (hasNew) {
       // render what we have now
···
   // on-visible setup
   // =
   useFocusEffect(
-    React.useCallback(() => {
+    useCallback(() => {
       if (isFocusedAndActive) {
         setMinimalShellMode(false)
         logger.debug('NotificationsScreen: Focus')
···
       }
     }, [setMinimalShellMode, onFocusCheckLatest, isFocusedAndActive]),
   )
-  React.useEffect(() => {
+
+  useEffect(() => {
     if (!isFocusedAndActive) {
       return
     }
···
           refreshNotifications={() => checkUnread({invalidate: true})}
           onScrolledDownChange={setIsScrolledDown}
           scrollElRef={scrollElRef}
+          ListHeaderComponent={
+            filter === 'mentions' ? (
+              <DisabledNotificationsWarning active={isFocusedAndActive} />
+            ) : null
+          }
         />
       </MainScrollProvider>
       {(isScrolledDown || hasNew) && (
···
     </>
   )
 }
+
+function DisabledNotificationsWarning({active}: {active: boolean}) {
+  const t = useTheme()
+  const {_} = useLingui()
+  const {data} = useNotificationSettingsQuery({enabled: active})
+
+  if (!data) return null
+
+  if (!data.reply.list && !data.quote.list && !data.mention.list) {
+    // mention tab notifications are disabled
+    return (
+      <View style={[a.py_md, a.px_lg, a.border_b, t.atoms.border_contrast_low]}>
+        <Admonition type="warning">
+          <Trans>
+            You have completely disabled reply, quote, and mention
+            notifications, so this tab will no longer update. To adjust this,
+            visit your{' '}
+            <InlineLinkText
+              label={_(msg`Visit your notification settings`)}
+              to={{screen: 'NotificationSettings'}}>
+              notification settings
+            </InlineLinkText>
+            .
+          </Trans>
+        </Admonition>
+      </View>
+    )
+  }
+
+  return null
+}

src/view/shell/createNativeStackNavigatorWithAuth.tsx

···
 import {SignupQueued} from '#/screens/SignupQueued'
 import {Takendown} from '#/screens/Takendown'
 import {atoms as a, useLayoutBreakpoints} from '#/alf'
-import {EmailDialog} from '#/components/dialogs/EmailDialog'
-import {InAppBrowserConsentDialog} from '#/components/dialogs/InAppBrowserConsent'
-import {LinkWarningDialog} from '#/components/dialogs/LinkWarning'
-import {MutedWordsDialog} from '#/components/dialogs/MutedWords'
-import {NuxDialogs} from '#/components/dialogs/nuxs'
-import {SigninDialog} from '#/components/dialogs/Signin'
-import {Outlet as PortalOutlet} from '#/components/Portal'
-import {BottomSheetOutlet} from '#/../modules/bottom-sheet'
 import {BottomBarWeb} from './bottom-bar/BottomBarWeb'
 import {DesktopLeftNav} from './desktop/LeftNav'
 import {DesktopRightNav} from './desktop/RightNav'
···
           {!isMobile && <DesktopRightNav routeName={activeRoute.name} />}
         </>
       )}
-
-      {/* Start: individual dialogs and outlets */}
-      <MutedWordsDialog />
-      <SigninDialog />
-      <EmailDialog />
-      <LinkWarningDialog />
-      {!isWeb && <InAppBrowserConsentDialog />}
-      <PortalOutlet />
-      <BottomSheetOutlet />
-      {/* End: individual dialogs and outlets */}
-
-      {/* Start: dialog controllers */}
-      <NuxDialogs />
-      {/* End: dialog controllers */}
     </NavigationContent>
   )
 }

src/view/shell/index.tsx

···
 import {ErrorBoundary} from '#/view/com/util/ErrorBoundary'
 import {atoms as a, select, useTheme} from '#/alf'
 import {setSystemUITheme} from '#/alf/util/systemUI'
+import {EmailDialog} from '#/components/dialogs/EmailDialog'
+import {InAppBrowserConsentDialog} from '#/components/dialogs/InAppBrowserConsent'
+import {LinkWarningDialog} from '#/components/dialogs/LinkWarning'
+import {MutedWordsDialog} from '#/components/dialogs/MutedWords'
+import {SigninDialog} from '#/components/dialogs/Signin'
+import {Outlet as PortalOutlet} from '#/components/Portal'
 import {RoutesContainer, TabsNavigator} from '#/Navigation'
+import {BottomSheetOutlet} from '../../../modules/bottom-sheet'
 import {updateActiveViewAsync} from '../../../modules/expo-bluesky-swiss-army/src/VisibilityView'
 import {Composer} from './Composer'
 import {DrawerContent} from './Drawer'
···
       </View>
       <Composer winHeight={winDim.height} />
       <ModalsContainer />
+      <MutedWordsDialog />
+      <SigninDialog />
+      <EmailDialog />
+      <InAppBrowserConsentDialog />
+      <LinkWarningDialog />
       <Lightbox />
+      <PortalOutlet />
+      <BottomSheetOutlet />
     </>
   )
 }

src/view/shell/index.web.tsx

···
 import {ModalsContainer} from '#/view/com/modals/Modal'
 import {ErrorBoundary} from '#/view/com/util/ErrorBoundary'
 import {atoms as a, select, useTheme} from '#/alf'
+import {EmailDialog} from '#/components/dialogs/EmailDialog'
+import {LinkWarningDialog} from '#/components/dialogs/LinkWarning'
+import {MutedWordsDialog} from '#/components/dialogs/MutedWords'
+import {SigninDialog} from '#/components/dialogs/Signin'
+import {Outlet as PortalOutlet} from '#/components/Portal'
 import {FlatNavigator, RoutesContainer} from '#/Navigation'
 import {Composer} from './Composer.web'
 import {DrawerContent} from './Drawer'
···
       </ErrorBoundary>
       <Composer winHeight={0} />
       <ModalsContainer />
+      <MutedWordsDialog />
+      <SigninDialog />
+      <EmailDialog />
+      <LinkWarningDialog />
       <Lightbox />
+      <PortalOutlet />
 
       {showDrawerDelayedExit && (
         <>

yarn.lock

···
   resolved "https://registry.yarnpkg.com/react-native-is-edge-to-edge/-/react-native-is-edge-to-edge-1.1.6.tgz#69ec13f70d76e9245e275eed4140d0873a78f902"
   integrity sha512-1pHnFTlBahins6UAajXUqeCOHew9l9C2C8tErnpGC3IyLJzvxD+TpYAixnCbrVS52f7+NvMttbiSI290XfwN0w==
 
-react-native-keyboard-controller@^1.17.1:
-  version "1.17.1"
-  resolved "https://registry.yarnpkg.com/react-native-keyboard-controller/-/react-native-keyboard-controller-1.17.1.tgz#46efe148c1bdd0ee22094dcb2660f70f81e6544e"
-  integrity sha512-YM3GYvtkuWimCKkZFURn5hIb1WiKOQqi2DijdwZSF5QSSzGqfqwzEEC3bm1xCN8HGHAEIXAaWIBUsc3Xp5L+Ng==
+react-native-keyboard-controller@^1.17.5:
+  version "1.17.5"
+  resolved "https://registry.yarnpkg.com/react-native-keyboard-controller/-/react-native-keyboard-controller-1.17.5.tgz#a517f0d42f73e69a03e768379934a3bb705595f5"
+  integrity sha512-2bZi4uH/beAcHiQ7nv6sxW03/UpNcnNAPpaSnQtg0cbU3ySThPRETMqr0ZupFLUSZovolyFhyFJLjxmQ7cavJg==
   dependencies:
     react-native-is-edge-to-edge "^1.1.6"