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

feature/default_network_editable
Dan 7 years ago committed by Chi Kei Chan
parent 4671f28476
commit 9e3f921ba9
  1. 9
      ui/app/actions.js
  2. 15
      ui/app/components/pending-tx/confirm-send-ether.js
  3. 15
      ui/app/components/pending-tx/confirm-send-token.js
  4. 2
      ui/app/components/send/currency-display.js
  5. 10
      ui/app/reducers/metamask.js

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

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

@ -77,13 +77,16 @@ function mapDispatchToProps (dispatch, ownProps) {
gasPrice, gasPrice,
to, to,
} = txParams } = 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.setSelectedToken(address))
dispatch(actions.updateSend({
gasLimit,
gasPrice,
gasTotal: null,
to,
amount,
errors: { to: null, amount: null },
editingTransactionId: id,
}))
dispatch(actions.showSendTokenPage()) dispatch(actions.showSendTokenPage())
}, },
} }

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

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

Loading…
Cancel
Save