ok

src/index.js

@@ -6,9 +6,9 @@ import reportWebVitals from './reportWebVitals';
 
 const root = ReactDOM.createRoot(document.getElementById('root'));
 // Disable console methods
-console.log = () => {};
-console.warn = () => {};
-console.error = () => {};
+// console.log = () => {};
+// console.warn = () => {};
+// console.error = () => {};
 
 root.render(
   <React.StrictMode>

src/pages/Transactions.js

@@ -41,7 +41,7 @@ export default function Transactions({ shop, shopId, propsShopId, sendParam, dev
         //   response = await getMyTransactions(shopId || propsShopId, 5);
         // setMyTransactions(response);
         setLoading(true);
-        let response = await getTransactionsFromCafe(shopId || propsShopId, 5, false);
+        let response = await getTransactionsFromCafe(shopId || propsShopId, -1, false);
 
         setLoading(false);
         if (response) setTransactions(response);
@@ -65,20 +65,24 @@ const calculateAllTransactionsTotal = (transactions) => {
       return grandTotal + calculateTotalPrice(transaction.DetailedTransactions);
     }, 0);
 };
-
-  const searchAndAggregateItems = (transactions, searchTerm) => {
+const searchAndAggregateItems = (transactions, searchTerm) => {
   if (!searchTerm.trim()) return [];
 
   const normalizedTerm = searchTerm.trim().toLowerCase();
+  // Map with key = `${itemId}-${confirmedGroup}` to keep confirmed groups separate
   const aggregatedItems = new Map();
 
   transactions.forEach(transaction => {
+    // Determine confirmed group as a string key
+    const confirmedGroup = transaction.confirmed >= 0  && transaction.confirmed > 1 ? 'confirmed_gt_1' : 'confirmed_le_1';
+
     transaction.DetailedTransactions.forEach(detail => {
       const itemName = detail.Item.name;
       const itemNameLower = itemName.toLowerCase();
 
       if (itemNameLower.includes(normalizedTerm)) {
-          const key = detail.itemId;
+        // Combine itemId and confirmedGroup to keep them separated
+        const key = `${detail.itemId}-${confirmedGroup}`;
 
         if (!aggregatedItems.has(key)) {
           aggregatedItems.set(key, {
@@ -86,6 +90,7 @@ const calculateAllTransactionsTotal = (transactions) => {
             name: itemName,
             totalQty: 0,
             totalPrice: 0,
+            confirmedGroup, // Keep track of which group this belongs to
           });
         }
 
@@ -95,9 +100,10 @@ const calculateAllTransactionsTotal = (transactions) => {
       }
     });
   });
-
+console.log(aggregatedItems.values())
   return Array.from(aggregatedItems.values());
-  };
+};
+
 
 
   const handleConfirm = async (transactionId) => {
@@ -166,7 +172,7 @@ const calculateAllTransactionsTotal = (transactions) => {
 
         {matchedItems.length > 0 && matchedItems.map(item => (
           <div
-            key={item.itemId}
+ key={`${item.itemId}-${item.confirmedGroup}`}
              className={styles.RoundedRectangle}
             style={{ overflow: "hidden" }}
           >