Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 2 additions & 2 deletions shared/app/global-errors/hook.tsx
Original file line number Diff line number Diff line change
@@ -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 {useDaemonState} from '@/stores/daemon'

export type Size = 'Closed' | 'Small' | 'Big'

Expand Down
4 changes: 2 additions & 2 deletions shared/app/index.native.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
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 {handleAppLink} from '@/constants/deeplinks'
Expand All @@ -18,7 +18,7 @@ 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 * as DarkMode from '@/constants/darkmode'
import * as DarkMode from '@/stores/darkmode'
import {initPlatformListener, onEngineConnected, onEngineDisconnected, onEngineIncoming} from '@/constants/init/index.native'

enableFreeze(true)
Expand Down
2 changes: 1 addition & 1 deletion shared/app/main.desktop.tsx
Original file line number Diff line number Diff line change
@@ -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'
Expand Down
2 changes: 1 addition & 1 deletion shared/app/out-of-date.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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: {
Expand Down
2 changes: 1 addition & 1 deletion shared/app/runtime-stats.tsx
Original file line number Diff line number Diff line change
@@ -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'
Expand Down
2 changes: 1 addition & 1 deletion shared/chat/audio/audio-recorder.native.tsx
Original file line number Diff line number Diff line change
@@ -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'
Expand Down
6 changes: 3 additions & 3 deletions shared/chat/blocking/block-modal.tsx
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
6 changes: 3 additions & 3 deletions shared/chat/blocking/invitation-to-block.tsx
Original file line number Diff line number Diff line change
@@ -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()
Expand Down
4 changes: 2 additions & 2 deletions shared/chat/chat-button.tsx
Original file line number Diff line number Diff line change
@@ -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'

Expand Down
4 changes: 2 additions & 2 deletions shared/chat/conversation/attachment-fullscreen/hooks.tsx
Original file line number Diff line number Diff line change
@@ -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) => {
Expand Down
2 changes: 1 addition & 1 deletion shared/chat/conversation/attachment-get-titles.tsx
Original file line number Diff line number Diff line change
@@ -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'
Expand Down
2 changes: 1 addition & 1 deletion shared/chat/conversation/bot/confirm.tsx
Original file line number Diff line number Diff line change
@@ -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'

Expand Down
6 changes: 3 additions & 3 deletions shared/chat/conversation/bot/install.tsx
Original file line number Diff line number Diff line change
@@ -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---'
Expand Down
4 changes: 2 additions & 2 deletions shared/chat/conversation/bot/search.tsx
Original file line number Diff line number Diff line change
@@ -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}

Expand Down
2 changes: 1 addition & 1 deletion shared/chat/conversation/bot/team-picker.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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}

Expand Down
6 changes: 3 additions & 3 deletions shared/chat/conversation/bottom-banner.tsx
Original file line number Diff line number Diff line change
@@ -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 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'

const installMessage = `I sent you encrypted messages on Keybase. You can install it here: https://keybase.io/phone-app`

Expand Down
2 changes: 1 addition & 1 deletion shared/chat/conversation/command-markdown.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import * as Chat from '@/constants/chat2'
import * as Chat from '@/stores/chat2'
import * as Kb from '@/common-adapters'

const CommandMarkdown = () => {
Expand Down
4 changes: 2 additions & 2 deletions shared/chat/conversation/command-status.tsx
Original file line number Diff line number Diff line change
@@ -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: [],
Expand Down
2 changes: 1 addition & 1 deletion shared/chat/conversation/container.tsx
Original file line number Diff line number Diff line change
@@ -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'
Expand Down
2 changes: 1 addition & 1 deletion shared/chat/conversation/error.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import * as Chat from '@/constants/chat2'
import * as Chat from '@/stores/chat2'
import * as Kb from '@/common-adapters'

const ConversationError = () => {
Expand Down
2 changes: 1 addition & 1 deletion shared/chat/conversation/fwd-msg.tsx
Original file line number Diff line number Diff line change
@@ -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'
Expand Down
2 changes: 1 addition & 1 deletion shared/chat/conversation/giphy/hooks.tsx
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
8 changes: 4 additions & 4 deletions shared/chat/conversation/header-area/index.native.tsx
Original file line number Diff line number Diff line change
@@ -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'
Expand All @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions shared/chat/conversation/info-panel/add-people.tsx
Original file line number Diff line number Diff line change
@@ -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'

Expand Down
4 changes: 2 additions & 2 deletions shared/chat/conversation/info-panel/add-to-channel.tsx
Original file line number Diff line number Diff line change
@@ -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'
Expand Down
4 changes: 2 additions & 2 deletions shared/chat/conversation/info-panel/attachments.tsx
Original file line number Diff line number Diff line change
@@ -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'
Expand All @@ -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>
Expand Down
8 changes: 4 additions & 4 deletions shared/chat/conversation/info-panel/bot.tsx
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions shared/chat/conversation/info-panel/common.tsx
Original file line number Diff line number Diff line change
@@ -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'
Expand Down
4 changes: 2 additions & 2 deletions shared/chat/conversation/info-panel/header.tsx
Original file line number Diff line number Diff line change
@@ -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'
Expand Down
4 changes: 2 additions & 2 deletions shared/chat/conversation/info-panel/index.tsx
Original file line number Diff line number Diff line change
@@ -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'
Expand Down
8 changes: 4 additions & 4 deletions shared/chat/conversation/info-panel/members.tsx
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
8 changes: 4 additions & 4 deletions shared/chat/conversation/info-panel/menu.tsx
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
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 * as T from '@/constants/types'
import * as InfoPanelCommon from './common'
import {Avatars, TeamAvatar} from '@/chat/avatars'
import {TeamsSubscriberMountOnly} from '@/teams/subscriber'
import {useUsersState} from '@/constants/users'
import {useCurrentUserState} from '@/constants/current-user'
import {useUsersState} from '@/stores/users'
import {useCurrentUserState} from '@/stores/current-user'

export type OwnProps = {
attachTo?: React.RefObject<Kb.MeasureRef | null>
Expand Down
6 changes: 3 additions & 3 deletions shared/chat/conversation/info-panel/settings/index.tsx
Original file line number Diff line number Diff line change
@@ -1,13 +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 Teams from '@/constants/teams'
import * as Teams from '@/stores/teams'
import * as T from '@/constants/types'
import * as React from 'react'
import MinWriterRole from './min-writer-role'
import Notifications from './notifications'
import RetentionPicker from '@/teams/team/settings-tab/retention'
import {useCurrentUserState} from '@/constants/current-user'
import {useCurrentUserState} from '@/stores/current-user'

type EntityType = 'adhoc' | 'small team' | 'channel'
type SettingsPanelProps = {isPreview: boolean}
Expand Down
Original file line number Diff line number Diff line change
@@ -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 * as Style from '@/styles'
import type * as T from '@/constants/types'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import * as Chat from '@/constants/chat2'
import * as Chat from '@/stores/chat2'
import * as React from 'react'
import * as Kb from '@/common-adapters'
import type * as T from '@/constants/types'
Expand Down
2 changes: 1 addition & 1 deletion shared/chat/conversation/input-area/container.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as C from '@/constants'
import * as Chat from '@/constants/chat2'
import * as Chat from '@/stores/chat2'
import Normal from './normal2'
import Preview from './preview'
import ThreadSearch from '../search'
Expand Down
Loading