From 9a1dc5440c4e624b18003186e8da519f0e298030 Mon Sep 17 00:00:00 2001
From: orenzhang <41963680+OrenZhang@users.noreply.github.com>
Date: Tue, 21 Apr 2026 21:33:25 +0800
Subject: [PATCH 1/2] fix(merchant-data): update default order types to
 undefined when none selected

---
 frontend/components/common/merchant/merchant-data.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/components/common/merchant/merchant-data.tsx b/frontend/components/common/merchant/merchant-data.tsx
index d131b6c..c87cf28 100644
--- a/frontend/components/common/merchant/merchant-data.tsx
+++ b/frontend/components/common/merchant/merchant-data.tsx
@@ -72,7 +72,7 @@ function MerchantDataContent({ apiKey }: MerchantDataProps) {
     return {
       page,
       page_size: pageSize,
-      types: selectedTypes.length > 0 ? selectedTypes : DEFAULT_ORDER_TYPES,
+      types: selectedTypes.length > 0 ? selectedTypes : undefined,
       ...stateQuery,
       startTime: dateRange ? formatLocalDate(dateRange.from) : undefined,
       endTime: dateRange ? (() => {

From f2343d283890b32c7fd3111aa4b695835133cc35 Mon Sep 17 00:00:00 2001
From: orenzhang <41963680+OrenZhang@users.noreply.github.com>
Date: Tue, 21 Apr 2026 21:35:59 +0800
Subject: [PATCH 2/2] fix(merchant-data): remove unused import of
 DEFAULT_ORDER_TYPES

---
 frontend/components/common/merchant/merchant-data.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/components/common/merchant/merchant-data.tsx b/frontend/components/common/merchant/merchant-data.tsx
index c87cf28..7be5f57 100644
--- a/frontend/components/common/merchant/merchant-data.tsx
+++ b/frontend/components/common/merchant/merchant-data.tsx
@@ -7,7 +7,7 @@ import { Undo2, FileText, Link2 } from "lucide-react"
 import { toast } from "sonner"
 import { TableFilter, mapDisplayStatusToQuery, type DisplayOrderStatus, type SearchValues } from "@/components/common/general/table-filter"
 import { TransactionTableList } from "@/components/common/general/table-data"
-import { DEFAULT_ORDER_TYPES, type MerchantAPIKey, type OrderType } from "@/lib/services"
+import { type MerchantAPIKey, type OrderType } from "@/lib/services"
 import { TransactionProvider, useTransaction } from "@/contexts/transaction-context"
 import { formatLocalDate } from "@/lib/utils"