diff options
| author | Dan Finlay <dan@danfinlay.com> | 2016-08-25 07:59:22 +0800 |
|---|---|---|
| committer | Dan Finlay <dan@danfinlay.com> | 2016-08-25 07:59:22 +0800 |
| commit | 793ad6b8d8c5edec96553f3048595deff94d6f05 (patch) | |
| tree | 47b0721cb4d434fe164029807c71142aade633f8 /app | |
| parent | 4e34796983e399c05f18c3bd1355e2eea83ad891 (diff) | |
| parent | 4448b635b9246103b59fecc617bcee806d66712c (diff) | |
| download | tangerine-wallet-browser-793ad6b8d8c5edec96553f3048595deff94d6f05.tar.gz tangerine-wallet-browser-793ad6b8d8c5edec96553f3048595deff94d6f05.tar.zst tangerine-wallet-browser-793ad6b8d8c5edec96553f3048595deff94d6f05.zip | |
Merge branch 'master' into PopupNotifications
Diffstat (limited to 'app')
| -rw-r--r-- | app/manifest.json | 2 | ||||
| -rw-r--r-- | app/scripts/lib/config-manager.js | 4 | ||||
| -rw-r--r-- | app/scripts/metamask-controller.js | 1 |
3 files changed, 4 insertions, 3 deletions
diff --git a/app/manifest.json b/app/manifest.json index c1b9ee817..96b5879e2 100644 --- a/app/manifest.json +++ b/app/manifest.json @@ -1,7 +1,7 @@ { "name": "MetaMask", "short_name": "Metamask", - "version": "2.9.0", + "version": "2.9.1", "manifest_version": 2, "description": "Ethereum Browser Extension", "commands": { diff --git a/app/scripts/lib/config-manager.js b/app/scripts/lib/config-manager.js index 4d270bcdb..715efb42e 100644 --- a/app/scripts/lib/config-manager.js +++ b/app/scripts/lib/config-manager.js @@ -300,9 +300,10 @@ ConfigManager.prototype.updateConversionRate = function () { this.setConversionPrice(0) this.setConversionDate('N/A') }) + } -ConfigManager.prototype.setConversionPrice = function(price) { +ConfigManager.prototype.setConversionPrice = function (price) { var data = this.getData() data.conversionRate = Number(price) this.setData(data) @@ -372,4 +373,3 @@ ConfigManager.prototype.createShapeShiftTx = function (depositAddress, depositTy } this.setData(data) } - diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js index 81b232730..e94db2dfd 100644 --- a/app/scripts/metamask-controller.js +++ b/app/scripts/metamask-controller.js @@ -219,6 +219,7 @@ module.exports = class MetamaskController { newUnsignedMessage (msgParams, cb) { var state = this.idStore.getState() if (!state.isUnlocked) { + this.idStore.addUnconfirmedMessage(msgParams, cb) this.opts.unlockAccountMessage() } else { this.addUnconfirmedMessage(msgParams, cb) |