From e2d110da46a3fb918d25a87f445dd0ff6cea318b Mon Sep 17 00:00:00 2001 From: Kevin Peters Date: Fri, 28 Feb 2025 14:37:34 -0600 Subject: [PATCH 1/2] aptos cctp: support aptos connect --- wormhole-connect/src/hooks/useWalletCompatibility.ts | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/wormhole-connect/src/hooks/useWalletCompatibility.ts b/wormhole-connect/src/hooks/useWalletCompatibility.ts index b96ec50de..11fae13fb 100644 --- a/wormhole-connect/src/hooks/useWalletCompatibility.ts +++ b/wormhole-connect/src/hooks/useWalletCompatibility.ts @@ -24,12 +24,17 @@ export const useWalletCompatibility = ({ return useMemo(() => { const isManualCCTPRoute = routes.length === 1 && routes[0] === 'ManualCCTP'; + console.log(sendingWallet.name); + if (isManualCCTPRoute) { // Aptos CCTP requires modern (AIP-62 standard) wallets with support for signing move script transaction types const compatibleWallets: AvailableWallets[] = [ 'Petra', 'Pontem Wallet', 'Nightly', + 'Continue with Google', + // @ts-ignore + 'Continue with Apple', ]; if ( (sourceChain === 'Aptos' && @@ -41,9 +46,7 @@ export const useWalletCompatibility = ({ ) { return { isCompatible: false, - warning: `Please use ${compatibleWallets.join( - ' or ', - )} with the Aptos CCTP route.`, + warning: 'Please use a compatible wallet for this route.', }; } } From cc190d1171f90fb1172c82e17d3a2296760e11e4 Mon Sep 17 00:00:00 2001 From: Kevin Peters Date: Fri, 28 Feb 2025 15:57:33 -0600 Subject: [PATCH 2/2] fix linter --- .../src/hooks/useWalletCompatibility.ts | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/wormhole-connect/src/hooks/useWalletCompatibility.ts b/wormhole-connect/src/hooks/useWalletCompatibility.ts index 11fae13fb..2dd15d356 100644 --- a/wormhole-connect/src/hooks/useWalletCompatibility.ts +++ b/wormhole-connect/src/hooks/useWalletCompatibility.ts @@ -1,7 +1,6 @@ import { useMemo } from 'react'; import { Chain } from '@wormhole-foundation/sdk'; import { WalletData } from '../store/wallet'; -import { type AvailableWallets } from '@aptos-labs/wallet-adapter-core'; export type WalletCompatibilityResult = { isCompatible: boolean; @@ -24,25 +23,22 @@ export const useWalletCompatibility = ({ return useMemo(() => { const isManualCCTPRoute = routes.length === 1 && routes[0] === 'ManualCCTP'; - console.log(sendingWallet.name); - if (isManualCCTPRoute) { // Aptos CCTP requires modern (AIP-62 standard) wallets with support for signing move script transaction types - const compatibleWallets: AvailableWallets[] = [ + // NOTE: This package is missing some of the wallet types, so we're using a string array instead + // import { type AvailableWallets } from '@aptos-labs/wallet-adapter-core'; + const compatibleWallets: string[] = [ 'Petra', 'Pontem Wallet', 'Nightly', 'Continue with Google', - // @ts-ignore 'Continue with Apple', ]; if ( (sourceChain === 'Aptos' && - !compatibleWallets.includes( - sendingWallet.name as AvailableWallets, - )) || + !compatibleWallets.includes(sendingWallet.name)) || (destChain === 'Aptos' && - !compatibleWallets.includes(receivingWallet.name as AvailableWallets)) + !compatibleWallets.includes(receivingWallet.name)) ) { return { isCompatible: false,