Merge branch 'staging'

.flowconfig

@@ -8,7 +8,7 @@
 .*/node_modules/react-native-keyboard-aware-scroll-view/.*
 .*/node_modules/react-native-permissions/.*
 .*/node_modules/react-native/.*
-
+.*/node_modules/@react-native-community/async-storage/jest/.*
 ; We fork some components by platform
 .*/*[.]android.js
 

.gitignore

@@ -74,6 +74,7 @@ build/
 .gradle
 local.properties
 *.iml
+*.hprof
 
 # node.js
 #
@@ -85,6 +86,7 @@ yarn-error.log
 buck-out/
 \.buckd/
 *.keystore
+!debug.keystore
 
 # fastlane
 #
@@ -102,6 +104,3 @@ buck-out/
 
 # CocoaPods
 /ios/Pods/
-
-# Detox Test Artifacts
-artifacts/

CHANGELOG.md

@@ -1,5 +1,58 @@
 # edge-react-gui
 
+## 2.13.0 (2022-04-11)
+
+- Add Tomb Finance's Masonry and Cemetery platforms
+- New swap provider SpookySwap
+- Upgrade React Native to v0.67.2
+- Convert wallet list scenes and components to use React hooks
+- Overlay parent currency icon on top of token icons
+- New animated sync circle
+- New animated wallet swipe list/row/buttons
+- Refactor wallet list components to remove `GuiWallet` and unnecessary renders
+- Fix wallet list swipe button navigation
+- Split transfer transactions into two (QBO export)
+- Anypay: Add support for multiple outputs and payment submission
+- Fix crash related to wallet files and logout race condition
+- Update FIO strings
+- Development: Edge can now be built natively on M1 Macs without Rosetta
+- Development: Add copy button to seed modals
+- EdgeCoreWebView: Fix compiler errors on older Java versions
+- EdgeCoreWebView: Unify the iOS & Andriod WebView message passing with `dispatchViewManagerCommand`
+- EdgeCoreWebView: Move string manipulation off the main UI thread
+- Removed unused util functions
+- Address various deprecation warnings
+- Various visual fixes
+- Update translations
+- Upgrade edge-core-js to v0.19.12
+  - fixed: Avoid an internal crash on logout while reloading addresses.
+  - fixed: Make our code compatible with older Java versions again.
+  - fixed: Use the correct React dependency in the iOS podspec.
+  - changed: Allow individual log sources to be set to silent.
+  - changed: Move some string manipulations off of the main Java thread.
+  - changed: Perform React Native disk accesses on their own threads.
+- Upgrade edge-currency-accountbased to v0.15.3
+  - Add etherscan fee sources across EVM chains
+  - FTM: Add new tokens WFTM, TSHARE, TOMB, TBOND, and xBOO
+  - FTM: Add additional rpc servers
+  - Add blockbook broadcast method
+  - Fix networkFees object initialization on resync
+  - Fix checkTxsBlockbook so it doesn't break on unused addresses
+  - Reduce some duplicate blockbook code
+  - EOS/TLOS/WAX: Remove parent currency from metaTokens array
+  - Add backwards-compatible apikey helper function
+  - Update ZEC checkpoints
+  - added: EdgeCurrencyInfo.canReplaceByFee
+- Upgrade edge-exchange-plugins to v0.12.17
+  - Add SpookySwap exchange plugin
+  - Coingecko: Add TSHARE, TOMB, and MAI exchange rates
+  - Transfer: Don't allow transfers if the currency code doesn't match
+- Upgrade edge-currency-monero to v0.4.0
+  - added: Move the forked code out of mymonero-core-js directly into this repo.
+  - changed: Require react-native-mymonero-core ^0.1.2
+- Upgrade react-native-fast-crypto to v2.2.0
+  - changed: Compile secp256k1 as an XCFramework, making it compatible with the iOS simulator on M1 Macs.
+
 ## 2.12.1 (2022-03-29)
 
 - Add Bitpay v2 to send scene

README.md

@@ -35,14 +35,6 @@ This project uses Yarn to manage Javascript dependencies:
 
 Do not use NPM to install dependencies, since that will not work.
 
-### Install Rust and Cargo
-
-You need to install Rust and Cargo in order to build the ZcashLightClientKit library. Once installed, you need to add the appropriate architectures using `rustup`:
-
-    curl https://sh.rustup.rs -sSf | sh
-    cargo install cargo-lipo
-    rustup target add aarch64-apple-ios x86_64-apple-ios
-
 ### Checkout develop branch & install node_modules
 
     cd edge-react-gui

android/app/build.gradle

@@ -114,7 +114,7 @@ def jscFlavor = 'org.webkit:android-jsc:+'
 /**
  * Whether to enable the Hermes VM.
  *
- * This should be set on project.ext.react and mirrored here.  If it is not set
+ * This should be set on project.ext.react and that value will be read here. If it is not set
  * on project.ext.react, JavaScript will not be compiled to Hermes Bytecode
  * and the benefits of using Hermes will therefore be sharply reduced.
  */
@@ -125,11 +125,6 @@ android {
 
     compileSdkVersion rootProject.ext.compileSdkVersion
 
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-
     defaultConfig {
         multiDexEnabled true
         applicationId "co.edgesecure.app"
@@ -218,7 +213,7 @@ dependencies {
 // Run this once to be able to run the application with BUCK
 // puts all compile dependencies into folder libs for BUCK to use
 task copyDownloadableDepsToLibs(type: Copy) {
-    from configurations.compile
+    from configurations.implementation
     into 'libs'
 }
 

android/app/proguard-rules.pro

@@ -8,7 +8,3 @@
 #   http://developer.android.com/guide/developing/tools/proguard.html
 
 # Add any project specific keep options here:
-
-# Hermes
--keep class com.facebook.hermes.unicode.** { *; }
--keep class com.facebook.jni.** { *; }

android/app/src/main/AndroidManifest.xml

@@ -1,7 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-  package="co.edgesecure.app"
-  android:versionCode="1"
-  android:versionName="1.0">
+  package="co.edgesecure.app">
 
   <uses-permission android:name="android.permission.INTERNET" />
   <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
@@ -22,9 +20,6 @@
   <uses-feature android:name="android.hardware.fingerprint" android:required="false" />
   <uses-feature android:name="android.hardware.location" android:required="false" />
 
-  <uses-sdk
-    android:targetSdkVersion="28" />
-
   <queries>
     <package android:name="com.bankid.bus" />
     <package android:name="se.bankgirot.swish" />
@@ -34,23 +29,25 @@
       <data android:scheme="https" />
     </intent>
   </queries>
+
   <application
     android:name=".MainApplication"
     android:label="@string/app_name"
     android:icon="@mipmap/ic_launcher"
     android:roundIcon="@mipmap/ic_launcher_round"
     android:allowBackup="false"
     android:extractNativeLibs="true"
-    android:theme="@style/AppTheme"
-    android:usesCleartextTraffic="true">
+    android:usesCleartextTraffic="true"
+    android:theme="@style/AppTheme">
     <meta-data android:name="com.bugsnag.android.API_KEY"
                android:value="5aca2dbe708503471d8137625e092675"/>
     <activity
       android:name=".MainActivity"
       android:label="@string/app_name"
       android:configChanges="keyboard|keyboardHidden|orientation|screenSize|uiMode"
-      android:windowSoftInputMode="adjustPan"
-      android:launchMode="singleTask">
+      android:exported="true"
+      android:launchMode="singleTask"
+      android:windowSoftInputMode="adjustPan">
       <intent-filter>
         <action android:name="android.intent.action.MAIN" />
         <category android:name="android.intent.category.LAUNCHER" />

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

@@ -3,7 +3,6 @@
     <!-- Base application theme. -->
     <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>
           as requested by react-native-smart-splash-screen crashes on Oreo
           because we also request portrait mode. -->

android/build.gradle

@@ -2,19 +2,18 @@
 
 buildscript {
     ext {
-        buildToolsVersion = "29.0.3"
-        minSdkVersion = 24
-        compileSdkVersion = 29
+        buildToolsVersion = "30.0.2"
+        minSdkVersion = 21
+        compileSdkVersion = 30
         targetSdkVersion = 30
-        ndkVersion = "20.1.5948944"
-        kotlinVersion = "1.3.50"
+        ndkVersion = "21.4.7075529"
     }
     repositories {
         google()
         mavenCentral()
     }
     dependencies {
-        classpath("com.android.tools.build:gradle:4.1.0")
+        classpath("com.android.tools.build:gradle:4.2.2")
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
 
@@ -25,7 +24,6 @@ buildscript {
 
 allprojects {
     repositories {
-        mavenLocal()
         maven {
             // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
             url("$rootDir/../node_modules/react-native/android")
@@ -34,18 +32,15 @@ allprojects {
             // Android JSC is installed from npm
             url("$rootDir/../node_modules/jsc-android/dist")
         }
-
-        google()
-        mavenCentral()
-        jcenter() {
+         mavenCentral {
+            // We don't want to fetch react-native from Maven Central as there are
+            // older versions over there.
             content {
-                includeGroup("com.facebook.fbjni")
-                includeGroup("com.facebook.flipper")
-                includeGroup("com.facebook.fresco")
-                includeGroup("com.facebook.yoga")
-                includeGroup("com.eightbitlab")
+                excludeGroup "com.facebook.react"
             }
-    }
+        }
+
+        google()
         maven { url 'https://www.jitpack.io' }
     }
 }

android/gradle.properties

@@ -9,7 +9,7 @@
 
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
-# Default value: -Xmx10248m -XX:MaxPermSize=256m
+# Default value: -Xmx1024m -XX:MaxPermSize=256m
 # org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
 
 # When configured, Gradle will run in incubating parallel mode.
@@ -25,7 +25,7 @@ android.useAndroidX=true
 android.enableJetifier=true
 
 # Version of flipper SDK to use with React Native
-FLIPPER_VERSION=0.75.1
+FLIPPER_VERSION=0.99.0
 
 # 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.7-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

env.example.json

@@ -20,23 +20,25 @@
     "apiKey": ""
   },
   "x_ETHEREUM_INIT": {
-    "etherscanApiKey": [],
+    "evmScanApiKey": [],
     "infuraProjectId": "",
     "blockchairApiKey": "",
     "alethioApiKey": "",
+    "gasStationApiKey": "",
     "amberdataApiKey": ""
   },
   "x_BINANCE_SMART_CHAIN_INIT": {
-    "bscscanApiKey": []
+    "evmScanApiKey": []
   },
   "x_EXOLIX_INIT": {
     "apiKey": ""
   },
   "X_FANTOM_INIT": {
-    "ftmscanApiKey": ""
+    "evmScanApiKey": "",
+    "quiknodeApiKey": ""
   },
-  "POLYGON_INIT": {
-    "polygonscanApiKey": []
+  "x_POLYGON_INIT": {
+    "evmScanApiKey": []
   },
   "x_FOX_INIT": {
     "apiKey": ""

ios/Podfile

@@ -1,6 +1,8 @@
+source "https://cdn.cocoapods.org/"
 require_relative '../node_modules/react-native/scripts/react_native_pods'
 require_relative '../node_modules/@react-native-community/cli-platform-ios/native_modules'
 
+# Edge change: React Native itself only requires 11.0:
 platform :ios, '12.0'
 
 target 'edge' do
@@ -18,22 +20,15 @@ target 'edge' do
   # you should disable the next line.
   use_flipper!()
 
-  pod 'react-native-zcash', :path => '../node_modules/react-native-zcash'
-  # Necessary for Zcash
-  pod ‘CNIOAtomics’,:modular_headers => true
-  pod ‘CNIOBoringSSL’,:modular_headers => true
-  pod ‘CNIOBoringSSLShims’,:modular_headers => true
-  pod ‘CNIOLinux’,:modular_headers => true
-  pod ‘CNIODarwin’,:modular_headers => true
-  pod ‘CNIOHTTPParser’,:modular_headers => true
-  pod ‘CNIOWindows’,:modular_headers => true
-  pod ‘CGRPCZlib’,:modular_headers => true
-
   post_install do |installer|
     react_native_post_install(installer)
+    __apply_Xcode_12_5_M1_post_install_workaround(installer)
   end
 
+  # --------------------------------------------------------------------------
   # Edge additions
+  # --------------------------------------------------------------------------
+
   pod 'RNVectorIcons', :path => '../node_modules/react-native-vector-icons'
 
   # Permissions
@@ -46,4 +41,15 @@ target 'edge' do
   pod 'Permission-LocationWhenInUse', :path => "#{permissions_path}/LocationWhenInUse"
   pod 'Permission-Notifications', :path => "#{permissions_path}/Notifications"
 
+  # Necessary for Zcash
+  pod 'react-native-zcash', :path => '../node_modules/react-native-zcash'
+  pod 'CNIOAtomics', :modular_headers => true
+  pod 'CNIOBoringSSL', :modular_headers => true
+  pod 'CNIOBoringSSLShims', :modular_headers => true
+  pod 'CNIOLinux', :modular_headers => true
+  pod 'CNIODarwin', :modular_headers => true
+  pod 'CNIOHTTPParser', :modular_headers => true
+  pod 'CNIOWindows', :modular_headers => true
+  pod 'CGRPCZlib', :modular_headers => true
+  pod 'ZcashLightClientKit', :git => 'https://github.com/zcash/ZcashLightClientKit.git', :tag => '0.13.0-beta.2'
 end