Merge pull request #52 from VerusCoin/dev

v0.7.1-1
VerusCoin · Jul 16, 2020 · 94ea208 · 94ea208
2 parents 0166f1a + 8603541
commit 94ea208
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 10 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -8,8 +8,8 @@ stages:
 variables:
   DOCKER_DRIVER: overlay2
   DEFAULT_VERUSCOIN_BRANCH: release
-  VERUS_VERSION: 0.7.1
-  VERUSCOIN_VERSION: 0.7.1
+  VERUS_VERSION: 0.7.1-1
+  VERUSCOIN_VERSION: 0.7.1-1
   KOMODO_VERSION: 0.6.1
   BINARY_SOURCE: VerusCoin
   VERUS_APPIMAGE_X64: Verus-Desktop-v${VERUS_VERSION}-x86_64.AppImage

diff --git a/gui/Verus-Desktop-GUI b/gui/Verus-Desktop-GUI
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "verus-desktop",
   "productName": "Verus-Desktop",
-  "version": "0.7.1",
+  "version": "0.7.1-1",
   "description": "Verus Desktop Wallet App",
   "main": "main.js",
   "scripts": {

diff --git a/routes/api/daemonControl.js b/routes/api/daemonControl.js
@@ -193,8 +193,8 @@ module.exports = (api) => {
                   api.writeRpcPort(coin, confFile, fallbackPort),
                   api.writeRpcPassword(confFile),
                   api.writeRpcUser(confFile),
-                  api.WriteAddNode('185.25.48.72', confFile, '16329'),
-                  api.WriteAddNode('185.64.105.111', confFile, '16329')
+                  api.WriteAddNode('185.25.48.72', confFile, '19424'),
+                  api.WriteAddNode('185.64.105.111', confFile, '19424')
                 ]);
               } else {
                 return Promise.all([

diff --git a/routes/api/native/send.js b/routes/api/native/send.js
@@ -136,7 +136,7 @@ module.exports = (api) => {
               ] != null
             ) {
               price = toCurrency.bestcurrencystate.currencies[fromCurrency.currencyid].lastconversionprice;
-              conversionValue = 1 / (spendAmount * price)
+              conversionValue = spendAmount * (1 / price)
             } else if (
               fromCurrency.bestcurrencystate != null &&
               fromCurrency.bestcurrencystate.currencies[

diff --git a/routes/ports.js b/routes/ports.js
@@ -52,7 +52,7 @@ const assetChainPorts = {
   ZEXO: 33970,
   LABS: 40265,
   DP: 28388,
-  VRSCTEST: 18268,
+  VRSCTEST: 19425,
   VRSC: 27486,
   ZEC: 11192,
   VOTE2020: 44249

diff --git a/version b/version
@@ -1,2 +1,2 @@
-version=0.7.1
-minversion=0.7.1
+version=0.7.1-1
+minversion=0.7.1-1
+9 −2		react/src/components/modals/exportToCsv/exportToCsv.render.js
+6 −6		react/src/components/modals/sendCoin/sendCoin.js
+13 −9		react/src/components/modals/sendCoin/traditionalSendForm/traditionalSendForm.js
+1 −0		react/src/components/modals/sendCoin/traditionalSendForm/traditionalSendForm.render.js
+1 −1		react/src/containers/CurrencyCard/CurrencyCard.js
+20 −40		react/src/util/multiverse/multiverseCurrencyUtils.js