From 0e9ef0ec40caef22d9404b9d47c29e455b75bb47 Mon Sep 17 00:00:00 2001
From: Hanjiang Yu <delacroix.yu@gmail.com>
Date: Fri, 25 Nov 2022 22:31:49 +0800
Subject: [PATCH 01/40] Play audio in silent mode on iOS

---
 src/startup/audio.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/startup/audio.ts b/src/startup/audio.ts
index 2f3c2b51..4b5aa9b6 100644
--- a/src/startup/audio.ts
+++ b/src/startup/audio.ts
@@ -6,6 +6,7 @@ const audio = () => {
   Audio.setAudioModeAsync({
     interruptionModeIOS: InterruptionModeIOS.MixWithOthers,
     interruptionModeAndroid: InterruptionModeAndroid.DuckOthers,
+    playsInSilentModeIOS: true,
     staysActiveInBackground: false
   })
 }

From 0a5fea119464ef35979de2d4471592fb9b02d222 Mon Sep 17 00:00:00 2001
From: Hanjiang Yu <delacroix.yu@gmail.com>
Date: Mon, 28 Nov 2022 20:36:39 +0800
Subject: [PATCH 02/40] Always play video in fullscreen from beginning

---
 src/components/Timeline/Shared/Attachment/Video.tsx | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/components/Timeline/Shared/Attachment/Video.tsx b/src/components/Timeline/Shared/Attachment/Video.tsx
index 730c3248..e183eaab 100644
--- a/src/components/Timeline/Shared/Attachment/Video.tsx
+++ b/src/components/Timeline/Shared/Attachment/Video.tsx
@@ -27,7 +27,6 @@ const AttachmentVideo: React.FC<Props> = ({
   const videoPlayer = useRef<Video>(null)
   const [videoLoading, setVideoLoading] = useState(false)
   const [videoLoaded, setVideoLoaded] = useState(false)
-  const [videoPosition, setVideoPosition] = useState<number>(0)
   const [videoResizeMode, setVideoResizeMode] = useState<ResizeMode>(ResizeMode.COVER)
   const playOnPress = useCallback(async () => {
     analytics('timeline_shared_attachment_video_length', {
@@ -42,19 +41,15 @@ const AttachmentVideo: React.FC<Props> = ({
       await videoPlayer.current?.loadAsync({ uri: video.url })
     }
     Platform.OS === 'android' && setVideoResizeMode(ResizeMode.CONTAIN)
-    await videoPlayer.current?.setPositionAsync(videoPosition)
     await videoPlayer.current?.presentFullscreenPlayer()
     videoPlayer.current?.playAsync()
     setVideoLoading(false)
     videoPlayer.current?.setOnPlaybackStatusUpdate(props => {
       if (props.isLoaded) {
         setVideoLoaded(true)
-        if (props.positionMillis) {
-          setVideoPosition(props.positionMillis)
-        }
       }
     })
-  }, [videoLoaded, videoPosition])
+  }, [videoLoaded])
 
   const appState = useRef(AppState.currentState)
   useEffect(() => {
@@ -115,7 +110,7 @@ const AttachmentVideo: React.FC<Props> = ({
           if (event.fullscreenUpdate === VideoFullscreenUpdate.PLAYER_DID_DISMISS) {
             Platform.OS === 'android' && setVideoResizeMode(ResizeMode.COVER)
             if (!gifv) {
-              await videoPlayer.current?.pauseAsync()
+              await videoPlayer.current?.stopAsync()
             }
           }
         }}

From c60de7a5a1bd934a2edaa3f9aeca785dd4471d79 Mon Sep 17 00:00:00 2001
From: Hanjiang Yu <delacroix.yu@gmail.com>
Date: Mon, 28 Nov 2022 21:42:01 +0800
Subject: [PATCH 03/40] Fix the "undefined" string in DM

---
 src/screens/Compose.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/screens/Compose.tsx b/src/screens/Compose.tsx
index cb3e5f3b..5a423e1f 100644
--- a/src/screens/Compose.tsx
+++ b/src/screens/Compose.tsx
@@ -168,7 +168,7 @@ const ScreenCompose: React.FC<RootStackScreenProps<'Screen-Compose'>> = ({
           textInput: 'text',
           composeDispatch,
           content:
-            (params.text && `${params.text}\n`) +
+            (params.text ? `${params.text}\n` : '') +
             params.accts.map(acct => `@${acct}`).join(' ') +
             ' ',
           disableDebounce: true

From eda77fd7fcc3c9c7a2a63abb35d66cf3e7813cec Mon Sep 17 00:00:00 2001
From: xmflsct <me@xmflsct.com>
Date: Tue, 29 Nov 2022 21:58:59 +0100
Subject: [PATCH 04/40] Bump packages

---
 ios/Podfile.lock |  28 ++-
 package.json     |  40 ++--
 yarn.lock        | 463 +++++++++++++++++++++++++++--------------------
 3 files changed, 303 insertions(+), 228 deletions(-)

diff --git a/ios/Podfile.lock b/ios/Podfile.lock
index c57eaa54..6e5e751f 100644
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -3,7 +3,7 @@ PODS:
   - DoubleConversion (1.1.6)
   - EXApplication (5.0.1):
     - ExpoModulesCore
-  - EXAV (13.0.1):
+  - EXAV (13.0.2):
     - ExpoModulesCore
     - ReactCommon/turbomodule/core
   - EXConstants (14.0.2):
@@ -23,7 +23,7 @@ PODS:
     - ExpoModulesCore
   - EXNotifications (0.17.0):
     - ExpoModulesCore
-  - Expo (47.0.7):
+  - Expo (47.0.8):
     - ExpoModulesCore
   - ExpoCrypto (12.0.0):
     - ExpoModulesCore
@@ -417,9 +417,9 @@ PODS:
     - React
   - react-native-live-text-image-view (0.4.0):
     - React-Core
-  - react-native-netinfo (9.3.6):
+  - react-native-netinfo (9.3.7):
     - React-Core
-  - react-native-pager-view (6.1.1):
+  - react-native-pager-view (6.1.2):
     - React-Core
   - react-native-paste-input (0.5.1):
     - React-Core
@@ -538,9 +538,9 @@ PODS:
   - RNScreens (3.18.2):
     - React-Core
     - React-RCTImage
-  - RNSentry (4.8.0):
+  - RNSentry (4.10.0):
     - React-Core
-    - Sentry (= 7.29.0)
+    - Sentry/HybridSDK (= 7.31.2)
   - RNShareMenu (6.0.0):
     - React
   - RNSVG (13.6.0):
@@ -551,9 +551,7 @@ PODS:
   - SDWebImageWebPCoder (0.9.1):
     - libwebp (~> 1.0)
     - SDWebImage/Core (~> 5.13)
-  - Sentry (7.29.0):
-    - Sentry/Core (= 7.29.0)
-  - Sentry/Core (7.29.0)
+  - Sentry/HybridSDK (7.31.2)
   - Swime (3.0.6)
   - Yoga (1.14.0)
 
@@ -822,7 +820,7 @@ SPEC CHECKSUMS:
   boost: a7c83b31436843459a1961bfd74b96033dc77234
   DoubleConversion: 5189b271737e1565bdce30deb4a08d647e3f5f54
   EXApplication: 034b1c40a8e9fe1bff76a1e511ee90dff64ad834
-  EXAV: 766516466675fc5fdd7c500acced5934e8b00de2
+  EXAV: 9a45d37772c5329294c054a041dcc39931fc5032
   EXConstants: 3c86653c422dd77e40d10cbbabb3025003977415
   EXErrorRecovery: ae43433feb0608a64dc5b1c8363b3e7769a9ea24
   EXFileSystem: 60602b6eefa6873f97172c684b7537c9760b50d6
@@ -830,7 +828,7 @@ SPEC CHECKSUMS:
   EXFirebaseCore: d0d88cb904e893af07f809ab08c0892489bc6956
   EXFont: 319606bfe48c33b5b5063fb0994afdc496befe80
   EXNotifications: babce2a87b7922051354fcfe7a74dd279b7e272a
-  Expo: a37d568e9ae87645b74ed597dd0f0fd89e2daf2d
+  Expo: 36b5f625d36728adbdd1934d4d57182f319ab832
   ExpoCrypto: 51e7662c7f5bfeab25b7909b8a5d545ec15d4877
   ExpoHaptics: 5a56d30a87ea213dd00b09566dc4b441a4dff97f
   ExpoKeepAwake: 69b59d0a8d2b24de9f82759c39b3821fec030318
@@ -883,8 +881,8 @@ SPEC CHECKSUMS:
   react-native-image-picker: f2ab1215d17bcfe27b0eb6417cc236fd1f4775e7
   react-native-language-detection: 0e43195ad014974f1b7a31b64820eff34a243f2d
   react-native-live-text-image-view: 483bacfdba464162b8cf176bba555364f18b584c
-  react-native-netinfo: f80db8cac2151405633324cb645c60af098ee461
-  react-native-pager-view: 3c66c4e2f3ab423643d07b2c7041f8ac48395f72
+  react-native-netinfo: 2517ad504b3d303e90d7a431b0fcaef76d207983
+  react-native-pager-view: 54bed894cecebe28cede54c01038d9d1e122de43
   react-native-paste-input: 183ad7dc224e192719616f4258dde5b548627d08
   react-native-safe-area-context: 99b24a0c5acd0d5dcac2b1a7f18c49ea317be99a
   react-native-segmented-control: 65df6cd0619b780b3843d574a72d4c7cec396097
@@ -906,12 +904,12 @@ SPEC CHECKSUMS:
   RNGestureHandler: 62232ba8f562f7dea5ba1b3383494eb5bf97a4d3
   RNReanimated: ce445c233a6ff5600223484a88ad5704945d972a
   RNScreens: 34cc502acf1b916c582c60003dc3089fa01dc66d
-  RNSentry: db7fd7b66efda28885e4e904a8b5e7349aec61c1
+  RNSentry: 211e1a62145d5bcb4bee926823061b5af47816c4
   RNShareMenu: cb9dac548c8bf147d06f0bf07296ad51ea9f5fc3
   RNSVG: 3a79c0c4992213e4f06c08e62730c5e7b9e4dc17
   SDWebImage: b9a731e1d6307f44ca703b3976d18c24ca561e84
   SDWebImageWebPCoder: 18503de6621dd2c420d680e33d46bf8e1d5169b0
-  Sentry: 4272663eb0eda312024d795ca3f5a562a8ce5e18
+  Sentry: b15765d11769852fe78c9add942f7df60ed5dbf5
   Swime: d7b2c277503b6cea317774aedc2dce05613f8b0b
   Yoga: 99caf8d5ab45e9d637ee6e0174ec16fbbb01bcfc
 
diff --git a/package.json b/package.json
index f40d4351..fce73f57 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "tooot",
-  "version": "4.6.4",
+  "version": "4.6.5",
   "description": "tooot for Mastodon",
   "author": "xmflsct <me@xmflsct.com>",
   "license": "GPL-3.0-or-later",
@@ -19,11 +19,11 @@
   },
   "dependencies": {
     "@expo/react-native-action-sheet": "^4.0.1",
-    "@formatjs/intl-datetimeformat": "^6.3.1",
+    "@formatjs/intl-datetimeformat": "^6.4.0",
     "@formatjs/intl-getcanonicallocales": "^2.0.4",
-    "@formatjs/intl-locale": "^3.0.7",
-    "@formatjs/intl-numberformat": "^8.2.0",
-    "@formatjs/intl-pluralrules": "^5.1.4",
+    "@formatjs/intl-locale": "^3.0.8",
+    "@formatjs/intl-numberformat": "^8.3.0",
+    "@formatjs/intl-pluralrules": "^5.1.5",
     "@formatjs/intl-relativetimeformat": "^11.1.4",
     "@mattermost/react-native-paste-input": "^0.5.1",
     "@neverdull-agency/expo-unlimited-secure-store": "^1.0.10",
@@ -31,19 +31,19 @@
     "@react-native-camera-roll/camera-roll": "^5.1.0",
     "@react-native-clipboard/clipboard": "^1.11.1",
     "@react-native-community/blur": "^4.3.0",
-    "@react-native-community/netinfo": "9.3.6",
+    "@react-native-community/netinfo": "9.3.7",
     "@react-native-community/segmented-control": "^2.2.2",
-    "@react-navigation/bottom-tabs": "^6.4.1",
-    "@react-navigation/native": "^6.0.14",
-    "@react-navigation/native-stack": "^6.9.2",
-    "@react-navigation/stack": "^6.3.5",
+    "@react-navigation/bottom-tabs": "^6.4.3",
+    "@react-navigation/native": "^6.0.16",
+    "@react-navigation/native-stack": "^6.9.4",
+    "@react-navigation/stack": "^6.3.7",
     "@reduxjs/toolkit": "^1.9.0",
-    "@sentry/react-native": "4.8.0",
-    "@sharcoux/slider": "^6.0.3",
+    "@sentry/react-native": "4.10.0",
+    "@sharcoux/slider": "^6.1.1",
     "axios": "^0.27.2",
-    "expo": "^47.0.7",
+    "expo": "^47.0.8",
     "expo-auth-session": "^3.7.2",
-    "expo-av": "^13.0.1",
+    "expo-av": "^13.0.2",
     "expo-constants": "^14.0.2",
     "expo-crypto": "^12.0.0",
     "expo-file-system": "^15.1.1",
@@ -66,7 +66,7 @@
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "react-i18next": "^12.0.0",
-    "react-intl": "^6.2.1",
+    "react-intl": "^6.2.2",
     "react-native": "0.70.6",
     "react-native-animated-spinkit": "^1.5.2",
     "react-native-base64": "^0.2.1",
@@ -80,7 +80,7 @@
     "react-native-image-picker": "^4.10.1",
     "react-native-language-detection": "^0.1.0",
     "react-native-live-text-image-view": "^0.4.0",
-    "react-native-pager-view": "^6.1.1",
+    "react-native-pager-view": "^6.1.2",
     "react-native-reanimated": "^2.13.0",
     "react-native-reanimated-zoom": "^0.3.3",
     "react-native-safe-area-context": "^4.4.1",
@@ -88,7 +88,7 @@
     "react-native-share-menu": "^6.0.0",
     "react-native-svg": "^13.6.0",
     "react-native-swipe-list-view": "^3.2.9",
-    "react-native-tab-view": "^3.3.0",
+    "react-native-tab-view": "^3.3.2",
     "react-query": "^3.39.2",
     "react-redux": "^8.0.5",
     "redux-persist": "^6.0.0",
@@ -96,16 +96,16 @@
     "valid-url": "^1.0.9"
   },
   "devDependencies": {
-    "@babel/core": "^7.20.2",
+    "@babel/core": "^7.20.5",
     "@babel/plugin-proposal-optional-chaining": "^7.18.9",
     "@babel/preset-react": "^7.18.6",
     "@babel/preset-typescript": "^7.18.6",
     "@expo/config": "^7.0.3",
     "@types/linkify-it": "^3.0.2",
-    "@types/lodash": "^4.14.189",
+    "@types/lodash": "^4.14.190",
     "@types/react": "~18.0.25",
     "@types/react-dom": "~18.0.9",
-    "@types/react-native": "~0.70.6",
+    "@types/react-native": "~0.70.7",
     "@types/react-native-base64": "^0.2.0",
     "@types/react-native-share-menu": "^5.0.2",
     "@types/react-timeago": "^4.1.3",
diff --git a/yarn.lock b/yarn.lock
index 3aa45a2d..bc01eee8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -51,7 +51,7 @@
     semver "^5.4.1"
     source-map "^0.5.0"
 
-"@babel/core@^7.13.16", "@babel/core@^7.14.0", "@babel/core@^7.20.2":
+"@babel/core@^7.13.16", "@babel/core@^7.14.0":
   version "7.20.2"
   resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.20.2.tgz#8dc9b1620a673f92d3624bd926dc49a52cf25b92"
   integrity sha512-w7DbG8DtMrJcFOi4VrLm+8QM4az8Mo+PuLBKLp2zrYRCow8W/f9xiXm5sN53C8HksCyDQwCKha9JiDoIyPjT2g==
@@ -72,6 +72,27 @@
     json5 "^2.2.1"
     semver "^6.3.0"
 
+"@babel/core@^7.20.5":
+  version "7.20.5"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.20.5.tgz#45e2114dc6cd4ab167f81daf7820e8fa1250d113"
+  integrity sha512-UdOWmk4pNWTm/4DlPUl/Pt4Gz4rcEMb7CY0Y3eJl5Yz1vI8ZJGmHWaVE55LoxRjdpx0z259GE9U5STA9atUinQ==
+  dependencies:
+    "@ampproject/remapping" "^2.1.0"
+    "@babel/code-frame" "^7.18.6"
+    "@babel/generator" "^7.20.5"
+    "@babel/helper-compilation-targets" "^7.20.0"
+    "@babel/helper-module-transforms" "^7.20.2"
+    "@babel/helpers" "^7.20.5"
+    "@babel/parser" "^7.20.5"
+    "@babel/template" "^7.18.10"
+    "@babel/traverse" "^7.20.5"
+    "@babel/types" "^7.20.5"
+    convert-source-map "^1.7.0"
+    debug "^4.1.0"
+    gensync "^1.0.0-beta.2"
+    json5 "^2.2.1"
+    semver "^6.3.0"
+
 "@babel/generator@^7.14.0", "@babel/generator@^7.20.1", "@babel/generator@^7.20.2", "@babel/generator@^7.9.0":
   version "7.20.4"
   resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.20.4.tgz#4d9f8f0c30be75fd90a0562099a26e5839602ab8"
@@ -81,6 +102,15 @@
     "@jridgewell/gen-mapping" "^0.3.2"
     jsesc "^2.5.1"
 
+"@babel/generator@^7.20.5":
+  version "7.20.5"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.20.5.tgz#cb25abee3178adf58d6814b68517c62bdbfdda95"
+  integrity sha512-jl7JY2Ykn9S0yj4DQP82sYvPU+T3g0HFcWTqDLqiuA9tGRNIj9VfbtXGAYTTkyNEnQk1jkMGOdYka8aG/lulCA==
+  dependencies:
+    "@babel/types" "^7.20.5"
+    "@jridgewell/gen-mapping" "^0.3.2"
+    jsesc "^2.5.1"
+
 "@babel/helper-annotate-as-pure@^7.18.6":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.18.6.tgz#eaa49f6f80d5a33f9a5dd2276e6d6e451be0a6bb"
@@ -282,6 +312,15 @@
     "@babel/traverse" "^7.20.1"
     "@babel/types" "^7.20.0"
 
+"@babel/helpers@^7.20.5":
+  version "7.20.6"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.20.6.tgz#e64778046b70e04779dfbdf924e7ebb45992c763"
+  integrity sha512-Pf/OjgfgFRW5bApskEz5pvidpim7tEDPlFtKcNRXWmfHGn9IEI2W2flqRQXTFb7gIPTyK++N6rVHuwKut4XK6w==
+  dependencies:
+    "@babel/template" "^7.18.10"
+    "@babel/traverse" "^7.20.5"
+    "@babel/types" "^7.20.5"
+
 "@babel/highlight@^7.10.4", "@babel/highlight@^7.18.6":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.18.6.tgz#81158601e93e2563795adcbfbdf5d64be3f2ecdf"
@@ -296,6 +335,11 @@
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.20.3.tgz#5358cf62e380cf69efcb87a7bb922ff88bfac6e2"
   integrity sha512-OP/s5a94frIPXwjzEcv5S/tpQfc6XhxYUnmWpgdqMWGgYCuErA3SzozaRAMQgSZWKeTJxht9aWAkUY+0UzvOFg==
 
+"@babel/parser@^7.20.5":
+  version "7.20.5"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.20.5.tgz#7f3c7335fe417665d929f34ae5dceae4c04015e8"
+  integrity sha512-r27t/cy/m9uKLXQNWWebeCUHgnAZq0CpG1OwKRxzJMP1vpSU4bSIK2hq+/cp0bQxetkXx38n09rNu8jVkcK/zA==
+
 "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.18.6":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6.tgz#da5b8f9a580acdfbe53494dba45ea389fb09a4d2"
@@ -1105,6 +1149,22 @@
     debug "^4.1.0"
     globals "^11.1.0"
 
+"@babel/traverse@^7.20.5":
+  version "7.20.5"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.20.5.tgz#78eb244bea8270fdda1ef9af22a5d5e5b7e57133"
+  integrity sha512-WM5ZNN3JITQIq9tFZaw1ojLU3WgWdtkxnhM1AegMS+PvHjkM5IXjmYEGY7yukz5XS4sJyEf2VzWjI8uAavhxBQ==
+  dependencies:
+    "@babel/code-frame" "^7.18.6"
+    "@babel/generator" "^7.20.5"
+    "@babel/helper-environment-visitor" "^7.18.9"
+    "@babel/helper-function-name" "^7.19.0"
+    "@babel/helper-hoist-variables" "^7.18.6"
+    "@babel/helper-split-export-declaration" "^7.18.6"
+    "@babel/parser" "^7.20.5"
+    "@babel/types" "^7.20.5"
+    debug "^4.1.0"
+    globals "^11.1.0"
+
 "@babel/types@^7.0.0", "@babel/types@^7.18.10", "@babel/types@^7.18.6", "@babel/types@^7.18.9", "@babel/types@^7.19.0", "@babel/types@^7.20.0", "@babel/types@^7.20.2", "@babel/types@^7.4.4", "@babel/types@^7.9.0":
   version "7.20.2"
   resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.20.2.tgz#67ac09266606190f496322dbaff360fdaa5e7842"
@@ -1114,6 +1174,15 @@
     "@babel/helper-validator-identifier" "^7.19.1"
     to-fast-properties "^2.0.0"
 
+"@babel/types@^7.20.5":
+  version "7.20.5"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.20.5.tgz#e206ae370b5393d94dfd1d04cd687cace53efa84"
+  integrity sha512-c9fst/h2/dcF7H+MJKZ2T0KjEQ8hY/BNnDk/H3XY8C4Aw/eWQXWn/lWntHF9ooUBnGmEvbfGrTgLWc+um0YDUg==
+  dependencies:
+    "@babel/helper-string-parser" "^7.19.4"
+    "@babel/helper-validator-identifier" "^7.19.1"
+    to-fast-properties "^2.0.0"
+
 "@colors/colors@1.5.0":
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/@colors/colors/-/colors-1.5.0.tgz#bb504579c1cae923e6576a4f5da43d25f97bdbd9"
@@ -1665,6 +1734,14 @@
     "@formatjs/intl-localematcher" "0.2.31"
     tslib "2.4.0"
 
+"@formatjs/ecma402-abstract@1.14.0":
+  version "1.14.0"
+  resolved "https://registry.yarnpkg.com/@formatjs/ecma402-abstract/-/ecma402-abstract-1.14.0.tgz#2ee584d671e2776434da88b3e1ae4ed3053ad450"
+  integrity sha512-o1RDlkxcLzi0ZcoaovQooZC+0M3Ox0/DKZ+YTdUU9DHgWFeEZbYXEqM9k7JHdN7VyRi4wprTVPqrK+zR/9mo8Q==
+  dependencies:
+    "@formatjs/intl-localematcher" "0.2.31"
+    tslib "2.4.0"
+
 "@formatjs/fast-memoize@1.2.6":
   version "1.2.6"
   resolved "https://registry.yarnpkg.com/@formatjs/fast-memoize/-/fast-memoize-1.2.6.tgz#a442970db7e9634af556919343261a7bbe5e88c3"
@@ -1672,38 +1749,38 @@
   dependencies:
     tslib "2.4.0"
 
-"@formatjs/icu-messageformat-parser@2.1.10":
-  version "2.1.10"
-  resolved "https://registry.yarnpkg.com/@formatjs/icu-messageformat-parser/-/icu-messageformat-parser-2.1.10.tgz#d11114343fcb4c6d5ccabdeac50badf49c83fd9e"
-  integrity sha512-KkRMxhifWkRC45dhM9tqm0GXbb6NPYTGVYY3xx891IKc6p++DQrZTnmkVSNNO47OEERLfuP2KkPFPJBuu8z/wg==
+"@formatjs/icu-messageformat-parser@2.1.11":
+  version "2.1.11"
+  resolved "https://registry.yarnpkg.com/@formatjs/icu-messageformat-parser/-/icu-messageformat-parser-2.1.11.tgz#d0b59145bf910ea0fdd023a848369d7f08a16c26"
+  integrity sha512-g2OET65sDI0F3RUNXcyQPlxn+h+zQ6RkFIZZnOo70LtMEHTyDbgaMvauRlkBX52kqEe9eI99I3RaLvaM8pEcEg==
   dependencies:
-    "@formatjs/ecma402-abstract" "1.13.0"
-    "@formatjs/icu-skeleton-parser" "1.3.14"
+    "@formatjs/ecma402-abstract" "1.14.0"
+    "@formatjs/icu-skeleton-parser" "1.3.15"
     tslib "2.4.0"
 
-"@formatjs/icu-skeleton-parser@1.3.14":
-  version "1.3.14"
-  resolved "https://registry.yarnpkg.com/@formatjs/icu-skeleton-parser/-/icu-skeleton-parser-1.3.14.tgz#b99ef7f855f8a58cab2519ec4f921f11c2bf74a7"
-  integrity sha512-7bv60HQQcBb3+TSj+45tOb/CHV5z1hOpwdtS50jsSBXfB+YpGhnoRsZxSRksXeCxMy6xn6tA6VY2601BrrK+OA==
+"@formatjs/icu-skeleton-parser@1.3.15":
+  version "1.3.15"
+  resolved "https://registry.yarnpkg.com/@formatjs/icu-skeleton-parser/-/icu-skeleton-parser-1.3.15.tgz#b30c6437aa259e8720e14beeff7e9c713d6e5646"
+  integrity sha512-/x7qBaswEGLEBm0vY8HmYy764py0FmD+pSzBNH5llgp1d0NFAIo+lTfsKFxPDk+iNNnL3f7ZH0KOyUtAResZ5Q==
   dependencies:
-    "@formatjs/ecma402-abstract" "1.13.0"
+    "@formatjs/ecma402-abstract" "1.14.0"
     tslib "2.4.0"
 
-"@formatjs/intl-datetimeformat@^6.3.1":
-  version "6.3.1"
-  resolved "https://registry.yarnpkg.com/@formatjs/intl-datetimeformat/-/intl-datetimeformat-6.3.1.tgz#a5909ee5b6f26572758c2d8e809c7cd888e01b68"
-  integrity sha512-6uJS+ipQo4m8+F8sSbTOd+4osoDe/9V10Me0OYL2jFCgxC/fKemRVqqGccNOg4l3rQghGHnmrsJLsZ1ydBo5LQ==
+"@formatjs/intl-datetimeformat@^6.4.0":
+  version "6.4.0"
+  resolved "https://registry.yarnpkg.com/@formatjs/intl-datetimeformat/-/intl-datetimeformat-6.4.0.tgz#cb743fb0aa0d119da1ad52e8c8688659cc704047"
+  integrity sha512-9dLbEq5UGCySAhVIOC+cUhhDHBDePBb2lafAllDxRpE6SHGBpEhxLLWMvm9iMokckF/T/Usg3240AxcKR3JNrA==
   dependencies:
-    "@formatjs/ecma402-abstract" "1.13.0"
+    "@formatjs/ecma402-abstract" "1.14.0"
     "@formatjs/intl-localematcher" "0.2.31"
     tslib "2.4.0"
 
-"@formatjs/intl-displaynames@6.1.4":
-  version "6.1.4"
-  resolved "https://registry.yarnpkg.com/@formatjs/intl-displaynames/-/intl-displaynames-6.1.4.tgz#26b2c7b814f5132b2e6d781bf4af7bce86f46852"
-  integrity sha512-sEbziGLsWQo6nA8ZUBcsDRlZzPg+uMVjDmbTalgGqRWLbdXuxMldTYdaCK+UptyJhkmNVM/erz3csTiyqamXHQ==
+"@formatjs/intl-displaynames@6.2.0":
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/@formatjs/intl-displaynames/-/intl-displaynames-6.2.0.tgz#e0c5d2bec69949cccf9c0d533489d66667d9ed5b"
+  integrity sha512-gZCZBi7zYzkloVlzjNSS5XAZ0LNx51xHSzZhkqtkOnh1sWGP2Ciz/IcQQ/81SNzIk0kSCHx0n/VrisO7RLHkZQ==
   dependencies:
-    "@formatjs/ecma402-abstract" "1.13.0"
+    "@formatjs/ecma402-abstract" "1.14.0"
     "@formatjs/intl-localematcher" "0.2.31"
     tslib "2.4.0"
 
@@ -1714,21 +1791,21 @@
   dependencies:
     tslib "2.4.0"
 
-"@formatjs/intl-listformat@7.1.3":
-  version "7.1.3"
-  resolved "https://registry.yarnpkg.com/@formatjs/intl-listformat/-/intl-listformat-7.1.3.tgz#e2bda750a46d2a90d7fa023b02a984588978829c"
-  integrity sha512-rs0Kxl78PeRCedx2cmFoBqcun2Kf0bCQrF8ycna54sfePpDhMskvODWeI4G/xBioW01FjK7CJSvtJJ87hrr79A==
+"@formatjs/intl-listformat@7.1.4":
+  version "7.1.4"
+  resolved "https://registry.yarnpkg.com/@formatjs/intl-listformat/-/intl-listformat-7.1.4.tgz#a9d6483618f827bc97f1995301ea1734631e2078"
+  integrity sha512-hSUbhmNEcjtVcN7IkSpkFlectb3354sk+0RMa30H16LvBuLL+uXOt3RlwEWEDG7DjU5bcDqMuEu3fvoCKHpSvQ==
   dependencies:
-    "@formatjs/ecma402-abstract" "1.13.0"
+    "@formatjs/ecma402-abstract" "1.14.0"
     "@formatjs/intl-localematcher" "0.2.31"
     tslib "2.4.0"
 
-"@formatjs/intl-locale@^3.0.7":
-  version "3.0.7"
-  resolved "https://registry.yarnpkg.com/@formatjs/intl-locale/-/intl-locale-3.0.7.tgz#e8fa1eddb31d4f9d1e5228eca5f400ba1949b5b9"
-  integrity sha512-XucpMNDhiS/gkp+OdvGyHOKBgnB7DVnY81ErjUFI/ztLWxskEDfFhQrWJ4VeG+z0+k2kVnm2akAixhJws3hoKA==
+"@formatjs/intl-locale@^3.0.8":
+  version "3.0.8"
+  resolved "https://registry.yarnpkg.com/@formatjs/intl-locale/-/intl-locale-3.0.8.tgz#9a98f06081ae5b093378116b7a871741a03c197a"
+  integrity sha512-/bauX5OtC+VTZtrGAMkKONn4zrkvyvhMna93hSx0bALxwFjOo2U+n84fO+GVayI0WySV0S2bVD0cwzcHCQJYag==
   dependencies:
-    "@formatjs/ecma402-abstract" "1.13.0"
+    "@formatjs/ecma402-abstract" "1.14.0"
     "@formatjs/intl-getcanonicallocales" "2.0.4"
     tslib "2.4.0"
 
@@ -1739,21 +1816,21 @@
   dependencies:
     tslib "2.4.0"
 
-"@formatjs/intl-numberformat@^8.2.0":
-  version "8.2.0"
-  resolved "https://registry.yarnpkg.com/@formatjs/intl-numberformat/-/intl-numberformat-8.2.0.tgz#7c2262eb66aff1e899bec155da43c6d6ad50356a"
-  integrity sha512-X9tIhOSrzw8ywBowd0QGyNE6oXHCcp2GKfTxBR3BZ9m99f5omoQTEH89wTdEFM38oQcWgXN4juSpJYbtZUQ2MA==
+"@formatjs/intl-numberformat@^8.3.0":
+  version "8.3.0"
+  resolved "https://registry.yarnpkg.com/@formatjs/intl-numberformat/-/intl-numberformat-8.3.0.tgz#32b72f146a4c8a6ea19408eb55d77b170c37f544"
+  integrity sha512-WDGbaGhJOfl9tYfLDmAdDvtuIwud3ABM1mfuLELXO0ETQJICD89oIOFMTITCoWZBdxqsP55B64SJQBFJNBwQAg==
   dependencies:
-    "@formatjs/ecma402-abstract" "1.13.0"
+    "@formatjs/ecma402-abstract" "1.14.0"
     "@formatjs/intl-localematcher" "0.2.31"
     tslib "2.4.0"
 
-"@formatjs/intl-pluralrules@^5.1.4":
-  version "5.1.4"
-  resolved "https://registry.yarnpkg.com/@formatjs/intl-pluralrules/-/intl-pluralrules-5.1.4.tgz#7b8f0101a47a017d6b747a5a42959ccb604e4bef"
-  integrity sha512-SD9G54mH5Kp8COUxZbGL44oLG5ZoNc3MYG/09jtPbPLv8GjLXbs9EEvnwGi0OD9PEnj7dkg0FoOLMulFLcoeCA==
+"@formatjs/intl-pluralrules@^5.1.5":
+  version "5.1.5"
+  resolved "https://registry.yarnpkg.com/@formatjs/intl-pluralrules/-/intl-pluralrules-5.1.5.tgz#41de4ec508b5c240e4923a7807bbc3c8412425ae"
+  integrity sha512-Y+IB9xjJ1fhKIhFbmlvCYHyAQAbnuqqIo56C5P41A6PGUH2FGj+6v2xlwzE7vKb6+jxBGGqd1JVTYNJNGx0sGw==
   dependencies:
-    "@formatjs/ecma402-abstract" "1.13.0"
+    "@formatjs/ecma402-abstract" "1.14.0"
     "@formatjs/intl-localematcher" "0.2.31"
     tslib "2.4.0"
 
@@ -1766,17 +1843,17 @@
     "@formatjs/intl-localematcher" "0.2.31"
     tslib "2.4.0"
 
-"@formatjs/intl@2.5.1":
-  version "2.5.1"
-  resolved "https://registry.yarnpkg.com/@formatjs/intl/-/intl-2.5.1.tgz#7a743c3f5ca70b7c7881d6e67e5ce14e2fffac2a"
-  integrity sha512-P01ZGuDDlcN8bHHBCEHspJPvs8WJeO8SXlUIcVGWhS3IN5vUgz0QKUXcKBFnJbEHhONJ+azlObVwvlDKsE+kUg==
+"@formatjs/intl@2.6.0":
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/@formatjs/intl/-/intl-2.6.0.tgz#9698d44d7167a93f301405d4cbff8e640498d569"
+  integrity sha512-pMrNpqNGj7QnQewIBe8Dh52teZ24hQpP4w4S4UzB0BZmTJ3KkIi05oJoL2Cagzsli4j1pXR0V39LD7+lnWhgCg==
   dependencies:
-    "@formatjs/ecma402-abstract" "1.13.0"
+    "@formatjs/ecma402-abstract" "1.14.0"
     "@formatjs/fast-memoize" "1.2.6"
-    "@formatjs/icu-messageformat-parser" "2.1.10"
-    "@formatjs/intl-displaynames" "6.1.4"
-    "@formatjs/intl-listformat" "7.1.3"
-    intl-messageformat "10.2.1"
+    "@formatjs/icu-messageformat-parser" "2.1.11"
+    "@formatjs/intl-displaynames" "6.2.0"
+    "@formatjs/intl-listformat" "7.1.4"
+    intl-messageformat "10.2.2"
     tslib "2.4.0"
 
 "@gar/promisify@^1.0.1":
@@ -2109,10 +2186,10 @@
     prompts "^2.4.0"
     semver "^6.3.0"
 
-"@react-native-community/netinfo@9.3.6":
-  version "9.3.6"
-  resolved "https://registry.yarnpkg.com/@react-native-community/netinfo/-/netinfo-9.3.6.tgz#730de4ebf83f7263fa61b0cbec6cde9b28660077"
-  integrity sha512-SwbBnHZuXcCUpYdL6ebt4HPAZEugPASl+RPxIyNe91Y+boZptzAFLywYW6yU93DYAhiHHFQBL6x6LxwF/K/tOQ==
+"@react-native-community/netinfo@9.3.7":
+  version "9.3.7"
+  resolved "https://registry.yarnpkg.com/@react-native-community/netinfo/-/netinfo-9.3.7.tgz#92407f679f00bae005c785a9284e61d63e292b34"
+  integrity sha512-+taWmE5WpBp0uS6kf+bouCx/sn89G9EpR4s2M/ReLvctVIFL2Qh8WnWfBxqK9qwgmFha/uqjSr2Gq03OOtiDcw==
 
 "@react-native-community/segmented-control@^2.2.2":
   version "2.2.2"
@@ -2139,63 +2216,63 @@
   resolved "https://registry.yarnpkg.com/@react-native/polyfills/-/polyfills-2.0.0.tgz#4c40b74655c83982c8cf47530ee7dc13d957b6aa"
   integrity sha512-K0aGNn1TjalKj+65D7ycc1//H9roAQ51GJVk5ZJQFb2teECGmzd86bYDC0aYdbRf7gtovescq4Zt6FR0tgXiHQ==
 
-"@react-navigation/bottom-tabs@^6.4.1":
-  version "6.4.1"
-  resolved "https://registry.yarnpkg.com/@react-navigation/bottom-tabs/-/bottom-tabs-6.4.1.tgz#54e469077f7c9f3750e6727ec8f298d5497b6ae5"
-  integrity sha512-b12o0aVe+A9bUVP31kQLVcZ5l4Inm/7XhpSS5FvwhoI9L2iwofK1tt98uEQd79NIAklfui+IqRqr2X6XKkygbA==
+"@react-navigation/bottom-tabs@^6.4.3":
+  version "6.4.3"
+  resolved "https://registry.yarnpkg.com/@react-navigation/bottom-tabs/-/bottom-tabs-6.4.3.tgz#38498ade0e03294d7ba7fdcd96ab347c7ad1eb04"
+  integrity sha512-nkuHJ31mEyrZZPswfMAHZgUTEm11ohN9Fy54wao2HFk1VM4eplijX6pFGycA4yhKy73A/aesKhghVPzR+FaSmg==
   dependencies:
-    "@react-navigation/elements" "^1.3.7"
+    "@react-navigation/elements" "^1.3.9"
     color "^4.2.3"
     warn-once "^0.1.0"
 
-"@react-navigation/core@^6.4.1":
-  version "6.4.1"
-  resolved "https://registry.yarnpkg.com/@react-navigation/core/-/core-6.4.1.tgz#2d290cadc23992e914c45b5712efa30e5f37587f"
-  integrity sha512-M1rTS+qaw84ZItvObwFTjuvXfrJRnXL2uJJeiDVwSvu7/30Wp6bkL3/MfLUEA6I4CzJhL74iRSfCKSVe7kVhlw==
+"@react-navigation/core@^6.4.3":
+  version "6.4.3"
+  resolved "https://registry.yarnpkg.com/@react-navigation/core/-/core-6.4.3.tgz#5609bab95e3080d190eff46a64e52cc06eb0c4cf"
+  integrity sha512-+HGHeEq7GK029Jy2jFkV2uQYc6a6AurjjUAVFlSz5tsNo4L5E3ZCzo7sk5+lcvt0Agdedf5Q+wTiWjT7IrixgA==
   dependencies:
-    "@react-navigation/routers" "^6.1.3"
+    "@react-navigation/routers" "^6.1.5"
     escape-string-regexp "^4.0.0"
     nanoid "^3.1.23"
     query-string "^7.0.0"
     react-is "^16.13.0"
     use-latest-callback "^0.1.5"
 
-"@react-navigation/elements@^1.3.7":
-  version "1.3.7"
-  resolved "https://registry.yarnpkg.com/@react-navigation/elements/-/elements-1.3.7.tgz#40d80a7f34d645b605289da10bc4b6c3a7667215"
-  integrity sha512-OZg2N/dd2tl6qkfrWvmUjFsYsbEyHEv4NbZSBuT+CR+d1pzmexN2IeVmi4cEMoR7U7GwhFcHRevF36yBsjU/dw==
+"@react-navigation/elements@^1.3.9":
+  version "1.3.9"
+  resolved "https://registry.yarnpkg.com/@react-navigation/elements/-/elements-1.3.9.tgz#33e26d7ad655b012e024ef0a005a3f66201287f8"
+  integrity sha512-V9aIZN19ufaKWlXT4UcM545tDiEt9DIQS+74pDgbnzoQcDypn0CvSqWopFhPACMdJatgmlZUuOrrMfTeNrBWgA==
 
-"@react-navigation/native-stack@^6.9.2":
-  version "6.9.2"
-  resolved "https://registry.yarnpkg.com/@react-navigation/native-stack/-/native-stack-6.9.2.tgz#8c861a59a2a86aaf25f0f33a990958edc36ddac4"
-  integrity sha512-W5CYX+mYVyOYUgWoN15O34Pv/JieX2/pU09yh+kacxPHPEm4gYTQM/OIHACOov5T2WyiNSU6iIHjfzQ6e7M9zw==
+"@react-navigation/native-stack@^6.9.4":
+  version "6.9.4"
+  resolved "https://registry.yarnpkg.com/@react-navigation/native-stack/-/native-stack-6.9.4.tgz#d9cc26ad97afcee1c0e3fb092ae4c60f848b1572"
+  integrity sha512-R40G2Zfo748hE4+we/TUAEClw53l0QdFDJ0q/9VS1moxgI4zUopdBxN5SmF32OMFfkedMRAT9J+aVbwgmdn7pA==
   dependencies:
-    "@react-navigation/elements" "^1.3.7"
+    "@react-navigation/elements" "^1.3.9"
     warn-once "^0.1.0"
 
-"@react-navigation/native@^6.0.14":
-  version "6.0.14"
-  resolved "https://registry.yarnpkg.com/@react-navigation/native/-/native-6.0.14.tgz#3ce3a4176ac7dc5495241d56a28db18449baf754"
-  integrity sha512-Z95bJrRkZerBJq6Qc/xjA/kibPpB+UvPeMWS1CBhRF8FaX1483UdHqPqSbW879tPwjP2R4XfoA4dtoEHswrOjA==
+"@react-navigation/native@^6.0.16":
+  version "6.0.16"
+  resolved "https://registry.yarnpkg.com/@react-navigation/native/-/native-6.0.16.tgz#a37df62da9db912c91c53e2cdeadb954865a6a9b"
+  integrity sha512-YVmzypkDppV/vAG+66KTJ2RFtPjhDTLLjgk8TNTCHG3pahq1q13zbnEPjqB42bU4kgL5SG17O4saErt1DJaWQg==
   dependencies:
-    "@react-navigation/core" "^6.4.1"
+    "@react-navigation/core" "^6.4.3"
     escape-string-regexp "^4.0.0"
     fast-deep-equal "^3.1.3"
     nanoid "^3.1.23"
 
-"@react-navigation/routers@^6.1.3":
-  version "6.1.3"
-  resolved "https://registry.yarnpkg.com/@react-navigation/routers/-/routers-6.1.3.tgz#1df51959e9a67c44367462e8b929b7360a5d2555"
-  integrity sha512-idJotMEzHc3haWsCh7EvnnZMKxvaS4YF/x2UyFBkNFiEFUaEo/1ioQU6qqmVLspdEv4bI/dLm97hQo7qD8Yl7Q==
+"@react-navigation/routers@^6.1.5":
+  version "6.1.5"
+  resolved "https://registry.yarnpkg.com/@react-navigation/routers/-/routers-6.1.5.tgz#b3e06bc09346ad94206bcc71c46538d5b6dc4883"
+  integrity sha512-JzMRiRRu8J0yUMC7BV8wOVzevjkHnIPONbpCTL/vH5yceTm+dSH/U3esIObgk8wYYbov+jYlVhwUQNGRb2to6g==
   dependencies:
     nanoid "^3.1.23"
 
-"@react-navigation/stack@^6.3.5":
-  version "6.3.5"
-  resolved "https://registry.yarnpkg.com/@react-navigation/stack/-/stack-6.3.5.tgz#c616ef78cbaa55938da993d871d9fc41801d41f4"
-  integrity sha512-G706Ow+8fhiLT5Cf48566YsjboU5h5ll9nva90xX3br7V6x0JMoGMvXjvbORZyzLuUytQO3mf0T3nVUuO52vZQ==
+"@react-navigation/stack@^6.3.7":
+  version "6.3.7"
+  resolved "https://registry.yarnpkg.com/@react-navigation/stack/-/stack-6.3.7.tgz#a2c0e08c8cc8696da203eba6905025ce8665f40a"
+  integrity sha512-M0gGeIpXmY08ZxZlHO9o/NLj9lO4zGdTll+a9e40BwfSxR5v6R34msKHUJ57nxrzvr2/MSSllZRkW3wc8woKFg==
   dependencies:
-    "@react-navigation/elements" "^1.3.7"
+    "@react-navigation/elements" "^1.3.9"
     color "^4.2.3"
     warn-once "^0.1.0"
 
@@ -2217,14 +2294,14 @@
     component-type "^1.2.1"
     join-component "^1.1.0"
 
-"@sentry/browser@7.16.0":
-  version "7.16.0"
-  resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-7.16.0.tgz#afd2bac91857d2359272a0d9d2b1ee5ca7d69828"
-  integrity sha512-tJ063zvoF8Raw7mzQEXupOFPSN6v36WIbsDVGeFdToPCwViaBuATaxvWCrudGzsnBkMyItmTLJkzn9SEIXUOiw==
+"@sentry/browser@7.21.1":
+  version "7.21.1"
+  resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-7.21.1.tgz#bffa3ea19050c06400107d2297b9802f9719f98b"
+  integrity sha512-cS2Jz2+fs9+4pJqLJPtYqGyY97ywJDWAWIR1Yla3hs1QQuH6m0Nz3ojZD1gE2eKH9mHwkGbnNAh+hHcrYrfGzw==
   dependencies:
-    "@sentry/core" "7.16.0"
-    "@sentry/types" "7.16.0"
-    "@sentry/utils" "7.16.0"
+    "@sentry/core" "7.21.1"
+    "@sentry/types" "7.21.1"
+    "@sentry/utils" "7.21.1"
     tslib "^1.9.3"
 
 "@sentry/cli@1.74.4":
@@ -2253,83 +2330,83 @@
     proxy-from-env "^1.1.0"
     which "^2.0.2"
 
-"@sentry/core@7.16.0":
-  version "7.16.0"
-  resolved "https://registry.yarnpkg.com/@sentry/core/-/core-7.16.0.tgz#60f9b54ef2ec524176b329e1d15be39c36da5953"
-  integrity sha512-vq6H1b/IPTvzDD9coQ3wIudvSjkAYuUlXb1dv69dRlq4v3st9dcKBps1Zf0lQ1i4TVlDLoe1iGMmNFglMF1Q5w==
+"@sentry/core@7.21.1":
+  version "7.21.1"
+  resolved "https://registry.yarnpkg.com/@sentry/core/-/core-7.21.1.tgz#d0423282d90875625802dfe380f9657e9242b72b"
+  integrity sha512-Og5wEEsy24fNvT/T7IKjcV4EvVK5ryY2kxbJzKY6GU2eX+i+aBl+n/vp7U0Es351C/AlTkS+0NOUsp2TQQFxZA==
   dependencies:
-    "@sentry/types" "7.16.0"
-    "@sentry/utils" "7.16.0"
+    "@sentry/types" "7.21.1"
+    "@sentry/utils" "7.21.1"
     tslib "^1.9.3"
 
-"@sentry/hub@7.16.0":
-  version "7.16.0"
-  resolved "https://registry.yarnpkg.com/@sentry/hub/-/hub-7.16.0.tgz#26d65a2f6c71d18ec7a20f352fa8c4c461db2940"
-  integrity sha512-eCM66JPS2nw+fQK3vpJhs6Lxf4FqOwPqIpFbJ2TivQ8kgJyolHOyeH/LsmJbcw97P4sc3O3LHt5v93vTKmlDrw==
+"@sentry/hub@7.21.1":
+  version "7.21.1"
+  resolved "https://registry.yarnpkg.com/@sentry/hub/-/hub-7.21.1.tgz#5c046fd2ca7eaf14cd0bf70617cc8b057f9b88ce"
+  integrity sha512-WXQJ5z5iUZO6sOq3f7A3eIwvb/GoVJ3q5DQDTNF7HB/qcm11u5QPlAHTFBCsKJdT39NaE78JcMluiHZUWT+C5A==
   dependencies:
-    "@sentry/core" "7.16.0"
-    "@sentry/types" "7.16.0"
-    "@sentry/utils" "7.16.0"
+    "@sentry/core" "7.21.1"
+    "@sentry/types" "7.21.1"
+    "@sentry/utils" "7.21.1"
     tslib "^1.9.3"
 
-"@sentry/integrations@7.16.0":
-  version "7.16.0"
-  resolved "https://registry.yarnpkg.com/@sentry/integrations/-/integrations-7.16.0.tgz#fa6a2a2b7275efec5cf67c07eb76297447301ff2"
-  integrity sha512-PJRmFUHOKMf1APOlwxGB7Z6LHzJP4xL6OLSoiwnruRuHaGvdyILA53fr/A6wRMSPyTxJDJpNkcN36cA56mLxYA==
+"@sentry/integrations@7.21.1":
+  version "7.21.1"
+  resolved "https://registry.yarnpkg.com/@sentry/integrations/-/integrations-7.21.1.tgz#8a5d5595521c4891cc2582f98d253a074ba54abc"
+  integrity sha512-DbQZSdsqaD9RTy5WvLzonoJa2CIgeapnGfFOadnQGOD8A8GT9Bre/BgcQ5ksHqGnVfzYwpU26k/ue9gjXnI/Pg==
   dependencies:
-    "@sentry/types" "7.16.0"
-    "@sentry/utils" "7.16.0"
+    "@sentry/types" "7.21.1"
+    "@sentry/utils" "7.21.1"
     localforage "^1.8.1"
     tslib "^1.9.3"
 
-"@sentry/react-native@4.8.0":
-  version "4.8.0"
-  resolved "https://registry.yarnpkg.com/@sentry/react-native/-/react-native-4.8.0.tgz#77609f20dd84820e051d2669324e0e380702f4b6"
-  integrity sha512-+8js5kRGw8XurRqIVI+IT4tWdBlK6SVEEP6zHTMYB6u4NNzSXc5gKCheSZ1SeKAl30e1ZFw4t4Ace6kO+TlVdQ==
+"@sentry/react-native@4.10.0":
+  version "4.10.0"
+  resolved "https://registry.yarnpkg.com/@sentry/react-native/-/react-native-4.10.0.tgz#5824aeecf7dab27afd6f635411f2738faffd546c"
+  integrity sha512-90hPQ+kdHpCPwA6iAuDIvsDi9aM07JMGXP3fHivSIAVWGtpBtYjl+QT1amDorXwW04RdVLCEteL+21t0DxU8Eg==
   dependencies:
-    "@sentry/browser" "7.16.0"
+    "@sentry/browser" "7.21.1"
     "@sentry/cli" "1.74.4"
-    "@sentry/core" "7.16.0"
-    "@sentry/hub" "7.16.0"
-    "@sentry/integrations" "7.16.0"
-    "@sentry/react" "7.16.0"
-    "@sentry/tracing" "7.16.0"
-    "@sentry/types" "7.16.0"
-    "@sentry/utils" "7.16.0"
+    "@sentry/core" "7.21.1"
+    "@sentry/hub" "7.21.1"
+    "@sentry/integrations" "7.21.1"
+    "@sentry/react" "7.21.1"
+    "@sentry/tracing" "7.21.1"
+    "@sentry/types" "7.21.1"
+    "@sentry/utils" "7.21.1"
     "@sentry/wizard" "1.2.17"
 
-"@sentry/react@7.16.0":
-  version "7.16.0"
-  resolved "https://registry.yarnpkg.com/@sentry/react/-/react-7.16.0.tgz#7b214736804b7516ba66230301bc6f0202060a91"
-  integrity sha512-tJH5zO4MPopzqZgi7Yd4iIB9Am5uGVefgkHaoeCGXffveEVWqEdjj8TqPL36SBb76gCmtpa01NBDsUSDZ1w/yw==
+"@sentry/react@7.21.1":
+  version "7.21.1"
+  resolved "https://registry.yarnpkg.com/@sentry/react/-/react-7.21.1.tgz#275e6fd46212f608f382c7dde46d21e748f93491"
+  integrity sha512-w91PIUyX07mErKgrBQA+7ID8zFKrYDUYSOrFSHufg5DdPq4EpHiNDe/Yngg3e9ELhtr1AbCnEvx9wlvqLi3nZQ==
   dependencies:
-    "@sentry/browser" "7.16.0"
-    "@sentry/types" "7.16.0"
-    "@sentry/utils" "7.16.0"
+    "@sentry/browser" "7.21.1"
+    "@sentry/types" "7.21.1"
+    "@sentry/utils" "7.21.1"
     hoist-non-react-statics "^3.3.2"
     tslib "^1.9.3"
 
-"@sentry/tracing@7.16.0":
-  version "7.16.0"
-  resolved "https://registry.yarnpkg.com/@sentry/tracing/-/tracing-7.16.0.tgz#823b84abf0df08ecd16669547b4281e3c7a96ac9"
-  integrity sha512-8a9bViUY7oS35msBMouxkgz5OGd9NGutuKF7SQ8hPZwTcQPOxOwPyHccykgr56k6OmaDjGCLZMqZowaysJj+4g==
+"@sentry/tracing@7.21.1":
+  version "7.21.1"
+  resolved "https://registry.yarnpkg.com/@sentry/tracing/-/tracing-7.21.1.tgz#db02643e84960f1ea14b35fe75a93fc0bbca1fcb"
+  integrity sha512-b1BTPsRaNQpohzegoz59KGuBl+To651vEq0vMS4tCzSyIdxkYso3JCrjDdEqW/2MliQYANNVrUai2bmwmU9h1g==
   dependencies:
-    "@sentry/core" "7.16.0"
-    "@sentry/types" "7.16.0"
-    "@sentry/utils" "7.16.0"
+    "@sentry/core" "7.21.1"
+    "@sentry/types" "7.21.1"
+    "@sentry/utils" "7.21.1"
     tslib "^1.9.3"
 
-"@sentry/types@7.16.0":
-  version "7.16.0"
-  resolved "https://registry.yarnpkg.com/@sentry/types/-/types-7.16.0.tgz#79c06ada153a84feb949fa49b1c9d15f91decd79"
-  integrity sha512-i6D+OK6d0l/k+VQvRp/Pt21WkDEgVBUIZq+sOkEZJczbcfexVdXKeXXoYTD2vYuFq8Yy28fzlsZaKI+NoH94yQ==
+"@sentry/types@7.21.1":
+  version "7.21.1"
+  resolved "https://registry.yarnpkg.com/@sentry/types/-/types-7.21.1.tgz#408a7b95a66ddc30c4359979594e03bee8f9fbdc"
+  integrity sha512-3/IKnd52Ol21amQvI+kz+WB76s8/LR5YvFJzMgIoI2S8d82smIr253zGijRXxHPEif8kMLX4Yt+36VzrLxg6+A==
 
-"@sentry/utils@7.16.0":
-  version "7.16.0"
-  resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-7.16.0.tgz#b832520c661d4435808969ee04814ff8e20497b1"
-  integrity sha512-3Zh1txg7IRp4kZAdG27YF7K6lD1IZyuAo9KjoPg1Xzqa4DOZyASJuEkbf+rK2a9T4HrtVHHXJUsNbKg8WM3VHg==
+"@sentry/utils@7.21.1":
+  version "7.21.1"
+  resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-7.21.1.tgz#96582345178015fd32fe9159c25c44ccf2f99d2a"
+  integrity sha512-F0W0AAi8tgtTx6ApZRI2S9HbXEA9ENX1phTZgdNNWcMFm1BNbc21XEwLqwXBNjub5nlA6CE8xnjXRgdZKx4kzQ==
   dependencies:
-    "@sentry/types" "7.16.0"
+    "@sentry/types" "7.21.1"
     tslib "^1.9.3"
 
 "@sentry/wizard@1.2.17":
@@ -2349,10 +2426,10 @@
     xcode "3.0.1"
     yargs "^16.2.0"
 
-"@sharcoux/slider@^6.0.3":
-  version "6.0.3"
-  resolved "https://registry.yarnpkg.com/@sharcoux/slider/-/slider-6.0.3.tgz#0c43eade31fa64ea5d41ad1ce474c375fe35f806"
-  integrity sha512-eVweQ/BIc6jRXnUEWRKtytN5QndogBjiZqVxgXRcGRRI/DkeZV0Q5CcOsf7By6oUdCym3fORU7jTKMS8rIXlQA==
+"@sharcoux/slider@^6.1.1":
+  version "6.1.1"
+  resolved "https://registry.yarnpkg.com/@sharcoux/slider/-/slider-6.1.1.tgz#6260c1d86d1a51bafdcf1341cd9ff5ce178fc710"
+  integrity sha512-0ubP44rDzIhmN0UJxp2Y0Yresmlpruz46ymlG/9uoZHyXjuGg7yMuS78c/myfSRrtjiQoqnFMU52+kaG1uhX5w==
 
 "@sideway/address@^4.1.3":
   version "4.1.4"
@@ -2477,10 +2554,10 @@
   resolved "https://registry.yarnpkg.com/@types/linkify-it/-/linkify-it-3.0.2.tgz#fd2cd2edbaa7eaac7e7f3c1748b52a19143846c9"
   integrity sha512-HZQYqbiFVWufzCwexrvh694SOim8z2d+xJl5UNamcvQFejLY/2YUtzXHYi3cHdI7PMlS8ejH2slRAOJQ32aNbA==
 
-"@types/lodash@^4.14.189":
-  version "4.14.189"
-  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.189.tgz#975ff8c38da5ae58b751127b19ad5e44b5b7f6d2"
-  integrity sha512-kb9/98N6X8gyME9Cf7YaqIMvYGnBSWqEci6tiettE6iJWH1XdJz/PO8LB0GtLCG7x8dU3KWhZT+lA1a35127tA==
+"@types/lodash@^4.14.190":
+  version "4.14.190"
+  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.190.tgz#d8e99647af141c63902d0ca53cf2b34d2df33545"
+  integrity sha512-5iJ3FBJBvQHQ8sFhEhJfjUP+G+LalhavTkYyrAYqz5MEJG+erSv0k9KJLb6q7++17Lafk1scaTIFXcMJlwK8Mw==
 
 "@types/minimatch@*":
   version "5.1.2"
@@ -2524,10 +2601,10 @@
   resolved "https://registry.yarnpkg.com/@types/react-native-share-menu/-/react-native-share-menu-5.0.2.tgz#c9c8854a3d091cdb046df22dafe4a92332b322f3"
   integrity sha512-Qa9DGfL6Bvng2DXgCK0fFzdi9SJMGfs06MLSkCfSXBCGKlFLzSHCsXztvXlCCChn3dQArFHyz/uRUN3Sbt6LtQ==
 
-"@types/react-native@~0.70.6":
-  version "0.70.6"
-  resolved "https://registry.yarnpkg.com/@types/react-native/-/react-native-0.70.6.tgz#0d1bc3014111f64f13e0df643aec2ab03f021fdb"
-  integrity sha512-ynQ2jj0km9d7dbnyKqVdQ6Nti7VQ8SLTA/KKkkS5+FnvGyvij2AOo1/xnkBR/jnSNXuzrvGVzw2n0VWfppmfKw==
+"@types/react-native@~0.70.7":
+  version "0.70.7"
+  resolved "https://registry.yarnpkg.com/@types/react-native/-/react-native-0.70.7.tgz#1708e5f746bbce2ea4e0bd5a2627560667804d46"
+  integrity sha512-hBzeUWwk8sfj3vDfwEXb4hbjWjl0jb5CvWlu2gLrOUJyFHVzJ+x6Y9ilO2eVtJW7l5QmmNLILE1PkVfKRkqYuQ==
   dependencies:
     "@types/react" "*"
 
@@ -5490,10 +5567,10 @@ expo-auth-session@^3.7.2:
     invariant "^2.2.4"
     qs "6.9.1"
 
-expo-av@^13.0.1:
-  version "13.0.1"
-  resolved "https://registry.yarnpkg.com/expo-av/-/expo-av-13.0.1.tgz#c37c9d5381f2dabb224afacb7e71b3d88a3fc3f5"
-  integrity sha512-K4+ejVwWUpE0ZSHKPsgYNc5P6aoYfF5yBKw116Gjr1Yl/vkZ/F9klzr5cED1qmHBQ/Nst78GOvu4LCTLubcNsQ==
+expo-av@^13.0.2:
+  version "13.0.2"
+  resolved "https://registry.yarnpkg.com/expo-av/-/expo-av-13.0.2.tgz#06c2c5140b334319ed2844823181f7b88092da13"
+  integrity sha512-u+y9wUBodp08UjRZYckNWzr9zEQHK6eScRBkhdTd9Rq48SEZ7eN6xXn79hubvk0P5nj7lFS+hdKjmx9T5XHGww==
 
 expo-cli@^6.0.8:
   version "6.0.8"
@@ -5728,10 +5805,10 @@ expo-web-browser@~12.0.0:
   dependencies:
     compare-urls "^2.0.0"
 
-expo@^47.0.7:
-  version "47.0.7"
-  resolved "https://registry.yarnpkg.com/expo/-/expo-47.0.7.tgz#4fe95529c6b1e6d8026a164847ce1048f6dc5ccd"
-  integrity sha512-uHTxvPdD4K7W277tXVAdFmgjSZ0Hg+0g5bnez0jXyXQINa+0CTtGmulgFehBOrbrUZBqwosN0K8TsrxADwcXZQ==
+expo@^47.0.8:
+  version "47.0.8"
+  resolved "https://registry.yarnpkg.com/expo/-/expo-47.0.8.tgz#80390fd63f8305103445069c647011915f7c32dd"
+  integrity sha512-PGNCIvrnYwHH4TDFsVocq/xhWZ5DW8N3bLkZJPZZgX6VgjtVLNsbZ+0lm1inLCZHP+6xSpSKRccjGHO/QQoMBQ==
   dependencies:
     "@babel/runtime" "^7.14.0"
     "@expo/cli" "0.4.10"
@@ -7078,14 +7155,14 @@ internal-slot@^1.0.3:
     has "^1.0.3"
     side-channel "^1.0.4"
 
-intl-messageformat@10.2.1:
-  version "10.2.1"
-  resolved "https://registry.yarnpkg.com/intl-messageformat/-/intl-messageformat-10.2.1.tgz#2f5626db773c82f3038d355f56ac4736ceef362b"
-  integrity sha512-1lrJG2qKzcC1TVzYu1VuB1yiY68LU5rwpbHa2THCzA67Vutkz7+1lv5U20K3Lz5RAiH78zxNztMEtchokMWv8A==
+intl-messageformat@10.2.2:
+  version "10.2.2"
+  resolved "https://registry.yarnpkg.com/intl-messageformat/-/intl-messageformat-10.2.2.tgz#8436a6bf36d5d336513ff027fb099ca0d6676d13"
+  integrity sha512-iiaDjsEZNe92Vb8UIf46hT/3uVdcrL4x4GLjwFSVz/uC6ancQDUtyLVETX13wyTw78kBo3ONBMgiHoCtWN8ioQ==
   dependencies:
-    "@formatjs/ecma402-abstract" "1.13.0"
+    "@formatjs/ecma402-abstract" "1.14.0"
     "@formatjs/fast-memoize" "1.2.6"
-    "@formatjs/icu-messageformat-parser" "2.1.10"
+    "@formatjs/icu-messageformat-parser" "2.1.11"
     tslib "2.4.0"
 
 invariant@*, invariant@^2.2.4:
@@ -10380,20 +10457,20 @@ react-i18next@^12.0.0:
     "@babel/runtime" "^7.14.5"
     html-parse-stringify "^3.0.1"
 
-react-intl@^6.2.1:
-  version "6.2.1"
-  resolved "https://registry.yarnpkg.com/react-intl/-/react-intl-6.2.1.tgz#976a44f86a58270d1e498d09636b0ece63ad0344"
-  integrity sha512-hYxcSamgoA3Mvc55nwhTF1v15T0NUSkaV/EScMNVZXg0kRyaMAoNHkCi9/9H+TnXWNiWrcWH9bjlMlJwrG2V7g==
+react-intl@^6.2.2:
+  version "6.2.2"
+  resolved "https://registry.yarnpkg.com/react-intl/-/react-intl-6.2.2.tgz#966001736515cd4a24befcd60114c8c5fcc8e344"
+  integrity sha512-SW0BjtqyoxasdZYtoKLmPYjryqeN2vgtbOYc6J3PmJb/WHUih1X9LPjuL3Ap0Qen1sHLtUbwgJjRSWedGtibjg==
   dependencies:
-    "@formatjs/ecma402-abstract" "1.13.0"
-    "@formatjs/icu-messageformat-parser" "2.1.10"
-    "@formatjs/intl" "2.5.1"
-    "@formatjs/intl-displaynames" "6.1.4"
-    "@formatjs/intl-listformat" "7.1.3"
+    "@formatjs/ecma402-abstract" "1.14.0"
+    "@formatjs/icu-messageformat-parser" "2.1.11"
+    "@formatjs/intl" "2.6.0"
+    "@formatjs/intl-displaynames" "6.2.0"
+    "@formatjs/intl-listformat" "7.1.4"
     "@types/hoist-non-react-statics" "^3.3.1"
     "@types/react" "16 || 17 || 18"
     hoist-non-react-statics "^3.3.2"
-    intl-messageformat "10.2.1"
+    intl-messageformat "10.2.2"
     tslib "2.4.0"
 
 "react-is@^16.12.0 || ^17.0.0 || ^18.0.0", react-is@^18.0.0:
@@ -10507,10 +10584,10 @@ react-native-live-text-image-view@^0.4.0:
   resolved "https://registry.yarnpkg.com/react-native-live-text-image-view/-/react-native-live-text-image-view-0.4.0.tgz#d23d5850788609fd1448533213fc6c453c584761"
   integrity sha512-PhVFE0YogSLrTlnHIxUWL80CrmbDvxk1JvLx4UHiRHRwLda4dV/e/9Q+Pyh7Vq7qwAPE6vGoN6sjbXNaj4WCew==
 
-react-native-pager-view@^6.1.1:
-  version "6.1.1"
-  resolved "https://registry.yarnpkg.com/react-native-pager-view/-/react-native-pager-view-6.1.1.tgz#e396b0c78d74931a92d1c9bf28c450eb356b904d"
-  integrity sha512-4WqR0YWBjaUtc3iPVk8w6wsTsMq+r0plNiXdqPXOiUdQIhxKfsP1iqb6hRzdeJKOo8UH7RCP6zI7dxdFEAXzrw==
+react-native-pager-view@^6.1.2:
+  version "6.1.2"
+  resolved "https://registry.yarnpkg.com/react-native-pager-view/-/react-native-pager-view-6.1.2.tgz#3522079b9a9d6634ca5e8d153bc0b4d660254552"
+  integrity sha512-qs2KSFc+7N7B+UZ6SG2sTvCkppagm5fVyRclv1KFKc7lDtrhXLzN59tXJw575LDP/dRJoXsNwqUAhZJdws6ABQ==
 
 react-native-reanimated-zoom@^0.3.3:
   version "0.3.3"
@@ -10561,10 +10638,10 @@ react-native-swipe-list-view@^3.2.9:
   resolved "https://registry.yarnpkg.com/react-native-swipe-list-view/-/react-native-swipe-list-view-3.2.9.tgz#d725c7cdf481dd5df12a00dbfe0120013b5f2e59"
   integrity sha512-SjAEuHc/D6ovp+RjDUhfNmw6NYOntdT7+GFhfMGfP/BSLMuMWynpzJy9GKQeyB8sI78T6Lzip21TVbongOg1Mw==
 
-react-native-tab-view@^3.3.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/react-native-tab-view/-/react-native-tab-view-3.3.0.tgz#3d24ae4f4c55cfd54cd1d2d1f8915b0b2c33a5da"
-  integrity sha512-xjAQe657Gp/de2QHb7ptksTg8Jcb+j3fLAdcYryzfavt/pe+HtKLpkCtQsxyIJpRrAO7YPxFsymi2N4MnNfePA==
+react-native-tab-view@^3.3.2:
+  version "3.3.2"
+  resolved "https://registry.yarnpkg.com/react-native-tab-view/-/react-native-tab-view-3.3.2.tgz#4afc995e41b97e0457e95b487763d3f9dc318dcc"
+  integrity sha512-s0xr+wiMBHdjsWgbPTyZemgv7jJ+zKPBw/MIQIlKAMo4VCNV1vAZEbOHaHpGbqgYFwsmFXjKZNXQ5UJAIJXlDQ==
   dependencies:
     use-latest-callback "^0.1.5"
 

From 75800598c29fae7b8bbb14c4e3c29ec819d0f94c Mon Sep 17 00:00:00 2001
From: xmflsct <me@xmflsct.com>
Date: Tue, 29 Nov 2022 21:59:52 +0100
Subject: [PATCH 05/40] Fix #489

---
 src/components/Instance/Auth.tsx | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/components/Instance/Auth.tsx b/src/components/Instance/Auth.tsx
index 16af0428..9434220d 100644
--- a/src/components/Instance/Auth.tsx
+++ b/src/components/Instance/Auth.tsx
@@ -5,7 +5,9 @@ import { TabMeStackNavigationProp } from '@utils/navigation/navigators'
 import addInstance from '@utils/slices/instances/add'
 import { checkInstanceFeature } from '@utils/slices/instancesSlice'
 import * as AuthSession from 'expo-auth-session'
+import * as WebBrowser from 'expo-web-browser'
 import React, { useEffect } from 'react'
+import { Platform } from 'react-native'
 import { useQueryClient } from 'react-query'
 import { useSelector } from 'react-redux'
 
@@ -24,14 +26,11 @@ const InstanceAuth = React.memo(
       useProxy: false
     })
 
-    const navigation =
-      useNavigation<TabMeStackNavigationProp<'Tab-Me-Root' | 'Tab-Me-Switch'>>()
+    const navigation = useNavigation<TabMeStackNavigationProp<'Tab-Me-Root' | 'Tab-Me-Switch'>>()
     const queryClient = useQueryClient()
     const dispatch = useAppDispatch()
 
-    const deprecateAuthFollow = useSelector(
-      checkInstanceFeature('deprecate_auth_follow')
-    )
+    const deprecateAuthFollow = useSelector(checkInstanceFeature('deprecate_auth_follow'))
     const [request, response, promptAsync] = AuthSession.useAuthRequest(
       {
         clientId: appData.clientId,
@@ -48,7 +47,15 @@ const InstanceAuth = React.memo(
     useEffect(() => {
       ;(async () => {
         if (request?.clientId) {
-          await promptAsync()
+          let browserPackage: string | undefined
+          if (Platform.OS === 'android') {
+            const tabsSupportingBrowsers = await WebBrowser.getCustomTabsSupportingBrowsersAsync()
+            browserPackage =
+              tabsSupportingBrowsers?.preferredBrowserPackage ||
+              tabsSupportingBrowsers.browserPackages[0] ||
+              tabsSupportingBrowsers.servicePackages[0]
+          }
+          await promptAsync({ browserPackage }).catch(e => console.log(e))
         }
       })()
     }, [request])

From de7498b218523ec8bda620c4e08727e2ce3f05c3 Mon Sep 17 00:00:00 2001
From: xmflsct <me@xmflsct.com>
Date: Tue, 29 Nov 2022 23:44:11 +0100
Subject: [PATCH 06/40] Fixed #497

---
 android/app/build.gradle                      |   2 -
 android/app/google-services.json              |  46 ------
 android/build.gradle                          |   1 -
 app.config.ts                                 |   1 -
 configs/GoogleService-Info.plist              |  34 ----
 configs/google-services.json                  |  46 ------
 ios/Podfile                                   |   6 -
 ios/Podfile.lock                              | 147 +-----------------
 ios/tooot.xcodeproj/project.pbxproj           |   4 -
 ios/tooot/GoogleService-Info.plist            |  34 ----
 package.json                                  |   1 -
 src/Screens.tsx                               |   2 -
 src/components/Account.tsx                    |  16 +-
 src/components/ContextMenu/account.ts         |  10 --
 src/components/ContextMenu/instance.ts        |   7 -
 src/components/ContextMenu/share.ts           |   3 -
 src/components/ContextMenu/status.ts          |  22 ---
 src/components/Hashtag.tsx                    |   2 -
 src/components/Instance.tsx                   |  76 ++-------
 src/components/Parse/HTML.tsx                 |   5 -
 src/components/Relationship/Incoming.tsx      |  25 +--
 src/components/Relationship/Outgoing.tsx      |  19 +--
 src/components/Timeline/Conversation.tsx      |   2 -
 src/components/Timeline/Default.tsx           |   8 +-
 src/components/Timeline/Empty.tsx             |  23 +--
 src/components/Timeline/Notifications.tsx     |   4 +-
 src/components/Timeline/Shared/Actioned.tsx   |  11 +-
 src/components/Timeline/Shared/Actions.tsx    |  47 ++----
 src/components/Timeline/Shared/Attachment.tsx |   3 -
 .../Timeline/Shared/Attachment/Audio.tsx      |   3 -
 .../Timeline/Shared/Attachment/Image.tsx      |  17 +-
 .../Shared/Attachment/Unsupported.tsx         |  18 +--
 .../Timeline/Shared/Attachment/Video.tsx      |   8 -
 src/components/Timeline/Shared/Avatar.tsx     |  69 ++++----
 src/components/Timeline/Shared/Card.tsx       |  10 +-
 src/components/Timeline/Shared/Feedback.tsx   |  69 +++-----
 .../Timeline/Shared/HeaderConversation.tsx    |  40 ++---
 .../Shared/HeaderShared/Application.tsx       |   4 -
 src/components/Timeline/Shared/Poll.tsx       |  79 +++-------
 src/components/Timeline/Shared/Translate.tsx  |   7 -
 src/components/analytics.ts                   |   7 -
 src/i18n/en/screens/tabs.json                 |   4 -
 src/screens/Actions/Account.tsx               |  10 --
 src/screens/Actions/Domain.tsx                |  26 +---
 src/screens/Actions/Share.tsx                 |   2 -
 src/screens/Actions/Status.tsx                |  28 ----
 src/screens/Announcements.tsx                 |  69 ++------
 src/screens/Compose.tsx                       |  12 +-
 src/screens/Compose/EditAttachment/Submit.tsx |   3 -
 src/screens/Compose/Root/Actions.tsx          |  29 ----
 .../Compose/Root/Footer/Attachments.tsx       | 126 +++++----------
 src/screens/Compose/Root/Footer/Poll.tsx      |  11 --
 src/screens/Compose/Root/Suggestion.tsx       |   6 +-
 src/screens/ImagesViewer.tsx                  |   7 -
 src/screens/Tabs/Local.tsx                    |   6 +-
 src/screens/Tabs/Me/Profile/Root.tsx          |  23 +--
 src/screens/Tabs/Me/Push.tsx                  |  72 ++-------
 src/screens/Tabs/Me/Settings/Analytics.tsx    |  19 +--
 src/screens/Tabs/Me/Settings/App.tsx          |  37 +----
 src/screens/Tabs/Me/Settings/Tooot.tsx        |  16 +-
 src/screens/Tabs/Me/SettingsLanguage.tsx      |   5 -
 src/screens/Tabs/Notifications.tsx            |   6 +-
 src/screens/Tabs/Public.tsx                   |   6 +-
 .../Tabs/Shared/Account/Attachments.tsx       |  36 +----
 .../Shared/Account/Information/Actions.tsx    |  15 +-
 .../Shared/Account/Information/Avatar.tsx     |   2 -
 .../Tabs/Shared/Account/Information/Stats.tsx |  16 +-
 src/screens/Tabs/Shared/Search.tsx            |  77 +++------
 src/screens/Tabs/Shared/Users.tsx             |   2 +-
 src/store.ts                                  |   2 +-
 src/utils/migrations/settings/migration.ts    |   5 +
 src/utils/migrations/settings/v3.ts           |   8 +
 src/utils/slices/instancesSlice.ts            |   5 -
 src/utils/slices/settingsSlice.ts             |  67 ++------
 yarn.lock                                     |  14 --
 75 files changed, 289 insertions(+), 1421 deletions(-)
 delete mode 100644 android/app/google-services.json
 delete mode 100644 configs/GoogleService-Info.plist
 delete mode 100644 configs/google-services.json
 delete mode 100644 ios/tooot/GoogleService-Info.plist
 delete mode 100644 src/components/analytics.ts
 create mode 100644 src/utils/migrations/settings/v3.ts

diff --git a/android/app/build.gradle b/android/app/build.gradle
index a2231784..9826e70f 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -337,5 +337,3 @@ def isNewArchitectureEnabled() {
     // - Set an environment variable `ORG_GRADLE_PROJECT_newArchEnabled=true`
     return project.hasProperty("newArchEnabled") && project.newArchEnabled == "true"
 }
-
-apply plugin: 'com.google.gms.google-services'
diff --git a/android/app/google-services.json b/android/app/google-services.json
deleted file mode 100644
index d833db99..00000000
--- a/android/app/google-services.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  "project_info": {
-    "project_number": "661638997772",
-    "project_id": "xmflsct-mastodon-app",
-    "storage_bucket": "xmflsct-mastodon-app.appspot.com"
-  },
-  "client": [
-    {
-      "client_info": {
-        "mobilesdk_app_id": "1:661638997772:android:4fd02851f757f8fa9f8b29",
-        "android_client_info": {
-          "package_name": "com.xmflsct.app.tooot"
-        }
-      },
-      "oauth_client": [
-        {
-          "client_id": "661638997772-6aiqk97aema0rt280i7nfar3ha2mlgno.apps.googleusercontent.com",
-          "client_type": 3
-        }
-      ],
-      "api_key": [
-        {
-          "current_key": "AIzaSyDUw4s-mhQsHvs4hdIsldsi68ZIygM5MC4"
-        }
-      ],
-      "services": {
-        "appinvite_service": {
-          "other_platform_oauth_client": [
-            {
-              "client_id": "661638997772-6aiqk97aema0rt280i7nfar3ha2mlgno.apps.googleusercontent.com",
-              "client_type": 3
-            },
-            {
-              "client_id": "661638997772-sqa4raeghhrieqt9guljhcul9b51dvna.apps.googleusercontent.com",
-              "client_type": 2,
-              "ios_info": {
-                "bundle_id": "com.xmflsct.app.mastodon"
-              }
-            }
-          ]
-        }
-      }
-    }
-  ],
-  "configuration_version": "1"
-}
\ No newline at end of file
diff --git a/android/build.gradle b/android/build.gradle
index 0872442c..e90d3c65 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -22,7 +22,6 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.google.gms:google-services:4.3.3'
         classpath("com.android.tools.build:gradle:7.2.1")
         classpath("com.facebook.react:react-native-gradle-plugin")
         classpath("de.undercouch:gradle-download-task:5.0.1")
diff --git a/app.config.ts b/app.config.ts
index 4b34421b..0afae03f 100644
--- a/app.config.ts
+++ b/app.config.ts
@@ -15,7 +15,6 @@ export default (): ExpoConfig => ({
   },
   android: {
     package: 'com.xmflsct.app.tooot',
-    googleServicesFile: './configs/google-services.json',
     permissions: ['CAMERA', 'VIBRATE'],
     blockedPermissions: ['USE_BIOMETRIC', 'USE_FINGERPRINT']
   },
diff --git a/configs/GoogleService-Info.plist b/configs/GoogleService-Info.plist
deleted file mode 100644
index 553df7ab..00000000
--- a/configs/GoogleService-Info.plist
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CLIENT_ID</key>
-	<string>661638997772-65g8ce369ugck3ii4ulk6jhb3ijg51kl.apps.googleusercontent.com</string>
-	<key>REVERSED_CLIENT_ID</key>
-	<string>com.googleusercontent.apps.661638997772-65g8ce369ugck3ii4ulk6jhb3ijg51kl</string>
-	<key>API_KEY</key>
-	<string>AIzaSyAOS1Yq_uNVctG89LB6Dl1PVhb_FAQRbRg</string>
-	<key>GCM_SENDER_ID</key>
-	<string>661638997772</string>
-	<key>PLIST_VERSION</key>
-	<string>1</string>
-	<key>BUNDLE_ID</key>
-	<string>com.xmflsct.app.tooot</string>
-	<key>PROJECT_ID</key>
-	<string>xmflsct-mastodon-app</string>
-	<key>STORAGE_BUCKET</key>
-	<string>xmflsct-mastodon-app.appspot.com</string>
-	<key>IS_ADS_ENABLED</key>
-	<false></false>
-	<key>IS_ANALYTICS_ENABLED</key>
-	<false></false>
-	<key>IS_APPINVITE_ENABLED</key>
-	<true></true>
-	<key>IS_GCM_ENABLED</key>
-	<true></true>
-	<key>IS_SIGNIN_ENABLED</key>
-	<true></true>
-	<key>GOOGLE_APP_ID</key>
-	<string>1:661638997772:ios:c8d2e09264a344b09f8b29</string>
-</dict>
-</plist>
\ No newline at end of file
diff --git a/configs/google-services.json b/configs/google-services.json
deleted file mode 100644
index d833db99..00000000
--- a/configs/google-services.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  "project_info": {
-    "project_number": "661638997772",
-    "project_id": "xmflsct-mastodon-app",
-    "storage_bucket": "xmflsct-mastodon-app.appspot.com"
-  },
-  "client": [
-    {
-      "client_info": {
-        "mobilesdk_app_id": "1:661638997772:android:4fd02851f757f8fa9f8b29",
-        "android_client_info": {
-          "package_name": "com.xmflsct.app.tooot"
-        }
-      },
-      "oauth_client": [
-        {
-          "client_id": "661638997772-6aiqk97aema0rt280i7nfar3ha2mlgno.apps.googleusercontent.com",
-          "client_type": 3
-        }
-      ],
-      "api_key": [
-        {
-          "current_key": "AIzaSyDUw4s-mhQsHvs4hdIsldsi68ZIygM5MC4"
-        }
-      ],
-      "services": {
-        "appinvite_service": {
-          "other_platform_oauth_client": [
-            {
-              "client_id": "661638997772-6aiqk97aema0rt280i7nfar3ha2mlgno.apps.googleusercontent.com",
-              "client_type": 3
-            },
-            {
-              "client_id": "661638997772-sqa4raeghhrieqt9guljhcul9b51dvna.apps.googleusercontent.com",
-              "client_type": 2,
-              "ios_info": {
-                "bundle_id": "com.xmflsct.app.mastodon"
-              }
-            }
-          ]
-        }
-      }
-    }
-  ],
-  "configuration_version": "1"
-}
\ No newline at end of file
diff --git a/ios/Podfile b/ios/Podfile
index 98b9127d..ce23340c 100644
--- a/ios/Podfile
+++ b/ios/Podfile
@@ -15,12 +15,6 @@ target 'tooot' do
   # Flags change depending on the env values.
   flags = get_default_flags()
 
-  # https://stackoverflow.com/questions/72289521/swift-pods-cannot-yet-be-integrated-as-static-libraries-firebasecoreinternal-lib/72969220#72969220
-  pod 'Firebase', :modular_headers => true
-  pod 'FirebaseCore', :modular_headers => true
-  pod 'GoogleUtilities', :modular_headers => true
-  $RNFirebaseAsStaticFramework = true
-
   use_react_native!(
     :path => config[:reactNativePath],
     :hermes_enabled => true,
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
index 6e5e751f..80c3ab78 100644
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -12,13 +12,6 @@ PODS:
     - ExpoModulesCore
   - EXFileSystem (15.1.1):
     - ExpoModulesCore
-  - EXFirebaseAnalytics (8.0.0):
-    - EXFirebaseCore
-    - ExpoModulesCore
-    - Firebase/Core (= 9.5.0)
-  - EXFirebaseCore (6.0.0):
-    - ExpoModulesCore
-    - Firebase/Core (= 9.5.0)
   - EXFont (11.0.1):
     - ExpoModulesCore
   - EXNotifications (0.17.0):
@@ -59,107 +52,8 @@ PODS:
     - React-Core (= 0.70.6)
     - React-jsi (= 0.70.6)
     - ReactCommon/turbomodule/core (= 0.70.6)
-  - Firebase (9.5.0):
-    - Firebase/Core (= 9.5.0)
-  - Firebase/Core (9.5.0):
-    - Firebase/CoreOnly
-    - FirebaseAnalytics (~> 9.5.0)
-  - Firebase/CoreOnly (9.5.0):
-    - FirebaseCore (= 9.5.0)
-  - FirebaseAnalytics (9.5.0):
-    - FirebaseAnalytics/AdIdSupport (= 9.5.0)
-    - FirebaseCore (~> 9.0)
-    - FirebaseInstallations (~> 9.0)
-    - GoogleUtilities/AppDelegateSwizzler (~> 7.7)
-    - GoogleUtilities/MethodSwizzler (~> 7.7)
-    - GoogleUtilities/Network (~> 7.7)
-    - "GoogleUtilities/NSData+zlib (~> 7.7)"
-    - nanopb (< 2.30910.0, >= 2.30908.0)
-  - FirebaseAnalytics/AdIdSupport (9.5.0):
-    - FirebaseCore (~> 9.0)
-    - FirebaseInstallations (~> 9.0)
-    - GoogleAppMeasurement (= 9.5.0)
-    - GoogleUtilities/AppDelegateSwizzler (~> 7.7)
-    - GoogleUtilities/MethodSwizzler (~> 7.7)
-    - GoogleUtilities/Network (~> 7.7)
-    - "GoogleUtilities/NSData+zlib (~> 7.7)"
-    - nanopb (< 2.30910.0, >= 2.30908.0)
-  - FirebaseCore (9.5.0):
-    - FirebaseCoreDiagnostics (~> 9.0)
-    - FirebaseCoreInternal (~> 9.0)
-    - GoogleUtilities/Environment (~> 7.7)
-    - GoogleUtilities/Logger (~> 7.7)
-  - FirebaseCoreDiagnostics (9.6.0):
-    - GoogleDataTransport (< 10.0.0, >= 9.1.4)
-    - GoogleUtilities/Environment (~> 7.7)
-    - GoogleUtilities/Logger (~> 7.7)
-    - nanopb (< 2.30910.0, >= 2.30908.0)
-  - FirebaseCoreInternal (9.6.0):
-    - "GoogleUtilities/NSData+zlib (~> 7.7)"
-  - FirebaseInstallations (9.6.0):
-    - FirebaseCore (~> 9.0)
-    - GoogleUtilities/Environment (~> 7.7)
-    - GoogleUtilities/UserDefaults (~> 7.7)
-    - PromisesObjC (~> 2.1)
   - fmt (6.2.1)
   - glog (0.3.5)
-  - GoogleAppMeasurement (9.5.0):
-    - GoogleAppMeasurement/AdIdSupport (= 9.5.0)
-    - GoogleUtilities/AppDelegateSwizzler (~> 7.7)
-    - GoogleUtilities/MethodSwizzler (~> 7.7)
-    - GoogleUtilities/Network (~> 7.7)
-    - "GoogleUtilities/NSData+zlib (~> 7.7)"
-    - nanopb (< 2.30910.0, >= 2.30908.0)
-  - GoogleAppMeasurement/AdIdSupport (9.5.0):
-    - GoogleAppMeasurement/WithoutAdIdSupport (= 9.5.0)
-    - GoogleUtilities/AppDelegateSwizzler (~> 7.7)
-    - GoogleUtilities/MethodSwizzler (~> 7.7)
-    - GoogleUtilities/Network (~> 7.7)
-    - "GoogleUtilities/NSData+zlib (~> 7.7)"
-    - nanopb (< 2.30910.0, >= 2.30908.0)
-  - GoogleAppMeasurement/WithoutAdIdSupport (9.5.0):
-    - GoogleUtilities/AppDelegateSwizzler (~> 7.7)
-    - GoogleUtilities/MethodSwizzler (~> 7.7)
-    - GoogleUtilities/Network (~> 7.7)
-    - "GoogleUtilities/NSData+zlib (~> 7.7)"
-    - nanopb (< 2.30910.0, >= 2.30908.0)
-  - GoogleDataTransport (9.2.0):
-    - GoogleUtilities/Environment (~> 7.7)
-    - nanopb (< 2.30910.0, >= 2.30908.0)
-    - PromisesObjC (< 3.0, >= 1.2)
-  - GoogleUtilities (7.10.0):
-    - GoogleUtilities/AppDelegateSwizzler (= 7.10.0)
-    - GoogleUtilities/Environment (= 7.10.0)
-    - GoogleUtilities/ISASwizzler (= 7.10.0)
-    - GoogleUtilities/Logger (= 7.10.0)
-    - GoogleUtilities/MethodSwizzler (= 7.10.0)
-    - GoogleUtilities/Network (= 7.10.0)
-    - "GoogleUtilities/NSData+zlib (= 7.10.0)"
-    - GoogleUtilities/Reachability (= 7.10.0)
-    - GoogleUtilities/SwizzlerTestHelpers (= 7.10.0)
-    - GoogleUtilities/UserDefaults (= 7.10.0)
-  - GoogleUtilities/AppDelegateSwizzler (7.10.0):
-    - GoogleUtilities/Environment
-    - GoogleUtilities/Logger
-    - GoogleUtilities/Network
-  - GoogleUtilities/Environment (7.10.0):
-    - PromisesObjC (< 3.0, >= 1.2)
-  - GoogleUtilities/ISASwizzler (7.10.0)
-  - GoogleUtilities/Logger (7.10.0):
-    - GoogleUtilities/Environment
-  - GoogleUtilities/MethodSwizzler (7.10.0):
-    - GoogleUtilities/Logger
-  - GoogleUtilities/Network (7.10.0):
-    - GoogleUtilities/Logger
-    - "GoogleUtilities/NSData+zlib"
-    - GoogleUtilities/Reachability
-  - "GoogleUtilities/NSData+zlib (7.10.0)"
-  - GoogleUtilities/Reachability (7.10.0):
-    - GoogleUtilities/Logger
-  - GoogleUtilities/SwizzlerTestHelpers (7.10.0):
-    - GoogleUtilities/MethodSwizzler
-  - GoogleUtilities/UserDefaults (7.10.0):
-    - GoogleUtilities/Logger
   - hermes-engine (0.70.6)
   - libevent (2.1.12)
   - libwebp (1.2.4):
@@ -171,12 +65,6 @@ PODS:
   - libwebp/mux (1.2.4):
     - libwebp/demux
   - libwebp/webp (1.2.4)
-  - nanopb (2.30909.0):
-    - nanopb/decode (= 2.30909.0)
-    - nanopb/encode (= 2.30909.0)
-  - nanopb/decode (2.30909.0)
-  - nanopb/encode (2.30909.0)
-  - PromisesObjC (2.1.1)
   - RCT-Folly (2021.07.22.00):
     - boost
     - DoubleConversion
@@ -563,8 +451,6 @@ DEPENDENCIES:
   - EXConstants (from `../node_modules/expo-constants/ios`)
   - EXErrorRecovery (from `../node_modules/expo-error-recovery/ios`)
   - EXFileSystem (from `../node_modules/expo-file-system/ios`)
-  - EXFirebaseAnalytics (from `../node_modules/expo-firebase-analytics/ios`)
-  - EXFirebaseCore (from `../node_modules/expo-firebase-core/ios`)
   - EXFont (from `../node_modules/expo-font/ios`)
   - EXNotifications (from `../node_modules/expo-notifications/ios`)
   - Expo (from `../node_modules/expo`)
@@ -582,10 +468,7 @@ DEPENDENCIES:
   - EXVideoThumbnails (from `../node_modules/expo-video-thumbnails/ios`)
   - FBLazyVector (from `../node_modules/react-native/Libraries/FBLazyVector`)
   - FBReactNativeSpec (from `../node_modules/react-native/React/FBReactNativeSpec`)
-  - Firebase
-  - FirebaseCore
   - glog (from `../node_modules/react-native/third-party-podspecs/glog.podspec`)
-  - GoogleUtilities
   - hermes-engine (from `../node_modules/react-native/sdks/hermes/hermes-engine.podspec`)
   - libevent (~> 2.1.12)
   - RCT-Folly (from `../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec`)
@@ -641,20 +524,9 @@ DEPENDENCIES:
 
 SPEC REPOS:
   trunk:
-    - Firebase
-    - FirebaseAnalytics
-    - FirebaseCore
-    - FirebaseCoreDiagnostics
-    - FirebaseCoreInternal
-    - FirebaseInstallations
     - fmt
-    - GoogleAppMeasurement
-    - GoogleDataTransport
-    - GoogleUtilities
     - libevent
     - libwebp
-    - nanopb
-    - PromisesObjC
     - SDWebImage
     - SDWebImageWebPCoder
     - Sentry
@@ -675,10 +547,6 @@ EXTERNAL SOURCES:
     :path: "../node_modules/expo-error-recovery/ios"
   EXFileSystem:
     :path: "../node_modules/expo-file-system/ios"
-  EXFirebaseAnalytics:
-    :path: "../node_modules/expo-firebase-analytics/ios"
-  EXFirebaseCore:
-    :path: "../node_modules/expo-firebase-core/ios"
   EXFont:
     :path: "../node_modules/expo-font/ios"
   EXNotifications:
@@ -824,8 +692,6 @@ SPEC CHECKSUMS:
   EXConstants: 3c86653c422dd77e40d10cbbabb3025003977415
   EXErrorRecovery: ae43433feb0608a64dc5b1c8363b3e7769a9ea24
   EXFileSystem: 60602b6eefa6873f97172c684b7537c9760b50d6
-  EXFirebaseAnalytics: 58d70e698859b070b2450ad8664d7b5bc6c6e3e1
-  EXFirebaseCore: d0d88cb904e893af07f809ab08c0892489bc6956
   EXFont: 319606bfe48c33b5b5063fb0994afdc496befe80
   EXNotifications: babce2a87b7922051354fcfe7a74dd279b7e272a
   Expo: 36b5f625d36728adbdd1934d4d57182f319ab832
@@ -843,22 +709,11 @@ SPEC CHECKSUMS:
   EXVideoThumbnails: 8b3e48f3716679dd0cbf949217a31eab5c555799
   FBLazyVector: 48289402952f4f7a4e235de70a9a590aa0b79ef4
   FBReactNativeSpec: dd1186fd05255e3457baa2f4ca65e94c2cd1e3ac
-  Firebase: 800f16f07af493d98d017446a315c27af0552f41
-  FirebaseAnalytics: 1b60984a408320dda637306f3f733699ef8473d7
-  FirebaseCore: 25c0400b670fd1e2f2104349cd3b5dcce8d9418f
-  FirebaseCoreDiagnostics: 99a495094b10a57eeb3ae8efa1665700ad0bdaa6
-  FirebaseCoreInternal: bca76517fe1ed381e989f5e7d8abb0da8d85bed3
-  FirebaseInstallations: 0a115432c4e223c5ab20b0dbbe4cbefa793a0e8e
   fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9
   glog: 04b94705f318337d7ead9e6d17c019bd9b1f6b1b
-  GoogleAppMeasurement: 6ee231473fbd75c11221dfce489894334024eead
-  GoogleDataTransport: 1c8145da7117bd68bbbed00cf304edb6a24de00f
-  GoogleUtilities: bad72cb363809015b1f7f19beb1f1cd23c589f95
   hermes-engine: 2af7b7a59128f250adfd86f15aa1d5a2ecd39995
   libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913
   libwebp: f62cb61d0a484ba548448a4bd52aabf150ff6eef
-  nanopb: b552cce312b6c8484180ef47159bc0f65a1f0431
-  PromisesObjC: ab77feca74fa2823e7af4249b8326368e61014cb
   RCT-Folly: 0080d0a6ebf2577475bda044aa59e2ca1f909cda
   RCTRequired: e1866f61af7049eb3d8e08e8b133abd38bc1ca7a
   RCTTypeSafety: 27c2ac1b00609a432ced1ae701247593f07f901e
@@ -913,6 +768,6 @@ SPEC CHECKSUMS:
   Swime: d7b2c277503b6cea317774aedc2dce05613f8b0b
   Yoga: 99caf8d5ab45e9d637ee6e0174ec16fbbb01bcfc
 
-PODFILE CHECKSUM: e4191b63c8f15031b2365226730770e7978dca41
+PODFILE CHECKSUM: 05bf71d31ba782dfda5a6b47d38e98a6f6bc079a
 
 COCOAPODS: 1.11.3
diff --git a/ios/tooot.xcodeproj/project.pbxproj b/ios/tooot.xcodeproj/project.pbxproj
index 6af87ad9..811bb728 100644
--- a/ios/tooot.xcodeproj/project.pbxproj
+++ b/ios/tooot.xcodeproj/project.pbxproj
@@ -17,7 +17,6 @@
 		5EE088C926297820007E5FEC /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 5EE088CB26297820007E5FEC /* InfoPlist.strings */; };
 		5EE44DD62600124E00A9BCED /* File.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5EE44DD52600124E00A9BCED /* File.swift */; };
 		96905EF65AED1B983A6B3ABC /* libPods-tooot.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 58EEBF8E8E6FB1BC6CAF49B5 /* libPods-tooot.a */; };
-		DA8B5B7F0DED488CAC0FF169 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = B96B72E5384D44A7B240B27E /* GoogleService-Info.plist */; };
 		E3BC22F5F8ABE515E14CF199 /* ExpoModulesProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9D878F932AF7A9974E06E461 /* ExpoModulesProvider.swift */; };
 		E613A80B28282A01003C97D6 /* AppDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = E613A80A28282A01003C97D6 /* AppDelegate.mm */; };
 		E633A42B281EAEAB000E540F /* ShareExtension.appex in Embed App Extensions */ = {isa = PBXBuildFile; fileRef = E633A420281EAEAB000E540F /* ShareExtension.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
@@ -69,7 +68,6 @@
 		7A4D352CD337FB3A3BF06240 /* Pods-tooot.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-tooot.release.xcconfig"; path = "Target Support Files/Pods-tooot/Pods-tooot.release.xcconfig"; sourceTree = "<group>"; };
 		9D878F932AF7A9974E06E461 /* ExpoModulesProvider.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ExpoModulesProvider.swift; path = "Pods/Target Support Files/Pods-tooot/ExpoModulesProvider.swift"; sourceTree = "<group>"; };
 		AA286B85B6C04FC6940260E9 /* SplashScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = SplashScreen.storyboard; path = tooot/SplashScreen.storyboard; sourceTree = "<group>"; };
-		B96B72E5384D44A7B240B27E /* GoogleService-Info.plist */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = text.plist.xml; name = "GoogleService-Info.plist"; path = "tooot/GoogleService-Info.plist"; sourceTree = "<group>"; };
 		DF8133F098604A10B0D94952 /* boop.mp3 */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = boop.mp3; path = tooot/boop.mp3; sourceTree = "<group>"; };
 		E613A80A28282A01003C97D6 /* AppDelegate.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = AppDelegate.mm; path = tooot/AppDelegate.mm; sourceTree = "<group>"; };
 		E633A420281EAEAB000E540F /* ShareExtension.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = ShareExtension.appex; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -122,7 +120,6 @@
 				13B07FB71A68108700A75B9A /* main.m */,
 				AA286B85B6C04FC6940260E9 /* SplashScreen.storyboard */,
 				5E36538225C9B8BD009F93EE /* RootViewColor.xcassets */,
-				B96B72E5384D44A7B240B27E /* GoogleService-Info.plist */,
 				5EE088CB26297820007E5FEC /* InfoPlist.strings */,
 				DF8133F098604A10B0D94952 /* boop.mp3 */,
 			);
@@ -319,7 +316,6 @@
 				13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */,
 				13B07FBD1A68108700A75B9A /* LaunchScreen.xib in Resources */,
 				3E461D99554A48A4959DE609 /* SplashScreen.storyboard in Resources */,
-				DA8B5B7F0DED488CAC0FF169 /* GoogleService-Info.plist in Resources */,
 				4986628FD0DD4630BFE5F388 /* boop.mp3 in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
diff --git a/ios/tooot/GoogleService-Info.plist b/ios/tooot/GoogleService-Info.plist
deleted file mode 100644
index 553df7ab..00000000
--- a/ios/tooot/GoogleService-Info.plist
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CLIENT_ID</key>
-	<string>661638997772-65g8ce369ugck3ii4ulk6jhb3ijg51kl.apps.googleusercontent.com</string>
-	<key>REVERSED_CLIENT_ID</key>
-	<string>com.googleusercontent.apps.661638997772-65g8ce369ugck3ii4ulk6jhb3ijg51kl</string>
-	<key>API_KEY</key>
-	<string>AIzaSyAOS1Yq_uNVctG89LB6Dl1PVhb_FAQRbRg</string>
-	<key>GCM_SENDER_ID</key>
-	<string>661638997772</string>
-	<key>PLIST_VERSION</key>
-	<string>1</string>
-	<key>BUNDLE_ID</key>
-	<string>com.xmflsct.app.tooot</string>
-	<key>PROJECT_ID</key>
-	<string>xmflsct-mastodon-app</string>
-	<key>STORAGE_BUCKET</key>
-	<string>xmflsct-mastodon-app.appspot.com</string>
-	<key>IS_ADS_ENABLED</key>
-	<false></false>
-	<key>IS_ANALYTICS_ENABLED</key>
-	<false></false>
-	<key>IS_APPINVITE_ENABLED</key>
-	<true></true>
-	<key>IS_GCM_ENABLED</key>
-	<true></true>
-	<key>IS_SIGNIN_ENABLED</key>
-	<true></true>
-	<key>GOOGLE_APP_ID</key>
-	<string>1:661638997772:ios:c8d2e09264a344b09f8b29</string>
-</dict>
-</plist>
\ No newline at end of file
diff --git a/package.json b/package.json
index fce73f57..4e43b860 100644
--- a/package.json
+++ b/package.json
@@ -47,7 +47,6 @@
     "expo-constants": "^14.0.2",
     "expo-crypto": "^12.0.0",
     "expo-file-system": "^15.1.1",
-    "expo-firebase-analytics": "^8.0.0",
     "expo-haptics": "^12.0.1",
     "expo-linking": "^3.2.3",
     "expo-localization": "^14.0.0",
diff --git a/src/Screens.tsx b/src/Screens.tsx
index 82e09f8c..59c7c3b1 100644
--- a/src/Screens.tsx
+++ b/src/Screens.tsx
@@ -1,4 +1,3 @@
-import analytics from '@components/analytics'
 import { HeaderLeft } from '@components/Header'
 import { displayMessage, Message } from '@components/Message'
 import navigationRef from '@helpers/navigationRef'
@@ -113,7 +112,6 @@ const Screens: React.FC<Props> = ({ localCorrupt }) => {
     }
 
     if (previousRoute?.name !== currentRoute?.name) {
-      analytics('screen_view', { screen_name: currentRoute?.name })
       Sentry.setContext('page', {
         previous: previousRoute,
         current: currentRoute
diff --git a/src/components/Account.tsx b/src/components/Account.tsx
index 103ded66..a59684b7 100644
--- a/src/components/Account.tsx
+++ b/src/components/Account.tsx
@@ -6,29 +6,19 @@ import { StyleConstants } from '@utils/styles/constants'
 import { useTheme } from '@utils/styles/ThemeManager'
 import React, { useCallback } from 'react'
 import { Pressable, View } from 'react-native'
-import analytics from './analytics'
 import GracefullyImage from './GracefullyImage'
 import CustomText from './Text'
 
 export interface Props {
   account: Mastodon.Account
   onPress?: () => void
-  origin?: string
 }
 
-const ComponentAccount: React.FC<Props> = ({
-  account,
-  onPress: customOnPress,
-  origin
-}) => {
+const ComponentAccount: React.FC<Props> = ({ account, onPress: customOnPress }) => {
   const { colors } = useTheme()
-  const navigation =
-    useNavigation<StackNavigationProp<TabLocalStackParamList>>()
+  const navigation = useNavigation<StackNavigationProp<TabLocalStackParamList>>()
 
-  const onPress = useCallback(() => {
-    analytics('search_account_press', { page: origin })
-    navigation.push('Tab-Shared-Account', { account })
-  }, [])
+  const onPress = useCallback(() => navigation.push('Tab-Shared-Account', { account }), [])
 
   return (
     <Pressable
diff --git a/src/components/ContextMenu/account.ts b/src/components/ContextMenu/account.ts
index cd5e4793..9bb4645b 100644
--- a/src/components/ContextMenu/account.ts
+++ b/src/components/ContextMenu/account.ts
@@ -1,4 +1,3 @@
-import analytics from '@components/analytics'
 import { displayMessage } from '@components/Message'
 import { useRelationshipQuery } from '@utils/queryHooks/relationship'
 import {
@@ -135,9 +134,6 @@ const contextMenuAccount = ({ actions, type, queryKey, rootQueryKey, id: account
       return // For Android
     }
     if (actions[index].id === 'account-mute') {
-      analytics('timeline_shared_headeractions_account_mute_press', {
-        page: queryKey && queryKey[1].page
-      })
       mutation.mutate({
         type: 'updateAccountProperty',
         queryKey,
@@ -149,9 +145,6 @@ const contextMenuAccount = ({ actions, type, queryKey, rootQueryKey, id: account
       actions[index].id === 'account-block' ||
       (actions[index].id === 'account' && actions[index].actions?.[0].id === 'account-block')
     ) {
-      analytics('timeline_shared_headeractions_account_block_press', {
-        page: queryKey && queryKey[1].page
-      })
       mutation.mutate({
         type: 'updateAccountProperty',
         queryKey,
@@ -163,9 +156,6 @@ const contextMenuAccount = ({ actions, type, queryKey, rootQueryKey, id: account
       actions[index].id === 'account-reports' ||
       (actions[index].id === 'account' && actions[index].actions?.[0].id === 'account-reports')
     ) {
-      analytics('timeline_shared_headeractions_account_reports_press', {
-        page: queryKey && queryKey[1].page
-      })
       mutation.mutate({
         type: 'updateAccountProperty',
         queryKey,
diff --git a/src/components/ContextMenu/instance.ts b/src/components/ContextMenu/instance.ts
index 92df562e..3022c512 100644
--- a/src/components/ContextMenu/instance.ts
+++ b/src/components/ContextMenu/instance.ts
@@ -1,4 +1,3 @@
-import analytics from '@components/analytics'
 import { displayMessage } from '@components/Message'
 import { QueryKeyTimeline, useTimelineMutation } from '@utils/queryHooks/timeline'
 import { getInstanceUrl } from '@utils/slices/instancesSlice'
@@ -71,9 +70,6 @@ const contextMenuInstance = ({ actions, status, queryKey, rootQueryKey }: Props)
       actions[index].id === 'instance-block' ||
       (actions[index].id === 'instance' && actions[index].actions?.[0].id === 'instance-block')
     ) {
-      analytics('timeline_shared_headeractions_domain_block_press', {
-        page: queryKey[1].page
-      })
       Alert.alert(
         t('instance.block.alert.title', { instance }),
         t('instance.block.alert.message'),
@@ -82,9 +78,6 @@ const contextMenuInstance = ({ actions, status, queryKey, rootQueryKey }: Props)
             text: t('instance.block.alert.buttons.confirm'),
             style: 'destructive',
             onPress: () => {
-              analytics('timeline_shared_headeractions_domain_block_confirm', {
-                page: queryKey && queryKey[1].page
-              })
               mutation.mutate({
                 type: 'domainBlock',
                 queryKey,
diff --git a/src/components/ContextMenu/share.ts b/src/components/ContextMenu/share.ts
index 03401876..9bc5c465 100644
--- a/src/components/ContextMenu/share.ts
+++ b/src/components/ContextMenu/share.ts
@@ -1,4 +1,3 @@
-import analytics from '@components/analytics'
 import { displayMessage } from '@components/Message'
 import Clipboard from '@react-native-clipboard/clipboard'
 import { useTheme } from '@utils/styles/ThemeManager'
@@ -39,7 +38,6 @@ const contextMenuShare = ({ copiableContent, actions, type, url }: Props) => {
       return // For Android
     }
     if (actions[index].id === 'copy') {
-      analytics('timeline_shared_headeractions_copy_press')
       Clipboard.setString(copiableContent?.current.content || '')
       displayMessage({
         theme,
@@ -48,7 +46,6 @@ const contextMenuShare = ({ copiableContent, actions, type, url }: Props) => {
       })
     }
     if (actions[index].id === 'share') {
-      analytics('timeline_shared_headeractions_share_press')
       switch (Platform.OS) {
         case 'ios':
           Share.share({ url })
diff --git a/src/components/ContextMenu/status.ts b/src/components/ContextMenu/status.ts
index 8e98f7fc..b5cc3402 100644
--- a/src/components/ContextMenu/status.ts
+++ b/src/components/ContextMenu/status.ts
@@ -1,5 +1,4 @@
 import apiInstance from '@api/instance'
-import analytics from '@components/analytics'
 import { displayMessage } from '@components/Message'
 import { useNavigation } from '@react-navigation/native'
 import { NativeStackNavigationProp } from '@react-navigation/native-stack'
@@ -107,17 +106,11 @@ const contextMenuStatus = ({ actions, status, queryKey, rootQueryKey }: Props) =
       return // For Android
     }
     if (actions[index].id === 'status-delete') {
-      analytics('timeline_shared_headeractions_status_delete_press', {
-        page: queryKey && queryKey[1].page
-      })
       Alert.alert(t('status.delete.alert.title'), t('status.delete.alert.message'), [
         {
           text: t('status.delete.alert.buttons.confirm'),
           style: 'destructive',
           onPress: async () => {
-            analytics('timeline_shared_headeractions_status_delete_confirm', {
-              page: queryKey && queryKey[1].page
-            })
             mutation.mutate({
               type: 'deleteItem',
               source: 'statuses',
@@ -133,17 +126,11 @@ const contextMenuStatus = ({ actions, status, queryKey, rootQueryKey }: Props) =
       ])
     }
     if (actions[index].id === 'status-delete-edit') {
-      analytics('timeline_shared_headeractions_status_deleteedit_press', {
-        page: queryKey && queryKey[1].page
-      })
       Alert.alert(t('status.deleteEdit.alert.title'), t('status.deleteEdit.alert.message'), [
         {
           text: t('status.deleteEdit.alert.buttons.confirm'),
           style: 'destructive',
           onPress: async () => {
-            analytics('timeline_shared_headeractions_status_deleteedit_confirm', {
-              page: queryKey && queryKey[1].page
-            })
             let replyToStatus: Mastodon.Status | undefined = undefined
             if (status.in_reply_to_id) {
               replyToStatus = await apiInstance<Mastodon.Status>({
@@ -174,9 +161,6 @@ const contextMenuStatus = ({ actions, status, queryKey, rootQueryKey }: Props) =
       ])
     }
     if (actions[index].id === 'status-mute') {
-      analytics('timeline_shared_headeractions_status_mute_press', {
-        page: queryKey && queryKey[1].page
-      })
       mutation.mutate({
         type: 'updateStatusProperty',
         queryKey,
@@ -191,9 +175,6 @@ const contextMenuStatus = ({ actions, status, queryKey, rootQueryKey }: Props) =
       })
     }
     if (actions[index].id === 'status-edit') {
-      analytics('timeline_shared_headeractions_status_edit_press', {
-        page: queryKey && queryKey[1].page
-      })
       let replyToStatus: Mastodon.Status | undefined = undefined
       if (status.in_reply_to_id) {
         replyToStatus = await apiInstance<Mastodon.Status>({
@@ -224,9 +205,6 @@ const contextMenuStatus = ({ actions, status, queryKey, rootQueryKey }: Props) =
     }
     if (actions[index].id === 'status-pin') {
       // Also note that reblogs cannot be pinned.
-      analytics('timeline_shared_headeractions_status_pin_press', {
-        page: queryKey && queryKey[1].page
-      })
       mutation.mutate({
         type: 'updateStatusProperty',
         queryKey,
diff --git a/src/components/Hashtag.tsx b/src/components/Hashtag.tsx
index 7efccdf3..aebb1adc 100644
--- a/src/components/Hashtag.tsx
+++ b/src/components/Hashtag.tsx
@@ -5,7 +5,6 @@ import { StyleConstants } from '@utils/styles/constants'
 import { useTheme } from '@utils/styles/ThemeManager'
 import React, { useCallback } from 'react'
 import { Pressable } from 'react-native'
-import analytics from './analytics'
 import CustomText from './Text'
 
 export interface Props {
@@ -24,7 +23,6 @@ const ComponentHashtag: React.FC<Props> = ({
     useNavigation<StackNavigationProp<TabLocalStackParamList>>()
 
   const onPress = useCallback(() => {
-    analytics('search_account_press', { page: origin })
     navigation.push('Tab-Shared-Hashtag', { hashtag: hashtag.name })
   }, [])
 
diff --git a/src/components/Instance.tsx b/src/components/Instance.tsx
index b37361c2..46be34e8 100644
--- a/src/components/Instance.tsx
+++ b/src/components/Instance.tsx
@@ -9,18 +9,10 @@ import * as WebBrowser from 'expo-web-browser'
 import { debounce } from 'lodash'
 import React, { RefObject, useCallback, useMemo, useState } from 'react'
 import { Trans, useTranslation } from 'react-i18next'
-import {
-  Alert,
-  Image,
-  KeyboardAvoidingView,
-  Platform,
-  TextInput,
-  View
-} from 'react-native'
+import { Alert, Image, KeyboardAvoidingView, Platform, TextInput, View } from 'react-native'
 import { ScrollView } from 'react-native-gesture-handler'
 import { useSelector } from 'react-redux'
 import { Placeholder } from 'rn-placeholder'
-import analytics from './analytics'
 import InstanceAuth from './Instance/Auth'
 import InstanceInfo from './Instance/Info'
 import CustomText from './Text'
@@ -65,11 +57,7 @@ const ComponentInstance: React.FC<Props> = ({
 
   const processUpdate = useCallback(() => {
     if (domain) {
-      analytics('instance_login')
-      if (
-        instances &&
-        instances.filter(instance => instance.url === domain).length
-      ) {
+      if (instances && instances.filter(instance => instance.url === domain).length) {
         Alert.alert(t('update.alert.title'), t('update.alert.message'), [
           {
             text: t('update.alert.buttons.cancel'),
@@ -142,9 +130,7 @@ const ComponentInstance: React.FC<Props> = ({
               borderBottomWidth: 1,
               ...StyleConstants.FontStyle.M,
               color: colors.primaryDefault,
-              borderBottomColor: instanceQuery.isError
-                ? colors.red
-                : colors.border
+              borderBottomColor: instanceQuery.isError ? colors.red : colors.border
             }}
             editable={false}
             defaultValue='https://'
@@ -156,9 +142,7 @@ const ComponentInstance: React.FC<Props> = ({
               ...StyleConstants.FontStyle.M,
               marginRight: StyleConstants.Spacing.M,
               color: colors.primaryDefault,
-              borderBottomColor: instanceQuery.isError
-                ? colors.red
-                : colors.border
+              borderBottomColor: instanceQuery.isError ? colors.red : colors.border
             }}
             onChangeText={onChangeText}
             autoCapitalize='none'
@@ -166,7 +150,6 @@ const ComponentInstance: React.FC<Props> = ({
             keyboardType='url'
             textContentType='URL'
             onSubmitEditing={({ nativeEvent: { text } }) => {
-              analytics('instance_textinput_submit', { match: text === domain })
               if (
                 text === domain &&
                 instanceQuery.isSuccess &&
@@ -182,11 +165,7 @@ const ComponentInstance: React.FC<Props> = ({
             keyboardAppearance={mode}
             {...(scrollViewRef && {
               onFocus: () =>
-                setTimeout(
-                  () =>
-                    scrollViewRef.current?.scrollTo({ y: 0, animated: true }),
-                  150
-                )
+                setTimeout(() => scrollViewRef.current?.scrollTo({ y: 0, animated: true }), 150)
             })}
             autoCorrect={false}
             spellCheck={false}
@@ -211,27 +190,19 @@ const ComponentInstance: React.FC<Props> = ({
               <InstanceInfo
                 style={{ alignItems: 'flex-start' }}
                 header={t('server.information.accounts')}
-                content={
-                  instanceQuery.data?.stats?.user_count?.toString() || undefined
-                }
+                content={instanceQuery.data?.stats?.user_count?.toString() || undefined}
                 potentialWidth={4}
               />
               <InstanceInfo
                 style={{ alignItems: 'center' }}
                 header={t('server.information.statuses')}
-                content={
-                  instanceQuery.data?.stats?.status_count?.toString() ||
-                  undefined
-                }
+                content={instanceQuery.data?.stats?.status_count?.toString() || undefined}
                 potentialWidth={4}
               />
               <InstanceInfo
                 style={{ alignItems: 'flex-end' }}
                 header={t('server.information.domains')}
-                content={
-                  instanceQuery.data?.stats?.domain_count?.toString() ||
-                  undefined
-                }
+                content={instanceQuery.data?.stats?.domain_count?.toString() || undefined}
                 potentialWidth={4}
               />
             </View>
@@ -248,17 +219,11 @@ const ComponentInstance: React.FC<Props> = ({
               size={StyleConstants.Font.Size.S}
               color={colors.secondary}
               style={{
-                marginTop:
-                  (StyleConstants.Font.LineHeight.S -
-                    StyleConstants.Font.Size.S) /
-                  2,
+                marginTop: (StyleConstants.Font.LineHeight.S - StyleConstants.Font.Size.S) / 2,
                 marginRight: StyleConstants.Spacing.XS
               }}
             />
-            <CustomText
-              fontStyle='S'
-              style={{ flex: 1, color: colors.secondary }}
-            >
+            <CustomText fontStyle='S' style={{ flex: 1, color: colors.secondary }}>
               {t('server.disclaimer.base')}
             </CustomText>
           </View>
@@ -274,10 +239,7 @@ const ComponentInstance: React.FC<Props> = ({
               size={StyleConstants.Font.Size.S}
               color={colors.secondary}
               style={{
-                marginTop:
-                  (StyleConstants.Font.LineHeight.S -
-                    StyleConstants.Font.Size.S) /
-                  2,
+                marginTop: (StyleConstants.Font.LineHeight.S - StyleConstants.Font.Size.S) / 2,
                 marginRight: StyleConstants.Spacing.XS
               }}
             />
@@ -292,22 +254,14 @@ const ComponentInstance: React.FC<Props> = ({
                   <CustomText
                     accessible
                     style={{ color: colors.blue }}
-                    onPress={() => {
-                      analytics('view_privacy')
-                      WebBrowser.openBrowserAsync(
-                        'https://tooot.app/privacy-policy'
-                      )
-                    }}
+                    onPress={() => WebBrowser.openBrowserAsync('https://tooot.app/privacy-policy')}
                   />,
                   <CustomText
                     accessible
                     style={{ color: colors.blue }}
-                    onPress={() => {
-                      analytics('view_tos')
-                      WebBrowser.openBrowserAsync(
-                        'https://tooot.app/terms-of-service'
-                      )
-                    }}
+                    onPress={() =>
+                      WebBrowser.openBrowserAsync('https://tooot.app/terms-of-service')
+                    }
                   />
                 ]}
               />
diff --git a/src/components/Parse/HTML.tsx b/src/components/Parse/HTML.tsx
index e68b3d30..b619b144 100644
--- a/src/components/Parse/HTML.tsx
+++ b/src/components/Parse/HTML.tsx
@@ -1,4 +1,3 @@
-import analytics from '@components/analytics'
 import Icon from '@components/Icon'
 import openLink from '@components/openLink'
 import ParseEmojis from '@components/Parse/Emojis'
@@ -63,7 +62,6 @@ const renderNode = ({
                 lineHeight: adaptedLineheight
               }}
               onPress={() => {
-                analytics('status_hashtag_press')
                 !disableDetails &&
                   differentTag &&
                   navigation.push('Tab-Shared-Hashtag', {
@@ -89,7 +87,6 @@ const renderNode = ({
                 lineHeight: adaptedLineheight
               }}
               onPress={() => {
-                analytics('status_mention_press')
                 accountIndex !== -1 &&
                   !disableDetails &&
                   differentAccount &&
@@ -118,7 +115,6 @@ const renderNode = ({
               lineHeight: adaptedLineheight
             }}
             onPress={async () => {
-              analytics('status_link_press')
               if (!disableDetails) {
                 if (shouldBeTag) {
                   navigation.push('Tab-Shared-Hashtag', {
@@ -255,7 +251,6 @@ const ParseHTML = React.memo(
               <Pressable
                 accessibilityLabel={t('HTML.accessibilityHint')}
                 onPress={() => {
-                  analytics('status_readmore', { totalLines, expanded })
                   layoutAnimation()
                   setExpanded(!expanded)
                 }}
diff --git a/src/components/Relationship/Incoming.tsx b/src/components/Relationship/Incoming.tsx
index feb97340..d6eb633c 100644
--- a/src/components/Relationship/Incoming.tsx
+++ b/src/components/Relationship/Incoming.tsx
@@ -1,11 +1,7 @@
-import analytics from '@components/analytics'
 import Button from '@components/Button'
 import haptics from '@components/haptics'
 import { displayMessage } from '@components/Message'
-import {
-  QueryKeyRelationship,
-  useRelationshipMutation
-} from '@utils/queryHooks/relationship'
+import { QueryKeyRelationship, useRelationshipMutation } from '@utils/queryHooks/relationship'
 import { QueryKeyTimeline } from '@utils/queryHooks/timeline'
 import { StyleConstants } from '@utils/styles/constants'
 import { useTheme } from '@utils/styles/ThemeManager'
@@ -23,17 +19,12 @@ const RelationshipIncoming: React.FC<Props> = ({ id }) => {
   const { t } = useTranslation()
 
   const queryKeyRelationship: QueryKeyRelationship = ['Relationship', { id }]
-  const queryKeyNotification: QueryKeyTimeline = [
-    'Timeline',
-    { page: 'Notifications' }
-  ]
+  const queryKeyNotification: QueryKeyTimeline = ['Timeline', { page: 'Notifications' }]
   const queryClient = useQueryClient()
   const mutation = useRelationshipMutation({
     onSuccess: res => {
       haptics('Success')
-      queryClient.setQueryData<Mastodon.Relationship[]>(queryKeyRelationship, [
-        res
-      ])
+      queryClient.setQueryData<Mastodon.Relationship[]>(queryKeyRelationship, [res])
       queryClient.refetchQueries(queryKeyNotification)
     },
     onError: (err: any, { type }) => {
@@ -62,28 +53,26 @@ const RelationshipIncoming: React.FC<Props> = ({ id }) => {
         type='icon'
         content='X'
         loading={mutation.isLoading}
-        onPress={() => {
-          analytics('relationship_incoming_press_reject')
+        onPress={() =>
           mutation.mutate({
             id,
             type: 'incoming',
             payload: { action: 'reject' }
           })
-        }}
+        }
       />
       <Button
         round
         type='icon'
         content='Check'
         loading={mutation.isLoading}
-        onPress={() => {
-          analytics('relationship_incoming_press_authorize')
+        onPress={() =>
           mutation.mutate({
             id,
             type: 'incoming',
             payload: { action: 'authorize' }
           })
-        }}
+        }
         style={styles.approve}
       />
     </View>
diff --git a/src/components/Relationship/Outgoing.tsx b/src/components/Relationship/Outgoing.tsx
index 123ac90d..b551d670 100644
--- a/src/components/Relationship/Outgoing.tsx
+++ b/src/components/Relationship/Outgoing.tsx
@@ -1,4 +1,3 @@
-import analytics from '@components/analytics'
 import Button from '@components/Button'
 import haptics from '@components/haptics'
 import { displayMessage } from '@components/Message'
@@ -29,10 +28,7 @@ const RelationshipOutgoing = React.memo(
     const mutation = useRelationshipMutation({
       onSuccess: (res, { payload: { action } }) => {
         haptics('Success')
-        queryClient.setQueryData<Mastodon.Relationship[]>(
-          queryKeyRelationship,
-          [res]
-        )
+        queryClient.setQueryData<Mastodon.Relationship[]>(queryKeyRelationship, [res])
         if (action === 'block') {
           const queryKey: QueryKeyTimeline = ['Timeline', { page: 'Following' }]
           queryClient.invalidateQueries(queryKey)
@@ -64,17 +60,12 @@ const RelationshipOutgoing = React.memo(
       onPress = () => {}
     } else {
       if (query.data?.blocked_by) {
-        analytics('relationship_outgoing_blocked_by')
         content = t('button.blocked_by')
-        onPress = () => {
-          analytics('relationship_outgoing_blocked_by_press')
-        }
+        onPress = () => {}
       } else {
         if (query.data?.blocking) {
-          analytics('relationship_outgoing_blocking')
           content = t('button.blocking')
           onPress = () => {
-            analytics('relationship_outgoing_blocking_press')
             mutation.mutate({
               id,
               type: 'outgoing',
@@ -86,10 +77,8 @@ const RelationshipOutgoing = React.memo(
           }
         } else {
           if (query.data?.following) {
-            analytics('relationship_outgoing_following')
             content = t('button.following')
             onPress = () => {
-              analytics('relationship_outgoing_following_press')
               mutation.mutate({
                 id,
                 type: 'outgoing',
@@ -101,10 +90,8 @@ const RelationshipOutgoing = React.memo(
             }
           } else {
             if (query.data?.requested) {
-              analytics('relationship_outgoing_requested')
               content = t('button.requested')
               onPress = () => {
-                analytics('relationship_outgoing_requested_press')
                 mutation.mutate({
                   id,
                   type: 'outgoing',
@@ -115,10 +102,8 @@ const RelationshipOutgoing = React.memo(
                 })
               }
             } else {
-              analytics('relationship_outgoing_default')
               content = t('button.default')
               onPress = () => {
-                analytics('relationship_outgoing_default_press')
                 mutation.mutate({
                   id,
                   type: 'outgoing',
diff --git a/src/components/Timeline/Conversation.tsx b/src/components/Timeline/Conversation.tsx
index 212234d4..5dbd3d2d 100644
--- a/src/components/Timeline/Conversation.tsx
+++ b/src/components/Timeline/Conversation.tsx
@@ -1,5 +1,4 @@
 import apiInstance from '@api/instance'
-import analytics from '@components/analytics'
 import GracefullyImage from '@components/GracefullyImage'
 import { useNavigation } from '@react-navigation/native'
 import { StackNavigationProp } from '@react-navigation/stack'
@@ -79,7 +78,6 @@ const TimelineConversation = React.memo(
     const navigation =
       useNavigation<StackNavigationProp<TabLocalStackParamList>>()
     const onPress = useCallback(() => {
-      analytics('timeline_conversation_press')
       if (conversation.last_status) {
         conversation.unread && mutate()
         navigation.push('Tab-Shared-Toot', {
diff --git a/src/components/Timeline/Default.tsx b/src/components/Timeline/Default.tsx
index e861298a..6d9ab41d 100644
--- a/src/components/Timeline/Default.tsx
+++ b/src/components/Timeline/Default.tsx
@@ -1,4 +1,3 @@
-import analytics from '@components/analytics'
 import TimelineActioned from '@components/Timeline/Shared/Actioned'
 import TimelineActions from '@components/Timeline/Shared/Actions'
 import TimelineAttachment from '@components/Timeline/Shared/Attachment'
@@ -17,7 +16,7 @@ import { StyleConstants } from '@utils/styles/constants'
 import { useTheme } from '@utils/styles/ThemeManager'
 import { uniqBy } from 'lodash'
 import React, { useRef } from 'react'
-import { Platform, Pressable, StyleProp, View, ViewStyle } from 'react-native'
+import { Pressable, StyleProp, View, ViewStyle } from 'react-native'
 import { useSelector } from 'react-redux'
 import TimelineContextMenu from './Shared/ContextMenu'
 import TimelineFeedback from './Shared/Feedback'
@@ -29,7 +28,6 @@ export interface Props {
   item: Mastodon.Status & { _pinned?: boolean } // For account page, internal property
   queryKey?: QueryKeyTimeline
   rootQueryKey?: QueryKeyTimeline
-  origin?: string
   highlighted?: boolean
   disableDetails?: boolean
   disableOnPress?: boolean
@@ -40,7 +38,6 @@ const TimelineDefault: React.FC<Props> = ({
   item,
   queryKey,
   rootQueryKey,
-  origin,
   highlighted = false,
   disableDetails = false,
   disableOnPress = false
@@ -65,9 +62,6 @@ const TimelineDefault: React.FC<Props> = ({
 
   const onPress = () => {
     if (highlighted) return
-    analytics('timeline_default_press', {
-      page: queryKey ? queryKey[1].page : origin
-    })
     navigation.push('Tab-Shared-Toot', {
       toot: actualStatus,
       rootQueryKey: queryKey
diff --git a/src/components/Timeline/Empty.tsx b/src/components/Timeline/Empty.tsx
index af5227e5..b2ef2cde 100644
--- a/src/components/Timeline/Empty.tsx
+++ b/src/components/Timeline/Empty.tsx
@@ -1,4 +1,3 @@
-import analytics from '@components/analytics'
 import Button from '@components/Button'
 import Icon from '@components/Icon'
 import CustomText from '@components/Text'
@@ -27,20 +26,11 @@ const TimelineEmpty = React.memo(
     const children = () => {
       switch (status) {
         case 'loading':
-          return (
-            <Circle
-              size={StyleConstants.Font.Size.L}
-              color={colors.secondary}
-            />
-          )
+          return <Circle size={StyleConstants.Font.Size.L} color={colors.secondary} />
         case 'error':
           return (
             <>
-              <Icon
-                name='Frown'
-                size={StyleConstants.Font.Size.L}
-                color={colors.primaryDefault}
-              />
+              <Icon name='Frown' size={StyleConstants.Font.Size.L} color={colors.primaryDefault} />
               <CustomText
                 fontStyle='M'
                 style={{
@@ -51,14 +41,7 @@ const TimelineEmpty = React.memo(
               >
                 {t('empty.error.message')}
               </CustomText>
-              <Button
-                type='text'
-                content={t('empty.error.button')}
-                onPress={() => {
-                  analytics('timeline_error_press_refetch')
-                  refetch()
-                }}
-              />
+              <Button type='text' content={t('empty.error.button')} onPress={() => refetch()} />
             </>
           )
         case 'success':
diff --git a/src/components/Timeline/Notifications.tsx b/src/components/Timeline/Notifications.tsx
index 85dc7943..81e2e24b 100644
--- a/src/components/Timeline/Notifications.tsx
+++ b/src/components/Timeline/Notifications.tsx
@@ -1,4 +1,3 @@
-import analytics from '@components/analytics'
 import TimelineActioned from '@components/Timeline/Shared/Actioned'
 import TimelineActions from '@components/Timeline/Shared/Actions'
 import TimelineAttachment from '@components/Timeline/Shared/Attachment'
@@ -15,7 +14,7 @@ import { QueryKeyTimeline } from '@utils/queryHooks/timeline'
 import { getInstanceAccount } from '@utils/slices/instancesSlice'
 import { StyleConstants } from '@utils/styles/constants'
 import { useTheme } from '@utils/styles/ThemeManager'
-import { isEqual, uniqBy } from 'lodash'
+import { uniqBy } from 'lodash'
 import React, { useCallback, useRef } from 'react'
 import { Platform, Pressable, View } from 'react-native'
 import { useSelector } from 'react-redux'
@@ -57,7 +56,6 @@ const TimelineNotifications: React.FC<Props> = ({
   const actualAccount = notification.status ? notification.status.account : notification.account
 
   const onPress = useCallback(() => {
-    analytics('timeline_notification_press')
     notification.status &&
       navigation.push('Tab-Shared-Toot', {
         toot: notification.status,
diff --git a/src/components/Timeline/Shared/Actioned.tsx b/src/components/Timeline/Shared/Actioned.tsx
index 59db82b9..32390eae 100644
--- a/src/components/Timeline/Shared/Actioned.tsx
+++ b/src/components/Timeline/Shared/Actioned.tsx
@@ -1,4 +1,3 @@
-import analytics from '@components/analytics'
 import Icon from '@components/Icon'
 import { ParseEmojis } from '@components/Parse'
 import { useNavigation } from '@react-navigation/native'
@@ -6,7 +5,7 @@ import { StackNavigationProp } from '@react-navigation/stack'
 import { TabLocalStackParamList } from '@utils/navigation/navigators'
 import { StyleConstants } from '@utils/styles/constants'
 import { useTheme } from '@utils/styles/ThemeManager'
-import React, { useCallback, useMemo } from 'react'
+import React from 'react'
 import { useTranslation } from 'react-i18next'
 import { Pressable, StyleSheet, View } from 'react-native'
 
@@ -20,8 +19,7 @@ const TimelineActioned = React.memo(
   ({ account, action, notification = false }: Props) => {
     const { t } = useTranslation('componentTimeline')
     const { colors } = useTheme()
-    const navigation =
-      useNavigation<StackNavigationProp<TabLocalStackParamList>>()
+    const navigation = useNavigation<StackNavigationProp<TabLocalStackParamList>>()
     const name = account?.display_name || account?.username
     const iconColor = colors.primaryDefault
 
@@ -29,10 +27,7 @@ const TimelineActioned = React.memo(
       <ParseEmojis content={content} emojis={account.emojis} size='S' />
     )
 
-    const onPress = useCallback(() => {
-      analytics('timeline_shared_actioned_press', { action })
-      navigation.push('Tab-Shared-Account', { account })
-    }, [])
+    const onPress = () => navigation.push('Tab-Shared-Account', { account })
 
     const children = () => {
       switch (action) {
diff --git a/src/components/Timeline/Shared/Actions.tsx b/src/components/Timeline/Shared/Actions.tsx
index 46e98e1b..7300935d 100644
--- a/src/components/Timeline/Shared/Actions.tsx
+++ b/src/components/Timeline/Shared/Actions.tsx
@@ -1,4 +1,3 @@
-import analytics from '@components/analytics'
 import Icon from '@components/Icon'
 import { displayMessage } from '@components/Message'
 import CustomText from '@components/Text'
@@ -84,18 +83,16 @@ const TimelineActions: React.FC<Props> = ({
     }
   })
 
-  const onPressReply = useCallback(() => {
-    analytics('timeline_shared_actions_reply_press', {
-      page: queryKey[1].page,
-      count: status.replies_count
-    })
-    navigation.navigate('Screen-Compose', {
-      type: 'reply',
-      incomingStatus: status,
-      accts,
-      queryKey
-    })
-  }, [status.replies_count])
+  const onPressReply = useCallback(
+    () =>
+      navigation.navigate('Screen-Compose', {
+        type: 'reply',
+        incomingStatus: status,
+        accts,
+        queryKey
+      }),
+    [status.replies_count]
+  )
   const { showActionSheetWithOptions } = useActionSheet()
   const onPressReblog = useCallback(() => {
     if (!status.reblogged) {
@@ -112,11 +109,6 @@ const TimelineActions: React.FC<Props> = ({
         (selectedIndex: number) => {
           switch (selectedIndex) {
             case 0:
-              analytics('timeline_shared_actions_reblog_public_press', {
-                page: queryKey[1].page,
-                count: status.reblogs_count,
-                current: status.reblogged
-              })
               mutation.mutate({
                 type: 'updateStatusProperty',
                 queryKey,
@@ -133,11 +125,6 @@ const TimelineActions: React.FC<Props> = ({
               })
               break
             case 1:
-              analytics('timeline_shared_actions_reblog_unlisted_press', {
-                page: queryKey[1].page,
-                count: status.reblogs_count,
-                current: status.reblogged
-              })
               mutation.mutate({
                 type: 'updateStatusProperty',
                 queryKey,
@@ -157,11 +144,6 @@ const TimelineActions: React.FC<Props> = ({
         }
       )
     } else {
-      analytics('timeline_shared_actions_reblog_press', {
-        page: queryKey[1].page,
-        count: status.reblogs_count,
-        current: status.reblogged
-      })
       mutation.mutate({
         type: 'updateStatusProperty',
         queryKey,
@@ -179,11 +161,6 @@ const TimelineActions: React.FC<Props> = ({
     }
   }, [status.reblogged, status.reblogs_count])
   const onPressFavourite = useCallback(() => {
-    analytics('timeline_shared_actions_favourite_press', {
-      page: queryKey[1].page,
-      count: status.favourites_count,
-      current: status.favourited
-    })
     mutation.mutate({
       type: 'updateStatusProperty',
       queryKey,
@@ -199,10 +176,6 @@ const TimelineActions: React.FC<Props> = ({
     })
   }, [status.favourited, status.favourites_count])
   const onPressBookmark = useCallback(() => {
-    analytics('timeline_shared_actions_bookmark_press', {
-      page: queryKey[1].page,
-      current: status.bookmarked
-    })
     mutation.mutate({
       type: 'updateStatusProperty',
       queryKey,
diff --git a/src/components/Timeline/Shared/Attachment.tsx b/src/components/Timeline/Shared/Attachment.tsx
index ba9fad2a..60b98098 100644
--- a/src/components/Timeline/Shared/Attachment.tsx
+++ b/src/components/Timeline/Shared/Attachment.tsx
@@ -1,4 +1,3 @@
-import analytics from '@components/analytics'
 import Button from '@components/Button'
 import haptics from '@components/haptics'
 import AttachmentAudio from '@components/Timeline/Shared/Attachment/Audio'
@@ -195,7 +194,6 @@ const TimelineAttachment = React.memo(
                 content={t('shared.attachment.sensitive.button')}
                 overlay
                 onPress={() => {
-                  analytics('timeline_shared_attachment_blurview_press_show')
                   layoutAnimation()
                   setSensitiveShown(false)
                   haptics('Light')
@@ -209,7 +207,6 @@ const TimelineAttachment = React.memo(
               round
               overlay
               onPress={() => {
-                analytics('timeline_shared_attachment_blurview_press_hide')
                 setSensitiveShown(true)
                 haptics('Light')
               }}
diff --git a/src/components/Timeline/Shared/Attachment/Audio.tsx b/src/components/Timeline/Shared/Attachment/Audio.tsx
index ad19496e..83ec4f82 100644
--- a/src/components/Timeline/Shared/Attachment/Audio.tsx
+++ b/src/components/Timeline/Shared/Attachment/Audio.tsx
@@ -1,4 +1,3 @@
-import analytics from '@components/analytics'
 import Button from '@components/Button'
 import GracefullyImage from '@components/GracefullyImage'
 import { Slider } from '@sharcoux/slider'
@@ -25,7 +24,6 @@ const AttachmentAudio: React.FC<Props> = ({ total, index, sensitiveShown, audio
   const [audioPlaying, setAudioPlaying] = useState(false)
   const [audioPosition, setAudioPosition] = useState(0)
   const playAudio = useCallback(async () => {
-    analytics('timeline_shared_attachment_audio_play_press', { id: audio.id })
     if (!audioPlayer) {
       const { sound } = await Audio.Sound.createAsync(
         { uri: audio.url },
@@ -41,7 +39,6 @@ const AttachmentAudio: React.FC<Props> = ({ total, index, sensitiveShown, audio
     }
   }, [audioPlayer, audioPosition])
   const pauseAudio = useCallback(async () => {
-    analytics('timeline_shared_attachment_audio_pause_press', { id: audio.id })
     audioPlayer!.pauseAsync()
     setAudioPlaying(false)
   }, [audioPlayer])
diff --git a/src/components/Timeline/Shared/Attachment/Image.tsx b/src/components/Timeline/Shared/Attachment/Image.tsx
index 3d5fabe4..814d41b2 100644
--- a/src/components/Timeline/Shared/Attachment/Image.tsx
+++ b/src/components/Timeline/Shared/Attachment/Image.tsx
@@ -1,4 +1,3 @@
-import analytics from '@components/analytics'
 import GracefullyImage from '@components/GracefullyImage'
 import { StyleConstants } from '@utils/styles/constants'
 import React from 'react'
@@ -34,27 +33,17 @@ const AttachmentImage = ({
         hidden={sensitiveShown}
         uri={{ original: image.preview_url, remote: image.remote_url }}
         blurhash={image.blurhash}
-        onPress={() => {
-          analytics('timeline_shared_attachment_image_press', {
-            id: image.id
-          })
-          navigateToImagesViewer(image.id)
-        }}
+        onPress={() => navigateToImagesViewer(image.id)}
         style={{
           aspectRatio:
-            total > 1 ||
-            !image.meta?.original?.width ||
-            !image.meta?.original?.height
+            total > 1 || !image.meta?.original?.width || !image.meta?.original?.height
               ? attachmentAspectRatio({ total, index })
               : image.meta.original.height / image.meta.original.width > 1
               ? 1
               : image.meta.original.width / image.meta.original.height
         }}
       />
-      <AttachmentAltText
-        sensitiveShown={sensitiveShown}
-        text={image.description}
-      />
+      <AttachmentAltText sensitiveShown={sensitiveShown} text={image.description} />
     </View>
   )
 }
diff --git a/src/components/Timeline/Shared/Attachment/Unsupported.tsx b/src/components/Timeline/Shared/Attachment/Unsupported.tsx
index 2d88cd40..f1c7f347 100644
--- a/src/components/Timeline/Shared/Attachment/Unsupported.tsx
+++ b/src/components/Timeline/Shared/Attachment/Unsupported.tsx
@@ -1,4 +1,3 @@
-import analytics from '@components/analytics'
 import Button from '@components/Button'
 import openLink from '@components/openLink'
 import CustomText from '@components/Text'
@@ -18,12 +17,7 @@ export interface Props {
   attachment: Mastodon.AttachmentUnknown
 }
 
-const AttachmentUnsupported: React.FC<Props> = ({
-  total,
-  index,
-  sensitiveShown,
-  attachment
-}) => {
+const AttachmentUnsupported: React.FC<Props> = ({ total, index, sensitiveShown, attachment }) => {
   const { t } = useTranslation('componentTimeline')
   const { colors } = useTheme()
 
@@ -55,9 +49,7 @@ const AttachmentUnsupported: React.FC<Props> = ({
             style={{
               textAlign: 'center',
               marginBottom: StyleConstants.Spacing.S,
-              color: attachment.blurhash
-                ? colors.backgroundDefault
-                : colors.primaryDefault
+              color: attachment.blurhash ? colors.backgroundDefault : colors.primaryDefault
             }}
           >
             {t('shared.attachment.unsupported.text')}
@@ -69,17 +61,13 @@ const AttachmentUnsupported: React.FC<Props> = ({
               size='S'
               overlay
               onPress={() => {
-                analytics('timeline_shared_attachment_unsupported_press')
                 attachment.remote_url && openLink(attachment.remote_url)
               }}
             />
           ) : null}
         </>
       ) : null}
-      <AttachmentAltText
-        sensitiveShown={sensitiveShown}
-        text={attachment.description}
-      />
+      <AttachmentAltText sensitiveShown={sensitiveShown} text={attachment.description} />
     </View>
   )
 }
diff --git a/src/components/Timeline/Shared/Attachment/Video.tsx b/src/components/Timeline/Shared/Attachment/Video.tsx
index 730c3248..2b8594ce 100644
--- a/src/components/Timeline/Shared/Attachment/Video.tsx
+++ b/src/components/Timeline/Shared/Attachment/Video.tsx
@@ -5,7 +5,6 @@ import React, { useCallback, useEffect, useRef, useState } from 'react'
 import { AppState, AppStateStatus, Pressable, View } from 'react-native'
 import { Blurhash } from 'react-native-blurhash'
 import attachmentAspectRatio from './aspectRatio'
-import analytics from '@components/analytics'
 import AttachmentAltText from './AltText'
 import { Platform } from 'expo-modules-core'
 
@@ -30,13 +29,6 @@ const AttachmentVideo: React.FC<Props> = ({
   const [videoPosition, setVideoPosition] = useState<number>(0)
   const [videoResizeMode, setVideoResizeMode] = useState<ResizeMode>(ResizeMode.COVER)
   const playOnPress = useCallback(async () => {
-    analytics('timeline_shared_attachment_video_length', {
-      length: video.meta?.length
-    })
-    analytics('timeline_shared_attachment_vide_play_press', {
-      id: video.id,
-      timestamp: Date.now()
-    })
     setVideoLoading(true)
     if (!videoLoaded) {
       await videoPlayer.current?.loadAsync({ uri: video.url })
diff --git a/src/components/Timeline/Shared/Avatar.tsx b/src/components/Timeline/Shared/Avatar.tsx
index 739e622f..a41e8a81 100644
--- a/src/components/Timeline/Shared/Avatar.tsx
+++ b/src/components/Timeline/Shared/Avatar.tsx
@@ -1,4 +1,3 @@
-import analytics from '@components/analytics'
 import GracefullyImage from '@components/GracefullyImage'
 import { useNavigation } from '@react-navigation/native'
 import { StackNavigationProp } from '@react-navigation/stack'
@@ -14,43 +13,37 @@ export interface Props {
   highlighted: boolean
 }
 
-const TimelineAvatar = React.memo(
-  ({ queryKey, account, highlighted }: Props) => {
-    const { t } = useTranslation('componentTimeline')
-    const navigation =
-      useNavigation<StackNavigationProp<TabLocalStackParamList>>()
-    // Need to fix go back root
-    const onPress = useCallback(() => {
-      analytics('timeline_shared_avatar_press', {
-        page: queryKey && queryKey[1].page
-      })
-      queryKey && navigation.push('Tab-Shared-Account', { account })
-    }, [])
+const TimelineAvatar = React.memo(({ queryKey, account, highlighted }: Props) => {
+  const { t } = useTranslation('componentTimeline')
+  const navigation = useNavigation<StackNavigationProp<TabLocalStackParamList>>()
+  // Need to fix go back root
+  const onPress = useCallback(() => {
+    queryKey && navigation.push('Tab-Shared-Account', { account })
+  }, [])
 
-    return (
-      <GracefullyImage
-        {...(highlighted && {
-          accessibilityLabel: t('shared.avatar.accessibilityLabel', {
-            name: account.display_name
-          }),
-          accessibilityHint: t('shared.avatar.accessibilityHint', {
-            name: account.display_name
-          })
-        })}
-        onPress={onPress}
-        uri={{ original: account?.avatar, static: account?.avatar_static }}
-        dimension={{
-          width: StyleConstants.Avatar.M,
-          height: StyleConstants.Avatar.M
-        }}
-        style={{
-          borderRadius: StyleConstants.Avatar.M,
-          overflow: 'hidden',
-          marginRight: StyleConstants.Spacing.S
-        }}
-      />
-    )
-  }
-)
+  return (
+    <GracefullyImage
+      {...(highlighted && {
+        accessibilityLabel: t('shared.avatar.accessibilityLabel', {
+          name: account.display_name
+        }),
+        accessibilityHint: t('shared.avatar.accessibilityHint', {
+          name: account.display_name
+        })
+      })}
+      onPress={onPress}
+      uri={{ original: account?.avatar, static: account?.avatar_static }}
+      dimension={{
+        width: StyleConstants.Avatar.M,
+        height: StyleConstants.Avatar.M
+      }}
+      style={{
+        borderRadius: StyleConstants.Avatar.M,
+        overflow: 'hidden',
+        marginRight: StyleConstants.Spacing.S
+      }}
+    />
+  )
+})
 
 export default TimelineAvatar
diff --git a/src/components/Timeline/Shared/Card.tsx b/src/components/Timeline/Shared/Card.tsx
index bbe01708..d8f03112 100644
--- a/src/components/Timeline/Shared/Card.tsx
+++ b/src/components/Timeline/Shared/Card.tsx
@@ -1,5 +1,4 @@
 import ComponentAccount from '@components/Account'
-import analytics from '@components/analytics'
 import GracefullyImage from '@components/GracefullyImage'
 import openLink from '@components/openLink'
 import CustomText from '@components/Text'
@@ -130,10 +129,10 @@ const TimelineCard = React.memo(({ card }: Props) => {
       )
     }
     if (isStatus && foundStatus) {
-      return <TimelineDefault item={foundStatus} disableDetails disableOnPress origin='card' />
+      return <TimelineDefault item={foundStatus} disableDetails disableOnPress />
     }
     if (isAccount && foundAccount) {
-      return <ComponentAccount account={foundAccount} origin='card' />
+      return <ComponentAccount account={foundAccount} />
     }
     return (
       <>
@@ -193,10 +192,7 @@ const TimelineCard = React.memo(({ card }: Props) => {
         overflow: 'hidden',
         borderColor: colors.border
       }}
-      onPress={async () => {
-        analytics('timeline_shared_card_press')
-        await openLink(card.url, navigation)
-      }}
+      onPress={async () => await openLink(card.url, navigation)}
       children={cardContent}
     />
   )
diff --git a/src/components/Timeline/Shared/Feedback.tsx b/src/components/Timeline/Shared/Feedback.tsx
index 4f22de37..0d2d11f4 100644
--- a/src/components/Timeline/Shared/Feedback.tsx
+++ b/src/components/Timeline/Shared/Feedback.tsx
@@ -1,4 +1,3 @@
-import analytics from '@components/analytics'
 import CustomText from '@components/Text'
 import { useNavigation } from '@react-navigation/native'
 import { StackNavigationProp } from '@react-navigation/stack'
@@ -11,10 +10,7 @@ import { useTranslation } from 'react-i18next'
 import { StyleSheet, View } from 'react-native'
 
 export interface Props {
-  status: Pick<
-    Mastodon.Status,
-    'id' | 'edited_at' | 'reblogs_count' | 'favourites_count'
-  >
+  status: Pick<Mastodon.Status, 'id' | 'edited_at' | 'reblogs_count' | 'favourites_count'>
   highlighted: boolean
 }
 
@@ -26,8 +22,7 @@ const TimelineFeedback = React.memo(
 
     const { t } = useTranslation('componentTimeline')
     const { colors } = useTheme()
-    const navigation =
-      useNavigation<StackNavigationProp<TabLocalStackParamList>>()
+    const navigation = useNavigation<StackNavigationProp<TabLocalStackParamList>>()
 
     const { data } = useStatusHistory({
       id: status.id,
@@ -39,28 +34,20 @@ const TimelineFeedback = React.memo(
         <View style={{ flexDirection: 'row' }}>
           {status.reblogs_count > 0 ? (
             <CustomText
-              accessibilityLabel={t(
-                'shared.actionsUsers.reblogged_by.accessibilityLabel',
-                {
-                  count: status.reblogs_count
-                }
-              )}
-              accessibilityHint={t(
-                'shared.actionsUsers.reblogged_by.accessibilityHint'
-              )}
+              accessibilityLabel={t('shared.actionsUsers.reblogged_by.accessibilityLabel', {
+                count: status.reblogs_count
+              })}
+              accessibilityHint={t('shared.actionsUsers.reblogged_by.accessibilityHint')}
               accessibilityRole='button'
               style={[styles.text, { color: colors.blue }]}
-              onPress={() => {
-                analytics('timeline_shared_feedback_press_reblog', {
-                  count: status.reblogs_count
-                })
+              onPress={() =>
                 navigation.push('Tab-Shared-Users', {
                   reference: 'statuses',
                   id: status.id,
                   type: 'reblogged_by',
                   count: status.reblogs_count
                 })
-              }}
+              }
             >
               {t('shared.actionsUsers.reblogged_by.text', {
                 count: status.reblogs_count
@@ -69,28 +56,20 @@ const TimelineFeedback = React.memo(
           ) : null}
           {status.favourites_count > 0 ? (
             <CustomText
-              accessibilityLabel={t(
-                'shared.actionsUsers.favourited_by.accessibilityLabel',
-                {
-                  count: status.reblogs_count
-                }
-              )}
-              accessibilityHint={t(
-                'shared.actionsUsers.favourited_by.accessibilityHint'
-              )}
+              accessibilityLabel={t('shared.actionsUsers.favourited_by.accessibilityLabel', {
+                count: status.reblogs_count
+              })}
+              accessibilityHint={t('shared.actionsUsers.favourited_by.accessibilityHint')}
               accessibilityRole='button'
               style={[styles.text, { color: colors.blue }]}
-              onPress={() => {
-                analytics('timeline_shared_feedback_press_favourite', {
-                  count: status.favourites_count
-                })
+              onPress={() =>
                 navigation.push('Tab-Shared-Users', {
                   reference: 'statuses',
                   id: status.id,
                   type: 'favourited_by',
                   count: status.favourites_count
                 })
-              }}
+              }
             >
               {t('shared.actionsUsers.favourited_by.text', {
                 count: status.favourites_count
@@ -101,23 +80,13 @@ const TimelineFeedback = React.memo(
         <View>
           {data && data.length > 1 ? (
             <CustomText
-              accessibilityLabel={t(
-                'shared.actionsUsers.history.accessibilityLabel',
-                {
-                  count: data.length - 1
-                }
-              )}
-              accessibilityHint={t(
-                'shared.actionsUsers.history.accessibilityHint'
-              )}
+              accessibilityLabel={t('shared.actionsUsers.history.accessibilityLabel', {
+                count: data.length - 1
+              })}
+              accessibilityHint={t('shared.actionsUsers.history.accessibilityHint')}
               accessibilityRole='button'
               style={[styles.text, { marginRight: 0, color: colors.blue }]}
-              onPress={() => {
-                analytics('timeline_shared_feedback_press_history', {
-                  count: data.length - 1
-                })
-                navigation.push('Tab-Shared-History', { id: status.id })
-              }}
+              onPress={() => navigation.push('Tab-Shared-History', { id: status.id })}
             >
               {t('shared.actionsUsers.history.text', {
                 count: data.length - 1
diff --git a/src/components/Timeline/Shared/HeaderConversation.tsx b/src/components/Timeline/Shared/HeaderConversation.tsx
index 00c789f2..1d5f7543 100644
--- a/src/components/Timeline/Shared/HeaderConversation.tsx
+++ b/src/components/Timeline/Shared/HeaderConversation.tsx
@@ -1,15 +1,11 @@
-import analytics from '@components/analytics'
 import Icon from '@components/Icon'
 import { displayMessage } from '@components/Message'
 import { ParseEmojis } from '@components/Parse'
 import CustomText from '@components/Text'
-import {
-  QueryKeyTimeline,
-  useTimelineMutation
-} from '@utils/queryHooks/timeline'
+import { QueryKeyTimeline, useTimelineMutation } from '@utils/queryHooks/timeline'
 import { StyleConstants } from '@utils/styles/constants'
 import { useTheme } from '@utils/styles/ThemeManager'
-import React, { useCallback, useMemo } from 'react'
+import React from 'react'
 import { useTranslation } from 'react-i18next'
 import { Pressable, View } from 'react-native'
 import { useQueryClient } from 'react-query'
@@ -71,27 +67,6 @@ const HeaderConversation = ({ queryKey, conversation }: Props) => {
     }
   })
 
-  const actionOnPress = useCallback(() => {
-    analytics('timeline_conversation_delete_press')
-    mutation.mutate({
-      type: 'deleteItem',
-      source: 'conversations',
-      queryKey,
-      id: conversation.id
-    })
-  }, [])
-
-  const actionChildren = useMemo(
-    () => (
-      <Icon
-        name='Trash'
-        color={colors.secondary}
-        size={StyleConstants.Font.Size.L}
-      />
-    ),
-    []
-  )
-
   return (
     <View style={{ flex: 1, flexDirection: 'row' }}>
       <View style={{ flex: 3 }}>
@@ -116,8 +91,15 @@ const HeaderConversation = ({ queryKey, conversation }: Props) => {
 
       <Pressable
         style={{ flex: 1, flexDirection: 'row', justifyContent: 'center' }}
-        onPress={actionOnPress}
-        children={actionChildren}
+        onPress={() =>
+          mutation.mutate({
+            type: 'deleteItem',
+            source: 'conversations',
+            queryKey,
+            id: conversation.id
+          })
+        }
+        children={<Icon name='Trash' color={colors.secondary} size={StyleConstants.Font.Size.L} />}
       />
     </View>
   )
diff --git a/src/components/Timeline/Shared/HeaderShared/Application.tsx b/src/components/Timeline/Shared/HeaderShared/Application.tsx
index b61043a1..75b5ff68 100644
--- a/src/components/Timeline/Shared/HeaderShared/Application.tsx
+++ b/src/components/Timeline/Shared/HeaderShared/Application.tsx
@@ -1,4 +1,3 @@
-import analytics from '@components/analytics'
 import openLink from '@components/openLink'
 import CustomText from '@components/Text'
 import { StyleConstants } from '@utils/styles/constants'
@@ -20,9 +19,6 @@ const HeaderSharedApplication = React.memo(
         fontStyle='S'
         accessibilityRole='link'
         onPress={async () => {
-          analytics('timeline_shared_header_application_press', {
-            application
-          })
           application.website && (await openLink(application.website))
         }}
         style={{
diff --git a/src/components/Timeline/Shared/Poll.tsx b/src/components/Timeline/Shared/Poll.tsx
index a44c44fd..b7b37d7a 100644
--- a/src/components/Timeline/Shared/Poll.tsx
+++ b/src/components/Timeline/Shared/Poll.tsx
@@ -1,4 +1,3 @@
-import analytics from '@components/analytics'
 import Button from '@components/Button'
 import haptics from '@components/haptics'
 import Icon from '@components/Icon'
@@ -40,9 +39,7 @@ const TimelinePoll: React.FC<Props> = ({
   const { colors, theme } = useTheme()
   const { t, i18n } = useTranslation('componentTimeline')
 
-  const [allOptions, setAllOptions] = useState(
-    new Array(poll.options.length).fill(false)
-  )
+  const [allOptions, setAllOptions] = useState(new Array(poll.options.length).fill(false))
 
   const queryClient = useQueryClient()
   const mutation = useTimelineMutation({
@@ -86,8 +83,7 @@ const TimelinePoll: React.FC<Props> = ({
         return (
           <View style={{ marginRight: StyleConstants.Spacing.S }}>
             <Button
-              onPress={() => {
-                analytics('timeline_shared_vote_vote_press')
+              onPress={() =>
                 mutation.mutate({
                   type: 'updateStatusProperty',
                   queryKey,
@@ -101,7 +97,7 @@ const TimelinePoll: React.FC<Props> = ({
                     options: allOptions
                   }
                 })
-              }}
+              }
               type='text'
               content={t('shared.poll.meta.button.vote')}
               loading={mutation.isLoading}
@@ -113,8 +109,7 @@ const TimelinePoll: React.FC<Props> = ({
         return (
           <View style={{ marginRight: StyleConstants.Spacing.S }}>
             <Button
-              onPress={() => {
-                analytics('timeline_shared_vote_refresh_press')
+              onPress={() =>
                 mutation.mutate({
                   type: 'updateStatusProperty',
                   queryKey,
@@ -127,7 +122,7 @@ const TimelinePoll: React.FC<Props> = ({
                     type: 'refresh'
                   }
                 })
-              }}
+              }
               type='text'
               content={t('shared.poll.meta.button.refresh')}
               loading={mutation.isLoading}
@@ -136,14 +131,7 @@ const TimelinePoll: React.FC<Props> = ({
         )
       }
     }
-  }, [
-    theme,
-    i18n.language,
-    poll.expired,
-    poll.voted,
-    allOptions,
-    mutation.isLoading
-  ])
+  }, [theme, i18n.language, poll.expired, poll.voted, allOptions, mutation.isLoading])
 
   const isSelected = useCallback(
     (index: number): string =>
@@ -154,20 +142,13 @@ const TimelinePoll: React.FC<Props> = ({
   )
 
   const pollBodyDisallow = useMemo(() => {
-    const maxValue = maxBy(
-      poll.options,
-      option => option.votes_count
-    )?.votes_count
+    const maxValue = maxBy(poll.options, option => option.votes_count)?.votes_count
     return poll.options.map((option, index) => (
-      <View
-        key={index}
-        style={{ flex: 1, paddingVertical: StyleConstants.Spacing.S }}
-      >
+      <View key={index} style={{ flex: 1, paddingVertical: StyleConstants.Spacing.S }}>
         <View style={{ flex: 1, flexDirection: 'row' }}>
           <Icon
             style={{
-              paddingTop:
-                StyleConstants.Font.LineHeight.M - StyleConstants.Font.Size.M,
+              paddingTop: StyleConstants.Font.LineHeight.M - StyleConstants.Font.Size.M,
               marginRight: StyleConstants.Spacing.S
             }}
             name={
@@ -176,9 +157,7 @@ const TimelinePoll: React.FC<Props> = ({
               }` as any
             }
             size={StyleConstants.Font.Size.M}
-            color={
-              poll.own_votes?.includes(index) ? colors.blue : colors.disabled
-            }
+            color={poll.own_votes?.includes(index) ? colors.blue : colors.disabled}
           />
           <CustomText style={{ flex: 1 }}>
             <ParseEmojis content={option.title} emojis={poll.emojis} />
@@ -194,11 +173,7 @@ const TimelinePoll: React.FC<Props> = ({
             }}
           >
             {poll.votes_count
-              ? Math.round(
-                  (option.votes_count /
-                    (poll.voters_count || poll.votes_count)) *
-                    100
-                )
+              ? Math.round((option.votes_count / (poll.voters_count || poll.votes_count)) * 100)
               : 0}
             %
           </CustomText>
@@ -213,11 +188,9 @@ const TimelinePoll: React.FC<Props> = ({
             marginTop: StyleConstants.Spacing.XS,
             marginBottom: StyleConstants.Spacing.S,
             width: `${Math.round(
-              (option.votes_count / (poll.voters_count || poll.votes_count)) *
-                100
+              (option.votes_count / (poll.voters_count || poll.votes_count)) * 100
             )}%`,
-            backgroundColor:
-              option.votes_count === maxValue ? colors.blue : colors.disabled
+            backgroundColor: option.votes_count === maxValue ? colors.blue : colors.disabled
           }}
         />
       </View>
@@ -229,21 +202,15 @@ const TimelinePoll: React.FC<Props> = ({
         key={index}
         style={{ flex: 1, paddingVertical: StyleConstants.Spacing.S }}
         onPress={() => {
-          analytics('timeline_shared_vote_option_press')
           !allOptions[index] && haptics('Light')
           if (poll.multiple) {
             setAllOptions(allOptions.map((o, i) => (i === index ? !o : o)))
           } else {
             {
-              const otherOptions =
-                allOptions[index] === false ? false : undefined
+              const otherOptions = allOptions[index] === false ? false : undefined
               setAllOptions(
                 allOptions.map((o, i) =>
-                  i === index
-                    ? !o
-                    : otherOptions !== undefined
-                    ? otherOptions
-                    : o
+                  i === index ? !o : otherOptions !== undefined ? otherOptions : o
                 )
               )
             }
@@ -253,8 +220,7 @@ const TimelinePoll: React.FC<Props> = ({
         <View style={{ flex: 1, flexDirection: 'row' }}>
           <Icon
             style={{
-              paddingTop:
-                StyleConstants.Font.LineHeight.M - StyleConstants.Font.Size.M,
+              paddingTop: StyleConstants.Font.LineHeight.M - StyleConstants.Font.Size.M,
               marginRight: StyleConstants.Spacing.S
             }}
             name={isSelected(index)}
@@ -271,13 +237,9 @@ const TimelinePoll: React.FC<Props> = ({
 
   const pollVoteCounts = () => {
     if (poll.voters_count !== null) {
-      return (
-        t('shared.poll.meta.count.voters', { count: poll.voters_count }) + ' • '
-      )
+      return t('shared.poll.meta.count.voters', { count: poll.voters_count }) + ' • '
     } else if (poll.votes_count !== null) {
-      return (
-        t('shared.poll.meta.count.votes', { count: poll.votes_count }) + ' • '
-      )
+      return t('shared.poll.meta.count.votes', { count: poll.votes_count }) + ' • '
     }
   }
 
@@ -308,10 +270,7 @@ const TimelinePoll: React.FC<Props> = ({
         }}
       >
         {pollButton}
-        <CustomText
-          fontStyle='S'
-          style={{ flexShrink: 1, color: colors.secondary }}
-        >
+        <CustomText fontStyle='S' style={{ flexShrink: 1, color: colors.secondary }}>
           {pollVoteCounts()}
           {pollExpiration()}
         </CustomText>
diff --git a/src/components/Timeline/Shared/Translate.tsx b/src/components/Timeline/Shared/Translate.tsx
index fcabf8a1..152b833a 100644
--- a/src/components/Timeline/Shared/Translate.tsx
+++ b/src/components/Timeline/Shared/Translate.tsx
@@ -1,4 +1,3 @@
-import analytics from '@components/analytics'
 import { ParseHTML } from '@components/Parse'
 import CustomText from '@components/Text'
 import getLanguage from '@helpers/getLanguage'
@@ -85,15 +84,9 @@ const TimelineTranslate = React.memo(
           onPress={() => {
             if (enabled) {
               if (!isSuccess) {
-                analytics('timeline_shared_translate_retry', {
-                  language: detectedLanguage
-                })
                 refetch()
               }
             } else {
-              analytics('timeline_shared_translate', {
-                language: detectedLanguage
-              })
               setEnabled(true)
             }
           }}
diff --git a/src/components/analytics.ts b/src/components/analytics.ts
deleted file mode 100644
index dd205a63..00000000
--- a/src/components/analytics.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import * as Analytics from 'expo-firebase-analytics'
-
-const analytics = (event: string, params?: { [key: string]: any }) => {
-  Analytics.logEvent(event, params).catch(() => {})
-}
-
-export default analytics
diff --git a/src/i18n/en/screens/tabs.json b/src/i18n/en/screens/tabs.json
index ccef3557..53d0f315 100644
--- a/src/i18n/en/screens/tabs.json
+++ b/src/i18n/en/screens/tabs.json
@@ -275,10 +275,6 @@
       "contact": {
         "heading": "Contact tooot"
       },
-      "analytics": {
-        "heading": "Help us improve",
-        "description": "Collecting only non-user relative usage"
-      },
       "version": "Version v{{version}}",
       "instanceVersion": "Mastodon version v{{version}}"
     },
diff --git a/src/screens/Actions/Account.tsx b/src/screens/Actions/Account.tsx
index fc908d55..8071a0ed 100644
--- a/src/screens/Actions/Account.tsx
+++ b/src/screens/Actions/Account.tsx
@@ -1,4 +1,3 @@
-import analytics from '@components/analytics'
 import { MenuContainer, MenuHeader, MenuRow } from '@components/Menu'
 import { displayMessage } from '@components/Message'
 import {
@@ -74,9 +73,6 @@ const ActionsAccount: React.FC<Props> = ({
       <MenuHeader heading={t('shared.header.actions.account.heading')} />
       <MenuRow
         onPress={() => {
-          analytics('timeline_shared_headeractions_account_mute_press', {
-            page: queryKey && queryKey[1].page
-          })
           dismiss()
           mutation.mutate({
             type: 'updateAccountProperty',
@@ -92,9 +88,6 @@ const ActionsAccount: React.FC<Props> = ({
       />
       <MenuRow
         onPress={() => {
-          analytics('timeline_shared_headeractions_account_block_press', {
-            page: queryKey && queryKey[1].page
-          })
           dismiss()
           mutation.mutate({
             type: 'updateAccountProperty',
@@ -110,9 +103,6 @@ const ActionsAccount: React.FC<Props> = ({
       />
       <MenuRow
         onPress={() => {
-          analytics('timeline_shared_headeractions_account_reports_press', {
-            page: queryKey && queryKey[1].page
-          })
           dismiss()
           mutation.mutate({
             type: 'updateAccountProperty',
diff --git a/src/screens/Actions/Domain.tsx b/src/screens/Actions/Domain.tsx
index 80a9ed5f..4354ac91 100644
--- a/src/screens/Actions/Domain.tsx
+++ b/src/screens/Actions/Domain.tsx
@@ -1,12 +1,8 @@
-import analytics from '@components/analytics'
 import MenuContainer from '@components/Menu/Container'
 import MenuHeader from '@components/Menu/Header'
 import MenuRow from '@components/Menu/Row'
 import { displayMessage } from '@components/Message'
-import {
-  QueryKeyTimeline,
-  useTimelineMutation
-} from '@utils/queryHooks/timeline'
+import { QueryKeyTimeline, useTimelineMutation } from '@utils/queryHooks/timeline'
 import { useTheme } from '@utils/styles/ThemeManager'
 import React from 'react'
 import { useTranslation } from 'react-i18next'
@@ -20,12 +16,7 @@ export interface Props {
   dismiss: () => void
 }
 
-const ActionsDomain: React.FC<Props> = ({
-  queryKey,
-  rootQueryKey,
-  domain,
-  dismiss
-}) => {
+const ActionsDomain: React.FC<Props> = ({ queryKey, rootQueryKey, domain, dismiss }) => {
   const { theme } = useTheme()
   const { t } = useTranslation('componentTimeline')
   const queryClient = useQueryClient()
@@ -47,10 +38,7 @@ const ActionsDomain: React.FC<Props> = ({
     <MenuContainer>
       <MenuHeader heading={t(`shared.header.actions.domain.heading`)} />
       <MenuRow
-        onPress={() => {
-          analytics('timeline_shared_headeractions_domain_block_press', {
-            page: queryKey[1].page
-          })
+        onPress={() =>
           Alert.alert(
             t('shared.header.actions.domain.alert.title', { domain }),
             t('shared.header.actions.domain.alert.message'),
@@ -63,12 +51,6 @@ const ActionsDomain: React.FC<Props> = ({
                 text: t('shared.header.actions.domain.alert.buttons.confirm'),
                 style: 'destructive',
                 onPress: () => {
-                  analytics(
-                    'timeline_shared_headeractions_domain_block_confirm',
-                    {
-                      page: queryKey && queryKey[1].page
-                    }
-                  )
                   dismiss()
                   mutation.mutate({
                     type: 'domainBlock',
@@ -79,7 +61,7 @@ const ActionsDomain: React.FC<Props> = ({
               }
             ]
           )
-        }}
+        }
         iconFront='CloudOff'
         title={t(`shared.header.actions.domain.block.button`, {
           domain
diff --git a/src/screens/Actions/Share.tsx b/src/screens/Actions/Share.tsx
index 9bad4c3e..6a8f7308 100644
--- a/src/screens/Actions/Share.tsx
+++ b/src/screens/Actions/Share.tsx
@@ -1,4 +1,3 @@
-import analytics from '@components/analytics'
 import MenuContainer from '@components/Menu/Container'
 import MenuHeader from '@components/Menu/Header'
 import MenuRow from '@components/Menu/Row'
@@ -22,7 +21,6 @@ const ActionsShare: React.FC<Props> = ({ type, url, dismiss }) => {
         iconFront='Share2'
         title={t(`shared.header.actions.share.${type}.button`)}
         onPress={async () => {
-          analytics('timeline_shared_headeractions_share_press')
           switch (Platform.OS) {
             case 'ios':
               await Share.share({
diff --git a/src/screens/Actions/Status.tsx b/src/screens/Actions/Status.tsx
index dcffd6bd..9dfce233 100644
--- a/src/screens/Actions/Status.tsx
+++ b/src/screens/Actions/Status.tsx
@@ -8,7 +8,6 @@ import {
   QueryKeyTimeline,
   useTimelineMutation
 } from '@utils/queryHooks/timeline'
-import analytics from '@components/analytics'
 import { displayMessage } from '@components/Message'
 import { useTheme } from '@utils/styles/ThemeManager'
 import apiInstance from '@api/instance'
@@ -69,9 +68,6 @@ const ActionsStatus: React.FC<Props> = ({
       {canEditPost ? (
         <MenuRow
           onPress={async () => {
-            analytics('timeline_shared_headeractions_status_edit_press', {
-              page: queryKey && queryKey[1].page
-            })
             let replyToStatus: Mastodon.Status | undefined = undefined
             if (status.in_reply_to_id) {
               replyToStatus = await apiInstance<Mastodon.Status>({
@@ -107,9 +103,6 @@ const ActionsStatus: React.FC<Props> = ({
       ) : null}
       <MenuRow
         onPress={() => {
-          analytics('timeline_shared_headeractions_status_delete_press', {
-            page: queryKey && queryKey[1].page
-          })
           Alert.alert(
             t('shared.header.actions.status.delete.alert.title'),
             t('shared.header.actions.status.delete.alert.message'),
@@ -126,12 +119,6 @@ const ActionsStatus: React.FC<Props> = ({
                 ),
                 style: 'destructive',
                 onPress: async () => {
-                  analytics(
-                    'timeline_shared_headeractions_status_delete_confirm',
-                    {
-                      page: queryKey && queryKey[1].page
-                    }
-                  )
                   dismiss()
                   mutation.mutate({
                     type: 'deleteItem',
@@ -150,9 +137,6 @@ const ActionsStatus: React.FC<Props> = ({
       />
       <MenuRow
         onPress={() => {
-          analytics('timeline_shared_headeractions_status_deleteedit_press', {
-            page: queryKey && queryKey[1].page
-          })
           Alert.alert(
             t('shared.header.actions.status.deleteEdit.alert.title'),
             t('shared.header.actions.status.deleteEdit.alert.message'),
@@ -169,12 +153,6 @@ const ActionsStatus: React.FC<Props> = ({
                 ),
                 style: 'destructive',
                 onPress: async () => {
-                  analytics(
-                    'timeline_shared_headeractions_status_deleteedit_confirm',
-                    {
-                      page: queryKey && queryKey[1].page
-                    }
-                  )
                   let replyToStatus: Mastodon.Status | undefined = undefined
                   if (status.in_reply_to_id) {
                     replyToStatus = await apiInstance<Mastodon.Status>({
@@ -208,9 +186,6 @@ const ActionsStatus: React.FC<Props> = ({
       />
       <MenuRow
         onPress={() => {
-          analytics('timeline_shared_headeractions_status_mute_press', {
-            page: queryKey && queryKey[1].page
-          })
           dismiss()
           mutation.mutate({
             type: 'updateStatusProperty',
@@ -236,9 +211,6 @@ const ActionsStatus: React.FC<Props> = ({
       {(status.visibility === 'public' || status.visibility === 'unlisted') && (
         <MenuRow
           onPress={() => {
-            analytics('timeline_shared_headeractions_status_pin_press', {
-              page: queryKey && queryKey[1].page
-            })
             dismiss()
             mutation.mutate({
               type: 'updateStatusProperty',
diff --git a/src/screens/Announcements.tsx b/src/screens/Announcements.tsx
index 882a56e8..01afb295 100644
--- a/src/screens/Announcements.tsx
+++ b/src/screens/Announcements.tsx
@@ -1,4 +1,3 @@
-import analytics from '@components/analytics'
 import Button from '@components/Button'
 import haptics from '@components/haptics'
 import { ParseHTML } from '@components/Parse'
@@ -7,10 +6,7 @@ import CustomText from '@components/Text'
 import { BlurView } from '@react-native-community/blur'
 import { useAccessibility } from '@utils/accessibility/AccessibilityManager'
 import { RootStackScreenProps } from '@utils/navigation/navigators'
-import {
-  useAnnouncementMutation,
-  useAnnouncementQuery
-} from '@utils/queryHooks/announcement'
+import { useAnnouncementMutation, useAnnouncementQuery } from '@utils/queryHooks/announcement'
 import { StyleConstants } from '@utils/styles/constants'
 import { useTheme } from '@utils/styles/ThemeManager'
 import React, { useCallback, useEffect, useState } from 'react'
@@ -29,9 +25,7 @@ import FastImage from 'react-native-fast-image'
 import { FlatList, ScrollView } from 'react-native-gesture-handler'
 import { SafeAreaView } from 'react-native-safe-area-context'
 
-const ScreenAnnouncements: React.FC<
-  RootStackScreenProps<'Screen-Announcements'>
-> = ({
+const ScreenAnnouncements: React.FC<RootStackScreenProps<'Screen-Announcements'>> = ({
   route: {
     params: { showAll = false }
   },
@@ -46,9 +40,7 @@ const ScreenAnnouncements: React.FC<
     showAll,
     options: {
       select: announcements =>
-        announcements.filter(announcement =>
-          showAll ? announcement : !announcement.read
-        )
+        announcements.filter(announcement => (showAll ? announcement : !announcement.read))
     }
   })
   const mutation = useAnnouncementMutation({
@@ -75,10 +67,7 @@ const ScreenAnnouncements: React.FC<
           justifyContent: 'center'
         }}
       >
-        <Pressable
-          style={StyleSheet.absoluteFillObject}
-          onPress={() => navigation.goBack()}
-        />
+        <Pressable style={StyleSheet.absoluteFillObject} onPress={() => navigation.goBack()} />
         <View
           style={{
             flexShrink: 1,
@@ -136,31 +125,22 @@ const ScreenAnnouncements: React.FC<
                     marginRight: StyleConstants.Spacing.M,
                     borderRadius: 6,
                     flexDirection: 'row',
-                    borderColor: reaction.me
-                      ? colors.disabled
-                      : colors.primaryDefault,
-                    backgroundColor: reaction.me
-                      ? colors.disabled
-                      : colors.backgroundDefault
+                    borderColor: reaction.me ? colors.disabled : colors.primaryDefault,
+                    backgroundColor: reaction.me ? colors.disabled : colors.backgroundDefault
                   }}
-                  onPress={() => {
-                    analytics('announcement_reaction_press', {
-                      current: reaction.me
-                    })
+                  onPress={() =>
                     mutation.mutate({
                       id: item.id,
                       type: 'reaction',
                       name: reaction.name,
                       me: reaction.me
                     })
-                  }}
+                  }
                 >
                   {reaction.url ? (
                     <FastImage
                       source={{
-                        uri: reduceMotionEnabled
-                          ? reaction.static_url
-                          : reaction.url
+                        uri: reduceMotionEnabled ? reaction.static_url : reaction.url
                       }}
                       style={{
                         width: StyleConstants.Font.LineHeight.M + 3,
@@ -183,27 +163,14 @@ const ScreenAnnouncements: React.FC<
                   ) : null}
                 </Pressable>
               ))}
-              {/* <Pressable
-                style={[styles.reaction, { borderColor: colors.primaryDefault }]}
-                onPress={() => invisibleTextInputRef.current?.focus()}
-              >
-                <Icon
-                  name='Plus'
-                  size={StyleConstants.Font.Size.M}
-                  color={colors.primaryDefault}
-                />
-              </Pressable> */}
             </View>
           ) : null}
           <Button
             type='text'
-            content={
-              item.read ? t('content.button.read') : t('content.button.unread')
-            }
+            content={item.read ? t('content.button.read') : t('content.button.unread')}
             loading={mutation.isLoading}
             disabled={item.read}
             onPress={() => {
-              analytics('announcement_read_press')
               !item.read &&
                 mutation.mutate({
                   id: item.id,
@@ -279,10 +246,8 @@ const ScreenAnnouncements: React.FC<
                     borderRadius: StyleConstants.Spacing.S,
                     borderWidth: 1,
                     borderColor: colors.primaryDefault,
-                    backgroundColor:
-                      i === index ? colors.primaryDefault : undefined,
-                    marginLeft:
-                      i === query.data.length ? 0 : StyleConstants.Spacing.S
+                    backgroundColor: i === index ? colors.primaryDefault : undefined,
+                    marginLeft: i === query.data.length ? 0 : StyleConstants.Spacing.S
                   }}
                 />
               ))}
@@ -292,9 +257,7 @@ const ScreenAnnouncements: React.FC<
       </SafeAreaView>
     </BlurView>
   ) : (
-    <SafeAreaView
-      style={{ flex: 1, backgroundColor: colors.backgroundDefault }}
-    >
+    <SafeAreaView style={{ flex: 1, backgroundColor: colors.backgroundDefault }}>
       <FlatList
         horizontal
         data={query.data}
@@ -323,10 +286,8 @@ const ScreenAnnouncements: React.FC<
                   borderRadius: StyleConstants.Spacing.S,
                   borderWidth: 1,
                   borderColor: colors.primaryDefault,
-                  backgroundColor:
-                    i === index ? colors.primaryDefault : undefined,
-                  marginLeft:
-                    i === query.data.length ? 0 : StyleConstants.Spacing.S
+                  backgroundColor: i === index ? colors.primaryDefault : undefined,
+                  marginLeft: i === query.data.length ? 0 : StyleConstants.Spacing.S
                 }}
               />
             ))}
diff --git a/src/screens/Compose.tsx b/src/screens/Compose.tsx
index 5a423e1f..7d17bc82 100644
--- a/src/screens/Compose.tsx
+++ b/src/screens/Compose.tsx
@@ -1,4 +1,3 @@
-import analytics from '@components/analytics'
 import { ComponentEmojis } from '@components/Emojis'
 import { EmojisState } from '@components/Emojis/helpers/EmojisContext'
 import { HeaderLeft, HeaderRight } from '@components/Header'
@@ -209,19 +208,15 @@ const ScreenCompose: React.FC<RootStackScreenProps<'Screen-Compose'>> = ({
         type='text'
         content={t('heading.left.button')}
         onPress={() => {
-          analytics('compose_header_back_press')
           if (!composeState.dirty) {
-            analytics('compose_header_back_empty')
             navigation.goBack()
             return
           } else {
-            analytics('compose_header_back_state_occupied')
             Alert.alert(t('heading.left.alert.title'), undefined, [
               {
                 text: t('heading.left.alert.buttons.delete'),
                 style: 'destructive',
                 onPress: () => {
-                  analytics('compose_header_back_occupied_save')
                   removeDraft()
                   navigation.goBack()
                 }
@@ -229,17 +224,13 @@ const ScreenCompose: React.FC<RootStackScreenProps<'Screen-Compose'>> = ({
               {
                 text: t('heading.left.alert.buttons.save'),
                 onPress: () => {
-                  analytics('compose_header_back_occupied_delete')
                   saveDraft()
                   navigation.goBack()
                 }
               },
               {
                 text: t('heading.left.alert.buttons.cancel'),
-                style: 'cancel',
-                onPress: () => {
-                  analytics('compose_header_back_occupied_cancel')
-                }
+                style: 'cancel'
               }
             ])
           }
@@ -272,7 +263,6 @@ const ScreenCompose: React.FC<RootStackScreenProps<'Screen-Compose'>> = ({
             : t('heading.right.button.default')
         }
         onPress={() => {
-          analytics('compose_header_post_press')
           composeDispatch({ type: 'posting', payload: true })
 
           composePost(params, composeState)
diff --git a/src/screens/Compose/EditAttachment/Submit.tsx b/src/screens/Compose/EditAttachment/Submit.tsx
index 932b28d4..c4ee0e39 100644
--- a/src/screens/Compose/EditAttachment/Submit.tsx
+++ b/src/screens/Compose/EditAttachment/Submit.tsx
@@ -1,5 +1,4 @@
 import apiInstance from '@api/instance'
-import analytics from '@components/analytics'
 import haptics from '@components/haptics'
 import { HeaderRight } from '@components/Header'
 import { useNavigation } from '@react-navigation/native'
@@ -29,8 +28,6 @@ const ComposeEditAttachmentSubmit: React.FC<Props> = ({ index }) => {
       content='Save'
       loading={isSubmitting}
       onPress={() => {
-        analytics('editattachment_confirm_press')
-
         setIsSubmitting(true)
         const formData = new FormData()
         if (theAttachment.description) {
diff --git a/src/screens/Compose/Root/Actions.tsx b/src/screens/Compose/Root/Actions.tsx
index 2bc83acc..5ab0945f 100644
--- a/src/screens/Compose/Root/Actions.tsx
+++ b/src/screens/Compose/Root/Actions.tsx
@@ -1,4 +1,3 @@
-import analytics from '@components/analytics'
 import { emojis } from '@components/Emojis'
 import EmojisContext from '@components/Emojis/helpers/EmojisContext'
 import Icon from '@components/Icon'
@@ -36,9 +35,6 @@ const ComposeActions: React.FC = () => {
     if (composeState.poll.active) return
 
     if (composeState.attachments.uploads.length < instanceConfigurationStatusMaxAttachments) {
-      analytics('compose_actions_attachment_press', {
-        count: composeState.attachments.uploads.length
-      })
       return chooseAndUploadAttachment({
         composeDispatch,
         showActionSheetWithOptions
@@ -57,9 +53,6 @@ const ComposeActions: React.FC = () => {
   }, [composeState.poll.active, composeState.attachments.uploads])
   const pollOnPress = () => {
     if (!composeState.attachments.uploads.length) {
-      analytics('compose_actions_poll_press', {
-        current: composeState.poll.active
-      })
       layoutAnimation()
       composeDispatch({
         type: 'poll',
@@ -101,31 +94,15 @@ const ComposeActions: React.FC = () => {
         buttonIndex => {
           switch (buttonIndex) {
             case 0:
-              analytics('compose_actions_visibility_press', {
-                current: composeState.visibility,
-                new: 'public'
-              })
               composeDispatch({ type: 'visibility', payload: 'public' })
               break
             case 1:
-              analytics('compose_actions_visibility_press', {
-                current: composeState.visibility,
-                new: 'unlisted'
-              })
               composeDispatch({ type: 'visibility', payload: 'unlisted' })
               break
             case 2:
-              analytics('compose_actions_visibility_press', {
-                current: composeState.visibility,
-                new: 'private'
-              })
               composeDispatch({ type: 'visibility', payload: 'private' })
               break
             case 3:
-              analytics('compose_actions_visibility_press', {
-                current: composeState.visibility,
-                new: 'direct'
-              })
               composeDispatch({ type: 'visibility', payload: 'direct' })
               break
           }
@@ -135,9 +112,6 @@ const ComposeActions: React.FC = () => {
   }
 
   const spoilerOnPress = () => {
-    analytics('compose_actions_spoiler_press', {
-      current: composeState.spoiler.active
-    })
     if (composeState.spoiler.active) {
       composeState.textInputFocus.refs.text.current?.focus()
     }
@@ -159,9 +133,6 @@ const ComposeActions: React.FC = () => {
     }
   }, [emojis.current?.length, emojisState.targetIndex])
   const emojiOnPress = () => {
-    analytics('compose_actions_emojis_press', {
-      current: emojisState.targetIndex !== -1
-    })
     if (emojisState.targetIndex === -1) {
       Keyboard.dismiss()
       const focusedPropsIndex = emojisState.inputProps?.findIndex(props => props.isFocused.current)
diff --git a/src/screens/Compose/Root/Footer/Attachments.tsx b/src/screens/Compose/Root/Footer/Attachments.tsx
index da5c7496..ec71b0a5 100644
--- a/src/screens/Compose/Root/Footer/Attachments.tsx
+++ b/src/screens/Compose/Root/Footer/Attachments.tsx
@@ -1,4 +1,3 @@
-import analytics from '@components/analytics'
 import Button from '@components/Button'
 import haptics from '@components/haptics'
 import Icon from '@components/Icon'
@@ -9,14 +8,7 @@ import { getInstanceConfigurationStatusMaxAttachments } from '@utils/slices/inst
 import { StyleConstants } from '@utils/styles/constants'
 import layoutAnimation from '@utils/styles/layoutAnimation'
 import { useTheme } from '@utils/styles/ThemeManager'
-import React, {
-  RefObject,
-  useCallback,
-  useContext,
-  useEffect,
-  useMemo,
-  useRef
-} from 'react'
+import React, { RefObject, useCallback, useContext, useEffect, useMemo, useRef } from 'react'
 import { useTranslation } from 'react-i18next'
 import { FlatList, Pressable, StyleSheet, View } from 'react-native'
 import { Circle } from 'react-native-animated-spinkit'
@@ -39,41 +31,29 @@ const ComposeAttachments: React.FC<Props> = ({ accessibleRefAttachments }) => {
   const { colors } = useTheme()
   const navigation = useNavigation<any>()
 
-  const maxAttachments = useSelector(
-    getInstanceConfigurationStatusMaxAttachments,
-    () => true
-  )
+  const maxAttachments = useSelector(getInstanceConfigurationStatusMaxAttachments, () => true)
 
   const flatListRef = useRef<FlatList>(null)
 
-  const sensitiveOnPress = useCallback(() => {
-    analytics('compose_attachment_sensitive_press', {
-      current: composeState.attachments.sensitive
-    })
-    composeDispatch({
-      type: 'attachments/sensitive',
-      payload: { sensitive: !composeState.attachments.sensitive }
-    })
-  }, [composeState.attachments.sensitive])
+  const sensitiveOnPress = useCallback(
+    () =>
+      composeDispatch({
+        type: 'attachments/sensitive',
+        payload: { sensitive: !composeState.attachments.sensitive }
+      }),
+    [composeState.attachments.sensitive]
+  )
 
   const calculateWidth = useCallback((item: ExtendedAttachment) => {
     if (item.local) {
-      return (
-        ((item.local.width || 100) / (item.local.height || 100)) *
-        DEFAULT_HEIGHT
-      )
+      return ((item.local.width || 100) / (item.local.height || 100)) * DEFAULT_HEIGHT
     } else {
       if (item.remote) {
         if (item.remote.meta.original.aspect) {
           return item.remote.meta.original.aspect * DEFAULT_HEIGHT
-        } else if (
-          item.remote.meta.original.width &&
-          item.remote.meta.original.height
-        ) {
+        } else if (item.remote.meta.original.width && item.remote.meta.original.height) {
           return (
-            (item.remote.meta.original.width /
-              item.remote.meta.original.height) *
-            DEFAULT_HEIGHT
+            (item.remote.meta.original.width / item.remote.meta.original.height) * DEFAULT_HEIGHT
           )
         } else {
           return DEFAULT_HEIGHT
@@ -85,19 +65,17 @@ const ComposeAttachments: React.FC<Props> = ({ accessibleRefAttachments }) => {
   }, [])
 
   const snapToOffsets = useMemo(() => {
-    const attachmentsOffsets = composeState.attachments.uploads.map(
-      (_, index) => {
-        let currentOffset = 0
-        Array.from(Array(index).keys()).map(
-          i =>
-            (currentOffset =
-              currentOffset +
-              calculateWidth(composeState.attachments.uploads[i]) +
-              StyleConstants.Spacing.Global.PagePadding)
-        )
-        return currentOffset
-      }
-    )
+    const attachmentsOffsets = composeState.attachments.uploads.map((_, index) => {
+      let currentOffset = 0
+      Array.from(Array(index).keys()).map(
+        i =>
+          (currentOffset =
+            currentOffset +
+            calculateWidth(composeState.attachments.uploads[i]) +
+            StyleConstants.Spacing.Global.PagePadding)
+      )
+      return currentOffset
+    })
     return attachmentsOffsets.length < 4
       ? [
           ...attachmentsOffsets,
@@ -109,14 +87,9 @@ const ComposeAttachments: React.FC<Props> = ({ accessibleRefAttachments }) => {
   }, [composeState.attachments.uploads.length])
   let prevOffsets = useRef<number[]>()
   useEffect(() => {
-    if (
-      snapToOffsets.length >
-      (prevOffsets.current ? prevOffsets.current.length : 0)
-    ) {
+    if (snapToOffsets.length > (prevOffsets.current ? prevOffsets.current.length : 0)) {
       flatListRef.current?.scrollToOffset({
-        offset:
-          snapToOffsets[snapToOffsets.length - 2] +
-          snapToOffsets[snapToOffsets.length - 1]
+        offset: snapToOffsets[snapToOffsets.length - 2] + snapToOffsets[snapToOffsets.length - 1]
       })
     }
     prevOffsets.current = snapToOffsets
@@ -168,10 +141,7 @@ const ComposeAttachments: React.FC<Props> = ({ accessibleRefAttachments }) => {
                 backgroundColor: colors.backgroundOverlayInvert
               }}
             >
-              <Circle
-                size={StyleConstants.Font.Size.L}
-                color={colors.primaryOverlay}
-              />
+              <Circle size={StyleConstants.Font.Size.L} color={colors.primaryOverlay} />
             </View>
           ) : (
             <View
@@ -184,17 +154,15 @@ const ComposeAttachments: React.FC<Props> = ({ accessibleRefAttachments }) => {
               }}
             >
               <Button
-                accessibilityLabel={t(
-                  'content.root.footer.attachments.remove.accessibilityLabel',
-                  { attachment: index + 1 }
-                )}
+                accessibilityLabel={t('content.root.footer.attachments.remove.accessibilityLabel', {
+                  attachment: index + 1
+                })}
                 type='icon'
                 content='X'
                 spacing='M'
                 round
                 overlay
                 onPress={() => {
-                  analytics('compose_attachment_delete')
                   layoutAnimation()
                   composeDispatch({
                     type: 'attachment/delete',
@@ -204,17 +172,15 @@ const ComposeAttachments: React.FC<Props> = ({ accessibleRefAttachments }) => {
                 }}
               />
               <Button
-                accessibilityLabel={t(
-                  'content.root.footer.attachments.edit.accessibilityLabel',
-                  { attachment: index + 1 }
-                )}
+                accessibilityLabel={t('content.root.footer.attachments.edit.accessibilityLabel', {
+                  attachment: index + 1
+                })}
                 type='icon'
                 content='Edit'
                 spacing='M'
                 round
                 overlay
                 onPress={() => {
-                  analytics('compose_attachment_edit')
                   navigation.navigate('Screen-Compose-EditAttachment', {
                     index
                   })
@@ -232,9 +198,7 @@ const ComposeAttachments: React.FC<Props> = ({ accessibleRefAttachments }) => {
     () => (
       <Pressable
         accessible
-        accessibilityLabel={t(
-          'content.root.footer.attachments.upload.accessibilityLabel'
-        )}
+        accessibilityLabel={t('content.root.footer.attachments.upload.accessibilityLabel')}
         style={{
           height: DEFAULT_HEIGHT,
           marginLeft: StyleConstants.Spacing.Global.PagePadding,
@@ -244,7 +208,6 @@ const ComposeAttachments: React.FC<Props> = ({ accessibleRefAttachments }) => {
           backgroundColor: colors.backgroundOverlayInvert
         }}
         onPress={async () => {
-          analytics('compose_attachment_add_container_press')
           await chooseAndUploadAttachment({
             composeDispatch,
             showActionSheetWithOptions
@@ -258,7 +221,6 @@ const ComposeAttachments: React.FC<Props> = ({ accessibleRefAttachments }) => {
           round
           overlay
           onPress={async () => {
-            analytics('compose_attachment_add_button_press')
             await chooseAndUploadAttachment({
               composeDispatch,
               showActionSheetWithOptions
@@ -266,16 +228,8 @@ const ComposeAttachments: React.FC<Props> = ({ accessibleRefAttachments }) => {
           }}
           style={{
             position: 'absolute',
-            top:
-              (DEFAULT_HEIGHT -
-                StyleConstants.Spacing.M * 2 -
-                StyleConstants.Font.Size.M) /
-              2,
-            left:
-              (DEFAULT_HEIGHT -
-                StyleConstants.Spacing.M * 2 -
-                StyleConstants.Font.Size.M) /
-              2
+            top: (DEFAULT_HEIGHT - StyleConstants.Spacing.M * 2 - StyleConstants.Font.Size.M) / 2,
+            left: (DEFAULT_HEIGHT - StyleConstants.Spacing.M * 2 - StyleConstants.Font.Size.M) / 2
           }}
         />
       </Pressable>
@@ -327,13 +281,9 @@ const ComposeAttachments: React.FC<Props> = ({ accessibleRefAttachments }) => {
         keyboardShouldPersistTaps='always'
         showsHorizontalScrollIndicator={false}
         data={composeState.attachments.uploads}
-        keyExtractor={item =>
-          item.local?.uri || item.remote?.url || Math.random().toString()
-        }
+        keyExtractor={item => item.local?.uri || item.remote?.url || Math.random().toString()}
         ListFooterComponent={
-          composeState.attachments.uploads.length < maxAttachments
-            ? listFooter
-            : null
+          composeState.attachments.uploads.length < maxAttachments ? listFooter : null
         }
       />
     </View>
diff --git a/src/screens/Compose/Root/Footer/Poll.tsx b/src/screens/Compose/Root/Footer/Poll.tsx
index 3899e6fa..ec72d5e4 100644
--- a/src/screens/Compose/Root/Footer/Poll.tsx
+++ b/src/screens/Compose/Root/Footer/Poll.tsx
@@ -1,4 +1,3 @@
-import analytics from '@components/analytics'
 import Button from '@components/Button'
 import Icon from '@components/Icon'
 import { MenuRow } from '@components/Menu'
@@ -134,7 +133,6 @@ const ComposePoll: React.FC = () => {
                 )
               })}
           onPress={() => {
-            analytics('compose_poll_reduce_press')
             total > 2 &&
               composeDispatch({
                 type: 'poll',
@@ -169,7 +167,6 @@ const ComposePoll: React.FC = () => {
                 )
               })}
           onPress={() => {
-            analytics('compose_poll_increase_press')
             total < MAX_OPTIONS &&
               composeDispatch({
                 type: 'poll',
@@ -205,10 +202,6 @@ const ComposePoll: React.FC = () => {
               },
               index => {
                 if (index && index < 2) {
-                  analytics('compose_poll_expiration_press', {
-                    current: multiple,
-                    new: index === 1
-                  })
                   composeDispatch({
                     type: 'poll',
                     payload: { multiple: index === 1 }
@@ -249,10 +242,6 @@ const ComposePoll: React.FC = () => {
               },
               index => {
                 if (index !== undefined && index < expirations.length) {
-                  analytics('compose_poll_expiration_press', {
-                    current: expire,
-                    new: expirations[index]
-                  })
                   composeDispatch({
                     type: 'poll',
                     // @ts-ignore
diff --git a/src/screens/Compose/Root/Suggestion.tsx b/src/screens/Compose/Root/Suggestion.tsx
index 8f02b8b5..2f5155e2 100644
--- a/src/screens/Compose/Root/Suggestion.tsx
+++ b/src/screens/Compose/Root/Suggestion.tsx
@@ -1,5 +1,4 @@
 import ComponentAccount from '@components/Account'
-import analytics from '@components/analytics'
 import haptics from '@components/haptics'
 import ComponentHashtag from '@components/Hashtag'
 import React, { useContext, useEffect } from 'react'
@@ -18,9 +17,6 @@ const ComposeRootSuggestion: React.FC<Props> = ({ item }) => {
   }, [composeState.text.raw.length])
 
   const onPress = () => {
-    analytics('compose_suggestion_press', {
-      type: item.acct ? 'account' : 'hashtag'
-    })
     const focusedInput = composeState.textInputFocus.current
     const updatedText = (): string => {
       const main = item.acct ? `@${item.acct}` : `#${item.name}`
@@ -48,7 +44,7 @@ const ComposeRootSuggestion: React.FC<Props> = ({ item }) => {
   }
 
   return item.acct ? (
-    <ComponentAccount account={item} onPress={onPress} origin='suggestion' />
+    <ComponentAccount account={item} onPress={onPress} />
   ) : (
     <ComponentHashtag hashtag={item} onPress={onPress} origin='suggestion' />
   )
diff --git a/src/screens/ImagesViewer.tsx b/src/screens/ImagesViewer.tsx
index f9d3b095..72c29015 100644
--- a/src/screens/ImagesViewer.tsx
+++ b/src/screens/ImagesViewer.tsx
@@ -1,4 +1,3 @@
-import analytics from '@components/analytics'
 import GracefullyImage from '@components/GracefullyImage'
 import { HeaderCenter, HeaderLeft, HeaderRight } from '@components/Header'
 import { useActionSheet } from '@expo/react-native-action-sheet'
@@ -49,7 +48,6 @@ const ScreenImagesViewer = ({
 
   const { showActionSheetWithOptions } = useActionSheet()
   const onPress = useCallback(() => {
-    analytics('imageviewer_more_press')
     showActionSheetWithOptions(
       {
         options: [
@@ -63,11 +61,9 @@ const ScreenImagesViewer = ({
       async buttonIndex => {
         switch (buttonIndex) {
           case 0:
-            analytics('imageviewer_more_save_press')
             saveImage({ theme, image: imageUrls[currentIndex] })
             break
           case 1:
-            analytics('imageviewer_more_share_press')
             switch (Platform.OS) {
               case 'ios':
                 await Share.share({ url: imageUrls[currentIndex].url })
@@ -179,7 +175,6 @@ const ScreenImagesViewer = ({
       </View>
       <LongPressGestureHandler
         onEnded={() => {
-          analytics('imageviewer_more_press')
           showActionSheetWithOptions(
             {
               options: [
@@ -193,11 +188,9 @@ const ScreenImagesViewer = ({
             async buttonIndex => {
               switch (buttonIndex) {
                 case 0:
-                  analytics('imageviewer_more_save_press')
                   saveImage({ theme, image: imageUrls[currentIndex] })
                   break
                 case 1:
-                  analytics('imageviewer_more_share_press')
                   switch (Platform.OS) {
                     case 'ios':
                       await Share.share({ url: imageUrls[currentIndex].url })
diff --git a/src/screens/Tabs/Local.tsx b/src/screens/Tabs/Local.tsx
index c5d5ac17..f456b084 100644
--- a/src/screens/Tabs/Local.tsx
+++ b/src/screens/Tabs/Local.tsx
@@ -1,4 +1,3 @@
-import analytics from '@components/analytics'
 import { HeaderCenter, HeaderRight } from '@components/Header'
 import Timeline from '@components/Timeline'
 import TimelineDefault from '@components/Timeline/Default'
@@ -76,13 +75,12 @@ const TabLocal = React.memo(
                 accessibilityLabel={t('common.search.accessibilityLabel')}
                 accessibilityHint={t('common.search.accessibilityHint')}
                 content='Search'
-                onPress={() => {
-                  analytics('search_tap', { page: 'Local' })
+                onPress={() =>
                   navigation.navigate('Tab-Local', {
                     screen: 'Tab-Shared-Search',
                     params: { text: undefined }
                   })
-                }}
+                }
               />
             )
           }}
diff --git a/src/screens/Tabs/Me/Profile/Root.tsx b/src/screens/Tabs/Me/Profile/Root.tsx
index 9fc5466a..10d43dd8 100644
--- a/src/screens/Tabs/Me/Profile/Root.tsx
+++ b/src/screens/Tabs/Me/Profile/Root.tsx
@@ -1,4 +1,3 @@
-import analytics from '@components/analytics'
 import { MenuContainer, MenuRow } from '@components/Menu'
 import { useActionSheet } from '@expo/react-native-action-sheet'
 import { useAppDispatch } from '@root/store'
@@ -44,18 +43,12 @@ const TabMeProfileRoot: React.FC<
           case 0:
           case 1:
           case 2:
-            const indexVisibilityMapping = [
+            const indexVisibilityMapping = ['public', 'unlisted', 'private'] as [
               'public',
               'unlisted',
               'private'
-            ] as ['public', 'unlisted', 'private']
+            ]
             if (data?.source.privacy !== indexVisibilityMapping[buttonIndex]) {
-              analytics('me_profile_visibility', {
-                current: t(
-                  `me.profile.root.visibility.options.${data?.source.privacy}`
-                ),
-                new: indexVisibilityMapping[buttonIndex]
-              })
               mutateAsync({
                 theme,
                 messageRef,
@@ -75,10 +68,6 @@ const TabMeProfileRoot: React.FC<
   }, [theme, data?.source?.privacy])
 
   const onPressSensitive = useCallback(() => {
-    analytics('me_profile_sensitive', {
-      current: data?.source.sensitive,
-      new: data?.source.sensitive === undefined ? true : !data.source.sensitive
-    })
     mutateAsync({
       theme,
       messageRef,
@@ -93,10 +82,6 @@ const TabMeProfileRoot: React.FC<
   }, [data?.source.sensitive])
 
   const onPressLock = useCallback(() => {
-    analytics('me_profile_lock', {
-      current: data?.locked,
-      new: data?.locked === undefined ? true : !data.locked
-    })
     mutateAsync({
       theme,
       messageRef,
@@ -111,10 +96,6 @@ const TabMeProfileRoot: React.FC<
   }, [theme, data?.locked])
 
   const onPressBot = useCallback(() => {
-    analytics('me_profile_bot', {
-      current: data?.bot,
-      new: data?.bot === undefined ? true : !data.bot
-    })
     mutateAsync({
       theme,
       messageRef,
diff --git a/src/screens/Tabs/Me/Push.tsx b/src/screens/Tabs/Me/Push.tsx
index 9e739527..3e75454b 100644
--- a/src/screens/Tabs/Me/Push.tsx
+++ b/src/screens/Tabs/Me/Push.tsx
@@ -1,4 +1,3 @@
-import analytics from '@components/analytics'
 import Button from '@components/Button'
 import Icon from '@components/Icon'
 import { MenuContainer, MenuRow } from '@components/Menu'
@@ -28,10 +27,7 @@ import { useSelector } from 'react-redux'
 const TabMePush: React.FC = () => {
   const { colors } = useTheme()
   const { t } = useTranslation('screenTabs')
-  const instanceAccount = useSelector(
-    getInstanceAccount,
-    (prev, next) => prev?.acct === next?.acct
-  )
+  const instanceAccount = useSelector(getInstanceAccount, (prev, next) => prev?.acct === next?.acct)
   const instanceUri = useSelector(getInstanceUri)
 
   const dispatch = useAppDispatch()
@@ -70,15 +66,7 @@ const TabMePush: React.FC = () => {
   const alerts = useMemo(() => {
     return instancePush?.alerts
       ? (
-          [
-            'follow',
-            'follow_request',
-            'favourite',
-            'reblog',
-            'mention',
-            'poll',
-            'status'
-          ] as [
+          ['follow', 'follow_request', 'favourite', 'reblog', 'mention', 'poll', 'status'] as [
             'follow',
             'follow_request',
             'favourite',
@@ -91,15 +79,9 @@ const TabMePush: React.FC = () => {
           <MenuRow
             key={alert}
             title={t(`me.push.${alert}.heading`)}
-            switchDisabled={
-              !pushEnabled || !instancePush.global.value || isLoading
-            }
+            switchDisabled={!pushEnabled || !instancePush.global.value || isLoading}
             switchValue={instancePush?.alerts[alert].value}
-            switchOnValueChange={() => {
-              analytics(`me_push_${alert}`, {
-                current: instancePush?.alerts[alert].value,
-                new: !instancePush?.alerts[alert].value
-              })
+            switchOnValueChange={() =>
               dispatch(
                 updateInstancePushAlert({
                   changed: alert,
@@ -112,7 +94,7 @@ const TabMePush: React.FC = () => {
                   }
                 })
               )
-            }}
+            }
           />
         ))
       : null
@@ -127,23 +109,18 @@ const TabMePush: React.FC = () => {
               <Button
                 type='text'
                 content={
-                  pushCanAskAgain
-                    ? t('me.push.enable.direct')
-                    : t('me.push.enable.settings')
+                  pushCanAskAgain ? t('me.push.enable.direct') : t('me.push.enable.settings')
                 }
                 style={{
                   marginTop: StyleConstants.Spacing.Global.PagePadding,
-                  marginHorizontal:
-                    StyleConstants.Spacing.Global.PagePadding * 2
+                  marginHorizontal: StyleConstants.Spacing.Global.PagePadding * 2
                 }}
                 onPress={async () => {
                   if (pushCanAskAgain) {
-                    analytics('me_push_enabled_dialogue')
                     const result = await Notifications.requestPermissionsAsync()
                     setPushEnabled(result.granted)
                     setPushCanAskAgain(result.canAskAgain)
                   } else {
-                    analytics('me_push_enabled_setting')
                     Linking.openSettings()
                   }
                 }}
@@ -158,16 +135,8 @@ const TabMePush: React.FC = () => {
               description={t('me.push.global.description')}
               loading={instancePush?.global.loading}
               switchDisabled={!pushEnabled || isLoading}
-              switchValue={
-                pushEnabled === false ? false : instancePush?.global.value
-              }
-              switchOnValueChange={() => {
-                analytics('me_push_global', {
-                  current: instancePush?.global.value,
-                  new: !instancePush?.global.value
-                })
-                dispatch(updateInstancePush(!instancePush?.global.value))
-              }}
+              switchValue={pushEnabled === false ? false : instancePush?.global.value}
+              switchOnValueChange={() => dispatch(updateInstancePush(!instancePush?.global.value))}
             />
           </MenuContainer>
           <MenuContainer>
@@ -175,25 +144,16 @@ const TabMePush: React.FC = () => {
               title={t('me.push.decode.heading')}
               description={t('me.push.decode.description')}
               loading={instancePush?.decode.loading}
-              switchDisabled={
-                !pushEnabled || !instancePush?.global.value || isLoading
-              }
+              switchDisabled={!pushEnabled || !instancePush?.global.value || isLoading}
               switchValue={instancePush?.decode.value}
-              switchOnValueChange={() => {
-                analytics('me_push_decode', {
-                  current: instancePush?.decode.value,
-                  new: !instancePush?.decode.value
-                })
+              switchOnValueChange={() =>
                 dispatch(updateInstancePushDecode(!instancePush?.decode.value))
-              }}
+              }
             />
             <MenuRow
               title={t('me.push.howitworks')}
               iconBack='ExternalLink'
-              onPress={() => {
-                analytics('me_push_howitworks')
-                WebBrowser.openBrowserAsync('https://tooot.app/how-push-works')
-              }}
+              onPress={() => WebBrowser.openBrowserAsync('https://tooot.app/how-push-works')}
             />
           </MenuContainer>
           <MenuContainer>{alerts}</MenuContainer>
@@ -207,11 +167,7 @@ const TabMePush: React.FC = () => {
             alignItems: 'center'
           }}
         >
-          <Icon
-            name='Frown'
-            size={StyleConstants.Font.Size.L}
-            color={colors.primaryDefault}
-          />
+          <Icon name='Frown' size={StyleConstants.Font.Size.L} color={colors.primaryDefault} />
           <CustomText fontStyle='M' style={{ color: colors.primaryDefault }}>
             {t('me.push.notAvailable')}
           </CustomText>
diff --git a/src/screens/Tabs/Me/Settings/Analytics.tsx b/src/screens/Tabs/Me/Settings/Analytics.tsx
index 580cd530..1836d7c3 100644
--- a/src/screens/Tabs/Me/Settings/Analytics.tsx
+++ b/src/screens/Tabs/Me/Settings/Analytics.tsx
@@ -1,11 +1,6 @@
-import { MenuContainer, MenuRow } from '@components/Menu'
+import { MenuContainer } from '@components/Menu'
 import CustomText from '@components/Text'
-import { useAppDispatch } from '@root/store'
 import { getInstanceVersion } from '@utils/slices/instancesSlice'
-import {
-  changeAnalytics,
-  getSettingsAnalytics
-} from '@utils/slices/settingsSlice'
 import { StyleConstants } from '@utils/styles/constants'
 import { useTheme } from '@utils/styles/ThemeManager'
 import Constants from 'expo-constants'
@@ -14,25 +9,13 @@ import { useTranslation } from 'react-i18next'
 import { useSelector } from 'react-redux'
 
 const SettingsAnalytics: React.FC = () => {
-  const dispatch = useAppDispatch()
   const { colors } = useTheme()
   const { t } = useTranslation('screenTabs')
 
-  const settingsAnalytics = useSelector(getSettingsAnalytics)
   const instanceVersion = useSelector(getInstanceVersion, () => true)
 
   return (
     <>
-      <MenuContainer>
-        <MenuRow
-          title={t('me.settings.analytics.heading')}
-          description={t('me.settings.analytics.description')}
-          switchValue={settingsAnalytics}
-          switchOnValueChange={() =>
-            dispatch(changeAnalytics(!settingsAnalytics))
-          }
-        />
-      </MenuContainer>
       <MenuContainer>
         <CustomText
           fontStyle='S'
diff --git a/src/screens/Tabs/Me/Settings/App.tsx b/src/screens/Tabs/Me/Settings/App.tsx
index b2ef7d70..7621a635 100644
--- a/src/screens/Tabs/Me/Settings/App.tsx
+++ b/src/screens/Tabs/Me/Settings/App.tsx
@@ -1,4 +1,3 @@
-import analytics from '@components/analytics'
 import haptics from '@components/haptics'
 import { MenuContainer, MenuRow } from '@components/Menu'
 import { useActionSheet } from '@expo/react-native-action-sheet'
@@ -77,26 +76,14 @@ const SettingsApp: React.FC = () => {
             buttonIndex => {
               switch (buttonIndex) {
                 case 0:
-                  analytics('settings_appearance_press', {
-                    current: settingsTheme,
-                    new: 'auto'
-                  })
                   haptics('Success')
                   dispatch(changeTheme('auto'))
                   break
                 case 1:
-                  analytics('settings_appearance_press', {
-                    current: settingsTheme,
-                    new: 'light'
-                  })
                   haptics('Success')
                   dispatch(changeTheme('light'))
                   break
                 case 2:
-                  analytics('settings_appearance_press', {
-                    current: settingsTheme,
-                    new: 'dark'
-                  })
                   haptics('Success')
                   dispatch(changeTheme('dark'))
                   break
@@ -123,18 +110,10 @@ const SettingsApp: React.FC = () => {
             buttonIndex => {
               switch (buttonIndex) {
                 case 0:
-                  analytics('settings_darktheme_press', {
-                    current: settingsDarkTheme,
-                    new: 'lighter'
-                  })
                   haptics('Success')
                   dispatch(changeDarkTheme('lighter'))
                   break
                 case 1:
-                  analytics('settings_darktheme_press', {
-                    current: settingsDarkTheme,
-                    new: 'darker'
-                  })
                   haptics('Success')
                   dispatch(changeDarkTheme('darker'))
                   break
@@ -161,18 +140,10 @@ const SettingsApp: React.FC = () => {
             buttonIndex => {
               switch (buttonIndex) {
                 case 0:
-                  analytics('settings_browser_press', {
-                    current: settingsBrowser,
-                    new: 'internal'
-                  })
                   haptics('Success')
                   dispatch(changeBrowser('internal'))
                   break
                 case 1:
-                  analytics('settings_browser_press', {
-                    current: settingsBrowser,
-                    new: 'external'
-                  })
                   haptics('Success')
                   dispatch(changeBrowser('external'))
                   break
@@ -185,13 +156,7 @@ const SettingsApp: React.FC = () => {
         title={t('me.settings.staticEmoji.heading')}
         description={t('me.settings.staticEmoji.description')}
         switchValue={settingsStaticEmoji}
-        switchOnValueChange={() => {
-          analytics('settings_staticemoji_press', {
-            current: settingsStaticEmoji.toString(),
-            new: !settingsStaticEmoji.toString()
-          })
-          dispatch(changeStaticEmoji(!settingsStaticEmoji))
-        }}
+        switchOnValueChange={() => dispatch(changeStaticEmoji(!settingsStaticEmoji))}
       />
     </MenuContainer>
   )
diff --git a/src/screens/Tabs/Me/Settings/Tooot.tsx b/src/screens/Tabs/Me/Settings/Tooot.tsx
index 2c72f5ec..cac380dd 100644
--- a/src/screens/Tabs/Me/Settings/Tooot.tsx
+++ b/src/screens/Tabs/Me/Settings/Tooot.tsx
@@ -1,4 +1,3 @@
-import analytics from '@components/analytics'
 import Icon from '@components/Icon'
 import { MenuContainer, MenuRow } from '@components/Menu'
 import { useNavigation } from '@react-navigation/native'
@@ -33,29 +32,20 @@ const SettingsTooot: React.FC = () => {
           <Icon name='MessageSquare' size={StyleConstants.Font.Size.M} color={colors.secondary} />
         }
         iconBack='ChevronRight'
-        onPress={() => {
-          analytics('settings_feedback_press')
-          Linking.openURL('https://feedback.tooot.app/feature-requests')
-        }}
+        onPress={() => Linking.openURL('https://feedback.tooot.app/feature-requests')}
       />
       <MenuRow
         title={t('me.settings.support.heading')}
         content={<Icon name='Heart' size={StyleConstants.Font.Size.M} color={colors.red} />}
         iconBack='ChevronRight'
-        onPress={() => {
-          analytics('settings_support_press')
-          Linking.openURL('https://www.buymeacoffee.com/xmflsct')
-        }}
+        onPress={() => Linking.openURL('https://www.buymeacoffee.com/xmflsct')}
       />
       {isDevelopment || isRelease ? (
         <MenuRow
           title={t('me.settings.review.heading')}
           content={<Icon name='Star' size={StyleConstants.Font.Size.M} color='#FF9500' />}
           iconBack='ChevronRight'
-          onPress={() => {
-            analytics('settings_review_press')
-            StoreReview?.isAvailableAsync().then(() => StoreReview?.requestReview())
-          }}
+          onPress={() => StoreReview?.isAvailableAsync().then(() => StoreReview?.requestReview())}
         />
       ) : null}
       <MenuRow
diff --git a/src/screens/Tabs/Me/SettingsLanguage.tsx b/src/screens/Tabs/Me/SettingsLanguage.tsx
index 705b6c28..0e9cd820 100644
--- a/src/screens/Tabs/Me/SettingsLanguage.tsx
+++ b/src/screens/Tabs/Me/SettingsLanguage.tsx
@@ -1,4 +1,3 @@
-import analytics from '@components/analytics'
 import haptics from '@components/haptics'
 import { MenuContainer, MenuRow } from '@components/Menu'
 import { LOCALES } from '@root/i18n/locales'
@@ -21,10 +20,6 @@ const TabMeSettingsLanguage: React.FC<
   const dispatch = useDispatch()
 
   const change = (lang: string) => {
-    analytics('settings_language_press', {
-      current: i18n.language,
-      new: lang
-    })
     haptics('Success')
 
     dispatch(changeLanguage(lang))
diff --git a/src/screens/Tabs/Notifications.tsx b/src/screens/Tabs/Notifications.tsx
index e3621e49..c5f7cdeb 100644
--- a/src/screens/Tabs/Notifications.tsx
+++ b/src/screens/Tabs/Notifications.tsx
@@ -1,4 +1,3 @@
-import analytics from '@components/analytics'
 import { HeaderCenter, HeaderRight } from '@components/Header'
 import Timeline from '@components/Timeline'
 import TimelineNotifications from '@components/Timeline/Notifications'
@@ -29,12 +28,11 @@ const TabNotifications = React.memo(
             accessibilityLabel={t('notifications.filter.accessibilityLabel')}
             accessibilityHint={t('notifications.filter.accessibilityHint')}
             content='Filter'
-            onPress={() => {
-              analytics('notificationsfilter_tap')
+            onPress={() =>
               navigationRef.navigate('Screen-Actions', {
                 type: 'notifications_filter'
               })
-            }}
+            }
           />
         )
       }),
diff --git a/src/screens/Tabs/Public.tsx b/src/screens/Tabs/Public.tsx
index bd493b17..65fbbd04 100644
--- a/src/screens/Tabs/Public.tsx
+++ b/src/screens/Tabs/Public.tsx
@@ -1,4 +1,3 @@
-import analytics from '@components/analytics'
 import { HeaderRight } from '@components/Header'
 import Timeline from '@components/Timeline'
 import TimelineDefault from '@components/Timeline/Default'
@@ -51,13 +50,12 @@ const TabPublic = React.memo(
             accessibilityLabel={t('common.search.accessibilityLabel')}
             accessibilityHint={t('common.search.accessibilityHint')}
             content='Search'
-            onPress={() => {
-              analytics('search_tap', { page: pages[segment].key })
+            onPress={() =>
               navigation.navigate('Tab-Public', {
                 screen: 'Tab-Shared-Search',
                 params: { text: undefined }
               })
-            }}
+            }
           />
         )
       }),
diff --git a/src/screens/Tabs/Shared/Account/Attachments.tsx b/src/screens/Tabs/Shared/Account/Attachments.tsx
index 4a43d635..dd6be7d7 100644
--- a/src/screens/Tabs/Shared/Account/Attachments.tsx
+++ b/src/screens/Tabs/Shared/Account/Attachments.tsx
@@ -1,4 +1,3 @@
-import analytics from '@components/analytics'
 import GracefullyImage from '@components/GracefullyImage'
 import Icon from '@components/Icon'
 import { useNavigation } from '@react-navigation/native'
@@ -8,13 +7,7 @@ import { useTimelineQuery } from '@utils/queryHooks/timeline'
 import { StyleConstants } from '@utils/styles/constants'
 import { useTheme } from '@utils/styles/ThemeManager'
 import React, { useCallback, useEffect } from 'react'
-import {
-  Dimensions,
-  ListRenderItem,
-  Pressable,
-  StyleSheet,
-  View
-} from 'react-native'
+import { Dimensions, ListRenderItem, Pressable, StyleSheet, View } from 'react-native'
 import { FlatList } from 'react-native-gesture-handler'
 import Animated, { useAnimatedStyle, withTiming } from 'react-native-reanimated'
 
@@ -24,16 +17,13 @@ export interface Props {
 
 const AccountAttachments = React.memo(
   ({ account }: Props) => {
-    const navigation =
-      useNavigation<StackNavigationProp<TabLocalStackParamList>>()
+    const navigation = useNavigation<StackNavigationProp<TabLocalStackParamList>>()
     const { colors } = useTheme()
 
     const DISPLAY_AMOUNT = 6
 
     const width =
-      (Dimensions.get('screen').width -
-        StyleConstants.Spacing.Global.PagePadding * 2) /
-      4
+      (Dimensions.get('screen').width - StyleConstants.Spacing.Global.PagePadding * 2) / 4
 
     const queryKeyParams = {
       page: 'Account_Attachments' as 'Account_Attachments',
@@ -62,9 +52,7 @@ const AccountAttachments = React.memo(
           return (
             <Pressable
               onPress={() => {
-                analytics('account_attachment_more_press')
-                account &&
-                  navigation.push('Tab-Shared-Attachments', { account })
+                account && navigation.push('Tab-Shared-Attachments', { account })
               }}
               children={
                 <View
@@ -91,21 +79,15 @@ const AccountAttachments = React.memo(
           return (
             <GracefullyImage
               uri={{
-                original:
-                  item.media_attachments[0]?.preview_url ||
-                  item.media_attachments[0]?.url,
+                original: item.media_attachments[0]?.preview_url || item.media_attachments[0]?.url,
                 remote: item.media_attachments[0]?.remote_url
               }}
               blurhash={
-                item.media_attachments[0] &&
-                (item.media_attachments[0].blurhash || undefined)
+                item.media_attachments[0] && (item.media_attachments[0].blurhash || undefined)
               }
               dimension={{ width: width, height: width }}
               style={{ marginLeft: StyleConstants.Spacing.Global.PagePadding }}
-              onPress={() => {
-                analytics('account_attachment_item_press')
-                navigation.push('Tab-Shared-Toot', { toot: item })
-              }}
+              onPress={() => navigation.push('Tab-Shared-Toot', { toot: item })}
             />
           )
         }
@@ -116,9 +98,7 @@ const AccountAttachments = React.memo(
     const styleContainer = useAnimatedStyle(() => {
       if (flattenData.length) {
         return {
-          height: withTiming(
-            width + StyleConstants.Spacing.Global.PagePadding * 2
-          ),
+          height: withTiming(width + StyleConstants.Spacing.Global.PagePadding * 2),
           paddingVertical: StyleConstants.Spacing.Global.PagePadding,
           borderTopWidth: 1,
           borderTopColor: colors.border
diff --git a/src/screens/Tabs/Shared/Account/Information/Actions.tsx b/src/screens/Tabs/Shared/Account/Information/Actions.tsx
index f8e75c09..e1086eac 100644
--- a/src/screens/Tabs/Shared/Account/Information/Actions.tsx
+++ b/src/screens/Tabs/Shared/Account/Information/Actions.tsx
@@ -1,4 +1,3 @@
-import analytics from '@components/analytics'
 import Button from '@components/Button'
 import { RelationshipOutgoing } from '@components/Relationship'
 import { useNavigation } from '@react-navigation/native'
@@ -25,13 +24,12 @@ const Conversation = ({ account }: { account: Mastodon.Account }) => {
       type='icon'
       content='Mail'
       style={styles.actionLeft}
-      onPress={() => {
-        analytics('account_DM_press')
+      onPress={() =>
         navigation.navigate('Screen-Compose', {
           type: 'conversation',
           accts: [account.acct]
         })
-      }}
+      }
     />
   ) : null
 }
@@ -51,10 +49,7 @@ const AccountInformationActions: React.FC<Props> = ({ account, myInfo }) => {
         <Button
           type='text'
           content={t('shared.account.moved')}
-          onPress={() => {
-            analytics('account_gotomoved_press')
-            navigation.push('Tab-Shared-Account', { account: accountMoved })
-          }}
+          onPress={() => navigation.push('Tab-Shared-Account', { account: accountMoved })}
         />
       </View>
     )
@@ -74,9 +69,7 @@ const AccountInformationActions: React.FC<Props> = ({ account, myInfo }) => {
   }
 
   const instanceAccount = useSelector(getInstanceAccount, () => true)
-  const ownAccount =
-    account?.id === instanceAccount?.id &&
-    account?.acct === instanceAccount?.acct
+  const ownAccount = account?.id === instanceAccount?.id && account?.acct === instanceAccount?.acct
 
   if (!ownAccount && account) {
     return (
diff --git a/src/screens/Tabs/Shared/Account/Information/Avatar.tsx b/src/screens/Tabs/Shared/Account/Information/Avatar.tsx
index 05e35449..76003b07 100644
--- a/src/screens/Tabs/Shared/Account/Information/Avatar.tsx
+++ b/src/screens/Tabs/Shared/Account/Information/Avatar.tsx
@@ -1,4 +1,3 @@
-import analytics from '@components/analytics'
 import Button from '@components/Button'
 import GracefullyImage from '@components/GracefullyImage'
 import { useNavigation } from '@react-navigation/native'
@@ -25,7 +24,6 @@ const AccountInformationAvatar: React.FC<Props> = ({
     <Pressable
       disabled={!myInfo}
       onPress={() => {
-        analytics('account_avatar_press')
         myInfo && account && navigation.push('Tab-Shared-Account', { account })
       }}
       style={styles.base}
diff --git a/src/screens/Tabs/Shared/Account/Information/Stats.tsx b/src/screens/Tabs/Shared/Account/Information/Stats.tsx
index bd7f2255..fe2c4e37 100644
--- a/src/screens/Tabs/Shared/Account/Information/Stats.tsx
+++ b/src/screens/Tabs/Shared/Account/Information/Stats.tsx
@@ -1,4 +1,3 @@
-import analytics from '@components/analytics'
 import CustomText from '@components/Text'
 import { useNavigation } from '@react-navigation/native'
 import { StackNavigationProp } from '@react-navigation/stack'
@@ -33,7 +32,6 @@ const AccountInformationStats: React.FC<Props> = ({ account, myInfo }) => {
             count: account.statuses_count || 0
           })}
           onPress={() => {
-            analytics('account_stats_toots_press')
             myInfo && account && navigation.push('Tab-Shared-Account', { account })
           }}
         />
@@ -52,17 +50,14 @@ const AccountInformationStats: React.FC<Props> = ({ account, myInfo }) => {
           children={t('shared.account.summary.following_count', {
             count: account.following_count
           })}
-          onPress={() => {
-            analytics('account_stats_following_press', {
-              count: account.following_count
-            })
+          onPress={() =>
             navigation.push('Tab-Shared-Users', {
               reference: 'accounts',
               id: account.id,
               type: 'following',
               count: account.following_count
             })
-          }}
+          }
         />
       ) : (
         <PlaceholderLine
@@ -79,17 +74,14 @@ const AccountInformationStats: React.FC<Props> = ({ account, myInfo }) => {
           children={t('shared.account.summary.followers_count', {
             count: account.followers_count
           })}
-          onPress={() => {
-            analytics('account_stats_followers_press', {
-              count: account.followers_count
-            })
+          onPress={() =>
             navigation.push('Tab-Shared-Users', {
               reference: 'accounts',
               id: account.id,
               type: 'followers',
               count: account.followers_count
             })
-          }}
+          }
         />
       ) : (
         <PlaceholderLine
diff --git a/src/screens/Tabs/Shared/Search.tsx b/src/screens/Tabs/Shared/Search.tsx
index 4f883807..1cf14e3f 100644
--- a/src/screens/Tabs/Shared/Search.tsx
+++ b/src/screens/Tabs/Shared/Search.tsx
@@ -9,18 +9,10 @@ import { StyleConstants } from '@utils/styles/constants'
 import { useTheme } from '@utils/styles/ThemeManager'
 import React, { useCallback, useMemo } from 'react'
 import { Trans, useTranslation } from 'react-i18next'
-import {
-  KeyboardAvoidingView,
-  Platform,
-  SectionList,
-  StyleSheet,
-  View
-} from 'react-native'
+import { KeyboardAvoidingView, Platform, SectionList, StyleSheet, View } from 'react-native'
 import { Circle } from 'react-native-animated-spinkit'
 
-const TabSharedSearch: React.FC<
-  TabSharedStackScreenProps<'Tab-Shared-Search'>
-> = ({
+const TabSharedSearch: React.FC<TabSharedStackScreenProps<'Tab-Shared-Search'>> = ({
   route: {
     params: { text }
   }
@@ -75,10 +67,7 @@ const TabSharedSearch: React.FC<
         <View>
           {status === 'loading' ? (
             <View style={{ flex: 1, alignItems: 'center' }}>
-              <Circle
-                size={StyleConstants.Font.Size.M * 1.25}
-                color={colors.secondary}
-              />
+              <Circle size={StyleConstants.Font.Size.M * 1.25} color={colors.secondary} />
             </View>
           ) : (
             <>
@@ -96,39 +85,25 @@ const TabSharedSearch: React.FC<
                   }}
                 />
               </CustomText>
-              <CustomText
-                style={[styles.emptyAdvanced, { color: colors.primaryDefault }]}
-              >
+              <CustomText style={[styles.emptyAdvanced, { color: colors.primaryDefault }]}>
                 {t('shared.search.empty.advanced.header')}
               </CustomText>
-              <CustomText
-                style={[styles.emptyAdvanced, { color: colors.primaryDefault }]}
-              >
-                <CustomText style={{ color: colors.secondary }}>
-                  @username@domain
-                </CustomText>
+              <CustomText style={[styles.emptyAdvanced, { color: colors.primaryDefault }]}>
+                <CustomText style={{ color: colors.secondary }}>@username@domain</CustomText>
                 {'   '}
                 {t('shared.search.empty.advanced.example.account')}
               </CustomText>
-              <CustomText
-                style={[styles.emptyAdvanced, { color: colors.primaryDefault }]}
-              >
-                <CustomText style={{ color: colors.secondary }}>
-                  #example
-                </CustomText>
+              <CustomText style={[styles.emptyAdvanced, { color: colors.primaryDefault }]}>
+                <CustomText style={{ color: colors.secondary }}>#example</CustomText>
                 {'   '}
                 {t('shared.search.empty.advanced.example.hashtag')}
               </CustomText>
-              <CustomText
-                style={[styles.emptyAdvanced, { color: colors.primaryDefault }]}
-              >
+              <CustomText style={[styles.emptyAdvanced, { color: colors.primaryDefault }]}>
                 <CustomText style={{ color: colors.secondary }}>URL</CustomText>
                 {'   '}
                 {t('shared.search.empty.advanced.example.statusLink')}
               </CustomText>
-              <CustomText
-                style={[styles.emptyAdvanced, { color: colors.primaryDefault }]}
-              >
+              <CustomText style={[styles.emptyAdvanced, { color: colors.primaryDefault }]}>
                 <CustomText style={{ color: colors.secondary }}>URL</CustomText>
                 {'   '}
                 {t('shared.search.empty.advanced.example.accountLink')}
@@ -140,21 +115,18 @@ const TabSharedSearch: React.FC<
     )
   }, [status])
 
-  const listItem = useCallback(
-    ({ item, section }: { item: any; section: any }) => {
-      switch (section.title) {
-        case 'accounts':
-          return <ComponentAccount account={item} origin='search' />
-        case 'hashtags':
-          return <ComponentHashtag hashtag={item} origin='search' />
-        case 'statuses':
-          return <TimelineDefault item={item} disableDetails origin='search' />
-        default:
-          return null
-      }
-    },
-    []
-  )
+  const listItem = useCallback(({ item, section }: { item: any; section: any }) => {
+    switch (section.title) {
+      case 'accounts':
+        return <ComponentAccount account={item} />
+      case 'hashtags':
+        return <ComponentHashtag hashtag={item} origin='search' />
+      case 'statuses':
+        return <TimelineDefault item={item} disableDetails />
+      default:
+        return null
+    }
+  }, [])
 
   return (
     <KeyboardAvoidingView
@@ -195,10 +167,7 @@ const TabSharedSearch: React.FC<
                 backgroundColor: colors.backgroundDefault
               }}
             >
-              <CustomText
-                fontStyle='S'
-                style={{ textAlign: 'center', color: colors.secondary }}
-              >
+              <CustomText fontStyle='S' style={{ textAlign: 'center', color: colors.secondary }}>
                 <Trans
                   i18nKey='screenTabs:shared.search.notFound'
                   values={{ searchTerm: text, type: translation }}
diff --git a/src/screens/Tabs/Shared/Users.tsx b/src/screens/Tabs/Shared/Users.tsx
index 187f3b11..e6356b44 100644
--- a/src/screens/Tabs/Shared/Users.tsx
+++ b/src/screens/Tabs/Shared/Users.tsx
@@ -34,7 +34,7 @@ const TabSharedUsers = React.memo(
         data={flattenData}
         style={styles.flatList}
         renderItem={({ item }) => (
-          <ComponentAccount account={item} origin='relationship' />
+          <ComponentAccount account={item} />
         )}
         onEndReached={onEndReached}
         onEndReachedThreshold={0.75}
diff --git a/src/store.ts b/src/store.ts
index f2635cad..7e6b5e2d 100644
--- a/src/store.ts
+++ b/src/store.ts
@@ -55,7 +55,7 @@ const settingsPersistConfig = {
   key: 'settings',
   prefix,
   storage: AsyncStorage,
-  version: 1,
+  version: 3,
   // @ts-ignore
   migrate: createMigrate(settingsMigration)
 }
diff --git a/src/utils/migrations/settings/migration.ts b/src/utils/migrations/settings/migration.ts
index a99a662e..7a8df37e 100644
--- a/src/utils/migrations/settings/migration.ts
+++ b/src/utils/migrations/settings/migration.ts
@@ -1,6 +1,7 @@
 import { SettingsV0 } from './v0'
 import { SettingsV1 } from './v1'
 import { SettingsV2 } from './v2'
+import { SettingsV3 } from './v3'
 
 const settingsMigration = {
   1: (state: SettingsV0): SettingsV1 => {
@@ -15,6 +16,10 @@ const settingsMigration = {
       darkTheme: 'lighter',
       staticEmoji: false
     }
+  },
+  3: (state: SettingsV2): SettingsV3 => {
+    const { analytics, ...rest } = state
+    return rest
   }
 }
 
diff --git a/src/utils/migrations/settings/v3.ts b/src/utils/migrations/settings/v3.ts
new file mode 100644
index 00000000..8935e0a8
--- /dev/null
+++ b/src/utils/migrations/settings/v3.ts
@@ -0,0 +1,8 @@
+export type SettingsV3 = {
+  fontsize: -1 | 0 | 1 | 2 | 3
+  language: string
+  theme: 'light' | 'dark' | 'auto'
+  darkTheme: 'lighter' | 'darker'
+  browser: 'internal' | 'external'
+  staticEmoji: boolean
+}
diff --git a/src/utils/slices/instancesSlice.ts b/src/utils/slices/instancesSlice.ts
index 8747943f..bb6ac578 100644
--- a/src/utils/slices/instancesSlice.ts
+++ b/src/utils/slices/instancesSlice.ts
@@ -1,4 +1,3 @@
-import analytics from '@components/analytics'
 import features from '@helpers/features'
 import { createSlice, PayloadAction } from '@reduxjs/toolkit'
 import { RootState } from '@root/store'
@@ -184,8 +183,6 @@ const instancesSlice = createSlice({
               }
             })
         }
-
-        analytics('login')
       })
       .addCase(addInstance.rejected, (state, action) => {
         console.error(state.instances)
@@ -204,8 +201,6 @@ const instancesSlice = createSlice({
           }
         })
         state.instances.length && (state.instances[state.instances.length - 1].active = true)
-
-        analytics('logout')
       })
       .addCase(removeInstance.rejected, (state, action) => {
         console.error(state)
diff --git a/src/utils/slices/settingsSlice.ts b/src/utils/slices/settingsSlice.ts
index 69cde671..dad5501f 100644
--- a/src/utils/slices/settingsSlice.ts
+++ b/src/utils/slices/settingsSlice.ts
@@ -1,72 +1,43 @@
-import { createAsyncThunk, createSlice, PayloadAction } from '@reduxjs/toolkit'
+import { createSlice, PayloadAction } from '@reduxjs/toolkit'
 import { LOCALES } from '@root/i18n/locales'
 import { RootState } from '@root/store'
-import { SettingsV2 } from '@utils/migrations/settings/v2'
-import * as Analytics from 'expo-firebase-analytics'
+import { SettingsV3 } from '@utils/migrations/settings/v3'
 import * as Localization from 'expo-localization'
 import { pickBy } from 'lodash'
 
-export const changeAnalytics = createAsyncThunk(
-  'settings/changeAnalytics',
-  async (newValue: SettingsState['analytics']) => {
-    await Analytics.setAnalyticsCollectionEnabled(newValue)
-    return { newValue }
-  }
-)
-
-export type SettingsState = SettingsV2
+export type SettingsState = SettingsV3
 
 export const settingsInitialState = {
   fontsize: 0,
   notification: {
     enabled: false
   },
-  language: Object.keys(
-    pickBy(LOCALES, (_, key) => Localization.locale.startsWith(key))
-  )
-    ? Object.keys(
-        pickBy(LOCALES, (_, key) => Localization.locale.startsWith(key))
-      )[0]
+  language: Object.keys(pickBy(LOCALES, (_, key) => Localization.locale.startsWith(key)))
+    ? Object.keys(pickBy(LOCALES, (_, key) => Localization.locale.startsWith(key)))[0]
     : 'en',
   theme: 'auto',
   darkTheme: 'lighter',
   browser: 'internal',
-  staticEmoji: false,
-  analytics: true
+  staticEmoji: false
 }
 
 const settingsSlice = createSlice({
   name: 'settings',
   initialState: settingsInitialState as SettingsState,
   reducers: {
-    changeFontsize: (
-      state,
-      action: PayloadAction<SettingsState['fontsize']>
-    ) => {
+    changeFontsize: (state, action: PayloadAction<SettingsState['fontsize']>) => {
       state.fontsize = action.payload
     },
-    changeLanguage: (
-      state,
-      action: PayloadAction<NonNullable<SettingsState['language']>>
-    ) => {
+    changeLanguage: (state, action: PayloadAction<NonNullable<SettingsState['language']>>) => {
       state.language = action.payload
     },
-    changeTheme: (
-      state,
-      action: PayloadAction<NonNullable<SettingsState['theme']>>
-    ) => {
+    changeTheme: (state, action: PayloadAction<NonNullable<SettingsState['theme']>>) => {
       state.theme = action.payload
     },
-    changeDarkTheme: (
-      state,
-      action: PayloadAction<NonNullable<SettingsState['darkTheme']>>
-    ) => {
+    changeDarkTheme: (state, action: PayloadAction<NonNullable<SettingsState['darkTheme']>>) => {
       state.darkTheme = action.payload
     },
-    changeBrowser: (
-      state,
-      action: PayloadAction<NonNullable<SettingsState['browser']>>
-    ) => {
+    changeBrowser: (state, action: PayloadAction<NonNullable<SettingsState['browser']>>) => {
       state.browser = action.payload
     },
     changeStaticEmoji: (
@@ -75,25 +46,15 @@ const settingsSlice = createSlice({
     ) => {
       state.staticEmoji = action.payload
     }
-  },
-  extraReducers: builder => {
-    builder.addCase(changeAnalytics.fulfilled, (state, action) => {
-      state.analytics = action.payload.newValue
-    })
   }
 })
 
-export const getSettingsFontsize = (state: RootState) =>
-  state.settings.fontsize || 0
+export const getSettingsFontsize = (state: RootState) => state.settings.fontsize || 0
 export const getSettingsLanguage = (state: RootState) => state.settings.language
 export const getSettingsTheme = (state: RootState) => state.settings.theme
-export const getSettingsDarkTheme = (state: RootState) =>
-  state.settings.darkTheme
+export const getSettingsDarkTheme = (state: RootState) => state.settings.darkTheme
 export const getSettingsBrowser = (state: RootState) => state.settings.browser
-export const getSettingsStaticEmoji = (state: RootState) =>
-  state.settings.staticEmoji
-export const getSettingsAnalytics = (state: RootState) =>
-  state.settings.analytics
+export const getSettingsStaticEmoji = (state: RootState) => state.settings.staticEmoji
 
 export const {
   changeFontsize,
diff --git a/yarn.lock b/yarn.lock
index bc01eee8..b2f1aa78 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5659,20 +5659,6 @@ expo-file-system@^15.1.1, expo-file-system@~15.1.0, expo-file-system@~15.1.1:
   dependencies:
     uuid "^3.4.0"
 
-expo-firebase-analytics@^8.0.0:
-  version "8.0.0"
-  resolved "https://registry.yarnpkg.com/expo-firebase-analytics/-/expo-firebase-analytics-8.0.0.tgz#69b17bf48317d95a55f28cbd485e06d4800c134b"
-  integrity sha512-nWYa5vm2BX+qXrB0UQPMb0vh+QSGpx9G78TetRQAa+M+96j5Y0qUEsSKWkKvkICFF8ItnhNz2vdDNWZrMLefnw==
-  dependencies:
-    expo-firebase-core "~6.0.0"
-
-expo-firebase-core@~6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/expo-firebase-core/-/expo-firebase-core-6.0.0.tgz#854fb72b6769f3c6d3caa5797c3f8d4effe9a564"
-  integrity sha512-ZMcvRxKuAjZ0V4+VCuYKQ9P3Br8nGUORCbG41ewyLnLXBwov85AdBx4/5lA7T5cX1oOmv2fKMnU3gqCR+s6Veg==
-  dependencies:
-    expo-constants "~14.0.0"
-
 expo-font@~11.0.1:
   version "11.0.1"
   resolved "https://registry.yarnpkg.com/expo-font/-/expo-font-11.0.1.tgz#0758ce4e505995d0193a33e3c4325b35bf1fb7f7"

From bb3ddd27792478736062fa027e750dabc06406e8 Mon Sep 17 00:00:00 2001
From: xmflsct <me@xmflsct.com>
Date: Wed, 30 Nov 2022 22:42:42 +0100
Subject: [PATCH 07/40] Partial fix #495

Add list
Edit list info
---
 src/@types/mastodon.d.ts                 |   1 +
 src/components/ContextMenu/status.ts     |   3 +-
 src/components/Instance.tsx              |   4 +-
 src/components/Message.tsx               |   2 +-
 src/components/Selections.tsx            |  71 ++++++++++
 src/i18n/en/common.json                  |  10 +-
 src/i18n/en/components/instance.json     |   6 +-
 src/i18n/en/screens/compose.json         |  10 +-
 src/i18n/en/screens/imageViewer.json     |   3 +-
 src/i18n/en/screens/tabs.json            |  45 ++++---
 src/screens/Actions/Domain.tsx           |   8 +-
 src/screens/Actions/Status.tsx           |  31 ++---
 src/screens/Compose.tsx                  |   2 +-
 src/screens/Compose/Root/Actions.tsx     |   2 +-
 src/screens/Compose/Root/Footer/Poll.tsx |   4 +-
 src/screens/ImagesViewer.tsx             |   2 +-
 src/screens/Tabs/Me.tsx                  |  81 +++++------
 src/screens/Tabs/Me/List.tsx             |  40 ++++++
 src/screens/Tabs/Me/ListEdit.tsx         | 163 +++++++++++++++++++++++
 src/screens/Tabs/Me/Lists.tsx            |  28 ++--
 src/screens/Tabs/Me/ListsList.tsx        |  26 ----
 src/screens/Tabs/Me/Profile/Fields.tsx   |  15 ++-
 src/screens/Tabs/Me/Profile/Name.tsx     |  15 ++-
 src/screens/Tabs/Me/Profile/Note.tsx     |  15 ++-
 src/screens/Tabs/Me/Profile/Root.tsx     |   2 +-
 src/screens/Tabs/Me/Root/Logout.tsx      |  34 +++--
 src/screens/Tabs/Me/Settings/App.tsx     |   6 +-
 src/utils/navigation/navigators.ts       |  47 ++++---
 src/utils/queryHooks/lists.ts            |  54 ++++++--
 29 files changed, 506 insertions(+), 224 deletions(-)
 create mode 100644 src/components/Selections.tsx
 create mode 100644 src/screens/Tabs/Me/List.tsx
 create mode 100644 src/screens/Tabs/Me/ListEdit.tsx
 delete mode 100644 src/screens/Tabs/Me/ListsList.tsx

diff --git a/src/@types/mastodon.d.ts b/src/@types/mastodon.d.ts
index 0e452f3a..54bc1571 100644
--- a/src/@types/mastodon.d.ts
+++ b/src/@types/mastodon.d.ts
@@ -274,6 +274,7 @@ declare namespace Mastodon {
   type List = {
     id: string
     title: string
+    replies_policy: 'none' | 'list' | 'followed'
   }
 
   type Instance = {
diff --git a/src/components/ContextMenu/status.ts b/src/components/ContextMenu/status.ts
index b5cc3402..6f23326f 100644
--- a/src/components/ContextMenu/status.ts
+++ b/src/components/ContextMenu/status.ts
@@ -121,7 +121,8 @@ const contextMenuStatus = ({ actions, status, queryKey, rootQueryKey }: Props) =
           }
         },
         {
-          text: t('common:buttons.cancel')
+          text: t('common:buttons.cancel'),
+          style: 'default'
         }
       ])
     }
diff --git a/src/components/Instance.tsx b/src/components/Instance.tsx
index 46be34e8..958c4338 100644
--- a/src/components/Instance.tsx
+++ b/src/components/Instance.tsx
@@ -60,11 +60,11 @@ const ComponentInstance: React.FC<Props> = ({
       if (instances && instances.filter(instance => instance.url === domain).length) {
         Alert.alert(t('update.alert.title'), t('update.alert.message'), [
           {
-            text: t('update.alert.buttons.cancel'),
+            text: t('common:buttons.cancel'),
             style: 'cancel'
           },
           {
-            text: t('update.alert.buttons.continue'),
+            text: t('common:buttons.continue'),
             onPress: () => {
               appsQuery.refetch()
             }
diff --git a/src/components/Message.tsx b/src/components/Message.tsx
index ddcdc5fa..85e6e62c 100644
--- a/src/components/Message.tsx
+++ b/src/components/Message.tsx
@@ -125,7 +125,7 @@ const Message = React.forwardRef<FlashMessage>((_, ref) => {
         shadowOpacity: theme === 'light' ? 0.16 : 0.24,
         shadowRadius: 4,
         paddingRight: StyleConstants.Spacing.M * 2,
-        marginTop: insets.top
+        marginTop: ref ? undefined : insets.top
       }}
       titleStyle={{
         color: colors.primaryDefault,
diff --git a/src/components/Selections.tsx b/src/components/Selections.tsx
new file mode 100644
index 00000000..3e39cdfd
--- /dev/null
+++ b/src/components/Selections.tsx
@@ -0,0 +1,71 @@
+import { StyleConstants } from '@utils/styles/constants'
+import { useTheme } from '@utils/styles/ThemeManager'
+import React from 'react'
+import { Pressable, View } from 'react-native'
+import haptics from './haptics'
+import Icon from './Icon'
+import { ParseEmojis } from './Parse'
+import CustomText from './Text'
+
+export interface Props {
+  multiple?: boolean
+  options: { selected: boolean; content: string }[]
+  setOptions: React.Dispatch<React.SetStateAction<{ selected: boolean; content: string }[]>>
+}
+
+const Selections: React.FC<Props> = ({ multiple = false, options, setOptions }) => {
+  const { colors } = useTheme()
+
+  const isSelected = (index: number): string =>
+    options[index].selected
+      ? `Check${multiple ? 'Square' : 'Circle'}`
+      : `${multiple ? 'Square' : 'Circle'}`
+
+  return (
+    <>
+      {options.map((option, index) => (
+        <Pressable
+          key={index}
+          style={{ flex: 1, paddingVertical: StyleConstants.Spacing.S }}
+          onPress={() => {
+            if (multiple) {
+              haptics('Light')
+
+              setOptions(options.map((o, i) => (i === index ? { ...o, selected: !o.selected } : o)))
+            } else {
+              if (!option.selected) {
+                haptics('Light')
+                setOptions(
+                  options.map((o, i) => {
+                    if (i === index) {
+                      return { ...o, selected: true }
+                    } else {
+                      return { ...o, selected: false }
+                    }
+                  })
+                )
+              }
+            }
+          }}
+        >
+          <View style={{ flex: 1, flexDirection: 'row' }}>
+            <Icon
+              style={{
+                paddingTop: StyleConstants.Font.LineHeight.M - StyleConstants.Font.Size.M,
+                marginRight: StyleConstants.Spacing.S
+              }}
+              name={isSelected(index)}
+              size={StyleConstants.Font.Size.M}
+              color={colors.primaryDefault}
+            />
+            <CustomText style={{ flex: 1 }}>
+              <ParseEmojis content={option.content} />
+            </CustomText>
+          </View>
+        </Pressable>
+      ))}
+    </>
+  )
+}
+
+export default Selections
diff --git a/src/i18n/en/common.json b/src/i18n/en/common.json
index 4b3fa57e..6a81edbb 100644
--- a/src/i18n/en/common.json
+++ b/src/i18n/en/common.json
@@ -2,7 +2,9 @@
   "buttons": {
     "OK": "OK",
     "apply": "Apply",
-    "cancel": "Cancel"
+    "cancel": "Cancel",
+    "discard": "Discard",
+    "continue": "Continue"
   },
   "customEmoji": {
     "accessibilityLabel": "Custom emoji {{emoji}}"
@@ -18,5 +20,9 @@
       "message": "{{function}} failed, please retry"
     }
   },
-  "separator": ", "
+  "separator": ", ",
+  "discard": {
+    "title": "Change Not Saved",
+    "message": "Your change has not been saved. Would you discard saving the changes?"
+  }
 }
\ No newline at end of file
diff --git a/src/i18n/en/components/instance.json b/src/i18n/en/components/instance.json
index b66fda37..f59b012e 100644
--- a/src/i18n/en/components/instance.json
+++ b/src/i18n/en/components/instance.json
@@ -20,11 +20,7 @@
   "update": {
     "alert": {
       "title": "Logged in to this instance",
-      "message": "You can login to another account, keeping existing logged in account",
-      "buttons": {
-        "cancel": "$t(common:buttons.cancel)",
-        "continue": "Continue"
-      }
+      "message": "You can login to another account, keeping existing logged in account"
     }
   }
 }
\ No newline at end of file
diff --git a/src/i18n/en/screens/compose.json b/src/i18n/en/screens/compose.json
index 6290ee6a..c4ea0f80 100644
--- a/src/i18n/en/screens/compose.json
+++ b/src/i18n/en/screens/compose.json
@@ -28,7 +28,6 @@
         "removeReply": {
           "title": "Replied toot could not be found",
           "description": "Replied toot could have been deleted. Do you want to remove it from your reference?",
-          "cancel": "$t(common:buttons.cancel)",
           "confirm": "Remove reference"
         }
       }
@@ -89,8 +88,7 @@
             "heading": "Choice type",
             "options": {
               "single": "Single choice",
-              "multiple": "Multiple choice",
-              "cancel": "$t(common:buttons.cancel)"
+              "multiple": "Multiple choice"
             }
           },
           "expiration": {
@@ -102,8 +100,7 @@
               "21600": "6 hours",
               "86400": "1 day",
               "259200": "3 days",
-              "604800": "7 days",
-              "cancel": "$t(common:buttons.cancel)"
+              "604800": "7 days"
             }
           }
         }
@@ -130,8 +127,7 @@
             "public": "Public",
             "unlisted": "Unlisted",
             "private": "Followers only",
-            "direct": "Direct message",
-            "cancel": "$t(common:buttons.cancel)"
+            "direct": "Direct message"
           }
         },
         "spoiler": {
diff --git a/src/i18n/en/screens/imageViewer.json b/src/i18n/en/screens/imageViewer.json
index 7b41e857..7638236a 100644
--- a/src/i18n/en/screens/imageViewer.json
+++ b/src/i18n/en/screens/imageViewer.json
@@ -6,8 +6,7 @@
     },
     "options": {
       "save": "Save image",
-      "share": "Share image",
-      "cancel": "$t(common:buttons.cancel)"
+      "share": "Share image"
     },
     "save": {
       "succeed": "Image saved",
diff --git a/src/i18n/en/screens/tabs.json b/src/i18n/en/screens/tabs.json
index 53d0f315..22303258 100644
--- a/src/i18n/en/screens/tabs.json
+++ b/src/i18n/en/screens/tabs.json
@@ -49,6 +49,12 @@
       "lists": {
         "name": "Lists"
       },
+      "listAdd": {
+        "name": "Add a List"
+      },
+      "listEdit": {
+        "name": "Edit List"
+      },
       "list": {
         "name": "List: {{list}}"
       },
@@ -87,15 +93,18 @@
         "XXL": "XXL"
       }
     },
-    "profile": {
-      "cancellation": {
-        "title": "Change Not Saved",
-        "message": "Your change has not been saved. Would you discard saving the changes?",
-        "buttons": {
-          "cancel": "$t(common:buttons.cancel)",
-          "discard": "Discard"
+    "listEdit": {
+      "title": "Title",
+      "repliesPolicy": {
+        "heading": "Show replies to:",
+        "options": {
+          "none": "No one",
+          "list": "Members of the list",
+          "followed": "Any followed user"
         }
-      },
+      }
+    },
+    "profile": {
       "feedback": {
         "succeed": "{{type}} updated",
         "failed": "{{type}} update failed, please try again"
@@ -125,8 +134,7 @@
           "options": {
             "public": "Public",
             "unlisted": "Unlisted",
-            "private": "Followers only",
-            "cancel": "$t(common:buttons.cancel)"
+            "private": "Followers only"
           }
         },
         "sensitive": {
@@ -211,8 +219,7 @@
           "title": "Logging out?",
           "message": "After logging out, you need to log in again",
           "buttons": {
-            "logout": "Logout",
-            "cancel": "$t(common:buttons.cancel)"
+            "logout": "Logout"
           }
         }
       }
@@ -229,34 +236,28 @@
         }
       },
       "language": {
-        "heading": "$t(me.stacks.language.name)",
-        "options": {
-          "cancel": "$t(common:buttons.cancel)"
-        }
+        "heading": "$t(me.stacks.language.name)"
       },
       "theme": {
         "heading": "Appearance",
         "options": {
           "auto": "As system",
           "light": "Light mode",
-          "dark": "Dark mode",
-          "cancel": "$t(common:buttons.cancel)"
+          "dark": "Dark mode"
         }
       },
       "darkTheme": {
         "heading": "Dark theme",
         "options": {
           "lighter": "Lighter",
-          "darker": "Darker",
-          "cancel": "$t(common:buttons.cancel)"
+          "darker": "Darker"
         }
       },
       "browser": {
         "heading": "Opening Link",
         "options": {
           "internal": "Inside app",
-          "external": "Use system browser",
-          "cancel": "$t(common:buttons.cancel)"
+          "external": "Use system browser"
         }
       },
       "staticEmoji": {
diff --git a/src/screens/Actions/Domain.tsx b/src/screens/Actions/Domain.tsx
index 4354ac91..009987e0 100644
--- a/src/screens/Actions/Domain.tsx
+++ b/src/screens/Actions/Domain.tsx
@@ -43,10 +43,6 @@ const ActionsDomain: React.FC<Props> = ({ queryKey, rootQueryKey, domain, dismis
             t('shared.header.actions.domain.alert.title', { domain }),
             t('shared.header.actions.domain.alert.message'),
             [
-              {
-                text: t('shared.header.actions.domain.alert.buttons.cancel'),
-                style: 'cancel'
-              },
               {
                 text: t('shared.header.actions.domain.alert.buttons.confirm'),
                 style: 'destructive',
@@ -58,6 +54,10 @@ const ActionsDomain: React.FC<Props> = ({ queryKey, rootQueryKey, domain, dismis
                     domain: domain
                   })
                 }
+              },
+              {
+                text: t('shared.header.actions.domain.alert.buttons.cancel'),
+                style: 'default'
               }
             ]
           )
diff --git a/src/screens/Actions/Status.tsx b/src/screens/Actions/Status.tsx
index 9dfce233..751a9c6e 100644
--- a/src/screens/Actions/Status.tsx
+++ b/src/screens/Actions/Status.tsx
@@ -38,8 +38,7 @@ const ActionsStatus: React.FC<Props> = ({
   const mutation = useTimelineMutation({
     onMutate: true,
     onError: (err: any, params, oldData) => {
-      const theFunction = (params as MutationVarsTimelineUpdateStatusProperty)
-        .payload
+      const theFunction = (params as MutationVarsTimelineUpdateStatusProperty).payload
         ? (params as MutationVarsTimelineUpdateStatusProperty).payload.property
         : 'delete'
       displayMessage({
@@ -108,15 +107,7 @@ const ActionsStatus: React.FC<Props> = ({
             t('shared.header.actions.status.delete.alert.message'),
             [
               {
-                text: t(
-                  'shared.header.actions.status.delete.alert.buttons.cancel'
-                ),
-                style: 'cancel'
-              },
-              {
-                text: t(
-                  'shared.header.actions.status.delete.alert.buttons.confirm'
-                ),
+                text: t('shared.header.actions.status.delete.alert.buttons.confirm'),
                 style: 'destructive',
                 onPress: async () => {
                   dismiss()
@@ -128,6 +119,10 @@ const ActionsStatus: React.FC<Props> = ({
                     id: status.id
                   })
                 }
+              },
+              {
+                text: t('shared.header.actions.status.delete.alert.buttons.cancel'),
+                style: 'default'
               }
             ]
           )
@@ -142,15 +137,7 @@ const ActionsStatus: React.FC<Props> = ({
             t('shared.header.actions.status.deleteEdit.alert.message'),
             [
               {
-                text: t(
-                  'shared.header.actions.status.deleteEdit.alert.buttons.cancel'
-                ),
-                style: 'cancel'
-              },
-              {
-                text: t(
-                  'shared.header.actions.status.deleteEdit.alert.buttons.confirm'
-                ),
+                text: t('shared.header.actions.status.deleteEdit.alert.buttons.confirm'),
                 style: 'destructive',
                 onPress: async () => {
                   let replyToStatus: Mastodon.Status | undefined = undefined
@@ -177,6 +164,10 @@ const ActionsStatus: React.FC<Props> = ({
                       })
                     })
                 }
+              },
+              {
+                text: t('shared.header.actions.status.deleteEdit.alert.buttons.cancel'),
+                style: 'default'
               }
             ]
           )
diff --git a/src/screens/Compose.tsx b/src/screens/Compose.tsx
index 7d17bc82..8d8ee53c 100644
--- a/src/screens/Compose.tsx
+++ b/src/screens/Compose.tsx
@@ -300,7 +300,7 @@ const ScreenCompose: React.FC<RootStackScreenProps<'Screen-Compose'>> = ({
                   t('heading.right.alert.removeReply.description'),
                   [
                     {
-                      text: t('heading.right.alert.removeReply.cancel'),
+                      text: t('common:buttons.cancel'),
                       onPress: () => {
                         composeDispatch({ type: 'posting', payload: false })
                       },
diff --git a/src/screens/Compose/Root/Actions.tsx b/src/screens/Compose/Root/Actions.tsx
index 5ab0945f..ed32fa5e 100644
--- a/src/screens/Compose/Root/Actions.tsx
+++ b/src/screens/Compose/Root/Actions.tsx
@@ -86,7 +86,7 @@ const ComposeActions: React.FC = () => {
             t('content.root.actions.visibility.options.unlisted'),
             t('content.root.actions.visibility.options.private'),
             t('content.root.actions.visibility.options.direct'),
-            t('content.root.actions.visibility.options.cancel')
+            t('common:buttons.cancel')
           ],
           cancelButtonIndex: 4,
           userInterfaceStyle: mode
diff --git a/src/screens/Compose/Root/Footer/Poll.tsx b/src/screens/Compose/Root/Footer/Poll.tsx
index ec72d5e4..b2fbcca7 100644
--- a/src/screens/Compose/Root/Footer/Poll.tsx
+++ b/src/screens/Compose/Root/Footer/Poll.tsx
@@ -195,7 +195,7 @@ const ComposePoll: React.FC = () => {
                 options: [
                   t('content.root.footer.poll.multiple.options.single'),
                   t('content.root.footer.poll.multiple.options.multiple'),
-                  t('content.root.footer.poll.multiple.options.cancel')
+                  t('common:buttons.cancel')
                 ],
                 cancelButtonIndex: 2,
                 userInterfaceStyle: mode
@@ -235,7 +235,7 @@ const ComposePoll: React.FC = () => {
                   ...expirations.map(e =>
                     t(`content.root.footer.poll.expiration.options.${e}`)
                   ),
-                  t('content.root.footer.poll.expiration.options.cancel')
+                  t('common:buttons.cancel')
                 ],
                 cancelButtonIndex: expirations.length,
                 userInterfaceStyle: mode
diff --git a/src/screens/ImagesViewer.tsx b/src/screens/ImagesViewer.tsx
index 72c29015..dff8754f 100644
--- a/src/screens/ImagesViewer.tsx
+++ b/src/screens/ImagesViewer.tsx
@@ -53,7 +53,7 @@ const ScreenImagesViewer = ({
         options: [
           t('content.options.save'),
           t('content.options.share'),
-          t('content.options.cancel')
+          t('common:buttons.cancel')
         ],
         cancelButtonIndex: 2,
         userInterfaceStyle: mode
diff --git a/src/screens/Tabs/Me.tsx b/src/screens/Tabs/Me.tsx
index d7d2ac86..7c244ac5 100644
--- a/src/screens/Tabs/Me.tsx
+++ b/src/screens/Tabs/Me.tsx
@@ -7,8 +7,9 @@ import { Platform } from 'react-native'
 import TabMeBookmarks from './Me/Bookmarks'
 import TabMeConversations from './Me/Cconversations'
 import TabMeFavourites from './Me/Favourites'
+import TabMeList from './Me/List'
+import TabMeListEdit from './Me/ListEdit'
 import TabMeLists from './Me/Lists'
-import TabMeListsList from './Me/ListsList'
 import TabMeProfile from './Me/Profile'
 import TabMePush from './Me/Push'
 import TabMeRoot from './Me/Root'
@@ -41,9 +42,7 @@ const TabMe = React.memo(
           options={({ navigation }: any) => ({
             title: t('me.stacks.bookmarks.name'),
             ...(Platform.OS === 'android' && {
-              headerCenter: () => (
-                <HeaderCenter content={t('me.stacks.bookmarks.name')} />
-              )
+              headerCenter: () => <HeaderCenter content={t('me.stacks.bookmarks.name')} />
             }),
             headerLeft: () => <HeaderLeft onPress={() => navigation.pop(1)} />
           })}
@@ -54,9 +53,7 @@ const TabMe = React.memo(
           options={({ navigation }: any) => ({
             title: t('me.stacks.conversations.name'),
             ...(Platform.OS === 'android' && {
-              headerCenter: () => (
-                <HeaderCenter content={t('me.stacks.conversations.name')} />
-              )
+              headerCenter: () => <HeaderCenter content={t('me.stacks.conversations.name')} />
             }),
             headerLeft: () => <HeaderLeft onPress={() => navigation.pop(1)} />
           })}
@@ -67,29 +64,14 @@ const TabMe = React.memo(
           options={({ navigation }: any) => ({
             title: t('me.stacks.favourites.name'),
             ...(Platform.OS === 'android' && {
-              headerCenter: () => (
-                <HeaderCenter content={t('me.stacks.favourites.name')} />
-              )
+              headerCenter: () => <HeaderCenter content={t('me.stacks.favourites.name')} />
             }),
             headerLeft: () => <HeaderLeft onPress={() => navigation.pop(1)} />
           })}
         />
         <Stack.Screen
-          name='Tab-Me-Lists'
-          component={TabMeLists}
-          options={({ navigation }: any) => ({
-            title: t('me.stacks.lists.name'),
-            ...(Platform.OS === 'android' && {
-              headerCenter: () => (
-                <HeaderCenter content={t('me.stacks.lists.name')} />
-              )
-            }),
-            headerLeft: () => <HeaderLeft onPress={() => navigation.pop(1)} />
-          })}
-        />
-        <Stack.Screen
-          name='Tab-Me-Lists-List'
-          component={TabMeListsList}
+          name='Tab-Me-List'
+          component={TabMeList}
           options={({ route, navigation }: any) => ({
             title: t('me.stacks.list.name', { list: route.params.title }),
             ...(Platform.OS === 'android' && {
@@ -104,6 +86,29 @@ const TabMe = React.memo(
             headerLeft: () => <HeaderLeft onPress={() => navigation.pop(1)} />
           })}
         />
+        <Stack.Screen
+          name='Tab-Me-List-Edit'
+          component={TabMeListEdit}
+          options={{
+            gestureEnabled: false,
+            presentation: 'modal',
+            title: t('me.stacks.listsAdd.name'),
+            ...(Platform.OS === 'android' && {
+              headerCenter: () => <HeaderCenter content={t('me.stacks.listsAdd.name')} />
+            })
+          }}
+        />
+        <Stack.Screen
+          name='Tab-Me-Lists'
+          component={TabMeLists}
+          options={({ navigation }: any) => ({
+            title: t('me.stacks.lists.name'),
+            ...(Platform.OS === 'android' && {
+              headerCenter: () => <HeaderCenter content={t('me.stacks.lists.name')} />
+            }),
+            headerLeft: () => <HeaderLeft onPress={() => navigation.pop(1)} />
+          })}
+        />
         <Stack.Screen
           name='Tab-Me-Profile'
           component={TabMeProfile}
@@ -120,15 +125,10 @@ const TabMe = React.memo(
             headerShown: true,
             title: t('me.stacks.push.name'),
             ...(Platform.OS === 'android' && {
-              headerCenter: () => (
-                <HeaderCenter content={t('me.stacks.push.name')} />
-              )
+              headerCenter: () => <HeaderCenter content={t('me.stacks.push.name')} />
             }),
             headerLeft: () => (
-              <HeaderLeft
-                content='ChevronDown'
-                onPress={() => navigation.goBack()}
-              />
+              <HeaderLeft content='ChevronDown' onPress={() => navigation.goBack()} />
             )
           })}
         />
@@ -146,9 +146,7 @@ const TabMe = React.memo(
           options={({ navigation }: any) => ({
             title: t('me.stacks.fontSize.name'),
             ...(Platform.OS === 'android' && {
-              headerCenter: () => (
-                <HeaderCenter content={t('me.stacks.fontSize.name')} />
-              )
+              headerCenter: () => <HeaderCenter content={t('me.stacks.fontSize.name')} />
             }),
             headerLeft: () => <HeaderLeft onPress={() => navigation.pop(1)} />
           })}
@@ -159,9 +157,7 @@ const TabMe = React.memo(
           options={({ navigation }: any) => ({
             title: t('me.stacks.language.name'),
             ...(Platform.OS === 'android' && {
-              headerCenter: () => (
-                <HeaderCenter content={t('me.stacks.language.name')} />
-              )
+              headerCenter: () => <HeaderCenter content={t('me.stacks.language.name')} />
             }),
             headerLeft: () => <HeaderLeft onPress={() => navigation.pop(1)} />
           })}
@@ -174,15 +170,10 @@ const TabMe = React.memo(
             headerShown: true,
             title: t('me.stacks.switch.name'),
             ...(Platform.OS === 'android' && {
-              headerCenter: () => (
-                <HeaderCenter content={t('me.stacks.switch.name')} />
-              )
+              headerCenter: () => <HeaderCenter content={t('me.stacks.switch.name')} />
             }),
             headerLeft: () => (
-              <HeaderLeft
-                content='ChevronDown'
-                onPress={() => navigation.goBack()}
-              />
+              <HeaderLeft content='ChevronDown' onPress={() => navigation.goBack()} />
             )
           })}
         />
diff --git a/src/screens/Tabs/Me/List.tsx b/src/screens/Tabs/Me/List.tsx
new file mode 100644
index 00000000..1a776be3
--- /dev/null
+++ b/src/screens/Tabs/Me/List.tsx
@@ -0,0 +1,40 @@
+import { HeaderRight } from '@components/Header'
+import Timeline from '@components/Timeline'
+import TimelineDefault from '@components/Timeline/Default'
+import { TabMeStackScreenProps } from '@utils/navigation/navigators'
+import { QueryKeyTimeline } from '@utils/queryHooks/timeline'
+import React, { useEffect } from 'react'
+import { useTranslation } from 'react-i18next'
+
+const TabMeList: React.FC<TabMeStackScreenProps<'Tab-Me-List'>> = ({
+  navigation,
+  route: { key, params }
+}) => {
+  const { t } = useTranslation('screenTabs')
+  const queryKey: QueryKeyTimeline = ['Timeline', { page: 'List', list: params.id }]
+
+  useEffect(() => {
+    navigation.setOptions({
+      headerRight: () => (
+        <HeaderRight
+          accessibilityLabel={t('me.stacks.listEdit.name')}
+          content='Edit'
+          onPress={() =>
+            navigation.navigate('Tab-Me-List-Edit', { type: 'edit', payload: params, key })
+          }
+        />
+      )
+    })
+  }, [params])
+
+  return (
+    <Timeline
+      queryKey={queryKey}
+      customProps={{
+        renderItem: ({ item }) => <TimelineDefault item={item} queryKey={queryKey} />
+      }}
+    />
+  )
+}
+
+export default TabMeList
diff --git a/src/screens/Tabs/Me/ListEdit.tsx b/src/screens/Tabs/Me/ListEdit.tsx
new file mode 100644
index 00000000..a4eab6ee
--- /dev/null
+++ b/src/screens/Tabs/Me/ListEdit.tsx
@@ -0,0 +1,163 @@
+import { EmojisState } from '@components/Emojis/helpers/EmojisContext'
+import haptics from '@components/haptics'
+import { HeaderLeft, HeaderRight } from '@components/Header'
+import ComponentInput from '@components/Input'
+import { displayMessage, Message } from '@components/Message'
+import Selections from '@components/Selections'
+import CustomText from '@components/Text'
+import { CommonActions } from '@react-navigation/native'
+import { TabMeStackScreenProps } from '@utils/navigation/navigators'
+import { QueryKeyLists, useListsMutation } from '@utils/queryHooks/lists'
+import { StyleConstants } from '@utils/styles/constants'
+import { useTheme } from '@utils/styles/ThemeManager'
+import React, { useEffect, useRef, useState } from 'react'
+import { useTranslation } from 'react-i18next'
+import { Alert, ScrollView, TextInput } from 'react-native'
+import { useQueryClient } from 'react-query'
+
+const TabMeListEdit: React.FC<TabMeStackScreenProps<'Tab-Me-List-Edit'>> = ({
+  navigation,
+  route: { params }
+}) => {
+  const { colors, theme } = useTheme()
+  const { t } = useTranslation('screenTabs')
+
+  const messageRef = useRef(null)
+
+  const queryKeyLists: QueryKeyLists = ['Lists']
+  const queryClient = useQueryClient()
+  const mutation = useListsMutation({
+    onSuccess: res => {
+      haptics('Success')
+      queryClient.refetchQueries(queryKeyLists)
+      navigation.pop(1)
+      if (params.type === 'edit') {
+        navigation.dispatch({
+          ...CommonActions.setParams(res),
+          source: params.key
+        })
+      }
+    },
+    onError: () => {
+      displayMessage({
+        ref: messageRef,
+        theme,
+        type: 'error',
+        message: t('common:message.error.message', {
+          function:
+            params.type === 'add' ? t('me.stacks.listAdd.name') : t('me.stacks.listEdit.name')
+        })
+      })
+    }
+  })
+
+  const ref = useRef<TextInput>(null)
+  const [title, setTitle] = useState(params.type === 'edit' ? params.payload.title : '')
+  const inputProps: EmojisState['inputProps'][0] = {
+    ref,
+    value: [title, setTitle],
+    selection: useState({ start: title.length }),
+    isFocused: useRef<boolean>(false),
+    maxLength: 50
+  }
+
+  const [options, setOptions] = useState<
+    { id: 'none' | 'list' | 'followed'; content: string; selected: boolean }[]
+  >([
+    {
+      id: 'none',
+      content: t('me.listEdit.repliesPolicy.options.none'),
+      selected: params.type === 'edit' ? params.payload.replies_policy === 'none' : false
+    },
+    {
+      id: 'list',
+      content: t('me.listEdit.repliesPolicy.options.list'),
+      selected: params.type === 'edit' ? params.payload.replies_policy === 'list' : true
+    },
+    {
+      id: 'followed',
+      content: t('me.listEdit.repliesPolicy.options.followed'),
+      selected: params.type === 'edit' ? params.payload.replies_policy === 'followed' : false
+    }
+  ])
+
+  useEffect(() => {
+    navigation.setOptions({
+      headerLeft: () => (
+        <HeaderLeft
+          content='X'
+          onPress={() => {
+            if (params.type === 'edit' ? params.payload.title !== title : title.length) {
+              Alert.alert(t('common:discard.title'), t('common:discard.message'), [
+                {
+                  text: t('common:buttons.discard'),
+                  style: 'destructive',
+                  onPress: () => navigation.pop(1)
+                },
+                {
+                  text: t('common:buttons.cancel'),
+                  style: 'default'
+                }
+              ])
+            } else {
+              navigation.pop(1)
+            }
+          }}
+        />
+      ),
+      headerRight: () => (
+        <HeaderRight
+          content='Save'
+          disabled={!title.length}
+          loading={mutation.isLoading}
+          onPress={() => {
+            switch (params.type) {
+              case 'add':
+                mutation.mutate({
+                  type: 'add',
+                  payload: {
+                    title,
+                    replies_policy: options.find(option => option.selected)?.id || 'list'
+                  }
+                })
+                break
+              case 'edit':
+                mutation.mutate({
+                  type: 'edit',
+                  payload: {
+                    id: params.payload.id,
+                    title,
+                    replies_policy: options.find(option => option.selected)?.id || 'list'
+                  }
+                })
+                break
+            }
+          }}
+        />
+      )
+    })
+  }, [title.length, options])
+
+  return (
+    <ScrollView style={{ paddingHorizontal: StyleConstants.Spacing.Global.PagePadding }}>
+      <ComponentInput {...inputProps} autoFocus title={t('me.listEdit.title')} />
+
+      <CustomText
+        fontStyle='M'
+        fontWeight='Bold'
+        style={{
+          color: colors.primaryDefault,
+          marginBottom: StyleConstants.Spacing.XS,
+          marginTop: StyleConstants.Spacing.M
+        }}
+      >
+        {t('me.listEdit.repliesPolicy.heading')}
+      </CustomText>
+      <Selections options={options} setOptions={setOptions} />
+
+      <Message ref={messageRef} />
+    </ScrollView>
+  )
+}
+
+export default TabMeListEdit
diff --git a/src/screens/Tabs/Me/Lists.tsx b/src/screens/Tabs/Me/Lists.tsx
index 1a03abe5..76efe7c0 100644
--- a/src/screens/Tabs/Me/Lists.tsx
+++ b/src/screens/Tabs/Me/Lists.tsx
@@ -1,12 +1,25 @@
+import { HeaderRight } from '@components/Header'
 import { MenuContainer, MenuRow } from '@components/Menu'
 import { TabMeStackScreenProps } from '@utils/navigation/navigators'
 import { useListsQuery } from '@utils/queryHooks/lists'
-import React from 'react'
+import React, { useEffect } from 'react'
+import { useTranslation } from 'react-i18next'
 
-const TabMeLists: React.FC<TabMeStackScreenProps<'Tab-Me-Lists'>> = ({
-  navigation
-}) => {
+const TabMeLists: React.FC<TabMeStackScreenProps<'Tab-Me-Lists'>> = ({ navigation }) => {
   const { data } = useListsQuery({})
+  const { t } = useTranslation('screenTabs')
+
+  useEffect(() => {
+    navigation.setOptions({
+      headerRight: () => (
+        <HeaderRight
+          accessibilityLabel={t('me.stacks.listAdd.name')}
+          content='Plus'
+          onPress={() => navigation.navigate('Tab-Me-List-Edit', { type: 'add' })}
+        />
+      )
+    })
+  }, [])
 
   return (
     <MenuContainer>
@@ -16,12 +29,7 @@ const TabMeLists: React.FC<TabMeStackScreenProps<'Tab-Me-Lists'>> = ({
           iconFront='List'
           iconBack='ChevronRight'
           title={d.title}
-          onPress={() =>
-            navigation.navigate('Tab-Me-Lists-List', {
-              list: d.id,
-              title: d.title
-            })
-          }
+          onPress={() => navigation.navigate('Tab-Me-List', d)}
         />
       ))}
     </MenuContainer>
diff --git a/src/screens/Tabs/Me/ListsList.tsx b/src/screens/Tabs/Me/ListsList.tsx
deleted file mode 100644
index 3c76cf85..00000000
--- a/src/screens/Tabs/Me/ListsList.tsx
+++ /dev/null
@@ -1,26 +0,0 @@
-import Timeline from '@components/Timeline'
-import TimelineDefault from '@components/Timeline/Default'
-import { TabMeStackScreenProps } from '@utils/navigation/navigators'
-import { QueryKeyTimeline } from '@utils/queryHooks/timeline'
-import React from 'react'
-
-const TabMeListsList: React.FC<TabMeStackScreenProps<'Tab-Me-Lists-List'>> = ({
-  route: {
-    params: { list }
-  }
-}) => {
-  const queryKey: QueryKeyTimeline = ['Timeline', { page: 'List', list }]
-
-  return (
-    <Timeline
-      queryKey={queryKey}
-      customProps={{
-        renderItem: ({ item }) => (
-          <TimelineDefault item={item} queryKey={queryKey} />
-        )
-      }}
-    />
-  )
-}
-
-export default TabMeListsList
diff --git a/src/screens/Tabs/Me/Profile/Fields.tsx b/src/screens/Tabs/Me/Profile/Fields.tsx
index a39b62d6..52cc1b4a 100644
--- a/src/screens/Tabs/Me/Profile/Fields.tsx
+++ b/src/screens/Tabs/Me/Profile/Fields.tsx
@@ -90,20 +90,21 @@ const TabMeProfileFields: React.FC<
     navigation.setOptions({
       headerLeft: () => (
         <HeaderLeft
+          content='X'
           onPress={() => {
             if (dirty) {
               Alert.alert(
-                t('me.profile.cancellation.title'),
-                t('me.profile.cancellation.message'),
+                t('common:discard.title'),
+                t('common:discard.message'),
                 [
                   {
-                    text: t('me.profile.cancellation.buttons.cancel'),
-                    style: 'default'
-                  },
-                  {
-                    text: t('me.profile.cancellation.buttons.discard'),
+                    text: t('common:buttons.discard'),
                     style: 'destructive',
                     onPress: () => navigation.navigate('Tab-Me-Profile-Root')
+                  },
+                  {
+                    text: t('common:buttons.cancel'),
+                    style: 'default'
                   }
                 ]
               )
diff --git a/src/screens/Tabs/Me/Profile/Name.tsx b/src/screens/Tabs/Me/Profile/Name.tsx
index 0760ef7a..e2add288 100644
--- a/src/screens/Tabs/Me/Profile/Name.tsx
+++ b/src/screens/Tabs/Me/Profile/Name.tsx
@@ -44,20 +44,21 @@ const TabMeProfileName: React.FC<
     navigation.setOptions({
       headerLeft: () => (
         <HeaderLeft
+          content='X'
           onPress={() => {
             if (dirty) {
               Alert.alert(
-                t('me.profile.cancellation.title'),
-                t('me.profile.cancellation.message'),
+                t('common:discard.title'),
+                t('common:discard.message'),
                 [
                   {
-                    text: t('me.profile.cancellation.buttons.cancel'),
-                    style: 'default'
-                  },
-                  {
-                    text: t('me.profile.cancellation.buttons.discard'),
+                    text: t('common:buttons.discard'),
                     style: 'destructive',
                     onPress: () => navigation.navigate('Tab-Me-Profile-Root')
+                  },
+                  {
+                    text: t('common:buttons.cancel'),
+                    style: 'default'
                   }
                 ]
               )
diff --git a/src/screens/Tabs/Me/Profile/Note.tsx b/src/screens/Tabs/Me/Profile/Note.tsx
index cda09ebf..f3cc5407 100644
--- a/src/screens/Tabs/Me/Profile/Note.tsx
+++ b/src/screens/Tabs/Me/Profile/Note.tsx
@@ -44,20 +44,21 @@ const TabMeProfileNote: React.FC<
     navigation.setOptions({
       headerLeft: () => (
         <HeaderLeft
+          content='X'
           onPress={() => {
             if (dirty) {
               Alert.alert(
-                t('me.profile.cancellation.title'),
-                t('me.profile.cancellation.message'),
+                t('common:discard.title'),
+                t('common:discard.message'),
                 [
                   {
-                    text: t('me.profile.cancellation.buttons.cancel'),
-                    style: 'default'
-                  },
-                  {
-                    text: t('me.profile.cancellation.buttons.discard'),
+                    text: t('common:buttons.discard'),
                     style: 'destructive',
                     onPress: () => navigation.navigate('Tab-Me-Profile-Root')
+                  },
+                  {
+                    text: t('common:buttons.cancel'),
+                    style: 'default'
                   }
                 ]
               )
diff --git a/src/screens/Tabs/Me/Profile/Root.tsx b/src/screens/Tabs/Me/Profile/Root.tsx
index 10d43dd8..d66aa704 100644
--- a/src/screens/Tabs/Me/Profile/Root.tsx
+++ b/src/screens/Tabs/Me/Profile/Root.tsx
@@ -33,7 +33,7 @@ const TabMeProfileRoot: React.FC<
           t('me.profile.root.visibility.options.public'),
           t('me.profile.root.visibility.options.unlisted'),
           t('me.profile.root.visibility.options.private'),
-          t('me.profile.root.visibility.options.cancel')
+          t('common:buttons.cancel')
         ],
         cancelButtonIndex: 3,
         userInterfaceStyle: mode
diff --git a/src/screens/Tabs/Me/Root/Logout.tsx b/src/screens/Tabs/Me/Root/Logout.tsx
index 5a07c7f0..a25f7bb3 100644
--- a/src/screens/Tabs/Me/Root/Logout.tsx
+++ b/src/screens/Tabs/Me/Root/Logout.tsx
@@ -27,27 +27,23 @@ const Logout: React.FC = () => {
       }}
       destructive
       onPress={() =>
-        Alert.alert(
-          t('me.root.logout.alert.title'),
-          t('me.root.logout.alert.message'),
-          [
-            {
-              text: t('me.root.logout.alert.buttons.logout'),
-              style: 'destructive' as const,
-              onPress: () => {
-                if (instance) {
-                  haptics('Success')
-                  queryClient.clear()
-                  dispatch(removeInstance(instance))
-                }
+        Alert.alert(t('me.root.logout.alert.title'), t('me.root.logout.alert.message'), [
+          {
+            text: t('me.root.logout.alert.buttons.logout'),
+            style: 'destructive',
+            onPress: () => {
+              if (instance) {
+                haptics('Success')
+                queryClient.clear()
+                dispatch(removeInstance(instance))
               }
-            },
-            {
-              text: t('me.root.logout.alert.buttons.cancel'),
-              style: 'cancel' as const
             }
-          ]
-        )
+          },
+          {
+            text: t('common:buttons.cancel'),
+            style: 'default'
+          }
+        ])
       }
     />
   )
diff --git a/src/screens/Tabs/Me/Settings/App.tsx b/src/screens/Tabs/Me/Settings/App.tsx
index 7621a635..e927104c 100644
--- a/src/screens/Tabs/Me/Settings/App.tsx
+++ b/src/screens/Tabs/Me/Settings/App.tsx
@@ -69,7 +69,7 @@ const SettingsApp: React.FC = () => {
                 t('me.settings.theme.options.auto'),
                 t('me.settings.theme.options.light'),
                 t('me.settings.theme.options.dark'),
-                t('me.settings.theme.options.cancel')
+                t('common:buttons.cancel')
               ],
               cancelButtonIndex: 3
             },
@@ -103,7 +103,7 @@ const SettingsApp: React.FC = () => {
               options: [
                 t('me.settings.darkTheme.options.lighter'),
                 t('me.settings.darkTheme.options.darker'),
-                t('me.settings.darkTheme.options.cancel')
+                t('common:buttons.cancel')
               ],
               cancelButtonIndex: 2
             },
@@ -133,7 +133,7 @@ const SettingsApp: React.FC = () => {
               options: [
                 t('me.settings.browser.options.internal'),
                 t('me.settings.browser.options.external'),
-                t('me.settings.browser.options.cancel')
+                t('common:buttons.cancel')
               ],
               cancelButtonIndex: 2
             },
diff --git a/src/utils/navigation/navigators.ts b/src/utils/navigation/navigators.ts
index f75eaba8..f9659575 100644
--- a/src/utils/navigation/navigators.ts
+++ b/src/utils/navigation/navigators.ts
@@ -63,17 +63,18 @@ export type RootStackParamList = {
     share?: { text?: string; media?: { uri: string; mime: string }[] }
   }
 }
-export type RootStackScreenProps<T extends keyof RootStackParamList> =
-  NativeStackScreenProps<RootStackParamList, T>
+export type RootStackScreenProps<T extends keyof RootStackParamList> = NativeStackScreenProps<
+  RootStackParamList,
+  T
+>
 
 export type ScreenComposeStackParamList = {
   'Screen-Compose-Root': undefined
   'Screen-Compose-EditAttachment': { index: number }
   'Screen-Compose-DraftsList': { timestamp: number }
 }
-export type ScreenComposeStackScreenProps<
-  T extends keyof ScreenComposeStackParamList
-> = NativeStackScreenProps<ScreenComposeStackParamList, T>
+export type ScreenComposeStackScreenProps<T extends keyof ScreenComposeStackParamList> =
+  NativeStackScreenProps<ScreenComposeStackParamList, T>
 
 export type ScreenTabsStackParamList = {
   'Tab-Local': NavigatorScreenParams<TabLocalStackParamList>
@@ -82,8 +83,10 @@ export type ScreenTabsStackParamList = {
   'Tab-Notifications': NavigatorScreenParams<TabNotificationsStackParamList>
   'Tab-Me': NavigatorScreenParams<TabMeStackParamList>
 }
-export type ScreenTabsScreenProps<T extends keyof ScreenTabsStackParamList> =
-  BottomTabScreenProps<ScreenTabsStackParamList, T>
+export type ScreenTabsScreenProps<T extends keyof ScreenTabsStackParamList> = BottomTabScreenProps<
+  ScreenTabsStackParamList,
+  T
+>
 
 export type TabSharedStackParamList = {
   'Tab-Shared-Account': {
@@ -135,11 +138,17 @@ export type TabMeStackParamList = {
   'Tab-Me-Bookmarks': undefined
   'Tab-Me-Conversations': undefined
   'Tab-Me-Favourites': undefined
+  'Tab-Me-List': Mastodon.List
+  'Tab-Me-List-Edit':
+    | {
+        type: 'add'
+      }
+    | {
+        type: 'edit'
+        payload: Mastodon.List
+        key: string // To update title after successful mutation
+      }
   'Tab-Me-Lists': undefined
-  'Tab-Me-Lists-List': {
-    list: Mastodon.List['id']
-    title: Mastodon.List['title']
-  }
   'Tab-Me-Profile': undefined
   'Tab-Me-Push': undefined
   'Tab-Me-Settings': undefined
@@ -147,11 +156,12 @@ export type TabMeStackParamList = {
   'Tab-Me-Settings-Language': undefined
   'Tab-Me-Switch': undefined
 } & TabSharedStackParamList
-export type TabMeStackScreenProps<T extends keyof TabMeStackParamList> =
-  NativeStackScreenProps<TabMeStackParamList, T>
-export type TabMeStackNavigationProp<
-  RouteName extends keyof TabMeStackParamList
-> = StackNavigationProp<TabMeStackParamList, RouteName>
+export type TabMeStackScreenProps<T extends keyof TabMeStackParamList> = NativeStackScreenProps<
+  TabMeStackParamList,
+  T
+>
+export type TabMeStackNavigationProp<RouteName extends keyof TabMeStackParamList> =
+  StackNavigationProp<TabMeStackParamList, RouteName>
 
 export type TabMeProfileStackParamList = {
   'Tab-Me-Profile-Root': undefined
@@ -165,6 +175,5 @@ export type TabMeProfileStackParamList = {
     fields?: Mastodon.Source['fields']
   }
 }
-export type TabMeProfileStackScreenProps<
-  T extends keyof TabMeProfileStackParamList
-> = NativeStackScreenProps<TabMeProfileStackParamList, T>
+export type TabMeProfileStackScreenProps<T extends keyof TabMeProfileStackParamList> =
+  NativeStackScreenProps<TabMeProfileStackParamList, T>
diff --git a/src/utils/queryHooks/lists.ts b/src/utils/queryHooks/lists.ts
index c1d381de..ac09607f 100644
--- a/src/utils/queryHooks/lists.ts
+++ b/src/utils/queryHooks/lists.ts
@@ -1,8 +1,8 @@
 import apiInstance from '@api/instance'
 import { AxiosError } from 'axios'
-import { useQuery, UseQueryOptions } from 'react-query'
+import { useMutation, UseMutationOptions, useQuery, UseQueryOptions } from 'react-query'
 
-export type QueryKey = ['Lists']
+export type QueryKeyLists = ['Lists']
 
 const queryFunction = async () => {
   const res = await apiInstance<Mastodon.List[]>({
@@ -12,13 +12,49 @@ const queryFunction = async () => {
   return res.body
 }
 
-const useListsQuery = ({
-  options
-}: {
-  options?: UseQueryOptions<Mastodon.List[], AxiosError>
-}) => {
-  const queryKey: QueryKey = ['Lists']
+const useListsQuery = ({ options }: { options?: UseQueryOptions<Mastodon.List[], AxiosError> }) => {
+  const queryKey: QueryKeyLists = ['Lists']
   return useQuery(queryKey, queryFunction, options)
 }
 
-export { useListsQuery }
+type MutationVarsLists =
+  | {
+      type: 'add'
+      payload: Omit<Mastodon.List, 'id'>
+    }
+  | {
+      type: 'edit'
+      payload: Mastodon.List
+    }
+
+const mutationFunction = async (params: MutationVarsLists) => {
+  const body = new FormData()
+  switch (params.type) {
+    case 'add':
+      body.append('title', params.payload.title)
+      body.append('replies_policy', params.payload.replies_policy)
+
+      return apiInstance<Mastodon.List>({
+        method: 'post',
+        url: 'lists',
+        body
+      }).then(res => res.body)
+    case 'edit':
+      body.append('title', params.payload.title)
+      body.append('replies_policy', params.payload.replies_policy)
+
+      return apiInstance<Mastodon.List>({
+        method: 'put',
+        url: `lists/${params.payload.id}`,
+        body
+      }).then(res => res.body)
+  }
+}
+
+const useListsMutation = (
+  options: UseMutationOptions<Mastodon.List, AxiosError, MutationVarsLists>
+) => {
+  return useMutation(mutationFunction, options)
+}
+
+export { useListsQuery, useListsMutation }

From 0cc1cdd4b6295772e98a889f41ae668be487774f Mon Sep 17 00:00:00 2001
From: xmflsct <me@xmflsct.com>
Date: Wed, 30 Nov 2022 23:47:05 +0100
Subject: [PATCH 08/40] Partial fix #495

Add delete list
Also trying out new context menu
---
 ios/Podfile.lock              |  12 ++
 package.json                  |   5 +-
 src/i18n/en/common.json       |   3 +-
 src/i18n/en/screens/tabs.json |   7 +
 src/screens/Tabs/Me/List.tsx  |  82 +++++++-
 src/utils/queryHooks/lists.ts |   9 +
 yarn.lock                     | 355 +++++++++++++++++++++++++++++++++-
 7 files changed, 461 insertions(+), 12 deletions(-)

diff --git a/ios/Podfile.lock b/ios/Podfile.lock
index 80c3ab78..37023dbe 100644
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -301,10 +301,14 @@ PODS:
     - React
   - react-native-image-picker (4.10.1):
     - React-Core
+  - react-native-ios-context-menu (1.15.1):
+    - React-Core
   - react-native-language-detection (0.1.0):
     - React
   - react-native-live-text-image-view (0.4.0):
     - React-Core
+  - react-native-menu (0.7.2):
+    - React
   - react-native-netinfo (9.3.7):
     - React-Core
   - react-native-pager-view (6.1.2):
@@ -492,8 +496,10 @@ DEPENDENCIES:
   - "react-native-cameraroll (from `../node_modules/@react-native-camera-roll/camera-roll`)"
   - react-native-context-menu-view (from `../node_modules/react-native-context-menu-view`)
   - react-native-image-picker (from `../node_modules/react-native-image-picker`)
+  - react-native-ios-context-menu (from `../node_modules/react-native-ios-context-menu`)
   - react-native-language-detection (from `../node_modules/react-native-language-detection`)
   - react-native-live-text-image-view (from `../node_modules/react-native-live-text-image-view`)
+  - "react-native-menu (from `../node_modules/@react-native-menu/menu`)"
   - "react-native-netinfo (from `../node_modules/@react-native-community/netinfo`)"
   - react-native-pager-view (from `../node_modules/react-native-pager-view`)
   - "react-native-paste-input (from `../node_modules/@mattermost/react-native-paste-input`)"
@@ -625,10 +631,14 @@ EXTERNAL SOURCES:
     :path: "../node_modules/react-native-context-menu-view"
   react-native-image-picker:
     :path: "../node_modules/react-native-image-picker"
+  react-native-ios-context-menu:
+    :path: "../node_modules/react-native-ios-context-menu"
   react-native-language-detection:
     :path: "../node_modules/react-native-language-detection"
   react-native-live-text-image-view:
     :path: "../node_modules/react-native-live-text-image-view"
+  react-native-menu:
+    :path: "../node_modules/@react-native-menu/menu"
   react-native-netinfo:
     :path: "../node_modules/@react-native-community/netinfo"
   react-native-pager-view:
@@ -734,8 +744,10 @@ SPEC CHECKSUMS:
   react-native-cameraroll: a40b082318eb1ecd0336a2f29d9f74b7f2c8cae8
   react-native-context-menu-view: b0beca02aad4bd9f9d7d932bf437e0a03baa69ef
   react-native-image-picker: f2ab1215d17bcfe27b0eb6417cc236fd1f4775e7
+  react-native-ios-context-menu: b170594b4448c0cd10c79e13432216bac99de1ac
   react-native-language-detection: 0e43195ad014974f1b7a31b64820eff34a243f2d
   react-native-live-text-image-view: 483bacfdba464162b8cf176bba555364f18b584c
+  react-native-menu: 8e172cfcf0e42e92f028e7781eddf84d430cae24
   react-native-netinfo: 2517ad504b3d303e90d7a431b0fcaef76d207983
   react-native-pager-view: 54bed894cecebe28cede54c01038d9d1e122de43
   react-native-paste-input: 183ad7dc224e192719616f4258dde5b548627d08
diff --git a/package.json b/package.json
index 4e43b860..34ddf089 100644
--- a/package.json
+++ b/package.json
@@ -33,6 +33,7 @@
     "@react-native-community/blur": "^4.3.0",
     "@react-native-community/netinfo": "9.3.7",
     "@react-native-community/segmented-control": "^2.2.2",
+    "@react-native-menu/menu": "^0.7.2",
     "@react-navigation/bottom-tabs": "^6.4.3",
     "@react-navigation/native": "^6.0.16",
     "@react-navigation/native-stack": "^6.9.4",
@@ -77,6 +78,7 @@
     "react-native-gesture-handler": "~2.8.0",
     "react-native-htmlview": "^0.16.0",
     "react-native-image-picker": "^4.10.1",
+    "react-native-ios-context-menu": "^1.15.1",
     "react-native-language-detection": "^0.1.0",
     "react-native-live-text-image-view": "^0.4.0",
     "react-native-pager-view": "^6.1.2",
@@ -92,7 +94,8 @@
     "react-redux": "^8.0.5",
     "redux-persist": "^6.0.0",
     "rn-placeholder": "^3.0.3",
-    "valid-url": "^1.0.9"
+    "valid-url": "^1.0.9",
+    "zeego": "^0.5.0"
   },
   "devDependencies": {
     "@babel/core": "^7.20.5",
diff --git a/src/i18n/en/common.json b/src/i18n/en/common.json
index 6a81edbb..14ce79e7 100644
--- a/src/i18n/en/common.json
+++ b/src/i18n/en/common.json
@@ -4,7 +4,8 @@
     "apply": "Apply",
     "cancel": "Cancel",
     "discard": "Discard",
-    "continue": "Continue"
+    "continue": "Continue",
+    "delete": "Delete"
   },
   "customEmoji": {
     "accessibilityLabel": "Custom emoji {{emoji}}"
diff --git a/src/i18n/en/screens/tabs.json b/src/i18n/en/screens/tabs.json
index 22303258..c50884bb 100644
--- a/src/i18n/en/screens/tabs.json
+++ b/src/i18n/en/screens/tabs.json
@@ -104,6 +104,13 @@
         }
       }
     },
+    "listDelete": {
+      "heading": "Delete list",
+      "confirm": {
+        "title": "Delete list \"{{list}}\"?",
+        "message": "This action is not recoverable."
+      }
+    },
     "profile": {
       "feedback": {
         "succeed": "{{type}} updated",
diff --git a/src/screens/Tabs/Me/List.tsx b/src/screens/Tabs/Me/List.tsx
index 1a776be3..e1d1625e 100644
--- a/src/screens/Tabs/Me/List.tsx
+++ b/src/screens/Tabs/Me/List.tsx
@@ -1,28 +1,94 @@
-import { HeaderRight } from '@components/Header'
+import Icon from '@components/Icon'
+import { displayMessage } from '@components/Message'
 import Timeline from '@components/Timeline'
 import TimelineDefault from '@components/Timeline/Default'
 import { TabMeStackScreenProps } from '@utils/navigation/navigators'
+import { QueryKeyLists, useListsMutation } from '@utils/queryHooks/lists'
 import { QueryKeyTimeline } from '@utils/queryHooks/timeline'
+import { StyleConstants } from '@utils/styles/constants'
+import { useTheme } from '@utils/styles/ThemeManager'
 import React, { useEffect } from 'react'
 import { useTranslation } from 'react-i18next'
+import { Alert } from 'react-native'
+import { useQueryClient } from 'react-query'
+import * as DropdownMenu from 'zeego/dropdown-menu'
 
 const TabMeList: React.FC<TabMeStackScreenProps<'Tab-Me-List'>> = ({
   navigation,
   route: { key, params }
 }) => {
+  const { colors, theme } = useTheme()
   const { t } = useTranslation('screenTabs')
   const queryKey: QueryKeyTimeline = ['Timeline', { page: 'List', list: params.id }]
 
+  const queryKeyLists: QueryKeyLists = ['Lists']
+  const queryClient = useQueryClient()
+  const mutation = useListsMutation({
+    onSuccess: () => {
+      queryClient.refetchQueries(queryKeyLists)
+      navigation.pop(1)
+    },
+    onError: () => {
+      displayMessage({
+        theme,
+        type: 'error',
+        message: t('common:message.error.message', {
+          function: t('me.listDelete.heading')
+        })
+      })
+    }
+  })
+
   useEffect(() => {
     navigation.setOptions({
       headerRight: () => (
-        <HeaderRight
-          accessibilityLabel={t('me.stacks.listEdit.name')}
-          content='Edit'
-          onPress={() =>
-            navigation.navigate('Tab-Me-List-Edit', { type: 'edit', payload: params, key })
-          }
-        />
+        <DropdownMenu.Root>
+          <DropdownMenu.Trigger>
+            <Icon
+              name='MoreHorizontal'
+              size={StyleConstants.Spacing.M * 1.25}
+              color={colors.primaryDefault}
+            />
+          </DropdownMenu.Trigger>
+
+          <DropdownMenu.Content>
+            <DropdownMenu.Item
+              key='list-edit'
+              onSelect={() =>
+                navigation.navigate('Tab-Me-List-Edit', {
+                  type: 'edit',
+                  payload: params,
+                  key
+                })
+              }
+            >
+              <DropdownMenu.ItemTitle children={t('me.stacks.listEdit.name')} />
+              <DropdownMenu.ItemIcon iosIconName='square.and.pencil' />
+            </DropdownMenu.Item>
+
+            <DropdownMenu.Item
+              key='list-delete'
+              destructive
+              onSelect={() =>
+                Alert.alert(
+                  t('me.listDelete.confirm.title', { list: params.title.slice(0, 6) }),
+                  t('me.listDelete.confirm.message'),
+                  [
+                    {
+                      text: t('common:buttons.delete'),
+                      style: 'destructive',
+                      onPress: () => mutation.mutate({ type: 'delete', payload: params })
+                    },
+                    { text: t('common:buttons.cancel') }
+                  ]
+                )
+              }
+            >
+              <DropdownMenu.ItemTitle children={t('me.listDelete.heading')} />
+              <DropdownMenu.ItemIcon iosIconName='trash' />
+            </DropdownMenu.Item>
+          </DropdownMenu.Content>
+        </DropdownMenu.Root>
       )
     })
   }, [params])
diff --git a/src/utils/queryHooks/lists.ts b/src/utils/queryHooks/lists.ts
index ac09607f..865928b2 100644
--- a/src/utils/queryHooks/lists.ts
+++ b/src/utils/queryHooks/lists.ts
@@ -26,6 +26,10 @@ type MutationVarsLists =
       type: 'edit'
       payload: Mastodon.List
     }
+  | {
+      type: 'delete'
+      payload: Pick<Mastodon.List, 'id'>
+    }
 
 const mutationFunction = async (params: MutationVarsLists) => {
   const body = new FormData()
@@ -48,6 +52,11 @@ const mutationFunction = async (params: MutationVarsLists) => {
         url: `lists/${params.payload.id}`,
         body
       }).then(res => res.body)
+    case 'delete':
+      return apiInstance({
+        method: 'delete',
+        url: `lists/${params.payload.id}`
+      })
   }
 }
 
diff --git a/yarn.lock b/yarn.lock
index b2f1aa78..9bfa0ac7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1124,6 +1124,13 @@
   dependencies:
     regenerator-runtime "^0.13.10"
 
+"@babel/runtime@^7.13.10":
+  version "7.20.6"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.20.6.tgz#facf4879bfed9b5326326273a64220f099b0fce3"
+  integrity sha512-Q+8MqP7TiHMWzSfwiJwXCjyf4GYA4Dgw3emg/7xmwsdLJOZUp+nMqcOwOzzYheuM1rhDu8FSj2l0aoMygEuXuA==
+  dependencies:
+    regenerator-runtime "^0.13.11"
+
 "@babel/template@^7.0.0", "@babel/template@^7.18.10", "@babel/template@^7.8.6":
   version "7.18.10"
   resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.18.10.tgz#6f9134835970d1dbf0835c0d100c9f38de0c5e71"
@@ -1188,6 +1195,11 @@
   resolved "https://registry.yarnpkg.com/@colors/colors/-/colors-1.5.0.tgz#bb504579c1cae923e6576a4f5da43d25f97bdbd9"
   integrity sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ==
 
+"@dominicstop/ts-event-emitter@^1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@dominicstop/ts-event-emitter/-/ts-event-emitter-1.1.0.tgz#1f3d3fa878a1ccab686931280757954719cf88e4"
+  integrity sha512-CcxmJIvUb1vsFheuGGVSQf4KdPZC44XolpUT34+vlal+LyQoBUOn31pjFET5M9ctOxEpt8xa0M3/2M7uUiAoJw==
+
 "@egjs/hammerjs@^2.0.17":
   version "2.0.17"
   resolved "https://registry.yarnpkg.com/@egjs/hammerjs/-/hammerjs-2.0.17.tgz#5dc02af75a6a06e4c2db0202cae38c9263895124"
@@ -2003,6 +2015,261 @@
     mkdirp "^1.0.4"
     rimraf "^3.0.2"
 
+"@radix-ui/popper@0.1.0":
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/@radix-ui/popper/-/popper-0.1.0.tgz#c387a38f31b7799e1ea0d2bb1ca0c91c2931b063"
+  integrity sha512-uzYeElL3w7SeNMuQpXiFlBhTT+JyaNMCwDfjKkrzugEcYrf5n52PHqncNdQPUtR42hJh8V9FsqyEDbDxkeNjJQ==
+  dependencies:
+    "@babel/runtime" "^7.13.10"
+    csstype "^3.0.4"
+
+"@radix-ui/primitive@0.1.0":
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/@radix-ui/primitive/-/primitive-0.1.0.tgz#6206b97d379994f0d1929809db035733b337e543"
+  integrity sha512-tqxZKybwN5Fa3VzZry4G6mXAAb9aAqKmPtnVbZpL0vsBwvOHTBwsjHVPXylocYLwEtBY9SCe665bYnNB515uoA==
+  dependencies:
+    "@babel/runtime" "^7.13.10"
+
+"@radix-ui/react-arrow@0.1.4":
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-arrow/-/react-arrow-0.1.4.tgz#a871448a418cd3507d83840fdd47558cb961672b"
+  integrity sha512-BB6XzAb7Ml7+wwpFdYVtZpK1BlMgqyafSQNGzhIpSZ4uXvXOHPlR5GP8M449JkeQzgQjv9Mp1AsJxFC0KuOtuA==
+  dependencies:
+    "@babel/runtime" "^7.13.10"
+    "@radix-ui/react-primitive" "0.1.4"
+
+"@radix-ui/react-collection@0.1.4":
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-collection/-/react-collection-0.1.4.tgz#734061ffd5bb93e88889d49b87391a73a63824c9"
+  integrity sha512-3muGI15IdgaDFjOcO7xX8a35HQRBRF6LH9pS6UCeZeRmbslkVeHyJRQr2rzICBUoX7zgIA0kXyMDbpQnJGyJTA==
+  dependencies:
+    "@babel/runtime" "^7.13.10"
+    "@radix-ui/react-compose-refs" "0.1.0"
+    "@radix-ui/react-context" "0.1.1"
+    "@radix-ui/react-primitive" "0.1.4"
+    "@radix-ui/react-slot" "0.1.2"
+
+"@radix-ui/react-compose-refs@0.1.0":
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-compose-refs/-/react-compose-refs-0.1.0.tgz#cff6e780a0f73778b976acff2c2a5b6551caab95"
+  integrity sha512-eyclbh+b77k+69Dk72q3694OHrn9B3QsoIRx7ywX341U9RK1ThgQjMFZoPtmZNQTksXHLNEiefR8hGVeFyInGg==
+  dependencies:
+    "@babel/runtime" "^7.13.10"
+
+"@radix-ui/react-context@0.1.1":
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-context/-/react-context-0.1.1.tgz#06996829ea124d9a1bc1dbe3e51f33588fab0875"
+  integrity sha512-PkyVX1JsLBioeu0jB9WvRpDBBLtLZohVDT3BB5CTSJqActma8S8030P57mWZb4baZifMvN7KKWPAA40UmWKkQg==
+  dependencies:
+    "@babel/runtime" "^7.13.10"
+
+"@radix-ui/react-dismissable-layer@0.1.5":
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-dismissable-layer/-/react-dismissable-layer-0.1.5.tgz#9379032351e79028d472733a5cc8ba4a0ea43314"
+  integrity sha512-J+fYWijkX4M4QKwf9dtu1oC0U6e6CEl8WhBp3Ad23yz2Hia0XCo6Pk/mp5CAFy4QBtQedTSkhW05AdtSOEoajQ==
+  dependencies:
+    "@babel/runtime" "^7.13.10"
+    "@radix-ui/primitive" "0.1.0"
+    "@radix-ui/react-compose-refs" "0.1.0"
+    "@radix-ui/react-primitive" "0.1.4"
+    "@radix-ui/react-use-body-pointer-events" "0.1.1"
+    "@radix-ui/react-use-callback-ref" "0.1.0"
+    "@radix-ui/react-use-escape-keydown" "0.1.0"
+
+"@radix-ui/react-dropdown-menu@0.1.6":
+  version "0.1.6"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-dropdown-menu/-/react-dropdown-menu-0.1.6.tgz#3203229788cd57e552c9f19dcc7008e2b545919c"
+  integrity sha512-RZhtzjWwJ4ZBN7D8ek4Zn+ilHzYuYta9yIxFnbC0pfqMnSi67IQNONo1tuuNqtFh9SRHacPKc65zo+kBBlxtdg==
+  dependencies:
+    "@babel/runtime" "^7.13.10"
+    "@radix-ui/primitive" "0.1.0"
+    "@radix-ui/react-compose-refs" "0.1.0"
+    "@radix-ui/react-context" "0.1.1"
+    "@radix-ui/react-id" "0.1.5"
+    "@radix-ui/react-menu" "0.1.6"
+    "@radix-ui/react-primitive" "0.1.4"
+    "@radix-ui/react-use-controllable-state" "0.1.0"
+
+"@radix-ui/react-focus-guards@0.1.0":
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-focus-guards/-/react-focus-guards-0.1.0.tgz#ba3b6f902cba7826569f8edc21ff8223dece7def"
+  integrity sha512-kRx/swAjEfBpQ3ns7J3H4uxpXuWCqN7MpALiSDOXiyo2vkWv0L9sxvbpZeTulINuE3CGMzicVMuNc/VWXjFKOg==
+  dependencies:
+    "@babel/runtime" "^7.13.10"
+
+"@radix-ui/react-focus-scope@0.1.4":
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-focus-scope/-/react-focus-scope-0.1.4.tgz#c830724e212d42ffaaa81aee49533213d09b47df"
+  integrity sha512-fbA4ES3H4Wkxp+OeLhvN6SwL7mXNn/aBtUf7DRYxY9+Akrf7dRxl2ck4lgcpPsSg3zSDsEwLcY+h5cmj5yvlug==
+  dependencies:
+    "@babel/runtime" "^7.13.10"
+    "@radix-ui/react-compose-refs" "0.1.0"
+    "@radix-ui/react-primitive" "0.1.4"
+    "@radix-ui/react-use-callback-ref" "0.1.0"
+
+"@radix-ui/react-id@0.1.5":
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-id/-/react-id-0.1.5.tgz#010d311bedd5a2884c1e9bb6aaaa4e6cc1d1d3b8"
+  integrity sha512-IPc4H/63bes0IZ1GJJozSEkSWcDyhNGtKFWUpJ+XtaLyQ1X3x7Mf6fWwWhDcpqlYEP+5WtAvfqcyEsyjP+ZhBQ==
+  dependencies:
+    "@babel/runtime" "^7.13.10"
+    "@radix-ui/react-use-layout-effect" "0.1.0"
+
+"@radix-ui/react-menu@0.1.6":
+  version "0.1.6"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-menu/-/react-menu-0.1.6.tgz#7f9521a10f6a9cd819b33b33d5ed9538d79b2e75"
+  integrity sha512-ho3+bhpr3oAFkOBJ8VkUb1BcGoiZBB3OmcWPqa6i5RTUKrzNX/d6rauochu2xDlWjiRtpVuiAcsTVOeIC4FbYQ==
+  dependencies:
+    "@babel/runtime" "^7.13.10"
+    "@radix-ui/primitive" "0.1.0"
+    "@radix-ui/react-collection" "0.1.4"
+    "@radix-ui/react-compose-refs" "0.1.0"
+    "@radix-ui/react-context" "0.1.1"
+    "@radix-ui/react-dismissable-layer" "0.1.5"
+    "@radix-ui/react-focus-guards" "0.1.0"
+    "@radix-ui/react-focus-scope" "0.1.4"
+    "@radix-ui/react-id" "0.1.5"
+    "@radix-ui/react-popper" "0.1.4"
+    "@radix-ui/react-portal" "0.1.4"
+    "@radix-ui/react-presence" "0.1.2"
+    "@radix-ui/react-primitive" "0.1.4"
+    "@radix-ui/react-roving-focus" "0.1.5"
+    "@radix-ui/react-use-callback-ref" "0.1.0"
+    "@radix-ui/react-use-direction" "0.1.0"
+    aria-hidden "^1.1.1"
+    react-remove-scroll "^2.4.0"
+
+"@radix-ui/react-popper@0.1.4":
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-popper/-/react-popper-0.1.4.tgz#dfc055dcd7dfae6a2eff7a70d333141d15a5d029"
+  integrity sha512-18gDYof97t8UQa7zwklG1Dr8jIdj3u+rVOQLzPi9f5i1YQak/pVGkaqw8aY+iDUknKKuZniTk/7jbAJUYlKyOw==
+  dependencies:
+    "@babel/runtime" "^7.13.10"
+    "@radix-ui/popper" "0.1.0"
+    "@radix-ui/react-arrow" "0.1.4"
+    "@radix-ui/react-compose-refs" "0.1.0"
+    "@radix-ui/react-context" "0.1.1"
+    "@radix-ui/react-primitive" "0.1.4"
+    "@radix-ui/react-use-rect" "0.1.1"
+    "@radix-ui/react-use-size" "0.1.1"
+    "@radix-ui/rect" "0.1.1"
+
+"@radix-ui/react-portal@0.1.4":
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-portal/-/react-portal-0.1.4.tgz#17bdce3d7f1a9a0b35cb5e935ab8bc562441a7d2"
+  integrity sha512-MO0wRy2eYRTZ/CyOri9NANCAtAtq89DEtg90gicaTlkCfdqCLEBsLb+/q66BZQTr3xX/Vq01nnVfc/TkCqoqvw==
+  dependencies:
+    "@babel/runtime" "^7.13.10"
+    "@radix-ui/react-primitive" "0.1.4"
+    "@radix-ui/react-use-layout-effect" "0.1.0"
+
+"@radix-ui/react-presence@0.1.2":
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-presence/-/react-presence-0.1.2.tgz#9f11cce3df73cf65bc348e8b76d891f0d54c1fe3"
+  integrity sha512-3BRlFZraooIUfRlyN+b/Xs5hq1lanOOo/+3h6Pwu2GMFjkGKKa4Rd51fcqGqnVlbr3jYg+WLuGyAV4KlgqwrQw==
+  dependencies:
+    "@babel/runtime" "^7.13.10"
+    "@radix-ui/react-compose-refs" "0.1.0"
+    "@radix-ui/react-use-layout-effect" "0.1.0"
+
+"@radix-ui/react-primitive@0.1.4":
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-primitive/-/react-primitive-0.1.4.tgz#6c233cf08b0cb87fecd107e9efecb3f21861edc1"
+  integrity sha512-6gSl2IidySupIMJFjYnDIkIWRyQdbu/AHK7rbICPani+LW4b0XdxBXc46og/iZvuwW8pjCS8I2SadIerv84xYA==
+  dependencies:
+    "@babel/runtime" "^7.13.10"
+    "@radix-ui/react-slot" "0.1.2"
+
+"@radix-ui/react-roving-focus@0.1.5":
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-roving-focus/-/react-roving-focus-0.1.5.tgz#cc48d17a36b56f253d54905b0fd60ee134cb97ee"
+  integrity sha512-ClwKPS5JZE+PaHCoW7eu1onvE61pDv4kO8W4t5Ra3qMFQiTJLZMdpBQUhksN//DaVygoLirz4Samdr5Y1x1FSA==
+  dependencies:
+    "@babel/runtime" "^7.13.10"
+    "@radix-ui/primitive" "0.1.0"
+    "@radix-ui/react-collection" "0.1.4"
+    "@radix-ui/react-compose-refs" "0.1.0"
+    "@radix-ui/react-context" "0.1.1"
+    "@radix-ui/react-id" "0.1.5"
+    "@radix-ui/react-primitive" "0.1.4"
+    "@radix-ui/react-use-callback-ref" "0.1.0"
+    "@radix-ui/react-use-controllable-state" "0.1.0"
+
+"@radix-ui/react-slot@0.1.2":
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-slot/-/react-slot-0.1.2.tgz#e6f7ad9caa8ce81cc8d532c854c56f9b8b6307c8"
+  integrity sha512-ADkqfL+agEzEguU3yS26jfB50hRrwf7U4VTwAOZEmi/g+ITcBWe12yM46ueS/UCIMI9Py+gFUaAdxgxafFvY2Q==
+  dependencies:
+    "@babel/runtime" "^7.13.10"
+    "@radix-ui/react-compose-refs" "0.1.0"
+
+"@radix-ui/react-use-body-pointer-events@0.1.1":
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-use-body-pointer-events/-/react-use-body-pointer-events-0.1.1.tgz#63e7fd81ca7ffd30841deb584cd2b7f460df2597"
+  integrity sha512-R8leV2AWmJokTmERM8cMXFHWSiv/fzOLhG/JLmRBhLTAzOj37EQizssq4oW0Z29VcZy2tODMi9Pk/htxwb+xpA==
+  dependencies:
+    "@babel/runtime" "^7.13.10"
+    "@radix-ui/react-use-layout-effect" "0.1.0"
+
+"@radix-ui/react-use-callback-ref@0.1.0":
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-use-callback-ref/-/react-use-callback-ref-0.1.0.tgz#934b6e123330f5b3a6b116460e6662cbc663493f"
+  integrity sha512-Va041McOFFl+aV+sejvl0BS2aeHx86ND9X/rVFmEFQKTXCp6xgUK0NGUAGcgBlIjnJSbMYPGEk1xKSSlVcN2Aw==
+  dependencies:
+    "@babel/runtime" "^7.13.10"
+
+"@radix-ui/react-use-controllable-state@0.1.0":
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-use-controllable-state/-/react-use-controllable-state-0.1.0.tgz#4fced164acfc69a4e34fb9d193afdab973a55de1"
+  integrity sha512-zv7CX/PgsRl46a52Tl45TwqwVJdmqnlQEQhaYMz/yBOD2sx2gCkCFSoF/z9mpnYWmS6DTLNTg5lIps3fV6EnXg==
+  dependencies:
+    "@babel/runtime" "^7.13.10"
+    "@radix-ui/react-use-callback-ref" "0.1.0"
+
+"@radix-ui/react-use-direction@0.1.0":
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-use-direction/-/react-use-direction-0.1.0.tgz#97ac1d52e497c974389e7988f809238ed72e7df7"
+  integrity sha512-NajpY/An9TCPSfOVkgWIdXJV+VuWl67PxB6kOKYmtNAFHvObzIoh8o0n9sAuwSAyFCZVq211FEf9gvVDRhOyiA==
+  dependencies:
+    "@babel/runtime" "^7.13.10"
+
+"@radix-ui/react-use-escape-keydown@0.1.0":
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-use-escape-keydown/-/react-use-escape-keydown-0.1.0.tgz#dc80cb3753e9d1bd992adbad9a149fb6ea941874"
+  integrity sha512-tDLZbTGFmvXaazUXXv8kYbiCcbAE8yKgng9s95d8fCO+Eundv0Jngbn/hKPhDDs4jj9ChwRX5cDDnlaN+ugYYQ==
+  dependencies:
+    "@babel/runtime" "^7.13.10"
+    "@radix-ui/react-use-callback-ref" "0.1.0"
+
+"@radix-ui/react-use-layout-effect@0.1.0":
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-use-layout-effect/-/react-use-layout-effect-0.1.0.tgz#ebf71bd6d2825de8f1fbb984abf2293823f0f223"
+  integrity sha512-+wdeS51Y+E1q1Wmd+1xSSbesZkpVj4jsg0BojCbopWvgq5iBvixw5vgemscdh58ep98BwUbsFYnrywFhV9yrVg==
+  dependencies:
+    "@babel/runtime" "^7.13.10"
+
+"@radix-ui/react-use-rect@0.1.1":
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-use-rect/-/react-use-rect-0.1.1.tgz#6c15384beee59c086e75b89a7e66f3d2e583a856"
+  integrity sha512-kHNNXAsP3/PeszEmM/nxBBS9Jbo93sO+xuMTcRfwzXsmxT5gDXQzAiKbZQ0EecCPtJIzqvr7dlaQi/aP1PKYqQ==
+  dependencies:
+    "@babel/runtime" "^7.13.10"
+    "@radix-ui/rect" "0.1.1"
+
+"@radix-ui/react-use-size@0.1.1":
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-use-size/-/react-use-size-0.1.1.tgz#f6b75272a5d41c3089ca78c8a2e48e5f204ef90f"
+  integrity sha512-pTgWM5qKBu6C7kfKxrKPoBI2zZYZmp2cSXzpUiGM3qEBQlMLtYhaY2JXdXUCxz+XmD1YEjc8oRwvyfsD4AG4WA==
+  dependencies:
+    "@babel/runtime" "^7.13.10"
+
+"@radix-ui/rect@0.1.1":
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/@radix-ui/rect/-/rect-0.1.1.tgz#95b5ba51f469bea6b1b841e2d427e17e37d38419"
+  integrity sha512-g3hnE/UcOg7REdewduRPAK88EPuLZtaq7sA9ouu8S+YEtnyFRI16jgv6GZYe3VMoQLL1T171ebmEPtDjyxWLzw==
+  dependencies:
+    "@babel/runtime" "^7.13.10"
+
 "@react-native-async-storage/async-storage@~1.17.11":
   version "1.17.11"
   resolved "https://registry.yarnpkg.com/@react-native-async-storage/async-storage/-/async-storage-1.17.11.tgz#7ec329c1b9f610e344602e806b04d7c928a2341d"
@@ -2196,6 +2463,11 @@
   resolved "https://registry.yarnpkg.com/@react-native-community/segmented-control/-/segmented-control-2.2.2.tgz#4014256819ab8f40f6bc3a3929ff14a9d149cf04"
   integrity sha512-14+4HnGVrg3USqMzcHCPCqPmPmaEj0ogQH4pHRFXjoVvJokzidXBcYyXl5yrwFcKGW6zTXI6Fx9Qgt4ydtS6tw==
 
+"@react-native-menu/menu@^0.7.2":
+  version "0.7.2"
+  resolved "https://registry.yarnpkg.com/@react-native-menu/menu/-/menu-0.7.2.tgz#922a4357994f2768313ce0fc22362f6cea74ad8b"
+  integrity sha512-RXoU1tZjRdG/IV2S1x6WYNA2z6ul2vhdXQU/WFmsIAT+FbX1j9R/odSL/qjeyr5LlV+OUI0zofh8YrBn9wesag==
+
 "@react-native/assets@1.0.0":
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/@react-native/assets/-/assets-1.0.0.tgz#c6f9bf63d274bafc8e970628de24986b30a55c8e"
@@ -3134,6 +3406,13 @@ argparse@^2.0.1:
   resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"
   integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==
 
+aria-hidden@^1.1.1:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/aria-hidden/-/aria-hidden-1.2.2.tgz#8c4f7cc88d73ca42114106fdf6f47e68d31475b8"
+  integrity sha512-6y/ogyDTk/7YAe91T3E2PR1ALVKyM2QbTio5HwM+N1Q6CMlCKhvClyIjkckBswa0f2xJhjsfzIGa1yVSe1UMVA==
+  dependencies:
+    tslib "^2.0.0"
+
 arr-diff@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520"
@@ -4802,7 +5081,7 @@ csso@^4.0.2:
   dependencies:
     css-tree "^1.1.2"
 
-csstype@^3.0.2:
+csstype@^3.0.2, csstype@^3.0.4:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.1.1.tgz#841b532c45c758ee546a11d5bd7b7b473c8c30b9"
   integrity sha512-DJR/VvkAvSZW9bTouZue2sSxDwdTN92uHjqeKVm+0dAqdfNykRzQ95tay8aXMBAAPpUiq4Qcug2L7neoRh2Egw==
@@ -5045,6 +5324,11 @@ destroy@~1.0.4:
   resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80"
   integrity sha512-3NdhDuEXnfun/z7x9GOElY49LoqVHoGScmOKwmxhsS8N5Y+Z8KyPPDnaSzqWgYt/ji4mqwfTS34Htrk0zPIXVg==
 
+detect-node-es@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/detect-node-es/-/detect-node-es-1.1.0.tgz#163acdf643330caa0b4cd7c21e7ee7755d6fa493"
+  integrity sha512-ypdmJU/TbBby2Dxibuv7ZLW3Bs1QEmM7nHjEANfohJLvE0XVujisn1qPJcZxg+qDucsr+bP6fLD1rPS3AhJ7EQ==
+
 detect-node@^2.0.4, detect-node@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.1.0.tgz#c9c70775a49c3d03bc2c06d9a73be550f978f8b1"
@@ -6403,6 +6687,11 @@ get-intrinsic@^1.0.2, get-intrinsic@^1.1.0, get-intrinsic@^1.1.1, get-intrinsic@
     has "^1.0.3"
     has-symbols "^1.0.3"
 
+get-nonce@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/get-nonce/-/get-nonce-1.0.1.tgz#fdf3f0278073820d2ce9426c18f07481b1e0cdf3"
+  integrity sha512-FJhYRoDaiatfEkUK8HKlicmu/3SGFD51q3itKDGoSTysQJBnfOcxU5GxnhE1E6soB76MbT0MBtnKJuXyAx+96Q==
+
 get-port@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/get-port/-/get-port-3.2.0.tgz#dd7ce7de187c06c8bf353796ac71e099f0980ebc"
@@ -10555,6 +10844,13 @@ react-native-image-picker@^4.10.1:
   resolved "https://registry.yarnpkg.com/react-native-image-picker/-/react-native-image-picker-4.10.1.tgz#eb7e02124e8e649a89e4fcabb72d0312a65fe340"
   integrity sha512-tPA9UtboEsZ8qtm7pX9WInlo9sf0J2ArJgP4uVgKw1QNrwkRX/kZQ6uzOSN747Dhj9WS42ce4RN+rFK86J13DQ==
 
+react-native-ios-context-menu@^1.15.1:
+  version "1.15.1"
+  resolved "https://registry.yarnpkg.com/react-native-ios-context-menu/-/react-native-ios-context-menu-1.15.1.tgz#f3edf20c5fc426b073a110140a2d441250576aa1"
+  integrity sha512-JkOJGx8Kjm7ChyDBmv1TqZg9mg8Jo8Y6kZISVbsXndx22Ke8sEIZGrizw6aXjkSQafomJ0ZAEZU7kuFHbFEwlg==
+  dependencies:
+    "@dominicstop/ts-event-emitter" "^1.1.0"
+
 react-native-iphone-x-helper@^1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/react-native-iphone-x-helper/-/react-native-iphone-x-helper-1.3.1.tgz#20c603e9a0e765fd6f97396638bdeb0e5a60b010"
@@ -10695,6 +10991,25 @@ react-refresh@^0.4.0:
   resolved "https://registry.yarnpkg.com/react-refresh/-/react-refresh-0.4.3.tgz#966f1750c191672e76e16c2efa569150cc73ab53"
   integrity sha512-Hwln1VNuGl/6bVwnd0Xdn1e84gT/8T9aYNL+HAKDArLCS7LWjwr7StE30IEYbIkx0Vi3vs+coQxe+SQDbGbbpA==
 
+react-remove-scroll-bar@^2.3.3:
+  version "2.3.4"
+  resolved "https://registry.yarnpkg.com/react-remove-scroll-bar/-/react-remove-scroll-bar-2.3.4.tgz#53e272d7a5cb8242990c7f144c44d8bd8ab5afd9"
+  integrity sha512-63C4YQBUt0m6ALadE9XV56hV8BgJWDmmTPY758iIJjfQKt2nYwoUrPk0LXRXcB/yIj82T1/Ixfdpdk68LwIB0A==
+  dependencies:
+    react-style-singleton "^2.2.1"
+    tslib "^2.0.0"
+
+react-remove-scroll@^2.4.0:
+  version "2.5.5"
+  resolved "https://registry.yarnpkg.com/react-remove-scroll/-/react-remove-scroll-2.5.5.tgz#1e31a1260df08887a8a0e46d09271b52b3a37e77"
+  integrity sha512-ImKhrzJJsyXJfBZ4bzu8Bwpka14c/fQt0k+cyFp/PBhTfyDnU5hjOtM4AG/0AMyy8oKzOTR0lDgJIM7pYXI0kw==
+  dependencies:
+    react-remove-scroll-bar "^2.3.3"
+    react-style-singleton "^2.2.1"
+    tslib "^2.1.0"
+    use-callback-ref "^1.3.0"
+    use-sidecar "^1.1.2"
+
 react-shallow-renderer@^16.15.0:
   version "16.15.0"
   resolved "https://registry.yarnpkg.com/react-shallow-renderer/-/react-shallow-renderer-16.15.0.tgz#48fb2cf9b23d23cde96708fe5273a7d3446f4457"
@@ -10703,6 +11018,15 @@ react-shallow-renderer@^16.15.0:
     object-assign "^4.1.1"
     react-is "^16.12.0 || ^17.0.0 || ^18.0.0"
 
+react-style-singleton@^2.2.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/react-style-singleton/-/react-style-singleton-2.2.1.tgz#f99e420492b2d8f34d38308ff660b60d0b1205b4"
+  integrity sha512-ZWj0fHEMyWkHzKYUr2Bs/4zU6XLmq9HsgBURm7g5pAVfyn49DgUiNgY2d4lXRlYSiCif9YBGpQleewkcqddc7g==
+  dependencies:
+    get-nonce "^1.0.0"
+    invariant "^2.2.4"
+    tslib "^2.0.0"
+
 react@^18.2.0:
   version "18.2.0"
   resolved "https://registry.yarnpkg.com/react/-/react-18.2.0.tgz#555bd98592883255fa00de14f1151a917b5d77d5"
@@ -10826,6 +11150,11 @@ regenerator-runtime@^0.13.10, regenerator-runtime@^0.13.2, regenerator-runtime@^
   resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.10.tgz#ed07b19616bcbec5da6274ebc75ae95634bfc2ee"
   integrity sha512-KepLsg4dU12hryUO7bp/axHAKvwGOCV0sGloQtpagJ12ai+ojVDqkeGSiRX1zlq+kjIMZ1t7gpze+26QqtdGqw==
 
+regenerator-runtime@^0.13.11:
+  version "0.13.11"
+  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz#f6dca3e7ceec20590d07ada785636a90cdca17f9"
+  integrity sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==
+
 regenerator-transform@^0.15.0:
   version "0.15.0"
   resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.15.0.tgz#cbd9ead5d77fae1a48d957cf889ad0586adb6537"
@@ -12272,7 +12601,7 @@ tslib@^1.9.0, tslib@^1.9.3:
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
   integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
 
-tslib@^2.0.1, tslib@^2.0.3, tslib@^2.1.0, tslib@^2.4.0:
+tslib@^2.0.0, tslib@^2.0.1, tslib@^2.0.3, tslib@^2.1.0, tslib@^2.4.0:
   version "2.4.1"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.4.1.tgz#0d0bfbaac2880b91e22df0768e55be9753a5b17e"
   integrity sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA==
@@ -12559,11 +12888,26 @@ url@^0.11.0:
     punycode "1.3.2"
     querystring "0.2.0"
 
+use-callback-ref@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/use-callback-ref/-/use-callback-ref-1.3.0.tgz#772199899b9c9a50526fedc4993fc7fa1f7e32d5"
+  integrity sha512-3FT9PRuRdbB9HfXhEq35u4oZkvpJ5kuYbpqhCfmiZyReuRgpnhDlbr2ZEnnuS0RrJAPn6l23xjFg9kpDM+Ms7w==
+  dependencies:
+    tslib "^2.0.0"
+
 use-latest-callback@^0.1.5:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/use-latest-callback/-/use-latest-callback-0.1.5.tgz#a4a836c08fa72f6608730b5b8f4bbd9c57c04f51"
   integrity sha512-HtHatS2U4/h32NlkhupDsPlrbiD27gSH5swBdtXbCAlc6pfOFzaj0FehW/FO12rx8j2Vy4/lJScCiJyM01E+bQ==
 
+use-sidecar@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/use-sidecar/-/use-sidecar-1.1.2.tgz#2f43126ba2d7d7e117aa5855e5d8f0276dfe73c2"
+  integrity sha512-epTbsLuzZ7lPClpz2TyryBfztm7m+28DlEv2ZCQ3MDr5ssiwyOwGH/e5F9CkfWjJ1t4clvI58yF822/GUkjjhw==
+  dependencies:
+    detect-node-es "^1.1.0"
+    tslib "^2.0.0"
+
 use-sync-external-store@^1.0.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/use-sync-external-store/-/use-sync-external-store-1.2.0.tgz#7dbefd6ef3fe4e767a0cf5d7287aacfb5846928a"
@@ -13223,3 +13567,10 @@ yocto-queue@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b"
   integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==
+
+zeego@^0.5.0:
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/zeego/-/zeego-0.5.0.tgz#e22d22ec43ad0f36539893df2b0bda51947ebf4b"
+  integrity sha512-jczVlG/azQsNAGb64dfmrJ6hIFv7PkV+RkJfANRjKG/3lhAYCx5SYb3Bla9uw7x0AddALihBnisQOo4vfHV6CQ==
+  dependencies:
+    "@radix-ui/react-dropdown-menu" "0.1.6"

From f619d1bb6a5e956aba0130c790407d8e2aeac04c Mon Sep 17 00:00:00 2001
From: xmflsct <me@xmflsct.com>
Date: Fri, 2 Dec 2022 00:13:59 +0100
Subject: [PATCH 09/40] Partial fix #495

Added list removing users
---
 src/components/Account.tsx                    | 37 ++++---
 src/components/Timeline/Empty.tsx             |  2 +-
 src/i18n/en/screens/tabs.json                 | 19 +++-
 src/screens/Compose/Root/Suggestion.tsx       |  2 +-
 src/screens/Tabs/Me.tsx                       | 26 +++--
 src/screens/Tabs/Me/List/Accounts.tsx         | 99 +++++++++++++++++++
 .../Tabs/Me/{ListEdit.tsx => List/Edit.tsx}   | 14 ++-
 .../Tabs/Me/{Lists.tsx => List/List.tsx}      | 12 +--
 .../Tabs/Me/{List.tsx => List/index.tsx}      | 57 +++++------
 src/screens/Tabs/Me/List/menus.tsx            | 48 +++++++++
 src/screens/Tabs/Me/Root/Collections.tsx      |  2 +-
 src/utils/navigation/navigators.ts            |  3 +-
 src/utils/queryHooks/lists.ts                 | 68 ++++++++++++-
 13 files changed, 309 insertions(+), 80 deletions(-)
 create mode 100644 src/screens/Tabs/Me/List/Accounts.tsx
 rename src/screens/Tabs/Me/{ListEdit.tsx => List/Edit.tsx} (90%)
 rename src/screens/Tabs/Me/{Lists.tsx => List/List.tsx} (75%)
 rename src/screens/Tabs/Me/{List.tsx => List/index.tsx} (60%)
 create mode 100644 src/screens/Tabs/Me/List/menus.tsx

diff --git a/src/components/Account.tsx b/src/components/Account.tsx
index a59684b7..a65827dd 100644
--- a/src/components/Account.tsx
+++ b/src/components/Account.tsx
@@ -4,39 +4,47 @@ import { StackNavigationProp } from '@react-navigation/stack'
 import { TabLocalStackParamList } from '@utils/navigation/navigators'
 import { StyleConstants } from '@utils/styles/constants'
 import { useTheme } from '@utils/styles/ThemeManager'
-import React, { useCallback } from 'react'
+import React, { PropsWithChildren } from 'react'
 import { Pressable, View } from 'react-native'
 import GracefullyImage from './GracefullyImage'
 import CustomText from './Text'
 
 export interface Props {
   account: Mastodon.Account
-  onPress?: () => void
+  Component?: typeof View | typeof Pressable
+  props?: {}
 }
 
-const ComponentAccount: React.FC<Props> = ({ account, onPress: customOnPress }) => {
+const ComponentAccount: React.FC<PropsWithChildren & Props> = ({
+  account,
+  Component,
+  props,
+  children
+}) => {
   const { colors } = useTheme()
   const navigation = useNavigation<StackNavigationProp<TabLocalStackParamList>>()
 
-  const onPress = useCallback(() => navigation.push('Tab-Shared-Account', { account }), [])
+  if (!props) {
+    props = { onPress: () => navigation.push('Tab-Shared-Account', { account }) }
+  }
 
-  return (
-    <Pressable
-      accessibilityRole='button'
-      style={{
+  return React.createElement(
+    Component || Pressable,
+    {
+      ...props,
+      style: {
         flex: 1,
         paddingHorizontal: StyleConstants.Spacing.Global.PagePadding,
         paddingVertical: StyleConstants.Spacing.M,
         flexDirection: 'row',
-        alignSelf: 'flex-start',
+        justifyContent: 'space-between',
         alignItems: 'center'
-      }}
-      onPress={customOnPress || onPress}
-    >
+      }
+    },
+    <View style={{ flex: 1, flexDirection: 'row', alignItems: 'center' }}>
       <GracefullyImage
         uri={{ original: account.avatar, static: account.avatar_static }}
         style={{
-          alignSelf: 'flex-start',
           width: StyleConstants.Avatar.S,
           height: StyleConstants.Avatar.S,
           borderRadius: 6,
@@ -62,7 +70,8 @@ const ComponentAccount: React.FC<Props> = ({ account, onPress: customOnPress })
           @{account.acct}
         </CustomText>
       </View>
-    </Pressable>
+    </View>,
+    children
   )
 }
 
diff --git a/src/components/Timeline/Empty.tsx b/src/components/Timeline/Empty.tsx
index b2ef2cde..c533de87 100644
--- a/src/components/Timeline/Empty.tsx
+++ b/src/components/Timeline/Empty.tsx
@@ -57,7 +57,7 @@ const TimelineEmpty = React.memo(
                 style={{
                   marginTop: StyleConstants.Spacing.S,
                   marginBottom: StyleConstants.Spacing.L,
-                  color: colors.primaryDefault
+                  color: colors.secondary
                 }}
               >
                 {t('empty.success.message')}
diff --git a/src/i18n/en/screens/tabs.json b/src/i18n/en/screens/tabs.json
index c50884bb..828ff2e2 100644
--- a/src/i18n/en/screens/tabs.json
+++ b/src/i18n/en/screens/tabs.json
@@ -46,17 +46,20 @@
       "language": {
         "name": "Language"
       },
-      "lists": {
-        "name": "Lists"
+      "list": {
+        "name": "List: {{list}}"
+      },
+      "listAccounts": {
+        "name": "Users in list: {{list}}"
       },
       "listAdd": {
         "name": "Add a List"
       },
       "listEdit": {
-        "name": "Edit List"
+        "name": "Edit List Details"
       },
-      "list": {
-        "name": "List: {{list}}"
+      "lists": {
+        "name": "Lists"
       },
       "push": {
         "name": "Push Notification"
@@ -93,7 +96,13 @@
         "XXL": "XXL"
       }
     },
+    "listAccounts": {
+      "heading": "Manage users",
+      "error": "Delete user from list",
+      "empty": "No user added in this list"
+    },
     "listEdit": {
+      "heading": "Edit list details",
       "title": "Title",
       "repliesPolicy": {
         "heading": "Show replies to:",
diff --git a/src/screens/Compose/Root/Suggestion.tsx b/src/screens/Compose/Root/Suggestion.tsx
index 2f5155e2..c56078b0 100644
--- a/src/screens/Compose/Root/Suggestion.tsx
+++ b/src/screens/Compose/Root/Suggestion.tsx
@@ -44,7 +44,7 @@ const ComposeRootSuggestion: React.FC<Props> = ({ item }) => {
   }
 
   return item.acct ? (
-    <ComponentAccount account={item} onPress={onPress} />
+    <ComponentAccount account={item} props={{ onPress }} />
   ) : (
     <ComponentHashtag hashtag={item} onPress={onPress} origin='suggestion' />
   )
diff --git a/src/screens/Tabs/Me.tsx b/src/screens/Tabs/Me.tsx
index 7c244ac5..bf8c5a14 100644
--- a/src/screens/Tabs/Me.tsx
+++ b/src/screens/Tabs/Me.tsx
@@ -8,8 +8,9 @@ import TabMeBookmarks from './Me/Bookmarks'
 import TabMeConversations from './Me/Cconversations'
 import TabMeFavourites from './Me/Favourites'
 import TabMeList from './Me/List'
-import TabMeListEdit from './Me/ListEdit'
-import TabMeLists from './Me/Lists'
+import TabMeListAccounts from './Me/List/Accounts'
+import TabMeListEdit from './Me/List/Edit'
+import TabMeListList from './Me/List/List'
 import TabMeProfile from './Me/Profile'
 import TabMePush from './Me/Push'
 import TabMeRoot from './Me/Root'
@@ -86,21 +87,28 @@ const TabMe = React.memo(
             headerLeft: () => <HeaderLeft onPress={() => navigation.pop(1)} />
           })}
         />
+        <Stack.Screen
+          name='Tab-Me-List-Accounts'
+          component={TabMeListAccounts}
+          options={({ navigation, route: { params } }) => ({
+            title: t('me.stacks.listAccounts.name', { list: params.title }),
+            ...(Platform.OS === 'android' && {
+              headerCenter: () => <HeaderCenter content={t('me.stacks.listsAdd.name')} />
+            }),
+            headerLeft: () => <HeaderLeft onPress={() => navigation.pop(1)} />
+          })}
+        />
         <Stack.Screen
           name='Tab-Me-List-Edit'
           component={TabMeListEdit}
           options={{
             gestureEnabled: false,
-            presentation: 'modal',
-            title: t('me.stacks.listsAdd.name'),
-            ...(Platform.OS === 'android' && {
-              headerCenter: () => <HeaderCenter content={t('me.stacks.listsAdd.name')} />
-            })
+            presentation: 'modal'
           }}
         />
         <Stack.Screen
-          name='Tab-Me-Lists'
-          component={TabMeLists}
+          name='Tab-Me-List-List'
+          component={TabMeListList}
           options={({ navigation }: any) => ({
             title: t('me.stacks.lists.name'),
             ...(Platform.OS === 'android' && {
diff --git a/src/screens/Tabs/Me/List/Accounts.tsx b/src/screens/Tabs/Me/List/Accounts.tsx
new file mode 100644
index 00000000..ca526283
--- /dev/null
+++ b/src/screens/Tabs/Me/List/Accounts.tsx
@@ -0,0 +1,99 @@
+import ComponentAccount from '@components/Account'
+import Button from '@components/Button'
+import haptics from '@components/haptics'
+import { displayMessage } from '@components/Message'
+import CustomText from '@components/Text'
+import { TabMeStackScreenProps } from '@utils/navigation/navigators'
+import {
+  QueryKeyListAccounts,
+  useListAccountsMutation,
+  useListAccountsQuery
+} from '@utils/queryHooks/lists'
+import { StyleConstants } from '@utils/styles/constants'
+import { useTheme } from '@utils/styles/ThemeManager'
+import React from 'react'
+import { useTranslation } from 'react-i18next'
+import { FlatList, View } from 'react-native'
+
+const TabMeListAccounts: React.FC<TabMeStackScreenProps<'Tab-Me-List-Accounts'>> = ({
+  route: { params }
+}) => {
+  const { colors, theme } = useTheme()
+  const { t } = useTranslation('screenTabs')
+
+  const queryKey: QueryKeyListAccounts = ['ListAccounts', { id: params.id }]
+  const { data, refetch, fetchNextPage, hasNextPage } = useListAccountsQuery({
+    ...queryKey[1],
+    options: {
+      getNextPageParam: lastPage =>
+        lastPage?.links?.next && {
+          max_id: lastPage.links.next
+        }
+    }
+  })
+
+  const flattenData = data?.pages ? data.pages?.flatMap(page => [...page.body]) : []
+
+  const mutation = useListAccountsMutation({
+    onSuccess: () => {
+      haptics('Light')
+      refetch()
+    },
+    onError: () => {
+      displayMessage({
+        theme,
+        type: 'error',
+        message: t('common:message.error.message', {
+          function: t('me.listAccounts.error')
+        })
+      })
+    }
+  })
+
+  return (
+    <FlatList
+      data={flattenData}
+      renderItem={({ item, index }) => (
+        <ComponentAccount
+          key={index}
+          account={item}
+          Component={View}
+          children={
+            <Button
+              type='icon'
+              content='X'
+              round
+              onPress={() =>
+                mutation.mutate({ type: 'delete', payload: { id: params.id, accounts: [item.id] } })
+              }
+            />
+          }
+        />
+      )}
+      ListEmptyComponent={
+        <View
+          style={{
+            flex: 1,
+            minHeight: '100%',
+            justifyContent: 'center',
+            alignItems: 'center'
+          }}
+        >
+          <CustomText
+            fontStyle='M'
+            style={{
+              marginTop: StyleConstants.Spacing.S,
+              marginBottom: StyleConstants.Spacing.L,
+              color: colors.secondary
+            }}
+          >
+            {t('me.listAccounts.empty')}
+          </CustomText>
+        </View>
+      }
+      onEndReached={() => hasNextPage && fetchNextPage()}
+    />
+  )
+}
+
+export default TabMeListAccounts
diff --git a/src/screens/Tabs/Me/ListEdit.tsx b/src/screens/Tabs/Me/List/Edit.tsx
similarity index 90%
rename from src/screens/Tabs/Me/ListEdit.tsx
rename to src/screens/Tabs/Me/List/Edit.tsx
index a4eab6ee..dda4e3e4 100644
--- a/src/screens/Tabs/Me/ListEdit.tsx
+++ b/src/screens/Tabs/Me/List/Edit.tsx
@@ -1,6 +1,6 @@
 import { EmojisState } from '@components/Emojis/helpers/EmojisContext'
 import haptics from '@components/haptics'
-import { HeaderLeft, HeaderRight } from '@components/Header'
+import { HeaderCenter, HeaderLeft, HeaderRight } from '@components/Header'
 import ComponentInput from '@components/Input'
 import { displayMessage, Message } from '@components/Message'
 import Selections from '@components/Selections'
@@ -12,7 +12,7 @@ import { StyleConstants } from '@utils/styles/constants'
 import { useTheme } from '@utils/styles/ThemeManager'
 import React, { useEffect, useRef, useState } from 'react'
 import { useTranslation } from 'react-i18next'
-import { Alert, ScrollView, TextInput } from 'react-native'
+import { Alert, Platform, ScrollView, TextInput } from 'react-native'
 import { useQueryClient } from 'react-query'
 
 const TabMeListEdit: React.FC<TabMeStackScreenProps<'Tab-Me-List-Edit'>> = ({
@@ -83,6 +83,16 @@ const TabMeListEdit: React.FC<TabMeStackScreenProps<'Tab-Me-List-Edit'>> = ({
 
   useEffect(() => {
     navigation.setOptions({
+      title: params.type === 'add' ? t('me.stacks.listAdd.name') : t('me.stacks.listEdit.name'),
+      ...(Platform.OS === 'android' && {
+        headerCenter: () => (
+          <HeaderCenter
+            content={
+              params.type === 'add' ? t('me.stacks.listAdd.name') : t('me.stacks.listEdit.name')
+            }
+          />
+        )
+      }),
       headerLeft: () => (
         <HeaderLeft
           content='X'
diff --git a/src/screens/Tabs/Me/Lists.tsx b/src/screens/Tabs/Me/List/List.tsx
similarity index 75%
rename from src/screens/Tabs/Me/Lists.tsx
rename to src/screens/Tabs/Me/List/List.tsx
index 76efe7c0..5582e7c1 100644
--- a/src/screens/Tabs/Me/Lists.tsx
+++ b/src/screens/Tabs/Me/List/List.tsx
@@ -5,7 +5,7 @@ import { useListsQuery } from '@utils/queryHooks/lists'
 import React, { useEffect } from 'react'
 import { useTranslation } from 'react-i18next'
 
-const TabMeLists: React.FC<TabMeStackScreenProps<'Tab-Me-Lists'>> = ({ navigation }) => {
+const TabMeListList: React.FC<TabMeStackScreenProps<'Tab-Me-List-List'>> = ({ navigation }) => {
   const { data } = useListsQuery({})
   const { t } = useTranslation('screenTabs')
 
@@ -23,17 +23,17 @@ const TabMeLists: React.FC<TabMeStackScreenProps<'Tab-Me-Lists'>> = ({ navigatio
 
   return (
     <MenuContainer>
-      {data?.map((d: Mastodon.List, i: number) => (
+      {data?.map((params, index) => (
         <MenuRow
-          key={i}
+          key={index}
           iconFront='List'
           iconBack='ChevronRight'
-          title={d.title}
-          onPress={() => navigation.navigate('Tab-Me-List', d)}
+          title={params.title}
+          onPress={() => navigation.navigate('Tab-Me-List', params)}
         />
       ))}
     </MenuContainer>
   )
 }
 
-export default TabMeLists
+export default TabMeListList
diff --git a/src/screens/Tabs/Me/List.tsx b/src/screens/Tabs/Me/List/index.tsx
similarity index 60%
rename from src/screens/Tabs/Me/List.tsx
rename to src/screens/Tabs/Me/List/index.tsx
index e1d1625e..464a8d5c 100644
--- a/src/screens/Tabs/Me/List.tsx
+++ b/src/screens/Tabs/Me/List/index.tsx
@@ -9,9 +9,9 @@ import { StyleConstants } from '@utils/styles/constants'
 import { useTheme } from '@utils/styles/ThemeManager'
 import React, { useEffect } from 'react'
 import { useTranslation } from 'react-i18next'
-import { Alert } from 'react-native'
 import { useQueryClient } from 'react-query'
 import * as DropdownMenu from 'zeego/dropdown-menu'
+import { menuListAccounts, menuListDelete, menuListEdit } from './menus'
 
 const TabMeList: React.FC<TabMeStackScreenProps<'Tab-Me-List'>> = ({
   navigation,
@@ -40,6 +40,10 @@ const TabMeList: React.FC<TabMeStackScreenProps<'Tab-Me-List'>> = ({
   })
 
   useEffect(() => {
+    const listAccounts = menuListAccounts({ params })
+    const listEdit = menuListEdit({ params, key })
+    const listDelete = menuListDelete({ params, mutation })
+
     navigation.setOptions({
       headerRight: () => (
         <DropdownMenu.Root>
@@ -52,41 +56,24 @@ const TabMeList: React.FC<TabMeStackScreenProps<'Tab-Me-List'>> = ({
           </DropdownMenu.Trigger>
 
           <DropdownMenu.Content>
-            <DropdownMenu.Item
-              key='list-edit'
-              onSelect={() =>
-                navigation.navigate('Tab-Me-List-Edit', {
-                  type: 'edit',
-                  payload: params,
-                  key
-                })
-              }
-            >
-              <DropdownMenu.ItemTitle children={t('me.stacks.listEdit.name')} />
-              <DropdownMenu.ItemIcon iosIconName='square.and.pencil' />
-            </DropdownMenu.Item>
+            <DropdownMenu.Group>
+              <DropdownMenu.Item key={listAccounts.key} onSelect={listAccounts.onSelect}>
+                <DropdownMenu.ItemTitle children={listAccounts.title} />
+                <DropdownMenu.ItemIcon iosIconName={listAccounts.icon} />
+              </DropdownMenu.Item>
+            </DropdownMenu.Group>
 
-            <DropdownMenu.Item
-              key='list-delete'
-              destructive
-              onSelect={() =>
-                Alert.alert(
-                  t('me.listDelete.confirm.title', { list: params.title.slice(0, 6) }),
-                  t('me.listDelete.confirm.message'),
-                  [
-                    {
-                      text: t('common:buttons.delete'),
-                      style: 'destructive',
-                      onPress: () => mutation.mutate({ type: 'delete', payload: params })
-                    },
-                    { text: t('common:buttons.cancel') }
-                  ]
-                )
-              }
-            >
-              <DropdownMenu.ItemTitle children={t('me.listDelete.heading')} />
-              <DropdownMenu.ItemIcon iosIconName='trash' />
-            </DropdownMenu.Item>
+            <DropdownMenu.Group>
+              <DropdownMenu.Item key={listEdit.key} onSelect={listEdit.onSelect}>
+                <DropdownMenu.ItemTitle children={listEdit.title} />
+                <DropdownMenu.ItemIcon iosIconName={listEdit.icon} />
+              </DropdownMenu.Item>
+
+              <DropdownMenu.Item key={listDelete.key} destructive onSelect={listDelete.onSelect}>
+                <DropdownMenu.ItemTitle children={listDelete.title} />
+                <DropdownMenu.ItemIcon iosIconName={listDelete.icon} />
+              </DropdownMenu.Item>
+            </DropdownMenu.Group>
           </DropdownMenu.Content>
         </DropdownMenu.Root>
       )
diff --git a/src/screens/Tabs/Me/List/menus.tsx b/src/screens/Tabs/Me/List/menus.tsx
new file mode 100644
index 00000000..aaccaf6b
--- /dev/null
+++ b/src/screens/Tabs/Me/List/menus.tsx
@@ -0,0 +1,48 @@
+import navigationRef from '@helpers/navigationRef'
+import i18next from 'i18next'
+import { Alert } from 'react-native'
+import { UseMutationResult } from 'react-query'
+
+export const menuListAccounts = ({ params }: { params: Mastodon.List }) => ({
+  key: 'list-accounts',
+  onSelect: () => navigationRef.navigate<any>('Tab-Me-List-Accounts', params),
+  title: i18next.t('screenTabs:me.listAccounts.heading'),
+  icon: 'person.crop.circle.fill.badge.checkmark'
+})
+
+export const menuListEdit = ({ params, key }: { params: Mastodon.List; key: string }) => ({
+  key: 'list-edit',
+  onSelect: () =>
+    navigationRef.navigate<any>('Tab-Me-List-Edit', {
+      type: 'edit',
+      payload: params,
+      key
+    }),
+  title: i18next.t('screenTabs:me.listEdit.heading'),
+  icon: 'square.and.pencil'
+})
+
+export const menuListDelete = ({
+  params,
+  mutation
+}: {
+  params: Mastodon.List
+  mutation: UseMutationResult<any, any, unknown, unknown>
+}) => ({
+  key: 'list-delete',
+  onSelect: () =>
+    Alert.alert(
+      i18next.t('screenTabs:me.listDelete.confirm.title', { list: params.title.slice(0, 6) }),
+      i18next.t('screenTabs:me.listDelete.confirm.message'),
+      [
+        {
+          text: i18next.t('common:buttons.delete'),
+          style: 'destructive',
+          onPress: () => mutation.mutate({ type: 'delete', payload: params })
+        },
+        { text: i18next.t('common:buttons.cancel') }
+      ]
+    ),
+  title: i18next.t('screenTabs:me.listDelete.heading'),
+  icon: 'trash'
+})
diff --git a/src/screens/Tabs/Me/Root/Collections.tsx b/src/screens/Tabs/Me/Root/Collections.tsx
index daf2608e..f9897c57 100644
--- a/src/screens/Tabs/Me/Root/Collections.tsx
+++ b/src/screens/Tabs/Me/Root/Collections.tsx
@@ -85,7 +85,7 @@ const Collections: React.FC = () => {
           iconFront='List'
           iconBack='ChevronRight'
           title={t('me.stacks.lists.name')}
-          onPress={() => navigation.navigate('Tab-Me-Lists')}
+          onPress={() => navigation.navigate('Tab-Me-List-List')}
         />
       ) : null}
       {mePage.announcements.shown ? (
diff --git a/src/utils/navigation/navigators.ts b/src/utils/navigation/navigators.ts
index f9659575..8ae239d4 100644
--- a/src/utils/navigation/navigators.ts
+++ b/src/utils/navigation/navigators.ts
@@ -139,6 +139,7 @@ export type TabMeStackParamList = {
   'Tab-Me-Conversations': undefined
   'Tab-Me-Favourites': undefined
   'Tab-Me-List': Mastodon.List
+  'Tab-Me-List-Accounts': Omit<Mastodon.List, 'replies_policy'>
   'Tab-Me-List-Edit':
     | {
         type: 'add'
@@ -148,7 +149,7 @@ export type TabMeStackParamList = {
         payload: Mastodon.List
         key: string // To update title after successful mutation
       }
-  'Tab-Me-Lists': undefined
+  'Tab-Me-List-List': undefined
   'Tab-Me-Profile': undefined
   'Tab-Me-Push': undefined
   'Tab-Me-Settings': undefined
diff --git a/src/utils/queryHooks/lists.ts b/src/utils/queryHooks/lists.ts
index 865928b2..0f7d7071 100644
--- a/src/utils/queryHooks/lists.ts
+++ b/src/utils/queryHooks/lists.ts
@@ -1,6 +1,14 @@
-import apiInstance from '@api/instance'
+import apiInstance, { InstanceResponse } from '@api/instance'
 import { AxiosError } from 'axios'
-import { useMutation, UseMutationOptions, useQuery, UseQueryOptions } from 'react-query'
+import {
+  QueryFunctionContext,
+  useInfiniteQuery,
+  UseInfiniteQueryOptions,
+  useMutation,
+  UseMutationOptions,
+  useQuery,
+  UseQueryOptions
+} from 'react-query'
 
 export type QueryKeyLists = ['Lists']
 
@@ -53,10 +61,10 @@ const mutationFunction = async (params: MutationVarsLists) => {
         body
       }).then(res => res.body)
     case 'delete':
-      return apiInstance({
+      return apiInstance<{}>({
         method: 'delete',
         url: `lists/${params.payload.id}`
-      })
+      }).then(res => res.body)
   }
 }
 
@@ -66,4 +74,54 @@ const useListsMutation = (
   return useMutation(mutationFunction, options)
 }
 
-export { useListsQuery, useListsMutation }
+/* ----- */
+
+export type QueryKeyListAccounts = ['ListAccounts', { id: Mastodon.List['id'] }]
+
+const accountsQueryFunction = async ({
+  queryKey,
+  pageParam
+}: QueryFunctionContext<QueryKeyListAccounts>) => {
+  const { id } = queryKey[1]
+
+  return await apiInstance<Mastodon.Account[]>({
+    method: 'get',
+    url: `lists/${id}/accounts`,
+    params: { ...pageParam, limit: 40 }
+  })
+}
+
+const useListAccountsQuery = ({
+  options,
+  ...queryKeyParams
+}: QueryKeyListAccounts[1] & {
+  options?: UseInfiniteQueryOptions<InstanceResponse<Mastodon.Account[]>, AxiosError>
+}) => {
+  const queryKey: QueryKeyListAccounts = ['ListAccounts', queryKeyParams]
+  return useInfiniteQuery(queryKey, accountsQueryFunction, options)
+}
+
+type AccountsMutationVarsLists = {
+  type: 'add' | 'delete'
+  payload: Pick<Mastodon.List, 'id'> & { accounts: Mastodon.Account['id'][] }
+}
+
+const accountsMutationFunction = async (params: AccountsMutationVarsLists) => {
+  const body = new FormData()
+  for (const account of params.payload.accounts) {
+    body.append('account_ids[]', account)
+  }
+  return apiInstance<{}>({
+    method: params.type === 'add' ? 'post' : 'delete',
+    url: `lists/${params.payload.id}/accounts`,
+    body
+  }).then(res => res.body)
+}
+
+const useListAccountsMutation = (
+  options: UseMutationOptions<Mastodon.List, AxiosError, AccountsMutationVarsLists>
+) => {
+  return useMutation(accountsMutationFunction, options)
+}
+
+export { useListsQuery, useListsMutation, useListAccountsQuery, useListAccountsMutation }

From a3a0bf523f1a6481e1ccc2b20be449d8efbe3975 Mon Sep 17 00:00:00 2001
From: xmflsct <me@xmflsct.com>
Date: Sat, 3 Dec 2022 01:08:38 +0100
Subject: [PATCH 10/40] Moving to using zeego

---
 ios/Podfile.lock                              |   6 -
 package.json                                  |   1 -
 src/components/ContextMenu/account.ts         | 175 ---------
 src/components/ContextMenu/instance.ts        | 116 +++---
 src/components/ContextMenu/share.ts           | 109 +++---
 src/components/ContextMenu/status.ts          | 335 +++++++++---------
 src/components/Timeline/Default.tsx           |  86 ++++-
 src/components/Timeline/Notifications.tsx     | 101 ++++--
 .../Timeline/Shared/ContextMenu.tsx           |  84 -----
 .../Timeline/Shared/HeaderAndroid.tsx         | 103 ++++++
 .../Timeline/Shared/HeaderDefault.android.tsx | 114 ------
 .../Timeline/Shared/HeaderDefault.ios.tsx     |  75 ----
 .../Timeline/Shared/HeaderDefault.tsx         | 144 ++++++++
 .../Shared/HeaderNotification.android.tsx     | 157 --------
 .../Shared/HeaderNotification.ios.tsx         | 105 ------
 .../Timeline/Shared/HeaderNotification.tsx    | 163 +++++++++
 src/components/contextMenu/account.tsx        | 220 ++++++++++++
 src/components/contextMenu/index.d.ts         |   6 +
 src/i18n/en/components/contextMenu.json       |   6 +-
 src/screens/Tabs/Local.tsx                    |  69 ++--
 src/screens/Tabs/Shared/Account.tsx           |  72 +++-
 src/screens/Tabs/Shared/index.tsx             |  42 +--
 yarn.lock                                     |   4 -
 23 files changed, 1179 insertions(+), 1114 deletions(-)
 delete mode 100644 src/components/ContextMenu/account.ts
 delete mode 100644 src/components/Timeline/Shared/ContextMenu.tsx
 create mode 100644 src/components/Timeline/Shared/HeaderAndroid.tsx
 delete mode 100644 src/components/Timeline/Shared/HeaderDefault.android.tsx
 delete mode 100644 src/components/Timeline/Shared/HeaderDefault.ios.tsx
 create mode 100644 src/components/Timeline/Shared/HeaderDefault.tsx
 delete mode 100644 src/components/Timeline/Shared/HeaderNotification.android.tsx
 delete mode 100644 src/components/Timeline/Shared/HeaderNotification.ios.tsx
 create mode 100644 src/components/Timeline/Shared/HeaderNotification.tsx
 create mode 100644 src/components/contextMenu/account.tsx
 create mode 100644 src/components/contextMenu/index.d.ts

diff --git a/ios/Podfile.lock b/ios/Podfile.lock
index 37023dbe..e676ffb5 100644
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -297,8 +297,6 @@ PODS:
     - React-Core
   - react-native-cameraroll (5.1.0):
     - React-Core
-  - react-native-context-menu-view (1.5.4):
-    - React
   - react-native-image-picker (4.10.1):
     - React-Core
   - react-native-ios-context-menu (1.15.1):
@@ -494,7 +492,6 @@ DEPENDENCIES:
   - "react-native-blur (from `../node_modules/@react-native-community/blur`)"
   - react-native-blurhash (from `../node_modules/react-native-blurhash`)
   - "react-native-cameraroll (from `../node_modules/@react-native-camera-roll/camera-roll`)"
-  - react-native-context-menu-view (from `../node_modules/react-native-context-menu-view`)
   - react-native-image-picker (from `../node_modules/react-native-image-picker`)
   - react-native-ios-context-menu (from `../node_modules/react-native-ios-context-menu`)
   - react-native-language-detection (from `../node_modules/react-native-language-detection`)
@@ -627,8 +624,6 @@ EXTERNAL SOURCES:
     :path: "../node_modules/react-native-blurhash"
   react-native-cameraroll:
     :path: "../node_modules/@react-native-camera-roll/camera-roll"
-  react-native-context-menu-view:
-    :path: "../node_modules/react-native-context-menu-view"
   react-native-image-picker:
     :path: "../node_modules/react-native-image-picker"
   react-native-ios-context-menu:
@@ -742,7 +737,6 @@ SPEC CHECKSUMS:
   react-native-blur: 50c9feabacbc5f49b61337ebc32192c6be7ec3c3
   react-native-blurhash: add4df9a937b4e021a24bc67a0714f13e0bd40b7
   react-native-cameraroll: a40b082318eb1ecd0336a2f29d9f74b7f2c8cae8
-  react-native-context-menu-view: b0beca02aad4bd9f9d7d932bf437e0a03baa69ef
   react-native-image-picker: f2ab1215d17bcfe27b0eb6417cc236fd1f4775e7
   react-native-ios-context-menu: b170594b4448c0cd10c79e13432216bac99de1ac
   react-native-language-detection: 0e43195ad014974f1b7a31b64820eff34a243f2d
diff --git a/package.json b/package.json
index 34ddf089..cdf9715f 100644
--- a/package.json
+++ b/package.json
@@ -71,7 +71,6 @@
     "react-native-animated-spinkit": "^1.5.2",
     "react-native-base64": "^0.2.1",
     "react-native-blurhash": "^1.1.10",
-    "react-native-context-menu-view": "xmflsct/react-native-context-menu-view",
     "react-native-fast-image": "^8.6.3",
     "react-native-feather": "^1.1.2",
     "react-native-flash-message": "^0.3.1",
diff --git a/src/components/ContextMenu/account.ts b/src/components/ContextMenu/account.ts
deleted file mode 100644
index 9bb4645b..00000000
--- a/src/components/ContextMenu/account.ts
+++ /dev/null
@@ -1,175 +0,0 @@
-import { displayMessage } from '@components/Message'
-import { useRelationshipQuery } from '@utils/queryHooks/relationship'
-import {
-  MutationVarsTimelineUpdateAccountProperty,
-  QueryKeyTimeline,
-  useTimelineMutation
-} from '@utils/queryHooks/timeline'
-import { getInstanceAccount } from '@utils/slices/instancesSlice'
-import { useTheme } from '@utils/styles/ThemeManager'
-import { useTranslation } from 'react-i18next'
-import { Platform } from 'react-native'
-import { ContextMenuAction } from 'react-native-context-menu-view'
-import { useQueryClient } from 'react-query'
-import { useSelector } from 'react-redux'
-
-export interface Props {
-  actions: ContextMenuAction[]
-  type: 'status' | 'account' // Do not need to fetch relationship in timeline
-  queryKey?: QueryKeyTimeline
-  rootQueryKey?: QueryKeyTimeline
-  id: Mastodon.Account['id']
-}
-
-const contextMenuAccount = ({ actions, type, queryKey, rootQueryKey, id: accountId }: Props) => {
-  const { theme } = useTheme()
-  const { t } = useTranslation('componentContextMenu')
-
-  const queryClient = useQueryClient()
-  const mutation = useTimelineMutation({
-    onSuccess: (_, params) => {
-      queryClient.refetchQueries(['Relationship', { id: accountId }])
-      const theParams = params as MutationVarsTimelineUpdateAccountProperty
-      displayMessage({
-        theme,
-        type: 'success',
-        message: t('common:message.success.message', {
-          function: t(`account.${theParams.payload.property}.action`, {
-            ...(theParams.payload.property !== 'reports' && {
-              context: (theParams.payload.currentValue || false).toString()
-            })
-          })
-        })
-      })
-    },
-    onError: (err: any, params) => {
-      const theParams = params as MutationVarsTimelineUpdateAccountProperty
-      displayMessage({
-        theme,
-        type: 'error',
-        message: t('common:message.error.message', {
-          function: t(`account.${theParams.payload.property}.action`, {
-            ...(theParams.payload.property !== 'reports' && {
-              context: (theParams.payload.currentValue || false).toString()
-            })
-          })
-        }),
-        ...(err.status &&
-          typeof err.status === 'number' &&
-          err.data &&
-          err.data.error &&
-          typeof err.data.error === 'string' && {
-            description: err.data.error
-          })
-      })
-    },
-    onSettled: () => {
-      queryKey && queryClient.invalidateQueries(queryKey)
-      rootQueryKey && queryClient.invalidateQueries(rootQueryKey)
-    }
-  })
-
-  const instanceAccount = useSelector(getInstanceAccount, (prev, next) => prev.id === next.id)
-  const ownAccount = instanceAccount?.id === accountId
-
-  const { data: relationship } = useRelationshipQuery({
-    id: accountId,
-    options: { enabled: type === 'account' }
-  })
-
-  if (!ownAccount) {
-    actions.push({
-      id: 'account-mute',
-      title: t('account.mute.action', {
-        context: (relationship?.muting || false).toString()
-      }),
-      systemIcon: 'eye.slash'
-    })
-    switch (Platform.OS) {
-      case 'ios':
-        actions.push({
-          id: 'account',
-          title: t('account.title'),
-          actions: [
-            {
-              id: 'account-block',
-              title: t('account.block.action', {
-                context: (relationship?.blocking || false).toString()
-              }),
-              systemIcon: 'xmark.circle',
-              destructive: true
-            },
-            {
-              id: 'account-reports',
-              title: t('account.reports.action'),
-              systemIcon: 'flag',
-              destructive: true
-            }
-          ]
-        })
-        break
-      default:
-        actions.push(
-          {
-            id: 'account-block',
-            title: t('account.block.action', {
-              context: (relationship?.blocking || false).toString()
-            }),
-            systemIcon: 'xmark.circle',
-            destructive: true
-          },
-          {
-            id: 'account-reports',
-            title: t('account.reports.action'),
-            systemIcon: 'flag',
-            destructive: true
-          }
-        )
-        break
-    }
-  }
-
-  return (index: number) => {
-    if (typeof index !== 'number' || !actions[index]) {
-      return // For Android
-    }
-    if (actions[index].id === 'account-mute') {
-      mutation.mutate({
-        type: 'updateAccountProperty',
-        queryKey,
-        id: accountId,
-        payload: { property: 'mute', currentValue: relationship?.muting }
-      })
-    }
-    if (
-      actions[index].id === 'account-block' ||
-      (actions[index].id === 'account' && actions[index].actions?.[0].id === 'account-block')
-    ) {
-      mutation.mutate({
-        type: 'updateAccountProperty',
-        queryKey,
-        id: accountId,
-        payload: { property: 'block', currentValue: relationship?.blocking }
-      })
-    }
-    if (
-      actions[index].id === 'account-reports' ||
-      (actions[index].id === 'account' && actions[index].actions?.[0].id === 'account-reports')
-    ) {
-      mutation.mutate({
-        type: 'updateAccountProperty',
-        queryKey,
-        id: accountId,
-        payload: { property: 'reports' }
-      })
-      mutation.mutate({
-        type: 'updateAccountProperty',
-        queryKey,
-        id: accountId,
-        payload: { property: 'block', currentValue: false }
-      })
-    }
-  }
-}
-
-export default contextMenuAccount
diff --git a/src/components/ContextMenu/instance.ts b/src/components/ContextMenu/instance.ts
index 3022c512..b152779a 100644
--- a/src/components/ContextMenu/instance.ts
+++ b/src/components/ContextMenu/instance.ts
@@ -3,24 +3,23 @@ import { QueryKeyTimeline, useTimelineMutation } from '@utils/queryHooks/timelin
 import { getInstanceUrl } from '@utils/slices/instancesSlice'
 import { useTheme } from '@utils/styles/ThemeManager'
 import { useTranslation } from 'react-i18next'
-import { Alert, Platform } from 'react-native'
-import { ContextMenuAction } from 'react-native-context-menu-view'
+import { Alert } from 'react-native'
 import { useQueryClient } from 'react-query'
 import { useSelector } from 'react-redux'
 
-export interface Props {
-  actions: ContextMenuAction[]
-  status: Mastodon.Status
-  queryKey: QueryKeyTimeline
+const menuInstance = ({
+  status,
+  queryKey,
+  rootQueryKey
+}: {
+  status?: Mastodon.Status
+  queryKey?: QueryKeyTimeline
   rootQueryKey?: QueryKeyTimeline
-}
+}): ContextMenu[][] => {
+  if (!status || !queryKey) return []
 
-const contextMenuInstance = ({ actions, status, queryKey, rootQueryKey }: Props) => {
-  const { t } = useTranslation('componentContextMenu')
   const { theme } = useTheme()
-
-  const currentInstance = useSelector(getInstanceUrl)
-  const instance = status?.uri && status.uri.split(new RegExp(/\/\/(.*?)\//))[1]
+  const { t } = useTranslation('componentContextMenu')
 
   const queryClient = useQueryClient()
   const mutation = useTimelineMutation({
@@ -37,61 +36,48 @@ const contextMenuInstance = ({ actions, status, queryKey, rootQueryKey }: Props)
     }
   })
 
+  const menus: ContextMenu[][] = []
+
+  const currentInstance = useSelector(getInstanceUrl)
+  const instance = status.uri && status.uri.split(new RegExp(/\/\/(.*?)\//))[1]
+
   if (currentInstance !== instance && instance) {
-    switch (Platform.OS) {
-      case 'ios':
-        actions.push({
-          id: 'instance',
-          title: t('instance.title'),
-          actions: [
-            {
-              id: 'instance-block',
-              title: t('instance.block.action', { instance }),
-              destructive: true
-            }
-          ]
-        })
-        break
-      default:
-        actions.push({
-          id: 'instance-block',
-          title: t('instance.block.action', { instance }),
-          destructive: true
-        })
-        break
-    }
+    menus.push([
+      {
+        key: 'instance-block',
+        item: {
+          onSelect: () =>
+            Alert.alert(
+              t('instance.block.alert.title', { instance }),
+              t('instance.block.alert.message'),
+              [
+                {
+                  text: t('instance.block.alert.buttons.confirm'),
+                  style: 'destructive',
+                  onPress: () => {
+                    mutation.mutate({
+                      type: 'domainBlock',
+                      queryKey,
+                      domain: instance
+                    })
+                  }
+                },
+                {
+                  text: t('common:buttons.cancel')
+                }
+              ]
+            ),
+          disabled: false,
+          destructive: true,
+          hidden: false
+        },
+        title: t('instance.block.action', { instance }),
+        icon: ''
+      }
+    ])
   }
 
-  return (index: number) => {
-    if (typeof index !== 'number' || !actions[index]) {
-      return // For Android
-    }
-    if (
-      actions[index].id === 'instance-block' ||
-      (actions[index].id === 'instance' && actions[index].actions?.[0].id === 'instance-block')
-    ) {
-      Alert.alert(
-        t('instance.block.alert.title', { instance }),
-        t('instance.block.alert.message'),
-        [
-          {
-            text: t('instance.block.alert.buttons.confirm'),
-            style: 'destructive',
-            onPress: () => {
-              mutation.mutate({
-                type: 'domainBlock',
-                queryKey,
-                domain: instance
-              })
-            }
-          },
-          {
-            text: t('common:buttons.cancel')
-          }
-        ]
-      )
-    }
-  }
+  return menus
 }
 
-export default contextMenuInstance
+export default menuInstance
diff --git a/src/components/ContextMenu/share.ts b/src/components/ContextMenu/share.ts
index 9bc5c465..961bc091 100644
--- a/src/components/ContextMenu/share.ts
+++ b/src/components/ContextMenu/share.ts
@@ -3,59 +3,74 @@ import Clipboard from '@react-native-clipboard/clipboard'
 import { useTheme } from '@utils/styles/ThemeManager'
 import { useTranslation } from 'react-i18next'
 import { Platform, Share } from 'react-native'
-import { ContextMenuAction } from 'react-native-context-menu-view'
 
-export interface Props {
-  copiableContent?: React.MutableRefObject<{
-    content?: string | undefined
-    complete: boolean
-  }>
-  actions: ContextMenuAction[]
-  type: 'status' | 'account'
-  url: string
-}
+const menuShare = (
+  params:
+    | {
+        visibility?: Mastodon.Status['visibility']
+        copiableContent?: React.MutableRefObject<{
+          content?: string | undefined
+          complete: boolean
+        }>
+        type: 'status'
+        url?: string
+      }
+    | {
+        type: 'account'
+        url: string
+      }
+): ContextMenu[][] => {
+  if (params.type === 'status' && params.visibility === 'direct') return []
 
-const contextMenuShare = ({ copiableContent, actions, type, url }: Props) => {
   const { theme } = useTheme()
   const { t } = useTranslation('componentContextMenu')
 
-  actions.push({
-    id: 'share',
-    title: t(`share.${type}.action`),
-    systemIcon: 'square.and.arrow.up'
-  })
-  Platform.OS !== 'android' &&
-    type === 'status' &&
-    actions.push({
-      id: 'copy',
-      title: t(`copy.action`),
-      systemIcon: 'doc.on.doc',
-      disabled: !copiableContent?.current.content?.length
+  const menus: ContextMenu[][] = [[]]
+
+  if (params.url) {
+    const url = params.url
+    menus[0].push({
+      key: 'share',
+      item: {
+        onSelect: () => {
+          switch (Platform.OS) {
+            case 'ios':
+              Share.share({ url })
+              break
+            case 'android':
+              Share.share({ message: url })
+              break
+          }
+        },
+        disabled: false,
+        destructive: false,
+        hidden: false
+      },
+      title: t(`share.${params.type}.action`),
+      icon: 'square.and.arrow.up'
+    })
+  }
+  if (params.type === 'status' && Platform.OS === 'ios')
+    menus[0].push({
+      key: 'copy',
+      item: {
+        onSelect: () => {
+          Clipboard.setString(params.copiableContent?.current.content || '')
+          displayMessage({
+            theme,
+            type: 'success',
+            message: t(`copy.succeed`)
+          })
+        },
+        disabled: false,
+        destructive: false,
+        hidden: !params.copiableContent?.current.content?.length
+      },
+      title: t('copy.action'),
+      icon: 'doc.on.doc'
     })
 
-  return (index: number) => {
-    if (typeof index !== 'number' || !actions[index]) {
-      return // For Android
-    }
-    if (actions[index].id === 'copy') {
-      Clipboard.setString(copiableContent?.current.content || '')
-      displayMessage({
-        theme,
-        type: 'success',
-        message: t(`copy.succeed`)
-      })
-    }
-    if (actions[index].id === 'share') {
-      switch (Platform.OS) {
-        case 'ios':
-          Share.share({ url })
-          break
-        case 'android':
-          Share.share({ message: url })
-          break
-      }
-    }
-  }
+  return menus
 }
 
-export default contextMenuShare
+export default menuShare
diff --git a/src/components/ContextMenu/status.ts b/src/components/ContextMenu/status.ts
index 6f23326f..9223d640 100644
--- a/src/components/ContextMenu/status.ts
+++ b/src/components/ContextMenu/status.ts
@@ -12,18 +12,20 @@ import { checkInstanceFeature, getInstanceAccount } from '@utils/slices/instance
 import { useTheme } from '@utils/styles/ThemeManager'
 import { useTranslation } from 'react-i18next'
 import { Alert } from 'react-native'
-import { ContextMenuAction } from 'react-native-context-menu-view'
 import { useQueryClient } from 'react-query'
 import { useSelector } from 'react-redux'
 
-export interface Props {
-  actions: ContextMenuAction[]
-  status: Mastodon.Status
-  queryKey: QueryKeyTimeline
+const menuStatus = ({
+  status,
+  queryKey,
+  rootQueryKey
+}: {
+  status?: Mastodon.Status
+  queryKey?: QueryKeyTimeline
   rootQueryKey?: QueryKeyTimeline
-}
+}): ContextMenu[][] => {
+  if (!status || !queryKey) return []
 
-const contextMenuStatus = ({ actions, status, queryKey, rootQueryKey }: Props) => {
   const navigation = useNavigation<NativeStackNavigationProp<RootStackParamList, 'Screen-Tabs'>>()
   const { theme } = useTheme()
   const { t } = useTranslation('componentContextMenu')
@@ -53,85 +55,19 @@ const contextMenuStatus = ({ actions, status, queryKey, rootQueryKey }: Props) =
     }
   })
 
+  const menus: ContextMenu[][] = []
+
   const instanceAccount = useSelector(getInstanceAccount, (prev, next) => prev.id === next.id)
-  const ownAccount = instanceAccount?.id === status?.account?.id
+  const ownAccount = instanceAccount?.id === status.account?.id
+
+  const canEditPost = useSelector(checkInstanceFeature('edit_post'))
 
   if (ownAccount) {
-    const accountMenuItems: ContextMenuAction[] = [
+    menus.push([
       {
-        id: 'status-delete',
-        title: t('status.delete.action'),
-        systemIcon: 'trash',
-        destructive: true
-      },
-      {
-        id: 'status-delete-edit',
-        title: t('status.deleteEdit.action'),
-        systemIcon: 'pencil.and.outline',
-        destructive: true
-      },
-      {
-        id: 'status-mute',
-        title: t('status.mute.action', {
-          context: (status.muted || false).toString()
-        }),
-        systemIcon: status.muted ? 'speaker' : 'speaker.slash'
-      }
-    ]
-
-    const canEditPost = useSelector(checkInstanceFeature('edit_post'))
-    if (canEditPost) {
-      accountMenuItems.unshift({
-        id: 'status-edit',
-        title: t('status.edit.action'),
-        systemIcon: 'square.and.pencil'
-      })
-    }
-
-    if (status.visibility === 'public' || status.visibility === 'unlisted') {
-      accountMenuItems.push({
-        id: 'status-pin',
-        title: t('status.pin.action', {
-          context: (status.pinned || false).toString()
-        }),
-        systemIcon: status.pinned ? 'pin.slash' : 'pin'
-      })
-    }
-
-    actions.push(...accountMenuItems)
-  }
-
-  return async (index: number) => {
-    if (typeof index !== 'number' || !actions[index]) {
-      return // For Android
-    }
-    if (actions[index].id === 'status-delete') {
-      Alert.alert(t('status.delete.alert.title'), t('status.delete.alert.message'), [
-        {
-          text: t('status.delete.alert.buttons.confirm'),
-          style: 'destructive',
-          onPress: async () => {
-            mutation.mutate({
-              type: 'deleteItem',
-              source: 'statuses',
-              queryKey,
-              rootQueryKey,
-              id: status.id
-            })
-          }
-        },
-        {
-          text: t('common:buttons.cancel'),
-          style: 'default'
-        }
-      ])
-    }
-    if (actions[index].id === 'status-delete-edit') {
-      Alert.alert(t('status.deleteEdit.alert.title'), t('status.deleteEdit.alert.message'), [
-        {
-          text: t('status.deleteEdit.alert.buttons.confirm'),
-          style: 'destructive',
-          onPress: async () => {
+        key: 'status-edit',
+        item: {
+          onSelect: async () => {
             let replyToStatus: Mastodon.Status | undefined = undefined
             if (status.in_reply_to_id) {
               replyToStatus = await apiInstance<Mastodon.Status>({
@@ -139,87 +75,166 @@ const contextMenuStatus = ({ actions, status, queryKey, rootQueryKey }: Props) =
                 url: `statuses/${status.in_reply_to_id}`
               }).then(res => res.body)
             }
-            mutation
-              .mutateAsync({
-                type: 'deleteItem',
-                source: 'statuses',
+            apiInstance<{
+              id: Mastodon.Status['id']
+              text: NonNullable<Mastodon.Status['text']>
+              spoiler_text: Mastodon.Status['spoiler_text']
+            }>({
+              method: 'get',
+              url: `statuses/${status.id}/source`
+            }).then(res => {
+              navigation.navigate('Screen-Compose', {
+                type: 'edit',
+                incomingStatus: {
+                  ...status,
+                  text: res.body.text,
+                  spoiler_text: res.body.spoiler_text
+                },
+                ...(replyToStatus && { replyToStatus }),
                 queryKey,
-                id: status.id
+                rootQueryKey
               })
-              .then(res => {
-                navigation.navigate('Screen-Compose', {
-                  type: 'deleteEdit',
-                  incomingStatus: res.body as Mastodon.Status,
-                  ...(replyToStatus && { replyToStatus }),
-                  queryKey
-                })
-              })
-          }
-        },
-        {
-          text: t('common:buttons.cancel')
-        }
-      ])
-    }
-    if (actions[index].id === 'status-mute') {
-      mutation.mutate({
-        type: 'updateStatusProperty',
-        queryKey,
-        rootQueryKey,
-        id: status.id,
-        payload: {
-          property: 'muted',
-          currentValue: status.muted,
-          propertyCount: undefined,
-          countValue: undefined
-        }
-      })
-    }
-    if (actions[index].id === 'status-edit') {
-      let replyToStatus: Mastodon.Status | undefined = undefined
-      if (status.in_reply_to_id) {
-        replyToStatus = await apiInstance<Mastodon.Status>({
-          method: 'get',
-          url: `statuses/${status.in_reply_to_id}`
-        }).then(res => res.body)
-      }
-      apiInstance<{
-        id: Mastodon.Status['id']
-        text: NonNullable<Mastodon.Status['text']>
-        spoiler_text: Mastodon.Status['spoiler_text']
-      }>({
-        method: 'get',
-        url: `statuses/${status.id}/source`
-      }).then(res => {
-        navigation.navigate('Screen-Compose', {
-          type: 'edit',
-          incomingStatus: {
-            ...status,
-            text: res.body.text,
-            spoiler_text: res.body.spoiler_text
+            })
           },
-          ...(replyToStatus && { replyToStatus }),
-          queryKey,
-          rootQueryKey
-        })
-      })
-    }
-    if (actions[index].id === 'status-pin') {
-      // Also note that reblogs cannot be pinned.
-      mutation.mutate({
-        type: 'updateStatusProperty',
-        queryKey,
-        rootQueryKey,
-        id: status.id,
-        payload: {
-          property: 'pinned',
-          currentValue: status.pinned,
-          propertyCount: undefined,
-          countValue: undefined
-        }
-      })
-    }
+          disabled: false,
+          destructive: false,
+          hidden: !canEditPost
+        },
+        title: t('status.edit.action'),
+        icon: 'square.and.pencil'
+      },
+      {
+        key: 'status-delete-edit',
+        item: {
+          onSelect: () =>
+            Alert.alert(t('status.deleteEdit.alert.title'), t('status.deleteEdit.alert.message'), [
+              {
+                text: t('status.deleteEdit.alert.buttons.confirm'),
+                style: 'destructive',
+                onPress: async () => {
+                  let replyToStatus: Mastodon.Status | undefined = undefined
+                  if (status.in_reply_to_id) {
+                    replyToStatus = await apiInstance<Mastodon.Status>({
+                      method: 'get',
+                      url: `statuses/${status.in_reply_to_id}`
+                    }).then(res => res.body)
+                  }
+                  mutation
+                    .mutateAsync({
+                      type: 'deleteItem',
+                      source: 'statuses',
+                      queryKey,
+                      id: status.id
+                    })
+                    .then(res => {
+                      navigation.navigate('Screen-Compose', {
+                        type: 'deleteEdit',
+                        incomingStatus: res.body as Mastodon.Status,
+                        ...(replyToStatus && { replyToStatus }),
+                        queryKey
+                      })
+                    })
+                }
+              },
+              {
+                text: t('common:buttons.cancel')
+              }
+            ]),
+          disabled: false,
+          destructive: true,
+          hidden: false
+        },
+        title: t('status.deleteEdit.action'),
+        icon: 'pencil.and.outline'
+      },
+      {
+        key: 'status-delete',
+        item: {
+          onSelect: () =>
+            Alert.alert(t('status.delete.alert.title'), t('status.delete.alert.message'), [
+              {
+                text: t('status.delete.alert.buttons.confirm'),
+                style: 'destructive',
+                onPress: async () => {
+                  mutation.mutate({
+                    type: 'deleteItem',
+                    source: 'statuses',
+                    queryKey,
+                    rootQueryKey,
+                    id: status.id
+                  })
+                }
+              },
+              {
+                text: t('common:buttons.cancel'),
+                style: 'default'
+              }
+            ]),
+          disabled: false,
+          destructive: true,
+          hidden: false
+        },
+        title: t('status.delete.action'),
+        icon: 'trash'
+      }
+    ])
+
+    menus.push([
+      {
+        key: 'status-mute',
+        item: {
+          onSelect: () =>
+            mutation.mutate({
+              type: 'updateStatusProperty',
+              queryKey,
+              rootQueryKey,
+              id: status.id,
+              payload: {
+                property: 'muted',
+                currentValue: status.muted,
+                propertyCount: undefined,
+                countValue: undefined
+              }
+            }),
+          disabled: false,
+          destructive: false,
+          hidden: false
+        },
+        title: t('status.mute.action', {
+          context: (status.muted || false).toString()
+        }),
+        icon: status.muted ? 'speaker' : 'speaker.slash'
+      },
+      {
+        key: 'status-pin',
+        item: {
+          onSelect: () =>
+            // Also note that reblogs cannot be pinned.
+            mutation.mutate({
+              type: 'updateStatusProperty',
+              queryKey,
+              rootQueryKey,
+              id: status.id,
+              payload: {
+                property: 'pinned',
+                currentValue: status.pinned,
+                propertyCount: undefined,
+                countValue: undefined
+              }
+            }),
+          disabled: false,
+          destructive: false,
+          hidden: status.visibility !== 'public' && status.visibility !== 'unlisted'
+        },
+        title: t('status.pin.action', {
+          context: (status.pinned || false).toString()
+        }),
+        icon: status.pinned ? 'pin.slash' : 'pin'
+      }
+    ])
   }
+
+  return menus
 }
 
-export default contextMenuStatus
+export default menuStatus
diff --git a/src/components/Timeline/Default.tsx b/src/components/Timeline/Default.tsx
index 6d9ab41d..7660f6a3 100644
--- a/src/components/Timeline/Default.tsx
+++ b/src/components/Timeline/Default.tsx
@@ -1,10 +1,12 @@
+import menuInstance from '@components/contextMenu/instance'
+import menuShare from '@components/contextMenu/share'
+import menuStatus from '@components/contextMenu/status'
 import TimelineActioned from '@components/Timeline/Shared/Actioned'
 import TimelineActions from '@components/Timeline/Shared/Actions'
 import TimelineAttachment from '@components/Timeline/Shared/Attachment'
 import TimelineAvatar from '@components/Timeline/Shared/Avatar'
 import TimelineCard from '@components/Timeline/Shared/Card'
 import TimelineContent from '@components/Timeline/Shared/Content'
-// @ts-ignore
 import TimelineHeaderDefault from '@components/Timeline/Shared/HeaderDefault'
 import TimelinePoll from '@components/Timeline/Shared/Poll'
 import { useNavigation } from '@react-navigation/native'
@@ -18,10 +20,11 @@ import { uniqBy } from 'lodash'
 import React, { useRef } from 'react'
 import { Pressable, StyleProp, View, ViewStyle } from 'react-native'
 import { useSelector } from 'react-redux'
-import TimelineContextMenu from './Shared/ContextMenu'
+import * as ContextMenu from 'zeego/context-menu'
 import TimelineFeedback from './Shared/Feedback'
 import TimelineFiltered, { shouldFilter } from './Shared/Filtered'
 import TimelineFullConversation from './Shared/FullConversation'
+import TimelineHeaderAndroid from './Shared/HeaderAndroid'
 import TimelineTranslate from './Shared/Translate'
 
 export interface Props {
@@ -89,8 +92,10 @@ const TimelineDefault: React.FC<Props> = ({
         />
         <TimelineHeaderDefault
           queryKey={disableOnPress ? undefined : queryKey}
+          rootQueryKey={rootQueryKey}
           status={actualStatus}
           highlighted={highlighted}
+          copiableContent={copiableContent}
         />
       </View>
 
@@ -149,24 +154,71 @@ const TimelineDefault: React.FC<Props> = ({
     </>
   )
 
+  const mShare = menuShare({
+    visibility: actualStatus.visibility,
+    type: 'status',
+    url: actualStatus.url || actualStatus.uri,
+    copiableContent
+  })
+  const mStatus = menuStatus({ status: actualStatus, queryKey, rootQueryKey })
+  const mInstance = menuInstance({ status: actualStatus, queryKey, rootQueryKey })
+
   return disableOnPress ? (
     <View style={mainStyle}>{main()}</View>
   ) : (
-    <TimelineContextMenu
-      copiableContent={copiableContent}
-      status={actualStatus}
-      queryKey={queryKey}
-      rootQueryKey={rootQueryKey}
-    >
-      <Pressable
-        accessible={highlighted ? false : true}
-        style={mainStyle}
-        onPress={onPress}
-        onLongPress={() => {}}
-      >
-        {main()}
-      </Pressable>
-    </TimelineContextMenu>
+    <>
+      <ContextMenu.Root>
+        <ContextMenu.Trigger>
+          <Pressable
+            accessible={highlighted ? false : true}
+            style={mainStyle}
+            onPress={onPress}
+            onLongPress={() => {}}
+            children={main()}
+          />
+        </ContextMenu.Trigger>
+
+        <ContextMenu.Content>
+          {mShare.map((mGroup, index) => (
+            <ContextMenu.Group key={index}>
+              {mGroup.map(menu => (
+                <ContextMenu.Item key={menu.key} {...menu.item}>
+                  <ContextMenu.ItemTitle children={menu.title} />
+                  <ContextMenu.ItemIcon iosIconName={menu.icon} />
+                </ContextMenu.Item>
+              ))}
+            </ContextMenu.Group>
+          ))}
+
+          {mStatus.map((mGroup, index) => (
+            <ContextMenu.Group key={index}>
+              {mGroup.map(menu => (
+                <ContextMenu.Item key={menu.key} {...menu.item}>
+                  <ContextMenu.ItemTitle children={menu.title} />
+                  <ContextMenu.ItemIcon iosIconName={menu.icon} />
+                </ContextMenu.Item>
+              ))}
+            </ContextMenu.Group>
+          ))}
+
+          {mInstance.map((mGroup, index) => (
+            <ContextMenu.Group key={index}>
+              {mGroup.map(menu => (
+                <ContextMenu.Item key={menu.key} {...menu.item}>
+                  <ContextMenu.ItemTitle children={menu.title} />
+                  <ContextMenu.ItemIcon iosIconName={menu.icon} />
+                </ContextMenu.Item>
+              ))}
+            </ContextMenu.Group>
+          ))}
+        </ContextMenu.Content>
+      </ContextMenu.Root>
+      <TimelineHeaderAndroid
+        queryKey={disableOnPress ? undefined : queryKey}
+        rootQueryKey={rootQueryKey}
+        status={actualStatus}
+      />
+    </>
   )
 }
 
diff --git a/src/components/Timeline/Notifications.tsx b/src/components/Timeline/Notifications.tsx
index 81e2e24b..848896e2 100644
--- a/src/components/Timeline/Notifications.tsx
+++ b/src/components/Timeline/Notifications.tsx
@@ -1,10 +1,12 @@
+import menuInstance from '@components/contextMenu/instance'
+import menuShare from '@components/contextMenu/share'
+import menuStatus from '@components/contextMenu/status'
 import TimelineActioned from '@components/Timeline/Shared/Actioned'
 import TimelineActions from '@components/Timeline/Shared/Actions'
 import TimelineAttachment from '@components/Timeline/Shared/Attachment'
 import TimelineAvatar from '@components/Timeline/Shared/Avatar'
 import TimelineCard from '@components/Timeline/Shared/Card'
 import TimelineContent from '@components/Timeline/Shared/Content'
-// @ts-ignore
 import TimelineHeaderNotification from '@components/Timeline/Shared/HeaderNotification'
 import TimelinePoll from '@components/Timeline/Shared/Poll'
 import { useNavigation } from '@react-navigation/native'
@@ -16,11 +18,12 @@ import { StyleConstants } from '@utils/styles/constants'
 import { useTheme } from '@utils/styles/ThemeManager'
 import { uniqBy } from 'lodash'
 import React, { useCallback, useRef } from 'react'
-import { Platform, Pressable, View } from 'react-native'
+import { Pressable, View } from 'react-native'
 import { useSelector } from 'react-redux'
-import TimelineContextMenu from './Shared/ContextMenu'
+import * as ContextMenu from 'zeego/context-menu'
 import TimelineFiltered, { shouldFilter } from './Shared/Filtered'
 import TimelineFullConversation from './Shared/FullConversation'
+import TimelineHeaderAndroid from './Shared/HeaderAndroid'
 
 export interface Props {
   notification: Mastodon.Notification
@@ -136,36 +139,68 @@ const TimelineNotifications: React.FC<Props> = ({
     )
   }
 
-  return Platform.OS === 'android' ? (
-    <Pressable
-      style={{
-        padding: StyleConstants.Spacing.Global.PagePadding,
-        backgroundColor: colors.backgroundDefault,
-        paddingBottom: notification.status ? 0 : StyleConstants.Spacing.Global.PagePadding
-      }}
-      onPress={onPress}
-      onLongPress={() => {}}
-    >
-      {main()}
-    </Pressable>
-  ) : (
-    <TimelineContextMenu
-      copiableContent={copiableContent}
-      status={notification.status}
-      queryKey={queryKey}
-    >
-      <Pressable
-        style={{
-          padding: StyleConstants.Spacing.Global.PagePadding,
-          backgroundColor: colors.backgroundDefault,
-          paddingBottom: notification.status ? 0 : StyleConstants.Spacing.Global.PagePadding
-        }}
-        onPress={onPress}
-        onLongPress={() => {}}
-      >
-        {main()}
-      </Pressable>
-    </TimelineContextMenu>
+  const mShare = menuShare({
+    visibility: notification.status?.visibility,
+    type: 'status',
+    url: notification.status?.url || notification.status?.uri,
+    copiableContent
+  })
+  const mStatus = menuStatus({ status: notification.status, queryKey })
+  const mInstance = menuInstance({ status: notification.status, queryKey })
+
+  return (
+    <>
+      <ContextMenu.Root>
+        <ContextMenu.Trigger>
+          <Pressable
+            style={{
+              padding: StyleConstants.Spacing.Global.PagePadding,
+              backgroundColor: colors.backgroundDefault,
+              paddingBottom: notification.status ? 0 : StyleConstants.Spacing.Global.PagePadding
+            }}
+            onPress={onPress}
+            onLongPress={() => {}}
+            children={main()}
+          />
+        </ContextMenu.Trigger>
+
+        <ContextMenu.Content>
+          {mShare.map((mGroup, index) => (
+            <ContextMenu.Group key={index}>
+              {mGroup.map(menu => (
+                <ContextMenu.Item key={menu.key} {...menu.item}>
+                  <ContextMenu.ItemTitle children={menu.title} />
+                  <ContextMenu.ItemIcon iosIconName={menu.icon} />
+                </ContextMenu.Item>
+              ))}
+            </ContextMenu.Group>
+          ))}
+
+          {mStatus.map((mGroup, index) => (
+            <ContextMenu.Group key={index}>
+              {mGroup.map(menu => (
+                <ContextMenu.Item key={menu.key} {...menu.item}>
+                  <ContextMenu.ItemTitle children={menu.title} />
+                  <ContextMenu.ItemIcon iosIconName={menu.icon} />
+                </ContextMenu.Item>
+              ))}
+            </ContextMenu.Group>
+          ))}
+
+          {mInstance.map((mGroup, index) => (
+            <ContextMenu.Group key={index}>
+              {mGroup.map(menu => (
+                <ContextMenu.Item key={menu.key} {...menu.item}>
+                  <ContextMenu.ItemTitle children={menu.title} />
+                  <ContextMenu.ItemIcon iosIconName={menu.icon} />
+                </ContextMenu.Item>
+              ))}
+            </ContextMenu.Group>
+          ))}
+        </ContextMenu.Content>
+      </ContextMenu.Root>
+      <TimelineHeaderAndroid queryKey={queryKey} status={notification.status} />
+    </>
   )
 }
 
diff --git a/src/components/Timeline/Shared/ContextMenu.tsx b/src/components/Timeline/Shared/ContextMenu.tsx
deleted file mode 100644
index f5935e9d..00000000
--- a/src/components/Timeline/Shared/ContextMenu.tsx
+++ /dev/null
@@ -1,84 +0,0 @@
-import contextMenuAccount from '@components/ContextMenu/account'
-import contextMenuInstance from '@components/ContextMenu/instance'
-import contextMenuShare from '@components/ContextMenu/share'
-import contextMenuStatus from '@components/ContextMenu/status'
-import { QueryKeyTimeline } from '@utils/queryHooks/timeline'
-import React from 'react'
-import { createContext } from 'react'
-import { Platform } from 'react-native'
-import ContextMenu, { ContextMenuAction, ContextMenuProps } from 'react-native-context-menu-view'
-
-export interface Props {
-  copiableContent: React.MutableRefObject<{
-    content: string
-    complete: boolean
-  }>
-  status?: Mastodon.Status
-  queryKey?: QueryKeyTimeline
-  rootQueryKey?: QueryKeyTimeline
-}
-
-export const ContextMenuContext = createContext<ContextMenuAction[]>([])
-
-const TimelineContextMenu: React.FC<Props & ContextMenuProps> = ({
-  children,
-  copiableContent,
-  status,
-  queryKey,
-  rootQueryKey,
-  ...props
-}) => {
-  if (!status || !queryKey || Platform.OS === 'android') {
-    return <>{children}</>
-  }
-
-  const actions: ContextMenuAction[] = []
-
-  const shareOnPress =
-    status.visibility !== 'direct'
-      ? contextMenuShare({
-          copiableContent,
-          actions,
-          type: 'status',
-          url: status.url || status.uri
-        })
-      : null
-  const statusOnPress = contextMenuStatus({
-    actions,
-    status,
-    queryKey,
-    rootQueryKey
-  })
-  const accountOnPress = status?.account?.id
-    ? contextMenuAccount({
-        actions,
-        type: 'status',
-        queryKey,
-        rootQueryKey,
-        id: status.account.id
-      })
-    : null
-  const instanceOnPress = contextMenuInstance({
-    actions,
-    status,
-    queryKey,
-    rootQueryKey
-  })
-
-  return (
-    <ContextMenuContext.Provider value={actions}>
-      <ContextMenu
-        actions={actions}
-        onPress={({ nativeEvent: { index } }) => {
-          for (const on of [shareOnPress, statusOnPress, accountOnPress, instanceOnPress]) {
-            on && on(index)
-          }
-        }}
-        children={children}
-        {...props}
-      />
-    </ContextMenuContext.Provider>
-  )
-}
-
-export default TimelineContextMenu
diff --git a/src/components/Timeline/Shared/HeaderAndroid.tsx b/src/components/Timeline/Shared/HeaderAndroid.tsx
new file mode 100644
index 00000000..eeed11e6
--- /dev/null
+++ b/src/components/Timeline/Shared/HeaderAndroid.tsx
@@ -0,0 +1,103 @@
+import menuAccount from '@components/contextMenu/account'
+import menuInstance from '@components/contextMenu/instance'
+import menuShare from '@components/contextMenu/share'
+import menuStatus from '@components/contextMenu/status'
+import Icon from '@components/Icon'
+import { QueryKeyTimeline } from '@utils/queryHooks/timeline'
+import { StyleConstants } from '@utils/styles/constants'
+import { useTheme } from '@utils/styles/ThemeManager'
+import React, { useState } from 'react'
+import { Platform, View } from 'react-native'
+import * as DropdownMenu from 'zeego/dropdown-menu'
+
+export interface Props {
+  queryKey?: QueryKeyTimeline
+  rootQueryKey?: QueryKeyTimeline
+  status?: Mastodon.Status
+}
+
+const TimelineHeaderAndroid: React.FC<Props> = ({ queryKey, rootQueryKey, status }) => {
+  if (Platform.OS !== 'android' || !status) return null
+
+  const { colors } = useTheme()
+
+  const [openChange, setOpenChange] = useState(false)
+  const mShare = menuShare({
+    visibility: status.visibility,
+    type: 'status',
+    url: status.url || status.uri
+  })
+  const mAccount = menuAccount({
+    openChange,
+    id: status.account.id,
+    queryKey
+  })
+  const mStatus = menuStatus({ status, queryKey, rootQueryKey })
+  const mInstance = menuInstance({ status, queryKey, rootQueryKey })
+
+  return (
+    <View style={{ position: 'absolute', top: 0, right: 0 }}>
+      {queryKey ? (
+        <DropdownMenu.Root onOpenChange={setOpenChange}>
+          <DropdownMenu.Trigger>
+            <View style={{ padding: StyleConstants.Spacing.L }}>
+              <Icon
+                name='MoreHorizontal'
+                color={colors.secondary}
+                size={StyleConstants.Font.Size.L}
+              />
+            </View>
+          </DropdownMenu.Trigger>
+
+          <DropdownMenu.Content>
+            {mShare.map((mGroup, index) => (
+              <DropdownMenu.Group key={index}>
+                {mGroup.map(menu => (
+                  <DropdownMenu.Item key={menu.key} {...menu.item}>
+                    <DropdownMenu.ItemTitle children={menu.title} />
+                    <DropdownMenu.ItemIcon iosIconName={menu.icon} />
+                  </DropdownMenu.Item>
+                ))}
+              </DropdownMenu.Group>
+            ))}
+
+            {mAccount.map((mGroup, index) => (
+              <DropdownMenu.Group key={index}>
+                {mGroup.map(menu => (
+                  <DropdownMenu.Item key={menu.key} {...menu.item}>
+                    <DropdownMenu.ItemTitle children={menu.title} />
+                    <DropdownMenu.ItemIcon iosIconName={menu.icon} />
+                  </DropdownMenu.Item>
+                ))}
+              </DropdownMenu.Group>
+            ))}
+
+            {mStatus.map((mGroup, index) => (
+              <DropdownMenu.Group key={index}>
+                {mGroup.map(menu => (
+                  <DropdownMenu.Item key={menu.key} {...menu.item}>
+                    <DropdownMenu.ItemTitle children={menu.title} />
+                    <DropdownMenu.ItemIcon iosIconName={menu.icon} />
+                  </DropdownMenu.Item>
+                ))}
+              </DropdownMenu.Group>
+            ))}
+
+            {mInstance.map((mGroup, index) => (
+              <DropdownMenu.Group key={index}>
+                {mGroup.map(menu => (
+                  <DropdownMenu.Item key={menu.key} {...menu.item}>
+                    <DropdownMenu.ItemTitle children={menu.title} />
+                    <DropdownMenu.ItemIcon iosIconName={menu.icon} />
+                  </DropdownMenu.Item>
+                ))}
+              </DropdownMenu.Group>
+            ))}
+          </DropdownMenu.Content>
+        </DropdownMenu.Root>
+      ) : null}
+    </View>
+  )
+}
+
+export default TimelineHeaderAndroid
diff --git a/src/components/Timeline/Shared/HeaderDefault.android.tsx b/src/components/Timeline/Shared/HeaderDefault.android.tsx
deleted file mode 100644
index 9869f450..00000000
--- a/src/components/Timeline/Shared/HeaderDefault.android.tsx
+++ /dev/null
@@ -1,114 +0,0 @@
-import contextMenuAccount from '@components/ContextMenu/account'
-import contextMenuInstance from '@components/ContextMenu/instance'
-import contextMenuShare from '@components/ContextMenu/share'
-import contextMenuStatus from '@components/ContextMenu/status'
-import Icon from '@components/Icon'
-import { useActionSheet } from '@expo/react-native-action-sheet'
-import { QueryKeyTimeline } from '@utils/queryHooks/timeline'
-import { StyleConstants } from '@utils/styles/constants'
-import { useTheme } from '@utils/styles/ThemeManager'
-import React from 'react'
-import { useTranslation } from 'react-i18next'
-import { Pressable, View } from 'react-native'
-import { ContextMenuAction } from 'react-native-context-menu-view'
-import HeaderSharedAccount from './HeaderShared/Account'
-import HeaderSharedApplication from './HeaderShared/Application'
-import HeaderSharedCreated from './HeaderShared/Created'
-import HeaderSharedMuted from './HeaderShared/Muted'
-import HeaderSharedVisibility from './HeaderShared/Visibility'
-
-export interface Props {
-  queryKey?: QueryKeyTimeline
-  status: Mastodon.Status
-  highlighted: boolean
-}
-
-const TimelineHeaderDefault = ({ queryKey, status, highlighted }: Props) => {
-  if (!queryKey) return null
-
-  const { t } = useTranslation('componentContextMenu')
-  const { colors } = useTheme()
-
-  const actions: ContextMenuAction[] = []
-
-  const shareOnPress =
-    status.visibility !== 'direct'
-      ? contextMenuShare({
-          actions,
-          type: 'status',
-          url: status.url || status.uri
-        })
-      : null
-  const statusOnPress = contextMenuStatus({
-    actions,
-    status,
-    queryKey
-  })
-  const accountOnPress = contextMenuAccount({
-    actions,
-    type: 'status',
-    queryKey,
-    id: status.account.id
-  })
-  const instanceOnPress = contextMenuInstance({
-    actions,
-    status,
-    queryKey
-  })
-
-  const { showActionSheetWithOptions } = useActionSheet()
-
-  return (
-    <View style={{ flex: 1, flexDirection: 'row' }}>
-      <View style={{ flex: 7 }}>
-        <HeaderSharedAccount account={status.account} />
-        <View
-          style={{
-            flexDirection: 'row',
-            alignItems: 'center',
-            marginTop: StyleConstants.Spacing.XS,
-            marginBottom: StyleConstants.Spacing.S
-          }}
-        >
-          <HeaderSharedCreated
-            created_at={status.created_at}
-            edited_at={status.edited_at}
-            highlighted={highlighted}
-          />
-          <HeaderSharedVisibility visibility={status.visibility} />
-          <HeaderSharedMuted muted={status.muted} />
-          <HeaderSharedApplication application={status.application} />
-        </View>
-      </View>
-
-      {queryKey ? (
-        <Pressable
-          accessibilityHint={t('accessibilityHint')}
-          style={{ flex: 1, flexBasis: StyleConstants.Font.Size.L }}
-          onPress={() =>
-            showActionSheetWithOptions(
-              {
-                options: actions.map(action => action.title),
-                cancelButtonIndex: 999,
-                destructiveButtonIndex: actions
-                  .map((action, index) => (action.destructive ? index : 999))
-                  .filter(num => num !== 999)
-              },
-              index => {
-                if (index !== undefined) {
-                  for (const on of [shareOnPress, statusOnPress, accountOnPress, instanceOnPress]) {
-                    on && on(index)
-                  }
-                }
-              }
-            )
-          }
-        >
-          <Icon name='MoreHorizontal' color={colors.secondary} size={StyleConstants.Font.Size.L} />
-        </Pressable>
-      ) : null}
-    </View>
-  )
-}
-
-export default TimelineHeaderDefault
diff --git a/src/components/Timeline/Shared/HeaderDefault.ios.tsx b/src/components/Timeline/Shared/HeaderDefault.ios.tsx
deleted file mode 100644
index d2219c87..00000000
--- a/src/components/Timeline/Shared/HeaderDefault.ios.tsx
+++ /dev/null
@@ -1,75 +0,0 @@
-import Icon from '@components/Icon'
-import { QueryKeyTimeline } from '@utils/queryHooks/timeline'
-import { StyleConstants } from '@utils/styles/constants'
-import { useTheme } from '@utils/styles/ThemeManager'
-import React, { useContext } from 'react'
-import { useTranslation } from 'react-i18next'
-import { Pressable, View } from 'react-native'
-import ContextMenu from 'react-native-context-menu-view'
-import { ContextMenuContext } from './ContextMenu'
-import HeaderSharedAccount from './HeaderShared/Account'
-import HeaderSharedApplication from './HeaderShared/Application'
-import HeaderSharedCreated from './HeaderShared/Created'
-import HeaderSharedMuted from './HeaderShared/Muted'
-import HeaderSharedVisibility from './HeaderShared/Visibility'
-
-export interface Props {
-  queryKey?: QueryKeyTimeline
-  status: Mastodon.Status
-  highlighted: boolean
-}
-
-const TimelineHeaderDefault = ({ queryKey, status, highlighted }: Props) => {
-  const { t } = useTranslation('componentContextMenu')
-  const { colors } = useTheme()
-
-  const contextMenuContext = useContext(ContextMenuContext)
-
-  return (
-    <View style={{ flex: 1, flexDirection: 'row' }}>
-      <View style={{ flex: 7 }}>
-        <HeaderSharedAccount account={status.account} />
-        <View
-          style={{
-            flexDirection: 'row',
-            alignItems: 'center',
-            marginTop: StyleConstants.Spacing.XS,
-            marginBottom: StyleConstants.Spacing.S
-          }}
-        >
-          <HeaderSharedCreated
-            created_at={status.created_at}
-            edited_at={status.edited_at}
-            highlighted={highlighted}
-          />
-          <HeaderSharedVisibility visibility={status.visibility} />
-          <HeaderSharedMuted muted={status.muted} />
-          <HeaderSharedApplication application={status.application} />
-        </View>
-      </View>
-
-      {queryKey ? (
-        <Pressable
-          accessibilityHint={t('accessibilityHint')}
-          style={{ flex: 1, flexBasis: StyleConstants.Font.Size.L }}
-        >
-          <ContextMenu
-            style={{ flex: 1, alignItems: 'center' }}
-            dropdownMenuMode
-            actions={contextMenuContext}
-            onPress={() => {}}
-            children={
-              <Icon
-                name='MoreHorizontal'
-                color={colors.secondary}
-                size={StyleConstants.Font.Size.L}
-              />
-            }
-          />
-        </Pressable>
-      ) : null}
-    </View>
-  )
-}
-
-export default TimelineHeaderDefault
diff --git a/src/components/Timeline/Shared/HeaderDefault.tsx b/src/components/Timeline/Shared/HeaderDefault.tsx
new file mode 100644
index 00000000..7a649026
--- /dev/null
+++ b/src/components/Timeline/Shared/HeaderDefault.tsx
@@ -0,0 +1,144 @@
+import menuAccount from '@components/contextMenu/account'
+import menuInstance from '@components/contextMenu/instance'
+import menuShare from '@components/contextMenu/share'
+import menuStatus from '@components/contextMenu/status'
+import Icon from '@components/Icon'
+import { QueryKeyTimeline } from '@utils/queryHooks/timeline'
+import { StyleConstants } from '@utils/styles/constants'
+import { useTheme } from '@utils/styles/ThemeManager'
+import React, { useState } from 'react'
+import { useTranslation } from 'react-i18next'
+import { Platform, Pressable, View } from 'react-native'
+import * as DropdownMenu from 'zeego/dropdown-menu'
+import HeaderSharedAccount from './HeaderShared/Account'
+import HeaderSharedApplication from './HeaderShared/Application'
+import HeaderSharedCreated from './HeaderShared/Created'
+import HeaderSharedMuted from './HeaderShared/Muted'
+import HeaderSharedVisibility from './HeaderShared/Visibility'
+
+export interface Props {
+  queryKey?: QueryKeyTimeline
+  rootQueryKey?: QueryKeyTimeline
+  status: Mastodon.Status
+  highlighted: boolean
+  copiableContent: React.MutableRefObject<{
+    content: string
+    complete: boolean
+  }>
+}
+
+const TimelineHeaderDefault: React.FC<Props> = ({
+  queryKey,
+  rootQueryKey,
+  status,
+  highlighted,
+  copiableContent
+}) => {
+  const { colors } = useTheme()
+  const { t } = useTranslation('componentContextMenu')
+
+  const [openChange, setOpenChange] = useState(false)
+  const mShare = menuShare({
+    visibility: status.visibility,
+    type: 'status',
+    url: status.url || status.uri,
+    copiableContent
+  })
+  const mAccount = menuAccount({
+    openChange,
+    id: status.account.id,
+    queryKey
+  })
+  const mStatus = menuStatus({ status, queryKey, rootQueryKey })
+  const mInstance = menuInstance({ status, queryKey, rootQueryKey })
+
+  return (
+    <View style={{ flex: 1, flexDirection: 'row' }}>
+      <View style={{ flex: 7 }}>
+        <HeaderSharedAccount account={status.account} />
+        <View
+          style={{
+            flexDirection: 'row',
+            alignItems: 'center',
+            marginTop: StyleConstants.Spacing.XS,
+            marginBottom: StyleConstants.Spacing.S
+          }}
+        >
+          <HeaderSharedCreated
+            created_at={status.created_at}
+            edited_at={status.edited_at}
+            highlighted={highlighted}
+          />
+          <HeaderSharedVisibility visibility={status.visibility} />
+          <HeaderSharedMuted muted={status.muted} />
+          <HeaderSharedApplication application={status.application} />
+        </View>
+      </View>
+
+      {Platform.OS !== 'android' && queryKey ? (
+        <Pressable
+          accessibilityHint={t('accessibilityHint')}
+          style={{ flex: 1, alignItems: 'center' }}
+        >
+          <DropdownMenu.Root onOpenChange={setOpenChange}>
+            <DropdownMenu.Trigger>
+              <Icon
+                name='MoreHorizontal'
+                color={colors.secondary}
+                size={StyleConstants.Font.Size.L}
+              />
+            </DropdownMenu.Trigger>
+
+            <DropdownMenu.Content>
+              {mShare.map((mGroup, index) => (
+                <DropdownMenu.Group key={index}>
+                  {mGroup.map(menu => (
+                    <DropdownMenu.Item key={menu.key} {...menu.item}>
+                      <DropdownMenu.ItemTitle children={menu.title} />
+                      <DropdownMenu.ItemIcon iosIconName={menu.icon} />
+                    </DropdownMenu.Item>
+                  ))}
+                </DropdownMenu.Group>
+              ))}
+
+              {mAccount.map((mGroup, index) => (
+                <DropdownMenu.Group key={index}>
+                  {mGroup.map(menu => (
+                    <DropdownMenu.Item key={menu.key} {...menu.item}>
+                      <DropdownMenu.ItemTitle children={menu.title} />
+                      <DropdownMenu.ItemIcon iosIconName={menu.icon} />
+                    </DropdownMenu.Item>
+                  ))}
+                </DropdownMenu.Group>
+              ))}
+
+              {mStatus.map((mGroup, index) => (
+                <DropdownMenu.Group key={index}>
+                  {mGroup.map(menu => (
+                    <DropdownMenu.Item key={menu.key} {...menu.item}>
+                      <DropdownMenu.ItemTitle children={menu.title} />
+                      <DropdownMenu.ItemIcon iosIconName={menu.icon} />
+                    </DropdownMenu.Item>
+                  ))}
+                </DropdownMenu.Group>
+              ))}
+
+              {mInstance.map((mGroup, index) => (
+                <DropdownMenu.Group key={index}>
+                  {mGroup.map(menu => (
+                    <DropdownMenu.Item key={menu.key} {...menu.item}>
+                      <DropdownMenu.ItemTitle children={menu.title} />
+                      <DropdownMenu.ItemIcon iosIconName={menu.icon} />
+                    </DropdownMenu.Item>
+                  ))}
+                </DropdownMenu.Group>
+              ))}
+            </DropdownMenu.Content>
+          </DropdownMenu.Root>
+        </Pressable>
+      ) : null}
+    </View>
+  )
+}
+
+export default TimelineHeaderDefault
diff --git a/src/components/Timeline/Shared/HeaderNotification.android.tsx b/src/components/Timeline/Shared/HeaderNotification.android.tsx
deleted file mode 100644
index de62abd0..00000000
--- a/src/components/Timeline/Shared/HeaderNotification.android.tsx
+++ /dev/null
@@ -1,157 +0,0 @@
-import contextMenuAccount from '@components/ContextMenu/account'
-import contextMenuInstance from '@components/ContextMenu/instance'
-import contextMenuShare from '@components/ContextMenu/share'
-import contextMenuStatus from '@components/ContextMenu/status'
-import Icon from '@components/Icon'
-import { RelationshipIncoming, RelationshipOutgoing } from '@components/Relationship'
-import { useActionSheet } from '@expo/react-native-action-sheet'
-import { QueryKeyTimeline } from '@utils/queryHooks/timeline'
-import { StyleConstants } from '@utils/styles/constants'
-import { useTheme } from '@utils/styles/ThemeManager'
-import React, { useMemo } from 'react'
-import { Pressable, View } from 'react-native'
-import { ContextMenuAction } from 'react-native-context-menu-view'
-import HeaderSharedAccount from './HeaderShared/Account'
-import HeaderSharedApplication from './HeaderShared/Application'
-import HeaderSharedCreated from './HeaderShared/Created'
-import HeaderSharedMuted from './HeaderShared/Muted'
-import HeaderSharedVisibility from './HeaderShared/Visibility'
-
-export interface Props {
-  queryKey: QueryKeyTimeline
-  notification: Mastodon.Notification
-}
-
-const TimelineHeaderNotification = ({ queryKey, notification }: Props) => {
-  const { colors } = useTheme()
-
-  const contextMenuActions: ContextMenuAction[] = []
-  const status = notification.status
-  const shareOnPress =
-    status && status?.visibility !== 'direct'
-      ? contextMenuShare({
-          actions: contextMenuActions,
-          type: 'status',
-          url: status.url || status.uri
-        })
-      : null
-  const statusOnPress =
-    status &&
-    contextMenuStatus({
-      actions: contextMenuActions,
-      status: status,
-      queryKey
-    })
-  const accountOnPress =
-    status &&
-    contextMenuAccount({
-      actions: contextMenuActions,
-      type: 'status',
-      queryKey,
-      id: status.account.id
-    })
-  const instanceOnPress =
-    status &&
-    contextMenuInstance({
-      actions: contextMenuActions,
-      status: status,
-      queryKey
-    })
-
-  const { showActionSheetWithOptions } = useActionSheet()
-
-  const actions = useMemo(() => {
-    switch (notification.type) {
-      case 'follow':
-        return <RelationshipOutgoing id={notification.account.id} />
-      case 'follow_request':
-        return <RelationshipIncoming id={notification.account.id} />
-      default:
-        if (notification.status) {
-          return (
-            <Pressable
-              style={{ flex: 1, flexBasis: StyleConstants.Font.Size.L }}
-              onPress={() =>
-                showActionSheetWithOptions(
-                  {
-                    options: contextMenuActions.map(action => action.title),
-                    cancelButtonIndex: 999,
-                    destructiveButtonIndex: contextMenuActions
-                      .map((action, index) => (action.destructive ? index : 999))
-                      .filter(num => num !== 999)
-                  },
-                  index => {
-                    if (index !== undefined) {
-                      for (const on of [
-                        shareOnPress,
-                        statusOnPress,
-                        accountOnPress,
-                        instanceOnPress
-                      ]) {
-                        on && on(index)
-                      }
-                    }
-                  }
-                )
-              }
-              children={
-                <Icon
-                  name='MoreHorizontal'
-                  color={colors.secondary}
-                  size={StyleConstants.Font.Size.L}
-                />
-              }
-            />
-          )
-        }
-    }
-  }, [notification.type])
-
-  return (
-    <View style={{ flex: 1, flexDirection: 'row' }}>
-      <View
-        style={{
-          flex: notification.type === 'follow' || notification.type === 'follow_request' ? 1 : 4
-        }}
-      >
-        <HeaderSharedAccount
-          account={notification.status ? notification.status.account : notification.account}
-          {...((notification.type === 'follow' || notification.type === 'follow_request') && {
-            withoutName: true
-          })}
-        />
-        <View
-          style={{
-            flexDirection: 'row',
-            alignItems: 'center',
-            marginTop: StyleConstants.Spacing.XS,
-            marginBottom: StyleConstants.Spacing.S
-          }}
-        >
-          <HeaderSharedCreated
-            created_at={notification.status?.created_at || notification.created_at}
-            edited_at={notification.status?.edited_at}
-          />
-          {notification.status?.visibility ? (
-            <HeaderSharedVisibility visibility={notification.status.visibility} />
-          ) : null}
-          <HeaderSharedMuted muted={notification.status?.muted} />
-          <HeaderSharedApplication application={notification.status?.application} />
-        </View>
-      </View>
-
-      <View
-        style={[
-          { marginLeft: StyleConstants.Spacing.M },
-          notification.type === 'follow' || notification.type === 'follow_request'
-            ? { flexShrink: 1 }
-            : { flex: 1 }
-        ]}
-      >
-        {actions}
-      </View>
-    </View>
-  )
-}
-
-export default TimelineHeaderNotification
diff --git a/src/components/Timeline/Shared/HeaderNotification.ios.tsx b/src/components/Timeline/Shared/HeaderNotification.ios.tsx
deleted file mode 100644
index 376029a9..00000000
--- a/src/components/Timeline/Shared/HeaderNotification.ios.tsx
+++ /dev/null
@@ -1,105 +0,0 @@
-import Icon from '@components/Icon'
-import { RelationshipIncoming, RelationshipOutgoing } from '@components/Relationship'
-import { QueryKeyTimeline } from '@utils/queryHooks/timeline'
-import { StyleConstants } from '@utils/styles/constants'
-import { useTheme } from '@utils/styles/ThemeManager'
-import React, { useContext, useMemo } from 'react'
-import { Pressable, View } from 'react-native'
-import ContextMenu from 'react-native-context-menu-view'
-import { ContextMenuContext } from './ContextMenu'
-import HeaderSharedAccount from './HeaderShared/Account'
-import HeaderSharedApplication from './HeaderShared/Application'
-import HeaderSharedCreated from './HeaderShared/Created'
-import HeaderSharedMuted from './HeaderShared/Muted'
-import HeaderSharedVisibility from './HeaderShared/Visibility'
-
-export interface Props {
-  queryKey: QueryKeyTimeline
-  notification: Mastodon.Notification
-}
-
-const TimelineHeaderNotification = ({ notification }: Props) => {
-  const { colors } = useTheme()
-
-  const contextMenuContext = useContext(ContextMenuContext)
-
-  const actions = useMemo(() => {
-    switch (notification.type) {
-      case 'follow':
-        return <RelationshipOutgoing id={notification.account.id} />
-      case 'follow_request':
-        return <RelationshipIncoming id={notification.account.id} />
-      default:
-        if (notification.status) {
-          return (
-            <Pressable
-              style={{ flex: 1, flexBasis: StyleConstants.Font.Size.L }}
-              children={
-                <ContextMenu
-                  style={{ flex: 1, alignItems: 'center' }}
-                  dropdownMenuMode
-                  actions={contextMenuContext}
-                  onPress={() => {}}
-                  children={
-                    <Icon
-                      name='MoreHorizontal'
-                      color={colors.secondary}
-                      size={StyleConstants.Font.Size.L}
-                    />
-                  }
-                />
-              }
-            />
-          )
-        }
-    }
-  }, [notification.type])
-
-  return (
-    <View style={{ flex: 1, flexDirection: 'row' }}>
-      <View
-        style={{
-          flex: notification.type === 'follow' || notification.type === 'follow_request' ? 1 : 4
-        }}
-      >
-        <HeaderSharedAccount
-          account={notification.status ? notification.status.account : notification.account}
-          {...((notification.type === 'follow' || notification.type === 'follow_request') && {
-            withoutName: true
-          })}
-        />
-        <View
-          style={{
-            flexDirection: 'row',
-            alignItems: 'center',
-            marginTop: StyleConstants.Spacing.XS,
-            marginBottom: StyleConstants.Spacing.S
-          }}
-        >
-          <HeaderSharedCreated
-            created_at={notification.status?.created_at || notification.created_at}
-            edited_at={notification.status?.edited_at}
-          />
-          {notification.status?.visibility ? (
-            <HeaderSharedVisibility visibility={notification.status.visibility} />
-          ) : null}
-          <HeaderSharedMuted muted={notification.status?.muted} />
-          <HeaderSharedApplication application={notification.status?.application} />
-        </View>
-      </View>
-
-      <View
-        style={[
-          { marginLeft: StyleConstants.Spacing.M },
-          notification.type === 'follow' || notification.type === 'follow_request'
-            ? { flexShrink: 1 }
-            : { flex: 1 }
-        ]}
-      >
-        {actions}
-      </View>
-    </View>
-  )
-}
-
-export default TimelineHeaderNotification
diff --git a/src/components/Timeline/Shared/HeaderNotification.tsx b/src/components/Timeline/Shared/HeaderNotification.tsx
new file mode 100644
index 00000000..4e1b7854
--- /dev/null
+++ b/src/components/Timeline/Shared/HeaderNotification.tsx
@@ -0,0 +1,163 @@
+import menuAccount from '@components/contextMenu/account'
+import menuInstance from '@components/contextMenu/instance'
+import menuShare from '@components/contextMenu/share'
+import menuStatus from '@components/contextMenu/status'
+import Icon from '@components/Icon'
+import { RelationshipIncoming, RelationshipOutgoing } from '@components/Relationship'
+import { QueryKeyTimeline } from '@utils/queryHooks/timeline'
+import { StyleConstants } from '@utils/styles/constants'
+import { useTheme } from '@utils/styles/ThemeManager'
+import React, { useState } from 'react'
+import { Platform, Pressable, View } from 'react-native'
+import * as DropdownMenu from 'zeego/dropdown-menu'
+import HeaderSharedAccount from './HeaderShared/Account'
+import HeaderSharedApplication from './HeaderShared/Application'
+import HeaderSharedCreated from './HeaderShared/Created'
+import HeaderSharedMuted from './HeaderShared/Muted'
+import HeaderSharedVisibility from './HeaderShared/Visibility'
+
+export interface Props {
+  queryKey: QueryKeyTimeline
+  notification: Mastodon.Notification
+}
+
+const TimelineHeaderNotification = ({ queryKey, notification }: Props) => {
+  const { colors } = useTheme()
+
+  const [openChange, setOpenChange] = useState(false)
+  const mShare = menuShare({
+    visibility: notification.status?.visibility,
+    type: 'status',
+    url: notification.status?.url || notification.status?.uri
+  })
+  const mAccount = menuAccount({
+    openChange,
+    id: notification.status?.account.id,
+    queryKey
+  })
+  const mStatus = menuStatus({ status: notification.status, queryKey })
+  const mInstance = menuInstance({ status: notification.status, queryKey })
+
+  const actions = () => {
+    switch (notification.type) {
+      case 'follow':
+        return <RelationshipOutgoing id={notification.account.id} />
+      case 'follow_request':
+        return <RelationshipIncoming id={notification.account.id} />
+      default:
+        if (notification.status) {
+          return (
+            <Pressable
+              style={{ flex: 1, alignItems: 'center' }}
+              children={
+                <DropdownMenu.Root onOpenChange={setOpenChange}>
+                  <DropdownMenu.Trigger>
+                    <Icon
+                      name='MoreHorizontal'
+                      color={colors.secondary}
+                      size={StyleConstants.Font.Size.L}
+                    />
+                  </DropdownMenu.Trigger>
+
+                  <DropdownMenu.Content>
+                    {mShare.map((mGroup, index) => (
+                      <DropdownMenu.Group key={index}>
+                        {mGroup.map(menu => (
+                          <DropdownMenu.Item key={menu.key} {...menu.item}>
+                            <DropdownMenu.ItemTitle children={menu.title} />
+                            <DropdownMenu.ItemIcon iosIconName={menu.icon} />
+                          </DropdownMenu.Item>
+                        ))}
+                      </DropdownMenu.Group>
+                    ))}
+
+                    {mAccount.map((mGroup, index) => (
+                      <DropdownMenu.Group key={index}>
+                        {mGroup.map(menu => (
+                          <DropdownMenu.Item key={menu.key} {...menu.item}>
+                            <DropdownMenu.ItemTitle children={menu.title} />
+                            <DropdownMenu.ItemIcon iosIconName={menu.icon} />
+                          </DropdownMenu.Item>
+                        ))}
+                      </DropdownMenu.Group>
+                    ))}
+
+                    {mStatus.map((mGroup, index) => (
+                      <DropdownMenu.Group key={index}>
+                        {mGroup.map(menu => (
+                          <DropdownMenu.Item key={menu.key} {...menu.item}>
+                            <DropdownMenu.ItemTitle children={menu.title} />
+                            <DropdownMenu.ItemIcon iosIconName={menu.icon} />
+                          </DropdownMenu.Item>
+                        ))}
+                      </DropdownMenu.Group>
+                    ))}
+
+                    {mInstance.map((mGroup, index) => (
+                      <DropdownMenu.Group key={index}>
+                        {mGroup.map(menu => (
+                          <DropdownMenu.Item key={menu.key} {...menu.item}>
+                            <DropdownMenu.ItemTitle children={menu.title} />
+                            <DropdownMenu.ItemIcon iosIconName={menu.icon} />
+                          </DropdownMenu.Item>
+                        ))}
+                      </DropdownMenu.Group>
+                    ))}
+                  </DropdownMenu.Content>
+                </DropdownMenu.Root>
+              }
+            />
+          )
+        }
+    }
+  }
+
+  return (
+    <View style={{ flex: 1, flexDirection: 'row' }}>
+      <View
+        style={{
+          flex: notification.type === 'follow' || notification.type === 'follow_request' ? 1 : 4
+        }}
+      >
+        <HeaderSharedAccount
+          account={notification.status ? notification.status.account : notification.account}
+          {...((notification.type === 'follow' || notification.type === 'follow_request') && {
+            withoutName: true
+          })}
+        />
+        <View
+          style={{
+            flexDirection: 'row',
+            alignItems: 'center',
+            marginTop: StyleConstants.Spacing.XS,
+            marginBottom: StyleConstants.Spacing.S
+          }}
+        >
+          <HeaderSharedCreated
+            created_at={notification.status?.created_at || notification.created_at}
+            edited_at={notification.status?.edited_at}
+          />
+          {notification.status?.visibility ? (
+            <HeaderSharedVisibility visibility={notification.status.visibility} />
+          ) : null}
+          <HeaderSharedMuted muted={notification.status?.muted} />
+          <HeaderSharedApplication application={notification.status?.application} />
+        </View>
+      </View>
+
+      {Platform.OS !== 'android' ? (
+        <View
+          style={[
+            { marginLeft: StyleConstants.Spacing.M },
+            notification.type === 'follow' || notification.type === 'follow_request'
+              ? { flexShrink: 1 }
+              : { flex: 1 }
+          ]}
+          children={actions()}
+        />
+      ) : null}
+    </View>
+  )
+}
+
+export default TimelineHeaderNotification
diff --git a/src/components/contextMenu/account.tsx b/src/components/contextMenu/account.tsx
new file mode 100644
index 00000000..3e0dc319
--- /dev/null
+++ b/src/components/contextMenu/account.tsx
@@ -0,0 +1,220 @@
+import haptics from '@components/haptics'
+import { displayMessage } from '@components/Message'
+import {
+  QueryKeyRelationship,
+  useRelationshipMutation,
+  useRelationshipQuery
+} from '@utils/queryHooks/relationship'
+import {
+  MutationVarsTimelineUpdateAccountProperty,
+  QueryKeyTimeline,
+  useTimelineMutation
+} from '@utils/queryHooks/timeline'
+import { getInstanceAccount } from '@utils/slices/instancesSlice'
+import { useTheme } from '@utils/styles/ThemeManager'
+import { useEffect, useState } from 'react'
+import { useTranslation } from 'react-i18next'
+import { Platform } from 'react-native'
+import { useQueryClient } from 'react-query'
+import { useSelector } from 'react-redux'
+
+const menuAccount = ({
+  openChange,
+  id,
+  queryKey,
+  rootQueryKey
+}: {
+  openChange: boolean
+  id?: Mastodon.Account['id']
+  queryKey?: QueryKeyTimeline
+  rootQueryKey?: QueryKeyTimeline
+}): ContextMenu[][] => {
+  if (!id) return []
+
+  const { theme } = useTheme()
+  const { t } = useTranslation('componentContextMenu')
+
+  const menus: ContextMenu[][] = [[]]
+
+  const instanceAccount = useSelector(getInstanceAccount, (prev, next) => prev.id === next.id)
+  const ownAccount = instanceAccount?.id === id
+
+  const [enabled, setEnabled] = useState(openChange)
+  useEffect(() => {
+    if (!ownAccount && enabled === false && openChange === true) {
+      setEnabled(true)
+    }
+  }, [openChange, enabled])
+  const { data, isFetching } = useRelationshipQuery({ id, options: { enabled } })
+
+  const queryClient = useQueryClient()
+  const timelineMutation = useTimelineMutation({
+    onSuccess: (_, params) => {
+      queryClient.refetchQueries(['Relationship', { id }])
+      const theParams = params as MutationVarsTimelineUpdateAccountProperty
+      displayMessage({
+        theme,
+        type: 'success',
+        message: t('common:message.success.message', {
+          function: t(`account.${theParams.payload.property}.action`, {
+            ...(theParams.payload.property !== 'reports' && {
+              context: (theParams.payload.currentValue || false).toString()
+            })
+          })
+        })
+      })
+    },
+    onError: (err: any, params) => {
+      const theParams = params as MutationVarsTimelineUpdateAccountProperty
+      displayMessage({
+        theme,
+        type: 'error',
+        message: t('common:message.error.message', {
+          function: t(`account.${theParams.payload.property}.action`, {
+            ...(theParams.payload.property !== 'reports' && {
+              context: (theParams.payload.currentValue || false).toString()
+            })
+          })
+        }),
+        ...(err.status &&
+          typeof err.status === 'number' &&
+          err.data &&
+          err.data.error &&
+          typeof err.data.error === 'string' && {
+            description: err.data.error
+          })
+      })
+    },
+    onSettled: () => {
+      queryKey && queryClient.invalidateQueries(queryKey)
+      rootQueryKey && queryClient.invalidateQueries(rootQueryKey)
+    }
+  })
+  const queryKeyRelationship: QueryKeyRelationship = ['Relationship', { id }]
+  const relationshipMutation = useRelationshipMutation({
+    onSuccess: (res, { payload: { action } }) => {
+      haptics('Success')
+      queryClient.setQueryData<Mastodon.Relationship[]>(queryKeyRelationship, [res])
+      if (action === 'block') {
+        const queryKey: QueryKeyTimeline = ['Timeline', { page: 'Following' }]
+        queryClient.invalidateQueries(queryKey)
+      }
+    },
+    onError: (err: any, { payload: { action } }) => {
+      displayMessage({
+        theme,
+        type: 'error',
+        message: t('common:message.error.message', {
+          function: t(`${action}.function`)
+        }),
+        ...(err.status &&
+          typeof err.status === 'number' &&
+          err.data &&
+          err.data.error &&
+          typeof err.data.error === 'string' && {
+            description: err.data.error
+          })
+      })
+    }
+  })
+
+  if (!ownAccount && Platform.OS !== 'android') {
+    menus[0].push({
+      key: 'account-following',
+      item: {
+        onSelect: () =>
+          data &&
+          relationshipMutation.mutate({
+            id,
+            type: 'outgoing',
+            payload: { action: 'follow', state: !data?.requested ? data.following : true }
+          }),
+        disabled: !data || isFetching,
+        destructive: false,
+        hidden: false
+      },
+      title: !data?.requested
+        ? t('account.following.action', {
+            context: (data?.following || false).toString()
+          })
+        : t('componentRelationship:button.requested'),
+      icon: !data?.requested
+        ? data?.following
+          ? 'person.badge.minus'
+          : 'person.badge.plus'
+        : 'person.badge.minus'
+    })
+  }
+  if (!ownAccount) {
+    menus[0].push({
+      key: 'account-mute',
+      item: {
+        onSelect: () =>
+          timelineMutation.mutate({
+            type: 'updateAccountProperty',
+            queryKey,
+            id,
+            payload: { property: 'mute', currentValue: data?.muting }
+          }),
+        disabled: Platform.OS !== 'android' ? !data || isFetching : false,
+        destructive: false,
+        hidden: false
+      },
+      title: t('account.mute.action', {
+        context: (data?.muting || false).toString()
+      }),
+      icon: data?.muting ? 'eye' : 'eye.slash'
+    })
+  }
+
+  !ownAccount &&
+    menus.push([
+      {
+        key: 'account-block',
+        item: {
+          onSelect: () =>
+            timelineMutation.mutate({
+              type: 'updateAccountProperty',
+              queryKey,
+              id,
+              payload: { property: 'block', currentValue: data?.blocking }
+            }),
+          disabled: Platform.OS !== 'android' ? !data || isFetching : false,
+          destructive: !data?.blocking,
+          hidden: false
+        },
+        title: t('account.block.action', {
+          context: (data?.blocking || false).toString()
+        }),
+        icon: data?.blocking ? 'checkmark.circle' : 'xmark.circle'
+      },
+      {
+        key: 'account-reports',
+        item: {
+          onSelect: () => {
+            timelineMutation.mutate({
+              type: 'updateAccountProperty',
+              queryKey,
+              id,
+              payload: { property: 'reports' }
+            })
+            timelineMutation.mutate({
+              type: 'updateAccountProperty',
+              queryKey,
+              id,
+              payload: { property: 'block', currentValue: false }
+            })
+          },
+          disabled: false,
+          destructive: true,
+          hidden: false
+        },
+        title: t('account.reports.action'),
+        icon: 'flag'
+      }
+    ])
+
+  return menus
+}
+
+export default menuAccount
diff --git a/src/components/contextMenu/index.d.ts b/src/components/contextMenu/index.d.ts
new file mode 100644
index 00000000..edbf9430
--- /dev/null
+++ b/src/components/contextMenu/index.d.ts
@@ -0,0 +1,6 @@
+type ContextMenu = {
+  key: string
+  item: { onSelect: () => void; disabled: boolean; destructive: boolean; hidden: boolean }
+  title: string
+  icon: string
+}
diff --git a/src/i18n/en/components/contextMenu.json b/src/i18n/en/components/contextMenu.json
index 6dbd8ea1..4ce19a8b 100644
--- a/src/i18n/en/components/contextMenu.json
+++ b/src/i18n/en/components/contextMenu.json
@@ -2,6 +2,10 @@
   "accessibilityHint": "Actions for this toot, such as its posted user, toot itself",
   "account": {
     "title": "User actions",
+    "following": {
+      "action_false": "Follow user",
+      "action_true": "Unfollow user"
+    },
     "mute": {
       "action_false": "Mute user",
       "action_true": "Unmute user"
@@ -11,7 +15,7 @@
       "action_true": "Unblock user"
     },
     "reports": {
-      "action": "Report and block"
+      "action": "Report and block user"
     }
   },
   "copy": {
diff --git a/src/screens/Tabs/Local.tsx b/src/screens/Tabs/Local.tsx
index f456b084..7f885001 100644
--- a/src/screens/Tabs/Local.tsx
+++ b/src/screens/Tabs/Local.tsx
@@ -9,8 +9,7 @@ import { QueryKeyTimeline } from '@utils/queryHooks/timeline'
 import layoutAnimation from '@utils/styles/layoutAnimation'
 import React, { useEffect, useState } from 'react'
 import { useTranslation } from 'react-i18next'
-import { Platform } from 'react-native'
-import ContextMenu from 'react-native-context-menu-view'
+import * as DropdownMenu from 'zeego/dropdown-menu'
 import TabShared from './Shared'
 
 const Stack = createNativeStackNavigator<TabLocalStackParamList>()
@@ -34,31 +33,8 @@ const TabLocal = React.memo(
           name='Tab-Local-Root'
           options={{
             headerTitle: () => (
-              <ContextMenu
-                dropdownMenuMode
-                style={{ maxWidth: '80%', flex: Platform.OS === 'android' ? 1 : undefined }}
-                actions={
-                  lists?.length
-                    ? [
-                        {
-                          id: '',
-                          title: t('tabs.local.name'),
-                          disabled: queryKey[1].page === 'Following'
-                        },
-                        ...lists?.map(list => ({
-                          id: list.id,
-                          title: list.title,
-                          disabled: queryKey[1].page === 'List' && queryKey[1].list === list.id
-                        }))
-                      ]
-                    : undefined
-                }
-                onPress={({ nativeEvent: { index } }) => {
-                  lists && index
-                    ? setQueryKey(['Timeline', { page: 'List', list: lists[index - 1].id }])
-                    : setQueryKey(['Timeline', { page: 'Following' }])
-                }}
-                children={
+              <DropdownMenu.Root>
+                <DropdownMenu.Trigger>
                   <HeaderCenter
                     dropdown={(lists?.length ?? 0) > 0}
                     content={
@@ -67,8 +43,43 @@ const TabLocal = React.memo(
                         : t('tabs.local.name')
                     }
                   />
-                }
-              />
+                </DropdownMenu.Trigger>
+
+                <DropdownMenu.Content>
+                  {lists?.length
+                    ? [
+                        {
+                          key: 'default',
+                          item: {
+                            onSelect: () => setQueryKey(['Timeline', { page: 'Following' }]),
+                            disabled: queryKey[1].page === 'Following',
+                            destructive: false,
+                            hidden: false
+                          },
+                          title: t('tabs.local.name'),
+                          icon: ''
+                        },
+                        ...lists?.map(list => ({
+                          key: list.id,
+                          item: {
+                            onSelect: () =>
+                              setQueryKey(['Timeline', { page: 'List', list: list.id }]),
+                            disabled: queryKey[1].page === 'List' && queryKey[1].list === list.id,
+                            destructive: false,
+                            hidden: false
+                          },
+                          title: list.title,
+                          icon: ''
+                        }))
+                      ].map(menu => (
+                        <DropdownMenu.Item key={menu.key} {...menu.item}>
+                          <DropdownMenu.ItemTitle children={menu.title} />
+                          <DropdownMenu.ItemIcon iosIconName={menu.icon} />
+                        </DropdownMenu.Item>
+                      ))
+                    : undefined}
+                </DropdownMenu.Content>
+              </DropdownMenu.Root>
             ),
             headerRight: () => (
               <HeaderRight
diff --git a/src/screens/Tabs/Shared/Account.tsx b/src/screens/Tabs/Shared/Account.tsx
index db4a56b6..38202a93 100644
--- a/src/screens/Tabs/Shared/Account.tsx
+++ b/src/screens/Tabs/Shared/Account.tsx
@@ -1,3 +1,6 @@
+import menuAccount from '@components/contextMenu/account'
+import menuShare from '@components/contextMenu/share'
+import { HeaderRight } from '@components/Header'
 import Timeline from '@components/Timeline'
 import TimelineDefault from '@components/Timeline/Default'
 import SegmentedControl from '@react-native-community/segmented-control'
@@ -11,12 +14,14 @@ import { useTranslation } from 'react-i18next'
 import { StyleSheet, Text, View } from 'react-native'
 import { useSharedValue } from 'react-native-reanimated'
 import { useIsFetching } from 'react-query'
+import * as DropdownMenu from 'zeego/dropdown-menu'
 import AccountAttachments from './Account/Attachments'
 import AccountHeader from './Account/Header'
 import AccountInformation from './Account/Information'
 import AccountNav from './Account/Nav'
 
 const TabSharedAccount: React.FC<TabSharedStackScreenProps<'Tab-Shared-Account'>> = ({
+  navigation,
   route: {
     params: { account }
   }
@@ -24,6 +29,65 @@ const TabSharedAccount: React.FC<TabSharedStackScreenProps<'Tab-Shared-Account'>
   const { t, i18n } = useTranslation('screenTabs')
   const { colors, mode } = useTheme()
 
+  const mShare = menuShare({ type: 'account', url: account.url })
+  const mAccount = menuAccount({ openChange: true, id: account.id })
+  useEffect(() => {
+    navigation.setOptions({
+      headerRight: () => {
+        // const shareOnPress = contextMenuShare({
+        //   actions,
+        //   type: 'account',
+        //   url: account.url
+        // })
+        // const accountOnPress = contextMenuAccount({
+        //   actions,
+        //   type: 'account',
+        //   id: account.id
+        // })
+
+        return (
+          <DropdownMenu.Root>
+            <DropdownMenu.Trigger>
+              <HeaderRight
+                accessibilityLabel={t('shared.account.actions.accessibilityLabel', {
+                  user: account.acct
+                })}
+                accessibilityHint={t('shared.account.actions.accessibilityHint')}
+                content='MoreHorizontal'
+                onPress={() => {}}
+                background
+              />
+            </DropdownMenu.Trigger>
+
+            <DropdownMenu.Content>
+              {mShare.map((mGroup, index) => (
+                <DropdownMenu.Group key={index}>
+                  {mGroup.map(menu => (
+                    <DropdownMenu.Item key={menu.key} {...menu.item}>
+                      <DropdownMenu.ItemTitle children={menu.title} />
+                      <DropdownMenu.ItemIcon iosIconName={menu.icon} />
+                    </DropdownMenu.Item>
+                  ))}
+                </DropdownMenu.Group>
+              ))}
+
+              {mAccount.map((mGroup, index) => (
+                <DropdownMenu.Group key={index}>
+                  {mGroup.map(menu => (
+                    <DropdownMenu.Item key={menu.key} {...menu.item}>
+                      <DropdownMenu.ItemTitle children={menu.title} />
+                      <DropdownMenu.ItemIcon iosIconName={menu.icon} />
+                    </DropdownMenu.Item>
+                  ))}
+                </DropdownMenu.Group>
+              ))}
+            </DropdownMenu.Content>
+          </DropdownMenu.Root>
+        )
+      }
+    })
+  }, [])
+
   const { data } = useAccountQuery({ id: account.id })
 
   const scrollY = useSharedValue(0)
@@ -77,7 +141,13 @@ const TabSharedAccount: React.FC<TabSharedStackScreenProps<'Tab-Shared-Account'>
               paddingHorizontal: StyleConstants.Spacing.Global.PagePadding
             }}
           >
-            <Text style={{ ...StyleConstants.FontStyle.M, color: colors.secondary, textAlign: 'center' }}>
+            <Text
+              style={{
+                ...StyleConstants.FontStyle.M,
+                color: colors.secondary,
+                textAlign: 'center'
+              }}
+            >
               {t('shared.account.suspended')}
             </Text>
           </View>
diff --git a/src/screens/Tabs/Shared/index.tsx b/src/screens/Tabs/Shared/index.tsx
index a98e71c9..46a7e25b 100644
--- a/src/screens/Tabs/Shared/index.tsx
+++ b/src/screens/Tabs/Shared/index.tsx
@@ -1,6 +1,4 @@
-import contextMenuAccount from '@components/ContextMenu/account'
-import contextMenuShare from '@components/ContextMenu/share'
-import { HeaderCenter, HeaderLeft, HeaderRight } from '@components/Header'
+import { HeaderCenter, HeaderLeft } from '@components/Header'
 import { ParseEmojis } from '@components/Parse'
 import CustomText from '@components/Text'
 import { createNativeStackNavigator } from '@react-navigation/native-stack'
@@ -18,7 +16,6 @@ import { debounce } from 'lodash'
 import React from 'react'
 import { Trans, useTranslation } from 'react-i18next'
 import { Platform, TextInput, View } from 'react-native'
-import ContextMenu, { ContextMenuAction } from 'react-native-context-menu-view'
 
 const TabShared = ({ Stack }: { Stack: ReturnType<typeof createNativeStackNavigator> }) => {
   const { colors, mode } = useTheme()
@@ -46,42 +43,7 @@ const TabShared = ({ Stack }: { Stack: ReturnType<typeof createNativeStackNaviga
               backgroundColor: `rgba(255, 255, 255, 0)`
             },
             title: '',
-            headerLeft: () => <HeaderLeft onPress={() => navigation.goBack()} background />,
-            headerRight: () => {
-              const actions: ContextMenuAction[] = []
-
-              const shareOnPress = contextMenuShare({
-                actions,
-                type: 'account',
-                url: account.url
-              })
-              const accountOnPress = contextMenuAccount({
-                actions,
-                type: 'account',
-                id: account.id
-              })
-
-              return (
-                <ContextMenu
-                  actions={actions}
-                  onPress={({ nativeEvent: { index } }) => {
-                    shareOnPress(index)
-                    accountOnPress(index)
-                  }}
-                  dropdownMenuMode
-                >
-                  <HeaderRight
-                    accessibilityLabel={t('shared.account.actions.accessibilityLabel', {
-                      user: account.acct
-                    })}
-                    accessibilityHint={t('shared.account.actions.accessibilityHint')}
-                    content='MoreHorizontal'
-                    onPress={() => {}}
-                    background
-                  />
-                </ContextMenu>
-              )
-            }
+            headerLeft: () => <HeaderLeft onPress={() => navigation.goBack()} background />
           }
         }}
       />
diff --git a/yarn.lock b/yarn.lock
index 9bfa0ac7..b50bb865 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -10793,10 +10793,6 @@ react-native-codegen@^0.70.6:
     jscodeshift "^0.13.1"
     nullthrows "^1.1.1"
 
-react-native-context-menu-view@xmflsct/react-native-context-menu-view:
-  version "1.5.4"
-  resolved "https://codeload.github.com/xmflsct/react-native-context-menu-view/tar.gz/bff5773d318970cd67b5cf114d4bec1e200178eb"
-
 react-native-fast-image@^8.6.3:
   version "8.6.3"
   resolved "https://registry.yarnpkg.com/react-native-fast-image/-/react-native-fast-image-8.6.3.tgz#6edc3f9190092a909d636d93eecbcc54a8822255"

From 267fa2194dfff8ea068ad1cc4df9159955d8dd90 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 3 Dec 2022 00:09:10 +0000
Subject: [PATCH 11/40] Bump decode-uri-component from 0.2.0 to 0.2.2

Bumps [decode-uri-component](https://github.com/SamVerschueren/decode-uri-component) from 0.2.0 to 0.2.2.
- [Release notes](https://github.com/SamVerschueren/decode-uri-component/releases)
- [Commits](https://github.com/SamVerschueren/decode-uri-component/compare/v0.2.0...v0.2.2)

---
updated-dependencies:
- dependency-name: decode-uri-component
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index b50bb865..11f619fc 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5140,9 +5140,9 @@ decamelize@^1.2.0:
   integrity sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==
 
 decode-uri-component@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
-  integrity sha512-hjf+xovcEn31w/EUYdTXQh/8smFL/dzYjohQGEIgjyNavaJfBY2p5F527Bo1VPATxv0VYTUC2bOcXvqFwk78Og==
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.2.tgz#e69dbe25d37941171dd540e024c444cd5188e1e9"
+  integrity sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==
 
 decompress-response@^3.3.0:
   version "3.3.0"

From 29fd36a5817562e71e7179a600430f70d9b68898 Mon Sep 17 00:00:00 2001
From: xmflsct <me@xmflsct.com>
Date: Sat, 3 Dec 2022 15:50:15 +0100
Subject: [PATCH 12/40] Fixed #495

---
 src/components/Menu/Container.tsx             |  20 +--
 src/components/Menu/Row.tsx                   |   8 +-
 .../Timeline/Shared/HeaderAndroid.tsx         |   3 +-
 .../Timeline/Shared/HeaderDefault.tsx         |   3 +-
 .../Timeline/Shared/HeaderNotification.tsx    |   3 +-
 src/components/contextMenu/account.tsx        |  44 +++++--
 src/i18n/en/common.json                       |   3 +-
 src/i18n/en/components/contextMenu.json       |   1 +
 src/i18n/en/screens/tabs.json                 |   5 +
 src/screens/Tabs/Shared/Account.tsx           |  32 ++---
 src/screens/Tabs/Shared/AccountInLists.tsx    | 119 ++++++++++++++++++
 src/screens/Tabs/Shared/index.tsx             |   7 ++
 src/utils/navigation/navigators.ts            |   3 +
 src/utils/queryHooks/account.ts               |  29 ++++-
 14 files changed, 223 insertions(+), 57 deletions(-)
 create mode 100644 src/screens/Tabs/Shared/AccountInLists.tsx

diff --git a/src/components/Menu/Container.tsx b/src/components/Menu/Container.tsx
index 0a7910c0..10c942eb 100644
--- a/src/components/Menu/Container.tsx
+++ b/src/components/Menu/Container.tsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { StyleSheet, View } from 'react-native'
+import { View } from 'react-native'
 import { StyleConstants } from '@utils/styles/constants'
 
 export interface Props {
@@ -7,14 +7,16 @@ export interface Props {
 }
 
 const MenuContainer: React.FC<Props> = ({ children }) => {
-  return <View style={styles.base}>{children}</View>
+  return (
+    <View
+      style={{
+        paddingHorizontal: StyleConstants.Spacing.Global.PagePadding,
+        marginBottom: StyleConstants.Spacing.Global.PagePadding
+      }}
+    >
+      {children}
+    </View>
+  )
 }
 
-const styles = StyleSheet.create({
-  base: {
-    paddingHorizontal: StyleConstants.Spacing.Global.PagePadding,
-    marginBottom: StyleConstants.Spacing.Global.PagePadding
-  }
-})
-
 export default MenuContainer
diff --git a/src/components/Menu/Row.tsx b/src/components/Menu/Row.tsx
index e5027ff1..3953e5c9 100644
--- a/src/components/Menu/Row.tsx
+++ b/src/components/Menu/Row.tsx
@@ -5,7 +5,7 @@ import { StyleConstants } from '@utils/styles/constants'
 import { useTheme } from '@utils/styles/ThemeManager'
 import { ColorDefinitions } from '@utils/styles/themes'
 import React, { useMemo } from 'react'
-import { View } from 'react-native'
+import { Text, View } from 'react-native'
 import { Flow } from 'react-native-animated-spinkit'
 import { State, Switch, TapGestureHandler } from 'react-native-gesture-handler'
 
@@ -65,6 +65,7 @@ const MenuRow: React.FC<Props> = ({
     >
       <TapGestureHandler
         onHandlerStateChange={async ({ nativeEvent }) => {
+          if (typeof iconBack !== 'string') return // Let icon back handles the gesture
           if (nativeEvent.state === State.ACTIVE && !loading) {
             if (screenReaderEnabled && switchOnValueChange) {
               switchOnValueChange()
@@ -79,12 +80,13 @@ const MenuRow: React.FC<Props> = ({
             style={{
               flex: 1,
               flexDirection: 'row',
-              paddingTop: StyleConstants.Spacing.S
+              justifyContent: 'space-between',
+              marginTop: StyleConstants.Spacing.S
             }}
           >
             <View
               style={{
-                flexGrow: 3,
+                flex: 3,
                 flexDirection: 'row',
                 alignItems: 'center'
               }}
diff --git a/src/components/Timeline/Shared/HeaderAndroid.tsx b/src/components/Timeline/Shared/HeaderAndroid.tsx
index eeed11e6..e1034b10 100644
--- a/src/components/Timeline/Shared/HeaderAndroid.tsx
+++ b/src/components/Timeline/Shared/HeaderAndroid.tsx
@@ -28,8 +28,9 @@ const TimelineHeaderAndroid: React.FC<Props> = ({ queryKey, rootQueryKey, status
     url: status.url || status.uri
   })
   const mAccount = menuAccount({
+    type: 'status',
     openChange,
-    id: status.account.id,
+    account: status.account,
     queryKey
   })
   const mStatus = menuStatus({ status, queryKey, rootQueryKey })
diff --git a/src/components/Timeline/Shared/HeaderDefault.tsx b/src/components/Timeline/Shared/HeaderDefault.tsx
index 7a649026..3e0e7102 100644
--- a/src/components/Timeline/Shared/HeaderDefault.tsx
+++ b/src/components/Timeline/Shared/HeaderDefault.tsx
@@ -45,8 +45,9 @@ const TimelineHeaderDefault: React.FC<Props> = ({
     copiableContent
   })
   const mAccount = menuAccount({
+    type: 'status',
     openChange,
-    id: status.account.id,
+    account: status.account,
     queryKey
   })
   const mStatus = menuStatus({ status, queryKey, rootQueryKey })
diff --git a/src/components/Timeline/Shared/HeaderNotification.tsx b/src/components/Timeline/Shared/HeaderNotification.tsx
index 4e1b7854..b29589d8 100644
--- a/src/components/Timeline/Shared/HeaderNotification.tsx
+++ b/src/components/Timeline/Shared/HeaderNotification.tsx
@@ -31,8 +31,9 @@ const TimelineHeaderNotification = ({ queryKey, notification }: Props) => {
     url: notification.status?.url || notification.status?.uri
   })
   const mAccount = menuAccount({
+    type: 'status',
     openChange,
-    id: notification.status?.account.id,
+    account: notification.status?.account,
     queryKey
   })
   const mStatus = menuStatus({ status: notification.status, queryKey })
diff --git a/src/components/contextMenu/account.tsx b/src/components/contextMenu/account.tsx
index 3e0dc319..34b52dce 100644
--- a/src/components/contextMenu/account.tsx
+++ b/src/components/contextMenu/account.tsx
@@ -1,5 +1,8 @@
 import haptics from '@components/haptics'
 import { displayMessage } from '@components/Message'
+import { useNavigation } from '@react-navigation/native'
+import { NativeStackNavigationProp } from '@react-navigation/native-stack'
+import { TabSharedStackParamList } from '@utils/navigation/navigators'
 import {
   QueryKeyRelationship,
   useRelationshipMutation,
@@ -19,25 +22,29 @@ import { useQueryClient } from 'react-query'
 import { useSelector } from 'react-redux'
 
 const menuAccount = ({
+  type,
   openChange,
-  id,
+  account,
   queryKey,
   rootQueryKey
 }: {
+  type: 'status' | 'account' // Where the action is coming from
   openChange: boolean
-  id?: Mastodon.Account['id']
+  account?: Pick<Mastodon.Account, 'id' | 'username'>
   queryKey?: QueryKeyTimeline
   rootQueryKey?: QueryKeyTimeline
 }): ContextMenu[][] => {
-  if (!id) return []
+  if (!account) return []
 
+  const navigation =
+    useNavigation<NativeStackNavigationProp<TabSharedStackParamList, any, undefined>>()
   const { theme } = useTheme()
   const { t } = useTranslation('componentContextMenu')
 
   const menus: ContextMenu[][] = [[]]
 
   const instanceAccount = useSelector(getInstanceAccount, (prev, next) => prev.id === next.id)
-  const ownAccount = instanceAccount?.id === id
+  const ownAccount = instanceAccount?.id === account.id
 
   const [enabled, setEnabled] = useState(openChange)
   useEffect(() => {
@@ -45,12 +52,12 @@ const menuAccount = ({
       setEnabled(true)
     }
   }, [openChange, enabled])
-  const { data, isFetching } = useRelationshipQuery({ id, options: { enabled } })
+  const { data, isFetching } = useRelationshipQuery({ id: account.id, options: { enabled } })
 
   const queryClient = useQueryClient()
   const timelineMutation = useTimelineMutation({
     onSuccess: (_, params) => {
-      queryClient.refetchQueries(['Relationship', { id }])
+      queryClient.refetchQueries(['Relationship', { id: account.id }])
       const theParams = params as MutationVarsTimelineUpdateAccountProperty
       displayMessage({
         theme,
@@ -90,7 +97,7 @@ const menuAccount = ({
       rootQueryKey && queryClient.invalidateQueries(rootQueryKey)
     }
   })
-  const queryKeyRelationship: QueryKeyRelationship = ['Relationship', { id }]
+  const queryKeyRelationship: QueryKeyRelationship = ['Relationship', { id: account.id }]
   const relationshipMutation = useRelationshipMutation({
     onSuccess: (res, { payload: { action } }) => {
       haptics('Success')
@@ -118,14 +125,14 @@ const menuAccount = ({
     }
   })
 
-  if (!ownAccount && Platform.OS !== 'android') {
+  if (!ownAccount && Platform.OS !== 'android' && type !== 'account') {
     menus[0].push({
       key: 'account-following',
       item: {
         onSelect: () =>
           data &&
           relationshipMutation.mutate({
-            id,
+            id: account.id,
             type: 'outgoing',
             payload: { action: 'follow', state: !data?.requested ? data.following : true }
           }),
@@ -146,6 +153,17 @@ const menuAccount = ({
     })
   }
   if (!ownAccount) {
+    menus[0].push({
+      key: 'account-list',
+      item: {
+        onSelect: () => navigation.navigate('Tab-Shared-Account-In-Lists', { account }),
+        disabled: Platform.OS !== 'android' ? !data || isFetching : false,
+        destructive: false,
+        hidden: isFetching ? false : !data?.following
+      },
+      title: t('account.inLists'),
+      icon: 'checklist'
+    })
     menus[0].push({
       key: 'account-mute',
       item: {
@@ -153,7 +171,7 @@ const menuAccount = ({
           timelineMutation.mutate({
             type: 'updateAccountProperty',
             queryKey,
-            id,
+            id: account.id,
             payload: { property: 'mute', currentValue: data?.muting }
           }),
         disabled: Platform.OS !== 'android' ? !data || isFetching : false,
@@ -176,7 +194,7 @@ const menuAccount = ({
             timelineMutation.mutate({
               type: 'updateAccountProperty',
               queryKey,
-              id,
+              id: account.id,
               payload: { property: 'block', currentValue: data?.blocking }
             }),
           disabled: Platform.OS !== 'android' ? !data || isFetching : false,
@@ -195,13 +213,13 @@ const menuAccount = ({
             timelineMutation.mutate({
               type: 'updateAccountProperty',
               queryKey,
-              id,
+              id: account.id,
               payload: { property: 'reports' }
             })
             timelineMutation.mutate({
               type: 'updateAccountProperty',
               queryKey,
-              id,
+              id: account.id,
               payload: { property: 'block', currentValue: false }
             })
           },
diff --git a/src/i18n/en/common.json b/src/i18n/en/common.json
index 14ce79e7..8a4d2329 100644
--- a/src/i18n/en/common.json
+++ b/src/i18n/en/common.json
@@ -5,7 +5,8 @@
     "cancel": "Cancel",
     "discard": "Discard",
     "continue": "Continue",
-    "delete": "Delete"
+    "delete": "Delete",
+    "done": "Done"
   },
   "customEmoji": {
     "accessibilityLabel": "Custom emoji {{emoji}}"
diff --git a/src/i18n/en/components/contextMenu.json b/src/i18n/en/components/contextMenu.json
index 4ce19a8b..08b201d7 100644
--- a/src/i18n/en/components/contextMenu.json
+++ b/src/i18n/en/components/contextMenu.json
@@ -6,6 +6,7 @@
       "action_false": "Follow user",
       "action_true": "Unfollow user"
     },
+    "inLists": "Manage user of lists",
     "mute": {
       "action_false": "Mute user",
       "action_true": "Unmute user"
diff --git a/src/i18n/en/screens/tabs.json b/src/i18n/en/screens/tabs.json
index 828ff2e2..808dd98b 100644
--- a/src/i18n/en/screens/tabs.json
+++ b/src/i18n/en/screens/tabs.json
@@ -320,6 +320,11 @@
       },
       "suspended": "Account suspended by the moderators of your server"
     },
+    "accountInLists": {
+      "name": "Lists of @{{username}}",
+      "inLists": "In lists",
+      "notInLists": "Other lists"
+    },
     "attachments": {
       "name": "<0 /><1>\"s media</1>"
     },
diff --git a/src/screens/Tabs/Shared/Account.tsx b/src/screens/Tabs/Shared/Account.tsx
index 38202a93..c36ee564 100644
--- a/src/screens/Tabs/Shared/Account.tsx
+++ b/src/screens/Tabs/Shared/Account.tsx
@@ -11,7 +11,7 @@ import { StyleConstants } from '@utils/styles/constants'
 import { useTheme } from '@utils/styles/ThemeManager'
 import React, { useEffect, useMemo, useRef, useState } from 'react'
 import { useTranslation } from 'react-i18next'
-import { StyleSheet, Text, View } from 'react-native'
+import { Text, View } from 'react-native'
 import { useSharedValue } from 'react-native-reanimated'
 import { useIsFetching } from 'react-query'
 import * as DropdownMenu from 'zeego/dropdown-menu'
@@ -30,21 +30,10 @@ const TabSharedAccount: React.FC<TabSharedStackScreenProps<'Tab-Shared-Account'>
   const { colors, mode } = useTheme()
 
   const mShare = menuShare({ type: 'account', url: account.url })
-  const mAccount = menuAccount({ openChange: true, id: account.id })
+  const mAccount = menuAccount({ type: 'account', openChange: true, account })
   useEffect(() => {
     navigation.setOptions({
       headerRight: () => {
-        // const shareOnPress = contextMenuShare({
-        //   actions,
-        //   type: 'account',
-        //   url: account.url
-        // })
-        // const accountOnPress = contextMenuAccount({
-        //   actions,
-        //   type: 'account',
-        //   id: account.id
-        // })
-
         return (
           <DropdownMenu.Root>
             <DropdownMenu.Trigger>
@@ -107,7 +96,7 @@ const TabSharedAccount: React.FC<TabSharedStackScreenProps<'Tab-Shared-Account'>
   const ListHeaderComponent = useMemo(() => {
     return (
       <>
-        <View style={[styles.header, { borderBottomColor: colors.border }]}>
+        <View style={{ borderBottomWidth: 1, borderBottomColor: colors.border }}>
           <AccountHeader account={data} />
           <AccountInformation account={data} />
           {!data?.suspended && fetchedTimeline.current ? (
@@ -129,7 +118,10 @@ const TabSharedAccount: React.FC<TabSharedStackScreenProps<'Tab-Shared-Account'>
                   break
               }
             }}
-            style={styles.segmentsContainer}
+            style={{
+              marginTop: StyleConstants.Spacing.M,
+              marginHorizontal: StyleConstants.Spacing.Global.PagePadding
+            }}
           />
         ) : null}
         {data?.suspended ? (
@@ -178,14 +170,4 @@ const TabSharedAccount: React.FC<TabSharedStackScreenProps<'Tab-Shared-Account'>
   )
 }
 
-const styles = StyleSheet.create({
-  header: {
-    borderBottomWidth: 1
-  },
-  segmentsContainer: {
-    marginTop: StyleConstants.Spacing.M,
-    marginHorizontal: StyleConstants.Spacing.Global.PagePadding
-  }
-})
-
 export default TabSharedAccount
diff --git a/src/screens/Tabs/Shared/AccountInLists.tsx b/src/screens/Tabs/Shared/AccountInLists.tsx
new file mode 100644
index 00000000..4cc2900f
--- /dev/null
+++ b/src/screens/Tabs/Shared/AccountInLists.tsx
@@ -0,0 +1,119 @@
+import Button from '@components/Button'
+import haptics from '@components/haptics'
+import { HeaderRight } from '@components/Header'
+import { MenuRow } from '@components/Menu'
+import CustomText from '@components/Text'
+import { TabSharedStackScreenProps } from '@utils/navigation/navigators'
+import { useAccountInListsQuery } from '@utils/queryHooks/account'
+import { useListAccountsMutation, useListsQuery } from '@utils/queryHooks/lists'
+import { StyleConstants } from '@utils/styles/constants'
+import { useTheme } from '@utils/styles/ThemeManager'
+import React, { useEffect } from 'react'
+import { useTranslation } from 'react-i18next'
+import { SectionList, Text, View } from 'react-native'
+
+const TabSharedAccountInLists: React.FC<
+  TabSharedStackScreenProps<'Tab-Shared-Account-In-Lists'>
+> = ({
+  navigation,
+  route: {
+    params: { account }
+  }
+}) => {
+  const { colors } = useTheme()
+  const { t } = useTranslation('screenTabs')
+
+  useEffect(() => {
+    navigation.setOptions({
+      presentation: 'modal',
+      title: t('shared.accountInLists.name', { username: account.username }),
+      headerLeft: () => null,
+      headerRight: () => {
+        return (
+          <HeaderRight
+            type='text'
+            content={t('common:buttons.done')}
+            onPress={() => navigation.pop(1)}
+          />
+        )
+      }
+    })
+  }, [])
+
+  const listsQuery = useListsQuery({})
+  const accountInListsQuery = useAccountInListsQuery({ id: account.id })
+
+  const sections = [
+    { id: 'in', title: t('shared.accountInLists.inLists'), data: accountInListsQuery.data || [] },
+    {
+      id: 'out',
+      title: t('shared.accountInLists.notInLists'),
+      data:
+        listsQuery.data?.filter(
+          ({ id }) => !accountInListsQuery.data?.filter(d => d.id === id).length
+        ) || []
+    }
+  ]
+
+  const listAccountsMutation = useListAccountsMutation({})
+
+  return (
+    <SectionList
+      style={{ padding: StyleConstants.Spacing.Global.PagePadding }}
+      sections={sections}
+      SectionSeparatorComponent={props => {
+        return props.leadingItem && props.trailingSection ? (
+          <View style={{ flex: 1, height: StyleConstants.Spacing.Global.PagePadding * 2 }} />
+        ) : null
+      }}
+      renderSectionHeader={({ section: { title, data } }) =>
+        data.length ? (
+          <CustomText fontStyle='S' style={{ color: colors.secondary }} children={title} />
+        ) : null
+      }
+      renderItem={({ index, item, section }) => (
+        <MenuRow
+          key={index}
+          iconFront='List'
+          content={
+            <Button
+              type='icon'
+              content={section.id === 'in' ? 'Minus' : 'Plus'}
+              round
+              disabled={accountInListsQuery.isFetching}
+              onPress={() => {
+                switch (section.id) {
+                  case 'in':
+                    listAccountsMutation
+                      .mutateAsync({
+                        type: 'delete',
+                        payload: { id: item.id, accounts: [account.id] }
+                      })
+                      .then(() => {
+                        haptics('Light')
+                        accountInListsQuery.refetch()
+                      })
+                    break
+                  case 'out':
+                    listAccountsMutation
+                      .mutateAsync({
+                        type: 'add',
+                        payload: { id: item.id, accounts: [account.id] }
+                      })
+                      .then(() => {
+                        haptics('Light')
+                        accountInListsQuery.refetch()
+                      })
+                    break
+                }
+              }}
+            />
+          }
+          title={item.title}
+        />
+      )}
+    ></SectionList>
+  )
+}
+
+export default TabSharedAccountInLists
diff --git a/src/screens/Tabs/Shared/index.tsx b/src/screens/Tabs/Shared/index.tsx
index 46a7e25b..131079dc 100644
--- a/src/screens/Tabs/Shared/index.tsx
+++ b/src/screens/Tabs/Shared/index.tsx
@@ -16,6 +16,7 @@ import { debounce } from 'lodash'
 import React from 'react'
 import { Trans, useTranslation } from 'react-i18next'
 import { Platform, TextInput, View } from 'react-native'
+import TabSharedAccountInLists from './AccountInLists'
 
 const TabShared = ({ Stack }: { Stack: ReturnType<typeof createNativeStackNavigator> }) => {
   const { colors, mode } = useTheme()
@@ -48,6 +49,12 @@ const TabShared = ({ Stack }: { Stack: ReturnType<typeof createNativeStackNaviga
         }}
       />
 
+      <Stack.Screen
+        key='Tab-Shared-Account-In-Lists'
+        name='Tab-Shared-Account-In-Lists'
+        component={TabSharedAccountInLists}
+      />
+
       <Stack.Screen
         key='Tab-Shared-Attachments'
         name='Tab-Shared-Attachments'
diff --git a/src/utils/navigation/navigators.ts b/src/utils/navigation/navigators.ts
index 8ae239d4..dde46365 100644
--- a/src/utils/navigation/navigators.ts
+++ b/src/utils/navigation/navigators.ts
@@ -92,6 +92,9 @@ export type TabSharedStackParamList = {
   'Tab-Shared-Account': {
     account: Mastodon.Account | Mastodon.Mention
   }
+  'Tab-Shared-Account-In-Lists': {
+    account: Pick<Mastodon.Account, 'id' | 'username'>
+  }
   'Tab-Shared-Attachments': { account: Mastodon.Account }
   'Tab-Shared-Hashtag': {
     hashtag: Mastodon.Tag['name']
diff --git a/src/utils/queryHooks/account.ts b/src/utils/queryHooks/account.ts
index 45ab11df..7187b437 100644
--- a/src/utils/queryHooks/account.ts
+++ b/src/utils/queryHooks/account.ts
@@ -4,7 +4,7 @@ import { QueryFunctionContext, useQuery, UseQueryOptions } from 'react-query'
 
 export type QueryKeyAccount = ['Account', { id: Mastodon.Account['id'] }]
 
-const queryFunction = ({ queryKey }: QueryFunctionContext<QueryKeyAccount>) => {
+const accountQueryFunction = ({ queryKey }: QueryFunctionContext<QueryKeyAccount>) => {
   const { id } = queryKey[1]
 
   return apiInstance<Mastodon.Account>({
@@ -20,7 +20,30 @@ const useAccountQuery = ({
   options?: UseQueryOptions<Mastodon.Account, AxiosError>
 }) => {
   const queryKey: QueryKeyAccount = ['Account', { ...queryKeyParams }]
-  return useQuery(queryKey, queryFunction, options)
+  return useQuery(queryKey, accountQueryFunction, options)
 }
 
-export { useAccountQuery }
+/* ----- */
+
+export type QueryKeyAccountInLists = ['AccountInLists', { id: Mastodon.Account['id'] }]
+
+const accountInListsQueryFunction = ({ queryKey }: QueryFunctionContext<QueryKeyAccount>) => {
+  const { id } = queryKey[1]
+
+  return apiInstance<Mastodon.List[]>({
+    method: 'get',
+    url: `accounts/${id}/lists`
+  }).then(res => res.body)
+}
+
+const useAccountInListsQuery = ({
+  options,
+  ...queryKeyParams
+}: QueryKeyAccount[1] & {
+  options?: UseQueryOptions<Mastodon.List[], AxiosError>
+}) => {
+  const queryKey: QueryKeyAccount = ['Account', { ...queryKeyParams }]
+  return useQuery(queryKey, accountInListsQueryFunction, options)
+}
+
+export { useAccountQuery, useAccountInListsQuery }

From 6a9f951dbad32a07fd05a6f118000486e2eaf2b4 Mon Sep 17 00:00:00 2001
From: xmflsct <me@xmflsct.com>
Date: Sat, 3 Dec 2022 16:50:54 +0100
Subject: [PATCH 13/40] Move screen options into each screen

---
 src/screens/Tabs/Shared/Account.tsx        |   8 +-
 src/screens/Tabs/Shared/AccountInLists.tsx |   7 +-
 src/screens/Tabs/Shared/Attachments.tsx    |  44 +++++-
 src/screens/Tabs/Shared/Hashtag.tsx        |   9 +-
 src/screens/Tabs/Shared/History.tsx        |  42 +++---
 src/screens/Tabs/Shared/Search.tsx         |  69 +++++++++-
 src/screens/Tabs/Shared/Toot.tsx           |  14 +-
 src/screens/Tabs/Shared/Users.tsx          |  93 +++++++------
 src/screens/Tabs/Shared/index.tsx          | 149 +--------------------
 9 files changed, 203 insertions(+), 232 deletions(-)

diff --git a/src/screens/Tabs/Shared/Account.tsx b/src/screens/Tabs/Shared/Account.tsx
index c36ee564..758071c0 100644
--- a/src/screens/Tabs/Shared/Account.tsx
+++ b/src/screens/Tabs/Shared/Account.tsx
@@ -1,6 +1,6 @@
 import menuAccount from '@components/contextMenu/account'
 import menuShare from '@components/contextMenu/share'
-import { HeaderRight } from '@components/Header'
+import { HeaderLeft, HeaderRight } from '@components/Header'
 import Timeline from '@components/Timeline'
 import TimelineDefault from '@components/Timeline/Default'
 import SegmentedControl from '@react-native-community/segmented-control'
@@ -33,6 +33,12 @@ const TabSharedAccount: React.FC<TabSharedStackScreenProps<'Tab-Shared-Account'>
   const mAccount = menuAccount({ type: 'account', openChange: true, account })
   useEffect(() => {
     navigation.setOptions({
+      headerTransparent: true,
+      headerStyle: {
+        backgroundColor: `rgba(255, 255, 255, 0)`
+      },
+      title: '',
+      headerLeft: () => <HeaderLeft onPress={() => navigation.goBack()} background />,
       headerRight: () => {
         return (
           <DropdownMenu.Root>
diff --git a/src/screens/Tabs/Shared/AccountInLists.tsx b/src/screens/Tabs/Shared/AccountInLists.tsx
index 4cc2900f..8628c41c 100644
--- a/src/screens/Tabs/Shared/AccountInLists.tsx
+++ b/src/screens/Tabs/Shared/AccountInLists.tsx
@@ -10,7 +10,7 @@ import { StyleConstants } from '@utils/styles/constants'
 import { useTheme } from '@utils/styles/ThemeManager'
 import React, { useEffect } from 'react'
 import { useTranslation } from 'react-i18next'
-import { SectionList, Text, View } from 'react-native'
+import { SectionList, View } from 'react-native'
 
 const TabSharedAccountInLists: React.FC<
   TabSharedStackScreenProps<'Tab-Shared-Account-In-Lists'>
@@ -27,7 +27,6 @@ const TabSharedAccountInLists: React.FC<
     navigation.setOptions({
       presentation: 'modal',
       title: t('shared.accountInLists.name', { username: account.username }),
-      headerLeft: () => null,
       headerRight: () => {
         return (
           <HeaderRight
@@ -49,8 +48,8 @@ const TabSharedAccountInLists: React.FC<
       id: 'out',
       title: t('shared.accountInLists.notInLists'),
       data:
-        listsQuery.data?.filter(
-          ({ id }) => !accountInListsQuery.data?.filter(d => d.id === id).length
+        listsQuery?.data?.filter(
+          ({ id }) => !accountInListsQuery?.data?.filter(d => d.id === id)?.length
         ) || []
     }
   ]
diff --git a/src/screens/Tabs/Shared/Attachments.tsx b/src/screens/Tabs/Shared/Attachments.tsx
index 773b3938..948d2552 100644
--- a/src/screens/Tabs/Shared/Attachments.tsx
+++ b/src/screens/Tabs/Shared/Attachments.tsx
@@ -1,27 +1,57 @@
+import { HeaderLeft } from '@components/Header'
+import { ParseEmojis } from '@components/Parse'
+import CustomText from '@components/Text'
 import Timeline from '@components/Timeline'
 import TimelineDefault from '@components/Timeline/Default'
 import { TabSharedStackScreenProps } from '@utils/navigation/navigators'
 import { QueryKeyTimeline } from '@utils/queryHooks/timeline'
-import React from 'react'
+import { useTheme } from '@utils/styles/ThemeManager'
+import React, { useEffect } from 'react'
+import { Trans } from 'react-i18next'
 
-const TabSharedAttachments: React.FC<
-  TabSharedStackScreenProps<'Tab-Shared-Attachments'>
-> = ({
+const TabSharedAttachments: React.FC<TabSharedStackScreenProps<'Tab-Shared-Attachments'>> = ({
+  navigation,
   route: {
     params: { account }
   }
 }) => {
+  const { colors } = useTheme()
+
+  useEffect(() => {
+    navigation.setOptions({
+      headerLeft: () => <HeaderLeft onPress={() => navigation.goBack()} background />,
+      headerTitle: () => (
+        <CustomText numberOfLines={1}>
+          <Trans
+            i18nKey='screenTabs:shared.attachments.name'
+            components={[
+              <ParseEmojis
+                content={account.display_name || account.username}
+                emojis={account.emojis}
+                fontBold
+              />,
+              <CustomText
+                fontStyle='M'
+                style={{ color: colors.primaryDefault }}
+                fontWeight='Bold'
+              />
+            ]}
+          />
+        </CustomText>
+      )
+    })
+  }, [])
+
   const queryKey: QueryKeyTimeline = [
     'Timeline',
     { page: 'Account_Attachments', account: account.id }
   ]
+
   return (
     <Timeline
       queryKey={queryKey}
       customProps={{
-        renderItem: ({ item }) => (
-          <TimelineDefault item={item} queryKey={queryKey} />
-        )
+        renderItem: ({ item }) => <TimelineDefault item={item} queryKey={queryKey} />
       }}
     />
   )
diff --git a/src/screens/Tabs/Shared/Hashtag.tsx b/src/screens/Tabs/Shared/Hashtag.tsx
index e905e8a7..541f822b 100644
--- a/src/screens/Tabs/Shared/Hashtag.tsx
+++ b/src/screens/Tabs/Shared/Hashtag.tsx
@@ -1,5 +1,5 @@
 import haptics from '@components/haptics'
-import { HeaderRight } from '@components/Header'
+import { HeaderLeft, HeaderRight } from '@components/Header'
 import { displayMessage } from '@components/Message'
 import Timeline from '@components/Timeline'
 import TimelineDefault from '@components/Timeline/Default'
@@ -18,6 +18,13 @@ const TabSharedHashtag: React.FC<TabSharedStackScreenProps<'Tab-Shared-Hashtag'>
     params: { hashtag }
   }
 }) => {
+  useEffect(() => {
+    navigation.setOptions({
+      headerLeft: () => <HeaderLeft onPress={() => navigation.goBack()} />,
+      title: `#${decodeURIComponent(hashtag)}`
+    })
+  }, [])
+
   const queryKey: QueryKeyTimeline = ['Timeline', { page: 'Hashtag', hashtag }]
 
   const { theme } = useTheme()
diff --git a/src/screens/Tabs/Shared/History.tsx b/src/screens/Tabs/Shared/History.tsx
index 0fd08519..ea8ef633 100644
--- a/src/screens/Tabs/Shared/History.tsx
+++ b/src/screens/Tabs/Shared/History.tsx
@@ -1,3 +1,4 @@
+import { HeaderLeft } from '@components/Header'
 import Icon from '@components/Icon'
 import { ParseEmojis } from '@components/Parse'
 import ComponentSeparator from '@components/Separator'
@@ -9,7 +10,8 @@ import { TabSharedStackScreenProps } from '@utils/navigation/navigators'
 import { useStatusHistory } from '@utils/queryHooks/statusesHistory'
 import { StyleConstants } from '@utils/styles/constants'
 import { useTheme } from '@utils/styles/ThemeManager'
-import React from 'react'
+import React, { useEffect } from 'react'
+import { useTranslation } from 'react-i18next'
 import { View } from 'react-native'
 import { ScrollView } from 'react-native-gesture-handler'
 
@@ -23,6 +25,7 @@ const ContentView = ({
   last: boolean
 }) => {
   const { colors } = useTheme()
+
   return (
     <>
       <View
@@ -37,16 +40,11 @@ const ContentView = ({
         ) : null}
         {history.poll
           ? history.poll.options.map((option, index) => (
-              <View
-                key={index}
-                style={{ flex: 1, paddingVertical: StyleConstants.Spacing.S }}
-              >
+              <View key={index} style={{ flex: 1, paddingVertical: StyleConstants.Spacing.S }}>
                 <View style={{ flex: 1, flexDirection: 'row' }}>
                   <Icon
                     style={{
-                      paddingTop:
-                        StyleConstants.Font.LineHeight.M -
-                        StyleConstants.Font.Size.M,
+                      paddingTop: StyleConstants.Font.LineHeight.M - StyleConstants.Font.Size.M,
                       marginRight: StyleConstants.Spacing.S
                     }}
                     name='Circle'
@@ -54,17 +52,13 @@ const ContentView = ({
                     color={colors.disabled}
                   />
                   <CustomText style={{ flex: 1 }}>
-                    <ParseEmojis
-                      content={option.title}
-                      emojis={history.poll?.emojis}
-                    />
+                    <ParseEmojis content={option.title} emojis={history.poll?.emojis} />
                   </CustomText>
                 </View>
               </View>
             ))
           : null}
-        {Array.isArray(history.media_attachments) &&
-        history.media_attachments.length ? (
+        {Array.isArray(history.media_attachments) && history.media_attachments.length ? (
           <TimelineAttachment status={history} />
         ) : null}
       </View>
@@ -73,15 +67,22 @@ const ContentView = ({
   )
 }
 
-const TabSharedHistory: React.FC<
-  TabSharedStackScreenProps<'Tab-Shared-History'>
-> = ({
+const TabSharedHistory: React.FC<TabSharedStackScreenProps<'Tab-Shared-History'>> = ({
+  navigation,
   route: {
     params: { id }
   }
 }) => {
+  const { t } = useTranslation('screenTabs')
   const { data } = useStatusHistory({ id })
 
+  useEffect(() => {
+    navigation.setOptions({
+      title: t('shared.history.name'),
+      headerLeft: () => <HeaderLeft onPress={() => navigation.goBack()} />
+    })
+  }, [])
+
   return (
     <ScrollView>
       {data && data.length > 0
@@ -90,12 +91,7 @@ const TabSharedHistory: React.FC<
             .reverse()
             .map((d, i) =>
               i !== 0 ? (
-                <ContentView
-                  key={i}
-                  history={d}
-                  first={i === 1}
-                  last={i === data.length - 1}
-                />
+                <ContentView key={i} history={d} first={i === 1} last={i === data.length - 1} />
               ) : null
             )
         : null}
diff --git a/src/screens/Tabs/Shared/Search.tsx b/src/screens/Tabs/Shared/Search.tsx
index 1cf14e3f..72843e40 100644
--- a/src/screens/Tabs/Shared/Search.tsx
+++ b/src/screens/Tabs/Shared/Search.tsx
@@ -1,5 +1,6 @@
 import ComponentAccount from '@components/Account'
 import ComponentHashtag from '@components/Hashtag'
+import { HeaderLeft } from '@components/Header'
 import ComponentSeparator from '@components/Separator'
 import CustomText from '@components/Text'
 import TimelineDefault from '@components/Timeline/Default'
@@ -7,18 +8,80 @@ import { TabSharedStackScreenProps } from '@utils/navigation/navigators'
 import { useSearchQuery } from '@utils/queryHooks/search'
 import { StyleConstants } from '@utils/styles/constants'
 import { useTheme } from '@utils/styles/ThemeManager'
-import React, { useCallback, useMemo } from 'react'
+import { debounce } from 'lodash'
+import React, { useCallback, useEffect, useMemo } from 'react'
 import { Trans, useTranslation } from 'react-i18next'
-import { KeyboardAvoidingView, Platform, SectionList, StyleSheet, View } from 'react-native'
+import {
+  KeyboardAvoidingView,
+  Platform,
+  SectionList,
+  StyleSheet,
+  TextInput,
+  View
+} from 'react-native'
 import { Circle } from 'react-native-animated-spinkit'
 
 const TabSharedSearch: React.FC<TabSharedStackScreenProps<'Tab-Shared-Search'>> = ({
+  navigation,
   route: {
     params: { text }
   }
 }) => {
   const { t } = useTranslation('screenTabs')
-  const { colors } = useTheme()
+  const { colors, mode } = useTheme()
+
+  useEffect(() => {
+    navigation.setOptions({
+      ...(Platform.OS === 'ios'
+        ? {
+            headerLeft: () => <HeaderLeft onPress={() => navigation.goBack()} />
+          }
+        : { headerLeft: () => null }),
+      headerTitle: () => {
+        const onChangeText = debounce((text: string) => navigation.setParams({ text }), 1000, {
+          trailing: true
+        })
+        return (
+          <View
+            style={{
+              flexBasis: '80%',
+              flexDirection: 'row',
+              alignItems: 'center'
+            }}
+          >
+            <TextInput
+              editable={false}
+              style={{
+                fontSize: StyleConstants.Font.Size.M,
+                color: colors.primaryDefault
+              }}
+              defaultValue={t('shared.search.header.prefix')}
+            />
+            <TextInput
+              accessibilityRole='search'
+              keyboardAppearance={mode}
+              style={{
+                fontSize: StyleConstants.Font.Size.M,
+                flex: 1,
+                color: colors.primaryDefault,
+                paddingLeft: StyleConstants.Spacing.XS
+              }}
+              autoFocus
+              onChangeText={onChangeText}
+              autoCapitalize='none'
+              autoCorrect={false}
+              clearButtonMode='never'
+              keyboardType='web-search'
+              onSubmitEditing={({ nativeEvent: { text } }) => navigation.setParams({ text })}
+              placeholder={t('shared.search.header.placeholder')}
+              placeholderTextColor={colors.secondary}
+              returnKeyType='go'
+            />
+          </View>
+        )
+      }
+    })
+  }, [])
 
   const mapKeyToTranslations = {
     accounts: t('shared.search.sections.accounts'),
diff --git a/src/screens/Tabs/Shared/Toot.tsx b/src/screens/Tabs/Shared/Toot.tsx
index 1c2dca2d..dbd59181 100644
--- a/src/screens/Tabs/Shared/Toot.tsx
+++ b/src/screens/Tabs/Shared/Toot.tsx
@@ -1,24 +1,34 @@
+import { HeaderLeft } from '@components/Header'
 import Timeline from '@components/Timeline'
 import TimelineDefault from '@components/Timeline/Default'
-import { useNavigation } from '@react-navigation/native'
 import { TabSharedStackScreenProps } from '@utils/navigation/navigators'
 import { QueryKeyTimeline } from '@utils/queryHooks/timeline'
 import React, { useEffect, useRef, useState } from 'react'
+import { useTranslation } from 'react-i18next'
 import { FlatList } from 'react-native'
 import { InfiniteQueryObserver, useQueryClient } from 'react-query'
 
 const TabSharedToot: React.FC<TabSharedStackScreenProps<'Tab-Shared-Toot'>> = ({
+  navigation,
   route: {
     params: { toot, rootQueryKey }
   }
 }) => {
+  const { t } = useTranslation('screenTabs')
+
+  useEffect(() => {
+    navigation.setOptions({
+      title: t('shared.toot.name'),
+      headerLeft: () => <HeaderLeft onPress={() => navigation.goBack()} />
+    })
+  }, [])
+
   const queryKey: QueryKeyTimeline = ['Timeline', { page: 'Toot', toot: toot.id }]
 
   const flRef = useRef<FlatList>(null)
 
   const [itemsLength, setItemsLength] = useState(0)
   const scrolled = useRef(false)
-  const navigation = useNavigation()
   const queryClient = useQueryClient()
   const observer = new InfiniteQueryObserver(queryClient, {
     queryKey,
diff --git a/src/screens/Tabs/Shared/Users.tsx b/src/screens/Tabs/Shared/Users.tsx
index e6356b44..d1a6fdf7 100644
--- a/src/screens/Tabs/Shared/Users.tsx
+++ b/src/screens/Tabs/Shared/Users.tsx
@@ -1,58 +1,57 @@
 import ComponentAccount from '@components/Account'
+import { HeaderLeft } from '@components/Header'
 import ComponentSeparator from '@components/Separator'
 import { TabSharedStackScreenProps } from '@utils/navigation/navigators'
 import { QueryKeyUsers, useUsersQuery } from '@utils/queryHooks/users'
-import React, { useCallback } from 'react'
-import { StyleSheet } from 'react-native'
+import React, { useCallback, useEffect } from 'react'
+import { useTranslation } from 'react-i18next'
 import { FlatList } from 'react-native-gesture-handler'
 
-const TabSharedUsers = React.memo(
-  ({ route: { params } }: TabSharedStackScreenProps<'Tab-Shared-Users'>) => {
-    const queryKey: QueryKeyUsers = ['Users', params]
-    const { data, hasNextPage, fetchNextPage, isFetchingNextPage } =
-      useUsersQuery({
-        ...queryKey[1],
-        options: {
-          getPreviousPageParam: firstPage =>
-            firstPage.links?.prev && { since_id: firstPage.links.next },
-          getNextPageParam: lastPage =>
-            lastPage.links?.next && { max_id: lastPage.links.next }
-        }
-      })
-    const flattenData = data?.pages
-      ? data.pages.flatMap(page => [...page.body])
-      : []
+const TabSharedUsers: React.FC<TabSharedStackScreenProps<'Tab-Shared-Users'>> = ({
+  navigation,
+  route: { params }
+}) => {
+  const { t } = useTranslation('screenTabs')
+  useEffect(() => {
+    navigation.setOptions({
+      title: t(`shared.users.${params.reference}.${params.type}`, { count: params.count }),
+      headerLeft: () => <HeaderLeft onPress={() => navigation.goBack()} />
+    })
+  }, [])
 
-    const onEndReached = useCallback(
-      () => hasNextPage && !isFetchingNextPage && fetchNextPage(),
-      [hasNextPage, isFetchingNextPage]
-    )
+  const queryKey: QueryKeyUsers = ['Users', params]
+  const { data, hasNextPage, fetchNextPage, isFetchingNextPage } = useUsersQuery({
+    ...queryKey[1],
+    options: {
+      getPreviousPageParam: firstPage =>
+        firstPage.links?.prev && { since_id: firstPage.links.next },
+      getNextPageParam: lastPage => lastPage.links?.next && { max_id: lastPage.links.next }
+    }
+  })
+  const flattenData = data?.pages ? data.pages.flatMap(page => [...page.body]) : []
 
-    return (
-      <FlatList
-        windowSize={7}
-        data={flattenData}
-        style={styles.flatList}
-        renderItem={({ item }) => (
-          <ComponentAccount account={item} />
-        )}
-        onEndReached={onEndReached}
-        onEndReachedThreshold={0.75}
-        ItemSeparatorComponent={ComponentSeparator}
-        maintainVisibleContentPosition={{
-          minIndexForVisible: 0,
-          autoscrollToTopThreshold: 2
-        }}
-      />
-    )
-  },
-  () => true
-)
+  const onEndReached = useCallback(
+    () => hasNextPage && !isFetchingNextPage && fetchNextPage(),
+    [hasNextPage, isFetchingNextPage]
+  )
 
-const styles = StyleSheet.create({
-  flatList: {
-    minHeight: '100%'
-  }
-})
+  return (
+    <FlatList
+      windowSize={7}
+      data={flattenData}
+      style={{
+        minHeight: '100%'
+      }}
+      renderItem={({ item }) => <ComponentAccount account={item} />}
+      onEndReached={onEndReached}
+      onEndReachedThreshold={0.75}
+      ItemSeparatorComponent={ComponentSeparator}
+      maintainVisibleContentPosition={{
+        minIndexForVisible: 0,
+        autoscrollToTopThreshold: 2
+      }}
+    />
+  )
+}
 
 export default TabSharedUsers
diff --git a/src/screens/Tabs/Shared/index.tsx b/src/screens/Tabs/Shared/index.tsx
index 131079dc..bf07e7fe 100644
--- a/src/screens/Tabs/Shared/index.tsx
+++ b/src/screens/Tabs/Shared/index.tsx
@@ -1,6 +1,3 @@
-import { HeaderCenter, HeaderLeft } from '@components/Header'
-import { ParseEmojis } from '@components/Parse'
-import CustomText from '@components/Text'
 import { createNativeStackNavigator } from '@react-navigation/native-stack'
 import TabSharedAccount from '@screens/Tabs/Shared/Account'
 import TabSharedAttachments from '@screens/Tabs/Shared/Attachments'
@@ -9,13 +6,9 @@ import TabSharedHistory from '@screens/Tabs/Shared/History'
 import TabSharedSearch from '@screens/Tabs/Shared/Search'
 import TabSharedToot from '@screens/Tabs/Shared/Toot'
 import TabSharedUsers from '@screens/Tabs/Shared/Users'
-import { TabSharedStackScreenProps } from '@utils/navigation/navigators'
-import { StyleConstants } from '@utils/styles/constants'
 import { useTheme } from '@utils/styles/ThemeManager'
-import { debounce } from 'lodash'
 import React from 'react'
-import { Trans, useTranslation } from 'react-i18next'
-import { Platform, TextInput, View } from 'react-native'
+import { useTranslation } from 'react-i18next'
 import TabSharedAccountInLists from './AccountInLists'
 
 const TabShared = ({ Stack }: { Stack: ReturnType<typeof createNativeStackNavigator> }) => {
@@ -23,167 +16,35 @@ const TabShared = ({ Stack }: { Stack: ReturnType<typeof createNativeStackNaviga
   const { t } = useTranslation('screenTabs')
 
   return (
-    <Stack.Group
-      screenOptions={({ navigation }) => ({
-        headerLeft: () => <HeaderLeft onPress={() => navigation.goBack()} />
-      })}
-    >
+    <Stack.Group>
       <Stack.Screen
         key='Tab-Shared-Account'
         name='Tab-Shared-Account'
         component={TabSharedAccount}
-        options={({
-          navigation,
-          route: {
-            params: { account }
-          }
-        }: TabSharedStackScreenProps<'Tab-Shared-Account'>) => {
-          return {
-            headerTransparent: true,
-            headerStyle: {
-              backgroundColor: `rgba(255, 255, 255, 0)`
-            },
-            title: '',
-            headerLeft: () => <HeaderLeft onPress={() => navigation.goBack()} background />
-          }
-        }}
       />
-
       <Stack.Screen
         key='Tab-Shared-Account-In-Lists'
         name='Tab-Shared-Account-In-Lists'
         component={TabSharedAccountInLists}
       />
-
       <Stack.Screen
         key='Tab-Shared-Attachments'
         name='Tab-Shared-Attachments'
         component={TabSharedAttachments}
-        options={({
-          route: {
-            params: { account }
-          }
-        }: TabSharedStackScreenProps<'Tab-Shared-Attachments'>) => {
-          return {
-            headerTitle: () => (
-              <CustomText numberOfLines={1}>
-                <Trans
-                  i18nKey='screenTabs:shared.attachments.name'
-                  components={[
-                    <ParseEmojis
-                      content={account.display_name || account.username}
-                      emojis={account.emojis}
-                      fontBold
-                    />,
-                    <CustomText
-                      fontStyle='M'
-                      style={{ color: colors.primaryDefault }}
-                      fontWeight='Bold'
-                    />
-                  ]}
-                />
-              </CustomText>
-            )
-          }
-        }}
       />
-
       <Stack.Screen
         key='Tab-Shared-Hashtag'
         name='Tab-Shared-Hashtag'
         component={TabSharedHashtag}
-        options={({ route }: TabSharedStackScreenProps<'Tab-Shared-Hashtag'>) => ({
-          title: `#${decodeURIComponent(route.params.hashtag)}`
-        })}
       />
-
       <Stack.Screen
         key='Tab-Shared-History'
         name='Tab-Shared-History'
         component={TabSharedHistory}
-        options={{ title: t('screenTabs:shared.history.name') }}
-      />
-
-      <Stack.Screen
-        key='Tab-Shared-Search'
-        name='Tab-Shared-Search'
-        component={TabSharedSearch}
-        options={({ navigation }: TabSharedStackScreenProps<'Tab-Shared-Search'>) => ({
-          ...(Platform.OS === 'ios'
-            ? {
-                headerLeft: () => <HeaderLeft onPress={() => navigation.goBack()} />
-              }
-            : { headerLeft: () => null }),
-          headerTitle: () => {
-            const onChangeText = debounce((text: string) => navigation.setParams({ text }), 1000, {
-              trailing: true
-            })
-            return (
-              <View
-                style={{
-                  flexBasis: '80%',
-                  flexDirection: 'row',
-                  alignItems: 'center'
-                }}
-              >
-                <TextInput
-                  editable={false}
-                  style={{
-                    fontSize: StyleConstants.Font.Size.M,
-                    color: colors.primaryDefault
-                  }}
-                  defaultValue={t('shared.search.header.prefix')}
-                />
-                <TextInput
-                  accessibilityRole='search'
-                  keyboardAppearance={mode}
-                  style={{
-                    fontSize: StyleConstants.Font.Size.M,
-                    flex: 1,
-                    color: colors.primaryDefault,
-                    paddingLeft: StyleConstants.Spacing.XS
-                  }}
-                  autoFocus
-                  onChangeText={onChangeText}
-                  autoCapitalize='none'
-                  autoCorrect={false}
-                  clearButtonMode='never'
-                  keyboardType='web-search'
-                  onSubmitEditing={({ nativeEvent: { text } }) => navigation.setParams({ text })}
-                  placeholder={t('shared.search.header.placeholder')}
-                  placeholderTextColor={colors.secondary}
-                  returnKeyType='go'
-                />
-              </View>
-            )
-          }
-        })}
-      />
-
-      <Stack.Screen
-        key='Tab-Shared-Toot'
-        name='Tab-Shared-Toot'
-        component={TabSharedToot}
-        options={{ title: t('shared.toot.name') }}
-      />
-
-      <Stack.Screen
-        key='Tab-Shared-Users'
-        name='Tab-Shared-Users'
-        component={TabSharedUsers}
-        options={({
-          route: {
-            params: { reference, type, count }
-          }
-        }: TabSharedStackScreenProps<'Tab-Shared-Users'>) => ({
-          title: t(`shared.users.${reference}.${type}`, { count }),
-          ...(Platform.OS === 'android' && {
-            headerCenter: () => (
-              <HeaderCenter content={t(`shared.users.${reference}.${type}`, { count })} />
-            )
-          })
-        })}
       />
+      <Stack.Screen key='Tab-Shared-Search' name='Tab-Shared-Search' component={TabSharedSearch} />
+      <Stack.Screen key='Tab-Shared-Toot' name='Tab-Shared-Toot' component={TabSharedToot} />
+      <Stack.Screen key='Tab-Shared-Users' name='Tab-Shared-Users' component={TabSharedUsers} />
     </Stack.Group>
   )
 }

From 20a55efb9c4fd033d40d59598c673ae38e85d447 Mon Sep 17 00:00:00 2001
From: xmflsct <me@xmflsct.com>
Date: Sat, 3 Dec 2022 20:47:11 +0100
Subject: [PATCH 14/40] Fixed #476

---
 src/components/Parse/HTML.tsx                 |   7 +-
 src/components/Timeline/Conversation.tsx      | 163 ++++----
 src/components/Timeline/Default.tsx           | 224 +++++------
 src/components/Timeline/Notifications.tsx     |  81 ++--
 src/components/Timeline/Shared/Actioned.tsx   | 293 +++++++--------
 src/components/Timeline/Shared/Actions.tsx    |  63 ++--
 src/components/Timeline/Shared/Attachment.tsx | 351 +++++++++---------
 src/components/Timeline/Shared/Avatar.tsx     |  30 +-
 src/components/Timeline/Shared/Card.tsx       |  42 ++-
 src/components/Timeline/Shared/Content.tsx    |  93 +++--
 src/components/Timeline/Shared/Context.tsx    |  24 ++
 src/components/Timeline/Shared/Feedback.tsx   | 165 ++++----
 .../Timeline/Shared/FullConversation.tsx      |  55 ++-
 .../Timeline/Shared/HeaderAndroid.tsx         |  15 +-
 .../Timeline/Shared/HeaderConversation.tsx    |  52 ++-
 .../Timeline/Shared/HeaderDefault.tsx         |  27 +-
 .../Timeline/Shared/HeaderNotification.tsx    |  23 +-
 src/components/Timeline/Shared/Poll.tsx       |  39 +-
 src/components/Timeline/Shared/Translate.tsx  | 208 +++++------
 src/utils/queryHooks/timeline.ts              |  48 +--
 .../queryHooks/timeline/update/status.ts      |  26 +-
 .../timeline/updateStatusProperty.ts          | 136 +++----
 22 files changed, 990 insertions(+), 1175 deletions(-)
 create mode 100644 src/components/Timeline/Shared/Context.tsx

diff --git a/src/components/Parse/HTML.tsx b/src/components/Parse/HTML.tsx
index b619b144..828ba608 100644
--- a/src/components/Parse/HTML.tsx
+++ b/src/components/Parse/HTML.tsx
@@ -168,6 +168,7 @@ export interface Props {
   highlighted?: boolean
   disableDetails?: boolean
   selectable?: boolean
+  setSpoilerExpanded?: React.Dispatch<React.SetStateAction<boolean>>
 }
 
 const ParseHTML = React.memo(
@@ -183,7 +184,8 @@ const ParseHTML = React.memo(
     expandHint,
     highlighted = false,
     disableDetails = false,
-    selectable = false
+    selectable = false,
+    setSpoilerExpanded
   }: Props) => {
     const adaptiveFontsize = useSelector(getSettingsFontsize)
     const adaptedFontsize = adaptiveScale(
@@ -253,6 +255,9 @@ const ParseHTML = React.memo(
                 onPress={() => {
                   layoutAnimation()
                   setExpanded(!expanded)
+                  if (setSpoilerExpanded) {
+                    setSpoilerExpanded(!expanded)
+                  }
                 }}
                 style={{
                   flexDirection: 'row',
diff --git a/src/components/Timeline/Conversation.tsx b/src/components/Timeline/Conversation.tsx
index 5dbd3d2d..b3311a28 100644
--- a/src/components/Timeline/Conversation.tsx
+++ b/src/components/Timeline/Conversation.tsx
@@ -4,90 +4,52 @@ import { useNavigation } from '@react-navigation/native'
 import { StackNavigationProp } from '@react-navigation/stack'
 import { TabLocalStackParamList } from '@utils/navigation/navigators'
 import { QueryKeyTimeline } from '@utils/queryHooks/timeline'
-import { getInstanceAccount } from '@utils/slices/instancesSlice'
 import { StyleConstants } from '@utils/styles/constants'
 import { useTheme } from '@utils/styles/ThemeManager'
-import { isEqual } from 'lodash'
 import React, { useCallback } from 'react'
 import { Pressable, View } from 'react-native'
 import { useMutation, useQueryClient } from 'react-query'
-import { useSelector } from 'react-redux'
 import TimelineActions from './Shared/Actions'
 import TimelineContent from './Shared/Content'
+import StatusContext from './Shared/Context'
 import TimelineHeaderConversation from './Shared/HeaderConversation'
 import TimelinePoll from './Shared/Poll'
 
-const Avatars: React.FC<{ accounts: Mastodon.Account[] }> = ({ accounts }) => {
-  return (
-    <View
-      style={{
-        borderRadius: 4,
-        overflow: 'hidden',
-        marginRight: StyleConstants.Spacing.S,
-        width: StyleConstants.Avatar.M,
-        height: StyleConstants.Avatar.M,
-        flexDirection: 'row',
-        flexWrap: 'wrap'
-      }}
-    >
-      {accounts.slice(0, 4).map(account => (
-        <GracefullyImage
-          key={account.id}
-          uri={{ original: account.avatar, static: account.avatar_static }}
-          dimension={{
-            width: StyleConstants.Avatar.M,
-            height:
-              accounts.length > 2
-                ? StyleConstants.Avatar.M / 2
-                : StyleConstants.Avatar.M
-          }}
-          style={{ flex: 1, flexBasis: '50%' }}
-        />
-      ))}
-    </View>
-  )
-}
-
 export interface Props {
   conversation: Mastodon.Conversation
   queryKey: QueryKeyTimeline
   highlighted?: boolean
 }
 
-const TimelineConversation = React.memo(
-  ({ conversation, queryKey, highlighted = false }: Props) => {
-    const instanceAccount = useSelector(
-      getInstanceAccount,
-      (prev, next) => prev?.id === next?.id
-    )
-    const { colors } = useTheme()
+const TimelineConversation: React.FC<Props> = ({ conversation, queryKey, highlighted = false }) => {
+  const { colors } = useTheme()
 
-    const queryClient = useQueryClient()
-    const fireMutation = useCallback(() => {
-      return apiInstance<Mastodon.Conversation>({
-        method: 'post',
-        url: `conversations/${conversation.id}/read`
-      })
-    }, [])
-    const { mutate } = useMutation(fireMutation, {
-      onSettled: () => {
-        queryClient.invalidateQueries(queryKey)
-      }
+  const queryClient = useQueryClient()
+  const fireMutation = useCallback(() => {
+    return apiInstance<Mastodon.Conversation>({
+      method: 'post',
+      url: `conversations/${conversation.id}/read`
     })
+  }, [])
+  const { mutate } = useMutation(fireMutation, {
+    onSettled: () => {
+      queryClient.invalidateQueries(queryKey)
+    }
+  })
 
-    const navigation =
-      useNavigation<StackNavigationProp<TabLocalStackParamList>>()
-    const onPress = useCallback(() => {
-      if (conversation.last_status) {
-        conversation.unread && mutate()
-        navigation.push('Tab-Shared-Toot', {
-          toot: conversation.last_status,
-          rootQueryKey: queryKey
-        })
-      }
-    }, [])
+  const navigation = useNavigation<StackNavigationProp<TabLocalStackParamList>>()
+  const onPress = useCallback(() => {
+    if (conversation.last_status) {
+      conversation.unread && mutate()
+      navigation.push('Tab-Shared-Toot', {
+        toot: conversation.last_status,
+        rootQueryKey: queryKey
+      })
+    }
+  }, [])
 
-    return (
+  return (
+    <StatusContext.Provider value={{ queryKey, status: conversation.last_status }}>
       <Pressable
         style={[
           {
@@ -100,19 +62,39 @@ const TimelineConversation = React.memo(
           conversation.unread && {
             borderLeftWidth: StyleConstants.Spacing.XS,
             borderLeftColor: colors.blue,
-            paddingLeft:
-              StyleConstants.Spacing.Global.PagePadding -
-              StyleConstants.Spacing.XS
+            paddingLeft: StyleConstants.Spacing.Global.PagePadding - StyleConstants.Spacing.XS
           }
         ]}
         onPress={onPress}
       >
         <View style={{ flex: 1, width: '100%', flexDirection: 'row' }}>
-          <Avatars accounts={conversation.accounts} />
-          <TimelineHeaderConversation
-            queryKey={queryKey}
-            conversation={conversation}
-          />
+          <View
+            style={{
+              borderRadius: 4,
+              overflow: 'hidden',
+              marginRight: StyleConstants.Spacing.S,
+              width: StyleConstants.Avatar.M,
+              height: StyleConstants.Avatar.M,
+              flexDirection: 'row',
+              flexWrap: 'wrap'
+            }}
+          >
+            {conversation.accounts.slice(0, 4).map(account => (
+              <GracefullyImage
+                key={account.id}
+                uri={{ original: account.avatar, static: account.avatar_static }}
+                dimension={{
+                  width: StyleConstants.Avatar.M,
+                  height:
+                    conversation.accounts.length > 2
+                      ? StyleConstants.Avatar.M / 2
+                      : StyleConstants.Avatar.M
+                }}
+                style={{ flex: 1, flexBasis: '50%' }}
+              />
+            ))}
+          </View>
+          <TimelineHeaderConversation conversation={conversation} />
         </View>
 
         {conversation.last_status ? (
@@ -120,40 +102,19 @@ const TimelineConversation = React.memo(
             <View
               style={{
                 paddingTop: highlighted ? StyleConstants.Spacing.S : 0,
-                paddingLeft: highlighted
-                  ? 0
-                  : StyleConstants.Avatar.M + StyleConstants.Spacing.S
+                paddingLeft: highlighted ? 0 : StyleConstants.Avatar.M + StyleConstants.Spacing.S
               }}
             >
-              <TimelineContent
-                status={conversation.last_status}
-                highlighted={highlighted}
-              />
-              {conversation.last_status.poll ? (
-                <TimelinePoll
-                  queryKey={queryKey}
-                  statusId={conversation.last_status.id}
-                  poll={conversation.last_status.poll}
-                  reblog={false}
-                  sameAccount={
-                    conversation.last_status.id === instanceAccount?.id
-                  }
-                />
-              ) : null}
+              <TimelineContent />
+              <TimelinePoll />
             </View>
-            <TimelineActions
-              queryKey={queryKey}
-              status={conversation.last_status}
-              highlighted={highlighted}
-              accts={conversation.accounts.map(account => account.acct)}
-              reblog={false}
-            />
+
+            <TimelineActions />
           </>
         ) : null}
       </Pressable>
-    )
-  },
-  (prev, next) => isEqual(prev.conversation, next.conversation)
-)
+    </StatusContext.Provider>
+  )
+}
 
 export default TimelineConversation
diff --git a/src/components/Timeline/Default.tsx b/src/components/Timeline/Default.tsx
index 7660f6a3..65b9d33d 100644
--- a/src/components/Timeline/Default.tsx
+++ b/src/components/Timeline/Default.tsx
@@ -16,11 +16,11 @@ import { QueryKeyTimeline } from '@utils/queryHooks/timeline'
 import { getInstanceAccount } from '@utils/slices/instancesSlice'
 import { StyleConstants } from '@utils/styles/constants'
 import { useTheme } from '@utils/styles/ThemeManager'
-import { uniqBy } from 'lodash'
-import React, { useRef } from 'react'
+import React, { useRef, useState } from 'react'
 import { Pressable, StyleProp, View, ViewStyle } from 'react-native'
 import { useSelector } from 'react-redux'
 import * as ContextMenu from 'zeego/context-menu'
+import StatusContext from './Shared/Context'
 import TimelineFeedback from './Shared/Feedback'
 import TimelineFiltered, { shouldFilter } from './Shared/Filtered'
 import TimelineFullConversation from './Shared/FullConversation'
@@ -46,31 +46,28 @@ const TimelineDefault: React.FC<Props> = ({
   disableOnPress = false
 }) => {
   const { colors } = useTheme()
-  const instanceAccount = useSelector(getInstanceAccount, () => true)
   const navigation = useNavigation<StackNavigationProp<TabLocalStackParamList>>()
 
-  const actualStatus = item.reblog ? item.reblog : item
-
-  const ownAccount = actualStatus.account?.id === instanceAccount?.id
+  const instanceAccount = useSelector(getInstanceAccount, () => true)
 
+  const status = item.reblog ? item.reblog : item
+  const ownAccount = status.account?.id === instanceAccount?.id
+  const [spoilerExpanded, setSpoilerExpanded] = useState(
+    instanceAccount.preferences['reading:expand:spoilers'] || false
+  )
+  const spoilerHidden = status.spoiler_text?.length
+    ? !instanceAccount.preferences['reading:expand:spoilers'] && !spoilerExpanded
+    : false
   const copiableContent = useRef<{ content: string; complete: boolean }>({
     content: '',
     complete: false
   })
 
-  const filtered = queryKey && shouldFilter({ copiableContent, status: actualStatus, queryKey })
+  const filtered = queryKey && shouldFilter({ copiableContent, status, queryKey })
   if (queryKey && filtered && !highlighted) {
     return <TimelineFiltered phrase={filtered} />
   }
 
-  const onPress = () => {
-    if (highlighted) return
-    navigation.push('Tab-Shared-Toot', {
-      toot: actualStatus,
-      rootQueryKey: queryKey
-    })
-  }
-
   const mainStyle: StyleProp<ViewStyle> = {
     padding: StyleConstants.Spacing.Global.PagePadding,
     backgroundColor: colors.backgroundDefault,
@@ -79,24 +76,14 @@ const TimelineDefault: React.FC<Props> = ({
   const main = () => (
     <>
       {item.reblog ? (
-        <TimelineActioned action='reblog' account={item.account} />
+        <TimelineActioned action='reblog' />
       ) : item._pinned ? (
-        <TimelineActioned action='pinned' account={item.account} />
+        <TimelineActioned action='pinned' />
       ) : null}
 
       <View style={{ flex: 1, width: '100%', flexDirection: 'row' }}>
-        <TimelineAvatar
-          queryKey={disableOnPress ? undefined : queryKey}
-          account={actualStatus.account}
-          highlighted={highlighted}
-        />
-        <TimelineHeaderDefault
-          queryKey={disableOnPress ? undefined : queryKey}
-          rootQueryKey={rootQueryKey}
-          status={actualStatus}
-          highlighted={highlighted}
-          copiableContent={copiableContent}
-        />
+        <TimelineAvatar />
+        <TimelineHeaderDefault />
       </View>
 
       <View
@@ -105,120 +92,103 @@ const TimelineDefault: React.FC<Props> = ({
           paddingLeft: highlighted ? 0 : StyleConstants.Avatar.M + StyleConstants.Spacing.S
         }}
       >
-        {typeof actualStatus.content === 'string' && actualStatus.content.length > 0 ? (
-          <TimelineContent
-            status={actualStatus}
-            highlighted={highlighted}
-            disableDetails={disableDetails}
-          />
-        ) : null}
-        {queryKey && actualStatus.poll ? (
-          <TimelinePoll
-            queryKey={queryKey}
-            rootQueryKey={rootQueryKey}
-            statusId={actualStatus.id}
-            poll={actualStatus.poll}
-            reblog={item.reblog ? true : false}
-            sameAccount={ownAccount}
-          />
-        ) : null}
-        {!disableDetails &&
-        Array.isArray(actualStatus.media_attachments) &&
-        actualStatus.media_attachments.length ? (
-          <TimelineAttachment status={actualStatus} />
-        ) : null}
-        {!disableDetails && actualStatus.card ? <TimelineCard card={actualStatus.card} /> : null}
-        {!disableDetails ? (
-          <TimelineFullConversation queryKey={queryKey} status={actualStatus} />
-        ) : null}
-        <TimelineTranslate status={actualStatus} highlighted={highlighted} />
-        <TimelineFeedback status={actualStatus} highlighted={highlighted} />
+        <TimelineContent setSpoilerExpanded={setSpoilerExpanded} />
+        <TimelinePoll />
+        <TimelineAttachment />
+        <TimelineCard />
+        <TimelineFullConversation />
+        <TimelineTranslate />
+        <TimelineFeedback />
       </View>
 
-      {queryKey && !disableDetails ? (
-        <TimelineActions
-          queryKey={queryKey}
-          rootQueryKey={rootQueryKey}
-          highlighted={highlighted}
-          status={actualStatus}
-          ownAccount={ownAccount}
-          accts={uniqBy(
-            ([actualStatus.account] as Mastodon.Account[] & Mastodon.Mention[])
-              .concat(actualStatus.mentions)
-              .filter(d => d?.id !== instanceAccount?.id),
-            d => d?.id
-          ).map(d => d?.acct)}
-          reblog={item.reblog ? true : false}
-        />
-      ) : null}
+      <TimelineActions />
     </>
   )
 
   const mShare = menuShare({
-    visibility: actualStatus.visibility,
+    visibility: status.visibility,
     type: 'status',
-    url: actualStatus.url || actualStatus.uri,
+    url: status.url || status.uri,
     copiableContent
   })
-  const mStatus = menuStatus({ status: actualStatus, queryKey, rootQueryKey })
-  const mInstance = menuInstance({ status: actualStatus, queryKey, rootQueryKey })
+  const mStatus = menuStatus({ status, queryKey, rootQueryKey })
+  const mInstance = menuInstance({ status, queryKey, rootQueryKey })
 
-  return disableOnPress ? (
-    <View style={mainStyle}>{main()}</View>
-  ) : (
-    <>
-      <ContextMenu.Root>
-        <ContextMenu.Trigger>
-          <Pressable
-            accessible={highlighted ? false : true}
-            style={mainStyle}
-            onPress={onPress}
-            onLongPress={() => {}}
-            children={main()}
-          />
-        </ContextMenu.Trigger>
+  return (
+    <StatusContext.Provider
+      value={{
+        queryKey,
+        rootQueryKey,
+        status,
+        isReblog: !!item.reblog,
+        ownAccount,
+        spoilerHidden,
+        copiableContent,
+        highlighted,
+        disableDetails,
+        disableOnPress
+      }}
+    >
+      {disableOnPress ? (
+        <View style={mainStyle}>{main()}</View>
+      ) : (
+        <>
+          <ContextMenu.Root>
+            <ContextMenu.Trigger>
+              <Pressable
+                accessible={highlighted ? false : true}
+                style={mainStyle}
+                disabled={highlighted}
+                onPress={() =>
+                  navigation.push('Tab-Shared-Toot', {
+                    toot: status,
+                    rootQueryKey: queryKey
+                  })
+                }
+                onLongPress={() => {}}
+                children={main()}
+              />
+            </ContextMenu.Trigger>
 
-        <ContextMenu.Content>
-          {mShare.map((mGroup, index) => (
-            <ContextMenu.Group key={index}>
-              {mGroup.map(menu => (
-                <ContextMenu.Item key={menu.key} {...menu.item}>
-                  <ContextMenu.ItemTitle children={menu.title} />
-                  <ContextMenu.ItemIcon iosIconName={menu.icon} />
-                </ContextMenu.Item>
+            <ContextMenu.Content>
+              {mShare.map((mGroup, index) => (
+                <ContextMenu.Group key={index}>
+                  {mGroup.map(menu => (
+                    <ContextMenu.Item key={menu.key} {...menu.item}>
+                      <ContextMenu.ItemTitle children={menu.title} />
+                      <ContextMenu.ItemIcon iosIconName={menu.icon} />
+                    </ContextMenu.Item>
+                  ))}
+                </ContextMenu.Group>
               ))}
-            </ContextMenu.Group>
-          ))}
 
-          {mStatus.map((mGroup, index) => (
-            <ContextMenu.Group key={index}>
-              {mGroup.map(menu => (
-                <ContextMenu.Item key={menu.key} {...menu.item}>
-                  <ContextMenu.ItemTitle children={menu.title} />
-                  <ContextMenu.ItemIcon iosIconName={menu.icon} />
-                </ContextMenu.Item>
+              {mStatus.map((mGroup, index) => (
+                <ContextMenu.Group key={index}>
+                  {mGroup.map(menu => (
+                    <ContextMenu.Item key={menu.key} {...menu.item}>
+                      <ContextMenu.ItemTitle children={menu.title} />
+                      <ContextMenu.ItemIcon iosIconName={menu.icon} />
+                    </ContextMenu.Item>
+                  ))}
+                </ContextMenu.Group>
               ))}
-            </ContextMenu.Group>
-          ))}
 
-          {mInstance.map((mGroup, index) => (
-            <ContextMenu.Group key={index}>
-              {mGroup.map(menu => (
-                <ContextMenu.Item key={menu.key} {...menu.item}>
-                  <ContextMenu.ItemTitle children={menu.title} />
-                  <ContextMenu.ItemIcon iosIconName={menu.icon} />
-                </ContextMenu.Item>
+              {mInstance.map((mGroup, index) => (
+                <ContextMenu.Group key={index}>
+                  {mGroup.map(menu => (
+                    <ContextMenu.Item key={menu.key} {...menu.item}>
+                      <ContextMenu.ItemTitle children={menu.title} />
+                      <ContextMenu.ItemIcon iosIconName={menu.icon} />
+                    </ContextMenu.Item>
+                  ))}
+                </ContextMenu.Group>
               ))}
-            </ContextMenu.Group>
-          ))}
-        </ContextMenu.Content>
-      </ContextMenu.Root>
-      <TimelineHeaderAndroid
-        queryKey={disableOnPress ? undefined : queryKey}
-        rootQueryKey={rootQueryKey}
-        status={actualStatus}
-      />
-    </>
+            </ContextMenu.Content>
+          </ContextMenu.Root>
+          <TimelineHeaderAndroid />
+        </>
+      )}
+    </StatusContext.Provider>
   )
 }
 
diff --git a/src/components/Timeline/Notifications.tsx b/src/components/Timeline/Notifications.tsx
index 848896e2..802ae3d5 100644
--- a/src/components/Timeline/Notifications.tsx
+++ b/src/components/Timeline/Notifications.tsx
@@ -16,11 +16,11 @@ import { QueryKeyTimeline } from '@utils/queryHooks/timeline'
 import { getInstanceAccount } from '@utils/slices/instancesSlice'
 import { StyleConstants } from '@utils/styles/constants'
 import { useTheme } from '@utils/styles/ThemeManager'
-import { uniqBy } from 'lodash'
-import React, { useCallback, useRef } from 'react'
+import React, { useCallback, useRef, useState } from 'react'
 import { Pressable, View } from 'react-native'
 import { useSelector } from 'react-redux'
 import * as ContextMenu from 'zeego/context-menu'
+import StatusContext from './Shared/Context'
 import TimelineFiltered, { shouldFilter } from './Shared/Filtered'
 import TimelineFullConversation from './Shared/FullConversation'
 import TimelineHeaderAndroid from './Shared/HeaderAndroid'
@@ -36,6 +36,17 @@ const TimelineNotifications: React.FC<Props> = ({
   queryKey,
   highlighted = false
 }) => {
+  const instanceAccount = useSelector(getInstanceAccount, () => true)
+
+  const status = notification.status
+  const account = notification.status ? notification.status.account : notification.account
+  const ownAccount = notification.account?.id === instanceAccount?.id
+  const [spoilerExpanded, setSpoilerExpanded] = useState(
+    instanceAccount.preferences['reading:expand:spoilers'] || false
+  )
+  const spoilerHidden = notification.status?.spoiler_text?.length
+    ? !instanceAccount.preferences['reading:expand:spoilers'] && !spoilerExpanded
+    : false
   const copiableContent = useRef<{ content: string; complete: boolean }>({
     content: '',
     complete: false
@@ -53,11 +64,8 @@ const TimelineNotifications: React.FC<Props> = ({
   }
 
   const { colors } = useTheme()
-  const instanceAccount = useSelector(getInstanceAccount, (prev, next) => prev?.id === next?.id)
   const navigation = useNavigation<StackNavigationProp<TabLocalStackParamList>>()
 
-  const actualAccount = notification.status ? notification.status.account : notification.account
-
   const onPress = useCallback(() => {
     notification.status &&
       navigation.push('Tab-Shared-Toot', {
@@ -70,11 +78,7 @@ const TimelineNotifications: React.FC<Props> = ({
     return (
       <>
         {notification.type !== 'mention' ? (
-          <TimelineActioned
-            action={notification.type}
-            account={notification.account}
-            notification
-          />
+          <TimelineActioned action={notification.type} isNotification account={account} />
         ) : null}
 
         <View
@@ -89,8 +93,8 @@ const TimelineNotifications: React.FC<Props> = ({
           }}
         >
           <View style={{ flex: 1, width: '100%', flexDirection: 'row' }}>
-            <TimelineAvatar queryKey={queryKey} account={actualAccount} highlighted={highlighted} />
-            <TimelineHeaderNotification queryKey={queryKey} notification={notification} />
+            <TimelineAvatar account={account} />
+            <TimelineHeaderNotification notification={notification} />
           </View>
 
           {notification.status ? (
@@ -100,41 +104,16 @@ const TimelineNotifications: React.FC<Props> = ({
                 paddingLeft: highlighted ? 0 : StyleConstants.Avatar.M + StyleConstants.Spacing.S
               }}
             >
-              {notification.status.content.length > 0 ? (
-                <TimelineContent status={notification.status} highlighted={highlighted} />
-              ) : null}
-              {notification.status.poll ? (
-                <TimelinePoll
-                  queryKey={queryKey}
-                  statusId={notification.status.id}
-                  poll={notification.status.poll}
-                  reblog={false}
-                  sameAccount={notification.account.id === instanceAccount?.id}
-                />
-              ) : null}
-              {notification.status.media_attachments.length > 0 ? (
-                <TimelineAttachment status={notification.status} />
-              ) : null}
-              {notification.status.card ? <TimelineCard card={notification.status.card} /> : null}
-              <TimelineFullConversation queryKey={queryKey} status={notification.status} />
+              <TimelineContent setSpoilerExpanded={setSpoilerExpanded} />
+              <TimelinePoll />
+              <TimelineAttachment />
+              <TimelineCard />
+              <TimelineFullConversation />
             </View>
           ) : null}
         </View>
 
-        {notification.status ? (
-          <TimelineActions
-            queryKey={queryKey}
-            status={notification.status}
-            highlighted={highlighted}
-            accts={uniqBy(
-              ([notification.status.account] as Mastodon.Account[] & Mastodon.Mention[])
-                .concat(notification.status.mentions)
-                .filter(d => d?.id !== instanceAccount?.id),
-              d => d?.id
-            ).map(d => d?.acct)}
-            reblog={false}
-          />
-        ) : null}
+        <TimelineActions />
       </>
     )
   }
@@ -149,7 +128,17 @@ const TimelineNotifications: React.FC<Props> = ({
   const mInstance = menuInstance({ status: notification.status, queryKey })
 
   return (
-    <>
+    <StatusContext.Provider
+      value={{
+        queryKey,
+        status,
+        isReblog: !!status?.reblog,
+        ownAccount,
+        spoilerHidden,
+        copiableContent,
+        highlighted
+      }}
+    >
       <ContextMenu.Root>
         <ContextMenu.Trigger>
           <Pressable
@@ -199,8 +188,8 @@ const TimelineNotifications: React.FC<Props> = ({
           ))}
         </ContextMenu.Content>
       </ContextMenu.Root>
-      <TimelineHeaderAndroid queryKey={queryKey} status={notification.status} />
-    </>
+      <TimelineHeaderAndroid />
+    </StatusContext.Provider>
   )
 }
 
diff --git a/src/components/Timeline/Shared/Actioned.tsx b/src/components/Timeline/Shared/Actioned.tsx
index 32390eae..2a5c8f86 100644
--- a/src/components/Timeline/Shared/Actioned.tsx
+++ b/src/components/Timeline/Shared/Actioned.tsx
@@ -5,163 +5,164 @@ import { StackNavigationProp } from '@react-navigation/stack'
 import { TabLocalStackParamList } from '@utils/navigation/navigators'
 import { StyleConstants } from '@utils/styles/constants'
 import { useTheme } from '@utils/styles/ThemeManager'
-import React from 'react'
+import React, { useContext } from 'react'
 import { useTranslation } from 'react-i18next'
 import { Pressable, StyleSheet, View } from 'react-native'
+import StatusContext from './Context'
 
 export interface Props {
-  account: Mastodon.Account
-  action: Mastodon.Notification['type'] | ('reblog' | 'pinned')
-  notification?: boolean
+  action: Mastodon.Notification['type'] | 'reblog' | 'pinned'
+  isNotification?: boolean
+  account?: Mastodon.Account
 }
 
-const TimelineActioned = React.memo(
-  ({ account, action, notification = false }: Props) => {
-    const { t } = useTranslation('componentTimeline')
-    const { colors } = useTheme()
-    const navigation = useNavigation<StackNavigationProp<TabLocalStackParamList>>()
-    const name = account?.display_name || account?.username
-    const iconColor = colors.primaryDefault
+const TimelineActioned: React.FC<Props> = ({ action, isNotification, ...rest }) => {
+  const { status } = useContext(StatusContext)
+  const account = isNotification ? rest.account : status?.account
+  if (!status || !account) return null
 
-    const content = (content: string) => (
-      <ParseEmojis content={content} emojis={account.emojis} size='S' />
-    )
+  const { t } = useTranslation('componentTimeline')
+  const { colors } = useTheme()
+  const navigation = useNavigation<StackNavigationProp<TabLocalStackParamList>>()
+  const name = account?.display_name || account?.username
+  const iconColor = colors.primaryDefault
 
-    const onPress = () => navigation.push('Tab-Shared-Account', { account })
+  const content = (content: string) => (
+    <ParseEmojis content={content} emojis={account.emojis} size='S' />
+  )
 
-    const children = () => {
-      switch (action) {
-        case 'pinned':
-          return (
-            <>
-              <Icon
-                name='Anchor'
-                size={StyleConstants.Font.Size.S}
-                color={iconColor}
-                style={styles.icon}
-              />
-              {content(t('shared.actioned.pinned'))}
-            </>
-          )
-        case 'favourite':
-          return (
-            <>
-              <Icon
-                name='Heart'
-                size={StyleConstants.Font.Size.S}
-                color={iconColor}
-                style={styles.icon}
-              />
-              <Pressable onPress={onPress}>
-                {content(t('shared.actioned.favourite', { name }))}
-              </Pressable>
-            </>
-          )
-        case 'follow':
-          return (
-            <>
-              <Icon
-                name='UserPlus'
-                size={StyleConstants.Font.Size.S}
-                color={iconColor}
-                style={styles.icon}
-              />
-              <Pressable onPress={onPress}>
-                {content(t('shared.actioned.follow', { name }))}
-              </Pressable>
-            </>
-          )
-        case 'follow_request':
-          return (
-            <>
-              <Icon
-                name='UserPlus'
-                size={StyleConstants.Font.Size.S}
-                color={iconColor}
-                style={styles.icon}
-              />
-              <Pressable onPress={onPress}>
-                {content(t('shared.actioned.follow_request', { name }))}
-              </Pressable>
-            </>
-          )
-        case 'poll':
-          return (
-            <>
-              <Icon
-                name='BarChart2'
-                size={StyleConstants.Font.Size.S}
-                color={iconColor}
-                style={styles.icon}
-              />
-              {content(t('shared.actioned.poll'))}
-            </>
-          )
-        case 'reblog':
-          return (
-            <>
-              <Icon
-                name='Repeat'
-                size={StyleConstants.Font.Size.S}
-                color={iconColor}
-                style={styles.icon}
-              />
-              <Pressable onPress={onPress}>
-                {content(
-                  notification
-                    ? t('shared.actioned.reblog.notification', { name })
-                    : t('shared.actioned.reblog.default', { name })
-                )}
-              </Pressable>
-            </>
-          )
-        case 'status':
-          return (
-            <>
-              <Icon
-                name='Activity'
-                size={StyleConstants.Font.Size.S}
-                color={iconColor}
-                style={styles.icon}
-              />
-              <Pressable onPress={onPress}>
-                {content(t('shared.actioned.status', { name }))}
-              </Pressable>
-            </>
-          )
-        case 'update':
-          return (
-            <>
-              <Icon
-                name='BarChart2'
-                size={StyleConstants.Font.Size.S}
-                color={iconColor}
-                style={styles.icon}
-              />
-              {content(t('shared.actioned.update'))}
-            </>
-          )
-        default:
-          return <></>
-      }
+  const onPress = () => navigation.push('Tab-Shared-Account', { account })
+
+  const children = () => {
+    switch (action) {
+      case 'pinned':
+        return (
+          <>
+            <Icon
+              name='Anchor'
+              size={StyleConstants.Font.Size.S}
+              color={iconColor}
+              style={styles.icon}
+            />
+            {content(t('shared.actioned.pinned'))}
+          </>
+        )
+      case 'favourite':
+        return (
+          <>
+            <Icon
+              name='Heart'
+              size={StyleConstants.Font.Size.S}
+              color={iconColor}
+              style={styles.icon}
+            />
+            <Pressable onPress={onPress}>
+              {content(t('shared.actioned.favourite', { name }))}
+            </Pressable>
+          </>
+        )
+      case 'follow':
+        return (
+          <>
+            <Icon
+              name='UserPlus'
+              size={StyleConstants.Font.Size.S}
+              color={iconColor}
+              style={styles.icon}
+            />
+            <Pressable onPress={onPress}>
+              {content(t('shared.actioned.follow', { name }))}
+            </Pressable>
+          </>
+        )
+      case 'follow_request':
+        return (
+          <>
+            <Icon
+              name='UserPlus'
+              size={StyleConstants.Font.Size.S}
+              color={iconColor}
+              style={styles.icon}
+            />
+            <Pressable onPress={onPress}>
+              {content(t('shared.actioned.follow_request', { name }))}
+            </Pressable>
+          </>
+        )
+      case 'poll':
+        return (
+          <>
+            <Icon
+              name='BarChart2'
+              size={StyleConstants.Font.Size.S}
+              color={iconColor}
+              style={styles.icon}
+            />
+            {content(t('shared.actioned.poll'))}
+          </>
+        )
+      case 'reblog':
+        return (
+          <>
+            <Icon
+              name='Repeat'
+              size={StyleConstants.Font.Size.S}
+              color={iconColor}
+              style={styles.icon}
+            />
+            <Pressable onPress={onPress}>
+              {content(
+                isNotification
+                  ? t('shared.actioned.reblog.notification', { name })
+                  : t('shared.actioned.reblog.default', { name })
+              )}
+            </Pressable>
+          </>
+        )
+      case 'status':
+        return (
+          <>
+            <Icon
+              name='Activity'
+              size={StyleConstants.Font.Size.S}
+              color={iconColor}
+              style={styles.icon}
+            />
+            <Pressable onPress={onPress}>
+              {content(t('shared.actioned.status', { name }))}
+            </Pressable>
+          </>
+        )
+      case 'update':
+        return (
+          <>
+            <Icon
+              name='BarChart2'
+              size={StyleConstants.Font.Size.S}
+              color={iconColor}
+              style={styles.icon}
+            />
+            {content(t('shared.actioned.update'))}
+          </>
+        )
+      default:
+        return <></>
     }
+  }
 
-    return (
-      <View
-        style={{
-          flexDirection: 'row',
-          alignItems: 'center',
-          marginBottom: StyleConstants.Spacing.S,
-          paddingLeft: StyleConstants.Avatar.M - StyleConstants.Font.Size.S,
-          paddingRight: StyleConstants.Spacing.Global.PagePadding
-        }}
-      >
-        {children()}
-      </View>
-    )
-  },
-  () => true
-)
+  return (
+    <View
+      style={{
+        flexDirection: 'row',
+        alignItems: 'center',
+        marginBottom: StyleConstants.Spacing.S,
+        paddingLeft: StyleConstants.Avatar.M - StyleConstants.Font.Size.S,
+        paddingRight: StyleConstants.Spacing.Global.PagePadding
+      }}
+      children={children()}
+    />
+  )
+}
 
 const styles = StyleSheet.create({
   icon: {
diff --git a/src/components/Timeline/Shared/Actions.tsx b/src/components/Timeline/Shared/Actions.tsx
index 7300935d..511cbaa9 100644
--- a/src/components/Timeline/Shared/Actions.tsx
+++ b/src/components/Timeline/Shared/Actions.tsx
@@ -10,32 +10,22 @@ import {
   QueryKeyTimeline,
   useTimelineMutation
 } from '@utils/queryHooks/timeline'
+import { getInstanceAccount } from '@utils/slices/instancesSlice'
 import { StyleConstants } from '@utils/styles/constants'
 import { useTheme } from '@utils/styles/ThemeManager'
-import React, { useCallback, useMemo } from 'react'
+import { uniqBy } from 'lodash'
+import React, { useCallback, useContext, useMemo } from 'react'
 import { useTranslation } from 'react-i18next'
 import { Pressable, StyleSheet, View } from 'react-native'
 import { useQueryClient } from 'react-query'
+import { useSelector } from 'react-redux'
+import StatusContext from './Context'
 
-export interface Props {
-  queryKey: QueryKeyTimeline
-  rootQueryKey?: QueryKeyTimeline
-  highlighted: boolean
-  status: Mastodon.Status
-  ownAccount?: boolean
-  accts: Mastodon.Account['acct'][] // When replying to conversations
-  reblog: boolean
-}
+const TimelineActions: React.FC = () => {
+  const { queryKey, rootQueryKey, status, isReblog, ownAccount, highlighted, disableDetails } =
+    useContext(StatusContext)
+  if (!queryKey || !status || disableDetails) return null
 
-const TimelineActions: React.FC<Props> = ({
-  queryKey,
-  rootQueryKey,
-  highlighted,
-  status,
-  ownAccount = false,
-  accts,
-  reblog
-}) => {
   const navigation = useNavigation<StackNavigationProp<RootStackParamList>>()
   const { t } = useTranslation('componentTimeline')
   const { colors, theme } = useTheme()
@@ -83,16 +73,21 @@ const TimelineActions: React.FC<Props> = ({
     }
   })
 
-  const onPressReply = useCallback(
-    () =>
-      navigation.navigate('Screen-Compose', {
-        type: 'reply',
-        incomingStatus: status,
-        accts,
-        queryKey
-      }),
-    [status.replies_count]
-  )
+  const instanceAccount = useSelector(getInstanceAccount, () => true)
+  const onPressReply = useCallback(() => {
+    const accts = uniqBy(
+      ([status.account] as Mastodon.Account[] & Mastodon.Mention[])
+        .concat(status.mentions)
+        .filter(d => d?.id !== instanceAccount?.id),
+      d => d?.id
+    ).map(d => d?.acct)
+    navigation.navigate('Screen-Compose', {
+      type: 'reply',
+      incomingStatus: status,
+      accts,
+      queryKey
+    })
+  }, [status.replies_count])
   const { showActionSheetWithOptions } = useActionSheet()
   const onPressReblog = useCallback(() => {
     if (!status.reblogged) {
@@ -114,7 +109,7 @@ const TimelineActions: React.FC<Props> = ({
                 queryKey,
                 rootQueryKey,
                 id: status.id,
-                reblog,
+                isReblog,
                 payload: {
                   property: 'reblogged',
                   currentValue: status.reblogged,
@@ -130,7 +125,7 @@ const TimelineActions: React.FC<Props> = ({
                 queryKey,
                 rootQueryKey,
                 id: status.id,
-                reblog,
+                isReblog,
                 payload: {
                   property: 'reblogged',
                   currentValue: status.reblogged,
@@ -149,7 +144,7 @@ const TimelineActions: React.FC<Props> = ({
         queryKey,
         rootQueryKey,
         id: status.id,
-        reblog,
+        isReblog,
         payload: {
           property: 'reblogged',
           currentValue: status.reblogged,
@@ -166,7 +161,7 @@ const TimelineActions: React.FC<Props> = ({
       queryKey,
       rootQueryKey,
       id: status.id,
-      reblog,
+      isReblog,
       payload: {
         property: 'favourited',
         currentValue: status.favourited,
@@ -181,7 +176,7 @@ const TimelineActions: React.FC<Props> = ({
       queryKey,
       rootQueryKey,
       id: status.id,
-      reblog,
+      isReblog,
       payload: {
         property: 'bookmarked',
         currentValue: status.bookmarked,
diff --git a/src/components/Timeline/Shared/Attachment.tsx b/src/components/Timeline/Shared/Attachment.tsx
index 60b98098..4ff5ab84 100644
--- a/src/components/Timeline/Shared/Attachment.tsx
+++ b/src/components/Timeline/Shared/Attachment.tsx
@@ -10,51 +10,140 @@ import { RootStackParamList } from '@utils/navigation/navigators'
 import { getInstanceAccount } from '@utils/slices/instancesSlice'
 import { StyleConstants } from '@utils/styles/constants'
 import layoutAnimation from '@utils/styles/layoutAnimation'
-import React, { useState } from 'react'
+import React, { useContext, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import { Pressable, View } from 'react-native'
 import { useSelector } from 'react-redux'
+import StatusContext from './Context'
 
-export interface Props {
-  status: Pick<Mastodon.Status, 'media_attachments' | 'sensitive'>
-}
+const TimelineAttachment = () => {
+  const { status, disableDetails } = useContext(StatusContext)
+  if (
+    !status ||
+    disableDetails ||
+    !Array.isArray(status.media_attachments) ||
+    !status.media_attachments.length
+  )
+    return null
 
-const TimelineAttachment = React.memo(
-  ({ status }: Props) => {
-    const { t } = useTranslation('componentTimeline')
+  const { t } = useTranslation('componentTimeline')
 
-    const account = useSelector(
-      getInstanceAccount,
-      (prev, next) =>
-        prev.preferences['reading:expand:media'] === next.preferences['reading:expand:media']
-    )
-    const defaultSensitive = () => {
-      switch (account.preferences['reading:expand:media']) {
-        case 'show_all':
-          return false
-        case 'hide_all':
-          return true
-        default:
-          return status.sensitive
-      }
+  const account = useSelector(
+    getInstanceAccount,
+    (prev, next) =>
+      prev.preferences['reading:expand:media'] === next.preferences['reading:expand:media']
+  )
+  const defaultSensitive = () => {
+    switch (account.preferences['reading:expand:media']) {
+      case 'show_all':
+        return false
+      case 'hide_all':
+        return true
+      default:
+        return status.sensitive
     }
-    const [sensitiveShown, setSensitiveShown] = useState(defaultSensitive())
+  }
+  const [sensitiveShown, setSensitiveShown] = useState(defaultSensitive())
 
-    // @ts-ignore
-    const imageUrls: RootStackParamList['Screen-ImagesViewer']['imageUrls'] =
-      status.media_attachments
-        .map(attachment => {
+  // @ts-ignore
+  const imageUrls: RootStackParamList['Screen-ImagesViewer']['imageUrls'] = status.media_attachments
+    .map(attachment => {
+      switch (attachment.type) {
+        case 'image':
+          return {
+            id: attachment.id,
+            preview_url: attachment.preview_url,
+            url: attachment.url,
+            remote_url: attachment.remote_url,
+            blurhash: attachment.blurhash,
+            width: attachment.meta?.original?.width,
+            height: attachment.meta?.original?.height
+          }
+        default:
+          if (
+            attachment.preview_url?.endsWith('.jpg') ||
+            attachment.preview_url?.endsWith('.jpeg') ||
+            attachment.preview_url?.endsWith('.png') ||
+            attachment.preview_url?.endsWith('.gif') ||
+            attachment.remote_url?.endsWith('.jpg') ||
+            attachment.remote_url?.endsWith('.jpeg') ||
+            attachment.remote_url?.endsWith('.png') ||
+            attachment.remote_url?.endsWith('.gif')
+          ) {
+            return {
+              id: attachment.id,
+              preview_url: attachment.preview_url,
+              url: attachment.url,
+              remote_url: attachment.remote_url,
+              blurhash: attachment.blurhash,
+              width: attachment.meta?.original?.width,
+              height: attachment.meta?.original?.height
+            }
+          }
+      }
+    })
+    .filter(i => i)
+  const navigation = useNavigation<StackNavigationProp<RootStackParamList>>()
+  const navigateToImagesViewer = (id: string) => {
+    navigation.navigate('Screen-ImagesViewer', { imageUrls, id })
+  }
+
+  return (
+    <View>
+      <View
+        style={{
+          marginTop: StyleConstants.Spacing.S,
+          flex: 1,
+          flexDirection: 'row',
+          flexWrap: 'wrap',
+          justifyContent: 'center',
+          alignContent: 'stretch'
+        }}
+      >
+        {status.media_attachments.map((attachment, index) => {
           switch (attachment.type) {
             case 'image':
-              return {
-                id: attachment.id,
-                preview_url: attachment.preview_url,
-                url: attachment.url,
-                remote_url: attachment.remote_url,
-                blurhash: attachment.blurhash,
-                width: attachment.meta?.original?.width,
-                height: attachment.meta?.original?.height
-              }
+              return (
+                <AttachmentImage
+                  key={index}
+                  total={status.media_attachments.length}
+                  index={index}
+                  sensitiveShown={sensitiveShown}
+                  image={attachment}
+                  navigateToImagesViewer={navigateToImagesViewer}
+                />
+              )
+            case 'video':
+              return (
+                <AttachmentVideo
+                  key={index}
+                  total={status.media_attachments.length}
+                  index={index}
+                  sensitiveShown={sensitiveShown}
+                  video={attachment}
+                />
+              )
+            case 'gifv':
+              return (
+                <AttachmentVideo
+                  key={index}
+                  total={status.media_attachments.length}
+                  index={index}
+                  sensitiveShown={sensitiveShown}
+                  video={attachment}
+                  gifv
+                />
+              )
+            case 'audio':
+              return (
+                <AttachmentAudio
+                  key={index}
+                  total={status.media_attachments.length}
+                  index={index}
+                  sensitiveShown={sensitiveShown}
+                  audio={attachment}
+                />
+              )
             default:
               if (
                 attachment.preview_url?.endsWith('.jpg') ||
@@ -66,176 +155,74 @@ const TimelineAttachment = React.memo(
                 attachment.remote_url?.endsWith('.png') ||
                 attachment.remote_url?.endsWith('.gif')
               ) {
-                return {
-                  id: attachment.id,
-                  preview_url: attachment.preview_url,
-                  url: attachment.url,
-                  remote_url: attachment.remote_url,
-                  blurhash: attachment.blurhash,
-                  width: attachment.meta?.original?.width,
-                  height: attachment.meta?.original?.height
-                }
-              }
-          }
-        })
-        .filter(i => i)
-    const navigation = useNavigation<StackNavigationProp<RootStackParamList>>()
-    const navigateToImagesViewer = (id: string) => {
-      navigation.navigate('Screen-ImagesViewer', { imageUrls, id })
-    }
-
-    return (
-      <View>
-        <View
-          style={{
-            marginTop: StyleConstants.Spacing.S,
-            flex: 1,
-            flexDirection: 'row',
-            flexWrap: 'wrap',
-            justifyContent: 'center',
-            alignContent: 'stretch'
-          }}
-        >
-          {status.media_attachments.map((attachment, index) => {
-            switch (attachment.type) {
-              case 'image':
                 return (
                   <AttachmentImage
                     key={index}
                     total={status.media_attachments.length}
                     index={index}
                     sensitiveShown={sensitiveShown}
+                    // @ts-ignore
                     image={attachment}
                     navigateToImagesViewer={navigateToImagesViewer}
                   />
                 )
-              case 'video':
+              } else {
                 return (
-                  <AttachmentVideo
+                  <AttachmentUnsupported
                     key={index}
                     total={status.media_attachments.length}
                     index={index}
                     sensitiveShown={sensitiveShown}
-                    video={attachment}
+                    attachment={attachment}
                   />
                 )
-              case 'gifv':
-                return (
-                  <AttachmentVideo
-                    key={index}
-                    total={status.media_attachments.length}
-                    index={index}
-                    sensitiveShown={sensitiveShown}
-                    video={attachment}
-                    gifv
-                  />
-                )
-              case 'audio':
-                return (
-                  <AttachmentAudio
-                    key={index}
-                    total={status.media_attachments.length}
-                    index={index}
-                    sensitiveShown={sensitiveShown}
-                    audio={attachment}
-                  />
-                )
-              default:
-                if (
-                  attachment.preview_url?.endsWith('.jpg') ||
-                  attachment.preview_url?.endsWith('.jpeg') ||
-                  attachment.preview_url?.endsWith('.png') ||
-                  attachment.preview_url?.endsWith('.gif') ||
-                  attachment.remote_url?.endsWith('.jpg') ||
-                  attachment.remote_url?.endsWith('.jpeg') ||
-                  attachment.remote_url?.endsWith('.png') ||
-                  attachment.remote_url?.endsWith('.gif')
-                ) {
-                  return (
-                    <AttachmentImage
-                      key={index}
-                      total={status.media_attachments.length}
-                      index={index}
-                      sensitiveShown={sensitiveShown}
-                      // @ts-ignore
-                      image={attachment}
-                      navigateToImagesViewer={navigateToImagesViewer}
-                    />
-                  )
-                } else {
-                  return (
-                    <AttachmentUnsupported
-                      key={index}
-                      total={status.media_attachments.length}
-                      index={index}
-                      sensitiveShown={sensitiveShown}
-                      attachment={attachment}
-                    />
-                  )
-                }
-            }
-          })}
-        </View>
+              }
+          }
+        })}
+      </View>
 
-        {defaultSensitive() &&
-          (sensitiveShown ? (
-            <Pressable
-              style={{
-                position: 'absolute',
-                width: '100%',
-                height: '100%',
-                flex: 1,
-                justifyContent: 'center',
-                alignItems: 'center'
-              }}
-            >
-              <Button
-                type='text'
-                content={t('shared.attachment.sensitive.button')}
-                overlay
-                onPress={() => {
-                  layoutAnimation()
-                  setSensitiveShown(false)
-                  haptics('Light')
-                }}
-              />
-            </Pressable>
-          ) : (
+      {defaultSensitive() &&
+        (sensitiveShown ? (
+          <Pressable
+            style={{
+              position: 'absolute',
+              width: '100%',
+              height: '100%',
+              flex: 1,
+              justifyContent: 'center',
+              alignItems: 'center'
+            }}
+          >
             <Button
-              type='icon'
-              content='EyeOff'
-              round
+              type='text'
+              content={t('shared.attachment.sensitive.button')}
               overlay
               onPress={() => {
-                setSensitiveShown(true)
+                layoutAnimation()
+                setSensitiveShown(false)
                 haptics('Light')
               }}
-              style={{
-                position: 'absolute',
-                top: StyleConstants.Spacing.S * 2,
-                left: StyleConstants.Spacing.S
-              }}
             />
-          ))}
-      </View>
-    )
-  },
-  (prev, next) => {
-    let isEqual = true
-
-    if (prev.status.media_attachments.length !== next.status.media_attachments.length) {
-      isEqual = false
-      return isEqual
-    }
-
-    prev.status.media_attachments.forEach((attachment, index) => {
-      if (attachment.preview_url !== next.status.media_attachments[index].preview_url) {
-        isEqual = false
-      }
-    })
-
-    return isEqual
-  }
-)
+          </Pressable>
+        ) : (
+          <Button
+            type='icon'
+            content='EyeOff'
+            round
+            overlay
+            onPress={() => {
+              setSensitiveShown(true)
+              haptics('Light')
+            }}
+            style={{
+              position: 'absolute',
+              top: StyleConstants.Spacing.S * 2,
+              left: StyleConstants.Spacing.S
+            }}
+          />
+        ))}
+    </View>
+  )
+}
 
 export default TimelineAttachment
diff --git a/src/components/Timeline/Shared/Avatar.tsx b/src/components/Timeline/Shared/Avatar.tsx
index a41e8a81..e9d6a052 100644
--- a/src/components/Timeline/Shared/Avatar.tsx
+++ b/src/components/Timeline/Shared/Avatar.tsx
@@ -2,37 +2,37 @@ import GracefullyImage from '@components/GracefullyImage'
 import { useNavigation } from '@react-navigation/native'
 import { StackNavigationProp } from '@react-navigation/stack'
 import { TabLocalStackParamList } from '@utils/navigation/navigators'
-import { QueryKeyTimeline } from '@utils/queryHooks/timeline'
 import { StyleConstants } from '@utils/styles/constants'
-import React, { useCallback } from 'react'
+import React, { useContext } from 'react'
 import { useTranslation } from 'react-i18next'
+import StatusContext from './Context'
 
 export interface Props {
-  queryKey?: QueryKeyTimeline
-  account: Mastodon.Account
-  highlighted: boolean
+  account?: Mastodon.Account
 }
 
-const TimelineAvatar = React.memo(({ queryKey, account, highlighted }: Props) => {
+const TimelineAvatar: React.FC<Props> = ({ account }) => {
+  const { status, highlighted, disableOnPress } = useContext(StatusContext)
+  const actualAccount = account || status?.account
+  if (!actualAccount) return null
+
   const { t } = useTranslation('componentTimeline')
   const navigation = useNavigation<StackNavigationProp<TabLocalStackParamList>>()
-  // Need to fix go back root
-  const onPress = useCallback(() => {
-    queryKey && navigation.push('Tab-Shared-Account', { account })
-  }, [])
 
   return (
     <GracefullyImage
       {...(highlighted && {
         accessibilityLabel: t('shared.avatar.accessibilityLabel', {
-          name: account.display_name
+          name: actualAccount.display_name
         }),
         accessibilityHint: t('shared.avatar.accessibilityHint', {
-          name: account.display_name
+          name: actualAccount.display_name
         })
       })}
-      onPress={onPress}
-      uri={{ original: account?.avatar, static: account?.avatar_static }}
+      onPress={() =>
+        !disableOnPress && navigation.push('Tab-Shared-Account', { account: actualAccount })
+      }
+      uri={{ original: actualAccount.avatar, static: actualAccount.avatar_static }}
       dimension={{
         width: StyleConstants.Avatar.M,
         height: StyleConstants.Avatar.M
@@ -44,6 +44,6 @@ const TimelineAvatar = React.memo(({ queryKey, account, highlighted }: Props) =>
       }}
     />
   )
-})
+}
 
 export default TimelineAvatar
diff --git a/src/components/Timeline/Shared/Card.tsx b/src/components/Timeline/Shared/Card.tsx
index d8f03112..31fcb1c9 100644
--- a/src/components/Timeline/Shared/Card.tsx
+++ b/src/components/Timeline/Shared/Card.tsx
@@ -9,23 +9,23 @@ import { useSearchQuery } from '@utils/queryHooks/search'
 import { useStatusQuery } from '@utils/queryHooks/status'
 import { StyleConstants } from '@utils/styles/constants'
 import { useTheme } from '@utils/styles/ThemeManager'
-import React, { useEffect, useState } from 'react'
-import { Pressable, StyleSheet, View } from 'react-native'
+import React, { useContext, useEffect, useState } from 'react'
+import { Pressable, StyleSheet, Text, View } from 'react-native'
 import { Circle } from 'react-native-animated-spinkit'
 import TimelineDefault from '../Default'
+import StatusContext from './Context'
 
-export interface Props {
-  card: Pick<Mastodon.Card, 'url' | 'image' | 'blurhash' | 'title' | 'description'>
-}
+const TimelineCard: React.FC = () => {
+  const { status, spoilerHidden, disableDetails } = useContext(StatusContext)
+  if (!status || !status.card) return null
 
-const TimelineCard = React.memo(({ card }: Props) => {
   const { colors } = useTheme()
   const navigation = useNavigation()
 
   const [loading, setLoading] = useState(false)
-  const isStatus = matchStatus(card.url)
+  const isStatus = matchStatus(status.card.url)
   const [foundStatus, setFoundStatus] = useState<Mastodon.Status>()
-  const isAccount = matchAccount(card.url)
+  const isAccount = matchAccount(status.card.url)
   const [foundAccount, setFoundAccount] = useState<Mastodon.Account>()
 
   const searchQuery = useSearchQuery({
@@ -38,7 +38,7 @@ const TimelineCard = React.memo(({ card }: Props) => {
         if (isStatus.sameInstance) {
           return
         } else {
-          return card.url
+          return status.card.url
         }
       }
       if (isAccount) {
@@ -49,7 +49,7 @@ const TimelineCard = React.memo(({ card }: Props) => {
             return isAccount.username
           }
         } else {
-          return card.url
+          return status.card.url
         }
       }
     })(),
@@ -136,10 +136,10 @@ const TimelineCard = React.memo(({ card }: Props) => {
     }
     return (
       <>
-        {card.image ? (
+        {status.card?.image ? (
           <GracefullyImage
-            uri={{ original: card.image }}
-            blurhash={card.blurhash}
+            uri={{ original: status.card.image }}
+            blurhash={status.card.blurhash}
             style={{ flexBasis: StyleConstants.Font.LineHeight.M * 5 }}
             imageStyle={{ borderTopLeftRadius: 6, borderBottomLeftRadius: 6 }}
           />
@@ -155,9 +155,9 @@ const TimelineCard = React.memo(({ card }: Props) => {
             fontWeight='Bold'
             testID='title'
           >
-            {card.title}
+            {status.card?.title}
           </CustomText>
-          {card.description ? (
+          {status.card?.description ? (
             <CustomText
               fontStyle='S'
               numberOfLines={1}
@@ -167,17 +167,19 @@ const TimelineCard = React.memo(({ card }: Props) => {
               }}
               testID='description'
             >
-              {card.description}
+              {status.card.description}
             </CustomText>
           ) : null}
           <CustomText fontStyle='S' numberOfLines={1} style={{ color: colors.secondary }}>
-            {card.url}
+            {status.card?.url}
           </CustomText>
         </View>
       </>
     )
   }
 
+  if (spoilerHidden || disableDetails) return null
+
   return (
     <Pressable
       accessible
@@ -192,10 +194,10 @@ const TimelineCard = React.memo(({ card }: Props) => {
         overflow: 'hidden',
         borderColor: colors.border
       }}
-      onPress={async () => await openLink(card.url, navigation)}
-      children={cardContent}
+      onPress={async () => status.card && (await openLink(status.card.url, navigation))}
+      children={cardContent()}
     />
   )
-})
+}
 
 export default TimelineCard
diff --git a/src/components/Timeline/Shared/Content.tsx b/src/components/Timeline/Shared/Content.tsx
index cfdbcbb7..5e2578a1 100644
--- a/src/components/Timeline/Shared/Content.tsx
+++ b/src/components/Timeline/Shared/Content.tsx
@@ -1,52 +1,36 @@
 import { ParseHTML } from '@components/Parse'
 import { getInstanceAccount } from '@utils/slices/instancesSlice'
-import React from 'react'
+import React, { useContext } from 'react'
 import { useTranslation } from 'react-i18next'
 import { useSelector } from 'react-redux'
+import StatusContext from './Context'
 
 export interface Props {
-  status: Pick<Mastodon.Status, 'content' | 'spoiler_text' | 'emojis'> & {
-    mentions?: Mastodon.Status['mentions']
-    tags?: Mastodon.Status['tags']
-  }
-  highlighted?: boolean
-  disableDetails?: boolean
+  setSpoilerExpanded?: React.Dispatch<React.SetStateAction<boolean>>
 }
 
-const TimelineContent = React.memo(
-  ({ status, highlighted = false, disableDetails = false }: Props) => {
-    const { t } = useTranslation('componentTimeline')
-    const instanceAccount = useSelector(getInstanceAccount, () => true)
+const TimelineContent: React.FC<Props> = ({ setSpoilerExpanded }) => {
+  const { status, highlighted, disableDetails } = useContext(StatusContext)
+  if (!status || typeof status.content !== 'string' || !status.content.length) return null
 
-    return (
-      <>
-        {status.spoiler_text ? (
-          <>
-            <ParseHTML
-              content={status.spoiler_text}
-              size={highlighted ? 'L' : 'M'}
-              adaptiveSize
-              emojis={status.emojis}
-              mentions={status.mentions}
-              tags={status.tags}
-              numberOfLines={999}
-              highlighted={highlighted}
-              disableDetails={disableDetails}
-            />
-            <ParseHTML
-              content={status.content}
-              size={highlighted ? 'L' : 'M'}
-              adaptiveSize
-              emojis={status.emojis}
-              mentions={status.mentions}
-              tags={status.tags}
-              numberOfLines={instanceAccount.preferences['reading:expand:spoilers'] ? 999 : 1}
-              expandHint={t('shared.content.expandHint')}
-              highlighted={highlighted}
-              disableDetails={disableDetails}
-            />
-          </>
-        ) : (
+  const { t } = useTranslation('componentTimeline')
+  const instanceAccount = useSelector(getInstanceAccount, () => true)
+
+  return (
+    <>
+      {status.spoiler_text?.length ? (
+        <>
+          <ParseHTML
+            content={status.spoiler_text}
+            size={highlighted ? 'L' : 'M'}
+            adaptiveSize
+            emojis={status.emojis}
+            mentions={status.mentions}
+            tags={status.tags}
+            numberOfLines={999}
+            highlighted={highlighted}
+            disableDetails={disableDetails}
+          />
           <ParseHTML
             content={status.content}
             size={highlighted ? 'L' : 'M'}
@@ -54,16 +38,27 @@ const TimelineContent = React.memo(
             emojis={status.emojis}
             mentions={status.mentions}
             tags={status.tags}
-            numberOfLines={highlighted ? 999 : undefined}
+            numberOfLines={instanceAccount.preferences['reading:expand:spoilers'] ? 999 : 1}
+            expandHint={t('shared.content.expandHint')}
+            setSpoilerExpanded={setSpoilerExpanded}
+            highlighted={highlighted}
             disableDetails={disableDetails}
           />
-        )}
-      </>
-    )
-  },
-  (prev, next) =>
-    prev.status.content === next.status.content &&
-    prev.status.spoiler_text === next.status.spoiler_text
-)
+        </>
+      ) : (
+        <ParseHTML
+          content={status.content}
+          size={highlighted ? 'L' : 'M'}
+          adaptiveSize
+          emojis={status.emojis}
+          mentions={status.mentions}
+          tags={status.tags}
+          numberOfLines={highlighted ? 999 : undefined}
+          disableDetails={disableDetails}
+        />
+      )}
+    </>
+  )
+}
 
 export default TimelineContent
diff --git a/src/components/Timeline/Shared/Context.tsx b/src/components/Timeline/Shared/Context.tsx
new file mode 100644
index 00000000..5447643b
--- /dev/null
+++ b/src/components/Timeline/Shared/Context.tsx
@@ -0,0 +1,24 @@
+import { QueryKeyTimeline } from '@utils/queryHooks/timeline'
+import { createContext } from 'react'
+
+type ContextType = {
+  queryKey?: QueryKeyTimeline
+  rootQueryKey?: QueryKeyTimeline
+
+  status?: Mastodon.Status
+
+  isReblog?: boolean
+  ownAccount?: boolean
+  spoilerHidden?: boolean
+  copiableContent?: React.MutableRefObject<{
+    content: string
+    complete: boolean
+  }>
+
+  highlighted?: boolean
+  disableDetails?: boolean
+  disableOnPress?: boolean
+}
+const StatusContext = createContext<ContextType>({} as ContextType)
+
+export default StatusContext
diff --git a/src/components/Timeline/Shared/Feedback.tsx b/src/components/Timeline/Shared/Feedback.tsx
index 0d2d11f4..8fa8f30a 100644
--- a/src/components/Timeline/Shared/Feedback.tsx
+++ b/src/components/Timeline/Shared/Feedback.tsx
@@ -5,103 +5,92 @@ import { TabLocalStackParamList } from '@utils/navigation/navigators'
 import { useStatusHistory } from '@utils/queryHooks/statusesHistory'
 import { StyleConstants } from '@utils/styles/constants'
 import { useTheme } from '@utils/styles/ThemeManager'
-import React from 'react'
+import React, { useContext } from 'react'
 import { useTranslation } from 'react-i18next'
 import { StyleSheet, View } from 'react-native'
+import StatusContext from './Context'
 
-export interface Props {
-  status: Pick<Mastodon.Status, 'id' | 'edited_at' | 'reblogs_count' | 'favourites_count'>
-  highlighted: boolean
-}
+const TimelineFeedback = () => {
+  const { status, highlighted } = useContext(StatusContext)
+  if (!status || !highlighted) return null
 
-const TimelineFeedback = React.memo(
-  ({ status, highlighted }: Props) => {
-    if (!highlighted) {
-      return null
-    }
+  const { t } = useTranslation('componentTimeline')
+  const { colors } = useTheme()
+  const navigation = useNavigation<StackNavigationProp<TabLocalStackParamList>>()
 
-    const { t } = useTranslation('componentTimeline')
-    const { colors } = useTheme()
-    const navigation = useNavigation<StackNavigationProp<TabLocalStackParamList>>()
+  const { data } = useStatusHistory({
+    id: status.id,
+    options: { enabled: status.edited_at !== undefined }
+  })
 
-    const { data } = useStatusHistory({
-      id: status.id,
-      options: { enabled: status.edited_at !== undefined }
-    })
-
-    return (
-      <View style={{ flexDirection: 'row', justifyContent: 'space-between' }}>
-        <View style={{ flexDirection: 'row' }}>
-          {status.reblogs_count > 0 ? (
-            <CustomText
-              accessibilityLabel={t('shared.actionsUsers.reblogged_by.accessibilityLabel', {
+  return (
+    <View style={{ flexDirection: 'row', justifyContent: 'space-between' }}>
+      <View style={{ flexDirection: 'row' }}>
+        {status.reblogs_count > 0 ? (
+          <CustomText
+            accessibilityLabel={t('shared.actionsUsers.reblogged_by.accessibilityLabel', {
+              count: status.reblogs_count
+            })}
+            accessibilityHint={t('shared.actionsUsers.reblogged_by.accessibilityHint')}
+            accessibilityRole='button'
+            style={[styles.text, { color: colors.blue }]}
+            onPress={() =>
+              navigation.push('Tab-Shared-Users', {
+                reference: 'statuses',
+                id: status.id,
+                type: 'reblogged_by',
                 count: status.reblogs_count
-              })}
-              accessibilityHint={t('shared.actionsUsers.reblogged_by.accessibilityHint')}
-              accessibilityRole='button'
-              style={[styles.text, { color: colors.blue }]}
-              onPress={() =>
-                navigation.push('Tab-Shared-Users', {
-                  reference: 'statuses',
-                  id: status.id,
-                  type: 'reblogged_by',
-                  count: status.reblogs_count
-                })
-              }
-            >
-              {t('shared.actionsUsers.reblogged_by.text', {
-                count: status.reblogs_count
-              })}
-            </CustomText>
-          ) : null}
-          {status.favourites_count > 0 ? (
-            <CustomText
-              accessibilityLabel={t('shared.actionsUsers.favourited_by.accessibilityLabel', {
-                count: status.reblogs_count
-              })}
-              accessibilityHint={t('shared.actionsUsers.favourited_by.accessibilityHint')}
-              accessibilityRole='button'
-              style={[styles.text, { color: colors.blue }]}
-              onPress={() =>
-                navigation.push('Tab-Shared-Users', {
-                  reference: 'statuses',
-                  id: status.id,
-                  type: 'favourited_by',
-                  count: status.favourites_count
-                })
-              }
-            >
-              {t('shared.actionsUsers.favourited_by.text', {
+              })
+            }
+          >
+            {t('shared.actionsUsers.reblogged_by.text', {
+              count: status.reblogs_count
+            })}
+          </CustomText>
+        ) : null}
+        {status.favourites_count > 0 ? (
+          <CustomText
+            accessibilityLabel={t('shared.actionsUsers.favourited_by.accessibilityLabel', {
+              count: status.reblogs_count
+            })}
+            accessibilityHint={t('shared.actionsUsers.favourited_by.accessibilityHint')}
+            accessibilityRole='button'
+            style={[styles.text, { color: colors.blue }]}
+            onPress={() =>
+              navigation.push('Tab-Shared-Users', {
+                reference: 'statuses',
+                id: status.id,
+                type: 'favourited_by',
                 count: status.favourites_count
-              })}
-            </CustomText>
-          ) : null}
-        </View>
-        <View>
-          {data && data.length > 1 ? (
-            <CustomText
-              accessibilityLabel={t('shared.actionsUsers.history.accessibilityLabel', {
-                count: data.length - 1
-              })}
-              accessibilityHint={t('shared.actionsUsers.history.accessibilityHint')}
-              accessibilityRole='button'
-              style={[styles.text, { marginRight: 0, color: colors.blue }]}
-              onPress={() => navigation.push('Tab-Shared-History', { id: status.id })}
-            >
-              {t('shared.actionsUsers.history.text', {
-                count: data.length - 1
-              })}
-            </CustomText>
-          ) : null}
-        </View>
+              })
+            }
+          >
+            {t('shared.actionsUsers.favourited_by.text', {
+              count: status.favourites_count
+            })}
+          </CustomText>
+        ) : null}
       </View>
-    )
-  },
-  (prev, next) =>
-    prev.status.edited_at === next.status.edited_at &&
-    prev.status.reblogs_count === next.status.reblogs_count &&
-    prev.status.favourites_count === next.status.favourites_count
-)
+      <View>
+        {data && data.length > 1 ? (
+          <CustomText
+            accessibilityLabel={t('shared.actionsUsers.history.accessibilityLabel', {
+              count: data.length - 1
+            })}
+            accessibilityHint={t('shared.actionsUsers.history.accessibilityHint')}
+            accessibilityRole='button'
+            style={[styles.text, { marginRight: 0, color: colors.blue }]}
+            onPress={() => navigation.push('Tab-Shared-History', { id: status.id })}
+          >
+            {t('shared.actionsUsers.history.text', {
+              count: data.length - 1
+            })}
+          </CustomText>
+        ) : null}
+      </View>
+    </View>
+  )
+}
 
 const styles = StyleSheet.create({
   text: {
diff --git a/src/components/Timeline/Shared/FullConversation.tsx b/src/components/Timeline/Shared/FullConversation.tsx
index 81fe3e06..8842ad77 100644
--- a/src/components/Timeline/Shared/FullConversation.tsx
+++ b/src/components/Timeline/Shared/FullConversation.tsx
@@ -1,39 +1,32 @@
 import CustomText from '@components/Text'
-import { QueryKeyTimeline } from '@utils/queryHooks/timeline'
 import { StyleConstants } from '@utils/styles/constants'
 import { useTheme } from '@utils/styles/ThemeManager'
-import React from 'react'
+import React, { useContext } from 'react'
 import { useTranslation } from 'react-i18next'
+import StatusContext from './Context'
 
-export interface Props {
-  queryKey?: QueryKeyTimeline
-  status: Mastodon.Status
+const TimelineFullConversation = () => {
+  const { queryKey, status, disableDetails } = useContext(StatusContext)
+  if (!status || disableDetails) return null
+
+  const { t } = useTranslation('componentTimeline')
+  const { colors } = useTheme()
+
+  return queryKey &&
+    queryKey[1].page !== 'Toot' &&
+    status.in_reply_to_account_id &&
+    (status.mentions.length === 0 ||
+      status.mentions.filter(mention => mention.id !== status.in_reply_to_account_id).length) ? (
+    <CustomText
+      fontStyle='S'
+      style={{
+        color: colors.blue,
+        marginTop: StyleConstants.Spacing.S
+      }}
+    >
+      {t('shared.fullConversation')}
+    </CustomText>
+  ) : null
 }
 
-const TimelineFullConversation = React.memo(
-  ({ queryKey, status }: Props) => {
-    const { t } = useTranslation('componentTimeline')
-    const { colors } = useTheme()
-
-    return queryKey &&
-      queryKey[1].page !== 'Toot' &&
-      status.in_reply_to_account_id &&
-      (status.mentions.length === 0 ||
-        status.mentions.filter(
-          mention => mention.id !== status.in_reply_to_account_id
-        ).length) ? (
-      <CustomText
-        fontStyle='S'
-        style={{
-          color: colors.blue,
-          marginTop: StyleConstants.Spacing.S
-        }}
-      >
-        {t('shared.fullConversation')}
-      </CustomText>
-    ) : null
-  },
-  () => true
-)
-
 export default TimelineFullConversation
diff --git a/src/components/Timeline/Shared/HeaderAndroid.tsx b/src/components/Timeline/Shared/HeaderAndroid.tsx
index e1034b10..204db6df 100644
--- a/src/components/Timeline/Shared/HeaderAndroid.tsx
+++ b/src/components/Timeline/Shared/HeaderAndroid.tsx
@@ -3,21 +3,18 @@ import menuInstance from '@components/contextMenu/instance'
 import menuShare from '@components/contextMenu/share'
 import menuStatus from '@components/contextMenu/status'
 import Icon from '@components/Icon'
-import { QueryKeyTimeline } from '@utils/queryHooks/timeline'
 import { StyleConstants } from '@utils/styles/constants'
 import { useTheme } from '@utils/styles/ThemeManager'
-import React, { useState } from 'react'
+import React, { useContext, useState } from 'react'
 import { Platform, View } from 'react-native'
 import * as DropdownMenu from 'zeego/dropdown-menu'
+import StatusContext from './Context'
 
-export interface Props {
-  queryKey?: QueryKeyTimeline
-  rootQueryKey?: QueryKeyTimeline
-  status?: Mastodon.Status
-}
+const TimelineHeaderAndroid: React.FC = () => {
+  const { queryKey, rootQueryKey, status, disableDetails, disableOnPress } =
+    useContext(StatusContext)
 
-const TimelineHeaderAndroid: React.FC<Props> = ({ queryKey, rootQueryKey, status }) => {
-  if (Platform.OS !== 'android' || !status) return null
+  if (Platform.OS !== 'android' || !status || disableDetails || disableOnPress) return null
 
   const { colors } = useTheme()
 
diff --git a/src/components/Timeline/Shared/HeaderConversation.tsx b/src/components/Timeline/Shared/HeaderConversation.tsx
index 1d5f7543..baa255d7 100644
--- a/src/components/Timeline/Shared/HeaderConversation.tsx
+++ b/src/components/Timeline/Shared/HeaderConversation.tsx
@@ -2,46 +2,25 @@ import Icon from '@components/Icon'
 import { displayMessage } from '@components/Message'
 import { ParseEmojis } from '@components/Parse'
 import CustomText from '@components/Text'
-import { QueryKeyTimeline, useTimelineMutation } from '@utils/queryHooks/timeline'
+import { useTimelineMutation } from '@utils/queryHooks/timeline'
 import { StyleConstants } from '@utils/styles/constants'
 import { useTheme } from '@utils/styles/ThemeManager'
-import React from 'react'
+import React, { useContext } from 'react'
 import { useTranslation } from 'react-i18next'
 import { Pressable, View } from 'react-native'
 import { useQueryClient } from 'react-query'
+import StatusContext from './Context'
 import HeaderSharedCreated from './HeaderShared/Created'
 import HeaderSharedMuted from './HeaderShared/Muted'
 
-const Names = ({ accounts }: { accounts: Mastodon.Account[] }) => {
-  const { t } = useTranslation('componentTimeline')
-  const { colors } = useTheme()
-
-  return (
-    <CustomText
-      numberOfLines={1}
-      style={{ ...StyleConstants.FontStyle.M, color: colors.secondary }}
-    >
-      <CustomText>{t('shared.header.conversation.withAccounts')}</CustomText>
-      {accounts.map((account, index) => (
-        <CustomText key={account.id} numberOfLines={1}>
-          {index !== 0 ? t('common:separator') : undefined}
-          <ParseEmojis
-            content={account.display_name || account.username}
-            emojis={account.emojis}
-            fontBold
-          />
-        </CustomText>
-      ))}
-    </CustomText>
-  )
-}
-
 export interface Props {
-  queryKey: QueryKeyTimeline
   conversation: Mastodon.Conversation
 }
 
-const HeaderConversation = ({ queryKey, conversation }: Props) => {
+const HeaderConversation = ({ conversation }: Props) => {
+  const { queryKey } = useContext(StatusContext)
+  if (!queryKey) return null
+
   const { colors, theme } = useTheme()
   const { t } = useTranslation('componentTimeline')
 
@@ -70,7 +49,22 @@ const HeaderConversation = ({ queryKey, conversation }: Props) => {
   return (
     <View style={{ flex: 1, flexDirection: 'row' }}>
       <View style={{ flex: 3 }}>
-        <Names accounts={conversation.accounts} />
+        <CustomText
+          numberOfLines={1}
+          style={{ ...StyleConstants.FontStyle.M, color: colors.secondary }}
+        >
+          <CustomText>{t('shared.header.conversation.withAccounts')}</CustomText>
+          {conversation.accounts.map((account, index) => (
+            <CustomText key={account.id} numberOfLines={1}>
+              {index !== 0 ? t('common:separator') : undefined}
+              <ParseEmojis
+                content={account.display_name || account.username}
+                emojis={account.emojis}
+                fontBold
+              />
+            </CustomText>
+          ))}
+        </CustomText>
         <View
           style={{
             flexDirection: 'row',
diff --git a/src/components/Timeline/Shared/HeaderDefault.tsx b/src/components/Timeline/Shared/HeaderDefault.tsx
index 3e0e7102..5d52636a 100644
--- a/src/components/Timeline/Shared/HeaderDefault.tsx
+++ b/src/components/Timeline/Shared/HeaderDefault.tsx
@@ -3,37 +3,24 @@ import menuInstance from '@components/contextMenu/instance'
 import menuShare from '@components/contextMenu/share'
 import menuStatus from '@components/contextMenu/status'
 import Icon from '@components/Icon'
-import { QueryKeyTimeline } from '@utils/queryHooks/timeline'
 import { StyleConstants } from '@utils/styles/constants'
 import { useTheme } from '@utils/styles/ThemeManager'
-import React, { useState } from 'react'
+import React, { useContext, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import { Platform, Pressable, View } from 'react-native'
 import * as DropdownMenu from 'zeego/dropdown-menu'
+import StatusContext from './Context'
 import HeaderSharedAccount from './HeaderShared/Account'
 import HeaderSharedApplication from './HeaderShared/Application'
 import HeaderSharedCreated from './HeaderShared/Created'
 import HeaderSharedMuted from './HeaderShared/Muted'
 import HeaderSharedVisibility from './HeaderShared/Visibility'
 
-export interface Props {
-  queryKey?: QueryKeyTimeline
-  rootQueryKey?: QueryKeyTimeline
-  status: Mastodon.Status
-  highlighted: boolean
-  copiableContent: React.MutableRefObject<{
-    content: string
-    complete: boolean
-  }>
-}
+const TimelineHeaderDefault: React.FC = () => {
+  const { queryKey, rootQueryKey, status, copiableContent, highlighted, disableDetails } =
+    useContext(StatusContext)
+  if (!status) return null
 
-const TimelineHeaderDefault: React.FC<Props> = ({
-  queryKey,
-  rootQueryKey,
-  status,
-  highlighted,
-  copiableContent
-}) => {
   const { colors } = useTheme()
   const { t } = useTranslation('componentContextMenu')
 
@@ -76,7 +63,7 @@ const TimelineHeaderDefault: React.FC<Props> = ({
         </View>
       </View>
 
-      {Platform.OS !== 'android' && queryKey ? (
+      {Platform.OS !== 'android' && !disableDetails ? (
         <Pressable
           accessibilityHint={t('accessibilityHint')}
           style={{ flex: 1, alignItems: 'center' }}
diff --git a/src/components/Timeline/Shared/HeaderNotification.tsx b/src/components/Timeline/Shared/HeaderNotification.tsx
index b29589d8..a7f6c312 100644
--- a/src/components/Timeline/Shared/HeaderNotification.tsx
+++ b/src/components/Timeline/Shared/HeaderNotification.tsx
@@ -4,40 +4,41 @@ import menuShare from '@components/contextMenu/share'
 import menuStatus from '@components/contextMenu/status'
 import Icon from '@components/Icon'
 import { RelationshipIncoming, RelationshipOutgoing } from '@components/Relationship'
-import { QueryKeyTimeline } from '@utils/queryHooks/timeline'
 import { StyleConstants } from '@utils/styles/constants'
 import { useTheme } from '@utils/styles/ThemeManager'
-import React, { useState } from 'react'
+import React, { useContext, useState } from 'react'
 import { Platform, Pressable, View } from 'react-native'
 import * as DropdownMenu from 'zeego/dropdown-menu'
+import StatusContext from './Context'
 import HeaderSharedAccount from './HeaderShared/Account'
 import HeaderSharedApplication from './HeaderShared/Application'
 import HeaderSharedCreated from './HeaderShared/Created'
 import HeaderSharedMuted from './HeaderShared/Muted'
 import HeaderSharedVisibility from './HeaderShared/Visibility'
 
-export interface Props {
-  queryKey: QueryKeyTimeline
+export type Props = {
   notification: Mastodon.Notification
 }
 
-const TimelineHeaderNotification = ({ queryKey, notification }: Props) => {
+const TimelineHeaderNotification: React.FC<Props> = ({ notification }) => {
+  const { queryKey, status } = useContext(StatusContext)
+
   const { colors } = useTheme()
 
   const [openChange, setOpenChange] = useState(false)
   const mShare = menuShare({
-    visibility: notification.status?.visibility,
+    visibility: status?.visibility,
     type: 'status',
-    url: notification.status?.url || notification.status?.uri
+    url: status?.url || status?.uri
   })
   const mAccount = menuAccount({
     type: 'status',
     openChange,
-    account: notification.status?.account,
+    account: status?.account,
     queryKey
   })
-  const mStatus = menuStatus({ status: notification.status, queryKey })
-  const mInstance = menuInstance({ status: notification.status, queryKey })
+  const mStatus = menuStatus({ status, queryKey })
+  const mInstance = menuInstance({ status, queryKey })
 
   const actions = () => {
     switch (notification.type) {
@@ -46,7 +47,7 @@ const TimelineHeaderNotification = ({ queryKey, notification }: Props) => {
       case 'follow_request':
         return <RelationshipIncoming id={notification.account.id} />
       default:
-        if (notification.status) {
+        if (status) {
           return (
             <Pressable
               style={{ flex: 1, alignItems: 'center' }}
diff --git a/src/components/Timeline/Shared/Poll.tsx b/src/components/Timeline/Shared/Poll.tsx
index b7b37d7a..339b2fc5 100644
--- a/src/components/Timeline/Shared/Poll.tsx
+++ b/src/components/Timeline/Shared/Poll.tsx
@@ -7,39 +7,28 @@ import RelativeTime from '@components/RelativeTime'
 import CustomText from '@components/Text'
 import {
   MutationVarsTimelineUpdateStatusProperty,
-  QueryKeyTimeline,
   useTimelineMutation
 } from '@utils/queryHooks/timeline'
 import updateStatusProperty from '@utils/queryHooks/timeline/updateStatusProperty'
 import { StyleConstants } from '@utils/styles/constants'
 import { useTheme } from '@utils/styles/ThemeManager'
 import { maxBy } from 'lodash'
-import React, { useCallback, useMemo, useState } from 'react'
+import React, { useCallback, useContext, useMemo, useState } from 'react'
 import { Trans, useTranslation } from 'react-i18next'
 import { Pressable, View } from 'react-native'
 import { useQueryClient } from 'react-query'
+import StatusContext from './Context'
 
-export interface Props {
-  queryKey: QueryKeyTimeline
-  rootQueryKey?: QueryKeyTimeline
-  statusId: Mastodon.Status['id']
-  poll: NonNullable<Mastodon.Status['poll']>
-  reblog: boolean
-  sameAccount: boolean
-}
+const TimelinePoll: React.FC = () => {
+  const { queryKey, rootQueryKey, status, isReblog, ownAccount, spoilerHidden, disableDetails } =
+    useContext(StatusContext)
+  if (!queryKey || !status || !status.poll) return null
+  const poll = status.poll
 
-const TimelinePoll: React.FC<Props> = ({
-  queryKey,
-  rootQueryKey,
-  statusId,
-  poll,
-  reblog,
-  sameAccount
-}) => {
   const { colors, theme } = useTheme()
   const { t, i18n } = useTranslation('componentTimeline')
 
-  const [allOptions, setAllOptions] = useState(new Array(poll.options.length).fill(false))
+  const [allOptions, setAllOptions] = useState(new Array(status.poll.options.length).fill(false))
 
   const queryClient = useQueryClient()
   const mutation = useTimelineMutation({
@@ -79,7 +68,7 @@ const TimelinePoll: React.FC<Props> = ({
 
   const pollButton = useMemo(() => {
     if (!poll.expired) {
-      if (!sameAccount && !poll.voted) {
+      if (!ownAccount && !poll.voted) {
         return (
           <View style={{ marginRight: StyleConstants.Spacing.S }}>
             <Button
@@ -88,8 +77,8 @@ const TimelinePoll: React.FC<Props> = ({
                   type: 'updateStatusProperty',
                   queryKey,
                   rootQueryKey,
-                  id: statusId,
-                  reblog,
+                  id: status.id,
+                  isReblog,
                   payload: {
                     property: 'poll',
                     id: poll.id,
@@ -114,8 +103,8 @@ const TimelinePoll: React.FC<Props> = ({
                   type: 'updateStatusProperty',
                   queryKey,
                   rootQueryKey,
-                  id: statusId,
-                  reblog,
+                  id: status.id,
+                  isReblog,
                   payload: {
                     property: 'poll',
                     id: poll.id,
@@ -258,6 +247,8 @@ const TimelinePoll: React.FC<Props> = ({
     }
   }
 
+  if (spoilerHidden || disableDetails) return null
+
   return (
     <View style={{ marginTop: StyleConstants.Spacing.M }}>
       {poll.expired || poll.voted ? pollBodyDisallow : pollBodyAllow}
diff --git a/src/components/Timeline/Shared/Translate.tsx b/src/components/Timeline/Shared/Translate.tsx
index 152b833a..55eb4c8d 100644
--- a/src/components/Timeline/Shared/Translate.tsx
+++ b/src/components/Timeline/Shared/Translate.tsx
@@ -5,131 +5,119 @@ import { useTranslateQuery } from '@utils/queryHooks/translate'
 import { StyleConstants } from '@utils/styles/constants'
 import { useTheme } from '@utils/styles/ThemeManager'
 import * as Localization from 'expo-localization'
-import React, { useEffect, useState } from 'react'
+import React, { useContext, useEffect, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import { Pressable } from 'react-native'
 import { Circle } from 'react-native-animated-spinkit'
 import detectLanguage from 'react-native-language-detection'
+import StatusContext from './Context'
 
-export interface Props {
-  highlighted: boolean
-  status: Pick<Mastodon.Status, 'language' | 'spoiler_text' | 'content' | 'emojis'>
-}
+const TimelineTranslate = () => {
+  const { status, highlighted } = useContext(StatusContext)
+  if (!status || !highlighted) return null
 
-const TimelineTranslate = React.memo(
-  ({ highlighted, status }: Props) => {
-    if (!highlighted) {
-      return null
+  const { t } = useTranslation('componentTimeline')
+  const { colors } = useTheme()
+
+  const text = status.spoiler_text ? [status.spoiler_text, status.content] : [status.content]
+
+  for (const i in text) {
+    for (const emoji of status.emojis) {
+      text[i] = text[i].replaceAll(`:${emoji.shortcode}:`, ' ')
     }
+    text[i] = text[i]
+      .replace(/(<([^>]+)>)/gi, ' ')
+      .replace(/@.*? /gi, ' ')
+      .replace(/#.*? /gi, ' ')
+      .replace(/http(s):\/\/.*? /gi, ' ')
+  }
 
-    const { t } = useTranslation('componentTimeline')
-    const { colors } = useTheme()
-
-    const text = status.spoiler_text ? [status.spoiler_text, status.content] : [status.content]
-
-    for (const i in text) {
-      for (const emoji of status.emojis) {
-        text[i] = text[i].replaceAll(`:${emoji.shortcode}:`, ' ')
-      }
-      text[i] = text[i]
-        .replace(/(<([^>]+)>)/gi, ' ')
-        .replace(/@.*? /gi, ' ')
-        .replace(/#.*? /gi, ' ')
-        .replace(/http(s):\/\/.*? /gi, ' ')
+  const [detectedLanguage, setDetectedLanguage] = useState<string>('')
+  useEffect(() => {
+    const detect = async () => {
+      const result = await detectLanguage(text.join(`\n\n`)).catch(() => {
+        // No need to log language detection failure
+      })
+      result?.detected && setDetectedLanguage(result.detected.slice(0, 2))
     }
+    detect()
+  }, [])
 
-    const [detectedLanguage, setDetectedLanguage] = useState<string>('')
-    useEffect(() => {
-      const detect = async () => {
-        const result = await detectLanguage(text.join(`\n\n`)).catch(() => {
-          // No need to log language detection failure
-        })
-        result?.detected && setDetectedLanguage(result.detected.slice(0, 2))
-      }
-      detect()
-    }, [])
+  const settingsLanguage = getLanguage()
+  const targetLanguage = settingsLanguage?.startsWith('en')
+    ? Localization.locale || settingsLanguage || 'en'
+    : settingsLanguage || Localization.locale || 'en'
 
-    const settingsLanguage = getLanguage()
-    const targetLanguage = settingsLanguage?.startsWith('en')
-      ? Localization.locale || settingsLanguage || 'en'
-      : settingsLanguage || Localization.locale || 'en'
+  const [enabled, setEnabled] = useState(false)
+  const { refetch, data, isLoading, isSuccess, isError } = useTranslateQuery({
+    source: detectedLanguage,
+    target: targetLanguage,
+    text,
+    options: { enabled }
+  })
 
-    const [enabled, setEnabled] = useState(false)
-    const { refetch, data, isLoading, isSuccess, isError } = useTranslateQuery({
-      source: detectedLanguage,
-      target: targetLanguage,
-      text,
-      options: { enabled }
-    })
+  if (!detectedLanguage) {
+    return null
+  }
+  if (Localization.locale.slice(0, 2).includes(detectedLanguage)) {
+    return null
+  }
+  if (settingsLanguage?.slice(0, 2).includes(detectedLanguage)) {
+    return null
+  }
 
-    if (!detectedLanguage) {
-      return null
-    }
-    if (Localization.locale.slice(0, 2).includes(detectedLanguage)) {
-      return null
-    }
-    if (settingsLanguage?.slice(0, 2).includes(detectedLanguage)) {
-      return null
-    }
-
-    return (
-      <>
-        <Pressable
-          style={{
-            flexDirection: 'row',
-            alignItems: 'center',
-            paddingVertical: StyleConstants.Spacing.S,
-            paddingBottom: isSuccess ? 0 : undefined
-          }}
-          onPress={() => {
-            if (enabled) {
-              if (!isSuccess) {
-                refetch()
-              }
-            } else {
-              setEnabled(true)
+  return (
+    <>
+      <Pressable
+        style={{
+          flexDirection: 'row',
+          alignItems: 'center',
+          paddingVertical: StyleConstants.Spacing.S,
+          paddingBottom: isSuccess ? 0 : undefined
+        }}
+        onPress={() => {
+          if (enabled) {
+            if (!isSuccess) {
+              refetch()
             }
+          } else {
+            setEnabled(true)
+          }
+        }}
+      >
+        <CustomText
+          fontStyle='M'
+          style={{
+            color: isLoading || isSuccess ? colors.secondary : isError ? colors.red : colors.blue
           }}
         >
-          <CustomText
-            fontStyle='M'
-            style={{
-              color: isLoading || isSuccess ? colors.secondary : isError ? colors.red : colors.blue
-            }}
-          >
-            {isError
-              ? t('shared.translate.failed')
-              : isSuccess
-              ? typeof data?.error === 'string'
-                ? t(`shared.translate.${data.error}`)
-                : t('shared.translate.succeed', {
-                    provider: data?.provider,
-                    source: data?.sourceLanguage
-                  })
-              : t('shared.translate.default')}
-          </CustomText>
-          <CustomText>
-            {__DEV__ ? ` Source: ${detectedLanguage}; Target: ${targetLanguage}` : undefined}
-          </CustomText>
-          {isLoading ? (
-            <Circle
-              size={StyleConstants.Font.Size.M}
-              color={colors.disabled}
-              style={{ marginLeft: StyleConstants.Spacing.S }}
-            />
-          ) : null}
-        </Pressable>
-        {data && data.error === undefined
-          ? data.text.map((d, i) => (
-              <ParseHTML key={i} content={d} size={'M'} numberOfLines={999} />
-            ))
-          : null}
-      </>
-    )
-  },
-  (prev, next) =>
-    prev.status.content === next.status.content &&
-    prev.status.spoiler_text === next.status.spoiler_text
-)
+          {isError
+            ? t('shared.translate.failed')
+            : isSuccess
+            ? typeof data?.error === 'string'
+              ? t(`shared.translate.${data.error}`)
+              : t('shared.translate.succeed', {
+                  provider: data?.provider,
+                  source: data?.sourceLanguage
+                })
+            : t('shared.translate.default')}
+        </CustomText>
+        <CustomText>
+          {__DEV__ ? ` Source: ${detectedLanguage}; Target: ${targetLanguage}` : undefined}
+        </CustomText>
+        {isLoading ? (
+          <Circle
+            size={StyleConstants.Font.Size.M}
+            color={colors.disabled}
+            style={{ marginLeft: StyleConstants.Spacing.S }}
+          />
+        ) : null}
+      </Pressable>
+      {data && data.error === undefined
+        ? data.text.map((d, i) => <ParseHTML key={i} content={d} size={'M'} numberOfLines={999} />)
+        : null}
+    </>
+  )
+}
 
 export default TimelineTranslate
diff --git a/src/utils/queryHooks/timeline.ts b/src/utils/queryHooks/timeline.ts
index fc3756b6..eff1113e 100644
--- a/src/utils/queryHooks/timeline.ts
+++ b/src/utils/queryHooks/timeline.ts
@@ -2,10 +2,7 @@ import apiInstance, { InstanceResponse } from '@api/instance'
 import haptics from '@components/haptics'
 import queryClient from '@helpers/queryClient'
 import { store } from '@root/store'
-import {
-  checkInstanceFeature,
-  getInstanceNotificationsFilter
-} from '@utils/slices/instancesSlice'
+import { checkInstanceFeature, getInstanceNotificationsFilter } from '@utils/slices/instancesSlice'
 import { AxiosError } from 'axios'
 import { uniqBy } from 'lodash'
 import {
@@ -30,10 +27,7 @@ export type QueryKeyTimeline = [
   }
 ]
 
-const queryFunction = async ({
-  queryKey,
-  pageParam
-}: QueryFunctionContext<QueryKeyTimeline>) => {
+const queryFunction = async ({ queryKey, pageParam }: QueryFunctionContext<QueryKeyTimeline>) => {
   const { page, account, hashtag, list, toot } = queryKey[1]
   let params: { [key: string]: string } = { ...pageParam }
 
@@ -65,9 +59,9 @@ const queryFunction = async ({
     case 'Notifications':
       const rootStore = store.getState()
       const notificationsFilter = getInstanceNotificationsFilter(rootStore)
-      const usePositiveFilter = checkInstanceFeature(
-        'notification_types_positive_filter'
-      )(rootStore)
+      const usePositiveFilter = checkInstanceFeature('notification_types_positive_filter')(
+        rootStore
+      )
       return apiInstance<Mastodon.Notification[]>({
         method: 'get',
         url: 'notifications',
@@ -99,9 +93,7 @@ const queryFunction = async ({
           }
         })
       } else {
-        const res1 = await apiInstance<
-          (Mastodon.Status & { _pinned: boolean })[]
-        >({
+        const res1 = await apiInstance<(Mastodon.Status & { _pinned: boolean })[]>({
           method: 'get',
           url: `accounts/${account}/statuses`,
           params: {
@@ -190,11 +182,7 @@ const queryFunction = async ({
         url: `statuses/${toot}/context`
       })
       return {
-        body: [
-          ...res2_1.body.ancestors,
-          res1_1.body,
-          ...res2_1.body.descendants
-        ]
+        body: [...res2_1.body.ancestors, res1_1.body, ...res2_1.body.descendants]
       }
     default:
       return Promise.reject()
@@ -207,10 +195,7 @@ const useTimelineQuery = ({
   options,
   ...queryKeyParams
 }: QueryKeyTimeline[1] & {
-  options?: UseInfiniteQueryOptions<
-    InstanceResponse<Mastodon.Status[]>,
-    AxiosError
-  >
+  options?: UseInfiniteQueryOptions<InstanceResponse<Mastodon.Status[]>, AxiosError>
 }) => {
   const queryKey: QueryKeyTimeline = ['Timeline', { ...queryKeyParams }]
   return useInfiniteQuery(queryKey, queryFunction, {
@@ -284,7 +269,7 @@ export type MutationVarsTimelineUpdateStatusProperty = {
   queryKey: QueryKeyTimeline
   rootQueryKey?: QueryKeyTimeline
   id: Mastodon.Status['id'] | Mastodon.Poll['id']
-  reblog?: boolean
+  isReblog?: boolean
   payload:
     | {
         property: 'bookmarked' | 'muted' | 'pinned'
@@ -384,9 +369,9 @@ const mutationFunction = async (params: MutationVarsTimeline) => {
           }
           return apiInstance<Mastodon.Status>({
             method: 'post',
-            url: `statuses/${params.id}/${
-              params.payload.currentValue ? 'un' : ''
-            }${MapPropertyToUrl[params.payload.property]}`,
+            url: `statuses/${params.id}/${params.payload.currentValue ? 'un' : ''}${
+              MapPropertyToUrl[params.payload.property]
+            }`,
             ...(params.payload.property === 'reblogged' && { body })
           })
       }
@@ -396,9 +381,9 @@ const mutationFunction = async (params: MutationVarsTimeline) => {
         case 'mute':
           return apiInstance<Mastodon.Account>({
             method: 'post',
-            url: `accounts/${params.id}/${
-              params.payload.currentValue ? 'un' : ''
-            }${params.payload.property}`
+            url: `accounts/${params.id}/${params.payload.currentValue ? 'un' : ''}${
+              params.payload.property
+            }`
           })
         case 'reports':
           return apiInstance<Mastodon.Account>({
@@ -455,8 +440,7 @@ const useTimelineMutation = ({
     ...(onMutate && {
       onMutate: params => {
         queryClient.cancelQueries(params.queryKey)
-        const oldData =
-          params.queryKey && queryClient.getQueryData(params.queryKey)
+        const oldData = params.queryKey && queryClient.getQueryData(params.queryKey)
 
         haptics('Light')
         switch (params.type) {
diff --git a/src/utils/queryHooks/timeline/update/status.ts b/src/utils/queryHooks/timeline/update/status.ts
index 086bc36f..c6b0b5f4 100644
--- a/src/utils/queryHooks/timeline/update/status.ts
+++ b/src/utils/queryHooks/timeline/update/status.ts
@@ -2,32 +2,27 @@ import { MutationVarsTimelineUpdateStatusProperty } from '@utils/queryHooks/time
 
 const updateStatus = ({
   item,
-  reblog,
+  isReblog,
   payload
 }: {
   item: Mastodon.Status
-  reblog?: boolean
+  isReblog?: boolean
   payload: MutationVarsTimelineUpdateStatusProperty['payload']
 }) => {
   switch (payload.property) {
     case 'poll':
-      if (reblog) {
+      if (isReblog) {
         item.reblog!.poll = payload.data
       } else {
         item.poll = payload.data
       }
       break
     default:
-      if (reblog) {
+      if (isReblog) {
         item.reblog![payload.property] =
-          typeof payload.currentValue === 'boolean'
-            ? !payload.currentValue
-            : true
+          typeof payload.currentValue === 'boolean' ? !payload.currentValue : true
         if (payload.propertyCount) {
-          if (
-            typeof payload.currentValue === 'boolean' &&
-            payload.currentValue
-          ) {
+          if (typeof payload.currentValue === 'boolean' && payload.currentValue) {
             item.reblog![payload.propertyCount] = payload.countValue - 1
           } else {
             item.reblog![payload.propertyCount] = payload.countValue + 1
@@ -35,14 +30,9 @@ const updateStatus = ({
         }
       } else {
         item[payload.property] =
-          typeof payload.currentValue === 'boolean'
-            ? !payload.currentValue
-            : true
+          typeof payload.currentValue === 'boolean' ? !payload.currentValue : true
         if (payload.propertyCount) {
-          if (
-            typeof payload.currentValue === 'boolean' &&
-            payload.currentValue
-          ) {
+          if (typeof payload.currentValue === 'boolean' && payload.currentValue) {
             item[payload.propertyCount] = payload.countValue - 1
           } else {
             item[payload.propertyCount] = payload.countValue + 1
diff --git a/src/utils/queryHooks/timeline/updateStatusProperty.ts b/src/utils/queryHooks/timeline/updateStatusProperty.ts
index 85d5e166..d0e1332f 100644
--- a/src/utils/queryHooks/timeline/updateStatusProperty.ts
+++ b/src/utils/queryHooks/timeline/updateStatusProperty.ts
@@ -1,9 +1,6 @@
 import queryClient from '@helpers/queryClient'
 import { InfiniteData } from 'react-query'
-import {
-  MutationVarsTimelineUpdateStatusProperty,
-  TimelineData
-} from '../timeline'
+import { MutationVarsTimelineUpdateStatusProperty, TimelineData } from '../timeline'
 import updateConversation from './update/conversation'
 import updateNotification from './update/notification'
 import updateStatus from './update/status'
@@ -12,12 +9,54 @@ const updateStatusProperty = ({
   queryKey,
   rootQueryKey,
   id,
-  reblog,
+  isReblog,
   payload
 }: MutationVarsTimelineUpdateStatusProperty) => {
-  queryClient.setQueryData<InfiniteData<TimelineData> | undefined>(
-    queryKey,
-    old => {
+  queryClient.setQueryData<InfiniteData<TimelineData> | undefined>(queryKey, old => {
+    if (old) {
+      let foundToot = false
+      old.pages = old.pages.map(page => {
+        // Skip rest of the pages if any toot is found
+        if (foundToot) {
+          return page
+        } else {
+          if (typeof (page.body as Mastodon.Conversation[])[0].unread === 'boolean') {
+            const items = page.body as Mastodon.Conversation[]
+            const tootIndex = items.findIndex(({ last_status }) => last_status?.id === id)
+            if (tootIndex >= 0) {
+              foundToot = true
+              updateConversation({ item: items[tootIndex], payload })
+            }
+            return page
+          } else if (typeof (page.body as Mastodon.Notification[])[0].type === 'string') {
+            const items = page.body as Mastodon.Notification[]
+            const tootIndex = items.findIndex(({ status }) => status?.id === id)
+            if (tootIndex >= 0) {
+              foundToot = true
+              updateNotification({ item: items[tootIndex], payload })
+            }
+          } else {
+            const items = page.body as Mastodon.Status[]
+            const tootIndex = isReblog
+              ? items.findIndex(({ reblog }) => reblog?.id === id)
+              : items.findIndex(toot => toot.id === id)
+            // if favourites page and notifications page, remove the item instead
+            if (tootIndex >= 0) {
+              foundToot = true
+              updateStatus({ item: items[tootIndex], isReblog, payload })
+            }
+          }
+
+          return page
+        }
+      })
+    }
+
+    return old
+  })
+
+  rootQueryKey &&
+    queryClient.setQueryData<InfiniteData<TimelineData> | undefined>(rootQueryKey, old => {
       if (old) {
         let foundToot = false
         old.pages = old.pages.map(page => {
@@ -25,39 +64,30 @@ const updateStatusProperty = ({
           if (foundToot) {
             return page
           } else {
-            if (
-              typeof (page.body as Mastodon.Conversation[])[0].unread ===
-              'boolean'
-            ) {
+            if (typeof (page.body as Mastodon.Conversation[])[0].unread === 'boolean') {
               const items = page.body as Mastodon.Conversation[]
-              const tootIndex = items.findIndex(
-                ({ last_status }) => last_status?.id === id
-              )
+              const tootIndex = items.findIndex(({ last_status }) => last_status?.id === id)
               if (tootIndex >= 0) {
                 foundToot = true
                 updateConversation({ item: items[tootIndex], payload })
               }
               return page
-            } else if (
-              typeof (page.body as Mastodon.Notification[])[0].type === 'string'
-            ) {
+            } else if (typeof (page.body as Mastodon.Notification[])[0].type === 'string') {
               const items = page.body as Mastodon.Notification[]
-              const tootIndex = items.findIndex(
-                ({ status }) => status?.id === id
-              )
+              const tootIndex = items.findIndex(({ status }) => status?.id === id)
               if (tootIndex >= 0) {
                 foundToot = true
                 updateNotification({ item: items[tootIndex], payload })
               }
             } else {
               const items = page.body as Mastodon.Status[]
-              const tootIndex = reblog
+              const tootIndex = isReblog
                 ? items.findIndex(({ reblog }) => reblog?.id === id)
                 : items.findIndex(toot => toot.id === id)
               // if favourites page and notifications page, remove the item instead
               if (tootIndex >= 0) {
                 foundToot = true
-                updateStatus({ item: items[tootIndex], reblog, payload })
+                updateStatus({ item: items[tootIndex], isReblog, payload })
               }
             }
 
@@ -67,65 +97,7 @@ const updateStatusProperty = ({
       }
 
       return old
-    }
-  )
-
-  rootQueryKey &&
-    queryClient.setQueryData<InfiniteData<TimelineData> | undefined>(
-      rootQueryKey,
-      old => {
-        if (old) {
-          let foundToot = false
-          old.pages = old.pages.map(page => {
-            // Skip rest of the pages if any toot is found
-            if (foundToot) {
-              return page
-            } else {
-              if (
-                typeof (page.body as Mastodon.Conversation[])[0].unread ===
-                'boolean'
-              ) {
-                const items = page.body as Mastodon.Conversation[]
-                const tootIndex = items.findIndex(
-                  ({ last_status }) => last_status?.id === id
-                )
-                if (tootIndex >= 0) {
-                  foundToot = true
-                  updateConversation({ item: items[tootIndex], payload })
-                }
-                return page
-              } else if (
-                typeof (page.body as Mastodon.Notification[])[0].type ===
-                'string'
-              ) {
-                const items = page.body as Mastodon.Notification[]
-                const tootIndex = items.findIndex(
-                  ({ status }) => status?.id === id
-                )
-                if (tootIndex >= 0) {
-                  foundToot = true
-                  updateNotification({ item: items[tootIndex], payload })
-                }
-              } else {
-                const items = page.body as Mastodon.Status[]
-                const tootIndex = reblog
-                  ? items.findIndex(({ reblog }) => reblog?.id === id)
-                  : items.findIndex(toot => toot.id === id)
-                // if favourites page and notifications page, remove the item instead
-                if (tootIndex >= 0) {
-                  foundToot = true
-                  updateStatus({ item: items[tootIndex], reblog, payload })
-                }
-              }
-
-              return page
-            }
-          })
-        }
-
-        return old
-      }
-    )
+    })
 }
 
 export default updateStatusProperty

From 507ecf5eeb26c4382522603b345a2458329b9e85 Mon Sep 17 00:00:00 2001
From: xmflsct <me@xmflsct.com>
Date: Sat, 3 Dec 2022 21:14:00 +0100
Subject: [PATCH 15/40] Fix history page

---
 src/components/Separator.tsx        |  37 +++++----
 src/screens/Tabs/Shared/History.tsx | 120 ++++++++++++++--------------
 2 files changed, 80 insertions(+), 77 deletions(-)

diff --git a/src/components/Separator.tsx b/src/components/Separator.tsx
index 0241ce90..b0d8802c 100644
--- a/src/components/Separator.tsx
+++ b/src/components/Separator.tsx
@@ -1,32 +1,35 @@
 import { StyleConstants } from '@utils/styles/constants'
 import { useTheme } from '@utils/styles/ThemeManager'
 import React from 'react'
-import { StyleSheet, View } from 'react-native'
+import { StyleProp, StyleSheet, View, ViewStyle } from 'react-native'
 
 export interface Props {
   extraMarginLeft?: number
   extraMarginRight?: number
+  style?: StyleProp<ViewStyle>
 }
 
-const ComponentSeparator = React.memo(
-  ({ extraMarginLeft = 0, extraMarginRight = 0 }: Props) => {
-    const { colors } = useTheme()
+const ComponentSeparator: React.FC<Props> = ({
+  extraMarginLeft = 0,
+  extraMarginRight = 0,
+  style
+}) => {
+  const { colors } = useTheme()
 
-    return (
-      <View
-        style={{
+  return (
+    <View
+      style={[
+        style,
+        {
           backgroundColor: colors.backgroundDefault,
           borderTopColor: colors.border,
           borderTopWidth: StyleSheet.hairlineWidth,
-          marginLeft:
-            StyleConstants.Spacing.Global.PagePadding + extraMarginLeft,
-          marginRight:
-            StyleConstants.Spacing.Global.PagePadding + extraMarginRight
-        }}
-      />
-    )
-  },
-  () => true
-)
+          marginLeft: StyleConstants.Spacing.Global.PagePadding + extraMarginLeft,
+          marginRight: StyleConstants.Spacing.Global.PagePadding + extraMarginRight
+        }
+      ]}
+    />
+  )
+}
 
 export default ComponentSeparator
diff --git a/src/screens/Tabs/Shared/History.tsx b/src/screens/Tabs/Shared/History.tsx
index ea8ef633..fc9a9d3c 100644
--- a/src/screens/Tabs/Shared/History.tsx
+++ b/src/screens/Tabs/Shared/History.tsx
@@ -5,6 +5,7 @@ import ComponentSeparator from '@components/Separator'
 import CustomText from '@components/Text'
 import TimelineAttachment from '@components/Timeline/Shared/Attachment'
 import TimelineContent from '@components/Timeline/Shared/Content'
+import StatusContext from '@components/Timeline/Shared/Context'
 import HeaderSharedCreated from '@components/Timeline/Shared/HeaderShared/Created'
 import { TabSharedStackScreenProps } from '@utils/navigation/navigators'
 import { useStatusHistory } from '@utils/queryHooks/statusesHistory'
@@ -12,58 +13,36 @@ import { StyleConstants } from '@utils/styles/constants'
 import { useTheme } from '@utils/styles/ThemeManager'
 import React, { useEffect } from 'react'
 import { useTranslation } from 'react-i18next'
-import { View } from 'react-native'
-import { ScrollView } from 'react-native-gesture-handler'
+import { FlatList, View } from 'react-native'
 
-const ContentView = ({
-  history,
-  first,
-  last
-}: {
-  history: Mastodon.StatusHistory
-  first: boolean
-  last: boolean
-}) => {
+const ContentView: React.FC<{ item: Mastodon.StatusHistory }> = ({ item }) => {
   const { colors } = useTheme()
 
   return (
-    <>
-      <View
-        style={{
-          padding: StyleConstants.Spacing.Global.PagePadding,
-          paddingTop: first ? 0 : undefined
-        }}
-      >
-        <HeaderSharedCreated created_at={history.created_at} />
-        {typeof history.content === 'string' && history.content.length > 0 ? (
-          <TimelineContent status={history} />
-        ) : null}
-        {history.poll
-          ? history.poll.options.map((option, index) => (
-              <View key={index} style={{ flex: 1, paddingVertical: StyleConstants.Spacing.S }}>
-                <View style={{ flex: 1, flexDirection: 'row' }}>
-                  <Icon
-                    style={{
-                      paddingTop: StyleConstants.Font.LineHeight.M - StyleConstants.Font.Size.M,
-                      marginRight: StyleConstants.Spacing.S
-                    }}
-                    name='Circle'
-                    size={StyleConstants.Font.Size.M}
-                    color={colors.disabled}
-                  />
-                  <CustomText style={{ flex: 1 }}>
-                    <ParseEmojis content={option.title} emojis={history.poll?.emojis} />
-                  </CustomText>
-                </View>
-              </View>
-            ))
-          : null}
-        {Array.isArray(history.media_attachments) && history.media_attachments.length ? (
-          <TimelineAttachment status={history} />
-        ) : null}
-      </View>
-      {!last ? <ComponentSeparator extraMarginLeft={0} /> : null}
-    </>
+    // @ts-ignore
+    <StatusContext.Provider value={{ status: item, disableOnPress: true }}>
+      <HeaderSharedCreated created_at={item.created_at} />
+      <TimelineContent />
+      {item.poll?.options.map((option, index) => (
+        <View key={index} style={{ flex: 1, paddingVertical: StyleConstants.Spacing.XS }}>
+          <View style={{ flex: 1, flexDirection: 'row' }}>
+            <Icon
+              style={{
+                paddingTop: StyleConstants.Font.LineHeight.M - StyleConstants.Font.Size.M,
+                marginRight: StyleConstants.Spacing.S
+              }}
+              name='Circle'
+              size={StyleConstants.Font.Size.M}
+              color={colors.disabled}
+            />
+            <CustomText style={{ flex: 1 }}>
+              <ParseEmojis content={option.title} emojis={item.poll?.emojis} />
+            </CustomText>
+          </View>
+        </View>
+      ))}
+      <TimelineAttachment />
+    </StatusContext.Provider>
   )
 }
 
@@ -84,19 +63,40 @@ const TabSharedHistory: React.FC<TabSharedStackScreenProps<'Tab-Shared-History'>
   }, [])
 
   return (
-    <ScrollView>
-      {data && data.length > 0
-        ? data
-            .slice(0)
-            .reverse()
-            .map((d, i) =>
-              i !== 0 ? (
-                <ContentView key={i} history={d} first={i === 1} last={i === data.length - 1} />
-              ) : null
-            )
-        : null}
-    </ScrollView>
+    <FlatList
+      style={{ flex: 1, minHeight: '100%', padding: StyleConstants.Spacing.Global.PagePadding }}
+      data={
+        data && data.length > 0
+          ? data
+              .slice(0)
+              .reverse()
+              .filter((_, index) => index !== 0)
+          : []
+      }
+      renderItem={({ item }) => <ContentView item={item} />}
+      ItemSeparatorComponent={() => (
+        <ComponentSeparator
+          extraMarginLeft={0}
+          style={{ marginVertical: StyleConstants.Spacing.Global.PagePadding }}
+        />
+      )}
+    />
   )
+
+  // return (
+  //   <ScrollView>
+  //     {data && data.length > 0
+  //       ? data
+  //           .slice(0)
+  //           .reverse()
+  //           .map((d, i) =>
+  //             i !== 0 ? (
+  //               <ContentView key={i} history={d} first={i === 1} last={i === data.length - 1} />
+  //             ) : null
+  //           )
+  //       : null}
+  //   </ScrollView>
+  // )
 }
 
 export default TabSharedHistory

From 0fd3fcfd3f27fe79ffde4a56f0521ef2b9f34aa1 Mon Sep 17 00:00:00 2001
From: xmflsct <me@xmflsct.com>
Date: Sat, 3 Dec 2022 21:38:35 +0100
Subject: [PATCH 16/40] Add logging for #472

---
 src/utils/slices/instances/push/register.ts | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/utils/slices/instances/push/register.ts b/src/utils/slices/instances/push/register.ts
index fafad15d..afc20ccb 100644
--- a/src/utils/slices/instances/push/register.ts
+++ b/src/utils/slices/instances/push/register.ts
@@ -2,6 +2,7 @@ import apiInstance from '@api/instance'
 import apiTooot, { TOOOT_API_DOMAIN } from '@api/tooot'
 import i18n from '@root/i18n/i18n'
 import { RootState } from '@root/store'
+import * as Sentry from '@sentry/react-native'
 import { InstanceLatest } from '@utils/migrations/instances/migration'
 import { getInstance } from '@utils/slices/instancesSlice'
 import * as Notifications from 'expo-notifications'
@@ -72,6 +73,16 @@ const pushRegister = async (
     body: formData
   })
 
+  if (res.body.server_key) {
+    Sentry.setExtras({
+      API: 'tooot',
+      instance: instanceUri,
+      resBody: res.body
+    })
+    Sentry.captureMessage('Push register error')
+    return Promise.reject()
+  }
+
   await subscribe({
     expoToken,
     instanceUrl,

From 7421ffd1bc52aea1d990d60c5f9ac7e61b97c7aa Mon Sep 17 00:00:00 2001
From: xmflsct <me@xmflsct.com>
Date: Sat, 3 Dec 2022 21:56:52 +0100
Subject: [PATCH 17/40] Fix toot relative time does not align with app's
 language

---
 src/App.tsx                     | 26 ++++++++++++++------------
 src/Screens.tsx                 |  5 ++---
 src/components/RelativeTime.tsx |  2 +-
 src/startup/timezone.ts         |  4 ++--
 4 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/src/App.tsx b/src/App.tsx
index 2f26fdb8..6575b3e1 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -1,5 +1,4 @@
 import { ActionSheetProvider } from '@expo/react-native-action-sheet'
-import getLanguage from '@helpers/getLanguage'
 import queryClient from '@helpers/queryClient'
 import i18n from '@root/i18n/i18n'
 import Screens from '@root/Screens'
@@ -13,11 +12,12 @@ import timezone from '@root/startup/timezone'
 import { persistor, store } from '@root/store'
 import * as Sentry from '@sentry/react-native'
 import AccessibilityManager from '@utils/accessibility/AccessibilityManager'
-import { changeLanguage } from '@utils/slices/settingsSlice'
+import { changeLanguage, getSettingsLanguage } from '@utils/slices/settingsSlice'
 import ThemeManager from '@utils/styles/ThemeManager'
 import * as Localization from 'expo-localization'
 import * as SplashScreen from 'expo-splash-screen'
 import React, { useCallback, useEffect, useState } from 'react'
+import { IntlProvider } from 'react-intl'
 import { LogBox, Platform } from 'react-native'
 import { GestureHandlerRootView } from 'react-native-gesture-handler'
 import { SafeAreaProvider } from 'react-native-safe-area-context'
@@ -85,7 +85,7 @@ const App: React.FC = () => {
               if (bootstrapped) {
                 log('log', 'App', 'loading actual app :)')
                 log('log', 'App', `Locale: ${Localization.locale}`)
-                const language = getLanguage()
+                const language = getSettingsLanguage(store.getState())
                 if (!language) {
                   if (Platform.OS !== 'ios') {
                     store.dispatch(changeLanguage('en'))
@@ -96,15 +96,17 @@ const App: React.FC = () => {
                 }
 
                 return (
-                  <SafeAreaProvider>
-                    <ActionSheetProvider>
-                      <AccessibilityManager>
-                        <ThemeManager>
-                          <Screens localCorrupt={localCorrupt} />
-                        </ThemeManager>
-                      </AccessibilityManager>
-                    </ActionSheetProvider>
-                  </SafeAreaProvider>
+                  <IntlProvider locale={language}>
+                    <SafeAreaProvider>
+                      <ActionSheetProvider>
+                        <AccessibilityManager>
+                          <ThemeManager>
+                            <Screens localCorrupt={localCorrupt} />
+                          </ThemeManager>
+                        </AccessibilityManager>
+                      </ActionSheetProvider>
+                    </SafeAreaProvider>
+                  </IntlProvider>
                 )
               } else {
                 return null
diff --git a/src/Screens.tsx b/src/Screens.tsx
index 59c7c3b1..c88da00b 100644
--- a/src/Screens.tsx
+++ b/src/Screens.tsx
@@ -27,7 +27,6 @@ import * as Linking from 'expo-linking'
 import { addScreenshotListener } from 'expo-screen-capture'
 import React, { useCallback, useEffect, useRef, useState } from 'react'
 import { useTranslation } from 'react-i18next'
-import { IntlProvider } from 'react-intl'
 import { Alert, Platform, StatusBar } from 'react-native'
 import ShareMenu from 'react-native-share-menu'
 import { useSelector } from 'react-redux'
@@ -271,7 +270,7 @@ const Screens: React.FC<Props> = ({ localCorrupt }) => {
   }, [])
 
   return (
-    <IntlProvider locale={i18n.language}>
+    <>
       <StatusBar
         backgroundColor={colors.backgroundDefault}
         {...(Platform.OS === 'android' && {
@@ -348,7 +347,7 @@ const Screens: React.FC<Props> = ({ localCorrupt }) => {
 
         <Message />
       </NavigationContainer>
-    </IntlProvider>
+    </>
   )
 }
 
diff --git a/src/components/RelativeTime.tsx b/src/components/RelativeTime.tsx
index 5b1589f4..25a7a2db 100644
--- a/src/components/RelativeTime.tsx
+++ b/src/components/RelativeTime.tsx
@@ -9,7 +9,7 @@ export interface Props {
 const RelativeTime: React.FC<Props> = ({ time }) => {
   const [now, setNow] = useState(new Date().getTime())
   useEffect(() => {
-    const appStateListener = AppState.addEventListener('change', state => {
+    const appStateListener = AppState.addEventListener('change', () => {
       setNow(new Date().getTime())
     })
 
diff --git a/src/startup/timezone.ts b/src/startup/timezone.ts
index dd466588..d0a8f439 100644
--- a/src/startup/timezone.ts
+++ b/src/startup/timezone.ts
@@ -2,10 +2,10 @@ import * as Localization from 'expo-localization'
 import log from './log'
 
 const timezone = () => {
-  log('log', 'Timezone', Localization.timezone)
+  log('log', 'Timezone', Localization.getCalendars()[0].timeZone || 'unknown')
   if ('__setDefaultTimeZone' in Intl.DateTimeFormat) {
     // @ts-ignore
-    Intl.DateTimeFormat.__setDefaultTimeZone(Localization.timezone)
+    Intl.DateTimeFormat.__setDefaultTimeZone(Localization.getCalendars()[0].timeZone)
   }
 }
 

From 8a7e78485dac8e8aad2178dc79f41c26350f2b2f Mon Sep 17 00:00:00 2001
From: xmflsct <me@xmflsct.com>
Date: Sat, 3 Dec 2022 23:10:20 +0100
Subject: [PATCH 18/40] Add hashtag sparkline

---
 src/components/Hashtag.tsx              | 47 ++++++++++----
 src/components/Sparkline.tsx            | 86 +++++++++++++++++++++++++
 src/screens/Compose/Root/Suggestion.tsx |  2 +-
 src/screens/Tabs/Shared/Search.tsx      |  4 +-
 4 files changed, 124 insertions(+), 15 deletions(-)
 create mode 100644 src/components/Sparkline.tsx

diff --git a/src/components/Hashtag.tsx b/src/components/Hashtag.tsx
index aebb1adc..721dd73f 100644
--- a/src/components/Hashtag.tsx
+++ b/src/components/Hashtag.tsx
@@ -3,38 +3,61 @@ import { StackNavigationProp } from '@react-navigation/stack'
 import { TabLocalStackParamList } from '@utils/navigation/navigators'
 import { StyleConstants } from '@utils/styles/constants'
 import { useTheme } from '@utils/styles/ThemeManager'
-import React, { useCallback } from 'react'
-import { Pressable } from 'react-native'
+import { sumBy } from 'lodash'
+import React, { useCallback, useState } from 'react'
+import { Dimensions, Pressable, View } from 'react-native'
+import Sparkline from './Sparkline'
 import CustomText from './Text'
 
 export interface Props {
   hashtag: Mastodon.Tag
   onPress?: () => void
-  origin?: string
 }
 
-const ComponentHashtag: React.FC<Props> = ({
-  hashtag,
-  onPress: customOnPress,
-  origin
-}) => {
+const ComponentHashtag: React.FC<Props> = ({ hashtag, onPress: customOnPress }) => {
   const { colors } = useTheme()
-  const navigation =
-    useNavigation<StackNavigationProp<TabLocalStackParamList>>()
+  const navigation = useNavigation<StackNavigationProp<TabLocalStackParamList>>()
 
   const onPress = useCallback(() => {
     navigation.push('Tab-Shared-Hashtag', { hashtag: hashtag.name })
   }, [])
 
+  const padding = StyleConstants.Spacing.S * 1.5
+  const width = Dimensions.get('window').width / 4
+  const [height, setHeight] = useState<number>(0)
+
   return (
     <Pressable
       accessibilityRole='button'
-      style={{ padding: StyleConstants.Spacing.S * 1.5 }}
+      style={{
+        flex: 1,
+        flexDirection: 'row',
+        justifyContent: 'space-between',
+        padding
+      }}
       onPress={customOnPress || onPress}
+      onLayout={({
+        nativeEvent: {
+          layout: { height }
+        }
+      }) => setHeight(height - padding * 2 - 1)}
     >
-      <CustomText fontStyle='M' style={{ color: colors.primaryDefault }}>
+      <CustomText
+        fontStyle='M'
+        style={{
+          flexShrink: 1,
+          color: colors.primaryDefault,
+          paddingRight: StyleConstants.Spacing.M
+        }}
+        numberOfLines={1}
+      >
         #{hashtag.name}
       </CustomText>
+      <Sparkline
+        data={hashtag.history.map(h => parseInt(h.uses)).reverse()}
+        width={width}
+        height={height}
+      />
     </Pressable>
   )
 }
diff --git a/src/components/Sparkline.tsx b/src/components/Sparkline.tsx
new file mode 100644
index 00000000..f0eb6aa0
--- /dev/null
+++ b/src/components/Sparkline.tsx
@@ -0,0 +1,86 @@
+import { useTheme } from '@utils/styles/ThemeManager'
+import { maxBy, minBy } from 'lodash'
+import React from 'react'
+import Svg, { G, Path } from 'react-native-svg'
+
+export interface Props {
+  data: number[]
+  width: number
+  height: number
+  margin?: number
+}
+
+const Sparkline: React.FC<Props> = ({ data, width, height, margin = 0 }) => {
+  const { colors } = useTheme()
+
+  const dataToPoints = ({
+    data,
+    width,
+    height
+  }: {
+    data: number[]
+    width: number
+    height: number
+  }): { x: number; y: number }[] => {
+    const max = maxBy(data) || 0
+    const min = minBy(data) || 0
+    const len = data.length
+
+    const vfactor = (height - margin * 2) / (max - min || 2)
+    const hfactor = (width - margin * 2) / (len - (len > 1 ? 1 : 0))
+
+    return data.map((d, i) => ({
+      x: i * hfactor + margin,
+      y: (max === min ? 1 : max - d) * vfactor + margin
+    }))
+  }
+  const points = dataToPoints({ data, width, height })
+  const divisor = 0.25
+  let prev: { x: number; y: number }
+  const curve = (p: { x: number; y: number }) => {
+    let res
+    if (!prev) {
+      res = [p.x, p.y]
+    } else {
+      const len = (p.x - prev.x) * divisor
+      res = [
+        'C',
+        prev.x + len, // x1
+        prev.y, // y1
+        p.x - len, // x2
+        p.y, // y2
+        p.x, // x
+        p.y // y
+      ]
+    }
+    prev = p
+    return res
+  }
+  const linePoints = points.map(p => curve(p)).reduce((a, b) => a.concat(b))
+  const closePolyPoints = [
+    'L' + points[points.length - 1].x,
+    height - margin,
+    margin,
+    height - margin,
+    margin,
+    points[0].y
+  ]
+  const fillPoints = linePoints.concat(closePolyPoints)
+
+  return (
+    <Svg height='auto' width={width}>
+      <G>
+        <Path d={'M' + fillPoints.join(' ')} fill={colors.blue} fillOpacity={0.1} />
+        <Path
+          d={'M' + linePoints.join(' ')}
+          stroke={colors.blue}
+          strokeWidth={1}
+          strokeLinejoin='round'
+          strokeLinecap='round'
+        />
+      </G>
+    </Svg>
+  )
+}
+
+export default Sparkline
diff --git a/src/screens/Compose/Root/Suggestion.tsx b/src/screens/Compose/Root/Suggestion.tsx
index c56078b0..0c317c9b 100644
--- a/src/screens/Compose/Root/Suggestion.tsx
+++ b/src/screens/Compose/Root/Suggestion.tsx
@@ -46,7 +46,7 @@ const ComposeRootSuggestion: React.FC<Props> = ({ item }) => {
   return item.acct ? (
     <ComponentAccount account={item} props={{ onPress }} />
   ) : (
-    <ComponentHashtag hashtag={item} onPress={onPress} origin='suggestion' />
+    <ComponentHashtag hashtag={item} onPress={onPress} />
   )
 }
 
diff --git a/src/screens/Tabs/Shared/Search.tsx b/src/screens/Tabs/Shared/Search.tsx
index 72843e40..c5a7cd43 100644
--- a/src/screens/Tabs/Shared/Search.tsx
+++ b/src/screens/Tabs/Shared/Search.tsx
@@ -81,7 +81,7 @@ const TabSharedSearch: React.FC<TabSharedStackScreenProps<'Tab-Shared-Search'>>
         )
       }
     })
-  }, [])
+  }, [mode])
 
   const mapKeyToTranslations = {
     accounts: t('shared.search.sections.accounts'),
@@ -183,7 +183,7 @@ const TabSharedSearch: React.FC<TabSharedStackScreenProps<'Tab-Shared-Search'>>
       case 'accounts':
         return <ComponentAccount account={item} />
       case 'hashtags':
-        return <ComponentHashtag hashtag={item} origin='search' />
+        return <ComponentHashtag hashtag={item} />
       case 'statuses':
         return <TimelineDefault item={item} disableDetails />
       default:

From dab09369cb165b382a6d6a9a457102f4c98588ba Mon Sep 17 00:00:00 2001
From: xmflsct <me@xmflsct.com>
Date: Sat, 3 Dec 2022 23:49:14 +0100
Subject: [PATCH 19/40] Add trending tags in search landing page

---
 src/api/handleError.ts             |  15 ++---
 src/api/instance.ts                |  40 +++++------
 src/components/Hashtag.tsx         |   5 +-
 src/helpers/features.json          |   5 ++
 src/i18n/en/screens/tabs.json      |   3 +
 src/screens/Tabs/Shared/Search.tsx | 104 ++++++++++++++++++-----------
 src/utils/queryHooks/trends.ts     |  42 ++++++++++++
 7 files changed, 135 insertions(+), 79 deletions(-)
 create mode 100644 src/utils/queryHooks/trends.ts

diff --git a/src/api/handleError.ts b/src/api/handleError.ts
index 6f984b78..efbff696 100644
--- a/src/api/handleError.ts
+++ b/src/api/handleError.ts
@@ -7,30 +7,23 @@ const handleError = (error: any) => {
     // The request was made and the server responded with a status code
     // that falls out of the range of 2xx
     console.error(
-      ctx.bold(' API instance '),
+      ctx.bold(' API '),
       ctx.bold('response'),
       error.response.status,
       error?.response.data?.error || error?.response.message || 'Unknown error'
     )
     return Promise.reject({
       status: error?.response.status,
-      message:
-        error?.response.data?.error ||
-        error?.response.message ||
-        'Unknown error'
+      message: error?.response.data?.error || error?.response.message || 'Unknown error'
     })
   } else if (error?.request) {
     // The request was made but no response was received
     // `error.request` is an instance of XMLHttpRequest in the browser and an instance of
     // http.ClientRequest in node.js
-    console.error(ctx.bold(' API instance '), ctx.bold('request'), error)
+    console.error(ctx.bold(' API '), ctx.bold('request'), error)
     return Promise.reject()
   } else {
-    console.error(
-      ctx.bold(' API instance '),
-      ctx.bold('internal'),
-      error?.message
-    )
+    console.error(ctx.bold(' API '), ctx.bold('internal'), error?.message)
     return Promise.reject()
   }
 }
diff --git a/src/api/instance.ts b/src/api/instance.ts
index 6df9974d..0126e4b1 100644
--- a/src/api/instance.ts
+++ b/src/api/instance.ts
@@ -13,10 +13,7 @@ export type Params = {
   }
   headers?: { [key: string]: string }
   body?: FormData
-  extras?: Omit<
-    AxiosRequestConfig,
-    'method' | 'url' | 'params' | 'headers' | 'data'
-  >
+  extras?: Omit<AxiosRequestConfig, 'method' | 'url' | 'params' | 'headers' | 'data'>
 }
 
 export type InstanceResponse<T = unknown> = {
@@ -35,9 +32,7 @@ const apiInstance = async <T = unknown>({
 }: Params): Promise<InstanceResponse<T>> => {
   const { store } = require('@root/store')
   const state = store.getState() as RootState
-  const instanceActive = state.instances.instances.findIndex(
-    instance => instance.active
-  )
+  const instanceActive = state.instances.instances.findIndex(instance => instance.active)
 
   let domain
   let token
@@ -45,21 +40,19 @@ const apiInstance = async <T = unknown>({
     domain = state.instances.instances[instanceActive].url
     token = state.instances.instances[instanceActive].token
   } else {
-    console.warn(
-      ctx.bgRed.white.bold(' API ') + ' ' + 'No instance domain is provided'
-    )
+    console.warn(ctx.bgRed.white.bold(' API ') + ' ' + 'No instance domain is provided')
     return Promise.reject()
   }
 
   console.log(
     ctx.bgGreen.bold(' API instance ') +
-    ' ' +
-    domain +
-    ' ' +
-    method +
-    ctx.green(' -> ') +
-    `/${url}` +
-    (params ? ctx.green(' -> ') : ''),
+      ' ' +
+      domain +
+      ' ' +
+      method +
+      ctx.green(' -> ') +
+      `/${url}` +
+      (params ? ctx.green(' -> ') : ''),
     params ? params : ''
   )
 
@@ -70,10 +63,7 @@ const apiInstance = async <T = unknown>({
     url,
     params,
     headers: {
-      'Content-Type':
-        body && body instanceof FormData
-          ? 'multipart/form-data'
-          : 'application/json',
+      'Content-Type': body && body instanceof FormData ? 'multipart/form-data' : 'application/json',
       Accept: '*/*',
       ...userAgent,
       ...headers,
@@ -87,10 +77,10 @@ const apiInstance = async <T = unknown>({
     .then(response => {
       let prev
       let next
-      if (response.headers.link) {
-        const headersLinks = li.parse(response.headers.link)
-        prev = headersLinks.prev?.match(/_id=([0-9]*)/)[1]
-        next = headersLinks.next?.match(/_id=([0-9]*)/)[1]
+      if (response.headers?.link) {
+        const headersLinks = li.parse(response.headers?.link)
+        prev = headersLinks.prev?.match(/_id=([0-9]*)/)?.[1]
+        next = headersLinks.next?.match(/_id=([0-9]*)/)?.[1]
       }
       return Promise.resolve({
         body: response.data,
diff --git a/src/components/Hashtag.tsx b/src/components/Hashtag.tsx
index 721dd73f..2d05edc9 100644
--- a/src/components/Hashtag.tsx
+++ b/src/components/Hashtag.tsx
@@ -3,9 +3,8 @@ import { StackNavigationProp } from '@react-navigation/stack'
 import { TabLocalStackParamList } from '@utils/navigation/navigators'
 import { StyleConstants } from '@utils/styles/constants'
 import { useTheme } from '@utils/styles/ThemeManager'
-import { sumBy } from 'lodash'
 import React, { useCallback, useState } from 'react'
-import { Dimensions, Pressable, View } from 'react-native'
+import { Dimensions, Pressable } from 'react-native'
 import Sparkline from './Sparkline'
 import CustomText from './Text'
 
@@ -22,7 +21,7 @@ const ComponentHashtag: React.FC<Props> = ({ hashtag, onPress: customOnPress })
     navigation.push('Tab-Shared-Hashtag', { hashtag: hashtag.name })
   }, [])
 
-  const padding = StyleConstants.Spacing.S * 1.5
+  const padding = StyleConstants.Spacing.Global.PagePadding
   const width = Dimensions.get('window').width / 4
   const [height, setHeight] = useState<number>(0)
 
diff --git a/src/helpers/features.json b/src/helpers/features.json
index 147b20a4..3a466762 100644
--- a/src/helpers/features.json
+++ b/src/helpers/features.json
@@ -24,6 +24,11 @@
     "version": 3.5,
     "reference": "https://github.com/mastodon/mastodon/releases/tag/v3.5.0"
   },
+  {
+    "feature": "trends_new_path",
+    "version": 3.5,
+    "reference": "https://github.com/mastodon/mastodon/releases/tag/v3.5.0"
+  },
   {
     "feature": "follow_tags",
     "version": 4.0,
diff --git a/src/i18n/en/screens/tabs.json b/src/i18n/en/screens/tabs.json
index 808dd98b..8f49b544 100644
--- a/src/i18n/en/screens/tabs.json
+++ b/src/i18n/en/screens/tabs.json
@@ -350,6 +350,9 @@
             "statusLink": "$t(shared.search.header.prefix) $t(shared.search.sections.statuses)",
             "accountLink": "$t(shared.search.header.prefix) $t(shared.search.sections.accounts)"
           }
+        },
+        "trending": {
+          "tags": "Trending tags"
         }
       },
       "sections": {
diff --git a/src/screens/Tabs/Shared/Search.tsx b/src/screens/Tabs/Shared/Search.tsx
index c5a7cd43..090d696e 100644
--- a/src/screens/Tabs/Shared/Search.tsx
+++ b/src/screens/Tabs/Shared/Search.tsx
@@ -6,10 +6,11 @@ import CustomText from '@components/Text'
 import TimelineDefault from '@components/Timeline/Default'
 import { TabSharedStackScreenProps } from '@utils/navigation/navigators'
 import { useSearchQuery } from '@utils/queryHooks/search'
+import { useTrendsQuery } from '@utils/queryHooks/trends'
 import { StyleConstants } from '@utils/styles/constants'
 import { useTheme } from '@utils/styles/ThemeManager'
 import { debounce } from 'lodash'
-import React, { useCallback, useEffect, useMemo } from 'react'
+import React, { useEffect } from 'react'
 import { Trans, useTranslation } from 'react-i18next'
 import {
   KeyboardAvoidingView,
@@ -38,9 +39,6 @@ const TabSharedSearch: React.FC<TabSharedStackScreenProps<'Tab-Shared-Search'>>
           }
         : { headerLeft: () => null }),
       headerTitle: () => {
-        const onChangeText = debounce((text: string) => navigation.setParams({ text }), 1000, {
-          trailing: true
-        })
         return (
           <View
             style={{
@@ -67,7 +65,10 @@ const TabSharedSearch: React.FC<TabSharedStackScreenProps<'Tab-Shared-Search'>>
                 paddingLeft: StyleConstants.Spacing.XS
               }}
               autoFocus
-              onChangeText={onChangeText}
+              value={text}
+              onChangeText={debounce((text: string) => navigation.setParams({ text }), 1000, {
+                trailing: true
+              })}
               autoCapitalize='none'
               autoCorrect={false}
               clearButtonMode='never'
@@ -81,7 +82,9 @@ const TabSharedSearch: React.FC<TabSharedStackScreenProps<'Tab-Shared-Search'>>
         )
       }
     })
-  }, [mode])
+  }, [text, mode])
+
+  const trendsTags = useTrendsQuery({ type: 'tags' })
 
   const mapKeyToTranslations = {
     accounts: t('shared.search.sections.accounts'),
@@ -119,21 +122,16 @@ const TabSharedSearch: React.FC<TabSharedStackScreenProps<'Tab-Shared-Search'>>
     }
   })
 
-  const listEmpty = useMemo(() => {
+  const listEmpty = () => {
     return (
-      <View
-        style={{
-          marginVertical: StyleConstants.Spacing.Global.PagePadding,
-          alignItems: 'center'
-        }}
-      >
-        <View>
-          {status === 'loading' ? (
-            <View style={{ flex: 1, alignItems: 'center' }}>
-              <Circle size={StyleConstants.Font.Size.M * 1.25} color={colors.secondary} />
-            </View>
-          ) : (
-            <>
+      <View style={{ paddingVertical: StyleConstants.Spacing.Global.PagePadding }}>
+        {status === 'loading' ? (
+          <View style={{ flex: 1, alignItems: 'center' }}>
+            <Circle size={StyleConstants.Font.Size.M * 1.25} color={colors.secondary} />
+          </View>
+        ) : (
+          <>
+            <View style={{ paddingHorizontal: StyleConstants.Spacing.Global.PagePadding }}>
               <CustomText
                 fontStyle='S'
                 style={{
@@ -148,7 +146,10 @@ const TabSharedSearch: React.FC<TabSharedStackScreenProps<'Tab-Shared-Search'>>
                   }}
                 />
               </CustomText>
-              <CustomText style={[styles.emptyAdvanced, { color: colors.primaryDefault }]}>
+              <CustomText
+                style={[styles.emptyAdvanced, { color: colors.primaryDefault }]}
+                fontWeight='Bold'
+              >
                 {t('shared.search.empty.advanced.header')}
               </CustomText>
               <CustomText style={[styles.emptyAdvanced, { color: colors.primaryDefault }]}>
@@ -171,25 +172,37 @@ const TabSharedSearch: React.FC<TabSharedStackScreenProps<'Tab-Shared-Search'>>
                 {'   '}
                 {t('shared.search.empty.advanced.example.accountLink')}
               </CustomText>
-            </>
-          )}
-        </View>
+            </View>
+
+            <CustomText
+              style={{
+                color: colors.primaryDefault,
+                marginTop: StyleConstants.Spacing.M,
+                paddingHorizontal: StyleConstants.Spacing.Global.PagePadding
+              }}
+              fontWeight='Bold'
+            >
+              {t('shared.search.empty.trending.tags')}
+            </CustomText>
+            <View>
+              {trendsTags.data?.map((tag, index) => {
+                const hashtag = tag as Mastodon.Tag
+                return (
+                  <React.Fragment key={index}>
+                    {index !== 0 ? <ComponentSeparator /> : null}
+                    <ComponentHashtag
+                      hashtag={hashtag}
+                      onPress={() => navigation.setParams({ text: `#${hashtag.name}` })}
+                    />
+                  </React.Fragment>
+                )
+              })}
+            </View>
+          </>
+        )}
       </View>
     )
-  }, [status])
-
-  const listItem = useCallback(({ item, section }: { item: any; section: any }) => {
-    switch (section.title) {
-      case 'accounts':
-        return <ComponentAccount account={item} />
-      case 'hashtags':
-        return <ComponentHashtag hashtag={item} />
-      case 'statuses':
-        return <TimelineDefault item={item} disableDetails />
-      default:
-        return null
-    }
-  }, [])
+  }
 
   return (
     <KeyboardAvoidingView
@@ -198,10 +211,21 @@ const TabSharedSearch: React.FC<TabSharedStackScreenProps<'Tab-Shared-Search'>>
     >
       <SectionList
         style={{ minHeight: '100%' }}
-        renderItem={listItem}
+        renderItem={({ item, section }: { item: any; section: any }) => {
+          switch (section.title) {
+            case 'accounts':
+              return <ComponentAccount account={item} />
+            case 'hashtags':
+              return <ComponentHashtag hashtag={item} />
+            case 'statuses':
+              return <TimelineDefault item={item} disableDetails />
+            default:
+              return null
+          }
+        }}
         stickySectionHeadersEnabled
         sections={data || []}
-        ListEmptyComponent={listEmpty}
+        ListEmptyComponent={listEmpty()}
         keyboardShouldPersistTaps='always'
         renderSectionHeader={({ section: { translation } }) => (
           <View
diff --git a/src/utils/queryHooks/trends.ts b/src/utils/queryHooks/trends.ts
new file mode 100644
index 00000000..38bcd791
--- /dev/null
+++ b/src/utils/queryHooks/trends.ts
@@ -0,0 +1,42 @@
+import apiInstance from '@api/instance'
+import { store } from '@root/store'
+import { checkInstanceFeature } from '@utils/slices/instancesSlice'
+import { AxiosError } from 'axios'
+import { QueryFunctionContext, useQuery, UseQueryOptions } from 'react-query'
+
+export type QueryKeyTrends = ['Trends', { type: 'tags' | 'statuses' | 'links' }]
+
+const queryFunction = ({ queryKey }: QueryFunctionContext<QueryKeyTrends>) => {
+  const trendsNewPath = checkInstanceFeature('trends_new_path')(store.getState())
+
+  if (!trendsNewPath && queryKey[1].type !== 'tags') {
+    return []
+  }
+
+  const { type } = queryKey[1]
+
+  switch (type) {
+    case 'tags':
+      return apiInstance<Mastodon.Tag[]>({
+        method: 'get',
+        url: trendsNewPath ? 'trends/tags' : 'trends'
+      }).then(res => res.body)
+    case 'statuses':
+      return apiInstance<Mastodon.Status[]>({
+        method: 'get',
+        url: 'trends/tags'
+      }).then(res => res.body)
+  }
+}
+
+const useTrendsQuery = ({
+  options,
+  ...queryKeyParams
+}: QueryKeyTrends[1] & {
+  options?: UseQueryOptions<Mastodon.Tag[] | Mastodon.Status[], AxiosError>
+}) => {
+  const queryKey: QueryKeyTrends = ['Trends', { ...queryKeyParams }]
+  return useQuery(queryKey, queryFunction, options)
+}
+
+export { useTrendsQuery }

From d8bff02136be8c7c3dc859b4c467a691d6121c54 Mon Sep 17 00:00:00 2001
From: xmflsct <me@xmflsct.com>
Date: Sun, 4 Dec 2022 00:13:54 +0100
Subject: [PATCH 20/40] Fix logging logic

---
 src/utils/slices/instances/push/register.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/utils/slices/instances/push/register.ts b/src/utils/slices/instances/push/register.ts
index afc20ccb..7fc592ea 100644
--- a/src/utils/slices/instances/push/register.ts
+++ b/src/utils/slices/instances/push/register.ts
@@ -73,7 +73,7 @@ const pushRegister = async (
     body: formData
   })
 
-  if (res.body.server_key) {
+  if (!res.body.server_key?.length) {
     Sentry.setExtras({
       API: 'tooot',
       instance: instanceUri,

From 9f76fa08a8fb36ef5fc5e4245e270709e587414c Mon Sep 17 00:00:00 2001
From: xmflsct <me@xmflsct.com>
Date: Sun, 4 Dec 2022 00:35:13 +0100
Subject: [PATCH 21/40] Fix Android browser package

---
 src/components/Instance.tsx            | 13 ++++++++++---
 src/components/Instance/Auth.tsx       | 13 ++-----------
 src/components/openLink.ts             |  4 +++-
 src/helpers/browserPackage.ts          | 16 ++++++++++++++++
 src/screens/Tabs/Me/Push.tsx           |  7 ++++++-
 src/screens/Tabs/Me/Root/Settings.tsx  |  9 +++++++--
 src/screens/Tabs/Me/Settings/Tooot.tsx |  7 +++++--
 7 files changed, 49 insertions(+), 20 deletions(-)
 create mode 100644 src/helpers/browserPackage.ts

diff --git a/src/components/Instance.tsx b/src/components/Instance.tsx
index 958c4338..b0039b37 100644
--- a/src/components/Instance.tsx
+++ b/src/components/Instance.tsx
@@ -1,5 +1,6 @@
 import Button from '@components/Button'
 import Icon from '@components/Icon'
+import browserPackage from '@helpers/browserPackage'
 import { useAppsQuery } from '@utils/queryHooks/apps'
 import { useInstanceQuery } from '@utils/queryHooks/instance'
 import { getInstances } from '@utils/slices/instancesSlice'
@@ -254,13 +255,19 @@ const ComponentInstance: React.FC<Props> = ({
                   <CustomText
                     accessible
                     style={{ color: colors.blue }}
-                    onPress={() => WebBrowser.openBrowserAsync('https://tooot.app/privacy-policy')}
+                    onPress={async () =>
+                      WebBrowser.openBrowserAsync('https://tooot.app/privacy-policy', {
+                        browserPackage: await browserPackage()
+                      })
+                    }
                   />,
                   <CustomText
                     accessible
                     style={{ color: colors.blue }}
-                    onPress={() =>
-                      WebBrowser.openBrowserAsync('https://tooot.app/terms-of-service')
+                    onPress={async () =>
+                      WebBrowser.openBrowserAsync('https://tooot.app/terms-of-service', {
+                        browserPackage: await browserPackage()
+                      })
                     }
                   />
                 ]}
diff --git a/src/components/Instance/Auth.tsx b/src/components/Instance/Auth.tsx
index 9434220d..1a72e2b5 100644
--- a/src/components/Instance/Auth.tsx
+++ b/src/components/Instance/Auth.tsx
@@ -1,3 +1,4 @@
+import browserPackage from '@helpers/browserPackage'
 import { useNavigation } from '@react-navigation/native'
 import { useAppDispatch } from '@root/store'
 import { InstanceLatest } from '@utils/migrations/instances/migration'
@@ -5,9 +6,7 @@ import { TabMeStackNavigationProp } from '@utils/navigation/navigators'
 import addInstance from '@utils/slices/instances/add'
 import { checkInstanceFeature } from '@utils/slices/instancesSlice'
 import * as AuthSession from 'expo-auth-session'
-import * as WebBrowser from 'expo-web-browser'
 import React, { useEffect } from 'react'
-import { Platform } from 'react-native'
 import { useQueryClient } from 'react-query'
 import { useSelector } from 'react-redux'
 
@@ -47,15 +46,7 @@ const InstanceAuth = React.memo(
     useEffect(() => {
       ;(async () => {
         if (request?.clientId) {
-          let browserPackage: string | undefined
-          if (Platform.OS === 'android') {
-            const tabsSupportingBrowsers = await WebBrowser.getCustomTabsSupportingBrowsersAsync()
-            browserPackage =
-              tabsSupportingBrowsers?.preferredBrowserPackage ||
-              tabsSupportingBrowsers.browserPackages[0] ||
-              tabsSupportingBrowsers.servicePackages[0]
-          }
-          await promptAsync({ browserPackage }).catch(e => console.log(e))
+          await promptAsync({ browserPackage: await browserPackage() }).catch(e => console.log(e))
         }
       })()
     }, [request])
diff --git a/src/components/openLink.ts b/src/components/openLink.ts
index 96531e87..30425685 100644
--- a/src/components/openLink.ts
+++ b/src/components/openLink.ts
@@ -1,4 +1,5 @@
 import apiInstance from '@api/instance'
+import browserPackage from '@helpers/browserPackage'
 import navigationRef from '@helpers/navigationRef'
 import { matchAccount, matchStatus } from '@helpers/urlMatcher'
 import { store } from '@root/store'
@@ -91,7 +92,8 @@ const openLink = async (url: string, navigation?: any) => {
     case 'internal':
       await WebBrowser.openBrowserAsync(encodeURI(url), {
         dismissButtonStyle: 'close',
-        enableBarCollapsing: true
+        enableBarCollapsing: true,
+        browserPackage: await browserPackage()
       })
       break
     case 'external':
diff --git a/src/helpers/browserPackage.ts b/src/helpers/browserPackage.ts
new file mode 100644
index 00000000..b5e3a1b0
--- /dev/null
+++ b/src/helpers/browserPackage.ts
@@ -0,0 +1,16 @@
+import * as WebBrowser from 'expo-web-browser'
+import { Platform } from 'react-native'
+
+const browserPackage = async () => {
+  let browserPackage: string | undefined
+  if (Platform.OS === 'android') {
+    const tabsSupportingBrowsers = await WebBrowser.getCustomTabsSupportingBrowsersAsync()
+    browserPackage =
+      tabsSupportingBrowsers?.preferredBrowserPackage ||
+      tabsSupportingBrowsers.browserPackages[0] ||
+      tabsSupportingBrowsers.servicePackages[0]
+  }
+  return browserPackage
+}
+
+export default browserPackage
diff --git a/src/screens/Tabs/Me/Push.tsx b/src/screens/Tabs/Me/Push.tsx
index 3e75454b..5d498b8b 100644
--- a/src/screens/Tabs/Me/Push.tsx
+++ b/src/screens/Tabs/Me/Push.tsx
@@ -2,6 +2,7 @@ import Button from '@components/Button'
 import Icon from '@components/Icon'
 import { MenuContainer, MenuRow } from '@components/Menu'
 import CustomText from '@components/Text'
+import browserPackage from '@helpers/browserPackage'
 import { useAppDispatch } from '@root/store'
 import { isDevelopment } from '@utils/checkEnvironment'
 import { getExpoToken } from '@utils/slices/appSlice'
@@ -153,7 +154,11 @@ const TabMePush: React.FC = () => {
             <MenuRow
               title={t('me.push.howitworks')}
               iconBack='ExternalLink'
-              onPress={() => WebBrowser.openBrowserAsync('https://tooot.app/how-push-works')}
+              onPress={async () =>
+                WebBrowser.openBrowserAsync('https://tooot.app/how-push-works', {
+                  browserPackage: await browserPackage()
+                })
+              }
             />
           </MenuContainer>
           <MenuContainer>{alerts}</MenuContainer>
diff --git a/src/screens/Tabs/Me/Root/Settings.tsx b/src/screens/Tabs/Me/Root/Settings.tsx
index d7687db4..6ea7d071 100644
--- a/src/screens/Tabs/Me/Root/Settings.tsx
+++ b/src/screens/Tabs/Me/Root/Settings.tsx
@@ -1,4 +1,5 @@
 import { MenuContainer, MenuRow } from '@components/Menu'
+import browserPackage from '@helpers/browserPackage'
 import { useNavigation } from '@react-navigation/native'
 import { getInstanceActive, getInstanceUrl } from '@utils/slices/instancesSlice'
 import * as WebBrowser from 'expo-web-browser'
@@ -25,11 +26,15 @@ const Settings: React.FC = () => {
           iconFront='Sliders'
           iconBack='ExternalLink'
           title={t('me.stacks.webSettings.name')}
-          onPress={() =>
+          onPress={async () =>
             WebBrowser.openAuthSessionAsync(
               `https://${url}/settings/preferences`,
               'tooot://tooot',
-              { dismissButtonStyle: 'done', readerMode: false }
+              {
+                browserPackage: await browserPackage(),
+                dismissButtonStyle: 'done',
+                readerMode: false
+              }
             )
           }
         />
diff --git a/src/screens/Tabs/Me/Settings/Tooot.tsx b/src/screens/Tabs/Me/Settings/Tooot.tsx
index cac380dd..ab15f365 100644
--- a/src/screens/Tabs/Me/Settings/Tooot.tsx
+++ b/src/screens/Tabs/Me/Settings/Tooot.tsx
@@ -14,6 +14,7 @@ import { isDevelopment, isRelease } from '@utils/checkEnvironment'
 import { Platform } from 'react-native'
 import Constants from 'expo-constants'
 import { getExpoToken } from '@utils/slices/appSlice'
+import browserPackage from '@helpers/browserPackage'
 
 const SettingsTooot: React.FC = () => {
   const instanceActive = useSelector(getInstanceActive)
@@ -52,7 +53,7 @@ const SettingsTooot: React.FC = () => {
         title={t('me.settings.contact.heading')}
         content={<Icon name='Mail' size={StyleConstants.Font.Size.M} color={colors.secondary} />}
         iconBack='ChevronRight'
-        onPress={() => {
+        onPress={async () => {
           if (instanceActive !== -1) {
             navigation.navigate('Screen-Compose', {
               type: 'conversation',
@@ -71,7 +72,9 @@ const SettingsTooot: React.FC = () => {
                 ']'
             })
           } else {
-            WebBrowser.openBrowserAsync('https://social.xmflsct.com/@tooot')
+            WebBrowser.openBrowserAsync('https://social.xmflsct.com/@tooot', {
+              browserPackage: await browserPackage()
+            })
           }
         }}
       />

From be30ec3e3cd6149e0bdb4284342a9ed2690e653c Mon Sep 17 00:00:00 2001
From: xmflsct <me@xmflsct.com>
Date: Sun, 4 Dec 2022 00:38:15 +0100
Subject: [PATCH 22/40] Fix Android crashing

---
 src/components/Sparkline.tsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/Sparkline.tsx b/src/components/Sparkline.tsx
index f0eb6aa0..21792069 100644
--- a/src/components/Sparkline.tsx
+++ b/src/components/Sparkline.tsx
@@ -1,6 +1,7 @@
 import { useTheme } from '@utils/styles/ThemeManager'
 import { maxBy, minBy } from 'lodash'
 import React from 'react'
+import { Platform } from 'react-native'
 import Svg, { G, Path } from 'react-native-svg'
 
 export interface Props {
@@ -68,7 +69,7 @@ const Sparkline: React.FC<Props> = ({ data, width, height, margin = 0 }) => {
   const fillPoints = linePoints.concat(closePolyPoints)
 
   return (
-    <Svg height='auto' width={width}>
+    <Svg height={Platform.OS !== 'android' ? 'auto' : 24} width={width}>
       <G>
         <Path d={'M' + fillPoints.join(' ')} fill={colors.blue} fillOpacity={0.1} />
         <Path

From 52ece9a2eb167f04855b881d3107714350669ba0 Mon Sep 17 00:00:00 2001
From: xmflsct <me@xmflsct.com>
Date: Sun, 4 Dec 2022 01:12:59 +0100
Subject: [PATCH 23/40] Bump up packages

---
 ios/Podfile.lock |   8 +-
 package.json     |  26 ++--
 yarn.lock        | 304 +++++++++++++++++++++++------------------------
 3 files changed, 167 insertions(+), 171 deletions(-)

diff --git a/ios/Podfile.lock b/ios/Podfile.lock
index e676ffb5..82d8d8f0 100644
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -297,7 +297,7 @@ PODS:
     - React-Core
   - react-native-cameraroll (5.1.0):
     - React-Core
-  - react-native-image-picker (4.10.1):
+  - react-native-image-picker (4.10.2):
     - React-Core
   - react-native-ios-context-menu (1.15.1):
     - React-Core
@@ -428,7 +428,7 @@ PODS:
   - RNScreens (3.18.2):
     - React-Core
     - React-RCTImage
-  - RNSentry (4.10.0):
+  - RNSentry (4.10.1):
     - React-Core
     - Sentry/HybridSDK (= 7.31.2)
   - RNShareMenu (6.0.0):
@@ -737,7 +737,7 @@ SPEC CHECKSUMS:
   react-native-blur: 50c9feabacbc5f49b61337ebc32192c6be7ec3c3
   react-native-blurhash: add4df9a937b4e021a24bc67a0714f13e0bd40b7
   react-native-cameraroll: a40b082318eb1ecd0336a2f29d9f74b7f2c8cae8
-  react-native-image-picker: f2ab1215d17bcfe27b0eb6417cc236fd1f4775e7
+  react-native-image-picker: bf34f3f516d139ed3e24c5f5a381a91819e349ea
   react-native-ios-context-menu: b170594b4448c0cd10c79e13432216bac99de1ac
   react-native-language-detection: 0e43195ad014974f1b7a31b64820eff34a243f2d
   react-native-live-text-image-view: 483bacfdba464162b8cf176bba555364f18b584c
@@ -765,7 +765,7 @@ SPEC CHECKSUMS:
   RNGestureHandler: 62232ba8f562f7dea5ba1b3383494eb5bf97a4d3
   RNReanimated: ce445c233a6ff5600223484a88ad5704945d972a
   RNScreens: 34cc502acf1b916c582c60003dc3089fa01dc66d
-  RNSentry: 211e1a62145d5bcb4bee926823061b5af47816c4
+  RNSentry: 3c27f3c57f16bab9835d9555add298571077e0c1
   RNShareMenu: cb9dac548c8bf147d06f0bf07296ad51ea9f5fc3
   RNSVG: 3a79c0c4992213e4f06c08e62730c5e7b9e4dc17
   SDWebImage: b9a731e1d6307f44ca703b3976d18c24ca561e84
diff --git a/package.json b/package.json
index cdf9715f..12581c74 100644
--- a/package.json
+++ b/package.json
@@ -19,12 +19,12 @@
   },
   "dependencies": {
     "@expo/react-native-action-sheet": "^4.0.1",
-    "@formatjs/intl-datetimeformat": "^6.4.0",
-    "@formatjs/intl-getcanonicallocales": "^2.0.4",
-    "@formatjs/intl-locale": "^3.0.8",
-    "@formatjs/intl-numberformat": "^8.3.0",
-    "@formatjs/intl-pluralrules": "^5.1.5",
-    "@formatjs/intl-relativetimeformat": "^11.1.4",
+    "@formatjs/intl-datetimeformat": "^6.4.3",
+    "@formatjs/intl-getcanonicallocales": "^2.0.5",
+    "@formatjs/intl-locale": "^3.0.11",
+    "@formatjs/intl-numberformat": "^8.3.3",
+    "@formatjs/intl-pluralrules": "^5.1.8",
+    "@formatjs/intl-relativetimeformat": "^11.1.8",
     "@mattermost/react-native-paste-input": "^0.5.1",
     "@neverdull-agency/expo-unlimited-secure-store": "^1.0.10",
     "@react-native-async-storage/async-storage": "~1.17.11",
@@ -38,12 +38,12 @@
     "@react-navigation/native": "^6.0.16",
     "@react-navigation/native-stack": "^6.9.4",
     "@react-navigation/stack": "^6.3.7",
-    "@reduxjs/toolkit": "^1.9.0",
-    "@sentry/react-native": "4.10.0",
+    "@reduxjs/toolkit": "^1.9.1",
+    "@sentry/react-native": "4.10.1",
     "@sharcoux/slider": "^6.1.1",
     "axios": "^0.27.2",
     "expo": "^47.0.8",
-    "expo-auth-session": "^3.7.2",
+    "expo-auth-session": "^3.7.3",
     "expo-av": "^13.0.2",
     "expo-constants": "^14.0.2",
     "expo-crypto": "^12.0.0",
@@ -66,7 +66,7 @@
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "react-i18next": "^12.0.0",
-    "react-intl": "^6.2.2",
+    "react-intl": "^6.2.5",
     "react-native": "0.70.6",
     "react-native-animated-spinkit": "^1.5.2",
     "react-native-base64": "^0.2.1",
@@ -76,7 +76,7 @@
     "react-native-flash-message": "^0.3.1",
     "react-native-gesture-handler": "~2.8.0",
     "react-native-htmlview": "^0.16.0",
-    "react-native-image-picker": "^4.10.1",
+    "react-native-image-picker": "^4.10.2",
     "react-native-ios-context-menu": "^1.15.1",
     "react-native-language-detection": "^0.1.0",
     "react-native-live-text-image-view": "^0.4.0",
@@ -103,8 +103,8 @@
     "@babel/preset-typescript": "^7.18.6",
     "@expo/config": "^7.0.3",
     "@types/linkify-it": "^3.0.2",
-    "@types/lodash": "^4.14.190",
-    "@types/react": "~18.0.25",
+    "@types/lodash": "^4.14.191",
+    "@types/react": "~18.0.26",
     "@types/react-dom": "~18.0.9",
     "@types/react-native": "~0.70.7",
     "@types/react-native-base64": "^0.2.0",
diff --git a/yarn.lock b/yarn.lock
index 11f619fc..05ef3028 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1738,135 +1738,127 @@
     find-up "^5.0.0"
     js-yaml "^4.1.0"
 
-"@formatjs/ecma402-abstract@1.13.0":
-  version "1.13.0"
-  resolved "https://registry.yarnpkg.com/@formatjs/ecma402-abstract/-/ecma402-abstract-1.13.0.tgz#df6db3cbee0182bbd2fd6217103781c802aee819"
-  integrity sha512-CQ8Ykd51jYD1n05dtoX6ns6B9n/+6ZAxnWUAonvHC4kkuAemROYBhHkEB4tm1uVrRlE7gLDqXkAnY51Y0pRCWQ==
+"@formatjs/ecma402-abstract@1.14.3":
+  version "1.14.3"
+  resolved "https://registry.yarnpkg.com/@formatjs/ecma402-abstract/-/ecma402-abstract-1.14.3.tgz#6428f243538a11126180d121ce8d4b2f17465738"
+  integrity sha512-SlsbRC/RX+/zg4AApWIFNDdkLtFbkq3LNoZWXZCE/nHVKqoIJyaoQyge/I0Y38vLxowUn9KTtXgusLD91+orbg==
   dependencies:
-    "@formatjs/intl-localematcher" "0.2.31"
-    tslib "2.4.0"
+    "@formatjs/intl-localematcher" "0.2.32"
+    tslib "^2.4.0"
 
-"@formatjs/ecma402-abstract@1.14.0":
-  version "1.14.0"
-  resolved "https://registry.yarnpkg.com/@formatjs/ecma402-abstract/-/ecma402-abstract-1.14.0.tgz#2ee584d671e2776434da88b3e1ae4ed3053ad450"
-  integrity sha512-o1RDlkxcLzi0ZcoaovQooZC+0M3Ox0/DKZ+YTdUU9DHgWFeEZbYXEqM9k7JHdN7VyRi4wprTVPqrK+zR/9mo8Q==
+"@formatjs/fast-memoize@1.2.7":
+  version "1.2.7"
+  resolved "https://registry.yarnpkg.com/@formatjs/fast-memoize/-/fast-memoize-1.2.7.tgz#90d5de031fc80e0027b2d4e8a3197b0df4a94457"
+  integrity sha512-hPeM5LXUUjtCKPybWOUAWpv8lpja8Xz+uKprFPJcg5F2Rd+/bf1E0UUsLRpaAgOReAf5HMRtoIgv/UcyPICrTQ==
   dependencies:
-    "@formatjs/intl-localematcher" "0.2.31"
-    tslib "2.4.0"
+    tslib "^2.4.0"
 
-"@formatjs/fast-memoize@1.2.6":
-  version "1.2.6"
-  resolved "https://registry.yarnpkg.com/@formatjs/fast-memoize/-/fast-memoize-1.2.6.tgz#a442970db7e9634af556919343261a7bbe5e88c3"
-  integrity sha512-9CWZ3+wCkClKHX+i5j+NyoBVqGf0pIskTo6Xl6ihGokYM2yqSSS68JIgeo+99UIHc+7vi9L3/SDSz/dWI9SNlA==
+"@formatjs/icu-messageformat-parser@2.1.14":
+  version "2.1.14"
+  resolved "https://registry.yarnpkg.com/@formatjs/icu-messageformat-parser/-/icu-messageformat-parser-2.1.14.tgz#d7bc8c82bfce1eb8e3232e6d7e3d6ea92ba390cc"
+  integrity sha512-0KqeVOb72losEhUW+59vhZGGd14s1f35uThfEMVKZHKLEObvJdFTiI3ZQwvTMUCzLEMxnS6mtnYPmG4mTvwd3Q==
   dependencies:
-    tslib "2.4.0"
+    "@formatjs/ecma402-abstract" "1.14.3"
+    "@formatjs/icu-skeleton-parser" "1.3.18"
+    tslib "^2.4.0"
 
-"@formatjs/icu-messageformat-parser@2.1.11":
-  version "2.1.11"
-  resolved "https://registry.yarnpkg.com/@formatjs/icu-messageformat-parser/-/icu-messageformat-parser-2.1.11.tgz#d0b59145bf910ea0fdd023a848369d7f08a16c26"
-  integrity sha512-g2OET65sDI0F3RUNXcyQPlxn+h+zQ6RkFIZZnOo70LtMEHTyDbgaMvauRlkBX52kqEe9eI99I3RaLvaM8pEcEg==
+"@formatjs/icu-skeleton-parser@1.3.18":
+  version "1.3.18"
+  resolved "https://registry.yarnpkg.com/@formatjs/icu-skeleton-parser/-/icu-skeleton-parser-1.3.18.tgz#7aed3d60e718c8ad6b0e64820be44daa1e29eeeb"
+  integrity sha512-ND1ZkZfmLPcHjAH1sVpkpQxA+QYfOX3py3SjKWMUVGDow18gZ0WPqz3F+pJLYQMpS2LnnQ5zYR2jPVYTbRwMpg==
   dependencies:
-    "@formatjs/ecma402-abstract" "1.14.0"
-    "@formatjs/icu-skeleton-parser" "1.3.15"
-    tslib "2.4.0"
+    "@formatjs/ecma402-abstract" "1.14.3"
+    tslib "^2.4.0"
 
-"@formatjs/icu-skeleton-parser@1.3.15":
-  version "1.3.15"
-  resolved "https://registry.yarnpkg.com/@formatjs/icu-skeleton-parser/-/icu-skeleton-parser-1.3.15.tgz#b30c6437aa259e8720e14beeff7e9c713d6e5646"
-  integrity sha512-/x7qBaswEGLEBm0vY8HmYy764py0FmD+pSzBNH5llgp1d0NFAIo+lTfsKFxPDk+iNNnL3f7ZH0KOyUtAResZ5Q==
+"@formatjs/intl-datetimeformat@^6.4.3":
+  version "6.4.3"
+  resolved "https://registry.yarnpkg.com/@formatjs/intl-datetimeformat/-/intl-datetimeformat-6.4.3.tgz#1ef2b578186c9843603d1c07f9f9c369f5ab292d"
+  integrity sha512-+fLPuBHTZZqJJzjfK4cqamW00j8yCtcQekkAVvfSn/2xibJaQvhqrpDs++4/qM847lZtnDU3q33lelM3H5JMbQ==
   dependencies:
-    "@formatjs/ecma402-abstract" "1.14.0"
-    tslib "2.4.0"
+    "@formatjs/ecma402-abstract" "1.14.3"
+    "@formatjs/intl-localematcher" "0.2.32"
+    tslib "^2.4.0"
 
-"@formatjs/intl-datetimeformat@^6.4.0":
-  version "6.4.0"
-  resolved "https://registry.yarnpkg.com/@formatjs/intl-datetimeformat/-/intl-datetimeformat-6.4.0.tgz#cb743fb0aa0d119da1ad52e8c8688659cc704047"
-  integrity sha512-9dLbEq5UGCySAhVIOC+cUhhDHBDePBb2lafAllDxRpE6SHGBpEhxLLWMvm9iMokckF/T/Usg3240AxcKR3JNrA==
+"@formatjs/intl-displaynames@6.2.3":
+  version "6.2.3"
+  resolved "https://registry.yarnpkg.com/@formatjs/intl-displaynames/-/intl-displaynames-6.2.3.tgz#65bc954fe891fdfe197268602f4d2d3ccd631cce"
+  integrity sha512-teB0L68MDGM8jEKQg55w7nvFjzeLHE6e3eK/04s+iuEVYYmvjjiHJKHrthKENzcJ0F6mHf/AwXrbX+1mKxT6AQ==
   dependencies:
-    "@formatjs/ecma402-abstract" "1.14.0"
-    "@formatjs/intl-localematcher" "0.2.31"
-    tslib "2.4.0"
+    "@formatjs/ecma402-abstract" "1.14.3"
+    "@formatjs/intl-localematcher" "0.2.32"
+    tslib "^2.4.0"
 
-"@formatjs/intl-displaynames@6.2.0":
-  version "6.2.0"
-  resolved "https://registry.yarnpkg.com/@formatjs/intl-displaynames/-/intl-displaynames-6.2.0.tgz#e0c5d2bec69949cccf9c0d533489d66667d9ed5b"
-  integrity sha512-gZCZBi7zYzkloVlzjNSS5XAZ0LNx51xHSzZhkqtkOnh1sWGP2Ciz/IcQQ/81SNzIk0kSCHx0n/VrisO7RLHkZQ==
+"@formatjs/intl-getcanonicallocales@2.0.5", "@formatjs/intl-getcanonicallocales@^2.0.5":
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/@formatjs/intl-getcanonicallocales/-/intl-getcanonicallocales-2.0.5.tgz#d405cf5221f49531e62ecfde50acdfb62fcc4854"
+  integrity sha512-YOk+Fa5gpPq5bdpm8JDAY5bkfCkR+NENZKQbLHeqhm8JchHcclPwZ9FU48gYGg3CW6Wi/cTCOvmOrzsIhlkr0w==
   dependencies:
-    "@formatjs/ecma402-abstract" "1.14.0"
-    "@formatjs/intl-localematcher" "0.2.31"
-    tslib "2.4.0"
+    tslib "^2.4.0"
 
-"@formatjs/intl-getcanonicallocales@2.0.4", "@formatjs/intl-getcanonicallocales@^2.0.4":
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/@formatjs/intl-getcanonicallocales/-/intl-getcanonicallocales-2.0.4.tgz#6e294c43c1753d4713ec3e055440b0f10e6fa7dc"
-  integrity sha512-+Sd9QcfnUQlo/hnBq8Czh3TyVgHWK1AW2fAlUABLCd6zVxJwFpHX20CATetH9lKKgbaG8fOP/ijn/7So6aa2fQ==
+"@formatjs/intl-listformat@7.1.7":
+  version "7.1.7"
+  resolved "https://registry.yarnpkg.com/@formatjs/intl-listformat/-/intl-listformat-7.1.7.tgz#b46fec1038ef9ca062d1e7b9b3412c2a14dca18f"
+  integrity sha512-Zzf5ruPpfJnrAA2hGgf/6pMgQ3tx9oJVhpqycFDavHl3eEzrwdHddGqGdSNwhd0bB4NAFttZNQdmKDldc5iDZw==
   dependencies:
-    tslib "2.4.0"
+    "@formatjs/ecma402-abstract" "1.14.3"
+    "@formatjs/intl-localematcher" "0.2.32"
+    tslib "^2.4.0"
 
-"@formatjs/intl-listformat@7.1.4":
-  version "7.1.4"
-  resolved "https://registry.yarnpkg.com/@formatjs/intl-listformat/-/intl-listformat-7.1.4.tgz#a9d6483618f827bc97f1995301ea1734631e2078"
-  integrity sha512-hSUbhmNEcjtVcN7IkSpkFlectb3354sk+0RMa30H16LvBuLL+uXOt3RlwEWEDG7DjU5bcDqMuEu3fvoCKHpSvQ==
+"@formatjs/intl-locale@^3.0.11":
+  version "3.0.11"
+  resolved "https://registry.yarnpkg.com/@formatjs/intl-locale/-/intl-locale-3.0.11.tgz#6b3bee5692fab3c70a0ce9c642c2a2bec3700aa4"
+  integrity sha512-gLEX9kzebBjIVCkXMMN+VFMUV2aj0vhmrP+nke2muxUSJ3fLs/DJjlkv+s59rAL3nNaGdvphqKLhQsul0mmhAw==
   dependencies:
-    "@formatjs/ecma402-abstract" "1.14.0"
-    "@formatjs/intl-localematcher" "0.2.31"
-    tslib "2.4.0"
+    "@formatjs/ecma402-abstract" "1.14.3"
+    "@formatjs/intl-getcanonicallocales" "2.0.5"
+    tslib "^2.4.0"
 
-"@formatjs/intl-locale@^3.0.8":
-  version "3.0.8"
-  resolved "https://registry.yarnpkg.com/@formatjs/intl-locale/-/intl-locale-3.0.8.tgz#9a98f06081ae5b093378116b7a871741a03c197a"
-  integrity sha512-/bauX5OtC+VTZtrGAMkKONn4zrkvyvhMna93hSx0bALxwFjOo2U+n84fO+GVayI0WySV0S2bVD0cwzcHCQJYag==
+"@formatjs/intl-localematcher@0.2.32":
+  version "0.2.32"
+  resolved "https://registry.yarnpkg.com/@formatjs/intl-localematcher/-/intl-localematcher-0.2.32.tgz#00d4d307cd7d514b298e15a11a369b86c8933ec1"
+  integrity sha512-k/MEBstff4sttohyEpXxCmC3MqbUn9VvHGlZ8fauLzkbwXmVrEeyzS+4uhrvAk9DWU9/7otYWxyDox4nT/KVLQ==
   dependencies:
-    "@formatjs/ecma402-abstract" "1.14.0"
-    "@formatjs/intl-getcanonicallocales" "2.0.4"
-    tslib "2.4.0"
+    tslib "^2.4.0"
 
-"@formatjs/intl-localematcher@0.2.31":
-  version "0.2.31"
-  resolved "https://registry.yarnpkg.com/@formatjs/intl-localematcher/-/intl-localematcher-0.2.31.tgz#aada2b1e58211460cedba56889e3c489117eb6eb"
-  integrity sha512-9QTjdSBpQ7wHShZgsNzNig5qT3rCPvmZogS/wXZzKotns5skbXgs0I7J8cuN0PPqXyynvNVuN+iOKhNS2eb+ZA==
+"@formatjs/intl-numberformat@^8.3.3":
+  version "8.3.3"
+  resolved "https://registry.yarnpkg.com/@formatjs/intl-numberformat/-/intl-numberformat-8.3.3.tgz#bfba1a90a22a28479dae4cf8cc16fb81ff659a36"
+  integrity sha512-11mSFZb5RsCVZMVaHbRcDYNxQ+tsstReL62AJcTCBZdvAZMqECOEsDkJODZ90nf/ClKqp0/KxwVlshxprn22Nw==
   dependencies:
-    tslib "2.4.0"
+    "@formatjs/ecma402-abstract" "1.14.3"
+    "@formatjs/intl-localematcher" "0.2.32"
+    tslib "^2.4.0"
 
-"@formatjs/intl-numberformat@^8.3.0":
-  version "8.3.0"
-  resolved "https://registry.yarnpkg.com/@formatjs/intl-numberformat/-/intl-numberformat-8.3.0.tgz#32b72f146a4c8a6ea19408eb55d77b170c37f544"
-  integrity sha512-WDGbaGhJOfl9tYfLDmAdDvtuIwud3ABM1mfuLELXO0ETQJICD89oIOFMTITCoWZBdxqsP55B64SJQBFJNBwQAg==
+"@formatjs/intl-pluralrules@^5.1.8":
+  version "5.1.8"
+  resolved "https://registry.yarnpkg.com/@formatjs/intl-pluralrules/-/intl-pluralrules-5.1.8.tgz#11eeca3cde088fd68d258a09b0791b327a8eb019"
+  integrity sha512-uevO916EWoeuueqeNzHjnUzpfWZzXFJibC/sEvPR/ZiZH5btWuOLeJLdb1To4nMH8ZJQlmAf8SDpFf+eWvz5lQ==
   dependencies:
-    "@formatjs/ecma402-abstract" "1.14.0"
-    "@formatjs/intl-localematcher" "0.2.31"
-    tslib "2.4.0"
+    "@formatjs/ecma402-abstract" "1.14.3"
+    "@formatjs/intl-localematcher" "0.2.32"
+    tslib "^2.4.0"
 
-"@formatjs/intl-pluralrules@^5.1.5":
-  version "5.1.5"
-  resolved "https://registry.yarnpkg.com/@formatjs/intl-pluralrules/-/intl-pluralrules-5.1.5.tgz#41de4ec508b5c240e4923a7807bbc3c8412425ae"
-  integrity sha512-Y+IB9xjJ1fhKIhFbmlvCYHyAQAbnuqqIo56C5P41A6PGUH2FGj+6v2xlwzE7vKb6+jxBGGqd1JVTYNJNGx0sGw==
+"@formatjs/intl-relativetimeformat@^11.1.8":
+  version "11.1.8"
+  resolved "https://registry.yarnpkg.com/@formatjs/intl-relativetimeformat/-/intl-relativetimeformat-11.1.8.tgz#8bce76cc396d143558cb8335f2b4b12b85259413"
+  integrity sha512-5evaQTfSiSNLXt6GxfPEq2YGtPCH2UKNEoPB0Rg9+3IPSPp5o39Oks91bDZE8SCk5rK2ABlmrc8ZnMILfZhl/Q==
   dependencies:
-    "@formatjs/ecma402-abstract" "1.14.0"
-    "@formatjs/intl-localematcher" "0.2.31"
-    tslib "2.4.0"
+    "@formatjs/ecma402-abstract" "1.14.3"
+    "@formatjs/intl-localematcher" "0.2.32"
+    tslib "^2.4.0"
 
-"@formatjs/intl-relativetimeformat@^11.1.4":
-  version "11.1.4"
-  resolved "https://registry.yarnpkg.com/@formatjs/intl-relativetimeformat/-/intl-relativetimeformat-11.1.4.tgz#e8ececbae337caf4c62946f6080ef9eecfc6f36f"
-  integrity sha512-vUz2O1OpmKAyLTyQw6BUT0KMrm/2373zPUlF5wlCmy6mT4YIvxUAizaeSLHKpjQgc6qWmzsOiQTJG04Sz2vtYA==
+"@formatjs/intl@2.6.3":
+  version "2.6.3"
+  resolved "https://registry.yarnpkg.com/@formatjs/intl/-/intl-2.6.3.tgz#7cedd184fb62d39174fbf62ee636b1b306524b7c"
+  integrity sha512-JaVZk14U/GypVfCZPevQ0KdruFkq16FXx7g398/Dm+YEx/W7sRiftbZeDy4wQ7WGryb45e763XycxD9o/vm9BA==
   dependencies:
-    "@formatjs/ecma402-abstract" "1.13.0"
-    "@formatjs/intl-localematcher" "0.2.31"
-    tslib "2.4.0"
-
-"@formatjs/intl@2.6.0":
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/@formatjs/intl/-/intl-2.6.0.tgz#9698d44d7167a93f301405d4cbff8e640498d569"
-  integrity sha512-pMrNpqNGj7QnQewIBe8Dh52teZ24hQpP4w4S4UzB0BZmTJ3KkIi05oJoL2Cagzsli4j1pXR0V39LD7+lnWhgCg==
-  dependencies:
-    "@formatjs/ecma402-abstract" "1.14.0"
-    "@formatjs/fast-memoize" "1.2.6"
-    "@formatjs/icu-messageformat-parser" "2.1.11"
-    "@formatjs/intl-displaynames" "6.2.0"
-    "@formatjs/intl-listformat" "7.1.4"
-    intl-messageformat "10.2.2"
-    tslib "2.4.0"
+    "@formatjs/ecma402-abstract" "1.14.3"
+    "@formatjs/fast-memoize" "1.2.7"
+    "@formatjs/icu-messageformat-parser" "2.1.14"
+    "@formatjs/intl-displaynames" "6.2.3"
+    "@formatjs/intl-listformat" "7.1.7"
+    intl-messageformat "10.2.5"
+    tslib "^2.4.0"
 
 "@gar/promisify@^1.0.1":
   version "1.1.3"
@@ -2548,10 +2540,10 @@
     color "^4.2.3"
     warn-once "^0.1.0"
 
-"@reduxjs/toolkit@^1.9.0":
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/@reduxjs/toolkit/-/toolkit-1.9.0.tgz#76b264fcea677d256b18f86cc77e00743a9e02b0"
-  integrity sha512-ak11IrjYcUXRqlhNPwnz6AcvA2ynJTu8PzDbbqQw4a3xR4KZtgiqbNblQD+10CRbfK4+5C79SOyxnT9dhBqFnA==
+"@reduxjs/toolkit@^1.9.1":
+  version "1.9.1"
+  resolved "https://registry.yarnpkg.com/@reduxjs/toolkit/-/toolkit-1.9.1.tgz#4c34dc4ddcec161535288c60da5c19c3ef15180e"
+  integrity sha512-HikrdY+IDgRfRYlCTGUQaiCxxDDgM1mQrRbZ6S1HFZX5ZYuJ4o8EstNmhTwHdPl2rTmLxzwSu0b3AyeyTlR+RA==
   dependencies:
     immer "^9.0.16"
     redux "^4.2.0"
@@ -2589,7 +2581,7 @@
     proxy-from-env "^1.1.0"
     which "^2.0.2"
 
-"@sentry/cli@^1.52.4":
+"@sentry/cli@^1.72.0":
   version "1.74.6"
   resolved "https://registry.yarnpkg.com/@sentry/cli/-/cli-1.74.6.tgz#c4f276e52c6f5e8c8d692845a965988068ebc6f5"
   integrity sha512-pJ7JJgozyjKZSTjOGi86chIngZMLUlYt2HOog+OJn+WGvqEkVymu8m462j1DiXAnex9NspB4zLLNuZ/R6rTQHg==
@@ -2631,10 +2623,10 @@
     localforage "^1.8.1"
     tslib "^1.9.3"
 
-"@sentry/react-native@4.10.0":
-  version "4.10.0"
-  resolved "https://registry.yarnpkg.com/@sentry/react-native/-/react-native-4.10.0.tgz#5824aeecf7dab27afd6f635411f2738faffd546c"
-  integrity sha512-90hPQ+kdHpCPwA6iAuDIvsDi9aM07JMGXP3fHivSIAVWGtpBtYjl+QT1amDorXwW04RdVLCEteL+21t0DxU8Eg==
+"@sentry/react-native@4.10.1":
+  version "4.10.1"
+  resolved "https://registry.yarnpkg.com/@sentry/react-native/-/react-native-4.10.1.tgz#9e2c1f5dd4b27103882a71503805f86059a7cde9"
+  integrity sha512-yF5g2bCjPpfu4DUVQPlDnSMUdz5bh/i1s9zZ5cnOmA9LsXQulk9o1Z6fTeZ5LkgPzogTRjn0eudvaCz5u+nxaA==
   dependencies:
     "@sentry/browser" "7.21.1"
     "@sentry/cli" "1.74.4"
@@ -2645,7 +2637,7 @@
     "@sentry/tracing" "7.21.1"
     "@sentry/types" "7.21.1"
     "@sentry/utils" "7.21.1"
-    "@sentry/wizard" "1.2.17"
+    "@sentry/wizard" "1.4.0"
 
 "@sentry/react@7.21.1":
   version "7.21.1"
@@ -2681,12 +2673,12 @@
     "@sentry/types" "7.21.1"
     tslib "^1.9.3"
 
-"@sentry/wizard@1.2.17":
-  version "1.2.17"
-  resolved "https://registry.yarnpkg.com/@sentry/wizard/-/wizard-1.2.17.tgz#c3247b47129d002cfa45d7a2048d13dc6513457b"
-  integrity sha512-wXzjOZVDzh+1MhA9tpZXCKNTDusL2Dc298KGQkEkNefbW+OlYbsWwF7GAihLKUjYOSnKKZFzLIwbD+gxwxWxlw==
+"@sentry/wizard@1.4.0":
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/@sentry/wizard/-/wizard-1.4.0.tgz#9356ae2cb9e81ee6fa64418d15638607f1a957bd"
+  integrity sha512-Q/f9wJAAAr/YB6oWUzMQP/y5LIgx9la1SanMHNr3hMtVPKkMhvIZO5UWVn2G763yi85zARqSCLDx31/tZd4new==
   dependencies:
-    "@sentry/cli" "^1.52.4"
+    "@sentry/cli" "^1.72.0"
     chalk "^2.4.1"
     glob "^7.1.3"
     inquirer "^6.2.0"
@@ -2826,10 +2818,10 @@
   resolved "https://registry.yarnpkg.com/@types/linkify-it/-/linkify-it-3.0.2.tgz#fd2cd2edbaa7eaac7e7f3c1748b52a19143846c9"
   integrity sha512-HZQYqbiFVWufzCwexrvh694SOim8z2d+xJl5UNamcvQFejLY/2YUtzXHYi3cHdI7PMlS8ejH2slRAOJQ32aNbA==
 
-"@types/lodash@^4.14.190":
-  version "4.14.190"
-  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.190.tgz#d8e99647af141c63902d0ca53cf2b34d2df33545"
-  integrity sha512-5iJ3FBJBvQHQ8sFhEhJfjUP+G+LalhavTkYyrAYqz5MEJG+erSv0k9KJLb6q7++17Lafk1scaTIFXcMJlwK8Mw==
+"@types/lodash@^4.14.191":
+  version "4.14.191"
+  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.191.tgz#09511e7f7cba275acd8b419ddac8da9a6a79e2fa"
+  integrity sha512-BdZ5BCCvho3EIXw6wUCXHe7rS53AIDPLE+JzwgT+OsJk53oBfbSmZZ7CX4VaRoN78N+TJpFi9QPlfIVNmJYWxQ==
 
 "@types/minimatch@*":
   version "5.1.2"
@@ -2887,7 +2879,7 @@
   dependencies:
     "@types/react" "*"
 
-"@types/react@*", "@types/react@16 || 17 || 18", "@types/react@~18.0.25":
+"@types/react@*", "@types/react@16 || 17 || 18":
   version "18.0.25"
   resolved "https://registry.yarnpkg.com/@types/react/-/react-18.0.25.tgz#8b1dcd7e56fe7315535a4af25435e0bb55c8ae44"
   integrity sha512-xD6c0KDT4m7n9uD4ZHi02lzskaiqcBxf4zi+tXZY98a04wvc0hi/TcCPC2FOESZi51Nd7tlUeOJY8RofL799/g==
@@ -2896,6 +2888,15 @@
     "@types/scheduler" "*"
     csstype "^3.0.2"
 
+"@types/react@~18.0.26":
+  version "18.0.26"
+  resolved "https://registry.yarnpkg.com/@types/react/-/react-18.0.26.tgz#8ad59fc01fef8eaf5c74f4ea392621749f0b7917"
+  integrity sha512-hCR3PJQsAIXyxhTNSiDFY//LhnMZWpNNr5etoCqx/iUfGc5gXWtQR2Phl908jVR6uPXacojQWTg4qRpkxTuGug==
+  dependencies:
+    "@types/prop-types" "*"
+    "@types/scheduler" "*"
+    csstype "^3.0.2"
+
 "@types/responselike@^1.0.0":
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/@types/responselike/-/responselike-1.0.0.tgz#251f4fe7d154d2bad125abe1b429b23afd262e29"
@@ -5839,10 +5840,10 @@ expo-asset@~8.6.2:
     path-browserify "^1.0.0"
     url-parse "^1.5.9"
 
-expo-auth-session@^3.7.2:
-  version "3.7.2"
-  resolved "https://registry.yarnpkg.com/expo-auth-session/-/expo-auth-session-3.7.2.tgz#4c67b9b5c4171efc79f42b19c7337baae3b4c20e"
-  integrity sha512-FLbliqiE39jZP+UjpMbxw8lWM+WlezgbcALr7HRkHCJHHM3taMkT8RX9oB1s68lUCA/EngcBKu5lSPDnbamcvg==
+expo-auth-session@^3.7.3:
+  version "3.7.3"
+  resolved "https://registry.yarnpkg.com/expo-auth-session/-/expo-auth-session-3.7.3.tgz#ded1afbbf88e0c6e4098e59920b4f13927fc1f3d"
+  integrity sha512-0mX47j6WdpEoaFVxU36VBRkEjJKwAkqnRyNdd5g+Ab1fHXQJJK3nzjOjxuBzgE8mKSS9NGHr/At9IGY6MLrg2g==
   dependencies:
     expo-constants "~14.0.0"
     expo-crypto "~12.0.0"
@@ -7430,15 +7431,15 @@ internal-slot@^1.0.3:
     has "^1.0.3"
     side-channel "^1.0.4"
 
-intl-messageformat@10.2.2:
-  version "10.2.2"
-  resolved "https://registry.yarnpkg.com/intl-messageformat/-/intl-messageformat-10.2.2.tgz#8436a6bf36d5d336513ff027fb099ca0d6676d13"
-  integrity sha512-iiaDjsEZNe92Vb8UIf46hT/3uVdcrL4x4GLjwFSVz/uC6ancQDUtyLVETX13wyTw78kBo3ONBMgiHoCtWN8ioQ==
+intl-messageformat@10.2.5:
+  version "10.2.5"
+  resolved "https://registry.yarnpkg.com/intl-messageformat/-/intl-messageformat-10.2.5.tgz#a51e6e2700d82b5b7ccd7a9f3bd45d967d95afc0"
+  integrity sha512-AievYMN6WLLHwBeCTv4aRKG+w3ZNyZtkObwgsKk3Q7GNTq8zDRvDbJSBQkb2OPeVCcAKcIXvak9FF/bRNavoww==
   dependencies:
-    "@formatjs/ecma402-abstract" "1.14.0"
-    "@formatjs/fast-memoize" "1.2.6"
-    "@formatjs/icu-messageformat-parser" "2.1.11"
-    tslib "2.4.0"
+    "@formatjs/ecma402-abstract" "1.14.3"
+    "@formatjs/fast-memoize" "1.2.7"
+    "@formatjs/icu-messageformat-parser" "2.1.14"
+    tslib "^2.4.0"
 
 invariant@*, invariant@^2.2.4:
   version "2.2.4"
@@ -10732,21 +10733,21 @@ react-i18next@^12.0.0:
     "@babel/runtime" "^7.14.5"
     html-parse-stringify "^3.0.1"
 
-react-intl@^6.2.2:
-  version "6.2.2"
-  resolved "https://registry.yarnpkg.com/react-intl/-/react-intl-6.2.2.tgz#966001736515cd4a24befcd60114c8c5fcc8e344"
-  integrity sha512-SW0BjtqyoxasdZYtoKLmPYjryqeN2vgtbOYc6J3PmJb/WHUih1X9LPjuL3Ap0Qen1sHLtUbwgJjRSWedGtibjg==
+react-intl@^6.2.5:
+  version "6.2.5"
+  resolved "https://registry.yarnpkg.com/react-intl/-/react-intl-6.2.5.tgz#eb871145e0866916d0c9283b2c83a146c6121793"
+  integrity sha512-nz21POTKbE0sPEuEJU4o5YTZYY7VlIYCPNJaD6D2+xKyk6Noj6DoUK0LRO9LXuQNUuQ044IZl3m6ymzZRj8XFQ==
   dependencies:
-    "@formatjs/ecma402-abstract" "1.14.0"
-    "@formatjs/icu-messageformat-parser" "2.1.11"
-    "@formatjs/intl" "2.6.0"
-    "@formatjs/intl-displaynames" "6.2.0"
-    "@formatjs/intl-listformat" "7.1.4"
+    "@formatjs/ecma402-abstract" "1.14.3"
+    "@formatjs/icu-messageformat-parser" "2.1.14"
+    "@formatjs/intl" "2.6.3"
+    "@formatjs/intl-displaynames" "6.2.3"
+    "@formatjs/intl-listformat" "7.1.7"
     "@types/hoist-non-react-statics" "^3.3.1"
     "@types/react" "16 || 17 || 18"
     hoist-non-react-statics "^3.3.2"
-    intl-messageformat "10.2.2"
-    tslib "2.4.0"
+    intl-messageformat "10.2.5"
+    tslib "^2.4.0"
 
 "react-is@^16.12.0 || ^17.0.0 || ^18.0.0", react-is@^18.0.0:
   version "18.2.0"
@@ -10835,10 +10836,10 @@ react-native-htmlview@^0.16.0:
     entities "^1.1.1"
     htmlparser2-without-node-native "^3.9.2"
 
-react-native-image-picker@^4.10.1:
-  version "4.10.1"
-  resolved "https://registry.yarnpkg.com/react-native-image-picker/-/react-native-image-picker-4.10.1.tgz#eb7e02124e8e649a89e4fcabb72d0312a65fe340"
-  integrity sha512-tPA9UtboEsZ8qtm7pX9WInlo9sf0J2ArJgP4uVgKw1QNrwkRX/kZQ6uzOSN747Dhj9WS42ce4RN+rFK86J13DQ==
+react-native-image-picker@^4.10.2:
+  version "4.10.2"
+  resolved "https://registry.yarnpkg.com/react-native-image-picker/-/react-native-image-picker-4.10.2.tgz#75b356c9eea70c2c4f5c1089f8758e2fa32f88a8"
+  integrity sha512-3h9PrA1dQ84rVeipzQE4eWTELvflSHNtJZN6rz7NkZyaxo9YZV8H/TswBpHwiS5YWlyu+zlLzSoWVa1opSu7GA==
 
 react-native-ios-context-menu@^1.15.1:
   version "1.15.1"
@@ -12587,11 +12588,6 @@ ts-pnp@^1.1.6:
   resolved "https://registry.yarnpkg.com/ts-pnp/-/ts-pnp-1.2.0.tgz#a500ad084b0798f1c3071af391e65912c86bca92"
   integrity sha512-csd+vJOb/gkzvcCHgTGSChYpy5f1/XKNsmvBGO4JXS+z1v2HobugDz4s1IeFXM3wZB44uczs+eazB5Q/ccdhQw==
 
-tslib@2.4.0:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.4.0.tgz#7cecaa7f073ce680a05847aa77be941098f36dc3"
-  integrity sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==
-
 tslib@^1.9.0, tslib@^1.9.3:
   version "1.14.1"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"

From b3441d6edbde448e48f4d1b1b2fc9fddfb90fed8 Mon Sep 17 00:00:00 2001
From: xmflsct <me@xmflsct.com>
Date: Sun, 4 Dec 2022 01:14:27 +0100
Subject: [PATCH 24/40] New Crowdin updates (#488)

* New translations tabs.json (Italian)

* New translations tabs.json (Japanese)

* New translations tabs.json (Korean)

* New translations tabs.json (Chinese Simplified)

* New translations tabs.json (Chinese Traditional)

* New translations tabs.json (Vietnamese)

* New translations tabs.json (Portuguese, Brazilian)

* New translations tabs.json (French)

* New translations tabs.json (Polish)

* New translations tabs.json (Spanish)

* New translations tabs.json (Swedish)

* New translations tabs.json (Czech)

* New translations common.json (Dutch)

* New translations instance.json (Dutch)

* New translations parse.json (Dutch)

* New translations relationship.json (Dutch)

* New translations timeline.json (Dutch)

* New translations actions.json (Dutch)

* New translations imageViewer.json (Dutch)

* New translations announcements.json (Dutch)

* New translations compose.json (Dutch)

* New translations screens.json (Dutch)

* New translations tabs.json (Dutch)

* New translations mediaSelector.json (Dutch)

* New translations emojis.json (Dutch)

* New translations contextMenu.json (Dutch)

* New translations accountSelection.json (Dutch)

* New translations common.json (Dutch)

* New translations instance.json (Dutch)

* New translations parse.json (Dutch)

* New translations relationship.json (Dutch)

* New translations timeline.json (Dutch)

* New translations actions.json (Dutch)

* New translations imageViewer.json (Dutch)

* New translations announcements.json (Dutch)

* New translations compose.json (Dutch)

* New translations screens.json (Dutch)

* New translations tabs.json (Dutch)

* New translations timeline.json (Dutch)

* New translations actions.json (Dutch)

* New translations compose.json (Dutch)

* New translations screens.json (Dutch)

* New translations tabs.json (Dutch)

* New translations mediaSelector.json (Dutch)

* New translations emojis.json (Dutch)

* New translations contextMenu.json (Dutch)

* New translations accountSelection.json (Dutch)

* New translations instance.json (German)

* New translations tabs.json (Chinese Traditional)

* New translations compose.json (Chinese Simplified)

* New translations compose.json (Chinese Traditional)

* New translations compose.json (Vietnamese)

* New translations compose.json (Portuguese, Brazilian)

* New translations tabs.json (German)

* New translations tabs.json (Italian)

* New translations tabs.json (Japanese)

* New translations tabs.json (Korean)

* New translations tabs.json (Chinese Simplified)

* New translations tabs.json (Vietnamese)

* New translations compose.json (Japanese)

* New translations tabs.json (Portuguese, Brazilian)

* New translations common.json (German)

* New translations common.json (Italian)

* New translations common.json (Japanese)

* New translations common.json (Korean)

* New translations common.json (Chinese Simplified)

* New translations common.json (Chinese Traditional)

* New translations common.json (Vietnamese)

* New translations common.json (Portuguese, Brazilian)

* New translations common.json (French)

* New translations compose.json (Korean)

* New translations compose.json (Italian)

* New translations instance.json (Italian)

* New translations contextMenu.json (Chinese Simplified)

* New translations instance.json (Japanese)

* New translations instance.json (Korean)

* New translations instance.json (Chinese Simplified)

* New translations instance.json (Chinese Traditional)

* New translations instance.json (Vietnamese)

* New translations instance.json (Portuguese, Brazilian)

* New translations contextMenu.json (German)

* New translations contextMenu.json (Italian)

* New translations contextMenu.json (Japanese)

* New translations contextMenu.json (Korean)

* New translations contextMenu.json (Chinese Traditional)

* New translations compose.json (German)

* New translations contextMenu.json (Vietnamese)

* New translations contextMenu.json (Portuguese, Brazilian)

* New translations imageViewer.json (German)

* New translations imageViewer.json (Italian)

* New translations imageViewer.json (Japanese)

* New translations imageViewer.json (Korean)

* New translations imageViewer.json (Chinese Simplified)

* New translations imageViewer.json (Chinese Traditional)

* New translations imageViewer.json (Vietnamese)

* New translations imageViewer.json (Portuguese, Brazilian)

* New translations instance.json (French)

* New translations imageViewer.json (French)

* New translations imageViewer.json (Swedish)

* New translations tabs.json (Dutch)

* New translations compose.json (Dutch)

* New translations imageViewer.json (Dutch)

* New translations instance.json (Dutch)

* New translations common.json (Dutch)

* New translations contextMenu.json (Czech)

* New translations tabs.json (Czech)

* New translations compose.json (Czech)

* New translations imageViewer.json (Czech)

* New translations instance.json (Czech)

* New translations common.json (Czech)

* New translations contextMenu.json (Swedish)

* New translations tabs.json (Swedish)

* New translations compose.json (Swedish)

* New translations instance.json (Swedish)

* New translations compose.json (French)

* New translations tabs.json (Polish)

* New translations tabs.json (French)

* New translations contextMenu.json (French)

* New translations common.json (Polish)

* New translations instance.json (Polish)

* New translations imageViewer.json (Polish)

* New translations compose.json (Polish)

* New translations contextMenu.json (Polish)

* New translations common.json (Swedish)

* New translations common.json (Spanish)

* New translations instance.json (Spanish)

* New translations imageViewer.json (Spanish)

* New translations compose.json (Spanish)

* New translations tabs.json (Spanish)

* New translations contextMenu.json (Spanish)

* New translations contextMenu.json (Dutch)

* New translations contextMenu.json (Japanese)

* New translations tabs.json (Japanese)

* New translations common.json (Japanese)

* New translations common.json (Dutch)

* New translations tabs.json (Dutch)

* New translations contextMenu.json (Dutch)

* New translations common.json (Swedish)

* New translations tabs.json (Swedish)

* New translations contextMenu.json (Swedish)

* New translations contextMenu.json (Dutch)

* New translations contextMenu.json (German)

* New translations tabs.json (German)

* New translations common.json (German)

* New translations common.json (Spanish)

* New translations tabs.json (Spanish)

* New translations contextMenu.json (Spanish)

* New translations contextMenu.json (Vietnamese)

* New translations tabs.json (Vietnamese)

* New translations common.json (Vietnamese)

* New translations contextMenu.json (German)

* New translations tabs.json (Spanish)

* New translations common.json (French)

* New translations tabs.json (French)

* New translations contextMenu.json (French)

* New translations common.json (Polish)

* New translations tabs.json (Polish)

* New translations contextMenu.json (Polish)

* New translations common.json (Spanish)

* New translations contextMenu.json (Spanish)

* New translations common.json (Vietnamese)

* New translations common.json (Swedish)

* New translations tabs.json (Swedish)

* New translations contextMenu.json (Swedish)

* New translations common.json (Czech)

* New translations tabs.json (Czech)

* New translations contextMenu.json (Czech)

* New translations common.json (Dutch)

* New translations tabs.json (Dutch)

* New translations common.json (Portuguese, Brazilian)

* New translations common.json (Chinese Traditional)

* New translations contextMenu.json (Italian)

* New translations tabs.json (Japanese)

* New translations contextMenu.json (Japanese)

* New translations contextMenu.json (Korean)

* New translations contextMenu.json (Chinese Simplified)

* New translations contextMenu.json (Chinese Traditional)

* New translations contextMenu.json (Vietnamese)

* New translations contextMenu.json (Portuguese, Brazilian)

* New translations tabs.json (German)

* New translations tabs.json (Italian)

* New translations tabs.json (Korean)

* New translations common.json (Chinese Simplified)

* New translations tabs.json (Chinese Simplified)

* New translations tabs.json (Chinese Traditional)

* New translations tabs.json (Vietnamese)

* New translations tabs.json (Portuguese, Brazilian)

* New translations common.json (German)

* New translations common.json (Italian)

* New translations common.json (Japanese)

* New translations common.json (Korean)

* New translations contextMenu.json (Dutch)

* New translations actions.json (Catalan)

* New translations contextMenu.json (Catalan)

* New translations emojis.json (Catalan)

* New translations mediaSelector.json (Catalan)

* New translations tabs.json (Catalan)

* New translations screens.json (Catalan)

* New translations compose.json (Catalan)

* New translations announcements.json (Catalan)

* New translations imageViewer.json (Catalan)

* New translations timeline.json (Catalan)

* New translations timeline.json (Chinese Traditional)

* New translations relationship.json (Catalan)

* New translations parse.json (Catalan)

* New translations instance.json (Catalan)

* New translations common.json (Catalan)

* New translations contextMenu.json (Spanish)

* New translations common.json (Chinese Traditional)

* New translations tabs.json (Chinese Traditional)

* New translations contextMenu.json (Chinese Traditional)

* New translations mediaSelector.json (Chinese Traditional)

* New translations accountSelection.json (Catalan)

* New translations common.json (Dutch)

* New translations tabs.json (Dutch)

* New translations contextMenu.json (Dutch)

* New translations common.json (Catalan)

* New translations instance.json (Catalan)

* New translations parse.json (Catalan)

* New translations timeline.json (Catalan)

* New translations actions.json (Catalan)

* New translations imageViewer.json (Catalan)

* New translations announcements.json (Catalan)

* New translations compose.json (Catalan)

* New translations screens.json (Catalan)

* New translations tabs.json (Catalan)

* New translations contextMenu.json (Catalan)

* New translations tabs.json (Spanish)

* New translations compose.json (Catalan)

* New translations tabs.json (Catalan)

* New translations tabs.json (German)

* New translations tabs.json (Polish)

* New translations compose.json (Catalan)

* New translations timeline.json (Catalan)

* New translations tabs.json (Dutch)

* New translations tabs.json (Czech)

* New translations tabs.json (Swedish)

* New translations tabs.json (Spanish)

* New translations tabs.json (French)

* New translations tabs.json (Italian)

* New translations tabs.json (Portuguese, Brazilian)

* New translations tabs.json (Vietnamese)

* New translations tabs.json (Chinese Traditional)

* New translations tabs.json (Chinese Simplified)

* New translations tabs.json (Korean)

* New translations tabs.json (Japanese)

* New translations tabs.json (Catalan)

* New translations tabs.json (Chinese Simplified)

* New translations contextMenu.json (Chinese Simplified)

* New translations common.json (Chinese Simplified)
---
 src/i18n/ca/common.json                       |  30 ++
 src/i18n/ca/components/contextMenu.json       |  81 ++++
 src/i18n/ca/components/emojis.json            |   3 +
 src/i18n/ca/components/instance.json          |  26 ++
 src/i18n/ca/components/mediaSelector.json     |  10 +
 src/i18n/ca/components/parse.json             |   8 +
 src/i18n/ca/components/relationship.json      |  16 +
 src/i18n/ca/components/timeline.json          | 152 +++++++
 src/i18n/ca/screens.json                      |  18 +
 src/i18n/ca/screens/accountSelection.json     |   6 +
 src/i18n/ca/screens/actions.json              |  20 +
 src/i18n/ca/screens/announcements.json        |  10 +
 src/i18n/ca/screens/compose.json              | 175 ++++++++
 src/i18n/ca/screens/imageViewer.json          |  16 +
 src/i18n/ca/screens/tabs.json                 | 379 ++++++++++++++++++
 src/i18n/cs/common.json                       |  30 ++
 src/i18n/cs/components/contextMenu.json       |  81 ++++
 src/i18n/cs/components/emojis.json            |   1 +
 src/i18n/cs/components/instance.json          |  26 ++
 src/i18n/cs/components/mediaSelector.json     |  10 +
 src/i18n/cs/components/parse.json             |   8 +
 src/i18n/cs/components/relationship.json      |  16 +
 src/i18n/cs/components/timeline.json          | 152 +++++++
 src/i18n/cs/screens.json                      |  18 +
 src/i18n/cs/screens/accountSelection.json     |   6 +
 src/i18n/cs/screens/actions.json              |  20 +
 src/i18n/cs/screens/announcements.json        |  10 +
 src/i18n/cs/screens/compose.json              | 175 ++++++++
 src/i18n/cs/screens/imageViewer.json          |  16 +
 src/i18n/cs/screens/tabs.json                 | 379 ++++++++++++++++++
 src/i18n/de/common.json                       |  12 +-
 src/i18n/de/components/contextMenu.json       |   7 +-
 src/i18n/de/components/instance.json          |   6 +-
 src/i18n/de/screens/compose.json              |  10 +-
 src/i18n/de/screens/imageViewer.json          |   3 +-
 src/i18n/de/screens/tabs.json                 |  79 ++--
 src/i18n/es/common.json                       |  12 +-
 src/i18n/es/components/contextMenu.json       |   7 +-
 src/i18n/es/components/instance.json          |   6 +-
 src/i18n/es/screens/compose.json              |  10 +-
 src/i18n/es/screens/imageViewer.json          |   3 +-
 src/i18n/es/screens/tabs.json                 |  89 ++--
 src/i18n/fr/common.json                       |  12 +-
 src/i18n/fr/components/contextMenu.json       |   7 +-
 src/i18n/fr/components/instance.json          |   6 +-
 src/i18n/fr/screens/compose.json              |  10 +-
 src/i18n/fr/screens/imageViewer.json          |   3 +-
 src/i18n/fr/screens/tabs.json                 |  79 ++--
 src/i18n/it/common.json                       |  12 +-
 src/i18n/it/components/contextMenu.json       |   7 +-
 src/i18n/it/components/instance.json          |   6 +-
 src/i18n/it/screens/compose.json              |  10 +-
 src/i18n/it/screens/imageViewer.json          |   3 +-
 src/i18n/it/screens/tabs.json                 |  79 ++--
 src/i18n/ja/common.json                       |  12 +-
 src/i18n/ja/components/contextMenu.json       |   7 +-
 src/i18n/ja/components/instance.json          |   6 +-
 src/i18n/ja/screens/compose.json              |  10 +-
 src/i18n/ja/screens/imageViewer.json          |   3 +-
 src/i18n/ja/screens/tabs.json                 |  79 ++--
 src/i18n/ko/common.json                       |  12 +-
 src/i18n/ko/components/contextMenu.json       |   7 +-
 src/i18n/ko/components/instance.json          |   6 +-
 src/i18n/ko/screens/compose.json              |  10 +-
 src/i18n/ko/screens/imageViewer.json          |   3 +-
 src/i18n/ko/screens/tabs.json                 |  79 ++--
 src/i18n/nl/common.json                       |  30 ++
 src/i18n/nl/components/contextMenu.json       |  81 ++++
 src/i18n/nl/components/emojis.json            |   3 +
 src/i18n/nl/components/instance.json          |  26 ++
 src/i18n/nl/components/mediaSelector.json     |  10 +
 src/i18n/nl/components/parse.json             |   8 +
 src/i18n/nl/components/relationship.json      |  16 +
 src/i18n/nl/components/timeline.json          | 152 +++++++
 src/i18n/nl/screens.json                      |  18 +
 src/i18n/nl/screens/accountSelection.json     |   6 +
 src/i18n/nl/screens/actions.json              |  20 +
 src/i18n/nl/screens/announcements.json        |  10 +
 src/i18n/nl/screens/compose.json              | 175 ++++++++
 src/i18n/nl/screens/imageViewer.json          |  16 +
 src/i18n/nl/screens/tabs.json                 | 379 ++++++++++++++++++
 src/i18n/pl/common.json                       |  12 +-
 src/i18n/pl/components/contextMenu.json       |   5 +
 src/i18n/pl/components/instance.json          |   6 +-
 src/i18n/pl/screens/compose.json              |  10 +-
 src/i18n/pl/screens/imageViewer.json          |   3 +-
 src/i18n/pl/screens/tabs.json                 |  77 ++--
 src/i18n/pt_BR/common.json                    |  12 +-
 src/i18n/pt_BR/components/contextMenu.json    |   7 +-
 src/i18n/pt_BR/components/instance.json       |   6 +-
 src/i18n/pt_BR/screens/compose.json           |  10 +-
 src/i18n/pt_BR/screens/imageViewer.json       |   3 +-
 src/i18n/pt_BR/screens/tabs.json              |  79 ++--
 src/i18n/sv/common.json                       |  12 +-
 src/i18n/sv/components/contextMenu.json       |   7 +-
 src/i18n/sv/components/instance.json          |   6 +-
 src/i18n/sv/screens/compose.json              |  12 +-
 src/i18n/sv/screens/imageViewer.json          |   3 +-
 src/i18n/sv/screens/tabs.json                 |  79 ++--
 src/i18n/vi/common.json                       |  12 +-
 src/i18n/vi/components/contextMenu.json       |   5 +
 src/i18n/vi/components/instance.json          |   6 +-
 src/i18n/vi/screens/compose.json              |  10 +-
 src/i18n/vi/screens/imageViewer.json          |   3 +-
 src/i18n/vi/screens/tabs.json                 |  79 ++--
 src/i18n/zh-Hans/common.json                  |  12 +-
 src/i18n/zh-Hans/components/contextMenu.json  |   7 +-
 src/i18n/zh-Hans/components/instance.json     |   6 +-
 src/i18n/zh-Hans/screens/compose.json         |  10 +-
 src/i18n/zh-Hans/screens/imageViewer.json     |   3 +-
 src/i18n/zh-Hans/screens/tabs.json            |  79 ++--
 src/i18n/zh-Hant/common.json                  |  12 +-
 src/i18n/zh-Hant/components/contextMenu.json  |   7 +-
 src/i18n/zh-Hant/components/instance.json     |   6 +-
 .../zh-Hant/components/mediaSelector.json     |   6 +-
 src/i18n/zh-Hant/components/parse.json        |   2 +-
 src/i18n/zh-Hant/components/timeline.json     |  10 +-
 src/i18n/zh-Hant/screens/compose.json         |  10 +-
 src/i18n/zh-Hant/screens/imageViewer.json     |   3 +-
 src/i18n/zh-Hant/screens/tabs.json            |  83 ++--
 120 files changed, 3714 insertions(+), 566 deletions(-)
 create mode 100644 src/i18n/ca/common.json
 create mode 100644 src/i18n/ca/components/contextMenu.json
 create mode 100644 src/i18n/ca/components/emojis.json
 create mode 100644 src/i18n/ca/components/instance.json
 create mode 100644 src/i18n/ca/components/mediaSelector.json
 create mode 100644 src/i18n/ca/components/parse.json
 create mode 100644 src/i18n/ca/components/relationship.json
 create mode 100644 src/i18n/ca/components/timeline.json
 create mode 100644 src/i18n/ca/screens.json
 create mode 100644 src/i18n/ca/screens/accountSelection.json
 create mode 100644 src/i18n/ca/screens/actions.json
 create mode 100644 src/i18n/ca/screens/announcements.json
 create mode 100644 src/i18n/ca/screens/compose.json
 create mode 100644 src/i18n/ca/screens/imageViewer.json
 create mode 100644 src/i18n/ca/screens/tabs.json
 create mode 100644 src/i18n/cs/common.json
 create mode 100644 src/i18n/cs/components/contextMenu.json
 create mode 100644 src/i18n/cs/components/emojis.json
 create mode 100644 src/i18n/cs/components/instance.json
 create mode 100644 src/i18n/cs/components/mediaSelector.json
 create mode 100644 src/i18n/cs/components/parse.json
 create mode 100644 src/i18n/cs/components/relationship.json
 create mode 100644 src/i18n/cs/components/timeline.json
 create mode 100644 src/i18n/cs/screens.json
 create mode 100644 src/i18n/cs/screens/accountSelection.json
 create mode 100644 src/i18n/cs/screens/actions.json
 create mode 100644 src/i18n/cs/screens/announcements.json
 create mode 100644 src/i18n/cs/screens/compose.json
 create mode 100644 src/i18n/cs/screens/imageViewer.json
 create mode 100644 src/i18n/cs/screens/tabs.json
 create mode 100644 src/i18n/nl/common.json
 create mode 100644 src/i18n/nl/components/contextMenu.json
 create mode 100644 src/i18n/nl/components/emojis.json
 create mode 100644 src/i18n/nl/components/instance.json
 create mode 100644 src/i18n/nl/components/mediaSelector.json
 create mode 100644 src/i18n/nl/components/parse.json
 create mode 100644 src/i18n/nl/components/relationship.json
 create mode 100644 src/i18n/nl/components/timeline.json
 create mode 100644 src/i18n/nl/screens.json
 create mode 100644 src/i18n/nl/screens/accountSelection.json
 create mode 100644 src/i18n/nl/screens/actions.json
 create mode 100644 src/i18n/nl/screens/announcements.json
 create mode 100644 src/i18n/nl/screens/compose.json
 create mode 100644 src/i18n/nl/screens/imageViewer.json
 create mode 100644 src/i18n/nl/screens/tabs.json

diff --git a/src/i18n/ca/common.json b/src/i18n/ca/common.json
new file mode 100644
index 00000000..c67e4cce
--- /dev/null
+++ b/src/i18n/ca/common.json
@@ -0,0 +1,30 @@
+{
+  "buttons": {
+    "OK": "D'acord",
+    "apply": "Aplica",
+    "cancel": "Cancel·la",
+    "discard": "Descarta",
+    "continue": "Continua",
+    "delete": "Esborra",
+    "done": "Fet"
+  },
+  "customEmoji": {
+    "accessibilityLabel": "Emoji personalitzat {{emoji}}"
+  },
+  "message": {
+    "success": {
+      "message": "{{function}} amb èxit"
+    },
+    "warning": {
+      "message": ""
+    },
+    "error": {
+      "message": "{{function}} ha fallat, torna-ho a intentar"
+    }
+  },
+  "separator": ", ",
+  "discard": {
+    "title": "Canvis no desats",
+    "message": "Els canvis no han sigut desats. Vols descartar-los?"
+  }
+}
\ No newline at end of file
diff --git a/src/i18n/ca/components/contextMenu.json b/src/i18n/ca/components/contextMenu.json
new file mode 100644
index 00000000..ee0d8953
--- /dev/null
+++ b/src/i18n/ca/components/contextMenu.json
@@ -0,0 +1,81 @@
+{
+  "accessibilityHint": "Accions per aquesta publicació, com el seu usuari o la mateixa publicació",
+  "account": {
+    "title": "Accions d'usuari",
+    "following": {
+      "action_false": "Segueix l'usuari",
+      "action_true": "Deixa de seguir l'usuari"
+    },
+    "inLists": "Gestionar usuari de llistes",
+    "mute": {
+      "action_false": "Silencia l'usuari",
+      "action_true": "Deixa de silenciar l'usuari"
+    },
+    "block": {
+      "action_false": "Bloqueja l'usuari",
+      "action_true": "Deixa de bloquejar l'usuari"
+    },
+    "reports": {
+      "action": "Denuncia i bloqueja l'usuari"
+    }
+  },
+  "copy": {
+    "action": "Copia la publicació",
+    "succeed": "Copiat"
+  },
+  "instance": {
+    "title": "Acció de la instància",
+    "block": {
+      "action": "Bloquejar la instància {{instance}}",
+      "alert": {
+        "title": "Confirma el bloqueig de la instància {{instance}}?",
+        "message": "Pots silenciar o bloquejar a un usuari.\n\nDesprés de bloquejar una instància, tot el seu contingut, amb els seus seguidors, seran esborrats!",
+        "buttons": {
+          "confirm": "Confirma"
+        }
+      }
+    }
+  },
+  "share": {
+    "status": {
+      "action": "Comparteix la publicació"
+    },
+    "account": {
+      "action": "Comparteix l'usuari"
+    }
+  },
+  "status": {
+    "title": "Accions de la publicació",
+    "edit": {
+      "action": "Edita la publicació"
+    },
+    "delete": {
+      "action": "Elimina la publicació",
+      "alert": {
+        "title": "Confirma l'eliminació?",
+        "message": "Tots els impulsos i favorits s'esborraran, incloses totes les respostes.",
+        "buttons": {
+          "confirm": "Confirma"
+        }
+      }
+    },
+    "deleteEdit": {
+      "action": "Elimina la publicació i torna a publicar",
+      "alert": {
+        "title": "Confirma l'eliminació i tornar a publicar?",
+        "message": "Tots els impulsos i favorits s'esborraran, incloses totes les respostes.",
+        "buttons": {
+          "confirm": "Confirma"
+        }
+      }
+    },
+    "mute": {
+      "action_false": "Silencia la publicació i les respostes",
+      "action_true": "Deixa de silenciar la publicació i les respostes"
+    },
+    "pin": {
+      "action_false": "Fixa la publicació",
+      "action_true": "Deixa de fixar la publicació"
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/i18n/ca/components/emojis.json b/src/i18n/ca/components/emojis.json
new file mode 100644
index 00000000..5d439704
--- /dev/null
+++ b/src/i18n/ca/components/emojis.json
@@ -0,0 +1,3 @@
+{
+  "frequentUsed": "D'ús freqüent"
+}
\ No newline at end of file
diff --git a/src/i18n/ca/components/instance.json b/src/i18n/ca/components/instance.json
new file mode 100644
index 00000000..de2f42e2
--- /dev/null
+++ b/src/i18n/ca/components/instance.json
@@ -0,0 +1,26 @@
+{
+  "server": {
+    "textInput": {
+      "placeholder": "Domini de la instància"
+    },
+    "button": "Inicia la sessió",
+    "information": {
+      "name": "Nom",
+      "accounts": "Usuaris",
+      "statuses": "Publicacions",
+      "domains": "Universos"
+    },
+    "disclaimer": {
+      "base": "L'inici de sessió fa servir el navegador del sistema. Per tant, el tooot no accedirà a la informació del compte."
+    },
+    "terms": {
+      "base": "En iniciar la sessió, acceptes la <0>política de privacitat</0> i les <1>condicions del servei</1>."
+    }
+  },
+  "update": {
+    "alert": {
+      "title": "Iniciada la sessió a aquesta instància",
+      "message": "Pots iniciar la sessió a un altre compte, mantenint els existents connectats"
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/i18n/ca/components/mediaSelector.json b/src/i18n/ca/components/mediaSelector.json
new file mode 100644
index 00000000..09013a96
--- /dev/null
+++ b/src/i18n/ca/components/mediaSelector.json
@@ -0,0 +1,10 @@
+{
+  "title": "Selecciona origen multimèdia",
+  "message": "Les dades multimèdia EXIF no s'han penjat",
+  "options": {
+    "image": "Penja fotos",
+    "image_max": "Penja fotos (màx. {{max}})",
+    "video": "Penja vídeo",
+    "video_max": "Penja vídeo (màx. {{max}})"
+  }
+}
\ No newline at end of file
diff --git a/src/i18n/ca/components/parse.json b/src/i18n/ca/components/parse.json
new file mode 100644
index 00000000..0948306a
--- /dev/null
+++ b/src/i18n/ca/components/parse.json
@@ -0,0 +1,8 @@
+{
+  "HTML": {
+    "accessibilityHint": "Prem per expandir o contraure el contingut",
+    "expanded": "{{hint}}{{moreLines}}",
+    "moreLines": " ({{count}} línies més)",
+    "defaultHint": "Publicació llarga"
+  }
+}
\ No newline at end of file
diff --git a/src/i18n/ca/components/relationship.json b/src/i18n/ca/components/relationship.json
new file mode 100644
index 00000000..c7efe0c9
--- /dev/null
+++ b/src/i18n/ca/components/relationship.json
@@ -0,0 +1,16 @@
+{
+  "follow": {
+    "function": "Segueix l'usuari"
+  },
+  "block": {
+    "function": "Bloqueja l'usuari"
+  },
+  "button": {
+    "error": "Error en carregar",
+    "blocked_by": "Bloquejat per l'usuari",
+    "blocking": "Desbloquejar",
+    "following": "Deixa de seguir",
+    "requested": "Retirar la sol·licitud",
+    "default": "Segueix"
+  }
+}
\ No newline at end of file
diff --git a/src/i18n/ca/components/timeline.json b/src/i18n/ca/components/timeline.json
new file mode 100644
index 00000000..adc39c18
--- /dev/null
+++ b/src/i18n/ca/components/timeline.json
@@ -0,0 +1,152 @@
+{
+  "empty": {
+    "error": {
+      "message": "Error en carregar",
+      "button": "Torna-ho a provar"
+    },
+    "success": {
+      "message": "Cronologia buida"
+    }
+  },
+  "end": {
+    "message": "Ja estàs, vols una tassa de <0 />?"
+  },
+  "lookback": {
+    "message": "Llegit a"
+  },
+  "refresh": {
+    "fetchPreviousPage": "Més recent des d'aquí",
+    "refetch": "A l'últim"
+  },
+  "shared": {
+    "actioned": {
+      "pinned": "Fixat",
+      "favourite": "{{name}} ha marcat la teva publicació com a favorita",
+      "status": "{{name}} ha publicat",
+      "follow": "{{name}} et segueix",
+      "follow_request": "{{name}} ha sol·licitat seguir-te",
+      "poll": "S'ha acabat una enquesta en què havies participat",
+      "reblog": {
+        "default": "{{name}} ha impulsat",
+        "notification": "{{name}} ha impulsat la teva publicació"
+      },
+      "update": "L'impuls ha sigut editat"
+    },
+    "actions": {
+      "reply": {
+        "accessibilityLabel": "Respon a aquesta publicació"
+      },
+      "reblogged": {
+        "accessibilityLabel": "Impulsa aquesta publicació",
+        "function": "Impulsa la publicació",
+        "options": {
+          "title": "Escull la visibilitat de l'impuls",
+          "public": "Impuls públic",
+          "unlisted": "Impuls no llistat"
+        }
+      },
+      "favourited": {
+        "accessibilityLabel": "Afegeix aquesta publicació a favorits",
+        "function": "Marca la publicació com a favorita"
+      },
+      "bookmarked": {
+        "accessibilityLabel": "Afegeix aquesta publicació a marcadors",
+        "function": "Afegeix la publicació a marcadors"
+      }
+    },
+    "actionsUsers": {
+      "reblogged_by": {
+        "accessibilityLabel": "{{count}} usuaris han impulsat aquesta publicació",
+        "accessibilityHint": "Prem per conèixer els usuaris",
+        "text": "$t(screenTabs:shared.users.statuses.reblogged_by)"
+      },
+      "favourited_by": {
+        "accessibilityLabel": "{{count}} usuaris han marcat com a favorits aquesta publicació",
+        "accessibilityHint": "Prem per conèixer els usuaris",
+        "text": "$t(screenTabs:shared.users.statuses.favourited_by)"
+      },
+      "history": {
+        "accessibilityLabel": "Aquesta publicació ha sigut editada unes {{count}} vegades",
+        "accessibilityHint": "Prem per veure tot l'historial d'edicions",
+        "text_one": "{{count}} edició",
+        "text_other": "{{count}} edicions"
+      }
+    },
+    "attachment": {
+      "sensitive": {
+        "button": "Mostra contingut sensible"
+      },
+      "unsupported": {
+        "text": "Error en carregar",
+        "button": "Prova amb l'enllaç remot"
+      }
+    },
+    "avatar": {
+      "accessibilityLabel": "Avatar de {{name}}",
+      "accessibilityHint": "Prem per anar a la pàgina de {{name}}"
+    },
+    "content": {
+      "expandHint": "Contingut ocult"
+    },
+    "filtered": "Filtrat: {{phrase}}.",
+    "fullConversation": "Llegeix conversacions",
+    "translate": {
+      "default": "Tradueix",
+      "succeed": "Traduït per {{provider}} amb {{source}}",
+      "failed": "Error al traduir",
+      "source_not_supported": "L'idioma de la publicació no està suportada",
+      "target_not_supported": "Aquest idioma no està suportat"
+    },
+    "header": {
+      "shared": {
+        "account": {
+          "name": {
+            "accessibilityHint": "Nom d'usuari"
+          },
+          "account": {
+            "accessibilityHint": "Compte d'usuari"
+          }
+        },
+        "application": "Amb {{application}}",
+        "edited": {
+          "accessibilityLabel": "Publicació editada"
+        },
+        "muted": {
+          "accessibilityLabel": "Publicació silenciada"
+        },
+        "visibility": {
+          "direct": {
+            "accessibilityLabel": "La publicació és un missatge directe"
+          },
+          "private": {
+            "accessibilityLabel": "La publicació és visible només per als seguidors"
+          }
+        }
+      },
+      "conversation": {
+        "withAccounts": "Amb",
+        "delete": {
+          "function": "Esborra el missatge directe"
+        }
+      }
+    },
+    "poll": {
+      "meta": {
+        "button": {
+          "vote": "Vota",
+          "refresh": "Actualitza"
+        },
+        "count": {
+          "voters_one": "{{count}} usuari ha votat",
+          "voters_other": "{{count}} usuaris han votat",
+          "votes_one": "{{count}} vot",
+          "votes_other": "{{count}} vots"
+        },
+        "expiration": {
+          "expired": "Votació finalitzada",
+          "until": "Finalitza <0 />"
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/i18n/ca/screens.json b/src/i18n/ca/screens.json
new file mode 100644
index 00000000..9f753430
--- /dev/null
+++ b/src/i18n/ca/screens.json
@@ -0,0 +1,18 @@
+{
+  "screenshot": {
+    "title": "Protecció de la privacitat",
+    "message": "Si us plau, no revelis la identitat d'altres usuaris, així com el nom d'usuari, avatar, etc. Gràcies!",
+    "button": "Confirma"
+  },
+  "localCorrupt": {
+    "message": "La sessió ha sigut expirada. Si us plau, torna a iniciar la sessió"
+  },
+  "pushError": {
+    "message": "Error del servei push",
+    "description": "Si us plau, torna a habilitar les notificacions push a la configuració"
+  },
+  "shareError": {
+    "imageNotSupported": "Format d'imatge {{type}} no suportat",
+    "videoNotSupported": "Format de vídeo {{type}} no suportat"
+  }
+}
\ No newline at end of file
diff --git a/src/i18n/ca/screens/accountSelection.json b/src/i18n/ca/screens/accountSelection.json
new file mode 100644
index 00000000..a119748e
--- /dev/null
+++ b/src/i18n/ca/screens/accountSelection.json
@@ -0,0 +1,6 @@
+{
+  "heading": "Comparteix amb...",
+  "content": {
+    "select_account": "Selecciona el compte"
+  }
+}
\ No newline at end of file
diff --git a/src/i18n/ca/screens/actions.json b/src/i18n/ca/screens/actions.json
new file mode 100644
index 00000000..063f9d09
--- /dev/null
+++ b/src/i18n/ca/screens/actions.json
@@ -0,0 +1,20 @@
+{
+  "content": {
+    "altText": {
+      "heading": "Text alternatiu"
+    },
+    "notificationsFilter": {
+      "heading": "Mostra els tipus de notificació",
+      "content": {
+        "follow": "$t(screenTabs:me.push.follow.heading)",
+        "follow_request": "Sol·licitud de seguiment",
+        "favourite": "$t(screenTabs:me.push.favourite.heading)",
+        "reblog": "$t(screenTabs:me.push.reblog.heading)",
+        "mention": "$t(screenTabs:me.push.mention.heading)",
+        "poll": "$t(screenTabs:me.push.poll.heading)",
+        "status": "Publicació d'usuaris subscrits",
+        "update": "L'impuls ha sigut editat"
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/i18n/ca/screens/announcements.json b/src/i18n/ca/screens/announcements.json
new file mode 100644
index 00000000..45e4a1a3
--- /dev/null
+++ b/src/i18n/ca/screens/announcements.json
@@ -0,0 +1,10 @@
+{
+  "heading": "Avisos",
+  "content": {
+    "published": "S'ha publicat <0 />",
+    "button": {
+      "read": "Llegit",
+      "unread": "Marca com a llegit"
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/i18n/ca/screens/compose.json b/src/i18n/ca/screens/compose.json
new file mode 100644
index 00000000..af53c55f
--- /dev/null
+++ b/src/i18n/ca/screens/compose.json
@@ -0,0 +1,175 @@
+{
+  "heading": {
+    "left": {
+      "button": "Cancel·la",
+      "alert": {
+        "title": "Voleu cancel·lar l'edició?",
+        "buttons": {
+          "save": "Desa l'esborrany",
+          "delete": "Esborra l'esborrany",
+          "cancel": "Cancel·la"
+        }
+      }
+    },
+    "right": {
+      "button": {
+        "default": "Publicació",
+        "conversation": "Envia un missatge directe",
+        "reply": "Resposta de la publicació",
+        "deleteEdit": "Publicació",
+        "edit": "Publicació",
+        "share": "Publicació"
+      },
+      "alert": {
+        "default": {
+          "title": "Error en publicar",
+          "button": "Torna a provar"
+        },
+        "removeReply": {
+          "title": "No s'ha pogut trobar la publicació resposta",
+          "description": "La publicació resposta és possible que hagi sigut esborrada. Vols eliminar-ho de la teva referència?",
+          "confirm": "Elimina la referència"
+        }
+      }
+    }
+  },
+  "content": {
+    "root": {
+      "header": {
+        "postingAs": "Publicant la publicació com a @{{acct}}@{{domain}}",
+        "spoilerInput": {
+          "placeholder": "Missatge d'alerta d'espòiler"
+        },
+        "textInput": {
+          "placeholder": "Què et passa pel cap?",
+          "keyboardImage": {
+            "exceedMaximum": {
+              "title": "S'ha arribat al nombre màxim d'adjunts",
+              "OK": "$t(common:buttons.OK)"
+            }
+          }
+        }
+      },
+      "footer": {
+        "attachments": {
+          "sensitive": "Marca els adjunts com a contingut sensible",
+          "remove": {
+            "accessibilityLabel": "Esborra l'adjunt afegit, número {{attachment}}"
+          },
+          "edit": {
+            "accessibilityLabel": "Edita l'adjunt afegit, número {{attachment}}"
+          },
+          "upload": {
+            "accessibilityLabel": "Afegeix més adjunts"
+          }
+        },
+        "emojis": {
+          "accessibilityHint": "Toca per a afegir emojis a la publicació"
+        },
+        "poll": {
+          "option": {
+            "placeholder": {
+              "accessibilityLabel": "Resposta {{index}}",
+              "single": "Resposta única",
+              "multiple": "Resposta múltiple"
+            }
+          },
+          "quantity": {
+            "reduce": {
+              "accessibilityLabel": "Rebaixa el nombre de respostes a {{amount}}",
+              "accessibilityHint": "S'ha arribat al nombre mínim de respostes, ara mateix n'hi ha {{amount}}"
+            },
+            "increase": {
+              "accessibilityLabel": "Augmentar el nombre de respostes a {{amount}}",
+              "accessibilityHint": "S'ha arribat al nombre màxim de respostes, ara mateix n'hi ha {{amount}}"
+            }
+          },
+          "multiple": {
+            "heading": "Tipus d'enquesta",
+            "options": {
+              "single": "Elecció única",
+              "multiple": "Elecció múltiple"
+            }
+          },
+          "expiration": {
+            "heading": "Caducitat",
+            "options": {
+              "300": "5 minuts",
+              "1800": "30 minuts",
+              "3600": "1 hora",
+              "21600": "6 hores",
+              "86400": "1 dia",
+              "259200": "3 dies",
+              "604800": "7 dies"
+            }
+          }
+        }
+      },
+      "actions": {
+        "attachment": {
+          "accessibilityLabel": "Puja fitxer",
+          "accessibilityHint": "La funció d'enquesta serà desactivada si hi ha algun fitxer adjunt",
+          "failed": {
+            "alert": {
+              "title": "Ha fallat la pujada",
+              "button": "Torna-ho a provar"
+            }
+          }
+        },
+        "poll": {
+          "accessibilityLabel": "Afegeix una enquesta",
+          "accessibilityHint": "La funció d'adjuntar fitxers serà desactivada si hi ha una enquesta"
+        },
+        "visibility": {
+          "accessibilityLabel": "La visibilitat de la publicació és {{visibility}}",
+          "title": "Visibilitat de la publicació",
+          "options": {
+            "public": "Públic",
+            "unlisted": "Sense llistar",
+            "private": "Només seguidors",
+            "direct": "Missatge directe"
+          }
+        },
+        "spoiler": {
+          "accessibilityLabel": "Espòiler"
+        },
+        "emoji": {
+          "accessibilityLabel": "Afegeix un emoji",
+          "accessibilityHint": "Obre el panell d'emojis, llisca horitzontalment per canviar de pàgina"
+        }
+      },
+      "drafts_one": "Esborrany ({{count}})",
+      "drafts_other": "Esborranys ({{count}})"
+    },
+    "editAttachment": {
+      "header": {
+        "title": "Edita el fitxer adjunt",
+        "right": {
+          "accessibilityLabel": "Desa canvis",
+          "failed": {
+            "title": "Error a l'editar",
+            "button": "Torna-ho a provar"
+          }
+        }
+      },
+      "content": {
+        "altText": {
+          "heading": "Descriu el contingut per a persones amb discapacitat visual",
+          "placeholder": "Pots afegir una descripció, també conegut com a text alternatiu, als teus fitxers perquè siguin accessibles a més persones, també aquelles amb discapacitat visual.\n\nLes bones descripcions han de ser concises, però que s'expressin tot el que surt als fitxers amb exactitud per poder entendre el seu context."
+        },
+        "imageFocus": "Arrossega el cercle per a canviar el seu punt d'atenció"
+      }
+    },
+    "draftsList": {
+      "header": {
+        "title": "Esborrany"
+      },
+      "warning": "Els esborranys només estan desats en aquest dispositiu i es poden perdre. No es recomana desar-los durant molt de temps.",
+      "content": {
+        "accessibilityHint": "S'ha desat l'esborrany, prem per a editar",
+        "textEmpty": "Sense contingut"
+      },
+      "checkAttachment": "Comprovant els fitxers adjunts al servidor..."
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/i18n/ca/screens/imageViewer.json b/src/i18n/ca/screens/imageViewer.json
new file mode 100644
index 00000000..9bdc5bb9
--- /dev/null
+++ b/src/i18n/ca/screens/imageViewer.json
@@ -0,0 +1,16 @@
+{
+  "content": {
+    "actions": {
+      "accessibilityLabel": "Més accions per aquesta imatge",
+      "accessibilityHint": "Pots desar o compartir aquesta imatge"
+    },
+    "options": {
+      "save": "Desa la imatge",
+      "share": "Comparteix la imatge"
+    },
+    "save": {
+      "succeed": "Imatge desada",
+      "failed": "Error al desar la imatge"
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/i18n/ca/screens/tabs.json b/src/i18n/ca/screens/tabs.json
new file mode 100644
index 00000000..6f38f91d
--- /dev/null
+++ b/src/i18n/ca/screens/tabs.json
@@ -0,0 +1,379 @@
+{
+  "tabs": {
+    "local": {
+      "name": "Seguint"
+    },
+    "public": {
+      "name": "",
+      "segments": {
+        "left": "Federat",
+        "right": "Local"
+      }
+    },
+    "notifications": {
+      "name": "Notificacions"
+    },
+    "me": {
+      "name": "Sobre mi"
+    }
+  },
+  "common": {
+    "search": {
+      "accessibilityLabel": "Cerca",
+      "accessibilityHint": "Cerca per a etiquetes, usuaris o publicacions"
+    }
+  },
+  "notifications": {
+    "filter": {
+      "accessibilityLabel": "Filtra",
+      "accessibilityHint": "Filtra els tipus de notificacions"
+    }
+  },
+  "me": {
+    "stacks": {
+      "bookmarks": {
+        "name": "Marcadors"
+      },
+      "conversations": {
+        "name": "Missatges directes"
+      },
+      "favourites": {
+        "name": "Favorits"
+      },
+      "fontSize": {
+        "name": "Mida de la font de la publicació"
+      },
+      "language": {
+        "name": "Idioma"
+      },
+      "list": {
+        "name": "Llista: {{list}}"
+      },
+      "listAccounts": {
+        "name": "Usuaris a la llista: {{list}}"
+      },
+      "listAdd": {
+        "name": "Afegeix a la llista"
+      },
+      "listEdit": {
+        "name": "Edita els detalls de la llista"
+      },
+      "lists": {
+        "name": "Llistes"
+      },
+      "push": {
+        "name": "Notificacions push"
+      },
+      "profile": {
+        "name": "Edita el teu perfil"
+      },
+      "profileName": {
+        "name": "Edita el nom"
+      },
+      "profileNote": {
+        "name": "Edita la descripció"
+      },
+      "profileFields": {
+        "name": "Editar les metadades"
+      },
+      "settings": {
+        "name": "Configuració de l'aplicació"
+      },
+      "webSettings": {
+        "name": "Més configuracions del compte"
+      },
+      "switch": {
+        "name": "Canvia de compte"
+      }
+    },
+    "fontSize": {
+      "demo": "<p>Això és una publicació de prova😊. Pots escollir entre moltes opcions<br /><br />Aquesta configuració només afecta el contingut principal de les publicacions, però altres mides de la font.</p>",
+      "sizes": {
+        "S": "S",
+        "M": "M - Per defecte",
+        "L": "L",
+        "XL": "XL",
+        "XXL": "XXL"
+      }
+    },
+    "listAccounts": {
+      "heading": "Gestiona els usuaris",
+      "error": "Esborra l'usuari de la llista",
+      "empty": "Cap usuari afegit en aquesta llista"
+    },
+    "listEdit": {
+      "heading": "Edita els detalls de la llista",
+      "title": "Títol",
+      "repliesPolicy": {
+        "heading": "Mostra respostes a:",
+        "options": {
+          "none": "Ningú",
+          "list": "Membres de la llista",
+          "followed": "Qualsevol usuari seguit"
+        }
+      }
+    },
+    "listDelete": {
+      "heading": "Esborra la llista",
+      "confirm": {
+        "title": "Vol esborrar la llista \"{{list}}\"?",
+        "message": "Aquesta acció no es pot desfer."
+      }
+    },
+    "profile": {
+      "feedback": {
+        "succeed": "{{type}} actualitzat",
+        "failed": "Error a l'actualitzar {{type}}. Si us plau, torna-ho a provar."
+      },
+      "root": {
+        "name": {
+          "title": "Nom"
+        },
+        "avatar": {
+          "title": "Avatar",
+          "description": "Es reduirà a 400x400px"
+        },
+        "header": {
+          "title": "Capçalera",
+          "description": "Es reduirà a 1500x500px"
+        },
+        "note": {
+          "title": "Descripció"
+        },
+        "fields": {
+          "title": "Metadades",
+          "total_one": "{{count}} camp",
+          "total_other": "{{count}} camps"
+        },
+        "visibility": {
+          "title": "Visibilitat de la publicació",
+          "options": {
+            "public": "Públic",
+            "unlisted": "Sense llistar",
+            "private": "Només als seguidors"
+          }
+        },
+        "sensitive": {
+          "title": "Publica contingut multimèdia sensible"
+        },
+        "lock": {
+          "title": "Fes el compte privat",
+          "description": "Caldrà l'aprovació manual de seguidors nous"
+        },
+        "bot": {
+          "title": "Compte bot",
+          "description": "Aquest compte executa principalment accions automatitzades i no podrà ser monitorat"
+        }
+      },
+      "fields": {
+        "group": "Grup {{index}}",
+        "label": "Etiqueta",
+        "content": "Contingut"
+      },
+      "mediaSelectionFailed": "Ha fallat el processament d'imatge. Si us plau, torneu-ho a provar."
+    },
+    "push": {
+      "notAvailable": "El seu telèfon no suporta les notificacions push de tooot",
+      "enable": {
+        "direct": "Habilita les notificacions push",
+        "settings": "Activa'ls a la configuració"
+      },
+      "global": {
+        "heading": "Activa per {{acct}}",
+        "description": "Els missatges s'envien a través del servidor del tooot"
+      },
+      "decode": {
+        "heading": "Mostra els detalls del missatge",
+        "description": "Els missatges que s'envien a través del servidor del tooot estan encriptades, però pots escollir per desencriptar-los en el servidor. El nostre servidor és de codi obert i tenim una política de zero registres."
+      },
+      "default": {
+        "heading": "Per defecte"
+      },
+      "follow": {
+        "heading": "Nou seguidor"
+      },
+      "follow_request": {
+        "heading": "Sol·licitud de seguiment"
+      },
+      "favourite": {
+        "heading": "Favorits"
+      },
+      "reblog": {
+        "heading": "Impulsat"
+      },
+      "mention": {
+        "heading": "T'ha mencionat"
+      },
+      "poll": {
+        "heading": "Actualització d'una votació"
+      },
+      "status": {
+        "heading": "Publicació d'usuaris subscrits"
+      },
+      "howitworks": "Aprèn com funciona"
+    },
+    "root": {
+      "announcements": {
+        "content": {
+          "unread": "{{amount}} sense llegir",
+          "read": "Tots llegits",
+          "empty": "Cap"
+        }
+      },
+      "push": {
+        "content": {
+          "enabled": "Habilitat",
+          "disabled": "Deshabilitat"
+        }
+      },
+      "update": {
+        "title": "Actualitza a la última versió"
+      },
+      "logout": {
+        "button": "Tanca la sessió",
+        "alert": {
+          "title": "Vol tancar la sessió?",
+          "message": "Després de tancar la sessió, hauràs de tornar a iniciar la sessió",
+          "buttons": {
+            "logout": "Tanca la sessió"
+          }
+        }
+      }
+    },
+    "settings": {
+      "fontsize": {
+        "heading": "$t(me.stacks.fontSize.name)",
+        "content": {
+          "S": "$t(me.fontSize.sizes.S)",
+          "M": "$t(me.fontSize.sizes.M)",
+          "L": "$t(me.fontSize.sizes.L)",
+          "XL": "$t(me.fontSize.sizes.XL)",
+          "XXL": "$t(me.fontSize.sizes.XXL)"
+        }
+      },
+      "language": {
+        "heading": "$t(me.stacks.language.name)"
+      },
+      "theme": {
+        "heading": "Aspecte",
+        "options": {
+          "auto": "Com el sistema",
+          "light": "Mode clar",
+          "dark": "Mode fosc"
+        }
+      },
+      "darkTheme": {
+        "heading": "Tema fosc",
+        "options": {
+          "lighter": "Més clar",
+          "darker": "Més fosc"
+        }
+      },
+      "browser": {
+        "heading": "Obertura d'enllaços",
+        "options": {
+          "internal": "Dins de l'aplicació",
+          "external": "Utilitza el navegador del sistema"
+        }
+      },
+      "staticEmoji": {
+        "heading": "Utilitza emojis estàtics",
+        "description": "Si l'aplicació falla freqüentment en visualitzar la llista d'emojis, pots intentar fer servir els emojis estàtics."
+      },
+      "feedback": {
+        "heading": "Peticions de característiques"
+      },
+      "support": {
+        "heading": "Dona suport al tooot"
+      },
+      "review": {
+        "heading": "Valora al tooot"
+      },
+      "contact": {
+        "heading": "Contacta al tooot"
+      },
+      "version": "Versió v{{version}}",
+      "instanceVersion": "Versió del Mastodon v{{version}}"
+    },
+    "switch": {
+      "existing": "Escull la sessió",
+      "new": "Inicia la sessió a la instància"
+    }
+  },
+  "shared": {
+    "account": {
+      "actions": {
+        "accessibilityLabel": "Accions per l'usuari {{user}}",
+        "accessibilityHint": "Pots silenciar, bloquejar, reportar o compartir aquest usuari"
+      },
+      "followed_by": " et segueix",
+      "moved": "S'ha traslladat",
+      "created_at": "Es va unir el dia {{date}}",
+      "summary": {
+        "statuses_count": "{{count}} publicacions",
+        "following_count": "$t(shared.users.accounts.following)",
+        "followers_count": "$t(shared.users.accounts.followers)"
+      },
+      "toots": {
+        "default": "Publicacions",
+        "all": "Publicacions i respostes"
+      },
+      "suspended": "Compte suspès pels moderadors del teu servidor"
+    },
+    "accountInLists": {
+      "name": "Llistes de @{{username}}",
+      "inLists": "En les llistes",
+      "notInLists": "Altres llistes"
+    },
+    "attachments": {
+      "name": "Multimèdia de <0 /><1></1>"
+    },
+    "hashtag": {
+      "follow": "Segueix",
+      "unfollow": "Deixa de seguir"
+    },
+    "history": {
+      "name": "Edita l'historial"
+    },
+    "search": {
+      "header": {
+        "prefix": "Cercant",
+        "placeholder": "alguna cosa..."
+      },
+      "empty": {
+        "general": "Escriu per cercar <bold>$t(screenTabs:shared.search.sections.accounts)</bold>, <bold>$t(screenTabs:shared.search.sections.hashtags)</bold> o <bold>$t(screenTabs:shared.search.sections.statuses)</bold>",
+        "advanced": {
+          "header": "Cerca avançada",
+          "example": {
+            "account": "$t(shared.search.header.prefix) $t(shared.search.sections.accounts)",
+            "hashtag": "$t(shared.search.header.prefix) $t(shared.search.sections.hashtags)",
+            "statusLink": "$t(shared.search.header.prefix) $t(shared.search.sections.statuses)",
+            "accountLink": "$t(shared.search.header.prefix) $t(shared.search.sections.accounts)"
+          }
+        },
+        "trending": {
+          "tags": ""
+        }
+      },
+      "sections": {
+        "accounts": "Usuari",
+        "hashtags": "Etiqueta",
+        "statuses": "Publicació"
+      },
+      "notFound": "No s'ha trobat <bold>{{searchTerm}}</bold> relacionat {{type}}"
+    },
+    "toot": {
+      "name": "Discussions"
+    },
+    "users": {
+      "accounts": {
+        "following": "{{count}} seguits",
+        "followers": "{{count}} seguidors"
+      },
+      "statuses": {
+        "reblogged_by": "{{count}} impulsats",
+        "favourited_by": "{{count}} favorits"
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/i18n/cs/common.json b/src/i18n/cs/common.json
new file mode 100644
index 00000000..e83caf88
--- /dev/null
+++ b/src/i18n/cs/common.json
@@ -0,0 +1,30 @@
+{
+  "buttons": {
+    "OK": "",
+    "apply": "",
+    "cancel": "",
+    "discard": "",
+    "continue": "",
+    "delete": "",
+    "done": ""
+  },
+  "customEmoji": {
+    "accessibilityLabel": ""
+  },
+  "message": {
+    "success": {
+      "message": ""
+    },
+    "warning": {
+      "message": ""
+    },
+    "error": {
+      "message": ""
+    }
+  },
+  "separator": "",
+  "discard": {
+    "title": "",
+    "message": ""
+  }
+}
\ No newline at end of file
diff --git a/src/i18n/cs/components/contextMenu.json b/src/i18n/cs/components/contextMenu.json
new file mode 100644
index 00000000..84daeaaf
--- /dev/null
+++ b/src/i18n/cs/components/contextMenu.json
@@ -0,0 +1,81 @@
+{
+  "accessibilityHint": "",
+  "account": {
+    "title": "",
+    "following": {
+      "action_false": "",
+      "action_true": ""
+    },
+    "inLists": "",
+    "mute": {
+      "action_false": "",
+      "action_true": ""
+    },
+    "block": {
+      "action_false": "",
+      "action_true": ""
+    },
+    "reports": {
+      "action": ""
+    }
+  },
+  "copy": {
+    "action": "",
+    "succeed": ""
+  },
+  "instance": {
+    "title": "",
+    "block": {
+      "action": "",
+      "alert": {
+        "title": "",
+        "message": "",
+        "buttons": {
+          "confirm": ""
+        }
+      }
+    }
+  },
+  "share": {
+    "status": {
+      "action": ""
+    },
+    "account": {
+      "action": ""
+    }
+  },
+  "status": {
+    "title": "",
+    "edit": {
+      "action": ""
+    },
+    "delete": {
+      "action": "",
+      "alert": {
+        "title": "",
+        "message": "",
+        "buttons": {
+          "confirm": ""
+        }
+      }
+    },
+    "deleteEdit": {
+      "action": "",
+      "alert": {
+        "title": "",
+        "message": "",
+        "buttons": {
+          "confirm": ""
+        }
+      }
+    },
+    "mute": {
+      "action_false": "",
+      "action_true": ""
+    },
+    "pin": {
+      "action_false": "",
+      "action_true": ""
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/i18n/cs/components/emojis.json b/src/i18n/cs/components/emojis.json
new file mode 100644
index 00000000..9e26dfee
--- /dev/null
+++ b/src/i18n/cs/components/emojis.json
@@ -0,0 +1 @@
+{}
\ No newline at end of file
diff --git a/src/i18n/cs/components/instance.json b/src/i18n/cs/components/instance.json
new file mode 100644
index 00000000..9ab20d42
--- /dev/null
+++ b/src/i18n/cs/components/instance.json
@@ -0,0 +1,26 @@
+{
+  "server": {
+    "textInput": {
+      "placeholder": ""
+    },
+    "button": "",
+    "information": {
+      "name": "",
+      "accounts": "",
+      "statuses": "",
+      "domains": ""
+    },
+    "disclaimer": {
+      "base": ""
+    },
+    "terms": {
+      "base": ""
+    }
+  },
+  "update": {
+    "alert": {
+      "title": "",
+      "message": ""
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/i18n/cs/components/mediaSelector.json b/src/i18n/cs/components/mediaSelector.json
new file mode 100644
index 00000000..afd894e4
--- /dev/null
+++ b/src/i18n/cs/components/mediaSelector.json
@@ -0,0 +1,10 @@
+{
+  "title": "",
+  "message": "",
+  "options": {
+    "image": "",
+    "image_max": "",
+    "video": "",
+    "video_max": ""
+  }
+}
\ No newline at end of file
diff --git a/src/i18n/cs/components/parse.json b/src/i18n/cs/components/parse.json
new file mode 100644
index 00000000..c2dc48a6
--- /dev/null
+++ b/src/i18n/cs/components/parse.json
@@ -0,0 +1,8 @@
+{
+  "HTML": {
+    "accessibilityHint": "",
+    "expanded": "",
+    "moreLines": "",
+    "defaultHint": ""
+  }
+}
\ No newline at end of file
diff --git a/src/i18n/cs/components/relationship.json b/src/i18n/cs/components/relationship.json
new file mode 100644
index 00000000..ccf2aa7b
--- /dev/null
+++ b/src/i18n/cs/components/relationship.json
@@ -0,0 +1,16 @@
+{
+  "follow": {
+    "function": ""
+  },
+  "block": {
+    "function": ""
+  },
+  "button": {
+    "error": "",
+    "blocked_by": "",
+    "blocking": "",
+    "following": "",
+    "requested": "",
+    "default": ""
+  }
+}
\ No newline at end of file
diff --git a/src/i18n/cs/components/timeline.json b/src/i18n/cs/components/timeline.json
new file mode 100644
index 00000000..4ed9c372
--- /dev/null
+++ b/src/i18n/cs/components/timeline.json
@@ -0,0 +1,152 @@
+{
+  "empty": {
+    "error": {
+      "message": "",
+      "button": ""
+    },
+    "success": {
+      "message": ""
+    }
+  },
+  "end": {
+    "message": ""
+  },
+  "lookback": {
+    "message": ""
+  },
+  "refresh": {
+    "fetchPreviousPage": "",
+    "refetch": ""
+  },
+  "shared": {
+    "actioned": {
+      "pinned": "",
+      "favourite": "",
+      "status": "",
+      "follow": "",
+      "follow_request": "",
+      "poll": "",
+      "reblog": {
+        "default": "",
+        "notification": ""
+      },
+      "update": ""
+    },
+    "actions": {
+      "reply": {
+        "accessibilityLabel": ""
+      },
+      "reblogged": {
+        "accessibilityLabel": "",
+        "function": "",
+        "options": {
+          "title": "",
+          "public": "",
+          "unlisted": ""
+        }
+      },
+      "favourited": {
+        "accessibilityLabel": "",
+        "function": ""
+      },
+      "bookmarked": {
+        "accessibilityLabel": "",
+        "function": ""
+      }
+    },
+    "actionsUsers": {
+      "reblogged_by": {
+        "accessibilityLabel": "",
+        "accessibilityHint": "",
+        "text": ""
+      },
+      "favourited_by": {
+        "accessibilityLabel": "",
+        "accessibilityHint": "",
+        "text": ""
+      },
+      "history": {
+        "accessibilityLabel": "",
+        "accessibilityHint": "",
+        "text_one": "",
+        "text_other": ""
+      }
+    },
+    "attachment": {
+      "sensitive": {
+        "button": ""
+      },
+      "unsupported": {
+        "text": "",
+        "button": ""
+      }
+    },
+    "avatar": {
+      "accessibilityLabel": "",
+      "accessibilityHint": ""
+    },
+    "content": {
+      "expandHint": ""
+    },
+    "filtered": "",
+    "fullConversation": "",
+    "translate": {
+      "default": "",
+      "succeed": "",
+      "failed": "",
+      "source_not_supported": "",
+      "target_not_supported": ""
+    },
+    "header": {
+      "shared": {
+        "account": {
+          "name": {
+            "accessibilityHint": ""
+          },
+          "account": {
+            "accessibilityHint": ""
+          }
+        },
+        "application": "",
+        "edited": {
+          "accessibilityLabel": ""
+        },
+        "muted": {
+          "accessibilityLabel": ""
+        },
+        "visibility": {
+          "direct": {
+            "accessibilityLabel": ""
+          },
+          "private": {
+            "accessibilityLabel": ""
+          }
+        }
+      },
+      "conversation": {
+        "withAccounts": "",
+        "delete": {
+          "function": ""
+        }
+      }
+    },
+    "poll": {
+      "meta": {
+        "button": {
+          "vote": "",
+          "refresh": ""
+        },
+        "count": {
+          "voters_one": "",
+          "voters_other": "",
+          "votes_one": "",
+          "votes_other": ""
+        },
+        "expiration": {
+          "expired": "",
+          "until": ""
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/i18n/cs/screens.json b/src/i18n/cs/screens.json
new file mode 100644
index 00000000..59b67261
--- /dev/null
+++ b/src/i18n/cs/screens.json
@@ -0,0 +1,18 @@
+{
+  "screenshot": {
+    "title": "",
+    "message": "",
+    "button": ""
+  },
+  "localCorrupt": {
+    "message": ""
+  },
+  "pushError": {
+    "message": "",
+    "description": ""
+  },
+  "shareError": {
+    "imageNotSupported": "",
+    "videoNotSupported": ""
+  }
+}
\ No newline at end of file
diff --git a/src/i18n/cs/screens/accountSelection.json b/src/i18n/cs/screens/accountSelection.json
new file mode 100644
index 00000000..b16795a6
--- /dev/null
+++ b/src/i18n/cs/screens/accountSelection.json
@@ -0,0 +1,6 @@
+{
+  "heading": "",
+  "content": {
+    "select_account": ""
+  }
+}
\ No newline at end of file
diff --git a/src/i18n/cs/screens/actions.json b/src/i18n/cs/screens/actions.json
new file mode 100644
index 00000000..55e9959c
--- /dev/null
+++ b/src/i18n/cs/screens/actions.json
@@ -0,0 +1,20 @@
+{
+  "content": {
+    "altText": {
+      "heading": ""
+    },
+    "notificationsFilter": {
+      "heading": "",
+      "content": {
+        "follow": "",
+        "follow_request": "",
+        "favourite": "",
+        "reblog": "",
+        "mention": "",
+        "poll": "",
+        "status": "",
+        "update": ""
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/i18n/cs/screens/announcements.json b/src/i18n/cs/screens/announcements.json
new file mode 100644
index 00000000..95737a45
--- /dev/null
+++ b/src/i18n/cs/screens/announcements.json
@@ -0,0 +1,10 @@
+{
+  "heading": "",
+  "content": {
+    "published": "",
+    "button": {
+      "read": "",
+      "unread": ""
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/i18n/cs/screens/compose.json b/src/i18n/cs/screens/compose.json
new file mode 100644
index 00000000..ebf265d9
--- /dev/null
+++ b/src/i18n/cs/screens/compose.json
@@ -0,0 +1,175 @@
+{
+  "heading": {
+    "left": {
+      "button": "",
+      "alert": {
+        "title": "",
+        "buttons": {
+          "save": "",
+          "delete": "",
+          "cancel": ""
+        }
+      }
+    },
+    "right": {
+      "button": {
+        "default": "",
+        "conversation": "",
+        "reply": "",
+        "deleteEdit": "",
+        "edit": "",
+        "share": ""
+      },
+      "alert": {
+        "default": {
+          "title": "",
+          "button": ""
+        },
+        "removeReply": {
+          "title": "",
+          "description": "",
+          "confirm": ""
+        }
+      }
+    }
+  },
+  "content": {
+    "root": {
+      "header": {
+        "postingAs": "",
+        "spoilerInput": {
+          "placeholder": ""
+        },
+        "textInput": {
+          "placeholder": "",
+          "keyboardImage": {
+            "exceedMaximum": {
+              "title": "",
+              "OK": ""
+            }
+          }
+        }
+      },
+      "footer": {
+        "attachments": {
+          "sensitive": "",
+          "remove": {
+            "accessibilityLabel": ""
+          },
+          "edit": {
+            "accessibilityLabel": ""
+          },
+          "upload": {
+            "accessibilityLabel": ""
+          }
+        },
+        "emojis": {
+          "accessibilityHint": ""
+        },
+        "poll": {
+          "option": {
+            "placeholder": {
+              "accessibilityLabel": "",
+              "single": "",
+              "multiple": ""
+            }
+          },
+          "quantity": {
+            "reduce": {
+              "accessibilityLabel": "",
+              "accessibilityHint": ""
+            },
+            "increase": {
+              "accessibilityLabel": "",
+              "accessibilityHint": ""
+            }
+          },
+          "multiple": {
+            "heading": "",
+            "options": {
+              "single": "",
+              "multiple": ""
+            }
+          },
+          "expiration": {
+            "heading": "",
+            "options": {
+              "300": "",
+              "1800": "",
+              "3600": "",
+              "21600": "",
+              "86400": "",
+              "259200": "",
+              "604800": ""
+            }
+          }
+        }
+      },
+      "actions": {
+        "attachment": {
+          "accessibilityLabel": "",
+          "accessibilityHint": "",
+          "failed": {
+            "alert": {
+              "title": "",
+              "button": ""
+            }
+          }
+        },
+        "poll": {
+          "accessibilityLabel": "",
+          "accessibilityHint": ""
+        },
+        "visibility": {
+          "accessibilityLabel": "",
+          "title": "",
+          "options": {
+            "public": "",
+            "unlisted": "",
+            "private": "",
+            "direct": ""
+          }
+        },
+        "spoiler": {
+          "accessibilityLabel": ""
+        },
+        "emoji": {
+          "accessibilityLabel": "",
+          "accessibilityHint": ""
+        }
+      },
+      "drafts_one": "",
+      "drafts_other": ""
+    },
+    "editAttachment": {
+      "header": {
+        "title": "",
+        "right": {
+          "accessibilityLabel": "",
+          "failed": {
+            "title": "",
+            "button": ""
+          }
+        }
+      },
+      "content": {
+        "altText": {
+          "heading": "",
+          "placeholder": ""
+        },
+        "imageFocus": ""
+      }
+    },
+    "draftsList": {
+      "header": {
+        "title": ""
+      },
+      "warning": "",
+      "content": {
+        "accessibilityHint": "",
+        "textEmpty": ""
+      },
+      "checkAttachment": ""
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/i18n/cs/screens/imageViewer.json b/src/i18n/cs/screens/imageViewer.json
new file mode 100644
index 00000000..17bba91e
--- /dev/null
+++ b/src/i18n/cs/screens/imageViewer.json
@@ -0,0 +1,16 @@
+{
+  "content": {
+    "actions": {
+      "accessibilityLabel": "",
+      "accessibilityHint": ""
+    },
+    "options": {
+      "save": "",
+      "share": ""
+    },
+    "save": {
+      "succeed": "",
+      "failed": ""
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/i18n/cs/screens/tabs.json b/src/i18n/cs/screens/tabs.json
new file mode 100644
index 00000000..f280a8a7
--- /dev/null
+++ b/src/i18n/cs/screens/tabs.json
@@ -0,0 +1,379 @@
+{
+  "tabs": {
+    "local": {
+      "name": ""
+    },
+    "public": {
+      "name": "",
+      "segments": {
+        "left": "",
+        "right": ""
+      }
+    },
+    "notifications": {
+      "name": ""
+    },
+    "me": {
+      "name": ""
+    }
+  },
+  "common": {
+    "search": {
+      "accessibilityLabel": "",
+      "accessibilityHint": ""
+    }
+  },
+  "notifications": {
+    "filter": {
+      "accessibilityLabel": "",
+      "accessibilityHint": ""
+    }
+  },
+  "me": {
+    "stacks": {
+      "bookmarks": {
+        "name": ""
+      },
+      "conversations": {
+        "name": ""
+      },
+      "favourites": {
+        "name": ""
+      },
+      "fontSize": {
+        "name": ""
+      },
+      "language": {
+        "name": ""
+      },
+      "list": {
+        "name": ""
+      },
+      "listAccounts": {
+        "name": ""
+      },
+      "listAdd": {
+        "name": ""
+      },
+      "listEdit": {
+        "name": ""
+      },
+      "lists": {
+        "name": ""
+      },
+      "push": {
+        "name": ""
+      },
+      "profile": {
+        "name": ""
+      },
+      "profileName": {
+        "name": ""
+      },
+      "profileNote": {
+        "name": ""
+      },
+      "profileFields": {
+        "name": ""
+      },
+      "settings": {
+        "name": ""
+      },
+      "webSettings": {
+        "name": ""
+      },
+      "switch": {
+        "name": ""
+      }
+    },
+    "fontSize": {
+      "demo": "",
+      "sizes": {
+        "S": "",
+        "M": "",
+        "L": "",
+        "XL": "",
+        "XXL": ""
+      }
+    },
+    "listAccounts": {
+      "heading": "",
+      "error": "",
+      "empty": ""
+    },
+    "listEdit": {
+      "heading": "",
+      "title": "",
+      "repliesPolicy": {
+        "heading": "",
+        "options": {
+          "none": "",
+          "list": "",
+          "followed": ""
+        }
+      }
+    },
+    "listDelete": {
+      "heading": "",
+      "confirm": {
+        "title": "",
+        "message": ""
+      }
+    },
+    "profile": {
+      "feedback": {
+        "succeed": "",
+        "failed": ""
+      },
+      "root": {
+        "name": {
+          "title": ""
+        },
+        "avatar": {
+          "title": "",
+          "description": ""
+        },
+        "header": {
+          "title": "",
+          "description": ""
+        },
+        "note": {
+          "title": ""
+        },
+        "fields": {
+          "title": "",
+          "total_one": "",
+          "total_other": ""
+        },
+        "visibility": {
+          "title": "",
+          "options": {
+            "public": "",
+            "unlisted": "",
+            "private": ""
+          }
+        },
+        "sensitive": {
+          "title": ""
+        },
+        "lock": {
+          "title": "",
+          "description": ""
+        },
+        "bot": {
+          "title": "",
+          "description": ""
+        }
+      },
+      "fields": {
+        "group": "",
+        "label": "",
+        "content": ""
+      },
+      "mediaSelectionFailed": ""
+    },
+    "push": {
+      "notAvailable": "",
+      "enable": {
+        "direct": "",
+        "settings": ""
+      },
+      "global": {
+        "heading": "",
+        "description": ""
+      },
+      "decode": {
+        "heading": "",
+        "description": ""
+      },
+      "default": {
+        "heading": ""
+      },
+      "follow": {
+        "heading": ""
+      },
+      "follow_request": {
+        "heading": ""
+      },
+      "favourite": {
+        "heading": ""
+      },
+      "reblog": {
+        "heading": ""
+      },
+      "mention": {
+        "heading": ""
+      },
+      "poll": {
+        "heading": ""
+      },
+      "status": {
+        "heading": ""
+      },
+      "howitworks": ""
+    },
+    "root": {
+      "announcements": {
+        "content": {
+          "unread": "",
+          "read": "",
+          "empty": ""
+        }
+      },
+      "push": {
+        "content": {
+          "enabled": "",
+          "disabled": ""
+        }
+      },
+      "update": {
+        "title": ""
+      },
+      "logout": {
+        "button": "",
+        "alert": {
+          "title": "",
+          "message": "",
+          "buttons": {
+            "logout": ""
+          }
+        }
+      }
+    },
+    "settings": {
+      "fontsize": {
+        "heading": "",
+        "content": {
+          "S": "",
+          "M": "",
+          "L": "",
+          "XL": "",
+          "XXL": ""
+        }
+      },
+      "language": {
+        "heading": ""
+      },
+      "theme": {
+        "heading": "",
+        "options": {
+          "auto": "",
+          "light": "",
+          "dark": ""
+        }
+      },
+      "darkTheme": {
+        "heading": "",
+        "options": {
+          "lighter": "",
+          "darker": ""
+        }
+      },
+      "browser": {
+        "heading": "",
+        "options": {
+          "internal": "",
+          "external": ""
+        }
+      },
+      "staticEmoji": {
+        "heading": "",
+        "description": ""
+      },
+      "feedback": {
+        "heading": ""
+      },
+      "support": {
+        "heading": ""
+      },
+      "review": {
+        "heading": ""
+      },
+      "contact": {
+        "heading": ""
+      },
+      "version": "",
+      "instanceVersion": ""
+    },
+    "switch": {
+      "existing": "",
+      "new": ""
+    }
+  },
+  "shared": {
+    "account": {
+      "actions": {
+        "accessibilityLabel": "",
+        "accessibilityHint": ""
+      },
+      "followed_by": "",
+      "moved": "",
+      "created_at": "",
+      "summary": {
+        "statuses_count": "",
+        "following_count": "",
+        "followers_count": ""
+      },
+      "toots": {
+        "default": "",
+        "all": ""
+      },
+      "suspended": ""
+    },
+    "accountInLists": {
+      "name": "",
+      "inLists": "",
+      "notInLists": ""
+    },
+    "attachments": {
+      "name": ""
+    },
+    "hashtag": {
+      "follow": "",
+      "unfollow": ""
+    },
+    "history": {
+      "name": ""
+    },
+    "search": {
+      "header": {
+        "prefix": "",
+        "placeholder": ""
+      },
+      "empty": {
+        "general": "",
+        "advanced": {
+          "header": "",
+          "example": {
+            "account": "",
+            "hashtag": "",
+            "statusLink": "",
+            "accountLink": ""
+          }
+        },
+        "trending": {
+          "tags": ""
+        }
+      },
+      "sections": {
+        "accounts": "",
+        "hashtags": "",
+        "statuses": ""
+      },
+      "notFound": ""
+    },
+    "toot": {
+      "name": ""
+    },
+    "users": {
+      "accounts": {
+        "following": "",
+        "followers": ""
+      },
+      "statuses": {
+        "reblogged_by": "",
+        "favourited_by": ""
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/i18n/de/common.json b/src/i18n/de/common.json
index 88bf6d29..4e0636a7 100644
--- a/src/i18n/de/common.json
+++ b/src/i18n/de/common.json
@@ -2,7 +2,11 @@
   "buttons": {
     "OK": "OK",
     "apply": "Übernehmen",
-    "cancel": "Abbrechen"
+    "cancel": "Abbrechen",
+    "discard": "Abbrechen",
+    "continue": "Weiter",
+    "delete": "Löschen",
+    "done": ""
   },
   "customEmoji": {
     "accessibilityLabel": "Eigenes Emoji {{emoji}}"
@@ -18,5 +22,9 @@
       "message": "{{function}} fehlgeschlagen, bitte wiederholen"
     }
   },
-  "separator": ", "
+  "separator": ", ",
+  "discard": {
+    "title": "Änderungen nicht gespeichert",
+    "message": "Deine Änderungen wurden nicht gespeichert. Möchtest du die Änderungen verwerfen?"
+  }
 }
\ No newline at end of file
diff --git a/src/i18n/de/components/contextMenu.json b/src/i18n/de/components/contextMenu.json
index 10371cc1..a5fb5fd2 100644
--- a/src/i18n/de/components/contextMenu.json
+++ b/src/i18n/de/components/contextMenu.json
@@ -2,6 +2,11 @@
   "accessibilityHint": "Funktionen für diesen Tröt - wie z. B. Autor und Originaltröt",
   "account": {
     "title": "Benutzeraktionen",
+    "following": {
+      "action_false": "Folgen",
+      "action_true": "Nutzer entfolgen"
+    },
+    "inLists": "",
     "mute": {
       "action_false": "Profil stummschalten",
       "action_true": "Stummschaltung des Nutzers aufheben"
@@ -11,7 +16,7 @@
       "action_true": "User entblocken"
     },
     "reports": {
-      "action": "Melden und blockieren"
+      "action": "Nutzer melden und blockieren"
     }
   },
   "copy": {
diff --git a/src/i18n/de/components/instance.json b/src/i18n/de/components/instance.json
index e2a8925e..e3d1efdc 100644
--- a/src/i18n/de/components/instance.json
+++ b/src/i18n/de/components/instance.json
@@ -20,11 +20,7 @@
   "update": {
     "alert": {
       "title": "Bei der Instanz angemeldet",
-      "message": "Du kannst dich mit einem weiteren Konto anmelden, während du weiterhin mit deinem bestehen Account eingeloggt bleibst",
-      "buttons": {
-        "cancel": "$t(common:buttons.cancel)",
-        "continue": "Weiter"
-      }
+      "message": "Du kannst dich mit einem weiteren Konto anmelden, während du weiterhin mit deinem bestehen Account eingeloggt bleibst"
     }
   }
 }
\ No newline at end of file
diff --git a/src/i18n/de/screens/compose.json b/src/i18n/de/screens/compose.json
index 7b8bb1ff..303980e9 100644
--- a/src/i18n/de/screens/compose.json
+++ b/src/i18n/de/screens/compose.json
@@ -28,7 +28,6 @@
         "removeReply": {
           "title": "Ursprungsnachricht nicht verfügbar",
           "description": "Ursprungströt wurde gelöscht. Möchtest du die Verknüpfung zu ihn entfernen?",
-          "cancel": "$t(common:buttons.cancel)",
           "confirm": "Referenz entfernen"
         }
       }
@@ -89,8 +88,7 @@
             "heading": "Auswahltyp wählen",
             "options": {
               "single": "Einfachauswahl",
-              "multiple": "Mehrfachauswahl",
-              "cancel": "$t(common:buttons.cancel)"
+              "multiple": "Mehrfachauswahl"
             }
           },
           "expiration": {
@@ -102,8 +100,7 @@
               "21600": "6 Stunden",
               "86400": "1 Tag",
               "259200": "3 Tage",
-              "604800": "7 Tage",
-              "cancel": "$t(common:buttons.cancel)"
+              "604800": "7 Tage"
             }
           }
         }
@@ -130,8 +127,7 @@
             "public": "Öffentlich",
             "unlisted": "Ungelistet",
             "private": "Nur für Folgende",
-            "direct": "Direktnachricht",
-            "cancel": "$t(common:buttons.cancel)"
+            "direct": "Direktnachricht"
           }
         },
         "spoiler": {
diff --git a/src/i18n/de/screens/imageViewer.json b/src/i18n/de/screens/imageViewer.json
index 765c5900..e204c9f4 100644
--- a/src/i18n/de/screens/imageViewer.json
+++ b/src/i18n/de/screens/imageViewer.json
@@ -6,8 +6,7 @@
     },
     "options": {
       "save": "Bild speichern",
-      "share": "Bild teilen",
-      "cancel": "$t(common:buttons.cancel)"
+      "share": "Bild teilen"
     },
     "save": {
       "succeed": "Bild gespeichert",
diff --git a/src/i18n/de/screens/tabs.json b/src/i18n/de/screens/tabs.json
index 4485a8e0..0edb41ac 100644
--- a/src/i18n/de/screens/tabs.json
+++ b/src/i18n/de/screens/tabs.json
@@ -46,12 +46,21 @@
       "language": {
         "name": "Sprache"
       },
-      "lists": {
-        "name": "Listen"
-      },
       "list": {
         "name": "Liste: {{list}}"
       },
+      "listAccounts": {
+        "name": "Benutzer in dieser Liste: {{list}}"
+      },
+      "listAdd": {
+        "name": "Eine Liste hinzufügen"
+      },
+      "listEdit": {
+        "name": "Listendetails bearbeiten"
+      },
+      "lists": {
+        "name": "Listen"
+      },
       "push": {
         "name": "Push-Benachrichtigung"
       },
@@ -87,15 +96,31 @@
         "XXL": "XXL"
       }
     },
-    "profile": {
-      "cancellation": {
-        "title": "Änderungen nicht gespeichert",
-        "message": "Änderung wurde nicht gespeichert. Möchtest du die Änderungen verwerfen?",
-        "buttons": {
-          "cancel": "$t(common:buttons.cancel)",
-          "discard": "Verwerfen"
+    "listAccounts": {
+      "heading": "Nutzer verwalten",
+      "error": "Nutzer von der Liste löschen",
+      "empty": "Keine Nutzer in diese Liste hinzugefügt"
+    },
+    "listEdit": {
+      "heading": "Listendetails bearbeiten",
+      "title": "Titel",
+      "repliesPolicy": {
+        "heading": "Antworten anzeigen für:",
+        "options": {
+          "none": "Niemanden",
+          "list": "Mitglieder der Liste",
+          "followed": "Allen gefolgten Nutzern"
         }
-      },
+      }
+    },
+    "listDelete": {
+      "heading": "Liste löschen",
+      "confirm": {
+        "title": "Liste \"{{list}}\" löschen?",
+        "message": "Diese Aktion kann nicht rückgängig gemacht werden."
+      }
+    },
+    "profile": {
       "feedback": {
         "succeed": "{{type}} aktualisiert",
         "failed": "{{type}} Aktualisierung fehlgeschlagen, bitte erneut versuchen"
@@ -125,8 +150,7 @@
           "options": {
             "public": "Öffentlich",
             "unlisted": "Ungelistet",
-            "private": "Nur für Follower",
-            "cancel": "$t(common:buttons.cancel)"
+            "private": "Nur für Follower"
           }
         },
         "sensitive": {
@@ -211,8 +235,7 @@
           "title": "Abmelden?",
           "message": "Nach dem Ausloggen musst du dich erneut anmelden",
           "buttons": {
-            "logout": "Abmelden",
-            "cancel": "$t(common:buttons.cancel)"
+            "logout": "Abmelden"
           }
         }
       }
@@ -229,34 +252,28 @@
         }
       },
       "language": {
-        "heading": "$t(me.stacks.language.name)",
-        "options": {
-          "cancel": "$t(common:buttons.cancel)"
-        }
+        "heading": "$t(me.stacks.language.name)"
       },
       "theme": {
         "heading": "Erscheinungsbild",
         "options": {
           "auto": "Wie System",
           "light": "Heller Modus",
-          "dark": "Dunkler Modus",
-          "cancel": "$t(common:buttons.cancel)"
+          "dark": "Dunkler Modus"
         }
       },
       "darkTheme": {
         "heading": "Dunkles Design",
         "options": {
           "lighter": "Heller",
-          "darker": "Dunkler",
-          "cancel": "$t(common:buttons.cancel)"
+          "darker": "Dunkler"
         }
       },
       "browser": {
         "heading": "Link öffnen",
         "options": {
           "internal": "Innerhalb der App",
-          "external": "Im Systembrowser öffnen",
-          "cancel": "$t(common:buttons.cancel)"
+          "external": "Im Systembrowser öffnen"
         }
       },
       "staticEmoji": {
@@ -275,10 +292,6 @@
       "contact": {
         "heading": "Nimm Kontakt mit tooot auf"
       },
-      "analytics": {
-        "heading": "Hilf uns, besser zu werden",
-        "description": "Es werden ausschließlich Daten gesammelt, welche nicht nutzerbezogen sind"
-      },
       "version": "Version v{{version}}",
       "instanceVersion": "Mastodon Version {{version}}"
     },
@@ -307,6 +320,11 @@
       },
       "suspended": "Konto wurde von den Instanzmoderation gesperrt"
     },
+    "accountInLists": {
+      "name": "",
+      "inLists": "",
+      "notInLists": ""
+    },
     "attachments": {
       "name": "<0 /><1>\"s Medien</1>"
     },
@@ -332,6 +350,9 @@
             "statusLink": "$t(shared.search.header.prefix) $t(shared.search.sections.statuses)",
             "accountLink": "$t(shared.search.header.prefix) $t(shared.search.sections.accounts)"
           }
+        },
+        "trending": {
+          "tags": ""
         }
       },
       "sections": {
diff --git a/src/i18n/es/common.json b/src/i18n/es/common.json
index cd456dfe..ca8f5ee4 100644
--- a/src/i18n/es/common.json
+++ b/src/i18n/es/common.json
@@ -2,7 +2,11 @@
   "buttons": {
     "OK": "OK",
     "apply": "Aplicar",
-    "cancel": "Cancelar"
+    "cancel": "Cancelar",
+    "discard": "Descartar",
+    "continue": "Continuar",
+    "delete": "Borrar",
+    "done": "Hecho"
   },
   "customEmoji": {
     "accessibilityLabel": "Emoji personalizado {{emoji}}"
@@ -18,5 +22,9 @@
       "message": "{{function}} falló, vuelva a intentarlo"
     }
   },
-  "separator": ", "
+  "separator": ", ",
+  "discard": {
+    "title": "Cambios no guardados",
+    "message": "Los cambios no se han guardado. ¿Quieres descartarlos?"
+  }
 }
\ No newline at end of file
diff --git a/src/i18n/es/components/contextMenu.json b/src/i18n/es/components/contextMenu.json
index e879a855..00dcf472 100644
--- a/src/i18n/es/components/contextMenu.json
+++ b/src/i18n/es/components/contextMenu.json
@@ -2,6 +2,11 @@
   "accessibilityHint": "Acciones para este toot, como su usuario o el toot en sí mismo",
   "account": {
     "title": "Acciones de usuario",
+    "following": {
+      "action_false": "Seguir usuario",
+      "action_true": "Dejar de seguir usuario"
+    },
+    "inLists": "Administrar usuario de listas",
     "mute": {
       "action_false": "Silenciar usuario",
       "action_true": "Dejar de silenciar al usuario"
@@ -11,7 +16,7 @@
       "action_true": "Desbloquear usuario"
     },
     "reports": {
-      "action": "Reportar y bloquear"
+      "action": "Reportar y bloquear usuario"
     }
   },
   "copy": {
diff --git a/src/i18n/es/components/instance.json b/src/i18n/es/components/instance.json
index 914f3c04..ab46d601 100644
--- a/src/i18n/es/components/instance.json
+++ b/src/i18n/es/components/instance.json
@@ -20,11 +20,7 @@
   "update": {
     "alert": {
       "title": "Iniciado sesión en esta instancia",
-      "message": "Puedes iniciar sesión en otra cuenta, manteniendo conectadas las cuentas actuales",
-      "buttons": {
-        "cancel": "$t(common:buttons.cancel)",
-        "continue": "Continuar"
-      }
+      "message": "Puedes iniciar sesión en otra cuenta, manteniendo conectadas las cuentas actuales"
     }
   }
 }
\ No newline at end of file
diff --git a/src/i18n/es/screens/compose.json b/src/i18n/es/screens/compose.json
index 5d696e74..60604b07 100644
--- a/src/i18n/es/screens/compose.json
+++ b/src/i18n/es/screens/compose.json
@@ -28,7 +28,6 @@
         "removeReply": {
           "title": "No se pudo encontrar el toot respondido",
           "description": "El toot respondido podría haber sido eliminado. ¿Quieres eliminarlo de tu referencia?",
-          "cancel": "$t(common:buttons.cancel)",
           "confirm": "Eliminar referencia"
         }
       }
@@ -89,8 +88,7 @@
             "heading": "Tipo de encuesta",
             "options": {
               "single": "Respuesta única",
-              "multiple": "Respuesta múltiple",
-              "cancel": "$t(common:buttons.cancel)"
+              "multiple": "Respuesta múltiple"
             }
           },
           "expiration": {
@@ -102,8 +100,7 @@
               "21600": "6 horas",
               "86400": "1 día",
               "259200": "3 días",
-              "604800": "7 días",
-              "cancel": "$t(common:buttons.cancel)"
+              "604800": "7 días"
             }
           }
         }
@@ -130,8 +127,7 @@
             "public": "Público",
             "unlisted": "No listado",
             "private": "Solo seguidores",
-            "direct": "Mensaje directo",
-            "cancel": "$t(common:buttons.cancel)"
+            "direct": "Mensaje directo"
           }
         },
         "spoiler": {
diff --git a/src/i18n/es/screens/imageViewer.json b/src/i18n/es/screens/imageViewer.json
index 03b22a17..45f4411e 100644
--- a/src/i18n/es/screens/imageViewer.json
+++ b/src/i18n/es/screens/imageViewer.json
@@ -6,8 +6,7 @@
     },
     "options": {
       "save": "Guardar imagen",
-      "share": "Compartir imagen",
-      "cancel": "$t(common:buttons.cancel)"
+      "share": "Compartir imagen"
     },
     "save": {
       "succeed": "Imagen guardada",
diff --git a/src/i18n/es/screens/tabs.json b/src/i18n/es/screens/tabs.json
index be1155a7..9103b01e 100644
--- a/src/i18n/es/screens/tabs.json
+++ b/src/i18n/es/screens/tabs.json
@@ -46,14 +46,23 @@
       "language": {
         "name": "Idioma"
       },
-      "lists": {
-        "name": "Listas"
-      },
       "list": {
         "name": "Lista: {{list}}"
       },
+      "listAccounts": {
+        "name": "Usuarios en la lista: {{list}}"
+      },
+      "listAdd": {
+        "name": "Añadir una lista"
+      },
+      "listEdit": {
+        "name": "Editar detalles de lista"
+      },
+      "lists": {
+        "name": "Listas"
+      },
       "push": {
-        "name": "Notificación push"
+        "name": "Notificaciones push"
       },
       "profile": {
         "name": "Editar perfil"
@@ -87,15 +96,31 @@
         "XXL": "XXL"
       }
     },
-    "profile": {
-      "cancellation": {
-        "title": "Cambios no guardados",
-        "message": "Los cambios no se han guardado. ¿Quieres descartarlos?",
-        "buttons": {
-          "cancel": "$t(common:buttons.cancel)",
-          "discard": "Descartar"
+    "listAccounts": {
+      "heading": "Administrar usuarios",
+      "error": "Eliminar usuario de la lista",
+      "empty": "No hay usuarios en esta lista"
+    },
+    "listEdit": {
+      "heading": "Editar detalles de lista",
+      "title": "Título",
+      "repliesPolicy": {
+        "heading": "Mostrar respuestas a:",
+        "options": {
+          "none": "Nadie",
+          "list": "Miembros de la lista",
+          "followed": "Cualquier usuario seguido"
         }
-      },
+      }
+    },
+    "listDelete": {
+      "heading": "Borrar lista",
+      "confirm": {
+        "title": "¿Eliminar lista \"{{list}}\"?",
+        "message": "Esta acción no se podrá deshacer."
+      }
+    },
+    "profile": {
       "feedback": {
         "succeed": "{{type}} actualizado",
         "failed": "Error al actualizar {{type}}, inténtalo de nuevo"
@@ -125,15 +150,14 @@
           "options": {
             "public": "Público",
             "unlisted": "No listado",
-            "private": "Solo seguidores",
-            "cancel": "$t(common:buttons.cancel)"
+            "private": "Solo seguidores"
           }
         },
         "sensitive": {
           "title": "Publicar contenido multimedia sensible"
         },
         "lock": {
-          "title": "Bloquear cuenta",
+          "title": "Hacer la cuenta privada",
           "description": "Necesitas aprobar manualmente los seguidores nuevos"
         },
         "bot": {
@@ -211,8 +235,7 @@
           "title": "¿Cerrar sesión?",
           "message": "Después de cerrar sesión, necesitas iniciar sesión de nuevo",
           "buttons": {
-            "logout": "Cerrar sesión",
-            "cancel": "$t(common:buttons.cancel)"
+            "logout": "Cerrar sesión"
           }
         }
       }
@@ -229,34 +252,28 @@
         }
       },
       "language": {
-        "heading": "$t(me.stacks.language.name)",
-        "options": {
-          "cancel": "$t(common:buttons.cancel)"
-        }
+        "heading": "$t(me.stacks.language.name)"
       },
       "theme": {
         "heading": "Apariencia",
         "options": {
           "auto": "Como el sistema",
           "light": "Modo claro",
-          "dark": "Modo oscuro",
-          "cancel": "$t(common:buttons.cancel)"
+          "dark": "Modo oscuro"
         }
       },
       "darkTheme": {
         "heading": "Tema oscuro",
         "options": {
           "lighter": "Más claro",
-          "darker": "Más oscuro",
-          "cancel": "$t(common:buttons.cancel)"
+          "darker": "Más oscuro"
         }
       },
       "browser": {
         "heading": "Abrir enlaces",
         "options": {
           "internal": "Dentro de la aplicación",
-          "external": "Usar navegador",
-          "cancel": "$t(common:buttons.cancel)"
+          "external": "Usar navegador"
         }
       },
       "staticEmoji": {
@@ -275,10 +292,6 @@
       "contact": {
         "heading": "Contactar tooot"
       },
-      "analytics": {
-        "heading": "Ayúdanos a mejorar",
-        "description": "Recopilar uso no relativo al usuario"
-      },
       "version": "Versión v{{version}}",
       "instanceVersion": "Versión de Mastodon v{{version}}"
     },
@@ -294,8 +307,8 @@
         "accessibilityHint": "Puedes silenciar, bloquear, reportar o compartir este usuario"
       },
       "followed_by": " te sigue",
-      "moved": "Se ha transladado",
-      "created_at": "Se unió en {{date}}",
+      "moved": "Se ha trasladado",
+      "created_at": "Se unió el {{date}}",
       "summary": {
         "statuses_count": "{{count}} toots",
         "following_count": "$t(shared.users.accounts.following)",
@@ -307,8 +320,13 @@
       },
       "suspended": "Cuenta suspendida por los moderadores de tu servidor"
     },
+    "accountInLists": {
+      "name": "Listas de @{{username}}",
+      "inLists": "En listas",
+      "notInLists": "Otras listas"
+    },
     "attachments": {
-      "name": ""
+      "name": "Multimedia de <0 /><1></1>"
     },
     "hashtag": {
       "follow": "Seguir",
@@ -332,6 +350,9 @@
             "statusLink": "$t(shared.search.header.prefix) $t(shared.search.sections.statuses)",
             "accountLink": "$t(shared.search.header.prefix) $t(shared.search.sections.accounts)"
           }
+        },
+        "trending": {
+          "tags": ""
         }
       },
       "sections": {
diff --git a/src/i18n/fr/common.json b/src/i18n/fr/common.json
index 2ff041e6..0b47114c 100644
--- a/src/i18n/fr/common.json
+++ b/src/i18n/fr/common.json
@@ -2,7 +2,11 @@
   "buttons": {
     "OK": "Ok",
     "apply": "Confirmer",
-    "cancel": "Annuler"
+    "cancel": "Annuler",
+    "discard": "",
+    "continue": "",
+    "delete": "",
+    "done": ""
   },
   "customEmoji": {
     "accessibilityLabel": "Émoji personnalisé {{emoji}}"
@@ -18,5 +22,9 @@
       "message": "Échec de la connexion, veuillez réessayer"
     }
   },
-  "separator": ", "
+  "separator": ", ",
+  "discard": {
+    "title": "",
+    "message": ""
+  }
 }
\ No newline at end of file
diff --git a/src/i18n/fr/components/contextMenu.json b/src/i18n/fr/components/contextMenu.json
index d81e64c8..f938cde1 100644
--- a/src/i18n/fr/components/contextMenu.json
+++ b/src/i18n/fr/components/contextMenu.json
@@ -2,6 +2,11 @@
   "accessibilityHint": "Actions pour ce Pouet, telles que son utilisateur affiché, le Pouet lui-même",
   "account": {
     "title": "Actions de l'utilisateur",
+    "following": {
+      "action_false": "",
+      "action_true": ""
+    },
+    "inLists": "",
     "mute": {
       "action_false": "Rendre muet l'utilisateur",
       "action_true": "Rendre la parole"
@@ -11,7 +16,7 @@
       "action_true": "Débloquer l'utilisateur"
     },
     "reports": {
-      "action": "Signaler et bloquer"
+      "action": ""
     }
   },
   "copy": {
diff --git a/src/i18n/fr/components/instance.json b/src/i18n/fr/components/instance.json
index 90d9fe5b..7bea5931 100644
--- a/src/i18n/fr/components/instance.json
+++ b/src/i18n/fr/components/instance.json
@@ -20,11 +20,7 @@
   "update": {
     "alert": {
       "title": "Connecté à cette instance",
-      "message": "Vous pouvez vous connecter à un autre compte, en maintenant un compte connecté existant",
-      "buttons": {
-        "cancel": "$t(common:buttons.cancel)",
-        "continue": "Continuer"
-      }
+      "message": "Vous pouvez vous connecter à un autre compte, en maintenant un compte connecté existant"
     }
   }
 }
\ No newline at end of file
diff --git a/src/i18n/fr/screens/compose.json b/src/i18n/fr/screens/compose.json
index dd5387ed..7fd65c95 100644
--- a/src/i18n/fr/screens/compose.json
+++ b/src/i18n/fr/screens/compose.json
@@ -28,7 +28,6 @@
         "removeReply": {
           "title": "Le pouet répondu est introuvable",
           "description": "Le pouet répondu a peut-être été supprimé. Voulez-vous le supprimer de votre référence ?",
-          "cancel": "$t(common:buttons.cancel)",
           "confirm": "Supprimer la référence"
         }
       }
@@ -89,8 +88,7 @@
             "heading": "Type de choix",
             "options": {
               "single": "Choix unique",
-              "multiple": "Choix multiple",
-              "cancel": "$t(common:buttons.cancel)"
+              "multiple": "Choix multiple"
             }
           },
           "expiration": {
@@ -102,8 +100,7 @@
               "21600": "6 heures",
               "86400": "1 jour",
               "259200": "3 jours",
-              "604800": "7 jours",
-              "cancel": "$t(common:buttons.cancel)"
+              "604800": "7 jours"
             }
           }
         }
@@ -130,8 +127,7 @@
             "public": "Public",
             "unlisted": "Non listé",
             "private": "Abonné·e·s uniquement",
-            "direct": "Message direct",
-            "cancel": "$t(common:buttons.cancel)"
+            "direct": "Message direct"
           }
         },
         "spoiler": {
diff --git a/src/i18n/fr/screens/imageViewer.json b/src/i18n/fr/screens/imageViewer.json
index 993931a0..e480f9c0 100644
--- a/src/i18n/fr/screens/imageViewer.json
+++ b/src/i18n/fr/screens/imageViewer.json
@@ -6,8 +6,7 @@
     },
     "options": {
       "save": "Enregistrer l'image",
-      "share": "Partager l'image",
-      "cancel": "$t(common:buttons.cancel)"
+      "share": "Partager l'image"
     },
     "save": {
       "succeed": "Image enregistrée",
diff --git a/src/i18n/fr/screens/tabs.json b/src/i18n/fr/screens/tabs.json
index 7934b677..f20dc2ed 100644
--- a/src/i18n/fr/screens/tabs.json
+++ b/src/i18n/fr/screens/tabs.json
@@ -46,12 +46,21 @@
       "language": {
         "name": "Langue"
       },
-      "lists": {
-        "name": "Listes"
-      },
       "list": {
         "name": "Liste : {{list}}"
       },
+      "listAccounts": {
+        "name": ""
+      },
+      "listAdd": {
+        "name": ""
+      },
+      "listEdit": {
+        "name": ""
+      },
+      "lists": {
+        "name": "Listes"
+      },
       "push": {
         "name": "Push de Notification"
       },
@@ -87,15 +96,31 @@
         "XXL": "XXL"
       }
     },
-    "profile": {
-      "cancellation": {
-        "title": "Modifications non sauvegardées",
-        "message": "Votre modification n'a pas été enregistrée. Voulez-vous annuler l'enregistrement des modifications ?",
-        "buttons": {
-          "cancel": "$t(common:buttons.cancel)",
-          "discard": "Ne pas tenir compte"
+    "listAccounts": {
+      "heading": "",
+      "error": "",
+      "empty": ""
+    },
+    "listEdit": {
+      "heading": "",
+      "title": "",
+      "repliesPolicy": {
+        "heading": "",
+        "options": {
+          "none": "",
+          "list": "",
+          "followed": ""
         }
-      },
+      }
+    },
+    "listDelete": {
+      "heading": "",
+      "confirm": {
+        "title": "",
+        "message": ""
+      }
+    },
+    "profile": {
       "feedback": {
         "succeed": "{{type}} mis à jour",
         "failed": "{{type}} Échec de la mise à jour, veuillez ré-essayer"
@@ -125,8 +150,7 @@
           "options": {
             "public": "Public",
             "unlisted": "Non listé",
-            "private": "Abonné·e·s uniquement",
-            "cancel": "$t(common:buttons.cancel)"
+            "private": "Abonné·e·s uniquement"
           }
         },
         "sensitive": {
@@ -211,8 +235,7 @@
           "title": "Déconnexion?",
           "message": "Après vous être déconnecté, vous devez vous reconnecter",
           "buttons": {
-            "logout": "Déconnexion",
-            "cancel": "$t(common:buttons.cancel)"
+            "logout": "Déconnexion"
           }
         }
       }
@@ -229,34 +252,28 @@
         }
       },
       "language": {
-        "heading": "$t(me.stacks.language.name)",
-        "options": {
-          "cancel": "$t(common:buttons.cancel)"
-        }
+        "heading": "$t(me.stacks.language.name)"
       },
       "theme": {
         "heading": "Apparence",
         "options": {
           "auto": "Comme le système",
           "light": "Mode Clair",
-          "dark": "Mode sombre",
-          "cancel": "$t(common:buttons.cancel)"
+          "dark": "Mode sombre"
         }
       },
       "darkTheme": {
         "heading": "Thème sombre",
         "options": {
           "lighter": "Plus claire",
-          "darker": "Plus sombre",
-          "cancel": "$t(common:buttons.cancel)"
+          "darker": "Plus sombre"
         }
       },
       "browser": {
         "heading": "Ouverture du lien",
         "options": {
           "internal": "Dans l'application",
-          "external": "Ouvrir dans le navigateur système",
-          "cancel": "$t(common:buttons.cancel)"
+          "external": "Ouvrir dans le navigateur système"
         }
       },
       "staticEmoji": {
@@ -275,10 +292,6 @@
       "contact": {
         "heading": "Contacter tooot"
       },
-      "analytics": {
-        "heading": "Aidez-nous à nous améliorer",
-        "description": "Collecte uniquement de l'usage relatif des non-utilisateurs"
-      },
       "version": "Version {{version}}",
       "instanceVersion": "Version de Mastodon v{{version}}"
     },
@@ -307,6 +320,11 @@
       },
       "suspended": "Compte suspendu par les modérateurs de votre serveur"
     },
+    "accountInLists": {
+      "name": "",
+      "inLists": "",
+      "notInLists": ""
+    },
     "attachments": {
       "name": "<0 /><1>\"s media</1>"
     },
@@ -332,6 +350,9 @@
             "statusLink": "$t(shared.search.header.prefix) $t(shared.search.sections.statuses)",
             "accountLink": "$t(shared.search.header.prefix) $t(shared.search.sections.accounts)"
           }
+        },
+        "trending": {
+          "tags": ""
         }
       },
       "sections": {
diff --git a/src/i18n/it/common.json b/src/i18n/it/common.json
index 182154db..daed31b9 100644
--- a/src/i18n/it/common.json
+++ b/src/i18n/it/common.json
@@ -2,7 +2,11 @@
   "buttons": {
     "OK": "OK",
     "apply": "Applica",
-    "cancel": "Annulla"
+    "cancel": "Annulla",
+    "discard": "",
+    "continue": "",
+    "delete": "",
+    "done": ""
   },
   "customEmoji": {
     "accessibilityLabel": "Emoji personalizzata {{emoji}}"
@@ -18,5 +22,9 @@
       "message": "{{function}} fallito, per favore riprova"
     }
   },
-  "separator": ", "
+  "separator": ", ",
+  "discard": {
+    "title": "",
+    "message": ""
+  }
 }
\ No newline at end of file
diff --git a/src/i18n/it/components/contextMenu.json b/src/i18n/it/components/contextMenu.json
index 6f130c39..64ae83b7 100644
--- a/src/i18n/it/components/contextMenu.json
+++ b/src/i18n/it/components/contextMenu.json
@@ -2,6 +2,11 @@
   "accessibilityHint": "Azioni per questo toot, per l'utente che l'ha pubblicato o per il toot stesso",
   "account": {
     "title": "Azioni utente",
+    "following": {
+      "action_false": "",
+      "action_true": ""
+    },
+    "inLists": "",
     "mute": {
       "action_false": "Muta utente",
       "action_true": "Riattiva utente"
@@ -11,7 +16,7 @@
       "action_true": "Sblocca utente"
     },
     "reports": {
-      "action": "Segnala e blocca"
+      "action": ""
     }
   },
   "copy": {
diff --git a/src/i18n/it/components/instance.json b/src/i18n/it/components/instance.json
index 1e47895b..4919837e 100644
--- a/src/i18n/it/components/instance.json
+++ b/src/i18n/it/components/instance.json
@@ -20,11 +20,7 @@
   "update": {
     "alert": {
       "title": "Accesso a questa istanza effettuato",
-      "message": "Puoi accedere ad ulteriori account, mantenendo l'accesso a quelli già esistenti",
-      "buttons": {
-        "cancel": "$t(common:buttons.cancel)",
-        "continue": "Continua"
-      }
+      "message": "Puoi accedere ad ulteriori account, mantenendo l'accesso a quelli già esistenti"
     }
   }
 }
\ No newline at end of file
diff --git a/src/i18n/it/screens/compose.json b/src/i18n/it/screens/compose.json
index f84b9a13..589f34b1 100644
--- a/src/i18n/it/screens/compose.json
+++ b/src/i18n/it/screens/compose.json
@@ -28,7 +28,6 @@
         "removeReply": {
           "title": "Impossibile trovare il toot a cui si è risposto",
           "description": "Il toot a cui si è risposto potrebbe essere stato cancellato. Vuoi rimuoverne il riferimento?",
-          "cancel": "$t(common:buttons.cancel)",
           "confirm": "Rimuovi riferimento"
         }
       }
@@ -89,8 +88,7 @@
             "heading": "Tipo di risposta",
             "options": {
               "single": "Risposta singola",
-              "multiple": "Risposta multipla",
-              "cancel": "$t(common:buttons.cancel)"
+              "multiple": "Risposta multipla"
             }
           },
           "expiration": {
@@ -102,8 +100,7 @@
               "21600": "6 ore",
               "86400": "1 giorno",
               "259200": "3 giorni",
-              "604800": "7 giorni",
-              "cancel": "$t(common:buttons.cancel)"
+              "604800": "7 giorni"
             }
           }
         }
@@ -130,8 +127,7 @@
             "public": "Pubblico",
             "unlisted": "Non listato",
             "private": "Solo seguaci",
-            "direct": "Messaggio diretto",
-            "cancel": "$t(common:buttons.cancel)"
+            "direct": "Messaggio diretto"
           }
         },
         "spoiler": {
diff --git a/src/i18n/it/screens/imageViewer.json b/src/i18n/it/screens/imageViewer.json
index 1a640fec..19742768 100644
--- a/src/i18n/it/screens/imageViewer.json
+++ b/src/i18n/it/screens/imageViewer.json
@@ -6,8 +6,7 @@
     },
     "options": {
       "save": "Salva immagine",
-      "share": "Condividi immagine",
-      "cancel": "$t(common:buttons.cancel)"
+      "share": "Condividi immagine"
     },
     "save": {
       "succeed": "Immagine salvata",
diff --git a/src/i18n/it/screens/tabs.json b/src/i18n/it/screens/tabs.json
index dedbc789..ace9b5b2 100644
--- a/src/i18n/it/screens/tabs.json
+++ b/src/i18n/it/screens/tabs.json
@@ -46,12 +46,21 @@
       "language": {
         "name": "Lingua"
       },
-      "lists": {
-        "name": "Liste"
-      },
       "list": {
         "name": "Lista: {{list}}"
       },
+      "listAccounts": {
+        "name": ""
+      },
+      "listAdd": {
+        "name": ""
+      },
+      "listEdit": {
+        "name": ""
+      },
+      "lists": {
+        "name": "Liste"
+      },
       "push": {
         "name": "Notifiche push"
       },
@@ -87,15 +96,31 @@
         "XXL": "XXL"
       }
     },
-    "profile": {
-      "cancellation": {
-        "title": "Modifiche non salvate",
-        "message": "Le tue modifiche non sono state salvate. Vuoi scartarle?",
-        "buttons": {
-          "cancel": "$t(common:buttons.cancel)",
-          "discard": "Scarta"
+    "listAccounts": {
+      "heading": "",
+      "error": "",
+      "empty": ""
+    },
+    "listEdit": {
+      "heading": "",
+      "title": "",
+      "repliesPolicy": {
+        "heading": "",
+        "options": {
+          "none": "",
+          "list": "",
+          "followed": ""
         }
-      },
+      }
+    },
+    "listDelete": {
+      "heading": "",
+      "confirm": {
+        "title": "",
+        "message": ""
+      }
+    },
+    "profile": {
       "feedback": {
         "succeed": "{{type}} aggiornato",
         "failed": "Aggiornamento di {{type}} fallito, per favore riprova."
@@ -125,8 +150,7 @@
           "options": {
             "public": "Pubblico",
             "unlisted": "Non listato",
-            "private": "Solo seguaci",
-            "cancel": "$t(common:buttons.cancel)"
+            "private": "Solo seguaci"
           }
         },
         "sensitive": {
@@ -211,8 +235,7 @@
           "title": "Uscire dall'account?",
           "message": "Se esci dal tuo account, dovrai rifare l'accesso",
           "buttons": {
-            "logout": "Esci",
-            "cancel": "$t(common:buttons.cancel)"
+            "logout": "Esci"
           }
         }
       }
@@ -229,34 +252,28 @@
         }
       },
       "language": {
-        "heading": "$t(me.stacks.language.name)",
-        "options": {
-          "cancel": "$t(common:buttons.cancel)"
-        }
+        "heading": "$t(me.stacks.language.name)"
       },
       "theme": {
         "heading": "Tema",
         "options": {
           "auto": "Segui impostazioni di sistema",
           "light": "Tema chiaro",
-          "dark": "Tema scuro",
-          "cancel": "$t(common:buttons.cancel)"
+          "dark": "Tema scuro"
         }
       },
       "darkTheme": {
         "heading": "Tema scuro",
         "options": {
           "lighter": "Poco scuro",
-          "darker": "Molto scuro",
-          "cancel": "$t(common:buttons.cancel)"
+          "darker": "Molto scuro"
         }
       },
       "browser": {
         "heading": "Apertura link",
         "options": {
           "internal": "Nella app",
-          "external": "Nel browser di sistema",
-          "cancel": "$t(common:buttons.cancel)"
+          "external": "Nel browser di sistema"
         }
       },
       "staticEmoji": {
@@ -275,10 +292,6 @@
       "contact": {
         "heading": "Contatta tooot"
       },
-      "analytics": {
-        "heading": "Aiutaci a migliorare",
-        "description": "Vengono raccolti dati di utilizzo anonimi"
-      },
       "version": "Versione di tooot: v{{version}}",
       "instanceVersion": "Versione dell'istanza Mastodon: v{{version}}"
     },
@@ -307,6 +320,11 @@
       },
       "suspended": ""
     },
+    "accountInLists": {
+      "name": "",
+      "inLists": "",
+      "notInLists": ""
+    },
     "attachments": {
       "name": "Media di <0 /><1>\"</1>"
     },
@@ -332,6 +350,9 @@
             "statusLink": "$t(shared.search.header.prefix) $t(shared.search.sections.statuses)",
             "accountLink": "$t(shared.search.header.prefix) $t(shared.search.sections.accounts)"
           }
+        },
+        "trending": {
+          "tags": ""
         }
       },
       "sections": {
diff --git a/src/i18n/ja/common.json b/src/i18n/ja/common.json
index c0702a88..b2f8b369 100644
--- a/src/i18n/ja/common.json
+++ b/src/i18n/ja/common.json
@@ -2,7 +2,11 @@
   "buttons": {
     "OK": "はい",
     "apply": "適用",
-    "cancel": "キャンセル"
+    "cancel": "キャンセル",
+    "discard": "変更を破棄",
+    "continue": "続ける",
+    "delete": "削除",
+    "done": "完了"
   },
   "customEmoji": {
     "accessibilityLabel": "カスタム絵文字 {{emoji}}"
@@ -18,5 +22,9 @@
       "message": "{{function}} 接続に失敗しました。再試行してください。"
     }
   },
-  "separator": ", "
+  "separator": ", ",
+  "discard": {
+    "title": "変更は保存されていません",
+    "message": "変更は保存されていません。変更を破棄しますか?"
+  }
 }
\ No newline at end of file
diff --git a/src/i18n/ja/components/contextMenu.json b/src/i18n/ja/components/contextMenu.json
index 47a35d43..9b4b5d61 100644
--- a/src/i18n/ja/components/contextMenu.json
+++ b/src/i18n/ja/components/contextMenu.json
@@ -2,6 +2,11 @@
   "accessibilityHint": "このトゥートへのアクション、投稿されたユーザー、トゥート自体など",
   "account": {
     "title": "ユーザーアクション",
+    "following": {
+      "action_false": "ユーザーをフォロー",
+      "action_true": "ユーザーをフォロー解除"
+    },
+    "inLists": "リストのユーザーを管理",
     "mute": {
       "action_false": "ユーザーをミュート",
       "action_true": "ユーザーのミュートを解除"
@@ -11,7 +16,7 @@
       "action_true": "ユーザーのブロックを解除"
     },
     "reports": {
-      "action": "通報とブロック"
+      "action": "ユーザーの報告とブロック"
     }
   },
   "copy": {
diff --git a/src/i18n/ja/components/instance.json b/src/i18n/ja/components/instance.json
index 8a556d94..6f6e662d 100644
--- a/src/i18n/ja/components/instance.json
+++ b/src/i18n/ja/components/instance.json
@@ -20,11 +20,7 @@
   "update": {
     "alert": {
       "title": "このインスタンスにログインしました",
-      "message": "既存のアカウントにログインしたまま、他のアカウントにログインできます",
-      "buttons": {
-        "cancel": "$t(common:buttons.cancel)",
-        "continue": "続行"
-      }
+      "message": "既存のアカウントにログインしたまま、他のアカウントにログインできます"
     }
   }
 }
\ No newline at end of file
diff --git a/src/i18n/ja/screens/compose.json b/src/i18n/ja/screens/compose.json
index 5caeff56..31cb0bf8 100644
--- a/src/i18n/ja/screens/compose.json
+++ b/src/i18n/ja/screens/compose.json
@@ -28,7 +28,6 @@
         "removeReply": {
           "title": "返信されたトゥートが見つかりませんでした",
           "description": "返信されたトゥートが削除された可能性があります。参照から削除しますか？",
-          "cancel": "$t(common:buttons.cancel)",
           "confirm": "参照を削除"
         }
       }
@@ -89,8 +88,7 @@
             "heading": "投票タイプ",
             "options": {
               "single": "単一選択式",
-              "multiple": "複数選択式",
-              "cancel": "$t(common:buttons.cancel)"
+              "multiple": "複数選択式"
             }
           },
           "expiration": {
@@ -102,8 +100,7 @@
               "21600": "6時間",
               "86400": "1日",
               "259200": "3日",
-              "604800": "7日",
-              "cancel": "$t(common:buttons.cancel)"
+              "604800": "7日"
             }
           }
         }
@@ -130,8 +127,7 @@
             "public": "公開",
             "unlisted": "未収載",
             "private": "フォロワー限定",
-            "direct": "ダイレクトメッセージ",
-            "cancel": "$t(common:buttons.cancel)"
+            "direct": "ダイレクトメッセージ"
           }
         },
         "spoiler": {
diff --git a/src/i18n/ja/screens/imageViewer.json b/src/i18n/ja/screens/imageViewer.json
index 8b2d2ab8..0cc9316c 100644
--- a/src/i18n/ja/screens/imageViewer.json
+++ b/src/i18n/ja/screens/imageViewer.json
@@ -6,8 +6,7 @@
     },
     "options": {
       "save": "画像を保存",
-      "share": "画像を共有",
-      "cancel": "$t(common:buttons.cancel)"
+      "share": "画像を共有"
     },
     "save": {
       "succeed": "画像を保存しました",
diff --git a/src/i18n/ja/screens/tabs.json b/src/i18n/ja/screens/tabs.json
index aa1ac6ca..4f0e761b 100644
--- a/src/i18n/ja/screens/tabs.json
+++ b/src/i18n/ja/screens/tabs.json
@@ -46,12 +46,21 @@
       "language": {
         "name": "言語"
       },
-      "lists": {
-        "name": "リスト"
-      },
       "list": {
         "name": "リスト: {{list}}"
       },
+      "listAccounts": {
+        "name": "リスト {{list}} のユーザー"
+      },
+      "listAdd": {
+        "name": "リストに追加"
+      },
+      "listEdit": {
+        "name": "リストの詳細を編集"
+      },
+      "lists": {
+        "name": "リスト"
+      },
       "push": {
         "name": "プッシュ通知"
       },
@@ -87,15 +96,31 @@
         "XXL": "最大"
       }
     },
-    "profile": {
-      "cancellation": {
-        "title": "変更を破棄",
-        "message": "変更は保存されていません。変更の保存を破棄しますか？",
-        "buttons": {
-          "cancel": "$t(common:buttons.cancel)",
-          "discard": "破棄"
+    "listAccounts": {
+      "heading": "ユーザーの管理",
+      "error": "リストからユーザーを削除",
+      "empty": "このリストにはユーザーが追加されていません"
+    },
+    "listEdit": {
+      "heading": "リストの詳細を編集",
+      "title": "タイトル",
+      "repliesPolicy": {
+        "heading": "返信を表示",
+        "options": {
+          "none": "なし",
+          "list": "リストのメンバー",
+          "followed": "フォロー中のユーザー全員"
         }
-      },
+      }
+    },
+    "listDelete": {
+      "heading": "リストを削除",
+      "confirm": {
+        "title": "リスト \"{{list}}\" を削除しますか?",
+        "message": "この操作は復元できません。"
+      }
+    },
+    "profile": {
       "feedback": {
         "succeed": "{{type}} がアップデートされました",
         "failed": "{{type}} のアップデートに失敗しました。もういちどお試しください"
@@ -125,8 +150,7 @@
           "options": {
             "public": "公開",
             "unlisted": "未収載",
-            "private": "フォロワー限定",
-            "cancel": "$t(common:buttons.cancel)"
+            "private": "フォロワー限定"
           }
         },
         "sensitive": {
@@ -211,8 +235,7 @@
           "title": "ログアウトしますか？",
           "message": "ログアウトすると、再度ログインする必要があります",
           "buttons": {
-            "logout": "ログアウト",
-            "cancel": "$t(common:buttons.cancel)"
+            "logout": "ログアウト"
           }
         }
       }
@@ -229,34 +252,28 @@
         }
       },
       "language": {
-        "heading": "$t(me.stacks.language.name)",
-        "options": {
-          "cancel": "$t(common:buttons.cancel)"
-        }
+        "heading": "$t(me.stacks.language.name)"
       },
       "theme": {
         "heading": "外観",
         "options": {
           "auto": "システムの設定に従う",
           "light": "ライトモード",
-          "dark": "ダークモード",
-          "cancel": "$t(common:buttons.cancel)"
+          "dark": "ダークモード"
         }
       },
       "darkTheme": {
         "heading": "ダークテーマ",
         "options": {
           "lighter": "明るめ",
-          "darker": "暗め",
-          "cancel": "$t(common:buttons.cancel)"
+          "darker": "暗め"
         }
       },
       "browser": {
         "heading": "リンクを開く",
         "options": {
           "internal": "アプリ内で開く",
-          "external": "システムブラウザを使用する",
-          "cancel": "$t(common:buttons.cancel)"
+          "external": "システムブラウザを使用する"
         }
       },
       "staticEmoji": {
@@ -275,10 +292,6 @@
       "contact": {
         "heading": "tooot に関する連絡"
       },
-      "analytics": {
-        "heading": "ソフトウェア改善への協力",
-        "description": "ユーザーに関連しない情報のみ収集します"
-      },
       "version": "バージョン v{{version}}",
       "instanceVersion": "Mastodonのバージョン v{{version}}"
     },
@@ -307,6 +320,11 @@
       },
       "suspended": "あなたのサーバーのモデレーターによって、アカウントは停止されました"
     },
+    "accountInLists": {
+      "name": "@{{username}}のリスト",
+      "inLists": "リスト内",
+      "notInLists": "その他のリスト"
+    },
     "attachments": {
       "name": "<0 /><1>\" のメディア</1>"
     },
@@ -332,6 +350,9 @@
             "statusLink": "$t(shared.search.header.prefix) $t(shared.search.sections.statuses)",
             "accountLink": "$t(shared.search.header.prefix) $t(shared.search.sections.accounts)"
           }
+        },
+        "trending": {
+          "tags": ""
         }
       },
       "sections": {
diff --git a/src/i18n/ko/common.json b/src/i18n/ko/common.json
index ecf14ded..ef6e5112 100644
--- a/src/i18n/ko/common.json
+++ b/src/i18n/ko/common.json
@@ -2,7 +2,11 @@
   "buttons": {
     "OK": "확인",
     "apply": "적용",
-    "cancel": "취소"
+    "cancel": "취소",
+    "discard": "",
+    "continue": "",
+    "delete": "",
+    "done": ""
   },
   "customEmoji": {
     "accessibilityLabel": "커스텀 이모지 {{emoji}}"
@@ -18,5 +22,9 @@
       "message": "{{function}} 실패, 다시 시도해주세요"
     }
   },
-  "separator": ", "
+  "separator": ", ",
+  "discard": {
+    "title": "",
+    "message": ""
+  }
 }
\ No newline at end of file
diff --git a/src/i18n/ko/components/contextMenu.json b/src/i18n/ko/components/contextMenu.json
index 3ee2f6f6..e0d0b445 100644
--- a/src/i18n/ko/components/contextMenu.json
+++ b/src/i18n/ko/components/contextMenu.json
@@ -2,6 +2,11 @@
   "accessibilityHint": "이 툿에 할 동작, 툿 자체나 포스트한 사용자",
   "account": {
     "title": "사용자 동작",
+    "following": {
+      "action_false": "",
+      "action_true": ""
+    },
+    "inLists": "",
     "mute": {
       "action_false": "사용자 뮤트",
       "action_true": "사용자 뮤트 해제"
@@ -11,7 +16,7 @@
       "action_true": "사용자 차단 해제"
     },
     "reports": {
-      "action": "신고 및 차단"
+      "action": ""
     }
   },
   "copy": {
diff --git a/src/i18n/ko/components/instance.json b/src/i18n/ko/components/instance.json
index c6ac6762..c673b5ce 100644
--- a/src/i18n/ko/components/instance.json
+++ b/src/i18n/ko/components/instance.json
@@ -20,11 +20,7 @@
   "update": {
     "alert": {
       "title": "이 인스턴스에 로그인했어요",
-      "message": "기존에 로그인한 계정을 유지한 채로, 새 계정에 로그인할 수 있어요",
-      "buttons": {
-        "cancel": "$t(common:buttons.cancel)",
-        "continue": "계속"
-      }
+      "message": "기존에 로그인한 계정을 유지한 채로, 새 계정에 로그인할 수 있어요"
     }
   }
 }
\ No newline at end of file
diff --git a/src/i18n/ko/screens/compose.json b/src/i18n/ko/screens/compose.json
index ad21f6ec..c96f785b 100644
--- a/src/i18n/ko/screens/compose.json
+++ b/src/i18n/ko/screens/compose.json
@@ -28,7 +28,6 @@
         "removeReply": {
           "title": "답장한 툿을 찾을 수 없어요",
           "description": "답장한 툿이 삭제되었을 수 있어요. 참조에서 제거할까요?",
-          "cancel": "$t(common:buttons.cancel)",
           "confirm": "참조 제거"
         }
       }
@@ -89,8 +88,7 @@
             "heading": "선택 유형",
             "options": {
               "single": "단일 선택",
-              "multiple": "다중 선택",
-              "cancel": "$t(common:buttons.cancel)"
+              "multiple": "다중 선택"
             }
           },
           "expiration": {
@@ -102,8 +100,7 @@
               "21600": "6시간",
               "86400": "1일",
               "259200": "3일",
-              "604800": "7일",
-              "cancel": "$t(common:buttons.cancel)"
+              "604800": "7일"
             }
           }
         }
@@ -130,8 +127,7 @@
             "public": "공개",
             "unlisted": "공개 타임라인에 비표시",
             "private": "팔로워만",
-            "direct": "개인 메시지",
-            "cancel": "$t(common:buttons.cancel)"
+            "direct": "개인 메시지"
           }
         },
         "spoiler": {
diff --git a/src/i18n/ko/screens/imageViewer.json b/src/i18n/ko/screens/imageViewer.json
index 87bbff9d..958407da 100644
--- a/src/i18n/ko/screens/imageViewer.json
+++ b/src/i18n/ko/screens/imageViewer.json
@@ -6,8 +6,7 @@
     },
     "options": {
       "save": "이미지 저장",
-      "share": "이미지 공유",
-      "cancel": "$t(common:buttons.cancel)"
+      "share": "이미지 공유"
     },
     "save": {
       "succeed": "이미지 저장됨",
diff --git a/src/i18n/ko/screens/tabs.json b/src/i18n/ko/screens/tabs.json
index 965f926d..b07580a3 100644
--- a/src/i18n/ko/screens/tabs.json
+++ b/src/i18n/ko/screens/tabs.json
@@ -46,12 +46,21 @@
       "language": {
         "name": "언어"
       },
-      "lists": {
-        "name": "목록"
-      },
       "list": {
         "name": "목록: {{list}}"
       },
+      "listAccounts": {
+        "name": ""
+      },
+      "listAdd": {
+        "name": ""
+      },
+      "listEdit": {
+        "name": ""
+      },
+      "lists": {
+        "name": "목록"
+      },
       "push": {
         "name": "푸시 알림"
       },
@@ -87,15 +96,31 @@
         "XXL": "아주 크게"
       }
     },
-    "profile": {
-      "cancellation": {
-        "title": "변경 사항이 저장되지 않음",
-        "message": "변경 사항이 저장되지 않았어요. 변경 사항 적용을 취소할까요?",
-        "buttons": {
-          "cancel": "$t(common:buttons.cancel)",
-          "discard": "취소"
+    "listAccounts": {
+      "heading": "",
+      "error": "",
+      "empty": ""
+    },
+    "listEdit": {
+      "heading": "",
+      "title": "",
+      "repliesPolicy": {
+        "heading": "",
+        "options": {
+          "none": "",
+          "list": "",
+          "followed": ""
         }
-      },
+      }
+    },
+    "listDelete": {
+      "heading": "",
+      "confirm": {
+        "title": "",
+        "message": ""
+      }
+    },
+    "profile": {
       "feedback": {
         "succeed": "{{type}} 업데이트됨",
         "failed": "{{type}} 업데이트 실패, 다시 시도해주세요"
@@ -125,8 +150,7 @@
           "options": {
             "public": "공개",
             "unlisted": "공개 타임라인에 비표시",
-            "private": "팔로워만",
-            "cancel": "$t(common:buttons.cancel)"
+            "private": "팔로워만"
           }
         },
         "sensitive": {
@@ -211,8 +235,7 @@
           "title": "로그아웃할까요?",
           "message": "로그아웃한 이후, 다시 로그인해야해요",
           "buttons": {
-            "logout": "로그아웃",
-            "cancel": "$t(common:buttons.cancel)"
+            "logout": "로그아웃"
           }
         }
       }
@@ -229,34 +252,28 @@
         }
       },
       "language": {
-        "heading": "$t(me.stacks.language.name)",
-        "options": {
-          "cancel": "$t(common:buttons.cancel)"
-        }
+        "heading": "$t(me.stacks.language.name)"
       },
       "theme": {
         "heading": "모양",
         "options": {
           "auto": "시스템과 동일",
           "light": "밝은 모드",
-          "dark": "어두운 모드",
-          "cancel": "$t(common:buttons.cancel)"
+          "dark": "어두운 모드"
         }
       },
       "darkTheme": {
         "heading": "다크 테마",
         "options": {
           "lighter": "밝게",
-          "darker": "어둡게",
-          "cancel": "$t(common:buttons.cancel)"
+          "darker": "어둡게"
         }
       },
       "browser": {
         "heading": "링크 열기",
         "options": {
           "internal": "앱 안에서",
-          "external": "시스템 브라우저 사용",
-          "cancel": "$t(common:buttons.cancel)"
+          "external": "시스템 브라우저 사용"
         }
       },
       "staticEmoji": {
@@ -275,10 +292,6 @@
       "contact": {
         "heading": "tooot 연락"
       },
-      "analytics": {
-        "heading": "개선할 수 있도록 도와주세요",
-        "description": "유저와 관련이 없는 사용량만 수집해요"
-      },
       "version": "버전 v{{version}}",
       "instanceVersion": "마스토돈 버전 v{{version}}"
     },
@@ -307,6 +320,11 @@
       },
       "suspended": "계정이 서버 관리자에 의해 정지되었어요."
     },
+    "accountInLists": {
+      "name": "",
+      "inLists": "",
+      "notInLists": ""
+    },
     "attachments": {
       "name": "<0 /><1>\"의 미디어</1>"
     },
@@ -332,6 +350,9 @@
             "statusLink": "$t(shared.search.header.prefix) $t(shared.search.sections.statuses)",
             "accountLink": "$t(shared.search.header.prefix) $t(shared.search.sections.accounts)"
           }
+        },
+        "trending": {
+          "tags": ""
         }
       },
       "sections": {
diff --git a/src/i18n/nl/common.json b/src/i18n/nl/common.json
new file mode 100644
index 00000000..02c05685
--- /dev/null
+++ b/src/i18n/nl/common.json
@@ -0,0 +1,30 @@
+{
+  "buttons": {
+    "OK": "OK",
+    "apply": "Toepassen",
+    "cancel": "Annuleer",
+    "discard": "Verwijder",
+    "continue": "Ga verder",
+    "delete": "Verwijder",
+    "done": "Gereed"
+  },
+  "customEmoji": {
+    "accessibilityLabel": "Aangepaste emoji {{emoji}}"
+  },
+  "message": {
+    "success": {
+      "message": "{{function}} geslaagd"
+    },
+    "warning": {
+      "message": ""
+    },
+    "error": {
+      "message": "{{function}} mislukt, probeer het opnieuw"
+    }
+  },
+  "separator": ", ",
+  "discard": {
+    "title": "Wijziging niet opgeslagen",
+    "message": "De wijziging is niet opgeslagen. Wilt u de wijzigingen niet opslaan?"
+  }
+}
\ No newline at end of file
diff --git a/src/i18n/nl/components/contextMenu.json b/src/i18n/nl/components/contextMenu.json
new file mode 100644
index 00000000..c17a3a4f
--- /dev/null
+++ b/src/i18n/nl/components/contextMenu.json
@@ -0,0 +1,81 @@
+{
+  "accessibilityHint": "Acties voor deze toot, zoals de geplaatste gebruiker, toot zichzelf",
+  "account": {
+    "title": "Gebruikersacties",
+    "following": {
+      "action_false": "Volg gebruiker",
+      "action_true": "Ontvolg"
+    },
+    "inLists": "Gebruiker van lijsten beheren",
+    "mute": {
+      "action_false": "Gebruiker dempen",
+      "action_true": "Dempen opheffen voor gebruiker"
+    },
+    "block": {
+      "action_false": "Gebruiker blokkeren",
+      "action_true": "Gebruiker deblokkeren"
+    },
+    "reports": {
+      "action": "Rapporteren en blokkeren"
+    }
+  },
+  "copy": {
+    "action": "Toot kopiëren",
+    "succeed": "Gekopieerd"
+  },
+  "instance": {
+    "title": "Instantie actie",
+    "block": {
+      "action": "Blokkeer instantie {{instance}}",
+      "alert": {
+        "title": "Bevestig blokkeren van {{instance}} ?",
+        "message": "Meestal kunt u bepaalde gebruiker dempen of blokkeren.\n\nNa het blokkeren van de instantie, wordt alle inhoud inclusief volgers van deze instantie verwijderd!",
+        "buttons": {
+          "confirm": "Bevestig"
+        }
+      }
+    }
+  },
+  "share": {
+    "status": {
+      "action": "Toot delen"
+    },
+    "account": {
+      "action": "Gebruiker delen"
+    }
+  },
+  "status": {
+    "title": "Toot acties",
+    "edit": {
+      "action": "Toot bewerken"
+    },
+    "delete": {
+      "action": "Toot verwijderen",
+      "alert": {
+        "title": "Verwijderen bevestigen?",
+        "message": "Alle boosts en favorieten zullen worden gewist, inclusief alle antwoorden.",
+        "buttons": {
+          "confirm": "Bevestig"
+        }
+      }
+    },
+    "deleteEdit": {
+      "action": "Toot verwijderen en opnieuw plaatsen",
+      "alert": {
+        "title": "Bevestig verwijderen en opnieuw plaatsen?",
+        "message": "Alle boosts en favorieten zullen worden gewist, inclusief alle antwoorden.",
+        "buttons": {
+          "confirm": "Bevestig"
+        }
+      }
+    },
+    "mute": {
+      "action_false": "Mute toot en reacties",
+      "action_true": "Unmute toot en reacties"
+    },
+    "pin": {
+      "action_false": "Toot vastzetten",
+      "action_true": "Toot losmaken"
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/i18n/nl/components/emojis.json b/src/i18n/nl/components/emojis.json
new file mode 100644
index 00000000..2b24c36c
--- /dev/null
+++ b/src/i18n/nl/components/emojis.json
@@ -0,0 +1,3 @@
+{
+  "frequentUsed": "Vaak gebruikt"
+}
\ No newline at end of file
diff --git a/src/i18n/nl/components/instance.json b/src/i18n/nl/components/instance.json
new file mode 100644
index 00000000..3f6bbf6a
--- /dev/null
+++ b/src/i18n/nl/components/instance.json
@@ -0,0 +1,26 @@
+{
+  "server": {
+    "textInput": {
+      "placeholder": "Domeinnaam van instantie"
+    },
+    "button": "Inloggen",
+    "information": {
+      "name": "Naam",
+      "accounts": "Gebruikers",
+      "statuses": "Toots",
+      "domains": "Universum"
+    },
+    "disclaimer": {
+      "base": "Het inlogproces gebruikt de systeembrowser, accountgegevens zijn niet zichtbaar voor de app."
+    },
+    "terms": {
+      "base": "Door in te loggen, gaat u akkoord met het <0>privacybeleid </0> en met de <1>servicevoorwaarden</1>."
+    }
+  },
+  "update": {
+    "alert": {
+      "title": "Ingelogd bij deze instantie",
+      "message": "Je kunt inloggen op een ander account met behoud van de huidige aangemelde account"
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/i18n/nl/components/mediaSelector.json b/src/i18n/nl/components/mediaSelector.json
new file mode 100644
index 00000000..1c79a4c3
--- /dev/null
+++ b/src/i18n/nl/components/mediaSelector.json
@@ -0,0 +1,10 @@
+{
+  "title": "Selecteer mediabron",
+  "message": "Media EXIF-gegevens zijn niet geüpload",
+  "options": {
+    "image": "Foto's uploaden",
+    "image_max": "Foto's uploaden (max {{max}})",
+    "video": "Video uploaden",
+    "video_max": "Video uploaden (max {{max}})"
+  }
+}
\ No newline at end of file
diff --git a/src/i18n/nl/components/parse.json b/src/i18n/nl/components/parse.json
new file mode 100644
index 00000000..3018349d
--- /dev/null
+++ b/src/i18n/nl/components/parse.json
@@ -0,0 +1,8 @@
+{
+  "HTML": {
+    "accessibilityHint": "Tik om inhoud uit te vouwen of in te klappen",
+    "expanded": "{{hint}}{{moreLines}}",
+    "moreLines": " ({{count}} meer lijnen)",
+    "defaultHint": "Lange toot"
+  }
+}
\ No newline at end of file
diff --git a/src/i18n/nl/components/relationship.json b/src/i18n/nl/components/relationship.json
new file mode 100644
index 00000000..8f023a3b
--- /dev/null
+++ b/src/i18n/nl/components/relationship.json
@@ -0,0 +1,16 @@
+{
+  "follow": {
+    "function": "Volg gebruiker"
+  },
+  "block": {
+    "function": "Gebruiker blokkeren"
+  },
+  "button": {
+    "error": "Fout bij het laden",
+    "blocked_by": "Geblokkeerd door gebruiker",
+    "blocking": "Deblokkeer",
+    "following": "Ontvolg",
+    "requested": "Aanvraag intrekken",
+    "default": "Volg"
+  }
+}
\ No newline at end of file
diff --git a/src/i18n/nl/components/timeline.json b/src/i18n/nl/components/timeline.json
new file mode 100644
index 00000000..68e68fee
--- /dev/null
+++ b/src/i18n/nl/components/timeline.json
@@ -0,0 +1,152 @@
+{
+  "empty": {
+    "error": {
+      "message": "Fout bij het laden",
+      "button": "Probeer opnieuw"
+    },
+    "success": {
+      "message": "Tijdlijn is leeg"
+    }
+  },
+  "end": {
+    "message": "Het einde, wat dacht je van een kopje <0 />"
+  },
+  "lookback": {
+    "message": "Laatst gelezen om"
+  },
+  "refresh": {
+    "fetchPreviousPage": "Nieuwere vanaf hier",
+    "refetch": "Naar nieuwste"
+  },
+  "shared": {
+    "actioned": {
+      "pinned": "Vastgezet",
+      "favourite": "{{name}} markeerde jouw bericht als favoriet",
+      "status": "{{name}} heeft zojuist een bericht geplaatst",
+      "follow": "{{name}} volgt jou nu",
+      "follow_request": "{{name}} heeft verzocht je te volgen",
+      "poll": "Een poll waaraan jij hebt meegedaan is beëindigd",
+      "reblog": {
+        "default": "{{name}} boostte",
+        "notification": "{{name}} boostte jouw toot"
+      },
+      "update": "De reblog is bewerkt"
+    },
+    "actions": {
+      "reply": {
+        "accessibilityLabel": "Reageer op deze toot"
+      },
+      "reblogged": {
+        "accessibilityLabel": "Boost deze toot",
+        "function": "Boost toot",
+        "options": {
+          "title": "Kies zichtbaarheid boost",
+          "public": "Openbare boost",
+          "unlisted": "Niet openbare boost"
+        }
+      },
+      "favourited": {
+        "accessibilityLabel": "Toot toevoegen aan favorieten",
+        "function": "Favoriete toot"
+      },
+      "bookmarked": {
+        "accessibilityLabel": "Toot toevoegen aan bladwijzers",
+        "function": "Voeg deze toot toe aan bladwijzers"
+      }
+    },
+    "actionsUsers": {
+      "reblogged_by": {
+        "accessibilityLabel": "{{count}} gebruikers hebben deze toot geboost",
+        "accessibilityHint": "Tik om gebruikers te kennen",
+        "text": "$t(screenTabs:shared.users.statuses.reblogged_by)"
+      },
+      "favourited_by": {
+        "accessibilityLabel": "{{count}} gebruikers hebben deze toot geboost",
+        "accessibilityHint": "Tik om gebruikers te kennen",
+        "text": "$t(screenTabs:shared.users.statuses.favourited_by)"
+      },
+      "history": {
+        "accessibilityLabel": "Deze toot is {{count}} keer bewerkt",
+        "accessibilityHint": "Tik om de volledige bewerkingsgeschiedenis te bekijken",
+        "text_one": "{{count}} bewerken",
+        "text_other": "{{count}} bewerkingen"
+      }
+    },
+    "attachment": {
+      "sensitive": {
+        "button": "Gevoelige media tonen"
+      },
+      "unsupported": {
+        "text": "Fout bij het laden",
+        "button": "Probeer externe link"
+      }
+    },
+    "avatar": {
+      "accessibilityLabel": "Avatar van {{name}}",
+      "accessibilityHint": "Tik om naar de pagina van {{name}} te gaan"
+    },
+    "content": {
+      "expandHint": "Verborgen inhoud"
+    },
+    "filtered": "Gefilterd: {{phrase}}.",
+    "fullConversation": "Gesprekken lezen",
+    "translate": {
+      "default": "Vertaal",
+      "succeed": "Vertaald door {{provider}} van {{source}}",
+      "failed": "Vertaling mislukt",
+      "source_not_supported": "Deze taal wordt niet ondersteund",
+      "target_not_supported": "Deze taal wordt niet ondersteund"
+    },
+    "header": {
+      "shared": {
+        "account": {
+          "name": {
+            "accessibilityHint": "Weergavenaam gebruiker"
+          },
+          "account": {
+            "accessibilityHint": "Gebruikersaccount"
+          }
+        },
+        "application": "Via {{application}}",
+        "edited": {
+          "accessibilityLabel": "Toot bewerkt"
+        },
+        "muted": {
+          "accessibilityLabel": "Toot gedempt"
+        },
+        "visibility": {
+          "direct": {
+            "accessibilityLabel": "Toot is een direct bericht"
+          },
+          "private": {
+            "accessibilityLabel": "Toot is alleen zichtbaar voor volgers"
+          }
+        }
+      },
+      "conversation": {
+        "withAccounts": "Met",
+        "delete": {
+          "function": "Verwijder direct bericht"
+        }
+      }
+    },
+    "poll": {
+      "meta": {
+        "button": {
+          "vote": "Stem",
+          "refresh": "Vernieuw"
+        },
+        "count": {
+          "voters_one": "{{count}} gebruiker heeft gestemd",
+          "voters_other": "{{count}} gebruikers hebben gestemd",
+          "votes_one": "{{count}} stem",
+          "votes_other": "{{count}} stemmen"
+        },
+        "expiration": {
+          "expired": "Stemmen verlopen",
+          "until": "Verloopt <0 />"
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/i18n/nl/screens.json b/src/i18n/nl/screens.json
new file mode 100644
index 00000000..6fab9103
--- /dev/null
+++ b/src/i18n/nl/screens.json
@@ -0,0 +1,18 @@
+{
+  "screenshot": {
+    "title": "Privacy Bescherming",
+    "message": "Gelieve de identiteit van een andere gebruiker niet openbaar te maken, zoals gebruikersnaam, avatar enz. Bedankt!",
+    "button": "Bevestig"
+  },
+  "localCorrupt": {
+    "message": "Sessie verlopen. Log opnieuw in"
+  },
+  "pushError": {
+    "message": "Push service fout",
+    "description": "Schakel push-meldingen opnieuw in bij instellingen"
+  },
+  "shareError": {
+    "imageNotSupported": "Afbeeldingstype {{type}} wordt niet ondersteund",
+    "videoNotSupported": "Videotype {{type}} wordt niet ondersteund"
+  }
+}
\ No newline at end of file
diff --git a/src/i18n/nl/screens/accountSelection.json b/src/i18n/nl/screens/accountSelection.json
new file mode 100644
index 00000000..2b86781c
--- /dev/null
+++ b/src/i18n/nl/screens/accountSelection.json
@@ -0,0 +1,6 @@
+{
+  "heading": "Delen met...",
+  "content": {
+    "select_account": "Selecteer account"
+  }
+}
\ No newline at end of file
diff --git a/src/i18n/nl/screens/actions.json b/src/i18n/nl/screens/actions.json
new file mode 100644
index 00000000..519e01a5
--- /dev/null
+++ b/src/i18n/nl/screens/actions.json
@@ -0,0 +1,20 @@
+{
+  "content": {
+    "altText": {
+      "heading": "Alternatieve tekst"
+    },
+    "notificationsFilter": {
+      "heading": "Melding soorten weergeven",
+      "content": {
+        "follow": "$t(screenTabs:me.push.follow.heading)",
+        "follow_request": "Volgverzoek",
+        "favourite": "$t(screenTabs:me.push.favourite.heading)",
+        "reblog": "$t(screenTabs:me.push.reblog.heading)",
+        "mention": "$t(screenTabs:me.push.mention.heading)",
+        "poll": "$t(screenTabs:me.push.poll.heading)",
+        "status": "Toot van geabonneerde gebruikers",
+        "update": "De reblog is bewerkt"
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/i18n/nl/screens/announcements.json b/src/i18n/nl/screens/announcements.json
new file mode 100644
index 00000000..cb61596a
--- /dev/null
+++ b/src/i18n/nl/screens/announcements.json
@@ -0,0 +1,10 @@
+{
+  "heading": "Mededelingen",
+  "content": {
+    "published": "Gepubliceerd <0 />",
+    "button": {
+      "read": "Lees",
+      "unread": "Markeren als gelezen"
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/i18n/nl/screens/compose.json b/src/i18n/nl/screens/compose.json
new file mode 100644
index 00000000..d14dc421
--- /dev/null
+++ b/src/i18n/nl/screens/compose.json
@@ -0,0 +1,175 @@
+{
+  "heading": {
+    "left": {
+      "button": "Annuleer",
+      "alert": {
+        "title": "Bewerken annuleren?",
+        "buttons": {
+          "save": "Concept opslaan",
+          "delete": "Concept verwijderen",
+          "cancel": "Annuleer"
+        }
+      }
+    },
+    "right": {
+      "button": {
+        "default": "Toot",
+        "conversation": "Toot DM",
+        "reply": "Toot reactie",
+        "deleteEdit": "Toot",
+        "edit": "Toot",
+        "share": "Toot"
+      },
+      "alert": {
+        "default": {
+          "title": "Tooten mislukt",
+          "button": "Probeer het opnieuw"
+        },
+        "removeReply": {
+          "title": "Antwoord toot kon niet worden gevonden",
+          "description": "Het antwoord is mogelijk verwijderd. Wil je het van je referentie verwijderen?",
+          "confirm": "Verwijder de referentie"
+        }
+      }
+    }
+  },
+  "content": {
+    "root": {
+      "header": {
+        "postingAs": "Tooten als @{{acct}}@{{domain}}",
+        "spoilerInput": {
+          "placeholder": "Spoiler waarschuwingsbericht"
+        },
+        "textInput": {
+          "placeholder": "Wat wil je kwijt",
+          "keyboardImage": {
+            "exceedMaximum": {
+              "title": "Maximum aantal bijlagen bereikt",
+              "OK": "$t(common:buttons.OK)"
+            }
+          }
+        }
+      },
+      "footer": {
+        "attachments": {
+          "sensitive": "Bijlagen als gevoelig markeren",
+          "remove": {
+            "accessibilityLabel": "Geüploade bijlage, nummer {{attachment}} verwijderen"
+          },
+          "edit": {
+            "accessibilityLabel": "Geüploade bijlage, nummer {{attachment}} bewerken"
+          },
+          "upload": {
+            "accessibilityLabel": "Upload meer bijlagen"
+          }
+        },
+        "emojis": {
+          "accessibilityHint": "Tik om emoji toe te voegen"
+        },
+        "poll": {
+          "option": {
+            "placeholder": {
+              "accessibilityLabel": "Poll optie {{index}}",
+              "single": "Enkele keuze",
+              "multiple": "Meerkeuze"
+            }
+          },
+          "quantity": {
+            "reduce": {
+              "accessibilityLabel": "Verminder de poll opties tot {{amount}}",
+              "accessibilityHint": "Minimale hoeveelheid poll opties bereikt, momenteel zijn dat er {{amount}}"
+            },
+            "increase": {
+              "accessibilityLabel": "Verhoog poll opties naar {{amount}}",
+              "accessibilityHint": "Maximum aantal poll opties bereikt, momenteel is {{amount}}"
+            }
+          },
+          "multiple": {
+            "heading": "Keuze soort",
+            "options": {
+              "single": "Enkele keuze",
+              "multiple": "Meerkeuze"
+            }
+          },
+          "expiration": {
+            "heading": "Geldigheid",
+            "options": {
+              "300": "5 minuten",
+              "1800": "30 minuten",
+              "3600": "1 uur",
+              "21600": "6 uur",
+              "86400": "1 dag",
+              "259200": "3 dagen",
+              "604800": "7 dagen"
+            }
+          }
+        }
+      },
+      "actions": {
+        "attachment": {
+          "accessibilityLabel": "Bijlage toevoegen",
+          "accessibilityHint": "Poll functie wordt uitgeschakeld wanneer er een bijlage is",
+          "failed": {
+            "alert": {
+              "title": "Uploaden mislukt",
+              "button": "Probeer het opnieuw"
+            }
+          }
+        },
+        "poll": {
+          "accessibilityLabel": "Voeg poll toe",
+          "accessibilityHint": "Bijlage functie wordt uitgeschakeld wanneer poll actief is"
+        },
+        "visibility": {
+          "accessibilityLabel": "Toot zichtbaarheid is {{visibility}}",
+          "title": "Toot zichtbaarheid",
+          "options": {
+            "public": "Openbaar",
+            "unlisted": "Niet openbaar",
+            "private": "Alleen volgers",
+            "direct": "Direct bericht"
+          }
+        },
+        "spoiler": {
+          "accessibilityLabel": "Spoiler"
+        },
+        "emoji": {
+          "accessibilityLabel": "Voeg emoji toe",
+          "accessibilityHint": "Open emoji lijst, veeg horizontaal om de pagina te wijzigen"
+        }
+      },
+      "drafts_one": "Concept ({{count}})",
+      "drafts_other": "Concepten ({{count}})"
+    },
+    "editAttachment": {
+      "header": {
+        "title": "Bijlage bewerken",
+        "right": {
+          "accessibilityLabel": "Sla bewerken van de bijlage op",
+          "failed": {
+            "title": "Bewerken mislukt",
+            "button": "Probeer het opnieuw"
+          }
+        }
+      },
+      "content": {
+        "altText": {
+          "heading": "Omschrijf deze media voor mensen met een visuele beperking",
+          "placeholder": "Je kan een beschrijving aan je media toevoegen, ook wel bekend als alt-text, zodat deze voor meer mensen toegankelijk wordt. Bijvoorbeeld voor mensen met een visuele beperking.\n\nGoede beschrijvingen zijn beknopt, maar geven nauwkeurig genoeg weer wat er in de media staat om de context ervan te begrijpen."
+        },
+        "imageFocus": "Sleep de focuscirkel om het focuspunt bij te werken"
+      }
+    },
+    "draftsList": {
+      "header": {
+        "title": "Concept"
+      },
+      "warning": "Concepten worden alleen lokaal opgeslagen en kunnen verloren gaan. Gebruik daarom de concepten niet voor langdurige opslag.",
+      "content": {
+        "accessibilityHint": "Opgeslagen concept, tik om dit concept te bewerken",
+        "textEmpty": "Inhoud is leeg"
+      },
+      "checkAttachment": "Controleren van bijlagen op de server..."
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/i18n/nl/screens/imageViewer.json b/src/i18n/nl/screens/imageViewer.json
new file mode 100644
index 00000000..f8b7ce36
--- /dev/null
+++ b/src/i18n/nl/screens/imageViewer.json
@@ -0,0 +1,16 @@
+{
+  "content": {
+    "actions": {
+      "accessibilityLabel": "Meer acties van deze afbeelding",
+      "accessibilityHint": "Je kunt deze afbeelding opslaan of delen"
+    },
+    "options": {
+      "save": "Afbeelding opslaan",
+      "share": "Afbeelding delen"
+    },
+    "save": {
+      "succeed": "Afbeelding opgeslagen",
+      "failed": "Afbeelding opslaan mislukt"
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/i18n/nl/screens/tabs.json b/src/i18n/nl/screens/tabs.json
new file mode 100644
index 00000000..307902d3
--- /dev/null
+++ b/src/i18n/nl/screens/tabs.json
@@ -0,0 +1,379 @@
+{
+  "tabs": {
+    "local": {
+      "name": "Volgend"
+    },
+    "public": {
+      "name": "",
+      "segments": {
+        "left": "Globaal",
+        "right": "Lokaal"
+      }
+    },
+    "notifications": {
+      "name": "Meldingen"
+    },
+    "me": {
+      "name": "Over mij"
+    }
+  },
+  "common": {
+    "search": {
+      "accessibilityLabel": "Zoeken",
+      "accessibilityHint": "Zoek naar hashtags, gebruikers of toots"
+    }
+  },
+  "notifications": {
+    "filter": {
+      "accessibilityLabel": "Filter",
+      "accessibilityHint": "Filter getoonde meldingstypes"
+    }
+  },
+  "me": {
+    "stacks": {
+      "bookmarks": {
+        "name": "Bladwijzers"
+      },
+      "conversations": {
+        "name": "Directe Berichten"
+      },
+      "favourites": {
+        "name": "Favorieten"
+      },
+      "fontSize": {
+        "name": "Grootte van lettertype"
+      },
+      "language": {
+        "name": "Taal"
+      },
+      "list": {
+        "name": "Lijst: {{list}}"
+      },
+      "listAccounts": {
+        "name": "Gebruikers in de lijst: {{list}}"
+      },
+      "listAdd": {
+        "name": "Lijst toevoegen"
+      },
+      "listEdit": {
+        "name": "Lijstdetails bewerken"
+      },
+      "lists": {
+        "name": "Lijsten"
+      },
+      "push": {
+        "name": "Push Melding"
+      },
+      "profile": {
+        "name": "Profiel bewerken"
+      },
+      "profileName": {
+        "name": "Weergavenaam bewerken"
+      },
+      "profileNote": {
+        "name": "Beschrijving bewerken"
+      },
+      "profileFields": {
+        "name": "Metadata bewerken"
+      },
+      "settings": {
+        "name": "App Instellingen"
+      },
+      "webSettings": {
+        "name": "Meer Accountinstellingen"
+      },
+      "switch": {
+        "name": "Account wisselen"
+      }
+    },
+    "fontSize": {
+      "demo": "<p>Dit is een demo toot😊. Je kan uit verschillende opties hieronder kiezen.<br /><br /> Deze instelling heeft alleen invloed op de inhoud van toots, maar niet op andere lettergroottes.</p>",
+      "sizes": {
+        "S": "S",
+        "M": "M - Standaard",
+        "L": "L",
+        "XL": "XL",
+        "XXL": "XXL"
+      }
+    },
+    "listAccounts": {
+      "heading": "Gebruikers beheren",
+      "error": "Gebruiker verwijderen uit lijst",
+      "empty": "Geen gebruiker toegevoegd aan deze lijst"
+    },
+    "listEdit": {
+      "heading": "Lijstdetails bewerken",
+      "title": "Titel",
+      "repliesPolicy": {
+        "heading": "Toon reacties aan:",
+        "options": {
+          "none": "Niemand",
+          "list": "Leden van de lijst",
+          "followed": "Elke gevolgde gebruiker"
+        }
+      }
+    },
+    "listDelete": {
+      "heading": "Verwijder lijst",
+      "confirm": {
+        "title": "Lijst verwijderen \"{{list}}\"?",
+        "message": "Deze actie kan niet worden hersteld."
+      }
+    },
+    "profile": {
+      "feedback": {
+        "succeed": "{{type}} bijgewerkt",
+        "failed": "{{type}} update is mislukt, probeer het opnieuw"
+      },
+      "root": {
+        "name": {
+          "title": "Weergavenaam"
+        },
+        "avatar": {
+          "title": "Avatar",
+          "description": "Zal worden teruggebracht naar 400x400px"
+        },
+        "header": {
+          "title": "Omslagfoto",
+          "description": "Zal worden teruggebracht naar 1500x500px"
+        },
+        "note": {
+          "title": "Omschrijving"
+        },
+        "fields": {
+          "title": "Metadata",
+          "total_one": "{{count}} veld",
+          "total_other": "{{count}} velden"
+        },
+        "visibility": {
+          "title": "Post zichtbaarheid",
+          "options": {
+            "public": "Openbaar",
+            "unlisted": "Niet openbaar",
+            "private": "Alleen volgers"
+          }
+        },
+        "sensitive": {
+          "title": "Posten van gevoelige media"
+        },
+        "lock": {
+          "title": "Account vergrendelen",
+          "description": "Vereist dat je handmatig volgers goedkeurt"
+        },
+        "bot": {
+          "title": "Bot account",
+          "description": "Dit is een geautomatiseerd account en wordt mogelijk niet gemonitord"
+        }
+      },
+      "fields": {
+        "group": "Groep {{index}}",
+        "label": "Label",
+        "content": "Inhoud"
+      },
+      "mediaSelectionFailed": "Afbeelding verwerken is mislukt. Probeer het opnieuw."
+    },
+    "push": {
+      "notAvailable": "Je telefoon ondersteunt geen push-meldingen",
+      "enable": {
+        "direct": "Push meldingen inschakelen",
+        "settings": "Inschakelen in instellingen"
+      },
+      "global": {
+        "heading": "Inschakelen voor {{acct}}",
+        "description": "Berichten worden doorgestuurd via tooot's server"
+      },
+      "decode": {
+        "heading": "Toon berichtdetails",
+        "description": "Berichten die doorgestuurd zijn via tooot's server zijn versleuteld, maar je kunt kiezen om het bericht op de server te decoderen. Onze broncode is open source en we houden geen logs bij."
+      },
+      "default": {
+        "heading": "Standaard"
+      },
+      "follow": {
+        "heading": "Nieuwe volger"
+      },
+      "follow_request": {
+        "heading": "Volgverzoek"
+      },
+      "favourite": {
+        "heading": "Favorieten"
+      },
+      "reblog": {
+        "heading": "Boosted"
+      },
+      "mention": {
+        "heading": "Vermeldde jou"
+      },
+      "poll": {
+        "heading": "Enquete updates"
+      },
+      "status": {
+        "heading": "Toot van geabonneerde gebruikers"
+      },
+      "howitworks": "Leer hoe het werkt"
+    },
+    "root": {
+      "announcements": {
+        "content": {
+          "unread": "{{amount}} ongelezen",
+          "read": "Alle gelezen",
+          "empty": "Geen"
+        }
+      },
+      "push": {
+        "content": {
+          "enabled": "Ingeschakeld",
+          "disabled": "Uitgeschakeld"
+        }
+      },
+      "update": {
+        "title": "Bijwerken naar de laatste versie"
+      },
+      "logout": {
+        "button": "Uitloggen",
+        "alert": {
+          "title": "Uitloggen?",
+          "message": "Na het uitloggen moet je opnieuw inloggen",
+          "buttons": {
+            "logout": "Uitloggen"
+          }
+        }
+      }
+    },
+    "settings": {
+      "fontsize": {
+        "heading": "$t(me.stacks.fontSize.name)",
+        "content": {
+          "S": "$t(me.fontSize.sizes.S)",
+          "M": "$t(me.fontSize.sizes.M)",
+          "L": "$t(me.fontSize.sizes.L)",
+          "XL": "$t(me.fontSize.sizes.XL)",
+          "XXL": "$t(me.fontSize.sizes.XXL)"
+        }
+      },
+      "language": {
+        "heading": "$t(me.stacks.language.name)"
+      },
+      "theme": {
+        "heading": "Uiterlijk",
+        "options": {
+          "auto": "Zoals systeem",
+          "light": "Lichte modus",
+          "dark": "Donkere modus"
+        }
+      },
+      "darkTheme": {
+        "heading": "Donker thema",
+        "options": {
+          "lighter": "Lichter",
+          "darker": "Donkerder"
+        }
+      },
+      "browser": {
+        "heading": "Link openen",
+        "options": {
+          "internal": "In app",
+          "external": "Systeembrowser gebruiken"
+        }
+      },
+      "staticEmoji": {
+        "heading": "Statische emoji gebruiken",
+        "description": "Als je vaak een app crash tegenkomt bij het bekijken van de emoji-lijst, kun je proberen om statische emojis te gebruiken."
+      },
+      "feedback": {
+        "heading": "Feature aanvragen"
+      },
+      "support": {
+        "heading": "Tooot ondersteunen"
+      },
+      "review": {
+        "heading": "Tooot beoordelen"
+      },
+      "contact": {
+        "heading": "Contacteer tooot"
+      },
+      "version": "Version v{{version}}",
+      "instanceVersion": "Mastodon versie v{{version}}"
+    },
+    "switch": {
+      "existing": "Kies uit ingelogd",
+      "new": "Log in op instantie"
+    }
+  },
+  "shared": {
+    "account": {
+      "actions": {
+        "accessibilityLabel": "Acties voor gebruiker {{user}}",
+        "accessibilityHint": "Je kunt deze gebruiker dempen, blokkeren, rapporteren of delen"
+      },
+      "followed_by": " volgt jou",
+      "moved": "Gebruiker is verplaatst",
+      "created_at": "Lid sinds {{date}}",
+      "summary": {
+        "statuses_count": "{{count}} toots",
+        "following_count": "$t(shared.users.accounts.following)",
+        "followers_count": "$t(shared.users.accounts.followers)"
+      },
+      "toots": {
+        "default": "Toots",
+        "all": "Toots en reacties"
+      },
+      "suspended": "Account is geschorst door de beheerders van de server"
+    },
+    "accountInLists": {
+      "name": "Lijsten van @{{username}}",
+      "inLists": "In lijsten",
+      "notInLists": "Andere lijsten"
+    },
+    "attachments": {
+      "name": "<0 /><1>\"s media</1>"
+    },
+    "hashtag": {
+      "follow": "Volg",
+      "unfollow": "Ontvolg"
+    },
+    "history": {
+      "name": "Geschiedenis bewerken"
+    },
+    "search": {
+      "header": {
+        "prefix": "Zoeken",
+        "placeholder": "naar..."
+      },
+      "empty": {
+        "general": "Enter keyword to search for <bold>$t(screenTabs:shared.search.sections.accounts)</bold>、<bold>$t(screenTabs:shared.search.sections.hashtags)</bold> or <bold>$t(screenTabs:shared.search.sections.statuses)</bold>",
+        "advanced": {
+          "header": "Geavanceerd zoeken",
+          "example": {
+            "account": "$t(shared.search.header.prefix) $t(shared.search.sections.accounts)",
+            "hashtag": "$t(shared.search.header.prefix) $t(shared.search.sections.hashtags)",
+            "statusLink": "$t(shared.search.header.prefix) $t(shared.search.sections.statuses)",
+            "accountLink": "$t(shared.search.header.prefix) $t(shared.search.sections.accounts)"
+          }
+        },
+        "trending": {
+          "tags": ""
+        }
+      },
+      "sections": {
+        "accounts": "Gebruiker",
+        "hashtags": "Hashtag",
+        "statuses": "Toot"
+      },
+      "notFound": "Kan <bold>{{searchTerm}}</bold> niet vinden gerelateerd aan {{type}}"
+    },
+    "toot": {
+      "name": "Discussies"
+    },
+    "users": {
+      "accounts": {
+        "following": "Volgend {{count}}",
+        "followers": "{{count}} volgers"
+      },
+      "statuses": {
+        "reblogged_by": "{{count}} boostten",
+        "favourited_by": "{{count}} markeerden als favoriet"
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/i18n/pl/common.json b/src/i18n/pl/common.json
index 304fea54..59af91e9 100644
--- a/src/i18n/pl/common.json
+++ b/src/i18n/pl/common.json
@@ -2,7 +2,11 @@
   "buttons": {
     "OK": "Ok",
     "apply": "Zastosuj",
-    "cancel": "Anuluj"
+    "cancel": "Anuluj",
+    "discard": "",
+    "continue": "",
+    "delete": "",
+    "done": ""
   },
   "customEmoji": {
     "accessibilityLabel": "Własne emoji {{emoji}}"
@@ -18,5 +22,9 @@
       "message": "{{function}} nie powiodło się, spróbuj ponownie"
     }
   },
-  "separator": ", "
+  "separator": ", ",
+  "discard": {
+    "title": "",
+    "message": ""
+  }
 }
\ No newline at end of file
diff --git a/src/i18n/pl/components/contextMenu.json b/src/i18n/pl/components/contextMenu.json
index ba398d8a..84daeaaf 100644
--- a/src/i18n/pl/components/contextMenu.json
+++ b/src/i18n/pl/components/contextMenu.json
@@ -2,6 +2,11 @@
   "accessibilityHint": "",
   "account": {
     "title": "",
+    "following": {
+      "action_false": "",
+      "action_true": ""
+    },
+    "inLists": "",
     "mute": {
       "action_false": "",
       "action_true": ""
diff --git a/src/i18n/pl/components/instance.json b/src/i18n/pl/components/instance.json
index 3f2cd6e8..9ab20d42 100644
--- a/src/i18n/pl/components/instance.json
+++ b/src/i18n/pl/components/instance.json
@@ -20,11 +20,7 @@
   "update": {
     "alert": {
       "title": "",
-      "message": "",
-      "buttons": {
-        "cancel": "",
-        "continue": ""
-      }
+      "message": ""
     }
   }
 }
\ No newline at end of file
diff --git a/src/i18n/pl/screens/compose.json b/src/i18n/pl/screens/compose.json
index ceb1afd4..ebf265d9 100644
--- a/src/i18n/pl/screens/compose.json
+++ b/src/i18n/pl/screens/compose.json
@@ -28,7 +28,6 @@
         "removeReply": {
           "title": "",
           "description": "",
-          "cancel": "",
           "confirm": ""
         }
       }
@@ -89,8 +88,7 @@
             "heading": "",
             "options": {
               "single": "",
-              "multiple": "",
-              "cancel": ""
+              "multiple": ""
             }
           },
           "expiration": {
@@ -102,8 +100,7 @@
               "21600": "",
               "86400": "",
               "259200": "",
-              "604800": "",
-              "cancel": ""
+              "604800": ""
             }
           }
         }
@@ -130,8 +127,7 @@
             "public": "",
             "unlisted": "",
             "private": "",
-            "direct": "",
-            "cancel": ""
+            "direct": ""
           }
         },
         "spoiler": {
diff --git a/src/i18n/pl/screens/imageViewer.json b/src/i18n/pl/screens/imageViewer.json
index ad2b495c..17bba91e 100644
--- a/src/i18n/pl/screens/imageViewer.json
+++ b/src/i18n/pl/screens/imageViewer.json
@@ -6,8 +6,7 @@
     },
     "options": {
       "save": "",
-      "share": "",
-      "cancel": ""
+      "share": ""
     },
     "save": {
       "succeed": "",
diff --git a/src/i18n/pl/screens/tabs.json b/src/i18n/pl/screens/tabs.json
index ed143487..f280a8a7 100644
--- a/src/i18n/pl/screens/tabs.json
+++ b/src/i18n/pl/screens/tabs.json
@@ -46,10 +46,19 @@
       "language": {
         "name": ""
       },
-      "lists": {
+      "list": {
         "name": ""
       },
-      "list": {
+      "listAccounts": {
+        "name": ""
+      },
+      "listAdd": {
+        "name": ""
+      },
+      "listEdit": {
+        "name": ""
+      },
+      "lists": {
         "name": ""
       },
       "push": {
@@ -87,15 +96,31 @@
         "XXL": ""
       }
     },
-    "profile": {
-      "cancellation": {
-        "title": "",
-        "message": "",
-        "buttons": {
-          "cancel": "",
-          "discard": ""
+    "listAccounts": {
+      "heading": "",
+      "error": "",
+      "empty": ""
+    },
+    "listEdit": {
+      "heading": "",
+      "title": "",
+      "repliesPolicy": {
+        "heading": "",
+        "options": {
+          "none": "",
+          "list": "",
+          "followed": ""
         }
-      },
+      }
+    },
+    "listDelete": {
+      "heading": "",
+      "confirm": {
+        "title": "",
+        "message": ""
+      }
+    },
+    "profile": {
       "feedback": {
         "succeed": "",
         "failed": ""
@@ -125,8 +150,7 @@
           "options": {
             "public": "",
             "unlisted": "",
-            "private": "",
-            "cancel": ""
+            "private": ""
           }
         },
         "sensitive": {
@@ -211,8 +235,7 @@
           "title": "",
           "message": "",
           "buttons": {
-            "logout": "",
-            "cancel": ""
+            "logout": ""
           }
         }
       }
@@ -229,34 +252,28 @@
         }
       },
       "language": {
-        "heading": "",
-        "options": {
-          "cancel": ""
-        }
+        "heading": ""
       },
       "theme": {
         "heading": "",
         "options": {
           "auto": "",
           "light": "",
-          "dark": "",
-          "cancel": ""
+          "dark": ""
         }
       },
       "darkTheme": {
         "heading": "",
         "options": {
           "lighter": "",
-          "darker": "",
-          "cancel": ""
+          "darker": ""
         }
       },
       "browser": {
         "heading": "",
         "options": {
           "internal": "",
-          "external": "",
-          "cancel": ""
+          "external": ""
         }
       },
       "staticEmoji": {
@@ -275,10 +292,6 @@
       "contact": {
         "heading": ""
       },
-      "analytics": {
-        "heading": "",
-        "description": ""
-      },
       "version": "",
       "instanceVersion": ""
     },
@@ -307,6 +320,11 @@
       },
       "suspended": ""
     },
+    "accountInLists": {
+      "name": "",
+      "inLists": "",
+      "notInLists": ""
+    },
     "attachments": {
       "name": ""
     },
@@ -332,6 +350,9 @@
             "statusLink": "",
             "accountLink": ""
           }
+        },
+        "trending": {
+          "tags": ""
         }
       },
       "sections": {
diff --git a/src/i18n/pt_BR/common.json b/src/i18n/pt_BR/common.json
index 0cc54b9b..7b9190b2 100644
--- a/src/i18n/pt_BR/common.json
+++ b/src/i18n/pt_BR/common.json
@@ -2,7 +2,11 @@
   "buttons": {
     "OK": "OK",
     "apply": "Aplicar",
-    "cancel": "Cancelar"
+    "cancel": "Cancelar",
+    "discard": "",
+    "continue": "",
+    "delete": "",
+    "done": ""
   },
   "customEmoji": {
     "accessibilityLabel": "Emoji personalizado {{emoji}}"
@@ -18,5 +22,9 @@
       "message": "{{function}} falhou, por favor, tente novamente"
     }
   },
-  "separator": ", "
+  "separator": ", ",
+  "discard": {
+    "title": "",
+    "message": ""
+  }
 }
\ No newline at end of file
diff --git a/src/i18n/pt_BR/components/contextMenu.json b/src/i18n/pt_BR/components/contextMenu.json
index 0b1c7410..e0498625 100644
--- a/src/i18n/pt_BR/components/contextMenu.json
+++ b/src/i18n/pt_BR/components/contextMenu.json
@@ -2,6 +2,11 @@
   "accessibilityHint": "Ações para este toot, como o seu usuário publicado",
   "account": {
     "title": "Ações do Usuário",
+    "following": {
+      "action_false": "",
+      "action_true": ""
+    },
+    "inLists": "",
     "mute": {
       "action_false": "Silenciar usuário",
       "action_true": "Desativar o silêncio do usuário"
@@ -11,7 +16,7 @@
       "action_true": "Desbloquear usuário"
     },
     "reports": {
-      "action": "Denunciar e bloquear"
+      "action": ""
     }
   },
   "copy": {
diff --git a/src/i18n/pt_BR/components/instance.json b/src/i18n/pt_BR/components/instance.json
index 8f237b89..5266bfd0 100644
--- a/src/i18n/pt_BR/components/instance.json
+++ b/src/i18n/pt_BR/components/instance.json
@@ -20,11 +20,7 @@
   "update": {
     "alert": {
       "title": "Conectado a esta instância",
-      "message": "Você pode fazer login em outra conta mantendo a conta existente logada",
-      "buttons": {
-        "cancel": "$t(common:buttons.cancel)",
-        "continue": "Continuar"
-      }
+      "message": "Você pode fazer login em outra conta mantendo a conta existente logada"
     }
   }
 }
\ No newline at end of file
diff --git a/src/i18n/pt_BR/screens/compose.json b/src/i18n/pt_BR/screens/compose.json
index aa3677e0..0af03ec4 100644
--- a/src/i18n/pt_BR/screens/compose.json
+++ b/src/i18n/pt_BR/screens/compose.json
@@ -28,7 +28,6 @@
         "removeReply": {
           "title": "Não foi possível encontrar um toot respondido",
           "description": "Um toot respondido pode ter sido excluído. Você quer removê-lo da sua referência?",
-          "cancel": "$t(common:buttons.cancel)",
           "confirm": "Remover referência"
         }
       }
@@ -89,8 +88,7 @@
             "heading": "Tipo de opção",
             "options": {
               "single": "Uma opção",
-              "multiple": "Múltipla escolha",
-              "cancel": "$t(common:buttons.cancel)"
+              "multiple": "Múltipla escolha"
             }
           },
           "expiration": {
@@ -102,8 +100,7 @@
               "21600": "6 horas",
               "86400": "1 dia",
               "259200": "3 dias",
-              "604800": "7 dias",
-              "cancel": "$t(common:buttons.cancel)"
+              "604800": "7 dias"
             }
           }
         }
@@ -130,8 +127,7 @@
             "public": "Público",
             "unlisted": "Não listado",
             "private": "Apenas seguidores",
-            "direct": "Mensagem Direta",
-            "cancel": "$t(common:buttons.cancel)"
+            "direct": "Mensagem Direta"
           }
         },
         "spoiler": {
diff --git a/src/i18n/pt_BR/screens/imageViewer.json b/src/i18n/pt_BR/screens/imageViewer.json
index e6ec5e54..c458a2a6 100644
--- a/src/i18n/pt_BR/screens/imageViewer.json
+++ b/src/i18n/pt_BR/screens/imageViewer.json
@@ -6,8 +6,7 @@
     },
     "options": {
       "save": "Salvar imagem",
-      "share": "Compartilhar Imagem",
-      "cancel": "$t(common:buttons.cancel)"
+      "share": "Compartilhar Imagem"
     },
     "save": {
       "succeed": "Imagem salva",
diff --git a/src/i18n/pt_BR/screens/tabs.json b/src/i18n/pt_BR/screens/tabs.json
index b44b69fe..885fd814 100644
--- a/src/i18n/pt_BR/screens/tabs.json
+++ b/src/i18n/pt_BR/screens/tabs.json
@@ -46,12 +46,21 @@
       "language": {
         "name": "Idioma"
       },
-      "lists": {
-        "name": "Listas"
-      },
       "list": {
         "name": "Lista: {{list}}"
       },
+      "listAccounts": {
+        "name": ""
+      },
+      "listAdd": {
+        "name": ""
+      },
+      "listEdit": {
+        "name": ""
+      },
+      "lists": {
+        "name": "Listas"
+      },
       "push": {
         "name": "Notificação"
       },
@@ -87,15 +96,31 @@
         "XXL": "Extra grande"
       }
     },
-    "profile": {
-      "cancellation": {
-        "title": "Alterações não salvas",
-        "message": "Sua alteração não foi salva. Descartar as alterações?",
-        "buttons": {
-          "cancel": "$t(common:buttons.cancel)",
-          "discard": "Descartar"
+    "listAccounts": {
+      "heading": "",
+      "error": "",
+      "empty": ""
+    },
+    "listEdit": {
+      "heading": "",
+      "title": "",
+      "repliesPolicy": {
+        "heading": "",
+        "options": {
+          "none": "",
+          "list": "",
+          "followed": ""
         }
-      },
+      }
+    },
+    "listDelete": {
+      "heading": "",
+      "confirm": {
+        "title": "",
+        "message": ""
+      }
+    },
+    "profile": {
       "feedback": {
         "succeed": "{{type}} atualizado",
         "failed": "{{type}} falhou na atualização. Por favor, tente novamente"
@@ -125,8 +150,7 @@
           "options": {
             "public": "Público",
             "unlisted": "Não listado",
-            "private": "Apenas seguidores",
-            "cancel": "$t(common:buttons.cancel)"
+            "private": "Apenas seguidores"
           }
         },
         "sensitive": {
@@ -211,8 +235,7 @@
           "title": "Desconectar?",
           "message": "Após sair, você precisa entrar novamente",
           "buttons": {
-            "logout": "Sair",
-            "cancel": "$t(common:buttons.cancel)"
+            "logout": "Sair"
           }
         }
       }
@@ -229,34 +252,28 @@
         }
       },
       "language": {
-        "heading": "$t(me.stacks.language.name)",
-        "options": {
-          "cancel": "$t(common:buttons.cancel)"
-        }
+        "heading": "$t(me.stacks.language.name)"
       },
       "theme": {
         "heading": "Aparência",
         "options": {
           "auto": "Como o sistema",
           "light": "Modo claro",
-          "dark": "Modo escuro",
-          "cancel": "$t(common:buttons.cancel)"
+          "dark": "Modo escuro"
         }
       },
       "darkTheme": {
         "heading": "Tema escuro",
         "options": {
           "lighter": "Claro",
-          "darker": "Escuro",
-          "cancel": "$t(common:buttons.cancel)"
+          "darker": "Escuro"
         }
       },
       "browser": {
         "heading": "Abrir links",
         "options": {
           "internal": "Dentro do aplicativo",
-          "external": "Usar navegador do sistema",
-          "cancel": "$t(common:buttons.cancel)"
+          "external": "Usar navegador do sistema"
         }
       },
       "staticEmoji": {
@@ -275,10 +292,6 @@
       "contact": {
         "heading": "Contatar tooot"
       },
-      "analytics": {
-        "heading": "Ajude-nos a melhorar",
-        "description": "Coletando somente relativo ao uso, não ao usuário"
-      },
       "version": "Versão v{{version}}",
       "instanceVersion": "Versão Mastodon v{{version}}"
     },
@@ -307,6 +320,11 @@
       },
       "suspended": ""
     },
+    "accountInLists": {
+      "name": "",
+      "inLists": "",
+      "notInLists": ""
+    },
     "attachments": {
       "name": "<0 /><1>\"s mídia</1>"
     },
@@ -332,6 +350,9 @@
             "statusLink": "$t(shared.search.header.prefix) $t(shared.search.sections.statuses)",
             "accountLink": "$t(shared.search.header.prefix) $t(shared.search.sections.accounts)"
           }
+        },
+        "trending": {
+          "tags": ""
         }
       },
       "sections": {
diff --git a/src/i18n/sv/common.json b/src/i18n/sv/common.json
index cb81f060..bea4cce8 100644
--- a/src/i18n/sv/common.json
+++ b/src/i18n/sv/common.json
@@ -2,7 +2,11 @@
   "buttons": {
     "OK": "OK",
     "apply": "Verkställ",
-    "cancel": "Avbryt"
+    "cancel": "Avbryt",
+    "discard": "Kasta bort",
+    "continue": "Fortsätt",
+    "delete": "Radera",
+    "done": "Klar"
   },
   "customEmoji": {
     "accessibilityLabel": "Anpassad emoji {{emoji}}"
@@ -18,5 +22,9 @@
       "message": "{{function}} misslyckades, försök igen"
     }
   },
-  "separator": ", "
+  "separator": ", ",
+  "discard": {
+    "title": "Ändringen har inte sparats",
+    "message": "Din ändring har inte sparats. Vill du strunta i att spara ändringarna?"
+  }
 }
\ No newline at end of file
diff --git a/src/i18n/sv/components/contextMenu.json b/src/i18n/sv/components/contextMenu.json
index 164e3beb..cf1c2b56 100644
--- a/src/i18n/sv/components/contextMenu.json
+++ b/src/i18n/sv/components/contextMenu.json
@@ -2,6 +2,11 @@
   "accessibilityHint": "Åtgärder för detta inlägg, som t.ex. dess författare, själva inlägget",
   "account": {
     "title": "Användaråtgärder",
+    "following": {
+      "action_false": "Följ användare",
+      "action_true": "Avfölj användaren"
+    },
+    "inLists": "Hantera användare i listor",
     "mute": {
       "action_false": "Tysta användare",
       "action_true": "Sluta tysta användare"
@@ -11,7 +16,7 @@
       "action_true": "Avblockera användare"
     },
     "reports": {
-      "action": "Rapportera och blockera"
+      "action": "Rapportera och blockera användare"
     }
   },
   "copy": {
diff --git a/src/i18n/sv/components/instance.json b/src/i18n/sv/components/instance.json
index 3f669dbf..b770b56f 100644
--- a/src/i18n/sv/components/instance.json
+++ b/src/i18n/sv/components/instance.json
@@ -20,11 +20,7 @@
   "update": {
     "alert": {
       "title": "Inloggad till denna instans",
-      "message": "Du kan logga in på ett annat konto och behålla redan inloggade konton",
-      "buttons": {
-        "cancel": "$t(common:buttons.cancel)",
-        "continue": "Fortsätt"
-      }
+      "message": "Du kan logga in på ett annat konto och behålla redan inloggade konton"
     }
   }
 }
\ No newline at end of file
diff --git a/src/i18n/sv/screens/compose.json b/src/i18n/sv/screens/compose.json
index daa26e73..001fd497 100644
--- a/src/i18n/sv/screens/compose.json
+++ b/src/i18n/sv/screens/compose.json
@@ -13,7 +13,7 @@
     },
     "right": {
       "button": {
-        "default": "Inlägg",
+        "default": "Publicera",
         "conversation": "Skicka DM",
         "reply": "Skicka svar",
         "deleteEdit": "Inlägg",
@@ -28,7 +28,6 @@
         "removeReply": {
           "title": "Inlägget kunde inte hittas",
           "description": "Inlägget du svarar på kan ha raderats. Vill du ta bort referensen till det?",
-          "cancel": "$t(common:buttons.cancel)",
           "confirm": "Ta bort referens"
         }
       }
@@ -89,8 +88,7 @@
             "heading": "Typ av val",
             "options": {
               "single": "Enval",
-              "multiple": "Flerval",
-              "cancel": "$t(common:buttons.cancel)"
+              "multiple": "Flerval"
             }
           },
           "expiration": {
@@ -102,8 +100,7 @@
               "21600": "6 timmar",
               "86400": "1 dag",
               "259200": "3 dagar",
-              "604800": "7 dagar",
-              "cancel": "$t(common:buttons.cancel)"
+              "604800": "7 dagar"
             }
           }
         }
@@ -130,8 +127,7 @@
             "public": "Offentlig",
             "unlisted": "Olistad",
             "private": "Endast följare",
-            "direct": "Direktmeddelande",
-            "cancel": "$t(common:buttons.cancel)"
+            "direct": "Direktmeddelande"
           }
         },
         "spoiler": {
diff --git a/src/i18n/sv/screens/imageViewer.json b/src/i18n/sv/screens/imageViewer.json
index 39ad2514..f26d0e52 100644
--- a/src/i18n/sv/screens/imageViewer.json
+++ b/src/i18n/sv/screens/imageViewer.json
@@ -6,8 +6,7 @@
     },
     "options": {
       "save": "Spara bild",
-      "share": "Dela bild",
-      "cancel": "$t(common:buttons.cancel)"
+      "share": "Dela bild"
     },
     "save": {
       "succeed": "Bild sparad",
diff --git a/src/i18n/sv/screens/tabs.json b/src/i18n/sv/screens/tabs.json
index e10287fd..9ae9726b 100644
--- a/src/i18n/sv/screens/tabs.json
+++ b/src/i18n/sv/screens/tabs.json
@@ -46,12 +46,21 @@
       "language": {
         "name": "Språk"
       },
-      "lists": {
-        "name": "Listor"
-      },
       "list": {
         "name": "Lista: {{list}}"
       },
+      "listAccounts": {
+        "name": "Användare i listan: {{list}}"
+      },
+      "listAdd": {
+        "name": "Lägg till en lista"
+      },
+      "listEdit": {
+        "name": "Redigera listans detaljer"
+      },
+      "lists": {
+        "name": "Listor"
+      },
       "push": {
         "name": "Pushnotiser"
       },
@@ -87,15 +96,31 @@
         "XXL": "XXL"
       }
     },
-    "profile": {
-      "cancellation": {
-        "title": "Ändringen har inte sparats",
-        "message": "Din ändring har inte sparats. Vill du strunta i att spara ändringarna?",
-        "buttons": {
-          "cancel": "$t(common:buttons.cancel)",
-          "discard": "Kasta bort"
+    "listAccounts": {
+      "heading": "Hantera användare",
+      "error": "Ta bort användare från lista",
+      "empty": "Ingen användare tillagd i denna lista"
+    },
+    "listEdit": {
+      "heading": "Redigera listans detaljer",
+      "title": "Titel",
+      "repliesPolicy": {
+        "heading": "Visa svar:",
+        "options": {
+          "none": "Ingen",
+          "list": "Medlemmar i listan",
+          "followed": "Alla följda användare"
         }
-      },
+      }
+    },
+    "listDelete": {
+      "heading": "Radera lista",
+      "confirm": {
+        "title": "Radera listan \"{{list}}\"?",
+        "message": "Denna åtgärd kan inte ångras."
+      }
+    },
+    "profile": {
       "feedback": {
         "succeed": "{{type}} uppdaterades",
         "failed": "{{type}}-uppdateringen misslyckades, vänligen försök igen"
@@ -125,8 +150,7 @@
           "options": {
             "public": "Offentlig",
             "unlisted": "Olistad",
-            "private": "Endast följare",
-            "cancel": "$t(common:buttons.cancel)"
+            "private": "Endast följare"
           }
         },
         "sensitive": {
@@ -211,8 +235,7 @@
           "title": "Logga ut?",
           "message": "Efter att du loggat ut måste du logga in igen",
           "buttons": {
-            "logout": "Logga ut",
-            "cancel": "$t(common:buttons.cancel)"
+            "logout": "Logga ut"
           }
         }
       }
@@ -229,34 +252,28 @@
         }
       },
       "language": {
-        "heading": "$t(me.stacks.language.name)",
-        "options": {
-          "cancel": "$t(common:buttons.cancel)"
-        }
+        "heading": "$t(me.stacks.language.name)"
       },
       "theme": {
         "heading": "Utseende",
         "options": {
           "auto": "Som systemet",
           "light": "Ljust läge",
-          "dark": "Mörkt läge",
-          "cancel": "$t(common:buttons.cancel)"
+          "dark": "Mörkt läge"
         }
       },
       "darkTheme": {
         "heading": "Mörkt tema",
         "options": {
           "lighter": "Ljusare",
-          "darker": "Mörkare",
-          "cancel": "$t(common:buttons.cancel)"
+          "darker": "Mörkare"
         }
       },
       "browser": {
         "heading": "Öppna länk",
         "options": {
           "internal": "Inuti appen",
-          "external": "Använd systemets webbläsare",
-          "cancel": "$t(common:buttons.cancel)"
+          "external": "Använd systemets webbläsare"
         }
       },
       "staticEmoji": {
@@ -275,10 +292,6 @@
       "contact": {
         "heading": "Kontakta tooot"
       },
-      "analytics": {
-        "heading": "Hjälp oss att bli bättre",
-        "description": "Samlar endast in användningsdata som inte är kopplad till användaren"
-      },
       "version": "Version v{{version}}",
       "instanceVersion": "Mastodon version v{{version}}"
     },
@@ -307,6 +320,11 @@
       },
       "suspended": "Kontot är avstängt av moderatorerna på din server"
     },
+    "accountInLists": {
+      "name": "@{{username}}s listor",
+      "inLists": "I listor",
+      "notInLists": "Andra listor"
+    },
     "attachments": {
       "name": "<0 /><1>s media</1>"
     },
@@ -332,6 +350,9 @@
             "statusLink": "$t(shared.search.header.prefix) $t(shared.search.sections.statuses)",
             "accountLink": "$t(shared.search.header.prefix) $t(shared.search.sections.accounts)"
           }
+        },
+        "trending": {
+          "tags": ""
         }
       },
       "sections": {
diff --git a/src/i18n/vi/common.json b/src/i18n/vi/common.json
index 92fe0faf..d1eefbd6 100644
--- a/src/i18n/vi/common.json
+++ b/src/i18n/vi/common.json
@@ -2,7 +2,11 @@
   "buttons": {
     "OK": "OK",
     "apply": "Áp dụng",
-    "cancel": "Hủy bỏ"
+    "cancel": "Hủy bỏ",
+    "discard": "Bỏ qua",
+    "continue": "Tiếp tục",
+    "delete": "Xóa",
+    "done": ""
   },
   "customEmoji": {
     "accessibilityLabel": "Tùy chỉnh emoji {{emoji}}"
@@ -18,5 +22,9 @@
       "message": "{{function}} thất bại, xin thử lại sau"
     }
   },
-  "separator": ", "
+  "separator": ", ",
+  "discard": {
+    "title": "Những thay đổi chưa được lưu",
+    "message": "Những thay đổi của bạn chưa được lưu. Bạn có muốn hủy bỏ?"
+  }
 }
\ No newline at end of file
diff --git a/src/i18n/vi/components/contextMenu.json b/src/i18n/vi/components/contextMenu.json
index 0dee5c99..8cedf106 100644
--- a/src/i18n/vi/components/contextMenu.json
+++ b/src/i18n/vi/components/contextMenu.json
@@ -2,6 +2,11 @@
   "accessibilityHint": "Hành động với tút này, bao gồm đăng thủ công hay đăng tự động",
   "account": {
     "title": "Hành động người dùng",
+    "following": {
+      "action_false": "Theo dõi người này",
+      "action_true": "Ngưng theo dõi người này"
+    },
+    "inLists": "",
     "mute": {
       "action_false": "Ẩn người này",
       "action_true": "Bỏ ẩn người dùng"
diff --git a/src/i18n/vi/components/instance.json b/src/i18n/vi/components/instance.json
index 901fbd3a..b03df3c8 100644
--- a/src/i18n/vi/components/instance.json
+++ b/src/i18n/vi/components/instance.json
@@ -20,11 +20,7 @@
   "update": {
     "alert": {
       "title": "Đang đăng nhập vào máy chủ",
-      "message": "Bạn có thể đăng nhập nhiều tài khoản cùng lúc",
-      "buttons": {
-        "cancel": "$t(common:buttons.cancel)",
-        "continue": "Tiếp tục"
-      }
+      "message": "Bạn có thể đăng nhập nhiều tài khoản cùng lúc"
     }
   }
 }
\ No newline at end of file
diff --git a/src/i18n/vi/screens/compose.json b/src/i18n/vi/screens/compose.json
index 36f7ac4a..83b5901c 100644
--- a/src/i18n/vi/screens/compose.json
+++ b/src/i18n/vi/screens/compose.json
@@ -28,7 +28,6 @@
         "removeReply": {
           "title": "Tút trả lời sẽ không tìm thấy",
           "description": "Đã xóa tút trả lời. Bạn có muốn xóa nguồn luôn không?",
-          "cancel": "$t(common:buttons.cancel)",
           "confirm": "Xóa nguồn"
         }
       }
@@ -89,8 +88,7 @@
             "heading": "Kiểu bình chọn",
             "options": {
               "single": "Một lựa chọn",
-              "multiple": "Nhiều lựa chọn",
-              "cancel": "$t(common:buttons.cancel)"
+              "multiple": "Nhiều lựa chọn"
             }
           },
           "expiration": {
@@ -102,8 +100,7 @@
               "21600": "6 giờ",
               "86400": "1 ngày",
               "259200": "3 ngày",
-              "604800": "7 ngày",
-              "cancel": "$t(common:buttons.cancel)"
+              "604800": "7 ngày"
             }
           }
         }
@@ -130,8 +127,7 @@
             "public": "Công khai",
             "unlisted": "Hạn chế",
             "private": "Riêng tư",
-            "direct": "Nhắn riêng",
-            "cancel": "$t(common:buttons.cancel)"
+            "direct": "Nhắn riêng"
           }
         },
         "spoiler": {
diff --git a/src/i18n/vi/screens/imageViewer.json b/src/i18n/vi/screens/imageViewer.json
index a815b0cd..643ef719 100644
--- a/src/i18n/vi/screens/imageViewer.json
+++ b/src/i18n/vi/screens/imageViewer.json
@@ -6,8 +6,7 @@
     },
     "options": {
       "save": "Lưu ảnh",
-      "share": "Chia sẻ ảnh",
-      "cancel": "$t(common:buttons.cancel)"
+      "share": "Chia sẻ ảnh"
     },
     "save": {
       "succeed": "Đã lưu ảnh",
diff --git a/src/i18n/vi/screens/tabs.json b/src/i18n/vi/screens/tabs.json
index 5a79d628..65775503 100644
--- a/src/i18n/vi/screens/tabs.json
+++ b/src/i18n/vi/screens/tabs.json
@@ -46,12 +46,21 @@
       "language": {
         "name": "Ngôn ngữ"
       },
-      "lists": {
-        "name": "Danh sách"
-      },
       "list": {
         "name": "Danh sách: {{list}}"
       },
+      "listAccounts": {
+        "name": "Người trong danh sách: {{list}}"
+      },
+      "listAdd": {
+        "name": "Thêm một danh sách"
+      },
+      "listEdit": {
+        "name": "Sửa danh sách"
+      },
+      "lists": {
+        "name": "Danh sách"
+      },
       "push": {
         "name": "Thông báo đẩy"
       },
@@ -87,15 +96,31 @@
         "XXL": "XXL"
       }
     },
-    "profile": {
-      "cancellation": {
-        "title": "Những thay đổi chưa được lưu",
-        "message": "Những thay đổi của bạn chưa được lưu. Bạn có muốn hủy bỏ?",
-        "buttons": {
-          "cancel": "$t(common:buttons.cancel)",
-          "discard": "Hủy bỏ"
+    "listAccounts": {
+      "heading": "Quản lý người dùng",
+      "error": "Xoá khỏi danh sách",
+      "empty": "Chưa thêm ai vào danh sách"
+    },
+    "listEdit": {
+      "heading": "Sửa danh sách",
+      "title": "Chức vụ",
+      "repliesPolicy": {
+        "heading": "Cho phép trả lời với:",
+        "options": {
+          "none": "Không ai",
+          "list": "Người trong danh sách",
+          "followed": "Bất cứ ai đã theo dõi"
         }
-      },
+      }
+    },
+    "listDelete": {
+      "heading": "Xoá danh sách",
+      "confirm": {
+        "title": "Xóa danh sách \"{{list}}\"?",
+        "message": "Hành phục này không thể khôi phục được."
+      }
+    },
+    "profile": {
       "feedback": {
         "succeed": "Đã cập nhật {{type}}",
         "failed": "Cập nhật {{type}} thất bại, xin thử lại"
@@ -125,8 +150,7 @@
           "options": {
             "public": "Công khai",
             "unlisted": "Hạn chế",
-            "private": "Riêng tư",
-            "cancel": "$t(common:buttons.cancel)"
+            "private": "Riêng tư"
           }
         },
         "sensitive": {
@@ -211,8 +235,7 @@
           "title": "Vẫn đăng xuất?",
           "message": "Sau khi đăng xuất, bạn sẽ phải nhập lại mật khẩu",
           "buttons": {
-            "logout": "Đăng xuất",
-            "cancel": "$t(common:buttons.cancel)"
+            "logout": "Đăng xuất"
           }
         }
       }
@@ -229,34 +252,28 @@
         }
       },
       "language": {
-        "heading": "$t(me.stacks.language.name)",
-        "options": {
-          "cancel": "$t(common:buttons.cancel)"
-        }
+        "heading": "$t(me.stacks.language.name)"
       },
       "theme": {
         "heading": "Giao diện",
         "options": {
           "auto": "Theo thiết bị",
           "light": "Sáng",
-          "dark": "Tối",
-          "cancel": "$t(common:buttons.cancel)"
+          "dark": "Tối"
         }
       },
       "darkTheme": {
         "heading": "Độ tối",
         "options": {
           "lighter": "Thấp",
-          "darker": "Vừa",
-          "cancel": "$t(common:buttons.cancel)"
+          "darker": "Vừa"
         }
       },
       "browser": {
         "heading": "Mở liên kết",
         "options": {
           "internal": "Bằng app",
-          "external": "Bằng trình duyệt",
-          "cancel": "$t(common:buttons.cancel)"
+          "external": "Bằng trình duyệt"
         }
       },
       "staticEmoji": {
@@ -275,10 +292,6 @@
       "contact": {
         "heading": "Liên hệ tooot"
       },
-      "analytics": {
-        "heading": "Thu thập dữ liệu",
-        "description": "Giúp cải thiện chất lượng app"
-      },
       "version": "Phiên bản {{version}}",
       "instanceVersion": "Mastodon phiên bản {{version}}"
     },
@@ -307,6 +320,11 @@
       },
       "suspended": "Người này đã bị vô hiệu hóa"
     },
+    "accountInLists": {
+      "name": "",
+      "inLists": "",
+      "notInLists": ""
+    },
     "attachments": {
       "name": "<0 /><1>'s media</1>"
     },
@@ -332,6 +350,9 @@
             "statusLink": "$t(shared.search.header.prefix) $t(shared.search.sections.statuses)",
             "accountLink": "$t(shared.search.header.prefix) $t(shared.search.sections.accounts)"
           }
+        },
+        "trending": {
+          "tags": ""
         }
       },
       "sections": {
diff --git a/src/i18n/zh-Hans/common.json b/src/i18n/zh-Hans/common.json
index 1cf4d63d..a3c7dd6d 100644
--- a/src/i18n/zh-Hans/common.json
+++ b/src/i18n/zh-Hans/common.json
@@ -2,7 +2,11 @@
   "buttons": {
     "OK": "好的",
     "apply": "应用",
-    "cancel": "取消"
+    "cancel": "取消",
+    "discard": "丢弃",
+    "continue": "继续",
+    "delete": "删除",
+    "done": "完成"
   },
   "customEmoji": {
     "accessibilityLabel": "自定义表情{{emoji}}"
@@ -18,5 +22,9 @@
       "message": "{{function}}失败，请重试"
     }
   },
-  "separator": "，"
+  "separator": "，",
+  "discard": {
+    "title": "更改尚未保存",
+    "message": "您的更改尚未保存。是否放弃保存更改？"
+  }
 }
\ No newline at end of file
diff --git a/src/i18n/zh-Hans/components/contextMenu.json b/src/i18n/zh-Hans/components/contextMenu.json
index 1be976e7..456b3e1c 100644
--- a/src/i18n/zh-Hans/components/contextMenu.json
+++ b/src/i18n/zh-Hans/components/contextMenu.json
@@ -2,6 +2,11 @@
   "accessibilityHint": "更多关于此条嘟文，例如发布者等",
   "account": {
     "title": "用户操作",
+    "following": {
+      "action_false": "关注用户",
+      "action_true": "取消关注用户"
+    },
+    "inLists": "管理用户列表",
     "mute": {
       "action_false": "静音用户",
       "action_true": "取消静音用户"
@@ -11,7 +16,7 @@
       "action_true": "取消屏蔽用户"
     },
     "reports": {
-      "action": "举报并屏蔽"
+      "action": "举报并屏蔽用户"
     }
   },
   "copy": {
diff --git a/src/i18n/zh-Hans/components/instance.json b/src/i18n/zh-Hans/components/instance.json
index bdda2741..abf40b9b 100644
--- a/src/i18n/zh-Hans/components/instance.json
+++ b/src/i18n/zh-Hans/components/instance.json
@@ -20,11 +20,7 @@
   "update": {
     "alert": {
       "title": "此社区已登录",
-      "message": "你可以登录同个社区的另一个账号，不影响已登录的账号",
-      "buttons": {
-        "cancel": "$t(common:buttons.cancel)",
-        "continue": "继续"
-      }
+      "message": "你可以登录同个社区的另一个账号，不影响已登录的账号"
     }
   }
 }
\ No newline at end of file
diff --git a/src/i18n/zh-Hans/screens/compose.json b/src/i18n/zh-Hans/screens/compose.json
index 5af29c05..ba2d5dc3 100644
--- a/src/i18n/zh-Hans/screens/compose.json
+++ b/src/i18n/zh-Hans/screens/compose.json
@@ -28,7 +28,6 @@
         "removeReply": {
           "title": "回复的嘟文不存在",
           "description": "回复的嘟文可能已被删除。确认移除回复嘟文的关联？",
-          "cancel": "$t(common:buttons.cancel)",
           "confirm": "移除关联"
         }
       }
@@ -89,8 +88,7 @@
             "heading": "可选项",
             "options": {
               "single": "单选",
-              "multiple": "多选",
-              "cancel": "$t(common:buttons.cancel)"
+              "multiple": "多选"
             }
           },
           "expiration": {
@@ -102,8 +100,7 @@
               "21600": "6小时",
               "86400": "1天",
               "259200": "3天",
-              "604800": "7天",
-              "cancel": "$t(common:buttons.cancel)"
+              "604800": "7天"
             }
           }
         }
@@ -130,8 +127,7 @@
             "public": "公开",
             "unlisted": "不公开",
             "private": "仅关注者",
-            "direct": "私信",
-            "cancel": "$t(common:buttons.cancel)"
+            "direct": "私信"
           }
         },
         "spoiler": {
diff --git a/src/i18n/zh-Hans/screens/imageViewer.json b/src/i18n/zh-Hans/screens/imageViewer.json
index 27ab50ac..fbc0e928 100644
--- a/src/i18n/zh-Hans/screens/imageViewer.json
+++ b/src/i18n/zh-Hans/screens/imageViewer.json
@@ -6,8 +6,7 @@
     },
     "options": {
       "save": "保存图片",
-      "share": "分享图片",
-      "cancel": "$t(common:buttons.cancel)"
+      "share": "分享图片"
     },
     "save": {
       "succeed": "图片保存成功",
diff --git a/src/i18n/zh-Hans/screens/tabs.json b/src/i18n/zh-Hans/screens/tabs.json
index 131094ba..38200304 100644
--- a/src/i18n/zh-Hans/screens/tabs.json
+++ b/src/i18n/zh-Hans/screens/tabs.json
@@ -46,12 +46,21 @@
       "language": {
         "name": "应用语言"
       },
-      "lists": {
-        "name": "列表"
-      },
       "list": {
         "name": "列表：{{list}}"
       },
+      "listAccounts": {
+        "name": "列表中的用户：{{list}}"
+      },
+      "listAdd": {
+        "name": "添加列表"
+      },
+      "listEdit": {
+        "name": "编辑列表详情"
+      },
+      "lists": {
+        "name": "列表"
+      },
       "push": {
         "name": "推送通知"
       },
@@ -87,15 +96,31 @@
         "XXL": "超大号"
       }
     },
-    "profile": {
-      "cancellation": {
-        "title": "更改尚未保存",
-        "message": "您的更改尚未保存。是否放弃保存更改？",
-        "buttons": {
-          "cancel": "$t(common:buttons.cancel)",
-          "discard": "不保存"
+    "listAccounts": {
+      "heading": "管理用户",
+      "error": "从列表中移除用户",
+      "empty": "此列表中没有添加用户"
+    },
+    "listEdit": {
+      "heading": "编辑列表详情",
+      "title": "名称",
+      "repliesPolicy": {
+        "heading": "显示回复给：",
+        "options": {
+          "none": "无",
+          "list": "列表成员",
+          "followed": "任何被关注的用户"
         }
-      },
+      }
+    },
+    "listDelete": {
+      "heading": "删除列表",
+      "confirm": {
+        "title": "删除列表“{{list}}”？",
+        "message": "此操作不可恢复。"
+      }
+    },
+    "profile": {
       "feedback": {
         "succeed": "{{type}}已更新",
         "failed": "{{type}}更新失败，请重试"
@@ -125,8 +150,7 @@
           "options": {
             "public": "公开",
             "unlisted": "不公开",
-            "private": "仅关注者",
-            "cancel": "$t(common:buttons.cancel)"
+            "private": "仅关注者"
           }
         },
         "sensitive": {
@@ -211,8 +235,7 @@
           "title": "确认退出登录？",
           "message": "退出登录后，需要重新认证账号",
           "buttons": {
-            "logout": "退出登录",
-            "cancel": "$t(common:buttons.cancel)"
+            "logout": "退出登录"
           }
         }
       }
@@ -229,34 +252,28 @@
         }
       },
       "language": {
-        "heading": "$t(me.stacks.language.name)",
-        "options": {
-          "cancel": "$t(common:buttons.cancel)"
-        }
+        "heading": "$t(me.stacks.language.name)"
       },
       "theme": {
         "heading": "应用外观",
         "options": {
           "auto": "跟随系统",
           "light": "浅色模式",
-          "dark": "深色模式",
-          "cancel": "$t(common:buttons.cancel)"
+          "dark": "深色模式"
         }
       },
       "darkTheme": {
         "heading": "深色主题",
         "options": {
           "lighter": "暗淡",
-          "darker": "暗黑",
-          "cancel": "$t(common:buttons.cancel)"
+          "darker": "暗黑"
         }
       },
       "browser": {
         "heading": "外部链接",
         "options": {
           "internal": "应用内打开",
-          "external": "浏览器打开",
-          "cancel": "$t(common:buttons.cancel)"
+          "external": "浏览器打开"
         }
       },
       "staticEmoji": {
@@ -275,10 +292,6 @@
       "contact": {
         "heading": "联系 tooot"
       },
-      "analytics": {
-        "heading": "帮助我们改进",
-        "description": "收集不与用户相关联的使用信息"
-      },
       "version": "版本 v{{version}}",
       "instanceVersion": "长毛象版本 v{{version}}"
     },
@@ -307,6 +320,11 @@
       },
       "suspended": "此账户已被服务器管理员停用"
     },
+    "accountInLists": {
+      "name": "@{{username}}所在列表",
+      "inLists": "在列表中",
+      "notInLists": "其它列表"
+    },
     "attachments": {
       "name": "<0 /><1>的媒体</1>"
     },
@@ -332,6 +350,9 @@
             "statusLink": "$t(shared.search.header.prefix)指定$t(shared.search.sections.statuses)",
             "accountLink": "$t(shared.search.header.prefix)指定$t(shared.search.sections.accounts)"
           }
+        },
+        "trending": {
+          "tags": "热门标签"
         }
       },
       "sections": {
diff --git a/src/i18n/zh-Hant/common.json b/src/i18n/zh-Hant/common.json
index 2f4cb560..6132e49a 100644
--- a/src/i18n/zh-Hant/common.json
+++ b/src/i18n/zh-Hant/common.json
@@ -2,7 +2,11 @@
   "buttons": {
     "OK": "OK",
     "apply": "套用",
-    "cancel": "取消"
+    "cancel": "取消",
+    "discard": "不儲存",
+    "continue": "繼續",
+    "delete": "刪除",
+    "done": "完成"
   },
   "customEmoji": {
     "accessibilityLabel": "自定的表情符號 {{emoji}}"
@@ -18,5 +22,9 @@
       "message": "{{function}} 失敗，請再試一次"
     }
   },
-  "separator": "，"
+  "separator": "，",
+  "discard": {
+    "title": "變更尚未儲存",
+    "message": "您的變更尚未儲存。是否放棄儲存變更？"
+  }
 }
\ No newline at end of file
diff --git a/src/i18n/zh-Hant/components/contextMenu.json b/src/i18n/zh-Hant/components/contextMenu.json
index e375eca0..4280dd5c 100644
--- a/src/i18n/zh-Hant/components/contextMenu.json
+++ b/src/i18n/zh-Hant/components/contextMenu.json
@@ -2,6 +2,11 @@
   "accessibilityHint": "更多關於此條嘟文，例如發佈者等",
   "account": {
     "title": "使用者操作",
+    "following": {
+      "action_false": "跟隨使用者",
+      "action_true": "取消跟隨使用者"
+    },
+    "inLists": "管理使用者列表",
     "mute": {
       "action_false": "靜音使用者",
       "action_true": "解除靜音使用者"
@@ -11,7 +16,7 @@
       "action_true": "解除封鎖使用者"
     },
     "reports": {
-      "action": "檢舉並封鎖"
+      "action": "檢舉並封鎖使用者"
     }
   },
   "copy": {
diff --git a/src/i18n/zh-Hant/components/instance.json b/src/i18n/zh-Hant/components/instance.json
index 7acbe363..26dec890 100644
--- a/src/i18n/zh-Hant/components/instance.json
+++ b/src/i18n/zh-Hant/components/instance.json
@@ -20,11 +20,7 @@
   "update": {
     "alert": {
       "title": "已登入站點",
-      "message": "您可以登入其它的帳號，已登入的帳號會被保留",
-      "buttons": {
-        "cancel": "$t(common:buttons.cancel)",
-        "continue": "繼續"
-      }
+      "message": "您可以登入其它的帳號，已登入的帳號會被保留"
     }
   }
 }
\ No newline at end of file
diff --git a/src/i18n/zh-Hant/components/mediaSelector.json b/src/i18n/zh-Hant/components/mediaSelector.json
index 509d1f4e..01033cf0 100644
--- a/src/i18n/zh-Hant/components/mediaSelector.json
+++ b/src/i18n/zh-Hant/components/mediaSelector.json
@@ -2,9 +2,9 @@
   "title": "選擇媒體來源",
   "message": "媒體 Exif 資訊不會被上傳",
   "options": {
-    "image": "上傳圖片",
-    "image_max": "上傳圖片（最多 {{max}} 張）",
+    "image": "上傳照片",
+    "image_max": "上傳照片（最多 {{max}} 張）",
     "video": "上傳影片",
-    "video_max": "上傳影片（最多 {{max}} 個）"
+    "video_max": "上傳影片（最多 {{max}} 支）"
   }
 }
\ No newline at end of file
diff --git a/src/i18n/zh-Hant/components/parse.json b/src/i18n/zh-Hant/components/parse.json
index 613472f0..f721fc53 100644
--- a/src/i18n/zh-Hant/components/parse.json
+++ b/src/i18n/zh-Hant/components/parse.json
@@ -1,6 +1,6 @@
 {
   "HTML": {
-    "accessibilityHint": "點擊展開或折疊內容",
+    "accessibilityHint": "點擊以展開或折疊內容",
     "expanded": "{{hint}}{{moreLines}}",
     "moreLines": "（還有 {{count}} 行）",
     "defaultHint": "長嘟文"
diff --git a/src/i18n/zh-Hant/components/timeline.json b/src/i18n/zh-Hant/components/timeline.json
index ad5d3d02..a483f163 100644
--- a/src/i18n/zh-Hant/components/timeline.json
+++ b/src/i18n/zh-Hant/components/timeline.json
@@ -37,7 +37,7 @@
         "accessibilityLabel": "回覆嘟文"
       },
       "reblogged": {
-        "accessibilityLabel": "轉發此嘟",
+        "accessibilityLabel": "轉嘟",
         "function": "轉嘟",
         "options": {
           "title": "選擇轉嘟範圍",
@@ -56,18 +56,18 @@
     },
     "actionsUsers": {
       "reblogged_by": {
-        "accessibilityLabel": "{{count}} 個使用者轉嘟了此嘟文",
-        "accessibilityHint": "點擊可以取得更多使用者資訊",
+        "accessibilityLabel": "{{count}} 個使用者轉嘟了",
+        "accessibilityHint": "點擊以取得更多使用者資訊",
         "text": "$t(screenTabs:shared.users.statuses.reblogged_by)"
       },
       "favourited_by": {
         "accessibilityLabel": "{{count}} 個使用者喜歡此嘟文",
-        "accessibilityHint": "點擊可以取得使用者資訊",
+        "accessibilityHint": "點擊以取得使用者資訊",
         "text": "$t(screenTabs:shared.users.statuses.favourited_by)"
       },
       "history": {
         "accessibilityLabel": "嘟文被編輯了 {{count}} 次",
-        "accessibilityHint": "點擊查看編輯紀錄",
+        "accessibilityHint": "點擊以查看編輯紀錄",
         "text_one": "{{count}} 次編輯",
         "text_other": "{{count}} 次編輯"
       }
diff --git a/src/i18n/zh-Hant/screens/compose.json b/src/i18n/zh-Hant/screens/compose.json
index b9a8ebd5..4e374c29 100644
--- a/src/i18n/zh-Hant/screens/compose.json
+++ b/src/i18n/zh-Hant/screens/compose.json
@@ -28,7 +28,6 @@
         "removeReply": {
           "title": "回覆的嘟文不存在",
           "description": "回覆的嘟文可能已被刪除。確認移除回覆嘟文的關聯？",
-          "cancel": "$t(common:buttons.cancel)",
           "confirm": "移除關聯"
         }
       }
@@ -89,8 +88,7 @@
             "heading": "選擇類型",
             "options": {
               "single": "單選題",
-              "multiple": "複選題",
-              "cancel": "$t(common:buttons.cancel)"
+              "multiple": "複選題"
             }
           },
           "expiration": {
@@ -102,8 +100,7 @@
               "21600": "6 小時",
               "86400": "1 天",
               "259200": "3 天",
-              "604800": "7 天",
-              "cancel": "$t(common:buttons.cancel)"
+              "604800": "7 天"
             }
           }
         }
@@ -130,8 +127,7 @@
             "public": "公開",
             "unlisted": "不公開",
             "private": "僅限跟隨者",
-            "direct": "私訊",
-            "cancel": "$t(common:buttons.cancel)"
+            "direct": "私訊"
           }
         },
         "spoiler": {
diff --git a/src/i18n/zh-Hant/screens/imageViewer.json b/src/i18n/zh-Hant/screens/imageViewer.json
index 1d3de721..49e5b9b9 100644
--- a/src/i18n/zh-Hant/screens/imageViewer.json
+++ b/src/i18n/zh-Hant/screens/imageViewer.json
@@ -6,8 +6,7 @@
     },
     "options": {
       "save": "儲存圖片",
-      "share": "分享圖片",
-      "cancel": "$t(common:buttons.cancel)"
+      "share": "分享圖片"
     },
     "save": {
       "succeed": "圖片已儲存",
diff --git a/src/i18n/zh-Hant/screens/tabs.json b/src/i18n/zh-Hant/screens/tabs.json
index 96fee96c..f53da09a 100644
--- a/src/i18n/zh-Hant/screens/tabs.json
+++ b/src/i18n/zh-Hant/screens/tabs.json
@@ -46,12 +46,21 @@
       "language": {
         "name": "語言"
       },
-      "lists": {
-        "name": "列表"
-      },
       "list": {
         "name": "列表：{{list}}"
       },
+      "listAccounts": {
+        "name": "使用者在 {{list}} 列表中"
+      },
+      "listAdd": {
+        "name": "新增列表"
+      },
+      "listEdit": {
+        "name": "編輯列表詳細資料"
+      },
+      "lists": {
+        "name": "列表"
+      },
       "push": {
         "name": "推播通知"
       },
@@ -87,15 +96,31 @@
         "XXL": "超大"
       }
     },
-    "profile": {
-      "cancellation": {
-        "title": "變更尚未儲存",
-        "message": "您的變更尚未儲存。是否放棄儲存變更？",
-        "buttons": {
-          "cancel": "$t(common:buttons.cancel)",
-          "discard": "不儲存"
+    "listAccounts": {
+      "heading": "管理使用者",
+      "error": "從列表中刪除使用者",
+      "empty": "此列表中沒有任何使用者"
+    },
+    "listEdit": {
+      "heading": "編輯列表詳細資料",
+      "title": "標題",
+      "repliesPolicy": {
+        "heading": "顯示回覆：",
+        "options": {
+          "none": "沒有人",
+          "list": "列表中的成員",
+          "followed": "任何跟隨的使用者"
         }
-      },
+      }
+    },
+    "listDelete": {
+      "heading": "刪除列表",
+      "confirm": {
+        "title": "要刪除 \"{{list}}\" 列表嗎？",
+        "message": "此操作無法還原。"
+      }
+    },
+    "profile": {
       "feedback": {
         "succeed": "{{type}} 已更新",
         "failed": "{{type}} 更新失敗，請重試。"
@@ -125,8 +150,7 @@
           "options": {
             "public": "公開",
             "unlisted": "不公開",
-            "private": "僅限跟隨者",
-            "cancel": "$t(common:buttons.cancel)"
+            "private": "僅限跟隨者"
           }
         },
         "sensitive": {
@@ -211,8 +235,7 @@
           "title": "確定要登出？",
           "message": "登出後，需要重新驗證帳號",
           "buttons": {
-            "logout": "登出",
-            "cancel": "$t(common:buttons.cancel)"
+            "logout": "登出"
           }
         }
       }
@@ -229,34 +252,28 @@
         }
       },
       "language": {
-        "heading": "$t(me.stacks.language.name)",
-        "options": {
-          "cancel": "$t(common:buttons.cancel)"
-        }
+        "heading": "$t(me.stacks.language.name)"
       },
       "theme": {
         "heading": "外觀",
         "options": {
           "auto": "跟隨系統",
           "light": "淺色模式",
-          "dark": "深色模式",
-          "cancel": "$t(common:buttons.cancel)"
+          "dark": "深色模式"
         }
       },
       "darkTheme": {
         "heading": "深色主題",
         "options": {
           "lighter": "暗淡",
-          "darker": "暗黑",
-          "cancel": "$t(common:buttons.cancel)"
+          "darker": "暗黑"
         }
       },
       "browser": {
         "heading": "開啟連結",
         "options": {
           "internal": "從應用程式內開啟",
-          "external": "使用系統瀏覽器開啟",
-          "cancel": "$t(common:buttons.cancel)"
+          "external": "使用系統瀏覽器開啟"
         }
       },
       "staticEmoji": {
@@ -275,10 +292,6 @@
       "contact": {
         "heading": "聯繫 tooot"
       },
-      "analytics": {
-        "heading": "幫助我們改善",
-        "description": "僅收集不與使用者相關聯的資料"
-      },
       "version": "Version v{{version}}",
       "instanceVersion": "Mastodon version v{{version}}"
     },
@@ -307,12 +320,17 @@
       },
       "suspended": "此帳號已被伺服器管理員停用"
     },
+    "accountInLists": {
+      "name": "@{{username}} 的列表",
+      "inLists": "在列表中",
+      "notInLists": "其它列表"
+    },
     "attachments": {
       "name": "<0 /><1>的媒體</1>"
     },
     "hashtag": {
-      "follow": "跟隨",
-      "unfollow": "取消跟隨"
+      "follow": "追蹤",
+      "unfollow": "取消追蹤"
     },
     "history": {
       "name": "編輯歷史"
@@ -332,6 +350,9 @@
             "statusLink": "$t(shared.search.header.prefix) $t(shared.search.sections.statuses)",
             "accountLink": "$t(shared.search.header.prefix) $t(shared.search.sections.accounts)"
           }
+        },
+        "trending": {
+          "tags": ""
         }
       },
       "sections": {

From 277d114b27c485c2a1e9035788d23f22277ed261 Mon Sep 17 00:00:00 2001
From: xmflsct <me@xmflsct.com>
Date: Sun, 4 Dec 2022 01:20:49 +0100
Subject: [PATCH 25/40] Added Dutch

---
 README.md                           |  2 ++
 ios/nl.lproj/InfoPlist.strings      |  2 ++
 ios/tooot.xcodeproj/project.pbxproj |  3 +++
 src/i18n/i18n.ts                    |  6 ++++++
 src/i18n/locales.ts                 |  1 +
 src/i18n/nl/index.ts                | 18 ++++++++++++++++++
 6 files changed, 32 insertions(+)
 create mode 100644 ios/nl.lproj/InfoPlist.strings
 create mode 100644 src/i18n/nl/index.ts

diff --git a/README.md b/README.md
index ed0da06d..39dc8e41 100644
--- a/README.md
+++ b/README.md
@@ -23,6 +23,8 @@ Please **do not** create a pull request to update translation. tooot's translati
 
 [@hellojaccc](https://github.com/hellojaccc) for Korean translation
 
+[@jan-vandenberg](https://crowdin.com/profile/jan-vandenberg) for Dutch translation
+
 [@luizpicolo](https://github.com/luizpicolo) for Brazilian Portuguese
 
 [@janlindblom](https://github.com/janlindblom) for Swedish
diff --git a/ios/nl.lproj/InfoPlist.strings b/ios/nl.lproj/InfoPlist.strings
new file mode 100644
index 00000000..8251d31e
--- /dev/null
+++ b/ios/nl.lproj/InfoPlist.strings
@@ -0,0 +1,2 @@
+"NSPhotoLibraryAddUsageDescription" = "Sta tooot toe om afbeeldingen op te slaan in je filmrol";
+"NSPhotoLibraryUsageDescription" = "Sta tooot toe om afbeeldingen op te slaan in je filmrol";
diff --git a/ios/tooot.xcodeproj/project.pbxproj b/ios/tooot.xcodeproj/project.pbxproj
index 811bb728..9b5dde16 100644
--- a/ios/tooot.xcodeproj/project.pbxproj
+++ b/ios/tooot.xcodeproj/project.pbxproj
@@ -70,6 +70,7 @@
 		AA286B85B6C04FC6940260E9 /* SplashScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = SplashScreen.storyboard; path = tooot/SplashScreen.storyboard; sourceTree = "<group>"; };
 		DF8133F098604A10B0D94952 /* boop.mp3 */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = boop.mp3; path = tooot/boop.mp3; sourceTree = "<group>"; };
 		E613A80A28282A01003C97D6 /* AppDelegate.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = AppDelegate.mm; path = tooot/AppDelegate.mm; sourceTree = "<group>"; };
+		E6217B7E293C1EBF00B1755E /* nl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = nl; path = nl.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		E633A420281EAEAB000E540F /* ShareExtension.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = ShareExtension.appex; sourceTree = BUILT_PRODUCTS_DIR; };
 		E633A427281EAEAB000E540F /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		E633A42F281EAF38000E540F /* ShareViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ShareViewController.swift; path = "../../node_modules/react-native-share-menu/ios/ShareViewController.swift"; sourceTree = "<group>"; };
@@ -294,6 +295,7 @@
 				fr,
 				es,
 				sv,
+				nl,
 			);
 			mainGroup = 83CBB9F61A601CBA00E9B192;
 			productRefGroup = 83CBBA001A601CBA00E9B192 /* Products */;
@@ -524,6 +526,7 @@
 				E66C0842291F095800DFFF60 /* fr */,
 				E690AF692926B737002C38A8 /* es */,
 				E63E7FF0292A828100C76FD4 /* sv */,
+				E6217B7E293C1EBF00B1755E /* nl */,
 			);
 			name = InfoPlist.strings;
 			sourceTree = "<group>";
diff --git a/src/i18n/i18n.ts b/src/i18n/i18n.ts
index a1b0073c..2bb82932 100644
--- a/src/i18n/i18n.ts
+++ b/src/i18n/i18n.ts
@@ -8,6 +8,7 @@ import fr from '@root/i18n/fr'
 import it from '@root/i18n/it'
 import ja from '@root/i18n/ja'
 import ko from '@root/i18n/ko'
+import nl from '@root/i18n/nl'
 import pt_BR from '@root/i18n/pt_BR'
 import sv from '@root/i18n/sv'
 import vi from '@root/i18n/vi'
@@ -25,6 +26,7 @@ import '@formatjs/intl-pluralrules/locale-data/fr'
 import '@formatjs/intl-pluralrules/locale-data/it'
 import '@formatjs/intl-pluralrules/locale-data/ja'
 import '@formatjs/intl-pluralrules/locale-data/ko'
+import '@formatjs/intl-pluralrules/locale-data/nl'
 import '@formatjs/intl-pluralrules/locale-data/pt'
 import '@formatjs/intl-pluralrules/locale-data/sv'
 import '@formatjs/intl-pluralrules/locale-data/vi'
@@ -38,6 +40,7 @@ import '@formatjs/intl-numberformat/locale-data/fr'
 import '@formatjs/intl-numberformat/locale-data/it'
 import '@formatjs/intl-numberformat/locale-data/ja'
 import '@formatjs/intl-numberformat/locale-data/ko'
+import '@formatjs/intl-numberformat/locale-data/nl'
 import '@formatjs/intl-numberformat/locale-data/pt'
 import '@formatjs/intl-numberformat/locale-data/sv'
 import '@formatjs/intl-numberformat/locale-data/vi'
@@ -52,6 +55,7 @@ import '@formatjs/intl-datetimeformat/locale-data/fr'
 import '@formatjs/intl-datetimeformat/locale-data/it'
 import '@formatjs/intl-datetimeformat/locale-data/ja'
 import '@formatjs/intl-datetimeformat/locale-data/ko'
+import '@formatjs/intl-datetimeformat/locale-data/nl'
 import '@formatjs/intl-datetimeformat/locale-data/pt'
 import '@formatjs/intl-datetimeformat/locale-data/sv'
 import '@formatjs/intl-datetimeformat/locale-data/vi'
@@ -67,6 +71,7 @@ import '@formatjs/intl-relativetimeformat/locale-data/fr'
 import '@formatjs/intl-relativetimeformat/locale-data/it'
 import '@formatjs/intl-relativetimeformat/locale-data/ja'
 import '@formatjs/intl-relativetimeformat/locale-data/ko'
+import '@formatjs/intl-relativetimeformat/locale-data/nl'
 import '@formatjs/intl-relativetimeformat/locale-data/pt'
 import '@formatjs/intl-relativetimeformat/locale-data/sv'
 import '@formatjs/intl-relativetimeformat/locale-data/vi'
@@ -88,6 +93,7 @@ i18n.use(initReactI18next).init({
     it,
     ja,
     ko,
+    nl,
     'pt-BR': pt_BR,
     sv,
     vi,
diff --git a/src/i18n/locales.ts b/src/i18n/locales.ts
index 80cba743..0e13587a 100644
--- a/src/i18n/locales.ts
+++ b/src/i18n/locales.ts
@@ -6,6 +6,7 @@ const LOCALES = {
   it: 'Italiano',
   ja: '日本語',
   ko: '한국어',
+  nl: 'Nederlands',
   'pt-br': 'Português (Brasil)',
   sv: 'Svenska',
   vi: 'Tiếng Việt',
diff --git a/src/i18n/nl/index.ts b/src/i18n/nl/index.ts
new file mode 100644
index 00000000..5f2a7a82
--- /dev/null
+++ b/src/i18n/nl/index.ts
@@ -0,0 +1,18 @@
+export default {
+  common: require('./common'),
+
+  screens: require('./screens'),
+  screenActions: require('./screens/actions'),
+  screenAnnouncements: require('./screens/announcements'),
+  screenCompose: require('./screens/compose'),
+  screenImageViewer: require('./screens/imageViewer'),
+  screenTabs: require('./screens/tabs'),
+
+  componentContextMenu: require('./components/contextMenu'),
+  componentEmojis: require('./components/emojis'),
+  componentInstance: require('./components/instance'),
+  componentMediaSelector: require('./components/mediaSelector'),
+  componentParse: require('./components/parse'),
+  componentRelationship: require('./components/relationship'),
+  componentTimeline: require('./components/timeline')
+}

From 7faa4b504442e0a4038305667dff1747c284c7b5 Mon Sep 17 00:00:00 2001
From: xmflsct <me@xmflsct.com>
Date: Sun, 4 Dec 2022 01:24:37 +0100
Subject: [PATCH 26/40] Added Catalan

---
 README.md                           |  6 +++---
 ios/ca.lproj/InfoPlist.strings      |  2 ++
 ios/tooot.xcodeproj/project.pbxproj |  3 +++
 src/i18n/ca/index.ts                | 18 ++++++++++++++++++
 src/i18n/i18n.ts                    |  6 ++++++
 src/i18n/locales.ts                 |  1 +
 6 files changed, 33 insertions(+), 3 deletions(-)
 create mode 100644 ios/ca.lproj/InfoPlist.strings
 create mode 100644 src/i18n/ca/index.ts

diff --git a/README.md b/README.md
index 39dc8e41..b1bcf7e3 100644
--- a/README.md
+++ b/README.md
@@ -11,12 +11,12 @@ Please **do not** create a pull request to update translation. tooot's translati
 
 ## Special thanks
 
-[@amrtf](https://crowdin.com/profile/amrtf) for Spanish translation
-
-[@pat](https://piaille.fr/@pat) for French translation
+[@amrtf](https://crowdin.com/profile/amrtf) for Catalan and Spanish translation
 
 [@forenta](https://github.com/forenta) for German translation
 
+[@pat](https://piaille.fr/@pat) for French translation
+
 [@andrigamerita](https://github.com/andrigamerita) for Italian translation
 
 [@Hikaru](https://github.com/Hikali-47041) and [@la_la](https://mstdn.jp/@la_la_la) for Japanese translation
diff --git a/ios/ca.lproj/InfoPlist.strings b/ios/ca.lproj/InfoPlist.strings
new file mode 100644
index 00000000..873ce7f9
--- /dev/null
+++ b/ios/ca.lproj/InfoPlist.strings
@@ -0,0 +1,2 @@
+"NSPhotoLibraryAddUsageDescription" = "Permet que tooot desi imatges al carret de la càmera";
+"NSPhotoLibraryUsageDescription" = "Permet que tooot desi imatges al carret de la càmera";
diff --git a/ios/tooot.xcodeproj/project.pbxproj b/ios/tooot.xcodeproj/project.pbxproj
index 9b5dde16..6d8698dd 100644
--- a/ios/tooot.xcodeproj/project.pbxproj
+++ b/ios/tooot.xcodeproj/project.pbxproj
@@ -84,6 +84,7 @@
 		E69EBACC28DF28420057EDEC /* ko */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ko; path = ko.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		E69EBACD28DF284D0057EDEC /* pt-BR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "pt-BR"; path = "pt-BR.lproj/InfoPlist.strings"; sourceTree = "<group>"; };
 		E69EBACE28DF28560057EDEC /* vi */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = vi; path = vi.lproj/InfoPlist.strings; sourceTree = "<group>"; };
+		E6A4895D293C1F740047951A /* ca */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ca; path = ca.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		E6C8B26628F5F9FC0062CF2E /* ja */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ja; path = ja.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		ED297162215061F000B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; };
 		ED2971642150620600B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS12.0.sdk/System/Library/Frameworks/JavaScriptCore.framework; sourceTree = DEVELOPER_DIR; };
@@ -296,6 +297,7 @@
 				es,
 				sv,
 				nl,
+				ca,
 			);
 			mainGroup = 83CBB9F61A601CBA00E9B192;
 			productRefGroup = 83CBBA001A601CBA00E9B192 /* Products */;
@@ -527,6 +529,7 @@
 				E690AF692926B737002C38A8 /* es */,
 				E63E7FF0292A828100C76FD4 /* sv */,
 				E6217B7E293C1EBF00B1755E /* nl */,
+				E6A4895D293C1F740047951A /* ca */,
 			);
 			name = InfoPlist.strings;
 			sourceTree = "<group>";
diff --git a/src/i18n/ca/index.ts b/src/i18n/ca/index.ts
new file mode 100644
index 00000000..5f2a7a82
--- /dev/null
+++ b/src/i18n/ca/index.ts
@@ -0,0 +1,18 @@
+export default {
+  common: require('./common'),
+
+  screens: require('./screens'),
+  screenActions: require('./screens/actions'),
+  screenAnnouncements: require('./screens/announcements'),
+  screenCompose: require('./screens/compose'),
+  screenImageViewer: require('./screens/imageViewer'),
+  screenTabs: require('./screens/tabs'),
+
+  componentContextMenu: require('./components/contextMenu'),
+  componentEmojis: require('./components/emojis'),
+  componentInstance: require('./components/instance'),
+  componentMediaSelector: require('./components/mediaSelector'),
+  componentParse: require('./components/parse'),
+  componentRelationship: require('./components/relationship'),
+  componentTimeline: require('./components/timeline')
+}
diff --git a/src/i18n/i18n.ts b/src/i18n/i18n.ts
index 2bb82932..d0b71546 100644
--- a/src/i18n/i18n.ts
+++ b/src/i18n/i18n.ts
@@ -1,6 +1,7 @@
 import i18n from 'i18next'
 import { initReactI18next } from 'react-i18next'
 
+import ca from '@root/i18n/ca'
 import de from '@root/i18n/de'
 import en from '@root/i18n/en'
 import es from '@root/i18n/es'
@@ -19,6 +20,7 @@ import '@formatjs/intl-getcanonicallocales/polyfill'
 import '@formatjs/intl-locale/polyfill'
 
 import '@formatjs/intl-pluralrules/polyfill'
+import '@formatjs/intl-pluralrules/locale-data/ca'
 import '@formatjs/intl-pluralrules/locale-data/de'
 import '@formatjs/intl-pluralrules/locale-data/en'
 import '@formatjs/intl-pluralrules/locale-data/es'
@@ -33,6 +35,7 @@ import '@formatjs/intl-pluralrules/locale-data/vi'
 import '@formatjs/intl-pluralrules/locale-data/zh'
 
 import '@formatjs/intl-numberformat/polyfill'
+import '@formatjs/intl-numberformat/locale-data/ca'
 import '@formatjs/intl-numberformat/locale-data/de'
 import '@formatjs/intl-numberformat/locale-data/en'
 import '@formatjs/intl-numberformat/locale-data/es'
@@ -48,6 +51,7 @@ import '@formatjs/intl-numberformat/locale-data/zh-Hans'
 import '@formatjs/intl-numberformat/locale-data/zh-Hant'
 
 import '@formatjs/intl-datetimeformat/polyfill'
+import '@formatjs/intl-datetimeformat/locale-data/ca'
 import '@formatjs/intl-datetimeformat/locale-data/de'
 import '@formatjs/intl-datetimeformat/locale-data/en'
 import '@formatjs/intl-datetimeformat/locale-data/es'
@@ -64,6 +68,7 @@ import '@formatjs/intl-datetimeformat/locale-data/zh-Hant'
 import '@formatjs/intl-datetimeformat/add-all-tz'
 
 import '@formatjs/intl-relativetimeformat/polyfill'
+import '@formatjs/intl-relativetimeformat/locale-data/ca'
 import '@formatjs/intl-relativetimeformat/locale-data/de'
 import '@formatjs/intl-relativetimeformat/locale-data/en'
 import '@formatjs/intl-relativetimeformat/locale-data/es'
@@ -86,6 +91,7 @@ i18n.use(initReactI18next).init({
   defaultNS: 'common',
 
   resources: {
+    ca,
     de,
     en,
     es,
diff --git a/src/i18n/locales.ts b/src/i18n/locales.ts
index 0e13587a..44ef48dc 100644
--- a/src/i18n/locales.ts
+++ b/src/i18n/locales.ts
@@ -1,4 +1,5 @@
 const LOCALES = {
+  ca: 'Català',
   de: 'Deutsch',
   en: 'English',
   es: 'Español',

From 6146ecf7128328cefe50ab0528205eac844f1772 Mon Sep 17 00:00:00 2001
From: xmflsct <me@xmflsct.com>
Date: Sun, 4 Dec 2022 12:29:44 +0100
Subject: [PATCH 27/40] Fix git folder renaming

---
 src/components/{ContextMenu => contextMenu}/instance.ts | 0
 src/components/{ContextMenu => contextMenu}/share.ts    | 0
 src/components/{ContextMenu => contextMenu}/status.ts   | 0
 3 files changed, 0 insertions(+), 0 deletions(-)
 rename src/components/{ContextMenu => contextMenu}/instance.ts (100%)
 rename src/components/{ContextMenu => contextMenu}/share.ts (100%)
 rename src/components/{ContextMenu => contextMenu}/status.ts (100%)

diff --git a/src/components/ContextMenu/instance.ts b/src/components/contextMenu/instance.ts
similarity index 100%
rename from src/components/ContextMenu/instance.ts
rename to src/components/contextMenu/instance.ts
diff --git a/src/components/ContextMenu/share.ts b/src/components/contextMenu/share.ts
similarity index 100%
rename from src/components/ContextMenu/share.ts
rename to src/components/contextMenu/share.ts
diff --git a/src/components/ContextMenu/status.ts b/src/components/contextMenu/status.ts
similarity index 100%
rename from src/components/ContextMenu/status.ts
rename to src/components/contextMenu/status.ts

From e1e700543fb6a3598ddb9b535dcb9c32de7c19b6 Mon Sep 17 00:00:00 2001
From: xmflsct <me@xmflsct.com>
Date: Sun, 4 Dec 2022 12:57:03 +0100
Subject: [PATCH 28/40] Refine component account

---
 src/components/Account.tsx            | 99 ++++++++++++++-------------
 src/screens/Tabs/Me/List/Accounts.tsx |  2 +-
 2 files changed, 54 insertions(+), 47 deletions(-)

diff --git a/src/components/Account.tsx b/src/components/Account.tsx
index a65827dd..b2c7a058 100644
--- a/src/components/Account.tsx
+++ b/src/components/Account.tsx
@@ -5,22 +5,17 @@ import { TabLocalStackParamList } from '@utils/navigation/navigators'
 import { StyleConstants } from '@utils/styles/constants'
 import { useTheme } from '@utils/styles/ThemeManager'
 import React, { PropsWithChildren } from 'react'
-import { Pressable, View } from 'react-native'
+import { Pressable, PressableProps, View } from 'react-native'
 import GracefullyImage from './GracefullyImage'
+import Icon from './Icon'
 import CustomText from './Text'
 
 export interface Props {
   account: Mastodon.Account
-  Component?: typeof View | typeof Pressable
-  props?: {}
+  props?: PressableProps
 }
 
-const ComponentAccount: React.FC<PropsWithChildren & Props> = ({
-  account,
-  Component,
-  props,
-  children
-}) => {
+const ComponentAccount: React.FC<PropsWithChildren & Props> = ({ account, props, children }) => {
   const { colors } = useTheme()
   const navigation = useNavigation<StackNavigationProp<TabLocalStackParamList>>()
 
@@ -28,50 +23,62 @@ const ComponentAccount: React.FC<PropsWithChildren & Props> = ({
     props = { onPress: () => navigation.push('Tab-Shared-Account', { account }) }
   }
 
-  return React.createElement(
-    Component || Pressable,
-    {
-      ...props,
-      style: {
+  return (
+    <Pressable
+      {...props}
+      style={{
         flex: 1,
         paddingHorizontal: StyleConstants.Spacing.Global.PagePadding,
         paddingVertical: StyleConstants.Spacing.M,
         flexDirection: 'row',
         justifyContent: 'space-between',
         alignItems: 'center'
+      }}
+      children={
+        <>
+          <View style={{ flex: 1, flexDirection: 'row', alignItems: 'center' }}>
+            <GracefullyImage
+              uri={{ original: account.avatar, static: account.avatar_static }}
+              style={{
+                width: StyleConstants.Avatar.S,
+                height: StyleConstants.Avatar.S,
+                borderRadius: 6,
+                marginRight: StyleConstants.Spacing.S
+              }}
+            />
+            <View>
+              <CustomText numberOfLines={1}>
+                <ParseEmojis
+                  content={account.display_name || account.username}
+                  emojis={account.emojis}
+                  size='S'
+                  fontBold
+                />
+              </CustomText>
+              <CustomText
+                numberOfLines={1}
+                style={{
+                  marginTop: StyleConstants.Spacing.XS,
+                  color: colors.secondary
+                }}
+              >
+                @{account.acct}
+              </CustomText>
+            </View>
+          </View>
+          {props.onPress && !props.disabled ? (
+            <Icon
+              name='ChevronRight'
+              size={StyleConstants.Font.Size.L}
+              color={colors.secondary}
+              style={{ marginLeft: 8 }}
+            />
+          ) : (
+            children || null
+          )}
+        </>
       }
-    },
-    <View style={{ flex: 1, flexDirection: 'row', alignItems: 'center' }}>
-      <GracefullyImage
-        uri={{ original: account.avatar, static: account.avatar_static }}
-        style={{
-          width: StyleConstants.Avatar.S,
-          height: StyleConstants.Avatar.S,
-          borderRadius: 6,
-          marginRight: StyleConstants.Spacing.S
-        }}
-      />
-      <View>
-        <CustomText numberOfLines={1}>
-          <ParseEmojis
-            content={account.display_name || account.username}
-            emojis={account.emojis}
-            size='S'
-            fontBold
-          />
-        </CustomText>
-        <CustomText
-          numberOfLines={1}
-          style={{
-            marginTop: StyleConstants.Spacing.XS,
-            color: colors.secondary
-          }}
-        >
-          @{account.acct}
-        </CustomText>
-      </View>
-    </View>,
-    children
+    />
   )
 }
 
diff --git a/src/screens/Tabs/Me/List/Accounts.tsx b/src/screens/Tabs/Me/List/Accounts.tsx
index ca526283..be0fbfca 100644
--- a/src/screens/Tabs/Me/List/Accounts.tsx
+++ b/src/screens/Tabs/Me/List/Accounts.tsx
@@ -57,7 +57,6 @@ const TabMeListAccounts: React.FC<TabMeStackScreenProps<'Tab-Me-List-Accounts'>>
         <ComponentAccount
           key={index}
           account={item}
-          Component={View}
           children={
             <Button
               type='icon'
@@ -68,6 +67,7 @@ const TabMeListAccounts: React.FC<TabMeStackScreenProps<'Tab-Me-List-Accounts'>>
               }
             />
           }
+          props={{ disabled: true }}
         />
       )}
       ListEmptyComponent={

From c79caa6dc792da4db6cb17b8765f4cacf2fda6e7 Mon Sep 17 00:00:00 2001
From: xmflsct <me@xmflsct.com>
Date: Sun, 4 Dec 2022 13:26:36 +0100
Subject: [PATCH 29/40] Fixed #505

---
 .../contextMenu/{account.tsx => account.ts}   |  0
 src/components/contextMenu/at.ts              | 50 ++++++++++++++++
 src/i18n/en/components/contextMenu.json       |  4 ++
 src/screens/Compose.tsx                       |  4 +-
 src/screens/Compose/utils/parseState.ts       |  2 +-
 src/screens/Tabs/Me/Settings/Tooot.tsx        |  1 +
 .../Shared/Account/Information/Actions.tsx    | 58 +++++++++++--------
 src/utils/navigation/navigators.ts            |  2 +
 8 files changed, 95 insertions(+), 26 deletions(-)
 rename src/components/contextMenu/{account.tsx => account.ts} (100%)
 create mode 100644 src/components/contextMenu/at.ts

diff --git a/src/components/contextMenu/account.tsx b/src/components/contextMenu/account.ts
similarity index 100%
rename from src/components/contextMenu/account.tsx
rename to src/components/contextMenu/account.ts
diff --git a/src/components/contextMenu/at.ts b/src/components/contextMenu/at.ts
new file mode 100644
index 00000000..a94a8258
--- /dev/null
+++ b/src/components/contextMenu/at.ts
@@ -0,0 +1,50 @@
+import { useNavigation } from '@react-navigation/native'
+import { NativeStackNavigationProp } from '@react-navigation/native-stack'
+import { RootStackParamList } from '@utils/navigation/navigators'
+import { useTranslation } from 'react-i18next'
+
+const menuAt = ({ account }: { account: Mastodon.Account }): ContextMenu[][] => {
+  const { t } = useTranslation('componentContextMenu')
+  const navigation = useNavigation<NativeStackNavigationProp<RootStackParamList>>()
+
+  const menus: ContextMenu[][] = []
+
+  menus.push([
+    {
+      key: 'at-direct',
+      item: {
+        onSelect: () =>
+          navigation.navigate('Screen-Compose', {
+            type: 'conversation',
+            accts: [account.acct],
+            visibility: 'direct'
+          }),
+        disabled: false,
+        destructive: false,
+        hidden: false
+      },
+      title: t('at.direct'),
+      icon: 'envelope'
+    },
+    {
+      key: 'at-public',
+      item: {
+        onSelect: () =>
+          navigation.navigate('Screen-Compose', {
+            type: 'conversation',
+            accts: [account.acct],
+            visibility: 'public'
+          }),
+        disabled: false,
+        destructive: false,
+        hidden: false
+      },
+      title: t('at.public'),
+      icon: 'at'
+    }
+  ])
+
+  return menus
+}
+
+export default menuAt
diff --git a/src/i18n/en/components/contextMenu.json b/src/i18n/en/components/contextMenu.json
index 08b201d7..a6b5e27c 100644
--- a/src/i18n/en/components/contextMenu.json
+++ b/src/i18n/en/components/contextMenu.json
@@ -19,6 +19,10 @@
       "action": "Report and block user"
     }
   },
+  "at": {
+    "direct": "Direct message",
+    "public": "Public message"
+  },
   "copy": {
     "action": "Copy toot",
     "succeed": "Copied"
diff --git a/src/screens/Compose.tsx b/src/screens/Compose.tsx
index 8d8ee53c..594c5d12 100644
--- a/src/screens/Compose.tsx
+++ b/src/screens/Compose.tsx
@@ -259,7 +259,9 @@ const ScreenCompose: React.FC<RootStackScreenProps<'Screen-Compose'>> = ({
         type='text'
         content={
           params?.type
-            ? t(`heading.right.button.${params.type}`)
+            ? params.type === 'conversation' && params.visibility === 'direct'
+              ? t(`heading.right.button.${params.type}`)
+              : t('heading.right.button.default')
             : t('heading.right.button.default')
         }
         onPress={() => {
diff --git a/src/screens/Compose/utils/parseState.ts b/src/screens/Compose/utils/parseState.ts
index 3814347e..688c0e7c 100644
--- a/src/screens/Compose/utils/parseState.ts
+++ b/src/screens/Compose/utils/parseState.ts
@@ -92,7 +92,7 @@ const composeParseState = (
         ...composeInitialState,
         dirty: true,
         timestamp: Date.now(),
-        ...assignVisibility('direct')
+        ...assignVisibility(params.visibility || 'direct')
       }
   }
 }
diff --git a/src/screens/Tabs/Me/Settings/Tooot.tsx b/src/screens/Tabs/Me/Settings/Tooot.tsx
index ab15f365..a6fcf735 100644
--- a/src/screens/Tabs/Me/Settings/Tooot.tsx
+++ b/src/screens/Tabs/Me/Settings/Tooot.tsx
@@ -58,6 +58,7 @@ const SettingsTooot: React.FC = () => {
             navigation.navigate('Screen-Compose', {
               type: 'conversation',
               accts: ['tooot@xmflsct.com'],
+              visibility: 'direct',
               text:
                 '[' +
                 `${Platform.OS}/${Platform.Version}` +
diff --git a/src/screens/Tabs/Shared/Account/Information/Actions.tsx b/src/screens/Tabs/Shared/Account/Information/Actions.tsx
index e1086eac..85bcf734 100644
--- a/src/screens/Tabs/Shared/Account/Information/Actions.tsx
+++ b/src/screens/Tabs/Shared/Account/Information/Actions.tsx
@@ -1,4 +1,5 @@
 import Button from '@components/Button'
+import menuAt from '@components/contextMenu/at'
 import { RelationshipOutgoing } from '@components/Relationship'
 import { useNavigation } from '@react-navigation/native'
 import { useRelationshipQuery } from '@utils/queryHooks/relationship'
@@ -8,32 +9,13 @@ import React from 'react'
 import { useTranslation } from 'react-i18next'
 import { StyleSheet, View } from 'react-native'
 import { useSelector } from 'react-redux'
+import * as DropdownMenu from 'zeego/dropdown-menu'
 
 export interface Props {
   account: Mastodon.Account | undefined
   myInfo?: boolean
 }
 
-const Conversation = ({ account }: { account: Mastodon.Account }) => {
-  const navigation = useNavigation<any>()
-  const query = useRelationshipQuery({ id: account.id })
-
-  return query.data && !query.data.blocked_by ? (
-    <Button
-      round
-      type='icon'
-      content='Mail'
-      style={styles.actionLeft}
-      onPress={() =>
-        navigation.navigate('Screen-Compose', {
-          type: 'conversation',
-          accts: [account.acct]
-        })
-      }
-    />
-  ) : null
-}
-
 const AccountInformationActions: React.FC<Props> = ({ account, myInfo }) => {
   if (!account || account.suspended) {
     return null
@@ -71,10 +53,38 @@ const AccountInformationActions: React.FC<Props> = ({ account, myInfo }) => {
   const instanceAccount = useSelector(getInstanceAccount, () => true)
   const ownAccount = account?.id === instanceAccount?.id && account?.acct === instanceAccount?.acct
 
+  const query = useRelationshipQuery({ id: account.id })
+  const mAt = menuAt({ account })
+
   if (!ownAccount && account) {
     return (
       <View style={styles.base}>
-        <Conversation account={account} />
+        {query.data && !query.data.blocked_by ? (
+          <DropdownMenu.Root>
+            <DropdownMenu.Trigger>
+              <Button
+                round
+                type='icon'
+                content='AtSign'
+                style={{ marginRight: StyleConstants.Spacing.S }}
+                onPress={() => {}}
+              />
+            </DropdownMenu.Trigger>
+
+            <DropdownMenu.Content>
+              {mAt.map((mGroup, index) => (
+                <DropdownMenu.Group key={index}>
+                  {mGroup.map(menu => (
+                    <DropdownMenu.Item key={menu.key} {...menu.item}>
+                      <DropdownMenu.ItemTitle children={menu.title} />
+                      <DropdownMenu.ItemIcon iosIconName={menu.icon} />
+                    </DropdownMenu.Item>
+                  ))}
+                </DropdownMenu.Group>
+              ))}
+            </DropdownMenu.Content>
+          </DropdownMenu.Root>
+        ) : null}
         <RelationshipOutgoing id={account.id} />
       </View>
     )
@@ -86,9 +96,9 @@ const AccountInformationActions: React.FC<Props> = ({ account, myInfo }) => {
 const styles = StyleSheet.create({
   base: {
     alignSelf: 'flex-end',
-    flexDirection: 'row'
-  },
-  actionLeft: { marginRight: StyleConstants.Spacing.S }
+    flexDirection: 'row',
+    alignItems: 'center'
+  }
 })
 
 export default AccountInformationActions
diff --git a/src/utils/navigation/navigators.ts b/src/utils/navigation/navigators.ts
index dde46365..2560bf75 100644
--- a/src/utils/navigation/navigators.ts
+++ b/src/utils/navigation/navigators.ts
@@ -2,6 +2,7 @@ import { BottomTabScreenProps } from '@react-navigation/bottom-tabs'
 import { NavigatorScreenParams } from '@react-navigation/native'
 import { NativeStackScreenProps } from '@react-navigation/native-stack'
 import { StackNavigationProp } from '@react-navigation/stack'
+import { ComposeState } from '@screens/Compose/utils/types'
 import { QueryKeyTimeline } from '@utils/queryHooks/timeline'
 
 export type RootStackParamList = {
@@ -38,6 +39,7 @@ export type RootStackParamList = {
     | {
         type: 'conversation'
         accts: Mastodon.Account['acct'][]
+        visibility: ComposeState['visibility']
         text?: string // For contacting tooot only
       }
     | {

From 196fb05dea54b75455728bbc8f5c0c32fc4885eb Mon Sep 17 00:00:00 2001
From: xmflsct <me@xmflsct.com>
Date: Sun, 4 Dec 2022 13:37:42 +0100
Subject: [PATCH 30/40] Remove button animation

Not great
---
 src/components/Button.tsx | 29 +++++------------------------
 1 file changed, 5 insertions(+), 24 deletions(-)

diff --git a/src/components/Button.tsx b/src/components/Button.tsx
index 80049c5d..62ba3490 100644
--- a/src/components/Button.tsx
+++ b/src/components/Button.tsx
@@ -1,15 +1,8 @@
 import Icon from '@components/Icon'
 import { StyleConstants } from '@utils/styles/constants'
-import layoutAnimation from '@utils/styles/layoutAnimation'
 import { useTheme } from '@utils/styles/ThemeManager'
-import React, { useEffect, useMemo, useRef, useState } from 'react'
-import {
-  AccessibilityProps,
-  Pressable,
-  StyleProp,
-  View,
-  ViewStyle
-} from 'react-native'
+import React, { useMemo, useState } from 'react'
+import { AccessibilityProps, Pressable, StyleProp, View, ViewStyle } from 'react-native'
 import { Flow } from 'react-native-animated-spinkit'
 import CustomText from './Text'
 
@@ -57,15 +50,6 @@ const Button: React.FC<Props> = ({
 }) => {
   const { colors, theme } = useTheme()
 
-  const mounted = useRef(false)
-  useEffect(() => {
-    if (mounted.current) {
-      layoutAnimation()
-    } else {
-      mounted.current = true
-    }
-  }, [content, loading, disabled])
-
   const loadingSpinkit = useMemo(
     () => (
       <View style={{ position: 'absolute' }}>
@@ -120,8 +104,7 @@ const Button: React.FC<Props> = ({
             <CustomText
               style={{
                 color: mainColor,
-                fontSize:
-                  StyleConstants.Font.Size[size] * (size === 'L' ? 1.25 : 1),
+                fontSize: StyleConstants.Font.Size[size] * (size === 'L' ? 1.25 : 1),
                 opacity: loading ? 0 : 1
               }}
               fontWeight={fontBold ? 'Bold' : 'Normal'}
@@ -156,15 +139,13 @@ const Button: React.FC<Props> = ({
           borderColor: mainColor,
           backgroundColor: colorBackground,
           paddingVertical: StyleConstants.Spacing[spacing],
-          paddingHorizontal:
-            StyleConstants.Spacing[spacing] + StyleConstants.Spacing.XS,
+          paddingHorizontal: StyleConstants.Spacing[spacing] + StyleConstants.Spacing.XS,
           width: round && layoutHeight ? layoutHeight : undefined
         },
         customStyle
       ]}
       {...(round && {
-        onLayout: ({ nativeEvent }) =>
-          setLayoutHeight(nativeEvent.layout.height)
+        onLayout: ({ nativeEvent }) => setLayoutHeight(nativeEvent.layout.height)
       })}
       testID='base'
       onPress={onPress}

From 413bb4b76ff9cb0ebc2ca7246bfe54916d37d752 Mon Sep 17 00:00:00 2001
From: xmflsct <me@xmflsct.com>
Date: Sun, 4 Dec 2022 13:48:50 +0100
Subject: [PATCH 31/40] Fixed #506

---
 src/screens/Compose/EditAttachment/Root.tsx      | 2 --
 src/screens/Compose/Root/Header/SpoilerInput.tsx | 2 --
 src/screens/Tabs/Shared/Search.tsx               | 4 ++--
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/screens/Compose/EditAttachment/Root.tsx b/src/screens/Compose/EditAttachment/Root.tsx
index 431217e8..fcce19ed 100644
--- a/src/screens/Compose/EditAttachment/Root.tsx
+++ b/src/screens/Compose/EditAttachment/Root.tsx
@@ -73,8 +73,6 @@ const ComposeEditAttachmentRoot: React.FC<Props> = ({ index }) => {
             color: colors.primaryDefault
           }}
           onFocus={() => scrollViewRef.current?.scrollToEnd()}
-          autoCapitalize='none'
-          autoCorrect={false}
           maxLength={1500}
           multiline
           onChangeText={(e) =>
diff --git a/src/screens/Compose/Root/Header/SpoilerInput.tsx b/src/screens/Compose/Root/Header/SpoilerInput.tsx
index ed991158..644737ae 100644
--- a/src/screens/Compose/Root/Header/SpoilerInput.tsx
+++ b/src/screens/Compose/Root/Header/SpoilerInput.tsx
@@ -35,8 +35,6 @@ const ComposeSpoilerInput: React.FC = () => {
         fontSize: adaptedFontsize,
         lineHeight: adaptedLineheight
       }}
-      autoCapitalize='none'
-      autoCorrect={false}
       autoFocus
       enablesReturnKeyAutomatically
       multiline
diff --git a/src/screens/Tabs/Shared/Search.tsx b/src/screens/Tabs/Shared/Search.tsx
index 090d696e..ba7fa0d0 100644
--- a/src/screens/Tabs/Shared/Search.tsx
+++ b/src/screens/Tabs/Shared/Search.tsx
@@ -71,12 +71,12 @@ const TabSharedSearch: React.FC<TabSharedStackScreenProps<'Tab-Shared-Search'>>
               })}
               autoCapitalize='none'
               autoCorrect={false}
-              clearButtonMode='never'
+              clearButtonMode='always'
               keyboardType='web-search'
               onSubmitEditing={({ nativeEvent: { text } }) => navigation.setParams({ text })}
               placeholder={t('shared.search.header.placeholder')}
               placeholderTextColor={colors.secondary}
-              returnKeyType='go'
+              returnKeyType='search'
             />
           </View>
         )

From 24d57704b912f77ae18e1978aae5c3d61476ae83 Mon Sep 17 00:00:00 2001
From: Hanjiang Yu <delacroix.yu@gmail.com>
Date: Sun, 4 Dec 2022 20:48:52 +0800
Subject: [PATCH 32/40] Patch expo-av

---
 patches/expo-av+13.0.2.patch | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 patches/expo-av+13.0.2.patch

diff --git a/patches/expo-av+13.0.2.patch b/patches/expo-av+13.0.2.patch
new file mode 100644
index 00000000..72bf082a
--- /dev/null
+++ b/patches/expo-av+13.0.2.patch
@@ -0,0 +1,14 @@
+diff --git a/node_modules/expo-av/ios/EXAV/EXAudioSessionManager.m b/node_modules/expo-av/ios/EXAV/EXAudioSessionManager.m
+index 81dce13..8664b90 100644
+--- a/node_modules/expo-av/ios/EXAV/EXAudioSessionManager.m
++++ b/node_modules/expo-av/ios/EXAV/EXAudioSessionManager.m
+@@ -168,9 +168,6 @@ - (void)moduleDidBackground:(id)backgroundingModule
+   // compact doesn't work, that's why we need the `|| !pointer` above
+   // http://www.openradar.me/15396578
+   [_foregroundedModules compact];
+-
+-  // Any possible failures are silent
+-  [self _updateSessionConfiguration];
+ }
+ 
+ - (void)moduleDidForeground:(id)module

From 79246ff8214244c46e871dd7eb06c89a19b922d1 Mon Sep 17 00:00:00 2001
From: xmflsct <me@xmflsct.com>
Date: Sun, 4 Dec 2022 14:39:27 +0100
Subject: [PATCH 33/40] Refine logging

---
 src/api/general.ts                          |  3 +-
 src/api/handleError.ts                      | 31 -----------------
 src/api/helpers/index.ts                    | 38 ++++++++++++++++++---
 src/api/instance.ts                         |  3 +-
 src/api/tooot.ts                            | 15 ++++----
 src/screens/Compose.tsx                     |  5 ++-
 src/utils/push/useConnect.ts                | 16 +++------
 src/utils/slices/instances/push/register.ts |  3 +-
 8 files changed, 50 insertions(+), 64 deletions(-)
 delete mode 100644 src/api/handleError.ts

diff --git a/src/api/general.ts b/src/api/general.ts
index 29e49158..09eb3966 100644
--- a/src/api/general.ts
+++ b/src/api/general.ts
@@ -1,6 +1,5 @@
 import axios from 'axios'
-import handleError, { ctx } from './handleError'
-import { userAgent } from './helpers'
+import { ctx, handleError, userAgent } from './helpers'
 
 export type Params = {
   method: 'get' | 'post' | 'put' | 'delete'
diff --git a/src/api/handleError.ts b/src/api/handleError.ts
deleted file mode 100644
index efbff696..00000000
--- a/src/api/handleError.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-import chalk from 'chalk'
-
-export const ctx = new chalk.Instance({ level: 3 })
-
-const handleError = (error: any) => {
-  if (error?.response) {
-    // The request was made and the server responded with a status code
-    // that falls out of the range of 2xx
-    console.error(
-      ctx.bold(' API '),
-      ctx.bold('response'),
-      error.response.status,
-      error?.response.data?.error || error?.response.message || 'Unknown error'
-    )
-    return Promise.reject({
-      status: error?.response.status,
-      message: error?.response.data?.error || error?.response.message || 'Unknown error'
-    })
-  } else if (error?.request) {
-    // The request was made but no response was received
-    // `error.request` is an instance of XMLHttpRequest in the browser and an instance of
-    // http.ClientRequest in node.js
-    console.error(ctx.bold(' API '), ctx.bold('request'), error)
-    return Promise.reject()
-  } else {
-    console.error(ctx.bold(' API '), ctx.bold('internal'), error?.message)
-    return Promise.reject()
-  }
-}
-
-export default handleError
diff --git a/src/api/helpers/index.ts b/src/api/helpers/index.ts
index 799b7d11..2f057967 100644
--- a/src/api/helpers/index.ts
+++ b/src/api/helpers/index.ts
@@ -1,6 +1,36 @@
-import Constants from "expo-constants"
-import { Platform } from "react-native"
+import chalk from 'chalk'
+import Constants from 'expo-constants'
+import { Platform } from 'react-native'
 
-const userAgent = { 'User-Agent': `tooot/${Constants.expoConfig?.version} ${Platform.OS}/${Platform.Version}` }
+const userAgent = {
+  'User-Agent': `tooot/${Constants.expoConfig?.version} ${Platform.OS}/${Platform.Version}`
+}
 
-export { userAgent }
\ No newline at end of file
+const ctx = new chalk.Instance({ level: 3 })
+const handleError = (error: any) => {
+  if (error?.response) {
+    // The request was made and the server responded with a status code
+    // that falls out of the range of 2xx
+    console.error(
+      ctx.bold(' API '),
+      ctx.bold('response'),
+      error.response.status,
+      error?.response.data?.error || error?.response.message || 'Unknown error'
+    )
+    return Promise.reject({
+      status: error?.response.status,
+      message: error?.response.data?.error || error?.response.message || 'Unknown error'
+    })
+  } else if (error?.request) {
+    // The request was made but no response was received
+    // `error.request` is an instance of XMLHttpRequest in the browser and an instance of
+    // http.ClientRequest in node.js
+    console.error(ctx.bold(' API '), ctx.bold('request'), error)
+    return Promise.reject()
+  } else {
+    console.error(ctx.bold(' API '), ctx.bold('internal'), error?.message)
+    return Promise.reject()
+  }
+}
+
+export { ctx, handleError, userAgent }
diff --git a/src/api/instance.ts b/src/api/instance.ts
index 0126e4b1..270f88df 100644
--- a/src/api/instance.ts
+++ b/src/api/instance.ts
@@ -1,8 +1,7 @@
 import { RootState } from '@root/store'
 import axios, { AxiosRequestConfig } from 'axios'
 import li from 'li'
-import handleError, { ctx } from './handleError'
-import { userAgent } from './helpers'
+import { ctx, handleError, userAgent } from './helpers'
 
 export type Params = {
   method: 'get' | 'post' | 'put' | 'delete' | 'patch'
diff --git a/src/api/tooot.ts b/src/api/tooot.ts
index 94f2bb98..bfe6d8e3 100644
--- a/src/api/tooot.ts
+++ b/src/api/tooot.ts
@@ -1,8 +1,7 @@
 import * as Sentry from '@sentry/react-native'
 import { mapEnvironment } from '@utils/checkEnvironment'
 import axios from 'axios'
-import handleError, { ctx } from './handleError'
-import { userAgent } from './helpers'
+import { ctx, handleError, userAgent } from './helpers'
 
 export type Params = {
   method: 'get' | 'post' | 'put' | 'delete'
@@ -57,14 +56,12 @@ const apiTooot = async <T = unknown>({
       })
     })
     .catch(error => {
-      Sentry.setExtras({
-        API: 'tooot',
-        request: { url, params, body },
-        ...(error?.response && { response: error.response })
-      })
-      Sentry.captureMessage('API error', {
-        contexts: { errorObject: error }
+      Sentry.setContext('API request', { url, params, body })
+      Sentry.setContext('Error response', {
+        ...(error?.response && { response: error.response?._response })
       })
+      Sentry.setContext('Error object', { error })
+      Sentry.captureMessage('API error')
 
       return handleError(error)
     })
diff --git a/src/screens/Compose.tsx b/src/screens/Compose.tsx
index 594c5d12..9928c062 100644
--- a/src/screens/Compose.tsx
+++ b/src/screens/Compose.tsx
@@ -319,9 +319,8 @@ const ScreenCompose: React.FC<RootStackScreenProps<'Screen-Compose'>> = ({
                   ]
                 )
               } else {
-                Sentry.captureMessage('Compose posting', {
-                  contexts: { errorObject: error }
-                })
+                Sentry.setContext('Error object', { error })
+                Sentry.captureMessage('Posting error')
                 haptics('Error')
                 composeDispatch({ type: 'posting', payload: false })
                 Alert.alert(t('heading.right.alert.default.title'), undefined, [
diff --git a/src/utils/push/useConnect.ts b/src/utils/push/useConnect.ts
index a6fc3b09..a34df781 100644
--- a/src/utils/push/useConnect.ts
+++ b/src/utils/push/useConnect.ts
@@ -33,14 +33,11 @@ const pushUseConnect = () => {
     })
       .then(() => Notifications.setBadgeCountAsync(0))
       .catch(error => {
-        Sentry.setExtras({
-          API: 'tooot',
-          expoToken,
-          ...(error?.response && { response: error.response })
-        })
-        Sentry.captureMessage('Push connect error', {
-          contexts: { errorObject: error }
+        Sentry.setContext('Error response', {
+          ...(error?.response && { response: error.response?._response })
         })
+        Sentry.setContext('Error object', { error })
+        Sentry.captureMessage('Push connect error')
         Notifications.setBadgeCountAsync(0)
         if (error?.status == 404) {
           displayMessage({
@@ -84,10 +81,7 @@ const pushUseConnect = () => {
   }
 
   useEffect(() => {
-    Sentry.setExtras({
-      expoToken,
-      pushEnabledCount: pushEnabled
-    })
+    Sentry.setContext('Push', { expoToken, pushEnabledCount: pushEnabled.length })
 
     if (expoToken && pushEnabled.length) {
       connect()
diff --git a/src/utils/slices/instances/push/register.ts b/src/utils/slices/instances/push/register.ts
index 7fc592ea..dd82032c 100644
--- a/src/utils/slices/instances/push/register.ts
+++ b/src/utils/slices/instances/push/register.ts
@@ -74,8 +74,7 @@ const pushRegister = async (
   })
 
   if (!res.body.server_key?.length) {
-    Sentry.setExtras({
-      API: 'tooot',
+    Sentry.setContext('Push server key', {
       instance: instanceUri,
       resBody: res.body
     })

From 580ed84d67dbd2396d20242bd4a0f4fbaf6e63e1 Mon Sep 17 00:00:00 2001
From: xmflsct <me@xmflsct.com>
Date: Sun, 4 Dec 2022 14:39:44 +0100
Subject: [PATCH 34/40] New Crowdin updates (#503)

* New translations tabs.json (German)

* New translations tabs.json (Japanese)

* New translations tabs.json (Chinese Traditional)

* New translations tabs.json (Japanese)

* New translations contextMenu.json (Korean)

* New translations tabs.json (Korean)

* New translations common.json (Korean)

* New translations screens.json (Korean)

* New translations tabs.json (Korean)

* New translations tabs.json (Swedish)

* New translations contextMenu.json (German)

* New translations contextMenu.json (Italian)

* New translations contextMenu.json (Japanese)

* New translations contextMenu.json (Korean)

* New translations contextMenu.json (Chinese Simplified)

* New translations contextMenu.json (Chinese Traditional)

* New translations contextMenu.json (Vietnamese)

* New translations contextMenu.json (Portuguese, Brazilian)

* New translations contextMenu.json (French)

* New translations contextMenu.json (Polish)

* New translations contextMenu.json (Spanish)

* New translations contextMenu.json (Swedish)

* New translations contextMenu.json (Czech)

* New translations contextMenu.json (Dutch)

* New translations contextMenu.json (Catalan)

* New translations contextMenu.json (Chinese Simplified)
---
 src/i18n/ca/components/contextMenu.json      |  4 +
 src/i18n/cs/components/contextMenu.json      |  4 +
 src/i18n/de/components/contextMenu.json      |  4 +
 src/i18n/de/screens/tabs.json                |  2 +-
 src/i18n/es/components/contextMenu.json      |  4 +
 src/i18n/fr/components/contextMenu.json      |  4 +
 src/i18n/it/components/contextMenu.json      |  4 +
 src/i18n/ja/components/contextMenu.json      |  4 +
 src/i18n/ja/screens/tabs.json                |  2 +-
 src/i18n/ko/common.json                      | 14 ++--
 src/i18n/ko/components/contextMenu.json      | 12 ++-
 src/i18n/ko/screens.json                     |  2 +-
 src/i18n/ko/screens/tabs.json                | 82 ++++++++++----------
 src/i18n/nl/components/contextMenu.json      |  4 +
 src/i18n/pl/components/contextMenu.json      |  4 +
 src/i18n/pt_BR/components/contextMenu.json   |  4 +
 src/i18n/sv/components/contextMenu.json      |  4 +
 src/i18n/sv/screens/tabs.json                |  2 +-
 src/i18n/vi/components/contextMenu.json      |  4 +
 src/i18n/zh-Hans/components/contextMenu.json |  4 +
 src/i18n/zh-Hant/components/contextMenu.json |  4 +
 src/i18n/zh-Hant/screens/tabs.json           |  2 +-
 22 files changed, 117 insertions(+), 57 deletions(-)

diff --git a/src/i18n/ca/components/contextMenu.json b/src/i18n/ca/components/contextMenu.json
index ee0d8953..8a4a90a7 100644
--- a/src/i18n/ca/components/contextMenu.json
+++ b/src/i18n/ca/components/contextMenu.json
@@ -19,6 +19,10 @@
       "action": "Denuncia i bloqueja l'usuari"
     }
   },
+  "at": {
+    "direct": "",
+    "public": ""
+  },
   "copy": {
     "action": "Copia la publicació",
     "succeed": "Copiat"
diff --git a/src/i18n/cs/components/contextMenu.json b/src/i18n/cs/components/contextMenu.json
index 84daeaaf..89d1e76e 100644
--- a/src/i18n/cs/components/contextMenu.json
+++ b/src/i18n/cs/components/contextMenu.json
@@ -19,6 +19,10 @@
       "action": ""
     }
   },
+  "at": {
+    "direct": "",
+    "public": ""
+  },
   "copy": {
     "action": "",
     "succeed": ""
diff --git a/src/i18n/de/components/contextMenu.json b/src/i18n/de/components/contextMenu.json
index a5fb5fd2..f49b7a66 100644
--- a/src/i18n/de/components/contextMenu.json
+++ b/src/i18n/de/components/contextMenu.json
@@ -19,6 +19,10 @@
       "action": "Nutzer melden und blockieren"
     }
   },
+  "at": {
+    "direct": "",
+    "public": ""
+  },
   "copy": {
     "action": "Tröt kopieren",
     "succeed": "Kopiert"
diff --git a/src/i18n/de/screens/tabs.json b/src/i18n/de/screens/tabs.json
index 0edb41ac..aebe63d3 100644
--- a/src/i18n/de/screens/tabs.json
+++ b/src/i18n/de/screens/tabs.json
@@ -352,7 +352,7 @@
           }
         },
         "trending": {
-          "tags": ""
+          "tags": "Angesagte Tags"
         }
       },
       "sections": {
diff --git a/src/i18n/es/components/contextMenu.json b/src/i18n/es/components/contextMenu.json
index 00dcf472..fe8f71a9 100644
--- a/src/i18n/es/components/contextMenu.json
+++ b/src/i18n/es/components/contextMenu.json
@@ -19,6 +19,10 @@
       "action": "Reportar y bloquear usuario"
     }
   },
+  "at": {
+    "direct": "",
+    "public": ""
+  },
   "copy": {
     "action": "Copiar toot",
     "succeed": "Copiado"
diff --git a/src/i18n/fr/components/contextMenu.json b/src/i18n/fr/components/contextMenu.json
index f938cde1..3de56f9c 100644
--- a/src/i18n/fr/components/contextMenu.json
+++ b/src/i18n/fr/components/contextMenu.json
@@ -19,6 +19,10 @@
       "action": ""
     }
   },
+  "at": {
+    "direct": "",
+    "public": ""
+  },
   "copy": {
     "action": "Copier le Pouet",
     "succeed": "Copié"
diff --git a/src/i18n/it/components/contextMenu.json b/src/i18n/it/components/contextMenu.json
index 64ae83b7..7f216bf5 100644
--- a/src/i18n/it/components/contextMenu.json
+++ b/src/i18n/it/components/contextMenu.json
@@ -19,6 +19,10 @@
       "action": ""
     }
   },
+  "at": {
+    "direct": "",
+    "public": ""
+  },
   "copy": {
     "action": "",
     "succeed": "Copiato"
diff --git a/src/i18n/ja/components/contextMenu.json b/src/i18n/ja/components/contextMenu.json
index 9b4b5d61..560b7e92 100644
--- a/src/i18n/ja/components/contextMenu.json
+++ b/src/i18n/ja/components/contextMenu.json
@@ -19,6 +19,10 @@
       "action": "ユーザーの報告とブロック"
     }
   },
+  "at": {
+    "direct": "",
+    "public": ""
+  },
   "copy": {
     "action": "トゥートをコピー",
     "succeed": "コピー完了"
diff --git a/src/i18n/ja/screens/tabs.json b/src/i18n/ja/screens/tabs.json
index 4f0e761b..efa9e2c2 100644
--- a/src/i18n/ja/screens/tabs.json
+++ b/src/i18n/ja/screens/tabs.json
@@ -352,7 +352,7 @@
           }
         },
         "trending": {
-          "tags": ""
+          "tags": "トレンドタグ"
         }
       },
       "sections": {
diff --git a/src/i18n/ko/common.json b/src/i18n/ko/common.json
index ef6e5112..d6a3c406 100644
--- a/src/i18n/ko/common.json
+++ b/src/i18n/ko/common.json
@@ -3,13 +3,13 @@
     "OK": "확인",
     "apply": "적용",
     "cancel": "취소",
-    "discard": "",
-    "continue": "",
-    "delete": "",
-    "done": ""
+    "discard": "취소",
+    "continue": "계속",
+    "delete": "삭제",
+    "done": "완료"
   },
   "customEmoji": {
-    "accessibilityLabel": "커스텀 이모지 {{emoji}}"
+    "accessibilityLabel": "커스텀 에모지 {{emoji}}"
   },
   "message": {
     "success": {
@@ -24,7 +24,7 @@
   },
   "separator": ", ",
   "discard": {
-    "title": "",
-    "message": ""
+    "title": "변경 사항이 저장되지 않음",
+    "message": "변경 사항이 저장되지 않았습니다. 작업 내용 저장을 취소할까요?"
   }
 }
\ No newline at end of file
diff --git a/src/i18n/ko/components/contextMenu.json b/src/i18n/ko/components/contextMenu.json
index e0d0b445..976a20b2 100644
--- a/src/i18n/ko/components/contextMenu.json
+++ b/src/i18n/ko/components/contextMenu.json
@@ -3,10 +3,10 @@
   "account": {
     "title": "사용자 동작",
     "following": {
-      "action_false": "",
-      "action_true": ""
+      "action_false": "사용자 팔로우",
+      "action_true": "사용자 팔로우 해제"
     },
-    "inLists": "",
+    "inLists": "리스트의 사용자 관리",
     "mute": {
       "action_false": "사용자 뮤트",
       "action_true": "사용자 뮤트 해제"
@@ -16,9 +16,13 @@
       "action_true": "사용자 차단 해제"
     },
     "reports": {
-      "action": ""
+      "action": "사용자 신고 및 차단"
     }
   },
+  "at": {
+    "direct": "",
+    "public": ""
+  },
   "copy": {
     "action": "툿 복사",
     "succeed": "복사됨"
diff --git a/src/i18n/ko/screens.json b/src/i18n/ko/screens.json
index 20d2387b..e3390238 100644
--- a/src/i18n/ko/screens.json
+++ b/src/i18n/ko/screens.json
@@ -1,7 +1,7 @@
 {
   "screenshot": {
     "title": "개인정보 보호",
-    "message": "다른 사용자의 사용자 이름이나, 아바타 등의 정보를 유출하지 말아주세요. 고마워요!",
+    "message": "다른 사용자의 이름이나, 프로필 사진 등의 정보를 유출하지 말아주세요. 고마워요!",
     "button": "확인"
   },
   "localCorrupt": {
diff --git a/src/i18n/ko/screens/tabs.json b/src/i18n/ko/screens/tabs.json
index b07580a3..a8e1c69d 100644
--- a/src/i18n/ko/screens/tabs.json
+++ b/src/i18n/ko/screens/tabs.json
@@ -50,13 +50,13 @@
         "name": "목록: {{list}}"
       },
       "listAccounts": {
-        "name": ""
+        "name": "{{list}} 리스트의 사용자"
       },
       "listAdd": {
-        "name": ""
+        "name": "리스트에 추가"
       },
       "listEdit": {
-        "name": ""
+        "name": "리스트 상세 편집"
       },
       "lists": {
         "name": "목록"
@@ -97,27 +97,27 @@
       }
     },
     "listAccounts": {
-      "heading": "",
-      "error": "",
-      "empty": ""
+      "heading": "사용자 관리",
+      "error": "사용자를 리스트에서 제거",
+      "empty": "이 리스트에 추가된 사용자가 없어요"
     },
     "listEdit": {
-      "heading": "",
-      "title": "",
+      "heading": "리스트 상세 편집",
+      "title": "이름",
       "repliesPolicy": {
-        "heading": "",
+        "heading": "답장을 표시할 대상:",
         "options": {
-          "none": "",
-          "list": "",
-          "followed": ""
+          "none": "없음",
+          "list": "리스트의 사용자",
+          "followed": "모든 팔로우 중인 사용자"
         }
       }
     },
     "listDelete": {
-      "heading": "",
+      "heading": "리스트 삭제",
       "confirm": {
-        "title": "",
-        "message": ""
+        "title": "리스트 \"{{list}}\"를 삭제할까요?",
+        "message": "이 작업은 되돌릴 수 없습니다."
       }
     },
     "profile": {
@@ -127,18 +127,18 @@
       },
       "root": {
         "name": {
-          "title": "표시 이름"
+          "title": "사옹자 이름"
         },
         "avatar": {
           "title": "아바타",
-          "description": "400x400px으로 다운스케일되어요"
+          "description": "400x400px 크기로 조정돼요"
         },
         "header": {
           "title": "배너",
-          "description": "1500x500px으로 다운스케일되어요"
+          "description": "1500x500px 크기로 조정돼요"
         },
         "note": {
-          "title": "설명"
+          "title": "자기소개"
         },
         "fields": {
           "title": "메타데이터",
@@ -154,15 +154,15 @@
           }
         },
         "sensitive": {
-          "title": "미디어 민감함으로 포스트"
+          "title": "미디어를 민감함 표시 후 게시"
         },
         "lock": {
           "title": "계정 잠그기",
-          "description": "내가 직접 팔로워를 수락해야해요"
+          "description": "직접 승인한 사람만 나를 팔로우 할 수 있어요"
         },
         "bot": {
           "title": "봇 계정",
-          "description": "이 계정이 대부분 자동으로 작업을 수행하고 잘 확인하지 않는다는 것을 알려요."
+          "description": "이 계정이 대부분 자동으로 작업을 수행하고 잘 확인하지 않는다는 것을 알려요"
         }
       },
       "fields": {
@@ -180,17 +180,17 @@
       },
       "global": {
         "heading": "{{acct}} 활성화",
-        "description": "메시지는 tooot의 서버를 거쳐 라우트되어요"
+        "description": "메시지는 tooot의 서버를 거쳐 전달돼요"
       },
       "decode": {
         "heading": "메시지 세부 정보",
-        "description": "tooot의 서버를 거치는 메시지는 암호화되지만, 메시지를 서버에서 복호화하도록 설정할 수 있습니다. 서버의 소스는 오픈 소스이고, 로그하지 않습니다."
+        "description": "tooot의 서버를 거치는 메시지는 암호화되어 있지만, 서버에서 이를 복호화하도록 선택할 수 있어요. 서버의 소스 코드는 오픈 소스로 관리되며 로그를 남기지 않습니다."
       },
       "default": {
         "heading": "기본값"
       },
       "follow": {
-        "heading": "새 팔로워"
+        "heading": "새로운 팔로워"
       },
       "follow_request": {
         "heading": "팔로우 요청"
@@ -202,7 +202,7 @@
         "heading": "부스트됨"
       },
       "mention": {
-        "heading": "멘션했어요"
+        "heading": "멘션됨"
       },
       "poll": {
         "heading": "투표 업데이트"
@@ -210,7 +210,7 @@
       "status": {
         "heading": "구독한 사용자의 툿"
       },
-      "howitworks": "라우팅 방법 알아보기"
+      "howitworks": "메시지 라우팅 방식 더 알아보기"
     },
     "root": {
       "announcements": {
@@ -255,7 +255,7 @@
         "heading": "$t(me.stacks.language.name)"
       },
       "theme": {
-        "heading": "모양",
+        "heading": "테마",
         "options": {
           "auto": "시스템과 동일",
           "light": "밝은 모드",
@@ -296,7 +296,7 @@
       "instanceVersion": "마스토돈 버전 v{{version}}"
     },
     "switch": {
-      "existing": "로그인된 것 중 선택",
+      "existing": "로그인 한 계정 선택",
       "new": "인스턴스에 로그인"
     }
   },
@@ -318,15 +318,15 @@
         "default": "툿",
         "all": "툿과 답장"
       },
-      "suspended": "계정이 서버 관리자에 의해 정지되었어요."
+      "suspended": "계정이 서버 관리자에 의해 정지되었어요"
     },
     "accountInLists": {
-      "name": "",
-      "inLists": "",
-      "notInLists": ""
+      "name": "@{{username}}의 리스트",
+      "inLists": "포함된 리스트",
+      "notInLists": "다른 리스트"
     },
     "attachments": {
-      "name": "<0 /><1>\"의 미디어</1>"
+      "name": "<0 /><1>의 미디어</1>"
     },
     "hashtag": {
       "follow": "팔로우",
@@ -337,11 +337,11 @@
     },
     "search": {
       "header": {
-        "prefix": "무엇을",
-        "placeholder": "검색할까요..."
+        "prefix": "검색할",
+        "placeholder": "내용을 입력..."
       },
       "empty": {
-        "general": "키워드를 입력해 <bold>$t(screenTabs:shared.search.sections.accounts)</bold>, <bold>$t(screenTabs:shared.search.sections.hashtags)</bold>이나 <bold>$t(screenTabs:shared.search.sections.statuses)</bold>를 검색할 수 있어요",
+        "general": "키워드를 입력해 <bold>$t(screenTabs:shared.search.sections.accounts)</bold>, <bold>$t(screenTabs:shared.search.sections.hashtags)</bold>, 또는 <bold>$t(screenTabs:shared.search.sections.statuses)</bold> 등을 검색할 수 있어요",
         "advanced": {
           "header": "고급 검색",
           "example": {
@@ -352,7 +352,7 @@
           }
         },
         "trending": {
-          "tags": ""
+          "tags": "유행하는 태그"
         }
       },
       "sections": {
@@ -367,12 +367,12 @@
     },
     "users": {
       "accounts": {
-        "following": "팔로잉 {{count}}",
+        "following": "{{count}} 팔로잉",
         "followers": "{{count}} 팔로워"
       },
       "statuses": {
-        "reblogged_by": "{{count}} 부스트함",
-        "favourited_by": "{{count}} 즐겨찾기함"
+        "reblogged_by": "{{count}} 부스트",
+        "favourited_by": "{{count}} 즐겨찾기"
       }
     }
   }
diff --git a/src/i18n/nl/components/contextMenu.json b/src/i18n/nl/components/contextMenu.json
index c17a3a4f..9bb9f208 100644
--- a/src/i18n/nl/components/contextMenu.json
+++ b/src/i18n/nl/components/contextMenu.json
@@ -19,6 +19,10 @@
       "action": "Rapporteren en blokkeren"
     }
   },
+  "at": {
+    "direct": "",
+    "public": ""
+  },
   "copy": {
     "action": "Toot kopiëren",
     "succeed": "Gekopieerd"
diff --git a/src/i18n/pl/components/contextMenu.json b/src/i18n/pl/components/contextMenu.json
index 84daeaaf..89d1e76e 100644
--- a/src/i18n/pl/components/contextMenu.json
+++ b/src/i18n/pl/components/contextMenu.json
@@ -19,6 +19,10 @@
       "action": ""
     }
   },
+  "at": {
+    "direct": "",
+    "public": ""
+  },
   "copy": {
     "action": "",
     "succeed": ""
diff --git a/src/i18n/pt_BR/components/contextMenu.json b/src/i18n/pt_BR/components/contextMenu.json
index e0498625..5386e2cf 100644
--- a/src/i18n/pt_BR/components/contextMenu.json
+++ b/src/i18n/pt_BR/components/contextMenu.json
@@ -19,6 +19,10 @@
       "action": ""
     }
   },
+  "at": {
+    "direct": "",
+    "public": ""
+  },
   "copy": {
     "action": "",
     "succeed": "Copiado"
diff --git a/src/i18n/sv/components/contextMenu.json b/src/i18n/sv/components/contextMenu.json
index cf1c2b56..94fa5534 100644
--- a/src/i18n/sv/components/contextMenu.json
+++ b/src/i18n/sv/components/contextMenu.json
@@ -19,6 +19,10 @@
       "action": "Rapportera och blockera användare"
     }
   },
+  "at": {
+    "direct": "Direktmeddelande",
+    "public": "Offentligt meddelande"
+  },
   "copy": {
     "action": "Kopiera inlägg",
     "succeed": "Kopierat"
diff --git a/src/i18n/sv/screens/tabs.json b/src/i18n/sv/screens/tabs.json
index 9ae9726b..cd0b0e83 100644
--- a/src/i18n/sv/screens/tabs.json
+++ b/src/i18n/sv/screens/tabs.json
@@ -352,7 +352,7 @@
           }
         },
         "trending": {
-          "tags": ""
+          "tags": "Trendande hashtaggar"
         }
       },
       "sections": {
diff --git a/src/i18n/vi/components/contextMenu.json b/src/i18n/vi/components/contextMenu.json
index 8cedf106..cadfc401 100644
--- a/src/i18n/vi/components/contextMenu.json
+++ b/src/i18n/vi/components/contextMenu.json
@@ -19,6 +19,10 @@
       "action": "Báo cáo và chặn"
     }
   },
+  "at": {
+    "direct": "",
+    "public": ""
+  },
   "copy": {
     "action": "Sao chép tút",
     "succeed": "Đã sao chép"
diff --git a/src/i18n/zh-Hans/components/contextMenu.json b/src/i18n/zh-Hans/components/contextMenu.json
index 456b3e1c..908bae62 100644
--- a/src/i18n/zh-Hans/components/contextMenu.json
+++ b/src/i18n/zh-Hans/components/contextMenu.json
@@ -19,6 +19,10 @@
       "action": "举报并屏蔽用户"
     }
   },
+  "at": {
+    "direct": "私信",
+    "public": "公开信息"
+  },
   "copy": {
     "action": "复制嘟文",
     "succeed": "已复制"
diff --git a/src/i18n/zh-Hant/components/contextMenu.json b/src/i18n/zh-Hant/components/contextMenu.json
index 4280dd5c..296bbeb1 100644
--- a/src/i18n/zh-Hant/components/contextMenu.json
+++ b/src/i18n/zh-Hant/components/contextMenu.json
@@ -19,6 +19,10 @@
       "action": "檢舉並封鎖使用者"
     }
   },
+  "at": {
+    "direct": "私訊",
+    "public": "公開訊息"
+  },
   "copy": {
     "action": "複製嘟文",
     "succeed": "已複製"
diff --git a/src/i18n/zh-Hant/screens/tabs.json b/src/i18n/zh-Hant/screens/tabs.json
index f53da09a..73eef275 100644
--- a/src/i18n/zh-Hant/screens/tabs.json
+++ b/src/i18n/zh-Hant/screens/tabs.json
@@ -352,7 +352,7 @@
           }
         },
         "trending": {
-          "tags": ""
+          "tags": "熱門標籤"
         }
       },
       "sections": {

From fc06e4c6293486fc550e3a3fa64d00cb66d63a59 Mon Sep 17 00:00:00 2001
From: xmflsct <me@xmflsct.com>
Date: Sun, 4 Dec 2022 16:05:35 +0100
Subject: [PATCH 35/40] Update audio.ts

---
 src/startup/audio.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/startup/audio.ts b/src/startup/audio.ts
index 4b5aa9b6..3055cbfd 100644
--- a/src/startup/audio.ts
+++ b/src/startup/audio.ts
@@ -4,7 +4,7 @@ import log from './log'
 const audio = () => {
   log('log', 'audio', 'setting audio playback default options')
   Audio.setAudioModeAsync({
-    interruptionModeIOS: InterruptionModeIOS.MixWithOthers,
+    interruptionModeIOS: InterruptionModeIOS.DuckOthers,
     interruptionModeAndroid: InterruptionModeAndroid.DuckOthers,
     playsInSilentModeIOS: true,
     staysActiveInBackground: false

From b70ca924a17f4445d04dc75769e053d0b7864ed2 Mon Sep 17 00:00:00 2001
From: xmflsct <me@xmflsct.com>
Date: Sun, 4 Dec 2022 16:16:53 +0100
Subject: [PATCH 36/40] Fix wrong query key

---
 src/screens/Tabs/Shared/Account.tsx        | 2 +-
 src/screens/Tabs/Shared/AccountInLists.tsx | 4 ++--
 src/utils/queryHooks/account.ts            | 6 ++++--
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/screens/Tabs/Shared/Account.tsx b/src/screens/Tabs/Shared/Account.tsx
index 758071c0..635fcddb 100644
--- a/src/screens/Tabs/Shared/Account.tsx
+++ b/src/screens/Tabs/Shared/Account.tsx
@@ -81,7 +81,7 @@ const TabSharedAccount: React.FC<TabSharedStackScreenProps<'Tab-Shared-Account'>
         )
       }
     })
-  }, [])
+  }, [mAccount])
 
   const { data } = useAccountQuery({ id: account.id })
 
diff --git a/src/screens/Tabs/Shared/AccountInLists.tsx b/src/screens/Tabs/Shared/AccountInLists.tsx
index 8628c41c..4e7d8041 100644
--- a/src/screens/Tabs/Shared/AccountInLists.tsx
+++ b/src/screens/Tabs/Shared/AccountInLists.tsx
@@ -48,8 +48,8 @@ const TabSharedAccountInLists: React.FC<
       id: 'out',
       title: t('shared.accountInLists.notInLists'),
       data:
-        listsQuery?.data?.filter(
-          ({ id }) => !accountInListsQuery?.data?.filter(d => d.id === id)?.length
+        listsQuery.data?.filter(
+          ({ id }) => accountInListsQuery.data?.filter(d => d.id !== id).length
         ) || []
     }
   ]
diff --git a/src/utils/queryHooks/account.ts b/src/utils/queryHooks/account.ts
index 7187b437..565fa71b 100644
--- a/src/utils/queryHooks/account.ts
+++ b/src/utils/queryHooks/account.ts
@@ -27,7 +27,9 @@ const useAccountQuery = ({
 
 export type QueryKeyAccountInLists = ['AccountInLists', { id: Mastodon.Account['id'] }]
 
-const accountInListsQueryFunction = ({ queryKey }: QueryFunctionContext<QueryKeyAccount>) => {
+const accountInListsQueryFunction = ({
+  queryKey
+}: QueryFunctionContext<QueryKeyAccountInLists>) => {
   const { id } = queryKey[1]
 
   return apiInstance<Mastodon.List[]>({
@@ -42,7 +44,7 @@ const useAccountInListsQuery = ({
 }: QueryKeyAccount[1] & {
   options?: UseQueryOptions<Mastodon.List[], AxiosError>
 }) => {
-  const queryKey: QueryKeyAccount = ['Account', { ...queryKeyParams }]
+  const queryKey: QueryKeyAccountInLists = ['AccountInLists', { ...queryKeyParams }]
   return useQuery(queryKey, accountInListsQueryFunction, options)
 }
 

From cb7762d18cee45ef0d7ad70a6f70f64cdf5abfc2 Mon Sep 17 00:00:00 2001
From: xmflsct <me@xmflsct.com>
Date: Sun, 4 Dec 2022 17:56:47 +0100
Subject: [PATCH 37/40] Fix Sentry reports

---
 src/components/Parse/HTML.tsx                 |  2 +-
 src/components/Timeline/Default.tsx           |  4 ++--
 .../Timeline/Shared/HeaderShared/Account.tsx  | 10 +++-------
 .../Compose/Root/Footer/addAttachment.ts      | 16 +++++-----------
 src/screens/Compose/utils/post.ts             | 19 ++++---------------
 src/screens/Tabs/Me/Root/Collections.tsx      | 19 ++++++-------------
 src/screens/Tabs/Shared/Toot.tsx              |  2 ++
 src/utils/slices/instancesSlice.ts            |  2 +-
 8 files changed, 24 insertions(+), 50 deletions(-)

diff --git a/src/components/Parse/HTML.tsx b/src/components/Parse/HTML.tsx
index 828ba608..a2615163 100644
--- a/src/components/Parse/HTML.tsx
+++ b/src/components/Parse/HTML.tsx
@@ -126,7 +126,7 @@ const renderNode = ({
               }
             }}
           >
-            {(content && content !== href && content) || (showFullLink ? href : domain[1])}
+            {content && content !== href ? content : showFullLink ? href : domain?.[1]}
             {!shouldBeTag ? (
               <Icon
                 color={colors.blue}
diff --git a/src/components/Timeline/Default.tsx b/src/components/Timeline/Default.tsx
index 65b9d33d..9676ad6b 100644
--- a/src/components/Timeline/Default.tsx
+++ b/src/components/Timeline/Default.tsx
@@ -53,10 +53,10 @@ const TimelineDefault: React.FC<Props> = ({
   const status = item.reblog ? item.reblog : item
   const ownAccount = status.account?.id === instanceAccount?.id
   const [spoilerExpanded, setSpoilerExpanded] = useState(
-    instanceAccount.preferences['reading:expand:spoilers'] || false
+    instanceAccount?.preferences['reading:expand:spoilers'] || false
   )
   const spoilerHidden = status.spoiler_text?.length
-    ? !instanceAccount.preferences['reading:expand:spoilers'] && !spoilerExpanded
+    ? !instanceAccount?.preferences['reading:expand:spoilers'] && !spoilerExpanded
     : false
   const copiableContent = useRef<{ content: string; complete: boolean }>({
     content: '',
diff --git a/src/components/Timeline/Shared/HeaderShared/Account.tsx b/src/components/Timeline/Shared/HeaderShared/Account.tsx
index 5efe3bf9..991be557 100644
--- a/src/components/Timeline/Shared/HeaderShared/Account.tsx
+++ b/src/components/Timeline/Shared/HeaderShared/Account.tsx
@@ -20,23 +20,19 @@ const HeaderSharedAccount = React.memo(
       <View style={{ flexDirection: 'row', alignItems: 'center' }}>
         {withoutName ? null : (
           <CustomText
-            accessibilityHint={t(
-              'shared.header.shared.account.name.accessibilityHint'
-            )}
+            accessibilityHint={t('shared.header.shared.account.name.accessibilityHint')}
             style={{ marginRight: StyleConstants.Spacing.XS }}
             numberOfLines={1}
           >
             <ParseEmojis
               content={account?.display_name || account?.username}
-              emojis={account.emojis}
+              emojis={account?.emojis}
               fontBold
             />
           </CustomText>
         )}
         <CustomText
-          accessibilityHint={t(
-            'shared.header.shared.account.account.accessibilityHint'
-          )}
+          accessibilityHint={t('shared.header.shared.account.account.accessibilityHint')}
           style={{ flexShrink: 1, color: colors.secondary }}
           numberOfLines={1}
         >
diff --git a/src/screens/Compose/Root/Footer/addAttachment.ts b/src/screens/Compose/Root/Footer/addAttachment.ts
index 86104c42..391b8f4a 100644
--- a/src/screens/Compose/Root/Footer/addAttachment.ts
+++ b/src/screens/Compose/Root/Footer/addAttachment.ts
@@ -26,10 +26,10 @@ export const uploadAttachment = async ({
 }) => {
   const hash = await Crypto.digestStringAsync(
     Crypto.CryptoDigestAlgorithm.SHA256,
-    media.uri + Math.random()
+    media.uri + Math.random().toString()
   )
 
-  switch (media.type.split('/')[0]) {
+  switch (media.type?.split('/')[0] || '') {
     case 'image':
       composeDispatch({
         type: 'attachment/upload/start',
@@ -77,15 +77,11 @@ export const uploadAttachment = async ({
       payload: hash
     })
     Alert.alert(
-      i18next.t(
-        'screenCompose:content.root.actions.attachment.failed.alert.title'
-      ),
+      i18next.t('screenCompose:content.root.actions.attachment.failed.alert.title'),
       message,
       [
         {
-          text: i18next.t(
-            'screenCompose:content.root.actions.attachment.failed.alert.button'
-          ),
+          text: i18next.t('screenCompose:content.root.actions.attachment.failed.alert.button'),
           onPress: () => {}
         }
       ]
@@ -117,9 +113,7 @@ export const uploadAttachment = async ({
     })
     .catch((err: any) => {
       uploadFailed(
-        err?.message && typeof err?.message === 'string'
-          ? err?.message.slice(0, 50)
-          : undefined
+        err?.message && typeof err?.message === 'string' ? err?.message.slice(0, 50) : undefined
       )
     })
 }
diff --git a/src/screens/Compose/utils/post.ts b/src/screens/Compose/utils/post.ts
index 56209a67..348225ef 100644
--- a/src/screens/Compose/utils/post.ts
+++ b/src/screens/Compose/utils/post.ts
@@ -37,25 +37,16 @@ const composePost = async (
     formData.append('poll[multiple]', composeState.poll.multiple.toString())
   }
 
-  if (
-    composeState.attachments.uploads.filter(
-      upload => upload.remote && upload.remote.id
-    ).length
-  ) {
+  if (composeState.attachments.uploads.filter(upload => upload.remote && upload.remote.id).length) {
     formData.append('sensitive', composeState.attachments.sensitive.toString())
-    composeState.attachments.uploads.forEach(e =>
-      formData.append('media_ids[]', e.remote!.id!)
-    )
+    composeState.attachments.uploads.forEach(e => formData.append('media_ids[]', e.remote!.id!))
   }
 
   formData.append('visibility', composeState.visibility)
 
   return apiInstance<Mastodon.Status>({
     method: params?.type === 'edit' ? 'put' : 'post',
-    url:
-      params?.type === 'edit'
-        ? `statuses/${params.incomingStatus.id}`
-        : 'statuses',
+    url: params?.type === 'edit' ? `statuses/${params.incomingStatus.id}` : 'statuses',
     headers: {
       'Idempotency-Key': await Crypto.digestStringAsync(
         Crypto.CryptoDigestAlgorithm.SHA256,
@@ -70,9 +61,7 @@ const composePost = async (
           composeState.attachments.sensitive +
           composeState.attachments.uploads.map(upload => upload.remote?.id) +
           composeState.visibility +
-          (params?.type === 'edit' || params?.type === 'deleteEdit'
-            ? Math.random()
-            : '')
+          (params?.type === 'edit' || params?.type === 'deleteEdit' ? Math.random().toString() : '')
       )
     },
     body: formData
diff --git a/src/screens/Tabs/Me/Root/Collections.tsx b/src/screens/Tabs/Me/Root/Collections.tsx
index f9897c57..900be986 100644
--- a/src/screens/Tabs/Me/Root/Collections.tsx
+++ b/src/screens/Tabs/Me/Root/Collections.tsx
@@ -3,10 +3,7 @@ import { useNavigation } from '@react-navigation/native'
 import { useAppDispatch } from '@root/store'
 import { useAnnouncementQuery } from '@utils/queryHooks/announcement'
 import { useListsQuery } from '@utils/queryHooks/lists'
-import {
-  getInstanceMePage,
-  updateInstanceMePage
-} from '@utils/slices/instancesSlice'
+import { getInstanceMePage, updateInstanceMePage } from '@utils/slices/instancesSlice'
 import { getInstancePush } from '@utils/slices/instancesSlice'
 import React, { useEffect } from 'react'
 import { useTranslation } from 'react-i18next'
@@ -41,19 +38,17 @@ const Collections: React.FC = () => {
     }
   })
   useEffect(() => {
-    if (announcementsQuery.isSuccess) {
+    if (announcementsQuery.data) {
       dispatch(
         updateInstanceMePage({
           announcements: {
-            shown: announcementsQuery.data?.length ? true : false,
-            unread: announcementsQuery.data?.filter(
-              announcement => !announcement.read
-            ).length
+            shown: announcementsQuery.data.length ? true : false,
+            unread: announcementsQuery.data.filter(announcement => !announcement.read).length
           }
         })
       )
     }
-  }, [announcementsQuery.isSuccess, announcementsQuery.data?.length])
+  }, [announcementsQuery.data])
 
   const instancePush = useSelector(
     getInstancePush,
@@ -100,9 +95,7 @@ const Collections: React.FC = () => {
                 })
               : t('me.root.announcements.content.read')
           }
-          onPress={() =>
-            navigation.navigate('Screen-Announcements', { showAll: true })
-          }
+          onPress={() => navigation.navigate('Screen-Announcements', { showAll: true })}
         />
       ) : null}
       <MenuRow
diff --git a/src/screens/Tabs/Shared/Toot.tsx b/src/screens/Tabs/Shared/Toot.tsx
index dbd59181..196bccc5 100644
--- a/src/screens/Tabs/Shared/Toot.tsx
+++ b/src/screens/Tabs/Shared/Toot.tsx
@@ -51,6 +51,8 @@ const TabSharedToot: React.FC<TabSharedStackScreenProps<'Tab-Shared-Toot'>> = ({
           scrolled.current = true
           const pointer = flattenData.findIndex(({ id }) => id === toot.id)
           if (pointer < 1) return
+          const length = flRef.current?.props.data?.length
+          if (!length) return
           try {
             setTimeout(() => {
               try {
diff --git a/src/utils/slices/instancesSlice.ts b/src/utils/slices/instancesSlice.ts
index bb6ac578..c331301c 100644
--- a/src/utils/slices/instancesSlice.ts
+++ b/src/utils/slices/instancesSlice.ts
@@ -287,7 +287,7 @@ const instancesSlice = createSlice({
         const activeIndex = findInstanceActive(state.instances)
         state.instances[activeIndex].frequentEmojis = state.instances[
           activeIndex
-        ].frequentEmojis?.filter(emoji => {
+        ]?.frequentEmojis?.filter(emoji => {
           return action.payload?.find(
             e => e.shortcode === emoji.emoji.shortcode && e.url === emoji.emoji.url
           )

From e2e5e80aaf89793c38f157706ad1516c0cffc27f Mon Sep 17 00:00:00 2001
From: xmflsct <me@xmflsct.com>
Date: Sun, 4 Dec 2022 18:42:01 +0100
Subject: [PATCH 38/40] Remove previous fix attempts

#499
---
 .../Timeline/Shared/Attachment/AltText.tsx    |  4 +-
 .../Timeline/Shared/Attachment/Video.tsx      | 71 ++++++-------------
 2 files changed, 24 insertions(+), 51 deletions(-)

diff --git a/src/components/Timeline/Shared/Attachment/AltText.tsx b/src/components/Timeline/Shared/Attachment/AltText.tsx
index 59775ac5..ce1bf2a6 100644
--- a/src/components/Timeline/Shared/Attachment/AltText.tsx
+++ b/src/components/Timeline/Shared/Attachment/AltText.tsx
@@ -28,9 +28,7 @@ const AttachmentAltText: React.FC<Props> = ({ sensitiveShown, text }) => {
       type='text'
       content='ALT'
       fontBold
-      onPress={() => {
-        navigation.navigate('Screen-Actions', { type: 'alt_text', text })
-      }}
+      onPress={() => navigation.navigate('Screen-Actions', { type: 'alt_text', text })}
     />
   ) : null
 }
diff --git a/src/components/Timeline/Shared/Attachment/Video.tsx b/src/components/Timeline/Shared/Attachment/Video.tsx
index c868210f..518a5b78 100644
--- a/src/components/Timeline/Shared/Attachment/Video.tsx
+++ b/src/components/Timeline/Shared/Attachment/Video.tsx
@@ -1,8 +1,8 @@
 import Button from '@components/Button'
 import { StyleConstants } from '@utils/styles/constants'
 import { ResizeMode, Video, VideoFullscreenUpdate } from 'expo-av'
-import React, { useCallback, useEffect, useRef, useState } from 'react'
-import { AppState, AppStateStatus, Pressable, View } from 'react-native'
+import React, { useRef, useState } from 'react'
+import { Pressable, View } from 'react-native'
 import { Blurhash } from 'react-native-blurhash'
 import attachmentAspectRatio from './aspectRatio'
 import AttachmentAltText from './AltText'
@@ -27,46 +27,19 @@ const AttachmentVideo: React.FC<Props> = ({
   const [videoLoading, setVideoLoading] = useState(false)
   const [videoLoaded, setVideoLoaded] = useState(false)
   const [videoResizeMode, setVideoResizeMode] = useState<ResizeMode>(ResizeMode.COVER)
-  const playOnPress = useCallback(async () => {
+  const playOnPress = async () => {
     setVideoLoading(true)
     if (!videoLoaded) {
       await videoPlayer.current?.loadAsync({ uri: video.url })
     }
+    setVideoLoading(false)
+
     Platform.OS === 'android' && setVideoResizeMode(ResizeMode.CONTAIN)
     await videoPlayer.current?.presentFullscreenPlayer()
+
     videoPlayer.current?.playAsync()
-    setVideoLoading(false)
-    videoPlayer.current?.setOnPlaybackStatusUpdate(props => {
-      if (props.isLoaded) {
-        setVideoLoaded(true)
-      }
-    })
-  }, [videoLoaded])
-
-  const appState = useRef(AppState.currentState)
-  useEffect(() => {
-    const appState = AppState.addEventListener('change', _handleAppStateChange)
-
-    return () => appState.remove()
-  }, [])
-  const _handleAppStateChange = async (nextAppState: AppStateStatus) => {
-    if (appState.current.match(/active/) && nextAppState.match(/inactive/)) {
-      // await videoPlayer.current?.stopAsync()
-    } else if (gifv && appState.current.match(/background/) && nextAppState.match(/active/)) {
-      await videoPlayer.current?.setIsMutedAsync(true)
-      await videoPlayer.current?.playAsync()
-    }
-
-    appState.current = nextAppState
   }
 
-  const playerStatus = useRef<any>(null)
-  useEffect(() => {
-    videoPlayer.current?.setOnPlaybackStatusUpdate(playbackStatus => {
-      playerStatus.current = playbackStatus
-    })
-  }, [])
-
   return (
     <View
       style={{
@@ -79,11 +52,7 @@ const AttachmentVideo: React.FC<Props> = ({
       <Video
         accessibilityLabel={video.description}
         ref={videoPlayer}
-        style={{
-          width: '100%',
-          height: '100%',
-          opacity: sensitiveShown ? 0 : 1
-        }}
+        style={{ width: '100%', height: '100%', opacity: sensitiveShown ? 0 : 1 }}
         usePoster
         resizeMode={videoResizeMode}
         {...(gifv
@@ -98,11 +67,22 @@ const AttachmentVideo: React.FC<Props> = ({
               posterStyle: { resizeMode: ResizeMode.COVER }
             })}
         useNativeControls={false}
-        onFullscreenUpdate={async event => {
+        onFullscreenUpdate={event => {
           if (event.fullscreenUpdate === VideoFullscreenUpdate.PLAYER_DID_DISMISS) {
             Platform.OS === 'android' && setVideoResizeMode(ResizeMode.COVER)
             if (!gifv) {
-              await videoPlayer.current?.stopAsync()
+              videoPlayer.current?.pauseAsync()
+            } else {
+              videoPlayer.current?.playAsync()
+            }
+          }
+        }}
+        onPlaybackStatusUpdate={event => {
+          if (event.isLoaded) {
+            !videoLoaded && setVideoLoaded(true)
+
+            if (event.didJustFinish) {
+              videoPlayer.current?.setPositionAsync(0)
             }
           }
         }}
@@ -116,19 +96,14 @@ const AttachmentVideo: React.FC<Props> = ({
           justifyContent: 'center',
           alignItems: 'center'
         }}
+        disabled={gifv ? (sensitiveShown ? true : false) : true}
         onPress={gifv ? playOnPress : null}
       >
         {sensitiveShown ? (
           video.blurhash ? (
-            <Blurhash
-              blurhash={video.blurhash}
-              style={{
-                width: '100%',
-                height: '100%'
-              }}
-            />
+            <Blurhash blurhash={video.blurhash} style={{ width: '100%', height: '100%' }} />
           ) : null
-        ) : !gifv || (gifv && playerStatus.current === false) ? (
+        ) : !gifv ? (
           <Button
             round
             overlay

From 3d590d836d53877f311650f94dd82db8ab5ec149 Mon Sep 17 00:00:00 2001
From: xmflsct <me@xmflsct.com>
Date: Sun, 4 Dec 2022 20:08:55 +0100
Subject: [PATCH 39/40] Fix search debouncing

---
 src/screens/Tabs/Local.tsx                    |   7 +-
 src/screens/Tabs/Public.tsx                   |   7 +-
 src/screens/Tabs/Shared/Search/Empty.tsx      | 114 ++++++++++++++
 .../Shared/{Search.tsx => Search/index.tsx}   | 142 +++---------------
 src/utils/navigation/navigators.ts            |   2 +-
 5 files changed, 142 insertions(+), 130 deletions(-)
 create mode 100644 src/screens/Tabs/Shared/Search/Empty.tsx
 rename src/screens/Tabs/Shared/{Search.tsx => Search/index.tsx} (54%)

diff --git a/src/screens/Tabs/Local.tsx b/src/screens/Tabs/Local.tsx
index 7f885001..93bba91d 100644
--- a/src/screens/Tabs/Local.tsx
+++ b/src/screens/Tabs/Local.tsx
@@ -86,12 +86,7 @@ const TabLocal = React.memo(
                 accessibilityLabel={t('common.search.accessibilityLabel')}
                 accessibilityHint={t('common.search.accessibilityHint')}
                 content='Search'
-                onPress={() =>
-                  navigation.navigate('Tab-Local', {
-                    screen: 'Tab-Shared-Search',
-                    params: { text: undefined }
-                  })
-                }
+                onPress={() => navigation.navigate('Tab-Local', { screen: 'Tab-Shared-Search' })}
               />
             )
           }}
diff --git a/src/screens/Tabs/Public.tsx b/src/screens/Tabs/Public.tsx
index 65fbbd04..8865623e 100644
--- a/src/screens/Tabs/Public.tsx
+++ b/src/screens/Tabs/Public.tsx
@@ -50,12 +50,7 @@ const TabPublic = React.memo(
             accessibilityLabel={t('common.search.accessibilityLabel')}
             accessibilityHint={t('common.search.accessibilityHint')}
             content='Search'
-            onPress={() =>
-              navigation.navigate('Tab-Public', {
-                screen: 'Tab-Shared-Search',
-                params: { text: undefined }
-              })
-            }
+            onPress={() => navigation.navigate('Tab-Public', { screen: 'Tab-Shared-Search' })}
           />
         )
       }),
diff --git a/src/screens/Tabs/Shared/Search/Empty.tsx b/src/screens/Tabs/Shared/Search/Empty.tsx
new file mode 100644
index 00000000..34b61b01
--- /dev/null
+++ b/src/screens/Tabs/Shared/Search/Empty.tsx
@@ -0,0 +1,114 @@
+import ComponentHashtag from '@components/Hashtag'
+import ComponentSeparator from '@components/Separator'
+import CustomText from '@components/Text'
+import { useTrendsQuery } from '@utils/queryHooks/trends'
+import { StyleConstants } from '@utils/styles/constants'
+import { useTheme } from '@utils/styles/ThemeManager'
+import React from 'react'
+import { Trans, useTranslation } from 'react-i18next'
+import { StyleSheet, TextInput, View } from 'react-native'
+import { Circle } from 'react-native-animated-spinkit'
+
+export interface Props {
+  isLoading: boolean
+  inputRef: React.RefObject<TextInput>
+  setSearchTerm: React.Dispatch<React.SetStateAction<string>>
+}
+
+const SearchEmpty: React.FC<Props> = ({ isLoading, inputRef, setSearchTerm }) => {
+  const { colors } = useTheme()
+  const { t } = useTranslation('screenTabs')
+
+  const trendsTags = useTrendsQuery({ type: 'tags' })
+
+  return (
+    <View style={{ paddingVertical: StyleConstants.Spacing.Global.PagePadding }}>
+      {isLoading ? (
+        <View style={{ flex: 1, alignItems: 'center' }}>
+          <Circle size={StyleConstants.Font.Size.M * 1.25} color={colors.secondary} />
+        </View>
+      ) : (
+        <>
+          <View style={{ paddingHorizontal: StyleConstants.Spacing.Global.PagePadding }}>
+            <CustomText
+              fontStyle='S'
+              style={{
+                marginBottom: StyleConstants.Spacing.L,
+                color: colors.primaryDefault
+              }}
+            >
+              <Trans
+                i18nKey='screenTabs:shared.search.empty.general'
+                components={{
+                  bold: <CustomText fontWeight='Bold' />
+                }}
+              />
+            </CustomText>
+            <CustomText
+              style={[styles.emptyAdvanced, { color: colors.primaryDefault }]}
+              fontWeight='Bold'
+            >
+              {t('shared.search.empty.advanced.header')}
+            </CustomText>
+            <CustomText style={[styles.emptyAdvanced, { color: colors.primaryDefault }]}>
+              <CustomText style={{ color: colors.secondary }}>@username@domain</CustomText>
+              {'   '}
+              {t('shared.search.empty.advanced.example.account')}
+            </CustomText>
+            <CustomText style={[styles.emptyAdvanced, { color: colors.primaryDefault }]}>
+              <CustomText style={{ color: colors.secondary }}>#example</CustomText>
+              {'   '}
+              {t('shared.search.empty.advanced.example.hashtag')}
+            </CustomText>
+            <CustomText style={[styles.emptyAdvanced, { color: colors.primaryDefault }]}>
+              <CustomText style={{ color: colors.secondary }}>URL</CustomText>
+              {'   '}
+              {t('shared.search.empty.advanced.example.statusLink')}
+            </CustomText>
+            <CustomText style={[styles.emptyAdvanced, { color: colors.primaryDefault }]}>
+              <CustomText style={{ color: colors.secondary }}>URL</CustomText>
+              {'   '}
+              {t('shared.search.empty.advanced.example.accountLink')}
+            </CustomText>
+          </View>
+
+          <CustomText
+            style={{
+              color: colors.primaryDefault,
+              marginTop: StyleConstants.Spacing.M,
+              paddingHorizontal: StyleConstants.Spacing.Global.PagePadding
+            }}
+            fontWeight='Bold'
+          >
+            {t('shared.search.empty.trending.tags')}
+          </CustomText>
+          <View>
+            {trendsTags.data?.map((tag, index) => {
+              const hashtag = tag as Mastodon.Tag
+              return (
+                <React.Fragment key={index}>
+                  {index !== 0 ? <ComponentSeparator /> : null}
+                  <ComponentHashtag
+                    hashtag={hashtag}
+                    onPress={() => {
+                      inputRef.current?.setNativeProps({ text: `#${hashtag.name}` })
+                      setSearchTerm(`#${hashtag.name}`)
+                    }}
+                  />
+                </React.Fragment>
+              )
+            })}
+          </View>
+        </>
+      )}
+    </View>
+  )
+}
+
+const styles = StyleSheet.create({
+  emptyAdvanced: {
+    marginBottom: StyleConstants.Spacing.S
+  }
+})
+
+export default SearchEmpty
diff --git a/src/screens/Tabs/Shared/Search.tsx b/src/screens/Tabs/Shared/Search/index.tsx
similarity index 54%
rename from src/screens/Tabs/Shared/Search.tsx
rename to src/screens/Tabs/Shared/Search/index.tsx
index ba7fa0d0..2eee2d01 100644
--- a/src/screens/Tabs/Shared/Search.tsx
+++ b/src/screens/Tabs/Shared/Search/index.tsx
@@ -6,31 +6,22 @@ import CustomText from '@components/Text'
 import TimelineDefault from '@components/Timeline/Default'
 import { TabSharedStackScreenProps } from '@utils/navigation/navigators'
 import { useSearchQuery } from '@utils/queryHooks/search'
-import { useTrendsQuery } from '@utils/queryHooks/trends'
 import { StyleConstants } from '@utils/styles/constants'
 import { useTheme } from '@utils/styles/ThemeManager'
 import { debounce } from 'lodash'
-import React, { useEffect } from 'react'
+import React, { useEffect, useRef, useState } from 'react'
 import { Trans, useTranslation } from 'react-i18next'
-import {
-  KeyboardAvoidingView,
-  Platform,
-  SectionList,
-  StyleSheet,
-  TextInput,
-  View
-} from 'react-native'
-import { Circle } from 'react-native-animated-spinkit'
+import { KeyboardAvoidingView, Platform, SectionList, TextInput, View } from 'react-native'
+import SearchEmpty from './Empty'
 
 const TabSharedSearch: React.FC<TabSharedStackScreenProps<'Tab-Shared-Search'>> = ({
-  navigation,
-  route: {
-    params: { text }
-  }
+  navigation
 }) => {
   const { t } = useTranslation('screenTabs')
   const { colors, mode } = useTheme()
 
+  const inputRef = useRef<TextInput>(null)
+  const [searchTerm, setSearchTerm] = useState<string>('')
   useEffect(() => {
     navigation.setOptions({
       ...(Platform.OS === 'ios'
@@ -56,6 +47,7 @@ const TabSharedSearch: React.FC<TabSharedStackScreenProps<'Tab-Shared-Search'>>
               defaultValue={t('shared.search.header.prefix')}
             />
             <TextInput
+              ref={inputRef}
               accessibilityRole='search'
               keyboardAppearance={mode}
               style={{
@@ -65,15 +57,18 @@ const TabSharedSearch: React.FC<TabSharedStackScreenProps<'Tab-Shared-Search'>>
                 paddingLeft: StyleConstants.Spacing.XS
               }}
               autoFocus
-              value={text}
-              onChangeText={debounce((text: string) => navigation.setParams({ text }), 1000, {
-                trailing: true
-              })}
+              onChangeText={debounce(
+                text => {
+                  setSearchTerm(text)
+                  refetch()
+                },
+                1000,
+                { trailing: true }
+              )}
               autoCapitalize='none'
               autoCorrect={false}
               clearButtonMode='always'
               keyboardType='web-search'
-              onSubmitEditing={({ nativeEvent: { text } }) => navigation.setParams({ text })}
               placeholder={t('shared.search.header.placeholder')}
               placeholderTextColor={colors.secondary}
               returnKeyType='search'
@@ -82,25 +77,23 @@ const TabSharedSearch: React.FC<TabSharedStackScreenProps<'Tab-Shared-Search'>>
         )
       }
     })
-  }, [text, mode])
-
-  const trendsTags = useTrendsQuery({ type: 'tags' })
+  }, [mode])
 
   const mapKeyToTranslations = {
     accounts: t('shared.search.sections.accounts'),
     hashtags: t('shared.search.sections.hashtags'),
     statuses: t('shared.search.sections.statuses')
   }
-  const { status, data } = useSearchQuery<
+  const { isLoading, data, refetch } = useSearchQuery<
     {
       title: string
       translation: string
       data: any[]
     }[]
   >({
-    term: text,
+    term: searchTerm,
     options: {
-      enabled: text !== undefined,
+      enabled: !!searchTerm.length,
       select: data =>
         Object.keys(data as Mastodon.Results)
           .map(key => ({
@@ -110,6 +103,7 @@ const TabSharedSearch: React.FC<TabSharedStackScreenProps<'Tab-Shared-Search'>>
             // @ts-ignore
             data: data[key]
           }))
+          .filter(d => d.data.length)
           .sort((a, b) => {
             if (!a.data.length) {
               return 1
@@ -122,88 +116,6 @@ const TabSharedSearch: React.FC<TabSharedStackScreenProps<'Tab-Shared-Search'>>
     }
   })
 
-  const listEmpty = () => {
-    return (
-      <View style={{ paddingVertical: StyleConstants.Spacing.Global.PagePadding }}>
-        {status === 'loading' ? (
-          <View style={{ flex: 1, alignItems: 'center' }}>
-            <Circle size={StyleConstants.Font.Size.M * 1.25} color={colors.secondary} />
-          </View>
-        ) : (
-          <>
-            <View style={{ paddingHorizontal: StyleConstants.Spacing.Global.PagePadding }}>
-              <CustomText
-                fontStyle='S'
-                style={{
-                  marginBottom: StyleConstants.Spacing.L,
-                  color: colors.primaryDefault
-                }}
-              >
-                <Trans
-                  i18nKey='screenTabs:shared.search.empty.general'
-                  components={{
-                    bold: <CustomText fontWeight='Bold' />
-                  }}
-                />
-              </CustomText>
-              <CustomText
-                style={[styles.emptyAdvanced, { color: colors.primaryDefault }]}
-                fontWeight='Bold'
-              >
-                {t('shared.search.empty.advanced.header')}
-              </CustomText>
-              <CustomText style={[styles.emptyAdvanced, { color: colors.primaryDefault }]}>
-                <CustomText style={{ color: colors.secondary }}>@username@domain</CustomText>
-                {'   '}
-                {t('shared.search.empty.advanced.example.account')}
-              </CustomText>
-              <CustomText style={[styles.emptyAdvanced, { color: colors.primaryDefault }]}>
-                <CustomText style={{ color: colors.secondary }}>#example</CustomText>
-                {'   '}
-                {t('shared.search.empty.advanced.example.hashtag')}
-              </CustomText>
-              <CustomText style={[styles.emptyAdvanced, { color: colors.primaryDefault }]}>
-                <CustomText style={{ color: colors.secondary }}>URL</CustomText>
-                {'   '}
-                {t('shared.search.empty.advanced.example.statusLink')}
-              </CustomText>
-              <CustomText style={[styles.emptyAdvanced, { color: colors.primaryDefault }]}>
-                <CustomText style={{ color: colors.secondary }}>URL</CustomText>
-                {'   '}
-                {t('shared.search.empty.advanced.example.accountLink')}
-              </CustomText>
-            </View>
-
-            <CustomText
-              style={{
-                color: colors.primaryDefault,
-                marginTop: StyleConstants.Spacing.M,
-                paddingHorizontal: StyleConstants.Spacing.Global.PagePadding
-              }}
-              fontWeight='Bold'
-            >
-              {t('shared.search.empty.trending.tags')}
-            </CustomText>
-            <View>
-              {trendsTags.data?.map((tag, index) => {
-                const hashtag = tag as Mastodon.Tag
-                return (
-                  <React.Fragment key={index}>
-                    {index !== 0 ? <ComponentSeparator /> : null}
-                    <ComponentHashtag
-                      hashtag={hashtag}
-                      onPress={() => navigation.setParams({ text: `#${hashtag.name}` })}
-                    />
-                  </React.Fragment>
-                )
-              })}
-            </View>
-          </>
-        )}
-      </View>
-    )
-  }
-
   return (
     <KeyboardAvoidingView
       behavior={Platform.OS === 'ios' ? 'padding' : 'height'}
@@ -211,6 +123,7 @@ const TabSharedSearch: React.FC<TabSharedStackScreenProps<'Tab-Shared-Search'>>
     >
       <SectionList
         style={{ minHeight: '100%' }}
+        sections={data || []}
         renderItem={({ item, section }: { item: any; section: any }) => {
           switch (section.title) {
             case 'accounts':
@@ -224,8 +137,9 @@ const TabSharedSearch: React.FC<TabSharedStackScreenProps<'Tab-Shared-Search'>>
           }
         }}
         stickySectionHeadersEnabled
-        sections={data || []}
-        ListEmptyComponent={listEmpty()}
+        ListEmptyComponent={
+          <SearchEmpty isLoading={isLoading} inputRef={inputRef} setSearchTerm={setSearchTerm} />
+        }
         keyboardShouldPersistTaps='always'
         renderSectionHeader={({ section: { translation } }) => (
           <View
@@ -257,7 +171,7 @@ const TabSharedSearch: React.FC<TabSharedStackScreenProps<'Tab-Shared-Search'>>
               <CustomText fontStyle='S' style={{ textAlign: 'center', color: colors.secondary }}>
                 <Trans
                   i18nKey='screenTabs:shared.search.notFound'
-                  values={{ searchTerm: text, type: translation }}
+                  values={{ searchTerm, type: translation }}
                   components={{
                     bold: <CustomText fontWeight='Bold' />
                   }}
@@ -274,10 +188,4 @@ const TabSharedSearch: React.FC<TabSharedStackScreenProps<'Tab-Shared-Search'>>
   )
 }
 
-const styles = StyleSheet.create({
-  emptyAdvanced: {
-    marginBottom: StyleConstants.Spacing.S
-  }
-})
-
 export default TabSharedSearch
diff --git a/src/utils/navigation/navigators.ts b/src/utils/navigation/navigators.ts
index 2560bf75..8c7f70ee 100644
--- a/src/utils/navigation/navigators.ts
+++ b/src/utils/navigation/navigators.ts
@@ -104,7 +104,7 @@ export type TabSharedStackParamList = {
   'Tab-Shared-History': {
     id: Mastodon.Status['id']
   }
-  'Tab-Shared-Search': { text: string | undefined }
+  'Tab-Shared-Search': undefined
   'Tab-Shared-Toot': {
     toot: Mastodon.Status
     rootQueryKey?: QueryKeyTimeline

From a901fdb9ffb2b22bf3f32f642e77a3e4a91a9c4b Mon Sep 17 00:00:00 2001
From: xmflsct <me@xmflsct.com>
Date: Sun, 4 Dec 2022 20:09:38 +0100
Subject: [PATCH 40/40] New Crowdin updates (#509)

* New translations contextMenu.json (German)

* New translations tabs.json (Chinese Traditional)
---
 src/i18n/de/components/contextMenu.json | 4 ++--
 src/i18n/zh-Hant/screens/tabs.json      | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/i18n/de/components/contextMenu.json b/src/i18n/de/components/contextMenu.json
index f49b7a66..09a0beb2 100644
--- a/src/i18n/de/components/contextMenu.json
+++ b/src/i18n/de/components/contextMenu.json
@@ -20,8 +20,8 @@
     }
   },
   "at": {
-    "direct": "",
-    "public": ""
+    "direct": "Direktnachricht",
+    "public": "Öffentliche Nachricht"
   },
   "copy": {
     "action": "Tröt kopieren",
diff --git a/src/i18n/zh-Hant/screens/tabs.json b/src/i18n/zh-Hant/screens/tabs.json
index 73eef275..50c3f12e 100644
--- a/src/i18n/zh-Hant/screens/tabs.json
+++ b/src/i18n/zh-Hant/screens/tabs.json
@@ -329,8 +329,8 @@
       "name": "<0 /><1>的媒體</1>"
     },
     "hashtag": {
-      "follow": "追蹤",
-      "unfollow": "取消追蹤"
+      "follow": "跟隨",
+      "unfollow": "取消跟隨"
     },
     "history": {
       "name": "編輯歷史"