Merge branch 'main' into candidate

.github/workflows/build.yml

@@ -7,12 +7,12 @@ on:
 
 jobs:
   build-ios:
-    runs-on: macos-13
+    runs-on: macos-14
     steps:
-      - uses: tj-actions/branch-names@v6
+      - uses: tj-actions/branch-names@v8
         id: branch
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
         with:
           node-version-file: '.nvmrc'
       - run: corepack enable
@@ -20,7 +20,7 @@ jobs:
       - run: bundle install
       - run: yarn app:build ios
         env:
-          DEVELOPER_DIR: /Applications/Xcode_14.3.1.app/Contents/Developer
+          DEVELOPER_DIR: /Applications/Xcode_15.2.app/Contents/Developer
           ENVIRONMENT: ${{ steps.branch.outputs.current_branch }}
           SENTRY_ENVIRONMENT: ${{ steps.branch.outputs.current_branch }}
           LC_ALL: en_US.UTF-8
@@ -38,18 +38,18 @@ jobs:
           GH_PAT_GET_RELEASE: ${{ secrets.GITHUB_TOKEN }}
 
   build-android:
-    runs-on: macos-13
+    runs-on: macos-14
     steps:
-      - uses: tj-actions/branch-names@v6
+      - uses: tj-actions/branch-names@v8
         id: branch
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
         with:
           node-version-file: '.nvmrc'
-      - uses: actions/setup-java@v3
+      - uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
-          java-version: '11'
+          java-version: '17'
       - run: corepack enable
       - run: yarn install
       - run: bundle install
@@ -67,19 +67,19 @@ jobs:
           GH_PAT_GET_RELEASE: ${{ secrets.GITHUB_TOKEN }}
 
   create-release:
-    runs-on: macos-13
+    runs-on: macos-14
     needs: [build-ios, build-android]
     steps:
-      - uses: tj-actions/branch-names@v6
+      - uses: tj-actions/branch-names@v8
         id: branch
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
         with:
           node-version-file: '.nvmrc'
-      - uses: actions/setup-java@v3
+      - uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
-          java-version: '11'
+          java-version: '17'
       - run: corepack enable
       - run: yarn install
       - run: bundle install

.nvmrc

@@ -1 +1 @@
-18
+20

.yarnrc.yml

@@ -1,7 +1,7 @@
+compressionLevel: mixed
+
+enableGlobalCache: false
+
 nodeLinker: node-modules
 
-plugins:
+yarnPath: .yarn/releases/yarn-4.1.0.cjs
-  - path: .yarn/plugins/@yarnpkg/plugin-typescript.cjs
-    spec: "@yarnpkg/plugin-typescript"
-  - path: .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
-    spec: "@yarnpkg/plugin-interactive-tools"

android/gradle.properties

@@ -43,10 +43,10 @@ newArchEnabled=false
 # If set to false, you will be using JSC instead.
 hermesEnabled=true
 
-org.gradle.jvmargs=-Xmx4096m -XX:MaxPermSize=4096m -XX:+HeapDumpOnOutOfMemoryError
+org.gradle.jvmargs=-Xmx2048m -XX:MaxMetaspaceSize=512m
-org.gradle.daemon=true
+# org.gradle.daemon=true
-org.gradle.parallel=true
+# org.gradle.parallel=true
-org.gradle.configureondemand=true
+# org.gradle.configureondemand=true
 
 # The hosted JavaScript engine
 # Supported values: expo.jsEngine = "hermes" | "jsc"

fastlane/metadata/en-US/release_notes.txt

@@ -1 +1 @@
-Enjoy toooting! This version includes following improvements and fixes:
+Enjoy toooting! This version includes improvements and fixes.

fastlane/metadata/zh-Hans/release_notes.txt

@@ -1 +1 @@
-tooot-ing愉快！此版本包括以下改进和修复：
+tooot-ing愉快！此版本包括改进和修复。

ios/Podfile.lock

@@ -6,7 +6,7 @@ PODS:
   - EXAV (13.5.0):
     - ExpoModulesCore
     - ReactCommon/turbomodule/core
-  - EXConstants (14.5.0):
+  - EXConstants (14.5.1):
     - ExpoModulesCore
   - EXFileSystem (15.5.0):
     - ExpoModulesCore
@@ -14,7 +14,7 @@ PODS:
     - ExpoModulesCore
   - EXNotifications (0.20.1):
     - ExpoModulesCore
-  - Expo (49.0.6):
+  - Expo (49.0.18):
     - ExpoModulesCore
   - ExpoCrypto (12.5.0):
     - ExpoModulesCore
@@ -30,7 +30,7 @@ PODS:
     - ExpoModulesCore
   - ExpoLocalization (14.3.0):
     - ExpoModulesCore
-  - ExpoModulesCore (1.5.9):
+  - ExpoModulesCore (1.5.11):
     - RCT-Folly (= 2021.07.22.00)
     - React-Core
     - React-NativeModulesApple
@@ -54,19 +54,19 @@ PODS:
     - ExpoModulesCore
     - RCT-Folly (= 2021.07.22.00)
     - React-Core
-  - FBLazyVector (0.72.3)
+  - FBLazyVector (0.72.6)
-  - FBReactNativeSpec (0.72.3):
+  - FBReactNativeSpec (0.72.6):
     - RCT-Folly (= 2021.07.22.00)
-    - RCTRequired (= 0.72.3)
+    - RCTRequired (= 0.72.6)
-    - RCTTypeSafety (= 0.72.3)
+    - RCTTypeSafety (= 0.72.6)
-    - React-Core (= 0.72.3)
+    - React-Core (= 0.72.6)
-    - React-jsi (= 0.72.3)
+    - React-jsi (= 0.72.6)
-    - ReactCommon/turbomodule/core (= 0.72.3)
+    - ReactCommon/turbomodule/core (= 0.72.6)
   - fmt (6.2.1)
   - glog (0.3.5)
-  - hermes-engine (0.72.3):
+  - hermes-engine (0.72.6):
-    - hermes-engine/Pre-built (= 0.72.3)
+    - hermes-engine/Pre-built (= 0.72.6)
-  - hermes-engine/Pre-built (0.72.3)
+  - hermes-engine/Pre-built (0.72.6)
   - libaom (3.0.0):
     - libvmaf (>= 2.2.0)
   - libavif (0.11.1):
@@ -77,21 +77,21 @@ PODS:
     - libavif/core
   - libevent (2.1.12)
   - libvmaf (2.3.1)
-  - libwebp (1.3.1):
+  - libwebp (1.3.2):
-    - libwebp/demux (= 1.3.1)
+    - libwebp/demux (= 1.3.2)
-    - libwebp/mux (= 1.3.1)
+    - libwebp/mux (= 1.3.2)
-    - libwebp/sharpyuv (= 1.3.1)
+    - libwebp/sharpyuv (= 1.3.2)
-    - libwebp/webp (= 1.3.1)
+    - libwebp/webp (= 1.3.2)
-  - libwebp/demux (1.3.1):
+  - libwebp/demux (1.3.2):
     - libwebp/webp
-  - libwebp/mux (1.3.1):
+  - libwebp/mux (1.3.2):
     - libwebp/demux
-  - libwebp/sharpyuv (1.3.1)
+  - libwebp/sharpyuv (1.3.2)
-  - libwebp/webp (1.3.1):
+  - libwebp/webp (1.3.2):
     - libwebp/sharpyuv
-  - MMKV (1.3.0):
+  - MMKV (1.3.1):
-    - MMKVCore (~> 1.3.0)
+    - MMKVCore (~> 1.3.1)
-  - MMKVCore (1.3.0)
+  - MMKVCore (1.3.1)
   - RCT-Folly (2021.07.22.00):
     - boost
     - DoubleConversion
@@ -109,26 +109,26 @@ PODS:
     - fmt (~> 6.2.1)
     - glog
     - libevent
-  - RCTRequired (0.72.3)
+  - RCTRequired (0.72.6)
-  - RCTTypeSafety (0.72.3):
+  - RCTTypeSafety (0.72.6):
-    - FBLazyVector (= 0.72.3)
+    - FBLazyVector (= 0.72.6)
-    - RCTRequired (= 0.72.3)
+    - RCTRequired (= 0.72.6)
-    - React-Core (= 0.72.3)
+    - React-Core (= 0.72.6)
-  - React (0.72.3):
+  - React (0.72.6):
-    - React-Core (= 0.72.3)
+    - React-Core (= 0.72.6)
-    - React-Core/DevSupport (= 0.72.3)
+    - React-Core/DevSupport (= 0.72.6)
-    - React-Core/RCTWebSocket (= 0.72.3)
+    - React-Core/RCTWebSocket (= 0.72.6)
-    - React-RCTActionSheet (= 0.72.3)
+    - React-RCTActionSheet (= 0.72.6)
-    - React-RCTAnimation (= 0.72.3)
+    - React-RCTAnimation (= 0.72.6)
-    - React-RCTBlob (= 0.72.3)
+    - React-RCTBlob (= 0.72.6)
-    - React-RCTImage (= 0.72.3)
+    - React-RCTImage (= 0.72.6)
-    - React-RCTLinking (= 0.72.3)
+    - React-RCTLinking (= 0.72.6)
-    - React-RCTNetwork (= 0.72.3)
+    - React-RCTNetwork (= 0.72.6)
-    - React-RCTSettings (= 0.72.3)
+    - React-RCTSettings (= 0.72.6)
-    - React-RCTText (= 0.72.3)
+    - React-RCTText (= 0.72.6)
-    - React-RCTVibration (= 0.72.3)
+    - React-RCTVibration (= 0.72.6)
-  - React-callinvoker (0.72.3)
+  - React-callinvoker (0.72.6)
-  - React-Codegen (0.72.3):
+  - React-Codegen (0.72.6):
     - DoubleConversion
     - FBReactNativeSpec
     - glog
@@ -143,11 +143,11 @@ PODS:
     - React-rncore
     - ReactCommon/turbomodule/bridging
     - ReactCommon/turbomodule/core
-  - React-Core (0.72.3):
+  - React-Core (0.72.6):
     - glog
     - hermes-engine
     - RCT-Folly (= 2021.07.22.00)
-    - React-Core/Default (= 0.72.3)
+    - React-Core/Default (= 0.72.6)
     - React-cxxreact
     - React-hermes
     - React-jsi
@@ -157,7 +157,7 @@ PODS:
     - React-utils
     - SocketRocket (= 0.6.1)
     - Yoga
-  - React-Core/CoreModulesHeaders (0.72.3):
+  - React-Core/CoreModulesHeaders (0.72.6):
     - glog
     - hermes-engine
     - RCT-Folly (= 2021.07.22.00)
@@ -171,7 +171,7 @@ PODS:
     - React-utils
     - SocketRocket (= 0.6.1)
     - Yoga
-  - React-Core/Default (0.72.3):
+  - React-Core/Default (0.72.6):
     - glog
     - hermes-engine
     - RCT-Folly (= 2021.07.22.00)
@@ -184,23 +184,23 @@ PODS:
     - React-utils
     - SocketRocket (= 0.6.1)
     - Yoga
-  - React-Core/DevSupport (0.72.3):
+  - React-Core/DevSupport (0.72.6):
     - glog
     - hermes-engine
     - RCT-Folly (= 2021.07.22.00)
-    - React-Core/Default (= 0.72.3)
+    - React-Core/Default (= 0.72.6)
-    - React-Core/RCTWebSocket (= 0.72.3)
+    - React-Core/RCTWebSocket (= 0.72.6)
     - React-cxxreact
     - React-hermes
     - React-jsi
     - React-jsiexecutor
-    - React-jsinspector (= 0.72.3)
+    - React-jsinspector (= 0.72.6)
     - React-perflogger
     - React-runtimeexecutor
     - React-utils
     - SocketRocket (= 0.6.1)
     - Yoga
-  - React-Core/RCTActionSheetHeaders (0.72.3):
+  - React-Core/RCTActionSheetHeaders (0.72.6):
     - glog
     - hermes-engine
     - RCT-Folly (= 2021.07.22.00)
@@ -214,7 +214,7 @@ PODS:
     - React-utils
     - SocketRocket (= 0.6.1)
     - Yoga
-  - React-Core/RCTAnimationHeaders (0.72.3):
+  - React-Core/RCTAnimationHeaders (0.72.6):
     - glog
     - hermes-engine
     - RCT-Folly (= 2021.07.22.00)
@@ -228,7 +228,7 @@ PODS:
     - React-utils
     - SocketRocket (= 0.6.1)
     - Yoga
-  - React-Core/RCTBlobHeaders (0.72.3):
+  - React-Core/RCTBlobHeaders (0.72.6):
     - glog
     - hermes-engine
     - RCT-Folly (= 2021.07.22.00)
@@ -242,7 +242,7 @@ PODS:
     - React-utils
     - SocketRocket (= 0.6.1)
     - Yoga
-  - React-Core/RCTImageHeaders (0.72.3):
+  - React-Core/RCTImageHeaders (0.72.6):
     - glog
     - hermes-engine
     - RCT-Folly (= 2021.07.22.00)
@@ -256,7 +256,7 @@ PODS:
     - React-utils
     - SocketRocket (= 0.6.1)
     - Yoga
-  - React-Core/RCTLinkingHeaders (0.72.3):
+  - React-Core/RCTLinkingHeaders (0.72.6):
     - glog
     - hermes-engine
     - RCT-Folly (= 2021.07.22.00)
@@ -270,7 +270,7 @@ PODS:
     - React-utils
     - SocketRocket (= 0.6.1)
     - Yoga
-  - React-Core/RCTNetworkHeaders (0.72.3):
+  - React-Core/RCTNetworkHeaders (0.72.6):
     - glog
     - hermes-engine
     - RCT-Folly (= 2021.07.22.00)
@@ -284,7 +284,7 @@ PODS:
     - React-utils
     - SocketRocket (= 0.6.1)
     - Yoga
-  - React-Core/RCTSettingsHeaders (0.72.3):
+  - React-Core/RCTSettingsHeaders (0.72.6):
     - glog
     - hermes-engine
     - RCT-Folly (= 2021.07.22.00)
@@ -298,7 +298,7 @@ PODS:
     - React-utils
     - SocketRocket (= 0.6.1)
     - Yoga
-  - React-Core/RCTTextHeaders (0.72.3):
+  - React-Core/RCTTextHeaders (0.72.6):
     - glog
     - hermes-engine
     - RCT-Folly (= 2021.07.22.00)
@@ -312,7 +312,7 @@ PODS:
     - React-utils
     - SocketRocket (= 0.6.1)
     - Yoga
-  - React-Core/RCTVibrationHeaders (0.72.3):
+  - React-Core/RCTVibrationHeaders (0.72.6):
     - glog
     - hermes-engine
     - RCT-Folly (= 2021.07.22.00)
@@ -326,11 +326,11 @@ PODS:
     - React-utils
     - SocketRocket (= 0.6.1)
     - Yoga
-  - React-Core/RCTWebSocket (0.72.3):
+  - React-Core/RCTWebSocket (0.72.6):
     - glog
     - hermes-engine
     - RCT-Folly (= 2021.07.22.00)
-    - React-Core/Default (= 0.72.3)
+    - React-Core/Default (= 0.72.6)
     - React-cxxreact
     - React-hermes
     - React-jsi
@@ -340,57 +340,57 @@ PODS:
     - React-utils
     - SocketRocket (= 0.6.1)
     - Yoga
-  - React-CoreModules (0.72.3):
+  - React-CoreModules (0.72.6):
     - RCT-Folly (= 2021.07.22.00)
-    - RCTTypeSafety (= 0.72.3)
+    - RCTTypeSafety (= 0.72.6)
-    - React-Codegen (= 0.72.3)
+    - React-Codegen (= 0.72.6)
-    - React-Core/CoreModulesHeaders (= 0.72.3)
+    - React-Core/CoreModulesHeaders (= 0.72.6)
-    - React-jsi (= 0.72.3)
+    - React-jsi (= 0.72.6)
     - React-RCTBlob
-    - React-RCTImage (= 0.72.3)
+    - React-RCTImage (= 0.72.6)
-    - ReactCommon/turbomodule/core (= 0.72.3)
+    - ReactCommon/turbomodule/core (= 0.72.6)
     - SocketRocket (= 0.6.1)
-  - React-cxxreact (0.72.3):
+  - React-cxxreact (0.72.6):
     - boost (= 1.76.0)
     - DoubleConversion
     - glog
     - hermes-engine
     - RCT-Folly (= 2021.07.22.00)
-    - React-callinvoker (= 0.72.3)
+    - React-callinvoker (= 0.72.6)
-    - React-debug (= 0.72.3)
+    - React-debug (= 0.72.6)
-    - React-jsi (= 0.72.3)
+    - React-jsi (= 0.72.6)
-    - React-jsinspector (= 0.72.3)
+    - React-jsinspector (= 0.72.6)
-    - React-logger (= 0.72.3)
+    - React-logger (= 0.72.6)
-    - React-perflogger (= 0.72.3)
+    - React-perflogger (= 0.72.6)
-    - React-runtimeexecutor (= 0.72.3)
+    - React-runtimeexecutor (= 0.72.6)
-  - React-debug (0.72.3)
+  - React-debug (0.72.6)
-  - React-hermes (0.72.3):
+  - React-hermes (0.72.6):
     - DoubleConversion
     - glog
     - hermes-engine
     - RCT-Folly (= 2021.07.22.00)
     - RCT-Folly/Futures (= 2021.07.22.00)
-    - React-cxxreact (= 0.72.3)
+    - React-cxxreact (= 0.72.6)
     - React-jsi
-    - React-jsiexecutor (= 0.72.3)
+    - React-jsiexecutor (= 0.72.6)
-    - React-jsinspector (= 0.72.3)
+    - React-jsinspector (= 0.72.6)
-    - React-perflogger (= 0.72.3)
+    - React-perflogger (= 0.72.6)
-  - React-jsi (0.72.3):
+  - React-jsi (0.72.6):
     - boost (= 1.76.0)
     - DoubleConversion
     - glog
     - hermes-engine
     - RCT-Folly (= 2021.07.22.00)
-  - React-jsiexecutor (0.72.3):
+  - React-jsiexecutor (0.72.6):
     - DoubleConversion
     - glog
     - hermes-engine
     - RCT-Folly (= 2021.07.22.00)
-    - React-cxxreact (= 0.72.3)
+    - React-cxxreact (= 0.72.6)
-    - React-jsi (= 0.72.3)
+    - React-jsi (= 0.72.6)
-    - React-perflogger (= 0.72.3)
+    - React-perflogger (= 0.72.6)
-  - React-jsinspector (0.72.3)
+  - React-jsinspector (0.72.6)
-  - React-logger (0.72.3):
+  - React-logger (0.72.6):
     - glog
   - react-native-blur (4.3.2):
     - React-Core
@@ -407,18 +407,18 @@ PODS:
     - React-Core
   - react-native-netinfo (9.4.1):
     - React-Core
-  - react-native-pager-view (6.2.0):
+  - react-native-pager-view (6.2.2):
     - React-Core
   - react-native-paste-input (0.6.4):
     - React-Core
     - Swime (= 3.0.6)
   - react-native-quick-base64 (2.0.7):
     - React-Core
-  - react-native-safe-area-context (4.7.1):
+  - react-native-safe-area-context (4.7.4):
     - React-Core
   - react-native-segmented-control (2.4.2):
     - React-Core
-  - React-NativeModulesApple (0.72.3):
+  - React-NativeModulesApple (0.72.6):
     - hermes-engine
     - React-callinvoker
     - React-Core
@@ -427,17 +427,17 @@ PODS:
     - React-runtimeexecutor
     - ReactCommon/turbomodule/bridging
     - ReactCommon/turbomodule/core
-  - React-perflogger (0.72.3)
+  - React-perflogger (0.72.6)
-  - React-RCTActionSheet (0.72.3):
+  - React-RCTActionSheet (0.72.6):
-    - React-Core/RCTActionSheetHeaders (= 0.72.3)
+    - React-Core/RCTActionSheetHeaders (= 0.72.6)
-  - React-RCTAnimation (0.72.3):
+  - React-RCTAnimation (0.72.6):
     - RCT-Folly (= 2021.07.22.00)
-    - RCTTypeSafety (= 0.72.3)
+    - RCTTypeSafety (= 0.72.6)
-    - React-Codegen (= 0.72.3)
+    - React-Codegen (= 0.72.6)
-    - React-Core/RCTAnimationHeaders (= 0.72.3)
+    - React-Core/RCTAnimationHeaders (= 0.72.6)
-    - React-jsi (= 0.72.3)
+    - React-jsi (= 0.72.6)
-    - ReactCommon/turbomodule/core (= 0.72.3)
+    - ReactCommon/turbomodule/core (= 0.72.6)
-  - React-RCTAppDelegate (0.72.3):
+  - React-RCTAppDelegate (0.72.6):
     - RCT-Folly
     - RCTRequired
     - RCTTypeSafety
@@ -449,54 +449,54 @@ PODS:
     - React-RCTNetwork
     - React-runtimescheduler
     - ReactCommon/turbomodule/core
-  - React-RCTBlob (0.72.3):
+  - React-RCTBlob (0.72.6):
     - hermes-engine
     - RCT-Folly (= 2021.07.22.00)
-    - React-Codegen (= 0.72.3)
+    - React-Codegen (= 0.72.6)
-    - React-Core/RCTBlobHeaders (= 0.72.3)
+    - React-Core/RCTBlobHeaders (= 0.72.6)
-    - React-Core/RCTWebSocket (= 0.72.3)
+    - React-Core/RCTWebSocket (= 0.72.6)
-    - React-jsi (= 0.72.3)
+    - React-jsi (= 0.72.6)
-    - React-RCTNetwork (= 0.72.3)
+    - React-RCTNetwork (= 0.72.6)
-    - ReactCommon/turbomodule/core (= 0.72.3)
+    - ReactCommon/turbomodule/core (= 0.72.6)
-  - React-RCTImage (0.72.3):
+  - React-RCTImage (0.72.6):
     - RCT-Folly (= 2021.07.22.00)
-    - RCTTypeSafety (= 0.72.3)
+    - RCTTypeSafety (= 0.72.6)
-    - React-Codegen (= 0.72.3)
+    - React-Codegen (= 0.72.6)
-    - React-Core/RCTImageHeaders (= 0.72.3)
+    - React-Core/RCTImageHeaders (= 0.72.6)
-    - React-jsi (= 0.72.3)
+    - React-jsi (= 0.72.6)
-    - React-RCTNetwork (= 0.72.3)
+    - React-RCTNetwork (= 0.72.6)
-    - ReactCommon/turbomodule/core (= 0.72.3)
+    - ReactCommon/turbomodule/core (= 0.72.6)
-  - React-RCTLinking (0.72.3):
+  - React-RCTLinking (0.72.6):
-    - React-Codegen (= 0.72.3)
+    - React-Codegen (= 0.72.6)
-    - React-Core/RCTLinkingHeaders (= 0.72.3)
+    - React-Core/RCTLinkingHeaders (= 0.72.6)
-    - React-jsi (= 0.72.3)
+    - React-jsi (= 0.72.6)
-    - ReactCommon/turbomodule/core (= 0.72.3)
+    - ReactCommon/turbomodule/core (= 0.72.6)
-  - React-RCTNetwork (0.72.3):
+  - React-RCTNetwork (0.72.6):
     - RCT-Folly (= 2021.07.22.00)
-    - RCTTypeSafety (= 0.72.3)
+    - RCTTypeSafety (= 0.72.6)
-    - React-Codegen (= 0.72.3)
+    - React-Codegen (= 0.72.6)
-    - React-Core/RCTNetworkHeaders (= 0.72.3)
+    - React-Core/RCTNetworkHeaders (= 0.72.6)
-    - React-jsi (= 0.72.3)
+    - React-jsi (= 0.72.6)
-    - ReactCommon/turbomodule/core (= 0.72.3)
+    - ReactCommon/turbomodule/core (= 0.72.6)
-  - React-RCTSettings (0.72.3):
+  - React-RCTSettings (0.72.6):
     - RCT-Folly (= 2021.07.22.00)
-    - RCTTypeSafety (= 0.72.3)
+    - RCTTypeSafety (= 0.72.6)
-    - React-Codegen (= 0.72.3)
+    - React-Codegen (= 0.72.6)
-    - React-Core/RCTSettingsHeaders (= 0.72.3)
+    - React-Core/RCTSettingsHeaders (= 0.72.6)
-    - React-jsi (= 0.72.3)
+    - React-jsi (= 0.72.6)
-    - ReactCommon/turbomodule/core (= 0.72.3)
+    - ReactCommon/turbomodule/core (= 0.72.6)
-  - React-RCTText (0.72.3):
+  - React-RCTText (0.72.6):
-    - React-Core/RCTTextHeaders (= 0.72.3)
+    - React-Core/RCTTextHeaders (= 0.72.6)
-  - React-RCTVibration (0.72.3):
+  - React-RCTVibration (0.72.6):
     - RCT-Folly (= 2021.07.22.00)
-    - React-Codegen (= 0.72.3)
+    - React-Codegen (= 0.72.6)
-    - React-Core/RCTVibrationHeaders (= 0.72.3)
+    - React-Core/RCTVibrationHeaders (= 0.72.6)
-    - React-jsi (= 0.72.3)
+    - React-jsi (= 0.72.6)
-    - ReactCommon/turbomodule/core (= 0.72.3)
+    - ReactCommon/turbomodule/core (= 0.72.6)
-  - React-rncore (0.72.3)
+  - React-rncore (0.72.6)
-  - React-runtimeexecutor (0.72.3):
+  - React-runtimeexecutor (0.72.6):
-    - React-jsi (= 0.72.3)
+    - React-jsi (= 0.72.6)
-  - React-runtimescheduler (0.72.3):
+  - React-runtimescheduler (0.72.6):
     - glog
     - hermes-engine
     - RCT-Folly (= 2021.07.22.00)
@@ -504,35 +504,35 @@ PODS:
     - React-debug
     - React-jsi
     - React-runtimeexecutor
-  - React-utils (0.72.3):
+  - React-utils (0.72.6):
     - glog
     - RCT-Folly (= 2021.07.22.00)
     - React-debug
-  - ReactCommon/turbomodule/bridging (0.72.3):
+  - ReactCommon/turbomodule/bridging (0.72.6):
     - DoubleConversion
     - glog
     - hermes-engine
     - RCT-Folly (= 2021.07.22.00)
-    - React-callinvoker (= 0.72.3)
+    - React-callinvoker (= 0.72.6)
-    - React-cxxreact (= 0.72.3)
+    - React-cxxreact (= 0.72.6)
-    - React-jsi (= 0.72.3)
+    - React-jsi (= 0.72.6)
-    - React-logger (= 0.72.3)
+    - React-logger (= 0.72.6)
-    - React-perflogger (= 0.72.3)
+    - React-perflogger (= 0.72.6)
-  - ReactCommon/turbomodule/core (0.72.3):
+  - ReactCommon/turbomodule/core (0.72.6):
     - DoubleConversion
     - glog
     - hermes-engine
     - RCT-Folly (= 2021.07.22.00)
-    - React-callinvoker (= 0.72.3)
+    - React-callinvoker (= 0.72.6)
-    - React-cxxreact (= 0.72.3)
+    - React-cxxreact (= 0.72.6)
-    - React-jsi (= 0.72.3)
+    - React-jsi (= 0.72.6)
-    - React-logger (= 0.72.3)
+    - React-logger (= 0.72.6)
-    - React-perflogger (= 0.72.3)
+    - React-perflogger (= 0.72.6)
   - RNCAsyncStorage (1.17.12):
     - React-Core
   - RNCClipboard (1.11.2):
     - React-Core
-  - RNGestureHandler (2.12.0):
+  - RNGestureHandler (2.12.1):
     - React-Core
   - RNReanimated (3.4.1):
     - DoubleConversion
@@ -746,7 +746,7 @@ EXTERNAL SOURCES:
     :podspec: "../node_modules/react-native/third-party-podspecs/glog.podspec"
   hermes-engine:
     :podspec: "../node_modules/react-native/sdks/hermes-engine/hermes-engine.podspec"
-    :tag: hermes-2023-03-20-RNv0.72.0-49794cfc7c81fb8f69fd60c3bbf85a7480cc5a77
+    :tag: hermes-2023-08-07-RNv0.72.4-813b2def12bc9df02654b3e3653ae4a68d0572e0
   RCT-Folly:
     :podspec: "../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec"
   RCTRequired:
@@ -859,17 +859,17 @@ SPEC CHECKSUMS:
   DoubleConversion: 5189b271737e1565bdce30deb4a08d647e3f5f54
   EXApplication: 02655a251434d564bb0e73291f5a490c74b5b76f
   EXAV: 0f6f47ecd4d4aff93f486be494e28f8bdb3c9514
-  EXConstants: ea6e3ff17f5c8926a4a7f35467d88b8af3230052
+  EXConstants: 6cb14c7520a3538d37894fe8f0de9b8196d38455
   EXFileSystem: 6acc93642ad8c3c3ffabd7adbd86f7af4d8eca52
   EXFont: 738c44c390953ebcbab075a4848bfbef025fd9ee
   EXNotifications: 09394cbd7165f9a4a00a53328aa09bf874bae717
-  Expo: 5601f86edc81c7e7e1772b9af9ae58fa3b45ad53
+  Expo: f446f9811b9dfc0abc05a1613966c8475bc6795e
   ExpoCrypto: 2347fbf8a5d80676b4266548df62df397fbb537c
   ExpoHaptics: 360af6898407ee4e8265d30a1a8fb16491a660eb
   ExpoImage: d940c1a403aa25cb4461a7e082f74676a3f7af0f
   ExpoKeepAwake: be4cbd52d9b177cde0fd66daa1913afa3161fc1d
   ExpoLocalization: be37fdd0b5930c6a49cd307b4542f4b426d6134c
-  ExpoModulesCore: e4e437139259c5a73530a8895af69774ff8ec12d
+  ExpoModulesCore: 51cb2e7ab4c8da14be3f40b66d54c1781002e99d
   ExpoScreenOrientation: 786cb014ccf2ba54ac3f9b3214a9e20a9170cfff
   ExpoSecureStore: 57db3b6da8b59046e2057e95bf7738a8027b47c3
   ExpoStoreReview: f154c9fdf3dbd877ca0115757f0b2b6f43dd9db4
@@ -877,33 +877,33 @@ SPEC CHECKSUMS:
   ExpoWebBrowser: 682823428c10629836f97f7c5fbf85825b6ac5b3
   EXScreenCapture: 81002ba5fb40a367fba9047d223068abb558594d
   EXSplashScreen: c0e7f2d4a640f3b875808ed0b88575538daf6d82
-  FBLazyVector: 4cce221dd782d3ff7c4172167bba09d58af67ccb
+  FBLazyVector: 748c0ef74f2bf4b36cfcccf37916806940a64c32
-  FBReactNativeSpec: c6bd9e179757b3c0ecf815864fae8032377903ef
+  FBReactNativeSpec: 966f29e4e697de53a3b366355e8f57375c856ad9
   fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9
   glog: 04b94705f318337d7ead9e6d17c019bd9b1f6b1b
-  hermes-engine: 10fbd3f62405c41ea07e71973ea61e1878d07322
+  hermes-engine: 8057e75cfc1437b178ac86c8654b24e7fead7f60
   libaom: 144606b1da4b5915a1054383c3a4459ccdb3c661
   libavif: 84bbb62fb232c3018d6f1bab79beea87e35de7b7
   libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913
   libvmaf: 27f523f1e63c694d14d534cd0fddd2fab0ae8711
-  libwebp: 33dc822fbbf4503668d09f7885bbfedc76c45e96
+  libwebp: 1786c9f4ff8a279e4dac1e8f385004d5fc253009
-  MMKV: 9c6c3fa4ddd849f28c7b9a5c9d23aab84f14ee35
+  MMKV: 5a07930c70c70b86cd87761a42c8f3836fb681d7
-  MMKVCore: 9bb7440b170181ac5b81f542ac258103542e693d
+  MMKVCore: e50135dbd33235b6ab390635991bab437ab873c0
   RCT-Folly: 424b8c9a7a0b9ab2886ffe9c3b041ef628fd4fb1
-  RCTRequired: a2faf4bad4e438ca37b2040cb8f7799baa065c18
+  RCTRequired: 28469809442eb4eb5528462705f7d852948c8a74
-  RCTTypeSafety: cb09f3e4747b6d18331a15eb05271de7441ca0b3
+  RCTTypeSafety: e9c6c409fca2cc584e5b086862d562540cb38d29
-  React: 13109005b5353095c052f26af37413340ccf7a5d
+  React: 769f469909b18edfe934f0539fffb319c4c61043
-  React-callinvoker: c8c87bce983aa499c13cb06d4447c025a35274d6
+  React-callinvoker: e48ce12c83706401251921896576710d81e54763
-  React-Codegen: 712d523524d89d71f1cf7cc624854941be983c4d
+  React-Codegen: a136b8094d39fd071994eaa935366e6be2239cb1
-  React-Core: 688f88b7f3a3d30b4848036223f8b07102c687e5
+  React-Core: e548a186fb01c3a78a9aeeffa212d625ca9511bf
-  React-CoreModules: 63c063a3ade8fb3b1bec5fd9a50f17b0421558c6
+  React-CoreModules: d226b22d06ea1bc4e49d3c073b2c6cbb42265405
-  React-cxxreact: 37765b4975541105b2a3322a4b473417c158c869
+  React-cxxreact: 44a3560510ead6633b6e02f9fbbdd1772fb40f92
-  React-debug: 51f11ef8db14b47f24e71c42a4916d4192972156
+  React-debug: 238501490155574ae9f3f8dd1c74330eba30133e
-  React-hermes: 935ae71fb3d7654e947beba8498835cd5e479707
+  React-hermes: 46e66dc854124d7645c20bfec0a6be9542826ecd
-  React-jsi: ec628dc7a15ffea969f237b0ea6d2fde212b19dd
+  React-jsi: fbdaf4166bae60524b591b18c851b530c8cdb90c
-  React-jsiexecutor: 59d1eb03af7d30b7d66589c410f13151271e8006
+  React-jsiexecutor: 3bf18ff7cb03cd8dfdce08fbbc0d15058c1d71ae
-  React-jsinspector: b511447170f561157547bc0bef3f169663860be7
+  React-jsinspector: 194e32c6aab382d88713ad3dd0025c5f5c4ee072
-  React-logger: c5b527272d5f22eaa09bb3c3a690fee8f237ae95
+  React-logger: cebf22b6cf43434e471dc561e5911b40ac01d289
   react-native-blur: cfdad7b3c01d725ab62a8a729f42ea463998afa2
   react-native-cameraroll: 134805127580aed23403b8c2cb1548920dd77b3a
   react-native-image-picker: db60857e03d63721f19b6f4027de20429ddd9cba
@@ -911,31 +911,31 @@ SPEC CHECKSUMS:
   react-native-language-detection: f414937fa715108ab50a6269a3de0bcb95e4ceb0
   react-native-mmkv: dea675cf9697ad35940f1687e98e133e1358ef9f
   react-native-netinfo: fefd4e98d75cbdd6e85fc530f7111a8afdf2b0c5
-  react-native-pager-view: 0ccb8bf60e2ebd38b1f3669fa3650ecce81db2df
+  react-native-pager-view: 02a5c4962530f7efc10dd51ee9cdabeff5e6c631
   react-native-paste-input: 09f14cbfb646ad9d2ef79cdc6f3d45f337c10ad1
   react-native-quick-base64: a5dbe4528f1453e662fcf7351029500b8b63e7bb
-  react-native-safe-area-context: 9697629f7b2cda43cf52169bb7e0767d330648c2
+  react-native-safe-area-context: 2cd91d532de12acdb0a9cbc8d43ac72a8e4c897c
   react-native-segmented-control: 2221962f5073e2e809aa3691e8e410fc10b60578
-  React-NativeModulesApple: c57f3efe0df288a6532b726ad2d0322a9bf38472
+  React-NativeModulesApple: 02e35e9a51e10c6422f04f5e4076a7c02243fff2
-  React-perflogger: 6bd153e776e6beed54c56b0847e1220a3ff92ba5
+  React-perflogger: e3596db7e753f51766bceadc061936ef1472edc3
-  React-RCTActionSheet: c0b62af44e610e69d9a2049a682f5dba4e9dff17
+  React-RCTActionSheet: 17ab132c748b4471012abbcdcf5befe860660485
-  React-RCTAnimation: f9bf9719258926aea9ecb8a2aa2595d3ff9a6022
+  React-RCTAnimation: c8bbaab62be5817d2a31c36d5f2571e3f7dcf099
-  React-RCTAppDelegate: e5ac35d4dbd1fae7df3a62b47db04b6a8d151592
+  React-RCTAppDelegate: af1c7dace233deba4b933cd1d6491fe4e3584ad1
-  React-RCTBlob: c4f1e69a6ef739aa42586b876d637dab4e3b5bed
+  React-RCTBlob: 1bcf3a0341eb8d6950009b1ddb8aefaf46996b8c
-  React-RCTImage: e5798f01aba248416c02a506cf5e6dfcba827638
+  React-RCTImage: 670a3486b532292649b1aef3ffddd0b495a5cee4
-  React-RCTLinking: f5b6227c879e33206f34e68924c458f57bbb96d9
+  React-RCTLinking: bd7ab853144aed463903237e615fd91d11b4f659
-  React-RCTNetwork: d5554fbfac1c618da3c8fa29933108ea22837788
+  React-RCTNetwork: be86a621f3e4724758f23ad1fdce32474ab3d829
-  React-RCTSettings: 189c71e3e6146ba59f4f7e2cbeb494cf2ad42afa
+  React-RCTSettings: 4f3a29a6d23ffa639db9701bc29af43f30781058
-  React-RCTText: 19425aea9d8b6ccae55a27916355b17ab577e56e
+  React-RCTText: adde32164a243103aaba0b1dc7b0a2599733873e
-  React-RCTVibration: 388ac0e1455420895d1ca2548401eed964b038a6
+  React-RCTVibration: 6bd85328388ac2e82ae0ca11afe48ad5555b483a
-  React-rncore: 755a331dd67b74662108f2d66a384454bf8dc1a1
+  React-rncore: fda7b1ae5918fa7baa259105298a5487875a57c8
-  React-runtimeexecutor: 369ae9bb3f83b65201c0c8f7d50b72280b5a1dbc
+  React-runtimeexecutor: 57d85d942862b08f6d15441a0badff2542fd233c
-  React-runtimescheduler: 837c1bebd2f84572db17698cd702ceaf585b0d9a
+  React-runtimescheduler: f23e337008403341177fc52ee4ca94e442c17ede
-  React-utils: bcb57da67eec2711f8b353f6e3d33bd8e4b2efa3
+  React-utils: fa59c9a3375fb6f4aeb66714fd3f7f76b43a9f16
-  ReactCommon: 3ccb8fb14e6b3277e38c73b0ff5e4a1b8db017a9
+  ReactCommon: dd03c17275c200496f346af93a7b94c53f3093a4
   RNCAsyncStorage: 09fc8595e6d6f6d5abf16b23a56b257d9c6b7c5b
   RNCClipboard: 3f0451a8100393908bea5c5c5b16f96d45f30bfc
-  RNGestureHandler: dec4645026e7401a0899f2846d864403478ff6a5
+  RNGestureHandler: c0d04458598fcb26052494ae23dda8f8f5162b13
   RNReanimated: 53ca20eee770c41173703f5948cd8898aa08262c
   RNScreens: 6a8a3c6b808aa48dca1780df7b73ea524f602c63
   RNSentry: f9e637773502a61c7b455c4ce65bc7008ce22a6e
@@ -949,8 +949,8 @@ SPEC CHECKSUMS:
   SentryPrivate: 9a76def09fb08f9501997b8df946e8097947b94f
   SocketRocket: f32cd54efbe0f095c4d7594881e52619cfe80b17
   Swime: d7b2c277503b6cea317774aedc2dce05613f8b0b
-  Yoga: 8796b55dba14d7004f980b54bcc9833ee45b28ce
+  Yoga: b76f1acfda8212aa16b7e26bcce3983230c82603
 
 PODFILE CHECKSUM: 1decd5b21ac0602154fbdba45a568b9c3acebb7c
 
-COCOAPODS: 1.12.1
+COCOAPODS: 1.15.0

ios/tooot.xcodeproj/project.pbxproj

@@ -701,6 +701,7 @@
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"DEBUG=1",
 					"$(inherited)",
+					_LIBCPP_ENABLE_CXX17_REMOVED_UNARY_BINARY_FUNCTION,
 				);
 				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@@ -719,6 +720,11 @@
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_CFLAGS = "$(inherited)";
 				OTHER_CPLUSPLUSFLAGS = "$(inherited)";
+				OTHER_LDFLAGS = (
+					"$(inherited)",
+					"-Wl",
+					"-ld_classic",
+				);
 				REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
 				SDKROOT = iphoneos;
 			};
@@ -761,6 +767,10 @@
 				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = i386;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"$(inherited)",
+					_LIBCPP_ENABLE_CXX17_REMOVED_UNARY_BINARY_FUNCTION,
+				);
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
 				GCC_WARN_UNDECLARED_SELECTOR = YES;
@@ -777,6 +787,11 @@
 				ONLY_ACTIVE_ARCH = NO;
 				OTHER_CFLAGS = "$(inherited)";
 				OTHER_CPLUSPLUSFLAGS = "$(inherited)";
+				OTHER_LDFLAGS = (
+					"$(inherited)",
+					"-Wl",
+					"-ld_classic",
+				);
 				REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
 				SDKROOT = iphoneos;
 				SWIFT_COMPILATION_MODE = wholemodule;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "tooot",
-  "version": "4.10.1",
+  "version": "4.10.4",
   "description": "tooot for Mastodon",
   "author": "xmflsct <me@xmflsct.com>",
   "license": "GPL-3.0-or-later",
@@ -12,7 +12,7 @@
     "start": "react-native start",
     "android": "react-native run-android",
     "phone": "react-native run-ios --device",
-    "iphone": "react-native run-ios --simulator 'iPhone 14 Pro'",
+    "iphone": "react-native run-ios --simulator 'iPhone 15 Pro'",
     "ipad": "react-native run-ios --simulator 'iPad Pro (11-inch) (4th generation)'",
     "app:build": "bundle exec fastlane",
     "clean": "react-native-clean-project"
@@ -23,8 +23,8 @@
     "@formatjs/intl-getcanonicallocales": "^2.2.1",
     "@formatjs/intl-locale": "^3.3.2",
     "@formatjs/intl-numberformat": "^8.7.0",
-    "@formatjs/intl-pluralrules": "^5.2.4",
+    "@formatjs/intl-pluralrules": "^5.2.9",
-    "@formatjs/intl-relativetimeformat": "^11.2.4",
+    "@formatjs/intl-relativetimeformat": "^11.2.9",
     "@mattermost/react-native-paste-input": "^0.6.4",
     "@neverdull-agency/expo-unlimited-secure-store": "^1.0.10",
     "@react-native-async-storage/async-storage": "~1.17.11",
@@ -35,19 +35,19 @@
     "@react-native-firebase/app": "^18.3.0",
     "@react-native-menu/menu": "^0.8.0",
     "@react-native-segmented-control/segmented-control": "^2.4.2",
-    "@react-navigation/bottom-tabs": "^6.5.8",
+    "@react-navigation/bottom-tabs": "^6.5.11",
-    "@react-navigation/native": "^6.1.7",
+    "@react-navigation/native": "^6.1.9",
-    "@react-navigation/native-stack": "^6.9.13",
+    "@react-navigation/native-stack": "^6.9.17",
-    "@react-navigation/stack": "^6.3.17",
+    "@react-navigation/stack": "^6.3.20",
     "@sentry/react-native": "^5.8.0",
-    "@sharcoux/slider": "^7.0.1",
+    "@sharcoux/slider": "^7.0.5",
     "@tanstack/react-query": "^4.32.0",
     "axios": "^1.4.0",
     "diff": "^5.1.0",
-    "expo": "^49.0.6",
+    "expo": "^49.0.18",
     "expo-auth-session": "^5.1.0",
     "expo-av": "^13.5.0",
-    "expo-constants": "^14.5.0",
+    "expo-constants": "^14.5.1",
     "expo-crypto": "^12.5.0",
     "expo-file-system": "^15.5.0",
     "expo-haptics": "^12.4.0",
@@ -70,18 +70,18 @@
     "react-dom": "^18.2.0",
     "react-i18next": "^13.0.2",
     "react-intl": "^6.4.4",
-    "react-native": "^0.72.3",
+    "react-native": "^0.72.6",
-    "react-native-flash-message": "^0.4.1",
+    "react-native-flash-message": "^0.4.2",
-    "react-native-gesture-handler": "~2.12.0",
+    "react-native-gesture-handler": "~2.12.1",
     "react-native-image-picker": "^5.6.0",
     "react-native-ios-context-menu": "^1.15.3",
     "react-native-language-detection": "^0.2.2",
     "react-native-mmkv": "^2.10.1",
-    "react-native-pager-view": "^6.2.0",
+    "react-native-pager-view": "^6.2.2",
     "react-native-quick-base64": "^2.0.7",
     "react-native-reanimated": "^3.4.1",
     "react-native-reanimated-zoom": "^0.3.3",
-    "react-native-safe-area-context": "^4.7.1",
+    "react-native-safe-area-context": "^4.7.4",
     "react-native-screens": "^3.23.0",
     "react-native-share-menu": "^6.0.0",
     "react-native-svg": "^13.10.0",
@@ -95,13 +95,13 @@
     "@babel/plugin-proposal-optional-chaining": "^7.21.0",
     "@babel/preset-typescript": "^7.22.5",
     "@expo/config": "^8.2.0",
-    "@react-native/metro-config": "^0.72.9",
+    "@react-native/metro-config": "^0.72.11",
-    "@types/diff": "^5.0.3",
+    "@types/diff": "^5.0.8",
-    "@types/linkify-it": "^3.0.2",
+    "@types/linkify-it": "^3.0.5",
-    "@types/lodash": "^4.14.196",
+    "@types/lodash": "^4.14.201",
-    "@types/react": "^18.2.17",
+    "@types/react": "^18.2.37",
-    "@types/react-dom": "^18.2.7",
+    "@types/react-dom": "^18.2.15",
-    "@types/react-native-share-menu": "^5.0.2",
+    "@types/react-native-share-menu": "^5.0.5",
     "babel-plugin-module-resolver": "^5.0.0",
     "babel-plugin-transform-remove-console": "^6.9.4",
     "chalk": "^4.1.2",
@@ -109,7 +109,7 @@
     "react-native-clean-project": "^4.0.1",
     "typescript": "^5.1.6"
   },
-  "packageManager": "yarn@3.3.1",
+  "packageManager": "yarn@4.1.0",
   "resolutions": {
     "expo-av@^13.0.2": "patch:expo-av@npm%3A13.0.2#./.yarn/patches/expo-av-npm-13.0.2-7a651776f1.patch",
     "react-native-share-menu@^6.0.0": "patch:react-native-share-menu@npm%3A6.0.0#./.yarn/patches/react-native-share-menu-npm-6.0.0-f1094c3204.patch",

src/components/Separator.tsx

@@ -22,7 +22,7 @@ const ComponentSeparator: React.FC<Props> = ({
         style,
         {
           backgroundColor: colors.backgroundDefault,
-          borderTopColor: colors.border,
+          borderTopColor: colors.separator,
           borderTopWidth: 1,
           marginLeft: StyleConstants.Spacing.Global.PagePadding + extraMarginLeft,
           marginRight: StyleConstants.Spacing.Global.PagePadding + extraMarginRight

src/components/Timeline/Shared/Card/Neodb.tsx

@@ -1,22 +1,20 @@
 import GracefullyImage from '@components/GracefullyImage'
-import openLink from '@components/openLink'
 import CustomText from '@components/Text'
+import openLink from '@components/openLink'
 import { useNeodbQuery } from '@utils/queryHooks/neodb'
-import { StyleConstants } from '@utils/styles/constants'
 import { useTheme } from '@utils/styles/ThemeManager'
+import { StyleConstants } from '@utils/styles/constants'
 import * as Linking from 'expo-linking'
-import { useState } from 'react'
+import { useContext, useState } from 'react'
 import { Pressable, View } from 'react-native'
+import StatusContext from '../Context'
 import { Rating } from './Rating'
 
-export type Props = {
+export const CardNeodb: React.FC = () => {
-  card: Mastodon.Card
+  const { status } = useContext(StatusContext)
-}
-
-export const CardNeodb: React.FC<Props> = ({ card }) => {
   const { colors } = useTheme()
 
-  const path = Linking.parse(card.url).path
+  const path = Linking.parse(status?.card?.url || '').path
   if (!path) return null
 
   const segments = path?.split('/')
@@ -26,7 +24,7 @@ export const CardNeodb: React.FC<Props> = ({ card }) => {
   )
     return null
 
-  const [headingLines, setHeadingLines] = useState(3)
+  const [headingLines, setHeadingLines] = useState<number>()
 
   const { data } = useNeodbQuery({ path })
 
@@ -41,7 +39,7 @@ export const CardNeodb: React.FC<Props> = ({ card }) => {
         padding: StyleConstants.Spacing.S,
         flexDirection: 'row'
       }}
-      onPress={() => openLink(card.url)}
+      onPress={() => status?.card?.url && openLink(status.card.url)}
     >
       {data.cover_image_url ? (
         <GracefullyImage
@@ -68,7 +66,9 @@ export const CardNeodb: React.FC<Props> = ({ card }) => {
             fontWeight='Bold'
             style={{ color: colors.primaryDefault }}
             numberOfLines={3}
-            onTextLayout={({ nativeEvent }) => setHeadingLines(nativeEvent.lines.length)}
+            onTextLayout={({ nativeEvent }) =>
+              !headingLines && setHeadingLines(nativeEvent.lines.length)
+            }
             children={heading.filter(d => d).join(' ')}
           />
           <Rating rating={data.rating / 2} />
@@ -77,7 +77,7 @@ export const CardNeodb: React.FC<Props> = ({ card }) => {
         <CustomText
           fontStyle='S'
           style={{ color: colors.secondary }}
-          numberOfLines={4 - headingLines}
+          numberOfLines={4 - (headingLines || 3)}
           children={details.filter(d => d).join(' / ')}
         />
       </View>

src/components/Timeline/Shared/Card/index.tsx

@@ -1,7 +1,7 @@
 import ComponentAccount from '@components/Account'
 import GracefullyImage from '@components/GracefullyImage'
-import openLink from '@components/openLink'
 import CustomText from '@components/Text'
+import openLink from '@components/openLink'
 import { useNavigation } from '@react-navigation/native'
 import { StackNavigationProp } from '@react-navigation/stack'
 import { isDevelopment } from '@utils/helpers/checkEnvironment'
@@ -9,8 +9,8 @@ import { urlMatcher } from '@utils/helpers/urlMatcher'
 import { TabLocalStackParamList } from '@utils/navigation/navigators'
 import { useAccountQuery } from '@utils/queryHooks/account'
 import { useStatusQuery } from '@utils/queryHooks/status'
-import { StyleConstants } from '@utils/styles/constants'
 import { useTheme } from '@utils/styles/ThemeManager'
+import { StyleConstants } from '@utils/styles/constants'
 import React, { useContext, useEffect, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import { Pressable, View } from 'react-native'
@@ -32,7 +32,7 @@ const TimelineCard: React.FC = () => {
       i18n.language.toLowerCase().startsWith('zh-hans')) ||
     isDevelopment
   ) {
-    return <CardNeodb card={status.card} />
+    return <CardNeodb />
   }
 
   const { colors } = useTheme()

src/i18n/pt_BR/components/contextMenu.json

@@ -9,17 +9,17 @@
     "inLists": "Listas contendo usuário ...",
     "showBoosts": {
       "action_false": "Mostrar boosts do usuário",
-      "action_true": ""
+      "action_true": "Ocultar boosts dos usuários"
     },
     "mute": {
       "action_false": "Silenciar usuário",
       "action_true": "Desativar o silêncio do usuário"
     },
     "followAs": {
-      "trigger": "",
+      "trigger": "Seguir como ...",
       "succeed_default": "Agora seguindo @{{target}} com @{{source}}",
-      "succeed_locked": "",
+      "succeed_locked": "Enviado o pedido para seguir @{{target}} com {{source}}, aguardando aprovação",
-      "failed": ""
+      "failed": "Seguir como"
     },
     "blockReport": "Bloquear e denunciar",
     "block": {
@@ -38,7 +38,7 @@
   },
   "at": {
     "direct": "Mensagem Direta",
-    "public": ""
+    "public": "Mensagem pública"
   },
   "copy": {
     "action": "Copiar toot",

src/i18n/pt_BR/components/instance.json

@@ -3,7 +3,7 @@
     "textInput": {
       "placeholder": "Domínio da instância"
     },
-    "whitelisted": "",
+    "whitelisted": "Esta pode ser uma instância na lista de permissões da qual o tooot não consegue recuperar dados antes de se conectar.",
     "button": "Entrar",
     "information": {
       "name": "Nome",

src/i18n/pt_BR/components/timeline.json

@@ -20,7 +20,7 @@
     "fetching": "Buscando toots mais recentes...",
     "fetched": {
       "none": "Nenhum novo toot",
-      "found": ""
+      "found": "toots {{count}} obtidos"
     }
   },
   "shared": {
@@ -33,12 +33,12 @@
       "poll": "Uma enquete em que você votou terminou",
       "reblog": {
         "default": "{{name}} boostou",
-        "myself": "",
+        "myself": "Eu impulsionei",
         "notification": "{{name}} deu boost no teu toot"
       },
       "update": "Toot foi editado",
       "admin.sign_up": "{{name}} entrou na instância",
-      "admin.report": ""
+      "admin.report": "{{name}} relatou:"
     },
     "actions": {
       "reply": {

src/i18n/pt_BR/screens/tabs.json

@@ -172,15 +172,15 @@
       },
       "filters": {
         "title": "Filtros de conteúdo",
-        "content": ""
+        "content": "{{count}} ativo"
       },
       "web_only": {
-        "title": "",
+        "title": "Atualizar configurações",
         "description": "As configurações abaixo só podem ser atualizadas usando a interface web"
       }
     },
     "preferencesFilters": {
-      "expired": "",
+      "expired": "Expirado",
       "keywords_one": "{{count}} palavra-chave",
       "keywords_other": "{{count}} palavras-chave",
       "statuses_one": "{{count}} toot",
@@ -271,8 +271,8 @@
         "settings": "Ativar em configurações"
       },
       "missingServerKey": {
-        "message": "",
+        "message": "Servidor configurado incorretamente para push",
-        "description": ""
+        "description": "Entre em contato com o administrador do servidor para configurar o suporte push"
       },
       "global": {
         "heading": "Habilitar para {{acct}}",
@@ -390,7 +390,7 @@
         "accessibilityHint": "Você pode silenciar, bloquear, relatar ou compartilhar este usuário"
       },
       "followed_by": " está seguindo você",
-      "privateNote": "",
+      "privateNote": "Adicionar nota privada",
       "moved": "Usuário movido",
       "created_at": "Registrado em: {{date}}",
       "summary": {
@@ -404,7 +404,7 @@
     },
     "accountInLists": {
       "name": "Listas de @{{username}}",
-      "inLists": "",
+      "inLists": "Nas listas",
       "notInLists": "Outras listas"
     },
     "attachments": {
@@ -418,17 +418,17 @@
       "name": "Histórico de Edição"
     },
     "mute": {
-      "name": "",
+      "name": "Silenciar {{acct}}",
-      "mute": "",
+      "mute": "Silenciar",
-      "description": "",
+      "description": "Oculte postagens e menções a este usuário, mas isso ainda permitirá que ele veja suas postagens e siga você.",
-      "notification": "",
+      "notification": "Ocultar também notificações deste usuário",
       "duration": {
-        "heading": "",
+        "heading": "Por duração",
-        "0": "",
+        "0": "Indefinidamente",
-        "1800": "",
+        "1800": "30 minutos",
-        "3600": "",
+        "3600": "1 hora",
-        "86400": "",
+        "86400": "1 dia",
-        "604800": ""
+        "604800": "1 semana"
       }
     },
     "report": {
@@ -481,7 +481,7 @@
     "toot": {
       "name": "Discussões",
       "remoteFetch": {
-        "title": "",
+        "title": "Contém conteúdo remoto",
         "message": "O conteúdo global nem sempre está disponível na instância local. Estes conteúdos são obtidos de instâncias remotas e marcados. Você pode interagir com esses conteúdos normalmente."
       }
     },

src/i18n/ru/common.json

@@ -9,7 +9,7 @@
     "delete": "Удалить",
     "done": "Готово",
     "confirm": "Подтвердить",
-    "add": ""
+    "add": "Добавить"
   },
   "customEmoji": {
     "accessibilityLabel": "Пользовательские эмодзи {{emoji}}"

src/i18n/ru/components/instance.json

@@ -7,7 +7,7 @@
     "button": "Войти",
     "information": {
       "name": "Название",
-      "description": ""
+      "description": "Описание"
     },
     "disclaimer": {
       "base": "Вход в систему использует системный браузер, информация о вашем аккаунте не будет видна приложению."

src/i18n/ru/components/parse.json

@@ -1,8 +1,8 @@
 {
   "HTML": {
-    "accessibilityHint": "",
+    "accessibilityHint": "Нажмите, чтобы развернуть или свернуть содержимое",
-    "expanded": "",
+    "expanded": "{{hint}}{{moreLines}}",
-    "moreLines": "",
+    "moreLines": " ({{count}} больше строк)",
-    "defaultHint": ""
+    "defaultHint": "Длинное сообщение"
   }
 }

src/i18n/ru/components/relationship.json

@@ -1,16 +1,16 @@
 {
   "follow": {
-    "function": ""
+    "function": "Подписаться на пользователя"
   },
   "block": {
-    "function": ""
+    "function": "Заблокировать пользователя"
   },
   "button": {
-    "error": "",
+    "error": "Ошибка загрузки",
-    "blocked_by": "",
+    "blocked_by": "Заблокирован пользователем",
-    "blocking": "",
+    "blocking": "Разблокировать",
-    "following": "",
+    "following": "Отписаться",
-    "requested": "",
+    "requested": "Отменить запрос",
-    "default": ""
+    "default": "Подписаться"
   }
 }

src/i18n/ru/components/timeline.json

@@ -1,81 +1,81 @@
 {
   "empty": {
     "error": {
-      "message": "",
+      "message": "Ошибка загрузки",
-      "button": ""
+      "button": "Повторить"
     },
     "success": {
-      "message": ""
+      "message": "Лента пуста"
     }
   },
   "end": {
-    "message": ""
+    "message": "Конец, как насчет чашки <0 />"
   },
   "lookback": {
-    "message": ""
+    "message": "Последний просмотр в"
   },
   "refresh": {
-    "fetchPreviousPage": "",
+    "fetchPreviousPage": "Новинки отсюда",
-    "refetch": "",
+    "refetch": "В конец",
-    "fetching": "",
+    "fetching": "Получение новых сообщений ...",
     "fetched": {
-      "none": "",
+      "none": "Нет новых сообщений",
-      "found": ""
+      "found": "Получено {{count}} сообщений"
     }
   },
   "shared": {
     "actioned": {
       "pinned": "Закрепить",
-      "favourite": "",
+      "favourite": "{{name}} добавил(а) ваш пост в избранное",
       "status": "{{name}} только что запостил",
       "follow": "{{name}} подписался (-лась) на вас",
       "follow_request": "{{name}} хочет подписаться на вас",
-      "poll": "",
+      "poll": "Опрос, в котором вы участвовали, завершен",
       "reblog": {
-        "default": "",
+        "default": "{{name}} продвинул(а)",
-        "myself": "",
+        "myself": "Я продвинул(а)",
-        "notification": ""
+        "notification": "{{name}} продвинул(а) ваш пост"
       },
-      "update": "",
+      "update": "Репост был отредактирован",
-      "admin.sign_up": "",
+      "admin.sign_up": "{{name}} присоединился к серверу",
-      "admin.report": ""
+      "admin.report": "{{name}} сообщил(а):"
     },
     "actions": {
       "reply": {
-        "accessibilityLabel": ""
+        "accessibilityLabel": "Ответить на это сообщение"
       },
       "reblogged": {
-        "accessibilityLabel": "",
+        "accessibilityLabel": "Продвинуть это сообщение",
-        "function": "",
+        "function": "Продвинуть сообщение",
         "options": {
-          "title": "",
+          "title": "Выберите видимость продвижения",
-          "public": "",
+          "public": "Публичное продвижение",
-          "unlisted": ""
+          "unlisted": "Убрать из списка"
         }
       },
       "favourited": {
-        "accessibilityLabel": "",
+        "accessibilityLabel": "Добавить этот пост в избранное",
-        "function": ""
+        "function": "Избранное"
       },
       "bookmarked": {
-        "accessibilityLabel": "",
+        "accessibilityLabel": "Добавить этот пост в закладки",
-        "function": ""
+        "function": "Закладки"
       },
-      "openReport": ""
+      "openReport": "Открыть отчет"
     },
     "actionsUsers": {
       "reblogged_by": {
-        "accessibilityLabel": "",
+        "accessibilityLabel": "{{count}} пользователей продвинули этот пост",
-        "accessibilityHint": "",
+        "accessibilityHint": "Нажмите, чтобы узнать пользователей",
-        "text": ""
+        "text": "$t(screenTabs:shared.users.statuses.reblogged_by)"
       },
       "favourited_by": {
-        "accessibilityLabel": "",
+        "accessibilityLabel": "{{count}} пользователей добавили этот пост в избранное",
-        "accessibilityHint": "",
+        "accessibilityHint": "Нажмите, чтобы узнать пользователей",
-        "text": ""
+        "text": "$t(screenTabs:shared.users.statuses.favourited_by)"
       },
       "history": {
-        "accessibilityLabel": "",
+        "accessibilityLabel": "Этот пост был отредактирован {{count}} раз",
         "accessibilityHint": "",
         "text_one": "",
         "text_other": ""

src/i18n/sv/screens/tabs.json

@@ -83,10 +83,10 @@
         "name": ""
       },
       "preferencesFilters": {
-        "name": ""
+        "name": "Alla innehållsfilter"
       },
       "preferencesFilterAdd": {
-        "name": ""
+        "name": "Skapa ett filter"
       },
       "preferencesFilterEdit": {
         "name": "Redigera filter"
@@ -150,7 +150,7 @@
         "options": {
           "public": "",
           "unlisted": "",
-          "private": ""
+          "private": "Endast följare"
         }
       },
       "sensitive": {
@@ -181,8 +181,8 @@
     },
     "preferencesFilters": {
       "expired": "",
-      "keywords_one": "",
+      "keywords_one": "{{count}} nyckelord",
-      "keywords_other": "",
+      "keywords_other": "{{count}} nyckelord",
       "statuses_one": "",
       "statuses_other": "",
       "context": "",
@@ -191,7 +191,7 @@
         "notifications": "",
         "public": "",
         "thread": "",
-        "account": ""
+        "account": "profil"
       }
     },
     "preferencesFilter": {

src/utils/styles/themes.ts

@@ -1,4 +1,5 @@
 import { DarkTheme, DefaultTheme } from '@react-navigation/native'
+import { Platform, PlatformColor } from 'react-native'
 
 export type Theme = 'light' | 'dark_lighter' | 'dark_darker'
 
@@ -16,6 +17,7 @@ export type ColorDefinitions =
   | 'backgroundOverlayDefault'
   | 'backgroundOverlayInvert'
   | 'border'
+  | 'separator'
   | 'shimmerDefault'
   | 'shimmerHighlight'
 
@@ -94,6 +96,21 @@ const themeColors: {
     dark_darker: 'rgb(90, 90, 90)'
   },
 
+  separator: {
+    light: Platform.select({
+      ios: PlatformColor('separator') as unknown as string,
+      default: 'rgb(180, 180, 180)'
+    }),
+    dark_lighter: Platform.select({
+      ios: PlatformColor('separator') as unknown as string,
+      default: 'rgb(90, 90, 90)'
+    }),
+    dark_darker: Platform.select({
+      ios: PlatformColor('separator') as unknown as string,
+      default: 'rgb(90, 90, 90)'
+    })
+  },
+
   shimmerDefault: {
     light: 'rgba(25, 25, 25, 0.05)',
     dark_lighter: 'rgba(250, 250, 250, 0.05)',