Merge beta into master

.circleci/config.yml

@@ -3,7 +3,7 @@ defaults: &defaults
 
 macos: &macos
   macos:
-    xcode: "11.5.0"
+    xcode: "12.1.0"
 
 bash-env: &bash-env
   BASH_ENV: "~/.nvm/nvm.sh"
@@ -343,12 +343,11 @@ jobs:
             agvtool new-version -all $CIRCLE_BUILD_NUM
             /usr/libexec/PlistBuddy -c "Set BugsnagAPIKey $BUGSNAG_KEY" ./RocketChatRN/Info.plist
 
-            if [[ $MATCH_KEYCHAIN_NAME ]]; then
+            if [[ $APP_STORE_CONNECT_API_KEY ]]; then
+              echo $APP_STORE_CONNECT_API_KEY | base64 --decode > ./fastlane/app_store_connect_api_key.p8
               bundle exec fastlane ios release
             else
-              export MATCH_KEYCHAIN_NAME="temp"
-              export MATCH_KEYCHAIN_PASSWORD="temp"
-              bundle exec fastlane ios build
+              bundle exec fastlane ios build_fork
             fi
           working_directory: ios
 
@@ -381,6 +380,7 @@ jobs:
       - run:
           name: Fastlane Tesflight Upload
           command: |
+            echo $APP_STORE_CONNECT_API_KEY | base64 --decode > ./fastlane/app_store_connect_api_key.p8
             bundle exec fastlane ios beta
           working_directory: ios
 

.gitignore

@@ -61,4 +61,6 @@ coverage
 artifacts
 .vscode/
 e2e/docker/rc_test_env/docker-compose.yml
-e2e/docker/data/db
+e2e/docker/data/db
+
+*.p8

README.md

@@ -7,7 +7,7 @@
 
 - **Supported server versions:** 0.70.0+
 - **Supported iOS versions**: 11+
-- **Supported Android versions**: 5.0+
+- **Supported Android versions**: 6.0+
 
 ## Download
 
@@ -35,7 +35,7 @@ Do you want to make the app run on your own server only? [Follow our whitelabel
 
 ## 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).
+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).
 
 ### 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)
+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)

__mocks__/expo-keep-awake.js

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

__mocks__/react-native-gesture-handler.js

@@ -1,5 +1,5 @@
-export const RectButton = () => 'View';
+export const RectButton = ({ children }) => children;
 export const State = () => 'View';
-export const LongPressGestureHandler = () => 'View';
-export const BorderlessButton = () => 'View';
-export const PanGestureHandler = () => 'View';
+export const LongPressGestureHandler = ({ children }) => children;
+export const BorderlessButton = ({ children }) => children;
+export const PanGestureHandler = ({ children }) => children;

__tests__/Storyshots.test.js

@@ -1,3 +1,6 @@
 import initStoryshots from '@storybook/addon-storyshots';
 
+jest.mock('../app/lib/database', () => jest.fn(() => null));
+global.Date.now = jest.fn(() => new Date('2019-10-10').getTime());
+
 initStoryshots();