Fix

.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+$/
+      # - 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
+      # - github-release:
+      #     context: mattermost-mobile-unsigned
+      #     requires:
+      #       - build-android-unsigned
+      #       - build-ios-unsigned
+      #     filters:
+      #       tags:
+      #         only: /^v(\d+\.)(\d+\.)(\d+)(.*)?$/
+      #       branches:
+      #         only: unsigned

.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]
@@ -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*

ISSUE_TEMPLATE.md

@@ -1,4 +1,4 @@
-Submit feature requests to https://mattermost.com/suggestions/. 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.

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.
@@ -2824,38 +2791,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 +2962,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

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",
+    ],
+)

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 457
-        versionName "2.1.0"
+        versionCode 446
+        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 {
@@ -147,7 +240,6 @@ android {
         release {
             minifyEnabled enableProguardInReleaseBuilds
             proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
-            proguardFile "${rootProject.projectDir}/../node_modules/detox/android/detox/proguard-rules-app.pro"
             if (useReleaseKey) {
                 signingConfig signingConfigs.release
             } else {
@@ -189,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'
@@ -237,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'
             }
         }
     }
@@ -258,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"
+}

android/app/src/debug/java/com/rn/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());

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"/>
@@ -12,7 +12,6 @@
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.RECORD_AUDIO" />
     <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
-    <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
 
     <!-- Request legacy Bluetooth permissions on older devices. -->
     <uses-permission android:name="android.permission.BLUETOOTH"

android/app/src/main/java/com/mattermost/helpers/BitmapCache.kt

@@ -1,28 +0,0 @@
-package com.mattermost.helpers
-
-import android.graphics.Bitmap
-import android.util.LruCache
-
-class BitmapCache {
-    private var memoryCache: LruCache<String, Bitmap>
-
-    init {
-        val maxMemory = (Runtime.getRuntime().maxMemory() / 1024).toInt()
-        val cacheSize = maxMemory / 8
-        memoryCache = object : LruCache<String, Bitmap>(cacheSize) {
-            override fun sizeOf(key: String, bitmap: Bitmap): Int {
-                return bitmap.byteCount / 1024
-            }
-        }
-    }
-
-    fun getBitmapFromMemCache(key: String): Bitmap? {
-        return memoryCache.get(key)
-    }
-
-    fun addBitmapToMemoryCache(key: String, bitmap: Bitmap) {
-        if (getBitmapFromMemCache(key) == null) {
-            memoryCache.put(key, bitmap)
-        }
-    }
-}

android/app/src/main/java/com/mattermost/helpers/CustomPushNotificationHelper.java

@@ -7,6 +7,7 @@ import android.app.NotificationManager;
 import android.app.PendingIntent;
 import android.content.Context;
 import android.content.Intent;
+import android.content.res.Resources;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.graphics.Canvas;
@@ -27,6 +28,7 @@ import androidx.core.app.Person;
 import androidx.core.app.RemoteInput;
 import androidx.core.graphics.drawable.IconCompat;
 
+import com.facebook.react.bridge.ReactApplicationContext;
 import com.mattermost.rnbeta.*;
 
 import java.io.IOException;
@@ -51,16 +53,11 @@ public class CustomPushNotificationHelper {
     private static NotificationChannel mHighImportanceChannel;
     private static NotificationChannel mMinImportanceChannel;
 
-    private static final OkHttpClient client = new OkHttpClient();
-
-    private static final BitmapCache bitmapCache = new BitmapCache();
-
-    private static void addMessagingStyleMessages(NotificationCompat.MessagingStyle messagingStyle, String conversationTitle, Bundle bundle) {
+    private static void addMessagingStyleMessages(Context context, NotificationCompat.MessagingStyle messagingStyle, String conversationTitle, Bundle bundle) {
         String message = bundle.getString("message", bundle.getString("body"));
         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";
         }
@@ -77,7 +74,7 @@ public class CustomPushNotificationHelper {
 
         if (serverUrl != null && !type.equals(CustomPushNotificationHelper.PUSH_TYPE_SESSION)) {
             try {
-                Bitmap avatar = userAvatar(serverUrl, senderId, urlOverride);
+                Bitmap avatar = userAvatar(context, serverUrl, senderId, null);
                 if (avatar != null) {
                     sender.setIcon(IconCompat.createWithBitmap(avatar));
                 }
@@ -179,12 +176,12 @@ public class CustomPushNotificationHelper {
         String groupId = is_crt_enabled && !android.text.TextUtils.isEmpty(rootId) ? rootId : channelId;
 
         addNotificationExtras(notification, bundle);
-        setNotificationIcons(notification, bundle);
-        setNotificationMessagingStyle(notification, bundle);
+        setNotificationIcons(context, notification, bundle);
+        setNotificationMessagingStyle(context, notification, bundle);
         setNotificationGroup(notification, groupId, createSummary);
         setNotificationBadgeType(notification);
 
-        setNotificationChannel(context, notification);
+        setNotificationChannel(notification, bundle);
         setNotificationDeleteIntent(context, notification, bundle, notificationId);
         addNotificationReplyAction(context, notification, bundle, notificationId);
 
@@ -256,12 +253,19 @@ public class CustomPushNotificationHelper {
         return title;
     }
 
-    private static NotificationCompat.MessagingStyle getMessagingStyle(Bundle bundle) {
+    private static int getIconResourceId(Context context, String iconName) {
+        final Resources res = context.getResources();
+        String packageName = context.getPackageName();
+        String defType = "mipmap";
+
+        return res.getIdentifier(iconName, defType, packageName);
+    }
+
+    private static NotificationCompat.MessagingStyle getMessagingStyle(Context context, Bundle bundle) {
         NotificationCompat.MessagingStyle messagingStyle;
         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)
@@ -269,7 +273,7 @@ public class CustomPushNotificationHelper {
 
         if (serverUrl != null && !type.equals(CustomPushNotificationHelper.PUSH_TYPE_SESSION)) {
             try {
-                Bitmap avatar = userAvatar(serverUrl, "me", urlOverride);
+                Bitmap avatar = userAvatar(context, serverUrl, "me", null);
                 if (avatar != null) {
                     sender.setIcon(IconCompat.createWithBitmap(avatar));
                 }
@@ -282,7 +286,7 @@ public class CustomPushNotificationHelper {
 
         String conversationTitle = getConversationTitle(bundle);
         setMessagingStyleConversationTitle(messagingStyle, conversationTitle, bundle);
-        addMessagingStyleMessages(messagingStyle, conversationTitle, bundle);
+        addMessagingStyleMessages(context, messagingStyle, conversationTitle, bundle);
 
         return messagingStyle;
     }
@@ -309,6 +313,25 @@ public class CustomPushNotificationHelper {
         return getConversationTitle(bundle);
     }
 
+    public static int getSmallIconResourceId(Context context, String iconName) {
+        if (iconName == null) {
+            iconName = "ic_notification";
+        }
+
+        int resourceId = getIconResourceId(context, iconName);
+
+        if (resourceId == 0) {
+            iconName = "ic_launcher";
+            resourceId = getIconResourceId(context, iconName);
+
+            if (resourceId == 0) {
+                resourceId = android.R.drawable.ic_dialog_info;
+            }
+        }
+
+        return resourceId;
+    }
+
     private static String removeSenderNameFromMessage(String message, String senderName) {
         int index = message.indexOf(senderName);
         if (index == 0) {
@@ -340,15 +363,12 @@ public class CustomPushNotificationHelper {
         }
     }
 
-    private static void setNotificationChannel(Context context, NotificationCompat.Builder notification) {
+    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());
     }
@@ -364,8 +384,8 @@ public class CustomPushNotificationHelper {
         notification.setDeleteIntent(deleteIntent);
     }
 
-    private static void setNotificationMessagingStyle(NotificationCompat.Builder notification, Bundle bundle) {
-        NotificationCompat.MessagingStyle messagingStyle = getMessagingStyle(bundle);
+    private static void setNotificationMessagingStyle(Context context, NotificationCompat.Builder notification, Bundle bundle) {
+        NotificationCompat.MessagingStyle messagingStyle = getMessagingStyle(context, bundle);
         notification.setStyle(messagingStyle);
     }
 
@@ -378,18 +398,20 @@ public class CustomPushNotificationHelper {
         }
     }
 
-    private static void setNotificationIcons(NotificationCompat.Builder notification, Bundle bundle) {
+    private static void setNotificationIcons(Context context, NotificationCompat.Builder notification, Bundle bundle) {
+        String smallIcon = bundle.getString("smallIcon");
         String channelName = getConversationTitle(bundle);
         String senderName = bundle.getString("sender_name");
         String serverUrl = bundle.getString("server_url");
         String urlOverride = bundle.getString("override_icon_url");
 
-        notification.setSmallIcon(R.mipmap.ic_notification);
+        int smallIconResId = getSmallIconResourceId(context, smallIcon);
+        notification.setSmallIcon(smallIconResId);
 
         if (serverUrl != null && channelName.equals(senderName)) {
             try {
                 String senderId = bundle.getString("sender_id");
-                Bitmap avatar = userAvatar(serverUrl, senderId, urlOverride);
+                Bitmap avatar = userAvatar(context, serverUrl, senderId, urlOverride);
                 if (avatar != null) {
                     notification.setLargeIcon(avatar);
                 }
@@ -399,31 +421,29 @@ public class CustomPushNotificationHelper {
         }
     }
 
-    private static Bitmap userAvatar(final String serverUrl, final String userId, final String urlOverride) throws IOException {
+    private static Bitmap userAvatar(Context context, final String serverUrl, final String userId, final String urlOverride) throws IOException {
         try {
-            Response response;
-            if (!TextUtils.isEmpty(urlOverride)) {
-                Request request = new Request.Builder().url(urlOverride).build();
+            final OkHttpClient client = new OkHttpClient();
+            Request request;
+            String url;
+            if (urlOverride != null) {
+                request = new Request.Builder().url(urlOverride).build();
                 Log.i("ReactNative", String.format("Fetch override profile image %s", urlOverride));
-                response = client.newCall(request).execute();
             } else {
-                Bitmap cached = bitmapCache.getBitmapFromMemCache(userId);
-                if (cached != null) {
-                    Bitmap bitmap = cached.copy(cached.getConfig(), false);
-                    return getCircleBitmap(bitmap);
-                }
-                String url = String.format("api/v4/users/%s/image", userId);
+                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));
-                response = Network.getSync(serverUrl, url, null);
+                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);
-                if (TextUtils.isEmpty(urlOverride) && !TextUtils.isEmpty(userId)) {
-                    bitmapCache.addBitmapToMemoryCache(userId, bitmap.copy(bitmap.getConfig(), false));
-                }
                 return getCircleBitmap(bitmap);
             }
 

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
     }

android/app/src/main/java/com/mattermost/helpers/Network.java

@@ -12,7 +12,6 @@ import com.mattermost.networkclient.APIClientModule;
 import com.mattermost.networkclient.enums.RetryTypes;
 
 import okhttp3.HttpUrl;
-import okhttp3.Response;
 
 
 public class Network {
@@ -36,16 +35,6 @@ public class Network {
         clientModule.post(baseUrl, endpoint, options, promise);
     }
 
-    public static Response getSync(String baseUrl, String endpoint, ReadableMap options) {
-        createClientIfNeeded(baseUrl);
-        return clientModule.getSync(baseUrl, endpoint, options);
-    }
-
-    public static Response postSync(String baseUrl, String endpoint, ReadableMap options) {
-        createClientIfNeeded(baseUrl);
-        return clientModule.postSync(baseUrl, endpoint, options);
-    }
-
     private static void createClientOptions() {
         WritableMap headers = Arguments.createMap();
         headers.putString("X-Requested-With", "XMLHttpRequest");

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;
             }

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;
+      }
+    };
+  }
+}

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);
+  }
+}

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;
+    }
+  }
+}

android/app/src/main/java/com/mattermost/rnbeta/CustomPushNotification.java

@@ -7,6 +7,7 @@ import android.os.Bundle;
 import android.text.TextUtils;
 import android.util.Log;
 
+import androidx.annotation.Nullable;
 import androidx.core.app.NotificationCompat;
 
 import java.util.Objects;
@@ -16,6 +17,7 @@ import com.mattermost.helpers.DatabaseHelper;
 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;
@@ -29,6 +31,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 {
@@ -54,31 +57,27 @@ public class CustomPushNotification extends PushNotification {
         boolean isReactInit = mAppLifecycleFacade.isReactInitialized();
 
         if (ackId != null && serverUrl != null) {
-            Bundle response = ReceiptDelivery.send(ackId, serverUrl, postId, type, isIdLoaded);
-            if (isIdLoaded && response != null) {
-                Bundle current = mNotificationProps.asBundle();
-                if (!current.containsKey("server_url")) {
-                    response.putString("server_url", serverUrl);
+            notificationReceiptDelivery(ackId, serverUrl, postId, type, isIdLoaded, new ResolvePromise() {
+                @Override
+                public void resolve(@Nullable Object value) {
+                    if (isIdLoaded) {
+                        Bundle response = (Bundle) value;
+                        if (value != null) {
+                            response.putString("server_url", serverUrl);
+                            Bundle current = mNotificationProps.asBundle();
+                            current.putAll(response);
+                            mNotificationProps = createProps(current);
+                        }
+                    }
                 }
-                current.putAll(response);
-                mNotificationProps = createProps(current);
-            }
+
+                @Override
+                public void reject(String code, String message) {
+                    Log.e("ReactNative", code + ": " + message);
+                }
+            });
         }
 
-        finishProcessingNotification(serverUrl, type, channelId, notificationId, isReactInit);
-    }
-
-    @Override
-    public void onOpened() {
-        if (mNotificationProps != null) {
-            digestNotification();
-
-            Bundle data = mNotificationProps.asBundle();
-            NotificationHelper.clearChannelOrThreadNotifications(mContext, data);
-        }
-    }
-
-    private void finishProcessingNotification(String serverUrl, String type, String channelId, int notificationId, Boolean isReactInit) {
         switch (type) {
             case CustomPushNotificationHelper.PUSH_TYPE_MESSAGE:
             case CustomPushNotificationHelper.PUSH_TYPE_SESSION:
@@ -119,6 +118,16 @@ public class CustomPushNotification extends PushNotification {
         }
     }
 
+    @Override
+    public void onOpened() {
+        if (mNotificationProps != null) {
+            digestNotification();
+
+            Bundle data = mNotificationProps.asBundle();
+            NotificationHelper.clearChannelOrThreadNotifications(mContext, data);
+        }
+    }
+
     private void buildNotification(Integer notificationId, boolean createSummary) {
         final PendingIntent pendingIntent = NotificationIntentAdapter.createPendingNotificationIntent(mContext, mNotificationProps);
         final Notification notification = buildNotification(pendingIntent);
@@ -140,6 +149,10 @@ public class CustomPushNotification extends PushNotification {
         return CustomPushNotificationHelper.createNotificationBuilder(mContext, intent, bundle, true);
     }
 
+    private void notificationReceiptDelivery(String ackId, String serverUrl, String postId, String type, boolean isIdLoaded, ResolvePromise promise) {
+        ReceiptDelivery.send(mContext, ackId, serverUrl, postId, type, isIdLoaded, promise);
+    }
+
     private void notifyReceivedToJS() {
         mJsIOHelper.sendEventToJS(NOTIFICATION_RECEIVED_EVENT_NAME, mNotificationProps.asBundle(), mAppLifecycleFacade.getRunningReactContext());
     }

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
-    }
-}

android/app/src/main/java/com/mattermost/rnbeta/MainActivity.java

@@ -6,36 +6,37 @@ 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
@@ -43,19 +44,6 @@ public class MainActivity extends NavigationActivity {
         super.onCreate(null);
         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

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;
@@ -22,12 +23,11 @@ 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 +36,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;
@@ -70,8 +71,6 @@ public class MainApplication extends NavigationApplication implements INotificat
                     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);
                   }
@@ -84,7 +83,6 @@ public class MainApplication extends NavigationApplication implements INotificat
                     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 +106,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 +141,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 +153,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();
+      }
+    }
+  }
 }

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;

android/app/src/main/java/com/mattermost/rnbeta/NotificationReplyBroadcastReceiver.java

@@ -8,16 +8,28 @@ import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.util.Log;
 
-import androidx.annotation.Nullable;
+import androidx.annotation.NonNull;
 import androidx.core.app.NotificationCompat;
 import androidx.core.app.Person;
 
-import com.facebook.react.bridge.Arguments;
-import com.facebook.react.bridge.WritableMap;
+import android.util.Log;
+import java.io.IOException;
+import java.util.Objects;
+
+import okhttp3.Call;
+import okhttp3.MediaType;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.RequestBody;
+import okhttp3.Response;
+
+import org.json.JSONObject;
+import org.json.JSONException;
 
 import com.mattermost.helpers.*;
+import com.facebook.react.bridge.ReactApplicationContext;
+
 import com.wix.reactnativenotifications.core.NotificationIntentAdapter;
 import com.wix.reactnativenotifications.core.notification.PushNotificationProps;
 
@@ -41,7 +53,12 @@ public class NotificationReplyBroadcastReceiver extends BroadcastReceiver {
             final int notificationId = intent.getIntExtra(CustomPushNotificationHelper.NOTIFICATION_ID, -1);
             final String serverUrl = bundle.getString("server_url");
             if (serverUrl != null) {
-                    replyToMessage(serverUrl, notificationId, message);
+                final ReactApplicationContext reactApplicationContext = new ReactApplicationContext(context);
+                final String token = Credentials.getCredentialsForServerSync(reactApplicationContext, serverUrl);
+
+                if (token != null) {
+                    replyToMessage(serverUrl, token, notificationId, message);
+                }
             } else {
                 onReplyFailed(notificationId);
             }
@@ -50,7 +67,7 @@ public class NotificationReplyBroadcastReceiver extends BroadcastReceiver {
         }
     }
 
-    protected void replyToMessage(final String serverUrl, final int notificationId, final CharSequence message) {
+    protected void replyToMessage(final String serverUrl, final String token, final int notificationId, final CharSequence message) {
         final String channelId = bundle.getString("channel_id");
         final String postId = bundle.getString("post_id");
         String rootId = bundle.getString("root_id");
@@ -58,53 +75,63 @@ public class NotificationReplyBroadcastReceiver extends BroadcastReceiver {
             rootId = postId;
         }
 
-        if (serverUrl == null) {
+        if (token == null || serverUrl == null) {
             onReplyFailed(notificationId);
             return;
         }
 
-        WritableMap headers = Arguments.createMap();
-        headers.putString("Content-Type", "application/json");
-
-
-        WritableMap body = Arguments.createMap();
-        body.putString("channel_id", channelId);
-        body.putString("message", message.toString());
-        body.putString("root_id", rootId);
-
-        WritableMap options = Arguments.createMap();
-        options.putMap("headers", headers);
-        options.putMap("body", body);
+        final OkHttpClient client = new OkHttpClient();
+        final MediaType JSON = MediaType.parse("application/json; charset=utf-8");
+        String json = buildReplyPost(channelId, rootId, message.toString());
+        RequestBody body = RequestBody.create(json, JSON);
 
         String postsEndpoint = "/api/v4/posts?set_online=false";
-        Network.post(serverUrl, postsEndpoint, options, new ResolvePromise() {
+        String url = String.format("%s%s", serverUrl.replaceAll("/$", ""), postsEndpoint);
+        Log.i("ReactNative", String.format("Reply URL=%s", url));
+        Request request = new Request.Builder()
+            .header("Authorization", String.format("Bearer %s", token))
+            .header("Content-Type", "application/json")
+            .url(url)
+            .post(body)
+            .build();
+
+        client.newCall(request).enqueue(new okhttp3.Callback() {
             @Override
-            public void resolve(@Nullable Object value) {
-                if (value != null) {
+            public void onFailure(@NonNull Call call, @NonNull IOException e) {
+                Log.i("ReactNative", String.format("Reply FAILED exception %s", e.getMessage()));
+                onReplyFailed(notificationId);
+            }
+
+            @Override
+            public void onResponse(@NonNull Call call, @NonNull final Response response) throws IOException {
+                if (response.isSuccessful()) {
                     onReplySuccess(notificationId, message);
                     Log.i("ReactNative", "Reply SUCCESS");
                 } else {
-                    Log.i("ReactNative", "Reply FAILED resolved without value");
+                    Log.i("ReactNative",
+                            String.format("Reply FAILED status %s BODY %s",
+                                    response.code(),
+                                    Objects.requireNonNull(response.body()).string()
+                            )
+                    );
                     onReplyFailed(notificationId);
                 }
             }
-
-            @Override
-            public void reject(Throwable reason) {
-                Log.i("ReactNative", String.format("Reply FAILED exception %s", reason.getMessage()));
-                onReplyFailed(notificationId);
-            }
-
-            @Override
-            public void reject(String code, String message) {
-                Log.i("ReactNative",
-                        String.format("Reply FAILED status %s BODY %s", code, message)
-                );
-                onReplyFailed(notificationId);
-            }
         });
     }
 
+    protected String buildReplyPost(String channelId, String rootId, String message) {
+        try {
+            JSONObject json = new JSONObject();
+            json.put("channel_id", channelId);
+            json.put("message", message);
+            json.put("root_id", rootId);
+            return json.toString();
+        } catch(JSONException e) {
+            return "{}";
+        }
+    }
+
     protected void onReplyFailed(int notificationId) {
         recreateNotification(notificationId, "Message failed to send.");
     }

android/app/src/main/java/com/mattermost/rnbeta/ReceiptDelivery.java

@@ -1,60 +1,135 @@
 package com.mattermost.rnbeta;
 
+import android.content.Context;
 import android.os.Bundle;
 import android.util.Log;
-
 import java.lang.System;
 import java.util.Objects;
 
+import okhttp3.MediaType;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.RequestBody;
+import okhttp3.Response;
+import okhttp3.HttpUrl;
+
 import org.json.JSONObject;
+import org.json.JSONException;
 
-import com.facebook.react.bridge.Arguments;
+import com.facebook.react.bridge.ReactApplicationContext;
 
-import com.facebook.react.bridge.WritableMap;
 import com.mattermost.helpers.*;
 
-import okhttp3.Response;
-
 public class ReceiptDelivery {
-    private static final String[] ackKeys = new String[]{"post_id", "root_id", "category", "message", "team_id", "channel_id", "channel_name", "type", "sender_id", "sender_name", "version"};
+    private static final int[] FIBONACCI_BACKOFF = new int[] { 0, 1, 2, 3, 5, 8 };
 
-    public static Bundle send(final String ackId, final String serverUrl, final String postId, final String type, final boolean isIdLoaded) {
+    public static void send(Context context, final String ackId, final String serverUrl, final String postId, final String type, final boolean isIdLoaded, ResolvePromise promise) {
+        final ReactApplicationContext reactApplicationContext = new ReactApplicationContext(context);
+        final String token = Credentials.getCredentialsForServerSync(reactApplicationContext, serverUrl);
         Log.i("ReactNative", String.format("Send receipt delivery ACK=%s TYPE=%s to URL=%s with ID-LOADED=%s", ackId, type, serverUrl, isIdLoaded));
-        WritableMap options = Arguments.createMap();
-        WritableMap headers = Arguments.createMap();
-        WritableMap body = Arguments.createMap();
-        headers.putString("Content-Type", "application/json");
-        options.putMap("headers", headers);
-        body.putString("id", ackId);
-        body.putDouble("received_at", System.currentTimeMillis());
-        body.putString("platform", "android");
-        body.putString("type", type);
-        body.putString("post_id", postId);
-        body.putBoolean("is_id_loaded", isIdLoaded);
-        options.putMap("body", body);
+        execute(serverUrl, postId, token, ackId, type, isIdLoaded, promise);
+    }
 
-        try (Response response = Network.postSync(serverUrl, "api/v4/notifications/ack", options)) {
-            String responseBody = Objects.requireNonNull(response.body()).string();
-            JSONObject jsonResponse = new JSONObject(responseBody);
-            return parseAckResponse(jsonResponse);
-        } catch (Exception e) {
-            e.printStackTrace();
-            return null;
+    protected static void execute(String serverUrl, String postId, String token, String ackId, String type, boolean isIdLoaded, ResolvePromise promise) {
+        if (token == null) {
+            promise.reject("Receipt delivery failure", "Invalid token");
+            return;
+        }
+
+        if (serverUrl == null) {
+            promise.reject("Receipt delivery failure", "Invalid server URL");
+        }
+
+        JSONObject json;
+        long receivedAt = System.currentTimeMillis();
+
+        try {
+            json = new JSONObject();
+            json.put("id", ackId);
+            json.put("received_at", receivedAt);
+            json.put("platform", "android");
+            json.put("type", type);
+            json.put("post_id", postId);
+            json.put("is_id_loaded", isIdLoaded);
+        } catch (JSONException e) {
+            Log.e("ReactNative", "Receipt delivery failed to build json payload");
+            promise.reject("Receipt delivery failure", e.toString());
+            return;
+        }
+
+        final HttpUrl url;
+        if (serverUrl != null) {
+            url = HttpUrl.parse(
+                String.format("%s/api/v4/notifications/ack", serverUrl.replaceAll("/$", "")));
+            if (url != null) {
+                final OkHttpClient client = new OkHttpClient();
+                final MediaType JSON = MediaType.parse("application/json; charset=utf-8");
+                RequestBody body = RequestBody.create(json.toString(), JSON);
+                Request request = new Request.Builder()
+                        .header("Authorization", String.format("Bearer %s", token))
+                        .header("Content-Type", "application/json")
+                        .url(url)
+                        .post(body)
+                        .build();
+
+                makeServerRequest(client, request, isIdLoaded, 0, promise);
+            }
         }
     }
 
-    public static Bundle parseAckResponse(JSONObject jsonResponse) {
+    private static void makeServerRequest(OkHttpClient client, Request request, Boolean isIdLoaded, int reRequestCount, ResolvePromise promise) {
         try {
+            Response response = client.newCall(request).execute();
+            String responseBody = Objects.requireNonNull(response.body()).string();
+            if (response.code() != 200) {
+                switch (response.code()) {
+                    case 302:
+                    promise.reject("Receipt delivery failure", "StatusFound");
+                    return;
+                    case 400:
+                    promise.reject("Receipt delivery failure", "StatusBadRequest");
+                    return;
+                    case 401:
+                    promise.reject("Receipt delivery failure", "Unauthorized");
+                    case 403:
+                    promise.reject("Receipt delivery failure", "Forbidden");
+                    return;
+                    case 500:
+                    promise.reject("Receipt delivery failure", "StatusInternalServerError");
+                    return;
+                    case 501:
+                    promise.reject("Receipt delivery failure", "StatusNotImplemented");
+                    return;
+                }
+
+                throw new Exception(responseBody);
+            }
+
+            JSONObject jsonResponse = new JSONObject(responseBody);
             Bundle bundle = new Bundle();
-            for (String key : ackKeys) {
+            String[] keys = new String[]{"post_id", "root_id", "category", "message", "team_id", "channel_id", "channel_name", "type", "sender_id", "sender_name", "version"};
+            for (String key : keys) {
                 if (jsonResponse.has(key)) {
                     bundle.putString(key, jsonResponse.getString(key));
                 }
             }
-            return bundle;
+            promise.resolve(bundle);
         } catch (Exception e) {
-            e.printStackTrace();
-            return null;
+            Log.e("ReactNative", "Receipt delivery failed to send");
+            if (isIdLoaded) {
+                try {
+                    reRequestCount++;
+                    if (reRequestCount < FIBONACCI_BACKOFF.length) {
+                        Log.i("ReactNative", "Retry attempt " + reRequestCount + " with backoff delay: " + FIBONACCI_BACKOFF[reRequestCount] + " seconds");
+                        Thread.sleep(FIBONACCI_BACKOFF[reRequestCount] * 1000);
+                        makeServerRequest(client, request, true, reRequestCount, promise);
+                    }
+                } catch(InterruptedException ie) {
+                    ie.printStackTrace();
+                }
+            }
+
+            promise.reject("Receipt delivery failure", e.toString());
         }
     }
 }

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
-    }
-}

android/app/src/main/java/com/mattermost/share/ShareUtils.java

@@ -90,26 +90,22 @@ public class ShareUtils {
     }
 
     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));
+        MediaMetadataRetriever retriever = new MediaMetadataRetriever();
+        if (URLUtil.isFileUrl(filePath)) {
+            String decodedPath;
+            try {
+                decodedPath = URLDecoder.decode(filePath, "UTF-8");
+            } catch (UnsupportedEncodingException e) {
+                decodedPath = 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");
+            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;
     }
 }

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)

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

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

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

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

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

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

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();
+  });
+}

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.
-    }
-}

android/app/src/unsigned/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.
-    }
-}

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,8 +25,9 @@ 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("de.undercouch:gradle-download-task:5.0.1")
         classpath('com.google.gms:google-services:4.3.14')
         classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")
 
@@ -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"
+            }
+        }
     }
 }
 

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

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')

app/actions/app/global.ts

@@ -1,7 +1,6 @@
 // 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';
@@ -23,20 +22,16 @@ export const storeDeviceToken = async (token: string, prepareRecordsOnly = false
     return storeGlobal(GLOBAL_IDENTIFIERS.DEVICE_TOKEN, token, prepareRecordsOnly);
 };
 
+export const storeMultiServerTutorial = async (prepareRecordsOnly = false) => {
+    return storeGlobal(GLOBAL_IDENTIFIERS.MULTI_SERVER_TUTORIAL, 'true', 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);
-};
-
 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) => {

app/actions/local/category.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 {CHANNELS_CATEGORY, DMS_CATEGORY} from '@constants/categories';
 import DatabaseManager from '@database/manager';
 import {prepareCategoryChannels, queryCategoriesByTeamIds, getCategoryById, prepareCategoriesAndCategoriesChannels} from '@queries/servers/categories';
@@ -39,7 +41,7 @@ export async function storeCategories(serverUrl: string, categories: CategoryWit
         }
 
         if (models.length > 0) {
-            await operator.batchRecords(models, 'storeCategories');
+            await operator.batchRecords(models);
         }
 
         return {models};
@@ -79,6 +81,7 @@ export async function addChannelToDefaultCategory(serverUrl: string, channel: Ch
             return {error: 'no current user id'};
         }
 
+        const models: Model[] = [];
         const categoriesWithChannels: CategoryWithChannels[] = [];
 
         if (isDMorGM(channel)) {
@@ -98,12 +101,13 @@ export async function addChannelToDefaultCategory(serverUrl: string, channel: Ch
                 cwc.channel_ids.unshift(channel.id);
                 categoriesWithChannels.push(cwc);
             }
+
+            const ccModels = await prepareCategoryChannels(operator, categoriesWithChannels);
+            models.push(...ccModels);
         }
 
-        const models = await prepareCategoryChannels(operator, categoriesWithChannels);
-
         if (models.length && !prepareRecordsOnly) {
-            await operator.batchRecords(models, 'addChannelToDefaultCategory');
+            await operator.batchRecords(models);
         }
 
         return {models};

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();
 

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';
@@ -13,7 +14,7 @@ import {
     prepareDeleteChannel, prepareMyChannelsForTeam, queryAllMyChannel,
     getMyChannel, getChannelById, queryUsersOnChannel, queryUserChannelsByTypes,
 } from '@queries/servers/channel';
-import {queryDisplayNamePreferences} from '@queries/servers/preference';
+import {queryPreferencesByCategoryAndName} from '@queries/servers/preference';
 import {prepareCommonSystemValues, PrepareCommonSystemValuesArgs, getCommonSystemValues, getCurrentTeamId, setCurrentChannelId, getCurrentUserId, getConfig, getLicense} from '@queries/servers/system';
 import {addChannelToTeamHistory, addTeamToTeamHistory, getTeamById, removeChannelFromTeamHistory} from '@queries/servers/team';
 import {getCurrentUser, queryUsersById} from '@queries/servers/user';
@@ -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,13 +76,13 @@ 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);
                 }
 
                 if (models.length && !prepareRecordsOnly) {
-                    await operator.batchRecords(models, 'switchToChannel');
+                    await operator.batchRecords(models);
                 }
 
                 if (isTabletDevice) {
@@ -124,7 +124,7 @@ export async function removeCurrentUserFromChannel(serverUrl: string, channelId:
             await removeChannelFromTeamHistory(operator, teamId, channel.id, false);
 
             if (models.length && !prepareRecordsOnly) {
-                await operator.batchRecords(models, 'removeCurrentUserFromChannel');
+                await operator.batchRecords(models);
             }
         }
         return {models};
@@ -145,7 +145,7 @@ export async function setChannelDeleteAt(serverUrl: string, channelId: string, d
         const model = channel.prepareUpdate((c) => {
             c.deleteAt = deleteAt;
         });
-        await operator.batchRecords([model], 'setChannelDeleteAt');
+        await operator.batchRecords([model]);
     } catch (error) {
         logError('FAILED TO BATCH CHANGES FOR CHANNEL DELETE AT', error);
     }
@@ -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,14 +172,12 @@ 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) {
-            await operator.batchRecords([member], 'markChannelAsViewed');
+            await operator.batchRecords([member]);
         }
 
         return {member};
@@ -206,7 +204,7 @@ export async function markChannelAsUnread(serverUrl: string, channelId: string,
             m.isUnread = true;
         });
         if (!prepareRecordsOnly) {
-            await operator.batchRecords([member], 'markChannelAsUnread');
+            await operator.batchRecords([member]);
         }
 
         return {member};
@@ -226,7 +224,7 @@ export async function resetMessageCount(serverUrl: string, channelId: string) {
         member.prepareUpdate((m) => {
             m.messageCount = 0;
         });
-        await operator.batchRecords([member], 'resetMessageCount');
+        await operator.batchRecords([member]);
 
         return member;
     } catch (error) {
@@ -254,7 +252,7 @@ export async function storeMyChannelsForTeam(serverUrl: string, teamId: string,
         }
 
         if (flattenedModels.length) {
-            await operator.batchRecords(flattenedModels, 'storeMyChannelsForTeam');
+            await operator.batchRecords(flattenedModels);
         }
 
         return {models: flattenedModels};
@@ -273,7 +271,7 @@ export async function updateMyChannelFromWebsocket(serverUrl: string, channelMem
                 m.roles = channelMember.roles;
             });
             if (!prepareRecordsOnly) {
-                operator.batchRecords([member], 'updateMyChannelFromWebsocket');
+                operator.batchRecords([member]);
             }
         }
         return {model: member};
@@ -293,7 +291,7 @@ export async function updateChannelInfoFromChannel(serverUrl: string, channel: C
         }],
         prepareRecordsOnly: true});
         if (!prepareRecordsOnly) {
-            operator.batchRecords(newInfo, 'updateChannelInfoFromChannel');
+            operator.batchRecords(newInfo);
         }
         return {model: newInfo};
     } catch (error) {
@@ -317,7 +315,7 @@ export async function updateLastPostAt(serverUrl: string, channelId: string, las
             });
 
             if (!prepareRecordsOnly) {
-                await operator.batchRecords([myChannel], 'updateLastPostAt');
+                await operator.batchRecords([myChannel]);
             }
 
             return {member: myChannel};
@@ -345,7 +343,7 @@ export async function updateMyChannelLastFetchedAt(serverUrl: string, channelId:
             });
 
             if (!prepareRecordsOnly) {
-                await operator.batchRecords([myChannel], 'updateMyChannelLastFetchedAt');
+                await operator.batchRecords([myChannel]);
             }
 
             return {member: myChannel};
@@ -369,7 +367,7 @@ export async function updateChannelsDisplayName(serverUrl: string, channels: Cha
 
         const license = await getLicense(database);
         const config = await getConfig(database);
-        const preferences = await queryDisplayNamePreferences(database, Preferences.NAME_NAME_FORMAT).fetch();
+        const preferences = await queryPreferencesByCategoryAndName(database, Preferences.CATEGORY_DISPLAY_SETTINGS, Preferences.NAME_NAME_FORMAT).fetch();
         const displaySettings = getTeammateNameDisplaySetting(preferences, config.LockTeammateNameDisplay, config.TeammateNameDisplay, license);
         const models: Model[] = [];
         for await (const channel of channels) {
@@ -403,7 +401,7 @@ export async function updateChannelsDisplayName(serverUrl: string, channels: Cha
         }
 
         if (models.length && !prepareRecordsOnly) {
-            await operator.batchRecords(models, 'updateChannelsDisplayName');
+            await operator.batchRecords(models);
         }
 
         return {models};

app/actions/local/draft.ts

@@ -26,7 +26,7 @@ export async function updateDraftFile(serverUrl: string, channelId: string, root
         });
 
         if (!prepareRecordsOnly) {
-            await operator.batchRecords([draft], 'updateDraftFile');
+            await operator.batchRecords([draft]);
         }
 
         return {draft};
@@ -58,7 +58,7 @@ export async function removeDraftFile(serverUrl: string, channelId: string, root
         }
 
         if (!prepareRecordsOnly) {
-            await operator.batchRecords([draft], 'removeDraftFile');
+            await operator.batchRecords([draft]);
         }
 
         return {draft};
@@ -99,7 +99,7 @@ export async function updateDraftMessage(serverUrl: string, channelId: string, r
         }
 
         if (!prepareRecordsOnly) {
-            await operator.batchRecords([draft], 'updateDraftMessage');
+            await operator.batchRecords([draft]);
         }
 
         return {draft};
@@ -129,7 +129,7 @@ export async function addFilesToDraft(serverUrl: string, channelId: string, root
         });
 
         if (!prepareRecordsOnly) {
-            await operator.batchRecords([draft], 'addFilesToDraft');
+            await operator.batchRecords([draft]);
         }
 
         return {draft};

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);
@@ -127,14 +124,14 @@ export async function removePost(serverUrl: string, post: PostModel | Post) {
             }
 
             if (removeModels.length) {
-                await operator.batchRecords(removeModels, 'removePost (combined user activity)');
+                await operator.batchRecords(removeModels);
             }
         } else {
             const postModel = await getPostById(database, post.id);
             if (postModel) {
                 const preparedPost = await prepareDeletePost(postModel);
                 if (preparedPost.length) {
-                    await operator.batchRecords(preparedPost, 'removePost');
+                    await operator.batchRecords(preparedPost);
                 }
             }
         }
@@ -162,7 +159,7 @@ export async function markPostAsDeleted(serverUrl: string, post: Post, prepareRe
         });
 
         if (!prepareRecordsOnly) {
-            await operator.batchRecords([dbPost], 'markPostAsDeleted');
+            await operator.batchRecords([dbPost]);
         }
         return {model};
     } catch (error) {
@@ -229,7 +226,7 @@ export async function storePostsForChannel(
         }
 
         if (models.length && !prepareRecordsOnly) {
-            await operator.batchRecords(models, 'storePostsForChannel');
+            await operator.batchRecords(models);
         }
 
         return {models};
@@ -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};
-    }
-}

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);

app/actions/local/team.ts

@@ -22,7 +22,7 @@ export async function removeUserFromTeam(serverUrl: string, teamId: string) {
                 models.push(...system);
             }
             if (models.length) {
-                await operator.batchRecords(models, 'removeUserFromTeam');
+                await operator.batchRecords(models);
             }
         }
 
@@ -61,7 +61,7 @@ export async function addSearchToTeamSearchHistory(serverUrl: string, teamId: st
             }
         }
 
-        await operator.batchRecords(models, 'addSearchToTeamHistory');
+        await operator.batchRecords(models);
         return {searchModel};
     } catch (error) {
         logError('Failed addSearchToTeamSearchHistory', error);

app/actions/local/thread.ts

@@ -40,7 +40,7 @@ export const switchToGlobalThreads = async (serverUrl: string, teamId?: string,
         models.push(...history);
 
         if (!prepareRecordsOnly) {
-            await operator.batchRecords(models, 'switchToGlobalThreads');
+            await operator.batchRecords(models);
         }
 
         const isTabletDevice = await isTablet();
@@ -84,7 +84,7 @@ export const switchToThread = async (serverUrl: string, rootId: string, isFromNo
                 currentChannelId: channel.id,
             });
             if (models.length) {
-                await operator.batchRecords(models, 'switchToThread');
+                await operator.batchRecords(models);
             }
         } else {
             const modelPromises: Array<Promise<Model[]>> = [];
@@ -97,7 +97,7 @@ export const switchToThread = async (serverUrl: string, rootId: string, isFromNo
             modelPromises.push(prepareCommonSystemValues(operator, commonValues));
             const models = (await Promise.all(modelPromises)).flat();
             if (models.length) {
-                await operator.batchRecords(models, 'switchToThread');
+                await operator.batchRecords(models);
             }
         }
 
@@ -201,7 +201,7 @@ export async function createThreadFromNewPost(serverUrl: string, post: Post, pre
         }
 
         if (!prepareRecordsOnly) {
-            await operator.batchRecords(models, 'createThreadFromNewPost');
+            await operator.batchRecords(models);
         }
 
         return {models};
@@ -257,7 +257,7 @@ export async function processReceivedThreads(serverUrl: string, threads: Thread[
         }
 
         if (!prepareRecordsOnly) {
-            await operator.batchRecords(models, 'processReceivedThreads');
+            await operator.batchRecords(models);
         }
         return {models};
     } catch (error) {
@@ -277,7 +277,7 @@ export async function markTeamThreadsAsRead(serverUrl: string, teamId: string, p
             record.viewedAt = Date.now();
         }));
         if (!prepareRecordsOnly) {
-            await operator.batchRecords(models, 'markTeamThreadsAsRead');
+            await operator.batchRecords(models);
         }
         return {models};
     } catch (error) {
@@ -300,7 +300,7 @@ export async function markThreadAsViewed(serverUrl: string, threadId: string, pr
         });
 
         if (!prepareRecordsOnly) {
-            await operator.batchRecords([thread], 'markThreadAsViewed');
+            await operator.batchRecords([thread]);
         }
 
         return {model: thread};
@@ -327,7 +327,7 @@ export async function updateThread(serverUrl: string, threadId: string, updatedT
             record.unreadReplies = updatedThread.unread_replies ?? record.unreadReplies;
         });
         if (!prepareRecordsOnly) {
-            await operator.batchRecords([model], 'updateThread');
+            await operator.batchRecords([model]);
         }
         return {model};
     } catch (error) {
@@ -341,7 +341,7 @@ export async function updateTeamThreadsSync(serverUrl: string, data: TeamThreads
         const {operator} = DatabaseManager.getServerDatabaseAndOperator(serverUrl);
         const models = await operator.handleTeamThreadsSync({data: [data], prepareRecordsOnly});
         if (!prepareRecordsOnly) {
-            await operator.batchRecords(models, 'updateTeamThreadsSync');
+            await operator.batchRecords(models);
         }
         return {models};
     } catch (error) {

app/actions/local/user.ts

@@ -22,7 +22,7 @@ export async function setCurrentUserStatusOffline(serverUrl: string) {
         }
 
         user.prepareStatus(General.OFFLINE);
-        await operator.batchRecords([user], 'setCurrentUserStatusOffline');
+        await operator.batchRecords([user]);
         return null;
     } catch (error) {
         logError('Failed setCurrentUserStatusOffline', error);
@@ -54,7 +54,7 @@ export async function updateLocalCustomStatus(serverUrl: string, user: UserModel
             }
         }
 
-        await operator.batchRecords(models, 'updateLocalCustomStatus');
+        await operator.batchRecords(models);
 
         return {};
     } catch (error) {
@@ -97,37 +97,27 @@ export const updateRecentCustomStatuses = async (serverUrl: string, customStatus
 export const updateLocalUser = async (
     serverUrl: string,
     userDetails: Partial<UserProfile> & { status?: string},
-    userId?: string,
 ) => {
     try {
         const {database} = DatabaseManager.getServerDatabaseAndOperator(serverUrl);
-
-        let user: UserModel | undefined;
-
-        if (userId) {
-            user = await getUserById(database, userId);
-        } else {
-            user = await getCurrentUser(database);
-        }
-
+        const user = await getCurrentUser(database);
         if (user) {
-            const u = user;
             await database.write(async () => {
-                await u.update((userRecord: UserModel) => {
-                    userRecord.authService = userDetails.auth_service ?? u.authService;
-                    userRecord.email = userDetails.email ?? u.email;
-                    userRecord.firstName = userDetails.first_name ?? u.firstName;
-                    userRecord.lastName = userDetails.last_name ?? u.lastName;
-                    userRecord.lastPictureUpdate = userDetails.last_picture_update ?? u.lastPictureUpdate;
-                    userRecord.locale = userDetails.locale ?? u.locale;
-                    userRecord.nickname = userDetails.nickname ?? u.nickname;
-                    userRecord.notifyProps = userDetails.notify_props ?? u.notifyProps;
-                    userRecord.position = userDetails?.position ?? u.position;
-                    userRecord.props = userDetails.props ?? u.props;
-                    userRecord.roles = userDetails.roles ?? u.roles;
-                    userRecord.status = userDetails?.status ?? u.status;
-                    userRecord.timezone = userDetails.timezone ?? u.timezone;
-                    userRecord.username = userDetails.username ?? u.username;
+                await user.update((userRecord: UserModel) => {
+                    userRecord.authService = userDetails.auth_service ?? user.authService;
+                    userRecord.email = userDetails.email ?? user.email;
+                    userRecord.firstName = userDetails.first_name ?? user.firstName;
+                    userRecord.lastName = userDetails.last_name ?? user.lastName;
+                    userRecord.lastPictureUpdate = userDetails.last_picture_update ?? user.lastPictureUpdate;
+                    userRecord.locale = userDetails.locale ?? user.locale;
+                    userRecord.nickname = userDetails.nickname ?? user.nickname;
+                    userRecord.notifyProps = userDetails.notify_props ?? user.notifyProps;
+                    userRecord.position = userDetails?.position ?? user.position;
+                    userRecord.props = userDetails.props ?? user.props;
+                    userRecord.roles = userDetails.roles ?? user.roles;
+                    userRecord.status = userDetails?.status ?? user.status;
+                    userRecord.timezone = userDetails.timezone ?? user.timezone;
+                    userRecord.username = userDetails.username ?? user.username;
                 });
             });
         }

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

app/actions/remote/channel.ts

@@ -2,12 +2,13 @@
 // 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 {updateLocalUser} from '@actions/local/user';
 import {loadCallForChannel} from '@calls/actions/calls';
 import {DeepLink, Events, General, Preferences, Screens} from '@constants';
 import DatabaseManager from '@database/manager';
@@ -16,8 +17,8 @@ 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, deleteChannelMembership, queryChannelsById} from '@queries/servers/channel';
-import {queryDisplayNamePreferences} from '@queries/servers/preference';
+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 {getCurrentUser} from '@queries/servers/user';
@@ -36,13 +37,10 @@ import {setDirectChannelVisible} from './preference';
 import {fetchRolesIfNeeded} from './role';
 import {forceLogoutIfNecessary} from './session';
 import {addCurrentUserToTeam, fetchTeamByName, removeCurrentUserFromTeam} from './team';
-import {fetchProfilesInChannel, fetchProfilesInGroupChannels, fetchProfilesPerChannels, fetchUsersByIds, updateUsersNoLongerVisible} from './user';
+import {fetchProfilesInGroupChannels, fetchProfilesPerChannels, fetchUsersByIds, updateUsersNoLongerVisible} from './user';
 
 import type {Client} from '@client/rest';
-import type ClientError from '@client/rest/error';
-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[];
@@ -51,99 +49,6 @@ export type MyChannelsRequest = {
     error?: unknown;
 }
 
-export type ChannelMembersRequest = {
-    members?: ChannelMembership[];
-    error?: unknown;
-}
-
-export async function removeMemberFromChannel(serverUrl: string, channelId: string, userId: string) {
-    try {
-        const {operator} = DatabaseManager.getServerDatabaseAndOperator(serverUrl);
-        const client = NetworkManager.getClient(serverUrl);
-
-        await client.removeFromChannel(userId, channelId);
-        await deleteChannelMembership(operator, userId, channelId);
-
-        return {error: undefined};
-    } catch (error) {
-        logError('removeMemberFromChannel', error);
-        forceLogoutIfNecessary(serverUrl, error as ClientErrorProps);
-        return {error};
-    }
-}
-
-export async function fetchChannelMembersByIds(serverUrl: string, channelId: string, userIds: string[], fetchOnly = false): Promise<ChannelMembersRequest> {
-    try {
-        const client = NetworkManager.getClient(serverUrl);
-        const members = await client.getChannelMembersByIds(channelId, userIds);
-
-        if (!fetchOnly) {
-            const {operator} = DatabaseManager.getServerDatabaseAndOperator(serverUrl);
-            if (operator && members.length) {
-                const memberships = members.map((u) => ({
-                    channel_id: channelId,
-                    user_id: u.user_id,
-                    scheme_admin: u.scheme_admin,
-                }));
-                await operator.handleChannelMembership({
-                    channelMemberships: memberships,
-                    prepareRecordsOnly: false,
-                });
-            }
-        }
-
-        return {members};
-    } catch (error) {
-        logError('fetchChannelMembersByIds', error);
-        forceLogoutIfNecessary(serverUrl, error as ClientError);
-        return {error};
-    }
-}
-export async function updateChannelMemberSchemeRoles(serverUrl: string, channelId: string, userId: string, isSchemeUser: boolean, isSchemeAdmin: boolean, fetchOnly = false) {
-    try {
-        const client = NetworkManager.getClient(serverUrl);
-        await client.updateChannelMemberSchemeRoles(channelId, userId, isSchemeUser, isSchemeAdmin);
-
-        if (!fetchOnly) {
-            return getMemberInChannel(serverUrl, channelId, userId);
-        }
-
-        return {error: undefined};
-    } catch (error) {
-        logError('updateChannelMemberSchemeRoles', error);
-        forceLogoutIfNecessary(serverUrl, error as ClientErrorProps);
-        return {error};
-    }
-}
-
-export async function getMemberInChannel(serverUrl: string, channelId: string, userId: string, fetchOnly = false) {
-    try {
-        const client = NetworkManager.getClient(serverUrl);
-        const member = await client.getMemberInChannel(channelId, userId);
-
-        if (!fetchOnly) {
-            updateLocalUser(serverUrl, member, userId);
-        }
-        return {member, error: undefined};
-    } catch (error) {
-        logError('getMemberInChannel', error);
-        forceLogoutIfNecessary(serverUrl, error as ClientErrorProps);
-        return {error};
-    }
-}
-
-export async function fetchChannelMemberships(serverUrl: string, channelId: string, options: GetUsersOptions, fetchOnly = false) {
-    const {users = []} = await fetchProfilesInChannel(serverUrl, channelId, undefined, options, fetchOnly);
-    const userIds = users.map((u) => u.id);
-
-    // MM-49896 https://mattermost.atlassian.net/browse/MM-49896
-    // We are not sure the getChannelMembers API returns the same members
-    // from getProfilesInChannel.  This guarantees a 1:1 match of the
-    // user IDs
-    const {members = []} = await fetchChannelMembersByIds(serverUrl, channelId, userIds, true);
-    return {users, members};
-}
-
 export async function addMembersToChannel(serverUrl: string, channelId: string, userIds: string[], postRootId = '', fetchOnly = false) {
     const operator = DatabaseManager.serverDatabases[serverUrl]?.operator;
     if (!operator) {
@@ -174,7 +79,7 @@ export async function addMembersToChannel(serverUrl: string, channelId: string,
             }));
 
             const models = await Promise.all(modelPromises);
-            await operator.batchRecords(models.flat(), 'addMembersToChannel');
+            await operator.batchRecords(models.flat());
         }
         return {channelMemberships};
     } catch (error) {
@@ -251,7 +156,7 @@ export async function createChannel(serverUrl: string, displayName: string, purp
             models.push(...categoriesModels.models);
         }
         if (models.length) {
-            await operator.batchRecords(models, 'createChannel');
+            await operator.batchRecords(models);
         }
         fetchChannelStats(serverUrl, channelData.id, false);
         EphemeralStore.creatingChannel = false;
@@ -296,7 +201,7 @@ export async function patchChannel(serverUrl: string, channelPatch: Partial<Chan
             models.push(channel);
         }
         if (models?.length) {
-            await operator.batchRecords(models.flat(), 'patchChannel');
+            await operator.batchRecords(models.flat());
         }
         return {channel: channelData};
     } catch (error) {
@@ -343,7 +248,7 @@ export async function leaveChannel(serverUrl: string, channelId: string) {
             models.push(...removeUserModels);
         }
 
-        await operator.batchRecords(models, 'leaveChannel');
+        await operator.batchRecords(models);
 
         if (isTabletDevice) {
             switchToLastChannel(serverUrl);
@@ -393,7 +298,7 @@ export async function fetchChannelCreator(serverUrl: string, channelId: string,
                 }));
 
                 const models = await Promise.all(modelPromises);
-                await operator.batchRecords(models.flat(), 'fetchChannelCreator');
+                await operator.batchRecords(models.flat());
             }
 
             return {user};
@@ -484,7 +389,7 @@ export async function fetchMyChannelsForTeam(serverUrl: string, teamId: string,
             const {models: catModels} = await storeCategories(serverUrl, categories, true, true); // Re-sync
             const models = (chModels || []).concat(catModels || []);
             if (models.length) {
-                await operator.batchRecords(models, 'fetchMyChannelsForTeam');
+                await operator.batchRecords(models);
             }
             setTeamLoading(serverUrl, false);
         }
@@ -533,37 +438,38 @@ export async function fetchMyChannel(serverUrl: string, teamId: string, channelI
 }
 
 export async function fetchMissingDirectChannelsInfo(serverUrl: string, directChannels: Channel[], locale?: string, teammateDisplayNameSetting?: string, currentUserId?: string, fetchOnly = false) {
-    try {
-        const {database, operator} = DatabaseManager.getServerDatabaseAndOperator(serverUrl);
-        const displayNameByChannel: Record<string, string> = {};
-        const users: UserProfile[] = [];
-        const updatedChannels = new Set<Channel>();
+    const operator = DatabaseManager.serverDatabases[serverUrl]?.operator;
+    if (!operator) {
+        return {error: `${serverUrl} database not found`};
+    }
 
-        const dms: Channel[] = [];
-        const dmIds: string[] = [];
-        const dmWithoutDisplayName = new Set<string>();
-        const gms: Channel[] = [];
-        const channelIds = new Set(directChannels.map((c) => c.id));
-        const storedChannels = await queryChannelsById(database, Array.from(channelIds)).fetch();
-        const storedChannelsMap = new Map(storedChannels.map((c) => [c.id, c]));
+    const {database} = operator;
+    const displayNameByChannel: Record<string, string> = {};
+    const users: UserProfile[] = [];
+    const updatedChannels = new Set<Channel>();
 
-        for (const c of directChannels) {
-            if (c.type === General.DM_CHANNEL) {
-                dms.push(c);
-                dmIds.push(c.id);
-                if (!c.display_name && !storedChannelsMap.get(c.id)?.displayName) {
-                    dmWithoutDisplayName.add(c.id);
-                }
-                continue;
+    const dms: Channel[] = [];
+    const dmIds: string[] = [];
+    const dmWithoutDisplayName = new Set<string>();
+    const gms: Channel[] = [];
+    for (const c of directChannels) {
+        if (c.type === General.DM_CHANNEL) {
+            dms.push(c);
+            dmIds.push(c.id);
+            if (!c.display_name) {
+                dmWithoutDisplayName.add(c.id);
             }
-            gms.push(c);
+            continue;
         }
+        gms.push(c);
+    }
 
+    try {
         const currentUser = await getCurrentUser(database);
 
         // let's filter those channels that we already have the users
         const membersCount = await getMembersCountByChannelsId(database, dmIds);
-        const profileChannelsToFetch = dmIds.filter((id) => membersCount[id] <= 1 && dmWithoutDisplayName.has(id));
+        const profileChannelsToFetch = dmIds.filter((id) => membersCount[id] <= 1 || dmWithoutDisplayName.has(id));
         const results = await Promise.all([
             profileChannelsToFetch.length ? fetchProfilesPerChannels(serverUrl, profileChannelsToFetch, currentUserId, false) : Promise.resolve({data: undefined}),
             fetchProfilesInGroupChannels(serverUrl, gms.map((c) => c.id), false),
@@ -609,7 +515,7 @@ export async function fetchMissingDirectChannelsInfo(serverUrl: string, directCh
             }
 
             const models = await Promise.all(modelPromises);
-            await operator.batchRecords(models.flat(), 'fetchMissingDirectChannelInfo');
+            await operator.batchRecords(models.flat());
         }
 
         return {directChannels: updatedChannelsArray, users};
@@ -624,7 +530,7 @@ export async function fetchDirectChannelsInfo(serverUrl: string, directChannels:
         return {error: `${serverUrl} database not found`};
     }
 
-    const preferences = await queryDisplayNamePreferences(database).fetch();
+    const preferences = await queryPreferencesByCategoryAndName(database, Preferences.CATEGORY_DISPLAY_SETTINGS).fetch();
     const config = await getConfig(database);
     const license = await getLicense(database);
     const teammateDisplayNameSetting = getTeammateNameDisplaySetting(preferences, config?.LockTeammateNameDisplay, config?.TeammateNameDisplay, license);
@@ -687,7 +593,7 @@ export async function joinChannel(serverUrl: string, teamId: string, channelId?:
                 }
                 if (flattenedModels?.length > 0) {
                     try {
-                        await operator.batchRecords(flattenedModels, 'joinChannel');
+                        await operator.batchRecords(flattenedModels);
                     } catch {
                         logError('FAILED TO BATCH CHANNELS');
                     }
@@ -870,7 +776,7 @@ export async function createDirectChannel(serverUrl: string, userId: string, dis
         if (displayName) {
             created.display_name = displayName;
         } else {
-            const preferences = await queryDisplayNamePreferences(database, Preferences.NAME_NAME_FORMAT).fetch();
+            const preferences = await queryPreferencesByCategoryAndName(database, Preferences.CATEGORY_DISPLAY_SETTINGS, Preferences.NAME_NAME_FORMAT).fetch();
             const license = await getLicense(database);
             const config = await getConfig(database);
             const teammateDisplayNameSetting = getTeammateNameDisplaySetting(preferences || [], config.LockTeammateNameDisplay, config.TeammateNameDisplay, license);
@@ -913,7 +819,7 @@ export async function createDirectChannel(serverUrl: string, userId: string, dis
             models.push(...userModels);
         }
 
-        await operator.batchRecords(models, 'createDirectChannel');
+        await operator.batchRecords(models);
         EphemeralStore.creatingDMorGMTeammates = [];
         fetchRolesIfNeeded(serverUrl, member.roles.split(' '));
         return {data: created};
@@ -1012,7 +918,7 @@ export async function createGroupChannel(serverUrl: string, userIds: string[]) {
             return {data: created};
         }
 
-        const preferences = await queryDisplayNamePreferences(database, Preferences.NAME_NAME_FORMAT).fetch();
+        const preferences = await queryPreferencesByCategoryAndName(database, Preferences.CATEGORY_DISPLAY_SETTINGS, Preferences.NAME_NAME_FORMAT).fetch();
         const license = await getLicense(database);
         const config = await getConfig(database);
         const teammateDisplayNameSetting = getTeammateNameDisplaySetting(preferences || [], config.LockTeammateNameDisplay, config.TeammateNameDisplay, license);
@@ -1047,7 +953,7 @@ export async function createGroupChannel(serverUrl: string, userIds: string[]) {
                 }
 
                 models.push(...userModels);
-                operator.batchRecords(models, 'createGroupChannel');
+                operator.batchRecords(models);
             }
         }
         EphemeralStore.creatingDMorGMTeammates = [];
@@ -1392,7 +1298,7 @@ export const convertChannelToPrivate = async (serverUrl: string, channelId: stri
             channel.prepareUpdate((c) => {
                 c.type = General.PRIVATE_CHANNEL;
             });
-            await operator.batchRecords([channel], 'convertChannelToPrivate');
+            await operator.batchRecords([channel]);
         }
         return {error: undefined};
     } catch (error) {

app/actions/remote/command.ts

@@ -1,9 +1,11 @@
 // 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 {Client} from '@client/rest';
 import {AppCommandParser} from '@components/autocomplete/slash_suggestion/app_command_parser/app_command_parser';
 import {AppCallResponseTypes} from '@constants/apps';
 import DatabaseManager from '@database/manager';
@@ -16,9 +18,6 @@ import {showAppForm} from '@screens/navigation';
 import {handleDeepLink, matchDeepLink} from '@utils/deep_link';
 import {tryOpenURL} from '@utils/url';
 
-import type {Client} from '@client/rest';
-import type {IntlShape} from 'react-intl';
-
 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;
     if (!operator) {

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};

app/actions/remote/entry/app.ts

@@ -1,14 +1,13 @@
 // 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 {fetchConfigAndLicense} from '@actions/remote/systems';
 import DatabaseManager from '@database/manager';
 import {prepareCommonSystemValues, getCurrentTeamId, getWebSocketLastDisconnected, 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';
@@ -27,13 +26,10 @@ 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, 'appEntry - removeLastUnreadChannelId');
+        operator.batchRecords(removeLastUnreadChannelId);
     }
 
     const {database} = operator;
@@ -51,21 +47,16 @@ export async function appEntry(serverUrl: string, since = 0, isUpgrade = false)
 
     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, 'appEntry - upgrade store me');
+            await operator.batchRecords(me);
         }
     }
 
     await handleEntryAfterLoadNavigation(serverUrl, teamData.memberships || [], chData?.memberships || [], currentTeamId, currentChannelId, initialTeamId, initialChannelId);
 
     const dt = Date.now();
-    await operator.batchRecords(models, 'appEntry');
+    await operator.batchRecords(models);
     logInfo('ENTRY MODELS BATCHING TOOK', `${Date.now() - dt}ms`);
     setTeamLoading(serverUrl, false);
 
@@ -93,8 +84,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();
         }
 

app/actions/remote/entry/common.ts

@@ -1,7 +1,8 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
-import {dataRetentionCleanup} from '@actions/local/systems';
+import {Database, Model} from '@nozbe/watermelondb';
+
 import {fetchMissingDirectChannelsInfo, fetchMyChannelsForTeam, handleKickFromChannel, MyChannelsRequest} from '@actions/remote/channel';
 import {fetchGroupsForMember} from '@actions/remote/groups';
 import {fetchPostsForUnreadChannels} from '@actions/remote/post';
@@ -36,7 +37,6 @@ 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;
@@ -178,7 +178,7 @@ export const fetchAppEntryData = async (serverUrl: string, sinceArg: number, ini
     if (!initialTeamId && teamData.teams?.length && teamData.memberships?.length) {
         // If no initial team was set in the database but got teams in the response
         const config = await getConfig(database);
-        const teamOrderPreference = getPreferenceValue<string>(prefData.preferences || [], Preferences.CATEGORIES.TEAMS_ORDER, '', '');
+        const teamOrderPreference = getPreferenceValue(prefData.preferences || [], Preferences.TEAMS_ORDER, '', '') as string;
         const teamMembers = new Set(teamData.memberships.filter((m) => m.delete_at === 0).map((m) => m.team_id));
         const myTeams = teamData.teams!.filter((t) => teamMembers.has(t.id));
         const defaultTeam = selectDefaultTeam(myTeams, meData.user?.locale || DEFAULT_LOCALE, teamOrderPreference, config?.ExperimentalPrimaryTeam);
@@ -378,9 +378,7 @@ export const syncOtherServers = async (serverUrl: string) => {
     for (const server of servers) {
         if (server.url !== serverUrl && server.lastActiveAt > 0) {
             registerDeviceToken(server.url);
-            syncAllChannelMembersAndThreads(server.url).then(() => {
-                dataRetentionCleanup(server.url);
-            });
+            syncAllChannelMembersAndThreads(server.url);
             autoUpdateTimezone(server.url);
         }
     }
@@ -431,7 +429,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, 'graphQLSyncAllChannelMembers');
+            await operator.batchRecords(models);
         }
     }
 

app/actions/remote/entry/gql_common.ts

@@ -1,10 +1,12 @@
 // 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 {autoUpdateTimezone, updateAllUsersSince} from '@actions/remote/user';
@@ -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(
@@ -82,7 +82,7 @@ export async function deferredAppEntryGraphQLActions(
             modelPromises.push(operator.handleRole({roles, prepareRecordsOnly: true}));
         }
         const models = (await Promise.all(modelPromises)).flat();
-        operator.batchRecords(models, 'deferredAppEntryActions');
+        operator.batchRecords(models);
 
         setTimeout(() => {
             if (result.chData?.channels?.length && result.chData.memberships?.length) {
@@ -217,7 +217,7 @@ export const entryGQL = async (serverUrl: string, currentTeamId?: string, curren
     if (!teamData.teams.length) {
         initialTeamId = '';
     } else if (!initialTeamId || !teamData.teams.find((t) => t.id === currentTeamId && t.delete_at === 0)) {
-        const teamOrderPreference = getPreferenceValue<string>(prefData.preferences || [], Preferences.CATEGORIES.TEAMS_ORDER, '', '');
+        const teamOrderPreference = getPreferenceValue(prefData.preferences || [], Preferences.TEAMS_ORDER, '', '') as string;
         initialTeamId = selectDefaultTeam(teamData.teams, meData.user.locale, teamOrderPreference, config.ExperimentalPrimaryTeam)?.id || '';
     }
     const gqlRoles = [
@@ -265,12 +265,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;
 };
 

app/actions/remote/entry/login.ts

@@ -68,7 +68,7 @@ export async function loginEntry({serverUrl, user, deviceToken}: AfterLoginArgs)
             setCurrentTeamAndChannelId(operator, initialTeamId, '');
         }
 
-        await operator.batchRecords(models, 'loginEntry');
+        await operator.batchRecords(models);
         setTeamLoading(serverUrl, false);
 
         const config = clData.config || {} as ClientConfig;

app/actions/remote/entry/notification.ts

@@ -3,11 +3,11 @@
 
 import {switchToChannelById} from '@actions/remote/channel';
 import {fetchAndSwitchToThread} from '@actions/remote/thread';
-import {Screens} from '@constants';
+import {Preferences, Screens} from '@constants';
 import {getDefaultThemeByAppearance} from '@context/theme';
 import DatabaseManager from '@database/manager';
 import {getMyChannel} from '@queries/servers/channel';
-import {queryThemePreferences} from '@queries/servers/preference';
+import {queryPreferencesByCategoryAndName} from '@queries/servers/preference';
 import {getConfig, getCurrentTeamId, getLicense, getWebSocketLastDisconnected, setCurrentTeamAndChannelId} from '@queries/servers/system';
 import {getMyTeamById} from '@queries/servers/team';
 import {getIsCRTEnabled} from '@queries/servers/thread';
@@ -53,7 +53,7 @@ export async function pushNotificationEntry(serverUrl: string, notification: Not
         // When opening the app from a push notification the theme may not be set in the EphemeralStore
         // causing the goToScreen to use the Appearance theme instead and that causes the screen background color to potentially
         // not match the theme
-        const themes = await queryThemePreferences(database, teamId).fetch();
+        const themes = await queryPreferencesByCategoryAndName(database, Preferences.CATEGORY_THEME, teamId).fetch();
         let theme = getDefaultThemeByAppearance();
         if (themes.length) {
             theme = setThemeDefaults(JSON.parse(themes[0].value) as Theme);
@@ -136,7 +136,7 @@ export async function pushNotificationEntry(serverUrl: string, notification: Not
         await NavigationStore.waitUntilScreenHasLoaded(Screens.THREAD);
     }
 
-    await operator.batchRecords(models, 'pushNotificationEntry');
+    await operator.batchRecords(models);
     setTeamLoading(serverUrl, false);
 
     const {id: currentUserId, locale: currentUserLocale} = (await getCurrentUser(operator.database))!;

app/actions/remote/file.ts

@@ -1,26 +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 {logDebug} from '@utils/log';
 
 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,
@@ -33,11 +27,10 @@ export const uploadFile = (
     let client: Client;
     try {
         client = NetworkManager.getClient(serverUrl);
-        return {cancel: client.uploadPostAttachment(file, channelId, onProgress, onComplete, onError, skipBytes)};
     } catch (error) {
-        logDebug('uploadFile', error);
         return {error: error as ClientError};
     }
+    return {cancel: client.uploadPostAttachment(file, channelId, onProgress, onComplete, onError, skipBytes)};
 };
 
 export const fetchPublicLink = async (serverUrl: string, fileId: string) => {

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);
@@ -83,7 +82,7 @@ export const fetchGroupsForChannel = async (serverUrl: string, channelId: string
         ]);
 
         if (!fetchOnly) {
-            await operator.batchRecords([...groups, ...groupChannels], 'fetchGroupsForChannel');
+            await operator.batchRecords([...groups, ...groupChannels]);
         }
 
         return {groups, groupChannels};
@@ -110,7 +109,7 @@ export const fetchGroupsForTeam = async (serverUrl: string, teamId: string, fetc
         ]);
 
         if (!fetchOnly) {
-            await operator.batchRecords([...groups, ...groupTeams], 'fetchGroupsForTeam');
+            await operator.batchRecords([...groups, ...groupTeams]);
         }
 
         return {groups, groupTeams};
@@ -136,7 +135,7 @@ export const fetchGroupsForMember = async (serverUrl: string, userId: string, fe
         ]);
 
         if (!fetchOnly) {
-            await operator.batchRecords([...groups, ...groupMemberships], 'fetchGroupsForMember');
+            await operator.batchRecords([...groups, ...groupMemberships]);
         }
 
         return {groups, groupMemberships};

app/actions/remote/post.ts

@@ -128,7 +128,7 @@ export async function createPost(serverUrl: string, post: Partial<Post>, files:
         initialPostModels.push(...reactionModels);
     }
 
-    await operator.batchRecords(initialPostModels, 'createPost - initial');
+    await operator.batchRecords(initialPostModels);
 
     const isCRTEnabled = await getIsCRTEnabled(database);
 
@@ -167,7 +167,7 @@ export async function createPost(serverUrl: string, post: Partial<Post>, files:
                     models.push(...threadModels);
                 }
             }
-            await operator.batchRecords(models, 'createPost - failure');
+            await operator.batchRecords(models);
         }
 
         return {data: true};
@@ -192,7 +192,7 @@ export async function createPost(serverUrl: string, post: Partial<Post>, files:
             models.push(...threadModels);
         }
     }
-    await operator.batchRecords(models, 'createPost - success');
+    await operator.batchRecords(models);
 
     newPost = created;
 
@@ -237,7 +237,7 @@ export const retryFailedPost = async (serverUrl: string, post: PostModel) => {
             p.props = newPost.props;
             p.updateAt = timestamp;
         });
-        await operator.batchRecords([post], 'retryFailedPost - first update');
+        await operator.batchRecords([post]);
 
         const created = await client.createPost(newPost);
         const models = await operator.handlePosts({
@@ -253,7 +253,7 @@ export const retryFailedPost = async (serverUrl: string, post: PostModel) => {
                 models.push(member);
             }
         }
-        await operator.batchRecords(models, 'retryFailedPost - success update');
+        await operator.batchRecords(models);
     } catch (error) {
         if (isServerError(error) && (
             error.server_error_id === ServerErrors.DELETED_ROOT_POST_ERROR ||
@@ -268,7 +268,7 @@ export const retryFailedPost = async (serverUrl: string, post: PostModel) => {
                     failed: true,
                 };
             });
-            await operator.batchRecords([post], 'retryFailedPost - error update');
+            await operator.batchRecords([post]);
         }
 
         return {error};
@@ -375,7 +375,7 @@ export async function fetchPosts(serverUrl: string, channelId: string, page = 0,
                     models.push(...threadModels);
                 }
             }
-            await operator.batchRecords(models, 'fetchPosts');
+            await operator.batchRecords(models);
         }
         return result;
     } catch (error) {
@@ -434,9 +434,9 @@ export async function fetchPostsBefore(serverUrl: string, channelId: string, pos
                     }
                 }
 
-                await operator.batchRecords(models, 'fetchPostsBefore');
+                await operator.batchRecords(models);
             } catch (error) {
-                logError('FETCH POSTS BEFORE ERROR', error);
+                logError('FETCH AUTHORS ERROR', error);
             }
         }
 
@@ -444,7 +444,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};
     }
@@ -489,7 +489,7 @@ export async function fetchPostsSince(serverUrl: string, channelId: string, sinc
                     models.push(...threadModels);
                 }
             }
-            await operator.batchRecords(models, 'fetchPostsSince');
+            await operator.batchRecords(models);
         }
         return result;
     } catch (error) {
@@ -544,15 +544,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,
@@ -621,7 +615,7 @@ export async function fetchPostThread(serverUrl: string, postId: string, options
                     models.push(...threadModels);
                 }
             }
-            await operator.batchRecords(models, 'fetchPostThread');
+            await operator.batchRecords(models);
         }
         setFetchingThreadState(postId, false);
         return {posts: extractRecordsForTable<PostModel>(posts, MM_TABLES.SERVER.POST)};
@@ -697,7 +691,7 @@ export async function fetchPostsAround(serverUrl: string, channelId: string, pos
                     models.push(...threadModels);
                 }
             }
-            await operator.batchRecords(models, 'fetchPostsAround');
+            await operator.batchRecords(models);
         }
 
         return {posts: extractRecordsForTable<PostModel>(posts, MM_TABLES.SERVER.POST)};
@@ -751,7 +745,7 @@ export async function fetchMissingChannelsFromPosts(serverUrl: string, posts: Po
                         return mdls;
                     });
                     if (models.length) {
-                        await operator.batchRecords(models, 'fetchMissingChannelsFromPosts');
+                        await operator.batchRecords(models);
                     }
                 }
             }
@@ -809,7 +803,7 @@ export async function fetchPostById(serverUrl: string, postId: string, fetchOnly
                 }
             }
 
-            await operator.batchRecords(models, 'fetchPostById');
+            await operator.batchRecords(models);
         }
 
         return {post};
@@ -1036,7 +1030,7 @@ export async function fetchSavedPosts(serverUrl: string, teamId?: string, channe
             return mdls;
         });
 
-        await operator.batchRecords(models, 'fetchSavedPosts');
+        await operator.batchRecords(models);
 
         return {
             order,
@@ -1118,7 +1112,7 @@ export async function fetchPinnedPosts(serverUrl: string, channelId: string) {
             return mdls;
         });
 
-        await operator.batchRecords(models, 'fetchPinnedPosts');
+        await operator.batchRecords(models);
 
         return {
             order,

app/actions/remote/preference.ts

@@ -5,12 +5,14 @@ import {General, Preferences} from '@constants';
 import DatabaseManager from '@database/manager';
 import NetworkManager from '@managers/network_manager';
 import {getChannelById} from '@queries/servers/channel';
-import {querySavedPostsPreferences} from '@queries/servers/preference';
+import {queryPreferencesByCategoryAndName} from '@queries/servers/preference';
 import {getCurrentUserId} from '@queries/servers/system';
 import {getUserIdFromChannelName} from '@utils/user';
 
 import {forceLogoutIfNecessary} from './session';
 
+const {CATEGORY_DIRECT_CHANNEL_SHOW, CATEGORY_GROUP_CHANNEL_SHOW, CATEGORY_FAVORITE_CHANNEL, CATEGORY_SAVED_POST} = Preferences;
+
 export type MyPreferencesRequest = {
     preferences?: PreferenceType[];
     error?: unknown;
@@ -54,7 +56,7 @@ export const saveFavoriteChannel = async (serverUrl: string, channelId: string,
     try {
         const userId = await getCurrentUserId(operator.database);
         const favPref: PreferenceType = {
-            category: Preferences.CATEGORIES.FAVORITE_CHANNEL,
+            category: CATEGORY_FAVORITE_CHANNEL,
             name: channelId,
             user_id: userId,
             value: String(isFavorite),
@@ -75,7 +77,7 @@ export const savePostPreference = async (serverUrl: string, postId: string) => {
         const userId = await getCurrentUserId(operator.database);
         const pref: PreferenceType = {
             user_id: userId,
-            category: Preferences.CATEGORIES.SAVED_POST,
+            category: CATEGORY_SAVED_POST,
             name: postId,
             value: 'true',
         };
@@ -114,15 +116,23 @@ export const savePreference = async (serverUrl: string, preferences: PreferenceT
 };
 
 export const deleteSavedPost = async (serverUrl: string, postId: string) => {
+    const operator = DatabaseManager.serverDatabases[serverUrl]?.operator;
+    if (!operator) {
+        return {error: `${serverUrl} database not found`};
+    }
+    let client;
     try {
-        const {database} = DatabaseManager.getServerDatabaseAndOperator(serverUrl);
-        const client = NetworkManager.getClient(serverUrl);
-        const userId = await getCurrentUserId(database);
-        const records = await querySavedPostsPreferences(database, postId).fetch();
+        client = NetworkManager.getClient(serverUrl);
+    } catch (error) {
+        return {error};
+    }
+    try {
+        const userId = await getCurrentUserId(operator.database);
+        const records = await queryPreferencesByCategoryAndName(operator.database, CATEGORY_SAVED_POST, postId).fetch();
         const postPreferenceRecord = records.find((r) => postId === r.name);
         const pref = {
             user_id: userId,
-            category: Preferences.CATEGORIES.SAVED_POST,
+            category: CATEGORY_SAVED_POST,
             name: postId,
             value: 'true',
         };
@@ -151,8 +161,7 @@ export const setDirectChannelVisible = async (serverUrl: string, channelId: stri
         const channel = await getChannelById(database, channelId);
         if (channel?.type === General.DM_CHANNEL || channel?.type === General.GM_CHANNEL) {
             const userId = await getCurrentUserId(database);
-            const {DIRECT_CHANNEL_SHOW, GROUP_CHANNEL_SHOW} = Preferences.CATEGORIES;
-            const category = channel.type === General.DM_CHANNEL ? DIRECT_CHANNEL_SHOW : GROUP_CHANNEL_SHOW;
+            const category = channel.type === General.DM_CHANNEL ? CATEGORY_DIRECT_CHANNEL_SHOW : CATEGORY_GROUP_CHANNEL_SHOW;
             const name = channel.type === General.DM_CHANNEL ? getUserIdFromChannelName(userId, channel.name) : channelId;
             const pref: PreferenceType = {
                 user_id: userId,
@@ -169,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.CATEGORIES.EMOJI,
-            name: Preferences.EMOJI_SKINTONE,
-            value: skinCode,
-        };
-        return savePreference(serverUrl, [pref]);
-    } catch (error) {
-        return {error};
-    }
-};

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) {
@@ -51,7 +52,7 @@ export async function addReaction(serverUrl: string, postId: string, emojiName:
                 models.push(...recent);
             }
 
-            await operator.batchRecords(models, 'addReaction');
+            await operator.batchRecords(models);
 
             return {reaction};
         }

app/actions/remote/retry.ts

@@ -9,7 +9,7 @@ import {selectDefaultTeam} from '@helpers/api/team';
 import NetworkManager from '@managers/network_manager';
 import {prepareCategoriesAndCategoriesChannels} from '@queries/servers/categories';
 import {prepareMyChannelsForTeam} from '@queries/servers/channel';
-import {prepareMyPreferences, queryDisplayNamePreferences} from '@queries/servers/preference';
+import {prepareMyPreferences, queryPreferencesByCategoryAndName} from '@queries/servers/preference';
 import {prepareCommonSystemValues, getConfig, getLicense} from '@queries/servers/system';
 import {prepareMyTeams} from '@queries/servers/team';
 import {getCurrentUser} from '@queries/servers/user';
@@ -60,7 +60,7 @@ export async function retryInitialTeamAndChannel(serverUrl: string) {
 
         // select initial team
         if (!clData.error && !prefData.error && !teamData.error) {
-            const teamOrderPreference = getPreferenceValue<string>(prefData.preferences!, Preferences.CATEGORIES.TEAMS_ORDER, '', '');
+            const teamOrderPreference = getPreferenceValue(prefData.preferences!, Preferences.TEAMS_ORDER, '', '') as string;
             const teamRoles: string[] = [];
             const teamMembers = new Set<string>();
 
@@ -117,7 +117,7 @@ export async function retryInitialTeamAndChannel(serverUrl: string) {
             ),
         ])).flat();
 
-        await operator.batchRecords(models, 'retryInitialTeamAndChannel');
+        await operator.batchRecords(models);
 
         const directChannels = chData!.channels!.filter(isDMorGM);
         const channelsToFetchProfiles = new Set<Channel>(directChannels);
@@ -157,7 +157,7 @@ export async function retryInitialChannel(serverUrl: string, teamId: string) {
             return {error: true};
         }
 
-        const prefs = await queryDisplayNamePreferences(database, Preferences.NAME_NAME_FORMAT).fetch();
+        const prefs = await queryPreferencesByCategoryAndName(database, Preferences.CATEGORY_DISPLAY_SETTINGS, Preferences.NAME_NAME_FORMAT).fetch();
         const preferences: PreferenceType[] = prefs.map((p) => ({
             category: p.category,
             name: p.name,
@@ -196,7 +196,7 @@ export async function retryInitialChannel(serverUrl: string, teamId: string) {
             prepareCommonSystemValues(operator, {currentChannelId: initialChannel?.id}),
         ])).flat();
 
-        await operator.batchRecords(models, 'retryInitialChannel');
+        await operator.batchRecords(models);
 
         const directChannels = chData!.channels!.filter(isDMorGM);
         const channelsToFetchProfiles = new Set<Channel>(directChannels);

app/actions/remote/search.ts

@@ -103,7 +103,7 @@ export const searchPosts = async (serverUrl: string, teamId: string, params: Pos
             return mdls;
         });
 
-        await operator.batchRecords(models, 'searchPosts');
+        await operator.batchRecords(models);
         return {
             order,
             posts: postsArray,

app/actions/remote/session.ts

@@ -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[] = [];

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> => {

app/actions/remote/team.ts

@@ -1,9 +1,11 @@
 // 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 {Client} from '@client/rest';
 import {PER_PAGE_DEFAULT} from '@client/rest/constants';
 import {Events} from '@constants';
 import DatabaseManager from '@database/manager';
@@ -25,9 +27,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[];
@@ -86,7 +86,7 @@ export async function addUserToTeam(serverUrl: string, teamId: string, userId: s
                     prepareCategoriesAndCategoriesChannels(operator, categories || [], true),
                 ])).flat();
 
-                await operator.batchRecords(models, 'addUserToTeam');
+                await operator.batchRecords(models);
                 setTeamLoading(serverUrl, false);
                 loadEventSent = false;
 
@@ -114,54 +114,6 @@ export async function addUserToTeam(serverUrl: string, teamId: string, userId: s
     }
 }
 
-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 {
@@ -199,7 +151,7 @@ export async function fetchMyTeams(serverUrl: string, fetchOnly = false): Promis
                     const models = await Promise.all(modelPromises);
                     const flattenedModels = models.flat();
                     if (flattenedModels.length > 0) {
-                        await operator.batchRecords(flattenedModels, 'fetchMyTeams');
+                        await operator.batchRecords(flattenedModels);
                     }
                 }
             }
@@ -233,7 +185,7 @@ export async function fetchMyTeam(serverUrl: string, teamId: string, fetchOnly =
                     const models = await Promise.all(modelPromises);
                     const flattenedModels = models.flat();
                     if (flattenedModels?.length > 0) {
-                        await operator.batchRecords(flattenedModels, 'fetchMyTeam');
+                        await operator.batchRecords(flattenedModels);
                     }
                 }
             }
@@ -362,7 +314,7 @@ export async function fetchTeamByName(serverUrl: string, teamName: string, fetch
             const operator = DatabaseManager.serverDatabases[serverUrl]?.operator;
             if (operator) {
                 const models = await operator.handleTeam({teams: [team], prepareRecordsOnly: true});
-                await operator.batchRecords(models, 'fetchTeamByName');
+                await operator.batchRecords(models);
             }
         }
 
@@ -441,7 +393,7 @@ export async function handleTeamChange(serverUrl: string, teamId: string) {
     }
 
     if (models.length) {
-        await operator.batchRecords(models, 'handleTeamChange');
+        await operator.batchRecords(models);
     }
     DeviceEventEmitter.emit(Events.TEAM_SWITCH, false);
 
@@ -476,28 +428,3 @@ export async function handleKickFromTeam(serverUrl: string, teamId: string) {
         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};
-    }
-}

app/actions/remote/terms_of_service.ts

@@ -43,7 +43,7 @@ export async function updateTermsOfServiceStatus(serverUrl: string, id: string,
                     u.termsOfServiceId = '';
                 }
             });
-            operator.batchRecords([currentUser], 'updateTermsOfServiceStatus');
+            operator.batchRecords([currentUser]);
         }
         return {resp};
     } catch (error) {

app/actions/remote/thread.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/Model';
+
 import {markTeamThreadsAsRead, markThreadAsViewed, processReceivedThreads, switchToThread, updateTeamThreadsSync, updateThread} from '@actions/local/thread';
 import {fetchPostThread} from '@actions/remote/post';
 import {General} from '@constants';
@@ -17,7 +19,6 @@ import {getThreadsListEdges} from '@utils/thread';
 import {forceLogoutIfNecessary} from './session';
 
 import type {Client} from '@client/rest';
-import type Model from '@nozbe/watermelondb/Model';
 
 type FetchThreadsOptions = {
     before?: string;
@@ -360,7 +361,7 @@ export const syncTeamThreads = async (serverUrl: string, teamId: string, prepare
             const allNewThreads = await fetchThreads(
                 serverUrl,
                 teamId,
-                {deleted: true, since: syncData.latest + 1},
+                {deleted: true, since: syncData.latest},
             );
             if (allNewThreads.error) {
                 return {error: allNewThreads.error};
@@ -395,7 +396,7 @@ export const syncTeamThreads = async (serverUrl: string, teamId: string, prepare
 
             if (!prepareRecordsOnly && models?.length) {
                 try {
-                    await operator.batchRecords(models, 'syncTeamThreads');
+                    await operator.batchRecords(models);
                 } catch (err) {
                     if (__DEV__) {
                         throw err;
@@ -460,7 +461,7 @@ export const loadEarlierThreads = async (serverUrl: string, teamId: string, last
 
             if (!prepareRecordsOnly && models?.length) {
                 try {
-                    await operator.batchRecords(models, 'loadEarlierThreads');
+                    await operator.batchRecords(models);
                 } catch (err) {
                     if (__DEV__) {
                         throw err;

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 = {
@@ -74,7 +74,7 @@ export const fetchMe = async (serverUrl: string, fetchOnly = false): Promise<MyU
     }
 };
 
-export async function fetchProfilesInChannel(serverUrl: string, channelId: string, excludeUserId?: string, options?: GetUsersOptions, fetchOnly = false): Promise<ProfilesInChannelRequest> {
+export async function fetchProfilesInChannel(serverUrl: string, channelId: string, excludeUserId?: string, fetchOnly = false): Promise<ProfilesInChannelRequest> {
     let client: Client;
     try {
         client = NetworkManager.getClient(serverUrl);
@@ -83,7 +83,7 @@ export async function fetchProfilesInChannel(serverUrl: string, channelId: strin
     }
 
     try {
-        const users = await client.getProfilesInChannel(channelId, options);
+        const users = await client.getProfilesInChannel(channelId);
         const uniqueUsers = Array.from(new Set(users));
         const filteredUsers = uniqueUsers.filter((u) => u.id !== excludeUserId);
         if (!fetchOnly) {
@@ -102,13 +102,12 @@ export async function fetchProfilesInChannel(serverUrl: string, channelId: strin
                 modelPromises.push(prepare);
 
                 const models = await Promise.all(modelPromises);
-                await operator.batchRecords(models.flat(), 'fetchProfilesInChannel');
+                await operator.batchRecords(models.flat());
             }
         }
 
         return {channelId, users: filteredUsers};
     } catch (error) {
-        logError('fetchProfilesInChannel', error);
         forceLogoutIfNecessary(serverUrl, error as ClientError);
         return {channelId, error};
     }
@@ -178,7 +177,7 @@ export async function fetchProfilesInGroupChannels(serverUrl: string, groupChann
             }
 
             const models = await Promise.all(modelPromises);
-            await operator.batchRecords(models.flat(), 'fetchProfilesInGroupChannels');
+            await operator.batchRecords(models.flat());
         }
 
         return {data};
@@ -199,7 +198,7 @@ export async function fetchProfilesPerChannels(serverUrl: string, channelIds: st
         const data: ProfilesInChannelRequest[] = [];
 
         for await (const cIds of channels) {
-            const requests = cIds.map((id) => fetchProfilesInChannel(serverUrl, id, excludeUserId, undefined, true));
+            const requests = cIds.map((id) => fetchProfilesInChannel(serverUrl, id, excludeUserId, true));
             const response = await Promise.all(requests);
             data.push(...response);
         }
@@ -230,7 +229,7 @@ export async function fetchProfilesPerChannels(serverUrl: string, channelIds: st
             }
 
             const models = await Promise.all(modelPromises);
-            await operator.batchRecords(models.flat(), 'fetchProfilesPerChannels');
+            await operator.batchRecords(models.flat());
         }
 
         return {data};
@@ -366,7 +365,7 @@ export async function fetchStatusByIds(serverUrl: string, userIds: string[], fet
                     user.prepareStatus(status?.status || General.OFFLINE);
                 }
 
-                await operator.batchRecords(users, 'fetchStatusByIds');
+                await operator.batchRecords(users);
             }
         }
 
@@ -531,7 +530,7 @@ export const fetchProfilesInTeam = async (serverUrl: string, teamId: string, pag
     }
 };
 
-export const searchProfiles = async (serverUrl: string, term: string, options: SearchUserOptions, fetchOnly = false) => {
+export const searchProfiles = async (serverUrl: string, term: string, options: any = {}, fetchOnly = false) => {
     let client: Client;
     try {
         client = NetworkManager.getClient(serverUrl);
@@ -564,7 +563,6 @@ export const searchProfiles = async (serverUrl: string, term: string, options: S
 
         return {data: users};
     } catch (error) {
-        logError('searchProfiles', error);
         forceLogoutIfNecessary(serverUrl, error as ClientError);
         return {error};
     }
@@ -641,7 +639,7 @@ export async function updateAllUsersSince(serverUrl: string, since: number, fetc
                 modelsToBatch.push(...models);
             }
 
-            await operator.batchRecords(modelsToBatch, 'updateAllUsersSince');
+            await operator.batchRecords(modelsToBatch);
         }
     } catch {
         // Do nothing
@@ -677,7 +675,7 @@ export async function updateUsersNoLongerVisible(serverUrl: string, prepareRecor
             }
         }
         if (models.length && !prepareRecordsOnly) {
-            serverDatabase.operator.batchRecords(models, 'updateUsersNoLongerVisible');
+            serverDatabase.operator.batchRecords(models);
         }
     } catch (error) {
         forceLogoutIfNecessary(serverUrl, error as ClientError);
@@ -917,7 +915,7 @@ export const fetchTeamAndChannelMembership = async (serverUrl: string, userId: s
         }
 
         const models = await Promise.all(modelPromises);
-        await operator.batchRecords(models.flat(), 'fetchTeamAndChannelMembership');
+        await operator.batchRecords(models.flat());
         return {error: undefined};
     } catch (error) {
         return {error};

app/actions/websocket/category.ts

@@ -96,7 +96,7 @@ export async function handleCategoryOrderUpdatedEvent(serverUrl: string, msg: We
                     c.sortOrder = order.findIndex(findOrder);
                 });
             });
-            await operator.batchRecords(categories, 'handleCategoryOrderUpdatedEvent');
+            await operator.batchRecords(categories);
         }
     } catch (e) {
         logError('Category WS: handleCategoryOrderUpdatedEvent', e, msg);

app/actions/websocket/channel.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 {addChannelToDefaultCategory} from '@actions/local/category';
 import {
     markChannelAsViewed, removeCurrentUserFromChannel, setChannelDeleteAt,
@@ -20,8 +22,6 @@ import {getCurrentUser, getTeammateNameDisplay, getUserById} from '@queries/serv
 import EphemeralStore from '@store/ephemeral_store';
 import {logDebug} from '@utils/log';
 
-import type {Model} from '@nozbe/watermelondb';
-
 // Received when current user created a channel in a different client
 export async function handleChannelCreatedEvent(serverUrl: string, msg: any) {
     const operator = DatabaseManager.serverDatabases[serverUrl]?.operator;
@@ -57,7 +57,7 @@ export async function handleChannelCreatedEvent(serverUrl: string, msg: any) {
                 }
             }
         }
-        operator.batchRecords(models, 'handleChannelCreatedEvent');
+        operator.batchRecords(models);
     } catch {
         // do nothing
     }
@@ -109,7 +109,7 @@ export async function handleChannelUpdatedEvent(serverUrl: string, msg: any) {
         if (infoModel.model) {
             models.push(...infoModel.model);
         }
-        operator.batchRecords(models, 'handleChannelUpdatedEvent');
+        operator.batchRecords(models);
     } catch {
         // Do nothing
     }
@@ -128,7 +128,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
@@ -165,7 +165,7 @@ export async function handleChannelMemberUpdatedEvent(serverUrl: string, msg: an
         if (rolesRequest.roles?.length) {
             models.push(...await operator.handleRole({roles: rolesRequest.roles, prepareRecordsOnly: true}));
         }
-        operator.batchRecords(models, 'handleChannelMemberUpdatedEvent');
+        operator.batchRecords(models);
     } catch {
         // do nothing
     }
@@ -235,7 +235,7 @@ export async function handleDirectAddedEvent(serverUrl: string, msg: WebSocketMe
             models.push(...userModels);
         }
 
-        operator.batchRecords(models, 'handleDirectAddedEvent');
+        operator.batchRecords(models);
     } catch {
         // do nothing
     }
@@ -267,7 +267,7 @@ export async function handleUserAddedToChannelEvent(serverUrl: string, msg: any)
                     const prepareModels = await Promise.all(prepare);
                     const flattenedModels = prepareModels.flat();
                     if (flattenedModels?.length > 0) {
-                        await operator.batchRecords(flattenedModels, 'handleUserAddedToChannelEvent - prepareMyChannelsForTeam');
+                        await operator.batchRecords(flattenedModels);
                     }
                 }
 
@@ -308,7 +308,7 @@ export async function handleUserAddedToChannelEvent(serverUrl: string, msg: any)
         }
 
         if (models.length) {
-            await operator.batchRecords(models, 'handleUserAddedToChannelEvent');
+            await operator.batchRecords(models);
         }
 
         await fetchChannelStats(serverUrl, channelId, false);
@@ -356,7 +356,7 @@ export async function handleUserRemovedFromChannelEvent(serverUrl: string, msg:
             }
         }
 
-        operator.batchRecords(models, 'handleUserRemovedFromChannelEvent');
+        operator.batchRecords(models);
     } catch (error) {
         logDebug('cannot handle user removed from channel websocket event', error);
     }

app/actions/websocket/index.ts

@@ -150,7 +150,7 @@ async function doReconnect(serverUrl: string) {
     await handleEntryAfterLoadNavigation(serverUrl, teamData.memberships || [], chData?.memberships || [], currentTeam?.id || '', currentChannel?.id || '', initialTeamId, initialChannelId);
 
     const dt = Date.now();
-    await operator.batchRecords(models, 'doReconnect');
+    await operator.batchRecords(models);
     logInfo('WEBSOCKET RECONNECT MODELS BATCHING TOOK', `${Date.now() - dt}ms`);
     setTeamLoading(serverUrl, false);
 
@@ -409,13 +409,6 @@ 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;
     }
 }
 
@@ -451,7 +444,7 @@ async function fetchPostDataIfNeeded(serverUrl: string) {
             await fetchPostsForChannel(serverUrl, currentChannelId);
             markChannelAsRead(serverUrl, currentChannelId);
             if (!EphemeralStore.wasNotificationTapped()) {
-                markChannelAsViewed(serverUrl, currentChannelId, true);
+                markChannelAsViewed(serverUrl, currentChannelId);
             }
             EphemeralStore.setNotificationTapped(false);
         }

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;
     }
 }
@@ -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,
@@ -176,7 +173,7 @@ export async function handleNewPostEvent(serverUrl: string, msg: WebSocketMessag
 
     models.push(...postModels);
 
-    operator.batchRecords(models, 'handleNewPostEvent');
+    operator.batchRecords(models);
 }
 
 export async function handlePostEdited(serverUrl: string, msg: WebSocketMessage) {
@@ -206,21 +203,15 @@ 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,
     });
     models.push(...postModels);
 
-    operator.batchRecords(models, 'handlePostEdited');
+    operator.batchRecords(models);
 }
 
 export async function handlePostDeleted(serverUrl: string, msg: WebSocketMessage) {
@@ -263,7 +254,7 @@ export async function handlePostDeleted(serverUrl: string, msg: WebSocketMessage
         }
 
         if (models.length) {
-            await operator.batchRecords(models, 'handlePostDeleted');
+            await operator.batchRecords(models);
         }
     } catch {
         // Do nothing

app/actions/websocket/preferences.ts

@@ -107,7 +107,7 @@ async function handleSavePostAdded(serverUrl: string, preferences: PreferenceTyp
         return;
     }
 
-    const savedPosts = preferences.filter((p) => p.category === Preferences.CATEGORIES.SAVED_POST);
+    const savedPosts = preferences.filter((p) => p.category === Preferences.CATEGORY_SAVED_POST);
     for await (const saved of savedPosts) {
         const post = await getPostById(database, saved.name);
         if (!post) {

app/actions/websocket/roles.ts

@@ -66,7 +66,7 @@ export async function handleUserRoleUpdatedEvent(serverUrl: string, msg: WebSock
         models.push(user);
     }
 
-    await operator.batchRecords(models, 'handleUserRoleUpdatedEvent');
+    await operator.batchRecords(models);
 }
 
 export async function handleTeamMemberRoleUpdatedEvent(serverUrl: string, msg: WebSocketMessage): Promise<void> {
@@ -118,7 +118,7 @@ export async function handleTeamMemberRoleUpdatedEvent(serverUrl: string, msg: W
         });
         models.push(...teamMembership);
 
-        await operator.batchRecords(models, 'handleTeamMemberRoleUpdatedEvent');
+        await operator.batchRecords(models);
     } catch {
         // do nothing
     }

app/actions/websocket/teams.ts

@@ -1,12 +1,15 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
+import {Model} from '@nozbe/watermelondb';
+
 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 {updateUsersNoLongerVisible} from '@actions/remote/user';
 import DatabaseManager from '@database/manager';
+import ServerDataOperator from '@database/operator/server_data_operator';
 import NetworkManager from '@managers/network_manager';
 import {prepareCategoriesAndCategoriesChannels} from '@queries/servers/categories';
 import {prepareMyChannelsForTeam} from '@queries/servers/channel';
@@ -16,9 +19,6 @@ 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);
@@ -162,5 +162,5 @@ const fetchAndStoreJoinedTeamInfo = async (serverUrl: string, operator: ServerDa
     }
 
     const models = await Promise.all(modelPromises);
-    await operator.batchRecords(models.flat(), 'fetchAndStoreJoinedTeamInfo');
+    await operator.batchRecords(models.flat());
 };

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;

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';
@@ -10,13 +11,11 @@ import DatabaseManager from '@database/manager';
 import {getTeammateNameDisplaySetting} from '@helpers/api/preference';
 import WebsocketManager from '@managers/websocket_manager';
 import {queryChannelsByTypes, queryUserChannelsByTypes} from '@queries/servers/channel';
-import {queryDisplayNamePreferences} from '@queries/servers/preference';
+import {queryPreferencesByCategoryAndName} from '@queries/servers/preference';
 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) {
@@ -71,7 +70,7 @@ export async function handleUserUpdatedEvent(serverUrl: string, msg: WebSocketMe
     modelsToBatch.push(...userModel);
 
     try {
-        await operator.batchRecords(modelsToBatch, 'handleUserUpdatedEvent');
+        await operator.batchRecords(modelsToBatch);
     } catch {
         // do nothing
     }
@@ -91,7 +90,7 @@ export async function handleUserTypingEvent(serverUrl: string, msg: WebSocketMes
         const {users, existingUsers} = await fetchUsersByIds(serverUrl, [msg.data.user_id]);
         const user = users?.[0] || existingUsers?.[0];
 
-        const namePreference = await queryDisplayNamePreferences(database, Preferences.NAME_NAME_FORMAT).fetch();
+        const namePreference = await queryPreferencesByCategoryAndName(database, Preferences.CATEGORY_DISPLAY_SETTINGS, Preferences.NAME_NAME_FORMAT).fetch();
         const teammateDisplayNameSetting = getTeammateNameDisplaySetting(namePreference, config.LockTeammateNameDisplay, config.TeammateNameDisplay, license);
         const currentUser = await getCurrentUser(database);
         const username = displayUsername(user, currentUser?.locale, teammateDisplayNameSetting);

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 {

app/client/rest/apps.ts

@@ -3,15 +3,13 @@
 
 import {buildQueryString} from '@utils/helpers';
 
-import type ClientBase from './base';
-
 export interface ClientAppsMix {
     executeAppCall: <Res = unknown>(call: AppCallRequest, trackAsSubmit: boolean) => Promise<AppCallResponse<Res>>;
     getAppsBindings: (userID: string, channelID: string, teamID: string) => Promise<AppBinding[]>;
 }
 
-const ClientApps = <TBase extends Constructor<ClientBase>>(superclass: TBase) => class extends superclass {
-    executeAppCall = async (call: AppCallRequest, trackAsSubmit: boolean) => {
+const ClientApps = (superclass: any) => class extends superclass {
+    executeAppCall = async <Res = unknown>(call: AppCallRequest, trackAsSubmit: boolean): Promise<AppCallResponse<Res>> => {
         const callCopy = {
             ...call,
             context: {

app/client/rest/base.ts

@@ -26,7 +26,6 @@ export default class ClientBase {
     requestHeaders: {[x: string]: string} = {};
     serverVersion = '';
     urlVersion = '/api/v4';
-    enableLogging = false;
 
     constructor(apiClient: APIClientInterface, serverUrl: string, bearerToken?: string, csrfToken?: string) {
         this.apiClient = apiClient;
@@ -46,10 +45,6 @@ export default class ClientBase {
         }
     }
 
-    getBaseRoute() {
-        return this.apiClient.baseUrl || '';
-    }
-
     getAbsoluteUrl(baseUrl?: string) {
         if (typeof baseUrl !== 'string' || !baseUrl.startsWith('/')) {
             return baseUrl;
@@ -182,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`;
     }
@@ -308,7 +299,7 @@ export default class ClientBase {
         }
 
         if (response.ok) {
-            return returnDataOnly ? (response.data || {}) : response;
+            return returnDataOnly ? response.data : response;
         }
 
         throw new ClientError(this.apiClient.baseUrl, {

app/client/rest/categories.ts

@@ -1,8 +1,6 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
-import type ClientBase from './base';
-
 export interface ClientCategoriesMix {
     getCategories: (userId: string, teamId: string) => Promise<CategoriesWithOrder>;
     getCategoriesOrder: (userId: string, teamId: string) => Promise<string[]>;
@@ -10,7 +8,7 @@ export interface ClientCategoriesMix {
     updateChannelCategories: (userId: string, teamId: string, categories: CategoryWithChannels[]) => Promise<CategoriesWithOrder>;
 }
 
-const ClientCategories = <TBase extends Constructor<ClientBase>>(superclass: TBase) => class extends superclass {
+const ClientCategories = (superclass: any) => class extends superclass {
     getCategories = async (userId: string, teamId: string) => {
         return this.doFetch(
             `${this.getCategoriesRoute(userId, teamId)}`,

app/client/rest/channels.ts

@@ -5,8 +5,6 @@ import {buildQueryString} from '@utils/helpers';
 
 import {PER_PAGE_DEFAULT} from './constants';
 
-import type ClientBase from './base';
-
 export interface ClientChannelsMix {
     getAllChannels: (page?: number, perPage?: number, notAssociatedToGroup?: string, excludeDefaultChannels?: boolean, includeTotalCount?: boolean) => Promise<any>;
     createChannel: (channel: Channel) => Promise<Channel>;
@@ -42,11 +40,9 @@ export interface ClientChannelsMix {
     searchChannels: (teamId: string, term: string) => Promise<Channel[]>;
     searchArchivedChannels: (teamId: string, term: string) => Promise<Channel[]>;
     searchAllChannels: (term: string, teamIds: string[], archivedOnly?: boolean) => Promise<Channel[]>;
-    updateChannelMemberSchemeRoles: (channelId: string, userId: string, isSchemeUser: boolean, isSchemeAdmin: boolean) => Promise<any>;
-    getMemberInChannel: (channelId: string, userId: string) => Promise<any>;
 }
 
-const ClientChannels = <TBase extends Constructor<ClientBase>>(superclass: TBase) => class extends superclass {
+const ClientChannels = (superclass: any) => class extends superclass {
     getAllChannels = async (page = 0, perPage = PER_PAGE_DEFAULT, notAssociatedToGroup = '', excludeDefaultChannels = false, includeTotalCount = false) => {
         const queryData = {
             page,
@@ -62,7 +58,7 @@ const ClientChannels = <TBase extends Constructor<ClientBase>>(superclass: TBase
     };
 
     createChannel = async (channel: Channel) => {
-        this.analytics?.trackAPI('api_channels_create', {team_id: channel.team_id});
+        this.analytics.trackAPI('api_channels_create', {team_id: channel.team_id});
 
         return this.doFetch(
             `${this.getChannelsRoute()}`,
@@ -71,7 +67,7 @@ const ClientChannels = <TBase extends Constructor<ClientBase>>(superclass: TBase
     };
 
     createDirectChannel = async (userIds: string[]) => {
-        this.analytics?.trackAPI('api_channels_create_direct');
+        this.analytics.trackAPI('api_channels_create_direct');
 
         return this.doFetch(
             `${this.getChannelsRoute()}/direct`,
@@ -80,7 +76,7 @@ const ClientChannels = <TBase extends Constructor<ClientBase>>(superclass: TBase
     };
 
     createGroupChannel = async (userIds: string[]) => {
-        this.analytics?.trackAPI('api_channels_create_group');
+        this.analytics.trackAPI('api_channels_create_group');
 
         return this.doFetch(
             `${this.getChannelsRoute()}/group`,
@@ -89,7 +85,7 @@ const ClientChannels = <TBase extends Constructor<ClientBase>>(superclass: TBase
     };
 
     deleteChannel = async (channelId: string) => {
-        this.analytics?.trackAPI('api_channels_delete', {channel_id: channelId});
+        this.analytics.trackAPI('api_channels_delete', {channel_id: channelId});
 
         return this.doFetch(
             `${this.getChannelRoute(channelId)}`,
@@ -98,7 +94,7 @@ const ClientChannels = <TBase extends Constructor<ClientBase>>(superclass: TBase
     };
 
     unarchiveChannel = async (channelId: string) => {
-        this.analytics?.trackAPI('api_channels_unarchive', {channel_id: channelId});
+        this.analytics.trackAPI('api_channels_unarchive', {channel_id: channelId});
 
         return this.doFetch(
             `${this.getChannelRoute(channelId)}/restore`,
@@ -107,7 +103,7 @@ const ClientChannels = <TBase extends Constructor<ClientBase>>(superclass: TBase
     };
 
     updateChannel = async (channel: Channel) => {
-        this.analytics?.trackAPI('api_channels_update', {channel_id: channel.id});
+        this.analytics.trackAPI('api_channels_update', {channel_id: channel.id});
 
         return this.doFetch(
             `${this.getChannelRoute(channel.id)}`,
@@ -120,7 +116,7 @@ const ClientChannels = <TBase extends Constructor<ClientBase>>(superclass: TBase
     };
 
     updateChannelPrivacy = async (channelId: string, privacy: any) => {
-        this.analytics?.trackAPI('api_channels_update_privacy', {channel_id: channelId, privacy});
+        this.analytics.trackAPI('api_channels_update_privacy', {channel_id: channelId, privacy});
 
         return this.doFetch(
             `${this.getChannelRoute(channelId)}/privacy`,
@@ -129,7 +125,7 @@ const ClientChannels = <TBase extends Constructor<ClientBase>>(superclass: TBase
     };
 
     patchChannel = async (channelId: string, channelPatch: Partial<Channel>) => {
-        this.analytics?.trackAPI('api_channels_patch', {channel_id: channelId});
+        this.analytics.trackAPI('api_channels_patch', {channel_id: channelId});
 
         return this.doFetch(
             `${this.getChannelRoute(channelId)}/patch`,
@@ -138,7 +134,7 @@ const ClientChannels = <TBase extends Constructor<ClientBase>>(superclass: TBase
     };
 
     updateChannelNotifyProps = async (props: ChannelNotifyProps & {channel_id: string; user_id: string}) => {
-        this.analytics?.trackAPI('api_users_update_channel_notifications', {channel_id: props.channel_id});
+        this.analytics.trackAPI('api_users_update_channel_notifications', {channel_id: props.channel_id});
 
         return this.doFetch(
             `${this.getChannelMemberRoute(props.channel_id, props.user_id)}/notify_props`,
@@ -147,7 +143,7 @@ const ClientChannels = <TBase extends Constructor<ClientBase>>(superclass: TBase
     };
 
     getChannel = async (channelId: string) => {
-        this.analytics?.trackAPI('api_channel_get', {channel_id: channelId});
+        this.analytics.trackAPI('api_channel_get', {channel_id: channelId});
 
         return this.doFetch(
             `${this.getChannelRoute(channelId)}`,
@@ -163,7 +159,7 @@ const ClientChannels = <TBase extends Constructor<ClientBase>>(superclass: TBase
     };
 
     getChannelByNameAndTeamName = async (teamName: string, channelName: string, includeDeleted = false) => {
-        this.analytics?.trackAPI('api_channel_get_by_name_and_teamName', {channel_name: channelName, team_name: teamName, include_deleted: includeDeleted});
+        this.analytics.trackAPI('api_channel_get_by_name_and_teamName', {channel_name: channelName, team_name: teamName, include_deleted: includeDeleted});
 
         return this.doFetch(
             `${this.getTeamNameRoute(teamName)}/channels/name/${channelName}?include_deleted=${includeDeleted}`,
@@ -245,7 +241,7 @@ const ClientChannels = <TBase extends Constructor<ClientBase>>(superclass: TBase
     };
 
     addToChannel = async (userId: string, channelId: string, postRootId = '') => {
-        this.analytics?.trackAPI('api_channels_add_member', {channel_id: channelId});
+        this.analytics.trackAPI('api_channels_add_member', {channel_id: channelId});
 
         const member = {user_id: userId, channel_id: channelId, post_root_id: postRootId};
         return this.doFetch(
@@ -255,7 +251,7 @@ const ClientChannels = <TBase extends Constructor<ClientBase>>(superclass: TBase
     };
 
     removeFromChannel = async (userId: string, channelId: string) => {
-        this.analytics?.trackAPI('api_channels_remove_member', {channel_id: channelId});
+        this.analytics.trackAPI('api_channels_remove_member', {channel_id: channelId});
 
         return this.doFetch(
             `${this.getChannelMemberRoute(channelId, userId)}`,
@@ -331,25 +327,6 @@ const ClientChannels = <TBase extends Constructor<ClientBase>>(superclass: TBase
             {method: 'post', body},
         );
     };
-
-    // Update a channel member's scheme_admin/scheme_user properties. Typically
-    // this should either be scheme_admin=false, scheme_user=true for ordinary
-    // channel member, or scheme_admin=true, scheme_user=true for a channel
-    // admin.
-    updateChannelMemberSchemeRoles = (channelId: string, userId: string, isSchemeUser: boolean, isSchemeAdmin: boolean) => {
-        const body = {scheme_user: isSchemeUser, scheme_admin: isSchemeAdmin};
-        return this.doFetch(
-            `${this.getChannelMembersRoute(channelId)}/${userId}/schemeRoles`,
-            {method: 'put', body},
-        );
-    };
-
-    getMemberInChannel = (channelId: string, userId: string) => {
-        return this.doFetch(
-            `${this.getChannelMembersRoute(channelId)}/${userId}`,
-            {method: 'get'},
-        );
-    };
 };
 
 export default ClientChannels;

app/client/rest/emojis.ts

@@ -5,8 +5,6 @@ import {buildQueryString} from '@utils/helpers';
 
 import {PER_PAGE_DEFAULT} from './constants';
 
-import type ClientBase from './base';
-
 export interface ClientEmojisMix {
     getCustomEmoji: (id: string) => Promise<CustomEmoji>;
     getCustomEmojiByName: (name: string) => Promise<CustomEmoji>;
@@ -17,7 +15,7 @@ export interface ClientEmojisMix {
     autocompleteCustomEmoji: (name: string) => Promise<CustomEmoji[]>;
 }
 
-const ClientEmojis = <TBase extends Constructor<ClientBase>>(superclass: TBase) => class extends superclass {
+const ClientEmojis = (superclass: any) => class extends superclass {
     getCustomEmoji = async (id: string) => {
         return this.doFetch(
             `${this.getEmojisRoute()}/${id}`,

app/client/rest/files.ts

@@ -1,10 +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 ClientBase from './base';
-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;
@@ -23,7 +22,7 @@ export interface ClientFilesMix {
     searchFilesWithParams: (teamId: string, FileSearchParams: string) => Promise<FileSearchRequest>;
 }
 
-const ClientFiles = <TBase extends Constructor<ClientBase>>(superclass: TBase) => class extends superclass {
+const ClientFiles = (superclass: any) => class extends superclass {
     getFileUrl(fileId: string, timestamp: number) {
         let url = `${this.apiClient.baseUrl}${this.getFileRoute(fileId)}`;
         if (timestamp) {
@@ -77,17 +76,13 @@ const ClientFiles = <TBase extends Constructor<ClientBase>>(superclass: TBase) =
             },
             timeoutInterval: toMilliseconds({minutes: 3}),
         };
-        if (!file.localPath) {
-            throw new Error('file does not have local path defined');
-        }
-
         const promise = this.apiClient.upload(url, file.localPath, options) as ProgressPromise<ClientResponse>;
         promise.progress!(onProgress).then(onComplete).catch(onError);
         return promise.cancel!;
     };
 
     searchFilesWithParams = async (teamId: string, params: FileSearchParams) => {
-        this.analytics?.trackAPI('api_files_search');
+        this.analytics.trackAPI('api_files_search');
         const endpoint = teamId ? `${this.getTeamRoute(teamId)}/files/search` : `${this.getFilesRoute()}/search`;
         return this.doFetch(endpoint, {method: 'post', body: params});
     };

app/client/rest/general.ts

@@ -3,16 +3,8 @@
 
 import {buildQueryString} from '@utils/helpers';
 
-import {PER_PAGE_DEFAULT} from './constants';
 import ClientError from './error';
 
-import type ClientBase from './base';
-
-type PoliciesResponse<T> = {
-    policies: T[];
-    total_count: number;
-}
-
 export interface ClientGeneralMix {
     getOpenGraphMetadata: (url: string) => Promise<any>;
     ping: (deviceId?: string, timeoutInterval?: number) => Promise<any>;
@@ -20,14 +12,12 @@ 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>>;
 }
 
-const ClientGeneral = <TBase extends Constructor<ClientBase>>(superclass: TBase) => class extends superclass {
+const ClientGeneral = (superclass: any) => class extends superclass {
     getOpenGraphMetadata = async (url: string) => {
         return this.doFetch(
             `${this.urlVersion}/opengraph`,
@@ -51,7 +41,7 @@ const ClientGeneral = <TBase extends Constructor<ClientBase>>(superclass: TBase)
         const url = `${this.urlVersion}/logs`;
 
         if (!this.enableLogging) {
-            throw new ClientError(this.apiClient.baseUrl, {
+            throw new ClientError(this.client.baseUrl, {
                 message: 'Logging disabled.',
                 url,
             });
@@ -84,23 +74,9 @@ const ClientGeneral = <TBase extends Constructor<ClientBase>>(superclass: TBase)
         );
     };
 
-    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'},
         );
     };

app/client/rest/groups.ts

@@ -5,8 +5,6 @@ import {buildQueryString} from '@utils/helpers';
 
 import {PER_PAGE_DEFAULT} from './constants';
 
-import type ClientBase from './base';
-
 export interface ClientGroupsMix {
     getGroup: (id: string) => Promise<Group>;
     getGroups: (params: {query?: string; filterAllowReference?: boolean; page?: number; perPage?: number; since?: number; includeMemberCount?: boolean}) => Promise<Group[]>;
@@ -18,7 +16,7 @@ export interface ClientGroupsMix {
     getAllTeamsAssociatedToGroup: (groupId: string, filterAllowReference?: boolean) => Promise<{groupTeams: GroupTeam[]}>;
 }
 
-const ClientGroups = <TBase extends Constructor<ClientBase>>(superclass: TBase) => class extends superclass {
+const ClientGroups = (superclass: any) => class extends superclass {
     getGroup = async (id: string) => {
         return this.doFetch(
             `${this.urlVersion}/groups/${id}`,

app/client/rest/integrations.ts

@@ -5,8 +5,6 @@ import {buildQueryString} from '@utils/helpers';
 
 import {PER_PAGE_DEFAULT} from './constants';
 
-import type ClientBase from './base';
-
 export interface ClientIntegrationsMix {
     getCommandsList: (teamId: string) => Promise<Command[]>;
     getCommandAutocompleteSuggestionsList: (userInput: string, teamId: string, channelId: string, rootId?: string) => Promise<AutocompleteSuggestion[]>;
@@ -16,7 +14,7 @@ export interface ClientIntegrationsMix {
     submitInteractiveDialog: (data: DialogSubmission) => Promise<any>;
 }
 
-const ClientIntegrations = <TBase extends Constructor<ClientBase>>(superclass: TBase) => class extends superclass {
+const ClientIntegrations = (superclass: any) => class extends superclass {
     getCommandsList = async (teamId: string) => {
         return this.doFetch(
             `${this.getCommandsRoute()}?team_id=${teamId}`,
@@ -39,7 +37,7 @@ const ClientIntegrations = <TBase extends Constructor<ClientBase>>(superclass: T
     };
 
     executeCommand = async (command: string, commandArgs = {}) => {
-        this.analytics?.trackAPI('api_integrations_used');
+        this.analytics.trackAPI('api_integrations_used');
 
         return this.doFetch(
             `${this.getCommandsRoute()}/execute`,
@@ -48,7 +46,7 @@ const ClientIntegrations = <TBase extends Constructor<ClientBase>>(superclass: T
     };
 
     addCommand = async (command: Command) => {
-        this.analytics?.trackAPI('api_integrations_created');
+        this.analytics.trackAPI('api_integrations_created');
 
         return this.doFetch(
             `${this.getCommandsRoute()}`,
@@ -57,7 +55,7 @@ const ClientIntegrations = <TBase extends Constructor<ClientBase>>(superclass: T
     };
 
     submitInteractiveDialog = async (data: DialogSubmission) => {
-        this.analytics?.trackAPI('api_interactive_messages_dialog_submitted');
+        this.analytics.trackAPI('api_interactive_messages_dialog_submitted');
         return this.doFetch(
             `${this.urlVersion}/actions/dialogs/submit`,
             {method: 'post', body: data},

app/client/rest/nps.ts

@@ -3,13 +3,11 @@
 
 import {General} from '@constants';
 
-import type ClientBase from './base';
-
 export interface ClientNPSMix {
     npsGiveFeedbackAction: () => Promise<Post>;
 }
 
-const ClientNPS = <TBase extends Constructor<ClientBase>>(superclass: TBase) => class extends superclass {
+const ClientNPS = (superclass: any) => class extends superclass {
     npsGiveFeedbackAction = async () => {
         return this.doFetch(
             `${this.getPluginRoute(General.NPS_PLUGIN_ID)}/api/v1/give_feedback`,

app/client/rest/plugins.ts

@@ -1,13 +1,11 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
-import type ClientBase from './base';
-
 export interface ClientPluginsMix {
     getPluginsManifests: () => Promise<ClientPluginManifest[]>;
 }
 
-const ClientPlugins = <TBase extends Constructor<ClientBase>>(superclass: TBase) => class extends superclass {
+const ClientPlugins = (superclass: any) => class extends superclass {
     getPluginsManifests = async () => {
         return this.doFetch(
             `${this.getPluginsRoute()}/webapp`,

app/client/rest/posts.ts

@@ -5,8 +5,6 @@ import {buildQueryString} from '@utils/helpers';
 
 import {PER_PAGE_DEFAULT} from './constants';
 
-import type ClientBase from './base';
-
 export interface ClientPostsMix {
     createPost: (post: Post) => Promise<Post>;
     updatePost: (post: Post) => Promise<Post>;
@@ -33,12 +31,12 @@ export interface ClientPostsMix {
     doPostActionWithCookie: (postId: string, actionId: string, actionCookie: string, selectedOption?: string) => Promise<any>;
 }
 
-const ClientPosts = <TBase extends Constructor<ClientBase>>(superclass: TBase) => class extends superclass {
+const ClientPosts = (superclass: any) => class extends superclass {
     createPost = async (post: Post) => {
-        this.analytics?.trackAPI('api_posts_create', {channel_id: post.channel_id});
+        this.analytics.trackAPI('api_posts_create', {channel_id: post.channel_id});
 
         if (post.root_id != null && post.root_id !== '') {
-            this.analytics?.trackAPI('api_posts_replied', {channel_id: post.channel_id});
+            this.analytics.trackAPI('api_posts_replied', {channel_id: post.channel_id});
         }
 
         return this.doFetch(
@@ -48,7 +46,7 @@ const ClientPosts = <TBase extends Constructor<ClientBase>>(superclass: TBase) =
     };
 
     updatePost = async (post: Post) => {
-        this.analytics?.trackAPI('api_posts_update', {channel_id: post.channel_id});
+        this.analytics.trackAPI('api_posts_update', {channel_id: post.channel_id});
 
         return this.doFetch(
             `${this.getPostRoute(post.id)}`,
@@ -64,7 +62,7 @@ const ClientPosts = <TBase extends Constructor<ClientBase>>(superclass: TBase) =
     };
 
     patchPost = async (postPatch: Partial<Post> & {id: string}) => {
-        this.analytics?.trackAPI('api_posts_patch', {channel_id: postPatch.channel_id});
+        this.analytics.trackAPI('api_posts_patch', {channel_id: postPatch.channel_id});
 
         return this.doFetch(
             `${this.getPostRoute(postPatch.id)}/patch`,
@@ -73,7 +71,7 @@ const ClientPosts = <TBase extends Constructor<ClientBase>>(superclass: TBase) =
     };
 
     deletePost = async (postId: string) => {
-        this.analytics?.trackAPI('api_posts_delete');
+        this.analytics.trackAPI('api_posts_delete');
 
         return this.doFetch(
             `${this.getPostRoute(postId)}`,
@@ -81,7 +79,7 @@ const ClientPosts = <TBase extends Constructor<ClientBase>>(superclass: TBase) =
         );
     };
 
-    getPostThread = (postId: string, options: FetchPaginatedThreadOptions) => {
+    getPostThread = (postId: string, options: FetchPaginatedThreadOptions): Promise<PostResponse> => {
         const {
             fetchThreads = true,
             collapsedThreads = false,
@@ -112,7 +110,7 @@ const ClientPosts = <TBase extends Constructor<ClientBase>>(superclass: TBase) =
     };
 
     getPostsBefore = async (channelId: string, postId: string, page = 0, perPage = PER_PAGE_DEFAULT, collapsedThreads = false, collapsedThreadsExtended = false) => {
-        this.analytics?.trackAPI('api_posts_get_before', {channel_id: channelId});
+        this.analytics.trackAPI('api_posts_get_before', {channel_id: channelId});
 
         return this.doFetch(
             `${this.getChannelRoute(channelId)}/posts${buildQueryString({before: postId, page, per_page: perPage, collapsedThreads, collapsedThreadsExtended})}`,
@@ -121,7 +119,7 @@ const ClientPosts = <TBase extends Constructor<ClientBase>>(superclass: TBase) =
     };
 
     getPostsAfter = async (channelId: string, postId: string, page = 0, perPage = PER_PAGE_DEFAULT, collapsedThreads = false, collapsedThreadsExtended = false) => {
-        this.analytics?.trackAPI('api_posts_get_after', {channel_id: channelId});
+        this.analytics.trackAPI('api_posts_get_after', {channel_id: channelId});
 
         return this.doFetch(
             `${this.getChannelRoute(channelId)}/posts${buildQueryString({after: postId, page, per_page: perPage, collapsedThreads, collapsedThreadsExtended})}`,
@@ -137,7 +135,7 @@ const ClientPosts = <TBase extends Constructor<ClientBase>>(superclass: TBase) =
     };
 
     getSavedPosts = async (userId: string, channelId = '', teamId = '', page = 0, perPage = PER_PAGE_DEFAULT) => {
-        this.analytics?.trackAPI('api_posts_get_flagged', {team_id: teamId});
+        this.analytics.trackAPI('api_posts_get_flagged', {team_id: teamId});
 
         return this.doFetch(
             `${this.getUserRoute(userId)}/posts/flagged${buildQueryString({channel_id: channelId, team_id: teamId, page, per_page: perPage})}`,
@@ -146,7 +144,7 @@ const ClientPosts = <TBase extends Constructor<ClientBase>>(superclass: TBase) =
     };
 
     getPinnedPosts = async (channelId: string) => {
-        this.analytics?.trackAPI('api_posts_get_pinned', {channel_id: channelId});
+        this.analytics.trackAPI('api_posts_get_pinned', {channel_id: channelId});
         return this.doFetch(
             `${this.getChannelRoute(channelId)}/pinned`,
             {method: 'get'},
@@ -154,7 +152,7 @@ const ClientPosts = <TBase extends Constructor<ClientBase>>(superclass: TBase) =
     };
 
     markPostAsUnread = async (userId: string, postId: string) => {
-        this.analytics?.trackAPI('api_post_set_unread_post');
+        this.analytics.trackAPI('api_post_set_unread_post');
 
         // collapsed_threads_supported is not based on user preferences but to know if "CLIENT" supports CRT
         const body = JSON.stringify({collapsed_threads_supported: true});
@@ -166,7 +164,7 @@ const ClientPosts = <TBase extends Constructor<ClientBase>>(superclass: TBase) =
     };
 
     pinPost = async (postId: string) => {
-        this.analytics?.trackAPI('api_posts_pin');
+        this.analytics.trackAPI('api_posts_pin');
 
         return this.doFetch(
             `${this.getPostRoute(postId)}/pin`,
@@ -175,7 +173,7 @@ const ClientPosts = <TBase extends Constructor<ClientBase>>(superclass: TBase) =
     };
 
     unpinPost = async (postId: string) => {
-        this.analytics?.trackAPI('api_posts_unpin');
+        this.analytics.trackAPI('api_posts_unpin');
 
         return this.doFetch(
             `${this.getPostRoute(postId)}/unpin`,
@@ -184,7 +182,7 @@ const ClientPosts = <TBase extends Constructor<ClientBase>>(superclass: TBase) =
     };
 
     addReaction = async (userId: string, postId: string, emojiName: string) => {
-        this.analytics?.trackAPI('api_reactions_save', {post_id: postId});
+        this.analytics.trackAPI('api_reactions_save', {post_id: postId});
 
         return this.doFetch(
             `${this.getReactionsRoute()}`,
@@ -193,7 +191,7 @@ const ClientPosts = <TBase extends Constructor<ClientBase>>(superclass: TBase) =
     };
 
     removeReaction = async (userId: string, postId: string, emojiName: string) => {
-        this.analytics?.trackAPI('api_reactions_delete', {post_id: postId});
+        this.analytics.trackAPI('api_reactions_delete', {post_id: postId});
 
         return this.doFetch(
             `${this.getUserRoute(userId)}/posts/${postId}/reactions/${emojiName}`,
@@ -209,7 +207,7 @@ const ClientPosts = <TBase extends Constructor<ClientBase>>(superclass: TBase) =
     };
 
     searchPostsWithParams = async (teamId: string, params: PostSearchParams) => {
-        this.analytics?.trackAPI('api_posts_search');
+        this.analytics.trackAPI('api_posts_search');
         const endpoint = teamId ? `${this.getTeamRoute(teamId)}/posts/search` : `${this.getPostsRoute()}/search`;
         return this.doFetch(endpoint, {method: 'post', body: params});
     };
@@ -224,9 +222,9 @@ const ClientPosts = <TBase extends Constructor<ClientBase>>(superclass: TBase) =
 
     doPostActionWithCookie = async (postId: string, actionId: string, actionCookie: string, selectedOption = '') => {
         if (selectedOption) {
-            this.analytics?.trackAPI('api_interactive_messages_menu_selected');
+            this.analytics.trackAPI('api_interactive_messages_menu_selected');
         } else {
-            this.analytics?.trackAPI('api_interactive_messages_button_clicked');
+            this.analytics.trackAPI('api_interactive_messages_button_clicked');
         }
 
         const msg: any = {

app/client/rest/preferences.ts

@@ -1,17 +1,15 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
-import type ClientBase from './base';
-
 export interface ClientPreferencesMix {
     savePreferences: (userId: string, preferences: PreferenceType[]) => Promise<any>;
     deletePreferences: (userId: string, preferences: PreferenceType[]) => Promise<any>;
     getMyPreferences: () => Promise<PreferenceType[]>;
 }
 
-const ClientPreferences = <TBase extends Constructor<ClientBase>>(superclass: TBase) => class extends superclass {
+const ClientPreferences = (superclass: any) => class extends superclass {
     savePreferences = async (userId: string, preferences: PreferenceType[]) => {
-        this.analytics?.trackAPI('action_posts_flag');
+        this.analytics.trackAPI('action_posts_flag');
         return this.doFetch(
             `${this.getPreferencesRoute(userId)}`,
             {method: 'put', body: preferences},
@@ -26,7 +24,7 @@ const ClientPreferences = <TBase extends Constructor<ClientBase>>(superclass: TB
     };
 
     deletePreferences = async (userId: string, preferences: PreferenceType[]) => {
-        this.analytics?.trackAPI('action_posts_unflag');
+        this.analytics.trackAPI('action_posts_unflag');
         return this.doFetch(
             `${this.getPreferencesRoute(userId)}/delete`,
             {method: 'post', body: preferences},

app/client/rest/teams.ts

@@ -5,8 +5,6 @@ import {buildQueryString} from '@utils/helpers';
 
 import {PER_PAGE_DEFAULT} from './constants';
 
-import type ClientBase from './base';
-
 export interface ClientTeamsMix {
     createTeam: (team: Team) => Promise<Team>;
     deleteTeam: (teamId: string) => Promise<any>;
@@ -20,19 +18,16 @@ 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>;
     getTeamIconUrl: (teamId: string, lastTeamIconUpdate: number) => string;
 }
 
-const ClientTeams = <TBase extends Constructor<ClientBase>>(superclass: TBase) => class extends superclass {
+const ClientTeams = (superclass: any) => class extends superclass {
     createTeam = async (team: Team) => {
-        this.analytics?.trackAPI('api_teams_create');
+        this.analytics.trackAPI('api_teams_create');
 
         return this.doFetch(
             `${this.getTeamsRoute()}`,
@@ -41,7 +36,7 @@ const ClientTeams = <TBase extends Constructor<ClientBase>>(superclass: TBase) =
     };
 
     deleteTeam = async (teamId: string) => {
-        this.analytics?.trackAPI('api_teams_delete');
+        this.analytics.trackAPI('api_teams_delete');
 
         return this.doFetch(
             `${this.getTeamRoute(teamId)}`,
@@ -50,7 +45,7 @@ const ClientTeams = <TBase extends Constructor<ClientBase>>(superclass: TBase) =
     };
 
     updateTeam = async (team: Team) => {
-        this.analytics?.trackAPI('api_teams_update_name', {team_id: team.id});
+        this.analytics.trackAPI('api_teams_update_name', {team_id: team.id});
 
         return this.doFetch(
             `${this.getTeamRoute(team.id)}`,
@@ -59,7 +54,7 @@ const ClientTeams = <TBase extends Constructor<ClientBase>>(superclass: TBase) =
     };
 
     patchTeam = async (team: Partial<Team> & {id: string}) => {
-        this.analytics?.trackAPI('api_teams_patch_name', {team_id: team.id});
+        this.analytics.trackAPI('api_teams_patch_name', {team_id: team.id});
 
         return this.doFetch(
             `${this.getTeamRoute(team.id)}/patch`,
@@ -82,7 +77,7 @@ const ClientTeams = <TBase extends Constructor<ClientBase>>(superclass: TBase) =
     };
 
     getTeamByName = async (teamName: string) => {
-        this.analytics?.trackAPI('api_teams_get_team_by_name');
+        this.analytics.trackAPI('api_teams_get_team_by_name');
 
         return this.doFetch(
             this.getTeamNameRoute(teamName),
@@ -125,15 +120,8 @@ const ClientTeams = <TBase extends Constructor<ClientBase>>(superclass: TBase) =
         );
     };
 
-    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});
+        this.analytics.trackAPI('api_teams_invite_members', {team_id: teamId});
 
         const member = {user_id: userId, team_id: teamId};
         return this.doFetch(
@@ -142,27 +130,6 @@ const ClientTeams = <TBase extends Constructor<ClientBase>>(superclass: TBase) =
         );
     };
 
-    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(
@@ -172,7 +139,7 @@ const ClientTeams = <TBase extends Constructor<ClientBase>>(superclass: TBase) =
     };
 
     removeFromTeam = async (teamId: string, userId: string) => {
-        this.analytics?.trackAPI('api_teams_remove_members', {team_id: teamId});
+        this.analytics.trackAPI('api_teams_remove_members', {team_id: teamId});
 
         return this.doFetch(
             `${this.getTeamMemberRoute(teamId, userId)}`,

app/client/rest/threads.ts

@@ -5,8 +5,6 @@ import {buildQueryString, isMinimumServerVersion} from '@utils/helpers';
 
 import {PER_PAGE_DEFAULT} from './constants';
 
-import type ClientBase from './base';
-
 export interface ClientThreadsMix {
     getThreads: (userId: string, teamId: string, before?: string, after?: string, pageSize?: number, deleted?: boolean, unread?: boolean, since?: number, totalsOnly?: boolean, serverVersion?: string) => Promise<GetUserThreadsResponse>;
     getThread: (userId: string, teamId: string, threadId: string, extended?: boolean) => Promise<any>;
@@ -16,7 +14,7 @@ export interface ClientThreadsMix {
     updateThreadFollow: (userId: string, teamId: string, threadId: string, state: boolean) => Promise<any>;
 }
 
-const ClientThreads = <TBase extends Constructor<ClientBase>>(superclass: TBase) => class extends superclass {
+const ClientThreads = (superclass: any) => class extends superclass {
     getThreads = async (userId: string, teamId: string, before = '', after = '', pageSize = PER_PAGE_DEFAULT, deleted = false, unread = false, since = 0, totalsOnly = false, serverVersion = '') => {
         const queryStringObj: Record<string, any> = {
             extended: 'true',

app/client/rest/tos.ts

@@ -1,14 +1,12 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
-import type ClientBase from './base';
-
 export interface ClientTosMix {
     updateMyTermsOfServiceStatus: (termsOfServiceId: string, accepted: boolean) => Promise<{status: string}>;
     getTermsOfService: () => Promise<TermsOfService>;
 }
 
-const ClientTos = <TBase extends Constructor<ClientBase>>(superclass: TBase) => class extends superclass {
+const ClientTos = (superclass: any) => class extends superclass {
     updateMyTermsOfServiceStatus = async (termsOfServiceId: string, accepted: boolean) => {
         return this.doFetch(
             `${this.getUserRoute('me')}/terms_of_service`,

app/client/rest/users.ts

@@ -6,8 +6,6 @@ import {buildQueryString} from '@utils/helpers';
 
 import {PER_PAGE_DEFAULT} from './constants';
 
-import type ClientBase from './base';
-
 export interface ClientUsersMix {
     createUser: (user: UserProfile, token: string, inviteId: string) => Promise<UserProfile>;
     patchMe: (userPatch: Partial<UserProfile>) => Promise<UserProfile>;
@@ -26,7 +24,7 @@ export interface ClientUsersMix {
     getProfilesInTeam: (teamId: string, page?: number, perPage?: number, sort?: string, options?: Record<string, any>) => Promise<UserProfile[]>;
     getProfilesNotInTeam: (teamId: string, groupConstrained: boolean, page?: number, perPage?: number) => Promise<UserProfile[]>;
     getProfilesWithoutTeam: (page?: number, perPage?: number, options?: Record<string, any>) => Promise<UserProfile[]>;
-    getProfilesInChannel: (channelId: string, options?: GetUsersOptions) => Promise<UserProfile[]>;
+    getProfilesInChannel: (channelId: string, page?: number, perPage?: number, sort?: string) => Promise<UserProfile[]>;
     getProfilesInGroupChannels: (channelsIds: string[]) => Promise<{[x: string]: UserProfile[]}>;
     getProfilesNotInChannel: (teamId: string, channelId: string, groupConstrained: boolean, page?: number, perPage?: number) => Promise<UserProfile[]>;
     getMe: () => Promise<UserProfile>;
@@ -39,7 +37,7 @@ export interface ClientUsersMix {
     getSessions: (userId: string) => Promise<Session[]>;
     checkUserMfa: (loginId: string) => Promise<{mfa_required: boolean}>;
     attachDevice: (deviceId: string) => Promise<any>;
-    searchUsers: (term: string, options: SearchUserOptions) => Promise<UserProfile[]>;
+    searchUsers: (term: string, options: any) => Promise<UserProfile[]>;
     getStatusesByIds: (userIds: string[]) => Promise<UserStatus[]>;
     getStatus: (userId: string) => Promise<UserStatus>;
     updateStatus: (status: UserStatus) => Promise<UserStatus>;
@@ -48,9 +46,9 @@ export interface ClientUsersMix {
     removeRecentCustomStatus: (customStatus: UserCustomStatus) => Promise<{status: string}>;
 }
 
-const ClientUsers = <TBase extends Constructor<ClientBase>>(superclass: TBase) => class extends superclass {
+const ClientUsers = (superclass: any) => class extends superclass {
     createUser = async (user: UserProfile, token: string, inviteId: string) => {
-        this.analytics?.trackAPI('api_users_create');
+        this.analytics.trackAPI('api_users_create');
 
         const queryParams: any = {};
 
@@ -76,7 +74,7 @@ const ClientUsers = <TBase extends Constructor<ClientBase>>(superclass: TBase) =
     };
 
     patchUser = async (userPatch: Partial<UserProfile> & {id: string}) => {
-        this.analytics?.trackAPI('api_users_patch');
+        this.analytics.trackAPI('api_users_patch');
 
         return this.doFetch(
             `${this.getUserRoute(userPatch.id)}/patch`,
@@ -85,7 +83,7 @@ const ClientUsers = <TBase extends Constructor<ClientBase>>(superclass: TBase) =
     };
 
     updateUser = async (user: UserProfile) => {
-        this.analytics?.trackAPI('api_users_update');
+        this.analytics.trackAPI('api_users_update');
 
         return this.doFetch(
             `${this.getUserRoute(user.id)}`,
@@ -94,7 +92,7 @@ const ClientUsers = <TBase extends Constructor<ClientBase>>(superclass: TBase) =
     };
 
     demoteUserToGuest = async (userId: string) => {
-        this.analytics?.trackAPI('api_users_demote_user_to_guest');
+        this.analytics.trackAPI('api_users_demote_user_to_guest');
 
         return this.doFetch(
             `${this.getUserRoute(userId)}/demote`,
@@ -103,7 +101,7 @@ const ClientUsers = <TBase extends Constructor<ClientBase>>(superclass: TBase) =
     };
 
     getKnownUsers = async () => {
-        this.analytics?.trackAPI('api_get_known_users');
+        this.analytics.trackAPI('api_get_known_users');
 
         return this.doFetch(
             `${this.getUsersRoute()}/known`,
@@ -112,7 +110,7 @@ const ClientUsers = <TBase extends Constructor<ClientBase>>(superclass: TBase) =
     };
 
     sendPasswordResetEmail = async (email: string) => {
-        this.analytics?.trackAPI('api_users_send_password_reset');
+        this.analytics.trackAPI('api_users_send_password_reset');
 
         return this.doFetch(
             `${this.getUsersRoute()}/password/reset/send`,
@@ -121,7 +119,7 @@ const ClientUsers = <TBase extends Constructor<ClientBase>>(superclass: TBase) =
     };
 
     setDefaultProfileImage = async (userId: string) => {
-        this.analytics?.trackAPI('api_users_set_default_profile_picture');
+        this.analytics.trackAPI('api_users_set_default_profile_picture');
 
         return this.doFetch(
             `${this.getUserRoute(userId)}/image`,
@@ -130,10 +128,10 @@ const ClientUsers = <TBase extends Constructor<ClientBase>>(superclass: TBase) =
     };
 
     login = async (loginId: string, password: string, token = '', deviceId = '', ldapOnly = false) => {
-        this.analytics?.trackAPI('api_users_login');
+        this.analytics.trackAPI('api_users_login');
 
         if (ldapOnly) {
-            this.analytics?.trackAPI('api_users_login_ldap');
+            this.analytics.trackAPI('api_users_login_ldap');
         }
 
         const body: any = {
@@ -161,7 +159,7 @@ const ClientUsers = <TBase extends Constructor<ClientBase>>(superclass: TBase) =
     };
 
     loginById = async (id: string, password: string, token = '', deviceId = '') => {
-        this.analytics?.trackAPI('api_users_login');
+        this.analytics.trackAPI('api_users_login');
         const body: any = {
             device_id: deviceId,
             id,
@@ -183,7 +181,7 @@ const ClientUsers = <TBase extends Constructor<ClientBase>>(superclass: TBase) =
     };
 
     logout = async () => {
-        this.analytics?.trackAPI('api_users_logout');
+        this.analytics.trackAPI('api_users_logout');
 
         const response = await this.doFetch(
             `${this.getUsersRoute()}/logout`,
@@ -194,7 +192,7 @@ const ClientUsers = <TBase extends Constructor<ClientBase>>(superclass: TBase) =
     };
 
     getProfiles = async (page = 0, perPage = PER_PAGE_DEFAULT, options = {}) => {
-        this.analytics?.trackAPI('api_profiles_get');
+        this.analytics.trackAPI('api_profiles_get');
 
         return this.doFetch(
             `${this.getUsersRoute()}${buildQueryString({page, per_page: perPage, ...options})}`,
@@ -203,7 +201,7 @@ const ClientUsers = <TBase extends Constructor<ClientBase>>(superclass: TBase) =
     };
 
     getProfilesByIds = async (userIds: string[], options = {}) => {
-        this.analytics?.trackAPI('api_profiles_get_by_ids');
+        this.analytics.trackAPI('api_profiles_get_by_ids');
 
         return this.doFetch(
             `${this.getUsersRoute()}/ids${buildQueryString(options)}`,
@@ -212,7 +210,7 @@ const ClientUsers = <TBase extends Constructor<ClientBase>>(superclass: TBase) =
     };
 
     getProfilesByUsernames = async (usernames: string[]) => {
-        this.analytics?.trackAPI('api_profiles_get_by_usernames');
+        this.analytics.trackAPI('api_profiles_get_by_usernames');
 
         return this.doFetch(
             `${this.getUsersRoute()}/usernames`,
@@ -221,7 +219,7 @@ const ClientUsers = <TBase extends Constructor<ClientBase>>(superclass: TBase) =
     };
 
     getProfilesInTeam = async (teamId: string, page = 0, perPage = PER_PAGE_DEFAULT, sort = '', options = {}) => {
-        this.analytics?.trackAPI('api_profiles_get_in_team', {team_id: teamId, sort});
+        this.analytics.trackAPI('api_profiles_get_in_team', {team_id: teamId, sort});
 
         return this.doFetch(
             `${this.getUsersRoute()}${buildQueryString({...options, in_team: teamId, page, per_page: perPage, sort})}`,
@@ -230,7 +228,7 @@ const ClientUsers = <TBase extends Constructor<ClientBase>>(superclass: TBase) =
     };
 
     getProfilesNotInTeam = async (teamId: string, groupConstrained: boolean, page = 0, perPage = PER_PAGE_DEFAULT) => {
-        this.analytics?.trackAPI('api_profiles_get_not_in_team', {team_id: teamId, group_constrained: groupConstrained});
+        this.analytics.trackAPI('api_profiles_get_not_in_team', {team_id: teamId, group_constrained: groupConstrained});
 
         const queryStringObj: any = {not_in_team: teamId, page, per_page: perPage};
         if (groupConstrained) {
@@ -244,7 +242,7 @@ const ClientUsers = <TBase extends Constructor<ClientBase>>(superclass: TBase) =
     };
 
     getProfilesWithoutTeam = async (page = 0, perPage = PER_PAGE_DEFAULT, options = {}) => {
-        this.analytics?.trackAPI('api_profiles_get_without_team');
+        this.analytics.trackAPI('api_profiles_get_without_team');
 
         return this.doFetch(
             `${this.getUsersRoute()}${buildQueryString({...options, without_team: 1, page, per_page: perPage})}`,
@@ -252,10 +250,10 @@ const ClientUsers = <TBase extends Constructor<ClientBase>>(superclass: TBase) =
         );
     };
 
-    getProfilesInChannel = async (channelId: string, options: GetUsersOptions) => {
-        this.analytics?.trackAPI('api_profiles_get_in_channel', {channel_id: channelId});
+    getProfilesInChannel = async (channelId: string, page = 0, perPage = PER_PAGE_DEFAULT, sort = '') => {
+        this.analytics.trackAPI('api_profiles_get_in_channel', {channel_id: channelId});
 
-        const queryStringObj = {in_channel: channelId, ...options};
+        const queryStringObj = {in_channel: channelId, page, per_page: perPage, sort};
         return this.doFetch(
             `${this.getUsersRoute()}${buildQueryString(queryStringObj)}`,
             {method: 'get'},
@@ -263,7 +261,7 @@ const ClientUsers = <TBase extends Constructor<ClientBase>>(superclass: TBase) =
     };
 
     getProfilesInGroupChannels = async (channelsIds: string[]) => {
-        this.analytics?.trackAPI('api_profiles_get_in_group_channels', {channelsIds});
+        this.analytics.trackAPI('api_profiles_get_in_group_channels', {channelsIds});
 
         return this.doFetch(
             `${this.getUsersRoute()}/group_channels`,
@@ -272,7 +270,7 @@ const ClientUsers = <TBase extends Constructor<ClientBase>>(superclass: TBase) =
     };
 
     getProfilesNotInChannel = async (teamId: string, channelId: string, groupConstrained: boolean, page = 0, perPage = PER_PAGE_DEFAULT) => {
-        this.analytics?.trackAPI('api_profiles_get_not_in_channel', {team_id: teamId, channel_id: channelId, group_constrained: groupConstrained});
+        this.analytics.trackAPI('api_profiles_get_not_in_channel', {team_id: teamId, channel_id: channelId, group_constrained: groupConstrained});
 
         const queryStringObj: any = {in_team: teamId, not_in_channel: channelId, page, per_page: perPage};
         if (groupConstrained) {
@@ -374,7 +372,7 @@ const ClientUsers = <TBase extends Constructor<ClientBase>>(superclass: TBase) =
     };
 
     searchUsers = async (term: string, options: any) => {
-        this.analytics?.trackAPI('api_search_users');
+        this.analytics.trackAPI('api_search_users');
 
         return this.doFetch(
             `${this.getUsersRoute()}/search`,

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;
     }

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,7 +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,7 +82,6 @@ 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);
@@ -103,20 +100,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);