From 8ee9a8ab75f442e8f490bf83ff068ee315a242a9 Mon Sep 17 00:00:00 2001
From: Alex Junior <alexalexandrejr@gmail.com>
Date: Thu, 22 Jul 2021 18:13:02 -0300
Subject: [PATCH] [FIX] Conflicts not resolved properly on 4.18.0 (#3290)

---
 app/views/RoomsListView/Header/Header.js | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

diff --git a/app/views/RoomsListView/Header/Header.js b/app/views/RoomsListView/Header/Header.js
index 96712e125..8eb51c250 100644
--- a/app/views/RoomsListView/Header/Header.js
+++ b/app/views/RoomsListView/Header/Header.js
@@ -66,21 +66,10 @@ const Header = React.memo(({
 	}
 	return (
 		<View style={styles.container}>
-			<TouchableOpacity
-				onPress={onPress}
-				testID='rooms-list-header-server-dropdown-button'
-			>
-				<View style={styles.button}>
-					<Text style={[styles.title, isFetching && styles.serverSmall, titleColorStyle, { fontSize: titleFontSize }]} numberOfLines={1}>{serverName}</Text>
-					<CustomIcon
-						name='chevron-down'
-						color={themes[theme].headerTintColor}
-						style={[showServerDropdown && styles.upsideDown]}
-						size={18}
-					/>
-				</View>
-				{subtitle ? <Text testID='rooms-list-header-server-subtitle' style={[styles.subtitle, { color: themes[theme].auxiliaryText, fontSize: subTitleFontSize }]} numberOfLines={1}>{subtitle}</Text> : null}
-			</TouchableOpacity>
+			<View style={styles.button}>
+				<Text style={[styles.title, isFetching && styles.serverSmall, titleColorStyle, { fontSize: titleFontSize }]} numberOfLines={1}>{serverName}</Text>
+			</View>
+			{subtitle ? <Text testID='rooms-list-header-server-subtitle' style={[styles.subtitle, { color: themes[theme].auxiliaryText, fontSize: subTitleFontSize }]} numberOfLines={1}>{subtitle}</Text> : null}
 		</View>
 	);
 });