aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan <danjm.com@gmail.com>2018-05-20 08:37:44 +0800
committerDan <danjm.com@gmail.com>2018-05-31 07:24:31 +0800
commit6f633a97e15e8277a065f987880cd666cc2fbf89 (patch)
treed484496cf79fbaea79dfaa3472182a008ae7c08a
parent8b6d08a15dc40b4cd8159a543b5cc6855f7848a8 (diff)
downloadtangerine-wallet-browser-6f633a97e15e8277a065f987880cd666cc2fbf89.tar
tangerine-wallet-browser-6f633a97e15e8277a065f987880cd666cc2fbf89.tar.gz
tangerine-wallet-browser-6f633a97e15e8277a065f987880cd666cc2fbf89.tar.bz2
tangerine-wallet-browser-6f633a97e15e8277a065f987880cd666cc2fbf89.tar.lz
tangerine-wallet-browser-6f633a97e15e8277a065f987880cd666cc2fbf89.tar.xz
tangerine-wallet-browser-6f633a97e15e8277a065f987880cd666cc2fbf89.tar.zst
tangerine-wallet-browser-6f633a97e15e8277a065f987880cd666cc2fbf89.zip
Rename gas change actions.
-rw-r--r--ui/app/actions.js16
-rw-r--r--ui/app/components/customize-gas-modal/index.js18
-rw-r--r--ui/app/components/send_/send.container.js4
-rw-r--r--ui/app/components/send_/tests/send-container.test.js6
4 files changed, 22 insertions, 22 deletions
diff --git a/ui/app/actions.js b/ui/app/actions.js
index 3aa046345..d83ecbe24 100644
--- a/ui/app/actions.js
+++ b/ui/app/actions.js
@@ -177,9 +177,9 @@ var actions = {
CLEAR_SEND: 'CLEAR_SEND',
OPEN_FROM_DROPDOWN: 'OPEN_FROM_DROPDOWN',
CLOSE_FROM_DROPDOWN: 'CLOSE_FROM_DROPDOWN',
- updateGasLimit,
- updateGasPrice,
- updateGasTotal,
+ setGasLimit,
+ setGasPrice,
+ updateGasData,
setGasTotal,
setSendTokenBalance,
updateSendTokenBalance,
@@ -714,14 +714,14 @@ function estimateGas (params = {}) {
return reject(err)
}
dispatch(actions.hideWarning())
- dispatch(actions.updateGasLimit(data))
+ dispatch(actions.setGasLimit(data))
return resolve(data)
})
})
}
}
-function updateGasLimit (gasLimit) {
+function setGasLimit (gasLimit) {
return {
type: actions.UPDATE_GAS_LIMIT,
value: gasLimit,
@@ -737,14 +737,14 @@ function getGasPrice () {
return reject(err)
}
dispatch(actions.hideWarning())
- dispatch(actions.updateGasPrice(data))
+ dispatch(actions.setGasPrice(data))
return resolve(data)
})
})
}
}
-function updateGasPrice (gasPrice) {
+function setGasPrice (gasPrice) {
return {
type: actions.UPDATE_GAS_PRICE,
value: gasPrice,
@@ -772,7 +772,7 @@ function getGasEstimate ({ selectedAddress, selectedToken, data }) {
}
}
-function updateGasTotal ({ selectedAddress, selectedToken, data }) {
+function updateGasData ({ selectedAddress, selectedToken, data }) {
return (dispatch) => {
return dispatch(actions.getGasEstimate({ selectedAddress, selectedToken, data }))
.then((gasEstimate) => {
diff --git a/ui/app/components/customize-gas-modal/index.js b/ui/app/components/customize-gas-modal/index.js
index df933e363..9ab785760 100644
--- a/ui/app/components/customize-gas-modal/index.js
+++ b/ui/app/components/customize-gas-modal/index.js
@@ -65,9 +65,9 @@ function mapStateToProps (state) {
function mapDispatchToProps (dispatch) {
return {
hideModal: () => dispatch(actions.hideModal()),
- updateGasPrice: newGasPrice => dispatch(actions.updateGasPrice(newGasPrice)),
- updateGasLimit: newGasLimit => dispatch(actions.updateGasLimit(newGasLimit)),
- updateGasTotal: newGasTotal => dispatch(actions.setGasTotal(newGasTotal)),
+ setGasPrice: newGasPrice => dispatch(actions.setGasPrice(newGasPrice)),
+ setGasLimit: newGasLimit => dispatch(actions.setGasLimit(newGasLimit)),
+ updateGasData: newGasTotal => dispatch(actions.setGasTotal(newGasTotal)),
updateSendAmount: newAmount => dispatch(actions.updateSendAmount(newAmount)),
updateSendErrors: error => dispatch(updateSendErrors(error)),
}
@@ -109,10 +109,10 @@ module.exports = connect(mapStateToProps, mapDispatchToProps)(CustomizeGasModal)
CustomizeGasModal.prototype.save = function (gasPrice, gasLimit, gasTotal) {
const {
- updateGasPrice,
- updateGasLimit,
+ setGasPrice,
+ setGasLimit,
hideModal,
- updateGasTotal,
+ updateGasData,
maxModeOn,
selectedToken,
balance,
@@ -129,9 +129,9 @@ CustomizeGasModal.prototype.save = function (gasPrice, gasLimit, gasTotal) {
updateSendAmount(maxAmount)
}
- updateGasPrice(ethUtil.addHexPrefix(gasPrice))
- updateGasLimit(ethUtil.addHexPrefix(gasLimit))
- updateGasTotal(ethUtil.addHexPrefix(gasTotal))
+ setGasPrice(ethUtil.addHexPrefix(gasPrice))
+ setGasLimit(ethUtil.addHexPrefix(gasLimit))
+ updateGasData(ethUtil.addHexPrefix(gasTotal))
updateSendErrors({ insufficientFunds: false })
hideModal()
}
diff --git a/ui/app/components/send_/send.container.js b/ui/app/components/send_/send.container.js
index 8efaf5aaf..df28caca8 100644
--- a/ui/app/components/send_/send.container.js
+++ b/ui/app/components/send_/send.container.js
@@ -21,7 +21,7 @@ import {
} from './send.selectors'
import {
updateSendTokenBalance,
- updateGasTotal,
+ updateGasData,
setGasTotal,
} from '../../actions'
import {
@@ -73,7 +73,7 @@ function mapDispatchToProps (dispatch) {
}) => {
console.log(`editingTransactionId`, editingTransactionId)
!editingTransactionId
- ? dispatch(updateGasTotal({ selectedAddress, selectedToken, data }))
+ ? dispatch(updateGasData({ selectedAddress, selectedToken, data }))
: dispatch(setGasTotal(calcGasTotal(gasLimit, gasPrice)))
},
updateSendTokenBalance: ({ selectedToken, tokenContract, address }) => {
diff --git a/ui/app/components/send_/tests/send-container.test.js b/ui/app/components/send_/tests/send-container.test.js
index 7b6ca1f7b..e589cca05 100644
--- a/ui/app/components/send_/tests/send-container.test.js
+++ b/ui/app/components/send_/tests/send-container.test.js
@@ -7,7 +7,7 @@ let mapDispatchToProps
const actionSpies = {
updateSendTokenBalance: sinon.spy(),
- updateGasTotal: sinon.spy(),
+ updateGasData: sinon.spy(),
setGasTotal: sinon.spy(),
}
const duckActionSpies = {
@@ -104,14 +104,14 @@ describe('send container', () => {
)
})
- it('should dispatch an updateGasTotal action when editingTransactionId is falsy', () => {
+ it('should dispatch an updateGasData action when editingTransactionId is falsy', () => {
const { selectedAddress, selectedToken, data } = mockProps
mapDispatchToPropsObject.updateAndSetGasTotal(
Object.assign(mockProps, {editingTransactionId: false})
)
assert(dispatchSpy.calledOnce)
assert.deepEqual(
- actionSpies.updateGasTotal.getCall(0).args[0],
+ actionSpies.updateGasData.getCall(0).args[0],
{ selectedAddress, selectedToken, data }
)
})