store uid along with current user state

shared/chat/conversation/thread-context.tsx

@@ -20,6 +20,7 @@ import {clearChatTimeCache} from '@/util/timestamp'
 import {findLast} from '@/util/arrays'
 import {ignorePromise} from '@/constants/utils'
 import {RPCError} from '@/util/errors'
+import {persistRoute} from '@/util/storeless-actions'
 import {uint8ArrayToString} from '@/util/uint8array'
 import {useEngineActionListener} from '@/engine/action-listener'
 import {useCurrentUserState} from '@/stores/current-user'
@@ -868,6 +869,10 @@ const loadConversationThreadMessages = (
       if (error instanceof RPCError) {
         logger.warn(`loadMoreMessages: error: ${error.desc}`)
         if (error.code === T.RPCGen.StatusCode.scchatnotinteam) {
+          // We're no longer in this conv's team. Clear the persisted last-route
+          // (ui.routeState2) so app startup doesn't keep restoring and reloading
+          // this conv, which would re-trigger this error on every launch.
+          persistRoute(true, true, () => useConfigState.getState().startup.loaded)
           navigateToInbox(true, 'maybeKickedFromTeam')
         }
         if (error.code !== T.RPCGen.StatusCode.scteamreaderror) {

shared/constants/init/index.tsx

@@ -215,6 +215,7 @@ const loadStartupDetails = async () => {
   ] as const)
 
   let conversation: T.Chat.ConversationIDKey | undefined
+  let conversationUid = ''
   let followUser = ''
   let link = ''
   let tab = ''
@@ -232,11 +233,14 @@ const loadStartupDetails = async () => {
     try {
       const item = JSON.parse(routeState) as
         | undefined
-        | {param?: {selectedConversationIDKey?: unknown}; routeName?: string}
+        | {param?: {selectedConversationIDKey?: unknown}; routeName?: string; uid?: unknown}
       if (item) {
         const _convo = item.param?.selectedConversationIDKey || undefined
         if (typeof _convo === 'string') {
           conversation = _convo
+          if (typeof item.uid === 'string') {
+            conversationUid = item.uid
+          }
           logger.info('initialState: routeState', conversation)
         }
         const _rn = item.routeName || undefined
@@ -256,6 +260,7 @@ const loadStartupDetails = async () => {
 
   useConfigState.getState().dispatch.setStartupDetails({
     conversation: conversation ?? noConversationIDKey,
+    conversationUid,
     followUser,
     link,
     tab: tab as Tabs.Tab,

shared/router-v2/linking.tsx

@@ -2,6 +2,7 @@ import * as Tabs from '@/constants/tabs'
 import {isSplit} from '@/constants/chat/layout'
 import {isValidConversationIDKey} from '@/constants/types/chat/common'
 import {useConfigState} from '@/stores/config'
+import {useCurrentUserState} from '@/stores/current-user'
 import type * as UsePushStateType from '@/stores/push'
 import type {LinkingOptions} from '@react-navigation/native'
 import type {RootParamList} from './route-params'
@@ -261,6 +262,13 @@ export const createLinkingConfig = (
         startupConversation = ''
       }
 
+      // Only restore a conv that belongs to the logged-in account; see persistRoute
+      // (ui.routeState2 is device-global, so it can hold another account's conv).
+      const {uid: currentUid} = useCurrentUserState.getState()
+      if (startupConversation && startup.conversationUid && startup.conversationUid !== currentUid) {
+        startupConversation = ''
+      }
+
       // Lazy-require to break require cycle: linking.tsx → push.native.tsx → linking.tsx
       const {usePushState} = require('@/stores/push') as typeof UsePushStateType
       const pushState = usePushState.getState()

shared/stores/config.tsx

@@ -51,6 +51,9 @@ type Store = T.Immutable<{
   startup: {
     loaded: boolean
     conversation: T.Chat.ConversationIDKey
+    // uid of the account that persisted `conversation` (from ui.routeState2).
+    // Used to avoid replaying a conversation under a different account.
+    conversationUid?: string
     followUser: string
     link: string
     tab?: Tab

shared/util/storeless-actions.tsx

@@ -7,6 +7,7 @@ import {Alert, Linking} from 'react-native'
 import {showShareActionSheet as showShareActionSheetImpl} from '@/util/platform-specific'
 import {getTab, getVisiblePath} from '@/constants/router'
 import {peopleTab} from '@/constants/tabs'
+import {useCurrentUserState} from '@/stores/current-user'
 
 export const copyToClipboard = (text: string) => {
   if (isMobile) {
@@ -100,7 +101,11 @@ export const persistRoute = (clear: boolean, immediate: boolean, isStartupLoaded
       }
       return false
     })
-    const next = JSON.stringify({param, routeName})
+    // Stamp the persisted route with the current uid. ui.routeState2 is stored
+    // device-globally (not per-account), so on startup we must only restore a
+    // conversation that belongs to the account we end up logged in as.
+    const {uid} = useCurrentUserState.getState()
+    const next = JSON.stringify({param, routeName, uid})
     if (lastPersist === next) {
       return
     }