Merge branch 'develop' into chore.circleci_caching

Prevent brew auto-cleanup
2020-07-26 13:44:11 +01:00 · 2020-07-22 22:10:14 +01:00 · 2020-07-22 21:03:41 +01:00 · 2020-07-22 21:01:51 +01:00 · 2020-07-22 16:47:46 +01:00 · 2020-07-22 13:45:45 +01:00
21289 changed files with 3246565 additions and 118873 deletions
--- a/.bundle/config
+++ b/.bundle/config
@ -1,2 +0,0 @@
-BUNDLE_PATH: "vendor/bundle"
-BUNDLE_FORCE_RUBY_PLATFORM: 1
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
--- a/.detoxrc.js
+++ b/.detoxrc.js
@ -1,91 +0,0 @@
-/** @type {Detox.DetoxConfig} */
-module.exports = {
-	testRunner: {
-		args: {
-			$0: 'jest',
-			config: 'e2e/jest.config.js'
-		},
-		retries: process.env.CI ? 3 : 0
-	},
-	artifacts: {
-		plugins: {
-			screenshot: 'failing',
-			video: 'failing',
-			uiHierarchy: 'enabled'
-		}
-	},
-	apps: {
-		'ios.debug': {
-			type: 'ios.app',
-			binaryPath: 'ios/build/Build/Products/Debug-iphonesimulator/Rocket.Chat Experimental.app',
-			build:
-				'xcodebuild -workspace ios/RocketChatRN.xcworkspace -scheme RocketChatRN -configuration Debug -sdk iphonesimulator -derivedDataPath ios/build'
-		},
-		'ios.release': {
-			type: 'ios.app',
-			binaryPath: 'ios/build/Build/Products/Release-iphonesimulator/Rocket.Chat Experimental.app',
-			build:
-				'xcodebuild -workspace ios/RocketChatRN.xcworkspace -scheme RocketChatRN -configuration Release -sdk iphonesimulator -derivedDataPath ios/build'
-		},
-		'android.debug': {
-			type: 'android.apk',
-			binaryPath: 'android/app/build/outputs/apk/experimentalPlay/debug/app-experimental-play-debug.apk',
-			build:
-				'cd android ; ./gradlew assembleExperimentalPlayDebug assembleExperimentalPlayDebugAndroidTest -DtestBuildType=debug ; cd -',
-			reversePorts: [8081]
-		},
-		'android.release': {
-			type: 'android.apk',
-			binaryPath: 'android/app/build/outputs/apk/experimentalPlay/release/app-experimental-play-release.apk',
-			build:
-				'cd android ; ./gradlew assembleExperimentalPlayRelease assembleExperimentalPlayReleaseAndroidTest -DtestBuildType=release ; cd -'
-		}
-	},
-	devices: {
-		simulator: {
-			type: 'ios.simulator',
-			device: {
-				type: 'iPhone 14'
-			}
-		},
-		attached: {
-			type: 'android.attached',
-			device: {
-				adbName: '.*'
-			}
-		},
-		emulator: {
-			type: 'android.emulator',
-			device: {
-				avdName: 'Pixel_API_31_AOSP'
-			},
-			headless: process.env.CI ? true : false
-		}
-	},
-	configurations: {
-		'ios.sim.debug': {
-			device: 'simulator',
-			app: 'ios.debug'
-		},
-		'ios.sim.release': {
-			device: 'simulator',
-			app: 'ios.release'
-		},
-		'android.att.debug': {
-			device: 'attached',
-			app: 'android.debug'
-		},
-		'android.att.release': {
-			device: 'attached',
-			app: 'android.release'
-		},
-		'android.emu.debug': {
-			device: 'emulator',
-			app: 'android.debug'
-		},
-		'android.emu.release': {
-			device: 'emulator',
-			app: 'android.release'
-		}
-	}
-};
--- a/.env
+++ b/.env
@ -1,2 +0,0 @@
-# DON'T COMMIT THIS FILE
-RUNNING_E2E_TESTS=
--- a/.eslintignore
+++ b/.eslintignore
@ -1,7 +1,6 @@
 __tests__
 node_modules
 coverage
-e2e/docker
+e2e
 android
 ios
-.eslintrc.js
--- a/.eslintrc.js
+++ b/.eslintrc.js
@ -1,248 +1,156 @@
 module.exports = {
-	settings: {
-		'import/resolver': {
-			node: {
-				extensions: ['.ts', '.tsx', '.js', '.ios.js', '.android.js', '.native.js', '.ios.tsx', '.android.tsx']
+	"settings": {
+    "import/resolver": {
+      "node": {
+        "extensions": [".js", ".ios.js", ".android.js", ".native.js", ".tsx"]
      }
    }
  },
-	parser: '@babel/eslint-parser',
-	extends: ['@rocket.chat/eslint-config', 'prettier'],
-	parserOptions: {
-		sourceType: 'module',
-		ecmaVersion: 2017,
-		ecmaFeatures: {
-			experimentalObjectRestSpread: true,
-			jsx: true,
-			legacyDecorators: true
+	"parser": "babel-eslint",
+	"extends": "airbnb",
+	"parserOptions": {
+		"sourceType": "module",
+		"ecmaVersion": 2017,
+		"ecmaFeatures": {
+			"experimentalObjectRestSpread" : true,
+			"jsx": true,
+			"legacyDecorators": true
 		}
 	},
-	plugins: ['react', 'jsx-a11y', 'import', 'react-native', '@babel', 'jest', 'react-hooks'],
-	env: {
-		browser: true,
-		commonjs: true,
-		es6: true,
-		node: true,
-		jquery: true,
-		mocha: true,
-		'jest/globals': true
-	},
-	rules: {
-		'import/extensions': [
-			'error',
-			'ignorePackages',
-			{
-				js: 'warning',
-				jsx: 'warning',
-				ts: 'warning',
-				tsx: 'warning'
-			}
+	"plugins": [
+		"react",
+		"jsx-a11y",
+        "import",
+    	"react-native"
 	],
-		'react/jsx-filename-extension': [
-			1,
-			{
-				extensions: ['.js', '.jsx', '.ts', '.tsx']
-			}
-		],
-		'react/require-default-props': [0],
-		'ordered-imports': [0],
-		'react/no-did-mount-set-state': 0,
-		'react/no-multi-comp': [0],
-		'react/jsx-indent-props': [2, 'tab'],
-		'jsx-quotes': [2, 'prefer-single'],
-		'jsx-a11y/href-no-hash': 0,
-		'jsx-a11y/aria-role': 0,
-		'import/prefer-default-export': 0,
-		'import/no-cycle': 0,
-		'import/order': [
-			'error',
-			{
-				'newlines-between': 'ignore'
-			}
-		],
-		camelcase: 0,
-		'no-underscore-dangle': 0,
-		'no-return-assign': 0,
-		'no-param-reassign': 0,
-		'no-tabs': 0,
-		'no-multi-spaces': 2,
-		'no-eval': 2,
-		'no-extend-native': 2,
-		'no-multi-str': 2,
-		'no-use-before-define': 2,
-		'no-const-assign': 2,
-		'no-cond-assign': 2,
-		'no-constant-condition': 2,
-		'no-control-regex': 2,
-		'no-debugger': 2,
-		'no-delete-var': 2,
-		'no-dupe-keys': 2,
-		'no-dupe-args': 2,
-		'no-dupe-class-members': 2,
-		'no-duplicate-case': 2,
-		'no-else-return': [0, { allowElseIf: true }],
-		'no-empty': 2,
-		'no-empty-character-class': 2,
-		'no-ex-assign': 2,
-		'no-extra-boolean-cast': 2,
-		'no-extra-semi': 2,
-		'no-fallthrough': 2,
-		'no-func-assign': 2,
-		'no-inner-declarations': [2, 'functions'],
-		'no-invalid-regexp': 2,
-		'no-irregular-whitespace': 2,
-		'no-mixed-spaces-and-tabs': 1,
-		'no-sparse-arrays': 2,
-		'no-negated-in-lhs': 2,
-		'no-obj-calls': 2,
-		'no-octal': 2,
-		'no-redeclare': 2,
-		'no-regex-spaces': 2,
-		'no-undef': 2,
-		'no-unreachable': 2,
-		'no-unused-expressions': 0,
-		'no-unused-vars': 'off',
-		'max-len': 0,
-		'react/jsx-uses-vars': 2,
-		'no-void': 2,
-		'no-var': 2,
-		'one-var': [2, 'never'],
-		'no-lonely-if': 2,
-		'no-trailing-spaces': 2,
-		complexity: [1, 31],
-		'space-in-parens': [2, 'never'],
-		'space-before-blocks': [2, 'always'],
-		indent: 'off',
-		'eol-last': [2, 'always'],
-		'comma-dangle': [2, 'never'],
-		'keyword-spacing': 2,
-		'block-spacing': 2,
-		'brace-style': [2, '1tbs', { allowSingleLine: true }],
-		'computed-property-spacing': 2,
-		'comma-spacing': 2,
-		'comma-style': 2,
-		'guard-for-in': 2,
-		'wrap-iife': 2,
-		'block-scoped-var': 2,
-		curly: [2, 'all'],
-		eqeqeq: [2, 'allow-null'],
-		'new-cap': 'off',
-		'use-isnan': 2,
-		'valid-typeof': 2,
-		'linebreak-style': 0,
-		'prefer-template': 2,
-		quotes: [1, 'single'],
-		semi: [2, 'always'],
-		'prefer-const': 2,
-		'object-shorthand': 2,
-		'consistent-return': 0,
-		'global-require': 'off',
-		'react-native/no-unused-styles': 2,
-		'react/jsx-one-expression-per-line': 0,
-		'require-await': 2,
-		'func-names': 0,
-		'react/static-property-placement': [0],
-		'arrow-parens': ['warn', 'as-needed', { requireForBlockBody: true }],
-		'react/jsx-curly-newline': [0],
-		'react/state-in-constructor': [0],
-		'no-async-promise-executor': [0],
-		'max-classes-per-file': [0],
-		'no-multiple-empty-lines': [0],
-		'no-sequences': 'off',
-		'react-hooks/rules-of-hooks': 'error',
-		'react-hooks/exhaustive-deps': 'warn'
+	"env": {
+		"browser": true,
+		"commonjs": true,
+		"es6": true,
+		"node": true,
+		"jquery": true
 	},
-	globals: {
-		__DEV__: true
-	},
-	overrides: [
-		{
-			files: ['**/*.ts', '**/*.tsx'],
-			extends: [
-				'plugin:@typescript-eslint/recommended',
-				'plugin:@typescript-eslint/eslint-recommended',
-				'@rocket.chat/eslint-config',
-				'prettier'
-			],
-			parser: '@typescript-eslint/parser',
-			parserOptions: {
-				sourceType: 'module',
-				ecmaVersion: 2018,
-				warnOnUnsupportedTypeScriptVersion: false,
-				ecmaFeatures: {
-					experimentalObjectRestSpread: true,
-					legacyDecorators: true
-				}
-			},
-			plugins: ['react', '@typescript-eslint'],
-			rules: {
-				'@typescript-eslint/no-var-requires': 'off',
-				'@typescript-eslint/no-empty-function': [0],
-				'@typescript-eslint/ban-types': [0],
-				'func-call-spacing': 'off',
-				'jsx-quotes': ['error', 'prefer-single'],
-				indent: 'off',
-				'comma-dangle': [2, 'never'],
-				'no-return-assign': 0,
-				'no-dupe-class-members': 'off',
-				'no-extra-parens': 'off',
-				'no-spaced-func': 'off',
-				'no-unused-vars': 'off',
-				'no-useless-constructor': 'off',
-				'no-use-before-define': 'off',
-				'react/jsx-uses-react': 'error',
-				'react/jsx-uses-vars': 'error',
-				'react/jsx-no-undef': 'error',
-				'react/jsx-fragments': ['error', 'syntax'],
-				'@typescript-eslint/ban-ts-comment': 'off',
-				'@typescript-eslint/indent': [
-					'warn',
-					'tab',
-					{
-						SwitchCase: 1
-					}
-				],
-				'@typescript-eslint/no-extra-parens': [
-					'warn',
-					'all',
-					{
-						conditionalAssign: true,
-						nestedBinaryExpressions: false,
-						returnAssign: true,
-						ignoreJSX: 'all',
-						enforceForArrowConditionals: false
-					}
-				],
-				'@typescript-eslint/no-dupe-class-members': 'error',
-				'@typescript-eslint/no-explicit-any': 'off',
-				'@typescript-eslint/no-unused-vars': [
-					'error',
-					{
-						argsIgnorePattern: '^_',
-						ignoreRestSiblings: true
-					}
-				],
-				'new-cap': 'off',
-				'lines-between-class-members': 'off',
-				'react-hooks/rules-of-hooks': 'error',
-				'react-hooks/exhaustive-deps': 'warn'
-			},
-			globals: {
-				JSX: true
-			},
-			settings: {
-				'import/resolver': {
-					node: {
-						extensions: ['.js', '.ts', '.tsx']
-					}
-				}
-			}
-		},
-		{
-			files: ['e2e/**'],
-			rules: {
-				'no-await-in-loop': 0
-			}
-		}
+	"rules": {
+		"react/jsx-filename-extension": [1, {
+			"extensions": [".js", ".jsx"]
+		}],
+		"react/require-default-props": [0],
+		"react/no-unused-prop-types": [2, {
+			"skipShapeProps": true
+		}],
+		"react/no-did-mount-set-state": 0,
+		"react/no-multi-comp": [0],
+		"react/jsx-indent": [2, "tab"],
+		"react/jsx-indent-props": [2, "tab"],
+		"react/forbid-prop-types": 0,
+		"jsx-quotes": [2, "prefer-single"],
+		"jsx-a11y/href-no-hash": 0,
+		"import/prefer-default-export": 0,
+		"import/no-cycle": 0,
+		"camelcase": 0,
+		"no-underscore-dangle": 0,
+		"no-return-assign": 0,
+		"no-param-reassign": 0,
+		"no-tabs": 0,
+		"no-multi-spaces": 2,
+		"no-eval": 2,
+		"no-extend-native": 2,
+		"no-multi-str": 2,
+		"no-use-before-define": 2,
+		"no-const-assign": 2,
+		"no-cond-assign": 2,
+		"no-constant-condition": 2,
+		"no-control-regex": 2,
+		"no-debugger": 2,
+		"no-delete-var": 2,
+		"no-dupe-keys": 2,
+		"no-dupe-args": 2,
+		"no-dupe-class-members": 2,
+		"no-duplicate-case": 2,
+		"no-else-return": [0, {allowElseIf: true}],
+		"no-empty": 2,
+		"no-empty-character-class": 2,
+		"no-ex-assign": 2,
+		"no-extra-boolean-cast": 2,
+		"no-extra-semi": 2,
+		"no-fallthrough": 2,
+		"no-func-assign": 2,
+		"no-inner-declarations": [2, "functions"],
+		"no-invalid-regexp": 2,
+		"no-irregular-whitespace": 2,
+		"no-mixed-spaces-and-tabs": 2,
+		"no-sparse-arrays": 2,
+		"no-negated-in-lhs": 2,
+		"no-obj-calls": 2,
+		"no-octal": 2,
+		"no-redeclare": 2,
+		"no-regex-spaces": 2,
+		"no-undef": 2,
+		"no-unreachable": 2,
+		"no-unused-expressions": 0,
+		"no-unused-vars": [2, {
+			"vars": "all",
+			"args": "after-used"
+		}],
+		"max-len": 0,
+		"react/jsx-uses-vars": 2,
+		"no-void": 2,
+		"no-var": 2,
+		"one-var": [2, "never"],
+		"no-lonely-if": 2,
+		"no-trailing-spaces": 2,
+		"complexity": [1, 31],
+		"space-in-parens": [2, "never"],
+		"space-before-function-paren": [2, "never"],
+		"space-before-blocks": [2, "always"],
+		"indent": [2, "tab", {"SwitchCase": 1}],
+		"eol-last": [2, "always"],
+		"comma-dangle": [2, "never"],
+		"keyword-spacing": 2,
+		"block-spacing": 2,
+		"brace-style": [2, "1tbs", { "allowSingleLine": true }],
+		"computed-property-spacing": 2,
+		"comma-spacing": 2,
+		"comma-style": 2,
+		"guard-for-in": 2,
+		"wrap-iife": 2,
+		"block-scoped-var": 2,
+		"curly": [2, "all"],
+		"eqeqeq": [2, "allow-null"],
+		"new-cap":  [2],
+		"use-isnan": 2,
+		"valid-typeof": 2,
+		"linebreak-style": 0,
+		"prefer-template": 2,
+		"template-curly-spacing": [2, "always"],
+		"quotes": [2, "single"],
+		"semi": [2, "always"],
+		"prefer-const": 2,
+		"object-shorthand": 2,
+		"consistent-return": 0,
+		"global-require": "off",
+		"react-native/no-unused-styles": 2,
+		"react/jsx-one-expression-per-line": 0,
+		"require-await": 2,
+		"func-names": 0,
+		"react/sort-comp": ["error", {
+			"order": [
+				"static-variables",
+				"static-methods",
+				"lifecycle",
+				"everything-else",
+				"render"
 			]
+		}],
+		"react/static-property-placement": [0],
+		"arrow-parens": ["error", "as-needed", { requireForBlockBody: true }],
+		"react/jsx-props-no-spreading": [1],
+		"react/jsx-curly-newline": [0],
+		"react/state-in-constructor": [0],
+		"no-async-promise-executor": [0],
+		"max-classes-per-file": [0]
+	},
+	"globals": {
+		"__DEV__": true
+	}
 };
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@ -1,38 +1,6 @@
-<!-- 
+- Your Rocket.Chat Experimental app version: ####
+- Your Rocket.Chat server version: ####
+- Device (or Simulator) you're running with: ####

-Please see our guide for opening issues: https://rocket.chat/docs/contributing/reporting-issues
-
-If you have questions or are looking for help/support please see: https://rocket.chat/docs/getting-support
-
-If you are experiencing a bug please search our issues to be sure it is not already present: https://github.com/RocketChat/Rocket.Chat.ReactNative/issues
-
-->
-
-### Description:
-
-<!-- A clear and concise description of what the bug is. -->
-
-### Environment Information:
-
- Rocket.Chat Server Version:
- Rocket.Chat App Version:
- Device Name: 
- OS Version: 
-
-### Steps to reproduce:
-
-1. <!-- Go to '...' -->
-2. <!-- Click on '....' -->
-3. <!-- and so on... -->
-
-### Expected behavior:
-
-<!-- What you expect to happen -->
-
-### Actual behavior:
-
-<!-- What actually happens with SCREENSHOT, if applicable -->
-
-### Additional context:
-
-<!-- Add any other context about the problem here. -->
+**The app isn't connecting to your server?**
+Make sure your server supports WebSocket. These are the minimum requirements for Apache 2.4 and Nginx 1.3 or greater.
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@ -1,7 +0,0 @@
-version: 2
-updates:
-  - package-ecosystem: "npm"
-    directory: "/"
-    schedule:
-      interval: "weekly"
-    open-pull-requests-limit: 25
--- a/.gitignore
+++ b/.gitignore
@ -21,9 +21,6 @@ DerivedData
 *.ipa
 *.xcuserstate
 project.xcworkspace
-*.mobileprovision
-ios/Pods/
-/vendor/bundle/

 # Android/IntelliJ
 #
@ -65,8 +62,3 @@ artifacts
 .vscode/
 e2e/docker/rc_test_env/docker-compose.yml
 e2e/docker/data/db
-e2e/e2e_account.js
-e2e/e2e_account.ts
-junit.xml
-
-*.p8
--- a/.husky/.gitignore
+++ b/.husky/.gitignore
@ -1 +0,0 @@
-_
--- a/.husky/pre-commit
+++ b/.husky/pre-commit
@ -1,4 +0,0 @@
-#!/bin/sh
-. "$(dirname "$0")/_/husky.sh"
-
-npm run precommit
--- a/.prettierignore
+++ b/.prettierignore
@ -1,30 +0,0 @@
-.circleci/
-.github/
-.husky
-build/
-node_modules/
-coverage/
-e2e/docker/
-artifacts/
-android/
-ios/
-patches/
-scripts/
-
-.bettercodehub.yml
-.buckconfig
-.gitattributes
-.gitignore
-.snyk
-.watchmanconfig
-CONTRIBUTING.md
-README.md
-SECURITY.md
-npm-debug.log
-yarn-error.log
-
-.storybook/
-
-app/i18n/locales/
-app/containers/CustomIcon/mappedIcons.js
-app/containers/CustomIcon/selection.json
--- a/.prettierrc.js
+++ b/.prettierrc.js
@ -1,10 +0,0 @@
-module.exports = {
-	bracketSpacing: true,
-	singleQuote: true,
-	jsxSingleQuote: true,
-	trailingComma: 'none',
-	printWidth: 130,
-	useTabs: true,
-	arrowParens: 'avoid',
-	bracketSameLine: true
-};
--- a/.ruby-version
+++ b/.ruby-version
@ -1 +0,0 @@
-2.7.7
--- a/.storybook/index.js
+++ b/.storybook/index.js
@ -1,19 +0,0 @@
-import { getStorybookUI } from '@storybook/react-native';
-import './storybook.requires';
-
-import RNBootSplash from 'react-native-bootsplash';
-
-import { selectServerRequest } from '../app/actions/server';
-import { mockedStore as store } from '../app/reducers/mockedStore';
-import database from '../app/lib/database';
-import { setUser } from '../app/actions/login';
-
-RNBootSplash.hide();
-
-const baseUrl = 'https://open.rocket.chat';
-store.dispatch(selectServerRequest(baseUrl));
-store.dispatch(setUser({ id: 'abc', username: 'rocket.cat', name: 'Rocket Cat' }));
-database.setActiveDB(baseUrl);
-
-const StorybookUIRoot = getStorybookUI({});
-export default StorybookUIRoot;
--- a/.storybook/main.js
+++ b/.storybook/main.js
@ -1,4 +0,0 @@
-module.exports = {
-	stories: ['../app/**/*.stories.?(ts|tsx|js|jsx)'],
-	addons: []
-};
--- a/.storybook/preview.js
+++ b/.storybook/preview.js
@ -1,40 +0,0 @@
-import React from 'react';
-import { Provider } from 'react-redux';
-
-import { themes } from '../app/lib/constants';
-import MessageContext from '../app/containers/message/Context';
-import { selectServerRequest } from '../app/actions/server';
-import { mockedStore as store } from '../app/reducers/mockedStore';
-import { setUser } from '../app/actions/login';
-
-const baseUrl = 'https://open.rocket.chat';
-store.dispatch(selectServerRequest(baseUrl));
-store.dispatch(setUser({ id: 'abc', username: 'rocket.cat', name: 'Rocket Cat' }));
-
-export const decorators = [
-	Story => (
-		<Provider store={store}>
-			<MessageContext.Provider
-				value={{
-					user: {
-						id: 'y8bd77ptZswPj3EW8',
-						username: 'diego.mello',
-						token: 'abc'
-					},
-					baseUrl,
-					onPress: () => {},
-					onLongPress: () => {},
-					reactionInit: () => {},
-					onErrorPress: () => {},
-					replyBroadcast: () => {},
-					onReactionPress: () => {},
-					onDiscussionPress: () => {},
-					onReactionLongPress: () => {},
-					threadBadgeColor: themes.light.tunreadColor
-				}}
-			>
-				<Story />
-			</MessageContext.Provider>
-		</Provider>
-	)
-];
--- a/.storybook/storybook.requires.js
+++ b/.storybook/storybook.requires.js
@ -1,50 +0,0 @@
-/* do not change this file, it is auto generated by storybook. */
-
-import {
-  configure,
-  addDecorator,
-  addParameters,
-  addArgsEnhancer,
-} from "@storybook/react-native";
-
-import { decorators, parameters } from "./preview";
-
-if (decorators) {
-  decorators.forEach((decorator) => addDecorator(decorator));
-}
-
-if (parameters) {
-  addParameters(parameters);
-}
-
-const getStories = () => {
-  return [
-    require("../app/containers/Avatar/Avatar.stories.tsx"),
-    require("../app/containers/BackgroundContainer/index.stories.tsx"),
-    require("../app/containers/Button/Button.stories.tsx"),
-    require("../app/containers/Chip/Chip.stories.tsx"),
-    require("../app/containers/HeaderButton/HeaderButtons.stories.tsx"),
-    require("../app/containers/List/List.stories.tsx"),
-    require("../app/containers/LoginServices/LoginServices.stories.tsx"),
-    require("../app/containers/markdown/Markdown.stories.tsx"),
-    require("../app/containers/markdown/new/NewMarkdown.stories.tsx"),
-    require("../app/containers/message/Components/CollapsibleQuote/CollapsibleQuote.stories.tsx"),
-    require("../app/containers/message/Message.stories.tsx"),
-    require("../app/containers/ReactionsList/ReactionsList.stories.tsx"),
-    require("../app/containers/RoomHeader/RoomHeader.stories.tsx"),
-    require("../app/containers/RoomItem/RoomItem.stories.tsx"),
-    require("../app/containers/SearchBox/SearchBox.stories.tsx"),
-    require("../app/containers/ServerItem/ServerItem.stories.tsx"),
-    require("../app/containers/TextInput/TextInput.stories.tsx"),
-    require("../app/containers/UIKit/UiKitMessage.stories.tsx"),
-    require("../app/containers/UIKit/UiKitModal.stories.tsx"),
-    require("../app/containers/UnreadBadge/UnreadBadge.stories.tsx"),
-    require("../app/views/CannedResponsesListView/CannedResponseItem.stories.tsx"),
-    require("../app/views/CreateChannelView/RoomSettings/SwitchItem.stories.tsx"),
-    require("../app/views/DiscussionsView/Item.stories.tsx"),
-    require("../app/views/RoomView/LoadMore/LoadMore.stories.tsx"),
-    require("../app/views/ThreadMessagesView/Item.stories.tsx"),
-  ];
-};
-
-configure(getStories, module, false);
--- a/.storybook/utils.ts
+++ b/.storybook/utils.ts
@ -1,2 +0,0 @@
-export const longText =
-	'Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industrys standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries';
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@ -1,110 +0,0 @@
-# Contributing Guidelines 
-
-Great to have you here! Here are a few ways you can help make this project better!
-
-## Setting up a development environment
-
-Refer to [React Native environment setup](https://reactnative.dev/docs/environment-setup) to make sure everything is up and running.
-Follow the `React Native CLI Quickstart` section as we don't support Expo managed flow.
-
-*Note: you'll need a MacOS to run iOS apps*
-
-### How to run
-
-Clone repository and install dependencies:
-```sh
-git clone git@github.com:RocketChat/Rocket.Chat.ReactNative.git
-cd Rocket.Chat.ReactNative
-yarn
-```
-
-Run the app:
-```sh
-npx pod-install
-yarn ios
-```
-
-or
-
-```sh
-yarn android
-```
-
-At this point, the app should be running on the simulator or on your device!
-
-*Note: npm won't work on this project*
-
-### How to inspect the app
-
-We use [Reactotron](https://github.com/infinitered/reactotron) to inspect logs, redux state, redux-sagas, HTTP requests, etc.
-
-## Issues needing help
-
-Didn't find a bug or want a new feature not already reported? Check out the [help wanted](https://github.com/RocketChat/Rocket.Chat.ReactNative/issues?q=is%3Aissue+is%3Aopen+label%3A%22%F0%9F%91%8B+help+wanted%22) or the [good first issue](https://github.com/RocketChat/Rocket.Chat.ReactNative/issues?q=is%3Aissue+is%3Aopen+label%3A%22%F0%9F%8D%AD+good+first+issue%22) labels.
-
-Can't help coding? Triaging issues is a **great** way of helping.
-
-## Code style
-
-We use [ESLint](https://eslint.org/) to enforce code style and best practices. We have a pre-commit hook enforcing commits to follow our lint rules.
-
-To check for lint issues on your code, run this on your terminal:
-
-```sh
-yarn lint
-```
-
-## Code formatting
-
-We use [Prettier](https://prettier.io) to format the code style in our project. We have a pre-commit hook enforcing commits to follow our style guides.
-
-To fix your code formatting issues, run this on your terminal:
-
-```sh
-yarn prettier
-```
-
-[Check this link](https://prettier.io/docs/en/editors.html) to see how to integrate Prettier with your preferred code editor, and run Prettier when save your file for example.
-
-## Tests
-
-It's always important to ensure everything is working properly and that's why tests are great. We have unit and e2e tests on this project.
-
-### Unit tests
-
-We use [Jest](https://jestjs.io/) and [Storybook](https://storybook.js.org/) on our tests.
-
-#### Storybook
-
-Storybook is a tool for developing UI Components and has some plugins to make Jest generate snapshots of them.
-
-[On the root of the project](https://github.com/RocketChat/Rocket.Chat.ReactNative/blob/develop/index.js#L24), comment everything leaving only the last import to Storybook left  and refresh your project.
-You'll see some tests like this:
-
-<img src="https://user-images.githubusercontent.com/804994/89677725-56393200-d8c4-11ea-84b0-213be1d24e98.png" width="350" />
-
-#### Jest
-
-We use Jest for our unit tests and to generate Storybook snapshots. We have a pre-commit hook enforcing preventing commits that breaks any test.
-
-To check for test issues on your code, run this on your terminal:
-
-```sh
-yarn test
-```
-
-### E2E tests
-
-We use [Detox](https://github.com/wix/Detox) framework to end-to-end test our app and ensure everything is working properly.
-
-[Follow this documentation to learn how to run it](https://github.com/RocketChat/Rocket.Chat.ReactNative/blob/develop/e2e).
-
-### Pull request
-
-As soon as your changes are ready, you can open a Pull Request.
-
-The title of your PR should be descriptive, including either [NEW], [IMPROVEMENT] or [FIX] at the beginning, e.g. [FIX] App crashing on startup.
-
-You may share working results prior to finishing, please include [WIP] in the title. This way anyone can look at your code: you can ask for help within the PR if you don't know how to solve a problem.
-
-Your PR is automatically inspected by various tools, check their response and try to improve your code accordingly. Requests that fail to build or have wrong coding style won't be merged.
--- a/4
+++ b/4
@ -1,4 +0,0 @@
-source 'https://rubygems.org'
-# You may use http://rbenv.org/ or https://rvm.io/ to install and use this version
-ruby '2.7.7'
-gem 'cocoapods', '~> 1.11', '>= 1.11.2'
--- a/README.md
+++ b/README.md
@ -5,12 +5,11 @@
 [![codecov](https://codecov.io/gh/RocketChat/Rocket.Chat.ReactNative/branch/master/graph/badge.svg)](https://codecov.io/gh/RocketChat/Rocket.Chat.ReactNative)
 [![CodeFactor](https://www.codefactor.io/repository/github/rocketchat/rocket.chat.reactnative/badge)](https://www.codefactor.io/repository/github/rocketchat/rocket.chat.reactnative)

- **Supported server versions:** 0.70.0+
- **Supported iOS versions**: 12+
- **Supported Android versions**: 6.0+
+**Supported Server Versions:** 0.70.0+

 ## Download

+### Official apps
 <a href="https://play.google.com/store/apps/details?id=chat.rocket.android">
  <img alt="Download on Google Play" src="https://play.google.com/intl/en_us/badges/images/badge_new.png" height=43>
 </a>
@ -18,7 +17,29 @@
  <img alt="Download on App Store" src="https://user-images.githubusercontent.com/7317008/43209852-4ca39622-904b-11e8-8ce1-cdc3aee76ae9.png" height=43>
 </a>

-Check [our docs](https://docs.rocket.chat/installation/mobile-and-desktop-apps#mobile-apps) for  beta and Experimental versions.
+### Experimental apps
+<a href="https://play.google.com/store/apps/details?id=chat.rocket.reactnative">
+  <img alt="Download on Google Play" src="https://play.google.com/intl/en_us/badges/images/badge_new.png" height=43>
+</a>
+<a href="https://itunes.apple.com/us/app/rocket-chat-experimental/id1272915472">
+  <img alt="Download on App Store" src="https://user-images.githubusercontent.com/7317008/43209852-4ca39622-904b-11e8-8ce1-cdc3aee76ae9.png" height=43>
+</a>
+
+## Beta Access
+
+### TestFlight
+
+You can signup to our TestFlight builds by accessing these links:
+
+- Official: https://testflight.apple.com/join/3gcYeoMr
+- Experimental: https://testflight.apple.com/join/7I3dLCNT.
+
+### Google Play beta
+
+You can subscribe to Google Play Beta program and download latest versions:
+
+- Official: https://play.google.com/store/apps/details?id=chat.rocket.android
+- Experimental: https://play.google.com/store/apps/details?id=chat.rocket.reactnative

 ## Reporting an Issue

@ -26,16 +47,195 @@ Check [our docs](https://docs.rocket.chat/installation/mobile-and-desktop-apps#m

 Also check the [#react-native](https://open.rocket.chat/channel/react-native) community on [open.rocket.chat](https://open.rocket.chat). We'd like to help.

-## Contributing
+## Installing dependencies

-Are you a dev and would like to help? Found a bug that you would like to report or a missing feature that you would like to work on? Great! We have written down a [Contribution guide](https://github.com/RocketChat/Rocket.Chat.ReactNative/blob/develop/CONTRIBUTING.md) so you can start easily.
+Follow the [React Native Getting Started Guide](https://facebook.github.io/react-native/docs/getting-started.html) for detailed instructions on setting up your local machine for development.

-## Whitelabel
-Do you want to make the app run on your own server only? [Follow our whitelabel documentation.](https://developer.rocket.chat/mobile-app/mobile-app-white-labelling)
+## How to run
+- Clone repository and install dependencies:
+    ```bash
+    $ git clone git@github.com:RocketChat/Rocket.Chat.ReactNative.git
+    $ cd Rocket.Chat.ReactNative
+    $ yarn
+    ```

-## Engage with us
-### Share your story
-We’d love to hear about [your experience](https://survey.zohopublic.com/zs/e4BUFG) and potentially feature it on our [blog](https://rocket.chat/case-studies/?utm_source=github&utm_medium=readme&utm_campaign=community).
+- Run application
+    ```bash
+    $ npx react-native run-ios
+    ```
+    ```bash
+    $ npx react-native run-android
+    ```

-### Subscribe for Updates
-Once a month our marketing team releases an email update with news about product releases, company related topics, events and use cases. [Sign up!](https://rocket.chat/newsletter/?utm_source=github&utm_medium=readme&utm_campaign=community)
+### Running single server
+If you don't need multiple servers, there is a branch `single-server` just for that.
+Readme will guide you on how to config.
+
+## Current priorities
+1) Omnichannel support
+2) E2E encryption
+
+## Features
+| Feature                                                   	    | Status 	|
+|---------------------------------------------------------------	|--------	|
+| Jitsi Integration                                             	| ✅    	|
+| Federation (Directory)                                        	| ✅    	|
+| Discussions                                                     | ✅    	|
+| Omnichannel                                                     | ❌    	|
+| Threads                                                       	| ✅    	|
+| Record Audio                                                  	| ✅    	|
+| Record Video                                                  	| ✅    	|
+| Commands                                                      	| ✅    	|
+| Draft message per room                                        	| ✅    	|
+| Share Extension                                               	| ✅    	|
+| Notifications Preferences                                     	| ✅    	|
+| Edited status                                                 	| ✅    	|
+| Upload video                                                  	| ✅    	|
+| Grouped messages                                              	| ✅    	|
+| Mark room as read                                             	| ✅    	|
+| Mark room as unread                                           	| ✅    	|
+| Tablet Support                                                	| ✅    	|
+| Read receipt                                                  	| ✅    	|
+| Broadbast Channel                                             	| ✅    	|
+| Authentication via SAML                                       	| ✅    	|
+| Authentication via CAS                                        	| ✅    	|
+| Custom Fields on Signup                                       	| ✅    	|
+| Report message                                                	| ✅    	|
+| Theming                                                       	| ✅    	|
+| Settings -> Review the App                                    	| ✅    	|
+| Settings -> Default Browser                                   	| ✅    	|
+| Admin panel                                                   	| ✅    	|
+| Reply message from notification                               	| ✅    	|
+| Unread counter banner on message list                         	| ✅    	|
+| E2E Encryption                                                 	| ❌    	|
+| Join a Protected Room                                         	| ❌    	|
+| Optional Analytics                                            	| ✅    	|
+| Settings -> About us                                          	| ❌    	|
+| Settings -> Contact us                                        	| ✅    	|
+| Settings -> Update App Icon                                   	| ❌    	|
+| Settings -> Share                                             	| ✅    	|
+| Accessibility (Medium)                                        	| ❌    	|
+| Accessibility (Advanced)                                      	| ❌    	|
+| Authentication via Meteor                                     	| ❌    	|
+| Authentication via Wordpress                                  	| ✅    	|
+| Authentication via Custom OAuth                               	| ✅    	|
+| Add user to the room                                          	| ✅    	|
+| Send message                                                  	| ✅    	|
+| Authentication via Email                                      	| ✅    	|
+| Authentication via Username                                   	| ✅    	|
+| Authentication via LDAP                                       	| ✅    	|
+| Message format: Markdown                                      	| ✅    	|
+| Message format: System messages (Welcome, Message removed...) 	| ✅    	|
+| Message format: links                                         	| ✅    	|
+| Message format: images                                        	| ✅    	|
+| Message format: replies                                       	| ✅    	|
+| Message format: alias with custom message (title & text)      	| ✅    	|
+| Messages list: day separation                                 	| ✅    	|
+| Messages list: load more on scroll                            	| ✅    	|
+| Messages list: receive new messages via subscription          	| ✅    	|
+| Subscriptions list                                            	| ✅    	|
+| Segmented subscriptions list: Favorites                       	| ✅    	|
+| Segmented subscriptions list: Unreads                         	| ✅    	|
+| Segmented subscriptions list: DMs                             	| ✅    	|
+| Segmented subscriptions list: Channels                        	| ✅    	|
+| Subscriptions list: update user status via subscription       	| ✅    	|
+| Numbers os messages unread in the Subscriptions list          	| ✅    	|
+| Status change                                                 	| ✅    	|
+| Upload image                                                  	| ✅    	|
+| Take picture & upload it                                      	| ✅    	|
+| 2FA                                                           	| ✅    	|
+| Signup                                                        	| ✅    	|
+| Autocomplete with usernames                                   	| ✅    	|
+| Autocomplete with @all & @here                                	| ✅    	|
+| Autocomplete room/channel name                                	| ✅    	|
+| Upload audio                                                  	| ✅    	|
+| Forgot your password                                          	| ✅    	|
+| Login screen: terms of service                                	| ✅    	|
+| Login screen: privacy policy                                  	| ✅    	|
+| Authentication via Google                                     	| ✅    	|
+| Authentication via Facebook                                   	| ✅    	|
+| Authentication via Twitter                                    	| ✅    	|
+| Authentication via GitHub                                     	| ✅    	|
+| Authentication via GitLab                                     	| ✅    	|
+| Authentication via LinkedIn                                   	| ✅    	|
+| Create channel                                                	| ✅    	|
+| Search Local                                                  	| ✅    	|
+| Search in the API                                             	| ✅    	|
+| Settings -> License                                           	| ✅    	|
+| Settings -> App version                                       	| ✅    	|
+| Autocomplete emoji                                            	| ✅    	|
+| Upload file (documents, PDFs, spreadsheets, zip files, etc)   	| ✅    	|
+| Copy message                                                  	| ✅    	|
+| Pin message                                                   	| ✅    	|
+| Unpin message                                                 	| ✅    	|
+| Channel Info screen -> Members                                	| ✅    	|
+| Channel Info screen -> Pinned                                 	| ✅    	|
+| Channel Info screen -> Starred                                	| ✅    	|
+| Channel Info screen -> Uploads                                	| ✅    	|
+| Star message                                                  	| ✅    	|
+| Unstar message                                                	| ✅    	|
+| Channel Info screen -> Topic                                  	| ✅    	|
+| Channel Info screen -> Description                            	| ✅    	|
+| Star a channel                                                	| ✅    	|
+| Message format: videos                                        	| ✅    	|
+| Message format: audios                                        	| ✅    	|
+| Edit message                                                  	| ✅    	|
+| Delete a message                                              	| ✅    	|
+| Reply message                                                 	| ✅    	|
+| Quote message                                                 	| ✅    	|
+| Muted state                                                   	| ✅    	|
+| Offline reading                                               	| ✅    	|
+| Offline writing                                               	| ✅    	|
+| Edit profile                                                  	| ✅    	|
+| Reactions                                                     	| ✅    	|
+| Custom emojis                                                 	| ✅    	|
+| Accessibility (Basic)                                         	| ✅    	|
+| Tap notification, go to the channel                           	| ✅    	|
+| Deep links: Authentication                                    	| ✅    	|
+| Deep links: Rooms                                             	| ✅    	|
+| Full name setting                                             	| ✅    	|
+| Read only rooms                                               	| ✅    	|
+| Typing status                                                 	| ✅    	|
+| Create channel/group                                          	| ✅    	|
+| Disable registration setting                                  	| ✅    	|
+| Unread red line indicator on message list                     	| ✅    	|
+| Search Messages in Channel                                    	| ✅    	|
+| Mentions List                                                 	| ✅    	|
+| Attachment List                                               	| ✅    	|
+| Join a Room                                                   	| ✅    	|
+
+## Detox (end-to-end tests)
+- Build your app
+
+```bash
+$ npx detox build --configuration ios.sim.release
+```
+
+- Run tests
+
+```bash
+$ npx detox test ./e2e/tests/onboarding --configuration ios.sim.release
+$ npx detox test ./e2e/tests/room --configuration ios.sim.release
+$ npx detox test ./e2e/tests/assorted --configuration ios.sim.release
+```
+
+## Storybook
+- Open index.js
+
+- Uncomment following line
+
+```bash
+import './storybook';
+```
+
+- Comment out following lines
+```bash
+import './app/ReactotronConfig';
+import { AppRegistry } from 'react-native';
+import App from './app/index';
+import { name as appName } from './app.json';
+
+AppRegistry.registerComponent(appName, () => App);
+```
+
+- Start your application again
--- a/mocks/@bugsnag/react-native.js
+++ b/mocks/@bugsnag/react-native.js
@ -1,5 +0,0 @@
-export default {
-	start: () => '',
-	leaveBreadcrumb: () => '',
-	notify: () => ''
-};
--- a/mocks/bugsnag-react-native.js
+++ b/mocks/bugsnag-react-native.js
@ -0,0 +1,8 @@
+export class Client { }
+
+export default {
+	bugsnag: () => '',
+	leaveBreadcrumb: () => '',
+	notify: () => '',
+	loggerConfig: () => ''
+};
--- a/mocks/expo-av.js
+++ b/mocks/expo-av.js
@ -0,0 +1,14 @@
+export class Sound {
+	loadAsync = () => {};
+
+	playAsync = () => {};
+
+	pauseAsync = () => {};
+
+	stopAsync = () => {};
+
+	setOnPlaybackStatusUpdate = () => {};
+
+	setPositionAsync = () => {};
+}
+export const Audio = { Sound };
--- a/mocks/expo-keep-awake.js
+++ b/mocks/expo-keep-awake.js
@ -0,0 +1,4 @@
+export default {
+	activateKeepAwake: () => '',
+	deactivateKeepAwake: () => ''
+};
--- a/mocks/expo-web-browser.js
+++ b/mocks/expo-web-browser.js
@ -0,0 +1,3 @@
+export default {
+	openBrowserAsync: () => ''
+};
--- a/mocks/react-native-config-reader.js
+++ b/mocks/react-native-config-reader.js
@ -1,3 +0,0 @@
-export default {
-	BuildConfigs: null
-};
--- a/mocks/react-native-device-info.js
+++ b/mocks/react-native-device-info.js
@ -1,3 +1,7 @@
-import mockDeviceInfo from 'react-native-device-info/jest/react-native-device-info-mock';
-
-export default mockDeviceInfo;
+export default {
+	getModel: () => '',
+	getReadableVersion: () => '',
+	getBundleId: () => '',
+	isTablet: () => false,
+	hasNotch: () => false
+};
--- a/mocks/react-native-gesture-handler.js
+++ b/mocks/react-native-gesture-handler.js
@ -1,5 +1,5 @@
-export const RectButton = ({ children }) => children;
+export const RectButton = () => 'View';
 export const State = () => 'View';
-export const LongPressGestureHandler = ({ children }) => children;
-export const BorderlessButton = ({ children }) => children;
-export const PanGestureHandler = ({ children }) => children;
+export const LongPressGestureHandler = () => 'View';
+export const BorderlessButton = () => 'View';
+export const PanGestureHandler = () => 'View';
--- a/mocks/react-native-mmkv-storage.js
+++ b/mocks/react-native-mmkv-storage.js
@ -1,17 +0,0 @@
-export class MMKVLoader {
-	constructor() {
-		console.log('MMKVLoader constructor mock');
-	}
-
-	setProcessingMode = jest.fn().mockImplementation(() => ({
-		withEncryption: jest.fn().mockImplementation(() => ({
-			initialize: jest.fn().mockImplementation(() => {})
-		}))
-	}));
-}
-
-export const ProcessingModes = {
-	MULTI_PROCESS: ''
-};
-
-export const create = jest.fn();
--- a/mocks/rn-user-defaults.js
+++ b/mocks/rn-user-defaults.js
@ -0,0 +1,4 @@
+export default {
+	set: () => '',
+	get: () => ''
+};
--- a/tests/Storyshots.test.js
+++ b/tests/Storyshots.test.js
@ -0,0 +1,3 @@
+import initStoryshots from '@storybook/addon-storyshots';
+
+initStoryshots();
--- a/tests/snapshots/Storyshots.test.js.snap
+++ b/tests/snapshots/Storyshots.test.js.snap
--- a/tests/containers/Avatar/snapshots/Avatar.stories.storyshot
+++ b/tests/containers/Avatar/snapshots/Avatar.stories.storyshot
@ -1,31 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`Storyshots Avatar Avatar Path 1`] = `"{\\"type\\":\\"View\\",\\"props\\":{\\"style\\":[{\\"width\\":56,\\"height\\":56,\\"borderRadius\\":4},null],\\"testID\\":\\"avatar\\"},\\"children\\":[{\\"type\\":\\"View\\",\\"props\\":{\\"style\\":[{\\"overflow\\":\\"hidden\\"},{\\"width\\":56,\\"height\\":56,\\"borderRadius\\":4}]},\\"children\\":[{\\"type\\":\\"FastImageView\\",\\"props\\":{\\"style\\":{\\"position\\":\\"absolute\\",\\"left\\":0,\\"right\\":0,\\"top\\":0,\\"bottom\\":0},\\"source\\":{\\"uri\\":\\"https://open.rocket.chat/avatar/diego.mello?format=png&size=112\\",\\"headers\\":{\\"User-Agent\\":\\"RC Mobile; ios unknown; vunknown (unknown)\\"},\\"priority\\":\\"high\\"},\\"resizeMode\\":\\"cover\\"},\\"children\\":null}]}]}"`;
-
-exports[`Storyshots Avatar Avatar Room Id 1`] = `"{\\"type\\":\\"View\\",\\"props\\":{\\"style\\":[{\\"width\\":56,\\"height\\":56,\\"borderRadius\\":4},null],\\"testID\\":\\"avatar\\"},\\"children\\":[{\\"type\\":\\"View\\",\\"props\\":{\\"style\\":[{\\"overflow\\":\\"hidden\\"},{\\"width\\":56,\\"height\\":56,\\"borderRadius\\":4}]},\\"children\\":[{\\"type\\":\\"FastImageView\\",\\"props\\":{\\"style\\":{\\"position\\":\\"absolute\\",\\"left\\":0,\\"right\\":0,\\"top\\":0,\\"bottom\\":0},\\"source\\":{\\"uri\\":\\"https://open.rocket.chat/avatar/room/devWBbYr7inwupPqK?format=png&size=112\\",\\"headers\\":{\\"User-Agent\\":\\"RC Mobile; ios unknown; vunknown (unknown)\\"},\\"priority\\":\\"high\\"},\\"resizeMode\\":\\"cover\\"},\\"children\\":null}]}]}"`;
-
-exports[`Storyshots Avatar Avatar Text 1`] = `"{\\"type\\":\\"View\\",\\"props\\":{\\"style\\":[{\\"width\\":56,\\"height\\":56,\\"borderRadius\\":4},null],\\"testID\\":\\"avatar\\"},\\"children\\":[{\\"type\\":\\"View\\",\\"props\\":{\\"style\\":[{\\"overflow\\":\\"hidden\\"},{\\"width\\":56,\\"height\\":56,\\"borderRadius\\":4}]},\\"children\\":[{\\"type\\":\\"FastImageView\\",\\"props\\":{\\"style\\":{\\"position\\":\\"absolute\\",\\"left\\":0,\\"right\\":0,\\"top\\":0,\\"bottom\\":0},\\"source\\":{\\"uri\\":\\"https://open.rocket.chat/avatar/Avatar?format=png&size=112\\",\\"headers\\":{\\"User-Agent\\":\\"RC Mobile; ios unknown; vunknown (unknown)\\"},\\"priority\\":\\"high\\"},\\"resizeMode\\":\\"cover\\"},\\"children\\":null}]}]}"`;
-
-exports[`Storyshots Avatar Avatar Url 1`] = `"{\\"type\\":\\"View\\",\\"props\\":{\\"style\\":[{\\"width\\":56,\\"height\\":56,\\"borderRadius\\":4},null],\\"testID\\":\\"avatar\\"},\\"children\\":[{\\"type\\":\\"View\\",\\"props\\":{\\"style\\":[{\\"overflow\\":\\"hidden\\"},{\\"width\\":56,\\"height\\":56,\\"borderRadius\\":4}]},\\"children\\":[{\\"type\\":\\"FastImageView\\",\\"props\\":{\\"style\\":{\\"position\\":\\"absolute\\",\\"left\\":0,\\"right\\":0,\\"top\\":0,\\"bottom\\":0},\\"source\\":{\\"uri\\":\\"https://user-images.githubusercontent.com/29778115/89444446-14738480-d728-11ea-9412-75fd978d95fb.jpg\\",\\"headers\\":{\\"User-Agent\\":\\"RC Mobile; ios unknown; vunknown (unknown)\\"},\\"priority\\":\\"high\\"},\\"resizeMode\\":\\"cover\\"},\\"children\\":null}]}]}"`;
-
-exports[`Storyshots Avatar Channel 1`] = `"{\\"type\\":\\"View\\",\\"props\\":{\\"style\\":[{\\"width\\":56,\\"height\\":56,\\"borderRadius\\":4},null],\\"testID\\":\\"avatar\\"},\\"children\\":[{\\"type\\":\\"View\\",\\"props\\":{\\"style\\":[{\\"overflow\\":\\"hidden\\"},{\\"width\\":56,\\"height\\":56,\\"borderRadius\\":4}]},\\"children\\":[{\\"type\\":\\"FastImageView\\",\\"props\\":{\\"style\\":{\\"position\\":\\"absolute\\",\\"left\\":0,\\"right\\":0,\\"top\\":0,\\"bottom\\":0},\\"source\\":{\\"uri\\":\\"https://open.rocket.chat/avatar/@general?format=png&size=112\\",\\"headers\\":{\\"User-Agent\\":\\"RC Mobile; ios unknown; vunknown (unknown)\\"},\\"priority\\":\\"high\\"},\\"resizeMode\\":\\"cover\\"},\\"children\\":null}]}]}"`;
-
-exports[`Storyshots Avatar Children 1`] = `"{\\"type\\":\\"View\\",\\"props\\":{\\"style\\":[{\\"width\\":56,\\"height\\":56,\\"borderRadius\\":4},null],\\"testID\\":\\"avatar\\"},\\"children\\":[{\\"type\\":\\"View\\",\\"props\\":{\\"style\\":[{\\"overflow\\":\\"hidden\\"},{\\"width\\":56,\\"height\\":56,\\"borderRadius\\":4}]},\\"children\\":[{\\"type\\":\\"FastImageView\\",\\"props\\":{\\"style\\":{\\"position\\":\\"absolute\\",\\"left\\":0,\\"right\\":0,\\"top\\":0,\\"bottom\\":0},\\"source\\":{\\"uri\\":\\"https://open.rocket.chat/avatar/Avatar?format=png&size=112\\",\\"headers\\":{\\"User-Agent\\":\\"RC Mobile; ios unknown; vunknown (unknown)\\"},\\"priority\\":\\"high\\"},\\"resizeMode\\":\\"cover\\"},\\"children\\":null}]},{\\"type\\":\\"Text\\",\\"props\\":{\\"selectable\\":false,\\"allowFontScaling\\":false,\\"style\\":[{\\"fontSize\\":24,\\"color\\":\\"#f5455c\\"},[{\\"width\\":24,\\"height\\":24,\\"textAlignVertical\\":\\"center\\"},[{\\"position\\":\\"absolute\\",\\"bottom\\":-2,\\"right\\":-2,\\"borderRadius\\":10}]],{\\"fontFamily\\":\\"custom\\",\\"fontWeight\\":\\"normal\\",\\"fontStyle\\":\\"normal\\"},{}]},\\"children\\":[\\"\\"]}]}"`;
-
-exports[`Storyshots Avatar Custom Border Radius 1`] = `"{\\"type\\":\\"View\\",\\"props\\":{\\"style\\":[{\\"width\\":56,\\"height\\":56,\\"borderRadius\\":28},null],\\"testID\\":\\"avatar\\"},\\"children\\":[{\\"type\\":\\"View\\",\\"props\\":{\\"style\\":[{\\"overflow\\":\\"hidden\\"},{\\"width\\":56,\\"height\\":56,\\"borderRadius\\":28}]},\\"children\\":[{\\"type\\":\\"FastImageView\\",\\"props\\":{\\"style\\":{\\"position\\":\\"absolute\\",\\"left\\":0,\\"right\\":0,\\"top\\":0,\\"bottom\\":0},\\"source\\":{\\"uri\\":\\"https://open.rocket.chat/avatar/Avatar?format=png&size=112\\",\\"headers\\":{\\"User-Agent\\":\\"RC Mobile; ios unknown; vunknown (unknown)\\"},\\"priority\\":\\"high\\"},\\"resizeMode\\":\\"cover\\"},\\"children\\":null}]}]}"`;
-
-exports[`Storyshots Avatar Custom Style 1`] = `"{\\"type\\":\\"View\\",\\"props\\":{\\"style\\":[{\\"width\\":56,\\"height\\":56,\\"borderRadius\\":4},{\\"padding\\":16}],\\"testID\\":\\"avatar\\"},\\"children\\":[{\\"type\\":\\"View\\",\\"props\\":{\\"style\\":[{\\"overflow\\":\\"hidden\\"},{\\"width\\":56,\\"height\\":56,\\"borderRadius\\":4}]},\\"children\\":[{\\"type\\":\\"FastImageView\\",\\"props\\":{\\"style\\":{\\"position\\":\\"absolute\\",\\"left\\":0,\\"right\\":0,\\"top\\":0,\\"bottom\\":0},\\"source\\":{\\"uri\\":\\"https://open.rocket.chat/avatar/Avatar?format=png&size=112\\",\\"headers\\":{\\"User-Agent\\":\\"RC Mobile; ios unknown; vunknown (unknown)\\"},\\"priority\\":\\"high\\"},\\"resizeMode\\":\\"cover\\"},\\"children\\":null}]}]}"`;
-
-exports[`Storyshots Avatar Direct 1`] = `"{\\"type\\":\\"View\\",\\"props\\":{\\"style\\":[{\\"width\\":56,\\"height\\":56,\\"borderRadius\\":4},null],\\"testID\\":\\"avatar\\"},\\"children\\":[{\\"type\\":\\"View\\",\\"props\\":{\\"style\\":[{\\"overflow\\":\\"hidden\\"},{\\"width\\":56,\\"height\\":56,\\"borderRadius\\":4}]},\\"children\\":[{\\"type\\":\\"FastImageView\\",\\"props\\":{\\"style\\":{\\"position\\":\\"absolute\\",\\"left\\":0,\\"right\\":0,\\"top\\":0,\\"bottom\\":0},\\"source\\":{\\"uri\\":\\"https://open.rocket.chat/avatar/diego.mello?format=png&size=112\\",\\"headers\\":{\\"User-Agent\\":\\"RC Mobile; ios unknown; vunknown (unknown)\\"},\\"priority\\":\\"high\\"},\\"resizeMode\\":\\"cover\\"},\\"children\\":null}]}]}"`;
-
-exports[`Storyshots Avatar Emoji 1`] = `"{\\"type\\":\\"View\\",\\"props\\":{\\"style\\":[{\\"width\\":56,\\"height\\":56,\\"borderRadius\\":4},null],\\"testID\\":\\"avatar\\"},\\"children\\":[{\\"type\\":\\"View\\",\\"props\\":{\\"style\\":[{\\"overflow\\":\\"hidden\\"},[{\\"width\\":30,\\"height\\":30},{\\"width\\":56,\\"height\\":56,\\"borderRadius\\":4}]]},\\"children\\":[{\\"type\\":\\"FastImageView\\",\\"props\\":{\\"style\\":{\\"position\\":\\"absolute\\",\\"left\\":0,\\"right\\":0,\\"top\\":0,\\"bottom\\":0},\\"source\\":{\\"uri\\":\\"https://open.rocket.chat/emoji-custom/troll.jpg\\",\\"priority\\":\\"high\\"},\\"resizeMode\\":\\"contain\\"},\\"children\\":null}]}]}"`;
-
-exports[`Storyshots Avatar Static 1`] = `"{\\"type\\":\\"View\\",\\"props\\":{\\"style\\":[{\\"width\\":56,\\"height\\":56,\\"borderRadius\\":4},null],\\"testID\\":\\"avatar\\"},\\"children\\":[{\\"type\\":\\"View\\",\\"props\\":{\\"style\\":[{\\"overflow\\":\\"hidden\\"},{\\"width\\":56,\\"height\\":56,\\"borderRadius\\":4}]},\\"children\\":[{\\"type\\":\\"FastImageView\\",\\"props\\":{\\"style\\":{\\"position\\":\\"absolute\\",\\"left\\":0,\\"right\\":0,\\"top\\":0,\\"bottom\\":0},\\"source\\":{\\"uri\\":\\"https://user-images.githubusercontent.com/29778115/89444446-14738480-d728-11ea-9412-75fd978d95fb.jpg\\",\\"headers\\":{\\"User-Agent\\":\\"RC Mobile; ios unknown; vunknown (unknown)\\"},\\"priority\\":\\"high\\"},\\"resizeMode\\":\\"cover\\"},\\"children\\":null}]}]}"`;
-
-exports[`Storyshots Avatar Touchable 1`] = `"{\\"type\\":\\"View\\",\\"props\\":{\\"style\\":[{\\"width\\":56,\\"height\\":56,\\"borderRadius\\":4},null],\\"testID\\":\\"avatar\\"},\\"children\\":[{\\"type\\":\\"View\\",\\"props\\":{\\"accessible\\":true,\\"focusable\\":true,\\"collapsable\\":false,\\"style\\":{\\"opacity\\":1}},\\"children\\":[{\\"type\\":\\"View\\",\\"props\\":{\\"style\\":[{\\"overflow\\":\\"hidden\\"},{\\"width\\":56,\\"height\\":56,\\"borderRadius\\":4}]},\\"children\\":[{\\"type\\":\\"FastImageView\\",\\"props\\":{\\"style\\":{\\"position\\":\\"absolute\\",\\"left\\":0,\\"right\\":0,\\"top\\":0,\\"bottom\\":0},\\"source\\":{\\"uri\\":\\"https://open.rocket.chat/avatar/Avatar?format=png&size=112\\",\\"headers\\":{\\"User-Agent\\":\\"RC Mobile; ios unknown; vunknown (unknown)\\"},\\"priority\\":\\"high\\"},\\"resizeMode\\":\\"cover\\"},\\"children\\":null}]}]}]}"`;
-
-exports[`Storyshots Avatar With E Tag 1`] = `"{\\"type\\":\\"View\\",\\"props\\":{\\"style\\":[{\\"width\\":56,\\"height\\":56,\\"borderRadius\\":4},null],\\"testID\\":\\"avatar\\"},\\"children\\":[{\\"type\\":\\"View\\",\\"props\\":{\\"style\\":[{\\"overflow\\":\\"hidden\\"},{\\"width\\":56,\\"height\\":56,\\"borderRadius\\":4}]},\\"children\\":[{\\"type\\":\\"FastImageView\\",\\"props\\":{\\"style\\":{\\"position\\":\\"absolute\\",\\"left\\":0,\\"right\\":0,\\"top\\":0,\\"bottom\\":0},\\"source\\":{\\"uri\\":\\"https://open.rocket.chat/avatar/djorkaeff.alexandre?format=png&size=112&etag=5ag8KffJcZj9m5rCv\\",\\"headers\\":{\\"User-Agent\\":\\"RC Mobile; ios unknown; vunknown (unknown)\\"},\\"priority\\":\\"high\\"},\\"resizeMode\\":\\"cover\\"},\\"children\\":null}]}]}"`;
-
-exports[`Storyshots Avatar Without E Tag 1`] = `"{\\"type\\":\\"View\\",\\"props\\":{\\"style\\":[{\\"width\\":56,\\"height\\":56,\\"borderRadius\\":4},null],\\"testID\\":\\"avatar\\"},\\"children\\":[{\\"type\\":\\"View\\",\\"props\\":{\\"style\\":[{\\"overflow\\":\\"hidden\\"},{\\"width\\":56,\\"height\\":56,\\"borderRadius\\":4}]},\\"children\\":[{\\"type\\":\\"FastImageView\\",\\"props\\":{\\"style\\":{\\"position\\":\\"absolute\\",\\"left\\":0,\\"right\\":0,\\"top\\":0,\\"bottom\\":0},\\"source\\":{\\"uri\\":\\"https://open.rocket.chat/avatar/djorkaeff.alexandre?format=png&size=112\\",\\"headers\\":{\\"User-Agent\\":\\"RC Mobile; ios unknown; vunknown (unknown)\\"},\\"priority\\":\\"high\\"},\\"resizeMode\\":\\"cover\\"},\\"children\\":null}]}]}"`;
-
-exports[`Storyshots Avatar Wrong Server 1`] = `"{\\"type\\":\\"View\\",\\"props\\":{\\"style\\":[{\\"width\\":56,\\"height\\":56,\\"borderRadius\\":4},null],\\"testID\\":\\"avatar\\"},\\"children\\":[{\\"type\\":\\"View\\",\\"props\\":{\\"style\\":[{\\"overflow\\":\\"hidden\\"},{\\"width\\":56,\\"height\\":56,\\"borderRadius\\":4}]},\\"children\\":[{\\"type\\":\\"FastImageView\\",\\"props\\":{\\"style\\":{\\"position\\":\\"absolute\\",\\"left\\":0,\\"right\\":0,\\"top\\":0,\\"bottom\\":0},\\"source\\":{\\"uri\\":\\"https://google.com/avatar/Avatar?format=png&size=112\\",\\"headers\\":{\\"User-Agent\\":\\"RC Mobile; ios unknown; vunknown (unknown)\\"},\\"priority\\":\\"high\\"},\\"resizeMode\\":\\"cover\\"},\\"children\\":null}]}]}"`;
--- a/tests/containers/BackgroundContainer/snapshots/index.stories.storyshot
+++ b/tests/containers/BackgroundContainer/snapshots/index.stories.storyshot
@ -1,17 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`Storyshots BackgroundContainer Basic 1`] = `"{\\"type\\":\\"View\\",\\"props\\":{\\"style\\":{\\"flex\\":1}},\\"children\\":[{\\"type\\":\\"View\\",\\"props\\":{\\"accessibilityIgnoresInvertColors\\":true,\\"style\\":{\\"width\\":\\"100%\\",\\"height\\":\\"100%\\",\\"position\\":\\"absolute\\"}},\\"children\\":[{\\"type\\":\\"Image\\",\\"props\\":{\\"source\\":{\\"uri\\":\\"message_empty_light\\"},\\"style\\":[{\\"position\\":\\"absolute\\",\\"left\\":0,\\"right\\":0,\\"top\\":0,\\"bottom\\":0},{\\"width\\":\\"100%\\",\\"height\\":\\"100%\\"},null]},\\"children\\":null}]}]}"`;
-
-exports[`Storyshots BackgroundContainer Black Theme Loading 1`] = `"{\\"type\\":\\"View\\",\\"props\\":{\\"style\\":{\\"flex\\":1}},\\"children\\":[{\\"type\\":\\"View\\",\\"props\\":{\\"accessibilityIgnoresInvertColors\\":true,\\"style\\":{\\"width\\":\\"100%\\",\\"height\\":\\"100%\\",\\"position\\":\\"absolute\\"}},\\"children\\":[{\\"type\\":\\"Image\\",\\"props\\":{\\"source\\":{\\"uri\\":\\"message_empty_black\\"},\\"style\\":[{\\"position\\":\\"absolute\\",\\"left\\":0,\\"right\\":0,\\"top\\":0,\\"bottom\\":0},{\\"width\\":\\"100%\\",\\"height\\":\\"100%\\"},null]},\\"children\\":null}]},{\\"type\\":\\"ActivityIndicator\\",\\"props\\":{\\"style\\":{\\"position\\":\\"absolute\\",\\"top\\":60,\\"left\\":0,\\"right\\":0,\\"fontSize\\":16,\\"paddingHorizontal\\":24,\\"textAlign\\":\\"center\\",\\"backgroundColor\\":\\"transparent\\",\\"fontFamily\\":\\"Inter\\",\\"fontWeight\\":\\"400\\"},\\"color\\":\\"#f9f9f9\\"},\\"children\\":null}]}"`;
-
-exports[`Storyshots BackgroundContainer Black Theme Text 1`] = `"{\\"type\\":\\"View\\",\\"props\\":{\\"style\\":{\\"flex\\":1}},\\"children\\":[{\\"type\\":\\"View\\",\\"props\\":{\\"accessibilityIgnoresInvertColors\\":true,\\"style\\":{\\"width\\":\\"100%\\",\\"height\\":\\"100%\\",\\"position\\":\\"absolute\\"}},\\"children\\":[{\\"type\\":\\"Image\\",\\"props\\":{\\"source\\":{\\"uri\\":\\"message_empty_black\\"},\\"style\\":[{\\"position\\":\\"absolute\\",\\"left\\":0,\\"right\\":0,\\"top\\":0,\\"bottom\\":0},{\\"width\\":\\"100%\\",\\"height\\":\\"100%\\"},null]},\\"children\\":null}]},{\\"type\\":\\"Text\\",\\"props\\":{\\"style\\":[{\\"position\\":\\"absolute\\",\\"top\\":60,\\"left\\":0,\\"right\\":0,\\"fontSize\\":16,\\"paddingHorizontal\\":24,\\"textAlign\\":\\"center\\",\\"backgroundColor\\":\\"transparent\\",\\"fontFamily\\":\\"Inter\\",\\"fontWeight\\":\\"400\\"},{\\"color\\":\\"#f9f9f9\\"}]},\\"children\\":[\\"Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industrys standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries\\"]}]}"`;
-
-exports[`Storyshots BackgroundContainer Dark Theme Loading 1`] = `"{\\"type\\":\\"View\\",\\"props\\":{\\"style\\":{\\"flex\\":1}},\\"children\\":[{\\"type\\":\\"View\\",\\"props\\":{\\"accessibilityIgnoresInvertColors\\":true,\\"style\\":{\\"width\\":\\"100%\\",\\"height\\":\\"100%\\",\\"position\\":\\"absolute\\"}},\\"children\\":[{\\"type\\":\\"Image\\",\\"props\\":{\\"source\\":{\\"uri\\":\\"message_empty_dark\\"},\\"style\\":[{\\"position\\":\\"absolute\\",\\"left\\":0,\\"right\\":0,\\"top\\":0,\\"bottom\\":0},{\\"width\\":\\"100%\\",\\"height\\":\\"100%\\"},null]},\\"children\\":null}]},{\\"type\\":\\"ActivityIndicator\\",\\"props\\":{\\"style\\":{\\"position\\":\\"absolute\\",\\"top\\":60,\\"left\\":0,\\"right\\":0,\\"fontSize\\":16,\\"paddingHorizontal\\":24,\\"textAlign\\":\\"center\\",\\"backgroundColor\\":\\"transparent\\",\\"fontFamily\\":\\"Inter\\",\\"fontWeight\\":\\"400\\"},\\"color\\":\\"#f9f9f9\\"},\\"children\\":null}]}"`;
-
-exports[`Storyshots BackgroundContainer Dark Theme Text 1`] = `"{\\"type\\":\\"View\\",\\"props\\":{\\"style\\":{\\"flex\\":1}},\\"children\\":[{\\"type\\":\\"View\\",\\"props\\":{\\"accessibilityIgnoresInvertColors\\":true,\\"style\\":{\\"width\\":\\"100%\\",\\"height\\":\\"100%\\",\\"position\\":\\"absolute\\"}},\\"children\\":[{\\"type\\":\\"Image\\",\\"props\\":{\\"source\\":{\\"uri\\":\\"message_empty_dark\\"},\\"style\\":[{\\"position\\":\\"absolute\\",\\"left\\":0,\\"right\\":0,\\"top\\":0,\\"bottom\\":0},{\\"width\\":\\"100%\\",\\"height\\":\\"100%\\"},null]},\\"children\\":null}]},{\\"type\\":\\"Text\\",\\"props\\":{\\"style\\":[{\\"position\\":\\"absolute\\",\\"top\\":60,\\"left\\":0,\\"right\\":0,\\"fontSize\\":16,\\"paddingHorizontal\\":24,\\"textAlign\\":\\"center\\",\\"backgroundColor\\":\\"transparent\\",\\"fontFamily\\":\\"Inter\\",\\"fontWeight\\":\\"400\\"},{\\"color\\":\\"#f9f9f9\\"}]},\\"children\\":[\\"Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industrys standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries\\"]}]}"`;
-
-exports[`Storyshots BackgroundContainer Loading 1`] = `"{\\"type\\":\\"View\\",\\"props\\":{\\"style\\":{\\"flex\\":1}},\\"children\\":[{\\"type\\":\\"View\\",\\"props\\":{\\"accessibilityIgnoresInvertColors\\":true,\\"style\\":{\\"width\\":\\"100%\\",\\"height\\":\\"100%\\",\\"position\\":\\"absolute\\"}},\\"children\\":[{\\"type\\":\\"Image\\",\\"props\\":{\\"source\\":{\\"uri\\":\\"message_empty_light\\"},\\"style\\":[{\\"position\\":\\"absolute\\",\\"left\\":0,\\"right\\":0,\\"top\\":0,\\"bottom\\":0},{\\"width\\":\\"100%\\",\\"height\\":\\"100%\\"},null]},\\"children\\":null}]},{\\"type\\":\\"ActivityIndicator\\",\\"props\\":{\\"style\\":{\\"position\\":\\"absolute\\",\\"top\\":60,\\"left\\":0,\\"right\\":0,\\"fontSize\\":16,\\"paddingHorizontal\\":24,\\"textAlign\\":\\"center\\",\\"backgroundColor\\":\\"transparent\\",\\"fontFamily\\":\\"Inter\\",\\"fontWeight\\":\\"400\\"},\\"color\\":\\"#6C727A\\"},\\"children\\":null}]}"`;
-
-exports[`Storyshots BackgroundContainer Long Text 1`] = `"{\\"type\\":\\"View\\",\\"props\\":{\\"style\\":{\\"flex\\":1}},\\"children\\":[{\\"type\\":\\"View\\",\\"props\\":{\\"accessibilityIgnoresInvertColors\\":true,\\"style\\":{\\"width\\":\\"100%\\",\\"height\\":\\"100%\\",\\"position\\":\\"absolute\\"}},\\"children\\":[{\\"type\\":\\"Image\\",\\"props\\":{\\"source\\":{\\"uri\\":\\"message_empty_light\\"},\\"style\\":[{\\"position\\":\\"absolute\\",\\"left\\":0,\\"right\\":0,\\"top\\":0,\\"bottom\\":0},{\\"width\\":\\"100%\\",\\"height\\":\\"100%\\"},null]},\\"children\\":null}]},{\\"type\\":\\"Text\\",\\"props\\":{\\"style\\":[{\\"position\\":\\"absolute\\",\\"top\\":60,\\"left\\":0,\\"right\\":0,\\"fontSize\\":16,\\"paddingHorizontal\\":24,\\"textAlign\\":\\"center\\",\\"backgroundColor\\":\\"transparent\\",\\"fontFamily\\":\\"Inter\\",\\"fontWeight\\":\\"400\\"},{\\"color\\":\\"#6C727A\\"}]},\\"children\\":[\\"Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industrys standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries\\"]}]}"`;
-
-exports[`Storyshots BackgroundContainer Text 1`] = `"{\\"type\\":\\"View\\",\\"props\\":{\\"style\\":{\\"flex\\":1}},\\"children\\":[{\\"type\\":\\"View\\",\\"props\\":{\\"accessibilityIgnoresInvertColors\\":true,\\"style\\":{\\"width\\":\\"100%\\",\\"height\\":\\"100%\\",\\"position\\":\\"absolute\\"}},\\"children\\":[{\\"type\\":\\"Image\\",\\"props\\":{\\"source\\":{\\"uri\\":\\"message_empty_light\\"},\\"style\\":[{\\"position\\":\\"absolute\\",\\"left\\":0,\\"right\\":0,\\"top\\":0,\\"bottom\\":0},{\\"width\\":\\"100%\\",\\"height\\":\\"100%\\"},null]},\\"children\\":null}]},{\\"type\\":\\"Text\\",\\"props\\":{\\"style\\":[{\\"position\\":\\"absolute\\",\\"top\\":60,\\"left\\":0,\\"right\\":0,\\"fontSize\\":16,\\"paddingHorizontal\\":24,\\"textAlign\\":\\"center\\",\\"backgroundColor\\":\\"transparent\\",\\"fontFamily\\":\\"Inter\\",\\"fontWeight\\":\\"400\\"},{\\"color\\":\\"#6C727A\\"}]},\\"children\\":[\\"Text here\\"]}]}"`;
--- a/tests/containers/Button/snapshots/Button.stories.storyshot
+++ b/tests/containers/Button/snapshots/Button.stories.storyshot
@ -1,13 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`Storyshots Button Custom Button 1`] = `"{\\"type\\":\\"View\\",\\"props\\":{\\"accessible\\":true,\\"accessibilityLabel\\":\\"Press me!\\",\\"accessibilityState\\":{\\"disabled\\":false},\\"testID\\":\\"testButton\\",\\"focusable\\":true,\\"collapsable\\":false,\\"style\\":{\\"paddingHorizontal\\":14,\\"justifyContent\\":\\"center\\",\\"height\\":48,\\"borderRadius\\":4,\\"marginBottom\\":12,\\"backgroundColor\\":\\"purple\\",\\"padding\\":10,\\"opacity\\":1}},\\"children\\":[{\\"type\\":\\"Text\\",\\"props\\":{\\"style\\":[{\\"textAlign\\":\\"center\\",\\"backgroundColor\\":\\"transparent\\",\\"fontFamily\\":\\"Inter\\",\\"fontWeight\\":\\"500\\"},{\\"color\\":\\"yellow\\",\\"fontSize\\":18},[{\\"textAlign\\":\\"left\\"}]],\\"accessibilityLabel\\":\\"Press me!\\"},\\"children\\":[\\"Press me!\\"]}]}"`;
-
-exports[`Storyshots Button Disabled Button 1`] = `"{\\"type\\":\\"View\\",\\"props\\":{\\"accessible\\":true,\\"accessibilityLabel\\":\\"Press me!\\",\\"accessibilityState\\":{\\"disabled\\":true},\\"testID\\":\\"testButton\\",\\"focusable\\":true,\\"collapsable\\":false,\\"style\\":{\\"paddingHorizontal\\":14,\\"justifyContent\\":\\"center\\",\\"height\\":48,\\"borderRadius\\":4,\\"marginBottom\\":12,\\"backgroundColor\\":\\"#1d74f5\\",\\"opacity\\":0.3}},\\"children\\":[{\\"type\\":\\"Text\\",\\"props\\":{\\"style\\":[{\\"textAlign\\":\\"center\\",\\"backgroundColor\\":\\"transparent\\",\\"fontFamily\\":\\"Inter\\",\\"fontWeight\\":\\"500\\"},{\\"color\\":\\"#ffffff\\",\\"fontSize\\":16},null],\\"accessibilityLabel\\":\\"Press me!\\"},\\"children\\":[\\"Press me!\\"]}]}"`;
-
-exports[`Storyshots Button Disabled Loading Button 1`] = `"{\\"type\\":\\"View\\",\\"props\\":{\\"accessible\\":true,\\"accessibilityLabel\\":\\"Press me!\\",\\"accessibilityState\\":{\\"disabled\\":true},\\"testID\\":\\"testButton\\",\\"focusable\\":true,\\"collapsable\\":false,\\"style\\":{\\"paddingHorizontal\\":14,\\"justifyContent\\":\\"center\\",\\"height\\":48,\\"borderRadius\\":4,\\"marginBottom\\":12,\\"backgroundColor\\":\\"#1d74f5\\",\\"opacity\\":0.3}},\\"children\\":[{\\"type\\":\\"ActivityIndicator\\",\\"props\\":{\\"style\\":[{\\"padding\\":16,\\"flex\\":1},null],\\"color\\":\\"#ffffff\\"},\\"children\\":null}]}"`;
-
-exports[`Storyshots Button Loading Button 1`] = `"{\\"type\\":\\"View\\",\\"props\\":{\\"accessible\\":true,\\"accessibilityLabel\\":\\"Press me!\\",\\"accessibilityState\\":{\\"disabled\\":true},\\"testID\\":\\"testButton\\",\\"focusable\\":true,\\"collapsable\\":false,\\"style\\":{\\"paddingHorizontal\\":14,\\"justifyContent\\":\\"center\\",\\"height\\":48,\\"borderRadius\\":4,\\"marginBottom\\":12,\\"backgroundColor\\":\\"#1d74f5\\",\\"opacity\\":1}},\\"children\\":[{\\"type\\":\\"ActivityIndicator\\",\\"props\\":{\\"style\\":[{\\"padding\\":16,\\"flex\\":1},null],\\"color\\":\\"#ffffff\\"},\\"children\\":null}]}"`;
-
-exports[`Storyshots Button Primary Button 1`] = `"{\\"type\\":\\"View\\",\\"props\\":{\\"accessible\\":true,\\"accessibilityLabel\\":\\"Press me!\\",\\"accessibilityState\\":{\\"disabled\\":false},\\"testID\\":\\"testButton\\",\\"focusable\\":true,\\"collapsable\\":false,\\"style\\":{\\"paddingHorizontal\\":14,\\"justifyContent\\":\\"center\\",\\"height\\":48,\\"borderRadius\\":4,\\"marginBottom\\":12,\\"backgroundColor\\":\\"#1d74f5\\",\\"opacity\\":1}},\\"children\\":[{\\"type\\":\\"Text\\",\\"props\\":{\\"style\\":[{\\"textAlign\\":\\"center\\",\\"backgroundColor\\":\\"transparent\\",\\"fontFamily\\":\\"Inter\\",\\"fontWeight\\":\\"500\\"},{\\"color\\":\\"#ffffff\\",\\"fontSize\\":16},null],\\"accessibilityLabel\\":\\"Press me!\\"},\\"children\\":[\\"Press me!\\"]}]}"`;
-
-exports[`Storyshots Button Secondary Button 1`] = `"{\\"type\\":\\"View\\",\\"props\\":{\\"accessible\\":true,\\"accessibilityLabel\\":\\"Press me!\\",\\"accessibilityState\\":{\\"disabled\\":false},\\"testID\\":\\"testButton\\",\\"focusable\\":true,\\"collapsable\\":false,\\"style\\":{\\"paddingHorizontal\\":14,\\"justifyContent\\":\\"center\\",\\"height\\":48,\\"borderRadius\\":4,\\"marginBottom\\":12,\\"backgroundColor\\":\\"#ffffff\\",\\"opacity\\":1}},\\"children\\":[{\\"type\\":\\"Text\\",\\"props\\":{\\"style\\":[{\\"textAlign\\":\\"center\\",\\"backgroundColor\\":\\"transparent\\",\\"fontFamily\\":\\"Inter\\",\\"fontWeight\\":\\"500\\"},{\\"color\\":\\"#2f343d\\",\\"fontSize\\":16},null],\\"accessibilityLabel\\":\\"Press me!\\"},\\"children\\":[\\"Press me!\\"]}]}"`;
--- a/tests/containers/Chip/snapshots/Chip.stories.storyshot
+++ b/tests/containers/Chip/snapshots/Chip.stories.storyshot
@ -1,11 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`Storyshots Chip Chip Text 1`] = `"{\\"type\\":\\"View\\",\\"props\\":{\\"style\\":{\\"flex\\":1,\\"alignItems\\":\\"flex-start\\",\\"padding\\":16}},\\"children\\":[{\\"type\\":\\"View\\",\\"props\\":{\\"accessible\\":true,\\"accessibilityState\\":{\\"disabled\\":false},\\"focusable\\":true,\\"style\\":[{\\"paddingHorizontal\\":8,\\"marginRight\\":8,\\"borderRadius\\":4,\\"justifyContent\\":\\"center\\",\\"maxWidth\\":192},{\\"backgroundColor\\":\\"#efeff4\\"},null],\\"collapsable\\":false},\\"children\\":[{\\"type\\":\\"View\\",\\"props\\":{\\"style\\":{\\"flexDirection\\":\\"row\\",\\"alignItems\\":\\"center\\"}},\\"children\\":[{\\"type\\":\\"View\\",\\"props\\":{\\"style\\":[{\\"width\\":28,\\"height\\":28,\\"borderRadius\\":4},{\\"marginRight\\":8,\\"marginVertical\\":8}],\\"testID\\":\\"avatar\\"},\\"children\\":[{\\"type\\":\\"View\\",\\"props\\":{\\"style\\":[{\\"overflow\\":\\"hidden\\"},{\\"width\\":28,\\"height\\":28,\\"borderRadius\\":4}]},\\"children\\":[{\\"type\\":\\"FastImageView\\",\\"props\\":{\\"style\\":{\\"position\\":\\"absolute\\",\\"left\\":0,\\"right\\":0,\\"top\\":0,\\"bottom\\":0},\\"source\\":{\\"uri\\":\\"https://open.rocket.chat/avatar/rocket.cat?format=png&size=56\\",\\"headers\\":{\\"User-Agent\\":\\"RC Mobile; ios unknown; vunknown (unknown)\\"},\\"priority\\":\\"high\\"},\\"resizeMode\\":\\"cover\\"},\\"children\\":null}]}]},{\\"type\\":\\"View\\",\\"props\\":{\\"style\\":{\\"marginRight\\":8,\\"maxWidth\\":120}},\\"children\\":[{\\"type\\":\\"Text\\",\\"props\\":{\\"style\\":[{\\"fontSize\\":16,\\"textAlign\\":\\"left\\",\\"backgroundColor\\":\\"transparent\\",\\"fontFamily\\":\\"Inter\\",\\"fontWeight\\":\\"500\\"},{\\"color\\":\\"#2f343d\\"}],\\"numberOfLines\\":1},\\"children\\":[\\"Rocket.Cat\\"]}]},{\\"type\\":\\"Text\\",\\"props\\":{\\"selectable\\":false,\\"allowFontScaling\\":false,\\"style\\":[{\\"fontSize\\":16,\\"color\\":\\"#6C727A\\"},null,{\\"fontFamily\\":\\"custom\\",\\"fontWeight\\":\\"normal\\",\\"fontStyle\\":\\"normal\\"},{}]},\\"children\\":[\\"\\"]}]}]}]}"`;
-
-exports[`Storyshots Chip Chip With Short Text 1`] = `"{\\"type\\":\\"View\\",\\"props\\":{\\"style\\":{\\"flex\\":1,\\"alignItems\\":\\"flex-start\\",\\"padding\\":16}},\\"children\\":[{\\"type\\":\\"View\\",\\"props\\":{\\"accessible\\":true,\\"accessibilityState\\":{\\"disabled\\":false},\\"focusable\\":true,\\"style\\":[{\\"paddingHorizontal\\":8,\\"marginRight\\":8,\\"borderRadius\\":4,\\"justifyContent\\":\\"center\\",\\"maxWidth\\":192},{\\"backgroundColor\\":\\"#efeff4\\"},null],\\"collapsable\\":false},\\"children\\":[{\\"type\\":\\"View\\",\\"props\\":{\\"style\\":{\\"flexDirection\\":\\"row\\",\\"alignItems\\":\\"center\\"}},\\"children\\":[{\\"type\\":\\"View\\",\\"props\\":{\\"style\\":[{\\"width\\":28,\\"height\\":28,\\"borderRadius\\":4},{\\"marginRight\\":8,\\"marginVertical\\":8}],\\"testID\\":\\"avatar\\"},\\"children\\":[{\\"type\\":\\"View\\",\\"props\\":{\\"style\\":[{\\"overflow\\":\\"hidden\\"},{\\"width\\":28,\\"height\\":28,\\"borderRadius\\":4}]},\\"children\\":[{\\"type\\":\\"FastImageView\\",\\"props\\":{\\"style\\":{\\"position\\":\\"absolute\\",\\"left\\":0,\\"right\\":0,\\"top\\":0,\\"bottom\\":0},\\"source\\":{\\"uri\\":\\"https://open.rocket.chat/avatar/rocket.cat?format=png&size=56\\",\\"headers\\":{\\"User-Agent\\":\\"RC Mobile; ios unknown; vunknown (unknown)\\"},\\"priority\\":\\"high\\"},\\"resizeMode\\":\\"cover\\"},\\"children\\":null}]}]},{\\"type\\":\\"View\\",\\"props\\":{\\"style\\":{\\"marginRight\\":8,\\"maxWidth\\":120}},\\"children\\":[{\\"type\\":\\"Text\\",\\"props\\":{\\"style\\":[{\\"fontSize\\":16,\\"textAlign\\":\\"left\\",\\"backgroundColor\\":\\"transparent\\",\\"fontFamily\\":\\"Inter\\",\\"fontWeight\\":\\"500\\"},{\\"color\\":\\"#2f343d\\"}],\\"numberOfLines\\":1},\\"children\\":[\\"Short\\"]}]},{\\"type\\":\\"Text\\",\\"props\\":{\\"selectable\\":false,\\"allowFontScaling\\":false,\\"style\\":[{\\"fontSize\\":16,\\"color\\":\\"#6C727A\\"},null,{\\"fontFamily\\":\\"custom\\",\\"fontWeight\\":\\"normal\\",\\"fontStyle\\":\\"normal\\"},{}]},\\"children\\":[\\"\\"]}]}]}]}"`;
-
-exports[`Storyshots Chip Chip Without Avatar 1`] = `"{\\"type\\":\\"View\\",\\"props\\":{\\"style\\":{\\"flex\\":1,\\"alignItems\\":\\"flex-start\\",\\"padding\\":16}},\\"children\\":[{\\"type\\":\\"View\\",\\"props\\":{\\"accessible\\":true,\\"accessibilityState\\":{\\"disabled\\":false},\\"focusable\\":true,\\"style\\":[{\\"paddingHorizontal\\":8,\\"marginRight\\":8,\\"borderRadius\\":4,\\"justifyContent\\":\\"center\\",\\"maxWidth\\":192},{\\"backgroundColor\\":\\"#efeff4\\"},null],\\"collapsable\\":false},\\"children\\":[{\\"type\\":\\"View\\",\\"props\\":{\\"style\\":{\\"flexDirection\\":\\"row\\",\\"alignItems\\":\\"center\\"}},\\"children\\":[{\\"type\\":\\"View\\",\\"props\\":{\\"style\\":{\\"marginRight\\":8,\\"maxWidth\\":120}},\\"children\\":[{\\"type\\":\\"Text\\",\\"props\\":{\\"style\\":[{\\"fontSize\\":16,\\"textAlign\\":\\"left\\",\\"backgroundColor\\":\\"transparent\\",\\"fontFamily\\":\\"Inter\\",\\"fontWeight\\":\\"500\\"},{\\"color\\":\\"#2f343d\\"}],\\"numberOfLines\\":1},\\"children\\":[\\"Without Avatar\\"]}]},{\\"type\\":\\"Text\\",\\"props\\":{\\"selectable\\":false,\\"allowFontScaling\\":false,\\"style\\":[{\\"fontSize\\":16,\\"color\\":\\"#6C727A\\"},null,{\\"fontFamily\\":\\"custom\\",\\"fontWeight\\":\\"normal\\",\\"fontStyle\\":\\"normal\\"},{}]},\\"children\\":[\\"\\"]}]}]}]}"`;
-
-exports[`Storyshots Chip Chip Without Avatar And Icon 1`] = `"{\\"type\\":\\"View\\",\\"props\\":{\\"style\\":{\\"flex\\":1,\\"alignItems\\":\\"flex-start\\",\\"padding\\":16}},\\"children\\":[{\\"type\\":\\"View\\",\\"props\\":{\\"accessible\\":true,\\"accessibilityState\\":{\\"disabled\\":true},\\"focusable\\":true,\\"style\\":[{\\"paddingHorizontal\\":8,\\"marginRight\\":8,\\"borderRadius\\":4,\\"justifyContent\\":\\"center\\",\\"maxWidth\\":192},{\\"backgroundColor\\":\\"#efeff4\\"},null],\\"collapsable\\":false},\\"children\\":[{\\"type\\":\\"View\\",\\"props\\":{\\"style\\":{\\"flexDirection\\":\\"row\\",\\"alignItems\\":\\"center\\"}},\\"children\\":[{\\"type\\":\\"View\\",\\"props\\":{\\"style\\":{\\"marginRight\\":8,\\"maxWidth\\":120}},\\"children\\":[{\\"type\\":\\"Text\\",\\"props\\":{\\"style\\":[{\\"fontSize\\":16,\\"textAlign\\":\\"left\\",\\"backgroundColor\\":\\"transparent\\",\\"fontFamily\\":\\"Inter\\",\\"fontWeight\\":\\"500\\"},{\\"color\\":\\"#2f343d\\"}],\\"numberOfLines\\":1},\\"children\\":[\\"Without Avatar and Icon\\"]}]}]}]}]}"`;
-
-exports[`Storyshots Chip Chip Without Icon 1`] = `"{\\"type\\":\\"View\\",\\"props\\":{\\"style\\":{\\"flex\\":1,\\"alignItems\\":\\"flex-start\\",\\"padding\\":16}},\\"children\\":[{\\"type\\":\\"View\\",\\"props\\":{\\"accessible\\":true,\\"accessibilityState\\":{\\"disabled\\":true},\\"focusable\\":true,\\"style\\":[{\\"paddingHorizontal\\":8,\\"marginRight\\":8,\\"borderRadius\\":4,\\"justifyContent\\":\\"center\\",\\"maxWidth\\":192},{\\"backgroundColor\\":\\"#efeff4\\"},null],\\"collapsable\\":false},\\"children\\":[{\\"type\\":\\"View\\",\\"props\\":{\\"style\\":{\\"flexDirection\\":\\"row\\",\\"alignItems\\":\\"center\\"}},\\"children\\":[{\\"type\\":\\"View\\",\\"props\\":{\\"style\\":[{\\"width\\":28,\\"height\\":28,\\"borderRadius\\":4},{\\"marginRight\\":8,\\"marginVertical\\":8}],\\"testID\\":\\"avatar\\"},\\"children\\":[{\\"type\\":\\"View\\",\\"props\\":{\\"style\\":[{\\"overflow\\":\\"hidden\\"},{\\"width\\":28,\\"height\\":28,\\"borderRadius\\":4}]},\\"children\\":[{\\"type\\":\\"FastImageView\\",\\"props\\":{\\"style\\":{\\"position\\":\\"absolute\\",\\"left\\":0,\\"right\\":0,\\"top\\":0,\\"bottom\\":0},\\"source\\":{\\"uri\\":\\"https://open.rocket.chat/avatar/rocket.cat?format=png&size=56\\",\\"headers\\":{\\"User-Agent\\":\\"RC Mobile; ios unknown; vunknown (unknown)\\"},\\"priority\\":\\"high\\"},\\"resizeMode\\":\\"cover\\"},\\"children\\":null}]}]},{\\"type\\":\\"View\\",\\"props\\":{\\"style\\":{\\"marginRight\\":8,\\"maxWidth\\":120}},\\"children\\":[{\\"type\\":\\"Text\\",\\"props\\":{\\"style\\":[{\\"fontSize\\":16,\\"textAlign\\":\\"left\\",\\"backgroundColor\\":\\"transparent\\",\\"fontFamily\\":\\"Inter\\",\\"fontWeight\\":\\"500\\"},{\\"color\\":\\"#2f343d\\"}],\\"numberOfLines\\":1},\\"children\\":[\\"Without Icon\\"]}]}]}]}]}"`;
--- a/tests/containers/HeaderButton/snapshots/HeaderButtons.stories.storyshot
+++ b/tests/containers/HeaderButton/snapshots/HeaderButtons.stories.storyshot
@ -1,11 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`Storyshots HeaderButtons Badge 1`] = `"{\\"type\\":\\"RNCSafeAreaProvider\\",\\"props\\":{\\"style\\":[{\\"flex\\":1},null]},\\"children\\":null}"`;
-
-exports[`Storyshots HeaderButtons Common 1`] = `"{\\"type\\":\\"RNCSafeAreaProvider\\",\\"props\\":{\\"style\\":[{\\"flex\\":1},null]},\\"children\\":null}"`;
-
-exports[`Storyshots HeaderButtons Icons 1`] = `"{\\"type\\":\\"RNCSafeAreaProvider\\",\\"props\\":{\\"style\\":[{\\"flex\\":1},null]},\\"children\\":null}"`;
-
-exports[`Storyshots HeaderButtons Themes 1`] = `"{\\"type\\":\\"RNCSafeAreaProvider\\",\\"props\\":{\\"style\\":[{\\"flex\\":1},null]},\\"children\\":null}"`;
-
-exports[`Storyshots HeaderButtons Title 1`] = `"{\\"type\\":\\"RNCSafeAreaProvider\\",\\"props\\":{\\"style\\":[{\\"flex\\":1},null]},\\"children\\":null}"`;
--- a/tests/containers/List/snapshots/List.stories.storyshot
+++ b/tests/containers/List/snapshots/List.stories.storyshot
--- a/tests/containers/LoginServices/snapshots/LoginServices.stories.storyshot
+++ b/tests/containers/LoginServices/snapshots/LoginServices.stories.storyshot
@ -1,5 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`Storyshots Login Services Separators 1`] = `"[{\\"type\\":\\"View\\",\\"props\\":{\\"accessible\\":true,\\"accessibilityLabel\\":\\"More options\\",\\"accessibilityState\\":{\\"disabled\\":false},\\"focusable\\":true,\\"collapsable\\":false,\\"style\\":{\\"paddingHorizontal\\":14,\\"justifyContent\\":\\"center\\",\\"height\\":48,\\"borderRadius\\":4,\\"marginBottom\\":0,\\"backgroundColor\\":\\"#ffffff\\",\\"opacity\\":1}},\\"children\\":[{\\"type\\":\\"Text\\",\\"props\\":{\\"style\\":[{\\"textAlign\\":\\"center\\",\\"backgroundColor\\":\\"transparent\\",\\"fontFamily\\":\\"Inter\\",\\"fontWeight\\":\\"500\\"},{\\"color\\":\\"#1d74f5\\",\\"fontSize\\":16},null],\\"accessibilityLabel\\":\\"More options\\"},\\"children\\":[\\"More options\\"]}]},{\\"type\\":\\"View\\",\\"props\\":{\\"style\\":{\\"flexDirection\\":\\"row\\",\\"alignItems\\":\\"center\\",\\"marginVertical\\":24}},\\"children\\":[{\\"type\\":\\"View\\",\\"props\\":{\\"style\\":[{\\"height\\":1,\\"flex\\":1},{\\"backgroundColor\\":\\"#e1e5e8\\"}]},\\"children\\":null},{\\"type\\":\\"Text\\",\\"props\\":{\\"style\\":[{\\"fontSize\\":14,\\"marginLeft\\":14,\\"marginRight\\":14,\\"textAlign\\":\\"left\\",\\"backgroundColor\\":\\"transparent\\",\\"fontFamily\\":\\"Inter\\",\\"fontWeight\\":\\"500\\"},{\\"color\\":\\"#9ca2a8\\"}]},\\"children\\":[\\"OR\\"]},{\\"type\\":\\"View\\",\\"props\\":{\\"style\\":[{\\"height\\":1,\\"flex\\":1},{\\"backgroundColor\\":\\"#e1e5e8\\"}]},\\"children\\":null}]},{\\"type\\":\\"View\\",\\"props\\":{\\"accessible\\":true,\\"accessibilityLabel\\":\\"Less options\\",\\"accessibilityState\\":{\\"disabled\\":false},\\"focusable\\":true,\\"collapsable\\":false,\\"style\\":{\\"paddingHorizontal\\":14,\\"justifyContent\\":\\"center\\",\\"height\\":48,\\"borderRadius\\":4,\\"marginBottom\\":0,\\"backgroundColor\\":\\"#ffffff\\",\\"opacity\\":1}},\\"children\\":[{\\"type\\":\\"Text\\",\\"props\\":{\\"style\\":[{\\"textAlign\\":\\"center\\",\\"backgroundColor\\":\\"transparent\\",\\"fontFamily\\":\\"Inter\\",\\"fontWeight\\":\\"500\\"},{\\"color\\":\\"#1d74f5\\",\\"fontSize\\":16},null],\\"accessibilityLabel\\":\\"Less options\\"},\\"children\\":[\\"Less options\\"]}]},{\\"type\\":\\"View\\",\\"props\\":{\\"style\\":{\\"flexDirection\\":\\"row\\",\\"alignItems\\":\\"center\\",\\"marginVertical\\":24}},\\"children\\":[{\\"type\\":\\"View\\",\\"props\\":{\\"style\\":[{\\"height\\":1,\\"flex\\":1},{\\"backgroundColor\\":\\"#e1e5e8\\"}]},\\"children\\":null},{\\"type\\":\\"Text\\",\\"props\\":{\\"style\\":[{\\"fontSize\\":14,\\"marginLeft\\":14,\\"marginRight\\":14,\\"textAlign\\":\\"left\\",\\"backgroundColor\\":\\"transparent\\",\\"fontFamily\\":\\"Inter\\",\\"fontWeight\\":\\"500\\"},{\\"color\\":\\"#9ca2a8\\"}]},\\"children\\":[\\"OR\\"]},{\\"type\\":\\"View\\",\\"props\\":{\\"style\\":[{\\"height\\":1,\\"flex\\":1},{\\"backgroundColor\\":\\"#e1e5e8\\"}]},\\"children\\":null}]}]"`;
-
-exports[`Storyshots Login Services Service List 1`] = `"[{\\"type\\":\\"View\\",\\"props\\":{\\"style\\":{\\"borderRadius\\":4,\\"width\\":\\"100%\\",\\"height\\":48,\\"flexDirection\\":\\"row\\",\\"alignItems\\":\\"center\\",\\"justifyContent\\":\\"center\\",\\"paddingHorizontal\\":15}},\\"children\\":[{\\"type\\":\\"Text\\",\\"props\\":{\\"selectable\\":false,\\"allowFontScaling\\":false,\\"style\\":[{\\"fontSize\\":24,\\"color\\":\\"#0d0e12\\"},{\\"position\\":\\"absolute\\",\\"left\\":15,\\"top\\":12,\\"width\\":24,\\"height\\":24},{\\"fontFamily\\":\\"custom\\",\\"fontWeight\\":\\"normal\\",\\"fontStyle\\":\\"normal\\"},{}]},\\"children\\":[\\"\\"]},{\\"type\\":\\"Text\\",\\"props\\":{\\"style\\":[{\\"textAlign\\":\\"left\\",\\"backgroundColor\\":\\"transparent\\",\\"fontFamily\\":\\"Inter\\",\\"fontWeight\\":\\"400\\",\\"fontSize\\":16},{\\"color\\":\\"#0d0e12\\"}]},\\"children\\":[\\"Continue with\\",\\" \\",{\\"type\\":\\"Text\\",\\"props\\":{\\"style\\":{\\"textAlign\\":\\"left\\",\\"backgroundColor\\":\\"transparent\\",\\"fontFamily\\":\\"Inter\\",\\"fontWeight\\":\\"600\\"}},\\"children\\":[\\"github\\"]}]}]},{\\"type\\":\\"View\\",\\"props\\":{\\"style\\":{\\"borderRadius\\":4,\\"width\\":\\"100%\\",\\"height\\":48,\\"flexDirection\\":\\"row\\",\\"alignItems\\":\\"center\\",\\"justifyContent\\":\\"center\\",\\"paddingHorizontal\\":15}},\\"children\\":[{\\"type\\":\\"Text\\",\\"props\\":{\\"selectable\\":false,\\"allowFontScaling\\":false,\\"style\\":[{\\"fontSize\\":24,\\"color\\":\\"#0d0e12\\"},{\\"position\\":\\"absolute\\",\\"left\\":15,\\"top\\":12,\\"width\\":24,\\"height\\":24},{\\"fontFamily\\":\\"custom\\",\\"fontWeight\\":\\"normal\\",\\"fontStyle\\":\\"normal\\"},{}]},\\"children\\":[\\"\\"]},{\\"type\\":\\"Text\\",\\"props\\":{\\"style\\":[{\\"textAlign\\":\\"left\\",\\"backgroundColor\\":\\"transparent\\",\\"fontFamily\\":\\"Inter\\",\\"fontWeight\\":\\"400\\",\\"fontSize\\":16},{\\"color\\":\\"#0d0e12\\"}]},\\"children\\":[\\"Continue with\\",\\" \\",{\\"type\\":\\"Text\\",\\"props\\":{\\"style\\":{\\"textAlign\\":\\"left\\",\\"backgroundColor\\":\\"transparent\\",\\"fontFamily\\":\\"Inter\\",\\"fontWeight\\":\\"600\\"}},\\"children\\":[\\"gitlab\\"]}]}]},{\\"type\\":\\"View\\",\\"props\\":{\\"style\\":{\\"borderRadius\\":4,\\"width\\":\\"100%\\",\\"height\\":48,\\"flexDirection\\":\\"row\\",\\"alignItems\\":\\"center\\",\\"justifyContent\\":\\"center\\",\\"paddingHorizontal\\":15}},\\"children\\":[{\\"type\\":\\"Text\\",\\"props\\":{\\"selectable\\":false,\\"allowFontScaling\\":false,\\"style\\":[{\\"fontSize\\":24,\\"color\\":\\"#0d0e12\\"},{\\"position\\":\\"absolute\\",\\"left\\":15,\\"top\\":12,\\"width\\":24,\\"height\\":24},{\\"fontFamily\\":\\"custom\\",\\"fontWeight\\":\\"normal\\",\\"fontStyle\\":\\"normal\\"},{}]},\\"children\\":[\\"\\"]},{\\"type\\":\\"Text\\",\\"props\\":{\\"style\\":[{\\"textAlign\\":\\"left\\",\\"backgroundColor\\":\\"transparent\\",\\"fontFamily\\":\\"Inter\\",\\"fontWeight\\":\\"400\\",\\"fontSize\\":16},{\\"color\\":\\"#0d0e12\\"}]},\\"children\\":[\\"Continue with\\",\\" \\",{\\"type\\":\\"Text\\",\\"props\\":{\\"style\\":{\\"textAlign\\":\\"left\\",\\"backgroundColor\\":\\"transparent\\",\\"fontFamily\\":\\"Inter\\",\\"fontWeight\\":\\"600\\"}},\\"children\\":[\\"google\\"]}]}]},{\\"type\\":\\"View\\",\\"props\\":{\\"style\\":{\\"borderRadius\\":4,\\"width\\":\\"100%\\",\\"height\\":48,\\"flexDirection\\":\\"row\\",\\"alignItems\\":\\"center\\",\\"justifyContent\\":\\"center\\",\\"paddingHorizontal\\":15}},\\"children\\":[{\\"type\\":\\"Text\\",\\"props\\":{\\"selectable\\":false,\\"allowFontScaling\\":false,\\"style\\":[{\\"fontSize\\":24,\\"color\\":\\"#0d0e12\\"},{\\"position\\":\\"absolute\\",\\"left\\":15,\\"top\\":12,\\"width\\":24,\\"height\\":24},{\\"fontFamily\\":\\"custom\\",\\"fontWeight\\":\\"normal\\",\\"fontStyle\\":\\"normal\\"},{}]},\\"children\\":[\\"\\"]},{\\"type\\":\\"Text\\",\\"props\\":{\\"style\\":[{\\"textAlign\\":\\"left\\",\\"backgroundColor\\":\\"transparent\\",\\"fontFamily\\":\\"Inter\\",\\"fontWeight\\":\\"400\\",\\"fontSize\\":16},{\\"color\\":\\"#0d0e12\\"}]},\\"children\\":[\\"Continue with\\",\\" \\",{\\"type\\":\\"Text\\",\\"props\\":{\\"style\\":{\\"textAlign\\":\\"left\\",\\"backgroundColor\\":\\"transparent\\",\\"fontFamily\\":\\"Inter\\",\\"fontWeight\\":\\"600\\"}},\\"children\\":[\\"apple\\"]}]}]}]"`;
--- a/tests/containers/ReactionsList/snapshots/ReactionsList.stories.storyshot
+++ b/tests/containers/ReactionsList/snapshots/ReactionsList.stories.storyshot
--- a/tests/containers/RoomHeader/snapshots/RoomHeader.stories.storyshot
+++ b/tests/containers/RoomHeader/snapshots/RoomHeader.stories.storyshot
--- a/tests/containers/RoomItem/snapshots/RoomItem.stories.storyshot
+++ b/tests/containers/RoomItem/snapshots/RoomItem.stories.storyshot
--- a/tests/containers/SearchBox/snapshots/SearchBox.stories.storyshot
+++ b/tests/containers/SearchBox/snapshots/SearchBox.stories.storyshot
@ -1,3 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`Storyshots SearchBox Basic 1`] = `"{\\"type\\":\\"View\\",\\"props\\":{\\"testID\\":\\"searchbox\\",\\"style\\":{\\"backgroundColor\\":\\"#ffffff\\"}},\\"children\\":[{\\"type\\":\\"View\\",\\"props\\":{\\"style\\":[{\\"marginBottom\\":10},{\\"margin\\":16,\\"marginBottom\\":16}]},\\"children\\":[{\\"type\\":\\"View\\",\\"props\\":{\\"style\\":{\\"position\\":\\"relative\\",\\"justifyContent\\":\\"center\\"}},\\"children\\":[{\\"type\\":\\"TextInput\\",\\"props\\":{\\"style\\":[{\\"color\\":\\"#0d0e12\\"},[{\\"textAlign\\":\\"left\\",\\"backgroundColor\\":\\"transparent\\",\\"fontFamily\\":\\"Inter\\",\\"fontWeight\\":\\"400\\",\\"height\\":48,\\"fontSize\\":16,\\"paddingHorizontal\\":16,\\"paddingVertical\\":10,\\"borderWidth\\":1,\\"borderRadius\\":4},null,{\\"paddingRight\\":45},{\\"backgroundColor\\":\\"#ffffff\\",\\"borderColor\\":\\"#cbcbcc\\",\\"color\\":\\"#0d0e12\\"},null,null],{\\"textAlign\\":\\"auto\\"}],\\"placeholderTextColor\\":\\"#9ca2a8\\",\\"keyboardAppearance\\":\\"light\\",\\"autoCorrect\\":false,\\"autoCapitalize\\":\\"none\\",\\"underlineColorAndroid\\":\\"transparent\\",\\"accessibilityLabel\\":\\"Search\\",\\"placeholder\\":\\"Search\\",\\"value\\":\\"\\",\\"blurOnSubmit\\":true,\\"returnKeyType\\":\\"search\\"},\\"children\\":null},{\\"type\\":\\"Text\\",\\"props\\":{\\"selectable\\":false,\\"allowFontScaling\\":false,\\"style\\":[{\\"fontSize\\":20,\\"color\\":\\"#2f343d\\"},[{\\"position\\":\\"absolute\\"},{\\"right\\":12}],{\\"fontFamily\\":\\"custom\\",\\"fontWeight\\":\\"normal\\",\\"fontStyle\\":\\"normal\\"},{}]},\\"children\\":[\\"\\"]}]}]}]}"`;
--- a/tests/containers/ServerItem/snapshots/ServerItem.stories.storyshot
+++ b/tests/containers/ServerItem/snapshots/ServerItem.stories.storyshot
--- a/tests/containers/TextInput/snapshots/TextInput.stories.storyshot
+++ b/tests/containers/TextInput/snapshots/TextInput.stories.storyshot
--- a/tests/containers/UIKit/snapshots/UiKitMessage.stories.storyshot
+++ b/tests/containers/UIKit/snapshots/UiKitMessage.stories.storyshot
@ -1,27 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`Storyshots UIKit/UiKitMessage Action - Buttons 1`] = `"{\\"type\\":\\"RCTScrollView\\",\\"props\\":{\\"style\\":[{\\"flex\\":1,\\"backgroundColor\\":\\"#fff\\"},{\\"paddingHorizontal\\":16}],\\"keyboardShouldPersistTaps\\":\\"always\\"},\\"children\\":[{\\"type\\":\\"View\\",\\"props\\":{},\\"children\\":null}]}"`;
-
-exports[`Storyshots UIKit/UiKitMessage Action - Select 1`] = `"{\\"type\\":\\"RCTScrollView\\",\\"props\\":{\\"style\\":[{\\"flex\\":1,\\"backgroundColor\\":\\"#fff\\"},{\\"paddingHorizontal\\":16}],\\"keyboardShouldPersistTaps\\":\\"always\\"},\\"children\\":[{\\"type\\":\\"View\\",\\"props\\":{},\\"children\\":null}]}"`;
-
-exports[`Storyshots UIKit/UiKitMessage Context 1`] = `"{\\"type\\":\\"RCTScrollView\\",\\"props\\":{\\"style\\":[{\\"flex\\":1,\\"backgroundColor\\":\\"#fff\\"},{\\"paddingHorizontal\\":16}],\\"keyboardShouldPersistTaps\\":\\"always\\"},\\"children\\":[{\\"type\\":\\"View\\",\\"props\\":{},\\"children\\":null}]}"`;
-
-exports[`Storyshots UIKit/UiKitMessage Fields 1`] = `"{\\"type\\":\\"RCTScrollView\\",\\"props\\":{\\"style\\":[{\\"flex\\":1,\\"backgroundColor\\":\\"#fff\\"},{\\"paddingHorizontal\\":16}],\\"keyboardShouldPersistTaps\\":\\"always\\"},\\"children\\":[{\\"type\\":\\"View\\",\\"props\\":{},\\"children\\":null}]}"`;
-
-exports[`Storyshots UIKit/UiKitMessage Image 1`] = `"{\\"type\\":\\"RCTScrollView\\",\\"props\\":{\\"style\\":[{\\"flex\\":1,\\"backgroundColor\\":\\"#fff\\"},{\\"paddingHorizontal\\":16}],\\"keyboardShouldPersistTaps\\":\\"always\\"},\\"children\\":[{\\"type\\":\\"View\\",\\"props\\":{},\\"children\\":null}]}"`;
-
-exports[`Storyshots UIKit/UiKitMessage Section + DatePicker 1`] = `"{\\"type\\":\\"RCTScrollView\\",\\"props\\":{\\"style\\":[{\\"flex\\":1,\\"backgroundColor\\":\\"#fff\\"},{\\"paddingHorizontal\\":16}],\\"keyboardShouldPersistTaps\\":\\"always\\"},\\"children\\":[{\\"type\\":\\"View\\",\\"props\\":{},\\"children\\":null}]}"`;
-
-exports[`Storyshots UIKit/UiKitMessage Section + Markdown List 1`] = `"{\\"type\\":\\"RCTScrollView\\",\\"props\\":{\\"style\\":[{\\"flex\\":1,\\"backgroundColor\\":\\"#fff\\"},{\\"paddingHorizontal\\":16}],\\"keyboardShouldPersistTaps\\":\\"always\\"},\\"children\\":[{\\"type\\":\\"View\\",\\"props\\":{},\\"children\\":null}]}"`;
-
-exports[`Storyshots UIKit/UiKitMessage Section + Multi Select 1`] = `"{\\"type\\":\\"RCTScrollView\\",\\"props\\":{\\"style\\":[{\\"flex\\":1,\\"backgroundColor\\":\\"#fff\\"},{\\"paddingHorizontal\\":16}],\\"keyboardShouldPersistTaps\\":\\"always\\"},\\"children\\":[{\\"type\\":\\"View\\",\\"props\\":{},\\"children\\":null}]}"`;
-
-exports[`Storyshots UIKit/UiKitMessage Section + Overflow 1`] = `"{\\"type\\":\\"RCTScrollView\\",\\"props\\":{\\"style\\":[{\\"flex\\":1,\\"backgroundColor\\":\\"#fff\\"},{\\"paddingHorizontal\\":16}],\\"keyboardShouldPersistTaps\\":\\"always\\"},\\"children\\":[{\\"type\\":\\"View\\",\\"props\\":{},\\"children\\":null}]}"`;
-
-exports[`Storyshots UIKit/UiKitMessage Section + Select 1`] = `"{\\"type\\":\\"RCTScrollView\\",\\"props\\":{\\"style\\":[{\\"flex\\":1,\\"backgroundColor\\":\\"#fff\\"},{\\"paddingHorizontal\\":16}],\\"keyboardShouldPersistTaps\\":\\"always\\"},\\"children\\":[{\\"type\\":\\"View\\",\\"props\\":{},\\"children\\":null}]}"`;
-
-exports[`Storyshots UIKit/UiKitMessage Section + button 1`] = `"{\\"type\\":\\"RCTScrollView\\",\\"props\\":{\\"style\\":[{\\"flex\\":1,\\"backgroundColor\\":\\"#fff\\"},{\\"paddingHorizontal\\":16}],\\"keyboardShouldPersistTaps\\":\\"always\\"},\\"children\\":[{\\"type\\":\\"View\\",\\"props\\":{},\\"children\\":null}]}"`;
-
-exports[`Storyshots UIKit/UiKitMessage Section + image 1`] = `"{\\"type\\":\\"RCTScrollView\\",\\"props\\":{\\"style\\":[{\\"flex\\":1,\\"backgroundColor\\":\\"#fff\\"},{\\"paddingHorizontal\\":16}],\\"keyboardShouldPersistTaps\\":\\"always\\"},\\"children\\":[{\\"type\\":\\"View\\",\\"props\\":{},\\"children\\":null}]}"`;
-
-exports[`Storyshots UIKit/UiKitMessage Section 1`] = `"{\\"type\\":\\"RCTScrollView\\",\\"props\\":{\\"style\\":[{\\"flex\\":1,\\"backgroundColor\\":\\"#fff\\"},{\\"paddingHorizontal\\":16}],\\"keyboardShouldPersistTaps\\":\\"always\\"},\\"children\\":[{\\"type\\":\\"View\\",\\"props\\":{},\\"children\\":null}]}"`;
--- a/tests/containers/UIKit/snapshots/UiKitModal.stories.storyshot
+++ b/tests/containers/UIKit/snapshots/UiKitModal.stories.storyshot
@ -1,21 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`Storyshots UIKit/UiKitModal Modal - Actions 1`] = `"{\\"type\\":\\"RCTScrollView\\",\\"props\\":{\\"style\\":[{\\"flex\\":1,\\"backgroundColor\\":\\"#fff\\"},{\\"paddingHorizontal\\":16}],\\"keyboardShouldPersistTaps\\":\\"always\\"},\\"children\\":[{\\"type\\":\\"View\\",\\"props\\":{},\\"children\\":null}]}"`;
-
-exports[`Storyshots UIKit/UiKitModal Modal - Contexts and Dividers 1`] = `"{\\"type\\":\\"RCTScrollView\\",\\"props\\":{\\"style\\":[{\\"flex\\":1,\\"backgroundColor\\":\\"#fff\\"},{\\"paddingHorizontal\\":16}],\\"keyboardShouldPersistTaps\\":\\"always\\"},\\"children\\":[{\\"type\\":\\"View\\",\\"props\\":{},\\"children\\":null}]}"`;
-
-exports[`Storyshots UIKit/UiKitModal Modal - DatePicker with error 1`] = `"{\\"type\\":\\"RCTScrollView\\",\\"props\\":{\\"style\\":[{\\"flex\\":1,\\"backgroundColor\\":\\"#fff\\"},{\\"paddingHorizontal\\":16}],\\"keyboardShouldPersistTaps\\":\\"always\\"},\\"children\\":[{\\"type\\":\\"View\\",\\"props\\":{},\\"children\\":null}]}"`;
-
-exports[`Storyshots UIKit/UiKitModal Modal - Form Input 1`] = `"{\\"type\\":\\"RCTScrollView\\",\\"props\\":{\\"style\\":[{\\"flex\\":1,\\"backgroundColor\\":\\"#fff\\"},{\\"paddingHorizontal\\":16}],\\"keyboardShouldPersistTaps\\":\\"always\\"},\\"children\\":[{\\"type\\":\\"View\\",\\"props\\":{},\\"children\\":null}]}"`;
-
-exports[`Storyshots UIKit/UiKitModal Modal - Form TextArea 1`] = `"{\\"type\\":\\"RCTScrollView\\",\\"props\\":{\\"style\\":[{\\"flex\\":1,\\"backgroundColor\\":\\"#fff\\"},{\\"paddingHorizontal\\":16}],\\"keyboardShouldPersistTaps\\":\\"always\\"},\\"children\\":[{\\"type\\":\\"View\\",\\"props\\":{},\\"children\\":null}]}"`;
-
-exports[`Storyshots UIKit/UiKitModal Modal - Images 1`] = `"{\\"type\\":\\"RCTScrollView\\",\\"props\\":{\\"style\\":[{\\"flex\\":1,\\"backgroundColor\\":\\"#fff\\"},{\\"paddingHorizontal\\":16}],\\"keyboardShouldPersistTaps\\":\\"always\\"},\\"children\\":[{\\"type\\":\\"View\\",\\"props\\":{},\\"children\\":null}]}"`;
-
-exports[`Storyshots UIKit/UiKitModal Modal - Input with error 1`] = `"{\\"type\\":\\"RCTScrollView\\",\\"props\\":{\\"style\\":[{\\"flex\\":1,\\"backgroundColor\\":\\"#fff\\"},{\\"paddingHorizontal\\":16}],\\"keyboardShouldPersistTaps\\":\\"always\\"},\\"children\\":[{\\"type\\":\\"View\\",\\"props\\":{},\\"children\\":null}]}"`;
-
-exports[`Storyshots UIKit/UiKitModal Modal - Multilne with error 1`] = `"{\\"type\\":\\"RCTScrollView\\",\\"props\\":{\\"style\\":[{\\"flex\\":1,\\"backgroundColor\\":\\"#fff\\"},{\\"paddingHorizontal\\":16}],\\"keyboardShouldPersistTaps\\":\\"always\\"},\\"children\\":[{\\"type\\":\\"View\\",\\"props\\":{},\\"children\\":null}]}"`;
-
-exports[`Storyshots UIKit/UiKitModal Modal - Section and Accessories 1`] = `"{\\"type\\":\\"RCTScrollView\\",\\"props\\":{\\"style\\":[{\\"flex\\":1,\\"backgroundColor\\":\\"#fff\\"},{\\"paddingHorizontal\\":16}],\\"keyboardShouldPersistTaps\\":\\"always\\"},\\"children\\":[{\\"type\\":\\"View\\",\\"props\\":{},\\"children\\":null}]}"`;
-
-exports[`Storyshots UIKit/UiKitModal Modal - Section and Selects 1`] = `"{\\"type\\":\\"RCTScrollView\\",\\"props\\":{\\"style\\":[{\\"flex\\":1,\\"backgroundColor\\":\\"#fff\\"},{\\"paddingHorizontal\\":16}],\\"keyboardShouldPersistTaps\\":\\"always\\"},\\"children\\":[{\\"type\\":\\"View\\",\\"props\\":{},\\"children\\":null}]}"`;
--- a/tests/containers/UnreadBadge/snapshots/UnreadBadge.stories.storyshot
+++ b/tests/containers/UnreadBadge/snapshots/UnreadBadge.stories.storyshot
--- a/tests/containers/markdown/snapshots/Markdown.stories.storyshot
+++ b/tests/containers/markdown/snapshots/Markdown.stories.storyshot
--- a/tests/containers/markdown/new/snapshots/NewMarkdown.stories.storyshot
+++ b/tests/containers/markdown/new/snapshots/NewMarkdown.stories.storyshot
--- a/tests/containers/message/Components/CollapsibleQuote/snapshots/CollapsibleQuote.stories.storyshot
+++ b/tests/containers/message/Components/CollapsibleQuote/snapshots/CollapsibleQuote.stories.storyshot
@ -1,3 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`Storyshots CollapsibleQuote Item 1`] = `"{\\"type\\":\\"View\\",\\"props\\":{\\"style\\":{\\"padding\\":10}},\\"children\\":[{\\"type\\":\\"View\\",\\"props\\":{\\"accessible\\":true,\\"testID\\":\\"collapsibleQuoteTouchable-Engineering (9 today)\\",\\"hitSlop\\":{\\"top\\":4,\\"right\\":4,\\"bottom\\":4,\\"left\\":4},\\"focusable\\":true,\\"collapsable\\":false,\\"style\\":{\\"flexDirection\\":\\"row\\",\\"alignItems\\":\\"center\\",\\"marginTop\\":6,\\"borderWidth\\":1,\\"borderRadius\\":4,\\"minHeight\\":40,\\"backgroundColor\\":\\"#f3f4f5\\",\\"borderLeftColor\\":\\"#CBCED1\\",\\"borderTopColor\\":\\"#e1e5e8\\",\\"borderRightColor\\":\\"#e1e5e8\\",\\"borderBottomColor\\":\\"#e1e5e8\\",\\"borderLeftWidth\\":2,\\"opacity\\":1}},\\"children\\":[{\\"type\\":\\"View\\",\\"props\\":{\\"style\\":{\\"flexDirection\\":\\"row\\"}},\\"children\\":[{\\"type\\":\\"View\\",\\"props\\":{\\"style\\":{\\"flex\\":1,\\"borderRadius\\":4,\\"padding\\":8}},\\"children\\":[{\\"type\\":\\"View\\",\\"props\\":{\\"style\\":{\\"flexDirection\\":\\"row\\"}},\\"children\\":[{\\"type\\":\\"Text\\",\\"props\\":{\\"style\\":[{\\"fontSize\\":16,\\"textAlign\\":\\"left\\",\\"backgroundColor\\":\\"transparent\\",\\"fontFamily\\":\\"Inter\\",\\"fontWeight\\":\\"500\\"},{\\"color\\":\\"#6C727A\\"}]},\\"children\\":[\\"Engineering (9 today)\\"]}]}]},{\\"type\\":\\"View\\",\\"props\\":{\\"style\\":{\\"width\\":20,\\"height\\":20,\\"right\\":8,\\"top\\":8,\\"justifyContent\\":\\"center\\",\\"alignItems\\":\\"center\\"}},\\"children\\":[{\\"type\\":\\"Text\\",\\"props\\":{\\"selectable\\":false,\\"allowFontScaling\\":false,\\"style\\":[{\\"fontSize\\":22,\\"color\\":\\"#6C727A\\"},null,{\\"fontFamily\\":\\"custom\\",\\"fontWeight\\":\\"normal\\",\\"fontStyle\\":\\"normal\\"},{}]},\\"children\\":[\\"\\"]}]}]}]}]}"`;
--- a/tests/containers/message/snapshots/Message.stories.storyshot
+++ b/tests/containers/message/snapshots/Message.stories.storyshot
--- a/tests/storybook.test.js
+++ b/tests/storybook.test.js
@ -1,17 +0,0 @@
-import initStoryshots, { Stories2SnapsConverter } from '@storybook/addon-storyshots';
-import { render } from '@testing-library/react-native';
-
-global.Date.now = jest.fn(() => new Date('2019-10-10').getTime());
-
-const converter = new Stories2SnapsConverter();
-
-initStoryshots({
-	test: ({ story, context }) => {
-		const snapshotFilename = converter.getSnapshotFileName(context);
-		const storyElement = story.render();
-		const { update, toJSON } = render(storyElement);
-		update(storyElement);
-		const json = toJSON();
-		expect(JSON.stringify(json)).toMatchSpecificSnapshot(snapshotFilename);
-	}
-});
--- a/tests/views/CannedResponsesListView/snapshots/CannedResponseItem.stories.storyshot
+++ b/tests/views/CannedResponsesListView/snapshots/CannedResponseItem.stories.storyshot
--- a/tests/views/CreateChannelView/RoomSettings/snapshots/SwitchItem.stories.storyshot
+++ b/tests/views/CreateChannelView/RoomSettings/snapshots/SwitchItem.stories.storyshot
@ -1,3 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`Storyshots SwitchItem Switch 1`] = `"{\\"type\\":\\"View\\",\\"props\\":{\\"style\\":{\\"flex\\":1,\\"alignItems\\":\\"flex-start\\",\\"padding\\":16}},\\"children\\":[{\\"type\\":\\"View\\",\\"props\\":{\\"style\\":[{\\"minHeight\\":54,\\"alignItems\\":\\"center\\",\\"justifyContent\\":\\"space-between\\",\\"flexDirection\\":\\"row\\",\\"maxHeight\\":80,\\"marginBottom\\":12},{\\"backgroundColor\\":\\"#ffffff\\"}]},\\"children\\":[{\\"type\\":\\"View\\",\\"props\\":{\\"style\\":{\\"flex\\":1,\\"marginRight\\":8}},\\"children\\":[{\\"type\\":\\"Text\\",\\"props\\":{\\"style\\":[{\\"fontSize\\":14,\\"textAlign\\":\\"left\\",\\"backgroundColor\\":\\"transparent\\",\\"fontFamily\\":\\"Inter\\",\\"fontWeight\\":\\"500\\"},{\\"color\\":\\"#0d0e12\\"}]},\\"children\\":[\\"Welcome to Rocket.Chat\\"]},{\\"type\\":\\"Text\\",\\"props\\":{\\"testID\\":\\"create-channel-switch-id-hint\\",\\"style\\":[{\\"fontSize\\":14,\\"textAlign\\":\\"left\\",\\"backgroundColor\\":\\"transparent\\",\\"fontFamily\\":\\"Inter\\",\\"fontWeight\\":\\"400\\"},{\\"color\\":\\"#9ca2a8\\"}]},\\"children\\":[\\"Only authorized users can write new messages\\"]}]},{\\"type\\":\\"RCTSwitch\\",\\"props\\":{\\"testID\\":\\"create-channel-switch-id\\",\\"disabled\\":false,\\"onTintColor\\":\\"#2de0a5\\",\\"style\\":{\\"height\\":31,\\"width\\":51},\\"tintColor\\":\\"#f5455c\\",\\"value\\":false,\\"accessibilityRole\\":\\"switch\\"},\\"children\\":null}]}]}"`;
--- a/tests/views/DiscussionsView/snapshots/Item.stories.storyshot
+++ b/tests/views/DiscussionsView/snapshots/Item.stories.storyshot
--- a/tests/views/RoomView/LoadMore/snapshots/LoadMore.stories.storyshot
+++ b/tests/views/RoomView/LoadMore/snapshots/LoadMore.stories.storyshot
--- a/tests/views/ThreadMessagesView/snapshots/Item.stories.storyshot
+++ b/tests/views/ThreadMessagesView/snapshots/Item.stories.storyshot
--- a/android/Gemfile.lock
+++ b/android/Gemfile.lock
@ -1,102 +1,78 @@
 GEM
  remote: https://rubygems.org/
  specs:
-    CFPropertyList (3.0.5)
-      rexml
-    addressable (2.8.0)
+    CFPropertyList (3.0.2)
+    addressable (2.7.0)
      public_suffix (>= 2.0.2, < 5.0)
-    artifactory (3.0.15)
    atomos (0.1.3)
-    aws-eventstream (1.2.0)
-    aws-partitions (1.600.0)
-    aws-sdk-core (3.131.2)
-      aws-eventstream (~> 1, >= 1.0.2)
-      aws-partitions (~> 1, >= 1.525.0)
+    aws-eventstream (1.0.3)
+    aws-partitions (1.294.0)
+    aws-sdk-core (3.92.0)
+      aws-eventstream (~> 1.0, >= 1.0.2)
+      aws-partitions (~> 1, >= 1.239.0)
      aws-sigv4 (~> 1.1)
-      jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.57.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+      jmespath (~> 1.0)
+    aws-sdk-kms (1.30.0)
+      aws-sdk-core (~> 3, >= 3.71.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.114.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-s3 (1.61.2)
+      aws-sdk-core (~> 3, >= 3.83.0)
      aws-sdk-kms (~> 1)
-      aws-sigv4 (~> 1.4)
-    aws-sigv4 (1.5.0)
-      aws-eventstream (~> 1, >= 1.0.2)
-    babosa (1.0.4)
-    claide (1.1.0)
+      aws-sigv4 (~> 1.1)
+    aws-sigv4 (1.1.1)
+      aws-eventstream (~> 1.0, >= 1.0.2)
+    babosa (1.0.3)
+    claide (1.0.3)
    colored (1.2)
    colored2 (3.1.2)
-    commander (4.6.0)
-      highline (~> 2.0.0)
-    declarative (0.0.20)
-    digest-crc (0.6.4)
-      rake (>= 12.0.0, < 14.0.0)
+    commander-fastlane (4.4.6)
+      highline (~> 1.7.2)
+    declarative (0.0.10)
+    declarative-option (0.1.0)
+    digest-crc (0.5.1)
    domain_name (0.5.20190701)
      unf (>= 0.0.5, < 1.0.0)
-    dotenv (2.7.6)
-    emoji_regex (3.2.3)
-    excon (0.92.3)
-    faraday (1.10.0)
-      faraday-em_http (~> 1.0)
-      faraday-em_synchrony (~> 1.0)
-      faraday-excon (~> 1.1)
-      faraday-httpclient (~> 1.0)
-      faraday-multipart (~> 1.0)
-      faraday-net_http (~> 1.0)
-      faraday-net_http_persistent (~> 1.0)
-      faraday-patron (~> 1.0)
-      faraday-rack (~> 1.0)
-      faraday-retry (~> 1.0)
-      ruby2_keywords (>= 0.0.4)
-    faraday-cookie_jar (0.0.7)
-      faraday (>= 0.8.0)
+    dotenv (2.7.5)
+    emoji_regex (1.0.1)
+    excon (0.73.0)
+    faraday (0.17.3)
+      multipart-post (>= 1.2, < 3)
+    faraday-cookie_jar (0.0.6)
+      faraday (>= 0.7.4)
      http-cookie (~> 1.0.0)
-    faraday-em_http (1.0.0)
-    faraday-em_synchrony (1.0.0)
-    faraday-excon (1.1.0)
-    faraday-httpclient (1.0.1)
-    faraday-multipart (1.0.4)
-      multipart-post (~> 2)
-    faraday-net_http (1.0.1)
-    faraday-net_http_persistent (1.2.0)
-    faraday-patron (1.0.0)
-    faraday-rack (1.0.0)
-    faraday-retry (1.0.3)
-    faraday_middleware (1.2.0)
-      faraday (~> 1.0)
-    fastimage (2.2.6)
-    fastlane (2.206.2)
+    faraday_middleware (0.13.1)
+      faraday (>= 0.7.4, < 1.0)
+    fastimage (2.1.7)
+    fastlane (2.145.0)
      CFPropertyList (>= 2.3, < 4.0.0)
-      addressable (>= 2.8, < 3.0.0)
-      artifactory (~> 3.0)
+      addressable (>= 2.3, < 3.0.0)
      aws-sdk-s3 (~> 1.0)
-      babosa (>= 1.0.3, < 2.0.0)
+      babosa (>= 1.0.2, < 2.0.0)
      bundler (>= 1.12.0, < 3.0.0)
      colored
-      commander (~> 4.6)
+      commander-fastlane (>= 4.4.6, < 5.0.0)
      dotenv (>= 2.1.1, < 3.0.0)
-      emoji_regex (>= 0.1, < 4.0)
+      emoji_regex (>= 0.1, < 2.0)
      excon (>= 0.71.0, < 1.0.0)
-      faraday (~> 1.0)
+      faraday (~> 0.17)
      faraday-cookie_jar (~> 0.0.6)
-      faraday_middleware (~> 1.0)
+      faraday_middleware (~> 0.13.1)
      fastimage (>= 2.1.0, < 3.0.0)
      gh_inspector (>= 1.1.2, < 2.0.0)
-      google-apis-androidpublisher_v3 (~> 0.3)
-      google-apis-playcustomapp_v1 (~> 0.1)
-      google-cloud-storage (~> 1.31)
-      highline (~> 2.0)
+      google-api-client (>= 0.29.2, < 0.37.0)
+      google-cloud-storage (>= 1.15.0, < 2.0.0)
+      highline (>= 1.7.2, < 2.0.0)
      json (< 3.0.0)
-      jwt (>= 2.1.0, < 3)
+      jwt (~> 2.1.0)
      mini_magick (>= 4.9.4, < 5.0.0)
+      multi_xml (~> 0.5)
      multipart-post (~> 2.0.0)
-      naturally (~> 2.2)
-      optparse (~> 0.1.1)
      plist (>= 3.1.0, < 4.0.0)
-      rubyzip (>= 2.0.0, < 3.0.0)
+      public_suffix (~> 2.0.0)
+      rubyzip (>= 1.3.0, < 2.0.0)
      security (= 0.1.3)
      simctl (~> 1.6.3)
+      slack-notifier (>= 2.0.0, < 3.0.0)
      terminal-notifier (>= 2.0.0, < 3.0.0)
      terminal-table (>= 1.4.5, < 2.0.0)
      tty-screen (>= 0.6.3, < 1.0.0)
@ -105,115 +81,101 @@ GEM
      xcodeproj (>= 1.13.0, < 2.0.0)
      xcpretty (~> 0.3.0)
      xcpretty-travis-formatter (>= 0.0.3)
+    fastlane-plugin-appcenter (1.8.0)
    gh_inspector (1.1.3)
-    google-apis-androidpublisher_v3 (0.22.0)
-      google-apis-core (>= 0.5, < 2.a)
-    google-apis-core (0.6.0)
+    google-api-client (0.36.4)
      addressable (~> 2.5, >= 2.5.1)
-      googleauth (>= 0.16.2, < 2.a)
-      httpclient (>= 2.8.1, < 3.a)
+      googleauth (~> 0.9)
+      httpclient (>= 2.8.1, < 3.0)
      mini_mime (~> 1.0)
      representable (~> 3.0)
-      retriable (>= 2.0, < 4.a)
-      rexml
-      webrick
-    google-apis-iamcredentials_v1 (0.12.0)
-      google-apis-core (>= 0.6, < 2.a)
-    google-apis-playcustomapp_v1 (0.9.0)
-      google-apis-core (>= 0.6, < 2.a)
-    google-apis-storage_v1 (0.15.0)
-      google-apis-core (>= 0.5, < 2.a)
-    google-cloud-core (1.6.0)
+      retriable (>= 2.0, < 4.0)
+      signet (~> 0.12)
+    google-cloud-core (1.5.0)
      google-cloud-env (~> 1.0)
      google-cloud-errors (~> 1.0)
-    google-cloud-env (1.6.0)
-      faraday (>= 0.17.3, < 3.0)
-    google-cloud-errors (1.2.0)
-    google-cloud-storage (1.36.2)
-      addressable (~> 2.8)
+    google-cloud-env (1.3.1)
+      faraday (>= 0.17.3, < 2.0)
+    google-cloud-errors (1.0.0)
+    google-cloud-storage (1.25.1)
+      addressable (~> 2.5)
      digest-crc (~> 0.4)
-      google-apis-iamcredentials_v1 (~> 0.1)
-      google-apis-storage_v1 (~> 0.1)
-      google-cloud-core (~> 1.6)
-      googleauth (>= 0.16.2, < 2.a)
+      google-api-client (~> 0.33)
+      google-cloud-core (~> 1.2)
+      googleauth (~> 0.9)
      mini_mime (~> 1.0)
-    googleauth (1.2.0)
-      faraday (>= 0.17.3, < 3.a)
+    googleauth (0.11.0)
+      faraday (>= 0.17.3, < 2.0)
      jwt (>= 1.4, < 3.0)
      memoist (~> 0.16)
      multi_json (~> 1.11)
      os (>= 0.9, < 2.0)
-      signet (>= 0.16, < 2.a)
-    highline (2.0.3)
-    http-cookie (1.0.5)
+      signet (~> 0.12)
+    highline (1.7.10)
+    http-cookie (1.0.3)
      domain_name (~> 0.5)
    httpclient (2.8.3)
-    jmespath (1.6.1)
-    json (2.6.2)
-    jwt (2.4.1)
+    jmespath (1.4.0)
+    json (2.3.0)
+    jwt (2.1.0)
    memoist (0.16.2)
-    mini_magick (4.11.0)
-    mini_mime (1.1.2)
-    multi_json (1.15.0)
+    mini_magick (4.10.1)
+    mini_mime (1.0.2)
+    multi_json (1.14.1)
+    multi_xml (0.6.0)
    multipart-post (2.0.0)
-    nanaimo (0.3.0)
-    naturally (2.2.1)
-    optparse (0.1.1)
-    os (1.1.4)
-    plist (3.6.0)
-    public_suffix (4.0.7)
-    rake (13.0.6)
-    representable (3.2.0)
+    nanaimo (0.2.6)
+    naturally (2.2.0)
+    os (1.1.0)
+    plist (3.5.0)
+    public_suffix (2.0.5)
+    representable (3.0.4)
      declarative (< 0.1.0)
-      trailblazer-option (>= 0.1.1, < 0.2.0)
+      declarative-option (< 0.2.0)
      uber (< 0.2.0)
    retriable (3.1.2)
-    rexml (3.2.5)
    rouge (2.0.7)
-    ruby2_keywords (0.0.5)
-    rubyzip (2.3.2)
+    rubyzip (1.3.0)
    security (0.1.3)
-    signet (0.17.0)
-      addressable (~> 2.8)
-      faraday (>= 0.17.5, < 3.a)
+    signet (0.14.0)
+      addressable (~> 2.3)
+      faraday (>= 0.17.3, < 2.0)
      jwt (>= 1.5, < 3.0)
      multi_json (~> 1.10)
    simctl (1.6.8)
      CFPropertyList
      naturally
+    slack-notifier (2.3.2)
    terminal-notifier (2.0.0)
    terminal-table (1.8.0)
      unicode-display_width (~> 1.1, >= 1.1.1)
-    trailblazer-option (0.1.2)
    tty-cursor (0.7.1)
-    tty-screen (0.8.1)
+    tty-screen (0.7.1)
    tty-spinner (0.9.3)
      tty-cursor (~> 0.7)
    uber (0.1.0)
    unf (0.1.4)
      unf_ext
-    unf_ext (0.0.8.2)
-    unicode-display_width (1.8.0)
-    webrick (1.7.0)
+    unf_ext (0.0.7.7-x64-mingw32)
+    unicode-display_width (1.7.0)
    word_wrap (1.0.0)
-    xcodeproj (1.22.0)
+    xcodeproj (1.15.0)
      CFPropertyList (>= 2.3.3, < 4.0)
      atomos (~> 0.1.3)
      claide (>= 1.0.2, < 2.0)
      colored2 (~> 3.1)
-      nanaimo (~> 0.3.0)
-      rexml (~> 3.2.4)
+      nanaimo (~> 0.2.6)
    xcpretty (0.3.0)
      rouge (~> 2.0.7)
-    xcpretty-travis-formatter (1.0.1)
+    xcpretty-travis-formatter (1.0.0)
      xcpretty (~> 0.2, >= 0.0.7)

 PLATFORMS
-  ruby
  x64-mingw32

 DEPENDENCIES
  fastlane
+  fastlane-plugin-appcenter

 BUNDLED WITH
-   2.3.11
+   2.0.2
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@ -1,13 +1,8 @@
-def taskRequests = getGradle().getStartParameter().getTaskRequests().toString().toLowerCase()
-def isFoss = taskRequests.contains("foss")
-
 apply plugin: "com.android.application"
-apply plugin: 'kotlin-android'
-
-if (!isFoss) {
+apply plugin: 'com.google.gms.google-services'
 apply plugin: 'com.google.firebase.crashlytics'
+apply plugin: 'kotlin-android'
 apply plugin: 'com.bugsnag.android.gradle'
-}

 import com.android.build.OutputFile

@ -25,7 +20,7 @@ import com.android.build.OutputFile
 *   bundleAssetName: "index.android.bundle",
 *
 *   // the entry file for bundle generation. If none specified and
- *   // "index.android.js" exists, it will be used. Otherwise "index.tsx" is
+ *   // "index.android.js" exists, it will be used. Otherwise "index.js" is
 *   // default. Can be overridden with ENTRY_FILE environment variable.
 *   entryFile: "index.android.js",
 *
@ -93,6 +88,7 @@ project.ext.react = [
 ]

 apply from: "../../node_modules/react-native/react.gradle"
+apply from: '../../node_modules/react-native-unimodules/gradle.groovy'

 /**
 * Set this to true to create two separate APKs instead of one:
@ -130,103 +126,24 @@ def jscFlavor = 'org.webkit:android-jsc:+'
 */
 def enableHermes = project.ext.react.get("enableHermes", false);

-/**
- * Architectures to build native code for.
- */
-def reactNativeArchitectures() {
-    def value = project.getProperties().get("reactNativeArchitectures")
-    return value ? value.split(",") : ["armeabi-v7a", "x86", "x86_64", "arm64-v8a"]
-}
-
 android {
-    ndkVersion rootProject.ext.ndkVersion
    compileSdkVersion rootProject.ext.compileSdkVersion

+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
    defaultConfig {
-        applicationId APPLICATION_ID
+        applicationId "chat.rocket.reactnative"
        minSdkVersion rootProject.ext.minSdkVersion
        targetSdkVersion rootProject.ext.targetSdkVersion
        versionCode VERSIONCODE as Integer
-        versionName "4.37.0"
+        versionName "4.10.0"
        vectorDrawables.useSupportLibrary = true
-        if (!isFoss) {
        manifestPlaceholders = [BugsnagAPIKey: BugsnagAPIKey as String]
        missingDimensionStrategy "RNNotifications.reactNativeVersion", "reactNative60" // See note below!
    }
-        resValue "string", "rn_config_reader_custom_package", "chat.rocket.reactnative"
-        testBuildType System.getProperty('testBuildType', 'debug')
-        testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
-
-        buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
-        if (isNewArchitectureEnabled()) {
-            // We configure the NDK build only if you decide to opt-in for the New Architecture.
-            externalNativeBuild {
-                ndkBuild {
-                    arguments "APP_PLATFORM=android-21",
-                        "APP_STL=c++_shared",
-                        "NDK_TOOLCHAIN_VERSION=clang",
-                        "GENERATED_SRC_DIR=$buildDir/generated/source",
-                        "PROJECT_BUILD_DIR=$buildDir",
-                        "REACT_ANDROID_DIR=$rootDir/../node_modules/react-native/ReactAndroid",
-                        "REACT_ANDROID_BUILD_DIR=$rootDir/../node_modules/react-native/ReactAndroid/build"
-                    cFlags "-Wall", "-Werror", "-fexceptions", "-frtti", "-DWITH_INSPECTOR=1"
-                    cppFlags "-std=c++17"
-                    // Make sure this target name is the same you specify inside the
-                    // src/main/jni/Android.mk file for the `LOCAL_MODULE` variable.
-                    targets "rndiffapp_appmodules"
-                    // Fix for windows limit on number of character in file paths and in command lines
-                    if (Os.isFamily(Os.FAMILY_WINDOWS)) {
-                        arguments "NDK_APP_SHORT_COMMANDS=true"
-                    }
-                }
-            }
-            if (!enableSeparateBuildPerCPUArchitecture) {
-                ndk {
-                    abiFilters (*reactNativeArchitectures())
-                }
-            }
-        }
-    }
-
-    if (isNewArchitectureEnabled()) {
-        // We configure the NDK build only if you decide to opt-in for the New Architecture.
-        externalNativeBuild {
-            ndkBuild {
-                path "$projectDir/src/main/jni/Android.mk"
-            }
-        }
-        def reactAndroidProjectDir = project(':ReactAndroid').projectDir
-        def packageReactNdkDebugLibs = tasks.register("packageReactNdkDebugLibs", Copy) {
-            dependsOn(":ReactAndroid:packageReactNdkDebugLibsForBuck")
-            from("$reactAndroidProjectDir/src/main/jni/prebuilt/lib")
-            into("$buildDir/react-ndk/exported")
-        }
-        def packageReactNdkReleaseLibs = tasks.register("packageReactNdkReleaseLibs", Copy) {
-            dependsOn(":ReactAndroid:packageReactNdkReleaseLibsForBuck")
-            from("$reactAndroidProjectDir/src/main/jni/prebuilt/lib")
-            into("$buildDir/react-ndk/exported")
-        }
-        afterEvaluate {
-            // If you wish to add a custom TurboModule or component locally,
-            // you should uncomment this line.
-            // preBuild.dependsOn("generateCodegenArtifactsFromSchema")
-            preDebugBuild.dependsOn(packageReactNdkDebugLibs)
-            preReleaseBuild.dependsOn(packageReactNdkReleaseLibs)
-            // Due to a bug inside AGP, we have to explicitly set a dependency
-            // between configureNdkBuild* tasks and the preBuild tasks.
-            // This can be removed once this is solved: https://issuetracker.google.com/issues/207403732
-            configureNdkBuildRelease.dependsOn(preReleaseBuild)
-            configureNdkBuildDebug.dependsOn(preDebugBuild)
-            reactNativeArchitectures().each { architecture ->
-                tasks.findByName("configureNdkBuildDebug[${architecture}]")?.configure {
-                    dependsOn("preDebugBuild")
-                }
-                tasks.findByName("configureNdkBuildRelease[${architecture}]")?.configure {
-                    dependsOn("preReleaseBuild")
-                }
-            }
-        }
-    }

    signingConfigs {
        release {
@ -243,21 +160,16 @@ android {
            reset()
            enable enableSeparateBuildPerCPUArchitecture
            universalApk false  // If true, also generate a universal APK
-            include (*reactNativeArchitectures())
+            include "armeabi-v7a", "x86", "arm64-v8a", "x86_64"
        }
    }
    buildTypes {
        release {
            minifyEnabled enableProguardInReleaseBuilds
            setProguardFiles([getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'])
-            proguardFile "${rootProject.projectDir}/../node_modules/detox/android/detox/proguard-rules-app.pro"
            signingConfig signingConfigs.release
-            if (!isFoss) {
            firebaseCrashlytics {
                nativeSymbolUploadEnabled true
-                    strippedNativeLibsDir 'build/intermediates/stripped_native_libs/release/out/lib'
-                    unstrippedNativeLibsDir 'build/intermediates/merged_native_libs/release/out/lib'
-                }
            }
        }
    }
@ -269,52 +181,7 @@ android {
    //     pickFirst '**/x86_64/libc++_shared.so'
    // }

-    // FIXME: Remove when we update RN
-    packagingOptions {
-        pickFirst '**/*.so'
-    }
-
    // applicationVariants are e.g. debug, release
-
-    flavorDimensions "app", "type"
-    productFlavors {
-        official {
-            dimension = "app"
-            buildConfigField "boolean", "IS_OFFICIAL", "true"
-        }
-        experimental {
-            dimension = "app"
-            buildConfigField "boolean", "IS_OFFICIAL", "false"
-        }
-        foss {
-            dimension = "type"
-            buildConfigField "boolean", "FDROID_BUILD", "true"
-        }
-        play {
-            dimension = "type"
-            buildConfigField "boolean", "FDROID_BUILD", "false"
-        }
-    }
-    sourceSets {
-        // TODO: refactor making sure notifications are working properly both on debug and release
-        experimentalPlayDebug {
-            java.srcDirs = ['src/main/java', 'src/play/java']
-            manifest.srcFile 'src/play/AndroidManifest.xml'
-        }
-        experimentalPlayRelease {
-            java.srcDirs = ['src/main/java', 'src/play/java']
-            manifest.srcFile 'src/play/AndroidManifest.xml'
-        }
-        officialPlayDebug {
-            java.srcDirs = ['src/main/java', 'src/play/java']
-            manifest.srcFile 'src/play/AndroidManifest.xml'
-        }
-        officialPlayRelease {
-            java.srcDirs = ['src/main/java', 'src/play/java']
-            manifest.srcFile 'src/play/AndroidManifest.xml'
-        }
-    }
-
    applicationVariants.all { variant ->
        variant.outputs.each { output ->
            // For each separate APK per architecture, set a unique version code as described here:
@ -342,24 +209,21 @@ android {
 }

 dependencies {
+    addUnimodulesDependencies()
+    implementation project(':watermelondb')
+    implementation project(':reactnativenotifications')
+    implementation project(":reactnativekeyboardinput")
    implementation project(':@react-native-community_viewpager')
-    implementation "androidx.core:core-splashscreen:1.0.0"
-    playImplementation project(':react-native-notifications')
-    playImplementation 'com.google.firebase:firebase-core:16.0.0'
-    playImplementation project(':@react-native-firebase_app')
-    playImplementation project(':@react-native-firebase_analytics')
-    playImplementation project(':@react-native-firebase_crashlytics')
    implementation fileTree(dir: "libs", include: ["*.jar"])
-
    //noinspection GradleDynamicVersion
    implementation "com.facebook.react:react-native:+"  // From node_modules
+    implementation "com.google.firebase:firebase-messaging:18.0.0"
    implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.0.0"
    debugImplementation("com.facebook.flipper:flipper:${FLIPPER_VERSION}") {
      exclude group:'com.facebook.fbjni'
    }
    debugImplementation("com.facebook.flipper:flipper-network-plugin:${FLIPPER_VERSION}") {
        exclude group:'com.facebook.flipper'
-        exclude group:'com.squareup.okhttp3', module:'okhttp'
    }
    debugImplementation("com.facebook.flipper:flipper-fresco-plugin:${FLIPPER_VERSION}") {
        exclude group:'com.facebook.flipper'
@ -373,43 +237,16 @@ dependencies {
      implementation jscFlavor
    }

-    implementation "com.google.code.gson:gson:2.8.9"
+    implementation "com.google.code.gson:gson:2.8.5"
    implementation "com.github.bumptech.glide:glide:4.9.0"
    annotationProcessor "com.github.bumptech.glide:compiler:4.9.0"
-    implementation "com.tencent:mmkv-static:1.2.10"
-    androidTestImplementation('com.wix:detox:+')
-    implementation 'androidx.appcompat:appcompat:1.1.0'
-    implementation 'com.facebook.soloader:soloader:0.10.4'
-}
-
-if (isNewArchitectureEnabled()) {
-    // If new architecture is enabled, we let you build RN from source
-    // Otherwise we fallback to a prebuilt .aar bundled in the NPM package.
-    // This will be applied to all the imported transtitive dependency.
-    configurations.all {
-        resolutionStrategy.dependencySubstitution {
-            substitute(module("com.facebook.react:react-native"))
-                    .using(project(":ReactAndroid")).because("On New Architecture we're building React Native from source")
-        }
-    }
 }

 // Run this once to be able to run the application with BUCK
 // puts all compile dependencies into folder libs for BUCK to use
 task copyDownloadableDepsToLibs(type: Copy) {
-    from configurations.implementation
+    from configurations.compile
    into 'libs'
 }

 apply from: file("../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesAppBuildGradle(project)
-if (!isFoss) {
-    apply plugin: 'com.google.gms.google-services'
-}
-
-def isNewArchitectureEnabled() {
-    // To opt-in for the New Architecture, you can either:
-    // - Set `newArchEnabled` to true inside the `gradle.properties` file
-    // - Invoke gradle with `-newArchEnabled=true`
-    // - Set an environment variable `ORG_GRADLE_PROJECT_newArchEnabled=true`
-    return project.hasProperty("newArchEnabled") && project.newArchEnabled == "true"
-}
--- a/android/app/google-services.json
+++ b/android/app/google-services.json
@ -6,42 +6,6 @@
    "storage_bucket": "rocketchat-reactnative-test.appspot.com"
  },
  "client": [
-    {
-      "client_info": {
-        "mobilesdk_app_id": "1:115198584049:android:a79216ae48935d2c9ab550",
-        "android_client_info": {
-          "package_name": "chat.rocket.android"
-        }
-      },
-      "oauth_client": [
-        {
-          "client_id": "115198584049-ack609b1338b827fta26s9rd2ab1aad5.apps.googleusercontent.com",
-          "client_type": 3
-        }
-      ],
-      "api_key": [
-        {
-          "current_key": "AIzaSyAWwowhAfACHBw3YxmDOXY3QyakgjhJLqc"
-        }
-      ],
-      "services": {
-        "appinvite_service": {
-          "other_platform_oauth_client": [
-            {
-              "client_id": "115198584049-ack609b1338b827fta26s9rd2ab1aad5.apps.googleusercontent.com",
-              "client_type": 3
-            },
-            {
-              "client_id": "115198584049-0efgfvm0oh9ap55g7epmqnjm27mq3j4e.apps.googleusercontent.com",
-              "client_type": 2,
-              "ios_info": {
-                "bundle_id": "chat.rocket.reactnative"
-              }
-            }
-          ]
-        }
-      }
-    },
    {
      "client_info": {
        "mobilesdk_app_id": "1:115198584049:android:8be27b1f7c42a2ed",
@ -66,13 +30,6 @@
            {
              "client_id": "115198584049-ack609b1338b827fta26s9rd2ab1aad5.apps.googleusercontent.com",
              "client_type": 3
-            },
-            {
-              "client_id": "115198584049-0efgfvm0oh9ap55g7epmqnjm27mq3j4e.apps.googleusercontent.com",
-              "client_type": 2,
-              "ios_info": {
-                "bundle_id": "chat.rocket.reactnative"
-              }
            }
          ]
        }
--- a/android/app/google-services.prod.json
+++ b/android/app/google-services.prod.json
@ -0,0 +1,231 @@
+{
+  "project_info": {
+    "project_number": "673693445664",
+    "firebase_url": "https://rocketchat-9e9be.firebaseio.com",
+    "project_id": "rocketchat-9e9be",
+    "storage_bucket": "rocketchat-9e9be.appspot.com"
+  },
+  "client": [
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:673693445664:android:6ef4638e500ec958",
+        "android_client_info": {
+          "package_name": "RocketChat"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "673693445664-97s9t777ful7mn2510vuhb48958qd9tb.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "AIzaSyDIkZj1TRz8TmhnMswDwVY5OnWuzFK3rxg"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": [
+            {
+              "client_id": "673693445664-97s9t777ful7mn2510vuhb48958qd9tb.apps.googleusercontent.com",
+              "client_type": 3
+            },
+            {
+              "client_id": "673693445664-jbf9m30ta163gobjfp0v7j1v7kpo7kmv.apps.googleusercontent.com",
+              "client_type": 2,
+              "ios_info": {
+                "bundle_id": "chat.rocket.reactnative"
+              }
+            }
+          ]
+        }
+      }
+    },
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:673693445664:android:16da2e50aff9f0c9",
+        "android_client_info": {
+          "package_name": "chat.rocket.android"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "673693445664-k0mvosdjoe5dbvqce3b377ckabb5dgu8.apps.googleusercontent.com",
+          "client_type": 1,
+          "android_info": {
+            "package_name": "chat.rocket.android",
+            "certificate_hash": "33fa8582794176014a59054192e261bfad0e5273"
+          }
+        },
+        {
+          "client_id": "673693445664-hrjftksij02vqtd467ln2cubvu48ft5j.apps.googleusercontent.com",
+          "client_type": 1,
+          "android_info": {
+            "package_name": "chat.rocket.android",
+            "certificate_hash": "41cf750df786a6d9da712a98a629d0c8391876d6"
+          }
+        },
+        {
+          "client_id": "673693445664-97s9t777ful7mn2510vuhb48958qd9tb.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "AIzaSyDIkZj1TRz8TmhnMswDwVY5OnWuzFK3rxg"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": [
+            {
+              "client_id": "673693445664-97s9t777ful7mn2510vuhb48958qd9tb.apps.googleusercontent.com",
+              "client_type": 3
+            },
+            {
+              "client_id": "673693445664-jbf9m30ta163gobjfp0v7j1v7kpo7kmv.apps.googleusercontent.com",
+              "client_type": 2,
+              "ios_info": {
+                "bundle_id": "chat.rocket.reactnative"
+              }
+            }
+          ]
+        }
+      }
+    },
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:673693445664:android:1551054db195f705",
+        "android_client_info": {
+          "package_name": "chat.rocket.android.dev"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "673693445664-t5aeku0oie010npd40a0tgn27c418vk7.apps.googleusercontent.com",
+          "client_type": 1,
+          "android_info": {
+            "package_name": "chat.rocket.android.dev",
+            "certificate_hash": "41cf750df786a6d9da712a98a629d0c8391876d6"
+          }
+        },
+        {
+          "client_id": "673693445664-iml14ln4vccuu7liclrpt2k671fkjs38.apps.googleusercontent.com",
+          "client_type": 1,
+          "android_info": {
+            "package_name": "chat.rocket.android.dev",
+            "certificate_hash": "33fa8582794176014a59054192e261bfad0e5273"
+          }
+        },
+        {
+          "client_id": "673693445664-97s9t777ful7mn2510vuhb48958qd9tb.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "AIzaSyDIkZj1TRz8TmhnMswDwVY5OnWuzFK3rxg"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": [
+            {
+              "client_id": "673693445664-97s9t777ful7mn2510vuhb48958qd9tb.apps.googleusercontent.com",
+              "client_type": 3
+            },
+            {
+              "client_id": "673693445664-jbf9m30ta163gobjfp0v7j1v7kpo7kmv.apps.googleusercontent.com",
+              "client_type": 2,
+              "ios_info": {
+                "bundle_id": "chat.rocket.reactnative"
+              }
+            }
+          ]
+        }
+      }
+    },
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:673693445664:android:8be27b1f7c42a2ed",
+        "android_client_info": {
+          "package_name": "chat.rocket.reactnative"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "673693445664-97s9t777ful7mn2510vuhb48958qd9tb.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "AIzaSyDIkZj1TRz8TmhnMswDwVY5OnWuzFK3rxg"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": [
+            {
+              "client_id": "673693445664-97s9t777ful7mn2510vuhb48958qd9tb.apps.googleusercontent.com",
+              "client_type": 3
+            },
+            {
+              "client_id": "673693445664-jbf9m30ta163gobjfp0v7j1v7kpo7kmv.apps.googleusercontent.com",
+              "client_type": 2,
+              "ios_info": {
+                "bundle_id": "chat.rocket.reactnative"
+              }
+            }
+          ]
+        }
+      }
+    },
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:673693445664:android:64932c99863e2838",
+        "android_client_info": {
+          "package_name": "com.konecty.rocket.chat"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "673693445664-3ajben08beuco6eout3kpod2gbbm8fij.apps.googleusercontent.com",
+          "client_type": 1,
+          "android_info": {
+            "package_name": "com.konecty.rocket.chat",
+            "certificate_hash": "cd5806ba3f0141d0f2e47acfe64a485f575108ab"
+          }
+        },
+        {
+          "client_id": "673693445664-97s9t777ful7mn2510vuhb48958qd9tb.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "AIzaSyDIkZj1TRz8TmhnMswDwVY5OnWuzFK3rxg"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": [
+            {
+              "client_id": "673693445664-97s9t777ful7mn2510vuhb48958qd9tb.apps.googleusercontent.com",
+              "client_type": 3
+            },
+            {
+              "client_id": "673693445664-jbf9m30ta163gobjfp0v7j1v7kpo7kmv.apps.googleusercontent.com",
+              "client_type": 2,
+              "ios_info": {
+                "bundle_id": "chat.rocket.reactnative"
+              }
+            }
+          ]
+        }
+      }
+    }
+  ],
+  "configuration_version": "1"
+}
--- a/android/app/src/androidTest/java/chat/rocket/reactnative/DetoxTest.java
+++ b/android/app/src/androidTest/java/chat/rocket/reactnative/DetoxTest.java
@ -1,32 +0,0 @@
-// Replace "com.example" here and below with your app's package name from the top of MainActivity.java
-package chat.rocket.reactnative;
-
-import com.wix.detox.Detox;
-import com.wix.detox.config.DetoxConfig;
-
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import androidx.test.ext.junit.runners.AndroidJUnit4;
-import androidx.test.filters.LargeTest;
-import androidx.test.rule.ActivityTestRule;
-
-@RunWith(AndroidJUnit4.class)
-@LargeTest
-public class DetoxTest {
-    @Rule
-    // Replace 'MainActivity' with the value of android:name entry in 
-    // <activity> in AndroidManifest.xml
-    public ActivityTestRule<chat.rocket.reactnative.MainActivity> mActivityRule = new ActivityTestRule<>(chat.rocket.reactnative.MainActivity.class, false, false);
-
-    @Test
-    public void runDetoxTests() {
-        DetoxConfig detoxConfig = new DetoxConfig();
-        detoxConfig.idlePolicyConfig.masterTimeoutSec = 90;
-        detoxConfig.idlePolicyConfig.idleResourceTimeoutSec = 60;
-        detoxConfig.rnContextLoadTimeoutSec = (chat.rocket.reactnative.BuildConfig.DEBUG ? 180 : 60);
-
-        Detox.runTests(mActivityRule, detoxConfig);
-    }
-}
--- a/android/app/src/debug/AndroidManifest.xml
+++ b/android/app/src/debug/AndroidManifest.xml
@ -2,14 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:tools="http://schemas.android.com/tools">

-    <application
-        android:name="chat.rocket.reactnative.MainDebugApplication"
-        tools:ignore="GoogleAppIndexingWarning"
-        tools:replace="android:name"
-        tools:targetApi="28"
-        android:networkSecurityConfig="@xml/network_security_config">
-        <activity android:name="com.facebook.react.devsupport.DevSettingsActivity" android:exported="true" />
-    </application>
-
    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
+
+    <application tools:targetApi="28" tools:ignore="GoogleAppIndexingWarning" />
 </manifest>
--- a/android/app/src/debug/java/chat/rocket/reactnative/ReactNativeFlipper.java
+++ b/android/app/src/debug/java/chat/rocket/reactnative/ReactNativeFlipper.java
@ -4,7 +4,7 @@
 * <p>This source code is licensed under the MIT license found in the LICENSE file in the root
 * directory of this source tree.
 */
-package chat.rocket.reactnative;
+package com.rndiffapp;
 import android.content.Context;
 import com.facebook.flipper.android.AndroidFlipperClient;
 import com.facebook.flipper.android.utils.FlipperUtils;
@ -18,11 +18,9 @@ import com.facebook.flipper.plugins.network.FlipperOkhttpInterceptor;
 import com.facebook.flipper.plugins.network.NetworkFlipperPlugin;
 import com.facebook.flipper.plugins.react.ReactFlipperPlugin;
 import com.facebook.flipper.plugins.sharedpreferences.SharedPreferencesFlipperPlugin;
-import com.facebook.react.ReactInstanceEventListener;
 import com.facebook.react.ReactInstanceManager;
 import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.modules.network.NetworkingModule;
-import com.facebook.react.modules.network.CustomClientBuilder;
 import okhttp3.OkHttpClient;
 public class ReactNativeFlipper {
  public static void initializeFlipper(Context context, ReactInstanceManager reactInstanceManager) {
@ -35,7 +33,7 @@ public class ReactNativeFlipper {
      client.addPlugin(CrashReporterPlugin.getInstance());
      NetworkFlipperPlugin networkFlipperPlugin = new NetworkFlipperPlugin();
      NetworkingModule.setCustomClientBuilder(
-          new CustomClientBuilder() {
+          new NetworkingModule.CustomClientBuilder() {
            @Override
            public void apply(OkHttpClient.Builder builder) {
              builder.addNetworkInterceptor(new FlipperOkhttpInterceptor(networkFlipperPlugin));
@ -48,7 +46,7 @@ public class ReactNativeFlipper {
      ReactContext reactContext = reactInstanceManager.getCurrentReactContext();
      if (reactContext == null) {
        reactInstanceManager.addReactInstanceEventListener(
-            new ReactInstanceEventListener() {
+            new ReactInstanceManager.ReactInstanceEventListener() {
              @Override
              public void onReactContextInitialized(ReactContext reactContext) {
                reactInstanceManager.removeReactInstanceEventListener(this);
--- a/android/app/src/debug/res/xml/network_security_config.xml
+++ b/android/app/src/debug/res/xml/network_security_config.xml
@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<network-security-config xmlns:tools="http://schemas.android.com/tools">
-    <base-config cleartextTrafficPermitted="true">
-        <trust-anchors>
-            <certificates src="system" />
-            <certificates src="user"
-                tools:ignore="AcceptsUserCertificates" />
-        </trust-anchors>
-    </base-config>
-</network-security-config>
--- a/android/app/src/experimental/ic_launcher-web.png
+++ b/android/app/src/experimental/ic_launcher-web.png
--- a/android/app/src/experimental/res/drawable-v24/ic_launcher_background.xml
+++ b/android/app/src/experimental/res/drawable-v24/ic_launcher_background.xml
@ -1,24 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:aapt="http://schemas.android.com/aapt"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="512"
-    android:viewportHeight="512">
-  <group>
-    <clip-path android:pathData="M0,0h512v512h-512z M 0,0"/>
-    <path
-        android:pathData="M0,0h512v512h-512z">
-      <aapt:attr name="android:fillColor">
-        <gradient 
-            android:startY="0"
-            android:startX="256"
-            android:endY="512"
-            android:endX="256"
-            android:type="linear">
-          <item android:offset="0" android:color="#FF1C82FF"/>
-          <item android:offset="1" android:color="#FF0066E3"/>
-        </gradient>
-      </aapt:attr>
-    </path>
-  </group>
-</vector>
--- a/android/app/src/experimental/res/drawable/ic_launcher_foreground.xml
+++ b/android/app/src/experimental/res/drawable/ic_launcher_foreground.xml
--- a/android/app/src/experimental/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/android/app/src/experimental/res/mipmap-anydpi-v26/ic_launcher.xml
@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background"/>
-    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
-</adaptive-icon>
--- a/android/app/src/experimental/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ b/android/app/src/experimental/res/mipmap-anydpi-v26/ic_launcher_round.xml
@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background"/>
-    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
-</adaptive-icon>
--- a/android/app/src/experimental/res/mipmap-hdpi/ic_launcher.png
+++ b/android/app/src/experimental/res/mipmap-hdpi/ic_launcher.png
--- a/android/app/src/experimental/res/mipmap-hdpi/ic_launcher_round.png
+++ b/android/app/src/experimental/res/mipmap-hdpi/ic_launcher_round.png
--- a/android/app/src/experimental/res/mipmap-mdpi/ic_launcher.png
+++ b/android/app/src/experimental/res/mipmap-mdpi/ic_launcher.png
--- a/android/app/src/experimental/res/mipmap-mdpi/ic_launcher_round.png
+++ b/android/app/src/experimental/res/mipmap-mdpi/ic_launcher_round.png
--- a/android/app/src/experimental/res/mipmap-xhdpi/ic_launcher.png
+++ b/android/app/src/experimental/res/mipmap-xhdpi/ic_launcher.png
--- a/android/app/src/experimental/res/mipmap-xhdpi/ic_launcher_round.png
+++ b/android/app/src/experimental/res/mipmap-xhdpi/ic_launcher_round.png
--- a/android/app/src/experimental/res/mipmap-xxhdpi/ic_launcher.png
+++ b/android/app/src/experimental/res/mipmap-xxhdpi/ic_launcher.png
--- a/android/app/src/experimental/res/mipmap-xxhdpi/ic_launcher_round.png
+++ b/android/app/src/experimental/res/mipmap-xxhdpi/ic_launcher_round.png
--- a/android/app/src/experimental/res/mipmap-xxxhdpi/ic_launcher.png
+++ b/android/app/src/experimental/res/mipmap-xxxhdpi/ic_launcher.png
--- a/android/app/src/experimental/res/mipmap-xxxhdpi/ic_launcher_round.png
+++ b/android/app/src/experimental/res/mipmap-xxxhdpi/ic_launcher_round.png
--- a/android/app/src/experimental/res/values/colors.xml
+++ b/android/app/src/experimental/res/values/colors.xml
@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-	<color name="primary_dark">#660B0B0B</color>
-	<item name="splashBackground" type="color">#1D74F5</item>
-	<item name="notification_text" type="color">#1D74F5</item>
-</resources>
--- a/android/app/src/foss/java/chat/rocket/reactnative/AdditionalModules.java
+++ b/android/app/src/foss/java/chat/rocket/reactnative/AdditionalModules.java
@ -1,14 +0,0 @@
-package chat.rocket.reactnative;
-
-import android.app.Application;
-
-import com.facebook.react.ReactPackage;
-
-import java.util.Arrays;
-import java.util.List;
-
-public class AdditionalModules {
-    public List<ReactPackage> getAdditionalModules(Application application) {
-        return Arrays.<ReactPackage>asList();
-    }
-}
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@ -3,86 +3,71 @@
 	package="chat.rocket.reactnative">

 	<uses-permission android:name="android.permission.INTERNET" />
+	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
 	<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />

-    <uses-permission android:name="android.permission.CAMERA" />
-    <uses-permission android:name="android.permission.RECORD_AUDIO"/>
-    <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
-    <uses-permission android:name="android.permission.VIDEO_CAPTURE" />
-    <uses-permission android:name="android.permission.AUDIO_CAPTURE" />
-
-    <!-- permissions related to jitsi call -->
-    <uses-permission android:name="android.permission.BLUETOOTH" />
-    
 	<application
-        android:name="chat.rocket.reactnative.MainApplication"
-        android:allowBackup="false"
+		android:name=".MainApplication"
+		android:allowBackup="true"
+		android:label="@string/app_name"
 		android:icon="@mipmap/ic_launcher"
-        android:label="@string/app_name"
+		android:theme="@style/AppTheme"
 		android:networkSecurityConfig="@xml/network_security_config"
-        android:requestLegacyExternalStorage="true"
-        android:supportsRtl="true"
-        android:theme="@style/BootTheme"
-        android:hardwareAccelerated="true"
-        tools:replace="android:allowBackup">
+	>
 		<activity
-            android:name="chat.rocket.reactnative.MainActivity"
-            android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|screenSize|smallestScreenSize|uiMode"
-            android:exported="true"
-            android:label="@string/app_name"
-            android:launchMode="singleTask"
-            android:windowSoftInputMode="adjustResize">
-            <intent-filter>
-                <action android:name="android.intent.action.DOWNLOAD_COMPLETE" />
-            </intent-filter>
-            <intent-filter android:label="@string/app_name">
-                <action android:name="android.intent.action.VIEW" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-
-                <data
-                    android:host="go.rocket.chat"
-                    android:scheme="https" />
-                <data
-                    android:host="jitsi.rocket.chat"
-                    android:scheme="https" />
-                <data
-                    android:host="room"
-                    android:scheme="rocketchat" />
-                <data
-                    android:host="auth"
-                    android:scheme="rocketchat" />
-                <data
-                    android:host="jitsi.rocket.chat"
-                    android:scheme="rocketchat" />
-            </intent-filter>
+      android:name="com.zoontek.rnbootsplash.RNBootSplashActivity"
+      android:theme="@style/BootTheme">
      <intent-filter>
        <action android:name="android.intent.action.MAIN" />
        <category android:name="android.intent.category.LAUNCHER" />
      </intent-filter>
    </activity>
 		<activity
-            android:name="chat.rocket.reactnative.share.ShareActivity"
+			android:name=".MainActivity"
+			android:label="@string/app_name"
+			android:configChanges="keyboard|keyboardHidden|orientation|screenSize|uiMode"
+			android:launchMode="singleTask"
+			android:windowSoftInputMode="adjustResize"
+			android:exported="true">
+			<intent-filter>
+				<action android:name="android.intent.action.DOWNLOAD_COMPLETE"/>
+			</intent-filter>
+			<intent-filter android:label="@string/app_name">
+				<action android:name="android.intent.action.VIEW" />
+				<category android:name="android.intent.category.DEFAULT" />
+				<category android:name="android.intent.category.BROWSABLE" />
+				<data android:scheme="https" android:host="go.rocket.chat" />
+				<data android:scheme="rocketchat" android:host="room" />
+				<data android:scheme="rocketchat" android:host="auth" />
+			</intent-filter>
+		</activity>
+		<activity android:name="com.facebook.react.devsupport.DevSettingsActivity" />
+		<receiver
+			android:name=".ReplyBroadcast"
+			android:enabled="true"
+			android:exported="false" />
+		<receiver
+			android:name=".DismissNotification"
+			android:enabled="true"
+			android:exported="false" >
+		</receiver>
+		<activity
+				android:noHistory="true"
+				android:name=".share.ShareActivity"
 				android:configChanges="keyboard|keyboardHidden|orientation|screenSize"
 				android:label="@string/share_extension_name"
-            android:noHistory="true"
 				android:screenOrientation="portrait"
-            android:theme="@style/ShareTheme"
-            android:exported="true">
+				android:theme="@style/AppTheme" >
 				<intent-filter>
 					<action android:name="android.intent.action.SEND" />
 					<action android:name="android.intent.action.SEND_MULTIPLE" />
-
 					<category android:name="android.intent.category.DEFAULT" />
 					<data android:mimeType="*/*" />
 				</intent-filter>
 		</activity>
+		<meta-data
+				android:name="com.bugsnag.android.API_KEY"
+				android:value="${BugsnagAPIKey}" />
 	</application>
-    <queries>
-        <package android:name="org.jitsi.meet" />
-            <intent>
-                <action android:name="android.intent.action.SEND" />
-            </intent>
-    </queries>
+
 </manifest>
--- a/android/app/src/main/assets/fonts/Inter-Bold.otf
+++ b/android/app/src/main/assets/fonts/Inter-Bold.otf
--- a/android/app/src/main/assets/fonts/Inter-Medium.otf
+++ b/android/app/src/main/assets/fonts/Inter-Medium.otf
--- a/android/app/src/main/assets/fonts/Inter-Regular.otf
+++ b/android/app/src/main/assets/fonts/Inter-Regular.otf
--- a/android/app/src/main/assets/fonts/Inter-SemiBold.otf
+++ b/android/app/src/main/assets/fonts/Inter-SemiBold.otf
--- a/android/app/src/main/assets/fonts/custom.ttf
+++ b/android/app/src/main/assets/fonts/custom.ttf
--- a/android/app/src/main/ic_launcher-web.png
+++ b/android/app/src/main/ic_launcher-web.png
--- a/android/app/src/main/java/chat/rocket/reactnative/CustomPushNotification.java
+++ b/android/app/src/main/java/chat/rocket/reactnative/CustomPushNotification.java
@ -0,0 +1,303 @@
+package chat.rocket.reactnative;
+
+import android.app.Notification;
+import android.app.NotificationChannel;
+import android.app.NotificationManager;
+import android.app.PendingIntent;
+import android.app.RemoteInput;
+import android.content.Intent;
+import android.content.Context;
+import android.content.res.Resources;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.drawable.Icon;
+import android.os.Build;
+import android.os.Bundle;
+import android.app.Person;
+
+import com.google.gson.*;
+import com.bumptech.glide.Glide;
+import com.bumptech.glide.load.resource.bitmap.RoundedCorners;
+import com.bumptech.glide.request.RequestOptions;
+import java.util.concurrent.ExecutionException;
+import java.lang.InterruptedException;
+
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.wix.reactnativenotifications.core.AppLaunchHelper;
+import com.wix.reactnativenotifications.core.AppLifecycleFacade;
+import com.wix.reactnativenotifications.core.JsIOHelper;
+import com.wix.reactnativenotifications.core.notification.PushNotification;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.ArrayList;
+import java.util.Date;
+
+import static com.wix.reactnativenotifications.Defs.NOTIFICATION_RECEIVED_EVENT_NAME;
+
+public class CustomPushNotification extends PushNotification {
+    public static ReactApplicationContext reactApplicationContext;
+
+    public CustomPushNotification(Context context, Bundle bundle, AppLifecycleFacade appLifecycleFacade, AppLaunchHelper appLaunchHelper, JsIOHelper jsIoHelper) {
+        super(context, bundle, appLifecycleFacade, appLaunchHelper, jsIoHelper);
+        reactApplicationContext = new ReactApplicationContext(context);
+    }
+
+    private static Map<String, List<Bundle>> notificationMessages = new HashMap<String, List<Bundle>>();
+    public static String KEY_REPLY = "KEY_REPLY";
+    public static String NOTIFICATION_ID = "NOTIFICATION_ID";
+
+    public static void clearMessages(int notId) {
+        notificationMessages.remove(Integer.toString(notId));
+    }
+
+    @Override
+    public void onReceived() throws InvalidNotificationException {
+        final Bundle bundle = mNotificationProps.asBundle();
+
+        String notId = bundle.getString("notId", "1");
+        String title = bundle.getString("title");
+
+        if (notificationMessages.get(notId) == null) {
+            notificationMessages.put(notId, new ArrayList<Bundle>());
+        }
+
+        Gson gson = new Gson();
+        Ejson ejson = gson.fromJson(bundle.getString("ejson", "{}"), Ejson.class);
+
+        boolean hasSender = ejson.sender != null;
+
+        bundle.putLong("time", new Date().getTime());
+        bundle.putString("username", hasSender ? ejson.sender.username : title);
+        bundle.putString("senderId", hasSender ? ejson.sender._id : "1");
+        bundle.putString("avatarUri", ejson.getAvatarUri());
+
+        notificationMessages.get(notId).add(bundle);
+
+        super.postNotification(Integer.parseInt(notId));
+
+        notifyReceivedToJS();
+    }
+
+    @Override
+    public void onOpened() {
+        Bundle bundle = mNotificationProps.asBundle();
+        final String notId = bundle.getString("notId", "1");
+        notificationMessages.remove(notId);
+        digestNotification();
+    }
+
+    @Override
+    protected Notification.Builder getNotificationBuilder(PendingIntent intent) {
+        final Notification.Builder notification = new Notification.Builder(mContext);
+
+        Bundle bundle = mNotificationProps.asBundle();
+        String notId = bundle.getString("notId", "1");
+        String title = bundle.getString("title");
+        String message = bundle.getString("message");
+
+        notification
+            .setContentTitle(title)
+            .setContentText(message)
+            .setContentIntent(intent)
+            .setPriority(Notification.PRIORITY_HIGH)
+            .setDefaults(Notification.DEFAULT_ALL)
+            .setAutoCancel(true);
+
+        Integer notificationId = Integer.parseInt(notId);
+        notificationColor(notification);
+        notificationChannel(notification);
+        notificationIcons(notification, bundle);
+        notificationStyle(notification, notificationId, bundle);
+        notificationReply(notification, notificationId, bundle);
+        notificationDismiss(notification, notificationId);
+
+        return notification;
+    }
+
+    private void notifyReceivedToJS() {
+        mJsIOHelper.sendEventToJS(NOTIFICATION_RECEIVED_EVENT_NAME, mNotificationProps.asBundle(), mAppLifecycleFacade.getRunningReactContext());
+    }
+
+    private Bitmap getAvatar(String uri) {
+        try {
+            return Glide.with(mContext)
+                .asBitmap()
+                .apply(RequestOptions.bitmapTransform(new RoundedCorners(10)))
+                .load(uri)
+                .submit(100, 100)
+                .get();
+        } catch (final ExecutionException | InterruptedException e) {
+            return largeIcon();
+        }
+    }
+
+    private Bitmap largeIcon() {
+        final Resources res = mContext.getResources();
+        String packageName = mContext.getPackageName();
+        int largeIconResId = res.getIdentifier("ic_launcher", "mipmap", packageName);
+        Bitmap largeIconBitmap = BitmapFactory.decodeResource(res, largeIconResId);
+        return largeIconBitmap;
+    }
+
+    private void notificationIcons(Notification.Builder notification, Bundle bundle) {
+        final Resources res = mContext.getResources();
+        String packageName = mContext.getPackageName();
+
+        int smallIconResId = res.getIdentifier("ic_notification", "mipmap", packageName);
+
+        Gson gson = new Gson();
+        Ejson ejson = gson.fromJson(bundle.getString("ejson", "{}"), Ejson.class);
+
+        notification.setSmallIcon(smallIconResId);
+
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) {
+            notification.setLargeIcon(getAvatar(ejson.getAvatarUri()));
+        }
+    }
+
+    private void notificationChannel(Notification.Builder notification) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            String CHANNEL_ID = "rocketchatrn_channel_01";
+            String CHANNEL_NAME = "All";
+
+            NotificationChannel channel = new NotificationChannel(CHANNEL_ID,
+                                                                  CHANNEL_NAME,
+                                                                  NotificationManager.IMPORTANCE_DEFAULT);
+
+            final NotificationManager notificationManager = (NotificationManager) mContext.getSystemService(Context.NOTIFICATION_SERVICE);
+            notificationManager.createNotificationChannel(channel);
+
+            notification.setChannelId(CHANNEL_ID);
+        }
+    }
+
+    private String extractMessage(String message, Ejson ejson) {
+        if (ejson.type != null && !ejson.type.equals("d")) {
+            int pos = message.indexOf(":");
+            int start = pos == -1 ? 0 : pos + 2;
+            return message.substring(start, message.length());
+        }
+        return message;
+    }
+
+    private void notificationColor(Notification.Builder notification) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            notification.setColor(mContext.getColor(R.color.notification_text));
+        }
+    }
+
+    private void notificationStyle(Notification.Builder notification, int notId, Bundle bundle) {
+        List<Bundle> bundles = notificationMessages.get(Integer.toString(notId));
+
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) {
+            Notification.InboxStyle messageStyle = new Notification.InboxStyle();
+            if (bundles != null) {
+                for (int i = 0; i < bundles.size(); i++) {
+                    Bundle data = bundles.get(i);
+                    String message = data.getString("message");
+
+                    messageStyle.addLine(message);
+                }
+            }
+
+            notification.setStyle(messageStyle);
+        } else {
+            Notification.MessagingStyle messageStyle;
+
+            Gson gson = new Gson();
+            Ejson ejson = gson.fromJson(bundle.getString("ejson", "{}"), Ejson.class);
+
+            if (Build.VERSION.SDK_INT < Build.VERSION_CODES.P) {
+                messageStyle = new Notification.MessagingStyle("");
+            } else {
+                Person sender = new Person.Builder()
+                    .setKey("")
+                    .setName("")
+                    .build();
+                messageStyle = new Notification.MessagingStyle(sender);
+            }
+
+            String title = bundle.getString("title");
+            messageStyle.setConversationTitle(title);
+
+            if (bundles != null) {
+                for (int i = 0; i < bundles.size(); i++) {
+                    Bundle data = bundles.get(i);
+
+                    long timestamp = data.getLong("time");
+                    String message = data.getString("message");
+                    String username = data.getString("username");
+                    String senderId = data.getString("senderId");
+                    String avatarUri = data.getString("avatarUri");
+
+                    String m = extractMessage(message, ejson);
+
+                    if (Build.VERSION.SDK_INT < Build.VERSION_CODES.P) {
+                        messageStyle.addMessage(m, timestamp, username);
+                    } else {
+                        Bitmap avatar = getAvatar(avatarUri);
+
+                        Person.Builder sender = new Person.Builder()
+                            .setKey(senderId)
+                            .setName(username);
+
+                        if (avatar != null) {
+                            sender.setIcon(Icon.createWithBitmap(avatar));
+                        }
+
+                        Person person = sender.build();
+
+                        messageStyle.addMessage(m, timestamp, person);
+                    }
+                }
+            }
+
+            notification.setStyle(messageStyle);
+        }
+    }
+
+    private void notificationReply(Notification.Builder notification, int notificationId, Bundle bundle) {
+        String notId = bundle.getString("notId", "1");
+        String ejson = bundle.getString("ejson", "{}");
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N || notId.equals("1") || ejson.equals("{}")) {
+            return;
+        }
+        String label = "Reply";
+
+        final Resources res = mContext.getResources();
+        String packageName = mContext.getPackageName();
+        int smallIconResId = res.getIdentifier("ic_notification", "mipmap", packageName);
+
+        Intent replyIntent = new Intent(mContext, ReplyBroadcast.class);
+        replyIntent.setAction(KEY_REPLY);
+        replyIntent.putExtra("pushNotification", bundle);
+
+        PendingIntent replyPendingIntent = PendingIntent.getBroadcast(mContext, notificationId, replyIntent, PendingIntent.FLAG_UPDATE_CURRENT);
+
+        RemoteInput remoteInput = new RemoteInput.Builder(KEY_REPLY)
+            .setLabel(label)
+            .build();
+
+        CharSequence title = label;
+        Notification.Action replyAction = new Notification.Action.Builder(smallIconResId, title, replyPendingIntent)
+            .addRemoteInput(remoteInput)
+            .setAllowGeneratedReplies(true)
+            .build();
+
+        notification
+            .setShowWhen(true)
+            .addAction(replyAction);
+    }
+
+    private void notificationDismiss(Notification.Builder notification, int notificationId) {
+        Intent intent = new Intent(mContext, DismissNotification.class);
+        intent.putExtra(NOTIFICATION_ID, notificationId);
+
+        PendingIntent dismissPendingIntent = PendingIntent.getBroadcast(mContext, notificationId, intent, 0);
+        
+        notification.setDeleteIntent(dismissPendingIntent);
+    }
+
+}
--- a/android/app/src/main/java/chat/rocket/reactnative/DismissNotification.java
+++ b/android/app/src/main/java/chat/rocket/reactnative/DismissNotification.java
@ -0,0 +1,13 @@
+package chat.rocket.reactnative;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+
+public class DismissNotification extends BroadcastReceiver {
+	@Override
+	public void onReceive(Context context, Intent intent) {
+		int notId = intent.getExtras().getInt(CustomPushNotification.NOTIFICATION_ID);
+		CustomPushNotification.clearMessages(notId);
+	}
+}
--- a/android/app/src/main/java/chat/rocket/reactnative/Ejson.java
+++ b/android/app/src/main/java/chat/rocket/reactnative/Ejson.java
@ -0,0 +1,43 @@
+package chat.rocket.reactnative;
+
+import android.content.SharedPreferences;
+
+import chat.rocket.userdefaults.RNUserDefaultsModule;
+
+public class Ejson {
+    String host;
+    String rid;
+    String type;
+    Sender sender;
+
+    private String TOKEN_KEY = "reactnativemeteor_usertoken-";
+    private SharedPreferences sharedPreferences = RNUserDefaultsModule.getPreferences(CustomPushNotification.reactApplicationContext);
+
+    public String getAvatarUri() {
+        if (type == null) {
+            return null;
+        }
+        return serverURL() + "/avatar/" + this.sender.username + "?rc_token=" + token() + "&rc_uid=" + userId();
+    }
+
+    public String token() {
+        return sharedPreferences.getString(TOKEN_KEY.concat(userId()), "");
+    }
+
+    public String userId() {
+        return sharedPreferences.getString(TOKEN_KEY.concat(serverURL()), "");
+    }
+
+    public String serverURL() {
+        String url = this.host;
+        if (url != null && url.endsWith("/")) {
+            url = url.substring(0, url.length() - 1);
+        }
+        return url;
+    }
+
+    public class Sender {
+        String username;
+        String _id;
+    }
+}
--- a/android/app/src/main/java/chat/rocket/reactnative/MainActivity.java
+++ b/android/app/src/main/java/chat/rocket/reactnative/MainActivity.java
@ -1,28 +1,21 @@
 package chat.rocket.reactnative;

-import android.content.Intent;
-import android.content.res.Configuration;
-import android.os.Bundle;
-
-import com.facebook.react.ReactActivity;
 import com.facebook.react.ReactActivityDelegate;
 import com.facebook.react.ReactRootView;
+import com.swmansion.gesturehandler.react.RNGestureHandlerEnabledRootView;
+import android.os.Bundle;
+import com.facebook.react.ReactFragmentActivity;
+import android.content.Intent;
+import android.content.res.Configuration;
 import com.zoontek.rnbootsplash.RNBootSplash;

-import expo.modules.ReactActivityDelegateWrapper;
-
-public class MainActivity extends ReactActivity {
+public class MainActivity extends ReactFragmentActivity {

    @Override
    protected void onCreate(Bundle savedInstanceState) {
-        RNBootSplash.init(this);
        // https://github.com/software-mansion/react-native-screens/issues/17#issuecomment-424704067
        super.onCreate(null);
-    }
-
-    @Override
-    public void invokeDefaultOnBackPressed() {
-        moveTaskToBack(true);
+        RNBootSplash.init(R.drawable.launch_screen, MainActivity.this);
    }

    /**
@ -34,6 +27,16 @@ public class MainActivity extends ReactActivity {
        return "RocketChatRN";
    }

+    @Override
+    protected ReactActivityDelegate createReactActivityDelegate() {
+      return new ReactActivityDelegate(this, getMainComponentName()) {
+        @Override
+        protected ReactRootView createRootView() {
+         return new RNGestureHandlerEnabledRootView(MainActivity.this);
+        }
+      };
+    }
+
    // from react-native-orientation
    @Override
    public void onConfigurationChanged(Configuration newConfig) {
@ -42,27 +45,5 @@ public class MainActivity extends ReactActivity {
        intent.putExtra("newConfig", newConfig);
        this.sendBroadcast(intent);
    }
-
-    /**
-    * Returns the instance of the {@link ReactActivityDelegate}. There the RootView is created and
-    * you can specify the rendered you wish to use (Fabric or the older renderer).
-    */
-    @Override
-    protected ReactActivityDelegate createReactActivityDelegate() {
-        return new ReactActivityDelegateWrapper(this, new MainActivityDelegate(this, getMainComponentName()));
 }

-    public static class MainActivityDelegate extends ReactActivityDelegate {
-        public MainActivityDelegate(ReactActivity activity, String mainComponentName) {
-            super(activity, mainComponentName);
-        }
-
-        @Override
-        protected ReactRootView createRootView() {
-            ReactRootView reactRootView = new ReactRootView(getContext());
-            // If you opted-in for the New Architecture, we enable the Fabric Renderer.
-            reactRootView.setIsFabric(BuildConfig.IS_NEW_ARCHITECTURE_ENABLED);
-            return reactRootView;
-        }
-    }
-}
--- a/android/app/src/main/java/chat/rocket/reactnative/MainApplication.java
+++ b/android/app/src/main/java/chat/rocket/reactnative/MainApplication.java
@ -1,34 +1,45 @@
 package chat.rocket.reactnative;

 import android.app.Application;
-
+import android.content.Context;
+import android.os.Bundle;
 import androidx.annotation.Nullable;

 import com.facebook.react.PackageList;
+import com.facebook.hermes.reactexecutor.HermesExecutorFactory;
+import com.facebook.react.bridge.JavaScriptExecutorFactory;
 import com.facebook.react.ReactApplication;
+import com.facebook.react.ReactInstanceManager;
 import com.facebook.react.ReactNativeHost;
 import com.facebook.react.ReactPackage;
-import com.facebook.react.config.ReactFeatureFlags;
-import com.facebook.react.ReactInstanceManager;
 import com.facebook.soloader.SoLoader;
-import com.reactnativecommunity.viewpager.RNCViewPagerPackage;
-import com.facebook.react.bridge.JSIModulePackage;
-import com.swmansion.reanimated.ReanimatedJSIModulePackage;
-import android.content.Context;
-import android.content.res.Configuration;
-import expo.modules.ApplicationLifecycleDispatcher;
-import expo.modules.ReactNativeHostWrapper;
 import java.lang.reflect.InvocationTargetException;

+import chat.rocket.reactnative.generated.BasePackageList;
+
+import org.unimodules.adapters.react.ModuleRegistryAdapter;
+import org.unimodules.adapters.react.ReactModuleRegistryProvider;
+import org.unimodules.core.interfaces.SingletonModule;
+
+import com.wix.reactnativenotifications.RNNotificationsPackage;
+import com.wix.reactnativenotifications.core.AppLaunchHelper;
+import com.wix.reactnativenotifications.core.AppLifecycleFacade;
+import com.wix.reactnativenotifications.core.JsIOHelper;
+import com.wix.reactnativenotifications.core.notification.INotificationsApplication;
+import com.wix.reactnativenotifications.core.notification.IPushNotification;
+import com.wix.reactnativekeyboardinput.KeyboardInputPackage;
+
+import com.nozbe.watermelondb.WatermelonDBPackage;
+import com.reactnativecommunity.viewpager.RNCViewPagerPackage;
+
 import java.util.Arrays;
 import java.util.List;

-import chat.rocket.reactnative.newarchitecture.MainApplicationReactNativeHost;
-import chat.rocket.reactnative.networking.SSLPinningPackage;
+public class MainApplication extends Application implements ReactApplication, INotificationsApplication {

-public class MainApplication extends Application implements ReactApplication {
+  private final ReactModuleRegistryProvider mModuleRegistryProvider = new ReactModuleRegistryProvider(new BasePackageList().getPackageList(), null);

-  private final ReactNativeHost mReactNativeHost = new ReactNativeHostWrapper(this, new ReactNativeHost(this) {
+  private final ReactNativeHost mReactNativeHost = new ReactNativeHost(this) {
    @Override
    public boolean getUseDeveloperSupport() {
      return BuildConfig.DEBUG;
@ -38,10 +49,15 @@ public class MainApplication extends Application implements ReactApplication {
    protected List<ReactPackage> getPackages() {
      @SuppressWarnings("UnnecessaryLocalVariable")
      List<ReactPackage> packages = new PackageList(this).getPackages();
+      packages.add(new KeyboardInputPackage(MainApplication.this));
+      packages.add(new RNNotificationsPackage(MainApplication.this));
+      packages.add(new WatermelonDBPackage());
      packages.add(new RNCViewPagerPackage());
-      packages.add(new SSLPinningPackage());
-      List<ReactPackage> additionalModules = new AdditionalModules().getAdditionalModules(MainApplication.this);
-      packages.addAll(additionalModules);
+      // packages.add(new ModuleRegistryAdapter(mModuleRegistryProvider));
+      List<ReactPackage> unimodules = Arrays.<ReactPackage>asList(
+        new ModuleRegistryAdapter(mModuleRegistryProvider)
+      );
+      packages.addAll(unimodules);
      return packages;
    }

@ -50,43 +66,22 @@ public class MainApplication extends Application implements ReactApplication {
      return "index";
    }

-    @Override
-    protected JSIModulePackage getJSIModulePackage() {
-      return new ReanimatedJSIModulePackage();
-    }
-
    @Override
    protected @Nullable String getBundleAssetName() {
      return "app.bundle";
    }
-  });
-
-  private final ReactNativeHost mNewArchitectureNativeHost =
-    new ReactNativeHostWrapper(this, new MainApplicationReactNativeHost(this));
+  };

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

  @Override
  public void onCreate() {
    super.onCreate();
-    // If you opted-in for the New Architecture, we enable the TurboModule system
-    ReactFeatureFlags.useTurboModules = BuildConfig.IS_NEW_ARCHITECTURE_ENABLED;
    SoLoader.init(this, /* native exopackage */ false);
    initializeFlipper(this, getReactNativeHost().getReactInstanceManager());
-    ApplicationLifecycleDispatcher.onApplicationCreate(this);
-  }
-
-  @Override
-  public void onConfigurationChanged(Configuration newConfig) {
-    super.onConfigurationChanged(newConfig);
-    ApplicationLifecycleDispatcher.onConfigurationChanged(this, newConfig);
  }

  /**
@ -104,7 +99,7 @@ public class MainApplication extends Application implements ReactApplication {
         We use reflection here to pick up the class that initializes Flipper,
        since Flipper library is not available in release mode
        */
-        Class<?> aClass = Class.forName("chat.rocket.reactnative.ReactNativeFlipper");
+        Class<?> aClass = Class.forName("chat.rocket.reactnative");
        aClass
            .getMethod("initializeFlipper", Context.class, ReactInstanceManager.class)
            .invoke(null, context, reactInstanceManager);
@ -119,4 +114,15 @@ public class MainApplication extends Application implements ReactApplication {
      }
    }
  }
+
+  @Override
+  public IPushNotification getPushNotification(Context context, Bundle bundle, AppLifecycleFacade defaultFacade, AppLaunchHelper defaultAppLaunchHelper) {
+      return new CustomPushNotification(
+              context,
+              bundle,
+              defaultFacade,
+              defaultAppLaunchHelper,
+              new JsIOHelper()
+      );
+  }
 }
--- a/android/app/src/main/java/chat/rocket/reactnative/ReplyBroadcast.java
+++ b/android/app/src/main/java/chat/rocket/reactnative/ReplyBroadcast.java
@ -11,12 +11,10 @@ import android.content.res.Resources;
 import android.os.Build;
 import android.os.Bundle;
 import android.util.Log;
-
 import java.io.IOException;

 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
-
 import java.util.HashMap;
 import java.util.Map;

@ -27,6 +25,7 @@ import okhttp3.Request;
 import okhttp3.RequestBody;
 import okhttp3.Response;

+import chat.rocket.userdefaults.RNUserDefaultsModule;
 import com.wix.reactnativenotifications.core.NotificationIntentAdapter;

 public class ReplyBroadcast extends BroadcastReceiver {
@ -66,7 +65,7 @@ public class ReplyBroadcast extends BroadcastReceiver {
        final OkHttpClient client = new OkHttpClient();
        final MediaType JSON = MediaType.parse("application/json; charset=utf-8");

-        String json = buildMessage(rid, message.toString(), ejson);
+        String json = buildMessage(rid, message.toString());

        CustomPushNotification.clearMessages(notId);

@ -109,26 +108,19 @@ public class ReplyBroadcast extends BroadcastReceiver {
        return builder.toString();
    }

-    protected String buildMessage(String rid, String message, Ejson ejson) {
+    protected String buildMessage(String rid, String message) {
        Gson gsonBuilder = new GsonBuilder().create();

-        String id = getMessageId();
-
-        String msg = Encryption.shared.encryptMessage(message, id, ejson);
-
        Map msgMap = new HashMap();
-        msgMap.put("_id", id);
+        msgMap.put("_id", getMessageId());
        msgMap.put("rid", rid);
-        msgMap.put("msg", msg);
-        if (msg != message) {
-            msgMap.put("t", "e2e");
-        }
+        msgMap.put("msg", message);
        msgMap.put("tmid", null);

-        Map m = new HashMap();
-        m.put("message", msgMap);
+        Map msg = new HashMap();
+        msg.put("message", msgMap);

-        String json = gsonBuilder.toJson(m);
+        String json = gsonBuilder.toJson(msg);

        return json;
    }
--- a/android/app/src/main/java/chat/rocket/reactnative/generated/BasePackageList.java
+++ b/android/app/src/main/java/chat/rocket/reactnative/generated/BasePackageList.java
@ -0,0 +1,22 @@
+package chat.rocket.reactnative.generated;
+
+import java.util.Arrays;
+import java.util.List;
+import org.unimodules.core.interfaces.Package;
+
+public class BasePackageList {
+  public List<Package> getPackageList() {
+    return Arrays.<Package>asList(
+        new expo.modules.av.AVPackage(),
+        new expo.modules.constants.ConstantsPackage(),
+        new expo.modules.filesystem.FileSystemPackage(),
+        new expo.modules.haptics.HapticsPackage(),
+        new expo.modules.imageloader.ImageLoaderPackage(),
+        new expo.modules.keepawake.KeepAwakePackage(),
+        new expo.modules.localauthentication.LocalAuthenticationPackage(),
+        new expo.modules.permissions.PermissionsPackage(),
+        new expo.modules.videothumbnails.VideoThumbnailsPackage(),
+        new expo.modules.webbrowser.WebBrowserPackage()
+    );
+  }
+}
--- a/android/app/src/main/java/chat/rocket/reactnative/networking/SSLPinningModule.java
+++ b/android/app/src/main/java/chat/rocket/reactnative/networking/SSLPinningModule.java
@ -1,198 +0,0 @@
-package chat.rocket.reactnative.networking;
-
-import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.bridge.ReactContextBaseJavaModule;
-import com.facebook.react.modules.network.NetworkingModule;
-import com.facebook.react.modules.network.CustomClientBuilder;
-import com.facebook.react.modules.network.ReactCookieJarContainer;
-import com.facebook.react.modules.websocket.WebSocketModule;
-import com.facebook.react.modules.fresco.ReactOkHttpNetworkFetcher;
-import com.facebook.react.bridge.ReactMethod;
-import com.facebook.react.bridge.Promise;
-
-import java.net.Socket;
-import java.security.KeyStore;
-import java.security.Principal;
-import java.security.cert.CertificateException;
-import java.security.cert.X509Certificate;
-
-import javax.net.ssl.TrustManagerFactory;
-import javax.net.ssl.X509ExtendedKeyManager;
-import java.security.PrivateKey;
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.X509TrustManager;
-import javax.net.ssl.SSLSocketFactory;
-import javax.net.ssl.TrustManager;
-import okhttp3.OkHttpClient;
-import android.app.Activity;
-import javax.net.ssl.KeyManager;
-import android.security.KeyChain;
-import android.security.KeyChainAliasCallback;
-
-import java.util.Arrays;
-import java.util.concurrent.TimeUnit;
-
-import com.RNFetchBlob.RNFetchBlob;
-
-import com.reactnativecommunity.webview.RNCWebViewManager;
-
-import com.dylanvann.fastimage.FastImageOkHttpUrlLoader;
-
-import expo.modules.av.player.datasource.SharedCookiesDataSourceFactory;
-
-public class SSLPinningModule extends ReactContextBaseJavaModule implements KeyChainAliasCallback {
-
-    private Promise promise;
-    private static String alias;
-    private static ReactApplicationContext reactContext;
-
-    public SSLPinningModule(ReactApplicationContext reactContext) {
-        super(reactContext);
-        this.reactContext = reactContext;
-    }
-
-    public class CustomClient implements CustomClientBuilder {
-        @Override
-        public void apply(OkHttpClient.Builder builder) {
-            if (alias != null) {
-                SSLSocketFactory sslSocketFactory = getSSLFactory(alias);
-                X509TrustManager trustManager = getTrustManagerFactory();
-                if (sslSocketFactory != null) {
-                    builder.sslSocketFactory(sslSocketFactory, trustManager);
-                }
-            }
-        }
-    }
-
-    protected OkHttpClient getOkHttpClient() {
-        OkHttpClient.Builder builder = new OkHttpClient.Builder()
-                .connectTimeout(0, TimeUnit.MILLISECONDS)
-                .readTimeout(0, TimeUnit.MILLISECONDS)
-                .writeTimeout(0, TimeUnit.MILLISECONDS)
-                .cookieJar(new ReactCookieJarContainer());
-
-        if (alias != null) {
-            SSLSocketFactory sslSocketFactory = getSSLFactory(alias);
-            X509TrustManager trustManager = getTrustManagerFactory();
-            if (sslSocketFactory != null) {
-                builder.sslSocketFactory(sslSocketFactory, trustManager);
-            }
-        }
-
-        return builder.build();
-    }
-
-    @Override
-    public String getName() {
-        return "SSLPinning";
-    }
-
-    @Override
-    public void alias(String alias) {
-        this.alias = alias;
-
-        this.promise.resolve(alias);
-    }
-
-    @ReactMethod
-    public void setCertificate(String data, Promise promise) {
-        this.alias = data;
-
-        // HTTP Fetch react-native layer
-        NetworkingModule.setCustomClientBuilder(new CustomClient());
-        // Websocket react-native layer
-        WebSocketModule.setCustomClientBuilder(new CustomClient());
-        // Image networking react-native layer
-        ReactOkHttpNetworkFetcher.setOkHttpClient(getOkHttpClient());
-        // RNFetchBlob networking layer
-        RNFetchBlob.applyCustomOkHttpClient(getOkHttpClient());
-        // RNCWebView onReceivedClientCertRequest
-        RNCWebViewManager.setCertificateAlias(data);
-        // FastImage Glide network layer
-        FastImageOkHttpUrlLoader.setOkHttpClient(getOkHttpClient());
-        // Expo AV network layer
-        SharedCookiesDataSourceFactory.setOkHttpClient(getOkHttpClient());
-
-        promise.resolve(null);
-    }
-
-    @ReactMethod
-    public void pickCertificate(Promise promise) {
-        Activity activity = getCurrentActivity();
-
-        this.promise = promise;
-
-        KeyChain.choosePrivateKeyAlias(activity,
-                this, // Callback
-                null, // Any key types.
-                null, // Any issuers.
-                null, // Any host
-                -1, // Any port
-                "RocketChat");
-    }
-
-    public static SSLSocketFactory getSSLFactory(final String alias) {
-        try {
-            final PrivateKey privKey = KeyChain.getPrivateKey(reactContext, alias);
-            final X509Certificate[] certChain = KeyChain.getCertificateChain(reactContext, alias);
-
-            final X509ExtendedKeyManager keyManager = new X509ExtendedKeyManager() {
-                @Override
-                public String chooseClientAlias(String[] strings, Principal[] principals, Socket socket) {
-                    return alias;
-                }
-
-                @Override
-                public String chooseServerAlias(String s, Principal[] principals, Socket socket) {
-                    return alias;
-                }
-
-                @Override
-                public X509Certificate[] getCertificateChain(String s) {
-                    return certChain;
-                }
-
-                @Override
-                public String[] getClientAliases(String s, Principal[] principals) {
-                    return new String[]{alias};
-                }
-
-                @Override
-                public String[] getServerAliases(String s, Principal[] principals) {
-                    return new String[]{alias};
-                }
-
-                @Override
-                public PrivateKey getPrivateKey(String s) {
-                    return privKey;
-                }
-            };
-
-            final X509TrustManager trustManager = getTrustManagerFactory();
-            final SSLContext sslContext = SSLContext.getInstance("TLS");
-            sslContext.init(new KeyManager[]{keyManager}, new TrustManager[]{trustManager}, new java.security.SecureRandom());
-            SSLContext.setDefault(sslContext);
-
-            final SSLSocketFactory sslSocketFactory = sslContext.getSocketFactory();
-
-            return sslSocketFactory;
-        } catch (Exception e) {
-            return null;
-        }
-    }
-
-    public static X509TrustManager getTrustManagerFactory() {
-        try {
-            TrustManagerFactory trustManagerFactory = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
-            trustManagerFactory.init((KeyStore) null);
-            TrustManager[] trustManagers = trustManagerFactory.getTrustManagers();
-            if (trustManagers.length != 1 || !(trustManagers[0] instanceof X509TrustManager)) {
-                throw new IllegalStateException("Unexpected default trust managers:" + Arrays.toString(trustManagers));
-            }
-            final X509TrustManager trustManager = (X509TrustManager) trustManagers[0];
-            return trustManager;
-        } catch (Exception e) {
-            return null;
-        }
-    }
-}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Dan Caseley	e19665e3e6	Merge branch 'develop' into chore.circleci_caching	2020-07-26 13:44:11 +01:00
Dan Caseley	8c072c3b82	Merge branch 'develop' into chore.circleci_caching	2020-07-22 22:10:14 +01:00
Dan Caseley	f44ad00f85	Prevent brew auto-cleanup	2020-07-22 21:03:41 +01:00
Dan Caseley	905a3364cf	Prevent brew auto-update	2020-07-22 21:01:51 +01:00
Dan Caseley	082a36ad85	Invalidate previous app caches	2020-07-22 16:47:46 +01:00
Dan Caseley	5de294bfd3	Only cache downloaded Brew things	2020-07-22 13:45:45 +01:00
Dan Caseley	cd3ede8903	Don't key brew caching on unrelated things - any hit is better than none	2020-07-22 13:45:45 +01:00
Dan Caseley	93771b67ad	Remove unused "brew update" Brew version is maintained by Circle, and we don't care about formulae	2020-07-22 13:45:45 +01:00
Dan Caseley	b76fed827d	Remove debugging steps	2020-07-22 11:08:28 +01:00
Dan Caseley	8911a3b0d1	Don't install simulator utils for building	2020-07-22 11:03:18 +01:00
Dan Caseley	d78cfd59c3	Fix fancy quotes for useful ones Note to self: Don't copy-n-paste	2020-07-22 09:13:51 +01:00
Dan Caseley	0e5389539c	Debug output for app cache restore check	2020-07-21 17:42:31 +01:00
Dan Caseley	ebcdc3eb5d	Fix app cache check - apps are directories not files	2020-07-21 17:00:15 +01:00
Dan Caseley	19c129d4d7	Merge branch 'develop' into chore.circleci_caching	2020-07-21 16:58:04 +01:00
Dan Caseley	b679c6894f	Try caching built iOS app	2020-07-21 12:01:17 +01:00
Dan Caseley	e509a7a6e8	Move YAML anchors to CircleCI commands	2020-07-20 16:37:51 +01:00