aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app/conf-tx.js
diff options
context:
space:
mode:
authorDan Finlay <dan@danfinlay.com>2017-02-24 06:23:45 +0800
committerDan Finlay <dan@danfinlay.com>2017-02-24 06:23:45 +0800
commit4697aca02c669b1787e72f0648b3043270867799 (patch)
treeecc07db1ce05ec6a88612a0fa7d1c86007ef6389 /ui/app/conf-tx.js
parent7ec25526b70473247a69ab4a3a1302e50b06f12b (diff)
downloadtangerine-wallet-browser-4697aca02c669b1787e72f0648b3043270867799.tar
tangerine-wallet-browser-4697aca02c669b1787e72f0648b3043270867799.tar.gz
tangerine-wallet-browser-4697aca02c669b1787e72f0648b3043270867799.tar.bz2
tangerine-wallet-browser-4697aca02c669b1787e72f0648b3043270867799.tar.lz
tangerine-wallet-browser-4697aca02c669b1787e72f0648b3043270867799.tar.xz
tangerine-wallet-browser-4697aca02c669b1787e72f0648b3043270867799.tar.zst
tangerine-wallet-browser-4697aca02c669b1787e72f0648b3043270867799.zip
Got personal_sign working
Also fixed bug where signing would not close popup.
Diffstat (limited to 'ui/app/conf-tx.js')
-rw-r--r--ui/app/conf-tx.js14
1 files changed, 13 insertions, 1 deletions
diff --git a/ui/app/conf-tx.js b/ui/app/conf-tx.js
index 571ae85b6..a2e5ee94c 100644
--- a/ui/app/conf-tx.js
+++ b/ui/app/conf-tx.js
@@ -109,6 +109,7 @@ ConfirmTxScreen.prototype.render = function () {
sendTransaction: this.sendTransaction.bind(this, txData),
cancelTransaction: this.cancelTransaction.bind(this, txData),
signMessage: this.signMessage.bind(this, txData),
+ signPersonalMessage: this.signPersonalMessage.bind(this, txData),
cancelMessage: this.cancelMessage.bind(this, txData),
}),
@@ -167,13 +168,24 @@ ConfirmTxScreen.prototype.cancelTransaction = function (txData, event) {
}
ConfirmTxScreen.prototype.signMessage = function (msgData, event) {
+ log.info('conf-tx.js: signing message')
var params = msgData.msgParams
+ var type = msgData.type
params.metamaskId = msgData.id
event.stopPropagation()
this.props.dispatch(actions.signMsg(params))
}
+ConfirmTxScreen.prototype.signPersonalMessage = function (msgData, event) {
+ log.info('conf-tx.js: signing personal message')
+ var params = msgData.msgParams
+ params.metamaskId = msgData.id
+ event.stopPropagation()
+ this.props.dispatch(actions.signPersonalMsg(params))
+}
+
ConfirmTxScreen.prototype.cancelMessage = function (msgData, event) {
+ log.info('canceling message')
event.stopPropagation()
this.props.dispatch(actions.cancelMsg(msgData))
}
@@ -185,7 +197,7 @@ ConfirmTxScreen.prototype.goHome = function (event) {
function warningIfExists (warning) {
if (warning &&
- // Do not display user rejections on this screen:
+ // Do not display user rejections on this screen:
warning.indexOf('User denied transaction signature') === -1) {
return h('.error', {
style: {