Optimize useHistory and useTxs

helix-bridge · Aug 27, 2024 · f0d534c · f0d534c
1 parent 18fc89a
commit f0d534c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 23 deletions.
diff --git a/packages/xtoken-ui/src/hooks/use-history.ts b/packages/xtoken-ui/src/hooks/use-history.ts
@@ -1,7 +1,6 @@
 import { GQL_GET_HISTORY } from "../config";
 import { HistoryReqParams, HistoryResData } from "../types";
 import { useQuery } from "@apollo/client";
-import { useEffect, useState } from "react";
 import { useWallet } from "./use-wallet";
 
 export function useHistory(page: number, enabled?: boolean) {
@@ -17,14 +16,5 @@ export function useHistory(page: number, enabled?: boolean) {
  skip: !enabled,
  });
 
- const [data, setData] = useState(_data?.historyRecords.records ?? []);
- const [total, setTotal] = useState(_data?.historyRecords.total ?? 0);
- useEffect(() => {
- if (!loading) {
- setData(_data?.historyRecords.records ?? []);
- setTotal(_data?.historyRecords.total ?? 0);
- }
- }, [loading, _data?.historyRecords]);
-
- return { loading, data, total, refetch };
+ return { loading, data: _data?.historyRecords.records ?? [], total: _data?.historyRecords.total ?? 0, refetch };
 }
diff --git a/packages/xtoken-ui/src/hooks/use-txs.ts b/packages/xtoken-ui/src/hooks/use-txs.ts
@@ -1,7 +1,6 @@
 import { GQL_GET_TXS } from "../config";
 import { TxsReqParams, TxsResData } from "../types";
 import { useQuery } from "@apollo/client";
-import { useEffect, useState } from "react";
 
 export function useTxs(sender: string, page: number, row = 10) {
  const {
@@ -15,15 +14,11 @@ export function useTxs(sender: string, page: number, row = 10) {
  fetchPolicy: "cache-and-network",
  });
 
- const [data, setData] = useState(_data?.historyRecords.records ?? []);
- const [total, setTotal] = useState(_data?.historyRecords.total ?? 0);
-
- useEffect(() => {
- if (!loading) {
- setData(_data?.historyRecords.records ?? []);
- setTotal(_data?.historyRecords.total ?? 0);
- }
- }, [loading, _data?.historyRecords.records, _data?.historyRecords.total]);
-
- return { loading, data, total, networkStatus, refetch };
+ return {
+ loading,
+ data: _data?.historyRecords.records ?? [],
+ total: _data?.historyRecords.total ?? 0,
+ networkStatus,
+ refetch,
+ };
 }