Delete <AppProfiler>

Preconnect to public.api.bsky.app (#7396 )
Add key to invalidate spinner when theme changes (#7351 )
2025-01-08 18:43:24 +00:00 · 2025-01-08 17:21:21 +00:00 · 2025-01-08 00:13:03 +00:00 · 2025-01-07 22:21:58 +00:00 · 2025-01-07 21:14:14 +00:00 · 2025-01-07 21:07:06 +00:00
100 changed files with 17609 additions and 10217 deletions
@@ -19,7 +19,7 @@ jobs:
      - name: Set up Go tooling
        uses: actions/setup-go@v3
        with:
-          go-version: '1.22'
+          go-version: '1.23'
      - name: Dummy Static Files
        run: touch bskyweb/static/js/blah.js && touch bskyweb/static/css/blah.txt && touch bskyweb/static/media/blah.txt
      - name: Check
@@ -36,7 +36,7 @@ jobs:
      - name: Set up Go tooling
        uses: actions/setup-go@v3
        with:
-          go-version: '1.22'
+          go-version: '1.23'
      - name: Dummy Static Files
        run: touch bskyweb/static/js/blah.js && touch bskyweb/static/css/blah.txt && touch bskyweb/static/media/blah.txt
      - name: Lint
@@ -1,4 +1,4 @@
-FROM golang:1.22-bullseye AS build-env
+FROM golang:1.23-bullseye AS build-env

 WORKDIR /usr/src/social-app

@@ -1,4 +1,4 @@
-FROM golang:1.22-bullseye AS build-env
+FROM golang:1.23-bullseye AS build-env

 WORKDIR /usr/src/social-app

@@ -50,7 +50,6 @@ module.exports = function (config) {
      runtimeVersion: {
        policy: 'appVersion',
      },
-      orientation: 'portrait',
      icon: './assets/app-icons/ios_icon_default_light.png',
      userInterfaceStyle: 'automatic',
      primaryColor: '#1083fe',
@@ -77,6 +76,7 @@ module.exports = function (config) {
            'ast',
            'ca',
            'de',
+            'el',
            'es',
            'fi',
            'fr',
@@ -89,8 +89,8 @@ module.exports = function (config) {
            'ja',
            'km',
            'ko',
+            'ne',
            'nl',
-            'np',
            'pl',
            'pt-BR',
            'ro',
@@ -346,6 +346,7 @@ module.exports = function (config) {
            },
          },
        ],
+        ['expo-screen-orientation', {initialOrientation: 'PORTRAIT_UP'}],
      ].filter(Boolean),
      extra: {
        eas: {
@@ -4,6 +4,7 @@
  <meta charset="UTF-8">
  <meta name="viewport" content="width=device-width, initial-scale=1.0">
  <title>Bluesky Embed</title>
+  <link rel="preconnect" href="https://public.api.bsky.app">
  <link rel="apple-touch-icon" sizes="180x180" href="/static/apple-touch-icon.png">
  <link rel="icon" type="image/png" sizes="32x32" href="/static/favicon-32x32.png">
  <link rel="icon" type="image/png" sizes="16x16" href="/static/favicon-16x16.png">
@@ -4,6 +4,7 @@
  <meta charset="UTF-8">
  <meta name="viewport" content="width=device-width, initial-scale=1.0">
  <title>Bluesky Embed</title>
+  <link rel="preconnect" href="https://public.api.bsky.app">
  <link rel="apple-touch-icon" sizes="180x180" href="/static/apple-touch-icon.png">
  <link rel="icon" type="image/png" sizes="32x32" href="/static/favicon-32x32.png">
  <link rel="icon" type="image/png" sizes="16x16" href="/static/favicon-16x16.png">
@@ -24,7 +24,7 @@ Then build and copy over the big 'ol `bundle.web.js` file:

 ### Golang Daemon

-Install golang. We are generally using v1.22+.
+Install golang. We generally develop against the current stable release of the language, as declared in `go.mod`.

 In this directory (`bskyweb/`):

@@ -1,8 +1,8 @@
 module github.com/bluesky-social/social-app/bskyweb

-go 1.22
+go 1.23

-toolchain go1.22.4
+toolchain go1.23.4

 require (
 	github.com/bluesky-social/indigo v0.0.0-20240624223826-fd66f93ce141
@@ -13,7 +13,7 @@

  <!-- Hello Humans! API docs at https://atproto.com -->

-  <link rel="preload" as="font" type="font/ttf" href="{{ staticCDNHost }}/static/media/InterVariable.c504db5c06caaf7cdfba.woff2">
+  <link rel="preload" as="font" type="font/woff2" href="{{ staticCDNHost }}/static/media/InterVariable.c504db5c06caaf7cdfba.woff2" crossorigin>

  <style>
    /**
@@ -6,6 +6,7 @@ module.exports = {
    'ast',
    'ca',
    'de',
+    'el',
    'en-GB',
    'es',
    'fi',
@@ -19,8 +20,8 @@ module.exports = {
    'ja',
    'km',
    'ko',
+    'ne',
    'nl',
-    'np',
    'pl',
    'pt-BR',
    'ro',
@@ -1,6 +1,6 @@
 {
  "name": "bsky.app",
-  "version": "1.96.0",
+  "version": "1.97.0",
  "private": true,
  "engines": {
    "node": ">=20"
@@ -62,7 +62,6 @@
    "@expo/webpack-config": "^19.0.0",
    "@floating-ui/dom": "^1.6.3",
    "@floating-ui/react-dom": "^2.0.8",
-    "@formatjs/intl-datetimeformat": "^6.17.1",
    "@formatjs/intl-locale": "^4.2.8",
    "@formatjs/intl-numberformat": "^8.15.1",
    "@formatjs/intl-pluralrules": "^5.4.1",
@@ -70,10 +69,10 @@
    "@fortawesome/free-regular-svg-icons": "^6.1.1",
    "@fortawesome/free-solid-svg-icons": "^6.1.1",
    "@fortawesome/react-native-fontawesome": "^0.3.2",
-    "@haileyok/bluesky-video": "0.2.4",
+    "@haileyok/bluesky-video": "0.2.6",
    "@ipld/dag-cbor": "^9.2.0",
    "@lingui/react": "^4.14.1",
-    "@mattermost/react-native-paste-input": "^0.7.1",
+    "@mattermost/react-native-paste-input": "^0.8.1",
    "@miblanchard/react-native-slider": "^2.3.1",
    "@mozzius/expo-dynamic-app-icon": "^1.5.0",
    "@radix-ui/react-dismissable-layer": "^1.1.1",
@@ -139,6 +138,7 @@
    "expo-media-library": "~17.0.3",
    "expo-navigation-bar": "~4.0.4",
    "expo-notifications": "~0.29.11",
+    "expo-screen-orientation": "^8.0.2",
    "expo-sharing": "^13.0.0",
    "expo-splash-screen": "~0.29.18",
    "expo-status-bar": "~2.0.0",
@@ -171,7 +171,7 @@
    "react-native": "0.76.3",
    "react-native-compressor": "1.10.3",
    "react-native-date-picker": "^5.0.7",
-    "react-native-drawer-layout": "^4.0.4",
+    "react-native-drawer-layout": "^4.1.1",
    "react-native-gesture-handler": "2.20.2",
    "react-native-get-random-values": "~1.11.0",
    "react-native-image-crop-picker": "^0.41.6",
@@ -1,16 +0,0 @@
-diff --git a/node_modules/@mattermost/react-native-paste-input/ios/PasteInputView.m b/node_modules/@mattermost/react-native-paste-input/ios/PasteInputView.m
-index e916023..0564d97 100644
--- a/node_modules/@mattermost/react-native-paste-input/ios/PasteInputView.m
-+++ b/node_modules/@mattermost/react-native-paste-input/ios/PasteInputView.m
-@@ -22,6 +22,11 @@ - (instancetype)initWithBridge:(RCTBridge *)bridge
-     _backedTextInputView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
-     _backedTextInputView.textInputDelegate = self;
-
-+    // Disable inline predictions to prevent jank in the composer
-+    if (@available(iOS 17.0, *)) {
-+      _backedTextInputView.inlinePredictionType = UITextInlinePredictionTypeNo;
-+    }
-+
-     [self addSubview:_backedTextInputView];
-   }
-
@@ -0,0 +1,160 @@
+diff --git a/node_modules/@mattermost/react-native-paste-input/ios/PasteInputView.m b/node_modules/@mattermost/react-native-paste-input/ios/PasteInputView.m
+index e916023..9968f3c 100644
+--- a/node_modules/@mattermost/react-native-paste-input/ios/PasteInputView.m
+++ b/node_modules/@mattermost/react-native-paste-input/ios/PasteInputView.m
+@@ -3,58 +3,87 @@
+ //  PasteInput
+ //
+ //  Created by Elias Nahum on 04-11-20.
+-//  Copyright © 2020 Facebook. All rights reserved.
+//  Updated to remove parent’s default text view
+ //
+ 
+ #import "PasteInputView.h"
+ #import "PasteInputTextView.h"
+-#import <React/RCTUtils.h>
+#import <React/RCTUtils.h> // for RCTDirectEventBlock, etc.
+ 
+ @implementation PasteInputView
+ {
+-    PasteInputTextView *_backedTextInputView;
+  // We'll store the custom text view in this ivar
+  PasteInputTextView *_customBackedTextView;
+ }
+ 
+ - (instancetype)initWithBridge:(RCTBridge *)bridge
+ {
+  // Must call the super’s designated initializer
+   if (self = [super initWithBridge:bridge]) {
+-    _backedTextInputView = [[PasteInputTextView alloc] initWithFrame:self.bounds];
+-    _backedTextInputView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
+-    _backedTextInputView.textInputDelegate = self;
+    // 1. The parent (RCTMultilineTextInputView) has already created
+    //    its own _backedTextInputView = [RCTUITextView new] in super init.
+    //    We can remove that subview:
+ 
+-    [self addSubview:_backedTextInputView];
+-  }
+    id<RCTBackedTextInputViewProtocol> parentInputView = super.backedTextInputView;
+    if ([parentInputView isKindOfClass:[UIView class]]) {
+      UIView *parentSubview = (UIView *)parentInputView;
+      if (parentSubview.superview == self) {
+        [parentSubview removeFromSuperview];
+      }
+    }
+ 
+    // 2. Now create our custom PasteInputTextView
+    _customBackedTextView = [[PasteInputTextView alloc] initWithFrame:self.bounds];
+    _customBackedTextView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
+    _customBackedTextView.textInputDelegate = self;
+
+    // Optional: disable inline predictions for iOS 17+
+    if (@available(iOS 17.0, *)) {
+      _customBackedTextView.inlinePredictionType = UITextInlinePredictionTypeNo;
+    }
+
+    // 3. Add your custom text view as the only subview
+    [self addSubview:_customBackedTextView];
+  }
+   return self;
+ }
+ 
+/**
+ * Override the parent's accessor so that anywhere in RN that calls
+ * `self.backedTextInputView` will get the custom PasteInputTextView.
+ */
+ - (id<RCTBackedTextInputViewProtocol>)backedTextInputView
+ {
+-  return _backedTextInputView;
+  return _customBackedTextView;
+ }
+ 
+-- (void)setDisableCopyPaste:(BOOL)disableCopyPaste {
+-    _backedTextInputView.disableCopyPaste = disableCopyPaste;
+#pragma mark - Setters for React Props
+
+- (void)setDisableCopyPaste:(BOOL)disableCopyPaste
+{
+  _customBackedTextView.disableCopyPaste = disableCopyPaste;
+ }
+ 
+-- (void)setOnPaste:(RCTDirectEventBlock)onPaste {
+-    _backedTextInputView.onPaste = onPaste;
+- (void)setOnPaste:(RCTDirectEventBlock)onPaste
+{
+  _customBackedTextView.onPaste = onPaste;
+ }
+ 
+-- (void)setSmartPunctuation:(NSString *)smartPunctuation {
+-    if ([smartPunctuation isEqualToString:@"enable"]) {
+-        [_backedTextInputView setSmartDashesType:UITextSmartDashesTypeYes];
+-        [_backedTextInputView setSmartQuotesType:UITextSmartQuotesTypeYes];
+-        [_backedTextInputView setSmartInsertDeleteType:UITextSmartInsertDeleteTypeYes];
+-    } else if ([smartPunctuation isEqualToString:@"disable"]) {
+-        [_backedTextInputView setSmartDashesType:UITextSmartDashesTypeNo];
+-        [_backedTextInputView setSmartQuotesType:UITextSmartQuotesTypeNo];
+-        [_backedTextInputView setSmartInsertDeleteType:UITextSmartInsertDeleteTypeNo];
+-    } else {
+-        [_backedTextInputView setSmartDashesType:UITextSmartDashesTypeDefault];
+-        [_backedTextInputView setSmartQuotesType:UITextSmartQuotesTypeDefault];
+-        [_backedTextInputView setSmartInsertDeleteType:UITextSmartInsertDeleteTypeDefault];
+-    }
+- (void)setSmartPunctuation:(NSString *)smartPunctuation
+{
+  if ([smartPunctuation isEqualToString:@"enable"]) {
+    [_customBackedTextView setSmartDashesType:UITextSmartDashesTypeYes];
+    [_customBackedTextView setSmartQuotesType:UITextSmartQuotesTypeYes];
+    [_customBackedTextView setSmartInsertDeleteType:UITextSmartInsertDeleteTypeYes];
+  } else if ([smartPunctuation isEqualToString:@"disable"]) {
+    [_customBackedTextView setSmartDashesType:UITextSmartDashesTypeNo];
+    [_customBackedTextView setSmartQuotesType:UITextSmartQuotesTypeNo];
+    [_customBackedTextView setSmartInsertDeleteType:UITextSmartInsertDeleteTypeNo];
+  } else {
+    [_customBackedTextView setSmartDashesType:UITextSmartDashesTypeDefault];
+    [_customBackedTextView setSmartQuotesType:UITextSmartQuotesTypeDefault];
+    [_customBackedTextView setSmartInsertDeleteType:UITextSmartInsertDeleteTypeDefault];
+  }
+ }
+ 
+ #pragma mark - UIScrollViewDelegate
+@@ -62,7 +91,6 @@
+ - (void)scrollViewDidScroll:(UIScrollView *)scrollView
+ {
+   RCTDirectEventBlock onScroll = self.onScroll;
+-
+   if (onScroll) {
+     CGPoint contentOffset = scrollView.contentOffset;
+     CGSize contentSize = scrollView.contentSize;
+@@ -71,22 +99,22 @@
+ 
+     onScroll(@{
+       @"contentOffset": @{
+-        @"x": @(contentOffset.x),
+-        @"y": @(contentOffset.y)
+          @"x": @(contentOffset.x),
+          @"y": @(contentOffset.y)
+       },
+       @"contentInset": @{
+-        @"top": @(contentInset.top),
+-        @"left": @(contentInset.left),
+-        @"bottom": @(contentInset.bottom),
+-        @"right": @(contentInset.right)
+          @"top": @(contentInset.top),
+          @"left": @(contentInset.left),
+          @"bottom": @(contentInset.bottom),
+          @"right": @(contentInset.right)
+       },
+       @"contentSize": @{
+-        @"width": @(contentSize.width),
+-        @"height": @(contentSize.height)
+          @"width": @(contentSize.width),
+          @"height": @(contentSize.height)
+       },
+       @"layoutMeasurement": @{
+-        @"width": @(size.width),
+-        @"height": @(size.height)
+          @"width": @(size.width),
+          @"height": @(size.height)
+       },
+       @"zoomScale": @(scrollView.zoomScale ?: 1),
+     });
@@ -0,0 +1,19 @@
+diff --git a/node_modules/expo-media-library/android/src/main/java/expo/modules/medialibrary/MediaLibraryModule.kt b/node_modules/expo-media-library/android/src/main/java/expo/modules/medialibrary/MediaLibraryModule.kt
+index b928b8f..7175cf6 100644
+--- a/node_modules/expo-media-library/android/src/main/java/expo/modules/medialibrary/MediaLibraryModule.kt
+++ b/node_modules/expo-media-library/android/src/main/java/expo/modules/medialibrary/MediaLibraryModule.kt
+@@ -99,12 +99,12 @@ class MediaLibraryModule : Module() {
+     }
+ 
+     AsyncFunction("createAssetAsync") { localUri: String, promise: Promise ->
+-      throwUnlessPermissionsGranted {
+      //throwUnlessPermissionsGranted {
+         withModuleScope(promise) {
+           CreateAsset(context, localUri, promise)
+             .execute()
+         }
+-      }
+      //}
+     }
+ 
+     AsyncFunction("addAssetsToAlbumAsync") { assetsId: List<String>, albumId: String, copyToAlbum: Boolean, promise: Promise ->
@@ -1,876 +0,0 @@
-diff --git a/node_modules/react-native-drawer-layout/lib/commonjs/index.js b/node_modules/react-native-drawer-layout/lib/commonjs/index.js
-index 3dce76e..6c4b3e5 100644
--- a/node_modules/react-native-drawer-layout/lib/commonjs/index.js
-+++ b/node_modules/react-native-drawer-layout/lib/commonjs/index.js
-@@ -9,6 +9,12 @@ Object.defineProperty(exports, "Drawer", {
-     return _Drawer.Drawer;
-   }
- });
-+Object.defineProperty(exports, "DrawerGestureContext", {
-+  enumerable: true,
-+  get: function () {
-+    return _DrawerGestureContext.DrawerGestureContext;
-+  }
-+});
- Object.defineProperty(exports, "DrawerProgressContext", {
-   enumerable: true,
-   get: function () {
-@@ -21,6 +27,7 @@ Object.defineProperty(exports, "useDrawerProgress", {
-     return _useDrawerProgress.useDrawerProgress;
-   }
- });
-+var _DrawerGestureContext = require("./utils/DrawerGestureContext.js");
- var _DrawerProgressContext = require("./utils/DrawerProgressContext.js");
- var _useDrawerProgress = require("./utils/useDrawerProgress.js");
- var _Drawer = require("./views/Drawer");
-diff --git a/node_modules/react-native-drawer-layout/lib/commonjs/utils/DrawerGestureContext.js b/node_modules/react-native-drawer-layout/lib/commonjs/utils/DrawerGestureContext.js
-new file mode 100644
-index 0000000..de6d793
--- /dev/null
-+++ b/node_modules/react-native-drawer-layout/lib/commonjs/utils/DrawerGestureContext.js
-@@ -0,0 +1,11 @@
-+"use strict";
-+
-+Object.defineProperty(exports, "__esModule", {
-+  value: true
-+});
-+exports.DrawerGestureContext = void 0;
-+var React = _interopRequireWildcard(require("react"));
-+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
-+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
-+const DrawerGestureContext = exports.DrawerGestureContext = /*#__PURE__*/React.createContext(undefined);
-+//# sourceMappingURL=DrawerGestureContext.js.map
-\ No newline at end of file
-diff --git a/node_modules/react-native-drawer-layout/lib/commonjs/views/Drawer.native.js b/node_modules/react-native-drawer-layout/lib/commonjs/views/Drawer.native.js
-index fd65ab8..86a9a6a 100644
--- a/node_modules/react-native-drawer-layout/lib/commonjs/views/Drawer.native.js
-+++ b/node_modules/react-native-drawer-layout/lib/commonjs/views/Drawer.native.js
-@@ -8,6 +8,7 @@ var React = _interopRequireWildcard(require("react"));
- var _reactNative = require("react-native");
- var _reactNativeReanimated = _interopRequireWildcard(require("react-native-reanimated"));
- var _useLatestCallback = _interopRequireDefault(require("use-latest-callback"));
-+var _DrawerGestureContext = require("../utils/DrawerGestureContext.js");
- var _DrawerProgressContext = require("../utils/DrawerProgressContext.js");
- var _getDrawerWidth = require("../utils/getDrawerWidth.js");
- var _GestureHandler = require("./GestureHandler");
-@@ -79,38 +80,38 @@ function Drawer({
-     return () => hideStatusBar(false);
-   }, [isOpen, hideStatusBarOnOpen, statusBarAnimation, hideStatusBar]);
-   const interactionHandleRef = React.useRef(null);
-  const startInteraction = () => {
-+  const startInteraction = React.useCallback(() => {
-     interactionHandleRef.current = _reactNative.InteractionManager.createInteractionHandle();
-  };
-  const endInteraction = () => {
-+  }, []);
-+  const endInteraction = React.useCallback(() => {
-     if (interactionHandleRef.current != null) {
-       _reactNative.InteractionManager.clearInteractionHandle(interactionHandleRef.current);
-       interactionHandleRef.current = null;
-     }
-  };
-  const hideKeyboard = () => {
-+  }, []);
-+  const hideKeyboard = React.useCallback(() => {
-     if (keyboardDismissMode === 'on-drag') {
-       _reactNative.Keyboard.dismiss();
-     }
-  };
-  const onGestureBegin = () => {
-+  }, [keyboardDismissMode]);
-+  const onGestureBegin = React.useCallback(() => {
-     onGestureStart?.();
-     startInteraction();
-     hideKeyboard();
-     hideStatusBar(true);
-  };
-  const onGestureFinish = () => {
-+  }, [onGestureStart, startInteraction, hideKeyboard, hideStatusBar]);
-+  const onGestureFinish = React.useCallback(() => {
-     onGestureEnd?.();
-     endInteraction();
-  };
-  const onGestureAbort = () => {
-+  }, [onGestureEnd, endInteraction]);
-+  const onGestureAbort = React.useCallback(() => {
-     onGestureCancel?.();
-     endInteraction();
-  };
-+  }, [onGestureCancel, endInteraction]);
- 
-   // FIXME: Currently hitSlop is broken when on Android when drawer is on right
-   // https://github.com/software-mansion/react-native-gesture-handler/issues/569
-  const hitSlop = isRight ?
-+  const hitSlop = React.useMemo(() => isRight ?
-   // Extend hitSlop to the side of the screen when drawer is closed
-   // This lets the user drag the drawer from the side of the screen
-   {
-@@ -119,7 +120,7 @@ function Drawer({
-   } : {
-     left: 0,
-     width: isOpen ? undefined : swipeEdgeWidth
-  };
-+  }, [isRight, isOpen, swipeEdgeWidth]);
-   const touchStartX = (0, _reactNativeReanimated.useSharedValue)(0);
-   const touchX = (0, _reactNativeReanimated.useSharedValue)(0);
-   const translationX = (0, _reactNativeReanimated.useSharedValue)(getDrawerTranslationX(open));
-@@ -158,40 +159,43 @@ function Drawer({
-   }, [getDrawerTranslationX, handleAnimationEnd, handleAnimationStart, onClose, onOpen, touchStartX, touchX, translationX]);
-   React.useEffect(() => toggleDrawer(open), [open, toggleDrawer]);
-   const startX = (0, _reactNativeReanimated.useSharedValue)(0);
-  let pan = _GestureHandler.Gesture?.Pan().onBegin(event => {
-    'worklet';
-+  const pan = React.useMemo(() => {
-+    let panGesture = _GestureHandler.Gesture?.Pan().onBegin(event => {
-+      'worklet';
- 
-    startX.value = translationX.value;
-    gestureState.value = event.state;
-    touchStartX.value = event.x;
-  }).onStart(() => {
-    'worklet';
-+      startX.value = translationX.value;
-+      gestureState.value = event.state;
-+      touchStartX.value = event.x;
-+    }).onStart(() => {
-+      'worklet';
- 
-    (0, _reactNativeReanimated.runOnJS)(onGestureBegin)();
-  }).onChange(event => {
-    'worklet';
-+      (0, _reactNativeReanimated.runOnJS)(onGestureBegin)();
-+    }).onChange(event => {
-+      'worklet';
- 
-    touchX.value = event.x;
-    translationX.value = startX.value + event.translationX;
-    gestureState.value = event.state;
-  }).onEnd((event, success) => {
-    'worklet';
-+      touchX.value = event.x;
-+      translationX.value = startX.value + event.translationX;
-+      gestureState.value = event.state;
-+    }).onEnd((event, success) => {
-+      'worklet';
- 
-    gestureState.value = event.state;
-    if (!success) {
-      (0, _reactNativeReanimated.runOnJS)(onGestureAbort)();
-+      gestureState.value = event.state;
-+      if (!success) {
-+        (0, _reactNativeReanimated.runOnJS)(onGestureAbort)();
-+      }
-+      const nextOpen = Math.abs(event.translationX) > SWIPE_MIN_OFFSET && Math.abs(event.translationX) > swipeMinVelocity || Math.abs(event.translationX) > swipeMinDistance ? drawerPosition === 'left' ?
-+      // If swiped to right, open the drawer, otherwise close it
-+      (event.velocityX === 0 ? event.translationX : event.velocityX) > 0 :
-+      // If swiped to left, open the drawer, otherwise close it
-+      (event.velocityX === 0 ? event.translationX : event.velocityX) < 0 : open;
-+      toggleDrawer(nextOpen, event.velocityX);
-+      (0, _reactNativeReanimated.runOnJS)(onGestureFinish)();
-+    }).activeOffsetX([-SWIPE_MIN_OFFSET, SWIPE_MIN_OFFSET]).failOffsetY([-SWIPE_MIN_OFFSET, SWIPE_MIN_OFFSET]).hitSlop(hitSlop).enabled(drawerType !== 'permanent' && swipeEnabled);
-+    if (panGesture && configureGestureHandler) {
-+      panGesture = configureGestureHandler(panGesture);
-     }
-    const nextOpen = Math.abs(event.translationX) > SWIPE_MIN_OFFSET && Math.abs(event.translationX) > swipeMinVelocity || Math.abs(event.translationX) > swipeMinDistance ? drawerPosition === 'left' ?
-    // If swiped to right, open the drawer, otherwise close it
-    (event.velocityX === 0 ? event.translationX : event.velocityX) > 0 :
-    // If swiped to left, open the drawer, otherwise close it
-    (event.velocityX === 0 ? event.translationX : event.velocityX) < 0 : open;
-    toggleDrawer(nextOpen, event.velocityX);
-    (0, _reactNativeReanimated.runOnJS)(onGestureFinish)();
-  }).activeOffsetX([-SWIPE_MIN_OFFSET, SWIPE_MIN_OFFSET]).failOffsetY([-SWIPE_MIN_OFFSET, SWIPE_MIN_OFFSET]).hitSlop(hitSlop).enabled(drawerType !== 'permanent' && swipeEnabled);
-  if (pan && configureGestureHandler) {
-    pan = configureGestureHandler(pan);
-  }
-+    return panGesture;
-+  }, [configureGestureHandler, drawerPosition, drawerType, gestureState, hitSlop, onGestureBegin, onGestureAbort, onGestureFinish, open, startX, swipeEnabled, swipeMinDistance, swipeMinVelocity, toggleDrawer, touchStartX, touchX, translationX]);
-   const translateX = (0, _reactNativeReanimated.useDerivedValue)(() => {
-     // Comment stolen from react-native-gesture-handler/DrawerLayout
-     //
-@@ -254,35 +258,38 @@ function Drawer({
-     style: [styles.container, style],
-     children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_DrawerProgressContext.DrawerProgressContext.Provider, {
-       value: progress,
-      children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_GestureHandler.GestureDetector, {
-        gesture: pan,
-        children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_reactNativeReanimated.default.View, {
-          style: [styles.main, {
-            flexDirection: drawerType === 'permanent' ? isRight && direction === 'ltr' || !isRight && direction === 'rtl' ? 'row' : 'row-reverse' : 'row'
-          }],
-          children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)(_reactNativeReanimated.default.View, {
-            style: [styles.content, contentAnimatedStyle],
-            children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.View, {
-              accessibilityElementsHidden: isOpen && drawerType !== 'permanent',
-              importantForAccessibility: isOpen && drawerType !== 'permanent' ? 'no-hide-descendants' : 'auto',
-              style: styles.content,
-              children: children
-            }), drawerType !== 'permanent' ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_Overlay.Overlay, {
-              open: open,
-              progress: progress,
-              onPress: () => toggleDrawer(false),
-              style: overlayStyle,
-              accessibilityLabel: overlayAccessibilityLabel
-            }) : null]
-          }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNativeReanimated.default.View, {
-            removeClippedSubviews: _reactNative.Platform.OS !== 'ios',
-            style: [styles.drawer, {
-              width: drawerWidth,
-              position: drawerType === 'permanent' ? 'relative' : 'absolute',
-              zIndex: drawerType === 'back' ? -1 : 0
-            }, drawerAnimatedStyle, drawerStyle],
-            children: renderDrawerContent()
-          })]
-+      children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_DrawerGestureContext.DrawerGestureContext.Provider, {
-+        value: pan,
-+        children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_GestureHandler.GestureDetector, {
-+          gesture: pan,
-+          children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_reactNativeReanimated.default.View, {
-+            style: [styles.main, {
-+              flexDirection: drawerType === 'permanent' ? isRight && direction === 'ltr' || !isRight && direction === 'rtl' ? 'row' : 'row-reverse' : 'row'
-+            }],
-+            children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)(_reactNativeReanimated.default.View, {
-+              style: [styles.content, contentAnimatedStyle],
-+              children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.View, {
-+                accessibilityElementsHidden: isOpen && drawerType !== 'permanent',
-+                importantForAccessibility: isOpen && drawerType !== 'permanent' ? 'no-hide-descendants' : 'auto',
-+                style: styles.content,
-+                children: children
-+              }), drawerType !== 'permanent' ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_Overlay.Overlay, {
-+                open: open,
-+                progress: progress,
-+                onPress: () => toggleDrawer(false),
-+                style: overlayStyle,
-+                accessibilityLabel: overlayAccessibilityLabel
-+              }) : null]
-+            }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNativeReanimated.default.View, {
-+              removeClippedSubviews: _reactNative.Platform.OS !== 'ios',
-+              style: [styles.drawer, {
-+                width: drawerWidth,
-+                position: drawerType === 'permanent' ? 'relative' : 'absolute',
-+                zIndex: drawerType === 'back' ? -1 : 0
-+              }, drawerAnimatedStyle, drawerStyle],
-+              children: renderDrawerContent()
-+            })]
-+          })
-         })
-       })
-     })
-diff --git a/node_modules/react-native-drawer-layout/lib/module/index.js b/node_modules/react-native-drawer-layout/lib/module/index.js
-index a600e51..f08275c 100644
--- a/node_modules/react-native-drawer-layout/lib/module/index.js
-+++ b/node_modules/react-native-drawer-layout/lib/module/index.js
-@@ -1,5 +1,6 @@
- "use strict";
- 
-+export { DrawerGestureContext } from "./utils/DrawerGestureContext.js";
- export { DrawerProgressContext } from "./utils/DrawerProgressContext.js";
- export { useDrawerProgress } from "./utils/useDrawerProgress.js";
- export { Drawer } from './views/Drawer';
-diff --git a/node_modules/react-native-drawer-layout/lib/module/utils/DrawerGestureContext.js b/node_modules/react-native-drawer-layout/lib/module/utils/DrawerGestureContext.js
-new file mode 100644
-index 0000000..1adaa9c
--- /dev/null
-+++ b/node_modules/react-native-drawer-layout/lib/module/utils/DrawerGestureContext.js
-@@ -0,0 +1,5 @@
-+"use strict";
-+
-+import * as React from 'react';
-+export const DrawerGestureContext = /*#__PURE__*/React.createContext(undefined);
-+//# sourceMappingURL=DrawerGestureContext.js.map
-\ No newline at end of file
-diff --git a/node_modules/react-native-drawer-layout/lib/module/views/Drawer.native.js b/node_modules/react-native-drawer-layout/lib/module/views/Drawer.native.js
-index 6d07126..981d9f8 100644
--- a/node_modules/react-native-drawer-layout/lib/module/views/Drawer.native.js
-+++ b/node_modules/react-native-drawer-layout/lib/module/views/Drawer.native.js
-@@ -4,6 +4,7 @@ import * as React from 'react';
- import { I18nManager, InteractionManager, Keyboard, Platform, StatusBar, StyleSheet, useWindowDimensions, View } from 'react-native';
- import Animated, { interpolate, ReduceMotion, runOnJS, useAnimatedStyle, useDerivedValue, useSharedValue, withSpring } from 'react-native-reanimated';
- import useLatestCallback from 'use-latest-callback';
-+import { DrawerGestureContext } from "../utils/DrawerGestureContext.js";
- import { DrawerProgressContext } from "../utils/DrawerProgressContext.js";
- import { getDrawerWidth } from "../utils/getDrawerWidth.js";
- import { Gesture, GestureDetector, GestureHandlerRootView, GestureState } from './GestureHandler';
-@@ -72,38 +73,38 @@ export function Drawer({
-     return () => hideStatusBar(false);
-   }, [isOpen, hideStatusBarOnOpen, statusBarAnimation, hideStatusBar]);
-   const interactionHandleRef = React.useRef(null);
-  const startInteraction = () => {
-+  const startInteraction = React.useCallback(() => {
-     interactionHandleRef.current = InteractionManager.createInteractionHandle();
-  };
-  const endInteraction = () => {
-+  }, []);
-+  const endInteraction = React.useCallback(() => {
-     if (interactionHandleRef.current != null) {
-       InteractionManager.clearInteractionHandle(interactionHandleRef.current);
-       interactionHandleRef.current = null;
-     }
-  };
-  const hideKeyboard = () => {
-+  }, []);
-+  const hideKeyboard = React.useCallback(() => {
-     if (keyboardDismissMode === 'on-drag') {
-       Keyboard.dismiss();
-     }
-  };
-  const onGestureBegin = () => {
-+  }, [keyboardDismissMode]);
-+  const onGestureBegin = React.useCallback(() => {
-     onGestureStart?.();
-     startInteraction();
-     hideKeyboard();
-     hideStatusBar(true);
-  };
-  const onGestureFinish = () => {
-+  }, [onGestureStart, startInteraction, hideKeyboard, hideStatusBar]);
-+  const onGestureFinish = React.useCallback(() => {
-     onGestureEnd?.();
-     endInteraction();
-  };
-  const onGestureAbort = () => {
-+  }, [onGestureEnd, endInteraction]);
-+  const onGestureAbort = React.useCallback(() => {
-     onGestureCancel?.();
-     endInteraction();
-  };
-+  }, [onGestureCancel, endInteraction]);
- 
-   // FIXME: Currently hitSlop is broken when on Android when drawer is on right
-   // https://github.com/software-mansion/react-native-gesture-handler/issues/569
-  const hitSlop = isRight ?
-+  const hitSlop = React.useMemo(() => isRight ?
-   // Extend hitSlop to the side of the screen when drawer is closed
-   // This lets the user drag the drawer from the side of the screen
-   {
-@@ -112,7 +113,7 @@ export function Drawer({
-   } : {
-     left: 0,
-     width: isOpen ? undefined : swipeEdgeWidth
-  };
-+  }, [isRight, isOpen, swipeEdgeWidth]);
-   const touchStartX = useSharedValue(0);
-   const touchX = useSharedValue(0);
-   const translationX = useSharedValue(getDrawerTranslationX(open));
-@@ -151,40 +152,43 @@ export function Drawer({
-   }, [getDrawerTranslationX, handleAnimationEnd, handleAnimationStart, onClose, onOpen, touchStartX, touchX, translationX]);
-   React.useEffect(() => toggleDrawer(open), [open, toggleDrawer]);
-   const startX = useSharedValue(0);
-  let pan = Gesture?.Pan().onBegin(event => {
-    'worklet';
-+  const pan = React.useMemo(() => {
-+    let panGesture = Gesture?.Pan().onBegin(event => {
-+      'worklet';
- 
-    startX.value = translationX.value;
-    gestureState.value = event.state;
-    touchStartX.value = event.x;
-  }).onStart(() => {
-    'worklet';
-+      startX.value = translationX.value;
-+      gestureState.value = event.state;
-+      touchStartX.value = event.x;
-+    }).onStart(() => {
-+      'worklet';
- 
-    runOnJS(onGestureBegin)();
-  }).onChange(event => {
-    'worklet';
-+      runOnJS(onGestureBegin)();
-+    }).onChange(event => {
-+      'worklet';
- 
-    touchX.value = event.x;
-    translationX.value = startX.value + event.translationX;
-    gestureState.value = event.state;
-  }).onEnd((event, success) => {
-    'worklet';
-+      touchX.value = event.x;
-+      translationX.value = startX.value + event.translationX;
-+      gestureState.value = event.state;
-+    }).onEnd((event, success) => {
-+      'worklet';
- 
-    gestureState.value = event.state;
-    if (!success) {
-      runOnJS(onGestureAbort)();
-+      gestureState.value = event.state;
-+      if (!success) {
-+        runOnJS(onGestureAbort)();
-+      }
-+      const nextOpen = Math.abs(event.translationX) > SWIPE_MIN_OFFSET && Math.abs(event.translationX) > swipeMinVelocity || Math.abs(event.translationX) > swipeMinDistance ? drawerPosition === 'left' ?
-+      // If swiped to right, open the drawer, otherwise close it
-+      (event.velocityX === 0 ? event.translationX : event.velocityX) > 0 :
-+      // If swiped to left, open the drawer, otherwise close it
-+      (event.velocityX === 0 ? event.translationX : event.velocityX) < 0 : open;
-+      toggleDrawer(nextOpen, event.velocityX);
-+      runOnJS(onGestureFinish)();
-+    }).activeOffsetX([-SWIPE_MIN_OFFSET, SWIPE_MIN_OFFSET]).failOffsetY([-SWIPE_MIN_OFFSET, SWIPE_MIN_OFFSET]).hitSlop(hitSlop).enabled(drawerType !== 'permanent' && swipeEnabled);
-+    if (panGesture && configureGestureHandler) {
-+      panGesture = configureGestureHandler(panGesture);
-     }
-    const nextOpen = Math.abs(event.translationX) > SWIPE_MIN_OFFSET && Math.abs(event.translationX) > swipeMinVelocity || Math.abs(event.translationX) > swipeMinDistance ? drawerPosition === 'left' ?
-    // If swiped to right, open the drawer, otherwise close it
-    (event.velocityX === 0 ? event.translationX : event.velocityX) > 0 :
-    // If swiped to left, open the drawer, otherwise close it
-    (event.velocityX === 0 ? event.translationX : event.velocityX) < 0 : open;
-    toggleDrawer(nextOpen, event.velocityX);
-    runOnJS(onGestureFinish)();
-  }).activeOffsetX([-SWIPE_MIN_OFFSET, SWIPE_MIN_OFFSET]).failOffsetY([-SWIPE_MIN_OFFSET, SWIPE_MIN_OFFSET]).hitSlop(hitSlop).enabled(drawerType !== 'permanent' && swipeEnabled);
-  if (pan && configureGestureHandler) {
-    pan = configureGestureHandler(pan);
-  }
-+    return panGesture;
-+  }, [configureGestureHandler, drawerPosition, drawerType, gestureState, hitSlop, onGestureBegin, onGestureAbort, onGestureFinish, open, startX, swipeEnabled, swipeMinDistance, swipeMinVelocity, toggleDrawer, touchStartX, touchX, translationX]);
-   const translateX = useDerivedValue(() => {
-     // Comment stolen from react-native-gesture-handler/DrawerLayout
-     //
-@@ -247,35 +251,38 @@ export function Drawer({
-     style: [styles.container, style],
-     children: /*#__PURE__*/_jsx(DrawerProgressContext.Provider, {
-       value: progress,
-      children: /*#__PURE__*/_jsx(GestureDetector, {
-        gesture: pan,
-        children: /*#__PURE__*/_jsxs(Animated.View, {
-          style: [styles.main, {
-            flexDirection: drawerType === 'permanent' ? isRight && direction === 'ltr' || !isRight && direction === 'rtl' ? 'row' : 'row-reverse' : 'row'
-          }],
-          children: [/*#__PURE__*/_jsxs(Animated.View, {
-            style: [styles.content, contentAnimatedStyle],
-            children: [/*#__PURE__*/_jsx(View, {
-              accessibilityElementsHidden: isOpen && drawerType !== 'permanent',
-              importantForAccessibility: isOpen && drawerType !== 'permanent' ? 'no-hide-descendants' : 'auto',
-              style: styles.content,
-              children: children
-            }), drawerType !== 'permanent' ? /*#__PURE__*/_jsx(Overlay, {
-              open: open,
-              progress: progress,
-              onPress: () => toggleDrawer(false),
-              style: overlayStyle,
-              accessibilityLabel: overlayAccessibilityLabel
-            }) : null]
-          }), /*#__PURE__*/_jsx(Animated.View, {
-            removeClippedSubviews: Platform.OS !== 'ios',
-            style: [styles.drawer, {
-              width: drawerWidth,
-              position: drawerType === 'permanent' ? 'relative' : 'absolute',
-              zIndex: drawerType === 'back' ? -1 : 0
-            }, drawerAnimatedStyle, drawerStyle],
-            children: renderDrawerContent()
-          })]
-+      children: /*#__PURE__*/_jsx(DrawerGestureContext.Provider, {
-+        value: pan,
-+        children: /*#__PURE__*/_jsx(GestureDetector, {
-+          gesture: pan,
-+          children: /*#__PURE__*/_jsxs(Animated.View, {
-+            style: [styles.main, {
-+              flexDirection: drawerType === 'permanent' ? isRight && direction === 'ltr' || !isRight && direction === 'rtl' ? 'row' : 'row-reverse' : 'row'
-+            }],
-+            children: [/*#__PURE__*/_jsxs(Animated.View, {
-+              style: [styles.content, contentAnimatedStyle],
-+              children: [/*#__PURE__*/_jsx(View, {
-+                accessibilityElementsHidden: isOpen && drawerType !== 'permanent',
-+                importantForAccessibility: isOpen && drawerType !== 'permanent' ? 'no-hide-descendants' : 'auto',
-+                style: styles.content,
-+                children: children
-+              }), drawerType !== 'permanent' ? /*#__PURE__*/_jsx(Overlay, {
-+                open: open,
-+                progress: progress,
-+                onPress: () => toggleDrawer(false),
-+                style: overlayStyle,
-+                accessibilityLabel: overlayAccessibilityLabel
-+              }) : null]
-+            }), /*#__PURE__*/_jsx(Animated.View, {
-+              removeClippedSubviews: Platform.OS !== 'ios',
-+              style: [styles.drawer, {
-+                width: drawerWidth,
-+                position: drawerType === 'permanent' ? 'relative' : 'absolute',
-+                zIndex: drawerType === 'back' ? -1 : 0
-+              }, drawerAnimatedStyle, drawerStyle],
-+              children: renderDrawerContent()
-+            })]
-+          })
-         })
-       })
-     })
-diff --git a/node_modules/react-native-drawer-layout/lib/typescript/commonjs/src/index.d.ts b/node_modules/react-native-drawer-layout/lib/typescript/commonjs/src/index.d.ts
-index 7e978f0..a8bce18 100644
--- a/node_modules/react-native-drawer-layout/lib/typescript/commonjs/src/index.d.ts
-+++ b/node_modules/react-native-drawer-layout/lib/typescript/commonjs/src/index.d.ts
-@@ -1,3 +1,4 @@
-+export { DrawerGestureContext } from './utils/DrawerGestureContext';
- export { DrawerProgressContext } from './utils/DrawerProgressContext';
- export { useDrawerProgress } from './utils/useDrawerProgress';
- export { Drawer } from './views/Drawer';
-diff --git a/node_modules/react-native-drawer-layout/lib/typescript/commonjs/src/utils/DrawerGestureContext.d.ts b/node_modules/react-native-drawer-layout/lib/typescript/commonjs/src/utils/DrawerGestureContext.d.ts
-new file mode 100644
-index 0000000..33ffbeb
--- /dev/null
-+++ b/node_modules/react-native-drawer-layout/lib/typescript/commonjs/src/utils/DrawerGestureContext.d.ts
-@@ -0,0 +1,3 @@
-+import * as React from 'react';
-+export declare const DrawerGestureContext: React.Context<import("react-native-gesture-handler/lib/typescript/handlers/gestures/panGesture").PanGesture | undefined>;
-+//# sourceMappingURL=DrawerGestureContext.d.ts.map
-\ No newline at end of file
-diff --git a/node_modules/react-native-drawer-layout/lib/typescript/module/src/index.d.ts b/node_modules/react-native-drawer-layout/lib/typescript/module/src/index.d.ts
-index 7e978f0..a8bce18 100644
--- a/node_modules/react-native-drawer-layout/lib/typescript/module/src/index.d.ts
-+++ b/node_modules/react-native-drawer-layout/lib/typescript/module/src/index.d.ts
-@@ -1,3 +1,4 @@
-+export { DrawerGestureContext } from './utils/DrawerGestureContext';
- export { DrawerProgressContext } from './utils/DrawerProgressContext';
- export { useDrawerProgress } from './utils/useDrawerProgress';
- export { Drawer } from './views/Drawer';
-diff --git a/node_modules/react-native-drawer-layout/lib/typescript/module/src/utils/DrawerGestureContext.d.ts b/node_modules/react-native-drawer-layout/lib/typescript/module/src/utils/DrawerGestureContext.d.ts
-new file mode 100644
-index 0000000..33ffbeb
--- /dev/null
-+++ b/node_modules/react-native-drawer-layout/lib/typescript/module/src/utils/DrawerGestureContext.d.ts
-@@ -0,0 +1,3 @@
-+import * as React from 'react';
-+export declare const DrawerGestureContext: React.Context<import("react-native-gesture-handler/lib/typescript/handlers/gestures/panGesture").PanGesture | undefined>;
-+//# sourceMappingURL=DrawerGestureContext.d.ts.map
-\ No newline at end of file
-diff --git a/node_modules/react-native-drawer-layout/src/index.tsx b/node_modules/react-native-drawer-layout/src/index.tsx
-index 0aa6f53..61a37cf 100644
--- a/node_modules/react-native-drawer-layout/src/index.tsx
-+++ b/node_modules/react-native-drawer-layout/src/index.tsx
-@@ -1,3 +1,4 @@
-+export { DrawerGestureContext } from './utils/DrawerGestureContext';
- export { DrawerProgressContext } from './utils/DrawerProgressContext';
- export { useDrawerProgress } from './utils/useDrawerProgress';
- export { Drawer } from './views/Drawer';
-diff --git a/node_modules/react-native-drawer-layout/src/utils/DrawerGestureContext.tsx b/node_modules/react-native-drawer-layout/src/utils/DrawerGestureContext.tsx
-new file mode 100644
-index 0000000..3aac957
--- /dev/null
-+++ b/node_modules/react-native-drawer-layout/src/utils/DrawerGestureContext.tsx
-@@ -0,0 +1,6 @@
-+import * as React from 'react';
-+import type { PanGesture } from 'react-native-gesture-handler';
-+
-+export const DrawerGestureContext = React.createContext<PanGesture | undefined>(
-+  undefined
-+);
-diff --git a/node_modules/react-native-drawer-layout/src/views/Drawer.native.tsx b/node_modules/react-native-drawer-layout/src/views/Drawer.native.tsx
-index 9c40f41..ee5d075 100644
--- a/node_modules/react-native-drawer-layout/src/views/Drawer.native.tsx
-+++ b/node_modules/react-native-drawer-layout/src/views/Drawer.native.tsx
-@@ -21,6 +21,7 @@ import Animated, {
- import useLatestCallback from 'use-latest-callback';
- 
- import type { DrawerProps } from '../types';
-+import { DrawerGestureContext } from '../utils/DrawerGestureContext';
- import { DrawerProgressContext } from '../utils/DrawerProgressContext';
- import { getDrawerWidth } from '../utils/getDrawerWidth';
- import {
-@@ -110,47 +111,51 @@ export function Drawer({
- 
-   const interactionHandleRef = React.useRef<number | null>(null);
- 
-  const startInteraction = () => {
-+  const startInteraction = React.useCallback(() => {
-     interactionHandleRef.current = InteractionManager.createInteractionHandle();
-  };
-+  }, []);
- 
-  const endInteraction = () => {
-+  const endInteraction = React.useCallback(() => {
-     if (interactionHandleRef.current != null) {
-       InteractionManager.clearInteractionHandle(interactionHandleRef.current);
-       interactionHandleRef.current = null;
-     }
-  };
-+  }, []);
- 
-  const hideKeyboard = () => {
-+  const hideKeyboard = React.useCallback(() => {
-     if (keyboardDismissMode === 'on-drag') {
-       Keyboard.dismiss();
-     }
-  };
-+  }, [keyboardDismissMode]);
- 
-  const onGestureBegin = () => {
-+  const onGestureBegin = React.useCallback(() => {
-     onGestureStart?.();
-     startInteraction();
-     hideKeyboard();
-     hideStatusBar(true);
-  };
-+  }, [onGestureStart, startInteraction, hideKeyboard, hideStatusBar]);
- 
-  const onGestureFinish = () => {
-+  const onGestureFinish = React.useCallback(() => {
-     onGestureEnd?.();
-     endInteraction();
-  };
-+  }, [onGestureEnd, endInteraction]);
- 
-  const onGestureAbort = () => {
-+  const onGestureAbort = React.useCallback(() => {
-     onGestureCancel?.();
-     endInteraction();
-  };
-+  }, [onGestureCancel, endInteraction]);
- 
-   // FIXME: Currently hitSlop is broken when on Android when drawer is on right
-   // https://github.com/software-mansion/react-native-gesture-handler/issues/569
-  const hitSlop = isRight
-    ? // Extend hitSlop to the side of the screen when drawer is closed
-      // This lets the user drag the drawer from the side of the screen
-      { right: 0, width: isOpen ? undefined : swipeEdgeWidth }
-    : { left: 0, width: isOpen ? undefined : swipeEdgeWidth };
-+  const hitSlop = React.useMemo(
-+    () =>
-+      isRight
-+        ? // Extend hitSlop to the side of the screen when drawer is closed
-+          // This lets the user drag the drawer from the side of the screen
-+          { right: 0, width: isOpen ? undefined : swipeEdgeWidth }
-+        : { left: 0, width: isOpen ? undefined : swipeEdgeWidth },
-+    [isRight, isOpen, swipeEdgeWidth]
-+  );
- 
-   const touchStartX = useSharedValue(0);
-   const touchX = useSharedValue(0);
-@@ -217,53 +222,76 @@ export function Drawer({
- 
-   const startX = useSharedValue(0);
- 
-  let pan = Gesture?.Pan()
-    .onBegin((event) => {
-      'worklet';
-      startX.value = translationX.value;
-      gestureState.value = event.state;
-      touchStartX.value = event.x;
-    })
-    .onStart(() => {
-      'worklet';
-      runOnJS(onGestureBegin)();
-    })
-    .onChange((event) => {
-      'worklet';
-      touchX.value = event.x;
-      translationX.value = startX.value + event.translationX;
-      gestureState.value = event.state;
-    })
-    .onEnd((event, success) => {
-      'worklet';
-      gestureState.value = event.state;
-
-      if (!success) {
-        runOnJS(onGestureAbort)();
-      }
-
-      const nextOpen =
-        (Math.abs(event.translationX) > SWIPE_MIN_OFFSET &&
-          Math.abs(event.translationX) > swipeMinVelocity) ||
-        Math.abs(event.translationX) > swipeMinDistance
-          ? drawerPosition === 'left'
-            ? // If swiped to right, open the drawer, otherwise close it
-              (event.velocityX === 0 ? event.translationX : event.velocityX) > 0
-            : // If swiped to left, open the drawer, otherwise close it
-              (event.velocityX === 0 ? event.translationX : event.velocityX) < 0
-          : open;
-
-      toggleDrawer(nextOpen, event.velocityX);
-      runOnJS(onGestureFinish)();
-    })
-    .activeOffsetX([-SWIPE_MIN_OFFSET, SWIPE_MIN_OFFSET])
-    .failOffsetY([-SWIPE_MIN_OFFSET, SWIPE_MIN_OFFSET])
-    .hitSlop(hitSlop)
-    .enabled(drawerType !== 'permanent' && swipeEnabled);
-
-  if (pan && configureGestureHandler) {
-    pan = configureGestureHandler(pan);
-  }
-+  const pan = React.useMemo(() => {
-+    let panGesture = Gesture?.Pan()
-+      .onBegin((event) => {
-+        'worklet';
-+        startX.value = translationX.value;
-+        gestureState.value = event.state;
-+        touchStartX.value = event.x;
-+      })
-+      .onStart(() => {
-+        'worklet';
-+        runOnJS(onGestureBegin)();
-+      })
-+      .onChange((event) => {
-+        'worklet';
-+        touchX.value = event.x;
-+        translationX.value = startX.value + event.translationX;
-+        gestureState.value = event.state;
-+      })
-+      .onEnd((event, success) => {
-+        'worklet';
-+        gestureState.value = event.state;
-+
-+        if (!success) {
-+          runOnJS(onGestureAbort)();
-+        }
-+
-+        const nextOpen =
-+          (Math.abs(event.translationX) > SWIPE_MIN_OFFSET &&
-+            Math.abs(event.translationX) > swipeMinVelocity) ||
-+          Math.abs(event.translationX) > swipeMinDistance
-+            ? drawerPosition === 'left'
-+              ? // If swiped to right, open the drawer, otherwise close it
-+                (event.velocityX === 0 ? event.translationX : event.velocityX) >
-+                0
-+              : // If swiped to left, open the drawer, otherwise close it
-+                (event.velocityX === 0 ? event.translationX : event.velocityX) <
-+                0
-+            : open;
-+
-+        toggleDrawer(nextOpen, event.velocityX);
-+        runOnJS(onGestureFinish)();
-+      })
-+      .activeOffsetX([-SWIPE_MIN_OFFSET, SWIPE_MIN_OFFSET])
-+      .failOffsetY([-SWIPE_MIN_OFFSET, SWIPE_MIN_OFFSET])
-+      .hitSlop(hitSlop)
-+      .enabled(drawerType !== 'permanent' && swipeEnabled);
-+
-+    if (panGesture && configureGestureHandler) {
-+      panGesture = configureGestureHandler(panGesture);
-+    }
-+    return panGesture;
-+  }, [
-+    configureGestureHandler,
-+    drawerPosition,
-+    drawerType,
-+    gestureState,
-+    hitSlop,
-+    onGestureBegin,
-+    onGestureAbort,
-+    onGestureFinish,
-+    open,
-+    startX,
-+    swipeEnabled,
-+    swipeMinDistance,
-+    swipeMinVelocity,
-+    toggleDrawer,
-+    touchStartX,
-+    touchX,
-+    translationX,
-+  ]);
- 
-   const translateX = useDerivedValue(() => {
-     // Comment stolen from react-native-gesture-handler/DrawerLayout
-@@ -376,64 +404,66 @@ export function Drawer({
-   return (
-     <GestureHandlerRootView style={[styles.container, style]}>
-       <DrawerProgressContext.Provider value={progress}>
-        <GestureDetector gesture={pan}>
-          {/* Immediate child of gesture handler needs to be an Animated.View */}
-          <Animated.View
-            style={[
-              styles.main,
-              {
-                flexDirection:
-                  drawerType === 'permanent'
-                    ? (isRight && direction === 'ltr') ||
-                      (!isRight && direction === 'rtl')
-                      ? 'row'
-                      : 'row-reverse'
-                    : 'row',
-              },
-            ]}
-          >
-            <Animated.View style={[styles.content, contentAnimatedStyle]}>
-              <View
-                accessibilityElementsHidden={
-                  isOpen && drawerType !== 'permanent'
-                }
-                importantForAccessibility={
-                  isOpen && drawerType !== 'permanent'
-                    ? 'no-hide-descendants'
-                    : 'auto'
-                }
-                style={styles.content}
-              >
-                {children}
-              </View>
-              {drawerType !== 'permanent' ? (
-                <Overlay
-                  open={open}
-                  progress={progress}
-                  onPress={() => toggleDrawer(false)}
-                  style={overlayStyle}
-                  accessibilityLabel={overlayAccessibilityLabel}
-                />
-              ) : null}
-            </Animated.View>
-+        <DrawerGestureContext.Provider value={pan}>
-+          <GestureDetector gesture={pan}>
-+            {/* Immediate child of gesture handler needs to be an Animated.View */}
-             <Animated.View
-              removeClippedSubviews={Platform.OS !== 'ios'}
-               style={[
-                styles.drawer,
-+                styles.main,
-                 {
-                  width: drawerWidth,
-                  position:
-                    drawerType === 'permanent' ? 'relative' : 'absolute',
-                  zIndex: drawerType === 'back' ? -1 : 0,
-+                  flexDirection:
-+                    drawerType === 'permanent'
-+                      ? (isRight && direction === 'ltr') ||
-+                        (!isRight && direction === 'rtl')
-+                        ? 'row'
-+                        : 'row-reverse'
-+                      : 'row',
-                 },
-                drawerAnimatedStyle,
-                drawerStyle,
-               ]}
-             >
-              {renderDrawerContent()}
-+              <Animated.View style={[styles.content, contentAnimatedStyle]}>
-+                <View
-+                  accessibilityElementsHidden={
-+                    isOpen && drawerType !== 'permanent'
-+                  }
-+                  importantForAccessibility={
-+                    isOpen && drawerType !== 'permanent'
-+                      ? 'no-hide-descendants'
-+                      : 'auto'
-+                  }
-+                  style={styles.content}
-+                >
-+                  {children}
-+                </View>
-+                {drawerType !== 'permanent' ? (
-+                  <Overlay
-+                    open={open}
-+                    progress={progress}
-+                    onPress={() => toggleDrawer(false)}
-+                    style={overlayStyle}
-+                    accessibilityLabel={overlayAccessibilityLabel}
-+                  />
-+                ) : null}
-+              </Animated.View>
-+              <Animated.View
-+                removeClippedSubviews={Platform.OS !== 'ios'}
-+                style={[
-+                  styles.drawer,
-+                  {
-+                    width: drawerWidth,
-+                    position:
-+                      drawerType === 'permanent' ? 'relative' : 'absolute',
-+                    zIndex: drawerType === 'back' ? -1 : 0,
-+                  },
-+                  drawerAnimatedStyle,
-+                  drawerStyle,
-+                ]}
-+              >
-+                {renderDrawerContent()}
-+              </Animated.View>
-             </Animated.View>
-          </Animated.View>
-        </GestureDetector>
-+          </GestureDetector>
-+        </DrawerGestureContext.Provider>
-       </DrawerProgressContext.Provider>
-     </GestureHandlerRootView>
-   );
@@ -0,0 +1,47 @@
+diff --git a/node_modules/react-native-image-crop-picker/android/src/main/AndroidManifest.xml b/node_modules/react-native-image-crop-picker/android/src/main/AndroidManifest.xml
+index 391f303..8e2c3db 100644
+--- a/node_modules/react-native-image-crop-picker/android/src/main/AndroidManifest.xml
+++ b/node_modules/react-native-image-crop-picker/android/src/main/AndroidManifest.xml
+@@ -24,7 +24,7 @@
+ 
+         <activity
+             android:name="com.yalantis.ucrop.UCropActivity"
+-            android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
+            android:theme="@style/Theme.UCropNoEdgeToEdge" />
+     </application>
+ 
+ </manifest>
+diff --git a/node_modules/react-native-image-crop-picker/android/src/main/res/values-v35/styles.xml b/node_modules/react-native-image-crop-picker/android/src/main/res/values-v35/styles.xml
+new file mode 100644
+index 0000000..396d5a8
+--- /dev/null
+++ b/node_modules/react-native-image-crop-picker/android/src/main/res/values-v35/styles.xml
+@@ -0,0 +1,5 @@
+<resources>
+    <style name="Theme.UCropNoEdgeToEdge" parent="Theme.AppCompat.Light.NoActionBar">
+        <item name="android:windowOptOutEdgeToEdgeEnforcement">true</item>
+    </style>
+</resources>
+diff --git a/node_modules/react-native-image-crop-picker/android/src/main/res/values/styles.xml b/node_modules/react-native-image-crop-picker/android/src/main/res/values/styles.xml
+new file mode 100644
+index 0000000..50129b6
+--- /dev/null
+++ b/node_modules/react-native-image-crop-picker/android/src/main/res/values/styles.xml
+@@ -0,0 +1,3 @@
+<resources>
+    <style name="Theme.UCropNoEdgeToEdge" parent="Theme.AppCompat.Light.NoActionBar"/>
+</resources>
+diff --git a/node_modules/react-native-image-crop-picker/ios/src/ImageCropPicker.m b/node_modules/react-native-image-crop-picker/ios/src/ImageCropPicker.m
+index 9f20973..68d4766 100644
+--- a/node_modules/react-native-image-crop-picker/ios/src/ImageCropPicker.m
+++ b/node_modules/react-native-image-crop-picker/ios/src/ImageCropPicker.m
+@@ -126,7 +126,8 @@ - (void) setConfiguration:(NSDictionary *)options
+ 
+ - (UIViewController*) getRootVC {
+     UIViewController *root = [[[[UIApplication sharedApplication] delegate] window] rootViewController];
+-    while (root.presentedViewController != nil) {
+    while (root.presentedViewController != nil &&
+           !root.presentedViewController.isBeingDismissed) {
+         root = root.presentedViewController;
+     }
+     
@@ -10,6 +10,7 @@ import {
  initialWindowMetrics,
  SafeAreaProvider,
 } from 'react-native-safe-area-context'
+import * as ScreenOrientation from 'expo-screen-orientation'
 import * as SplashScreen from 'expo-splash-screen'
 import * as SystemUI from 'expo-system-ui'
 import {msg} from '@lingui/macro'
@@ -22,7 +23,7 @@ import {s} from '#/lib/styles'
 import {ThemeProvider} from '#/lib/ThemeContext'
 import I18nProvider from '#/locale/i18nProvider'
 import {logger} from '#/logger'
-import {isIOS} from '#/platform/detection'
+import {isAndroid, isIOS} from '#/platform/detection'
 import {Provider as A11yProvider} from '#/state/a11y'
 import {Provider as MutedThreadsProvider} from '#/state/cache/thread-mutes'
 import {Provider as DialogStateProvider} from '#/state/dialogs'
@@ -68,7 +69,6 @@ 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'
-import {AppProfiler} from '#/AppProfiler'
 import {Splash} from '#/Splash'
 import {BottomSheetProvider} from '../modules/bottom-sheet'
 import {BackgroundNotificationPreferencesProvider} from '../modules/expo-background-notification-handler/src/BackgroundNotificationHandlerProvider'
@@ -77,6 +77,10 @@ SplashScreen.preventAutoHideAsync()
 if (isIOS) {
  SystemUI.setBackgroundColorAsync('black')
 }
+if (isAndroid) {
+  // iOS is handled by the config plugin -sfn
+  ScreenOrientation.lockAsync(ScreenOrientation.OrientationLock.PORTRAIT_UP)
+}

 /**
 * Begin geolocation ASAP
@@ -193,44 +197,42 @@ function App() {
   * that is set up in the InnerApp component above.
   */
  return (
-    <AppProfiler>
-      <GeolocationProvider>
-        <A11yProvider>
-          <KeyboardControllerProvider>
-            <SessionProvider>
-              <PrefsStateProvider>
-                <I18nProvider>
-                  <ShellStateProvider>
-                    <InvitesStateProvider>
-                      <ModalStateProvider>
-                        <DialogStateProvider>
-                          <LightboxStateProvider>
-                            <PortalProvider>
-                              <BottomSheetProvider>
-                                <StarterPackProvider>
-                                  <SafeAreaProvider
-                                    initialMetrics={initialWindowMetrics}>
-                                    <IntentDialogProvider>
-                                      <LightStatusBarProvider>
-                                        <InnerApp />
-                                      </LightStatusBarProvider>
-                                    </IntentDialogProvider>
-                                  </SafeAreaProvider>
-                                </StarterPackProvider>
-                              </BottomSheetProvider>
-                            </PortalProvider>
-                          </LightboxStateProvider>
-                        </DialogStateProvider>
-                      </ModalStateProvider>
-                    </InvitesStateProvider>
-                  </ShellStateProvider>
-                </I18nProvider>
-              </PrefsStateProvider>
-            </SessionProvider>
-          </KeyboardControllerProvider>
-        </A11yProvider>
-      </GeolocationProvider>
-    </AppProfiler>
+    <GeolocationProvider>
+      <A11yProvider>
+        <KeyboardControllerProvider>
+          <SessionProvider>
+            <PrefsStateProvider>
+              <I18nProvider>
+                <ShellStateProvider>
+                  <InvitesStateProvider>
+                    <ModalStateProvider>
+                      <DialogStateProvider>
+                        <LightboxStateProvider>
+                          <PortalProvider>
+                            <BottomSheetProvider>
+                              <StarterPackProvider>
+                                <SafeAreaProvider
+                                  initialMetrics={initialWindowMetrics}>
+                                  <IntentDialogProvider>
+                                    <LightStatusBarProvider>
+                                      <InnerApp />
+                                    </LightStatusBarProvider>
+                                  </IntentDialogProvider>
+                                </SafeAreaProvider>
+                              </StarterPackProvider>
+                            </BottomSheetProvider>
+                          </PortalProvider>
+                        </LightboxStateProvider>
+                      </DialogStateProvider>
+                    </ModalStateProvider>
+                  </InvitesStateProvider>
+                </ShellStateProvider>
+              </I18nProvider>
+            </PrefsStateProvider>
+          </SessionProvider>
+        </KeyboardControllerProvider>
+      </A11yProvider>
+    </GeolocationProvider>
  )
 }

@@ -1,29 +0,0 @@
-import React, {Profiler} from 'react'
-
-// Don't let it get stripped out in profiling builds (which apply production Babel preset).
-const log = (global as any)['con' + 'sole'].log
-
-function onRender(id: string, phase: string, actualDuration: number) {
-  if (!__DEV__) {
-    // This block of code will exist in the production build of the app.
-    // However, only profiling builds of React call `onRender` so it's dead code in actual production.
-    const message = `<Profiler> ${id}:${phase} ${
-      actualDuration > 500
-        ? '(╯°□°）╯ '
-        : actualDuration > 100
-        ? '[!!] '
-        : actualDuration > 16
-        ? '[!] '
-        : ''
-    }${Math.round(actualDuration)}ms`
-    log(message)
-  }
-}
-
-export function AppProfiler({children}: {children: React.ReactNode}) {
-  return (
-    <Profiler id="app" onRender={onRender}>
-      {children}
-    </Profiler>
-  )
-}
@@ -158,6 +158,9 @@ export const atoms = {
  flex_wrap: {
    flexWrap: 'wrap',
  },
+  flex_nowrap: {
+    flexWrap: 'nowrap',
+  },
  flex_0: {
    flex: web('0 0 auto') || (native(0) as number),
  },
@@ -1,4 +1,5 @@
 import * as NavigationBar from 'expo-navigation-bar'
+import * as SystemUI from 'expo-system-ui'

 import {isAndroid} from '#/platform/detection'
 import {Theme} from '../types'
@@ -9,10 +10,12 @@ export function setNavigationBar(themeType: 'theme' | 'lightbox', t: Theme) {
      NavigationBar.setBackgroundColorAsync(t.atoms.bg.backgroundColor)
      NavigationBar.setBorderColorAsync(t.atoms.bg.backgroundColor)
      NavigationBar.setButtonStyleAsync(t.name !== 'light' ? 'light' : 'dark')
+      SystemUI.setBackgroundColorAsync(t.atoms.bg.backgroundColor)
    } else {
      NavigationBar.setBackgroundColorAsync('black')
      NavigationBar.setBorderColorAsync('black')
      NavigationBar.setButtonStyleAsync('light')
+      SystemUI.setBackgroundColorAsync('black')
    }
  }
 }
@@ -10,6 +10,7 @@ import {msg, Trans} from '@lingui/macro'
 import {useLingui} from '@lingui/react'

 import {useNonReactiveCallback} from '#/lib/hooks/useNonReactiveCallback'
+import {logEvent} from '#/lib/statsig/statsig'
 import {cleanError} from '#/lib/strings/errors'
 import {logger} from '#/logger'
 import {isWeb} from '#/platform/detection'
@@ -75,7 +76,10 @@ export function FollowDialog({guide}: {guide: Follow10ProgressGuide}) {
    <>
      <Button
        label={_(msg`Find people to follow`)}
-        onPress={control.open}
+        onPress={() => {
+          control.open()
+          logEvent('progressGuide:followDialog:open', {})
+        }}
        size={gtMobile ? 'small' : 'large'}
        color="primary"
        variant="solid">
@@ -12,6 +12,7 @@ import {formatDistance, Locale} from 'date-fns'
 import {
  ca,
  de,
+  el,
  enGB,
  es,
  fi,
@@ -50,6 +51,7 @@ const locales: Record<AppLanguage, Locale | undefined> = {
  ast: undefined,
  ca,
  de,
+  el,
  ['en-GB']: enGB,
  es,
  fi,
@@ -63,8 +65,8 @@ const locales: Record<AppLanguage, Locale | undefined> = {
  ja,
  km,
  ko,
+  ne: undefined,
  nl,
-  np: undefined,
  pl,
  ['pt-BR']: ptBR,
  ro,
@@ -73,9 +75,9 @@ const locales: Record<AppLanguage, Locale | undefined> = {
  tr,
  uk,
  vi,
-  ['zh-CN']: zhCN,
-  ['zh-HK']: zhHK,
-  ['zh-TW']: zhTW,
+  ['zh-Hans-CN']: zhCN,
+  ['zh-Hant-HK']: zhHK,
+  ['zh-Hant-TW']: zhTW,
 }

 /**
@@ -12,5 +12,5 @@ export function useHeaderOffset() {
  const tabBarPad = 10 + 10 + 3 // padding + border
  const normalLineHeight = 20 // matches tab bar
  const tabBarText = normalLineHeight * fontScale
-  return navBarHeight + tabBarPad + tabBarText
+  return navBarHeight + tabBarPad + tabBarText - 4 // for some reason, this calculation is wrong by 4 pixels, which we adjust
 }
@@ -1,6 +1,7 @@
 import React from 'react'
 import {View} from 'react-native'
-import {msg, Trans} from '@lingui/macro'
+import {ScrollView} from 'react-native-gesture-handler'
+import {msg} from '@lingui/macro'
 import {useLingui} from '@lingui/react'

 import {logEvent} from '#/lib/statsig/statsig'
@@ -8,22 +9,15 @@ import {
  useTrendingSettings,
  useTrendingSettingsApi,
 } from '#/state/preferences/trending'
-import {
-  DEFAULT_LIMIT as TRENDING_TOPICS_COUNT,
-  useTrendingTopics,
-} from '#/state/queries/trending/useTrendingTopics'
+import {useTrendingTopics} from '#/state/queries/trending/useTrendingTopics'
 import {useTrendingConfig} from '#/state/trending-config'
-import {atoms as a, tokens, useGutters, useTheme} from '#/alf'
+import {LoadingPlaceholder} from '#/view/com/util/LoadingPlaceholder'
+import {atoms as a, useGutters, useTheme} from '#/alf'
 import {Button, ButtonIcon} from '#/components/Button'
-import {GradientFill} from '#/components/GradientFill'
 import {TimesLarge_Stroke2_Corner0_Rounded as X} from '#/components/icons/Times'
 import {Trending2_Stroke2_Corner2_Rounded as Graph} from '#/components/icons/Trending2'
 import * as Prompt from '#/components/Prompt'
-import {
-  TrendingTopic,
-  TrendingTopicLink,
-  TrendingTopicSkeleton,
-} from '#/components/TrendingTopics'
+import {TrendingTopicLink} from '#/components/TrendingTopics'
 import {Text} from '#/components/Typography'

 export function TrendingInterstitial() {
@@ -35,7 +29,7 @@ export function TrendingInterstitial() {
 export function Inner() {
  const t = useTheme()
  const {_} = useLingui()
-  const gutters = useGutters(['wide', 'base'])
+  const gutters = useGutters([0, 'base', 0, 'base'])
  const trendingPrompt = Prompt.usePromptControl()
  const {setTrendingDisabled} = useTrendingSettingsApi()
  const {data: trending, error, isLoading} = useTrendingTopics()
@@ -47,64 +41,82 @@ export function Inner() {
  }, [setTrendingDisabled])

  return error || noTopics ? null : (
-    <View
-      style={[
-        gutters,
-        a.gap_lg,
-        a.border_t,
-        t.atoms.border_contrast_low,
-        t.atoms.bg_contrast_25,
-      ]}>
-      <View style={[a.flex_row, a.align_center, a.gap_sm]}>
-        <View style={[a.flex_1, a.flex_row, a.align_center, a.gap_sm]}>
-          <Graph size="lg" />
-          <Text style={[a.text_lg, a.font_heavy]}>
-            <Trans>Trending</Trans>
-          </Text>
-          <View style={[a.py_xs, a.px_sm, a.rounded_sm, a.overflow_hidden]}>
-            <GradientFill gradient={tokens.gradients.primary} />
-            <Text style={[a.text_sm, a.font_heavy, {color: 'white'}]}>
-              <Trans>BETA</Trans>
-            </Text>
+    <View style={[t.atoms.border_contrast_low, a.border_t]}>
+      <ScrollView
+        horizontal
+        showsHorizontalScrollIndicator={false}
+        decelerationRate="fast">
+        <View style={[gutters, a.flex_row, a.align_center, a.gap_lg]}>
+          <View style={{paddingLeft: 4, paddingRight: 2}}>
+            <Graph size="sm" />
          </View>
+          {isLoading ? (
+            <View style={[a.py_lg, a.flex_row, a.gap_lg, a.align_center]}>
+              <LoadingPlaceholder
+                width={80}
+                height={undefined}
+                style={{alignSelf: 'stretch'}}
+              />
+              <LoadingPlaceholder
+                width={50}
+                height={undefined}
+                style={{alignSelf: 'stretch'}}
+              />
+              <LoadingPlaceholder
+                width={120}
+                height={undefined}
+                style={{alignSelf: 'stretch'}}
+              />
+              <LoadingPlaceholder
+                width={30}
+                height={undefined}
+                style={{alignSelf: 'stretch'}}
+              />
+              <LoadingPlaceholder
+                width={180}
+                height={undefined}
+                style={{alignSelf: 'stretch'}}
+              />
+              <Text
+                style={[t.atoms.text_contrast_medium, a.text_sm, a.font_bold]}>
+                {' '}
+              </Text>
+            </View>
+          ) : !trending?.topics ? null : (
+            <>
+              {trending.topics.map(topic => (
+                <TrendingTopicLink
+                  key={topic.link}
+                  topic={topic}
+                  onPress={() => {
+                    logEvent('trendingTopic:click', {context: 'interstitial'})
+                  }}>
+                  <View style={[a.py_lg]}>
+                    <Text
+                      style={[
+                        t.atoms.text,
+                        a.text_sm,
+                        a.font_bold,
+                        {opacity: 0.7}, // NOTE: we use opacity 0.7 instead of a color to match the color of the home pager tab bar
+                      ]}>
+                      {topic.topic}
+                    </Text>
+                  </View>
+                </TrendingTopicLink>
+              ))}
+              <Button
+                label={_(msg`Hide trending topics`)}
+                size="tiny"
+                variant="ghost"
+                color="secondary"
+                shape="round"
+                onPress={() => trendingPrompt.open()}>
+                <ButtonIcon icon={X} />
+              </Button>
+            </>
+          )}
        </View>
-
-        <Button
-          label={_(msg`Hide trending topics`)}
-          size="tiny"
-          variant="outline"
-          color="secondary"
-          shape="round"
-          onPress={() => trendingPrompt.open()}>
-          <ButtonIcon icon={X} />
-        </Button>
-      </View>
-
-      <View style={[a.flex_row, a.flex_wrap, {rowGap: 8, columnGap: 6}]}>
-        {isLoading ? (
-          Array(TRENDING_TOPICS_COUNT)
-            .fill(0)
-            .map((_n, i) => <TrendingTopicSkeleton key={i} index={i} />)
-        ) : !trending?.topics ? null : (
-          <>
-            {trending.topics.map(topic => (
-              <TrendingTopicLink key={topic.link} topic={topic}>
-                {({hovered}) => (
-                  <TrendingTopic
-                    topic={topic}
-                    style={[
-                      hovered && [
-                        t.atoms.border_contrast_high,
-                        t.atoms.bg_contrast_25,
-                      ],
-                    ]}
-                  />
-                )}
-              </TrendingTopicLink>
-            ))}
-          </>
-        )}
-      </View>
+      </ScrollView>

      <Prompt.Basic
        control={trendingPrompt}
@@ -215,7 +215,7 @@ async function doResize(localUri: string, opts: DoResizeOpts): Promise<Image> {
  )
 }

-async function moveToPermanentPath(path: string, ext = 'jpg'): Promise<string> {
+async function moveToPermanentPath(path: string, ext: string): Promise<string> {
  /*
  Since this package stores images in a temp directory, we need to move the file to a permanent location.
  Relevant: IOS bug when trying to open a second time:
@@ -237,8 +237,19 @@ export type LogEvents = {
  'tmd:download': {}
  'tmd:post': {}

-  'trendingTopics:show': {}
-  'trendingTopics:hide': {
-    context: 'sidebar' | 'interstitial' | 'explore:trending'
+  'trendingTopics:show': {
+    context: 'settings'
  }
+  'trendingTopics:hide': {
+    context: 'settings' | 'sidebar' | 'interstitial' | 'explore:trending'
+  }
+  'trendingTopic:click': {
+    context: 'sidebar' | 'interstitial' | 'explore'
+  }
+  'recommendedTopic:click': {
+    context: 'explore'
+  }
+
+  'progressGuide:hide': {}
+  'progressGuide:followDialog:open': {}
 }
@@ -5,6 +5,7 @@ import {AppLanguage} from '#/locale/languages'

 test('sanitizeAppLanguageSetting', () => {
  expect(sanitizeAppLanguageSetting('en')).toBe(AppLanguage.en)
+  expect(sanitizeAppLanguageSetting('el')).toBe(AppLanguage.el)
  expect(sanitizeAppLanguageSetting('pt-BR')).toBe(AppLanguage.pt_BR)
  expect(sanitizeAppLanguageSetting('hi')).toBe(AppLanguage.hi)
  expect(sanitizeAppLanguageSetting('id')).toBe(AppLanguage.id)
@@ -12,5 +13,5 @@ test('sanitizeAppLanguageSetting', () => {
  expect(sanitizeAppLanguageSetting('en,foo')).toBe(AppLanguage.en)
  expect(sanitizeAppLanguageSetting('foo,en')).toBe(AppLanguage.en)
  expect(sanitizeAppLanguageSetting('vi')).toBe(AppLanguage.vi)
-  expect(sanitizeAppLanguageSetting('np')).toBe(AppLanguage.np)
+  expect(sanitizeAppLanguageSetting('ne')).toBe(AppLanguage.ne)
 })
@@ -41,17 +41,19 @@ export function getLocales() {
    }

    if (typeof locale.languageTag === 'string') {
-      if (locale.languageTag.startsWith('zh-Hans')) {
-        // Simplified Chinese to zh-CN
-        locale.languageTag = 'zh-CN'
+      if (
+        locale.languageTag.startsWith('zh-Hans') ||
+        locale.languageTag === 'zh-CN'
+      ) {
+        // Simplified Chinese to zh-Hans-CN
+        locale.languageTag = 'zh-Hans-CN'
      }
-      if (locale.languageTag.startsWith('zh-Hant')) {
-        // Traditional Chinese to zh-TW
-        locale.languageTag = 'zh-TW'
-      }
-      if (locale.languageTag.startsWith('yue')) {
-        // Cantonese (Yue) to zh-HK
-        locale.languageTag = 'zh-HK'
+      if (
+        locale.languageTag.startsWith('zh-Hant') ||
+        locale.languageTag === 'zh-TW'
+      ) {
+        // Traditional Chinese to zh-Hant-TW
+        locale.languageTag = 'zh-Hant-TW'
      }
    }

@@ -5,6 +5,7 @@ import lande from 'lande'
 import {hasProp} from '#/lib/type-guards'
 import {
  AppLanguage,
+  type Language,
  LANGUAGES_MAP_CODE2,
  LANGUAGES_MAP_CODE3,
 } from './languages'
@@ -31,9 +32,44 @@ export function code3ToCode2Strict(lang: string): string | undefined {
  return undefined
 }

-export function codeToLanguageName(lang: string): string {
-  const lang2 = code3ToCode2(lang)
-  return LANGUAGES_MAP_CODE2[lang2]?.name || lang
+function getLocalizedLanguage(
+  langCode: string,
+  appLang: string,
+): string | undefined {
+  try {
+    const allNames = new Intl.DisplayNames([appLang], {
+      type: 'language',
+      fallback: 'none',
+      languageDisplay: 'standard',
+    })
+    const translatedName = allNames.of(langCode)
+
+    if (translatedName) {
+      // force simple title case (as languages do not always start with an uppercase in Unicode data)
+      return translatedName[0].toLocaleUpperCase() + translatedName.slice(1)
+    }
+  } catch (e) {
+    // ignore RangeError from Intl.DisplayNames APIs
+    if (!(e instanceof RangeError)) {
+      throw e
+    }
+  }
+}
+
+export function languageName(language: Language, appLang: string): string {
+  // if Intl.DisplayNames is unavailable on the target, display the English name
+  if (!(Intl as any).DisplayNames) {
+    return language.name
+  }
+
+  return getLocalizedLanguage(language.code2, appLang) || language.name
+}
+
+export function codeToLanguageName(lang2or3: string, appLang: string): string {
+  const code2 = code3ToCode2(lang2or3)
+  const knownLanguage = LANGUAGES_MAP_CODE2[code2]
+
+  return knownLanguage ? languageName(knownLanguage, appLang) : code2
 }

 export function getPostLanguage(
@@ -127,6 +163,8 @@ export function sanitizeAppLanguageSetting(appLanguage: string): AppLanguage {
        return AppLanguage.ca
      case 'de':
        return AppLanguage.de
+      case 'el':
+        return AppLanguage.el
      case 'en-GB':
        return AppLanguage.en_GB
      case 'es':
@@ -153,10 +191,10 @@ export function sanitizeAppLanguageSetting(appLanguage: string): AppLanguage {
        return AppLanguage.km
      case 'ko':
        return AppLanguage.ko
+      case 'ne':
+        return AppLanguage.ne
      case 'nl':
        return AppLanguage.nl
-      case 'np':
-        return AppLanguage.np
      case 'pl':
        return AppLanguage.pl
      case 'pt-BR':
@@ -173,11 +211,11 @@ export function sanitizeAppLanguageSetting(appLanguage: string): AppLanguage {
        return AppLanguage.uk
      case 'vi':
        return AppLanguage.vi
-      case 'zh-CN':
+      case 'zh-Hans-CN':
        return AppLanguage.zh_CN
-      case 'zh-HK':
+      case 'zh-Hant-HK':
        return AppLanguage.zh_HK
-      case 'zh-TW':
+      case 'zh-Hant-TW':
        return AppLanguage.zh_TW
      default:
        continue
@@ -1,10 +1,8 @@
 // Don't remove -force from these because detection is VERY slow on low-end Android.
 // https://github.com/formatjs/formatjs/issues/4463#issuecomment-2176070577
 import '@formatjs/intl-locale/polyfill-force'
-import '@formatjs/intl-datetimeformat/polyfill-force'
 import '@formatjs/intl-pluralrules/polyfill-force'
 import '@formatjs/intl-numberformat/polyfill-force'
-import '@formatjs/intl-datetimeformat/locale-data/en'
 import '@formatjs/intl-pluralrules/locale-data/en'
 import '@formatjs/intl-numberformat/locale-data/en'

@@ -17,6 +15,7 @@ import {messages as messagesAn} from '#/locale/locales/an/messages'
 import {messages as messagesAst} from '#/locale/locales/ast/messages'
 import {messages as messagesCa} from '#/locale/locales/ca/messages'
 import {messages as messagesDe} from '#/locale/locales/de/messages'
+import {messages as messagesEl} from '#/locale/locales/el/messages'
 import {messages as messagesEn} from '#/locale/locales/en/messages'
 import {messages as messagesEn_GB} from '#/locale/locales/en-GB/messages'
 import {messages as messagesEs} from '#/locale/locales/es/messages'
@@ -31,8 +30,8 @@ import {messages as messagesIt} from '#/locale/locales/it/messages'
 import {messages as messagesJa} from '#/locale/locales/ja/messages'
 import {messages as messagesKm} from '#/locale/locales/km/messages'
 import {messages as messagesKo} from '#/locale/locales/ko/messages'
+import {messages as messagesNe} from '#/locale/locales/ne/messages'
 import {messages as messagesNl} from '#/locale/locales/nl/messages'
-import {messages as messagesNp} from '#/locale/locales/np/messages'
 import {messages as messagesPl} from '#/locale/locales/pl/messages'
 import {messages as messagesPt_BR} from '#/locale/locales/pt-BR/messages'
 import {messages as messagesRo} from '#/locale/locales/ro/messages'
@@ -54,7 +53,6 @@ export async function dynamicActivate(locale: AppLanguage) {
    case AppLanguage.an: {
      i18n.loadAndActivate({locale, messages: messagesAn})
      await Promise.all([
-        import('@formatjs/intl-datetimeformat/locale-data/es'),
        import('@formatjs/intl-pluralrules/locale-data/an'),
        import('@formatjs/intl-numberformat/locale-data/es'),
      ])
@@ -63,7 +61,6 @@ export async function dynamicActivate(locale: AppLanguage) {
    case AppLanguage.ast: {
      i18n.loadAndActivate({locale, messages: messagesAst})
      await Promise.all([
-        import('@formatjs/intl-datetimeformat/locale-data/ast'),
        import('@formatjs/intl-pluralrules/locale-data/ast'),
        import('@formatjs/intl-numberformat/locale-data/ast'),
      ])
@@ -72,7 +69,6 @@ export async function dynamicActivate(locale: AppLanguage) {
    case AppLanguage.ca: {
      i18n.loadAndActivate({locale, messages: messagesCa})
      await Promise.all([
-        import('@formatjs/intl-datetimeformat/locale-data/ca'),
        import('@formatjs/intl-pluralrules/locale-data/ca'),
        import('@formatjs/intl-numberformat/locale-data/ca'),
      ])
@@ -81,16 +77,22 @@ export async function dynamicActivate(locale: AppLanguage) {
    case AppLanguage.de: {
      i18n.loadAndActivate({locale, messages: messagesDe})
      await Promise.all([
-        import('@formatjs/intl-datetimeformat/locale-data/de'),
        import('@formatjs/intl-pluralrules/locale-data/de'),
        import('@formatjs/intl-numberformat/locale-data/de'),
      ])
      break
    }
+    case AppLanguage.el: {
+      i18n.loadAndActivate({locale, messages: messagesEl})
+      await Promise.all([
+        import('@formatjs/intl-pluralrules/locale-data/el'),
+        import('@formatjs/intl-numberformat/locale-data/el'),
+      ])
+      break
+    }
    case AppLanguage.en_GB: {
      i18n.loadAndActivate({locale, messages: messagesEn_GB})
      await Promise.all([
-        import('@formatjs/intl-datetimeformat/locale-data/en-GB'),
        import('@formatjs/intl-pluralrules/locale-data/en'),
        import('@formatjs/intl-numberformat/locale-data/en-GB'),
      ])
@@ -99,7 +101,6 @@ export async function dynamicActivate(locale: AppLanguage) {
    case AppLanguage.es: {
      i18n.loadAndActivate({locale, messages: messagesEs})
      await Promise.all([
-        import('@formatjs/intl-datetimeformat/locale-data/es'),
        import('@formatjs/intl-pluralrules/locale-data/es'),
        import('@formatjs/intl-numberformat/locale-data/es'),
      ])
@@ -108,7 +109,6 @@ export async function dynamicActivate(locale: AppLanguage) {
    case AppLanguage.fi: {
      i18n.loadAndActivate({locale, messages: messagesFi})
      await Promise.all([
-        import('@formatjs/intl-datetimeformat/locale-data/fi'),
        import('@formatjs/intl-pluralrules/locale-data/fi'),
        import('@formatjs/intl-numberformat/locale-data/fi'),
      ])
@@ -117,7 +117,6 @@ export async function dynamicActivate(locale: AppLanguage) {
    case AppLanguage.fr: {
      i18n.loadAndActivate({locale, messages: messagesFr})
      await Promise.all([
-        import('@formatjs/intl-datetimeformat/locale-data/fr'),
        import('@formatjs/intl-pluralrules/locale-data/fr'),
        import('@formatjs/intl-numberformat/locale-data/fr'),
      ])
@@ -126,7 +125,6 @@ export async function dynamicActivate(locale: AppLanguage) {
    case AppLanguage.ga: {
      i18n.loadAndActivate({locale, messages: messagesGa})
      await Promise.all([
-        import('@formatjs/intl-datetimeformat/locale-data/ga'),
        import('@formatjs/intl-pluralrules/locale-data/ga'),
        import('@formatjs/intl-numberformat/locale-data/ga'),
      ])
@@ -135,7 +133,6 @@ export async function dynamicActivate(locale: AppLanguage) {
    case AppLanguage.gl: {
      i18n.loadAndActivate({locale, messages: messagesGl})
      await Promise.all([
-        import('@formatjs/intl-datetimeformat/locale-data/gl'),
        import('@formatjs/intl-pluralrules/locale-data/gl'),
        import('@formatjs/intl-numberformat/locale-data/gl'),
      ])
@@ -144,7 +141,6 @@ export async function dynamicActivate(locale: AppLanguage) {
    case AppLanguage.hi: {
      i18n.loadAndActivate({locale, messages: messagesHi})
      await Promise.all([
-        import('@formatjs/intl-datetimeformat/locale-data/hi'),
        import('@formatjs/intl-pluralrules/locale-data/hi'),
        import('@formatjs/intl-numberformat/locale-data/hi'),
      ])
@@ -153,7 +149,6 @@ export async function dynamicActivate(locale: AppLanguage) {
    case AppLanguage.hu: {
      i18n.loadAndActivate({locale, messages: messagesHu})
      await Promise.all([
-        import('@formatjs/intl-datetimeformat/locale-data/hu'),
        import('@formatjs/intl-pluralrules/locale-data/hu'),
        import('@formatjs/intl-numberformat/locale-data/hu'),
      ])
@@ -162,7 +157,6 @@ export async function dynamicActivate(locale: AppLanguage) {
    case AppLanguage.id: {
      i18n.loadAndActivate({locale, messages: messagesId})
      await Promise.all([
-        import('@formatjs/intl-datetimeformat/locale-data/id'),
        import('@formatjs/intl-pluralrules/locale-data/id'),
        import('@formatjs/intl-numberformat/locale-data/id'),
      ])
@@ -171,7 +165,6 @@ export async function dynamicActivate(locale: AppLanguage) {
    case AppLanguage.it: {
      i18n.loadAndActivate({locale, messages: messagesIt})
      await Promise.all([
-        import('@formatjs/intl-datetimeformat/locale-data/it'),
        import('@formatjs/intl-pluralrules/locale-data/it'),
        import('@formatjs/intl-numberformat/locale-data/it'),
      ])
@@ -180,7 +173,6 @@ export async function dynamicActivate(locale: AppLanguage) {
    case AppLanguage.ja: {
      i18n.loadAndActivate({locale, messages: messagesJa})
      await Promise.all([
-        import('@formatjs/intl-datetimeformat/locale-data/ja'),
        import('@formatjs/intl-pluralrules/locale-data/ja'),
        import('@formatjs/intl-numberformat/locale-data/ja'),
      ])
@@ -189,8 +181,6 @@ export async function dynamicActivate(locale: AppLanguage) {
    case AppLanguage.km: {
      i18n.loadAndActivate({locale, messages: messagesKm})
      await Promise.all([
-        import('@formatjs/intl-datetimeformat/locale-data/km'),
-        import('@formatjs/intl-datetimeformat/locale-data/km'),
        import('@formatjs/intl-pluralrules/locale-data/km'),
        import('@formatjs/intl-numberformat/locale-data/km'),
      ])
@@ -199,29 +189,26 @@ export async function dynamicActivate(locale: AppLanguage) {
    case AppLanguage.ko: {
      i18n.loadAndActivate({locale, messages: messagesKo})
      await Promise.all([
-        import('@formatjs/intl-datetimeformat/locale-data/ko'),
        import('@formatjs/intl-pluralrules/locale-data/ko'),
        import('@formatjs/intl-numberformat/locale-data/ko'),
      ])
      break
    }
+    case AppLanguage.ne: {
+      i18n.loadAndActivate({locale, messages: messagesNe})
+      break
+    }
    case AppLanguage.nl: {
      i18n.loadAndActivate({locale, messages: messagesNl})
      await Promise.all([
-        import('@formatjs/intl-datetimeformat/locale-data/nl'),
        import('@formatjs/intl-pluralrules/locale-data/nl'),
        import('@formatjs/intl-numberformat/locale-data/nl'),
      ])
      break
    }
-    case AppLanguage.np: {
-      i18n.loadAndActivate({locale, messages: messagesNp})
-      break
-    }
    case AppLanguage.pl: {
      i18n.loadAndActivate({locale, messages: messagesPl})
      await Promise.all([
-        import('@formatjs/intl-datetimeformat/locale-data/pl'),
        import('@formatjs/intl-pluralrules/locale-data/pl'),
        import('@formatjs/intl-numberformat/locale-data/pl'),
      ])
@@ -230,7 +217,6 @@ export async function dynamicActivate(locale: AppLanguage) {
    case AppLanguage.pt_BR: {
      i18n.loadAndActivate({locale, messages: messagesPt_BR})
      await Promise.all([
-        import('@formatjs/intl-datetimeformat/locale-data/pt'),
        import('@formatjs/intl-pluralrules/locale-data/pt'),
        import('@formatjs/intl-numberformat/locale-data/pt'),
      ])
@@ -239,7 +225,6 @@ export async function dynamicActivate(locale: AppLanguage) {
    case AppLanguage.ro: {
      i18n.loadAndActivate({locale, messages: messagesRo})
      await Promise.all([
-        import('@formatjs/intl-datetimeformat/locale-data/ro'),
        import('@formatjs/intl-pluralrules/locale-data/ro'),
        import('@formatjs/intl-numberformat/locale-data/ro'),
      ])
@@ -248,7 +233,6 @@ export async function dynamicActivate(locale: AppLanguage) {
    case AppLanguage.ru: {
      i18n.loadAndActivate({locale, messages: messagesRu})
      await Promise.all([
-        import('@formatjs/intl-datetimeformat/locale-data/ru'),
        import('@formatjs/intl-pluralrules/locale-data/ru'),
        import('@formatjs/intl-numberformat/locale-data/ru'),
      ])
@@ -257,7 +241,6 @@ export async function dynamicActivate(locale: AppLanguage) {
    case AppLanguage.th: {
      i18n.loadAndActivate({locale, messages: messagesTh})
      await Promise.all([
-        import('@formatjs/intl-datetimeformat/locale-data/th'),
        import('@formatjs/intl-pluralrules/locale-data/th'),
        import('@formatjs/intl-numberformat/locale-data/th'),
      ])
@@ -266,7 +249,6 @@ export async function dynamicActivate(locale: AppLanguage) {
    case AppLanguage.tr: {
      i18n.loadAndActivate({locale, messages: messagesTr})
      await Promise.all([
-        import('@formatjs/intl-datetimeformat/locale-data/tr'),
        import('@formatjs/intl-pluralrules/locale-data/tr'),
        import('@formatjs/intl-numberformat/locale-data/tr'),
      ])
@@ -275,7 +257,6 @@ export async function dynamicActivate(locale: AppLanguage) {
    case AppLanguage.uk: {
      i18n.loadAndActivate({locale, messages: messagesUk})
      await Promise.all([
-        import('@formatjs/intl-datetimeformat/locale-data/uk'),
        import('@formatjs/intl-pluralrules/locale-data/uk'),
        import('@formatjs/intl-numberformat/locale-data/uk'),
      ])
@@ -284,7 +265,6 @@ export async function dynamicActivate(locale: AppLanguage) {
    case AppLanguage.vi: {
      i18n.loadAndActivate({locale, messages: messagesVi})
      await Promise.all([
-        import('@formatjs/intl-datetimeformat/locale-data/vi'),
        import('@formatjs/intl-pluralrules/locale-data/vi'),
        import('@formatjs/intl-numberformat/locale-data/vi'),
      ])
@@ -293,7 +273,6 @@ export async function dynamicActivate(locale: AppLanguage) {
    case AppLanguage.zh_CN: {
      i18n.loadAndActivate({locale, messages: messagesZh_CN})
      await Promise.all([
-        import('@formatjs/intl-datetimeformat/locale-data/zh-Hans'),
        import('@formatjs/intl-pluralrules/locale-data/zh'),
        import('@formatjs/intl-numberformat/locale-data/zh'),
      ])
@@ -302,7 +281,6 @@ export async function dynamicActivate(locale: AppLanguage) {
    case AppLanguage.zh_HK: {
      i18n.loadAndActivate({locale, messages: messagesZh_HK})
      await Promise.all([
-        import('@formatjs/intl-datetimeformat/locale-data/yue'),
        import('@formatjs/intl-pluralrules/locale-data/zh'),
        import('@formatjs/intl-numberformat/locale-data/zh'),
      ])
@@ -311,7 +289,6 @@ export async function dynamicActivate(locale: AppLanguage) {
    case AppLanguage.zh_TW: {
      i18n.loadAndActivate({locale, messages: messagesZh_TW})
      await Promise.all([
-        import('@formatjs/intl-datetimeformat/locale-data/zh-Hant'),
        import('@formatjs/intl-pluralrules/locale-data/zh'),
        import('@formatjs/intl-numberformat/locale-data/zh'),
      ])
@@ -28,6 +28,10 @@ export async function dynamicActivate(locale: AppLanguage) {
      mod = await import(`./locales/de/messages`)
      break
    }
+    case AppLanguage.el: {
+      mod = await import(`./locales/el/messages`)
+      break
+    }
    case AppLanguage.en_GB: {
      mod = await import(`./locales/en-GB/messages`)
      break
@@ -80,12 +84,12 @@ export async function dynamicActivate(locale: AppLanguage) {
      mod = await import(`./locales/ko/messages`)
      break
    }
-    case AppLanguage.nl: {
-      mod = await import(`./locales/nl/messages`)
+    case AppLanguage.ne: {
+      mod = await import(`./locales/ne/messages`)
      break
    }
-    case AppLanguage.np: {
-      mod = await import(`./locales/np/messages`)
+    case AppLanguage.nl: {
+      mod = await import(`./locales/nl/messages`)
      break
    }
    case AppLanguage.pl: {
@@ -1,4 +1,4 @@
-interface Language {
+export interface Language {
  code3: string
  code2: string
  name: string
@@ -10,6 +10,7 @@ export enum AppLanguage {
  ast = 'ast',
  ca = 'ca',
  de = 'de',
+  el = 'el',
  en_GB = 'en-GB',
  es = 'es',
  fi = 'fi',
@@ -23,8 +24,8 @@ export enum AppLanguage {
  ja = 'ja',
  km = 'km',
  ko = 'ko',
+  ne = 'ne',
  nl = 'nl',
-  np = 'np',
  pl = 'pl',
  pt_BR = 'pt-BR',
  ro = 'ro',
@@ -33,9 +34,9 @@ export enum AppLanguage {
  tr = 'tr',
  uk = 'uk',
  vi = 'vi',
-  zh_CN = 'zh-CN',
-  zh_HK = 'zh-HK',
-  zh_TW = 'zh-TW',
+  zh_CN = 'zh-Hans-CN',
+  zh_HK = 'zh-Hant-HK',
+  zh_TW = 'zh-Hant-TW',
 }

 interface AppLanguageConfig {
@@ -49,6 +50,7 @@ export const APP_LANGUAGES: AppLanguageConfig[] = [
  {code2: AppLanguage.ast, name: 'Asturianu – Asturian'},
  {code2: AppLanguage.ca, name: 'Català – Catalan'},
  {code2: AppLanguage.de, name: 'Deutsch – German'},
+  {code2: AppLanguage.el, name: 'Ελληνικά – Greek'},
  {code2: AppLanguage.en_GB, name: 'English (UK)'},
  {code2: AppLanguage.es, name: 'Español – Spanish'},
  {code2: AppLanguage.fi, name: 'Suomi – Finnish'},
@@ -62,8 +64,8 @@ export const APP_LANGUAGES: AppLanguageConfig[] = [
  {code2: AppLanguage.ja, name: '日本語 – Japanese'},
  {code2: AppLanguage.km, name: 'ភាសាខ្មែរ – Khmer'},
  {code2: AppLanguage.ko, name: '한국어 – Korean'},
+  {code2: AppLanguage.ne, name: 'नेपाली – Nepali'},
  {code2: AppLanguage.nl, name: 'Nederlands – Dutch'},
-  {code2: AppLanguage.np, name: 'नेपाली – Nepali'},
  {code2: AppLanguage.pl, name: 'Polski – Polish'},
  {code2: AppLanguage.pt_BR, name: 'Português (BR) – Portuguese (BR)'},
  {code2: AppLanguage.ro, name: 'Română – Romanian'},
@@ -123,7 +123,11 @@ export function ListHiddenScreen({
        />
        <View style={[a.gap_sm, a.align_center]}>
          <Text style={[a.font_bold, a.text_3xl]}>
-            <Trans>List has been hidden</Trans>
+            {list.creator.viewer?.blocking || list.creator.viewer?.blockedBy ? (
+              <Trans>Creator has been blocked</Trans>
+            ) : (
+              <Trans>List has been hidden</Trans>
+            )}
          </Text>
          <Text
            style={[
@@ -133,16 +137,23 @@ export function ListHiddenScreen({
              t.atoms.text_contrast_high,
              {lineHeight: 1.4},
            ]}>
-            <Trans>
-              This list - created by{' '}
-              <Text style={[a.text_md, !isOwner && a.font_bold]}>
-                {isOwner
-                  ? _(msg`you`)
-                  : sanitizeHandle(list.creator.handle, '@')}
-              </Text>{' '}
-              - contains possible violations of Bluesky's community guidelines
-              in its name or description.
-            </Trans>
+            {list.creator.viewer?.blocking || list.creator.viewer?.blockedBy ? (
+              <Trans>
+                Either the creator of this list has blocked you or you have
+                blocked the creator.
+              </Trans>
+            ) : (
+              <Trans>
+                This list - created by{' '}
+                <Text style={[a.text_md, !isOwner && a.font_bold]}>
+                  {isOwner
+                    ? _(msg`you`)
+                    : sanitizeHandle(list.creator.handle, '@')}
+                </Text>{' '}
+                - contains possible violations of Bluesky's community guidelines
+                in its name or description.
+              </Trans>
+            )}
          </Text>
        </View>
      </View>
@@ -165,7 +165,9 @@ export function MessagesScreen({navigation, route}: Props) {
                      color="secondary"
                      variant="solid"
                      onPress={() => refetch()}>
-                      <ButtonText>Retry</ButtonText>
+                      <ButtonText>
+                        <Trans>Retry</Trans>
+                      </ButtonText>
                      <ButtonIcon icon={Retry} position="right" />
                    </Button>
                  </View>
@@ -3,6 +3,7 @@ import {Pressable, StyleSheet, View} from 'react-native'
 import {msg} from '@lingui/macro'
 import {useLingui} from '@lingui/react'
 import Graphemer from 'graphemer'
+import {flushSync} from 'react-dom'
 import TextareaAutosize from 'react-textarea-autosize'

 import {isSafari, isTouchDevice} from '#/lib/browser'
@@ -106,11 +107,19 @@ export function MessageInput({

  const onEmojiInserted = React.useCallback(
    (emoji: Emoji) => {
-      const position = textAreaRef.current?.selectionStart ?? 0
-      setMessage(
-        message =>
-          message.slice(0, position) + emoji.native + message.slice(position),
-      )
+      if (!textAreaRef.current) {
+        return
+      }
+      const position = textAreaRef.current.selectionStart ?? 0
+      textAreaRef.current.focus()
+      flushSync(() => {
+        setMessage(
+          message =>
+            message.slice(0, position) + emoji.native + message.slice(position),
+        )
+      })
+      textAreaRef.current.selectionStart = position + emoji.native.length
+      textAreaRef.current.selectionEnd = position + emoji.native.length
    },
    [setMessage],
  )
@@ -148,7 +157,14 @@ export function MessageInput({
        <Button
          onPress={e => {
            e.currentTarget.measure((_fx, _fy, _width, _height, px, py) => {
-              openEmojiPicker?.({top: py, left: px, right: px, bottom: py})
+              openEmojiPicker?.({
+                top: py,
+                left: px,
+                right: px,
+                bottom: py,
+                nextFocusRef:
+                  textAreaRef as unknown as React.MutableRefObject<HTMLElement>,
+              })
            })
          }}
          style={[
@@ -101,7 +101,7 @@ export function MessagesList({
  const [emojiPickerState, setEmojiPickerState] =
    React.useState<EmojiPickerState>({
      isOpen: false,
-      pos: {top: 0, left: 0, right: 0, bottom: 0},
+      pos: {top: 0, left: 0, right: 0, bottom: 0, nextFocusRef: null},
    })

  // We need to keep track of when the scroll offset is at the bottom of the list to know when to scroll as new items
@@ -1,6 +1,7 @@
 import {View} from 'react-native'
 import {Trans} from '@lingui/macro'

+import {logEvent} from '#/lib/statsig/statsig'
 import {isWeb} from '#/platform/detection'
 import {
  DEFAULT_LIMIT as RECOMMENDATIONS_COUNT,
@@ -71,7 +72,12 @@ function Inner() {
          ) : !trending?.suggested ? null : (
            <>
              {trending.suggested.map(topic => (
-                <TrendingTopicLink key={topic.link} topic={topic}>
+                <TrendingTopicLink
+                  key={topic.link}
+                  topic={topic}
+                  onPress={() => {
+                    logEvent('recommendedTopic:click', {context: 'explore'})
+                  }}>
                  {({hovered}) => (
                    <TrendingTopic
                      topic={topic}
@@ -106,7 +106,12 @@ function Inner() {
          ) : !trending?.topics ? null : (
            <>
              {trending.topics.map(topic => (
-                <TrendingTopicLink key={topic.link} topic={topic}>
+                <TrendingTopicLink
+                  key={topic.link}
+                  topic={topic}
+                  onPress={() => {
+                    logEvent('trendingTopic:click', {context: 'explore'})
+                  }}>
                  {({hovered}) => (
                    <TrendingTopic
                      topic={topic}
@@ -3,6 +3,7 @@ import {useLingui} from '@lingui/react'
 import {NativeStackScreenProps} from '@react-navigation/native-stack'

 import {CommonNavigatorParams} from '#/lib/routes/types'
+import {logEvent} from '#/lib/statsig/statsig'
 import {isNative} from '#/platform/detection'
 import {useAutoplayDisabled, useSetAutoplayDisabled} from '#/state/preferences'
 import {
@@ -120,7 +121,15 @@ export function ContentAndMediaSettingsScreen({}: Props) {
                name="show_trending_topics"
                label={_(msg`Enable trending topics`)}
                value={!trendingDisabled}
-                onChange={value => setTrendingDisabled(!value)}>
+                onChange={value => {
+                  const hide = Boolean(!value)
+                  if (hide) {
+                    logEvent('trendingTopics:hide', {context: 'settings'})
+                  } else {
+                    logEvent('trendingTopics:show', {context: 'settings'})
+                  }
+                  setTrendingDisabled(hide)
+                }}>
                <SettingsList.Item>
                  <SettingsList.ItemIcon icon={Graph} />
                  <SettingsList.ItemText>
@@ -6,7 +6,7 @@ import {useLingui} from '@lingui/react'

 import {APP_LANGUAGES, LANGUAGES} from '#/lib/../locale/languages'
 import {CommonNavigatorParams, NativeStackScreenProps} from '#/lib/routes/types'
-import {sanitizeAppLanguageSetting} from '#/locale/helpers'
+import {languageName, sanitizeAppLanguageSetting} from '#/locale/helpers'
 import {useModalControls} from '#/state/modals'
 import {useLanguagePrefs, useLanguagePrefsApi} from '#/state/preferences'
 import {atoms as a, useTheme, web} from '#/alf'
@@ -57,10 +57,10 @@ export function LanguageSettingsScreen({}: Props) {
        .map(lang => LANGUAGES.find(l => l.code2 === lang))
        .filter(Boolean)
        // @ts-ignore
-        .map(l => l.name)
+        .map(l => languageName(l, langPrefs.appLanguage))
        .join(', ')
    )
-  }, [langPrefs.contentLanguages])
+  }, [langPrefs.appLanguage, langPrefs.contentLanguages])

  return (
    <Layout.Screen testID="PreferencesLanguagesScreen">
@@ -179,7 +179,7 @@ export function LanguageSettingsScreen({}: Props) {
                  value={langPrefs.primaryLanguage}
                  onValueChange={onChangePrimaryLanguage}
                  items={LANGUAGES.filter(l => Boolean(l.code2)).map(l => ({
-                    label: l.name,
+                    label: languageName(l, langPrefs.appLanguage),
                    value: l.code2,
                    key: l.code2 + l.code3,
                  }))}
@@ -1,6 +1,5 @@
 import React from 'react'

-import {logEvent} from '#/lib/statsig/statsig'
 import * as persisted from '#/state/persisted'

 type StateContext = {
@@ -27,11 +26,7 @@ function usePersistedBooleanValue<T extends keyof persisted.Schema>(key: T) {
    (value: Exclude<persisted.Schema[T], undefined>) => void
  >(
    hidden => {
-      const hide = Boolean(hidden)
-      if (!hide) {
-        logEvent('trendingTopics:show', {})
-      }
-      _set(hide)
+      _set(Boolean(hidden))
      persisted.write(key, hidden)
    },
    [key, _set],
@@ -9,6 +9,11 @@ import {useAgent} from '#/state/session'

 export type TrendingTopic = AppBskyUnspeccedDefs.TrendingTopic

+type Response = {
+  topics: TrendingTopic[]
+  suggested: TrendingTopic[]
+}
+
 export const DEFAULT_LIMIT = 14

 export const trendingTopicsQueryKey = ['trending-topics']
@@ -20,7 +25,7 @@ export function useTrendingTopics() {
    return preferences?.moderationPrefs?.mutedWords || []
  }, [preferences?.moderationPrefs])

-  return useQuery({
+  return useQuery<Response>({
    refetchOnWindowFocus: true,
    staleTime: STALE.MINUTES.THREE,
    queryKey: trendingTopicsQueryKey,
@@ -28,22 +33,29 @@ export function useTrendingTopics() {
      const {data} = await agent.api.app.bsky.unspecced.getTrendingTopics({
        limit: DEFAULT_LIMIT,
      })
-
-      const {topics, suggested} = data
      return {
-        topics: topics.filter(t => {
-          return !hasMutedWord({
-            mutedWords,
-            text: t.topic + ' ' + t.displayName + ' ' + t.description,
-          })
-        }),
-        suggested: suggested.filter(t => {
-          return !hasMutedWord({
-            mutedWords,
-            text: t.topic + ' ' + t.displayName + ' ' + t.description,
-          })
-        }),
+        topics: data.topics ?? [],
+        suggested: data.suggested ?? [],
      }
    },
+    select: React.useCallback(
+      (data: Response) => {
+        return {
+          topics: data.topics.filter(t => {
+            return !hasMutedWord({
+              mutedWords,
+              text: t.topic + ' ' + t.displayName + ' ' + t.description,
+            })
+          }),
+          suggested: data.suggested.filter(t => {
+            return !hasMutedWord({
+              mutedWords,
+              text: t.topic + ' ' + t.displayName + ' ' + t.description,
+            })
+          }),
+        }
+      },
+      [mutedWords],
+    ),
  })
 }
@@ -13,6 +13,7 @@ import {useNonReactiveCallback} from '#/lib/hooks/useNonReactiveCallback'
 import {postUriToRelativePath, toBskyAppUrl} from '#/lib/strings/url-helpers'
 import {purgeTemporaryImageFiles} from '#/state/gallery'
 import {precacheResolveLinkQuery} from '#/state/queries/resolve-link'
+import type {EmojiPickerPosition} from '#/view/com/composer/text-input/web/EmojiPicker.web'
 import * as Toast from '#/view/com/util/Toast'

 export interface ComposerOptsPostRef {
@@ -29,7 +30,7 @@ export interface ComposerOpts {
  onPost?: (postUri: string | undefined) => void
  quote?: AppBskyFeedDefs.PostView
  mention?: string // handle of user to mention
-  openEmojiPicker?: (pos: DOMRect | undefined) => void
+  openEmojiPicker?: (pos: EmojiPickerPosition | undefined) => void
  text?: string
  imageUris?: {uri: string; width: number; height: number; altText?: string}[]
  videoUri?: {uri: string; width: number; height: number}
@@ -2,6 +2,7 @@ import React, {useMemo} from 'react'
 import {msg} from '@lingui/macro'
 import {useLingui} from '@lingui/react'

+import {logEvent} from '#/lib/statsig/statsig'
 import {
  ProgressGuideToast,
  ProgressGuideToastRef,
@@ -137,6 +138,7 @@ export function Provider({children}: React.PropsWithChildren<{}>) {
      endProgressGuide() {
        setLocalGuideState(undefined)
        mutateAsync(undefined)
+        logEvent('progressGuide:hide', {})
      },

      captureAction(action: ProgressGuideAction, count = 1) {
@@ -92,6 +92,9 @@ a[role='link'][data-no-underline='1']:hover {
 }

 /* ProseMirror */
+.ProseMirror {
+  min-height: inherit;
+}
 .ProseMirror-dark {
  color: white;
 }
@@ -530,7 +530,14 @@ export const ComposePost = ({
  }

  const onEmojiButtonPress = useCallback(() => {
-    openEmojiPicker?.(textInput.current?.getCursorPosition())
+    const rect = textInput.current?.getCursorPosition()
+    if (rect) {
+      openEmojiPicker?.({
+        ...rect,
+        nextFocusRef:
+          textInput as unknown as React.MutableRefObject<HTMLElement>,
+      })
+    }
  }, [openEmojiPicker])

  const scrollViewRef = useAnimatedRef<Animated.ScrollView>()
@@ -48,7 +48,7 @@ export function SelectLangBtn() {
    function add(commaSeparatedLangCodes: string) {
      const langCodes = commaSeparatedLangCodes.split(',')
      const langName = langCodes
-        .map(code => codeToLanguageName(code))
+        .map(code => codeToLanguageName(code, langPrefs.appLanguage))
        .join(' + ')

      /*
@@ -108,7 +108,9 @@ export function SelectLangBtn() {
      accessibilityHint="">
      {postLanguagesPref.length > 0 ? (
        <Text type="lg-bold" style={[pal.link, styles.label]} numberOfLines={1}>
-          {postLanguagesPref.map(lang => codeToLanguageName(lang)).join(', ')}
+          {postLanguagesPref
+            .map(lang => codeToLanguageName(lang, langPrefs.appLanguage))
+            .join(', ')}
        </Text>
      ) : (
        <FontAwesomeIcon
@@ -49,37 +49,48 @@ export function SuggestedLanguage({text}: {text: string}) {
    return () => cancelIdle(idle)
  }, [text])

-  return suggestedLanguage &&
-    !toPostLanguages(langPrefs.postLanguage).includes(suggestedLanguage) ? (
-    <View style={[pal.border, styles.infoBar]}>
-      <FontAwesomeIcon
-        icon="language"
-        style={pal.text as FontAwesomeIconStyle}
-        size={24}
-      />
-      <Text style={[pal.text, s.flex1]}>
-        <Trans>
-          Are you writing in{' '}
-          <Text type="sm-bold" style={pal.text}>
-            {codeToLanguageName(suggestedLanguage)}
-          </Text>
-          ?
-        </Trans>
-      </Text>
+  if (
+    suggestedLanguage &&
+    !toPostLanguages(langPrefs.postLanguage).includes(suggestedLanguage)
+  ) {
+    const suggestedLanguageName = codeToLanguageName(
+      suggestedLanguage,
+      langPrefs.appLanguage,
+    )

-      <Button
-        type="default"
-        onPress={() => setLangPrefs.setPostLanguage(suggestedLanguage)}
-        accessibilityLabel={_(
-          msg`Change post language to ${codeToLanguageName(suggestedLanguage)}`,
-        )}
-        accessibilityHint="">
-        <Text type="button" style={[pal.link, s.fw600]}>
-          <Trans>Yes</Trans>
+    return (
+      <View style={[pal.border, styles.infoBar]}>
+        <FontAwesomeIcon
+          icon="language"
+          style={pal.text as FontAwesomeIconStyle}
+          size={24}
+        />
+        <Text style={[pal.text, s.flex1]}>
+          <Trans>
+            Are you writing in{' '}
+            <Text type="sm-bold" style={pal.text}>
+              {suggestedLanguageName}
+            </Text>
+            ?
+          </Trans>
        </Text>
-      </Button>
-    </View>
-  ) : null
+
+        <Button
+          type="default"
+          onPress={() => setLangPrefs.setPostLanguage(suggestedLanguage)}
+          accessibilityLabel={_(
+            msg`Change post language to ${suggestedLanguageName}`,
+          )}
+          accessibilityHint="">
+          <Text type="button" style={[pal.link, s.fw600]}>
+            <Trans>Yes</Trans>
+          </Text>
+        </Button>
+      </View>
+    )
+  } else {
+    return null
+  }
 }

 const styles = StyleSheet.create({
@@ -1,15 +1,13 @@
 import React from 'react'
-import {
-  GestureResponderEvent,
-  TouchableWithoutFeedback,
-  useWindowDimensions,
-  View,
-} from 'react-native'
+import {Pressable, useWindowDimensions, View} from 'react-native'
 import Picker from '@emoji-mart/react'
+import {msg} from '@lingui/macro'
+import {useLingui} from '@lingui/react'
 import {DismissableLayer} from '@radix-ui/react-dismissable-layer'
+import {FocusScope} from '@radix-ui/react-focus-scope'

 import {textInputWebEmitter} from '#/view/com/composer/text-input/textInputWebEmitter'
-import {atoms as a} from '#/alf'
+import {atoms as a, flatten} from '#/alf'
 import {Portal} from '#/components/Portal'

 const HEIGHT_OFFSET = 40
@@ -33,6 +31,7 @@ export interface EmojiPickerPosition {
  left: number
  right: number
  bottom: number
+  nextFocusRef: React.MutableRefObject<HTMLElement> | null
 }

 export interface EmojiPickerState {
@@ -51,6 +50,7 @@ interface IProps {
 }

 export function EmojiPicker({state, close, pinToTop}: IProps) {
+  const {_} = useLingui()
  const {height, width} = useWindowDimensions()

  const isShiftDown = React.useRef(false)
@@ -119,48 +119,63 @@ export function EmojiPicker({state, close, pinToTop}: IProps) {

  if (!state.isOpen) return null

-  const onPressBackdrop = (e: GestureResponderEvent) => {
-    // @ts-ignore web only
-    if (e.nativeEvent?.pointerId === -1) return
-    close()
-  }
-
  return (
    <Portal>
-      <TouchableWithoutFeedback
-        accessibilityRole="button"
-        onPress={onPressBackdrop}
-        accessibilityViewIsModal>
+      <FocusScope
+        loop
+        trapped
+        onUnmountAutoFocus={e => {
+          const nextFocusRef = state.pos.nextFocusRef
+          const node = nextFocusRef?.current
+          if (node) {
+            e.preventDefault()
+            node.focus()
+          }
+        }}>
+        <Pressable
+          accessible
+          accessibilityLabel={_(msg`Close emoji picker`)}
+          accessibilityHint={_(msg`Tap to close the emoji picker`)}
+          onPress={close}
+          style={[a.fixed, a.inset_0]}
+        />
+
        <View
-          style={[
+          style={flatten([
            a.fixed,
            a.w_full,
            a.h_full,
            a.align_center,
+            a.z_10,
            {
              top: 0,
              left: 0,
              right: 0,
            },
-          ]}>
-          {/* eslint-disable-next-line react-native-a11y/has-valid-accessibility-descriptors */}
-          <TouchableWithoutFeedback onPress={e => e.stopPropagation()}>
-            <View style={[{position: 'absolute'}, position]}>
-              <DismissableLayer
-                onFocusOutside={evt => evt.preventDefault()}
-                onDismiss={close}>
-                <Picker
-                  data={async () => {
-                    return (await import('./EmojiPickerData.json')).default
-                  }}
-                  onEmojiSelect={onInsert}
-                  autoFocus={true}
-                />
-              </DismissableLayer>
-            </View>
-          </TouchableWithoutFeedback>
+          ])}>
+          <View style={[{position: 'absolute'}, position]}>
+            <DismissableLayer
+              onFocusOutside={evt => evt.preventDefault()}
+              onDismiss={close}>
+              <Picker
+                data={async () => {
+                  return (await import('./EmojiPickerData.json')).default
+                }}
+                onEmojiSelect={onInsert}
+                autoFocus={true}
+              />
+            </DismissableLayer>
+          </View>
        </View>
-      </TouchableWithoutFeedback>
+
+        <Pressable
+          accessible
+          accessibilityLabel={_(msg`Close emoji picker`)}
+          accessibilityHint={_(msg`Tap to close the emoji picker`)}
+          onPress={close}
+          style={[a.fixed, a.inset_0]}
+        />
+      </FocusScope>
    </Portal>
  )
 }
@@ -5,12 +5,8 @@
 * LICENSE file in the root directory of this source tree.
 *
 */
-import {
-  SafeAreaView,
-  StyleSheet,
-  TouchableOpacity,
-  ViewStyle,
-} from 'react-native'
+import {StyleSheet, TouchableOpacity, ViewStyle} from 'react-native'
+import {SafeAreaView} from 'react-native-safe-area-context'
 import {FontAwesomeIcon} from '@fortawesome/react-native-fontawesome'
 import {msg} from '@lingui/macro'
 import {useLingui} from '@lingui/react'
@@ -40,6 +40,7 @@ import {
  useSafeAreaFrame,
  useSafeAreaInsets,
 } from 'react-native-safe-area-context'
+import * as ScreenOrientation from 'expo-screen-orientation'
 import {StatusBar} from 'expo-status-bar'
 import {FontAwesomeIcon} from '@fortawesome/react-native-fontawesome'
 import {Trans} from '@lingui/macro'
@@ -60,11 +61,12 @@ import ImageItem from './components/ImageItem/ImageItem'

 type Rect = {x: number; y: number; width: number; height: number}

+const PORTRAIT_UP = ScreenOrientation.OrientationLock.PORTRAIT_UP
 const PIXEL_RATIO = PixelRatio.get()
 const EDGES =
-  Platform.OS === 'android'
+  Platform.OS === 'android' && Platform.Version < 35
    ? (['top', 'bottom', 'left', 'right'] satisfies Edge[])
-    : (['left', 'right'] satisfies Edge[]) // iOS, so no top/bottom safe area
+    : ([] satisfies Edge[]) // iOS or Android 15+ bleeds into safe area

 const SLOW_SPRING: WithSpringConfig = {
  mass: isIOS ? 1.25 : 0.75,
@@ -102,6 +104,9 @@ export default function ImageViewRoot({
  'use no memo'
  const ref = useAnimatedRef<View>()
  const [activeLightbox, setActiveLightbox] = useState(nextLightbox)
+  const [orientation, setOrientation] = useState<'portrait' | 'landscape'>(
+    'portrait',
+  )
  const openProgress = useSharedValue(0)

  if (!activeLightbox && nextLightbox) {
@@ -140,6 +145,20 @@ export default function ImageViewRoot({
    },
  )

+  // Delay the unlock until after we've finished the scale up animation.
+  // It's complicated to do the same for locking it back so we don't attempt that.
+  useAnimatedReaction(
+    () => openProgress.get() === 1,
+    (isOpen, wasOpen) => {
+      if (isOpen && !wasOpen) {
+        runOnJS(ScreenOrientation.unlockAsync)()
+      } else if (!isOpen && wasOpen) {
+        // default is PORTRAIT_UP - set via config plugin in app.config.js -sfn
+        runOnJS(ScreenOrientation.lockAsync)(PORTRAIT_UP)
+      }
+    },
+  )
+
  const onFlyAway = React.useCallback(() => {
    'worklet'
    openProgress.set(0)
@@ -154,11 +173,21 @@ export default function ImageViewRoot({
      aria-modal
      accessibilityViewIsModal
      aria-hidden={!activeLightbox}>
-      <Animated.View ref={ref} style={{flex: 1}} collapsable={false}>
+      <Animated.View
+        ref={ref}
+        style={{flex: 1}}
+        collapsable={false}
+        onLayout={e => {
+          const layout = e.nativeEvent.layout
+          setOrientation(
+            layout.height > layout.width ? 'portrait' : 'landscape',
+          )
+        }}>
        {activeLightbox && (
          <ImageView
-            key={activeLightbox.id}
+            key={activeLightbox.id + '-' + orientation}
            lightbox={activeLightbox}
+            orientation={orientation}
            onRequestClose={onRequestClose}
            onPressSave={onPressSave}
            onPressShare={onPressShare}
@@ -174,6 +203,7 @@ export default function ImageViewRoot({

 function ImageView({
  lightbox,
+  orientation,
  onRequestClose,
  onPressSave,
  onPressShare,
@@ -182,6 +212,7 @@ function ImageView({
  openProgress,
 }: {
  lightbox: Lightbox
+  orientation: 'portrait' | 'landscape'
  onRequestClose: () => void
  onPressSave: (uri: string) => void
  onPressShare: (uri: string) => void
@@ -221,7 +252,7 @@ function ImageView({
    const openProgressValue = openProgress.get()
    if (openProgressValue < 1) {
      opacity = Math.sqrt(openProgressValue)
-    } else if (screenSize) {
+    } else if (screenSize && orientation === 'portrait') {
      const dragProgress = Math.min(
        Math.abs(dismissSwipeTranslateY.get()) / (screenSize.height / 2),
        1,
@@ -8,7 +8,8 @@ import {
  ViewStyle,
 } from 'react-native'
 import {AppBskyGraphDefs as GraphDefs} from '@atproto/api'
-import {Trans} from '@lingui/macro'
+import {msg} from '@lingui/macro'
+import {useLingui} from '@lingui/react'

 import {usePalette} from '#/lib/hooks/usePalette'
 import {cleanError} from '#/lib/strings/errors'
@@ -42,6 +43,7 @@ export function MyLists({
 }) {
  const pal = usePalette('default')
  const t = useTheme()
+  const {_} = useLingui()
  const moderationOpts = useModerationOpts()
  const [isPTRing, setIsPTRing] = React.useState(false)
  const {data, isFetching, isFetched, isError, error, refetch} =
@@ -63,6 +65,23 @@ export function MyLists({
    return items
  }, [isError, isEmpty, isFetched, isFetching, moderationOpts, data])

+  let emptyText
+  switch (filter) {
+    case 'curate':
+      emptyText = _(
+        msg`Public, sharable lists which can be used to drive feeds.`,
+      )
+      break
+    case 'mod':
+      emptyText = _(
+        msg`Public, sharable lists of users to mute or block in bulk.`,
+      )
+      break
+    default:
+      emptyText = _(msg`You have no lists.`)
+      break
+  }
+
  // events
  // =

@@ -108,16 +127,7 @@ export function MyLists({
                  maxWidth: 200,
                },
              ]}>
-              {filter === 'curate' && (
-                <Trans>
-                  Public, sharable lists which can be used to drive feeds.
-                </Trans>
-              )}
-              {filter === 'mod' && (
-                <Trans>
-                  Public, sharable lists of users to mute or block in bulk.
-                </Trans>
-              )}
+              {emptyText}
            </Text>
          </View>
        )
@@ -149,7 +159,7 @@ export function MyLists({
        </View>
      )
    },
-    [t, renderItem, error, onRefresh, filter],
+    [t, renderItem, error, onRefresh, emptyText],
  )

  if (inline) {
@@ -5,6 +5,7 @@ import {Trans} from '@lingui/macro'
 import {usePalette} from '#/lib/hooks/usePalette'
 import {useWebMediaQueries} from '#/lib/hooks/useWebMediaQueries'
 import {deviceLanguageCodes} from '#/locale/deviceLocales'
+import {languageName} from '#/locale/helpers'
 import {useModalControls} from '#/state/modals'
 import {
  useLanguagePrefs,
@@ -88,7 +89,7 @@ export function Component({}: {}) {
            key={lang.code2}
            code2={lang.code2}
            langType="contentLanguages"
-            name={lang.name}
+            name={languageName(lang, langPrefs.appLanguage)}
            onPress={() => {
              onPress(lang.code2)
            }}
@@ -5,6 +5,7 @@ import {Trans} from '@lingui/macro'
 import {usePalette} from '#/lib/hooks/usePalette'
 import {useWebMediaQueries} from '#/lib/hooks/useWebMediaQueries'
 import {deviceLanguageCodes} from '#/locale/deviceLocales'
+import {languageName} from '#/locale/helpers'
 import {useModalControls} from '#/state/modals'
 import {
  hasPostLanguage,
@@ -91,7 +92,7 @@ export function Component() {
          return (
            <ToggleButton
              key={lang.code2}
-              label={lang.name}
+              label={languageName(lang, langPrefs.appLanguage)}
              isSelected={isSelected}
              onPress={() => (isDisabled ? undefined : onPress(lang.code2))}
              style={[
@@ -714,7 +714,7 @@ function MobileComposePrompt({onPressReply}: {onPressReply: () => unknown}) {
        styles.prompt,
        fabMinimalShellTransform,
        {
-          bottom: clamp(safeAreaInsets.bottom, 13, 30),
+          bottom: clamp(safeAreaInsets.bottom, 13, 60),
        },
      ]}>
      <PostThreadComposePrompt onPressCompose={onPressReply} />
@@ -567,7 +567,6 @@ let PostThreadItemLoaded = ({
                timestamp={post.indexedAt}
                postHref={postHref}
                showAvatar={isThreadedChild}
-                avatarModeration={moderation.ui('avatar')}
                avatarSize={24}
                style={[a.pb_xs]}
              />
@@ -309,20 +309,19 @@ let PostFeed = ({

            if (hasSession) {
              if (feedKind === 'discover') {
-                if (sliceIndex === 0 && showProgressIntersitial) {
-                  arr.push({
-                    type: 'interstitialProgressGuide',
-                    key: 'interstitial-' + sliceIndex + '-' + lastFetchedAt,
-                  })
-                } else if (
-                  sliceIndex === 15 &&
-                  !gtTablet &&
-                  !trendingDisabled
-                ) {
-                  arr.push({
-                    type: 'interstitialTrending',
-                    key: 'interstitial-' + sliceIndex + '-' + lastFetchedAt,
-                  })
+                if (sliceIndex === 0) {
+                  if (showProgressIntersitial) {
+                    arr.push({
+                      type: 'interstitialProgressGuide',
+                      key: 'interstitial-' + sliceIndex + '-' + lastFetchedAt,
+                    })
+                  }
+                  if (!gtTablet && !trendingDisabled) {
+                    arr.push({
+                      type: 'interstitialTrending',
+                      key: 'interstitial2-' + sliceIndex + '-' + lastFetchedAt,
+                    })
+                  }
                } else if (sliceIndex === 30) {
                  arr.push({
                    type: 'interstitialFollows',
@@ -132,6 +132,7 @@ let List = React.forwardRef<ListMethods, ListProps>(
    if (refreshing !== undefined || onRefresh !== undefined) {
      refreshControl = (
        <RefreshControl
+          key={t.atoms.text.color}
          refreshing={refreshing ?? false}
          onRefresh={onRefresh}
          tintColor={t.atoms.text.color}
@@ -23,7 +23,7 @@ export function LoadingPlaceholder({
  style,
 }: {
  width: DimensionValue
-  height: DimensionValue
+  height: DimensionValue | undefined
  style?: StyleProp<ViewStyle>
 }) {
  const theme = useTheme()
@@ -1,6 +1,6 @@
 import React, {memo, useCallback} from 'react'
 import {StyleProp, View, ViewStyle} from 'react-native'
-import {AppBskyActorDefs, ModerationDecision, ModerationUI} from '@atproto/api'
+import {AppBskyActorDefs, ModerationDecision} from '@atproto/api'
 import {msg} from '@lingui/macro'
 import {useLingui} from '@lingui/react'
 import {useQueryClient} from '@tanstack/react-query'
@@ -26,7 +26,6 @@ interface PostMetaOpts {
  postHref: string
  timestamp: string
  showAvatar?: boolean
-  avatarModeration?: ModerationUI
  avatarSize?: number
  onOpenAuthor?: () => void
  style?: StyleProp<ViewStyle>
@@ -67,7 +66,7 @@ let PostMeta = (opts: PostMetaOpts): React.ReactNode => {
          <PreviewableUserAvatar
            size={opts.avatarSize || 16}
            profile={opts.author}
-            moderation={opts.avatarModeration}
+            moderation={opts.moderation?.ui('avatar')}
            type={opts.author.associated?.labeler ? 'labeler' : 'user'}
          />
        </View>
@@ -70,6 +70,10 @@ export function NativeDropdown({
  const menuRef = React.useRef<HTMLDivElement>(null)

  React.useEffect(() => {
+    if (!open) {
+      return
+    }
+
    function clickHandler(e: MouseEvent) {
      const t = e.target

@@ -26,7 +26,7 @@ import {useQueryClient} from '@tanstack/react-query'
 import {HITSLOP_20} from '#/lib/constants'
 import {usePalette} from '#/lib/hooks/usePalette'
 import {InfoCircleIcon} from '#/lib/icons'
-import {moderatePost_wrapped} from '#/lib/moderatePost_wrapped'
+import {moderatePost_wrapped as moderatePost} from '#/lib/moderatePost_wrapped'
 import {makeProfileLink} from '#/lib/routes/links'
 import {s} from '#/lib/styles'
 import {useModerationOpts} from '#/state/preferences/moderation-opts'
@@ -134,9 +134,7 @@ function QuoteEmbedModerated({
    [viewRecord],
  )
  const moderation = React.useMemo(() => {
-    return moderationOpts
-      ? moderatePost_wrapped(postView, moderationOpts)
-      : undefined
+    return moderationOpts ? moderatePost(postView, moderationOpts) : undefined
  }, [postView, moderationOpts])

  return (
@@ -295,10 +293,14 @@ export function QuoteX({onRemove}: {onRemove: () => void}) {

 export function LazyQuoteEmbed({uri}: {uri: string}) {
  const {data} = useResolveLinkQuery(uri)
+  const moderationOpts = useModerationOpts()
  if (!data || data.type !== 'record' || data.kind !== 'post') {
    return null
  }
-  return <QuoteEmbed quote={data.view} />
+  const moderation = moderationOpts
+    ? moderatePost(data.view, moderationOpts)
+    : undefined
+  return <QuoteEmbed quote={data.view} moderation={moderation} />
 }

 function viewRecordToPostView(
@@ -222,6 +222,7 @@ function ProfileListScreenLoaded({
                  scrollElRef={scrollElRef as ListRef}
                  headerHeight={headerHeight}
                  isFocused={isScreenFocused && isFocused}
+                  isOwner={isOwner}
                  onPressAddUser={onPressAddUser}
                />
              )}
@@ -774,11 +775,12 @@ interface FeedSectionProps {
  headerHeight: number
  scrollElRef: ListRef
  isFocused: boolean
+  isOwner: boolean
  onPressAddUser: () => void
 }
 const FeedSection = React.forwardRef<SectionRef, FeedSectionProps>(
  function FeedSectionImpl(
-    {feed, scrollElRef, headerHeight, isFocused, onPressAddUser},
+    {feed, scrollElRef, headerHeight, isFocused, isOwner, onPressAddUser},
    ref,
  ) {
    const queryClient = useQueryClient()
@@ -810,20 +812,22 @@ const FeedSection = React.forwardRef<SectionRef, FeedSectionProps>(
      return (
        <View style={[a.gap_xl, a.align_center]}>
          <EmptyState icon="hashtag" message={_(msg`This feed is empty.`)} />
-          <NewButton
-            label={_(msg`Start adding people`)}
-            onPress={onPressAddUser}
-            color="primary"
-            size="small"
-            variant="solid">
-            <ButtonIcon icon={PersonPlusIcon} />
-            <ButtonText>
-              <Trans>Start adding people!</Trans>
-            </ButtonText>
-          </NewButton>
+          {isOwner && (
+            <NewButton
+              label={_(msg`Start adding people`)}
+              onPress={onPressAddUser}
+              color="primary"
+              size="small"
+              variant="solid">
+              <ButtonIcon icon={PersonPlusIcon} />
+              <ButtonText>
+                <Trans>Start adding people!</Trans>
+              </ButtonText>
+            </NewButton>
+          )}
        </View>
      )
-    }, [_, onPressAddUser])
+    }, [_, onPressAddUser, isOwner])

    return (
      <View>
@@ -928,21 +932,23 @@ const AboutSection = React.forwardRef<SectionRef, AboutSectionProps>(
            icon="users-slash"
            message={_(msg`This list is empty.`)}
          />
-          <NewButton
-            testID="emptyStateAddUserBtn"
-            label={_(msg`Start adding people`)}
-            onPress={onPressAddUser}
-            color="primary"
-            size="small"
-            variant="solid">
-            <ButtonIcon icon={PersonPlusIcon} />
-            <ButtonText>
-              <Trans>Start adding people!</Trans>
-            </ButtonText>
-          </NewButton>
+          {isOwner && (
+            <NewButton
+              testID="emptyStateAddUserBtn"
+              label={_(msg`Start adding people`)}
+              onPress={onPressAddUser}
+              color="primary"
+              size="small"
+              variant="solid">
+              <ButtonIcon icon={PersonPlusIcon} />
+              <ButtonText>
+                <Trans>Start adding people!</Trans>
+              </ButtonText>
+            </NewButton>
+          )}
        </View>
      )
-    }, [_, onPressAddUser])
+    }, [_, onPressAddUser, isOwner])

    return (
      <View>
@@ -3,7 +3,6 @@ import {
  ActivityIndicator,
  Image,
  ImageStyle,
-  Platform,
  Pressable,
  StyleProp,
  StyleSheet,
@@ -35,7 +34,9 @@ import {
  NativeStackScreenProps,
  SearchTabNavigatorParams,
 } from '#/lib/routes/types'
+import {sanitizeDisplayName} from '#/lib/strings/display-names'
 import {augmentSearchQuery} from '#/lib/strings/helpers'
+import {languageName} from '#/locale/helpers'
 import {logger} from '#/logger'
 import {isNative, isWeb} from '#/platform/detection'
 import {listenSoftReset} from '#/state/events'
@@ -58,7 +59,13 @@ import {Text} from '#/view/com/util/text/Text'
 import {Explore} from '#/view/screens/Search/Explore'
 import {SearchLinkCard, SearchProfileCard} from '#/view/shell/desktop/Search'
 import {makeSearchQuery, parseSearchQuery} from '#/screens/Search/utils'
-import {atoms as a, useBreakpoints, useTheme as useThemeNew, web} from '#/alf'
+import {
+  atoms as a,
+  tokens,
+  useBreakpoints,
+  useTheme as useThemeNew,
+  web,
+} from '#/alf'
 import {Button, ButtonIcon, ButtonText} from '#/components/Button'
 import * as FeedCard from '#/components/FeedCard'
 import {SearchInput} from '#/components/forms/SearchInput'
@@ -213,7 +220,6 @@ let SearchScreenPostResults = ({
              refreshing={isPTR}
              onRefresh={onPullToRefresh}
              onEndReached={onEndReached}
-              // @ts-ignore web only -prf
              desktopFixedHeight
              contentContainerStyle={{paddingBottom: 100}}
            />
@@ -252,7 +258,6 @@ let SearchScreenUserResults = ({
            <ProfileCardWithFollowBtn profile={item} noBg />
          )}
          keyExtractor={item => item.did}
-          // @ts-ignore web only -prf
          desktopFixedHeight
          contentContainerStyle={{paddingBottom: 100}}
        />
@@ -298,7 +303,6 @@ let SearchScreenFeedsResults = ({
            </View>
          )}
          keyExtractor={item => item.uri}
-          // @ts-ignore web only -prf
          desktopFixedHeight
          contentContainerStyle={{paddingBottom: 100}}
        />
@@ -321,7 +325,7 @@ function SearchLanguageDropdown({
 }) {
  const t = useThemeNew()
  const {_} = useLingui()
-  const {contentLanguages} = useLanguagePrefs()
+  const {appLanguage, contentLanguages} = useLanguagePrefs()

  const items = React.useMemo(() => {
    return [
@@ -338,8 +342,8 @@ function SearchLanguageDropdown({
          index === self.findIndex(t => t.code2 === lang.code2), // remove dupes (which will happen)
      )
        .map(l => ({
-          label: l.name,
-          inputLabel: l.name,
+          label: languageName(l, appLanguage),
+          inputLabel: languageName(l, appLanguage),
          value: l.code2,
          key: l.code2 + l.code3,
        }))
@@ -358,7 +362,7 @@ function SearchLanguageDropdown({
          return a.label.localeCompare(b.label)
        }),
    )
-  }, [_, contentLanguages])
+  }, [_, appLanguage, contentLanguages])

  const style = {
    backgroundColor: t.atoms.bg_contrast_25.backgroundColor,
@@ -548,11 +552,7 @@ let SearchScreenInner = ({
    <Explore />
  ) : (
    <Layout.Center>
-      <View
-        // @ts-ignore web only -esb
-        style={{
-          height: Platform.select({web: '100vh'}),
-        }}>
+      <View style={web({height: '100vh'})}>
        {isDesktop && (
          <Text
            type="title"
@@ -848,7 +848,7 @@ export function SearchScreen(
        <Layout.Center>
          <View style={[a.p_md, a.pb_sm, a.gap_sm, t.atoms.bg]}>
            <View style={[a.flex_row, a.gap_sm]}>
-              {!gtMobile && (
+              {!gtMobile && !showAutocomplete && (
                <Button
                  testID="viewHeaderBackOrMenuBtn"
                  onPress={onPressMenu}
@@ -1025,7 +1025,9 @@ function SearchHistory({
  const {_} = useLingui()

  return (
-    <Layout.Content>
+    <Layout.Content
+      keyboardDismissMode="interactive"
+      keyboardShouldPersistTaps="handled">
      <View style={styles.searchHistoryContainer}>
        {(searchHistory.length > 0 || selectedProfiles.length > 0) && (
          <Text style={[pal.text, styles.searchHistoryTitle]}>
@@ -1041,10 +1043,12 @@ function SearchHistory({
            <RNGHScrollView
              keyboardShouldPersistTaps="handled"
              horizontal={true}
-              style={styles.profilesRow}
-              contentContainerStyle={{
-                borderWidth: 0,
-              }}>
+              style={[
+                a.flex_row,
+                a.flex_nowrap,
+                {marginHorizontal: -tokens.space._2xl},
+              ]}
+              contentContainerStyle={[a.px_2xl, a.border_0]}>
              {selectedProfiles.slice(0, 5).map((profile, index) => (
                <View
                  key={index}
@@ -1068,7 +1072,9 @@ function SearchHistory({
                      emoji
                      style={[pal.text, styles.profileName]}
                      numberOfLines={1}>
-                      {profile.displayName || profile.handle}
+                      {sanitizeDisplayName(
+                        profile.displayName || profile.handle,
+                      )}
                    </Text>
                  </Link>
                  <Pressable
@@ -1179,10 +1185,6 @@ const styles = StyleSheet.create({
  selectedProfilesContainerMobile: {
    height: 100,
  },
-  profilesRow: {
-    flexDirection: 'row',
-    flexWrap: 'nowrap',
-  },
  profileItem: {
    alignItems: 'center',
    marginRight: 15,
@@ -9,6 +9,7 @@ import {useModals} from '#/state/modals'
 import {ComposerOpts, useComposerState} from '#/state/shell/composer'
 import {
  EmojiPicker,
+  EmojiPickerPosition,
  EmojiPickerState,
 } from '#/view/com/composer/text-input/web/EmojiPicker.web'
 import {useBreakpoints, useTheme} from '#/alf'
@@ -42,16 +43,19 @@ function Inner({state}: {state: ComposerOpts}) {
  const {gtMobile} = useBreakpoints()
  const [pickerState, setPickerState] = React.useState<EmojiPickerState>({
    isOpen: false,
-    pos: {top: 0, left: 0, right: 0, bottom: 0},
+    pos: {top: 0, left: 0, right: 0, bottom: 0, nextFocusRef: null},
  })

-  const onOpenPicker = React.useCallback((pos: DOMRect | undefined) => {
-    if (!pos) return
-    setPickerState({
-      isOpen: true,
-      pos,
-    })
-  }, [])
+  const onOpenPicker = React.useCallback(
+    (pos: EmojiPickerPosition | undefined) => {
+      if (!pos) return
+      setPickerState({
+        isOpen: true,
+        pos,
+      })
+    },
+    [],
+  )

  const onClosePicker = React.useCallback(() => {
    setPickerState(prev => ({
@@ -134,7 +134,7 @@ export function BottomBar({navigation}: BottomTabBarProps) {
          styles.bottomBar,
          pal.view,
          pal.border,
-          {paddingBottom: clamp(safeAreaInsets.bottom, 15, 30)},
+          {paddingBottom: clamp(safeAreaInsets.bottom, 15, 60)},
          footerMinimalShellTransform,
        ]}
        onLayout={e => {
@@ -79,7 +79,12 @@ function Inner() {
          ) : !trending?.topics ? null : (
            <>
              {trending.topics.slice(0, TRENDING_LIMIT).map(topic => (
-                <TrendingTopicLink key={topic.link} topic={topic}>
+                <TrendingTopicLink
+                  key={topic.link}
+                  topic={topic}
+                  onPress={() => {
+                    logEvent('trendingTopic:click', {context: 'sidebar'})
+                  }}>
                  {({hovered}) => (
                    <TrendingTopic
                      size="small"
@@ -4202,15 +4202,6 @@
  dependencies:
    tslib "2"

-"@formatjs/intl-datetimeformat@^6.17.1":
-  version "6.17.1"
-  resolved "https://registry.yarnpkg.com/@formatjs/intl-datetimeformat/-/intl-datetimeformat-6.17.1.tgz#d5e800891f9d79c8f1af1999f51db51f1384eca1"
-  integrity sha512-a18NqRo6R73xpREuMZo8FqjO+LnYFDHoeoviTh5de4ebI46wqLSDgbAIKoceuWblTQt8bvCpJIwvKgLItea88Q==
-  dependencies:
-    "@formatjs/ecma402-abstract" "2.3.1"
-    "@formatjs/intl-localematcher" "0.5.9"
-    tslib "2"
-
 "@formatjs/intl-enumerator@1.8.7":
  version "1.8.7"
  resolved "https://registry.yarnpkg.com/@formatjs/intl-enumerator/-/intl-enumerator-1.8.7.tgz#3f004753333f80cc468ae34046bd8416772a0412"
@@ -4304,10 +4295,10 @@
  dependencies:
    nanoid "^3.3.1"

-"@haileyok/bluesky-video@0.2.4":
-  version "0.2.4"
-  resolved "https://registry.yarnpkg.com/@haileyok/bluesky-video/-/bluesky-video-0.2.4.tgz#1591cbf744640e0cdac2a4bcaec22df916ce34b5"
-  integrity sha512-Vm2rdZYPUwD8Ncxqyy+YlBVhtJFkLhutGyoZayZJ5ATV/S8msbN4RK8MgXLvzlJfW497cLbk1w6M8kPU1xoDEQ==
+"@haileyok/bluesky-video@0.2.6":
+  version "0.2.6"
+  resolved "https://registry.yarnpkg.com/@haileyok/bluesky-video/-/bluesky-video-0.2.6.tgz#61bb4ff908498558fd2320f06ba0f74ea03598b4"
+  integrity sha512-IlzrTATD7ci/a+ehSA7pIhOvxxNTe35zdzBYt8EmVvKKafyeFhxGfDuuP5qxfQmHurcQMIL+3HeZgnAXwQQNmQ==

 "@hapi/accept@^6.0.3":
  version "6.0.3"
@@ -4999,12 +4990,12 @@
    "@babel/runtime" "^7.20.13"
    "@lingui/core" "4.14.1"

-"@mattermost/react-native-paste-input@^0.7.1":
-  version "0.7.1"
-  resolved "https://registry.yarnpkg.com/@mattermost/react-native-paste-input/-/react-native-paste-input-0.7.1.tgz#f14585030b992cf7c9bbd0921225eefa501756ba"
-  integrity sha512-kY8LKtqRX2T/rtn/HNrzTitijuATvyzd6yl5WNWOsszmyzNcssKStjjCTBup04CyMxfwutUU1CWrYUb3hQO7oA==
+"@mattermost/react-native-paste-input@^0.8.1":
+  version "0.8.1"
+  resolved "https://registry.yarnpkg.com/@mattermost/react-native-paste-input/-/react-native-paste-input-0.8.1.tgz#944ec69d0c49c3607265a02ad04103cc5b556caf"
+  integrity sha512-QHpwWORPALmX5FczCewRlJkVqtltD84mlpMpto5IGLKdHMAoHeXMiG4VJVh2XkRQvTyUhYegtrUrJzf8dkJokA==
  dependencies:
-    semver "7.6.0"
+    semver "7.6.3"

 "@messageformat/parser@^5.0.0":
  version "5.1.0"
@@ -10630,6 +10621,11 @@ expo-pwa@0.0.127:
    commander "2.20.0"
    update-check "1.5.3"

+expo-screen-orientation@^8.0.2:
+  version "8.0.2"
+  resolved "https://registry.yarnpkg.com/expo-screen-orientation/-/expo-screen-orientation-8.0.2.tgz#69139a1967557a331188d36b4dd615a0e220c2a0"
+  integrity sha512-YsY7Oumlv1WsHLQVgl1f+vAiMZfzUPGyVF2xc7jxmHKtM+jMzIflDl2qKLGfoB0S9Pgg6Z8V4+c+A8wlCURw4A==
+
 expo-sharing@^13.0.0:
  version "13.0.0"
  resolved "https://registry.yarnpkg.com/expo-sharing/-/expo-sharing-13.0.0.tgz#fbc46f4afdaa265a2811fe88c2a589aae2d2de0f"
@@ -15963,10 +15959,10 @@ react-native-dotenv@^3.4.11:
  dependencies:
    dotenv "^16.4.5"

-react-native-drawer-layout@^4.0.4:
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/react-native-drawer-layout/-/react-native-drawer-layout-4.0.4.tgz#b1b3f2dffd3653527def1d26f4a0cf3c98b9fb5e"
-  integrity sha512-yskKj1Kxbf5w5gInNEW4YtDkTUcMsoQ0FGH0wjQ3nHPAJ3AAVnr/QgZ1Hr4LeAQR+7vgaG058DX4/32WbwvQzA==
+react-native-drawer-layout@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/react-native-drawer-layout/-/react-native-drawer-layout-4.1.1.tgz#7fce1b3d3ddd9fc5d781c73d13b814d022b90114"
+  integrity sha512-ob6O3ph7PZ3A2FpdlsSxHuMpHDXREZPR8A6S3q0dSxV7i6d+8Z6CPCTbegfN2QZyizSow9NLrKyXP93tlqZ3dA==
  dependencies:
    use-latest-callback "^0.2.1"

@@ -16907,12 +16903,10 @@ semver-compare@^1.0.0:
  resolved "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz#0dee216a1c941ab37e9efb1788f6afc5ff5537fc"
  integrity sha512-YM3/ITh2MJ5MtzaM429anh+x2jiLVjqILF4m4oyQB18W7Ggea7BfqdH/wGMK7dDiMghv/6WG7znWMwUDzJiXow==

-semver@7.6.0:
-  version "7.6.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.0.tgz#1a46a4db4bffcccd97b743b5005c8325f23d4e2d"
-  integrity sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==
-  dependencies:
-    lru-cache "^6.0.0"
+semver@7.6.3, semver@^7.1.3, semver@^7.6.3:
+  version "7.6.3"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.3.tgz#980f7b5550bc175fb4dc09403085627f9eb33143"
+  integrity sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==

 semver@^5.5.0, semver@^5.6.0:
  version "5.7.2"
@@ -16924,11 +16918,6 @@ semver@^6.0.0, semver@^6.3.0, semver@^6.3.1:
  resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"
  integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==

-semver@^7.1.3, semver@^7.6.3:
-  version "7.6.3"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.3.tgz#980f7b5550bc175fb4dc09403085627f9eb33143"
-  integrity sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==
-
 semver@^7.3.5, semver@^7.3.7, semver@^7.3.8, semver@^7.5.3, semver@^7.5.4:
  version "7.5.4"
  resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e"
Author	SHA1	Message	Date
Dan Abramov	cee324c15a	Delete <AppProfiler>	2025-01-08 18:43:24 +00:00
Christian Schmidt	aa3d8c5230	Preconnect to public.api.bsky.app (#7396 )	2025-01-08 17:21:21 +00:00
Roland Crosby	c564981405	Add key to invalidate spinner when theme changes (#7351 )	2025-01-08 00:13:03 +00:00
Samuel Newman	f61390fdf4	Hide menu button when search is focused (#7373 ) * hide menu btn when cancel is shown * remove useless ts-ignores	2025-01-07 22:21:58 +00:00
dan	f3229d554b	Bump version to 1.97.0 (#7386 )	2025-01-07 21:14:14 +00:00
Dan Abramov	89353c6f22	Remove unused default argument	2025-01-07 21:07:06 +00:00
Jonathan Herbert	cdd7d040b9	Fix `moveToPermanentPath` ext Default Missing '.' (#7281 )	2025-01-07 19:13:01 +00:00
Samuel Newman	fe8d3b081c	Fix double text input in composer (#7381 ) * upgrade paste input * override how backing uitextinput is created * different approach	2025-01-07 18:29:27 +00:00
Hailey	615bbc3532	bump version (#7337 )	2025-01-02 16:10:34 -08:00
bnewbold	59709ad8d8	bump golang version to v1.23 (#7325 )	2025-01-02 12:57:03 -08:00
dan	85ad52e398	Add loading state to new trending interstitial (#7332 )	2025-01-02 20:20:40 +00:00
dan	3e0ed3b834	Remove upstreamed drawer patch (#7331 ) * Remove upstreamed drawer patch * Bump more	2025-01-02 20:20:30 +00:00
dan	c11a90124c	Fix key issue in trending topics (#7329 )	2025-01-02 17:27:15 +00:00
Stanislas Signoud	9f075b1340	Localize lang selectors according to the app language (#6207 ) * Localize lang selectors according to the app language * Explicitly ignore RangeError when translating locale names	2024-12-31 13:27:14 -08:00
Paul Frazee	09297d92cb	Release 1.96.3 (#7318 ) * Run intl extract * 1.96.3	2024-12-31 13:06:33 -08:00
Yiannis Mertzanis	2300410b4d	Add Greek Language ('el') Support and Internationalization (#6677 ) * Add Greek language support to the application * Add support for Greek language in date handling and tests * Update Greek locale file with translator and team information * Add support for Greek language in date handling and tests * Add support for Greek language in app configuration, and updated translation from the reviewers' comments * Update src/locale/i18n.ts Co-authored-by: surfdude29 <149612116+surfdude29@users.noreply.github.com> * Update src/locale/i18n.ts Co-authored-by: surfdude29 <149612116+surfdude29@users.noreply.github.com> --------- Co-authored-by: Paul Frazee <pfrazee@gmail.com> Co-authored-by: surfdude29 <149612116+surfdude29@users.noreply.github.com>	2024-12-31 12:28:17 -08:00
f e l p s	30d110dbcd	PT-BR Translation update (#6975 ) * PT-BR Translation update to 1.95.0 * PT-BR Translation update to 1.95.0 --------- Co-authored-by: Paul Frazee <pfrazee@gmail.com>	2024-12-31 12:25:42 -08:00
Virenbar	af94b79e2c	Update Russian localization (#7116 ) * Update messages.po * Update messages.po * Update messages.po (е -> ё) * Update messages.po (plurals) * Update messages.po * Update messages.po More е -> ё Fix some strings * Update messages.po * Update messages.po * Update messages.po (draft) * Update messages.po * Update messages.po * Update messages.po --------- Co-authored-by: ponfertato <ponfertato@ya.ru>	2024-12-31 12:20:38 -08:00
Takayuki KUSANO	6e94de9f83	Update Japanese translation (#7170 ) * Update translation * Update translation	2024-12-31 12:20:01 -08:00
Minseo Lee	9dc04bbfb0	Update Korean localization (#7171 ) * Update messages.po * Update messages.po * Update src/locale/locales/ko/messages.po Co-authored-by: Akamig <akamig@posteo.net> * Update messages.po * Update messages.po * Update messages.po * Update messages.po * Update messages.po * Update messages.po --------- Co-authored-by: Akamig <akamig@posteo.net>	2024-12-31 12:19:43 -08:00
Ivan Beà	eb3bfc9ff0	Update catalan messages.po for 1.96.0 (#7182 ) * Update catalan messages.po Ready for 1.96.0 Please take a look at it @jordimas @darccio @surfdude29 @rortan134 @magarcia @aryiu * Update messages.po Tema del moment per Trending Topic segons optimot https://aplicacions.llengua.gencat.cat/llc/AppJava/index.html;jsessionid=43E324EDAEFCD750A95579FEB9B5A164?action=Principal&method=detall&input_cercar=trending+topic&numPagina=1&database=TERMCAT&idFont=3279826&idHit=3279826&tipusFont=Diccionaris+terminol%F2gics+del+TERMCAT&numeroResultat=8&databases_avansada=&categories_avansada=&clickLink=detall&titol=tema+del+moment&tematica=Tecnologies+de+la+informaci%F3+i+la+comunicaci%F3&t%C3%ADtol=tema%20del%20moment&tipusCerca=cerca.tot	2024-12-31 12:19:22 -08:00
Valtteri Laitinen	ad42a9297a	Update Finnish localization (#7183 ) * Remove obsolete Finnish strings * Update and adjust Finnish locale	2024-12-31 12:18:43 -08:00
Michele Locati	97288983c3	Update Italian translations (#7184 ) * Update po from Transifex * Update Italian translations * Update Italian translations * Update Italian translations * Update Italian translations * Update Italian translations * Update Italian translations * Update Italian translations --------- Co-authored-by: GitHub <noreply@github.com>	2024-12-31 12:18:16 -08:00
voitech	0118fe75e0	Update Polish translation (#7206 ) Translated new strings and corrected various errors.	2024-12-31 12:16:18 -08:00
smileyhead	e44726529c	Update Hungarian translation for 1.96 (#7219 ) * Update Hungarian translation for 1.96 * Update Hungarian translation	2024-12-31 11:40:12 -08:00
Gerson Lázaro	619da81911	Fix Spanish translations for some messages (#7233 ) * Fix Spanish translations for some messages * Fix minor issues in es localization - Use "etiqueta" instead of "tag" - Use "eliminar" instead of "remover" - Unify "entrar en pantalla completa" - Use "Clic" instead of "Click" - Use "paquete de inicio" instead of "pack de inicio" - Unify use of "trasladado" instead of "mudado" - Unify use of "solo" instead of "sólo" - Unify use of "feed" instead of "noticias" - Unify use of quotes for "me gusta" as "likes" - Improve sentences using "2FA" - Unify sentences mentioning quote posts (citas) - Other small inconsistencies - Tú vs usted inconsistencies: - agregue -> agrega - inténtelo -> inténtalo - cierre -> cierra - su -> tu - complete -> completa - comience -> comienza - seleccionaba -> seleccionabas - intentaba -> intentabas - puede -> puedes - Inconsistencies to discuss and solve - Post: use of "post" and "publicación" - Repost: use of "repost"/"repostear" and "republicación"/"republicar" - Add: use of "agregar"/"agrega" and "añadir"/"añade" - Feed: use of Feeds in uppercase - Video: use of vídeo (es-ES) or video - User and account ("usuario" and "cuenta") - Punctuation consistency - Uppercase and lowercase consistency * Fix typos and improve Spanish localization in messages.po --------- Co-authored-by: Daniel García Ruano <dgruano.code@gmail.com>	2024-12-31 11:36:33 -08:00
Frudrax Cheng	cf1ccdf8e3	Update Chinese & Cantonese localization (#7235 ) * Update translates from crowdin * Convert language codes from RFC-1766 to RFC-4646 * Update translates from crowdin * Update deviceLocales.ts * Revert 'changes zh-HK to yue' * Fix zh-HK messages.po * Revert 'en/messages.po' * Update deviceLocales.ts * Revert code comments * Update translates from crowdin * zh-TW: Improved translations	2024-12-31 11:34:48 -08:00
Stanislas Signoud	444c4a944e	Update French translation (1.96.3 or 1.97) (#7299 ) * Bump locales in French * Translate French strings for 1.97 (or 1.96.3)	2024-12-31 11:30:49 -08:00
Lucasofchirstms	8af540f284	Update messages.po (#7305 )	2024-12-31 11:27:56 -08:00
Hailey	6c40efb3a3	change copy on list blocked (#7316 )	2024-12-31 11:24:50 -08:00
Paul Frazee	2dc6932f29	Rework discover-feed trending interstitial (#7314 ) * Rework discover-feed trending interstitial to take one row * Fix loading state * Try putting it at the top * Color consistency * Tweak some spacing * Show trending when progress guide is there	2024-12-31 09:44:52 -08:00
Eric Bailey	c6d26a0a9c	Some metrics (#7294 ) * Add trending metrics * Progress guide events * Fix naming, improve existing events	2024-12-27 14:21:17 -08:00
Eric Bailey	8b7a331815	Fix mute words in trending (#7293 )	2024-12-27 14:19:02 -08:00
Hailey	d27ed32188	bump video version, fix android crash (#7292 )	2024-12-27 13:10:01 -08:00
Samuel Newman	6c9e1d4837	Unlock orientation when lightbox is open (#7257 ) * unlock orientation when lightbox is open * rm outer safe area view, make sure alt text is safe * restore safe area view for android 14 and below * lock orientation on launch for android * set system ui background to black when lightbox is open * reset state on relayout * catch async functions with noops * rm superfluous catches * Delay unlock until after animation * Simplify how key is determined * Make landscape backdrop opaque --------- Co-authored-by: Dan Abramov <dan.abramov@gmail.com>	2024-12-24 20:05:54 +00:00
Minseo Lee	f05962a492	Fix Nepali language code (#7265 ) * Replace `np` with `ne` * Reorder	2024-12-24 16:54:05 +00:00
Samuel Newman	2b28c85b43	Cropper - opt out of edge-to-edge enforcement on Android 15 (#7254 ) * opt out of edge-to-edge enforcement * revert unintended change	2024-12-23 18:17:09 +00:00
Ahmed Soliman	1e4ea1a271	checking list/feed owner on empty state when prompting to add users (#7247 )	2024-12-23 17:42:10 +00:00
Barry Pollard	08a5f7a0bd	Correct font preload (#7249 )	2024-12-23 17:41:00 +00:00
Samuel Newman	5020e4233a	make horizontal scrollview touch edges (#7256 )	2024-12-23 15:58:54 +00:00
Christian Schmidt	190c7d6ed8	Extend clickable area to height of container (#7248 )	2024-12-23 15:12:38 +00:00
Christian Schmidt	9d4ae02300	Make "Retry" translatable (#7243 )	2024-12-22 17:45:08 +00:00
Christian Schmidt	fa2072cefa	Apply avatar moderation to quote post (#7229 )	2024-12-20 23:15:45 +00:00
Dan Abramov	3aa1a5f884	Bump	2024-12-20 21:34:10 +00:00
Dan Abramov	7d86bba7f1	Fix Android save to camera permissions	2024-12-20 21:34:10 +00:00
Samuel Newman	f5a9ac1313	fix lightbox on android 15 (#7221 )	2024-12-20 20:39:18 +00:00
Samuel Newman	c5421596a8	fix recent searches tap handling (#7214 )	2024-12-20 20:37:55 +00:00
Samuel Newman	8f7a6e5ffc	add default empty state text (#7212 )	2024-12-20 20:33:34 +00:00
Hailey	aeb78daf84	bump package (#7223 )	2024-12-20 20:15:21 +00:00
Eric Bailey	8116d12c15	Fix Emoji picker focus (#7217 ) * Only portal the emoji picker where needed * Add optional portal prop to emoji picker * Use FocusScope to our advantage * Pare back, add guards, fix focus trap * Don't return focus to emoji button * Set DM input position on emoji insert * Let the caller determine next focus node --------- Co-authored-by: Dan Abramov <dan.abramov@gmail.com>	2024-12-20 19:59:33 +00:00
dan	8a3dfcb9d0	Don't add unused keydown listeners (#7218 )	2024-12-20 18:00:30 +00:00
Samuel Newman	6afa44ddcb	Moderate composer quote (#7213 ) * moderate composer quote * consistency with other uses	2024-12-20 16:57:19 +00:00
dan	ab0697a0ec	Bump clamp max value (#7198 )	2024-12-19 23:14:33 +00:00
Dan Abramov	7f63679a5e	Fix build	2024-12-19 21:57:45 +00:00
Hailey	975e61d450	bump (#7197 )	2024-12-19 13:51:18 -08:00
dan	10981eec50	Proper fix for iOS cropper being stuck (#7194 ) * Revert "Add iOS hack to fix cropper failing to show (#7191)" This reverts commit `25d20c6395`. * Proper fix	2024-12-19 21:47:00 +00:00
dan	fb920f89d1	Revert "Fix post time localization on Android (#6742 )" (#7196 ) This reverts commit `b1b6affb71`.	2024-12-19 21:45:44 +00:00
dan	25d20c6395	Add iOS hack to fix cropper failing to show (#7191 ) * Add iOS hack to fix cropper failing to show * Make it 800	2024-12-19 21:12:58 +00:00