diff options
author | Whymarrh Whitby <whymarrh.whitby@gmail.com> | 2018-11-05 21:07:56 +0800 |
---|---|---|
committer | Dan Finlay <542863+danfinlay@users.noreply.github.com> | 2018-11-06 07:07:09 +0800 |
commit | 26ada8a828ab684c310080a18115a8ef3234aaee (patch) | |
tree | 5590e696390208691d61b5bdf82b80a9fe1ad27d /ui/app/components/pages | |
parent | 31cb111d2e98c17728a75ebe00430654d827e136 (diff) | |
download | tangerine-wallet-browser-26ada8a828ab684c310080a18115a8ef3234aaee.tar tangerine-wallet-browser-26ada8a828ab684c310080a18115a8ef3234aaee.tar.gz tangerine-wallet-browser-26ada8a828ab684c310080a18115a8ef3234aaee.tar.bz2 tangerine-wallet-browser-26ada8a828ab684c310080a18115a8ef3234aaee.tar.lz tangerine-wallet-browser-26ada8a828ab684c310080a18115a8ef3234aaee.tar.xz tangerine-wallet-browser-26ada8a828ab684c310080a18115a8ef3234aaee.tar.zst tangerine-wallet-browser-26ada8a828ab684c310080a18115a8ef3234aaee.zip |
Update Connect Request screen design (#5644)
* Parameterize NetworkDisplay background colour
* Update design for login request screen
* Pass siteTitle, siteImage through for calls to ethereum.enable()
* Bring the site images closer together
Diffstat (limited to 'ui/app/components/pages')
-rw-r--r-- | ui/app/components/pages/home/home.component.js | 4 | ||||
-rw-r--r-- | ui/app/components/pages/provider-approval/provider-approval.component.js | 31 |
2 files changed, 15 insertions, 20 deletions
diff --git a/ui/app/components/pages/home/home.component.js b/ui/app/components/pages/home/home.component.js index 7b64ebc4e..b9ec3c258 100644 --- a/ui/app/components/pages/home/home.component.js +++ b/ui/app/components/pages/home/home.component.js @@ -67,7 +67,9 @@ export default class Home extends PureComponent { } if (providerRequests && providerRequests.length > 0) { - return <ProviderApproval origin={providerRequests[0].origin} /> + return ( + <ProviderApproval providerRequest={providerRequests[0]} /> + ) } return ( diff --git a/ui/app/components/pages/provider-approval/provider-approval.component.js b/ui/app/components/pages/provider-approval/provider-approval.component.js index 67e8bdd4c..da98bc3fc 100644 --- a/ui/app/components/pages/provider-approval/provider-approval.component.js +++ b/ui/app/components/pages/provider-approval/provider-approval.component.js @@ -1,12 +1,12 @@ -import PageContainerContent from '../../page-container' import PropTypes from 'prop-types' import React, { Component } from 'react' +import ProviderPageContainer from '../../provider-page-container' export default class ProviderApproval extends Component { static propTypes = { - approveProviderRequest: PropTypes.func, - origin: PropTypes.string, - rejectProviderRequest: PropTypes.func, + approveProviderRequest: PropTypes.func.isRequired, + providerRequest: PropTypes.object.isRequired, + rejectProviderRequest: PropTypes.func.isRequired, }; static contextTypes = { @@ -14,22 +14,15 @@ export default class ProviderApproval extends Component { }; render () { - const { approveProviderRequest, origin, rejectProviderRequest } = this.props + const { approveProviderRequest, providerRequest, rejectProviderRequest } = this.props return ( - <PageContainerContent - title={this.context.t('providerAPIRequest')} - subtitle={this.context.t('reviewProviderRequest')} - contentComponent={( - <div className="provider_approval_content"> - {this.context.t('providerRequestInfo')} - <div className="provider_approval_origin">{origin}</div> - </div> - )} - submitText={this.context.t('approve')} - cancelText={this.context.t('reject')} - onSubmit={() => { approveProviderRequest(origin) }} - onCancel={() => { rejectProviderRequest(origin) }} - onClose={() => { rejectProviderRequest(origin) }} /> + <ProviderPageContainer + approveProviderRequest={approveProviderRequest} + origin={providerRequest.origin} + rejectProviderRequest={rejectProviderRequest} + siteImage={providerRequest.siteImage} + siteTitle={providerRequest.siteTitle} + /> ) } } |