|
|
@ -106,6 +106,7 @@ import {
|
|
|
|
NotificationsContainer,
|
|
|
|
NotificationsContainer,
|
|
|
|
ModalContainer,
|
|
|
|
ModalContainer,
|
|
|
|
ProfileHoverCard,
|
|
|
|
ProfileHoverCard,
|
|
|
|
|
|
|
|
RegisterInvite,
|
|
|
|
} from './util/async-components';
|
|
|
|
} from './util/async-components';
|
|
|
|
|
|
|
|
|
|
|
|
// Dummy import, to make sure that <Status /> ends up in the application bundle.
|
|
|
|
// Dummy import, to make sure that <Status /> ends up in the application bundle.
|
|
|
@ -275,6 +276,9 @@ class SwitchingColumnsArea extends React.PureComponent {
|
|
|
|
<WrappedRoute path='/statuses/:statusId' exact component={Status} content={children} componentParams={{ shouldUpdateScroll: this.shouldUpdateScroll }} />
|
|
|
|
<WrappedRoute path='/statuses/:statusId' exact component={Status} content={children} componentParams={{ shouldUpdateScroll: this.shouldUpdateScroll }} />
|
|
|
|
<WrappedRoute path='/scheduled_statuses' page={DefaultPage} component={ScheduledStatuses} content={children} />
|
|
|
|
<WrappedRoute path='/scheduled_statuses' page={DefaultPage} component={ScheduledStatuses} content={children} />
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<Redirect from='/registration/:token' to='/invite/:token' />
|
|
|
|
|
|
|
|
<WrappedRoute path='/invite/:token' component={RegisterInvite} content={children} publicRoute />
|
|
|
|
|
|
|
|
|
|
|
|
<Redirect exact from='/settings' to='/settings/preferences' />
|
|
|
|
<Redirect exact from='/settings' to='/settings/preferences' />
|
|
|
|
<WrappedRoute path='/settings/preferences' page={DefaultPage} component={Preferences} content={children} />
|
|
|
|
<WrappedRoute path='/settings/preferences' page={DefaultPage} component={Preferences} content={children} />
|
|
|
|
<WrappedRoute path='/settings/profile' page={DefaultPage} component={EditProfile} content={children} />
|
|
|
|
<WrappedRoute path='/settings/profile' page={DefaultPage} component={EditProfile} content={children} />
|
|
|
@ -482,9 +486,9 @@ class UI extends React.PureComponent {
|
|
|
|
componentDidUpdate(prevProps) {
|
|
|
|
componentDidUpdate(prevProps) {
|
|
|
|
this.connectStreaming();
|
|
|
|
this.connectStreaming();
|
|
|
|
|
|
|
|
|
|
|
|
const { dispatch, features } = this.props;
|
|
|
|
const { dispatch, account, features } = this.props;
|
|
|
|
|
|
|
|
|
|
|
|
if (features.chats && !prevProps.features.chats) {
|
|
|
|
if (features.chats && account && !prevProps.features.chats) {
|
|
|
|
dispatch(fetchChats());
|
|
|
|
dispatch(fetchChats());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|