Merge pull request #983 from MetaMask/slim1

deps - replace promise-request with fetch

3 files changed, 7 insertions, 6 deletions

diff --git a/app/scripts/lib/config-manager.js b/app/scripts/lib/config-manager.js
index 93501c859..3a1f12ac0 100644
--- a/app/scripts/lib/config-manager.js
+++ b/app/scripts/lib/config-manager.js
@@ -1,7 +1,6 @@
 const Migrator = require('pojo-migrator')
 const MetamaskConfig = require('../config.js')
 const migrations = require('./migrations')
-const rp = require('request-promise')
 const ethUtil = require('ethereumjs-util')
 const normalize = require('./sig-util').normalize
 
@@ -301,9 +300,9 @@ ConfigManager.prototype.getCurrentFiat = function () {
 
 ConfigManager.prototype.updateConversionRate = function () {
   var data = this.getData()
-  return rp(`https://www.cryptonator.com/api/ticker/eth-${data.fiatCurrency}`)
-  .then((response) => {
-    const parsedResponse = JSON.parse(response)
+  return fetch(`https://www.cryptonator.com/api/ticker/eth-${data.fiatCurrency}`)
+  .then(response => response.json())
+  .then((parsedResponse) => {
     this.setConversionPrice(parsedResponse.ticker.price)
     this.setConversionDate(parsedResponse.timestamp)
   }).catch((err) => {
diff --git a/package.json b/package.json
index 6f0fe00c7..3a02c64df 100644
--- a/package.json
+++ b/package.json
@@ -85,7 +85,6 @@
     "redux": "^3.0.5",
     "redux-logger": "^2.3.1",
     "redux-thunk": "^1.0.2",
-    "request-promise": "^4.1.1",
     "sandwich-expando": "^1.0.5",
     "textarea-caret": "^3.0.1",
     "three.js": "^0.73.2",
@@ -118,6 +117,7 @@
     "gulp-util": "^3.0.7",
     "gulp-watch": "^4.3.5",
     "gulp-zip": "^3.2.0",
+    "isomorphic-fetch": "^2.2.1",
     "jsdom": "^8.1.0",
     "jsdom-global": "^1.7.0",
     "jshint-stylish": "~0.1.5",
diff --git a/test/unit/config-manager-test.js b/test/unit/config-manager-test.js
index 075abbe65..77d431d5f 100644
--- a/test/unit/config-manager-test.js
+++ b/test/unit/config-manager-test.js
@@ -1,8 +1,10 @@
+// polyfill fetch
+global.fetch = global.fetch || require('isomorphic-fetch')
 const assert = require('assert')
 const extend = require('xtend')
 const rp = require('request-promise')
 const nock = require('nock')
-var configManagerGen = require('../lib/mock-config-manager')
+const configManagerGen = require('../lib/mock-config-manager')
 const STORAGE_KEY = 'metamask-persistance-key'
 
 describe('config-manager', function() {