fix: types

shapeshift · Jan 17, 2025 · c562ee4 · c562ee4
1 parent 77d0cd5
commit c562ee4
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 5 deletions.
diff --git a/src/context/WalletProvider/NewWalletViews/wallets/mipd/FirstClassBody.tsx b/src/context/WalletProvider/NewWalletViews/wallets/mipd/FirstClassBody.tsx
@@ -1,4 +1,5 @@
 import { Alert, AlertDescription, AlertIcon, Button, Flex, Image, Spinner } from '@chakra-ui/react'
+import type { MetaMaskAdapter } from '@shapeshiftoss/hdwallet-metamask-multichain'
 import { useCallback } from 'react'
 import { useTranslate } from 'react-polyglot'
 import { useHistory } from 'react-router-dom'
@@ -47,7 +48,8 @@ export const FirstClassBody = ({
     setError(null)
     setIsLoading(true)
 
-    const adapter = await getAdapter(keyManager)
+    // Just to narrow the types so that PairDevice is defined at type-level, this can currently be a Coinbase/Phantom/Keplr adapter
+    const adapter = (await getAdapter(keyManager)) as MetaMaskAdapter | null
     if (!adapter) {
       setIsLoading(false)
       return

diff --git a/src/plugins/walletConnectToDapps/components/modals/CosmosSignMessageConfirmation.tsx b/src/plugins/walletConnectToDapps/components/modals/CosmosSignMessageConfirmation.tsx
@@ -43,7 +43,10 @@ export const CosmosSignMessageConfirmationModal: FC<
   const translate = useTranslate()
   const walletInfo = useWallet().state.walletInfo
   const WalletIcon = walletInfo?.icon ?? FoxIcon
-  const walletIcon = useMemo(() => <WalletIcon w='full' h='full' />, [WalletIcon])
+  const walletIcon = useMemo(
+    () => (typeof WalletIcon === 'string' ? null : <WalletIcon w='full' h='full' />),
+    [WalletIcon],
+  )
   const cardBg = useColorModeValue('white', 'gray.850')
   const request = state.modalData.requestEvent?.params.request
 

diff --git a/src/plugins/walletConnectToDapps/components/modals/EIP155SignMessageConfirmation.tsx b/src/plugins/walletConnectToDapps/components/modals/EIP155SignMessageConfirmation.tsx
@@ -42,7 +42,10 @@ export const EIP155SignMessageConfirmationModal: FC<
   const translate = useTranslate()
   const walletInfo = useWallet().state.walletInfo
   const WalletIcon = walletInfo?.icon ?? FoxIcon
-  const walletIcon = useMemo(() => <WalletIcon w='full' h='full' />, [WalletIcon])
+  const walletIcon = useMemo(
+    () => (typeof WalletIcon === 'string' ? null : <WalletIcon w='full' h='full' />),
+    [WalletIcon],
+  )
   const cardBg = useColorModeValue('white', 'gray.850')
 
   const handleConfirm = useCallback(async () => {

diff --git a/src/plugins/walletConnectToDapps/components/modals/EIP155SignTypedDataConfirmation.tsx b/src/plugins/walletConnectToDapps/components/modals/EIP155SignTypedDataConfirmation.tsx
@@ -31,7 +31,10 @@ export const EIP155SignTypedDataConfirmation: FC<
   const translate = useTranslate()
   const walletInfo = useWallet().state.walletInfo
   const WalletIcon = walletInfo?.icon ?? FoxIcon
-  const walletIcon = useMemo(() => <WalletIcon w='full' h='full' />, [WalletIcon])
+  const walletIcon = useMemo(
+    () => (typeof WalletIcon === 'string' ? null : <WalletIcon w='full' h='full' />),
+    [WalletIcon],
+  )
 
   const handleConfirm = useCallback(async () => {
     setIsLoading(true)

diff --git a/src/plugins/walletConnectToDapps/components/modals/EIP155TransactionConfirmation.tsx b/src/plugins/walletConnectToDapps/components/modals/EIP155TransactionConfirmation.tsx
@@ -65,7 +65,10 @@ export const EIP155TransactionConfirmation: FC<
     state: { walletInfo },
   } = useWallet()
   const WalletIcon = walletInfo?.icon ?? FoxIcon
-  const walletIcon = useMemo(() => <WalletIcon w='full' h='full' />, [WalletIcon])
+  const walletIcon = useMemo(
+    () => (typeof WalletIcon === 'string' ? null : <WalletIcon w='full' h='full' />),
+    [WalletIcon],
+  )
   const addressSummaryCardIcon = useMemo(
     () => <Image borderRadius='full' w='full' h='full' src={feeAsset?.icon} />,
     [feeAsset?.icon],