status-im
/
MyCrypto
mirror of https://github.com/status-im/MyCrypto.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'develop' into fix-gas-slider

This commit is contained in:
Daniel Ternyak 2018-07-06 08:56:12 -05:00 committed by GitHub
parent 07adff6539 425655ee05
commit 45ff40d31d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
common/features/store.ts
View File

@ -91,6 +91,9 @@ window.addEventListener('load', () => {
});
});
setInterval(handleMetaMaskPolling.bind(null, store), METAMASK_POLLING_INTERVAL);
/** @desc When MetaMask is loaded as an extension, watch for network changes. */
if ((window as any).web3) {
setInterval(handleMetaMaskPolling.bind(null, store), METAMASK_POLLING_INTERVAL);
}
export default store;

5
common/index.html
View File

@ -4,6 +4,7 @@
<head>
<meta charset="utf-8">
<title>MyCrypto</title>
<meta http-equiv="Content-Security-Policy" content="<%= htmlWebpackPlugin.options.metaCsp %>" >
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="description" content="MyCrypto is a free, open-source interface for interacting with the blockchain.">
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
@ -12,7 +13,7 @@
<meta property="og:description" content="<%= htmlWebpackPlugin.options.appDescription %>">
<meta property="og:site_name" content="<%= htmlWebpackPlugin.options.title %>">
<meta property="og:type" content="<%= htmlWebpackPlugin.options.type %>">
<meta property="og:image" content="<%= htmlWebpackPlugin.options.image %>">
<meta property="og:image" content="/common/assets/images/link-preview.png">
<meta name="twitter:site" content="<%= htmlWebpackPlugin.options.twitter.site %>">
<meta name="twitter:creator" content="<%= htmlWebpackPlugin.options.twitter.creator %>">
<meta name="google-site-verification" content="dRWkvANAUNAhNyMnTyc7M7S3lnucotMY8j8R-gsZhbo" />
@ -73,4 +74,4 @@
</body>
</html>
</html>

5
webpack_config/makeConfig.js
View File

@ -166,7 +166,10 @@ module.exports = function(opts = {}) {
twitter: {
site: config.twitter.creator,
creator: config.twitter.creator
}
},
metaCsp: options.isProduction
? "default-src 'none'; script-src 'self'; worker-src 'self' blob:; style-src 'self' 'unsafe-inline'; manifest-src 'self'; font-src 'self'; img-src 'self' data: https://shapeshift.io; connect-src *;"
: ""
}),
new CopyWebpackPlugin([