Merge branch 'staging'

.eslintignore

@@ -5,3 +5,4 @@
 /src/util/bridge/injectThisInWebView.js
 /src/util/bridge/rolledUp.js
 node_modules
+artifacts

.eslintrc.json

@@ -11,7 +11,7 @@
     "fetch": true
   },
   "parser": "babel-eslint",
-  "plugins": ["react-native", "react", "simple-import-sort"],
+  "plugins": ["react-native", "react", "simple-import-sort", "detox"],
   "rules": {
     "camelcase": "warn",
     "flowtype/array-style-complex-type": ["error", "verbose"],

.flowconfig

@@ -1,6 +1,7 @@
 [ignore]
 ; Edge additions
 .*/node_modules/edge-plugin-bity/.*
+.*/node_modules/metro/.*
 .*/node_modules/react-native-camera/.*
 .*/node_modules/react-native-keyboard-aware-scroll-view/.*
 .*/node_modules/react-native-permissions/.*
@@ -15,10 +16,6 @@
 ; Ignore polyfills
 node_modules/react-native/Libraries/polyfills/.*
 
-; These should not be required directly
-; require from fbjs/lib instead: require('fbjs/lib/warning')
-node_modules/warning/.*
-
 ; Flow doesn't support platforms
 .*/Libraries/Utilities/LoadingView.js
 

.gitattributes

@@ -1 +1,3 @@
-*.pbxproj -text
+# Windows files should use crlf line endings
+# https://help.github.com/articles/dealing-with-line-endings/
+*.bat text eol=crlf

.gitignore

@@ -102,3 +102,6 @@ buck-out/
 
 # CocoaPods
 /ios/Pods/
+
+# Detox Test Artifacts
+artifacts/

CHANGELOG.md

@@ -1,5 +1,28 @@
 # edge-react-gui
 
+## 2.0.10 (2021-05-05)
+
+- Upgrade to RN 0.64
+- Various bug fixes and improvements
+- Upgrade edge-core-js to v0.17.32
+  - Enable safari10 option in webpack minimizer to fix stuck loading screens on iOS 10
+  - Add crash and breadcrumb methods to EdgeLog for crash reporting
+  - Deprecate the options prop on the MakeEdgeContext React Native component
+  - Just pass any context options as normal props
+  - Reset the wallet sync ratio as part of a resync
+- Upgrade edge-currency-accountbased to v0.7.55
+  - Remove allowance transaction filtering from addTransaction
+  - ETH: Add error reporting to tx lists and gas price query for future debugging
+  - FIO: Reduce logging verbosity
+  - BNB: Enable resync
+  - Add additional log types crash and breadcrumb
+  - FIO: Change some error logging levels from error to info to reduce log verbosity
+- Upgrade edge-exchange-plugins to v0.11.25
+  - Convert Nomics, Coincap, and Currencyconverter API to use bulk requests
+  - Sideshift: Add refund address
+- Upgrade edge-login-ui-rn v0.9.1
+  - Disable the password recovery email on Android. This works around a tricky crash in the React Native rendering code.
+
 ## 2.0.9 (2021-04-16)
 
 - Add UNI ERC20 token

README.md

@@ -55,7 +55,7 @@ Edge is known to build with this exact tool set. Updated versions of these tools
     yarn
 
 ### Run the bundler
-    
+
     yarn start
 
 ### XCode Setup - Use Legacy Build System
@@ -163,22 +163,9 @@ Run deploy
 
 ## Debugging
 
-For debugging, we recommend using [React Native Debugger](https://github.com/jhen0409/react-native-debugger). The current latest version (0.11) works well.
-
-### Installation
-
-You can download React Native Debgger 0.10.11 at
-[https://github.com/jhen0409/react-native-debugger/releases/tag/v0.10.11](https://github.com/jhen0409/react-native-debugger/releases/tag/v0.10.11).
-
-#### Debugging in iOS Simulator
-
-    ⌘ + d (command + d)
-    Select "Debug JS Remotely"
-
-#### Debugging in Android Emulator (GenyMotion / Android Studios)
+As with any modern React Native app, [Flipper](https://fbflipper.com/) is the officially-supported debugging app. Use the "React Native Hermes Debugger" to debug Javascript running in the UI.
 
-    ⌘ + m (command + m)
-    Select "Debug JS Remotely"
+If you want to inspect Redux, you can install the [redux-debugger](https://github.com/jk-gan/flipper-plugin-redux-debugger) plugin for Flipper, which this app supports.
 
 ## Contributing
 

android/app/build.gradle

@@ -121,6 +121,8 @@ def jscFlavor = 'org.webkit:android-jsc:+'
 def enableHermes = project.ext.react.get("enableHermes", false);
 
 android {
+    ndkVersion rootProject.ext.ndkVersion
+
     compileSdkVersion rootProject.ext.compileSdkVersion
 
     compileOptions {
@@ -163,11 +165,12 @@ android {
         variant.outputs.each { output ->
             // For each separate APK per architecture, set a unique version code as described here:
             // https://developer.android.com/studio/build/configure-apk-splits.html
+            // Example: versionCode 1 will generate 1001 for armeabi-v7a, 1002 for x86, etc.
             def versionCodes = ["armeabi-v7a": 1, "x86": 2, "arm64-v8a": 3, "x86_64": 4]
             def abi = output.getFilter(OutputFile.ABI)
             if (abi != null) {  // null for the universal-debug, universal-release variants
                 output.versionCodeOverride =
-                        versionCodes.get(abi) * 1048576 + defaultConfig.versionCode
+                        defaultConfig.versionCode * 10 + versionCodes.get(abi)
             }
 
         }
@@ -204,7 +207,6 @@ dependencies {
 
     // Edge additions:
     implementation 'androidx.work:work-runtime:2.0.1'
-    implementation 'org.json:json:20190722'
 
     // If your app supports Android versions before Ice Cream Sandwich (API level 14)
     implementation 'com.facebook.fresco:animated-base-support:1.3.0'

android/app/src/debug/AndroidManifest.xml

@@ -4,5 +4,10 @@
 
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
 
-    <application android:usesCleartextTraffic="true" tools:targetApi="28" tools:ignore="GoogleAppIndexingWarning" />
+    <application
+        android:usesCleartextTraffic="true"
+        tools:targetApi="28"
+        tools:ignore="GoogleAppIndexingWarning">
+        <activity android:name="com.facebook.react.devsupport.DevSettingsActivity" />
+    </application>
 </manifest>

android/app/src/main/AndroidManifest.xml

@@ -31,7 +31,8 @@
     android:icon="@mipmap/ic_launcher"
     android:roundIcon="@mipmap/ic_launcher_round"
     android:allowBackup="false"
-    android:theme="@style/AppTheme">
+    android:theme="@style/AppTheme"
+    android:usesCleartextTraffic="true">
     <meta-data android:name="com.bugsnag.android.API_KEY"
                android:value="5aca2dbe708503471d8137625e092675"/>
     <activity
@@ -123,7 +124,5 @@
         <data android:scheme="https" android:host="deep.edge.app" android:pathPrefix="/"></data>
       </intent-filter>
     </activity>
-    <activity android:name="com.facebook.react.devsupport.DevSettingsActivity" />
   </application>
-
 </manifest>

android/app/src/main/res/values/styles.xml

@@ -1,7 +1,7 @@
 <resources>
 
     <!-- Base application theme. -->
-    <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
+    <style name="AppTheme" parent="Theme.AppCompat.DayNight.NoActionBar">
         <!-- Customize your theme here. -->
         <item name="android:textColor">#000000</item>
         <!-- Doing <item name="android:windowIsTranslucent">true</item>

android/build.gradle

@@ -2,18 +2,19 @@
 
 buildscript {
     ext {
-        buildToolsVersion = "29.0.2"
-        minSdkVersion = 23
+        buildToolsVersion = "29.0.3"
+        minSdkVersion = 21
         compileSdkVersion = 29
         targetSdkVersion = 29
+        ndkVersion = "20.1.5948944"
         kotlinVersion = "1.3.50"
     }
     repositories {
         google()
         jcenter()
     }
     dependencies {
-        classpath("com.android.tools.build:gradle:3.5.3")
+        classpath("com.android.tools.build:gradle:4.1.0")
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
 

android/gradle.properties

@@ -25,7 +25,7 @@ android.useAndroidX=true
 android.enableJetifier=true
 
 # Version of flipper SDK to use with React Native
-FLIPPER_VERSION=0.54.0
+FLIPPER_VERSION=0.75.1
 
 # Edge additions:
 org.gradle.jvmargs=-Xmx2g

android/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

android/gradlew

@@ -82,6 +82,7 @@ esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
+
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
@@ -129,6 +130,7 @@ fi
 if [ "$cygwin" = "true" -o "$msys" = "true" ] ; 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

android/gradlew.bat

@@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if "%ERRORLEVEL%" == "0" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -54,7 +54,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -64,28 +64,14 @@ echo location of your Java installation.
 
 goto fail
 
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
 :execute
 @rem Setup the command line
 
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
+
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 
 :end
 @rem End local scope for the variables with windows NT shell