From dcd2e687ed7c46b9754ad0dc9f9f9045ff8768d6 Mon Sep 17 00:00:00 2001 From: case Date: Thu, 19 Sep 2024 17:22:43 -0700 Subject: [PATCH] Trading Closed sidebar --- packages/markets/components/MarketPageSidebar.tsx | 4 +++- packages/markets/components/MarketTradePanel.tsx | 11 +++++++++-- packages/markets/lib/helpers.ts | 2 +- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/packages/markets/components/MarketPageSidebar.tsx b/packages/markets/components/MarketPageSidebar.tsx index a0de3331..03a54e99 100644 --- a/packages/markets/components/MarketPageSidebar.tsx +++ b/packages/markets/components/MarketPageSidebar.tsx @@ -1,7 +1,7 @@ 'use client' import React from 'react' -import { isMarketResolved } from '../lib/helpers' +import { isMarketResolved, isMarketTradable } from '../lib/helpers' import { ExtendedMarket } from '../types' import { MarketTradePanel } from './MarketTradePanel' import { RelatedMarkets } from './RelatedMarkets' @@ -15,10 +15,12 @@ export function MarketPageSidebar({ activeOptionId: string onTradeComplete: () => void }) { + console.log(isMarketTradable(market)) return (
void @@ -53,7 +55,7 @@ export function MarketTradePanel({ return (
- {!isResolved ? ( + {isTradable ? ( @@ -88,6 +90,11 @@ export function MarketTradePanel({ + ) : !isResolved ? ( + + +
Trading closed
+
) : ( )} diff --git a/packages/markets/lib/helpers.ts b/packages/markets/lib/helpers.ts index f487ce18..76961277 100644 --- a/packages/markets/lib/helpers.ts +++ b/packages/markets/lib/helpers.ts @@ -7,7 +7,7 @@ export function canResolveMarket({ market, userId }: { market: Market; userId?: export function isMarketTradable(market: Market): boolean { const now = new Date() - return !market.resolvedAt && (!market.closeDate || market.closeDate > now) + return !market.resolvedAt && (!market.closeDate || new Date(market.closeDate) > now) } export function isMarketResolved(market: ExtendedMarket): boolean {