Merge branch 'dev' of https://github.com/VerusCoin/Agama into dev

VerusCoin · Jun 7, 2019 · b667032 · b667032
2 parents a71dc45 + 0d4bf9c
commit b667032
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 16 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -9,8 +9,8 @@ variables:
   DOCKER_DRIVER: overlay2
   DEFAULT_VERUSCOIN_BRANCH: ${CI_COMMIT_REF_NAME}
   DEFAULT_EASYDEXGUI_BRANCH: ${CI_COMMIT_REF_NAME}
-  AGAMA_VERSION: 0.6.0-13-PBaaS-Cross-chain-Technology-Preview
-  VERUSCOIN_VERSION: 0.6.0-12-PBaaS-Cross-chain-Technology-Preview
+  AGAMA_VERSION: 0.5.7
+  VERUSCOIN_VERSION: 0.5.7
   KOMODO_VERSION: 0.3.3b-beta
   BINARY_SOURCE: VerusCoin
   EASYDEX_GUI_BUILD: build.tar.gz

diff --git a/gui/EasyDEX-GUI b/gui/EasyDEX-GUI
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "Agama",
   "productName": "Agama",
-  "version": "0.6.0+13",
+  "version": "0.5.7",
   "description": "Agama Wallet Desktop App",
   "main": "main.js",
   "scripts": {
@@ -41,7 +41,6 @@
   "dependencies": {
     "adm-zip": "^0.4.7",
     "agama-wallet-lib": "git://github.com/VerusCoin/agama-wallet-lib#dev",
-    "coins": "https://github.com/jl777/coins.git",
     "arch": "^2.1.0",
     "async": "^2.6.0",
     "bigi": "^1.4.2",
@@ -98,7 +97,7 @@
     ],
     "asar": false,
     "mac": {
-      "artifactName": "${productName}-MacOS-v${version}-13-PBaaS-Cross-chain-Technology-Preview.${ext}",
+      "artifactName": "${productName}-MacOS-v${version}.${ext}",
       "icon": "assets/icons/agama_icons/agama_app_icon.icns",
       "target": [
         "dmg",
@@ -121,7 +120,7 @@
       ]
     },
     "linux": {
-      "artifactName": "${productName}-Linux-v${version}-13-PBaaS-Cross-chain-Technology-Preview.${ext}",
+      "artifactName": "${productName}-Linux-v${version}.${ext}",
       "icon": "assets/icons/agama_icons",
       "desktop": {
         "Encoding": "UTF-8"
@@ -131,7 +130,7 @@
       ]
     },
     "win": {
-      "artifactName": "${productName}-Windows-v${version}-13-PBaaS-Cross-chain-Technology-Preview.${ext}",
+      "artifactName": "${productName}-Windows-v${version}.${ext}",
       "target": [
         "nsis",
         "zip"

diff --git a/version b/version
@@ -1,3 +1,3 @@
-version=0.6.0-13-PBaaS-Cross-chain-Technology-Preview
+version=0.5.7
 type=beta
-minversion=0.6.0-13-PBaaS-Cross-chain-Technology-Preview
+minversion=0.5.7
diff --git a/version_build b/version_build
@@ -1 +1 @@
-0.6.0-13-PBaaS-Cross-chain-Technology-Preview
+0.5.7
diff --git a/yarn.lock b/yarn.lock
@@ -569,7 +569,6 @@ bitcoinjs-message@^2.0.0:
 
 "bitcore-lib-zcash@git+https://github.com/zcash-hackworks/bitcore-lib-zcash":
   version "0.13.19"
-  uid e97ae1dd2e9f14d6076d5e5429c75d8965afa4ab
   resolved "git+https://github.com/zcash-hackworks/bitcore-lib-zcash#e97ae1dd2e9f14d6076d5e5429c75d8965afa4ab"
   dependencies:
     bn.js "=2.0.4"
@@ -1054,10 +1053,6 @@ code-point-at@^1.0.0:
   resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
   integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=
 
-"coins@https://github.com/jl777/coins.git":
-  version "0.0.0"
-  resolved "https://github.com/jl777/coins.git#3694bff905902b945c906322051be04cfb1d44e4"
-
 "coinselect@github:bitcoinjs/coinselect":
   version "3.1.11"
   resolved "https://codeload.github.com/bitcoinjs/coinselect/tar.gz/288f24d221e5f1e5beac883043cc706914b2b2bd"
+40 −7		react/.babelrc
+3 −0		react/__tests__/components/__snapshots__/main.tests.js.snap
+10 −0		react/__tests__/components/main.tests.js
+52 −0		react/babel.config.js
+19 −0		react/jest.config.js
+39 −26		react/package.json
+ −		react/src/assets/images/cryptologo/btc/k64.png
+19 −15		react/src/components/addcoin/addcoinOptionsCustom.js
+3 −3		react/src/components/dashboard/coinTile/coinTileItem.render.js
+3 −1		react/src/components/dashboard/sendCoin/sendCoin.render.js
+1 −0		react/src/components/dashboard/tools/kmdexplorer.js
+8 −0		react/src/components/login/login.render.js
+14 −2		react/src/config.js
+1 −0		react/src/translate/coins.js
+7 −3		react/src/util/acHerdData.js
+3 −1		react/src/util/mainWindow.js
+118 −0		react/src/util/testutil/testConfig.js
+3 −3		react/webpack.config.js
+1,919 −970		react/yarn.lock
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		0.6.0-13-PBaaS-Cross-chain-Technology-Preview
		0.5.7