diff --git a/src/App.jsx b/src/App.jsx
index 3ad3902..0706715 100644
--- a/src/App.jsx
+++ b/src/App.jsx
@@ -23,7 +23,7 @@ import { ThemeProvider } from "@/context/ThemeContext";
 import Contributors from "@/components/Contributors";
 import AOS from "aos";
 import "aos/dist/aos.css";
-import { CoinContext } from "@/context/CoinContext";
+import { CoinContext } from "@/context/contexts";
 import LoadingSpinner from "@/components/LoadingSpinner";
 import { Toaster } from "react-hot-toast";
 import ScrollToTop from "@/components/ScrollToTop";
diff --git a/src/components/MarketFilters.jsx b/src/components/MarketFilters.jsx
index e6cf1d6..69ed355 100644
--- a/src/components/MarketFilters.jsx
+++ b/src/components/MarketFilters.jsx
@@ -1,6 +1,6 @@
 import React, {useState} from 'react'
 import { useContext } from "react";
-import { CoinContext } from "../context/CoinContext";
+import { CoinContext } from "../context/contexts";
 import "./MarketFilters.css";
 
 const MarketFilters = () => {
diff --git a/src/components/Navbar.jsx b/src/components/Navbar.jsx
index 0a4bb7d..5039387 100644
--- a/src/components/Navbar.jsx
+++ b/src/components/Navbar.jsx
@@ -15,28 +15,14 @@ function Navbar() {
   const [scrolled, setScrolled] = useState(false);
   const [openDropdown, setOpenDropdown] = useState(null);
   const [isProfileOpen, setIsProfileOpen] = useState(false);
- 
 
   const isDashboardPage = location.pathname === "/dashboard";
 
   /* -------------------- Handlers -------------------- */
-
-  const handleDropdownEnter = (label) => {
-    setOpenDropdown(label);
-  };
-
-  const handleDropdownLeave = () => {
-    setOpenDropdown(null);
-    };
-
-  const handleDropdownClick = (label) => {
-    setOpenDropdown(openDropdown === label ? null : label);
-  };
-
-  const toggleMobileMenu = () => {
-    setIsMobileMenuOpen((prev) => !prev);
-  };
-
+  const handleDropdownEnter = (label) => setOpenDropdown(label);
+  const handleDropdownLeave = () => setOpenDropdown(null);
+  const handleDropdownClick = (label) => setOpenDropdown((prev) => (prev === label ? null : label));
+  const toggleMobileMenu = () => setIsMobileMenuOpen((prev) => !prev);
   const closeMobileMenu = () => {
     setIsMobileMenuOpen(false);
     setOpenDropdown(null);
@@ -53,7 +39,6 @@ function Navbar() {
   }, [logout, navigate]);
 
   /* -------------------- Effects -------------------- */
-
   useEffect(() => {
     const onScroll = () => setScrolled(window.scrollY > 20);
     window.addEventListener("scroll", onScroll);
@@ -62,32 +47,35 @@ function Navbar() {
 
   useEffect(() => {
     const handleClickOutside = (e) => {
-      if (openDropdown && !e.target.closest(".dropdown-container")) {
-        setOpenDropdown(null);
-      }
-      if (isProfileOpen && !event.target.closest('.profile-menu-container')) {
-        setIsProfileOpen(false);
+      try {
+        if (openDropdown && !e.target.closest(".dropdown-container") && !e.target.closest(".dropdown-trigger")) {
+          setOpenDropdown(null);
+        }
+        if (isProfileOpen && !e.target.closest('.profile-menu-container')) {
+          setIsProfileOpen(false);
+        }
+      } catch (err) {
+        // ignore
       }
     };
 
-    const handleEscapeKey = (event) => {
-      if (event.key === 'Escape') {
+    const handleEscapeKey = (ev) => {
+      if (ev.key === 'Escape') {
         if (openDropdown) setOpenDropdown(null);
         if (isProfileOpen) setIsProfileOpen(false);
       }
     };
 
     document.addEventListener("click", handleClickOutside);
-    document.addEventListener("keydown", handleEscape);
+    document.addEventListener("keydown", handleEscapeKey);
 
     return () => {
       document.removeEventListener("click", handleClickOutside);
-      document.removeEventListener("keydown", handleEscape);
+      document.removeEventListener("keydown", handleEscapeKey);
     };
   }, [openDropdown, isProfileOpen]);
 
   /* -------------------- Nav Links -------------------- */
-
   const navLinks = [
     { to: "/", label: "Home" },
     { to: "/pricing", label: "Pricing" },
@@ -111,13 +99,10 @@ function Navbar() {
 
   const linksToRender = currentUser ? authenticatedNavLinks : navLinks;
 
-  /* -------------------- JSX -------------------- */
-
   return (
     <nav
-      className={`navbar ${scrolled ? "scrolled" : ""} ${
-        isMobileMenuOpen ? "has-mobile-menu" : ""
-      } ${isDashboardPage ? "is-dashboard" : ""}`}
+      data-theme={theme}
+      className={`navbar ${scrolled ? "scrolled" : ""} ${isMobileMenuOpen ? "has-mobile-menu" : ""} ${isDashboardPage ? "is-dashboard" : ""}`}
     >
       <div className="navbar-content">
         {/* Logo */}
@@ -128,57 +113,22 @@ function Navbar() {
 
         {/* Desktop Menu */}
         {!isDashboardPage && (
-    <ul className="navbar-menu">
-      {(currentUser ? authenticatedNavLinks : navLinks).map((link) => (
-        <li
-          key={link.label}
-          className="navbar-item"
-          onMouseEnter={() => link.dropdown && handleDropdownEnter(link.label)}
-          onMouseLeave={handleDropdownLeave}
-        >
-          {link.dropdown ? (
-            <>
-              <span 
-                className="navbar-link dropdown-trigger"
-                onClick={() => handleDropdownClick(link.label)}
-                role="button"
-                aria-expanded={openDropdown === link.label}
-                aria-haspopup="true"
-                tabIndex={0}
-                onKeyDown={(e) => {
-                  if (e.key === 'Enter' || e.key === ' ') {
-                    e.preventDefault();
-                    handleDropdownClick(link.label);
-                  }
-                }}
-              >
-                {link.label}
-              </span>
-
-              <ul 
-                className={`dropdown-menu ${openDropdown === link.label ? 'show' : ''}`}
-                role="menu"
-                aria-label={`${link.label} submenu`}
+          <ul className="navbar-menu">
+            {linksToRender.map((link) => (
+              <li
+                key={link.label}
+                className="navbar-item"
+                onMouseEnter={() => link.dropdown && handleDropdownEnter(link.label)}
+                onMouseLeave={handleDropdownLeave}
               >
-                {!link.dropdown ? (
-                  <Link
-                    to={link.to}
-                    className={`navbar-link ${
-                      location.pathname === link.to ? "active" : ""
-                    }`}
-                    onClick={closeMobileMenu}
-                  >
-                    {link.label}
-                  </Link>
-                ) : (
+                {link.dropdown ? (
                   <>
-                    <span
+                    <button
+                      type="button"
                       className="navbar-link dropdown-trigger"
-                      role="button"
-                      tabIndex={0}
-                      aria-haspopup="true"
-                      aria-expanded={openDropdown === link.label}
                       onClick={() => handleDropdownClick(link.label)}
+                      aria-expanded={openDropdown === link.label}
+                      aria-haspopup="true"
                       onKeyDown={(e) => {
                         if (e.key === "Enter" || e.key === " ") {
                           e.preventDefault();
@@ -187,28 +137,22 @@ function Navbar() {
                       }}
                     >
                       {link.label}
-                    </span>
+                    </button>
 
-                    <ul
-                      className={`dropdown-menu ${
-                        openDropdown === link.label ? "show" : ""
-                      }`}
-                      role="menu"
-                    >
+                    <ul className={`dropdown-menu ${openDropdown === link.label ? "show" : ""}`} role="menu" aria-label={`${link.label} submenu`}>
                       {link.dropdown.map((item) => (
                         <li key={item.to} role="none">
-                          <Link
-                            to={item.to}
-                            className="dropdown-link"
-                            role="menuitem"
-                            onClick={closeMobileMenu}
-                          >
+                          <Link to={item.to} className="dropdown-link" role="menuitem" onClick={closeMobileMenu}>
                             {item.label}
                           </Link>
                         </li>
                       ))}
                     </ul>
                   </>
+                ) : (
+                  <Link to={link.to} className={`navbar-link ${location.pathname === link.to ? "active" : ""}`} onClick={closeMobileMenu}>
+                    {link.label}
+                  </Link>
                 )}
               </li>
             ))}
@@ -220,42 +164,32 @@ function Navbar() {
           <div className="desktop-auth">
             {currentUser ? (
               <div className="profile-menu-container">
-                <button 
+                <button
                   className="profile-icon-btn"
-                  onClick={() => setIsProfileOpen(!isProfileOpen)}
+                  onClick={() => setIsProfileOpen((s) => !s)}
                   aria-label="User profile menu"
                   aria-expanded={isProfileOpen}
                 >
                   <FiUser />
                 </button>
-                
+
                 <div className={`profile-dropdown ${isProfileOpen ? 'show' : ''}`}>
                   <div className="profile-dropdown-header">
                     <FiMail className="profile-icon" />
                     <span className="profile-email">{currentUser.email}</span>
                   </div>
-                  
-                  <div className="profile-dropdown-divider"></div>
-                  
+
+                  <div className="profile-dropdown-divider" />
+
                   <div className="profile-dropdown-items">
                     {isEmailProvider() && (
-                      <Link
-                        to="/change-password"
-                        className="profile-dropdown-item"
-                        onClick={() => setIsProfileOpen(false)}
-                      >
+                      <Link to="/change-password" className="profile-dropdown-item" onClick={() => setIsProfileOpen(false)}>
                         <FiLock />
                         <span>Change Password</span>
                       </Link>
                     )}
-                    
-                    <button 
-                      onClick={() => {
-                        setIsProfileOpen(false);
-                        handleLogout();
-                      }} 
-                      className="profile-dropdown-item logout-item"
-                    >
+
+                    <button onClick={() => { setIsProfileOpen(false); handleLogout(); }} className="profile-dropdown-item logout-item">
                       <FiLogOut />
                       <span>Logout</span>
                     </button>
@@ -264,94 +198,53 @@ function Navbar() {
               </div>
             ) : (
               <>
-                <Link to="/login" className="navbar-btn navbar-btn-login">
-                  LOGIN
-                </Link>
-                <Link to="/signup" className="navbar-btn navbar-btn-signup">
-                  Get Started
-                </Link>
+                <Link to="/login" className="navbar-btn navbar-btn-login">LOGIN</Link>
+                <Link to="/signup" className="navbar-btn navbar-btn-signup">Get Started</Link>
               </>
             )}
           </div>
 
           {/* Mobile Toggle */}
-          <button
-            className={`navbar-toggle ${
-              isMobileMenuOpen ? "active" : ""
-            }`}
-            onClick={toggleMobileMenu}
-            aria-label="Toggle navigation"
-          >
+          <button className={`navbar-toggle ${isMobileMenuOpen ? "active" : ""}`} onClick={toggleMobileMenu} aria-label="Toggle navigation">
             <span />
             <span />
             <span />
           </button>
         </div>
-
       </div>
 
       {/* Mobile Menu Dropdown */}
       {isMobileMenuOpen && !isDashboardPage && (
         <div className="mobile-menu">
           <ul className="mobile-menu-list">
-            {(currentUser ? authenticatedNavLinks : navLinks).map((link) => (
+            {linksToRender.map((link) => (
               <li key={link.label} className="mobile-menu-item">
                 {link.dropdown ? (
                   <>
-                    <span 
-                      className="mobile-menu-link"
-                      onClick={() => handleDropdownClick(link.label)}
-                    >
+                    <button className="mobile-menu-link" onClick={() => handleDropdownClick(link.label)}>
                       {link.label}
-                    </span>
+                    </button>
                     {openDropdown === link.label && (
                       <ul className="mobile-dropdown-menu">
                         {link.dropdown.map((item) => (
                           <li key={item.to}>
-                            <Link
-                              to={item.to}
-                              className="mobile-dropdown-link"
-                              onClick={closeMobileMenu}
-                            >
-                              {item.label}
-                            </Link>
+                            <Link to={item.to} className="mobile-dropdown-link" onClick={closeMobileMenu}>{item.label}</Link>
                           </li>
                         ))}
                       </ul>
                     )}
                   </>
                 ) : (
-                  <Link
-                    to={link.to}
-                    className={`mobile-menu-link ${
-                      location.pathname === link.to ? "active" : ""
-                    }`}
-                    onClick={closeMobileMenu}
-                  >
-                    {link.label}
-                  </Link>
+                  <Link to={link.to} className={`mobile-menu-link ${location.pathname === link.to ? "active" : ""}`} onClick={closeMobileMenu}>{link.label}</Link>
                 )}
               </li>
             ))}
           </ul>
 
-          {/* Mobile Auth Buttons */}
           {!currentUser && (
             <div className="mobile-auth">
-              <Link
-                to="/login"
-                className="navbar-btn navbar-btn-login"
-                onClick={closeMobileMenu}
-              >
-                LOGIN
-              </Link>
-              <Link
-                to="/signup"
-                className="navbar-btn navbar-btn-signup"
-                onClick={closeMobileMenu}
-              >
-                Get Started
-              </Link>
+              <Link to="/login" className="navbar-btn navbar-btn-login" onClick={closeMobileMenu}>LOGIN</Link>
+              <Link to="/signup" className="navbar-btn navbar-btn-signup" onClick={closeMobileMenu}>Get Started</Link>
             </div>
           )}
         </div>
diff --git a/src/context/ActivityContext.jsx b/src/context/ActivityContext.jsx
index dff1cc0..ea2dd30 100644
--- a/src/context/ActivityContext.jsx
+++ b/src/context/ActivityContext.jsx
@@ -1,8 +1,6 @@
-import React, { createContext, useContext, useState, useEffect, useMemo, useCallback } from "react";
+import React, { useContext, useState, useEffect, useMemo, useCallback } from "react";
+import { ActivityContext } from "./contexts";
 
-const ActivityContext = createContext({});
-
-// eslint-disable-next-line react-refresh/only-export-components
 export const useActivity = () => {
   const context = useContext(ActivityContext);
   if (!context) {
@@ -63,4 +61,4 @@ export const ActivityProvider = ({ children }) => {
   );
 };
 
-export default ActivityContext;
+// ActivityContext object is exported from `src/context/contexts.js`.
diff --git a/src/context/AuthContext.jsx b/src/context/AuthContext.jsx
index a952507..f305568 100644
--- a/src/context/AuthContext.jsx
+++ b/src/context/AuthContext.jsx
@@ -1,12 +1,5 @@
 /* eslint-disable react-refresh/only-export-components */
-import React, {
-  createContext,
-  useContext,
-  useState,
-  useEffect,
-  useMemo,
-  useCallback,
-} from "react";
+import React, { useContext, useState, useEffect, useMemo, useCallback } from "react";
 import {
   createUserWithEmailAndPassword,
   signInWithEmailAndPassword,
@@ -22,8 +15,7 @@ import {
 } from "firebase/auth";
 import { doc, setDoc, getDoc, serverTimestamp } from "firebase/firestore";
 import { auth, db, googleProvider, isFirebaseConfigured } from "../firebase";
-
-const AuthContext = createContext({});
+import { AuthContext } from "./contexts";
 
 export const useAuth = () => {
   const context = useContext(AuthContext);
@@ -37,8 +29,6 @@ export const AuthProvider = ({ children }) => {
   const [currentUser, setCurrentUser] = useState(null);
   const [loading, setLoading] = useState(true);
 
-
-  //   verify recent authentication 
   const reauthenticateUser = useCallback(async (currentPassword) => {
     if (!isFirebaseConfigured() || !auth || !currentUser) {
       throw new Error(
@@ -46,26 +36,17 @@ export const AuthProvider = ({ children }) => {
       );
     }
     const user = auth.currentUser;
-    // create credential with email and current password
     const credentials = EmailAuthProvider.credential(user.email, currentPassword);
-
-    // Re-authenticate the user
     await reauthenticateWithCredential(user, credentials);
-  })
-
+  }, [currentUser]);
 
-  // signup function
   const signup = useCallback(async (email, password, fullName) => {
     if (!isFirebaseConfigured() || !auth) {
       throw new Error(
         "Firebase is not configured. Please add Firebase credentials to use authentication."
       );
     }
-    const userCredential = await createUserWithEmailAndPassword(
-      auth,
-      email,
-      password
-    );
+    const userCredential = await createUserWithEmailAndPassword(auth, email, password);
     const user = userCredential.user;
 
     await setDoc(doc(db, "users", user.uid), {
@@ -76,7 +57,6 @@ export const AuthProvider = ({ children }) => {
       provider: "email",
     });
 
-    // Initialize leaderboard entry for new user
     await setDoc(doc(db, "leaderboard", user.uid), {
       uid: user.uid,
       displayName: fullName,
@@ -89,7 +69,6 @@ export const AuthProvider = ({ children }) => {
     return userCredential;
   }, []);
 
-  //   login function
   const login = useCallback(async (email, password) => {
     if (!isFirebaseConfigured() || !auth) {
       throw new Error(
@@ -97,15 +76,10 @@ export const AuthProvider = ({ children }) => {
       );
     }
     await setPersistence(auth, browserSessionPersistence);
-    const userCredential = await signInWithEmailAndPassword(
-      auth,
-      email,
-      password
-    );
+    const userCredential = await signInWithEmailAndPassword(auth, email, password);
     return userCredential;
   }, []);
 
-  //   login with google function
   const loginWithGoogle = useCallback(async () => {
     if (!isFirebaseConfigured() || !auth || !googleProvider) {
       throw new Error(
@@ -116,7 +90,6 @@ export const AuthProvider = ({ children }) => {
     const userCredential = await signInWithPopup(auth, googleProvider);
     const user = userCredential.user;
 
-    // Check if user document exists, if not create it
     const userDoc = await getDoc(doc(db, "users", user.uid));
     if (!userDoc.exists()) {
       await setDoc(doc(db, "users", user.uid), {
@@ -128,7 +101,6 @@ export const AuthProvider = ({ children }) => {
         provider: "google",
       });
 
-      // Initialize leaderboard entry for new user
       await setDoc(doc(db, "leaderboard", user.uid), {
         uid: user.uid,
         displayName: user.displayName || "Google User",
@@ -142,7 +114,6 @@ export const AuthProvider = ({ children }) => {
     return userCredential;
   }, []);
 
-  //   logout function
   const logout = useCallback(async () => {
     if (!isFirebaseConfigured() || !auth) {
       return;
@@ -150,22 +121,15 @@ export const AuthProvider = ({ children }) => {
     await signOut(auth);
   }, []);
 
-  //   change Password function
   const ChangePassword = useCallback(async (currentPassword, newPassword) => {
     if (!isFirebaseConfigured() || !auth || !auth.currentUser) {
-      throw new Error('User  is Not Authenticated');
+      throw new Error("User is Not Authenticated");
     }
     const user = auth.currentUser;
-
-    // re-authenticate user
     await reauthenticateUser(currentPassword);
-
-    // update Password
     await updatePassword(user, newPassword);
-
   }, [reauthenticateUser]);
 
-  //   reset Password function
   const resetPassword = useCallback(async (email) => {
     if (!isFirebaseConfigured() || !auth) {
       throw new Error(
@@ -175,43 +139,26 @@ export const AuthProvider = ({ children }) => {
     await sendPasswordResetEmail(auth, email);
   }, []);
 
-  //   check if user signed in with email/password
   const isEmailProvider = useCallback(() => {
     if (!auth?.currentUser) return false;
-
-    // check if user has email/password as a  provider
-    return auth.currentUser.providerData.some(
-      (provider) => provider.providerId === 'password');
+    return auth.currentUser.providerData.some((provider) => provider.providerId === "password");
   }, []);
 
-  //   Monitor auth state changes
   useEffect(() => {
     if (!isFirebaseConfigured() || !auth) {
       setLoading(false);
       return;
     }
 
-    // Listen for auth state changes
     const unsubscribe = onAuthStateChanged(auth, async (user) => {
       if (user) {
         try {
           const userDoc = await getDoc(doc(db, "users", user.uid));
           if (userDoc.exists()) {
             const userData = userDoc.data();
-            console.log("Fetched user data from Firestore:", userData);
-            setCurrentUser({
-              ...user,
-              fullName: userData.fullName,
-            });
-            console.log("Current user after merge:", {
-              ...user,
-              fullName: userData.fullName,
-            });
+            setCurrentUser({ ...user, fullName: userData.fullName });
 
-            // Initialize leaderboard entry if it doesn't exist
-            const leaderboardDoc = await getDoc(
-              doc(db, "leaderboard", user.uid)
-            );
+            const leaderboardDoc = await getDoc(doc(db, "leaderboard", user.uid));
             if (!leaderboardDoc.exists()) {
               await setDoc(doc(db, "leaderboard", user.uid), {
                 uid: user.uid,
@@ -259,4 +206,4 @@ export const AuthProvider = ({ children }) => {
   );
 };
 
-export default AuthContext;
+// AuthContext object is exported from `src/context/contexts.js` to satisfy fast-refresh rule.
diff --git a/src/context/CoinContext.jsx b/src/context/CoinContext.jsx
index eaaf6a6..95a6792 100644
--- a/src/context/CoinContext.jsx
+++ b/src/context/CoinContext.jsx
@@ -1,9 +1,7 @@
-/* eslint-disable react-refresh/only-export-components */
-import { createContext, useState, useMemo } from "react";
+import { useState, useMemo } from "react";
+import { CoinContext } from "./contexts";
 import { useQuery } from "@tanstack/react-query";
 
-export const CoinContext = createContext();
-
 export const CoinContextProvider = (props) => {
   const [selectedFilters, setSelectedFilters] = useState(["all"]);
   const [currency, setCurrency] = useState({
@@ -116,4 +114,4 @@ export const CoinContextProvider = (props) => {
   );
 };
 
-export default CoinContextProvider;
\ No newline at end of file
+// Provider exported as named export. Context object is exported from `src/context/contexts.js`.
\ No newline at end of file
diff --git a/src/context/LeaderboardContext.jsx b/src/context/LeaderboardContext.jsx
index 562566a..122672b 100644
--- a/src/context/LeaderboardContext.jsx
+++ b/src/context/LeaderboardContext.jsx
@@ -1,11 +1,9 @@
-/* eslint-disable react-refresh/only-export-components */
-import React, { createContext, useContext, useState, useEffect, useMemo, useCallback } from "react";
+import React, { useContext, useState, useEffect, useMemo, useCallback } from "react";
+import { LeaderboardContext } from "./contexts";
 import { collection, query, orderBy, limit, onSnapshot, doc, setDoc, getDoc, updateDoc, increment, serverTimestamp } from "firebase/firestore";
 import { db, isFirebaseConfigured } from "../firebase";
 import { useAuth } from "./AuthContext";
 
-const LeaderboardContext = createContext({});
-
 export const useLeaderboard = () => {
   const context = useContext(LeaderboardContext);
   if (!context) {
@@ -128,4 +126,4 @@ export const LeaderboardProvider = ({ children }) => {
   );
 };
 
-export default LeaderboardContext;
+// LeaderboardContext object exported from `src/context/contexts.js` to satisfy fast-refresh rule.
diff --git a/src/context/ThemeContext.jsx b/src/context/ThemeContext.jsx
index 97c6663..85faa79 100644
--- a/src/context/ThemeContext.jsx
+++ b/src/context/ThemeContext.jsx
@@ -1,7 +1,5 @@
-/* eslint-disable react-refresh/only-export-components */
-import React, { createContext, useContext, useState, useEffect, useMemo, useCallback } from "react";
-
-const ThemeContext = createContext();
+import React, { useContext, useState, useEffect, useMemo, useCallback } from "react";
+import { ThemeContext } from "./contexts";
 
 export const useTheme = () => {
   const context = useContext(ThemeContext);
@@ -41,5 +39,4 @@ export const ThemeProvider = ({ children }) => {
     </ThemeContext.Provider>
   );
 };
-
-export default ThemeContext;
+// ThemeContext object exported from `src/context/contexts.js`.
diff --git a/src/context/contexts.js b/src/context/contexts.js
new file mode 100644
index 0000000..a270350
--- /dev/null
+++ b/src/context/contexts.js
@@ -0,0 +1,15 @@
+import { createContext } from "react";
+
+export const AuthContext = createContext({});
+export const CoinContext = createContext();
+export const LeaderboardContext = createContext({});
+export const ThemeContext = createContext();
+export const ActivityContext = createContext({});
+
+export default {
+  AuthContext,
+  CoinContext,
+  LeaderboardContext,
+  ThemeContext,
+  ActivityContext,
+};
diff --git a/src/pages/Dashboard/DashboardContent.jsx b/src/pages/Dashboard/DashboardContent.jsx
index 40848af..2b05d6a 100644
--- a/src/pages/Dashboard/DashboardContent.jsx
+++ b/src/pages/Dashboard/DashboardContent.jsx
@@ -2,7 +2,7 @@ import React, { useState, useEffect, useContext } from "react";
 import { useNavigate } from "react-router-dom";
 import { useAuth } from "../../context/AuthContext";
 import { useTheme } from "../../context/ThemeContext";
-import { CoinContext } from "../../context/CoinContext";
+import { CoinContext } from "../../context/contexts";
 
 const DashboardContent = () => {
     const { currentUser } = useAuth();
diff --git a/src/pages/Dashboard/MarketOverview.jsx b/src/pages/Dashboard/MarketOverview.jsx
index 09677ba..889e0d9 100644
--- a/src/pages/Dashboard/MarketOverview.jsx
+++ b/src/pages/Dashboard/MarketOverview.jsx
@@ -1,7 +1,7 @@
 import React, { useState, useEffect, useContext } from "react";
 import { useNavigate } from "react-router-dom";
 import { useTheme } from "../../context/ThemeContext";
-import { CoinContext } from "../../context/CoinContext";
+import { CoinContext } from "../../context/contexts";
 import "./MarketOverview.css";
 
 const MarketOverview = () => {
diff --git a/src/pages/Home/Coin/Coin.jsx b/src/pages/Home/Coin/Coin.jsx
index f31b0a3..eca8df6 100644
--- a/src/pages/Home/Coin/Coin.jsx
+++ b/src/pages/Home/Coin/Coin.jsx
@@ -1,7 +1,7 @@
 import React, { useContext, useEffect, useState } from "react";
 import { useParams } from "react-router-dom";
 import "./Coin.css";
-import { CoinContext } from "../../../context/CoinContext";
+import { CoinContext } from "../../../context/contexts";
 import LineChart from "../../../components/LineChart";
 import NewsPanel from "../../../components/NewsPanel";
 
diff --git a/src/pages/Home/Home.jsx b/src/pages/Home/Home.jsx
index 588d8e1..e3404e1 100644
--- a/src/pages/Home/Home.jsx
+++ b/src/pages/Home/Home.jsx
@@ -1,6 +1,6 @@
 import React, { useContext, useEffect, useState } from "react";
 import "./Home.css";
-import { CoinContext } from "../../context/CoinContext";
+import { CoinContext } from "../../context/contexts";
 import { Link } from "react-router-dom";
 import { FiSearch, FiArrowUpRight, FiArrowDownRight, FiFilter } from "react-icons/fi";
 import { motion } from "framer-motion";