diff options
| author | Kevin Serrano <kevgagser@gmail.com> | 2017-03-15 08:52:03 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-15 08:52:03 +0800 |
| commit | a186e40d179d230fc1e81f7f507a5232d23ad462 (patch) | |
| tree | 91d9cbb8baa26efa462a86e9ecda460792f90996 /app | |
| parent | fcee7723e99c13b3fddcb97853dfdd771b42de14 (diff) | |
| parent | 570cc891b5386dc04462737de4df6f2adf5059c9 (diff) | |
| download | tangerine-wallet-browser-a186e40d179d230fc1e81f7f507a5232d23ad462.tar tangerine-wallet-browser-a186e40d179d230fc1e81f7f507a5232d23ad462.tar.gz tangerine-wallet-browser-a186e40d179d230fc1e81f7f507a5232d23ad462.tar.bz2 tangerine-wallet-browser-a186e40d179d230fc1e81f7f507a5232d23ad462.tar.lz tangerine-wallet-browser-a186e40d179d230fc1e81f7f507a5232d23ad462.tar.xz tangerine-wallet-browser-a186e40d179d230fc1e81f7f507a5232d23ad462.tar.zst tangerine-wallet-browser-a186e40d179d230fc1e81f7f507a5232d23ad462.zip | |
Merge branch 'master' into i1165-predictive
Diffstat (limited to 'app')
| -rw-r--r-- | app/scripts/metamask-controller.js | 2 | ||||
| -rw-r--r-- | app/scripts/migrations/010.js | 2 | ||||
| -rw-r--r-- | app/scripts/migrations/011.js | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js index 1fcee61da..25f9d9e5d 100644 --- a/app/scripts/metamask-controller.js +++ b/app/scripts/metamask-controller.js @@ -636,7 +636,7 @@ module.exports = class MetamaskController extends EventEmitter { this.currencyController.updateConversionRate() const data = { conversionRate: this.currencyController.getConversionRate(), - currentFiat: this.currencyController.getCurrentCurrency(), + currentCurrency: this.currencyController.getCurrentCurrency(), conversionDate: this.currencyController.getConversionDate(), } cb(null, data) diff --git a/app/scripts/migrations/010.js b/app/scripts/migrations/010.js index 48a841bc1..c0cc56ae4 100644 --- a/app/scripts/migrations/010.js +++ b/app/scripts/migrations/010.js @@ -2,7 +2,7 @@ const version = 10 /* -This migration breaks out the CurrencyController substate +This migration breaks out the ShapeShiftController substate */ diff --git a/app/scripts/migrations/011.js b/app/scripts/migrations/011.js index bf283ef98..0d5d6d307 100644 --- a/app/scripts/migrations/011.js +++ b/app/scripts/migrations/011.js @@ -2,7 +2,7 @@ const version = 11 /* -This migration breaks out the CurrencyController substate +This migration removes the discaimer state from our app, which was integrated into our notices. */ |