Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -358,7 +358,7 @@ jobs:
lint-testunit:
<<: *defaults
docker:
- image: circleci/node:10
- image: circleci/node:15

environment:
CODECOV_TOKEN: caa771ab-3d45-4756-8e2a-e1f25996fef6
Expand Down
1 change: 1 addition & 0 deletions .husky/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
_
4 changes: 4 additions & 0 deletions .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/bin/sh
. "$(dirname "$0")/_/husky.sh"

npm run precommit
1 change: 0 additions & 1 deletion app/containers/MessageErrorActions.js
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,6 @@ const MessageErrorActions = forwardRef(({ tmid }, ref) => {
}));
});
MessageErrorActions.propTypes = {
message: PropTypes.object,
tmid: PropTypes.string
};

Expand Down
4 changes: 2 additions & 2 deletions app/sagas/init.js
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,8 @@ const restore = function* restore() {
}
};

const start = function start() {
RNBootSplash.hide();
const start = function* start() {
yield RNBootSplash.hide();
};

const root = function* root() {
Expand Down
2 changes: 1 addition & 1 deletion app/utils/localAuthentication.js
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ export const localAuthenticate = async(server) => {
// if screen lock is enabled
if (serverRecord?.autoLock) {
// Make sure splash screen has been hidden
RNBootSplash.hide();
await RNBootSplash.hide();

// Check if the app has passcode
const result = await checkHasPasscode({ serverRecord });
Expand Down
2 changes: 1 addition & 1 deletion app/views/SettingsView/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import {
import PropTypes from 'prop-types';
import { connect } from 'react-redux';
import FastImage from '@rocket.chat/react-native-fast-image';
import CookieManager from '@react-native-community/cookies';
import CookieManager from '@react-native-cookies/cookies';

import { logout as logoutAction } from '../../actions/login';
import { selectServerRequest as selectServerRequestAction } from '../../actions/server';
Expand Down
100 changes: 50 additions & 50 deletions ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ PODS:
- EXPermissions (9.0.1):
- UMCore
- UMPermissionsInterface
- EXVideoThumbnails (5.0.0):
- EXVideoThumbnails (5.1.0):
- UMCore
- UMFileSystemInterface
- EXWebBrowser (8.3.1):
Expand Down Expand Up @@ -364,36 +364,36 @@ PODS:
- React-jsinspector (0.63.4)
- react-native-appearance (0.3.4):
- React
- react-native-background-timer (2.2.0):
- React
- react-native-background-timer (2.4.1):
- React-Core
- react-native-blur (0.8.0):
- React
- react-native-cameraroll (4.0.1):
- React
- react-native-cookies (4.0.0):
- React
- react-native-document-picker (3.5.3):
- React
- react-native-cameraroll (4.0.4):
- React-Core
- react-native-cookies (6.0.8):
- React-Core
- react-native-document-picker (5.2.0):
- React-Core
- react-native-jitsi-meet (2.4.0):
- JitsiMeetSDK
- React
- react-native-mmkv-storage (0.3.5):
- MMKV (= 1.2.1)
- React
- react-native-netinfo (5.9.9):
- react-native-netinfo (6.0.0):
- React-Core
- react-native-notifications (2.1.7):
- React
- react-native-orientation-locker (1.1.8):
- React
- react-native-restart (0.0.17):
- React
- react-native-safe-area-context (3.1.1):
- React
- react-native-orientation-locker (1.3.1):
- React-Core
- react-native-restart (0.0.22):
- React-Core
- react-native-safe-area-context (3.2.0):
- React-Core
- react-native-simple-crypto (0.4.0):
- OpenSSL-Universal
- React
- react-native-slider (3.0.2):
- react-native-slider (3.0.3):
- React
- react-native-webview (10.3.2):
- React
Expand Down Expand Up @@ -465,20 +465,20 @@ PODS:
- React
- rn-fetch-blob (0.12.0):
- React-Core
- RNBootSplash (2.2.5):
- React
- RNCAsyncStorage (1.11.0):
- React
- RNCMaskedView (0.1.10):
- RNBootSplash (3.2.4):
- React-Core
- RNCAsyncStorage (1.12.1):
- React-Core
- RNCMaskedView (0.1.11):
- React
- RNConfigReader (1.0.0):
- React
- RNCPicker (1.8.1):
- React-Core
- RNDateTimePicker (2.6.0):
- React
- RNDeviceInfo (5.6.2):
- React
- RNDateTimePicker (3.5.2):
- React-Core
- RNDeviceInfo (8.1.3):
- React-Core
- RNFastImage (8.2.0):
- React
- SDWebImage (~> 5.0)
Expand Down Expand Up @@ -506,16 +506,16 @@ PODS:
- React-Core
- React-RCTImage
- TOCropViewController
- RNLocalize (1.4.0):
- React
- RNLocalize (2.1.1):
- React-Core
- RNReanimated (1.9.0):
- React
- RNRootView (1.0.3):
- React
- RNScreens (2.9.0):
- React
- RNVectorIcons (7.0.0):
- React
- RNVectorIcons (8.1.0):
- React-Core
- SDWebImage (5.8.4):
- SDWebImage/Core (= 5.8.4)
- SDWebImage/Core (5.8.4)
Expand Down Expand Up @@ -599,7 +599,7 @@ DEPENDENCIES:
- react-native-background-timer (from `../node_modules/react-native-background-timer`)
- "react-native-blur (from `../node_modules/@react-native-community/blur`)"
- "react-native-cameraroll (from `../node_modules/@react-native-community/cameraroll`)"
- "react-native-cookies (from `../node_modules/@react-native-community/cookies`)"
- "react-native-cookies (from `../node_modules/@react-native-cookies/cookies`)"
- react-native-document-picker (from `../node_modules/react-native-document-picker`)
- react-native-jitsi-meet (from `../node_modules/react-native-jitsi-meet`)
- react-native-mmkv-storage (from `../node_modules/react-native-mmkv-storage`)
Expand Down Expand Up @@ -759,7 +759,7 @@ EXTERNAL SOURCES:
react-native-cameraroll:
:path: "../node_modules/@react-native-community/cameraroll"
react-native-cookies:
:path: "../node_modules/@react-native-community/cookies"
:path: "../node_modules/@react-native-cookies/cookies"
react-native-document-picker:
:path: "../node_modules/react-native-document-picker"
react-native-jitsi-meet:
Expand Down Expand Up @@ -895,7 +895,7 @@ SPEC CHECKSUMS:
EXKeepAwake: 8b0f68242f036b971f9f8976341823cbe6f50812
EXLocalAuthentication: 985c65e08a6eb84f8f98b51f7435df138b18b9e8
EXPermissions: 80ac3acbdb145930079810fe5b08c022b3428aa8
EXVideoThumbnails: 0be939563a5d46ce0d1fa9baea7d454b99475763
EXVideoThumbnails: cd257fc6e07884a704a5674d362a6410933acb68
EXWebBrowser: d37a5ffdea1b65947352bc001dd9f732463725d4
FBLazyVector: 3bb422f41b18121b71783a905c10e58606f7dc3e
FBReactNativeSpec: f2c97f2529dd79c083355182cc158c9f98f4bd6e
Expand Down Expand Up @@ -937,20 +937,20 @@ SPEC CHECKSUMS:
React-jsiexecutor: 93bd528844ad21dc07aab1c67cb10abae6df6949
React-jsinspector: 58aef7155bc9a9683f5b60b35eccea8722a4f53a
react-native-appearance: 0f0e5fc2fcef70e03d48c8fe6b00b9158c2ba8aa
react-native-background-timer: 1f7d560647b40e6a60b01c452ba29c54bf581fc4
react-native-background-timer: 17ea5e06803401a379ebf1f20505b793ac44d0fe
react-native-blur: cad4d93b364f91e7b7931b3fa935455487e5c33c
react-native-cameraroll: 60ba0068826eab1c8d43146191bafd4363ea58a7
react-native-cookies: d79e5015a5d3a38e08f5cb39c4948532be7e9c2b
react-native-document-picker: 825552b827012282baf4b7cbf119d3b37a280c90
react-native-cameraroll: 88f4e62d9ecd0e1f253abe4f685474f2ea14bfa2
react-native-cookies: 2cb6ef472da68610dfcf0eaee68464c244943abd
react-native-document-picker: f1b5398801b332c77bc62ae0eae2116f49bdff26
react-native-jitsi-meet: f2407aca85566e031ee7b222e497ee5ecb6623de
react-native-mmkv-storage: 48729fe90e850ef2fdc9d3714b7030c7c51d82b0
react-native-netinfo: 0212ce8604e88edf686f1481b925b17a42a52449
react-native-netinfo: e849fc21ca2f4128a5726c801a82fc6f4a6db50d
react-native-notifications: ee8fd739853e72694f3af8b374c8ccb106b7b227
react-native-orientation-locker: f0ca1a8e5031dab6b74bfb4ab33a17ed2c2fcb0d
react-native-restart: d19a0f8d053d065fe64cd2baebb6487111c77149
react-native-safe-area-context: 344b969c45af3d8464d36e8dea264942992ef033
react-native-orientation-locker: 998c0744e26624407dac068c04c605b4af7304a2
react-native-restart: 733a51ad137f15b0f8dc34c4082e55af7da00979
react-native-safe-area-context: f0906bf8bc9835ac9a9d3f97e8bde2a997d8da79
react-native-simple-crypto: 564740fd8124827d82e9e8ded4a0de8c695c8a4d
react-native-slider: 0221b417686c5957f6e77cd9ac22c1478a165355
react-native-slider: e99fc201cefe81270fc9d81714a7a0f5e566b168
react-native-webview: 679b6f400176e2ea8a785acf7ae16cf282e7d1eb
React-RCTActionSheet: 89a0ca9f4a06c1f93c26067af074ccdce0f40336
React-RCTAnimation: 1bde3ecc0c104c55df246eda516e0deb03c4e49b
Expand All @@ -966,24 +966,24 @@ SPEC CHECKSUMS:
ReactNativeUiLib: cde7263a7d308b60161cd286f95c9433e79f2f7d
rn-extensions-share: 5fd84a80e6594706f0dfa1884f2d6d591b382cf5
rn-fetch-blob: f065bb7ab7fb48dd002629f8bdcb0336602d3cba
RNBootSplash: b3836aa90c5bec690c6cd3c9ab355fcf98d0fe1d
RNCAsyncStorage: d059c3ee71738c39834a627476322a5a8cd5bf36
RNCMaskedView: 5a8ec07677aa885546a0d98da336457e2bea557f
RNBootSplash: 4844706cbb56a3270556c9b94e59dedadccd47e4
RNCAsyncStorage: b03032fdbdb725bea0bd9e5ec5a7272865ae7398
RNCMaskedView: 0e1bc4bfa8365eba5fbbb71e07fbdc0555249489
RNConfigReader: 396da6a6444182a76e8ae0930b9436c7575045cb
RNCPicker: 914b557e20b3b8317b084aca9ff4b4edb95f61e4
RNDateTimePicker: e386ff4ef3300964ed0cad97ce6f206e0effbfdb
RNDeviceInfo: ed8557a8bd6443cbc0ab5d375e6808a38a279744
RNDateTimePicker: 7658208086d86d09e1627b5c34ba0cf237c60140
RNDeviceInfo: 8d3a29207835f972bce883723882980143270d55
RNFastImage: f40d202ea2367239f71bc7cf11315f4bebab85b4
RNFBAnalytics: dae6d7b280ba61c96e1bbdd34aca3154388f025e
RNFBApp: 6fd8a7e757135d4168bf033a8812c241af7363a0
RNFBCrashlytics: 88de72c2476b5868a892d9523b89b86c527c540e
RNGestureHandler: 8f09cd560f8d533eb36da5a6c5a843af9f056b38
RNImageCropPicker: 38865ab4af1b0b2146ad66061196bc0184946855
RNLocalize: b6df30cc25ae736d37874f9bce13351db2f56796
RNLocalize: 82a569022724d35461e2dc5b5d015a13c3ca995b
RNReanimated: b5ccb50650ba06f6e749c7c329a1bc3ae0c88b43
RNRootView: 895a4813dedeaca82db2fa868ca1c333d790e494
RNScreens: c526239bbe0e957b988dacc8d75ac94ec9cb19da
RNVectorIcons: da6fe858f5a65d7bbc3379540a889b0b12aa5976
RNVectorIcons: 31cebfcf94e8cf8686eb5303ae0357da64d7a5a4
SDWebImage: cf6922231e95550934da2ada0f20f2becf2ceba9
SDWebImageWebPCoder: 36f8f47bd9879a8aea6044765c1351120fd8e3a8
TOCropViewController: 20a14b6a7a098308bf369e7c8d700dc983a974e6
Expand All @@ -1005,4 +1005,4 @@ SPEC CHECKSUMS:

PODFILE CHECKSUM: 0351d0973911a397f1cb4e45f0b0f590b14816e3

COCOAPODS: 1.9.3
COCOAPODS: 1.10.1
1 change: 1 addition & 0 deletions ios/Pods/Headers/Private/RNDeviceInfo/EnvironmentUtil.h

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions ios/Pods/Headers/Public/RNDeviceInfo/EnvironmentUtil.h

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion ios/Pods/Local Podspecs/EXVideoThumbnails.podspec.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions ios/Pods/Local Podspecs/RNBootSplash.podspec.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions ios/Pods/Local Podspecs/RNCAsyncStorage.podspec.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions ios/Pods/Local Podspecs/RNCMaskedView.podspec.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions ios/Pods/Local Podspecs/RNDateTimePicker.podspec.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions ios/Pods/Local Podspecs/RNDeviceInfo.podspec.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading