diff --git a/plans/todo.md b/plans/todo.md
index b8c8c3d5f802..96832182f925 100644
--- a/plans/todo.md
+++ b/plans/todo.md
@@ -1,4 +1,6 @@
-look for opportunities to use gap in all boxes
+look for platform splits that can go away
+jump in inbox below tab
+go screen by screen and find cleanup
 any leftover zustand store
 ios push to convo broken
 ts split maybe
diff --git a/shared/.gitignore b/shared/.gitignore
index 114613c2f058..adca0cbc20bb 100644
--- a/shared/.gitignore
+++ b/shared/.gitignore
@@ -56,3 +56,4 @@ main.jsbundle
 coverage-ts
 temp.log
 .watchman-cookie-*
+.tsOuts/
diff --git a/shared/chat/audio/audio-video.desktop.tsx b/shared/chat/audio/audio-video.desktop.tsx
index bd6ed755d34b..d6b08a693cb0 100644
--- a/shared/chat/audio/audio-video.desktop.tsx
+++ b/shared/chat/audio/audio-video.desktop.tsx
@@ -1,5 +1,5 @@
 import * as React from 'react'
-import type {Props} from './audio-video'
+import type {Props} from './audio-video.shared'
 
 const AudioVideo = (props: Props) => {
   const {url, paused, onPositionUpdated, onEnded} = props
diff --git a/shared/chat/audio/audio-video.native.tsx b/shared/chat/audio/audio-video.native.tsx
index 778b9d53ac28..c4e77882c30e 100644
--- a/shared/chat/audio/audio-video.native.tsx
+++ b/shared/chat/audio/audio-video.native.tsx
@@ -1,7 +1,7 @@
 import * as React from 'react'
 import {useAudioPlayer} from 'expo-audio'
 import {useEventListener} from 'expo'
-import type {Props} from './audio-video'
+import type {Props} from './audio-video.shared'
 
 const AudioVideo = (props: Props) => {
   const {url, paused, onPositionUpdated, onEnded} = props
diff --git a/shared/chat/audio/audio-video.d.ts b/shared/chat/audio/audio-video.shared.tsx
similarity index 50%
rename from shared/chat/audio/audio-video.d.ts
rename to shared/chat/audio/audio-video.shared.tsx
index 96f14fa2e438..e1ad2c0648c5 100644
--- a/shared/chat/audio/audio-video.d.ts
+++ b/shared/chat/audio/audio-video.shared.tsx
@@ -1,11 +1,6 @@
-import type * as React from 'react'
-
 export type Props = {
   url: string
   paused: boolean
   onPositionUpdated: (ratio: number) => void
   onEnded: () => void
 }
-
-declare const AudioVideo: (p: Props) => React.ReactNode
-export default AudioVideo
diff --git a/shared/chat/conversation/attachment-fullscreen/index.desktop.tsx b/shared/chat/conversation/attachment-fullscreen/index.desktop.tsx
index 53aaa5330b5e..5d4353a21d05 100644
--- a/shared/chat/conversation/attachment-fullscreen/index.desktop.tsx
+++ b/shared/chat/conversation/attachment-fullscreen/index.desktop.tsx
@@ -1,7 +1,7 @@
 import * as React from 'react'
 import * as Kb from '@/common-adapters'
 import {useMessagePopup} from '../messages/message-popup'
-import type {Props} from '.'
+import type {Props} from './index.shared'
 import {useData, usePreviewFallback} from './hooks'
 import type {StyleOverride} from '@/common-adapters/markdown'
 
diff --git a/shared/chat/conversation/attachment-fullscreen/index.native.tsx b/shared/chat/conversation/attachment-fullscreen/index.native.tsx
index 8b3477258e59..abe627bc5142 100644
--- a/shared/chat/conversation/attachment-fullscreen/index.native.tsx
+++ b/shared/chat/conversation/attachment-fullscreen/index.native.tsx
@@ -4,7 +4,7 @@ import {useMessagePopup} from '../messages/message-popup'
 import {useVideoPlayer, VideoView} from 'expo-video'
 import logger from '@/logger'
 import {ShowToastAfterSaving} from '../messages/attachment/shared'
-import type {Props} from '.'
+import type {Props} from './index.shared'
 import {useData, usePreviewFallback} from './hooks'
 import {type GestureResponderEvent, Animated, View} from 'react-native'
 import {useSafeAreaFrame} from 'react-native-safe-area-context'
diff --git a/shared/chat/conversation/attachment-fullscreen/index.d.ts b/shared/chat/conversation/attachment-fullscreen/index.shared.tsx
similarity index 100%
rename from shared/chat/conversation/attachment-fullscreen/index.d.ts
rename to shared/chat/conversation/attachment-fullscreen/index.shared.tsx
diff --git a/shared/chat/conversation/giphy/index.d.ts b/shared/chat/conversation/giphy/index.d.ts
deleted file mode 100644
index 59d9869ce8e6..000000000000
--- a/shared/chat/conversation/giphy/index.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import type * as React from 'react'
-declare const GiphySearch: () => React.ReactNode
-export default GiphySearch
diff --git a/shared/chat/conversation/header-area/index.d.ts b/shared/chat/conversation/header-area/index.d.ts
deleted file mode 100644
index c8820f5b72e6..000000000000
--- a/shared/chat/conversation/header-area/index.d.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import type {GetOptionsRet} from '@/constants/types/router'
-import type * as T from '@/constants/types'
-
-declare function headerNavigationOptions(route: {
-  params?: {conversationIDKey?: T.Chat.ConversationIDKey}
-}): Partial<GetOptionsRet>
-export {headerNavigationOptions}
diff --git a/shared/chat/conversation/header-area/index.desktop.tsx b/shared/chat/conversation/header-area/index.desktop.tsx
index b52fbe24b277..ef58c37e4933 100644
--- a/shared/chat/conversation/header-area/index.desktop.tsx
+++ b/shared/chat/conversation/header-area/index.desktop.tsx
@@ -1 +1 @@
-export const headerNavigationOptions = (/*route*/) => ({})
+export const headerNavigationOptions = (_route: unknown) => ({})
diff --git a/shared/chat/conversation/input-area/filepicker-popup/index.native.tsx b/shared/chat/conversation/input-area/filepicker-popup/index.native.tsx
index 291f84d15580..2580773c07e5 100644
--- a/shared/chat/conversation/input-area/filepicker-popup/index.native.tsx
+++ b/shared/chat/conversation/input-area/filepicker-popup/index.native.tsx
@@ -1,5 +1,5 @@
 import * as Kb from '@/common-adapters'
-import type {Props} from '.'
+import type {Props} from './index.shared'
 
 const Prompt = () => (
   <Kb.Box2 direction="horizontal" fullWidth={true} gap="xtiny" style={styles.promptContainer} justifyContent="center">
diff --git a/shared/chat/conversation/input-area/filepicker-popup/index.d.ts b/shared/chat/conversation/input-area/filepicker-popup/index.shared.tsx
similarity index 75%
rename from shared/chat/conversation/input-area/filepicker-popup/index.d.ts
rename to shared/chat/conversation/input-area/filepicker-popup/index.shared.tsx
index 7b42f954414c..54ae4507612f 100644
--- a/shared/chat/conversation/input-area/filepicker-popup/index.d.ts
+++ b/shared/chat/conversation/input-area/filepicker-popup/index.shared.tsx
@@ -7,6 +7,3 @@ export type Props = {
   onHidden: () => void
   onSelect: (mediaType: 'photo' | 'video' | 'mixed' | 'file', location: 'camera' | 'library' | 'file') => void
 }
-
-export declare const FilePickerPopup: (p: Props) => React.ReactNode
-export default FilePickerPopup
diff --git a/shared/chat/conversation/input-area/location-popup.d.ts b/shared/chat/conversation/input-area/location-popup.d.ts
deleted file mode 100644
index 251868e41272..000000000000
--- a/shared/chat/conversation/input-area/location-popup.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import type * as React from 'react'
-declare const LocationPopup: () => React.ReactNode
-export default LocationPopup
diff --git a/shared/chat/conversation/input-area/normal/index.tsx b/shared/chat/conversation/input-area/normal/index.tsx
index 54dc042f0f5a..3756b7121bc3 100644
--- a/shared/chat/conversation/input-area/normal/index.tsx
+++ b/shared/chat/conversation/input-area/normal/index.tsx
@@ -13,7 +13,7 @@ import {indefiniteArticle} from '@/util/string'
 import {infoPanelWidthTablet} from '../../info-panel/common'
 import {assertionToDisplay} from '@/common-adapters/usernames'
 import {FocusContext, ScrollContext} from '@/chat/conversation/normal/context'
-import type {RefType as InputRef} from './input'
+import type {RefType as InputRef} from './input.shared'
 import {useConversationCenter} from '../../center-context'
 import {
   useConversationThreadID,
diff --git a/shared/chat/conversation/input-area/normal/input.desktop.tsx b/shared/chat/conversation/input-area/normal/input.desktop.tsx
index 356b1c68faa1..60b6fe6569b2 100644
--- a/shared/chat/conversation/input-area/normal/input.desktop.tsx
+++ b/shared/chat/conversation/input-area/normal/input.desktop.tsx
@@ -5,8 +5,9 @@ import * as React from 'react'
 import * as InputState from '../input-state'
 import SetExplodingMessagePopup from './set-explode-popup'
 import Typing from './typing'
-import type {Props as InputLowLevelProps, TextInfo, RefType} from './input'
-import type {PlatformInputProps as Props} from './input'
+import type {Props as InputLowLevelProps, TextInfo, RefType} from './input.shared'
+import type {PlatformInputProps as Props} from './input.shared'
+export type {Selection, RefType, TextInfo, PlatformInputProps} from './input.shared'
 import {EmojiPickerDesktop} from '@/chat/emoji-picker/container'
 import {KeyEventHandler} from '@/common-adapters/key-event-handler.desktop'
 import {formatDurationShort} from '@/util/timestamp'
diff --git a/shared/chat/conversation/input-area/normal/input.native.tsx b/shared/chat/conversation/input-area/normal/input.native.tsx
index 14adeccf503e..1b52ca088c31 100644
--- a/shared/chat/conversation/input-area/normal/input.native.tsx
+++ b/shared/chat/conversation/input-area/normal/input.native.tsx
@@ -9,7 +9,7 @@ import Typing from './typing'
 import logger from '@/logger'
 import type * as ImagePicker from 'expo-image-picker'
 import type {LayoutEvent} from '@/common-adapters/box'
-import type {Props as InputLowLevelProps, PlatformInputProps as Props, TextInfo, RefType} from './input'
+import type {Props as InputLowLevelProps, PlatformInputProps as Props, TextInfo, RefType} from './input.shared'
 import {AudioSendWrapper} from '@/chat/audio/audio-send.native'
 import {Keyboard, TextInput, type NativeSyntheticEvent, type TextInputSelectionChangeEventData, useColorScheme} from 'react-native'
 import {MaxInputAreaContext} from './max-input-area-context'
diff --git a/shared/chat/conversation/input-area/normal/input.d.ts b/shared/chat/conversation/input-area/normal/input.shared.tsx
similarity index 88%
rename from shared/chat/conversation/input-area/normal/input.d.ts
rename to shared/chat/conversation/input-area/normal/input.shared.tsx
index c922050bb01b..ce4775a6efdd 100644
--- a/shared/chat/conversation/input-area/normal/input.d.ts
+++ b/shared/chat/conversation/input-area/normal/input.shared.tsx
@@ -4,6 +4,11 @@ import type * as Styles from '@/styles'
 import type {TextType} from '@/common-adapters/text.shared'
 import type {TextInputProps} from 'react-native'
 
+export type Selection = {
+  start: number
+  end?: number
+}
+
 export type RefType = {
   blur: () => void
   clear: () => void
@@ -26,14 +31,11 @@ export type RefType = {
       }
 }
 
-export type Selection = {
-  start: number
-  end?: number
-}
 export type TextInfo = {
   text: string
   selection?: Selection
 }
+
 export type Props = {
   allowKeyboardEvents?: boolean
   disabled?: boolean
@@ -52,11 +54,11 @@ export type Props = {
   textType?: TextType
   style?: Styles.StylesCrossPlatform
   onChangeText?: (value: string) => void
-  onPasteImage?: (uris: Array<string>) => void // mobile only
+  onPasteImage?: (uris: Array<string>) => void
   multiline?: boolean
   rowsMin?: number
   rowsMax?: number
-  padding?: keyof typeof Styles.globalMargins | 0 // globalMargins does not have an option for 0
+  padding?: keyof typeof Styles.globalMargins | 0
 }
 
 export type PlatformInputProps = {
@@ -74,6 +76,3 @@ export type PlatformInputProps = {
   showReplyPreview: boolean
   suggestionOverlayStyle: Styles.StylesCrossPlatform
 }
-
-declare const PlatformInput: (p: PlatformInputProps) => React.ReactNode
-export default PlatformInput
diff --git a/shared/chat/conversation/input-area/normal/set-explode-popup/hooks.tsx b/shared/chat/conversation/input-area/normal/set-explode-popup/hooks.tsx
index 8c2bacdb913e..c8ea1b1e788a 100644
--- a/shared/chat/conversation/input-area/normal/set-explode-popup/hooks.tsx
+++ b/shared/chat/conversation/input-area/normal/set-explode-popup/hooks.tsx
@@ -1,6 +1,6 @@
 import * as Chat from '@/constants/chat'
 import type * as T from '@/constants/types'
-import type {Props} from '.'
+import type {Props} from './index.shared'
 import {useConversationThreadSelector} from '../../../thread-context'
 
 export type MessageExplodeDescription = {
diff --git a/shared/chat/conversation/input-area/normal/set-explode-popup/index.desktop.tsx b/shared/chat/conversation/input-area/normal/set-explode-popup/index.desktop.tsx
index 255ad7b0c55e..bd575535b2c3 100644
--- a/shared/chat/conversation/input-area/normal/set-explode-popup/index.desktop.tsx
+++ b/shared/chat/conversation/input-area/normal/set-explode-popup/index.desktop.tsx
@@ -1,5 +1,5 @@
 import * as Kb from '@/common-adapters'
-import type {Props} from '.'
+import type {Props} from './index.shared'
 import useHooks from './hooks'
 import type {MessageExplodeDescription} from './hooks'
 
diff --git a/shared/chat/conversation/input-area/normal/set-explode-popup/index.native.tsx b/shared/chat/conversation/input-area/normal/set-explode-popup/index.native.tsx
index 813c0c9483c9..e1d50248f819 100644
--- a/shared/chat/conversation/input-area/normal/set-explode-popup/index.native.tsx
+++ b/shared/chat/conversation/input-area/normal/set-explode-popup/index.native.tsx
@@ -1,5 +1,5 @@
 import * as Kb from '@/common-adapters'
-import type {Props} from '.'
+import type {Props} from './index.shared'
 import useHooks from './hooks'
 
 const Prompt = () => (
diff --git a/shared/chat/conversation/input-area/normal/set-explode-popup/index.d.ts b/shared/chat/conversation/input-area/normal/set-explode-popup/index.shared.tsx
similarity index 100%
rename from shared/chat/conversation/input-area/normal/set-explode-popup/index.d.ts
rename to shared/chat/conversation/input-area/normal/set-explode-popup/index.shared.tsx
diff --git a/shared/chat/conversation/input-area/suggestors/commands.tsx b/shared/chat/conversation/input-area/suggestors/commands.tsx
index 0dc92f2ed65a..812a4fb8d7ff 100644
--- a/shared/chat/conversation/input-area/suggestors/commands.tsx
+++ b/shared/chat/conversation/input-area/suggestors/commands.tsx
@@ -4,7 +4,7 @@ import * as Common from './common'
 import * as Kb from '@/common-adapters'
 import {useEngineActionListener} from '@/engine/action-listener'
 import {useConfigState} from '@/stores/config'
-import type {Selection as InputSelection} from '../normal/input'
+import type {Selection as InputSelection} from '../normal/input.shared'
 import {useConversationMeta} from '../../data-hooks'
 
 const getCommandPrefix = (command: T.RPCChat.ConversationCommand) => {
diff --git a/shared/chat/conversation/input-area/suggestors/index.tsx b/shared/chat/conversation/input-area/suggestors/index.tsx
index 8aa5683bc34e..1d1783527edc 100644
--- a/shared/chat/conversation/input-area/suggestors/index.tsx
+++ b/shared/chat/conversation/input-area/suggestors/index.tsx
@@ -6,7 +6,7 @@ import * as React from 'react'
 import * as Users from './users'
 import * as InputState from '../input-state'
 import type * as Common from './common'
-import type {PlatformInputProps as Props, RefType as InputRef} from '../normal/input'
+import type {PlatformInputProps as Props, RefType as InputRef} from '../normal/input.shared'
 import {useConversationThreadID} from '../../thread-context'
 
 const positionFallbacks = ['bottom center'] as const
@@ -128,7 +128,7 @@ const useSyncInput = (p: UseSyncInputProps) => {
     return null
   }
 
-  const triggerIDRef = React.useRef<number>(undefined)
+  const triggerIDRef = React.useRef<ReturnType<typeof setTimeout>>(undefined)
   const checkTrigger = () => {
     if (triggerIDRef.current) {
       clearTimeout(triggerIDRef.current)
diff --git a/shared/chat/conversation/input-area/suggestors/suggestion-list.desktop.tsx b/shared/chat/conversation/input-area/suggestors/suggestion-list.desktop.tsx
index 773958f38928..40c1752c0bb1 100644
--- a/shared/chat/conversation/input-area/suggestors/suggestion-list.desktop.tsx
+++ b/shared/chat/conversation/input-area/suggestors/suggestion-list.desktop.tsx
@@ -1,7 +1,7 @@
 import * as React from 'react'
 import * as Kb from '@/common-adapters'
 import * as T from '@/constants/types'
-import type {Props} from './suggestion-list'
+import type {Props} from './suggestion-list.shared'
 import {BotCommandUpdateStatus} from './shared'
 import type {LegendListRef} from '@/common-adapters'
 
diff --git a/shared/chat/conversation/input-area/suggestors/suggestion-list.native.tsx b/shared/chat/conversation/input-area/suggestors/suggestion-list.native.tsx
index 1b87bd7e7d38..128e3999053b 100644
--- a/shared/chat/conversation/input-area/suggestors/suggestion-list.native.tsx
+++ b/shared/chat/conversation/input-area/suggestors/suggestion-list.native.tsx
@@ -1,7 +1,7 @@
 import * as Kb from '@/common-adapters'
 import * as T from '@/constants/types'
 import noop from 'lodash/noop'
-import type {Props} from './suggestion-list'
+import type {Props} from './suggestion-list.shared'
 import {BotCommandUpdateStatus} from './shared'
 import {FlatList} from 'react-native'
 
diff --git a/shared/chat/conversation/input-area/suggestors/suggestion-list.d.ts b/shared/chat/conversation/input-area/suggestors/suggestion-list.shared.tsx
similarity index 73%
rename from shared/chat/conversation/input-area/suggestors/suggestion-list.d.ts
rename to shared/chat/conversation/input-area/suggestors/suggestion-list.shared.tsx
index 7a228f8ed5e9..482da65a17dc 100644
--- a/shared/chat/conversation/input-area/suggestors/suggestion-list.d.ts
+++ b/shared/chat/conversation/input-area/suggestors/suggestion-list.shared.tsx
@@ -3,15 +3,10 @@ import type * as Styles from '@/styles'
 import type * as T from '@/constants/types'
 
 export type Props<I> = {
-  // TODO fix this type
   items: Array<I>
   keyExtractor?: (item: I, idx: number) => string
   renderItem: (index: number, item: I) => React.ReactElement
   selectedIndex: number
   style?: Styles.StylesCrossPlatform
-  // likely doesn't belong here
   suggestBotCommandsUpdateStatus?: T.RPCChat.UIBotCommandsUpdateStatusTyp
 }
-
-declare function SuggestionList<I>(p: Props<I>): React.ReactNode
-export default SuggestionList
diff --git a/shared/chat/conversation/list-area/index.d.ts b/shared/chat/conversation/list-area/index.d.ts
deleted file mode 100644
index 331afdd4a4ac..000000000000
--- a/shared/chat/conversation/list-area/index.d.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import type * as React from 'react'
-import type * as T from '@/constants/types'
-
-export type ItemType = T.Chat.Ordinal
-declare const ConversationList: () => React.ReactNode
-export default ConversationList
diff --git a/shared/chat/conversation/list-area/index.native.tsx b/shared/chat/conversation/list-area/index.native.tsx
index e47df471047e..51ea828f0392 100644
--- a/shared/chat/conversation/list-area/index.native.tsx
+++ b/shared/chat/conversation/list-area/index.native.tsx
@@ -6,7 +6,7 @@ import * as React from 'react'
 import Separator from '../messages/separator'
 import SpecialBottomMessage from '../messages/special-bottom-message'
 import SpecialTopMessage from '../messages/special-top-message'
-import type {ItemType} from '.'
+import type {ItemType} from './index.shared'
 import {FlatList} from 'react-native'
 // import {FlashList, type ListRenderItemInfo} from '@shopify/flash-list'
 import {MessageRow} from '../messages/wrapper'
diff --git a/shared/chat/conversation/list-area/index.shared.tsx b/shared/chat/conversation/list-area/index.shared.tsx
new file mode 100644
index 000000000000..e1cfac5b230b
--- /dev/null
+++ b/shared/chat/conversation/list-area/index.shared.tsx
@@ -0,0 +1,3 @@
+import type * as T from '@/constants/types'
+
+export type ItemType = T.Chat.Ordinal
diff --git a/shared/chat/conversation/messages/attachment/image/imageimpl.d.ts b/shared/chat/conversation/messages/attachment/image/imageimpl.d.ts
deleted file mode 100644
index 1f586de3e41f..000000000000
--- a/shared/chat/conversation/messages/attachment/image/imageimpl.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import type * as React from 'react'
-import type * as T from '@/constants/types'
-declare const ImageImpl: (p: {message: T.Chat.MessageAttachment}) => React.ReactNode
-export default ImageImpl
diff --git a/shared/chat/conversation/messages/attachment/video/videoimpl.desktop.tsx b/shared/chat/conversation/messages/attachment/video/videoimpl.desktop.tsx
index 0d35558a8f00..ea46dce0ea59 100644
--- a/shared/chat/conversation/messages/attachment/video/videoimpl.desktop.tsx
+++ b/shared/chat/conversation/messages/attachment/video/videoimpl.desktop.tsx
@@ -1,6 +1,6 @@
 import * as Kb from '@/common-adapters'
 import * as React from 'react'
-import type {Props} from './videoimpl'
+import type {Props} from './videoimpl.shared'
 import {getAttachmentPreviewSize, maxWidth, maxHeight} from '../shared'
 
 // its important we use explicit height/width so we never CLS while loading
diff --git a/shared/chat/conversation/messages/attachment/video/videoimpl.native.tsx b/shared/chat/conversation/messages/attachment/video/videoimpl.native.tsx
index aa2107c32175..29c47a0d0be3 100644
--- a/shared/chat/conversation/messages/attachment/video/videoimpl.native.tsx
+++ b/shared/chat/conversation/messages/attachment/video/videoimpl.native.tsx
@@ -4,7 +4,7 @@ import {ShowToastAfterSaving} from '../shared'
 import {useVideoPlayer, VideoView} from 'expo-video'
 import {useEventListener} from 'expo'
 import {Pressable} from 'react-native'
-import type {Props} from './videoimpl'
+import type {Props} from './videoimpl.shared'
 import {getAttachmentPreviewSize} from '../shared'
 
 const VideoImpl = (p: Props) => {
diff --git a/shared/chat/conversation/messages/attachment/video/videoimpl.d.ts b/shared/chat/conversation/messages/attachment/video/videoimpl.shared.tsx
similarity index 60%
rename from shared/chat/conversation/messages/attachment/video/videoimpl.d.ts
rename to shared/chat/conversation/messages/attachment/video/videoimpl.shared.tsx
index ad172665d5fc..20e58705321e 100644
--- a/shared/chat/conversation/messages/attachment/video/videoimpl.d.ts
+++ b/shared/chat/conversation/messages/attachment/video/videoimpl.shared.tsx
@@ -1,10 +1,8 @@
-import type * as React from 'react'
 import type * as T from '@/constants/types'
+
 export type Props = {
   openFullscreen?: () => void
   showPopup?: () => void
   allowPlay: boolean
   message: T.Chat.MessageAttachment
 }
-declare const VideoImpl: (p: Props) => React.ReactNode
-export default VideoImpl
diff --git a/shared/chat/conversation/messages/text/unfurl/unfurl-list/image/video.desktop.tsx b/shared/chat/conversation/messages/text/unfurl/unfurl-list/image/video.desktop.tsx
index 72c5cc45635f..3c0f18f40a7d 100644
--- a/shared/chat/conversation/messages/text/unfurl/unfurl-list/image/video.desktop.tsx
+++ b/shared/chat/conversation/messages/text/unfurl/unfurl-list/image/video.desktop.tsx
@@ -1,6 +1,6 @@
 import * as React from 'react'
 import * as Kb from '@/common-adapters/index'
-import type {Props} from './video'
+import type {Props} from './video.shared'
 
 export const Video = (p: Props) => {
   const {autoPlay, onClick, height, width, style, url} = p
diff --git a/shared/chat/conversation/messages/text/unfurl/unfurl-list/image/video.native.tsx b/shared/chat/conversation/messages/text/unfurl/unfurl-list/image/video.native.tsx
index 0ccedc80d913..6e29df22dec3 100644
--- a/shared/chat/conversation/messages/text/unfurl/unfurl-list/image/video.native.tsx
+++ b/shared/chat/conversation/messages/text/unfurl/unfurl-list/image/video.native.tsx
@@ -2,7 +2,7 @@ import * as React from 'react'
 import * as Kb from '@/common-adapters/index'
 import logger from '@/logger'
 import {useVideoPlayer, VideoView} from 'expo-video'
-import type {Props} from './video'
+import type {Props} from './video.shared'
 
 export const Video = (props: Props) => {
   const {autoPlay, onClick, url, style, width, height} = props
diff --git a/shared/chat/conversation/messages/text/unfurl/unfurl-list/image/video.d.ts b/shared/chat/conversation/messages/text/unfurl/unfurl-list/image/video.shared.tsx
similarity index 58%
rename from shared/chat/conversation/messages/text/unfurl/unfurl-list/image/video.d.ts
rename to shared/chat/conversation/messages/text/unfurl/unfurl-list/image/video.shared.tsx
index 2f50512c9794..3917b659dd22 100644
--- a/shared/chat/conversation/messages/text/unfurl/unfurl-list/image/video.d.ts
+++ b/shared/chat/conversation/messages/text/unfurl/unfurl-list/image/video.shared.tsx
@@ -1,4 +1,3 @@
-import type * as React from 'react'
 export type Props = {
   autoPlay: boolean
   height: number
@@ -7,4 +6,3 @@ export type Props = {
   url: string
   width: number
 }
-export declare const Video: (p: Props) => React.ReactNode
diff --git a/shared/chat/conversation/messages/wrapper/exploding-height-retainer/index.desktop.tsx b/shared/chat/conversation/messages/wrapper/exploding-height-retainer/index.desktop.tsx
index 577a42d94fa4..4a5c5616de83 100644
--- a/shared/chat/conversation/messages/wrapper/exploding-height-retainer/index.desktop.tsx
+++ b/shared/chat/conversation/messages/wrapper/exploding-height-retainer/index.desktop.tsx
@@ -1,6 +1,6 @@
 import * as React from 'react'
 import * as Kb from '@/common-adapters'
-import type {Props} from '.'
+import type {Props} from './index.shared'
 import {useColorScheme} from 'react-native'
 
 export const animationDuration = 2000
diff --git a/shared/chat/conversation/messages/wrapper/exploding-height-retainer/index.native.tsx b/shared/chat/conversation/messages/wrapper/exploding-height-retainer/index.native.tsx
index c0773cd4bf59..84677ee57f53 100644
--- a/shared/chat/conversation/messages/wrapper/exploding-height-retainer/index.native.tsx
+++ b/shared/chat/conversation/messages/wrapper/exploding-height-retainer/index.native.tsx
@@ -4,7 +4,7 @@ import * as C from '@/constants'
 import {Animated as NativeAnimated, Easing as NativeEasing} from 'react-native'
 // ios must animated plain colors not the dynamic ones
 import colors, {darkColors} from '@/styles/colors'
-import type {Props} from '.'
+import type {Props} from './index.shared'
 import {useColorScheme} from 'react-native'
 
 // If this image changes, some hard coded dimensions
diff --git a/shared/chat/conversation/messages/wrapper/exploding-height-retainer/index.d.ts b/shared/chat/conversation/messages/wrapper/exploding-height-retainer/index.shared.tsx
similarity index 100%
rename from shared/chat/conversation/messages/wrapper/exploding-height-retainer/index.d.ts
rename to shared/chat/conversation/messages/wrapper/exploding-height-retainer/index.shared.tsx
diff --git a/shared/chat/conversation/messages/wrapper/long-pressable/index.desktop.tsx b/shared/chat/conversation/messages/wrapper/long-pressable/index.desktop.tsx
index 3a03695c19e2..059374b8994d 100644
--- a/shared/chat/conversation/messages/wrapper/long-pressable/index.desktop.tsx
+++ b/shared/chat/conversation/messages/wrapper/long-pressable/index.desktop.tsx
@@ -1,6 +1,6 @@
 import type * as React from 'react'
 import * as Kb from '@/common-adapters'
-import type {Props} from '.'
+import type {Props} from './index.shared'
 
 function LongPressable(props: Props & {ref?: React.Ref<Kb.MeasureRef>}) {
   return <Kb.Box2 direction="horizontal" fullWidth={true} {...props} />
diff --git a/shared/chat/conversation/messages/wrapper/long-pressable/index.native.tsx b/shared/chat/conversation/messages/wrapper/long-pressable/index.native.tsx
index 587311f1ae83..358c04a84cc4 100644
--- a/shared/chat/conversation/messages/wrapper/long-pressable/index.native.tsx
+++ b/shared/chat/conversation/messages/wrapper/long-pressable/index.native.tsx
@@ -1,7 +1,7 @@
 import * as Kb from '@/common-adapters'
 import * as React from 'react'
 import * as InputState from '../../../input-area/input-state'
-import type {Props} from '.'
+import type {Props} from './index.shared'
 import {useOrdinal} from '../../ids-context'
 import {useConversationThreadToggleSearch} from '../../../thread-context'
 import Swipeable, {type SwipeableMethods} from '@/common-adapters/swipeable-row.native'
diff --git a/shared/chat/conversation/messages/wrapper/long-pressable/index.d.ts b/shared/chat/conversation/messages/wrapper/long-pressable/index.shared.tsx
similarity index 100%
rename from shared/chat/conversation/messages/wrapper/long-pressable/index.d.ts
rename to shared/chat/conversation/messages/wrapper/long-pressable/index.shared.tsx
diff --git a/shared/chat/conversation/normal/index.d.ts b/shared/chat/conversation/normal/index.shared.tsx
similarity index 100%
rename from shared/chat/conversation/normal/index.d.ts
rename to shared/chat/conversation/normal/index.shared.tsx
diff --git a/shared/chat/conversation/rekey/participant-rekey.d.ts b/shared/chat/conversation/rekey/participant-rekey.d.ts
deleted file mode 100644
index bcebcfb2be06..000000000000
--- a/shared/chat/conversation/rekey/participant-rekey.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import type * as React from 'react'
-import type {Props} from './participant-rekey.types'
-declare const ParticipantRekey: (p: Props) => React.ReactNode
-export default ParticipantRekey
diff --git a/shared/chat/conversation/rekey/participant-rekey.types.d.ts b/shared/chat/conversation/rekey/participant-rekey.types.ts
similarity index 100%
rename from shared/chat/conversation/rekey/participant-rekey.types.d.ts
rename to shared/chat/conversation/rekey/participant-rekey.types.ts
diff --git a/shared/chat/conversation/rekey/you-rekey.d.ts b/shared/chat/conversation/rekey/you-rekey.d.ts
deleted file mode 100644
index a0524ad922a3..000000000000
--- a/shared/chat/conversation/rekey/you-rekey.d.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import type * as React from 'react'
-export type Props = {
-  onEnterPaperkey: () => void
-  onBack: () => void
-  onRekey: () => void
-}
-declare const YouRekey: (p: Props) => React.ReactNode
-export default YouRekey
diff --git a/shared/chat/conversation/rekey/you-rekey.desktop.tsx b/shared/chat/conversation/rekey/you-rekey.desktop.tsx
index a94d727c5281..d4db5ba7beaf 100644
--- a/shared/chat/conversation/rekey/you-rekey.desktop.tsx
+++ b/shared/chat/conversation/rekey/you-rekey.desktop.tsx
@@ -1,5 +1,5 @@
 import * as Kb from '@/common-adapters'
-import type {Props} from './you-rekey'
+import type {Props} from './you-rekey.shared'
 
 const YouRekey = ({onRekey}: Props) => {
   return (
diff --git a/shared/chat/conversation/rekey/you-rekey.native.tsx b/shared/chat/conversation/rekey/you-rekey.native.tsx
index 6bfc0fb4b874..8bb0260369c6 100644
--- a/shared/chat/conversation/rekey/you-rekey.native.tsx
+++ b/shared/chat/conversation/rekey/you-rekey.native.tsx
@@ -1,5 +1,5 @@
 import * as Kb from '@/common-adapters'
-import type {Props} from './you-rekey'
+import type {Props} from './you-rekey.shared'
 
 const YouRekey = ({onEnterPaperkey}: Props) => (
   <Kb.Box2 direction="vertical">
diff --git a/shared/chat/conversation/rekey/you-rekey.shared.tsx b/shared/chat/conversation/rekey/you-rekey.shared.tsx
new file mode 100644
index 000000000000..06cd5c511b2e
--- /dev/null
+++ b/shared/chat/conversation/rekey/you-rekey.shared.tsx
@@ -0,0 +1,5 @@
+export type Props = {
+  onEnterPaperkey: () => void
+  onBack: () => void
+  onRekey: () => void
+}
diff --git a/shared/chat/create-channel/hooks.tsx b/shared/chat/create-channel/hooks.tsx
index 7a346f0095ed..06562100fadb 100644
--- a/shared/chat/create-channel/hooks.tsx
+++ b/shared/chat/create-channel/hooks.tsx
@@ -3,7 +3,7 @@ import * as React from 'react'
 import * as T from '@/constants/types'
 import {RPCError} from '@/util/errors'
 import upperFirst from 'lodash/upperFirst'
-import type {Props} from '.'
+import type {Props} from './index.shared'
 import {useChatTeam} from '../conversation/team-hooks'
 
 export default (p: Props) => {
diff --git a/shared/chat/create-channel/index.desktop.tsx b/shared/chat/create-channel/index.desktop.tsx
index 90dc97cb5476..afe7bc4d9429 100644
--- a/shared/chat/create-channel/index.desktop.tsx
+++ b/shared/chat/create-channel/index.desktop.tsx
@@ -1,6 +1,6 @@
 import * as Kb from '@/common-adapters'
 import * as C from '@/constants'
-import type {Props} from './index'
+import type {Props} from './index.shared'
 import useHook from './hooks'
 
 const CreateChannel = (p: Props) => {
diff --git a/shared/chat/create-channel/index.native.tsx b/shared/chat/create-channel/index.native.tsx
index 66f6167fb2d3..261672e09d15 100644
--- a/shared/chat/create-channel/index.native.tsx
+++ b/shared/chat/create-channel/index.native.tsx
@@ -1,6 +1,6 @@
 import * as Kb from '@/common-adapters'
 import * as C from '@/constants'
-import type {Props} from './index'
+import type {Props} from './index.shared'
 import useHook from './hooks'
 
 const CreateChannel = (p: Props) => {
diff --git a/shared/chat/create-channel/index.d.ts b/shared/chat/create-channel/index.shared.tsx
similarity index 50%
rename from shared/chat/create-channel/index.d.ts
rename to shared/chat/create-channel/index.shared.tsx
index 393df8320e08..9d6f3787922c 100644
--- a/shared/chat/create-channel/index.d.ts
+++ b/shared/chat/create-channel/index.shared.tsx
@@ -1,10 +1,6 @@
-import type * as React from 'react'
 import type * as T from '@/constants/types'
 
 export type Props = {
   navToChatOnSuccess?: boolean
   teamID: T.Teams.TeamID
 }
-
-declare const CreateChannel: (p: Props) => React.ReactNode
-export default CreateChannel
diff --git a/shared/chat/inbox-and-conversation-get-options.tsx b/shared/chat/inbox-and-conversation-get-options.tsx
index b882a3a46ada..302e028c84a8 100644
--- a/shared/chat/inbox-and-conversation-get-options.tsx
+++ b/shared/chat/inbox-and-conversation-get-options.tsx
@@ -1,5 +1,5 @@
 import * as Kb from '@/common-adapters'
-import InboxAndConvoHeader from './inbox-and-conversation-header'
+import InboxAndConvoHeader from '@/chat/inbox-and-conversation-header'
 import {useSafeAreaFrame} from 'react-native-safe-area-context'
 
 function TabletHeader() {
diff --git a/shared/chat/inbox-and-conversation-header.tsx b/shared/chat/inbox-and-conversation-header.tsx
index d47fb36e0df2..70a4d8c801c7 100644
--- a/shared/chat/inbox-and-conversation-header.tsx
+++ b/shared/chat/inbox-and-conversation-header.tsx
@@ -4,18 +4,18 @@ import * as Config from '@/constants/config'
 import * as Kb from '@/common-adapters'
 import * as T from '@/constants/types'
 import type {StyleOverride} from '@/common-adapters/markdown'
-import NewChatButton from './inbox/new-chat-button'
-import {setInboxHeaderPortalNode, useInboxHeaderPortalContent} from './inbox/header-portal-state'
-import type {ChatRootRouteParams} from './inbox-and-conversation'
-import {useChatTeam} from './conversation/team-hooks'
+import NewChatButton from '@/chat/inbox/new-chat-button'
+import {setInboxHeaderPortalNode, useInboxHeaderPortalContent} from '@/chat/inbox/header-portal-state'
+import type {ChatRootRouteParams} from '@/chat/inbox-and-conversation'
+import {useChatTeam} from '@/chat/conversation/team-hooks'
 import {useRoute, type RouteProp} from '@react-navigation/native'
-import {useInboxMetadataState} from './inbox/metadata'
+import {useInboxMetadataState} from '@/chat/inbox/metadata'
 import {useInboxRowsState} from '@/stores/inbox-rows'
 import {useUsersState} from '@/stores/users'
 import {useCurrentUserState} from '@/stores/current-user'
 import {navToPath} from '@/constants/fs'
-import {showConversationInfoPanel, toggleConversationThreadSearch} from './conversation/thread-context'
-import {muteConversation} from './conversation/status-actions'
+import {showConversationInfoPanel, toggleConversationThreadSearch} from '@/chat/conversation/thread-context'
+import {muteConversation} from '@/chat/conversation/status-actions'
 
 type ChatRootRoute = RouteProp<{chatRoot: ChatRootRouteParams}, 'chatRoot'>
 
diff --git a/shared/chat/inbox-and-conversation-shared.tsx b/shared/chat/inbox-and-conversation-shared.tsx
index dd6aee85767c..1eb15071637c 100644
--- a/shared/chat/inbox-and-conversation-shared.tsx
+++ b/shared/chat/inbox-and-conversation-shared.tsx
@@ -4,10 +4,10 @@ import * as Chat from '@/constants/chat'
 import * as Kb from '@/common-adapters'
 import * as React from 'react'
 import type * as T from '@/constants/types'
-import Conversation from './conversation/container'
-import InfoPanel, {type Panel} from './conversation/info-panel'
-import type {ThreadSearchRouteProps} from './conversation/thread-search-route'
-import {useInboxLayoutState} from './inbox/layout-state'
+import Conversation from '@/chat/conversation/container'
+import InfoPanel, {type Panel} from '@/chat/conversation/info-panel'
+import type {ThreadSearchRouteProps} from '@/chat/conversation/thread-search-route'
+import {useInboxLayoutState} from '@/chat/inbox/layout-state'
 import type {NavState} from '@/constants/router'
 import logger from '@/logger'
 
diff --git a/shared/chat/inbox-and-conversation.desktop.tsx b/shared/chat/inbox-and-conversation.desktop.tsx
index ee182300e376..27ea4bc224bd 100644
--- a/shared/chat/inbox-and-conversation.desktop.tsx
+++ b/shared/chat/inbox-and-conversation.desktop.tsx
@@ -1,9 +1,9 @@
 import * as Kb from '@/common-adapters'
-import Inbox from './inbox'
-import {InboxAndConversationShell, type InboxAndConversationProps} from './inbox-and-conversation-shared'
-import {inboxWidth} from './inbox/row/sizes'
-import useInboxHeaderPortal from './inbox/use-header-portal'
-import {useInboxSearch} from './inbox/use-inbox-search'
+import Inbox from '@/chat/inbox'
+import {InboxAndConversationShell, type InboxAndConversationProps} from '@/chat/inbox-and-conversation-shared'
+import {inboxWidth} from '@/chat/inbox/row/sizes'
+import useInboxHeaderPortal from '@/chat/inbox/use-header-portal'
+import {useInboxSearch} from '@/chat/inbox/use-inbox-search'
 
 export default function InboxAndConversationDesktop(props: InboxAndConversationProps) {
   const search = useInboxSearch()
@@ -32,3 +32,5 @@ const styles = Kb.Styles.styleSheetCreate(
       },
     }) as const
 )
+
+export type {ChatRootRouteParams} from '@/chat/inbox-and-conversation-shared'
diff --git a/shared/chat/inbox-and-conversation.native.tsx b/shared/chat/inbox-and-conversation.native.tsx
index 9d091e887f14..1c188f61681a 100644
--- a/shared/chat/inbox-and-conversation.native.tsx
+++ b/shared/chat/inbox-and-conversation.native.tsx
@@ -1,7 +1,7 @@
-import Inbox from './inbox'
-import {InboxAndConversationShell, type InboxAndConversationProps} from './inbox-and-conversation-shared'
-import useInboxHeaderPortal from './inbox/use-header-portal'
-import {useInboxSearch} from './inbox/use-inbox-search'
+import Inbox from '@/chat/inbox'
+import {InboxAndConversationShell, type InboxAndConversationProps} from '@/chat/inbox-and-conversation-shared'
+import useInboxHeaderPortal from '@/chat/inbox/use-header-portal'
+import {useInboxSearch} from '@/chat/inbox/use-inbox-search'
 
 export default function InboxAndConversationNative(props: InboxAndConversationProps) {
   const search = useInboxSearch()
@@ -19,3 +19,5 @@ export default function InboxAndConversationNative(props: InboxAndConversationPr
     </>
   )
 }
+
+export type {ChatRootRouteParams} from '@/chat/inbox-and-conversation-shared'
diff --git a/shared/chat/inbox-and-conversation.tsx b/shared/chat/inbox-and-conversation.tsx
index e18500a7c574..1fb986a7c22f 100644
--- a/shared/chat/inbox-and-conversation.tsx
+++ b/shared/chat/inbox-and-conversation.tsx
@@ -1,11 +1,11 @@
 import * as C from '@/constants'
-import Desktop from './inbox-and-conversation.desktop'
-import Native from './inbox-and-conversation.native'
-import type {InboxAndConversationProps} from './inbox-and-conversation-shared'
+import Desktop from '@/chat/inbox-and-conversation.desktop'
+import Native from '@/chat/inbox-and-conversation.native'
+import type {InboxAndConversationProps} from '@/chat/inbox-and-conversation-shared'
 
 function InboxAndConversation(props: InboxAndConversationProps) {
   return C.isMobile ? <Native {...props} /> : <Desktop {...props} />
 }
 
 export default InboxAndConversation
-export type {ChatRootRouteParams, InboxAndConversationProps} from './inbox-and-conversation-shared'
+export type {ChatRootRouteParams, InboxAndConversationProps} from '@/chat/inbox-and-conversation-shared'
diff --git a/shared/chat/inbox-search/background.d.ts b/shared/chat/inbox-search/background.d.ts
deleted file mode 100644
index 5a40c413050a..000000000000
--- a/shared/chat/inbox-search/background.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import type * as React from 'react'
-declare const Background: () => React.ReactNode
-export default Background
diff --git a/shared/chat/inbox/index.d.ts b/shared/chat/inbox/index.d.ts
deleted file mode 100644
index 760c639820a8..000000000000
--- a/shared/chat/inbox/index.d.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import type * as React from 'react'
-import type {ChatRootInboxRefresh, ConversationIDKey} from '@/constants/types/chat'
-import type {InboxSearchController} from './use-inbox-search'
-
-type Props = {
-  conversationIDKey?: ConversationIDKey
-  refreshInbox?: ChatRootInboxRefresh
-  search?: InboxSearchController
-}
-
-declare const Inbox: (p: Props) => React.ReactNode
-export default Inbox
diff --git a/shared/chat/inbox/row/small-team/swipe-conv-actions/index.desktop.tsx b/shared/chat/inbox/row/small-team/swipe-conv-actions/index.desktop.tsx
index 82e4a7b67753..63ef5ea17d50 100644
--- a/shared/chat/inbox/row/small-team/swipe-conv-actions/index.desktop.tsx
+++ b/shared/chat/inbox/row/small-team/swipe-conv-actions/index.desktop.tsx
@@ -1,6 +1,6 @@
 import * as RowSizes from '../../sizes'
 import * as Kb from '@/common-adapters'
-import type {Props} from '.'
+import type {Props} from './index.shared'
 
 const SwipeConvActions = (props: Props) => {
   return <div style={styles.row}>{props.children}</div>
diff --git a/shared/chat/inbox/row/small-team/swipe-conv-actions/index.native.tsx b/shared/chat/inbox/row/small-team/swipe-conv-actions/index.native.tsx
index 4b317be31950..a7cfe6fecaaf 100644
--- a/shared/chat/inbox/row/small-team/swipe-conv-actions/index.native.tsx
+++ b/shared/chat/inbox/row/small-team/swipe-conv-actions/index.native.tsx
@@ -3,7 +3,7 @@ import * as Kb from '@/common-adapters'
 import * as React from 'react'
 import * as Reanimated from 'react-native-reanimated'
 import * as RowSizes from '../../sizes'
-import type {Props} from '.'
+import type {Props} from './index.shared'
 import {Pressable, View} from 'react-native'
 import Swipeable, {type SwipeableMethods} from '@/common-adapters/swipeable-row.native'
 import {useOpenedRowState} from '../../opened-row-state'
diff --git a/shared/chat/inbox/row/small-team/swipe-conv-actions/index.d.ts b/shared/chat/inbox/row/small-team/swipe-conv-actions/index.shared.tsx
similarity index 100%
rename from shared/chat/inbox/row/small-team/swipe-conv-actions/index.d.ts
rename to shared/chat/inbox/row/small-team/swipe-conv-actions/index.shared.tsx
diff --git a/shared/chat/inbox/use-header-portal.d.ts b/shared/chat/inbox/use-header-portal.d.ts
deleted file mode 100644
index 7c368a6e0392..000000000000
--- a/shared/chat/inbox/use-header-portal.d.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import type * as React from 'react'
-import type {InboxSearchController} from './use-inbox-search'
-
-declare const useInboxHeaderPortal: (search: InboxSearchController) => React.ReactNode
-export default useInboxHeaderPortal
diff --git a/shared/chat/location-map.d.ts b/shared/chat/location-map.d.ts
deleted file mode 100644
index 80826dcc1fd2..000000000000
--- a/shared/chat/location-map.d.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import type * as React from 'react'
-type Props = {
-  height: number
-  mapSrc: string
-  onLoad?: () => void
-  width: number
-}
-declare const LocationMap: (p: Props) => React.ReactNode
-export default LocationMap
diff --git a/shared/chat/location-map.desktop.tsx b/shared/chat/location-map.desktop.tsx
index 4017add5f1e6..8ff53c4186da 100644
--- a/shared/chat/location-map.desktop.tsx
+++ b/shared/chat/location-map.desktop.tsx
@@ -28,7 +28,7 @@ const LocationMap = (props: Props) => {
             bannerColor="white"
             content={[
               'Your location is protected. ',
-              {onClick: () => openURL('https://book.keybase.io/docs/chat/location'), text: 'Learn more'},
+              {onClick: () => { void openURL('https://book.keybase.io/docs/chat/location') }, text: 'Learn more'},
             ]}
           />
         </Kb.Banner>
diff --git a/shared/chat/pdf/index.desktop.tsx b/shared/chat/pdf/index.desktop.tsx
index d60667214d51..1b19c57de018 100644
--- a/shared/chat/pdf/index.desktop.tsx
+++ b/shared/chat/pdf/index.desktop.tsx
@@ -2,7 +2,7 @@ import * as C from '@/constants'
 import * as Kb from '@/common-adapters'
 import * as React from 'react'
 import {useNavigation} from '@react-navigation/native'
-import type {Props} from '.'
+import type {Props} from './index.shared'
 import * as T from '@/constants/types'
 import {openLocalPathInSystemFileManagerDesktop} from '@/util/fs-storeless-actions'
 import {attachmentDownloadMessage, takePDFMessage} from '../conversation/attachment-actions'
diff --git a/shared/chat/pdf/index.native.tsx b/shared/chat/pdf/index.native.tsx
index 9efc20f6e060..74f17ac9b227 100644
--- a/shared/chat/pdf/index.native.tsx
+++ b/shared/chat/pdf/index.native.tsx
@@ -1,6 +1,6 @@
 import * as React from 'react'
 import * as Kb from '@/common-adapters'
-import type {Props} from '.'
+import type {Props} from './index.shared'
 
 const ChatPDF = (props: Props) => {
   const {url} = props
diff --git a/shared/chat/pdf/index.d.ts b/shared/chat/pdf/index.shared.tsx
similarity index 100%
rename from shared/chat/pdf/index.d.ts
rename to shared/chat/pdf/index.shared.tsx
diff --git a/shared/common-adapters/animation.desktop.tsx b/shared/common-adapters/animation.desktop.tsx
index b3017ace0a34..d01196d9c37c 100644
--- a/shared/common-adapters/animation.desktop.tsx
+++ b/shared/common-adapters/animation.desktop.tsx
@@ -1,7 +1,8 @@
 import * as React from 'react'
 import {Box2} from './box'
 import lottie from 'lottie-web'
-import type {Props, AnimationType} from './animation'
+import type {Props, AnimationType} from './animation.shared'
+export type {AnimationType} from './animation.shared'
 
 const defaultDimension = 16
 
diff --git a/shared/common-adapters/animation.native.tsx b/shared/common-adapters/animation.native.tsx
index a5f1151bbedf..d70ecddc860a 100644
--- a/shared/common-adapters/animation.native.tsx
+++ b/shared/common-adapters/animation.native.tsx
@@ -1,7 +1,7 @@
 import * as React from 'react'
 import {Box2} from './box'
 import LottieView from 'lottie-react-native'
-import type {Props, AnimationType} from './animation'
+import type {Props, AnimationType} from './animation.shared'
 // prettier-ignore
 type AnimationObject = {
   v: string; fr: number; ip: number; op: number; w: number; h: number;
diff --git a/shared/common-adapters/animation.d.ts b/shared/common-adapters/animation.shared.tsx
similarity index 86%
rename from shared/common-adapters/animation.d.ts
rename to shared/common-adapters/animation.shared.tsx
index ee35e14884e5..cef87713f557 100644
--- a/shared/common-adapters/animation.d.ts
+++ b/shared/common-adapters/animation.shared.tsx
@@ -1,4 +1,3 @@
-import type * as React from 'react'
 import type * as Styles from '@/styles'
 
 export type AnimationType =
@@ -30,6 +29,3 @@ export type Props = {
   style?: Styles.StylesCrossPlatform
   width?: number
 }
-
-declare const Animation: (p: Props) => React.ReactNode
-export default Animation
diff --git a/shared/common-adapters/avatar/index.d.ts b/shared/common-adapters/avatar/index.d.ts
deleted file mode 100644
index 31e4ea71bb51..000000000000
--- a/shared/common-adapters/avatar/index.d.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import type * as React from 'react'
-import type * as Styles from '@/styles'
-import type * as T from '@/constants/types'
-
-type Props = {
-  children?: React.ReactNode
-  crop?: T.Teams.AvatarCrop
-  imageOverrideUrl?: string
-  isTeam?: boolean
-  onClick?: ((e?: React.BaseSyntheticEvent) => void) | 'profile'
-  size: 128 | 96 | 64 | 48 | 32 | 24 | 16
-  style?: Styles.CustomStyles<'borderStyle'>
-  teamname?: string
-  username?: string
-}
-
-declare const Avatar: (p: Props) => React.ReactNode
-export default Avatar
diff --git a/shared/common-adapters/back-button.desktop.tsx b/shared/common-adapters/back-button.desktop.tsx
index 59fffa854fa9..78f3ae7a035c 100644
--- a/shared/common-adapters/back-button.desktop.tsx
+++ b/shared/common-adapters/back-button.desktop.tsx
@@ -3,7 +3,7 @@ import type * as React from 'react'
 import * as Styles from '@/styles'
 import Icon from './icon'
 import Text from './text'
-import type {Props} from './back-button'
+import type {Props} from './back-button.shared'
 
 const Kb = {
   Icon,
diff --git a/shared/common-adapters/back-button.native.tsx b/shared/common-adapters/back-button.native.tsx
index 4c0ac9d804bf..ee330bd4ad6b 100644
--- a/shared/common-adapters/back-button.native.tsx
+++ b/shared/common-adapters/back-button.native.tsx
@@ -4,7 +4,7 @@ import Badge from './badge'
 import {Box2} from './box'
 import Icon from './icon'
 import * as Styles from '@/styles'
-import type {Props} from './back-button'
+import type {Props} from './back-button.shared'
 import noop from 'lodash/noop'
 
 const Kb = {
diff --git a/shared/common-adapters/back-button.d.ts b/shared/common-adapters/back-button.shared.tsx
similarity index 59%
rename from shared/common-adapters/back-button.d.ts
rename to shared/common-adapters/back-button.shared.tsx
index 0a937a328fc2..6177a8a5ea8d 100644
--- a/shared/common-adapters/back-button.d.ts
+++ b/shared/common-adapters/back-button.shared.tsx
@@ -1,10 +1,9 @@
-import type * as React from 'react'
 import type {Color, StylesCrossPlatform} from '@/styles'
 
 export type Props = {
   badgeNumber?: number
   hideBackLabel?: boolean
-  onClick?: () => void // if undefined will give you a navigate up
+  onClick?: () => void
   disabled?: boolean
   onPress?: never
   iconColor?: Color
@@ -12,6 +11,3 @@ export type Props = {
   style?: StylesCrossPlatform
   title?: string
 }
-
-declare const BackButton: (p: Props) => React.ReactNode
-export default BackButton
diff --git a/shared/common-adapters/bottom-accessory.d.ts b/shared/common-adapters/bottom-accessory.d.ts
deleted file mode 100644
index ced298e315a9..000000000000
--- a/shared/common-adapters/bottom-accessory.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import type * as React from 'react'
-
-export declare const BottomAccessory: (p: {children: React.ReactNode}) => React.ReactNode
diff --git a/shared/common-adapters/box.d.ts b/shared/common-adapters/box.d.ts
deleted file mode 100644
index 9f437f627c27..000000000000
--- a/shared/common-adapters/box.d.ts
+++ /dev/null
@@ -1,53 +0,0 @@
-import type * as React from 'react'
-import type {StylesCrossPlatform, globalMargins} from '@/styles'
-import type {NativeSyntheticEvent} from 'react-native'
-import type {MeasureRef} from './measure-ref'
-
-export type LayoutEvent = NativeSyntheticEvent<{
-  layout: {
-    x: number
-    y: number
-    width: number
-    height: number
-  }
-}>
-
-export type Box2Props = {
-  alignItems?: 'center' | 'flex-start' | 'flex-end' | 'stretch'
-  alignSelf?: 'center' | 'flex-start' | 'flex-end' | 'stretch'
-  children?: React.ReactNode
-  centerChildren?: boolean
-  className?: string
-  collapsable?: boolean
-  direction: 'horizontal' | 'vertical' | 'horizontalReverse' | 'verticalReverse'
-  flex?: number
-  fullHeight?: boolean
-  fullWidth?: boolean
-  justifyContent?: 'center' | 'flex-start' | 'flex-end' | 'space-between' | 'space-around' | 'space-evenly'
-  noShrink?: boolean
-  overflow?: 'hidden' | 'scroll' | 'visible' | 'auto'
-  onDragLeave?: (syntheticDragEvent: React.DragEvent) => void // desktop only
-  onDragOver?: (syntheticDragEvent: React.DragEvent) => void // desktop only
-  onDrop?: (syntheticDragEvent: React.DragEvent) => void // desktop only
-  onLayout?: (evt: LayoutEvent) => void // mobile only
-  onMouseDown?: (syntheticEvent: React.MouseEvent) => void // desktop only
-  onMouseMove?: (syntheticEvent: React.MouseEvent) => void // desktop only
-  onMouseLeave?: (syntheticEvent: React.MouseEvent) => void // desktop only
-  onMouseUp?: (syntheticEvent: React.MouseEvent) => void // desktop only
-  onMouseOver?: (syntheticEvent: React.MouseEvent) => void // desktop only
-  onCopyCapture?: (syntheticEvent: React.SyntheticEvent) => void // desktop only
-  onContextMenu?: () => void // desktop only
-  padding?: keyof typeof globalMargins
-  pointerEvents?: 'none' | 'box-none'
-  relative?: boolean
-  style?: StylesCrossPlatform
-  gap?: keyof typeof globalMargins
-  gapStart?: boolean
-  gapEnd?: boolean
-  title?: string
-  tooltip?: string
-}
-
-export declare function Box2(p: Box2Props & {ref?: React.Ref<MeasureRef>}): React.ReactNode
-// wrapped by reanimated
-export declare function Box2Animated(p: Box2Props & {ref?: React.Ref<MeasureRef>}): React.ReactNode
diff --git a/shared/common-adapters/box.desktop.tsx b/shared/common-adapters/box.desktop.tsx
index 340484d75c1f..ec252a3dcc2f 100644
--- a/shared/common-adapters/box.desktop.tsx
+++ b/shared/common-adapters/box.desktop.tsx
@@ -1,9 +1,10 @@
 import type * as React from 'react'
 import * as Styles from '@/styles'
-import type {Box2Props} from './box'
+import type {Box2Props, MeasureRef} from './box.shared'
+export type {LayoutEvent} from './box.shared'
 import './box.css'
 
-export const Box2 = (p: Box2Props & {ref?: React.Ref<HTMLDivElement>}) => {
+export const Box2 = (p: Box2Props & {ref?: React.Ref<MeasureRef>}) => {
   const {direction, fullHeight, fullWidth, centerChildren, alignSelf, alignItems, noShrink, ref} = p
   const {flex, justifyContent, overflow, padding, relative} = p
   const {onMouseMove, onMouseDown, onMouseLeave, onMouseUp, onMouseOver, onCopyCapture, children} = p
@@ -45,7 +46,7 @@ export const Box2 = (p: Box2Props & {ref?: React.Ref<HTMLDivElement>}) => {
 
   return (
     <div
-      ref={ref}
+      ref={ref as React.Ref<HTMLDivElement>}
       className={className}
       data-tooltip={tooltip}
       onContextMenu={onContextMenu}
diff --git a/shared/common-adapters/box.native.tsx b/shared/common-adapters/box.native.tsx
index 1710054ce49e..b05214eae4e7 100644
--- a/shared/common-adapters/box.native.tsx
+++ b/shared/common-adapters/box.native.tsx
@@ -1,8 +1,10 @@
 import type * as React from 'react'
 import * as Styles from '@/styles'
 import {View} from 'react-native'
-import type {Box2Props} from './box'
 import Reanimated from 'react-native-reanimated'
+import type {MeasureRef} from '@/common-adapters/measure-ref'
+import type {Box2Props} from '@/common-adapters/box.shared'
+
 
 type Margins = keyof typeof Styles.globalMargins
 const marginKeys = Object.keys(Styles.globalMargins) as Array<Margins>
@@ -136,16 +138,16 @@ const useBox2Shared = (p: Box2Props) => {
   }
 }
 
-export const Box2 = (p: Box2Props & {ref?: React.Ref<View>}) => {
+export const Box2 = (p: Box2Props & {ref?: React.Ref<MeasureRef>}) => {
   const {ref, ...rest} = p
   const props = useBox2Shared(rest)
-  return <View {...props} ref={ref} />
+  return <View {...props} ref={ref as React.Ref<View>} />
 }
 
-export const Box2Animated = (p: Box2Props & {ref?: React.Ref<View>}) => {
+export const Box2Animated = (p: Box2Props & {ref?: React.Ref<MeasureRef>}) => {
   const {ref, ...rest} = p
   const props = useBox2Shared(rest)
-  return <Reanimated.View {...props} ref={ref} />
+  return <Reanimated.View {...props} ref={ref as React.Ref<View>} />
 }
 
 
@@ -201,3 +203,5 @@ const styles = {
   },
 } as const
 
+
+export type * from '@/common-adapters/box.shared'
diff --git a/shared/common-adapters/box.shared.tsx b/shared/common-adapters/box.shared.tsx
new file mode 100644
index 000000000000..bcdfd3cfcdaf
--- /dev/null
+++ b/shared/common-adapters/box.shared.tsx
@@ -0,0 +1,49 @@
+import type {NativeSyntheticEvent} from 'react-native'
+import type * as React from 'react'
+import type * as Styles from '@/styles'
+export type {MeasureRef} from './measure-ref'
+
+export type Box2Props = {
+  alignItems?: 'center' | 'flex-start' | 'flex-end' | 'stretch'
+  alignSelf?: 'center' | 'flex-start' | 'flex-end' | 'stretch'
+  children?: React.ReactNode
+  centerChildren?: boolean
+  className?: string
+  collapsable?: boolean
+  direction: 'horizontal' | 'vertical' | 'horizontalReverse' | 'verticalReverse'
+  flex?: number
+  fullHeight?: boolean
+  fullWidth?: boolean
+  justifyContent?: 'center' | 'flex-start' | 'flex-end' | 'space-between' | 'space-around' | 'space-evenly'
+  noShrink?: boolean
+  overflow?: 'hidden' | 'scroll' | 'visible' | 'auto'
+  onDragLeave?: (syntheticDragEvent: React.DragEvent) => void
+  onDragOver?: (syntheticDragEvent: React.DragEvent) => void
+  onDrop?: (syntheticDragEvent: React.DragEvent) => void
+  onLayout?: (evt: LayoutEvent) => void
+  onMouseDown?: (syntheticEvent: React.MouseEvent) => void
+  onMouseMove?: (syntheticEvent: React.MouseEvent) => void
+  onMouseLeave?: (syntheticEvent: React.MouseEvent) => void
+  onMouseUp?: (syntheticEvent: React.MouseEvent) => void
+  onMouseOver?: (syntheticEvent: React.MouseEvent) => void
+  onCopyCapture?: (syntheticEvent: React.SyntheticEvent) => void
+  onContextMenu?: () => void
+  padding?: keyof typeof Styles.globalMargins
+  pointerEvents?: 'none' | 'box-none'
+  relative?: boolean
+  style?: Styles.StylesCrossPlatform
+  gap?: keyof typeof Styles.globalMargins
+  gapStart?: boolean
+  gapEnd?: boolean
+  title?: string
+  tooltip?: string
+}
+
+export type LayoutEvent = NativeSyntheticEvent<{
+  layout: {
+    x: number
+    y: number
+    width: number
+    height: number
+  }
+}>
diff --git a/shared/common-adapters/checkbox.desktop.tsx b/shared/common-adapters/checkbox.desktop.tsx
index b70546b82229..e425cb3c1a73 100644
--- a/shared/common-adapters/checkbox.desktop.tsx
+++ b/shared/common-adapters/checkbox.desktop.tsx
@@ -2,7 +2,7 @@ import {Box2} from './box'
 import ClickableBox from './clickable-box'
 import Icon from './icon'
 import Text from './text'
-import type {Props} from './checkbox'
+import type {Props} from './checkbox.shared'
 import * as Styles from '@/styles'
 
 const Kb = {
diff --git a/shared/common-adapters/checkbox.native.tsx b/shared/common-adapters/checkbox.native.tsx
index 90203fc12c98..c18b604fa8bb 100644
--- a/shared/common-adapters/checkbox.native.tsx
+++ b/shared/common-adapters/checkbox.native.tsx
@@ -1,7 +1,22 @@
-import Switch from './switch'
-import type {Props} from './checkbox'
+import type {TextType} from '@/common-adapters/text.shared'
+import type * as React from 'react'
+import Switch from '@/common-adapters/switch'
 import * as Styles from '@/styles'
 
+
+type Props = {
+  key?: string
+  label?: string | React.ReactNode
+  checkboxColor?: Styles.Color
+  checkboxStyle?: Styles.StylesCrossPlatform
+  labelComponent?: React.ReactNode
+  labelSubtitle?: string
+  labelType?: TextType
+  onCheck?: (newCheckedValue: boolean) => void
+  checked: boolean
+  style?: Styles.StylesCrossPlatform
+  disabled?: boolean
+}
 const Checkbox = (props: Props) => (
   <Switch
     align="left"
diff --git a/shared/common-adapters/checkbox.d.ts b/shared/common-adapters/checkbox.shared.tsx
similarity index 85%
rename from shared/common-adapters/checkbox.d.ts
rename to shared/common-adapters/checkbox.shared.tsx
index cbd54309781c..7e7e1c2e190c 100644
--- a/shared/common-adapters/checkbox.d.ts
+++ b/shared/common-adapters/checkbox.shared.tsx
@@ -15,6 +15,3 @@ export type Props = {
   style?: Styles.StylesCrossPlatform
   disabled?: boolean
 }
-
-declare const Checkbox: (p: Props) => React.ReactNode
-export default Checkbox
diff --git a/shared/common-adapters/choice-list.desktop.tsx b/shared/common-adapters/choice-list.desktop.tsx
index 5d07c0bab540..94795be14a1e 100644
--- a/shared/common-adapters/choice-list.desktop.tsx
+++ b/shared/common-adapters/choice-list.desktop.tsx
@@ -3,7 +3,7 @@ import ClickableBox from './clickable-box'
 import Text from './text'
 import IconAuto from './icon-auto'
 import * as Styles from '@/styles'
-import type {Props} from './choice-list'
+import type {Props} from './choice-list.shared'
 import './choice-list.css'
 
 const Kb = {
diff --git a/shared/common-adapters/choice-list.native.tsx b/shared/common-adapters/choice-list.native.tsx
index c4b1887757f9..83ddd130230f 100644
--- a/shared/common-adapters/choice-list.native.tsx
+++ b/shared/common-adapters/choice-list.native.tsx
@@ -4,7 +4,7 @@ import IconAuto from './icon-auto'
 import Text from './text'
 import * as React from 'react'
 import * as Styles from '@/styles'
-import type {Props} from './choice-list'
+import type {Props} from './choice-list.shared'
 
 const Kb = {Box2, ClickableBox, IconAuto, Text}
 
diff --git a/shared/common-adapters/choice-list.d.ts b/shared/common-adapters/choice-list.shared.tsx
similarity index 63%
rename from shared/common-adapters/choice-list.d.ts
rename to shared/common-adapters/choice-list.shared.tsx
index b65f8efd870c..5212cb6183a0 100644
--- a/shared/common-adapters/choice-list.d.ts
+++ b/shared/common-adapters/choice-list.shared.tsx
@@ -1,4 +1,3 @@
-import type * as React from 'react'
 import type {IconType} from './icon'
 
 export type Option = {
@@ -12,6 +11,3 @@ export type Option = {
 export type Props = {
   options: Array<Option>
 }
-
-declare const ChoiceList: (p: Props) => React.ReactNode
-export default ChoiceList
diff --git a/shared/common-adapters/clickable-box.desktop.tsx b/shared/common-adapters/clickable-box.desktop.tsx
index a603505410ee..137b097488d3 100644
--- a/shared/common-adapters/clickable-box.desktop.tsx
+++ b/shared/common-adapters/clickable-box.desktop.tsx
@@ -1,11 +1,11 @@
 import * as React from 'react'
 import * as Styles from '@/styles'
-import type {Props as _Props, Props2} from './clickable-box'
+import type {Props as _Props, Props2, MeasureRef} from './clickable-box.shared'
 import type {_StylesCrossPlatform} from '@/styles/css'
 
 type Props = _Props & {children: React.ReactNode}
 
-const ClickableBox = (props: Props & {ref?: React.Ref<HTMLDivElement | null>}) => {
+const ClickableBox = (props: Props & {ref?: React.Ref<MeasureRef | null>}) => {
   const {ref} = props
   const [mouseDown, setMouseDown] = React.useState(false)
   const [mouseIn, setMouseIn] = React.useState(false)
@@ -80,7 +80,7 @@ const ClickableBox = (props: Props & {ref?: React.Ref<HTMLDivElement | null>}) =
 
   return (
     <div
-      ref={ref}
+      ref={ref as React.Ref<HTMLDivElement>}
       className={Styles.classNames(className, {tooltip})}
       data-tooltip={tooltip}
       {...passThroughProps}
@@ -132,14 +132,14 @@ const styles = Styles.styleSheetCreate(
 
 export default ClickableBox
 
-export const ClickableBox2 = (p: Props2 & {ref?: React.Ref<HTMLDivElement | null>}) => {
+export const ClickableBox2 = (p: Props2 & {ref?: React.Ref<MeasureRef | null>}) => {
   const {onClick, children, style, className, onMouseOver, ref} = p
   return (
     <div
       onClick={onClick}
       onMouseOver={onMouseOver}
       style={Styles.castStyleDesktop(style)}
-      ref={ref}
+      ref={ref as React.Ref<HTMLDivElement>}
       className={Styles.classNames('clickable-box2', className)}
     >
       {children}
diff --git a/shared/common-adapters/clickable-box.native.tsx b/shared/common-adapters/clickable-box.native.tsx
index c51467345815..8a08ad27217e 100644
--- a/shared/common-adapters/clickable-box.native.tsx
+++ b/shared/common-adapters/clickable-box.native.tsx
@@ -1,11 +1,48 @@
+import type * as React from 'react'
 import * as Styles from '@/styles'
 import {Pressable, View, TouchableOpacity, TouchableWithoutFeedback} from 'react-native'
-import type {Props, Props2} from './clickable-box'
+import type {MeasureRef} from '@/common-adapters/measure-ref'
+
+type Props = {
+  className?: string
+  children?: React.ReactNode
+  style?: Styles.StylesCrossPlatform
+  onClick?: (event: React.BaseSyntheticEvent) => void
+  onDoubleClick?: (event: React.BaseSyntheticEvent) => void
+  onPress?: never
+  onLongPress?: (event: React.BaseSyntheticEvent) => void
+  underlayColor?: string
+  onPressIn?: () => void
+  onPressOut?: () => void
+  feedback?: boolean
+  activeOpacity?: number
+  hoverColor?: string
+  onMouseOver?: (event: React.MouseEvent) => void
+  onMouseEnter?: (event: React.MouseEvent) => void
+  onMouseLeave?: (event: React.MouseEvent) => void
+  onMouseDown?: (event: React.MouseEvent) => void
+  onMouseMove?: (event: React.MouseEvent) => void
+  onMouseUp?: (event: React.MouseEvent) => void
+  title?: string
+  tooltip?: string
+}
+
+type Props2 = {
+  onLongPress?: () => void
+  hitSlop?: number
+  testID?: string
+  onMouseOver?: (event: React.MouseEvent) => void
+  onClick?: () => void
+  children: React.ReactNode
+  className?: string
+  style?: Styles.StylesCrossPlatform
+  ref?: React.Ref<MeasureRef>
+}
 const Kb = {
   Styles,
 }
 
-const ClickableBox = (props: Props) => {
+const ClickableBox = (props: Props & {ref?: React.Ref<MeasureRef>}) => {
   const {feedback = true, onClick, onPressIn, onPressOut, onLongPress} = props
   const {style, activeOpacity, children} = props
 
diff --git a/shared/common-adapters/clickable-box.d.ts b/shared/common-adapters/clickable-box.shared.tsx
similarity index 78%
rename from shared/common-adapters/clickable-box.d.ts
rename to shared/common-adapters/clickable-box.shared.tsx
index 2cb2268cc419..e5af850279d9 100644
--- a/shared/common-adapters/clickable-box.d.ts
+++ b/shared/common-adapters/clickable-box.shared.tsx
@@ -1,6 +1,7 @@
 import type * as React from 'react'
 import type * as Styles from '@/styles'
 import type {MeasureRef} from './measure-ref'
+
 export type Props = {
   className?: string
   children?: React.ReactNode
@@ -12,10 +13,8 @@ export type Props = {
   underlayColor?: string
   onPressIn?: () => void
   onPressOut?: () => void
-  // mobile only
   feedback?: boolean
   activeOpacity?: number
-  // desktop only
   hoverColor?: string
   onMouseOver?: (event: React.MouseEvent) => void
   onMouseEnter?: (event: React.MouseEvent) => void
@@ -28,19 +27,14 @@ export type Props = {
 }
 
 export type Props2 = {
-  // mobile only
   onLongPress?: () => void
   hitSlop?: number
   testID?: string
-  // desktop only
   onMouseOver?: (event: React.MouseEvent) => void
-
   onClick?: () => void
   children: React.ReactNode
   className?: string
   style?: Styles.StylesCrossPlatform
 }
 
-export declare function ClickableBox(props: Props & {ref?: React.Ref<MeasureRef>}): React.ReactNode
-export declare function ClickableBox2(props: Props2 & {ref?: React.Ref<MeasureRef | null>}): React.ReactNode
-export default ClickableBox
+export type {MeasureRef}
diff --git a/shared/common-adapters/copyable-text.d.ts b/shared/common-adapters/copyable-text.d.ts
deleted file mode 100644
index 78566e98a8a8..000000000000
--- a/shared/common-adapters/copyable-text.d.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import type * as React from 'react'
-
-export type Props = {
-  value: string
-  style?: object
-}
-
-declare const CopyableText: (p: Props) => React.ReactNode
-export default CopyableText
diff --git a/shared/common-adapters/copyable-text.desktop.tsx b/shared/common-adapters/copyable-text.desktop.tsx
index fed8a6fdec09..aab2746a06ec 100644
--- a/shared/common-adapters/copyable-text.desktop.tsx
+++ b/shared/common-adapters/copyable-text.desktop.tsx
@@ -1,5 +1,5 @@
 import * as Styles from '@/styles'
-import type {Props} from './copyable-text'
+import type {Props} from './copyable-text.shared'
 
 const CopyableText = ({value, style}: Props) => {
   return (
diff --git a/shared/common-adapters/copyable-text.native.tsx b/shared/common-adapters/copyable-text.native.tsx
index a88aa2ed2d09..24ed525122ea 100644
--- a/shared/common-adapters/copyable-text.native.tsx
+++ b/shared/common-adapters/copyable-text.native.tsx
@@ -1,5 +1,5 @@
 import * as React from 'react'
-import type {Props as PropsCommon} from './copyable-text'
+import type {Props as PropsCommon} from './copyable-text.shared'
 import {useTimeout} from './use-timers'
 import Text from './text'
 import {Box2} from './box'
@@ -8,7 +8,7 @@ import * as Styles from '@/styles'
 import * as Clipboard from 'expo-clipboard'
 
 export type Props = {
-  textStyle: object
+  textStyle?: object
 } & PropsCommon
 
 const CopyableText = (props: Props) => {
diff --git a/shared/common-adapters/copyable-text.shared.tsx b/shared/common-adapters/copyable-text.shared.tsx
new file mode 100644
index 000000000000..759a934932f6
--- /dev/null
+++ b/shared/common-adapters/copyable-text.shared.tsx
@@ -0,0 +1,4 @@
+export type Props = {
+  value: string
+  style?: object
+}
diff --git a/shared/common-adapters/divider.tsx b/shared/common-adapters/divider.tsx
index b8af2e5ec1ee..e1cd13442485 100644
--- a/shared/common-adapters/divider.tsx
+++ b/shared/common-adapters/divider.tsx
@@ -1,7 +1,8 @@
 import {Box2} from './box'
 import * as Styles from '@/styles'
+import type {StylesCrossPlatform} from '@/styles'
 
-import type {Props} from './divider.d'
+type Props = {style?: StylesCrossPlatform; vertical?: boolean}
 
 const Divider = (props: Props) => (
   <Box2
diff --git a/shared/common-adapters/drag-and-drop.desktop.tsx b/shared/common-adapters/drag-and-drop.desktop.tsx
index 6750a3f5fa22..34a9b3a23d7c 100644
--- a/shared/common-adapters/drag-and-drop.desktop.tsx
+++ b/shared/common-adapters/drag-and-drop.desktop.tsx
@@ -5,7 +5,7 @@ import {Box2} from './box'
 import Icon from './icon'
 import Text from './text'
 import logger from '@/logger'
-import type {Props} from './drag-and-drop'
+import type {Props} from './drag-and-drop.shared'
 import KB2 from '@/util/electron.desktop'
 
 const {isDirectory, getPathForFile} = KB2.functions
diff --git a/shared/common-adapters/drag-and-drop.native.tsx b/shared/common-adapters/drag-and-drop.native.tsx
index e6d3520a643d..6da4a3f44a06 100644
--- a/shared/common-adapters/drag-and-drop.native.tsx
+++ b/shared/common-adapters/drag-and-drop.native.tsx
@@ -1,4 +1,4 @@
-import type {Props} from './drag-and-drop'
+import type {Props} from './drag-and-drop.shared'
 
 const RenderChildren = (props: Props): React.ReactNode => props.children || null
 
diff --git a/shared/common-adapters/drag-and-drop.d.ts b/shared/common-adapters/drag-and-drop.shared.tsx
similarity index 80%
rename from shared/common-adapters/drag-and-drop.d.ts
rename to shared/common-adapters/drag-and-drop.shared.tsx
index b640897f835f..50f1b4d69011 100644
--- a/shared/common-adapters/drag-and-drop.d.ts
+++ b/shared/common-adapters/drag-and-drop.shared.tsx
@@ -12,6 +12,3 @@ export type Props = {
   prompt?: string
   rejectReason?: string
 }
-
-declare const DragAndDrop: (p: Props) => React.ReactNode
-export default DragAndDrop
diff --git a/shared/common-adapters/emoji/custom-emoji.desktop.tsx b/shared/common-adapters/emoji/custom-emoji.desktop.tsx
index 3f0a7d0d2d2e..b98d5d2c399a 100644
--- a/shared/common-adapters/emoji/custom-emoji.desktop.tsx
+++ b/shared/common-adapters/emoji/custom-emoji.desktop.tsx
@@ -2,7 +2,7 @@ import * as Styles from '@/styles'
 import {Box2} from '@/common-adapters/box'
 import WithTooltip from '@/common-adapters/with-tooltip'
 import Image from '@/common-adapters/image'
-import type {Props} from './custom-emoji'
+import type {Props} from './custom-emoji.shared'
 
 const Kb = {
   Box2,
diff --git a/shared/common-adapters/emoji/custom-emoji.native.tsx b/shared/common-adapters/emoji/custom-emoji.native.tsx
index 5667c0c3f6ba..e24155063b41 100644
--- a/shared/common-adapters/emoji/custom-emoji.native.tsx
+++ b/shared/common-adapters/emoji/custom-emoji.native.tsx
@@ -1,4 +1,4 @@
-import type {Props} from './custom-emoji'
+import type {Props} from './custom-emoji.shared'
 import Image from '@/common-adapters/image'
 import * as Styles from '@/styles'
 
diff --git a/shared/common-adapters/emoji/custom-emoji.d.ts b/shared/common-adapters/emoji/custom-emoji.shared.tsx
similarity index 63%
rename from shared/common-adapters/emoji/custom-emoji.d.ts
rename to shared/common-adapters/emoji/custom-emoji.shared.tsx
index 69fb26f5ff66..38a48d053bf2 100644
--- a/shared/common-adapters/emoji/custom-emoji.d.ts
+++ b/shared/common-adapters/emoji/custom-emoji.shared.tsx
@@ -6,6 +6,3 @@ export type Props = {
   alias?: string
   style?: Styles.StylesCrossPlatform
 }
-
-declare const CustomEmoji: (p: Props) => React.ReactNode
-export default CustomEmoji
diff --git a/shared/common-adapters/emoji/native-emoji.d.ts b/shared/common-adapters/emoji/native-emoji.d.ts
deleted file mode 100644
index 31faed7c1e37..000000000000
--- a/shared/common-adapters/emoji/native-emoji.d.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import type * as React from 'react'
-import type {StylesCrossPlatform} from '@/styles'
-
-export type Props = {
-  size: 16 | 18 | 22 | 24 | 26 | 28 | 32 | 36
-  emojiName: string
-  disableSelecting?: boolean // desktop only - helps with chrome copy/paste bug workarounds
-  allowFontScaling?: boolean
-  style?: StylesCrossPlatform
-}
-
-declare const Emoji: (p: Props) => React.ReactNode
-export default Emoji
diff --git a/shared/common-adapters/emoji/native-emoji.desktop.tsx b/shared/common-adapters/emoji/native-emoji.desktop.tsx
index 03545853f377..04d5c4935b7b 100644
--- a/shared/common-adapters/emoji/native-emoji.desktop.tsx
+++ b/shared/common-adapters/emoji/native-emoji.desktop.tsx
@@ -1,4 +1,4 @@
-import type {Props} from './native-emoji'
+import type {Props} from './native-emoji.shared'
 import {type EmojiData} from '.'
 import {emojiData} from './data'
 import {spriteSheetWidth, spriteSheetHeight} from '../markdown/emoji-gen'
diff --git a/shared/common-adapters/emoji/native-emoji.native.tsx b/shared/common-adapters/emoji/native-emoji.native.tsx
index 6e871e7e69fb..9be458f62d15 100644
--- a/shared/common-adapters/emoji/native-emoji.native.tsx
+++ b/shared/common-adapters/emoji/native-emoji.native.tsx
@@ -3,7 +3,7 @@ import {isAndroid} from '@/constants/platform'
 import {emojiIndexByName} from '../markdown/emoji-gen'
 import Text from '../text'
 
-import type {Props} from './native-emoji'
+import type {Props} from './native-emoji.shared'
 
 const sizes = [16, 18, 22, 24, 26, 28, 32, 36] as const
 const sizeStyle = new Map<(typeof sizes)[number], Styles.StylesCrossPlatform>(
diff --git a/shared/common-adapters/emoji/native-emoji.shared.tsx b/shared/common-adapters/emoji/native-emoji.shared.tsx
new file mode 100644
index 000000000000..4b9e541a1578
--- /dev/null
+++ b/shared/common-adapters/emoji/native-emoji.shared.tsx
@@ -0,0 +1,9 @@
+import type * as Styles from '@/styles'
+
+export type Props = {
+  size: 16 | 18 | 22 | 24 | 26 | 28 | 32 | 36
+  emojiName: string
+  disableSelecting?: boolean
+  allowFontScaling?: boolean
+  style?: Styles.StylesCrossPlatform
+}
diff --git a/shared/common-adapters/floating-menu/index.tsx b/shared/common-adapters/floating-menu/index.tsx
index 5ce05ce5f9aa..e44108ec5b62 100644
--- a/shared/common-adapters/floating-menu/index.tsx
+++ b/shared/common-adapters/floating-menu/index.tsx
@@ -1,7 +1,8 @@
 import * as React from 'react'
 import Popup from '../popup'
 import type {MeasureRef} from '@/common-adapters/measure-ref'
-import MenuLayout, {type MenuItems as _MenuItems} from './menu-layout'
+import MenuLayout from './menu-layout'
+import type {MenuItems as _MenuItems} from './menu-layout/index.shared'
 import * as Styles from '@/styles'
 import {useNavigation, type NavigationProp, type ParamListBase} from '@react-navigation/native'
 
diff --git a/shared/common-adapters/floating-menu/menu-layout/index.desktop.tsx b/shared/common-adapters/floating-menu/menu-layout/index.desktop.tsx
index b2cc909ddbb2..9ba52728eaf9 100644
--- a/shared/common-adapters/floating-menu/menu-layout/index.desktop.tsx
+++ b/shared/common-adapters/floating-menu/menu-layout/index.desktop.tsx
@@ -1,5 +1,6 @@
 import type * as React from 'react'
-import type {MenuLayoutProps, MenuItem} from '.'
+import type {MenuLayoutProps, MenuItem} from './index.shared'
+export type {MenuItem, MenuItems, MenuLayoutProps, _InnerMenuItem} from './index.shared'
 import {Box2} from '@/common-adapters/box'
 import ClickableBox from '@/common-adapters/clickable-box'
 import Divider from '@/common-adapters/divider'
diff --git a/shared/common-adapters/floating-menu/menu-layout/index.native.tsx b/shared/common-adapters/floating-menu/menu-layout/index.native.tsx
index b5ad9c8e14be..1f7756f2ffee 100644
--- a/shared/common-adapters/floating-menu/menu-layout/index.native.tsx
+++ b/shared/common-adapters/floating-menu/menu-layout/index.native.tsx
@@ -11,7 +11,7 @@ import ScrollView from '@/common-adapters/scroll-view'
 import {BottomSheetScrollView} from '@/common-adapters/popup/bottom-sheet'
 import ProgressIndicator from '@/common-adapters/progress-indicator'
 import {useOnMountOnce} from '@/constants/react'
-import type {MenuItem, MenuLayoutProps} from '.'
+import type {MenuItem, MenuLayoutProps} from './index.shared'
 import {default as SafeAreaView, useSafeAreaInsets} from '@/common-adapters/safe-area-view'
 import {SafeAreaProvider, initialWindowMetrics} from 'react-native-safe-area-context'
 import noop from 'lodash/noop'
diff --git a/shared/common-adapters/floating-menu/menu-layout/index.d.ts b/shared/common-adapters/floating-menu/menu-layout/index.shared.tsx
similarity index 79%
rename from shared/common-adapters/floating-menu/menu-layout/index.d.ts
rename to shared/common-adapters/floating-menu/menu-layout/index.shared.tsx
index fa5878ff760e..73892a088c18 100644
--- a/shared/common-adapters/floating-menu/menu-layout/index.d.ts
+++ b/shared/common-adapters/floating-menu/menu-layout/index.shared.tsx
@@ -1,11 +1,11 @@
+import type {IconType} from '@/common-adapters/icon.constants-gen'
 import type * as React from 'react'
 import type * as Styles from '@/styles'
-import type {IconType} from '@/common-adapters/icon.constants-gen'
 
 export type MenuItem = {
   backgroundColor?: Styles.Color
   danger?: boolean
-  decoration?: React.ReactNode // on the right side. unused if `view` is given,
+  decoration?: React.ReactNode
   disabled?: boolean
   icon?: IconType
   iconIsVisible?: boolean
@@ -20,12 +20,11 @@ export type MenuItem = {
   style?: Styles.StylesCrossPlatform
   subTitle?: string
   rightTitle?: string
-  title: string // Used only as ID if view is provided
+  title: string
   unWrapped?: boolean
   view?: React.ReactNode
 }
 
-export type _InnerMenuItem = MenuItem | 'Divider' | undefined
 export type MenuItems = Array<_InnerMenuItem>
 
 export type MenuLayoutProps = {
@@ -37,10 +36,9 @@ export type MenuLayoutProps = {
   closeOnClick?: boolean
   style?: object
   listStyle?: object
-  closeText?: string // mobile only; default to "Close"
+  closeText?: string
   textColor?: Styles.Color
   safeProviderStyle?: Styles.StylesCrossPlatform
 }
 
-declare const MenuLayout: (p: MenuLayoutProps) => React.ReactNode
-export default MenuLayout
+export type _InnerMenuItem = MenuItem | 'Divider' | undefined
diff --git a/shared/common-adapters/floating-picker.desktop.tsx b/shared/common-adapters/floating-picker.desktop.tsx
index 18b0409461a1..5bb7d27dd7df 100644
--- a/shared/common-adapters/floating-picker.desktop.tsx
+++ b/shared/common-adapters/floating-picker.desktop.tsx
@@ -1,5 +1,9 @@
-const FloatingPicker = () => {
-  throw new Error('FloatingPicker not supported on desktop')
+import type * as React from 'react'
+import type {Props} from './floating-picker.shared'
+export type {Props, PickerItem} from './floating-picker.shared'
+
+function FloatingPicker<T>(_p: Props<T>): React.ReactNode {
+  return null
 }
 
 export default FloatingPicker
diff --git a/shared/common-adapters/floating-picker.native.tsx b/shared/common-adapters/floating-picker.native.tsx
index c2514b0ef091..a367c9264260 100644
--- a/shared/common-adapters/floating-picker.native.tsx
+++ b/shared/common-adapters/floating-picker.native.tsx
@@ -5,7 +5,7 @@ import {Picker} from '@react-native-picker/picker'
 import {Box2} from './box'
 import Popup from './popup'
 import Text from './text'
-import type {Props} from './floating-picker'
+import type {Props} from './floating-picker.shared'
 
 const Kb = {
   Box2,
diff --git a/shared/common-adapters/floating-picker.d.ts b/shared/common-adapters/floating-picker.shared.tsx
similarity index 55%
rename from shared/common-adapters/floating-picker.d.ts
rename to shared/common-adapters/floating-picker.shared.tsx
index b0318ba7104b..b02ea6da12b8 100644
--- a/shared/common-adapters/floating-picker.d.ts
+++ b/shared/common-adapters/floating-picker.shared.tsx
@@ -1,24 +1,19 @@
 import type * as React from 'react'
 
-// Mobile only. Show native dropdown UI.
-
 export type PickerItem<T> = {
   label: string
   value: T
 }
 
 export type Props<T> = {
-  items: PickerItem<T>[] // values must be unique,,
+  items: PickerItem<T>[]
   selectedValue?: T
   onSelect: (t: T | undefined) => void
   header?: React.ReactNode
   prompt?: React.ReactNode
-  promptString?: string // used on android as title of selection popup,,
+  promptString?: string
   onHidden: () => void
   onCancel: () => void
   onDone: () => void
   visible: boolean
 }
-
-declare function FloatingPicker<T>(p: Props<T>): React.ReactNode
-export default FloatingPicker
diff --git a/shared/common-adapters/header-buttons.d.ts b/shared/common-adapters/header-buttons.d.ts
deleted file mode 100644
index 8c0da035a841..000000000000
--- a/shared/common-adapters/header-buttons.d.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import type * as React from 'react'
-import type {HeaderOptions} from '@react-navigation/elements'
-type HeaderBackButtonProps = Parameters<NonNullable<HeaderOptions['headerLeft']>>[0]
-
-export declare function HeaderLeftButton(
-  p: HeaderBackButtonProps & {
-    badgeNumber?: number
-    mode?: 'back' | 'cancel'
-    autoDetectCanGoBack?: boolean
-  }
-): React.ReactNode
-
-export type {HeaderBackButtonProps}
diff --git a/shared/common-adapters/header-buttons.desktop.tsx b/shared/common-adapters/header-buttons.desktop.tsx
index 6219de2d79f8..9b48ad511f29 100644
--- a/shared/common-adapters/header-buttons.desktop.tsx
+++ b/shared/common-adapters/header-buttons.desktop.tsx
@@ -45,10 +45,10 @@ const styles = Styles.styleSheetCreate(() => ({
   }),
 }))
 
-export function HeaderLeftButton(hp: {
-  canGoBack?: boolean
-  tintColor?: string
-  onPress?: () => void
+export type {HeaderBackButtonProps} from './header-buttons.shared'
+import type {HeaderBackButtonProps} from './header-buttons.shared'
+
+export function HeaderLeftButton(hp: HeaderBackButtonProps & {
   badgeNumber?: number
   mode?: 'back' | 'cancel'
   autoDetectCanGoBack?: boolean
@@ -61,7 +61,7 @@ export function HeaderLeftButton(hp: {
       badgeNumber={hp.badgeNumber ?? 0}
       mode={hp.mode ?? 'back'}
       onAction={hp.onPress ?? nav.goBack}
-      iconColor={hp.tintColor}
+      iconColor={hp.tintColor as string | undefined}
     />
   )
 }
diff --git a/shared/common-adapters/header-buttons.native.tsx b/shared/common-adapters/header-buttons.native.tsx
index 630c5c827fed..b5d6db6217f0 100644
--- a/shared/common-adapters/header-buttons.native.tsx
+++ b/shared/common-adapters/header-buttons.native.tsx
@@ -1,6 +1,7 @@
 import type * as React from 'react'
+import type {ColorValue} from 'react-native'
 import * as Styles from '@/styles'
-import BackButton from './back-button'
+import BackButton from '@/common-adapters/back-button'
 import {Box2} from '@/common-adapters/box'
 import Text from '@/common-adapters/text'
 import {useNavigation} from '@react-navigation/native'
@@ -60,7 +61,7 @@ export function HeaderLeftButton(hp: {
   canGoBack?: boolean
   badgeNumber?: number
   onPress?: () => void
-  tintColor?: string
+  tintColor?: ColorValue
   mode?: 'back' | 'cancel'
   autoDetectCanGoBack?: boolean
 }) {
@@ -72,7 +73,9 @@ export function HeaderLeftButton(hp: {
       badgeNumber={hp.badgeNumber ?? 0}
       mode={hp.mode ?? 'back'}
       onAction={nav.goBack}
-      iconColor={hp.tintColor}
+      iconColor={hp.tintColor as string | undefined}
     />
   )
 }
+
+export type * from '@/common-adapters/header-buttons.shared'
diff --git a/shared/common-adapters/header-buttons.shared.tsx b/shared/common-adapters/header-buttons.shared.tsx
new file mode 100644
index 000000000000..eed6b8722529
--- /dev/null
+++ b/shared/common-adapters/header-buttons.shared.tsx
@@ -0,0 +1,3 @@
+import type {HeaderOptions} from '@react-navigation/elements'
+
+export type HeaderBackButtonProps = Parameters<NonNullable<HeaderOptions['headerLeft']>>[0]
diff --git a/shared/common-adapters/hot-key.d.ts b/shared/common-adapters/hot-key.d.ts
deleted file mode 100644
index 59e412391786..000000000000
--- a/shared/common-adapters/hot-key.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-export function useHotKey(keys: Array<string> | string, cb: (key: string) => void): void
diff --git a/shared/common-adapters/icon.constants-gen.desktop.tsx b/shared/common-adapters/icon.constants-gen.desktop.tsx
index 8d96252ab478..abf6d275c2e0 100644
--- a/shared/common-adapters/icon.constants-gen.desktop.tsx
+++ b/shared/common-adapters/icon.constants-gen.desktop.tsx
@@ -1,2 +1,16 @@
 // @ts-nocheck
-export * from './icon.constants-gen.shared'
+import {iconMeta as _iconMeta} from './icon.constants-gen.shared'
+export type IconType = keyof typeof _iconMeta
+
+type ReqOut = string | number
+type IconMeta = {
+  isFont?: boolean
+  gridSize?: number
+  extension?: string
+  charCode?: number
+  nameDark?: string
+  imagesDir?: string
+  require?: ReqOut
+  requireDark?: ReqOut
+}
+export const iconMeta: {[k in IconType]: IconMeta} = _iconMeta
diff --git a/shared/common-adapters/icon.constants-gen.native.tsx b/shared/common-adapters/icon.constants-gen.native.tsx
index 8d96252ab478..abf6d275c2e0 100644
--- a/shared/common-adapters/icon.constants-gen.native.tsx
+++ b/shared/common-adapters/icon.constants-gen.native.tsx
@@ -1,2 +1,16 @@
 // @ts-nocheck
-export * from './icon.constants-gen.shared'
+import {iconMeta as _iconMeta} from './icon.constants-gen.shared'
+export type IconType = keyof typeof _iconMeta
+
+type ReqOut = string | number
+type IconMeta = {
+  isFont?: boolean
+  gridSize?: number
+  extension?: string
+  charCode?: number
+  nameDark?: string
+  imagesDir?: string
+  require?: ReqOut
+  requireDark?: ReqOut
+}
+export const iconMeta: {[k in IconType]: IconMeta} = _iconMeta
diff --git a/shared/common-adapters/image.desktop.tsx b/shared/common-adapters/image.desktop.tsx
index 8591065e564a..4af2eebb26f1 100644
--- a/shared/common-adapters/image.desktop.tsx
+++ b/shared/common-adapters/image.desktop.tsx
@@ -1,6 +1,6 @@
 import * as React from 'react'
 import * as Styles from '@/styles'
-import type {Props} from './image'
+import type {Props} from './image.shared'
 import LoadingStateView from './loading-state-view'
 
 const onDragStart = (e: React.BaseSyntheticEvent) => e.preventDefault()
diff --git a/shared/common-adapters/image.native.tsx b/shared/common-adapters/image.native.tsx
index 64d51f7cef7c..fc0ec35223f4 100644
--- a/shared/common-adapters/image.native.tsx
+++ b/shared/common-adapters/image.native.tsx
@@ -1,6 +1,6 @@
 import * as React from 'react'
 import LoadingStateView from './loading-state-view'
-import type {Props} from './image'
+import type {Props} from './image.shared'
 import {Image as ExpoImage, type ImageLoadEventData, type ImageErrorEventData} from 'expo-image'
 
 const Image = (p: Props) => {
diff --git a/shared/common-adapters/image.d.ts b/shared/common-adapters/image.shared.tsx
similarity index 72%
rename from shared/common-adapters/image.d.ts
rename to shared/common-adapters/image.shared.tsx
index 0d0b28ce27db..b605a6f61fa4 100644
--- a/shared/common-adapters/image.d.ts
+++ b/shared/common-adapters/image.shared.tsx
@@ -1,15 +1,11 @@
-import type * as React from 'react'
 import type {StylesCrossPlatform} from '@/styles'
 
 export type Props = {
   contentFit?: 'cover' | 'contain' | 'fill' | 'none' | 'scale-down'
-  src: number | string | Array<{uri: string; width: number; height: number}> /*this form mobile only for now*/
+  src: number | string | Array<{uri: string; width: number; height: number}>
   style?: StylesCrossPlatform
   showLoadingStateUntilLoaded?: boolean
   onLoad?: (e: {target?: unknown; source?: {width: number; height: number}}) => void
   onError?: () => void
   allowDownscaling?: boolean
 }
-
-declare const Image: (p: Props) => React.ReactNode
-export default Image
diff --git a/shared/common-adapters/index-impl.d.ts b/shared/common-adapters/index-impl.d.ts
deleted file mode 100644
index e8ed8c74672e..000000000000
--- a/shared/common-adapters/index-impl.d.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-declare let ignore: object
-export default ignore
diff --git a/shared/common-adapters/index.d.ts b/shared/common-adapters/index.d.ts
deleted file mode 100644
index 4775cdbbb2a9..000000000000
--- a/shared/common-adapters/index.d.ts
+++ /dev/null
@@ -1,99 +0,0 @@
-// Any additions to this file should also be added to ./index-impl.tsx
-
-export type {MenuItem, MenuItems} from './floating-menu/menu-layout'
-export type {IconType} from './icon.constants-gen'
-export type {WebViewProps, WebViewInjections} from './web-view'
-export type {AnimationType} from './animation'
-
-export {LayoutAnimation} from 'react-native' // exported from index.native
-export {
-  BottomSheetModal,
-  BottomSheetBackdrop,
-  BottomSheetScrollView,
-  type BottomSheetBackdropProps,
-} from './popup/bottom-sheet'
-export {default as Animation} from './animation'
-export {default as Avatar} from './avatar'
-export {default as AvatarLine} from './avatar/avatar-line'
-export {BottomAccessory} from './bottom-accessory'
-export {default as BackButton} from './back-button'
-export {default as Badge} from './badge'
-export {Banner, BannerParagraph} from './banner'
-export {Box2, Box2Animated, type LayoutEvent} from './box'
-export type {MeasureRef} from './measure-ref'
-export {default as ButtonBar} from './button-bar'
-export {default as Button, IconButton} from './button'
-export {default as Icon, type IconProps, type SizeType} from './icon'
-export {default as IconAuto} from './icon-auto'
-export {default as BoxGrow, BoxGrow2} from './box-grow'
-export {default as Checkbox} from './checkbox'
-export {default as CheckCircle} from './check-circle'
-export {default as ChoiceList} from './choice-list'
-export {default as ClickableBox, ClickableBox2} from './clickable-box'
-export {default as ConfirmModal} from './confirm-modal'
-export {default as CopyText} from './copy-text'
-export {default as CopyableText} from './copyable-text'
-export {default as Divider} from './divider'
-export {default as Dropdown, DropdownButton, InlineDropdown} from './dropdown'
-export {default as DragAndDrop} from './drag-and-drop'
-export {default as NativeEmoji} from './emoji/native-emoji'
-export {default as Emoji} from './emoji'
-export {default as ErrorBoundary} from './error-boundary'
-export {default as FloatingMenu} from './floating-menu'
-export {default as FloatingPicker} from './floating-picker'
-export {usePopup2, type Popup2Parms} from './popup/use-popup'
-export {HeaderLeftButton} from './header-buttons'
-export {useHotKey} from './hot-key'
-export {default as Image} from './image'
-export {default as ImageIcon} from './image-icon'
-export {default as InfoNote} from './info-note'
-export {default as Input3, type Input3Ref, type Input3Props} from './input3'
-export {KeyboardAvoidingView2} from './keyboard-avoiding-view'
-export {default as List, type LegendListRef} from './list'
-export {default as LoadingLine} from './loading-line'
-export {
-  default as ListItem,
-  largeHeight as largeListItemHeight,
-  smallHeight as smallListItemHeight,
-} from './list-item'
-export {default as Markdown} from './markdown'
-
-export {default as Meta} from './meta'
-export {default as NameWithIcon} from './name-with-icon'
-export {default as ConnectedNameWithIcon} from './name-with-icon'
-export {default as Popup, type PopupProps} from './popup/index'
-export {default as PhoneInput} from './phone-input'
-export {default as Placeholder} from './placeholder'
-export {default as PlatformIcon} from './platform-icon'
-export {default as ProfileCard} from './profile-card'
-export {default as ProgressBar} from './progress-bar'
-export {default as ProgressIndicator} from './progress-indicator'
-export {default as ProofBrokenBanner} from './proof-broken-banner'
-export {default as RadioButton} from './radio-button'
-export {default as Reloadable} from './reload'
-export {default as RichButton} from './rich-button'
-export {default as RoundedBox} from './rounded-box'
-export {default as SafeAreaView, SafeAreaViewTop, useSafeAreaInsets} from './safe-area-view'
-export {default as SaveIndicator} from './save-indicator'
-export {default as SearchFilter, type SearchFilterRef} from './search-filter'
-export {default as SectionDivider} from './section-divider'
-export {default as ScrollView, type ScrollViewRef} from './scroll-view'
-export {default as SectionList, type SectionListRef, type SectionType} from './section-list'
-export {default as Switch} from './switch'
-export {default as Tabs} from './tabs'
-export {default as TeamWithPopup} from './team-with-popup'
-export {default as Text} from './text'
-export {useClickURL} from './text-url'
-export {default as Toast} from './toast'
-export {default as SimpleToast} from './simple-toast'
-export {default as TimelineMarker} from './timeline-marker'
-export {default as ConnectedUsernames} from './usernames'
-export {default as WaitingButton} from './waiting-button'
-export {default as WaveButton} from './wave-button'
-export {useTimeout, useInterval} from './use-timers'
-export {isValidIconType} from './icon.shared'
-export {default as Video} from './video'
-export {default as WebView} from './web-view'
-export {default as WithTooltip} from './with-tooltip'
-export {default as ZoomableImage} from './zoomable-image'
-export * as Styles from '@/styles'
diff --git a/shared/common-adapters/index.desktop.tsx b/shared/common-adapters/index.desktop.tsx
index bd96ec3e746b..d9ada62f1edf 100644
--- a/shared/common-adapters/index.desktop.tsx
+++ b/shared/common-adapters/index.desktop.tsx
@@ -1,4 +1,100 @@
-export * from './index-impl'
+import type {LayoutAnimation as NativeLayoutAnimation} from 'react-native'
+
+export type {MenuItem, MenuItems} from './floating-menu/menu-layout/index.desktop'
+export type {IconType} from './icon.constants-gen.desktop'
+export type {WebViewProps, WebViewInjections} from './web-view.desktop'
+export type {AnimationType} from './animation.desktop'
+
+export const LayoutAnimation = {} as unknown as typeof NativeLayoutAnimation
 export const ReAnimated = {}
-export const LayoutAnimation = {}
+
+export {
+  BottomSheetModal,
+  BottomSheetBackdrop,
+  BottomSheetScrollView,
+  type BottomSheetBackdropProps,
+} from './popup/bottom-sheet.desktop'
+export {default as Animation} from './animation.desktop'
+export {default as Avatar} from './avatar/index.desktop'
+export {default as AvatarLine} from './avatar/avatar-line'
 export {BottomAccessory} from './bottom-accessory.desktop'
+export {default as BackButton} from './back-button.desktop'
+export {default as Badge} from './badge'
+export {Banner, BannerParagraph} from './banner'
+export {Box2, Box2Animated, type LayoutEvent} from './box.desktop'
+export type {MeasureRef} from './measure-ref'
+export {default as ButtonBar} from './button-bar'
+export {default as Button, IconButton} from './button'
+export {default as Icon, type IconProps, type SizeType} from './icon'
+export {default as IconAuto} from './icon-auto'
+export {default as BoxGrow, BoxGrow2} from './box-grow'
+export {default as Checkbox} from './checkbox.desktop'
+export {default as CheckCircle} from './check-circle'
+export {default as ChoiceList} from './choice-list.desktop'
+export {default as ClickableBox, ClickableBox2} from './clickable-box.desktop'
+export {default as ConfirmModal} from './confirm-modal'
+export {default as CopyText} from './copy-text'
+export {default as CopyableText} from './copyable-text.desktop'
+export {default as Divider} from './divider'
+export {default as Dropdown, DropdownButton, InlineDropdown} from './dropdown'
+export {default as DragAndDrop} from './drag-and-drop.desktop'
+export {default as NativeEmoji} from './emoji/native-emoji.desktop'
+export {default as Emoji} from './emoji'
+export {default as ErrorBoundary} from './error-boundary'
+export {default as FloatingMenu} from './floating-menu'
+export {default as FloatingPicker} from './floating-picker.desktop'
+export {usePopup2, type Popup2Parms} from './popup/use-popup'
+export {HeaderLeftButton} from './header-buttons.desktop'
+export {useHotKey} from './hot-key.desktop'
+export {default as Image} from './image.desktop'
+export {default as ImageIcon} from './image-icon'
+export {default as InfoNote} from './info-note'
+export {default as Input3, type Input3Ref, type Input3Props} from './input3.desktop'
+export {KeyboardAvoidingView2} from './keyboard-avoiding-view.desktop'
+export {default as List, type LegendListRef} from './list.desktop'
+export {
+  default as ListItem,
+  largeHeight as largeListItemHeight,
+  smallHeight as smallListItemHeight,
+} from './list-item'
+export {default as LoadingLine} from './loading-line.desktop'
+export {default as Markdown} from './markdown'
+export {default as Meta} from './meta'
+export {default as NameWithIcon} from './name-with-icon'
+export {default as ConnectedNameWithIcon} from './name-with-icon'
+export {default as Popup, type PopupProps} from './popup/index.desktop'
+export {default as PhoneInput} from './phone-input'
+export {default as Placeholder} from './placeholder'
+export {default as PlatformIcon} from './platform-icon'
+export {default as ProfileCard} from './profile-card'
+export {default as ProgressBar} from './progress-bar'
+export {default as ProgressIndicator} from './progress-indicator.desktop'
+export {default as ProofBrokenBanner} from './proof-broken-banner'
+export {default as RadioButton} from './radio-button.desktop'
+export {default as Reloadable} from './reload'
+export {default as RichButton} from './rich-button'
+export {default as RoundedBox} from './rounded-box'
+export {default as SafeAreaView, SafeAreaViewTop, useSafeAreaInsets} from './safe-area-view.desktop'
+export {default as SaveIndicator} from './save-indicator'
+export {default as SearchFilter, type SearchFilterRef} from './search-filter'
+export {default as SectionDivider} from './section-divider'
+export {default as ScrollView, type ScrollViewRef} from './scroll-view.desktop'
+export {default as SectionList, type SectionListRef, type SectionType} from './section-list'
+export {default as Switch} from './switch'
+export {default as Tabs} from './tabs'
+export {default as TeamWithPopup} from './team-with-popup'
+export {default as Text} from './text.desktop'
+export {useClickURL} from './text-url.desktop'
+export {default as Toast} from './toast.desktop'
+export {default as SimpleToast} from './simple-toast'
+export {default as TimelineMarker} from './timeline-marker'
+export {default as ConnectedUsernames} from './usernames'
+export {default as WaitingButton} from './waiting-button'
+export {default as WaveButton} from './wave-button'
+export {useTimeout, useInterval} from './use-timers'
+export {isValidIconType} from './icon.shared'
+export {default as Video} from './video.desktop'
+export {default as WebView} from './web-view.desktop'
+export {default as WithTooltip} from './with-tooltip.desktop'
+export {default as ZoomableImage} from './zoomable-image.desktop'
+export * as Styles from '@/styles'
diff --git a/shared/common-adapters/index.native.tsx b/shared/common-adapters/index.native.tsx
index 8ad71b8604cb..e970a77c3bb5 100644
--- a/shared/common-adapters/index.native.tsx
+++ b/shared/common-adapters/index.native.tsx
@@ -1,4 +1,102 @@
-import {LayoutAnimation} from 'react-native'
-export * from './index-impl'
-export {LayoutAnimation}
+export type {MenuItem, MenuItems} from './floating-menu/menu-layout/index.shared'
+export type {IconType} from './icon.constants-gen.native'
+export type {WebViewProps, WebViewInjections} from './web-view.shared'
+export type {AnimationType} from './animation.shared'
+
+export {LayoutAnimation} from 'react-native'
+
+export {
+  BottomSheetModal,
+  BottomSheetBackdrop,
+  BottomSheetScrollView,
+  type BottomSheetBackdropProps,
+} from './popup/bottom-sheet.native'
+export {default as Animation} from './animation.native'
+export {default as Avatar} from './avatar/index.native'
+export {default as AvatarLine} from './avatar/avatar-line'
 export {BottomAccessory} from './bottom-accessory.native'
+export {default as BackButton} from './back-button.native'
+export {default as Badge} from './badge'
+export {Banner, BannerParagraph} from './banner'
+export {Box2, Box2Animated} from './box.native'
+export type {LayoutEvent} from './box.shared'
+export type {MeasureRef} from './measure-ref'
+export {default as ButtonBar} from './button-bar'
+export {default as Button, IconButton} from './button'
+export {default as Icon, type IconProps, type SizeType} from './icon'
+export {default as IconAuto} from './icon-auto'
+export {default as BoxGrow, BoxGrow2} from './box-grow'
+export {default as Checkbox} from './checkbox.native'
+export {default as CheckCircle} from './check-circle'
+export {default as ChoiceList} from './choice-list.native'
+export {default as ClickableBox, ClickableBox2} from './clickable-box.native'
+export {default as ConfirmModal} from './confirm-modal'
+export {default as CopyText} from './copy-text'
+export {default as CopyableText} from './copyable-text.native'
+export {default as Divider} from './divider'
+export {default as Dropdown, DropdownButton, InlineDropdown} from './dropdown'
+export {default as DragAndDrop} from './drag-and-drop.native'
+export {default as NativeEmoji} from './emoji/native-emoji.native'
+export {default as Emoji} from './emoji'
+export {default as ErrorBoundary} from './error-boundary'
+export {default as FloatingMenu} from './floating-menu'
+export {default as FloatingPicker} from './floating-picker.native'
+export {usePopup2, type Popup2Parms} from './popup/use-popup'
+export {HeaderLeftButton} from './header-buttons.native'
+export {useHotKey} from './hot-key.native'
+export {default as Image} from './image.native'
+export {default as ImageIcon} from './image-icon'
+export {default as InfoNote} from './info-note'
+export {default as Input3} from './input3.native'
+export type {Input3Ref, Input3Props} from './input3.shared'
+export {KeyboardAvoidingView2} from './keyboard-avoiding-view.native'
+export {default as List} from './list.native'
+export type {LegendListRef} from './list.shared'
+export {
+  default as ListItem,
+  largeHeight as largeListItemHeight,
+  smallHeight as smallListItemHeight,
+} from './list-item'
+export {default as LoadingLine} from './loading-line.native'
+export {default as Markdown} from './markdown'
+export {default as Meta} from './meta'
+export {default as NameWithIcon} from './name-with-icon'
+export {default as ConnectedNameWithIcon} from './name-with-icon'
+export {default as Popup} from './popup/index.native'
+export type {PopupProps} from './popup/index.shared'
+export {default as PhoneInput} from './phone-input'
+export {default as Placeholder} from './placeholder'
+export {default as PlatformIcon} from './platform-icon'
+export {default as ProfileCard} from './profile-card'
+export {default as ProgressBar} from './progress-bar'
+export {default as ProgressIndicator} from './progress-indicator.native'
+export {default as ProofBrokenBanner} from './proof-broken-banner'
+export {default as RadioButton} from './radio-button.native'
+export {default as Reloadable} from './reload'
+export {default as RichButton} from './rich-button'
+export {default as RoundedBox} from './rounded-box'
+export {default as SafeAreaView, SafeAreaViewTop, useSafeAreaInsets} from './safe-area-view.native'
+export {default as SaveIndicator} from './save-indicator'
+export {default as SearchFilter, type SearchFilterRef} from './search-filter'
+export {default as SectionDivider} from './section-divider'
+export {default as ScrollView} from './scroll-view.native'
+export type {ScrollViewRef} from './scroll-view.shared'
+export {default as SectionList, type SectionListRef, type SectionType} from './section-list'
+export {default as Switch} from './switch'
+export {default as Tabs} from './tabs'
+export {default as TeamWithPopup} from './team-with-popup'
+export {default as Text} from './text.native'
+export {useClickURL} from './text-url.native'
+export {default as Toast} from './toast.native'
+export {default as SimpleToast} from './simple-toast'
+export {default as TimelineMarker} from './timeline-marker'
+export {default as ConnectedUsernames} from './usernames'
+export {default as WaitingButton} from './waiting-button'
+export {default as WaveButton} from './wave-button'
+export {useTimeout, useInterval} from './use-timers'
+export {isValidIconType} from './icon.shared'
+export {default as Video} from './video.native'
+export {default as WebView} from './web-view.native'
+export {default as WithTooltip} from './with-tooltip.native'
+export {default as ZoomableImage} from './zoomable-image.native'
+export * as Styles from '@/styles'
diff --git a/shared/common-adapters/input3.desktop.tsx b/shared/common-adapters/input3.desktop.tsx
index 5c1413090e73..f8f4720f2ddf 100644
--- a/shared/common-adapters/input3.desktop.tsx
+++ b/shared/common-adapters/input3.desktop.tsx
@@ -6,7 +6,8 @@ import Text from './text'
 import {getTextStyle} from './text.styles'
 import {useColorScheme} from 'react-native'
 import './input.css'
-import type {Input3Props, Input3Ref} from './input3'
+import type {Input3Props, Input3Ref} from './input3.shared'
+export type {Input3Props, Input3Ref} from './input3.shared'
 
 function Input3(props: Input3Props & {ref?: React.Ref<Input3Ref>}) {
   const {autoCapitalize, autoCorrect, autoFocus, containerStyle, decoration, disabled} = props
diff --git a/shared/common-adapters/input3.native.tsx b/shared/common-adapters/input3.native.tsx
index d0fc9cdc7cc6..98f573472e00 100644
--- a/shared/common-adapters/input3.native.tsx
+++ b/shared/common-adapters/input3.native.tsx
@@ -7,7 +7,7 @@ import {getTextStyle} from './text.styles'
 import {TextInput as NativeTextInput} from 'react-native'
 import {isIOS} from '@/constants/platform'
 import {useColorScheme} from 'react-native'
-import type {Input3Props, Input3Ref} from './input3'
+import type {Input3Props, Input3Ref} from './input3.shared'
 
 function Input3(props: Input3Props & {ref?: React.Ref<Input3Ref>}) {
   const {autoCapitalize, autoCorrect, autoFocus, containerStyle, decoration, disabled} = props
diff --git a/shared/common-adapters/input3.d.ts b/shared/common-adapters/input3.shared.tsx
similarity index 81%
rename from shared/common-adapters/input3.d.ts
rename to shared/common-adapters/input3.shared.tsx
index 3b7db3e92e2a..d46c7490f831 100644
--- a/shared/common-adapters/input3.d.ts
+++ b/shared/common-adapters/input3.shared.tsx
@@ -1,6 +1,8 @@
+import type {IconType} from '@/common-adapters/icon.constants-gen'
+import type {TextType} from '@/common-adapters/text.shared'
 import type * as React from 'react'
-import type {IconType} from './icon'
-import type {StylesCrossPlatform} from '@/styles'
+import type * as Styles from '@/styles'
+
 export type KeyboardType =
   | 'default'
   | 'email-address'
@@ -48,7 +50,6 @@ export type TextContentType =
   | 'password'
   | 'newPassword'
   | 'oneTimeCode'
-import type {TextType} from './text.shared'
 
 export type Input3Ref = {
   focus: () => void
@@ -57,26 +58,19 @@ export type Input3Ref = {
 }
 
 export type Input3Props = {
-  // Value
   value?: string
   onChangeText?: (text: string) => void
   placeholder?: string
   maxLength?: number
-
-  // Chrome
   error?: boolean
   icon?: IconType
   prefix?: string
   decoration?: React.ReactNode
   hideBorder?: boolean
   disabled?: boolean
-  containerStyle?: StylesCrossPlatform
-  inputStyle?: StylesCrossPlatform
-
-  // Text
+  containerStyle?: Styles.StylesCrossPlatform
+  inputStyle?: Styles.StylesCrossPlatform
   textType?: TextType
-
-  // Behavior
   autoFocus?: boolean
   selectTextOnFocus?: boolean
   multiline?: boolean
@@ -84,8 +78,6 @@ export type Input3Props = {
   rowsMax?: number
   growAndScroll?: boolean
   secureTextEntry?: boolean
-
-  // Keyboard
   onEnterKeyDown?: (event?: React.KeyboardEvent) => void
   onKeyDown?: (event: React.KeyboardEvent) => void
   returnKeyType?: 'done' | 'go' | 'next' | 'search' | 'send'
@@ -93,16 +85,8 @@ export type Input3Props = {
   autoCapitalize?: 'none' | 'sentences' | 'words' | 'characters'
   autoCorrect?: boolean
   spellCheck?: boolean
-
-  // Focus
   onFocus?: () => void
   onBlur?: () => void
   onClick?: (event: React.BaseSyntheticEvent) => void
-
-  // iOS autofill
   textContentType?: TextContentType
 }
-
-declare function Input3(props: Input3Props & {ref?: React.Ref<Input3Ref>}): React.ReactNode
-
-export default Input3
diff --git a/shared/common-adapters/keyboard-avoiding-view.native.tsx b/shared/common-adapters/keyboard-avoiding-view.native.tsx
index 987638683acf..6f5cac3a3883 100644
--- a/shared/common-adapters/keyboard-avoiding-view.native.tsx
+++ b/shared/common-adapters/keyboard-avoiding-view.native.tsx
@@ -15,7 +15,7 @@ import {
   type ViewStyle,
 } from 'react-native'
 import {useHeaderHeight} from '@react-navigation/elements'
-import type {Props as KAVProps} from './keyboard-avoiding-view'
+import type {Props as KAVProps} from './keyboard-avoiding-view.shared'
 import * as React from 'react'
 import {getKeyboardUp} from '@/styles/keyboard-state'
 import {isTablet} from '@/constants/platform'
@@ -310,7 +310,7 @@ export const KeyboardAvoidingView2 = (p: KAVProps) => {
 */
 
 import {KeyboardAvoidingView} from 'react-native-keyboard-controller'
-import type {Props} from './keyboard-avoiding-view'
+import type {Props} from './keyboard-avoiding-view.shared'
 import * as Styles from '@/styles'
 import {useHeaderHeight} from '@react-navigation/elements'
 
diff --git a/shared/common-adapters/keyboard-avoiding-view.d.ts b/shared/common-adapters/keyboard-avoiding-view.shared.tsx
similarity index 50%
rename from shared/common-adapters/keyboard-avoiding-view.d.ts
rename to shared/common-adapters/keyboard-avoiding-view.shared.tsx
index 16fedf5f4875..547c81a27386 100644
--- a/shared/common-adapters/keyboard-avoiding-view.d.ts
+++ b/shared/common-adapters/keyboard-avoiding-view.shared.tsx
@@ -1,16 +1,10 @@
 import type * as React from 'react'
 
-export {KeyboardAvoidingView as default} from 'react-native'
-
 export type Props = {
   children: React.ReactNode
   isModal?: boolean
   extraOffset?: number
-  // if we're inside something that's using safe, we can compensate
   extraPadding?: number
-  // only used on ipad modals since they float
   compensateNotBeingOnBottom?: boolean
   behavior?: 'height' | 'padding' | 'translate-with-padding'
 }
-
-export declare const KeyboardAvoidingView2: (p: Props) => React.ReactNode
diff --git a/shared/common-adapters/list-common.tsx b/shared/common-adapters/list-common.tsx
index ab8b80fb4ee8..5fd7c3cb5f6b 100644
--- a/shared/common-adapters/list-common.tsx
+++ b/shared/common-adapters/list-common.tsx
@@ -1,5 +1,5 @@
 import {smallHeight, largeHeight} from './list-item'
-import type {Props} from './list'
+import type {Props} from './list.shared'
 
 export function useListProps<T>(p: Props<T>) {
   const {
diff --git a/shared/common-adapters/list.desktop.tsx b/shared/common-adapters/list.desktop.tsx
index ab8d7038270b..af47429f1559 100644
--- a/shared/common-adapters/list.desktop.tsx
+++ b/shared/common-adapters/list.desktop.tsx
@@ -1,7 +1,8 @@
 import type {CSSProperties} from 'react'
 import * as Styles from '@/styles'
 import {LegendList} from '@legendapp/list/react'
-import type {Props} from './list'
+import type {Props} from './list.shared'
+export type {LegendListRef, Props} from './list.shared'
 import {useListProps} from './list-common'
 
 function List<T>({ref, ...p}: Props<T>) {
diff --git a/shared/common-adapters/list.native.tsx b/shared/common-adapters/list.native.tsx
index 5523551e1848..766b97e6af0f 100644
--- a/shared/common-adapters/list.native.tsx
+++ b/shared/common-adapters/list.native.tsx
@@ -1,7 +1,7 @@
 import {View} from 'react-native'
 import * as Styles from '@/styles'
 import {LegendList} from '@legendapp/list/react-native'
-import type {Props} from './list'
+import type {Props} from './list.shared'
 import {useListProps} from './list-common'
 
 function List<T>({ref, ...p}: Props<T>) {
diff --git a/shared/common-adapters/list.d.ts b/shared/common-adapters/list.shared.tsx
similarity index 70%
rename from shared/common-adapters/list.d.ts
rename to shared/common-adapters/list.shared.tsx
index 2ea51ae6e346..39d8dbbe71f2 100644
--- a/shared/common-adapters/list.d.ts
+++ b/shared/common-adapters/list.shared.tsx
@@ -2,31 +2,6 @@ import type * as React from 'react'
 import type {CustomStyles} from '@/styles'
 import type {LegendListRef as _LegendListRef} from '@legendapp/list/react'
 
-export type LegendListState = {
-  end: number
-  scroll: number
-  scrollLength: number
-  start: number
-}
-
-export type LegendListRef = _LegendListRef & {
-  getState: () => LegendListState
-}
-
-// List differs from list in that on desktop it uses LegendList.
-
-export type VariableItemHeight<Item> = {
-  getItemLayout: (
-    index: number,
-    item?: Item
-  ) => {
-    index: number
-    length: number
-    offset: number
-  }
-  type: 'variable'
-}
-
 export type FixedHeight = {
   height: number
   type: 'fixed'
@@ -37,10 +12,26 @@ export type FixedListItemAuto = {
   type: 'fixedListItemAuto'
 }
 
+export type LegendListRef = _LegendListRef & {
+  getState: () => LegendListState
+}
+
+export type LegendListState = {
+  end: number
+  scroll: number
+  scrollLength: number
+  start: number
+}
+
 export type TrueVariable = {
   type: 'trueVariable'
 }
 
+export type VariableItemHeight<Item> = {
+  getItemLayout: (index: number, item?: Item) => {index: number; length: number; offset: number}
+  type: 'variable'
+}
+
 export type PerItemHeight<Item> = {
   type: 'perItem'
   getSize: (item: Item) => number
@@ -48,23 +39,21 @@ export type PerItemHeight<Item> = {
 
 export type ViewableItem<Item> = {index: number; item: Item}
 
-// Having flex in the list messes with creating the right size inner container
-// for scroll
 export type Props<Item> = {
   style?: CustomStyles<'flex' | 'flexDirection'>
   indexAsKey?: boolean
-  keyProperty?: string // if passed uses item[keyProperty] for the item keys,
+  keyProperty?: string
   keyExtractor?: (item: Item, index: number) => string
   items: ReadonlyArray<Item>
   renderItem: (index: number, item: Item) => React.ReactElement | null
   itemHeight: VariableItemHeight<Item> | FixedHeight | FixedListItemAuto | TrueVariable | PerItemHeight<Item>
   estimatedItemHeight?: number
-  selectedIndex?: number // TODO,
-  bounces?: boolean // mobile only,
-  keyboardShouldPersistTaps?: 'never' | 'always' | 'handled' // mobile only,
-  windowSize?: number // Mobile only, has a non-RN default,
+  selectedIndex?: number
+  bounces?: boolean
+  keyboardShouldPersistTaps?: 'never' | 'always' | 'handled'
+  windowSize?: number
   onEndReached?: () => void
-  reAnimated?: boolean // mobile only, make list animated
+  reAnimated?: boolean
   extraData?: unknown
   ref?: React.Ref<LegendListRef>
   testID?: string
@@ -79,6 +68,3 @@ export type Props<Item> = {
   }) => void
   viewabilityConfig?: object
 }
-
-export declare function List<Item>(p: Props<Item>): React.ReactNode
-export default List
diff --git a/shared/common-adapters/loading-line.d.ts b/shared/common-adapters/loading-line.d.ts
deleted file mode 100644
index 2e5f0d2dc5a5..000000000000
--- a/shared/common-adapters/loading-line.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import type * as React from 'react'
-declare const LoadingLine: () => React.ReactNode
-export default LoadingLine
diff --git a/shared/common-adapters/markdown/maybe-mention/unknown.tsx b/shared/common-adapters/markdown/maybe-mention/unknown.tsx
index 3ba8a73c17a8..923d9a7a5b8f 100644
--- a/shared/common-adapters/markdown/maybe-mention/unknown.tsx
+++ b/shared/common-adapters/markdown/maybe-mention/unknown.tsx
@@ -3,7 +3,7 @@ import Text from '@/common-adapters/text'
 import Button from '@/common-adapters/button'
 import {Box2} from '@/common-adapters/box'
 import type {MeasureRef} from '@/common-adapters/measure-ref'
-import type {MenuItems} from '@/common-adapters/floating-menu/menu-layout'
+import type {MenuItems} from '@/common-adapters/floating-menu/menu-layout/index.shared'
 import FloatingMenu from '@/common-adapters/floating-menu'
 import * as Styles from '@/styles'
 
diff --git a/shared/common-adapters/phone-input.tsx b/shared/common-adapters/phone-input.tsx
index 3f8ced4261a7..f9b36ba7c813 100644
--- a/shared/common-adapters/phone-input.tsx
+++ b/shared/common-adapters/phone-input.tsx
@@ -5,7 +5,8 @@ import Text from './text'
 import {Box2} from './box'
 import FloatingMenu from './floating-menu'
 import SearchFilter from './search-filter'
-import Input3, {type Input3Ref} from './input3'
+import Input3 from './input3'
+import type {Input3Ref} from './input3.shared'
 import FloatingPicker from './floating-picker'
 import ProgressIndicator from './progress-indicator'
 import ClickableBox from './clickable-box'
diff --git a/shared/common-adapters/popup/bottom-sheet.d.ts b/shared/common-adapters/popup/bottom-sheet.d.ts
deleted file mode 100644
index 3f1af40d13b4..000000000000
--- a/shared/common-adapters/popup/bottom-sheet.d.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-export {
-  BottomSheetView,
-  BottomSheetModal,
-  BottomSheetBackdrop,
-  BottomSheetScrollView,
-  BottomSheetHandle,
-  type BottomSheetBackdropProps,
-  type BottomSheetModalProps,
-  type BottomSheetHandleProps,
-} from '@gorhom/bottom-sheet'
diff --git a/shared/common-adapters/popup/bottom-sheet.desktop.tsx b/shared/common-adapters/popup/bottom-sheet.desktop.tsx
index 4b7411ed8477..71a5d6c05ef6 100644
--- a/shared/common-adapters/popup/bottom-sheet.desktop.tsx
+++ b/shared/common-adapters/popup/bottom-sheet.desktop.tsx
@@ -4,3 +4,4 @@ export const BottomSheetModal = () => null
 export const BottomSheetBackdrop = () => null
 export const BottomSheetScrollView = () => null
 export const BottomSheetHandle = () => null
+export type BottomSheetBackdropProps = Record<string, never>
diff --git a/shared/common-adapters/popup/bottom-sheet.native.tsx b/shared/common-adapters/popup/bottom-sheet.native.tsx
index 5be49bd7ca7d..e1fe35f06ee6 100644
--- a/shared/common-adapters/popup/bottom-sheet.native.tsx
+++ b/shared/common-adapters/popup/bottom-sheet.native.tsx
@@ -4,4 +4,5 @@ export {
   BottomSheetBackdrop,
   BottomSheetScrollView,
   BottomSheetHandle,
+  type BottomSheetBackdropProps,
 } from '@gorhom/bottom-sheet'
diff --git a/shared/common-adapters/popup/floating-box/index.d.ts b/shared/common-adapters/popup/floating-box/index.d.ts
deleted file mode 100644
index 3752cc161b54..000000000000
--- a/shared/common-adapters/popup/floating-box/index.d.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-import type * as React from 'react'
-import type {StylesCrossPlatform} from '@/styles/css'
-import type {Position} from '@/styles'
-import type {MeasureRef} from '@/common-adapters/measure-ref'
-
-// GatewayDests:
-// popup-root: At the root of the app. Sibling to root route renderer.
-
-export type Props = {
-  children?: React.ReactNode
-  // Desktop only - will be triggered automatically only on click outside the box
-  onHidden?: () => void
-  // Desktop only - the node that we should aim for
-  // optional because desktop only, return val nullable because refs always are
-  attachTo?: React.RefObject<MeasureRef | null>
-  // Desktop only - allow clicks outside the floating box to propagate. On
-  disableEscapeKey?: boolean // if true, ignore keys
-  // mobile you can control this by setting a margin in `containerStyle`.
-  propagateOutsideClicks?: boolean
-  containerStyle?: StylesCrossPlatform
-  matchDimension?: boolean
-  remeasureHint?: number
-  position?: Position
-  positionFallbacks?: ReadonlyArray<Position>
-  hideKeyboard?: boolean // if true, hide the keyboard on mount
-  offset?: number
-}
-export declare const FloatingBox: (p: Props) => React.ReactNode
-export default FloatingBox
diff --git a/shared/common-adapters/popup/floating-box/index.desktop.tsx b/shared/common-adapters/popup/floating-box/index.desktop.tsx
index 1965fe1d5e3a..1a1192c59570 100644
--- a/shared/common-adapters/popup/floating-box/index.desktop.tsx
+++ b/shared/common-adapters/popup/floating-box/index.desktop.tsx
@@ -1,4 +1,4 @@
-import type {Props} from '.'
+import type {Props} from './index.shared'
 import {RelativeFloatingBox} from './relative-floating-box.desktop'
 import noop from 'lodash/noop'
 
diff --git a/shared/common-adapters/popup/floating-box/index.native.tsx b/shared/common-adapters/popup/floating-box/index.native.tsx
index 62f0a8eedd61..61154266a2c1 100644
--- a/shared/common-adapters/popup/floating-box/index.native.tsx
+++ b/shared/common-adapters/popup/floating-box/index.native.tsx
@@ -3,7 +3,7 @@ import {Box2} from '@/common-adapters/box'
 import * as Styles from '@/styles'
 import {Keyboard} from 'react-native'
 import {Portal} from '../../portal.native'
-import type {Props} from '.'
+import type {Props} from './index.shared'
 
 const Kb = {
   Box2,
diff --git a/shared/common-adapters/popup/floating-box/index.shared.tsx b/shared/common-adapters/popup/floating-box/index.shared.tsx
new file mode 100644
index 000000000000..20d366b9cf58
--- /dev/null
+++ b/shared/common-adapters/popup/floating-box/index.shared.tsx
@@ -0,0 +1,18 @@
+import type {MeasureRef} from '@/common-adapters/measure-ref'
+import type * as Styles from '@/styles'
+import type * as React from 'react'
+
+export type Props = {
+  children?: React.ReactNode
+  onHidden?: () => void
+  attachTo?: React.RefObject<MeasureRef | null>
+  disableEscapeKey?: boolean
+  propagateOutsideClicks?: boolean
+  containerStyle?: Styles.StylesCrossPlatform
+  matchDimension?: boolean
+  remeasureHint?: number
+  position?: Styles.Position
+  positionFallbacks?: ReadonlyArray<Styles.Position>
+  hideKeyboard?: boolean
+  offset?: number
+}
diff --git a/shared/common-adapters/popup/index.d.ts b/shared/common-adapters/popup/index.d.ts
deleted file mode 100644
index 01a0892eb458..000000000000
--- a/shared/common-adapters/popup/index.d.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-import type * as React from 'react'
-import type {Position} from '@/styles'
-import type {MeasureRef} from '@/common-adapters/measure-ref'
-import type {StylesCrossPlatform} from '@/styles/css'
-
-export type PopupProps = {
-  children: React.ReactNode
-  onHidden?: () => void
-
-  // If attachTo -> positioned popup near trigger (desktop: FloatingBox, mobile: Portal)
-  // If no attachTo + onHidden -> centered overlay (desktop) or BottomSheet (mobile)
-  // If no attachTo + no onHidden -> Portal (mobile only, for rendering above nav stack)
-  attachTo?: React.RefObject<MeasureRef | null>
-  position?: Position
-  positionFallbacks?: ReadonlyArray<Position>
-  propagateOutsideClicks?: boolean
-  matchDimension?: boolean
-  remeasureHint?: number
-  offset?: number
-  style?: StylesCrossPlatform
-  containerStyle?: StylesCrossPlatform
-  visible?: boolean
-  hideKeyboard?: boolean
-
-  // Mobile only: BottomSheet snap points (only used when no attachTo)
-  snapPoints?: Array<string | number>
-}
-
-declare const Popup: (p: PopupProps) => React.ReactNode
-export default Popup
diff --git a/shared/common-adapters/popup/index.desktop.tsx b/shared/common-adapters/popup/index.desktop.tsx
index 18ffa93ecb83..9c5d234cd7e8 100644
--- a/shared/common-adapters/popup/index.desktop.tsx
+++ b/shared/common-adapters/popup/index.desktop.tsx
@@ -4,7 +4,8 @@ import FloatingBox from './floating-box'
 import Icon from '../icon'
 import {EscapeHandler} from '../key-event-handler.desktop'
 import * as Styles from '@/styles'
-import type {PopupProps} from '.'
+import type {PopupProps} from './index.shared'
+export type {PopupProps} from './index.shared'
 
 const Kb = {
   Box2,
diff --git a/shared/common-adapters/popup/index.native.tsx b/shared/common-adapters/popup/index.native.tsx
index 2762713112fd..230c2868f317 100644
--- a/shared/common-adapters/popup/index.native.tsx
+++ b/shared/common-adapters/popup/index.native.tsx
@@ -10,7 +10,7 @@ import {
   type BottomSheetBackdropProps,
 } from './bottom-sheet'
 import {FullWindowOverlay} from 'react-native-screens'
-import type {PopupProps} from '.'
+import type {PopupProps} from './index.shared'
 
 const defaultSnapPoints = ['75%']
 
diff --git a/shared/common-adapters/popup/index.shared.tsx b/shared/common-adapters/popup/index.shared.tsx
new file mode 100644
index 000000000000..1d431e3d9c14
--- /dev/null
+++ b/shared/common-adapters/popup/index.shared.tsx
@@ -0,0 +1,20 @@
+import type {MeasureRef} from '@/common-adapters/measure-ref'
+import type * as React from 'react'
+import type * as Styles from '@/styles'
+
+export type PopupProps = {
+  children: React.ReactNode
+  onHidden?: () => void
+  attachTo?: React.RefObject<MeasureRef | null>
+  position?: Styles.Position
+  positionFallbacks?: ReadonlyArray<Styles.Position>
+  propagateOutsideClicks?: boolean
+  matchDimension?: boolean
+  remeasureHint?: number
+  offset?: number
+  style?: Styles.StylesCrossPlatform
+  containerStyle?: Styles.StylesCrossPlatform
+  visible?: boolean
+  hideKeyboard?: boolean
+  snapPoints?: Array<string | number>
+}
diff --git a/shared/common-adapters/progress-indicator.d.ts b/shared/common-adapters/progress-indicator.d.ts
deleted file mode 100644
index e1f446ae147a..000000000000
--- a/shared/common-adapters/progress-indicator.d.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import type * as React from 'react'
-import type * as Styles from '@/styles'
-
-export type Props = {
-  style?: Styles.StylesCrossPlatform
-  white?: boolean
-  type?: 'Small' | 'Large' | 'Huge' // Huge is desktop-only
-}
-
-declare const ProgressIndicator: (p: Props) => React.ReactNode
-export default ProgressIndicator
diff --git a/shared/common-adapters/progress-indicator.desktop.tsx b/shared/common-adapters/progress-indicator.desktop.tsx
index 48bce6854b6f..7e7cd76148aa 100644
--- a/shared/common-adapters/progress-indicator.desktop.tsx
+++ b/shared/common-adapters/progress-indicator.desktop.tsx
@@ -1,5 +1,5 @@
 import Animation from './animation'
-import type {Props} from './progress-indicator'
+import type {Props} from './progress-indicator.shared'
 import * as Styles from '@/styles'
 
 const Kb = {
diff --git a/shared/common-adapters/progress-indicator.native.tsx b/shared/common-adapters/progress-indicator.native.tsx
index 0a8158365cc3..29f67ea918b9 100644
--- a/shared/common-adapters/progress-indicator.native.tsx
+++ b/shared/common-adapters/progress-indicator.native.tsx
@@ -1,4 +1,4 @@
-import type {Props} from './progress-indicator'
+import type {Props} from './progress-indicator.shared'
 import {ActivityIndicator} from 'react-native'
 import {globalColors, collapseStyles} from '@/styles'
 
diff --git a/shared/common-adapters/progress-indicator.shared.tsx b/shared/common-adapters/progress-indicator.shared.tsx
new file mode 100644
index 000000000000..04e863ea9900
--- /dev/null
+++ b/shared/common-adapters/progress-indicator.shared.tsx
@@ -0,0 +1,7 @@
+import type * as Styles from '@/styles'
+
+export type Props = {
+  style?: Styles.StylesCrossPlatform
+  white?: boolean
+  type?: 'Small' | 'Large' | 'Huge'
+}
diff --git a/shared/common-adapters/radio-button.desktop.tsx b/shared/common-adapters/radio-button.desktop.tsx
index c6a4c91aeac0..37f6bdad4f40 100644
--- a/shared/common-adapters/radio-button.desktop.tsx
+++ b/shared/common-adapters/radio-button.desktop.tsx
@@ -1,6 +1,6 @@
 import * as Styles from '@/styles'
 import Text from './text'
-import type {Props} from './radio-button'
+import type {Props} from './radio-button.shared'
 import './radio-button.css'
 
 const Kb = {
diff --git a/shared/common-adapters/radio-button.native.tsx b/shared/common-adapters/radio-button.native.tsx
index 36b5bbbb8cd6..cfe77a596ddc 100644
--- a/shared/common-adapters/radio-button.native.tsx
+++ b/shared/common-adapters/radio-button.native.tsx
@@ -2,7 +2,7 @@ import type * as React from 'react'
 import ClickableBox from './clickable-box'
 import Text from './text'
 import * as Styles from '@/styles'
-import type {Props} from './radio-button'
+import type {Props} from './radio-button.shared'
 
 const Kb = {
   ClickableBox,
diff --git a/shared/common-adapters/radio-button.d.ts b/shared/common-adapters/radio-button.shared.tsx
similarity index 69%
rename from shared/common-adapters/radio-button.d.ts
rename to shared/common-adapters/radio-button.shared.tsx
index 7d3e86257c53..509fe22e949e 100644
--- a/shared/common-adapters/radio-button.d.ts
+++ b/shared/common-adapters/radio-button.shared.tsx
@@ -7,6 +7,3 @@ export type Props = {
   style?: object
   disabled?: boolean
 }
-
-declare const RadioButton: (p: Props) => React.ReactNode
-export default RadioButton
diff --git a/shared/common-adapters/safe-area-view.d.ts b/shared/common-adapters/safe-area-view.d.ts
deleted file mode 100644
index d8183fba0a1d..000000000000
--- a/shared/common-adapters/safe-area-view.d.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import type * as React from 'react'
-import type {StylesCrossPlatform} from '@/styles'
-
-export type Props = {
-  children?: React.ReactNode
-  style?: StylesCrossPlatform
-}
-
-declare const SafeAreaView: (p: Props) => React.ReactNode
-export declare const SafeAreaViewTop: (p: Props) => React.ReactNode
-export declare function useSafeAreaInsets(): {
-  bottom: number
-  left: number
-  right: number
-  top: number
-}
-export default SafeAreaView
diff --git a/shared/common-adapters/safe-area-view.desktop.tsx b/shared/common-adapters/safe-area-view.desktop.tsx
index d9712ef76daa..bddb2de48fd1 100644
--- a/shared/common-adapters/safe-area-view.desktop.tsx
+++ b/shared/common-adapters/safe-area-view.desktop.tsx
@@ -1,4 +1,4 @@
-import type {Props} from './safe-area-view'
+import type {Props} from './safe-area-view.shared'
 
 const RenderChildren = (props: Props): React.ReactNode => props.children || null
 export const useSafeAreaInsets = () => ({
diff --git a/shared/common-adapters/safe-area-view.native.tsx b/shared/common-adapters/safe-area-view.native.tsx
index 949fbbbd3a21..b43b55fe92f0 100644
--- a/shared/common-adapters/safe-area-view.native.tsx
+++ b/shared/common-adapters/safe-area-view.native.tsx
@@ -1,6 +1,6 @@
 import {View} from 'react-native'
 import {SafeAreaView, useSafeAreaInsets} from 'react-native-safe-area-context'
-import type {Props} from './safe-area-view'
+import type {Props} from './safe-area-view.shared'
 import * as Styles from '@/styles'
 
 // Android doesn't have an implementation for SafeAreaView, so add a special case for handling the top of the screen
diff --git a/shared/common-adapters/divider.d.ts b/shared/common-adapters/safe-area-view.shared.tsx
similarity index 58%
rename from shared/common-adapters/divider.d.ts
rename to shared/common-adapters/safe-area-view.shared.tsx
index 5464d1172877..c9d2b7cb1db7 100644
--- a/shared/common-adapters/divider.d.ts
+++ b/shared/common-adapters/safe-area-view.shared.tsx
@@ -2,9 +2,6 @@ import type * as React from 'react'
 import type {StylesCrossPlatform} from '@/styles'
 
 export type Props = {
+  children?: React.ReactNode
   style?: StylesCrossPlatform
-  vertical?: boolean
 }
-
-declare const Divider: (p: Props) => React.ReactNode
-export default Divider
diff --git a/shared/common-adapters/scroll-view.desktop.tsx b/shared/common-adapters/scroll-view.desktop.tsx
index 04e90f35a6fc..68d424feac5c 100644
--- a/shared/common-adapters/scroll-view.desktop.tsx
+++ b/shared/common-adapters/scroll-view.desktop.tsx
@@ -1,6 +1,7 @@
 import * as React from 'react'
 import * as Styles from '@/styles'
-import type {Props} from './scroll-view'
+import type {Props} from './scroll-view.shared'
+export type {ScrollViewRef} from './scroll-view.shared'
 
 function ScrollView(props: Props) {
   const {className, contentContainerStyle, onScroll, style, children, ref} = props
diff --git a/shared/common-adapters/scroll-view.native.tsx b/shared/common-adapters/scroll-view.native.tsx
index fab3b2ff9222..a4b6af548764 100644
--- a/shared/common-adapters/scroll-view.native.tsx
+++ b/shared/common-adapters/scroll-view.native.tsx
@@ -1,16 +1,22 @@
-import type * as React from 'react'
+import * as React from 'react'
 import {ScrollView, type ScrollViewProps} from 'react-native'
+import type {ScrollViewRef} from './scroll-view.shared'
 // Out of the box the ScrollView will consume taps of all children to dismiss the keyboard. This means if you have
 // an input with focus and a button, tapping the button won't work until you click it twice. Setting these defaults
 // changes this behavior: https://github.com/facebook/react-native/issues/4087
 
-function BetterScrollView(props: ScrollViewProps & {ref?: React.Ref<ScrollView>}) {
-  const {ref, ...rest} = props
-  const keyboardShouldPersistTaps = props.keyboardShouldPersistTaps ?? 'handled'
-  const contentInsetAdjustmentBehavior = props.contentInsetAdjustmentBehavior ?? 'automatic'
+function BetterScrollView(props: ScrollViewProps & {ref?: React.Ref<ScrollViewRef>}) {
+  const {ref: outerRef, ...rest} = props
+  const innerRef = React.useRef<ScrollView>(null)
+  React.useImperativeHandle(outerRef, () => ({
+    scrollTo: (args: {x: number; y: number; animated?: boolean}) => innerRef.current?.scrollTo(args),
+    scrollToEnd: (opts: {animated?: boolean; duration?: number}) => innerRef.current?.scrollToEnd(opts),
+  }))
+  const keyboardShouldPersistTaps = rest.keyboardShouldPersistTaps ?? 'handled'
+  const contentInsetAdjustmentBehavior = rest.contentInsetAdjustmentBehavior ?? 'automatic'
   return (
     <ScrollView
-      ref={ref}
+      ref={innerRef}
       {...rest}
       contentInsetAdjustmentBehavior={contentInsetAdjustmentBehavior}
       keyboardShouldPersistTaps={keyboardShouldPersistTaps}
diff --git a/shared/common-adapters/scroll-view.d.ts b/shared/common-adapters/scroll-view.shared.tsx
similarity index 84%
rename from shared/common-adapters/scroll-view.d.ts
rename to shared/common-adapters/scroll-view.shared.tsx
index 5f51ae050079..8f31963a10f6 100644
--- a/shared/common-adapters/scroll-view.d.ts
+++ b/shared/common-adapters/scroll-view.shared.tsx
@@ -2,17 +2,16 @@ import type * as React from 'react'
 import type {RefreshControlProps, GestureResponderEvent} from 'react-native'
 import type {StylesCrossPlatform} from '@/styles'
 
+export type ScrollViewRef = {
+  scrollTo: (arg0: {x: number; y: number; animated?: boolean}) => void
+  scrollToEnd: (options: {animated?: boolean; duration?: number}) => void
+}
+
 export type ScrollEvent = {
   nativeEvent?: {
-    contentSize: {
-      height: number
-      width: number
-    }
+    contentSize: {height: number; width: number}
     zoomScale: number
-    contentOffset: {
-      x: number
-      y: number
-    }
+    contentOffset: {x: number; y: number}
   }
   currentTarget?: HTMLDivElement
 }
@@ -26,7 +25,6 @@ export type Props = {
   ref?: React.Ref<ScrollViewRef>
   showsVerticalScrollIndicator?: boolean
   showsHorizontalScrollIndicator?: boolean
-  // mobile only
   bounces?: boolean
   contentInset?: {top?: number; left?: number; bottom?: number; right?: number}
   contentInsetAdjustmentBehavior?: 'automatic' | 'scrollableAxes' | 'never' | 'always'
@@ -46,12 +44,3 @@ export type Props = {
   onTouchStart?: (e: GestureResponderEvent) => void
   onTouchEnd?: (e: GestureResponderEvent) => void
 }
-
-export interface ScrollViewRef {
-  scrollTo: (arg0: {x: number; y: number; animated?: boolean}) => void
-  scrollToEnd: (options: {animated?: boolean; duration?: number}) => void
-}
-
-declare function ScrollView(props: Props): React.ReactElement
-
-export default ScrollView
diff --git a/shared/common-adapters/search-filter.tsx b/shared/common-adapters/search-filter.tsx
index 3766e8ffb16d..a73edf86d143 100644
--- a/shared/common-adapters/search-filter.tsx
+++ b/shared/common-adapters/search-filter.tsx
@@ -2,7 +2,8 @@ import * as React from 'react'
 import Animation from './animation'
 import {Box2} from './box'
 import ClickableBox, {ClickableBox2} from './clickable-box'
-import Input3, {type Input3Ref} from './input3'
+import Input3 from './input3'
+import type {Input3Ref} from './input3.shared'
 import Text from './text'
 import type {AllowedColors} from './text.shared'
 import ProgressIndicator from './progress-indicator'
diff --git a/shared/common-adapters/switch-toggle.desktop.tsx b/shared/common-adapters/switch-toggle.desktop.tsx
index 1229fd4fca92..dedf3b6d51ff 100644
--- a/shared/common-adapters/switch-toggle.desktop.tsx
+++ b/shared/common-adapters/switch-toggle.desktop.tsx
@@ -1,5 +1,5 @@
 import * as Styles from '@/styles'
-import type {Props} from './switch-toggle'
+import type {Props} from './switch-toggle.shared'
 
 const SwitchToggle = (props: Props) => (
   <div
diff --git a/shared/common-adapters/switch-toggle.native.tsx b/shared/common-adapters/switch-toggle.native.tsx
index 545a7f9e64fc..b55a9d409d91 100644
--- a/shared/common-adapters/switch-toggle.native.tsx
+++ b/shared/common-adapters/switch-toggle.native.tsx
@@ -1,7 +1,7 @@
 import * as React from 'react'
 import {Animated as NativeAnimated, Easing as NativeEasing} from 'react-native'
 import * as Styles from '@/styles'
-import type {Props} from './switch-toggle'
+import type {Props} from './switch-toggle.shared'
 
 const SwitchToggle = (props: Props) => {
   const {on: _on} = props
diff --git a/shared/common-adapters/switch-toggle.d.ts b/shared/common-adapters/switch-toggle.shared.tsx
similarity index 54%
rename from shared/common-adapters/switch-toggle.d.ts
rename to shared/common-adapters/switch-toggle.shared.tsx
index 34842648f0f7..0b880d63faff 100644
--- a/shared/common-adapters/switch-toggle.d.ts
+++ b/shared/common-adapters/switch-toggle.shared.tsx
@@ -1,4 +1,3 @@
-import type * as React from 'react'
 import type * as Styles from '@/styles'
 
 export type Props = {
@@ -6,6 +5,3 @@ export type Props = {
   on: boolean
   style?: Styles.StylesCrossPlatform
 }
-
-declare const SwitchToggle: (p: Props) => React.ReactNode
-export default SwitchToggle
diff --git a/shared/common-adapters/text-url.d.ts b/shared/common-adapters/text-url.d.ts
deleted file mode 100644
index 83d7e0dd24d0..000000000000
--- a/shared/common-adapters/text-url.d.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export declare function useClickURL(url: string | undefined): {
-  readonly onClick?: (e: React.BaseSyntheticEvent) => void
-  readonly onContextMenu?: (e: React.BaseSyntheticEvent) => void
-  readonly onLongPress?: () => void
-}
diff --git a/shared/common-adapters/text-url.desktop.tsx b/shared/common-adapters/text-url.desktop.tsx
index c72177810150..c48a64905b2d 100644
--- a/shared/common-adapters/text-url.desktop.tsx
+++ b/shared/common-adapters/text-url.desktop.tsx
@@ -7,7 +7,7 @@ export function useClickURL(url: string | undefined) {
   return {
     onClick: (e: React.BaseSyntheticEvent) => {
       e.stopPropagation()
-      openURL(url)
+      void openURL(url)
     },
     onContextMenu: (e: React.BaseSyntheticEvent) => {
       e.stopPropagation()
diff --git a/shared/common-adapters/text.d.ts b/shared/common-adapters/text.d.ts
deleted file mode 100644
index 36e08afca95f..000000000000
--- a/shared/common-adapters/text.d.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-import type * as CSS from '@/styles/css'
-import type * as React from 'react'
-import type {MeasureRef} from './measure-ref'
-import type {TextType} from './text.shared'
-
-export type Props = {
-  type?: TextType
-  children?: React.ReactNode
-  style?: CSS.StylesCrossPlatform
-  allowFontScaling?: boolean
-  onClick?: (e: React.BaseSyntheticEvent) => void
-  onContextMenu?: (e: React.BaseSyntheticEvent) => void
-  onLongPress?: () => void
-  center?: boolean
-  negative?: boolean
-  lineClamp?: number
-  ellipsizeMode?: 'head' | 'middle' | 'tail' | 'clip'
-  selectable?: boolean
-  title?: string
-  tooltip?: string
-  textRef?: React.RefObject<MeasureRef | null>
-  underline?: boolean
-  underlineNever?: boolean
-  virtualText?: boolean
-  className?: string
-}
-export declare const Text: (p: Props) => React.ReactNode
-export default Text
diff --git a/shared/common-adapters/text.desktop.tsx b/shared/common-adapters/text.desktop.tsx
index 379c1e4ea01c..51d1ee7033d2 100644
--- a/shared/common-adapters/text.desktop.tsx
+++ b/shared/common-adapters/text.desktop.tsx
@@ -1,6 +1,6 @@
 import * as Styles from '@/styles'
 import {linkTypes} from './text.shared'
-import type {Props} from './text'
+import type {Props} from './text.shared'
 import './text.css'
 
 export function Text(p: Props) {
diff --git a/shared/common-adapters/text.native.tsx b/shared/common-adapters/text.native.tsx
index 1e4b9b378a16..c48acaf2bc74 100644
--- a/shared/common-adapters/text.native.tsx
+++ b/shared/common-adapters/text.native.tsx
@@ -1,6 +1,6 @@
 import * as Styles from '@/styles'
 import {typeStyles, negativeColors} from './text.meta.native'
-import type {Props} from './text'
+import type {Props} from './text.shared'
 import {Text as RNText} from 'react-native'
 
 export function Text(p: Props) {
diff --git a/shared/common-adapters/text.shared.tsx b/shared/common-adapters/text.shared.tsx
index 4a37562375d8..ffef9c45f6a2 100644
--- a/shared/common-adapters/text.shared.tsx
+++ b/shared/common-adapters/text.shared.tsx
@@ -1,5 +1,7 @@
+import type * as React from 'react'
 import type * as CSS from '@/styles/css'
 import type colors from '@/styles/colors'
+import type {MeasureRef} from './measure-ref'
 
 /* eslint-disable sort-keys */
 const _allTextTypes = {
@@ -125,3 +127,25 @@ export type TextStyle = CSS._StylesCrossPlatform & {
 
 export const backgroundModeIsNegative = (bm?: Background): boolean =>
   !!bm && !['Normal', 'Information'].includes(bm)
+
+export type Props = {
+  type?: TextType
+  children?: React.ReactNode
+  style?: CSS.StylesCrossPlatform
+  allowFontScaling?: boolean
+  onClick?: (e: React.BaseSyntheticEvent) => void
+  onContextMenu?: (e: React.BaseSyntheticEvent) => void
+  onLongPress?: () => void
+  center?: boolean
+  negative?: boolean
+  lineClamp?: number
+  ellipsizeMode?: 'head' | 'middle' | 'tail' | 'clip'
+  selectable?: boolean
+  title?: string
+  tooltip?: string
+  textRef?: React.RefObject<MeasureRef | null>
+  underline?: boolean
+  underlineNever?: boolean
+  virtualText?: boolean
+  className?: string
+}
diff --git a/shared/common-adapters/text.styles.d.ts b/shared/common-adapters/text.styles.d.ts
deleted file mode 100644
index 229c621f89f7..000000000000
--- a/shared/common-adapters/text.styles.d.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-import type {TextType, TextStyle} from './text.shared'
-export declare function getTextStyle(type: TextType, isDarkMode: boolean): TextStyle
diff --git a/shared/common-adapters/toast.desktop.tsx b/shared/common-adapters/toast.desktop.tsx
index ffde305b9aee..12e71fb1d642 100644
--- a/shared/common-adapters/toast.desktop.tsx
+++ b/shared/common-adapters/toast.desktop.tsx
@@ -1,6 +1,6 @@
 import * as C from '@/constants'
 import * as React from 'react'
-import type {Props} from './toast'
+import type {Props} from './toast.shared'
 import Popup from './popup'
 import * as Styles from '@/styles'
 import './toast.css'
diff --git a/shared/common-adapters/toast.native.tsx b/shared/common-adapters/toast.native.tsx
index 1edc53087eaf..41a3d97152dc 100644
--- a/shared/common-adapters/toast.native.tsx
+++ b/shared/common-adapters/toast.native.tsx
@@ -5,7 +5,7 @@ import {Box2} from './box'
 import {KeyboardAvoidingView2} from './keyboard-avoiding-view'
 import Popup from './popup'
 import {Animated as NativeAnimated, Easing as NativeEasing} from 'react-native'
-import type {Props} from './toast'
+import type {Props} from './toast.shared'
 import {colors, darkColors} from '@/styles/colors'
 import {useColorScheme} from 'react-native'
 
diff --git a/shared/common-adapters/toast.d.ts b/shared/common-adapters/toast.shared.tsx
similarity index 69%
rename from shared/common-adapters/toast.d.ts
rename to shared/common-adapters/toast.shared.tsx
index d976b8e1bc34..e81f54ce55b7 100644
--- a/shared/common-adapters/toast.d.ts
+++ b/shared/common-adapters/toast.shared.tsx
@@ -8,9 +8,5 @@ export type Props = {
   containerStyle?: StylesCrossPlatform
   visible: boolean
   attachTo?: React.RefObject<MeasureRef | null>
-  // applies on desktop only. Mobile is always centered in the screen
   position?: Position
 }
-
-export declare const Toast: (p: Props) => React.ReactNode
-export default Toast
diff --git a/shared/common-adapters/video.d.ts b/shared/common-adapters/video.d.ts
deleted file mode 100644
index 6242e3af2763..000000000000
--- a/shared/common-adapters/video.d.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import type * as React from 'react'
-import type * as Styles from '@/styles'
-
-export type Props = {
-  hideControls?: boolean
-  onUrlError?: (err: string) => void
-  style?: Styles.StylesCrossPlatform
-  url: string
-  allowFile?: boolean
-  muted?: boolean
-  autoPlay?: boolean
-}
-
-export type State = {
-  containerHeight: number
-  containerWidth: number
-  loadedVideoSize: boolean
-  videoHeight: number
-  videoWidth: number
-}
-
-declare const Video: (p: Props) => React.ReactNode
-export default Video
diff --git a/shared/common-adapters/video.desktop.tsx b/shared/common-adapters/video.desktop.tsx
index 5385d1c32ad2..0a5b4955cfe7 100644
--- a/shared/common-adapters/video.desktop.tsx
+++ b/shared/common-adapters/video.desktop.tsx
@@ -1,5 +1,5 @@
 import * as React from 'react'
-import type {Props} from './video'
+import type {Props} from './video.shared'
 import * as Styles from '@/styles'
 import {useCheckURL} from './video.shared'
 
diff --git a/shared/common-adapters/video.native.tsx b/shared/common-adapters/video.native.tsx
index 9c8f3a4dbdf0..d88c254c4274 100644
--- a/shared/common-adapters/video.native.tsx
+++ b/shared/common-adapters/video.native.tsx
@@ -1,7 +1,7 @@
 import * as React from 'react'
 import * as Styles from '@/styles'
 import {Box2} from './box'
-import type {Props} from './video'
+import type {Props} from './video.shared'
 import {StatusBar} from 'react-native'
 import {useVideoPlayer, VideoView} from 'expo-video'
 import {useEventListener} from 'expo'
diff --git a/shared/common-adapters/video.shared.tsx b/shared/common-adapters/video.shared.tsx
index 43032dbe9ef1..92de208fa5e5 100644
--- a/shared/common-adapters/video.shared.tsx
+++ b/shared/common-adapters/video.shared.tsx
@@ -1,3 +1,4 @@
+import type * as Styles from '@/styles'
 import type * as React from 'react'
 import {Box2} from './box'
 import Text from './text'
@@ -47,6 +48,16 @@ const isAllowedFilePath = (url: string, allowFile?: boolean) => {
 const urlIsOK = (url: string, allowFile?: boolean) =>
   isAllowedHostURL(url) || (hasAllowedChars(url) && isAllowedFilePath(url, allowFile))
 
+export type Props = {
+  hideControls?: boolean
+  onUrlError?: (err: string) => void
+  style?: Styles.StylesCrossPlatform
+  url: string
+  allowFile?: boolean
+  muted?: boolean
+  autoPlay?: boolean
+}
+
 export const useCheckURL = (children: React.ReactElement, url: string, allowFile?: boolean) => {
   const ok = urlIsOK(url, allowFile)
   return ok ? (
diff --git a/shared/common-adapters/web-view.desktop.tsx b/shared/common-adapters/web-view.desktop.tsx
index 2f13bb9c4eb4..87d78007903d 100644
--- a/shared/common-adapters/web-view.desktop.tsx
+++ b/shared/common-adapters/web-view.desktop.tsx
@@ -1,5 +1,6 @@
 import * as React from 'react'
-import type {WebViewProps} from './web-view'
+import type {WebViewProps} from './web-view.shared'
+export type {WebViewProps, WebViewInjections} from './web-view.shared'
 // this class isn't used at all afaik
 
 // not properly exposed in electron yet
diff --git a/shared/common-adapters/web-view.native.tsx b/shared/common-adapters/web-view.native.tsx
index b134c491d62f..e6082e25abe7 100644
--- a/shared/common-adapters/web-view.native.tsx
+++ b/shared/common-adapters/web-view.native.tsx
@@ -4,7 +4,7 @@ import * as Styles from '@/styles'
 import LoadingStateView from './loading-state-view'
 import memoize from 'lodash/memoize'
 import {openURL} from '@/util/misc'
-import type {WebViewInjections, WebViewProps} from './web-view'
+import type {WebViewInjections, WebViewProps} from './web-view.shared'
 import {View as NativeView} from 'react-native'
 import {WebView as NativeWebView} from 'react-native-webview'
 
diff --git a/shared/common-adapters/web-view.d.ts b/shared/common-adapters/web-view.shared.tsx
similarity index 78%
rename from shared/common-adapters/web-view.d.ts
rename to shared/common-adapters/web-view.shared.tsx
index ec30c576bfdc..15e8c8fa0760 100644
--- a/shared/common-adapters/web-view.d.ts
+++ b/shared/common-adapters/web-view.shared.tsx
@@ -12,11 +12,9 @@ export type WebViewProps = {
   originWhitelist?: Array<string>
   renderLoading?: () => React.ReactElement
   url: string
-  pinnedURLMode?: boolean // only tested on iOS
+  pinnedURLMode?: boolean
   injections?: WebViewInjections
   style?: object
   showLoadingStateUntilLoaded?: boolean
   onError?: (err: string) => void
 }
-declare const WebView: (p: WebViewProps) => React.ReactNode
-export default WebView
diff --git a/shared/common-adapters/with-tooltip.desktop.tsx b/shared/common-adapters/with-tooltip.desktop.tsx
index cec7aab3a2a1..da3f7163b618 100644
--- a/shared/common-adapters/with-tooltip.desktop.tsx
+++ b/shared/common-adapters/with-tooltip.desktop.tsx
@@ -3,7 +3,7 @@ import * as Styles from '@/styles'
 import {Box2} from './box'
 import Toast from './toast'
 import Text from './text'
-import type {Props} from './with-tooltip'
+import type {Props} from './with-tooltip.shared'
 import type {MeasureRef} from './measure-ref'
 
 const IGNORE_FOR_PROFILING = false as boolean
diff --git a/shared/common-adapters/with-tooltip.native.tsx b/shared/common-adapters/with-tooltip.native.tsx
index 0d7c2ce35fd6..9f8843cd1add 100644
--- a/shared/common-adapters/with-tooltip.native.tsx
+++ b/shared/common-adapters/with-tooltip.native.tsx
@@ -6,7 +6,7 @@ import {Box2} from './box'
 import ClickableBox from './clickable-box'
 import Text from './text'
 import * as Styles from '@/styles'
-import type {Props} from './with-tooltip'
+import type {Props} from './with-tooltip.shared'
 import {View} from 'react-native'
 import {useSafeAreaFrame} from 'react-native-safe-area-context'
 
diff --git a/shared/common-adapters/with-tooltip.d.ts b/shared/common-adapters/with-tooltip.shared.tsx
similarity index 70%
rename from shared/common-adapters/with-tooltip.d.ts
rename to shared/common-adapters/with-tooltip.shared.tsx
index 1ce8b1192d0d..d7650d74e2ff 100644
--- a/shared/common-adapters/with-tooltip.d.ts
+++ b/shared/common-adapters/with-tooltip.shared.tsx
@@ -8,13 +8,10 @@ export type Props = {
   multiline?: boolean
   containerStyle?: StylesCrossPlatform
   children: React.ReactNode
-  position?: Position // on mobile only 'top center' and 'bottom center' are supported,,
+  position?: Position
   className?: string
   toastClassName?: string
   toastStyle?: StylesCrossPlatform
   textStyle?: StylesCrossPlatform
   showOnPressMobile?: boolean
 }
-
-export declare const WithTooltip: (p: Props) => React.ReactNode
-export default WithTooltip
diff --git a/shared/common-adapters/zoomable-image.desktop.tsx b/shared/common-adapters/zoomable-image.desktop.tsx
index b5ee5944643e..239e5760c851 100644
--- a/shared/common-adapters/zoomable-image.desktop.tsx
+++ b/shared/common-adapters/zoomable-image.desktop.tsx
@@ -2,7 +2,7 @@ import * as React from 'react'
 import Toast from './toast.desktop'
 import {Box2} from './box'
 import Text from './text'
-import type {Props} from './zoomable-image'
+import type {Props} from './zoomable-image.shared'
 const Kb = {
   Box2,
   Text,
diff --git a/shared/common-adapters/zoomable-image.native.tsx b/shared/common-adapters/zoomable-image.native.tsx
index 1bdac15a5b00..23d5d0f82fcc 100644
--- a/shared/common-adapters/zoomable-image.native.tsx
+++ b/shared/common-adapters/zoomable-image.native.tsx
@@ -1,4 +1,4 @@
-import type {Props} from './zoomable-image'
+import type {Props} from './zoomable-image.shared'
 import * as Styles from '@/styles'
 import * as React from 'react'
 import Image from './image.native'
diff --git a/shared/common-adapters/zoomable-image.d.ts b/shared/common-adapters/zoomable-image.shared.tsx
similarity index 50%
rename from shared/common-adapters/zoomable-image.d.ts
rename to shared/common-adapters/zoomable-image.shared.tsx
index da6a7aaa35cf..801335b3271d 100644
--- a/shared/common-adapters/zoomable-image.d.ts
+++ b/shared/common-adapters/zoomable-image.shared.tsx
@@ -1,24 +1,17 @@
-import type * as React from 'react'
 import type * as Styles from '@/styles'
 
 export type Props = {
   src: string
   style?: Styles.StylesCrossPlatform
   zoomRatio?: number
-  // desktop only
   onLoaded?: () => void
   onError?: () => void
-  onIsZoomed?: (z: boolean) => void // desktop only
-  dragPan?: boolean // desktop only, pan on drag only
-  forceDims?: {height: number; width: number} // desktop only
+  onIsZoomed?: (z: boolean) => void
+  dragPan?: boolean
+  forceDims?: {height: number; width: number}
   onChanged?: (e: {height: number; width: number; x: number; y: number; scale: number}) => void
-  // mobile only, called if swiping while not zoomed
   onSwipe?: (left: boolean) => void
   onTap?: () => void
-  // hints for sizes
   srcDims?: {height: number; width: number}
   boxCacheKey?: string
 }
-
-export declare const ZoomableImage: (p: Props) => React.ReactNode
-export default ZoomableImage
diff --git a/shared/constants/init/index.d.ts b/shared/constants/init/index.d.ts
deleted file mode 100644
index 992fbdda468d..000000000000
--- a/shared/constants/init/index.d.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-// links all the stores together, stores never import this
-import type * as EngineGen from '@/constants/rpc'
-
-export declare function initPlatformListener(): void
-export declare function onEngineConnected(): void
-export declare function onEngineDisconnected(): void
-export declare function onEngineIncoming(action: EngineGen.Actions): void
diff --git a/shared/constants/platform.d.ts b/shared/constants/platform.d.ts
deleted file mode 100644
index 0aeba7e43478..000000000000
--- a/shared/constants/platform.d.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-export const runMode: string
-
-export const isNewArch: boolean // RN new arch
-export const isMobile: boolean
-export const isAndroid: boolean
-export const isIOS: boolean
-export const isLargeScreen: boolean
-export const isTablet: boolean
-export const isPhone: boolean
-export const pathSep: '/' | '\\'
-
-export const isElectron: boolean
-export const isDarwin: boolean
-export const isWindows: boolean
-export const isLinux: boolean
-export const isMac: boolean
-export const getModKey: (e: {metaKey: boolean; ctrlKey: boolean}) => boolean
-export const isDebuggingInChrome: boolean // only useful in RN
-
-export const isDeviceSecureAndroid: boolean
-export const isAndroidNewerThanM: boolean
-export const isAndroidNewerThanN: boolean
-export const defaultUseNativeFrame: boolean
-export const androidIsTestDevice: boolean
-
-export const downloadFolder: string
-export const fileUIName: string
-export const version: string
-export const pprofDir: string
-export const serverConfigFileName: string
-export const shortcutSymbol: string
-export const realDeviceName: string
-export const fsCacheDir: string
-export const uses24HourClock: boolean
diff --git a/shared/constants/platform.desktop.tsx b/shared/constants/platform.desktop.tsx
index 080278585284..7698886aa0e4 100644
--- a/shared/constants/platform.desktop.tsx
+++ b/shared/constants/platform.desktop.tsx
@@ -3,21 +3,21 @@ import KB2 from '@/util/electron.desktop'
 
 const {env, platform} = KB2.constants
 
-export const isNewArch = false
-export const androidIsTestDevice = false
-export const isMobile = false
-export const isPhone = false
-export const isAndroid = false
-export const isIOS = false
-export const isLargeScreen = true
-export const isTablet = false
-export const isDebuggingInChrome = true
+export const isNewArch: boolean = false
+export const androidIsTestDevice: boolean = false
+export const isMobile: boolean = false
+export const isPhone: boolean = false
+export const isAndroid: boolean = false
+export const isIOS: boolean = false
+export const isLargeScreen: boolean = true
+export const isTablet: boolean = false
+export const isDebuggingInChrome: boolean = true
 
 export const dokanPath = KB2.constants.dokanPath
 export const windowsBinPath = KB2.constants.windowsBinPath
 export const pathSep = KB2.constants.pathSep
 
-export const isElectron = true
+export const isElectron: boolean = true
 export const isDarwin = platform === 'darwin'
 export const isWindows = platform === 'win32'
 export const isLinux = platform === 'linux'
@@ -27,9 +27,9 @@ export const getModKey = (e: {metaKey: boolean; ctrlKey: boolean}): boolean => {
   return isMac ? e.metaKey : e.ctrlKey
 }
 
-export const isDeviceSecureAndroid = false
-export const isAndroidNewerThanN = false
-export const isAndroidNewerThanM = false
+export const isDeviceSecureAndroid: boolean = false
+export const isAndroidNewerThanN: boolean = false
+export const isAndroidNewerThanM: boolean = false
 export const shortcutSymbol = isDarwin ? '⌘' : 'Ctrl-'
 export const realDeviceName = ''
 
diff --git a/shared/constants/platform.native.tsx b/shared/constants/platform.native.tsx
index fd892cabe978..01ed593de55c 100644
--- a/shared/constants/platform.native.tsx
+++ b/shared/constants/platform.native.tsx
@@ -45,20 +45,20 @@ export const setSecureFlagSetting = async (secure: boolean): Promise<boolean> =>
 // Currently this is given to us as a boolean, but no real documentation on this, so just in case it changes in the future.
 // Android only field that tells us if there is a lock screen.
 export const isDeviceSecureAndroid = androidIsDeviceSecure
-export const runMode = 'prod'
+export const runMode: string = 'prod'
 export const pathSep = '/'
 
 export const isIOS = Platform.OS === 'ios'
 export const isAndroid = !isIOS
-export const isMobile = true
+export const isMobile: boolean = true
 export const isTablet = Platform.OS === 'ios' && Platform.isPad
 export const isPhone = !isTablet
 
-export const isDarwin = false
-export const isElectron = false
-export const isLinux = false
-export const isWindows = false
-export const isMac = false
+export const isDarwin: boolean = false
+export const isElectron: boolean = false
+export const isLinux: boolean = false
+export const isWindows: boolean = false
+export const isMac: boolean = false
 
 export const getModKey = (_e: {metaKey: boolean; ctrlKey: boolean}): boolean => {
   return false
diff --git a/shared/crypto/sub-nav/index.d.ts b/shared/crypto/sub-nav/index.d.ts
deleted file mode 100644
index cd674b9098c6..000000000000
--- a/shared/crypto/sub-nav/index.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import type * as React from 'react'
-declare const SubNav: () => React.ReactNode
-export default SubNav
diff --git a/shared/desktop/yarn-helper/font.mts b/shared/desktop/yarn-helper/font.mts
index d2465b400096..67325e3917a1 100644
--- a/shared/desktop/yarn-helper/font.mts
+++ b/shared/desktop/yarn-helper/font.mts
@@ -1,4 +1,4 @@
-/* eslint-disable sort-keys */
+ 
 import fs from 'fs'
 import path from 'path'
 import {execSync} from 'child_process'
diff --git a/shared/engine/index-impl.tsx b/shared/engine/index-impl.tsx
index ad8bb4b7c2b9..7b421ec8468d 100644
--- a/shared/engine/index-impl.tsx
+++ b/shared/engine/index-impl.tsx
@@ -3,7 +3,7 @@ import Session, {type CancelHandlerType} from './session'
 import engineListener from './listener'
 import logger from '@/logger'
 import throttle from 'lodash/throttle'
-import type {CustomResponseIncomingCallMapType, IncomingCallMapType, BatchParams} from '.'
+import type {CustomResponseIncomingCallMapType, IncomingCallMapType, BatchParams} from './index.shared'
 import type {SessionIDKey, MethodKey} from './types'
 import {initEngine, initEngineListener} from './require'
 import {isMobile} from '@/constants/platform'
@@ -203,7 +203,7 @@ class Engine {
   // An outgoing call. ONLY called by the flow-type rpc helpers
   _rpcOutgoing(p: {
     method: string
-    params: object
+    params: object | undefined
     callback: (...args: Array<any>) => void
     incomingCallMap?: IncomingCallMapType
     customResponseIncomingCallMap?: CustomResponseIncomingCallMapType
@@ -237,7 +237,7 @@ class Engine {
       cancelHandler,
       customResponseIncomingCallMap,
       dangling,
-      endHandler: (session: Session) => this._sessionEnded(session),
+      endHandler: session => this._sessionEnded(session),
       incomingCallMap,
       invoke: (method, param, cb) => {
         const callback =
@@ -247,9 +247,9 @@ class Engine {
             if (args.length > 0 && !!args[0]) {
               args[0] = convertToError(args[0], method)
             }
-            cb(...args)
+            cb(args[0], args[1])
           }
-        this._rpcClient.invoke(method, param || [{}], callback(method))
+        this._rpcClient.invoke(method, param, callback(method))
       },
       sessionID,
       waitingKey,
@@ -260,7 +260,7 @@ class Engine {
   }
 
   // Cleanup a session that ended
-  _sessionEnded(session: Session) {
+  _sessionEnded(session: {getId: () => number; _startMethod?: string}) {
     rpcLog({
       extra: {
         sessionID: session.getId(),
diff --git a/shared/engine/index.desktop.tsx b/shared/engine/index.desktop.tsx
index dc1fdeaf3650..119d27a09943 100644
--- a/shared/engine/index.desktop.tsx
+++ b/shared/engine/index.desktop.tsx
@@ -1,8 +1 @@
-import * as Impl from './index-impl'
-
-const getEngine = Impl.getEngine
-const makeEngine = Impl.makeEngine
-const Engine = Impl.Engine
-
-export default Impl.default
-export {getEngine, makeEngine, Engine}
+export {default, getEngine, makeEngine, Engine} from './index-impl'
diff --git a/shared/engine/index.native.tsx b/shared/engine/index.native.tsx
index dc1fdeaf3650..119d27a09943 100644
--- a/shared/engine/index.native.tsx
+++ b/shared/engine/index.native.tsx
@@ -1,8 +1 @@
-import * as Impl from './index-impl'
-
-const getEngine = Impl.getEngine
-const makeEngine = Impl.makeEngine
-const Engine = Impl.Engine
-
-export default Impl.default
-export {getEngine, makeEngine, Engine}
+export {default, getEngine, makeEngine, Engine} from './index-impl'
diff --git a/shared/engine/index.platform.d.ts b/shared/engine/index.platform.d.ts
deleted file mode 100644
index 71541235c3e7..000000000000
--- a/shared/engine/index.platform.d.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-import type {
-  ConnectDisconnectCB,
-  IncomingRPCCallbackType,
-  InvokeType,
-  PayloadType,
-  RPCMessage,
-  RPCTransport,
-} from './rpc-transport'
-
-export type {ConnectDisconnectCB, IncomingRPCCallbackType, InvokeType, PayloadType, RPCMessage}
-
-export type CreateClientType = {
-  transport: RPCTransport & {
-    needsConnect: boolean
-    reset: () => void
-    close?: () => void
-    send: (message: unknown) => boolean
-    packetizeData: (data: Uint8Array) => void
-    dispatchDecodedMessage: (message: unknown) => void
-  }
-  invoke: InvokeType
-}
-
-declare function createClient(
-  incomingRPCCallback: IncomingRPCCallbackType,
-  connectCallback: ConnectDisconnectCB,
-  disconnectCallback: ConnectDisconnectCB
-): CreateClientType
-
-declare function resetClient(
-  client: CreateClientType,
-  incomingRPCCallback: IncomingRPCCallbackType,
-  connectCallback: ConnectDisconnectCB,
-  disconnectCallback: ConnectDisconnectCB
-): CreateClientType
-
-declare function rpcLog(arg0: {method: string; reason?: string; extra?: object; type: string}): void
-
-export {createClient, resetClient, rpcLog}
diff --git a/shared/engine/index.platform.desktop.tsx b/shared/engine/index.platform.desktop.tsx
index b993493cf356..65c55d50a0de 100644
--- a/shared/engine/index.platform.desktop.tsx
+++ b/shared/engine/index.platform.desktop.tsx
@@ -3,7 +3,7 @@ import logger from '@/logger'
 import {TransportShared, LocalTransport, sharedCreateClient, rpcLog} from './transport-shared'
 import {socketPath} from '@/constants/platform.desktop'
 import {printRPCBytes} from '@/local-debug'
-import type {CreateClientType, IncomingRPCCallbackType, ConnectDisconnectCB} from './index.platform'
+import type {CreateClientType, IncomingRPCCallbackType, ConnectDisconnectCB} from './index.platform.shared'
 import type {RPCMessage} from './rpc-transport'
 import KB2 from '@/util/electron.desktop'
 
@@ -179,4 +179,5 @@ function resetClient(
   return sharedCreateClient(new NativeTransport(incomingRPCCallback, connectCallback, disconnectCallback))
 }
 
+export type {CreateClientType, PayloadType, InvokeType} from './index.platform.shared'
 export {resetClient, createClient, rpcLog}
diff --git a/shared/engine/index.platform.native.tsx b/shared/engine/index.platform.native.tsx
index c44c5e993549..8203e3988881 100644
--- a/shared/engine/index.platform.native.tsx
+++ b/shared/engine/index.platform.native.tsx
@@ -1,5 +1,5 @@
 import {LocalTransport, sharedCreateClient, rpcLog} from './transport-shared'
-import type {IncomingRPCCallbackType, ConnectDisconnectCB, CreateClientType} from './index.platform'
+import type {IncomingRPCCallbackType, ConnectDisconnectCB, CreateClientType} from './index.platform.shared'
 import type {RPCMessage} from './rpc-transport'
 import logger from '@/logger'
 import {engineReset, getNativeEmitter, notifyJSReady} from 'react-native-kb'
@@ -61,10 +61,11 @@ function createClient(
   return client
 }
 
-function resetClient(client: CreateClientType) {
+function resetClient(client: CreateClientType, _ic?: IncomingRPCCallbackType, _cc?: ConnectDisconnectCB, _dc?: ConnectDisconnectCB) {
   // Tell the RN bridge to reset itself
   engineReset()
   return client
 }
 
+export type {CreateClientType, PayloadType, InvokeType} from './index.platform.shared'
 export {resetClient, createClient, rpcLog}
diff --git a/shared/engine/index.platform.shared.tsx b/shared/engine/index.platform.shared.tsx
new file mode 100644
index 000000000000..e4a93e264467
--- /dev/null
+++ b/shared/engine/index.platform.shared.tsx
@@ -0,0 +1,15 @@
+import type {RPCTransport, InvokeType, PayloadType, ConnectDisconnectCB, IncomingRPCCallbackType} from '@/engine/rpc-transport'
+
+export type {PayloadType, ConnectDisconnectCB, IncomingRPCCallbackType, InvokeType}
+
+export type CreateClientType = {
+  transport: RPCTransport & {
+    needsConnect: boolean
+    reset: () => void
+    close?: () => void
+    send: (message: unknown) => boolean
+    packetizeData: (data: Uint8Array) => void
+    dispatchDecodedMessage: (message: unknown) => void
+  }
+  invoke: InvokeType
+}
diff --git a/shared/engine/index.d.ts b/shared/engine/index.shared.tsx
similarity index 87%
rename from shared/engine/index.d.ts
rename to shared/engine/index.shared.tsx
index 85e011f88d48..cd0c00e0c409 100644
--- a/shared/engine/index.d.ts
+++ b/shared/engine/index.shared.tsx
@@ -1,7 +1,8 @@
-import type Session from './session'
+import type Session from '@/engine/session-impl'
 import type {RPCError} from '@/util/errors'
 import type {IncomingCallMapType, CustomResponseIncomingCallMapType} from '@/constants/rpc/rpc-all-gen'
-import type {CreateClientType} from './index.platform'
+import type {CreateClientType} from '@/engine/index.platform.shared'
+import type * as EngineGen from '@/constants/rpc'
 
 export type BatchParams = Array<{key: string | ReadonlyArray<string>; increment: boolean; error?: RPCError}>
 
diff --git a/shared/engine/request.tsx b/shared/engine/request.tsx
index 51c49c8fcde3..c332bc19d124 100644
--- a/shared/engine/request.tsx
+++ b/shared/engine/request.tsx
@@ -48,12 +48,12 @@ class IncomingRequest extends Request {
   }
 
   result(...args: Array<unknown>) {
-    this._response?.result(...args)
+    this._response?.result?.(...args)
     this._cleanup()
   }
 
   error(...args: Array<unknown>) {
-    this._response?.error(...args)
+    this._response?.error?.(...args)
     this._cleanup()
   }
 
diff --git a/shared/engine/session-impl.tsx b/shared/engine/session-impl.tsx
index 7dd74bd69bcf..dffd4ee1d10b 100644
--- a/shared/engine/session-impl.tsx
+++ b/shared/engine/session-impl.tsx
@@ -118,7 +118,7 @@ class Session {
   }
 
   // Start the session normally. Tells engine we're done at the end
-  start(method: MethodKey, param: object, callback: (() => void) | undefined) {
+  start(method: MethodKey, param: object | undefined, callback: (() => void) | undefined) {
     this._startMethod = method
     this._startCallback = callback
 
@@ -129,9 +129,8 @@ class Session {
       this.end()
     }
 
-    // Add the sessionID
     const wrappedParam = {
-      ...param,
+      ...(param ?? {}),
       sessionID: this.getId(),
     }
 
@@ -154,7 +153,7 @@ class Session {
   }
 
   // We have an incoming call tied to a sessionID, called only by engine
-  incomingCall(method: keyof IncomingCallMapType, param: object, response?: ResponseType): boolean {
+  incomingCall(method: MethodKey, param: object, response?: ResponseType): boolean {
     rpcLog({
       extra: {
         id: this.getId(),
@@ -166,7 +165,7 @@ class Session {
       type: 'engineInternal',
     })
 
-    let handler = this._incomingCallMap[method] as
+    let handler = (this._incomingCallMap as {[key: string]: unknown})[method] as
       | undefined
       | ((param: object | undefined, request: ResponseType) => void)
 
diff --git a/shared/engine/session.d.ts b/shared/engine/session.d.ts
deleted file mode 100644
index 246b93e15125..000000000000
--- a/shared/engine/session.d.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-import type {
-  CustomResponseIncomingCallMap as KBCustomResponseIncomingCallMap,
-  IncomingCallMapType as KBIncomingCallMap,
-} from '@/constants/rpc/rpc-gen'
-import type {
-  CustomResponseIncomingCallMap as ChatCustomResponseIncomingCallMap,
-  IncomingCallMapType as ChatIncomingCallMap,
-} from '@/constants/rpc/rpc-chat-gen'
-import type {
-  CustomResponseIncomingCallMap as GregorCustomResponseIncomingCallMap,
-  IncomingCallMapType as GregorIncomingCallMap,
-} from '@/constants/rpc/rpc-gregor-gen'
-import type {
-  CustomResponseIncomingCallMap as SellarCustomResponseIncomingCallMap,
-  IncomingCallMapType as SellarIncomingCallMap,
-} from '@/constants/rpc/rpc-stellar-gen'
-
-type IncomingCallMap = {} & KBIncomingCallMap &
-  ChatIncomingCallMap &
-  GregorIncomingCallMap &
-  SellarIncomingCallMap
-type CustomResponseIncomingCallMap = {} & KBCustomResponseIncomingCallMap &
-  ChatCustomResponseIncomingCallMap &
-  GregorCustomResponseIncomingCallMap &
-  SellarCustomResponseIncomingCallMap
-declare class Session {
-  id: number
-  getId: () => number
-  end: () => void
-  getDangling: () => boolean
-  hasSeqID: (seqID: number) => boolean
-  _startMethod: string | undefined
-  cancel: () => void
-  incomingCall: (method: string, param: object, response?: object) => boolean
-  start: (method: string, param?: object, callback?: () => void) => void
-  constructor(p: {
-    sessionID: number
-    incomingCallMap?: IncomingCallMap
-    customResponseIncomingCallMap?: CustomResponseIncomingCallMap
-    waitingKey?: string | ReadonlyArray<string>
-    invoke: (method: string, param: [object] | undefined, cb: (err?: unknown, data?: unknown) => void) => void
-    endHandler: (session: Session) => void
-    cancelHandler?: (session: Session) => void
-    dangling?: boolean
-  })
-}
-
-export default Session
-
-export type CancelHandlerType = (session: Session) => void
diff --git a/shared/engine/session.desktop.tsx b/shared/engine/session.desktop.tsx
index 85cf29969555..1cc4a6451cef 100644
--- a/shared/engine/session.desktop.tsx
+++ b/shared/engine/session.desktop.tsx
@@ -1,4 +1,2 @@
-import * as Impl from './session-impl'
-
-const Session = Impl.default
-export default Session
+export {default} from './session-impl'
+export type {CancelHandlerType} from './session-impl'
diff --git a/shared/engine/session.native.tsx b/shared/engine/session.native.tsx
index 85cf29969555..1cc4a6451cef 100644
--- a/shared/engine/session.native.tsx
+++ b/shared/engine/session.native.tsx
@@ -1,4 +1,2 @@
-import * as Impl from './session-impl'
-
-const Session = Impl.default
-export default Session
+export {default} from './session-impl'
+export type {CancelHandlerType} from './session-impl'
diff --git a/shared/engine/types.d.ts b/shared/engine/types.ts
similarity index 76%
rename from shared/engine/types.d.ts
rename to shared/engine/types.ts
index f387ce0cae9e..b93f033a44ed 100644
--- a/shared/engine/types.d.ts
+++ b/shared/engine/types.ts
@@ -1,12 +1,12 @@
-import type {ErrorType} from './rpc-transport'
-export type EndHandlerType = (session: object) => void
+import type {ErrorType} from '@/engine/rpc-transport'
 export type MethodKey = string
 export type SessionID = number
 export type SessionIDKey = string // used in our maps, really converted to a string key
 export type WaitingHandlerType = (waiting: boolean, method: string, sessionID: SessionID) => object
+export type EndHandlerType = (session: {getId: () => SessionID; _startMethod?: MethodKey}) => void
 export type ResponseType = {
-  result: (...args: Array<any>) => void
-  error: (...args: Array<any>) => void
+  result?: (...args: Array<any>) => void
+  error?: (...args: Array<any>) => void
   seqid?: number
 }
 export type RPCErrorHandler = (e: ErrorType) => void
diff --git a/shared/eslint.config.mjs b/shared/eslint.config.mjs
index c03860b951df..f7b1ae11c7bb 100644
--- a/shared/eslint.config.mjs
+++ b/shared/eslint.config.mjs
@@ -6,6 +6,7 @@ import reactHooks from 'eslint-plugin-react-hooks'
 import tseslint from 'typescript-eslint'
 
 const ignores = [
+  '**/*.d.ts',
   'babel.config.js',
   'common-adapters/icon.constants-gen.desktop.tsx',
   'common-adapters/icon.constants-gen.native.tsx',
@@ -185,12 +186,11 @@ export default [
   })),
   ...tseslint.configs.recommendedTypeChecked.map(config => ({
     ...config,
-    files: ['**/*.mts', '**/*.ts', '**/*.tsx', '**/*.d.ts', '**/*.native.tsx', '**/*.desktop.tsx'],
+    files: ['**/*.mts', '**/*.ts', '**/*.tsx', '**/*.native.tsx', '**/*.desktop.tsx'],
     languageOptions: {
       ...config.languageOptions,
       parserOptions: {
-        project: ['./tsconfig.json'],
-        //tsconfigRootDir: __dirname,
+        project: ['./tsconfig.native.json', './tsconfig.desktop.json'],
       },
     },
   })),
diff --git a/shared/fs/common/path-item-action/types.d.ts b/shared/fs/common/path-item-action/types.ts
similarity index 100%
rename from shared/fs/common/path-item-action/types.d.ts
rename to shared/fs/common/path-item-action/types.ts
diff --git a/shared/fs/filepreview/pdf-view.d.ts b/shared/fs/filepreview/pdf-view.d.ts
deleted file mode 100644
index d9274c7a7d92..000000000000
--- a/shared/fs/filepreview/pdf-view.d.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import type * as React from 'react'
-
-export type Props = {
-  url: string
-  onUrlError?: (err: string) => void
-}
-
-declare const PdfView: (p: Props) => React.ReactNode
-export default PdfView
diff --git a/shared/fs/filepreview/pdf-view.desktop.tsx b/shared/fs/filepreview/pdf-view.desktop.tsx
index 2b032bdf829c..3826a7d2003b 100644
--- a/shared/fs/filepreview/pdf-view.desktop.tsx
+++ b/shared/fs/filepreview/pdf-view.desktop.tsx
@@ -1,5 +1,5 @@
 import * as Kb from '@/common-adapters'
-import type {Props} from './pdf-view'
+import type {Props} from './pdf-view.shared'
 
 const PDFView = (props: Props) => {
   return (
diff --git a/shared/fs/filepreview/pdf-view.native.tsx b/shared/fs/filepreview/pdf-view.native.tsx
index 2ab4acda0b02..9be348e1b1f1 100644
--- a/shared/fs/filepreview/pdf-view.native.tsx
+++ b/shared/fs/filepreview/pdf-view.native.tsx
@@ -1,6 +1,6 @@
 import * as C from '@/constants'
 import * as Kb from '@/common-adapters'
-import type {Props} from './pdf-view'
+import type {Props} from './pdf-view.shared'
 
 const PdfView = (props: Props) => (
   <Kb.Box2 fullHeight={true} fullWidth={true} direction="vertical">
diff --git a/shared/fs/filepreview/pdf-view.shared.tsx b/shared/fs/filepreview/pdf-view.shared.tsx
new file mode 100644
index 000000000000..6e863f20500a
--- /dev/null
+++ b/shared/fs/filepreview/pdf-view.shared.tsx
@@ -0,0 +1,4 @@
+export type Props = {
+  url: string
+  onUrlError?: (err: string) => void
+}
diff --git a/shared/fs/filepreview/text-view.desktop.tsx b/shared/fs/filepreview/text-view.desktop.tsx
index bb27fd5ca528..c35467bf56c3 100644
--- a/shared/fs/filepreview/text-view.desktop.tsx
+++ b/shared/fs/filepreview/text-view.desktop.tsx
@@ -1,6 +1,6 @@
 import * as React from 'react'
 import * as Kb from '@/common-adapters'
-import type {Props} from './text-view'
+import type {Props} from './text-view.shared'
 
 const TextView = (props: Props) => {
   const {onUrlError, url} = props
diff --git a/shared/fs/filepreview/text-view.native.tsx b/shared/fs/filepreview/text-view.native.tsx
index 33a4768af75d..820b4f645e84 100644
--- a/shared/fs/filepreview/text-view.native.tsx
+++ b/shared/fs/filepreview/text-view.native.tsx
@@ -1,5 +1,5 @@
 import * as Kb from '@/common-adapters'
-import type {Props} from './text-view'
+import type {Props} from './text-view.shared'
 import {colors, darkColors} from '@/styles/colors'
 
 const TextView = (props: Props) => (
diff --git a/shared/fs/filepreview/text-view.d.ts b/shared/fs/filepreview/text-view.shared.tsx
similarity index 52%
rename from shared/fs/filepreview/text-view.d.ts
rename to shared/fs/filepreview/text-view.shared.tsx
index 09b4690729df..0ccdafec8b8b 100644
--- a/shared/fs/filepreview/text-view.d.ts
+++ b/shared/fs/filepreview/text-view.shared.tsx
@@ -1,10 +1,5 @@
-import type * as React from 'react'
-
 export type Props = {
   url: string
   onLoadingStateChange?: (isLoading: boolean) => void
   onUrlError?: (err: string) => void
 }
-
-declare const TextView: (p: Props) => React.ReactNode
-export default TextView
diff --git a/shared/fs/footer/download-wrapper.desktop.tsx b/shared/fs/footer/download-wrapper.desktop.tsx
index 3be785291ef1..4e563e8b2a91 100644
--- a/shared/fs/footer/download-wrapper.desktop.tsx
+++ b/shared/fs/footer/download-wrapper.desktop.tsx
@@ -1,3 +1,3 @@
-import type {Props} from './download-wrapper'
+import type {Props} from './download-wrapper.shared'
 const DownloadWrapper = (props: Props): React.ReactNode => props.children
 export default DownloadWrapper
diff --git a/shared/fs/footer/download-wrapper.native.tsx b/shared/fs/footer/download-wrapper.native.tsx
index 027c00a3ff23..63c3ea360896 100644
--- a/shared/fs/footer/download-wrapper.native.tsx
+++ b/shared/fs/footer/download-wrapper.native.tsx
@@ -1,6 +1,6 @@
 import * as React from 'react'
 import {Animated as NativeAnimated, Easing as NativeEasing} from 'react-native'
-import type {Props} from './download-wrapper'
+import type {Props} from './download-wrapper.shared'
 
 const DownloadNativeWrapper: React.FC<Props> = props => {
   const [opacity] = React.useState(new NativeAnimated.Value(1))
diff --git a/shared/fs/footer/download-wrapper.d.ts b/shared/fs/footer/download-wrapper.shared.tsx
similarity index 61%
rename from shared/fs/footer/download-wrapper.d.ts
rename to shared/fs/footer/download-wrapper.shared.tsx
index 5bd9cf1290f4..cf6b16850936 100644
--- a/shared/fs/footer/download-wrapper.d.ts
+++ b/shared/fs/footer/download-wrapper.shared.tsx
@@ -6,6 +6,3 @@ export type Props = {
   isFirst: boolean
   children: React.ReactNode
 }
-
-declare const DownloadWrapper: (p: Props) => React.ReactNode
-export default DownloadWrapper
diff --git a/shared/fs/footer/upload.desktop.tsx b/shared/fs/footer/upload.desktop.tsx
index 58313ebbe520..411236ed3e84 100644
--- a/shared/fs/footer/upload.desktop.tsx
+++ b/shared/fs/footer/upload.desktop.tsx
@@ -1,7 +1,7 @@
 import * as C from '@/constants'
 import * as React from 'react'
 import * as Kb from '@/common-adapters'
-import type {UploadProps} from './upload'
+import type {UploadProps} from './upload.shared'
 import capitalize from 'lodash/capitalize'
 import './upload.css'
 
diff --git a/shared/fs/footer/upload.native.tsx b/shared/fs/footer/upload.native.tsx
index 35d228c22a2b..daa9919b9624 100644
--- a/shared/fs/footer/upload.native.tsx
+++ b/shared/fs/footer/upload.native.tsx
@@ -1,6 +1,6 @@
 import * as React from 'react'
 import * as Kb from '@/common-adapters'
-import type {UploadProps} from './upload'
+import type {UploadProps} from './upload.shared'
 import {Animated as NativeAnimated, Easing as NativeEasing} from 'react-native'
 import {useColorScheme} from 'react-native'
 
diff --git a/shared/fs/footer/upload.d.ts b/shared/fs/footer/upload.shared.tsx
similarity index 61%
rename from shared/fs/footer/upload.d.ts
rename to shared/fs/footer/upload.shared.tsx
index 6736073aded5..0f46c7706aaa 100644
--- a/shared/fs/footer/upload.d.ts
+++ b/shared/fs/footer/upload.shared.tsx
@@ -1,5 +1,3 @@
-import type * as React from 'react'
-
 export type UploadProps = {
   showing: boolean
   files: number
@@ -9,6 +7,3 @@ export type UploadProps = {
   debugToggleShow?: () => void
   smallMode?: boolean
 }
-
-declare const Upload: (p: UploadProps) => React.ReactNode
-export default Upload
diff --git a/shared/globals.native.d.ts b/shared/globals.native.d.ts
new file mode 100644
index 000000000000..21ee84887305
--- /dev/null
+++ b/shared/globals.native.d.ts
@@ -0,0 +1,24 @@
+// Globals available on React Native's `global` object.
+// `location` and `window` only exist in Chrome DevTools remote debugging builds.
+declare var location: unknown
+declare var window:
+  | {
+      __perfReact?: unknown
+      requestIdleCallback?: (
+        cb: (info: {didTimeout: boolean; timeRemaining: () => number}) => void,
+        opts?: {timeout?: number}
+      ) => number
+      cancelIdleCallback?: (handle: number) => void
+    }
+  | undefined
+
+// Minimal File/DataTransfer stubs for shared files that use these types
+// (actual drag-and-drop only runs on desktop, but the code is in shared files)
+interface File {
+  readonly type: string
+  readonly name: string
+}
+interface DataTransfer {
+  readonly files: ReadonlyArray<File>
+  readonly types: ReadonlyArray<string>
+}
diff --git a/shared/jest.config.js b/shared/jest.config.js
index e805013413e2..f67cec4f2e12 100644
--- a/shared/jest.config.js
+++ b/shared/jest.config.js
@@ -20,14 +20,12 @@ module.exports = {
     '^@/logger$': '<rootDir>/test/mocks/logger.js',
     '^@react-navigation/core$': '<rootDir>/test/mocks/react-navigation-core.js',
     '^@react-navigation/native$': '<rootDir>/test/mocks/react-navigation-native.js',
+    '^lottie-web$': '<rootDir>/test/mocks/lottie-web.js',
     '^react-native$': '<rootDir>/test/mocks/react-native.js',
   },
   setupFiles: ['<rootDir>/jest.setup.js'],
   testEnvironment: 'node',
-  testMatch: [
-    '<rootDir>/**/*.test.ts',
-    '<rootDir>/**/*.test.tsx',
-  ],
+  testMatch: ['<rootDir>/**/*.test.ts', '<rootDir>/**/*.test.tsx'],
   testPathIgnorePatterns: [
     '<rootDir>/node_modules/',
     '<rootDir>/desktop/dist/',
diff --git a/shared/local-debug.d.ts b/shared/local-debug.d.ts
deleted file mode 100644
index 5f1f27425de8..000000000000
--- a/shared/local-debug.d.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-export declare const allowMultipleInstances: boolean
-export declare const featureFlagsOverride: boolean
-export declare const forceImmediateLogging: boolean
-export declare const ignoreDisconnectOverlay: boolean
-export declare const isDevApplePushToken: boolean
-export declare const printOutstandingRPCs: boolean
-export declare const printOutstandingTimerListeners: boolean
-export declare const printRPC: boolean
-export declare const printRPCBytes: boolean
-export declare const printRPCStats: boolean
-export declare const printRPCWaitingSession: boolean
-export declare const showDevTools: boolean
-export declare const skipAppFocusActions: boolean
-export declare const skipSecondaryDevtools: boolean
diff --git a/shared/local-debug.native.tsx b/shared/local-debug.native.tsx
index 3ffe119792dd..54a688ed39fe 100644
--- a/shared/local-debug.native.tsx
+++ b/shared/local-debug.native.tsx
@@ -77,10 +77,10 @@ if (__DEV__) {
 if (PERF) {
   console.warn('\n\n\nlocal debug PERF is ONNNNNn!!!!!1!!!11!!!!\nAll console.logs disabled!\n\n\n')
 
-  window.console.log = noop
-  window.console.warn = noop
-  window.console.error = noop
-  window.console.info = noop
+  console.log = noop
+  console.warn = noop
+  console.error = noop
+  console.info = noop
 
   config.forceImmediateLogging = false
   config.printOutstandingRPCs = false
@@ -114,6 +114,7 @@ export const {
   printRPC,
   printRPCBytes,
   printRPCStats,
+  printRPCWaitingSession,
   showDevTools,
   skipSecondaryDevtools,
 } = config
diff --git a/shared/logger/index.tsx b/shared/logger/index.tsx
index 7d0e5012e91e..6d078fb0b970 100644
--- a/shared/logger/index.tsx
+++ b/shared/logger/index.tsx
@@ -118,7 +118,7 @@ class AggregateLoggerImpl {
       // NativeTransport forwards responses to the renderer without processing
       // them locally, so RPCs sent from node never get responses.
       try {
-        if (typeof process !== 'undefined' && process.type !== 'renderer') {
+        if (typeof process !== 'undefined' && process['type'] !== 'renderer') {
           return await Promise.resolve()
         }
         const {hasEngine} = require('../engine/require') as {hasEngine: typeof HasEngineType}
diff --git a/shared/login/forms/container.desktop.tsx b/shared/login/forms/container.desktop.tsx
index 53c8b94acf79..07fe4b0b8495 100644
--- a/shared/login/forms/container.desktop.tsx
+++ b/shared/login/forms/container.desktop.tsx
@@ -1,4 +1,4 @@
-import type {Props} from './container'
+import type {Props} from './container.shared'
 import * as Kb from '@/common-adapters'
 
 const Container = ({children, style, outerStyle}: Props) => {
diff --git a/shared/login/forms/container.native.tsx b/shared/login/forms/container.native.tsx
index 1d328cbc65fa..d474b2947a48 100644
--- a/shared/login/forms/container.native.tsx
+++ b/shared/login/forms/container.native.tsx
@@ -1,4 +1,4 @@
-import type {Props} from './container'
+import type {Props} from './container.shared'
 import * as Kb from '@/common-adapters'
 import NativeScrollView from '@/common-adapters/scroll-view.native'
 
diff --git a/shared/login/forms/container.d.ts b/shared/login/forms/container.shared.tsx
similarity index 74%
rename from shared/login/forms/container.d.ts
rename to shared/login/forms/container.shared.tsx
index 49fc98cb2114..9e27049b7c97 100644
--- a/shared/login/forms/container.d.ts
+++ b/shared/login/forms/container.shared.tsx
@@ -1,5 +1,5 @@
-import type * as React from 'react'
 import type * as Kb from '@/common-adapters'
+import type * as React from 'react'
 
 export type Props = {
   onBack?: () => void
@@ -7,6 +7,3 @@ export type Props = {
   style?: Kb.Styles.StylesCrossPlatform
   outerStyle?: Kb.Styles.StylesCrossPlatform
 }
-
-declare const Container: (p: Props) => React.ReactNode
-export default Container
diff --git a/shared/login/relogin/index.desktop.tsx b/shared/login/relogin/index.desktop.tsx
index 5be6a640edcc..c9c30bf84373 100644
--- a/shared/login/relogin/index.desktop.tsx
+++ b/shared/login/relogin/index.desktop.tsx
@@ -3,7 +3,7 @@ import * as React from 'react'
 import * as Kb from '@/common-adapters'
 import UserCard from '../user-card'
 import {errorBanner, SignupScreen} from '@/signup/common'
-import type {Props} from '.'
+import type {Props} from './index.shared'
 
 const other = 'Someone else...'
 
diff --git a/shared/login/relogin/index.native.tsx b/shared/login/relogin/index.native.tsx
index 27f1c7052bb7..1ace269dea4a 100644
--- a/shared/login/relogin/index.native.tsx
+++ b/shared/login/relogin/index.native.tsx
@@ -4,8 +4,8 @@ import NativeScrollView from '@/common-adapters/scroll-view.native'
 import * as React from 'react'
 import Dropdown from './dropdown.native'
 import UserCard from '../user-card'
-import type {Input3Props} from '@/common-adapters/input3'
-import type {Props} from '.'
+import type {Input3Props} from '@/common-adapters/input3.shared'
+import type {Props} from './index.shared'
 
 const LoginRender = (props: Props) => {
   const [scrollViewHeight, setScrollViewHeight] = React.useState<number | undefined>(undefined)
diff --git a/shared/login/relogin/index.d.ts b/shared/login/relogin/index.shared.tsx
similarity index 100%
rename from shared/login/relogin/index.d.ts
rename to shared/login/relogin/index.shared.tsx
diff --git a/shared/login/user-card/index.desktop.tsx b/shared/login/user-card/index.desktop.tsx
index 2e2b0dcb29a8..7d1c9e72fb2d 100644
--- a/shared/login/user-card/index.desktop.tsx
+++ b/shared/login/user-card/index.desktop.tsx
@@ -1,5 +1,5 @@
 import * as Kb from '@/common-adapters'
-import type {Props} from '.'
+import type {Props} from './index.shared'
 
 const UserCard = (p: Props) => {
   const {avatarSize = 128, outerStyle, onAvatarClicked, username, style, children} = p
diff --git a/shared/login/user-card/index.native.tsx b/shared/login/user-card/index.native.tsx
index 041693d43463..6353e9d9266f 100644
--- a/shared/login/user-card/index.native.tsx
+++ b/shared/login/user-card/index.native.tsx
@@ -1,5 +1,5 @@
 import * as Kb from '@/common-adapters'
-import type {Props} from '.'
+import type {Props} from './index.shared'
 
 const UserCard = (p: Props) => {
   const {avatarBackgroundStyle, avatarSize = 96, outerStyle, onAvatarClicked} = p
diff --git a/shared/login/user-card/index.d.ts b/shared/login/user-card/index.shared.tsx
similarity index 100%
rename from shared/login/user-card/index.d.ts
rename to shared/login/user-card/index.shared.tsx
diff --git a/shared/menubar/index.desktop.tsx b/shared/menubar/index.desktop.tsx
index 5717f830d8e8..208f3ad595af 100644
--- a/shared/menubar/index.desktop.tsx
+++ b/shared/menubar/index.desktop.tsx
@@ -307,11 +307,11 @@ const useMenuItems = (
 
   const ret = (() => {
     const common = [
-      {onClick: () => openUrl(`https://keybase.io/${username || ''}`), title: 'Keybase.io'},
+      {onClick: () => { void openUrl(`https://keybase.io/${username || ''}`) }, title: 'Keybase.io'},
       {
         onClick: () => {
           const version = __VERSION__
-          openUrl(
+          void openUrl(
             `https://github.com/keybase/client/issues/new?body=Keybase%20GUI%20Version:%20${encodeURIComponent(version)}`
           )
         },
@@ -319,7 +319,7 @@ const useMenuItems = (
       },
       {
         onClick: () => {
-          openUrl('https://keybase.io/docs')
+          void openUrl('https://keybase.io/docs')
           hideWindow?.()
         },
         title: 'Help',
diff --git a/shared/package.json b/shared/package.json
index 27001bdeff06..9ff3a50a49d8 100644
--- a/shared/package.json
+++ b/shared/package.json
@@ -54,7 +54,7 @@
     "rn-test-ios": "xcodebuild test -project ./ios/Keybase.xcodeproj -scheme 'Keybase For Test' -destination 'platform=iOS Simulator,name=iPhone 6s,OS=9.3'",
     "rn-jsbuild-ios": "mkdir -p ios/dist && react-native bundle --platform ios --dev false --entry-file index.ios.js --bundle-output ios/dist/main.jsbundle --sourcemap-output ios/dist/main.jsbundle.sourcemap",
     "rn-jsbuild-android": "mkdir -p android/dist && react-native bundle --platform android --dev false --entry-file index.android.js --bundle-output android/dist/main.jsbundle --sourcemap-output android/dist/main.jsbundle.sourcemap",
-    "tsc": "./node_modules/.bin/tsgo --project ./tsconfig.json",
+    "tsc": "./node_modules/.bin/tsgo --project ./tsconfig.desktop.json && ./node_modules/.bin/tsgo --project ./tsconfig.native.json",
     "modules": "yarn install --pure-lockfile --ignore-optional --ignore-scripts && yarn postinstall && cd node_modules/@typescript/native-preview && yarn install",
     "log-to-trace": "node desktop/yarn-helper/log-to-trace.mts",
     "pod-clean": "pod cache clean --all ; rm -rf ios/build; rm -rf ios/Pods; rm -f ios/.xcode.env.local; rm -rf ../rnmodules/react-native-kb/node_modules",
diff --git a/shared/people/index.d.ts b/shared/people/index.d.ts
deleted file mode 100644
index 1c9c190a658c..000000000000
--- a/shared/people/index.d.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-import type * as React from 'react'
-import type * as T from '@/constants/types'
-
-export type Props = {
-  dismissAnnouncement: (id: T.RPCGen.HomeScreenAnnouncementID) => void
-  followSuggestions: ReadonlyArray<T.People.FollowSuggestion>
-  getData: (markViewed?: boolean, force?: boolean) => void
-  oldItems: T.Immutable<Array<T.People.PeopleScreenItem>>
-  newItems: T.Immutable<Array<T.People.PeopleScreenItem>>
-  onClickUser: (username: string) => void
-  onOpenAccountSwitcher?: () => void
-  resentEmail: string
-  setResentEmail: (email: string) => void
-  signupEmail: string
-  skipTodo: (type: T.People.TodoType) => void
-  myUsername: string
-  // wotUpdates: Map<string, T.People.WotUpdate>
-}
-export type WrapProps = {
-  waiting: boolean
-} & Props
-
-export declare const Header: (p: {
-  onClickUser: (username: string) => void
-  myUsername: string
-}) => React.ReactNode
-declare const People: (p: WrapProps) => React.ReactNode
-export default People
diff --git a/shared/people/index.desktop.tsx b/shared/people/index.desktop.tsx
index da1e065ea6f2..9b37de12ddac 100644
--- a/shared/people/index.desktop.tsx
+++ b/shared/people/index.desktop.tsx
@@ -1,6 +1,6 @@
 import * as Kb from '@/common-adapters'
 import {PeoplePageList} from './index.shared'
-import type {WrapProps} from '.'
+import type {WrapProps} from './index.shared'
 
 function People(props: WrapProps) {
   const {waiting, ...rest} = props
diff --git a/shared/people/index.native.tsx b/shared/people/index.native.tsx
index b1d913139eab..c2896817a3fb 100644
--- a/shared/people/index.native.tsx
+++ b/shared/people/index.native.tsx
@@ -1,6 +1,6 @@
 import * as Kb from '@/common-adapters'
 import {PeoplePageList} from './index.shared'
-import type {WrapProps} from '.'
+import type {WrapProps} from './index.shared'
 import {RefreshControl} from 'react-native'
 
 function People(props: WrapProps) {
diff --git a/shared/people/index.shared.tsx b/shared/people/index.shared.tsx
index b9ec6d27a9d8..a890d4ffbdba 100644
--- a/shared/people/index.shared.tsx
+++ b/shared/people/index.shared.tsx
@@ -5,8 +5,23 @@ import type * as T from '@/constants/types'
 import Announcement from './announcement'
 import FollowNotification from './follow-notification'
 import FollowSuggestions from './follow-suggestions'
-import type {Props} from '.'
 import Todo from './todo'
+
+export type Props = {
+  dismissAnnouncement: (id: T.RPCGen.HomeScreenAnnouncementID) => void
+  followSuggestions: ReadonlyArray<T.People.FollowSuggestion>
+  getData: (markViewed?: boolean, force?: boolean) => void
+  oldItems: T.Immutable<Array<T.People.PeopleScreenItem>>
+  newItems: T.Immutable<Array<T.People.PeopleScreenItem>>
+  onClickUser: (username: string) => void
+  onOpenAccountSwitcher?: () => void
+  resentEmail: string
+  setResentEmail: (email: string) => void
+  signupEmail: string
+  skipTodo: (type: T.People.TodoType) => void
+  myUsername: string
+}
+export type WrapProps = {waiting: boolean} & Props
 import {clearSignupEmail} from './signup-email'
 // import WotTask from './wot-task'
 
diff --git a/shared/profile/edit-avatar/hooks.tsx b/shared/profile/edit-avatar/hooks.tsx
index 9128aa8c05bb..46fce355e46a 100644
--- a/shared/profile/edit-avatar/hooks.tsx
+++ b/shared/profile/edit-avatar/hooks.tsx
@@ -2,7 +2,7 @@ import * as React from 'react'
 import * as C from '@/constants'
 import * as Kb from '@/common-adapters'
 import * as T from '@/constants/types'
-import type {Props} from '.'
+import type {Props} from './index.shared'
 import type {ImageInfo} from '@/util/expo-image-picker.native'
 import {fixCrop} from '@/util/crop'
 import {getNextRouteAfterAvatar} from '@/teams/new-team/wizard/state'
diff --git a/shared/profile/edit-avatar/index.desktop.tsx b/shared/profile/edit-avatar/index.desktop.tsx
index 7db18d6da27a..8bd1dd5e1daf 100644
--- a/shared/profile/edit-avatar/index.desktop.tsx
+++ b/shared/profile/edit-avatar/index.desktop.tsx
@@ -1,6 +1,6 @@
 import * as React from 'react'
 import * as Kb from '@/common-adapters'
-import type {Props} from '.'
+import type {Props} from './index.shared'
 import KB2 from '@/util/electron.desktop'
 import './edit-avatar.css'
 import useHooks from './hooks'
diff --git a/shared/profile/edit-avatar/index.native.tsx b/shared/profile/edit-avatar/index.native.tsx
index 5ae025b1dd6d..5c3b03e53285 100644
--- a/shared/profile/edit-avatar/index.native.tsx
+++ b/shared/profile/edit-avatar/index.native.tsx
@@ -1,7 +1,7 @@
 import * as C from '@/constants'
 import * as React from 'react'
 import * as Kb from '@/common-adapters'
-import {type Props} from '.'
+import {type Props} from './index.shared'
 import {useNavigation} from '@react-navigation/native'
 import {launchImageLibraryAsync, type ImageInfo} from '@/util/expo-image-picker.native'
 import {useSafeNavigation} from '@/util/safe-navigation'
diff --git a/shared/profile/edit-avatar/index.d.ts b/shared/profile/edit-avatar/index.shared.tsx
similarity index 100%
rename from shared/profile/edit-avatar/index.d.ts
rename to shared/profile/edit-avatar/index.shared.tsx
diff --git a/shared/profile/pgp/choice/index.d.ts b/shared/profile/pgp/choice/index.shared.tsx
similarity index 100%
rename from shared/profile/pgp/choice/index.d.ts
rename to shared/profile/pgp/choice/index.shared.tsx
diff --git a/shared/profile/pgp/import/index.d.ts b/shared/profile/pgp/import/index.shared.tsx
similarity index 100%
rename from shared/profile/pgp/import/index.d.ts
rename to shared/profile/pgp/import/index.shared.tsx
diff --git a/shared/profile/user/index.tsx b/shared/profile/user/index.tsx
index ff8c27da48f9..fdda93d37797 100644
--- a/shared/profile/user/index.tsx
+++ b/shared/profile/user/index.tsx
@@ -11,6 +11,7 @@ import * as T from '@/constants/types'
 import type {RPCError} from '@/util/errors'
 import upperFirst from 'lodash/upperFirst'
 import {SiteIcon} from '../generic/shared'
+import type {MeasureRef} from '@/common-adapters/measure-ref'
 import useResizeObserver from '@/util/use-resize-observer'
 import useUserData from './hooks'
 
@@ -377,8 +378,8 @@ const User = (props: {username: string}) => {
   )
 
   // desktop only
-  const wrapperRef = React.useRef<HTMLDivElement>(null)
-  useResizeObserver(wrapperRef, e => setWidth(e.contentRect.width))
+  const wrapperRef = React.useRef<MeasureRef>(null)
+  useResizeObserver(wrapperRef as React.RefObject<HTMLDivElement>, (e: {contentRect: {width: number}}) => setWidth(e.contentRect.width))
 
   const errorFilter = (e: RPCError) => e.code !== T.RPCGen.StatusCode.scresolutionfailed
 
diff --git a/shared/provision/code-page/qr-scan/index.d.ts b/shared/provision/code-page/qr-scan/index.shared.tsx
similarity index 100%
rename from shared/provision/code-page/qr-scan/index.d.ts
rename to shared/provision/code-page/qr-scan/index.shared.tsx
diff --git a/shared/router-v2/common.d.ts b/shared/router-v2/common.d.ts
deleted file mode 100644
index f726c4cc625f..000000000000
--- a/shared/router-v2/common.d.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import type {NavState} from '@/constants/router'
-import type {ParamListBase} from '@react-navigation/native'
-import type {NavigationContainerRef} from '@react-navigation/core'
-import type * as Styles from '@/styles'
-import type {NativeStackNavigationOptions} from '@react-navigation/native-stack'
-export const tabBarStyle: Styles.StylesCrossPlatform
-export const tabBarBlurEffect: 'systemDefault'
-export const tabBarMinimizeBehavior: 'onScrollDown'
-export const headerDefaultStyle: Styles.StylesCrossPlatform
-// Intersection with NativeStackNavigationOptions: our custom header reads container
-// styles that aren't in RN's native-stack types. Cast to NativeStackNavigationOptions
-// at the boundary when passing to createNativeStackNavigator.
-export const defaultNavigationOptions: NativeStackNavigationOptions & {
-  headerBackgroundContainerStyle?: Styles.StylesCrossPlatform
-  headerLeftContainerStyle?: Styles.StylesCrossPlatform
-  headerRightContainerStyle?: Styles.StylesCrossPlatform
-  headerTitleContainerStyle?: Styles.StylesCrossPlatform
-}
-
-type SubnavNavigation = Pick<NavigationContainerRef<ParamListBase>, 'dispatch' | 'emit'>
-
-export function useSubnavTabAction(
-  navigation: SubnavNavigation,
-  state: NavState
-): (t: string) => void
diff --git a/shared/router-v2/common.desktop.tsx b/shared/router-v2/common.desktop.tsx
index d8e037dea7f7..2bf5a0ec5d4f 100644
--- a/shared/router-v2/common.desktop.tsx
+++ b/shared/router-v2/common.desktop.tsx
@@ -3,7 +3,7 @@ import * as Kb from '@/common-adapters'
 import Header from './header/index.desktop'
 import {HeaderLeftButton} from '@/common-adapters/header-buttons'
 import {TabActions} from '@react-navigation/core'
-import type {useSubnavTabAction as useSubnavTabActionType} from './common'
+import type {useSubnavTabAction as useSubnavTabActionType} from './common.shared'
 
 export const headerDefaultStyle = {}
 export const tabBarStyle = {
@@ -42,7 +42,7 @@ const styles = Kb.Styles.styleSheetCreate(() => ({
   },
 }))
 
-export const useSubnavTabAction: typeof useSubnavTabActionType = (navigation, state) => {
+export const useSubnavTabAction: useSubnavTabActionType = (navigation, state) => {
   const routesRef = React.useRef(state?.routes)
   const stateKeyRef = React.useRef(state?.key)
   React.useEffect(() => {
diff --git a/shared/router-v2/common.shared.tsx b/shared/router-v2/common.shared.tsx
new file mode 100644
index 000000000000..3630007b6f54
--- /dev/null
+++ b/shared/router-v2/common.shared.tsx
@@ -0,0 +1,7 @@
+import type {NavState} from '@/constants/router'
+import type {ParamListBase} from '@react-navigation/native'
+import type {NavigationContainerRef} from '@react-navigation/core'
+
+type SubnavNavigation = Pick<NavigationContainerRef<ParamListBase>, 'dispatch' | 'emit'>
+
+export type useSubnavTabAction = (navigation: SubnavNavigation, state: NavState) => (t: string) => void
diff --git a/shared/router-v2/router.d.ts b/shared/router-v2/router.d.ts
deleted file mode 100644
index 1f0da98f2f44..000000000000
--- a/shared/router-v2/router.d.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import type * as React from 'react'
-import type * as Styles from '@/styles'
-
-export declare const headerDefaultStyle: Styles.StylesCrossPlatform
-declare const Router: () => React.ReactNode
-export default Router
diff --git a/shared/router-v2/tab-bar.desktop.tsx b/shared/router-v2/tab-bar.desktop.tsx
index 17b1023a1585..67c69d82a2ff 100644
--- a/shared/router-v2/tab-bar.desktop.tsx
+++ b/shared/router-v2/tab-bar.desktop.tsx
@@ -45,7 +45,7 @@ const Header = () => {
   const fullname = useUsersState(s => s.infoMap.get(username)?.fullname ?? '')
 
   const logoutToLoggedOutFlow = useConfigState(s => s.dispatch.logoutToLoggedOutFlow)
-  const onHelp = () => openURL('https://book.keybase.io')
+  const onHelp = () => { void openURL('https://book.keybase.io') }
   const onQuit = () => {
     if (!__DEV__) {
       if (isLinux) {
diff --git a/shared/settings/delete-confirm/check-passphrase.d.ts b/shared/settings/delete-confirm/check-passphrase.d.ts
deleted file mode 100644
index 6b6ad1011659..000000000000
--- a/shared/settings/delete-confirm/check-passphrase.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import type * as React from 'react'
-declare const CheckPassphrase: () => React.ReactNode
-export default CheckPassphrase
diff --git a/shared/settings/feedback/container.d.ts b/shared/settings/feedback/container.d.ts
deleted file mode 100644
index deaedb9e783f..000000000000
--- a/shared/settings/feedback/container.d.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import type * as React from 'react'
-export type Props = {
-  heading?: string
-  feedback?: string
-}
-declare const FeedbackContainer: (p: Props) => React.ReactNode
-export default FeedbackContainer
diff --git a/shared/settings/feedback/container.desktop.tsx b/shared/settings/feedback/container.desktop.tsx
index 449a0e51ab9d..166f858d4f7f 100644
--- a/shared/settings/feedback/container.desktop.tsx
+++ b/shared/settings/feedback/container.desktop.tsx
@@ -1,6 +1,7 @@
 import * as C from '@/constants'
 import Feedback from '.'
-import type {Props} from './container'
+import type {Props} from './container.shared'
+export type {Props} from './container.shared'
 import {useSendFeedback} from './shared'
 import {useConfigState} from '@/stores/config'
 
diff --git a/shared/settings/feedback/container.native.tsx b/shared/settings/feedback/container.native.tsx
index fa5f80cf6cf4..404a63b7e7d4 100644
--- a/shared/settings/feedback/container.native.tsx
+++ b/shared/settings/feedback/container.native.tsx
@@ -8,7 +8,7 @@ import {Platform} from 'react-native'
 import {getExtraChatLogsForLogSend} from './shared'
 import {isAndroid, version, pprofDir} from '@/constants/platform'
 import {logSend, appVersionName, appVersionCode} from 'react-native-kb'
-import type {Props as OwnProps} from './container'
+import type {Props as OwnProps} from './container.shared'
 import {usePushState} from '@/stores/push'
 
 export type Props = {
diff --git a/shared/settings/feedback/container.shared.tsx b/shared/settings/feedback/container.shared.tsx
new file mode 100644
index 000000000000..e983cc31075e
--- /dev/null
+++ b/shared/settings/feedback/container.shared.tsx
@@ -0,0 +1,4 @@
+export type Props = {
+  heading?: string
+  feedback?: string
+}
diff --git a/shared/settings/files/index.d.ts b/shared/settings/files/index.d.ts
deleted file mode 100644
index da85b5883b43..000000000000
--- a/shared/settings/files/index.d.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import type * as React from 'react'
-
-export declare const allowedNotificationThresholds: Array<number>
-export declare const defaultNotificationThreshold: number
-declare const PaymentForm: () => React.ReactNode
-export default PaymentForm
diff --git a/shared/settings/make-icons.page.tsx b/shared/settings/make-icons.page.desktop.tsx
similarity index 98%
rename from shared/settings/make-icons.page.tsx
rename to shared/settings/make-icons.page.desktop.tsx
index 66d71cb1a19f..b109dcef4724 100644
--- a/shared/settings/make-icons.page.tsx
+++ b/shared/settings/make-icons.page.desktop.tsx
@@ -1,4 +1,3 @@
-// dev only helper
 import * as Kb from '@/common-adapters'
 // import * as C from '@/constants'
 // import * as React from 'react'
@@ -72,7 +71,7 @@ const Screen = __DEV__
 
         const dte = document.getElementById('divToExport')
         if (!dte) return
-        const copy = dte.cloneNode(true) as HTMLDivElement
+        const copy = dte.cloneNode(true) as HTMLElement
         copy.id = 'iconCopy'
         document.body.appendChild(copy)
 
diff --git a/shared/settings/make-icons.page.native.tsx b/shared/settings/make-icons.page.native.tsx
new file mode 100644
index 000000000000..e83337b261ff
--- /dev/null
+++ b/shared/settings/make-icons.page.native.tsx
@@ -0,0 +1,4 @@
+// Desktop-only page; not available on native
+export default function MakeIconsPage() {
+  return null
+}
diff --git a/shared/settings/notifications/index.d.ts b/shared/settings/notifications/index.d.ts
deleted file mode 100644
index d16505417e0e..000000000000
--- a/shared/settings/notifications/index.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import type * as React from 'react'
-declare const Notifications: () => React.ReactNode
-export default Notifications
diff --git a/shared/settings/root-desktop-tablet.tsx b/shared/settings/root-desktop-tablet.tsx
index ba077fe96950..66e92cfd1ab9 100644
--- a/shared/settings/root-desktop-tablet.tsx
+++ b/shared/settings/root-desktop-tablet.tsx
@@ -2,7 +2,7 @@ import * as React from 'react'
 import * as Kb from '@/common-adapters'
 import * as Common from '@/router-v2/common'
 import {routeMapToScreenElements} from '@/router-v2/routes'
-import {makeLayout} from '@/router-v2/screen-layout.desktop'
+import {makeLayout} from '@/router-v2/screen-layout'
 import type {RouteDef, GetOptionsParams} from '@/constants/types/router'
 import LeftNav from './sub-nav/left-nav'
 import {useNavigationBuilder, TabRouter, createNavigatorFactory} from '@react-navigation/core'
diff --git a/shared/settings/routes.tsx b/shared/settings/routes.tsx
index e586a227e210..1d18a5c21982 100644
--- a/shared/settings/routes.tsx
+++ b/shared/settings/routes.tsx
@@ -8,7 +8,7 @@ import * as Settings from '@/constants/settings'
 import {defineRouteMap} from '@/constants/types/router'
 import {usePushState} from '@/stores/push'
 import {e164ToDisplay} from '@/util/phone-numbers'
-import type {Props as FeedbackRouteParams} from './feedback/container'
+import type {Props as FeedbackRouteParams} from './feedback/container.shared'
 
 export type SettingsAccountRouteParams = {
   addedEmailBannerEmail?: string
diff --git a/shared/settings/screenprotector/index.d.ts b/shared/settings/screenprotector/index.d.ts
deleted file mode 100644
index 251d7b82f310..000000000000
--- a/shared/settings/screenprotector/index.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import type * as React from 'react'
-declare const ScreenProtector: () => React.ReactNode
-export default ScreenProtector
diff --git a/shared/settings/subheading.desktop.tsx b/shared/settings/subheading.desktop.tsx
index 2bdcef6e0aa7..86546e9979a2 100644
--- a/shared/settings/subheading.desktop.tsx
+++ b/shared/settings/subheading.desktop.tsx
@@ -1,6 +1,6 @@
 import * as Kb from '@/common-adapters'
 
-import type {Props} from './subheading'
+import type {Props} from './subheading.shared'
 
 function SubHeading({children}: Props) {
   return (
diff --git a/shared/settings/subheading.d.ts b/shared/settings/subheading.shared.tsx
similarity index 52%
rename from shared/settings/subheading.d.ts
rename to shared/settings/subheading.shared.tsx
index 6979c0ffb581..a715c061e3ce 100644
--- a/shared/settings/subheading.d.ts
+++ b/shared/settings/subheading.shared.tsx
@@ -3,6 +3,3 @@ import type * as React from 'react'
 export type Props = {
   children?: React.ReactNode
 }
-
-declare const SubHeading: (p: Props) => React.ReactNode
-export default SubHeading
diff --git a/shared/stores/fs-platform.d.ts b/shared/stores/fs-platform.d.ts
deleted file mode 100644
index d7662a797251..000000000000
--- a/shared/stores/fs-platform.d.ts
+++ /dev/null
@@ -1,65 +0,0 @@
-import type * as T from '@/constants/types'
-
-export declare const fuseStatusToDriverStatus: (status?: T.RPCGen.FuseStatus) => T.FS.DriverStatus
-
-export declare const openLocalPathInSystemFileManagerDesktop: (localPath: string) => Promise<void>
-
-export declare const openPathInSystemFileManagerDesktop: (
-  path: T.FS.Path,
-  driverStatus: T.FS.DriverStatus,
-  directMountDir: string
-) => Promise<void>
-
-export declare const refreshDriverStatusDesktop: () => Promise<T.RPCGen.FuseStatus | undefined>
-
-export declare const refreshMountDirsDesktop: () => Promise<{
-  directMountDir: string
-  preferredMountDirs: Array<string>
-}>
-
-export declare const setSfmiBannerDismissedDesktop: (dismissed: boolean) => Promise<void>
-
-export declare const afterDriverEnabledDesktop: (
-  isRetry: boolean
-) => Promise<'kextPermissionError' | 'kextPermissionErrorRetry' | 'noop' | 'refresh'>
-
-export declare const afterDriverDisableDesktop: (
-  driverStatus: T.FS.DriverStatus
-) => Promise<'disabling' | 'noop' | 'refresh'>
-
-export declare const afterDriverDisablingDesktop: (driverStatus: T.FS.DriverStatus) => Promise<void>
-
-export declare const openSecurityPreferencesDesktop: () => Promise<void>
-
-export declare const selectFilesToUploadDesktop: (
-  type: T.FS.OpenDialogType,
-  parentPath: T.FS.Path
-) => Promise<Array<string>>
-
-export declare const uploadFromDragAndDropDesktop: (localPaths: Array<string>) => Promise<Array<string>>
-
-export declare const pickAndUploadMobile: (
-  type: T.FS.MobilePickType,
-  parentPath: T.FS.Path,
-  upload: (parentPath: T.FS.Path, localPath: string) => void
-) => Promise<void>
-
-export declare const pickDocumentsMobile: (
-  parentPath: T.FS.Path,
-  upload: (parentPath: T.FS.Path, localPath: string) => void
-) => Promise<void>
-
-export declare const finishedDownloadWithIntentMobile: (
-  downloadState: T.FS.DownloadState,
-  downloadIntent: T.FS.DownloadIntent,
-  mimeType: string
-) => Promise<void>
-
-export declare const afterKbfsDaemonRpcStatusChangedMobile: () => Promise<void>
-
-export declare const finishedRegularDownloadMobile: (
-  downloadID: string,
-  downloadState: T.FS.DownloadState,
-  downloadInfo: T.FS.DownloadInfo,
-  mimeType: string
-) => Promise<void>
diff --git a/shared/stores/fs-platform.native.tsx b/shared/stores/fs-platform.native.tsx
index e7f044ed9d24..4e6dabddfb6b 100644
--- a/shared/stores/fs-platform.native.tsx
+++ b/shared/stores/fs-platform.native.tsx
@@ -102,7 +102,7 @@ export const openPathInSystemFileManagerDesktop = async (
   _directMountDir: string
 ) => {}
 
-export const refreshDriverStatusDesktop = async () => {
+export const refreshDriverStatusDesktop = async (): Promise<T.RPCGen.FuseStatus | undefined> => {
   await Promise.resolve()
   return undefined
 }
@@ -114,14 +114,18 @@ export const refreshMountDirsDesktop = async () => {
 
 export const setSfmiBannerDismissedDesktop = async (_dismissed: boolean) => {}
 
-export const afterDriverEnabledDesktop = async (_isRetry: boolean) => {
+export const afterDriverEnabledDesktop = async (
+  _isRetry: boolean
+): Promise<'noop' | 'refresh' | 'kextPermissionError' | 'kextPermissionErrorRetry'> => {
   await Promise.resolve()
-  return 'noop' as const
+  return 'noop'
 }
 
-export const afterDriverDisableDesktop = async (_driverStatus: T.FS.DriverStatus) => {
+export const afterDriverDisableDesktop = async (
+  _driverStatus: T.FS.DriverStatus
+): Promise<'noop' | 'disabling' | 'refresh'> => {
   await Promise.resolve()
-  return 'noop' as const
+  return 'noop'
 }
 
 export const afterDriverDisablingDesktop = async (_driverStatus: T.FS.DriverStatus) => {}
diff --git a/shared/stores/push.desktop.tsx b/shared/stores/push.desktop.tsx
index 48aa467e94a3..507bb724952c 100644
--- a/shared/stores/push.desktop.tsx
+++ b/shared/stores/push.desktop.tsx
@@ -1,5 +1,5 @@
 import * as Z from '@/util/zustand'
-import {type Store, type State} from '@/stores/push'
+import {type Store, type State} from './push.shared'
 
 export const tokenType = ''
 
diff --git a/shared/stores/push.native.tsx b/shared/stores/push.native.tsx
index f4fd02d1be8f..23ee41609291 100644
--- a/shared/stores/push.native.tsx
+++ b/shared/stores/push.native.tsx
@@ -20,7 +20,7 @@ import {
   requestPushPermissions,
   removeAllPendingNotificationRequests,
 } from 'react-native-kb'
-import {type Store, type State} from '@/stores/push'
+import {type Store, type State} from '@/stores/push.shared'
 import {openAppSettings} from '@/util/storeless-actions'
 
 export const tokenType = isIOS ? (isDevApplePushToken ? 'appledev' : 'apple') : 'androidplay'
diff --git a/shared/stores/push.d.ts b/shared/stores/push.shared.tsx
similarity index 75%
rename from shared/stores/push.d.ts
rename to shared/stores/push.shared.tsx
index 5ee7628736c1..22b40e755e23 100644
--- a/shared/stores/push.d.ts
+++ b/shared/stores/push.shared.tsx
@@ -1,30 +1,25 @@
 import type * as T from '@/constants/types'
-import type {UseBoundStore, StoreApi} from 'zustand'
 
-type Store = T.Immutable<{
+export type Store = {
   hasPermissions: boolean
   justSignedUp: boolean
   pendingPushNotification?: T.Push.PushNotification
   showPushPrompt: boolean
   token: string
-}>
+}
 
 export type State = Store & {
   dispatch: {
     checkPermissions: () => Promise<boolean>
     clearPendingPushNotification: () => void
-    setPendingPushNotification: (notification: T.Push.PushNotification) => void
     deleteToken: (version: number) => void
     handlePush: (notification: T.Push.PushNotification) => void
     initialPermissionsCheck: () => void
     rejectPermissions: () => void
     requestPermissions: () => void
+    resetState: () => void
+    setPendingPushNotification: (notification: T.Push.PushNotification) => void
     setPushToken: (token: string) => void
     showPermissionsPrompt: (p: {show?: boolean; persistSkip?: boolean; justSignedUp?: boolean}) => void
-    resetState: () => void
   }
 }
-
-declare const usePushState: UseBoundStore<StoreApi<State>>
-declare const permissionsRequestingWaitingKey: string
-declare const tokenType: 'appledev' | 'apple' | 'androidplay'
diff --git a/shared/stores/settings-contacts.desktop.tsx b/shared/stores/settings-contacts.desktop.tsx
index ae5fd96b5add..300958590ce0 100644
--- a/shared/stores/settings-contacts.desktop.tsx
+++ b/shared/stores/settings-contacts.desktop.tsx
@@ -1,5 +1,5 @@
 import * as Z from '@/util/zustand'
-import type {Store, State} from './settings-contacts'
+import type {Store, State} from './settings-contacts.shared'
 
 const initialStore: Store = {
   alreadyOnKeybase: [],
diff --git a/shared/stores/settings-contacts.native.tsx b/shared/stores/settings-contacts.native.tsx
index 005877825291..ba356ec89d3c 100644
--- a/shared/stores/settings-contacts.native.tsx
+++ b/shared/stores/settings-contacts.native.tsx
@@ -5,7 +5,7 @@ import * as T from '@/constants/types'
 import * as Z from '@/util/zustand'
 import {addNotificationRequest} from 'react-native-kb'
 import logger from '@/logger'
-import type {Store, State} from './settings-contacts'
+import type {Store, State} from './settings-contacts.shared'
 import {RPCError} from '@/util/errors'
 import * as Localization from 'expo-localization'
 import {getE164} from '@/util/phone-numbers'
diff --git a/shared/stores/settings-contacts.d.ts b/shared/stores/settings-contacts.shared.tsx
similarity index 76%
rename from shared/stores/settings-contacts.d.ts
rename to shared/stores/settings-contacts.shared.tsx
index 6b92103fedfe..9916ff0c0673 100644
--- a/shared/stores/settings-contacts.d.ts
+++ b/shared/stores/settings-contacts.shared.tsx
@@ -1,14 +1,13 @@
 import type * as T from '@/constants/types'
-import type {UseBoundStore, StoreApi} from 'zustand'
+
 type PermissionStatus = 'granted' | 'denied' | 'undetermined' | 'unknown'
 
-type Store = T.Immutable<{
+export type Store = T.Immutable<{
   alreadyOnKeybase: Array<T.RPCGen.ProcessedContact>
   importEnabled?: boolean
   importError: string
   importPromptDismissed: boolean
   importedCount?: number
-  // OS permissions. 'undetermined' -> we can show the prompt; 'unknown' -> we haven't checked
   permissionStatus: PermissionStatus
   userCountryCode?: string
   waitingToShowJoinedModal: boolean
@@ -25,5 +24,3 @@ export type State = Store & {
     resetState: () => void
   }
 }
-
-declare const useSettingsContactsState: UseBoundStore<StoreApi<State>>
diff --git a/shared/styles/colors.tsx b/shared/styles/colors.tsx
index b102f0d3d6cc..1318608778ab 100644
--- a/shared/styles/colors.tsx
+++ b/shared/styles/colors.tsx
@@ -162,7 +162,7 @@ function createColorObject(mode: 'light' | 'dark') {
   for (const [_key, val] of Object.entries(colorDefs)) {
     const key = _key as keyof typeof colorDefs
     const color = val[mode]
-    result[key] = color as string
+    result[key] = color
   }
 
   for (const [_key, val] of Object.entries(colorVariants)) {
diff --git a/shared/styles/index.d.ts b/shared/styles/index.d.ts
deleted file mode 100644
index b9bee532e21f..000000000000
--- a/shared/styles/index.d.ts
+++ /dev/null
@@ -1,148 +0,0 @@
-// Styles from our designers
-import type * as React from 'react'
-import type * as CSS from './css'
-export {default as globalColors} from './colors'
-import type {ViewStyle} from 'react-native'
-
-export declare const transition: (...properties: Array<string>) => {transition: string}
-
-type _fakeFontDefSeeCommentsOnThisStyle = {
-  fontFamily: 'Keybase'
-  fontWeight: '700'
-  fontStyle: 'normal'
-}
-
-export declare const globalStyles: {
-  fillAbsolute: {
-    inset: 0
-    position: 'absolute'
-  }
-  flexBoxCenter: {
-    alignItems: 'center'
-    justifyContent: 'center'
-  }
-  flexBoxColumn: {flexDirection: 'column'}
-  flexBoxColumnReverse: {flexDirection: 'column-reverse'}
-  flexBoxRow: {flexDirection: 'row'}
-  flexBoxRowReverse: {flexDirection: 'row-reverse'}
-  flexGrow: {flexGrow: 1}
-  flexOne: {flex: 1}
-  flexWrap: {
-    flexWrap: 'wrap'
-  }
-  fontBold: {
-    fontFamily: 'Keybase'
-    fontWeight: '700'
-    fontStyle: 'normal'
-  }
-  fontExtrabold: _fakeFontDefSeeCommentsOnThisStyle
-  fontRegular: _fakeFontDefSeeCommentsOnThisStyle
-  fontSemibold: _fakeFontDefSeeCommentsOnThisStyle
-  fontTerminal: _fakeFontDefSeeCommentsOnThisStyle
-  fontTerminalSemibold: _fakeFontDefSeeCommentsOnThisStyle
-  fullHeight: {height: '100%'}
-  fullWidth: {width: '100%'}
-  italic: _fakeFontDefSeeCommentsOnThisStyle
-  largeWidthPercent: CSS.DimensionValue
-  loadingTextStyle: CSS._StylesCrossPlatform
-  mediumSubNavWidth: CSS.DimensionValue
-  mediumWidth: CSS.DimensionValue
-  opacity0: {opacity: 0}
-  positionRelative: {position: 'relative'}
-  rounded: {borderRadius: 3}
-  shortSubNavWidth: number | string
-}
-
-export declare const desktopStyles: {
-  boxShadow: {boxShadow: ''}
-  clickable: {cursor: 'pointer'}
-  editable: {cursor: 'text'}
-  fadeOpacity: {transition: 'opacity .25s ease-in-out'}
-  noSelect: {userSelect: 'none'}
-  scrollable: {overflowY: 'auto'}
-  windowDragging: {WebkitAppRegion: 'drag'}
-  windowDraggingClickable: {WebkitAppRegion: 'no-drag'}
-}
-
-export declare const mobileStyles: object
-export declare const fileUIName: string
-export declare const borderRadius: number
-export declare const hairlineWidth: number
-
-type NamedStyles = {[key: string]: CSS._StylesCrossPlatform}
-// order important!
-export declare function styleSheetCreate<O extends NamedStyles>(styles: () => O): O
-
-// CollapsibleStyle is a generic version of ?StylesMobile and family,
-// slightly extended to support "isFoo && myStyle".
-type RemovedStyle = false | '' | 0 | null | undefined
-
-export type CollapsibleStyle =
-  | CSS.StylesCrossPlatform
-  | RemovedStyle
-  | {lineHeight: CSS._StylesDesktop['lineHeight']}
-
-// TODO better styles that aren't slow
-export declare function collapseStyles(styles: ReadonlyArray<CollapsibleStyle>): CSS.StylesCrossPlatform
-export declare function collapseStylesDesktop(styles: ReadonlyArray<CollapsibleStyle>): React.CSSProperties
-export declare function castStyleDesktop(style: CollapsibleStyle): React.CSSProperties
-export declare function castStyleNative(style: CollapsibleStyle): ViewStyle
-
-export declare const windowStyle: {
-  minWidth: number
-  minHeight: number
-  width: number
-  height: number
-}
-
-export type Position =
-  | 'top left'
-  | 'top right'
-  | 'bottom right'
-  | 'bottom left'
-  | 'right center'
-  | 'left center'
-  | 'top center'
-  | 'bottom center'
-  | 'center center'
-
-export declare function padding(
-  top: number,
-  right?: number,
-  bottom?: number,
-  left?: number
-): {
-  paddingTop: number
-  paddingRight: number
-  paddingBottom: number
-  paddingLeft: number
-}
-
-export declare const isAndroid: boolean
-export declare const isIOS: boolean
-export declare const isMobile: boolean
-export declare const isPhone: boolean
-export declare const isTablet: boolean
-export declare const dimensionWidth: number
-export declare const dimensionHeight: number
-export declare const headerExtraHeight: number
-
-export {platformStyles, globalMargins, backgroundModeToColor, backgroundModeToTextColor} from './shared'
-export type {
-  StylesDesktop,
-  StylesMobile,
-  StylesCrossPlatform,
-  Color,
-  CustomStyles,
-  _StylesCrossPlatform,
-  _StylesDesktop,
-  _StylesMobile,
-} from './css'
-export {default as classNames} from './class-names'
-export declare const undynamicColor: (col: string) => string
-// add file:// if its a pure path
-export declare const normalizePath: (p: string) => string
-// remove file://
-export declare const unnormalizePath: (p: string) => string
-// fixup file:// with spaces etc
-export declare const urlEscapeFilePath: (path: string) => string
diff --git a/shared/styles/index.desktop.tsx b/shared/styles/index.desktop.tsx
index c4d613e65b6c..9a6f52e38744 100644
--- a/shared/styles/index.desktop.tsx
+++ b/shared/styles/index.desktop.tsx
@@ -13,41 +13,41 @@ const font = {
   fontBold: {
     ...fontCommon,
     fontFamily: 'Keybase',
-    fontWeight: 700,
+    fontWeight: '700' as const,
   },
   fontExtrabold: {
     ...fontCommon,
     fontFamily: 'Keybase',
-    fontWeight: 800,
+    fontWeight: '800' as const,
   },
   fontRegular: {
     ...fontCommon,
     fontFamily: 'Keybase',
-    fontWeight: 500,
+    fontWeight: '500' as const,
   },
   fontSemibold: {
     ...fontCommon,
     fontFamily: 'Keybase',
-    fontWeight: 600,
+    fontWeight: '600' as const,
   },
   fontTerminal: {
     ...fontCommon,
     fontFamily: 'Source Code Pro',
-    fontWeight: 500,
+    fontWeight: '500' as const,
   },
   fontTerminalSemibold: {
     ...fontCommon,
     fontFamily: 'Source Code Pro',
-    fontWeight: 600,
+    fontWeight: '600' as const,
   },
   italic: {
-    fontStyle: 'italic',
+    fontStyle: 'italic' as const,
   },
 }
 
 const util = {
   ...Shared.util,
-  largeWidthPercent: '70%',
+  largeWidthPercent: '70%' as const,
   loadingTextStyle: {
     // this won't really work with dark mode
     backgroundColor: colors.greyLight,
@@ -70,18 +70,18 @@ export const desktopStyles = {
   get boxShadow() {
     return {boxShadow: `0 2px 5px 0 ${themed.black_20OrBlack}`}
   },
-  clickable: {cursor: 'pointer'},
-  editable: {cursor: 'text'},
-  fadeOpacity: {transition: 'opacity .25s ease-in-out'},
-  noSelect: {userSelect: 'none'},
-  scrollable: {overflowY: 'auto'},
+  clickable: {cursor: 'pointer' as const},
+  editable: {cursor: 'text' as const},
+  fadeOpacity: {transition: 'opacity .25s ease-in-out' as const},
+  noSelect: {userSelect: 'none' as const},
+  scrollable: {overflowY: 'auto' as const},
   windowDragging: {
     // allow frameless window dragging
-    WebkitAppRegion: 'drag',
+    WebkitAppRegion: 'drag' as const,
   },
   windowDraggingClickable: {
     // allow things in frameless regions to be clicked and not dragged
-    WebkitAppRegion: 'no-drag',
+    WebkitAppRegion: 'no-drag' as const,
   },
 }
 
@@ -173,9 +173,10 @@ export const initDesktopStyles = () => {
 
 export const hairlineWidth = 1
 
-type NamedStyles = {[key: string]: CSS._StylesCrossPlatform}
-export function styleSheetCreate<O extends NamedStyles>(styles: () => O) {
-  return styleSheetCreateProxy(styles, o => o)
+type NamedStyles = Record<string, CSS._StylesCrossPlatform>
+export function styleSheetCreate<const O extends NamedStyles>(styles: () => O): O
+export function styleSheetCreate(styles: () => NamedStyles): NamedStyles {
+  return styleSheetCreateProxy(styles, o => o) as NamedStyles
 }
 
 export const collapseStyles = (styles: ReadonlyArray<unknown>): object | undefined => {
@@ -210,6 +211,18 @@ export {themed as globalColors} from './colors'
 export const borderRadius = 4
 export {default as classNames} from './class-names'
 export type StylesCrossPlatform = CSS.StylesCrossPlatform
+export type {Color, CustomStyles, _StylesCrossPlatform, _StylesDesktop, _StylesMobile} from './css'
+export type CollapsibleStyle = CSS.StylesCrossPlatform | false | '' | 0 | null | undefined
+export type Position =
+  | 'top left'
+  | 'top right'
+  | 'bottom right'
+  | 'bottom left'
+  | 'right center'
+  | 'left center'
+  | 'top center'
+  | 'bottom center'
+  | 'center center'
 export const dimensionWidth = 0
 export const dimensionHeight = 0
 export const headerExtraHeight = 0
diff --git a/shared/styles/index.native.tsx b/shared/styles/index.native.tsx
index 8893815c5df4..596673739cf3 100644
--- a/shared/styles/index.native.tsx
+++ b/shared/styles/index.native.tsx
@@ -4,44 +4,50 @@ import styleSheetCreateProxy, {type MapToStyles} from './style-sheet-proxy'
 import {StyleSheet, Dimensions} from 'react-native'
 import {useDarkModeState} from '@/stores/darkmode'
 import {isIOS, isTablet} from '@/constants/platform'
+import type * as CSS from './css'
 
 const font = isIOS
   ? {
-      fontBold: {fontFamily: 'Keybase', fontWeight: '700'},
-      fontExtrabold: {fontFamily: 'Keybase', fontWeight: '800'},
-      fontRegular: {fontFamily: 'Keybase', fontWeight: '500'},
-      fontSemibold: {fontFamily: 'Keybase', fontWeight: '600'},
-      fontTerminal: {fontFamily: 'Source Code Pro Medium'},
-      fontTerminalSemibold: {fontFamily: 'Source Code Pro Semibold', fontWeight: '600'},
-      italic: {fontStyle: 'italic'},
+      fontBold: {fontFamily: 'Keybase' as const, fontWeight: '700' as const},
+      fontExtrabold: {fontFamily: 'Keybase' as const, fontWeight: '800' as const},
+      fontRegular: {fontFamily: 'Keybase' as const, fontWeight: '500' as const},
+      fontSemibold: {fontFamily: 'Keybase' as const, fontWeight: '600' as const},
+      fontTerminal: {fontFamily: 'Source Code Pro Medium' as const},
+      fontTerminalSemibold: {fontFamily: 'Source Code Pro Semibold' as const, fontWeight: '600' as const},
+      italic: {fontStyle: 'italic' as const},
     }
   : {
       // The fontFamily name must match the font file's name exactly on Android.
-      fontBold: {fontFamily: 'keybase', fontWeight: '700'},
-      fontExtrabold: {fontFamily: 'keybase-extrabold', fontWeight: '800'},
-      fontRegular: {fontFamily: 'keybase-medium', fontWeight: '500'},
-      fontSemibold: {fontFamily: 'keybase-semibold', fontWeight: '600'},
-      fontTerminal: {fontFamily: 'SourceCodePro-Medium'},
-      fontTerminalSemibold: {fontFamily: 'SourceCodePro-Semibold', fontWeight: '600'},
-      italic: {fontStyle: 'italic'},
+      fontBold: {fontFamily: 'keybase' as const, fontWeight: '700' as const},
+      fontExtrabold: {fontFamily: 'keybase-extrabold' as const, fontWeight: '800' as const},
+      fontRegular: {fontFamily: 'keybase-medium' as const, fontWeight: '500' as const},
+      fontSemibold: {fontFamily: 'keybase-semibold' as const, fontWeight: '600' as const},
+      fontTerminal: {fontFamily: 'SourceCodePro-Medium' as const},
+      fontTerminalSemibold: {fontFamily: 'SourceCodePro-Semibold' as const, fontWeight: '600' as const},
+      italic: {fontStyle: 'italic' as const},
     }
 
 const util = {
   ...Shared.util,
-  largeWidthPercent: '70%',
+  largeWidthPercent: '70%' as const,
   loadingTextStyle: {
     backgroundColor: lightColors.greyLight,
     height: 16,
   },
-  mediumSubNavWidth: isTablet ? 270 : '100%',
-  mediumWidth: isTablet ? 460 : '100%',
-  shortSubNavWidth: isTablet ? 162 : '100%',
+  mediumSubNavWidth: (isTablet ? 270 : '100%') as CSS.DimensionValue,
+  mediumWidth: (isTablet ? 460 : '100%') as CSS.DimensionValue,
+  shortSubNavWidth: (isTablet ? 162 : '100%') as CSS.DimensionValue,
 }
 
 export const desktopStyles = {
-  scrollable: {
-    // TODO remove this style entirely, use ScrollView
-  },
+  boxShadow: {},
+  clickable: {},
+  editable: {},
+  fadeOpacity: {},
+  noSelect: {},
+  scrollable: {},
+  windowDragging: {},
+  windowDraggingClickable: {},
 }
 
 export const mobileStyles = {}
@@ -52,19 +58,18 @@ export const globalStyles = {
 }
 
 export const hairlineWidth = StyleSheet.hairlineWidth
-export const styleSheetCreate = (f: () => MapToStyles): unknown =>
-  styleSheetCreateProxy(f, o => StyleSheet.create(o as any) as MapToStyles)
+type NamedStyles = {[key: string]: CSS._StylesCrossPlatform}
+export function styleSheetCreate<const O extends NamedStyles>(f: () => O): O
+export function styleSheetCreate(f: () => NamedStyles): NamedStyles {
+  return styleSheetCreateProxy(f, o => StyleSheet.create(o as any) as MapToStyles) as unknown as NamedStyles
+}
 
-export const collapseStyles = (
-  styles: ReadonlyArray<unknown>
-): undefined | object | ReadonlyArray<unknown> => {
-  // if we have no / singular values we pass those on in the hopes they're consts
+export const collapseStyles = (styles: ReadonlyArray<unknown>): CSS.StylesCrossPlatform => {
   const nonNull = styles.filter(s => {
     if (!s) {
       return false
     }
-    // has a value?
-    for (const _ in s) {
+    for (const _ in s as object) {
       return true
     }
     return false
@@ -75,34 +80,46 @@ export const collapseStyles = (
   if (nonNull.length === 1) {
     const s = nonNull[0]
     if (s && typeof s === 'object') {
-      return s
+      return s as CSS.StylesCrossPlatform
     }
   }
-  // rn allows falsy values so let memoized values through
-  return styles
+  return styles as CSS.StylesCrossPlatform
 }
 export const collapseStylesDesktop = collapseStyles
 
-export const transition = () => ({})
+export const transition = (..._properties: Array<string>) => ({})
 
 export {isMobile, isPhone, isTablet, fileUIName, isIOS, isAndroid} from '@/constants/platform'
 export * from './shared'
 export * from './styles-base'
 export {themed as globalColors} from './colors'
 export {default as classNames} from './class-names'
+export type StylesCrossPlatform = CSS.StylesCrossPlatform
+export type {Color, _StylesCrossPlatform, _StylesDesktop, _StylesMobile, CustomStyles} from './css'
+export type CollapsibleStyle = CSS.StylesCrossPlatform | false | '' | 0 | null | undefined
+export type Position =
+  | 'top left'
+  | 'top right'
+  | 'bottom right'
+  | 'bottom left'
+  | 'right center'
+  | 'left center'
+  | 'top center'
+  | 'bottom center'
+  | 'center center'
 export const borderRadius = 6
 export const dimensionWidth = Dimensions.get('window').width
 export const dimensionHeight = Dimensions.get('window').height
 export const headerExtraHeight = isTablet ? 16 : 0
 
-export const undynamicColor = (_col: string) => {
+export const undynamicColor = (_col: string): string => {
   const isDarkMode = useDarkModeState.getState().isDarkMode()
   const col = _col as string | {dynamic?: {dark: string; light: string}}
   // try and unwrap, some things (toggle?) don't seems to like mixed dynamic colors
   if (typeof col !== 'string' && col.dynamic) {
     return col.dynamic[isDarkMode ? 'dark' : 'light']
   }
-  return col
+  return col as string
 }
 
 export const normalizePath = (p: string) => {
diff --git a/shared/styles/shared.tsx b/shared/styles/shared.tsx
index c9b7af7aae87..e51b7a134550 100644
--- a/shared/styles/shared.tsx
+++ b/shared/styles/shared.tsx
@@ -3,7 +3,7 @@ import {isMobile, isIOS, isAndroid, isTablet, isPhone, isElectron} from '@/const
 import type {_StylesCrossPlatform, _StylesMobile, _StylesDesktop} from './css'
 import type {Background} from '@/common-adapters/text.shared'
 
-/* eslint-disable sort-keys */
+ 
 export const globalMargins = {
   xxtiny: 2,
   xtiny: 4,
@@ -15,7 +15,7 @@ export const globalMargins = {
   large: 40,
   xlarge: 64,
 } as const
-/* eslint-enable sort-keys */
+ 
 
 export const backgroundModeToColor = {
   get Announcements() {
@@ -170,7 +170,7 @@ export function platformStyles<
   return out
 }
 
-/* eslint-disable sort-keys */
+ 
 export const padding = (top: number, right?: number, bottom?: number, left?: number) => ({
   paddingTop: top,
   paddingRight: right !== undefined ? right : top,
diff --git a/shared/styles/style-sheet-proxy.tsx b/shared/styles/style-sheet-proxy.tsx
index a6d33b090b3b..e3595676576f 100644
--- a/shared/styles/style-sheet-proxy.tsx
+++ b/shared/styles/style-sheet-proxy.tsx
@@ -1,5 +1,5 @@
 import {useDarkModeState} from '@/stores/darkmode'
-import type {StylesCrossPlatform} from '.'
+import type {StylesCrossPlatform} from '@/styles/css'
 
 // Support a closure to enable simple dark mode.
 // transform is to allow native styleSheetCreate to convert the object
diff --git a/shared/styles/styles-base.tsx b/shared/styles/styles-base.tsx
index 235b5e412a7d..472a33a2e142 100644
--- a/shared/styles/styles-base.tsx
+++ b/shared/styles/styles-base.tsx
@@ -1,3 +1,6 @@
+import type {CSSProperties} from 'react'
+import type {TextStyle, ViewStyle} from 'react-native'
+
 export const urlEscapeFilePath = (path: string) => {
   if (path.startsWith('file://')) {
     const parts = path.split('/')
@@ -7,6 +10,5 @@ export const urlEscapeFilePath = (path: string) => {
   return path
 }
 
-export const castStyleDesktop = (style: unknown) => style
-export const castStyleNative = (style: unknown) => style
-
+export const castStyleDesktop = (style: unknown): CSSProperties | undefined => style as CSSProperties | undefined
+export const castStyleNative = (style: unknown): (TextStyle & ViewStyle) | undefined => style as (TextStyle & ViewStyle) | undefined
diff --git a/shared/team-building/alphabet-index.desktop.tsx b/shared/team-building/alphabet-index.desktop.tsx
index 826bd434802e..cfe0e9349bc9 100644
--- a/shared/team-building/alphabet-index.desktop.tsx
+++ b/shared/team-building/alphabet-index.desktop.tsx
@@ -1,2 +1,4 @@
-const AlphabetIndex = () => null
+import type {Props} from './alphabet-index.shared'
+
+const AlphabetIndex = (_p: Props) => null
 export default AlphabetIndex
diff --git a/shared/team-building/alphabet-index.native.tsx b/shared/team-building/alphabet-index.native.tsx
index 9f51c39e34a8..5c978c4ebe5e 100644
--- a/shared/team-building/alphabet-index.native.tsx
+++ b/shared/team-building/alphabet-index.native.tsx
@@ -1,7 +1,7 @@
 import * as React from 'react'
 import {View, type NativeSyntheticEvent, type NativeTouchEvent} from 'react-native'
 import * as Kb from '@/common-adapters'
-import type {Props} from './alphabet-index'
+import type {Props} from './alphabet-index.shared'
 
 const stubTrue = () => true
 const initMeasureRef = {height: -1, pageY: -1}
diff --git a/shared/team-building/alphabet-index.d.ts b/shared/team-building/alphabet-index.shared.tsx
similarity index 50%
rename from shared/team-building/alphabet-index.d.ts
rename to shared/team-building/alphabet-index.shared.tsx
index 9ce94db66142..dbbd9b59e2b9 100644
--- a/shared/team-building/alphabet-index.d.ts
+++ b/shared/team-building/alphabet-index.shared.tsx
@@ -1,11 +1,9 @@
 import type * as Kb from '@/common-adapters'
+
 export type Props = {
   labels: Array<string>
   showNumSection: boolean
-  measureKey?: unknown // change this when the position of AlphabetIndex on the screen changes
+  measureKey?: unknown
   onScroll: (label: string) => void
   style?: Kb.Styles.StylesCrossPlatform
 }
-
-export declare const AlphabetIndex: (p: Props) => React.ReactNode
-export default AlphabetIndex
diff --git a/shared/team-building/service-tab-bar.desktop.tsx b/shared/team-building/service-tab-bar.desktop.tsx
index 977b96d9925a..f7145d1bf154 100644
--- a/shared/team-building/service-tab-bar.desktop.tsx
+++ b/shared/team-building/service-tab-bar.desktop.tsx
@@ -3,7 +3,7 @@ import * as Kb from '@/common-adapters/index'
 import {serviceIdToIconFont, serviceIdToAccentColor, serviceIdToLongLabel, serviceIdToBadge} from './shared'
 import difference from 'lodash/difference'
 import type * as T from '@/constants/types'
-import type {Props, IconProps} from './service-tab-bar'
+import type {Props, IconProps} from './service-tab-bar.shared'
 import {useColorScheme} from 'react-native'
 
 const getDesktopServicesLayout = (
diff --git a/shared/team-building/service-tab-bar.native.tsx b/shared/team-building/service-tab-bar.native.tsx
index def651c62d23..5337f3dd5003 100644
--- a/shared/team-building/service-tab-bar.native.tsx
+++ b/shared/team-building/service-tab-bar.native.tsx
@@ -2,7 +2,7 @@ import * as React from 'react'
 import * as Kb from '@/common-adapters'
 import {serviceIdToIconFont, serviceIdToAccentColor, serviceIdToLongLabel, serviceIdToBadge} from './shared'
 import {ScrollView} from 'react-native'
-import type {Props, IconProps} from './service-tab-bar'
+import type {Props, IconProps} from './service-tab-bar.shared'
 import {useColorScheme} from 'react-native'
 import {
   useSharedValue,
diff --git a/shared/team-building/service-tab-bar.d.ts b/shared/team-building/service-tab-bar.shared.tsx
similarity index 81%
rename from shared/team-building/service-tab-bar.d.ts
rename to shared/team-building/service-tab-bar.shared.tsx
index 6dc77c28bbd2..9e9237e32ebb 100644
--- a/shared/team-building/service-tab-bar.d.ts
+++ b/shared/team-building/service-tab-bar.shared.tsx
@@ -1,16 +1,6 @@
-import type * as React from 'react'
 import type * as T from '@/constants/types'
 import type {SharedValue} from '@/common-adapters/reanimated'
 
-export type Props = {
-  services: Array<T.TB.ServiceIdWithContact>
-  selectedService: T.TB.ServiceIdWithContact
-  onChangeService: (newService: T.TB.ServiceIdWithContact) => void
-  servicesShown?: number
-  minimalBorder?: boolean
-  offset?: SharedValue<number>
-}
-
 export type IconProps = {
   service: T.TB.ServiceIdWithContact
   label: Array<string>
@@ -20,5 +10,11 @@ export type IconProps = {
   offset?: SharedValue<number>
 }
 
-export declare const ServiceTabBar: (p: Props) => React.ReactNode
-export default ServiceTabBar
+export type Props = {
+  services: Array<T.TB.ServiceIdWithContact>
+  selectedService: T.TB.ServiceIdWithContact
+  onChangeService: (newService: T.TB.ServiceIdWithContact) => void
+  servicesShown?: number
+  minimalBorder?: boolean
+  offset?: SharedValue<number>
+}
diff --git a/shared/teams/add-members-wizard/add-contacts.d.ts b/shared/teams/add-members-wizard/add-contacts.d.ts
deleted file mode 100644
index e63e72e8e98f..000000000000
--- a/shared/teams/add-members-wizard/add-contacts.d.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import type * as React from 'react'
-import type {AddMembersWizard} from './state'
-
-declare const AddContact: (_: {wizard: AddMembersWizard}) => React.ReactNode
-export default AddContact
diff --git a/shared/teams/invite-by-contact/container.d.ts b/shared/teams/invite-by-contact/container.d.ts
deleted file mode 100644
index 2b0a5685ec8c..000000000000
--- a/shared/teams/invite-by-contact/container.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import type * as React from 'react'
-export type OwnProps = {teamID: string}
-declare const InviteByContact: (p: OwnProps) => React.ReactNode
-export default InviteByContact
diff --git a/shared/test/mocks/lottie-web.js b/shared/test/mocks/lottie-web.js
new file mode 100644
index 000000000000..a6127b2707fa
--- /dev/null
+++ b/shared/test/mocks/lottie-web.js
@@ -0,0 +1,2 @@
+/* global module */
+module.exports = {default: null}
diff --git a/shared/tools/gen-ts-paths.mjs b/shared/tools/gen-ts-paths.mjs
new file mode 100755
index 000000000000..41b8ab01e561
--- /dev/null
+++ b/shared/tools/gen-ts-paths.mjs
@@ -0,0 +1,76 @@
+#!/usr/bin/env node
+/* global console */
+import {readdirSync, writeFileSync, existsSync} from 'fs'
+import {join, relative} from 'path'
+import {fileURLToPath} from 'url'
+
+const sharedDir = join(fileURLToPath(import.meta.url), '..', '..')
+
+const PLATFORMS = ['desktop', 'native']
+const EXTENSIONS = ['.tsx', '.ts', '.mts']
+const SKIP_DIRS = new Set(['node_modules', '.tsOuts', 'dist', 'build', 'tools'])
+
+function walk(dir, results = []) {
+  for (const entry of readdirSync(dir, {withFileTypes: true})) {
+    if (entry.isDirectory()) {
+      if (!SKIP_DIRS.has(entry.name)) walk(join(dir, entry.name), results)
+    } else {
+      results.push(join(dir, entry.name))
+    }
+  }
+  return results
+}
+
+// Collect all files
+const allFiles = new Set(walk(sharedDir))
+
+// For each platform, find modules that have a platform variant but no plain variant
+function buildPaths(platform) {
+  const paths = {'@/*': ['./*']}
+
+  for (const file of allFiles) {
+    for (const ext of EXTENSIONS) {
+      const suffix = `.${platform}${ext}`
+      if (!file.endsWith(suffix)) continue
+
+      // e.g. /shared/styles/index.desktop.tsx → base = /shared/styles/index
+      const base = file.slice(0, -suffix.length)
+
+      // Check if a plain variant exists (foo.tsx / foo.ts / foo.mts / foo.d.ts)
+      const hasPlain = EXTENSIONS.some(e => existsSync(base + e)) || existsSync(base + '.d.ts')
+      if (hasPlain) continue
+
+      // Generate the @/* key and value
+      const rel = relative(sharedDir, base) // e.g. "styles/index"
+      const key = `@/${rel}`               // e.g. "@/styles/index"
+      const value = `./${rel}.${platform}` // e.g. "./styles/index.desktop"
+      paths[key] = [value]
+
+      // If rel ends with /index, also emit a bare-directory entry
+      // but only when no index.d.ts exists (which would provide types via @/* catch-all)
+      const parts = rel.split('/')
+      if (parts[parts.length - 1] === 'index') {
+        const bareRel = parts.slice(0, -1).join('/')
+        if (bareRel) {
+          const dirPath = join(sharedDir, bareRel)
+          const hasIndexDts = existsSync(join(dirPath, 'index.d.ts'))
+          if (!hasIndexDts) {
+            const bareKey = `@/${bareRel}`
+            const bareValue = `./${bareRel}/index.${platform}`
+            paths[bareKey] = [bareValue]
+          }
+        }
+      }
+    }
+  }
+
+  return paths
+}
+
+for (const platform of PLATFORMS) {
+  const paths = buildPaths(platform)
+  const out = {compilerOptions: {paths}}
+  const outFile = join(sharedDir, `tsconfig.paths.${platform}.json`)
+  writeFileSync(outFile, JSON.stringify(out, null, 2) + '\n')
+  console.log(`wrote tsconfig.paths.${platform}.json (${Object.keys(paths).length - 1} platform paths)`)
+}
diff --git a/shared/tracker/index.desktop.tsx b/shared/tracker/index.desktop.tsx
index c0d3dcc7ce87..e07a51f5329d 100644
--- a/shared/tracker/index.desktop.tsx
+++ b/shared/tracker/index.desktop.tsx
@@ -229,7 +229,7 @@ const AssertionRow = (props: {assertion: T.Tracker.Assertion}) => {
         <Kb.Text type="Body" style={styles.assertionTextContainer}>
           <Kb.Text
             type="BodyPrimaryLink"
-            onClick={a.siteURL ? () => openUrl(a.siteURL) : undefined}
+            onClick={a.siteURL ? () => { void openUrl(a.siteURL) } : undefined}
             style={Kb.Styles.collapseStyles([
               styles.assertionValue,
               a.state === 'revoked' && styles.strikeThrough,
@@ -244,7 +244,7 @@ const AssertionRow = (props: {assertion: T.Tracker.Assertion}) => {
           type={stateToIcon(a.state)}
           fontSize={20}
           color={assertionColorToColor(a.color)}
-          onClick={a.proofURL ? () => openUrl(a.proofURL) : undefined}
+          onClick={a.proofURL ? () => { void openUrl(a.proofURL) } : undefined}
         />
       </Kb.Box2>
       {!!a.metas.length && (
diff --git a/shared/tsconfig.base.json b/shared/tsconfig.base.json
new file mode 100644
index 000000000000..0202ce253346
--- /dev/null
+++ b/shared/tsconfig.base.json
@@ -0,0 +1,38 @@
+{
+  "extends": "expo/tsconfig.base",
+  "compilerOptions": {
+    "allowJs": false,
+    "allowImportingTsExtensions": true,
+    "allowUnreachableCode": false,
+    "allowUnusedLabels": false,
+    "checkJs": false,
+    "incremental": true,
+    "isolatedModules": true,
+    "jsx": "preserve",
+    "module": "preserve",
+    "moduleResolution": "bundler",
+    "exactOptionalPropertyTypes": false,
+    "noEmit": true,
+    "noFallthroughCasesInSwitch": true,
+    "noImplicitAny": true,
+    "noImplicitOverride": true,
+    "noImplicitReturns": true,
+    "noImplicitThis": true,
+    "noPropertyAccessFromIndexSignature": true,
+    "noUncheckedIndexedAccess": true,
+    "noUnusedLocals": true,
+    "noUnusedParameters": true,
+    "resolveJsonModule": true,
+    "skipLibCheck": true,
+    "sourceMap": false,
+    "strict": true,
+    "target": "esnext"
+  },
+  "watchOptions": {
+    "watchFile": "useFsEvents",
+    "watchDirectory": "useFsEvents",
+    "fallbackPolling": "dynamicPriority",
+    "synchronousWatchDirectory": true,
+    "excludeDirectories": ["**/node_modules", "./desktop/dist", "./desktop/build"]
+  }
+}
diff --git a/shared/tsconfig.desktop.json b/shared/tsconfig.desktop.json
new file mode 100644
index 000000000000..d8e5a1e392cf
--- /dev/null
+++ b/shared/tsconfig.desktop.json
@@ -0,0 +1,26 @@
+{
+  "extends": ["./tsconfig.base.json", "./tsconfig.paths.desktop.json"],
+  "compilerOptions": {
+    "moduleSuffixes": [".desktop", ""],
+    "lib": ["ESNext", "dom"],
+    "types": ["jest", "node", "webpack-env"],
+    "outDir": "./.tsOuts/.tsOut-desktop/emit",
+    "tsBuildInfoFile": "./.tsOuts/.tsOut-desktop/cache"
+  },
+  "include": ["./**/*.mts", "./**/*.mjs", "./**/*.ts", "./**/*.tsx"],
+  "exclude": [
+    "**/node_modules",
+    "./desktop/dist",
+    "./desktop/build",
+    "./**/*.native.tsx",
+    "./**/*.native.ts",
+    "./**/*.android.tsx",
+    "./**/*.android.ts",
+    "./**/*.ios.tsx",
+    "./**/*.ios.ts",
+    "./common-adapters/icon.constants-gen.desktop.tsx",
+    "./common-adapters/icon.constants-gen.native.tsx",
+    "./common-adapters/icon.constants-gen.shared.tsx",
+    "./globals.native.d.ts"
+  ]
+}
diff --git a/shared/tsconfig.json b/shared/tsconfig.json
index 48140b19d857..ce11773d6c89 100644
--- a/shared/tsconfig.json
+++ b/shared/tsconfig.json
@@ -1,54 +1,3 @@
 {
-  "compilerOptions": {
-    "allowJs": false,
-    "allowImportingTsExtensions": true,
-    "allowUnreachableCode": false,
-    "allowUnusedLabels": false,
-    "checkJs": false,
-    "incremental": true,
-    "isolatedModules": true,
-    "jsx": "preserve",
-    "lib": ["ESNext", "dom"],
-    "module": "preserve",
-    "moduleResolution": "bundler",
-    "exactOptionalPropertyTypes": false,
-    "noEmit": true,
-    "noFallthroughCasesInSwitch": true,
-    "noImplicitAny": true,
-    "noImplicitOverride": true,
-    "noImplicitReturns": true,
-    "noImplicitThis": true,
-    "noPropertyAccessFromIndexSignature": true,
-    "noUncheckedIndexedAccess": true,
-    "noUnusedLocals": true,
-    "noUnusedParameters": true,
-    "outDir": "./.tsOuts/.tsOut/emit",
-    "paths": {
-      "@/*": ["./*"]
-    },
-    "resolveJsonModule": true,
-    "skipLibCheck": true,
-    "sourceMap": false,
-    "strict": true,
-    "target": "esnext",
-    "tsBuildInfoFile": "./.tsOuts/.tsOut/cache",
-    "types": ["jest", "node", "webpack-env"]
-  },
-  "include": ["./**/*.mts", "./**/*.mjs", "./**/*.ts", "./**/*.tsx"],
-  "exclude": [
-    "**/node_modules",
-    "./desktop/dist",
-    "./desktop/build",
-    "./common-adapters/icon.constants-gen.desktop.tsx",
-    "./common-adapters/icon.constants-gen.native.tsx",
-    "./common-adapters/icon.constants-gen.shared.tsx"
-  ],
-  "watchOptions": {
-    "watchFile": "useFsEvents",
-    "watchDirectory": "useFsEvents",
-    "fallbackPolling": "dynamicPriority",
-    "synchronousWatchDirectory": true,
-    "excludeDirectories": ["**/node_modules", "./desktop/dist", "./desktop/build"]
-  },
-  "extends": "expo/tsconfig.base"
+  "extends": "./tsconfig.desktop.json"
 }
diff --git a/shared/tsconfig.native.json b/shared/tsconfig.native.json
new file mode 100644
index 000000000000..62df0a01afe7
--- /dev/null
+++ b/shared/tsconfig.native.json
@@ -0,0 +1,22 @@
+{
+  "extends": ["./tsconfig.base.json", "./tsconfig.paths.native.json"],
+  "compilerOptions": {
+    "moduleSuffixes": [".native", ""],
+    "lib": ["ESNext"],
+    "types": ["jest", "node"],
+    "outDir": "./.tsOuts/.tsOut-native/emit",
+    "tsBuildInfoFile": "./.tsOuts/.tsOut-native/cache"
+  },
+  "include": ["./**/*.mts", "./**/*.mjs", "./**/*.ts", "./**/*.tsx"],
+  "exclude": [
+    "**/node_modules",
+    "./desktop",
+    "./**/*.desktop.tsx",
+    "./**/*.desktop.ts",
+    "./common-adapters/icon.constants-gen.desktop.tsx",
+    "./common-adapters/icon.constants-gen.native.tsx",
+    "./common-adapters/icon.constants-gen.shared.tsx",
+    "./chat/conversation/normal/container.test.tsx",
+    "./common-adapters/markdown/index.test.tsx"
+  ]
+}
diff --git a/shared/tsconfig.paths.desktop.json b/shared/tsconfig.paths.desktop.json
new file mode 100644
index 000000000000..2a2e4b3bf8ba
--- /dev/null
+++ b/shared/tsconfig.paths.desktop.json
@@ -0,0 +1,7 @@
+{
+  "compilerOptions": {
+    "paths": {
+      "@/*": ["./*"]
+    }
+  }
+}
diff --git a/shared/tsconfig.paths.native.json b/shared/tsconfig.paths.native.json
new file mode 100644
index 000000000000..2a2e4b3bf8ba
--- /dev/null
+++ b/shared/tsconfig.paths.native.json
@@ -0,0 +1,7 @@
+{
+  "compilerOptions": {
+    "paths": {
+      "@/*": ["./*"]
+    }
+  }
+}
diff --git a/shared/unlock-folders/engine-actions.desktop.test.ts b/shared/unlock-folders/engine-actions.desktop.test.ts
index 390ccb038c42..f1e2cae25f03 100644
--- a/shared/unlock-folders/engine-actions.desktop.test.ts
+++ b/shared/unlock-folders/engine-actions.desktop.test.ts
@@ -36,7 +36,7 @@ test('rekey refresh actions forward the device list to unlock folders', () => {
 
 test('delegateRekeyUI creates a dangling session and returns its id', () => {
   const response = {result: jest.fn()}
-  mockCreateSession.mockReturnValue({id: 42})
+  mockCreateSession.mockReturnValue({getId: () => 42, id: 42})
 
   handleUnlockFoldersEngineAction(
     {
diff --git a/shared/unlock-folders/engine-actions.desktop.tsx b/shared/unlock-folders/engine-actions.desktop.tsx
index 202e058edb97..7fed3d8827a4 100644
--- a/shared/unlock-folders/engine-actions.desktop.tsx
+++ b/shared/unlock-folders/engine-actions.desktop.tsx
@@ -36,7 +36,7 @@ export const handleUnlockFoldersEngineAction = (
         },
       })
       const {response} = action.payload
-      response.result(session.id)
+      response.result(session.getId())
       break
     }
   }
diff --git a/shared/util/electron.d.ts b/shared/util/electron.d.ts
deleted file mode 100644
index 7e77516a7654..000000000000
--- a/shared/util/electron.d.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-// cross platform view of electron just so actions can type correctly
-type KB2 = {
-  functions: {
-    darwinCopyToKBFSTempUploadFile?: (dir: string, originalFilePath: string) => Promise<string>
-    darwinCopyToChatTempUploadFile?: (
-      dst: string,
-      originalFilePath: string
-    ) => Promise<{outboxID: Uint8Array; path: string}>
-    getPathForFile?: (file: File) => string
-  }
-}
-
-declare const kb2: KB2
-export default kb2
diff --git a/shared/util/electron.native.tsx b/shared/util/electron.native.tsx
index 4d351cabb7fc..b3f722939cac 100644
--- a/shared/util/electron.native.tsx
+++ b/shared/util/electron.native.tsx
@@ -1,4 +1,8 @@
 const None = {
-  functions: {},
+  functions: {} as {
+    darwinCopyToChatTempUploadFile?: (dst: string, originalFilePath: string) => Promise<void>
+    getPathForFile?: (file: File) => string
+    setNativeTheme?: (theme: 'dark' | 'light' | 'system') => Promise<void>
+  },
 }
 export default None
diff --git a/shared/util/feature-flags.d.ts b/shared/util/feature-flags.d.ts
deleted file mode 100644
index 55ffcc02ae03..000000000000
--- a/shared/util/feature-flags.d.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export type FeatureFlags = {
-  admin: boolean
-}
-
-declare const ff: FeatureFlags
-export default ff
diff --git a/shared/util/feature-flags.desktop.tsx b/shared/util/feature-flags.desktop.tsx
index 102a2aeada8f..8ce32aef4a14 100644
--- a/shared/util/feature-flags.desktop.tsx
+++ b/shared/util/feature-flags.desktop.tsx
@@ -1,5 +1,5 @@
 import {featureFlagsOverride} from '@/local-debug.desktop'
-import type {FeatureFlags} from './feature-flags'
+import type {FeatureFlags} from './feature-flags.shared'
 
 const features = featureFlagsOverride?.split(',') || []
 
diff --git a/shared/util/feature-flags.native.tsx b/shared/util/feature-flags.native.tsx
index b9dea7eca527..9f2f7e31f5d3 100644
--- a/shared/util/feature-flags.native.tsx
+++ b/shared/util/feature-flags.native.tsx
@@ -1,4 +1,4 @@
-import type {FeatureFlags} from './feature-flags'
+import type {FeatureFlags} from './feature-flags.shared'
 import {featureFlagsOverride} from '@/local-debug.native'
 
 const features = featureFlagsOverride.split(',')
diff --git a/shared/util/feature-flags.shared.tsx b/shared/util/feature-flags.shared.tsx
new file mode 100644
index 000000000000..7f9916286ef3
--- /dev/null
+++ b/shared/util/feature-flags.shared.tsx
@@ -0,0 +1,3 @@
+export type FeatureFlags = {
+  admin: boolean
+}
diff --git a/shared/util/idle-callback.tsx b/shared/util/idle-callback.tsx
index 6ebe07f35bd6..1df0c7010e14 100644
--- a/shared/util/idle-callback.tsx
+++ b/shared/util/idle-callback.tsx
@@ -26,10 +26,10 @@ function timeoutFallback(cb: (info: TimeoutInfo) => void): number {
   }, 20) as unknown as number
 }
 
+const _window = global.window
+
 const useFallback =
-  typeof window === 'undefined' ||
-  // eslint-disable-next-line
-  !window.requestIdleCallback ||
+  !_window?.requestIdleCallback ||
   // Timers in RN in chrome are super problematic. https://github.com/facebook/react-native/issues/4470
   (isMobile && isDebuggingInChrome) ||
   isMobile // AND.. idle timers are entirely broken on ios on device https://github.com/facebook/react-native/pull/29895
@@ -39,4 +39,4 @@ export const requestIdleCallback: CBType = forceImmediateLogging
   ? immediateCallback
   : useFallback
     ? timeoutFallback
-    : window.requestIdleCallback.bind(window)
+    : (_window.requestIdleCallback as CBType).bind(_window)
diff --git a/shared/util/misc.d.ts b/shared/util/misc.d.ts
deleted file mode 100644
index 7ff59d3b09f3..000000000000
--- a/shared/util/misc.d.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import type {OpenDialogOptions, SaveDialogOptions} from './electron.desktop'
-
-type NotifyPopupOpts = {body?: string; sound?: boolean}
-
-export declare function openURL(url?: string): void
-export declare function openSMS(phonenos: Array<string>, body?: string): Promise<unknown>
-export declare function clearLocalLogs(): Promise<void>
-export declare function editAvatar(): void
-export declare function pickImages(title: string): Promise<Array<string>>
-export declare function pickFiles(options: OpenDialogOptions): Promise<Array<string>>
-export declare function pickSave(options: SaveDialogOptions): Promise<string>
-export declare function NotifyPopup(
-  title: string,
-  opts?: NotifyPopupOpts,
-  rateLimitSeconds?: number,
-  rateLimitKey?: string,
-  onClick?: () => void,
-  onClose?: () => void
-): void
diff --git a/shared/util/misc.desktop.tsx b/shared/util/misc.desktop.tsx
index daca3122e9f6..cab397e5d17e 100644
--- a/shared/util/misc.desktop.tsx
+++ b/shared/util/misc.desktop.tsx
@@ -26,7 +26,7 @@ export const openURL = async (url?: string) => {
   return openURLImpl?.(url)
 }
 
-export const openSMS = async (): Promise<unknown> => {
+export const openSMS = async (_phonenos: Array<string>, _body?: string): Promise<unknown> => {
   console.warn('Attempted to open SMS on desktop')
   return Promise.reject(new Error("Can't open SMS on desktop"))
 }
diff --git a/shared/util/misc.native.tsx b/shared/util/misc.native.tsx
index a288bd2d0df6..361151919e84 100644
--- a/shared/util/misc.native.tsx
+++ b/shared/util/misc.native.tsx
@@ -62,11 +62,11 @@ export const pickFiles = async (_options: OpenDialogOptions): Promise<Array<stri
   return result.canceled ? [] : result.assets.map(a => a.uri)
 }
 
-export const pickSave = (_options: SaveDialogOptions): never => {
-  throw new Error('No supported platform')
+export const pickSave = async (_options: SaveDialogOptions): Promise<string> => {
+  return await Promise.reject(new Error('No supported platform'))
 }
 
-export function NotifyPopup(title: string, _opts?: NotifyPopupOpts): void {
+export function NotifyPopup(title: string, _opts?: NotifyPopupOpts, _rateLimitSeconds?: number, _rateLimitKey?: string, _onClick?: () => void, _onClose?: () => void): void {
   console.log('NotifyPopup: ', title)
   addNotificationRequest({
     body: title,
diff --git a/shared/util/platform-specific/index.d.ts b/shared/util/platform-specific/index.d.ts
deleted file mode 100644
index 9fb4d51545fc..000000000000
--- a/shared/util/platform-specific/index.d.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import type * as T from '@/constants/types'
-
-type NextURI = string
-
-export declare function showShareActionSheet(options: {
-  filePath?: string
-  message?: string
-  mimeType: string
-}): Promise<{
-  completed: boolean
-  method: string
-}>
-
-export declare function saveAttachmentToCameraRoll(fileURL: string, mimeType: string): Promise<void>
-export declare function requestLocationPermission(mode: T.RPCChat.UIWatchPositionPerm): Promise<void>
-export declare function watchPositionForMap(conversationIDKey: T.Chat.ConversationIDKey): Promise<() => void>
-
-export declare function requestPermissionsToWrite(): Promise<void>
-export declare const fsCacheDir: string
diff --git a/shared/util/platform-specific/index.desktop.tsx b/shared/util/platform-specific/index.desktop.tsx
index 425732a96ab7..5e956127a19d 100644
--- a/shared/util/platform-specific/index.desktop.tsx
+++ b/shared/util/platform-specific/index.desktop.tsx
@@ -2,10 +2,17 @@ export const requestPermissionsToWrite = async () => {
   return Promise.resolve(true)
 }
 
-export function showShareActionSheet() {
-  throw new Error('Show Share Action - unsupported on this platform')
+export async function showShareActionSheet(_options: {
+  filePath?: string
+  message?: string
+  mimeType: string
+}): Promise<void> {
+  return Promise.reject(new Error('Show Share Action - unsupported on this platform'))
 }
-export async function saveAttachmentToCameraRoll() {
+export async function saveAttachmentToCameraRoll(
+  _filePath: string,
+  _mimeType: string
+): Promise<void> {
   return Promise.reject(new Error('Save Attachment to camera roll - unsupported on this platform'))
 }
 
diff --git a/shared/util/storeless-actions.d.ts b/shared/util/storeless-actions.d.ts
deleted file mode 100644
index 9c085e8d30fe..000000000000
--- a/shared/util/storeless-actions.d.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-export declare const copyToClipboard: (text: string) => void
-
-export declare const dumpLogs: (reason?: string) => Promise<void>
-
-export declare const filePickerError: (error: Error) => void
-
-export declare const onEngineConnected: () => void
-
-export declare const openAppSettings: () => void
-
-export declare const openAppStore: () => void
-
-export declare const persistRoute: (
-  clear: boolean,
-  immediate: boolean,
-  isStartupLoaded: () => boolean
-) => void
-
-export declare const setOpenAtLoginInPlatform: (openAtLogin: boolean) => Promise<void>
-
-export declare const showMain: () => void
-
-export declare const showShareActionSheet: (
-  filePath: string,
-  message: string,
-  mimeType: string
-) => void
diff --git a/shared/util/use-intersection-observer.desktop.tsx b/shared/util/use-intersection-observer.desktop.tsx
index 109bd8056dc1..7ccc705ebcaf 100644
--- a/shared/util/use-intersection-observer.desktop.tsx
+++ b/shared/util/use-intersection-observer.desktop.tsx
@@ -1,6 +1,6 @@
 // https://github.com/jaredLunde/react-hook/blob/master/packages/intersection-observer/src/index.tsx
 import * as React from 'react'
-import type {IntersectionObserverOptions, MockIntersectionObserverEntry} from './use-intersection-observer'
+import type {IntersectionObserverOptions, MockIntersectionObserverEntry} from './use-intersection-observer.shared'
 
 function useIntersectionObserver<T extends HTMLElement = HTMLElement>(
   target: React.RefObject<T> | T | null,
diff --git a/shared/util/use-intersection-observer.native.tsx b/shared/util/use-intersection-observer.native.tsx
index 6cefb2696cde..4a19cda4a1ee 100644
--- a/shared/util/use-intersection-observer.native.tsx
+++ b/shared/util/use-intersection-observer.native.tsx
@@ -1,4 +1,4 @@
-import type {MockIntersectionObserverEntry} from './use-intersection-observer'
+import type {MockIntersectionObserverEntry} from './use-intersection-observer.shared'
 function useIntersectionObserver(): MockIntersectionObserverEntry {
   return {
     boundingClientRect: null,
diff --git a/shared/util/use-intersection-observer.d.ts b/shared/util/use-intersection-observer.shared.tsx
similarity index 72%
rename from shared/util/use-intersection-observer.d.ts
rename to shared/util/use-intersection-observer.shared.tsx
index c69040be1c58..28101cb79288 100644
--- a/shared/util/use-intersection-observer.d.ts
+++ b/shared/util/use-intersection-observer.shared.tsx
@@ -1,22 +1,3 @@
-declare function useIntersectionObserver<T extends HTMLElement = HTMLElement>(
-  target: React.RefObject<T> | T | null,
-  options?: IntersectionObserverOptions
-): MockIntersectionObserverEntry | IntersectionObserverEntry
-
-export type UseIntersectionObserverCallback = (
-  entry: IntersectionObserverEntry,
-  observer: IntersectionObserver
-) => unknown
-
-export interface IntersectionObserverOptions {
-  root?: HTMLElement | null
-  pollInterval?: number | null
-  useMutationObserver?: boolean
-  rootMargin?: string
-  threshold?: number | number[]
-  initialIsIntersecting?: boolean
-}
-
 export interface IntersectionObserverBounds {
   readonly height: number
   readonly width: number
@@ -36,4 +17,16 @@ export interface MockIntersectionObserverEntry {
   readonly isIntersecting: boolean
 }
 
-export default useIntersectionObserver
+export interface IntersectionObserverOptions {
+  root?: HTMLElement | null
+  pollInterval?: number | null
+  useMutationObserver?: boolean
+  rootMargin?: string
+  threshold?: number | number[]
+  initialIsIntersecting?: boolean
+}
+
+export type UseIntersectionObserverCallback = (
+  entry: MockIntersectionObserverEntry,
+  observer: unknown
+) => unknown
diff --git a/shared/util/use-resize-observer.d.ts b/shared/util/use-resize-observer.d.ts
deleted file mode 100644
index 9bbc8932150c..000000000000
--- a/shared/util/use-resize-observer.d.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-export type UseResizeObserverCallback = (entry: ResizeObserverEntry, observer: ResizeObserver) => unknown
-
-declare function useResizeObserver<T extends Element>(
-  target: React.RefObject<T> | React.ForwardedRef<T> | T | null,
-  callback: UseResizeObserverCallback
-): ResizeObserver
-export default useResizeObserver
diff --git a/shared/util/use-resize-observer.desktop.tsx b/shared/util/use-resize-observer.desktop.tsx
index 1b51601b5df8..0a87789e50b4 100644
--- a/shared/util/use-resize-observer.desktop.tsx
+++ b/shared/util/use-resize-observer.desktop.tsx
@@ -1,10 +1,11 @@
 // https://github.com/jaredLunde/react-hook/blob/master/packages/resize-observer/src/index.tsx
 import * as React from 'react'
-import type {UseResizeObserverCallback} from './use-resize-observer'
+
+type InternalCallback = (entry: ResizeObserverEntry, observer: ResizeObserver) => unknown
 
 function useResizeObserver<T extends Element>(
   target: React.RefObject<T> | React.ForwardedRef<T> | T | null,
-  callback: UseResizeObserverCallback
+  callback: InternalCallback
 ): ResizeObserver {
   const resizeObserver = getResizeObserver()
   const storedCallback = React.useRef(callback)
@@ -36,7 +37,7 @@ function createResizeObserver() {
   let ticking = false
   let allEntries: ResizeObserverEntry[] = []
 
-  const callbacks: Map<unknown, Array<UseResizeObserverCallback>> = new Map()
+  const callbacks: Map<unknown, Array<InternalCallback>> = new Map()
 
   const observer = new window.ResizeObserver((entries: ResizeObserverEntry[], obs: ResizeObserver) => {
     allEntries = allEntries.concat(entries)
@@ -52,7 +53,7 @@ function createResizeObserver() {
           if (triggered.has(entry.target)) continue
           triggered.add(entry.target)
           const cbs = callbacks.get(entry.target)
-          // eslint-disable-next-line
+           
           cbs?.forEach(cb => cb(entry, obs))
         }
         allEntries = []
@@ -64,13 +65,13 @@ function createResizeObserver() {
 
   return {
     observer,
-    subscribe(target: Element, callback: UseResizeObserverCallback) {
+    subscribe(target: Element, callback: InternalCallback) {
       observer.observe(target)
       const cbs = callbacks.get(target) ?? []
       cbs.push(callback)
       callbacks.set(target, cbs)
     },
-    unsubscribe(target: Element, callback: UseResizeObserverCallback) {
+    unsubscribe(target: Element, callback: InternalCallback) {
       const cbs = callbacks.get(target) ?? []
       if (cbs.length === 1) {
         observer.unobserve(target)
diff --git a/shared/util/use-resize-observer.native.tsx b/shared/util/use-resize-observer.native.tsx
index f180f4a4fd87..7a9b0dbafe39 100644
--- a/shared/util/use-resize-observer.native.tsx
+++ b/shared/util/use-resize-observer.native.tsx
@@ -1,4 +1,10 @@
-function useResizeObserver(): ResizeObserver {
+type FakeResizeObserver = {
+  disconnect: () => void
+  observe: () => void
+  unobserve: () => void
+}
+
+function useResizeObserver(_target?: unknown, _callback?: unknown): FakeResizeObserver {
   return {
     disconnect: () => {},
     observe: () => {},