1 files changed, 12 insertions, 6 deletions
diff --git a/packages/merchant-backoffice-ui/src/paths/instance/orders/list/index.tsx b/packages/merchant-backoffice-ui/src/paths/instance/orders/list/index.tsx
index 6888eda58..48f77e3d3 100644
--- a/packages/merchant-backoffice-ui/src/paths/instance/orders/list/index.tsx
+++ b/packages/merchant-backoffice-ui/src/paths/instance/orders/list/index.tsx
@@ -55,7 +55,7 @@ export default function OrderList({
   onSelect,
   onNotFound,
 }: Props): VNode {
-  const [filter, setFilter] = useState<InstanceOrderFilter>({});
+  const [filter, setFilter] = useState<InstanceOrderFilter>({ paid: "no" });
   const [orderToBeRefunded, setOrderToBeRefunded] = useState<
     MerchantBackend.Orders.OrderHistoryEntry | undefined
   >(undefined);
@@ -88,13 +88,15 @@ export default function OrderList({
     return onLoadError(result);
   }
 
-  const isPaidActive = filter.paid === "yes" ? "is-active" : "";
+  const isNotPaidActive = filter.paid === "no" ? "is-active" : "";
+  const isPaidActive = filter.paid === "yes" && filter.wired === undefined ? "is-active" : "";
   const isRefundedActive = filter.refunded === "yes" ? "is-active" : "";
-  const isNotWiredActive = filter.wired === "no" ? "is-active" : "";
+  const isNotWiredActive = filter.wired === "no" && filter.paid === "yes" ? "is-active" : "";
+  const isWiredActive = filter.wired === "yes" ? "is-active" : "";
   const isAllActive =
     filter.paid === undefined &&
-    filter.refunded === undefined &&
-    filter.wired === undefined
+      filter.refunded === undefined &&
+      filter.wired === undefined
       ? "is-active"
       : "";
 
@@ -127,7 +129,9 @@ export default function OrderList({
         errorOrderId={errorOrderId}
         isAllActive={isAllActive}
         isNotWiredActive={isNotWiredActive}
+        isWiredActive={isWiredActive}
         isPaidActive={isPaidActive}
+        isNotPaidActive={isNotPaidActive}
         isRefundedActive={isRefundedActive}
         jumpToDate={filter.date}
         onCopyURL={(id) =>
@@ -137,9 +141,11 @@ export default function OrderList({
         onSearchOrderById={testIfOrderExistAndSelect}
         onSelectDate={setNewDate}
         onShowAll={() => setFilter({})}
+        onShowNotPaid={() => setFilter({ paid: "no" })}
         onShowPaid={() => setFilter({ paid: "yes" })}
         onShowRefunded={() => setFilter({ refunded: "yes" })}
-        onShowNotWired={() => setFilter({ wired: "no" })}
+        onShowNotWired={() => setFilter({ wired: "no", paid: "yes" })}
+        onShowWired={() => setFilter({ wired: "yes" })}
       />
 
       {orderToBeRefunded && (