diff --git a/js/components/ascribe_routes/proxy_routes/redirect_proxy_handler.js b/js/components/ascribe_routes/proxy_routes/redirect_proxy_handler.js index 4fae7da2..aabfb991 100644 --- a/js/components/ascribe_routes/proxy_routes/redirect_proxy_handler.js +++ b/js/components/ascribe_routes/proxy_routes/redirect_proxy_handler.js @@ -79,7 +79,11 @@ export default function RedirectProxyHandler({to, when}) { /* * redirectAuthenticated contains an arbirary path * eg pieces/, editions/, collection, settings, ... - * hence transitionTo cannot be used directly + * hence transitionTo cannot be used directly. + * + * While we're getting rid of `query.redirect` explicitly in the + * above `else if` statement, here it's sufficient to just call + * `baseUrl` + `redirectAuthenticated`, as it gets rid of queries as well. */ window.location = AppConstants.baseUrl + redirectAuthenticated; } diff --git a/js/components/whitelabel/wallet/components/ascribe_detail/wallet_action_panel.js b/js/components/whitelabel/wallet/components/ascribe_detail/wallet_action_panel.js index b00d10cc..3e60c653 100644 --- a/js/components/whitelabel/wallet/components/ascribe_detail/wallet_action_panel.js +++ b/js/components/whitelabel/wallet/components/ascribe_detail/wallet_action_panel.js @@ -49,7 +49,7 @@ let WalletActionPanel = React.createClass({ className="text-center ascribe-button-list" availableAcls={availableAcls} editions={this.props.piece} - handleSuccess={this.loadPiece}> + handleSuccess={this.props.loadPiece}> @@ -58,7 +58,6 @@ let WalletActionPanel = React.createClass({ aclName="acl_wallet_submit"> diff --git a/js/components/whitelabel/wallet/components/cyland/ascribe_detail/cyland_piece_container.js b/js/components/whitelabel/wallet/components/cyland/ascribe_detail/cyland_piece_container.js index 70744f54..2ad2dc9b 100644 --- a/js/components/whitelabel/wallet/components/cyland/ascribe_detail/cyland_piece_container.js +++ b/js/components/whitelabel/wallet/components/cyland/ascribe_detail/cyland_piece_container.js @@ -22,7 +22,8 @@ import { mergeOptions } from '../../../../../../utils/general_utils'; let CylandPieceContainer = React.createClass({ propTypes: { - location: React.PropTypes.object + location: React.PropTypes.object, + params: React.PropTypes.object }, getInitialState() { diff --git a/js/components/whitelabel/wallet/components/ikonotv/ascribe_buttons/ikonotv_submit_button.js b/js/components/whitelabel/wallet/components/ikonotv/ascribe_buttons/ikonotv_submit_button.js index 7fb70211..24af1d0b 100644 --- a/js/components/whitelabel/wallet/components/ikonotv/ascribe_buttons/ikonotv_submit_button.js +++ b/js/components/whitelabel/wallet/components/ikonotv/ascribe_buttons/ikonotv_submit_button.js @@ -12,7 +12,6 @@ import { getLangText } from '../../../../../../utils/lang_utils'; let IkonotvSubmitButton = React.createClass({ propTypes: { className: React.PropTypes.string, - handleSuccess: React.PropTypes.func, piece: React.PropTypes.object.isRequired }, diff --git a/js/components/whitelabel/wallet/components/ikonotv/ascribe_detail/ikonotv_piece_container.js b/js/components/whitelabel/wallet/components/ikonotv/ascribe_detail/ikonotv_piece_container.js index 1194b14a..cc457ea0 100644 --- a/js/components/whitelabel/wallet/components/ikonotv/ascribe_detail/ikonotv_piece_container.js +++ b/js/components/whitelabel/wallet/components/ikonotv/ascribe_detail/ikonotv_piece_container.js @@ -22,7 +22,12 @@ import AppConstants from '../../../../../../constants/application_constants'; import { getLangText } from '../../../../../../utils/lang_utils'; import { mergeOptions } from '../../../../../../utils/general_utils'; + let IkonotvPieceContainer = React.createClass({ + propTypes: { + params: React.PropTypes.object + }, + getInitialState() { return mergeOptions( PieceStore.getState(),