diff --git a/js/components/ascribe_buttons/acl_button.js b/js/components/ascribe_buttons/acl_button.js index 7eec36f1..e3a1b8c4 100644 --- a/js/components/ascribe_buttons/acl_button.js +++ b/js/components/ascribe_buttons/acl_button.js @@ -30,6 +30,7 @@ let AclButton = React.createClass({ currentUser: React.PropTypes.object, buttonAcceptName: React.PropTypes.string, buttonAcceptClassName: React.PropTypes.string, + email: React.PropTypes.string, handleSuccess: React.PropTypes.func.isRequired, className: React.PropTypes.string }, @@ -52,6 +53,7 @@ let AclButton = React.createClass({ tooltip: getLangText('Have someone else sell the artwork'), form: ( @@ -88,6 +90,7 @@ let AclButton = React.createClass({ tooltip: getLangText('Loan your artwork for a limited period of time'), form: ( - - - +
+ + {this.props.children}
); diff --git a/js/components/whitelabel/wallet/components/lumenus/lumenus_buttons/lumenus_submit_button.js b/js/components/whitelabel/wallet/components/lumenus/lumenus_buttons/lumenus_submit_button.js index 13483502..365a5a34 100644 --- a/js/components/whitelabel/wallet/components/lumenus/lumenus_buttons/lumenus_submit_button.js +++ b/js/components/whitelabel/wallet/components/lumenus/lumenus_buttons/lumenus_submit_button.js @@ -3,47 +3,32 @@ import React from 'react'; import classNames from 'classnames'; +import AclButton from '../../../../../ascribe_buttons/acl_button'; -import GlobalNotificationModel from '../../../../../../models/global_notification_model'; -import GlobalNotificationActions from '../../../../../../actions/global_notification_actions'; -import UserActions from '../../../../../../actions/user_actions'; -import UserStore from '../../../../../../stores/user_store'; import WhitelabelActions from '../../../../../../actions/whitelabel_actions'; import WhitelabelStore from '../../../../../../stores/whitelabel_store'; -import ConsignForm from '../../../../../ascribe_forms/form_consign'; - -import ModalWrapper from '../../../../../ascribe_modal/modal_wrapper'; - -import ApiUrls from '../../../../../../constants/api_urls'; - -import { getAclFormMessage, getAclFormDataId } from '../../../../../../utils/form_utils'; -import { mergeOptions } from '../../../../../../utils/general_utils'; import { getLangText } from '../../../../../../utils/lang_utils'; let LumenusSubmitButton = React.createClass({ propTypes: { - className: React.PropTypes.string, + availableAcls: React.PropTypes.object.isRequired, + currentUser: React.PropTypes.object, editions: React.PropTypes.array, handleSuccess: React.PropTypes.func, + className: React.PropTypes.string, }, getInitialState() { - return mergeOptions( - UserStore.getState(), - WhitelabelStore.getState() - ); + return WhitelabelStore.getState(); }, componentDidMount() { - UserStore.listen(this.onChange); - UserActions.fetchCurrentUser(); WhitelabelStore.listen(this.onChange); WhitelabelActions.fetchWhitelabel(); }, componentWillUnmount() { - UserStore.unlisten(this.onChange); WhitelabelStore.unlisten(this.onChange); }, @@ -51,39 +36,19 @@ let LumenusSubmitButton = React.createClass({ this.setState(state); }, - showNotification(response) { - this.props.handleSuccess(); - if (response.notification) { - let notification = new GlobalNotificationModel(response.notification, 'success'); - GlobalNotificationActions.appendGlobalNotification(notification); - } - }, - render() { - const { className, editions, handleSuccess } = this.props; - const title = getLangText('Consign to Lumenus'); - const message = getAclFormMessage({ - aclName: 'acl_consign', - entities: editions, - isPiece: false, - senderName: this.state.currentUser.username - }); + const { availableAcls, currentUser, className, editions, handleSuccess } = this.props; return ( - - {title} - - } - handleSuccess={this.showNotification} - title={title}> - - + ); } });