Skip to content

Commit dea09ee

Browse files
zhelezkovzhelezkov
committed
improve error message handling for wagmi adapter
1 parent e5108cf commit dea09ee

File tree

5 files changed

+25
-14
lines changed

5 files changed

+25
-14
lines changed

‎bun.lock‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"lockfileVersion": 0,
2+
"lockfileVersion": 1,
33
"workspaces": {
44
"": {
55
"name": "@dialectlabs/blinks",
@@ -22,7 +22,7 @@
2222
"name": "mini-blinks",
2323
"version": "0.0.0",
2424
"dependencies": {
25-
"@dialectlabs/blinks": "packages/blinks",
25+
"@dialectlabs/blinks": "^0.22.2",
2626
"@solana/wallet-adapter-react": "^0.15.0",
2727
"@solana/wallet-adapter-react-ui": "^0.9.0",
2828
"@solana/web3.js": "^1.95.1",
@@ -46,9 +46,9 @@
4646
},
4747
"packages/blinks": {
4848
"name": "@dialectlabs/blinks",
49-
"version": "0.21.0",
49+
"version": "0.22.2",
5050
"dependencies": {
51-
"@dialectlabs/blinks-core": "packages/blinks-core",
51+
"@dialectlabs/blinks-core": "^0.20.1",
5252
"bs58": "^6.0.0",
5353
"clsx": "^2.1.1",
5454
"markdown-to-jsx": "^7.5.0",
@@ -97,7 +97,7 @@
9797
},
9898
"packages/blinks-core": {
9999
"name": "@dialectlabs/blinks-core",
100-
"version": "0.19.0",
100+
"version": "0.20.4",
101101
"dependencies": {
102102
"nanoid": "^5.0.9",
103103
},
@@ -401,9 +401,9 @@
401401

402402
"@coinbase/wallet-sdk": ["@coinbase/[email protected]", "", { "dependencies": { "@noble/hashes": "^1.4.0", "clsx": "^1.2.1", "eventemitter3": "^5.0.1", "preact": "^10.24.2" } }, "sha512-BcyHZ/Ec84z0emORzqdXDv4P0oV+tV3a0OirfA8Ko1JGBIAVvB+hzLvZzCDvnuZx7MTK+Dd8Y9Tjlo446BpCIg=="],
403403

404-
"@dialectlabs/blinks": ["@dialectlabs/blinks@workspace:packages/blinks", { "dependencies": { "@dialectlabs/blinks-core": "packages/blinks-core", "bs58": "^6.0.0", "clsx": "^2.1.1", "markdown-to-jsx": "^7.5.0" }, "devDependencies": { "@solana/actions-spec": "~2.4.2", "@solana/wallet-adapter-react": "^0.15.0", "@solana/wallet-adapter-react-ui": "^0.9.0", "@solana/web3.js": "^1.95.1", "@types/react": "^18.3.3", "@types/react-dom": "^18.3.0", "@typescript-eslint/eslint-plugin": "^7.16.1", "@typescript-eslint/parser": "^7.16.1", "autoprefixer": "^10.4.19", "eslint": "^8.57.0", "eslint-config-prettier": "^9.1.0", "eslint-plugin-react": "^7.34.4", "eslint-plugin-react-hooks": "^4.6.2", "postcss": "^8.4.39", "postcss-prefix-selector": "^1.16.1", "prettier": "^3.3.3", "prettier-plugin-organize-imports": "^4.0.0", "prettier-plugin-tailwindcss": "^0.6.5", "tailwindcss": "^3.4.3", "tsup": "^8.2.0", "typescript": "^5.5.3", "viem": "^2.x", "wagmi": "^2.x" }, "peerDependencies": { "@solana/wallet-adapter-react": "^0.15.0", "@solana/wallet-adapter-react-ui": "^0.9.0", "@solana/web3.js": "^1.95.3", "react": ">=18", "react-dom": ">=18", "viem": "^2.x", "wagmi": "^2.x" }, "optionalPeers": ["@solana/wallet-adapter-react", "@solana/wallet-adapter-react-ui", "@solana/web3.js", "viem", "wagmi"] }],
404+
"@dialectlabs/blinks": ["@dialectlabs/blinks@workspace:packages/blinks"],
405405

406-
"@dialectlabs/blinks-core": ["@dialectlabs/blinks-core@workspace:packages/blinks-core", { "dependencies": { "nanoid": "^5.0.9" }, "devDependencies": { "@solana/actions-spec": "~2.4.2", "@types/react": "^18.3.3", "@types/react-dom": "^18.3.0", "@typescript-eslint/eslint-plugin": "^7.16.1", "@typescript-eslint/parser": "^7.16.1", "autoprefixer": "^10.4.19", "eslint": "^8.57.0", "eslint-config-prettier": "^9.1.0", "eslint-plugin-react": "^7.34.4", "eslint-plugin-react-hooks": "^4.6.2", "postcss": "^8.4.39", "postcss-prefix-selector": "^1.16.1", "prettier": "^3.3.3", "prettier-plugin-organize-imports": "^4.0.0", "prettier-plugin-tailwindcss": "^0.6.5", "tailwindcss": "^3.4.3", "tsup": "^8.2.0", "typescript": "^5.5.3" }, "peerDependencies": { "@solana/web3.js": "^1.95.3", "react": ">=18" }, "optionalPeers": ["@solana/web3.js"] }],
406+
"@dialectlabs/blinks-core": ["@dialectlabs/blinks-core@workspace:packages/blinks-core"],
407407

408408
"@ecies/ciphers": ["@ecies/[email protected]", "", { "peerDependencies": { "@noble/ciphers": "^1.0.0" } }, "sha512-ylfGR7PyTd+Rm2PqQowG08BCKA22QuX8NzrL+LxAAvazN10DMwdJ2fWwAzRj05FI/M8vNFGm3cv9Wq/GFWCBLg=="],
409409

@@ -1709,7 +1709,7 @@
17091709

17101710
"mimic-fn": ["[email protected]", "", {}, "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg=="],
17111711

1712-
"mini-blinks": ["mini-blinks@workspace:examples/mini-blinks", { "dependencies": { "@dialectlabs/blinks": "packages/blinks", "@solana/wallet-adapter-react": "^0.15.0", "@solana/wallet-adapter-react-ui": "^0.9.0", "@solana/web3.js": "^1.95.1", "react": "^18.3.1", "react-dom": "^18.3.1" }, "devDependencies": { "@eslint/js": "^9.9.0", "@types/react": "^18.3.3", "@types/react-dom": "^18.3.0", "@vitejs/plugin-react": "^4.3.1", "autoprefixer": "^10.4.20", "globals": "^15.9.0", "postcss": "^8.4.47", "tailwindcss": "^3.4.12", "typescript": "^5.5.3", "typescript-eslint": "^8.0.1", "vite": "^5.4.1", "vite-plugin-node-polyfills": "^0.22.0" } }],
1712+
"mini-blinks": ["mini-blinks@workspace:examples/mini-blinks"],
17131713

17141714
"minimalistic-assert": ["[email protected]", "", {}, "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A=="],
17151715

‎packages/blinks-core/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@dialectlabs/blinks-core",
3-
"version": "0.20.4",
3+
"version": "0.20.5",
44
"license": "Apache-2.0",
55
"private": false,
66
"sideEffects": true,

‎packages/blinks-core/src/BlinkContainer.tsx‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -603,7 +603,10 @@ export const BlinkContainer = ({
603603
);
604604

605605
if (!signResult || isSignTransactionError(signResult)) {
606-
dispatch({ type: ExecutionType.RESET });
606+
dispatch({
607+
type: ExecutionType.SOFT_RESET,
608+
errorMessage: signResult.error ?? 'Unable to sign transaction',
609+
});
607610
callbacks.onActionCancel?.(
608611
blink,
609612
component,

‎packages/blinks/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@dialectlabs/blinks",
3-
"version": "0.22.2",
3+
"version": "0.22.4",
44
"license": "Apache-2.0",
55
"private": false,
66
"sideEffects": true,
@@ -82,7 +82,7 @@
8282
"wagmi": "^2.x"
8383
},
8484
"dependencies": {
85-
"@dialectlabs/blinks-core": "^0.20.1",
85+
"@dialectlabs/blinks-core": "^0.20.5",
8686
"bs58": "^6.0.0",
8787
"clsx": "^2.1.1",
8888
"markdown-to-jsx": "^7.5.0"

‎packages/blinks/src/hooks/evm/useEvmWagmiAdapter.ts‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,12 @@ import type { SignMessageData } from '@solana/actions-spec';
33
import { useMemo } from 'react';
44
import { deserialize, useAccount, useChains, useConnectorClient } from 'wagmi';
55

6-
import type { ByteArray, Hex, SignableMessage } from 'viem';
6+
import {
7+
TransactionExecutionError,
8+
type ByteArray,
9+
type Hex,
10+
type SignableMessage,
11+
} from 'viem';
712
import {
813
sendTransaction,
914
signMessage,
@@ -79,7 +84,10 @@ export function useEvmWagmiAdapter({
7984
return { signature: hash };
8085
} catch (e) {
8186
console.error('Blink wagmi adapter sign transaction failed:', e);
82-
return { error: 'Signing failed.' };
87+
if (e instanceof TransactionExecutionError) {
88+
return { error: `Unable to sign: ${e.shortMessage}` };
89+
}
90+
return { error: 'Signing failed' };
8391
}
8492
},
8593
signMessage: async (

0 commit comments

Comments
 (0)