From e197e3808ff70058ccf3eca0d11255e61180373a Mon Sep 17 00:00:00 2001 From: Dan Finlay Date: Mon, 19 Sep 2016 10:15:19 +0800 Subject: Drop origin key from requests for Parity compatibility --- app/scripts/metamask-controller.js | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'app/scripts') diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js index 06337be1c..2b10c8c35 100644 --- a/app/scripts/metamask-controller.js +++ b/app/scripts/metamask-controller.js @@ -75,6 +75,10 @@ module.exports = class MetamaskController { } onRpcRequest (stream, originDomain, request) { + + /* Commented out for Parity compliance + * Parity does not permit additional keys, like `origin`, + * and Infura is not currently filtering this key out. var payloads = Array.isArray(request) ? request : [request] payloads.forEach(function (payload) { // Append origin to rpc payload @@ -86,6 +90,7 @@ module.exports = class MetamaskController { payload.params.push({ origin: originDomain }) } }) + */ // handle rpc request this.provider.sendAsync(request, function onPayloadHandled (err, response) { -- cgit v1.2.3 From 0a8a25c818f4c3059998445730c632158deaaf43 Mon Sep 17 00:00:00 2001 From: Frankie Date: Sat, 1 Oct 2016 09:31:14 +0800 Subject: Fix issue #688 where fiat conversion does not persist when switching networks --- app/scripts/metamask-controller.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'app/scripts') diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js index 2b10c8c35..fceac5263 100644 --- a/app/scripts/metamask-controller.js +++ b/app/scripts/metamask-controller.js @@ -22,7 +22,8 @@ module.exports = class MetamaskController { this.idStore.setStore(this.ethStore) this.messageManager = messageManager this.publicConfigStore = this.initPublicConfigStore() - this.configManager.setCurrentFiat('USD') + var currentFiat = this.configManager.getCurrentFiat() ? this.configManager.getCurrentFiat() : 'USD' + this.configManager.setCurrentFiat(currentFiat) this.configManager.updateConversionRate() this.scheduleConversionInterval() } -- cgit v1.2.3 From ebf864ae6e0efe7acbd83314c4343a73db38564d Mon Sep 17 00:00:00 2001 From: Frankie Date: Sun, 2 Oct 2016 04:53:43 +0800 Subject: Fix for readability --- app/scripts/metamask-controller.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/scripts') diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js index fceac5263..9e1a885ae 100644 --- a/app/scripts/metamask-controller.js +++ b/app/scripts/metamask-controller.js @@ -22,7 +22,7 @@ module.exports = class MetamaskController { this.idStore.setStore(this.ethStore) this.messageManager = messageManager this.publicConfigStore = this.initPublicConfigStore() - var currentFiat = this.configManager.getCurrentFiat() ? this.configManager.getCurrentFiat() : 'USD' + var currentFiat = this.configManager.getCurrentFiat() || 'USD' this.configManager.setCurrentFiat(currentFiat) this.configManager.updateConversionRate() this.scheduleConversionInterval() -- cgit v1.2.3