diff options
Diffstat (limited to 'app/scripts')
-rw-r--r-- | app/scripts/lib/notifications.js | 2 | ||||
-rw-r--r-- | app/scripts/metamask-controller.js | 22 |
2 files changed, 6 insertions, 18 deletions
diff --git a/app/scripts/lib/notifications.js b/app/scripts/lib/notifications.js index 422f46f6d..cd7535232 100644 --- a/app/scripts/lib/notifications.js +++ b/app/scripts/lib/notifications.js @@ -1,5 +1,5 @@ const extension = require('./extension') -const height = 500 +const height = 520 const width = 360 const notifications = { diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js index 9e1a885ae..03082013a 100644 --- a/app/scripts/metamask-controller.js +++ b/app/scripts/metamask-controller.js @@ -203,26 +203,15 @@ module.exports = class MetamaskController { newUnsignedTransaction (txParams, onTxDoneCb) { const idStore = this.idStore - var state = idStore.getState() let err = this.enforceTxValidations(txParams) if (err) return onTxDoneCb(err) - // It's locked - if (!state.isUnlocked) { - - // Allow the environment to define an unlock message. - this.opts.unlockAccountMessage() - idStore.addUnconfirmedTransaction(txParams, onTxDoneCb, noop) - - // It's unlocked - } else { - idStore.addUnconfirmedTransaction(txParams, onTxDoneCb, (err, txData) => { - if (err) return onTxDoneCb(err) - this.sendUpdate() - this.opts.showUnconfirmedTx(txParams, txData, onTxDoneCb) - }) - } + idStore.addUnconfirmedTransaction(txParams, onTxDoneCb, (err, txData) => { + if (err) return onTxDoneCb(err) + this.sendUpdate() + this.opts.showUnconfirmedTx(txParams, txData, onTxDoneCb) + }) } enforceTxValidations (txParams) { @@ -353,4 +342,3 @@ module.exports = class MetamaskController { } } -function noop () {} |