feat: wire up hdwallet-gridplus safecard validation

package.json

@@ -100,24 +100,24 @@
     "@shapeshiftoss/chain-adapters": "workspace:^",
     "@shapeshiftoss/contracts": "workspace:^",
     "@shapeshiftoss/errors": "workspace:^",
-    "@shapeshiftoss/hdwallet-coinbase": "1.62.15",
-    "@shapeshiftoss/hdwallet-core": "1.62.15",
-    "@shapeshiftoss/hdwallet-gridplus": "1.62.15",
-    "@shapeshiftoss/hdwallet-keepkey": "1.62.15",
-    "@shapeshiftoss/hdwallet-keepkey-webusb": "1.62.15",
-    "@shapeshiftoss/hdwallet-keplr": "1.62.15",
-    "@shapeshiftoss/hdwallet-ledger": "1.62.15",
-    "@shapeshiftoss/hdwallet-ledger-webhid": "1.62.15",
-    "@shapeshiftoss/hdwallet-ledger-webusb": "1.62.15",
-    "@shapeshiftoss/hdwallet-metamask-multichain": "1.62.15",
-    "@shapeshiftoss/hdwallet-native": "1.62.15",
-    "@shapeshiftoss/hdwallet-native-vault": "1.62.15",
-    "@shapeshiftoss/hdwallet-phantom": "1.62.15",
-    "@shapeshiftoss/hdwallet-trezor": "1.62.15",
-    "@shapeshiftoss/hdwallet-trezor-connect": "1.62.15",
-    "@shapeshiftoss/hdwallet-vultisig": "1.62.15",
-    "@shapeshiftoss/hdwallet-walletconnect": "1.62.15",
-    "@shapeshiftoss/hdwallet-walletconnectv2": "1.62.15",
+    "@shapeshiftoss/hdwallet-coinbase": "1.62.16",
+    "@shapeshiftoss/hdwallet-core": "1.62.16",
+    "@shapeshiftoss/hdwallet-gridplus": "1.62.16",
+    "@shapeshiftoss/hdwallet-keepkey": "1.62.16",
+    "@shapeshiftoss/hdwallet-keepkey-webusb": "1.62.16",
+    "@shapeshiftoss/hdwallet-keplr": "1.62.16",
+    "@shapeshiftoss/hdwallet-ledger": "1.62.16",
+    "@shapeshiftoss/hdwallet-ledger-webhid": "1.62.16",
+    "@shapeshiftoss/hdwallet-ledger-webusb": "1.62.16",
+    "@shapeshiftoss/hdwallet-metamask-multichain": "1.62.16",
+    "@shapeshiftoss/hdwallet-native": "1.62.16",
+    "@shapeshiftoss/hdwallet-native-vault": "1.62.16",
+    "@shapeshiftoss/hdwallet-phantom": "1.62.16",
+    "@shapeshiftoss/hdwallet-trezor": "1.62.16",
+    "@shapeshiftoss/hdwallet-trezor-connect": "1.62.16",
+    "@shapeshiftoss/hdwallet-vultisig": "1.62.16",
+    "@shapeshiftoss/hdwallet-walletconnect": "1.62.16",
+    "@shapeshiftoss/hdwallet-walletconnectv2": "1.62.16",
     "@shapeshiftoss/swapper": "workspace:^",
     "@shapeshiftoss/types": "workspace:^",
     "@shapeshiftoss/unchained-client": "workspace:^",

packages/chain-adapters/src/error/ErrorHandler.ts

@@ -32,6 +32,24 @@ export const ErrorHandler = async (err: unknown, metadata?: ErrorMetadata): Prom
     })
   }
 
+  if (
+    err instanceof Error &&
+    err.message.includes('Remove inserted SafeCard to access internal GridPlus wallet')
+  ) {
+    throw new ChainAdapterError(err, {
+      translation: 'chainAdapters.errors.gridplus.removeSafeCard',
+    })
+  }
+
+  if (
+    err instanceof Error &&
+    err.message.includes("Active SafeCard doesn't match expected SafeCard")
+  ) {
+    throw new ChainAdapterError(err, {
+      translation: 'chainAdapters.errors.gridplus.wrongSafeCard',
+    })
+  }
+
   if ((err as AxiosError).isAxiosError) {
     const response = JSON.stringify((err as AxiosError).response?.data)
     if (metadata) throw new ChainAdapterError(response, metadata)

src/assets/translations/en/main.json

@@ -1429,7 +1429,9 @@
         "renamed": "SafeCard renamed",
         "deleted": "SafeCard deleted",
         "deletedDescription": "Portfolio data has been cleared",
-        "warning": "Each SafeCard maintains its own portfolio. Make sure to insert the correct SafeCard in your device before connecting."
+        "warning": "Each SafeCard maintains its own portfolio. Make sure to insert the correct SafeCard in your device before connecting.",
+        "safeCardLabel": "SafeCard",
+        "internalSafeCardLabel": "Internal SafeCard"
       },
       "connect": {
         "header": "Connect New SafeCard",
@@ -1463,6 +1465,9 @@
         "deviceNotConnected": "Device not connected. Call connectDevice first.",
         "connectFailure": "Unable to connect GridPlus wallet",
         "unknown": "An unexpected error occurred communicating with GridPlus wallet"
+      },
+      "menu": {
+        "switchSafeCard": "Switch SafeCard"
       }
     },
     "ledger": {
@@ -2518,7 +2523,11 @@
       "getFeeData": "Failed to estimate network fees.",
       "getPublicKey": "Failed to get public key from wallet.",
       "getUtxos": "Failed to get utxos.",
-      "getValidator": "Failed to get validator."
+      "getValidator": "Failed to get validator.",
+      "gridplus": {
+        "wrongSafeCard": "Wrong SafeCard inserted. Please insert the correct SafeCard and try again.",
+        "removeSafeCard": "Remove inserted SafeCard to access internal GridPlus wallet."
+      }
     }
   },
   "actionCenter": {

src/context/WalletProvider/GridPlus/components/GridPlusMenu.tsx

@@ -0,0 +1,38 @@
+import { RepeatIcon } from '@chakra-ui/icons'
+import { MenuItem } from '@chakra-ui/react'
+import { useCallback } from 'react'
+import { useTranslate } from 'react-polyglot'
+
+import { ManageAccountsMenuItem } from '@/components/Layout/Header/NavBar/ManageAccountsMenuItem'
+import { WalletActions } from '@/context/WalletProvider/actions'
+import { useWallet } from '@/hooks/useWallet/useWallet'
+
+const switchIcon = <RepeatIcon />
+
+type GridPlusMenuProps = {
+  onClose?: () => void
+}
+
+export const GridPlusMenu = ({ onClose }: GridPlusMenuProps) => {
+  const translate = useTranslate()
+  const { dispatch } = useWallet()
+
+  const handleSwitchSafeCard = useCallback(() => {
+    dispatch({ type: WalletActions.RESET_STATE })
+    dispatch({
+      type: WalletActions.SET_INITIAL_ROUTE,
+      payload: '/gridplus/connect',
+    })
+    dispatch({ type: WalletActions.SET_WALLET_MODAL, payload: true })
+    onClose?.()
+  }, [dispatch, onClose])
+
+  return (
+    <>
+      <MenuItem icon={switchIcon} onClick={handleSwitchSafeCard}>
+        {translate('walletProvider.gridplus.menu.switchSafeCard')}
+      </MenuItem>
+      <ManageAccountsMenuItem onClose={onClose} />
+    </>
+  )
+}

src/context/WalletProvider/GridPlus/components/GridPlusPair.tsx

@@ -51,17 +51,21 @@ export const GridPlusPair = () => {
           throw new Error(translate('walletProvider.gridplus.errors.adapterNotAvailable'))
         }
 
-        const wallet = await pairConnectedDevice({
+        const { wallet, activeWalletId, type } = await pairConnectedDevice({
           adapter,
-          deviceId,
           pairingCode,
-          dispatch: appDispatch,
         })
 
         appDispatch(gridplusSlice.actions.setActiveSafeCard(safeCardUuid))
 
         navigate('/gridplus/setup', {
-          state: { safeCardUuid, wallet, safeCardWalletId: `gridplus:${safeCardUuid}` },
+          state: {
+            safeCardUuid,
+            wallet,
+            safeCardWalletId: `gridplus:${safeCardUuid}`,
+            activeWalletId,
+            type,
+          },
         })
       } catch (err) {
         setError((err as Error).message)

src/context/WalletProvider/GridPlus/components/GridPlusSetup.tsx

@@ -21,6 +21,8 @@ type LocationState = {
   defaultName?: string
   needsPairing?: boolean
   deviceId?: string
+  activeWalletId?: string
+  type?: 'external' | 'internal'
 }
 
 export const GridPlusSetup = () => {
@@ -64,6 +66,9 @@ export const GridPlusSetup = () => {
 
       try {
         let finalWallet = wallet
+        // Use activeWalletId and type from state if available (from pairing flow)
+        let activeWalletId: string | undefined = state?.activeWalletId
+        let type: 'external' | 'internal' | undefined = state?.type
 
         if (!finalWallet) {
           const adapter = await getAdapter(KeyManager.GridPlus)
@@ -76,12 +81,13 @@ export const GridPlusSetup = () => {
             if (!deviceId) {
               throw new Error(translate('walletProvider.gridplus.errors.deviceIdRequired'))
             }
-            finalWallet = await pairConnectedDevice({
+            const result = await pairConnectedDevice({
               adapter,
-              deviceId,
               pairingCode,
-              dispatch: appDispatch,
             })
+            finalWallet = result.wallet
+            activeWalletId = result.activeWalletId
+            type = result.type
           } else {
             const connectionDeviceId = physicalDeviceId || deviceId || state?.deviceId
             if (!connectionDeviceId) {
@@ -105,13 +111,23 @@ export const GridPlusSetup = () => {
           throw new Error(translate('walletProvider.gridplus.errors.walletNotAvailable'))
         }
 
+        // If we don't have activeWalletId yet (e.g., when adding new SafeCard with existing wallet),
+        // we need to fetch it from the wallet
+        if (activeWalletId === undefined || type === undefined) {
+          const validation = await finalWallet.validateActiveWallet()
+          activeWalletId = validation.activeWalletId
+          type = validation.type
+        }
+
         const safeCardWalletId = state?.safeCardWalletId || `gridplus:${safeCardUuid}`
         const finalSafeCardName = safeCardName.trim() || defaultName
 
         appDispatch(
           gridplusSlice.actions.addSafeCard({
             id: safeCardUuid,
             name: finalSafeCardName,
+            activeWalletId,
+            type,
           }),
         )
 
@@ -161,6 +177,8 @@ export const GridPlusSetup = () => {
       defaultName,
       state?.safeCardWalletId,
       state?.deviceId,
+      state?.activeWalletId,
+      state?.type,
       physicalDeviceId,
       translate,
       getAdapter,

src/context/WalletProvider/GridPlus/components/SafeCardRow.tsx

@@ -1,4 +1,14 @@
-import { Box, Button, ButtonGroup, HStack, IconButton, Input, Text, VStack } from '@chakra-ui/react'
+import {
+  Box,
+  Button,
+  ButtonGroup,
+  HStack,
+  IconButton,
+  Input,
+  Tag,
+  Text,
+  VStack,
+} from '@chakra-ui/react'
 import { memo } from 'react'
 import { FaWallet } from 'react-icons/fa'
 import { IoMdCreate, IoMdTrash } from 'react-icons/io'
@@ -68,7 +78,16 @@ export const SafeCardRow = memo(
             />
           ) : (
             <VStack align='start' flex={1} spacing={0}>
-              <Text fontWeight='medium'>{safeCard.name}</Text>
+              <HStack spacing={2}>
+                <Text fontWeight='medium'>{safeCard.name}</Text>
+                {safeCard.type && (
+                  <Tag size='sm' colorScheme='blue' variant='subtle'>
+                    {safeCard.type === 'internal'
+                      ? translate('walletProvider.gridplus.list.internalSafeCardLabel')
+                      : translate('walletProvider.gridplus.list.safeCardLabel')}
+                  </Tag>
+                )}
+              </HStack>
               {safeCard.lastConnectedAt && (
                 <Text fontSize='xs' color='text.subtle'>
                   {translate('walletProvider.gridplus.list.lastConnected', {

src/context/WalletProvider/GridPlus/hooks/useGridPlusConnection.ts

@@ -132,7 +132,8 @@ export const useGridPlusConnection = () => {
       setError(null)
 
       try {
-        appDispatch(gridplusSlice.actions.setActiveSafeCard(id))
+        const safeCard = safeCards.find(card => card.id === id)
+        const expectedWalletUid = safeCard?.activeWalletId
 
         const safeCardWalletId = `gridplus:${id}`
         const connectionDeviceId = getConnectionDeviceId()
@@ -141,6 +142,8 @@ export const useGridPlusConnection = () => {
         const wallet = await connectAndPairDevice({
           adapter,
           deviceId: connectionDeviceId,
+          expectedActiveWalletId: expectedWalletUid,
+          expectedType: safeCard?.type,
           dispatch: appDispatch,
         })
 
@@ -152,13 +155,17 @@ export const useGridPlusConnection = () => {
           return
         }
 
+        appDispatch(gridplusSlice.actions.setActiveSafeCard(id))
+
         finalizeWalletSetup({
           wallet,
           safeCardWalletId,
           walletDispatch,
           localWallet,
           navigate,
           appDispatch,
+          activeWalletId: safeCard?.activeWalletId,
+          type: safeCard?.type,
         })
       } catch (e) {
         setConnectingCardId(null)
@@ -167,6 +174,7 @@ export const useGridPlusConnection = () => {
     },
     [
       appDispatch,
+      safeCards,
       getConnectionDeviceId,
       getAdapterWithKeyring,
       walletDispatch,