Merge remote-tracking branch 'origin/dev'

# Conflicts: # yarn.lock
VerusCoin · Dec 4, 2020 · d556c5b · d556c5b
2 parents e300731 + ce68978
commit d556c5b
Show file tree

Hide file tree

Showing 8 changed files with 807 additions and 1,242 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -5,7 +5,7 @@ import com.android.build.OutputFile
 def versionMajor = 0
 def versionMinor = 2
 def versionRevision = 0
-def versionBuild = 1
+def versionBuild = 2
 
 def keystorePropertiesFile = rootProject.file("keystore.properties");
 
@@ -142,7 +142,11 @@ android {
             abiFilters "armeabi-v7a", "x86", "arm64-v8a", "x86_64"
         }
     }
-
+    configurations {
+        all {
+            exclude group: 'org.json', module: 'json'
+        }
+    }
 
     dexOptions
             {

diff --git a/env/main.json b/env/main.json
@@ -1,5 +1,5 @@
 {
-  "APP_VERSION": "0.2.0-beta",
+  "APP_VERSION": "0.2.0-beta-2",
   "VERUS_QR_VERSION": "0.2.0",
   "CHAIN_QR_VERSION": "0.1.0",
   "ELECTRUM_PROTOCOL_CHANGE": 1.4,

diff --git a/ios/assets/env/main.json b/ios/assets/env/main.json
@@ -1,5 +1,5 @@
 {
-  "APP_VERSION": "0.2.0-beta",
+  "APP_VERSION": "0.2.0-beta-2",
   "VERUS_QR_VERSION": "0.2.0",
   "CHAIN_QR_VERSION": "0.1.0",
   "ELECTRUM_PROTOCOL_CHANGE": 1.4,

diff --git a/ios/verusMobile.xcodeproj/project.pbxproj b/ios/verusMobile.xcodeproj/project.pbxproj
@@ -911,7 +911,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 0.06;
+				CURRENT_PROJECT_VERSION = 0.07;
 				DEAD_CODE_STRIPPING = NO;
 				DEVELOPMENT_TEAM = J8Y97B5NMQ;
 				ENABLE_BITCODE = NO;
@@ -981,7 +981,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 0.06;
+				CURRENT_PROJECT_VERSION = 0.07;
 				DEVELOPMENT_TEAM = J8Y97B5NMQ;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = verusmobile/Info.plist;

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "verusmobile",
-  "version": "0.2.0-beta",
+  "version": "0.2.0-beta-2",
   "private": true,
   "scripts": {
     "postinstall": "patch-package && ./node_modules/.bin/rn-nodeify --hack --install && npx jetify",

diff --git a/src/utils/api/channels/electrum/requests/pushTx.js b/src/utils/api/channels/electrum/requests/pushTx.js
@@ -206,7 +206,6 @@ export const txPreflight = (coinObj, activeUser, outputAddress, value, params) =
         for (let i = 0; i < inputs.length; i++) {
           if (Number(inputs[i].interestSats) > interestClaimThreshold) {
             totalInterest += Number(inputs[i].interestSats);
-            totalInterestUTXOCount++;
           }
         }
       }

diff --git a/src/utils/api/channels/eth/requests/send.js b/src/utils/api/channels/eth/requests/send.js
@@ -23,11 +23,6 @@ export const send = async (coinObj, activeUser, address, amount, params) => {
 
     const signedTx = await etherKeys(privKey, true).sign(transaction)
 
-    console.log(signedTx)
-    console.log(
-      ethers.utils.parseTransaction(ethers.utils.hexlify(signedTx))
-    );
-
     const response = await Web3Provider.EtherscanProvider.sendTransaction(signedTx);
 
     return {