Merge branch 'develop' into fix-moment-helper-locales

RocketChat · Nov 3, 2020 · 787fb69 · 787fb69
2 parents 4f482a4 + bfa4dff
commit 787fb69
Show file tree

Hide file tree

Showing 564 changed files with 95,897 additions and 28,379 deletions.
diff --git a/.circleci/config.yml b/.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"
@@ -347,7 +347,7 @@ jobs:
               echo $APP_STORE_CONNECT_API_KEY | base64 --decode > ./fastlane/app_store_connect_api_key.p8
               bundle exec fastlane ios release
             else
-              bundle exec fastlane ios build
+              bundle exec fastlane ios build_fork
             fi
           working_directory: ios
 

diff --git a/__mocks__/expo-keep-awake.js b/__mocks__/expo-keep-awake.js
@@ -1,4 +1,4 @@
-export default {
-	activateKeepAwake: () => '',
-	deactivateKeepAwake: () => ''
-};
+const activateKeepAwake = () => '';
+const deactivateKeepAwake = () => '';
+
+export { activateKeepAwake, deactivateKeepAwake };
diff --git a/__mocks__/react-native-gesture-handler.js b/__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;