@tronweb3/tronwallet-adapter-react-hooks 1.1.11 → 1.1.13
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/cjs/WalletProvider.js +36 -14
- package/lib/cjs/WalletProvider.js.map +1 -1
- package/lib/cjs/tsconfig.cjs.tsbuildinfo +1 -0
- package/lib/esm/WalletProvider.js +19 -7
- package/lib/esm/WalletProvider.js.map +1 -1
- package/lib/esm/tsconfig.esm.tsbuildinfo +1 -0
- package/lib/types/WalletProvider.d.ts.map +1 -1
- package/package.json +64 -60
- package/src/WalletProvider.tsx +21 -8
|
@@ -15,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
|
|
|
15
15
|
}) : function(o, v) {
|
|
16
16
|
o["default"] = v;
|
|
17
17
|
});
|
|
18
|
-
var __importStar = (this && this.__importStar) || function (
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
};
|
|
18
|
+
var __importStar = (this && this.__importStar) || (function () {
|
|
19
|
+
var ownKeys = function(o) {
|
|
20
|
+
ownKeys = Object.getOwnPropertyNames || function (o) {
|
|
21
|
+
var ar = [];
|
|
22
|
+
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
|
23
|
+
return ar;
|
|
24
|
+
};
|
|
25
|
+
return ownKeys(o);
|
|
26
|
+
};
|
|
27
|
+
return function (mod) {
|
|
28
|
+
if (mod && mod.__esModule) return mod;
|
|
29
|
+
var result = {};
|
|
30
|
+
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
|
31
|
+
__setModuleDefault(result, mod);
|
|
32
|
+
return result;
|
|
33
|
+
};
|
|
34
|
+
})();
|
|
25
35
|
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
26
36
|
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
27
37
|
return new (P || (P = Promise))(function (resolve, reject) {
|
|
@@ -124,10 +134,16 @@ const WalletProvider = function ({ children, adapters: adaptersPro = null, onErr
|
|
|
124
134
|
return error;
|
|
125
135
|
}, [onError]);
|
|
126
136
|
const handleAccountChange = (0, react_1.useCallback)(function (address, preAddr) {
|
|
127
|
-
|
|
137
|
+
// Adapters report "no account" as an empty string, while this state uses `null`
|
|
138
|
+
// for it, so normalise before storing. The callback still gets the raw value.
|
|
139
|
+
setState((state) => { var _a; return (Object.assign(Object.assign({}, state), { address: address || null, connected: !!((_a = state.adapter) === null || _a === void 0 ? void 0 : _a.connected) })); });
|
|
128
140
|
onAccountsChanged === null || onAccountsChanged === void 0 ? void 0 : onAccountsChanged(address, preAddr);
|
|
129
141
|
}, [onAccountsChanged]);
|
|
130
142
|
const handleDisconnect = (0, react_1.useCallback)(function () {
|
|
143
|
+
setState((state) => {
|
|
144
|
+
var _a, _b, _c;
|
|
145
|
+
return (Object.assign(Object.assign({}, state), { address: (_b = (_a = state.adapter) === null || _a === void 0 ? void 0 : _a.address) !== null && _b !== void 0 ? _b : null, connected: !!((_c = state.adapter) === null || _c === void 0 ? void 0 : _c.connected) }));
|
|
146
|
+
});
|
|
131
147
|
onDisconnect === null || onDisconnect === void 0 ? void 0 : onDisconnect();
|
|
132
148
|
}, [onDisconnect]);
|
|
133
149
|
const handleReadyStateChanged = (0, react_1.useCallback)(function (readyState) {
|
|
@@ -165,7 +181,13 @@ const WalletProvider = function ({ children, adapters: adaptersPro = null, onErr
|
|
|
165
181
|
// disconnect the previous when wallet changes
|
|
166
182
|
(0, react_1.useEffect)(() => {
|
|
167
183
|
return () => {
|
|
168
|
-
|
|
184
|
+
// Cleanup cannot await, so the rejection has to be handled here or it surfaces as
|
|
185
|
+
// an unhandled one. The listeners are already off by this point, so a failure means
|
|
186
|
+
// the old adapter may still be connected with nothing watching it -- worth a warning
|
|
187
|
+
// even though there is nothing left to retry against.
|
|
188
|
+
adapter === null || adapter === void 0 ? void 0 : adapter.disconnect().catch((error) => {
|
|
189
|
+
console.warn(`[${adapter.name}]: Failed to disconnect the previous wallet.`, error);
|
|
190
|
+
});
|
|
169
191
|
};
|
|
170
192
|
}, [adapter]);
|
|
171
193
|
const hasManuallySetName = (0, react_1.useRef)(false);
|
|
@@ -182,7 +204,7 @@ const WalletProvider = function ({ children, adapters: adaptersPro = null, onErr
|
|
|
182
204
|
try {
|
|
183
205
|
yield adapter.connect();
|
|
184
206
|
}
|
|
185
|
-
catch (
|
|
207
|
+
catch (_a) {
|
|
186
208
|
// setName(null);
|
|
187
209
|
}
|
|
188
210
|
finally {
|
|
@@ -240,18 +262,18 @@ const WalletProvider = function ({ children, adapters: adaptersPro = null, onErr
|
|
|
240
262
|
}
|
|
241
263
|
});
|
|
242
264
|
}, [adapter, isDisconnecting, setName]);
|
|
243
|
-
const signTransaction = (0, react_1.useCallback)(function (transaction
|
|
265
|
+
const signTransaction = (0, react_1.useCallback)(function (transaction) {
|
|
244
266
|
return __awaiter(this, void 0, void 0, function* () {
|
|
245
267
|
if (!adapter)
|
|
246
268
|
throw handleError(new tronwallet_abstract_adapter_1.WalletNotSelectedError());
|
|
247
|
-
return yield adapter.signTransaction(transaction
|
|
269
|
+
return yield adapter.signTransaction(transaction);
|
|
248
270
|
});
|
|
249
271
|
}, [adapter, handleError]);
|
|
250
|
-
const signMessage = (0, react_1.useCallback)(function (message
|
|
272
|
+
const signMessage = (0, react_1.useCallback)(function (message) {
|
|
251
273
|
return __awaiter(this, void 0, void 0, function* () {
|
|
252
274
|
if (!adapter)
|
|
253
275
|
throw handleError(new tronwallet_abstract_adapter_1.WalletNotSelectedError());
|
|
254
|
-
return yield adapter.signMessage(message
|
|
276
|
+
return yield adapter.signMessage(message);
|
|
255
277
|
});
|
|
256
278
|
}, [adapter, handleError]);
|
|
257
279
|
return (react_1.default.createElement(useWallet_js_1.WalletContext.Provider, { value: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WalletProvider.js","sourceRoot":"","sources":["../../src/WalletProvider.tsx"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"WalletProvider.js","sourceRoot":"","sources":["../../src/WalletProvider.tsx"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"root":["../../src/walletprovider.tsx","../../src/index.ts","../../src/uselocalstorage.ts","../../src/usewallet.ts"],"version":"5.8.2"}
|
|
@@ -98,10 +98,16 @@ export const WalletProvider = function ({ children, adapters: adaptersPro = null
|
|
|
98
98
|
return error;
|
|
99
99
|
}, [onError]);
|
|
100
100
|
const handleAccountChange = useCallback(function (address, preAddr) {
|
|
101
|
-
|
|
101
|
+
// Adapters report "no account" as an empty string, while this state uses `null`
|
|
102
|
+
// for it, so normalise before storing. The callback still gets the raw value.
|
|
103
|
+
setState((state) => { var _a; return (Object.assign(Object.assign({}, state), { address: address || null, connected: !!((_a = state.adapter) === null || _a === void 0 ? void 0 : _a.connected) })); });
|
|
102
104
|
onAccountsChanged === null || onAccountsChanged === void 0 ? void 0 : onAccountsChanged(address, preAddr);
|
|
103
105
|
}, [onAccountsChanged]);
|
|
104
106
|
const handleDisconnect = useCallback(function () {
|
|
107
|
+
setState((state) => {
|
|
108
|
+
var _a, _b, _c;
|
|
109
|
+
return (Object.assign(Object.assign({}, state), { address: (_b = (_a = state.adapter) === null || _a === void 0 ? void 0 : _a.address) !== null && _b !== void 0 ? _b : null, connected: !!((_c = state.adapter) === null || _c === void 0 ? void 0 : _c.connected) }));
|
|
110
|
+
});
|
|
105
111
|
onDisconnect === null || onDisconnect === void 0 ? void 0 : onDisconnect();
|
|
106
112
|
}, [onDisconnect]);
|
|
107
113
|
const handleReadyStateChanged = useCallback(function (readyState) {
|
|
@@ -139,7 +145,13 @@ export const WalletProvider = function ({ children, adapters: adaptersPro = null
|
|
|
139
145
|
// disconnect the previous when wallet changes
|
|
140
146
|
useEffect(() => {
|
|
141
147
|
return () => {
|
|
142
|
-
|
|
148
|
+
// Cleanup cannot await, so the rejection has to be handled here or it surfaces as
|
|
149
|
+
// an unhandled one. The listeners are already off by this point, so a failure means
|
|
150
|
+
// the old adapter may still be connected with nothing watching it -- worth a warning
|
|
151
|
+
// even though there is nothing left to retry against.
|
|
152
|
+
adapter === null || adapter === void 0 ? void 0 : adapter.disconnect().catch((error) => {
|
|
153
|
+
console.warn(`[${adapter.name}]: Failed to disconnect the previous wallet.`, error);
|
|
154
|
+
});
|
|
143
155
|
};
|
|
144
156
|
}, [adapter]);
|
|
145
157
|
const hasManuallySetName = useRef(false);
|
|
@@ -156,7 +168,7 @@ export const WalletProvider = function ({ children, adapters: adaptersPro = null
|
|
|
156
168
|
try {
|
|
157
169
|
yield adapter.connect();
|
|
158
170
|
}
|
|
159
|
-
catch (
|
|
171
|
+
catch (_a) {
|
|
160
172
|
// setName(null);
|
|
161
173
|
}
|
|
162
174
|
finally {
|
|
@@ -214,18 +226,18 @@ export const WalletProvider = function ({ children, adapters: adaptersPro = null
|
|
|
214
226
|
}
|
|
215
227
|
});
|
|
216
228
|
}, [adapter, isDisconnecting, setName]);
|
|
217
|
-
const signTransaction = useCallback(function (transaction
|
|
229
|
+
const signTransaction = useCallback(function (transaction) {
|
|
218
230
|
return __awaiter(this, void 0, void 0, function* () {
|
|
219
231
|
if (!adapter)
|
|
220
232
|
throw handleError(new WalletNotSelectedError());
|
|
221
|
-
return yield adapter.signTransaction(transaction
|
|
233
|
+
return yield adapter.signTransaction(transaction);
|
|
222
234
|
});
|
|
223
235
|
}, [adapter, handleError]);
|
|
224
|
-
const signMessage = useCallback(function (message
|
|
236
|
+
const signMessage = useCallback(function (message) {
|
|
225
237
|
return __awaiter(this, void 0, void 0, function* () {
|
|
226
238
|
if (!adapter)
|
|
227
239
|
throw handleError(new WalletNotSelectedError());
|
|
228
|
-
return yield adapter.signMessage(message
|
|
240
|
+
return yield adapter.signMessage(message);
|
|
229
241
|
});
|
|
230
242
|
}, [adapter, handleError]);
|
|
231
243
|
return (React.createElement(WalletContext.Provider, { value: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WalletProvider.js","sourceRoot":"","sources":["../../src/WalletProvider.tsx"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,sBAAsB,
|
|
1
|
+
{"version":3,"file":"WalletProvider.js","sourceRoot":"","sources":["../../src/WalletProvider.tsx"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"root":["../../src/walletprovider.tsx","../../src/index.ts","../../src/uselocalstorage.ts","../../src/usewallet.ts"],"version":"5.8.2"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WalletProvider.d.ts","sourceRoot":"","sources":["../../src/WalletProvider.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EACR,OAAO,EACP,WAAW,EAGX,gBAAgB,EACnB,MAAM,uCAAuC,CAAC;AAE/C,OAAO,KAAK,EAAE,EAAE,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAM3C,MAAM,WAAW,mBAAmB;IAChC,QAAQ,EAAE,SAAS,CAAC;IACpB,QAAQ,CAAC,EAAE,OAAO,EAAE,CAAC;IACrB,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,WAAW,KAAK,IAAI,CAAC;IACvC,SAAS,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC;IACzC,YAAY,CAAC,EAAE,MAAM,OAAO,CAAC;IAC7B,iBAAiB,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC;IACnE,mBAAmB,CAAC,EAAE,CAAC,KAAK,EAAE,gBAAgB,KAAK,OAAO,CAAC;IAC3D,cAAc,CAAC,EAAE,CAAC,SAAS,EAAE,OAAO,KAAK,OAAO,CAAC;IACjD,gBAAgB,CAAC,EAAE,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,KAAK,OAAO,CAAC;IACxD,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,wBAAwB,CAAC,EAAE,OAAO,CAAC;CACtC;AAcD,eAAO,MAAM,cAAc,EAAE,EAAE,CAAC,mBAAmB,
|
|
1
|
+
{"version":3,"file":"WalletProvider.d.ts","sourceRoot":"","sources":["../../src/WalletProvider.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EACR,OAAO,EACP,WAAW,EAGX,gBAAgB,EACnB,MAAM,uCAAuC,CAAC;AAE/C,OAAO,KAAK,EAAE,EAAE,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAM3C,MAAM,WAAW,mBAAmB;IAChC,QAAQ,EAAE,SAAS,CAAC;IACpB,QAAQ,CAAC,EAAE,OAAO,EAAE,CAAC;IACrB,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,WAAW,KAAK,IAAI,CAAC;IACvC,SAAS,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC;IACzC,YAAY,CAAC,EAAE,MAAM,OAAO,CAAC;IAC7B,iBAAiB,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC;IACnE,mBAAmB,CAAC,EAAE,CAAC,KAAK,EAAE,gBAAgB,KAAK,OAAO,CAAC;IAC3D,cAAc,CAAC,EAAE,CAAC,SAAS,EAAE,OAAO,KAAK,OAAO,CAAC;IACjD,gBAAgB,CAAC,EAAE,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,KAAK,OAAO,CAAC;IACxD,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,wBAAwB,CAAC,EAAE,OAAO,CAAC;CACtC;AAcD,eAAO,MAAM,cAAc,EAAE,EAAE,CAAC,mBAAmB,CAoTlD,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,61 +1,65 @@
|
|
|
1
1
|
{
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
"
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
"
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
"
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
2
|
+
"name": "@tronweb3/tronwallet-adapter-react-hooks",
|
|
3
|
+
"version": "1.1.13",
|
|
4
|
+
"description": "A `useWallet()` hook to make it easy to interact with Tron wallets.",
|
|
5
|
+
"keywords": [
|
|
6
|
+
"TRON",
|
|
7
|
+
"TronWeb",
|
|
8
|
+
"adapter"
|
|
9
|
+
],
|
|
10
|
+
"author": "tronweb3",
|
|
11
|
+
"repository": {
|
|
12
|
+
"type": "git",
|
|
13
|
+
"url": "https://github.com/tronweb3/tronwallet-adapter"
|
|
14
|
+
},
|
|
15
|
+
"license": "MIT",
|
|
16
|
+
"type": "module",
|
|
17
|
+
"sideEffects": false,
|
|
18
|
+
"engines": {
|
|
19
|
+
"node": ">=16",
|
|
20
|
+
"pnpm": ">=7"
|
|
21
|
+
},
|
|
22
|
+
"main": "./lib/cjs/index.js",
|
|
23
|
+
"module": "./lib/esm/index.js",
|
|
24
|
+
"types": "./lib/types/index.d.ts",
|
|
25
|
+
"exports": {
|
|
26
|
+
"require": "./lib/cjs/index.js",
|
|
27
|
+
"import": "./lib/esm/index.js",
|
|
28
|
+
"types": "./lib/types/index.d.ts"
|
|
29
|
+
},
|
|
30
|
+
"files": [
|
|
31
|
+
"lib",
|
|
32
|
+
"src",
|
|
33
|
+
"LICENSE"
|
|
34
|
+
],
|
|
35
|
+
"publishConfig": {
|
|
36
|
+
"access": "public"
|
|
37
|
+
},
|
|
38
|
+
"scripts": {
|
|
39
|
+
"clean": "shx mkdir -p lib && shx rm -rf lib",
|
|
40
|
+
"package": "shx echo '{ \"type\": \"commonjs\" }' > lib/cjs/package.json",
|
|
41
|
+
"test": "vitest run"
|
|
42
|
+
},
|
|
43
|
+
"peerDependencies": {
|
|
44
|
+
"react": "*",
|
|
45
|
+
"react-dom": "*"
|
|
46
|
+
},
|
|
47
|
+
"dependencies": {
|
|
48
|
+
"@tronweb3/tronwallet-abstract-adapter": "^1.2.0",
|
|
49
|
+
"@tronweb3/tronwallet-adapter-tronlink": "^1.2.0"
|
|
50
|
+
},
|
|
51
|
+
"devDependencies": {
|
|
52
|
+
"@testing-library/react": "16.3.2",
|
|
53
|
+
"@types/react": "18.3.3",
|
|
54
|
+
"@types/react-dom": "18.3.0",
|
|
55
|
+
"@vitejs/plugin-react": "5.2.0",
|
|
56
|
+
"@vitest/browser": "3.2.4",
|
|
57
|
+
"@vitest/ui": "3.2.4",
|
|
58
|
+
"eventemitter3": "5.0.4",
|
|
59
|
+
"happy-dom": "20.8.9",
|
|
60
|
+
"react": "18.3.1",
|
|
61
|
+
"react-dom": "18.3.1",
|
|
62
|
+
"shx": "0.3.4",
|
|
63
|
+
"vitest": "3.2.4"
|
|
64
|
+
}
|
|
65
|
+
}
|
package/src/WalletProvider.tsx
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { WalletNotSelectedError
|
|
1
|
+
import { WalletNotSelectedError } from '@tronweb3/tronwallet-abstract-adapter';
|
|
2
2
|
import type {
|
|
3
3
|
Adapter,
|
|
4
4
|
WalletError,
|
|
@@ -165,13 +165,20 @@ export const WalletProvider: FC<WalletProviderProps> = function ({
|
|
|
165
165
|
);
|
|
166
166
|
const handleAccountChange = useCallback(
|
|
167
167
|
function (address: string, preAddr?: string) {
|
|
168
|
-
|
|
168
|
+
// Adapters report "no account" as an empty string, while this state uses `null`
|
|
169
|
+
// for it, so normalise before storing. The callback still gets the raw value.
|
|
170
|
+
setState((state) => ({ ...state, address: address || null, connected: !!state.adapter?.connected }));
|
|
169
171
|
onAccountsChanged?.(address, preAddr);
|
|
170
172
|
},
|
|
171
173
|
[onAccountsChanged]
|
|
172
174
|
);
|
|
173
175
|
const handleDisconnect = useCallback(
|
|
174
176
|
function () {
|
|
177
|
+
setState((state) => ({
|
|
178
|
+
...state,
|
|
179
|
+
address: state.adapter?.address ?? null,
|
|
180
|
+
connected: !!state.adapter?.connected,
|
|
181
|
+
}));
|
|
175
182
|
onDisconnect?.();
|
|
176
183
|
},
|
|
177
184
|
[onDisconnect]
|
|
@@ -220,7 +227,13 @@ export const WalletProvider: FC<WalletProviderProps> = function ({
|
|
|
220
227
|
// disconnect the previous when wallet changes
|
|
221
228
|
useEffect(() => {
|
|
222
229
|
return () => {
|
|
223
|
-
|
|
230
|
+
// Cleanup cannot await, so the rejection has to be handled here or it surfaces as
|
|
231
|
+
// an unhandled one. The listeners are already off by this point, so a failure means
|
|
232
|
+
// the old adapter may still be connected with nothing watching it -- worth a warning
|
|
233
|
+
// even though there is nothing left to retry against.
|
|
234
|
+
adapter?.disconnect().catch((error) => {
|
|
235
|
+
console.warn(`[${adapter.name}]: Failed to disconnect the previous wallet.`, error);
|
|
236
|
+
});
|
|
224
237
|
};
|
|
225
238
|
}, [adapter]);
|
|
226
239
|
|
|
@@ -237,7 +250,7 @@ export const WalletProvider: FC<WalletProviderProps> = function ({
|
|
|
237
250
|
setConnecting(true);
|
|
238
251
|
try {
|
|
239
252
|
await adapter.connect();
|
|
240
|
-
} catch
|
|
253
|
+
} catch {
|
|
241
254
|
// setName(null);
|
|
242
255
|
} finally {
|
|
243
256
|
setConnecting(false);
|
|
@@ -298,17 +311,17 @@ export const WalletProvider: FC<WalletProviderProps> = function ({
|
|
|
298
311
|
);
|
|
299
312
|
|
|
300
313
|
const signTransaction = useCallback(
|
|
301
|
-
async function (transaction: Transaction
|
|
314
|
+
async function (transaction: Transaction) {
|
|
302
315
|
if (!adapter) throw handleError(new WalletNotSelectedError());
|
|
303
|
-
return await adapter.signTransaction(transaction
|
|
316
|
+
return await adapter.signTransaction(transaction);
|
|
304
317
|
},
|
|
305
318
|
[adapter, handleError]
|
|
306
319
|
);
|
|
307
320
|
|
|
308
321
|
const signMessage = useCallback(
|
|
309
|
-
async function (message: string
|
|
322
|
+
async function (message: string) {
|
|
310
323
|
if (!adapter) throw handleError(new WalletNotSelectedError());
|
|
311
|
-
return await adapter.signMessage(message
|
|
324
|
+
return await adapter.signMessage(message);
|
|
312
325
|
},
|
|
313
326
|
[adapter, handleError]
|
|
314
327
|
);
|