added qr code scanner icon in send transaction

3 files changed, 4 insertions, 15 deletions

diff --git a/app/scripts/contentscript.js b/app/scripts/contentscript.js
index 87f7c63ef..83ed85a1a 100644
--- a/app/scripts/contentscript.js
+++ b/app/scripts/contentscript.js
@@ -205,7 +205,7 @@ function initQrCodeScanner () {
   // Append preview div
   const preview = document.createElement('div')
   preview.id = 'metamask-preview-wrapper'
-  preview.style = 'position:absolute; top: 20px; left: 20px; width: 300px; height: 300px; overflow: hidden; z-index: 999999999;'
+  preview.style = 'position:fixed; top: 20px; left: 20px; width: 300px; height: 300px; overflow: hidden; z-index: 999999999;'
   const previewVideo = document.createElement('video')
   previewVideo.id = 'metamask-preview-video'
   previewVideo.style = 'width: 100%; height: 100%; object-fit: none; margin-left: -10%; margin-top: 10%;'
@@ -218,14 +218,11 @@ function initQrCodeScanner () {
     continuous: true,
   })
   scanner.addListener('scan', function (content) {
-    console.log('QR-SCANNER: got code (IN-PAGE)', content)
     scanner.stop().then(_ => {
-      console.log('QR-SCANNER: stopped scanner and sending msg (IN-PAGE)', content)
       extension.runtime.sendMessage({
         action: 'qr-code-scanner-data',
         data: content,
       })
-      console.log('QR-SCANNER: message sent (IN-PAGE)', content)
       document.getElementById('metamask-preview-wrapper').parentElement.removeChild(document.getElementById('metamask-preview-wrapper'))
     })
   })
@@ -241,8 +238,6 @@ function initQrCodeScanner () {
 }
 
 extension.runtime.onMessage.addListener(({ action }) => {
-  console.log('QR-SCANNER: message received (IN-PAGE)', action)
   initQrCodeScanner()
 })
-console.log('QR-SCANNER: now listening (IN-PAGE)')
 
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index 62d707432..f67d4edf8 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -660,20 +660,15 @@ module.exports = class MetamaskController extends EventEmitter {
 
   scanQrCode () {
     return new Promise((resolve, reject) => {
-      console.log('QR-SCANNER: intializing QR code scanner feature (MM controller)')
       // Tell contentscript to inject the QR reader
-      this.platform.sendMessage('qr-code-scanner-init')
-      console.log('QR-SCANNER: message to initialize has been sent (MM controller)')
+      this.platform.sendMessageToActiveTab('qr-code-scanner-init')
       // Wait for the scanner to send something back
       this.platform.addMessageListener(({ action, data }) => {
-        console.log('QR-SCANNER: message received (MM controller)', action, data)
         if (action && action === 'qr-code-scanner-data') {
           const normalizedAddress = data.replace('ethereum:', '')
-          console.log('QR-SCANNER: resolving promise!', normalizedAddress)
-          return Promise.resolve(normalizedAddress)
+          resolve(normalizedAddress)
         }
       })
-      console.log('QR-SCANNER: now listening (MM controller)')
     })
   }
 
diff --git a/app/scripts/platforms/extension.js b/app/scripts/platforms/extension.js
index 182df23b1..1cab0bedd 100644
--- a/app/scripts/platforms/extension.js
+++ b/app/scripts/platforms/extension.js
@@ -36,11 +36,10 @@ class ExtensionPlatform {
     extension.runtime.onMessage.addListener(cb)
   }
 
-  sendMessage (message, query = {}) {
+  sendMessageToActiveTab (message, query = {}) {
     extension.tabs.query(query, tabs => {
       const activeTab = tabs.filter(tab => tab.active)[0]
       extension.tabs.sendMessage(activeTab.id, message)
-      console.log('QR-SCANNER: message sent to tab', message, activeTab)
     })
   }
 }