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

Merge pull request #5442 from whymarrh/fix-page-container-footer

Browse Source 
Fix markup for inline instances of PageContainers
This commit is contained in:
Whymarrh Whitby 2018-10-05 19:04:55 -02:30 committed by GitHub
commit 888e5b4f16
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 64 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
ui/app/components/pages/confirm-add-suggested-token/confirm-add-suggested-token.component.js
View File

@ -90,35 +90,31 @@ export default class ConfirmAddSuggestedToken extends Component {
</div> </div>
</div> </div>
<div className="page-container__footer"> <div className="page-container__footer">
<Button <header>
type="default" <Button
large type="default"
className="page-container__footer-button" large
onClick={() => { className="page-container__footer-button"
removeSuggestedTokens() onClick={() => {
.then(() => { removeSuggestedTokens()
history.push(DEFAULT_ROUTE) .then(() => history.push(DEFAULT_ROUTE))
}) }}
}} >
> { this.context.t('cancel') }
{ this.context.t('cancel') } </Button>
</Button> <Button
<Button type="primary"
type="primary" large
large className="page-container__footer-button"
className="page-container__footer-button" onClick={() => {
onClick={() => { addToken(pendingToken)
addToken(pendingToken) .then(() => removeSuggestedTokens())
.then(() => { .then(() => history.push(DEFAULT_ROUTE))
removeSuggestedTokens() }}
.then(() => { >
history.push(DEFAULT_ROUTE) { this.context.t('addToken') }
}) </Button>
}) </header>
}}
>
{ this.context.t('addToken') }
</Button>
</div> </div>
</div> </div>
) )

46
ui/app/components/pages/confirm-add-token/confirm-add-token.component.js
View File

@ -86,28 +86,30 @@ export default class ConfirmAddToken extends Component {
</div> </div>
</div> </div>
<div className="page-container__footer"> <div className="page-container__footer">
<Button <header>
type="default" <Button
large type="default"
className="page-container__footer-button" large
onClick={() => history.push(ADD_TOKEN_ROUTE)} className="page-container__footer-button"
> onClick={() => history.push(ADD_TOKEN_ROUTE)}
{ this.context.t('back') } >
</Button> { this.context.t('back') }
<Button </Button>
type="primary" <Button
large type="primary"
className="page-container__footer-button" large
onClick={() => { className="page-container__footer-button"
addTokens(pendingTokens) onClick={() => {
.then(() => { addTokens(pendingTokens)
clearPendingTokens() .then(() => {
history.push(DEFAULT_ROUTE) clearPendingTokens()
}) history.push(DEFAULT_ROUTE)
}} })
> }}
{ this.context.t('addTokens') } >
</Button> { this.context.t('addTokens') }
</Button>
</header>
</div> </div>
</div> </div>
) )

28
ui/app/components/pages/keychains/reveal-seed.js
View File

@ -108,19 +108,21 @@ class RevealSeedPage extends Component {
renderPasswordPromptFooter () { renderPasswordPromptFooter () {
return ( return (
h('.page-container__footer', [ h('.page-container__footer', [
h(Button, { h('header', [
type: 'default', h(Button, {
large: true, type: 'default',
className: 'page-container__footer-button', large: true,
onClick: () => this.props.history.push(DEFAULT_ROUTE), className: 'page-container__footer-button',
}, this.context.t('cancel')), onClick: () => this.props.history.push(DEFAULT_ROUTE),
h(Button, { }, this.context.t('cancel')),
type: 'primary', h(Button, {
large: true, type: 'primary',
className: 'page-container__footer-button', large: true,
onClick: event => this.handleSubmit(event), className: 'page-container__footer-button',
disabled: this.state.password === '', onClick: event => this.handleSubmit(event),
}, this.context.t('next')), disabled: this.state.password === '',
}, this.context.t('next')),
]),
]) ])
) )
} }