merge small utils down

shared/chat/conversation/bot/install.tsx

@@ -5,7 +5,7 @@ import * as Teams from '@/stores/teams'
 import * as React from 'react'
 import {useModalHeaderState} from '@/stores/modal-header'
 import ChannelPicker from './channel-picker'
-import openURL from '@/util/open-url'
+import {openURL} from '@/util/misc'
 import * as T from '@/constants/types'
 import {useBotsState} from '@/stores/bots'
 import {useAllChannelMetas} from '@/teams/common/channel-hooks'

shared/chat/conversation/bottom-banner.tsx

@@ -2,7 +2,7 @@ import * as C from '@/constants'
 import * as Chat from '@/stores/chat'
 import * as Kb from '@/common-adapters'
 import type * as React from 'react'
-import _openSMS from '@/util/sms'
+import {openSMS as _openSMS} from '@/util/misc'
 import {assertionToDisplay} from '@/common-adapters/usernames'
 import {useUsersState} from '@/stores/users'
 import {useFollowerState} from '@/stores/followers'

shared/chat/conversation/messages/cards/new-chat.tsx

@@ -1,5 +1,5 @@
 import * as Kb from '@/common-adapters'
-import openUrl from '@/util/open-url'
+import {openURL as openUrl} from '@/util/misc'
 
 type Props = {
   self: boolean

shared/chat/conversation/messages/message-popup/text.tsx

@@ -6,7 +6,7 @@ import * as Kb from '@/common-adapters'
 import * as T from '@/constants/types'
 import type {Position, StylesCrossPlatform} from '@/styles'
 import {useItems, useHeader} from './hooks'
-import openURL from '@/util/open-url'
+import {openURL} from '@/util/misc'
 import {useCurrentUserState} from '@/stores/current-user'
 
 type OwnProps = {

shared/chat/conversation/messages/text/unfurl/unfurl-list/image/index.tsx

@@ -3,7 +3,7 @@ import * as Kb from '@/common-adapters/index'
 import * as Chat from '@/stores/chat'
 import {maxWidth} from '@/chat/conversation/messages/attachment/shared'
 import {Video} from './video'
-import openURL from '@/util/open-url'
+import {openURL} from '@/util/misc'
 
 export type Props = {
   autoplayVideo: boolean

shared/chat/conversation/messages/text/unfurl/unfurl-list/map-popup.tsx

@@ -2,7 +2,7 @@ import * as C from '@/constants'
 import * as Chat from '@/stores/chat'
 import * as Kb from '@/common-adapters/index'
 import type * as T from '@/constants/types'
-import openURL from '@/util/open-url'
+import {openURL} from '@/util/misc'
 import LocationMap from '@/chat/location-map'
 import {useConfigState} from '@/stores/config'
 

shared/chat/location-map.desktop.tsx

@@ -1,6 +1,6 @@
 import * as React from 'react'
 import * as Kb from '@/common-adapters'
-import openURL from '@/util/open-url'
+import {openURL} from '@/util/misc'
 
 type Props = {
   height: number

shared/chat/location-map.native.tsx

@@ -1,6 +1,6 @@
 import * as React from 'react'
 import * as Kb from '@/common-adapters'
-import openURL from '@/util/open-url'
+import {openURL} from '@/util/misc'
 
 type Props = {
   height: number

shared/chat/punycode-link-warning.tsx

@@ -1,6 +1,6 @@
 import * as Kb from '@/common-adapters'
 import {useSafeNavigation} from '@/util/safe-navigation'
-import openURL from '@/util/open-url'
+import {openURL} from '@/util/misc'
 
 type PunycodeLinkWarningProps = {
   display: string

shared/common-adapters/text-url.desktop.tsx

@@ -1,4 +1,4 @@
-import openURL from '@/util/open-url'
+import {openURL} from '@/util/misc'
 import KB2 from '@/util/electron.desktop'
 const {showContextMenu} = KB2.functions
 

shared/common-adapters/text-url.native.tsx

@@ -1,4 +1,4 @@
-import openURL from '@/util/open-url'
+import {openURL} from '@/util/misc'
 import * as Clipboard from 'expo-clipboard'
 import {Alert} from 'react-native'
 

shared/common-adapters/web-view.native.tsx

@@ -3,7 +3,7 @@ import * as React from 'react'
 import * as Styles from '@/styles'
 import LoadingStateView from './loading-state-view'
 import memoize from 'lodash/memoize'
-import openURL from '@/util/open-url'
+import {openURL} from '@/util/misc'
 import type {WebViewInjections, WebViewProps} from './web-view'
 import {View as NativeView} from 'react-native'
 import {WebView as NativeWebView} from 'react-native-webview'

shared/constants/init/index.desktop.tsx

@@ -17,7 +17,7 @@ import {getEngine} from '@/engine'
 import {isLinux, isWindows, isDarwin, pathSep} from '@/constants/platform.desktop'
 import {kbfsNotification} from '@/util/platform-specific/kbfs-notifications'
 import {skipAppFocusActions} from '@/local-debug.desktop'
-import NotifyPopup from '@/util/notify-popup'
+import {NotifyPopup} from '@/util/misc'
 import {noKBFSFailReason} from '@/constants/config'
 import {initSharedSubscriptions, _onEngineIncoming} from './shared'
 import {wrapErrors} from '@/util/debug'

shared/constants/init/index.native.tsx

@@ -16,7 +16,7 @@ import * as ExpoLocation from 'expo-location'
 import * as ExpoTaskManager from 'expo-task-manager'
 import * as Tabs from '@/constants/tabs'
 import * as NetInfo from '@react-native-community/netinfo'
-import NotifyPopup from '@/util/notify-popup'
+import {NotifyPopup} from '@/util/misc'
 import logger from '@/logger'
 import {Alert, Linking} from 'react-native'
 import {isAndroid} from '@/constants/platform.native'

shared/crypto/input.tsx

@@ -6,7 +6,7 @@ import * as Kb from '@/common-adapters'
 import * as FS from '@/constants/fs'
 import type {IconType} from '@/common-adapters/icon.constants-gen'
 import capitalize from 'lodash/capitalize'
-import {pickFiles} from '@/util/pick-files'
+import {pickFiles} from '@/util/misc'
 
 type CommonProps = {
   operation: T.Crypto.Operations

shared/crypto/operations/encrypt.tsx

@@ -3,7 +3,7 @@ import * as Crypto from '@/stores/crypto'
 import * as Kb from '@/common-adapters'
 import * as React from 'react'
 import Recipients from '../recipients'
-import openURL from '@/util/open-url'
+import {openURL} from '@/util/misc'
 import {DragAndDrop, Input, InputActionsBar, OperationBanner} from '../input'
 import {OutputInfoBanner, OperationOutput, OutputActionsBar, SignedSender} from '../output'
 

shared/crypto/operations/sign.tsx

@@ -2,7 +2,7 @@ import * as C from '@/constants'
 import * as Crypto from '@/stores/crypto'
 import * as React from 'react'
 import * as Kb from '@/common-adapters'
-import openURL from '@/util/open-url'
+import {openURL} from '@/util/misc'
 import {Input, DragAndDrop, OperationBanner, InputActionsBar} from '../input'
 import {OutputInfoBanner, OperationOutput, OutputActionsBar, SignedSender} from '../output'
 

shared/crypto/output.tsx

@@ -6,7 +6,7 @@ import * as Path from '@/util/path'
 import * as React from 'react'
 import capitalize from 'lodash/capitalize'
 import type * as T from '@/constants/types'
-import {pickFiles} from '@/util/pick-files'
+import {pickFiles} from '@/util/misc'
 import type HiddenString from '@/util/hidden-string'
 import {useFSState} from '@/stores/fs'
 import * as FS from '@/constants/fs'

shared/fs/banner/conflict-banner.tsx

@@ -1,7 +1,7 @@
 import * as C from '@/constants'
 import * as Kb from '@/common-adapters'
 import * as T from '@/constants/types'
-import openUrl from '@/util/open-url'
+import {openURL as openUrl} from '@/util/misc'
 import {useFSState} from '@/stores/fs'
 import * as FS from '@/stores/fs'
 

shared/git/row.tsx

@@ -4,7 +4,7 @@ import * as Teams from '@/stores/teams'
 import * as T from '@/constants/types'
 import * as Kb from '@/common-adapters'
 import * as React from 'react'
-import openURL from '@/util/open-url'
+import {openURL} from '@/util/misc'
 import {useTrackerState} from '@/stores/tracker'
 import * as FS from '@/stores/fs'
 import {useCurrentUserState} from '@/stores/current-user'

shared/menubar/index.desktop.tsx

@@ -10,7 +10,7 @@ import Filename from '@/fs/common/filename'
 import KB2 from '@/util/electron.desktop'
 import OutOfDate from './out-of-date'
 import Upload from '@/fs/footer/upload'
-import openUrl from '@/util/open-url'
+import {openURL as openUrl} from '@/util/misc'
 import {Loading} from '@/fs/simple-screens'
 import {isLinux, isDarwin} from '@/constants/platform'
 import {type _InnerMenuItem} from '@/common-adapters/floating-menu/menu-layout'

shared/people/announcement.tsx

@@ -1,7 +1,7 @@
 import * as C from '@/constants'
 import * as Chat from '@/stores/chat'
 import * as T from '@/constants/types'
-import openURL from '@/util/open-url'
+import {openURL} from '@/util/misc'
 import * as Kb from '@/common-adapters'
 import PeopleItem from './item'
 import * as Settings from '@/constants/settings'

shared/people/todo.tsx

@@ -1,7 +1,7 @@
 import * as C from '@/constants'
 import {useTeamsState} from '@/stores/teams'
 import * as React from 'react'
-import openURL from '@/util/open-url'
+import {openURL} from '@/util/misc'
 import type * as T from '@/constants/types'
 import type {IconType} from '@/common-adapters/icon.constants-gen'
 import PeopleItem, {type TaskButton} from './item'

shared/profile/generic/enter-username.tsx

@@ -1,6 +1,6 @@
 import * as C from '@/constants'
 import {useProfileState} from '@/stores/profile'
-import openURL from '@/util/open-url'
+import {openURL} from '@/util/misc'
 import * as React from 'react'
 import * as Kb from '@/common-adapters'
 import {SiteIcon} from './shared'

shared/profile/post-proof.tsx

@@ -3,7 +3,7 @@ import {useProfileState} from '@/stores/profile'
 import * as React from 'react'
 import * as Kb from '@/common-adapters'
 import {subtitle} from '@/util/platforms'
-import openUrl from '@/util/open-url'
+import {openURL as openUrl} from '@/util/misc'
 import Modal from './modal'
 import {useConfigState} from '@/stores/config'
 

shared/provision/error.tsx

@@ -3,7 +3,7 @@ import * as AutoReset from '@/stores/autoreset'
 import * as Kb from '@/common-adapters'
 import type * as React from 'react'
 import LoginContainer from '../login/forms/container'
-import openURL from '@/util/open-url'
+import {openURL} from '@/util/misc'
 import * as T from '@/constants/types'
 import {useProvisionState} from '@/stores/provision'
 

shared/router-v2/tab-bar.desktop.tsx

@@ -9,7 +9,7 @@ import * as Tabs from '@/constants/tabs'
 import * as Common from './common.desktop'
 import AccountSwitcher from './account-switcher'
 import RuntimeStats from '../app/runtime-stats'
-import openURL from '@/util/open-url'
+import {openURL} from '@/util/misc'
 import {isLinux} from '@/constants/platform'
 import KB2 from '@/util/electron.desktop'
 import './tab-bar.css'

shared/settings/about.tsx

@@ -1,6 +1,6 @@
 import * as C from '@/constants'
 import * as Kb from '@/common-adapters'
-import openUrl from '@/util/open-url'
+import {openURL as openUrl} from '@/util/misc'
 
 const privacyPolicy = 'https://keybase.io/_/webview/privacypolicy'
 const terms = 'https://keybase.io/_/webview/terms'

shared/settings/archive/modal.tsx

@@ -2,7 +2,7 @@ import * as React from 'react'
 import * as Kb from '@/common-adapters'
 import * as C from '@/constants'
 import type * as T from '@/constants/types'
-import {pickSave} from '@/util/pick-files'
+import {pickSave} from '@/util/misc'
 import * as FsCommon from '@/fs/common'
 import {useArchiveState} from '@/stores/archive'
 import {settingsArchiveTab} from '@/stores/settings'

shared/signup/common.tsx

@@ -2,7 +2,7 @@ import * as C from '@/constants'
 import type * as React from 'react'
 import * as Kb from '@/common-adapters'
 import {type ButtonProps} from '@/common-adapters/button'
-import openURL from '@/util/open-url'
+import {openURL} from '@/util/misc'
 import {useConfigState} from '@/stores/config'
 
 type InfoIconProps = {

shared/stores/convostate.tsx

@@ -36,7 +36,7 @@ import {noConversationIDKey} from '@/constants/types/chat/common'
 import {type StoreApi, type UseBoundStore, useStore} from 'zustand'
 import * as Platform from '@/constants/platform'
 import KB2 from '@/util/electron'
-import NotifyPopup from '@/util/notify-popup'
+import {NotifyPopup} from '@/util/misc'
 import {hexToUint8Array} from 'uint8array-extras'
 import {clearChatTimeCache} from '@/util/timestamp'
 import {registerDebugClear} from '@/util/debug'

shared/stores/fs.tsx

@@ -5,7 +5,7 @@ import {requestPermissionsToWrite} from '@/util/platform-specific'
 import * as Tabs from '@/constants/tabs'
 import * as T from '@/constants/types'
 import * as Z from '@/util/zustand'
-import NotifyPopup from '@/util/notify-popup'
+import {NotifyPopup} from '@/util/misc'
 import {RPCError} from '@/util/errors'
 import logger from '@/logger'
 import {tlfToPreferredOrder} from '@/util/kbfs'

shared/stores/profile.tsx

@@ -4,7 +4,7 @@ import * as S from '@/constants/strings'
 import * as Validators from '@/util/simple-validators'
 import * as Z from '@/util/zustand'
 import logger from '@/logger'
-import openURL from '@/util/open-url'
+import {openURL} from '@/util/misc'
 import {RPCError} from '@/util/errors'
 import {fixCrop} from '@/util/crop'
 import {clearModals, navToProfile, navigateAppend, navigateUp} from '@/constants/router'

shared/stores/settings.tsx

@@ -2,7 +2,7 @@ import * as T from '@/constants/types'
 import {ignorePromise, timeoutPromise} from '@/constants/utils'
 import * as S from '@/constants/strings'
 import {androidIsTestDevice, pprofDir} from '@/constants/platform'
-import openURL from '@/util/open-url'
+import {openURL} from '@/util/misc'
 import * as Z from '@/util/zustand'
 import {RPCError} from '@/util/errors'
 import * as Tabs from '@/constants/tabs'
@@ -105,7 +105,7 @@ export const useSettingsState = Z.createZustand<State>('settings', (set, get) =>
     },
     clearLogs: () => {
       const f = async () => {
-        const clearLocalLogs = (await import('@/util/clear-logs')).default
+        const {clearLocalLogs} = await import('@/util/misc')
         await clearLocalLogs()
       }
       ignorePromise(f())

shared/stores/teams.tsx

@@ -13,7 +13,7 @@ import {
 import * as Z from '@/util/zustand'
 import invert from 'lodash/invert'
 import logger from '@/logger'
-import openSMS from '@/util/sms'
+import {openSMS} from '@/util/misc'
 import {RPCError, logError} from '@/util/errors'
 import {isMobile, isPhone} from '@/constants/platform'
 import {mapGetEnsureValue} from '@/util/map'

shared/teams/emojis/add-emoji.tsx

@@ -4,7 +4,7 @@ import * as Chat from '@/stores/chat'
 import * as React from 'react'
 import * as Kb from '@/common-adapters'
 import {AliasInput, Modal} from './common'
-import {pickImages} from '@/util/pick-files'
+import {pickImages} from '@/util/misc'
 import kebabCase from 'lodash/kebabCase'
 import {useEmojiState} from './use-emoji'
 import {HeaderLeftButton} from '@/common-adapters/header-buttons'
@@ -13,7 +13,7 @@ import KB2 from '@/util/electron'
 
 const {getPathForFile} = KB2.functions
 
-const pickEmojisPromise = async () => pickImages('Select emoji images to upload')
+const pickEmojisPromise = async () => await pickImages('Select emoji images to upload')
 
 type Props = {
   conversationIDKey: T.Chat.ConversationIDKey

shared/teams/new-team/index.tsx

@@ -3,7 +3,7 @@ import * as React from 'react'
 import * as Teams from '@/stores/teams'
 import * as Kb from '@/common-adapters'
 import * as T from '@/constants/types'
-import openUrl from '@/util/open-url'
+import {openURL as openUrl} from '@/util/misc'
 import upperFirst from 'lodash/upperFirst'
 
 const openSubteamInfo = () => openUrl('https://book.keybase.io/docs/teams/design')

shared/tracker/assertion.tsx

@@ -3,7 +3,7 @@ import * as C from '@/constants'
 import {useConfigState} from '@/stores/config'
 import {useCurrentUserState} from '@/stores/current-user'
 import type * as T from '@/constants/types'
-import openUrl from '@/util/open-url'
+import {openURL as openUrl} from '@/util/misc'
 import * as Kb from '@/common-adapters'
 import {SiteIcon} from '@/profile/generic/shared'
 import {formatTimeForAssertionPopup} from '@/util/timestamp'

shared/tracker/index.desktop.tsx

@@ -1,6 +1,6 @@
 import * as Kb from '@/common-adapters'
 import type * as T from '@/constants/types'
-import openUrl from '@/util/open-url'
+import {openURL as openUrl} from '@/util/misc'
 import {useColorScheme} from 'react-native'
 
 export type Props = {