From 684bbb4aef417ea13c7a37bbb843bb4557a5aa30 Mon Sep 17 00:00:00 2001
From: Mylon Suren <23694620+mylonsuren@users.noreply.github.com>
Date: Thu, 3 Nov 2022 11:37:58 -0400
Subject: [PATCH] Remove down arrow next to team name and make team name
 unclickable (#6715)

---
 .../__snapshots__/index.test.tsx.snap         | 51 +++++--------------
 .../header/__snapshots__/header.test.tsx.snap | 51 +++++--------------
 .../categories_list/header/header.tsx         | 16 ++----
 3 files changed, 27 insertions(+), 91 deletions(-)

diff --git a/app/screens/home/channel_list/categories_list/__snapshots__/index.test.tsx.snap b/app/screens/home/channel_list/categories_list/__snapshots__/index.test.tsx.snap
index 8722aaba07..74f6b532fe 100644
--- a/app/screens/home/channel_list/categories_list/__snapshots__/index.test.tsx.snap
+++ b/app/screens/home/channel_list/categories_list/__snapshots__/index.test.tsx.snap
@@ -47,7 +47,6 @@ exports[`components/categories_list should render channels error 1`] = `
     >
       <View
         accessible={true}
-        collapsable={false}
         focusable={false}
         onClick={[Function]}
         onResponderGrant={[Function]}
@@ -58,52 +57,26 @@ exports[`components/categories_list should render channels error 1`] = `
         onStartShouldSetResponder={[Function]}
         style={
           {
-            "opacity": 1,
+            "alignItems": "center",
+            "flexDirection": "row",
+            "justifyContent": "space-between",
           }
         }
       >
-        <View
+        <Text
           style={
             {
-              "alignItems": "center",
-              "flexDirection": "row",
-              "justifyContent": "space-between",
+              "color": "#ffffff",
+              "fontFamily": "Metropolis-SemiBold",
+              "fontSize": 28,
+              "fontWeight": "600",
+              "lineHeight": 36,
             }
           }
+          testID="channel_list_header.team_display_name"
         >
-          <Text
-            style={
-              {
-                "color": "#ffffff",
-                "fontFamily": "Metropolis-SemiBold",
-                "fontSize": 28,
-                "fontWeight": "600",
-                "lineHeight": 36,
-              }
-            }
-            testID="channel_list_header.team_display_name"
-          >
-            Test Team!
-          </Text>
-          <View
-            style={
-              {
-                "marginLeft": 4,
-              }
-            }
-            testID="channel_list_header.chevron.button"
-          >
-            <Icon
-              name="chevron-down"
-              style={
-                {
-                  "color": "rgba(255,255,255,0.8)",
-                  "fontSize": 24,
-                }
-              }
-            />
-          </View>
-        </View>
+          Test Team!
+        </Text>
       </View>
       <View
         accessible={true}
diff --git a/app/screens/home/channel_list/categories_list/header/__snapshots__/header.test.tsx.snap b/app/screens/home/channel_list/categories_list/header/__snapshots__/header.test.tsx.snap
index 3950883343..e2ee64617b 100644
--- a/app/screens/home/channel_list/categories_list/header/__snapshots__/header.test.tsx.snap
+++ b/app/screens/home/channel_list/categories_list/header/__snapshots__/header.test.tsx.snap
@@ -27,7 +27,6 @@ exports[`components/channel_list/header Channel List Header Component should mat
   >
     <View
       accessible={true}
-      collapsable={false}
       focusable={false}
       onClick={[Function]}
       onResponderGrant={[Function]}
@@ -38,52 +37,26 @@ exports[`components/channel_list/header Channel List Header Component should mat
       onStartShouldSetResponder={[Function]}
       style={
         {
-          "opacity": 1,
+          "alignItems": "center",
+          "flexDirection": "row",
+          "justifyContent": "space-between",
         }
       }
     >
-      <View
+      <Text
         style={
           {
-            "alignItems": "center",
-            "flexDirection": "row",
-            "justifyContent": "space-between",
+            "color": "#ffffff",
+            "fontFamily": "Metropolis-SemiBold",
+            "fontSize": 28,
+            "fontWeight": "600",
+            "lineHeight": 36,
           }
         }
+        testID="channel_list_header.team_display_name"
       >
-        <Text
-          style={
-            {
-              "color": "#ffffff",
-              "fontFamily": "Metropolis-SemiBold",
-              "fontSize": 28,
-              "fontWeight": "600",
-              "lineHeight": 36,
-            }
-          }
-          testID="channel_list_header.team_display_name"
-        >
-          Test!
-        </Text>
-        <View
-          style={
-            {
-              "marginLeft": 4,
-            }
-          }
-          testID="channel_list_header.chevron.button"
-        >
-          <Icon
-            name="chevron-down"
-            style={
-              {
-                "color": "rgba(255,255,255,0.8)",
-                "fontSize": 24,
-              }
-            }
-          />
-        </View>
-      </View>
+        Test!
+      </Text>
     </View>
     <View
       accessible={true}
diff --git a/app/screens/home/channel_list/categories_list/header/header.tsx b/app/screens/home/channel_list/categories_list/header/header.tsx
index befe2c3575..d107967151 100644
--- a/app/screens/home/channel_list/categories_list/header/header.tsx
+++ b/app/screens/home/channel_list/categories_list/header/header.tsx
@@ -3,7 +3,7 @@
 
 import React, {useCallback, useEffect} from 'react';
 import {useIntl} from 'react-intl';
-import {Insets, Text, View} from 'react-native';
+import {Insets, Text, TouchableWithoutFeedback, View} from 'react-native';
 import Animated, {useAnimatedStyle, useSharedValue, withTiming} from 'react-native-reanimated';
 import {useSafeAreaInsets} from 'react-native-safe-area-context';
 
@@ -158,9 +158,8 @@ const ChannelListHeader = ({
         header = (
             <>
                 <View style={styles.headerRow}>
-                    <TouchableWithFeedback
+                    <TouchableWithoutFeedback
                         onPress={onHeaderPress}
-                        type='opacity'
                     >
                         <View style={styles.headerRow}>
                             <Text
@@ -169,17 +168,8 @@ const ChannelListHeader = ({
                             >
                                 {displayName}
                             </Text>
-                            <View
-                                style={styles.chevronButton}
-                                testID='channel_list_header.chevron.button'
-                            >
-                                <CompassIcon
-                                    style={styles.chevronIcon}
-                                    name={'chevron-down'}
-                                />
-                            </View>
                         </View>
-                    </TouchableWithFeedback>
+                    </TouchableWithoutFeedback>
                     <TouchableWithFeedback
                         hitSlop={hitSlop}
                         onPress={onPress}