RN v0.61 -> v0.62 upgrade followup

android/app/src/main/java/com/zulipmobile/generated/BasePackageList.java

@@ -12,7 +12,8 @@ public List<Package> getPackageList() {
         new expo.modules.filesystem.FileSystemPackage(),
         new expo.modules.imageloader.ImageLoaderPackage(),
         new expo.modules.permissions.PermissionsPackage(),
-        new expo.modules.screenorientation.ScreenOrientationPackage()
+        new expo.modules.screenorientation.ScreenOrientationPackage(),
+        new expo.modules.splashscreen.SplashScreenPackage()
     );
   }
 }

android/build.gradle

@@ -52,10 +52,6 @@ allprojects {
     }
 }
 
-project(":react-native-device-info").beforeEvaluate {
-    ext.googlePlayServicesVersion = "16.1.0"
-}
-
 subprojects {
     afterEvaluate {
         if (project.hasProperty("android")) {

flow-typed/npm/react-redux_v5.x.x.js → flow-typed/npm/react-redux_v7.x.x.js

@@ -1,5 +1,5 @@
-// flow-typed signature: be1a6a9041ded9d5eb2308664fa10a77
-// flow-typed version: c6154227d1/react-redux_v5.x.x/flow_>=v0.89.x <=v0.103.x
+// flow-typed signature: 8da1e134b3de1d6f6bf9ba1cc7e2dc7e
+// flow-typed version: 387a235736/react-redux_v7.x.x/flow_>=v0.104.x
 
 /**
 The order of type arguments for connect() is as follows:
@@ -27,6 +27,7 @@ Decrypting the abbreviations:
   RMP = Returned merge props
   CP = Props for returned component
   Com = React Component
+  SS = Selected state
   ST = Static properties of Com
   EFO = Extra factory options (used only in connectAdvanced)
 */
@@ -38,7 +39,7 @@ declare module "react-redux" {
 
   declare export type Options<S, OP, SP, MP> = {|
     pure?: boolean,
-    withRef?: boolean,
+    forwardRef?: boolean,
     areStatesEqual?: (next: S, prev: S) => boolean,
     areOwnPropsEqual?: (next: OP, prev: OP) => boolean,
     areStatePropsEqual?: (next: SP, prev: SP) => boolean,
@@ -198,13 +199,27 @@ declare module "react-redux" {
     options?: ?Options<S, OP, SP, P>,
   ): Connector<P, OP, P>;
 
+  // ------------------------------------------------------------
+  // Typings for Hooks
+  // ------------------------------------------------------------
+
+  declare export function useDispatch<D>(): D;
+
+  declare export function useSelector<S, SS>(
+    selector: (state: S) => SS,
+    equalityFn?: (a: SS, b: SS) => boolean,
+  ): SS;
+
+  declare export function useStore<Store>(): Store;
+
   // ------------------------------------------------------------
   // Typings for Provider
   // ------------------------------------------------------------
 
   declare export class Provider<Store> extends React$Component<{
     store: Store,
     children?: React$Node,
+    ...
   }> {}
 
   declare export function createProvider(
@@ -222,7 +237,8 @@ declare module "react-redux" {
     renderCountProp?: string,
     shouldHandleStateChanges?: boolean,
     storeKey?: string,
-    withRef?: boolean,
+    forwardRef?: boolean,
+    ...
   };
 
   declare type SelectorFactoryOptions<Com> = {
@@ -231,10 +247,11 @@ declare module "react-redux" {
     renderCountProp: ?string,
     shouldHandleStateChanges: boolean,
     storeKey: string,
-    withRef: boolean,
+    forwardRef: boolean,
     displayName: string,
     wrappedComponentName: string,
     WrappedComponent: Com,
+    ...
   };
 
   declare type MapStateToPropsEx<S: Object, SP: Object, RSP: Object> = (
@@ -261,16 +278,23 @@ declare module "react-redux" {
     OP: Object,
     CP: Object,
     EFO: Object,
-    ST: { [_: $Keys<Com>]: any },
+    ST: { [_: $Keys<Com>]: any, ... },
   >(
     selectorFactory: SelectorFactory<Com, D, S, OP, EFO, CP>,
     connectAdvancedOptions: ?(ConnectAdvancedOptions & EFO),
   ): (component: Com) => React$ComponentType<OP> & $Shape<ST>;
 
+  declare export function batch(() => void): void
+
   declare export default {
     Provider: typeof Provider,
     createProvider: typeof createProvider,
     connect: typeof connect,
     connectAdvanced: typeof connectAdvanced,
+    useDispatch: typeof useDispatch,
+    useSelector: typeof useSelector,
+    useStore: typeof useStore,
+    batch: typeof batch,
+    ...
   };
 }

ios/Podfile.lock

@@ -7,22 +7,25 @@ PODS:
     - UMCore
   - EXApplication (2.1.1):
     - UMCore
-  - EXConstants (9.0.0):
+  - EXConstants (9.1.1):
     - UMConstantsInterface
     - UMCore
-  - EXFileSystem (8.1.0):
+  - EXFileSystem (9.0.1):
     - UMCore
     - UMFileSystemInterface
-  - EXImageLoader (1.0.1):
+  - EXImageLoader (1.1.1):
     - React-Core
     - UMCore
     - UMImageLoaderInterface
-  - EXPermissions (8.1.0):
+  - EXPermissions (9.0.1):
     - UMCore
     - UMPermissionsInterface
   - EXScreenOrientation (1.0.0):
     - React-Core
     - UMCore
+  - EXSplashScreen (0.5.0):
+    - React
+    - UMCore
   - FBLazyVector (0.62.2)
   - FBReactNativeSpec (0.62.2):
     - Folly (= 2018.10.22.00)
@@ -352,7 +355,7 @@ PODS:
     - React
   - RNCMaskedView (0.1.10):
     - React
-  - RNDeviceInfo (0.21.5):
+  - RNDeviceInfo (6.0.2):
     - React
   - RNGestureHandler (1.8.0):
     - React
@@ -366,29 +369,29 @@ PODS:
     - RNSound/Core (= 0.11.0)
   - RNSound/Core (0.11.0):
     - React
-  - RNVectorIcons (6.6.0):
+  - RNVectorIcons (7.1.0):
     - React
   - Sentry (5.1.10):
     - Sentry/Core (= 5.1.10)
   - Sentry/Core (5.1.10)
   - Toast (4.0.0)
-  - UMAppLoader (1.0.2)
-  - UMBarCodeScannerInterface (5.1.0)
-  - UMCameraInterface (5.1.0)
-  - UMConstantsInterface (5.1.0)
-  - UMCore (5.1.2)
-  - UMFaceDetectorInterface (5.1.0)
-  - UMFileSystemInterface (5.1.0)
-  - UMFontInterface (5.1.0)
-  - UMImageLoaderInterface (5.1.0)
-  - UMPermissionsInterface (5.1.0):
+  - UMAppLoader (1.2.0)
+  - UMBarCodeScannerInterface (5.2.1)
+  - UMCameraInterface (5.2.1)
+  - UMConstantsInterface (5.2.1)
+  - UMCore (5.3.0)
+  - UMFaceDetectorInterface (5.2.1)
+  - UMFileSystemInterface (5.2.1)
+  - UMFontInterface (5.2.1)
+  - UMImageLoaderInterface (5.2.1)
+  - UMPermissionsInterface (5.2.1):
     - UMCore
-  - UMReactNativeAdapter (5.2.0):
+  - UMReactNativeAdapter (5.4.0):
     - React-Core
     - UMCore
     - UMFontInterface
-  - UMSensorsInterface (5.1.0)
-  - UMTaskManagerInterface (5.1.0)
+  - UMSensorsInterface (5.2.1)
+  - UMTaskManagerInterface (5.2.1)
   - Yoga (1.14.0)
   - YogaKit (1.18.1):
     - Yoga (~> 1.14)
@@ -402,6 +405,7 @@ DEPENDENCIES:
   - EXImageLoader (from `../node_modules/expo-image-loader/ios`)
   - EXPermissions (from `../node_modules/expo-permissions/ios`)
   - EXScreenOrientation (from `../node_modules/expo-screen-orientation/ios`)
+  - EXSplashScreen (from `../node_modules/expo-splash-screen/ios`)
   - FBLazyVector (from `../node_modules/react-native/Libraries/FBLazyVector`)
   - FBReactNativeSpec (from `../node_modules/react-native/Libraries/FBReactNativeSpec`)
   - Flipper (~> 0.33.1)
@@ -516,6 +520,8 @@ EXTERNAL SOURCES:
     :path: "../node_modules/expo-permissions/ios"
   EXScreenOrientation:
     :path: "../node_modules/expo-screen-orientation/ios"
+  EXSplashScreen:
+    :path: "../node_modules/expo-splash-screen/ios"
   FBLazyVector:
     :path: "../node_modules/react-native/Libraries/FBLazyVector"
   FBReactNativeSpec:
@@ -638,11 +644,12 @@ SPEC CHECKSUMS:
   DoubleConversion: 5805e889d232975c086db112ece9ed034df7a0b2
   EXAppleAuthentication: 046c76335343eaa97f6ed8d35a9cf493a2c4d351
   EXApplication: 7cf81de6fafccff42f5d1caa5c24a159db6b9437
-  EXConstants: 5304709b1bea70a4828f48ba4c7fc3ec3b2d9b17
-  EXFileSystem: cf4232ba7c62dc49b78c2d36005f97b6fddf0b01
-  EXImageLoader: 5ad6896fa1ef2ee814b551873cbf7a7baccc694a
-  EXPermissions: 24b97f734ce9172d245a5be38ad9ccfcb6135964
+  EXConstants: f907b3b6ce16e20d1750f22af1e095e924574bcb
+  EXFileSystem: 76875135b61708b9afa7e6a89b72a60ba0fdfa20
+  EXImageLoader: 02ca02c9cd5cc8a97b423207a73a791e0a86bea5
+  EXPermissions: 80ac3acbdb145930079810fe5b08c022b3428aa8
   EXScreenOrientation: 44d3cd3a99a86b9cb681e742697bc2c057d7fbd2
+  EXSplashScreen: 9423d258b71afa5bf128a83dcb57b636d9900a74
   FBLazyVector: 4aab18c93cd9546e4bfed752b4084585eca8b245
   FBReactNativeSpec: 5465d51ccfeecb7faa12f9ae0024f2044ce4044e
   Flipper: 6c1f484f9a88d30ab3e272800d53688439e50f69
@@ -688,27 +695,27 @@ SPEC CHECKSUMS:
   rn-fetch-blob: f525a73a78df9ed5d35e67ea65e79d53c15255bc
   RNCAsyncStorage: 3c304d1adfaea02ec732ac218801cb13897aa8c0
   RNCMaskedView: 5a8ec07677aa885546a0d98da336457e2bea557f
-  RNDeviceInfo: e7c5fcde13d40e161d8a27f6c5dc69c638936002
+  RNDeviceInfo: bdd61e8b070d13a1dd9d022091981075ed4cde16
   RNGestureHandler: 7a5833d0f788dbd107fbb913e09aa0c1ff333c39
   RNReanimated: 89f5e0a04d1dd52fbf27e7e7030d8f80a646a3fc
   RNSentry: ae1e005e4f2655775475445a9c49c1d343e8e3a7
   RNSound: da030221e6ac7e8290c6b43f2b5f2133a8e225b0
-  RNVectorIcons: 0bb4def82230be1333ddaeee9fcba45f0b288ed4
+  RNVectorIcons: bc69e6a278b14842063605de32bec61f0b251a59
   Sentry: 8715e88b813bde9ad37aead365d5b04ac7302153
   Toast: 91b396c56ee72a5790816f40d3a94dd357abc196
-  UMAppLoader: ee77a072f9e15128f777ccd6d2d00f52ab4387e6
-  UMBarCodeScannerInterface: 9dc692b87e5f20fe277fa57aa47f45d418c3cc6c
-  UMCameraInterface: 625878bbf2ba188a8548675e1d1d2e438a653e6d
-  UMConstantsInterface: 64060cf86587bcd90b1dbd804cceb6d377a308c1
-  UMCore: eb200e882eadafcd31ead290770835fd648c0945
-  UMFaceDetectorInterface: d6677d6ddc9ab95a0ca857aa7f8ba76656cc770f
-  UMFileSystemInterface: c70ea7147198b9807080f3597f26236be49b0165
-  UMFontInterface: d9d3b27af698c5389ae9e20b99ef56a083f491fb
-  UMImageLoaderInterface: 14dd2c46c67167491effc9e91250e9510f12709e
-  UMPermissionsInterface: 5e83a9167c177e4a0f0a3539345983cc749efb3e
-  UMReactNativeAdapter: 126da3486c1a1f11945b649d557d6c2ebb9407b2
-  UMSensorsInterface: 48941f70175e2975af1a9386c6d6cb16d8126805
-  UMTaskManagerInterface: cb890c79c63885504ddc0efd7a7d01481760aca2
+  UMAppLoader: 61049c8d55590b74e9ae1d5429bf68d96b4a2528
+  UMBarCodeScannerInterface: e5e4c87797d3d01214e25cd1618866caf5d4f17f
+  UMCameraInterface: 415ac060034edecacdbbaa739c223e3f276e0056
+  UMConstantsInterface: 1a52f2d884c95e8829439da13e36b7669a1a8fb4
+  UMCore: d98083b522b08c0a8ba3992bc263c624ae5d887c
+  UMFaceDetectorInterface: 67c6c82451338da01a4bc00ec46365a2a8ea9057
+  UMFileSystemInterface: 303d696ede28102a7e11d111808bd2ed2c5eb62f
+  UMFontInterface: 6edf1ee8bc55d2030766f8cf0a7b20a5d5a913b0
+  UMImageLoaderInterface: 9cdbf3bab6a513bddd88505cb2340fe02d6a11c0
+  UMPermissionsInterface: 019170ad655f464e3f8d23d2a8bcbda2e645cde4
+  UMReactNativeAdapter: 538efe92e781b5d7678cf95b34c46f2d0989a557
+  UMSensorsInterface: cb5bf31d52c4349f0ff9e3c049bbe4df0d80d383
+  UMTaskManagerInterface: 80653f25c55d9e6d79d6a0a65589fa213feaee11
   Yoga: 3ebccbdd559724312790e7742142d062476b698e
   YogaKit: f782866e155069a2cca2517aafea43200b01fd5a
 

jest.config.js

@@ -4,6 +4,7 @@
 // These will be used as regexp fragments.
 const transformModulesWhitelist = [
   'expo-apple-authentication',
+  'expo-application',
   'react-native',
   // @rnc/async-storage itself is precompiled, but its mock-helper is not
   '@react-native-community/async-storage',
@@ -24,7 +25,7 @@ const transformModulesWhitelist = [
 const transformIgnorePattern = `node_modules/(?!${transformModulesWhitelist.join('|')})`;
 
 module.exports = {
-  preset: 'react-native',
+  preset: 'jest-expo',
 
   // Finding and transforming source code.
 

jest/jestSetup.js

@@ -85,10 +85,6 @@ jest.mock('react-native-simple-toast', () => ({
   showWithGravity: jest.fn(),
 }));
 
-jest.mock('expo-application', () => ({
-  nativeApplicationVersion: '26.23.146',
-}));
-
 jest.mock('react-native-device-info', () => ({
   getSystemName: jest.fn().mockReturnValue('ios'),
   getSystemVersion: jest.fn().mockReturnValue('13.3.1'),
@@ -105,10 +101,3 @@ jest.mock('react-native-image-picker', () => ({
   launchCamera: jest.fn(),
   launchImageLibrary: jest.fn(),
 }));
-
-jest.mock('expo-apple-authentication', () => ({
-  AppleAuthenticationButton: jest.fn(),
-  isAvailableAsync: jest.fn(),
-  signInAsync: jest.fn(),
-  // etc. (incomplete)
-}));

package.json

@@ -38,7 +38,7 @@
     "@react-native-community/netinfo": "^5.9.5",
     "@react-navigation/core": "^3.7.6",
     "@sentry/react-native": "^1.0.9",
-    "@unimodules/core": "~5.1.2",
+    "@unimodules/core": "~5.3.0",
     "@zulip/shared": "^0.0.2",
     "base-64": "^0.1.0",
     "blueimp-md5": "^2.10.0",
@@ -47,6 +47,7 @@
     "expo-apple-authentication": "^2.1.1",
     "expo-application": "^2.1.1",
     "expo-screen-orientation": "^1.0.0",
+    "expo-splash-screen": "^0.5.0",
     "immutable": "^4.0.0-rc.12",
     "json-stringify-safe": "^5.0.1",
     "katex": "^0.11.1",
@@ -60,7 +61,7 @@
     "react": "16.11.0",
     "react-intl": "^2.4.0",
     "react-native": "0.62.2",
-    "react-native-device-info": "^0.21.5",
+    "react-native-device-info": "^6.0.2",
     "react-native-document-picker": "^3.2.4",
     "react-native-gesture-handler": "^1.0.12",
     "react-native-image-picker": "^2.3.3",
@@ -74,16 +75,16 @@
     "react-native-simple-toast": "^1.0.0",
     "react-native-sound": "^0.11.0",
     "react-native-text-input-reset": "^1.0.2",
-    "react-native-unimodules": "^0.9.1",
+    "react-native-unimodules": "^0.10.1",
     "react-native-url-polyfill": "1.2.0-rc.0",
-    "react-native-vector-icons": "^6.6.0",
+    "react-native-vector-icons": "^7.1.0",
     "react-native-webview": "^10.1.0",
     "react-navigation": "^4.4.0",
     "react-navigation-drawer": "^2.5.0",
     "react-navigation-redux-helpers": "^3.0.8",
     "react-navigation-stack": "^2.8.2",
     "react-navigation-tabs": "^2.9.0",
-    "react-redux": "^5.0.7",
+    "react-redux": "^7.2.1",
     "redux": "^4.0.0",
     "redux-action-buffer": "^1.2.0",
     "redux-batched-actions": "^0.3.0",
@@ -125,6 +126,7 @@
     "jest-cli": "^26.4.1",
     "jest-environment-jsdom": "^26.3.0",
     "jest-environment-jsdom-global": "^2.0.4",
+    "jest-expo": "^38.0.2",
     "jest-extended": "^0.11.5",
     "jetifier": "^1.6.5",
     "lolex": "^5.1.1",
@@ -133,10 +135,12 @@
     "prettier-eslint": "^11.0.0",
     "prettier-eslint-cli": "^5.0.0",
     "prop-types": "^15.7.2",
+    "react-dom": "16.11.0",
     "react-native-cli": "^2.0.1",
+    "react-native-web": "^0.13.3",
     "redux-mock-store": "^1.5.1",
     "rollup": "^2.26.5",
     "typescript": "^3.9.7",
-    "yarn-deduplicate": "^1.1.1"
+    "yarn-deduplicate": "^3.0.0"
   }
 }