handle wallet sign message error

00labs · Nov 13, 2024 · e83db83 · e83db83
1 parent b2ad782
commit e83db83
Showing 1 changed file with 12 additions and 9 deletions.
diff --git a/packages/huma-web-shared/src/hooks/useAuthErrorHandling/useAuthErrorHandlingSolana.ts b/packages/huma-web-shared/src/hooks/useAuthErrorHandling/useAuthErrorHandlingSolana.ts
@@ -7,6 +7,7 @@ import {
   SolanaChainEnum,
 } from '@huma-finance/shared'
 import { useConnection, useWallet } from '@solana/wallet-adapter-react'
+import { WalletSignMessageError } from '@solana/wallet-adapter-base'
 import {
   Connection,
   PublicKey,
@@ -89,15 +90,17 @@ const verifyOwnershipSolana = async (
         chainId,
         isDev,
       )
-    } catch (e) {
-      console.error(e)
-      // If the wallet does not support message signing, try to sign a transaction
-      const tx = await buildAuthTx(account, message)
-      tx.feePayer = account
-      tx.recentBlockhash = (await connection.getLatestBlockhash()).blockhash
-      const signedTx = await signTransaction(tx)
-      const serializedTx = signedTx.serialize().toString('base64')
-      await AuthService.verifySolanaTx(message, serializedTx, chainId, isDev)
+    } catch (e: unknown) {
+      console.error(e);
+      if(e instanceof WalletSignMessageError) {
+        // If the wallet does not support message signing, try to sign a transaction
+        const tx = await buildAuthTx(account, message)
+        tx.feePayer = account
+        tx.recentBlockhash = (await connection.getLatestBlockhash()).blockhash
+        const signedTx = await signTransaction(tx)
+        const serializedTx = signedTx.serialize().toString('base64')
+        await AuthService.verifySolanaTx(message, serializedTx, chainId, isDev)
+      }
     }
 
     onVerificationComplete()