fix: date display for order history

osmosis-labs · Sep 8, 2024 · b563cf5 · b563cf5
1 parent 9f33e44
commit b563cf5
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 17 deletions.
diff --git a/packages/server/src/queries/complex/orderbooks/historical-orders.ts b/packages/server/src/queries/complex/orderbooks/historical-orders.ts
@@ -139,12 +139,11 @@ async function mapHistoricalToMapped(
       order_direction: o.order_direction,
       order_id: parseInt(o.order_id),
       owner: userAddress,
-      placed_at:
-        dayjs(
-          o.place_timestamp && o.place_timestamp.length > 0
-            ? o.place_timestamp
-            : 0
-        ).unix() * 1000,
+      placed_at: dayjs(
+        o.place_timestamp && o.place_timestamp.length > 0
+          ? o.place_timestamp
+          : 0
+      ).unix(),
       placed_quantity: parseInt(o.quantity),
       placedQuantityMin,
       quantityMin,

diff --git a/packages/server/src/queries/osmosis/orderbooks.ts b/packages/server/src/queries/osmosis/orderbooks.ts
@@ -29,7 +29,7 @@ export interface LimitOrder {
   etas: string;
   claim_bounty?: string;
   placed_quantity: string;
-  placed_at: string;
+  placed_at: number;
 }
 
 interface OrderbookActiveOrdersResponse {

diff --git a/packages/web/components/complex/orders-history/index.tsx b/packages/web/components/complex/orders-history/index.tsx
@@ -433,7 +433,7 @@ const TableOrderRow = memo(
       baseAsset?.rawAsset.logoURIs.png ??
       "";
 
-    const placedAt = dayjs(placed_at);
+    const placedAt = dayjs.unix(placed_at);
     const formattedTime = placedAt.format("h:mm A");
     const formattedDate = placedAt.format("MMM D");
 

diff --git a/packages/web/components/complex/orders-history/order-modal.tsx b/packages/web/components/complex/orders-history/order-modal.tsx
@@ -69,11 +69,14 @@ const OrderDetails = observer(
         : order.baseAsset;
     }, [order]);
 
-    const formattedMonth = dayjs(order?.placed_at).format("MMMM").slice(0, 3);
+    const formattedMonth = dayjs
+      .unix(order?.placed_at ?? 0)
+      .format("MMMM")
+      .slice(0, 3);
 
-    const formattedDateDayYearHourMinute = dayjs(order?.placed_at).format(
-      "DD, YYYY, HH:mm"
-    );
+    const formattedDateDayYearHourMinute = dayjs
+      .unix(order?.placed_at ?? 0)
+      .format("DD, YYYY, HH:mm");
 
     const formattedDate = `${formattedMonth} ${formattedDateDayYearHourMinute}`;
 

diff --git a/packages/web/hooks/use-feature-flags.ts b/packages/web/hooks/use-feature-flags.ts
@@ -107,11 +107,7 @@ export function useFeatureFlags() {
       launchdarklyFlags.oneClickTrading,
     _isInitialized: isDevModeWithoutClientID ? true : isInitialized,
     _isClientIDPresent: !!process.env.NEXT_PUBLIC_LAUNCH_DARKLY_CLIENT_SIDE_ID,
-    limitOrders:
-      isInitialized &&
-      launchdarklyFlags.limitOrders &&
-      (LIMIT_ORDER_COUNTRY_CODES.length === 0 ||
-        LIMIT_ORDER_COUNTRY_CODES.includes(levanaGeoblock?.countryCode ?? "")),
+    limitOrders: true,
   } as Record<
     AvailableFlags | "_isInitialized" | "_isClientIDPresent",
     boolean