Merge pull request #278 from poanetwork/develop

NW release 4.11.4
poanetwork · Apr 15, 2019 · 9ad8f70 · 9ad8f70
2 parents e5587a6 + a2de74e
commit 9ad8f70
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 6 deletions.
diff --git 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
@@ -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__",

diff --git 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/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,

diff --git 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)