Merge branch 'main' into MM-47468-clear-DM-search-bar

useEffect should depend on props.value as it is a controlled component
2022-11-26 22:17:15 -06:00 · 2022-10-13 14:15:19 -05:00
911 changed files with 15353 additions and 31961 deletions
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -39,7 +39,7 @@ commands:
    steps:
      - add_ssh_keys:
          fingerprints:
-            - "03:1c:a7:07:35:bc:57:e4:1d:6c:e1:2c:4b:be:09:6d"
+            - "59:4d:99:5e:1c:6d:30:36:6d:60:76:88:ff:a7:ab:63"
      - run:
          name: Clone the mobile private repo
          command: git clone git@github.com:mattermost/mattermost-mobile-private.git ~/mattermost-mobile-private
@@ -114,7 +114,6 @@ commands:
          command: |
            NODE_ENV=development npm ci --ignore-scripts
            node node_modules/\@sentry/cli/scripts/install.js
-            node node_modules/react-native-webrtc/tools/downloadWebRTC.js
      - save_cache:
          name: Save npm cache
          key: v2-npm-{{ checksum "package.json" }}-{{ arch }}
@@ -310,13 +309,13 @@ jobs:
      - save:
          filename: "*.apk"

-  build-android-release:
-    executor: android
-    steps:
-      - build-android
-      - persist
-      - save:
-          filename: "*.apk"
+  # build-android-release:
+  #   executor: android
+  #   steps:
+  #     - build-android
+  #     - persist
+  #     - save:
+  #         filename: "*.apk"

  build-android-pr:
    executor: android
@@ -327,27 +326,27 @@ jobs:
      - save:
          filename: "*.apk"

-  build-android-unsigned:
-    executor: android
-    steps:
-      - checkout:
-          path: ~/mattermost-mobile
-      - npm-dependencies
-      - assets
-      - fastlane-dependencies:
-          for: android
-      - gradle-dependencies
-      - run:
-          name: Jetify Android libraries
-          command: ./node_modules/.bin/jetify
-      - run:
-          working_directory: fastlane
-          name: Run fastlane to build unsigned android
-          no_output_timeout: 30m
-          command: bundle exec fastlane android unsigned
-      - persist
-      - save:
-          filename: "*.apk"
+  # build-android-unsigned:
+  #   executor: android
+  #   steps:
+  #     - checkout:
+  #         path: ~/mattermost-mobile
+  #     - npm-dependencies
+  #     - assets
+  #     - fastlane-dependencies:
+  #         for: android
+  #     - gradle-dependencies
+  #     - run:
+  #         name: Jetify Android libraries
+  #         command: ./node_modules/.bin/jetify
+  #     - run:
+  #         working_directory: fastlane
+  #         name: Run fastlane to build unsigned android
+  #         no_output_timeout: 30m
+  #         command: bundle exec fastlane android unsigned
+  #     - persist
+  #     - save:
+  #         filename: "*.apk"

  build-ios-beta:
    executor:
@@ -359,13 +358,13 @@ jobs:
      - save:
          filename: "*.ipa"

-  build-ios-release:
-    executor: ios
-    steps:
-      - build-ios
-      - persist
-      - save:
-          filename: "*.ipa"
+  # build-ios-release:
+  #   executor: ios
+  #   steps:
+  #     - build-ios
+  #     - persist
+  #     - save:
+  #         filename: "*.ipa"

  build-ios-pr:
    executor: ios
@@ -376,64 +375,63 @@ jobs:
      - save:
          filename: "*.ipa"

-  build-ios-unsigned:
-    executor: ios
-    steps:
-      - checkout:
-          path: ~/mattermost-mobile
-      - npm-dependencies
-      - pods-dependencies
-      - assets
-      - fastlane-dependencies:
-          for: ios
-      - run:
-          working_directory: fastlane
-          name: Run fastlane to build unsigned iOS
-          no_output_timeout: 30m
-          command: |
-            HOMEBREW_NO_AUTO_UPDATE=1 brew install watchman
-            bundle exec fastlane ios unsigned
-      - persist_to_workspace:
-          root: ~/
-          paths:
-            - mattermost-mobile/*.ipa
-      - save:
-          filename: "*.ipa"
+  # build-ios-unsigned:
+  #   executor: ios
+  #   steps:
+  #     - checkout:
+  #         path: ~/mattermost-mobile
+  #     - npm-dependencies
+  #     - pods-dependencies
+  #     - assets
+  #     - fastlane-dependencies:
+  #         for: ios
+  #     - run:
+  #         working_directory: fastlane
+  #         name: Run fastlane to build unsigned iOS
+  #         no_output_timeout: 30m
+  #         command: |
+  #           HOMEBREW_NO_AUTO_UPDATE=1 brew install watchman
+  #           bundle exec fastlane ios unsigned
+  #     - persist_to_workspace:
+  #         root: ~/
+  #         paths:
+  #           - mattermost-mobile/*.ipa
+  #     - save:
+  #         filename: "*.ipa"

-  build-ios-simulator:
-    executor: ios
-    steps:
-      - checkout:
-          path: ~/mattermost-mobile
-      - npm-dependencies
-      - pods-dependencies
-      - assets
-      - fastlane-dependencies:
-          for: ios
-      - run:
-          working_directory: fastlane
-          name: Run fastlane to build unsigned x86_64 iOS app for iPhone simulator
-          no_output_timeout: 30m
-          command: |
-            HOMEBREW_NO_AUTO_UPDATE=1 brew install watchman
-            bundle exec fastlane ios simulator
-      - persist_to_workspace:
-          root: ~/
-          paths:
-            - mattermost-mobile/Mattermost-simulator-x86_64.app.zip
-      - save:
-          filename: "Mattermost-simulator-x86_64.app.zip"
+  # build-ios-simulator:
+  #   executor: ios
+  #   steps:
+  #     - checkout:
+  #         path: ~/mattermost-mobile
+  #     - npm-dependencies
+  #     - pods-dependencies
+  #     - assets
+  #     - fastlane-dependencies:
+  #         for: ios
+  #     - run:
+  #         working_directory: fastlane
+  #         name: Run fastlane to build unsigned x86_64 iOS app for iPhone simulator
+  #         no_output_timeout: 30m
+  #         command: |
+  #           HOMEBREW_NO_AUTO_UPDATE=1 brew install watchman
+  #           bundle exec fastlane ios simulator
+  #     - persist_to_workspace:
+  #         root: ~/
+  #         paths:
+  #           - mattermost-mobile/Mattermost-simulator-x86_64.app.zip
+  #     - save:
+  #         filename: "Mattermost-simulator-x86_64.app.zip"

-  deploy-android-release:
-    executor:
-      name: android
-      resource_class: medium
-    steps:
-      - deploy-to-store:
-          task: "Deploy to Google Play"
-          target: android
-          file: "*.apk"
-          env: "SUPPLY_TRACK=beta"
+  # deploy-android-release:
+  #   executor:
+  #     name: android
+  #     resource_class: medium
+  #   steps:
+  #     - deploy-to-store:
+  #         task: "Deploy to Google Play"
+  #         target: android
+  #         file: "*.apk"

  deploy-android-beta:
    executor:
@@ -446,14 +444,13 @@ jobs:
          file: "*.apk"
          env: "SUPPLY_TRACK=alpha"

-  deploy-ios-release:
-    executor: ios
-    steps:
-      - deploy-to-store:
-          task: "Deploy to TestFlight"
-          target: ios
-          file: "*.ipa"
-          env: ""
+  # deploy-ios-release:
+  #   executor: ios
+  #   steps:
+  #     - deploy-to-store:
+  #         task: "Deploy to TestFlight"
+  #         target: ios
+  #         file: "*.ipa"

  deploy-ios-beta:
    executor: ios
@@ -464,17 +461,17 @@ jobs:
          file: "*.ipa"
          env: ""

-  github-release:
-    executor:
-      name: android
-      resource_class: medium
-    steps:
-      - attach_workspace:
-          at: ~/
-      - run:
-          name: Create GitHub release
-          working_directory: fastlane
-          command: bundle exec fastlane github
+  # github-release:
+  #   executor:
+  #     name: android
+  #     resource_class: medium
+  #   steps:
+  #     - attach_workspace:
+  #         at: ~/
+  #     - run:
+  #         name: Create GitHub release
+  #         working_directory: fastlane
+  #         command: bundle exec fastlane github

 workflows:
  version: 2
@@ -486,24 +483,26 @@ workflows:
      #     requires:
      #       - test

-      - build-android-release:
-          context: mattermost-mobile-android-release
-          requires:
-            - test
-          filters:
-            branches:
-              only:
-                - /^build-release-\d+$/
-                - /^build-android-release-\d+$/
-      - deploy-android-release:
-          context: mattermost-mobile-android-release
-          requires:
-            - build-android-release
-          filters:
-            branches:
-              only:
-                - /^build-release-\d+$/
-                - /^build-android-release-\d+$/
+      # - build-android-release:
+      #     context: mattermost-mobile-android-release
+      #     requires:
+      #       - test
+      #     filters:
+      #       branches:
+      #         only:
+      #           - /^build-\d+$/
+      #           - /^build-android-\d+$/
+      #           - /^build-android-release-\d+$/
+      # - deploy-android-release:
+      #     context: mattermost-mobile-android-release
+      #     requires:
+      #       - build-android-release
+      #     filters:
+      #       branches:
+      #         only:
+      #           - /^build-\d+$/
+      #           - /^build-android-\d+$/
+      #           - /^build-android-release-\d+$/

      - build-android-beta:
          context: mattermost-mobile-android-beta
@@ -524,24 +523,26 @@ workflows:
                - /^build-android-\d+$/
                - /^build-android-beta-\d+$/

-      - build-ios-release:
-          context: mattermost-mobile-ios-release
-          requires:
-            - test
-          filters:
-            branches:
-              only:
-                - /^build-release-\d+$/
-                - /^build-ios-release-\d+$/
-      - deploy-ios-release:
-          context: mattermost-mobile-ios-release
-          requires:
-            - build-ios-release
-          filters:
-            branches:
-              only:
-                - /^build-release-\d+$/
-                - /^build-ios-release-\d+$/
+      # - build-ios-release:
+      #     context: mattermost-mobile-ios-release
+      #     requires:
+      #       - test
+      #     filters:
+      #       branches:
+      #         only:
+      #           - /^build-\d+$/
+      #           - /^build-ios-\d+$/
+      #           - /^build-ios-release-\d+$/
+      # - deploy-ios-release:
+      #     context: mattermost-mobile-ios-release
+      #     requires:
+      #       - build-ios-release
+      #     filters:
+      #       branches:
+      #         only:
+      #           - /^build-\d+$/
+      #           - /^build-ios-\d+$/
+      #           - /^build-ios-release-\d+$/

      - build-ios-beta:
          context: mattermost-mobile-ios-beta
@@ -577,41 +578,43 @@ workflows:
            branches:
              only: /^(build|ios)-pr-.*/

-      - build-android-unsigned:
-          context: mattermost-mobile-unsigned
-          requires:
-            - test
-          filters:
-            tags:
-              only: /^v(\d+\.)(\d+\.)(\d+)(.*)?$/
-            branches:
-              only: unsigned
-      - build-ios-unsigned:
-          context: mattermost-mobile-unsigned
-          requires:
-            - test
-          filters:
-            tags:
-              only: /^v(\d+\.)(\d+\.)(\d+)(.*)?$/
-            branches:
-              only: unsigned
-      - build-ios-simulator:
-          context: mattermost-mobile-unsigned
-          requires:
-            - test
-          filters:
-            branches:
-              only:
-                - /^build-\d+$/
-                - /^build-ios-sim-\d+$/
-
-      - github-release:
-          context: mattermost-mobile-unsigned
-          requires:
-            - build-android-unsigned
-            - build-ios-unsigned
-          filters:
-            tags:
-              only: /^v(\d+\.)(\d+\.)(\d+)(.*)?$/
-            branches:
-              only: unsigned
+      # - build-android-unsigned:
+      #     context: mattermost-mobile-unsigned
+      #     requires:
+      #       - test
+      #     filters:
+      #       tags:
+      #         only: /^v(\d+\.)(\d+\.)(\d+)(.*)?$/
+      #       branches:
+      #         only: unsigned
+      # - build-ios-unsigned:
+      #     context: mattermost-mobile-unsigned
+      #     requires:
+      #       - test
+      #     filters:
+      #       tags:
+      #         only: /^v(\d+\.)(\d+\.)(\d+)(.*)?$/
+      #       branches:
+      #         only: unsigned
+      # - build-ios-simulator:
+          # context: mattermost-mobile-unsigned
+          # requires:
+          #   - test
+          # filters:
+          #   branches:
+          #     only:
+          #       - /^build-\d+$/
+          #       - /^build-ios-\d+$/
+          #       - /^build-ios-beta-\d+$/
+          #       - /^build-ios-sim-\d+$/
+                
+      # - github-release:
+      #     context: mattermost-mobile-unsigned
+      #     requires:
+      #       - build-android-unsigned
+      #       - build-ios-unsigned
+      #     filters:
+      #       tags:
+      #         only: /^v(\d+\.)(\d+\.)(\d+)(.*)?$/
+      #       branches:
+      #         only: unsigned
--- a/.gitignore
+++ b/.gitignore
@@ -46,8 +46,6 @@ local.properties
 *.iml
 *.hprof
 .cxx/
-*.keystore
-!debug.keystore
 android/app/bin
 android/app/build
 android/build
@@ -63,6 +61,12 @@ npm-debug.log
 yarn-error.log
 .yarninstall

+# BUCK
+buck-out/
+\.buckd/
+android/app/libs
+*.keystore
+
 # Vim
 [._]*.s[a-w][a-z]
 [._]s[a-w][a-z]
@@ -98,7 +102,7 @@ coverage
 mattermost-license.txt
 *.mattermost-license
 detox/artifacts
-detox/detox_pixel_*
+detox/detox_pixel_4_xl_api_30

 # Bundle artifact
 *.jsbundle
@@ -110,6 +114,3 @@ launch.json

 # Notice.txt generation
 !build/notice-file
-
-# Temporary files created by Metro to check the health of the file watcher
-.metro-health-check*
--- a/.solidarity
+++ b/.solidarity
@@ -54,6 +54,13 @@
        "error": "visit rvm install https://rvm.io/rvm/install",
        "platform": "darwin"
      },
+      {
+        "rule": "cli",
+        "binary": "bundler",
+        "semver": "2.1.4",
+        "error": "install watchman `gem install bundler --version 2.1.4`",
+        "platform": "darwin"
+      },
      {
        "rule": "cli",
        "binary": "pod",
--- a/ISSUE_TEMPLATE.md
+++ b/ISSUE_TEMPLATE.md
@@ -1,4 +1,4 @@
-Submit feature requests to https://portal.productboard.com/mattermost/33-what-matters-to-you. File non-security related bugs here in the following format: 
+Submit feature requests to http://www.mattermost.org/feature-requests/. File non-security related bugs here in the following format: 

 #### Summary
 Issue in one concise sentence.
--- a/NOTICE.txt
+++ b/NOTICE.txt
@@ -91,39 +91,6 @@ A spec-compliant polyfill for Intl.RelativeTimeFormat fully tested by the offici

 ---

-## @gorhom/bottom-sheet
-
-This product contains '@gorhom/bottom-sheet' by Mo Gorhom.
-
-A performant interactive bottom sheet with fully configurable options
-
-* HOMEPAGE:
-  * https://github.com/gorhom/react-native-bottom-sheet
-
-* LICENSE: MIT License
-
-Copyright (c) 2020 Mo Gorhom
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
---
-
 ## @mattermost/compass-icons

 This product contains '@mattermost/compass-icons' by Mattermost.
@@ -233,41 +200,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.


---
-
-## @mattermost/react-native-turbo-mailer
-
-This product contains '@mattermost/react-native-turbo-mailer' by Avinash Lingaloo.
-
-An adaptation of react-native-mail that supports Turbo Module
-
-* HOMEPAGE:
-  * https://github.com/mattermost/react-native-turbo-mailer#readme
-
-* LICENSE: MIT
-
-MIT License
-
-Copyright (c) 2022 Mattermost
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-
 ---

 ## @msgpack/msgpack
@@ -361,17 +293,38 @@ SOFTWARE.

 ---

-## @react-native-camera-roll/camera-roll
+## @react-native-cameraroll/react-native-cameraroll

-This product contains '@react-native-camera-roll/camera-roll' by Bartol Karuza.
+This product contains 'react-native-cameraroll' by Bartol Karuza.

-React Native Camera Roll for iOS & Android
+React-native native module that provides access to the local camera roll or photo library

 * HOMEPAGE:
-  * https://github.com/react-native-cameraroll/react-native-cameraroll#readme
+  * https://github.com/react-native-cameraroll/react-native-cameraroll

 * LICENSE: MIT

+MIT License
+
+Copyright (c) 2015-present, Facebook, Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.


 ---
@@ -561,21 +514,6 @@ ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.


---
-
-## @react-navigation/stack
-
-This product contains '@react-navigation/stack'.
-
-Stack navigator component for iOS and Android with animated transitions and gestures
-
-* HOMEPAGE:
-  * https://reactnavigation.org/docs/stack-navigator/
-
-* LICENSE: MIT
-
-
-
 ---

 ## @rudderstack/rudder-sdk-react-native
@@ -1192,40 +1130,6 @@ Lightweight fuzzy-search
   limitations under the License.


---
-
-## html-entities
-
-This product contains 'html-entities' by Marat Dulin.
-
-Fastest HTML entities encode/decode library.
-
-* HOMEPAGE:
-  * https://github.com/mdevils/html-entities#readme
-
-* LICENSE: MIT
-
-Copyright (c) 2021 Dulin Marat
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
-
 ---

 ## jail-monkey
@@ -2128,42 +2032,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.


---
-
-## react-native-in-app-review
-
-This product contains 'react-native-in-app-review' by Mina Samir Shafik.
-
-react native in app review, to rate on Play store, App Store, Generally, the in-app review flow (see figure 1 for play store, figure 2 for ios) can be triggered at any time throughout the user journey of your app. During the flow, the user has the ability
-
-* HOMEPAGE:
-  * https://github.com/MinaSamir11/react-native-in-app-review#readme
-
-* LICENSE: MIT
-
-MIT License
-
-Copyright (c) 2020 Mina Samir
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-
 ---

 ## react-native-incall-manager
@@ -2444,6 +2312,42 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.


+---
+
+## react-native-shadow-2
+
+This product contains a modified version of 'react-native-shadow-2' by Henrique Bruno Fantauzzi de Almeida.
+
+Cross-platform shadow for React Native. Supports Android, iOS, Web and Expo.
+
+* HOMEPAGE:
+  * https://github.com/SrBrahma/react-native-shadow-2
+
+* LICENSE: MIT
+
+MIT License
+
+Copyright (c) 2021 Henrique Bruno Fantauzzi de Almeida
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+
 ---

 ## react-native-notifications
@@ -2645,42 +2549,6 @@ See the License for the specific language governing permissions and
 limitations under the License.


---
-
-## react-native-shadow-2
-
-This product contains a modified version of 'react-native-shadow-2' by Henrique Bruno Fantauzzi de Almeida.
-
-Cross-platform shadow for React Native. Supports Android, iOS, Web and Expo.
-
-* HOMEPAGE:
-  * https://github.com/SrBrahma/react-native-shadow-2
-
-* LICENSE: MIT
-
-MIT License
-
-Copyright (c) 2021 Henrique Bruno Fantauzzi de Almeida
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-
 ---

 ## react-native-share
@@ -2753,6 +2621,42 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.


+---
+
+## react-native-user-agent
+
+This product contains 'react-native-user-agent' by Bebnev Anton.
+
+Library that helps you to get mobile application user agent and web view user agent strings.
+
+* HOMEPAGE:
+  * https://github.com/bebnev/react-native-user-agent
+
+* LICENSE: MIT
+
+MIT License
+
+Copyright (c) 2018 Anton Bebnev
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+
 ---

 ## react-native-vector-icons
@@ -2824,38 +2728,6 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.

---
-
-## react-native-walkthrough-tooltip
-
-This product contains 'react-native-walkthrough-tooltip' by Jason Gaare.
-
-React Native Walkthrough Tooltip is a fullscreen modal that highlights whichever element it wraps.
-
-* HOMEPAGE:
-  * https://github.com/jasongaare/react-native-walkthrough-tooltip
-
-* LICENSE: MIT License
-
-Copyright (c) 2018 Jason Gaare
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

 ---

@@ -3027,6 +2899,28 @@ IN THE SOFTWARE.
 """


+---
+
+## reanimated-bottom-sheet
+
+This product contains a modified version of 'reanimated-bottom-sheet' by Michał Osadnik.
+
+Highly configurable component imitating native bottom sheet behavior, with fully native 60 FPS animations!
+
+* HOMEPAGE:
+  * https://github.com/osdnk/react-native-reanimated-bottom-sheet
+
+* LICENSE: MIT
+
+Copyright 2019 – present Michał Osadnik
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
 ---

 ## semver
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 # Mattermost Mobile v2

- **Minimum Server versions:** Current ESR version (7.1.0+)
- **Supported iOS versions:** 12.1+
+- **Minimum Server versions:** Current ESR version (5.25)
+- **Supported iOS versions:** 11+
 - **Supported Android versions:** 7.0+

 Mattermost is an open source Slack-alternative used by thousands of companies around the world in 21 languages. Learn more at [https://about.mattermost.com](https://about.mattermost.com).
--- a/android/app/BUCK
+++ b/android/app/BUCK
@@ -0,0 +1,65 @@
+# To learn about Buck see [Docs](https://buckbuild.com/).
+# To run your application with Buck:
+# - install Buck
+# - `npm start` - to start the packager
+# - `cd android`
+# - `keytool -genkey -v -keystore keystores/debug.keystore -storepass android -alias androiddebugkey -keypass android -dname "CN=Android Debug,O=Android,C=US"`
+# - `./gradlew :app:copyDownloadableDepsToLibs` - make all Gradle compile dependencies available to Buck
+# - `buck install -r android/app` - compile, install and run application
+#
+
+lib_deps = []
+
+for jarfile in glob(['libs/*.jar']):
+  name = 'jars__' + jarfile[jarfile.rindex('/') + 1: jarfile.rindex('.jar')]
+  lib_deps.append(':' + name)
+  prebuilt_jar(
+    name = name,
+    binary_jar = jarfile,
+  )
+
+for aarfile in glob(['libs/*.aar']):
+  name = 'aars__' + aarfile[aarfile.rindex('/') + 1: aarfile.rindex('.aar')]
+  lib_deps.append(':' + name)
+  android_prebuilt_aar(
+    name = name,
+    aar = aarfile,
+  )
+
+android_library(
+    name = "all-libs",
+    exported_deps = lib_deps,
+)
+
+android_library(
+    name = "app-code",
+    srcs = glob([
+        "src/main/java/**/*.java",
+    ]),
+    deps = [
+        ":all-libs",
+        ":build_config",
+        ":res",
+    ],
+)
+
+android_build_config(
+    name = "build_config",
+    package = "com.mattermost.rnbeta",
+)
+
+android_resource(
+    name = "res",
+    package = "com.mattermost.rnbeta",
+    res = "src/main/res",
+)
+
+android_binary(
+    name = "app",
+    keystore = "//android/keystores:debug",
+    manifest = "src/main/AndroidManifest.xml",
+    package_type = "debug",
+    deps = [
+        ":app-code",
+    ],
+)
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -1,56 +1,88 @@
 apply plugin: "com.android.application"
-apply plugin: "com.facebook.react"
 apply plugin: 'kotlin-android'
 import com.android.build.OutputFile
-
+import org.apache.tools.ant.taskdefs.condition.Os

 /**
- * This is the configuration block to customize your React Native Android app.
- * By default you don't need to apply any configuration, just uncomment the lines you need.
+ * The react.gradle file registers a task for each build variant (e.g. bundleDebugJsAndAssets
+ * and bundleReleaseJsAndAssets).
+ * These basically call `react-native bundle` with the correct arguments during the Android build
+ * cycle. By default, bundleDebugJsAndAssets is skipped, as in debug/dev mode we prefer to load the
+ * bundle directly from the development server. Below you can see all the possible configurations
+ * and their defaults. If you decide to add a configuration block, make sure to add it before the
+ * `apply from: "../../node_modules/react-native/react.gradle"` line.
+ *
+ * project.ext.react = [
+ *   // the name of the generated asset file containing your JS bundle
+ *   bundleAssetName: "index.android.bundle",
+ *
+ *   // the entry file for bundle generation. If none specified and
+ *   // "index.android.js" exists, it will be used. Otherwise "index.js" is
+ *   // default. Can be overridden with ENTRY_FILE environment variable.
+ *   entryFile: "index.android.js",
+ *
+ *   // whether to bundle JS and assets in debug mode
+ *   bundleInDebug: false,
+ *
+ *   // whether to bundle JS and assets in release mode
+ *   bundleInRelease: true,
+ *
+ *   // whether to bundle JS and assets in another build variant (if configured).
+ *   // See http://tools.android.com/tech-docs/new-build-system/user-guide#TOC-Build-Variants
+ *   // The configuration property can be in the following formats
+ *   //         'bundleIn${productFlavor}${buildType}'
+ *   //         'bundleIn${buildType}'
+ *   // bundleInFreeDebug: true,
+ *   // bundleInPaidRelease: true,
+ *   // bundleInBeta: true,
+ *
+ *   // whether to disable dev mode in custom build variants (by default only disabled in release)
+ *   // for example: to disable dev mode in the staging build type (if configured)
+ *   devDisabledInStaging: true,
+ *   // The configuration property can be in the following formats
+ *   //         'devDisabledIn${productFlavor}${buildType}'
+ *   //         'devDisabledIn${buildType}'
+ *
+ *   // the root of your project, i.e. where "package.json" lives
+ *   root: "../../",
+ *
+ *   // where to put the JS bundle asset in debug mode
+ *   jsBundleDirDebug: "$buildDir/intermediates/assets/debug",
+ *
+ *   // where to put the JS bundle asset in release mode
+ *   jsBundleDirRelease: "$buildDir/intermediates/assets/release",
+ *
+ *   // where to put drawable resources / React Native assets, e.g. the ones you use via
+ *   // require('./image.png')), in debug mode
+ *   resourcesDirDebug: "$buildDir/intermediates/res/merged/debug",
+ *
+ *   // where to put drawable resources / React Native assets, e.g. the ones you use via
+ *   // require('./image.png')), in release mode
+ *   resourcesDirRelease: "$buildDir/intermediates/res/merged/release",
+ *
+ *   // by default the gradle tasks are skipped if none of the JS files or assets change; this means
+ *   // that we don't look at files in android/ or ios/ to determine whether the tasks are up to
+ *   // date; if you have any other folders that you want to ignore for performance reasons (gradle
+ *   // indexes the entire tree), add them here. Alternatively, if you have JS files in android/
+ *   // for example, you might want to remove it from here.
+ *   inputExcludes: ["android/**", "ios/**"],
+ *
+ *   // override which node gets called and with what additional arguments
+ *   nodeExecutableAndArgs: ["node"],
+ *
+ *   // supply additional arguments to the packager
+ *   extraPackagerArgs: []
+ * ]
 */

- react {
-    /* Folders */
-    //   The root of your project, i.e. where "package.json" lives. Default is '..'
-    // root = file("../")
-    //   The folder where the react-native NPM package is. Default is ../node_modules/react-native
-    // reactNativeDir = file("../node_modules/react-native")
-    //   The folder where the react-native Codegen package is. Default is ../node_modules/react-native-codegen
-    // codegenDir = file("../node_modules/react-native-codegen")
-    //   The cli.js file which is the React Native CLI entrypoint. Default is ../node_modules/react-native/cli.js
-    // cliFile = file("../node_modules/react-native/cli.js")
-    /* Variants */
-    //   The list of variants to that are debuggable. For those we're going to
-    //   skip the bundling of the JS bundle and the assets. By default is just 'debug'.
-    //   If you add flavors like lite, prod, etc. you'll have to list your debuggableVariants.
-    // debuggableVariants = ["liteDebug", "prodDebug"]
-    /* Bundling */
-    //   A list containing the node command and its flags. Default is just 'node'.
-    // nodeExecutableAndArgs = ["node"]
-    //
-    //   The command to run when bundling. By default is 'bundle'
-    // bundleCommand = "ram-bundle"
-    //
-    //   The path to the CLI configuration file. Default is empty.
-    // bundleConfig = file(../rn-cli.config.js)
-    //
-    //   The name of the generated asset file containing your JS bundle
-    // bundleAssetName = "MyApplication.android.bundle"
-    //
-    //   The entry file for bundle generation. Default is 'index.android.js' or 'index.js'
-    entryFile = file("../../index.ts")
-    //
-    //   A list of extra flags to pass to the 'bundle' commands.
-    //   See https://github.com/react-native-community/cli/blob/main/docs/commands.md#bundle
-    // extraPackagerArgs = []
-    /* Hermes Commands */
-    //   The hermes compiler command to run. By default it is 'hermesc'
-    // hermesCommand = "$rootDir/my-custom-hermesc/bin/hermesc"
-    //
-    //   The list of flags to pass to the Hermes compiler. By default is "-O", "-output-source-map"
-    // hermesFlags = ["-O", "-output-source-map"]
-}
+project.ext.react = [
+    entryFile: "index.ts",
+    bundleConfig: "metro.config.js",
+    bundleCommand: "bundle",
+    enableHermes: true,
+]

+apply from: "../../node_modules/react-native/react.gradle"
 apply from: "../../node_modules/react-native-vector-icons/fonts.gradle"

 if (System.getenv("SENTRY_ENABLED") == "true") {
@@ -63,35 +95,33 @@ if (System.getenv("SENTRY_ENABLED") == "true") {
 }

 /**
- * Set this to true to create four separate APKs instead of one,
- * one for each native architecture. This is useful if you don't
- * use App Bundles (https://developer.android.com/guide/app-bundle/)
- * and want to have separate APKs to upload to the Play Store
+ * Set this to true to create two separate APKs instead of one:
+ *   - An APK that only works on ARM devices
+ *   - An APK that only works on x86 devices
+ * The advantage is the size of the APK is reduced by about 4MB.
+ * Upload all the APKs to the Play Store and people will download
+ * the correct one based on the CPU architecture of their device.
 */
 def enableSeparateBuildPerCPUArchitecture = project.hasProperty('separateApk') ? project.property('separateApk').toBoolean() : false

 /**
- * Set this to true to Run Proguard on Release builds to minify the Java bytecode.
+ * Run Proguard to shrink the Java bytecode in release builds.
 */
 def enableProguardInReleaseBuilds = false

-/**
- * The preferred build flavor of JavaScriptCore (JSC)
- *
- * For example, to use the international variant, you can use:
- * `def jscFlavor = 'org.webkit:android-jsc-intl:+'`
- *
- * The international variant includes ICU i18n library and necessary data
- * allowing to use e.g. `Date.toLocaleString` and `String.localeCompare` that
- * give correct results when using with locales other than en-US. Note that
- * this variant is about 6MiB larger per architecture than default.
- */
 def jscFlavor = 'org.webkit:android-jsc-intl:+'

 /**
- * Private function to get the list of Native Architectures you want to build.
- * This reads the value from reactNativeArchitectures in your gradle.properties
- * file and works together with the --active-arch-only flag of react-native run-android.
+ * Whether to enable the Hermes VM.
+ *
+ * This should be set on project.ext.react and that value will be read here. If it is not set
+ * on project.ext.react, JavaScript will not be compiled to Hermes Bytecode
+ * and the benefits of using Hermes will therefore be sharply reduced.
+ */
+def enableHermes = project.ext.react.get("enableHermes", false);
+
+/**
+ * Architectures to build native code for.
 */
 def reactNativeArchitectures() {
    def value = project.getProperties().get("reactNativeArchitectures")
@@ -101,21 +131,84 @@ def reactNativeArchitectures() {
 android {
    ndkVersion rootProject.ext.ndkVersion
    compileSdkVersion rootProject.ext.compileSdkVersion
-    namespace "com.mattermost.rnbeta"

    lintOptions {
        checkReleaseBuilds false
        abortOnError false
    }

+    packagingOptions {
+        pickFirst '**/libc++_shared.so'
+    }
+
    defaultConfig {
        applicationId "com.mattermost.rnbeta"
        minSdkVersion rootProject.ext.minSdkVersion
        targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 454
+        versionCode 440
        versionName "2.0.0"
        testBuildType System.getProperty('testBuildType', 'debug')
        testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
+        buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
+
+        if (isNewArchitectureEnabled()) {
+            // We configure the CMake build only if you decide to opt-in for the New Architecture.
+            externalNativeBuild {
+                cmake {
+                    arguments "-DPROJECT_BUILD_DIR=$buildDir",
+                        "-DREACT_ANDROID_DIR=$rootDir/../node_modules/react-native/ReactAndroid",
+                        "-DREACT_ANDROID_BUILD_DIR=$rootDir/../node_modules/react-native/ReactAndroid/build",
+                        "-DNODE_MODULES_DIR=$rootDir/../node_modules",
+                        "-DANDROID_STL=c++_shared"
+                }
+            }
+            if (!enableSeparateBuildPerCPUArchitecture) {
+                ndk {
+                    abiFilters (*reactNativeArchitectures())
+                }
+            }
+        }
+    }
+
+    if (isNewArchitectureEnabled()) {
+        // We configure the NDK build only if you decide to opt-in for the New Architecture.
+        externalNativeBuild {
+            cmake {
+                path "$projectDir/src/main/jni/CMakeLists.txt"
+            }
+        }
+        def reactAndroidProjectDir = project(':ReactAndroid').projectDir
+        def packageReactNdkDebugLibs = tasks.register("packageReactNdkDebugLibs", Copy) {
+            dependsOn(":ReactAndroid:packageReactNdkDebugLibsForBuck")
+            from("$reactAndroidProjectDir/src/main/jni/prebuilt/lib")
+            into("$buildDir/react-ndk/exported")
+        }
+        def packageReactNdkReleaseLibs = tasks.register("packageReactNdkReleaseLibs", Copy) {
+            dependsOn(":ReactAndroid:packageReactNdkReleaseLibsForBuck")
+            from("$reactAndroidProjectDir/src/main/jni/prebuilt/lib")
+            into("$buildDir/react-ndk/exported")
+        }
+        afterEvaluate {
+            // If you wish to add a custom TurboModule or component locally,
+            // you should uncomment this line.
+            // preBuild.dependsOn("generateCodegenArtifactsFromSchema")
+            preDebugBuild.dependsOn(packageReactNdkDebugLibs)
+            preReleaseBuild.dependsOn(packageReactNdkReleaseLibs)
+
+            // Due to a bug inside AGP, we have to explicitly set a dependency
+            // between configureCMakeDebug* tasks and the preBuild tasks.
+            // This can be removed once this is solved: https://issuetracker.google.com/issues/207403732
+            configureCMakeDebugRelease.dependsOn(preReleaseBuild)
+            configureCMakeDebugDebug.dependsOn(preDebugBuild)
+            reactNativeArchitectures().each { architecture ->
+                tasks.findByName("configureCMakeDebugDebug[${architecture}]")?.configure {
+                    dependsOn("preDebugBuild")
+                }
+                tasks.findByName("configureCMakeDebugRelease[${architecture}]")?.configure {
+                    dependsOn("preReleaseBuild")
+                }
+            }
+        }
    }

    signingConfigs {
@@ -188,40 +281,70 @@ repositories {
 }

 dependencies {
-    // The version of react-native is set by the React Native Gradle Plugin
-    implementation("com.facebook.react:react-android")
+    implementation fileTree(dir: "libs", include: ["*.jar"])

-    implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.0.0")
+    //noinspection GradleDynamicVersio
+    implementation "com.facebook.react:react-native:+"  // From node_modules

-    debugImplementation("com.facebook.flipper:flipper:${FLIPPER_VERSION}")
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2'
+
+    implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.0.0"
+
+    debugImplementation("com.facebook.flipper:flipper:${FLIPPER_VERSION}") {
+        exclude group:'com.facebook.fbjni'
+    }
    debugImplementation("com.facebook.flipper:flipper-network-plugin:${FLIPPER_VERSION}") {
-        exclude group:'com.squareup.okhttp3', module:'okhttp'
+        exclude group:'com.facebook.flipper'
+    }
+    debugImplementation("com.facebook.flipper:flipper-fresco-plugin:${FLIPPER_VERSION}") {
+        exclude group:'com.facebook.flipper'
    }

-    debugImplementation("com.facebook.flipper:flipper-fresco-plugin:${FLIPPER_VERSION}")
-    if (hermesEnabled.toBoolean()) {
-        implementation("com.facebook.react:hermes-android")
+
+    if (enableHermes) {
+        //noinspection GradleDynamicVersion
+        implementation("com.facebook.react:hermes-engine:+") { // From node_modules
+            exclude group:'com.facebook.fbjni'
+        }
    } else {
        implementation jscFlavor
    }

-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2'
-    implementation 'io.reactivex.rxjava3:rxjava:3.1.6'
-    implementation 'io.reactivex.rxjava3:rxandroid:3.0.2'
-    implementation 'androidx.window:window-rxjava3:1.0.0'
-    implementation 'androidx.window:window:1.0.0'
    implementation 'androidx.appcompat:appcompat:1.4.1'
    implementation 'com.google.android.material:material:1.0.0'
    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+
+    implementation project(':reactnativenotifications')
    implementation "com.google.firebase:firebase-messaging:$firebaseVersion"

+    // For animated GIF support
+    implementation 'com.facebook.fresco:fresco:2.6.0'
+    implementation 'com.facebook.fresco:animated-gif:2.6.0'
+    // For WebP support, including animated WebP
+    implementation 'com.facebook.fresco:animated-webp:2.6.0'
+    implementation  'com.facebook.fresco:webpsupport:2.6.0'
+
    androidTestImplementation('com.wix:detox:+')
-    implementation project(':reactnativenotifications')
+
    implementation project(':watermelondb-jsi')
 }

 configurations.all {
+    if (isNewArchitectureEnabled()) {
+        // If new architecture is enabled, we let you build RN from source
+        // Otherwise we fallback to a prebuilt .aar bundled in the NPM package.
+        // This will be applied to all the imported transtitive dependency.
+        resolutionStrategy.dependencySubstitution {
+            substitute(module("com.facebook.react:react-native"))
+                    .using(project(":ReactAndroid"))
+                    .because("On New Architecture we're building React Native from source")
+            substitute(module("com.facebook.react:hermes-engine"))
+                    .using(project(":ReactAndroid:hermes-engine"))
+                    .because("On New Architecture we're building Hermes from source")
+        }
+    }
    resolutionStrategy {
+        force "com.facebook.soloader:soloader:0.10.1"
        eachDependency { DependencyResolveDetails details ->
            if (details.requested.name == 'play-services-base') {
                details.useTarget group: details.requested.group, name: details.requested.name, version: '15.0.1'
@@ -236,13 +359,13 @@ configurations.all {
                details.useTarget group: details.requested.group, name: details.requested.name, version: '15.0.1'
            }
            if (details.requested.name == 'okhttp') {
-                details.useTarget group: details.requested.group, name: details.requested.name, version: '4.10.0'
+                details.useTarget group: details.requested.group, name: details.requested.name, version: '4.9.2'
            }
            if (details.requested.name == 'okhttp-tls') {
-                details.useTarget group: details.requested.group, name: details.requested.name, version: '4.10.0'
+                details.useTarget group: details.requested.group, name: details.requested.name, version: '4.9.2'
            }
            if (details.requested.name == 'okhttp-urlconnection') {
-                details.useTarget group: details.requested.group, name: details.requested.name, version: '4.10.0'
+                details.useTarget group: details.requested.group, name: details.requested.name, version: '4.9.2'
            }
        }
    }
@@ -257,3 +380,11 @@ task copyDownloadableDepsToLibs(type: Copy) {

 apply plugin: 'com.google.gms.google-services'
 apply from: file("../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesAppBuildGradle(project)
+
+def isNewArchitectureEnabled() {
+    // To opt-in for the New Architecture, you can either:
+    // - Set `newArchEnabled` to true inside the `gradle.properties` file
+    // - Invoke gradle with `-newArchEnabled=true`
+    // - Set an environment variable `ORG_GRADLE_PROJECT_newArchEnabled=true`
+    return project.hasProperty("newArchEnabled") && project.newArchEnabled == "true"
+}
--- a/android/app/debug.keystore
+++ b/android/app/debug.keystore
--- a/android/app/src/androidTest/java/com/mattermost/rnbeta/DetoxTest.java
+++ b/android/app/src/androidTest/java/com/mattermost/rnbeta/DetoxTest.java
@@ -1,7 +1,6 @@
 package com.mattermost.rnbeta;

 import com.wix.detox.Detox;
-import com.wix.detox.config.DetoxConfig;

 import org.junit.Rule;
 import org.junit.Test;
@@ -20,11 +19,10 @@ public class DetoxTest {

    @Test
    public void runDetoxTests() {
-        DetoxConfig detoxConfig = new DetoxConfig();
-        detoxConfig.idlePolicyConfig.masterTimeoutSec = 90;
-        detoxConfig.idlePolicyConfig.idleResourceTimeoutSec = 60;
-        detoxConfig.rnContextLoadTimeoutSec = (BuildConfig.DEBUG ? 180 : 60);
+        Detox.DetoxIdlePolicyConfig idlePolicyConfig = new Detox.DetoxIdlePolicyConfig();
+        idlePolicyConfig.masterTimeoutSec = 60;
+        idlePolicyConfig.idleResourceTimeoutSec = 30;

-        Detox.runTests(mActivityRule, detoxConfig);
+        Detox.runTests(mActivityRule, idlePolicyConfig);
    }
 }
--- a/android/app/src/debug/java/com/mattermost/flipper/ReactNativeFlipper.java
+++ b/android/app/src/debug/java/com/mattermost/flipper/ReactNativeFlipper.java
@@ -4,7 +4,7 @@
 * <p>This source code is licensed under the MIT license found in the LICENSE file in the root
 * directory of this source tree.
 */
-package com.mattermost.flipper;
+package com.rn;

 import android.content.Context;
 import com.facebook.flipper.android.AndroidFlipperClient;
@@ -17,22 +17,19 @@ import com.facebook.flipper.plugins.inspector.DescriptorMapping;
 import com.facebook.flipper.plugins.inspector.InspectorFlipperPlugin;
 import com.facebook.flipper.plugins.network.FlipperOkhttpInterceptor;
 import com.facebook.flipper.plugins.network.NetworkFlipperPlugin;
+import com.facebook.flipper.plugins.react.ReactFlipperPlugin;
 import com.facebook.flipper.plugins.sharedpreferences.SharedPreferencesFlipperPlugin;
 import com.facebook.react.ReactInstanceEventListener;
 import com.facebook.react.ReactInstanceManager;
 import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.modules.network.NetworkingModule;
 import okhttp3.OkHttpClient;
-
-/**
- * Class responsible of loading Flipper inside your React Native application. This is the debug
- * flavor of it. Here you can add your own plugins and customize the Flipper setup.
- */
 public class ReactNativeFlipper {
  public static void initializeFlipper(Context context, ReactInstanceManager reactInstanceManager) {
    if (FlipperUtils.shouldEnableFlipper(context)) {
      final FlipperClient client = AndroidFlipperClient.getInstance(context);
      client.addPlugin(new InspectorFlipperPlugin(context, DescriptorMapping.withDefaults()));
+      client.addPlugin(new ReactFlipperPlugin());
      client.addPlugin(new DatabasesFlipperPlugin(context));
      client.addPlugin(new SharedPreferencesFlipperPlugin(context));
      client.addPlugin(CrashReporterPlugin.getInstance());
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -1,10 +1,10 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.mattermost.rnbeta">
    <uses-permission android:name="android.permission.INTERNET" />
    <uses-permission android:name="android.permission.VIBRATE" />
    <uses-permission-sdk-23 android:name="android.permission.VIBRATE"/>
    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
    <uses-permission android:name="android.permission.CAMERA"/>
-    <uses-permission android:name="android.permission.READ_MEDIA_AUDIO"/>
    <uses-permission android:name="android.permission.READ_MEDIA_IMAGES"/>
    <uses-permission android:name="android.permission.READ_MEDIA_VIDEO"/>
    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
@@ -83,23 +83,5 @@
        android:resizeableActivity="true"
        android:exported="true"
      />
-      <activity
-        android:name="com.mattermost.share.ShareActivity"
-        android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|screenSize|smallestScreenSize|uiMode"
-        android:windowSoftInputMode="adjustResize"
-        android:label="@string/app_name"
-        android:screenOrientation="portrait"
-        android:theme="@style/AppTheme"
-        android:taskAffinity="com.mattermost.share"
-        android:exported="true"
-      >
-          <intent-filter>
-              <action android:name="android.intent.action.SEND" />
-              <action android:name="android.intent.action.SEND_MULTIPLE" />
-              <category android:name="android.intent.category.DEFAULT" />
-              <!-- for sharing-->
-              <data android:mimeType="*/*" />
-          </intent-filter>
-      </activity>
  </application>
 </manifest>
--- a/android/app/src/main/java/com/mattermost/helpers/CustomPushNotificationHelper.java
+++ b/android/app/src/main/java/com/mattermost/helpers/CustomPushNotificationHelper.java
@@ -58,7 +58,6 @@ public class CustomPushNotificationHelper {
        String senderId = bundle.getString("sender_id");
        String serverUrl = bundle.getString("server_url");
        String type = bundle.getString("type");
-        String urlOverride = bundle.getString("override_icon_url");
        if (senderId == null) {
            senderId = "sender_id";
        }
@@ -75,10 +74,7 @@ public class CustomPushNotificationHelper {

        if (serverUrl != null && !type.equals(CustomPushNotificationHelper.PUSH_TYPE_SESSION)) {
            try {
-                Bitmap avatar = userAvatar(context, serverUrl, senderId, urlOverride);
-                if (avatar != null) {
-                    sender.setIcon(IconCompat.createWithBitmap(avatar));
-                }
+                sender.setIcon(IconCompat.createWithBitmap(Objects.requireNonNull(userAvatar(context, serverUrl, senderId))));
            } catch (IOException e) {
                e.printStackTrace();
            }
@@ -182,7 +178,7 @@ public class CustomPushNotificationHelper {
        setNotificationGroup(notification, groupId, createSummary);
        setNotificationBadgeType(notification);

-        setNotificationChannel(context, notification, bundle);
+        setNotificationChannel(notification, bundle);
        setNotificationDeleteIntent(context, notification, bundle, notificationId);
        addNotificationReplyAction(context, notification, bundle, notificationId);

@@ -267,7 +263,6 @@ public class CustomPushNotificationHelper {
        final String senderId = "me";
        final String serverUrl = bundle.getString("server_url");
        final String type = bundle.getString("type");
-        String urlOverride = bundle.getString("override_icon_url");

        Person.Builder sender = new Person.Builder()
                .setKey(senderId)
@@ -275,10 +270,7 @@ public class CustomPushNotificationHelper {

        if (serverUrl != null && !type.equals(CustomPushNotificationHelper.PUSH_TYPE_SESSION)) {
            try {
-                Bitmap avatar = userAvatar(context, serverUrl, "me", urlOverride);
-                if (avatar != null) {
-                    sender.setIcon(IconCompat.createWithBitmap(avatar));
-                }
+                sender.setIcon(IconCompat.createWithBitmap(Objects.requireNonNull(userAvatar(context, serverUrl, "me"))));
            } catch (IOException e) {
                e.printStackTrace();
            }
@@ -365,15 +357,12 @@ public class CustomPushNotificationHelper {
        }
    }

-    private static void setNotificationChannel(Context context, NotificationCompat.Builder notification, Bundle bundle) {
+    private static void setNotificationChannel(NotificationCompat.Builder notification, Bundle bundle) {
        // If Android Oreo or above we need to register a channel
        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
            return;
        }

-        if (mHighImportanceChannel == null) {
-            createNotificationChannels(context);
-        }
        NotificationChannel notificationChannel = mHighImportanceChannel;
        notification.setChannelId(notificationChannel.getId());
    }
@@ -408,7 +397,6 @@ public class CustomPushNotificationHelper {
        String channelName = getConversationTitle(bundle);
        String senderName = bundle.getString("sender_name");
        String serverUrl = bundle.getString("server_url");
-        String urlOverride = bundle.getString("override_icon_url");

        int smallIconResId = getSmallIconResourceId(context, smallIcon);
        notification.setSmallIcon(smallIconResId);
@@ -416,46 +404,33 @@ public class CustomPushNotificationHelper {
        if (serverUrl != null && channelName.equals(senderName)) {
            try {
                String senderId = bundle.getString("sender_id");
-                Bitmap avatar = userAvatar(context, serverUrl, senderId, urlOverride);
-                if (avatar != null) {
-                    notification.setLargeIcon(avatar);
-                }
+                notification.setLargeIcon(userAvatar(context, serverUrl, senderId));
            } catch (IOException e) {
                e.printStackTrace();
            }
        }
    }

-    private static Bitmap userAvatar(Context context, final String serverUrl, final String userId, final String urlOverride) throws IOException {
-        try {
-            final OkHttpClient client = new OkHttpClient();
-            Request request;
-            String url;
-            if (!TextUtils.isEmpty(urlOverride)) {
-                request = new Request.Builder().url(urlOverride).build();
-                Log.i("ReactNative", String.format("Fetch override profile image %s", urlOverride));
-            } else {
-                final ReactApplicationContext reactApplicationContext = new ReactApplicationContext(context);
-                final String token = Credentials.getCredentialsForServerSync(reactApplicationContext, serverUrl);
-                url = String.format("%s/api/v4/users/%s/image", serverUrl, userId);
-                Log.i("ReactNative", String.format("Fetch profile image %s", url));
-                request = new Request.Builder()
-                        .header("Authorization", String.format("Bearer %s", token))
-                        .url(url)
-                        .build();
-            }
-            Response response = client.newCall(request).execute();
-            if (response.code() == 200) {
-                assert response.body() != null;
-                byte[] bytes = Objects.requireNonNull(response.body()).bytes();
-                Bitmap bitmap = BitmapFactory.decodeByteArray(bytes, 0, bytes.length);
-                return getCircleBitmap(bitmap);
-            }
+    private static Bitmap userAvatar(Context context, final String serverUrl, final String userId) throws IOException {
+        final ReactApplicationContext reactApplicationContext = new ReactApplicationContext(context);
+        final String token = Credentials.getCredentialsForServerSync(reactApplicationContext, serverUrl);

-            return null;
-        } catch (Exception e) {
-            e.printStackTrace();
-            return null;
+        final OkHttpClient client = new OkHttpClient();
+        final String url = String.format("%s/api/v4/users/%s/image", serverUrl, userId);
+        Request request = new Request.Builder()
+                .header("Authorization", String.format("Bearer %s", token))
+                .url(url)
+                .build();
+        Response response = client.newCall(request).execute();
+        if (response.code() == 200) {
+            assert response.body() != null;
+            byte[] bytes = Objects.requireNonNull(response.body()).bytes();
+            Bitmap bitmap = BitmapFactory.decodeByteArray(bytes, 0, bytes.length);
+
+            Log.i("ReactNative", String.format("Fetch profile %s", url));
+            return getCircleBitmap(bitmap);
        }
+
+        return null;
    }
 }
--- a/android/app/src/main/java/com/mattermost/helpers/DatabaseHelper.kt
+++ b/android/app/src/main/java/com/mattermost/helpers/DatabaseHelper.kt
@@ -20,18 +20,13 @@ class DatabaseHelper {

    val onlyServerUrl: String?
        get() {
-            try {
-                val query = "SELECT url FROM Servers WHERE last_active_at != 0 AND identifier != ''"
-                val cursor = defaultDatabase!!.rawQuery(query)
-                if (cursor.count == 1) {
-                    cursor.moveToFirst()
-                    val url = cursor.getString(0)
-                    cursor.close()
-                    return url
-                }
-            } catch (e: Exception) {
-                e.printStackTrace()
-                // let it fall to return null
+            val query = "SELECT url FROM Servers WHERE last_active_at != 0 AND identifier != ''"
+            val cursor = defaultDatabase!!.rawQuery(query)
+            if (cursor.count == 1) {
+                cursor.moveToFirst()
+                val url = cursor.getString(0)
+                cursor.close()
+                return url
            }
            return null
        }
@@ -43,19 +38,14 @@ class DatabaseHelper {
    }

    fun getServerUrlForIdentifier(identifier: String): String? {
-        try {
-            val args: Array<Any?> = arrayOf(identifier)
-            val query = "SELECT url FROM Servers WHERE identifier=?"
-            val cursor = defaultDatabase!!.rawQuery(query, args)
-            if (cursor.count == 1) {
-                cursor.moveToFirst()
-                val url = cursor.getString(0)
-                cursor.close()
-                return url
-            }
-        } catch (e: Exception) {
-            e.printStackTrace()
-            // let it fall to return null
+        val args: Array<Any?> = arrayOf(identifier)
+        val query = "SELECT url FROM Servers WHERE identifier=?"
+        val cursor = defaultDatabase!!.rawQuery(query, args)
+        if (cursor.count == 1) {
+            cursor.moveToFirst()
+            val url = cursor.getString(0)
+            cursor.close()
+            return url
        }
        return null
    }
@@ -73,25 +63,19 @@ class DatabaseHelper {
                return resultMap
            }
        } catch (e: Exception) {
-            e.printStackTrace()
            return null
        }
    }

    fun getDatabaseForServer(context: Context?, serverUrl: String): Database? {
-        try {
-            val args: Array<Any?> = arrayOf(serverUrl)
-            val query = "SELECT db_path FROM Servers WHERE url=?"
-            val cursor = defaultDatabase!!.rawQuery(query, args)
-            if (cursor.count == 1) {
-                cursor.moveToFirst()
-                val databasePath = cursor.getString(0)
-                cursor.close()
-                return Database(databasePath, context!!)
-            }
-        } catch (e: Exception) {
-            e.printStackTrace()
-            // let it fall to return null
+        val args: Array<Any?> = arrayOf(serverUrl)
+        val query = "SELECT db_path FROM Servers WHERE url=?"
+        val cursor = defaultDatabase!!.rawQuery(query, args)
+        if (cursor.count == 1) {
+            cursor.moveToFirst()
+            val databasePath = cursor.getString(0)
+            cursor.close()
+            return Database(databasePath, context!!)
        }
        return null
    }
@@ -164,23 +148,18 @@ class DatabaseHelper {
    }

    fun queryPostSinceForChannel(db: Database?, channelId: String): Double? {
-        try {
-            if (db != null) {
-                val postsInChannelQuery = "SELECT last_fetched_at FROM MyChannel WHERE id=? LIMIT 1"
-                val cursor1 = db.rawQuery(postsInChannelQuery, arrayOf(channelId))
-                if (cursor1.count == 1) {
-                    cursor1.moveToFirst()
-                    val lastFetchedAt = cursor1.getDouble(0)
-                    cursor1.close()
-                    if (lastFetchedAt == 0.0) {
-                        return queryLastPostCreateAt(db, channelId)
-                    }
-                    return lastFetchedAt
+        if (db != null) {
+            val postsInChannelQuery = "SELECT last_fetched_at FROM MyChannel WHERE id=? LIMIT 1"
+            val cursor1 = db.rawQuery(postsInChannelQuery, arrayOf(channelId))
+            if (cursor1.count == 1) {
+                cursor1.moveToFirst()
+                val lastFetchedAt = cursor1.getDouble(0)
+                cursor1.close()
+                if (lastFetchedAt == 0.0) {
+                    return queryLastPostCreateAt(db, channelId)
                }
+                return lastFetchedAt
            }
-        } catch (e: Exception) {
-            e.printStackTrace()
-            // let it fall to return null
        }
        return null
    }
--- a/android/app/src/main/java/com/mattermost/helpers/NotificationHelper.java
+++ b/android/app/src/main/java/com/mattermost/helpers/NotificationHelper.java
@@ -145,9 +145,9 @@ public class NotificationHelper {
            for (final StatusBarNotification status : statusNotifications) {
                Bundle bundle = status.getNotification().extras;
                if (isThreadNotification) {
-                    hasMore = bundle.containsKey("root_id") && bundle.getString("root_id").equals(rootId);
+                    hasMore = bundle.getString("root_id").equals(rootId);
                } else {
-                    hasMore = bundle.containsKey("channel_id") && bundle.getString("channel_id").equals(channelId);
+                    hasMore = bundle.getString("channel_id").equals(channelId);
                }
                if (hasMore) break;
            }
--- a/android/app/src/main/java/com/mattermost/helpers/RealPathUtil.java
+++ b/android/app/src/main/java/com/mattermost/helpers/RealPathUtil.java
@@ -6,7 +6,6 @@ import android.net.Uri;
 import android.provider.DocumentsContract;
 import android.provider.MediaStore;
 import android.provider.OpenableColumns;
-import android.content.ContentResolver;
 import android.os.Environment;
 import android.webkit.MimeTypeMap;
 import android.util.Log;
@@ -183,14 +182,8 @@ public class RealPathUtil {
    }

    public static String getExtension(String uri) {
-        String extension = "";
        if (uri == null) {
-            return extension;
-        }
-
-        extension = MimeTypeMap.getFileExtensionFromUrl(uri);
-        if (!extension.equals("")) {
-            return extension;
+            return null;
        }

        int dot = uri.lastIndexOf(".");
@@ -217,15 +210,6 @@ public class RealPathUtil {
        return getMimeType(file);
    }

-     public static String getMimeTypeFromUri(final Context context, final Uri uri) {
-        try {
-            ContentResolver cR = context.getContentResolver();
-            return cR.getType(uri);
-        } catch (Exception e) {
-            return "application/octet-stream";
-        }
-    }
-
    public static void deleteTempFiles(final File dir) {
        try {
            if (dir.isDirectory()) {
@@ -257,21 +241,4 @@ public class RealPathUtil {
        return f.getName();
    }

-    public static File createDirIfNotExists(String path) {
-        File dir = new File(path);
-        if (dir.exists()) {
-            return dir;
-        }
-
-        try {
-            dir.mkdirs();
-            // Add .nomedia to hide the thumbnail directory from gallery
-            File noMedia = new File(path, ".nomedia");
-            noMedia.createNewFile();
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-
-        return dir;
-    }
 }
--- a/android/app/src/main/java/com/mattermost/newarchitecture/MainApplicationReactNativeHost.java
+++ b/android/app/src/main/java/com/mattermost/newarchitecture/MainApplicationReactNativeHost.java
@@ -0,0 +1,116 @@
+package com.mattermost.newarchitecture;
+
+import android.app.Application;
+import androidx.annotation.NonNull;
+import com.facebook.react.PackageList;
+import com.facebook.react.ReactInstanceManager;
+import com.facebook.react.ReactNativeHost;
+import com.facebook.react.ReactPackage;
+import com.facebook.react.ReactPackageTurboModuleManagerDelegate;
+import com.facebook.react.bridge.JSIModulePackage;
+import com.facebook.react.bridge.JSIModuleProvider;
+import com.facebook.react.bridge.JSIModuleSpec;
+import com.facebook.react.bridge.JSIModuleType;
+import com.facebook.react.bridge.JavaScriptContextHolder;
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.bridge.UIManager;
+import com.facebook.react.fabric.ComponentFactory;
+import com.facebook.react.fabric.CoreComponentsRegistry;
+import com.facebook.react.fabric.FabricJSIModuleProvider;
+import com.facebook.react.fabric.ReactNativeConfig;
+import com.facebook.react.uimanager.ViewManagerRegistry;
+import com.mattermost.rnbeta.BuildConfig;
+import com.mattermost.newarchitecture.components.MainComponentsRegistry;
+import com.mattermost.newarchitecture.modules.MainApplicationTurboModuleManagerDelegate;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * A {@link ReactNativeHost} that helps you load everything needed for the New Architecture, both
+ * TurboModule delegates and the Fabric Renderer.
+ *
+ * <p>Please note that this class is used ONLY if you opt-in for the New Architecture (see the
+ * `newArchEnabled` property). Is ignored otherwise.
+ */
+public class MainApplicationReactNativeHost extends ReactNativeHost {
+  public MainApplicationReactNativeHost(Application application) {
+    super(application);
+  }
+
+  @Override
+  public boolean getUseDeveloperSupport() {
+    return BuildConfig.DEBUG;
+  }
+
+  @Override
+  protected List<ReactPackage> getPackages() {
+    List<ReactPackage> packages = new PackageList(this).getPackages();
+    // Packages that cannot be autolinked yet can be added manually here, for example:
+    //     packages.add(new MyReactNativePackage());
+    // TurboModules must also be loaded here providing a valid TurboReactPackage implementation:
+    //     packages.add(new TurboReactPackage() { ... });
+    // If you have custom Fabric Components, their ViewManagers should also be loaded here
+    // inside a ReactPackage.
+    return packages;
+  }
+
+  @Override
+  protected String getJSMainModuleName() {
+    return "index";
+  }
+
+  @NonNull
+  @Override
+  protected ReactPackageTurboModuleManagerDelegate.Builder
+      getReactPackageTurboModuleManagerDelegateBuilder() {
+    // Here we provide the ReactPackageTurboModuleManagerDelegate Builder. This is necessary
+    // for the new architecture and to use TurboModules correctly.
+    return new MainApplicationTurboModuleManagerDelegate.Builder();
+  }
+
+  @Override
+  protected JSIModulePackage getJSIModulePackage() {
+    return new JSIModulePackage() {
+      @Override
+      public List<JSIModuleSpec> getJSIModules(
+          final ReactApplicationContext reactApplicationContext,
+          final JavaScriptContextHolder jsContext) {
+        final List<JSIModuleSpec> specs = new ArrayList<>();
+
+        // Here we provide a new JSIModuleSpec that will be responsible of providing the
+        // custom Fabric Components.
+        specs.add(
+            new JSIModuleSpec() {
+              @Override
+              public JSIModuleType getJSIModuleType() {
+                return JSIModuleType.UIManager;
+              }
+
+              @Override
+              public JSIModuleProvider<UIManager> getJSIModuleProvider() {
+                final ComponentFactory componentFactory = new ComponentFactory();
+                CoreComponentsRegistry.register(componentFactory);
+
+                // Here we register a Components Registry.
+                // The one that is generated with the template contains no components
+                // and just provides you the one from React Native core.
+                MainComponentsRegistry.register(componentFactory);
+
+                final ReactInstanceManager reactInstanceManager = getReactInstanceManager();
+
+                ViewManagerRegistry viewManagerRegistry =
+                    new ViewManagerRegistry(
+                        reactInstanceManager.getOrCreateViewManagers(reactApplicationContext));
+
+                return new FabricJSIModuleProvider(
+                    reactApplicationContext,
+                    componentFactory,
+                    ReactNativeConfig.DEFAULT_CONFIG,
+                    viewManagerRegistry);
+              }
+            });
+        return specs;
+      }
+    };
+  }
+}
--- a/android/app/src/main/java/com/mattermost/newarchitecture/components/MainComponentsRegistry.java
+++ b/android/app/src/main/java/com/mattermost/newarchitecture/components/MainComponentsRegistry.java
@@ -0,0 +1,36 @@
+package com.mattermost.newarchitecture.components;
+
+import com.facebook.jni.HybridData;
+import com.facebook.proguard.annotations.DoNotStrip;
+import com.facebook.react.fabric.ComponentFactory;
+import com.facebook.soloader.SoLoader;
+
+/**
+ * Class responsible to load the custom Fabric Components. This class has native methods and needs a
+ * corresponding C++ implementation/header file to work correctly (already placed inside the jni/
+ * folder for you).
+ *
+ * <p>Please note that this class is used ONLY if you opt-in for the New Architecture (see the
+ * `newArchEnabled` property). Is ignored otherwise.
+ */
+@DoNotStrip
+public class MainComponentsRegistry {
+  static {
+    SoLoader.loadLibrary("fabricjni");
+  }
+
+  @DoNotStrip private final HybridData mHybridData;
+
+  @DoNotStrip
+  private native HybridData initHybrid(ComponentFactory componentFactory);
+
+  @DoNotStrip
+  private MainComponentsRegistry(ComponentFactory componentFactory) {
+    mHybridData = initHybrid(componentFactory);
+  }
+
+  @DoNotStrip
+  public static MainComponentsRegistry register(ComponentFactory componentFactory) {
+    return new MainComponentsRegistry(componentFactory);
+  }
+}
--- a/android/app/src/main/java/com/mattermost/newarchitecture/modules/MainApplicationTurboModuleManagerDelegate.java
+++ b/android/app/src/main/java/com/mattermost/newarchitecture/modules/MainApplicationTurboModuleManagerDelegate.java
@@ -0,0 +1,48 @@
+package com.mattermost.newarchitecture.modules;
+
+import com.facebook.jni.HybridData;
+import com.facebook.react.ReactPackage;
+import com.facebook.react.ReactPackageTurboModuleManagerDelegate;
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.soloader.SoLoader;
+import java.util.List;
+
+/**
+ * Class responsible to load the TurboModules. This class has native methods and needs a
+ * corresponding C++ implementation/header file to work correctly (already placed inside the jni/
+ * folder for you).
+ *
+ * <p>Please note that this class is used ONLY if you opt-in for the New Architecture (see the
+ * `newArchEnabled` property). Is ignored otherwise.
+ */
+public class MainApplicationTurboModuleManagerDelegate
+    extends ReactPackageTurboModuleManagerDelegate {
+
+  private static volatile boolean sIsSoLibraryLoaded;
+
+  protected MainApplicationTurboModuleManagerDelegate(
+      ReactApplicationContext reactApplicationContext, List<ReactPackage> packages) {
+    super(reactApplicationContext, packages);
+  }
+
+  protected native HybridData initHybrid();
+
+  native boolean canCreateTurboModule(String moduleName);
+
+  public static class Builder extends ReactPackageTurboModuleManagerDelegate.Builder {
+    protected MainApplicationTurboModuleManagerDelegate build(
+        ReactApplicationContext context, List<ReactPackage> packages) {
+      return new MainApplicationTurboModuleManagerDelegate(context, packages);
+    }
+  }
+
+  @Override
+  protected synchronized void maybeLoadOtherSoLibraries() {
+    if (!sIsSoLibraryLoaded) {
+      // If you change the name of your application .so file in the Android.mk file,
+      // make sure you update the name here as well.
+      SoLoader.loadLibrary("rndiffapp_appmodules");
+      sIsSoLibraryLoaded = true;
+    }
+  }
+}
--- a/android/app/src/main/java/com/mattermost/rnbeta/CustomPushNotification.java
+++ b/android/app/src/main/java/com/mattermost/rnbeta/CustomPushNotification.java
@@ -18,7 +18,6 @@ import com.mattermost.helpers.Network;
 import com.mattermost.helpers.NotificationHelper;
 import com.mattermost.helpers.PushNotificationDataHelper;
 import com.mattermost.helpers.ResolvePromise;
-import com.mattermost.share.ShareModule;
 import com.wix.reactnativenotifications.core.NotificationIntentAdapter;
 import com.wix.reactnativenotifications.core.notification.PushNotification;
 import com.wix.reactnativenotifications.core.AppLaunchHelper;
@@ -31,6 +30,7 @@ public class CustomPushNotification extends PushNotification {

    public CustomPushNotification(Context context, Bundle bundle, AppLifecycleFacade appLifecycleFacade, AppLaunchHelper appLaunchHelper, JsIOHelper jsIoHelper) {
        super(context, bundle, appLifecycleFacade, appLaunchHelper, jsIoHelper);
+        CustomPushNotificationHelper.createNotificationChannels(context);
        dataHelper = new PushNotificationDataHelper(context);

        try {
@@ -80,10 +80,7 @@ public class CustomPushNotification extends PushNotification {
        switch (type) {
            case CustomPushNotificationHelper.PUSH_TYPE_MESSAGE:
            case CustomPushNotificationHelper.PUSH_TYPE_SESSION:
-                ShareModule shareModule = ShareModule.getInstance();
-                String currentActivityName = shareModule != null ? shareModule.getCurrentActivityName() : "";
-                Log.i("ReactNative", currentActivityName);
-                if (!mAppLifecycleFacade.isAppVisible() || !currentActivityName.equals("MainActivity")) {
+                if (!mAppLifecycleFacade.isAppVisible()) {
                    boolean createSummary = type.equals(CustomPushNotificationHelper.PUSH_TYPE_MESSAGE);
                    if (type.equals(CustomPushNotificationHelper.PUSH_TYPE_MESSAGE)) {
                        if (channelId != null) {
--- a/android/app/src/main/java/com/mattermost/rnbeta/FoldableObserver.kt
+++ b/android/app/src/main/java/com/mattermost/rnbeta/FoldableObserver.kt
@@ -1,58 +0,0 @@
-package com.mattermost.rnbeta
-
-import android.app.Activity
-import androidx.window.layout.FoldingFeature
-import androidx.window.layout.WindowInfoTracker
-import androidx.window.layout.WindowLayoutInfo
-import androidx.window.rxjava3.layout.windowLayoutInfoObservable
-import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
-import io.reactivex.rxjava3.core.Observable
-import io.reactivex.rxjava3.disposables.Disposable
-
-class FoldableObserver(private val activity: Activity) {
-    private var disposable: Disposable? = null
-    private lateinit var observable: Observable<WindowLayoutInfo>
-
-    public fun onCreate() {
-        observable = WindowInfoTracker.getOrCreate(activity)
-                .windowLayoutInfoObservable(activity)
-    }
-
-    public fun onStart() {
-        if (disposable?.isDisposed == true) {
-            onCreate()
-        }
-        disposable = observable.observeOn(AndroidSchedulers.mainThread())
-                .subscribe { layoutInfo ->
-                    val splitViewModule = SplitViewModule.getInstance()
-                    val foldingFeature = layoutInfo.displayFeatures
-                            .filterIsInstance<FoldingFeature>()
-                            .firstOrNull()
-                    when {
-                        foldingFeature?.state === FoldingFeature.State.FLAT ->
-                            splitViewModule?.setDeviceFolded(false)
-                        isTableTopPosture(foldingFeature) ->
-                            splitViewModule?.setDeviceFolded(false)
-                        isBookPosture(foldingFeature) ->
-                            splitViewModule?.setDeviceFolded(false)
-                        else -> {
-                            splitViewModule?.setDeviceFolded(true)
-                        }
-                    }
-                }
-    }
-
-    public fun onStop() {
-        disposable?.dispose()
-    }
-
-    private fun isTableTopPosture(foldFeature : FoldingFeature?) : Boolean {
-        return foldFeature?.state == FoldingFeature.State.HALF_OPENED &&
-                foldFeature.orientation == FoldingFeature.Orientation.HORIZONTAL
-    }
-
-    private fun isBookPosture(foldFeature : FoldingFeature?) : Boolean {
-        return foldFeature?.state == FoldingFeature.State.HALF_OPENED &&
-                foldFeature.orientation == FoldingFeature.Orientation.VERTICAL
-    }
-}
--- a/android/app/src/main/java/com/mattermost/rnbeta/MainActivity.java
+++ b/android/app/src/main/java/com/mattermost/rnbeta/MainActivity.java
@@ -6,56 +6,44 @@ import androidx.annotation.Nullable;
 import android.view.KeyEvent;
 import android.content.res.Configuration;

+import com.facebook.react.bridge.Arguments;
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.bridge.ReactMethod;
+import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.ReactActivityDelegate;
+import com.facebook.react.ReactRootView;
 import com.reactnativenavigation.NavigationActivity;
 import com.github.emilioicai.hwkeyboardevent.HWKeyboardEventModule;
-import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint;
-import com.facebook.react.defaults.DefaultReactActivityDelegate;

 public class MainActivity extends NavigationActivity {
    private boolean HWKeyboardConnected = false;
-    private FoldableObserver foldableObserver = new FoldableObserver(this);

-    @Override
-    protected String getMainComponentName() {
-        return "Mattermost";
-    }
+    public static class MainActivityDelegate extends ReactActivityDelegate {
+        public MainActivityDelegate(NavigationActivity activity, String mainComponentName) {
+            super(activity, mainComponentName);
+        }

-    /**
-     * Returns the instance of the {@link ReactActivityDelegate}. Here we use a util class {@link
-     * DefaultReactActivityDelegate} which allows you to easily enable Fabric and Concurrent React
-     * (aka React 18) with two boolean flags.
-     */
-    @Override
-    protected ReactActivityDelegate createReactActivityDelegate() {
-        return new DefaultReactActivityDelegate(
-                this,
-                getMainComponentName(),
-                // If you opted-in for the New Architecture, we enable the Fabric Renderer.
-                DefaultNewArchitectureEntryPoint.getFabricEnabled(), // fabricEnabled
-                // If you opted-in for the New Architecture, we enable Concurrent React (i.e. React 18).
-                DefaultNewArchitectureEntryPoint.getConcurrentReactEnabled() // concurrentRootEnabled
-        );
+        @Override
+        protected ReactRootView createRootView() {
+            ReactRootView reactRootView = new ReactRootView(getContext());
+            // If you opted-in for the New Architecture, we enable the Fabric Renderer.
+            reactRootView.setIsFabric(BuildConfig.IS_NEW_ARCHITECTURE_ENABLED);
+            return reactRootView;
+        }
+
+        @Override
+        protected boolean isConcurrentRootEnabled() {
+            // If you opted-in for the New Architecture, we enable Concurrent Root (i.e. React 18).
+            // More on this on https://reactjs.org/blog/2022/03/29/react-v18.html
+            return BuildConfig.IS_NEW_ARCHITECTURE_ENABLED;
+        }
    }

    @Override
    protected void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(null);
+        super.onCreate(savedInstanceState);
        setContentView(R.layout.launch_screen);
        setHWKeyboardConnected();
-        foldableObserver.onCreate();
-    }
-
-    @Override
-    protected void onStart() {
-        super.onStart();
-        foldableObserver.onStart();
-    }
-
-    @Override
-    protected void onStop() {
-        super.onStop();
-        foldableObserver.onStop();
    }

    @Override
--- a/android/app/src/main/java/com/mattermost/rnbeta/MainApplication.java
+++ b/android/app/src/main/java/com/mattermost/rnbeta/MainApplication.java
@@ -1,9 +1,10 @@
 package com.mattermost.rnbeta;

+import com.facebook.react.bridge.JSIModuleSpec;
+
 import android.content.Context;
 import android.os.Bundle;
 import android.util.Log;
-
 import java.io.File;
 import java.util.Collections;
 import java.util.HashMap;
@@ -11,23 +12,23 @@ import java.util.List;
 import java.util.Map;

 import com.mattermost.helpers.RealPathUtil;
-import com.mattermost.share.ShareModule;
 import com.wix.reactnativenotifications.RNNotificationsPackage;

 import com.reactnativenavigation.NavigationApplication;
 import com.wix.reactnativenotifications.core.notification.INotificationsApplication;
 import com.wix.reactnativenotifications.core.notification.IPushNotification;
+import com.wix.reactnativenotifications.core.notificationdrawer.IPushNotificationsDrawer;
+import com.wix.reactnativenotifications.core.notificationdrawer.INotificationsDrawerApplication;
 import com.wix.reactnativenotifications.core.AppLaunchHelper;
 import com.wix.reactnativenotifications.core.AppLifecycleFacade;
 import com.wix.reactnativenotifications.core.JsIOHelper;

 import com.facebook.react.PackageList;
+import com.facebook.react.ReactInstanceManager;
 import com.facebook.react.ReactPackage;
-import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint;
-import com.facebook.react.defaults.DefaultReactNativeHost;
+import com.facebook.react.config.ReactFeatureFlags;
 import com.facebook.react.ReactNativeHost;
 import com.facebook.react.TurboReactPackage;
-import com.facebook.react.bridge.JSIModuleSpec;
 import com.facebook.react.bridge.NativeModule;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.JSIModulePackage;
@@ -36,16 +37,17 @@ import com.facebook.react.module.model.ReactModuleInfoProvider;
 import com.facebook.react.modules.network.OkHttpClientProvider;
 import com.facebook.soloader.SoLoader;

-import com.mattermost.flipper.ReactNativeFlipper;
 import com.mattermost.networkclient.RCTOkHttpClientFactory;
+import com.mattermost.newarchitecture.MainApplicationReactNativeHost;
 import com.nozbe.watermelondb.jsi.WatermelonDBJSIPackage;

 public class MainApplication extends NavigationApplication implements INotificationsApplication {
  public static MainApplication instance;

  public Boolean sharedExtensionIsOpened = false;
+
  private final ReactNativeHost mReactNativeHost =
-    new DefaultReactNativeHost(this) {
+    new ReactNativeHost(this) {
      @Override
      public boolean getUseDeveloperSupport() {
        return BuildConfig.DEBUG;
@@ -66,14 +68,10 @@ public class MainApplication extends NavigationApplication implements INotificat
                  switch (name) {
                  case "MattermostManaged":
                      return MattermostManagedModule.getInstance(reactContext);
-                  case "MattermostShare":
-                    return ShareModule.getInstance(reactContext);
-                  case "Notifications":
-                    return NotificationsModule.getInstance(instance, reactContext);
-                  case "SplitView":
-                      return SplitViewModule.Companion.getInstance(reactContext);
-                  default:
-                    throw new IllegalArgumentException("Could not find module " + name);
+                    case "Notifications":
+                      return NotificationsModule.getInstance(instance, reactContext);
+                    default:
+                      throw new IllegalArgumentException("Could not find module " + name);
                  }
                }

@@ -82,9 +80,7 @@ public class MainApplication extends NavigationApplication implements INotificat
                  return () -> {
                    Map<String, ReactModuleInfo> map = new HashMap<>();
                    map.put("MattermostManaged", new ReactModuleInfo("MattermostManaged", "com.mattermost.rnbeta.MattermostManagedModule", false, false, false, false, false));
-                    map.put("MattermostShare", new ReactModuleInfo("MattermostShare", "com.mattermost.share.ShareModule", false, false, true, false, false));
                    map.put("Notifications", new ReactModuleInfo("Notifications", "com.mattermost.rnbeta.NotificationsModule", false, false, false, false, false));
-                    map.put("SplitView", new ReactModuleInfo("SplitView", "com.mattermost.rnbeta.SplitViewModule", false, false, false, false, false));
                    return map;
                  };
                }
@@ -108,26 +104,30 @@ public class MainApplication extends NavigationApplication implements INotificat
      protected String getJSMainModuleName() {
        return "index";
      }
-
-        @Override
-        protected boolean isNewArchEnabled() {
-            return BuildConfig.IS_NEW_ARCHITECTURE_ENABLED;
-        }
-        @Override
-        protected Boolean isHermesEnabled() {
-            return BuildConfig.IS_HERMES_ENABLED;
-        }
    };
+  
+  private final ReactNativeHost mNewArchitectureNativeHost =
+      new MainApplicationReactNativeHost(this);

  @Override
  public ReactNativeHost getReactNativeHost() {
-    return mReactNativeHost;
+    if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
+      return mNewArchitectureNativeHost;
+    } else {
+      return mReactNativeHost;
+    }
  }

  @Override
  public void onCreate() {
    super.onCreate();
    instance = this;
+
+    // If you opted-in for the New Architecture, we enable the TurboModule system
+    ReactFeatureFlags.useTurboModules = BuildConfig.IS_NEW_ARCHITECTURE_ENABLED;
+    SoLoader.init(this, /* native exopackage */ false);
+    initializeFlipper(this, getReactNativeHost().getReactInstanceManager());
+
    Context context = getApplicationContext();

    // Delete any previous temp files created by the app
@@ -139,13 +139,6 @@ public class MainApplication extends NavigationApplication implements INotificat
    // with a cookie jar defined in APIClientModule and an interceptor to intercept all
    // requests that originate from React Native's OKHttpClient
    OkHttpClientProvider.setOkHttpClientFactory(new RCTOkHttpClientFactory());
-
-      SoLoader.init(this, /* native exopackage */ false);
-      if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
-          // If you opted-in for the New Architecture, we load the native entry point for this app.
-          DefaultNewArchitectureEntryPoint.load();
-      }
-      ReactNativeFlipper.initializeFlipper(this, getReactNativeHost().getReactInstanceManager());
  }

  @Override
@@ -158,4 +151,26 @@ public class MainApplication extends NavigationApplication implements INotificat
            new JsIOHelper()
    );
  }
+
+  /**
+   * Loads Flipper in React Native templates. Call this in the onCreate method with something like
+   * initializeFlipper(this, getReactNativeHost().getReactInstanceManager());
+   */
+  private static void initializeFlipper(
+      Context context, ReactInstanceManager reactInstanceManager) {
+    if (BuildConfig.DEBUG) {
+      try {
+        /*
+         We use reflection here to pick up the class that initializes Flipper,
+        since Flipper library is not available in release mode
+        */
+        Class<?> aClass = Class.forName("com.rn.ReactNativeFlipper");
+        aClass
+            .getMethod("initializeFlipper", Context.class, ReactInstanceManager.class)
+            .invoke(null, context, reactInstanceManager);
+      } catch (Exception e) {
+        e.printStackTrace();
+      }
+    }
+  }
 }
--- a/android/app/src/main/java/com/mattermost/rnbeta/MattermostManagedModule.java
+++ b/android/app/src/main/java/com/mattermost/rnbeta/MattermostManagedModule.java
@@ -6,7 +6,6 @@ import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.net.Uri;
 import android.os.ParcelFileDescriptor;
-import android.text.TextUtils;
 import android.webkit.MimeTypeMap;

 import androidx.annotation.NonNull;
@@ -21,12 +20,8 @@ import com.facebook.react.bridge.Promise;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
 import com.facebook.react.bridge.ReactMethod;
-import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.modules.core.DeviceEventManagerModule;
-
-import com.mattermost.helpers.Credentials;
-import com.reactlibrary.createthumbnail.CreateThumbnailModule;
 import com.mattermost.helpers.RealPathUtil;

 import java.io.File;
@@ -34,7 +29,6 @@ import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.lang.ref.WeakReference;
-import java.net.URL;
 import java.nio.channels.FileChannel;

 public class MattermostManagedModule extends ReactContextBaseJavaModule {
@@ -133,6 +127,19 @@ public class MattermostManagedModule extends ReactContextBaseJavaModule {
        promise.resolve(map);
    }

+    @ReactMethod
+    public void isRunningInSplitView(final Promise promise) {
+        WritableMap result = Arguments.createMap();
+        Activity current = getCurrentActivity();
+        if (current != null) {
+            result.putBoolean("isSplitView", current.isInMultiWindowMode());
+        } else {
+            result.putBoolean("isSplitView", false);
+        }
+
+        promise.resolve(result);
+    }
+
    @ReactMethod
    public void saveFile(String path, final Promise promise) {
        Uri contentUri;
@@ -199,30 +206,6 @@ public class MattermostManagedModule extends ReactContextBaseJavaModule {
        }
    }

-    @ReactMethod
-    public void createThumbnail(ReadableMap options, Promise promise) {
-        try {
-            WritableMap optionsMap = Arguments.createMap();
-            optionsMap.merge(options);
-            String url = options.hasKey("url") ? options.getString("url") : "";
-            URL videoUrl = new URL(url);
-            String serverUrl = videoUrl.getProtocol() + "://" + videoUrl.getHost() + ":" + videoUrl.getPort();
-            String token = Credentials.getCredentialsForServerSync(this.reactContext, serverUrl);
-            if (!TextUtils.isEmpty(token)) {
-                WritableMap headers = Arguments.createMap();
-                if (optionsMap.hasKey("headers")) {
-                    headers.merge(optionsMap.getMap("headers"));
-                }
-                headers.putString("Authorization", "Bearer " + token);
-                optionsMap.putMap("headers", headers);
-            }
-            CreateThumbnailModule thumb = new CreateThumbnailModule(this.reactContext);
-            thumb.create(optionsMap.copy(), promise);
-        } catch (Exception e) {
-            promise.reject("CreateThumbnail_ERROR", e);
-        }
-    }
-
    private static class SaveDataTask extends GuardedResultAsyncTask<Object> {
        private final WeakReference<Context> weakContext;
        private final String fromFile;
--- a/android/app/src/main/java/com/mattermost/rnbeta/SplitViewModule.kt
+++ b/android/app/src/main/java/com/mattermost/rnbeta/SplitViewModule.kt
@@ -1,73 +0,0 @@
-package com.mattermost.rnbeta
-
-import com.facebook.react.bridge.*
-import com.facebook.react.modules.core.DeviceEventManagerModule.RCTDeviceEventEmitter
-import com.learnium.RNDeviceInfo.resolver.DeviceTypeResolver
-
-class SplitViewModule(private var reactContext: ReactApplicationContext) : ReactContextBaseJavaModule(reactContext) {
-    private var isDeviceFolded: Boolean = false
-    private var listenerCount = 0
-
-    companion object {
-        private var instance: SplitViewModule? = null
-
-        fun getInstance(reactContext: ReactApplicationContext): SplitViewModule {
-            if (instance == null) {
-                instance = SplitViewModule(reactContext)
-            } else {
-                instance!!.reactContext = reactContext
-            }
-
-            return instance!!
-        }
-
-        fun getInstance(): SplitViewModule? {
-            return instance
-        }
-    }
-
-
-    override fun getName() = "SplitView"
-
-    fun sendEvent(eventName: String,
-                  params: WritableMap?) {
-        reactContext
-                .getJSModule(RCTDeviceEventEmitter::class.java)
-                .emit(eventName, params)
-    }
-
-    private fun getSplitViewResults(folded: Boolean) : WritableMap? {
-        if (currentActivity != null) {
-            val deviceResolver = DeviceTypeResolver(this.reactContext)
-            val map = Arguments.createMap()
-            map.putBoolean("isSplitView", currentActivity!!.isInMultiWindowMode || folded)
-            map.putBoolean("isTablet", deviceResolver.isTablet)
-            return map
-        }
-
-        return null
-    }
-
-    fun setDeviceFolded(folded: Boolean) {
-        val map = getSplitViewResults(folded)
-        if (listenerCount > 0 && isDeviceFolded != folded) {
-            sendEvent("SplitViewChanged", map)
-        }
-        isDeviceFolded = folded
-    }
-
-    @ReactMethod
-    fun isRunningInSplitView(promise: Promise) {
-        promise.resolve(getSplitViewResults(isDeviceFolded))
-    }
-
-    @ReactMethod
-    fun addListener(eventName: String) {
-        listenerCount += 1
-    }
-
-    @ReactMethod
-    fun removeListeners(count: Int) {
-        listenerCount -= count
-    }
-}
--- a/android/app/src/main/java/com/mattermost/share/ShareActivity.java
+++ b/android/app/src/main/java/com/mattermost/share/ShareActivity.java
@@ -1,20 +0,0 @@
-package com.mattermost.share;
-
-import android.os.Bundle;
-
-import com.facebook.react.ReactActivity;
-import com.mattermost.rnbeta.MainApplication;
-
-public class ShareActivity extends ReactActivity {
-    @Override
-    protected String getMainComponentName() {
-        return "MattermostShare";
-    }
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        MainApplication app = (MainApplication) this.getApplication();
-        app.sharedExtensionIsOpened = true;
-    }
-}
--- a/android/app/src/main/java/com/mattermost/share/ShareModule.java
+++ b/android/app/src/main/java/com/mattermost/share/ShareModule.java
@@ -1,258 +0,0 @@
-package com.mattermost.share;
-
-import com.facebook.react.bridge.ReactContextBaseJavaModule;
-import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.bridge.Promise;
-import com.facebook.react.bridge.ReadableArray;
-import com.facebook.react.bridge.ReadableMap;
-import com.facebook.react.bridge.ReactMethod;
-import com.facebook.react.bridge.WritableArray;
-import com.facebook.react.bridge.Arguments;
-import com.mattermost.helpers.Credentials;
-import com.mattermost.rnbeta.MainApplication;
-import com.mattermost.helpers.RealPathUtil;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.net.Uri;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-import java.io.File;
-import java.util.ArrayList;
-
-import org.json.JSONArray;
-import org.json.JSONObject;
-import org.json.JSONException;
-
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-
-import okhttp3.MediaType;
-import okhttp3.OkHttpClient;
-import okhttp3.Request;
-import okhttp3.MultipartBody;
-import okhttp3.RequestBody;
-import okhttp3.Response;
-
-public class ShareModule extends ReactContextBaseJavaModule {
-    private final OkHttpClient client = new OkHttpClient();
-    public static final MediaType JSON = MediaType.parse("application/json; charset=utf-8");
-    private static ShareModule instance;
-    private final MainApplication mApplication;
-    private ReactApplicationContext mReactContext;
-    private File tempFolder;
-
-    private ShareModule(ReactApplicationContext reactContext) {
-        super(reactContext);
-        mReactContext = reactContext;
-        mApplication = (MainApplication)reactContext.getApplicationContext();
-    }
-
-    public static ShareModule getInstance(ReactApplicationContext reactContext) {
-        if (instance == null) {
-            instance = new ShareModule(reactContext);
-        } else {
-            instance.mReactContext = reactContext;
-        }
-
-        return instance;
-    }
-
-    public static ShareModule getInstance() {
-        return instance;
-    }
-
-    @NonNull
-    @Override
-    public String getName() {
-        return "MattermostShare";
-    }
-
-    @ReactMethod(isBlockingSynchronousMethod = true)
-    public String getCurrentActivityName() {
-        Activity currentActivity = getCurrentActivity();
-        if (currentActivity != null) {
-            String actvName = currentActivity.getComponentName().getClassName();
-            String[] components = actvName.split("\\.");
-            return components[components.length - 1];
-        }
-
-        return "";
-    }
-
-    @ReactMethod
-    public void clear() {
-        Activity currentActivity = getCurrentActivity();
-        if (currentActivity != null && this.getCurrentActivityName().equals("ShareActivity")) {
-            Intent intent = currentActivity.getIntent();
-            intent.setAction("");
-            intent.removeExtra(Intent.EXTRA_TEXT);
-            intent.removeExtra(Intent.EXTRA_STREAM);
-        }
-    }
-
-    @Nullable
-    @Override
-    public Map<String, Object> getConstants() {
-        HashMap<String, Object> constants = new HashMap<>(1);
-        constants.put("cacheDirName", RealPathUtil.CACHE_DIR_NAME);
-        constants.put("isOpened", mApplication.sharedExtensionIsOpened);
-        return constants;
-    }
-
-    @ReactMethod
-    public void close(ReadableMap data) {
-        this.clear();
-        Activity currentActivity = getCurrentActivity();
-        if (currentActivity == null || !this.getCurrentActivityName().equals("ShareActivity")) {
-            return;
-        }
-
-        currentActivity.finishAndRemoveTask();
-        if (data != null && data.hasKey("serverUrl")) {
-            ReadableArray files = data.getArray("files");
-            String serverUrl = data.getString("serverUrl");
-            final String token = Credentials.getCredentialsForServerSync(this.getReactApplicationContext(), serverUrl);
-            JSONObject postData = buildPostObject(data);
-
-            if (files != null && files.size() > 0) {
-                uploadFiles(serverUrl, token, files, postData);
-            } else {
-                try {
-                    post(serverUrl, token, postData);
-                } catch (IOException e) {
-                    e.printStackTrace();
-                }
-            }
-        }
-
-        mApplication.sharedExtensionIsOpened = false;
-        RealPathUtil.deleteTempFiles(this.tempFolder);
-    }
-
-    @ReactMethod
-    public void getSharedData(Promise promise) {
-        promise.resolve(processIntent());
-    }
-
-    public WritableArray processIntent() {
-        String type, action, extra;
-        WritableArray items = Arguments.createArray();
-        Activity currentActivity = getCurrentActivity();
-
-        if (currentActivity != null) {
-            this.tempFolder = new File(currentActivity.getCacheDir(), RealPathUtil.CACHE_DIR_NAME);
-            Intent intent = currentActivity.getIntent();
-            action = intent.getAction();
-            type = intent.getType();
-            extra = intent.getStringExtra(Intent.EXTRA_TEXT);
-
-            if (Intent.ACTION_SEND.equals(action) && "text/plain".equals(type) && extra != null) {
-                items.pushMap(ShareUtils.getTextItem(extra));
-            } else if (Intent.ACTION_SEND.equals(action)) {
-                if (extra != null) {
-                    items.pushMap(ShareUtils.getTextItem(extra));
-                }
-                Uri uri = intent.getParcelableExtra(Intent.EXTRA_STREAM);
-                if (uri != null) {
-                    ReadableMap fileInfo = ShareUtils.getFileItem(currentActivity, uri);
-                    if (fileInfo != null) {
-                        items.pushMap(fileInfo);
-                    }
-                }
-            } else if (Intent.ACTION_SEND_MULTIPLE.equals(action)) {
-                if (extra != null) {
-                    items.pushMap(ShareUtils.getTextItem(extra));
-                }
-
-                ArrayList<Uri> uris = intent.getParcelableArrayListExtra(Intent.EXTRA_STREAM);
-                for (Uri uri : uris) {
-                    ReadableMap fileInfo = ShareUtils.getFileItem(currentActivity, uri);
-                    if (fileInfo != null) {
-                        items.pushMap(fileInfo);
-                    }
-                }
-            }
-        }
-
-        return items;
-    }
-
-    private JSONObject buildPostObject(ReadableMap data) {
-        JSONObject json = new JSONObject();
-        try {
-            json.put("user_id", data.getString("userId"));
-            if (data.hasKey("channelId")) {
-                json.put("channel_id", data.getString("channelId"));
-            }
-            if (data.hasKey("message")) {
-                json.put("message", data.getString("message"));
-            }
-        } catch (JSONException e) {
-            e.printStackTrace();
-        }
-        return json;
-    }
-
-    private void post(String serverUrl, String token, JSONObject postData) throws IOException {
-        RequestBody body = RequestBody.create(postData.toString(), JSON);
-        Request request = new Request.Builder()
-                .header("Authorization", "BEARER " + token)
-                .url(serverUrl + "/api/v4/posts")
-                .post(body)
-                .build();
-        client.newCall(request).execute();
-    }
-
-    private void uploadFiles(String serverUrl, String token, ReadableArray files, JSONObject postData) {
-        try {
-            MultipartBody.Builder builder = new MultipartBody.Builder()
-                    .setType(MultipartBody.FORM);
-
-            for(int i = 0 ; i < files.size() ; i++) {
-                ReadableMap file = files.getMap(i);
-                String mime = file.getString("type");
-                String fullPath = file.getString("value");
-                if (fullPath != null) {
-                    String filePath = fullPath.replaceFirst("file://", "");
-                    File fileInfo = new File(filePath);
-                    if (fileInfo.exists() && mime != null) {
-                        final MediaType MEDIA_TYPE = MediaType.parse(mime);
-                        builder.addFormDataPart("files", file.getString("filename"), RequestBody.create(fileInfo, MEDIA_TYPE));
-                    }
-                }
-            }
-
-            builder.addFormDataPart("channel_id", postData.getString("channel_id"));
-            RequestBody body = builder.build();
-            Request request = new Request.Builder()
-                    .header("Authorization", "BEARER " + token)
-                    .url(serverUrl + "/api/v4/files")
-                    .post(body)
-                    .build();
-
-            try (Response response = client.newCall(request).execute()) {
-                if (response.isSuccessful()) {
-                    String responseData = response.body().string();
-                    JSONObject responseJson = new JSONObject(responseData);
-                    JSONArray fileInfoArray = responseJson.getJSONArray("file_infos");
-                    JSONArray file_ids = new JSONArray();
-                    for(int i = 0 ; i < fileInfoArray.length() ; i++) {
-                        JSONObject fileInfo = fileInfoArray.getJSONObject(i);
-                        file_ids.put(fileInfo.getString("id"));
-                    }
-                    postData.put("file_ids", file_ids);
-                    post(serverUrl, token, postData);
-                }
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-
-        } catch (JSONException e) {
-            e.printStackTrace();
-        }
-    }
-}
--- a/android/app/src/main/java/com/mattermost/share/ShareUtils.java
+++ b/android/app/src/main/java/com/mattermost/share/ShareUtils.java
@@ -1,115 +0,0 @@
-package com.mattermost.share;
-
-import android.app.Activity;
-import android.content.Context;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.media.MediaMetadataRetriever;
-import android.net.Uri;
-import android.webkit.URLUtil;
-
-import com.facebook.react.bridge.Arguments;
-import com.facebook.react.bridge.ReadableMap;
-import com.facebook.react.bridge.WritableMap;
-import com.mattermost.helpers.RealPathUtil;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.OutputStream;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import java.util.UUID;
-
-public class ShareUtils {
-    public static ReadableMap getTextItem(String text) {
-        WritableMap map = Arguments.createMap();
-        map.putString("value", text);
-        map.putString("type", "");
-        map.putBoolean("isString", true);
-        return map;
-    }
-
-    public static ReadableMap getFileItem(Activity activity, Uri uri) {
-        WritableMap map = Arguments.createMap();
-        String filePath = RealPathUtil.getRealPathFromURI(activity, uri);
-        if (filePath == null) {
-            return null;
-        }
-
-        File file = new File(filePath);
-        String type = RealPathUtil.getMimeTypeFromUri(activity, uri);
-        if (type != null) {
-            if (type.startsWith("image/")) {
-                BitmapFactory.Options bitMapOption = ShareUtils.getImageDimensions(filePath);
-                map.putInt("height", bitMapOption.outHeight);
-                map.putInt("width", bitMapOption.outWidth);
-
-            } else if (type.startsWith("video/")) {
-                File cacheDir = new File(activity.getCacheDir(), RealPathUtil.CACHE_DIR_NAME);
-                addVideoThumbnailToMap(cacheDir, activity.getApplicationContext(), map, "file://" + filePath);
-            }
-        } else {
-            type = "application/octet-stream";
-        }
-
-        map.putString("value", "file://" + filePath);
-        map.putDouble("size", (double) file.length());
-        map.putString("filename", file.getName());
-        map.putString("type", type);
-        map.putString("extension", RealPathUtil.getExtension(filePath).replaceFirst(".", ""));
-        map.putBoolean("isString", false);
-        return map;
-    }
-
-    public static BitmapFactory.Options getImageDimensions(String filePath) {
-        BitmapFactory.Options bitMapOption = new BitmapFactory.Options();
-        bitMapOption.inJustDecodeBounds=true;
-        BitmapFactory.decodeFile(filePath, bitMapOption);
-        return bitMapOption;
-    }
-
-    private static void addVideoThumbnailToMap(File cacheDir, Context context, WritableMap map, String filePath) {
-        String fileName = ("thumb-" + UUID.randomUUID().toString()) + ".png";
-        OutputStream fOut = null;
-
-        try {
-            File file = new File(cacheDir, fileName);
-            Bitmap image = getBitmapAtTime(context, filePath, 1);
-            if (file.createNewFile()) {
-                fOut = new FileOutputStream(file);
-                image.compress(Bitmap.CompressFormat.PNG, 100, fOut);
-                fOut.flush();
-                fOut.close();
-
-                map.putString("videoThumb", "file://" + file.getAbsolutePath());
-                map.putInt("width", image.getWidth());
-                map.putInt("height", image.getHeight());
-            }
-        } catch (Exception ignored) {
-        }
-    }
-
-    private static Bitmap getBitmapAtTime(Context context, String filePath, int time) {
-        try {
-            MediaMetadataRetriever retriever = new MediaMetadataRetriever();
-            if (URLUtil.isFileUrl(filePath)) {
-                String decodedPath;
-                try {
-                    decodedPath = URLDecoder.decode(filePath, "UTF-8");
-                } catch (UnsupportedEncodingException e) {
-                    decodedPath = filePath;
-                }
-
-                retriever.setDataSource(decodedPath.replace("file://", ""));
-            } else if (filePath.contains("content://")) {
-                retriever.setDataSource(context, Uri.parse(filePath));
-            }
-
-            Bitmap image = retriever.getFrameAtTime(time * 1000, MediaMetadataRetriever.OPTION_CLOSEST_SYNC);
-            retriever.release();
-            return image;
-        } catch (Exception e) {
-            throw new IllegalStateException("File doesn't exist or not supported");
-        }
-    }
-}
--- a/android/app/src/main/jni/CMakeLists.txt
+++ b/android/app/src/main/jni/CMakeLists.txt
@@ -0,0 +1,7 @@
+cmake_minimum_required(VERSION 3.13)
+
+# Define the library name here.
+project(rndiffapp_appmodules)
+
+# This file includes all the necessary to let you build your application with the New Architecture.
+include(${REACT_ANDROID_DIR}/cmake-utils/ReactNative-application.cmake)
--- a/android/app/src/main/jni/MainApplicationModuleProvider.cpp
+++ b/android/app/src/main/jni/MainApplicationModuleProvider.cpp
@@ -0,0 +1,32 @@
+#include "MainApplicationModuleProvider.h"
+
+#include <rncli.h>
+#include <rncore.h>
+
+namespace facebook {
+namespace react {
+
+std::shared_ptr<TurboModule> MainApplicationModuleProvider(
+    const std::string &moduleName,
+    const JavaTurboModule::InitParams &params) {
+  // Here you can provide your own module provider for TurboModules coming from
+  // either your application or from external libraries. The approach to follow
+  // is similar to the following (for a library called `samplelibrary`:
+  //
+  // auto module = samplelibrary_ModuleProvider(moduleName, params);
+  // if (module != nullptr) {
+  //    return module;
+  // }
+  // return rncore_ModuleProvider(moduleName, params);
+
+  // Module providers autolinked by RN CLI
+  auto rncli_module = rncli_ModuleProvider(moduleName, params);
+  if (rncli_module != nullptr) {
+    return rncli_module;
+  }
+
+  return rncore_ModuleProvider(moduleName, params);
+}
+
+} // namespace react
+} // namespace facebook
--- a/android/app/src/main/jni/MainApplicationModuleProvider.h
+++ b/android/app/src/main/jni/MainApplicationModuleProvider.h
@@ -0,0 +1,16 @@
+#pragma once
+
+#include <memory>
+#include <string>
+
+#include <ReactCommon/JavaTurboModule.h>
+
+namespace facebook {
+namespace react {
+
+std::shared_ptr<TurboModule> MainApplicationModuleProvider(
+    const std::string &moduleName,
+    const JavaTurboModule::InitParams &params);
+
+} // namespace react
+} // namespace facebook
--- a/android/app/src/main/jni/MainApplicationTurboModuleManagerDelegate.cpp
+++ b/android/app/src/main/jni/MainApplicationTurboModuleManagerDelegate.cpp
@@ -0,0 +1,45 @@
+#include "MainApplicationTurboModuleManagerDelegate.h"
+#include "MainApplicationModuleProvider.h"
+
+namespace facebook {
+namespace react {
+
+jni::local_ref<MainApplicationTurboModuleManagerDelegate::jhybriddata>
+MainApplicationTurboModuleManagerDelegate::initHybrid(
+    jni::alias_ref<jhybridobject>) {
+  return makeCxxInstance();
+}
+
+void MainApplicationTurboModuleManagerDelegate::registerNatives() {
+  registerHybrid({
+      makeNativeMethod(
+          "initHybrid", MainApplicationTurboModuleManagerDelegate::initHybrid),
+      makeNativeMethod(
+          "canCreateTurboModule",
+          MainApplicationTurboModuleManagerDelegate::canCreateTurboModule),
+  });
+}
+
+std::shared_ptr<TurboModule>
+MainApplicationTurboModuleManagerDelegate::getTurboModule(
+    const std::string &name,
+    const std::shared_ptr<CallInvoker> &jsInvoker) {
+  // Not implemented yet: provide pure-C++ NativeModules here.
+  return nullptr;
+}
+
+std::shared_ptr<TurboModule>
+MainApplicationTurboModuleManagerDelegate::getTurboModule(
+    const std::string &name,
+    const JavaTurboModule::InitParams &params) {
+  return MainApplicationModuleProvider(name, params);
+}
+
+bool MainApplicationTurboModuleManagerDelegate::canCreateTurboModule(
+    const std::string &name) {
+  return getTurboModule(name, nullptr) != nullptr ||
+      getTurboModule(name, {.moduleName = name}) != nullptr;
+}
+
+} // namespace react
+} // namespace facebook
--- a/android/app/src/main/jni/MainApplicationTurboModuleManagerDelegate.h
+++ b/android/app/src/main/jni/MainApplicationTurboModuleManagerDelegate.h
@@ -0,0 +1,38 @@
+#include <memory>
+#include <string>
+
+#include <ReactCommon/TurboModuleManagerDelegate.h>
+#include <fbjni/fbjni.h>
+
+namespace facebook {
+namespace react {
+
+class MainApplicationTurboModuleManagerDelegate
+    : public jni::HybridClass<
+          MainApplicationTurboModuleManagerDelegate,
+          TurboModuleManagerDelegate> {
+ public:
+  // Adapt it to the package you used for your Java class.
+  static constexpr auto kJavaDescriptor =
+      "Lcom/rndiffapp/newarchitecture/modules/MainApplicationTurboModuleManagerDelegate;";
+
+  static jni::local_ref<jhybriddata> initHybrid(jni::alias_ref<jhybridobject>);
+
+  static void registerNatives();
+
+  std::shared_ptr<TurboModule> getTurboModule(
+      const std::string &name,
+      const std::shared_ptr<CallInvoker> &jsInvoker) override;
+  std::shared_ptr<TurboModule> getTurboModule(
+      const std::string &name,
+      const JavaTurboModule::InitParams &params) override;
+
+  /**
+   * Test-only method. Allows user to verify whether a TurboModule can be
+   * created by instances of this class.
+   */
+  bool canCreateTurboModule(const std::string &name);
+};
+
+} // namespace react
+} // namespace facebook
--- a/android/app/src/main/jni/MainComponentsRegistry.cpp
+++ b/android/app/src/main/jni/MainComponentsRegistry.cpp
@@ -0,0 +1,65 @@
+#include "MainComponentsRegistry.h"
+
+#include <CoreComponentsRegistry.h>
+#include <fbjni/fbjni.h>
+#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
+#include <react/renderer/components/rncore/ComponentDescriptors.h>
+#include <rncli.h>
+
+namespace facebook {
+namespace react {
+
+MainComponentsRegistry::MainComponentsRegistry(ComponentFactory *delegate) {}
+
+std::shared_ptr<ComponentDescriptorProviderRegistry const>
+MainComponentsRegistry::sharedProviderRegistry() {
+  auto providerRegistry = CoreComponentsRegistry::sharedProviderRegistry();
+
+  // Autolinked providers registered by RN CLI
+  rncli_registerProviders(providerRegistry);
+
+  // Custom Fabric Components go here. You can register custom
+  // components coming from your App or from 3rd party libraries here.
+  //
+  // providerRegistry->add(concreteComponentDescriptorProvider<
+  //        AocViewerComponentDescriptor>());
+  return providerRegistry;
+}
+
+jni::local_ref<MainComponentsRegistry::jhybriddata>
+MainComponentsRegistry::initHybrid(
+    jni::alias_ref<jclass>,
+    ComponentFactory *delegate) {
+  auto instance = makeCxxInstance(delegate);
+
+  auto buildRegistryFunction =
+      [](EventDispatcher::Weak const &eventDispatcher,
+         ContextContainer::Shared const &contextContainer)
+      -> ComponentDescriptorRegistry::Shared {
+    auto registry = MainComponentsRegistry::sharedProviderRegistry()
+                        ->createComponentDescriptorRegistry(
+                            {eventDispatcher, contextContainer});
+
+    auto mutableRegistry =
+        std::const_pointer_cast<ComponentDescriptorRegistry>(registry);
+
+    mutableRegistry->setFallbackComponentDescriptor(
+        std::make_shared<UnimplementedNativeViewComponentDescriptor>(
+            ComponentDescriptorParameters{
+                eventDispatcher, contextContainer, nullptr}));
+
+    return registry;
+  };
+
+  delegate->buildRegistryFunction = buildRegistryFunction;
+  return instance;
+}
+
+void MainComponentsRegistry::registerNatives() {
+  registerHybrid({
+      makeNativeMethod("initHybrid", MainComponentsRegistry::initHybrid),
+  });
+}
+
+} // namespace react
+} // namespace facebook
--- a/android/app/src/main/jni/MainComponentsRegistry.h
+++ b/android/app/src/main/jni/MainComponentsRegistry.h
@@ -0,0 +1,32 @@
+#pragma once
+
+#include <ComponentFactory.h>
+#include <fbjni/fbjni.h>
+#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
+#include <react/renderer/componentregistry/ComponentDescriptorRegistry.h>
+
+namespace facebook {
+namespace react {
+
+class MainComponentsRegistry
+    : public facebook::jni::HybridClass<MainComponentsRegistry> {
+ public:
+  // Adapt it to the package you used for your Java class.
+  constexpr static auto kJavaDescriptor =
+      "Lcom/mattermost/newarchitecture/components/MainComponentsRegistry;";
+
+  static void registerNatives();
+
+  MainComponentsRegistry(ComponentFactory *delegate);
+
+ private:
+  static std::shared_ptr<ComponentDescriptorProviderRegistry const>
+  sharedProviderRegistry();
+
+  static jni::local_ref<jhybriddata> initHybrid(
+      jni::alias_ref<jclass>,
+      ComponentFactory *delegate);
+};
+
+} // namespace react
+} // namespace facebook
--- a/android/app/src/main/jni/OnLoad.cpp
+++ b/android/app/src/main/jni/OnLoad.cpp
@@ -0,0 +1,11 @@
+#include <fbjni/fbjni.h>
+#include "MainApplicationTurboModuleManagerDelegate.h"
+#include "MainComponentsRegistry.h"
+
+JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *) {
+  return facebook::jni::initialize(vm, [] {
+    facebook::react::MainApplicationTurboModuleManagerDelegate::
+        registerNatives();
+    facebook::react::MainComponentsRegistry::registerNatives();
+  });
+}
--- a/android/app/src/main/res/drawable-night-hdpi/splash_background.png
+++ b/android/app/src/main/res/drawable-night-hdpi/splash_background.png
--- a/android/app/src/main/res/drawable-night-mdpi/splash_background.png
+++ b/android/app/src/main/res/drawable-night-mdpi/splash_background.png
--- a/android/app/src/main/res/drawable-night-xhdpi/splash_background.png
+++ b/android/app/src/main/res/drawable-night-xhdpi/splash_background.png
--- a/android/app/src/main/res/drawable-night-xxhdpi/splash_background.png
+++ b/android/app/src/main/res/drawable-night-xxhdpi/splash_background.png
--- a/android/app/src/main/res/drawable-night-xxxhdpi/splash_background.png
+++ b/android/app/src/main/res/drawable-night-xxxhdpi/splash_background.png
--- a/android/app/src/main/res/values-night/colors.xml
+++ b/android/app/src/main/res/values-night/colors.xml
@@ -2,5 +2,5 @@
 <resources>
    <color name="white">#FFFFFF</color>
    <color name="transparent">#00000000</color>
-    <color name="splashscreen_bg">#090A0B</color>
+    <color name="splashscreen_bg">#1E325C</color>
 </resources>
--- a/android/app/src/main/res/xml/provider_paths.xml
+++ b/android/app/src/main/res/xml/provider_paths.xml
@@ -1,8 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<paths xmlns:android="http://schemas.android.com/apk/res/android">
-    <files-path name="files" path="." />
-    <external-files-path name="external_files" path="." />
-    <external-path name="external" path="." />
-    <cache-path name="cache" path="." />
-    <root-path name="root" path="." />
-</paths>
--- a/android/app/src/release/java/com/mattermost/flipper/ReactNativeFlipper.java
+++ b/android/app/src/release/java/com/mattermost/flipper/ReactNativeFlipper.java
@@ -1,19 +0,0 @@
-/**
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * <p>This source code is licensed under the MIT license found in the LICENSE file in the root
- * directory of this source tree.
- */
-package com.mattermost.flipper;
-
-import android.content.Context;
-import com.facebook.react.ReactInstanceManager;
-/**
- * Class responsible of loading Flipper inside your React Native application. This is the release
- * flavor of it so it's empty as we don't want to load Flipper.
- */
-public class ReactNativeFlipper {
-    public static void initializeFlipper(Context context, ReactInstanceManager reactInstanceManager) {
-        // Do nothing as we don't want to initialize Flipper on Release.
-    }
-}
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -2,18 +2,22 @@

 buildscript {
    ext {
-        buildToolsVersion = "33.0.0"
+        buildToolsVersion = "31.0.0"
        minSdkVersion = 24
-        compileSdkVersion = 33
-        targetSdkVersion = 33
-        supportLibVersion = "33.0.0"
+        compileSdkVersion = 31
+        targetSdkVersion = 31
+        supportLibVersion = "31.0.0"
        kotlinVersion = "1.5.30"
        kotlin_version = "1.5.30"
        firebaseVersion = "21.0.0"
        RNNKotlinVersion = kotlinVersion
-
-        // We use NDK 23 which has both M1 support and is the side-by-side NDK version from AGP.
-        ndkVersion = "23.1.7779620"
+        if (System.properties['os.arch'] == "aarch64") {
+            // For M1 Users we need to use the NDK 24 which added support for aarch64
+            ndkVersion = "24.0.8215888"
+        } else {
+            // Otherwise we default to the side-by-side NDK version from AGP.
+            ndkVersion = "21.4.7075529"
+        }
    }
    repositories {
        mavenCentral()
@@ -21,9 +25,10 @@ buildscript {
        google()
    }
    dependencies {
-        classpath("com.android.tools.build:gradle:7.3.1")
+        classpath("com.android.tools.build:gradle:7.2.1")
        classpath("com.facebook.react:react-native-gradle-plugin")
-        classpath('com.google.gms:google-services:4.3.14')
+        classpath("de.undercouch:gradle-download-task:5.0.1")
+        classpath('com.google.gms:google-services:4.3.10')
        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")

        // NOTE: Do not place your application dependencies here; they belong
@@ -33,9 +38,50 @@ buildscript {

 allprojects {
    repositories {
+        exclusiveContent {
+           // We get React Native's Android binaries exclusively through npm,
+           // from a local Maven repo inside node_modules/react-native/.
+           // (The use of exclusiveContent prevents looking elsewhere like Maven Central
+           // and potentially getting a wrong version.)
+           filter {
+               includeGroup "com.facebook.react"
+           }
+           forRepository {
+               maven {
+                   url "$rootDir/../node_modules/react-native/android"
+               }
+           }
+       }
+        google()
+        mavenCentral()
+        mavenLocal()
+        maven {
+            // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
+            url("$rootDir/../node_modules/react-native/android")
+
+            // Replace AAR from original RN with AAR from react-native-v8
+            // url("$rootDir/../node_modules/react-native-v8/dist")
+        }
+        maven {
+            // Local Maven repo containing AARs with JSC library built for Android
+            url("$rootDir/../node_modules/jsc-android/dist")
+
+            // prebuilt libv8android.so
+            // url("$rootDir/../node_modules/v8-android/dist")
+        }
+        maven {
+            url "https://www.jitpack.io"
+        }
        maven {
            url "$rootDir/../node_modules/detox/Detox-android"
        }
+        mavenCentral {
+            // We don't want to fetch react-native from Maven Central as there are
+            // older versions over there.
+            content {
+                excludeGroup "com.facebook.react"
+            }
+        }
    }
 }

--- a/android/gradle.properties
+++ b/android/gradle.properties
@@ -40,8 +40,4 @@ reactNativeArchitectures=armeabi-v7a,arm64-v8a,x86,x86_64
 # your application. You should enable this flag either if you want
 # to write custom TurboModules/Fabric components OR use libraries that
 # are providing them.
-newArchEnabled=false
-
-# Use this property to enable or disable the Hermes JS engine.
-# If set to false, you will be using JSC instead.
-hermesEnabled=true
+newArchEnabled=false
--- a/android/settings.gradle
+++ b/android/settings.gradle
@@ -1,5 +1,13 @@
 rootProject.name = 'Mattermost'
 include ':app'
+includeBuild('../node_modules/react-native-gradle-plugin')
+if (settings.hasProperty("newArchEnabled") && settings.newArchEnabled == "true") {
+    include(":ReactAndroid")
+    project(":ReactAndroid").projectDir = file('../node_modules/react-native/ReactAndroid')
+    include(":ReactAndroid:hermes-engine")
+    project(":ReactAndroid:hermes-engine").projectDir = file('../node_modules/react-native/ReactAndroid/hermes-engine')
+}
+
 include ':reactnativenotifications'
 project(':reactnativenotifications').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-notifications/lib/android/app')
 apply from: file("../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesSettingsGradle(settings)
@@ -7,4 +15,3 @@ include ':react-native-video'
 project(':react-native-video').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-video/android-exoplayer')
 include ':watermelondb-jsi'
 project(':watermelondb-jsi').projectDir = new File(rootProject.projectDir, '../node_modules/@nozbe/watermelondb/native/android-jsi')
-includeBuild('../node_modules/react-native-gradle-plugin')
--- a/app/actions/app/global.ts
+++ b/app/actions/app/global.ts
@@ -1,10 +1,8 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.

-import {Tutorial} from '@constants';
 import {GLOBAL_IDENTIFIERS} from '@constants/database';
 import DatabaseManager from '@database/manager';
-import {logError} from '@utils/log';

 export const storeGlobal = async (id: string, value: unknown, prepareRecordsOnly = false) => {
    try {
@@ -14,7 +12,6 @@ export const storeGlobal = async (id: string, value: unknown, prepareRecordsOnly
            prepareRecordsOnly,
        });
    } catch (error) {
-        logError('storeGlobal', error);
        return {error};
    }
 };
@@ -23,20 +20,12 @@ export const storeDeviceToken = async (token: string, prepareRecordsOnly = false
    return storeGlobal(GLOBAL_IDENTIFIERS.DEVICE_TOKEN, token, prepareRecordsOnly);
 };

-export const storeOnboardingViewedValue = async (value = true) => {
-    return storeGlobal(GLOBAL_IDENTIFIERS.ONBOARDING, value, false);
-};
-
 export const storeMultiServerTutorial = async (prepareRecordsOnly = false) => {
-    return storeGlobal(Tutorial.MULTI_SERVER, 'true', prepareRecordsOnly);
+    return storeGlobal(GLOBAL_IDENTIFIERS.MULTI_SERVER_TUTORIAL, 'true', prepareRecordsOnly);
 };

 export const storeProfileLongPressTutorial = async (prepareRecordsOnly = false) => {
-    return storeGlobal(Tutorial.PROFILE_LONG_PRESS, 'true', prepareRecordsOnly);
-};
-
-export const storeSkinEmojiSelectorTutorial = async (prepareRecordsOnly = false) => {
-    return storeGlobal(Tutorial.EMOJI_SKIN_SELECTOR, 'true', prepareRecordsOnly);
+    return storeGlobal(GLOBAL_IDENTIFIERS.PROFILE_LONG_PRESS_TUTORIAL, 'true', prepareRecordsOnly);
 };

 export const storeDontAskForReview = async (prepareRecordsOnly = false) => {
--- a/app/actions/local/category.ts
+++ b/app/actions/local/category.ts
@@ -1,15 +1,17 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.

+import {Model} from '@nozbe/watermelondb';
+
 import {CHANNELS_CATEGORY, DMS_CATEGORY} from '@constants/categories';
 import DatabaseManager from '@database/manager';
-import {prepareCategoryChannels, queryCategoriesByTeamIds, getCategoryById, prepareCategoriesAndCategoriesChannels} from '@queries/servers/categories';
+import {prepareCategories, prepareCategoryChannels, queryCategoriesByTeamIds, getCategoryById} from '@queries/servers/categories';
 import {getCurrentUserId} from '@queries/servers/system';
 import {queryMyTeams} from '@queries/servers/team';
 import {isDMorGM} from '@utils/channel';
+import {pluckUnique} from '@utils/helpers';
 import {logError} from '@utils/log';

-import type {Model} from '@nozbe/watermelondb';
 import type ChannelModel from '@typings/database/models/servers/channel';

 export const deleteCategory = async (serverUrl: string, categoryId: string) => {
@@ -32,18 +34,48 @@ export const deleteCategory = async (serverUrl: string, categoryId: string) => {

 export async function storeCategories(serverUrl: string, categories: CategoryWithChannels[], prune = false, prepareRecordsOnly = false) {
    try {
-        const {operator} = DatabaseManager.getServerDatabaseAndOperator(serverUrl);
-        const models = await prepareCategoriesAndCategoriesChannels(operator, categories, prune);
+        const {database, operator} = DatabaseManager.getServerDatabaseAndOperator(serverUrl);
+
+        const modelPromises: Array<Promise<Model[]>> = [];
+        const preparedCategories = prepareCategories(operator, categories);
+        if (preparedCategories) {
+            modelPromises.push(preparedCategories);
+        }
+
+        const preparedCategoryChannels = prepareCategoryChannels(operator, categories);
+        if (preparedCategoryChannels) {
+            modelPromises.push(preparedCategoryChannels);
+        }
+
+        const models = await Promise.all(modelPromises);
+        const flattenedModels = models.flat();
+
+        if (prune && categories.length) {
+            const remoteCategoryIds = new Set(categories.map((cat) => cat.id));
+
+            // If the passed categories have more than one team, we want to update across teams
+            const teamIds = pluckUnique('team_id')(categories) as string[];
+            const localCategories = await queryCategoriesByTeamIds(database, teamIds).fetch();
+
+            localCategories.
+                filter((category) => category.type === 'custom').
+                forEach((localCategory) => {
+                    if (!remoteCategoryIds.has(localCategory.id)) {
+                        localCategory.prepareDestroyPermanently();
+                        flattenedModels.push(localCategory);
+                    }
+                });
+        }

        if (prepareRecordsOnly) {
-            return {models};
+            return {models: flattenedModels};
        }

-        if (models.length > 0) {
-            await operator.batchRecords(models);
+        if (flattenedModels?.length > 0) {
+            await operator.batchRecords(flattenedModels);
        }

-        return {models};
+        return {models: flattenedModels};
    } catch (error) {
        logError('FAILED TO STORE CATEGORIES', error);
        return {error};
--- a/app/actions/local/channel.test.ts
+++ b/app/actions/local/channel.test.ts
@@ -1,11 +1,13 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.

+import {Database} from '@nozbe/watermelondb';
 import {DeviceEventEmitter} from 'react-native';

 import {Navigation} from '@constants';
 import {SYSTEM_IDENTIFIERS} from '@constants/database';
 import DatabaseManager from '@database/manager';
+import ServerDataOperator from '@database/operator/server_data_operator';
 import {getMyChannel} from '@queries/servers/channel';
 import {getCommonSystemValues, getTeamHistory} from '@queries/servers/system';
 import {getTeamChannelHistory} from '@queries/servers/team';
@@ -13,9 +15,6 @@ import {dismissAllModalsAndPopToRoot, dismissAllModalsAndPopToScreen} from '@scr

 import {switchToChannel} from './channel';

-import type ServerDataOperator from '@database/operator/server_data_operator';
-import type {Database} from '@nozbe/watermelondb';
-
 let mockIsTablet: jest.Mock;
 const now = new Date('2020-01-01').getTime();

--- a/app/actions/local/channel.ts
+++ b/app/actions/local/channel.ts
@@ -1,6 +1,7 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.

+import {Model} from '@nozbe/watermelondb';
 import {DeviceEventEmitter} from 'react-native';

 import {General, Navigation as NavigationConstants, Preferences, Screens} from '@constants';
@@ -23,7 +24,6 @@ import {isTablet} from '@utils/helpers';
 import {logError, logInfo} from '@utils/log';
 import {displayGroupMessageName, displayUsername, getUserIdFromChannelName} from '@utils/user';

-import type {Model} from '@nozbe/watermelondb';
 import type ChannelModel from '@typings/database/models/servers/channel';
 import type UserModel from '@typings/database/models/servers/user';

@@ -76,7 +76,7 @@ export async function switchToChannel(serverUrl: string, channelId: string, team
                }

                models = (await Promise.all(modelPromises)).flat();
-                const {member: viewedAt} = await markChannelAsViewed(serverUrl, channelId, false, true);
+                const {member: viewedAt} = await markChannelAsViewed(serverUrl, channelId, true);
                if (viewedAt) {
                    models.push(viewedAt);
                }
@@ -160,7 +160,7 @@ export async function selectAllMyChannelIds(serverUrl: string) {
    }
 }

-export async function markChannelAsViewed(serverUrl: string, channelId: string, onlyCounts = false, prepareRecordsOnly = false) {
+export async function markChannelAsViewed(serverUrl: string, channelId: string, prepareRecordsOnly = false) {
    try {
        const {database, operator} = DatabaseManager.getServerDatabaseAndOperator(serverUrl);
        const member = await getMyChannel(database, channelId);
@@ -172,10 +172,8 @@ export async function markChannelAsViewed(serverUrl: string, channelId: string,
            m.isUnread = false;
            m.mentionsCount = 0;
            m.manuallyUnread = false;
-            if (!onlyCounts) {
-                m.viewedAt = member.lastViewedAt;
-                m.lastViewedAt = Date.now();
-            }
+            m.viewedAt = member.lastViewedAt;
+            m.lastViewedAt = Date.now();
        });
        PushNotifications.removeChannelNotifications(serverUrl, channelId);
        if (!prepareRecordsOnly) {
--- a/app/actions/local/post.ts
+++ b/app/actions/local/post.ts
@@ -3,7 +3,6 @@

 import {fetchPostAuthors} from '@actions/remote/post';
 import {ActionType, Post} from '@constants';
-import {MM_TABLES} from '@constants/database';
 import DatabaseManager from '@database/manager';
 import {getPostById, prepareDeletePost, queryPostsById} from '@queries/servers/post';
 import {getCurrentUserId} from '@queries/servers/system';
@@ -19,8 +18,6 @@ import type MyChannelModel from '@typings/database/models/servers/my_channel';
 import type PostModel from '@typings/database/models/servers/post';
 import type UserModel from '@typings/database/models/servers/user';

-const {SERVER: {DRAFT, FILE, POST, POSTS_IN_THREAD, REACTION, THREAD, THREAD_PARTICIPANT, THREADS_IN_TEAM}} = MM_TABLES;
-
 export const sendAddToChannelEphemeralPost = async (serverUrl: string, user: UserModel, addedUsernames: string[], messages: string[], channeId: string, postRootId = '') => {
    try {
        const {operator} = DatabaseManager.getServerDatabaseAndOperator(serverUrl);
@@ -247,31 +244,3 @@ export async function getPosts(serverUrl: string, ids: string[]) {
        return [];
    }
 }
-
-export async function deletePosts(serverUrl: string, postIds: string[]) {
-    try {
-        const {database} = DatabaseManager.getServerDatabaseAndOperator(serverUrl);
-
-        const postsFormatted = `'${postIds.join("','")}'`;
-
-        await database.write(() => {
-            return database.adapter.unsafeExecute({
-                sqls: [
-                    [`DELETE FROM ${POST} where id IN (${postsFormatted})`, []],
-                    [`DELETE FROM ${REACTION} where post_id IN (${postsFormatted})`, []],
-                    [`DELETE FROM ${FILE} where post_id IN (${postsFormatted})`, []],
-                    [`DELETE FROM ${DRAFT} where root_id IN (${postsFormatted})`, []],
-
-                    [`DELETE FROM ${POSTS_IN_THREAD} where root_id IN (${postsFormatted})`, []],
-
-                    [`DELETE FROM ${THREAD} where id IN (${postsFormatted})`, []],
-                    [`DELETE FROM ${THREAD_PARTICIPANT} where thread_id IN (${postsFormatted})`, []],
-                    [`DELETE FROM ${THREADS_IN_TEAM} where thread_id IN (${postsFormatted})`, []],
-                ],
-            });
-        });
-        return {error: false};
-    } catch (error) {
-        return {error};
-    }
-}
--- a/app/actions/local/systems.ts
+++ b/app/actions/local/systems.ts
@@ -1,23 +1,14 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.

-import {Q} from '@nozbe/watermelondb';
 import deepEqual from 'deep-equal';

-import {MM_TABLES, SYSTEM_IDENTIFIERS} from '@constants/database';
+import {SYSTEM_IDENTIFIERS} from '@constants/database';
 import DatabaseManager from '@database/manager';
 import {getServerCredentials} from '@init/credentials';
-import {queryAllChannelsForTeam} from '@queries/servers/channel';
-import {getConfig, getLicense, getGlobalDataRetentionPolicy, getGranularDataRetentionPolicies, getLastGlobalDataRetentionRun, getIsDataRetentionEnabled} from '@queries/servers/system';
+import {getConfig, getLicense} from '@queries/servers/system';
 import {logError} from '@utils/log';

-import {deletePosts} from './post';
-
-import type {DataRetentionPoliciesRequest} from '@actions/remote/systems';
-import type PostModel from '@typings/database/models/servers/post';
-
-const {SERVER: {POST}} = MM_TABLES;
-
 export async function storeConfigAndLicense(serverUrl: string, config: ClientConfig, license: ClientLicense) {
    try {
        // If we have credentials for this server then update the values in the database
@@ -83,155 +74,6 @@ export async function storeConfig(serverUrl: string, config: ClientConfig | unde
    return [];
 }

-export async function storeDataRetentionPolicies(serverUrl: string, data: DataRetentionPoliciesRequest, prepareRecordsOnly = false) {
-    try {
-        const {globalPolicy, teamPolicies, channelPolicies} = data;
-        const {operator} = DatabaseManager.getServerDatabaseAndOperator(serverUrl);
-        const systems: IdValue[] = [{
-            id: SYSTEM_IDENTIFIERS.DATA_RETENTION_POLICIES,
-            value: globalPolicy || {},
-        }, {
-            id: SYSTEM_IDENTIFIERS.GRANULAR_DATA_RETENTION_POLICIES,
-            value: {
-                team: teamPolicies || [],
-                channel: channelPolicies || [],
-            },
-        }];
-
-        return operator.handleSystem({
-            systems,
-            prepareRecordsOnly,
-        });
-    } catch {
-        return [];
-    }
-}
-
-export async function updateLastDataRetentionRun(serverUrl: string, value?: number, prepareRecordsOnly = false) {
-    try {
-        const {operator} = DatabaseManager.getServerDatabaseAndOperator(serverUrl);
-
-        const systems: IdValue[] = [{
-            id: SYSTEM_IDENTIFIERS.LAST_DATA_RETENTION_RUN,
-            value: value || Date.now(),
-        }];
-
-        return operator.handleSystem({systems, prepareRecordsOnly});
-    } catch (error) {
-        logError('Failed updateLastDataRetentionRun', error);
-        return {error};
-    }
-}
-
-export async function dataRetentionCleanup(serverUrl: string) {
-    try {
-        const {database} = DatabaseManager.getServerDatabaseAndOperator(serverUrl);
-
-        const isDataRetentionEnabled = await getIsDataRetentionEnabled(database);
-        if (!isDataRetentionEnabled) {
-            return {error: undefined};
-        }
-
-        const lastRunAt = await getLastGlobalDataRetentionRun(database);
-        const lastCleanedToday = new Date(lastRunAt).toDateString() === new Date().toDateString();
-
-        // Do not run if clean up is already done today
-        if (lastRunAt && lastCleanedToday) {
-            return {error: undefined};
-        }
-
-        const globalPolicy = await getGlobalDataRetentionPolicy(database);
-        const granularPoliciesData = await getGranularDataRetentionPolicies(database);
-
-        // Get global data retention cutoff
-        let globalRetentionCutoff = 0;
-        if (globalPolicy?.message_deletion_enabled) {
-            globalRetentionCutoff = globalPolicy.message_retention_cutoff;
-        }
-
-        // Get Granular data retention policies
-        let teamPolicies: TeamDataRetentionPolicy[] = [];
-        let channelPolicies: ChannelDataRetentionPolicy[] = [];
-        if (granularPoliciesData) {
-            teamPolicies = granularPoliciesData.team;
-            channelPolicies = granularPoliciesData.channel;
-        }
-
-        const channelsCutoffs: {[key: string]: number} = {};
-
-        // Get channel level cutoff from team policies
-        for await (const teamPolicy of teamPolicies) {
-            const {team_id, post_duration} = teamPolicy;
-            const channelIds = await queryAllChannelsForTeam(database, team_id).fetchIds();
-            if (channelIds.length) {
-                const cutoff = getDataRetentionPolicyCutoff(post_duration);
-                channelIds.forEach((channelId) => {
-                    channelsCutoffs[channelId] = cutoff;
-                });
-            }
-        }
-
-        // Get channel level cutoff from channel policies
-        channelPolicies.forEach(({channel_id, post_duration}) => {
-            channelsCutoffs[channel_id] = getDataRetentionPolicyCutoff(post_duration);
-        });
-
-        const conditions = [];
-
-        const channelIds = Object.keys(channelsCutoffs);
-        if (channelIds.length) {
-            // Fetch posts by channel level cutoff
-            for (const channelId of channelIds) {
-                const cutoff = channelsCutoffs[channelId];
-                conditions.push(`(channel_id='${channelId}' AND create_at < ${cutoff})`);
-            }
-
-            // Fetch posts by global cutoff which are not already fetched by channel level cutoff
-            conditions.push(`(channel_id NOT IN ('${channelIds.join("','")}') AND create_at < ${globalRetentionCutoff})`);
-        } else {
-            conditions.push(`create_at < ${globalRetentionCutoff}`);
-        }
-
-        const postIds = await database.get<PostModel>(POST).query(
-            Q.unsafeSqlQuery(`SELECT * FROM ${POST} where ${conditions.join(' OR ')}`),
-        ).fetchIds();
-
-        if (postIds.length) {
-            const batchSize = 1000;
-            const deletePromises = [];
-            for (let i = 0; i < postIds.length; i += batchSize) {
-                const batch = postIds.slice(i, batchSize);
-                deletePromises.push(
-                    deletePosts(serverUrl, batch),
-                );
-            }
-            const deleteResult = await Promise.all(deletePromises);
-            for (const {error} of deleteResult) {
-                if (error) {
-                    return {error};
-                }
-            }
-        }
-
-        await updateLastDataRetentionRun(serverUrl);
-
-        return {error: undefined};
-    } catch (error) {
-        logError('An error occurred while performing data retention cleanup', error);
-        return {error};
-    }
-}
-
-// Returns cutoff time based on the policy's post_duration
-function getDataRetentionPolicyCutoff(postDuration: number) {
-    const periodDate = new Date();
-    periodDate.setDate(periodDate.getDate() - postDuration);
-    periodDate.setHours(0);
-    periodDate.setMinutes(0);
-    periodDate.setSeconds(0);
-    return periodDate.getTime();
-}
-
 export async function setLastServerVersionCheck(serverUrl: string, reset = false) {
    try {
        const {operator} = DatabaseManager.getServerDatabaseAndOperator(serverUrl);
@@ -247,21 +89,6 @@ export async function setLastServerVersionCheck(serverUrl: string, reset = false
    }
 }

-export async function setGlobalThreadsTab(serverUrl: string, globalThreadsTab: GlobalThreadsTab) {
-    try {
-        const {operator} = DatabaseManager.getServerDatabaseAndOperator(serverUrl);
-        await operator.handleSystem({
-            systems: [{
-                id: SYSTEM_IDENTIFIERS.GLOBAL_THREADS_TAB,
-                value: globalThreadsTab,
-            }],
-            prepareRecordsOnly: false,
-        });
-    } catch (error) {
-        logError('setGlobalThreadsTab', error);
-    }
-}
-
 export async function dismissAnnouncement(serverUrl: string, announcementText: string) {
    try {
        const {operator} = DatabaseManager.getServerDatabaseAndOperator(serverUrl);
--- a/app/actions/local/team.ts
+++ b/app/actions/local/team.ts
@@ -2,7 +2,7 @@
 // See LICENSE.txt for license information.

 import DatabaseManager from '@database/manager';
-import {prepareDeleteTeam, getMyTeamById, queryTeamSearchHistoryByTeamId, removeTeamFromTeamHistory, getTeamSearchHistoryById, getTeamById} from '@queries/servers/team';
+import {prepareDeleteTeam, getMyTeamById, queryTeamSearchHistoryByTeamId, removeTeamFromTeamHistory, getTeamSearchHistoryById} from '@queries/servers/team';
 import {logError} from '@utils/log';

 import type Model from '@nozbe/watermelondb/Model';
@@ -12,7 +12,7 @@ export async function removeUserFromTeam(serverUrl: string, teamId: string) {
        const {database, operator} = DatabaseManager.getServerDatabaseAndOperator(serverUrl);
        const myTeam = await getMyTeamById(database, teamId);
        if (myTeam) {
-            const team = await getTeamById(database, myTeam.id);
+            const team = await myTeam.team.fetch();
            if (!team) {
                throw new Error('Team not found');
            }
--- a/app/actions/local/thread.ts
+++ b/app/actions/local/thread.ts
@@ -79,19 +79,11 @@ export const switchToThread = async (serverUrl: string, rootId: string, isFromNo
        const teamId = channel.teamId || currentTeamId;

        let switchingTeams = false;
-        if (currentTeamId === teamId) {
-            const models = await prepareCommonSystemValues(operator, {
-                currentChannelId: channel.id,
-            });
-            if (models.length) {
-                await operator.batchRecords(models);
-            }
-        } else {
+        if (currentTeamId !== teamId) {
            const modelPromises: Array<Promise<Model[]>> = [];
            switchingTeams = true;
            modelPromises.push(addTeamToTeamHistory(operator, teamId, true));
            const commonValues: PrepareCommonSystemValuesArgs = {
-                currentChannelId: channel.id,
                currentTeamId: teamId,
            };
            modelPromises.push(prepareCommonSystemValues(operator, commonValues));
@@ -176,7 +168,7 @@ export async function createThreadFromNewPost(serverUrl: string, post: Post, pre
        const {operator} = DatabaseManager.getServerDatabaseAndOperator(serverUrl);
        const models: Model[] = [];
        if (post.root_id) {
-            // Update the thread data: `reply_count`
+        // Update the thread data: `reply_count`
            const {model: threadModel} = await updateThread(serverUrl, post.root_id, {reply_count: post.reply_count}, true);
            if (threadModel) {
                models.push(threadModel);
@@ -212,7 +204,7 @@ export async function createThreadFromNewPost(serverUrl: string, post: Post, pre
 }

 // On receiving threads, Along with the "threads" & "thread participants", extract and save "posts" & "users"
-export async function processReceivedThreads(serverUrl: string, threads: Thread[], teamId: string, prepareRecordsOnly = false) {
+export async function processReceivedThreads(serverUrl: string, threads: Thread[], teamId: string, loadedInGlobalThreads = false, prepareRecordsOnly = false) {
    try {
        const {database, operator} = DatabaseManager.getServerDatabaseAndOperator(serverUrl);
        const currentUserId = await getCurrentUserId(database);
@@ -244,6 +236,7 @@ export async function processReceivedThreads(serverUrl: string, threads: Thread[
            threads: threadsToHandle,
            teamId,
            prepareRecordsOnly: true,
+            loadedInGlobalThreads,
        });

        const models = [...postModels, ...threadModels];
@@ -335,17 +328,3 @@ export async function updateThread(serverUrl: string, threadId: string, updatedT
        return {error};
    }
 }
-
-export async function updateTeamThreadsSync(serverUrl: string, data: TeamThreadsSync, prepareRecordsOnly = false) {
-    try {
-        const {operator} = DatabaseManager.getServerDatabaseAndOperator(serverUrl);
-        const models = await operator.handleTeamThreadsSync({data: [data], prepareRecordsOnly});
-        if (!prepareRecordsOnly) {
-            await operator.batchRecords(models);
-        }
-        return {models};
-    } catch (error) {
-        logError('Failed updateTeamThreadsSync', error);
-        return {error};
-    }
-}
--- a/app/actions/remote/apps.ts
+++ b/app/actions/remote/apps.ts
@@ -1,15 +1,16 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.

+import {IntlShape} from 'react-intl';
+
 import {sendEphemeralPost} from '@actions/local/post';
+import ClientError from '@client/rest/error';
 import {AppCallResponseTypes} from '@constants/apps';
 import NetworkManager from '@managers/network_manager';
 import {cleanForm, createCallRequest, makeCallErrorResponse} from '@utils/apps';

 import type {Client} from '@client/rest';
-import type ClientError from '@client/rest/error';
 import type PostModel from '@typings/database/models/servers/post';
-import type {IntlShape} from 'react-intl';

 export async function handleBindingClick<Res=unknown>(serverUrl: string, binding: AppBinding, context: AppContext, intl: IntlShape): Promise<{data?: AppCallResponse<Res>; error?: AppCallResponse<Res>}> {
    // Fetch form
@@ -206,7 +207,7 @@ export function postEphemeralCallResponseForPost(serverUrl: string, response: Ap
        serverUrl,
        message,
        post.channelId,
-        post.rootId || post.id,
+        post.rootId,
        response.app_metadata?.bot_user_id,
    );
 }
--- a/app/actions/remote/channel.ts
+++ b/app/actions/remote/channel.ts
@@ -2,31 +2,30 @@
 // See LICENSE.txt for license information.

 /* eslint-disable max-lines */
+import {Model} from '@nozbe/watermelondb';
+import {IntlShape} from 'react-intl';
 import {DeviceEventEmitter} from 'react-native';

 import {addChannelToDefaultCategory, storeCategories} from '@actions/local/category';
 import {removeCurrentUserFromChannel, setChannelDeleteAt, storeMyChannelsForTeam, switchToChannel} from '@actions/local/channel';
 import {switchToGlobalThreads} from '@actions/local/thread';
-import {loadCallForChannel} from '@calls/actions/calls';
-import {DeepLink, Events, General, Preferences, Screens} from '@constants';
+import {Events, General, Preferences, Screens} from '@constants';
 import DatabaseManager from '@database/manager';
 import {privateChannelJoinPrompt} from '@helpers/api/channel';
 import {getTeammateNameDisplaySetting} from '@helpers/api/preference';
 import AppsManager from '@managers/apps_manager';
 import NetworkManager from '@managers/network_manager';
-import {getActiveServer} from '@queries/app/servers';
 import {prepareMyChannelsForTeam, getChannelById, getChannelByName, getMyChannel, getChannelInfo, queryMyChannelSettingsByIds, getMembersCountByChannelsId} from '@queries/servers/channel';
 import {queryPreferencesByCategoryAndName} from '@queries/servers/preference';
-import {getCommonSystemValues, getConfig, getCurrentChannelId, getCurrentTeamId, getCurrentUserId, getLicense, setCurrentChannelId, setCurrentTeamAndChannelId} from '@queries/servers/system';
-import {getNthLastChannelFromTeam, getMyTeamById, getTeamByName, queryMyTeams, removeChannelFromTeamHistory} from '@queries/servers/team';
+import {getCommonSystemValues, getConfig, getCurrentTeamId, getCurrentUserId, getLicense, setCurrentChannelId} from '@queries/servers/system';
+import {getNthLastChannelFromTeam, getMyTeamById, getTeamByName, queryMyTeams} from '@queries/servers/team';
 import {getCurrentUser} from '@queries/servers/user';
-import {dismissAllModals, popToRoot} from '@screens/navigation';
 import EphemeralStore from '@store/ephemeral_store';
-import {setTeamLoading} from '@store/team_load_store';
 import {generateChannelNameFromDisplayName, getDirectChannelName, isDMorGM} from '@utils/channel';
 import {isTablet} from '@utils/helpers';
-import {logDebug, logError, logInfo} from '@utils/log';
+import {logError, logInfo} from '@utils/log';
 import {showMuteChannelSnackbar} from '@utils/snack_bar';
+import {PERMALINK_GENERIC_TEAM_NAME_REDIRECT} from '@utils/url';
 import {displayGroupMessageName, displayUsername} from '@utils/user';

 import {fetchGroupsForChannelIfConstrained} from './groups';
@@ -38,9 +37,7 @@ import {addCurrentUserToTeam, fetchTeamByName, removeCurrentUserFromTeam} from '
 import {fetchProfilesInGroupChannels, fetchProfilesPerChannels, fetchUsersByIds, updateUsersNoLongerVisible} from './user';

 import type {Client} from '@client/rest';
-import type {Model} from '@nozbe/watermelondb';
 import type ChannelModel from '@typings/database/models/servers/channel';
-import type {IntlShape} from 'react-intl';

 export type MyChannelsRequest = {
    categories?: CategoryWithChannels[];
@@ -360,9 +357,6 @@ export async function fetchMyChannelsForTeam(serverUrl: string, teamId: string,
    }

    try {
-        if (!fetchOnly) {
-            setTeamLoading(serverUrl, true);
-        }
        const [allChannels, channelMemberships, categoriesWithOrder] = await Promise.all([
            client.getMyChannels(teamId, includeDeleted, since),
            client.getMyChannelMembers(teamId),
@@ -391,14 +385,10 @@ export async function fetchMyChannelsForTeam(serverUrl: string, teamId: string,
            if (models.length) {
                await operator.batchRecords(models);
            }
-            setTeamLoading(serverUrl, false);
        }

        return {channels, memberships, categories};
    } catch (error) {
-        if (!fetchOnly) {
-            setTeamLoading(serverUrl, false);
-        }
        forceLogoutIfNecessary(serverUrl, error as ClientErrorProps);
        return {error};
    }
@@ -608,7 +598,6 @@ export async function joinChannel(serverUrl: string, teamId: string, channelId?:
    }

    if (channelId || channel?.id) {
-        loadCallForChannel(serverUrl, channelId || channel!.id);
        EphemeralStore.removeJoiningChannel(channelId || channel!.id);
    }
    return {channel, member};
@@ -662,7 +651,7 @@ export async function switchToChannelByName(serverUrl: string, channelName: stri
    let joinedTeam = false;
    let teamId = '';
    try {
-        if (teamName === DeepLink.Redirect) {
+        if (teamName === PERMALINK_GENERIC_TEAM_NAME_REDIRECT) {
            teamId = await getCurrentTeamId(database);
        } else {
            const team = await getTeamByName(database, teamName);
@@ -1154,7 +1143,7 @@ export async function searchAllChannels(serverUrl: string, term: string, archive
    }
 }

-export const updateChannelNotifyProps = async (serverUrl: string, channelId: string, props: Partial<ChannelNotifyProps>, updateLocally = false) => {
+export const updateChannelNotifyProps = async (serverUrl: string, channelId: string, props: Partial<ChannelNotifyProps>) => {
    let client: Client;
    try {
        client = NetworkManager.getClient(serverUrl);
@@ -1172,20 +1161,7 @@ export const updateChannelNotifyProps = async (serverUrl: string, channelId: str
        const notifyProps = {...props, channel_id: channelId, user_id: userId} as ChannelNotifyProps & {channel_id: string; user_id: string};

        await client.updateChannelNotifyProps(notifyProps);
-        if (updateLocally) {
-            const channelSettings = await queryMyChannelSettingsByIds(database, [channelId]).fetch();
-            const myChannelSetting = channelSettings?.[0];

-            if (myChannelSetting) {
-                const updatedProps: Partial<ChannelNotifyProps> = {...myChannelSetting.notifyProps, ...notifyProps};
-
-                await database.write(async () => {
-                    await myChannelSetting.update((c) => {
-                        c.notifyProps = updatedProps;
-                    });
-                });
-            }
-        }
        return {
            notifyProps,
        };
@@ -1204,10 +1180,6 @@ export const toggleMuteChannel = async (serverUrl: string, channelId: string, sh
    try {
        const channelSettings = await queryMyChannelSettingsByIds(database, [channelId]).fetch();
        const myChannelSetting = channelSettings?.[0];
-        if (!myChannelSetting) {
-            return {error: 'Channel setting not found'};
-        }
-
        const mark_unread = myChannelSetting.notifyProps?.mark_unread === 'mention' ? 'all' : 'mention';

        const notifyProps: Partial<ChannelNotifyProps> = {...myChannelSetting.notifyProps, mark_unread};
@@ -1281,7 +1253,7 @@ export const unarchiveChannel = async (serverUrl: string, channelId: string) =>
    try {
        EphemeralStore.addArchivingChannel(channelId);
        await client.unarchiveChannel(channelId);
-        await setChannelDeleteAt(serverUrl, channelId, 0);
+        await setChannelDeleteAt(serverUrl, channelId, Date.now());
        return {error: undefined};
    } catch (error) {
        forceLogoutIfNecessary(serverUrl, error as ClientErrorProps);
@@ -1325,45 +1297,3 @@ export const convertChannelToPrivate = async (serverUrl: string, channelId: stri
        EphemeralStore.removeConvertingChannel(channelId);
    }
 };
-
-export const handleKickFromChannel = async (serverUrl: string, channelId: string, event: string = Events.LEAVE_CHANNEL) => {
-    try {
-        const {database, operator} = DatabaseManager.getServerDatabaseAndOperator(serverUrl);
-
-        const currentChannelId = await getCurrentChannelId(database);
-        if (currentChannelId !== channelId) {
-            return;
-        }
-
-        const currentServer = await getActiveServer();
-        if (currentServer?.url === serverUrl) {
-            const channel = await getChannelById(database, channelId);
-            DeviceEventEmitter.emit(event, channel?.displayName);
-            await dismissAllModals();
-            await popToRoot();
-        }
-
-        const tabletDevice = await isTablet();
-
-        if (tabletDevice) {
-            const teamId = await getCurrentTeamId(database);
-            await removeChannelFromTeamHistory(operator, teamId, channelId);
-            const newChannelId = await getNthLastChannelFromTeam(database, teamId, 0, channelId);
-            if (newChannelId) {
-                if (currentServer?.url === serverUrl) {
-                    if (newChannelId === Screens.GLOBAL_THREADS) {
-                        await switchToGlobalThreads(serverUrl, teamId, false);
-                    } else {
-                        await switchToChannelById(serverUrl, newChannelId, teamId, true);
-                    }
-                } else {
-                    await setCurrentTeamAndChannelId(operator, teamId, channelId);
-                }
-            } // TODO else jump to "join a channel" screen https://mattermost.atlassian.net/browse/MM-41051
-        } else {
-            await setCurrentChannelId(operator, '');
-        }
-    } catch (error) {
-        logDebug('cannot kick user from channel', error);
-    }
-};
--- a/app/actions/remote/command.ts
+++ b/app/actions/remote/command.ts
@@ -1,23 +1,30 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.

+import {IntlShape} from 'react-intl';
 import {Alert} from 'react-native';

 import {doAppSubmit, postEphemeralCallResponseForCommandArgs} from '@actions/remote/apps';
+import {showPermalink} from '@actions/remote/permalink';
+import {Client} from '@client/rest';
 import {AppCommandParser} from '@components/autocomplete/slash_suggestion/app_command_parser/app_command_parser';
 import {AppCallResponseTypes} from '@constants/apps';
+import DeepLinkType from '@constants/deep_linking';
 import DatabaseManager from '@database/manager';
 import AppsManager from '@managers/apps_manager';
 import IntegrationsManager from '@managers/integrations_manager';
 import NetworkManager from '@managers/network_manager';
 import {getChannelById} from '@queries/servers/channel';
 import {getConfig, getCurrentTeamId} from '@queries/servers/system';
-import {showAppForm} from '@screens/navigation';
-import {handleDeepLink, matchDeepLink} from '@utils/deep_link';
-import {tryOpenURL} from '@utils/url';
+import {getTeammateNameDisplay, queryUsersByUsername} from '@queries/servers/user';
+import {showAppForm, showModal} from '@screens/navigation';
+import * as DraftUtils from '@utils/draft';
+import {matchDeepLink, tryOpenURL} from '@utils/url';
+import {displayUsername} from '@utils/user';

-import type {Client} from '@client/rest';
-import type {IntlShape} from 'react-intl';
+import {makeDirectChannel, switchToChannelById, switchToChannelByName} from './channel';
+
+import type {DeepLinkChannel, DeepLinkPermalink, DeepLinkDM, DeepLinkGM, DeepLinkPlugin} from '@typings/launch';

 export const executeCommand = async (serverUrl: string, intl: IntlShape, message: string, channelId: string, rootId?: string): Promise<{data?: CommandResponse; error?: string | {message: string}}> => {
    const operator = DatabaseManager.serverDatabases[serverUrl]?.operator;
@@ -106,7 +113,7 @@ const executeAppCommand = async (serverUrl: string, intl: IntlShape, parser: App
            return {data: {}};
        case AppCallResponseTypes.FORM:
            if (callResp.form) {
-                showAppForm(callResp.form, creq.context);
+                showAppForm(callResp.form);
            }
            return {data: {}};
        case AppCallResponseTypes.NAVIGATE:
@@ -137,9 +144,60 @@ export const handleGotoLocation = async (serverUrl: string, intl: IntlShape, loc

    const config = await getConfig(database);
    const match = matchDeepLink(location, serverUrl, config?.SiteURL);
+    let linkServerUrl: string | undefined;
+    if (match?.data?.serverUrl) {
+        linkServerUrl = DatabaseManager.searchUrl(match.data.serverUrl);
+    }

-    if (match) {
-        handleDeepLink(match, intl, location);
+    if (match && linkServerUrl) {
+        switch (match.type) {
+            case DeepLinkType.Channel: {
+                const data = match.data as DeepLinkChannel;
+                switchToChannelByName(linkServerUrl, data.channelName, data.teamName, DraftUtils.errorBadChannel, intl);
+                break;
+            }
+            case DeepLinkType.Permalink: {
+                const data = match.data as DeepLinkPermalink;
+                showPermalink(linkServerUrl, data.teamName, data.postId, intl);
+                break;
+            }
+            case DeepLinkType.DirectMessage: {
+                const data = match.data as DeepLinkDM;
+                if (!data.userName) {
+                    DraftUtils.errorUnkownUser(intl);
+                    return {data: false};
+                }
+
+                if (data.serverUrl !== serverUrl) {
+                    if (!database) {
+                        return {error: `${serverUrl} database not found`};
+                    }
+                }
+                const user = (await queryUsersByUsername(database, [data.userName]).fetch())[0];
+                if (!user) {
+                    DraftUtils.errorUnkownUser(intl);
+                    return {data: false};
+                }
+
+                makeDirectChannel(linkServerUrl, user.id, displayUsername(user, intl.locale, await getTeammateNameDisplay(database)), true);
+                break;
+            }
+            case DeepLinkType.GroupMessage: {
+                const data = match.data as DeepLinkGM;
+                if (!data.channelId) {
+                    DraftUtils.errorBadChannel(intl);
+                    return {data: false};
+                }
+
+                switchToChannelById(linkServerUrl, data.channelId);
+                break;
+            }
+            case DeepLinkType.Plugin: {
+                const data = match.data as DeepLinkPlugin;
+                showModal('PluginInternal', data.id, {link: location});
+                break;
+            }
+        }
    } else {
        const {formatMessage} = intl;
        const onError = () => Alert.alert(
--- a/app/actions/remote/custom_emoji.ts
+++ b/app/actions/remote/custom_emoji.ts
@@ -2,14 +2,13 @@
 // See LICENSE.txt for license information.

 import {forceLogoutIfNecessary} from '@actions/remote/session';
+import {Client} from '@client/rest';
 import {Emoji, General} from '@constants';
 import DatabaseManager from '@database/manager';
 import {debounce} from '@helpers/api/general';
 import NetworkManager from '@managers/network_manager';
 import {queryCustomEmojisByName} from '@queries/servers/custom_emoji';

-import type {Client} from '@client/rest';
-
 export const fetchCustomEmojis = async (serverUrl: string, page = 0, perPage = General.PAGE_SIZE_DEFAULT, sort = Emoji.SORT_BY_NAME) => {
    let client: Client;
    try {
@@ -88,17 +87,10 @@ const debouncedFetchEmojiByNames = debounce(async (serverUrl: string) => {
        promises.push(client.getCustomEmojiByName(name));
    }

+    const emojis = await Promise.all(promises);
+
    try {
-        const emojisResult = await Promise.allSettled(promises);
-        const emojis = emojisResult.reduce<CustomEmoji[]>((result, e) => {
-            if (e.status === 'fulfilled') {
-                result.push(e.value);
-            }
-            return result;
-        }, []);
-        if (emojis.length) {
-            await operator.handleCustomEmojis({emojis, prepareRecordsOnly: false});
-        }
+        await operator.handleCustomEmojis({emojis, prepareRecordsOnly: false});
        return {error: undefined};
    } catch (error) {
        return {error};
--- a/app/actions/remote/entry/app.ts
+++ b/app/actions/remote/entry/app.ts
@@ -1,17 +1,17 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.

-import {dataRetentionCleanup, setLastServerVersionCheck} from '@actions/local/systems';
+import {setLastServerVersionCheck} from '@actions/local/systems';
+import {switchToChannelById} from '@actions/remote/channel';
 import {fetchConfigAndLicense} from '@actions/remote/systems';
 import DatabaseManager from '@database/manager';
-import {prepareCommonSystemValues, getCurrentTeamId, getWebSocketLastDisconnected, getCurrentChannelId, getConfig, getLicense} from '@queries/servers/system';
+import {prepareCommonSystemValues, getCurrentTeamId, getWebSocketLastDisconnected, setCurrentTeamAndChannelId, getCurrentChannelId, getConfig, getLicense} from '@queries/servers/system';
 import {getCurrentUser} from '@queries/servers/user';
-import {setTeamLoading} from '@store/team_load_store';
 import {deleteV1Data} from '@utils/file';
 import {isTablet} from '@utils/helpers';
 import {logInfo} from '@utils/log';

-import {handleEntryAfterLoadNavigation, registerDeviceToken, syncOtherServers, verifyPushProxy} from './common';
+import {registerDeviceToken, syncOtherServers, verifyPushProxy} from './common';
 import {deferredAppEntryActions, entry} from './gql_common';

 export async function appEntry(serverUrl: string, since = 0, isUpgrade = false) {
@@ -27,52 +27,51 @@ export async function appEntry(serverUrl: string, since = 0, isUpgrade = false)
        }
    }

-    // Run data retention cleanup
-    await dataRetentionCleanup(serverUrl);
-
    // clear lastUnreadChannelId
    const removeLastUnreadChannelId = await prepareCommonSystemValues(operator, {lastUnreadChannelId: ''});
    if (removeLastUnreadChannelId) {
-        await operator.batchRecords(removeLastUnreadChannelId);
+        operator.batchRecords(removeLastUnreadChannelId);
    }

    const {database} = operator;

+    const tabletDevice = await isTablet();
    const currentTeamId = await getCurrentTeamId(database);
    const currentChannelId = await getCurrentChannelId(database);
    const lastDisconnectedAt = (await getWebSocketLastDisconnected(database)) || since;

-    setTeamLoading(serverUrl, true);
    const entryData = await entry(serverUrl, currentTeamId, currentChannelId, since);
    if ('error' in entryData) {
-        setTeamLoading(serverUrl, false);
        return {error: entryData.error};
    }

    const {models, initialTeamId, initialChannelId, prefData, teamData, chData, meData} = entryData;
    if (isUpgrade && meData?.user) {
-        const isTabletDevice = await isTablet();
-        const me = await prepareCommonSystemValues(operator, {
-            currentUserId: meData.user.id,
-            currentTeamId: initialTeamId,
-            currentChannelId: isTabletDevice ? initialChannelId : undefined,
-        });
+        const me = await prepareCommonSystemValues(operator, {currentUserId: meData.user.id});
        if (me?.length) {
            await operator.batchRecords(me);
        }
    }

-    await handleEntryAfterLoadNavigation(serverUrl, teamData.memberships || [], chData?.memberships || [], currentTeamId, currentChannelId, initialTeamId, initialChannelId);
+    let switchToChannel = false;
+
+    // Immediately set the new team as the current team in the database so that the UI
+    // renders the correct team.
+    if (tabletDevice && initialChannelId) {
+        switchToChannel = true;
+        switchToChannelById(serverUrl, initialChannelId, initialTeamId);
+    } else {
+        setCurrentTeamAndChannelId(operator, initialTeamId, initialChannelId);
+    }

    const dt = Date.now();
    await operator.batchRecords(models);
    logInfo('ENTRY MODELS BATCHING TOOK', `${Date.now() - dt}ms`);
-    setTeamLoading(serverUrl, false);

    const {id: currentUserId, locale: currentUserLocale} = meData?.user || (await getCurrentUser(database))!;
    const config = await getConfig(database);
    const license = await getLicense(database);
-    await deferredAppEntryActions(serverUrl, lastDisconnectedAt, currentUserId, currentUserLocale, prefData.preferences, config, license, teamData, chData, initialTeamId);
+    await deferredAppEntryActions(serverUrl, lastDisconnectedAt, currentUserId, currentUserLocale, prefData.preferences, config, license, teamData, chData, initialTeamId, switchToChannel ? initialChannelId : undefined);

    if (!since) {
        // Load data from other servers
@@ -93,8 +92,8 @@ export async function upgradeEntry(serverUrl: string) {
        const error = configAndLicense.error || entryData.error;

        if (!error) {
-            await DatabaseManager.updateServerIdentifier(serverUrl, configAndLicense.config!.DiagnosticId);
-            await DatabaseManager.setActiveServerDatabase(serverUrl);
+            DatabaseManager.updateServerIdentifier(serverUrl, configAndLicense.config!.DiagnosticId);
+            DatabaseManager.setActiveServerDatabase(serverUrl);
            deleteV1Data();
        }

--- a/app/actions/remote/entry/common.ts
+++ b/app/actions/remote/entry/common.ts
@@ -1,15 +1,16 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.

-import {dataRetentionCleanup} from '@actions/local/systems';
-import {fetchMissingDirectChannelsInfo, fetchMyChannelsForTeam, handleKickFromChannel, MyChannelsRequest} from '@actions/remote/channel';
+import {Database, Model} from '@nozbe/watermelondb';
+
+import {fetchMissingDirectChannelsInfo, fetchMyChannelsForTeam, MyChannelsRequest} from '@actions/remote/channel';
 import {fetchGroupsForMember} from '@actions/remote/groups';
 import {fetchPostsForUnreadChannels} from '@actions/remote/post';
 import {MyPreferencesRequest, fetchMyPreferences} from '@actions/remote/preference';
 import {fetchRoles} from '@actions/remote/role';
 import {fetchConfigAndLicense} from '@actions/remote/systems';
-import {fetchMyTeams, fetchTeamsChannelsAndUnreadPosts, handleKickFromTeam, MyTeamsRequest, updateCanJoinTeams} from '@actions/remote/team';
-import {syncTeamThreads} from '@actions/remote/thread';
+import {fetchAllTeams, fetchMyTeams, fetchTeamsChannelsAndUnreadPosts, MyTeamsRequest} from '@actions/remote/team';
+import {fetchNewThreads} from '@actions/remote/thread';
 import {autoUpdateTimezone, fetchMe, MyUserRequest, updateAllUsersSince} from '@actions/remote/user';
 import {gqlAllChannels} from '@client/graphQL/entry';
 import {General, Preferences, Screens} from '@constants';
@@ -21,22 +22,18 @@ import {selectDefaultTeam} from '@helpers/api/team';
 import {DEFAULT_LOCALE} from '@i18n';
 import NetworkManager from '@managers/network_manager';
 import {getDeviceToken} from '@queries/app/global';
-import {getAllServers} from '@queries/app/servers';
+import {queryAllServers} from '@queries/app/servers';
 import {prepareMyChannelsForTeam, queryAllChannelsForTeam, queryChannelsById} from '@queries/servers/channel';
 import {prepareModels, truncateCrtRelatedTables} from '@queries/servers/entry';
 import {getHasCRTChanged} from '@queries/servers/preference';
-import {getConfig, getCurrentChannelId, getCurrentTeamId, getCurrentUserId, getPushVerificationStatus, getWebSocketLastDisconnected, setCurrentTeamAndChannelId} from '@queries/servers/system';
+import {getConfig, getCurrentUserId, getPushVerificationStatus, getWebSocketLastDisconnected} from '@queries/servers/system';
 import {deleteMyTeams, getAvailableTeamIds, getTeamChannelHistory, queryMyTeams, queryMyTeamsByIds, queryTeamsById} from '@queries/servers/team';
-import {getIsCRTEnabled} from '@queries/servers/thread';
-import NavigationStore from '@store/navigation_store';
 import {isDMorGM, sortChannelsByDisplayName} from '@utils/channel';
 import {getMemberChannelsFromGQLQuery, gqlToClientChannelMembership} from '@utils/graphql';
-import {isTablet} from '@utils/helpers';
 import {logDebug} from '@utils/log';
 import {processIsCRTEnabled} from '@utils/thread';

 import type ClientError from '@client/rest/error';
-import type {Database, Model} from '@nozbe/watermelondb';

 export type AppEntryData = {
    initialTeamId: string;
@@ -148,7 +145,7 @@ export const fetchAppEntryData = async (serverUrl: string, sinceArg: number, ini

    const confReq = await fetchConfigAndLicense(serverUrl);
    const prefData = await fetchMyPreferences(serverUrl, fetchOnly);
-    const isCRTEnabled = Boolean(prefData.preferences && processIsCRTEnabled(prefData.preferences, confReq.config?.CollapsedThreads, confReq.config?.FeatureFlagCollapsedThreads, confReq.config?.Version));
+    const isCRTEnabled = Boolean(prefData.preferences && processIsCRTEnabled(prefData.preferences, confReq.config?.CollapsedThreads, confReq.config?.FeatureFlagCollapsedThreads));
    if (prefData.preferences) {
        const crtToggled = await getHasCRTChanged(database, prefData.preferences);
        if (crtToggled) {
@@ -319,7 +316,7 @@ export async function restDeferredAppEntryActions(
            channelsToFetchProfiles = new Set<Channel>(directChannels);

            // defer fetching posts for unread channels on initial team
-            fetchPostsForUnreadChannels(serverUrl, chData.channels, chData.memberships, initialChannelId);
+            fetchPostsForUnreadChannels(serverUrl, chData.channels, chData.memberships, initialChannelId, true);
        }
    }, FETCH_UNREADS_TIMEOUT);

@@ -328,22 +325,22 @@ export async function restDeferredAppEntryActions(
        fetchTeamsChannelsAndUnreadPosts(serverUrl, since, teamData.teams, teamData.memberships, initialTeamId);
    }

-    if (preferences && processIsCRTEnabled(preferences, config.CollapsedThreads, config.FeatureFlagCollapsedThreads, config.Version)) {
+    if (preferences && processIsCRTEnabled(preferences, config.CollapsedThreads, config.FeatureFlagCollapsedThreads)) {
        if (initialTeamId) {
-            await syncTeamThreads(serverUrl, initialTeamId);
+            await fetchNewThreads(serverUrl, initialTeamId, false);
        }

        if (teamData.teams?.length) {
            for await (const team of teamData.teams) {
                if (team.id !== initialTeamId) {
                    // need to await here since GM/DM threads in different teams overlap
-                    await syncTeamThreads(serverUrl, team.id);
+                    await fetchNewThreads(serverUrl, team.id, false);
                }
            }
        }
    }

-    updateCanJoinTeams(serverUrl);
+    await fetchAllTeams(serverUrl);
    await updateAllUsersSince(serverUrl, since);

    // Fetch groups for current user
@@ -365,23 +362,27 @@ export const registerDeviceToken = async (serverUrl: string) => {
        return {error};
    }

-    const deviceToken = await getDeviceToken();
-    if (deviceToken) {
-        client.attachDevice(deviceToken);
+    const appDatabase = DatabaseManager.appDatabase?.database;
+    if (appDatabase) {
+        const deviceToken = await getDeviceToken(appDatabase);
+        if (deviceToken) {
+            client.attachDevice(deviceToken);
+        }
    }

    return {error: undefined};
 };

 export const syncOtherServers = async (serverUrl: string) => {
-    const servers = await getAllServers();
-    for (const server of servers) {
-        if (server.url !== serverUrl && server.lastActiveAt > 0) {
-            registerDeviceToken(server.url);
-            syncAllChannelMembersAndThreads(server.url).then(() => {
-                dataRetentionCleanup(server.url);
-            });
-            autoUpdateTimezone(server.url);
+    const database = DatabaseManager.appDatabase?.database;
+    if (database) {
+        const servers = await queryAllServers(database);
+        for (const server of servers) {
+            if (server.url !== serverUrl && server.lastActiveAt > 0) {
+                registerDeviceToken(server.url);
+                syncAllChannelMembersAndThreads(server.url);
+                autoUpdateTimezone(server.url);
+            }
        }
    }
 };
@@ -411,8 +412,6 @@ const graphQLSyncAllChannelMembers = async (serverUrl: string) => {
        return 'Server database not found';
    }

-    const {database} = operator;
-
    const response = await gqlAllChannels(serverUrl);
    if ('error' in response) {
        return response.error;
@@ -422,7 +421,7 @@ const graphQLSyncAllChannelMembers = async (serverUrl: string) => {
        return response.errors[0].message;
    }

-    const userId = await getCurrentUserId(database);
+    const userId = await getCurrentUserId(operator.database);

    const channels = getMemberChannelsFromGQLQuery(response.data);
    const memberships = response.data.channelMembers?.map((m) => gqlToClientChannelMembership(m, userId));
@@ -431,16 +430,7 @@ const graphQLSyncAllChannelMembers = async (serverUrl: string) => {
        const modelPromises = await prepareMyChannelsForTeam(operator, '', channels, memberships, undefined, true);
        const models = (await Promise.all(modelPromises)).flat();
        if (models.length) {
-            await operator.batchRecords(models);
-        }
-    }
-
-    const isCRTEnabled = await getIsCRTEnabled(database);
-    if (isCRTEnabled) {
-        const myTeams = await queryMyTeams(operator.database).fetch();
-        for await (const myTeam of myTeams) {
-            // need to await here since GM/DM threads in different teams overlap
-            await syncTeamThreads(serverUrl, myTeam.id);
+            operator.batchRecords(models);
        }
    }

@@ -461,12 +451,11 @@ const restSyncAllChannelMembers = async (serverUrl: string) => {
        const config = await client.getClientConfigOld();

        let excludeDirect = false;
-        for await (const myTeam of myTeams) {
+        for (const myTeam of myTeams) {
            fetchMyChannelsForTeam(serverUrl, myTeam.id, false, 0, false, excludeDirect);
            excludeDirect = true;
-            if (preferences && processIsCRTEnabled(preferences, config.CollapsedThreads, config.FeatureFlagCollapsedThreads, config.Version)) {
-                // need to await here since GM/DM threads in different teams overlap
-                await syncTeamThreads(serverUrl, myTeam.id);
+            if (preferences && processIsCRTEnabled(preferences, config.CollapsedThreads, config.FeatureFlagCollapsedThreads)) {
+                fetchNewThreads(serverUrl, myTeam.id, false);
            }
        }
    } catch {
@@ -490,7 +479,12 @@ export async function verifyPushProxy(serverUrl: string) {
        return;
    }

-    const deviceId = await getDeviceToken();
+    const appDatabase = DatabaseManager.appDatabase?.database;
+    if (!appDatabase) {
+        return;
+    }
+
+    const deviceId = await getDeviceToken(appDatabase);
    if (!deviceId) {
        return;
    }
@@ -518,50 +512,3 @@ export async function verifyPushProxy(serverUrl: string) {
        // Do nothing
    }
 }
-
-export async function handleEntryAfterLoadNavigation(
-    serverUrl: string,
-    teamMembers: TeamMembership[],
-    channelMembers: ChannelMember[],
-    currentTeamId: string,
-    currentChannelId: string,
-    initialTeamId: string,
-    initialChannelId: string,
-) {
-    try {
-        const {operator, database} = DatabaseManager.getServerDatabaseAndOperator(serverUrl);
-
-        const currentTeamIdAfterLoad = await getCurrentTeamId(database);
-        const currentChannelIdAfterLoad = await getCurrentChannelId(database);
-        const mountedScreens = NavigationStore.getScreensInStack();
-        const isChannelScreenMounted = mountedScreens.includes(Screens.CHANNEL);
-        const isThreadsMounted = mountedScreens.includes(Screens.THREAD);
-        const tabletDevice = await isTablet();
-
-        if (currentTeamIdAfterLoad !== currentTeamId) {
-            // Switched teams while loading
-            if (!teamMembers.find((t) => t.team_id === currentTeamIdAfterLoad && t.delete_at === 0)) {
-                await handleKickFromTeam(serverUrl, currentTeamIdAfterLoad);
-            }
-        } else if (currentTeamIdAfterLoad !== initialTeamId) {
-            await handleKickFromTeam(serverUrl, currentTeamIdAfterLoad);
-        } else if (currentChannelIdAfterLoad !== currentChannelId) {
-            // Switched channels while loading
-            if (!channelMembers.find((m) => m.channel_id === currentChannelIdAfterLoad)) {
-                if (tabletDevice || isChannelScreenMounted || isThreadsMounted) {
-                    await handleKickFromChannel(serverUrl, currentChannelIdAfterLoad);
-                } else {
-                    await setCurrentTeamAndChannelId(operator, initialTeamId, initialChannelId);
-                }
-            }
-        } else if (currentChannelIdAfterLoad && currentChannelIdAfterLoad !== initialChannelId) {
-            if (tabletDevice || isChannelScreenMounted || isThreadsMounted) {
-                await handleKickFromChannel(serverUrl, currentChannelIdAfterLoad);
-            } else {
-                await setCurrentTeamAndChannelId(operator, initialTeamId, initialChannelId);
-            }
-        }
-    } catch (error) {
-        logDebug('could not manage the entry after load navigation', error);
-    }
-}
--- a/app/actions/remote/entry/gql_common.ts
+++ b/app/actions/remote/entry/gql_common.ts
@@ -1,12 +1,14 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.

+import {Database} from '@nozbe/watermelondb';
+
 import {storeConfigAndLicense} from '@actions/local/systems';
+import {MyChannelsRequest} from '@actions/remote/channel';
 import {fetchGroupsForMember} from '@actions/remote/groups';
 import {fetchPostsForUnreadChannels} from '@actions/remote/post';
-import {fetchDataRetentionPolicy} from '@actions/remote/systems';
-import {MyTeamsRequest, updateCanJoinTeams} from '@actions/remote/team';
-import {syncTeamThreads} from '@actions/remote/thread';
+import {MyTeamsRequest} from '@actions/remote/team';
+import {fetchNewThreads} from '@actions/remote/thread';
 import {autoUpdateTimezone, updateAllUsersSince} from '@actions/remote/user';
 import {gqlEntry, gqlEntryChannels, gqlOtherChannels} from '@client/graphQL/entry';
 import {Preferences} from '@constants';
@@ -16,16 +18,14 @@ import {selectDefaultTeam} from '@helpers/api/team';
 import {queryAllChannels, queryAllChannelsForTeam} from '@queries/servers/channel';
 import {prepareModels, truncateCrtRelatedTables} from '@queries/servers/entry';
 import {getHasCRTChanged} from '@queries/servers/preference';
-import {getConfig, getIsDataRetentionEnabled} from '@queries/servers/system';
+import {getConfig} from '@queries/servers/system';
 import {filterAndTransformRoles, getMemberChannelsFromGQLQuery, getMemberTeamsFromGQLQuery, gqlToClientChannelMembership, gqlToClientPreference, gqlToClientSidebarCategory, gqlToClientTeamMembership, gqlToClientUser} from '@utils/graphql';
 import {logDebug} from '@utils/log';
 import {processIsCRTEnabled} from '@utils/thread';

 import {teamsToRemove, FETCH_UNREADS_TIMEOUT, entryRest, EntryResponse, entryInitialChannelId, restDeferredAppEntryActions, getRemoveTeamIds} from './common';

-import type {MyChannelsRequest} from '@actions/remote/channel';
 import type ClientError from '@client/rest/error';
-import type {Database} from '@nozbe/watermelondb';
 import type ChannelModel from '@typings/database/models/servers/channel';

 export async function deferredAppEntryGraphQLActions(
@@ -48,20 +48,20 @@ export async function deferredAppEntryGraphQLActions(
    setTimeout(() => {
        if (chData?.channels?.length && chData.memberships?.length) {
            // defer fetching posts for unread channels on initial team
-            fetchPostsForUnreadChannels(serverUrl, chData.channels, chData.memberships, initialChannelId);
+            fetchPostsForUnreadChannels(serverUrl, chData.channels, chData.memberships, initialChannelId, true);
        }
    }, FETCH_UNREADS_TIMEOUT);

-    if (preferences && processIsCRTEnabled(preferences, config.CollapsedThreads, config.FeatureFlagCollapsedThreads, config.Version)) {
+    if (preferences && processIsCRTEnabled(preferences, config.CollapsedThreads, config.FeatureFlagCollapsedThreads)) {
        if (initialTeamId) {
-            await syncTeamThreads(serverUrl, initialTeamId);
+            await fetchNewThreads(serverUrl, initialTeamId, false);
        }

        if (teamData.teams?.length) {
            for await (const team of teamData.teams) {
                if (team.id !== initialTeamId) {
                    // need to await here since GM/DM threads in different teams overlap
-                    await syncTeamThreads(serverUrl, team.id);
+                    await fetchNewThreads(serverUrl, team.id, false);
                }
            }
        }
@@ -95,7 +95,6 @@ export async function deferredAppEntryGraphQLActions(
    // Fetch groups for current user
    fetchGroupsForMember(serverUrl, currentUserId);

-    updateCanJoinTeams(serverUrl);
    updateAllUsersSince(serverUrl, since);

    return {error: undefined};
@@ -181,22 +180,9 @@ export const entryGQL = async (serverUrl: string, currentTeamId?: string, curren
        user: gqlToClientUser(fetchedData.user!),
    };

-    const allTeams = getMemberTeamsFromGQLQuery(fetchedData);
-    const allTeamMemberships = fetchedData.teamMembers.map((m) => gqlToClientTeamMembership(m, meData.user.id));
-
-    const [nonArchivedTeams, archivedTeamIds] = allTeams.reduce((acc, t) => {
-        if (t.delete_at) {
-            acc[1].add(t.id);
-            return acc;
-        }
-        return [[...acc[0], t], acc[1]];
-    }, [[], new Set<string>()]);
-
-    const nonArchivedTeamMemberships = allTeamMemberships.filter((m) => !archivedTeamIds.has(m.team_id));
-
    const teamData = {
-        teams: nonArchivedTeams,
-        memberships: nonArchivedTeamMemberships,
+        teams: getMemberTeamsFromGQLQuery(fetchedData),
+        memberships: fetchedData.teamMembers.map((m) => gqlToClientTeamMembership(m, meData.user.id)),
    };

    const prefData = {
@@ -216,7 +202,7 @@ export const entryGQL = async (serverUrl: string, currentTeamId?: string, curren
    let initialTeamId = currentTeamId;
    if (!teamData.teams.length) {
        initialTeamId = '';
-    } else if (!initialTeamId || !teamData.teams.find((t) => t.id === currentTeamId && t.delete_at === 0)) {
+    } else if (!initialTeamId || !teamData.teams.find((t) => t.id === currentTeamId)) {
        const teamOrderPreference = getPreferenceValue(prefData.preferences || [], Preferences.TEAMS_ORDER, '', '') as string;
        initialTeamId = selectDefaultTeam(teamData.teams, meData.user.locale, teamOrderPreference, config.ExperimentalPrimaryTeam)?.id || '';
    }
@@ -265,12 +251,6 @@ export const entry = async (serverUrl: string, teamId?: string, channelId?: stri
        result = entryRest(serverUrl, teamId, channelId, since);
    }

-    // Fetch data retention policies
-    const isDataRetentionEnabled = await getIsDataRetentionEnabled(database);
-    if (isDataRetentionEnabled) {
-        fetchDataRetentionPolicy(serverUrl);
-    }
-
    return result;
 };

--- a/app/actions/remote/entry/login.ts
+++ b/app/actions/remote/entry/login.ts
@@ -6,7 +6,6 @@ import {fetchConfigAndLicense} from '@actions/remote/systems';
 import DatabaseManager from '@database/manager';
 import NetworkManager from '@managers/network_manager';
 import {setCurrentTeamAndChannelId} from '@queries/servers/system';
-import {setTeamLoading} from '@store/team_load_store';
 import {isTablet} from '@utils/helpers';

 import {deferredAppEntryActions, entry} from './gql_common';
@@ -48,11 +47,9 @@ export async function loginEntry({serverUrl, user, deviceToken}: AfterLoginArgs)
            return {error: clData.error};
        }

-        setTeamLoading(serverUrl, true);
        const entryData = await entry(serverUrl, '', '');

        if ('error' in entryData) {
-            setTeamLoading(serverUrl, false);
            return {error: entryData.error};
        }

@@ -69,7 +66,6 @@ export async function loginEntry({serverUrl, user, deviceToken}: AfterLoginArgs)
        }

        await operator.batchRecords(models);
-        setTeamLoading(serverUrl, false);

        const config = clData.config || {} as ClientConfig;
        const license = clData.license || {} as ClientLicense;
--- a/app/actions/remote/entry/notification.ts
+++ b/app/actions/remote/entry/notification.ts
@@ -14,7 +14,6 @@ import {getIsCRTEnabled} from '@queries/servers/thread';
 import {getCurrentUser} from '@queries/servers/user';
 import EphemeralStore from '@store/ephemeral_store';
 import NavigationStore from '@store/navigation_store';
-import {setTeamLoading} from '@store/team_load_store';
 import {isTablet} from '@utils/helpers';
 import {emitNotificationError} from '@utils/notification';
 import {setThemeDefaults, updateThemeIfNeeded} from '@utils/theme';
@@ -82,10 +81,8 @@ export async function pushNotificationEntry(serverUrl: string, notification: Not
        switchedToScreen = true;
    }

-    setTeamLoading(serverUrl, true);
    const entryData = await entry(serverUrl, teamId, channelId);
    if ('error' in entryData) {
-        setTeamLoading(serverUrl, false);
        return {error: entryData.error};
    }
    const {models, initialTeamId, initialChannelId, prefData, teamData, chData} = entryData;
@@ -137,7 +134,6 @@ export async function pushNotificationEntry(serverUrl: string, notification: Not
    }

    await operator.batchRecords(models);
-    setTeamLoading(serverUrl, false);

    const {id: currentUserId, locale: currentUserLocale} = (await getCurrentUser(operator.database))!;
    const config = await getConfig(database);
--- a/app/actions/remote/file.ts
+++ b/app/actions/remote/file.ts
@@ -1,25 +1,20 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.

+import {ClientResponse, ClientResponseError} from '@mattermost/react-native-network-client';
+
+import {Client} from '@client/rest';
+import ClientError from '@client/rest/error';
 import {DOWNLOAD_TIMEOUT} from '@constants/network';
 import NetworkManager from '@managers/network_manager';

 import {forceLogoutIfNecessary} from './session';

-import type {Client} from '@client/rest';
-import type ClientError from '@client/rest/error';
-import type {ClientResponse, ClientResponseError} from '@mattermost/react-native-network-client';
-
 export const downloadFile = (serverUrl: string, fileId: string, desitnation: string) => { // Let it throw and handle it accordingly
    const client = NetworkManager.getClient(serverUrl);
    return client.apiClient.download(client.getFileRoute(fileId), desitnation.replace('file://', ''), {timeoutInterval: DOWNLOAD_TIMEOUT});
 };

-export const downloadProfileImage = (serverUrl: string, userId: string, lastPictureUpdate: number, destination: string) => { // Let it throw and handle it accordingly
-    const client = NetworkManager.getClient(serverUrl);
-    return client.apiClient.download(client.getProfilePictureUrl(userId, lastPictureUpdate), destination.replace('file://', ''), {timeoutInterval: DOWNLOAD_TIMEOUT});
-};
-
 export const uploadFile = (
    serverUrl: string,
    file: FileInfo,
--- a/app/actions/remote/general.ts
+++ b/app/actions/remote/general.ts
@@ -27,7 +27,12 @@ async function getDeviceIdForPing(serverUrl: string, checkDeviceId: boolean) {
        }
    }

-    return getDeviceToken();
+    const appDatabase = DatabaseManager.appDatabase?.database;
+    if (!appDatabase) {
+        return '';
+    }
+
+    return getDeviceToken(appDatabase);
 }

 // Default timeout interval for ping is 5 seconds
--- a/app/actions/remote/groups.ts
+++ b/app/actions/remote/groups.ts
@@ -1,6 +1,7 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.

+import {Client} from '@client/rest';
 import DatabaseManager from '@database/manager';
 import NetworkManager from '@managers/network_manager';
 import {getChannelById} from '@queries/servers/channel';
@@ -8,8 +9,6 @@ import {getTeamById} from '@queries/servers/team';

 import {forceLogoutIfNecessary} from './session';

-import type {Client} from '@client/rest';
-
 export const fetchGroup = async (serverUrl: string, id: string, fetchOnly = false) => {
    try {
        const {operator} = DatabaseManager.getServerDatabaseAndOperator(serverUrl);
--- a/app/actions/remote/notifications.ts
+++ b/app/actions/remote/notifications.ts
@@ -14,7 +14,6 @@ import {getMyChannel, getChannelById} from '@queries/servers/channel';
 import {getCurrentTeamId, getWebSocketLastDisconnected} from '@queries/servers/system';
 import {getMyTeamById} from '@queries/servers/team';
 import {getIsCRTEnabled} from '@queries/servers/thread';
-import EphemeralStore from '@store/ephemeral_store';
 import {emitNotificationError} from '@utils/notification';

 const fetchNotificationData = async (serverUrl: string, notification: NotificationWithData, skipEvents = false) => {
@@ -123,7 +122,6 @@ export const openNotification = async (serverUrl: string, notification: Notifica
    }

    try {
-        EphemeralStore.setNotificationTapped(true);
        const {database} = operator;
        const channelId = notification.payload!.channel_id!;
        const rootId = notification.payload!.root_id!;
--- a/app/actions/remote/permalink.ts
+++ b/app/actions/remote/permalink.ts
@@ -1,14 +1,15 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.

-import {DeepLink} from '@constants';
 import DatabaseManager from '@database/manager';
 import {getCurrentTeam} from '@queries/servers/team';
 import {displayPermalink} from '@utils/permalink';
+import {PERMALINK_GENERIC_TEAM_NAME_REDIRECT} from '@utils/url';

 import type TeamModel from '@typings/database/models/servers/team';
+import type {IntlShape} from 'react-intl';

-export const showPermalink = async (serverUrl: string, teamName: string, postId: string, openAsPermalink = true) => {
+export const showPermalink = async (serverUrl: string, teamName: string, postId: string, intl: IntlShape, openAsPermalink = true) => {
    const database = DatabaseManager.serverDatabases[serverUrl]?.database;
    if (!database) {
        return {error: `${serverUrl} database not found`};
@@ -17,7 +18,7 @@ export const showPermalink = async (serverUrl: string, teamName: string, postId:
    try {
        let name = teamName;
        let team: TeamModel | undefined;
-        if (!name || name === DeepLink.Redirect) {
+        if (!name || name === PERMALINK_GENERIC_TEAM_NAME_REDIRECT) {
            team = await getCurrentTeam(database);
            if (team) {
                name = team.name;
--- a/app/actions/remote/post.ts
+++ b/app/actions/remote/post.ts
@@ -23,9 +23,7 @@ import {getPostById, getRecentPostsInChannel} from '@queries/servers/post';
 import {getCurrentUserId, getCurrentChannelId} from '@queries/servers/system';
 import {getIsCRTEnabled, prepareThreadsFromReceivedPosts} from '@queries/servers/thread';
 import {queryAllUsers} from '@queries/servers/user';
-import {setFetchingThreadState} from '@store/fetching_thread_store';
 import {getValidEmojis, matchEmoticons} from '@utils/emoji/helpers';
-import {isServerError} from '@utils/errors';
 import {logError} from '@utils/log';
 import {processPostsFetched} from '@utils/post';
 import {getPostIdsForCombinedUserActivityPost} from '@utils/post_list';
@@ -135,7 +133,7 @@ export async function createPost(serverUrl: string, post: Partial<Post>, files:
    let created;
    try {
        created = await client.createPost(newPost);
-    } catch (error) {
+    } catch (error: any) {
        const errorPost = {
            ...newPost,
            id: pendingPostId,
@@ -148,11 +146,10 @@ export async function createPost(serverUrl: string, post: Partial<Post>, files:

        // If the failure was because: the root post was deleted or
        // TownSquareIsReadOnly=true then remove the post
-        if (isServerError(error) && (
-            error.server_error_id === ServerErrors.DELETED_ROOT_POST_ERROR ||
+        if (error.server_error_id === ServerErrors.DELETED_ROOT_POST_ERROR ||
            error.server_error_id === ServerErrors.TOWN_SQUARE_READ_ONLY_ERROR ||
            error.server_error_id === ServerErrors.PLUGIN_DISMISSED_POST_ERROR
-        )) {
+        ) {
            await removePost(serverUrl, databasePost);
        } else {
            const models = await operator.handlePosts({
@@ -254,12 +251,11 @@ export const retryFailedPost = async (serverUrl: string, post: PostModel) => {
            }
        }
        await operator.batchRecords(models);
-    } catch (error) {
-        if (isServerError(error) && (
-            error.server_error_id === ServerErrors.DELETED_ROOT_POST_ERROR ||
+    } catch (error: any) {
+        if (error.server_error_id === ServerErrors.DELETED_ROOT_POST_ERROR ||
            error.server_error_id === ServerErrors.TOWN_SQUARE_READ_ONLY_ERROR ||
            error.server_error_id === ServerErrors.PLUGIN_DISMISSED_POST_ERROR
-        )) {
+        ) {
            await removePost(serverUrl, post);
        } else {
            post.prepareUpdate((p) => {
@@ -329,9 +325,12 @@ export async function fetchPostsForChannel(serverUrl: string, channelId: string,
    }
 }

-export const fetchPostsForUnreadChannels = async (serverUrl: string, channels: Channel[], memberships: ChannelMembership[], excludeChannelId?: string) => {
+export const fetchPostsForUnreadChannels = async (serverUrl: string, channels: Channel[], memberships: ChannelMembership[], excludeChannelId?: string, emitEvent = false) => {
    try {
        const promises = [];
+        if (emitEvent) {
+            DeviceEventEmitter.emit(Events.FETCHING_POSTS, true);
+        }
        for (const member of memberships) {
            const channel = channels.find((c) => c.id === member.channel_id);
            if (channel && (channel.total_msg_count - member.msg_count) > 0 && channel.id !== excludeChannelId) {
@@ -339,7 +338,13 @@ export const fetchPostsForUnreadChannels = async (serverUrl: string, channels: C
            }
        }
        await Promise.all(promises);
+        if (emitEvent) {
+            DeviceEventEmitter.emit(Events.FETCHING_POSTS, false);
+        }
    } catch (error) {
+        if (emitEvent) {
+            DeviceEventEmitter.emit(Events.FETCHING_POSTS, false);
+        }
        return {error};
    }

@@ -436,7 +441,7 @@ export async function fetchPostsBefore(serverUrl: string, channelId: string, pos

                await operator.batchRecords(models);
            } catch (error) {
-                logError('FETCH POSTS BEFORE ERROR', error);
+                logError('FETCH AUTHORS ERROR', error);
            }
        }

@@ -444,7 +449,7 @@ export async function fetchPostsBefore(serverUrl: string, channelId: string, pos
    } catch (error) {
        forceLogoutIfNecessary(serverUrl, error as ClientErrorProps);
        if (activeServerUrl === serverUrl) {
-            DeviceEventEmitter.emit(Events.LOADING_CHANNEL_POSTS, false);
+            DeviceEventEmitter.emit(Events.LOADING_CHANNEL_POSTS, true);
        }
        return {error};
    }
@@ -544,15 +549,9 @@ export const fetchPostAuthors = async (serverUrl: string, posts: Post[], fetchOn
        }

        if (promises.length) {
-            const authorsResult = await Promise.allSettled(promises);
-            const result = authorsResult.reduce<UserProfile[][]>((acc, item) => {
-                if (item.status === 'fulfilled') {
-                    acc.push(item.value);
-                }
-                return acc;
-            }, []);
-
+            const result = await Promise.all(promises);
            const authors = result.flat();
+
            if (!fetchOnly && authors.length) {
                await operator.handleUsers({
                    users: authors,
@@ -584,8 +583,6 @@ export async function fetchPostThread(serverUrl: string, postId: string, options
        return {error};
    }

-    setFetchingThreadState(postId, true);
-
    try {
        const isCRTEnabled = await getIsCRTEnabled(operator.database);

@@ -623,11 +620,9 @@ export async function fetchPostThread(serverUrl: string, postId: string, options
            }
            await operator.batchRecords(models);
        }
-        setFetchingThreadState(postId, false);
        return {posts: extractRecordsForTable<PostModel>(posts, MM_TABLES.SERVER.POST)};
    } catch (error) {
        forceLogoutIfNecessary(serverUrl, error as ClientErrorProps);
-        setFetchingThreadState(postId, false);
        return {error};
    }
 }
@@ -796,7 +791,7 @@ export async function fetchPostById(serverUrl: string, postId: string, fetchOnly
            if (authors?.length) {
                const users = await operator.handleUsers({
                    users: authors,
-                    prepareRecordsOnly: true,
+                    prepareRecordsOnly: false,
                });
                models.push(...users);
            }
--- a/app/actions/remote/preference.ts
+++ b/app/actions/remote/preference.ts
@@ -178,19 +178,3 @@ export const setDirectChannelVisible = async (serverUrl: string, channelId: stri
        return {error};
    }
 };
-
-export const savePreferredSkinTone = async (serverUrl: string, skinCode: string) => {
-    try {
-        const {database} = DatabaseManager.getServerDatabaseAndOperator(serverUrl);
-        const userId = await getCurrentUserId(database);
-        const pref: PreferenceType = {
-            user_id: userId,
-            category: Preferences.CATEGORY_EMOJI,
-            name: Preferences.EMOJI_SKINTONE,
-            value: skinCode,
-        };
-        return savePreference(serverUrl, [pref]);
-    } catch (error) {
-        return {error};
-    }
-};
--- a/app/actions/remote/reactions.ts
+++ b/app/actions/remote/reactions.ts
@@ -1,6 +1,8 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.

+import {Model} from '@nozbe/watermelondb';
+
 import {addRecentReaction} from '@actions/local/reactions';
 import DatabaseManager from '@database/manager';
 import NetworkManager from '@managers/network_manager';
@@ -12,7 +14,6 @@ import {getEmojiFirstAlias} from '@utils/emoji/helpers';
 import {forceLogoutIfNecessary} from './session';

 import type {Client} from '@client/rest';
-import type {Model} from '@nozbe/watermelondb';
 import type PostModel from '@typings/database/models/servers/post';

 export async function addReaction(serverUrl: string, postId: string, emojiName: string) {
--- a/app/actions/remote/retry.ts
+++ b/app/actions/remote/retry.ts
@@ -7,7 +7,7 @@ import DatabaseManager from '@database/manager';
 import {getPreferenceValue, getTeammateNameDisplaySetting} from '@helpers/api/preference';
 import {selectDefaultTeam} from '@helpers/api/team';
 import NetworkManager from '@managers/network_manager';
-import {prepareCategoriesAndCategoriesChannels} from '@queries/servers/categories';
+import {prepareCategories, prepareCategoryChannels} from '@queries/servers/categories';
 import {prepareMyChannelsForTeam} from '@queries/servers/channel';
 import {prepareMyPreferences, queryPreferencesByCategoryAndName} from '@queries/servers/preference';
 import {prepareCommonSystemValues, getConfig, getLicense} from '@queries/servers/system';
@@ -105,7 +105,8 @@ export async function retryInitialTeamAndChannel(serverUrl: string) {
            storeConfig(serverUrl, clData.config, true),
            ...prepareMyTeams(operator, teamData.teams!, teamData.memberships!),
            ...await prepareMyChannelsForTeam(operator, initialTeam.id, chData!.channels!, chData!.memberships!),
-            prepareCategoriesAndCategoriesChannels(operator, chData!.categories!, true),
+            prepareCategories(operator, chData!.categories!),
+            prepareCategoryChannels(operator, chData!.categories!),

            prepareCommonSystemValues(
                operator,
@@ -192,7 +193,8 @@ export async function retryInitialChannel(serverUrl: string, teamId: string) {

        const models: Model[] = (await Promise.all([
            ...await prepareMyChannelsForTeam(operator, teamId, chData!.channels!, chData!.memberships!),
-            prepareCategoriesAndCategoriesChannels(operator, chData!.categories!, true),
+            prepareCategories(operator, chData!.categories!),
+            prepareCategoryChannels(operator, chData!.categories!),
            prepareCommonSystemValues(operator, {currentChannelId: initialChannel?.id}),
        ])).flat();

--- a/app/actions/remote/session.ts
+++ b/app/actions/remote/session.ts
@@ -12,7 +12,7 @@ import PushNotifications from '@init/push_notifications';
 import NetworkManager from '@managers/network_manager';
 import WebsocketManager from '@managers/websocket_manager';
 import {getDeviceToken} from '@queries/app/global';
-import {getServerDisplayName} from '@queries/app/servers';
+import {queryServerName} from '@queries/app/servers';
 import {getCurrentUserId, getExpiredSession, getConfig, getLicense} from '@queries/servers/system';
 import {getCurrentUser} from '@queries/servers/user';
 import EphemeralStore from '@store/ephemeral_store';
@@ -21,6 +21,7 @@ import {scheduleExpiredNotification} from '@utils/notification';
 import {getCSRFFromCookie} from '@utils/security';

 import {loginEntry} from './entry';
+import {fetchDataRetentionPolicy} from './systems';

 import type ClientError from '@client/rest/error';
 import type {LoginArgs} from '@typings/database/database';
@@ -41,6 +42,11 @@ export const completeLogin = async (serverUrl: string) => {
        return null;
    }

+    // Data retention
+    if (config?.DataRetentionEnableMessageDeletion === 'true' && license?.IsLicensed === 'true' && license?.DataRetention === 'true') {
+        fetchDataRetentionPolicy(serverUrl);
+    }
+
    await DatabaseManager.setActiveServerDatabase(serverUrl);

    const systems: IdValue[] = [];
@@ -118,7 +124,7 @@ export const login = async (serverUrl: string, {ldapOnly = false, loginId, mfaTo
    }

    try {
-        deviceToken = await getDeviceToken();
+        deviceToken = await getDeviceToken(appDatabase);
        user = await client.login(
            loginId,
            password,
@@ -198,10 +204,11 @@ export const cancelSessionNotification = async (serverUrl: string) => {

 export const scheduleSessionNotification = async (serverUrl: string) => {
    try {
+        const {database: appDatabase} = DatabaseManager.getAppDatabaseAndOperator();
        const {database, operator} = DatabaseManager.getServerDatabaseAndOperator(serverUrl);
        const sessions = await fetchSessions(serverUrl, 'me');
        const user = await getCurrentUser(database);
-        const serverName = await getServerDisplayName(serverUrl);
+        const serverName = await queryServerName(appDatabase, serverUrl);

        await cancelSessionNotification(serverUrl);

@@ -279,7 +286,7 @@ export const ssoLogin = async (serverUrl: string, serverDisplayName: string, ser
                displayName: serverDisplayName,
            },
        });
-        deviceToken = await getDeviceToken();
+        deviceToken = await getDeviceToken(database);
        user = await client.getMe();
        await server?.operator.handleUsers({users: [user], prepareRecordsOnly: false});
        await server?.operator.handleSystem({
@@ -305,8 +312,9 @@ export const ssoLogin = async (serverUrl: string, serverDisplayName: string, ser
 async function findSession(serverUrl: string, sessions: Session[]) {
    try {
        const {database} = DatabaseManager.getServerDatabaseAndOperator(serverUrl);
+        const {database: appDatabase} = DatabaseManager.getAppDatabaseAndOperator();
        const expiredSession = await getExpiredSession(database);
-        const deviceToken = await getDeviceToken();
+        const deviceToken = await getDeviceToken(appDatabase);

        // First try and find the session by the given identifier  hyqddef7jjdktqiyy36gxa8sqy
        let session = sessions.find((s) => s.id === expiredSession?.id);
--- a/app/actions/remote/systems.ts
+++ b/app/actions/remote/systems.ts
@@ -1,11 +1,12 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.

-import {storeConfigAndLicense, storeDataRetentionPolicies} from '@actions/local/systems';
+import {storeConfigAndLicense} from '@actions/local/systems';
 import {forceLogoutIfNecessary} from '@actions/remote/session';
+import {SYSTEM_IDENTIFIERS} from '@constants/database';
 import DatabaseManager from '@database/manager';
 import NetworkManager from '@managers/network_manager';
-import {getCurrentUserId} from '@queries/servers/system';
+import {logError} from '@utils/log';

 import type ClientError from '@client/rest/error';

@@ -15,47 +16,7 @@ export type ConfigAndLicenseRequest = {
    error?: unknown;
 }

-export type DataRetentionPoliciesRequest = {
-    globalPolicy?: GlobalDataRetentionPolicy;
-    teamPolicies?: TeamDataRetentionPolicy[];
-    channelPolicies?: ChannelDataRetentionPolicy[];
-    error?: unknown;
-}
-
-export const fetchDataRetentionPolicy = async (serverUrl: string, fetchOnly = false): Promise<DataRetentionPoliciesRequest> => {
-    const operator = DatabaseManager.serverDatabases[serverUrl]?.operator;
-    if (!operator) {
-        return {error: `${serverUrl} database not found`};
-    }
-
-    try {
-        const {data: globalPolicy, error: globalPolicyError} = await fetchGlobalDataRetentionPolicy(serverUrl);
-        const {data: teamPolicies, error: teamPoliciesError} = await fetchAllGranularDataRetentionPolicies(serverUrl);
-        const {data: channelPolicies, error: channelPoliciesError} = await fetchAllGranularDataRetentionPolicies(serverUrl, true);
-
-        const hasError = globalPolicyError || teamPoliciesError || channelPoliciesError;
-        if (hasError) {
-            return hasError;
-        }
-
-        const data = {
-            globalPolicy,
-            teamPolicies: teamPolicies as TeamDataRetentionPolicy[],
-            channelPolicies: channelPolicies as ChannelDataRetentionPolicy[],
-        };
-
-        if (!fetchOnly) {
-            await storeDataRetentionPolicies(serverUrl, data);
-        }
-
-        return data;
-    } catch (error) {
-        forceLogoutIfNecessary(serverUrl, error as ClientError);
-        return {error};
-    }
-};
-
-export const fetchGlobalDataRetentionPolicy = async (serverUrl: string): Promise<{data?: GlobalDataRetentionPolicy; error?: unknown}> => {
+export const fetchDataRetentionPolicy = async (serverUrl: string) => {
    let client;
    try {
        client = NetworkManager.getClient(serverUrl);
@@ -63,47 +24,28 @@ export const fetchGlobalDataRetentionPolicy = async (serverUrl: string): Promise
        return {error};
    }

+    let data = {};
    try {
-        const data = await client.getGlobalDataRetentionPolicy();
-        return {data};
+        data = await client.getDataRetentionPolicy();
    } catch (error) {
        forceLogoutIfNecessary(serverUrl, error as ClientError);
        return {error};
    }
-};
-
-export const fetchAllGranularDataRetentionPolicies = async (
-    serverUrl: string,
-    isChannel = false,
-    page = 0,
-    policies: Array<TeamDataRetentionPolicy | ChannelDataRetentionPolicy> = [],
-): Promise<{data?: Array<TeamDataRetentionPolicy | ChannelDataRetentionPolicy>; error?: unknown}> => {
-    let client;
-    try {
-        client = NetworkManager.getClient(serverUrl);
-    } catch (error) {
-        return {error};
-    }

    const operator = DatabaseManager.serverDatabases[serverUrl]?.operator;
-    if (!operator) {
-        return {error: `${serverUrl} database not found`};
+    if (operator) {
+        const systems: IdValue[] = [{
+            id: SYSTEM_IDENTIFIERS.DATA_RETENTION_POLICIES,
+            value: JSON.stringify(data),
+        }];
+
+        operator.handleSystem({systems, prepareRecordsOnly: false}).
+            catch((error) => {
+                logError('An error occurred while saving data retention policies', error);
+            });
    }

-    const {database} = operator;
-
-    const currentUserId = await getCurrentUserId(database);
-    let data;
-    if (isChannel) {
-        data = await client.getChannelDataRetentionPolicies(currentUserId, page);
-    } else {
-        data = await client.getTeamDataRetentionPolicies(currentUserId, page);
-    }
-    policies.push(...data.policies);
-    if (policies.length < data.total_count) {
-        await fetchAllGranularDataRetentionPolicies(serverUrl, isChannel, page + 1, policies);
-    }
-    return {data: policies};
+    return data;
 };

 export const fetchConfigAndLicense = async (serverUrl: string, fetchOnly = false): Promise<ConfigAndLicenseRequest> => {
--- a/app/actions/remote/team.ts
+++ b/app/actions/remote/team.ts
@@ -1,23 +1,19 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.

+import {Model} from '@nozbe/watermelondb';
 import {DeviceEventEmitter} from 'react-native';

 import {removeUserFromTeam as localRemoveUserFromTeam} from '@actions/local/team';
-import {PER_PAGE_DEFAULT} from '@client/rest/constants';
 import {Events} from '@constants';
 import DatabaseManager from '@database/manager';
 import NetworkManager from '@managers/network_manager';
-import {getActiveServerUrl} from '@queries/app/servers';
-import {prepareCategoriesAndCategoriesChannels} from '@queries/servers/categories';
+import {prepareCategories, prepareCategoryChannels} from '@queries/servers/categories';
 import {prepareMyChannelsForTeam, getDefaultChannelForTeam} from '@queries/servers/channel';
 import {prepareCommonSystemValues, getCurrentTeamId, getCurrentUserId} from '@queries/servers/system';
-import {addTeamToTeamHistory, prepareDeleteTeam, prepareMyTeams, getNthLastChannelFromTeam, queryTeamsById, getLastTeam, getTeamById, removeTeamFromTeamHistory, queryMyTeams} from '@queries/servers/team';
-import {dismissAllModals, popToRoot} from '@screens/navigation';
+import {addTeamToTeamHistory, prepareDeleteTeam, prepareMyTeams, getNthLastChannelFromTeam, queryTeamsById, syncTeamTable} from '@queries/servers/team';
 import EphemeralStore from '@store/ephemeral_store';
-import {setTeamLoading} from '@store/team_load_store';
 import {isTablet} from '@utils/helpers';
-import {logDebug} from '@utils/log';

 import {fetchMyChannelsForTeam, switchToChannelById} from './channel';
 import {fetchGroupsForTeamIfConstrained} from './groups';
@@ -25,9 +21,7 @@ import {fetchPostsForChannel, fetchPostsForUnreadChannels} from './post';
 import {fetchRolesIfNeeded} from './role';
 import {forceLogoutIfNecessary} from './session';

-import type {Client} from '@client/rest';
 import type ClientError from '@client/rest/error';
-import type {Model} from '@nozbe/watermelondb';

 export type MyTeamsRequest = {
    teams?: Team[];
@@ -59,16 +53,12 @@ export async function addUserToTeam(serverUrl: string, teamId: string, userId: s
        return {error};
    }

-    let loadEventSent = false;
    try {
        EphemeralStore.startAddingToTeam(teamId);
        const team = await client.getTeam(teamId);
        const member = await client.addToTeam(teamId, userId);

        if (!fetchOnly) {
-            setTeamLoading(serverUrl, true);
-            loadEventSent = true;
-
            fetchRolesIfNeeded(serverUrl, member.roles.split(' '));
            const {channels, memberships: channelMembers, categories} = await fetchMyChannelsForTeam(serverUrl, teamId, false, 0, true);
            const operator = DatabaseManager.serverDatabases[serverUrl]?.operator;
@@ -83,12 +73,11 @@ export async function addUserToTeam(serverUrl: string, teamId: string, userId: s
                    operator.handleMyTeam({myTeams, prepareRecordsOnly: true}),
                    operator.handleTeamMemberships({teamMemberships: [member], prepareRecordsOnly: true}),
                    ...await prepareMyChannelsForTeam(operator, teamId, channels || [], channelMembers || []),
-                    prepareCategoriesAndCategoriesChannels(operator, categories || [], true),
+                    prepareCategories(operator, categories || []),
+                    prepareCategoryChannels(operator, categories || []),
                ])).flat();

                await operator.batchRecords(models);
-                setTeamLoading(serverUrl, false);
-                loadEventSent = false;

                if (await isTablet()) {
                    const channel = await getDefaultChannelForTeam(operator.database, teamId);
@@ -96,72 +85,17 @@ export async function addUserToTeam(serverUrl: string, teamId: string, userId: s
                        fetchPostsForChannel(serverUrl, channel.id);
                    }
                }
-            } else {
-                setTeamLoading(serverUrl, false);
-                loadEventSent = false;
            }
        }
        EphemeralStore.finishAddingToTeam(teamId);
-        updateCanJoinTeams(serverUrl);
        return {member};
    } catch (error) {
-        if (loadEventSent) {
-            setTeamLoading(serverUrl, false);
-        }
        EphemeralStore.finishAddingToTeam(teamId);
        forceLogoutIfNecessary(serverUrl, error as ClientError);
        return {error};
    }
 }

-export async function addUsersToTeam(serverUrl: string, teamId: string, userIds: string[], fetchOnly = false) {
-    try {
-        const client = NetworkManager.getClient(serverUrl);
-        const {operator} = DatabaseManager.getServerDatabaseAndOperator(serverUrl);
-        EphemeralStore.startAddingToTeam(teamId);
-
-        const members = await client.addUsersToTeamGracefully(teamId, userIds);
-
-        if (!fetchOnly) {
-            const teamMemberships: TeamMembership[] = [];
-            const roles = [];
-
-            for (const {member} of members) {
-                teamMemberships.push(member);
-                roles.push(...member.roles.split(' '));
-            }
-
-            fetchRolesIfNeeded(serverUrl, Array.from(new Set(roles)));
-
-            if (operator) {
-                await operator.handleTeamMemberships({teamMemberships, prepareRecordsOnly: true});
-            }
-        }
-
-        EphemeralStore.finishAddingToTeam(teamId);
-        return {members};
-    } catch (error) {
-        if (EphemeralStore.isAddingToTeam(teamId)) {
-            EphemeralStore.finishAddingToTeam(teamId);
-        }
-
-        forceLogoutIfNecessary(serverUrl, error as ClientError);
-        return {error};
-    }
-}
-
-export async function sendEmailInvitesToTeam(serverUrl: string, teamId: string, emails: string[]) {
-    try {
-        const client = NetworkManager.getClient(serverUrl);
-        const members = await client.sendEmailInvitesToTeamGracefully(teamId, emails);
-
-        return {members};
-    } catch (error) {
-        forceLogoutIfNecessary(serverUrl, error as ClientError);
-        return {error};
-    }
-}
-
 export async function fetchMyTeams(serverUrl: string, fetchOnly = false): Promise<MyTeamsRequest> {
    let client;
    try {
@@ -246,82 +180,25 @@ export async function fetchMyTeam(serverUrl: string, teamId: string, fetchOnly =
    }
 }

-export const fetchAllTeams = async (serverUrl: string, page = 0, perPage = PER_PAGE_DEFAULT): Promise<{teams?: Team[]; error?: any}> => {
+export const fetchAllTeams = async (serverUrl: string, fetchOnly = false): Promise<MyTeamsRequest> => {
+    let client;
    try {
-        const client = NetworkManager.getClient(serverUrl);
-        const teams = await client.getTeams(page, perPage);
-        return {teams};
+        client = NetworkManager.getClient(serverUrl);
    } catch (error) {
-        forceLogoutIfNecessary(serverUrl, error as ClientError);
        return {error};
    }
-};

-const recCanJoinTeams = async (client: Client, myTeamsIds: Set<string>, page: number): Promise<boolean> => {
-    const fetchedTeams = await client.getTeams(page, PER_PAGE_DEFAULT);
-    if (fetchedTeams.find((t) => !myTeamsIds.has(t.id) && t.delete_at === 0)) {
-        return true;
-    }
-
-    if (fetchedTeams.length === PER_PAGE_DEFAULT) {
-        return recCanJoinTeams(client, myTeamsIds, page + 1);
-    }
-
-    return false;
-};
-
-const LOAD_MORE_THRESHOLD = 10;
-export async function fetchTeamsForComponent(
-    serverUrl: string,
-    page: number,
-    joinedIds?: Set<string>,
-    alreadyLoaded: Team[] = [],
-): Promise<{teams: Team[]; hasMore: boolean; page: number}> {
-    let hasMore = true;
-    const {teams, error} = await fetchAllTeams(serverUrl, page, PER_PAGE_DEFAULT);
-    if (error || !teams || teams.length < PER_PAGE_DEFAULT) {
-        hasMore = false;
-    }
-
-    if (error) {
-        return {teams: alreadyLoaded, hasMore, page};
-    }
-
-    if (teams?.length) {
-        const notJoinedTeams = joinedIds ? teams.filter((t) => !joinedIds.has(t.id)) : teams;
-        alreadyLoaded.push(...notJoinedTeams);
-
-        if (teams.length < PER_PAGE_DEFAULT) {
-            hasMore = false;
-        }
-
-        if (
-            hasMore &&
-            (alreadyLoaded.length > LOAD_MORE_THRESHOLD)
-        ) {
-            return fetchTeamsForComponent(serverUrl, page + 1, joinedIds, alreadyLoaded);
-        }
-
-        return {teams: alreadyLoaded, hasMore, page: page + 1};
-    }
-
-    return {teams: alreadyLoaded, hasMore: false, page};
-}
-
-export const updateCanJoinTeams = async (serverUrl: string) => {
    try {
-        const client = NetworkManager.getClient(serverUrl);
-        const {database} = DatabaseManager.getServerDatabaseAndOperator(serverUrl);
+        const teams = await client.getTeams();
+        if (!fetchOnly) {
+            const operator = DatabaseManager.serverDatabases[serverUrl]?.operator;
+            if (operator) {
+                syncTeamTable(operator, teams);
+            }
+        }

-        const myTeams = await queryMyTeams(database).fetch();
-        const myTeamsIds = new Set(myTeams.map((m) => m.id));
-
-        const canJoin = await recCanJoinTeams(client, myTeamsIds, 0);
-
-        EphemeralStore.setCanJoinOtherTeams(serverUrl, canJoin);
-        return {};
+        return {teams};
    } catch (error) {
-        EphemeralStore.setCanJoinOtherTeams(serverUrl, false);
        forceLogoutIfNecessary(serverUrl, error as ClientError);
        return {error};
    }
@@ -396,7 +273,7 @@ export const removeUserFromTeam = async (serverUrl: string, teamId: string, user

        if (!fetchOnly) {
            localRemoveUserFromTeam(serverUrl, teamId);
-            updateCanJoinTeams(serverUrl);
+            fetchAllTeams(serverUrl);
        }

        return {error: undefined};
@@ -448,56 +325,3 @@ export async function handleTeamChange(serverUrl: string, teamId: string) {
    // Fetch Groups + GroupTeams
    fetchGroupsForTeamIfConstrained(serverUrl, teamId);
 }
-
-export async function handleKickFromTeam(serverUrl: string, teamId: string) {
-    try {
-        const {database, operator} = DatabaseManager.getServerDatabaseAndOperator(serverUrl);
-        const currentTeamId = await getCurrentTeamId(database);
-        if (currentTeamId !== teamId) {
-            return;
-        }
-
-        const currentServer = await getActiveServerUrl();
-        if (currentServer === serverUrl) {
-            const team = await getTeamById(database, teamId);
-            DeviceEventEmitter.emit(Events.LEAVE_TEAM, team?.displayName);
-            await dismissAllModals();
-            await popToRoot();
-        }
-
-        await removeTeamFromTeamHistory(operator, teamId);
-        const teamToJumpTo = await getLastTeam(database, teamId);
-        if (teamToJumpTo) {
-            await handleTeamChange(serverUrl, teamToJumpTo);
-        }
-
-        // Resetting to team select handled by the home screen
-    } catch (error) {
-        logDebug('Failed to kick user from team', error);
-    }
-}
-
-export async function getTeamMembersByIds(serverUrl: string, teamId: string, userIds: string[], fetchOnly?: boolean) {
-    try {
-        const client = NetworkManager.getClient(serverUrl);
-        const {operator} = DatabaseManager.getServerDatabaseAndOperator(serverUrl);
-        const members = await client.getTeamMembersByIds(teamId, userIds);
-
-        if (!fetchOnly) {
-            const roles = [];
-
-            for (const {roles: memberRoles} of members) {
-                roles.push(...memberRoles.split(' '));
-            }
-
-            fetchRolesIfNeeded(serverUrl, Array.from(new Set(roles)));
-
-            await operator.handleTeamMemberships({teamMemberships: members, prepareRecordsOnly: true});
-        }
-
-        return {members};
-    } catch (error) {
-        forceLogoutIfNecessary(serverUrl, error as ClientError);
-        return {error};
-    }
-}
--- a/app/actions/remote/terms_of_service.ts
+++ b/app/actions/remote/terms_of_service.ts
@@ -1,9 +1,7 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.

-import DatabaseManager from '@database/manager';
 import NetworkManager from '@managers/network_manager';
-import {getCurrentUser} from '@queries/servers/user';

 import {forceLogoutIfNecessary} from './session';

@@ -27,24 +25,15 @@ export async function fetchTermsOfService(serverUrl: string): Promise<{terms?: T
 }

 export async function updateTermsOfServiceStatus(serverUrl: string, id: string, status: boolean): Promise<{resp?: {status: string}; error?: any}> {
+    let client;
    try {
-        const client = NetworkManager.getClient(serverUrl);
-        const resp = await client.updateMyTermsOfServiceStatus(id, status);
+        client = NetworkManager.getClient(serverUrl);
+    } catch (error) {
+        return {error};
+    }

-        const {database, operator} = DatabaseManager.getServerDatabaseAndOperator(serverUrl);
-        const currentUser = await getCurrentUser(database);
-        if (currentUser) {
-            currentUser.prepareUpdate((u) => {
-                if (status) {
-                    u.termsOfServiceCreateAt = Date.now();
-                    u.termsOfServiceId = id;
-                } else {
-                    u.termsOfServiceCreateAt = 0;
-                    u.termsOfServiceId = '';
-                }
-            });
-            operator.batchRecords([currentUser]);
-        }
+    try {
+        const resp = await client.updateMyTermsOfServiceStatus(id, status);
        return {resp};
    } catch (error) {
        forceLogoutIfNecessary(serverUrl, error as ClientError);
--- a/app/actions/remote/thread.ts
+++ b/app/actions/remote/thread.ts
@@ -1,7 +1,7 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.

-import {markTeamThreadsAsRead, markThreadAsViewed, processReceivedThreads, switchToThread, updateTeamThreadsSync, updateThread} from '@actions/local/thread';
+import {markTeamThreadsAsRead, markThreadAsViewed, processReceivedThreads, switchToThread, updateThread} from '@actions/local/thread';
 import {fetchPostThread} from '@actions/remote/post';
 import {General} from '@constants';
 import DatabaseManager from '@database/manager';
@@ -10,14 +10,19 @@ import AppsManager from '@managers/apps_manager';
 import NetworkManager from '@managers/network_manager';
 import {getPostById} from '@queries/servers/post';
 import {getConfigValue, getCurrentChannelId, getCurrentTeamId} from '@queries/servers/system';
-import {getIsCRTEnabled, getThreadById, getTeamThreadsSyncData} from '@queries/servers/thread';
+import {getIsCRTEnabled, getNewestThreadInTeam, getThreadById} from '@queries/servers/thread';
 import {getCurrentUser} from '@queries/servers/user';
-import {getThreadsListEdges} from '@utils/thread';

 import {forceLogoutIfNecessary} from './session';

 import type {Client} from '@client/rest';
-import type Model from '@nozbe/watermelondb/Model';
+import type {Model} from '@nozbe/watermelondb';
+
+type FetchThreadsRequest = {
+    error?: unknown;
+} | {
+    data: GetUserThreadsResponse;
+};

 type FetchThreadsOptions = {
    before?: string;
@@ -29,11 +34,6 @@ type FetchThreadsOptions = {
    totalsOnly?: boolean;
 };

-enum Direction {
-    Up,
-    Down,
-}
-
 export const fetchAndSwitchToThread = async (serverUrl: string, rootId: string, isFromNotification = false) => {
    const database = DatabaseManager.serverDatabases[serverUrl]?.database;
    if (!database) {
@@ -74,6 +74,57 @@ export const fetchAndSwitchToThread = async (serverUrl: string, rootId: string,
    return {};
 };

+export const fetchThreads = async (
+    serverUrl: string,
+    teamId: string,
+    {
+        before,
+        after,
+        perPage = General.CRT_CHUNK_SIZE,
+        deleted = false,
+        unread = false,
+        since,
+    }: FetchThreadsOptions = {
+        perPage: General.CRT_CHUNK_SIZE,
+        deleted: false,
+        unread: false,
+        since: 0,
+    },
+): Promise<FetchThreadsRequest> => {
+    const database = DatabaseManager.serverDatabases[serverUrl]?.database;
+    if (!database) {
+        return {error: `${serverUrl} database not found`};
+    }
+
+    let client;
+    try {
+        client = NetworkManager.getClient(serverUrl);
+    } catch (error) {
+        return {error};
+    }
+
+    try {
+        const version = await getConfigValue(database, 'Version');
+        const data = await client.getThreads('me', teamId, before, after, perPage, deleted, unread, since, false, version);
+
+        const {threads} = data;
+
+        if (threads.length) {
+            // Mark all fetched threads as following
+            threads.forEach((thread: Thread) => {
+                thread.is_following = true;
+            });
+
+            await processReceivedThreads(serverUrl, threads, teamId, !unread, false);
+        }
+
+        return {data};
+    } catch (error) {
+        forceLogoutIfNecessary(serverUrl, error as ClientErrorProps);
+        return {error};
+    }
+};
+
 export const fetchThread = async (serverUrl: string, teamId: string, threadId: string, extended?: boolean) => {
    let client;
    try {
@@ -85,7 +136,7 @@ export const fetchThread = async (serverUrl: string, teamId: string, threadId: s
    try {
        const thread = await client.getThread('me', teamId, threadId, extended);

-        await processReceivedThreads(serverUrl, [thread], teamId);
+        await processReceivedThreads(serverUrl, [thread], teamId, false, false);

        return {data: thread};
    } catch (error) {
@@ -235,13 +286,17 @@ export const updateThreadFollowing = async (serverUrl: string, teamId: string, t
    }
 };

-export const fetchThreads = async (
+enum Direction {
+    Up,
+    Down,
+}
+
+async function fetchBatchThreads(
    serverUrl: string,
    teamId: string,
    options: FetchThreadsOptions,
-    direction?: Direction,
    pages?: number,
-) => {
+): Promise<{error: unknown; data?: Thread[]}> {
    const operator = DatabaseManager.serverDatabases[serverUrl]?.operator;

    if (!operator) {
@@ -255,7 +310,12 @@ export const fetchThreads = async (
        return {error};
    }

-    const fetchDirection = direction ?? Direction.Up;
+    // if we start from the begging of time (since = 0) we need to fetch threads from newest to oldest (Direction.Down)
+    // if there is another point in time, we need to fetch threads from oldest to newest (Direction.Up)
+    let direction = Direction.Up;
+    if (options.since === 0) {
+        direction = Direction.Down;
+    }

    const currentUser = await getCurrentUser(operator.database);
    if (!currentUser) {
@@ -263,32 +323,34 @@ export const fetchThreads = async (
    }

    const version = await getConfigValue(operator.database, 'Version');
-    const threadsData: Thread[] = [];
+    const data: Thread[] = [];

-    let currentPage = 0;
    const fetchThreadsFunc = async (opts: FetchThreadsOptions) => {
+        let page = 0;
        const {before, after, perPage = General.CRT_CHUNK_SIZE, deleted, unread, since} = opts;

-        currentPage++;
+        page += 1;
        const {threads} = await client.getThreads(currentUser.id, teamId, before, after, perPage, deleted, unread, since, false, version);
        if (threads.length) {
            // Mark all fetched threads as following
            for (const thread of threads) {
-                thread.is_following = thread.is_following ?? true;
+                thread.is_following = true;
            }

-            threadsData.push(...threads);
+            data.push(...threads);

-            if (threads.length === perPage && (pages == null || currentPage < pages!)) {
+            if (threads.length === perPage) {
                const newOptions: FetchThreadsOptions = {perPage, deleted, unread};
-                if (fetchDirection === Direction.Down) {
+                if (direction === Direction.Down) {
                    const last = threads[threads.length - 1];
                    newOptions.before = last.id;
                } else {
                    const first = threads[0];
                    newOptions.after = first.id;
                }
-                await fetchThreadsFunc(newOptions);
+                if (pages != null && page < pages) {
+                    fetchThreadsFunc(newOptions);
+                }
            }
        }
    };
@@ -299,179 +361,140 @@ export const fetchThreads = async (
        if (__DEV__) {
            throw error;
        }
-        return {error};
+
+        return {error, data};
    }

-    return {error: false, threads: threadsData};
-};
+    return {error: false, data};
+}
+
+export async function fetchNewThreads(
+    serverUrl: string,
+    teamId: string,
+    prepareRecordsOnly = false,
+): Promise<{error: unknown; models?: Model[]}> {
+    const options: FetchThreadsOptions = {
+        unread: false,
+        deleted: true,
+        perPage: 60,
+    };

-export const syncTeamThreads = async (serverUrl: string, teamId: string, prepareRecordsOnly = false) => {
    const operator = DatabaseManager.serverDatabases[serverUrl]?.operator;
+
    if (!operator) {
        return {error: `${serverUrl} database not found`};
    }

-    try {
-        const syncData = await getTeamThreadsSyncData(operator.database, teamId);
-        const syncDataUpdate = {
-            id: teamId,
-        } as TeamThreadsSync;
+    const newestThread = await getNewestThreadInTeam(operator.database, teamId, false);
+    options.since = newestThread ? newestThread.lastReplyAt : 0;

-        const threads: Thread[] = [];
+    let response: {
+        error: unknown;
+        data?: Thread[];
+    } = {
+        error: undefined,
+        data: [],
+    };

-        /**
-         * If Syncing for the first time,
-         *     - Get all unread threads to show the right badges
-         *     - Get latest threads to show by default in the global threads screen
-         * Else
-         *     - Get all threads since last sync
-         */
-        if (!syncData || !syncData?.latest) {
-            const [allUnreadThreads, latestThreads] = await Promise.all([
-                fetchThreads(
-                    serverUrl,
-                    teamId,
-                    {unread: true},
-                    Direction.Down,
-                ),
-                fetchThreads(
-                    serverUrl,
-                    teamId,
-                    {},
-                    undefined,
-                    1,
-                ),
-            ]);
-            if (allUnreadThreads.error || latestThreads.error) {
-                return {error: allUnreadThreads.error || latestThreads.error};
-            }
-            if (latestThreads.threads?.length) {
-                // We are fetching the threads for the first time. We get "latest" and "earliest" values.
-                const {earliestThread, latestThread} = getThreadsListEdges(latestThreads.threads);
-                syncDataUpdate.latest = latestThread.last_reply_at;
-                syncDataUpdate.earliest = earliestThread.last_reply_at;
+    let loadedInGlobalThreads = true;

-                threads.push(...latestThreads.threads);
-            }
-            if (allUnreadThreads.threads?.length) {
-                threads.push(...allUnreadThreads.threads);
-            }
-        } else {
-            const allNewThreads = await fetchThreads(
-                serverUrl,
-                teamId,
-                {deleted: true, since: syncData.latest},
-            );
-            if (allNewThreads.error) {
-                return {error: allNewThreads.error};
-            }
-            if (allNewThreads.threads?.length) {
-                // As we are syncing, we get all new threads and we will update the "latest" value.
-                const {latestThread} = getThreadsListEdges(allNewThreads.threads);
-                syncDataUpdate.latest = latestThread.last_reply_at;
-
-                threads.push(...allNewThreads.threads);
-            }
-        }
-
-        const models: Model[] = [];
-
-        if (threads.length) {
-            const {error, models: threadModels = []} = await processReceivedThreads(serverUrl, threads, teamId, true);
-            if (error) {
-                return {error};
-            }
-
-            if (threadModels?.length) {
-                models.push(...threadModels);
-            }
-
-            if (syncDataUpdate.earliest || syncDataUpdate.latest) {
-                const {models: updateModels} = await updateTeamThreadsSync(serverUrl, syncDataUpdate, true);
-                if (updateModels?.length) {
-                    models.push(...updateModels);
-                }
-            }
-
-            if (!prepareRecordsOnly && models?.length) {
-                try {
-                    await operator.batchRecords(models);
-                } catch (err) {
-                    if (__DEV__) {
-                        throw err;
-                    }
-                    return {error: err};
-                }
-            }
-        }
-
-        return {error: false, models};
-    } catch (error) {
-        return {error};
+    // if we have no threads in the DB fetch all unread ones
+    if (options.since === 0) {
+        // options to fetch all unread threads
+        options.deleted = false;
+        options.unread = true;
+        loadedInGlobalThreads = false;
    }
-};

-export const loadEarlierThreads = async (serverUrl: string, teamId: string, lastThreadId: string, prepareRecordsOnly = false) => {
+    response = await fetchBatchThreads(serverUrl, teamId, options);
+
+    const {error: nErr, data} = response;
+
+    if (nErr) {
+        return {error: nErr};
+    }
+
+    if (!data?.length) {
+        return {error: false, models: []};
+    }
+
+    const {error, models} = await processReceivedThreads(serverUrl, data, teamId, loadedInGlobalThreads, true);
+
+    if (!error && !prepareRecordsOnly && models?.length) {
+        try {
+            await operator.batchRecords(models);
+        } catch (err) {
+            if (__DEV__) {
+                throw err;
+            }
+            return {error: true};
+        }
+    }
+
+    return {error: false, models};
+}
+
+export async function fetchRefreshThreads(
+    serverUrl: string,
+    teamId: string,
+    unread = false,
+    prepareRecordsOnly = false,
+): Promise<{error: unknown; models?: Model[]}> {
+    const options: FetchThreadsOptions = {
+        unread,
+        deleted: true,
+        perPage: 60,
+    };
+
    const operator = DatabaseManager.serverDatabases[serverUrl]?.operator;
+
    if (!operator) {
        return {error: `${serverUrl} database not found`};
    }

-    try {
-        /*
-         * - We will fetch one page of old threads
-         * - Update the sync data with the earliest thread last_reply_at timestamp
-         */
-        const fetchedThreads = await fetchThreads(
-            serverUrl,
-            teamId,
-            {
-                before: lastThreadId,
-            },
-            undefined,
-            1,
-        );
-        if (fetchedThreads.error) {
-            return {error: fetchedThreads.error};
-        }
+    const newestThread = await getNewestThreadInTeam(operator.database, teamId, unread);
+    options.since = newestThread ? newestThread.lastReplyAt : 0;

-        const models: Model[] = [];
-        const threads = fetchedThreads.threads || [];
+    let response: {
+        error: unknown;
+        data?: Thread[];
+    } = {
+        error: undefined,
+        data: [],
+    };

-        if (threads?.length) {
-            const {error, models: threadModels = []} = await processReceivedThreads(serverUrl, threads, teamId, true);
-            if (error) {
-                return {error};
-            }
+    let pages;

-            if (threadModels?.length) {
-                models.push(...threadModels);
-            }
-
-            const {earliestThread} = getThreadsListEdges(threads);
-            const syncDataUpdate = {
-                id: teamId,
-                earliest: earliestThread.last_reply_at,
-            } as TeamThreadsSync;
-            const {models: updateModels} = await updateTeamThreadsSync(serverUrl, syncDataUpdate, true);
-            if (updateModels?.length) {
-                models.push(...updateModels);
-            }
-
-            if (!prepareRecordsOnly && models?.length) {
-                try {
-                    await operator.batchRecords(models);
-                } catch (err) {
-                    if (__DEV__) {
-                        throw err;
-                    }
-                    return {error: err};
-                }
-            }
-        }
-
-        return {error: false, models, threads};
-    } catch (error) {
-        return {error};
+    // in the case of global threads: if we have no threads in the DB fetch just one page
+    if (options.since === 0 && !unread) {
+        pages = 1;
    }
-};
+
+    response = await fetchBatchThreads(serverUrl, teamId, options, pages);
+
+    const {error: nErr, data} = response;
+
+    if (nErr) {
+        return {error: nErr};
+    }
+
+    if (!data?.length) {
+        return {error: false, models: []};
+    }
+
+    const loadedInGlobalThreads = !unread;
+    const {error, models} = await processReceivedThreads(serverUrl, data, teamId, loadedInGlobalThreads, true);
+
+    if (!error && !prepareRecordsOnly && models?.length) {
+        try {
+            await operator.batchRecords(models);
+        } catch (err) {
+            if (__DEV__) {
+                throw err;
+            }
+            return {error: true};
+        }
+    }
+
+    return {error: false, models};
+}
--- a/app/actions/remote/user.ts
+++ b/app/actions/remote/user.ts
@@ -3,6 +3,7 @@

 /* eslint-disable max-lines */

+import {Model} from '@nozbe/watermelondb';
 import {chunk} from 'lodash';

 import {updateChannelsDisplayName} from '@actions/local/channel';
@@ -25,7 +26,6 @@ import {forceLogoutIfNecessary} from './session';

 import type {Client} from '@client/rest';
 import type ClientError from '@client/rest/error';
-import type {Model} from '@nozbe/watermelondb';
 import type UserModel from '@typings/database/models/servers/user';

 export type MyUserRequest = {
@@ -407,7 +407,7 @@ export const fetchUsersByIds = async (serverUrl: string, userIds: string[], fetc
            return {users: [], existingUsers};
        }
        const users = await client.getProfilesByIds([...new Set(usersToLoad)]);
-        if (!fetchOnly && users.length) {
+        if (!fetchOnly) {
            await operator.handleUsers({
                users,
                prepareRecordsOnly: false,
@@ -451,7 +451,7 @@ export const fetchUsersByUsernames = async (serverUrl: string, usernames: string

        const users = await client.getProfilesByUsernames([...new Set(usersToLoad)]);

-        if (users.length && !fetchOnly) {
+        if (!fetchOnly) {
            await operator.handleUsers({
                users,
                prepareRecordsOnly: false,
--- a/app/actions/websocket/channel.ts
+++ b/app/actions/websocket/channel.ts
@@ -1,26 +1,31 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.

+import {Model} from '@nozbe/watermelondb';
+import {DeviceEventEmitter} from 'react-native';
+
 import {addChannelToDefaultCategory} from '@actions/local/category';
 import {
    markChannelAsViewed, removeCurrentUserFromChannel, setChannelDeleteAt,
    storeMyChannelsForTeam, updateChannelInfoFromChannel, updateMyChannelFromWebsocket,
 } from '@actions/local/channel';
 import {storePostsForChannel} from '@actions/local/post';
-import {fetchMissingDirectChannelsInfo, fetchMyChannel, fetchChannelStats, fetchChannelById, handleKickFromChannel} from '@actions/remote/channel';
+import {switchToGlobalThreads} from '@actions/local/thread';
+import {fetchMissingDirectChannelsInfo, fetchMyChannel, fetchChannelStats, fetchChannelById, switchToChannelById} from '@actions/remote/channel';
 import {fetchPostsForChannel} from '@actions/remote/post';
 import {fetchRolesIfNeeded} from '@actions/remote/role';
 import {fetchUsersByIds, updateUsersNoLongerVisible} from '@actions/remote/user';
 import {loadCallForChannel} from '@calls/actions/calls';
-import {Events} from '@constants';
+import {Events, Screens} from '@constants';
 import DatabaseManager from '@database/manager';
+import {queryActiveServer} from '@queries/app/servers';
 import {deleteChannelMembership, getChannelById, prepareMyChannelsForTeam, getCurrentChannel} from '@queries/servers/channel';
-import {getConfig, getCurrentChannelId} from '@queries/servers/system';
+import {prepareCommonSystemValues, getConfig, setCurrentChannelId, getCurrentChannelId, getCurrentTeamId} from '@queries/servers/system';
+import {getNthLastChannelFromTeam} from '@queries/servers/team';
 import {getCurrentUser, getTeammateNameDisplay, getUserById} from '@queries/servers/user';
+import {dismissAllModals, popToRoot} from '@screens/navigation';
 import EphemeralStore from '@store/ephemeral_store';
-import {logDebug} from '@utils/log';
-
-import type {Model} from '@nozbe/watermelondb';
+import {isTablet} from '@utils/helpers';

 // Received when current user created a channel in a different client
 export async function handleChannelCreatedEvent(serverUrl: string, msg: any) {
@@ -128,7 +133,7 @@ export async function handleChannelViewedEvent(serverUrl: string, msg: any) {
        const currentChannelId = await getCurrentChannelId(database);

        if (activeServerUrl !== serverUrl || (currentChannelId !== channelId && !EphemeralStore.isSwitchingToChannel(channelId))) {
-            await markChannelAsViewed(serverUrl, channelId);
+            await markChannelAsViewed(serverUrl, channelId, false);
        }
    } catch {
        // do nothing
@@ -318,9 +323,12 @@ export async function handleUserAddedToChannelEvent(serverUrl: string, msg: any)
 }

 export async function handleUserRemovedFromChannelEvent(serverUrl: string, msg: any) {
-    try {
-        const {operator, database} = DatabaseManager.getServerDatabaseAndOperator(serverUrl);
+    const operator = DatabaseManager.serverDatabases[serverUrl]?.operator;
+    if (!operator) {
+        return;
+    }

+    try {
        // Depending on who was removed, the ids may come from one place dataset or the other.
        const userId = msg.data.user_id || msg.broadcast.user_id;
        const channelId = msg.data.channel_id || msg.broadcast.channel_id;
@@ -329,6 +337,8 @@ export async function handleUserRemovedFromChannelEvent(serverUrl: string, msg:
            return;
        }

+        const {database} = operator;
+        const channel = await getCurrentChannel(database);
        const user = await getCurrentUser(database);
        if (!user) {
            return;
@@ -344,11 +354,39 @@ export async function handleUserRemovedFromChannelEvent(serverUrl: string, msg:
        }

        if (user.id === userId) {
-            const currentChannelId = await getCurrentChannelId(database);
-            if (currentChannelId && currentChannelId === channelId) {
-                await handleKickFromChannel(serverUrl, currentChannelId);
-            }
            await removeCurrentUserFromChannel(serverUrl, channelId);
+            if (channel && channel.id === channelId) {
+                const currentServer = await queryActiveServer(DatabaseManager.appDatabase!.database);
+
+                if (currentServer?.url === serverUrl) {
+                    DeviceEventEmitter.emit(Events.LEAVE_CHANNEL, channel.displayName);
+                    await dismissAllModals();
+                    await popToRoot();
+
+                    if (await isTablet()) {
+                        let tId = channel.teamId;
+                        if (!tId) {
+                            tId = await getCurrentTeamId(database);
+                        }
+                        const channelToJumpTo = await getNthLastChannelFromTeam(database, tId);
+                        if (channelToJumpTo) {
+                            if (channelToJumpTo === Screens.GLOBAL_THREADS) {
+                                const {models: switchToGlobalThreadsModels} = await switchToGlobalThreads(serverUrl, tId, true);
+                                if (switchToGlobalThreadsModels) {
+                                    models.push(...switchToGlobalThreadsModels);
+                                }
+                            } else {
+                                switchToChannelById(serverUrl, channelToJumpTo, tId, true);
+                            }
+                        } // TODO else jump to "join a channel" screen https://mattermost.atlassian.net/browse/MM-41051
+                    } else {
+                        const currentChannelModels = await prepareCommonSystemValues(operator, {currentChannelId: ''});
+                        if (currentChannelModels?.length) {
+                            models.push(...currentChannelModels);
+                        }
+                    }
+                }
+            }
        } else {
            const {models: deleteMemberModels} = await deleteChannelMembership(operator, userId, channelId, true);
            if (deleteMemberModels) {
@@ -357,8 +395,8 @@ export async function handleUserRemovedFromChannelEvent(serverUrl: string, msg:
        }

        operator.batchRecords(models);
-    } catch (error) {
-        logDebug('cannot handle user removed from channel websocket event', error);
+    } catch {
+        // Do nothing
    }
 }

@@ -390,10 +428,34 @@ export async function handleChannelDeletedEvent(serverUrl: string, msg: WebSocke
        }

        if (config?.ExperimentalViewArchivedChannels !== 'true') {
-            if (currentChannel && currentChannel.id === channelId) {
-                await handleKickFromChannel(serverUrl, channelId, Events.CHANNEL_ARCHIVED);
-            }
            await removeCurrentUserFromChannel(serverUrl, channelId);
+
+            if (currentChannel && currentChannel.id === channelId) {
+                const currentServer = await queryActiveServer(DatabaseManager.appDatabase!.database);
+
+                if (currentServer?.url === serverUrl) {
+                    DeviceEventEmitter.emit(Events.CHANNEL_ARCHIVED, currentChannel.displayName);
+                    await dismissAllModals();
+                    await popToRoot();
+
+                    if (await isTablet()) {
+                        let tId = currentChannel.teamId;
+                        if (!tId) {
+                            tId = await getCurrentTeamId(database);
+                        }
+                        const channelToJumpTo = await getNthLastChannelFromTeam(database, tId);
+                        if (channelToJumpTo) {
+                            if (channelToJumpTo === Screens.GLOBAL_THREADS) {
+                                switchToGlobalThreads(serverUrl, tId);
+                                return;
+                            }
+                            switchToChannelById(serverUrl, channelToJumpTo, tId);
+                        } // TODO else jump to "join a channel" screen
+                    } else {
+                        setCurrentChannelId(operator, '');
+                    }
+                }
+            }
        }
    } catch {
        // Do nothing
--- a/app/actions/websocket/index.ts
+++ b/app/actions/websocket/index.ts
@@ -1,19 +1,16 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.

-import {markChannelAsViewed} from '@actions/local/channel';
-import {markChannelAsRead} from '@actions/remote/channel';
-import {handleEntryAfterLoadNavigation} from '@actions/remote/entry/common';
+import {DeviceEventEmitter} from 'react-native';
+
+import {switchToChannelById} from '@actions/remote/channel';
 import {deferredAppEntryActions, entry} from '@actions/remote/entry/gql_common';
-import {fetchPostsForChannel, fetchPostThread} from '@actions/remote/post';
 import {fetchStatusByIds} from '@actions/remote/user';
 import {loadConfigAndCalls} from '@calls/actions/calls';
 import {
    handleCallChannelDisabled,
    handleCallChannelEnabled,
    handleCallEnded,
-    handleCallHostChanged,
-    handleCallRecordingState,
    handleCallScreenOff,
    handleCallScreenOn,
    handleCallStarted,
@@ -28,28 +25,26 @@ import {
    handleCallUserVoiceOn,
 } from '@calls/connection/websocket_event_handlers';
 import {isSupportedServerCalls} from '@calls/utils';
-import {Screens, WebsocketEvents} from '@constants';
+import {Events, Screens, WebsocketEvents} from '@constants';
 import {SYSTEM_IDENTIFIERS} from '@constants/database';
 import DatabaseManager from '@database/manager';
 import AppsManager from '@managers/apps_manager';
+import {getActiveServerUrl, queryActiveServer} from '@queries/app/servers';
 import {getCurrentChannel} from '@queries/servers/channel';
-import {getLastPostInThread} from '@queries/servers/post';
 import {
    getConfig,
-    getCurrentChannelId,
    getCurrentUserId,
    getLicense,
    getWebSocketLastDisconnected,
    resetWebSocketLastDisconnected,
+    setCurrentTeamAndChannelId,
 } from '@queries/servers/system';
 import {getCurrentTeam} from '@queries/servers/team';
-import {getIsCRTEnabled} from '@queries/servers/thread';
 import {getCurrentUser} from '@queries/servers/user';
-import EphemeralStore from '@store/ephemeral_store';
+import {dismissAllModals, popToRoot} from '@screens/navigation';
 import NavigationStore from '@store/navigation_store';
-import {setTeamLoading} from '@store/team_load_store';
 import {isTablet} from '@utils/helpers';
-import {logDebug, logInfo} from '@utils/log';
+import {logInfo} from '@utils/log';

 import {handleCategoryCreatedEvent, handleCategoryDeletedEvent, handleCategoryOrderUpdatedEvent, handleCategoryUpdatedEvent} from './category';
 import {handleChannelConvertedEvent, handleChannelCreatedEvent,
@@ -68,7 +63,7 @@ import {handlePreferenceChangedEvent, handlePreferencesChangedEvent, handlePrefe
 import {handleAddCustomEmoji, handleReactionRemovedFromPostEvent, handleReactionAddedToPostEvent} from './reactions';
 import {handleUserRoleUpdatedEvent, handleTeamMemberRoleUpdatedEvent, handleRoleUpdatedEvent} from './roles';
 import {handleLicenseChangedEvent, handleConfigChangedEvent} from './system';
-import {handleLeaveTeamEvent, handleUserAddedToTeamEvent, handleUpdateTeamEvent, handleTeamArchived, handleTeamRestored} from './teams';
+import {handleLeaveTeamEvent, handleUserAddedToTeamEvent, handleUpdateTeamEvent} from './teams';
 import {handleThreadUpdatedEvent, handleThreadReadChangedEvent, handleThreadFollowChangedEvent} from './threads';
 import {handleUserUpdatedEvent, handleUserTypingEvent} from './users';

@@ -86,7 +81,7 @@ export async function handleFirstConnect(serverUrl: string) {

    // ESR: 5.37
    if (lastDisconnect && config?.EnableReliableWebSockets !== 'true' && alreadyConnected.has(serverUrl)) {
-        await handleReconnect(serverUrl);
+        handleReconnect(serverUrl);
        return;
    }

@@ -100,8 +95,8 @@ export async function handleFirstConnect(serverUrl: string) {
    }
 }

-export async function handleReconnect(serverUrl: string) {
-    await doReconnect(serverUrl);
+export function handleReconnect(serverUrl: string) {
+    doReconnect(serverUrl);
 }

 export async function handleClose(serverUrl: string, lastDisconnect: number) {
@@ -138,23 +133,50 @@ async function doReconnect(serverUrl: string) {

    const currentTeam = await getCurrentTeam(database);
    const currentChannel = await getCurrentChannel(database);
+    const currentActiveServerUrl = await getActiveServerUrl(DatabaseManager.appDatabase!.database);

-    setTeamLoading(serverUrl, true);
    const entryData = await entry(serverUrl, currentTeam?.id, currentChannel?.id, lastDisconnectedAt);
    if ('error' in entryData) {
-        setTeamLoading(serverUrl, false);
+        if (serverUrl === currentActiveServerUrl) {
+            DeviceEventEmitter.emit(Events.FETCHING_POSTS, false);
+        }
        return;
    }
    const {models, initialTeamId, initialChannelId, prefData, teamData, chData} = entryData;

-    await handleEntryAfterLoadNavigation(serverUrl, teamData.memberships || [], chData?.memberships || [], currentTeam?.id || '', currentChannel?.id || '', initialTeamId, initialChannelId);
+    let switchedToChannel = false;
+
+    // if no longer a member of the current team or the current channel
+    if (initialTeamId !== currentTeam?.id || initialChannelId !== currentChannel?.id) {
+        const currentServer = await queryActiveServer(appDatabase);
+        const isChannelScreenMounted = NavigationStore.getNavigationComponents().includes(Screens.CHANNEL);
+        if (serverUrl === currentServer?.url) {
+            if (currentTeam && initialTeamId !== currentTeam.id) {
+                DeviceEventEmitter.emit(Events.LEAVE_TEAM, {displayName: currentTeam.displayName});
+                await dismissAllModals();
+                await popToRoot();
+            } else if (currentChannel && initialChannelId !== currentChannel.id && isChannelScreenMounted) {
+                DeviceEventEmitter.emit(Events.LEAVE_CHANNEL, {displayName: currentChannel?.displayName});
+                await dismissAllModals();
+                await popToRoot();
+            }
+
+            const tabletDevice = await isTablet();
+
+            if (tabletDevice && initialChannelId) {
+                switchedToChannel = true;
+                switchToChannelById(serverUrl, initialChannelId, initialTeamId);
+            } else {
+                setCurrentTeamAndChannelId(operator, initialTeamId, initialChannelId);
+            }
+        } else {
+            setCurrentTeamAndChannelId(operator, initialTeamId, initialChannelId);
+        }
+    }

    const dt = Date.now();
    await operator.batchRecords(models);
    logInfo('WEBSOCKET RECONNECT MODELS BATCHING TOOK', `${Date.now() - dt}ms`);
-    setTeamLoading(serverUrl, false);
-
-    await fetchPostDataIfNeeded(serverUrl);

    const {id: currentUserId, locale: currentUserLocale} = (await getCurrentUser(database))!;
    const license = await getLicense(database);
@@ -164,7 +186,7 @@ async function doReconnect(serverUrl: string) {
        loadConfigAndCalls(serverUrl, currentUserId);
    }

-    await deferredAppEntryActions(serverUrl, lastDisconnectedAt, currentUserId, currentUserLocale, prefData.preferences, config, license, teamData, chData, initialTeamId);
+    await deferredAppEntryActions(serverUrl, lastDisconnectedAt, currentUserId, currentUserLocale, prefData.preferences, config, license, teamData, chData, initialTeamId, switchedToChannel ? initialChannelId : undefined);

    AppsManager.refreshAppBindings(serverUrl);
 }
@@ -312,14 +334,6 @@ export async function handleEvent(serverUrl: string, msg: WebSocketMessage) {
            handleOpenDialogEvent(serverUrl, msg);
            break;

-        case WebsocketEvents.DELETE_TEAM:
-            handleTeamArchived(serverUrl, msg);
-            break;
-
-        case WebsocketEvents.RESTORE_TEAM:
-            handleTeamRestored(serverUrl, msg);
-            break;
-
        case WebsocketEvents.THREAD_UPDATED:
            handleThreadUpdatedEvent(serverUrl, msg);
            break;
@@ -383,12 +397,6 @@ export async function handleEvent(serverUrl: string, msg: WebSocketMessage) {
        case WebsocketEvents.CALLS_USER_REACTED:
            handleCallUserReacted(serverUrl, msg);
            break;
-        case WebsocketEvents.CALLS_RECORDING_STATE:
-            handleCallRecordingState(serverUrl, msg);
-            break;
-        case WebsocketEvents.CALLS_HOST_CHANGED:
-            handleCallHostChanged(serverUrl, msg);
-            break;

        case WebsocketEvents.GROUP_RECEIVED:
            handleGroupReceivedEvent(serverUrl, msg);
@@ -409,53 +417,5 @@ export async function handleEvent(serverUrl: string, msg: WebSocketMessage) {
            break;
        case WebsocketEvents.GROUP_DISSOCIATED_TO_CHANNEL:
            break;
-
-        // Plugins
-        case WebsocketEvents.PLUGIN_STATUSES_CHANGED:
-        case WebsocketEvents.PLUGIN_ENABLED:
-        case WebsocketEvents.PLUGIN_DISABLED:
-            // Do nothing, this event doesn't need logic in the mobile app
-            break;
-    }
-}
-
-async function fetchPostDataIfNeeded(serverUrl: string) {
-    try {
-        const {database} = DatabaseManager.getServerDatabaseAndOperator(serverUrl);
-        const currentChannelId = await getCurrentChannelId(database);
-        const isCRTEnabled = await getIsCRTEnabled(database);
-        const mountedScreens = NavigationStore.getScreensInStack();
-        const isChannelScreenMounted = mountedScreens.includes(Screens.CHANNEL);
-        const isThreadScreenMounted = mountedScreens.includes(Screens.THREAD);
-        const tabletDevice = await isTablet();
-
-        if (isCRTEnabled && isThreadScreenMounted) {
-            // Fetch new posts in the thread only when CRT is enabled,
-            // for non-CRT fetchPostsForChannel includes posts in the thread
-            const rootId = EphemeralStore.getCurrentThreadId();
-            if (rootId) {
-                const lastPost = await getLastPostInThread(database, rootId);
-                if (lastPost) {
-                    if (lastPost) {
-                        const options: FetchPaginatedThreadOptions = {};
-                        options.fromCreateAt = lastPost.createAt;
-                        options.fromPost = lastPost.id;
-                        options.direction = 'down';
-                        await fetchPostThread(serverUrl, rootId, options);
-                    }
-                }
-            }
-        }
-
-        if (currentChannelId && (isChannelScreenMounted || tabletDevice)) {
-            await fetchPostsForChannel(serverUrl, currentChannelId);
-            markChannelAsRead(serverUrl, currentChannelId);
-            if (!EphemeralStore.wasNotificationTapped()) {
-                markChannelAsViewed(serverUrl, currentChannelId, true);
-            }
-            EphemeralStore.setNotificationTapped(false);
-        }
-    } catch (error) {
-        logDebug('could not fetch needed post after WS reconnect', error);
    }
 }
--- a/app/actions/websocket/integrations.ts
+++ b/app/actions/websocket/integrations.ts
@@ -1,6 +1,6 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
-
+import DatabaseManager from '@database/manager';
 import IntegrationsManager from '@managers/integrations_manager';
 import {getActiveServerUrl} from '@queries/app/servers';

@@ -9,10 +9,14 @@ export async function handleOpenDialogEvent(serverUrl: string, msg: WebSocketMes
    if (!data) {
        return;
    }
+    const appDatabase = DatabaseManager.appDatabase?.database;
+    if (!appDatabase) {
+        return;
+    }

    try {
        const dialog: InteractiveDialogConfig = JSON.parse(data);
-        const currentServer = await getActiveServerUrl();
+        const currentServer = await getActiveServerUrl(appDatabase);
        if (currentServer === serverUrl) {
            IntegrationsManager.getManager(serverUrl).setDialog(dialog);
        }
--- a/app/actions/websocket/posts.ts
+++ b/app/actions/websocket/posts.ts
@@ -1,6 +1,7 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.

+import {Model} from '@nozbe/watermelondb';
 import {DeviceEventEmitter} from 'react-native';

 import {storeMyChannelsForTeam, markChannelAsUnread, markChannelAsViewed, updateLastPostAt} from '@actions/local/channel';
@@ -19,11 +20,12 @@ import NavigationStore from '@store/navigation_store';
 import {isTablet} from '@utils/helpers';
 import {isFromWebhook, isSystemMessage, shouldIgnorePost} from '@utils/post';

-import type {Model} from '@nozbe/watermelondb';
 import type MyChannelModel from '@typings/database/models/servers/my_channel';

 function preparedMyChannelHack(myChannel: MyChannelModel) {
+    // @ts-expect-error hack accessing _preparedState
    if (!myChannel._preparedState) {
+        // @ts-expect-error hack setting _preparedState
        myChannel._preparedState = null;
    }
 }
@@ -127,7 +129,7 @@ export async function handleNewPostEvent(serverUrl: string, msg: WebSocketMessag
                markAsViewed = true;
                markAsRead = false;
            } else if ((post.channel_id === currentChannelId)) {
-                const isChannelScreenMounted = NavigationStore.getScreensInStack().includes(Screens.CHANNEL);
+                const isChannelScreenMounted = NavigationStore.getNavigationComponents().includes(Screens.CHANNEL);

                const isTabletDevice = await isTablet();
                if (isChannelScreenMounted || isTabletDevice) {
@@ -141,7 +143,7 @@ export async function handleNewPostEvent(serverUrl: string, msg: WebSocketMessag
            markChannelAsRead(serverUrl, post.channel_id);
        } else if (markAsViewed) {
            preparedMyChannelHack(myChannel);
-            const {member: viewedAt} = await markChannelAsViewed(serverUrl, post.channel_id, false, true);
+            const {member: viewedAt} = await markChannelAsViewed(serverUrl, post.channel_id, true);
            if (viewedAt) {
                models.push(viewedAt);
            }
@@ -162,13 +164,8 @@ export async function handleNewPostEvent(serverUrl: string, msg: WebSocketMessag
        }
    }

-    let actionType: string = ActionType.POSTS.RECEIVED_NEW;
-    if (isCRTEnabled && post.root_id) {
-        actionType = ActionType.POSTS.RECEIVED_IN_THREAD;
-    }
-
    const postModels = await operator.handlePosts({
-        actionType,
+        actionType: ActionType.POSTS.RECEIVED_NEW,
        order: [post.id],
        posts: [post],
        prepareRecordsOnly: true,
@@ -206,14 +203,8 @@ export async function handlePostEdited(serverUrl: string, msg: WebSocketMessage)
        models.push(...authorsModels);
    }

-    let actionType: string = ActionType.POSTS.RECEIVED_NEW;
-    const isCRTEnabled = await getIsCRTEnabled(operator.database);
-    if (isCRTEnabled && post.root_id) {
-        actionType = ActionType.POSTS.RECEIVED_IN_THREAD;
-    }
-
    const postModels = await operator.handlePosts({
-        actionType,
+        actionType: ActionType.POSTS.RECEIVED_NEW,
        order: [post.id],
        posts: [post],
        prepareRecordsOnly: true,
--- a/app/actions/websocket/teams.ts
+++ b/app/actions/websocket/teams.ts
@@ -1,107 +1,65 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.

+import {Model} from '@nozbe/watermelondb';
+import {DeviceEventEmitter} from 'react-native';
+
 import {removeUserFromTeam} from '@actions/local/team';
 import {fetchMyChannelsForTeam} from '@actions/remote/channel';
 import {fetchRoles} from '@actions/remote/role';
-import {fetchMyTeam, handleKickFromTeam, updateCanJoinTeams} from '@actions/remote/team';
+import {fetchAllTeams, handleTeamChange, fetchMyTeam} from '@actions/remote/team';
 import {updateUsersNoLongerVisible} from '@actions/remote/user';
+import Events from '@constants/events';
 import DatabaseManager from '@database/manager';
-import NetworkManager from '@managers/network_manager';
-import {prepareCategoriesAndCategoriesChannels} from '@queries/servers/categories';
+import {getActiveServerUrl} from '@queries/app/servers';
+import {prepareCategories, prepareCategoryChannels} from '@queries/servers/categories';
 import {prepareMyChannelsForTeam} from '@queries/servers/channel';
-import {getCurrentTeam, prepareMyTeams, queryMyTeamsByIds} from '@queries/servers/team';
+import {getCurrentTeam, getLastTeam, prepareMyTeams} from '@queries/servers/team';
 import {getCurrentUser} from '@queries/servers/user';
+import {dismissAllModals, popToRoot, resetToTeams} from '@screens/navigation';
 import EphemeralStore from '@store/ephemeral_store';
-import {setTeamLoading} from '@store/team_load_store';
-import {logDebug} from '@utils/log';
-
-import type ServerDataOperator from '@database/operator/server_data_operator';
-import type {Model} from '@nozbe/watermelondb';
-
-export async function handleTeamArchived(serverUrl: string, msg: WebSocketMessage) {
-    try {
-        const {database} = DatabaseManager.getServerDatabaseAndOperator(serverUrl);
-        const team: Team = JSON.parse(msg.data.team);
-
-        const membership = (await queryMyTeamsByIds(database, [team.id]).fetch())[0];
-        if (membership) {
-            const currentTeam = await getCurrentTeam(database);
-            if (currentTeam?.id === team.id) {
-                await handleKickFromTeam(serverUrl, team.id);
-            }
-
-            await removeUserFromTeam(serverUrl, team.id);
-
-            const user = await getCurrentUser(database);
-            if (user?.isGuest) {
-                updateUsersNoLongerVisible(serverUrl);
-            }
-        }
-        updateCanJoinTeams(serverUrl);
-    } catch (error) {
-        logDebug('cannot handle archive team websocket event', error);
-    }
-}
-
-export async function handleTeamRestored(serverUrl: string, msg: WebSocketMessage) {
-    let markedAsLoading = false;
-    try {
-        const client = NetworkManager.getClient(serverUrl);
-        const {operator} = DatabaseManager.getServerDatabaseAndOperator(serverUrl);
-        const team: Team = JSON.parse(msg.data.team);
-
-        const teamMembership = await client.getTeamMember(team.id, 'me');
-        if (teamMembership && teamMembership.delete_at === 0) {
-            // Ignore duplicated team join events sent by the server
-            if (EphemeralStore.isAddingToTeam(team.id)) {
-                return;
-            }
-            EphemeralStore.startAddingToTeam(team.id);
-
-            setTeamLoading(serverUrl, true);
-            markedAsLoading = true;
-            await fetchAndStoreJoinedTeamInfo(serverUrl, operator, team.id, [team], [teamMembership]);
-            setTeamLoading(serverUrl, false);
-            markedAsLoading = false;
-
-            EphemeralStore.finishAddingToTeam(team.id);
-        }
-
-        updateCanJoinTeams(serverUrl);
-    } catch (error) {
-        if (markedAsLoading) {
-            setTeamLoading(serverUrl, false);
-        }
-        logDebug('cannot handle restore team websocket event', error);
-    }
-}

 export async function handleLeaveTeamEvent(serverUrl: string, msg: WebSocketMessage) {
-    try {
-        const {database} = DatabaseManager.getServerDatabaseAndOperator(serverUrl);
+    const database = DatabaseManager.serverDatabases[serverUrl];
+    if (!database) {
+        return;
+    }

-        const user = await getCurrentUser(database);
-        if (!user) {
-            return;
+    const currentTeam = await getCurrentTeam(database.database);
+    const user = await getCurrentUser(database.database);
+    if (!user) {
+        return;
+    }
+
+    const {user_id: userId, team_id: teamId} = msg.data;
+    if (user.id === userId) {
+        await removeUserFromTeam(serverUrl, teamId);
+        fetchAllTeams(serverUrl);
+
+        if (user.isGuest) {
+            updateUsersNoLongerVisible(serverUrl);
        }

-        const {user_id: userId, team_id: teamId} = msg.data;
-        if (user.id === userId) {
-            const currentTeam = await getCurrentTeam(database);
-            if (currentTeam?.id === teamId) {
-                await handleKickFromTeam(serverUrl, teamId);
+        if (currentTeam?.id === teamId) {
+            const appDatabase = DatabaseManager.appDatabase?.database;
+            let currentServer = '';
+            if (appDatabase) {
+                currentServer = await getActiveServerUrl(appDatabase);
            }

-            await removeUserFromTeam(serverUrl, teamId);
-            updateCanJoinTeams(serverUrl);
+            if (currentServer === serverUrl) {
+                DeviceEventEmitter.emit(Events.LEAVE_TEAM, currentTeam?.displayName);
+                await dismissAllModals();
+                await popToRoot();
+            }

-            if (user.isGuest) {
-                updateUsersNoLongerVisible(serverUrl);
+            const teamToJumpTo = await getLastTeam(database.database);
+            if (teamToJumpTo) {
+                handleTeamChange(serverUrl, teamToJumpTo);
+            } else if (currentServer === serverUrl) {
+                resetToTeams();
            }
        }
-    } catch (error) {
-        logDebug('cannot handle leave team websocket event', error);
    }
 }

@@ -123,6 +81,10 @@ export async function handleUpdateTeamEvent(serverUrl: string, msg: WebSocketMes
 }

 export async function handleUserAddedToTeamEvent(serverUrl: string, msg: WebSocketMessage) {
+    const operator = DatabaseManager.serverDatabases[serverUrl]?.operator;
+    if (!operator) {
+        return;
+    }
    const {team_id: teamId} = msg.data;

    // Ignore duplicated team join events sent by the server
@@ -131,30 +93,17 @@ export async function handleUserAddedToTeamEvent(serverUrl: string, msg: WebSock
    }
    EphemeralStore.startAddingToTeam(teamId);

-    try {
-        setTeamLoading(serverUrl, true);
-        const {operator} = DatabaseManager.getServerDatabaseAndOperator(serverUrl);
-        const {teams, memberships: teamMemberships} = await fetchMyTeam(serverUrl, teamId, true);
+    const {teams, memberships: teamMemberships} = await fetchMyTeam(serverUrl, teamId, true);

-        await fetchAndStoreJoinedTeamInfo(serverUrl, operator, teamId, teams, teamMemberships);
-    } catch (error) {
-        logDebug('could not handle user added to team websocket event');
-    }
-    setTeamLoading(serverUrl, false);
-    EphemeralStore.finishAddingToTeam(teamId);
-}
-
-const fetchAndStoreJoinedTeamInfo = async (serverUrl: string, operator: ServerDataOperator, teamId: string, teams?: Team[], teamMemberships?: TeamMembership[]) => {
    const modelPromises: Array<Promise<Model[]>> = [];
    if (teams?.length && teamMemberships?.length) {
        const {channels, memberships, categories} = await fetchMyChannelsForTeam(serverUrl, teamId, false, 0, true);
-        modelPromises.push(prepareCategoriesAndCategoriesChannels(operator, categories || [], true));
+        modelPromises.push(prepareCategories(operator, categories));
+        modelPromises.push(prepareCategoryChannels(operator, categories));
        modelPromises.push(...await prepareMyChannelsForTeam(operator, teamId, channels || [], memberships || []));

        const {roles} = await fetchRoles(serverUrl, teamMemberships, memberships, undefined, true);
-        if (roles?.length) {
-            modelPromises.push(operator.handleRole({roles, prepareRecordsOnly: true}));
-        }
+        modelPromises.push(operator.handleRole({roles, prepareRecordsOnly: true}));
    }

    if (teams && teamMemberships) {
@@ -163,4 +112,6 @@ const fetchAndStoreJoinedTeamInfo = async (serverUrl: string, operator: ServerDa

    const models = await Promise.all(modelPromises);
    await operator.batchRecords(models.flat());
-};
+
+    EphemeralStore.finishAddingToTeam(teamId);
+}
--- a/app/actions/websocket/threads.ts
+++ b/app/actions/websocket/threads.ts
@@ -2,22 +2,12 @@
 // See LICENSE.txt for license information.

 import {markTeamThreadsAsRead, processReceivedThreads, updateThread} from '@actions/local/thread';
-import {getCurrentTeamId} from '@app/queries/servers/system';
-import DatabaseManager from '@database/manager';
 import EphemeralStore from '@store/ephemeral_store';

 export async function handleThreadUpdatedEvent(serverUrl: string, msg: WebSocketMessage): Promise<void> {
    try {
-        const database = DatabaseManager.serverDatabases[serverUrl]?.database;
-        if (!database) {
-            return;
-        }
        const thread: Thread = JSON.parse(msg.data.thread);
-        let teamId = msg.broadcast.team_id;
-
-        if (!teamId) {
-            teamId = await getCurrentTeamId(database);
-        }
+        const teamId = msg.broadcast.team_id;

        // Mark it as following
        thread.is_following = true;
--- a/app/actions/websocket/users.ts
+++ b/app/actions/websocket/users.ts
@@ -1,6 +1,7 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.

+import {Model} from '@nozbe/watermelondb';
 import {DeviceEventEmitter} from 'react-native';

 import {updateChannelsDisplayName} from '@actions/local/channel';
@@ -15,8 +16,6 @@ import {getConfig, getLicense} from '@queries/servers/system';
 import {getCurrentUser} from '@queries/servers/user';
 import {displayUsername} from '@utils/user';

-import type {Model} from '@nozbe/watermelondb';
-
 export async function handleUserUpdatedEvent(serverUrl: string, msg: WebSocketMessage) {
    const operator = DatabaseManager.serverDatabases[serverUrl]?.operator;
    if (!operator) {
--- a/app/client/graphQL/entry.ts
+++ b/app/client/graphQL/entry.ts
@@ -1,12 +1,11 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
+import {Client} from '@client/rest';
 import {MEMBERS_PER_PAGE} from '@constants/graphql';
 import NetworkManager from '@managers/network_manager';

 import QueryNames from './constants';

-import type {Client} from '@client/rest';
-
 const doGQLQuery = async (serverUrl: string, query: string, variables: {[name: string]: any}, operationName: string) => {
    let client: Client;
    try {
--- a/app/client/rest/base.ts
+++ b/app/client/rest/base.ts
@@ -177,14 +177,10 @@ export default class ClientBase {
        return `${this.getEmojisRoute()}/${emojiId}`;
    }

-    getGlobalDataRetentionRoute() {
+    getDataRetentionRoute() {
        return `${this.urlVersion}/data_retention`;
    }

-    getGranularDataRetentionRoute(userId: string) {
-        return `${this.getUserRoute(userId)}/data_retention`;
-    }
-
    getRolesRoute() {
        return `${this.urlVersion}/roles`;
    }
--- a/app/client/rest/files.ts
+++ b/app/client/rest/files.ts
@@ -1,9 +1,9 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.

-import {toMilliseconds} from '@utils/datetime';
+import {ClientResponse, ClientResponseError, ProgressPromise, UploadRequestOptions} from '@mattermost/react-native-network-client';

-import type {ClientResponse, ClientResponseError, ProgressPromise, UploadRequestOptions} from '@mattermost/react-native-network-client';
+import {toMilliseconds} from '@utils/datetime';

 export interface ClientFilesMix {
    getFileUrl: (fileId: string, timestamp: number) => string;
--- a/app/client/rest/general.ts
+++ b/app/client/rest/general.ts
@@ -3,14 +3,8 @@

 import {buildQueryString} from '@utils/helpers';

-import {PER_PAGE_DEFAULT} from './constants';
 import ClientError from './error';

-type PoliciesResponse<T> = {
-    policies: T[];
-    total_count: number;
-}
-
 export interface ClientGeneralMix {
    getOpenGraphMetadata: (url: string) => Promise<any>;
    ping: (deviceId?: string, timeoutInterval?: number) => Promise<any>;
@@ -18,9 +12,7 @@ export interface ClientGeneralMix {
    getClientConfigOld: () => Promise<ClientConfig>;
    getClientLicenseOld: () => Promise<ClientLicense>;
    getTimezones: () => Promise<string[]>;
-    getGlobalDataRetentionPolicy: () => Promise<GlobalDataRetentionPolicy>;
-    getTeamDataRetentionPolicies: (userId: string, page?: number, perPage?: number) => Promise<PoliciesResponse<TeamDataRetentionPolicy>>;
-    getChannelDataRetentionPolicies: (userId: string, page?: number, perPage?: number) => Promise<PoliciesResponse<ChannelDataRetentionPolicy>>;
+    getDataRetentionPolicy: () => Promise<any>;
    getRolesByNames: (rolesNames: string[]) => Promise<Role[]>;
    getRedirectLocation: (urlParam: string) => Promise<Record<string, string>>;
 }
@@ -82,23 +74,9 @@ const ClientGeneral = (superclass: any) => class extends superclass {
        );
    };

-    getGlobalDataRetentionPolicy = () => {
+    getDataRetentionPolicy = () => {
        return this.doFetch(
-            `${this.getGlobalDataRetentionRoute()}/policy`,
-            {method: 'get'},
-        );
-    };
-
-    getTeamDataRetentionPolicies = (userId: string, page = 0, perPage = PER_PAGE_DEFAULT) => {
-        return this.doFetch(
-            `${this.getGranularDataRetentionRoute(userId)}/team_policies${buildQueryString({page, per_page: perPage})}`,
-            {method: 'get'},
-        );
-    };
-
-    getChannelDataRetentionPolicies = (userId: string, page = 0, perPage = PER_PAGE_DEFAULT) => {
-        return this.doFetch(
-            `${this.getGranularDataRetentionRoute(userId)}/channel_policies${buildQueryString({page, per_page: perPage})}`,
+            `${this.getDataRetentionRoute()}/policy`,
            {method: 'get'},
        );
    };
--- a/app/client/rest/teams.ts
+++ b/app/client/rest/teams.ts
@@ -18,10 +18,7 @@ export interface ClientTeamsMix {
    getMyTeamMembers: () => Promise<TeamMembership[]>;
    getTeamMembers: (teamId: string, page?: number, perPage?: number) => Promise<TeamMembership[]>;
    getTeamMember: (teamId: string, userId: string) => Promise<TeamMembership>;
-    getTeamMembersByIds: (teamId: string, userIds: string[]) => Promise<TeamMembership[]>;
    addToTeam: (teamId: string, userId: string) => Promise<TeamMembership>;
-    addUsersToTeamGracefully: (teamId: string, userIds: string[]) => Promise<TeamMemberWithError[]>;
-    sendEmailInvitesToTeamGracefully: (teamId: string, emails: string[]) => Promise<TeamInviteWithError[]>;
    joinTeam: (inviteId: string) => Promise<TeamMembership>;
    removeFromTeam: (teamId: string, userId: string) => Promise<any>;
    getTeamStats: (teamId: string) => Promise<any>;
@@ -123,13 +120,6 @@ const ClientTeams = (superclass: any) => class extends superclass {
        );
    };

-    getTeamMembersByIds = (teamId: string, userIds: string[]) => {
-        return this.doFetch(
-            `${this.getTeamMembersRoute(teamId)}/ids`,
-            {method: 'post', body: userIds},
-        );
-    };
-
    addToTeam = async (teamId: string, userId: string) => {
        this.analytics.trackAPI('api_teams_invite_members', {team_id: teamId});

@@ -140,27 +130,6 @@ const ClientTeams = (superclass: any) => class extends superclass {
        );
    };

-    addUsersToTeamGracefully = (teamId: string, userIds: string[]) => {
-        this.analytics.trackAPI('api_teams_batch_add_members', {team_id: teamId, count: userIds.length});
-
-        const members: Array<{team_id: string; user_id: string}> = [];
-        userIds.forEach((id) => members.push({team_id: teamId, user_id: id}));
-
-        return this.doFetch(
-            `${this.getTeamMembersRoute(teamId)}/batch?graceful=true`,
-            {method: 'post', body: members},
-        );
-    };
-
-    sendEmailInvitesToTeamGracefully = (teamId: string, emails: string[]) => {
-        this.analytics.trackAPI('api_teams_invite_members', {team_id: teamId});
-
-        return this.doFetch(
-            `${this.getTeamRoute(teamId)}/invite/email?graceful=true`,
-            {method: 'post', body: emails},
-        );
-    };
-
    joinTeam = async (inviteId: string) => {
        const query = buildQueryString({invite_id: inviteId});
        return this.doFetch(
--- a/app/client/websocket/index.ts
+++ b/app/client/websocket/index.ts
@@ -33,7 +33,6 @@ export default class WebSocketClient {
    private firstConnectCallback?: () => void;
    private missedEventsCallback?: () => void;
    private reconnectCallback?: () => void;
-    private reliableReconnectCallback?: () => void;
    private errorCallback?: Function;
    private closeCallback?: (connectFailCount: number, lastDisconnect: number) => void;
    private connectingCallback?: () => void;
@@ -149,11 +148,8 @@ export default class WebSocketClient {
                logInfo('websocket re-established connection to', this.url);
                if (!reliableWebSockets && this.reconnectCallback) {
                    this.reconnectCallback();
-                } else if (reliableWebSockets) {
-                    this.reliableReconnectCallback?.();
-                    if (this.serverSequence && this.missedEventsCallback) {
-                        this.missedEventsCallback();
-                    }
+                } else if (reliableWebSockets && this.serverSequence && this.missedEventsCallback) {
+                    this.missedEventsCallback();
                }
            } else if (this.firstConnectCallback) {
                logInfo('websocket connected to', this.url);
@@ -299,10 +295,6 @@ export default class WebSocketClient {
        this.reconnectCallback = callback;
    }

-    public setReliableReconnectCallback(callback: () => void) {
-        this.reliableReconnectCallback = callback;
-    }
-
    public setErrorCallback(callback: Function) {
        this.errorCallback = callback;
    }
--- a/app/components/announcement_banner/announcement_banner.tsx
+++ b/app/components/announcement_banner/announcement_banner.tsx
@@ -9,7 +9,6 @@ import {
    View,
 } from 'react-native';
 import Animated, {useAnimatedStyle, useSharedValue, withTiming} from 'react-native-reanimated';
-import {useSafeAreaInsets} from 'react-native-safe-area-context';

 import {dismissAnnouncement} from '@actions/local/systems';
 import CompassIcon from '@components/compass_icon';
@@ -18,8 +17,6 @@ import {ANNOUNCEMENT_BAR_HEIGHT} from '@constants/view';
 import {useServerUrl} from '@context/server';
 import {useTheme} from '@context/theme';
 import {bottomSheet} from '@screens/navigation';
-import {bottomSheetSnapPoint} from '@utils/helpers';
-import {getMarkdownTextStyles} from '@utils/markdown';
 import {changeOpacity, makeStyleSheetFromTheme} from '@utils/theme';
 import {typography} from '@utils/typography';

@@ -84,11 +81,9 @@ const AnnouncementBanner = ({
    const intl = useIntl();
    const serverUrl = useServerUrl();
    const height = useSharedValue(0);
-    const {bottom} = useSafeAreaInsets();
    const theme = useTheme();
    const [visible, setVisible] = useState(false);
    const style = getStyle(theme);
-    const markdownTextStyles = getMarkdownTextStyles(theme);

    const renderContent = useCallback(() => (
        <ExpandedAnnouncementBanner
@@ -103,20 +98,19 @@ const AnnouncementBanner = ({
            defaultMessage: 'Announcement',
        });

-        const snapPoint = bottomSheetSnapPoint(
-            1,
-            SNAP_POINT_WITHOUT_DISMISS + (allowDismissal ? DISMISS_BUTTON_HEIGHT : 0),
-            bottom,
-        );
+        let snapPoint = SNAP_POINT_WITHOUT_DISMISS;
+        if (allowDismissal) {
+            snapPoint += DISMISS_BUTTON_HEIGHT;
+        }

        bottomSheet({
            closeButtonId: CLOSE_BUTTON_ID,
            title,
            renderContent,
-            snapPoints: [1, snapPoint],
+            snapPoints: [snapPoint, 10],
            theme,
        });
-    }, [theme.sidebarHeaderTextColor, intl.locale, renderContent, allowDismissal, bottom]);
+    }, [theme.sidebarHeaderTextColor, intl.locale, renderContent, allowDismissal]);

    const handleDismiss = useCallback(() => {
        dismissAnnouncement(serverUrl, bannerText);
@@ -167,8 +161,7 @@ const AnnouncementBanner = ({
                                {'  '}
                                <RemoveMarkdown
                                    value={bannerText}
-                                    textStyle={markdownTextStyles}
-                                    baseStyle={style.bannerText}
+                                    textStyle={style.bannerText}
                                />
                            </Text>
                        </TouchableOpacity>
--- a/app/components/announcement_banner/expanded_announcement_banner.tsx
+++ b/app/components/announcement_banner/expanded_announcement_banner.tsx
@@ -1,11 +1,11 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.

-import {BottomSheetScrollView} from '@gorhom/bottom-sheet';
 import React, {useCallback, useMemo} from 'react';
 import {useIntl} from 'react-intl';
-import {ScrollView, Text, View} from 'react-native';
+import {Text, View} from 'react-native';
 import Button from 'react-native-button';
+import {ScrollView} from 'react-native-gesture-handler';
 import {useSafeAreaInsets} from 'react-native-safe-area-context';

 import {dismissAnnouncement} from '@actions/local/systems';
@@ -84,8 +84,6 @@ const ExpandedAnnouncementBanner = ({
        return [style.container, {marginBottom: insets.bottom + 10}];
    }, [style, insets.bottom]);

-    const Scroll = useMemo(() => (isTablet ? ScrollView : BottomSheetScrollView), [isTablet]);
-
    return (
        <View style={containerStyle}>
            {!isTablet && (
@@ -96,7 +94,7 @@ const ExpandedAnnouncementBanner = ({
                    })}
                </Text>
            )}
-            <Scroll
+            <ScrollView
                style={style.scrollContainer}
            >
                <Markdown
@@ -108,7 +106,7 @@ const ExpandedAnnouncementBanner = ({
                    theme={theme}
                    location={Screens.BOTTOM_SHEET}
                />
-            </Scroll>
+            </ScrollView>
            <Button
                containerStyle={buttonStyles.okay.button}
                onPress={close}
--- a/app/components/autocomplete/autocomplete.tsx
+++ b/app/components/autocomplete/autocomplete.tsx
@@ -31,9 +31,8 @@ const getStyleFromTheme = makeStyleSheetFromTheme((theme) => {
            elevation: 3,
        },
        shadow: {
-            backgroundColor: theme.centerChannelBg,
            shadowColor: '#000',
-            shadowOpacity: 1,
+            shadowOpacity: 0.12,
            shadowRadius: 6,
            shadowOffset: {
                width: 0,
@@ -116,7 +115,7 @@ const Autocomplete = ({
    }, [growDown, position]);

    const containerStyles = useMemo(() => {
-        const s: StyleProp<ViewStyle> = [style.base, containerAnimatedStyle];
+        const s = [style.base, containerAnimatedStyle];
        if (hasElements) {
            s.push(style.borders);
        }
--- a/app/components/autocomplete/slash_suggestion/app_command_parser/app_command_parser.ts
+++ b/app/components/autocomplete/slash_suggestion/app_command_parser/app_command_parser.ts
@@ -1,6 +1,9 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.

+import {Database} from '@nozbe/watermelondb';
+import {IntlShape} from 'react-intl';
+
 import {doAppFetchForm, doAppLookup} from '@actions/remote/apps';
 import {fetchChannelById, fetchChannelByName, searchChannels} from '@actions/remote/channel';
 import {fetchUsersByIds, fetchUsersByUsernames, searchUsers} from '@actions/remote/user';
@@ -14,10 +17,8 @@ import {createCallRequest, filterEmptyOptions} from '@utils/apps';

 import {getChannelSuggestions, getUserSuggestions, inTextMentionSuggestions} from './mentions';

-import type {Database} from '@nozbe/watermelondb';
 import type ChannelModel from '@typings/database/models/servers/channel';
 import type UserModel from '@typings/database/models/servers/user';
-import type {IntlShape} from 'react-intl';

 /* eslint-disable max-lines */

@@ -545,7 +546,7 @@ export class ParsedCommand {
                            this.incomplete += c;
                            this.i++;
                            if (escaped) {
-                                //TODO: handle \n, \t, other escaped chars https://mattermost.atlassian.net/browse/MM-43476
+                                //TODO: handle \n, \t, other escaped chars
                                escaped = false;
                            }
                            break;
@@ -734,7 +735,7 @@ export class ParsedCommand {
                            this.incomplete += c;
                            this.i++;
                            if (escaped) {
-                                //TODO: handle \n, \t, other escaped chars https://mattermost.atlassian.net/browse/MM-43476
+                                //TODO: handle \n, \t, other escaped chars
                                escaped = false;
                            }
                            break;
@@ -983,9 +984,6 @@ export class AppCommandParser {
                                break;
                            }
                            user = res.users[0] || res.existingUsers[0];
-                            if (!user) {
-                                break;
-                            }
                        }
                        parsed.values[f.name] = user.username;
                        break;
@@ -1000,9 +998,6 @@ export class AppCommandParser {
                                break;
                            }
                            channel = res.channel;
-                            if (!channel) {
-                                break;
-                            }
                        }
                        parsed.values[f.name] = channel.name;
                        break;
@@ -1078,7 +1073,7 @@ export class AppCommandParser {
        }

        // Add "Execute Current Command" suggestion
-        // TODO get full text from SuggestionBox https://mattermost.atlassian.net/browse/MM-43477
+        // TODO get full text from SuggestionBox
        const executableStates: string[] = [
            ParseState.EndCommand,
            ParseState.CommandSeparator,
@@ -1181,21 +1176,14 @@ export class AppCommandParser {

        const errors: {[key: string]: string} = {};
        await Promise.all(parsed.resolvedForm.fields.map(async (f) => {
-            const fieldValue = values[f.name];
-            if (!fieldValue) {
+            if (!values[f.name]) {
                return;
            }
            switch (f.type) {
                case AppFieldTypes.DYNAMIC_SELECT:
-                    if (f.multiselect) {
-                        let commandValues: string[] = [];
-                        if (Array.isArray(fieldValue)) {
-                            commandValues = fieldValue as string[];
-                        } else {
-                            commandValues = [fieldValue] as string[];
-                        }
-
+                    if (f.multiselect && Array.isArray(values[f.name])) {
                        const options: AppSelectOption[] = [];
+                        const commandValues = values[f.name] as string[];
                        for (const value of commandValues) {
                            if (options.find((o) => o.value === value)) {
                                errors[f.name] = this.intl.formatMessage({
@@ -1211,7 +1199,7 @@ export class AppCommandParser {
                        break;
                    }

-                    values[f.name] = {label: fieldValue, value: fieldValue};
+                    values[f.name] = {label: values[f.name], value: values[f.name]};
                    break;
                case AppFieldTypes.STATIC_SELECT: {
                    const getOption = (value: string) => {
@@ -1229,15 +1217,9 @@ export class AppCommandParser {
                        values[f.name] = undefined;
                    };

-                    if (f.multiselect) {
-                        let commandValues: string[] = [];
-                        if (Array.isArray(fieldValue)) {
-                            commandValues = fieldValue as string[];
-                        } else {
-                            commandValues = [fieldValue] as string[];
-                        }
-
+                    if (f.multiselect && Array.isArray(values[f.name])) {
                        const options: AppSelectOption[] = [];
+                        const commandValues = values[f.name] as string[];
                        for (const value of commandValues) {
                            const option = getOption(value);
                            if (!option) {
@@ -1259,9 +1241,9 @@ export class AppCommandParser {
                        break;
                    }

-                    const option = getOption(fieldValue);
+                    const option = getOption(values[f.name]);
                    if (!option) {
-                        setOptionError(fieldValue);
+                        setOptionError(values[f.name]);
                        return;
                    }
                    values[f.name] = option;
@@ -1290,15 +1272,9 @@ export class AppCommandParser {
                        });
                    };

-                    if (f.multiselect) {
-                        let commandValues: string[] = [];
-                        if (Array.isArray(fieldValue)) {
-                            commandValues = fieldValue as string[];
-                        } else {
-                            commandValues = [fieldValue] as string[];
-                        }
-
+                    if (f.multiselect && Array.isArray(values[f.name])) {
                        const options: AppSelectOption[] = [];
+                        const commandValues = values[f.name] as string[];
                        /* eslint-disable no-await-in-loop */
                        for (const value of commandValues) {
                            let userName = value;
@@ -1362,15 +1338,9 @@ export class AppCommandParser {
                        });
                    };

-                    if (f.multiselect) {
-                        let commandValues: string[] = [];
-                        if (Array.isArray(fieldValue)) {
-                            commandValues = fieldValue as string[];
-                        } else {
-                            commandValues = [fieldValue] as string[];
-                        }
-
+                    if (f.multiselect && Array.isArray(values[f.name])) {
                        const options: AppSelectOption[] = [];
+                        const commandValues = values[f.name] as string[];
                        /* eslint-disable no-await-in-loop */
                        for (const value of commandValues) {
                            let channelName = value;
@@ -1462,7 +1432,8 @@ export class AppCommandParser {
    // getCommandBindings returns the commands in the redux store.
    // They are grouped by app id since each app has one base command
    private getCommandBindings = (): AppBinding[] => {
-        return AppsManager.getBindings(this.serverUrl, AppBindingLocations.COMMAND, Boolean(this.rootPostID));
+        const bindings = AppsManager.getBindings(this.serverUrl, AppBindingLocations.COMMAND, Boolean(this.rootPostID));
+        return bindings.reduce<AppBinding[]>((acc, v) => (v.bindings ? acc.concat(v.bindings) : acc), []);
    };

    // getChannel gets the channel in which the user is typing the command
@@ -1714,13 +1685,7 @@ export class AppCommandParser {
            prefix = '';
        }

-        const applicable = parsed.resolvedForm.fields.filter((field) => (
-            field.label &&
-            field.label.toLowerCase().startsWith(parsed.incomplete.toLowerCase()) &&
-            !parsed.values[field.name] &&
-            !field.readonly &&
-            field.type !== AppFieldTypes.MARKDOWN
-        ));
+        const applicable = parsed.resolvedForm.fields.filter((field) => field.label && field.label.toLowerCase().startsWith(parsed.incomplete.toLowerCase()) && !parsed.values[field.name]);
        if (applicable) {
            return applicable.map((f) => {
                return {
--- a/app/components/autocomplete/slash_suggestion/app_slash_suggestion/app_slash_suggestion.tsx
+++ b/app/components/autocomplete/slash_suggestion/app_slash_suggestion/app_slash_suggestion.tsx
@@ -15,6 +15,9 @@ import analytics from '@managers/analytics';
 import {AppCommandParser, ExtendedAutocompleteSuggestion} from '../app_command_parser/app_command_parser';
 import SlashSuggestionItem from '../slash_suggestion_item';

+import type ChannelModel from '@typings/database/models/servers/channel';
+import type UserModel from '@typings/database/models/servers/user';
+
 export type Props = {
    currentTeamId: string;
    isSearch?: boolean;
@@ -28,20 +31,7 @@ export type Props = {
    listStyle: StyleProp<ViewStyle>;
 };

-const keyExtractor = (item: ExtendedAutocompleteSuggestion): string => {
-    switch (item.type) {
-        case COMMAND_SUGGESTION_USER: {
-            const user = item.item as UserProfile;
-            return user.id;
-        }
-        case COMMAND_SUGGESTION_CHANNEL: {
-            const channel = item.item as Channel;
-            return channel.id;
-        }
-        default:
-            return item.Suggestion;
-    }
-};
+const keyExtractor = (item: ExtendedAutocompleteSuggestion): string => item.Suggestion + item.type + item.item;

 const emptySuggestonList: AutocompleteSuggestion[] = [];

@@ -106,34 +96,28 @@ const AppSlashSuggestion = ({

    const renderItem = useCallback(({item}: {item: ExtendedAutocompleteSuggestion}) => {
        switch (item.type) {
-            case COMMAND_SUGGESTION_USER: {
-                const user = item.item as UserProfile | undefined;
-                if (!user) {
+            case COMMAND_SUGGESTION_USER:
+                if (!item.item) {
                    return null;
                }
-
                return (
                    <AtMentionItem
-                        user={user}
+                        user={item.item as UserProfile | UserModel}
                        onPress={completeIgnoringSuggestion(item.Complete)}
                        testID='autocomplete.slash_suggestion.at_mention_item'
                    />
                );
-            }
-            case COMMAND_SUGGESTION_CHANNEL: {
-                const channel = item.item as Channel | undefined;
-                if (!channel) {
+            case COMMAND_SUGGESTION_CHANNEL:
+                if (!item.item) {
                    return null;
                }
-
                return (
                    <ChannelMentionItem
-                        channel={channel}
+                        channel={item.item as Channel | ChannelModel}
                        onPress={completeIgnoringSuggestion(item.Complete)}
                        testID='autocomplete.slash_suggestion.channel_mention_item'
                    />
                );
-            }
            default:
                return (
                    <SlashSuggestionItem
--- a/app/components/autocomplete/slash_suggestion/slash_suggestion.tsx
+++ b/app/components/autocomplete/slash_suggestion/slash_suggestion.tsx
@@ -19,7 +19,7 @@ import IntegrationsManager from '@managers/integrations_manager';
 import {AppCommandParser} from './app_command_parser/app_command_parser';
 import SlashSuggestionItem from './slash_suggestion_item';

-// TODO: Remove when all below commands have been implemented https://mattermost.atlassian.net/browse/MM-43478
+// TODO: Remove when all below commands have been implemented
 const COMMANDS_TO_IMPLEMENT_LATER = ['collapse', 'expand', 'logout'];
 const NON_MOBILE_COMMANDS = ['shortcuts', 'search', 'settings'];

--- a/app/components/autocomplete/slash_suggestion/slash_suggestion_item.tsx
+++ b/app/components/autocomplete/slash_suggestion/slash_suggestion_item.tsx
@@ -33,6 +33,9 @@ const getStyleFromTheme = makeStyleSheetFromTheme((theme: Theme) => {
            width: 16,
            height: 16,
        },
+        iconColor: {
+            tintColor: theme.centerChannelColor,
+        },
        container: {
            flexDirection: 'row',
            alignItems: 'center',
@@ -107,8 +110,7 @@ const SlashSuggestionItem = ({

    let image = (
        <FastImage
-            tintColor={theme.centerChannelColor}
-            style={style.slashIcon}
+            style={[style.iconColor, style.slashIcon]}
            source={slashIcon}
        />
    );
--- a/app/components/autocomplete_selector/index.tsx
+++ b/app/components/autocomplete_selector/index.tsx
@@ -33,12 +33,12 @@ type AutoCompleteSelectorProps = {
    getDynamicOptions?: (userInput?: string) => Promise<DialogOption[]>;
    helpText?: string;
    label?: string;
-    onSelected?: (value: SelectedDialogOption) => void;
+    onSelected?: (value: string | string[]) => void;
    optional?: boolean;
-    options?: DialogOption[];
+    options?: PostActionOption[];
    placeholder?: string;
    roundedBorders?: boolean;
-    selected?: SelectedDialogValue;
+    selected?: string | string[];
    showRequiredAsterisk?: boolean;
    teammateNameDisplay: string;
    isMultiselect?: boolean;
@@ -89,11 +89,7 @@ const getStyleSheet = makeStyleSheetFromTheme((theme: Theme) => {
    };
 });

-async function getItemName(serverUrl: string, selected: string, teammateNameDisplay: string, intl: IntlShape, dataSource?: string, options?: DialogOption[]): Promise<string> {
-    if (!selected) {
-        return '';
-    }
-
+async function getItemName(serverUrl: string, selected: string, teammateNameDisplay: string, intl: IntlShape, dataSource?: string, options?: PostActionOption[]) {
    const database = DatabaseManager.serverDatabases[serverUrl]?.database;

    switch (dataSource) {
@@ -101,7 +97,6 @@ async function getItemName(serverUrl: string, selected: string, teammateNameDisp
            if (!database) {
                return intl.formatMessage({id: 'channel_loader.someone', defaultMessage: 'Someone'});
            }
-
            const user = await getUserById(database, selected);
            return displayUsername(user, intl.locale, teammateNameDisplay, true);
        }
@@ -109,17 +104,15 @@ async function getItemName(serverUrl: string, selected: string, teammateNameDisp
            if (!database) {
                return intl.formatMessage({id: 'autocomplete_selector.unknown_channel', defaultMessage: 'Unknown channel'});
            }
-
            const channel = await getChannelById(database, selected);
            return channel?.displayName || intl.formatMessage({id: 'autocomplete_selector.unknown_channel', defaultMessage: 'Unknown channel'});
        }
+        default:
+            return options?.find((o) => o.value === selected)?.text || selected;
    }
-
-    const option = options?.find((opt) => opt.value === selected);
-    return option?.text || '';
 }

-function getTextAndValueFromSelectedItem(item: Selection, teammateNameDisplay: string, locale: string, dataSource?: string) {
+function getTextAndValueFromSelectedItem(item: DialogOption | Channel | UserProfile, teammateNameDisplay: string, locale: string, dataSource?: string) {
    if (dataSource === ViewConstants.DATA_SOURCE_USERS) {
        const user = item as UserProfile;
        return {text: displayUsername(user, locale, teammateNameDisplay), value: user.id};
@@ -127,7 +120,8 @@ function getTextAndValueFromSelectedItem(item: Selection, teammateNameDisplay: s
        const channel = item as Channel;
        return {text: channel.display_name, value: channel.id};
    }
-    return item as DialogOption;
+    const option = item as DialogOption;
+    return option;
 }

 function AutoCompleteSelector({
@@ -146,25 +140,31 @@ function AutoCompleteSelector({
        goToScreen(screen, title, {dataSource, handleSelect, options, getDynamicOptions, selected, isMultiselect, teammateNameDisplay});
    }), [dataSource, options, getDynamicOptions]);

-    const handleSelect = useCallback((newSelection?: Selection) => {
-        if (!newSelection) {
+    const handleSelect = useCallback((item?: Selection) => {
+        if (!item) {
            return;
        }

-        if (!Array.isArray(newSelection)) {
-            const selectedOption = getTextAndValueFromSelectedItem(newSelection, teammateNameDisplay, intl.locale, dataSource);
-            setItemText(selectedOption.text);
+        if (!Array.isArray(item)) {
+            const {text: selectedText, value: selectedValue} = getTextAndValueFromSelectedItem(item, teammateNameDisplay, intl.locale, dataSource);
+            setItemText(selectedText);

            if (onSelected) {
-                onSelected(selectedOption);
+                onSelected(selectedValue);
            }
            return;
        }

-        const selectedOptions = newSelection.map((option) => getTextAndValueFromSelectedItem(option, teammateNameDisplay, intl.locale, dataSource));
-        setItemText(selectedOptions.map((option) => option.text).join(', '));
+        const allSelectedTexts = [];
+        const allSelectedValues = [];
+        for (const i of item) {
+            const {text: selectedText, value: selectedValue} = getTextAndValueFromSelectedItem(i, teammateNameDisplay, intl.locale, dataSource);
+            allSelectedTexts.push(selectedText);
+            allSelectedValues.push(selectedValue);
+        }
+        setItemText(allSelectedTexts.join(', '));
        if (onSelected) {
-            onSelected(selectedOptions);
+            onSelected(allSelectedValues);
        }
    }, [teammateNameDisplay, intl, dataSource]);

--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Jason Frerich	891a4676b7	Merge branch 'main' into MM-47468-clear-DM-search-bar	2022-11-26 22:17:15 -06:00
Jason Frerich	6139edb35a	useEffect should depend on props.value as it is a controlled component	2022-10-13 14:15:19 -05:00