From 83be29b6afbada80988a466f9d91aa6c0d90d82f Mon Sep 17 00:00:00 2001
From: findolor <anakisci@gmail.com>
Date: Mon, 9 Sep 2024 15:55:07 +0300
Subject: [PATCH 01/11] feat: add new field to query and Order struct

---
 crates/subgraph/queries/ordersList.graphql | 3 +++
 crates/subgraph/src/orderbook_client.rs    | 1 +
 crates/subgraph/src/types/common.rs        | 1 +
 3 files changed, 5 insertions(+)

diff --git a/crates/subgraph/queries/ordersList.graphql b/crates/subgraph/queries/ordersList.graphql
index 47901c884..894491b34 100644
--- a/crates/subgraph/queries/ordersList.graphql
+++ b/crates/subgraph/queries/ordersList.graphql
@@ -36,5 +36,8 @@ query OrdersListQuery($skip: Int = 0, $first: Int = 25) {
         timestamp
       }
     }
+    trades(first: 1) {
+      id 
+    }
   }
 }
\ No newline at end of file
diff --git a/crates/subgraph/src/orderbook_client.rs b/crates/subgraph/src/orderbook_client.rs
index cc8a18a97..872540e9c 100644
--- a/crates/subgraph/src/orderbook_client.rs
+++ b/crates/subgraph/src/orderbook_client.rs
@@ -92,6 +92,7 @@ impl OrderbookSubgraphClient {
         let data = self
             .query::<OrdersListQuery, OrdersListQueryVariables>(variables)
             .await?;
+
         Ok(data.orders)
     }
 
diff --git a/crates/subgraph/src/types/common.rs b/crates/subgraph/src/types/common.rs
index 8aa75ee79..fcd312588 100644
--- a/crates/subgraph/src/types/common.rs
+++ b/crates/subgraph/src/types/common.rs
@@ -72,6 +72,7 @@ pub struct Order {
     pub timestamp_added: BigInt,
     pub meta: Option<RainMetaV1>,
     pub add_events: Vec<AddOrder>,
+    pub trades: Vec<Trade>,
 }
 
 #[derive(cynic::QueryFragment, Debug, Serialize, Clone)]

From 268e59115da8dc9d6fd1c7364d697d7ef3e543df Mon Sep 17 00:00:00 2001
From: findolor <anakisci@gmail.com>
Date: Mon, 9 Sep 2024 18:55:14 +0300
Subject: [PATCH 02/11] feat: add trades field to order struct and update
 orders list table

---
 crates/subgraph/src/types/common.rs           | 10 ++++++++-
 .../components/tables/OrdersListTable.svelte  | 22 +++++++++++--------
 2 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/crates/subgraph/src/types/common.rs b/crates/subgraph/src/types/common.rs
index fcd312588..8fe0ece97 100644
--- a/crates/subgraph/src/types/common.rs
+++ b/crates/subgraph/src/types/common.rs
@@ -72,7 +72,8 @@ pub struct Order {
     pub timestamp_added: BigInt,
     pub meta: Option<RainMetaV1>,
     pub add_events: Vec<AddOrder>,
-    pub trades: Vec<Trade>,
+    #[arguments(first: 1000)]
+    pub trades: Vec<TradePartial>,
 }
 
 #[derive(cynic::QueryFragment, Debug, Serialize, Clone)]
@@ -222,6 +223,13 @@ pub struct Trade {
     pub orderbook: Orderbook,
 }
 
+#[derive(cynic::QueryFragment, Debug, Clone, Serialize)]
+#[cynic(graphql_type = "Trade")]
+#[typeshare]
+pub struct TradePartial {
+    pub id: Bytes,
+}
+
 #[derive(cynic::QueryFragment, Debug, Serialize, Clone)]
 #[cynic(graphql_type = "ERC20")]
 #[typeshare]
diff --git a/tauri-app/src/lib/components/tables/OrdersListTable.svelte b/tauri-app/src/lib/components/tables/OrdersListTable.svelte
index da6e7f180..e2e887666 100644
--- a/tauri-app/src/lib/components/tables/OrdersListTable.svelte
+++ b/tauri-app/src/lib/components/tables/OrdersListTable.svelte
@@ -71,6 +71,7 @@
       <TableHeadCell data-testid="orderListHeadingOutputs" padding="px-2 py-4"
         >Output Token(s)</TableHeadCell
       >
+      <TableHeadCell data-testid="orderListHeadingTrades" padding="px-2 py-4">Trades</TableHeadCell>
       <TableHeadCell padding="px-4 py-4"></TableHeadCell>
     </svelte:fragment>
 
@@ -82,15 +83,15 @@
           <Badge color="yellow">Inactive</Badge>
         {/if}
       </TableBodyCell>
-      <TableBodyCell data-testid="orderListRowID" tdClass="break-all px-4 py-4"
-        ><Hash type={HashType.Identifier} value={item.orderHash} /></TableBodyCell
-      >
-      <TableBodyCell data-testid="orderListRowOwner" tdClass="break-all px-4 py-2"
-        ><Hash type={HashType.Wallet} value={item.owner} /></TableBodyCell
-      >
-      <TableBodyCell data-testid="orderListRowOrderbook" tdClass="break-all px-4 py-2"
-        ><Hash type={HashType.Identifier} value={item.orderbook.id} /></TableBodyCell
-      >
+      <TableBodyCell data-testid="orderListRowID" tdClass="break-all px-4 py-4">
+        <Hash type={HashType.Identifier} value={item.orderHash} />
+      </TableBodyCell>
+      <TableBodyCell data-testid="orderListRowOwner" tdClass="break-all px-4 py-2">
+        <Hash type={HashType.Wallet} value={item.owner} />
+      </TableBodyCell>
+      <TableBodyCell data-testid="orderListRowOrderbook" tdClass="break-all px-4 py-2">
+        <Hash type={HashType.Identifier} value={item.orderbook.id} />
+      </TableBodyCell>
       <TableBodyCell data-testid="orderListRowLastAdded" tdClass="break-word px-4 py-2">
         {formatTimestampSecondsAsLocal(BigInt(item.timestampAdded))}
       </TableBodyCell>
@@ -100,6 +101,9 @@
       <TableBodyCell data-testid="orderListRowOutputs" tdClass="break-word p-2">
         {item.outputs?.map((t) => t.token.symbol)}
       </TableBodyCell>
+      <TableBodyCell data-testid="orderListRowTrades" tdClass="break-word p-2"
+        >{item.trades.length}</TableBodyCell
+      >
       <TableBodyCell tdClass="px-0 text-right">
         {#if $walletAddressMatchesOrBlank(item.owner) && item.active}
           <Button

From 867f467a3f8e15d0129655554115a59132bae77d Mon Sep 17 00:00:00 2001
From: findolor <anakisci@gmail.com>
Date: Mon, 9 Sep 2024 18:55:21 +0300
Subject: [PATCH 03/11] test: update tests

---
 crates/subgraph/src/types/order_detail_traits.rs | 1 +
 tauri-app/src-tauri/src/commands/order_quote.rs  | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/crates/subgraph/src/types/order_detail_traits.rs b/crates/subgraph/src/types/order_detail_traits.rs
index cc542aee6..b9f375706 100644
--- a/crates/subgraph/src/types/order_detail_traits.rs
+++ b/crates/subgraph/src/types/order_detail_traits.rs
@@ -86,6 +86,7 @@ mod tests {
             },
             // Only the order_bytes field is used for the conversion
             order_bytes: Bytes("0x00000000000000000000000000000000000000000000000000000000000000200000000000000000000000006171c21b2e553c59a64d1337211b77c367cefe5d00000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000001c000000000000000000000000000000000000000000000000000000000000002400000000000000000000000000000000000000000000000000000000000000001000000000000000000000000379b966dc6b117dd47b5fc5308534256a4ab1bcc0000000000000000000000006e4b01603edbda617002a077420e98c86595748e000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000950000000000000000000000000000000000000000000000000000000000000002ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0000000000000000000000000000000000000000000000000b1a2bc2ec5000000000000000000000000000000000000000000000000000000000000000000015020000000c020200020110000001100001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000050c5725949a6f0c72e6c4a641f24049a917db0cb000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000833589fcd6edb6e08f4c7c32d4f71b54bda0291300000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000001".into()),
+            trades: vec![]
         };
 
         let order_v3: OrderV3 = order_detail.try_into().unwrap();
diff --git a/tauri-app/src-tauri/src/commands/order_quote.rs b/tauri-app/src-tauri/src/commands/order_quote.rs
index 05390ee5f..4a0d87095 100644
--- a/tauri-app/src-tauri/src/commands/order_quote.rs
+++ b/tauri-app/src-tauri/src/commands/order_quote.rs
@@ -170,6 +170,7 @@ mod tests {
             add_events: vec![],
             meta: None,
             timestamp_added: BigInt(0.to_string()),
+            trades: vec![]
         };
 
         let input_io_index = 0;
@@ -250,6 +251,7 @@ mod tests {
             add_events: vec![],
             meta: None,
             timestamp_added: BigInt(0.to_string()),
+            trades: vec![]
         };
 
         let rpc_url = CI_DEPLOY_POLYGON_RPC_URL.to_string();

From f2c36c0632a8b23695d0572eb93f50cdc412c3e1 Mon Sep 17 00:00:00 2001
From: findolor <anakisci@gmail.com>
Date: Tue, 10 Sep 2024 10:01:35 +0300
Subject: [PATCH 04/11] fix: update trades count text

---
 tauri-app/src/lib/components/tables/OrdersListTable.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tauri-app/src/lib/components/tables/OrdersListTable.svelte b/tauri-app/src/lib/components/tables/OrdersListTable.svelte
index f45796af8..6e234abd7 100644
--- a/tauri-app/src/lib/components/tables/OrdersListTable.svelte
+++ b/tauri-app/src/lib/components/tables/OrdersListTable.svelte
@@ -102,7 +102,7 @@
         {item.outputs?.map((t) => t.token.symbol)}
       </TableBodyCell>
       <TableBodyCell data-testid="orderListRowTrades" tdClass="break-word p-2"
-        >{item.trades.length}</TableBodyCell
+        >{item.trades.length > 99 ? '>99' : item.trades.length}</TableBodyCell
       >
       <TableBodyCell tdClass="px-0 text-right">
         {#if $walletAddressMatchesOrBlank(item.owner) && item.active}

From 448aa62c7e11330f9dd7332dc49e51640c5d6e44 Mon Sep 17 00:00:00 2001
From: findolor <anakisci@gmail.com>
Date: Tue, 10 Sep 2024 10:01:52 +0300
Subject: [PATCH 05/11] test: update tests with correct fields

---
 .../src/lib/components/tables/OrderTradesListTable.test.ts  | 2 ++
 tauri-app/src/lib/components/tables/OrdersListTable.test.ts | 2 ++
 tauri-app/src/lib/queries/orderDetail.ts                    | 1 +
 tauri-app/src/lib/queries/orderQuote.ts                     | 1 +
 tauri-app/src/lib/services/historicalOrderCharts.ts         | 6 ++++++
 5 files changed, 12 insertions(+)

diff --git a/tauri-app/src/lib/components/tables/OrderTradesListTable.test.ts b/tauri-app/src/lib/components/tables/OrderTradesListTable.test.ts
index 7978ed10a..a316f526d 100644
--- a/tauri-app/src/lib/components/tables/OrderTradesListTable.test.ts
+++ b/tauri-app/src/lib/components/tables/OrderTradesListTable.test.ts
@@ -84,6 +84,7 @@ const mockTakeOrdersList: Trade[] = [
       orderbook: {
         id: '0x00',
       },
+      trades: [],
     },
     inputVaultBalanceChange: {
       vault: {
@@ -165,6 +166,7 @@ const mockTakeOrdersList: Trade[] = [
       orderbook: {
         id: '0x00',
       },
+      trades: [],
     },
     inputVaultBalanceChange: {
       vault: {
diff --git a/tauri-app/src/lib/components/tables/OrdersListTable.test.ts b/tauri-app/src/lib/components/tables/OrdersListTable.test.ts
index aea2b491d..a2d076616 100644
--- a/tauri-app/src/lib/components/tables/OrdersListTable.test.ts
+++ b/tauri-app/src/lib/components/tables/OrdersListTable.test.ts
@@ -81,6 +81,7 @@ const mockOrders: Order[] = [
       },
     ],
     orderbook: { id: '0x00' },
+    trades: [],
   },
   {
     id: 'order2',
@@ -117,6 +118,7 @@ const mockOrders: Order[] = [
       },
     ],
     orderbook: { id: '0x00' },
+    trades: [],
   },
 ];
 
diff --git a/tauri-app/src/lib/queries/orderDetail.ts b/tauri-app/src/lib/queries/orderDetail.ts
index fa6816a49..f2b41d09a 100644
--- a/tauri-app/src/lib/queries/orderDetail.ts
+++ b/tauri-app/src/lib/queries/orderDetail.ts
@@ -79,6 +79,7 @@ export const mockOrderDetailsExtended: OrderDetailExtended = {
     orderbook: {
       id: '0x00',
     },
+    trades: [],
   },
   rainlang: 'rainlang1',
 };
diff --git a/tauri-app/src/lib/queries/orderQuote.ts b/tauri-app/src/lib/queries/orderQuote.ts
index 41a3acb0e..46a44151d 100644
--- a/tauri-app/src/lib/queries/orderQuote.ts
+++ b/tauri-app/src/lib/queries/orderQuote.ts
@@ -61,6 +61,7 @@ if (import.meta.vitest) {
         active: true,
         addEvents: [],
         timestampAdded: '123',
+        trades: [],
       },
       0,
       0,
diff --git a/tauri-app/src/lib/services/historicalOrderCharts.ts b/tauri-app/src/lib/services/historicalOrderCharts.ts
index 3a3fe8959..0a1c2a1bb 100644
--- a/tauri-app/src/lib/services/historicalOrderCharts.ts
+++ b/tauri-app/src/lib/services/historicalOrderCharts.ts
@@ -110,6 +110,7 @@ if (import.meta.vitest) {
           orderbook: {
             id: '0x00',
           },
+          trades: [],
         },
         inputVaultBalanceChange: {
           vault: {
@@ -191,6 +192,7 @@ if (import.meta.vitest) {
           orderbook: {
             id: '0x00',
           },
+          trades: [],
         },
         inputVaultBalanceChange: {
           vault: {
@@ -272,6 +274,7 @@ if (import.meta.vitest) {
           orderbook: {
             id: '0x00',
           },
+          trades: [],
         },
         inputVaultBalanceChange: {
           vault: {
@@ -373,6 +376,7 @@ if (import.meta.vitest) {
           orderbook: {
             id: '0x00',
           },
+          trades: [],
         },
         inputVaultBalanceChange: {
           vault: {
@@ -454,6 +458,7 @@ if (import.meta.vitest) {
           orderbook: {
             id: '0x00',
           },
+          trades: [],
         },
         inputVaultBalanceChange: {
           vault: {
@@ -535,6 +540,7 @@ if (import.meta.vitest) {
           orderbook: {
             id: '0x00',
           },
+          trades: [],
         },
         inputVaultBalanceChange: {
           vault: {

From b55e8f886f58b4d5e6d2a5ee4d994af65f3c4a1e Mon Sep 17 00:00:00 2001
From: findolor <anakisci@gmail.com>
Date: Tue, 10 Sep 2024 10:02:09 +0300
Subject: [PATCH 06/11] fix: use partial order struct for trade query

---
 crates/subgraph/src/types/common.rs | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/crates/subgraph/src/types/common.rs b/crates/subgraph/src/types/common.rs
index 8fe0ece97..db8bf3372 100644
--- a/crates/subgraph/src/types/common.rs
+++ b/crates/subgraph/src/types/common.rs
@@ -72,8 +72,16 @@ pub struct Order {
     pub timestamp_added: BigInt,
     pub meta: Option<RainMetaV1>,
     pub add_events: Vec<AddOrder>,
-    #[arguments(first: 1000)]
-    pub trades: Vec<TradePartial>,
+    pub trades: Vec<OrderStructPartialTrade>,
+}
+
+#[derive(cynic::QueryFragment, Debug, Serialize, Clone)]
+#[cynic(graphql_type = "Order")]
+#[serde(rename_all = "camelCase")]
+#[typeshare]
+pub struct TradeStructPartialOrder {
+    pub id: Bytes,
+    pub order_hash: Bytes,
 }
 
 #[derive(cynic::QueryFragment, Debug, Serialize, Clone)]
@@ -217,7 +225,7 @@ pub struct Trade {
     pub id: Bytes,
     pub trade_event: TradeEvent,
     pub output_vault_balance_change: TradeVaultBalanceChange,
-    pub order: Order,
+    pub order: TradeStructPartialOrder,
     pub input_vault_balance_change: TradeVaultBalanceChange,
     pub timestamp: BigInt,
     pub orderbook: Orderbook,
@@ -226,7 +234,7 @@ pub struct Trade {
 #[derive(cynic::QueryFragment, Debug, Clone, Serialize)]
 #[cynic(graphql_type = "Trade")]
 #[typeshare]
-pub struct TradePartial {
+pub struct OrderStructPartialTrade {
     pub id: Bytes,
 }
 

From ed5b6dc1548ec0fc13a65323e06889b696b94e41 Mon Sep 17 00:00:00 2001
From: findolor <anakisci@gmail.com>
Date: Tue, 10 Sep 2024 10:09:28 +0300
Subject: [PATCH 07/11] test: update orders list table tests

---
 tauri-app/src/lib/components/tables/OrdersListTable.test.ts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/tauri-app/src/lib/components/tables/OrdersListTable.test.ts b/tauri-app/src/lib/components/tables/OrdersListTable.test.ts
index a2d076616..673162487 100644
--- a/tauri-app/src/lib/components/tables/OrdersListTable.test.ts
+++ b/tauri-app/src/lib/components/tables/OrdersListTable.test.ts
@@ -118,7 +118,7 @@ const mockOrders: Order[] = [
       },
     ],
     orderbook: { id: '0x00' },
-    trades: [],
+    trades: Array.from({ length: 100 }, (_, i) => ({ id: `trade${i}` })),
   },
 ];
 
@@ -141,6 +141,7 @@ test('renders the orders list table with correct data', async () => {
     expect(screen.getByTestId('orderListHeadingLastAdded')).toHaveTextContent('Last Added');
     expect(screen.getByTestId('orderListHeadingInputs')).toHaveTextContent('Input Token(s)');
     expect(screen.getByTestId('orderListHeadingOutputs')).toHaveTextContent('Output Token(s)');
+    expect(screen.getByTestId('orderListHeadingTrades')).toHaveTextContent('Trades');
 
     expect(await screen.findAllByTestId('bodyRow')).toHaveLength(2);
 
@@ -151,6 +152,7 @@ test('renders the orders list table with correct data', async () => {
     expect(await screen.findAllByTestId('orderListRowLastAdded')).toHaveLength(2);
     expect(await screen.findAllByTestId('orderListRowInputs')).toHaveLength(2);
     expect(await screen.findAllByTestId('orderListRowOutputs')).toHaveLength(2);
+    expect(await screen.findAllByTestId('orderListRowTrades')).toHaveLength(2);
 
     expect((await screen.findAllByTestId('orderListRowActive'))[0]).toHaveTextContent('Inactive');
     expect((await screen.findAllByTestId('orderListRowActive'))[1]).toHaveTextContent('Active');
@@ -172,6 +174,8 @@ test('renders the orders list table with correct data', async () => {
     expect((await screen.findAllByTestId('orderListRowInputs'))[1]).toHaveTextContent('USDT');
     expect((await screen.findAllByTestId('orderListRowOutputs'))[0]).toHaveTextContent('USDC');
     expect((await screen.findAllByTestId('orderListRowOutputs'))[1]).toHaveTextContent('DAI');
+    expect((await screen.findAllByTestId('orderListRowTrades'))[0]).toHaveTextContent('0');
+    expect((await screen.findAllByTestId('orderListRowTrades'))[1]).toHaveTextContent('>99');
   });
 });
 

From 5dff173a891060024f10ef0ba4ecd465f2b7d90a Mon Sep 17 00:00:00 2001
From: findolor <anakisci@gmail.com>
Date: Tue, 10 Sep 2024 13:26:29 +0300
Subject: [PATCH 08/11] test: adjust tests

---
 .../tables/OrderTradesListTable.test.ts       | 24 -------
 .../src/lib/services/historicalOrderCharts.ts | 72 -------------------
 2 files changed, 96 deletions(-)

diff --git a/tauri-app/src/lib/components/tables/OrderTradesListTable.test.ts b/tauri-app/src/lib/components/tables/OrderTradesListTable.test.ts
index a316f526d..673e460ff 100644
--- a/tauri-app/src/lib/components/tables/OrderTradesListTable.test.ts
+++ b/tauri-app/src/lib/components/tables/OrderTradesListTable.test.ts
@@ -73,18 +73,6 @@ const mockTakeOrdersList: Trade[] = [
     order: {
       id: 'order_id',
       orderHash: 'orderHash',
-      timestampAdded: '1632000000',
-      orderBytes: '0x123456',
-      owner: '0x1111111111111111111111111111111111111111',
-      outputs: [],
-      inputs: [],
-      active: true,
-      addEvents: [],
-      meta: 'metadata1',
-      orderbook: {
-        id: '0x00',
-      },
-      trades: [],
     },
     inputVaultBalanceChange: {
       vault: {
@@ -155,18 +143,6 @@ const mockTakeOrdersList: Trade[] = [
     order: {
       id: 'order_id',
       orderHash: 'orderHash',
-      timestampAdded: '1632000000',
-      orderBytes: '0x123456',
-      owner: '0x1111111111111111111111111111111111111111',
-      outputs: [],
-      inputs: [],
-      active: true,
-      addEvents: [],
-      meta: 'metadata1',
-      orderbook: {
-        id: '0x00',
-      },
-      trades: [],
     },
     inputVaultBalanceChange: {
       vault: {
diff --git a/tauri-app/src/lib/services/historicalOrderCharts.ts b/tauri-app/src/lib/services/historicalOrderCharts.ts
index 0a1c2a1bb..75d47c1b4 100644
--- a/tauri-app/src/lib/services/historicalOrderCharts.ts
+++ b/tauri-app/src/lib/services/historicalOrderCharts.ts
@@ -99,18 +99,6 @@ if (import.meta.vitest) {
         order: {
           id: 'order_id',
           orderHash: 'orderHash',
-          timestampAdded: '1632000000',
-          orderBytes: '0x123456',
-          owner: '0x1111111111111111111111111111111111111111',
-          outputs: [],
-          inputs: [],
-          active: true,
-          addEvents: [],
-          meta: 'metadata1',
-          orderbook: {
-            id: '0x00',
-          },
-          trades: [],
         },
         inputVaultBalanceChange: {
           vault: {
@@ -181,18 +169,6 @@ if (import.meta.vitest) {
         order: {
           id: 'order_id',
           orderHash: 'orderHash',
-          timestampAdded: '1631000000',
-          orderBytes: '0x123456',
-          owner: '0x1111111111111111111111111111111111111111',
-          outputs: [],
-          inputs: [],
-          active: true,
-          addEvents: [],
-          meta: 'metadata1',
-          orderbook: {
-            id: '0x00',
-          },
-          trades: [],
         },
         inputVaultBalanceChange: {
           vault: {
@@ -263,18 +239,6 @@ if (import.meta.vitest) {
         order: {
           id: 'order_id',
           orderHash: 'orderHash',
-          timestampAdded: '1630000000',
-          orderBytes: '0x123456',
-          owner: '0x1111111111111111111111111111111111111111',
-          outputs: [],
-          inputs: [],
-          active: true,
-          addEvents: [],
-          meta: 'metadata1',
-          orderbook: {
-            id: '0x00',
-          },
-          trades: [],
         },
         inputVaultBalanceChange: {
           vault: {
@@ -365,18 +329,6 @@ if (import.meta.vitest) {
         order: {
           id: 'order_id',
           orderHash: 'orderHash',
-          timestampAdded: '1632000000',
-          orderBytes: '0x123456',
-          owner: '0x1111111111111111111111111111111111111111',
-          outputs: [],
-          inputs: [],
-          active: true,
-          addEvents: [],
-          meta: 'metadata1',
-          orderbook: {
-            id: '0x00',
-          },
-          trades: [],
         },
         inputVaultBalanceChange: {
           vault: {
@@ -447,18 +399,6 @@ if (import.meta.vitest) {
         order: {
           id: 'order_id',
           orderHash: 'orderHash',
-          timestampAdded: '1632000000',
-          orderBytes: '0x123456',
-          owner: '0x1111111111111111111111111111111111111111',
-          outputs: [],
-          inputs: [],
-          active: true,
-          addEvents: [],
-          meta: 'metadata1',
-          orderbook: {
-            id: '0x00',
-          },
-          trades: [],
         },
         inputVaultBalanceChange: {
           vault: {
@@ -529,18 +469,6 @@ if (import.meta.vitest) {
         order: {
           id: 'order_id',
           orderHash: 'orderHash',
-          timestampAdded: '1632000000',
-          orderBytes: '0x123456',
-          owner: '0x1111111111111111111111111111111111111111',
-          outputs: [],
-          inputs: [],
-          active: true,
-          addEvents: [],
-          meta: 'metadata1',
-          orderbook: {
-            id: '0x00',
-          },
-          trades: [],
         },
         inputVaultBalanceChange: {
           vault: {

From 24475aaeb748ccd7a1b64811c4d097b63468e09c Mon Sep 17 00:00:00 2001
From: findolor <anakisci@gmail.com>
Date: Tue, 10 Sep 2024 15:42:10 +0300
Subject: [PATCH 09/11] test: fix test errors

---
 crates/cli/src/commands/order/detail.rs       |   1 +
 crates/cli/src/commands/order/list.rs         |  10 +-
 .../common/src/types/orders_list_flattened.rs |   9 +-
 crates/quote/src/cli/mod.rs                   |   1 +
 crates/quote/src/quote.rs                     |   1 +
 ...er_test__batch_order_query_gql_output.snap |   3 +
 ...er_take_test__vaults_query_gql_output.snap | 236 ------------------
 ...r_takes_test__vaults_query_gql_output.snap | 236 ------------------
 .../order_test__orders_query_gql_output.snap  |   3 +
 .../orders_test__orders_query_gql_output.snap |   3 +
 10 files changed, 29 insertions(+), 474 deletions(-)

diff --git a/crates/cli/src/commands/order/detail.rs b/crates/cli/src/commands/order/detail.rs
index 220eb33a4..77719c3df 100644
--- a/crates/cli/src/commands/order/detail.rs
+++ b/crates/cli/src/commands/order/detail.rs
@@ -136,6 +136,7 @@ mod tests {
                             "from": encode_prefixed(alloy::primitives::Address::random())
                         }
                     }],
+                    "trades": []
                 }
             }
         })
diff --git a/crates/cli/src/commands/order/list.rs b/crates/cli/src/commands/order/list.rs
index 0333508ea..7c202baa8 100644
--- a/crates/cli/src/commands/order/list.rs
+++ b/crates/cli/src/commands/order/list.rs
@@ -8,7 +8,7 @@ use comfy_table::Table;
 use rain_orderbook_common::{
     csv::TryIntoCsv,
     subgraph::SubgraphArgs,
-    types::{FlattenError, OrderFlattened},
+    types::{FlattenError, OrderFlattened, LIST_DELIMITER},
 };
 use tracing::info;
 
@@ -73,6 +73,7 @@ fn build_table(orders: Vec<OrderFlattened>) -> Result<Table> {
             "Owner",
             "Input Tokens",
             "Output Tokens",
+            "Trades",
         ]);
 
     for order in orders.into_iter() {
@@ -83,6 +84,12 @@ fn build_table(orders: Vec<OrderFlattened>) -> Result<Table> {
             order.owner.0,
             order.valid_inputs_token_symbols_display,
             order.valid_outputs_token_symbols_display,
+            order
+                .trades
+                .split(LIST_DELIMITER)
+                .collect::<Vec<&str>>()
+                .len()
+                .to_string(),
         ]);
     }
 
@@ -251,6 +258,7 @@ mod tests {
                             "from": encode_prefixed(alloy::primitives::Address::random())
                         }
                     }],
+                    "trades": []
                 }]
             }
         })
diff --git a/crates/common/src/types/orders_list_flattened.rs b/crates/common/src/types/orders_list_flattened.rs
index 789cd3b3c..3d9cff5fe 100644
--- a/crates/common/src/types/orders_list_flattened.rs
+++ b/crates/common/src/types/orders_list_flattened.rs
@@ -8,7 +8,7 @@ use serde::{Deserialize, Serialize};
 
 use super::FlattenError;
 
-const LIST_DELIMITER: &str = ", ";
+pub const LIST_DELIMITER: &str = ", ";
 
 #[derive(Serialize, Deserialize, Clone, Debug)]
 pub struct OrderFlattened {
@@ -24,6 +24,7 @@ pub struct OrderFlattened {
     pub valid_outputs_vaults: String,
     pub valid_inputs_token_symbols_display: String,
     pub valid_outputs_token_symbols_display: String,
+    pub trades: String,
 }
 
 impl TryFrom<Order> for OrderFlattened {
@@ -66,6 +67,12 @@ impl TryFrom<Order> for OrderFlattened {
                 .map(|vault| vault.token.symbol.unwrap_or(NO_SYMBOL.into()))
                 .collect::<Vec<String>>()
                 .join(LIST_DELIMITER),
+            trades: val
+                .trades
+                .into_iter()
+                .map(|trade| trade.id.0)
+                .collect::<Vec<String>>()
+                .join(LIST_DELIMITER),
         })
     }
 }
diff --git a/crates/quote/src/cli/mod.rs b/crates/quote/src/cli/mod.rs
index eb62fe4b9..71676932b 100644
--- a/crates/quote/src/cli/mod.rs
+++ b/crates/quote/src/cli/mod.rs
@@ -372,6 +372,7 @@ mod tests {
                     }],
                     "meta": null,
                     "timestampAdded": "0",
+                    "trades": []
                 }]
             }
         });
diff --git a/crates/quote/src/quote.rs b/crates/quote/src/quote.rs
index 5d642bd18..4c041ae79 100644
--- a/crates/quote/src/quote.rs
+++ b/crates/quote/src/quote.rs
@@ -408,6 +408,7 @@ mod tests {
             }],
             "meta": null,
             "timestampAdded": "0",
+            "trades": []
         });
         let retrun_sg_data = if batch {
             json!({
diff --git a/crates/subgraph/tests/snapshots/batch_order_test__batch_order_query_gql_output.snap b/crates/subgraph/tests/snapshots/batch_order_test__batch_order_query_gql_output.snap
index 75ccd9a36..37a91776a 100644
--- a/crates/subgraph/tests/snapshots/batch_order_test__batch_order_query_gql_output.snap
+++ b/crates/subgraph/tests/snapshots/batch_order_test__batch_order_query_gql_output.snap
@@ -242,5 +242,8 @@ query BatchOrderDetailQuery($id_list: Order_filter!) {
         timestamp
       }
     }
+    trades {
+      id
+    }
   }
 }
diff --git a/crates/subgraph/tests/snapshots/order_take_test__vaults_query_gql_output.snap b/crates/subgraph/tests/snapshots/order_take_test__vaults_query_gql_output.snap
index 611552e9c..d82c6bb1a 100644
--- a/crates/subgraph/tests/snapshots/order_take_test__vaults_query_gql_output.snap
+++ b/crates/subgraph/tests/snapshots/order_take_test__vaults_query_gql_output.snap
@@ -43,243 +43,7 @@ query OrderTakeDetailQuery($id: ID!) {
     }
     order {
       id
-      orderBytes
       orderHash
-      owner
-      outputs {
-        id
-        owner
-        vaultId
-        balance
-        token {
-          id
-          address
-          name
-          symbol
-          decimals
-        }
-        orderbook {
-          id
-        }
-        ordersAsOutput {
-          id
-          orderHash
-          active
-        }
-        ordersAsInput {
-          id
-          orderHash
-          active
-        }
-        balanceChanges {
-          __typename
-          ... on Withdrawal {
-            id
-            __typename
-            amount
-            newVaultBalance
-            oldVaultBalance
-            vault {
-              id
-              token {
-                id
-                address
-                name
-                symbol
-                decimals
-              }
-            }
-            timestamp
-            transaction {
-              id
-              from
-              blockNumber
-              timestamp
-            }
-            orderbook {
-              id
-            }
-          }
-          ... on TradeVaultBalanceChange {
-            id
-            __typename
-            amount
-            newVaultBalance
-            oldVaultBalance
-            vault {
-              id
-              token {
-                id
-                address
-                name
-                symbol
-                decimals
-              }
-            }
-            timestamp
-            transaction {
-              id
-              from
-              blockNumber
-              timestamp
-            }
-            orderbook {
-              id
-            }
-          }
-          ... on Deposit {
-            id
-            __typename
-            amount
-            newVaultBalance
-            oldVaultBalance
-            vault {
-              id
-              token {
-                id
-                address
-                name
-                symbol
-                decimals
-              }
-            }
-            timestamp
-            transaction {
-              id
-              from
-              blockNumber
-              timestamp
-            }
-            orderbook {
-              id
-            }
-          }
-        }
-      }
-      inputs {
-        id
-        owner
-        vaultId
-        balance
-        token {
-          id
-          address
-          name
-          symbol
-          decimals
-        }
-        orderbook {
-          id
-        }
-        ordersAsOutput {
-          id
-          orderHash
-          active
-        }
-        ordersAsInput {
-          id
-          orderHash
-          active
-        }
-        balanceChanges {
-          __typename
-          ... on Withdrawal {
-            id
-            __typename
-            amount
-            newVaultBalance
-            oldVaultBalance
-            vault {
-              id
-              token {
-                id
-                address
-                name
-                symbol
-                decimals
-              }
-            }
-            timestamp
-            transaction {
-              id
-              from
-              blockNumber
-              timestamp
-            }
-            orderbook {
-              id
-            }
-          }
-          ... on TradeVaultBalanceChange {
-            id
-            __typename
-            amount
-            newVaultBalance
-            oldVaultBalance
-            vault {
-              id
-              token {
-                id
-                address
-                name
-                symbol
-                decimals
-              }
-            }
-            timestamp
-            transaction {
-              id
-              from
-              blockNumber
-              timestamp
-            }
-            orderbook {
-              id
-            }
-          }
-          ... on Deposit {
-            id
-            __typename
-            amount
-            newVaultBalance
-            oldVaultBalance
-            vault {
-              id
-              token {
-                id
-                address
-                name
-                symbol
-                decimals
-              }
-            }
-            timestamp
-            transaction {
-              id
-              from
-              blockNumber
-              timestamp
-            }
-            orderbook {
-              id
-            }
-          }
-        }
-      }
-      orderbook {
-        id
-      }
-      active
-      timestampAdded
-      meta
-      addEvents {
-        transaction {
-          id
-          from
-          blockNumber
-          timestamp
-        }
-      }
     }
     inputVaultBalanceChange {
       id
diff --git a/crates/subgraph/tests/snapshots/order_takes_test__vaults_query_gql_output.snap b/crates/subgraph/tests/snapshots/order_takes_test__vaults_query_gql_output.snap
index 90c32d10d..986db96a7 100644
--- a/crates/subgraph/tests/snapshots/order_takes_test__vaults_query_gql_output.snap
+++ b/crates/subgraph/tests/snapshots/order_takes_test__vaults_query_gql_output.snap
@@ -43,243 +43,7 @@ query OrderTakesListQuery($first: Int, $id: Bytes!, $skip: Int) {
     }
     order {
       id
-      orderBytes
       orderHash
-      owner
-      outputs {
-        id
-        owner
-        vaultId
-        balance
-        token {
-          id
-          address
-          name
-          symbol
-          decimals
-        }
-        orderbook {
-          id
-        }
-        ordersAsOutput {
-          id
-          orderHash
-          active
-        }
-        ordersAsInput {
-          id
-          orderHash
-          active
-        }
-        balanceChanges {
-          __typename
-          ... on Withdrawal {
-            id
-            __typename
-            amount
-            newVaultBalance
-            oldVaultBalance
-            vault {
-              id
-              token {
-                id
-                address
-                name
-                symbol
-                decimals
-              }
-            }
-            timestamp
-            transaction {
-              id
-              from
-              blockNumber
-              timestamp
-            }
-            orderbook {
-              id
-            }
-          }
-          ... on TradeVaultBalanceChange {
-            id
-            __typename
-            amount
-            newVaultBalance
-            oldVaultBalance
-            vault {
-              id
-              token {
-                id
-                address
-                name
-                symbol
-                decimals
-              }
-            }
-            timestamp
-            transaction {
-              id
-              from
-              blockNumber
-              timestamp
-            }
-            orderbook {
-              id
-            }
-          }
-          ... on Deposit {
-            id
-            __typename
-            amount
-            newVaultBalance
-            oldVaultBalance
-            vault {
-              id
-              token {
-                id
-                address
-                name
-                symbol
-                decimals
-              }
-            }
-            timestamp
-            transaction {
-              id
-              from
-              blockNumber
-              timestamp
-            }
-            orderbook {
-              id
-            }
-          }
-        }
-      }
-      inputs {
-        id
-        owner
-        vaultId
-        balance
-        token {
-          id
-          address
-          name
-          symbol
-          decimals
-        }
-        orderbook {
-          id
-        }
-        ordersAsOutput {
-          id
-          orderHash
-          active
-        }
-        ordersAsInput {
-          id
-          orderHash
-          active
-        }
-        balanceChanges {
-          __typename
-          ... on Withdrawal {
-            id
-            __typename
-            amount
-            newVaultBalance
-            oldVaultBalance
-            vault {
-              id
-              token {
-                id
-                address
-                name
-                symbol
-                decimals
-              }
-            }
-            timestamp
-            transaction {
-              id
-              from
-              blockNumber
-              timestamp
-            }
-            orderbook {
-              id
-            }
-          }
-          ... on TradeVaultBalanceChange {
-            id
-            __typename
-            amount
-            newVaultBalance
-            oldVaultBalance
-            vault {
-              id
-              token {
-                id
-                address
-                name
-                symbol
-                decimals
-              }
-            }
-            timestamp
-            transaction {
-              id
-              from
-              blockNumber
-              timestamp
-            }
-            orderbook {
-              id
-            }
-          }
-          ... on Deposit {
-            id
-            __typename
-            amount
-            newVaultBalance
-            oldVaultBalance
-            vault {
-              id
-              token {
-                id
-                address
-                name
-                symbol
-                decimals
-              }
-            }
-            timestamp
-            transaction {
-              id
-              from
-              blockNumber
-              timestamp
-            }
-            orderbook {
-              id
-            }
-          }
-        }
-      }
-      orderbook {
-        id
-      }
-      active
-      timestampAdded
-      meta
-      addEvents {
-        transaction {
-          id
-          from
-          blockNumber
-          timestamp
-        }
-      }
     }
     inputVaultBalanceChange {
       id
diff --git a/crates/subgraph/tests/snapshots/order_test__orders_query_gql_output.snap b/crates/subgraph/tests/snapshots/order_test__orders_query_gql_output.snap
index 14bfc02d7..45e878e8d 100644
--- a/crates/subgraph/tests/snapshots/order_test__orders_query_gql_output.snap
+++ b/crates/subgraph/tests/snapshots/order_test__orders_query_gql_output.snap
@@ -242,5 +242,8 @@ query OrderDetailQuery($id: ID!) {
         timestamp
       }
     }
+    trades {
+      id
+    }
   }
 }
diff --git a/crates/subgraph/tests/snapshots/orders_test__orders_query_gql_output.snap b/crates/subgraph/tests/snapshots/orders_test__orders_query_gql_output.snap
index 80caa4527..7a089004d 100644
--- a/crates/subgraph/tests/snapshots/orders_test__orders_query_gql_output.snap
+++ b/crates/subgraph/tests/snapshots/orders_test__orders_query_gql_output.snap
@@ -242,5 +242,8 @@ query OrdersListQuery($first: Int, $skip: Int, $filters: Order_filter) {
         timestamp
       }
     }
+    trades {
+      id
+    }
   }
 }

From 970af3c99043e0ac4e59812a6fd67770a74e64c7 Mon Sep 17 00:00:00 2001
From: findolor <anakisci@gmail.com>
Date: Tue, 10 Sep 2024 15:44:13 +0300
Subject: [PATCH 10/11] test: update js test

---
 test-js/quote/test.test.ts | 64 ++++++++++++++++++--------------------
 1 file changed, 31 insertions(+), 33 deletions(-)

diff --git a/test-js/quote/test.test.ts b/test-js/quote/test.test.ts
index 921a76da7..3ab03fd84 100644
--- a/test-js/quote/test.test.ts
+++ b/test-js/quote/test.test.ts
@@ -1,6 +1,6 @@
-import assert from "assert";
-import { getLocal } from "mockttp";
-import { describe, it, beforeEach, afterEach } from "vitest";
+import assert from "assert"
+import { getLocal } from "mockttp"
+import { describe, it, beforeEach, afterEach } from "vitest"
 import {
   getId,
   QuoteSpec,
@@ -8,22 +8,22 @@ import {
   doQuoteTargets,
   OrderQuoteValue,
   getQuoteTargetFromSubgraph,
-} from "../../dist/cjs/quote";
+} from "../../dist/cjs/quote"
 
 describe("Rain Orderbook Quote Package Bindgen Tests", async function () {
-  const mockServer = getLocal();
-  beforeEach(() => mockServer.start(8081));
-  afterEach(() => mockServer.stop());
+  const mockServer = getLocal()
+  beforeEach(() => mockServer.start(8081))
+  afterEach(() => mockServer.stop())
 
   it("should get correct id", async () => {
-    const orderbook = "0xF14E09601A47552De6aBd3A0B165607FaFd2B5Ba";
+    const orderbook = "0xF14E09601A47552De6aBd3A0B165607FaFd2B5Ba"
     const orderHash =
-      "0xf4058d50e798f18a048097265fe67fe2e8619f337b9377a7620bb87fc2f52721";
-    const result = getId(orderbook, orderHash);
+      "0xf4058d50e798f18a048097265fe67fe2e8619f337b9377a7620bb87fc2f52721"
+    const result = getId(orderbook, orderHash)
     const expected =
-      "0xca228cb816102ef9f8e0f9a87bb34e06c49c4d4ddf5a2a0ec229ab671475c235";
-    assert.equal(result, expected);
-  });
+      "0xca228cb816102ef9f8e0f9a87bb34e06c49c4d4ddf5a2a0ec229ab671475c235"
+    assert.equal(result, expected)
+  })
 
   it("should get correct quote targets from subgraph", async () => {
     await mockServer.forPost("/sg-url").thenReply(
@@ -96,11 +96,12 @@ describe("Rain Orderbook Quote Package Bindgen Tests", async function () {
               orderbook: {
                 id: "0x0000000000000000000000000000000000000000",
               },
+              trades: [],
             },
           ],
         },
       })
-    );
+    )
 
     const quoteSpec: QuoteSpec = {
       orderbook: "0x713180d188e1ff758f508d9f2e1d350d650fea5e",
@@ -109,12 +110,12 @@ describe("Rain Orderbook Quote Package Bindgen Tests", async function () {
       outputIOIndex: 0,
       inputIOIndex: 0,
       signedContext: [],
-    };
+    }
     try {
       const result = await getQuoteTargetFromSubgraph(
         [quoteSpec],
         mockServer.url + "/sg-url"
-      );
+      )
       const expected: QuoteTarget = {
         quoteConfig: {
           order: {
@@ -148,20 +149,20 @@ describe("Rain Orderbook Quote Package Bindgen Tests", async function () {
           signedContext: [],
         },
         orderbook: "0x713180d188e1ff758f508d9f2e1d350d650fea5e",
-      };
-      assert.deepEqual(result[0], expected);
+      }
+      assert.deepEqual(result[0], expected)
     } catch (error) {
-      console.log(error);
-      assert.fail("expected to resolve, but failed");
+      console.log(error)
+      assert.fail("expected to resolve, but failed")
     }
-  });
+  })
 
   it("should quote targets", async () => {
     await mockServer
       .forPost("/rpc-url")
       .thenSendJsonRpcResult(
         "0x000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002"
-      );
+      )
     const target: QuoteTarget = {
       orderbook: "0xc6768d9e1cdd2f2058c92185364a3a5d2e1e47de",
       quoteConfig: {
@@ -195,22 +196,19 @@ describe("Rain Orderbook Quote Package Bindgen Tests", async function () {
         outputIOIndex: 0,
         signedContext: [],
       },
-    };
+    }
     try {
-      const result = await doQuoteTargets(
-        [target],
-        mockServer.url + "/rpc-url"
-      );
+      const result = await doQuoteTargets([target], mockServer.url + "/rpc-url")
       const expected: OrderQuoteValue = {
         maxOutput:
           "0x0000000000000000000000000000000000000000000000000000000000000001",
         ratio:
           "0x0000000000000000000000000000000000000000000000000000000000000002",
-      };
-      assert.deepEqual(result[0], expected);
+      }
+      assert.deepEqual(result[0], expected)
     } catch (error) {
-      console.log(error);
-      assert.fail("expected to resolve, but failed");
+      console.log(error)
+      assert.fail("expected to resolve, but failed")
     }
-  });
-});
+  })
+})

From 577d79bc0c4c693c8d850ce34a18a9f7aca4cae0 Mon Sep 17 00:00:00 2001
From: findolor <anakisci@gmail.com>
Date: Tue, 10 Sep 2024 16:42:02 +0300
Subject: [PATCH 11/11] test: fix test

---
 tauri-app/src/lib/components/modal/ModalQuoteDebug.test.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tauri-app/src/lib/components/modal/ModalQuoteDebug.test.ts b/tauri-app/src/lib/components/modal/ModalQuoteDebug.test.ts
index df9febd45..1a5e628cc 100644
--- a/tauri-app/src/lib/components/modal/ModalQuoteDebug.test.ts
+++ b/tauri-app/src/lib/components/modal/ModalQuoteDebug.test.ts
@@ -31,6 +31,7 @@ test('renders table with the correct data', async () => {
         active: true,
         addEvents: [],
         timestampAdded: '123',
+        trades: [],
       },
       rpcUrl: 'https://rpc-url.com',
       inputIOIndex: 0,