Merge pull request #160 from tooot-app/main

Pre-release v2.2
2021-09-16 23:02:13 +02:00 · 2021-09-16 23:02:13 +02:00 · a158fa93d8
parent 492b77b1bb b3b8cf1dad
commit a158fa93d8
79 changed files with 4171 additions and 5138 deletions
--- a/VERSIONING.md
+++ b/VERSIONING.md
@ -5,7 +5,7 @@
  * A new app store version has to be submitted.
  * Outdated versions in principle do not receive further OTA updates.

-## Minor releases - App Store and OTA
+## Minor releases - App Store

 "Minor releases" are artifacts published as `?.y.?`:
  * An artifact can be released as `?.y.?` when there is no change nor update made to the native modules.
@ -21,11 +21,12 @@

 ## OTA release channels

-  * `MAJOR-environment`. Environments include `release`, `candidate` and `development`.
+  * `MAJOR.MINOR-environment`. Environments include `release`, `candidate` and `development`.

 ## Major versions mapping to native module versions

-| Major version | Native module version | Expo version |
-| :-----------: | :-------------------: | :----------: |
-| `0`           | `210201`              | `40.0.0`     |
-| `1`           | `210317`              | `40.0.0`     |
+| Version | Native module version | Expo version |
+| :------:| :-------------------: | :----------: |
+| `0-`    | `210201`              | `40.0.0`     |
+| `1-`    | `210317`              | `40.0.0`     |
+| `2.2`   | `210916`              | `41.0.0`     |
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@ -8,7 +8,7 @@ ensure_env_vars(
 VERSIONS = read_json( json_path: "./package.json" )[:versions]
 ENVIRONMENT = ENV["ENVIRONMENT"]
 VERSION = "#{VERSIONS[:major]}.#{VERSIONS[:minor]}"
-RELEASE_CHANNEL = "#{VERSIONS[:major]}-#{ENVIRONMENT}"
+RELEASE_CHANNEL = "#{VERSIONS[:major]}.#{VERSIONS[:minor]}-#{ENVIRONMENT}"
 BUILD_NUMBER = "#{Time.now.strftime("%y%m%d")}#{ENV["GITHUB_RUN_NUMBER"]}"
 GITHUB_REPO = "tooot-app/app"
 case ENVIRONMENT
--- a/ios/File.swift
+++ b/ios/File.swift
@ -2,7 +2,7 @@
 //  File.swift
 //  tooot
 //
-//  Created by Zheng Zhiyuan (SEBD) on 2021-03-15.
+//  Created by Zhiyuan Zheng on 2021-08-22.
 //

 import Foundation
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@ -1,85 +1,96 @@
 PODS:
  - boost-for-react-native (1.63.0)
  - DoubleConversion (1.1.6)
-  - EXApplication (3.1.2):
+  - EXApplication (3.2.0):
    - UMCore
-  - EXAV (9.1.2):
+  - EXAV (9.2.3):
+    - ExpoModulesCore
    - UMCore
-    - UMFileSystemInterface
-    - UMPermissionsInterface
-  - EXConstants (10.1.3):
-    - UMConstantsInterface
+  - EXConstants (11.0.2):
+    - ExpoModulesCore
    - UMCore
-  - EXCrypto (9.1.0):
+  - EXCrypto (9.2.0):
    - UMCore
-  - EXDevice (2.4.0):
+  - EXDevice (3.3.0):
    - UMCore
-  - EXErrorRecovery (2.1.0):
+  - EXErrorRecovery (2.2.0):
    - UMCore
-  - EXFileSystem (11.0.2):
+  - EXFileSystem (11.1.3):
+    - ExpoModulesCore
    - UMCore
-    - UMFileSystemInterface
-  - EXFirebaseAnalytics (4.0.2):
+  - EXFirebaseAnalytics (4.1.0):
    - EXFirebaseCore
    - Firebase/Core (= 7.7.0)
    - UMCore
-  - EXFirebaseCore (3.0.0):
+  - EXFirebaseCore (3.1.0):
    - Firebase/Core (= 7.7.0)
    - UMCore
-  - EXFont (9.1.0):
+  - EXFont (9.2.1):
+    - ExpoModulesCore
    - UMCore
-    - UMFontInterface
-  - EXHaptics (10.0.0):
+  - EXHaptics (10.1.0):
    - UMCore
-  - EXImageLoader (2.1.1):
+  - EXImageLoader (2.2.0):
+    - ExpoModulesCore
    - React-Core
    - UMCore
-    - UMImageLoaderInterface
-  - EXImageManipulator (9.1.0):
+  - EXImageManipulator (9.2.2):
+    - ExpoModulesCore
    - UMCore
-    - UMFileSystemInterface
-    - UMImageLoaderInterface
-  - EXImagePicker (10.1.4):
+  - EXImagePicker (10.2.3):
+    - ExpoModulesCore
    - UMCore
-    - UMFileSystemInterface
-    - UMPermissionsInterface
-  - EXKeepAwake (9.1.2):
+  - EXKeepAwake (9.2.0):
    - UMCore
-  - EXLocalization (10.1.0):
+  - EXLocalization (10.2.0):
    - UMCore
-  - EXNotifications (0.11.6):
+  - EXNotifications (0.12.3):
+    - ExpoModulesCore
    - UMCore
-    - UMPermissionsInterface
-  - EXPermissions (12.0.1):
+  - EXPermissions (12.1.1):
+    - ExpoModulesCore
    - UMCore
-    - UMPermissionsInterface
-  - EXRandom (11.1.2):
+  - ExpoModulesCore (0.2.0):
+    - ExpoModulesCore/Core (= 0.2.0)
+    - ExpoModulesCore/Interfaces (= 0.2.0)
+    - UMCore
+  - ExpoModulesCore/Core (0.2.0):
+    - UMCore
+  - ExpoModulesCore/Interfaces (0.2.0):
+    - ExpoModulesCore/Core
+    - UMCore
+  - EXRandom (11.2.0):
    - React-Core
-  - EXScreenCapture (3.1.0):
+  - EXScreenCapture (3.2.0):
    - UMCore
-  - EXSecureStore (10.1.0):
+  - EXSecureStore (10.2.0):
    - UMCore
-  - EXSplashScreen (0.10.2):
+  - EXSplashScreen (0.11.4):
    - React-Core
    - UMCore
-  - EXStoreReview (4.0.2):
+  - EXStoreReview (4.1.0):
    - UMCore
-  - EXUpdates (0.3.5):
-    - React
+  - EXStructuredHeaders (1.1.1):
    - UMCore
-  - EXVideoThumbnails (5.1.0):
+  - EXUpdates (0.8.5):
+    - EXStructuredHeaders
+    - EXUpdatesInterface
+    - React-Core
    - UMCore
-    - UMFileSystemInterface
-  - EXWebBrowser (9.1.0):
+  - EXUpdatesInterface (0.2.2)
+  - EXVideoThumbnails (5.2.1):
+    - ExpoModulesCore
    - UMCore
-  - FBLazyVector (0.64.1)
-  - FBReactNativeSpec (0.64.1):
+  - EXWebBrowser (9.2.0):
+    - UMCore
+  - FBLazyVector (0.64.2)
+  - FBReactNativeSpec (0.64.2):
    - RCT-Folly (= 2020.01.13.00)
-    - RCTRequired (= 0.64.1)
-    - RCTTypeSafety (= 0.64.1)
-    - React-Core (= 0.64.1)
-    - React-jsi (= 0.64.1)
-    - ReactCommon/turbomodule/core (= 0.64.1)
+    - RCTRequired (= 0.64.2)
+    - RCTTypeSafety (= 0.64.2)
+    - React-Core (= 0.64.2)
+    - React-jsi (= 0.64.2)
+    - ReactCommon/turbomodule/core (= 0.64.2)
  - Firebase/Core (7.7.0):
    - Firebase/CoreOnly
    - FirebaseAnalytics (= 7.7.0)
@ -119,24 +130,24 @@ PODS:
    - GoogleUtilities/Environment (~> 7.2)
    - nanopb (~> 2.30907.0)
    - PromisesObjC (~> 1.2)
-  - GoogleUtilities/AppDelegateSwizzler (7.4.1):
+  - GoogleUtilities/AppDelegateSwizzler (7.5.1):
    - GoogleUtilities/Environment
    - GoogleUtilities/Logger
    - GoogleUtilities/Network
-  - GoogleUtilities/Environment (7.4.1):
-    - PromisesObjC (~> 1.2)
-  - GoogleUtilities/Logger (7.4.1):
+  - GoogleUtilities/Environment (7.5.1):
+    - PromisesObjC (< 3.0, >= 1.2)
+  - GoogleUtilities/Logger (7.5.1):
    - GoogleUtilities/Environment
-  - GoogleUtilities/MethodSwizzler (7.4.1):
+  - GoogleUtilities/MethodSwizzler (7.5.1):
    - GoogleUtilities/Logger
-  - GoogleUtilities/Network (7.4.1):
+  - GoogleUtilities/Network (7.5.1):
    - GoogleUtilities/Logger
    - "GoogleUtilities/NSData+zlib"
    - GoogleUtilities/Reachability
-  - "GoogleUtilities/NSData+zlib (7.4.1)"
-  - GoogleUtilities/Reachability (7.4.1):
+  - "GoogleUtilities/NSData+zlib (7.5.1)"
+  - GoogleUtilities/Reachability (7.5.1):
    - GoogleUtilities/Logger
-  - GoogleUtilities/UserDefaults (7.4.1):
+  - GoogleUtilities/UserDefaults (7.5.1):
    - GoogleUtilities/Logger
  - hermes-engine (0.7.2)
  - libevent (2.1.12)
@ -169,289 +180,287 @@ PODS:
    - DoubleConversion
    - glog
    - libevent
-  - RCTRequired (0.64.1)
-  - RCTTypeSafety (0.64.1):
-    - FBLazyVector (= 0.64.1)
+  - RCTRequired (0.64.2)
+  - RCTTypeSafety (0.64.2):
+    - FBLazyVector (= 0.64.2)
    - RCT-Folly (= 2020.01.13.00)
-    - RCTRequired (= 0.64.1)
-    - React-Core (= 0.64.1)
-  - React (0.64.1):
-    - React-Core (= 0.64.1)
-    - React-Core/DevSupport (= 0.64.1)
-    - React-Core/RCTWebSocket (= 0.64.1)
-    - React-RCTActionSheet (= 0.64.1)
-    - React-RCTAnimation (= 0.64.1)
-    - React-RCTBlob (= 0.64.1)
-    - React-RCTImage (= 0.64.1)
-    - React-RCTLinking (= 0.64.1)
-    - React-RCTNetwork (= 0.64.1)
-    - React-RCTSettings (= 0.64.1)
-    - React-RCTText (= 0.64.1)
-    - React-RCTVibration (= 0.64.1)
-  - React-callinvoker (0.64.1)
-  - React-Core (0.64.1):
+    - RCTRequired (= 0.64.2)
+    - React-Core (= 0.64.2)
+  - React (0.64.2):
+    - React-Core (= 0.64.2)
+    - React-Core/DevSupport (= 0.64.2)
+    - React-Core/RCTWebSocket (= 0.64.2)
+    - React-RCTActionSheet (= 0.64.2)
+    - React-RCTAnimation (= 0.64.2)
+    - React-RCTBlob (= 0.64.2)
+    - React-RCTImage (= 0.64.2)
+    - React-RCTLinking (= 0.64.2)
+    - React-RCTNetwork (= 0.64.2)
+    - React-RCTSettings (= 0.64.2)
+    - React-RCTText (= 0.64.2)
+    - React-RCTVibration (= 0.64.2)
+  - React-callinvoker (0.64.2)
+  - React-Core (0.64.2):
    - glog
    - RCT-Folly (= 2020.01.13.00)
-    - React-Core/Default (= 0.64.1)
-    - React-cxxreact (= 0.64.1)
-    - React-jsi (= 0.64.1)
-    - React-jsiexecutor (= 0.64.1)
-    - React-perflogger (= 0.64.1)
+    - React-Core/Default (= 0.64.2)
+    - React-cxxreact (= 0.64.2)
+    - React-jsi (= 0.64.2)
+    - React-jsiexecutor (= 0.64.2)
+    - React-perflogger (= 0.64.2)
    - Yoga
-  - React-Core/CoreModulesHeaders (0.64.1):
+  - React-Core/CoreModulesHeaders (0.64.2):
    - glog
    - RCT-Folly (= 2020.01.13.00)
    - React-Core/Default
-    - React-cxxreact (= 0.64.1)
-    - React-jsi (= 0.64.1)
-    - React-jsiexecutor (= 0.64.1)
-    - React-perflogger (= 0.64.1)
+    - React-cxxreact (= 0.64.2)
+    - React-jsi (= 0.64.2)
+    - React-jsiexecutor (= 0.64.2)
+    - React-perflogger (= 0.64.2)
    - Yoga
-  - React-Core/Default (0.64.1):
+  - React-Core/Default (0.64.2):
    - glog
    - RCT-Folly (= 2020.01.13.00)
-    - React-cxxreact (= 0.64.1)
-    - React-jsi (= 0.64.1)
-    - React-jsiexecutor (= 0.64.1)
-    - React-perflogger (= 0.64.1)
+    - React-cxxreact (= 0.64.2)
+    - React-jsi (= 0.64.2)
+    - React-jsiexecutor (= 0.64.2)
+    - React-perflogger (= 0.64.2)
    - Yoga
-  - React-Core/DevSupport (0.64.1):
+  - React-Core/DevSupport (0.64.2):
    - glog
    - RCT-Folly (= 2020.01.13.00)
-    - React-Core/Default (= 0.64.1)
-    - React-Core/RCTWebSocket (= 0.64.1)
-    - React-cxxreact (= 0.64.1)
-    - React-jsi (= 0.64.1)
-    - React-jsiexecutor (= 0.64.1)
-    - React-jsinspector (= 0.64.1)
-    - React-perflogger (= 0.64.1)
+    - React-Core/Default (= 0.64.2)
+    - React-Core/RCTWebSocket (= 0.64.2)
+    - React-cxxreact (= 0.64.2)
+    - React-jsi (= 0.64.2)
+    - React-jsiexecutor (= 0.64.2)
+    - React-jsinspector (= 0.64.2)
+    - React-perflogger (= 0.64.2)
    - Yoga
-  - React-Core/Hermes (0.64.1):
+  - React-Core/Hermes (0.64.2):
    - glog
    - hermes-engine
    - RCT-Folly (= 2020.01.13.00)
    - RCT-Folly/Futures
-    - React-cxxreact (= 0.64.1)
-    - React-jsi (= 0.64.1)
-    - React-jsiexecutor (= 0.64.1)
-    - React-perflogger (= 0.64.1)
+    - React-cxxreact (= 0.64.2)
+    - React-jsi (= 0.64.2)
+    - React-jsiexecutor (= 0.64.2)
+    - React-perflogger (= 0.64.2)
    - Yoga
-  - React-Core/RCTActionSheetHeaders (0.64.1):
+  - React-Core/RCTActionSheetHeaders (0.64.2):
    - glog
    - RCT-Folly (= 2020.01.13.00)
    - React-Core/Default
-    - React-cxxreact (= 0.64.1)
-    - React-jsi (= 0.64.1)
-    - React-jsiexecutor (= 0.64.1)
-    - React-perflogger (= 0.64.1)
+    - React-cxxreact (= 0.64.2)
+    - React-jsi (= 0.64.2)
+    - React-jsiexecutor (= 0.64.2)
+    - React-perflogger (= 0.64.2)
    - Yoga
-  - React-Core/RCTAnimationHeaders (0.64.1):
+  - React-Core/RCTAnimationHeaders (0.64.2):
    - glog
    - RCT-Folly (= 2020.01.13.00)
    - React-Core/Default
-    - React-cxxreact (= 0.64.1)
-    - React-jsi (= 0.64.1)
-    - React-jsiexecutor (= 0.64.1)
-    - React-perflogger (= 0.64.1)
+    - React-cxxreact (= 0.64.2)
+    - React-jsi (= 0.64.2)
+    - React-jsiexecutor (= 0.64.2)
+    - React-perflogger (= 0.64.2)
    - Yoga
-  - React-Core/RCTBlobHeaders (0.64.1):
+  - React-Core/RCTBlobHeaders (0.64.2):
    - glog
    - RCT-Folly (= 2020.01.13.00)
    - React-Core/Default
-    - React-cxxreact (= 0.64.1)
-    - React-jsi (= 0.64.1)
-    - React-jsiexecutor (= 0.64.1)
-    - React-perflogger (= 0.64.1)
+    - React-cxxreact (= 0.64.2)
+    - React-jsi (= 0.64.2)
+    - React-jsiexecutor (= 0.64.2)
+    - React-perflogger (= 0.64.2)
    - Yoga
-  - React-Core/RCTImageHeaders (0.64.1):
+  - React-Core/RCTImageHeaders (0.64.2):
    - glog
    - RCT-Folly (= 2020.01.13.00)
    - React-Core/Default
-    - React-cxxreact (= 0.64.1)
-    - React-jsi (= 0.64.1)
-    - React-jsiexecutor (= 0.64.1)
-    - React-perflogger (= 0.64.1)
+    - React-cxxreact (= 0.64.2)
+    - React-jsi (= 0.64.2)
+    - React-jsiexecutor (= 0.64.2)
+    - React-perflogger (= 0.64.2)
    - Yoga
-  - React-Core/RCTLinkingHeaders (0.64.1):
+  - React-Core/RCTLinkingHeaders (0.64.2):
    - glog
    - RCT-Folly (= 2020.01.13.00)
    - React-Core/Default
-    - React-cxxreact (= 0.64.1)
-    - React-jsi (= 0.64.1)
-    - React-jsiexecutor (= 0.64.1)
-    - React-perflogger (= 0.64.1)
+    - React-cxxreact (= 0.64.2)
+    - React-jsi (= 0.64.2)
+    - React-jsiexecutor (= 0.64.2)
+    - React-perflogger (= 0.64.2)
    - Yoga
-  - React-Core/RCTNetworkHeaders (0.64.1):
+  - React-Core/RCTNetworkHeaders (0.64.2):
    - glog
    - RCT-Folly (= 2020.01.13.00)
    - React-Core/Default
-    - React-cxxreact (= 0.64.1)
-    - React-jsi (= 0.64.1)
-    - React-jsiexecutor (= 0.64.1)
-    - React-perflogger (= 0.64.1)
+    - React-cxxreact (= 0.64.2)
+    - React-jsi (= 0.64.2)
+    - React-jsiexecutor (= 0.64.2)
+    - React-perflogger (= 0.64.2)
    - Yoga
-  - React-Core/RCTSettingsHeaders (0.64.1):
+  - React-Core/RCTSettingsHeaders (0.64.2):
    - glog
    - RCT-Folly (= 2020.01.13.00)
    - React-Core/Default
-    - React-cxxreact (= 0.64.1)
-    - React-jsi (= 0.64.1)
-    - React-jsiexecutor (= 0.64.1)
-    - React-perflogger (= 0.64.1)
+    - React-cxxreact (= 0.64.2)
+    - React-jsi (= 0.64.2)
+    - React-jsiexecutor (= 0.64.2)
+    - React-perflogger (= 0.64.2)
    - Yoga
-  - React-Core/RCTTextHeaders (0.64.1):
+  - React-Core/RCTTextHeaders (0.64.2):
    - glog
    - RCT-Folly (= 2020.01.13.00)
    - React-Core/Default
-    - React-cxxreact (= 0.64.1)
-    - React-jsi (= 0.64.1)
-    - React-jsiexecutor (= 0.64.1)
-    - React-perflogger (= 0.64.1)
+    - React-cxxreact (= 0.64.2)
+    - React-jsi (= 0.64.2)
+    - React-jsiexecutor (= 0.64.2)
+    - React-perflogger (= 0.64.2)
    - Yoga
-  - React-Core/RCTVibrationHeaders (0.64.1):
+  - React-Core/RCTVibrationHeaders (0.64.2):
    - glog
    - RCT-Folly (= 2020.01.13.00)
    - React-Core/Default
-    - React-cxxreact (= 0.64.1)
-    - React-jsi (= 0.64.1)
-    - React-jsiexecutor (= 0.64.1)
-    - React-perflogger (= 0.64.1)
+    - React-cxxreact (= 0.64.2)
+    - React-jsi (= 0.64.2)
+    - React-jsiexecutor (= 0.64.2)
+    - React-perflogger (= 0.64.2)
    - Yoga
-  - React-Core/RCTWebSocket (0.64.1):
+  - React-Core/RCTWebSocket (0.64.2):
    - glog
    - RCT-Folly (= 2020.01.13.00)
-    - React-Core/Default (= 0.64.1)
-    - React-cxxreact (= 0.64.1)
-    - React-jsi (= 0.64.1)
-    - React-jsiexecutor (= 0.64.1)
-    - React-perflogger (= 0.64.1)
+    - React-Core/Default (= 0.64.2)
+    - React-cxxreact (= 0.64.2)
+    - React-jsi (= 0.64.2)
+    - React-jsiexecutor (= 0.64.2)
+    - React-perflogger (= 0.64.2)
    - Yoga
-  - React-CoreModules (0.64.1):
-    - FBReactNativeSpec (= 0.64.1)
+  - React-CoreModules (0.64.2):
+    - FBReactNativeSpec (= 0.64.2)
    - RCT-Folly (= 2020.01.13.00)
-    - RCTTypeSafety (= 0.64.1)
-    - React-Core/CoreModulesHeaders (= 0.64.1)
-    - React-jsi (= 0.64.1)
-    - React-RCTImage (= 0.64.1)
-    - ReactCommon/turbomodule/core (= 0.64.1)
-  - React-cxxreact (0.64.1):
+    - RCTTypeSafety (= 0.64.2)
+    - React-Core/CoreModulesHeaders (= 0.64.2)
+    - React-jsi (= 0.64.2)
+    - React-RCTImage (= 0.64.2)
+    - ReactCommon/turbomodule/core (= 0.64.2)
+  - React-cxxreact (0.64.2):
    - boost-for-react-native (= 1.63.0)
    - DoubleConversion
    - glog
    - RCT-Folly (= 2020.01.13.00)
-    - React-callinvoker (= 0.64.1)
-    - React-jsi (= 0.64.1)
-    - React-jsinspector (= 0.64.1)
-    - React-perflogger (= 0.64.1)
-    - React-runtimeexecutor (= 0.64.1)
-  - React-jsi (0.64.1):
+    - React-callinvoker (= 0.64.2)
+    - React-jsi (= 0.64.2)
+    - React-jsinspector (= 0.64.2)
+    - React-perflogger (= 0.64.2)
+    - React-runtimeexecutor (= 0.64.2)
+  - React-jsi (0.64.2):
    - boost-for-react-native (= 1.63.0)
    - DoubleConversion
    - glog
    - RCT-Folly (= 2020.01.13.00)
-    - React-jsi/Default (= 0.64.1)
-  - React-jsi/Default (0.64.1):
+    - React-jsi/Default (= 0.64.2)
+  - React-jsi/Default (0.64.2):
    - boost-for-react-native (= 1.63.0)
    - DoubleConversion
    - glog
    - RCT-Folly (= 2020.01.13.00)
-  - React-jsiexecutor (0.64.1):
+  - React-jsiexecutor (0.64.2):
    - DoubleConversion
    - glog
    - RCT-Folly (= 2020.01.13.00)
-    - React-cxxreact (= 0.64.1)
-    - React-jsi (= 0.64.1)
-    - React-perflogger (= 0.64.1)
-  - React-jsinspector (0.64.1)
+    - React-cxxreact (= 0.64.2)
+    - React-jsi (= 0.64.2)
+    - React-perflogger (= 0.64.2)
+  - React-jsinspector (0.64.2)
  - react-native-blur (0.8.0):
    - React
-  - react-native-blurhash (1.1.4):
+  - react-native-blurhash (1.1.5):
    - React-Core
  - react-native-cameraroll (4.0.4):
    - React-Core
-  - react-native-netinfo (6.0.0):
+  - react-native-netinfo (6.0.2):
    - React-Core
-  - react-native-pager-view (5.1.9):
+  - react-native-pager-view (5.4.4):
    - React-Core
  - react-native-safe-area-context (3.2.0):
    - React-Core
  - react-native-segmented-control (2.2.2):
    - React-Core
-  - React-perflogger (0.64.1)
-  - React-RCTActionSheet (0.64.1):
-    - React-Core/RCTActionSheetHeaders (= 0.64.1)
-  - React-RCTAnimation (0.64.1):
-    - FBReactNativeSpec (= 0.64.1)
+  - React-perflogger (0.64.2)
+  - React-RCTActionSheet (0.64.2):
+    - React-Core/RCTActionSheetHeaders (= 0.64.2)
+  - React-RCTAnimation (0.64.2):
+    - FBReactNativeSpec (= 0.64.2)
    - RCT-Folly (= 2020.01.13.00)
-    - RCTTypeSafety (= 0.64.1)
-    - React-Core/RCTAnimationHeaders (= 0.64.1)
-    - React-jsi (= 0.64.1)
-    - ReactCommon/turbomodule/core (= 0.64.1)
-  - React-RCTBlob (0.64.1):
-    - FBReactNativeSpec (= 0.64.1)
+    - RCTTypeSafety (= 0.64.2)
+    - React-Core/RCTAnimationHeaders (= 0.64.2)
+    - React-jsi (= 0.64.2)
+    - ReactCommon/turbomodule/core (= 0.64.2)
+  - React-RCTBlob (0.64.2):
+    - FBReactNativeSpec (= 0.64.2)
    - RCT-Folly (= 2020.01.13.00)
-    - React-Core/RCTBlobHeaders (= 0.64.1)
-    - React-Core/RCTWebSocket (= 0.64.1)
-    - React-jsi (= 0.64.1)
-    - React-RCTNetwork (= 0.64.1)
-    - ReactCommon/turbomodule/core (= 0.64.1)
-  - React-RCTImage (0.64.1):
-    - FBReactNativeSpec (= 0.64.1)
+    - React-Core/RCTBlobHeaders (= 0.64.2)
+    - React-Core/RCTWebSocket (= 0.64.2)
+    - React-jsi (= 0.64.2)
+    - React-RCTNetwork (= 0.64.2)
+    - ReactCommon/turbomodule/core (= 0.64.2)
+  - React-RCTImage (0.64.2):
+    - FBReactNativeSpec (= 0.64.2)
    - RCT-Folly (= 2020.01.13.00)
-    - RCTTypeSafety (= 0.64.1)
-    - React-Core/RCTImageHeaders (= 0.64.1)
-    - React-jsi (= 0.64.1)
-    - React-RCTNetwork (= 0.64.1)
-    - ReactCommon/turbomodule/core (= 0.64.1)
-  - React-RCTLinking (0.64.1):
-    - FBReactNativeSpec (= 0.64.1)
-    - React-Core/RCTLinkingHeaders (= 0.64.1)
-    - React-jsi (= 0.64.1)
-    - ReactCommon/turbomodule/core (= 0.64.1)
-  - React-RCTNetwork (0.64.1):
-    - FBReactNativeSpec (= 0.64.1)
+    - RCTTypeSafety (= 0.64.2)
+    - React-Core/RCTImageHeaders (= 0.64.2)
+    - React-jsi (= 0.64.2)
+    - React-RCTNetwork (= 0.64.2)
+    - ReactCommon/turbomodule/core (= 0.64.2)
+  - React-RCTLinking (0.64.2):
+    - FBReactNativeSpec (= 0.64.2)
+    - React-Core/RCTLinkingHeaders (= 0.64.2)
+    - React-jsi (= 0.64.2)
+    - ReactCommon/turbomodule/core (= 0.64.2)
+  - React-RCTNetwork (0.64.2):
+    - FBReactNativeSpec (= 0.64.2)
    - RCT-Folly (= 2020.01.13.00)
-    - RCTTypeSafety (= 0.64.1)
-    - React-Core/RCTNetworkHeaders (= 0.64.1)
-    - React-jsi (= 0.64.1)
-    - ReactCommon/turbomodule/core (= 0.64.1)
-  - React-RCTSettings (0.64.1):
-    - FBReactNativeSpec (= 0.64.1)
+    - RCTTypeSafety (= 0.64.2)
+    - React-Core/RCTNetworkHeaders (= 0.64.2)
+    - React-jsi (= 0.64.2)
+    - ReactCommon/turbomodule/core (= 0.64.2)
+  - React-RCTSettings (0.64.2):
+    - FBReactNativeSpec (= 0.64.2)
    - RCT-Folly (= 2020.01.13.00)
-    - RCTTypeSafety (= 0.64.1)
-    - React-Core/RCTSettingsHeaders (= 0.64.1)
-    - React-jsi (= 0.64.1)
-    - ReactCommon/turbomodule/core (= 0.64.1)
-  - React-RCTText (0.64.1):
-    - React-Core/RCTTextHeaders (= 0.64.1)
-  - React-RCTVibration (0.64.1):
-    - FBReactNativeSpec (= 0.64.1)
+    - RCTTypeSafety (= 0.64.2)
+    - React-Core/RCTSettingsHeaders (= 0.64.2)
+    - React-jsi (= 0.64.2)
+    - ReactCommon/turbomodule/core (= 0.64.2)
+  - React-RCTText (0.64.2):
+    - React-Core/RCTTextHeaders (= 0.64.2)
+  - React-RCTVibration (0.64.2):
+    - FBReactNativeSpec (= 0.64.2)
    - RCT-Folly (= 2020.01.13.00)
-    - React-Core/RCTVibrationHeaders (= 0.64.1)
-    - React-jsi (= 0.64.1)
-    - ReactCommon/turbomodule/core (= 0.64.1)
-  - React-runtimeexecutor (0.64.1):
-    - React-jsi (= 0.64.1)
-  - ReactCommon/turbomodule/core (0.64.1):
+    - React-Core/RCTVibrationHeaders (= 0.64.2)
+    - React-jsi (= 0.64.2)
+    - ReactCommon/turbomodule/core (= 0.64.2)
+  - React-runtimeexecutor (0.64.2):
+    - React-jsi (= 0.64.2)
+  - ReactCommon/turbomodule/core (0.64.2):
    - DoubleConversion
    - glog
    - RCT-Folly (= 2020.01.13.00)
-    - React-callinvoker (= 0.64.1)
-    - React-Core (= 0.64.1)
-    - React-cxxreact (= 0.64.1)
-    - React-jsi (= 0.64.1)
-    - React-perflogger (= 0.64.1)
-  - RNCAsyncStorage (1.15.4):
+    - React-callinvoker (= 0.64.2)
+    - React-Core (= 0.64.2)
+    - React-cxxreact (= 0.64.2)
+    - React-jsi (= 0.64.2)
+    - React-perflogger (= 0.64.2)
+  - RNCAsyncStorage (1.15.8):
    - React-Core
-  - RNCMaskedView (0.1.11):
-    - React
-  - RNFastImage (8.3.4):
+  - RNFastImage (8.5.6):
    - React-Core
-    - SDWebImage (~> 5.8)
-    - SDWebImageWebPCoder (~> 0.6.1)
+    - SDWebImage (~> 5.11.1)
+    - SDWebImageWebPCoder (~> 0.8.4)
  - RNGestureHandler (1.10.3):
    - React-Core
-  - RNReanimated (2.1.0):
+  - RNReanimated (2.2.2):
    - DoubleConversion
    - FBLazyVector
    - FBReactNativeSpec
@ -480,44 +489,30 @@ PODS:
    - React-RCTVibration
    - ReactCommon/turbomodule/core
    - Yoga
-  - RNScreens (3.3.0):
+  - RNScreens (3.7.2):
    - React-Core
    - React-RCTImage
-  - RNSentry (2.4.3):
+  - RNSentry (2.6.2):
    - React-Core
-    - Sentry (= 6.1.4)
+    - Sentry (= 7.1.4)
  - RNSVG (12.1.1):
    - React
  - SDWebImage (5.11.1):
    - SDWebImage/Core (= 5.11.1)
  - SDWebImage/Core (5.11.1)
-  - SDWebImageWebPCoder (0.6.1):
+  - SDWebImageWebPCoder (0.8.4):
    - libwebp (~> 1.0)
-    - SDWebImage/Core (~> 5.7)
-  - Sentry (6.1.4):
-    - Sentry/Core (= 6.1.4)
-  - Sentry/Core (6.1.4)
-  - UMAppLoader (2.1.0)
-  - UMBarCodeScannerInterface (6.1.0):
-    - UMCore
-  - UMCameraInterface (6.1.0):
-    - UMCore
-  - UMConstantsInterface (6.1.0):
-    - UMCore
-  - UMCore (7.1.0)
-  - UMFaceDetectorInterface (6.1.0)
-  - UMFileSystemInterface (6.1.0)
-  - UMFontInterface (6.1.0)
-  - UMImageLoaderInterface (6.1.0)
-  - UMPermissionsInterface (6.1.0):
-    - UMCore
-  - UMReactNativeAdapter (6.2.2):
+    - SDWebImage/Core (~> 5.10)
+  - Sentry (7.1.4):
+    - Sentry/Core (= 7.1.4)
+  - Sentry/Core (7.1.4)
+  - UMAppLoader (2.2.0)
+  - UMCore (7.1.2)
+  - UMReactNativeAdapter (6.3.7):
+    - ExpoModulesCore
    - React-Core
    - UMCore
-    - UMFontInterface
-  - UMSensorsInterface (6.1.0):
-    - UMCore
-  - UMTaskManagerInterface (6.1.0):
+  - UMTaskManagerInterface (6.2.0):
    - UMCore
  - Yoga (1.14.0)

@ -525,7 +520,7 @@ DEPENDENCIES:
  - DoubleConversion (from `../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec`)
  - EXApplication (from `../node_modules/expo-application/ios`)
  - EXAV (from `../node_modules/expo-av/ios`)
-  - EXConstants (from `../node_modules/expo-constants/ios`)
+  - EXConstants (from `../node_modules/react-native-unimodules/node_modules/expo-constants/ios`)
  - EXCrypto (from `../node_modules/expo-crypto/ios`)
  - EXDevice (from `../node_modules/expo-device/ios`)
  - EXErrorRecovery (from `../node_modules/expo-error-recovery/ios`)
@ -541,12 +536,15 @@ DEPENDENCIES:
  - EXLocalization (from `../node_modules/expo-localization/ios`)
  - EXNotifications (from `../node_modules/expo-notifications/ios`)
  - EXPermissions (from `../node_modules/expo-permissions/ios`)
+  - ExpoModulesCore (from `../node_modules/expo-modules-core/ios`)
  - EXRandom (from `../node_modules/expo-random/ios`)
  - EXScreenCapture (from `../node_modules/expo-screen-capture/ios`)
  - EXSecureStore (from `../node_modules/expo-secure-store/ios`)
  - EXSplashScreen (from `../node_modules/expo-splash-screen/ios`)
  - EXStoreReview (from `../node_modules/expo-store-review/ios`)
+  - EXStructuredHeaders (from `../node_modules/expo-structured-headers/ios`)
  - EXUpdates (from `../node_modules/expo-updates/ios`)
+  - EXUpdatesInterface (from `../node_modules/expo-updates-interface/ios`)
  - EXVideoThumbnails (from `../node_modules/expo-video-thumbnails/ios`)
  - EXWebBrowser (from `../node_modules/expo-web-browser/ios`)
  - FBLazyVector (from `../node_modules/react-native/Libraries/FBLazyVector`)
@ -588,7 +586,6 @@ DEPENDENCIES:
  - React-runtimeexecutor (from `../node_modules/react-native/ReactCommon/runtimeexecutor`)
  - ReactCommon/turbomodule/core (from `../node_modules/react-native/ReactCommon`)
  - "RNCAsyncStorage (from `../node_modules/@react-native-async-storage/async-storage`)"
-  - "RNCMaskedView (from `../node_modules/@react-native-community/masked-view`)"
  - RNFastImage (from `../node_modules/react-native-fast-image`)
  - RNGestureHandler (from `../node_modules/react-native-gesture-handler`)
  - RNReanimated (from `../node_modules/react-native-reanimated`)
@ -596,17 +593,8 @@ DEPENDENCIES:
  - "RNSentry (from `../node_modules/@sentry/react-native`)"
  - RNSVG (from `../node_modules/react-native-svg`)
  - UMAppLoader (from `../node_modules/unimodules-app-loader/ios`)
-  - UMBarCodeScannerInterface (from `../node_modules/unimodules-barcode-scanner-interface/ios`)
-  - UMCameraInterface (from `../node_modules/unimodules-camera-interface/ios`)
-  - UMConstantsInterface (from `../node_modules/unimodules-constants-interface/ios`)
-  - "UMCore (from `../node_modules/@unimodules/core/ios`)"
-  - UMFaceDetectorInterface (from `../node_modules/unimodules-face-detector-interface/ios`)
-  - UMFileSystemInterface (from `../node_modules/unimodules-file-system-interface/ios`)
-  - UMFontInterface (from `../node_modules/unimodules-font-interface/ios`)
-  - UMImageLoaderInterface (from `../node_modules/unimodules-image-loader-interface/ios`)
-  - UMPermissionsInterface (from `../node_modules/unimodules-permissions-interface/ios`)
-  - "UMReactNativeAdapter (from `../node_modules/@unimodules/react-native-adapter/ios`)"
-  - UMSensorsInterface (from `../node_modules/unimodules-sensors-interface/ios`)
+  - "UMCore (from `../node_modules/react-native-unimodules/node_modules/@unimodules/core/ios`)"
+  - "UMReactNativeAdapter (from `../node_modules/react-native-unimodules/node_modules/@unimodules/react-native-adapter/ios`)"
  - UMTaskManagerInterface (from `../node_modules/unimodules-task-manager-interface/ios`)
  - Yoga (from `../node_modules/react-native/ReactCommon/yoga`)

@ -638,7 +626,7 @@ EXTERNAL SOURCES:
  EXAV:
    :path: "../node_modules/expo-av/ios"
  EXConstants:
-    :path: "../node_modules/expo-constants/ios"
+    :path: "../node_modules/react-native-unimodules/node_modules/expo-constants/ios"
  EXCrypto:
    :path: "../node_modules/expo-crypto/ios"
  EXDevice:
@ -669,6 +657,8 @@ EXTERNAL SOURCES:
    :path: "../node_modules/expo-notifications/ios"
  EXPermissions:
    :path: "../node_modules/expo-permissions/ios"
+  ExpoModulesCore:
+    :path: "../node_modules/expo-modules-core/ios"
  EXRandom:
    :path: "../node_modules/expo-random/ios"
  EXScreenCapture:
@ -679,8 +669,12 @@ EXTERNAL SOURCES:
    :path: "../node_modules/expo-splash-screen/ios"
  EXStoreReview:
    :path: "../node_modules/expo-store-review/ios"
+  EXStructuredHeaders:
+    :path: "../node_modules/expo-structured-headers/ios"
  EXUpdates:
    :path: "../node_modules/expo-updates/ios"
+  EXUpdatesInterface:
+    :path: "../node_modules/expo-updates-interface/ios"
  EXVideoThumbnails:
    :path: "../node_modules/expo-video-thumbnails/ios"
  EXWebBrowser:
@ -753,8 +747,6 @@ EXTERNAL SOURCES:
    :path: "../node_modules/react-native/ReactCommon"
  RNCAsyncStorage:
    :path: "../node_modules/@react-native-async-storage/async-storage"
-  RNCMaskedView:
-    :path: "../node_modules/@react-native-community/masked-view"
  RNFastImage:
    :path: "../node_modules/react-native-fast-image"
  RNGestureHandler:
@ -769,28 +761,10 @@ EXTERNAL SOURCES:
    :path: "../node_modules/react-native-svg"
  UMAppLoader:
    :path: "../node_modules/unimodules-app-loader/ios"
-  UMBarCodeScannerInterface:
-    :path: "../node_modules/unimodules-barcode-scanner-interface/ios"
-  UMCameraInterface:
-    :path: "../node_modules/unimodules-camera-interface/ios"
-  UMConstantsInterface:
-    :path: "../node_modules/unimodules-constants-interface/ios"
  UMCore:
-    :path: "../node_modules/@unimodules/core/ios"
-  UMFaceDetectorInterface:
-    :path: "../node_modules/unimodules-face-detector-interface/ios"
-  UMFileSystemInterface:
-    :path: "../node_modules/unimodules-file-system-interface/ios"
-  UMFontInterface:
-    :path: "../node_modules/unimodules-font-interface/ios"
-  UMImageLoaderInterface:
-    :path: "../node_modules/unimodules-image-loader-interface/ios"
-  UMPermissionsInterface:
-    :path: "../node_modules/unimodules-permissions-interface/ios"
+    :path: "../node_modules/react-native-unimodules/node_modules/@unimodules/core/ios"
  UMReactNativeAdapter:
-    :path: "../node_modules/@unimodules/react-native-adapter/ios"
-  UMSensorsInterface:
-    :path: "../node_modules/unimodules-sensors-interface/ios"
+    :path: "../node_modules/react-native-unimodules/node_modules/@unimodules/react-native-adapter/ios"
  UMTaskManagerInterface:
    :path: "../node_modules/unimodules-task-manager-interface/ios"
  Yoga:
@ -799,34 +773,37 @@ EXTERNAL SOURCES:
 SPEC CHECKSUMS:
  boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c
  DoubleConversion: cf9b38bf0b2d048436d9a82ad2abe1404f11e7de
-  EXApplication: 4797b8b37f0b0470f587fdccf6407f44b50d18b5
-  EXAV: f7c1b9af3aff7834cbdbe3e002d1f70e21c38320
-  EXConstants: c4dd28acc12039c999612507a5f935556f2c86ce
-  EXCrypto: 9cbeb90f6c60a8ae9f26242fd2db916b21c55700
-  EXDevice: 01f54314f618aa4098893f66cd8f2a8a411f33ee
-  EXErrorRecovery: 720641265b8cf95e6cdeb1884ac38e794a352488
-  EXFileSystem: dcf2273f49431e5037347c733a2dc5d08e0d0a9e
-  EXFirebaseAnalytics: aa820eafe8527a32f65a285047ce475e622c7e8f
-  EXFirebaseCore: 7865e37021ddcff5c575a4598686a2939d6c4183
-  EXFont: d6fb79f9863120f0d0b26b0c2d1453bc9511e9df
-  EXHaptics: 2de40c5f50a9e78da92c209db06db5134d8cac0b
-  EXImageLoader: da941c9399e01ec28f2d5b270bdd21f2c8ca596c
-  EXImageManipulator: a099e4694070c7cb86aa0b0b1afa3ea184153a7d
-  EXImagePicker: dd05b8a5cb782c79d07d1d72e5850c6acc2b9a37
-  EXKeepAwake: d4e4a3ed8c1c4fd940dd62fc5a8be2a190371fd4
-  EXLocalization: f139efe4a06be1041815879959346e3d437a6e93
-  EXNotifications: c13e078d83ce01c7aeb8e3f44a48c13f50099291
-  EXPermissions: 8f8c1c05580c4e02d4ee2c8dd74bfe173ff6a723
-  EXRandom: cbd66cd45434a494f5ef98650eec1f8d78b90270
-  EXScreenCapture: 2903dace06f2d06cc161017637cc4cbfcaa98986
-  EXSecureStore: da5a255445bb6ee8b8ac54f65412bc803272bd87
-  EXSplashScreen: a9baaf4fa866003884c90ba049f18760d6a8ce39
-  EXStoreReview: b1f68ed0369b0f1c443214ac8d6881ef3b64de9a
-  EXUpdates: 74b39409f68eca207075d87b0077bdf37865a8bf
-  EXVideoThumbnails: cd257fc6e07884a704a5674d362a6410933acb68
-  EXWebBrowser: 0b466c50e5ff61c9758095d49d5081e3229d77ac
-  FBLazyVector: 7b423f9e248eae65987838148c36eec1dbfe0b53
-  FBReactNativeSpec: 5058d1917c80dca4b9ed89bdf94385315939ab80
+  EXApplication: 9ff2a206009d6e55bca6c20b3f33d07986b51ef3
+  EXAV: 67bcc1d0afeb1fab854b206c84b9f2afbd61d0cd
+  EXConstants: 4cb52b6d8f636c767104a44bf7db3873e9c01a6f
+  EXCrypto: 46e28f1eb7ec3e2ae5aab652fe1dc4d46bafb386
+  EXDevice: 6f1eed02c099f5b382a12a40406c58868892aba6
+  EXErrorRecovery: 404d827bc7d42f306c062d58a60b06afc4d082b3
+  EXFileSystem: 0a04aba8da751b9ac954065911bcf166503f8267
+  EXFirebaseAnalytics: ca01838167729b67f838a673e4b3e0637faec118
+  EXFirebaseCore: 9b5380fd62fce3c790fa1d6727a8d7cbbef4f0fb
+  EXFont: 9846ba1bb6f5f5aed44e20eea3ac70693323832d
+  EXHaptics: 6dc4307ab0794fe7a87ec8d7d1c299cf103d6cb3
+  EXImageLoader: d3531a3fe530b22925c19977cb53bb43e3821fe6
+  EXImageManipulator: c9af8e8dc6543fdca23693eae280e388b2f93fb0
+  EXImagePicker: 414a3663910fd6604248e84c9c77a0501ae0d18b
+  EXKeepAwake: f4105ef469be7b283f66ce2d7234bb71ac80cd26
+  EXLocalization: 356f4e16a606cec21a77d6250528fde526152b45
+  EXNotifications: 171ccaf17643811673c78f4c4830560d6e5a92aa
+  EXPermissions: 916efb5b817cb0a40160c0cd2f369af3c23a78be
+  ExpoModulesCore: 2734852616127a6c1fc23012197890a6f3763dc7
+  EXRandom: ecb71f5d01991f29bb0277f8a2c35d168f85d637
+  EXScreenCapture: c51844407fbac8bbca4415467bc43f2b7764d225
+  EXSecureStore: 1aa80d49a3a101418bbd2675e2a0d32dceea10c2
+  EXSplashScreen: 847e0d8026731c1090bf269ede3e15ac87d88958
+  EXStoreReview: 40674cc897a6d7fd249969b86d1833f67b99170a
+  EXStructuredHeaders: e52b880264d15b8ad07d36670226c29476af6334
+  EXUpdates: 013d26649cb6ab4f8d8d80c35d3d4be150b47e7c
+  EXUpdatesInterface: b68e78b912a03fff7901a5f46ec200c45e3506a5
+  EXVideoThumbnails: 442c3abadb51a81551a3b53705b7560de390e6f7
+  EXWebBrowser: 76783ba5dcb8699237746ecf41a9643d428a4cc5
+  FBLazyVector: e686045572151edef46010a6f819ade377dfeb4b
+  FBReactNativeSpec: 23c392d9bbc0bef14737ae5109976815b182edcf
  Firebase: cd2ab85eec8170dc260186159f21072ecb679ad5
  FirebaseAnalytics: f3f8f75de34fe04141a69bb1c4bd7e24a80178e1
  FirebaseCore: ac35d680a0bf32319a59966a1478e0741536b97b
@ -835,67 +812,57 @@ SPEC CHECKSUMS:
  glog: 73c2498ac6884b13ede40eda8228cb1eee9d9d62
  GoogleAppMeasurement: 0c3b134b2c0a90c4c24833873894bfe0e42a0384
  GoogleDataTransport: 8b0e733ea77c9218778e5a9e34ba9508b8328939
-  GoogleUtilities: f8a43108b38a68eebe8b3540e1f4f2d28843ce20
+  GoogleUtilities: 3df19e3c24f7bbc291d8b5809aa6b0d41e642437
  hermes-engine: 7d97ba46a1e29bacf3e3c61ecb2804a5ddd02d4f
  libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913
  libwebp: e90b9c01d99205d03b6bb8f2c8c415e5a4ef66f0
  nanopb: 59221d7f958fb711001e6a449489542d92ae113e
  PromisesObjC: 3113f7f76903778cf4a0586bd1ab89329a0b7b97
  RCT-Folly: ec7a233ccc97cc556cf7237f0db1ff65b986f27c
-  RCTRequired: ec2ebc96b7bfba3ca5c32740f5a0c6a014a274d2
-  RCTTypeSafety: 22567f31e67c3e088c7ac23ea46ab6d4779c0ea5
-  React: a241e3dbb1e91d06332f1dbd2b3ab26e1a4c4b9d
-  React-callinvoker: da4d1c6141696a00163960906bc8a55b985e4ce4
-  React-Core: 46ba164c437d7dac607b470c83c8308b05799748
-  React-CoreModules: 217bd14904491c7b9940ff8b34a3fe08013c2f14
-  React-cxxreact: 0090588ae6660c4615d3629fdd5c768d0983add4
-  React-jsi: 5de8204706bd872b78ea646aee5d2561ca1214b6
-  React-jsiexecutor: 124e8f99992490d0d13e0649d950d3e1aae06fe9
-  React-jsinspector: 500a59626037be5b3b3d89c5151bc3baa9abf1a9
+  RCTRequired: 6d3e854f0e7260a648badd0d44fc364bc9da9728
+  RCTTypeSafety: c1f31d19349c6b53085766359caac425926fafaa
+  React: bda6b6d7ae912de97d7a61aa5c160db24aa2ad69
+  React-callinvoker: 9840ea7e8e88ed73d438edb725574820b29b5baa
+  React-Core: b5e385da7ce5f16a220fc60fd0749eae2c6120f0
+  React-CoreModules: 17071a4e2c5239b01585f4aa8070141168ab298f
+  React-cxxreact: 9be7b6340ed9f7c53e53deca7779f07cd66525ba
+  React-jsi: 67747b9722f6dab2ffe15b011bcf6b3f2c3f1427
+  React-jsiexecutor: 80c46bd381fd06e418e0d4f53672dc1d1945c4c3
+  React-jsinspector: cc614ec18a9ca96fd275100c16d74d62ee11f0ae
  react-native-blur: cad4d93b364f91e7b7931b3fa935455487e5c33c
-  react-native-blurhash: ec98d751a9cb9075cef0b9e3188244c517d6ab22
+  react-native-blurhash: d978f8017ed091d9e1179775fe7bac14297e6e1e
  react-native-cameraroll: 88f4e62d9ecd0e1f253abe4f685474f2ea14bfa2
-  react-native-netinfo: e849fc21ca2f4128a5726c801a82fc6f4a6db50d
-  react-native-pager-view: 14653de580178af7e65aa7e3fa08b4f243c86d4d
+  react-native-netinfo: 92e6e4476eb8bf6fc2d7c0a6ca0a1406f663d73a
+  react-native-pager-view: 5ab4d0b4b44d89f77310cb3eb8129745f274ce55
  react-native-safe-area-context: f0906bf8bc9835ac9a9d3f97e8bde2a997d8da79
  react-native-segmented-control: 65df6cd0619b780b3843d574a72d4c7cec396097
-  React-perflogger: aad6d4b4a267936b3667260d1f649b6f6069a675
-  React-RCTActionSheet: fc376be462c9c8d6ad82c0905442fd77f82a9d2a
-  React-RCTAnimation: ba0a1c3a2738be224a08092fa7f1b444ab77d309
-  React-RCTBlob: f758d4403fc5828a326dc69e27b41e1a92f34947
-  React-RCTImage: ce57088705f4a8d03f6594b066a59c29143ba73e
-  React-RCTLinking: 852a3a95c65fa63f657a4b4e2d3d83a815e00a7c
-  React-RCTNetwork: 9d7ccb8a08d522d71700b4fb677d9fa28cccd118
-  React-RCTSettings: d8aaf4389ff06114dee8c42ef5f0f2915946011e
-  React-RCTText: 809c12ed6b261796ba056c04fcd20d8b90bcc81d
-  React-RCTVibration: 4b99a7f5c6c0abbc5256410cc5425fb8531986e1
-  React-runtimeexecutor: ff951a0c241bfaefc4940a3f1f1a229e7cb32fa6
-  ReactCommon: bedc99ed4dae329c4fcf128d0c31b9115e5365ca
-  RNCAsyncStorage: f47a7e8f927f7c9da947491fc55752eb9ce17f2d
-  RNCMaskedView: 0e1bc4bfa8365eba5fbbb71e07fbdc0555249489
-  RNFastImage: d4870d58f5936111c56218dbd7fcfc18e65b58ff
+  React-perflogger: 25373e382fed75ce768a443822f07098a15ab737
+  React-RCTActionSheet: af7796ba49ffe4ca92e7277a5d992d37203f7da5
+  React-RCTAnimation: 6a2e76ab50c6f25b428d81b76a5a45351c4d77aa
+  React-RCTBlob: 02a2887023e0eed99391b6445b2e23a2a6f9226d
+  React-RCTImage: ce5bf8e7438f2286d9b646a05d6ab11f38b0323d
+  React-RCTLinking: ccd20742de14e020cb5f99d5c7e0bf0383aefbd9
+  React-RCTNetwork: dfb9d089ab0753e5e5f55fc4b1210858f7245647
+  React-RCTSettings: b14aef2d83699e48b410fb7c3ba5b66cd3291ae2
+  React-RCTText: 41a2e952dd9adc5caf6fb68ed46b275194d5da5f
+  React-RCTVibration: 24600e3b1aaa77126989bc58b6747509a1ba14f3
+  React-runtimeexecutor: a9904c6d0218fb9f8b19d6dd88607225927668f9
+  ReactCommon: 149906e01aa51142707a10665185db879898e966
+  RNCAsyncStorage: e8b8d6320a0dd90eb610fb0d0b1ef90596697c69
+  RNFastImage: 047bd977c73870c39cce48032cc6a7913cb4fc47
  RNGestureHandler: a479ebd5ed4221a810967000735517df0d2db211
-  RNReanimated: b8c8004b43446e3c2709fe64b2b41072f87428ad
-  RNScreens: bf59f17fbf001f1025243eeed5f19419d3c11ef2
-  RNSentry: 6f8f9ee7e4c939dcd35e5633b94d0e3782888e46
+  RNReanimated: 241c586663f44f19a53883c63375fdd041253960
+  RNScreens: 0591543e343c7444ea1756b6265d81a4295922c9
+  RNSentry: 68644ef607b780551cc555f084869764f2566652
  RNSVG: 551acb6562324b1d52a4e0758f7ca0ec234e278f
  SDWebImage: a7f831e1a65eb5e285e3fb046a23fcfbf08e696d
-  SDWebImageWebPCoder: d0dac55073088d24b2ac1b191a71a8f8d0adac21
-  Sentry: 9d055e2de30a77685e86b219acf02e59b82091fc
-  UMAppLoader: fe2708bb0ac5cd70052bc207d06aa3b7e72b9e97
-  UMBarCodeScannerInterface: 79f92bea5f7af39b381a4c82298105ceb537408a
-  UMCameraInterface: 81ff46700da88435f17afedfc88915eaede7e6a6
-  UMConstantsInterface: bb94dd46039dcde276ed50225b29e22785e604bf
-  UMCore: 60b35f4d217461f7b54934b0c5be67442871f01f
-  UMFaceDetectorInterface: 791eec55ffca1171992976b7eceb73e69e391c58
-  UMFileSystemInterface: f72245e90ce78fa6427180ff0b0904ead13d8161
-  UMFontInterface: 5843cff7db85a42ba629aaac53d33091c35524d3
-  UMImageLoaderInterface: 9ddffeb644b3f45d4eb0c2f51a2fd95fd5c8d1a4
-  UMPermissionsInterface: 40b72935a7d12a3f60dc6b7bb99ce47908380cb1
-  UMReactNativeAdapter: 65ada852a648fcb6674acfbfe72ccb095f2f5b75
-  UMSensorsInterface: a5e9db661e5d9ae214762033d725989880ae6993
-  UMTaskManagerInterface: 203c11259d2699b5b3a4eda4adbc466f5cb5c561
-  Yoga: a7de31c64fe738607e7a3803e3f591a4b1df7393
+  SDWebImageWebPCoder: f93010f3f6c031e2f8fb3081ca4ee6966c539815
+  Sentry: 1d3eb1a25f8c5333c88dd5603904a6d461cd9fcf
+  UMAppLoader: 21af63390e55c82e037fb9752d93114a80ecf16e
+  UMCore: ce3a4faa010239063b8343895b29a6d97b01069d
+  UMReactNativeAdapter: bb7922210cf6fdb5768f78685f3c3a2060299119
+  UMTaskManagerInterface: 2be431101b73604e64fbfffcf759336f9d8fccbb
+  Yoga: 575c581c63e0d35c9a83f4b46d01d63abc1100ac

 PODFILE CHECKSUM: 34cad1fa3f14caa5b138177b6379ac2cba0e1087

--- a/ios/tooot/Info.plist
+++ b/ios/tooot/Info.plist
@ -50,8 +50,6 @@
 			</dict>
 		</dict>
 	</dict>
-	<key>NSMicrophoneUsageDescription</key>
-	<string>$(PRODUCT_NAME) DOES NOT need microphone permission. Please reject this request.</string>
 	<key>NSCameraUsageDescription</key>
 	<string>Allow $(PRODUCT_NAME) to capture photo or video and attach it to your toot</string>
 	<key>NSLocationWhenInUseUsageDescription</key>
--- a/package.json
+++ b/package.json
@ -1,10 +1,10 @@
 {
  "name": "tooot",
  "versions": {
-    "native": "210511",
+    "native": "210916",
    "major": 2,
-    "minor": 1,
-    "patch": 3,
+    "minor": 2,
+    "patch": 0,
    "expo": "41.0.0"
  },
  "description": "tooot app for Mastodon",
@ -24,103 +24,106 @@
    "clean": "react-native-clean-project"
  },
  "dependencies": {
-    "@expo/react-native-action-sheet": "^3.9.0",
-    "@neverdull-agency/expo-unlimited-secure-store": "^1.0.10",
-    "@react-native-async-storage/async-storage": "^1.15.4",
-    "@react-native-community/blur": "^3.6.0",
-    "@react-native-community/cameraroll": "^4.0.4",
-    "@react-native-community/masked-view": "0.1.11",
-    "@react-native-community/netinfo": "6.0.0",
+    "@expo/react-native-action-sheet": "3.11.0",
+    "@neverdull-agency/expo-unlimited-secure-store": "1.0.10",
+    "@react-native-async-storage/async-storage": "1.15.8",
+    "@react-native-community/blur": "3.6.0",
+    "@react-native-community/cameraroll": "4.0.4",
+    "@react-native-community/netinfo": "6.0.2",
    "@react-native-community/segmented-control": "2.2.2",
-    "@react-navigation/bottom-tabs": "^5.11.11",
-    "@react-navigation/native": "^5.9.4",
-    "@react-navigation/stack": "^5.14.5",
-    "@reduxjs/toolkit": "^1.5.1",
-    "@sentry/react-native": "^2.4.3",
-    "@sharcoux/slider": "^5.3.0",
-    "axios": "^0.21.1",
-    "expo": "^41.0.1",
-    "expo-auth-session": "~3.2.3",
-    "expo-av": "~9.1.2",
-    "expo-crypto": "~9.1.0",
-    "expo-firebase-analytics": "~4.0.2",
-    "expo-haptics": "~10.0.0",
-    "expo-image-manipulator": "~9.1.0",
-    "expo-image-picker": "~10.1.4",
-    "expo-linking": "~2.2.3",
-    "expo-localization": "~10.1.0",
-    "expo-notifications": "~0.11.6",
-    "expo-random": "~11.1.2",
-    "expo-screen-capture": "^3.1.0",
-    "expo-secure-store": "~10.1.0",
-    "expo-splash-screen": "~0.10.2",
-    "expo-status-bar": "~1.0.4",
-    "expo-store-review": "~4.0.2",
-    "expo-video-thumbnails": "~5.1.0",
-    "expo-web-browser": "~9.1.0",
-    "i18next": "^20.3.0",
-    "li": "^1.3.0",
-    "lodash": "^4.17.21",
+    "@react-navigation/bottom-tabs": "6.0.5",
+    "@react-navigation/native": "6.0.2",
+    "@react-navigation/native-stack": "6.1.0",
+    "@react-navigation/stack": "6.0.7",
+    "@reduxjs/toolkit": "1.6.1",
+    "@sentry/react-native": "2.6.2",
+    "@sharcoux/slider": "5.4.3",
+    "axios": "0.21.4",
+    "expo": "42.0.3",
+    "expo-auth-session": "3.3.1",
+    "expo-av": "9.2.3",
+    "expo-crypto": "9.2.0",
+    "expo-device": "^3.3.0",
+    "expo-firebase-analytics": "4.1.0",
+    "expo-haptics": "10.1.0",
+    "expo-image-manipulator": "9.2.2",
+    "expo-image-picker": "10.2.3",
+    "expo-linking": "2.3.1",
+    "expo-localization": "10.2.0",
+    "expo-notifications": "0.12.3",
+    "expo-permissions": "^12.1.1",
+    "expo-random": "11.2.0",
+    "expo-screen-capture": "3.2.0",
+    "expo-secure-store": "10.2.0",
+    "expo-splash-screen": "0.11.4",
+    "expo-status-bar": "1.0.4",
+    "expo-store-review": "4.1.0",
+    "expo-updates": "^0.8.5",
+    "expo-video-thumbnails": "^5.2.1",
+    "expo-web-browser": "9.2.0",
+    "i18next": "20.6.1",
+    "li": "1.3.0",
+    "lodash": "4.17.21",
    "react": "17.0.2",
    "react-dom": "17.0.2",
-    "react-i18next": "^11.9.0",
-    "react-native": "~0.64.1",
-    "react-native-animated-spinkit": "^1.5.2",
-    "react-native-blurhash": "^1.1.4",
-    "react-native-fast-image": "^8.3.4",
-    "react-native-feather": "^1.0.2",
-    "react-native-flash-message": "^0.1.23",
-    "react-native-gesture-handler": "~1.10.3",
-    "react-native-htmlview": "^0.16.0",
-    "react-native-pager-view": "5.1.9",
-    "react-native-reanimated": "~2.1.0",
+    "react-i18next": "11.12.0",
+    "react-native": "0.64.2",
+    "react-native-animated-spinkit": "1.5.2",
+    "react-native-blurhash": "1.1.5",
+    "react-native-fast-image": "8.5.6",
+    "react-native-feather": "1.1.2",
+    "react-native-flash-message": "0.1.24",
+    "react-native-gesture-handler": "1.10.3",
+    "react-native-htmlview": "0.16.0",
+    "react-native-pager-view": "5.4.4",
+    "react-native-reanimated": "2.2.2",
    "react-native-safe-area-context": "3.2.0",
-    "react-native-screens": "~3.3.0",
+    "react-native-screens": "3.7.2",
    "react-native-svg": "12.1.1",
-    "react-native-swipe-list-view": "^3.2.7",
-    "react-native-tab-view": "^3.0.1",
-    "react-native-unimodules": "~0.13.3",
-    "react-query": "^3.16.0",
-    "react-redux": "^7.2.4",
-    "react-timeago": "^5.2.0",
-    "redux-persist": "^6.0.0",
-    "rn-placeholder": "^3.0.3",
-    "sentry-expo": "^3.1.3",
-    "tslib": "^2.2.0",
-    "valid-url": "^1.0.9"
+    "react-native-swipe-list-view": "3.2.9",
+    "react-native-tab-view": "3.1.1",
+    "react-native-unimodules": "0.14.8",
+    "react-query": "3.23.2",
+    "react-redux": "7.2.5",
+    "react-timeago": "6.2.1",
+    "redux-persist": "6.0.0",
+    "rn-placeholder": "3.0.3",
+    "sentry-expo": "4.0.1",
+    "tslib": "2.3.1",
+    "valid-url": "1.0.9"
  },
  "devDependencies": {
-    "@babel/core": "~7.14.3",
-    "@babel/plugin-proposal-optional-chaining": "^7.14.2",
-    "@babel/preset-typescript": "^7.13.0",
-    "@expo/config": "^3.3.43",
-    "@jest/types": "^26.6.2",
-    "@testing-library/jest-native": "^4.0.1",
-    "@testing-library/react-hooks": "^5.1.2",
-    "@testing-library/react-native": "^7.2.0",
-    "@types/jest": "^26.0.23",
-    "@types/lodash": "^4.14.170",
-    "@types/react": "~17.0.8",
-    "@types/react-dom": "~17.0.5",
-    "@types/react-native": "~0.64.6",
-    "@types/react-navigation": "^3.4.0",
-    "@types/react-redux": "^7.1.16",
-    "@types/react-test-renderer": "^17.0.1",
-    "@types/react-timeago": "^4.1.2",
-    "@types/valid-url": "^1.0.3",
-    "@welldone-software/why-did-you-render": "^6.1.4",
-    "babel-jest": "~26.6.3",
-    "babel-plugin-module-resolver": "^4.1.0",
-    "babel-plugin-transform-remove-console": "^6.9.4",
-    "chalk": "^4.1.1",
-    "dotenv": "^10.0.0",
-    "jest": "^26.6.3",
-    "jest-expo": "^41.0.0",
-    "nock": "^13.0.11",
-    "react-native-clean-project": "^3.6.4",
-    "react-navigation": "^4.4.4",
-    "react-navigation-stack": "^2.10.4",
-    "react-test-renderer": "^17.0.2",
-    "typescript": "~4.2.4"
+    "@babel/core": "7.15.5",
+    "@babel/plugin-proposal-optional-chaining": "7.14.5",
+    "@babel/preset-typescript": "7.15.0",
+    "@expo/config": "5.0.9",
+    "@jest/types": "27.1.0",
+    "@testing-library/jest-native": "4.0.2",
+    "@testing-library/react-hooks": "7.0.1",
+    "@testing-library/react-native": "7.2.0",
+    "@types/jest": "27.0.1",
+    "@types/lodash": "4.14.172",
+    "@types/react": "17.0.19",
+    "@types/react-dom": "17.0.9",
+    "@types/react-native": "0.64.13",
+    "@types/react-navigation": "3.4.0",
+    "@types/react-redux": "7.1.18",
+    "@types/react-test-renderer": "17.0.1",
+    "@types/react-timeago": "4.1.3",
+    "@types/valid-url": "1.0.3",
+    "@welldone-software/why-did-you-render": "6.2.1",
+    "babel-jest": "27.1.0",
+    "babel-plugin-module-resolver": "4.1.0",
+    "babel-plugin-transform-remove-console": "6.9.4",
+    "chalk": "4.1.2",
+    "dotenv": "10.0.0",
+    "jest": "27.1.0",
+    "jest-expo": "42.1.0",
+    "nock": "13.1.3",
+    "react-native-clean-project": "3.6.7",
+    "react-navigation": "4.4.4",
+    "react-navigation-stack": "2.10.4",
+    "react-test-renderer": "17.0.2",
+    "typescript": "4.4.3"
  }
 }
--- a/src/@types/react-navigation.d.ts
+++ b/src/@types/react-navigation.d.ts
@ -1,152 +0,0 @@
-declare namespace Nav {
-  type RootStackParamList = {
-    'Screen-Tabs': undefined
-    'Screen-Actions':
-      | {
-          type: 'status'
-          queryKey: QueryKeyTimeline
-          rootQueryKey?: QueryKeyTimeline
-          status: Mastodon.Status
-        }
-      | {
-          type: 'account'
-          account: Mastodon.Account
-        }
-      | {
-          type: 'notifications_filter'
-        }
-    'Screen-Announcements': { showAll: boolean }
-    'Screen-Compose':
-      | {
-          type: 'edit'
-          incomingStatus: Mastodon.Status
-          replyToStatus?: Mastodon.Status
-          queryKey?: [
-            'Timeline',
-            {
-              page: App.Pages
-              hashtag?: Mastodon.Tag['name']
-              list?: Mastodon.List['id']
-              toot?: Mastodon.Status['id']
-              account?: Mastodon.Account['id']
-            }
-          ]
-        }
-      | {
-          type: 'reply'
-          incomingStatus: Mastodon.Status
-          accts: Mastodon.Account['acct'][]
-          queryKey?: [
-            'Timeline',
-            {
-              page: App.Pages
-              hashtag?: Mastodon.Tag['name']
-              list?: Mastodon.List['id']
-              toot?: Mastodon.Status['id']
-              account?: Mastodon.Account['id']
-            }
-          ]
-        }
-      | {
-          type: 'conversation'
-          accts: Mastodon.Account['acct'][]
-        }
-      | undefined
-    'Screen-ImagesViewer': {
-      imageUrls: {
-        id: Mastodon.Attachment['id']
-        preview_url: Mastodon.AttachmentImage['preview_url']
-        url: Mastodon.AttachmentImage['url']
-        remote_url?: Mastodon.AttachmentImage['remote_url']
-        blurhash: Mastodon.AttachmentImage['blurhash']
-        width?: number
-        height?: number
-      }[]
-      id: Mastodon.Attachment['id']
-    }
-  }
-
-  type ScreenComposeStackParamList = {
-    'Screen-Compose-Root': undefined
-    'Screen-Compose-EditAttachment': { index: number }
-    'Screen-Compose-DraftsList': { timestamp: number }
-  }
-
-  type ScreenTabsStackParamList = {
-    'Tab-Local': undefined
-    'Tab-Public': undefined
-    'Tab-Compose': undefined
-    'Tab-Notifications': undefined
-    'Tab-Me': undefined
-  }
-
-  type TabSharedStackParamList = {
-    'Tab-Shared-Account': {
-      account: Mastodon.Account | Mastodon.Mention
-    }
-    'Tab-Shared-Attachments': { account: Mastodon.Account }
-    'Tab-Shared-Hashtag': {
-      hashtag: Mastodon.Tag['name']
-    }
-    'Tab-Shared-Search': { text: string | undefined }
-    'Tab-Shared-Toot': {
-      toot: Mastodon.Status
-      rootQueryKey?: QueryKeyTimeline
-    }
-    'Tab-Shared-Users':
-      | {
-          reference: 'accounts'
-          id: Mastodon.Account['id']
-          type: 'following' | 'followers'
-          count: number
-        }
-      | {
-          reference: 'statuses'
-          id: Mastodon.Status['id']
-          type: 'reblogged_by' | 'favourited_by'
-          count: number
-        }
-  }
-
-  type TabLocalStackParamList = {
-    'Tab-Local-Root': undefined
-  } & TabSharedStackParamList
-
-  type TabPublicStackParamList = {
-    'Tab-Public-Root': undefined
-  } & TabSharedStackParamList
-
-  type TabNotificationsStackParamList = {
-    'Tab-Notifications-Root': undefined
-  } & TabSharedStackParamList
-
-  type TabMeStackParamList = {
-    'Tab-Me-Root': undefined
-    'Tab-Me-Bookmarks': undefined
-    'Tab-Me-Conversations': undefined
-    'Tab-Me-Favourites': undefined
-    '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
-    'Tab-Me-Settings-Fontsize': undefined
-    'Tab-Me-Switch': undefined
-  } & TabSharedStackParamList
-
-  type TabMeProfileStackParamList = {
-    'Tab-Me-Profile-Root': undefined
-    'Tab-Me-Profile-Name': {
-      display_name: Mastodon.Account['display_name']
-    }
-    'Tab-Me-Profile-Note': {
-      note: Mastodon.Source['note']
-    }
-    'Tab-Me-Profile-Fields': {
-      fields?: Mastodon.Source['fields']
-    }
-  }
-}
--- a/src/Screens.tsx
+++ b/src/Screens.tsx
@ -1,13 +1,15 @@
-import { HeaderCenter, HeaderLeft } from '@components/Header'
+import { HeaderLeft } from '@components/Header'
 import { displayMessage, Message, removeMessage } from '@components/Message'
 import navigationRef from '@helpers/navigationRef'
 import { useNetInfo } from '@react-native-community/netinfo'
 import { NavigationContainer } from '@react-navigation/native'
+import { createNativeStackNavigator } from '@react-navigation/native-stack'
 import ScreenActions from '@screens/Actions'
 import ScreenAnnouncements from '@screens/Announcements'
 import ScreenCompose from '@screens/Compose'
 import ScreenImagesViewer from '@screens/ImagesViewer'
 import ScreenTabs from '@screens/Tabs'
+import { RootStackParamList } from '@utils/navigation/navigators'
 import pushUseConnect from '@utils/push/useConnect'
 import pushUseReceive from '@utils/push/useReceive'
 import pushUseRespond from '@utils/push/useRespond'
@ -22,12 +24,11 @@ import { addScreenshotListener } from 'expo-screen-capture'
 import React, { useCallback, useEffect, useRef } from 'react'
 import { useTranslation } from 'react-i18next'
 import { Alert, Platform, StatusBar } from 'react-native'
-import { createNativeStackNavigator } from 'react-native-screens/native-stack'
 import { onlineManager, useQueryClient } from 'react-query'
 import { useDispatch, useSelector } from 'react-redux'
 import * as Sentry from 'sentry-expo'

-const Stack = createNativeStackNavigator<Nav.RootStackParamList>()
+const Stack = createNativeStackNavigator<RootStackParamList>()

 export interface Props {
  localCorrupt?: string
@ -71,9 +72,9 @@ const Screens: React.FC<Props> = ({ localCorrupt }) => {
    (prev, next) => prev.length === next.length
  )
  const queryClient = useQueryClient()
-  pushUseConnect({ navigationRef, mode, t, instances, dispatch })
-  pushUseReceive({ navigationRef, queryClient, instances })
-  pushUseRespond({ navigationRef, queryClient, instances, dispatch })
+  pushUseConnect({ mode, t, instances, dispatch })
+  pushUseReceive({ queryClient, instances })
+  pushUseRespond({ queryClient, instances, dispatch })

  // Prevent screenshot alert
  useEffect(() => {
@ -96,7 +97,7 @@ const Screens: React.FC<Props> = ({ localCorrupt }) => {
          type: 'error',
          mode
        })
-        navigationRef.current?.navigate('Screen-Tabs', {
+        navigationRef.navigate('Screen-Tabs', {
          screen: 'Tab-Me'
        })
      }
@ -114,7 +115,7 @@ const Screens: React.FC<Props> = ({ localCorrupt }) => {

  // Callbacks
  const navigationContainerOnReady = useCallback(() => {
-    const currentRoute = navigationRef.current?.getCurrentRoute()
+    const currentRoute = navigationRef.getCurrentRoute()
    routeRef.current = {
      name: currentRoute?.name,
      params: currentRoute?.params
@ -124,7 +125,7 @@ const Screens: React.FC<Props> = ({ localCorrupt }) => {
  }, [])
  const navigationContainerOnStateChange = useCallback(() => {
    const previousRoute = routeRef.current
-    const currentRoute = navigationRef.current?.getCurrentRoute()
+    const currentRoute = navigationRef.getCurrentRoute()

    const matchTabName = currentRoute?.name?.match(/(Tab-.*)-Root/)
    if (matchTabName) {
@ -166,8 +167,8 @@ const Screens: React.FC<Props> = ({ localCorrupt }) => {
            name='Screen-Actions'
            component={ScreenActions}
            options={{
-              stackPresentation: 'transparentModal',
-              stackAnimation: 'fade',
+              presentation: 'transparentModal',
+              animation: 'fade',
              headerShown: false
            }}
          />
@ -175,38 +176,33 @@ const Screens: React.FC<Props> = ({ localCorrupt }) => {
            name='Screen-Announcements'
            component={ScreenAnnouncements}
            options={({ navigation }) => ({
-              stackPresentation: 'transparentModal',
-              stackAnimation: 'fade',
+              presentation: 'transparentModal',
+              animation: 'fade',
              headerShown: true,
-              headerHideShadow: true,
-              headerTopInsetEnabled: false,
+              headerShadowVisible: false,
+              headerTransparent: true,
              headerStyle: { backgroundColor: 'transparent' },
              headerLeft: () => (
                <HeaderLeft content='X' onPress={() => navigation.goBack()} />
              ),
-              headerTitle: t('screenAnnouncements:heading'),
-              ...(Platform.OS === 'android' && {
-                headerCenter: () => (
-                  <HeaderCenter content={t('screenAnnouncements:heading')} />
-                )
-              })
+              headerTitle: t('screenAnnouncements:heading')
            })}
          />
          <Stack.Screen
            name='Screen-Compose'
            component={ScreenCompose}
            options={{
-              stackPresentation: 'fullScreenModal',
-              ...(Platform.OS === 'android' && { headerShown: false })
+              headerShown: false,
+              presentation: 'fullScreenModal'
            }}
          />
          <Stack.Screen
            name='Screen-ImagesViewer'
            component={ScreenImagesViewer}
            options={{
-              stackPresentation: 'fullScreenModal',
-              stackAnimation: 'fade',
-              ...(Platform.OS === 'android' && { headerShown: false })
+              headerShown: false,
+              presentation: 'fullScreenModal',
+              animation: 'fade'
            }}
          />
        </Stack.Navigator>
--- a/src/api/general.ts
+++ b/src/api/general.ts
@ -46,7 +46,7 @@ const apiGeneral = async <T = unknown>({
    params,
    headers: {
      'Content-Type': 'application/json',
-      'User-Agent': `tooot/${Constants.manifest.version}`,
+      'User-Agent': `tooot/${Constants.manifest?.version}`,
      Accept: '*/*',
      ...headers
    },
--- a/src/api/instance.ts
+++ b/src/api/instance.ts
@ -68,7 +68,7 @@ const apiInstance = async <T = unknown>({
    params,
    headers: {
      'Content-Type': 'application/json',
-      'User-Agent': `tooot/${Constants.manifest.version}`,
+      'User-Agent': `tooot/${Constants.manifest?.version}`,
      Accept: '*/*',
      ...headers,
      ...(token && {
--- a/src/api/tooot.ts
+++ b/src/api/tooot.ts
@ -28,7 +28,7 @@ const apiTooot = async <T = unknown>({
  body,
  sentry = false
 }: Params): Promise<{ body: T }> => {
-  const key = Constants.manifest.extra?.toootApiKey
+  const key = Constants.manifest?.extra?.toootApiKey

  console.log(
    ctx.bgGreen.bold(' API tooot ') +
@ -49,7 +49,7 @@ const apiTooot = async <T = unknown>({
    headers: {
      ...(key && { 'x-tooot-key': key }),
      'Content-Type': 'application/json',
-      'User-Agent': `tooot/${Constants.manifest.version}`,
+      'User-Agent': `tooot/${Constants.manifest?.version}`,
      Accept: '*/*',
      ...headers
    },
--- a/src/components/Account.tsx
+++ b/src/components/Account.tsx
@ -1,6 +1,7 @@
 import { ParseEmojis } from '@components/Parse'
 import { useNavigation } from '@react-navigation/native'
 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'
@ -21,7 +22,7 @@ const ComponentAccount: React.FC<Props> = ({
 }) => {
  const { theme } = useTheme()
  const navigation = useNavigation<
-    StackNavigationProp<Nav.TabLocalStackParamList>
+    StackNavigationProp<TabLocalStackParamList>
  >()

  const onPress = useCallback(() => {
--- a/src/components/Instance/Auth.tsx
+++ b/src/components/Instance/Auth.tsx
@ -1,4 +1,5 @@
 import { useNavigation } from '@react-navigation/native'
+import { TabMeStackNavigationProp } from '@utils/navigation/navigators'
 import addInstance from '@utils/slices/instances/add'
 import { Instance } from '@utils/slices/instancesSlice'
 import * as AuthSession from 'expo-auth-session'
@ -21,7 +22,9 @@ const InstanceAuth = React.memo(
      useProxy: false
    })

-    const navigation = useNavigation()
+    const navigation = useNavigation<
+      TabMeStackNavigationProp<'Tab-Me-Root' | 'Tab-Me-Switch'>
+    >()
    const queryClient = useQueryClient()
    const dispatch = useDispatch()

--- a/src/components/Timeline/Default.tsx
+++ b/src/components/Timeline/Default.tsx
@ -10,10 +10,9 @@ import TimelinePoll from '@components/Timeline/Shared/Poll'
 import { useNavigation } from '@react-navigation/native'
 import { StackNavigationProp } from '@react-navigation/stack'
 import { QueryKeyTimeline } from '@utils/queryHooks/timeline'
-import { getInstance, getInstanceAccount } from '@utils/slices/instancesSlice'
+import { getInstanceAccount } from '@utils/slices/instancesSlice'
 import { StyleConstants } from '@utils/styles/constants'
 import { useTheme } from '@utils/styles/ThemeManager'
-import htmlparser2 from 'htmlparser2-without-node-native'
 import { uniqBy } from 'lodash'
 import React, { useCallback } from 'react'
 import { Pressable, StyleSheet, View } from 'react-native'
--- a/src/components/Timeline/Shared/Attachment.tsx
+++ b/src/components/Timeline/Shared/Attachment.tsx
@ -6,6 +6,7 @@ import AttachmentImage from '@components/Timeline/Shared/Attachment/Image'
 import AttachmentUnsupported from '@components/Timeline/Shared/Attachment/Unsupported'
 import AttachmentVideo from '@components/Timeline/Shared/Attachment/Video'
 import { useNavigation } from '@react-navigation/native'
+import { RootStackParamList } from '@utils/navigation/navigators'
 import { StyleConstants } from '@utils/styles/constants'
 import layoutAnimation from '@utils/styles/layoutAnimation'
 import React, { useCallback, useMemo, useRef, useState } from 'react'
@ -35,7 +36,7 @@ const TimelineAttachment = React.memo(
    }, [])

    const imageUrls = useRef<
-      Nav.RootStackParamList['Screen-ImagesViewer']['imageUrls']
+      RootStackParamList['Screen-ImagesViewer']['imageUrls']
    >([])
    const navigation = useNavigation()
    useEffect(() => {
--- a/src/components/Timeline/Shared/Attachment/Video.tsx
+++ b/src/components/Timeline/Shared/Attachment/Video.tsx
@ -1,8 +1,14 @@
 import Button from '@components/Button'
 import { StyleConstants } from '@utils/styles/constants'
 import { Video } from 'expo-av'
-import React, { useCallback, useRef, useState } from 'react'
-import { Pressable, StyleSheet, View } from 'react-native'
+import React, { useCallback, useEffect, useRef, useState } from 'react'
+import {
+  AppState,
+  AppStateStatus,
+  Pressable,
+  StyleSheet,
+  View
+} from 'react-native'
 import { Blurhash } from 'react-native-blurhash'
 import attachmentAspectRatio from './aspectRatio'
 import analytics from '@components/analytics'
@ -45,15 +51,43 @@ const AttachmentVideo: React.FC<Props> = ({
    videoPlayer.current?.setOnPlaybackStatusUpdate(props => {
      if (props.isLoaded) {
        setVideoLoaded(true)
-      }
-      // @ts-ignore
-      if (props.positionMillis) {
-        // @ts-ignore
-        setVideoPosition(props.positionMillis)
+        if (props.positionMillis) {
+          setVideoPosition(props.positionMillis)
+        }
      }
    })
  }, [videoLoaded, videoPosition])

+  const appState = useRef(AppState.currentState)
+  useEffect(() => {
+    AppState.addEventListener('change', _handleAppStateChange)
+
+    return () => {
+      AppState.removeEventListener('change', _handleAppStateChange)
+    }
+  }, [])
+  const _handleAppStateChange = async (nextAppState: AppStateStatus) => {
+    if (appState.current.match(/active/) && nextAppState.match(/inactive/)) {
+      await videoPlayer.current?.pauseAsync()
+    } 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={[
@ -83,16 +117,15 @@ const AttachmentVideo: React.FC<Props> = ({
              posterStyle: { resizeMode: 'cover' }
            })}
        useNativeControls={false}
-        onFullscreenUpdate={event => {
+        onFullscreenUpdate={async event => {
          if (
            event.fullscreenUpdate ===
            Video.FULLSCREEN_UPDATE_PLAYER_DID_DISMISS
          ) {
            if (gifv) {
-              videoPlayer.current?.setIsLoopingAsync(true)
-              videoPlayer.current?.playAsync()
+              await videoPlayer.current?.pauseAsync()
            } else {
-              videoPlayer.current?.pauseAsync()
+              await videoPlayer.current?.pauseAsync()
            }
          }
        }}
@ -108,7 +141,7 @@ const AttachmentVideo: React.FC<Props> = ({
              }}
            />
          ) : null
-        ) : !gifv ? (
+        ) : !gifv || (gifv && playerStatus.current === false) ? (
          <Button
            round
            overlay
--- a/src/components/openLink.ts
+++ b/src/components/openLink.ts
@ -1,6 +1,5 @@
 import apiInstance from '@api/instance'
 import navigationRef from '@helpers/navigationRef'
-import { NavigationProp, ParamListBase } from '@react-navigation/native'
 import { store } from '@root/store'
 import { SearchResult } from '@utils/queryHooks/search'
 import { getInstanceUrl } from '@utils/slices/instancesSlice'
@ -22,24 +21,7 @@ const matcherAccount = new RegExp(

 export let loadingLink = false

-const openLink = async (
-  url: string,
-  navigation?: NavigationProp<
-    ParamListBase,
-    string,
-    Readonly<{
-      key: string
-      index: number
-      routeNames: string[]
-      history?: unknown[] | undefined
-      routes: any[]
-      type: string
-      stale: false
-    }>,
-    {},
-    {}
-  >
-) => {
+const openLink = async (url: string, navigation?: any) => {
  if (loadingLink) {
    return
  }
@ -52,7 +34,7 @@ const openLink = async (
      // @ts-ignore
      navigation.push(page, options)
    } else {
-      navigationRef.current?.navigate(page, options)
+      navigationRef.navigate(page, options)
    }
  }

--- a/src/helpers/navigationRef.ts
+++ b/src/helpers/navigationRef.ts
@ -1,6 +1,6 @@
-import { NavigationContainerRef } from '@react-navigation/native'
-import { createRef } from 'react'
+import { createNavigationContainerRef } from '@react-navigation/native'
+import { RootStackParamList } from '@utils/navigation/navigators'

-const navigationRef = createRef<NavigationContainerRef>()
+const navigationRef = createNavigationContainerRef<RootStackParamList>()

 export default navigationRef
--- a/src/screens/Actions.tsx
+++ b/src/screens/Actions.tsx
@ -1,22 +1,244 @@
-import { StackScreenProps } from '@react-navigation/stack'
-import React from 'react'
-import { SafeAreaProvider } from 'react-native-safe-area-context'
-import ScreenActionsRoot from './Actions/Root'
-
-export type ScreenAccountProp = StackScreenProps<
-  Nav.RootStackParamList,
-  'Screen-Actions'
->
+import analytics from '@components/analytics'
+import Button from '@components/Button'
+import { RootStackScreenProps } from '@utils/navigation/navigators'
+import {
+  getInstanceAccount,
+  getInstanceUrl
+} from '@utils/slices/instancesSlice'
+import { StyleConstants } from '@utils/styles/constants'
+import { useTheme } from '@utils/styles/ThemeManager'
+import React, { useCallback, useEffect, useMemo } from 'react'
+import { useTranslation } from 'react-i18next'
+import { Dimensions, StyleSheet, View } from 'react-native'
+import {
+  PanGestureHandler,
+  State,
+  TapGestureHandler
+} from 'react-native-gesture-handler'
+import Animated, {
+  Extrapolate,
+  interpolate,
+  runOnJS,
+  useAnimatedGestureHandler,
+  useAnimatedStyle,
+  useSharedValue,
+  withTiming
+} from 'react-native-reanimated'
+import {
+  SafeAreaProvider,
+  useSafeAreaInsets
+} from 'react-native-safe-area-context'
+import { useSelector } from 'react-redux'
+import ActionsAccount from './Actions/Account'
+import ActionsDomain from './Actions/Domain'
+import ActionsNotificationsFilter from './Actions/NotificationsFilter'
+import ActionsShare from './Actions/Share'
+import ActionsStatus from './Actions/Status'

 const ScreenActions = React.memo(
-  (props: ScreenAccountProp) => {
+  ({
+    route: { params },
+    navigation
+  }: RootStackScreenProps<'Screen-Actions'>) => {
+    const { t } = useTranslation()
+
+    const instanceAccount = useSelector(
+      getInstanceAccount,
+      (prev, next) => prev?.id === next?.id
+    )
+    let sameAccount = false
+    switch (params.type) {
+      case 'status':
+        sameAccount = instanceAccount?.id === params.status.account.id
+        break
+      case 'account':
+        sameAccount = instanceAccount?.id === params.account.id
+        break
+    }
+
+    const instanceDomain = useSelector(getInstanceUrl)
+    let sameDomain = true
+    let statusDomain: string
+    switch (params.type) {
+      case 'status':
+        statusDomain = params.status.uri
+          ? params.status.uri.split(new RegExp(/\/\/(.*?)\//))[1]
+          : ''
+        sameDomain = instanceDomain === statusDomain
+        break
+    }
+
+    const { theme } = useTheme()
+    const insets = useSafeAreaInsets()
+
+    const DEFAULT_VALUE = 350
+    const screenHeight = Dimensions.get('screen').height
+    const panY = useSharedValue(DEFAULT_VALUE)
+    useEffect(() => {
+      panY.value = withTiming(0)
+    }, [])
+    const styleTop = useAnimatedStyle(() => {
+      return {
+        bottom: interpolate(
+          panY.value,
+          [0, screenHeight],
+          [0, -screenHeight],
+          Extrapolate.CLAMP
+        )
+      }
+    })
+    const dismiss = useCallback(() => {
+      navigation.goBack()
+    }, [])
+    const onGestureEvent = useAnimatedGestureHandler({
+      onActive: ({ translationY }) => {
+        panY.value = translationY
+      },
+      onEnd: ({ velocityY }) => {
+        if (velocityY > 500) {
+          runOnJS(dismiss)()
+        } else {
+          panY.value = withTiming(0)
+        }
+      }
+    })
+
+    const actions = useMemo(() => {
+      switch (params.type) {
+        case 'status':
+          return (
+            <>
+              {!sameAccount ? (
+                <ActionsAccount
+                  queryKey={params.queryKey}
+                  rootQueryKey={params.rootQueryKey}
+                  account={params.status.account}
+                  dismiss={dismiss}
+                />
+              ) : null}
+              {sameAccount && params.status ? (
+                <ActionsStatus
+                  navigation={navigation}
+                  queryKey={params.queryKey}
+                  rootQueryKey={params.rootQueryKey}
+                  status={params.status}
+                  dismiss={dismiss}
+                />
+              ) : null}
+              {!sameDomain && statusDomain ? (
+                <ActionsDomain
+                  queryKey={params.queryKey}
+                  rootQueryKey={params.rootQueryKey}
+                  domain={statusDomain}
+                  dismiss={dismiss}
+                />
+              ) : null}
+              {params.status.visibility !== 'direct' ? (
+                <ActionsShare
+                  url={params.status.url || params.status.uri}
+                  type={params.type}
+                  dismiss={dismiss}
+                />
+              ) : null}
+              <Button
+                type='text'
+                content={t('common:buttons.cancel')}
+                onPress={() => {
+                  analytics('bottomsheet_acknowledge')
+                }}
+                style={styles.button}
+              />
+            </>
+          )
+        case 'account':
+          return (
+            <>
+              {!sameAccount ? (
+                <ActionsAccount account={params.account} dismiss={dismiss} />
+              ) : null}
+              <ActionsShare
+                url={params.account.url}
+                type={params.type}
+                dismiss={dismiss}
+              />
+              <Button
+                type='text'
+                content={t('common:buttons.cancel')}
+                onPress={() => {
+                  analytics('bottomsheet_acknowledge')
+                }}
+                style={styles.button}
+              />
+            </>
+          )
+        case 'notifications_filter':
+          return <ActionsNotificationsFilter />
+      }
+    }, [])
+
    return (
      <SafeAreaProvider>
-        <ScreenActionsRoot {...props} />
+        <Animated.View style={{ flex: 1 }}>
+          <TapGestureHandler
+            onHandlerStateChange={({ nativeEvent }) => {
+              if (nativeEvent.state === State.ACTIVE) {
+                dismiss()
+              }
+            }}
+          >
+            <Animated.View
+              style={[
+                styles.overlay,
+                { backgroundColor: theme.backgroundOverlayInvert }
+              ]}
+            >
+              <PanGestureHandler onGestureEvent={onGestureEvent}>
+                <Animated.View
+                  style={[
+                    styles.container,
+                    styleTop,
+                    {
+                      backgroundColor: theme.backgroundDefault,
+                      paddingBottom: insets.bottom || StyleConstants.Spacing.L
+                    }
+                  ]}
+                >
+                  <View
+                    style={[
+                      styles.handle,
+                      { backgroundColor: theme.primaryOverlay }
+                    ]}
+                  />
+                  {actions}
+                </Animated.View>
+              </PanGestureHandler>
+            </Animated.View>
+          </TapGestureHandler>
+        </Animated.View>
      </SafeAreaProvider>
    )
  },
  () => true
 )

+const styles = StyleSheet.create({
+  overlay: {
+    flex: 1,
+    justifyContent: 'flex-end'
+  },
+  container: {
+    paddingTop: StyleConstants.Spacing.M
+  },
+  handle: {
+    alignSelf: 'center',
+    width: StyleConstants.Spacing.S * 8,
+    height: StyleConstants.Spacing.S / 2,
+    borderRadius: 100,
+    top: -StyleConstants.Spacing.M * 2
+  },
+  button: {
+    marginHorizontal: StyleConstants.Spacing.Global.PagePadding * 2
+  }
+})
+
 export default ScreenActions
--- a/src/screens/Actions/Root.tsx
+++ b/src/screens/Actions/Root.tsx
@ -1,241 +0,0 @@
-import analytics from '@components/analytics'
-import Button from '@components/Button'
-import { StackScreenProps } from '@react-navigation/stack'
-import {
-  getInstanceAccount,
-  getInstanceUrl
-} from '@utils/slices/instancesSlice'
-import { StyleConstants } from '@utils/styles/constants'
-import { useTheme } from '@utils/styles/ThemeManager'
-import React, { useCallback, useEffect, useMemo } from 'react'
-import { useTranslation } from 'react-i18next'
-import { Dimensions, StyleSheet, View } from 'react-native'
-import {
-  PanGestureHandler,
-  State,
-  TapGestureHandler
-} from 'react-native-gesture-handler'
-import Animated, {
-  Extrapolate,
-  interpolate,
-  runOnJS,
-  useAnimatedGestureHandler,
-  useAnimatedStyle,
-  useSharedValue,
-  withTiming
-} from 'react-native-reanimated'
-import { useSafeAreaInsets } from 'react-native-safe-area-context'
-import { useSelector } from 'react-redux'
-import ActionsAccount from './Account'
-import ActionsDomain from './Domain'
-import ActionsNotificationsFilter from './NotificationsFilter'
-import ActionsShare from './Share'
-import ActionsStatus from './Status'
-
-export type ScreenAccountProp = StackScreenProps<
-  Nav.RootStackParamList,
-  'Screen-Actions'
->
-
-const ScreenActionsRoot = React.memo(
-  ({ route: { params }, navigation }: ScreenAccountProp) => {
-    const { t } = useTranslation()
-
-    const instanceAccount = useSelector(
-      getInstanceAccount,
-      (prev, next) => prev?.id === next?.id
-    )
-    let sameAccount = false
-    switch (params.type) {
-      case 'status':
-        sameAccount = instanceAccount?.id === params.status.account.id
-        break
-      case 'account':
-        sameAccount = instanceAccount?.id === params.account.id
-        break
-    }
-
-    const instanceDomain = useSelector(getInstanceUrl)
-    let sameDomain = true
-    let statusDomain: string
-    switch (params.type) {
-      case 'status':
-        statusDomain = params.status.uri
-          ? params.status.uri.split(new RegExp(/\/\/(.*?)\//))[1]
-          : ''
-        sameDomain = instanceDomain === statusDomain
-        break
-    }
-
-    const { theme } = useTheme()
-    const insets = useSafeAreaInsets()
-
-    const DEFAULT_VALUE = 350
-    const screenHeight = Dimensions.get('screen').height
-    const panY = useSharedValue(DEFAULT_VALUE)
-    useEffect(() => {
-      panY.value = withTiming(0)
-    }, [])
-    const styleTop = useAnimatedStyle(() => {
-      return {
-        bottom: interpolate(
-          panY.value,
-          [0, screenHeight],
-          [0, -screenHeight],
-          Extrapolate.CLAMP
-        )
-      }
-    })
-    const dismiss = useCallback(() => {
-      navigation.goBack()
-    }, [])
-    const onGestureEvent = useAnimatedGestureHandler({
-      onActive: ({ translationY }) => {
-        panY.value = translationY
-      },
-      onEnd: ({ velocityY }) => {
-        if (velocityY > 500) {
-          runOnJS(dismiss)()
-        } else {
-          panY.value = withTiming(0)
-        }
-      }
-    })
-
-    const actions = useMemo(() => {
-      switch (params.type) {
-        case 'status':
-          return (
-            <>
-              {!sameAccount ? (
-                <ActionsAccount
-                  queryKey={params.queryKey}
-                  rootQueryKey={params.rootQueryKey}
-                  account={params.status.account}
-                  dismiss={dismiss}
-                />
-              ) : null}
-              {sameAccount && params.status ? (
-                <ActionsStatus
-                  navigation={navigation}
-                  queryKey={params.queryKey}
-                  rootQueryKey={params.rootQueryKey}
-                  status={params.status}
-                  dismiss={dismiss}
-                />
-              ) : null}
-              {!sameDomain && statusDomain ? (
-                <ActionsDomain
-                  queryKey={params.queryKey}
-                  rootQueryKey={params.rootQueryKey}
-                  domain={statusDomain}
-                  dismiss={dismiss}
-                />
-              ) : null}
-              {params.status.visibility !== 'direct' ? (
-                <ActionsShare
-                  url={params.status.url || params.status.uri}
-                  type={params.type}
-                  dismiss={dismiss}
-                />
-              ) : null}
-              <Button
-                type='text'
-                content={t('common:buttons.cancel')}
-                onPress={() => {
-                  analytics('bottomsheet_acknowledge')
-                }}
-                style={styles.button}
-              />
-            </>
-          )
-        case 'account':
-          return (
-            <>
-              {!sameAccount ? (
-                <ActionsAccount account={params.account} dismiss={dismiss} />
-              ) : null}
-              <ActionsShare
-                url={params.account.url}
-                type={params.type}
-                dismiss={dismiss}
-              />
-              <Button
-                type='text'
-                content={t('common:buttons.cancel')}
-                onPress={() => {
-                  analytics('bottomsheet_acknowledge')
-                }}
-                style={styles.button}
-              />
-            </>
-          )
-        case 'notifications_filter':
-          return <ActionsNotificationsFilter />
-      }
-    }, [])
-
-    return (
-      <Animated.View style={{ flex: 1 }}>
-        <TapGestureHandler
-          onHandlerStateChange={({ nativeEvent }) => {
-            if (nativeEvent.state === State.ACTIVE) {
-              dismiss()
-            }
-          }}
-        >
-          <Animated.View
-            style={[
-              styles.overlay,
-              { backgroundColor: theme.backgroundOverlayInvert }
-            ]}
-          >
-            <PanGestureHandler onGestureEvent={onGestureEvent}>
-              <Animated.View
-                style={[
-                  styles.container,
-                  styleTop,
-                  {
-                    backgroundColor: theme.backgroundDefault,
-                    paddingBottom: insets.bottom || StyleConstants.Spacing.L
-                  }
-                ]}
-              >
-                <View
-                  style={[
-                    styles.handle,
-                    { backgroundColor: theme.primaryOverlay }
-                  ]}
-                />
-                {actions}
-              </Animated.View>
-            </PanGestureHandler>
-          </Animated.View>
-        </TapGestureHandler>
-      </Animated.View>
-    )
-  },
-  () => true
-)
-
-const styles = StyleSheet.create({
-  overlay: {
-    flex: 1,
-    justifyContent: 'flex-end'
-  },
-  container: {
-    paddingTop: StyleConstants.Spacing.M
-  },
-  handle: {
-    alignSelf: 'center',
-    width: StyleConstants.Spacing.S * 8,
-    height: StyleConstants.Spacing.S / 2,
-    borderRadius: 100,
-    top: -StyleConstants.Spacing.M * 2
-  },
-  button: {
-    marginHorizontal: StyleConstants.Spacing.Global.PagePadding * 2
-  }
-})
-
-export default ScreenActionsRoot
--- a/src/screens/Actions/Status.tsx
+++ b/src/screens/Actions/Status.tsx
@ -9,13 +9,14 @@ import {
  useTimelineMutation
 } from '@utils/queryHooks/timeline'
 import analytics from '@components/analytics'
-import { StackNavigationProp } from '@react-navigation/stack'
 import { displayMessage } from '@components/Message'
 import { useTheme } from '@utils/styles/ThemeManager'
 import apiInstance from '@api/instance'
+import { NativeStackNavigationProp } from '@react-navigation/native-stack'
+import { RootStackParamList } from '@utils/navigation/navigators'

 export interface Props {
-  navigation: StackNavigationProp<Nav.RootStackParamList, 'Screen-Actions'>
+  navigation: NativeStackNavigationProp<RootStackParamList, 'Screen-Actions'>
  queryKey: QueryKeyTimeline
  rootQueryKey?: QueryKeyTimeline
  status: Mastodon.Status
--- a/src/screens/Announcements.tsx
+++ b/src/screens/Announcements.tsx
@ -4,8 +4,8 @@ import haptics from '@components/haptics'
 import { ParseHTML } from '@components/Parse'
 import RelativeTime from '@components/RelativeTime'
 import { BlurView } from '@react-native-community/blur'
-import { StackScreenProps } from '@react-navigation/stack'
 import { useAccessibility } from '@utils/accessibility/AccessibilityManager'
+import { RootStackScreenProps } from '@utils/navigation/navigators'
 import {
  useAnnouncementMutation,
  useAnnouncementQuery
@ -20,12 +20,9 @@ import FastImage from 'react-native-fast-image'
 import { FlatList, ScrollView } from 'react-native-gesture-handler'
 import { SafeAreaView } from 'react-native-safe-area-context'

-export type ScreenAnnouncementsProp = StackScreenProps<
-  Nav.RootStackParamList,
+const ScreenAnnouncements: React.FC<RootStackScreenProps<
  'Screen-Announcements'
->
-
-const ScreenAnnouncements: React.FC<ScreenAnnouncementsProp> = ({
+>> = ({
  route: {
    params: { showAll = false }
  },
--- a/src/screens/Compose.tsx
+++ b/src/screens/Compose.tsx
@ -1,9 +1,10 @@
 import analytics from '@components/analytics'
 import { HeaderCenter, HeaderLeft, HeaderRight } from '@components/Header'
-import { StackScreenProps } from '@react-navigation/stack'
+import { createNativeStackNavigator } from '@react-navigation/native-stack'
 import haptics from '@root/components/haptics'
 import formatText from '@screens/Compose/formatText'
 import ComposeRoot from '@screens/Compose/Root'
+import { RootStackScreenProps } from '@utils/navigation/navigators'
 import { QueryKeyTimeline } from '@utils/queryHooks/timeline'
 import { updateStoreReview } from '@utils/slices/contextsSlice'
 import {
@ -31,7 +32,6 @@ import {
  StyleSheet
 } from 'react-native'
 import { SafeAreaView } from 'react-native-safe-area-context'
-import { createNativeStackNavigator } from 'react-native-screens/native-stack'
 import { useQueryClient } from 'react-query'
 import { useDispatch, useSelector } from 'react-redux'
 import * as Sentry from 'sentry-expo'
@ -43,14 +43,9 @@ import composeParseState from './Compose/utils/parseState'
 import composePost from './Compose/utils/post'
 import composeReducer from './Compose/utils/reducer'

-export type ScreenComposeProp = StackScreenProps<
-  Nav.RootStackParamList,
-  'Screen-Compose'
->
-
 const Stack = createNativeStackNavigator()

-const ScreenCompose: React.FC<ScreenComposeProp> = ({
+const ScreenCompose: React.FC<RootStackScreenProps<'Screen-Compose'>> = ({
  route: { params },
  navigation
 }) => {
@ -371,10 +366,7 @@ const ScreenCompose: React.FC<ScreenComposeProp> = ({
        edges={hasKeyboard ? ['top'] : ['top', 'bottom']}
      >
        <ComposeContext.Provider value={{ composeState, composeDispatch }}>
-          <Stack.Navigator
-            screenOptions={{ headerTopInsetEnabled: false }}
-            initialRouteName='Screen-Compose-Root'
-          >
+          <Stack.Navigator initialRouteName='Screen-Compose-Root'>
            <Stack.Screen
              name='Screen-Compose-Root'
              component={ComposeRoot}
@ -405,18 +397,12 @@ const ScreenCompose: React.FC<ScreenComposeProp> = ({
            <Stack.Screen
              name='Screen-Compose-DraftsList'
              component={ComposeDraftsList}
-              options={{
-                stackPresentation: 'modal',
-                ...(Platform.OS === 'android' && { headerShown: false })
-              }}
+              options={{ headerShown: false, presentation: 'modal' }}
            />
            <Stack.Screen
              name='Screen-Compose-EditAttachment'
              component={ComposeEditAttachment}
-              options={{
-                stackPresentation: 'modal',
-                ...(Platform.OS === 'android' && { headerShown: false })
-              }}
+              options={{ headerShown: false, presentation: 'modal' }}
            />
          </Stack.Navigator>
        </ComposeContext.Provider>
--- a/src/screens/Compose/DraftsList.tsx
+++ b/src/screens/Compose/DraftsList.tsx
@ -1,19 +1,16 @@
 import { HeaderCenter, HeaderLeft } from '@components/Header'
-import { StackScreenProps } from '@react-navigation/stack'
+import { createNativeStackNavigator } from '@react-navigation/native-stack'
+import { ScreenComposeStackScreenProps } from '@utils/navigation/navigators'
 import React, { useCallback } from 'react'
 import { useTranslation } from 'react-i18next'
 import { Platform } from 'react-native'
-import { createNativeStackNavigator } from 'react-native-screens/native-stack'
 import ComposeDraftsListRoot from './DraftsList/Root'

 const Stack = createNativeStackNavigator()

-export type ScreenComposeEditAttachmentProp = StackScreenProps<
-  Nav.ScreenComposeStackParamList,
+const ComposeDraftsList: React.FC<ScreenComposeStackScreenProps<
  'Screen-Compose-DraftsList'
->
-
-const ComposeDraftsList: React.FC<ScreenComposeEditAttachmentProp> = ({
+>> = ({
  route: {
    params: { timestamp }
  },
@ -37,7 +34,7 @@ const ComposeDraftsList: React.FC<ScreenComposeEditAttachmentProp> = ({
  )

  return (
-    <Stack.Navigator screenOptions={{ headerTopInsetEnabled: false }}>
+    <Stack.Navigator>
      <Stack.Screen
        name='Screen-Compose-EditAttachment-Root'
        children={children}
@ -49,7 +46,7 @@ const ComposeDraftsList: React.FC<ScreenComposeEditAttachmentProp> = ({
              <HeaderCenter content={t('content.draftsList.header.title')} />
            )
          }),
-          headerHideShadow: true
+          headerShadowVisible: false
        }}
      />
    </Stack.Navigator>
--- a/src/screens/Compose/EditAttachment.tsx
+++ b/src/screens/Compose/EditAttachment.tsx
@ -1,21 +1,18 @@
-import { HeaderCenter, HeaderLeft } from '@components/Header'
-import { StackScreenProps } from '@react-navigation/stack'
+import { HeaderLeft } from '@components/Header'
+import { createNativeStackNavigator } from '@react-navigation/native-stack'
+import { ScreenComposeStackScreenProps } from '@utils/navigation/navigators'
 import React, { useCallback } from 'react'
 import { useTranslation } from 'react-i18next'
 import { KeyboardAvoidingView, Platform } from 'react-native'
 import { SafeAreaView } from 'react-native-safe-area-context'
-import { createNativeStackNavigator } from 'react-native-screens/native-stack'
 import ComposeEditAttachmentRoot from './EditAttachment/Root'
 import ComposeEditAttachmentSubmit from './EditAttachment/Submit'

 const Stack = createNativeStackNavigator()

-export type ScreenComposeEditAttachmentProp = StackScreenProps<
-  Nav.ScreenComposeStackParamList,
+const ComposeEditAttachment: React.FC<ScreenComposeStackScreenProps<
  'Screen-Compose-EditAttachment'
->
-
-const ComposeEditAttachment: React.FC<ScreenComposeEditAttachmentProp> = ({
+>> = ({
  route: {
    params: { index }
  },
@ -45,21 +42,14 @@ const ComposeEditAttachment: React.FC<ScreenComposeEditAttachmentProp> = ({
      style={{ flex: 1 }}
    >
      <SafeAreaView style={{ flex: 1 }} edges={['left', 'right', 'bottom']}>
-        <Stack.Navigator screenOptions={{ headerTopInsetEnabled: false }}>
+        <Stack.Navigator>
          <Stack.Screen
            name='Screen-Compose-EditAttachment-Root'
            children={children}
            options={{
              headerLeft,
              headerRight: () => <ComposeEditAttachmentSubmit index={index} />,
-              headerTitle: t('content.editAttachment.header.title'),
-              ...(Platform.OS === 'android' && {
-                headerCenter: () => (
-                  <HeaderCenter
-                    content={t('content.editAttachment.header.title')}
-                  />
-                )
-              })
+              headerTitle: t('content.editAttachment.header.title')
            }}
          />
        </Stack.Navigator>
--- a/src/screens/Compose/Root/Drafts.tsx
+++ b/src/screens/Compose/Root/Drafts.tsx
@ -15,7 +15,7 @@ export interface Props {

 const ComposeDrafts: React.FC<Props> = ({ accessibleRefDrafts }) => {
  const { t } = useTranslation('screenCompose')
-  const navigation = useNavigation()
+  const navigation = useNavigation<any>()
  const { composeState } = useContext(ComposeContext)
  const instanceDrafts = useSelector(getInstanceDrafts)?.filter(
    draft => draft.timestamp !== composeState.timestamp
--- a/src/screens/Compose/Root/Footer/Attachments.tsx
+++ b/src/screens/Compose/Root/Footer/Attachments.tsx
@ -40,7 +40,7 @@ const ComposeAttachments: React.FC<Props> = ({ accessibleRefAttachments }) => {
  const { composeState, composeDispatch } = useContext(ComposeContext)
  const { t } = useTranslation('screenCompose')
  const { theme } = useTheme()
-  const navigation = useNavigation()
+  const navigation = useNavigation<any>()

  const flatListRef = useRef<FlatList>(null)

--- a/src/screens/Compose/utils/parseState.ts
+++ b/src/screens/Compose/utils/parseState.ts
@ -1,4 +1,5 @@
 import { store } from '@root/store'
+import { RootStackParamList } from '@utils/navigation/navigators'
 import { getInstanceAccount } from '@utils/slices/instancesSlice'
 import composeInitialState from './initialState'
 import { ComposeState } from './types'
@ -34,7 +35,7 @@ const assignVisibility = (
 }

 const composeParseState = (
-  params: NonNullable<Nav.RootStackParamList['Screen-Compose']>
+  params: NonNullable<RootStackParamList['Screen-Compose']>
 ): ComposeState => {
  switch (params.type) {
    case 'edit':
--- a/src/screens/Compose/utils/post.ts
+++ b/src/screens/Compose/utils/post.ts
@ -1,9 +1,10 @@
 import apiInstance from '@api/instance'
 import { ComposeState } from '@screens/Compose/utils/types'
+import { RootStackParamList } from '@utils/navigation/navigators'
 import * as Crypto from 'expo-crypto'

 const composePost = async (
-  params: Nav.RootStackParamList['Screen-Compose'],
+  params: RootStackParamList['Screen-Compose'],
  composeState: ComposeState
 ) => {
  const formData = new FormData()
--- a/src/screens/ImageViewer/Root.tsx
+++ b/src/screens/ImageViewer/Root.tsx
@ -6,6 +6,7 @@
 *
 */

+import { RootStackParamList } from '@utils/navigation/navigators'
 import React, { ComponentType, useCallback, useEffect } from 'react'
 import {
  Animated,
@ -20,11 +21,11 @@ import useImageIndexChange from './hooks/useImageIndexChange'
 import useRequestClose from './hooks/useRequestClose'

 type Props = {
-  images: Nav.RootStackParamList['Screen-ImagesViewer']['imageUrls']
+  images: RootStackParamList['Screen-ImagesViewer']['imageUrls']
  imageIndex: number
  onRequestClose: () => void
  onLongPress?: (
-    image: Nav.RootStackParamList['Screen-ImagesViewer']['imageUrls'][0]
+    image: RootStackParamList['Screen-ImagesViewer']['imageUrls'][0]
  ) => void
  onImageIndexChange?: (imageIndex: number) => void
  backgroundColor?: string
@ -50,9 +51,7 @@ function ImageViewer ({
  HeaderComponent
 }: Props) {
  const imageList = React.createRef<
-    VirtualizedList<
-      Nav.RootStackParamList['Screen-ImagesViewer']['imageUrls'][0]
-    >
+    VirtualizedList<RootStackParamList['Screen-ImagesViewer']['imageUrls'][0]>
  >()
  const [opacity, onRequestCloseEnhanced] = useRequestClose(onRequestClose)
  const [currentImageIndex, onScroll] = useImageIndexChange(imageIndex, SCREEN)
--- a/src/screens/ImageViewer/save.ts
+++ b/src/screens/ImageViewer/save.ts
@ -1,6 +1,7 @@
 import haptics from '@components/haptics'
 import { displayMessage } from '@components/Message'
 import CameraRoll from '@react-native-community/cameraroll'
+import { RootStackParamList } from '@utils/navigation/navigators'
 import i18next from 'i18next'
 import { RefObject } from 'react'
 import { Platform } from 'react-native'
@ -10,7 +11,7 @@ import { FileSystem, Permissions } from 'react-native-unimodules'
 type CommonProps = {
  messageRef: RefObject<FlashMessage>
  mode: 'light' | 'dark'
-  image: Nav.RootStackParamList['Screen-ImagesViewer']['imageUrls'][0]
+  image: RootStackParamList['Screen-ImagesViewer']['imageUrls'][0]
 }

 const saveIos = async ({ messageRef, mode, image }: CommonProps) => {
--- a/src/screens/ImagesViewer.tsx
+++ b/src/screens/ImagesViewer.tsx
@ -2,7 +2,11 @@ import analytics from '@components/analytics'
 import { HeaderCenter, HeaderLeft, HeaderRight } from '@components/Header'
 import { Message } from '@components/Message'
 import { useActionSheet } from '@expo/react-native-action-sheet'
-import { StackScreenProps } from '@react-navigation/stack'
+import { NativeStackNavigationProp } from '@react-navigation/native-stack'
+import {
+  RootStackParamList,
+  RootStackScreenProps
+} from '@utils/navigation/navigators'
 import { useTheme } from '@utils/styles/ThemeManager'
 import { findIndex } from 'lodash'
 import React, { RefObject, useCallback, useRef, useState } from 'react'
@ -24,9 +28,12 @@ const HeaderComponent = React.memo(
    imageUrls
  }: {
    messageRef: RefObject<FlashMessage>
-    navigation: ScreenImagesViewerProp['navigation']
+    navigation: NativeStackNavigationProp<
+      RootStackParamList,
+      'Screen-ImagesViewer'
+    >
    currentIndex: number
-    imageUrls: Nav.RootStackParamList['Screen-ImagesViewer']['imageUrls']
+    imageUrls: RootStackParamList['Screen-ImagesViewer']['imageUrls']
  }) => {
    const insets = useSafeAreaInsets()
    const { mode } = useTheme()
@ -98,17 +105,12 @@ const HeaderComponent = React.memo(
  (prev, next) => prev.currentIndex === next.currentIndex
 )

-export type ScreenImagesViewerProp = StackScreenProps<
-  Nav.RootStackParamList,
-  'Screen-ImagesViewer'
->
-
 const ScreenImagesViewer = ({
  route: {
    params: { imageUrls, id }
  },
  navigation
-}: ScreenImagesViewerProp) => {
+}: RootStackScreenProps<'Screen-ImagesViewer'>) => {
  if (imageUrls.length === 0) {
    navigation.goBack()
    return null
--- a/src/screens/Tabs.tsx
+++ b/src/screens/Tabs.tsx
@ -5,8 +5,10 @@ import {
  BottomTabNavigationOptions,
  createBottomTabNavigator
 } from '@react-navigation/bottom-tabs'
-import { NavigatorScreenParams } from '@react-navigation/native'
-import { StackScreenProps } from '@react-navigation/stack'
+import {
+  RootStackScreenProps,
+  ScreenTabsStackParamList
+} from '@utils/navigation/navigators'
 import { getPreviousTab } from '@utils/slices/contextsSlice'
 import {
  getInstanceAccount,
@ -25,23 +27,10 @@ import TabMe from './Tabs/Me'
 import TabNotifications from './Tabs/Notifications'
 import TabPublic from './Tabs/Public'

-export type ScreenTabsParamList = {
-  'Tab-Local': NavigatorScreenParams<Nav.TabLocalStackParamList>
-  'Tab-Public': NavigatorScreenParams<Nav.TabPublicStackParamList>
-  'Tab-Compose': NavigatorScreenParams<Nav.ScreenComposeStackParamList>
-  'Tab-Notifications': NavigatorScreenParams<Nav.TabNotificationsStackParamList>
-  'Tab-Me': NavigatorScreenParams<Nav.TabMeStackParamList>
-}
-
-export type ScreenTabsProp = StackScreenProps<
-  Nav.RootStackParamList,
-  'Screen-Tabs'
->
-
-const Tab = createBottomTabNavigator<Nav.ScreenTabsStackParamList>()
+const Tab = createBottomTabNavigator<ScreenTabsStackParamList>()

 const ScreenTabs = React.memo(
-  ({ navigation }: ScreenTabsProp) => {
+  ({ navigation }: RootStackScreenProps<'Screen-Tabs'>) => {
    const { mode, theme } = useTheme()

    const instanceActive = useSelector(getInstanceActive)
@ -52,7 +41,12 @@ const ScreenTabs = React.memo(

    const screenOptions = useCallback(
      ({ route }): BottomTabNavigationOptions => ({
-        tabBarVisible: instanceActive !== -1,
+        headerShown: false,
+        tabBarActiveTintColor: theme.primaryDefault,
+        tabBarInactiveTintColor: theme.secondary,
+        tabBarShowLabel: false,
+        ...(Platform.OS === 'android' && { tabBarHideOnKeyboard: true }),
+        tabBarStyle: { display: instanceActive !== -1 ? 'flex' : 'none' },
        tabBarIcon: ({
          focused,
          color,
@ -95,15 +89,7 @@ const ScreenTabs = React.memo(
      }),
      [instanceAccount?.avatarStatic, instanceActive]
    )
-    const tabBarOptions = useMemo(
-      () => ({
-        activeTintColor: theme.primaryDefault,
-        inactiveTintColor: theme.secondary,
-        showLabel: false,
-        ...(Platform.OS === 'android' && { keyboardHidesTabBar: true })
-      }),
-      [mode]
-    )
+
    const composeListeners = useMemo(
      () => ({
        tabPress: (e: any) => {
@ -133,7 +119,6 @@ const ScreenTabs = React.memo(
      <Tab.Navigator
        initialRouteName={instanceActive !== -1 ? previousTab : 'Tab-Me'}
        screenOptions={screenOptions}
-        tabBarOptions={tabBarOptions}
      >
        <Tab.Screen name='Tab-Local' component={TabLocal} />
        <Tab.Screen name='Tab-Public' component={TabPublic} />
--- a/src/screens/Tabs/Local.tsx
+++ b/src/screens/Tabs/Local.tsx
@ -2,33 +2,23 @@ import analytics from '@components/analytics'
 import { HeaderCenter, HeaderRight } from '@components/Header'
 import Timeline from '@components/Timeline'
 import TimelineDefault from '@components/Timeline/Default'
-import { BottomTabScreenProps } from '@react-navigation/bottom-tabs'
-import { ScreenTabsParamList } from '@screens/Tabs'
+import { createNativeStackNavigator } from '@react-navigation/native-stack'
+import {
+  ScreenTabsScreenProps,
+  TabLocalStackParamList
+} from '@utils/navigation/navigators'
 import { QueryKeyTimeline } from '@utils/queryHooks/timeline'
 import React, { useCallback, useMemo } from 'react'
 import { useTranslation } from 'react-i18next'
 import { Platform } from 'react-native'
-import { createNativeStackNavigator } from 'react-native-screens/native-stack'
-import sharedScreens from './Shared/sharedScreens'
+import TabSharedRoot from './Shared/Root'

-export type TabLocalProp = BottomTabScreenProps<
-  ScreenTabsParamList,
-  'Tab-Local'
->
-
-const Stack = createNativeStackNavigator<Nav.TabLocalStackParamList>()
+const Stack = createNativeStackNavigator<TabLocalStackParamList>()

 const TabLocal = React.memo(
-  ({ navigation }: TabLocalProp) => {
+  ({ navigation }: ScreenTabsScreenProps<'Tab-Local'>) => {
    const { t, i18n } = useTranslation('screenTabs')

-    const screenOptions = useMemo(
-      () => ({
-        headerHideShadow: true,
-        headerTopInsetEnabled: false
-      }),
-      []
-    )
    const screenOptionsRoot = useMemo(
      () => ({
        headerTitle: t('tabs.local.name'),
@ -64,13 +54,13 @@ const TabLocal = React.memo(
    )

    return (
-      <Stack.Navigator screenOptions={screenOptions}>
+      <Stack.Navigator screenOptions={{ headerShadowVisible: false }}>
        <Stack.Screen
          name='Tab-Local-Root'
          options={screenOptionsRoot}
          children={children}
        />
-        {sharedScreens(Stack as any)}
+        {TabSharedRoot({ Stack })}
      </Stack.Navigator>
    )
  },
--- a/src/screens/Tabs/Me.tsx
+++ b/src/screens/Tabs/Me.tsx
@ -1,8 +1,9 @@
 import { HeaderCenter, HeaderLeft } from '@components/Header'
+import { createNativeStackNavigator } from '@react-navigation/native-stack'
+import { TabMeStackParamList } from '@utils/navigation/navigators'
 import React from 'react'
 import { useTranslation } from 'react-i18next'
 import { Platform } from 'react-native'
-import { createNativeStackNavigator } from 'react-native-screens/native-stack'
 import TabMeBookmarks from './Me/Bookmarks'
 import TabMeConversations from './Me/Cconversations'
 import TabMeFavourites from './Me/Favourites'
@ -14,25 +15,23 @@ import TabMeRoot from './Me/Root'
 import TabMeSettings from './Me/Settings'
 import TabMeSettingsFontsize from './Me/SettingsFontsize'
 import TabMeSwitch from './Me/Switch'
-import sharedScreens from './Shared/sharedScreens'
+import TabSharedRoot from './Shared/Root'

-const Stack = createNativeStackNavigator<Nav.TabMeStackParamList>()
+const Stack = createNativeStackNavigator<TabMeStackParamList>()

 const TabMe = React.memo(
  () => {
    const { t } = useTranslation('screenTabs')

    return (
-      <Stack.Navigator
-        screenOptions={{ headerHideShadow: true, headerTopInsetEnabled: false }}
-      >
+      <Stack.Navigator screenOptions={{ headerShadowVisible: false }}>
        <Stack.Screen
          name='Tab-Me-Root'
          component={TabMeRoot}
          options={{
-            headerTranslucent: true,
+            headerShadowVisible: false,
            headerStyle: { backgroundColor: 'rgba(255, 255, 255, 0)' },
-            headerCenter: () => null
+            headerShown: false
          }}
        />
        <Stack.Screen
@ -108,15 +107,15 @@ const TabMe = React.memo(
          name='Tab-Me-Profile'
          component={TabMeProfile}
          options={{
-            stackPresentation: 'modal',
-            ...(Platform.OS === 'android' && { headerShown: false })
+            headerShown: false,
+            presentation: 'modal'
          }}
        />
        <Stack.Screen
          name='Tab-Me-Push'
          component={TabMePush}
          options={({ navigation }) => ({
-            stackPresentation: 'modal',
+            presentation: 'modal',
            headerShown: true,
            headerTitle: t('me.stacks.push.name'),
            ...(Platform.OS === 'android' && {
@ -162,7 +161,7 @@ const TabMe = React.memo(
          name='Tab-Me-Switch'
          component={TabMeSwitch}
          options={({ navigation }) => ({
-            stackPresentation: 'modal',
+            presentation: 'modal',
            headerShown: true,
            headerTitle: t('me.stacks.switch.name'),
            ...(Platform.OS === 'android' && {
@ -179,7 +178,7 @@ const TabMe = React.memo(
          })}
        />

-        {sharedScreens(Stack as any)}
+        {TabSharedRoot({ Stack })}
      </Stack.Navigator>
    )
  },
--- a/src/screens/Tabs/Me/Lists.tsx
+++ b/src/screens/Tabs/Me/Lists.tsx
@ -1,12 +1,11 @@
 import { MenuContainer, MenuRow } from '@components/Menu'
-import { StackScreenProps } from '@react-navigation/stack'
+import { TabMeStackScreenProps } from '@utils/navigation/navigators'
 import { useListsQuery } from '@utils/queryHooks/lists'
 import React from 'react'

-const TabMeLists: React.FC<StackScreenProps<
-  Nav.TabMeStackParamList,
-  'Tab-Me-Lists'
->> = ({ navigation }) => {
+const TabMeLists: React.FC<TabMeStackScreenProps<'Tab-Me-Lists'>> = ({
+  navigation
+}) => {
  const { data } = useListsQuery({})

  return (
--- a/src/screens/Tabs/Me/ListsList.tsx
+++ b/src/screens/Tabs/Me/ListsList.tsx
@ -1,13 +1,10 @@
 import Timeline from '@components/Timeline'
 import TimelineDefault from '@components/Timeline/Default'
-import { StackScreenProps } from '@react-navigation/stack'
+import { TabMeStackScreenProps } from '@utils/navigation/navigators'
 import { QueryKeyTimeline } from '@utils/queryHooks/timeline'
 import React, { useCallback } from 'react'

-const TabMeListsList: React.FC<StackScreenProps<
-  Nav.TabMeStackParamList,
-  'Tab-Me-Lists-List'
->> = ({
+const TabMeListsList: React.FC<TabMeStackScreenProps<'Tab-Me-Lists-List'>> = ({
  route: {
    params: { list }
  }
--- a/src/screens/Tabs/Me/Profile.tsx
+++ b/src/screens/Tabs/Me/Profile.tsx
@ -1,22 +1,24 @@
 import { HeaderCenter, HeaderLeft } from '@components/Header'
 import { Message } from '@components/Message'
-import { StackScreenProps } from '@react-navigation/stack'
+import { createNativeStackNavigator } from '@react-navigation/native-stack'
+import {
+  TabMeProfileStackParamList,
+  TabMeStackScreenProps
+} from '@utils/navigation/navigators'
 import React, { useRef } from 'react'
 import { useTranslation } from 'react-i18next'
 import { KeyboardAvoidingView, Platform } from 'react-native'
 import FlashMessage from 'react-native-flash-message'
-import { createNativeStackNavigator } from 'react-native-screens/native-stack'
 import TabMeProfileFields from './Profile/Fields'
 import TabMeProfileName from './Profile/Name'
 import TabMeProfileNote from './Profile/Note'
 import TabMeProfileRoot from './Profile/Root'

-const Stack = createNativeStackNavigator<Nav.TabMeProfileStackParamList>()
+const Stack = createNativeStackNavigator<TabMeProfileStackParamList>()

-const TabMeProfile: React.FC<StackScreenProps<
-  Nav.TabMeStackParamList,
-  'Tab-Me-Switch'
->> = ({ navigation }) => {
+const TabMeProfile: React.FC<TabMeStackScreenProps<'Tab-Me-Switch'>> = ({
+  navigation
+}) => {
  const { t } = useTranslation('screenTabs')
  const messageRef = useRef<FlashMessage>(null)

@ -25,9 +27,7 @@ const TabMeProfile: React.FC<StackScreenProps<
      style={{ flex: 1 }}
      behavior={Platform.OS === 'ios' ? 'padding' : 'height'}
    >
-      <Stack.Navigator
-        screenOptions={{ headerHideShadow: true, headerTopInsetEnabled: false }}
-      >
+      <Stack.Navigator screenOptions={{ headerShadowVisible: false }}>
        <Stack.Screen
          name='Tab-Me-Profile-Root'
          options={{
--- a/src/screens/Tabs/Me/Profile/Fields.tsx
+++ b/src/screens/Tabs/Me/Profile/Fields.tsx
@ -1,6 +1,6 @@
 import { HeaderLeft, HeaderRight } from '@components/Header'
 import Input from '@components/Input'
-import { StackScreenProps } from '@react-navigation/stack'
+import { TabMeProfileStackScreenProps } from '@utils/navigation/navigators'
 import { useProfileMutation } from '@utils/queryHooks/profile'
 import { StyleConstants } from '@utils/styles/constants'
 import { useTheme } from '@utils/styles/ThemeManager'
@ -23,8 +23,7 @@ const prepareFields = (
  })
 }

-const TabMeProfileFields: React.FC<StackScreenProps<
-  Nav.TabMeProfileStackParamList,
+const TabMeProfileFields: React.FC<TabMeProfileStackScreenProps<
  'Tab-Me-Profile-Fields'
 > & { messageRef: RefObject<FlashMessage> }> = ({
  messageRef,
--- a/src/screens/Tabs/Me/Profile/Name.tsx
+++ b/src/screens/Tabs/Me/Profile/Name.tsx
@ -1,6 +1,6 @@
 import { HeaderLeft, HeaderRight } from '@components/Header'
 import Input from '@components/Input'
-import { StackScreenProps } from '@react-navigation/stack'
+import { TabMeProfileStackScreenProps } from '@utils/navigation/navigators'
 import { useProfileMutation } from '@utils/queryHooks/profile'
 import { StyleConstants } from '@utils/styles/constants'
 import { useTheme } from '@utils/styles/ThemeManager'
@ -10,8 +10,7 @@ import { Alert, StyleSheet } from 'react-native'
 import FlashMessage from 'react-native-flash-message'
 import { ScrollView } from 'react-native-gesture-handler'

-const TabMeProfileName: React.FC<StackScreenProps<
-  Nav.TabMeProfileStackParamList,
+const TabMeProfileName: React.FC<TabMeProfileStackScreenProps<
  'Tab-Me-Profile-Name'
 > & { messageRef: RefObject<FlashMessage> }> = ({
  messageRef,
--- a/src/screens/Tabs/Me/Profile/Note.tsx
+++ b/src/screens/Tabs/Me/Profile/Note.tsx
@ -1,6 +1,6 @@
 import { HeaderLeft, HeaderRight } from '@components/Header'
 import Input from '@components/Input'
-import { StackScreenProps } from '@react-navigation/stack'
+import { TabMeProfileStackScreenProps } from '@utils/navigation/navigators'
 import { useProfileMutation } from '@utils/queryHooks/profile'
 import { StyleConstants } from '@utils/styles/constants'
 import { useTheme } from '@utils/styles/ThemeManager'
@ -10,8 +10,7 @@ import { Alert, StyleSheet, View } from 'react-native'
 import FlashMessage from 'react-native-flash-message'
 import { ScrollView } from 'react-native-gesture-handler'

-const TabMeProfileNote: React.FC<StackScreenProps<
-  Nav.TabMeProfileStackParamList,
+const TabMeProfileNote: React.FC<TabMeProfileStackScreenProps<
  'Tab-Me-Profile-Note'
 > & { messageRef: RefObject<FlashMessage> }> = ({
  messageRef,
--- a/src/screens/Tabs/Me/Profile/Root.tsx
+++ b/src/screens/Tabs/Me/Profile/Root.tsx
@ -1,7 +1,7 @@
 import analytics from '@components/analytics'
 import { MenuContainer, MenuRow } from '@components/Menu'
 import { useActionSheet } from '@expo/react-native-action-sheet'
-import { StackScreenProps } from '@react-navigation/stack'
+import { TabMeProfileStackScreenProps } from '@utils/navigation/navigators'
 import { useProfileMutation, useProfileQuery } from '@utils/queryHooks/profile'
 import { updateAccountPreferences } from '@utils/slices/instances/updateAccountPreferences'
 import { useTheme } from '@utils/styles/ThemeManager'
@ -12,8 +12,7 @@ import { ScrollView } from 'react-native-gesture-handler'
 import { useDispatch } from 'react-redux'
 import ProfileAvatarHeader from './Root/AvatarHeader'

-const TabMeProfileRoot: React.FC<StackScreenProps<
-  Nav.TabMeProfileStackParamList,
+const TabMeProfileRoot: React.FC<TabMeProfileStackScreenProps<
  'Tab-Me-Profile-Root'
 > & { messageRef: RefObject<FlashMessage> }> = ({ messageRef, navigation }) => {
  const { mode } = useTheme()
--- a/src/screens/Tabs/Me/Root/Collections.tsx
+++ b/src/screens/Tabs/Me/Root/Collections.tsx
@ -7,7 +7,7 @@ import { useTranslation } from 'react-i18next'

 const Collections: React.FC = () => {
  const { t } = useTranslation('screenTabs')
-  const navigation = useNavigation()
+  const navigation = useNavigation<any>()

  const listsQuery = useListsQuery({
    options: {
--- a/src/screens/Tabs/Me/Root/Settings.tsx
+++ b/src/screens/Tabs/Me/Root/Settings.tsx
@ -5,7 +5,7 @@ import { useTranslation } from 'react-i18next'

 const Settings: React.FC = () => {
  const { t } = useTranslation('screenTabs')
-  const navigation = useNavigation()
+  const navigation = useNavigation<any>()

  return (
    <MenuContainer>
--- a/src/screens/Tabs/Me/Root/Switch.tsx
+++ b/src/screens/Tabs/Me/Root/Switch.tsx
@ -5,7 +5,7 @@ import React from 'react'
 import { useTranslation } from 'react-i18next'

 const AccountInformationSwitch: React.FC = () => {
-  const navigation = useNavigation()
+  const navigation = useNavigation<any>()
  const { t } = useTranslation('screenTabs')

  return (
--- a/src/screens/Tabs/Me/Settings/Analytics.tsx
+++ b/src/screens/Tabs/Me/Settings/Analytics.tsx
@ -29,7 +29,7 @@ const SettingsAnalytics: React.FC = () => {
        }
      />
      <Text style={[styles.version, { color: theme.secondary }]}>
-        {t('me.settings.version', { version: Constants.manifest.version })}
+        {t('me.settings.version', { version: Constants.manifest?.version })}
      </Text>
    </MenuContainer>
  )
--- a/src/screens/Tabs/Me/Settings/App.tsx
+++ b/src/screens/Tabs/Me/Settings/App.tsx
@ -23,7 +23,7 @@ import { useDispatch, useSelector } from 'react-redux'
 import { mapFontsizeToName } from '../SettingsFontsize'

 const SettingsApp: React.FC = () => {
-  const navigation = useNavigation()
+  const navigation = useNavigation<any>()
  const dispatch = useDispatch()
  const { showActionSheetWithOptions } = useActionSheet()
  const { setTheme } = useTheme()
--- a/src/screens/Tabs/Me/Settings/Tooot.tsx
+++ b/src/screens/Tabs/Me/Settings/Tooot.tsx
@ -15,7 +15,7 @@ import { getInstanceActive } from '@utils/slices/instancesSlice'

 const SettingsTooot: React.FC = () => {
  const instanceActive = useSelector(getInstanceActive)
-  const navigation = useNavigation()
+  const navigation = useNavigation<any>()
  const { theme } = useTheme()
  const { t } = useTranslation('screenTabs')

--- a/src/screens/Tabs/Me/SettingsFontsize.tsx
+++ b/src/screens/Tabs/Me/SettingsFontsize.tsx
@ -2,7 +2,7 @@ import Button from '@components/Button'
 import haptics from '@components/haptics'
 import ComponentSeparator from '@components/Separator'
 import TimelineDefault from '@components/Timeline/Default'
-import { StackScreenProps } from '@react-navigation/stack'
+import { TabMeStackScreenProps } from '@utils/navigation/navigators'
 import {
  changeFontsize,
  getSettingsFontsize,
@ -32,8 +32,7 @@ export const mapFontsizeToName = (size: SettingsState['fontsize']) => {
  }
 }

-const TabMeSettingsFontsize: React.FC<StackScreenProps<
-  Nav.TabMeStackParamList,
+const TabMeSettingsFontsize: React.FC<TabMeStackScreenProps<
  'Tab-Me-Settings-Fontsize'
 >> = () => {
  const { mode, theme } = useTheme()
@ -129,6 +128,7 @@ const TabMeSettingsFontsize: React.FC<StackScreenProps<
          onPress={() => {
            if (initialSize > -1) {
              haptics('Light')
+              // @ts-ignore
              dispatch(changeFontsize(initialSize - 1))
            }
          }}
@ -142,6 +142,7 @@ const TabMeSettingsFontsize: React.FC<StackScreenProps<
          onPress={() => {
            if (initialSize < 3) {
              haptics('Light')
+              // @ts-ignore
              dispatch(changeFontsize(initialSize + 1))
            }
          }}
--- a/src/screens/Tabs/Notifications.tsx
+++ b/src/screens/Tabs/Notifications.tsx
@ -2,28 +2,21 @@ import analytics from '@components/analytics'
 import { HeaderCenter, HeaderRight } from '@components/Header'
 import Timeline from '@components/Timeline'
 import TimelineNotifications from '@components/Timeline/Notifications'
-import { useNavigation } from '@react-navigation/native'
-import sharedScreens from '@screens/Tabs/Shared/sharedScreens'
+import navigationRef from '@helpers/navigationRef'
+import { createNativeStackNavigator } from '@react-navigation/native-stack'
+import { TabNotificationsStackParamList } from '@utils/navigation/navigators'
 import { QueryKeyTimeline } from '@utils/queryHooks/timeline'
 import React, { useCallback, useMemo } from 'react'
 import { useTranslation } from 'react-i18next'
 import { Platform } from 'react-native'
-import { createNativeStackNavigator } from 'react-native-screens/native-stack'
+import TabSharedRoot from './Shared/Root'

-const Stack = createNativeStackNavigator<Nav.TabNotificationsStackParamList>()
+const Stack = createNativeStackNavigator<TabNotificationsStackParamList>()

 const TabNotifications = React.memo(
  () => {
-    const navigation = useNavigation()
    const { t, i18n } = useTranslation('screenTabs')

-    const screenOptions = useMemo(
-      () => ({
-        headerHideShadow: true,
-        headerTopInsetEnabled: false
-      }),
-      []
-    )
    const screenOptionsRoot = useMemo(
      () => ({
        headerTitle: t('tabs.notifications.name'),
@ -39,7 +32,7 @@ const TabNotifications = React.memo(
            content='Filter'
            onPress={() => {
              analytics('notificationsfilter_tap')
-              navigation.navigate('Screen-Actions', {
+              navigationRef.navigate('Screen-Actions', {
                type: 'notifications_filter'
              })
            }}
@ -62,13 +55,13 @@ const TabNotifications = React.memo(
    )

    return (
-      <Stack.Navigator screenOptions={screenOptions}>
+      <Stack.Navigator screenOptions={{ headerShadowVisible: false }}>
        <Stack.Screen
          name='Tab-Notifications-Root'
          children={children}
          options={screenOptionsRoot}
        />
-        {sharedScreens(Stack as any)}
+        {TabSharedRoot({ Stack })}
      </Stack.Navigator>
    )
  },
--- a/src/screens/Tabs/Public.tsx
+++ b/src/screens/Tabs/Public.tsx
@ -3,26 +3,23 @@ import { HeaderRight } from '@components/Header'
 import Timeline from '@components/Timeline'
 import TimelineDefault from '@components/Timeline/Default'
 import SegmentedControl from '@react-native-community/segmented-control'
-import { BottomTabScreenProps } from '@react-navigation/bottom-tabs'
-import { ScreenTabsParamList } from '@screens/Tabs'
-import sharedScreens from '@screens/Tabs/Shared/sharedScreens'
+import { createNativeStackNavigator } from '@react-navigation/native-stack'
+import {
+  ScreenTabsScreenProps,
+  TabPublicStackParamList
+} from '@utils/navigation/navigators'
 import { QueryKeyTimeline } from '@utils/queryHooks/timeline'
 import { useTheme } from '@utils/styles/ThemeManager'
 import React, { useCallback, useMemo, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import { Dimensions, StyleSheet } from 'react-native'
-import { createNativeStackNavigator } from 'react-native-screens/native-stack'
 import { TabView } from 'react-native-tab-view'
+import TabSharedRoot from './Shared/Root'

-export type TabPublicProps = BottomTabScreenProps<
-  ScreenTabsParamList,
-  'Tab-Public'
->
-
-const Stack = createNativeStackNavigator<Nav.TabPublicStackParamList>()
+const Stack = createNativeStackNavigator<TabPublicStackParamList>()

 const TabPublic = React.memo(
-  ({ navigation }: TabPublicProps) => {
+  ({ navigation }: ScreenTabsScreenProps<'Tab-Public'>) => {
    const { t, i18n } = useTranslation('screenTabs')
    const { mode } = useTheme()

@ -40,16 +37,9 @@ const TabPublic = React.memo(
        key: 'Local'
      }
    ]
-    const screenOptions = useMemo(
-      () => ({
-        headerHideShadow: true,
-        headerTopInsetEnabled: false
-      }),
-      []
-    )
    const screenOptionsRoot = useMemo(
      () => ({
-        headerCenter: () => (
+        headerTitle: () => (
          <SegmentedControl
            appearance={mode}
            values={pages.map(p => p.title)}
@ -113,13 +103,13 @@ const TabPublic = React.memo(
    )

    return (
-      <Stack.Navigator screenOptions={screenOptions}>
+      <Stack.Navigator screenOptions={{ headerShadowVisible: false }}>
        <Stack.Screen
          name='Tab-Public-Root'
          options={screenOptionsRoot}
          children={children}
        />
-        {sharedScreens(Stack as any)}
+        {TabSharedRoot({ Stack })}
      </Stack.Navigator>
    )
  },
--- a/src/screens/Tabs/Shared/Account.tsx
+++ b/src/screens/Tabs/Shared/Account.tsx
@ -3,6 +3,7 @@ import { HeaderRight } from '@components/Header'
 import Timeline from '@components/Timeline'
 import TimelineDefault from '@components/Timeline/Default'
 import SegmentedControl from '@react-native-community/segmented-control'
+import { TabSharedStackScreenProps } from '@utils/navigation/navigators'
 import { useAccountQuery } from '@utils/queryHooks/account'
 import { QueryKeyTimeline } from '@utils/queryHooks/timeline'
 import { StyleConstants } from '@utils/styles/constants'
@ -16,9 +17,10 @@ import AccountAttachments from './Account/Attachments'
 import AccountHeader from './Account/Header'
 import AccountInformation from './Account/Information'
 import AccountNav from './Account/Nav'
-import { SharedAccountProp } from './sharedScreens'

-const TabSharedAccount: React.FC<SharedAccountProp> = ({
+const TabSharedAccount: React.FC<TabSharedStackScreenProps<
+  'Tab-Shared-Account'
+>> = ({
  route: {
    params: { account }
  },
--- a/src/screens/Tabs/Shared/Account/Attachments.tsx
+++ b/src/screens/Tabs/Shared/Account/Attachments.tsx
@ -3,6 +3,7 @@ import GracefullyImage from '@components/GracefullyImage'
 import Icon from '@components/Icon'
 import { useNavigation } from '@react-navigation/native'
 import { StackNavigationProp } from '@react-navigation/stack'
+import { TabLocalStackParamList } from '@utils/navigation/navigators'
 import { useTimelineQuery } from '@utils/queryHooks/timeline'
 import { StyleConstants } from '@utils/styles/constants'
 import { useTheme } from '@utils/styles/ThemeManager'
@ -24,7 +25,7 @@ export interface Props {
 const AccountAttachments = React.memo(
  ({ account }: Props) => {
    const navigation = useNavigation<
-      StackNavigationProp<Nav.TabLocalStackParamList>
+      StackNavigationProp<TabLocalStackParamList>
    >()
    const { theme } = useTheme()

--- a/src/screens/Tabs/Shared/Account/Information/Actions.tsx
+++ b/src/screens/Tabs/Shared/Account/Information/Actions.tsx
@ -19,7 +19,7 @@ export interface Props {
 }

 const Conversation = ({ account }: { account: Mastodon.Account }) => {
-  const navigation = useNavigation()
+  const navigation = useNavigation<any>()
  const query = useRelationshipQuery({ id: account.id })

  return query.data && !query.data.blocked_by ? (
@ -45,7 +45,7 @@ const AccountInformationActions: React.FC<Props> = ({ account, myInfo }) => {
  }

  const { t } = useTranslation('screenTabs')
-  const navigation = useNavigation()
+  const navigation = useNavigation<any>()

  if (account?.moved) {
    const accountMoved = account.moved
--- a/src/screens/Tabs/Shared/Account/Information/Avatar.tsx
+++ b/src/screens/Tabs/Shared/Account/Information/Avatar.tsx
@ -4,6 +4,7 @@ import GracefullyImage from '@components/GracefullyImage'
 import { useNavigation } from '@react-navigation/native'
 import { StackNavigationProp } from '@react-navigation/stack'
 import { useAccessibility } from '@utils/accessibility/AccessibilityManager'
+import { TabLocalStackParamList } from '@utils/navigation/navigators'
 import { StyleConstants } from '@utils/styles/constants'
 import React from 'react'
 import { Pressable, StyleSheet, View } from 'react-native'
@ -20,7 +21,7 @@ const AccountInformationAvatar: React.FC<Props> = ({
  edit
 }) => {
  const navigation = useNavigation<
-    StackNavigationProp<Nav.TabLocalStackParamList>
+    StackNavigationProp<TabLocalStackParamList>
  >()
  const { reduceMotionEnabled } = useAccessibility()

--- a/src/screens/Tabs/Shared/Account/Information/Stats.tsx
+++ b/src/screens/Tabs/Shared/Account/Information/Stats.tsx
@ -3,6 +3,7 @@ import { useNavigation } from '@react-navigation/native'
 import { StackNavigationProp } from '@react-navigation/stack'
 import { StyleConstants } from '@root/utils/styles/constants'
 import { useTheme } from '@root/utils/styles/ThemeManager'
+import { TabLocalStackParamList } from '@utils/navigation/navigators'
 import React from 'react'
 import { useTranslation } from 'react-i18next'
 import { StyleSheet, Text, View } from 'react-native'
@ -15,7 +16,7 @@ export interface Props {

 const AccountInformationStats: React.FC<Props> = ({ account, myInfo }) => {
  const navigation = useNavigation<
-    StackNavigationProp<Nav.TabLocalStackParamList>
+    StackNavigationProp<TabLocalStackParamList>
  >()
  const { theme } = useTheme()
  const { t } = useTranslation('screenTabs')
--- a/src/screens/Tabs/Shared/Attachments.tsx
+++ b/src/screens/Tabs/Shared/Attachments.tsx
@ -1,10 +1,12 @@
 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, { useCallback } from 'react'
-import { SharedAttachmentsProp } from './sharedScreens'

-const TabSharedAttachments: React.FC<SharedAttachmentsProp> = ({
+const TabSharedAttachments: React.FC<TabSharedStackScreenProps<
+  'Tab-Shared-Attachments'
+>> = ({
  route: {
    params: { account }
  }
--- a/src/screens/Tabs/Shared/Hashtag.tsx
+++ b/src/screens/Tabs/Shared/Hashtag.tsx
@ -1,10 +1,12 @@
 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, { useCallback } from 'react'
-import { SharedHashtagProp } from './sharedScreens'

-const TabSharedHashtag: React.FC<SharedHashtagProp> = ({
+const TabSharedHashtag: React.FC<TabSharedStackScreenProps<
+  'Tab-Shared-Hashtag'
+>> = ({
  route: {
    params: { hashtag }
  }
--- a/src/screens/Tabs/Shared/Root.tsx
+++ b/src/screens/Tabs/Shared/Root.tsx
@ -0,0 +1,208 @@
+import { HeaderCenter, HeaderLeft } from '@components/Header'
+import { ParseEmojis } from '@components/Parse'
+import { createNativeStackNavigator } from '@react-navigation/native-stack'
+import TabSharedAccount from '@screens/Tabs/Shared/Account'
+import TabSharedAttachments from '@screens/Tabs/Shared/Attachments'
+import TabSharedHashtag from '@screens/Tabs/Shared/Hashtag'
+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, StyleSheet, Text, TextInput, View } from 'react-native'
+
+const TabSharedRoot = ({
+  Stack
+}: {
+  Stack: ReturnType<typeof createNativeStackNavigator>
+}) => {
+  const { mode, theme } = useTheme()
+  const { t } = useTranslation('screenTabs')
+
+  return (
+    <Stack.Group
+      screenOptions={({ navigation }) => ({
+        headerLeft: () => <HeaderLeft onPress={() => navigation.goBack()} />
+      })}
+    >
+      <Stack.Screen
+        key='Tab-Shared-Account'
+        name='Tab-Shared-Account'
+        component={TabSharedAccount}
+        options={({
+          navigation
+        }: TabSharedStackScreenProps<'Tab-Shared-Account'>) => {
+          return {
+            headerTransparent: true,
+            headerStyle: {
+              backgroundColor: `rgba(255, 255, 255, 0)`
+            },
+            headerTitle: '',
+            headerLeft: () => (
+              <HeaderLeft onPress={() => navigation.goBack()} background />
+            )
+          }
+        }}
+      />
+
+      <Stack.Screen
+        key='Tab-Shared-Attachments'
+        name='Tab-Shared-Attachments'
+        component={TabSharedAttachments}
+        options={({
+          route: {
+            params: { account }
+          }
+        }: TabSharedStackScreenProps<'Tab-Shared-Attachments'>) => {
+          return {
+            headerTitle: () => (
+              <Text numberOfLines={1}>
+                <Trans
+                  i18nKey='screenTabs:shared.attachments.name'
+                  components={[
+                    <ParseEmojis
+                      content={account.display_name || account.username}
+                      emojis={account.emojis}
+                      fontBold
+                    />,
+                    <Text
+                      style={{
+                        ...StyleConstants.FontStyle.M,
+                        color: theme.primaryDefault,
+                        fontWeight: StyleConstants.Font.Weight.Bold
+                      }}
+                    />
+                  ]}
+                />
+              </Text>
+            )
+          }
+        }}
+      />
+
+      <Stack.Screen
+        key='Tab-Shared-Hashtag'
+        name='Tab-Shared-Hashtag'
+        component={TabSharedHashtag}
+        options={({
+          route
+        }: TabSharedStackScreenProps<'Tab-Shared-Hashtag'>) => ({
+          headerTitle: `#${decodeURIComponent(route.params.hashtag)}`,
+          ...(Platform.OS === 'android' && {
+            headerCenter: () => (
+              <HeaderCenter
+                content={`#${decodeURIComponent(route.params.hashtag)}`}
+              />
+            )
+          })
+        })}
+      />
+
+      <Stack.Screen
+        key='Tab-Shared-Search'
+        name='Tab-Shared-Search'
+        component={TabSharedSearch}
+        options={({
+          navigation
+        }: TabSharedStackScreenProps<'Tab-Shared-Search'>) => ({
+          headerTitle: () => {
+            const onChangeText = debounce(
+              (text: string) => navigation.setParams({ text }),
+              1000,
+              {
+                trailing: true
+              }
+            )
+            return (
+              <View style={styles.searchBar}>
+                <TextInput
+                  editable={false}
+                  style={[
+                    styles.textInput,
+                    {
+                      color: theme.primaryDefault
+                    }
+                  ]}
+                  defaultValue={t('shared.search.header.prefix')}
+                />
+                <TextInput
+                  accessibilityRole='search'
+                  keyboardAppearance={mode}
+                  style={[
+                    styles.textInput,
+                    {
+                      flex: 1,
+                      color: theme.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={theme.secondary}
+                  returnKeyType='go'
+                />
+              </View>
+            )
+          }
+        })}
+      />
+
+      <Stack.Screen
+        key='Tab-Shared-Toot'
+        name='Tab-Shared-Toot'
+        component={TabSharedToot}
+        options={{
+          headerTitle: t('shared.toot.name'),
+          ...(Platform.OS === 'android' && {
+            headerCenter: () => <HeaderCenter content={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'>) => ({
+          headerTitle: t(`shared.users.${reference}.${type}`, { count }),
+          ...(Platform.OS === 'android' && {
+            headerCenter: () => (
+              <HeaderCenter
+                content={t(`shared.users.${reference}.${type}`, { count })}
+              />
+            )
+          })
+        })}
+      />
+    </Stack.Group>
+  )
+}
+
+const styles = StyleSheet.create({
+  searchBar: {
+    flexBasis: '80%',
+    flexDirection: 'row',
+    alignItems: 'center'
+  },
+  textInput: {
+    fontSize: StyleConstants.Font.Size.M
+  }
+})
+
+export default TabSharedRoot
--- a/src/screens/Tabs/Shared/Search.tsx
+++ b/src/screens/Tabs/Shared/Search.tsx
@ -2,6 +2,7 @@ import ComponentAccount from '@components/Account'
 import ComponentHashtag from '@components/Hashtag'
 import ComponentSeparator from '@components/Separator'
 import TimelineDefault from '@components/Timeline/Default'
+import { TabSharedStackScreenProps } from '@utils/navigation/navigators'
 import { useSearchQuery } from '@utils/queryHooks/search'
 import { StyleConstants } from '@utils/styles/constants'
 import { useTheme } from '@utils/styles/ThemeManager'
@ -16,9 +17,10 @@ import {
  View
 } from 'react-native'
 import { Circle } from 'react-native-animated-spinkit'
-import { SharedSearchProp } from './sharedScreens'

-const TabSharedSearch: React.FC<SharedSearchProp> = ({
+const TabSharedSearch: React.FC<TabSharedStackScreenProps<
+  'Tab-Shared-Search'
+>> = ({
  route: {
    params: { text }
  }
--- a/src/screens/Tabs/Shared/Toot.tsx
+++ b/src/screens/Tabs/Shared/Toot.tsx
@ -1,14 +1,14 @@
 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 { findIndex } from 'lodash'
 import React, { useCallback, useEffect, useRef } from 'react'
 import { FlatList } from 'react-native'
 import { InfiniteQueryObserver, useQueryClient } from 'react-query'
-import { SharedTootProp } from './sharedScreens'

-const TabSharedToot: React.FC<SharedTootProp> = ({
+const TabSharedToot: React.FC<TabSharedStackScreenProps<'Tab-Shared-Toot'>> = ({
  route: {
    params: { toot, rootQueryKey }
  }
--- a/src/screens/Tabs/Shared/Users.tsx
+++ b/src/screens/Tabs/Shared/Users.tsx
@ -1,13 +1,13 @@
 import ComponentAccount from '@components/Account'
 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 { FlatList } from 'react-native-gesture-handler'
-import { SharedUsersProp } from './sharedScreens'

 const TabSharedUsers = React.memo(
-  ({ route: { params } }: SharedUsersProp) => {
+  ({ route: { params } }: TabSharedStackScreenProps<'Tab-Shared-Users'>) => {
    const queryKey: QueryKeyUsers = ['Users', params]
    const {
      data,
--- a/src/screens/Tabs/Shared/sharedScreens.tsx
+++ b/src/screens/Tabs/Shared/sharedScreens.tsx
@ -1,237 +0,0 @@
-import { HeaderCenter, HeaderLeft } from '@components/Header'
-import { ParseEmojis } from '@components/Parse'
-import { StackNavigationState, TypedNavigator } from '@react-navigation/native'
-import { StackScreenProps } from '@react-navigation/stack'
-import TabSharedAccount from '@screens/Tabs/Shared/Account'
-import TabSharedAttachments from '@screens/Tabs/Shared/Attachments'
-import TabSharedHashtag from '@screens/Tabs/Shared/Hashtag'
-import TabSharedSearch from '@screens/Tabs/Shared/Search'
-import TabSharedToot from '@screens/Tabs/Shared/Toot'
-import TabSharedUsers from '@screens/Tabs/Shared/Users'
-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, StyleSheet, Text, TextInput, View } from 'react-native'
-import { NativeStackNavigationOptions } from 'react-native-screens/lib/typescript/native-stack'
-import {
-  NativeStackNavigationEventMap,
-  NativeStackNavigatorProps
-} from 'react-native-screens/lib/typescript/native-stack/types'
-
-export type BaseScreens =
-  | Nav.TabLocalStackParamList
-  | Nav.TabPublicStackParamList
-  | Nav.TabNotificationsStackParamList
-  | Nav.TabMeStackParamList
-
-export type SharedAccountProp = StackScreenProps<
-  BaseScreens,
-  'Tab-Shared-Account'
->
-
-export type SharedAttachmentsProp = StackScreenProps<
-  BaseScreens,
-  'Tab-Shared-Attachments'
->
-
-export type SharedHashtagProp = StackScreenProps<
-  BaseScreens,
-  'Tab-Shared-Hashtag'
->
-
-export type SharedSearchProp = StackScreenProps<
-  BaseScreens,
-  'Tab-Shared-Search'
->
-
-export type SharedTootProp = StackScreenProps<BaseScreens, 'Tab-Shared-Toot'>
-
-export type SharedUsersProp = StackScreenProps<BaseScreens, 'Tab-Shared-Users'>
-
-const sharedScreens = (
-  Stack: TypedNavigator<
-    BaseScreens,
-    StackNavigationState<Record<string, object | undefined>>,
-    NativeStackNavigationOptions,
-    NativeStackNavigationEventMap,
-    ({ ...rest }: NativeStackNavigatorProps) => JSX.Element
-  >
-) => {
-  const { mode, theme } = useTheme()
-  const { t } = useTranslation('screenTabs')
-
-  return [
-    <Stack.Screen
-      key='Tab-Shared-Account'
-      name='Tab-Shared-Account'
-      component={TabSharedAccount}
-      options={({ navigation }: SharedAccountProp) => {
-        return {
-          headerTranslucent: true,
-          headerStyle: {
-            backgroundColor: `rgba(255, 255, 255, 0)`
-          },
-          headerCenter: () => null,
-          headerLeft: () => (
-            <HeaderLeft onPress={() => navigation.goBack()} background />
-          )
-        }
-      }}
-    />,
-    <Stack.Screen
-      key='Tab-Shared-Attachments'
-      name='Tab-Shared-Attachments'
-      component={TabSharedAttachments}
-      options={({
-        route: {
-          params: { account }
-        },
-        navigation
-      }: SharedAttachmentsProp) => {
-        return {
-          headerLeft: () => <HeaderLeft onPress={() => navigation.goBack()} />,
-          headerCenter: () => (
-            <Text numberOfLines={1}>
-              <Trans
-                i18nKey='screenTabs:shared.attachments.name'
-                components={[
-                  <ParseEmojis
-                    content={account.display_name || account.username}
-                    emojis={account.emojis}
-                    fontBold
-                  />,
-                  <Text
-                    style={{
-                      ...StyleConstants.FontStyle.M,
-                      color: theme.primaryDefault,
-                      fontWeight: StyleConstants.Font.Weight.Bold
-                    }}
-                  />
-                ]}
-              />
-            </Text>
-          )
-        }
-      }}
-    />,
-    <Stack.Screen
-      key='Tab-Shared-Hashtag'
-      name='Tab-Shared-Hashtag'
-      component={TabSharedHashtag}
-      options={({ route, navigation }: SharedHashtagProp) => ({
-        headerTitle: `#${decodeURIComponent(route.params.hashtag)}`,
-        ...(Platform.OS === 'android' && {
-          headerCenter: () => (
-            <HeaderCenter
-              content={`#${decodeURIComponent(route.params.hashtag)}`}
-            />
-          )
-        }),
-        headerLeft: () => <HeaderLeft onPress={() => navigation.goBack()} />
-      })}
-    />,
-    <Stack.Screen
-      key='Tab-Shared-Search'
-      name='Tab-Shared-Search'
-      component={TabSharedSearch}
-      options={({ navigation }: SharedSearchProp) => ({
-        headerLeft: () => <HeaderLeft onPress={() => navigation.goBack()} />,
-        headerCenter: () => {
-          const onChangeText = debounce(
-            (text: string) => navigation.setParams({ text }),
-            1000,
-            {
-              trailing: true
-            }
-          )
-          return (
-            <View style={styles.searchBar}>
-              <TextInput
-                editable={false}
-                style={[
-                  styles.textInput,
-                  {
-                    color: theme.primaryDefault
-                  }
-                ]}
-                defaultValue={t('shared.search.header.prefix')}
-              />
-              <TextInput
-                accessibilityRole='search'
-                keyboardAppearance={mode}
-                style={[
-                  styles.textInput,
-                  {
-                    flex: 1,
-                    color: theme.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={theme.secondary}
-                returnKeyType='go'
-              />
-            </View>
-          )
-        }
-      })}
-    />,
-    <Stack.Screen
-      key='Tab-Shared-Toot'
-      name='Tab-Shared-Toot'
-      component={TabSharedToot}
-      options={({ navigation }: SharedTootProp) => ({
-        headerTitle: t('shared.toot.name'),
-        ...(Platform.OS === 'android' && {
-          headerCenter: () => <HeaderCenter content={t('shared.toot.name')} />
-        }),
-        headerLeft: () => <HeaderLeft onPress={() => navigation.goBack()} />
-      })}
-    />,
-    <Stack.Screen
-      key='Tab-Shared-Users'
-      name='Tab-Shared-Users'
-      component={TabSharedUsers}
-      options={({
-        navigation,
-        route: {
-          params: { reference, type, count }
-        }
-      }: SharedUsersProp) => ({
-        headerLeft: () => <HeaderLeft onPress={() => navigation.goBack()} />,
-        headerTitle: t(`shared.users.${reference}.${type}`, { count }),
-        ...(Platform.OS === 'android' && {
-          headerCenter: () => (
-            <HeaderCenter
-              content={t(`shared.users.${reference}.${type}`, { count })}
-            />
-          )
-        })
-      })}
-    />
-  ]
-}
-
-const styles = StyleSheet.create({
-  searchBar: {
-    flexBasis: '80%',
-    flexDirection: 'row',
-    alignItems: 'center'
-  },
-  textInput: {
-    fontSize: StyleConstants.Font.Size.M
-  }
-})
-
-export default sharedScreens
--- a/src/startup/audio.ts
+++ b/src/startup/audio.ts
@ -5,9 +5,8 @@ const audio = () => {
  log('log', 'audio', 'setting audio playback default options')
  Audio.setAudioModeAsync({
    playsInSilentModeIOS: true,
-    interruptionModeIOS: Audio.INTERRUPTION_MODE_IOS_DO_NOT_MIX,
-    interruptionModeAndroid: Audio.INTERRUPTION_MODE_ANDROID_DO_NOT_MIX,
-    shouldDuckAndroid: true
+    interruptionModeIOS: Audio.INTERRUPTION_MODE_IOS_DUCK_OTHERS,
+    interruptionModeAndroid: Audio.INTERRUPTION_MODE_ANDROID_DUCK_OTHERS
  })
 }

--- a/src/store.ts
+++ b/src/store.ts
@ -1,10 +1,10 @@
 import createSecureStore from '@neverdull-agency/expo-unlimited-secure-store'
 import AsyncStorage from '@react-native-async-storage/async-storage'
-import { configureStore, getDefaultMiddleware } from '@reduxjs/toolkit'
+import { AnyAction, configureStore, Reducer } from '@reduxjs/toolkit'
 import instancesMigration from '@utils/migrations/instances/migration'
-import contextsSlice from '@utils/slices/contextsSlice'
-import instancesSlice from '@utils/slices/instancesSlice'
-import settingsSlice from '@utils/slices/settingsSlice'
+import contextsSlice, { ContextsState } from '@utils/slices/contextsSlice'
+import instancesSlice, { InstancesState } from '@utils/slices/instancesSlice'
+import settingsSlice, { SettingsState } from '@utils/slices/settingsSlice'
 import versionSlice from '@utils/slices/versionSlice'
 import { createMigrate, persistReducer, persistStore } from 'redux-persist'

@ -35,16 +35,26 @@ const settingsPersistConfig = {

 const store = configureStore({
  reducer: {
-    contexts: persistReducer(contextsPersistConfig, contextsSlice),
-    instances: persistReducer(instancesPersistConfig, instancesSlice),
-    settings: persistReducer(settingsPersistConfig, settingsSlice),
+    contexts: persistReducer(contextsPersistConfig, contextsSlice) as Reducer<
+      ContextsState,
+      AnyAction
+    >,
+    instances: persistReducer(
+      instancesPersistConfig,
+      instancesSlice
+    ) as Reducer<InstancesState, AnyAction>,
+    settings: persistReducer(settingsPersistConfig, settingsSlice) as Reducer<
+      SettingsState,
+      AnyAction
+    >,
    version: versionSlice
  },
-  middleware: getDefaultMiddleware({
-    serializableCheck: {
-      ignoredActions: ['persist/PERSIST']
-    }
-  })
+  middleware: getDefaultMiddleware =>
+    getDefaultMiddleware({
+      serializableCheck: {
+        ignoredActions: ['persist/PERSIST']
+      }
+    })
 })

 let persistor = persistStore(store)
--- a/src/utils/navigation/navigators.ts
+++ b/src/utils/navigation/navigators.ts
@ -0,0 +1,177 @@
+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 { QueryKeyTimeline } from '@utils/queryHooks/timeline'
+
+export type RootStackParamList = {
+  'Screen-Tabs': NavigatorScreenParams<ScreenTabsStackParamList>
+  'Screen-Actions':
+    | {
+        type: 'status'
+        queryKey: QueryKeyTimeline
+        rootQueryKey?: QueryKeyTimeline
+        status: Mastodon.Status
+      }
+    | {
+        type: 'account'
+        account: Mastodon.Account
+      }
+    | {
+        type: 'notifications_filter'
+      }
+  'Screen-Announcements': { showAll: boolean }
+  'Screen-Compose':
+    | {
+        type: 'edit'
+        incomingStatus: Mastodon.Status
+        replyToStatus?: Mastodon.Status
+        queryKey?: [
+          'Timeline',
+          {
+            page: App.Pages
+            hashtag?: Mastodon.Tag['name']
+            list?: Mastodon.List['id']
+            toot?: Mastodon.Status['id']
+            account?: Mastodon.Account['id']
+          }
+        ]
+      }
+    | {
+        type: 'reply'
+        incomingStatus: Mastodon.Status
+        accts: Mastodon.Account['acct'][]
+        queryKey?: [
+          'Timeline',
+          {
+            page: App.Pages
+            hashtag?: Mastodon.Tag['name']
+            list?: Mastodon.List['id']
+            toot?: Mastodon.Status['id']
+            account?: Mastodon.Account['id']
+          }
+        ]
+      }
+    | {
+        type: 'conversation'
+        accts: Mastodon.Account['acct'][]
+      }
+    | undefined
+  'Screen-ImagesViewer': {
+    imageUrls: {
+      id: Mastodon.Attachment['id']
+      preview_url: Mastodon.AttachmentImage['preview_url']
+      url: Mastodon.AttachmentImage['url']
+      remote_url?: Mastodon.AttachmentImage['remote_url']
+      blurhash: Mastodon.AttachmentImage['blurhash']
+      width?: number
+      height?: number
+    }[]
+    id: Mastodon.Attachment['id']
+  }
+}
+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 ScreenTabsStackParamList = {
+  'Tab-Local': NavigatorScreenParams<TabLocalStackParamList>
+  'Tab-Public': NavigatorScreenParams<TabPublicStackParamList>
+  'Tab-Compose': undefined
+  'Tab-Notifications': NavigatorScreenParams<TabNotificationsStackParamList>
+  'Tab-Me': NavigatorScreenParams<TabMeStackParamList>
+}
+export type ScreenTabsScreenProps<
+  T extends keyof ScreenTabsStackParamList
+> = BottomTabScreenProps<ScreenTabsStackParamList, T>
+
+export type TabSharedStackParamList = {
+  'Tab-Shared-Account': {
+    account: Mastodon.Account | Mastodon.Mention
+  }
+  'Tab-Shared-Attachments': { account: Mastodon.Account }
+  'Tab-Shared-Hashtag': {
+    hashtag: Mastodon.Tag['name']
+  }
+  'Tab-Shared-Search': { text: string | undefined }
+  'Tab-Shared-Toot': {
+    toot: Mastodon.Status
+    rootQueryKey?: QueryKeyTimeline
+  }
+  'Tab-Shared-Users':
+    | {
+        reference: 'accounts'
+        id: Mastodon.Account['id']
+        type: 'following' | 'followers'
+        count: number
+      }
+    | {
+        reference: 'statuses'
+        id: Mastodon.Status['id']
+        type: 'reblogged_by' | 'favourited_by'
+        count: number
+      }
+}
+export type TabSharedStackScreenProps<
+  T extends keyof TabSharedStackParamList
+> = NativeStackScreenProps<TabSharedStackParamList, T>
+
+export type TabLocalStackParamList = {
+  'Tab-Local-Root': undefined
+} & TabSharedStackParamList
+
+export type TabPublicStackParamList = {
+  'Tab-Public-Root': undefined
+} & TabSharedStackParamList
+
+export type TabNotificationsStackParamList = {
+  'Tab-Notifications-Root': undefined
+} & TabSharedStackParamList
+
+export type TabMeStackParamList = {
+  'Tab-Me-Root': undefined
+  'Tab-Me-Bookmarks': undefined
+  'Tab-Me-Conversations': undefined
+  'Tab-Me-Favourites': undefined
+  '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
+  'Tab-Me-Settings-Fontsize': 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 TabMeProfileStackParamList = {
+  'Tab-Me-Profile-Root': undefined
+  'Tab-Me-Profile-Name': {
+    display_name: Mastodon.Account['display_name']
+  }
+  'Tab-Me-Profile-Note': {
+    note: Mastodon.Source['note']
+  }
+  'Tab-Me-Profile-Fields': {
+    fields?: Mastodon.Source['fields']
+  }
+}
+export type TabMeProfileStackScreenProps<
+  T extends keyof TabMeProfileStackParamList
+> = NativeStackScreenProps<TabMeProfileStackParamList, T>
--- a/src/utils/push/useConnect.ts
+++ b/src/utils/push/useConnect.ts
@ -1,7 +1,7 @@
 import apiGeneral from '@api/general'
 import apiTooot from '@api/tooot'
 import { displayMessage } from '@components/Message'
-import { NavigationContainerRef } from '@react-navigation/native'
+import navigationRef from '@helpers/navigationRef'
 import { Dispatch } from '@reduxjs/toolkit'
 import { disableAllPushes, Instance } from '@utils/slices/instancesSlice'
 import * as Notifications from 'expo-notifications'
@ -9,20 +9,13 @@ import { useEffect } from 'react'
 import { TFunction } from 'react-i18next'

 export interface Params {
-  navigationRef: React.RefObject<NavigationContainerRef>
  mode: 'light' | 'dark'
  t: TFunction<'screens'>
  instances: Instance[]
  dispatch: Dispatch<any>
 }

-const pushUseConnect = ({
-  navigationRef,
-  mode,
-  t,
-  instances,
-  dispatch
-}: Params) => {
+const pushUseConnect = ({ mode, t, instances, dispatch }: Params) => {
  return useEffect(() => {
    const connect = async () => {
      const expoToken = (
@ -48,13 +41,13 @@ const pushUseConnect = ({
            message: t('pushError.message'),
            description: t('pushError.description'),
            onPress: () => {
-              navigationRef.current?.navigate('Screen-Tabs', {
+              navigationRef.navigate('Screen-Tabs', {
                screen: 'Tab-Me',
                params: {
                  screen: 'Tab-Me-Root'
                }
              })
-              navigationRef.current?.navigate('Screen-Tabs', {
+              navigationRef.navigate('Screen-Tabs', {
                screen: 'Tab-Me',
                params: {
                  screen: 'Tab-Me-Settings'
--- a/src/utils/push/useNavigate.ts
+++ b/src/utils/push/useNavigate.ts
@ -1,11 +1,8 @@
 import apiInstance from '@api/instance'
-import { NavigationContainerRef } from '@react-navigation/native'
+import navigationRef from '@helpers/navigationRef'

-const pushUseNavigate = (
-  navigationRef: React.RefObject<NavigationContainerRef>,
-  id?: Mastodon.Notification['id']
-) => {
-  navigationRef.current?.navigate('Screen-Tabs', {
+const pushUseNavigate = (id?: Mastodon.Notification['id']) => {
+  navigationRef.navigate('Screen-Tabs', {
    screen: 'Tab-Notifications',
    params: {
      screen: 'Tab-Notifications-Root'
@ -21,7 +18,7 @@ const pushUseNavigate = (
    url: `notifications/${id}`
  }).then(({ body }) => {
    if (body.status) {
-      navigationRef.current?.navigate('Screen-Tabs', {
+      navigationRef.navigate('Screen-Tabs', {
        screen: 'Tab-Notifications',
        params: {
          screen: 'Tab-Shared-Toot',
--- a/src/utils/push/useReceive.ts
+++ b/src/utils/push/useReceive.ts
@ -1,5 +1,4 @@
 import { displayMessage } from '@components/Message'
-import { NavigationContainerRef } from '@react-navigation/native'
 import { QueryKeyTimeline } from '@utils/queryHooks/timeline'
 import { Instance, updateInstanceActive } from '@utils/slices/instancesSlice'
 import * as Notifications from 'expo-notifications'
@ -10,12 +9,11 @@ import { useDispatch } from 'react-redux'
 import pushUseNavigate from './useNavigate'

 export interface Params {
-  navigationRef: React.RefObject<NavigationContainerRef>
  queryClient: QueryClient
  instances: Instance[]
 }

-const pushUseReceive = ({ navigationRef, queryClient, instances }: Params) => {
+const pushUseReceive = ({ queryClient, instances }: Params) => {
  const dispatch = useDispatch()

  return useEffect(() => {
@ -46,7 +44,7 @@ const pushUseReceive = ({ navigationRef, queryClient, instances }: Params) => {
            if (notificationIndex !== -1) {
              dispatch(updateInstanceActive(instances[notificationIndex]))
            }
-            pushUseNavigate(navigationRef, payloadData.notification_id)
+            pushUseNavigate(payloadData.notification_id)
          }
        })
      }
--- a/src/utils/push/useRespond.ts
+++ b/src/utils/push/useRespond.ts
@ -1,4 +1,3 @@
-import { NavigationContainerRef } from '@react-navigation/native'
 import { Dispatch } from '@reduxjs/toolkit'
 import { QueryKeyTimeline } from '@utils/queryHooks/timeline'
 import { Instance, updateInstanceActive } from '@utils/slices/instancesSlice'
@ -9,18 +8,12 @@ import { QueryClient } from 'react-query'
 import pushUseNavigate from './useNavigate'

 export interface Params {
-  navigationRef: React.RefObject<NavigationContainerRef>
  queryClient: QueryClient
  instances: Instance[]
  dispatch: Dispatch<any>
 }

-const pushUseRespond = ({
-  navigationRef,
-  queryClient,
-  instances,
-  dispatch
-}: Params) => {
+const pushUseRespond = ({ queryClient, instances, dispatch }: Params) => {
  return useEffect(() => {
    const subscription = Notifications.addNotificationResponseReceivedListener(
      ({ notification }) => {
@ -44,7 +37,7 @@ const pushUseRespond = ({
        if (notificationIndex !== -1) {
          dispatch(updateInstanceActive(instances[notificationIndex]))
        }
-        pushUseNavigate(navigationRef, payloadData.notification_id)
+        pushUseNavigate(payloadData.notification_id)
      }
    )
    return () => subscription.remove()
--- a/src/utils/queryHooks/timeline.ts
+++ b/src/utils/queryHooks/timeline.ts
@ -87,7 +87,9 @@ 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: {
@ -105,7 +107,7 @@ const queryFunction = async ({
            exclude_replies: 'true'
          }
        })
-        return await {
+        return {
          body: uniqBy([...res1.body, ...res2.body], 'id'),
          ...(res2.links.next && { links: { next: res2.links.next } })
        }
@ -175,8 +177,12 @@ const queryFunction = async ({
        method: 'get',
        url: `statuses/${toot}/context`
      })
-      return await {
-        body: [...res2_1.body.ancestors, res1_1.body, ...res2_1.body.descendants]
+      return {
+        body: [
+          ...res2_1.body.ancestors,
+          res1_1.body,
+          ...res2_1.body.descendants
+        ]
      }
    default:
      return Promise.reject()
--- a/src/utils/queryHooks/translate.ts
+++ b/src/utils/queryHooks/translate.ts
@ -1,8 +1,7 @@
 import apiTooot from '@api/tooot'
 import haptics from '@components/haptics'
 import { AxiosError } from 'axios'
-import { Buffer } from 'buffer'
-import Constants from 'expo-constants'
+import * as Crypto from 'expo-crypto'
 import { useQuery, UseQueryOptions } from 'react-query'

 type Translations = {
@ -24,13 +23,15 @@ export type QueryKeyTranslate = [
 const queryFunction = async ({ queryKey }: { queryKey: QueryKeyTranslate }) => {
  const { uri, source, target, text } = queryKey[1]

-  const uriEncoded = Buffer.from(uri.replace(/https?:\/\//, ''))
-    .toString('base64')
-    .replace('+', '-')
-    .replace('/', '_')
-    .replace(/=+$/, '')
-  const original = Buffer.from(JSON.stringify({ source, text })).toString(
-    'base64'
+  const uriEncoded = await Crypto.digestStringAsync(
+    Crypto.CryptoDigestAlgorithm.SHA256,
+    uri.replace(/https?:\/\//, ''),
+    { encoding: Crypto.CryptoEncoding.HEX }
+  )
+  const original = await Crypto.digestStringAsync(
+    Crypto.CryptoDigestAlgorithm.SHA256,
+    JSON.stringify({ source, text }),
+    { encoding: Crypto.CryptoEncoding.HEX }
  )

  const res = await apiTooot<Translations>({
--- a/src/utils/queryHooks/users.ts
+++ b/src/utils/queryHooks/users.ts
@ -1,10 +1,11 @@
 import apiInstance from '@api/instance'
+import { TabSharedStackParamList } from '@utils/navigation/navigators'
 import { AxiosError } from 'axios'
 import { useInfiniteQuery, UseInfiniteQueryOptions } from 'react-query'

 export type QueryKeyUsers = [
  'Users',
-  Nav.TabSharedStackParamList['Tab-Shared-Users']
+  TabSharedStackParamList['Tab-Shared-Users']
 ]

 const queryFunction = ({
--- a/src/utils/slices/instances/add.ts
+++ b/src/utils/slices/instances/add.ts
@ -54,6 +54,13 @@ const addInstance = createAsyncThunk(
      headers: { Authorization: `Bearer ${token}` }
    })

+    const { body: filters } = await apiGeneral<Mastodon.Filter[]>({
+      method: 'get',
+      domain,
+      url: `api/v1/filters`,
+      headers: { Authorization: `Bearer ${token}` }
+    })
+
    return Promise.resolve({
      type,
      data: {
@ -70,6 +77,7 @@ const addInstance = createAsyncThunk(
          avatarStatic: avatar_static,
          preferences
        },
+        filters,
        notifications_filter: {
          follow: true,
          favourite: true,
--- a/src/utils/slices/instances/updatePushDecode.ts
+++ b/src/utils/slices/instances/updatePushDecode.ts
@ -12,7 +12,7 @@ export const updateInstancePushDecode = createAsyncThunk(
  async (
    disable: boolean,
    { getState }
-  ): Promise<Instance['push']['decode']['value']> => {
+  ): Promise<{ disable: Instance['push']['decode']['value'] }> => {
    const state = getState() as RootState
    const instance = getInstance(state)
    if (!instance?.url || !instance.account.id || !instance.push.keys) {
@ -89,6 +89,6 @@ export const updateInstancePushDecode = createAsyncThunk(
      }
    }

-    return Promise.resolve(disable)
+    return Promise.resolve({ disable })
  }
 )
--- a/src/utils/slices/instancesSlice.ts
+++ b/src/utils/slices/instancesSlice.ts
@ -274,7 +274,7 @@ const instancesSlice = createSlice({
      .addCase(updateInstancePushDecode.fulfilled, (state, action) => {
        const activeIndex = findInstanceActive(state.instances)
        state.instances[activeIndex].push.decode.loading = false
-        state.instances[activeIndex].push.decode.value = action.payload
+        state.instances[activeIndex].push.decode.value = action.payload.disable
      })
      .addCase(updateInstancePushDecode.rejected, state => {
        const activeIndex = findInstanceActive(state.instances)
--- a/src/utils/slices/settingsSlice.ts
+++ b/src/utils/slices/settingsSlice.ts
@ -13,7 +13,7 @@ export const changeAnalytics = createAsyncThunk(
  'settings/changeAnalytics',
  async (newValue: SettingsState['analytics']) => {
    await Analytics.setAnalyticsCollectionEnabled(newValue)
-    return newValue
+    return { newValue }
  }
 )

@ -75,7 +75,7 @@ const settingsSlice = createSlice({
  },
  extraReducers: builder => {
    builder.addCase(changeAnalytics.fulfilled, (state, action) => {
-      state.analytics = action.payload
+      state.analytics = action.payload.newValue
    })
  }
 })
--- a/src/utils/slices/versionSlice.ts
+++ b/src/utils/slices/versionSlice.ts
@ -29,7 +29,7 @@ const versionSlice = createSlice({
  reducers: {},
  extraReducers: builder => {
    builder.addCase(retriveVersionLatest.fulfilled, (state, action) => {
-      if (action.payload && Constants.manifest.version) {
+      if (action.payload && Constants.manifest?.version) {
        if (parseInt(action.payload) > parseInt(Constants.manifest.version)) {
          state.update = true
        }
--- a/yarn.lock
+++ b/yarn.lock