more chat cleanup 1

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

@@ -3,6 +3,7 @@ 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 * as React from 'react'
 import {useCurrentUserState} from '@/stores/current-user'
 import {navToProfile} from '@/constants/router'
 
@@ -18,7 +19,17 @@ const BlockButtons = () => {
   })
   const participantInfo = ConvoState.useChatContext(s => s.participants)
   const currentUser = useCurrentUserState(s => s.username)
+  const hasOwnMessage = ConvoState.useChatContext(s =>
+    !!currentUser && [...(s.messageOrdinals ?? [])].some(ordinal => s.messageMap.get(ordinal)?.author === currentUser)
+  )
   const dismissBlockButtons = Chat.useChatState(s => s.dispatch.dismissBlockButtons)
+
+  React.useEffect(() => {
+    if (hasOwnMessage && blockButtonInfo && teamID) {
+      dismissBlockButtons(teamID)
+    }
+  }, [blockButtonInfo, dismissBlockButtons, hasOwnMessage, teamID])
+
   if (!blockButtonInfo) {
     return null
   }

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

@@ -41,7 +41,7 @@ const Container = (ownProps: OwnProps) => {
   const noDragDrop = ownProps.noDragDrop ?? false
   const selectConversationWithReason = ownProps.selectConversationWithReason
   const navigateUp = C.Router2.navigateUp
-  const navigateToThread = ConvoState.useChatContext(s => s.dispatch.navigateToThread)
+  const conversationIDKey = ConvoState.useChatContext(s => s.id)
   const attachmentUploadCanceled = ConvoState.useChatContext(s => s.dispatch.attachmentUploadCanceled)
   const onCancel = () => {
     attachmentUploadCanceled(
@@ -65,7 +65,7 @@ const Container = (ownProps: OwnProps) => {
     clearModals()
 
     if (selectConversationWithReason) {
-      navigateToThread(selectConversationWithReason)
+      C.Router2.navigateToThread(conversationIDKey, selectConversationWithReason)
     }
   }
   const pathAndInfos = pathAndOutboxIDs.map(({path, outboxID, url}) => {

shared/chat/conversation/bot/install.tsx

@@ -255,7 +255,7 @@ const InstallBotPopup = (props: Props) => {
   const dispatchClearWaiting = C.Waiting.useDispatchClearWaiting()
   const loadBotPublicCommands = C.useRPC(T.RPCChat.localListPublicBotCommandsLocalRpcPromise)
   const botPublicCommandsRequestIDRef = React.useRef(0)
-  const clearedWaitingForBotRef = React.useRef<string>()
+  const clearedWaitingForBotRef = React.useRef<string | undefined>(undefined)
   React.useEffect(() => {
     setBotPublicCommands(undefined)
   }, [botUsername])

shared/chat/conversation/info-panel/menu.tsx

@@ -118,7 +118,8 @@ const InfoPanelMenuConnector = function InfoPanelMenuConnector(p: OwnProps) {
   }
 
   const onJoinChannel = ConvoState.useChatContext(s => s.dispatch.joinConversation)
-  const onLeaveChannel = ConvoState.useChatContext(s => s.dispatch.leaveConversation)
+  const conversationIDKey = ConvoState.useChatContext(s => s.id)
+  const onLeaveChannel = () => C.Router2.leaveConversation(conversationIDKey)
   const onLeaveTeam = () => teamID && chatNavigateAppend(() => ({name: 'teamReallyLeaveTeam', params: {teamID}}))
   const onManageChannels = () => {
     manageChatChannels(teamID)
@@ -210,7 +211,6 @@ const InfoPanelMenuConnector = function InfoPanelMenuConnector(p: OwnProps) {
     ),
   } as const
 
-  const conversationIDKey = ConvoState.useChatContext(s => s.id)
   const hideItem = (() => {
     if (!conversationIDKey) {
       return null

shared/chat/conversation/info-panel/settings/index.tsx

@@ -64,9 +64,9 @@ const SettingsPanel = (props: SettingsPanelProps) => {
     }
   }
 
-  const leaveConversation = ConvoState.useChatContext(s => s.dispatch.leaveConversation)
+  const conversationIDKey = ConvoState.useChatContext(s => s.id)
   const onLeaveConversation = () => {
-    leaveConversation()
+    C.Router2.leaveConversation(conversationIDKey)
   }
 
   const onArchive = () => {
@@ -77,7 +77,6 @@ const SettingsPanel = (props: SettingsPanelProps) => {
   }
 
   const showDangerZone = canDeleteHistory || entityType === 'adhoc' || entityType !== 'channel'
-  const conversationIDKey = ConvoState.useChatContext(s => s.id)
   return (
     <Kb.ScrollView>
       <Kb.Box2

shared/chat/conversation/input-area/preview.tsx

@@ -1,11 +1,12 @@
+import * as C from '@/constants'
 import * as ConvoState from '@/stores/convostate'
 import * as React from 'react'
 import * as Kb from '@/common-adapters'
 
 const Preview = () => {
+  const conversationIDKey = ConvoState.useChatContext(s => s.id)
   const meta = ConvoState.useChatContext(s => s.meta)
   const onJoinChannel = ConvoState.useChatContext(s => s.dispatch.joinConversation)
-  const onLeaveChannel = ConvoState.useChatContext(s => s.dispatch.leaveConversation)
   const {channelname} = meta
   const [clicked, setClicked] = React.useState<undefined | 'join' | 'leave'>(undefined)
 
@@ -14,7 +15,7 @@ const Preview = () => {
     if (join) {
       onJoinChannel()
     } else {
-      onLeaveChannel()
+      C.Router2.leaveConversation(conversationIDKey)
     }
   }
 

shared/chat/conversation/messages/special-top-message.tsx

@@ -18,7 +18,7 @@ const ErrorMessage = () => {
   const createConversationError = useChatThreadRouteParams()?.createConversationError
 
   const _onCreateWithoutThem = (allowedUsers: ReadonlyArray<string>) => {
-    ConvoState.createConversation(allowedUsers)
+    C.Router2.createConversation(allowedUsers)
   }
 
   const navigateToInbox = C.Router2.navigateToInbox

shared/chat/conversation/messages/system-old-profile-reset-notice/container.tsx

@@ -1,6 +1,6 @@
 import * as ConvoState from '@/stores/convostate'
 import type * as T from '@/constants/types'
-import {previewConversation} from '@/constants/router'
+import {navigateToThread, previewConversation} from '@/constants/router'
 import {Text} from '@/common-adapters'
 import UserNotice from '../user-notice'
 
@@ -11,7 +11,7 @@ const SystemOldProfileResetNotice = () => {
   const nextConversationIDKey = meta.supersededBy
   const username = meta.wasFinalizedBy || ''
   const onOpenConversation = (conversationIDKey: T.Chat.ConversationIDKey) => {
-    ConvoState.getConvoState(conversationIDKey).dispatch.navigateToThread('jumpFromReset')
+    navigateToThread(conversationIDKey, 'jumpFromReset')
   }
   const startConversation = (participants: ReadonlyArray<string>) => {
     previewConversation({participants, reason: 'fromAReset'})

shared/chat/conversation/messages/system-profile-reset-notice.tsx

@@ -1,4 +1,5 @@
 import * as ConvoState from '@/stores/convostate'
+import * as C from '@/constants'
 import type * as T from '@/constants/types'
 import * as Kb from '@/common-adapters'
 import UserNotice from './user-notice'
@@ -8,7 +9,7 @@ const SystemProfileResetNotice = () => {
   const prevConversationIDKey = meta.supersedes
   const username = meta.wasFinalizedBy || ''
   const _onOpenOlderConversation = (conversationIDKey: T.Chat.ConversationIDKey) => {
-    ConvoState.getConvoState(conversationIDKey).dispatch.navigateToThread('jumpToReset')
+    C.Router2.navigateToThread(conversationIDKey, 'jumpToReset')
   }
   const onOpenOlderConversation = () => {
     prevConversationIDKey && _onOpenOlderConversation(prevConversationIDKey)

shared/chat/inbox-and-conversation-shared.tsx

@@ -12,6 +12,7 @@ import type {ThreadSearchRouteProps} from './conversation/thread-search-route'
 export type InboxAndConversationProps = ThreadSearchRouteProps & {
   conversationIDKey?: T.Chat.ConversationIDKey
   infoPanel?: {tab?: Panel}
+  refreshInbox?: T.Chat.ChatRootInboxRefresh
 }
 
 export type ChatRootRouteParams = InboxAndConversationProps
@@ -24,24 +25,30 @@ export function InboxAndConversationShell(props: Props) {
   const conversationIDKey = props.conversationIDKey ?? Chat.noConversationIDKey
   const infoPanel = props.infoPanel
   const validConvoID = conversationIDKey && conversationIDKey !== Chat.noConversationIDKey
-  const seenValidCIDRef = React.useRef(validConvoID ? conversationIDKey : '')
+  const lastValidCIDRef = React.useRef(validConvoID ? conversationIDKey : '')
+  const lastAutoSelectedCIDRef = React.useRef('')
   const selectNextConvo = Chat.useChatState(s => {
-    if (seenValidCIDRef.current) {
+    if (validConvoID) {
       return null
     }
     const first = s.inboxLayout?.smallTeams?.[0]
-    return first?.convID
+    return first?.convID === lastValidCIDRef.current ? null : first?.convID
   })
 
   React.useEffect(() => {
-    if (selectNextConvo && seenValidCIDRef.current !== selectNextConvo) {
-      seenValidCIDRef.current = selectNextConvo
+    if (validConvoID) {
+      lastValidCIDRef.current = conversationIDKey
+      lastAutoSelectedCIDRef.current = ''
+      return
+    }
+    if (selectNextConvo && lastAutoSelectedCIDRef.current !== selectNextConvo) {
+      lastAutoSelectedCIDRef.current = selectNextConvo
       // need to defer , not sure why, shouldn't be
       setTimeout(() => {
-        ConvoState.getConvoState(selectNextConvo).dispatch.navigateToThread('findNewestConversationFromLayout')
+        C.Router2.navigateToThread(selectNextConvo, 'findNewestConversationFromLayout')
       }, 100)
     }
-  }, [selectNextConvo])
+  }, [conversationIDKey, selectNextConvo, validConvoID])
 
   return (
     <ConvoState.ChatProvider id={conversationIDKey} canBeNull={true}>

shared/chat/inbox-and-conversation.desktop.tsx

@@ -10,7 +10,7 @@ export default function InboxAndConversationDesktop(props: InboxAndConversationP
   const headerPortal = useInboxHeaderPortal(search)
   const leftPane = (
     <Kb.Box2 direction="vertical" fullHeight={true} style={styles.inboxPane}>
-      <Inbox conversationIDKey={props.conversationIDKey} search={search} />
+      <Inbox conversationIDKey={props.conversationIDKey} refreshInbox={props.refreshInbox} search={search} />
     </Kb.Box2>
   )
 

shared/chat/inbox-and-conversation.native.tsx

@@ -12,7 +12,9 @@ export default function InboxAndConversationNative(props: InboxAndConversationPr
       {headerPortal}
       <InboxAndConversationShell
         {...props}
-        leftPane={<Inbox conversationIDKey={props.conversationIDKey} search={search} />}
+        leftPane={
+          <Inbox conversationIDKey={props.conversationIDKey} refreshInbox={props.refreshInbox} search={search} />
+        }
       />
     </>
   )

shared/chat/inbox/index.d.ts

@@ -1,9 +1,10 @@
 import type * as React from 'react'
-import type {ConversationIDKey} from '@/constants/types/chat'
+import type {ChatRootInboxRefresh, ConversationIDKey} from '@/constants/types/chat'
 import type {InboxSearchController} from './use-inbox-search'
 
 type Props = {
   conversationIDKey?: ConversationIDKey
+  refreshInbox?: ChatRootInboxRefresh
   search?: InboxSearchController
 }
 

shared/chat/inbox/index.desktop.tsx

@@ -200,22 +200,27 @@ const DragLine = (p: {
 
 type InboxProps = {
   conversationIDKey?: T.Chat.ConversationIDKey
+  refreshInbox?: T.Chat.ChatRootInboxRefresh
   search?: InboxSearchController
 }
 
 type ControlledInboxProps = {
   conversationIDKey?: T.Chat.ConversationIDKey
+  refreshInbox?: T.Chat.ChatRootInboxRefresh
   search: InboxSearchController
 }
 
-function InboxWithSearch(props: {conversationIDKey?: T.Chat.ConversationIDKey}) {
+function InboxWithSearch(props: {
+  conversationIDKey?: T.Chat.ConversationIDKey
+  refreshInbox?: T.Chat.ChatRootInboxRefresh
+}) {
   const search = useInboxSearch()
-  return <InboxBody conversationIDKey={props.conversationIDKey} search={search} />
+  return <InboxBody conversationIDKey={props.conversationIDKey} refreshInbox={props.refreshInbox} search={search} />
 }
 
 function InboxBody(props: ControlledInboxProps) {
-  const {conversationIDKey, search} = props
-  const inbox = useInboxState(conversationIDKey, search.isSearching)
+  const {conversationIDKey, refreshInbox, search} = props
+  const inbox = useInboxState(conversationIDKey, search.isSearching, refreshInbox)
   const {smallTeamsExpanded, rows, unreadIndices, unreadTotal, inboxNumSmallRows} = inbox
   const {toggleSmallTeamsExpanded, selectedConversationIDKey, onUntrustedInboxVisible} = inbox
   const {setInboxNumSmallRows, allowShowFloatingButton} = inbox
@@ -338,9 +343,9 @@ function InboxBody(props: ControlledInboxProps) {
 
 function Inbox(props: InboxProps) {
   return props.search ? (
-    <InboxBody conversationIDKey={props.conversationIDKey} search={props.search} />
+    <InboxBody conversationIDKey={props.conversationIDKey} refreshInbox={props.refreshInbox} search={props.search} />
   ) : (
-    <InboxWithSearch conversationIDKey={props.conversationIDKey} />
+    <InboxWithSearch conversationIDKey={props.conversationIDKey} refreshInbox={props.refreshInbox} />
   )
 }
 

shared/chat/inbox/index.native.tsx

@@ -53,22 +53,27 @@ const NoChats = (props: {onNewChat: () => void}) => (
 
 type InboxProps = {
   conversationIDKey?: T.Chat.ConversationIDKey
+  refreshInbox?: T.Chat.ChatRootInboxRefresh
   search?: InboxSearchController
 }
 
 type ControlledInboxProps = {
   conversationIDKey?: T.Chat.ConversationIDKey
+  refreshInbox?: T.Chat.ChatRootInboxRefresh
   search: InboxSearchController
 }
 
-function InboxWithSearch(props: {conversationIDKey?: T.Chat.ConversationIDKey}) {
+function InboxWithSearch(props: {
+  conversationIDKey?: T.Chat.ConversationIDKey
+  refreshInbox?: T.Chat.ChatRootInboxRefresh
+}) {
   const search = useInboxSearch()
-  return <InboxBody conversationIDKey={props.conversationIDKey} search={search} />
+  return <InboxBody conversationIDKey={props.conversationIDKey} refreshInbox={props.refreshInbox} search={search} />
 }
 
 function InboxBody(p: ControlledInboxProps) {
   const {search} = p
-  const inbox = useInboxState(p.conversationIDKey, search.isSearching)
+  const inbox = useInboxState(p.conversationIDKey, search.isSearching, p.refreshInbox)
   const {onUntrustedInboxVisible, toggleSmallTeamsExpanded, selectedConversationIDKey} = inbox
   const {unreadIndices, unreadTotal, rows, smallTeamsExpanded, isSearching, allowShowFloatingButton} = inbox
   const {neverLoaded, onNewChat, inboxNumSmallRows, setInboxNumSmallRows} = inbox
@@ -200,9 +205,9 @@ function InboxBody(p: ControlledInboxProps) {
 
 function Inbox(props: InboxProps) {
   return props.search ? (
-    <InboxBody conversationIDKey={props.conversationIDKey} search={props.search} />
+    <InboxBody conversationIDKey={props.conversationIDKey} refreshInbox={props.refreshInbox} search={props.search} />
   ) : (
-    <InboxWithSearch conversationIDKey={props.conversationIDKey} />
+    <InboxWithSearch conversationIDKey={props.conversationIDKey} refreshInbox={props.refreshInbox} />
   )
 }
 

shared/chat/inbox/row/big-team-channel.tsx

@@ -1,4 +1,4 @@
-import * as ConvoState from '@/stores/convostate'
+import * as C from '@/constants'
 import type * as React from 'react'
 import * as Kb from '@/common-adapters'
 import * as RowSizes from './sizes'
@@ -15,8 +15,7 @@ const BigTeamChannel = (props: Props) => {
   const row = useInboxRowBig(conversationIDKey)
   const {channelname, isMuted, hasBadge, hasDraft, hasUnread, isError, snippetDecoration} = row
 
-  const onSelectConversation = () =>
-    ConvoState.getConvoState(conversationIDKey).dispatch.navigateToThread('inboxBig')
+  const onSelectConversation = () => C.Router2.navigateToThread(conversationIDKey, 'inboxBig')
 
   let outboxTooltip: string | undefined
   let outboxIcon: React.ReactNode = null

shared/chat/inbox/row/small-team/index.tsx

@@ -35,7 +35,7 @@ const SmallTeam = (p: Props) => {
     : (p.onSelectConversation ??
         (() => {
           setOpenedRow(Chat.noConversationIDKey)
-          ConvoState.getConvoState(conversationIDKey).dispatch.navigateToThread('inboxSmall')
+          C.Router2.navigateToThread(conversationIDKey, 'inboxSmall')
         }))
 
   const backgroundColor = isSelected

shared/chat/inbox/use-inbox-search.tsx

@@ -1,3 +1,4 @@
+import * as C from '@/constants'
 import {ignorePromise} from '@/constants/utils'
 import * as T from '@/constants/types'
 import logger from '@/logger'
@@ -447,14 +448,9 @@ export function useInboxSearch(): InboxSearchController {
       }
 
       if (query) {
-        ConvoState.getConvoState(conversationIDKey).dispatch.navigateToThread(
-          'inboxSearch',
-          undefined,
-          undefined,
-          query
-        )
+        C.Router2.navigateToThread(conversationIDKey, 'inboxSearch', undefined, query)
       } else {
-        ConvoState.getConvoState(conversationIDKey).dispatch.navigateToThread('inboxSearch')
+        C.Router2.navigateToThread(conversationIDKey, 'inboxSearch')
         clearSearch()
       }
     },