unify getPool queries to prevent resolution of the wrong query

fluidity-money · Jan 21, 2025 · 42945f6 · 42945f6
1 parent a69458f
commit 42945f6
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 48 deletions.
diff --git a/web/src/components/SwapPro/index.tsx b/web/src/components/SwapPro/index.tsx
@@ -13,7 +13,7 @@ import { Graph } from "@/components/SwapPro/SwapProGraph";
 import { useSwapStore } from "@/stores/useSwapStore";
 import { columns, Transaction } from "@/app/_DataTable/columns";
 import { DataTable } from "@/app/_DataTable/DataTable";
-import { useGetFilteredPool } from "@/hooks/useGraphql";
+import { useGetPool } from "@/hooks/useGraphql";
 import { useFragment } from "@/gql";
 import { SwapProPoolFilteredFragment } from "@/components/SwapPro/SwapProPoolFragment";
 import { useMemo } from "react";
@@ -54,7 +54,7 @@ export const SwapPro = ({
   const poolToken =
     token0.address === fUSDC.address ? token1.address : token0.address;
 
-  const pool = useGetFilteredPool(poolToken, filterToken);
+  const pool = useGetPool(poolToken, filterToken);
   const poolSwapPro = useFragment(
     SwapProPoolFilteredFragment,
     pool.data?.getPool,

diff --git a/web/src/gql/gql.ts b/web/src/gql/gql.ts
@@ -31,8 +31,7 @@ const documents = {
     "\n  query AllData {\n    fusdc {\n      address\n      ...FusdcFragment\n    }\n    pools {\n      # used for the pool selector\n      address\n\n      # add general fragments here\n      ...SwapProPoolFragment\n      ...AllPoolsFragment\n      ...SelectPrimeAssetFragment\n      ...SwapExploreFragment\n      ...ManagePoolFragment\n      ...SwapFormFragment\n      ...StakeFormFragment\n      ...TokensFragment\n      ...ConfirmStakeFragment\n    }\n  }\n": types.AllDataDocument,
     "\n  query ForUser($wallet: String!) {\n    getSwapsForUser(wallet: $wallet, first: 10) {\n      data {\n        swaps {\n          # add transaction fragments here\n          ...TradeTabTransactionsFragment\n        }\n      }\n    }\n\n    getWallet(address: $wallet) {\n      # add wallet fragments here\n      ...MyPositionsInventoryWalletFragment\n      ...PositionsFragment\n    }\n\n    notes(wallet: $wallet) {\n      # add notes fragments here\n      ...NotesFragment\n    }\n  }\n": types.ForUserDocument,
     "\n  query queryGetPoints($wallet: String!) {\n    getPointsComponent(wallet: $wallet)\n  }\n": types.QueryGetPointsDocument,
-    "\n  query queryGetPool($token: String!) {\n    getPool(token: $token) {\n      ...StakeFormPoolFragment\n      ...ManagePoolFragment\n    }\n  }\n": types.QueryGetPoolDocument,
-    "\n  query queryGetFilteredPool($token: String!, $filter: String!) {\n    getPool(token: $token) {\n      ...SwapProPoolFilteredFragment\n    }\n  }\n": types.QueryGetFilteredPoolDocument,
+    "\n  query queryGetPool($token: String!, $filter: String = \"\") {\n    getPool(token: $token) {\n      ...StakeFormPoolFragment\n      ...ManagePoolFragment\n      ...SwapProPoolFilteredFragment\n    }\n  }\n": types.QueryGetPoolDocument,
     "\n  fragment PositionsFragment on Wallet {\n    id\n    positions {\n      positions {\n        created\n        served {\n          timestamp\n        }\n        positionId\n        pool {\n          token {\n            name\n            address\n            symbol\n            decimals\n          }\n          liquidityCampaigns {\n            campaignId\n            tickLower\n            tickUpper\n            fromTimestamp\n            endTimestamp\n          }\n        }\n        lower\n        upper\n        liquidity {\n          fusdc {\n            valueUsd\n          }\n          token1 {\n            valueUsd\n          }\n        }\n        isVested\n      }\n    }\n  }\n": types.PositionsFragmentFragmentDoc,
 };
 
@@ -125,11 +124,7 @@ export function graphql(source: "\n  query queryGetPoints($wallet: String!) {\n
 /**
  * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
  */
-export function graphql(source: "\n  query queryGetPool($token: String!) {\n    getPool(token: $token) {\n      ...StakeFormPoolFragment\n      ...ManagePoolFragment\n    }\n  }\n"): (typeof documents)["\n  query queryGetPool($token: String!) {\n    getPool(token: $token) {\n      ...StakeFormPoolFragment\n      ...ManagePoolFragment\n    }\n  }\n"];
-/**
- * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
- */
-export function graphql(source: "\n  query queryGetFilteredPool($token: String!, $filter: String!) {\n    getPool(token: $token) {\n      ...SwapProPoolFilteredFragment\n    }\n  }\n"): (typeof documents)["\n  query queryGetFilteredPool($token: String!, $filter: String!) {\n    getPool(token: $token) {\n      ...SwapProPoolFilteredFragment\n    }\n  }\n"];
+export function graphql(source: "\n  query queryGetPool($token: String!, $filter: String = \"\") {\n    getPool(token: $token) {\n      ...StakeFormPoolFragment\n      ...ManagePoolFragment\n      ...SwapProPoolFilteredFragment\n    }\n  }\n"): (typeof documents)["\n  query queryGetPool($token: String!, $filter: String = \"\") {\n    getPool(token: $token) {\n      ...StakeFormPoolFragment\n      ...ManagePoolFragment\n      ...SwapProPoolFilteredFragment\n    }\n  }\n"];
 /**
  * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
  */