diff options
| author | kumavis <kumavis@users.noreply.github.com> | 2017-03-15 08:26:06 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-15 08:26:06 +0800 |
| commit | 53efc53a4016d464d03ad7f1b474e1b09b0b4b9b (patch) | |
| tree | 9bb5bdb7dc39c774c574f9f910661d118ca5f0ce /app/scripts | |
| parent | 33a70a695bf054cc156262c45ad875d8eda02dc6 (diff) | |
| parent | 570cc891b5386dc04462737de4df6f2adf5059c9 (diff) | |
| download | tangerine-wallet-browser-53efc53a4016d464d03ad7f1b474e1b09b0b4b9b.tar tangerine-wallet-browser-53efc53a4016d464d03ad7f1b474e1b09b0b4b9b.tar.gz tangerine-wallet-browser-53efc53a4016d464d03ad7f1b474e1b09b0b4b9b.tar.bz2 tangerine-wallet-browser-53efc53a4016d464d03ad7f1b474e1b09b0b4b9b.tar.lz tangerine-wallet-browser-53efc53a4016d464d03ad7f1b474e1b09b0b4b9b.tar.xz tangerine-wallet-browser-53efc53a4016d464d03ad7f1b474e1b09b0b4b9b.tar.zst tangerine-wallet-browser-53efc53a4016d464d03ad7f1b474e1b09b0b4b9b.zip | |
Merge branch 'master' into i#1203MainNetSwitch
Diffstat (limited to 'app/scripts')
| -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 536891dc6..2eaa53200 100644 --- a/app/scripts/metamask-controller.js +++ b/app/scripts/metamask-controller.js @@ -621,7 +621,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. */ |