diff options
| -rw-r--r-- | app/_locales/en/messages.json | 2 | ||||
| -rw-r--r-- | app/scripts/contentscript.js | 8 | ||||
| -rw-r--r-- | app/scripts/controllers/provider-approval.js | 2 | ||||
| -rw-r--r-- | app/scripts/metamask-controller.js | 6 |
4 files changed, 1 insertions, 17 deletions
diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json index 430d1b50c..2fd4a18e7 100644 --- a/app/_locales/en/messages.json +++ b/app/_locales/en/messages.json @@ -6,7 +6,7 @@ "message": "Share your address to connect to $1?" }, "shareAddressInfo": { - "message": "Sharing your address with $1 will allow you to interact with this dapp. This permission is to protect your privacy by default." + "message": "Sharing your address with $1 will allow you to interact with this dapp. This permission is to protect your privacy by default. You may need to reload the dapp for the change to take effect." }, "privacyModeDefault": { "message": "Privacy Mode is now enabled by default" diff --git a/app/scripts/contentscript.js b/app/scripts/contentscript.js index 7415c5fe9..db4d5fd63 100644 --- a/app/scripts/contentscript.js +++ b/app/scripts/contentscript.js @@ -114,7 +114,6 @@ function forwardTrafficBetweenMuxers (channelName, muxA, muxB) { async function setupPublicApi (outStream) { const api = { - forceReloadSite: (cb) => cb(null, forceReloadSite()), getSiteMetadata: (cb) => cb(null, getSiteMetadata()), } const dnode = Dnode(api) @@ -307,10 +306,3 @@ async function domIsReady () { // wait for load await new Promise(resolve => window.addEventListener('DOMContentLoaded', resolve, { once: true })) } - -/** - * Reloads the site - */ -function forceReloadSite () { - window.location.reload() -} diff --git a/app/scripts/controllers/provider-approval.js b/app/scripts/controllers/provider-approval.js index 5d565c385..2300bb957 100644 --- a/app/scripts/controllers/provider-approval.js +++ b/app/scripts/controllers/provider-approval.js @@ -156,8 +156,6 @@ class ProviderApprovalController extends SafeEventEmitter { dismissedOrigins: _dismissedOrigins, providerRequests: remainingProviderRequests, }) - - this.emit(`forceResolvedRequest:${origin}`, { approved: true, forced: true }) } /** diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js index 46788aaae..fc40c8b6d 100644 --- a/app/scripts/metamask-controller.js +++ b/app/scripts/metamask-controller.js @@ -1273,8 +1273,6 @@ module.exports = class MetamaskController extends EventEmitter { const publicApi = this.setupPublicApi(mux.createStream('publicApi'), originDomain) this.setupProviderConnection(mux.createStream('provider'), originDomain, publicApi) this.setupPublicConfig(mux.createStream('publicConfig'), originDomain) - - this.providerApprovalController.on(`forceResolvedRequest:${originDomain}`, publicApi.forceReloadSite) } /** @@ -1455,10 +1453,6 @@ module.exports = class MetamaskController extends EventEmitter { const publicApi = { // wrap with an await remote - forceReloadSite: async () => { - const remote = await getRemote() - return await pify(remote.forceReloadSite)() - }, getSiteMetadata: async () => { const remote = await getRemote() return await pify(remote.getSiteMetadata)() |