WIP

Author: chrisnojima-zoom

shared/profile/add-to-team.tsx

@@ -184,7 +184,7 @@ const Container = (ownProps: OwnProps) => {
     setSendNotification(true)
     setTeamProfileAddList([])
     loadTeamList()
-  }, [loadTeamList, them])
+  }, [them])
 
   const onBack = () => {
     navigateUp()

shared/teams/container.tsx

@@ -2,6 +2,7 @@ import * as C from '@/constants'
 import * as Teams from '@/stores/teams'
 import * as Kb from '@/common-adapters'
 import type * as T from '@/constants/types'
+import type {RouteProps2} from '@/router-v2/route-params'
 import Main from './main'
 import {useTeamsSubscribe} from './subscriber'
 import {useActivityLevels} from './common'
@@ -42,12 +43,11 @@ const orderTeams = (
   })
 }
 
-type Props = {
-  filter?: string
-  sort?: T.Teams.TeamListSort
-}
+type Props = RouteProps2<'teamsRoot'>
 
-const Connected = ({filter = '', sort = 'role'}: Props) => {
+const Connected = ({navigation, route}: Props) => {
+  const filter = route.params?.filter ?? ''
+  const sort = route.params?.sort ?? 'role'
   const data = Teams.useTeamsState(
     C.useShallow(s => {
       const {deletedTeams, activityLevels, teamMeta, dispatch} = s
@@ -86,7 +86,7 @@ const Connected = ({filter = '', sort = 'role'}: Props) => {
         onCreateTeam={onCreateTeam}
         onJoinTeam={onJoinTeam}
         deletedTeams={deletedTeams}
-        onChangeSort={sortOrder => C.Router2.navigateAppend({name: 'teamsRoot', params: {filter, sort: sortOrder}}, true)}
+        onChangeSort={sortOrder => navigation.setParams({...(route.params ?? {}), filter, sort: sortOrder})}
         sortOrder={sort}
         teams={teams}
       />

shared/teams/get-options.tsx

@@ -16,9 +16,9 @@ const useHeaderActions = () => {
 }
 
 const TeamsFilter = () => {
-  const {params} = useRoute<RootRouteProps<'teamsRoot'>>()
+  const params = useRoute<RootRouteProps<'teamsRoot'>>().params ?? {}
   const navigation = useNavigation<NativeStackNavigationProp<RootParamList, 'teamsRoot'>>()
-  const filterValue = params?.filter ?? ''
+  const filterValue = params.filter ?? ''
   const numTeams = useTeamsState(s => s.teamMeta.size)
   const setFilter = (filter: string) => navigation.setParams({...params, filter})
   return numTeams >= 20 ? (

shared/teams/routes.tsx

@@ -293,8 +293,8 @@ export const newModalRoutes = {
   teamInviteLinkJoin: C.makeScreen(React.lazy(async () => import('./join-team/join-from-invite'))),
   teamJoinTeamDialog: C.makeScreen(React.lazy(async () => import('./join-team/container')), {
     getOptions: ({route}) => ({
-      headerLeft: () => <JoinTeamHeaderLeft success={route.params?.success} />,
-      headerTitle: () => <JoinTeamHeaderTitle success={route.params?.success} />,
+      headerLeft: () => <JoinTeamHeaderLeft success={route.params.success} />,
+      headerTitle: () => <JoinTeamHeaderTitle success={route.params.success} />,
     }),
   }),
   teamNewTeamDialog: C.makeScreen(React.lazy(async () => import('./new-team')), {

shared/teams/team/settings-tab/index.tsx

@@ -13,6 +13,7 @@ import isEqual from 'lodash/isEqual'
 type Props = {
   allowOpenTrigger: number
   canShowcase: boolean
+  error?: string
   isBigTeam: boolean
   ignoreAccessRequests: boolean
   publicityAnyMember: boolean
@@ -185,7 +186,7 @@ const IgnoreAccessRequests = (props: {
 }
 
 export const Settings = (p: Props) => {
-  const {savePublicity, isBigTeam, teamID, yourOperations, teamname, showOpenTeamWarning} = p
+  const {error, savePublicity, isBigTeam, teamID, yourOperations, teamname, showOpenTeamWarning} = p
   const {canShowcase, allowOpenTrigger} = p
 
   const [newPublicityAnyMember, setNewPublicityAnyMember] = React.useState(p.publicityAnyMember)

shared/teams/team/team-info.tsx

@@ -2,7 +2,7 @@ import * as C from '@/constants'
 import * as React from 'react'
 import * as Teams from '@/stores/teams'
 import * as Kb from '@/common-adapters'
-import type * as T from '@/constants/types'
+import * as T from '@/constants/types'
 
 type Props = {teamID: T.Teams.TeamID}