From a167bbc5a0f29568ec8e53ecdd942724aa15604b Mon Sep 17 00:00:00 2001
From: Dan Finlay <dan@danfinlay.com>
Date: Tue, 16 Aug 2016 17:32:54 -0700
Subject: MVP Popup Notifications Working

I'm unsure which will be more performant: A notification using a trimmed down version of the UI, or using them both, letting the browser cache them both.

In any case, here I've modified the normal UI to recognize when it's a popup, and change the UX accordingly in a few ways:
 - Hide the menu bar
 - Hide the back button from the notifications view.
 - When confirming the last tx, close the window.
---
 app/scripts/lib/extension-instance.js |  2 +-
 app/scripts/lib/notifications.js      |  3 +-
 app/scripts/notification.js           | 85 -----------------------------------
 3 files changed, 3 insertions(+), 87 deletions(-)
 delete mode 100644 app/scripts/notification.js

(limited to 'app/scripts')

diff --git a/app/scripts/lib/extension-instance.js b/app/scripts/lib/extension-instance.js
index d284895bc..1098130e3 100644
--- a/app/scripts/lib/extension-instance.js
+++ b/app/scripts/lib/extension-instance.js
@@ -45,7 +45,7 @@ function Extension () {
       if (browser[api]) {
         _this[api] = browser[api]
       }
-    }
+    } catch (e) {}
 
     try {
       _this.api = browser.extension[api]
diff --git a/app/scripts/lib/notifications.js b/app/scripts/lib/notifications.js
index e6bdeff09..de9cf26e3 100644
--- a/app/scripts/lib/notifications.js
+++ b/app/scripts/lib/notifications.js
@@ -33,7 +33,8 @@ function createMsgNotification (state) {
 function showNotification() {
   extension.windows.create({
     url:"notification.html",
-    type:"panel",
+    type:"detached_panel",
+    focused:true,
     width:360,
     height:500,
   })
diff --git a/app/scripts/notification.js b/app/scripts/notification.js
deleted file mode 100644
index 90c00b32d..000000000
--- a/app/scripts/notification.js
+++ /dev/null
@@ -1,85 +0,0 @@
-const url = require('url')
-const EventEmitter = require('events').EventEmitter
-const async = require('async')
-const Dnode = require('dnode')
-const Web3 = require('web3')
-const MetaMaskNotification = require('../../ui/notification')
-const MetaMaskUiCss = require('../../ui/css')
-const injectCss = require('inject-css')
-const PortStream = require('./lib/port-stream.js')
-const StreamProvider = require('web3-stream-provider')
-const setupMultiplex = require('./lib/stream-utils.js').setupMultiplex
-const extension = require('./lib/extension')
-
-// setup app
-var css = MetaMaskUiCss()
-injectCss(css)
-
-async.parallel({
-  currentDomain: getCurrentDomain,
-  accountManager: connectToAccountManager,
-}, setupApp)
-
-function connectToAccountManager (cb) {
-  // setup communication with background
-  var pluginPort = extension.runtime.connect({name: 'notification'})
-  var portStream = new PortStream(pluginPort)
-  // setup multiplexing
-  var mx = setupMultiplex(portStream)
-  // connect features
-  setupControllerConnection(mx.createStream('controller'), cb)
-  setupWeb3Connection(mx.createStream('provider'))
-}
-
-function setupWeb3Connection (stream) {
-  var remoteProvider = new StreamProvider()
-  remoteProvider.pipe(stream).pipe(remoteProvider)
-  stream.on('error', console.error.bind(console))
-  remoteProvider.on('error', console.error.bind(console))
-  global.web3 = new Web3(remoteProvider)
-}
-
-function setupControllerConnection (stream, cb) {
-  var eventEmitter = new EventEmitter()
-  var background = Dnode({
-    sendUpdate: function (state) {
-      eventEmitter.emit('update', state)
-    },
-  })
-  stream.pipe(background).pipe(stream)
-  background.once('remote', function (accountManager) {
-    // setup push events
-    accountManager.on = eventEmitter.on.bind(eventEmitter)
-    cb(null, accountManager)
-  })
-}
-
-function getCurrentDomain (cb) {
-  const unknown = '<unknown>'
-  if (!extension.tabs) return cb(null, unknown)
-  extension.tabs.query({active: true, currentWindow: true}, function (results) {
-    var activeTab = results[0]
-    var currentUrl = activeTab && activeTab.url
-    var currentDomain = url.parse(currentUrl).host
-    if (!currentUrl) {
-      return cb(null, unknown)
-    }
-    cb(null, currentDomain)
-  })
-}
-
-function setupApp (err, opts) {
-  if (err) {
-    alert(err.stack)
-    throw err
-  }
-
-  var container = document.getElementById('app-content')
-
-  MetaMaskNotification({
-    container: container,
-    accountManager: opts.accountManager,
-    currentDomain: opts.currentDomain,
-    networkVersion: opts.networkVersion,
-  })
-}
-- 
cgit v1.2.3