diff options
author | Whymarrh Whitby <whymarrh.whitby@gmail.com> | 2018-10-06 05:34:55 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-10-06 05:34:55 +0800 |
commit | 888e5b4f167a8701e44865fde4da95a3fb10a363 (patch) | |
tree | ecffe9aadcaa213f827fe8ed20f2a47142a2d3b3 | |
parent | 874a86a6abac2fb152a8bc9492c4d80b8722b0e6 (diff) | |
parent | 7dd1254424180e58c07a2dcbd2449415ea2bdb40 (diff) | |
download | tangerine-wallet-browser-888e5b4f167a8701e44865fde4da95a3fb10a363.tar tangerine-wallet-browser-888e5b4f167a8701e44865fde4da95a3fb10a363.tar.gz tangerine-wallet-browser-888e5b4f167a8701e44865fde4da95a3fb10a363.tar.bz2 tangerine-wallet-browser-888e5b4f167a8701e44865fde4da95a3fb10a363.tar.lz tangerine-wallet-browser-888e5b4f167a8701e44865fde4da95a3fb10a363.tar.xz tangerine-wallet-browser-888e5b4f167a8701e44865fde4da95a3fb10a363.tar.zst tangerine-wallet-browser-888e5b4f167a8701e44865fde4da95a3fb10a363.zip |
Merge pull request #5442 from whymarrh/fix-page-container-footer
Fix markup for inline instances of PageContainers
3 files changed, 64 insertions, 64 deletions
diff --git a/ui/app/components/pages/confirm-add-suggested-token/confirm-add-suggested-token.component.js b/ui/app/components/pages/confirm-add-suggested-token/confirm-add-suggested-token.component.js index c24e1e0ea..ee5d6fa64 100644 --- a/ui/app/components/pages/confirm-add-suggested-token/confirm-add-suggested-token.component.js +++ b/ui/app/components/pages/confirm-add-suggested-token/confirm-add-suggested-token.component.js @@ -90,35 +90,31 @@ export default class ConfirmAddSuggestedToken extends Component { </div> </div> <div className="page-container__footer"> - <Button - type="default" - large - className="page-container__footer-button" - onClick={() => { - removeSuggestedTokens() - .then(() => { - history.push(DEFAULT_ROUTE) - }) - }} - > - { this.context.t('cancel') } - </Button> - <Button - type="primary" - large - className="page-container__footer-button" - onClick={() => { - addToken(pendingToken) - .then(() => { - removeSuggestedTokens() - .then(() => { - history.push(DEFAULT_ROUTE) - }) - }) - }} - > - { this.context.t('addToken') } - </Button> + <header> + <Button + type="default" + large + className="page-container__footer-button" + onClick={() => { + removeSuggestedTokens() + .then(() => history.push(DEFAULT_ROUTE)) + }} + > + { this.context.t('cancel') } + </Button> + <Button + type="primary" + large + className="page-container__footer-button" + onClick={() => { + addToken(pendingToken) + .then(() => removeSuggestedTokens()) + .then(() => history.push(DEFAULT_ROUTE)) + }} + > + { this.context.t('addToken') } + </Button> + </header> </div> </div> ) diff --git a/ui/app/components/pages/confirm-add-token/confirm-add-token.component.js b/ui/app/components/pages/confirm-add-token/confirm-add-token.component.js index 3dcc8cda9..d3fec79d7 100644 --- a/ui/app/components/pages/confirm-add-token/confirm-add-token.component.js +++ b/ui/app/components/pages/confirm-add-token/confirm-add-token.component.js @@ -86,28 +86,30 @@ export default class ConfirmAddToken extends Component { </div> </div> <div className="page-container__footer"> - <Button - type="default" - large - className="page-container__footer-button" - onClick={() => history.push(ADD_TOKEN_ROUTE)} - > - { this.context.t('back') } - </Button> - <Button - type="primary" - large - className="page-container__footer-button" - onClick={() => { - addTokens(pendingTokens) - .then(() => { - clearPendingTokens() - history.push(DEFAULT_ROUTE) - }) - }} - > - { this.context.t('addTokens') } - </Button> + <header> + <Button + type="default" + large + className="page-container__footer-button" + onClick={() => history.push(ADD_TOKEN_ROUTE)} + > + { this.context.t('back') } + </Button> + <Button + type="primary" + large + className="page-container__footer-button" + onClick={() => { + addTokens(pendingTokens) + .then(() => { + clearPendingTokens() + history.push(DEFAULT_ROUTE) + }) + }} + > + { this.context.t('addTokens') } + </Button> + </header> </div> </div> ) diff --git a/ui/app/components/pages/keychains/reveal-seed.js b/ui/app/components/pages/keychains/reveal-seed.js index 7782b541c..32557066f 100644 --- a/ui/app/components/pages/keychains/reveal-seed.js +++ b/ui/app/components/pages/keychains/reveal-seed.js @@ -108,19 +108,21 @@ class RevealSeedPage extends Component { renderPasswordPromptFooter () { return ( h('.page-container__footer', [ - h(Button, { - type: 'default', - large: true, - className: 'page-container__footer-button', - onClick: () => this.props.history.push(DEFAULT_ROUTE), - }, this.context.t('cancel')), - h(Button, { - type: 'primary', - large: true, - className: 'page-container__footer-button', - onClick: event => this.handleSubmit(event), - disabled: this.state.password === '', - }, this.context.t('next')), + h('header', [ + h(Button, { + type: 'default', + large: true, + className: 'page-container__footer-button', + onClick: () => this.props.history.push(DEFAULT_ROUTE), + }, this.context.t('cancel')), + h(Button, { + type: 'primary', + large: true, + className: 'page-container__footer-button', + onClick: event => this.handleSubmit(event), + disabled: this.state.password === '', + }, this.context.t('next')), + ]), ]) ) } |