Merge pull request #2440 from zeitgeistpm/staging

zeitgeistpm · Jun 10, 2024 · ede758e · ede758e
2 parents b0e0394 + fdd5a81
commit ede758e
Show file tree

Hide file tree

Showing 8 changed files with 29 additions and 29 deletions.
diff --git a/components/assets/AssetActionButtons/AssetTradingButtons.tsx b/components/assets/AssetActionButtons/AssetTradingButtons.tsx
@@ -53,19 +53,15 @@ const AssetTradingButtons = ({
       {tradeItem && (
         <Modal open={isOpen} onClose={() => setIsOpen(false)}>
           <Dialog.Panel className="w-full max-w-[564px] rounded-[10px] bg-white">
-            {market?.scoringRule === ScoringRule.AmmCdaHybrid ? (
-              <Amm2TradeForm
-                marketId={marketId}
-                initialAsset={assetId}
-                selectedTab={
-                  tradeItem.action === "buy"
-                    ? TradeTabType.Buy
-                    : TradeTabType.Sell
-                }
-              />
-            ) : (
-              <TradeForm />
-            )}
+            <Amm2TradeForm
+              marketId={marketId}
+              initialAsset={assetId}
+              selectedTab={
+                tradeItem.action === "buy"
+                  ? TradeTabType.Buy
+                  : TradeTabType.Sell
+              }
+            />
           </Dialog.Panel>
         </Modal>
       )}

diff --git a/components/liquidity/MarketLiquiditySection.tsx b/components/liquidity/MarketLiquiditySection.tsx
@@ -28,10 +28,7 @@ export const MarketLiquiditySection = ({
   market: FullMarketFragment;
   poll?: boolean;
 }) => {
-  const marketHasPool =
-    (market?.scoringRule === ScoringRule.Cpmm && market.pool != null) ||
-    (market?.scoringRule === ScoringRule.AmmCdaHybrid &&
-      market.neoPool != null);
+  const marketHasPool = market.neoPool != null;
 
   return (
     <>

diff --git a/lib/gql/trending-markets.ts b/lib/gql/trending-markets.ts
@@ -67,7 +67,6 @@ const getTrendingMarkets = async (
       order: MarketOrderByInput.IdDesc,
       where: {
         status_eq: MarketStatus.Active,
-        scoringRule_eq: ScoringRule.AmmCdaHybrid,
         ...marketMetaFilter,
       },
     });

diff --git a/lib/hooks/queries/useInfiniteMarkets.ts b/lib/hooks/queries/useInfiniteMarkets.ts
@@ -109,6 +109,10 @@ export const useInfiniteMarkets = (
                 scoringRule_eq: ScoringRule.AmmCdaHybrid,
                 neoPool_isNull: withLiquidityOnly ? false : undefined,
               },
+              {
+                scoringRule_eq: ScoringRule.Lmsr,
+                neoPool_isNull: withLiquidityOnly ? false : undefined,
+              },
             ],
           },
         ],

diff --git a/lib/hooks/queries/useMarketSpotPrices.ts b/lib/hooks/queries/useMarketSpotPrices.ts
@@ -54,7 +54,8 @@ export const useMarketSpotPrices = (
       if (!enabled) return;
       const spotPrices: MarketPrices =
         market?.status !== "Resolved"
-          ? market.scoringRule === ScoringRule.AmmCdaHybrid
+          ? market.scoringRule === ScoringRule.AmmCdaHybrid ||
+            market.scoringRule === ScoringRule.Lmsr
             ? calcMarketPricesAmm2(amm2Pool!)
             : calcMarketPrices(market, basePoolBalance!, balances!)
           : calcResolvedMarketPrices(market);

diff --git a/lib/hooks/queries/usePortfolioPositions.ts b/lib/hooks/queries/usePortfolioPositions.ts
@@ -193,7 +193,11 @@ export const usePortfolioPositions = (
   const pools = usePoolsByIds(filter);
   const markets = useMarketsByIds(filter);
   const amm2MarketIds = markets.data
-    ?.filter((market) => market.scoringRule === ScoringRule.AmmCdaHybrid)
+    ?.filter(
+      (market) =>
+        market.scoringRule === ScoringRule.AmmCdaHybrid ||
+        market.scoringRule === ScoringRule.Lmsr,
+    )
     .map((m) => m.marketId);
 
   const { data: amm2SpotPrices } = useAmm2MarketSpotPrices(amm2MarketIds);
@@ -318,7 +322,10 @@ export const usePortfolioPositions = (
           price = calcResolvedMarketPrices(market).get(getIndexOf(assetId));
           price24HoursAgo = price;
         } else {
-          if (market.scoringRule === ScoringRule.AmmCdaHybrid) {
+          if (
+            market.scoringRule === ScoringRule.AmmCdaHybrid ||
+            market.scoringRule === ScoringRule.Lmsr
+          ) {
             price = lookupAssetPrice(assetId, amm2SpotPrices);
 
             price24HoursAgo = lookupAssetPrice(

diff --git a/lib/util/calc-resolved-market-prices.ts b/lib/util/calc-resolved-market-prices.ts
@@ -9,7 +9,8 @@ export const calcResolvedMarketPrices = (
   market: FullMarketFragment,
 ): MarketPrices => {
   const assetIds = (
-    market.scoringRule === ScoringRule.AmmCdaHybrid
+    market.scoringRule === ScoringRule.AmmCdaHybrid ||
+    market.scoringRule === ScoringRule.Lmsr
       ? market.neoPool?.account.balances.map((b) =>
           parseAssetIdString(b.assetId),
         )

diff --git a/pages/markets/[marketid].tsx b/pages/markets/[marketid].tsx
@@ -346,12 +346,7 @@ const Market: NextPage<MarketPageProps> = ({
   const hasLiveTwitchStream =
     hasLiveTwitchStreamClient || hasLiveTwitchStreamServer;
 
-  const marketHasPool =
-    (market?.scoringRule === ScoringRule.Cpmm &&
-      poolId != null &&
-      poolIdLoading === false) ||
-    (market?.scoringRule === ScoringRule.AmmCdaHybrid &&
-      market.neoPool != null);
+  const marketHasPool = market?.neoPool != null;
 
   const poolCreationDate = new Date(
     indexedMarket.pool?.createdAt ?? indexedMarket.neoPool?.createdAt ?? "",
@@ -396,7 +391,7 @@ const Market: NextPage<MarketPageProps> = ({
 
                 <Tab
                   key="twitch"
-                  className="flex items-center gap-2 rounded-md border-1 border-twitch-purple px-2 py-1 text-twitch-purple ui-selected:border-transparent ui-selected:bg-twitch-purple ui-selected:text-twitch-gray"
+                  className="border-twitch-purple text-twitch-purple ui-selected:bg-twitch-purple ui-selected:text-twitch-gray flex items-center gap-2 rounded-md border-1 px-2 py-1 ui-selected:border-transparent"
                 >
                   <FaTwitch size={16} />
                   Twitch Stream