diff --git a/package-lock.json b/package-lock.json index e38436f8..3a8661da 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,8 +9,8 @@ "version": "1.0.4", "license": "MIT", "dependencies": { - "@dfx.swiss/react": "^1.3.0-beta.250", - "@dfx.swiss/react-components": "^1.3.0-beta.250", + "@dfx.swiss/react": "^1.3.0-beta.251", + "@dfx.swiss/react-components": "^1.3.0-beta.251", "@ledgerhq/hw-app-btc": "^6.24.1", "@ledgerhq/hw-app-eth": "^6.33.7", "@ledgerhq/hw-transport-webhid": "^6.27.19", @@ -2632,9 +2632,9 @@ } }, "node_modules/@dfx.swiss/react": { - "version": "1.3.0-beta.250", - "resolved": "https://registry.npmjs.org/@dfx.swiss/react/-/react-1.3.0-beta.250.tgz", - "integrity": "sha512-tsquDZI+rnZLzYKFXMVPBjby5j2K5JLtKKZ+H42qAeGYmdGvpWzjmizg7mOFDGKgNjJyLEqgihX9zuzsdE8XdQ==", + "version": "1.3.0-beta.251", + "resolved": "https://registry.npmjs.org/@dfx.swiss/react/-/react-1.3.0-beta.251.tgz", + "integrity": "sha512-c0GccpW0giH+/je1FMCmifvQk87y0uca6kT8OnI8vJl2bPOILM7tY6aK2qJF/ikN6ifXzrgwS752zvkPri9pjQ==", "license": "MIT", "dependencies": { "ibantools": "^4.2.1", @@ -2645,9 +2645,9 @@ } }, "node_modules/@dfx.swiss/react-components": { - "version": "1.3.0-beta.250", - "resolved": "https://registry.npmjs.org/@dfx.swiss/react-components/-/react-components-1.3.0-beta.250.tgz", - "integrity": "sha512-hdEJCAiJdW3X5XKozhVCzgFxtKFHRJzrnsbPjxL3mJea4pOhPUchxG3OeBGatmYv1EoDBbpQL0kUjFnuKkN+Ow==", + "version": "1.3.0-beta.251", + "resolved": "https://registry.npmjs.org/@dfx.swiss/react-components/-/react-components-1.3.0-beta.251.tgz", + "integrity": "sha512-6z3qiIvp9K1Wja17SwYxg1Lh7837IHNVao7iPA+AT8Zn3c/HIkZMzY10KFxBktB+OlhdNDwoOv8ZjFPERaAdzQ==", "license": "MIT", "dependencies": { "@floating-ui/react": "^0.18.1", diff --git a/package.json b/package.json index 6cb4833b..62e81017 100644 --- a/package.json +++ b/package.json @@ -12,8 +12,8 @@ "access": "public" }, "dependencies": { - "@dfx.swiss/react": "^1.3.0-beta.250", - "@dfx.swiss/react-components": "^1.3.0-beta.250", + "@dfx.swiss/react": "^1.3.0-beta.251", + "@dfx.swiss/react-components": "^1.3.0-beta.251", "@ledgerhq/hw-app-btc": "^6.24.1", "@ledgerhq/hw-app-eth": "^6.33.7", "@ledgerhq/hw-transport-webhid": "^6.27.19", diff --git a/src/components/home/connect-wrapper.tsx b/src/components/home/connect-wrapper.tsx index b85eed8c..444a650b 100644 --- a/src/components/home/connect-wrapper.tsx +++ b/src/components/home/connect-wrapper.tsx @@ -40,6 +40,7 @@ export function ConnectWrapper(props: ConnectProps): JSX.Element { case WalletType.CLI_BTC: case WalletType.CLI_SPARK: + case WalletType.CLI_ARK: case WalletType.CLI_LN: case WalletType.CLI_FIRO: case WalletType.CLI_XMR: diff --git a/src/components/home/install-hint.tsx b/src/components/home/install-hint.tsx index d13367d9..d83e3bed 100644 --- a/src/components/home/install-hint.tsx +++ b/src/components/home/install-hint.tsx @@ -44,6 +44,7 @@ export function InstallHint({ type, onConfirm }: { type: WalletType; onConfirm: case WalletType.CLI_SOL: case WalletType.CLI_TRX: case WalletType.CLI_SPARK: + case WalletType.CLI_ARK: case WalletType.DFX_TARO: case WalletType.WALLET_CONNECT: case WalletType.CAKE: diff --git a/src/components/home/wallet/connect-cli.tsx b/src/components/home/wallet/connect-cli.tsx index 939bfc34..87d50849 100644 --- a/src/components/home/wallet/connect-cli.tsx +++ b/src/components/home/wallet/connect-cli.tsx @@ -41,6 +41,7 @@ const Wallets = [ WalletType.CLI_SOL, WalletType.CLI_TRX, WalletType.CLI_SPARK, + WalletType.CLI_ARK, ]; const SupportedBlockchains = Wallets.map((w) => WalletBlockchains[w]) @@ -108,6 +109,7 @@ function Content({ wallet, isConnecting, connect, error, form, onSwitch, rootRef [WalletType.CLI_SOL]: /^[1-9A-HJ-NP-Za-km-z]{43,44}$/, [WalletType.CLI_TRX]: /^T[1-9A-HJ-NP-Za-km-z]{32,34}$/, [WalletType.CLI_SPARK]: /^spark1[a-z0-9]{6,250}$/, + [WalletType.CLI_ARK]: /^ark1[a-z0-9]{6,500}$/, }; function validateAddress(address: string): true | string { diff --git a/src/contexts/wallet.context.tsx b/src/contexts/wallet.context.tsx index 1558b8e0..50ba7f4c 100644 --- a/src/contexts/wallet.context.tsx +++ b/src/contexts/wallet.context.tsx @@ -18,6 +18,7 @@ export enum WalletType { TREZOR_ETH = 'TrezorEth', CLI_BTC = 'CliBtc', CLI_SPARK = 'CliSpark', + CLI_ARK = 'CliArk', CLI_FIRO = 'CliFiro', CLI_XMR = 'CliXmr', CLI_ZANO = 'CliZano', @@ -63,6 +64,7 @@ export const WalletBlockchains: { [w in WalletType]?: Blockchain[] } = { [WalletType.TREZOR_ETH]: [Blockchain.ETHEREUM, Blockchain.ARBITRUM, Blockchain.OPTIMISM, Blockchain.POLYGON], [WalletType.CLI_BTC]: [Blockchain.BITCOIN], [WalletType.CLI_SPARK]: [Blockchain.SPARK], + [WalletType.CLI_ARK]: [Blockchain.ARK], [WalletType.CLI_FIRO]: [Blockchain.FIRO], [WalletType.CLI_LN]: [Blockchain.LIGHTNING], [WalletType.CLI_XMR]: [Blockchain.MONERO], @@ -123,6 +125,7 @@ const WalletTypeMap: { [k in WalletType]: AuthWalletType | undefined } = { [WalletType.TREZOR_ETH]: AuthWalletType.TREZOR, [WalletType.CLI_BTC]: AuthWalletType.CLI, [WalletType.CLI_SPARK]: AuthWalletType.CLI, + [WalletType.CLI_ARK]: AuthWalletType.CLI, [WalletType.CLI_FIRO]: AuthWalletType.CLI, [WalletType.CLI_LN]: AuthWalletType.CLI, [WalletType.CLI_XMR]: AuthWalletType.CLI, diff --git a/src/hooks/blockchain.hook.ts b/src/hooks/blockchain.hook.ts index 8bb4f220..3a016158 100644 --- a/src/hooks/blockchain.hook.ts +++ b/src/hooks/blockchain.hook.ts @@ -83,6 +83,7 @@ export function useBlockchain(): BlockchainInterface { [Blockchain.SOLANA]: 'Solana', [Blockchain.TRON]: 'Tron', [Blockchain.SPARK]: 'Spark', + [Blockchain.ARK]: 'Ark', [Blockchain.CITREA]: 'Citrea', [Blockchain.CITREA_TESTNET]: 'Citrea Testnet', },