From 47317bb1e97f3e42af9f957f5e355229c0c7812b Mon Sep 17 00:00:00 2001
From: Elias Nahum <nahumhbl@gmail.com>
Date: Wed, 19 Jul 2023 08:17:18 -0400
Subject: [PATCH] Do not show archived teams when browsing available teams
 (#7460)

---
 app/screens/index.tsx                   | 14 +++++---------
 app/screens/join_team/join_team.tsx     |  3 ++-
 app/screens/select_team/select_team.tsx |  3 ++-
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/app/screens/index.tsx b/app/screens/index.tsx
index 22d0f8c0c..0cde68c5d 100644
--- a/app/screens/index.tsx
+++ b/app/screens/index.tsx
@@ -15,15 +15,11 @@ import {DEFAULT_LOCALE, getTranslations} from '@i18n';
 
 const withGestures = (Screen: React.ComponentType, styles: StyleProp<ViewStyle>) => {
     return function gestureHoc(props: any) {
-        if (Platform.OS === 'android') {
-            return (
-                <GestureHandlerRootView style={[{flex: 1}, styles]}>
-                    <Screen {...props}/>
-                </GestureHandlerRootView>
-            );
-        }
-
-        return <Screen {...props}/>;
+        return (
+            <GestureHandlerRootView style={[{flex: 1}, styles]}>
+                <Screen {...props}/>
+            </GestureHandlerRootView>
+        );
     };
 };
 
diff --git a/app/screens/join_team/join_team.tsx b/app/screens/join_team/join_team.tsx
index b2752b35d..deb4b92af 100644
--- a/app/screens/join_team/join_team.tsx
+++ b/app/screens/join_team/join_team.tsx
@@ -79,7 +79,8 @@ export default function JoinTeam({
         page.current = resp.page;
         hasMore.current = resp.hasMore;
         if (resp.teams.length && mounted.current) {
-            setOtherTeams((cur) => [...cur, ...resp.teams]);
+            const teams = resp.teams.filter((t) => t.delete_at === 0);
+            setOtherTeams((cur) => [...cur, ...teams]);
         }
         setLoading(false);
     }, [joinedIds, serverUrl]);
diff --git a/app/screens/select_team/select_team.tsx b/app/screens/select_team/select_team.tsx
index 0ba14383b..2031bebf0 100644
--- a/app/screens/select_team/select_team.tsx
+++ b/app/screens/select_team/select_team.tsx
@@ -70,7 +70,8 @@ const SelectTeam = ({
         page.current = resp.page;
         hasMore.current = resp.hasMore;
         if (resp.teams.length && mounted.current) {
-            setOtherTeams((cur) => [...cur, ...resp.teams]);
+            const teams = resp.teams.filter((t) => t.delete_at === 0);
+            setOtherTeams((cur) => [...cur, ...teams]);
         }
         setLoading(false);
     }, [serverUrl]);