React Native 0.46

circle.yml

@@ -1,8 +1,8 @@
 machine:
   xcode:
-    version: 7.2
+    version: 8.3.3
   node:
-    version: 5.7.0
+    version: 6
   java:
     version: oraclejdk8
   environment:
@@ -18,6 +18,7 @@ general:
   build_dir: shared
 dependencies:
   pre:
+    - nvm ls-remote
     - sudo apt-key adv --fetch-keys http://dl.yarnpkg.com/debian/pubkey.gpg
     - echo "deb http://dl.yarnpkg.com/debian/ stable main" | sudo tee /etc/apt/sources.list.d/yarn.list
     - sudo apt-get update -qq

shared/.flowconfig

@@ -7,6 +7,7 @@
 .*/node_modules/fbjs/.*
 .*/node_modules/is-my-json-valid/.*
 .*/node_modules/json5/.*
+.*/node_modules/metro-bundler/.*
 .*/node_modules/npm/.*
 .*/node_modules/react-native/.*
 .*/node_modules/react-navigation/.*

shared/actions/gregor.js

@@ -184,15 +184,18 @@ function* handleKbfsFavoritesOOBM(kbfsFavoriteMessages: Array<OutOfBandMessage>)
   const createdTLFs = msgsWithParsedBodies.filter(m => m.body.action === 'create')
 
   const username: string = (yield select(usernameSelector): any)
-  yield createdTLFs
-    .map(m => {
-      const folder = m.body.tlf ? markTLFCreated(folderFromPath(username, m.body.tlf)) : null
-      if (folder != null) {
-        return put(folder)
-      }
-      console.warn('Failed to parse tlf for oobm:', m)
-    })
-    .filter(i => !!i)
+  // Must do this else we get weird errors from redux-saga, see https://github.com/redux-saga/redux-saga/issues/1000#issuecomment-315180255
+  yield Promise.resolve(
+    createdTLFs
+      .map(m => {
+        const folder = m.body.tlf ? markTLFCreated(folderFromPath(username, m.body.tlf)) : null
+        if (folder != null) {
+          return put(folder)
+        }
+        console.warn('Failed to parse tlf for oobm:', m)
+      })
+      .filter(i => !!i)
+  )
 }
 
 function* handlePushOOBM(pushOOBM: pushOOBM) {

shared/actions/login/saga.js

@@ -23,7 +23,7 @@ import {configurePush} from '../push/creators'
 import {pathSelector, navigateTo, navigateAppend} from '../route-tree'
 import {overrideLoggedInTab} from '../../local-debug'
 import {toDeviceType} from '../../constants/types/more'
-import {call, put, take, race, select} from 'redux-saga/effects'
+import {call, put, take, race, select, all} from 'redux-saga/effects'
 import * as Saga from '../../util/saga'
 
 import type {DeviceRole} from '../../constants/login'
@@ -137,7 +137,7 @@ function* navBasedOnLoginState() {
     }
   } else if (registered) {
     // relogging in
-    yield [put.resolve(getExtendedStatus()), put.resolve(getAccounts())]
+    yield all([put.resolve(getExtendedStatus()), put.resolve(getAccounts())])
     yield put(navigateTo(['login'], [loginTab]))
   } else if (loginError) {
     // show error on login screen

shared/actions/tracker.js

@@ -7,6 +7,7 @@ import engine from '../engine'
 import openUrl from '../util/open-url'
 import {requestIdleCallback} from '../util/idle-callback'
 import {showAllTrackers} from '../local-debug'
+import {isMobile} from '../constants/platform'
 
 import type {Action, Dispatch, AsyncAction} from '../constants/types/flux'
 import type {CancelHandlerType} from '../engine/session'
@@ -184,6 +185,10 @@ function registerIdentifyUi(): TrackerActionCreator {
         let trackerTimeoutError = 0
 
         const onStart = username => {
+          // Don't do this on mobile
+          if (isMobile) {
+            return
+          }
           trackerTimeoutError = setTimeout(() => {
             dispatch({
               type: Constants.identifyFinished,

shared/app/main.android.js

@@ -1,7 +1,7 @@
 // @flow
 import {connector, Main} from './main-shared.native'
 import {compose, lifecycle, withProps} from 'recompose'
-import {NativeBackAndroid} from '../common-adapters/index.native'
+import {NativeBackHandler} from '../common-adapters/index.native'
 import {getPath} from '../route-tree'
 
 module.hot &&
@@ -17,7 +17,7 @@ export default compose(
   connector,
   lifecycle({
     componentWillMount: function() {
-      NativeBackAndroid.addEventListener('hardwareBackPress', () => {
+      NativeBackHandler.addEventListener('hardwareBackPress', () => {
         if (getPath(this.props.routeState).size === 1) {
           return false
         }