diff --git a/tauri-app/src/lib/components/Hash.svelte b/tauri-app/src/lib/components/Hash.svelte new file mode 100644 index 000000000..e4b140dd2 --- /dev/null +++ b/tauri-app/src/lib/components/Hash.svelte @@ -0,0 +1,43 @@ + + + + +{#if shorten} + + {#if type === HashType.Wallet } + + {:else if type === HashType.Identifier } + + {:else if type === HashType.Transaction} + + {/if} +
{value}
+
+{/if} \ No newline at end of file diff --git a/tauri-app/src/lib/components/TableOrders.svelte b/tauri-app/src/lib/components/TableOrders.svelte index 6571a57be..ac1df2180 100644 --- a/tauri-app/src/lib/components/TableOrders.svelte +++ b/tauri-app/src/lib/components/TableOrders.svelte @@ -20,6 +20,8 @@ import type { PaginatedCachedStore } from '$lib/stores/paginatedStore'; import type { Order } from '$lib/typeshare/ordersList'; import ButtonLoading from './ButtonLoading.svelte'; + import Hash from './Hash.svelte'; + import { HashType } from '$lib/utils/hash'; export let ordersList: PaginatedCachedStore; @@ -47,8 +49,8 @@ Inactive {/if} - {order.id} - {order.owner.id} + + {formatTimestampSecondsAsLocal(BigInt(order.timestamp))} diff --git a/tauri-app/src/lib/stores/toasts.ts b/tauri-app/src/lib/stores/toasts.ts index f1f898ab1..72076739a 100644 --- a/tauri-app/src/lib/stores/toasts.ts +++ b/tauri-app/src/lib/stores/toasts.ts @@ -37,10 +37,18 @@ function useToastsStore(autohideMs = 5000) { }); } + function success(text: string) { + add({ + message_type: ToastMessageType.Success, + text + }); + } + return { subscribe: toasts.subscribe, add, - error + error, + success } } diff --git a/tauri-app/src/lib/utils/hash.ts b/tauri-app/src/lib/utils/hash.ts new file mode 100644 index 000000000..28621c1fb --- /dev/null +++ b/tauri-app/src/lib/utils/hash.ts @@ -0,0 +1,5 @@ +export enum HashType { + Identifier, + Wallet, + Transaction, +} \ No newline at end of file diff --git a/tauri-app/src/routes/orders/[id]/+page.svelte b/tauri-app/src/routes/orders/[id]/+page.svelte index 519195dc0..a6455da1d 100644 --- a/tauri-app/src/routes/orders/[id]/+page.svelte +++ b/tauri-app/src/routes/orders/[id]/+page.svelte @@ -9,6 +9,8 @@ import { orderRemove } from '$lib/utils/orderRemove'; import PageHeader from '$lib/components/PageHeader.svelte'; import { page } from '$app/stores'; + import Hash from '$lib/components/Hash.svelte'; + import { HashType } from '$lib/utils/hash'; let isSubmitting = false; @@ -40,14 +42,14 @@
Order not found
{:else}
- +
Order ID

- {order.id} +

@@ -56,7 +58,7 @@ Owner Address

- {order.owner.id} +

diff --git a/tauri-app/src/routes/vaults/+page.svelte b/tauri-app/src/routes/vaults/+page.svelte index d4c02e81a..bd75beb94 100644 --- a/tauri-app/src/routes/vaults/+page.svelte +++ b/tauri-app/src/routes/vaults/+page.svelte @@ -22,7 +22,9 @@ import type { TokenVault } from '$lib/typeshare/vaultsList'; import ButtonsPagination from '$lib/components/ButtonsPagination.svelte'; import ButtonLoading from '$lib/components/ButtonLoading.svelte'; - import { bigintStringToHex } from '$lib/utils/hex'; + import Hash from '$lib/components/Hash.svelte'; + import { HashType } from '$lib/utils/hash'; + import { bigintStringToHex } from '$lib/utils/hex'; let showDepositModal = false; let showWithdrawModal = false; @@ -51,9 +53,9 @@ {#each $vaultsList.currentPage as vault} {goto(`/vaults/${vault.id}`)}}> {bigintStringToHex(vault.vault_id)} - {vault.owner.id} - {vault.token.name} - + + {vault.token.name} + {vault.balance_display} {vault.token.symbol} diff --git a/tauri-app/src/routes/vaults/[id]/+page.svelte b/tauri-app/src/routes/vaults/[id]/+page.svelte index ab14586de..d1e93b6fe 100644 --- a/tauri-app/src/routes/vaults/[id]/+page.svelte +++ b/tauri-app/src/routes/vaults/[id]/+page.svelte @@ -22,6 +22,8 @@ import ButtonLoading from '$lib/components/ButtonLoading.svelte'; import { FileCsvOutline } from 'flowbite-svelte-icons'; import ButtonsPagination from '$lib/components/ButtonsPagination.svelte'; + import Hash from '$lib/components/Hash.svelte'; + import { HashType } from '$lib/utils/hash'; let showDepositModal = false; let showWithdrawModal = false; @@ -68,7 +70,7 @@ Owner Address

- {vault.owner.id} +

@@ -113,11 +115,11 @@ {formatTimestampSecondsAsLocal(BigInt(vaultBalanceChange.content.timestamp))} - - {vaultBalanceChange.content.sender.id} + + - - {vaultBalanceChange.content.transaction.id} + + {vaultBalanceChange.type === 'Withdraw' ? '-' : ''}{vaultBalanceChange.content.amount_display} {vaultBalanceChange.content.token_vault.token.symbol}