feat: closed pnl

src/bonsai/calculators/fills.ts

@@ -3,11 +3,15 @@ import { weakMapMemoize } from 'reselect';
 
 import { NUM_PARENT_SUBACCOUNTS } from '@/constants/account';
 import { EMPTY_ARR } from '@/constants/objects';
-import { IndexerFillType } from '@/types/indexer/indexerApiGen';
+import {
+  IndexerFillType,
+  IndexerOrderSide,
+  IndexerPositionSide,
+} from '@/types/indexer/indexerApiGen';
 import { IndexerCompositeFillObject } from '@/types/indexer/indexerManual';
 
 import { assertNever } from '@/lib/assertNever';
-import { MustBigNumber } from '@/lib/numbers';
+import { MustBigNumber, MustNumber } from '@/lib/numbers';
 
 import { mergeObjects } from '../lib/mergeObjects';
 import { SubaccountFill, SubaccountFillType } from '../types/summaryTypes';
@@ -30,6 +34,7 @@ const calculateFill = weakMapMemoize(
     ...base,
     marginMode: (base.subaccountNumber ?? 0) >= NUM_PARENT_SUBACCOUNTS ? 'ISOLATED' : 'CROSS',
     type: getFillType(base),
+    closedPnl: calculateClosedPnl(base),
   })
 );
 
@@ -53,3 +58,45 @@ function getFillType({
   assertNever(type);
   return SubaccountFillType.LIMIT;
 }
+
+const calculateClosedPnl = (fill: IndexerCompositeFillObject) => {
+  const fee = MustNumber(fill.fee ?? '0');
+
+  // Old fills are not supported so we show -- instead of 0
+  if (
+    fill.positionSideBefore === undefined ||
+    fill.positionSizeBefore === undefined ||
+    fill.entryPriceBefore === undefined
+  ) {
+    return undefined;
+  }
+
+  // No position before = opening trade, only fees realize
+  if (fill.positionSizeBefore === 0) {
+    return -fee;
+  }
+
+  // Check if position is reducing (opposite side)
+  const isReducing =
+    (fill.positionSideBefore === IndexerPositionSide.LONG && fill.side === IndexerOrderSide.SELL) ||
+    (fill.positionSideBefore === IndexerPositionSide.SHORT && fill.side === IndexerOrderSide.BUY);
+
+  if (!isReducing) {
+    // Position increasing (same side), only fees realize
+    return -fee;
+  }
+
+  const size = MustNumber(fill.size ?? '0');
+  const price = MustNumber(fill.price ?? '0');
+
+  // Position reducing - cap closing amount to actual position size
+  const closingAmount = Math.min(size, fill.positionSizeBefore);
+
+  // Calculate P&L only on the closing portion
+  const closingPnl =
+    fill.positionSideBefore === IndexerPositionSide.LONG
+      ? (price - fill.entryPriceBefore) * closingAmount
+      : (fill.entryPriceBefore - price) * closingAmount;
+
+  return closingPnl - fee;
+};

src/bonsai/types/summaryTypes.ts

@@ -197,6 +197,7 @@ export enum SubaccountFillType {
 export type SubaccountFill = Omit<IndexerCompositeFillObject, 'type'> & {
   marginMode: MarginMode;
   type: SubaccountFillType | undefined;
+  closedPnl?: number;
 };
 
 export type LiveTrade = IndexerWsTradeResponseObject;

src/pages/portfolio/Overview.tsx

@@ -90,6 +90,7 @@ export const Overview = () => {
                   PositionsTableColumnKey.Size,
                   PositionsTableColumnKey.Value,
                   PositionsTableColumnKey.PnL,
+                  PositionsTableColumnKey.RealizedPnL,
                   PositionsTableColumnKey.Margin,
                   PositionsTableColumnKey.AverageOpen,
                   PositionsTableColumnKey.Oracle,

src/pages/portfolio/Portfolio.tsx

@@ -131,6 +131,7 @@ const PortfolioPage = () => {
                         FillsTableColumnKey.Price,
                         FillsTableColumnKey.Total,
                         FillsTableColumnKey.Fee,
+                        FillsTableColumnKey.ClosedPnl,
                         FillsTableColumnKey.Liquidity,
                       ]
                 }

src/pages/portfolio/Positions.tsx

@@ -69,6 +69,7 @@ export const Positions = () => {
                   PositionsTableColumnKey.Size,
                   PositionsTableColumnKey.Value,
                   PositionsTableColumnKey.PnL,
+                  PositionsTableColumnKey.RealizedPnL,
                   PositionsTableColumnKey.Margin,
                   PositionsTableColumnKey.AverageOpen,
                   PositionsTableColumnKey.Oracle,

src/pages/trade/HorizontalPanel.tsx

@@ -150,6 +150,7 @@ export const HorizontalPanel = ({ isOpen = true, setIsOpen, handleStartResize }:
             PositionsTableColumnKey.Size,
             PositionsTableColumnKey.Value,
             PositionsTableColumnKey.PnL,
+            PositionsTableColumnKey.RealizedPnL,
             PositionsTableColumnKey.Margin,
             PositionsTableColumnKey.AverageOpen,
             PositionsTableColumnKey.Oracle,
@@ -326,6 +327,7 @@ export const HorizontalPanel = ({ isOpen = true, setIsOpen, handleStartResize }:
                   FillsTableColumnKey.Price,
                   FillsTableColumnKey.Total,
                   FillsTableColumnKey.Fee,
+                  FillsTableColumnKey.ClosedPnl,
                   FillsTableColumnKey.Liquidity,
                 ].filter(isTruthy)
           }

src/types/indexer/indexerManual.ts

@@ -19,6 +19,7 @@ import {
   IndexerPerpetualMarketStatus,
   IndexerPerpetualMarketType,
   IndexerPerpetualPositionResponseObject,
+  IndexerPositionSide,
   IndexerTradeResponseObject,
   IndexerTransferResponseObject,
 } from './indexerApiGen';
@@ -156,6 +157,9 @@ export interface IndexerCompositeFillObject {
   clientMetadata?: string | null;
   subaccountNumber?: number;
   market?: string;
+  positionSideBefore?: IndexerPositionSide;
+  positionSizeBefore?: number;
+  entryPriceBefore?: number;
 }
 
 export interface IndexerWsParentSubaccountSubscribedResponse {

src/views/tables/FillsTable.tsx

@@ -52,6 +52,7 @@ export enum FillsTableColumnKey {
   AmountTag = 'Amount-Tag',
   Total = 'Total',
   Fee = 'Fee',
+  ClosedPnl = 'ClosedPnl',
 
   // Tablet Only
   TypeAmount = 'Type-Amount',
@@ -212,6 +213,16 @@ const getFillsTableColumnDef = ({
           </TableCell>
         ),
       },
+      [FillsTableColumnKey.ClosedPnl]: {
+        columnKey: 'closedPnl',
+        getCellValue: (row) => row.closedPnl,
+        label: stringGetter({ key: STRING_KEYS.CLOSED_PNL }),
+        renderCell: ({ closedPnl }) => (
+          <TableCell>
+            <Output type={OutputType.Fiat} value={closedPnl} />
+          </TableCell>
+        ),
+      },
       [FillsTableColumnKey.Type]: {
         columnKey: 'type',
         getCellValue: (row) => row.type,