bigbuffet/pleroma
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'gate-messaging' into 'develop'

Browse source 
Fix feature-gating of messages

See merge request soapbox-pub/soapbox-fe!1445
This commit is contained in:
Alex Gleason 2022-05-24 16:12:16 +00:00
commit 5bfec696d9
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/soapbox/features/ui/index.tsx
View file

@ -184,9 +184,8 @@ const SwitchingColumnsArea: React.FC = ({ children }) => {
{features.federating && <WrappedRoute path='/timeline/:instance' exact page={RemoteInstancePage} component={RemoteTimeline} content={children} />}
{features.conversations && <WrappedRoute path='/conversations' page={DefaultPage} component={Conversations} content={children} />}
{features.directTimeline ? (
<WrappedRoute path='/messages' page={DefaultPage} component={DirectTimeline} content={children} />
) : (
{features.directTimeline && <WrappedRoute path='/messages' page={DefaultPage} component={DirectTimeline} content={children} />}
{(features.conversations && !features.directTimeline) && (
<WrappedRoute path='/messages' page={DefaultPage} component={Conversations} content={children} />
)}