From 7e9a2fbea4b89bbf3ffe0aac8d2682f59c0f1caa Mon Sep 17 00:00:00 2001
From: gabriellsh <40830821+gabriellsh@users.noreply.github.com>
Date: Mon, 28 Dec 2020 23:14:43 -0300
Subject: [PATCH] Regression: Double Scrollbars on tables (#19980)

---
 client/components/ScrollableContentWrapper.tsx       | 2 +-
 client/views/room/contextualBar/Discussions/index.js | 2 +-
 client/views/room/contextualBar/Threads/index.js     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/components/ScrollableContentWrapper.tsx b/client/components/ScrollableContentWrapper.tsx
index 106765f5811..1720ce9862a 100644
--- a/client/components/ScrollableContentWrapper.tsx
+++ b/client/components/ScrollableContentWrapper.tsx
@@ -6,7 +6,7 @@ import { useDir } from '../hooks/useDir';
 
 
 const styleDefault = {
-	maxHeight: '100%', flexGrow: 1, overflowY: 'auto', willChange: 'transform',
+	height: '100%', flexGrow: 1, overflowY: 'auto', willChange: 'transform', width: '100%',
 };
 
 type CustomScrollbarsProps = {
diff --git a/client/views/room/contextualBar/Discussions/index.js b/client/views/room/contextualBar/Discussions/index.js
index 6993e3118b2..a2cfaa20c52 100644
--- a/client/views/room/contextualBar/Discussions/index.js
+++ b/client/views/room/contextualBar/Discussions/index.js
@@ -215,7 +215,7 @@ export function DiscussionList({ total = 10, discussions = [], loadMoreItems, lo
 			<Box display='flex' flexDirection='row' p='x24' borderBlockEndWidth='x2' borderBlockEndStyle='solid' borderBlockEndColor='neutral-200' flexShrink={0}>
 				<TextInput placeholder={t('Search_Messages')} value={text} onChange={setText} addon={<Icon name='magnifier' size='x20'/>}/>
 			</Box>
-			<Box flexGrow={1} flexShrink={1} ref={ref} overflow='hidden'>
+			<Box flexGrow={1} flexShrink={1} ref={ref} overflow='hidden' display='flex'>
 				{error && <Callout mi='x24' type='danger'>{error.toString()}</Callout>}
 				{total === 0 && <Box p='x24'>{t('No_Discussions_found')}</Box>}
 				{!error && total > 0 && <InfiniteLoader
diff --git a/client/views/room/contextualBar/Threads/index.js b/client/views/room/contextualBar/Threads/index.js
index 14e10f48542..9d316af787a 100644
--- a/client/views/room/contextualBar/Threads/index.js
+++ b/client/views/room/contextualBar/Threads/index.js
@@ -258,7 +258,7 @@ export function ThreadList({ total = 10, threads = [], room, unread = [], unread
 					</Margins>
 				</Box>
 			</Box>
-			<Box flexGrow={1} flexShrink={1} ref={ref} overflow='hidden'>
+			<Box flexGrow={1} flexShrink={1} ref={ref} overflow='hidden' display='flex'>
 				{error && <Callout mi='x24' type='danger'>{error.toString()}</Callout>}
 				{total === 0 && <Box p='x24'>{t('No_Threads')}</Box>}
 				{!error && total > 0 && <InfiniteLoader