Merge remote-tracking branch 'origin/feature/general'

client/src/components/Sidebar/SidebarContainer.js

@@ -1,11 +1,12 @@
-import React from 'react';
+import * as React from 'react';
+import { Scrollbar } from 'react-scrollbars-custom';
 
 export default function SidebarContainer(props) {
   return (
-    <div className="sidebar" id="sidebar">
-      <div class="sidebar__inner">
-        {props.children}
-      </div>
+    <div className='sidebar' id='sidebar'>
+      <Scrollbar noDefaultStyles={true}>
+        <div className='sidebar__inner'>{props.children}</div>
+      </Scrollbar>
     </div>
-  )
-}
+  );
+}

client/src/components/Sidebar/SidebarMenu.js

@@ -32,7 +32,7 @@ export default function SidebarMenu() {
             dropdownType={item.dropdownType || 'collapse'}
             caretIconSize={15}
             onClick={handleItemClick}
-            callapseActive={!!isActive}
+            // callapseActive={!!isActive}
             className={classNames({ 'is-active': isActive })} />
       );
     });