From caacfd4193791482556ecb0a855394961ca80a46 Mon Sep 17 00:00:00 2001 From: Jon Ator Date: Wed, 28 Aug 2024 00:31:26 -0400 Subject: [PATCH] sqs pools handle no pools (#3801) --- .../complex/pools/providers/sidecar.ts | 2 + .../server/src/queries/complex/pools/user.ts | 11 +++--- packages/web/pages/test-bridge.tsx | 37 ------------------- 3 files changed, 7 insertions(+), 43 deletions(-) delete mode 100644 packages/web/pages/test-bridge.tsx diff --git a/packages/server/src/queries/complex/pools/providers/sidecar.ts b/packages/server/src/queries/complex/pools/providers/sidecar.ts index db7ca03ba7..c4a5670920 100644 --- a/packages/server/src/queries/complex/pools/providers/sidecar.ts +++ b/packages/server/src/queries/complex/pools/providers/sidecar.ts @@ -36,6 +36,8 @@ export function getPoolsFromSidecar({ minLiquidityUsd?: number; withMarketIncentives?: boolean; }): Promise { + if (poolIds && !poolIds.length) return Promise.resolve([]); + return cachified({ cache: poolsCache, key: diff --git a/packages/server/src/queries/complex/pools/user.ts b/packages/server/src/queries/complex/pools/user.ts index be812dabdc..0e6369521f 100644 --- a/packages/server/src/queries/complex/pools/user.ts +++ b/packages/server/src/queries/complex/pools/user.ts @@ -66,14 +66,13 @@ export async function getUserPools(params: { .map(({ position: { pool_id } }) => pool_id) .forEach((poolId) => userUniquePoolIds.add(poolId)); - const eventualPools = await timeout( - () => getPools({ ...params, poolIds: Array.from(userUniquePoolIds) }), - 10_000, // 10 seconds - "getPools" - )(); + const pools = await getPools({ + ...params, + poolIds: Array.from(userUniquePoolIds), + }); return await Promise.all( - eventualPools.map(async (pool) => { + pools.map(async (pool) => { const { id, reserveCoins, totalFiatValueLocked, type } = pool; let userValue: PricePretty = new PricePretty( DEFAULT_VS_CURRENCY, diff --git a/packages/web/pages/test-bridge.tsx b/packages/web/pages/test-bridge.tsx deleted file mode 100644 index ed8937ae38..0000000000 --- a/packages/web/pages/test-bridge.tsx +++ /dev/null @@ -1,37 +0,0 @@ -import { NextPage } from "next"; -import Image from "next/image"; -import { NextSeo } from "next-seo"; -import { useMount } from "react-use"; - -import { useTranslation } from "~/hooks"; -import { useBridgeStore } from "~/hooks/bridge"; - -const TestBridge: NextPage = () => { - const { t } = useTranslation(); - const bridgeAsset = useBridgeStore((state) => state.bridgeAsset); - - useMount(() => { - bridgeAsset({ - direction: "deposit", - anyDenom: "USDC", - }); - }); - - return ( -
- - {t("404.title")} -
{t("404.title")}
-
- ); -}; - -export default TestBridge;