aboutsummaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
Diffstat (limited to 'app')
-rw-r--r--app/scripts/contentscript.js1
-rw-r--r--app/scripts/inpage.js1
-rw-r--r--app/scripts/metamask-controller.js3
-rw-r--r--app/scripts/platforms/extension.js60
4 files changed, 7 insertions, 58 deletions
diff --git a/app/scripts/contentscript.js b/app/scripts/contentscript.js
index 7b7114c35..031cfca43 100644
--- a/app/scripts/contentscript.js
+++ b/app/scripts/contentscript.js
@@ -200,3 +200,4 @@ function redirectToPhishingWarning () {
console.log('MetaMask - redirecting to phishing warning')
window.location.href = 'https://metamask.io/phishing.html'
}
+
diff --git a/app/scripts/inpage.js b/app/scripts/inpage.js
index 7dd7fda02..20621b73f 100644
--- a/app/scripts/inpage.js
+++ b/app/scripts/inpage.js
@@ -96,3 +96,4 @@ function restoreContextAfterImports () {
console.warn('MetaMask - global.define could not be overwritten.')
}
}
+
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index bcc7075c2..c6be4b9d2 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -653,8 +653,7 @@ module.exports = class MetamaskController extends EventEmitter {
const { identities } = this.preferencesController.store.getState()
return { ...keyState, identities }
- }
-
+ }
//
// Account Management
diff --git a/app/scripts/platforms/extension.js b/app/scripts/platforms/extension.js
index 0803164e8..844670537 100644
--- a/app/scripts/platforms/extension.js
+++ b/app/scripts/platforms/extension.js
@@ -1,5 +1,4 @@
const extension = require('extensionizer')
-const explorerLink = require('etherscan-link').createExplorerLink
class ExtensionPlatform {
@@ -24,11 +23,8 @@ class ExtensionPlatform {
return extension.runtime.getManifest().version
}
- openExtensionInBrowser (route = null) {
- let extensionURL = extension.runtime.getURL('home.html')
- if (route) {
- extensionURL += `#${route}`
- }
+ openExtensionInBrowser () {
+ const extensionURL = extension.runtime.getURL('home.html')
this.openWindow({ url: extensionURL })
}
@@ -42,58 +38,10 @@ class ExtensionPlatform {
}
}
- showTransactionNotification (txMeta) {
-
- const status = txMeta.status
- if (status === 'confirmed') {
- this._showConfirmedTransaction(txMeta)
- } else if (status === 'failed') {
- this._showFailedTransaction(txMeta)
- }
- }
-
- _showConfirmedTransaction (txMeta) {
-
- this._subscribeToNotificationClicked()
-
- const url = explorerLink(txMeta.hash, parseInt(txMeta.metamaskNetworkId))
- const nonce = parseInt(txMeta.txParams.nonce, 16)
-
- const title = 'Confirmed transaction'
- const message = `Transaction ${nonce} confirmed! View on EtherScan`
- this._showNotification(title, message, url)
+ addMessageListener (cb) {
+ extension.runtime.onMessage.addListener(cb)
}
- _showFailedTransaction (txMeta) {
-
- const nonce = parseInt(txMeta.txParams.nonce, 16)
- const title = 'Failed transaction'
- const message = `Transaction ${nonce} failed! ${txMeta.err.message}`
- this._showNotification(title, message)
- }
-
- _showNotification (title, message, url) {
- extension.notifications.create(
- url,
- {
- 'type': 'basic',
- 'title': title,
- 'iconUrl': extension.extension.getURL('../../images/icon-64.png'),
- 'message': message,
- })
- }
-
- _subscribeToNotificationClicked () {
- if (!extension.notifications.onClicked.hasListener(this._viewOnEtherScan)) {
- extension.notifications.onClicked.addListener(this._viewOnEtherScan)
- }
- }
-
- _viewOnEtherScan (txId) {
- if (txId.startsWith('http://')) {
- global.metamaskController.platform.openWindow({ url: txId })
- }
- }
}
module.exports = ExtensionPlatform