check for metamask. related to #235

liquality · Dec 17, 2019 · b3f5f01 · b3f5f01
1 parent d32731f
commit b3f5f01
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 19 deletions.
diff --git a/examples/browser/ethereum/metamask-send-transaction.html b/examples/browser/ethereum/metamask-send-transaction.html
@@ -13,17 +13,24 @@ <h1>CAL + MetaMask: Sign a message (Ethereum)</h1>
   <p><code>For errors and logs, check console</code></p>
   <script>
 /* global $, web3, Bundle */
-const { Client, providers } = Bundle
-const ethereum = new Client()
-ethereum.addProvider(new providers.ethereum.EthereumMetaMaskProvider(web3.currentProvider))
-ethereum.wallet.getAddresses().then(addresses => {
-  const from = addresses[0]
-  $('#send').click(() => {
-    ethereum.chain.sendTransaction(from, $('#toAddress').val() || undefined, $('#value').val(), $('#data').val()).then(result => {
-      $('#result').text(JSON.stringify(result))
+
+if (typeof web3 === 'undefined') {
+  alert('Please install MetaMask.')
+} else if (document.location.protocol === 'file:') {
+  alert('Due to browser security restrictions, MetaMask can\'t communicate with dapps running on file://. Please use a local server for development.')
+} else {
+  const { Client, providers } = Bundle
+  const ethereum = new Client()
+  ethereum.addProvider(new providers.ethereum.EthereumMetaMaskProvider(web3.currentProvider))
+  ethereum.wallet.getAddresses().then(addresses => {
+    const from = addresses[0]
+    $('#send').click(() => {
+      ethereum.chain.sendTransaction(from, $('#toAddress').val() || undefined, $('#value').val(), $('#data').val()).then(result => {
+        $('#result').text(JSON.stringify(result))
+      })
     })
   })
-})
+}
   </script>
 </body>
 </html>
diff --git a/examples/browser/ethereum/metamask.html b/examples/browser/ethereum/metamask.html
@@ -11,19 +11,27 @@ <h1>CAL + MetaMask: Sign a message (Ethereum)</h1>
   <p><code>For errors and logs, check console</code></p>
   <script>
 /* global $, web3, Bundle */
-const { Client, providers } = Bundle
-const ethereum = new Client()
-ethereum.addProvider(new providers.ethereum.EthereumMetaMaskProvider(web3.currentProvider))
-ethereum.wallet.getAddresses().then(addresses => {
-  const from = addresses[0]
-  $('#address').text(from)
 
-  $('#sign').click(() => {
-    ethereum.wallet.signMessage($('#message').val(), from).then(result => {
-      $('#result').text(JSON.stringify(result))
+if (typeof web3 === 'undefined') {
+  alert('Please install MetaMask.')
+} else if (document.location.protocol === 'file:') {
+  alert('Due to browser security restrictions, MetaMask can\'t communicate with dapps running on file://. Please use a local server for development.')
+} else {
+  const { Client, providers } = Bundle
+  const ethereum = new Client()
+
+  ethereum.addProvider(new providers.ethereum.EthereumMetaMaskProvider(web3.currentProvider))
+  ethereum.wallet.getAddresses().then(addresses => {
+    const from = addresses[0]
+    $('#address').text(from)
+
+    $('#sign').click(() => {
+      ethereum.wallet.signMessage($('#message').val(), from).then(result => {
+        $('#result').text(JSON.stringify(result))
+      })
     })
   })
-})
+}
   </script>
 </body>
 </html>