diff options
-rw-r--r-- | app/scripts/background.js | 2 | ||||
-rw-r--r-- | app/scripts/lib/notifications.js | 21 | ||||
-rw-r--r-- | ui/app/components/pending-tx-details.js | 3 | ||||
-rw-r--r-- | ui/lib/contract-namer.js | 1 |
4 files changed, 10 insertions, 17 deletions
diff --git a/app/scripts/background.js b/app/scripts/background.js index 28285fd70..801dc95cf 100644 --- a/app/scripts/background.js +++ b/app/scripts/background.js @@ -43,7 +43,6 @@ function showUnconfirmedMessage (msgParams, msgId) { onConfirm: idStore.approveMessage.bind(idStore, msgId, noop), onCancel: idStore.cancelMessage.bind(idStore, msgId), }) - } function showUnconfirmedTx (txParams, txData, onTxDoneCb) { @@ -60,7 +59,6 @@ function showUnconfirmedTx (txParams, txData, onTxDoneCb) { onConfirm: idStore.approveTransaction.bind(idStore, txData.id, noop), onCancel: idStore.cancelTransaction.bind(idStore, txData.id), }) - } // diff --git a/app/scripts/lib/notifications.js b/app/scripts/lib/notifications.js index 354476af2..b6590b0e5 100644 --- a/app/scripts/lib/notifications.js +++ b/app/scripts/lib/notifications.js @@ -9,7 +9,7 @@ const PendingMsgDetails = require('../../../ui/app/components/pending-msg-detail const MetaMaskUiCss = require('../../../ui/css') var notificationHandlers = {} -const notifications = { +const notifications = { createUnlockRequestNotification: createUnlockRequestNotification, createTxNotification: createTxNotification, createMsgNotification: createMsgNotification, @@ -59,14 +59,13 @@ function createTxNotification (state) { // guard for chrome bug https://github.com/MetaMask/metamask-plugin/issues/236 if (!chrome.notifications) return console.error('Chrome notifications API missing...') - renderTxNotificationSVG(state, function(err, notificationSvgSource){ + renderTxNotificationSVG(state, function (err, notificationSvgSource) { if (err) throw err showNotification(extend(state, { title: 'New Unsigned Transaction', imageUrl: toSvgUri(notificationSvgSource), })) - }) } @@ -74,14 +73,13 @@ function createMsgNotification (state) { // guard for chrome bug https://github.com/MetaMask/metamask-plugin/issues/236 if (!chrome.notifications) return console.error('Chrome notifications API missing...') - renderMsgNotificationSVG(state, function(err, notificationSvgSource){ + renderMsgNotificationSVG(state, function (err, notificationSvgSource) { if (err) throw err showNotification(extend(state, { title: 'New Unsigned Message', imageUrl: toSvgUri(notificationSvgSource), })) - }) } @@ -107,20 +105,19 @@ function showNotification (state) { confirm: state.onConfirm, cancel: state.onCancel, } - } -function renderTxNotificationSVG(state, cb){ +function renderTxNotificationSVG (state, cb) { var content = h(PendingTxDetails, state) renderNotificationSVG(content, cb) } -function renderMsgNotificationSVG(state, cb){ +function renderMsgNotificationSVG (state, cb) { var content = h(PendingMsgDetails, state) renderNotificationSVG(content, cb) } -function renderNotificationSVG(content, cb){ +function renderNotificationSVG (content, cb) { var container = document.createElement('div') var confirmView = h('div.app-primary', { style: { @@ -135,7 +132,7 @@ function renderNotificationSVG(content, cb){ content, ]) - render(confirmView, container, function ready(){ + render(confirmView, container, function ready() { var rootElement = findDOMNode(this) var viewSource = rootElement.outerHTML unmountComponentAtNode(container) @@ -145,7 +142,7 @@ function renderNotificationSVG(content, cb){ }) } -function svgWrapper(content){ +function svgWrapper (content) { var wrapperSource = ` <svg xmlns="http://www.w3.org/2000/svg" width="360" height="240"> <foreignObject x="0" y="0" width="100%" height="100%"> @@ -156,6 +153,6 @@ function svgWrapper(content){ return wrapperSource.split('{{content}}').join(content) } -function toSvgUri(content){ +function toSvgUri (content) { return 'data:image/svg+xml;utf8,' + encodeURIComponent(content) } diff --git a/ui/app/components/pending-tx-details.js b/ui/app/components/pending-tx-details.js index 05409cf44..9a06ad09e 100644 --- a/ui/app/components/pending-tx-details.js +++ b/ui/app/components/pending-tx-details.js @@ -185,7 +185,6 @@ PTXP.miniAccountPanelForRecipient = function () { }, }, addressSummary(txParams.to, 6, 4, false)), ]) - } else { return h(MiniAccountPanel, { imageifyIdenticons: imageify, @@ -225,7 +224,7 @@ PTXP.warnIfNeeded = function () { } -function forwardCarrat(imageify){ +function forwardCarrat (imageify) { if (imageify) { return ( diff --git a/ui/lib/contract-namer.js b/ui/lib/contract-namer.js index 62c7933e8..c99d44de6 100644 --- a/ui/lib/contract-namer.js +++ b/ui/lib/contract-namer.js @@ -13,7 +13,6 @@ module.exports = function(addr, identities = {}) { const address = addr.toLowerCase() const ids = hashFromIdentities(identities) - console.dir({ addr, ids }) return addrFromHash(address, ids) || addrFromHash(address, nicknames) } |