Merge pull request #416 from Gbemi-programmer/fix/consolidate-layout-imports

Fix/consolidate layout imports

Author: 0xSlink

app/(merchant)/layout.tsx

@@ -3,13 +3,9 @@
 import { useCallback, useState, useEffect } from "react";
 import { useRouter } from "next/navigation";
 import { AlertTriangle } from "lucide-react";
-import { MerchantSidebar } from "@/components/layout";
+import { MerchantSidebar, MobileNavDrawer, Topbar, Footer, MobileBottomNav } from "@/components/layout";
 import { merchantNavItems } from "@/lib/navigation/merchantNav";
 import { PageTransition, ErrorBoundary } from "@/components/shared";
-import { MobileNavDrawer } from "@/components/layout";
-import { Topbar } from "@/components/layout";
-import Footer from "@/components/layout";
-import { MobileBottomNav } from "@/components/layout";
 import { OnboardingWizard } from "@/components/onboarding/OnboardingWizard";
 import { useWalletStore } from "@/lib/store/walletStore";
 import { useAuthStore } from "@/lib/store/authStore";
@@ -55,9 +51,13 @@ export default function MerchantLayout({
   }, [logout, router, dismissWarning]);
 
   useEffect(() => {
-    router.prefetch("/transactions");
-    router.prefetch("/payments");
-  }, [router]);
+    try {
+      router.prefetch("/transactions");
+      router.prefetch("/payments");
+    } catch {
+      // Prefetch may throw during SSR or in edge environments
+    }
+  }, []);
 
   return (
     <div className="flex h-screen overflow-hidden bg-background">

components/shared/index.ts

@@ -5,4 +5,5 @@ export * from './CurrencyDisplay';
 export * from './ErrorDisplay';
 export * from './StatusBadge';
 export * from './CopyAddress';
-export * from './EmptyState';
+export * from './EmptyState';
+export * from './PageHeader';

lib/api/hooks.ts

@@ -1,5 +1,6 @@
 "use client";
 
+import { useMemo } from 'react';
 import { useQuery, type UseQueryResult } from '@tanstack/react-query';
 import { apiClient } from './axios';
 import type { MerchantProfile, MerchantBankAccount } from '../types';
@@ -192,10 +193,13 @@ export function useRates(): UseRatesResult {
   });
 
   const rates: ApiRate[] = query.data?.rates ?? [];
-  const primaryRate =
-    query.data?.usdcNgn ??
-    rates.find((r) => r.from === 'USDC' && r.to === 'NGN')?.rate ??
-    null;
+  const primaryRate = useMemo(
+    () =>
+      query.data?.usdcNgn ??
+      rates.find((r) => r.from === 'USDC' && r.to === 'NGN')?.rate ??
+      null,
+    [query.data, rates],
+  );
 
   return {
     data: rates,