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

Fix order of button text in page-container-footer.

Browse Source
This commit is contained in:
Dan 2018-05-24 18:25:23 -02:30
parent 5bb399e55a
commit 3a87d9221d
2 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ui/app/components/page-container/page-container-footer/page-container-footer.component.js
View File

@ -34,7 +34,7 @@ export default class PageContainerFooter extends Component {
className="page-container__footer-button" className="page-container__footer-button"
onClick={() => onCancel()} onClick={() => onCancel()}
> >
{ this.context.t('cancel') || cancelText } { cancelText || this.context.t('cancel') }
</Button> </Button>
<Button <Button
@ -44,7 +44,7 @@ export default class PageContainerFooter extends Component {
disabled={disabled} disabled={disabled}
onClick={e => onSubmit(e)} onClick={e => onSubmit(e)}
> >
{ this.context.t('next') || submitText } { submitText || this.context.t('next') }
</Button> </Button>
</div> </div>

10
ui/app/components/send_/send-footer/send-footer.container.js
View File

@ -26,7 +26,6 @@ import {
addressIsNew, addressIsNew,
constructTxParams, constructTxParams,
constructUpdatedTx, constructUpdatedTx,
formShouldBeDisabled,
} from './send-footer.utils' } from './send-footer.utils'
export default connect(mapStateToProps, mapDispatchToProps)(SendFooter) export default connect(mapStateToProps, mapDispatchToProps)(SendFooter)
@ -34,21 +33,16 @@ export default connect(mapStateToProps, mapDispatchToProps)(SendFooter)
function mapStateToProps (state) { function mapStateToProps (state) {
return { return {
amount: getSendAmount(state), amount: getSendAmount(state),
disabled: formShouldBeDisabled({
inError: isSendFormInError(state),
selectedToken: getSelectedToken(state),
tokenBalance: getTokenBalance(state),
gasTotal: getGasTotal(state),
}),
editingTransactionId: getSendEditingTransactionId(state), editingTransactionId: getSendEditingTransactionId(state),
from: getSendFromObject(state), from: getSendFromObject(state),
gasLimit: getGasLimit(state), gasLimit: getGasLimit(state),
gasPrice: getGasPrice(state), gasPrice: getGasPrice(state),
gasTotal: getGasTotal(state),
inError: isSendFormInError(state), inError: isSendFormInError(state),
isToken: Boolean(getSelectedToken(state)),
selectedToken: getSelectedToken(state), selectedToken: getSelectedToken(state),
to: getSendTo(state), to: getSendTo(state),
toAccounts: getSendToAccounts(state), toAccounts: getSendToAccounts(state),
tokenBalance: getTokenBalance(state),
unapprovedTxs: getUnapprovedTxs(state), unapprovedTxs: getUnapprovedTxs(state),
} }
} }