From bf1dfb2a562d2c21b84314c8e8717ee3a01cca59 Mon Sep 17 00:00:00 2001 From: Jamie Harding Date: Mon, 10 Feb 2025 14:15:39 +0100 Subject: [PATCH 1/5] tweak order detail styling --- ...ultLink.test.ts => OrderVaultInfo.test.ts} | 6 +-- .../src/lib/components/ButtonVaultLink.svelte | 38 ------------------- .../lib/components/OrderOrVaultHash.svelte | 2 +- .../src/lib/components/OrderVaultInfo.svelte | 23 +++++++++++ .../lib/components/detail/OrderDetail.svelte | 12 ++---- packages/ui-components/src/lib/index.ts | 2 +- 6 files changed, 31 insertions(+), 52 deletions(-) rename packages/ui-components/src/__tests__/{ButtonVaultLink.test.ts => OrderVaultInfo.test.ts} (87%) delete mode 100644 packages/ui-components/src/lib/components/ButtonVaultLink.svelte create mode 100644 packages/ui-components/src/lib/components/OrderVaultInfo.svelte diff --git a/packages/ui-components/src/__tests__/ButtonVaultLink.test.ts b/packages/ui-components/src/__tests__/OrderVaultInfo.test.ts similarity index 87% rename from packages/ui-components/src/__tests__/ButtonVaultLink.test.ts rename to packages/ui-components/src/__tests__/OrderVaultInfo.test.ts index db251ca94..3d984f925 100644 --- a/packages/ui-components/src/__tests__/ButtonVaultLink.test.ts +++ b/packages/ui-components/src/__tests__/OrderVaultInfo.test.ts @@ -1,6 +1,6 @@ import { describe, it, expect, vi } from 'vitest'; import { render, screen } from '@testing-library/svelte'; -import ButtonVaultLink from '../lib/components/ButtonVaultLink.svelte'; +import OrderVaultInfo from '../lib/components/OrderVaultInfo.svelte'; import * as navigation from '$app/navigation'; import { userEvent } from '@testing-library/user-event'; import type { Vault } from '@rainlanguage/orderbook/js_api'; @@ -9,7 +9,7 @@ vi.mock('$app/navigation', () => ({ goto: vi.fn() })); -describe('ButtonVaultLink', () => { +describe('OrderVaultInfo', () => { const mockVault = { id: '123', vaultId: '1000', @@ -22,7 +22,7 @@ describe('ButtonVaultLink', () => { } as unknown as Vault; it('should navigate to vault details page when clicked', async () => { - render(ButtonVaultLink, { + render(OrderVaultInfo, { props: { tokenVault: mockVault, subgraphName: 'test' diff --git a/packages/ui-components/src/lib/components/ButtonVaultLink.svelte b/packages/ui-components/src/lib/components/ButtonVaultLink.svelte deleted file mode 100644 index 8e1a532c7..000000000 --- a/packages/ui-components/src/lib/components/ButtonVaultLink.svelte +++ /dev/null @@ -1,38 +0,0 @@ - - - - -
goto(`/vaults/${subgraphName}-${tokenVault.id}`)} -> -
-
- - ID: {bigintStringToHex(tokenVault.vaultId)} - - - {tokenVault.token.name} ({tokenVault.token.symbol}) - -
-
- Balance -
- - {formatUnits(BigInt(tokenVault.balance), parseInt(tokenVault.token.decimals || '18'))} - -
-
-
-
diff --git a/packages/ui-components/src/lib/components/OrderOrVaultHash.svelte b/packages/ui-components/src/lib/components/OrderOrVaultHash.svelte index 3c0a38d76..8c00f4427 100644 --- a/packages/ui-components/src/lib/components/OrderOrVaultHash.svelte +++ b/packages/ui-components/src/lib/components/OrderOrVaultHash.svelte @@ -20,7 +20,7 @@ From 2e51f9fa7f79c2e1c2a1d4cefcd28ead92126b4c Mon Sep 17 00:00:00 2001 From: Jamie Harding Date: Tue, 11 Feb 2025 12:38:48 +0100 Subject: [PATCH 4/5] fix test --- .../ui-components/src/__tests__/OrderVaultInfo.test.ts | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/packages/ui-components/src/__tests__/OrderVaultInfo.test.ts b/packages/ui-components/src/__tests__/OrderVaultInfo.test.ts index 3d984f925..1141b447b 100644 --- a/packages/ui-components/src/__tests__/OrderVaultInfo.test.ts +++ b/packages/ui-components/src/__tests__/OrderVaultInfo.test.ts @@ -21,7 +21,7 @@ describe('OrderVaultInfo', () => { } } as unknown as Vault; - it('should navigate to vault details page when clicked', async () => { + it('should display vault name and address', () => { render(OrderVaultInfo, { props: { tokenVault: mockVault, @@ -29,9 +29,7 @@ describe('OrderVaultInfo', () => { } }); - const vaultLink = screen.getByTestId('vault-link'); - expect(vaultLink).toBeTruthy(); - await userEvent.click(vaultLink); - expect(navigation.goto).toHaveBeenCalledWith(`/vaults/test-${mockVault.id}`); + expect(screen.getByText('Test Token (TEST)')).toBeInTheDocument(); + expect(screen.getByText('1')).toBeInTheDocument(); }); }); From 350f1467a9bbe736585670d8a562cdd41102935e Mon Sep 17 00:00:00 2001 From: Jamie Harding Date: Tue, 11 Feb 2025 14:38:55 +0100 Subject: [PATCH 5/5] vault info --- packages/ui-components/src/__tests__/OrderVaultInfo.test.ts | 2 -- 1 file changed, 2 deletions(-) diff --git a/packages/ui-components/src/__tests__/OrderVaultInfo.test.ts b/packages/ui-components/src/__tests__/OrderVaultInfo.test.ts index 1141b447b..76bfec5b1 100644 --- a/packages/ui-components/src/__tests__/OrderVaultInfo.test.ts +++ b/packages/ui-components/src/__tests__/OrderVaultInfo.test.ts @@ -1,8 +1,6 @@ import { describe, it, expect, vi } from 'vitest'; import { render, screen } from '@testing-library/svelte'; import OrderVaultInfo from '../lib/components/OrderVaultInfo.svelte'; -import * as navigation from '$app/navigation'; -import { userEvent } from '@testing-library/user-event'; import type { Vault } from '@rainlanguage/orderbook/js_api'; // Mock the $app/navigation module vi.mock('$app/navigation', () => ({