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

Create single action for updating all of send in redux state.

Browse Source
This commit is contained in:
Dan 2017-11-10 00:19:16 -03:30 committed by Chi Kei Chan
parent 4671f28476
commit 9e3f921ba9
5 changed files with 38 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ui/app/actions.js
View File

@ -149,6 +149,7 @@ var actions = {
UPDATE_SEND_AMOUNT: 'UPDATE_SEND_AMOUNT',
UPDATE_SEND_MEMO: 'UPDATE_SEND_MEMO',
UPDATE_SEND_ERRORS: 'UPDATE_SEND_ERRORS',
UPDATE_SEND: 'UPDATE_SEND',
CLEAR_SEND: 'CLEAR_SEND',
updateGasLimit,
updateGasPrice,
@ -159,6 +160,7 @@ var actions = {
updateSendAmount,
updateSendMemo,
updateSendErrors,
updateSend,
clearSend,
setSelectedAddress,
// app messages
@ -632,6 +634,13 @@ function updateSendErrors (error) {
}
}
function updateSend (newSend) {
return {
type: actions.UPDATE_SEND,
value: newSend,
}
}
function clearSend () {
return {
type: actions.CLEAR_SEND,

15
ui/app/components/pending-tx/confirm-send-ether.js
View File

@ -43,12 +43,15 @@ function mapDispatchToProps (dispatch) {
to,
value: amount,
} = txParams
dispatch(actions.editTx(id))
dispatch(actions.updateGasLimit(gasLimit))
dispatch(actions.updateGasPrice(gasPrice))
dispatch(actions.updateSendTo(to))
dispatch(actions.updateSendAmount(amount))
dispatch(actions.updateSendErrors({ to: null, amount: null }))
dispatch(actions.updateSend({
gasLimit,
gasPrice,
gasTotal: null,
to,
amount,
errors: { to: null, amount: null },
editingTransactionId: id,
}))
dispatch(actions.showSendPage())
},
cancelTransaction: ({ id }) => dispatch(actions.cancelTx({ id })),

15
ui/app/components/pending-tx/confirm-send-token.js
View File

@ -77,13 +77,16 @@ function mapDispatchToProps (dispatch, ownProps) {
gasPrice,
to,
} = txParams
dispatch(actions.editTx(id))
dispatch(actions.updateGasLimit(gasLimit))
dispatch(actions.updateGasPrice(gasPrice))
dispatch(actions.updateSendTo(to))
dispatch(actions.updateSendAmount(amount))
dispatch(actions.updateSendErrors({ to: null, amount: null }))
dispatch(actions.setSelectedToken(address))
dispatch(actions.updateSend({
gasLimit,
gasPrice,
gasTotal: null,
to,
amount,
errors: { to: null, amount: null },
editingTransactionId: id,
}))
dispatch(actions.showSendTokenPage())
},
}

2
ui/app/components/send/currency-display.js
View File

@ -97,7 +97,7 @@ CurrencyDisplay.prototype.render = function () {
onInputChange: newValue => {
handleChange(this.getAmount(newValue))
},
inputRef: input => { this.currencyInput = input; },
inputRef: input => { this.currencyInput = input },
}),
h('span.currency-display__currency-symbol', primaryCurrency),

10
ui/app/reducers/metamask.js
View File

@ -257,17 +257,27 @@ function reduceMetamask (state, action) {
},
})
case actions.UPDATE_SEND:
return extend(metamaskState, {
send: {
...metamaskState.send,
...action.value,
},
})
case actions.CLEAR_SEND:
return extend(metamaskState, {
send: {
gasLimit: null,
gasPrice: null,
gasTotal: null,
tokenBalance: null,
from: '',
to: '',
amount: '0x0',
memo: '',
errors: {},
editingTransactionId: null,
},
})