From e4e7b031b4d4b3803e01a7986c86b2ec2612583d Mon Sep 17 00:00:00 2001
From: Reckless_Satoshi <reckless.satoshi@protonmail.com>
Date: Mon, 28 Nov 2022 03:55:53 -0800
Subject: [PATCH] Fix random order matchmaking

---
 frontend/src/basic/MakerPage/index.tsx | 4 ++--
 frontend/src/utils/filterOrders.ts     | 9 ++++-----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/frontend/src/basic/MakerPage/index.tsx b/frontend/src/basic/MakerPage/index.tsx
index 69aeb84d..0a3dd901 100644
--- a/frontend/src/basic/MakerPage/index.tsx
+++ b/frontend/src/basic/MakerPage/index.tsx
@@ -71,9 +71,9 @@ const MakerPage = ({
             </Grid>
             <Grid item>
               <BookTable
-                book={book}
+                book={{ orders: matches, loading: book.loading }}
                 maxWidth={Math.min(windowSize.width, 60)} // EM units
-                maxHeight={Math.min(matches.length * 3.25 + 3.25, 16)} // EM units
+                maxHeight={Math.min(matches.length * 3.25 + 3, 16)} // EM units
                 defaultFullscreen={false}
                 showControls={false}
                 showFooter={false}
diff --git a/frontend/src/utils/filterOrders.ts b/frontend/src/utils/filterOrders.ts
index ba31ef1d..811d81b8 100644
--- a/frontend/src/utils/filterOrders.ts
+++ b/frontend/src/utils/filterOrders.ts
@@ -1,4 +1,4 @@
-import { Order, Favorites } from '../models';
+import { PublicOrder, Favorites } from '../models';
 
 interface AmountFilter {
   amount: string;
@@ -8,13 +8,13 @@ interface AmountFilter {
 }
 
 interface FilterOrders {
-  orders: Order[];
+  orders: PublicOrder[];
   baseFilter: Favorites;
   amountFilter?: AmountFilter | null;
   paymentMethods?: string[];
 }
 
-const filterByPayment = function (order: Order, paymentMethods: any[]) {
+const filterByPayment = function (order: PublicOrder, paymentMethods: any[]) {
   if (paymentMethods.length === 0) {
     return true;
   } else {
@@ -26,7 +26,7 @@ const filterByPayment = function (order: Order, paymentMethods: any[]) {
   }
 };
 
-const filterByAmount = function (order: Order, filter: AmountFilter) {
+const filterByAmount = function (order: PublicOrder, filter: AmountFilter) {
   const filterMaxAmount =
     Number(filter.amount != '' ? filter.amount : filter.maxAmount) * (1 + filter.threshold);
   const filterMinAmount =
@@ -54,7 +54,6 @@ const filterOrders = function ({
     const paymentMethodChecks =
       paymentMethods.length > 0 ? filterByPayment(order, paymentMethods) : true;
     const amountChecks = amountFilter != null ? filterByAmount(order, amountFilter) : true;
-
     return typeChecks && currencyChecks && paymentMethodChecks && amountChecks;
   });
   return filteredOrders;