1
0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00

Fix populating txParams with undefined data

This commit is contained in:
Alexander Tseung 2018-04-05 01:04:12 -07:00
parent 54b84e2c3d
commit 418926ffdf
2 changed files with 10 additions and 1 deletions

View File

@ -108,6 +108,10 @@ module.exports = class TransactionStateManager extends EventEmitter {
updateTx (txMeta, note) { updateTx (txMeta, note) {
// validate txParams // validate txParams
if (txMeta.txParams) { if (txMeta.txParams) {
if (typeof txMeta.txParams.data === 'undefined') {
delete txMeta.txParams.data
}
this.validateTxParams(txMeta.txParams) this.validateTxParams(txMeta.txParams)
} }

View File

@ -576,12 +576,17 @@ SendTransactionScreen.prototype.getEditedTx = function () {
data, data,
}) })
} else { } else {
const data = unapprovedTxs[editingTransactionId].txParams.data const { data } = unapprovedTxs[editingTransactionId].txParams
Object.assign(editingTx.txParams, { Object.assign(editingTx.txParams, {
value: ethUtil.addHexPrefix(amount), value: ethUtil.addHexPrefix(amount),
to: ethUtil.addHexPrefix(to), to: ethUtil.addHexPrefix(to),
data, data,
}) })
if (typeof editingTx.txParams.data === 'undefined') {
delete editingTx.txParams.data
}
} }
return editingTx return editingTx