diff --git a/app/gabsocial/features/ui/components/tabs_bar.js b/app/gabsocial/features/ui/components/tabs_bar.js index 815a3e973..ff7a747b8 100644 --- a/app/gabsocial/features/ui/components/tabs_bar.js +++ b/app/gabsocial/features/ui/components/tabs_bar.js @@ -4,7 +4,7 @@ import { NavLink, withRouter } from 'react-router-dom'; import { FormattedMessage, injectIntl } from 'react-intl'; import { throttle } from 'lodash'; import { connect } from 'react-redux'; -import { me, logo } from '../../../initial_state'; +import { me } from '../../../initial_state'; import classNames from 'classnames'; import NotificationsCounterIcon from './notifications_counter_icon'; import SearchContainer from 'gabsocial/features/compose/containers/search_container'; @@ -13,7 +13,7 @@ import ActionBar from 'gabsocial/features/compose/components/action_bar'; import { openModal } from '../../../actions/modal'; import { openSidebar } from '../../../actions/sidebar'; -export const privateLinks = [ +export const privateLinks = ({ logo }) => { return [ , @@ -34,9 +34,9 @@ export const privateLinks = [ , -]; +]} -export const publicLinks = [ +export const publicLinks = ({ logo }) => { return [ , @@ -48,7 +48,7 @@ export const publicLinks = [ , -]; +]} @withRouter class TabsBar extends React.PureComponent { @@ -117,9 +117,9 @@ class TabsBar extends React.PureComponent { }); render () { - const { intl: { formatMessage }, account, onOpenCompose, onOpenSidebar } = this.props; + const { intl: { formatMessage }, account, onOpenCompose, onOpenSidebar, logo } = this.props; const { collapsed } = this.state; - const links = account ? privateLinks : publicLinks; + const links = account ? privateLinks(this.props) : publicLinks(this.props); const classes = classNames('tabs-bar', { 'tabs-bar--collapsed': collapsed, @@ -181,6 +181,7 @@ class TabsBar extends React.PureComponent { const mapStateToProps = state => { return { account: state.getIn(['accounts', me]), + logo: state.getIn(['soapbox', 'logo']), }; }; diff --git a/public/soapbox/soapbox.json b/public/soapbox/soapbox.json index 424c9c60d..fa0ab7810 100644 --- a/public/soapbox/soapbox.json +++ b/public/soapbox/soapbox.json @@ -1,5 +1,6 @@ { "features": { "patron": false - } + }, + "logo": "https://media.gleasonator.com/site_uploads/files/000/000/002/original/logo.svg" }