ascribe/onion
1
0
Fork 0
mirror of https://github.com/ascribe/onion.git synced 2024-12-22 09:23:13 +01:00
Code Issues Releases Wiki Activity

Merge branch 'master' into AP-7-artcity-consignment-wallet

Browse Source 
Ok, it was my fault...

Conflicts:
	js/components/whitelabel/wallet/wallet_app.js
This commit is contained in:
Tim Daubenschütz 2016-02-08 10:09:14 +01:00
commit e69dc21518
2 changed files with 6 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/components/whitelabel/wallet/components/23vivi/23vivi_landing.js
View File

@ -13,7 +13,7 @@ let Vivi23Landing = React.createClass({
propTypes: {
customThumbnailPlaceholder: React.PropTypes.func,
// Provided from PrizeApp
// Provided from WalletApp
currentUser: React.PropTypes.object,
whitelabel: React.PropTypes.object.isRequired,

21
js/components/whitelabel/wallet/components/polline/polline_landing.js
View File

@ -13,34 +13,23 @@ import { setDocumentTitle } from '../../../../../utils/dom_utils';
let PollineLanding = React.createClass({
getInitialState() {
return WhitelabelStore.getState();
propTypes: {
// Provided from WalletApp
currentUser: React.PropTypes.object,
whitelabel: React.PropTypes.object.isRequired
},
componentWillMount() {
setDocumentTitle('Polline Marketplace');
},
componentDidMount() {
WhitelabelStore.listen(this.onChange);
WhitelabelActions.fetchWhitelabel();
},
componentWillUnmount() {
WhitelabelStore.unlisten(this.onChange);
},
onChange(state) {
this.setState(state);
},
render() {
return (
<div className="container ascribe-form-wrapper polline-landing">
<div className="row">
<div className="col-xs-12">
<div className="row polline-landing--header">
<img className="polline-landing--header-logo" src={this.state.whitelabel.logo} />
<img className="polline-landing--header-logo" src={this.props.whitelabel.logo} />
<div>
{getLangText('Polline Art Marketplace is powered by') + ' '}
<span className="icon-ascribe-logo" />