From 6ca6fa59ed3975333b80854f85199f1af262f3e0 Mon Sep 17 00:00:00 2001
From: Jamie Harding <jharding142@icloud.com>
Date: Thu, 19 Dec 2024 10:31:33 +0100
Subject: [PATCH 1/9] add optional field

---
 crates/subgraph/src/types/common.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/subgraph/src/types/common.rs b/crates/subgraph/src/types/common.rs
index b585a4fe2..5f4887983 100644
--- a/crates/subgraph/src/types/common.rs
+++ b/crates/subgraph/src/types/common.rs
@@ -348,7 +348,7 @@ pub struct Erc20 {
     pub address: Bytes,
     pub name: Option<String>,
     pub symbol: Option<String>,
-    #[cfg_attr(target_family = "wasm", tsify(type = "SgBigInt"))]
+    #[cfg_attr(target_family = "wasm", tsify(type = "SgBigInt | undefined"))]
     pub decimals: Option<BigInt>,
 }
 

From 0983c4e866f9884fe2b4baace603d02ae4778c1e Mon Sep 17 00:00:00 2001
From: Jamie Harding <jharding142@icloud.com>
Date: Thu, 19 Dec 2024 14:05:38 +0100
Subject: [PATCH 2/9] fix types

---
 crates/subgraph/src/types/common.rs                          | 5 +++++
 packages/ui-components/src/__tests__/ButtonVaultLink.test.ts | 2 +-
 .../ui-components/src/__tests__/OrderTradesListTable.test.ts | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/crates/subgraph/src/types/common.rs b/crates/subgraph/src/types/common.rs
index 5f4887983..5fa295091 100644
--- a/crates/subgraph/src/types/common.rs
+++ b/crates/subgraph/src/types/common.rs
@@ -203,6 +203,7 @@ pub struct VaultBalanceChangeVault {
 #[typeshare]
 #[serde(rename_all = "camelCase")]
 pub struct VaultBalanceChangeUnwrapped {
+    #[serde(rename(serialize = "__typename"))]
     pub __typename: String,
     pub amount: BigInt,
     pub new_vault_balance: BigInt,
@@ -233,6 +234,7 @@ pub enum VaultBalanceChange {
 #[serde(rename_all = "camelCase")]
 pub struct Deposit {
     pub id: Bytes,
+    #[serde(rename(serialize = "__typename"))]
     pub __typename: String,
     #[cfg_attr(target_family = "wasm", tsify(type = "SgBigInt"))]
     pub amount: BigInt,
@@ -253,6 +255,7 @@ pub struct Deposit {
 #[serde(rename_all = "camelCase")]
 pub struct Withdrawal {
     pub id: Bytes,
+    #[serde(rename(serialize = "__typename"))]
     pub __typename: String,
     #[cfg_attr(target_family = "wasm", tsify(type = "SgBigInt"))]
     pub amount: BigInt,
@@ -273,6 +276,7 @@ pub struct Withdrawal {
 #[serde(rename_all = "camelCase")]
 pub struct TradeVaultBalanceChange {
     pub id: Bytes,
+    #[serde(rename(serialize = "__typename"))]
     pub __typename: String,
     #[cfg_attr(target_family = "wasm", tsify(type = "SgBigInt"))]
     pub amount: BigInt,
@@ -293,6 +297,7 @@ pub struct TradeVaultBalanceChange {
 #[serde(rename_all = "camelCase")]
 pub struct ClearBounty {
     pub id: Bytes,
+    #[serde(rename(serialize = "__typename"))]
     pub __typename: String,
     #[cfg_attr(target_family = "wasm", tsify(type = "SgBigInt"))]
     pub amount: BigInt,
diff --git a/packages/ui-components/src/__tests__/ButtonVaultLink.test.ts b/packages/ui-components/src/__tests__/ButtonVaultLink.test.ts
index 3078e7668..3e2f21ff4 100644
--- a/packages/ui-components/src/__tests__/ButtonVaultLink.test.ts
+++ b/packages/ui-components/src/__tests__/ButtonVaultLink.test.ts
@@ -3,7 +3,7 @@ import { render, screen } from '@testing-library/svelte';
 import ButtonVaultLink from '../lib/components/ButtonVaultLink.svelte';
 import * as navigation from '$app/navigation';
 import { userEvent } from '@testing-library/user-event';
-import type { Vault } from '../lib/typeshare/subgraphTypes';
+import type { Vault } from '@rainlanguage/orderbook/js_api';
 
 // Mock the $app/navigation module
 vi.mock('$app/navigation', () => ({
diff --git a/packages/ui-components/src/__tests__/OrderTradesListTable.test.ts b/packages/ui-components/src/__tests__/OrderTradesListTable.test.ts
index d7d74f33c..fb724daf8 100644
--- a/packages/ui-components/src/__tests__/OrderTradesListTable.test.ts
+++ b/packages/ui-components/src/__tests__/OrderTradesListTable.test.ts
@@ -2,7 +2,7 @@ import { render, screen, waitFor } from '@testing-library/svelte';
 import { test, vi, type Mock } from 'vitest';
 import { expect } from '../lib/test/matchers';
 import { mockIPC } from '@tauri-apps/api/mocks';
-import type { Trade } from '../lib/typeshare/subgraphTypes';
+import type { Trade } from '@rainlanguage/orderbook/js_api';
 import { formatUnits } from 'viem';
 import OrderTradesListTable from '../lib/components/tables/OrderTradesListTable.svelte';
 import { QueryClient } from '@tanstack/svelte-query';

From 97dce1b993ad380538c7d3fb07900fd6e1acc1b7 Mon Sep 17 00:00:00 2001
From: Jamie Harding <jharding142@icloud.com>
Date: Thu, 19 Dec 2024 14:12:39 +0100
Subject: [PATCH 3/9] remove types

---
 .../ui-components/src/__tests__/OrderVaultsVolTable.test.ts     | 2 +-
 packages/ui-components/src/lib/__fixtures__/orderDetail.ts      | 2 +-
 .../ui-components/src/lib/components/ButtonVaultLink.svelte     | 2 +-
 .../src/lib/components/tables/OrderTradesListTable.svelte       | 2 +-
 .../src/lib/components/tables/OrderVaultsVolTable.svelte        | 2 +-
 .../src/lib/components/tables/VaultsListTable.svelte            | 2 +-
 packages/ui-components/src/lib/index.ts                         | 1 -
 .../ui-components/src/lib/services/historicalOrderCharts.ts     | 2 +-
 packages/ui-components/src/lib/utils/vault.ts                   | 2 +-
 9 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/packages/ui-components/src/__tests__/OrderVaultsVolTable.test.ts b/packages/ui-components/src/__tests__/OrderVaultsVolTable.test.ts
index 3ce9a0df9..66310f2dd 100644
--- a/packages/ui-components/src/__tests__/OrderVaultsVolTable.test.ts
+++ b/packages/ui-components/src/__tests__/OrderVaultsVolTable.test.ts
@@ -1,7 +1,7 @@
 import { render, screen, waitFor } from '@testing-library/svelte';
 import { test, vi } from 'vitest';
 import { expect } from '$lib/test/matchers';
-import type { VaultVolume } from '$lib/typeshare/subgraphTypes';
+import type { VaultVolume } from '@rainlanguage/orderbook/js_api';
 import { formatUnits } from 'viem';
 import OrderVaultsVolTable from '../lib/components/tables/OrderVaultsVolTable.svelte';
 import { QueryClient } from '@tanstack/svelte-query';
diff --git a/packages/ui-components/src/lib/__fixtures__/orderDetail.ts b/packages/ui-components/src/lib/__fixtures__/orderDetail.ts
index e432861dd..83d3909f1 100644
--- a/packages/ui-components/src/lib/__fixtures__/orderDetail.ts
+++ b/packages/ui-components/src/lib/__fixtures__/orderDetail.ts
@@ -1,4 +1,4 @@
-import type { OrderDetailExtended } from '../typeshare/subgraphTypes';
+import type { OrderDetailExtended } from '@rainlanguage/orderbook/js_api';
 
 export const mockOrderDetailsExtended: OrderDetailExtended = {
 	order: {
diff --git a/packages/ui-components/src/lib/components/ButtonVaultLink.svelte b/packages/ui-components/src/lib/components/ButtonVaultLink.svelte
index 81293ed34..f174b2b03 100644
--- a/packages/ui-components/src/lib/components/ButtonVaultLink.svelte
+++ b/packages/ui-components/src/lib/components/ButtonVaultLink.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { goto } from '$app/navigation';
-	import type { Vault } from '../typeshare/subgraphTypes';
+	import type { Vault } from '@rainlanguage/orderbook/js_api';
 	import { bigintStringToHex } from '../utils/hex';
 	import { Tooltip } from 'flowbite-svelte';
 	import { formatUnits } from 'viem';
diff --git a/packages/ui-components/src/lib/components/tables/OrderTradesListTable.svelte b/packages/ui-components/src/lib/components/tables/OrderTradesListTable.svelte
index 88050b2cd..04d58d0a4 100644
--- a/packages/ui-components/src/lib/components/tables/OrderTradesListTable.svelte
+++ b/packages/ui-components/src/lib/components/tables/OrderTradesListTable.svelte
@@ -9,7 +9,7 @@
 	import Hash, { HashType } from '../Hash.svelte';
 	import { formatUnits } from 'viem';
 	import { BugOutline } from 'flowbite-svelte-icons';
-	import type { Trade } from '../../typeshare/subgraphTypes';
+	import type { Trade } from '@rainlanguage/orderbook/js_api';
 	import TableTimeFilters from '../charts/TableTimeFilters.svelte';
 
 	export let id: string;
diff --git a/packages/ui-components/src/lib/components/tables/OrderVaultsVolTable.svelte b/packages/ui-components/src/lib/components/tables/OrderVaultsVolTable.svelte
index c261ebec2..d5ab79929 100644
--- a/packages/ui-components/src/lib/components/tables/OrderVaultsVolTable.svelte
+++ b/packages/ui-components/src/lib/components/tables/OrderVaultsVolTable.svelte
@@ -8,7 +8,7 @@
 	import { formatUnits } from 'viem';
 	import TableTimeFilters from '../charts/TableTimeFilters.svelte';
 	import { bigintStringToHex } from '../../utils/hex';
-	import type { VaultVolume } from '$lib/typeshare/subgraphTypes';
+	import type { VaultVolume } from '@rainlanguage/orderbook/js_api';
 
 	export let id: string;
 	export let subgraphUrl: string;
diff --git a/packages/ui-components/src/lib/components/tables/VaultsListTable.svelte b/packages/ui-components/src/lib/components/tables/VaultsListTable.svelte
index 826da0b38..28c8d7a3a 100644
--- a/packages/ui-components/src/lib/components/tables/VaultsListTable.svelte
+++ b/packages/ui-components/src/lib/components/tables/VaultsListTable.svelte
@@ -10,7 +10,7 @@
 	import { vaultBalanceDisplay } from '../../utils/vault';
 	import { bigintStringToHex } from '../../utils/hex';
 	import { type ConfigSource, type OrderbookConfigSource } from '../../typeshare/config';
-	import { type Vault } from '../../typeshare/subgraphTypes';
+	import { type Vault } from '@rainlanguage/orderbook/js_api';
 	import { QKEY_VAULTS } from '../../queries/keys';
 	import {
 		getVaults,
diff --git a/packages/ui-components/src/lib/index.ts b/packages/ui-components/src/lib/index.ts
index 57049d381..d21218770 100644
--- a/packages/ui-components/src/lib/index.ts
+++ b/packages/ui-components/src/lib/index.ts
@@ -50,7 +50,6 @@ export { default as IconWarning } from './components/IconWarning.svelte';
 //Types
 export type { AppStoresInterface } from './types/appStores.ts';
 export type { ConfigSource, OrderbookConfigSource, OrderbookRef } from './typeshare/config';
-export type { Vault } from './typeshare/subgraphTypes';
 
 // Functions
 export { createResolvableQuery, createResolvableInfiniteQuery } from './__mocks__/queries';
diff --git a/packages/ui-components/src/lib/services/historicalOrderCharts.ts b/packages/ui-components/src/lib/services/historicalOrderCharts.ts
index e48f85628..335b7412d 100644
--- a/packages/ui-components/src/lib/services/historicalOrderCharts.ts
+++ b/packages/ui-components/src/lib/services/historicalOrderCharts.ts
@@ -1,4 +1,4 @@
-import type { Trade } from '../typeshare/subgraphTypes';
+import type { Trade } from '@rainlanguage/orderbook/js_api';
 import type { UTCTimestamp } from 'lightweight-charts';
 import { timestampSecondsToUTCTimestamp } from '../utils/time';
 import { sortBy } from 'lodash';
diff --git a/packages/ui-components/src/lib/utils/vault.ts b/packages/ui-components/src/lib/utils/vault.ts
index eeca23aab..19e4419c8 100644
--- a/packages/ui-components/src/lib/utils/vault.ts
+++ b/packages/ui-components/src/lib/utils/vault.ts
@@ -1,4 +1,4 @@
-import type { Vault } from '../typeshare/subgraphTypes';
+import type { Vault } from '@rainlanguage/orderbook/js_api';
 import { formatUnits } from 'viem';
 
 export const vaultBalanceDisplay = (vault: Vault) => {

From d45a64db971e950b67da1c53132549b95e3c2802 Mon Sep 17 00:00:00 2001
From: Jamie Harding <jharding142@icloud.com>
Date: Thu, 19 Dec 2024 14:51:02 +0100
Subject: [PATCH 4/9] replace types

---
 crates/subgraph/src/types/common.rs                       | 8 ++++++++
 .../ui-components/src/lib/__fixtures__/orderDetail.ts     | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/crates/subgraph/src/types/common.rs b/crates/subgraph/src/types/common.rs
index 5fa295091..ce109adb8 100644
--- a/crates/subgraph/src/types/common.rs
+++ b/crates/subgraph/src/types/common.rs
@@ -107,6 +107,14 @@ pub struct OrderWithSubgraphName {
     pub subgraph_name: String,
 }
 
+#[derive(Debug, Serialize, Deserialize, Clone)]
+#[cfg_attr(target_family = "wasm", derive(Tsify))]
+#[typeshare]
+pub struct OrderDetailExtended {
+    pub order: Order,
+    pub rainlang: Option<String>,
+}
+
 #[derive(cynic::QueryFragment, Debug, Serialize, Clone)]
 #[cfg_attr(target_family = "wasm", derive(Tsify))]
 #[cynic(graphql_type = "Order")]
diff --git a/packages/ui-components/src/lib/__fixtures__/orderDetail.ts b/packages/ui-components/src/lib/__fixtures__/orderDetail.ts
index 83d3909f1..cae742c85 100644
--- a/packages/ui-components/src/lib/__fixtures__/orderDetail.ts
+++ b/packages/ui-components/src/lib/__fixtures__/orderDetail.ts
@@ -63,7 +63,7 @@ export const mockOrderDetailsExtended: OrderDetailExtended = {
 		trades: []
 	},
 	rainlang: 'rainlang1'
-};
+} as unknown as OrderDetailExtended;
 
 export const mockOrder = {
 	id: '0x9229dadc45c673afcbc393231d5ab0e15bb65719daa5d58bd85adfca3fd60d48',

From 50c9c4b7a8b63a1b4df795c447487bd23f70b79e Mon Sep 17 00:00:00 2001
From: Jamie Harding <jharding142@icloud.com>
Date: Thu, 19 Dec 2024 15:06:59 +0100
Subject: [PATCH 5/9] update all types

---
 crates/subgraph/src/types/common.rs           | 19 +++++++++++++++
 .../__tests__/OrderTradesListTable.test.ts    |  8 +++----
 .../src/lib/services/historicalOrderCharts.ts | 24 +++++++++----------
 packages/ui-components/src/lib/utils/vault.ts |  2 +-
 4 files changed, 36 insertions(+), 17 deletions(-)

diff --git a/crates/subgraph/src/types/common.rs b/crates/subgraph/src/types/common.rs
index ce109adb8..7b03027bf 100644
--- a/crates/subgraph/src/types/common.rs
+++ b/crates/subgraph/src/types/common.rs
@@ -1,4 +1,5 @@
 use crate::schema;
+use alloy::primitives::{I256, U256};
 #[cfg(target_family = "wasm")]
 use rain_orderbook_bindings::{impl_all_wasm_traits, wasm_traits::prelude::*};
 use serde::{Deserialize, Serialize};
@@ -195,6 +196,23 @@ pub struct VaultWithSubgraphName {
     pub subgraph_name: String,
 }
 
+#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
+#[cfg_attr(target_family = "wasm", derive(Tsify))]
+#[serde(rename_all = "camelCase")]
+#[typeshare]
+pub struct VaultVolume {
+    id: String,
+    token: Erc20,
+    #[cfg_attr(target_family = "wasm", tsify(type = "string"))]
+    total_in: U256,
+    #[cfg_attr(target_family = "wasm", tsify(type = "string"))]
+    total_out: U256,
+    #[cfg_attr(target_family = "wasm", tsify(type = "string"))]
+    total_vol: U256,
+    #[cfg_attr(target_family = "wasm", tsify(type = "string"))]
+    net_vol: I256,
+}
+
 #[derive(cynic::QueryFragment, Debug, Clone, Serialize)]
 #[cfg_attr(target_family = "wasm", derive(Tsify))]
 #[cynic(graphql_type = "Vault")]
@@ -590,6 +608,7 @@ mod impls {
     impl_all_wasm_traits!(OrderAsIO);
     impl_all_wasm_traits!(VaultBalanceChangeVault);
     impl_all_wasm_traits!(VaultBalanceChange);
+    impl_all_wasm_traits!(VaultVolume);
     impl_all_wasm_traits!(Withdrawal);
     impl_all_wasm_traits!(TradeVaultBalanceChange);
     impl_all_wasm_traits!(Deposit);
diff --git a/packages/ui-components/src/__tests__/OrderTradesListTable.test.ts b/packages/ui-components/src/__tests__/OrderTradesListTable.test.ts
index fb724daf8..0dcb13190 100644
--- a/packages/ui-components/src/__tests__/OrderTradesListTable.test.ts
+++ b/packages/ui-components/src/__tests__/OrderTradesListTable.test.ts
@@ -34,7 +34,7 @@ const mockTradeOrdersList: Trade[] = [
 				}
 			},
 			id: '1',
-			typename: 'Withdraw',
+			__typename: 'Withdraw',
 			newVaultBalance: '0',
 			oldVaultBalance: '0',
 			timestamp: '0',
@@ -64,7 +64,7 @@ const mockTradeOrdersList: Trade[] = [
 			},
 			amount: '50',
 			id: '1',
-			typename: 'Withdraw',
+			__typename: 'Withdraw',
 			newVaultBalance: '0',
 			oldVaultBalance: '0',
 			timestamp: '0',
@@ -106,7 +106,7 @@ const mockTradeOrdersList: Trade[] = [
 				}
 			},
 			id: '1',
-			typename: 'Withdraw',
+			__typename: 'Withdraw',
 			newVaultBalance: '0',
 			oldVaultBalance: '0',
 			timestamp: '0',
@@ -136,7 +136,7 @@ const mockTradeOrdersList: Trade[] = [
 			},
 			amount: '50',
 			id: '1',
-			typename: 'Withdraw',
+			__typename: 'Withdraw',
 			newVaultBalance: '0',
 			oldVaultBalance: '0',
 			timestamp: '0',
diff --git a/packages/ui-components/src/lib/services/historicalOrderCharts.ts b/packages/ui-components/src/lib/services/historicalOrderCharts.ts
index 335b7412d..d192974e0 100644
--- a/packages/ui-components/src/lib/services/historicalOrderCharts.ts
+++ b/packages/ui-components/src/lib/services/historicalOrderCharts.ts
@@ -85,7 +85,7 @@ if (import.meta.vitest) {
 						}
 					},
 					id: '1',
-					typename: 'Withdraw',
+					__typename: 'Withdraw',
 					newVaultBalance: '0',
 					oldVaultBalance: '0',
 					timestamp: '0',
@@ -115,7 +115,7 @@ if (import.meta.vitest) {
 					},
 					amount: '50',
 					id: '1',
-					typename: 'Withdraw',
+					__typename: 'Withdraw',
 					newVaultBalance: '0',
 					oldVaultBalance: '0',
 					timestamp: '0',
@@ -157,7 +157,7 @@ if (import.meta.vitest) {
 						}
 					},
 					id: '1',
-					typename: 'Withdraw',
+					__typename: 'Withdraw',
 					newVaultBalance: '0',
 					oldVaultBalance: '0',
 					timestamp: '0',
@@ -187,7 +187,7 @@ if (import.meta.vitest) {
 					},
 					amount: '50',
 					id: '1',
-					typename: 'Withdraw',
+					__typename: 'Withdraw',
 					newVaultBalance: '0',
 					oldVaultBalance: '0',
 					timestamp: '0',
@@ -229,7 +229,7 @@ if (import.meta.vitest) {
 						}
 					},
 					id: '1',
-					typename: 'Withdraw',
+					__typename: 'Withdraw',
 					newVaultBalance: '0',
 					oldVaultBalance: '0',
 					timestamp: '0',
@@ -259,7 +259,7 @@ if (import.meta.vitest) {
 					},
 					amount: '50',
 					id: '1',
-					typename: 'Withdraw',
+					__typename: 'Withdraw',
 					newVaultBalance: '0',
 					oldVaultBalance: '0',
 					timestamp: '0',
@@ -321,7 +321,7 @@ if (import.meta.vitest) {
 						}
 					},
 					id: '1',
-					typename: 'Withdraw',
+					__typename: 'Withdraw',
 					newVaultBalance: '0',
 					oldVaultBalance: '0',
 					timestamp: '0',
@@ -351,7 +351,7 @@ if (import.meta.vitest) {
 					},
 					amount: '50',
 					id: '1',
-					typename: 'Withdraw',
+					__typename: 'Withdraw',
 					newVaultBalance: '0',
 					oldVaultBalance: '0',
 					timestamp: '0',
@@ -393,7 +393,7 @@ if (import.meta.vitest) {
 						}
 					},
 					id: '1',
-					typename: 'Withdraw',
+					__typename: 'Withdraw',
 					newVaultBalance: '0',
 					oldVaultBalance: '0',
 					timestamp: '0',
@@ -423,7 +423,7 @@ if (import.meta.vitest) {
 					},
 					amount: '50',
 					id: '1',
-					typename: 'Withdraw',
+					__typename: 'Withdraw',
 					newVaultBalance: '0',
 					oldVaultBalance: '0',
 					timestamp: '0',
@@ -465,7 +465,7 @@ if (import.meta.vitest) {
 						}
 					},
 					id: '1',
-					typename: 'Withdraw',
+					__typename: 'Withdraw',
 					newVaultBalance: '0',
 					oldVaultBalance: '0',
 					timestamp: '0',
@@ -495,7 +495,7 @@ if (import.meta.vitest) {
 					},
 					amount: '50',
 					id: '1',
-					typename: 'Withdraw',
+					__typename: 'Withdraw',
 					newVaultBalance: '0',
 					oldVaultBalance: '0',
 					timestamp: '0',
diff --git a/packages/ui-components/src/lib/utils/vault.ts b/packages/ui-components/src/lib/utils/vault.ts
index 19e4419c8..1831a407a 100644
--- a/packages/ui-components/src/lib/utils/vault.ts
+++ b/packages/ui-components/src/lib/utils/vault.ts
@@ -25,7 +25,7 @@ if (import.meta.vitest) {
 			orderbook: {
 				id: '0x00'
 			}
-		} as Vault;
+		} as unknown as Vault;
 
 		expect(vaultBalanceDisplay(vault)).toEqual('1');
 

From df41f332612463705f5456e4ecf0d5bf3b2efd9f Mon Sep 17 00:00:00 2001
From: Jamie Harding <jharding142@icloud.com>
Date: Thu, 19 Dec 2024 15:41:20 +0100
Subject: [PATCH 6/9] switch type name

---
 crates/subgraph/src/types/common.rs      | 12 +++++++-----
 tauri-app/src/routes/vaults/+page.svelte |  1 -
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/crates/subgraph/src/types/common.rs b/crates/subgraph/src/types/common.rs
index 7b03027bf..8b23d39a6 100644
--- a/crates/subgraph/src/types/common.rs
+++ b/crates/subgraph/src/types/common.rs
@@ -229,7 +229,7 @@ pub struct VaultBalanceChangeVault {
 #[typeshare]
 #[serde(rename_all = "camelCase")]
 pub struct VaultBalanceChangeUnwrapped {
-    #[serde(rename(serialize = "__typename"))]
+    #[serde(rename = "__typename")]
     pub __typename: String,
     pub amount: BigInt,
     pub new_vault_balance: BigInt,
@@ -260,7 +260,7 @@ pub enum VaultBalanceChange {
 #[serde(rename_all = "camelCase")]
 pub struct Deposit {
     pub id: Bytes,
-    #[serde(rename(serialize = "__typename"))]
+    #[serde(rename = "__typename")]
     pub __typename: String,
     #[cfg_attr(target_family = "wasm", tsify(type = "SgBigInt"))]
     pub amount: BigInt,
@@ -281,7 +281,7 @@ pub struct Deposit {
 #[serde(rename_all = "camelCase")]
 pub struct Withdrawal {
     pub id: Bytes,
-    #[serde(rename(serialize = "__typename"))]
+    #[serde(rename = "__typename")]
     pub __typename: String,
     #[cfg_attr(target_family = "wasm", tsify(type = "SgBigInt"))]
     pub amount: BigInt,
@@ -302,7 +302,7 @@ pub struct Withdrawal {
 #[serde(rename_all = "camelCase")]
 pub struct TradeVaultBalanceChange {
     pub id: Bytes,
-    #[serde(rename(serialize = "__typename"))]
+    #[serde(rename = "__typename")]
     pub __typename: String,
     #[cfg_attr(target_family = "wasm", tsify(type = "SgBigInt"))]
     pub amount: BigInt,
@@ -323,7 +323,7 @@ pub struct TradeVaultBalanceChange {
 #[serde(rename_all = "camelCase")]
 pub struct ClearBounty {
     pub id: Bytes,
-    #[serde(rename(serialize = "__typename"))]
+    #[serde(rename = "__typename")]
     pub __typename: String,
     #[cfg_attr(target_family = "wasm", tsify(type = "SgBigInt"))]
     pub amount: BigInt,
@@ -377,7 +377,9 @@ pub struct OrderStructPartialTrade {
 pub struct Erc20 {
     pub id: Bytes,
     pub address: Bytes,
+    #[cfg_attr(target_family = "wasm", tsify(type = "string | undefined"))]
     pub name: Option<String>,
+    #[cfg_attr(target_family = "wasm", tsify(type = "string | undefined"))]
     pub symbol: Option<String>,
     #[cfg_attr(target_family = "wasm", tsify(type = "SgBigInt | undefined"))]
     pub decimals: Option<BigInt>,
diff --git a/tauri-app/src/routes/vaults/+page.svelte b/tauri-app/src/routes/vaults/+page.svelte
index 694aabb96..8b6927f8a 100644
--- a/tauri-app/src/routes/vaults/+page.svelte
+++ b/tauri-app/src/routes/vaults/+page.svelte
@@ -1,7 +1,6 @@
 <script lang="ts">
   import { PageHeader, VaultsListTable } from '@rainlanguage/ui-components';
   import { onMount } from 'svelte';
-
   import { page } from '$app/stores';
   import { walletAddressMatchesOrBlank } from '$lib/stores/wallets';
 

From af58e8ecba09ab07236673bc0ea7daeef5a9e9fc Mon Sep 17 00:00:00 2001
From: Jamie Harding <jharding142@icloud.com>
Date: Thu, 19 Dec 2024 17:22:35 +0100
Subject: [PATCH 7/9] remove volume

---
 crates/subgraph/src/types/common.rs            | 18 ------------------
 .../components/tables/VaultsListTable.svelte   |  2 +-
 2 files changed, 1 insertion(+), 19 deletions(-)

diff --git a/crates/subgraph/src/types/common.rs b/crates/subgraph/src/types/common.rs
index 8b23d39a6..19b547fdf 100644
--- a/crates/subgraph/src/types/common.rs
+++ b/crates/subgraph/src/types/common.rs
@@ -196,23 +196,6 @@ pub struct VaultWithSubgraphName {
     pub subgraph_name: String,
 }
 
-#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
-#[cfg_attr(target_family = "wasm", derive(Tsify))]
-#[serde(rename_all = "camelCase")]
-#[typeshare]
-pub struct VaultVolume {
-    id: String,
-    token: Erc20,
-    #[cfg_attr(target_family = "wasm", tsify(type = "string"))]
-    total_in: U256,
-    #[cfg_attr(target_family = "wasm", tsify(type = "string"))]
-    total_out: U256,
-    #[cfg_attr(target_family = "wasm", tsify(type = "string"))]
-    total_vol: U256,
-    #[cfg_attr(target_family = "wasm", tsify(type = "string"))]
-    net_vol: I256,
-}
-
 #[derive(cynic::QueryFragment, Debug, Clone, Serialize)]
 #[cfg_attr(target_family = "wasm", derive(Tsify))]
 #[cynic(graphql_type = "Vault")]
@@ -610,7 +593,6 @@ mod impls {
     impl_all_wasm_traits!(OrderAsIO);
     impl_all_wasm_traits!(VaultBalanceChangeVault);
     impl_all_wasm_traits!(VaultBalanceChange);
-    impl_all_wasm_traits!(VaultVolume);
     impl_all_wasm_traits!(Withdrawal);
     impl_all_wasm_traits!(TradeVaultBalanceChange);
     impl_all_wasm_traits!(Deposit);
diff --git a/packages/ui-components/src/lib/components/tables/VaultsListTable.svelte b/packages/ui-components/src/lib/components/tables/VaultsListTable.svelte
index 28c8d7a3a..826da0b38 100644
--- a/packages/ui-components/src/lib/components/tables/VaultsListTable.svelte
+++ b/packages/ui-components/src/lib/components/tables/VaultsListTable.svelte
@@ -10,7 +10,7 @@
 	import { vaultBalanceDisplay } from '../../utils/vault';
 	import { bigintStringToHex } from '../../utils/hex';
 	import { type ConfigSource, type OrderbookConfigSource } from '../../typeshare/config';
-	import { type Vault } from '@rainlanguage/orderbook/js_api';
+	import { type Vault } from '../../typeshare/subgraphTypes';
 	import { QKEY_VAULTS } from '../../queries/keys';
 	import {
 		getVaults,

From f851b892585859bed5304c7842517a72cdfb2be0 Mon Sep 17 00:00:00 2001
From: Jamie Harding <jharding142@icloud.com>
Date: Thu, 19 Dec 2024 17:23:52 +0100
Subject: [PATCH 8/9] remove

---
 crates/subgraph/src/types/common.rs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/crates/subgraph/src/types/common.rs b/crates/subgraph/src/types/common.rs
index 19b547fdf..1cb611b9a 100644
--- a/crates/subgraph/src/types/common.rs
+++ b/crates/subgraph/src/types/common.rs
@@ -1,5 +1,4 @@
 use crate::schema;
-use alloy::primitives::{I256, U256};
 #[cfg(target_family = "wasm")]
 use rain_orderbook_bindings::{impl_all_wasm_traits, wasm_traits::prelude::*};
 use serde::{Deserialize, Serialize};

From 6001a80d207033ceb51c0b9a9d4895da3ccbc664 Mon Sep 17 00:00:00 2001
From: Jamie Harding <jharding142@icloud.com>
Date: Thu, 19 Dec 2024 17:53:14 +0100
Subject: [PATCH 9/9] fixed export of types

---
 crates/common/src/types/order_detail_extended.rs         | 9 ++++++++-
 crates/subgraph/src/types/common.rs                      | 8 --------
 .../src/__tests__/OrderVaultsVolTable.test.ts            | 2 +-
 .../src/lib/components/tables/OrderVaultsVolTable.svelte | 2 +-
 .../src/lib/components/charts/VaultBalanceChart.test.ts  | 6 +++---
 .../components/tables/VaultBalanceChangesTable.svelte    | 2 +-
 .../components/tables/VaultBalanceChangesTable.test.ts   | 8 ++++----
 tauri-app/src/lib/queries/vaultBalanceChangesList.ts     | 6 +++---
 8 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/crates/common/src/types/order_detail_extended.rs b/crates/common/src/types/order_detail_extended.rs
index 0eff4a4a5..0b2eebd79 100644
--- a/crates/common/src/types/order_detail_extended.rs
+++ b/crates/common/src/types/order_detail_extended.rs
@@ -1,10 +1,14 @@
 use crate::meta::{TryDecodeRainlangSource, TryDecodeRainlangSourceError};
+#[cfg(target_family = "wasm")]
+use rain_orderbook_bindings::{impl_all_wasm_traits, wasm_traits::prelude::*};
 use rain_orderbook_subgraph_client::types::common::Order;
 use serde::{Deserialize, Serialize};
 use typeshare::typeshare;
 
-#[typeshare]
 #[derive(Serialize, Deserialize, Clone, Debug)]
+#[cfg_attr(target_family = "wasm", derive(Tsify))]
+#[serde(rename_all = "camelCase")]
+#[typeshare]
 pub struct OrderDetailExtended {
     pub order: Order,
     pub rainlang: Option<String>,
@@ -26,3 +30,6 @@ impl TryFrom<Order> for OrderDetailExtended {
         })
     }
 }
+
+#[cfg(target_family = "wasm")]
+impl_all_wasm_traits!(OrderDetailExtended);
diff --git a/crates/subgraph/src/types/common.rs b/crates/subgraph/src/types/common.rs
index 1cb611b9a..ebe2fe278 100644
--- a/crates/subgraph/src/types/common.rs
+++ b/crates/subgraph/src/types/common.rs
@@ -107,14 +107,6 @@ pub struct OrderWithSubgraphName {
     pub subgraph_name: String,
 }
 
-#[derive(Debug, Serialize, Deserialize, Clone)]
-#[cfg_attr(target_family = "wasm", derive(Tsify))]
-#[typeshare]
-pub struct OrderDetailExtended {
-    pub order: Order,
-    pub rainlang: Option<String>,
-}
-
 #[derive(cynic::QueryFragment, Debug, Serialize, Clone)]
 #[cfg_attr(target_family = "wasm", derive(Tsify))]
 #[cynic(graphql_type = "Order")]
diff --git a/packages/ui-components/src/__tests__/OrderVaultsVolTable.test.ts b/packages/ui-components/src/__tests__/OrderVaultsVolTable.test.ts
index 66310f2dd..929205c22 100644
--- a/packages/ui-components/src/__tests__/OrderVaultsVolTable.test.ts
+++ b/packages/ui-components/src/__tests__/OrderVaultsVolTable.test.ts
@@ -1,7 +1,7 @@
 import { render, screen, waitFor } from '@testing-library/svelte';
 import { test, vi } from 'vitest';
 import { expect } from '$lib/test/matchers';
-import type { VaultVolume } from '@rainlanguage/orderbook/js_api';
+import type { VaultVolume } from '../lib/typeshare/subgraphTypes';
 import { formatUnits } from 'viem';
 import OrderVaultsVolTable from '../lib/components/tables/OrderVaultsVolTable.svelte';
 import { QueryClient } from '@tanstack/svelte-query';
diff --git a/packages/ui-components/src/lib/components/tables/OrderVaultsVolTable.svelte b/packages/ui-components/src/lib/components/tables/OrderVaultsVolTable.svelte
index d5ab79929..de9cf9e5d 100644
--- a/packages/ui-components/src/lib/components/tables/OrderVaultsVolTable.svelte
+++ b/packages/ui-components/src/lib/components/tables/OrderVaultsVolTable.svelte
@@ -8,7 +8,7 @@
 	import { formatUnits } from 'viem';
 	import TableTimeFilters from '../charts/TableTimeFilters.svelte';
 	import { bigintStringToHex } from '../../utils/hex';
-	import type { VaultVolume } from '@rainlanguage/orderbook/js_api';
+	import type { VaultVolume } from '../../typeshare/subgraphTypes';
 
 	export let id: string;
 	export let subgraphUrl: string;
diff --git a/tauri-app/src/lib/components/charts/VaultBalanceChart.test.ts b/tauri-app/src/lib/components/charts/VaultBalanceChart.test.ts
index 9e2b48847..9b446a636 100644
--- a/tauri-app/src/lib/components/charts/VaultBalanceChart.test.ts
+++ b/tauri-app/src/lib/components/charts/VaultBalanceChart.test.ts
@@ -48,7 +48,7 @@ vi.mock('lightweight-charts', async () => {
 
 const mockVaultBalanceChangeUnwrappeds: VaultBalanceChangeUnwrapped[] = [
   {
-    typename: 'Withdrawal',
+    __typename: 'Withdrawal',
     amount: '1000',
     oldVaultBalance: '5000',
     newVaultBalance: '4000',
@@ -75,7 +75,7 @@ const mockVaultBalanceChangeUnwrappeds: VaultBalanceChangeUnwrapped[] = [
     },
   },
   {
-    typename: 'TradeVaultBalanceChangeUnwrapped',
+    __typename: 'TradeVaultBalanceChangeUnwrapped',
     amount: '1500',
     oldVaultBalance: '4000',
     newVaultBalance: '2500',
@@ -102,7 +102,7 @@ const mockVaultBalanceChangeUnwrappeds: VaultBalanceChangeUnwrapped[] = [
     },
   },
   {
-    typename: 'Deposit',
+    __typename: 'Deposit',
     amount: '2000',
     oldVaultBalance: '2500',
     newVaultBalance: '4500',
diff --git a/tauri-app/src/lib/components/tables/VaultBalanceChangesTable.svelte b/tauri-app/src/lib/components/tables/VaultBalanceChangesTable.svelte
index bbcab5310..1f0cbf249 100644
--- a/tauri-app/src/lib/components/tables/VaultBalanceChangesTable.svelte
+++ b/tauri-app/src/lib/components/tables/VaultBalanceChangesTable.svelte
@@ -65,7 +65,7 @@
       {item.vault.token.symbol}
     </TableBodyCell>
     <TableBodyCell tdClass="break-word p-0 text-left" data-testid="vaultBalanceChangesTableType">
-      {item.typename}
+      {item.__typename}
     </TableBodyCell>
   </svelte:fragment>
 </TanstackAppTable>
diff --git a/tauri-app/src/lib/components/tables/VaultBalanceChangesTable.test.ts b/tauri-app/src/lib/components/tables/VaultBalanceChangesTable.test.ts
index 53f5b5bdd..a079b4823 100644
--- a/tauri-app/src/lib/components/tables/VaultBalanceChangesTable.test.ts
+++ b/tauri-app/src/lib/components/tables/VaultBalanceChangesTable.test.ts
@@ -29,7 +29,7 @@ test('renders the vault list table with correct data', async () => {
 
   const mockVaultBalanceChanges: VaultBalanceChangeUnwrapped[] = [
     {
-      typename: 'Withdrawal',
+      __typename: 'Withdrawal',
       amount: '1000',
       oldVaultBalance: '5000',
       newVaultBalance: '4000',
@@ -56,7 +56,7 @@ test('renders the vault list table with correct data', async () => {
       },
     },
     {
-      typename: 'TradeVaultBalanceChange',
+      __typename: 'TradeVaultBalanceChange',
       amount: '1500',
       oldVaultBalance: '4000',
       newVaultBalance: '2500',
@@ -83,7 +83,7 @@ test('renders the vault list table with correct data', async () => {
       },
     },
     {
-      typename: 'Deposit',
+      __typename: 'Deposit',
       amount: '2000',
       oldVaultBalance: '2500',
       newVaultBalance: '4500',
@@ -133,7 +133,7 @@ test('it shows the correct data in the table', async () => {
 
   const mockVaultBalanceChanges: VaultBalanceChangeUnwrapped[] = [
     {
-      typename: 'Withdrawal',
+      __typename: 'Withdrawal',
       amount: '1000',
       oldVaultBalance: '5000',
       newVaultBalance: '4000',
diff --git a/tauri-app/src/lib/queries/vaultBalanceChangesList.ts b/tauri-app/src/lib/queries/vaultBalanceChangesList.ts
index f9993cad4..1051e1dbf 100644
--- a/tauri-app/src/lib/queries/vaultBalanceChangesList.ts
+++ b/tauri-app/src/lib/queries/vaultBalanceChangesList.ts
@@ -36,7 +36,7 @@ if (import.meta.vitest) {
   it('uses the vault_balance_changes_list command correctly', async () => {
     const mockVaultBalanceChanges: VaultBalanceChangeUnwrapped[] = [
       {
-        typename: 'Withdrawal',
+        __typename: 'Withdrawal',
         amount: '1000',
         oldVaultBalance: '5000',
         newVaultBalance: '4000',
@@ -63,7 +63,7 @@ if (import.meta.vitest) {
         },
       },
       {
-        typename: 'TradeVaultBalanceChange',
+        __typename: 'TradeVaultBalanceChange',
         amount: '1500',
         oldVaultBalance: '4000',
         newVaultBalance: '2500',
@@ -90,7 +90,7 @@ if (import.meta.vitest) {
         },
       },
       {
-        typename: 'Deposit',
+        __typename: 'Deposit',
         amount: '2000',
         oldVaultBalance: '2500',
         newVaultBalance: '4500',