aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app/components/send_/send-footer
diff options
context:
space:
mode:
authorDan <danjm.com@gmail.com>2018-04-27 08:38:14 +0800
committerDan <danjm.com@gmail.com>2018-04-27 10:46:11 +0800
commit91c201aa72581a59a0d2ef73a225b1768584dea7 (patch)
tree00782275e57c568fff16e289002a6c3a91f3c81e /ui/app/components/send_/send-footer
parent8ff7806f1b471a90fa3f45ebc10f0f4452ade541 (diff)
downloadtangerine-wallet-browser-91c201aa72581a59a0d2ef73a225b1768584dea7.tar.gz
tangerine-wallet-browser-91c201aa72581a59a0d2ef73a225b1768584dea7.tar.zst
tangerine-wallet-browser-91c201aa72581a59a0d2ef73a225b1768584dea7.zip
Lint fixes and alphabetization for i3725-refactor-send-component
Diffstat (limited to 'ui/app/components/send_/send-footer')
-rw-r--r--ui/app/components/send_/send-footer/send-footer.component.js18
-rw-r--r--ui/app/components/send_/send-footer/send-footer.container.js15
-rw-r--r--ui/app/components/send_/send-footer/send-footer.selectors.js2
-rw-r--r--ui/app/components/send_/send-footer/send-footer.utils.js2
4 files changed, 19 insertions, 18 deletions
diff --git a/ui/app/components/send_/send-footer/send-footer.component.js b/ui/app/components/send_/send-footer/send-footer.component.js
index 64dd027cf..ffece433e 100644
--- a/ui/app/components/send_/send-footer/send-footer.component.js
+++ b/ui/app/components/send_/send-footer/send-footer.component.js
@@ -6,24 +6,24 @@ import { CONFIRM_TRANSACTION_ROUTE, DEFAULT_ROUTE } from '../../../routes'
export default class SendFooter extends Component {
static propTypes = {
- addToAddressBook: PropTypes.func,
+ addToAddressBookIfNew: PropTypes.func,
amount: PropTypes.string,
clearSend: PropTypes.func,
+ disabled: PropTypes.bool,
editingTransactionId: PropTypes.string,
- errors: PropTypes.object,
+ errors: PropTypes.object,
from: PropTypes.object,
gasLimit: PropTypes.string,
gasPrice: PropTypes.string,
gasTotal: PropTypes.string,
history: PropTypes.object,
selectedToken: PropTypes.object,
- signTokenTx: PropTypes.func,
- signTx: PropTypes.func,
+ sign: PropTypes.func,
to: PropTypes.string,
toAccounts: PropTypes.array,
tokenBalance: PropTypes.string,
unapprovedTxs: PropTypes.object,
- updateTx: PropTypes.func,
+ update: PropTypes.func,
};
onSubmit (event) {
@@ -56,13 +56,13 @@ export default class SendFooter extends Component {
editingTransactionId
? update({
- from,
- to,
amount,
+ editingTransactionId,
+ from,
gas,
gasPrice,
selectedToken,
- editingTransactionId,
+ to,
unapprovedTxs,
})
: sign({ selectedToken, to, amount, from, gas, gasPrice })
@@ -83,7 +83,7 @@ export default class SendFooter extends Component {
onSubmit={e => this.onSubmit(e)}
disabled={disabled}
/>
- );
+ )
}
}
diff --git a/ui/app/components/send_/send-footer/send-footer.container.js b/ui/app/components/send_/send-footer/send-footer.container.js
index fff6e284f..288c4daf2 100644
--- a/ui/app/components/send_/send-footer/send-footer.container.js
+++ b/ui/app/components/send_/send-footer/send-footer.container.js
@@ -1,5 +1,5 @@
import { connect } from 'react-redux'
-import ethUtil from 'ethereumjs-util'
+import ethUtil from 'ethereumjs-util'
import {
addToAddressBook,
clearSend,
@@ -27,31 +27,32 @@ import {
} from './send-footer.selectors'
import {
addressIsNew,
- formShouldBeDisabled,
constructTxParams,
+ constructUpdatedTx,
+ formShouldBeDisabled,
} from './send-footer.utils'
export default connect(mapStateToProps, mapDispatchToProps)(SendFooter)
function mapStateToProps (state) {
return {
- isToken: Boolean(getSelectedToken(state)),
- inError: isSendFormInError(state),
+ amount: getSendAmount(state),
disabled: formShouldBeDisabled({
inError: isSendFormInError(state),
selectedToken: getSelectedToken(state),
tokenBalance: getTokenBalance(state),
gasTotal: getGasTotal(state),
}),
- amount: getSendAmount(state),
editingTransactionId: getSendEditingTransactionId(state),
from: getSendFromObject(state),
gasLimit: getGasLimit(state),
gasPrice: getGasPrice(state),
+ inError: isSendFormInError(state),
+ isToken: Boolean(getSelectedToken(state)),
selectedToken: getSelectedToken(state),
to: getSendTo(state),
- unapprovedTxs: getUnapprovedTxs(state),
toAccounts: getSendToAccounts(state),
+ unapprovedTxs: getUnapprovedTxs(state),
}
}
@@ -102,6 +103,6 @@ function mapDispatchToProps (dispatch) {
// TODO: nickname, i.e. addToAddressBook(recipient, nickname)
dispatch(addToAddressBook(hexPrefixedAddress, nickname))
}
- }
+ },
}
}
diff --git a/ui/app/components/send_/send-footer/send-footer.selectors.js b/ui/app/components/send_/send-footer/send-footer.selectors.js
index ccd4706ea..e8fef6be6 100644
--- a/ui/app/components/send_/send-footer/send-footer.selectors.js
+++ b/ui/app/components/send_/send-footer/send-footer.selectors.js
@@ -9,4 +9,4 @@ module.exports = selectors
function isSendFormInError (state) {
const { amount, to } = getSendErrors(state)
return Boolean(amount || to !== null)
-} \ No newline at end of file
+}
diff --git a/ui/app/components/send_/send-footer/send-footer.utils.js b/ui/app/components/send_/send-footer/send-footer.utils.js
index 23d5655c7..353c0e347 100644
--- a/ui/app/components/send_/send-footer/send-footer.utils.js
+++ b/ui/app/components/send_/send-footer/send-footer.utils.js
@@ -1,5 +1,5 @@
import ethAbi from 'ethereumjs-abi'
-import ethUtil from 'ethereumjs-util'
+import ethUtil from 'ethereumjs-util'
import { TOKEN_TRANSFER_FUNCTION_SIGNATURE } from '../send.constants'
function formShouldBeDisabled ({ inError, selectedToken, tokenBalance, gasTotal }) {