Merge pull request #6683 from MetaMask/develop

Merge dev to master

1 files changed, 7 insertions, 2 deletions

diff --git a/test/unit/app/controllers/metamask-controller-test.js b/test/unit/app/controllers/metamask-controller-test.js
index a56b8adbd..1b8cde42e 100644
--- a/test/unit/app/controllers/metamask-controller-test.js
+++ b/test/unit/app/controllers/metamask-controller-test.js
@@ -45,6 +45,11 @@ describe('MetaMaskController', function () {
       .get(/.*/)
       .reply(200)
 
+    nock('https://min-api.cryptocompare.com')
+      .persist()
+      .get(/.*/)
+      .reply(200, '{"JPY":12415.9}')
+
     metamaskController = new MetaMaskController({
       showUnapprovedTx: noop,
       showUnconfirmedMessage: noop,
@@ -441,7 +446,7 @@ describe('MetaMaskController', function () {
     let defaultMetaMaskCurrency
 
     beforeEach(function () {
-      defaultMetaMaskCurrency = metamaskController.currencyController.getCurrentCurrency()
+      defaultMetaMaskCurrency = metamaskController.currencyRateController.state.currentCurrency
     })
 
     it('defaults to usd', function () {
@@ -450,7 +455,7 @@ describe('MetaMaskController', function () {
 
     it('sets currency to JPY', function () {
       metamaskController.setCurrentCurrency('JPY', noop)
-      assert.equal(metamaskController.currencyController.getCurrentCurrency(), 'JPY')
+      assert.equal(metamaskController.currencyRateController.state.currentCurrency, 'JPY')
     })
   })