team chat split part 1

shared/chat/audio/audio-recorder.native.tsx

@@ -1,4 +1,4 @@
-import * as Chat from '@/stores/chat'
+import * as ConvoState from '@/stores/convostate'
 import * as T from '@/constants/types'
 import * as Kb from '@/common-adapters'
 import {Portal} from '@/common-adapters/portal.native'
@@ -364,7 +364,7 @@ const useRecorder = (p: {ampSV: SVN; setShowAudioSend: (s: boolean) => void; sho
     setStaged(false)
     setShowAudioSend(false)
   }
-  const setCommandStatusInfo = Chat.useChatUIContext(s => s.dispatch.setCommandStatusInfo)
+  const setCommandStatusInfo = ConvoState.useChatUIContext(s => s.dispatch.setCommandStatusInfo)
 
   const startRecording = () => {
     const checkPerms = async () => {
@@ -420,7 +420,7 @@ const useRecorder = (p: {ampSV: SVN; setShowAudioSend: (s: boolean) => void; sho
     return
   }
 
-  const sendAudioRecording = Chat.useChatContext(s => s.dispatch.sendAudioRecording)
+  const sendAudioRecording = ConvoState.useChatContext(s => s.dispatch.sendAudioRecording)
 
   const sendRecording = () => {
     const impl = async () => {
@@ -702,10 +702,16 @@ const CancelHint = (props: {fadeSV: SVN; dragXSV: SVN; lockedSV: SVN; onCancel:
 
   return (
     <>
-      <Kb.Box2Animated direction="vertical" style={[styles.cancelHintStyle, arrowStyle as Kb.Styles._StylesCrossPlatform]}>
+      <Kb.Box2Animated
+        direction="vertical"
+        style={[styles.cancelHintStyle, arrowStyle as Kb.Styles._StylesCrossPlatform]}
+      >
         <Kb.Icon sizeType="Tiny" type={'iconfont-arrow-left'} />
       </Kb.Box2Animated>
-      <Kb.Box2Animated direction="vertical" style={[styles.cancelHintStyle, closeStyle as Kb.Styles._StylesCrossPlatform]}>
+      <Kb.Box2Animated
+        direction="vertical"
+        style={[styles.cancelHintStyle, closeStyle as Kb.Styles._StylesCrossPlatform]}
+      >
         <Kb.Icon sizeType="Tiny" type={'iconfont-close'} color={Kb.Styles.globalColors.black_20} />
       </Kb.Box2Animated>
       <AnimatedText

shared/chat/blocking/block-modal.tsx

@@ -3,7 +3,7 @@ import * as React from 'react'
 import * as Kb from '@/common-adapters'
 import * as T from '@/constants/types'
 import * as S from '@/constants/strings'
-import * as Chat from '@/stores/chat'
+import * as ConvoState from '@/stores/convostate'
 import {useTeamsState} from '@/stores/teams'
 import {useUsersState} from '@/stores/users'
 
@@ -165,7 +165,7 @@ const Container = function BlockModal(ownProps: OwnProps) {
       () => {}
     )
   }
-  const setConversationStatus = Chat.useChatContext(s => s.dispatch.blockConversation)
+  const setConversationStatus = ConvoState.useChatContext(s => s.dispatch.blockConversation)
   const setUserBlocks = (newBlocks: NewBlocksMap) => {
     // Convert our state block array to action payload.
     const blocks = [...newBlocks.entries()]

shared/chat/blocking/invitation-to-block.tsx

@@ -1,28 +1,30 @@
 import * as C from '@/constants'
+import {isAssertion} from '@/constants/chat/helpers'
 import * as Chat from '@/stores/chat'
+import * as ConvoState from '@/stores/convostate'
 import * as Kb from '@/common-adapters'
 import {useCurrentUserState} from '@/stores/current-user'
 import {navToProfile} from '@/constants/router'
 
 const BlockButtons = () => {
   const navigateAppend = C.Router2.navigateAppend
-  const conversationIDKey = Chat.useChatContext(s => s.id)
+  const conversationIDKey = ConvoState.useChatContext(s => s.id)
 
-  const team = Chat.useChatContext(s => s.meta.teamname)
-  const teamID = Chat.useChatContext(s => s.meta.teamID)
+  const team = ConvoState.useChatContext(s => s.meta.teamname)
+  const teamID = ConvoState.useChatContext(s => s.meta.teamID)
   const blockButtonInfo = Chat.useChatState(s => {
     const blockButtonsMap = s.blockButtonsMap
     return teamID ? blockButtonsMap.get(teamID) : undefined
   })
-  const participantInfo = Chat.useChatContext(s => s.participants)
+  const participantInfo = ConvoState.useChatContext(s => s.participants)
   const currentUser = useCurrentUserState(s => s.username)
-  const dismissBlockButtons = Chat.useChatContext(s => s.dispatch.dismissBlockButtons)
+  const dismissBlockButtons = Chat.useChatState(s => s.dispatch.dismissBlockButtons)
   if (!blockButtonInfo) {
     return null
   }
   const adder = blockButtonInfo.adder
   const others = (team ? participantInfo.all : participantInfo.name).filter(
-    person => person !== currentUser && person !== adder && !Chat.isAssertion(person)
+    person => person !== currentUser && person !== adder && !isAssertion(person)
   )
 
   const onViewProfile = () => navToProfile(adder)

shared/chat/conversation/attachment-fullscreen/hooks.tsx

@@ -1,21 +1,23 @@
 import * as React from 'react'
 import * as C from '@/constants'
+import {clampImageSize} from '@/constants/chat/helpers'
 import * as Chat from '@/stores/chat'
+import * as ConvoState from '@/stores/convostate'
 import type * as T from '@/constants/types'
 import {maxWidth, maxHeight} from '../messages/attachment/shared'
 import {useFSState} from '@/stores/fs'
 
 const blankMessage = Chat.makeMessageAttachment({})
 export const useData = (initialOrdinal: T.Chat.Ordinal) => {
-  const conversationIDKey = Chat.useChatContext(s => s.id)
+  const conversationIDKey = ConvoState.useChatContext(s => s.id)
   const [ordinal, setOrdinal] = React.useState(initialOrdinal)
 
-  const message: T.Chat.MessageAttachment = Chat.useChatContext(s => {
+  const message: T.Chat.MessageAttachment = ConvoState.useChatContext(s => {
     const m = s.messageMap.get(ordinal)
     return m?.type === 'attachment' ? m : blankMessage
   })
 
-  const loadNextAttachment = Chat.useChatContext(s => s.dispatch.loadNextAttachment)
+  const loadNextAttachment = ConvoState.useChatContext(s => s.dispatch.loadNextAttachment)
   const onSwitchAttachment = (backInTime: boolean) => {
     const f = async () => {
       if (conversationIDKey !== blankMessage.conversationIDKey) {
@@ -37,11 +39,11 @@ export const useData = (initialOrdinal: T.Chat.Ordinal) => {
     s => s.dispatch.defer.openLocalPathInSystemFileManagerDesktop
   )
   const navigateUp = C.Router2.navigateUp
-  const showInfoPanel = Chat.useChatContext(s => s.dispatch.showInfoPanel)
-  const attachmentDownload = Chat.useChatContext(s => s.dispatch.attachmentDownload)
+  const showInfoPanel = ConvoState.useChatContext(s => s.dispatch.showInfoPanel)
+  const attachmentDownload = ConvoState.useChatContext(s => s.dispatch.attachmentDownload)
   const {downloadPath, fileURL: path, fullHeight, fullWidth, fileType} = message
   const {previewHeight, previewURL: previewPath, previewWidth, title, transferProgress} = message
-  const {height: clampedHeight, width: clampedWidth} = Chat.clampImageSize(
+  const {height: clampedHeight, width: clampedWidth} = clampImageSize(
     previewWidth,
     previewHeight,
     maxWidth,

shared/chat/conversation/attachment-get-titles.tsx

@@ -1,5 +1,6 @@
 import * as C from '@/constants'
 import * as Chat from '@/stores/chat'
+import * as ConvoState from '@/stores/convostate'
 import * as T from '@/constants/types'
 import * as React from 'react'
 import * as Kb from '@/common-adapters'
@@ -40,8 +41,8 @@ const Container = (ownProps: OwnProps) => {
   const noDragDrop = ownProps.noDragDrop ?? false
   const selectConversationWithReason = ownProps.selectConversationWithReason
   const navigateUp = C.Router2.navigateUp
-  const navigateToThread = Chat.useChatContext(s => s.dispatch.navigateToThread)
-  const attachmentUploadCanceled = Chat.useChatContext(s => s.dispatch.attachmentUploadCanceled)
+  const navigateToThread = ConvoState.useChatContext(s => s.dispatch.navigateToThread)
+  const attachmentUploadCanceled = ConvoState.useChatContext(s => s.dispatch.attachmentUploadCanceled)
   const onCancel = () => {
     attachmentUploadCanceled(
       pathAndOutboxIDs.reduce((l: Array<T.RPCChat.OutboxID>, {outboxID}) => {
@@ -54,8 +55,8 @@ const Container = (ownProps: OwnProps) => {
     navigateUp()
   }
   const clearModals = C.Router2.clearModals
-  const attachmentsUpload = Chat.useChatContext(s => s.dispatch.attachmentsUpload)
-  const attachFromDragAndDrop = Chat.useChatContext(s => s.dispatch.attachFromDragAndDrop)
+  const attachmentsUpload = ConvoState.useChatContext(s => s.dispatch.attachmentsUpload)
+  const attachFromDragAndDrop = ConvoState.useChatContext(s => s.dispatch.attachFromDragAndDrop)
 
   const _onSubmit = (titles: Array<string>, spoiler: boolean) => {
     tlfName || noDragDrop

shared/chat/conversation/bot/confirm.tsx

@@ -1,25 +1,36 @@
 import * as Kb from '@/common-adapters'
 import * as C from '@/constants'
-import * as Chat from '@/stores/chat'
+import * as ConvoState from '@/stores/convostate'
 import type * as T from '@/constants/types'
-import {useBotConversationIDKey} from './install'
+import {useBotConversationIDKey, useRefreshBotMembershipOnSuccess} from './install'
 
 type Props = {
   botUsername: string
   teamID?: T.Teams.TeamID
   conversationIDKey?: T.Chat.ConversationIDKey
 }
 
-const ConfirmBotRemoveImpl = (props: {botUsername: string}) => {
-  const {botUsername} = props
+const ConfirmBotRemoveImpl = (props: {botUsername: string; teamID?: T.Teams.TeamID}) => {
+  const {botUsername, teamID} = props
   const clearModals = C.Router2.clearModals
-  const removeBotMember = Chat.useChatContext(s => s.dispatch.removeBotMember)
+  const error = C.Waiting.useAnyErrors(C.waitingKeyChatBotRemove)
+  const removeBotMember = ConvoState.useChatContext(s => s.dispatch.removeBotMember)
+  const conversationIDKey = ConvoState.useChatContext(s => s.id)
   const onClose = () => {
     clearModals()
   }
   const onRemove = () => {
     removeBotMember(botUsername)
   }
+  useRefreshBotMembershipOnSuccess(
+    conversationIDKey,
+    teamID,
+    C.waitingKeyChatBotRemove,
+    error,
+    true,
+    {username: botUsername},
+    clearModals
+  )
   return (
     <Kb.ConfirmModal
       prompt={`Are you sure you want to uninstall ${botUsername}?`}
@@ -36,9 +47,9 @@ const ConfirmBotRemove = (props: Props) => {
   const {teamID, botUsername} = props
   const conversationIDKey = useBotConversationIDKey(props.conversationIDKey, teamID)
   return conversationIDKey ? (
-    <Chat.ChatProvider id={conversationIDKey}>
-      <ConfirmBotRemoveImpl botUsername={botUsername} />
-    </Chat.ChatProvider>
+    <ConvoState.ChatProvider id={conversationIDKey}>
+      <ConfirmBotRemoveImpl botUsername={botUsername} teamID={teamID} />
+    </ConvoState.ChatProvider>
   ) : null
 }