diff --git a/.github/workflows/deploy-vercel.yaml b/.github/workflows/deploy-vercel.yaml
index eb14dbb00..bf6e61a3a 100644
--- a/.github/workflows/deploy-vercel.yaml
+++ b/.github/workflows/deploy-vercel.yaml
@@ -4,6 +4,8 @@ on: [push]
 jobs:
   deploy:
     runs-on: ubuntu-latest
+    env:
+      COMMIT_SHA: ${{ github.sha }}
     steps:
       - uses: actions/checkout@v2
         with:
@@ -12,7 +14,7 @@ jobs:
 
       - uses: DeterminateSystems/nix-installer-action@main
       - uses: DeterminateSystems/magic-nix-cache-action@main
-      
+
       - run: nix develop -c rainix-sol-prelude
         working-directory: lib/rain.interpreter
       - run: nix develop -c rainix-rs-prelude
@@ -40,4 +42,4 @@ jobs:
           vercel-org-id: ${{ secrets.VERCEL_ORG_ID }} # Required
           vercel-project-id: ${{ secrets.VERCEL_PROJECT_ID }} # Required
           vercel-args: --prebuilt # We want to skip the build step on Vercel, since we've already built our app in the previous step
-          working-directory: ./packages/webapp # Optional, use for monorepo
\ No newline at end of file
+          working-directory: ./packages/webapp # Optional, use for monorepo
diff --git a/tauri-app/src/lib/components/tables/OrdersListTable.svelte b/tauri-app/src/lib/components/tables/OrdersListTable.svelte
index 34d890ddc..85e33d4bf 100644
--- a/tauri-app/src/lib/components/tables/OrdersListTable.svelte
+++ b/tauri-app/src/lib/components/tables/OrdersListTable.svelte
@@ -15,15 +15,26 @@
     TableHeadCell,
   } from 'flowbite-svelte';
   import { DotsVerticalOutline } from 'flowbite-svelte-icons';
-  import { walletAddressMatchesOrBlank } from '$lib/stores/wallets';
   import { Hash, HashType } from '@rainlanguage/ui-components';
 
-  import { activeNetworkRef, activeOrderbookRef, activeSubgraphs } from '$lib/stores/settings';
   import { formatTimestampSecondsAsLocal } from '$lib/utils/time';
-  import { handleOrderRemoveModal } from '$lib/services/modal';
-  import { activeAccounts, activeOrderStatus } from '$lib/stores/settings';
-  import { get } from 'svelte/store';
-  import { orderHash } from '$lib/stores/settings';
+
+  import type { Order as OrderDetailOrder } from '$lib/typeshare/subgraphTypes';
+  import type { Order as OrderListOrder } from '$lib/typeshare/subgraphTypes';
+
+  import { get, type Readable, type Writable } from 'svelte/store';
+
+  export let handleOrderRemoveModal: (
+    order: OrderDetailOrder | OrderListOrder,
+    onOrderRemoved: () => void,
+  ) => void;
+  export let walletAddressMatchesOrBlank: Writable<(otherAddress: string) => boolean>;
+  export let activeAccounts: Readable<Record<string, string>>;
+  export let activeSubgraphs: Writable<Record<string, string>>;
+  export let activeNetworkRef: Writable<string>;
+  export let activeOrderbookRef: Writable<string>;
+  export let activeOrderStatus: Writable<boolean | undefined>;
+  export let orderHash: Writable<string>;
 
   $: query = createInfiniteQuery({
     queryKey: [QKEY_ORDERS, $activeAccounts, $activeOrderStatus, $orderHash, $activeSubgraphs],