Update to React Native 0.57

src/mobile/.babelrc

@@ -1,10 +1,14 @@
 {
-  "presets": ["react-native"],
-  "plugins": [
-      ["module-resolver", {
-          "cwd": "babelrc",
-          "root": [".", "src"],
-          "extensions": [".ios.js", ".android.js", ".js", ".json"]
-      }]
-  ]
+    "presets": ["module:metro-react-native-babel-preset"],
+    "plugins": [
+        [
+            "module-resolver",
+            {
+                "cwd": "babelrc",
+                "root": [".", "src"],
+                "extensions": [".ios.js", ".android.js", ".js", ".json"]
+            }
+        ],
+        "jest-hoist"
+    ]
 }

src/mobile/.snyk

@@ -3,55 +3,6 @@ version: v1.12.0
 ignore: {}
 # patches apply the minimum changes required to fix a vulnerability
 patch:
-  'npm:lodash:20180130':
-    - react-native > plist > xmlbuilder > lodash:
-        patched: '2018-09-18T07:09:21.012Z'
-    - react-native > plist > xmlbuilder > lodash:
-        patched: '2018-09-18T19:51:49.892Z'
-  'npm:ms:20170412':
-    - react-native > connect > body-parser > debug > ms:
-        patched: '2018-09-18T19:51:49.892Z'
-    - react-native > connect > morgan > debug > ms:
-        patched: '2018-09-18T19:51:49.892Z'
-    - react-native > connect > express-session > debug > ms:
-        patched: '2018-09-18T19:51:49.892Z'
-    - react-native > connect > compression > debug > ms:
-        patched: '2018-09-18T19:51:49.892Z'
-    - react-native > connect > serve-index > debug > ms:
-        patched: '2018-09-18T19:51:49.892Z'
-    - react-native > connect > connect-timeout > ms:
-        patched: '2018-09-18T19:51:49.892Z'
-    - react-native > connect > connect-timeout > debug > ms:
-        patched: '2018-09-18T19:51:49.892Z'
-    - react-native > connect > serve-static > send > ms:
-        patched: '2018-09-18T19:51:49.892Z'
-    - react-native > connect > serve-static > send > debug > ms:
-        patched: '2018-09-18T19:51:49.892Z'
-    - react-native > connect > serve-favicon > ms:
-        patched: '2018-09-18T19:51:49.892Z'
   'npm:semver:20150403':
     - react-native-level-fs > levelup > semver:
-        patched: '2018-09-18T19:51:49.892Z'
-  'npm:debug:20170905':
-    - react-native > connect > body-parser > debug:
-        patched: '2018-09-18T22:12:12.424Z'
-    - react-native > connect > compression > debug:
-        patched: '2018-09-18T22:12:12.424Z'
-    - react-native > connect > connect-timeout > debug:
-        patched: '2018-09-18T22:12:12.424Z'
-    - react-native > connect > express-session > debug:
-        patched: '2018-09-18T22:12:12.424Z'
-    - react-native > connect > morgan > debug:
-        patched: '2018-09-18T22:12:12.424Z'
-    - react-native > connect > serve-index > debug:
-        patched: '2018-09-18T22:12:12.424Z'
-    - react-native > connect > serve-static > send > debug:
-        patched: '2018-09-18T22:12:12.424Z'
-  'npm:mime:20170907':
-    - react-native > connect > serve-static > send > mime:
-        patched: '2018-09-18T22:12:12.424Z'
-  'npm:negotiator:20160616':
-    - react-native > connect > compression > accepts > negotiator:
-        patched: '2018-09-18T22:12:12.424Z'
-    - react-native > connect > serve-index > accepts > negotiator:
-        patched: '2018-09-18T22:12:12.424Z'
+        patched: '2018-10-25T17:15:53.839Z'

src/mobile/__tests__/ui/components/HistoryModalContent.spec.js

@@ -124,7 +124,7 @@ describe('Testing HistoryModalContent component', () => {
             const props = getProps();
 
             const wrapper = shallow(<HistoryModalContent {...props} />);
-            expect(wrapper.find('ScrollViewMock').length).toEqual(1);
+            expect(wrapper.find('ScrollView').length).toEqual(1);
         });
 
         it('should return status prop as first child to first Text component', () => {

src/mobile/__tests__/ui/views/wallet/Balance.spec.js

@@ -101,7 +101,7 @@ describe('Testing Balance component', () => {
             const props = getProps();
 
             const wrapper = shallow(<Balance {...props} />);
-            expect(wrapper.name()).toEqual('ScrollViewMock');
+            expect(wrapper.name()).toEqual('ScrollView');
         });
     });
 

src/mobile/android/app/build.gradle

@@ -104,7 +104,7 @@ android {
         aaptOptions {
             ignoreAssetsPattern '!.svn:!.git:!.ds_store:!*.scc:.*:!CVS:!thumbs.db:!picasa.ini:!*~'
         }
-        missingDimensionStrategy "RNN.reactNativeVersion", "reactNative51"
+        missingDimensionStrategy "RNN.reactNativeVersion", "reactNative57"
     }
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
@@ -176,7 +176,7 @@ dependencies {
     implementation project(':react-native-navigation')
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     implementation 'com.android.support:appcompat-v7:27.1.0'
-    implementation ('com.facebook.react:react-native:0.51.0') { force = true }
+    implementation ('com.facebook.react:react-native:+')
     implementation project(':react-native-svg')
     implementation project(':react-native-keychain')
     implementation 'com.android.support:multidex:1.0.1'

src/mobile/android/gradle.properties

@@ -10,14 +10,14 @@
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
 # Default value: -Xmx10248m -XX:MaxPermSize=256m
-org.gradle.jvmargs=-Xmx1536m
 # org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
 
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
 
+org.gradle.jvmargs=-Xmx1536m
 android.useDeprecatedNdk=true
 android.enableAapt2=false
 distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip

src/mobile/android/gradle/wrapper/gradle-wrapper.properties

@@ -1,4 +1,3 @@
-#Mon May 14 13:15:29 BST 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

src/mobile/android/gradlew

@@ -1,43 +1,25 @@
-#!/usr/bin/env sh
+#!/usr/bin/env bash
 
 ##############################################################################
 ##
 ##  Gradle start up script for UN*X
 ##
 ##############################################################################
 
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
 
 APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
-
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
 
-warn () {
+warn ( ) {
     echo "$*"
 }
 
-die () {
+die ( ) {
     echo
     echo "$*"
     echo
@@ -48,7 +30,6 @@ die () {
 cygwin=false
 msys=false
 darwin=false
-nonstop=false
 case "`uname`" in
   CYGWIN* )
     cygwin=true
@@ -59,11 +40,31 @@ case "`uname`" in
   MINGW* )
     msys=true
     ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
 esac
 
+# For Cygwin, ensure paths are in UNIX format before anything is touched.
+if $cygwin ; then
+    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+fi
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >&-
+APP_HOME="`pwd -P`"
+cd "$SAVED" >&-
+
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
 # Determine the Java command to use to start the JVM.
@@ -89,7 +90,7 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
     MAX_FD_LIMIT=`ulimit -H -n`
     if [ $? -eq 0 ] ; then
         if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
@@ -113,7 +114,6 @@ fi
 if $cygwin ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-    JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath
     ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
@@ -154,19 +154,11 @@ if $cygwin ; then
     esac
 fi
 
-# Escape application args
-save () {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
+# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
+function splitJvmOpts() {
+    JVM_OPTS=("$@")
 }
-APP_ARGS=$(save "$@")
-
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
-
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-  cd "$(dirname "$0")"
-fi
+eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
+JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
 
-exec "$JAVACMD" "$@"
+exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"

src/mobile/android/gradlew.bat

@@ -8,14 +8,14 @@
 @rem Set local scope for the variables with windows NT shell
 if "%OS%"=="Windows_NT" setlocal
 
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
 set DIRNAME=%~dp0
 if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
 
@@ -46,9 +46,10 @@ echo location of your Java installation.
 goto fail
 
 :init
-@rem Get command-line arguments, handling Windows variants
+@rem Get command-line arguments, handling Windowz variants
 
 if not "%OS%" == "Windows_NT" goto win9xME_args
+if "%@eval[2+2]" == "4" goto 4NT_args
 
 :win9xME_args
 @rem Slurp the command line arguments.
@@ -59,6 +60,11 @@ set _SKIP=2
 if "x%~1" == "x" goto execute
 
 set CMD_LINE_ARGS=%*
+goto execute
+
+:4NT_args
+@rem Get arguments from the 4NT Shell from JP Software
+set CMD_LINE_ARGS=%$
 
 :execute
 @rem Setup the command line