@0xsquid/react-hooks 3.0.30-beta.6 → 3.0.30-beta.8
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.
|
@@ -12,6 +12,7 @@ const WAGMI_RECENT_CONNECTOR_ID_LOCAL_STORAGE_KEY = "wagmi.recentConnectorId";
|
|
|
12
12
|
export const useAutoConnect = () => {
|
|
13
13
|
const { connect, connectors } = useConnect();
|
|
14
14
|
const { connectWallet, wallets } = useWallet();
|
|
15
|
+
// const { connector } = useAccount();
|
|
15
16
|
useEffect(() => {
|
|
16
17
|
const queryParameters = new URLSearchParams(window.location.search);
|
|
17
18
|
// TODO: At the moment gnosis was published without the embed parameter in the manifest,
|
|
@@ -23,8 +24,15 @@ export const useAutoConnect = () => {
|
|
|
23
24
|
priorityConnector = connectors.find((c) => c.id === embedType);
|
|
24
25
|
}
|
|
25
26
|
else {
|
|
26
|
-
priorityConnector = connectors.find((c) => PRIORITY_CONNECTOR_ID.includes(c.id));
|
|
27
|
+
priorityConnector = connectors.find((c) => PRIORITY_CONNECTOR_ID.includes(c.id) && c.ready);
|
|
27
28
|
}
|
|
29
|
+
console.log({
|
|
30
|
+
priorityConnector,
|
|
31
|
+
// connectorId: connector?.id,
|
|
32
|
+
connectors,
|
|
33
|
+
// connector,
|
|
34
|
+
connectorToReady: connectors.map((c) => [c.name, c.id, c.ready]),
|
|
35
|
+
});
|
|
28
36
|
// Connect priority provider if it's present
|
|
29
37
|
// Otherwise, connect to the last wallet used if authorized
|
|
30
38
|
if (priorityConnector) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useAutoConnect.js","sourceRoot":"","sources":["../../../src/hooks/wallet/useAutoConnect.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAClC,OAAO,EAAgC,UAAU,EAAE,MAAM,OAAO,CAAC;AACjE,OAAO,EAAE,SAAS,EAAE,MAAM,KAAK,CAAC;AAChC,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAE1D,MAAM,qBAAqB,GAAG,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC;AAExD,MAAM,2CAA2C,GAAG,yBAAyB,CAAC;AAE9E;;;;GAIG;AACH,MAAM,CAAC,MAAM,cAAc,GAAG,GAAG,EAAE;IACjC,MAAM,EAAE,OAAO,EAAE,UAAU,EAAE,GAAG,UAAU,EAAE,CAAC;IAC7C,MAAM,EAAE,aAAa,EAAE,OAAO,EAAE,GAAG,SAAS,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"useAutoConnect.js","sourceRoot":"","sources":["../../../src/hooks/wallet/useAutoConnect.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAClC,OAAO,EAAgC,UAAU,EAAE,MAAM,OAAO,CAAC;AACjE,OAAO,EAAE,SAAS,EAAE,MAAM,KAAK,CAAC;AAChC,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAE1D,MAAM,qBAAqB,GAAG,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC;AAExD,MAAM,2CAA2C,GAAG,yBAAyB,CAAC;AAE9E;;;;GAIG;AACH,MAAM,CAAC,MAAM,cAAc,GAAG,GAAG,EAAE;IACjC,MAAM,EAAE,OAAO,EAAE,UAAU,EAAE,GAAG,UAAU,EAAE,CAAC;IAC7C,MAAM,EAAE,aAAa,EAAE,OAAO,EAAE,GAAG,SAAS,EAAE,CAAC;IAC/C,sCAAsC;IAEtC,SAAS,CAAC,GAAG,EAAE;QACb,MAAM,eAAe,GAAG,IAAI,eAAe,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;QACpE,wFAAwF;QACxF,8FAA8F;QAC9F,mFAAmF;QACnF,MAAM,SAAS,GAAG,eAAe,CAAC,GAAG,CAAC,OAAO,CAAuB,CAAC;QACrE,IAAI,iBAA4D,CAAC;QAEjE,IAAI,SAAS,EAAE;YACb,iBAAiB,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,SAAS,CAAC,CAAC;SAChE;aAAM;YACL,iBAAiB,GAAG,UAAU,CAAC,IAAI,CACjC,CAAC,CAAC,EAAE,EAAE,CACJ,qBAAqB,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAwB,CAAC,IAAI,CAAC,CAAC,KAAK,CACxE,CAAC;SACH;QAED,OAAO,CAAC,GAAG,CAAC;YACV,iBAAiB;YACjB,8BAA8B;YAC9B,UAAU;YACV,aAAa;YACb,gBAAgB,EAAE,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC;SACjE,CAAC,CAAC;QAEH,4CAA4C;QAC5C,2DAA2D;QAC3D,IAAI,iBAAiB,EAAE;YACrB,OAAO,CAAC,EAAE,SAAS,EAAE,iBAAiB,EAAE,CAAC,CAAC;SAC3C;aAAM;YACL,IAAI;gBACF,MAAM,sBAAsB,GAAG,IAAI,CAAC,KAAK,CACvC,YAAY,CAAC,OAAO,CAAC,2CAA2C,CAAC;oBAC/D,MAAM,CACT,CAAC;gBAEF,IAAI,CAAC,sBAAsB,EAAE;oBAC3B,OAAO;iBACR;gBAED,MAAM,oBAAoB,GAAG,OAAO,CAAC,IAAI,CACvC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,KAAK,sBAAsB,CAChD,CAAC;gBAEF,MAAM,mBAAmB,GAAG,IAAI,CAAC,KAAK,CACpC,YAAY,CAAC,OAAO,CAClB,SAAS,sBAAsB,eAAe,CAC/C,IAAI,OAAO,CACb,CAAC;gBAEF,mGAAmG;gBACnG,kGAAkG;gBAClG,IAAI,CAAC,mBAAmB,IAAI,oBAAoB,EAAE;oBAChD,aAAa,CAAC,EAAE,MAAM,EAAE,oBAAoB,EAAE,CAAC,CAAC;iBACjD;aACF;YAAC,OAAO,KAAK,EAAE;gBACd,OAAO,CAAC,KAAK,CAAC,+BAA+B,EAAE,KAAK,CAAC,CAAC;aACvD;SACF;IACH,CAAC,EAAE,CAAC,OAAO,EAAE,UAAU,EAAE,aAAa,EAAE,OAAO,CAAC,CAAC,CAAC;AACpD,CAAC,CAAC"}
|
|
@@ -8,6 +8,14 @@ export declare const transactionErrorCode: Record<string, TransactionErrorWithMe
|
|
|
8
8
|
* @returns boolean
|
|
9
9
|
*/
|
|
10
10
|
export declare const isTransactionError: (error: any) => error is TransactionError;
|
|
11
|
+
interface GnosisTransactionError {
|
|
12
|
+
code: string;
|
|
13
|
+
error: {
|
|
14
|
+
message: string;
|
|
15
|
+
};
|
|
16
|
+
shortMessage: string;
|
|
17
|
+
}
|
|
18
|
+
export declare const isGnosisSafeTxError: (error: any) => error is GnosisTransactionError;
|
|
11
19
|
/**
|
|
12
20
|
* Return the error from enum entry
|
|
13
21
|
* @param error
|
|
@@ -23,6 +31,7 @@ export declare const getTransactionError: (error: any) => TransactionErrorWithMe
|
|
|
23
31
|
*/
|
|
24
32
|
export declare const isSwapRouteError: (error: any) => error is SquidRouteError;
|
|
25
33
|
export declare const isStatusError: (error: any) => error is SquidStatusError;
|
|
34
|
+
export {};
|
|
26
35
|
/**
|
|
27
36
|
* Tries to parse as SquidRouteError Type & Return the error from Record entries
|
|
28
37
|
* @param error
|
|
@@ -10,6 +10,11 @@ export const transactionErrorCode = {
|
|
|
10
10
|
type: TransactionErrorType.REJECTED_BY_USER,
|
|
11
11
|
message: "Return to the swap page and try again.",
|
|
12
12
|
},
|
|
13
|
+
// Gnosis Safe
|
|
14
|
+
"Transaction was rejected": {
|
|
15
|
+
type: TransactionErrorType.REJECTED_BY_USER,
|
|
16
|
+
message: "Return to the swap page and try again.",
|
|
17
|
+
},
|
|
13
18
|
// Metamask
|
|
14
19
|
4001: {
|
|
15
20
|
type: TransactionErrorType.REJECTED_BY_USER,
|
|
@@ -39,21 +44,41 @@ export const isTransactionError = (error) => {
|
|
|
39
44
|
typeof error.reason === "string" ||
|
|
40
45
|
typeof error.action === "string"));
|
|
41
46
|
};
|
|
47
|
+
export const isGnosisSafeTxError = (error) => {
|
|
48
|
+
try {
|
|
49
|
+
return (error &&
|
|
50
|
+
typeof error.code === "string" &&
|
|
51
|
+
typeof error.error.message === "string" &&
|
|
52
|
+
typeof error.shortMessage === "string");
|
|
53
|
+
}
|
|
54
|
+
catch {
|
|
55
|
+
return false;
|
|
56
|
+
}
|
|
57
|
+
};
|
|
58
|
+
const isRainbowWalletTxRejectedError = (error) => {
|
|
59
|
+
try {
|
|
60
|
+
return error.error.code === -32603;
|
|
61
|
+
}
|
|
62
|
+
catch {
|
|
63
|
+
return false;
|
|
64
|
+
}
|
|
65
|
+
};
|
|
42
66
|
/**
|
|
43
67
|
* Return the error from enum entry
|
|
44
68
|
* @param error
|
|
45
69
|
* @returns boolean
|
|
46
70
|
*/
|
|
47
71
|
export const getTransactionError = (error) => {
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
72
|
+
if (isRainbowWalletTxRejectedError(error)) {
|
|
73
|
+
return transactionErrorCode.ACTION_REJECTED;
|
|
74
|
+
}
|
|
75
|
+
if (isGnosisSafeTxError(error)) {
|
|
76
|
+
const errorWithMessage = transactionErrorCode[error.error.message];
|
|
77
|
+
if (errorWithMessage) {
|
|
78
|
+
return errorWithMessage;
|
|
79
|
+
}
|
|
80
|
+
}
|
|
52
81
|
if (isTransactionError(error)) {
|
|
53
|
-
console.log({
|
|
54
|
-
code: error.code,
|
|
55
|
-
message: error.message,
|
|
56
|
-
});
|
|
57
82
|
const castError = error;
|
|
58
83
|
if (castError.code)
|
|
59
84
|
return transactionErrorCode[castError.code];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"errorService.js","sourceRoot":"","sources":["../../../src/services/internal/errorService.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAE9D,MAAM,CAAC,MAAM,oBAAoB,GAC/B;IACE,WAAW;IACX,eAAe,EAAE;QACf,IAAI,EAAE,oBAAoB,CAAC,gBAAgB;QAC3C,OAAO,EAAE,wCAAwC;KAClD;IACD,QAAQ;IACR,kBAAkB,EAAE;QAClB,IAAI,EAAE,oBAAoB,CAAC,gBAAgB;QAC3C,OAAO,EAAE,wCAAwC;KAClD;IACD,WAAW;IACX,IAAI,EAAE;QACJ,IAAI,EAAE,oBAAoB,CAAC,gBAAgB;QAC3C,OAAO,EAAE,wCAAwC;KAClD;IACD,cAAc,EAAE;QACd,IAAI,EAAE,oBAAoB,CAAC,cAAc;QACzC,OAAO,EACL,kFAAkF;KACrF;IACD,OAAO,EAAE;QACP,IAAI,EAAE,oBAAoB,CAAC,OAAO;QAClC,OAAO,EAAE,yCAAyC;KACnD;CACF,CAAC;AAEJ;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,KAAU,EAA6B,EAAE;IAC1E,OAAO,CACL,KAAK;QACL,CAAC,OAAO,KAAK,CAAC,IAAI,KAAK,QAAQ;YAC7B,OAAO,KAAK,CAAC,IAAI,KAAK,QAAQ;YAC9B,OAAO,KAAK,CAAC,OAAO,KAAK,QAAQ;YACjC,OAAO,KAAK,CAAC,MAAM,KAAK,QAAQ;YAChC,OAAO,KAAK,CAAC,MAAM,KAAK,QAAQ,CAAC,CACpC,CAAC;AACJ,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"errorService.js","sourceRoot":"","sources":["../../../src/services/internal/errorService.ts"],"names":[],"mappings":"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"}
|