Merge branch 'develop' into new.biometrics

# Conflicts:
#	__mocks__/react-native-device-info.js
#	__tests__/__snapshots__/Storyshots.test.js.snap
#	android/app/src/main/java/chat/rocket/reactnative/generated/BasePackageList.java
#	ios/Podfile.lock
#	ios/Pods/Local Podspecs/EXWebBrowser.podspec.json
#	ios/Pods/Local Podspecs/RNDeviceInfo.podspec.json
#	ios/Pods/Local Podspecs/ReactNativeKeyboardTrackingView.podspec.json
#	ios/Pods/Local Podspecs/UMAppLoader.podspec.json
#	ios/Pods/Local Podspecs/UMCore.podspec.json
#	ios/Pods/Manifest.lock
#	ios/Pods/Pods.xcodeproj/project.pbxproj
#	ios/Pods/Target Support Files/EXImageLoader/EXImageLoader.xcconfig
#	ios/Pods/Target Support Files/EXKeepAwake/EXKeepAwake-prefix.pch
#	ios/Pods/Target Support Files/EXLocalAuthentication/EXLocalAuthentication-prefix.pch
#	ios/Pods/Target Support Files/Pods-RocketChatRN/Pods-RocketChatRN-acknowledgements.markdown
#	ios/Pods/Target Support Files/Pods-RocketChatRN/Pods-RocketChatRN-acknowledgements.plist
#	ios/Pods/Target Support Files/Pods-RocketChatRN/Pods-RocketChatRN.debug.xcconfig
#	ios/Pods/Target Support Files/Pods-RocketChatRN/Pods-RocketChatRN.release.xcconfig
#	ios/Pods/Target Support Files/Pods-ShareRocketChatRN/Pods-ShareRocketChatRN-acknowledgements.markdown
#	ios/Pods/Target Support Files/Pods-ShareRocketChatRN/Pods-ShareRocketChatRN-acknowledgements.plist
#	ios/Pods/Target Support Files/Pods-ShareRocketChatRN/Pods-ShareRocketChatRN.debug.xcconfig
#	ios/Pods/Target Support Files/Pods-ShareRocketChatRN/Pods-ShareRocketChatRN.release.xcconfig
#	ios/Pods/Target Support Files/SocketRocket/SocketRocket-prefix.pch
#	ios/Pods/Target Support Files/UMAppLoader/UMAppLoader.xcconfig
#	ios/Pods/Target Support Files/UMReactNativeAdapter/UMReactNativeAdapter.xcconfig
#	package.json
#	yarn.lock

.circleci/config.yml

@@ -6,7 +6,7 @@ jobs:
   lint-testunit:
     <<: *defaults
     docker:
-      - image: circleci/node:8
+      - image: circleci/node:10
 
     environment:
       CODECOV_TOKEN: caa771ab-3d45-4756-8e2a-e1f25996fef6
@@ -59,13 +59,13 @@ jobs:
           key: node-v1-mac-{{ checksum "yarn.lock" }}
 
       - run:
-          name: Install Node 8
+          name: Install Node 10
           command: |
             curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.33.6/install.sh | bash
             source ~/.nvm/nvm.sh
             # https://github.com/creationix/nvm/issues/1394
             set +e
-            nvm install 8
+            nvm install 10
 
       - run:
           name: Install appleSimUtils
@@ -120,13 +120,13 @@ jobs:
           key: node-v1-mac-{{ checksum "yarn.lock" }}
 
       - run:
-          name: Install Node 8
+          name: Install Node 10
           command: |
             curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.33.6/install.sh | bash
             source ~/.nvm/nvm.sh
             # https://github.com/creationix/nvm/issues/1394
             set +e
-            nvm install 8
+            nvm install 10
 
       - run:
           name: Install appleSimUtils
@@ -176,14 +176,14 @@ jobs:
       - checkout
 
       - run:
-          name: Install Node 8
+          name: Install Node 10
           command: |
             curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.33.6/install.sh | bash
             source ~/.nvm/nvm.sh
             # https://github.com/creationix/nvm/issues/1394
             set +e
-            nvm install 8
-            echo 'export PATH="/home/circleci/.nvm/versions/node/v8.16.0/bin:$PATH"' >> ~/.bash_profile
+            nvm install 10
+            echo 'export PATH="/home/circleci/.nvm/versions/node/v10.20.1/bin:$PATH"' >> ~/.bash_profile
             source ~/.bash_profile
 
       - restore_cache:
@@ -206,6 +206,7 @@ jobs:
             # echo -e "android.enableAapt2=false" >> ./gradle.properties
             echo -e "android.useAndroidX=true" >> ./gradle.properties
             echo -e "android.enableJetifier=true" >> ./gradle.properties
+            echo -e "FLIPPER_VERSION=0.33.1" >> ./gradle.properties
 
             if [[ $KEYSTORE ]]; then
               echo $KEYSTORE_BASE64 | base64 --decode > ./app/$KEYSTORE
@@ -234,8 +235,7 @@ jobs:
           name: Build Android App
           command: |
             if [[ $KEYSTORE ]]; then
-              # TODO: enable app bundle again
-              ./gradlew assembleRelease
+              ./gradlew bundleRelease
             else
               ./gradlew assembleDebug
             fi
@@ -292,13 +292,13 @@ jobs:
           key: node-v1-mac-{{ checksum "yarn.lock" }}
 
       - run:
-          name: Install Node 8
+          name: Install Node 10
           command: |
             curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.33.6/install.sh | bash
             source ~/.nvm/nvm.sh
             # https://github.com/creationix/nvm/issues/1394
             set +e
-            nvm install 8
+            nvm install 10
 
       - run:
           name: Install NPM modules

.eslintrc.js

@@ -132,7 +132,23 @@ module.exports = {
 		"react-native/no-unused-styles": 2,
 		"react/jsx-one-expression-per-line": 0,
 		"require-await": 2,
-		"func-names": 0
+		"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

.gitignore

@@ -42,6 +42,7 @@ coverage/
 buck-out/
 \.buckd/
 *.keystore
+*.jks
 
 # fastlane
 #

__mocks__/expo-keep-awake.js

@@ -0,0 +1,4 @@
+export default {
+	activateKeepAwake: () => '',
+	deactivateKeepAwake: () => ''
+};

__mocks__/react-native-device-info.js

@@ -3,5 +3,5 @@ export default {
 	getReadableVersion: () => '',
 	getBundleId: () => '',
 	isTablet: () => false,
-	hasNotch: () => ''
+	hasNotch: () => false
 };