keybase · chrisnojima-zoom · Jan 6, 2026 · Jan 6, 2026 · Jan 6, 2026 · Jan 7, 2026
diff --git a/shared/app/global-errors/hook.tsx b/shared/app/global-errors/hook.tsx
@@ -1,9 +1,9 @@
 import * as C from '@/constants'
 import * as React from 'react'
-import {useConfigState} from '@/constants/config'
+import {useConfigState} from '@/stores/config'
 import type {RPCError} from '@/util/errors'
-import {settingsFeedbackTab} from '@/constants/settings/util'
-import {useDaemonState} from '@/constants/daemon'
+import {settingsFeedbackTab} from '@/constants/settings'
+import {useDaemonState} from '@/stores/daemon'
 
 export type Size = 'Closed' | 'Small' | 'Big'
 

diff --git a/shared/app/index.native.tsx b/shared/app/index.native.tsx
@@ -1,8 +1,8 @@
 import * as C from '@/constants'
-import {useConfigState} from '@/constants/config'
+import {useConfigState} from '@/stores/config'
 import * as Kb from '@/common-adapters'
 import * as React from 'react'
-import {useDeepLinksState} from '@/constants/deeplinks'
+import {handleAppLink} from '@/constants/deeplinks'
 import Main from './main.native'
 import {KeyboardProvider} from 'react-native-keyboard-controller'
 import Animated, {ReducedMotionConfig, ReduceMotion} from 'react-native-reanimated'
@@ -18,9 +18,8 @@ import ServiceDecoration from '@/common-adapters/markdown/service-decoration'
 import {useUnmountAll} from '@/util/debug-react'
 import {darkModeSupported, guiConfig} from 'react-native-kb'
 import {install} from 'react-native-kb'
-import {useEngineState} from '@/constants/engine'
-import * as DarkMode from '@/constants/darkmode'
-import {initPlatformListener} from '@/constants/platform-specific'
+import * as DarkMode from '@/stores/darkmode'
+import {initPlatformListener, onEngineConnected, onEngineDisconnected, onEngineIncoming} from '@/constants/init/index.native'
 
 enableFreeze(true)
 setServiceDecoration(ServiceDecoration)
@@ -107,7 +106,6 @@ const StoreHelper = (p: {children: React.ReactNode}): React.ReactNode => {
   const {children} = p
   useDarkHookup()
   useKeyboardHookup()
-  const handleAppLink = useDeepLinksState(s => s.dispatch.handleAppLink)
 
   React.useEffect(() => {
     const linkingSub = Linking.addEventListener('url', ({url}: {url: string}) => {
@@ -116,7 +114,7 @@ const StoreHelper = (p: {children: React.ReactNode}): React.ReactNode => {
     return () => {
       linkingSub.remove()
     }
-  }, [handleAppLink])
+  }, [])
 
   return children
 }
@@ -136,11 +134,11 @@ const useInit = () => {
   const {batch} = C.useWaitingState.getState().dispatch
   const eng = makeEngine(batch, c => {
     if (c) {
-      useEngineState.getState().dispatch.onEngineConnected()
+      onEngineConnected()
     } else {
-      useEngineState.getState().dispatch.onEngineDisconnected()
+      onEngineDisconnected()
     }
-  })
+  }, onEngineIncoming)
   initPlatformListener()
   eng.listenersAreReady()
 

diff --git a/shared/app/main.desktop.tsx b/shared/app/main.desktop.tsx
@@ -1,6 +1,6 @@
 import * as React from 'react'
 import Router from '@/router-v2/router'
-import {useDarkModeState} from '@/constants/darkmode'
+import {useDarkModeState} from '@/stores/darkmode'
 import ResetModal from '../login/reset/modal'
 import GlobalError from './global-errors'
 import OutOfDate from './out-of-date'

diff --git a/shared/app/out-of-date.tsx b/shared/app/out-of-date.tsx
@@ -3,7 +3,7 @@ import * as Kb from '@/common-adapters'
 import * as React from 'react'
 import * as T from '@/constants/types'
 import logger from '@/logger'
-import {useConfigState} from '@/constants/config'
+import {useConfigState} from '@/stores/config'
 
 const styles = Kb.Styles.styleSheetCreate(() => ({
   container: {

diff --git a/shared/app/runtime-stats.tsx b/shared/app/runtime-stats.tsx
@@ -1,7 +1,7 @@
 import * as React from 'react'
 import * as Kb from '@/common-adapters'
 import * as T from '@/constants/types'
-import {useConfigState} from '@/constants/config'
+import {useConfigState} from '@/stores/config'
 
 const isIPhoneX = false as boolean
 // import lagRadar from 'lag-radar'

diff --git a/shared/chat/audio/audio-recorder.native.tsx b/shared/chat/audio/audio-recorder.native.tsx
@@ -1,4 +1,4 @@
-import * as Chat from '@/constants/chat2'
+import * as Chat from '@/stores/chat2'
 import * as T from '@/constants/types'
 import * as Kb from '@/common-adapters'
 import {Portal} from '@/common-adapters/portal.native'

diff --git a/shared/chat/blocking/block-modal.tsx b/shared/chat/blocking/block-modal.tsx
@@ -1,9 +1,9 @@
 import * as C from '@/constants'
 import * as React from 'react'
 import * as Kb from '@/common-adapters'
-import * as Chat from '@/constants/chat2'
-import {useTeamsState} from '@/constants/teams'
-import {useUsersState} from '@/constants/users'
+import * as Chat from '@/stores/chat2'
+import {useTeamsState} from '@/stores/teams'
+import {useUsersState} from '@/stores/users'
 
 // Type for extra RouteProp passed to block modal sometimes when launching the
 // modal from specific places from the app.

diff --git a/shared/chat/blocking/invitation-to-block.tsx b/shared/chat/blocking/invitation-to-block.tsx
@@ -1,8 +1,8 @@
-import * as Chat from '@/constants/chat2'
-import {useProfileState} from '@/constants/profile'
+import * as Chat from '@/stores/chat2'
+import {useProfileState} from '@/stores/profile'
 import * as Kb from '@/common-adapters'
 import {useSafeNavigation} from '@/util/safe-navigation'
-import {useCurrentUserState} from '@/constants/current-user'
+import {useCurrentUserState} from '@/stores/current-user'
 
 const BlockButtons = () => {
   const nav = useSafeNavigation()

diff --git a/shared/chat/chat-button.tsx b/shared/chat/chat-button.tsx
@@ -1,7 +1,7 @@
 import * as C from '@/constants'
-import * as Chat from '@/constants/chat2'
+import * as Chat from '@/stores/chat2'
 import * as Styles from '@/styles'
-import {useConfigState} from '@/constants/config'
+import {useConfigState} from '@/stores/config'
 import WaitingButton from '@/common-adapters/waiting-button'
 import Icon from '@/common-adapters/icon'
 

diff --git a/shared/chat/conversation/attachment-fullscreen/hooks.tsx b/shared/chat/conversation/attachment-fullscreen/hooks.tsx
@@ -1,9 +1,9 @@
 import * as React from 'react'
 import * as C from '@/constants'
-import * as Chat from '@/constants/chat2'
+import * as Chat from '@/stores/chat2'
 import type * as T from '@/constants/types'
 import {maxWidth, maxHeight} from '../messages/attachment/shared'
-import {useFSState} from '@/constants/fs'
+import {useFSState} from '@/stores/fs'
 
 const blankMessage = Chat.makeMessageAttachment({})
 export const useData = (initialOrdinal: T.Chat.Ordinal) => {

diff --git a/shared/chat/conversation/attachment-get-titles.tsx b/shared/chat/conversation/attachment-get-titles.tsx
@@ -1,5 +1,5 @@
 import * as C from '@/constants'
-import * as Chat from '@/constants/chat2'
+import * as Chat from '@/stores/chat2'
 import * as T from '@/constants/types'
 import * as React from 'react'
 import * as Kb from '@/common-adapters'

diff --git a/shared/chat/conversation/bot/confirm.tsx b/shared/chat/conversation/bot/confirm.tsx
@@ -1,7 +1,7 @@
 import * as React from 'react'
 import * as Kb from '@/common-adapters'
 import * as C from '@/constants'
-import * as Chat from '@/constants/chat2'
+import * as Chat from '@/stores/chat2'
 import type * as T from '@/constants/types'
 import {useBotConversationIDKey} from './install'
 

diff --git a/shared/chat/conversation/bot/install.tsx b/shared/chat/conversation/bot/install.tsx
@@ -1,12 +1,12 @@
 import * as C from '@/constants'
-import * as Chat from '@/constants/chat2'
+import * as Chat from '@/stores/chat2'
 import * as Kb from '@/common-adapters'
-import * as Teams from '@/constants/teams'
+import * as Teams from '@/stores/teams'
 import * as React from 'react'
 import ChannelPicker from './channel-picker'
 import openURL from '@/util/open-url'
 import * as T from '@/constants/types'
-import {useBotsState} from '@/constants/bots'
+import {useBotsState} from '@/stores/bots'
 import {useAllChannelMetas} from '@/teams/common/channel-hooks'
 
 const RestrictedItem = '---RESTRICTED---'

diff --git a/shared/chat/conversation/bot/search.tsx b/shared/chat/conversation/bot/search.tsx
@@ -1,11 +1,11 @@
 import * as C from '@/constants'
-import * as Chat from '@/constants/chat2'
+import * as Chat from '@/stores/chat2'
 import * as Kb from '@/common-adapters'
 import * as React from 'react'
 import debounce from 'lodash/debounce'
 import type * as T from '@/constants/types'
 import {Bot} from '../info-panel/bot'
-import {getFeaturedSorted, useBotsState} from '@/constants/bots'
+import {getFeaturedSorted, useBotsState} from '@/stores/bots'
 
 type Props = {teamID?: T.Teams.TeamID}
 

diff --git a/shared/chat/conversation/bot/team-picker.tsx b/shared/chat/conversation/bot/team-picker.tsx
@@ -5,7 +5,7 @@ import * as T from '@/constants/types'
 import {Avatars, TeamAvatar} from '@/chat/avatars'
 import debounce from 'lodash/debounce'
 import logger from '@/logger'
-import {useBotsState} from '@/constants/bots'
+import {useBotsState} from '@/stores/bots'
 
 type Props = {botUsername: string}
 

diff --git a/shared/chat/conversation/bottom-banner.tsx b/shared/chat/conversation/bottom-banner.tsx
@@ -1,12 +1,13 @@
 import * as C from '@/constants'
-import * as Chat from '@/constants/chat2'
+import * as Chat from '@/stores/chat2'
 import * as Kb from '@/common-adapters'
 import * as React from 'react'
 import _openSMS from '@/util/sms'
 import {assertionToDisplay} from '@/common-adapters/usernames'
 import type {Props as TextProps} from '@/common-adapters/text'
-import {useUsersState} from '@/constants/users'
-import {useFollowerState} from '@/constants/followers'
+import {useUsersState} from '@/stores/users'
+import {useFollowerState} from '@/stores/followers'
+import {showShareActionSheet} from '@/util/platform-specific'
 
 const installMessage = `I sent you encrypted messages on Keybase. You can install it here: https://keybase.io/phone-app`
 
@@ -16,7 +17,7 @@ const Invite = () => {
   const users = participantInfoAll.filter(p => p.includes('@'))
 
   const openShareSheet = () => {
-    C.PlatformSpecific.showShareActionSheet({
+    showShareActionSheet({
       message: installMessage,
       mimeType: 'text/plain',
     })

diff --git a/shared/chat/conversation/command-markdown.tsx b/shared/chat/conversation/command-markdown.tsx
@@ -1,4 +1,4 @@
-import * as Chat from '@/constants/chat2'
+import * as Chat from '@/stores/chat2'
 import * as Kb from '@/common-adapters'
 
 const CommandMarkdown = () => {

diff --git a/shared/chat/conversation/command-status.tsx b/shared/chat/conversation/command-status.tsx
@@ -1,7 +1,7 @@
-import * as Chat from '@/constants/chat2'
+import * as Chat from '@/stores/chat2'
 import * as T from '@/constants/types'
 import * as Kb from '@/common-adapters'
-import {useConfigState} from '@/constants/config'
+import {useConfigState} from '@/stores/config'
 
 const empty = {
   actions: [],

diff --git a/shared/chat/conversation/container.tsx b/shared/chat/conversation/container.tsx
@@ -1,5 +1,5 @@
 import * as C from '@/constants'
-import * as Chat from '@/constants/chat2'
+import * as Chat from '@/stores/chat2'
 import Normal from './normal/container'
 import NoConversation from './no-conversation'
 import Error from './error'

diff --git a/shared/chat/conversation/error.tsx b/shared/chat/conversation/error.tsx
@@ -1,4 +1,4 @@
-import * as Chat from '@/constants/chat2'
+import * as Chat from '@/stores/chat2'
 import * as Kb from '@/common-adapters'
 
 const ConversationError = () => {

diff --git a/shared/chat/conversation/fwd-msg.tsx b/shared/chat/conversation/fwd-msg.tsx
@@ -1,5 +1,5 @@
 import * as C from '@/constants'
-import * as Chat from '@/constants/chat2'
+import * as Chat from '@/stores/chat2'
 import * as React from 'react'
 import * as Kb from '@/common-adapters'
 import * as T from '@/constants/types'

diff --git a/shared/chat/conversation/giphy/hooks.tsx b/shared/chat/conversation/giphy/hooks.tsx
@@ -1,4 +1,4 @@
-import * as Chat from '@/constants/chat2'
+import * as Chat from '@/stores/chat2'
 
 export const useHooks = () => {
   const giphy = Chat.useChatContext(s => s.giphyResult)

diff --git a/shared/chat/conversation/header-area/index.native.tsx b/shared/chat/conversation/header-area/index.native.tsx
@@ -1,6 +1,6 @@
 import * as C from '@/constants'
-import * as Chat from '@/constants/chat2'
-import {useProfileState} from '@/constants/profile'
+import * as Chat from '@/stores/chat2'
+import {useProfileState} from '@/stores/profile'
 import * as Kb from '@/common-adapters'
 import * as React from 'react'
 import type {HeaderBackButtonProps} from '@react-navigation/elements'
@@ -9,8 +9,8 @@ import {Keyboard} from 'react-native'
 // import {DebugChatDumpContext} from '@/constants/chat2/debug'
 import {assertionToDisplay} from '@/common-adapters/usernames'
 import {useSafeAreaFrame} from 'react-native-safe-area-context'
-import {useUsersState} from '@/constants/users'
-import {useCurrentUserState} from '@/constants/current-user'
+import {useUsersState} from '@/stores/users'
+import {useCurrentUserState} from '@/stores/current-user'
 
 export const HeaderAreaRight = () => {
   const conversationIDKey = Chat.useChatContext(s => s.id)

diff --git a/shared/chat/conversation/info-panel/add-people.tsx b/shared/chat/conversation/info-panel/add-people.tsx
@@ -1,5 +1,5 @@
-import * as Chat from '@/constants/chat2'
-import {useTeamsState} from '@/constants/teams'
+import * as Chat from '@/stores/chat2'
+import {useTeamsState} from '@/stores/teams'
 import * as React from 'react'
 import * as Kb from '@/common-adapters'
 

diff --git a/shared/chat/conversation/info-panel/add-to-channel.tsx b/shared/chat/conversation/info-panel/add-to-channel.tsx
@@ -1,7 +1,7 @@
 import * as C from '@/constants'
-import * as Chat from '@/constants/chat2'
+import * as Chat from '@/stores/chat2'
 import * as React from 'react'
-import * as Teams from '@/constants/teams'
+import * as Teams from '@/stores/teams'
 import * as Kb from '@/common-adapters'
 import {useSafeNavigation} from '@/util/safe-navigation'
 import * as T from '@/constants/types'

diff --git a/shared/chat/conversation/info-panel/attachments.tsx b/shared/chat/conversation/info-panel/attachments.tsx
@@ -1,5 +1,5 @@
 import * as C from '@/constants'
-import * as Chat from '@/constants/chat2'
+import * as Chat from '@/stores/chat2'
 import * as Kb from '@/common-adapters'
 import type {StylesTextCrossPlatform} from '@/common-adapters/text'
 import * as T from '@/constants/types'
@@ -8,7 +8,7 @@ import chunk from 'lodash/chunk'
 import {formatAudioRecordDuration, formatTimeForMessages} from '@/util/timestamp'
 import {infoPanelWidth} from './common'
 import {useMessagePopup} from '../messages/message-popup'
-import {useFSState} from '@/constants/fs'
+import {useFSState} from '@/stores/fs'
 
 type Props = {
   commonSections: ReadonlyArray<Section>

diff --git a/shared/chat/conversation/info-panel/bot.tsx b/shared/chat/conversation/info-panel/bot.tsx
@@ -1,11 +1,11 @@
 import * as C from '@/constants'
-import * as Chat from '@/constants/chat2'
-import * as Teams from '@/constants/teams'
+import * as Chat from '@/stores/chat2'
+import * as Teams from '@/stores/teams'
 import * as Kb from '@/common-adapters'
 import * as React from 'react'
 import type * as T from '@/constants/types'
-import {getFeaturedSorted, useBotsState} from '@/constants/bots'
-import {useUsersState} from '@/constants/users'
+import {getFeaturedSorted, useBotsState} from '@/stores/bots'
+import {useUsersState} from '@/stores/users'
 
 type AddToChannelProps = {
   conversationIDKey: T.Chat.ConversationIDKey

diff --git a/shared/chat/conversation/info-panel/common.tsx b/shared/chat/conversation/info-panel/common.tsx
@@ -1,5 +1,5 @@
-import type * as Chat from '@/constants/chat2'
-import {useTeamsState} from '@/constants/teams'
+import type * as Chat from '@/stores/chat2'
+import {useTeamsState} from '@/stores/teams'
 import * as React from 'react'
 import * as Styles from '@/styles'
 import type * as T from '@/constants/types'

diff --git a/shared/chat/conversation/info-panel/header.tsx b/shared/chat/conversation/info-panel/header.tsx
@@ -1,6 +1,6 @@
-import * as Chat from '@/constants/chat2'
+import * as Chat from '@/stores/chat2'
 import * as React from 'react'
-import * as Teams from '@/constants/teams'
+import * as Teams from '@/stores/teams'
 import * as Kb from '@/common-adapters'
 import InfoPanelMenu from './menu'
 import * as InfoPanelCommon from './common'

diff --git a/shared/chat/conversation/info-panel/index.tsx b/shared/chat/conversation/info-panel/index.tsx
@@ -1,6 +1,6 @@
-import * as Chat from '@/constants/chat2'
+import * as Chat from '@/stores/chat2'
 import * as Kb from '@/common-adapters'
-import * as Teams from '@/constants/teams'
+import * as Teams from '@/stores/teams'
 import * as React from 'react'
 import {AdhocHeader, TeamHeader} from './header'
 import SettingsList from './settings'

diff --git a/shared/chat/conversation/info-panel/members.tsx b/shared/chat/conversation/info-panel/members.tsx
@@ -1,12 +1,12 @@
 import * as C from '@/constants'
-import * as Chat from '@/constants/chat2'
-import {useProfileState} from '@/constants/profile'
-import * as Teams from '@/constants/teams'
+import * as Chat from '@/stores/chat2'
+import {useProfileState} from '@/stores/profile'
+import * as Teams from '@/stores/teams'
 import * as React from 'react'
 import * as Kb from '@/common-adapters'
 import * as T from '@/constants/types'
 import Participant from './participant'
-import {useUsersState} from '@/constants/users'
+import {useUsersState} from '@/stores/users'
 
 type Props = {
   commonSections: ReadonlyArray<Section>