WIP

Author: chrisnojima-zoom

shared/chat/inbox-search/index.tsx

@@ -381,14 +381,14 @@ const OpenTeamRow = (p: OpenTeamProps) => {
   const [hovering, setHovering] = React.useState(false)
   const {name, description, memberCount, publicAdmins, inTeam, isSelected} = p
   const showingDueToSelect = React.useRef(false)
-  const {joinTeam, showTeamByName} = useTeamsState(
+  const {showTeamByName} = useTeamsState(
     C.useShallow(s => ({
-      joinTeam: s.dispatch.joinTeam,
       showTeamByName: s.dispatch.showTeamByName,
     }))
   )
 
   const clearModals = C.Router2.clearModals
+  const navigateAppend = C.Router2.navigateAppend
   const makePopup = (p: Kb.Popup2Parms) => {
     const {attachTo, hidePopup} = p
     return (
@@ -402,7 +402,7 @@ const OpenTeamRow = (p: OpenTeamProps) => {
         position="right center"
         onChat={undefined}
         onHidden={hidePopup}
-        onJoinTeam={() => joinTeam(name)}
+        onJoinTeam={() => navigateAppend({name: 'teamJoinTeamDialog', params: {initialTeamname: name}})}
         onViewTeam={() => {
           clearModals()
           showTeamByName(name)

shared/common-adapters/markdown/maybe-mention/team.tsx

@@ -39,12 +39,13 @@ const TeamMention = (ownProps: OwnProps) => {
   const previewConversation = Chat.useChatState(s => s.dispatch.previewConversation)
   const showTeamByName = useTeamsState(s => s.dispatch.showTeamByName)
   const clearModals = C.Router2.clearModals
+  const navigateAppend = C.Router2.navigateAppend
   const _onViewTeam = (teamname: string) => {
     clearModals()
     showTeamByName(teamname)
   }
-  const joinTeam = useTeamsState(s => s.dispatch.joinTeam)
-  const onJoinTeam = joinTeam
+  const onJoinTeam = (teamname: string) =>
+    navigateAppend({name: 'teamJoinTeamDialog', params: {initialTeamname: teamname}})
 
   const convID = _convID ? T.Chat.stringToConversationIDKey(_convID) : undefined
   const onChat = convID

shared/common-adapters/team-with-popup.tsx

@@ -114,8 +114,6 @@ const ConnectedTeamWithPopup = (ownProps: OwnProps) => {
     memberCount: meta.memberCount,
     teamID,
   }
-  const joinTeam = Teams.useTeamsState(s => s.dispatch.joinTeam)
-  const _onJoinTeam = joinTeam
   const clearModals = C.Router2.clearModals
   const navigateAppend = C.Router2.navigateAppend
   const _onViewTeam = (teamID: T.Teams.TeamID) => {
@@ -129,7 +127,7 @@ const ConnectedTeamWithPopup = (ownProps: OwnProps) => {
     isMember: stateProps.isMember,
     isOpen: stateProps.isOpen,
     memberCount: stateProps.memberCount,
-    onJoinTeam: () => _onJoinTeam(ownProps.teamName),
+    onJoinTeam: () => navigateAppend({name: 'teamJoinTeamDialog', params: {initialTeamname: ownProps.teamName}}),
     onViewTeam: () => _onViewTeam(stateProps.teamID),
     prefix: ownProps.prefix,
     shouldLoadTeam: ownProps.shouldLoadTeam,

shared/profile/user/teams/index.tsx

@@ -19,18 +19,17 @@ const Container = (ownProps: OwnProps) => {
       _roles: s.teamRoleMap.roles,
       _teamNameToID: s.teamNameToID,
       _youAreInTeams: s.teamnames.size > 0,
-      joinTeam: s.dispatch.joinTeam,
       showTeamByName: s.dispatch.showTeamByName,
     }))
   )
-  const {joinTeam, showTeamByName, _roles} = teamsState
+  const {showTeamByName, _roles} = teamsState
   const {_teamNameToID, _youAreInTeams} = teamsState
   const teamShowcase = d.teamShowcase || noTeams
   const {clearModals, navigateAppend} = C.Router2
   const _onEdit = () => {
     navigateAppend('profileShowcaseTeamOffer')
   }
-  const onJoinTeam = joinTeam
+  const onJoinTeam = (teamname: string) => navigateAppend({name: 'teamJoinTeamDialog', params: {initialTeamname: teamname}})
   const onViewTeam = (teamname: string) => {
     clearModals()
     showTeamByName(teamname)

shared/stores/teams.tsx

@@ -896,7 +896,6 @@ export type State = Store & {
       fullName: string,
       loadingKey?: string
     ) => void
-    joinTeam: (teamname: string) => void
     launchNewTeamWizardOrModal: (subteamOf?: T.Teams.TeamID) => void
     leaveTeam: (teamname: string, permanent: boolean, context: 'teams' | 'chat') => void
     loadTeam: (teamID: T.Teams.TeamID, _subscribe?: boolean) => void
@@ -1692,42 +1691,6 @@ export const useTeamsState = Z.createZustand<State>('teams', (set, get) => {
       }
       ignorePromise(f())
     },
-    joinTeam: teamname => {
-      const f = async () => {
-        let handedOffToInvite = false
-        try {
-          await T.RPCGen.teamsTeamAcceptInviteOrRequestAccessRpcListener({
-            customResponseIncomingCallMap: {
-              'keybase.1.teamsUi.confirmInviteLinkAccept': (params, response) => {
-                handedOffToInvite = true
-                navigateAppend(
-                  {
-                    name: 'teamInviteLinkJoin',
-                    params: {
-                      inviteDetails: params.details,
-                      inviteKey: teamname,
-                    },
-                  },
-                  true
-                )
-                response.result(false)
-              },
-            },
-            incomingCallMap: {},
-            params: {tokenOrName: teamname},
-            waitingKey: S.waitingKeyTeamsJoinTeam,
-          })
-        } catch (error) {
-          if (handedOffToInvite) {
-            return
-          }
-          if (error instanceof RPCError) {
-            logger.info(error.message)
-          }
-        }
-      }
-      ignorePromise(f())
-    },
     launchNewTeamWizardOrModal: subteamOf => {
       set(s => {
         s.newTeamWizard = T.castDraft({