@rainlanguage/ui-components 0.0.1-alpha.233 → 0.0.1-alpha.235

package/dist/components/charts/OrderTradesChart.svelte

@@ -45,9 +45,9 @@ $: selectedPair = pairs[selectedPairIndex] ?? null;
 $: query = createQuery({
   queryKey: [QKEY_ORDER_TRADES_LIST, order.id],
   queryFn: async () => {
-    const data = await order.getTradesList(void 0, void 0, 1);
+    const data = await order.getTradesList(void 0, void 0, void 0);
     if (data.error) throw new Error(data.error.readableMsg);
-    return data.value;
+    return data.value.trades;
   }
 });
 $: trades = $query?.data ?? [];

package/dist/components/tables/OrderTradesListTable.svelte

@@ -1,7 +1,6 @@
 <script>import { createInfiniteQuery } from "@tanstack/svelte-query";
 import TanstackAppTable from "../TanstackAppTable.svelte";
 import { QKEY_ORDER_TRADES_LIST } from "../../queries/keys";
-import { DEFAULT_PAGE_SIZE } from "../../queries/constants";
 import { TableBodyCell, TableHeadCell } from "flowbite-svelte";
 import { formatTimestampSecondsAsLocal } from "../../services/time";
 import Hash, { HashType } from "../Hash.svelte";
@@ -18,29 +17,19 @@ $: orderTradesQuery = createInfiniteQuery({
   queryKey: [order.id, QKEY_ORDER_TRADES_LIST + order.id],
   queryFn: async ({ pageParam }) => {
     tradesCount = void 0;
-    const [countResult, tradesResult] = await Promise.all([
-      order.getTradeCount(
-        startTimestamp ? BigInt(startTimestamp) : void 0,
-        endTimestamp ? BigInt(endTimestamp) : void 0
-      ),
-      order.getTradesList(
-        startTimestamp ? BigInt(startTimestamp) : void 0,
-        endTimestamp ? BigInt(endTimestamp) : void 0,
-        pageParam + 1
-      )
-    ]);
-    if (countResult.error) throw new Error(countResult.error.readableMsg);
-    if (tradesResult.error) throw new Error(tradesResult.error.readableMsg);
-    const count = countResult.value;
-    const trades = tradesResult.value;
-    if (typeof count === "number") {
-      tradesCount = count;
-    }
-    return trades;
+    const result = await order.getTradesList(
+      startTimestamp ? BigInt(startTimestamp) : void 0,
+      endTimestamp ? BigInt(endTimestamp) : void 0,
+      pageParam + 1
+    );
+    if (result.error) throw new Error(result.error.readableMsg);
+    tradesCount = Number(result.value.totalCount);
+    return result.value;
   },
   initialPageParam: 0,
-  getNextPageParam: (lastPage, _allPages, lastPageParam) => {
-    return lastPage.length === DEFAULT_PAGE_SIZE ? lastPageParam + 1 : void 0;
+  getNextPageParam: (lastPage, allPages, lastPageParam) => {
+    const fetchedCount = allPages.reduce((sum, p) => sum + p.trades.length, 0);
+    return fetchedCount < Number(lastPage.totalCount) ? lastPageParam + 1 : void 0;
   }
 });
 const AppTable = TanstackAppTable;
@@ -48,6 +37,7 @@ const AppTable = TanstackAppTable;
 
 <AppTable
 	query={orderTradesQuery}
+	dataSelector={(page) => page.trades}
 	emptyMessage="No trades found"
 	rowHoverable={false}
 	queryKey={order.id}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@rainlanguage/ui-components",
-	"version": "0.0.1-alpha.233",
+	"version": "0.0.1-alpha.235",
 	"description": "A component library for building Svelte applications to be used with Raindex.",
 	"license": "LicenseRef-DCL-1.0",
 	"author": "Rain Open Source Software Ltd",
@@ -57,7 +57,7 @@
 		"@fontsource/dm-sans": "5.1.0",
 		"@imask/svelte": "7.6.1",
 		"@observablehq/plot": "0.6.16",
-		"@rainlanguage/orderbook": "0.0.1-alpha.234",
+		"@rainlanguage/orderbook": "0.0.1-alpha.236",
 		"@reown/appkit": "1.6.4",
 		"@reown/appkit-adapter-wagmi": "1.6.4",
 		"@sentry/sveltekit": "7.120.0",