merge

dydxprotocol · Dec 20, 2024 · 1f02709 · 1f02709
2 parents de23d8e + 5d73d72
commit 1f02709
Show file tree

Hide file tree

Showing 5 changed files with 150 additions and 135 deletions.
diff --git a/src/abacus-ts/lib/mapLoadable.ts b/src/abacus-ts/lib/mapLoadable.ts
@@ -19,7 +19,6 @@ export function mergeLoadableData<T, R>(
   } as any;
 }
 
-// converts idle to pending and if a status has valid data is counts as success
 export function mergeLoadableStatus(...status: Array<Loadable<any>>): Loadable<any>['status'] {
   if (status.some((s) => s.status === 'error' && s.data == null)) {
     return 'error';

diff --git a/src/lib/orders.ts b/src/lib/orders.ts
@@ -5,6 +5,7 @@ import {
   OrderStatus as OrderStatusNew,
 } from '@/abacus-ts/summaryTypes';
 import { IndexerOrderType } from '@/types/indexer/indexerApiGen';
+import { IndexerCompositeFillObject } from '@/types/indexer/indexerManual';
 import { OrderSide } from '@dydxprotocol/v4-client-js';
 import BigNumber from 'bignumber.js';
 
@@ -16,11 +17,11 @@ import {
   KotlinIrEnumValues,
   Nullable,
   OrderStatus,
+  SubaccountFill,
   SubaccountFills,
   TRADE_TYPES,
   type Asset,
   type PerpetualMarket,
-  type SubaccountFill,
   type SubaccountFundingPayment,
   type SubaccountOrder,
 } from '@/constants/abacus';
@@ -240,6 +241,27 @@ export const getHydratedOrder = ({
   };
 };
 
+export const getHydratedFill = ({
+  data,
+  assets,
+  perpetualMarkets,
+}: {
+  data: IndexerCompositeFillObject;
+  assets: AssetInfos;
+  perpetualMarkets: MarketsData;
+}): IndexerCompositeFillObject & NewAddedProps => {
+  return {
+    ...data,
+    asset: assets[getAssetFromMarketId(data.market ?? '')],
+    stepSizeDecimals: MaybeBigNumber(
+      perpetualMarkets[data.market ?? '']?.stepSize
+    )?.decimalPlaces(),
+    tickSizeDecimals: MaybeBigNumber(
+      perpetualMarkets[data.market ?? '']?.tickSize
+    )?.decimalPlaces(),
+  };
+};
+
 export const getTradeType = (orderType: string) =>
   TRADE_TYPES[orderType as KotlinIrEnumValues<typeof AbacusOrderType>];
 

diff --git a/src/pages/trade/HorizontalPanel.tsx b/src/pages/trade/HorizontalPanel.tsx
@@ -1,6 +1,6 @@
 import { useCallback, useMemo, useState } from 'react';
 
-import { selectAccountOrdersLoading } from '@/abacus-ts/selectors/account';
+import { BonsaiCore } from '@/abacus-ts/ontology';
 import { shallowEqual } from 'react-redux';
 import { useNavigate } from 'react-router-dom';
 import styled from 'styled-components';
@@ -80,7 +80,7 @@ export const HorizontalPanel = ({ isOpen = true, setIsOpen }: ElementProps) => {
     calculateShouldRenderActionsInPositionsTable
   );
   const isWaitingForOrderToIndex = useAppSelector(getHasUncommittedOrders);
-  const areOrdersLoading = useAppSelector(selectAccountOrdersLoading) === 'pending';
+  const areOrdersLoading = useAppSelector(BonsaiCore.account.openOrders.loading) === 'pending';
   const showCurrentMarket = isTablet || view === PanelView.CurrentMarket;
 
   const numOpenOrders = useParameterizedSelector(
@@ -93,6 +93,7 @@ export const HorizontalPanel = ({ isOpen = true, setIsOpen }: ElementProps) => {
   );
   const hasUnseenOrderUpdates = unseenOrders > 0;
 
+  const areFillsLoading = useAppSelector(BonsaiCore.account.fills.loading) === 'pending';
   const numUnseenFills = useParameterizedSelector(
     createGetUnseenFillsCount,
     showCurrentMarket ? currentMarketId : undefined
@@ -290,10 +291,14 @@ export const HorizontalPanel = ({ isOpen = true, setIsOpen }: ElementProps) => {
       value: InfoSection.Fills,
       label: stringGetter({ key: STRING_KEYS.FILLS }),
 
-      slotRight: fillsTagNumber && (
-        <Tag type={TagType.Number} isHighlighted={hasUnseenFillUpdates}>
-          {fillsTagNumber}
-        </Tag>
+      slotRight: areFillsLoading ? (
+        <LoadingSpinner tw="[--spinner-width:1rem]" />
+      ) : (
+        fillsTagNumber && (
+          <Tag type={TagType.Number} isHighlighted={hasUnseenFillUpdates}>
+            {fillsTagNumber}
+          </Tag>
+        )
       ),
 
       content: (
@@ -327,11 +332,12 @@ export const HorizontalPanel = ({ isOpen = true, setIsOpen }: ElementProps) => {
     }),
     [
       stringGetter,
-      currentMarketId,
-      showCurrentMarket,
-      isTablet,
+      areFillsLoading,
       fillsTagNumber,
       hasUnseenFillUpdates,
+      showCurrentMarket,
+      currentMarketId,
+      isTablet,
     ]
   );
 

diff --git a/src/state/accountSelectors.ts b/src/state/accountSelectors.ts
@@ -775,15 +775,14 @@ export const createGetUnseenFillsCount = () =>
     [
       getCurrentAccountMemory,
       BonsaiCore.network.indexerHeight.data,
-      getSubaccountFills,
+      BonsaiCore.account.fills.data,
       (state, market: string | undefined) => market,
     ],
     (memory, height, fills, market) => {
       if (height == null) {
         return 0;
       }
-      const ourFills =
-        (market == null ? fills : fills?.filter((o) => o.marketId === market)) ?? EMPTY_ARR;
+      const ourFills = market == null ? fills : fills.filter((o) => o.market === market);
       if (ourFills.length === 0) {
         return 0;
       }
@@ -792,9 +791,9 @@ export const createGetUnseenFillsCount = () =>
       }
       const unseen = ourFills.filter(
         (o) =>
-          o.createdAtMilliseconds >
+          (mapIfPresent(o.createdAt, (c) => new Date(c).valueOf()) ?? 0) >
           (mapIfPresent(
-            (memory.seenFills[o.marketId] ?? memory.seenFills[ALL_MARKETS_STRING])?.time,
+            (memory.seenFills[o.market ?? ''] ?? memory.seenFills[ALL_MARKETS_STRING])?.time,
             (t) => new Date(t).valueOf()
           ) ?? 0)
       );