Update v2 dependencies (#5312)

2021-04-14 10:55:29 -04:00 · 2021-04-14 10:55:29 -04:00 · 9a4a93a1a5
commit 9a4a93a1a5
parent 661904fbaf
60 changed files with 8792 additions and 13335 deletions
--- a/.eslintrc.json
+++ b/.eslintrc.json
@ -1,8 +1,8 @@
 {
  "extends": [
+    "plugin:mattermost/react",
    "plugin:@typescript-eslint/eslint-recommended",
-    "plugin:@typescript-eslint/recommended",
-    "plugin:mattermost/react"
+    "plugin:@typescript-eslint/recommended"
  ],
  "parser": "@typescript-eslint/parser",
  "plugins": [
@ -12,7 +12,7 @@
  "settings": {
    "react": {
      "pragma": "React",
-      "version": "16.5"
+      "version": "17.0"
    }
  },
  "env": {
@ -22,8 +22,10 @@
    "__DEV__": true
  },
  "rules": {
+    "eol-last": ["error", "always"],
    "global-require": 0,
    "no-undefined": 0,
+    "no-shadow": "off",
    "react/display-name": [2, { "ignoreTranspilerName": false }],
    "react/jsx-filename-extension": 0,
    "camelcase": [
@ -41,7 +43,9 @@
        "args": "after-used"
      }
    ],
+    "@typescript-eslint/no-shadow": ["error"],
    "@typescript-eslint/no-explicit-any": "warn",
+    "no-use-before-define": "off",
    "@typescript-eslint/no-use-before-define": 0,
    "@typescript-eslint/no-var-requires": 0,
    "@typescript-eslint/explicit-function-return-type": 0,
--- a/.flowconfig
+++ b/.flowconfig
@ -8,10 +8,6 @@
 ; Ignore polyfills
 node_modules/react-native/Libraries/polyfills/.*

-; These should not be required directly
-; require from fbjs/lib instead: require('fbjs/lib/warning')
-node_modules/warning/.*
-
 ; Flow doesn't support platforms
 .*/Libraries/Utilities/LoadingView.js

@ -30,6 +26,8 @@ emoji=true
 esproposal.optional_chaining=enable
 esproposal.nullish_coalescing=enable

+exact_by_default=true
+
 module.file_ext=.js
 module.file_ext=.json
 module.file_ext=.ios.js
@ -44,10 +42,6 @@ suppress_type=$FlowFixMe
 suppress_type=$FlowFixMeProps
 suppress_type=$FlowFixMeState

-suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(<VERSION>\\)? *\\(site=[a-z,_]*react_native\\(_ios\\)?_\\(oss\\|fb\\)[a-z,_]*\\)?)\\)
-suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(<VERSION>\\)? *\\(site=[a-z,_]*react_native\\(_ios\\)?_\\(oss\\|fb\\)[a-z,_]*\\)?)\\)?:? #[0-9]+
-suppress_comment=\\(.\\|\n\\)*\\$FlowExpectedError
-
 [lints]
 sketchy-null-number=warn
 sketchy-null-mixed=warn
@ -59,7 +53,6 @@ unsafe-getters-setters=warn
 inexact-spread=warn
 unnecessary-invariant=warn
 signature-verification-failure=warn
-deprecated-utility=error

 [strict]
 deprecated-type
@ -71,4 +64,4 @@ untyped-import
 untyped-type-import

 [version]
-^0.122.0
+^0.137.0
--- a/.gitattributes
+++ b/.gitattributes
@ -1,4 +1,3 @@
-*.pbxproj -text
-
-# specific for windows script files
-*.bat text eol=crlf
+# Windows files should use crlf line endings
+# https://help.github.com/articles/dealing-with-line-endings/
+*.bat text eol=crlf
--- a/.husky/.gitignore
+++ b/.husky/.gitignore
@ -0,0 +1 @@
+_
--- a/.husky/pre-commit
+++ b/.husky/pre-commit
@ -0,0 +1,4 @@
+#!/bin/sh
+. "$(dirname "$0")/_/husky.sh"
+
+sh ./scripts/pre-commit.sh
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@ -121,6 +121,7 @@ def jscFlavor = 'org.webkit:android-jsc-intl:+'
 def enableHermes = project.ext.react.get("enableHermes", false);

 android {
+    ndkVersion rootProject.ext.ndkVersion
    compileSdkVersion rootProject.ext.compileSdkVersion

    compileOptions {
--- a/android/app/src/debug/AndroidManifest.xml
+++ b/android/app/src/debug/AndroidManifest.xml
@ -4,5 +4,10 @@

    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>

-    <application android:usesCleartextTraffic="true" tools:targetApi="28" tools:ignore="GoogleAppIndexingWarning" />
+    <application
+        android:usesCleartextTraffic="true"
+        tools:targetApi="28"
+        tools:ignore="GoogleAppIndexingWarning">
+        <activity android:name="com.facebook.react.devsupport.DevSettingsActivity" />
+    </application>
 </manifest>
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@ -44,7 +44,6 @@
          <data android:scheme="mattermost" />
        </intent-filter>
      </activity>
-      <activity android:name="com.facebook.react.devsupport.DevSettingsActivity" />
      <service android:name=".NotificationDismissService"
                android:enabled="true"
                android:exported="false" />
--- a/android/app/src/main/java/com/mattermost/helpers/Credentials.java
+++ b/android/app/src/main/java/com/mattermost/helpers/Credentials.java
@ -12,7 +12,7 @@ public class Credentials {

    public static void getCredentialsForCurrentServer(ReactApplicationContext context, ResolvePromise promise) {
        final KeychainModule keychainModule = new KeychainModule(context);
-        final AsyncStorage asyncStorage = new AsyncStorage(context);
+        final AsyncStorageHelper asyncStorage = new AsyncStorageHelper(context);
        final ArrayList<String> keys = new ArrayList<String>(1);
        keys.add(CURRENT_SERVER_URL);
        KeysReadableArray asyncStorageKeys = new KeysReadableArray() {
@ -29,7 +29,14 @@ public class Credentials {

        HashMap<String, String> asyncStorageResults = asyncStorage.multiGet(asyncStorageKeys);
        String serverUrl = asyncStorageResults.get(CURRENT_SERVER_URL);
+        final WritableMap options = Arguments.createMap();
+        // KeyChain module fails if `authenticationPrompt` is not set
+        final WritableMap authPrompt = Arguments.createMap();
+        authPrompt.putString("title", "Authenticate to retrieve secret");
+        authPrompt.putString("cancel", "Cancel");
+        options.putMap("authenticationPrompt", authPrompt);
+        options.putString("service", serverUrl);

-        keychainModule.getGenericPasswordForOptions(serverUrl, promise);
+        keychainModule.getGenericPasswordForOptions(options, promise);
    }
 }
--- a/android/app/src/main/java/com/mattermost/rnbeta/MainApplication.java
+++ b/android/app/src/main/java/com/mattermost/rnbeta/MainApplication.java
@ -37,6 +37,7 @@ import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactMarker;
 import com.facebook.react.bridge.ReactMarkerConstants;
+import com.facebook.react.bridge.JSIModulePackage;
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.module.model.ReactModuleInfo;
 import com.facebook.react.module.model.ReactModuleInfoProvider;
@ -48,6 +49,7 @@ import org.unimodules.adapters.react.ReactModuleRegistryProvider;
 import org.unimodules.core.interfaces.SingletonModule;

 import com.nozbe.watermelondb.WatermelonDBPackage;
+import com.swmansion.reanimated.ReanimatedJSIModulePackage;

 public class MainApplication extends NavigationApplication implements INotificationsApplication, INotificationsDrawerApplication {
  public static MainApplication instance;
@ -123,6 +125,11 @@ public class MainApplication extends NavigationApplication implements INotificat
        return packages;
      }

+      @Override
+      protected JSIModulePackage getJSIModulePackage() {
+        return new ReanimatedJSIModulePackage();
+      }
+
      @Override
      protected String getJSMainModuleName() {
        return "index";
--- a/android/build.gradle
+++ b/android/build.gradle
@ -2,10 +2,11 @@

 buildscript {
    ext {
-        buildToolsVersion = "29.0.2"
+        buildToolsVersion = "29.0.3"
        minSdkVersion = 24
        compileSdkVersion = 29
        targetSdkVersion = 29
+        ndkVersion = "20.1.5948944"
        supportLibVersion = "28.0.0"
        kotlinVersion = "1.3.61"
        kotlin_version = "1.3.61"
@ -19,7 +20,7 @@ buildscript {
        mavenCentral()
    }
    dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.3'
+        classpath 'com.android.tools.build:gradle:4.1.0'
        classpath 'com.google.gms:google-services:4.2.0'
        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"

--- a/android/gradle.properties
+++ b/android/gradle.properties
@ -30,4 +30,4 @@ android.useAndroidX=true
 android.enableJetifier=true

 # Version of flipper SDK to use with React Native
-FLIPPER_VERSION=0.37.0
+FLIPPER_VERSION=0.75.1
--- a/android/gradle/wrapper/gradle-wrapper.jar
+++ b/android/gradle/wrapper/gradle-wrapper.jar
--- a/android/gradle/wrapper/gradle-wrapper.properties
+++ b/android/gradle/wrapper/gradle-wrapper.properties
@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
--- a/android/gradlew.bat
+++ b/android/gradlew.bat
@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome

 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if "%ERRORLEVEL%" == "0" goto execute

 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@ -54,7 +54,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe

-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute

 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@ -64,28 +64,14 @@ echo location of your Java installation.

 goto fail

-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
 :execute
@rem Setup the command line

 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar

+
@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*

 :end
@rem End local scope for the variables with windows NT shell
--- a/app/constants/preferences.ts
+++ b/app/constants/preferences.ts
@ -151,4 +151,4 @@ const Preferences: Dictionary<any> = {
    },
 };

-export default Preferences;
+export default Preferences;
--- a/app/database/admin/data_operator/handlers/index.ts
+++ b/app/database/admin/data_operator/handlers/index.ts
@ -246,7 +246,7 @@ class DataOperator {
            }
        }

-        if (operator && fieldName && findMatchingRecordBy) {
+        if (fieldName && findMatchingRecordBy) {
            await this.handleEntityRecords({
                findMatchingRecordBy,
                fieldName,
--- a/app/database/admin/database_manager/mocks/index.ts
+++ b/app/database/admin/database_manager/mocks/index.ts
@ -133,6 +133,8 @@ class DatabaseManager {
              dbName: databaseName,
              migrations,
              schema,
+              useWebWorker: false,
+              useIncrementalIndexedDB: true,
          });

          // Registers the new server connection into the DEFAULT database
@ -145,7 +147,8 @@ class DatabaseManager {
          }
          return new Database({adapter, actionsEnabled, modelClasses});
      } catch (e) {
-      // console.log(e);
+          // eslint-disable-next-line no-console
+          console.log('ERROR ==========================\n', e);
      }

      return undefined;
--- a/app/init/credentials.ts
+++ b/app/init/credentials.ts
@ -4,7 +4,7 @@
 import AsyncStorage from '@react-native-community/async-storage';
 import * as KeyChain from 'react-native-keychain';

-import * as analytics from '@init/analytics.ts';
+import * as analytics from '@init/analytics';
 import emmProvider from '@init/emm_provider';
 import EphemeralStore from '@store/ephemeral_store';
 import {getCSRFFromCookie} from '@utils/security';
--- a/app/init/global_event_handler.ts
+++ b/app/init/global_event_handler.ts
@ -9,7 +9,7 @@ import semver from 'semver';
 import LocalConfig from '@assets/config.json';
 import {Navigation} from '@constants';
 import {DEFAULT_LOCALE, getTranslations, resetMomentLocale, t} from '@i18n';
-import * as analytics from '@init/analytics.ts';
+import * as analytics from '@init/analytics';
 import {getAppCredentials, removeAppCredentials} from '@init/credentials';
 import PushNotifications from '@init/push_notifications';
 import {deleteFileCache} from '@utils/file';
--- a/app/init/push_notifications.ts
+++ b/app/init/push_notifications.ts
@ -241,4 +241,4 @@ class PushNotifications {
    };
 }

-export default new PushNotifications();
+export default new PushNotifications();
--- a/app/utils/client_error.ts
+++ b/app/utils/client_error.ts
@ -24,4 +24,4 @@ export class ClientError extends Error {
        // copying the object by using `{...error}` would not include the message.
        Object.defineProperty(this, 'message', {enumerable: true});
    }
-}
+}
--- a/app/utils/error_handling.ts
+++ b/app/utils/error_handling.ts
@ -57,4 +57,4 @@ class JavascriptAndNativeErrorHandler {
    };
 }

-export default new JavascriptAndNativeErrorHandler();
+export default new JavascriptAndNativeErrorHandler();
--- a/app/utils/file.ts
+++ b/app/utils/file.ts
@ -26,4 +26,4 @@ export async function deleteFileCache() {
    }

    return true;
-}
+}
--- a/app/utils/font_family.js
+++ b/app/utils/font_family.js
@ -28,4 +28,4 @@ const setFontFamily = () => {
    };
 };

-export default setFontFamily;
+export default setFontFamily;
--- a/app/utils/key_mirror.ts
+++ b/app/utils/key_mirror.ts
@ -15,4 +15,4 @@ export default function keyMirror<T extends {}>(obj: T): { [K in keyof T]: K } {
        ret[key] = key;
    }
    return ret;
-}
+}
--- a/babel.config.js
+++ b/babel.config.js
@ -45,6 +45,7 @@ module.exports = {
            safe: false,
            allowUndefined: true,
        }],
+        'react-native-reanimated/plugin',
    ],
    exclude: ['**/*.png', '**/*.jpg', '**/*.gif'],
 };
--- a/detox/package-lock.json
+++ b/detox/package-lock.json
--- a/detox/package.json
+++ b/detox/package.json
@ -4,20 +4,20 @@
  "repository": "git@github.com:mattermost/mattermost-mobile.git",
  "author": "Mattermost, Inc.",
  "devDependencies": {
-    "@babel/plugin-proposal-class-properties": "7.12.13",
-    "@babel/plugin-transform-modules-commonjs": "7.12.13",
-    "@babel/plugin-transform-runtime": "7.12.15",
-    "@babel/preset-env": "7.12.13",
+    "@babel/plugin-proposal-class-properties": "7.13.0",
+    "@babel/plugin-transform-modules-commonjs": "7.13.8",
+    "@babel/plugin-transform-runtime": "7.13.15",
+    "@babel/preset-env": "7.13.15",
    "axios": "0.21.1",
    "babel-jest": "26.6.3",
    "babel-plugin-module-resolver": "4.1.0",
    "deepmerge": "4.2.2",
-    "detox": "18.3.1",
-    "form-data": "3.0.0",
+    "detox": "18.11.1",
+    "form-data": "4.0.0",
    "jest": "26.6.3",
    "jest-circus": "26.6.3",
    "jest-cli": "26.6.3",
-    "jest-html-reporters": "2.1.2",
+    "jest-html-reporters": "2.1.3",
    "jest-junit": "12.0.0",
    "sanitize-filename": "1.6.3",
    "uuid": "8.3.2"
--- a/ios/Gemfile
+++ b/ios/Gemfile
@ -1,3 +1,3 @@
 source "https://rubygems.org"

-gem "cocoapods", "1.10.0.rc.1"
+gem "cocoapods", "1.10.1"
--- a/ios/Gemfile.lock
+++ b/ios/Gemfile.lock
@ -1,23 +1,23 @@
 GEM
  remote: https://rubygems.org/
  specs:
-    CFPropertyList (3.0.2)
-    activesupport (5.2.4.4)
+    CFPropertyList (3.0.3)
+    activesupport (5.2.5)
      concurrent-ruby (~> 1.0, >= 1.0.2)
      i18n (>= 0.7, < 2)
      minitest (~> 5.1)
      tzinfo (~> 1.1)
    addressable (2.7.0)
      public_suffix (>= 2.0.2, < 5.0)
-    algoliasearch (1.27.4)
+    algoliasearch (1.27.5)
      httpclient (~> 2.8, >= 2.8.3)
      json (>= 1.5.1)
    atomos (0.1.3)
    claide (1.0.3)
-    cocoapods (1.10.0.rc.1)
+    cocoapods (1.10.1)
      addressable (~> 2.6)
      claide (>= 1.0.2, < 2.0)
-      cocoapods-core (= 1.10.0.rc.1)
+      cocoapods-core (= 1.10.1)
      cocoapods-deintegrate (>= 1.0.3, < 2.0)
      cocoapods-downloader (>= 1.4.0, < 2.0)
      cocoapods-plugins (>= 1.0.0, < 2.0)
@ -31,8 +31,8 @@ GEM
      molinillo (~> 0.6.6)
      nap (~> 1.0)
      ruby-macho (~> 1.4)
-      xcodeproj (>= 1.17.0, < 2.0)
-    cocoapods-core (1.10.0.rc.1)
+      xcodeproj (>= 1.19.0, < 2.0)
+    cocoapods-core (1.10.1)
      activesupport (> 5.0, < 6)
      addressable (~> 2.6)
      algoliasearch (~> 1.0)
@ -52,19 +52,19 @@ GEM
      netrc (~> 0.11)
    cocoapods-try (1.2.0)
    colored2 (3.1.2)
-    concurrent-ruby (1.1.7)
+    concurrent-ruby (1.1.8)
    escape (0.0.4)
-    ethon (0.12.0)
-      ffi (>= 1.3.0)
-    ffi (1.13.1)
+    ethon (0.13.0)
+      ffi (>= 1.15.0)
+    ffi (1.15.0)
    fourflusher (2.3.1)
    fuzzy_match (2.0.4)
    gh_inspector (1.1.3)
    httpclient (2.8.3)
-    i18n (1.8.5)
+    i18n (1.8.10)
      concurrent-ruby (~> 1.0)
-    json (2.3.1)
-    minitest (5.14.2)
+    json (2.5.1)
+    minitest (5.14.4)
    molinillo (0.6.6)
    nanaimo (0.3.0)
    nap (1.1.0)
@ -74,9 +74,9 @@ GEM
    thread_safe (0.3.6)
    typhoeus (1.4.0)
      ethon (>= 0.9.0)
-    tzinfo (1.2.7)
+    tzinfo (1.2.9)
      thread_safe (~> 0.1)
-    xcodeproj (1.18.0)
+    xcodeproj (1.19.0)
      CFPropertyList (>= 2.3.3, < 4.0)
      atomos (~> 0.1.3)
      claide (>= 1.0.2, < 2.0)
@ -87,7 +87,7 @@ PLATFORMS
  ruby

 DEPENDENCIES
-  cocoapods (= 1.10.0.rc.1)
+  cocoapods (= 1.10.1)

 BUNDLED WITH
   2.1.4
--- a/ios/Mattermost.xcodeproj/project.pbxproj
+++ b/ios/Mattermost.xcodeproj/project.pbxproj
@ -1100,6 +1100,7 @@
 				COPY_PHASE_STRIP = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
+				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "arm64 ";
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_NO_COMMON_BLOCKS = YES;
@ -1145,6 +1146,7 @@
 				COPY_PHASE_STRIP = YES;
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "arm64 ";
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
--- a/ios/Podfile
+++ b/ios/Podfile
@ -13,11 +13,15 @@ target 'Mattermost' do
    'expo-face-detector',
  ])
  config = use_native_modules!
-  use_react_native!(:path => config["reactNativePath"])
+  use_react_native!(
+    :path => config[:reactNativePath],
+    # to enable hermes on iOS, change `false` to `true` and then install pods
+    :hermes_enabled => false
+  )

  permissions_path = '../node_modules/react-native-permissions/ios'
-  pod 'Permission-Camera', :path => "#{permissions_path}/Camera.podspec"
-  pod 'Permission-PhotoLibrary', :path => "#{permissions_path}/PhotoLibrary.podspec"
+  pod 'Permission-Camera', :path => "#{permissions_path}/Camera"
+  pod 'Permission-PhotoLibrary', :path => "#{permissions_path}/PhotoLibrary"
  pod 'React-jsi', :path => '../node_modules/react-native/ReactCommon/jsi', :modular_headers => true

  pod 'XCDYouTubeKit', '2.8.2'
@ -28,7 +32,8 @@ end
  #
  # Note that if you have use_frameworks! enabled, Flipper will not work and
  # you should disable these next few lines.
-  # use_flipper!
-  # post_install do |installer|
-  #   flipper_post_install(installer)
-  # end
+  # use_flipper!()
+
+  post_install do |installer|
+    react_native_post_install(installer)
+  end
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@ -3,29 +3,20 @@ PODS:
  - BVLinearGradient (2.5.6):
    - React
  - DoubleConversion (1.1.6)
-  - EXConstants (9.2.0):
+  - EXConstants (10.1.2):
    - UMConstantsInterface
    - UMCore
-  - EXFileSystem (9.2.0):
+  - EXFileSystem (11.0.1):
    - UMCore
    - UMFileSystemInterface
-  - FBLazyVector (0.63.3)
-  - FBReactNativeSpec (0.63.3):
-    - Folly (= 2020.01.13.00)
-    - RCTRequired (= 0.63.3)
-    - RCTTypeSafety (= 0.63.3)
-    - React-Core (= 0.63.3)
-    - React-jsi (= 0.63.3)
-    - ReactCommon/turbomodule/core (= 0.63.3)
-  - Folly (2020.01.13.00):
-    - boost-for-react-native
-    - DoubleConversion
-    - Folly/Default (= 2020.01.13.00)
-    - glog
-  - Folly/Default (2020.01.13.00):
-    - boost-for-react-native
-    - DoubleConversion
-    - glog
+  - FBLazyVector (0.64.0)
+  - FBReactNativeSpec (0.64.0):
+    - RCT-Folly (= 2020.01.13.00)
+    - RCTRequired (= 0.64.0)
+    - RCTTypeSafety (= 0.64.0)
+    - React-Core (= 0.64.0)
+    - React-jsi (= 0.64.0)
+    - ReactCommon/turbomodule/core (= 0.64.0)
  - glog (0.3.5)
  - jail-monkey (2.3.3):
    - React
@ -38,184 +29,211 @@ PODS:
  - libwebp/mux (1.1.0):
    - libwebp/demux
  - libwebp/webp (1.1.0)
-  - Permission-Camera (2.2.2):
+  - Permission-Camera (3.0.1):
    - RNPermissions
-  - Permission-PhotoLibrary (2.2.2):
+  - Permission-PhotoLibrary (3.0.1):
    - RNPermissions
-  - RCTRequired (0.63.3)
-  - RCTTypeSafety (0.63.3):
-    - FBLazyVector (= 0.63.3)
-    - Folly (= 2020.01.13.00)
-    - RCTRequired (= 0.63.3)
-    - React-Core (= 0.63.3)
+  - RCT-Folly (2020.01.13.00):
+    - boost-for-react-native
+    - DoubleConversion
+    - glog
+    - RCT-Folly/Default (= 2020.01.13.00)
+  - RCT-Folly/Default (2020.01.13.00):
+    - boost-for-react-native
+    - DoubleConversion
+    - glog
+  - RCTRequired (0.64.0)
+  - RCTTypeSafety (0.64.0):
+    - FBLazyVector (= 0.64.0)
+    - RCT-Folly (= 2020.01.13.00)
+    - RCTRequired (= 0.64.0)
+    - React-Core (= 0.64.0)
  - RCTYouTube (2.0.1):
    - React
    - YoutubePlayer-in-WKWebView (~> 0.3.1)
-  - React (0.63.3):
-    - React-Core (= 0.63.3)
-    - React-Core/DevSupport (= 0.63.3)
-    - React-Core/RCTWebSocket (= 0.63.3)
-    - React-RCTActionSheet (= 0.63.3)
-    - React-RCTAnimation (= 0.63.3)
-    - React-RCTBlob (= 0.63.3)
-    - React-RCTImage (= 0.63.3)
-    - React-RCTLinking (= 0.63.3)
-    - React-RCTNetwork (= 0.63.3)
-    - React-RCTSettings (= 0.63.3)
-    - React-RCTText (= 0.63.3)
-    - React-RCTVibration (= 0.63.3)
-  - React-callinvoker (0.63.3)
-  - React-Core (0.63.3):
-    - Folly (= 2020.01.13.00)
+  - React (0.64.0):
+    - React-Core (= 0.64.0)
+    - React-Core/DevSupport (= 0.64.0)
+    - React-Core/RCTWebSocket (= 0.64.0)
+    - React-RCTActionSheet (= 0.64.0)
+    - React-RCTAnimation (= 0.64.0)
+    - React-RCTBlob (= 0.64.0)
+    - React-RCTImage (= 0.64.0)
+    - React-RCTLinking (= 0.64.0)
+    - React-RCTNetwork (= 0.64.0)
+    - React-RCTSettings (= 0.64.0)
+    - React-RCTText (= 0.64.0)
+    - React-RCTVibration (= 0.64.0)
+  - React-callinvoker (0.64.0)
+  - React-Core (0.64.0):
    - glog
-    - React-Core/Default (= 0.63.3)
-    - React-cxxreact (= 0.63.3)
-    - React-jsi (= 0.63.3)
-    - React-jsiexecutor (= 0.63.3)
+    - RCT-Folly (= 2020.01.13.00)
+    - React-Core/Default (= 0.64.0)
+    - React-cxxreact (= 0.64.0)
+    - React-jsi (= 0.64.0)
+    - React-jsiexecutor (= 0.64.0)
+    - React-perflogger (= 0.64.0)
    - Yoga
-  - React-Core/CoreModulesHeaders (0.63.3):
-    - Folly (= 2020.01.13.00)
+  - React-Core/CoreModulesHeaders (0.64.0):
    - glog
+    - RCT-Folly (= 2020.01.13.00)
    - React-Core/Default
-    - React-cxxreact (= 0.63.3)
-    - React-jsi (= 0.63.3)
-    - React-jsiexecutor (= 0.63.3)
+    - React-cxxreact (= 0.64.0)
+    - React-jsi (= 0.64.0)
+    - React-jsiexecutor (= 0.64.0)
+    - React-perflogger (= 0.64.0)
    - Yoga
-  - React-Core/Default (0.63.3):
-    - Folly (= 2020.01.13.00)
+  - React-Core/Default (0.64.0):
    - glog
-    - React-cxxreact (= 0.63.3)
-    - React-jsi (= 0.63.3)
-    - React-jsiexecutor (= 0.63.3)
+    - RCT-Folly (= 2020.01.13.00)
+    - React-cxxreact (= 0.64.0)
+    - React-jsi (= 0.64.0)
+    - React-jsiexecutor (= 0.64.0)
+    - React-perflogger (= 0.64.0)
    - Yoga
-  - React-Core/DevSupport (0.63.3):
-    - Folly (= 2020.01.13.00)
+  - React-Core/DevSupport (0.64.0):
    - glog
-    - React-Core/Default (= 0.63.3)
-    - React-Core/RCTWebSocket (= 0.63.3)
-    - React-cxxreact (= 0.63.3)
-    - React-jsi (= 0.63.3)
-    - React-jsiexecutor (= 0.63.3)
-    - React-jsinspector (= 0.63.3)
+    - RCT-Folly (= 2020.01.13.00)
+    - React-Core/Default (= 0.64.0)
+    - React-Core/RCTWebSocket (= 0.64.0)
+    - React-cxxreact (= 0.64.0)
+    - React-jsi (= 0.64.0)
+    - React-jsiexecutor (= 0.64.0)
+    - React-jsinspector (= 0.64.0)
+    - React-perflogger (= 0.64.0)
    - Yoga
-  - React-Core/RCTActionSheetHeaders (0.63.3):
-    - Folly (= 2020.01.13.00)
+  - React-Core/RCTActionSheetHeaders (0.64.0):
    - glog
+    - RCT-Folly (= 2020.01.13.00)
    - React-Core/Default
-    - React-cxxreact (= 0.63.3)
-    - React-jsi (= 0.63.3)
-    - React-jsiexecutor (= 0.63.3)
+    - React-cxxreact (= 0.64.0)
+    - React-jsi (= 0.64.0)
+    - React-jsiexecutor (= 0.64.0)
+    - React-perflogger (= 0.64.0)
    - Yoga
-  - React-Core/RCTAnimationHeaders (0.63.3):
-    - Folly (= 2020.01.13.00)
+  - React-Core/RCTAnimationHeaders (0.64.0):
    - glog
+    - RCT-Folly (= 2020.01.13.00)
    - React-Core/Default
-    - React-cxxreact (= 0.63.3)
-    - React-jsi (= 0.63.3)
-    - React-jsiexecutor (= 0.63.3)
+    - React-cxxreact (= 0.64.0)
+    - React-jsi (= 0.64.0)
+    - React-jsiexecutor (= 0.64.0)
+    - React-perflogger (= 0.64.0)
    - Yoga
-  - React-Core/RCTBlobHeaders (0.63.3):
-    - Folly (= 2020.01.13.00)
+  - React-Core/RCTBlobHeaders (0.64.0):
    - glog
+    - RCT-Folly (= 2020.01.13.00)
    - React-Core/Default
-    - React-cxxreact (= 0.63.3)
-    - React-jsi (= 0.63.3)
-    - React-jsiexecutor (= 0.63.3)
+    - React-cxxreact (= 0.64.0)
+    - React-jsi (= 0.64.0)
+    - React-jsiexecutor (= 0.64.0)
+    - React-perflogger (= 0.64.0)
    - Yoga
-  - React-Core/RCTImageHeaders (0.63.3):
-    - Folly (= 2020.01.13.00)
+  - React-Core/RCTImageHeaders (0.64.0):
    - glog
+    - RCT-Folly (= 2020.01.13.00)
    - React-Core/Default
-    - React-cxxreact (= 0.63.3)
-    - React-jsi (= 0.63.3)
-    - React-jsiexecutor (= 0.63.3)
+    - React-cxxreact (= 0.64.0)
+    - React-jsi (= 0.64.0)
+    - React-jsiexecutor (= 0.64.0)
+    - React-perflogger (= 0.64.0)
    - Yoga
-  - React-Core/RCTLinkingHeaders (0.63.3):
-    - Folly (= 2020.01.13.00)
+  - React-Core/RCTLinkingHeaders (0.64.0):
    - glog
+    - RCT-Folly (= 2020.01.13.00)
    - React-Core/Default
-    - React-cxxreact (= 0.63.3)
-    - React-jsi (= 0.63.3)
-    - React-jsiexecutor (= 0.63.3)
+    - React-cxxreact (= 0.64.0)
+    - React-jsi (= 0.64.0)
+    - React-jsiexecutor (= 0.64.0)
+    - React-perflogger (= 0.64.0)
    - Yoga
-  - React-Core/RCTNetworkHeaders (0.63.3):
-    - Folly (= 2020.01.13.00)
+  - React-Core/RCTNetworkHeaders (0.64.0):
    - glog
+    - RCT-Folly (= 2020.01.13.00)
    - React-Core/Default
-    - React-cxxreact (= 0.63.3)
-    - React-jsi (= 0.63.3)
-    - React-jsiexecutor (= 0.63.3)
+    - React-cxxreact (= 0.64.0)
+    - React-jsi (= 0.64.0)
+    - React-jsiexecutor (= 0.64.0)
+    - React-perflogger (= 0.64.0)
    - Yoga
-  - React-Core/RCTSettingsHeaders (0.63.3):
-    - Folly (= 2020.01.13.00)
+  - React-Core/RCTSettingsHeaders (0.64.0):
    - glog
+    - RCT-Folly (= 2020.01.13.00)
    - React-Core/Default
-    - React-cxxreact (= 0.63.3)
-    - React-jsi (= 0.63.3)
-    - React-jsiexecutor (= 0.63.3)
+    - React-cxxreact (= 0.64.0)
+    - React-jsi (= 0.64.0)
+    - React-jsiexecutor (= 0.64.0)
+    - React-perflogger (= 0.64.0)
    - Yoga
-  - React-Core/RCTTextHeaders (0.63.3):
-    - Folly (= 2020.01.13.00)
+  - React-Core/RCTTextHeaders (0.64.0):
    - glog
+    - RCT-Folly (= 2020.01.13.00)
    - React-Core/Default
-    - React-cxxreact (= 0.63.3)
-    - React-jsi (= 0.63.3)
-    - React-jsiexecutor (= 0.63.3)
+    - React-cxxreact (= 0.64.0)
+    - React-jsi (= 0.64.0)
+    - React-jsiexecutor (= 0.64.0)
+    - React-perflogger (= 0.64.0)
    - Yoga
-  - React-Core/RCTVibrationHeaders (0.63.3):
-    - Folly (= 2020.01.13.00)
+  - React-Core/RCTVibrationHeaders (0.64.0):
    - glog
+    - RCT-Folly (= 2020.01.13.00)
    - React-Core/Default
-    - React-cxxreact (= 0.63.3)
-    - React-jsi (= 0.63.3)
-    - React-jsiexecutor (= 0.63.3)
+    - React-cxxreact (= 0.64.0)
+    - React-jsi (= 0.64.0)
+    - React-jsiexecutor (= 0.64.0)
+    - React-perflogger (= 0.64.0)
    - Yoga
-  - React-Core/RCTWebSocket (0.63.3):
-    - Folly (= 2020.01.13.00)
+  - React-Core/RCTWebSocket (0.64.0):
    - glog
-    - React-Core/Default (= 0.63.3)
-    - React-cxxreact (= 0.63.3)
-    - React-jsi (= 0.63.3)
-    - React-jsiexecutor (= 0.63.3)
+    - RCT-Folly (= 2020.01.13.00)
+    - React-Core/Default (= 0.64.0)
+    - React-cxxreact (= 0.64.0)
+    - React-jsi (= 0.64.0)
+    - React-jsiexecutor (= 0.64.0)
+    - React-perflogger (= 0.64.0)
    - Yoga
-  - React-CoreModules (0.63.3):
-    - FBReactNativeSpec (= 0.63.3)
-    - Folly (= 2020.01.13.00)
-    - RCTTypeSafety (= 0.63.3)
-    - React-Core/CoreModulesHeaders (= 0.63.3)
-    - React-jsi (= 0.63.3)
-    - React-RCTImage (= 0.63.3)
-    - ReactCommon/turbomodule/core (= 0.63.3)
-  - React-cxxreact (0.63.3):
+  - React-CoreModules (0.64.0):
+    - FBReactNativeSpec (= 0.64.0)
+    - RCT-Folly (= 2020.01.13.00)
+    - RCTTypeSafety (= 0.64.0)
+    - React-Core/CoreModulesHeaders (= 0.64.0)
+    - React-jsi (= 0.64.0)
+    - React-RCTImage (= 0.64.0)
+    - ReactCommon/turbomodule/core (= 0.64.0)
+  - React-cxxreact (0.64.0):
    - boost-for-react-native (= 1.63.0)
    - DoubleConversion
-    - Folly (= 2020.01.13.00)
    - glog
-    - React-callinvoker (= 0.63.3)
-    - React-jsinspector (= 0.63.3)
-  - React-jsi (0.63.3):
+    - RCT-Folly (= 2020.01.13.00)
+    - React-callinvoker (= 0.64.0)
+    - React-jsi (= 0.64.0)
+    - React-jsinspector (= 0.64.0)
+    - React-perflogger (= 0.64.0)
+    - React-runtimeexecutor (= 0.64.0)
+  - React-jsi (0.64.0):
    - boost-for-react-native (= 1.63.0)
    - DoubleConversion
-    - Folly (= 2020.01.13.00)
    - glog
-    - React-jsi/Default (= 0.63.3)
-  - React-jsi/Default (0.63.3):
+    - RCT-Folly (= 2020.01.13.00)
+    - React-jsi/Default (= 0.64.0)
+  - React-jsi/Default (0.64.0):
    - boost-for-react-native (= 1.63.0)
    - DoubleConversion
-    - Folly (= 2020.01.13.00)
    - glog
-  - React-jsiexecutor (0.63.3):
+    - RCT-Folly (= 2020.01.13.00)
+  - React-jsiexecutor (0.64.0):
    - DoubleConversion
-    - Folly (= 2020.01.13.00)
    - glog
-    - React-cxxreact (= 0.63.3)
-    - React-jsi (= 0.63.3)
-  - React-jsinspector (0.63.3)
-  - react-native-cameraroll (4.0.1):
-    - React
+    - RCT-Folly (= 2020.01.13.00)
+    - React-cxxreact (= 0.64.0)
+    - React-jsi (= 0.64.0)
+    - React-perflogger (= 0.64.0)
+  - React-jsinspector (0.64.0)
+  - react-native-cameraroll (4.0.4):
+    - React-Core
  - react-native-cookies (5.0.1):
    - React-Core
-  - react-native-document-picker (4.1.0):
+  - react-native-document-picker (5.0.3):
    - React-Core
  - react-native-emm (1.1.1):
    - React-Core
@ -223,92 +241,96 @@ PODS:
    - React
  - react-native-image-picker (2.3.4):
    - React-Core
-  - react-native-netinfo (5.9.7):
+  - react-native-netinfo (6.0.0):
    - React-Core
-  - react-native-notifications (3.4.0):
+  - react-native-notifications (3.4.2):
    - React-Core
-  - react-native-paste-input (0.1.2):
+  - react-native-paste-input (0.1.3):
    - React-Core
    - Swime (= 3.0.6)
-  - react-native-safe-area-context (3.1.9):
+  - react-native-safe-area-context (3.2.0):
    - React-Core
-  - react-native-video (5.1.0-alpha8):
-    - React
-    - react-native-video/Video (= 5.1.0-alpha8)
-  - react-native-video/Video (5.1.0-alpha8):
-    - React
-  - react-native-webview (10.10.2):
+  - react-native-video (5.1.1):
    - React-Core
-  - React-RCTActionSheet (0.63.3):
-    - React-Core/RCTActionSheetHeaders (= 0.63.3)
-  - React-RCTAnimation (0.63.3):
-    - FBReactNativeSpec (= 0.63.3)
-    - Folly (= 2020.01.13.00)
-    - RCTTypeSafety (= 0.63.3)
-    - React-Core/RCTAnimationHeaders (= 0.63.3)
-    - React-jsi (= 0.63.3)
-    - ReactCommon/turbomodule/core (= 0.63.3)
-  - React-RCTBlob (0.63.3):
-    - FBReactNativeSpec (= 0.63.3)
-    - Folly (= 2020.01.13.00)
-    - React-Core/RCTBlobHeaders (= 0.63.3)
-    - React-Core/RCTWebSocket (= 0.63.3)
-    - React-jsi (= 0.63.3)
-    - React-RCTNetwork (= 0.63.3)
-    - ReactCommon/turbomodule/core (= 0.63.3)
-  - React-RCTImage (0.63.3):
-    - FBReactNativeSpec (= 0.63.3)
-    - Folly (= 2020.01.13.00)
-    - RCTTypeSafety (= 0.63.3)
-    - React-Core/RCTImageHeaders (= 0.63.3)
-    - React-jsi (= 0.63.3)
-    - React-RCTNetwork (= 0.63.3)
-    - ReactCommon/turbomodule/core (= 0.63.3)
-  - React-RCTLinking (0.63.3):
-    - FBReactNativeSpec (= 0.63.3)
-    - React-Core/RCTLinkingHeaders (= 0.63.3)
-    - React-jsi (= 0.63.3)
-    - ReactCommon/turbomodule/core (= 0.63.3)
-  - React-RCTNetwork (0.63.3):
-    - FBReactNativeSpec (= 0.63.3)
-    - Folly (= 2020.01.13.00)
-    - RCTTypeSafety (= 0.63.3)
-    - React-Core/RCTNetworkHeaders (= 0.63.3)
-    - React-jsi (= 0.63.3)
-    - ReactCommon/turbomodule/core (= 0.63.3)
-  - React-RCTSettings (0.63.3):
-    - FBReactNativeSpec (= 0.63.3)
-    - Folly (= 2020.01.13.00)
-    - RCTTypeSafety (= 0.63.3)
-    - React-Core/RCTSettingsHeaders (= 0.63.3)
-    - React-jsi (= 0.63.3)
-    - ReactCommon/turbomodule/core (= 0.63.3)
-  - React-RCTText (0.63.3):
-    - React-Core/RCTTextHeaders (= 0.63.3)
-  - React-RCTVibration (0.63.3):
-    - FBReactNativeSpec (= 0.63.3)
-    - Folly (= 2020.01.13.00)
-    - React-Core/RCTVibrationHeaders (= 0.63.3)
-    - React-jsi (= 0.63.3)
-    - ReactCommon/turbomodule/core (= 0.63.3)
-  - ReactCommon/turbomodule/core (0.63.3):
+    - react-native-video/Video (= 5.1.1)
+  - react-native-video/Video (5.1.1):
+    - React-Core
+  - react-native-webview (11.3.2):
+    - React-Core
+  - React-perflogger (0.64.0)
+  - React-RCTActionSheet (0.64.0):
+    - React-Core/RCTActionSheetHeaders (= 0.64.0)
+  - React-RCTAnimation (0.64.0):
+    - FBReactNativeSpec (= 0.64.0)
+    - RCT-Folly (= 2020.01.13.00)
+    - RCTTypeSafety (= 0.64.0)
+    - React-Core/RCTAnimationHeaders (= 0.64.0)
+    - React-jsi (= 0.64.0)
+    - ReactCommon/turbomodule/core (= 0.64.0)
+  - React-RCTBlob (0.64.0):
+    - FBReactNativeSpec (= 0.64.0)
+    - RCT-Folly (= 2020.01.13.00)
+    - React-Core/RCTBlobHeaders (= 0.64.0)
+    - React-Core/RCTWebSocket (= 0.64.0)
+    - React-jsi (= 0.64.0)
+    - React-RCTNetwork (= 0.64.0)
+    - ReactCommon/turbomodule/core (= 0.64.0)
+  - React-RCTImage (0.64.0):
+    - FBReactNativeSpec (= 0.64.0)
+    - RCT-Folly (= 2020.01.13.00)
+    - RCTTypeSafety (= 0.64.0)
+    - React-Core/RCTImageHeaders (= 0.64.0)
+    - React-jsi (= 0.64.0)
+    - React-RCTNetwork (= 0.64.0)
+    - ReactCommon/turbomodule/core (= 0.64.0)
+  - React-RCTLinking (0.64.0):
+    - FBReactNativeSpec (= 0.64.0)
+    - React-Core/RCTLinkingHeaders (= 0.64.0)
+    - React-jsi (= 0.64.0)
+    - ReactCommon/turbomodule/core (= 0.64.0)
+  - React-RCTNetwork (0.64.0):
+    - FBReactNativeSpec (= 0.64.0)
+    - RCT-Folly (= 2020.01.13.00)
+    - RCTTypeSafety (= 0.64.0)
+    - React-Core/RCTNetworkHeaders (= 0.64.0)
+    - React-jsi (= 0.64.0)
+    - ReactCommon/turbomodule/core (= 0.64.0)
+  - React-RCTSettings (0.64.0):
+    - FBReactNativeSpec (= 0.64.0)
+    - RCT-Folly (= 2020.01.13.00)
+    - RCTTypeSafety (= 0.64.0)
+    - React-Core/RCTSettingsHeaders (= 0.64.0)
+    - React-jsi (= 0.64.0)
+    - ReactCommon/turbomodule/core (= 0.64.0)
+  - React-RCTText (0.64.0):
+    - React-Core/RCTTextHeaders (= 0.64.0)
+  - React-RCTVibration (0.64.0):
+    - FBReactNativeSpec (= 0.64.0)
+    - RCT-Folly (= 2020.01.13.00)
+    - React-Core/RCTVibrationHeaders (= 0.64.0)
+    - React-jsi (= 0.64.0)
+    - ReactCommon/turbomodule/core (= 0.64.0)
+  - React-runtimeexecutor (0.64.0):
+    - React-jsi (= 0.64.0)
+  - ReactCommon/turbomodule/core (0.64.0):
    - DoubleConversion
-    - Folly (= 2020.01.13.00)
    - glog
-    - React-callinvoker (= 0.63.3)
-    - React-Core (= 0.63.3)
-    - React-cxxreact (= 0.63.3)
-    - React-jsi (= 0.63.3)
-  - ReactNativeExceptionHandler (2.10.9):
+    - RCT-Folly (= 2020.01.13.00)
+    - React-callinvoker (= 0.64.0)
+    - React-Core (= 0.64.0)
+    - React-cxxreact (= 0.64.0)
+    - React-jsi (= 0.64.0)
+    - React-perflogger (= 0.64.0)
+  - ReactNativeExceptionHandler (2.10.10):
    - React-Core
  - ReactNativeKeyboardTrackingView (5.7.0):
    - React
-  - ReactNativeNavigation (7.3.0):
+  - ReactNativeNavigation (7.13.0):
    - React-Core
    - React-RCTImage
    - React-RCTText
-    - ReactNativeNavigation/Core (= 7.3.0)
-  - ReactNativeNavigation/Core (7.3.0):
+    - ReactNativeNavigation/Core (= 7.13.0)
+  - ReactNativeNavigation/Core (7.13.0):
    - React-Core
    - React-RCTImage
    - React-RCTText
@ -318,7 +340,7 @@ PODS:
    - React-Core
  - RNCMaskedView (0.1.10):
    - React
-  - RNDeviceInfo (7.0.2):
+  - RNDeviceInfo (8.1.0):
    - React-Core
  - RNDevMenu (4.0.2):
    - React-Core
@ -330,32 +352,57 @@ PODS:
    - SDWebImageWebPCoder (~> 0.6.1)
  - RNFileViewer (2.1.4):
    - React-Core
-  - RNGestureHandler (1.8.0):
-    - React
-  - RNKeychain (4.0.5):
-    - React
-  - RNLocalize (2.0.0):
+  - RNGestureHandler (1.10.3):
    - React-Core
-  - RNPermissions (2.2.2):
+  - RNKeychain (6.2.0):
+    - React
+  - RNLocalize (2.0.2):
+    - React-Core
+  - RNPermissions (3.0.1):
    - React-Core
  - RNReactNativeHapticFeedback (1.11.0):
    - React-Core
-  - RNReanimated (1.13.2):
+  - RNReanimated (2.1.0):
+    - DoubleConversion
+    - FBLazyVector
+    - FBReactNativeSpec
+    - glog
+    - RCT-Folly
+    - RCTRequired
+    - RCTTypeSafety
+    - React
+    - React-callinvoker
    - React-Core
+    - React-Core/DevSupport
+    - React-Core/RCTWebSocket
+    - React-CoreModules
+    - React-cxxreact
+    - React-jsi
+    - React-jsiexecutor
+    - React-jsinspector
+    - React-RCTActionSheet
+    - React-RCTAnimation
+    - React-RCTBlob
+    - React-RCTImage
+    - React-RCTLinking
+    - React-RCTNetwork
+    - React-RCTSettings
+    - React-RCTText
+    - React-RCTVibration
+    - ReactCommon/turbomodule/core
+    - Yoga
  - RNRudderSdk (1.0.0):
    - React
    - Rudder
-  - RNScreens (2.15.0):
+  - RNSentry (2.4.0):
    - React-Core
-  - RNSentry (2.0.0):
+    - Sentry (= 6.1.4)
+  - RNShare (5.2.2):
    - React-Core
-    - Sentry (~> 6.0.3)
-  - RNShare (4.1.0):
-    - React-Core
-  - RNSVG (12.1.0):
-    - React
-  - RNVectorIcons (7.1.0):
+  - RNSVG (12.1.1-0):
    - React
+  - RNVectorIcons (8.1.0):
+    - React-Core
  - Rudder (1.0.9)
  - SDWebImage (5.9.4):
    - SDWebImage/Core (= 5.9.4)
@ -363,28 +410,33 @@ PODS:
  - SDWebImageWebPCoder (0.6.1):
    - libwebp (~> 1.0)
    - SDWebImage/Core (~> 5.7)
-  - Sentry (6.0.7):
-    - Sentry/Core (= 6.0.7)
-  - Sentry/Core (6.0.7)
+  - Sentry (6.1.4):
+    - Sentry/Core (= 6.1.4)
+  - Sentry/Core (6.1.4)
  - Swime (3.0.6)
-  - UMAppLoader (1.3.0)
-  - UMBarCodeScannerInterface (5.3.0)
-  - UMCameraInterface (5.3.0)
-  - UMConstantsInterface (5.3.0)
-  - UMCore (5.5.1)
-  - UMFaceDetectorInterface (5.3.0)
-  - UMFileSystemInterface (5.3.0)
-  - UMFontInterface (5.3.0)
-  - UMImageLoaderInterface (5.3.0)
-  - UMPermissionsInterface (5.3.0):
+  - UMAppLoader (2.1.0)
+  - UMBarCodeScannerInterface (6.1.0):
    - UMCore
-  - UMReactNativeAdapter (5.6.0):
+  - UMCameraInterface (6.1.0):
+    - UMCore
+  - UMConstantsInterface (6.1.0):
+    - UMCore
+  - UMCore (7.1.0)
+  - UMFaceDetectorInterface (6.1.0)
+  - UMFileSystemInterface (6.1.0)
+  - UMFontInterface (6.1.0)
+  - UMImageLoaderInterface (6.1.0)
+  - UMPermissionsInterface (6.1.0):
+    - UMCore
+  - UMReactNativeAdapter (6.2.1):
    - React-Core
    - UMCore
    - UMFontInterface
-  - UMSensorsInterface (5.3.0)
-  - UMTaskManagerInterface (5.3.0)
-  - WatermelonDB (0.20.0):
+  - UMSensorsInterface (6.1.0):
+    - UMCore
+  - UMTaskManagerInterface (6.1.0):
+    - UMCore
+  - WatermelonDB (0.21.0):
    - React
    - React-jsi
  - XCDYouTubeKit (2.8.2)
@ -397,12 +449,12 @@ DEPENDENCIES:
  - EXConstants (from `../node_modules/expo-constants/ios`)
  - EXFileSystem (from `../node_modules/expo-file-system/ios`)
  - FBLazyVector (from `../node_modules/react-native/Libraries/FBLazyVector`)
-  - FBReactNativeSpec (from `../node_modules/react-native/Libraries/FBReactNativeSpec`)
-  - Folly (from `../node_modules/react-native/third-party-podspecs/Folly.podspec`)
+  - FBReactNativeSpec (from `../node_modules/react-native/React/FBReactNativeSpec`)
  - glog (from `../node_modules/react-native/third-party-podspecs/glog.podspec`)
  - jail-monkey (from `../node_modules/jail-monkey`)
-  - Permission-Camera (from `../node_modules/react-native-permissions/ios/Camera.podspec`)
-  - Permission-PhotoLibrary (from `../node_modules/react-native-permissions/ios/PhotoLibrary.podspec`)
+  - Permission-Camera (from `../node_modules/react-native-permissions/ios/Camera`)
+  - Permission-PhotoLibrary (from `../node_modules/react-native-permissions/ios/PhotoLibrary`)
+  - RCT-Folly (from `../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec`)
  - RCTRequired (from `../node_modules/react-native/Libraries/RCTRequired`)
  - RCTTypeSafety (from `../node_modules/react-native/Libraries/TypeSafety`)
  - RCTYouTube (from `../node_modules/react-native-youtube`)
@ -428,6 +480,7 @@ DEPENDENCIES:
  - react-native-safe-area-context (from `../node_modules/react-native-safe-area-context`)
  - react-native-video (from `../node_modules/react-native-video`)
  - react-native-webview (from `../node_modules/react-native-webview`)
+  - React-perflogger (from `../node_modules/react-native/ReactCommon/reactperflogger`)
  - React-RCTActionSheet (from `../node_modules/react-native/Libraries/ActionSheetIOS`)
  - React-RCTAnimation (from `../node_modules/react-native/Libraries/NativeAnimation`)
  - React-RCTBlob (from `../node_modules/react-native/Libraries/Blob`)
@ -437,6 +490,7 @@ DEPENDENCIES:
  - React-RCTSettings (from `../node_modules/react-native/Libraries/Settings`)
  - React-RCTText (from `../node_modules/react-native/Libraries/Text`)
  - React-RCTVibration (from `../node_modules/react-native/Libraries/Vibration`)
+  - React-runtimeexecutor (from `../node_modules/react-native/ReactCommon/runtimeexecutor`)
  - ReactCommon/turbomodule/core (from `../node_modules/react-native/ReactCommon`)
  - ReactNativeExceptionHandler (from `../node_modules/react-native-exception-handler`)
  - ReactNativeKeyboardTrackingView (from `../node_modules/react-native-keyboard-tracking-view`)
@ -455,7 +509,6 @@ DEPENDENCIES:
  - RNReactNativeHapticFeedback (from `../node_modules/react-native-haptic-feedback`)
  - RNReanimated (from `../node_modules/react-native-reanimated`)
  - "RNRudderSdk (from `../node_modules/@rudderstack/rudder-sdk-react-native/ios`)"
-  - RNScreens (from `../node_modules/react-native-screens`)
  - "RNSentry (from `../node_modules/@sentry/react-native`)"
  - RNShare (from `../node_modules/react-native-share`)
  - RNSVG (from `../node_modules/react-native-svg`)
@ -502,17 +555,17 @@ EXTERNAL SOURCES:
  FBLazyVector:
    :path: "../node_modules/react-native/Libraries/FBLazyVector"
  FBReactNativeSpec:
-    :path: "../node_modules/react-native/Libraries/FBReactNativeSpec"
-  Folly:
-    :podspec: "../node_modules/react-native/third-party-podspecs/Folly.podspec"
+    :path: "../node_modules/react-native/React/FBReactNativeSpec"
  glog:
    :podspec: "../node_modules/react-native/third-party-podspecs/glog.podspec"
  jail-monkey:
    :path: "../node_modules/jail-monkey"
  Permission-Camera:
-    :path: "../node_modules/react-native-permissions/ios/Camera.podspec"
+    :path: "../node_modules/react-native-permissions/ios/Camera"
  Permission-PhotoLibrary:
-    :path: "../node_modules/react-native-permissions/ios/PhotoLibrary.podspec"
+    :path: "../node_modules/react-native-permissions/ios/PhotoLibrary"
+  RCT-Folly:
+    :podspec: "../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec"
  RCTRequired:
    :path: "../node_modules/react-native/Libraries/RCTRequired"
  RCTTypeSafety:
@ -559,6 +612,8 @@ EXTERNAL SOURCES:
    :path: "../node_modules/react-native-video"
  react-native-webview:
    :path: "../node_modules/react-native-webview"
+  React-perflogger:
+    :path: "../node_modules/react-native/ReactCommon/reactperflogger"
  React-RCTActionSheet:
    :path: "../node_modules/react-native/Libraries/ActionSheetIOS"
  React-RCTAnimation:
@ -577,6 +632,8 @@ EXTERNAL SOURCES:
    :path: "../node_modules/react-native/Libraries/Text"
  React-RCTVibration:
    :path: "../node_modules/react-native/Libraries/Vibration"
+  React-runtimeexecutor:
+    :path: "../node_modules/react-native/ReactCommon/runtimeexecutor"
  ReactCommon:
    :path: "../node_modules/react-native/ReactCommon"
  ReactNativeExceptionHandler:
@ -613,8 +670,6 @@ EXTERNAL SOURCES:
    :path: "../node_modules/react-native-reanimated"
  RNRudderSdk:
    :path: "../node_modules/@rudderstack/rudder-sdk-react-native/ios"
-  RNScreens:
-    :path: "../node_modules/react-native-screens"
  RNSentry:
    :path: "../node_modules/@sentry/react-native"
  RNShare:
@ -657,95 +712,96 @@ EXTERNAL SOURCES:
 SPEC CHECKSUMS:
  boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c
  BVLinearGradient: e3aad03778a456d77928f594a649e96995f1c872
-  DoubleConversion: cde416483dac037923206447da6e1454df403714
-  EXConstants: 6ec1ea4a13ec734c7e2274bc9e5b7408d73007a1
-  EXFileSystem: efd6c0225f90c8b2c85131d578a09e13197e8b70
-  FBLazyVector: 878b59e31113e289e275165efbe4b54fa614d43d
-  FBReactNativeSpec: 7da9338acfb98d4ef9e5536805a0704572d33c2f
-  Folly: b73c3869541e86821df3c387eb0af5f65addfab4
-  glog: 40a13f7840415b9a77023fbcae0f1e6f43192af3
+  DoubleConversion: cf9b38bf0b2d048436d9a82ad2abe1404f11e7de
+  EXConstants: 9d38f1a67f2bfcb222bb1d108a7070cf38132891
+  EXFileSystem: b3857957f9ca86c8743c6c60cc27fa078ac2992b
+  FBLazyVector: 49cbe4b43e445b06bf29199b6ad2057649e4c8f5
+  FBReactNativeSpec: a804c9d6c798f94831713302354003ee54ea18cb
+  glog: 73c2498ac6884b13ede40eda8228cb1eee9d9d62
  jail-monkey: 80c9e34da2cd54023e5ad08bf7051ec75bd43d5b
  libwebp: 946cb3063cea9236285f7e9a8505d806d30e07f3
-  Permission-Camera: 375576c57ea625c88137d2cc52ba6dfeb21db036
-  Permission-PhotoLibrary: bb20a7ac8aec0f7459558e5fbe2bd0a6f2744be3
-  RCTRequired: 48884c74035a0b5b76dbb7a998bd93bcfc5f2047
-  RCTTypeSafety: edf4b618033c2f1c5b7bc3d90d8e085ed95ba2ab
+  Permission-Camera: 0d2d15352e9c54c3ea8686c8c21fb1a9edf3431b
+  Permission-PhotoLibrary: e5d0500209f22e2a5b281501cd3744a965747726
+  RCT-Folly: ec7a233ccc97cc556cf7237f0db1ff65b986f27c
+  RCTRequired: 2f8cb5b7533219bf4218a045f92768129cf7050a
+  RCTTypeSafety: 512728b73549e72ad7330b92f3d42936f2a4de5b
  RCTYouTube: 7ff7d42f5ed42d185198681e967fd2c2b661375d
-  React: f36e90f3ceb976546e97df3403e37d226f79d0e3
-  React-callinvoker: 18874f621eb96625df7a24a7dc8d6e07391affcd
-  React-Core: ac3d816b8e3493970153f4aaf0cff18af0bb95e6
-  React-CoreModules: 4016d3a4e518bcfc4f5a51252b5a05692ca6f0e1
-  React-cxxreact: ffc9129013b87cb36cf3f30a86695a3c397b0f99
-  React-jsi: df07aa95b39c5be3e41199921509bfa929ed2b9d
-  React-jsiexecutor: b56c03e61c0dd5f5801255f2160a815f4a53d451
-  React-jsinspector: 8e68ffbfe23880d3ee9bafa8be2777f60b25cbe2
-  react-native-cameraroll: 9d2b7c1707204d2040d2812f960c6cebdbd9f670
+  React: 98eac01574128a790f0bbbafe2d1a8607291ac24
+  React-callinvoker: def3f7fae16192df68d9b69fd4bbb59092ee36bc
+  React-Core: 70a52aa5dbe9b83befae82038451a7df9fd54c5a
+  React-CoreModules: 052edef46117862e2570eb3a0f06d81c61d2c4b8
+  React-cxxreact: c1dc71b30653cfb4770efdafcbdc0ad6d388baab
+  React-jsi: 74341196d9547cbcbcfa4b3bbbf03af56431d5a1
+  React-jsiexecutor: 06a9c77b56902ae7ffcdd7a4905f664adc5d237b
+  React-jsinspector: 0ae35a37b20d5e031eb020a69cc5afdbd6406301
+  react-native-cameraroll: 7c6c7ca84844f93b3dac9a87670bbad6541684ec
  react-native-cookies: ce50e42ace7cf0dd47769260ca5bbe8eee607e4e
-  react-native-document-picker: 37b870da56cf33b8432212842e3f374b9fe98889
+  react-native-document-picker: d2b8fa4d9b268a316515b1f631236f7a87813df6
  react-native-emm: 480fc1cf19a8f3cd2b7e96d15ae3a238307bd534
  react-native-hw-keyboard-event: b517cefb8d5c659a38049c582de85ff43337dc53
  react-native-image-picker: 32d1ad2c0024ca36161ae0d5c2117e2d6c441f11
-  react-native-netinfo: e36c1bb6df27ab84aa933679b3f5bbf9d180b18f
-  react-native-notifications: 1e4912c8f11741799c823f263beaf9f7f829955b
-  react-native-paste-input: 7ace2dac857ddf3becfc0b591618ff7a5c6a0be7
-  react-native-safe-area-context: 86612d2c9a9e94e288319262d10b5f93f0b395f5
-  react-native-video: 8d97379f3c2322a569f1e27542ad1a646cad9444
-  react-native-webview: ef8d30ecc5baf6bf7821690180c2f9bf2bdf00c0
-  React-RCTActionSheet: 53ea72699698b0b47a6421cb1c8b4ab215a774aa
-  React-RCTAnimation: 1befece0b5183c22ae01b966f5583f42e69a83c2
-  React-RCTBlob: 0b284339cbe4b15705a05e2313a51c6d8b51fa40
-  React-RCTImage: d1756599ebd4dc2cb19d1682fe67c6b976658387
-  React-RCTLinking: 9af0a51c6d6a4dd1674daadafffc6d03033a6d18
-  React-RCTNetwork: 332c83929cc5eae0b3bbca4add1d668e1fc18bda
-  React-RCTSettings: d6953772cfd55f2c68ad72b7ef29efc7ec49f773
-  React-RCTText: 65a6de06a7389098ce24340d1d3556015c38f746
-  React-RCTVibration: 8e9fb25724a0805107fc1acc9075e26f814df454
-  ReactCommon: 4167844018c9ed375cc01a843e9ee564399e53c3
-  ReactNativeExceptionHandler: f1638ffd507ef1b1794af25884fa0eb30dd5c551
+  react-native-netinfo: 34f4d7a42f49157f3b45c14217d256bce7dc9682
+  react-native-notifications: e914ff49de3b2268cfa1b5e2ad21fd27c36d5b7b
+  react-native-paste-input: 003693cff6fcea476066172e66901beb7ef25670
+  react-native-safe-area-context: e471852c5ed67eea4b10c5d9d43c1cebae3b231d
+  react-native-video: 1574074179ecaf6a9dd067116c8f31bf9fec15c8
+  react-native-webview: aea3233f26253f5c360164ee87d01ef9f7b9a27f
+  React-perflogger: 9c547d8f06b9bf00cb447f2b75e8d7f19b7e02af
+  React-RCTActionSheet: 3080b6e12e0e1a5b313c8c0050699b5c794a1b11
+  React-RCTAnimation: 3f96f21a497ae7dabf4d2f150ee43f906aaf516f
+  React-RCTBlob: 283b8e5025e7f954176bc48164f846909002f3ed
+  React-RCTImage: 5088a484faac78f2d877e1b79125d3bb1ea94a16
+  React-RCTLinking: 5e8fbb3e9a8bc2e4e3eb15b1eb8bda5fcac27b8c
+  React-RCTNetwork: 38ec277217b1e841d5e6a1fa78da65b9212ccb28
+  React-RCTSettings: 242d6e692108c3de4f3bb74b7586a8799e9ab070
+  React-RCTText: 8746736ac8eb5a4a74719aa695b7a236a93a83d2
+  React-RCTVibration: 0fd6b21751a33cb72fce1a4a33ab9678416d307a
+  React-runtimeexecutor: cad74a1eaa53ee6e7a3620231939d8fe2c6afcf0
+  ReactCommon: cfe2b7fd20e0dbd2d1185cd7d8f99633fbc5ff05
+  ReactNativeExceptionHandler: b11ff67c78802b2f62eed0e10e75cb1ef7947c60
  ReactNativeKeyboardTrackingView: 02137fac3b2ebd330d74fa54ead48b14750a2306
-  ReactNativeNavigation: c2dcda2b86e32090c443182206c915107d03106f
+  ReactNativeNavigation: 4c4ca87edc0da4ee818158a62cb6188088454e5c
  RNCAsyncStorage: cb9a623793918c6699586281f0b51cbc38f046f9
  RNCClipboard: 5e299c6df8e0c98f3d7416b86ae563d3a9f768a3
  RNCMaskedView: f5c7d14d6847b7b44853f7acb6284c1da30a3459
-  RNDeviceInfo: a37a15a98822c31c3982cb28eba6d336ba4d0968
+  RNDeviceInfo: 77944ee74f4464aa4672b62e3239e4fa69ab534f
  RNDevMenu: 9f80d65b80ba1fa84e5361d017b8c854a2f05005
  RNFastImage: d4870d58f5936111c56218dbd7fcfc18e65b58ff
  RNFileViewer: 83cc066ad795b1f986791d03b56fe0ee14b6a69f
-  RNGestureHandler: 7a5833d0f788dbd107fbb913e09aa0c1ff333c39
-  RNKeychain: 840f8e6f13be0576202aefcdffd26a4f54bfe7b5
-  RNLocalize: dc432c370fe76ad48cb380386232ca68d534a52a
-  RNPermissions: 067727df624665d4a6c8e2cffcc172ba608b96ed
+  RNGestureHandler: a479ebd5ed4221a810967000735517df0d2db211
+  RNKeychain: b8e0711b959a19c5b057d1e970d3c83d159b6da5
+  RNLocalize: 47e22ef8c36df1d572e42a87c8ae22e3fcf551dd
+  RNPermissions: eb94f9fdc0a8ecd02fcce0676d56ffb1395d41e1
  RNReactNativeHapticFeedback: 653a8c126a0f5e88ce15ffe280b3ff37e1fbb285
-  RNReanimated: e03f7425cb7a38dcf1b644d680d1bfc91c3337ad
+  RNReanimated: b8c8004b43446e3c2709fe64b2b41072f87428ad
  RNRudderSdk: 5d99b1a5a582ab55d6213b38018d35e98818af63
-  RNScreens: 2ad555d4d9fa10b91bb765ca07fe9b29d59573f0
-  RNSentry: cb4ef23400fb6690f6ac8f6acef0c023a8a4f37d
-  RNShare: 106a76243ac90f43ddb9028dcb78ade406b8adff
-  RNSVG: ce9d996113475209013317e48b05c21ee988d42e
-  RNVectorIcons: bc69e6a278b14842063605de32bec61f0b251a59
+  RNSentry: b0d55027200c96f52e26b9bfb20296d47fc5051d
+  RNShare: 5cfe16bfd42cd2c4869a7692462181ac8cc15a6d
+  RNSVG: 1a8855adeb20c5beb0a808281608315fc1092d15
+  RNVectorIcons: 31cebfcf94e8cf8686eb5303ae0357da64d7a5a4
  Rudder: 90ed801a09c73017184e6fc901370be1754eb182
  SDWebImage: b69257f4ab14e9b6a2ef53e910fdf914d8f757c1
  SDWebImageWebPCoder: d0dac55073088d24b2ac1b191a71a8f8d0adac21
-  Sentry: e2c691627ae1dc0029acebbd1b0b4af4df12af73
+  Sentry: 9d055e2de30a77685e86b219acf02e59b82091fc
  Swime: d7b2c277503b6cea317774aedc2dce05613f8b0b
-  UMAppLoader: 939854a42e69527ee11dd17b39ebafcbfbefd05c
-  UMBarCodeScannerInterface: 198ced513a0cf8143d822620f1620bce467d02be
-  UMCameraInterface: dbcaade8d0364ba5518ae4519c63c59bf010aa89
-  UMConstantsInterface: 2ad180a29afdf28607d11d6e23c90793d294ea0e
-  UMCore: 9b6c0ae27349356ed39c9e78b99b7830bb093856
-  UMFaceDetectorInterface: 24faf81d90fb00d477c674fd00b9cb005176f4a0
-  UMFileSystemInterface: 5216dca58177014de7f1157d69c70a1ec5c620bb
-  UMFontInterface: 4d0f13001fc59436125d7424cdfa7c897b699724
-  UMImageLoaderInterface: 575357942cc57ad31662659df9d5a73daa6de54c
-  UMPermissionsInterface: 208b2c5fd6756dcad739d806dfe32b9e44b9311b
-  UMReactNativeAdapter: 2c175f151cfe5ff011ced7bc79ccb08bf124f6c3
-  UMSensorsInterface: 1df848f22690ccd23a821777f00df230fe5a28e3
-  UMTaskManagerInterface: dfc62edf51844ae87dafc1fe849b594871fda1e5
-  WatermelonDB: 0aa53ec3f017fd52cd953ad6e69e4eec36c04044
+  UMAppLoader: aae896b81e3fcaa6528992e2e19ec8db38c2cedd
+  UMBarCodeScannerInterface: 96a01d81ff0c7febbfefc2d7396db9e7462d8c68
+  UMCameraInterface: 8ad433fdadca22703ebeb614d42b814092d38d69
+  UMConstantsInterface: 55c79ca258a3ede70480fed85e3843899cd47ea3
+  UMCore: 0da048c9753abcea0042258e6ad0fed77811f7e1
+  UMFaceDetectorInterface: 4db950a25e785796a237bcebb8fff05078c4fb61
+  UMFileSystemInterface: 4a92ee36e6c2757833031718f8496690fa931280
+  UMFontInterface: 81a951117d03f57aa636fba3992adefd0191f200
+  UMImageLoaderInterface: 5cd09b41630dc8aef7619fabc497c01c0f6b715c
+  UMPermissionsInterface: 4351145563e703c521fe2299e08227bc3584b94a
+  UMReactNativeAdapter: 7e15ed07bf2d7290e997e5d892e31bd276d4f4f1
+  UMSensorsInterface: 50439b47826e716a514cbd7384aebe9ab4fde5f4
+  UMTaskManagerInterface: 482155764886069beb1bc7fcf6036f12e4ad0751
+  WatermelonDB: e6706a0fac2221e2be4bdc93ff0e3990231d91bd
  XCDYouTubeKit: 79baadb0560673a67c771eba45f83e353fd12c1f
-  Yoga: 7d13633d129fd179e01b8953d38d47be90db185a
+  Yoga: 8c8436d4171c87504c648ae23b1d81242bdf3bbf
  YoutubePlayer-in-WKWebView: af2f5929fc78882d94bfdfeea999b661b78d9717

-PODFILE CHECKSUM: 93ddf37519d321c69692a52e0a30c3e7fb27b0e0
+PODFILE CHECKSUM: 34335a8d329b001fdfa695c4fb3c8928db80f375

-COCOAPODS: 1.10.0
+COCOAPODS: 1.10.1
--- a/jest.config.js
+++ b/jest.config.js
@ -13,7 +13,6 @@ module.exports = {
    clearMocks: true,
    setupFilesAfterEnv: [
        '<rootDir>/test/setup.ts',
-        '<rootDir>/node_modules/jest-enzyme/lib/index.js',
    ],
    collectCoverageFrom: [
        'app/**/*.{js,jsx,ts,tsx}',
@ -29,6 +28,6 @@ module.exports = {
        'assets/images/video_player/(.*).png': '<rootDir>/dist/assets/images/video_player/$1@2x.png',
    },
    transformIgnorePatterns: [
-        'node_modules/(?!react-native|jail-monkey|@sentry/react-native|react-navigation|@react-native-community/cameraroll|react-clone-referenced-element|@react-native-community|expo(nent)?|@expo(nent)?/.*|react-navigation|@react-navigation/.*|@unimodules/.*|sentry-expo|native-base|unimodules-permissions-interface)',
+        'node_modules/(?!(@react-native|react-native)|jail-monkey|@sentry/react-native|react-navigation|@react-native-community/cameraroll|react-clone-referenced-element|@react-native-community|expo(nent)?|@expo(nent)?/.*|react-navigation|@react-navigation/.*|@unimodules/.*|sentry-expo|native-base|unimodules-permissions-interface)',
    ],
 };
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@ -7,146 +7,129 @@
  "license": "Apache 2.0",
  "private": true,
  "dependencies": {
-    "@babel/runtime": "7.12.5",
+    "@babel/runtime": "7.13.10",
    "@mattermost/react-native-emm": "1.1.1",
-    "@mattermost/react-native-paste-input": "0.1.2",
-    "@nozbe/watermelondb": "0.20.0",
-    "@nozbe/with-observables": "1.0.7",
+    "@mattermost/react-native-paste-input": "0.1.3",
+    "@nozbe/watermelondb": "0.21.0",
+    "@nozbe/with-observables": "1.3.0",
    "@react-native-community/async-storage": "1.12.1",
-    "@react-native-community/cameraroll": "4.0.1",
+    "@react-native-community/cameraroll": "4.0.4",
    "@react-native-community/clipboard": "1.5.1",
    "@react-native-community/cookies": "5.0.1",
    "@react-native-community/masked-view": "0.1.10",
-    "@react-native-community/netinfo": "5.9.7",
-    "@react-navigation/native": "5.8.9",
-    "@react-navigation/stack": "5.12.6",
-    "@rudderstack/rudder-sdk-react-native": "1.0.3",
-    "@sentry/react-native": "2.0.0",
+    "@react-native-community/netinfo": "6.0.0",
+    "@rudderstack/rudder-sdk-react-native": "1.0.6",
+    "@sentry/react-native": "2.4.0",
    "commonmark": "github:mattermost/commonmark.js#f6ab98dede6ce4b4e7adea140ac77249bfb2d6ce",
    "commonmark-react-renderer": "github:mattermost/commonmark-react-renderer#3a2ac19cab725ad28b170fdc1d397dddedcf87eb",
-    "core-js": "3.7.0",
-    "deep-equal": "2.0.4",
+    "deep-equal": "2.0.5",
    "deepmerge": "4.2.2",
-    "emoji-regex": "9.2.0",
-    "fuse.js": "6.4.3",
+    "emoji-regex": "9.2.2",
+    "fuse.js": "6.4.6",
    "intl": "1.2.5",
    "jail-monkey": "2.3.3",
-    "mime-db": "1.45.0",
-    "moment-timezone": "0.5.32",
+    "mime-db": "1.47.0",
+    "moment-timezone": "0.5.33",
    "prop-types": "15.7.2",
-    "react": "16.13.1",
-    "react-intl": "5.10.1",
-    "react-native": "0.63.3",
+    "react": "17.0.1",
+    "react-intl": "5.15.8",
+    "react-native": "0.64.0",
    "react-native-android-open-settings": "1.3.0",
    "react-native-animatable": "1.3.3",
-    "react-native-calendars": "1.403.0",
-    "react-native-device-info": "7.0.2",
-    "react-native-document-picker": "4.1.0",
-    "react-native-elements": "2.3.2",
-    "react-native-exception-handler": "2.10.9",
+    "react-native-calendars": "1.1255.0",
+    "react-native-device-info": "8.1.0",
+    "react-native-document-picker": "5.0.3",
+    "react-native-elements": "3.3.2",
+    "react-native-exception-handler": "2.10.10",
    "react-native-fast-image": "8.3.4",
    "react-native-file-viewer": "2.1.4",
-    "react-native-gesture-handler": "1.8.0",
+    "react-native-gesture-handler": "1.10.3",
    "react-native-haptic-feedback": "1.11.0",
    "react-native-hw-keyboard-event": "0.0.4",
    "react-native-image-picker": "2.3.4",
    "react-native-keyboard-aware-scrollview": "2.1.0",
    "react-native-keyboard-tracking-view": "5.7.0",
-    "react-native-keychain": "4.0.5",
+    "react-native-keychain": "6.2.0",
    "react-native-linear-gradient": "2.5.6",
-    "react-native-localize": "2.0.0",
-    "react-native-navigation": "7.3.0",
-    "react-native-notifications": "3.4.0",
-    "react-native-permissions": "2.2.2",
-    "react-native-reanimated": "1.13.2",
-    "react-native-redash": "15.11.1",
-    "react-native-safe-area-context": "3.1.9",
-    "react-native-screens": "2.15.0",
-    "react-native-share": "4.1.0",
+    "react-native-localize": "2.0.2",
+    "react-native-navigation": "7.13.0",
+    "react-native-notifications": "3.4.2",
+    "react-native-permissions": "3.0.1",
+    "react-native-reanimated": "2.1.0",
+    "react-native-redash": "16.0.11",
+    "react-native-safe-area-context": "3.2.0",
+    "react-native-share": "5.2.2",
    "react-native-slider": "0.11.0",
-    "react-native-svg": "12.1.0",
-    "react-native-unimodules": "0.11.0",
-    "react-native-vector-icons": "7.1.0",
-    "react-native-video": "5.1.0-alpha8",
-    "react-native-webview": "10.10.2",
+    "react-native-svg": "12.1.1-0",
+    "react-native-unimodules": "0.13.2",
+    "react-native-vector-icons": "8.1.0",
+    "react-native-video": "5.1.1",
+    "react-native-webview": "11.3.2",
    "react-native-youtube": "2.0.1",
    "rn-placeholder": "3.0.3",
-    "semver": "7.3.2",
-    "serialize-error": "7.0.1",
+    "semver": "7.3.5",
+    "serialize-error": "8.0.1",
    "shallow-equals": "1.0.0",
    "tinycolor2": "1.4.2",
-    "url-parse": "1.4.7"
+    "url-parse": "1.5.1"
  },
  "devDependencies": {
-    "@babel/cli": "7.12.1",
-    "@babel/core": "7.12.3",
-    "@babel/plugin-proposal-class-properties": "7.12.1",
-    "@babel/plugin-proposal-decorators": "7.12.12",
-    "@babel/plugin-transform-flow-strip-types": "7.12.10",
-    "@babel/plugin-transform-runtime": "7.12.1",
-    "@babel/preset-env": "7.12.1",
-    "@babel/preset-typescript": "7.12.7",
-    "@babel/register": "7.12.1",
+    "@babel/cli": "7.13.14",
+    "@babel/core": "7.13.15",
+    "@babel/plugin-proposal-class-properties": "7.13.0",
+    "@babel/plugin-proposal-decorators": "7.13.15",
+    "@babel/plugin-transform-flow-strip-types": "7.13.0",
+    "@babel/plugin-transform-runtime": "7.13.15",
+    "@babel/preset-env": "7.13.15",
+    "@babel/preset-typescript": "7.13.0",
+    "@babel/register": "7.13.14",
    "@react-native-community/eslint-config": "2.0.0",
-    "@storybook/addon-knobs": "6.0.28",
-    "@storybook/addon-ondevice-knobs": "5.3.23",
-    "@storybook/react-native": "5.3.23",
+    "@storybook/addon-knobs": "6.2.7",
+    "@storybook/addon-ondevice-knobs": "5.3.25",
+    "@storybook/react-native": "5.3.25",
    "@storybook/react-native-server": "5.3.23",
-    "@testing-library/react-native": "7.1.0",
-    "@types/enzyme": "3.10.8",
-    "@types/enzyme-adapter-react-16": "1.0.6",
-    "@types/jest": "26.0.15",
-    "@types/react": "16.9.56",
-    "@types/react-native": "0.63.35",
-    "@types/react-native-share": "3.3.0",
-    "@types/react-native-video": "5.0.3",
-    "@types/react-redux": "7.1.11",
-    "@types/react-test-renderer": "16.9.3",
+    "@testing-library/react-native": "7.2.0",
+    "@types/jest": "26.0.22",
+    "@types/react": "17.0.3",
+    "@types/react-native": "0.64.2",
+    "@types/react-native-share": "3.3.2",
+    "@types/react-native-video": "5.0.4",
+    "@types/react-test-renderer": "17.0.1",
    "@types/semver": "7.3.4",
    "@types/shallow-equals": "1.0.0",
    "@types/tinycolor2": "1.4.2",
    "@types/url-parse": "1.4.3",
-    "@typescript-eslint/eslint-plugin": "3.10.1",
-    "@typescript-eslint/parser": "3.10.1",
+    "@typescript-eslint/eslint-plugin": "4.22.0",
+    "@typescript-eslint/parser": "4.22.0",
    "babel-eslint": "10.1.0",
    "babel-jest": "26.6.3",
-    "babel-loader": "8.2.1",
-    "babel-plugin-module-resolver": "4.0.0",
+    "babel-loader": "8.2.2",
+    "babel-plugin-module-resolver": "4.1.0",
    "babel-plugin-transform-remove-console": "6.9.4",
    "deep-freeze": "0.0.1",
-    "detox": "18.3.1",
-    "enzyme": "3.11.0",
-    "enzyme-adapter-react-16": "1.15.5",
-    "enzyme-to-json": "3.6.1",
-    "eslint": "7.13.0",
-    "eslint-plugin-header": "3.1.0",
-    "eslint-plugin-jest": "24.1.3",
+    "detox": "18.11.1",
+    "eslint": "7.24.0",
+    "eslint-plugin-header": "3.1.1",
+    "eslint-plugin-jest": "24.3.5",
    "eslint-plugin-mattermost": "github:mattermost/eslint-plugin-mattermost#070ce792d105482ffb2b27cfc0b7e78b3d20acee",
-    "eslint-plugin-react": "7.21.5",
-    "hermes-engine": "0.5.2-rc1",
-    "husky": "4.3.0",
+    "eslint-plugin-react": "7.23.2",
+    "husky": "6.0.0",
    "isomorphic-fetch": "3.0.0",
    "jest": "26.6.3",
    "jest-cli": "26.6.3",
-    "jest-enzyme": "7.1.2",
    "jetifier": "1.6.6",
-    "metro-react-native-babel-preset": "0.64.0",
+    "metro-react-native-babel-preset": "0.65.2",
    "mmjstool": "github:mattermost/mattermost-utilities#519b99a4e51e6c67a0dbd46a6efdff27dc835aaa",
    "mock-async-storage": "2.2.0",
-    "patch-package": "6.2.2",
+    "patch-package": "6.4.7",
    "react-native-dev-menu": "4.0.2",
-    "react-native-dotenv": "2.4.2",
+    "react-native-dotenv": "2.5.5",
    "react-native-storybook-loader": "2.0.2",
-    "ts-jest": "26.4.4",
-    "typescript": "4.1.3",
-    "underscore": "1.11.0",
+    "ts-jest": "26.5.4",
+    "typescript": "4.2.4",
+    "underscore": "1.13.0",
    "util": "0.12.3"
  },
-  "husky": {
-    "hooks": {
-      "pre-commit": "sh ./scripts/pre-commit.sh"
-    }
-  },
  "scripts": {
    "android": "react-native run-android",
    "build-storybook": "build-storybook",
--- a/packager/moduleNames.js
+++ b/packager/moduleNames.js
@ -1,4 +1,4 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.

-module.exports = [];
+module.exports = [];
--- a/packager/modules.ios.js
+++ b/packager/modules.ios.js
@ -1,4 +1,4 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.

-module.exports = [];
+module.exports = [];
--- a/patches/@nozbe+watermelondb+0.20.0.patch
+++ b/patches/@nozbe+watermelondb+0.20.0.patch
--- a/patches/@nozbe+watermelondb+0.21.0.patch
+++ b/patches/@nozbe+watermelondb+0.21.0.patch
@ -0,0 +1,109 @@
+diff --git a/node_modules/@nozbe/watermelondb/adapters/sqlite/index.d.ts b/node_modules/@nozbe/watermelondb/adapters/sqlite/index.d.ts
+index 380f9c7..4302827 100644
+--- a/node_modules/@nozbe/watermelondb/adapters/sqlite/index.d.ts
+++ b/node_modules/@nozbe/watermelondb/adapters/sqlite/index.d.ts
+@@ -20,12 +20,19 @@ declare module '@nozbe/watermelondb/adapters/sqlite' {
+ 
+   export type SQLiteQuery = [SQL, SQLiteArg[]]
+ 
+  export type MigrationEvents = {
+    onSuccess?: () => void,
+    onStarted?: () => void,
+    onFailure?: (error: string) => void,
+  }
+
+   export interface SQLiteAdapterOptions {
+     dbName?: string
+     migrations?: SchemaMigrations
+     schema: AppSchema
+     synchronous?: boolean
+     experimentalUseJSI?: boolean
+    migrationEvents?: MigrationEvents
+   }
+ 
+   export default class SQLiteAdapter implements DatabaseAdapter {
+diff --git a/node_modules/@nozbe/watermelondb/adapters/sqlite/index.js b/node_modules/@nozbe/watermelondb/adapters/sqlite/index.js
+index 54fe949..f7d6acf 100644
+--- a/node_modules/@nozbe/watermelondb/adapters/sqlite/index.js
+++ b/node_modules/@nozbe/watermelondb/adapters/sqlite/index.js
+@@ -36,9 +36,11 @@ function () {
+       dbName: dbName,
+       schema: schema,
+       migrations: migrations
+      migrationEvents: migrationEvents
+     } = options;
+     this.schema = schema;
+     this.migrations = migrations;
+    this._migrationEvents = migrationEvents;
+     this._dbName = this._getName(dbName);
+     this._dispatcherType = (0, _makeDispatcher.getDispatcherType)(options);
+     this._dispatcher = (0, _makeDispatcher.makeDispatcher)(this._dispatcherType, this._tag, this._dbName);
+@@ -160,6 +162,10 @@ function () {
+       if (migrationSteps) {
+         _common.logger.log("[WatermelonDB][SQLite] Migrating from version ".concat(databaseVersion, " to ").concat(this.schema.version, "..."));
+ 
+        if (this._migrationEvents && this._migrationEvents.onStarted) {
+          this._migrationEvents.onStarted();
+        }
+
+         var $Try_1_Post = function () {
+           try {
+             return $If_4.call(this);
+@@ -172,11 +178,15 @@ function () {
+           try {
+             _common.logger.error('[WatermelonDB][SQLite] Migration failed', error);
+ 
+            if (this._migrationEvents && this._migrationEvents.onFailure) {
+              this._migrationEvents.onFailure();
+            }
+
+             throw error;
+           } catch ($boundEx) {
+             return $error($boundEx);
+           }
+-        };
+        }.bind(this);
+ 
+         try {
+           return Promise.resolve((0, _Result.toPromise)(function (callback) {
+@@ -185,11 +195,15 @@ function () {
+             try {
+               _common.logger.log('[WatermelonDB][SQLite] Migration successful');
+ 
+              if (this._migrationEvents && this._migrationEvents.onSuccess) {
+                this._migrationEvents.onSuccess();
+              }
+
+               return $Try_1_Post();
+             } catch ($boundEx) {
+               return $Try_1_Catch($boundEx);
+             }
+-          }, $Try_1_Catch);
+          }.bind(this), $Try_1_Catch);
+         } catch (error) {
+           $Try_1_Catch(error)
+         }
+diff --git a/node_modules/@nozbe/watermelondb/native/android/src/main/java/com/nozbe/watermelondb/Database.kt b/node_modules/@nozbe/watermelondb/native/android/src/main/java/com/nozbe/watermelondb/Database.kt
+index 2217222..afde44a 100644
+--- a/node_modules/@nozbe/watermelondb/native/android/src/main/java/com/nozbe/watermelondb/Database.kt
+++ b/node_modules/@nozbe/watermelondb/native/android/src/main/java/com/nozbe/watermelondb/Database.kt
+@@ -15,6 +15,19 @@ class Database(private val name: String, private val context: Context) {
+                 if (name == ":memory:" || name.contains("mode=memory")) {
+                     context.cacheDir.delete()
+                     File(context.cacheDir, name).path
+                } else if (name.contains("/") || name.contains("file")) {
+                    // Extracts the database name from the path
+                    val dbName = name.substringAfterLast("/")
+
+                    // Extracts the real path where the *.db file will be created
+                    val truePath = name.substringAfterLast("file://").substringBeforeLast("/")
+
+                    // Creates the directory
+                    val fileObj = File(truePath, "databases")
+                    fileObj.mkdir()
+
+
+                    File("${truePath}/databases", dbName).path
+                 } else
+                     // On some systems there is some kind of lock on `/databases` folder ¯\_(ツ)_/¯
+                     context.getDatabasePath("$name.db").path.replace("/databases", ""),
--- a/patches/react-native+0.64.0.patch
+++ b/patches/react-native+0.64.0.patch
@ -1,8 +1,8 @@
 diff --git a/node_modules/react-native/Libraries/Lists/VirtualizedList.js b/node_modules/react-native/Libraries/Lists/VirtualizedList.js
-index 9ec105f..18f7bf6 100644
+index 2249d54..d26452a 100644
 --- a/node_modules/react-native/Libraries/Lists/VirtualizedList.js
 +++ b/node_modules/react-native/Libraries/Lists/VirtualizedList.js
-@@ -20,6 +20,7 @@ const ScrollView = require('../Components/ScrollView/ScrollView');
+@@ -18,6 +18,7 @@ const ScrollView = require('../Components/ScrollView/ScrollView');
 const StyleSheet = require('../StyleSheet/StyleSheet');
 const View = require('../Components/View/View');
 const ViewabilityHelper = require('./ViewabilityHelper');
@ -10,7 +10,7 @@ index 9ec105f..18f7bf6 100644
 
 const flattenStyle = require('../StyleSheet/flattenStyle');
 const infoLog = require('../Utilities/infoLog');
-@@ -2186,7 +2187,7 @@ function describeNestedLists(childList: {
+@@ -2061,7 +2062,7 @@ function describeNestedLists(childList: {
 
 const styles = StyleSheet.create({
   verticallyInverted: {
@ -20,7 +20,7 @@ index 9ec105f..18f7bf6 100644
   horizontallyInverted: {
     transform: [{scaleX: -1}],
 diff --git a/node_modules/react-native/react.gradle b/node_modules/react-native/react.gradle
-index 6441d93..4a0cd01 100644
+index 5995ad5..dbae7e3 100644
 --- a/node_modules/react-native/react.gradle
 +++ b/node_modules/react-native/react.gradle
@@ -157,7 +157,7 @@ afterEvaluate {
@ -50,7 +50,7 @@ index 6441d93..4a0cd01 100644
         }
 
         // Expose a minimal interface on the application variant and the task itself:
-@@ -313,7 +313,7 @@ afterEvaluate {
+@@ -318,7 +318,7 @@ afterEvaluate {
         // This should really be done by packaging all Hermes releated libs into
         // two separate HermesDebug and HermesRelease AARs, but until then we'll
         // kludge it by deleting the .so files out of the /transforms/ directory.
--- a/patches/react-native-device-info+8.1.0.patch
+++ b/patches/react-native-device-info+8.1.0.patch
--- a/patches/react-native-elements+2.3.2.patch
+++ b/patches/react-native-elements+2.3.2.patch
@ -1,51 +0,0 @@
-diff --git a/node_modules/react-native-elements/src/searchbar/SearchBar-android.js b/node_modules/react-native-elements/src/searchbar/SearchBar-android.js
-index 9ab7ce3..e53034b 100644
--- a/node_modules/react-native-elements/src/searchbar/SearchBar-android.js
-+++ b/node_modules/react-native-elements/src/searchbar/SearchBar-android.js
-@@ -29,6 +29,12 @@ const defaultClearIcon = (theme) => ({
- });
- 
- class SearchBar extends Component {
-+  componentDidUpdate(prevProps) {
-+    if (this.props.value !== prevProps.value) {
-+      this.setState({isEmpty: this.props.value === ''});
-+    }
-+  }
-+
-   focus = () => {
-     this.input.focus();
-   };
-diff --git a/node_modules/react-native-elements/src/searchbar/SearchBar-ios.js b/node_modules/react-native-elements/src/searchbar/SearchBar-ios.js
-index f1ad10d..17cc1e2 100644
--- a/node_modules/react-native-elements/src/searchbar/SearchBar-ios.js
-+++ b/node_modules/react-native-elements/src/searchbar/SearchBar-ios.js
-@@ -39,6 +39,12 @@ class SearchBar extends Component {
-     };
-   }
- 
-+  componentDidUpdate(prevProps) {
-+    if (this.props.value !== prevProps.value) {
-+      this.setState({isEmpty: this.props.value === ''});
-+    }
-+  }
-+
-   focus = () => {
-     this.input.focus();
-   };
-@@ -268,7 +274,6 @@ const styles = {
-     paddingBottom: 13,
-     paddingTop: 13,
-     flexDirection: 'row',
-    overflow: 'hidden',
-     alignItems: 'center',
-   }),
-   input: {
-@@ -279,7 +284,7 @@ const styles = {
-     borderBottomWidth: 0,
-     backgroundColor: theme.colors.platform.ios.searchBg,
-     borderRadius: 9,
-    minHeight: 36,
-+    minHeight: 30,
-     marginLeft: 8,
-     marginRight: 8,
-   }),
--- a/patches/react-native-elements+3.3.2.patch
+++ b/patches/react-native-elements+3.3.2.patch
@ -0,0 +1,69 @@
+diff --git a/node_modules/react-native-elements/dist/searchbar/SearchBar-android.js b/node_modules/react-native-elements/dist/searchbar/SearchBar-android.js
+index 4261cea..183bde1 100644
+--- a/node_modules/react-native-elements/dist/searchbar/SearchBar-android.js
+++ b/node_modules/react-native-elements/dist/searchbar/SearchBar-android.js
+@@ -10,7 +10,7 @@ var __rest = (this && this.__rest) || function (s, e) {
+     return t;
+ };
+ import React, { Component } from 'react';
+-import { StyleSheet, View, ActivityIndicator, Keyboard, } from 'react-native';
+import { StyleSheet, View, ActivityIndicator, } from 'react-native';
+ import { renderNode } from '../helpers';
+ import Input from '../input/Input';
+ import Icon from '../icons/Icon';
+@@ -65,18 +65,16 @@ class SearchBar extends Component {
+             this.props.onChangeText(text);
+             this.setState({ isEmpty: text === '' });
+         };
+-        this._keyboardDidHide = () => {
+-            this.cancel();
+-        };
+         const { value = '' } = props;
+         this.state = {
+             hasFocus: false,
+             isEmpty: value ? value === '' : true,
+         };
+-        Keyboard.addListener('keyboardDidHide', this._keyboardDidHide);
+     }
+-    componentWillUnmount() {
+-        Keyboard.removeListener('keyboardDidHide', this._keyboardDidHide);
+    componentDidUpdate(prevProps) {
+        if (this.props.value !== prevProps.value) {
+            this.setState({isEmpty: this.props.value === ''});
+        }
+     }
+     render() {
+         const _a = this.props, { theme, clearIcon = { name: 'clear' }, containerStyle, leftIconContainerStyle, rightIconContainerStyle, inputContainerStyle, inputStyle, searchIcon = { name: 'search' }, cancelIcon = { name: 'arrow-back' }, showLoading = false, loadingProps = {} } = _a, attributes = __rest(_a, ["theme", "clearIcon", "containerStyle", "leftIconContainerStyle", "rightIconContainerStyle", "inputContainerStyle", "inputStyle", "searchIcon", "cancelIcon", "showLoading", "loadingProps"]);
+diff --git a/node_modules/react-native-elements/dist/searchbar/SearchBar-ios.js b/node_modules/react-native-elements/dist/searchbar/SearchBar-ios.js
+index b0761ab..4fa5e83 100644
+--- a/node_modules/react-native-elements/dist/searchbar/SearchBar-ios.js
+++ b/node_modules/react-native-elements/dist/searchbar/SearchBar-ios.js
+@@ -82,6 +82,11 @@ class SearchBar extends Component {
+             cancelButtonWidth: null,
+         };
+     }
+    componentDidUpdate(prevProps) {
+        if (this.props.value !== prevProps.value) {
+            this.setState({isEmpty: this.props.value === ''});
+        }
+    }
+     render() {
+         const _a = this.props, { theme, cancelButtonProps, cancelButtonTitle, clearIcon, containerStyle, leftIconContainerStyle, rightIconContainerStyle, inputContainerStyle, inputStyle, placeholderTextColor, showLoading, loadingProps, searchIcon, showCancel } = _a, attributes = __rest(_a, ["theme", "cancelButtonProps", "cancelButtonTitle", "clearIcon", "containerStyle", "leftIconContainerStyle", "rightIconContainerStyle", "inputContainerStyle", "inputStyle", "placeholderTextColor", "showLoading", "loadingProps", "searchIcon", "showCancel"]);
+         const { hasFocus, isEmpty } = this.state;
+@@ -159,7 +164,6 @@ const styles = StyleSheet.create({
+         paddingBottom: 13,
+         paddingTop: 13,
+         flexDirection: 'row',
+-        overflow: 'hidden',
+         alignItems: 'center',
+     },
+     input: {
+@@ -169,7 +173,7 @@ const styles = StyleSheet.create({
+     inputContainer: {
+         borderBottomWidth: 0,
+         borderRadius: 9,
+-        minHeight: 36,
+        minHeight: 30,
+         marginLeft: 8,
+         marginRight: 8,
+     },
--- a/patches/react-native-keyboard-tracking-view+5.7.0.patch
+++ b/patches/react-native-keyboard-tracking-view+5.7.0.patch
@ -1,5 +1,5 @@
 diff --git a/node_modules/react-native-keyboard-tracking-view/lib/KeyboardTrackingViewManager.m b/node_modules/react-native-keyboard-tracking-view/lib/KeyboardTrackingViewManager.m
-index 1333a10..86d3678 100644
+index 1333a10..6922a17 100644
 --- a/node_modules/react-native-keyboard-tracking-view/lib/KeyboardTrackingViewManager.m
 +++ b/node_modules/react-native-keyboard-tracking-view/lib/KeyboardTrackingViewManager.m
@@ -23,7 +23,7 @@
@ -41,7 +41,7 @@ index 1333a10..86d3678 100644
         
         _observingInputAccessoryView = [ObservingInputAccessoryView new];
         _observingInputAccessoryView.delegate = self;
- 
+         
 +        _initialOffsetY = 0;
 +        _initialOffsetIsSet = NO;
 +        
@ -82,16 +82,16 @@ index 1333a10..86d3678 100644
             if(_scrollViewToManage == nil)
             {
 -                if(_requiresSameParentToManageScrollView && [subview isKindOfClass:[RCTScrollView class]] && subview.superview == self.superview)
-                {
+                if([subview isKindOfClass:[RCTScrollView class]])
+                 {
 -                    _scrollViewToManage = ((RCTScrollView*)subview).scrollView;
 -                }
 -                else if(!_requiresSameParentToManageScrollView && [subview isKindOfClass:[UIScrollView class]])
-+                if([subview isKindOfClass:[RCTScrollView class]])
-                 {
+-                {
 -                    _scrollViewToManage = (UIScrollView*)subview;
 -                }
 +                    RCTScrollView *scrollView = (RCTScrollView*)subview;
- 
+                 
 -                if(_scrollViewToManage != nil)
 -                {
 -                    _scrollIsInverted = CGAffineTransformEqualToTransform(_scrollViewToManage.superview.transform, CGAffineTransformMakeScale(1, -1));
@ -197,32 +197,37 @@ index 1333a10..86d3678 100644
             }
         }
         else if(self.scrollBehavior == KeyboardTrackingScrollBehaviorFixedOffset && !self.isDraggingScrollView)
-@@ -422,16 +459,15 @@ - (void)_updateScrollViewInsets
+@@ -422,16 +459,21 @@ - (void)_updateScrollViewInsets
             self.scrollViewToManage.contentOffset = CGPointMake(originalOffset.x, originalOffset.y + insetsDiff);
         }
- 
+         
 -        insets = self.scrollViewToManage.contentInset;
 -        if(self.scrollIsInverted)
 -        {
 -            insets.top = bottomInset;
-        }
+        CGFloat kHeight = _observingInputAccessoryView.keyboardHeight;
+        if (kHeight != 0 && (_observingInputAccessoryView.keyboardState == KeyboardStateShown || _observingInputAccessoryView.keyboardState == KeyboardStateWillShow)) {
+                kHeight -= bottomSafeArea;
+         }
 -        else
 -        {
 -            insets.bottom = bottomInset;
-+        CGFloat positionY = self.normalList ? 0 : _observingInputAccessoryView.keyboardHeight;
+
+        CGFloat positionY = self.normalList ? 0 : kHeight;
 +        CGRect frame = CGRectMake(self.scrollViewToManage.frame.origin.x, positionY,
 +                                  self.scrollViewToManage.frame.size.width, self.scrollViewToManage.frame.size.height);
 +        self.scrollViewToManage.frame = frame;
 +
 +        if (self.accessoriesContainer) {
-+            self.accessoriesContainer.bounds =  CGRectMake(self.accessoriesContainer.bounds.origin.x, positionY,
+            CGFloat containerPositionY = self.normalList ? 0 : _observingInputAccessoryView.keyboardHeight;
+            self.accessoriesContainer.bounds =  CGRectMake(self.accessoriesContainer.bounds.origin.x, containerPositionY,
 +                                                           self.accessoriesContainer.bounds.size.width, self.accessoriesContainer.bounds.size.height);
         }
 -        self.scrollViewToManage.scrollIndicatorInsets = insets;
     }
 }
 
-@@ -448,7 +484,6 @@ -(void)addBottomViewIfNecessary
+@@ -448,7 +490,6 @@ -(void)addBottomViewIfNecessary
     if (self.addBottomView && _bottomView == nil)
     {
         _bottomView = [UIView new];
@ -230,7 +235,7 @@ index 1333a10..86d3678 100644
         [self addSubview:_bottomView];
         [self updateBottomViewFrame];
     }
-@@ -467,6 +502,12 @@ -(void)updateBottomViewFrame
+@@ -467,6 +508,12 @@ -(void)updateBottomViewFrame
     }
 }
 
@ -243,7 +248,7 @@ index 1333a10..86d3678 100644
 #pragma mark - safe area
 
 -(void)safeAreaInsetsDidChange
-@@ -510,7 +551,7 @@ -(void)updateTransformAndInsets
+@@ -510,7 +557,7 @@ -(void)updateTransformAndInsets
     CGFloat accessoryTranslation = MIN(-bottomSafeArea, -_observingInputAccessoryView.keyboardHeight);
     
     if (_observingInputAccessoryView.keyboardHeight <= bottomSafeArea) {
@ -252,22 +257,7 @@ index 1333a10..86d3678 100644
     } else if (_observingInputAccessoryView.keyboardState != KeyboardStateWillHide) {
         _bottomViewHeight = 0;
     }
-@@ -554,6 +595,14 @@ - (void) observingInputAccessoryViewKeyboardWillAppear:(ObservingInputAccessoryV
-     [self performScrollToFocusedInput];
- }
- 
-+- (void)observingInputAccessoryViewKeyboardDidAppear:(ObservingInputAccessoryView *)observingInputAccessoryView {
-+    if (observingInputAccessoryView.keyboardHeight == 0 && self.scrollViewToManage) {
-+        CGRect frame = CGRectMake(self.scrollViewToManage.frame.origin.x, _observingInputAccessoryView.height,
-+                                  self.scrollViewToManage.frame.size.width, self.scrollViewToManage.frame.size.height);
-+        self.scrollViewToManage.frame = frame;
-+    }
-+}
-+
- #pragma mark - UIScrollViewDelegate methods
- 
- - (void)scrollViewDidScroll:(UIScrollView *)scrollView
-@@ -582,6 +631,8 @@ - (void)scrollViewDidScroll:(UIScrollView *)scrollView
+@@ -582,6 +629,8 @@ - (void)scrollViewDidScroll:(UIScrollView *)scrollView
 - (void)scrollViewWillBeginDragging:(UIScrollView *)scrollView
 {
     self.isDraggingScrollView = YES;
@ -276,7 +266,7 @@ index 1333a10..86d3678 100644
 }
 
 - (void)scrollViewWillEndDragging:(UIScrollView *)scrollView withVelocity:(CGPoint)velocity targetContentOffset:(inout CGPoint *)targetContentOffset
-@@ -592,6 +643,15 @@ - (void)scrollViewWillEndDragging:(UIScrollView *)scrollView withVelocity:(CGPoi
+@@ -592,6 +641,15 @@ - (void)scrollViewWillEndDragging:(UIScrollView *)scrollView withVelocity:(CGPoi
 - (void)scrollViewDidEndDragging:(UIScrollView *)scrollView willDecelerate:(BOOL)decelerate
 {
     self.isDraggingScrollView = NO;
@ -292,7 +282,7 @@ index 1333a10..86d3678 100644
 }
 
 - (CGFloat)getKeyboardHeight
-@@ -634,6 +694,12 @@ @implementation KeyboardTrackingViewManager
+@@ -634,6 +692,12 @@ @implementation KeyboardTrackingViewManager
 RCT_REMAP_VIEW_PROPERTY(addBottomView, addBottomView, BOOL)
 RCT_REMAP_VIEW_PROPERTY(scrollToFocusedInput, scrollToFocusedInput, BOOL)
 RCT_REMAP_VIEW_PROPERTY(allowHitsOutsideBounds, allowHitsOutsideBounds, BOOL)
@ -305,7 +295,7 @@ index 1333a10..86d3678 100644
 
 + (BOOL)requiresMainQueueSetup
 {
-@@ -654,6 +720,20 @@ - (UIView *)view
+@@ -654,6 +718,20 @@ - (UIView *)view
     return [[KeyboardTrackingView alloc] init];
 }
 
@ -326,34 +316,6 @@ index 1333a10..86d3678 100644
 RCT_EXPORT_METHOD(getNativeProps:(nonnull NSNumber *)reactTag resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
 {
     [self.bridge.uiManager addUIBlock:
-diff --git a/node_modules/react-native-keyboard-tracking-view/lib/ObservingInputAccessoryView.h b/node_modules/react-native-keyboard-tracking-view/lib/ObservingInputAccessoryView.h
-index 9b242e8..b500db1 100644
--- a/node_modules/react-native-keyboard-tracking-view/lib/ObservingInputAccessoryView.h
-+++ b/node_modules/react-native-keyboard-tracking-view/lib/ObservingInputAccessoryView.h
-@@ -30,6 +30,7 @@ typedef NS_ENUM(NSUInteger, KeyboardState) {
- 
- - (void)observingInputAccessoryViewKeyboardWillAppear:(ObservingInputAccessoryView*)observingInputAccessoryView keyboardDelta:(CGFloat)delta;
- - (void)observingInputAccessoryViewKeyboardWillDisappear:(ObservingInputAccessoryView*)observingInputAccessoryView;
-+- (void)observingInputAccessoryViewKeyboardDidAppear:(ObservingInputAccessoryView*)observingInputAccessoryView;
- 
- @end
- 
-diff --git a/node_modules/react-native-keyboard-tracking-view/lib/ObservingInputAccessoryView.m b/node_modules/react-native-keyboard-tracking-view/lib/ObservingInputAccessoryView.m
-index e472679..dbc5c5e 100644
--- a/node_modules/react-native-keyboard-tracking-view/lib/ObservingInputAccessoryView.m
-+++ b/node_modules/react-native-keyboard-tracking-view/lib/ObservingInputAccessoryView.m
-@@ -123,6 +123,11 @@ - (void)_keyboardWillShowNotification:(NSNotification*)notification
-     {
-         [_delegate observingInputAccessoryViewKeyboardWillAppear:self keyboardDelta:_keyboardHeight - _previousKeyboardHeight];
-     }
-+
-+    if([_delegate respondsToSelector:@selector(observingInputAccessoryViewKeyboardDidAppear:)])
-+    {
-+        [_delegate observingInputAccessoryViewKeyboardDidAppear:self];
-+    }
- }
- 
- - (void)_keyboardDidShowNotification:(NSNotification*)notification
 diff --git a/node_modules/react-native-keyboard-tracking-view/src/KeyboardTrackingView.android.js b/node_modules/react-native-keyboard-tracking-view/src/KeyboardTrackingView.android.js
 index af15edf..3ba0a3a 100644
 --- a/node_modules/react-native-keyboard-tracking-view/src/KeyboardTrackingView.android.js
--- a/patches/react-native-keychain+6.2.0.patch
+++ b/patches/react-native-keychain+6.2.0.patch
@ -0,0 +1,59 @@
+diff --git a/node_modules/react-native-keychain/android/src/main/java/com/oblador/keychain/KeychainModule.java b/node_modules/react-native-keychain/android/src/main/java/com/oblador/keychain/KeychainModule.java
+index d4ded69..af35eaa 100644
+--- a/node_modules/react-native-keychain/android/src/main/java/com/oblador/keychain/KeychainModule.java
+++ b/node_modules/react-native-keychain/android/src/main/java/com/oblador/keychain/KeychainModule.java
+@@ -1,6 +1,7 @@
+ package com.oblador.keychain;
+ 
+ import android.os.Build;
+import android.os.Bundle;
+ import android.os.Looper;
+ import android.text.TextUtils;
+ import android.util.Log;
+@@ -128,6 +129,7 @@ public class KeychainModule extends ReactContextBaseJavaModule {
+   //region Members
+   /** Name-to-instance lookup  map. */
+   private final Map<String, CipherStorage> cipherStorageMap = new HashMap<>();
+  private final Map<String, Bundle> cachedCredentialsMap = new HashMap<>();
+   /** Shared preferences storage. */
+   private final PrefsStorage prefsStorage;
+   //endregion
+@@ -139,13 +141,13 @@ public class KeychainModule extends ReactContextBaseJavaModule {
+     super(reactContext);
+     prefsStorage = new PrefsStorage(reactContext);
+ 
+-    addCipherStorageToMap(new CipherStorageFacebookConceal(reactContext));
+    // addCipherStorageToMap(new CipherStorageFacebookConceal(reactContext));
+     addCipherStorageToMap(new CipherStorageKeystoreAesCbc());
+ 
+     // we have a references to newer api that will fail load of app classes in old androids OS
+-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+-      addCipherStorageToMap(new CipherStorageKeystoreRsaEcb());
+-    }
+    // if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+    //   addCipherStorageToMap(new CipherStorageKeystoreRsaEcb());
+    // }
+   }
+ 
+   /** Allow initialization in chain. */
+@@ -277,6 +279,12 @@ public class KeychainModule extends ReactContextBaseJavaModule {
+                                     @Nullable final ReadableMap options,
+                                     @NonNull final Promise promise) {
+     try {
+      Bundle cached = cachedCredentialsMap.get(alias);
+      if (cached != null) {
+        promise.resolve(Arguments.fromBundle(cached));
+        return;
+      }
+
+       final ResultSet resultSet = prefsStorage.getEncryptedEntry(alias);
+ 
+       if (resultSet == null) {
+@@ -299,6 +307,7 @@ public class KeychainModule extends ReactContextBaseJavaModule {
+       credentials.putString(Maps.USERNAME, decryptionResult.username);
+       credentials.putString(Maps.PASSWORD, decryptionResult.password);
+       credentials.putString(Maps.STORAGE, current.getCipherStorageName());
+      cachedCredentialsMap.put(alias, Arguments.toBundle(credentials));
+ 
+       promise.resolve(credentials);
+     } catch (KeyStoreAccessException e) {
--- a/patches/react-native-navigation+7.13.0.patch
+++ b/patches/react-native-navigation+7.13.0.patch
@ -1,5 +1,5 @@
 diff --git a/node_modules/react-native-navigation/lib/android/app/src/main/java/com/reactnativenavigation/react/NavigationModule.java b/node_modules/react-native-navigation/lib/android/app/src/main/java/com/reactnativenavigation/react/NavigationModule.java
-index 3bfbc0b..cdb0d05 100644
+index 4e4f498..b7ddd86 100644
 --- a/node_modules/react-native-navigation/lib/android/app/src/main/java/com/reactnativenavigation/react/NavigationModule.java
 +++ b/node_modules/react-native-navigation/lib/android/app/src/main/java/com/reactnativenavigation/react/NavigationModule.java
@@ -55,14 +55,18 @@ public class NavigationModule extends ReactContextBaseJavaModule {
@ -29,7 +29,7 @@ index 3bfbc0b..cdb0d05 100644
             }
         });
     }
-@@ -196,8 +200,12 @@ public class NavigationModule extends ReactContextBaseJavaModule {
+@@ -201,8 +205,12 @@ public class NavigationModule extends ReactContextBaseJavaModule {
 
     protected void handle(Runnable task) {
         UiThread.post(() -> {
@ -44,11 +44,34 @@ index 3bfbc0b..cdb0d05 100644
             }
         });
     }
+diff --git a/node_modules/react-native-navigation/lib/ios/RNNOverlayWindow.m b/node_modules/react-native-navigation/lib/ios/RNNOverlayWindow.m
+index 815e1c6..a35a087 100644
+--- a/node_modules/react-native-navigation/lib/ios/RNNOverlayWindow.m
+++ b/node_modules/react-native-navigation/lib/ios/RNNOverlayWindow.m
+@@ -1,5 +1,7 @@
+ #import "RNNOverlayWindow.h"
+ #import "RNNReactView.h"
+#import <react-native-safe-area-context/RNCSafeAreaView.h>
+#import <react-native-safe-area-context/RNCSafeAreaProvider.h>
+ 
+ @implementation RNNOverlayWindow
+ 
+@@ -7,7 +9,9 @@
+     UIView *hitTestResult = [super hitTest:point withEvent:event];
+ 
+     if ([hitTestResult isKindOfClass:[UIWindow class]] ||
+-        [hitTestResult.subviews.firstObject isKindOfClass:RNNReactView.class]) {
+        [hitTestResult.subviews.firstObject isKindOfClass:RNNReactView.class] ||
+        [hitTestResult isKindOfClass:[RNCSafeAreaView class]] ||
+        [hitTestResult isKindOfClass:[RNCSafeAreaProvider class]]) {
+         return nil;
+     }
+ 
 diff --git a/node_modules/react-native-navigation/lib/ios/RNNViewLocation.m b/node_modules/react-native-navigation/lib/ios/RNNViewLocation.m
-index f5187d9..d97e766 100644
+index 6b9981d..f725701 100644
 --- a/node_modules/react-native-navigation/lib/ios/RNNViewLocation.m
 +++ b/node_modules/react-native-navigation/lib/ios/RNNViewLocation.m
-@@ -32,11 +32,7 @@ - (CGFloat)getClippedCornerRadius:(UIView *)view {
+@@ -31,11 +31,7 @@
 
 - (CATransform3D)getTransform:(UIView *)view {
     if (view) {
--- a/patches/react-native-notifications+3.4.2.patch
+++ b/patches/react-native-notifications+3.4.2.patch
@ -388,18 +388,9 @@ index ad7fc1a..a04ec6b 100644
     get title() {
         return this.payload.title;
 diff --git a/node_modules/react-native-notifications/lib/dist/Notifications.d.ts b/node_modules/react-native-notifications/lib/dist/Notifications.d.ts
-index 34e8170..10600d2 100644
+index 3a75bcf..10600d2 100644
 --- a/node_modules/react-native-notifications/lib/dist/Notifications.d.ts
 +++ b/node_modules/react-native-notifications/lib/dist/Notifications.d.ts
-@@ -23,7 +23,7 @@ export declare class NotificationsRoot {
-     /**
-      * postLocalNotification
-      */
-    postLocalNotification(notification: Notification, id: number): number;
-+    postLocalNotification(notification: Notification, id?: number): number;
-     /**
-      * getInitialNotification
-      */
@@ -36,6 +36,10 @@ export declare class NotificationsRoot {
      * cancelLocalNotification
     */
@ -440,7 +431,7 @@ index 0e78cb5..ae90bd1 100644
 +    constructor(identifier: string, activationMode: 'background' | 'foreground' | 'authenticationRequired' | 'destructive', title: string, authenticationRequired: boolean, textInput?: NotificationTextInput);
 }
 diff --git a/node_modules/react-native-notifications/lib/ios/RNNotificationCenter.m b/node_modules/react-native-notifications/lib/ios/RNNotificationCenter.m
-index 1fbd2a5..ab44587 100644
+index 0a30b5a..a45a83d 100644
 --- a/node_modules/react-native-notifications/lib/ios/RNNotificationCenter.m
 +++ b/node_modules/react-native-notifications/lib/ios/RNNotificationCenter.m
@@ -58,7 +58,7 @@ - (void)getDeliveredNotifications:(RCTResponseSenderBlock)callback {
@ -453,18 +444,9 @@ index 1fbd2a5..ab44587 100644
 }
 
 diff --git a/node_modules/react-native-notifications/lib/src/Notifications.ts b/node_modules/react-native-notifications/lib/src/Notifications.ts
-index 44956df..551fac2 100644
+index 8a4a51e..551fac2 100644
 --- a/node_modules/react-native-notifications/lib/src/Notifications.ts
 +++ b/node_modules/react-native-notifications/lib/src/Notifications.ts
-@@ -54,7 +54,7 @@ export class NotificationsRoot {
-   /**
-    * postLocalNotification
-    */
-  public postLocalNotification(notification: Notification, id: number) {
-+  public postLocalNotification(notification: Notification, id?: number) {
-     return this.commands.postLocalNotification(notification, id);
-   }
- 
@@ -79,6 +79,13 @@ export class NotificationsRoot {
     return this.commands.cancelLocalNotification(notificationId);
   }
--- a/patches/react-native-vector-icons+8.1.0.patch
+++ b/patches/react-native-vector-icons+8.1.0.patch
--- a/react-native.config.js
+++ b/react-native.config.js
@ -12,4 +12,4 @@ module.exports = {
    assets: [
        './assets/fonts',
    ],
-};
+};
--- a/share_extension/index.tsx
+++ b/share_extension/index.tsx
@ -109,4 +109,4 @@ const styles = StyleSheet.create({
    },
 });

-export default Channel;
+export default Channel;
--- a/types/api/client_error.d.ts
+++ b/types/api/client_error.d.ts
@ -7,4 +7,4 @@ interface ClientErrorProps extends Error {
    url: string;
    server_error_id?: string | number;
    status_code?: number;
-}
+}
--- a/types/api/preferences.d.ts
+++ b/types/api/preferences.d.ts
@ -0,0 +1,31 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+type Theme = {
+    [key: string]: string | undefined;
+    type?: string;
+    sidebarBg: string;
+    sidebarText: string;
+    sidebarUnreadText: string;
+    sidebarTextHoverBg: string;
+    sidebarTextActiveBorder: string;
+    sidebarTextActiveColor: string;
+    sidebarHeaderBg: string;
+    sidebarHeaderTextColor: string;
+    onlineIndicator: string;
+    awayIndicator: string;
+    dndIndicator: string;
+    mentionBg: string;
+    mentionBj: string;
+    mentionColor: string;
+    centerChannelBg: string;
+    centerChannelColor: string;
+    newMessageSeparator: string;
+    linkColor: string;
+    buttonBg: string;
+    buttonColor: string;
+    errorTextColor: string;
+    mentionHighlightBg: string;
+    mentionHighlightLink: string;
+    codeTheme: string;
+};
--- a/types/database/database.d.ts
+++ b/types/database/database.d.ts
@ -486,7 +486,7 @@ export type PrepareForDatabaseArgs = {
  tableName: string;
  createRaws?: MatchExistingRecord[];
  updateRaws?: MatchExistingRecord[];
-  recordOperator: (DataFactoryArgs) => void;
+  recordOperator: (dataArgs: DataFactoryArgs) => void;
 };

 export type PrepareRecordsArgs = PrepareForDatabaseArgs & {
@ -575,7 +575,7 @@ export type ProcessInputsArgs = {
 export type HandleEntityRecordsArgs = {
  findMatchingRecordBy: (existing: Model, newElement: RawValue) => boolean;
  fieldName: string;
-  operator: (DataFactoryArgs) => Promise<Model | null>;
+  operator: (dataArgs: DataFactoryArgs) => Promise<Model | null>;
  rawValues: RawValue[];
  tableName: string;
 };
--- a/types/global/error_handling.d.ts
+++ b/types/global/error_handling.d.ts
@ -5,4 +5,4 @@ interface jsAndNativeErrorHandler {
    initializeErrorHandling: () => void;
    nativeErrorHandler: (e: string) => void;
    errorHandler: (e: Error | ClientError, isFatal: boolean) => void;
-}
+}
--- a/types/global/push_notifications.d.ts
+++ b/types/global/push_notifications.d.ts
@ -44,4 +44,4 @@ interface NotificationWithData extends Notification {

 declare class NotificationWithChannel extends Notification {
    channel_id?: string;
-}
+}
--- a/types/modules/react-native-slider.d.ts
+++ b/types/modules/react-native-slider.d.ts
@ -1,6 +1,6 @@
 /* eslint-disable header/header */
 declare module 'react-native-slider' {
-    import {ComponentClass, PureComponent} from 'react';
+    import {ComponentClass} from 'react';

    import {
        ImageSourcePropType,
@ -131,4 +131,4 @@ declare module 'react-native-slider' {
    const Slider: ComponentClass<SliderProps>;

    export default Slider;
-  }
+  }
--- a/types/screens/gallery.d.ts
+++ b/types/screens/gallery.d.ts
@ -1,6 +1,7 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.

+import React from 'react';
 import {intlShape} from 'react-intl';
 import {StyleProp, ViewStyle} from 'react-native';
 import Animated from 'react-native-reanimated';
@ -8,6 +9,10 @@ import Animated from 'react-native-reanimated';
 import type {FileInfo} from '@mm-redux/types/files';
 import type {Theme} from '@mm-redux/types/preferences';

+export interface CallbackFunctionWithoutArguments {
+    (): void;
+}
+
 export interface ActionCallback {
    (callback: CallbackFunctionWithoutArguments): void;
 }
@ -31,10 +36,6 @@ export interface AvatarProps {
    theme: Theme;
 }

-export interface CallbackFunctionWithoutArguments {
-    (): void;
-}
-
 export interface DetailsProps {
    channel?: string;
    isDirect?: boolean;
@ -110,7 +111,7 @@ export interface ToastRef {
 }

 export interface ToastState {
-    animation?: CompositeAnimation,
+    animation?: Animated.CompositeAnimation,
    duration?: number;
    callback?: () => void;
 }
--- a/types/utils/index.d.ts
+++ b/types/utils/index.d.ts
@ -0,0 +1,6 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+type Dictionary<T> = {
+    [key: string]: T;
+};