@0xsquid/react-hooks 1.0.25 → 1.0.27
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/dist/core/index.d.ts +1 -0
- package/dist/core/index.js +1 -0
- package/dist/core/index.js.map +1 -1
- package/dist/hooks/navigation/useKeyboardNavigation.d.ts +3 -2
- package/dist/hooks/navigation/useKeyboardNavigation.js +3 -5
- package/dist/hooks/navigation/useKeyboardNavigation.js.map +1 -1
- package/dist/hooks/transaction/useGetRoute.js +1 -1
- package/dist/hooks/transaction/useGetRoute.js.map +1 -1
- package/dist/hooks/transaction/useSingleTransaction.d.ts +5 -1
- package/dist/hooks/transaction/useSingleTransaction.js +3 -14
- package/dist/hooks/transaction/useSingleTransaction.js.map +1 -1
- package/package.json +1 -1
- package/dist/hooks/webapp-router/useSquidRouter.d.ts +0 -11
- package/dist/hooks/webapp-router/useSquidRouter.js +0 -33
- package/dist/hooks/webapp-router/useSquidRouter.js.map +0 -1
package/dist/core/index.d.ts
CHANGED
package/dist/core/index.js
CHANGED
package/dist/core/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/core/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/core/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AACtC,OAAO,EAAE,cAAc,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC"}
|
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import type { RefObject } from "react";
|
|
2
2
|
type Props = {
|
|
3
|
-
itemsListRef
|
|
4
|
-
activeListItemClassName
|
|
3
|
+
itemsListRef?: RefObject<HTMLElement>;
|
|
4
|
+
activeListItemClassName?: string;
|
|
5
|
+
onEscape?: () => void;
|
|
5
6
|
};
|
|
6
7
|
export declare const useKeyboardNavigation: (props?: Props) => void;
|
|
7
8
|
export {};
|
|
@@ -1,11 +1,9 @@
|
|
|
1
1
|
import { useCallback, useEffect } from "react";
|
|
2
|
-
import { useSquidRouter } from "../../hooks/webapp-router/useSquidRouter";
|
|
3
2
|
export const useKeyboardNavigation = (props) => {
|
|
4
|
-
const { itemsListRef, activeListItemClassName = "" } = props ?? {};
|
|
5
|
-
const { previousRoute } = useSquidRouter();
|
|
3
|
+
const { itemsListRef, activeListItemClassName = "", onEscape } = props ?? {};
|
|
6
4
|
const onKeyDown = useCallback((event) => {
|
|
7
5
|
if (event.key === "Escape") {
|
|
8
|
-
|
|
6
|
+
onEscape?.();
|
|
9
7
|
return;
|
|
10
8
|
}
|
|
11
9
|
if (activeListItemClassName.trim() === "")
|
|
@@ -58,7 +56,7 @@ export const useKeyboardNavigation = (props) => {
|
|
|
58
56
|
defaultActiveItem.querySelector("button")?.click();
|
|
59
57
|
}
|
|
60
58
|
}
|
|
61
|
-
}, [
|
|
59
|
+
}, [itemsListRef, activeListItemClassName]);
|
|
62
60
|
useEffect(() => {
|
|
63
61
|
document.addEventListener("keydown", onKeyDown, false);
|
|
64
62
|
return () => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useKeyboardNavigation.js","sourceRoot":"","sources":["../../../src/hooks/navigation/useKeyboardNavigation.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"useKeyboardNavigation.js","sourceRoot":"","sources":["../../../src/hooks/navigation/useKeyboardNavigation.ts"],"names":[],"mappings":"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"}
|
|
@@ -73,7 +73,7 @@ export const useGetRoute = () => {
|
|
|
73
73
|
toToken: toToken.address,
|
|
74
74
|
toAddress: destinationAddress ?? "",
|
|
75
75
|
quoteOnly: sourceUserAddress === undefined || destinationAddress === undefined,
|
|
76
|
-
slippage: config.slippage,
|
|
76
|
+
slippage: config.slippage === 0 ? undefined : config.slippage,
|
|
77
77
|
enableBoost: expressEnabled,
|
|
78
78
|
prefer: config.preferDex,
|
|
79
79
|
receiveGasOnDestination: gasEnabled,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useGetRoute.js","sourceRoot":"","sources":["../../../src/hooks/transaction/useGetRoute.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAC9D,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAC;AAC1C,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAC7C,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,gBAAgB,EAAE,MAAM,qCAAqC,CAAC;AAGvE,OAAO,EAAE,IAAI,EAAE,MAAM,iCAAiC,CAAC;AACvD,OAAO,EACL,aAAa,EACb,wBAAwB,GACzB,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAC/D,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAC1C,OAAO,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AAEpE,MAAM,CAAC,MAAM,WAAW,GAAG,GAAG,EAAE;IAC9B,MAAM,EAAE,wBAAwB,EAAE,WAAW,EAAE,iBAAiB,EAAE,GAChE,gBAAgB,EAAE,CAAC;IACrB,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,aAAa,EAAE,CAAC;IAC1C,MAAM,EAAE,SAAS,EAAE,GAAG,wBAAwB,EAAE,CAAC;IACjD,MAAM,EAAE,cAAc,EAAE,UAAU,EAAE,GAAG,aAAa,EAAE,CAAC;IAEvD;;;;OAIG;IACH,MAAM,0BAA0B,GAAG,WAAW,CAAC,KAAK,IAAI,EAAE;QACxD,wDAAwD;QACxD,IAAI,CAAC,iBAAiB,EAAE;YACtB,OAAO,SAAS,EAAE,eAAe;gBAC/B,CAAC,CAAE;oBACC;wBACE,OAAO,EAAE,SAAS,EAAE,eAAe;wBACnC,QAAQ,EAAE,GAAG;qBACd;oBACD,wDAAwD;iBACnC;gBACzB,CAAC,CAAC,SAAS,CAAC;SACf;QAED,mFAAmF;QACnF,iEAAiE;QACjE,MAAM,cAAc,GAAG,MAAM,wBAAwB,CACnD,cAAc,CAAC,OAAO,CACvB,CAAC;QACF,IAAI,CAAC,cAAc,EAAE;YACnB,OAAO,SAAS,CAAC;SAClB;QAED,mFAAmF;QACnF,kEAAkE;QAClE,IAAI,CAAC,CAAC,SAAS,EAAE,eAAe,IAAI,CAAC,CAAC,cAAc,EAAE;YACpD,OAAO;gBACL;oBACE,OAAO,EAAE,SAAS,EAAE,eAAe,IAAI,cAAc;oBACrD,QAAQ,EAAE,GAAG;iBACd;aACmB,CAAC;SACxB;QAED,OAAO,SAAS,CAAC;IACnB,CAAC,EAAE,CAAC,wBAAwB,EAAE,iBAAiB,EAAE,SAAS,EAAE,eAAe,CAAC,CAAC,CAAC;IAE9E;;;;OAIG;IACH,OAAO,WAAW,CAChB,KAAK,EAAE,EACL,SAAS,EACT,OAAO,EACP,SAAS,EACT,OAAO,EACP,iBAAiB,EACjB,kBAAkB,EAClB,SAAS,GASV,EAAE,EAAE;QACH,IAAI,CAAC,SAAS,IAAI,CAAC,OAAO,IAAI,CAAC,SAAS,IAAI,CAAC,OAAO,IAAI,CAAC,SAAS,EAAE;YAClE,OAAO,SAAS,CAAC;SAClB;QAED,MAAM,SAAS,GACb,iBAAiB,KAAK,SAAS,IAAI,kBAAkB,KAAK,SAAS,CAAC;QAEtE,MAAM,SAAS,GAAG,MAAM,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QAE/D,MAAM,uBAAuB,GAC3B,SAAS,IAAI,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,0BAA0B,EAAE,CAAC;QAE1E,+DAA+D;QAC/D,MAAM,MAAM,GAAiB;YAC3B,SAAS;YACT,SAAS,EAAE,SAAS,CAAC,OAAO;YAC5B,WAAW,EAAE,iBAAiB,IAAI,SAAS,CAAC,WAAW;YACvD,UAAU,EAAE,KAAK;iBACd,UAAU,CAAC,SAAS,EAAE,QAAQ,EAAE,IAAI,GAAG,EAAE,SAAS,EAAE,QAAQ,CAAC;iBAC7D,QAAQ,EAAE;YACb,OAAO;YACP,OAAO,EAAE,OAAO,CAAC,OAAO;YACxB,SAAS,EAAE,kBAAkB,IAAI,EAAE;YACnC,SAAS,EACP,iBAAiB,KAAK,SAAS,IAAI,kBAAkB,KAAK,SAAS;YACrE,QAAQ,EAAE,MAAM,CAAC,QAAQ;
|
|
1
|
+
{"version":3,"file":"useGetRoute.js","sourceRoot":"","sources":["../../../src/hooks/transaction/useGetRoute.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,7 +2,11 @@ import type { StatusResponse } from "@0xsquid/squid-types";
|
|
|
2
2
|
import type { AxiosError } from "axios";
|
|
3
3
|
import type { TransactionParams } from "../../core/types/transaction";
|
|
4
4
|
import { TransactionStatus } from "../../core/types/transaction";
|
|
5
|
-
export declare const useSingleTransaction: (transaction
|
|
5
|
+
export declare const useSingleTransaction: ({ transaction, retry, refetchOnWindowFocus, }: {
|
|
6
|
+
transaction?: TransactionParams | undefined;
|
|
7
|
+
retry?: number | undefined;
|
|
8
|
+
refetchOnWindowFocus?: boolean | "always" | undefined;
|
|
9
|
+
}) => {
|
|
6
10
|
transactionStatusQuery: import("@tanstack/react-query").UseQueryResult<StatusResponse, Error | AxiosError<unknown, any>>;
|
|
7
11
|
latestStatus: TransactionStatus;
|
|
8
12
|
};
|
|
@@ -6,20 +6,13 @@ import { axelarEndStatuses, axelarSuccessStatuses, backendVersion, } from "../..
|
|
|
6
6
|
import { keys } from "../../core/queries/queries-keys";
|
|
7
7
|
import { TransactionStatus } from "../../core/types/transaction";
|
|
8
8
|
import { usePersistStore, useSquidStore, } from "../../hooks/store/useSquidStore";
|
|
9
|
-
import { useSquidRouter } from "../../hooks/webapp-router/useSquidRouter";
|
|
10
9
|
import { getQueryHeaders } from "../../services/internal/apiService";
|
|
11
10
|
import { WidgetEvents } from "../../services/internal/eventService";
|
|
12
11
|
import { findHistoryItem, isCCTPBridge, updateTransactionHistoryStatus, } from "../../services/internal/transactionService";
|
|
13
|
-
export const useSingleTransaction = (transaction) => {
|
|
12
|
+
export const useSingleTransaction = ({ transaction, retry = 25, refetchOnWindowFocus = "always", }) => {
|
|
14
13
|
const { config } = useSquidStore();
|
|
15
|
-
const { currentRoute } = useSquidRouter();
|
|
16
14
|
const [refetchInterval, setRefetchInterval] = useState(10000);
|
|
17
15
|
const currentHistoryItem = useMemo(() => findHistoryItem(transaction?.transactionId), [transaction?.transactionId]);
|
|
18
|
-
// TODO: Might need to be outside the hooks library
|
|
19
|
-
const isTransactionPage = useMemo(
|
|
20
|
-
// () => currentRoute?.path === routes.transaction.path,
|
|
21
|
-
// TODO: Update this to use the correct route
|
|
22
|
-
() => true, [currentRoute?.path]);
|
|
23
16
|
/**
|
|
24
17
|
* Transaction status endpoint
|
|
25
18
|
* Squid api is using axelar endpoint and parsing the response
|
|
@@ -61,12 +54,8 @@ export const useSingleTransaction = (transaction) => {
|
|
|
61
54
|
},
|
|
62
55
|
// At the moment Cosmos indexing takes more time, so need more time between retries
|
|
63
56
|
retryDelay: transaction?.fromChain?.chainType === ChainType.COSMOS ? 5000 : 3000,
|
|
64
|
-
retry: transaction?.fromChain?.chainType === ChainType.COSMOS
|
|
65
|
-
|
|
66
|
-
: currentRoute.id === "transaction"
|
|
67
|
-
? 25
|
|
68
|
-
: 1,
|
|
69
|
-
refetchOnWindowFocus: isTransactionPage ? "always" : false,
|
|
57
|
+
retry: transaction?.fromChain?.chainType === ChainType.COSMOS ? 6 : retry,
|
|
58
|
+
refetchOnWindowFocus,
|
|
70
59
|
onSuccess: (data) => {
|
|
71
60
|
const statusResponse = data;
|
|
72
61
|
// Dispatch event
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useSingleTransaction.js","sourceRoot":"","sources":["../../../src/hooks/transaction/useSingleTransaction.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAEjD,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAEjD,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAC1C,OAAO,EACL,iBAAiB,EACjB,qBAAqB,EACrB,cAAc,GACf,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,IAAI,EAAE,MAAM,iCAAiC,CAAC;AAGvD,OAAO,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AACjE,OAAO,EACL,eAAe,EACf,aAAa,GACd,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"useSingleTransaction.js","sourceRoot":"","sources":["../../../src/hooks/transaction/useSingleTransaction.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,11 +0,0 @@
|
|
|
1
|
-
import { WidgetRoute } from "../../core/types/route";
|
|
2
|
-
export declare const useSquidRouter: () => {
|
|
3
|
-
currentRoute: WidgetRoute;
|
|
4
|
-
switchRoute: (route: WidgetRoute, params?: {
|
|
5
|
-
[key: string]: any;
|
|
6
|
-
} | undefined, addRouteToHistory?: boolean) => void;
|
|
7
|
-
previousRoute: () => void;
|
|
8
|
-
currentRouteParams: {
|
|
9
|
-
[key: string]: any;
|
|
10
|
-
} | undefined;
|
|
11
|
-
};
|
|
@@ -1,33 +0,0 @@
|
|
|
1
|
-
import { useSquidRouterStore } from "../../hooks/store/useSquidStore";
|
|
2
|
-
export const useSquidRouter = () => {
|
|
3
|
-
const { history } = useSquidRouterStore();
|
|
4
|
-
const switchRoute = (route, params, addRouteToHistory = true) => {
|
|
5
|
-
const currentHistory = useSquidRouterStore.getState().history;
|
|
6
|
-
if (addRouteToHistory) {
|
|
7
|
-
useSquidRouterStore.setState({
|
|
8
|
-
history: [...currentHistory, { route, params }],
|
|
9
|
-
});
|
|
10
|
-
}
|
|
11
|
-
else {
|
|
12
|
-
useSquidRouterStore.setState({
|
|
13
|
-
history: [...currentHistory.slice(0, -1), { route, params }],
|
|
14
|
-
});
|
|
15
|
-
}
|
|
16
|
-
};
|
|
17
|
-
const previousRoute = () => {
|
|
18
|
-
const currentHistory = useSquidRouterStore.getState().history;
|
|
19
|
-
currentHistory.pop();
|
|
20
|
-
useSquidRouterStore.setState({
|
|
21
|
-
history: currentHistory,
|
|
22
|
-
});
|
|
23
|
-
};
|
|
24
|
-
const currentRoute = history[history.length - 1].route;
|
|
25
|
-
const currentRouteParams = history[history.length - 1].params;
|
|
26
|
-
return {
|
|
27
|
-
currentRoute,
|
|
28
|
-
switchRoute,
|
|
29
|
-
previousRoute,
|
|
30
|
-
currentRouteParams,
|
|
31
|
-
};
|
|
32
|
-
};
|
|
33
|
-
//# sourceMappingURL=useSquidRouter.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"useSquidRouter.js","sourceRoot":"","sources":["../../../src/hooks/webapp-router/useSquidRouter.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AAEtE,MAAM,CAAC,MAAM,cAAc,GAAG,GAAG,EAAE;IACjC,MAAM,EAAE,OAAO,EAAE,GAAG,mBAAmB,EAAE,CAAC;IAE1C,MAAM,WAAW,GAAG,CAClB,KAAkB,EAClB,MAAuD,EACvD,iBAAiB,GAAG,IAAI,EACxB,EAAE;QACF,MAAM,cAAc,GAAG,mBAAmB,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC;QAC9D,IAAI,iBAAiB,EAAE;YACrB,mBAAmB,CAAC,QAAQ,CAAC;gBAC3B,OAAO,EAAE,CAAC,GAAG,cAAc,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC;aAChD,CAAC,CAAC;SACJ;aAAM;YACL,mBAAmB,CAAC,QAAQ,CAAC;gBAC3B,OAAO,EAAE,CAAC,GAAG,cAAc,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC;aAC7D,CAAC,CAAC;SACJ;IACH,CAAC,CAAC;IAEF,MAAM,aAAa,GAAG,GAAG,EAAE;QACzB,MAAM,cAAc,GAAG,mBAAmB,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC;QAC9D,cAAc,CAAC,GAAG,EAAE,CAAC;QAErB,mBAAmB,CAAC,QAAQ,CAAC;YAC3B,OAAO,EAAE,cAAc;SACxB,CAAC,CAAC;IACL,CAAC,CAAC;IAEF,MAAM,YAAY,GAAG,OAAO,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC;IACvD,MAAM,kBAAkB,GAAG,OAAO,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC;IAE9D,OAAO;QACL,YAAY;QACZ,WAAW;QACX,aAAa;QACb,kBAAkB;KACnB,CAAC;AACJ,CAAC,CAAC"}
|