Merge pull request #223 from VerusCoin/dev

v1.1.1-10
VerusCoin · Oct 25, 2023 · 196701d · 196701d
2 parents b39a3a8 + 5a41820
commit 196701d
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 9 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: 1.1.1-9
-  VERUSCOIN_VERSION: 1.1.1-8
+  VERUS_VERSION: 1.1.1-10
+  VERUSCOIN_VERSION: 1.1.1-10
   KOMODO_VERSION: 0.8.0
   KOMODO_DOWNLOAD_URL: https://github.com/KomodoPlatform/komodo/releases/download
   PIRATE_VERSION: 5.7.5

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": "1.1.1-9",
+  "version": "1.1.1-10",
   "description": "Verus Desktop Wallet App",
   "main": "main.js",
   "scripts": {

diff --git a/routes/api/native/verusbridge/verusbridge.js b/routes/api/native/verusbridge/verusbridge.js
@@ -34,11 +34,11 @@ module.exports = (api) => {
   };
 
   api.native.bridgekeeper_status = (chainTicker) => {
-    return new Promise((resolve, reject) => {
+    return new Promise(async (resolve, reject) => {
       if (chainTicker !== "VRSC")
         reject(new Error("bridgekeeper not currently supported outside of VRSC"));
 
-      const result = server.status();
+      const result = await server.status();
 
       if (result) resolve(result);
       else reject(result);

diff --git a/version.json b/version.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.1.1-9",
+  "version": "1.1.1-10",
   "minVersion": "1.1.1-8",
   "versionUrl": "https://raw.githubusercontent.com/VerusCoin/Verus-Desktop/master/version.json",
   "repository": "https://github.com/VerusCoin/Verus-Desktop/"

diff --git a/version_build b/version_build
@@ -1 +1 @@
-1.1.1-9
+1.1.1-10
diff --git a/yarn.lock b/yarn.lock
@@ -7729,7 +7729,7 @@ verror@^1.10.0:
 
 "verus_bridgekeeper@git+https://github.com/VerusCoin/verusbridgekeeper.git":
   version "1.0.6"
-  resolved "git+https://github.com/VerusCoin/verusbridgekeeper.git#984bfc79868be48d4875ba4b4505a42019d0d844"
+  resolved "git+https://github.com/VerusCoin/verusbridgekeeper.git#1867c0bf4f934290e6b0983f426f2341d245d8e0"
   dependencies:
     async "^3.2.4"
     axios "0.25.0"
+3 −8		react/src/components/modals/bridgekeeper/bridgekeeper.js
+5 −1		react/src/components/postAuth/apps/mining/mining.js
+8 −4		react/src/components/postAuth/apps/mining/miningWallet/miningWallet.render.js