From 000b777b0f53e4d004f3fffd6a16976dfda68335 Mon Sep 17 00:00:00 2001
From: Buyankhuu Tsolmonkhuu <Buyankhuuts@Berkeley.edu>
Date: Mon, 8 Apr 2024 17:54:18 -0700
Subject: [PATCH 1/2] switchBrnach

---
 src/app/profileScreen/page.tsx | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/app/profileScreen/page.tsx b/src/app/profileScreen/page.tsx
index d8bd8add..16703a92 100644
--- a/src/app/profileScreen/page.tsx
+++ b/src/app/profileScreen/page.tsx
@@ -1,7 +1,7 @@
 'use client';
 
 import { useRouter } from 'next/navigation';
-import { toast } from 'react-toastify';
+import { toast, ToastContainer } from 'react-toastify';
 import { useEffect, useState } from 'react';
 import {
   Heading2,
@@ -387,6 +387,12 @@ export default function Profile() {
   return (
     <Fullscreen>
       <NavBarMovedUP />
+      <ToastContainer
+        position="top-center"
+        autoClose={500}
+        limit={1}
+        hideProgressBar
+      />
       <ColumnDiv>
         <MostRecentOrder>
           <HeadingBack>

From 01a6c0e710c8cdcddbbb4c30d3db138f871ee003 Mon Sep 17 00:00:00 2001
From: Buyankhuu Tsolmonkhuu <Buyankhuuts@Berkeley.edu>
Date: Mon, 8 Apr 2024 18:41:02 -0700
Subject: [PATCH 2/2] feat:queryExcludesIP

---
 src/api/supabase/queries/order_queries.ts | 3 ++-
 src/api/supabase/queries/user_queries.ts  | 1 -
 src/app/orderHistory/page.tsx             | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/api/supabase/queries/order_queries.ts b/src/api/supabase/queries/order_queries.ts
index d9aff0d0..fdd4e246 100644
--- a/src/api/supabase/queries/order_queries.ts
+++ b/src/api/supabase/queries/order_queries.ts
@@ -67,7 +67,8 @@ export async function fetchOrdersByUser(): Promise<Order[]> {
   const { data, error } = await supabase
     .from('order')
     .select('*')
-    .eq('user_id', userId);
+    .eq('user_id', userId)
+    .neq('status', 'In Progress');
 
   if (error) {
     throw new Error(`Error fetching orders for user: ${error.message}`);
diff --git a/src/api/supabase/queries/user_queries.ts b/src/api/supabase/queries/user_queries.ts
index 13b50d3c..4db5252a 100644
--- a/src/api/supabase/queries/user_queries.ts
+++ b/src/api/supabase/queries/user_queries.ts
@@ -144,7 +144,6 @@ export async function fetchCurrentUserAddress() {
     if (error) {
       console.error('Error fetching user data:', error);
     }
-
     return address;
   } catch (error) {
     console.error('Error:', error);
diff --git a/src/app/orderHistory/page.tsx b/src/app/orderHistory/page.tsx
index 8e1efd9c..62b3bf77 100644
--- a/src/app/orderHistory/page.tsx
+++ b/src/app/orderHistory/page.tsx
@@ -1,7 +1,7 @@
 'use client';
 
 import React, { useEffect, useState } from 'react';
-import { Heading1 } from '@/styles/fonts';
+import { Heading1, Body1 } from '@/styles/fonts';
 import OrderDetailsWithProducts from '../../components/OrderHistory/OrderHistoryBox';
 import { fetchOrderIdsByUserIdSorted } from '../../api/supabase/queries/order_queries';
 import Footer from '../../components/FooterFolder/Footer';
@@ -37,7 +37,7 @@ function OrderHistory() {
               <OrderDetailsWithProducts key={orderId} orderId={orderId} />
             ))
           ) : (
-            <div>Loading...</div>
+            <Body1>No Order</Body1>
           )}
         </OrderHistoryContainer>
       </OutterBox>