From 64e2f536924e8bf86d8b5f77c89ad2fe9afe6b70 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Fri, 20 Aug 2021 16:28:15 -0500
Subject: [PATCH] Mastodon: don't conditionally render chat routes (this causes
 bugs)

---
 app/soapbox/features/ui/index.js | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/app/soapbox/features/ui/index.js b/app/soapbox/features/ui/index.js
index 9bfb2d4f9..45d77a466 100644
--- a/app/soapbox/features/ui/index.js
+++ b/app/soapbox/features/ui/index.js
@@ -161,7 +161,6 @@ class SwitchingColumnsArea extends React.PureComponent {
     children: PropTypes.node,
     location: PropTypes.object,
     onLayoutChange: PropTypes.func.isRequired,
-    features: PropTypes.object.isRequired,
   };
 
   state = {
@@ -190,7 +189,7 @@ class SwitchingColumnsArea extends React.PureComponent {
   }
 
   render() {
-    const { children, features } = this.props;
+    const { children } = this.props;
 
     return (
       <Switch>
@@ -240,10 +239,8 @@ class SwitchingColumnsArea extends React.PureComponent {
 
         <WrappedRoute path='/search' publicRoute page={DefaultPage} component={Search} content={children} />
 
-        {features.chats && <>
-          <WrappedRoute path='/chats' exact page={DefaultPage} component={ChatIndex} content={children} />
-          <WrappedRoute path='/chats/:chatId' page={DefaultPage} component={ChatRoom} content={children} />
-        </>}
+        <WrappedRoute path='/chats' exact page={DefaultPage} component={ChatIndex} content={children} />
+        <WrappedRoute path='/chats/:chatId' page={DefaultPage} component={ChatRoom} content={children} />
 
         <WrappedRoute path='/follow_requests' page={DefaultPage} component={FollowRequests} content={children} />
         <WrappedRoute path='/blocks' page={DefaultPage} component={Blocks} content={children} />
@@ -634,7 +631,7 @@ class UI extends React.PureComponent {
       <HotKeys keyMap={keyMap} handlers={handlers} ref={this.setHotkeysRef} attach={window} focused>
         <div className={classnames} ref={this.setRef} style={style}>
           <TabsBar />
-          <SwitchingColumnsArea location={location} onLayoutChange={this.handleLayoutChange} features={features}>
+          <SwitchingColumnsArea location={location} onLayoutChange={this.handleLayoutChange}>
             {children}
           </SwitchingColumnsArea>