From fe4c4d93c9f1a8e023e6366353090d41b21e533e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?marcin=20miko=C5=82ajczak?= Date: Thu, 28 Oct 2021 19:58:18 +0200 Subject: [PATCH] use baseURL for /invites MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: marcin mikołajczak --- app/soapbox/components/primary_navigation.js | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/app/soapbox/components/primary_navigation.js b/app/soapbox/components/primary_navigation.js index b9c1c6e72..15bc811f6 100644 --- a/app/soapbox/components/primary_navigation.js +++ b/app/soapbox/components/primary_navigation.js @@ -11,20 +11,22 @@ import IconWithCounter from 'soapbox/components/icon_with_counter'; import classNames from 'classnames'; import { getFeatures } from 'soapbox/utils/features'; import { getSoapboxConfig } from 'soapbox/actions/soapbox'; -import { isStaff } from 'soapbox/utils/accounts'; +import { isStaff, getBaseURL } from 'soapbox/utils/accounts'; const mapStateToProps = state => { const me = state.get('me'); + const account = state.getIn(['accounts', me]); const reportsCount = state.getIn(['admin', 'openReports']).count(); const approvalCount = state.getIn(['admin', 'awaitingApproval']).count(); const instance = state.get('instance'); return { - account: state.getIn(['accounts', me]), + account, logo: getSoapboxConfig(state).get('logo'), notificationCount: state.getIn(['notifications', 'unread']), chatsCount: state.get('chats').reduce((acc, curr) => acc + Math.min(curr.get('unread', 0), 1), 0), dashboardCount: reportsCount + approvalCount, + baseURL: getBaseURL(account), features: getFeatures(instance), instance, }; @@ -44,13 +46,14 @@ class PrimaryNavigation extends React.PureComponent { dashboardCount: PropTypes.number, notificationCount: PropTypes.number, chatsCount: PropTypes.number, + baseURL: PropTypes.string, features: PropTypes.object.isRequired, location: PropTypes.object, instance: ImmutablePropTypes.map.isRequired, }; render() { - const { account, features, notificationCount, chatsCount, dashboardCount, location, instance } = this.props; + const { account, features, notificationCount, chatsCount, dashboardCount, location, instance, baseURL } = this.props; return (
@@ -118,7 +121,7 @@ class PrimaryNavigation extends React.PureComponent { )} {(account && instance.get('invites_enabled')) && ( - +