diff --git a/src/pages/UserViewCart.tsx b/src/pages/UserViewCart.tsx
index 9c16c79a..a5d362a4 100644
--- a/src/pages/UserViewCart.tsx
+++ b/src/pages/UserViewCart.tsx
@@ -1,9 +1,9 @@
 /* eslint-disable */
-import React, { useEffect, useState } from "react";
-import { Meta } from "../components/Meta";
-import { useAppDispatch, useAppSelector } from "../store/store";
-import { PuffLoader, PulseLoader } from "react-spinners";
-import { toast } from "react-toastify";
+import React, { useEffect, useState } from 'react';
+import { Meta } from '../components/Meta';
+import { useAppDispatch, useAppSelector } from '../store/store';
+import { PuffLoader, PulseLoader } from 'react-spinners';
+import { toast } from 'react-toastify';
 import {
   checkout,
   getUserCarts,
@@ -15,7 +15,7 @@ import {
   createSessionStripe,
   updateCartStatus,
   userSaveOrder,
-} from "../store/features/carts/cartSlice";
+} from '../store/features/carts/cartSlice';
 import {
   FaCheckSquare,
   FaMinus,
@@ -24,21 +24,20 @@ import {
   FaTrash,
   FaGift,
   FaShippingFast,
-} from "react-icons/fa";
-import { GiBroom } from "react-icons/gi";
-import { useNavigate } from "react-router-dom";
-import Dialog from "@mui/material/Dialog";
-import DialogActions from "@mui/material/DialogActions";
-import DialogContent from "@mui/material/DialogContent";
-import DialogContentText from "@mui/material/DialogContentText";
-import DialogTitle from "@mui/material/DialogTitle";
-import Product from "../components/product/Product";
-import { Box, LinearProgress } from "@mui/material";
-import Button from "@mui/material/Button";
-import Dispatch from "react";
-import { fetchUserProfile } from "../store/features/user/userSlice";
-import { useLocation } from "react-router-dom";
-import { Empty } from "antd";
+} from 'react-icons/fa';
+import { GiBroom } from 'react-icons/gi';
+import { useNavigate } from 'react-router-dom';
+import Dialog from '@mui/material/Dialog';
+import DialogActions from '@mui/material/DialogActions';
+import DialogContent from '@mui/material/DialogContent';
+import DialogContentText from '@mui/material/DialogContentText';
+import DialogTitle from '@mui/material/DialogTitle';
+import Product from '../components/product/Product';
+import { Box, LinearProgress } from '@mui/material';
+import Button from '@mui/material/Button';
+import Dispatch from 'react';
+import { fetchUserProfile } from '../store/features/user/userSlice';
+import { useLocation } from 'react-router-dom';
 
 const UserViewCart: React.FC = () => {
   const dispatch = useAppDispatch();
@@ -57,8 +56,8 @@ const UserViewCart: React.FC = () => {
   const [open, setOpen] = useState(false);
   const [cartToPay, setCartToPay] = useState<string | null>(null);
   const [amountToPay, setAmountToPay] = useState<any>(null);
-  const [stripePrice, setStripePrice] = useState<string>("");
-  const [currentEndpoint, setCurrentEndpoint] = useState("");
+  const [stripePrice, setStripePrice] = useState<string>('');
+  const [currentEndpoint, setCurrentEndpoint] = useState('');
 
   const navigate = useNavigate();
   const location = useLocation();
@@ -74,20 +73,20 @@ const UserViewCart: React.FC = () => {
       setIsLoading(true);
       const response = await dispatch(getUserCarts());
       const response1 = await dispatch(getUserCarts()).unwrap();
-      if (response.payload === "Not authorized") {
+      if (response.payload === 'Not authorized') {
         setIsLoggedOut(true);
-        toast.error("Please login first");
-        navigate("/login");
+        toast.error('Please login first');
+        navigate('/login');
       }
       setCartResponseData(response1.data);
       setIsLoading(false);
     } catch (error: any) {
-      if (error === "Not authorized") {
+      if (error === 'Not authorized') {
         setIsLoggedOut(true);
-        toast.error("Please login first");
-        navigate("/login");
+        toast.error('Please login first');
+        navigate('/login');
       }
-      console.error("Error fetching carts:", error);
+      console.error('Error fetching carts:', error);
       setIsLoading(false);
       setIsError(true);
       toast.error(error.message);
@@ -109,12 +108,12 @@ const UserViewCart: React.FC = () => {
       const response = await dispatch(checkout(cartId));
       if (!response.payload) {
         throw new Error(
-          "Checkout failed, Check your internet connection or try again later"
+          'Checkout failed, Check your internet connection or try again later'
         );
       }
-      localStorage.setItem("cartToPay", cartId);
+      localStorage.setItem('cartToPay', cartId);
 
-      localStorage.setItem("productsToSave", JSON.stringify(productsArr));
+      localStorage.setItem('productsToSave', JSON.stringify(productsArr));
       const totalCartAmount = response.payload.data.totalAmount;
       const array = cartResponseData.carts[index];
 
@@ -127,14 +126,14 @@ const UserViewCart: React.FC = () => {
       );
       setTotalProductPrice(totalProductPrice);
 
-      const names = productsArr.map((product) => product.name).join(", ");
+      const names = productsArr.map((product) => product.name).join(', ');
       const descriptions = productsArr
         .map((product) => product.description)
-        .join(", ");
+        .join(', ');
       const image1 = productsArr[0]?.image;
       const image2 = productsArr[1]?.image;
       const shopidToSave: any = productsArr[0]?.shopId;
-      localStorage.setItem("shopIdToSave", shopidToSave);
+      localStorage.setItem('shopIdToSave', shopidToSave);
 
       const unit_amount = Math.round(totalCartAmount * 100);
 
@@ -150,16 +149,16 @@ const UserViewCart: React.FC = () => {
       );
       console.log(stripeProduct);
       localStorage.setItem(
-        "stripePrice",
+        'stripePrice',
         stripeProduct.payload.data.product.default_price
       );
 
       setCheckoutSuccess(true);
 
-      toast.success("Checkout is done Successfully");
+      toast.success('Checkout is done Successfully');
     } catch (error) {
-      console.error("Checkout failed", error);
-      toast.error("Checkout failed");
+      console.error('Checkout failed', error);
+      toast.error('Checkout failed');
     } finally {
       setIsPreloader(false);
     }
@@ -170,19 +169,17 @@ const UserViewCart: React.FC = () => {
       setIsPreloader(true);
       const profile: any = await dispatch(fetchUserProfile());
       const data = {
-        successUrl:
-          "https://e-commerce-ninja-fn-staging.netlify.app/shopping-cart?success",
-        cancelUrl:
-          "https://e-commerce-ninja-fn-staging.netlify.app/shopping-cart?cancel",
+        successUrl: 'https://e-commerce-ninja-fn-staging.netlify.app/shopping-cart?success',
+        cancelUrl: 'https://e-commerce-ninja-fn-staging.netlify.app/shopping-cart?cancel',
         customerEmail: profile.payload.email,
-        price: localStorage.getItem("stripePrice"),
+        price: localStorage.getItem('stripePrice'),
       };
       const response = await dispatch(createSessionStripe(data));
       const url = response.payload.data.session.url;
       window.location.href = url;
     } catch (error) {
-      console.error("Checkout failed", error);
-      toast.error("Payment initialization failed, try again later");
+      console.error('Checkout failed', error);
+      toast.error('Payment initialization failed, try again later');
     } finally {
       setIsPreloader(false);
     }
@@ -190,24 +187,24 @@ const UserViewCart: React.FC = () => {
 
   const checkPayFailOrSuccess = async () => {
     const params = window.location.search.slice(1);
-    if (params === "success") {
+    if (params === 'success') {
       setIsPreloader(true);
-      const cartId = localStorage.getItem("cartToPay");
-      const products = localStorage.getItem("productsToSave");
-      const shopId = localStorage.getItem("shopIdToSave");
+      const cartId = localStorage.getItem('cartToPay');
+      const products = localStorage.getItem('productsToSave');
+      const shopId = localStorage.getItem('shopIdToSave');
       console.log("Caert id", cartId);
-      console.log("Product ", products);
-      console.log("Shop id ", shopId);
+      console.log("Product ", products)
+      console.log("Shop id ", shopId)
       if (!cartId || !products || !shopId) {
-        navigate("/shopping-cart");
-        toast.error("Unknown error occurred saving order");
+        navigate('/shopping-cart');
+        toast.error('Unknown error occurred saving order');
         return;
       }
       const data = {
         cartId: cartId,
-        status: "Paid",
+        status: 'Paid',
       };
-
+      
       const response = await dispatch(getUserCarts());
       const response1 = await dispatch(getUserCarts()).unwrap();
       setCartResponseData(response1.data);
@@ -215,20 +212,20 @@ const UserViewCart: React.FC = () => {
       const order = await dispatch(
         userSaveOrder({
           cartId: cartId,
-          paymentMethodId: "Stripe",
+          paymentMethodId: 'Stripe',
           products: products,
           shopId: shopId,
         })
       );
-      toast.success("Cart Payment successful");
-      localStorage.removeItem("cartToPay");
-      localStorage.removeItem("productsToSave");
-      localStorage.removeItem("shopIdToSave");
-      navigate("/my-orders");
+      toast.success('Cart Payment successful');
+      localStorage.removeItem('cartToPay');
+      localStorage.removeItem('productsToSave');
+      localStorage.removeItem('shopIdToSave');
+      navigate('/my-orders');
       setIsPreloader(false);
-    } else if (params === "cancel") {
-      toast.error("Payment cancelled successfully");
-      navigate("/shopping-cart");
+    } else if (params === 'cancel') {
+      toast.error('Payment cancelled successfully');
+      navigate('/shopping-cart');
       setIsPreloader(false);
     }
   };
@@ -259,7 +256,7 @@ const UserViewCart: React.FC = () => {
   if (!cartResponseData || cartResponseData?.carts?.length < 1) {
     return (
       <div className="error-message">
-        <Empty image={Empty.PRESENTED_IMAGE_SIMPLE} description={"Empty cart"} />
+        <p>Your cart is empty.</p>
       </div>
     );
   }
@@ -286,12 +283,12 @@ const UserViewCart: React.FC = () => {
         toast.error(response.message);
       }
     } catch (error: any) {
-      if (error === "Not authorized") {
-        localStorage.setItem("pendingCartProduct", productId);
-        toast.error("Please login first");
-        navigate("/login");
+      if (error === 'Not authorized') {
+        localStorage.setItem('pendingCartProduct', productId);
+        toast.error('Please login first');
+        navigate('/login');
       } else {
-        toast.error("Something went wrong. Please try again later.");
+        toast.error('Something went wrong. Please try again later.');
       }
     } finally {
       setIsLoading(false);
@@ -314,8 +311,8 @@ const UserViewCart: React.FC = () => {
     await dispatch(clearCarts()).unwrap();
     setIsPreloader(false);
     await fetchCarts();
-    toast.success("Cart cleared successfully");
-    navigate("/shopping-cart");
+    toast.success('Cart cleared successfully');
+    navigate('/shopping-cart');
     handleClose();
   };
 
@@ -331,10 +328,10 @@ const UserViewCart: React.FC = () => {
       );
       setCartResponseData({ ...cartResponseData, carts: remainingCarts });
       setIsPreloader(false);
-      toast.success("Cart cleared successfully");
+      toast.success('Cart cleared successfully');
     } catch (error) {
-      console.error("Error clearing cart:", error);
-      toast.error("Failed to clear the cart");
+      console.error('Error clearing cart:', error);
+      toast.error('Failed to clear the cart');
     } finally {
       setIsPreloader(false);
     }
@@ -354,9 +351,9 @@ const UserViewCart: React.FC = () => {
       const response = await dispatch(clearCartProduct({ cartId, productId }));
       const response1 = await dispatch(getUserCarts()).unwrap();
       setCartResponseData(response1.data);
-      toast.success("product cleared successfully");
+      toast.success('product cleared successfully');
     } catch (error) {
-      toast.error("Failed to clear the product ");
+      toast.error('Failed to clear the product ');
       throw error;
     } finally {
       setIsPreloader(false);
@@ -373,12 +370,12 @@ const UserViewCart: React.FC = () => {
       <Meta title="View shopping cart - E-Commerce Ninjas" />
       {isPreloader && (
         <div className="table__spinner">
-          <Box sx={{ width: "100%" }}>
+          <Box sx={{ width: '100%' }}>
             <LinearProgress
               sx={{
-                backgroundColor: "#fff",
-                "& .MuiLinearProgress-bar": {
-                  backgroundColor: "#ff8a46",
+                backgroundColor: '#fff',
+                '& .MuiLinearProgress-bar': {
+                  backgroundColor: '#ff8a46',
                 },
               }}
             />
@@ -404,7 +401,7 @@ const UserViewCart: React.FC = () => {
                 <div className="title">
                   <FaCheckSquare className="check" color="#ff6d18" />
                   <h2>Shopping Cart</h2>
-                  {cart.status === "Paid" ? (
+                  {cart.status === 'Paid' ? (
                     <button className="checkout-btn" disabled>
                       Paid
                     </button>
@@ -415,7 +412,7 @@ const UserViewCart: React.FC = () => {
                       }
                       className={`checkout-btn`}
                     >
-                      <span>{"Checkout"}</span>
+                      <span>{'Checkout'}</span>
                     </button>
                   )}
 
@@ -447,14 +444,11 @@ const UserViewCart: React.FC = () => {
                                 {product.discount}
                               </span>
                               <div className="price">{product.price} RWF</div>
-                              <div
-                                className="description"
-                                style={{ fontSize: "1.6rem" }}
-                              >
+                              <div className="description">
                                 {product.description}
                               </div>
                             </div>
-                            {cart.status !== "Paid" && (
+                            {cart.status !== 'Paid' && (
                               <div className="controls">
                                 <div className="quantity">
                                   <button
@@ -523,7 +517,7 @@ const UserViewCart: React.FC = () => {
                   <div className="icon">
                     <FaShippingFast />
                   </div>
-                  <div className="text"> 0 RWF</div>
+                  <div className="text">0.00 RWF</div>
                 </div>
               </div>
             </div>
@@ -533,7 +527,7 @@ const UserViewCart: React.FC = () => {
 
                 {arrayOfProduct.products.map((product, index) => (
                   <div className="row" key={index}>
-                    <div className="left">{product.name} :</div>
+                    <div className="left">{product.name}:</div>
                     <div className="right">{product.price} RWF</div>
                   </div>
                 ))}
@@ -557,12 +551,12 @@ const UserViewCart: React.FC = () => {
               aria-describedby="alert-dialog-description"
             >
               <DialogTitle id="alert-dialog-title">
-                {"Delete all Carts"}
+                {'Delete all Carts'}
               </DialogTitle>
               <DialogContent>
                 <DialogContentText
                   id="alert-dialog-description"
-                  sx={{ fontSize: "1.6rem" }}
+                  sx={{ fontSize: '1.6rem' }}
                 >
                   Are you sure you want to delete all Carts ?
                 </DialogContentText>
@@ -571,12 +565,12 @@ const UserViewCart: React.FC = () => {
                 <Button
                   onClick={handleClose}
                   sx={{
-                    backgroundColor: "primary.main",
-                    color: "#fff",
-                    fontSize: "1.2rem",
-                    "&:hover": {
-                      backgroundColor: "primary.dark",
-                      color: "#fff",
+                    backgroundColor: 'primary.main',
+                    color: '#fff',
+                    fontSize: '1.2rem',
+                    '&:hover': {
+                      backgroundColor: 'primary.dark',
+                      color: '#fff',
                     },
                   }}
                 >
@@ -585,12 +579,12 @@ const UserViewCart: React.FC = () => {
                 <Button
                   onClick={handleClearCart}
                   sx={{
-                    backgroundColor: "#ff6d18",
-                    color: "#fff",
-                    fontSize: "1.2rem",
-                    "&:hover": {
-                      backgroundColor: "#e65b00",
-                      color: "#fff",
+                    backgroundColor: '#ff6d18',
+                    color: '#fff',
+                    fontSize: '1.2rem',
+                    '&:hover': {
+                      backgroundColor: '#e65b00',
+                      color: '#fff',
                     },
                   }}
                   autoFocus
@@ -606,4 +600,4 @@ const UserViewCart: React.FC = () => {
   );
 };
 
-export default UserViewCart;
+export default UserViewCart;
\ No newline at end of file
diff --git a/src/pages/UserViewOrders.tsx b/src/pages/UserViewOrders.tsx
index 4dbfc0fe..365c0ef2 100644
--- a/src/pages/UserViewOrders.tsx
+++ b/src/pages/UserViewOrders.tsx
@@ -267,4 +267,4 @@ const UserVIewOrders: React.FC = () => {
   );
 };
 
-export default UserVIewOrders;
+export default UserVIewOrders;
\ No newline at end of file
diff --git a/src/pages/trackOrder.tsx b/src/pages/trackOrder.tsx
index 610c73c7..c844df44 100644
--- a/src/pages/trackOrder.tsx
+++ b/src/pages/trackOrder.tsx
@@ -129,7 +129,7 @@ const TrackOrder = () => {
                 <br />
                 <br />
               </strong>
-              <b>${product.quantity * product.price}</b>
+              <b>{product.quantity * product.price} RWF</b>
             </p>
             <p>
               <strong>
@@ -164,4 +164,4 @@ const TrackOrder = () => {
   );
 };
 
-export default TrackOrder;
+export default TrackOrder;
\ No newline at end of file
diff --git a/src/router.tsx b/src/router.tsx
index aeb7693a..15c1e80d 100644
--- a/src/router.tsx
+++ b/src/router.tsx
@@ -11,21 +11,23 @@ import { ResendEmail } from './components/ResendEmail';
 import GoogleCallback from './components/GoogleCallback';
 import SendResetPasswordLink from './pages/SendResetPasswordLink';
 import ResetPassword from './pages/ResetPassword';
-import { ProtectedRoute } from "./utils/protectRoute/ProtectedRoute";
+import { ProtectedRoute } from './utils/protectRoute/ProtectedRoute';
 import ViewProduct from './pages/ViewProduct';
 import Login from './pages/Login';
 import UserViewCart from './pages/UserViewCart';
-import Search from "./pages/Search";
-import SellerViewProduct from "./pages/seller/SellerViewProduct";
-import SellerCollection from "./pages/seller/SellerCollection";
-import { SellerLayout } from "./components/layout/SellerLayout";
-import SellerDashboard from "./pages/seller/SellerDashboard";
-import { AdminDashboard } from "./pages/admin/Dashboard";
-import { OverViewDashboard } from "./pages/admin/OverView";
-import Users from "./pages/admin/Users";
+import Search from './pages/Search';
+import SellerViewProduct from './pages/seller/SellerViewProduct';
+import SellerCollection from './pages/seller/SellerCollection';
+import { SellerLayout } from './components/layout/SellerLayout';
+import SellerDashboard from './pages/seller/SellerDashboard';
+import { AdminDashboard } from './pages/admin/Dashboard';
+import { OverViewDashboard } from './pages/admin/OverView';
+import Users from './pages/admin/Users';
 import Logout from './components/layout/Logout';
 import UserProfile from './pages/UserEditProfile';
 import ProductsPage from './pages/Products';
+import TrackOrder from './pages/trackOrder';
+import UserVIewOrders from './pages/UserViewOrders';
 const AppRouter: React.FC = () => {
   return (
     <div>
@@ -38,17 +40,37 @@ const AppRouter: React.FC = () => {
           <Route path="login" element={<Login />} />
           <Route path="verify-email" element={<EmailVerifying />} />
           <Route path="resend-email" element={<ResendEmail />} />
-          <Route path="/api/auth/verify-email/:token" element={<VerifyEmail />} />
-          <Route path="/api/auth/google/callback" element={<GoogleCallback />} />
+          <Route
+            path="/api/auth/verify-email/:token"
+            element={<VerifyEmail />}
+          />
+          <Route
+            path="/api/auth/google/callback"
+            element={<GoogleCallback />}
+          />
           <Route path="/reset-password" element={<SendResetPasswordLink />} />
-          <Route path="/api/auth/reset-password/:token" element={<ResetPassword />} />
+          <Route
+            path="/api/auth/reset-password/:token"
+            element={<ResetPassword />}
+          />
           <Route path="product/:id" element={<ViewProduct />} />
           <Route path="search" element={<Search />} />
           <Route path="logout" element={<Logout />} />
           <Route path="shopping-cart" element={<UserViewCart />} />
-          <Route path="/profile-settings" element={<ProtectedRoute redirectPath="/login"><UserProfile /></ProtectedRoute>}/>
+          <Route path="my-orders" element={<UserVIewOrders />} />
+          <Route
+            path="trackOrder/:orderId/:productId"
+            element={<TrackOrder />}
+          />
+          <Route
+            path="/profile-settings"
+            element={
+              <ProtectedRoute redirectPath="/login">
+                <UserProfile />
+              </ProtectedRoute>
+            }
+          />
           <Route path="*" element={<NotFound />} />
-        
         </Route>
         <Route path="/seller" element={<SellerLayout />}>
           <Route index element={<Navigate to="dashboard" replace />} />
@@ -63,8 +85,15 @@ const AppRouter: React.FC = () => {
           <Route path="products" element={<SellerCollection />} />
         </Route>
         <Route path="/admin">
-         <Route index element={<Navigate to="dashboard" replace />} />
-          <Route path="dashboard" element={<ProtectedRoute redirectPath="/login"><AdminDashboard /></ProtectedRoute>}>
+          <Route index element={<Navigate to="dashboard" replace />} />
+          <Route
+            path="dashboard"
+            element={
+              <ProtectedRoute redirectPath="/login">
+                <AdminDashboard />
+              </ProtectedRoute>
+            }
+          >
             <Route index element={<OverViewDashboard />} />
             <Route path="users" element={<Users />} />
           </Route>
@@ -74,4 +103,4 @@ const AppRouter: React.FC = () => {
   );
 };
 
-export default AppRouter;
\ No newline at end of file
+export default AppRouter;