diff --git a/tauri-app/src/lib/components/TradesTable.svelte b/tauri-app/src/lib/components/TradesTable.svelte
index 0f34cfbdb..bbb52ffa6 100644
--- a/tauri-app/src/lib/components/TradesTable.svelte
+++ b/tauri-app/src/lib/components/TradesTable.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
   import { TableBodyCell, TableHeadCell } from 'flowbite-svelte';
-  import { formatTimestampSecondsAsLocal } from '$lib/utils/time';
+  import { formatTimestampSecondsAsLocal } from '@rainlanguage/ui-components';
   import { Hash, HashType } from '@rainlanguage/ui-components';
 
   import AppTable from '$lib/components/AppTable.svelte';
diff --git a/tauri-app/src/lib/components/charts/VaultBalanceChart.svelte b/tauri-app/src/lib/components/charts/VaultBalanceChart.svelte
index e1b00d396..6d7c3ac8f 100644
--- a/tauri-app/src/lib/components/charts/VaultBalanceChart.svelte
+++ b/tauri-app/src/lib/components/charts/VaultBalanceChart.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import { timestampSecondsToUTCTimestamp } from '$lib/utils/time';
+  import { timestampSecondsToUTCTimestamp } from '@rainlanguage/ui-components';
   import { bigintToFloat } from '$lib/utils/number';
   import type { Vault } from '$lib/typeshare/subgraphTypes';
   import { createQuery } from '@tanstack/svelte-query';
diff --git a/tauri-app/src/lib/components/charts/VaultBalanceChart.test.ts b/tauri-app/src/lib/components/charts/VaultBalanceChart.test.ts
index b0b22e995..5192e69d4 100644
--- a/tauri-app/src/lib/components/charts/VaultBalanceChart.test.ts
+++ b/tauri-app/src/lib/components/charts/VaultBalanceChart.test.ts
@@ -3,7 +3,7 @@ import { expect, test, vi } from 'vitest';
 import { QueryClient } from '@tanstack/svelte-query';
 import { mockIPC } from '@tauri-apps/api/mocks';
 import VaultBalanceChart from './VaultBalanceChart.svelte';
-import { timestampSecondsToUTCTimestamp } from '$lib/utils/time';
+import { timestampSecondsToUTCTimestamp } from '@rainlanguage/ui-components';
 import { bigintToFloat } from '$lib/utils/number';
 import type { Vault } from '$lib/typeshare/subgraphTypes';
 import type { VaultBalanceChangeUnwrapped } from '$lib/typeshare/subgraphTypes';
diff --git a/tauri-app/src/lib/components/detail/OrderDetail.svelte b/tauri-app/src/lib/components/detail/OrderDetail.svelte
index a4e1d338f..89f94400d 100644
--- a/tauri-app/src/lib/components/detail/OrderDetail.svelte
+++ b/tauri-app/src/lib/components/detail/OrderDetail.svelte
@@ -3,7 +3,7 @@
   import { Button, TabItem, Tabs } from 'flowbite-svelte';
   import { walletAddressMatchesOrBlank } from '$lib/stores/wallets';
   import BadgeActive from '$lib/components/BadgeActive.svelte';
-  import { formatTimestampSecondsAsLocal } from '$lib/utils/time';
+  import { formatTimestampSecondsAsLocal } from '@rainlanguage/ui-components';
   import ButtonVaultLink from '$lib/components/ButtonVaultLink.svelte';
   import { Hash, HashType } from '@rainlanguage/ui-components';
 
diff --git a/tauri-app/src/lib/components/detail/OrderDetail.test.ts b/tauri-app/src/lib/components/detail/OrderDetail.test.ts
index 6df2df10f..d7fe95e3c 100644
--- a/tauri-app/src/lib/components/detail/OrderDetail.test.ts
+++ b/tauri-app/src/lib/components/detail/OrderDetail.test.ts
@@ -6,7 +6,7 @@ import OrderDetail from './OrderDetail.svelte';
 import { mockIPC } from '@tauri-apps/api/mocks';
 import { mockOrderDetailsExtended } from '$lib/queries/orderDetail';
 import { handleOrderRemoveModal } from '$lib/services/modal';
-import { formatTimestampSecondsAsLocal } from '$lib/utils/time';
+import { formatTimestampSecondsAsLocal } from '@rainlanguage/ui-components';
 import { formatUnits } from 'viem';
 
 const { mockWalletAddressMatchesOrBlankStore } = await vi.hoisted(
diff --git a/tauri-app/src/lib/components/tables/OrderTradesListTable.svelte b/tauri-app/src/lib/components/tables/OrderTradesListTable.svelte
index d90541fd4..02995ccc5 100644
--- a/tauri-app/src/lib/components/tables/OrderTradesListTable.svelte
+++ b/tauri-app/src/lib/components/tables/OrderTradesListTable.svelte
@@ -6,7 +6,7 @@
   import { rpcUrl, subgraphUrl } from '$lib/stores/settings';
   import { DEFAULT_PAGE_SIZE } from '$lib/queries/constants';
   import { TableBodyCell, TableHeadCell } from 'flowbite-svelte';
-  import { formatTimestampSecondsAsLocal } from '$lib/utils/time';
+  import { formatTimestampSecondsAsLocal } from '@rainlanguage/ui-components';
   import { Hash, HashType } from '@rainlanguage/ui-components';
 
   import { formatUnits } from 'viem';
diff --git a/tauri-app/src/lib/components/tables/OrdersListTable.svelte b/tauri-app/src/lib/components/tables/OrdersListTable.svelte
index ce42c786d..d64a2c98d 100644
--- a/tauri-app/src/lib/components/tables/OrdersListTable.svelte
+++ b/tauri-app/src/lib/components/tables/OrdersListTable.svelte
@@ -19,7 +19,7 @@
   import { Hash, HashType } from '@rainlanguage/ui-components';
 
   import { activeNetworkRef, activeOrderbookRef, activeSubgraphs } from '$lib/stores/settings';
-  import { formatTimestampSecondsAsLocal } from '$lib/utils/time';
+  import { formatTimestampSecondsAsLocal } from '@rainlanguage/ui-components';
   import { handleOrderRemoveModal } from '$lib/services/modal';
   import { activeAccounts, activeOrderStatus } from '$lib/stores/settings';
   import { get } from 'svelte/store';
diff --git a/tauri-app/src/lib/components/tables/OrdersListTable.test.ts b/tauri-app/src/lib/components/tables/OrdersListTable.test.ts
index 314b40fa2..3a66e8ff4 100644
--- a/tauri-app/src/lib/components/tables/OrdersListTable.test.ts
+++ b/tauri-app/src/lib/components/tables/OrdersListTable.test.ts
@@ -5,7 +5,7 @@ import OrdersListTable from './OrdersListTable.svelte';
 import { mockIPC } from '@tauri-apps/api/mocks';
 import { goto } from '$app/navigation';
 import { handleOrderRemoveModal } from '$lib/services/modal';
-import { formatTimestampSecondsAsLocal } from '$lib/utils/time';
+import { formatTimestampSecondsAsLocal } from '@rainlanguage/ui-components';
 import type { OrderWithSubgraphName } from '$lib/typeshare/subgraphTypes';
 
 const { mockWalletAddressMatchesOrBlankStore } = await vi.hoisted(
diff --git a/tauri-app/src/lib/components/tables/VaultBalanceChangesTable.svelte b/tauri-app/src/lib/components/tables/VaultBalanceChangesTable.svelte
index 72eecf22f..f8f34767a 100644
--- a/tauri-app/src/lib/components/tables/VaultBalanceChangesTable.svelte
+++ b/tauri-app/src/lib/components/tables/VaultBalanceChangesTable.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
   import { Heading, TableHeadCell, TableBodyCell } from 'flowbite-svelte';
-  import { formatTimestampSecondsAsLocal } from '$lib/utils/time';
+  import { formatTimestampSecondsAsLocal } from '@rainlanguage/ui-components';
   import { Hash, HashType } from '@rainlanguage/ui-components';
 
   import { formatUnits } from 'viem';
diff --git a/tauri-app/src/lib/components/tables/VaultBalanceChangesTable.test.ts b/tauri-app/src/lib/components/tables/VaultBalanceChangesTable.test.ts
index d02f0c440..5eb4135cf 100644
--- a/tauri-app/src/lib/components/tables/VaultBalanceChangesTable.test.ts
+++ b/tauri-app/src/lib/components/tables/VaultBalanceChangesTable.test.ts
@@ -5,7 +5,7 @@ import { QueryClient } from '@tanstack/svelte-query';
 import { mockIPC } from '@tauri-apps/api/mocks';
 import VaultBalanceChangesTable from './VaultBalanceChangesTable.svelte';
 import type { VaultBalanceChangeUnwrapped } from '$lib/typeshare/subgraphTypes';
-import { formatTimestampSecondsAsLocal } from '$lib/utils/time';
+import { formatTimestampSecondsAsLocal } from '@rainlanguage/ui-components';
 
 vi.mock('$lib/stores/settings', async (importOriginal) => {
   const { writable } = await import('svelte/store');
diff --git a/tauri-app/src/lib/services/historicalOrderCharts.ts b/tauri-app/src/lib/services/historicalOrderCharts.ts
index 3431e6045..4a44f67df 100644
--- a/tauri-app/src/lib/services/historicalOrderCharts.ts
+++ b/tauri-app/src/lib/services/historicalOrderCharts.ts
@@ -1,6 +1,6 @@
 import type { Trade } from '$lib/typeshare/subgraphTypes';
 import type { UTCTimestamp } from 'lightweight-charts';
-import { timestampSecondsToUTCTimestamp } from '$lib/utils/time';
+import { timestampSecondsToUTCTimestamp } from '@rainlanguage/ui-components';
 import { sortBy } from 'lodash';
 import { formatUnits } from 'viem';
 
diff --git a/tauri-app/src/routes/orders/add/+page.svelte b/tauri-app/src/routes/orders/add/+page.svelte
index 85d16b347..4667a2efb 100644
--- a/tauri-app/src/routes/orders/add/+page.svelte
+++ b/tauri-app/src/routes/orders/add/+page.svelte
@@ -26,7 +26,7 @@
   import { ethersExecute } from '$lib/services/ethersTx';
   import { formatEthersTransactionError } from '$lib/utils/transaction';
   import CodeMirrorRainlang from '$lib/components/CodeMirrorRainlang.svelte';
-  import { promiseTimeout } from '$lib/utils/time';
+  import { promiseTimeout } from '@rainlanguage/ui-components';
   import { SentrySeverityLevel, reportErrorToSentry } from '$lib/services/sentry';
   import { pickScenarios } from '$lib/services/pickConfig';
   import {