diff options
| author | frankiebee <frankie.diamond@gmail.com> | 2017-09-28 07:14:58 +0800 |
|---|---|---|
| committer | frankiebee <frankie.diamond@gmail.com> | 2017-09-28 07:14:58 +0800 |
| commit | b24e16d346d0e71b140a659815a32be9ce7cd117 (patch) | |
| tree | fa363be0715448923aeeb9a1b34e764d6a94ee8f | |
| parent | 4979f5902fc15a7bb65e1e7420e699282d40c8b7 (diff) | |
| download | tangerine-wallet-browser-b24e16d346d0e71b140a659815a32be9ce7cd117.tar tangerine-wallet-browser-b24e16d346d0e71b140a659815a32be9ce7cd117.tar.gz tangerine-wallet-browser-b24e16d346d0e71b140a659815a32be9ce7cd117.tar.bz2 tangerine-wallet-browser-b24e16d346d0e71b140a659815a32be9ce7cd117.tar.lz tangerine-wallet-browser-b24e16d346d0e71b140a659815a32be9ce7cd117.tar.xz tangerine-wallet-browser-b24e16d346d0e71b140a659815a32be9ce7cd117.tar.zst tangerine-wallet-browser-b24e16d346d0e71b140a659815a32be9ce7cd117.zip | |
re-enabled x-metamask-origin for mascara
| -rw-r--r-- | app/scripts/metamask-controller.js | 2 | ||||
| -rw-r--r-- | app/scripts/platforms/extension.js | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js index 4d149545a..fef16c3a9 100644 --- a/app/scripts/metamask-controller.js +++ b/app/scripts/metamask-controller.js @@ -196,7 +196,7 @@ module.exports = class MetamaskController extends EventEmitter { }, // rpc data source rpcUrl: this.networkController.getCurrentRpcAddress(), - originHttpHeaderKey: this.platform.isExtension ? 'X-Metamask-Origin' : undefined, + originHttpHeaderKey: 'X-Metamask-Origin', // account mgmt getAccounts: (cb) => { const isUnlocked = this.keyringController.memStore.getState().isUnlocked diff --git a/app/scripts/platforms/extension.js b/app/scripts/platforms/extension.js index d97138207..0afe04b74 100644 --- a/app/scripts/platforms/extension.js +++ b/app/scripts/platforms/extension.js @@ -5,10 +5,6 @@ class ExtensionPlatform { // // Public // - get isExtension () { - return true - } - reload () { extension.runtime.reload() } |