From 5d7c2810a701097ef1a4f9de23948418340f9cb4 Mon Sep 17 00:00:00 2001
From: Dan Finlay <dan@danfinlay.com>
Date: Mon, 18 Jun 2018 15:05:41 -0700
Subject: Begin adding eth_watchToken

---
 app/scripts/background.js | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'app/scripts/background.js')

diff --git a/app/scripts/background.js b/app/scripts/background.js
index 2451cddb6..2be600c4b 100644
--- a/app/scripts/background.js
+++ b/app/scripts/background.js
@@ -248,6 +248,7 @@ function setupController (initState, initLangCode) {
     showUnconfirmedMessage: triggerUi,
     unlockAccountMessage: triggerUi,
     showUnapprovedTx: triggerUi,
+    showAddTokenUi: triggerUi,
     // initial state
     initState,
     // initial locale code
@@ -436,3 +437,4 @@ extension.runtime.onInstalled.addListener(function (details) {
     extension.tabs.create({url: 'https://metamask.io/#how-it-works'})
   }
 })
+
-- 
cgit v1.2.3


From 68c1b4c17049e3ef18397ae83b0eb9da8cccab2c Mon Sep 17 00:00:00 2001
From: Esteban MIno <efmino@uc.cl>
Date: Mon, 20 Aug 2018 22:32:14 -0300
Subject: watchAsset returns result wether token was added or not

---
 app/scripts/background.js | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

(limited to 'app/scripts/background.js')

diff --git a/app/scripts/background.js b/app/scripts/background.js
index 029ad139a..1913d35dd 100644
--- a/app/scripts/background.js
+++ b/app/scripts/background.js
@@ -256,7 +256,7 @@ function setupController (initState, initLangCode) {
     showUnconfirmedMessage: triggerUi,
     unlockAccountMessage: triggerUi,
     showUnapprovedTx: triggerUi,
-    showAddTokenUi: triggerUi,
+    showWatchAssetUi: showWatchAssetUi,
     // initial state
     initState,
     // initial locale code
@@ -444,6 +444,24 @@ function triggerUi () {
   })
 }
 
+/**
+ * Opens the browser popup for user confirmation of watchAsset
+ * then it waits until user interact with the UI
+ */
+function showWatchAssetUi () {
+  triggerUi()
+  return new Promise(
+    (resolve) => {
+      var interval = setInterval(() => {
+        if (!notificationIsOpen) {
+          clearInterval(interval)
+          resolve()
+        }
+      }, 1000)
+    }
+  )
+}
+
 // On first install, open a window to MetaMask website to how-it-works.
 extension.runtime.onInstalled.addListener(function (details) {
   if ((details.reason === 'install') && (!METAMASK_DEBUG)) {
-- 
cgit v1.2.3