Merge branch 'master' into i1340-SynchronousInjection

1 files changed, 20 insertions, 8 deletions

diff --git a/mascara/example/app.js b/mascara/example/app.js
index d0cb6ba83..598e2c84c 100644
--- a/mascara/example/app.js
+++ b/mascara/example/app.js
@@ -7,20 +7,32 @@ async function loadProvider() {
   const ethereumProvider = window.metamask.createDefaultProvider({ host: 'http://localhost:9001' })
   const ethQuery = new EthQuery(ethereumProvider)
   const accounts = await ethQuery.accounts()
-  logToDom(accounts.length ? accounts[0] : 'LOCKED or undefined')
-  setupButton(ethQuery)
+   window.METAMASK_ACCOUNT = accounts[0] || 'locked'
+  logToDom(accounts.length ? accounts[0] : 'LOCKED or undefined', 'account')
+  setupButtons(ethQuery)
 }
 
 
-function logToDom(message){
-  document.getElementById('account').innerText = message
+function logToDom(message, context){
+  document.getElementById(context).innerText = message
   console.log(message)
 }
 
-function setupButton (ethQuery) {
-  const button = document.getElementById('action-button-1')
-  button.addEventListener('click', async () => {
+function setupButtons (ethQuery) {
+  const accountButton = document.getElementById('action-button-1')
+  accountButton.addEventListener('click', async () => {
     const accounts = await ethQuery.accounts()
-    logToDom(accounts.length ? accounts[0] : 'LOCKED or undefined')
+    window.METAMASK_ACCOUNT = accounts[0] || 'locked'
+    logToDom(accounts.length ? accounts[0] : 'LOCKED or undefined', 'account')
+  })
+  const txButton = document.getElementById('action-button-2')
+  txButton.addEventListener('click', async () => {
+    if (!window.METAMASK_ACCOUNT || window.METAMASK_ACCOUNT === 'locked') return
+    const txHash = await ethQuery.sendTransaction({
+      from: window.METAMASK_ACCOUNT,
+      to: window.METAMASK_ACCOUNT,
+      data: '',
+    })
+    logToDom(txHash, 'cb-value')
   })
 }
\ No newline at end of file