Update to RN 61 and AndroidX #1343

cmcewen · 2019-10-15T19:25:34Z

Description

This updates RN and a ton of our dependencies for 0.61. This gives us the Hermes JS engine, which is better on low end phones, autolinking of deps, AndroidX, and lots of other goodies. I had to update a ton of dependencies and do a lot of wrangling so apologies for the large size.

Tested

In progress right now, but using the app and running tests

Other changes

Describe any minor or "drive-by" changes here.

Related issues

Backwards compatibility

Lots of potential breakage here so please keep an eye out

codecov · 2019-10-16T02:42:21Z

Codecov Report

Merging #1343 into master will increase coverage by 8.34%.
The diff coverage is 58.06%.

@@            Coverage Diff             @@
##           master    #1343      +/-   ##
==========================================
+ Coverage   65.39%   73.73%   +8.34%     
==========================================
  Files         271      277       +6     
  Lines        8187     7418     -769     
  Branches      570      660      +90     
==========================================
+ Hits         5354     5470     +116     
+ Misses       2711     1836     -875     
+ Partials      122      112      -10

Flag	Coverage Δ
#mobile	`73.73% <58.06%> (+8.34%)`	⬆️

Impacted Files	Coverage Δ
packages/mobile/src/app/actions.ts	`96% <ø> (+0.16%)`	⬆️
packages/mobile/src/language/Language.tsx	`74.07% <ø> (ø)`	⬆️
packages/mobile/test/values.ts	`100% <ø> (ø)`
packages/mobile/test/utils.ts	`97.14% <ø> (ø)`
packages/mobile/src/firebase/notifications.ts	`48.38% <0%> (+2.67%)`	⬆️
packages/mobile/src/geth/geth.ts	`21.98% <0%> (+1.25%)`	⬆️
packages/mobile/src/account/saga.ts	`83.78% <100%> (+1.96%)`	⬆️
packages/mobile/src/redux/store.ts	`100% <100%> (ø)`	⬆️
packages/mobile/src/app/ErrorBoundary.tsx	`100% <100%> (ø)`	⬆️
packages/mobile/src/app/App.tsx	`84.21% <100%> (ø)`	⬆️
... and 270 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 494f140...6ff0a10. Read the comment docs.

cmcewen · 2019-10-16T02:57:04Z

package.json

@@ -34,26 +34,28 @@
      "packages/*"
    ],
    "nohoist": [
-      "@celo/verifier/react-native",


Now that RN uses the normal module resolution system instead of haste, we don't have to nohoist anymore

cmcewen · 2019-10-16T02:57:15Z

package.json

      "@celo/web/@timkendrick/monaco-editor",
      "@celo/web/@types/react-i18next",
      "@celo/web/next-i18next",
      "**/openzeppelin-solidity"
    ]
  },
  "devDependencies": {
-    "@types/jest": "^24.0.17",
+    "@babel/core": "^7.6.2",


just moving up shared devDeps

cmcewen · 2019-10-16T02:58:09Z

packages/mobile/__mocks__/src/navigator/NavigationService.ts

@@ -1 +1,6 @@
-export function navigate() {}
+export const navigate = jest.fn()


Jest started complaining about mocking in scope so I moved to this. It should work the same in tests

cmcewen · 2019-10-16T02:58:35Z

packages/mobile/android/app/build.gradle

@@ -223,56 +253,32 @@ android {
 }

 dependencies {
-    implementation project(':react-native-install-referrer')


Autolinking means we don't have to add these intentionally any more

packages/mobile/android/app/src/main/java/org/celo/mobile/MainApplication.java

cmcewen · 2019-10-16T03:04:11Z

packages/mobile/src/networkInfo/saga.ts

@@ -1,5 +1,4 @@
-import NetInfo from '@react-native-community/netinfo'
-import { ConnectionInfo } from 'react-native'
+import NetInfo, { NetInfoState } from '@react-native-community/netinfo'


NetInfo was complaining about deprecated methods

cmcewen · 2019-10-16T03:04:24Z

packages/mobile/src/redux/store.ts

@@ -1,7 +1,7 @@
+import AsyncStorage from '@react-native-community/async-storage'


Removed from RN core

cmcewen · 2019-10-16T03:04:42Z

packages/mobile/src/sentry/Sentry.ts

-    environment: DeviceInfo.getBundleId(),
-    react: true,
-  })
+  Sentry.init({ dsn: SENTRY_URL, environment: await DeviceInfo.getBundleId() })


New sentry version changed the API a bit

DeviceInfo.getBundleId() is still synchronous:
https://github.com/react-native-community/react-native-device-info/blob/v4.0.1/src/index.ts#L273-L282

cmcewen · 2019-10-16T03:05:42Z

packages/react-components/analytics/CeloAnalytics.tsx

 import * as _ from 'lodash'
 import DeviceInfo from 'react-native-device-info'

 const TAG = 'CeloAnalytics'

-function getDeviceInfo() {
+async function getDeviceInfo() {


Had to change this due to the async functions

cmcewen · 2019-10-16T03:06:22Z

packages/react-components/jest.config.js

@@ -1,19 +1,29 @@
-const defaultConfig = require('../../jest.config.js')
+const reactNativeJestPreset = require('react-native/jest-preset')


Jest was being v annoying to had to start over with this

jmrossy

Really great work, thanks for taking this on!!
Mostly lgtm, just some questions below

packages/mobile/android/app/build.gradle

jmrossy · 2019-10-16T10:15:37Z

packages/mobile/android/app/build.gradle

@@ -223,56 +253,32 @@ android {
 }

 dependencies {
-    implementation project(':react-native-install-referrer')


packages/mobile/android/app/src/main/java/org/celo/mobile/MainApplication.java

jmrossy · 2019-10-16T12:55:09Z

packages/mobile/src/account/InviteReview.test.tsx

@@ -1,6 +1,6 @@
 jest.useFakeTimers()

-import Button from '@celo/react-components/components/Button'
+import mockButton from '@celo/react-components/components/Button'


What I read is that symbols beginning with 'mock' will be hoisted to the top of the file before jest messes around with the real imports.

packages/mobile/src/account/__snapshots__/PhotosEducation.test.tsx.snap

jmrossy · 2019-10-16T12:58:31Z

packages/mobile/src/app/App.tsx

@@ -18,16 +19,14 @@ import Navigator from 'src/navigator/NavigatorWrapper'
 import { persistor, store } from 'src/redux/store'
 import Logger from 'src/utils/Logger'

+useScreens()


Do we use it? I know it's a dep of some of other other deps but to my knowledge we don't use it anywhere. Just gave their readme a look, don't fully understand what it's for.

packages/mobile/src/app/App.tsx

packages/mobile/src/firebase/notifications.ts

jeanregisser

That's an EPIC effort!! Looks awesome! 🥇 🎉 💣

Just some small issues/questions.

jeanregisser · 2019-10-16T12:20:16Z

packages/mobile/ios/Podfile

@@ -1,81 +1,66 @@
 # File contents of "ios/Podfile"
-platform :ios, '9.0'
+platform :ios, "9.0"
+require_relative "../../../node_modules/@react-native-community/cli-platform-ios/native_modules"


Looks good! 👍

packages/mobile/jest.config.js

jeanregisser · 2019-10-16T12:31:13Z

packages/mobile/src/account/Account.tsx

  }

  async componentDidMount() {
    const phoneNumber = this.props.e164PhoneNumber
    const verified = await isPhoneNumberVerified(phoneNumber)
    this.setState({ verified })
+    this.setState({ version: await DeviceInfo.getVersion() })


Yes, it's kind of painful for some basic stuff :/

jeanregisser · 2019-10-16T12:42:42Z

packages/mobile/src/account/Account.tsx

  }

  async componentDidMount() {
    const phoneNumber = this.props.e164PhoneNumber
    const verified = await isPhoneNumberVerified(phoneNumber)
    this.setState({ verified })
+    this.setState({ version: await DeviceInfo.getVersion() })


Hum, they kept some of the basic info as normal functions. getVersion() still returns a string synchronously:
https://github.com/react-native-community/react-native-device-info/blob/v4.0.1/src/index.ts#L309-L318

You should be able to keep the existing code as is in this specific instance.

packages/react-components/analytics/CeloAnalytics.tsx

packages/react-components/components/PhoneNumberInput.tsx

jeanregisser · 2019-10-16T13:18:57Z

packages/react-components/jest.config.js

-      // Disables type-check when running tests as it takes valuable time
-      // and is redundant with the tsc build step


nit: you really don't like this comment? 😸

patches/@react-native-community/cli-platform-android+3.0.0-alpha.2.patch

yarn.lock

made changes

…repo into aaronmgdr/invite-page * 'aaronmgdr/invite-page' of github.com:celo-org/celo-monorepo: (63 commits) Fix compile error during local clean build (#1506) Update to RN 61 and AndroidX (#1343) Set usage of shuffled round robin in the genesis block (#1464) Add spanish backup key for backup key flow (#1500) Fix sync tests by pulling genesis block to determine epoch length (#1504) [Wallet] fix missing full name error alert (#1496) [Wallet + Verification Pool] Add details about generating an app-signature (#1482) Deploy celo's image of ethstats (#1421) Storing previous randomness values (#1197) [Wallet] Fix wei invite bug (#1489) Point all packages to latest ganache-cli master (#1488) Point end-to-end tests back to master (#1469) [Wallet] Migrate app view functions to contractkit (#1381) [Wallet] Add script to translate locale strings (#1485) [Wallet] Update wallet celo client version and add missing translations for backup flow (#1483) [Wallet] Hotfix local currency (#1481) [Wallet] Remove QR debouncing to improve responsiveness (#1480) [Wallet] Upgrade app version to v1.5.1 (#1463) Update governance end-to-end tests to work with changed precompile (#1476) Fixes key_placer.sh when encrypting files (#1465) ...

cmcewen added 7 commits October 9, 2019 19:32

Updating to RN 61 + androidx - WIP

0485df5

Fix phone number country input

6e83d99

Merge branch 'master' into cmcewen/androidx

e2ff89a

Get firebase working again

78f4242

Tests pass

25e2371

Get everything working

5fb7232

Unneeded changes

cb6e91a

cmcewen requested review from aaronmgdr, ashishb, jmrossy and yerdua as code owners October 15, 2019 19:25

cmcewen added 8 commits October 15, 2019 14:14

podfile changes

1fe444f

Merge branch 'master' into cmcewen/androidx

452fac8

Work on iOS

24b8ccd

Get build working

6a25ffe

Fix tests

0f62b11

Lint checks

e7638ba

Conditional import + fix test TZ

04fbc76

Try fixing mobile build

cbdb63c

pod install works

1f75a6d

cmcewen commented Oct 16, 2019

View reviewed changes

jmrossy reviewed Oct 16, 2019

View reviewed changes

jmrossy assigned cmcewen Oct 16, 2019

jmrossy requested a review from jeanregisser October 16, 2019 13:09

jmrossy assigned jeanregisser Oct 16, 2019

jeanregisser previously requested changes Oct 16, 2019

View reviewed changes

cmcewen added 3 commits October 16, 2019 14:12

PR feedback

3ceed6c

Comment fixes

3d06150

DeviceInfo async

ed4e53a

jmrossy approved these changes Oct 17, 2019

View reviewed changes

cmcewen added 13 commits October 17, 2019 14:33

Merge branch 'master' into cmcewen/androidx

ba88131

Java heap error

44862e0

Update snapshot

f59bff9

Bump up resource class

851da58

Get e2e tests running

c010bc1

Try to fix OOM error

a842624

Merge branch 'master' into cmcewen/androidx

deb9822

Add simulator to start command

587e258

Merge branch 'master' into cmcewen/androidx

df72813

Lint errors and naming functions differently

0fe4d20

Merge branch 'master' into cmcewen/androidx

92fb986

Fix alfajores network id

247188d

Lint error

0d0f930

cmcewen requested review from asaj and m-chrzan as code owners October 28, 2019 20:12

cmcewen added 9 commits October 28, 2019 17:55

Get tests to pass

ae4dc16

Imports

3361314

Try fixing build

b68ddd6

use android defaults

d580571

Config

ece9581

config

073346d

Jetify

e1a0225

Switch order back

4f4bdc6

Merge branch 'master' into cmcewen/androidx

6ff0a10

cmcewen added the automerge Have PR merge automatically when checks pass label Oct 29, 2019

celo-ci-bot-user merged commit 74c81bd into master Oct 29, 2019

celo-ci-bot-user deleted the cmcewen/androidx branch October 29, 2019 05:45

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update to RN 61 and AndroidX #1343

Update to RN 61 and AndroidX #1343

cmcewen commented Oct 15, 2019

codecov bot commented Oct 16, 2019 •

edited

Loading

cmcewen Oct 16, 2019

cmcewen Oct 16, 2019

cmcewen Oct 16, 2019

cmcewen Oct 16, 2019

jmrossy Oct 16, 2019

cmcewen Oct 16, 2019

cmcewen Oct 16, 2019

cmcewen Oct 16, 2019

jeanregisser Oct 16, 2019

cmcewen Oct 16, 2019

cmcewen Oct 16, 2019

jmrossy left a comment

jmrossy Oct 16, 2019

jmrossy Oct 16, 2019

jmrossy Oct 16, 2019

jeanregisser left a comment

jeanregisser Oct 16, 2019

jeanregisser Oct 16, 2019

jeanregisser Oct 16, 2019

jeanregisser Oct 16, 2019

		@@ -1 +1,6 @@
		export function navigate() {}
		export const navigate = jest.fn()

		@@ -1,7 +1,7 @@
		import AsyncStorage from '@react-native-community/async-storage'

		@@ -1,19 +1,29 @@
		const defaultConfig = require('../../jest.config.js')
		const reactNativeJestPreset = require('react-native/jest-preset')

		// Disables type-check when running tests as it takes valuable time
		// and is redundant with the tsc build step

Update to RN 61 and AndroidX #1343

Update to RN 61 and AndroidX #1343

Conversation

cmcewen commented Oct 15, 2019

Description

Tested

Other changes

Related issues

Backwards compatibility

codecov bot commented Oct 16, 2019 • edited Loading

Codecov Report

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jmrossy left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jeanregisser left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

codecov bot commented Oct 16, 2019 •

edited

Loading