From 7a76d80eb2e894461cc9ef12913dde3638b37009 Mon Sep 17 00:00:00 2001 From: Victor Baranov Date: Mon, 15 Apr 2019 12:44:24 +0300 Subject: [PATCH 1/3] Remove js obfuscation to fit new Google Chrome extensions development guidelines --- gulpfile.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gulpfile.js b/gulpfile.js index 289cce2b5ffb..193b64466382 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -302,7 +302,7 @@ function createTasksForBuildJsExtension ({ buildJsFiles, taskPrefix, devMode, bu bundleTaskOpts = Object.assign({ buildSourceMaps: true, sourceMapDir: devMode ? './' : '../sourcemaps', - minifyBuild: !devMode, + minifyBuild: false, buildWithFullPaths: devMode, watch: devMode, devMode, @@ -318,7 +318,7 @@ function createTasksForBuildJsMascara ({ taskPrefix, devMode, bundleTaskOpts = { bundleTaskOpts = Object.assign({ buildSourceMaps: true, sourceMapDir: './', - minifyBuild: !devMode, + minifyBuild: false, buildWithFullPaths: devMode, watch: devMode, devMode, From adff219218571f180c76a768f6e5648a6eeafeee Mon Sep 17 00:00:00 2001 From: Victor Baranov Date: Mon, 15 Apr 2019 13:03:35 +0300 Subject: [PATCH 2/3] Fix USD price for ETC --- app/scripts/controllers/currency.js | 2 +- ui/app/actions.js | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/app/scripts/controllers/currency.js b/app/scripts/controllers/currency.js index 7ce6b31d70af..6298b9593961 100644 --- a/app/scripts/controllers/currency.js +++ b/app/scripts/controllers/currency.js @@ -130,7 +130,7 @@ class CurrencyController { currentCurrency = this.getCurrentCurrency() currentCoin = this.getCurrentCoin() let conversionRate, conversionDate - if (currentCoin === 'poa') { + if (currentCoin === 'poa' || currentCoin === 'etc') { const apiLink = `https://min-api.cryptocompare.com/data/price?fsym=${currentCoin.toUpperCase()}&tsyms=${currentCurrency.toUpperCase()}` const response = await fetch(apiLink) const parsedResponse = await response.json() diff --git a/ui/app/actions.js b/ui/app/actions.js index 9845988fb57c..7ccba548e534 100644 --- a/ui/app/actions.js +++ b/ui/app/actions.js @@ -13,7 +13,8 @@ const log = require('loglevel') const { ENVIRONMENT_TYPE_NOTIFICATION } = require('../../app/scripts/lib/enums') const { POA, DAI, - POA_SOKOL } = require('../../app/scripts/controllers/network/enums') + POA_SOKOL, + CLASSIC } = require('../../app/scripts/controllers/network/enums') const { hasUnconfirmedTransactions } = require('./helpers/confirm-transaction/util') const WebcamUtils = require('../lib/webcam-utils') @@ -2012,7 +2013,8 @@ function setProviderType (type) { const newCoin = type === POA || type === POA_SOKOL ? 'poa' : type === DAI ? - 'dai' : 'eth' + 'dai' : type === CLASSIC ? + 'etc' : 'eth' background.setCurrentCoin(newCoin, (err, data) => { if (err) { log.error(err.stack) From a2de74e422c3324731fd83ef542f318637090bed Mon Sep 17 00:00:00 2001 From: Victor Baranov Date: Mon, 15 Apr 2019 14:53:27 +0300 Subject: [PATCH 3/3] Update changelog and version bump --- CHANGELOG.md | 5 +++++ app/manifest.json | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6af1f6715e4f..9cfcf5651d28 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,11 @@ ## Current Master +## 4.11.4 Mon Apr 15 2019 + +- [#277](https://github.com/poanetwork/nifty-wallet/pull/277): (Fix) USD price for ETC coin +- [#276](https://github.com/poanetwork/nifty-wallet/pull/276): (Fix) Remove js obfuscation + ## 4.11.3 Fri Mar 29 2019 - [#272](https://github.com/poanetwork/nifty-wallet/pull/272): Update Classic RPC endpoint diff --git a/app/manifest.json b/app/manifest.json index 026cb0e46783..94ecf38f3523 100644 --- a/app/manifest.json +++ b/app/manifest.json @@ -1,7 +1,7 @@ { "name": "__MSG_appName__", "short_name": "__MSG_appName__", - "version": "4.11.3", + "version": "4.11.4", "manifest_version": 2, "author": "POA Network", "description": "__MSG_appDescription__",