diff --git a/packages/cashier/src/stores/general-store.js b/packages/cashier/src/stores/general-store.js index 6201f7d6b11c..9d8aff7ac09a 100644 --- a/packages/cashier/src/stores/general-store.js +++ b/packages/cashier/src/stores/general-store.js @@ -108,7 +108,7 @@ export default class GeneralStore extends BaseStore { @action.bound replaceCashierMenuOnclick() { - const { menu, ui } = this.root_store; + const { menu, ui, client } = this.root_store; this.setHasSetCurrency(); @@ -117,7 +117,7 @@ export default class GeneralStore extends BaseStore { id: 'dt_cashier_tab', icon: , text: () => localize('Cashier'), - link_to: this.has_set_currency && routes.cashier, + link_to: client.is_cra ? routes.cashier_withdrawal : this.has_set_currency && routes.cashier, onClick: !this.has_set_currency ? ui.toggleSetCurrencyModal : false, login_only: true, }, diff --git a/packages/core/src/App/Containers/Layout/footer.jsx b/packages/core/src/App/Containers/Layout/footer.jsx index 27db723a58a3..5378f99cf932 100644 --- a/packages/core/src/App/Containers/Layout/footer.jsx +++ b/packages/core/src/App/Containers/Layout/footer.jsx @@ -43,6 +43,7 @@ const Footer = ({ toggleSettingsModal, settings_extension, landing_company_shortcode, + is_cra, }) => { let footer_extensions_left = []; let footer_extensions_right = []; @@ -70,8 +71,8 @@ const Footer = ({ - - {is_logged_in && } + {!is_cra && } + {is_logged_in && !is_cra && } {is_logged_in && !is_virtual && ( )} @@ -92,6 +93,7 @@ const Footer = ({ Footer.propTypes = { is_app_disabled: PropTypes.bool, + is_cra: PropTypes.bool, is_logged_in: PropTypes.bool, is_route_modal_on: PropTypes.bool, is_settings_modal_on: PropTypes.bool, @@ -109,6 +111,7 @@ export default withRouter( is_route_modal_on: ui.is_route_modal_on, is_logged_in: client.is_logged_in, is_eu: client.is_eu, + is_cra: client.is_cra, is_loading: ui.is_loading, is_settings_modal_on: ui.is_settings_modal_on, is_virtual: client.is_virtual,