From ba4e2b73547303134482e9436862cf713e2efc14 Mon Sep 17 00:00:00 2001
From: crthpl <theo@reinsberg.info>
Date: Fri, 26 Dec 2025 17:16:22 -0800
Subject: [PATCH 1/5] add account and round (group) pnl

---
 frontend/src/lib/portfolioMetrics.ts    | 71 +++++++++++++++++++++++++
 frontend/src/routes/+layout.svelte      | 24 ++++++---
 frontend/src/routes/home/+page.svelte   | 24 ++++++++-
 frontend/src/routes/market/+page.svelte |  9 +++-
 4 files changed, 120 insertions(+), 8 deletions(-)

diff --git a/frontend/src/lib/portfolioMetrics.ts b/frontend/src/lib/portfolioMetrics.ts
index c0f8aafc..d6ce36f4 100644
--- a/frontend/src/lib/portfolioMetrics.ts
+++ b/frontend/src/lib/portfolioMetrics.ts
@@ -143,3 +143,74 @@ export const computePortfolioMetrics = (
 		}
 	};
 };
+
+/**
+ * Calculate subaccount PnL: Current MTM - Net Transfers In
+ */
+export const calculateSubaccountPnL = (
+	accountId: number,
+	transfers: websocket_api.ITransfer[],
+	markToMarket: number
+): number => {
+	let netTransfersIn = 0;
+	for (const transfer of transfers) {
+		if (transfer.toAccountId === accountId) {
+			netTransfersIn += transfer.amount ?? 0;
+		}
+		if (transfer.fromAccountId === accountId) {
+			netTransfersIn -= transfer.amount ?? 0;
+		}
+	}
+	return markToMarket - netTransfersIn;
+};
+
+/**
+ * Calculate group PnL from trade history for all markets in the group
+ */
+export const calculateGroupPnL = (
+	groupId: number,
+	markets: Map<number, MarketData>,
+	actingAs: number | undefined
+): number => {
+	if (actingAs === undefined) return 0;
+
+	let totalPnL = 0;
+
+	for (const [, marketData] of markets) {
+		if (marketData.definition.groupId !== groupId) continue;
+
+		// Calculate cost basis and position from trades
+		let costBasis = 0; // positive = net money spent
+		let position = 0;
+
+		for (const trade of marketData.trades) {
+			const size = trade.size ?? 0;
+			const price = trade.price ?? 0;
+
+			if (trade.buyerId === actingAs) {
+				costBasis += price * size;
+				position += size;
+			}
+			if (trade.sellerId === actingAs) {
+				costBasis -= price * size;
+				position -= size;
+			}
+		}
+
+		// Get current price: settlePrice if closed, lastPrice if open
+		let currentPrice: number | undefined;
+		if (marketData.definition.closed) {
+			currentPrice = marketData.definition.closed.settlePrice ?? undefined;
+		} else {
+			currentPrice = lastTradePrice(marketData);
+		}
+
+		// Calculate PnL: current value - cost basis
+		const currentValue = currentPrice !== undefined ? position * currentPrice : 0;
+		const marketPnL = currentValue - costBasis;
+
+		totalPnL += marketPnL;
+	}
+
+	return totalPnL;
+};
diff --git a/frontend/src/routes/+layout.svelte b/frontend/src/routes/+layout.svelte
index 96f5f09d..1d059abb 100644
--- a/frontend/src/routes/+layout.svelte
+++ b/frontend/src/routes/+layout.svelte
@@ -7,7 +7,7 @@
 	import { Button } from '$lib/components/ui/button';
 	import * as Sidebar from '$lib/components/ui/sidebar/index.js';
 	import { Toaster } from '$lib/components/ui/sonner';
-	import { computePortfolioMetrics } from '$lib/portfolioMetrics';
+	import { calculateGroupPnL, computePortfolioMetrics } from '$lib/portfolioMetrics';
 	import { cn, formatMarketName } from '$lib/utils';
 	import { ModeWatcher } from 'mode-watcher';
 	import { onMount } from 'svelte';
@@ -21,6 +21,11 @@
 			? serverState.markets.get(marketId)?.definition?.name
 			: undefined
 	);
+	let currentGroupId = $derived(
+		marketId !== undefined && !Number.isNaN(marketId)
+			? serverState.markets.get(marketId)?.definition?.groupId
+			: undefined
+	);
 
 	let { children } = $props();
 	let scrolled = $state(false);
@@ -188,14 +193,21 @@
 					{#if serverState.portfolio}
 						<!-- Hidden measurement elements (same structure as visible) -->
 						{@const availableBalance = formatBalance(serverState.portfolio.availableBalance)}
-						{@const mtmValue = new Intl.NumberFormat(undefined, { maximumFractionDigits: 0 }).format(portfolioMetrics.totals.markToMarket)}
+						{@const isGroupView = currentGroupId !== undefined && currentGroupId !== 0}
+						{@const displayValue = isGroupView
+							? calculateGroupPnL(currentGroupId, serverState.markets, serverState.actingAs)
+							: portfolioMetrics.totals.markToMarket}
+						{@const formattedValue = new Intl.NumberFormat(undefined, { maximumFractionDigits: 0 }).format(displayValue)}
+						{@const fullLabel = isGroupView ? 'Round PnL' : 'Mark to Market'}
+						{@const shortLabel = isGroupView ? 'Round' : 'MtM'}
+						{@const valueColor = isGroupView ? (displayValue >= 0 ? 'text-green-600 dark:text-green-400' : 'text-red-600 dark:text-red-400') : ''}
 						<div class="absolute invisible pointer-events-none" aria-hidden="true">
 							<ul bind:this={measureFullEl} class="flex w-fit items-center gap-2 md:gap-8">
 								<li class={cn('whitespace-nowrap', scrolled ? 'text-base' : 'text-lg')}>
 									Available Balance: 📎 {availableBalance}
 								</li>
 								<li class={cn('whitespace-nowrap', scrolled ? 'text-base' : 'text-lg')}>
-									Mark to Market: 📎 {mtmValue}
+									{fullLabel}: 📎 {formattedValue}
 								</li>
 							</ul>
 							<ul bind:this={measureShortEl} class="flex w-fit items-center gap-2 md:gap-8">
@@ -203,7 +215,7 @@
 									Available: 📎 {availableBalance}
 								</li>
 								<li class={cn('whitespace-nowrap', scrolled ? 'text-base' : 'text-lg')}>
-									MtM: 📎 {mtmValue}
+									{shortLabel}: 📎 {formattedValue}
 								</li>
 							</ul>
 							<ul bind:this={measureMinimalEl} class="flex w-fit items-center gap-2 md:gap-8">
@@ -218,8 +230,8 @@
 								{bannerMode === 'full' ? 'Available Balance' : 'Available'}: 📎 {availableBalance}
 							</li>
 							{#if bannerMode !== 'minimal'}
-								<li class={cn('shrink-0 whitespace-nowrap', scrolled ? 'text-base' : 'text-lg')}>
-									{bannerMode === 'full' ? 'Mark to Market' : 'MtM'}: 📎 {mtmValue}
+								<li class={cn('shrink-0 whitespace-nowrap', scrolled ? 'text-base' : 'text-lg', valueColor)}>
+									{bannerMode === 'full' ? fullLabel : shortLabel}: 📎 {formattedValue}
 								</li>
 							{/if}
 						</ul>
diff --git a/frontend/src/routes/home/+page.svelte b/frontend/src/routes/home/+page.svelte
index 29500b68..9f367cfc 100644
--- a/frontend/src/routes/home/+page.svelte
+++ b/frontend/src/routes/home/+page.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 	import { sendClientMessage, serverState } from '$lib/api.svelte';
 	import * as Table from '$lib/components/ui/table';
-	import { computePortfolioMetrics, type PortfolioRow } from '$lib/portfolioMetrics';
+	import { calculateSubaccountPnL, computePortfolioMetrics, type PortfolioRow } from '$lib/portfolioMetrics';
 	import Minus from '@lucide/svelte/icons/minus';
 
 	type SortKey =
@@ -58,6 +58,20 @@
 		rows = metrics.rows;
 	});
 
+	// Subaccount PnL: show when acting as an account with ownerCredits
+	let isSubaccount = $derived(
+		(serverState.portfolio?.ownerCredits?.length ?? 0) > 0
+	);
+	let subaccountPnL = $derived(
+		isSubaccount && serverState.actingAs !== undefined
+			? calculateSubaccountPnL(
+					serverState.actingAs,
+					serverState.transfers,
+					metrics.totals.markToMarket
+				)
+			: null
+	);
+
 	// Ensure we have last prices by requesting trade history for relevant markets.
 	let requestedTrades = new Set<number>();
 	$effect(() => {
@@ -328,6 +342,14 @@
 				<p class="text-sm text-muted-foreground">Mark to Market</p>
 				<p class="text-2xl font-semibold">📎 {Math.round(metrics.totals.markToMarket).toLocaleString()}</p>
 			</div>
+			{#if isSubaccount && subaccountPnL !== null}
+				<div class="rounded-md border bg-muted/30 p-4">
+					<p class="text-sm text-muted-foreground">Account PnL</p>
+					<p class="text-2xl font-semibold {subaccountPnL >= 0 ? 'text-green-600 dark:text-green-400' : 'text-red-600 dark:text-red-400'}">
+						📎 {Math.round(subaccountPnL).toLocaleString()}
+					</p>
+				</div>
+			{/if}
 		</div>
 
 		<div class="mt-8">
diff --git a/frontend/src/routes/market/+page.svelte b/frontend/src/routes/market/+page.svelte
index 1fc9113b..58c509fe 100644
--- a/frontend/src/routes/market/+page.svelte
+++ b/frontend/src/routes/market/+page.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
 	import { sendClientMessage, serverState } from '$lib/api.svelte';
+	import { calculateGroupPnL } from '$lib/portfolioMetrics';
 	import CreateMarket from '$lib/components/forms/createMarket.svelte';
 	import FormattedName from '$lib/components/formattedName.svelte';
 	import {
@@ -386,8 +387,14 @@
 
 				{#each organized as item (item.type === 'group' ? `group-${item.groupId}` : item.key)}
 					{#if item.type === 'group'}
+						{@const groupPnL = calculateGroupPnL(item.groupId, serverState.markets, serverState.actingAs)}
 						<div class="mb-4 rounded-lg border-2 border-primary/30 bg-muted/10 p-3">
-							<h3 class="mb-3 text-xl font-semibold">{item.groupName}</h3>
+							<div class="mb-3 flex items-center justify-between">
+								<h3 class="text-xl font-semibold">{item.groupName}</h3>
+								<span class="text-sm font-medium {groupPnL >= 0 ? 'text-green-600 dark:text-green-400' : 'text-red-600 dark:text-red-400'}">
+									Round PnL: 📎 {Math.round(groupPnL).toLocaleString()}
+								</span>
+							</div>
 							<div class="grid gap-4 md:grid-cols-2 lg:grid-cols-3">
 								{#each item.markets as { id, market, starred, pinned } (id)}
 									{@const bestBid = sortedBids(market.orders)[0]?.price}

From 8beee8584a02e22a0d97d8de7ed91f4f7fa51c82 Mon Sep 17 00:00:00 2001
From: crthpl <theo@reinsberg.info>
Date: Sat, 27 Dec 2025 14:28:22 -0800
Subject: [PATCH 2/5] get trade history

---
 frontend/src/routes/+layout.svelte      | 15 ++++++++++++++-
 frontend/src/routes/market/+page.svelte | 12 ++++++++++++
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/frontend/src/routes/+layout.svelte b/frontend/src/routes/+layout.svelte
index 1d059abb..27690795 100644
--- a/frontend/src/routes/+layout.svelte
+++ b/frontend/src/routes/+layout.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { page } from '$app/stores';
-	import { serverState } from '$lib/api.svelte';
+	import { sendClientMessage, serverState } from '$lib/api.svelte';
 	import { kinde } from '$lib/auth.svelte';
 	import AppSideBar from '$lib/components/appSideBar.svelte';
 	import { formatBalance } from '$lib/components/marketDataUtils';
@@ -120,6 +120,19 @@
 		)
 	);
 
+	// Request trade history for markets in the current group (needed for Round PnL)
+	let requestedGroupTrades = new Set<number>();
+	$effect(() => {
+		if (!currentGroupId) return;
+		for (const [marketId, marketData] of serverState.markets) {
+			if (marketData.definition.groupId !== currentGroupId) continue;
+			if (marketData.hasFullTradeHistory) continue;
+			if (requestedGroupTrades.has(marketId)) continue;
+			requestedGroupTrades.add(marketId);
+			sendClientMessage({ getFullTradeHistory: { marketId } });
+		}
+	});
+
 	onMount(async () => {
 		if (!(await kinde.isAuthenticated())) {
 			kinde.login();
diff --git a/frontend/src/routes/market/+page.svelte b/frontend/src/routes/market/+page.svelte
index 58c509fe..f289f07c 100644
--- a/frontend/src/routes/market/+page.svelte
+++ b/frontend/src/routes/market/+page.svelte
@@ -321,6 +321,18 @@
 			sendClientMessage({ deleteMarketType: { marketTypeId } });
 		}
 	}
+
+	// Request trade history for markets in groups (needed for Round PnL calculation)
+	let requestedGroupTrades = new Set<number>();
+	$effect(() => {
+		for (const [marketId, marketData] of serverState.markets) {
+			if (!marketData.definition.groupId) continue;
+			if (marketData.hasFullTradeHistory) continue;
+			if (requestedGroupTrades.has(marketId)) continue;
+			requestedGroupTrades.add(marketId);
+			sendClientMessage({ getFullTradeHistory: { marketId } });
+		}
+	});
 </script>
 
 <div class="w-full py-4">

From bb6c8f11093bff558bf3da490a62114846d44bec Mon Sep 17 00:00:00 2001
From: crthpl <theo@reinsberg.info>
Date: Sun, 25 Jan 2026 17:06:59 -0800
Subject: [PATCH 3/5] Add backend-calculated group PnL to MarketGroup

- Add optional pnl field to MarketGroup proto
- Add get_group_pnls() to calculate PnL per group for an account
- Send group PnL when sending MarketGroups to clients
- Update frontend to use backend-provided PnL instead of calculating from trade history
- Remove trade history fetching for group PnL calculation
- Hide redeem button when market is settled
- Rename "Exchange for" to "Exchangeable for"

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
---
 ...c5ff3543da2769bf6a760a360cff0800f7279.json | 26 +++++++++
 backend/src/convert.rs                        |  1 +
 backend/src/db.rs                             | 53 +++++++++++++++++++
 backend/src/handle_socket.rs                  | 17 +++++-
 .../src/lib/components/forms/redeem.svelte    |  2 +-
 frontend/src/lib/components/marketHead.svelte |  2 +-
 frontend/src/lib/portfolioMetrics.ts          | 50 ++---------------
 frontend/src/routes/+layout.svelte            | 17 +-----
 frontend/src/routes/market/+page.svelte       | 15 +-----
 schema-js/index.d.ts                          |  9 ++++
 schema-js/index.js                            | 42 +++++++++++++++
 schema/market-group.proto                     |  1 +
 12 files changed, 158 insertions(+), 77 deletions(-)
 create mode 100644 backend/.sqlx/query-15938c411b430d9f196b271888bc5ff3543da2769bf6a760a360cff0800f7279.json

diff --git a/backend/.sqlx/query-15938c411b430d9f196b271888bc5ff3543da2769bf6a760a360cff0800f7279.json b/backend/.sqlx/query-15938c411b430d9f196b271888bc5ff3543da2769bf6a760a360cff0800f7279.json
new file mode 100644
index 00000000..8bfe3ba8
--- /dev/null
+++ b/backend/.sqlx/query-15938c411b430d9f196b271888bc5ff3543da2769bf6a760a360cff0800f7279.json
@@ -0,0 +1,26 @@
+{
+  "db_name": "SQLite",
+  "query": "\n                WITH trade_costs AS (\n                    SELECT\n                        market.group_id,\n                        trade.market_id,\n                        SUM(CASE WHEN trade.buyer_id = ? THEN CAST(trade.price AS REAL) * CAST(trade.size AS REAL) ELSE 0 END) as buy_cost,\n                        SUM(CASE WHEN trade.seller_id = ? THEN CAST(trade.price AS REAL) * CAST(trade.size AS REAL) ELSE 0 END) as sell_cost,\n                        SUM(CASE WHEN trade.buyer_id = ? THEN CAST(trade.size AS REAL) ELSE 0 END) -\n                        SUM(CASE WHEN trade.seller_id = ? THEN CAST(trade.size AS REAL) ELSE 0 END) as position\n                    FROM trade\n                    JOIN market ON trade.market_id = market.id\n                    WHERE market.group_id IS NOT NULL\n                        AND market.group_id > 0\n                        AND (trade.buyer_id = ? OR trade.seller_id = ?)\n                    GROUP BY market.group_id, trade.market_id\n                ),\n                market_prices AS (\n                    SELECT\n                        market.id as market_id,\n                        market.group_id,\n                        COALESCE(\n                            market.settled_price,\n                            (SELECT CAST(price AS REAL) FROM trade WHERE trade.market_id = market.id ORDER BY trade.id DESC LIMIT 1)\n                        ) as current_price\n                    FROM market\n                    WHERE market.group_id IS NOT NULL AND market.group_id > 0\n                )\n                SELECT\n                    tc.group_id as \"group_id!\",\n                    CAST(SUM((tc.position * COALESCE(mp.current_price, 0)) - (tc.buy_cost - tc.sell_cost)) AS TEXT) as \"pnl!: Text<Decimal>\"\n                FROM trade_costs tc\n                LEFT JOIN market_prices mp ON tc.market_id = mp.market_id\n                GROUP BY tc.group_id\n            ",
+  "describe": {
+    "columns": [
+      {
+        "name": "group_id!",
+        "ordinal": 0,
+        "type_info": "Int64"
+      },
+      {
+        "name": "pnl!: Text<Decimal>",
+        "ordinal": 1,
+        "type_info": "Text"
+      }
+    ],
+    "parameters": {
+      "Right": 6
+    },
+    "nullable": [
+      true,
+      false
+    ]
+  },
+  "hash": "15938c411b430d9f196b271888bc5ff3543da2769bf6a760a360cff0800f7279"
+}
diff --git a/backend/src/convert.rs b/backend/src/convert.rs
index 3cd8e547..f4333067 100644
--- a/backend/src/convert.rs
+++ b/backend/src/convert.rs
@@ -139,6 +139,7 @@ impl From<db::MarketGroup> for websocket_api::MarketGroup {
             name,
             description,
             type_id,
+            pnl: None,
         }
     }
 }
diff --git a/backend/src/db.rs b/backend/src/db.rs
index 90e393d3..a7105923 100644
--- a/backend/src/db.rs
+++ b/backend/src/db.rs
@@ -1049,6 +1049,59 @@ impl DB {
         .await
     }
 
+    /// Get PnL for each group for a specific account.
+    /// Returns a map of group_id -> pnl.
+    #[instrument(err, skip(self))]
+    pub async fn get_group_pnls(&self, account_id: i64) -> SqlxResult<std::collections::HashMap<i64, Decimal>> {
+        struct GroupPnLRow {
+            group_id: i64,
+            pnl: Text<Decimal>,
+        }
+
+        let rows = sqlx::query_as!(
+            GroupPnLRow,
+            r#"
+                WITH trade_costs AS (
+                    SELECT
+                        market.group_id,
+                        trade.market_id,
+                        SUM(CASE WHEN trade.buyer_id = ? THEN CAST(trade.price AS REAL) * CAST(trade.size AS REAL) ELSE 0 END) as buy_cost,
+                        SUM(CASE WHEN trade.seller_id = ? THEN CAST(trade.price AS REAL) * CAST(trade.size AS REAL) ELSE 0 END) as sell_cost,
+                        SUM(CASE WHEN trade.buyer_id = ? THEN CAST(trade.size AS REAL) ELSE 0 END) -
+                        SUM(CASE WHEN trade.seller_id = ? THEN CAST(trade.size AS REAL) ELSE 0 END) as position
+                    FROM trade
+                    JOIN market ON trade.market_id = market.id
+                    WHERE market.group_id IS NOT NULL
+                        AND market.group_id > 0
+                        AND (trade.buyer_id = ? OR trade.seller_id = ?)
+                    GROUP BY market.group_id, trade.market_id
+                ),
+                market_prices AS (
+                    SELECT
+                        market.id as market_id,
+                        market.group_id,
+                        COALESCE(
+                            market.settled_price,
+                            (SELECT CAST(price AS REAL) FROM trade WHERE trade.market_id = market.id ORDER BY trade.id DESC LIMIT 1)
+                        ) as current_price
+                    FROM market
+                    WHERE market.group_id IS NOT NULL AND market.group_id > 0
+                )
+                SELECT
+                    tc.group_id as "group_id!",
+                    CAST(SUM((tc.position * COALESCE(mp.current_price, 0)) - (tc.buy_cost - tc.sell_cost)) AS TEXT) as "pnl!: Text<Decimal>"
+                FROM trade_costs tc
+                LEFT JOIN market_prices mp ON tc.market_id = mp.market_id
+                GROUP BY tc.group_id
+            "#,
+            account_id, account_id, account_id, account_id, account_id, account_id
+        )
+        .fetch_all(&self.pool)
+        .await?;
+
+        Ok(rows.into_iter().map(|r| (r.group_id, r.pnl.0)).collect())
+    }
+
     #[instrument(err, skip(self))]
     pub async fn create_market_group(
         &self,
diff --git a/backend/src/handle_socket.rs b/backend/src/handle_socket.rs
index 172be5b6..59e4b485 100644
--- a/backend/src/handle_socket.rs
+++ b/backend/src/handle_socket.rs
@@ -325,12 +325,25 @@ async fn send_initial_public_data(
     );
     socket.send(market_types_msg).await?;
 
-    // Send groups
+    // Send groups with PnL for the acting account
     let market_groups = db.get_all_market_groups().await?;
+    let group_pnls = if let Some(&account_id) = owned_accounts.first() {
+        db.get_group_pnls(account_id).await.unwrap_or_default()
+    } else {
+        std::collections::HashMap::new()
+    };
     let market_groups_msg = encode_server_message(
         String::new(),
         SM::MarketGroups(MarketGroups {
-            market_groups: market_groups.into_iter().map(MarketGroup::from).collect(),
+            market_groups: market_groups
+                .into_iter()
+                .map(|g| {
+                    let pnl = group_pnls.get(&g.id).map(|d| (*d).try_into().unwrap());
+                    let mut mg = MarketGroup::from(g);
+                    mg.pnl = pnl;
+                    mg
+                })
+                .collect(),
         }),
     );
     socket.send(market_groups_msg).await?;
diff --git a/frontend/src/lib/components/forms/redeem.svelte b/frontend/src/lib/components/forms/redeem.svelte
index 0c9f2a6a..123e92ef 100644
--- a/frontend/src/lib/components/forms/redeem.svelte
+++ b/frontend/src/lib/components/forms/redeem.svelte
@@ -42,7 +42,7 @@
 
 <form bind:this={formElement} use:enhance class="flex flex-wrap items-center gap-2">
 	<div class="whitespace-nowrap text-sm text-muted-foreground">
-		Exchange for {constituentList}
+		Exchangeable for {constituentList}
 	</div>
 	<Form.Field {form} name="amount" class="flex flex-col gap-0 space-y-0">
 		<Form.Control>
diff --git a/frontend/src/lib/components/marketHead.svelte b/frontend/src/lib/components/marketHead.svelte
index e60fcb0d..da678f3b 100644
--- a/frontend/src/lib/components/marketHead.svelte
+++ b/frontend/src/lib/components/marketHead.svelte
@@ -200,7 +200,7 @@
 					Settle Price: {marketDefinition.closed.settlePrice}
 				</p>
 			{/if}
-			{#if isRedeemable}
+			{#if isRedeemable && !marketDefinition.closed}
 				<div class="mr-4">
 					<Redeem marketId={id} disabled={!canPlaceOrders} />
 				</div>
diff --git a/frontend/src/lib/portfolioMetrics.ts b/frontend/src/lib/portfolioMetrics.ts
index 16eb520f..d18e381c 100644
--- a/frontend/src/lib/portfolioMetrics.ts
+++ b/frontend/src/lib/portfolioMetrics.ts
@@ -172,52 +172,12 @@ export const calculateSubaccountPnL = (
 };
 
 /**
- * Calculate group PnL from trade history for all markets in the group
+ * Get group PnL from market groups (calculated by backend)
  */
-export const calculateGroupPnL = (
+export const getGroupPnL = (
 	groupId: number,
-	markets: Map<number, MarketData>,
-	actingAs: number | undefined
+	marketGroups: Map<number, websocket_api.IMarketGroup>
 ): number => {
-	if (actingAs === undefined) return 0;
-
-	let totalPnL = 0;
-
-	for (const [, marketData] of markets) {
-		if (marketData.definition.groupId !== groupId) continue;
-
-		// Calculate cost basis and position from trades
-		let costBasis = 0; // positive = net money spent
-		let position = 0;
-
-		for (const trade of marketData.trades) {
-			const size = trade.size ?? 0;
-			const price = trade.price ?? 0;
-
-			if (trade.buyerId === actingAs) {
-				costBasis += price * size;
-				position += size;
-			}
-			if (trade.sellerId === actingAs) {
-				costBasis -= price * size;
-				position -= size;
-			}
-		}
-
-		// Get current price: settlePrice if closed, lastPrice if open
-		let currentPrice: number | undefined;
-		if (marketData.definition.closed) {
-			currentPrice = marketData.definition.closed.settlePrice ?? undefined;
-		} else {
-			currentPrice = lastTradePrice(marketData);
-		}
-
-		// Calculate PnL: current value - cost basis
-		const currentValue = currentPrice !== undefined ? position * currentPrice : 0;
-		const marketPnL = currentValue - costBasis;
-
-		totalPnL += marketPnL;
-	}
-
-	return totalPnL;
+	const group = marketGroups.get(groupId);
+	return group?.pnl ?? 0;
 };
diff --git a/frontend/src/routes/+layout.svelte b/frontend/src/routes/+layout.svelte
index a9fdd6ec..e68cb0a5 100644
--- a/frontend/src/routes/+layout.svelte
+++ b/frontend/src/routes/+layout.svelte
@@ -7,7 +7,7 @@
 	import { formatBalance } from '$lib/components/marketDataUtils';
 	import * as Sidebar from '$lib/components/ui/sidebar/index.js';
 	import { Toaster } from '$lib/components/ui/sonner';
-	import { calculateGroupPnL, computePortfolioMetrics } from '$lib/portfolioMetrics';
+	import { getGroupPnL, computePortfolioMetrics } from '$lib/portfolioMetrics';
 	import { cn, formatMarketName } from '$lib/utils';
 	import { ModeWatcher } from 'mode-watcher';
 	import { onMount } from 'svelte';
@@ -141,19 +141,6 @@
 		)
 	);
 
-	// Request trade history for markets in the current group (needed for Round PnL)
-	let requestedGroupTrades = new Set<number>();
-	$effect(() => {
-		if (!currentGroupId) return;
-		for (const [marketId, marketData] of serverState.markets) {
-			if (marketData.definition.groupId !== currentGroupId) continue;
-			if (marketData.hasFullTradeHistory) continue;
-			if (requestedGroupTrades.has(marketId)) continue;
-			requestedGroupTrades.add(marketId);
-			sendClientMessage({ getFullTradeHistory: { marketId } });
-		}
-	});
-
 	// Check if we're on the login page - skip auth check for that route
 	let isLoginPage = $derived($page.url.pathname === '/login');
 
@@ -225,7 +212,7 @@
 						{@const availableBalance = formatBalance(serverState.portfolio.availableBalance)}
 						{@const isGroupView = currentGroupId !== undefined && currentGroupId !== 0}
 						{@const displayValue = isGroupView
-							? calculateGroupPnL(currentGroupId, serverState.markets, serverState.actingAs)
+							? getGroupPnL(currentGroupId, serverState.marketGroups)
 							: portfolioMetrics.totals.markToMarket}
 						{@const formattedValue = new Intl.NumberFormat(undefined, { maximumFractionDigits: 0 }).format(displayValue)}
 						{@const fullLabel = isGroupView ? 'Round PnL' : 'Mark to Market'}
diff --git a/frontend/src/routes/market/+page.svelte b/frontend/src/routes/market/+page.svelte
index 246b5bff..3c873e7c 100644
--- a/frontend/src/routes/market/+page.svelte
+++ b/frontend/src/routes/market/+page.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { sendClientMessage, serverState } from '$lib/api.svelte';
-	import { calculateGroupPnL } from '$lib/portfolioMetrics';
+	import { getGroupPnL } from '$lib/portfolioMetrics';
 	import { scenariosApi } from '$lib/scenariosApi';
 	import CreateMarket from '$lib/components/forms/createMarket.svelte';
 	import FormattedName from '$lib/components/formattedName.svelte';
@@ -396,17 +396,6 @@
 		}
 	}
 
-	// Request trade history for markets in groups (needed for Round PnL calculation)
-	let requestedGroupTrades = new Set<number>();
-	$effect(() => {
-		for (const [marketId, marketData] of serverState.markets) {
-			if (!marketData.definition.groupId) continue;
-			if (marketData.hasFullTradeHistory) continue;
-			if (requestedGroupTrades.has(marketId)) continue;
-			requestedGroupTrades.add(marketId);
-			sendClientMessage({ getFullTradeHistory: { marketId } });
-		}
-	});
 </script>
 
 <div class="w-full py-4">
@@ -473,7 +462,7 @@
 
 				{#each organized as item (item.type === 'group' ? `group-${item.groupId}` : item.key)}
 					{#if item.type === 'group'}
-						{@const groupPnL = calculateGroupPnL(item.groupId, serverState.markets, serverState.actingAs)}
+						{@const groupPnL = getGroupPnL(item.groupId, serverState.marketGroups)}
 						{@const clock = clocksByName.get(item.groupName)}
 						<div class="mb-4 rounded-lg border-2 border-primary/30 bg-muted/10 p-3">
 							<div class="mb-3 flex items-center justify-between">
diff --git a/schema-js/index.d.ts b/schema-js/index.d.ts
index 2e8de787..64e72a61 100644
--- a/schema-js/index.d.ts
+++ b/schema-js/index.d.ts
@@ -2548,6 +2548,9 @@ export namespace websocket_api {
 
         /** MarketGroup typeId */
         typeId?: (number|Long|null);
+
+        /** MarketGroup pnl */
+        pnl?: (number|null);
     }
 
     /** Represents a MarketGroup. */
@@ -2571,6 +2574,12 @@ export namespace websocket_api {
         /** MarketGroup typeId. */
         public typeId: (number|Long);
 
+        /** MarketGroup pnl. */
+        public pnl?: (number|null);
+
+        /** MarketGroup _pnl. */
+        public _pnl?: "pnl";
+
         /**
          * Creates a new MarketGroup instance using the specified properties.
          * @param [properties] Properties to set
diff --git a/schema-js/index.js b/schema-js/index.js
index 2f05d27a..05334a3a 100644
--- a/schema-js/index.js
+++ b/schema-js/index.js
@@ -6888,6 +6888,7 @@ $root.websocket_api = (function() {
          * @property {string|null} [name] MarketGroup name
          * @property {string|null} [description] MarketGroup description
          * @property {number|Long|null} [typeId] MarketGroup typeId
+         * @property {number|null} [pnl] MarketGroup pnl
          */
 
         /**
@@ -6937,6 +6938,28 @@ $root.websocket_api = (function() {
          */
         MarketGroup.prototype.typeId = $util.Long ? $util.Long.fromBits(0,0,false) : 0;
 
+        /**
+         * MarketGroup pnl.
+         * @member {number|null|undefined} pnl
+         * @memberof websocket_api.MarketGroup
+         * @instance
+         */
+        MarketGroup.prototype.pnl = null;
+
+        // OneOf field names bound to virtual getters and setters
+        var $oneOfFields;
+
+        /**
+         * MarketGroup _pnl.
+         * @member {"pnl"|undefined} _pnl
+         * @memberof websocket_api.MarketGroup
+         * @instance
+         */
+        Object.defineProperty(MarketGroup.prototype, "_pnl", {
+            get: $util.oneOfGetter($oneOfFields = ["pnl"]),
+            set: $util.oneOfSetter($oneOfFields)
+        });
+
         /**
          * Creates a new MarketGroup instance using the specified properties.
          * @function create
@@ -6969,6 +6992,8 @@ $root.websocket_api = (function() {
                 writer.uint32(/* id 3, wireType 2 =*/26).string(message.description);
             if (message.typeId != null && Object.hasOwnProperty.call(message, "typeId"))
                 writer.uint32(/* id 4, wireType 0 =*/32).int64(message.typeId);
+            if (message.pnl != null && Object.hasOwnProperty.call(message, "pnl"))
+                writer.uint32(/* id 5, wireType 1 =*/41).double(message.pnl);
             return writer;
         };
 
@@ -7019,6 +7044,10 @@ $root.websocket_api = (function() {
                         message.typeId = reader.int64();
                         break;
                     }
+                case 5: {
+                        message.pnl = reader.double();
+                        break;
+                    }
                 default:
                     reader.skipType(tag & 7);
                     break;
@@ -7054,6 +7083,7 @@ $root.websocket_api = (function() {
         MarketGroup.verify = function verify(message) {
             if (typeof message !== "object" || message === null)
                 return "object expected";
+            var properties = {};
             if (message.id != null && message.hasOwnProperty("id"))
                 if (!$util.isInteger(message.id) && !(message.id && $util.isInteger(message.id.low) && $util.isInteger(message.id.high)))
                     return "id: integer|Long expected";
@@ -7066,6 +7096,11 @@ $root.websocket_api = (function() {
             if (message.typeId != null && message.hasOwnProperty("typeId"))
                 if (!$util.isInteger(message.typeId) && !(message.typeId && $util.isInteger(message.typeId.low) && $util.isInteger(message.typeId.high)))
                     return "typeId: integer|Long expected";
+            if (message.pnl != null && message.hasOwnProperty("pnl")) {
+                properties._pnl = 1;
+                if (typeof message.pnl !== "number")
+                    return "pnl: number expected";
+            }
             return null;
         };
 
@@ -7103,6 +7138,8 @@ $root.websocket_api = (function() {
                     message.typeId = object.typeId;
                 else if (typeof object.typeId === "object")
                     message.typeId = new $util.LongBits(object.typeId.low >>> 0, object.typeId.high >>> 0).toNumber();
+            if (object.pnl != null)
+                message.pnl = Number(object.pnl);
             return message;
         };
 
@@ -7147,6 +7184,11 @@ $root.websocket_api = (function() {
                     object.typeId = options.longs === String ? String(message.typeId) : message.typeId;
                 else
                     object.typeId = options.longs === String ? $util.Long.prototype.toString.call(message.typeId) : options.longs === Number ? new $util.LongBits(message.typeId.low >>> 0, message.typeId.high >>> 0).toNumber() : message.typeId;
+            if (message.pnl != null && message.hasOwnProperty("pnl")) {
+                object.pnl = options.json && !isFinite(message.pnl) ? String(message.pnl) : message.pnl;
+                if (options.oneofs)
+                    object._pnl = "pnl";
+            }
             return object;
         };
 
diff --git a/schema/market-group.proto b/schema/market-group.proto
index c2f373d9..53c8b9bc 100644
--- a/schema/market-group.proto
+++ b/schema/market-group.proto
@@ -6,4 +6,5 @@ message MarketGroup {
   string name = 2;
   string description = 3;
   int64 type_id = 4;
+  optional double pnl = 5;
 }

From ed4e7f044e321fdb1e0980dd9bb641de9b4d1c98 Mon Sep 17 00:00:00 2001
From: crthpl <theo@reinsberg.info>
Date: Sun, 25 Jan 2026 17:22:32 -0800
Subject: [PATCH 4/5] Optimize group PnL SQL query performance

Replace correlated subquery for last trade price with CTEs using
GROUP BY to avoid per-row subquery execution.

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
---
 ...b1e5b393504ba4df56c636d35a2e6c7d1c07ad.json} |  4 ++--
 backend/src/db.rs                               | 17 ++++++++++++-----
 2 files changed, 14 insertions(+), 7 deletions(-)
 rename backend/.sqlx/{query-15938c411b430d9f196b271888bc5ff3543da2769bf6a760a360cff0800f7279.json => query-3030c6202cc960882a5ac37b92b1e5b393504ba4df56c636d35a2e6c7d1c07ad.json} (51%)

diff --git a/backend/.sqlx/query-15938c411b430d9f196b271888bc5ff3543da2769bf6a760a360cff0800f7279.json b/backend/.sqlx/query-3030c6202cc960882a5ac37b92b1e5b393504ba4df56c636d35a2e6c7d1c07ad.json
similarity index 51%
rename from backend/.sqlx/query-15938c411b430d9f196b271888bc5ff3543da2769bf6a760a360cff0800f7279.json
rename to backend/.sqlx/query-3030c6202cc960882a5ac37b92b1e5b393504ba4df56c636d35a2e6c7d1c07ad.json
index 8bfe3ba8..c5ce91a6 100644
--- a/backend/.sqlx/query-15938c411b430d9f196b271888bc5ff3543da2769bf6a760a360cff0800f7279.json
+++ b/backend/.sqlx/query-3030c6202cc960882a5ac37b92b1e5b393504ba4df56c636d35a2e6c7d1c07ad.json
@@ -1,6 +1,6 @@
 {
   "db_name": "SQLite",
-  "query": "\n                WITH trade_costs AS (\n                    SELECT\n                        market.group_id,\n                        trade.market_id,\n                        SUM(CASE WHEN trade.buyer_id = ? THEN CAST(trade.price AS REAL) * CAST(trade.size AS REAL) ELSE 0 END) as buy_cost,\n                        SUM(CASE WHEN trade.seller_id = ? THEN CAST(trade.price AS REAL) * CAST(trade.size AS REAL) ELSE 0 END) as sell_cost,\n                        SUM(CASE WHEN trade.buyer_id = ? THEN CAST(trade.size AS REAL) ELSE 0 END) -\n                        SUM(CASE WHEN trade.seller_id = ? THEN CAST(trade.size AS REAL) ELSE 0 END) as position\n                    FROM trade\n                    JOIN market ON trade.market_id = market.id\n                    WHERE market.group_id IS NOT NULL\n                        AND market.group_id > 0\n                        AND (trade.buyer_id = ? OR trade.seller_id = ?)\n                    GROUP BY market.group_id, trade.market_id\n                ),\n                market_prices AS (\n                    SELECT\n                        market.id as market_id,\n                        market.group_id,\n                        COALESCE(\n                            market.settled_price,\n                            (SELECT CAST(price AS REAL) FROM trade WHERE trade.market_id = market.id ORDER BY trade.id DESC LIMIT 1)\n                        ) as current_price\n                    FROM market\n                    WHERE market.group_id IS NOT NULL AND market.group_id > 0\n                )\n                SELECT\n                    tc.group_id as \"group_id!\",\n                    CAST(SUM((tc.position * COALESCE(mp.current_price, 0)) - (tc.buy_cost - tc.sell_cost)) AS TEXT) as \"pnl!: Text<Decimal>\"\n                FROM trade_costs tc\n                LEFT JOIN market_prices mp ON tc.market_id = mp.market_id\n                GROUP BY tc.group_id\n            ",
+  "query": "\n                WITH trade_costs AS (\n                    SELECT\n                        market.group_id,\n                        trade.market_id,\n                        SUM(CASE WHEN trade.buyer_id = ? THEN CAST(trade.price AS REAL) * CAST(trade.size AS REAL) ELSE 0 END) as buy_cost,\n                        SUM(CASE WHEN trade.seller_id = ? THEN CAST(trade.price AS REAL) * CAST(trade.size AS REAL) ELSE 0 END) as sell_cost,\n                        SUM(CASE WHEN trade.buyer_id = ? THEN CAST(trade.size AS REAL) ELSE 0 END) -\n                        SUM(CASE WHEN trade.seller_id = ? THEN CAST(trade.size AS REAL) ELSE 0 END) as position\n                    FROM trade\n                    JOIN market ON trade.market_id = market.id\n                    WHERE market.group_id IS NOT NULL\n                        AND market.group_id > 0\n                        AND (trade.buyer_id = ? OR trade.seller_id = ?)\n                    GROUP BY market.group_id, trade.market_id\n                ),\n                last_trade_ids AS (\n                    SELECT market_id, MAX(id) as max_id\n                    FROM trade\n                    GROUP BY market_id\n                ),\n                last_trades AS (\n                    SELECT t.market_id, CAST(t.price AS REAL) as price\n                    FROM trade t\n                    JOIN last_trade_ids lti ON t.id = lti.max_id\n                ),\n                market_prices AS (\n                    SELECT\n                        market.id as market_id,\n                        COALESCE(CAST(market.settled_price AS REAL), lt.price) as current_price\n                    FROM market\n                    LEFT JOIN last_trades lt ON lt.market_id = market.id\n                    WHERE market.group_id IS NOT NULL AND market.group_id > 0\n                )\n                SELECT\n                    tc.group_id as \"group_id!\",\n                    CAST(SUM((tc.position * COALESCE(mp.current_price, 0)) - (tc.buy_cost - tc.sell_cost)) AS TEXT) as \"pnl!: Text<Decimal>\"\n                FROM trade_costs tc\n                LEFT JOIN market_prices mp ON tc.market_id = mp.market_id\n                GROUP BY tc.group_id\n            ",
   "describe": {
     "columns": [
       {
@@ -22,5 +22,5 @@
       false
     ]
   },
-  "hash": "15938c411b430d9f196b271888bc5ff3543da2769bf6a760a360cff0800f7279"
+  "hash": "3030c6202cc960882a5ac37b92b1e5b393504ba4df56c636d35a2e6c7d1c07ad"
 }
diff --git a/backend/src/db.rs b/backend/src/db.rs
index a7105923..198be939 100644
--- a/backend/src/db.rs
+++ b/backend/src/db.rs
@@ -1076,15 +1076,22 @@ impl DB {
                         AND (trade.buyer_id = ? OR trade.seller_id = ?)
                     GROUP BY market.group_id, trade.market_id
                 ),
+                last_trade_ids AS (
+                    SELECT market_id, MAX(id) as max_id
+                    FROM trade
+                    GROUP BY market_id
+                ),
+                last_trades AS (
+                    SELECT t.market_id, CAST(t.price AS REAL) as price
+                    FROM trade t
+                    JOIN last_trade_ids lti ON t.id = lti.max_id
+                ),
                 market_prices AS (
                     SELECT
                         market.id as market_id,
-                        market.group_id,
-                        COALESCE(
-                            market.settled_price,
-                            (SELECT CAST(price AS REAL) FROM trade WHERE trade.market_id = market.id ORDER BY trade.id DESC LIMIT 1)
-                        ) as current_price
+                        COALESCE(CAST(market.settled_price AS REAL), lt.price) as current_price
                     FROM market
+                    LEFT JOIN last_trades lt ON lt.market_id = market.id
                     WHERE market.group_id IS NOT NULL AND market.group_id > 0
                 )
                 SELECT

From 8edf236b464bebade984cf5828256f1c13e26934 Mon Sep 17 00:00:00 2001
From: crthpl <theo@reinsberg.info>
Date: Sun, 25 Jan 2026 17:28:13 -0800
Subject: [PATCH 5/5] Revert "Optimize group PnL SQL query performance"

Benchmark showed the CTE approach is actually slower:
- With index: 24ms (old) vs 29ms (CTE)
- Without index: 28ms (old) vs 48ms (CTE)

The correlated subquery is more efficient because it only looks up
last trades for markets with group_id > 0, while the CTE scans all
trades upfront.

This reverts commit ed4e7f0.

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
---
 ...bc5ff3543da2769bf6a760a360cff0800f7279.json} |  4 ++--
 backend/src/db.rs                               | 17 +++++------------
 2 files changed, 7 insertions(+), 14 deletions(-)
 rename backend/.sqlx/{query-3030c6202cc960882a5ac37b92b1e5b393504ba4df56c636d35a2e6c7d1c07ad.json => query-15938c411b430d9f196b271888bc5ff3543da2769bf6a760a360cff0800f7279.json} (51%)

diff --git a/backend/.sqlx/query-3030c6202cc960882a5ac37b92b1e5b393504ba4df56c636d35a2e6c7d1c07ad.json b/backend/.sqlx/query-15938c411b430d9f196b271888bc5ff3543da2769bf6a760a360cff0800f7279.json
similarity index 51%
rename from backend/.sqlx/query-3030c6202cc960882a5ac37b92b1e5b393504ba4df56c636d35a2e6c7d1c07ad.json
rename to backend/.sqlx/query-15938c411b430d9f196b271888bc5ff3543da2769bf6a760a360cff0800f7279.json
index c5ce91a6..8bfe3ba8 100644
--- a/backend/.sqlx/query-3030c6202cc960882a5ac37b92b1e5b393504ba4df56c636d35a2e6c7d1c07ad.json
+++ b/backend/.sqlx/query-15938c411b430d9f196b271888bc5ff3543da2769bf6a760a360cff0800f7279.json
@@ -1,6 +1,6 @@
 {
   "db_name": "SQLite",
-  "query": "\n                WITH trade_costs AS (\n                    SELECT\n                        market.group_id,\n                        trade.market_id,\n                        SUM(CASE WHEN trade.buyer_id = ? THEN CAST(trade.price AS REAL) * CAST(trade.size AS REAL) ELSE 0 END) as buy_cost,\n                        SUM(CASE WHEN trade.seller_id = ? THEN CAST(trade.price AS REAL) * CAST(trade.size AS REAL) ELSE 0 END) as sell_cost,\n                        SUM(CASE WHEN trade.buyer_id = ? THEN CAST(trade.size AS REAL) ELSE 0 END) -\n                        SUM(CASE WHEN trade.seller_id = ? THEN CAST(trade.size AS REAL) ELSE 0 END) as position\n                    FROM trade\n                    JOIN market ON trade.market_id = market.id\n                    WHERE market.group_id IS NOT NULL\n                        AND market.group_id > 0\n                        AND (trade.buyer_id = ? OR trade.seller_id = ?)\n                    GROUP BY market.group_id, trade.market_id\n                ),\n                last_trade_ids AS (\n                    SELECT market_id, MAX(id) as max_id\n                    FROM trade\n                    GROUP BY market_id\n                ),\n                last_trades AS (\n                    SELECT t.market_id, CAST(t.price AS REAL) as price\n                    FROM trade t\n                    JOIN last_trade_ids lti ON t.id = lti.max_id\n                ),\n                market_prices AS (\n                    SELECT\n                        market.id as market_id,\n                        COALESCE(CAST(market.settled_price AS REAL), lt.price) as current_price\n                    FROM market\n                    LEFT JOIN last_trades lt ON lt.market_id = market.id\n                    WHERE market.group_id IS NOT NULL AND market.group_id > 0\n                )\n                SELECT\n                    tc.group_id as \"group_id!\",\n                    CAST(SUM((tc.position * COALESCE(mp.current_price, 0)) - (tc.buy_cost - tc.sell_cost)) AS TEXT) as \"pnl!: Text<Decimal>\"\n                FROM trade_costs tc\n                LEFT JOIN market_prices mp ON tc.market_id = mp.market_id\n                GROUP BY tc.group_id\n            ",
+  "query": "\n                WITH trade_costs AS (\n                    SELECT\n                        market.group_id,\n                        trade.market_id,\n                        SUM(CASE WHEN trade.buyer_id = ? THEN CAST(trade.price AS REAL) * CAST(trade.size AS REAL) ELSE 0 END) as buy_cost,\n                        SUM(CASE WHEN trade.seller_id = ? THEN CAST(trade.price AS REAL) * CAST(trade.size AS REAL) ELSE 0 END) as sell_cost,\n                        SUM(CASE WHEN trade.buyer_id = ? THEN CAST(trade.size AS REAL) ELSE 0 END) -\n                        SUM(CASE WHEN trade.seller_id = ? THEN CAST(trade.size AS REAL) ELSE 0 END) as position\n                    FROM trade\n                    JOIN market ON trade.market_id = market.id\n                    WHERE market.group_id IS NOT NULL\n                        AND market.group_id > 0\n                        AND (trade.buyer_id = ? OR trade.seller_id = ?)\n                    GROUP BY market.group_id, trade.market_id\n                ),\n                market_prices AS (\n                    SELECT\n                        market.id as market_id,\n                        market.group_id,\n                        COALESCE(\n                            market.settled_price,\n                            (SELECT CAST(price AS REAL) FROM trade WHERE trade.market_id = market.id ORDER BY trade.id DESC LIMIT 1)\n                        ) as current_price\n                    FROM market\n                    WHERE market.group_id IS NOT NULL AND market.group_id > 0\n                )\n                SELECT\n                    tc.group_id as \"group_id!\",\n                    CAST(SUM((tc.position * COALESCE(mp.current_price, 0)) - (tc.buy_cost - tc.sell_cost)) AS TEXT) as \"pnl!: Text<Decimal>\"\n                FROM trade_costs tc\n                LEFT JOIN market_prices mp ON tc.market_id = mp.market_id\n                GROUP BY tc.group_id\n            ",
   "describe": {
     "columns": [
       {
@@ -22,5 +22,5 @@
       false
     ]
   },
-  "hash": "3030c6202cc960882a5ac37b92b1e5b393504ba4df56c636d35a2e6c7d1c07ad"
+  "hash": "15938c411b430d9f196b271888bc5ff3543da2769bf6a760a360cff0800f7279"
 }
diff --git a/backend/src/db.rs b/backend/src/db.rs
index 198be939..a7105923 100644
--- a/backend/src/db.rs
+++ b/backend/src/db.rs
@@ -1076,22 +1076,15 @@ impl DB {
                         AND (trade.buyer_id = ? OR trade.seller_id = ?)
                     GROUP BY market.group_id, trade.market_id
                 ),
-                last_trade_ids AS (
-                    SELECT market_id, MAX(id) as max_id
-                    FROM trade
-                    GROUP BY market_id
-                ),
-                last_trades AS (
-                    SELECT t.market_id, CAST(t.price AS REAL) as price
-                    FROM trade t
-                    JOIN last_trade_ids lti ON t.id = lti.max_id
-                ),
                 market_prices AS (
                     SELECT
                         market.id as market_id,
-                        COALESCE(CAST(market.settled_price AS REAL), lt.price) as current_price
+                        market.group_id,
+                        COALESCE(
+                            market.settled_price,
+                            (SELECT CAST(price AS REAL) FROM trade WHERE trade.market_id = market.id ORDER BY trade.id DESC LIMIT 1)
+                        ) as current_price
                     FROM market
-                    LEFT JOIN last_trades lt ON lt.market_id = market.id
                     WHERE market.group_id IS NOT NULL AND market.group_id > 0
                 )
                 SELECT