Merge pull request #258 from Siddh2024/fix/merge-conflict-artifacts

fix: resolve merge conflict artifacts in 4 page files (closes #256)

Author: Nsanjayboruds

frontend/src/context/ShopContext.jsx

@@ -302,9 +302,7 @@ function ShopContext({ children }) {
     removeFromCompare,
     comparePanelOpen,
     toggleComparePanel,
-    wishlist,
-    loadingWishlist,
-    wishlistError,
+    wishlist, loadingWishlist, wishlistError,
     addToWishlist,
     fetchWishlist,
     removeFromWishlist,

frontend/src/pages/Order.jsx

@@ -4,24 +4,12 @@ import apiConfig from '../utils/apiConfig';
 import gsap from 'gsap';
 import { ScrollTrigger } from 'gsap/ScrollTrigger';
 import {
-  FaBox,
-  FaShoppingBag,
-  FaShippingFast,
-  FaCheckCircle,
-  FaClock,
-  FaMapMarkerAlt,
-  FaUndo,
-  FaCalendarAlt,
-  FaMoneyBillWave,
-  FaStar,
+  FaBox, FaShoppingBag, FaShippingFast, FaCheckCircle,
+  FaClock, FaMapMarkerAlt, FaUndo, FaCalendarAlt, FaMoneyBillWave, FaStar,
 } from 'react-icons/fa';
 import { GiReceiveMoney } from 'react-icons/gi';
 import Title from '../components/Title';
-import {
-  LoadingState,
-  EmptyState,
-  ErrorState,
-} from '../components/StateComponents';
+import { LoadingState, EmptyState, ErrorState } from '../components/StateComponents';
 
 gsap.registerPlugin(ScrollTrigger);
 

frontend/src/pages/wishlist.jsx

@@ -10,12 +10,8 @@ import { FaHeart, FaTrash } from 'react-icons/fa';
 
 function Wishlist() {
   const {
-    wishlist,
-    fetchWishlist,
-    currency,
-    removeFromWishlist,
-    loadingWishlist,
-    wishlistError,
+    wishlist, fetchWishlist, currency, removeFromWishlist,
+    loadingWishlist, wishlistError,
   } = useContext(shopDataContext);
 
   const navigate = useNavigate();