poanetwork
/
nifty-wallet
mirror of https://github.com/poanetwork/nifty-wallet.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix message signing UI rendering 

[A recent PR](https://github.com/MetaMask/metamask-plugin/pull/1004) removed logic that rendered pending messages for approval.

This commit fixes that.
This commit is contained in:
Dan Finlay 2017-01-16 23:59:25 -08:00
parent 665d6c5406
commit 54c536e72c
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ui/app/conf-tx.js
View File

@ -41,12 +41,13 @@ ConfirmTxScreen.prototype.render = function () {
var provider = state.provider var provider = state.provider
var unconfTxs = state.unconfTxs var unconfTxs = state.unconfTxs
var unconfMsgs = state.unconfMsgs var unconfMsgs = state.unconfMsgs
var unconfTxList = txHelper(unconfTxs, unconfMsgs, network) var unconfTxList = txHelper(unconfTxs, unconfMsgs, network)
var index = state.index !== undefined ? state.index : 0 var index = state.index !== undefined && unconfTxList[index] ? state.index : 0
var txData = unconfTxList[index] || {} var txData = unconfTxList[index] || {}
var txParams = txData.txParams var txParams = txData.params || {}
var isNotification = isPopupOrNotification() === 'notification' var isNotification = isPopupOrNotification() === 'notification'
if (!txParams) return null if (unconfTxList.length === 0) return null
return ( return (
@ -116,15 +117,19 @@ ConfirmTxScreen.prototype.render = function () {
} }
function currentTxView (opts) { function currentTxView (opts) {
if ('txParams' in opts.txData) { const { txData } = opts
const { txParams, msgParams } = txData
if (txParams) {
// This is a pending transaction // This is a pending transaction
return h(PendingTx, opts) return h(PendingTx, opts)
} else if ('msgParams' in opts.txData) { } else if (msgParams) {
// This is a pending message to sign // This is a pending message to sign
return h(PendingMsg, opts) return h(PendingMsg, opts)
} }
} }
ConfirmTxScreen.prototype.checkBalanceAgainstTx = function (txData) { ConfirmTxScreen.prototype.checkBalanceAgainstTx = function (txData) {
if (!txData.txParams) return false
var state = this.props var state = this.props
var address = txData.txParams.from || state.selectedAccount var address = txData.txParams.from || state.selectedAccount
var account = state.accounts[address] var account = state.accounts[address]