diff --git a/frontend/src/LandingPage/LandingPage.tsx b/frontend/src/LandingPage/LandingPage.tsx
index 0a1ea49c..9c281385 100644
--- a/frontend/src/LandingPage/LandingPage.tsx
+++ b/frontend/src/LandingPage/LandingPage.tsx
@@ -1,10 +1,9 @@
 import React from "react";
 import { Link } from "react-router-dom";
-import { ArrowRight, History, Bookmark } from "lucide-react";
+import { ArrowRight, Bookmark } from "lucide-react";
 import Home from "./sections/Home/Home";
 import HowItWorks from "./sections/HowItWorks/HowItWorks";
 import WhyNavin from "./sections/WhyNavin/WhyNavin";
-import Features from "./sections/Features/Features";
 import FAQSection from "./sections/FAQSection/FAQSection";
 import LogoStrip from "./sections/LogoStrip/LogoStrip";
 import CoreFeatures from "./sections/CoreFeatures/CoreFeatures";
@@ -13,59 +12,15 @@ import { useReturningVisitor } from "@hooks/useReturningVisitor";
 import { useAuthContext } from "@context/AuthContext";
 
 const LandingPage: React.FC = () => {
-  const { isReturning, visitCount, daysSinceLastVisit } = useReturningVisitor();
+  const { isReturning } = useReturningVisitor();
   const { isAuthenticated } = useAuthContext();
 
-  const showReturningBanner = isReturning && !isAuthenticated;
-
   return (
     <main className="scroll-smooth w-full">
-      {/* Returning visitor banner */}
-      {showReturningBanner && (
-        <div
-          className="bg-[rgba(98,255,255,0.06)] border-b border-[rgba(98,255,255,0.15)] px-6 py-3"
-          role="region"
-          aria-label="Welcome back"
-        >
-          <div className="max-w-6xl mx-auto flex flex-col sm:flex-row items-start sm:items-center justify-between gap-3">
-            <div className="flex items-center gap-3">
-              <div className="w-8 h-8 rounded-full bg-[rgba(98,255,255,0.15)] flex items-center justify-center shrink-0">
-                <History size={16} className="text-[#62ffff]" />
-              </div>
-              <div>
-                <p className="text-sm text-white font-medium">
-                  Welcome back{visitCount > 1 ? ` — visit #${visitCount}` : ''}!
-                  {daysSinceLastVisit !== null && daysSinceLastVisit > 0 && (
-                    <span className="text-slate-400 font-normal">
-                      {' '}It's been {daysSinceLastVisit} {daysSinceLastVisit === 1 ? 'day' : 'days'} since your last visit.
-                    </span>
-                  )}
-                </p>
-              </div>
-            </div>
-            <div className="flex items-center gap-2">
-              <Link
-                to="/login"
-                className="inline-flex items-center gap-1.5 px-4 py-1.5 rounded-lg bg-[rgba(98,255,255,0.1)] hover:bg-[rgba(98,255,255,0.2)] border border-[rgba(98,255,255,0.3)] text-sm font-medium text-[#62ffff] transition-colors no-underline"
-              >
-                Sign In
-                <ArrowRight size={14} />
-              </Link>
-              <Link
-                to="/signup"
-                className="inline-flex items-center gap-1.5 px-4 py-1.5 rounded-lg bg-[#62ffff] hover:bg-[#4ae8e8] text-sm font-semibold text-black transition-colors no-underline"
-              >
-                Get Started
-              </Link>
-            </div>
-          </div>
-        </div>
-      )}
-
       {/* Quick-access for authenticated returning visitors */}
       {isReturning && isAuthenticated && (
         <div
-          className="bg-[rgba(98,255,255,0.06)] border-b border-[rgba(98,255,255,0.15)] px-6 py-3"
+          className="bg-[rgba(98,255,255,0.06)] border-b border-[rgba(98,255,255,0.15)] px-6 pt-20 pb-3"
           role="region"
           aria-label="Quick access"
         >
@@ -96,9 +51,6 @@ const LandingPage: React.FC = () => {
       <section id="why-navin">
         <WhyNavin />
       </section>
-      <section id="features">
-        <Features />
-      </section>
       <section id="core-features">
         <CoreFeatures />
       </section>
diff --git a/frontend/src/LandingPage/sections/CoreFeatures/CoreFeatures.test.tsx b/frontend/src/LandingPage/sections/CoreFeatures/CoreFeatures.test.tsx
index 519bc1da..936b5e53 100644
--- a/frontend/src/LandingPage/sections/CoreFeatures/CoreFeatures.test.tsx
+++ b/frontend/src/LandingPage/sections/CoreFeatures/CoreFeatures.test.tsx
@@ -1,25 +1,7 @@
 import { render, screen } from '@testing-library/react';
-import { describe, expect, it, beforeAll } from 'vitest';
+import { describe, expect, it } from 'vitest';
 import CoreFeatures from './CoreFeatures';
 
-beforeAll(() => {
-  const IntersectionObserverMock = class {
-    observe() { }
-    unobserve() { }
-    disconnect() { }
-  };
-  Object.defineProperty(window, 'IntersectionObserver', {
-    writable: true,
-    configurable: true,
-    value: IntersectionObserverMock,
-  });
-  Object.defineProperty(globalThis, 'IntersectionObserver', {
-    writable: true,
-    configurable: true,
-    value: IntersectionObserverMock,
-  });
-});
-
 describe('CoreFeatures', () => {
   it('renders the section title and subtitle', () => {
     render(<CoreFeatures />);
@@ -31,55 +13,37 @@ describe('CoreFeatures', () => {
     ).toBeInTheDocument();
   });
 
-  it('renders all four feature blocks', () => {
+  it('renders all four feature callouts', () => {
     render(<CoreFeatures />);
 
-    expect(screen.getByText('Track every delivery, every step of the way')).toBeInTheDocument();
-    expect(screen.getByText("Don't trust. Verify.")).toBeInTheDocument();
-    expect(screen.getByText('Payments that release themselves')).toBeInTheDocument();
-    expect(screen.getByText('Everyone sees what they need to see')).toBeInTheDocument();
+    expect(screen.getByText('Tokenized Assets')).toBeInTheDocument();
+    expect(screen.getByText('IoT-Verified Milestones')).toBeInTheDocument();
+    expect(screen.getByText('Smart Settlements')).toBeInTheDocument();
+    expect(screen.getByText('Parity Dashboards')).toBeInTheDocument();
   });
 
   it('renders feature descriptions', () => {
     render(<CoreFeatures />);
 
-    expect(
-      screen.getByText(/Navin gives you full visibility into every shipment/i)
-    ).toBeInTheDocument();
-    expect(screen.getByText(/Hash-and-Emit architecture/i)).toBeInTheDocument();
-    expect(screen.getByText(/smart contract escrow/i)).toBeInTheDocument();
-    expect(screen.getByText(/four roles — Company, Carrier, Customer, and Admin/i)).toBeInTheDocument();
+    expect(screen.getByText(/unique digital identity on the Stellar blockchain/i)).toBeInTheDocument();
+    expect(screen.getByText(/hashed and anchored on-chain/i)).toBeInTheDocument();
+    expect(screen.getByText(/released automatically via smart contract/i)).toBeInTheDocument();
+    expect(screen.getByText(/single source of truth for Company, Carrier, Customer, and Admin/i)).toBeInTheDocument();
   });
 
-  it('renders bullet points for each feature', () => {
+  it('renders the bar-chart visualization', () => {
     render(<CoreFeatures />);
 
-    expect(screen.getByText('Live status updates at every checkpoint')).toBeInTheDocument();
-    expect(screen.getByText('IoT-powered temperature and condition monitoring')).toBeInTheDocument();
-    expect(screen.getByText(/SHA-256 hashes of all shipment data/i)).toBeInTheDocument();
-    expect(screen.getByText('Funds locked on shipment creation')).toBeInTheDocument();
-    expect(screen.getByText(/On-chain role assignment/i)).toBeInTheDocument();
+    expect(
+      screen.getByRole('img', { name: /illustrative visualization of on-chain shipment activity/i })
+    ).toBeInTheDocument();
   });
 
-  it('renders images for each feature with proper alt text', () => {
+  it('renders the Track Your Shipment CTA', () => {
     render(<CoreFeatures />);
 
-    expect(screen.getByAltText('Real-time shipment tracking visualization')).toBeInTheDocument();
-    expect(screen.getByAltText('Blockchain verification data flow diagram')).toBeInTheDocument();
-    expect(screen.getByAltText('Smart escrow payment flow illustration')).toBeInTheDocument();
-    expect(screen.getByAltText('Role-based access control diagram')).toBeInTheDocument();
-  });
-
-  it('applies correct layout classes for zigzag pattern', () => {
-    const { container } = render(<CoreFeatures />);
-
-    // Check for flex containers (no longer using .feature-block class)
-    const flexContainers = container.querySelectorAll('.flex.flex-col');
-    expect(flexContainers.length).toBeGreaterThanOrEqual(4);
-
-    // Verify the structure has alternating row/row-reverse layout
-    const parentDiv = container.querySelector('.space-y-24');
-    expect(parentDiv).toBeInTheDocument();
-    expect(parentDiv?.children).toHaveLength(4);
+    const cta = screen.getByRole('link', { name: /track your shipment/i });
+    expect(cta).toBeInTheDocument();
+    expect(cta).toHaveAttribute('href', '#track');
   });
 });
diff --git a/frontend/src/LandingPage/sections/CoreFeatures/CoreFeatures.tsx b/frontend/src/LandingPage/sections/CoreFeatures/CoreFeatures.tsx
index fe528914..e6af6063 100644
--- a/frontend/src/LandingPage/sections/CoreFeatures/CoreFeatures.tsx
+++ b/frontend/src/LandingPage/sections/CoreFeatures/CoreFeatures.tsx
@@ -1,146 +1,120 @@
 import React from "react";
+import { useTranslation } from "react-i18next";
 
-interface FeatureBlock {
-  title: string;
-  subtitle: string;
-  description: string;
-  bullets: string[];
-  imageSrc: string;
-  imageAlt: string;
+interface CoreFeature {
+  key: string;
 }
 
+const CORE_FEATURES: CoreFeature[] = [
+  { key: "tokenizedAssets" },
+  { key: "iotMilestones" },
+  { key: "smartSettlements" },
+  { key: "parityDashboards" },
+];
+
+const BAR_COUNT = 32;
+const HIGHLIGHTED_BARS = new Set([5, 13, 21, 27]);
+const INDENT_CLASSES = ["", "md:ml-8", "md:ml-16", "md:ml-24"];
+
 const CoreFeatures: React.FC = () => {
-  const features: FeatureBlock[] = [
-    {
-      title: "Track every delivery, every step of the way",
-      subtitle: "Real-time Visibility",
-      description: "Navin gives you full visibility into every shipment milestone, from warehouse pickup to final delivery. No more guessing where your package is—everything is tracked on-chain and reflected in your dashboard.",
-      bullets: [
-        "Live status updates at every checkpoint",
-        "IoT-powered temperature and condition monitoring",
-        "GPS tracking with real-time map visualization",
-      ],
-      imageSrc: "/images/tracking-visualization.png",
-      imageAlt: "Real-time shipment tracking visualization",
-    },
-    {
-      title: "Don't trust. Verify.",
-      subtitle: "Blockchain Verification",
-      description: "Hash-and-Emit architecture means every milestone update is hashed and emitted as a blockchain event. You're not trusting a centralized database—you're verifying cryptographic proof.",
-      bullets: [
-        "SHA-256 hashes of all shipment data recorded on-chain",
-        "Immutable audit trail accessible to all authorized parties",
-        "One-click Stellar Explorer link to verify transactions",
-      ],
-      imageSrc: "/images/blockchain-verification.png",
-      imageAlt: "Blockchain verification data flow diagram",
-    },
-    {
-      title: "Payments that release themselves",
-      subtitle: "Smart Escrow",
-      description: "Navin uses smart contract escrow to hold funds until delivery is confirmed. No manual invoicing. No waiting for bank transfers. The moment a verified delivery happens, payment releases automatically.",
-      bullets: [
-        "Funds locked on shipment creation",
-        "Automatic release on verified delivery",
-        "Built-in dispute resolution with admin override",
-      ],
-      imageSrc: "/images/smart-escrow.png",
-      imageAlt: "Smart escrow payment flow illustration",
-    },
-    {
-      title: "Everyone sees what they need to see",
-      subtitle: "Role-Based Access",
-      description: "Navin supports four roles — Company, Carrier, Customer, and Admin. Each role sees exactly what they're authorized to see. No information asymmetry. No hidden data.",
-      bullets: [
-        "On-chain role assignment with cryptographic proof",
-        "Granular permissions for shipment visibility",
-        "Customer and company dashboards with tailored views",
-      ],
-      imageSrc: "/images/role-access.png",
-      imageAlt: "Role-based access control diagram",
-    },
-  ];
+  const { t } = useTranslation("landing");
+
+  const bars = Array.from({ length: BAR_COUNT }, (_, i) => ({
+    heightPct: 22 + (Math.sin(i * 0.55) * 0.5 + 0.5) * 68,
+    highlighted: HIGHLIGHTED_BARS.has(i),
+  }));
 
   return (
     <section className="relative py-20 px-4 md:py-28 lg:py-32 bg-background overflow-hidden">
       {/* Ambient glow effects */}
-      <div className="absolute top-1/3 right-1/4 w-[700px] h-[700px] bg-accent-teal/10 blur-[120px] rounded-full pointer-events-none" />
-      <div className="absolute bottom-1/3 left-1/4 w-[700px] h-[700px] bg-primary/10 blur-[120px] rounded-full pointer-events-none" />
-      
-      <div className="relative max-w-7xl mx-auto">
+      <div className="absolute top-1/4 right-1/4 w-[700px] h-[700px] bg-accent-teal/10 blur-[120px] rounded-full pointer-events-none" />
+      <div className="absolute bottom-1/4 left-1/4 w-[700px] h-[700px] bg-primary/10 blur-[120px] rounded-full pointer-events-none" />
+
+      <div className="relative max-w-4xl mx-auto">
         {/* Section Header */}
-        <div className="text-center mb-20">
+        <div className="text-center mb-16">
           <h2 className="font-display text-3xl md:text-5xl lg:text-6xl font-bold mb-6 text-text-primary">
-            Core <span className="text-primary">Features</span>
+            {t("coreFeatures.heading")} <span className="text-primary">{t("coreFeatures.headingHighlight")}</span>
           </h2>
           <p className="text-lg text-text-secondary max-w-2xl mx-auto">
-            Built on Stellar blockchain for transparency, security, and automation
+            {t("coreFeatures.subtitle")}
           </p>
         </div>
 
-        {/* Feature Blocks with Zigzag Layout */}
-        <div className="space-y-24">
-          {features.map((feature, index) => {
-            const isImageLeft = index % 2 === 0;
-            
-            return (
-              <div
-                key={index}
-                className={`flex flex-col ${
-                  isImageLeft ? "lg:flex-row" : "lg:flex-row-reverse"
-                } gap-12 items-center`}
-              >
-                {/* Image Side */}
-                <div className="flex-1 w-full">
-                  <div className="group/image relative overflow-hidden rounded-2xl">
-                    <img
-                      src={feature.imageSrc}
-                      alt={feature.imageAlt}
-                      className="w-full rounded-2xl border border-border-light bg-background-card/40 backdrop-blur-lg transition-all duration-500 group-hover/image:border-primary-light group-hover/image:shadow-glow-blue group-hover/image:scale-105"
-                    />
-                    {/* Hover overlay glow */}
-                    <div className="absolute inset-0 bg-gradient-to-t from-primary/20 to-transparent opacity-0 transition-opacity duration-500 group-hover/image:opacity-100 rounded-2xl pointer-events-none" />
-                  </div>
-                </div>
+        {/* Bar-chart visualization */}
+        <div
+          className="flex items-end justify-center gap-[3px] h-36 md:h-52 mb-20"
+          role="img"
+          aria-label={t("coreFeatures.chartAriaLabel")}
+        >
+          {bars.map((bar, i) => (
+            <div
+              key={i}
+              className={`flex-1 max-w-[14px] rounded-t-sm transition-all duration-700 ${
+                bar.highlighted
+                  ? "bg-gradient-to-t from-primary to-accent-teal shadow-glow-blue"
+                  : "bg-gradient-to-t from-primary/15 to-accent-teal/35"
+              }`}
+              style={{ height: `${bar.heightPct}%` }}
+            />
+          ))}
+        </div>
 
-                {/* Content Side */}
-                <div className="flex-1 group/content">
-                  <h2 className="text-primary font-semibold uppercase tracking-wide text-sm mb-3 transition-all duration-300 group-hover/content:text-primary-light group-hover/content:tracking-wider">
-                    {feature.subtitle}
-                  </h2>
-                  <h3 className="font-display text-3xl md:text-4xl font-bold mb-6 text-text-primary transition-colors duration-300 group-hover/content:text-primary">
-                    {feature.title}
-                  </h3>
-                  <p className="font-sans text-lg text-text-secondary mb-6 leading-relaxed transition-colors duration-300 group-hover/content:text-text-primary">
-                    {feature.description}
-                  </p>
-                  <ul className="space-y-3">
-                    {feature.bullets.map((bullet, bulletIndex) => (
-                      <li
-                        key={bulletIndex}
-                        className="group/bullet flex items-start gap-3 text-text-secondary transition-all duration-300 hover:translate-x-1"
-                      >
-                        <svg
-                          className="w-6 h-6 text-primary flex-shrink-0 mt-0.5 transition-all duration-300 group-hover/bullet:scale-125 group-hover/bullet:text-primary-light"
-                          fill="none"
-                          stroke="currentColor"
-                          viewBox="0 0 24 24"
-                        >
-                          <path
-                            strokeLinecap="round"
-                            strokeLinejoin="round"
-                            strokeWidth={2}
-                            d="M5 13l4 4L19 7"
-                          />
-                        </svg>
-                        <span className="transition-colors duration-300 group-hover/bullet:text-text-primary">{bullet}</span>
-                      </li>
-                    ))}
-                  </ul>
-                </div>
+        {/* Staggered callouts with dashed connectors */}
+        <div className="flex flex-col gap-10 md:gap-12">
+          {CORE_FEATURES.map((feature, index) => (
+            <div
+              key={feature.key}
+              className={`flex items-start gap-5 ${INDENT_CLASSES[index]}`}
+            >
+              <div className="flex flex-col items-center pt-1.5 shrink-0" aria-hidden="true">
+                <span className="w-2.5 h-2.5 rounded-full bg-primary shadow-glow-blue" />
+                {index < CORE_FEATURES.length - 1 && (
+                  <span className="w-px flex-1 min-h-[3rem] mt-1.5 border-l-[1.5px] border-dashed border-[rgba(0,180,160,0.4)]" />
+                )}
+              </div>
+              <div className="max-w-md">
+                <h3 className="font-display text-lg md:text-xl font-semibold text-primary mb-2">
+                  {t(`coreFeatures.${feature.key}.label`)}
+                </h3>
+                <p className="font-sans text-sm md:text-base leading-relaxed text-text-secondary">
+                  {t(`coreFeatures.${feature.key}.description`)}
+                </p>
               </div>
-            );
-          })}
+            </div>
+          ))}
+        </div>
+
+        {/* CTA */}
+        <div className="flex items-center gap-0 mt-20 w-full justify-center">
+          <span
+            className="flex-1 max-w-[200px] sm:max-w-[60px] h-px border-t-[1.5px] border-dashed border-[rgba(0,180,160,0.5)]"
+            aria-hidden="true"
+          />
+          <a
+            href="#track"
+            className="inline-flex items-center gap-2.5 px-8 py-3.5 sm:px-6 sm:py-3 bg-[rgba(8,40,50,0.75)] text-white text-base sm:text-[0.9rem] font-medium no-underline border-[1.5px] border-[rgba(0,180,160,0.6)] rounded-full cursor-pointer backdrop-blur-[8px] whitespace-nowrap transition-all duration-[250ms] hover:bg-[rgba(0,120,110,0.35)] hover:border-[#00d4c8] hover:shadow-[0_0_24px_rgba(0,212,200,0.3),inset_0_0_12px_rgba(0,212,200,0.08)] hover:-translate-y-0.5 focus-visible:outline-2 focus-visible:outline-[#00d4c8] focus-visible:outline-offset-4"
+          >
+            {t("coreFeatures.cta")}
+            <svg
+              className="shrink-0 text-[#00d4c8]"
+              width="22"
+              height="16"
+              viewBox="0 0 22 16"
+              fill="none"
+              aria-hidden="true"
+              xmlns="http://www.w3.org/2000/svg"
+            >
+              <rect x="0" y="4" width="13" height="9" rx="1" stroke="currentColor" strokeWidth="1.4" />
+              <path d="M13 6h4l3 4v3h-7V6Z" stroke="currentColor" strokeWidth="1.4" strokeLinejoin="round" />
+              <circle cx="4" cy="13.5" r="1.5" stroke="currentColor" strokeWidth="1.2" />
+              <circle cx="17" cy="13.5" r="1.5" stroke="currentColor" strokeWidth="1.2" />
+            </svg>
+          </a>
+          <span
+            className="flex-1 max-w-[200px] sm:max-w-[60px] h-px border-t-[1.5px] border-dashed border-[rgba(0,180,160,0.5)]"
+            aria-hidden="true"
+          />
         </div>
       </div>
     </section>
diff --git a/frontend/src/LandingPage/sections/FAQSection/FAQSection.tsx b/frontend/src/LandingPage/sections/FAQSection/FAQSection.tsx
index 94a2e1a1..4cd44a8a 100644
--- a/frontend/src/LandingPage/sections/FAQSection/FAQSection.tsx
+++ b/frontend/src/LandingPage/sections/FAQSection/FAQSection.tsx
@@ -1,45 +1,22 @@
 import { useState } from "react";
 import { ChevronDown } from "lucide-react";
+import { useTranslation } from "react-i18next";
 
 type FAQItem = {
-    question: string;
-    answer: string;
+    key: string;
 };
 
 const faqItems: FAQItem[] = [
-    {
-        question: "What is Navin?",
-        answer:
-            "Navin is a next-generation logistics platform that combines blockchain technology with IoT tracking to provide transparent, tamper-proof shipment management. Every milestone is recorded on-chain, ensuring accountability from pickup to delivery.",
-    },
-    {
-        question: "How do Stellar payments work on Navin?",
-        answer:
-            "Navin integrates with the Stellar blockchain to handle payments via smart contracts. When a shipment is confirmed, funds are held in escrow and automatically released to the logistics provider upon successful delivery—no manual processing required.",
-    },
-    {
-        question: "How does IoT tracking work?",
-        answer:
-            "Our IoT sensors attached to shipments continuously report GPS location, temperature, humidity, and shock events. This data is logged in real-time and anchored to the blockchain, giving you a verifiable, tamper-proof record of your shipment's journey.",
-    },
-    {
-        question: "How do I get started with Navin?",
-        answer:
-            "Simply sign up for an account, choose your role (logistics company or customer), and you'll have immediate access to the dashboard. You can create your first shipment in minutes—our onboarding tour will guide you through each step.",
-    },
-    {
-        question: "Is my data secure on Navin?",
-        answer:
-            "Yes. All sensitive data is encrypted in transit and at rest. Shipment records are anchored to the Stellar blockchain, making them immutable and auditable. Access is controlled through role-based permissions, ensuring only authorized parties can view or modify shipment details.",
-    },
-    {
-        question: "Which wallets are supported?",
-        answer:
-            "Navin supports any Stellar-compatible wallet, including Freighter, Lobstr, and Solar Wallet. You can connect your wallet directly from the dashboard to manage payments and view on-chain transaction history.",
-    },
+    { key: "whatIsNavin" },
+    { key: "stellarPayments" },
+    { key: "iotTracking" },
+    { key: "getStarted" },
+    { key: "dataSecure" },
+    { key: "walletsSupported" },
 ];
 
 function FAQSection() {
+    const { t } = useTranslation("landing");
     const [openIndex, setOpenIndex] = useState<number | null>(null);
 
     const handleToggle = (index: number) => {
@@ -57,10 +34,10 @@ function FAQSection() {
                 {/* Left side - FAQ Content */}
                 <div>
                     <h2 className="font-display text-3xl md:text-5xl lg:text-6xl font-bold mb-6 text-text-primary">
-                        Frequently Asked <span className="text-primary">Questions</span>
+                        {t("faq.heading")} <span className="text-primary">{t("faq.headingHighlight")}</span>
                     </h2>
                     <p className="text-text-secondary text-lg mb-12">
-                        Everything you need to know about Navin's blockchain-powered logistics platform.
+                        {t("faq.subtitle")}
                     </p>
                     
                     <div className="flex flex-col gap-4">
@@ -84,7 +61,7 @@ function FAQSection() {
                                         <span className={`font-display font-semibold text-base md:text-lg transition-colors duration-300 ${
                                             isOpen ? 'text-primary' : 'text-text-primary group-hover:text-primary'
                                         }`}>
-                                            {item.question}
+                                            {t(`faq.${item.key}.question`)}
                                         </span>
                                         <ChevronDown 
                                             className={`flex-shrink-0 w-5 h-5 text-primary transition-all duration-300 ${
@@ -101,7 +78,7 @@ function FAQSection() {
                                     >
                                         <div className="overflow-hidden">
                                             <p className="px-6 pb-5 font-sans text-base leading-relaxed text-text-secondary">
-                                                {item.answer}
+                                                {t(`faq.${item.key}.answer`)}
                                             </p>
                                         </div>
                                     </div>
diff --git a/frontend/src/LandingPage/sections/Features/Features.tsx b/frontend/src/LandingPage/sections/Features/Features.tsx
deleted file mode 100644
index aa0b3bfc..00000000
--- a/frontend/src/LandingPage/sections/Features/Features.tsx
+++ /dev/null
@@ -1,90 +0,0 @@
-import React from "react";
-
-type FeatureCard = {
-    icon: string;
-    iconAlt: string;
-    title: string;
-    description: string;
-};
-
-const Features: React.FC = () => {
-    const features: FeatureCard[] = [
-        {
-            icon: "/images/icons/tracking.svg",
-            iconAlt: "Real-time tracking icon",
-            title: "Real-time Tracking",
-            description: "Monitor your shipments live with precise location updates at every stage of delivery.",
-        },
-        {
-            icon: "/images/icons/blockchain.svg",
-            iconAlt: "Immutable records icon",
-            title: "Immutable Records",
-            description: "Blockchain-powered ledger ensures every transaction is secure and tamper-proof.",
-        },
-        {
-            icon: "/images/icons/settlement.svg",
-            iconAlt: "Automated settlements icon",
-            title: "Automated Settlements",
-            description: "Smart contracts handle payments instantly, eliminating delays and manual processing.",
-        },
-        {
-            icon: "/images/icons/dashboard.svg",
-            iconAlt: "Responsive dashboard icon",
-            title: "Responsive Dashboard",
-            description: "Access your logistics data anywhere with our intuitive, mobile-friendly interface.",
-        },
-    ];
-
-    return (
-        <section 
-            id="features" 
-            className="relative py-20 px-4 md:py-28 lg:py-32 bg-background-secondary overflow-hidden"
-        >
-            {/* Ambient glow effects */}
-            <div className="absolute top-1/4 left-1/4 w-[600px] h-[600px] bg-primary/10 blur-[120px] rounded-full pointer-events-none" />
-            <div className="absolute bottom-1/4 right-1/4 w-[600px] h-[600px] bg-accent-teal/10 blur-[120px] rounded-full pointer-events-none" />
-            
-            <div className="relative max-w-7xl mx-auto">
-                <h2 className="font-display text-3xl md:text-5xl lg:text-6xl font-bold text-center mb-6 text-text-primary">
-                    Key <span className="text-primary">Features</span>
-                </h2>
-                <p className="text-center text-text-secondary text-lg mb-16 max-w-2xl mx-auto">
-                    Cutting-edge blockchain technology meets logistics. Experience transparency, security, and efficiency like never before.
-                </p>
-                
-                <div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-4 gap-6">
-                    {features.map((feature, index) => (
-                        <article 
-                            key={index} 
-                            className="group relative flex flex-col gap-6 p-6 bg-background-card/60 backdrop-blur-lg border border-border-light rounded-2xl transition-all duration-300 hover:border-primary-light hover:-translate-y-2 hover:shadow-glow-blue hover:bg-background-card/80"
-                        >
-                            {/* Icon container with inset glow */}
-                            <div className="inline-flex items-center justify-center w-20 h-20 rounded-2xl bg-gradient-card border border-primary-light/40 shadow-inset-teal transition-all duration-300 group-hover:shadow-inset-teal-hover group-hover:border-primary-light group-hover:scale-110 group-hover:rotate-3">
-                                <img
-                                    src={feature.icon}
-                                    alt={feature.iconAlt}
-                                    className="w-10 h-10 object-contain transition-transform duration-300 group-hover:scale-110"
-                                />
-                            </div>
-                            
-                            {/* Content */}
-                            <div>
-                                <h3 className="font-display text-xl font-semibold text-text-primary mb-3 transition-colors duration-300 group-hover:text-primary">
-                                    {feature.title}
-                                </h3>
-                                <p className="font-sans text-base leading-relaxed text-text-secondary transition-colors duration-300 group-hover:text-text-primary">
-                                    {feature.description}
-                                </p>
-                            </div>
-                            
-                            {/* Hover glow effect */}
-                            <div className="absolute inset-0 bg-primary/5 rounded-2xl opacity-0 transition-opacity duration-300 group-hover:opacity-100 pointer-events-none" />
-                        </article>
-                    ))}
-                </div>
-            </div>
-        </section>
-    );
-};
-
-export default Features;
diff --git a/frontend/src/LandingPage/sections/Footer/Footer.tsx b/frontend/src/LandingPage/sections/Footer/Footer.tsx
index aaf64a98..116ac8b8 100644
--- a/frontend/src/LandingPage/sections/Footer/Footer.tsx
+++ b/frontend/src/LandingPage/sections/Footer/Footer.tsx
@@ -1,6 +1,9 @@
 import { Github, Linkedin, Twitter } from "lucide-react";
+import { useTranslation } from "react-i18next";
 
 function Footer() {
+    const { t } = useTranslation("landing");
+
     return (
         <footer className="relative py-20 px-4 bg-background-secondary overflow-hidden">
             {/* Background footer image */}
@@ -16,17 +19,17 @@ function Footer() {
                 {/* CTA Section */}
                 <div className="text-center mb-16">
                     <h2 className="font-display text-3xl md:text-5xl lg:text-6xl font-bold mb-6 text-text-primary">
-                        Get Started <span className="text-primary">Today</span>
+                        {t("footer.heading")} <span className="text-primary">{t("footer.headingHighlight")}</span>
                     </h2>
                     <p className="text-text-secondary text-lg mb-8 max-w-2xl mx-auto">
-                        Join 500+ enterprise leaders. Get the latest on blockchain logistics and zero trust supply chain management.
+                        {t("footer.subtitle")}
                     </p>
-                    
+
                     {/* Email Subscribe Form */}
                     <form className="flex flex-col sm:flex-row gap-4 max-w-2xl mx-auto">
                         <input
                             type="email"
-                            placeholder="Enter your Email"
+                            placeholder={t("footer.emailPlaceholder")}
                             className="flex-1 px-6 py-4 bg-background-card/60 backdrop-blur-lg border border-border-light rounded-2xl text-text-primary placeholder:text-text-secondary/60 focus:outline-none focus:border-primary-light focus:shadow-glow-blue transition-all duration-300 hover:border-primary-light/50"
                             required
                         />
@@ -34,7 +37,7 @@ function Footer() {
                             type="submit"
                             className="w-full sm:w-auto px-10 py-4 bg-primary hover:bg-primary-light text-background font-display font-semibold text-lg rounded-2xl transition-all duration-300 hover:shadow-glow-blue hover:scale-[1.02] active:scale-[0.98] border border-primary-light/40"
                         >
-                            Subscribe
+                            {t("footer.subscribe")}
                         </button>
                     </form>
                 </div>
@@ -51,14 +54,14 @@ function Footer() {
                             />
                             <div>
                                 <h3 className="font-display text-xl font-bold text-text-primary">Navin</h3>
-                                <p className="text-sm text-text-secondary">The New Standard in Logistics Security</p>
+                                <p className="text-sm text-text-secondary">{t("footer.tagline")}</p>
                             </div>
                         </div>
                         
                         {/* Social Links */}
                         <div className="flex items-center gap-4">
                             <a
-                                href="https://github.com"
+                                href="https://github.com/Navin-xmr/"
                                 target="_blank"
                                 rel="noopener noreferrer"
                                 className="group w-12 h-12 rounded-xl bg-background-card/60 backdrop-blur-lg border border-border-light flex items-center justify-center hover:border-primary-light hover:shadow-glow-blue hover:scale-110 transition-all duration-300"
@@ -89,10 +92,26 @@ function Footer() {
                     
                     {/* Copyright */}
                     <div className="mt-8 text-center text-sm text-text-secondary">
-                        <p>&copy; {new Date().getFullYear()} Navin. All rights reserved.</p>
+                        <p>&copy; {new Date().getFullYear()} {t("footer.copyright")}</p>
                     </div>
                 </div>
             </div>
+
+            {/* Giant watermark wordmark */}
+            <div
+                className="relative mt-12 select-none pointer-events-none overflow-hidden"
+                aria-hidden="true"
+            >
+                <p
+                    className="font-display font-extrabold leading-none text-center bg-gradient-to-b from-primary/25 via-accent-teal/15 to-transparent bg-clip-text text-transparent"
+                    style={{
+                        fontSize: 'clamp(6rem, 22vw, 16rem)',
+                        transform: 'translateY(28%)',
+                    }}
+                >
+                    Navin
+                </p>
+            </div>
         </footer>
     );
 }
diff --git a/frontend/src/LandingPage/sections/Home/Home.tsx b/frontend/src/LandingPage/sections/Home/Home.tsx
index c14ab2fe..88160abf 100644
--- a/frontend/src/LandingPage/sections/Home/Home.tsx
+++ b/frontend/src/LandingPage/sections/Home/Home.tsx
@@ -1,6 +1,9 @@
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 const Home: React.FC = () => {
+  const { t } = useTranslation('landing');
+
   return (
     <section
       className="relative w-full min-h-screen flex items-center justify-center overflow-hidden"
@@ -44,16 +47,14 @@ const Home: React.FC = () => {
             fontSize: 'clamp(3rem, 9vw, 7rem)',
           }}
         >
-          TRANSPARENT <span className="text-[#00d4c8]">TRACKING</span>
+          {t('hero.titleLine1')} <span className="text-[#00d4c8]">{t('hero.titleLine2')}</span>
         </h1>
 
         <p
           className="font-light leading-[1.7] text-[rgba(200,230,240,0.75)] max-w-[580px]"
           style={{ fontSize: 'clamp(0.9rem, 2vw, 1.05rem)' }}
         >
-          Our platform uses next gen tech to make your deliveries faster and more reliable.
-          <br className="hidden sm:hidden" />
-          Every step is visible, every shipment secure.
+          {t('hero.subtitle')}
         </p>
 
         <div className="flex items-center gap-0 mt-2 w-full justify-center">
@@ -67,7 +68,7 @@ const Home: React.FC = () => {
             href="#track"
             className="inline-flex items-center gap-2.5 px-8 py-3.5 sm:px-6 sm:py-3 bg-[rgba(8,40,50,0.75)] text-white text-base sm:text-[0.9rem] font-medium no-underline border-[1.5px] border-[rgba(0,180,160,0.6)] rounded-full cursor-pointer backdrop-blur-[8px] whitespace-nowrap transition-all duration-[250ms] hover:bg-[rgba(0,120,110,0.35)] hover:border-[#00d4c8] hover:shadow-[0_0_24px_rgba(0,212,200,0.3),inset_0_0_12px_rgba(0,212,200,0.08)] hover:-translate-y-0.5 focus-visible:outline-2 focus-visible:outline-[#00d4c8] focus-visible:outline-offset-4"
           >
-            Track Your Shipment
+            {t('hero.cta')}
             <svg
               className="shrink-0 text-[#00d4c8]"
               width="22"
diff --git a/frontend/src/LandingPage/sections/HowItWorks/HowItWorks.tsx b/frontend/src/LandingPage/sections/HowItWorks/HowItWorks.tsx
index cabded9c..527a54a4 100644
--- a/frontend/src/LandingPage/sections/HowItWorks/HowItWorks.tsx
+++ b/frontend/src/LandingPage/sections/HowItWorks/HowItWorks.tsx
@@ -1,25 +1,25 @@
+import { useTranslation } from "react-i18next";
+
 type Step = {
     number: string;
-    title: string;
-    description: string;
+    key: string;
 };
 
 function HowItWorks() {
+    const { t } = useTranslation("landing");
+
     const steps: Step[] = [
         {
             number: "01",
-            title: "Smart Pickup",
-            description: "We pick up your package from your chosen location or partner hub and log it into our system for full transparency from the start.",
+            key: "pickup",
         },
         {
             number: "02",
-            title: "Live Tracking",
-            description: "Track your shipment in real time with instant updates at every milestone—from dispatch to delivery. No more wondering where your package is.",
+            key: "tracking",
         },
         {
             number: "03",
-            title: "Secure Delivery",
-            description: "Once your package arrives, you'll receive a secure delivery confirmation—complete with proof of hand-off. Peace of mind, guaranteed.",
+            key: "delivery",
         },
     ];
 
@@ -34,10 +34,10 @@ function HowItWorks() {
             
             <div className="relative max-w-7xl mx-auto">
                 <h2 className="font-display text-3xl md:text-5xl lg:text-6xl font-bold text-center mb-6 text-text-primary">
-                    How <span className="text-primary">Navin</span> Works
+                    {t("howItWorks.headingPrefix")} <span className="text-primary">{t("howItWorks.headingHighlight")}</span> {t("howItWorks.headingSuffix")}
                 </h2>
                 <p className="text-center text-text-secondary text-lg mb-16 max-w-2xl mx-auto">
-                    Simple, transparent, and blockchain-powered. Track your shipments from pickup to delivery.
+                    {t("howItWorks.subtitle")}
                 </p>
                 
                 <div className="grid grid-cols-1 md:grid-cols-3 gap-8">
@@ -56,10 +56,10 @@ function HowItWorks() {
                             {/* Content */}
                             <div>
                                 <h3 className="font-display text-2xl font-semibold text-text-primary mb-3 transition-colors duration-300 group-hover:text-primary">
-                                    {step.title}
+                                    {t(`howItWorks.${step.key}.title`)}
                                 </h3>
                                 <p className="font-sans text-base leading-relaxed text-text-secondary transition-colors duration-300 group-hover:text-text-primary">
-                                    {step.description}
+                                    {t(`howItWorks.${step.key}.description`)}
                                 </p>
                             </div>
                             
diff --git a/frontend/src/LandingPage/sections/LogoStrip/LogoStrip.tsx b/frontend/src/LandingPage/sections/LogoStrip/LogoStrip.tsx
index 68ca7efe..0126da02 100644
--- a/frontend/src/LandingPage/sections/LogoStrip/LogoStrip.tsx
+++ b/frontend/src/LandingPage/sections/LogoStrip/LogoStrip.tsx
@@ -1,4 +1,5 @@
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 const LOGOS = [
   { name: 'Stellar',  color: '#00D4C8' },
@@ -12,37 +13,41 @@ const LOGOS = [
 
 const STRIP = [...LOGOS, ...LOGOS];
 
-const LogoStrip: React.FC = () => (
-  <section
-    aria-label="Technology and Partners"
-    className="w-full py-10 overflow-hidden border-y border-border-light bg-background-secondary"
-  >
-    <p className="text-center text-xs font-semibold uppercase tracking-[0.2em] text-text-secondary mb-6">
-      Powered by &amp; Trusted with
-    </p>
+const LogoStrip: React.FC = () => {
+  const { t } = useTranslation('landing');
 
-    <div className="logo-strip-wrapper">
-      <div className="logo-strip-track">
-        {STRIP.map((logo, i) => (
-          <div
-            key={i}
-            className="group flex items-center justify-center px-6 min-w-[140px] h-14 rounded-xl border border-border-light bg-background-card/40 backdrop-blur-sm select-none shrink-0 transition-all duration-300 hover:border-primary-light hover:bg-background-card/60 hover:shadow-glow-blue hover:scale-105"
-          >
-            <span
-              className="text-lg font-bold tracking-tight transition-all duration-300 group-hover:scale-110"
-              style={{
-                color: logo.color,
-                fontFamily: "'Bricolage Grotesque', sans-serif",
-                textShadow: `0 0 18px ${logo.color}55`,
-              }}
+  return (
+    <section
+      aria-label="Technology and Partners"
+      className="w-full py-10 overflow-hidden border-y border-border-light bg-background-secondary"
+    >
+      <p className="text-center text-xs font-semibold uppercase tracking-[0.2em] text-text-secondary mb-6">
+        {t('logoStrip.poweredBy')}
+      </p>
+
+      <div className="logo-strip-wrapper">
+        <div className="logo-strip-track">
+          {STRIP.map((logo, i) => (
+            <div
+              key={i}
+              className="group flex items-center justify-center px-6 min-w-[140px] h-14 rounded-xl border border-border-light bg-background-card/40 backdrop-blur-sm select-none shrink-0 transition-all duration-300 hover:border-primary-light hover:bg-background-card/60 hover:shadow-glow-blue hover:scale-105"
             >
-              {logo.name}
-            </span>
-          </div>
-        ))}
+              <span
+                className="text-lg font-bold tracking-tight transition-all duration-300 group-hover:scale-110"
+                style={{
+                  color: logo.color,
+                  fontFamily: "'Bricolage Grotesque', sans-serif",
+                  textShadow: `0 0 18px ${logo.color}55`,
+                }}
+              >
+                {logo.name}
+              </span>
+            </div>
+          ))}
+        </div>
       </div>
-    </div>
-  </section>
-);
+    </section>
+  );
+};
 
 export default LogoStrip;
\ No newline at end of file
diff --git a/frontend/src/LandingPage/sections/WhyNavin/WhyNavin.tsx b/frontend/src/LandingPage/sections/WhyNavin/WhyNavin.tsx
index 840bf3e5..8f35ba9a 100644
--- a/frontend/src/LandingPage/sections/WhyNavin/WhyNavin.tsx
+++ b/frontend/src/LandingPage/sections/WhyNavin/WhyNavin.tsx
@@ -1,35 +1,34 @@
+import { useTranslation } from "react-i18next";
+
 type WhyNavinItem = {
     icon: string;
     iconAlt: string;
-    header: string;
-    description: string;
+    key: string;
 };
 
 function WhyNavin() {
+    const { t } = useTranslation("landing");
+
     const whyNavin: WhyNavinItem[] = [
         {
             icon: "/images/icons/Transparency.svg",
             iconAlt: "Eye icon",
-            header: "Total Transparency",
-            description: "See your shipments journey, every step of the way.",
+            key: "transparency",
         },
         {
             icon: "/images/icons/Alerts.svg",
             iconAlt: "Bell icon",
-            header: "Real Time Alerts",
-            description: "Know instantly if there is a delay or issue.",
+            key: "alerts",
         },
         {
             icon: "/images/icons/Deliveries.svg",
             iconAlt: "Truck icon",
-            header: "Safe Deliveries",
-            description: "Tamper proof technology prevents fraud and errors.",
+            key: "deliveries",
         },
         {
             icon: "/images/icons/Fast.svg",
             iconAlt: "Rocket icon",
-            header: "Faster Service",
-            description: "Automated processes mean quicker, smoother deliveries.",
+            key: "fastService",
         },
     ];
 
@@ -44,30 +43,30 @@ function WhyNavin() {
             
             <div className="relative max-w-7xl mx-auto">
                 <h2 className="font-display text-3xl md:text-5xl lg:text-6xl font-bold text-center mb-6 text-text-primary">
-                    Why <span className="text-primary">Navin?</span>
+                    {t("whyNavin.heading")} <span className="text-primary">{t("whyNavin.headingHighlight")}</span>
                 </h2>
                 <p className="text-center text-text-secondary text-lg mb-16 max-w-2xl mx-auto">
-                    Blockchain-powered logistics that puts transparency, speed, and security first.
+                    {t("whyNavin.subtitle")}
                 </p>
-                
+
                 <div className="grid gap-6 md:grid-cols-2 lg:grid-cols-4">
                     {whyNavin.map((item) => (
                         <article
-                            key={item.header}
+                            key={item.key}
                             className="group relative flex flex-col gap-6 p-6 bg-background-card/60 backdrop-blur-lg border border-border-light rounded-2xl transition-all duration-300 hover:border-primary-light hover:shadow-glow-blue hover:-translate-y-2 hover:bg-background-card/80"
                         >
                             {/* Icon container */}
                             <div className="inline-flex items-center justify-center w-[6.5rem] h-[6.5rem] rounded-2xl bg-gradient-card border border-primary-light/40 shadow-inset-teal transition-all duration-300 group-hover:shadow-inset-teal-hover group-hover:border-primary-light group-hover:scale-110">
                                 <img src={item.icon} alt={item.iconAlt} className="w-8 h-8 transition-transform duration-300 group-hover:scale-110" />
                             </div>
-                            
+
                             {/* Content */}
                             <div>
                                 <h3 className="font-display text-xl font-semibold text-text-primary mb-3 transition-colors duration-300 group-hover:text-primary">
-                                    {item.header}
+                                    {t(`whyNavin.${item.key}.title`)}
                                 </h3>
                                 <p className="font-sans text-base leading-relaxed text-text-secondary transition-colors duration-300 group-hover:text-text-primary">
-                                    {item.description}
+                                    {t(`whyNavin.${item.key}.description`)}
                                 </p>
                             </div>
                         </article>
diff --git a/frontend/src/components/ErrorBoundary/ErrorBoundary.tsx b/frontend/src/components/ErrorBoundary/ErrorBoundary.tsx
index 2809487b..b267d480 100644
--- a/frontend/src/components/ErrorBoundary/ErrorBoundary.tsx
+++ b/frontend/src/components/ErrorBoundary/ErrorBoundary.tsx
@@ -34,7 +34,7 @@ class ErrorBoundary extends React.Component<ErrorBoundaryProps, State> {
     if (this.state.hasError) {
       if (this.props.fallback) {
         if (typeof this.props.fallback === "function") {
-          return this.props.fallback(this.state.error, this.resetError);
+          return this.props.fallback(this.state.error ?? null, this.resetError);
         }
         return this.props.fallback;
       }
@@ -71,6 +71,7 @@ class ErrorBoundary extends React.Component<ErrorBoundaryProps, State> {
               Try Again
             </button>
           </div>
+        </div>
       );
     }
 
diff --git a/frontend/src/components/Navbar/Navbar.tsx b/frontend/src/components/Navbar/Navbar.tsx
index e1eefba5..909f43c6 100644
--- a/frontend/src/components/Navbar/Navbar.tsx
+++ b/frontend/src/components/Navbar/Navbar.tsx
@@ -13,6 +13,34 @@ const navLinks = [
   { id: "faq", key: "faq", href: "#faq" },
 ];
 
+const LanguageSelect: React.FC<{ compact?: boolean }> = ({ compact = false }) => {
+  const { t, i18n } = useTranslation(["common"]);
+
+  return (
+    <select
+      value={i18n.language}
+      onChange={(e) => {
+        const lang = e.target.value;
+        i18n.changeLanguage(lang);
+        localStorage.setItem("language", lang);
+      }}
+      aria-label={t("language")}
+      className={`bg-gradient-card backdrop-blur-md text-white border border-primary/30 rounded-lg font-medium cursor-pointer transition-all duration-300 hover:border-primary hover:shadow-glow-blue focus:outline-none focus:border-primary focus:shadow-glow-blue appearance-none bg-[url('data:image/svg+xml;charset=utf-8,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20fill%3D%22none%22%20viewBox%3D%220%200%2020%2020%22%3E%3Cpath%20stroke%3D%22%2300d4c8%22%20stroke-linecap%3D%22round%22%20stroke-linejoin%3D%22round%22%20stroke-width%3D%221.5%22%20d%3D%22m6%208%204%204%204-4%22%2F%3E%3C%2Fsvg%3E')] bg-no-repeat ${
+        compact
+          ? "pl-3 pr-7 py-1.5 text-xs bg-[length:1em] bg-[right_0.4rem_center]"
+          : "pl-3 pr-8 py-2 text-sm bg-[length:1.2em] bg-[right_0.4rem_center]"
+      }`}
+      style={{
+        colorScheme: 'dark',
+      }}
+    >
+      <option value="en" className="bg-background text-white">{compact ? "EN" : "English"}</option>
+      <option value="fr" className="bg-background text-white">{compact ? "FR" : "Français"}</option>
+      <option value="es" className="bg-background text-white">{compact ? "ES" : "Español"}</option>
+    </select>
+  );
+};
+
 const Navbar: React.FC = () => {
   const [companyLogo] = React.useState<string | null>(() => {
     try {
@@ -22,7 +50,7 @@ const Navbar: React.FC = () => {
     }
   });
   const location = useLocation();
-const { t, i18n } = useTranslation(["common"]);
+  const { t } = useTranslation(["common"]);
   const isLandingPage = location.pathname === '/';
   const activeSectionId = useScrollSpy(
     isLandingPage ? [...SECTION_IDS] : [],
@@ -43,12 +71,12 @@ const { t, i18n } = useTranslation(["common"]);
 
  return (
   <nav className="absolute top-0 left-0 w-full bg-transparent z-[1000] m-0 p-0">
-    <div className="max-w-[1480px] mx-auto px-8 py-3 flex justify-center items-center relative gap-12">
+    <div className="max-w-[1480px] mx-auto px-8 py-3 flex items-center gap-4">
 
       {/* Logo */}
       <Link
         to="/"
-        className="flex items-center gap-2 no-underline font-albert font-normal text-[30px] text-white transition-opacity duration-300 hover:opacity-80 absolute left-8"
+        className="flex items-center gap-2 no-underline font-albert font-normal text-[30px] text-white transition-opacity duration-300 hover:opacity-80 shrink-0"
       >
         {companyLogo ? (
           <img
@@ -69,59 +97,55 @@ const { t, i18n } = useTranslation(["common"]);
         </span>
       </Link>
 
-      {/* Desktop Menu */}
-      <div className="hidden md:flex items-center gap-12">
-
-        <div className="flex flex-row justify-center items-center px-6 py-3.5 gap-12 h-[55.19px] bg-gradient-card border-t border-[rgba(0,128,128,0.3)] rounded-[30px]">
-          {navLinks.map((link) => {
-            const isActive = activeSectionId === link.id;
-
-            return (
-              <a
-                key={link.id}
-                href={link.href}
-                className={`text-white no-underline text-base font-normal relative transition-colors duration-300 cursor-pointer hover:text-[#00d4c8] after:content-[''] after:absolute after:-bottom-1.5 after:left-0 after:w-0 after:h-0.5 after:bg-[#00d4c8] after:transition-all after:duration-300 hover:after:w-full${
-                  isActive ? " !text-[#00d4c8] after:!w-full" : ""
-                }`}
-                onClick={(e) => handleNavClick(e, link.id)}
-                aria-current={isActive ? "true" : undefined}
-              >
-                {t(link.key)}
-              </a>
-            );
-          })}
+      {/* Compact language switcher for screens too narrow to fit the full nav below
+          (the nav links + login + signup can overflow at md/lg widths once
+          translated into longer languages like French/Spanish) */}
+      <div className="flex xl:hidden items-center ml-auto">
+        <LanguageSelect compact />
+      </div>
+
+      {/* Desktop Menu: a flexible center zone keeps the nav pill from ever
+          colliding with the right-side controls, regardless of how long the
+          translated nav labels get. */}
+      <div className="hidden xl:flex flex-1 items-center min-w-0 gap-4">
+
+        <div className="flex-1 flex justify-center min-w-0">
+          <div className="flex flex-row justify-center items-center px-4 py-3.5 gap-3.5 h-[55.19px] max-w-full bg-gradient-card border-t border-[rgba(0,128,128,0.3)] rounded-[30px]">
+            {navLinks.map((link) => {
+              const isActive = activeSectionId === link.id;
+
+              return (
+                <a
+                  key={link.id}
+                  href={link.href}
+                  className={`text-white no-underline text-sm font-normal relative whitespace-nowrap transition-colors duration-300 cursor-pointer hover:text-[#00d4c8] after:content-[''] after:absolute after:-bottom-1.5 after:left-0 after:w-0 after:h-0.5 after:bg-[#00d4c8] after:transition-all after:duration-300 hover:after:w-full${
+                    isActive ? " !text-[#00d4c8] after:!w-full" : ""
+                  }`}
+                  onClick={(e) => handleNavClick(e, link.id)}
+                  aria-current={isActive ? "true" : undefined}
+                >
+                  {t(link.key)}
+                </a>
+              );
+            })}
+          </div>
         </div>
 
         {/* Right side */}
-        <div className="flex gap-4 items-center absolute right-8">
-
-          <select
-            value={i18n.language}
-            onChange={(e) => {
-              const lang = e.target.value;
-              i18n.changeLanguage(lang);
-              localStorage.setItem("language", lang);
-            }}
-            className="bg-gradient-card backdrop-blur-md text-white border border-primary/30 rounded-lg px-4 py-2 font-medium cursor-pointer transition-all duration-300 hover:border-primary hover:shadow-glow-blue focus:outline-none focus:border-primary focus:shadow-glow-blue appearance-none bg-[url('data:image/svg+xml;charset=utf-8,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20fill%3D%22none%22%20viewBox%3D%220%200%2020%2020%22%3E%3Cpath%20stroke%3D%22%2300d4c8%22%20stroke-linecap%3D%22round%22%20stroke-linejoin%3D%22round%22%20stroke-width%3D%221.5%22%20d%3D%22m6%208%204%204%204-4%22%2F%3E%3C%2Fsvg%3E')] bg-[length:1.5em] bg-[right_0.5rem_center] bg-no-repeat pr-10"
-            style={{
-              colorScheme: 'dark',
-            }}
-          >
-            <option value="en" className="bg-background text-white">English</option>
-            <option value="fr" className="bg-background text-white">Français</option>
-            <option value="es" className="bg-background text-white">Español</option>
-          </select>
+        <div className="flex gap-2.5 items-center shrink-0">
+
+          <LanguageSelect />
 
           <Link
             to="/login"
-            className="px-5 py-2.5 rounded-full no-underline font-medium text-lg transition-all duration-300 text-white font-display bg-transparent hover:-translate-y-0.5"
+            className="px-3 py-2 rounded-full no-underline font-medium text-sm whitespace-nowrap transition-all duration-300 text-white font-display bg-transparent hover:-translate-y-0.5"
           >
             {t("login")}
           </Link>
 
           <Link
             to="/signup"
-            className="font-display flex flex-row justify-center items-center px-8 py-3.5 gap-2 bg-[rgba(1,56,59)] backdrop-blur-xs text-[#E5FFFF] font-bold text-lg leading-[21px] tracking-[-0.32px] no-underline cursor-pointer transition-all duration-300 rounded-full border border-[#60C9CD] shadow-glow-blue shadow-inset-teal hover:-translate-y-0.5 hover:shadow-glow-blue-hover hover:shadow-inset-teal-hover"
+            className="font-display flex flex-row justify-center items-center px-5 py-2.5 gap-2 bg-[rgba(1,56,59)] backdrop-blur-xs text-[#E5FFFF] font-bold text-sm no-underline whitespace-nowrap cursor-pointer transition-all duration-300 rounded-full border border-[#60C9CD] shadow-glow-blue shadow-inset-teal hover:-translate-y-0.5 hover:shadow-glow-blue-hover hover:shadow-inset-teal-hover"
           >
             {t("freeDemo")}
           </Link>
diff --git a/frontend/src/components/auth/ProtectedRoute/ProtectedRoute.test.tsx b/frontend/src/components/auth/ProtectedRoute/ProtectedRoute.test.tsx
index 97da0366..10529333 100644
--- a/frontend/src/components/auth/ProtectedRoute/ProtectedRoute.test.tsx
+++ b/frontend/src/components/auth/ProtectedRoute/ProtectedRoute.test.tsx
@@ -3,6 +3,13 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 import { MemoryRouter, Route, Routes } from 'react-router-dom';
 import ProtectedRoute from './ProtectedRoute';
 
+// Helper to create a valid-looking JWT (not cryptographically signed, just for testing)
+function makeToken(payload: Record<string, unknown>): string {
+  const header = btoa(JSON.stringify({ alg: 'HS256', typ: 'JWT' }));
+  const body = btoa(JSON.stringify(payload));
+  return `${header}.${body}.signature`;
+}
+
 describe('ProtectedRoute', () => {
   beforeEach(() => {
     localStorage.clear();
@@ -49,7 +56,7 @@ describe('ProtectedRoute', () => {
   });
 
   it('renders protected content for authenticated users', () => {
-    localStorage.setItem('authToken', 'test-token');
+    localStorage.setItem('authToken', makeToken({ sub: 'user-1', role: 'company' }));
 
     render(
       <MemoryRouter initialEntries={['/dashboard']}>
diff --git a/frontend/src/components/auth/WalletConnectButton/WalletConnectButton.tsx b/frontend/src/components/auth/WalletConnectButton/WalletConnectButton.tsx
index 4478617f..40f999c0 100644
--- a/frontend/src/components/auth/WalletConnectButton/WalletConnectButton.tsx
+++ b/frontend/src/components/auth/WalletConnectButton/WalletConnectButton.tsx
@@ -1,125 +1,71 @@
-import React, { useState, useEffect } from 'react';
-import {
-    isConnected,
-    getAddress,
-    requestAccess,
-} from '@stellar/freighter-api';
-import { Wallet, LogOut, Download } from 'lucide-react';
+import React, { useEffect, useRef } from 'react';
+import { Wallet, LogOut, Loader2 } from 'lucide-react';
+import { useWallet } from '../../../context/WalletContext';
 
 export interface WalletConnectButtonProps {
-    className?: string;
-    onConnect?: (address: string) => void;
-    onDisconnect?: () => void;
+  className?: string;
+  onConnect?: (address: string) => void;
+  onDisconnect?: () => void;
+}
+
+function truncateAddress(addr: string): string {
+  if (!addr) return '';
+  return `${addr.slice(0, 5)}...${addr.slice(-4)}`;
 }
 
 export const WalletConnectButton: React.FC<WalletConnectButtonProps> = ({
-    className = '',
-    onConnect,
-    onDisconnect,
+  className = '',
+  onConnect,
+  onDisconnect,
 }) => {
-    const [hasFreighter, setHasFreighter] = useState<boolean>(false);
-    const [address, setAddress] = useState<string | null>(null);
-    const [isConnecting, setIsConnecting] = useState<boolean>(false);
-
-    useEffect(() => {
-        let mounted = true;
-        const checkFreighter = async () => {
-            try {
-                const isFreighterInstalled = await isConnected();
-                if (mounted) {
-                    if (isFreighterInstalled.isConnected) {
-                        setHasFreighter(true);
-                        const response = await getAddress();
-                        if (response.address) {
-                            setAddress(response.address);
-                            if (onConnect) onConnect(response.address);
-                        }
-                    } else {
-                        setHasFreighter(false);
-                    }
-                }
-            } catch (error) {
-                console.error('Error checking Freighter status:', error);
-            }
-        };
-        checkFreighter();
-        return () => { mounted = false; };
-    }, [onConnect]);
-
-    const handleConnect = async () => {
-        if (!hasFreighter) {
-            window.open('https://www.freighter.app/', '_blank');
-            return;
-        }
-        try {
-            setIsConnecting(true);
-            const access = await requestAccess();
-            if (access && access.address) {
-                setAddress(access.address);
-                if (onConnect) onConnect(access.address);
-            }
-        } catch (error) {
-            console.error('Error connecting to Freighter:', error);
-        } finally {
-            setIsConnecting(false);
-        }
-    };
-
-    const handleDisconnect = () => {
-        setAddress(null);
-        if (onDisconnect) onDisconnect();
-    };
-
-    const truncateAddress = (addr: string) => {
-        if (!addr) return '';
-        return `${addr.slice(0, 5)}...${addr.slice(-4)}`;
-    };
+  const { publicKey, isConnecting, openModal, disconnect } = useWallet();
+  const prevPublicKey = useRef<string | null>(publicKey);
 
-    // State 1: Connected
-    if (address) {
-        return (
-            <div className={`flex items-center gap-2 font-sans ${className}`}>
-                <button
-                    className="flex items-center justify-center gap-2 px-5 py-2.5 rounded-xl text-[0.95rem] font-semibold cursor-default transition-all border border-gray-200 bg-gray-100 text-gray-800 dark:bg-gray-800 dark:text-gray-100 dark:border-gray-700"
-                    disabled
-                >
-                    <Wallet size={18} className="shrink-0" />
-                    <span className="font-mono tracking-wide">{truncateAddress(address)}</span>
-                </button>
-                <button
-                    className="flex items-center justify-center p-2.5 rounded-xl cursor-pointer transition-all border border-red-100 bg-red-50 text-red-500 hover:bg-red-100 hover:text-red-600 hover:-translate-y-px active:translate-y-px dark:bg-red-500/10 dark:border-red-500/20 dark:text-red-400 dark:hover:bg-red-500/20"
-                    onClick={handleDisconnect}
-                    title="Disconnect wallet"
-                    aria-label="Disconnect wallet"
-                >
-                    <LogOut size={16} className="shrink-0" />
-                </button>
-            </div>
-        );
+  // Notify parents when the underlying wallet state changes, regardless of
+  // whether the connection happened via this button or the navbar picker.
+  useEffect(() => {
+    if (publicKey && publicKey !== prevPublicKey.current) {
+      onConnect?.(publicKey);
+    } else if (!publicKey && prevPublicKey.current) {
+      onDisconnect?.();
     }
+    prevPublicKey.current = publicKey;
+  }, [publicKey, onConnect, onDisconnect]);
 
-    // State 2: Not Installed
-    if (!hasFreighter) {
-        return (
-            <button
-                className={`flex items-center justify-center gap-2 px-5 py-2.5 rounded-xl text-[0.95rem] font-semibold cursor-pointer transition-all border-none bg-gradient-to-br from-blue-500 to-blue-600 text-white shadow-[0_4px_6px_-1px_rgba(59,130,246,0.2),0_2px_4px_-1px_rgba(59,130,246,0.1)] hover:from-blue-600 hover:to-blue-700 hover:-translate-y-px hover:shadow-[0_6px_8px_-1px_rgba(59,130,246,0.3)] active:translate-y-px ${className}`}
-                onClick={handleConnect}
-            >
-                <Download size={18} className="shrink-0" />
-                <span>Install Freighter</span>
-            </button>
-        );
-    }
+  const handleDisconnect = () => {
+    void disconnect();
+  };
 
-    // State 3: Installed, Not Connected
+  if (publicKey) {
     return (
+      <div className={`flex items-center gap-2 font-sans ${className}`}>
         <button
-            className={`flex items-center justify-center gap-2 px-5 py-2.5 rounded-xl text-[0.95rem] font-semibold cursor-pointer transition-all border-none bg-gradient-to-br from-emerald-500 to-emerald-600 text-white shadow-[0_4px_6px_-1px_rgba(16,185,129,0.2),0_2px_4px_-1px_rgba(16,185,129,0.1)] hover:from-emerald-600 hover:to-emerald-700 hover:-translate-y-px hover:shadow-[0_6px_8px_-1px_rgba(16,185,129,0.3)] active:translate-y-px disabled:cursor-default ${className}`}
-            onClick={handleConnect}
-            disabled={isConnecting}
+          className="flex items-center justify-center gap-2 px-5 py-2.5 rounded-xl text-[0.95rem] font-semibold cursor-default transition-all border border-gray-200 bg-gray-100 text-gray-800 dark:bg-gray-800 dark:text-gray-100 dark:border-gray-700"
+          disabled
         >
-            <Wallet size={18} className="shrink-0" />
-            <span>{isConnecting ? 'Connecting...' : 'Connect Wallet'}</span>
+          <Wallet size={18} className="shrink-0" />
+          <span className="font-mono tracking-wide">{truncateAddress(publicKey)}</span>
         </button>
+        <button
+          className="flex items-center justify-center p-2.5 rounded-xl cursor-pointer transition-all border border-red-100 bg-red-50 text-red-500 hover:bg-red-100 hover:text-red-600 hover:-translate-y-px active:translate-y-px dark:bg-red-500/10 dark:border-red-500/20 dark:text-red-400 dark:hover:bg-red-500/20"
+          onClick={handleDisconnect}
+          title="Disconnect wallet"
+          aria-label="Disconnect wallet"
+        >
+          <LogOut size={16} className="shrink-0" />
+        </button>
+      </div>
     );
+  }
+
+  return (
+    <button
+      className={`flex items-center justify-center gap-2 px-5 py-2.5 rounded-xl text-[0.95rem] font-semibold cursor-pointer transition-all border-none bg-gradient-to-br from-emerald-500 to-emerald-600 text-white shadow-[0_4px_6px_-1px_rgba(16,185,129,0.2),0_2px_4px_-1px_rgba(16,185,129,0.1)] hover:from-emerald-600 hover:to-emerald-700 hover:-translate-y-px hover:shadow-[0_6px_8px_-1px_rgba(16,185,129,0.3)] active:translate-y-px disabled:cursor-default disabled:opacity-70 ${className}`}
+      onClick={openModal}
+      disabled={isConnecting}
+    >
+      {isConnecting ? <Loader2 size={18} className="shrink-0 animate-spin" /> : <Wallet size={18} className="shrink-0" />}
+      <span>{isConnecting ? 'Connecting...' : 'Connect Wallet'}</span>
+    </button>
+  );
 };
diff --git a/frontend/src/components/common/GlobalSearch/GlobalSearch.tsx b/frontend/src/components/common/GlobalSearch/GlobalSearch.tsx
index b0550182..73e7343e 100644
--- a/frontend/src/components/common/GlobalSearch/GlobalSearch.tsx
+++ b/frontend/src/components/common/GlobalSearch/GlobalSearch.tsx
@@ -165,13 +165,11 @@ const GlobalSearch: React.FC<GlobalSearchProps> = ({
 
     const trimmed = query.trim();
     if (!trimmed) {
-      setResults([]);
-      setLoading(false);
       return;
     }
 
-    setLoading(true);
     debounceRef.current = setTimeout(async () => {
+      setLoading(true);
       try {
         const { data } = await shipmentApi.getAll({ limit: 50 });
         const q = trimmed.toLowerCase();
@@ -199,7 +197,13 @@ const GlobalSearch: React.FC<GlobalSearchProps> = ({
 
   // ── Keyboard navigation ───────────────────────────────────────────────────
 
-  const allItems = query.trim() ? results : recent.map((r) => ({ id: r, recent: true }));
+  const trimmedQuery = query.trim();
+  // Results/loading only reflect the current query; once it's cleared, the
+  // previous search's state is stale and shouldn't be shown.
+  const displayResults = trimmedQuery ? results : [];
+  const displayLoading = trimmedQuery ? loading : false;
+
+  const allItems = trimmedQuery ? displayResults : recent.map((r) => ({ id: r, recent: true }));
   const itemCount = allItems.length;
 
   const handleKeyDown = (e: React.KeyboardEvent<HTMLInputElement>) => {
@@ -211,8 +215,8 @@ const GlobalSearch: React.FC<GlobalSearchProps> = ({
       setActiveIdx((prev) => (prev - 1 + itemCount) % itemCount);
     } else if (e.key === 'Enter' && activeIdx >= 0) {
       e.preventDefault();
-      if (query.trim()) {
-        const result = results[activeIdx];
+      if (trimmedQuery) {
+        const result = displayResults[activeIdx];
         if (result) navigateTo(result);
       } else {
         const r = recent[activeIdx];
@@ -239,9 +243,9 @@ const GlobalSearch: React.FC<GlobalSearchProps> = ({
   // ── Render ────────────────────────────────────────────────────────────────
 
   const showPanel = open;
-  const showRecent = open && !query.trim() && recent.length > 0;
-  const showResults = open && query.trim().length > 0;
-  const noResults = showResults && !loading && results.length === 0;
+  const showRecent = open && !trimmedQuery && recent.length > 0;
+  const showResults = open && trimmedQuery.length > 0;
+  const noResults = showResults && !displayLoading && displayResults.length === 0;
 
   return (
     <>
@@ -285,7 +289,7 @@ const GlobalSearch: React.FC<GlobalSearchProps> = ({
           <div className="absolute top-full left-0 right-0 mt-2 bg-background-elevated border border-border rounded-2xl shadow-[0_16px_48px_rgba(0,0,0,0.6)] overflow-hidden animate-fade-in-up min-w-[320px]">
             {/* Input */}
             <div className="flex items-center gap-3 px-4 py-3 border-b border-border">
-              {loading ? (
+              {displayLoading ? (
                 <Loader2 size={16} className="shrink-0 text-accent-blue animate-spin" />
               ) : (
                 <Search size={16} className="shrink-0 text-text-secondary" />
@@ -354,7 +358,7 @@ const GlobalSearch: React.FC<GlobalSearchProps> = ({
                 role="listbox"
                 className="py-2 max-h-72 overflow-y-auto"
               >
-                {results.map((result, i) => (
+                {displayResults.map((result, i) => (
                   <li
                     key={result.id}
                     id={`gs-item-${i}`}
@@ -422,7 +426,7 @@ const GlobalSearch: React.FC<GlobalSearchProps> = ({
             )}
 
             {/* Loading */}
-            {loading && results.length === 0 && (
+            {displayLoading && displayResults.length === 0 && (
               <div className="flex items-center justify-center gap-2 py-8 text-text-secondary text-sm">
                 <Loader2 size={16} className="animate-spin" />
                 Searching…
diff --git a/frontend/src/components/common/Modal/Modal.test.tsx b/frontend/src/components/common/Modal/Modal.test.tsx
index ad770e25..9cdeb247 100644
--- a/frontend/src/components/common/Modal/Modal.test.tsx
+++ b/frontend/src/components/common/Modal/Modal.test.tsx
@@ -58,8 +58,7 @@ describe('Modal', () => {
     const user = userEvent.setup();
     const onClose = vi.fn();
     render(<Modal {...defaultProps} onClose={onClose} closeOnOverlayClick />);
-    const overlays = document.querySelectorAll('[aria-hidden="true"]');
-    const overlay = overlays[1];
+    const overlay = document.querySelector('[role="presentation"]')!.firstElementChild as HTMLElement;
     await user.click(overlay);
     expect(onClose).toHaveBeenCalledTimes(1);
   });
@@ -68,8 +67,7 @@ describe('Modal', () => {
     const user = userEvent.setup();
     const onClose = vi.fn();
     render(<Modal {...defaultProps} onClose={onClose} closeOnOverlayClick={false} />);
-    const overlays = document.querySelectorAll('[aria-hidden="true"]');
-    const overlay = overlays[1];
+    const overlay = document.querySelector('[role="presentation"]')!.firstElementChild as HTMLElement;
     await user.click(overlay);
     expect(onClose).not.toHaveBeenCalled();
   });
diff --git a/frontend/src/components/dashboard/ShipmentVolumeTrendWidget/ShipmentVolumeTrendWidget.tsx b/frontend/src/components/dashboard/ShipmentVolumeTrendWidget/ShipmentVolumeTrendWidget.tsx
index 5f05153e..c149d6e5 100644
--- a/frontend/src/components/dashboard/ShipmentVolumeTrendWidget/ShipmentVolumeTrendWidget.tsx
+++ b/frontend/src/components/dashboard/ShipmentVolumeTrendWidget/ShipmentVolumeTrendWidget.tsx
@@ -150,6 +150,7 @@ export default function ShipmentVolumeTrendWidget({
               <TrendIcon size={14} />
               <span>{percentage.toFixed(1)}%</span>
             </div>
+          </div>
 
           <div className="flex items-center gap-3">
             <WidgetRefreshIndicator
@@ -194,6 +195,7 @@ export default function ShipmentVolumeTrendWidget({
             </button>
           ))}
         </div>
+      </div>
 
       {/* Chart body */}
       <div className="pt-5 pr-4 pb-3 pl-0 h-[400px] md:h-[300px] md:pt-4 md:pr-2 md:pb-2">
@@ -273,5 +275,6 @@ export default function ShipmentVolumeTrendWidget({
           </AreaChart>
         </ResponsiveContainer>
       </div>
+    </div>
   );
 }
diff --git a/frontend/src/components/index.ts b/frontend/src/components/index.ts
index e50e5af0..008ba7a9 100644
--- a/frontend/src/components/index.ts
+++ b/frontend/src/components/index.ts
@@ -71,8 +71,8 @@ export { default as CostPerRouteWidget } from './dashboard/CostPerRouteWidget';
 // Shipment
 export { default as TrackingTimeline } from './shipment/TrackingTimeline';
 export type { TrackingTimelineProps, Milestone } from './shipment/TrackingTimeline';
-export { default as MilestoneTimeline } from './shipment/MilestoneTimeline';
-export type { MilestoneDetail, MilestoneTimelineProps } from './shipment/MilestoneTimeline';
+export { default as MilestoneTimeline } from './shipment/MilestoneTimeline/MilestoneTimeline';
+export type { MilestoneDetail, MilestoneTimelineProps } from './shipment/MilestoneTimeline/MilestoneTimeline';
 export { default as EventAnnotation } from './shipment/EventAnnotation';
 export type { EventAnnotationProps, Annotation } from './shipment/EventAnnotation';
 export { default as StatusUpdate } from './shipment/StatusUpdate';
@@ -81,7 +81,7 @@ export { default as DeliveryConfirmation } from './shipment/DeliveryConfirmation
 export type { DeliveryConfirmationProps } from './shipment/DeliveryConfirmation/DeliveryConfirmation';
 export { default as QuickActionPanel } from './shipment/QuickActionPanel';
 export type { QuickActionPanelProps, ActionType } from './shipment/QuickActionPanel';
-export { default as OverdueShipmentBadge } from './shipment/OverdueShipmentBadge';
+export { OverdueShipmentBadge } from './shipment/OverdueShipmentBadge';
 export type { OverdueShipmentBadgeProps } from './shipment/OverdueShipmentBadge';
 
 // Onboarding
diff --git a/frontend/src/components/layout/DashboardLayout.tsx b/frontend/src/components/layout/DashboardLayout.tsx
index b236e29a..165666b5 100644
--- a/frontend/src/components/layout/DashboardLayout.tsx
+++ b/frontend/src/components/layout/DashboardLayout.tsx
@@ -292,7 +292,6 @@ const DashboardLayout: React.FC = () => {
           ${isSidebarOpen ? 'translate-x-0' : '-translate-x-full lg:translate-x-0'}
           ${isCollapsed ? 'w-16 px-2 py-6' : 'w-64 p-6'}
         `}
-        aria-label="Main navigation"
       >
         {/* Logo + collapse toggle */}
         <div className={`flex items-center mb-10 ${isCollapsed ? 'justify-center' : 'justify-between'}`}>
@@ -302,40 +301,6 @@ const DashboardLayout: React.FC = () => {
               <span>NAVIN</span>
             </div>
           )}
-        <div className="flex items-center gap-3 text-xl font-bold mb-12 text-teal-600 dark:text-[#62ffff]">
-          <img src="/images/logo.svg" alt="Navin Logo" className="w-8 h-8" />
-          <span>NAVIN</span>
-          <button
-            className="ml-auto flex lg:hidden bg-transparent border-none text-slate-400 cursor-pointer"
-            onClick={closeSidebar}
-            aria-label="Close sidebar"
-          >
-            <X size={20} />
-          </button>
-        </div>
-
-        {favoriteItems.length > 0 && (
-          <div className="mb-8" aria-label="Dashboard favorites">
-            <h3 className="text-[11px] font-semibold uppercase text-gray-500 dark:text-[#8a8f9d] tracking-[0.05em] mb-4">Favorites</h3>
-            <div className="flex flex-col gap-1">
-              {favoriteItems.map((item) => renderNavItem(item, false))}
-            </div>
-          </div>
-        )}
-
-        <div className="mb-8">
-          <h3 className="text-[11px] font-semibold uppercase text-gray-500 dark:text-[#8a8f9d] tracking-[0.05em] mb-4">Main Menu</h3>
-          <div className="flex flex-col gap-1">
-            {mainMenu.map((item) => renderNavItem(item))}
-          </div>
-        </div>
-
-        <div className="mb-8">
-          <h3 className="text-[11px] font-semibold uppercase text-gray-500 dark:text-[#8a8f9d] tracking-[0.05em] mb-4">System</h3>
-          <div className="flex flex-col gap-1">
-            {systemMenu.map((item) => renderNavItem(item))}
-          </div>
-        </div>
           {isCollapsed && (
             <img src="/images/logo.svg" alt="Navin Logo" className="w-8 h-8" />
           )}
@@ -362,6 +327,15 @@ const DashboardLayout: React.FC = () => {
           </div>
         </div>
 
+        {favoriteItems.length > 0 && (
+          <div className="mb-8" aria-label="Dashboard favorites">
+            <h3 className="text-[11px] font-semibold uppercase text-gray-500 dark:text-[#8a8f9d] tracking-[0.05em] mb-4">Favorites</h3>
+            <div className="flex flex-col gap-1">
+              {favoriteItems.map((item) => renderNavItem(item, false))}
+            </div>
+          </div>
+        )}
+
         {/* Nav groups */}
         <nav className="flex-1 overflow-y-auto overflow-x-hidden" aria-label="Site navigation">
           {navGroups.map(group => (
diff --git a/frontend/src/components/notifications/NotificationDropdown/NotificationDropdown.tsx b/frontend/src/components/notifications/NotificationDropdown/NotificationDropdown.tsx
index 44a0b4f3..22a30151 100644
--- a/frontend/src/components/notifications/NotificationDropdown/NotificationDropdown.tsx
+++ b/frontend/src/components/notifications/NotificationDropdown/NotificationDropdown.tsx
@@ -123,14 +123,12 @@ export const NotificationDropdown: React.FC = () => {
 
   // Focus first item when dropdown opens
   useEffect(() => {
-    if (isOpen) {
-      setFocusIndex(-1);
-      // Small delay to allow the dropdown to render
-      const timer = setTimeout(() => {
-        listRef.current?.querySelector<HTMLElement>('[role="listitem"]')?.focus();
-      }, 50);
-      return () => clearTimeout(timer);
-    }
+    if (!isOpen) return;
+    // Small delay to allow the dropdown to render
+    const timer = setTimeout(() => {
+      listRef.current?.querySelector<HTMLElement>('[role="listitem"]')?.focus();
+    }, 50);
+    return () => clearTimeout(timer);
   }, [isOpen]);
 
   useEffect(() => {
@@ -162,7 +160,11 @@ export const NotificationDropdown: React.FC = () => {
       <button
         ref={toggleRef}
         className="relative flex items-center justify-center w-[34px] h-[34px] rounded-lg bg-[#07090d] text-white border-none cursor-pointer transition-all hover:bg-[#1e2433] focus-visible:outline-2 focus-visible:outline-blue-500"
-        onClick={() => setIsOpen(!isOpen)}
+        onClick={() => {
+          const next = !isOpen;
+          setIsOpen(next);
+          if (next) setFocusIndex(-1);
+        }}
         aria-label={unreadCount > 0 ? `Notifications — ${unreadCount} unread` : "Notifications"}
         aria-haspopup="true"
         aria-expanded={isOpen}
diff --git a/frontend/src/components/shipment/StatusUpdate/StatusUpdate.test.tsx b/frontend/src/components/shipment/StatusUpdate/StatusUpdate.test.tsx
index ce536deb..7acee092 100644
--- a/frontend/src/components/shipment/StatusUpdate/StatusUpdate.test.tsx
+++ b/frontend/src/components/shipment/StatusUpdate/StatusUpdate.test.tsx
@@ -1,10 +1,23 @@
+import type { ReactElement } from 'react';
 import { fireEvent, render, screen, waitFor } from '@testing-library/react';
 import { describe, expect, it, vi } from 'vitest';
+import { BrowserRouter } from 'react-router-dom';
 import StatusUpdate from './StatusUpdate';
+import { ToastProvider } from '../../../context/ToastContext';
+import { LiveRegionProvider } from '../../../context/LiveRegionContext';
+
+const renderWithProviders = (ui: ReactElement) =>
+  render(
+    <BrowserRouter>
+      <LiveRegionProvider>
+        <ToastProvider>{ui}</ToastProvider>
+      </LiveRegionProvider>
+    </BrowserRouter>,
+  );
 
 describe('StatusUpdate', () => {
   it('shows a dropdown with five milestone options', () => {
-    render(<StatusUpdate shipmentId="1234" />);
+    renderWithProviders(<StatusUpdate shipmentId="1234" />);
 
     fireEvent.click(screen.getByRole('button', { name: /update status for shipment 1234/i }));
 
@@ -19,7 +32,7 @@ describe('StatusUpdate', () => {
   it('opens confirmation dialog and closes on cancel', () => {
     const onStatusUpdate = vi.fn().mockResolvedValue(undefined);
 
-    render(<StatusUpdate shipmentId="1234" onStatusUpdate={onStatusUpdate} />);
+    renderWithProviders(<StatusUpdate shipmentId="1234" onStatusUpdate={onStatusUpdate} />);
 
     fireEvent.click(screen.getByRole('button', { name: /update status for shipment 1234/i }));
     fireEvent.click(screen.getByRole('button', { name: 'In Transit' }));
@@ -36,7 +49,7 @@ describe('StatusUpdate', () => {
   it('confirms status update and shows success feedback', async () => {
     const onStatusUpdate = vi.fn().mockResolvedValue(undefined);
 
-    render(<StatusUpdate shipmentId="1234" onStatusUpdate={onStatusUpdate} />);
+    renderWithProviders(<StatusUpdate shipmentId="1234" onStatusUpdate={onStatusUpdate} />);
 
     fireEvent.click(screen.getByRole('button', { name: /update status for shipment 1234/i }));
     fireEvent.click(screen.getByRole('button', { name: 'Delivered' }));
@@ -46,20 +59,26 @@ describe('StatusUpdate', () => {
       expect(onStatusUpdate).toHaveBeenCalledWith('1234', 'Delivered');
     });
 
-    expect(screen.getByRole('status')).toHaveTextContent('Shipment #1234 updated to Delivered.');
+    await waitFor(() => {
+      expect(screen.getByRole('status')).toHaveTextContent('Shipment #1234 updated to Delivered.');
+    });
   });
 
   it('shows error feedback when update fails', async () => {
     const onStatusUpdate = vi.fn().mockRejectedValue(new Error('Could not update shipment'));
 
-    render(<StatusUpdate shipmentId="1234" onStatusUpdate={onStatusUpdate} />);
+    renderWithProviders(<StatusUpdate shipmentId="1234" onStatusUpdate={onStatusUpdate} />);
 
     fireEvent.click(screen.getByRole('button', { name: /update status for shipment 1234/i }));
     fireEvent.click(screen.getByRole('button', { name: 'Out for Delivery' }));
     fireEvent.click(screen.getByRole('button', { name: 'Confirm' }));
 
+    // useOptimisticUpdate deliberately swallows the raw thrown error and
+    // surfaces its own configured, user-facing fallback message instead.
     await waitFor(() => {
-      expect(screen.getByRole('alert')).toHaveTextContent('Could not update shipment');
+      expect(screen.getByRole('alert')).toHaveTextContent(
+        'Failed to update shipment status. Changes have been reverted.',
+      );
     });
   });
 });
diff --git a/frontend/src/components/shipment/TrackingTimeline/TrackingTimeline.test.tsx b/frontend/src/components/shipment/TrackingTimeline/TrackingTimeline.test.tsx
index 4ed36e50..539ae931 100644
--- a/frontend/src/components/shipment/TrackingTimeline/TrackingTimeline.test.tsx
+++ b/frontend/src/components/shipment/TrackingTimeline/TrackingTimeline.test.tsx
@@ -95,8 +95,10 @@ describe('TrackingTimeline', () => {
   it('renders connectors between milestones (n-1 connectors for n milestones)', () => {
     const { container } = render(<TrackingTimeline milestones={mockMilestones} />);
 
-    // Connectors are aria-hidden divs (not SVGs) between milestone items
-    const connectors = container.querySelectorAll('div[aria-hidden="true"]');
+    // Connectors are aria-hidden divs between milestone icons. The timeline
+    // also has other decorative aria-hidden elements (progress step dots,
+    // the "current" pulse ring), so scope to the connector's unique class.
+    const connectors = container.querySelectorAll('div[aria-hidden="true"].min-h-\\[48px\\]');
     expect(connectors.length).toBe(mockMilestones.length - 1);
   });
 
diff --git a/frontend/src/components/shipment/TrackingTimeline/TrackingTimeline.tsx b/frontend/src/components/shipment/TrackingTimeline/TrackingTimeline.tsx
index 441ea88e..d2f6448a 100644
--- a/frontend/src/components/shipment/TrackingTimeline/TrackingTimeline.tsx
+++ b/frontend/src/components/shipment/TrackingTimeline/TrackingTimeline.tsx
@@ -13,10 +13,15 @@ export interface TrackingTimelineProps {
   milestones: Milestone[];
 }
 
+const STATUS_LABEL: Record<Milestone['status'], string> = {
+  completed: 'Completed',
+  current: 'Current',
+  upcoming: 'Upcoming',
+};
+
 function getMilestoneIcon(name: string, status: Milestone['status']) {
   const upper = name.toUpperCase();
-  const sizeClass = 'w-4 h-4';
-  const iconProps = { className: sizeClass };
+  const iconProps = { className: 'w-4 h-4', 'aria-label': STATUS_LABEL[status] };
 
   let Icon = Package;
   if (upper.includes('PICK') || upper.includes('CARRIER')) Icon = Truck;
@@ -24,7 +29,6 @@ function getMilestoneIcon(name: string, status: Milestone['status']) {
   else if (upper.includes('DELIVER')) Icon = CheckCircle;
   else if (upper.includes('DELAY')) Icon = AlertTriangle;
 
-  if (status === 'upcoming') return <Icon {...iconProps} />;
   return <Icon {...iconProps} />;
 }
 
diff --git a/frontend/src/components/ui/DataTable/DataTable.tsx b/frontend/src/components/ui/DataTable/DataTable.tsx
index 762cefda..b971fafe 100644
--- a/frontend/src/components/ui/DataTable/DataTable.tsx
+++ b/frontend/src/components/ui/DataTable/DataTable.tsx
@@ -138,8 +138,8 @@ function DataTable<T extends object>({
           <tbody>
             {pagedData.length === 0 ? (
               <tr>
-                <td colSpan={columns.length} className="px-6 py-16 text-center text-text-secondary text-sm">
-                  No data available
+                <td colSpan={columns.length} className="p-0">
+                  <EmptyState title="No data available" />
                 </td>
               </tr>
             ) : (
diff --git a/frontend/src/components/ui/RoleAccessInfo.tsx b/frontend/src/components/ui/RoleAccessInfo.tsx
index 7e3d05ba..73df136f 100644
--- a/frontend/src/components/ui/RoleAccessInfo.tsx
+++ b/frontend/src/components/ui/RoleAccessInfo.tsx
@@ -7,6 +7,7 @@ export interface RoleAccessInfoProps {
   requiredRole?: string;
   userRole?: string;
   children?: React.ReactNode;
+  className?: string;
 }
 
 const RoleAccessInfo: React.FC<RoleAccessInfoProps> = ({
@@ -15,13 +16,14 @@ const RoleAccessInfo: React.FC<RoleAccessInfoProps> = ({
   requiredRole = 'Company Account',
   userRole,
   children,
+  className = '',
 }) => {
   if (hasAccess) {
     return children ? <>{children}</> : null;
   }
 
   return (
-    <div className="flex flex-col gap-3 p-4 rounded-lg border border-border/50 bg-background-card/50 backdrop-blur-sm">
+    <div className={`flex flex-col gap-3 p-4 rounded-lg border border-border/50 bg-background-card/50 backdrop-blur-sm ${className}`}>
       <div className="flex items-start gap-3">
         <AlertCircle className="w-5 h-5 text-text-secondary/60 shrink-0 mt-0.5" aria-hidden="true" />
         <div className="flex-1">
diff --git a/frontend/src/components/ui/Tag.test.tsx b/frontend/src/components/ui/Tag.test.tsx
index 5eeb51d0..36f18de7 100644
--- a/frontend/src/components/ui/Tag.test.tsx
+++ b/frontend/src/components/ui/Tag.test.tsx
@@ -1,6 +1,7 @@
 import { render, screen } from '@testing-library/react';
 import { describe, expect, it, vi } from 'vitest';
-import Tag, { StatusBadge, STATUS_VARIANT_MAP } from './Tag';
+import Tag, { StatusBadge } from './Tag';
+import { STATUS_VARIANT_MAP } from './statusVariantMap';
 
 describe('Tag', () => {
   it('renders the requested variant, size, icon and remove button', () => {
diff --git a/frontend/src/components/ui/Tag.tsx b/frontend/src/components/ui/Tag.tsx
index 9b5f3cf2..192d64fa 100644
--- a/frontend/src/components/ui/Tag.tsx
+++ b/frontend/src/components/ui/Tag.tsx
@@ -85,23 +85,4 @@ export const StatusBadge: React.FC<StatusBadgeProps> = ({ status, variant = 'def
   <Tag label={status} variant={variant} size={size} dot className={className} />
 );
 
-// Status variant mapping for common statuses
-export const STATUS_VARIANT_MAP: Record<string, TagVariant> = {
-  active: 'success',
-  completed: 'success',
-  delivered: 'success',
-  released: 'success',
-  success: 'success',
-  pending: 'warning',
-  in_transit: 'info',
-  processing: 'info',
-  escrowed: 'accent',
-  failed: 'danger',
-  cancelled: 'danger',
-  disputed: 'danger',
-  error: 'danger',
-  idle: 'neutral',
-  draft: 'neutral',
-};
-
 export default Tag;
diff --git a/frontend/src/components/ui/statusVariantMap.ts b/frontend/src/components/ui/statusVariantMap.ts
new file mode 100644
index 00000000..16f4e8bb
--- /dev/null
+++ b/frontend/src/components/ui/statusVariantMap.ts
@@ -0,0 +1,20 @@
+import type { TagVariant } from './Tag';
+
+// Status variant mapping for common statuses
+export const STATUS_VARIANT_MAP: Record<string, TagVariant> = {
+  active: 'success',
+  completed: 'success',
+  delivered: 'success',
+  released: 'success',
+  success: 'success',
+  pending: 'warning',
+  in_transit: 'info',
+  processing: 'info',
+  escrowed: 'accent',
+  failed: 'danger',
+  cancelled: 'danger',
+  disputed: 'danger',
+  error: 'danger',
+  idle: 'neutral',
+  draft: 'neutral',
+};
diff --git a/frontend/src/components/wallet/WalletModal.tsx b/frontend/src/components/wallet/WalletModal.tsx
index 5d4bfea9..ebee3552 100644
--- a/frontend/src/components/wallet/WalletModal.tsx
+++ b/frontend/src/components/wallet/WalletModal.tsx
@@ -1,5 +1,5 @@
 import React, { useEffect, useState } from 'react';
-import { Loader2, Smartphone, Globe, CheckCircle, HelpCircle, AlertCircle, RefreshCw } from 'lucide-react';
+import { Loader2, Smartphone, Globe, CheckCircle, HelpCircle, AlertCircle, RefreshCw, Wallet } from 'lucide-react';
 import Modal from '../common/Modal/Modal';
 import { useWallet } from '../../context/WalletContext';
 import { WALLET_ADAPTERS } from '../../services/stellar/adapters';
@@ -30,6 +30,13 @@ function friendlyError(err: unknown): string {
   return msg.length > 120 ? `${msg.slice(0, 117)}…` : msg;
 }
 
+/** No per-wallet artwork ships with the app, so fall back to a recognizable lucide icon per adapter. */
+function adapterIcon(id: WalletAdapter['id']): React.ReactNode {
+  if (id === 'albedo') return <Globe size={16} aria-hidden="true" />;
+  if (id === 'lobstr') return <Smartphone size={16} aria-hidden="true" />;
+  return <Wallet size={16} aria-hidden="true" />;
+}
+
 function statusBadge(id: WalletAdapter['id'], available: boolean | undefined): React.ReactNode {
   if (id === 'lobstr') {
     return (
@@ -150,14 +157,8 @@ const WalletModal: React.FC = () => {
                       : 'border-border hover:border-primary hover:bg-background-elevated'
                   }`}
                 >
-                  <div className="w-8 h-8 rounded-lg bg-background-elevated flex items-center justify-center shrink-0">
-                    <img
-                      src={adapter.icon}
-                      alt=""
-                      aria-hidden="true"
-                      className="w-5 h-5"
-                      onError={(e) => { (e.currentTarget as HTMLImageElement).style.display = 'none'; }}
-                    />
+                  <div className="w-8 h-8 rounded-lg bg-background-elevated flex items-center justify-center shrink-0 text-text-primary">
+                    {adapterIcon(adapter.id)}
                   </div>
                   <span className="flex-1 font-medium text-text-primary">{adapter.name}</span>
                   {isLoadingThis ? (
diff --git a/frontend/src/hooks/useFormAutosave.ts b/frontend/src/hooks/useFormAutosave.ts
index c2e36911..db1f3b65 100644
--- a/frontend/src/hooks/useFormAutosave.ts
+++ b/frontend/src/hooks/useFormAutosave.ts
@@ -52,7 +52,9 @@ function useFormAutosave<T>({
   const isMountedRef = useRef(false);
 
   // Keep the ref up to date so saveNow always uses the latest data
-  dataRef.current = data;
+  useEffect(() => {
+    dataRef.current = data;
+  });
 
   const persistData = useCallback(() => {
     setStatus('saving');
diff --git a/frontend/src/hooks/useFormDraft.ts b/frontend/src/hooks/useFormDraft.ts
index 9ecafb9b..1c65f9e6 100644
--- a/frontend/src/hooks/useFormDraft.ts
+++ b/frontend/src/hooks/useFormDraft.ts
@@ -86,7 +86,9 @@ export function useFormDraft<T extends object>(
     if (disabled || hasPendingDraft.current) return;
 
     if (isEmpty(values)) {
-      clearDraft();
+      // Defer out of the effect body so the setState inside clearDraft()
+      // isn't called synchronously during the effect.
+      queueMicrotask(() => clearDraft());
       return;
     }
 
diff --git a/frontend/src/hooks/useWidgetCache.ts b/frontend/src/hooks/useWidgetCache.ts
index 4a11a94c..fb0f4598 100644
--- a/frontend/src/hooks/useWidgetCache.ts
+++ b/frontend/src/hooks/useWidgetCache.ts
@@ -71,7 +71,9 @@ function useWidgetCache<T>(
   // adding it to the dependency array (avoids infinite loops when the caller
   // passes an inline arrow function).
   const fetcherRef = useRef(fetcher);
-  fetcherRef.current = fetcher;
+  useEffect(() => {
+    fetcherRef.current = fetcher;
+  });
 
   // -------------------------------------------------------------------------
   // Derive initial state from whatever is already in the cache.
@@ -122,26 +124,31 @@ function useWidgetCache<T>(
   // navigation returns to this widget's route).
   // -------------------------------------------------------------------------
   useEffect(() => {
-    const entry = getCachedEntry();
-
-    if (!entry) {
-      // No cached data at all — fetch immediately.
-      void runFetch();
-      return;
-    }
-
-    if (isEntryStale(entry)) {
-      // Data exists but is past TTL — mark stale and re-fetch.
-      setData(entry.data); // keep showing stale data while re-fetching
-      setIsStale(true);
-      void runFetch();
-    } else {
-      // Fresh cached data — hydrate state without a loading spinner.
-      setData(entry.data);
-      setIsStale(false);
-      setLastUpdated(new Date(entry.fetchedAt));
-      setIsLoading(false);
-    }
+    // The whole body is deferred to a microtask so its setState calls run
+    // as a reaction to the cache lookup rather than synchronously within
+    // the effect (still resolves before the next paint).
+    queueMicrotask(() => {
+      const entry = getCachedEntry();
+
+      if (!entry) {
+        // No cached data at all — fetch immediately.
+        void runFetch();
+        return;
+      }
+
+      if (isEntryStale(entry)) {
+        // Data exists but is past TTL — mark stale and re-fetch.
+        setData(entry.data); // keep showing stale data while re-fetching
+        setIsStale(true);
+        void runFetch();
+      } else {
+        // Fresh cached data — hydrate state without a loading spinner.
+        setData(entry.data);
+        setIsStale(false);
+        setLastUpdated(new Date(entry.fetchedAt));
+        setIsLoading(false);
+      }
+    });
   }, [cacheKey, getCachedEntry, isEntryStale, runFetch]);
 
   // -------------------------------------------------------------------------
diff --git a/frontend/src/hooks/useWidgetRefresh.ts b/frontend/src/hooks/useWidgetRefresh.ts
index 2b719874..6c26a325 100644
--- a/frontend/src/hooks/useWidgetRefresh.ts
+++ b/frontend/src/hooks/useWidgetRefresh.ts
@@ -55,7 +55,9 @@ function useWidgetRefresh({
   const successTimerRef = useRef<ReturnType<typeof setTimeout> | null>(null);
   const isMountedRef = useRef(true);
 
-  onRefreshRef.current = onRefresh;
+  useEffect(() => {
+    onRefreshRef.current = onRefresh;
+  });
 
   useEffect(() => {
     isMountedRef.current = true;
diff --git a/frontend/src/i18n.ts b/frontend/src/i18n.ts
index 8636be9c..006bb633 100644
--- a/frontend/src/i18n.ts
+++ b/frontend/src/i18n.ts
@@ -6,16 +6,19 @@ import enAuth from "./locales/en/auth.json";
 import enDashboard from "./locales/en/dashboard.json";
 import enShipments from "./locales/en/shipments.json";
 import enSettings from "./locales/en/settings.json";
-import frCommon from "./locales/fr/common.json";    
+import enLanding from "./locales/en/landing.json";
+import frCommon from "./locales/fr/common.json";
 import frAuth from "./locales/fr/auth.json";
 import frDashboard from "./locales/fr/dashboard.json";
 import frShipments from "./locales/fr/shipments.json";
 import frSettings from "./locales/fr/settings.json";
+import frLanding from "./locales/fr/landing.json";
 import esCommon from "./locales/es/common.json";
 import esAuth from "./locales/es/auth.json";
 import esDashboard from "./locales/es/dashboard.json";
 import esShipments from "./locales/es/shipments.json";
-import esSettings from "./locales/es/settings.json";        
+import esSettings from "./locales/es/settings.json";
+import esLanding from "./locales/es/landing.json";
 
 
 const savedLanguage =
@@ -38,6 +41,7 @@ i18n.use(initReactI18next).init({
       dashboard: enDashboard,
       shipments: enShipments,
       settings: enSettings,
+      landing: enLanding,
     },
     fr: {
       common: frCommon,
@@ -45,6 +49,7 @@ i18n.use(initReactI18next).init({
       dashboard: frDashboard,
       shipments: frShipments,
       settings: frSettings,
+      landing: frLanding,
     },
     es: {
       common: esCommon,
@@ -52,6 +57,7 @@ i18n.use(initReactI18next).init({
       dashboard: esDashboard,
       shipments: esShipments,
       settings: esSettings,
+      landing: esLanding,
     },
   },
 });
diff --git a/frontend/src/index.css b/frontend/src/index.css
index d5208589..cf0ab0c2 100644
--- a/frontend/src/index.css
+++ b/frontend/src/index.css
@@ -1,6 +1,8 @@
 @import url("https://fonts.googleapis.com/css2?family=Albert+Sans:ital,wght@0,100..900;1,100..900&display=swap");
 @import url("https://fonts.googleapis.com/css2?family=Albert+Sans:ital,wght@0,100..900;1,100..900&family=Bricolage+Grotesque:opsz,wght@12..96,200..800&display=swap");
+@import url("https://fonts.googleapis.com/css2?family=Bebas+Neue&family=DM+Sans:ital,opsz,wght@0,9..40,100..1000;1,9..40,100..1000&display=swap");
 @import "tailwindcss";
+@config "../tailwind.config.js";
 
 /* ── Global smooth scrolling ── */
 html {
diff --git a/frontend/src/locales/en/landing.json b/frontend/src/locales/en/landing.json
new file mode 100644
index 00000000..4ef7cac0
--- /dev/null
+++ b/frontend/src/locales/en/landing.json
@@ -0,0 +1,111 @@
+{
+  "hero": {
+    "titleLine1": "TRANSPARENT",
+    "titleLine2": "TRACKING",
+    "subtitle": "Our platform uses next gen tech to make your deliveries faster and more reliable. Every step is visible, every shipment secure.",
+    "cta": "Track Your Shipment"
+  },
+  "logoStrip": {
+    "poweredBy": "Powered by & Trusted with"
+  },
+  "whyNavin": {
+    "heading": "Why",
+    "headingHighlight": "Navin?",
+    "subtitle": "Blockchain-powered logistics that puts transparency, speed, and security first.",
+    "transparency": {
+      "title": "Total Transparency",
+      "description": "See your shipments journey, every step of the way."
+    },
+    "alerts": {
+      "title": "Real Time Alerts",
+      "description": "Know instantly if there is a delay or issue."
+    },
+    "deliveries": {
+      "title": "Safe Deliveries",
+      "description": "Tamper proof technology prevents fraud and errors."
+    },
+    "fastService": {
+      "title": "Faster Service",
+      "description": "Automated processes mean quicker, smoother deliveries."
+    }
+  },
+  "coreFeatures": {
+    "heading": "Core",
+    "headingHighlight": "Features",
+    "subtitle": "Built on Stellar blockchain for transparency, security, and automation",
+    "chartAriaLabel": "Illustrative visualization of on-chain shipment activity",
+    "tokenizedAssets": {
+      "label": "Tokenized Assets",
+      "description": "Every shipment is assigned a unique digital identity on the Stellar blockchain, giving you full on-chain visibility from pickup to delivery."
+    },
+    "iotMilestones": {
+      "label": "IoT-Verified Milestones",
+      "description": "Real-time location and environmental data — temperature, humidity — are hashed and anchored on-chain to prevent tampering at every checkpoint."
+    },
+    "smartSettlements": {
+      "label": "Smart Settlements",
+      "description": "Funds are locked in escrow and released automatically via smart contract the instant a delivery is cryptographically verified."
+    },
+    "parityDashboards": {
+      "label": "Parity Dashboards",
+      "description": "A single source of truth for Company, Carrier, Customer, and Admin roles — each with tailored, permissioned visibility. No referee, no player conflict."
+    },
+    "cta": "Track Your Shipment"
+  },
+  "howItWorks": {
+    "headingPrefix": "How",
+    "headingHighlight": "Navin",
+    "headingSuffix": "Works",
+    "subtitle": "Simple, transparent, and blockchain-powered. Track your shipments from pickup to delivery.",
+    "pickup": {
+      "title": "Smart Pickup",
+      "description": "We pick up your package from your chosen location or partner hub and log it into our system for full transparency from the start."
+    },
+    "tracking": {
+      "title": "Live Tracking",
+      "description": "Track your shipment in real time with instant updates at every milestone—from dispatch to delivery. No more wondering where your package is."
+    },
+    "delivery": {
+      "title": "Secure Delivery",
+      "description": "Once your package arrives, you'll receive a secure delivery confirmation—complete with proof of hand-off. Peace of mind, guaranteed."
+    }
+  },
+  "faq": {
+    "heading": "Frequently Asked",
+    "headingHighlight": "Questions",
+    "subtitle": "Everything you need to know about Navin's blockchain-powered logistics platform.",
+    "whatIsNavin": {
+      "question": "What is Navin?",
+      "answer": "Navin is a next-generation logistics platform that combines blockchain technology with IoT tracking to provide transparent, tamper-proof shipment management. Every milestone is recorded on-chain, ensuring accountability from pickup to delivery."
+    },
+    "stellarPayments": {
+      "question": "How do Stellar payments work on Navin?",
+      "answer": "Navin integrates with the Stellar blockchain to handle payments via smart contracts. When a shipment is confirmed, funds are held in escrow and automatically released to the logistics provider upon successful delivery—no manual processing required."
+    },
+    "iotTracking": {
+      "question": "How does IoT tracking work?",
+      "answer": "Our IoT sensors attached to shipments continuously report GPS location, temperature, humidity, and shock events. This data is logged in real-time and anchored to the blockchain, giving you a verifiable, tamper-proof record of your shipment's journey."
+    },
+    "getStarted": {
+      "question": "How do I get started with Navin?",
+      "answer": "Simply sign up for an account, choose your role (logistics company or customer), and you'll have immediate access to the dashboard. You can create your first shipment in minutes—our onboarding tour will guide you through each step."
+    },
+    "dataSecure": {
+      "question": "Is my data secure on Navin?",
+      "answer": "Yes. All sensitive data is encrypted in transit and at rest. Shipment records are anchored to the Stellar blockchain, making them immutable and auditable. Access is controlled through role-based permissions, ensuring only authorized parties can view or modify shipment details."
+    },
+    "walletsSupported": {
+      "question": "Which wallets are supported?",
+      "answer": "Navin supports Freighter and Albedo out of the box, with LOBSTR available via WalletConnect pairing. You can connect your wallet directly from the dashboard to manage payments and view on-chain transaction history."
+    }
+  },
+  "footer": {
+    "heading": "Get Started",
+    "headingHighlight": "Today",
+    "subtitle": "Join 500+ enterprise leaders. Get the latest on blockchain logistics and zero trust supply chain management.",
+    "emailPlaceholder": "Enter your Email",
+    "subscribe": "Subscribe",
+    "tagline": "The New Standard in Logistics Security",
+    "copyright": "Navin. All rights reserved."
+  }
+}
diff --git a/frontend/src/locales/es/landing.json b/frontend/src/locales/es/landing.json
new file mode 100644
index 00000000..3d40f9f1
--- /dev/null
+++ b/frontend/src/locales/es/landing.json
@@ -0,0 +1,111 @@
+{
+  "hero": {
+    "titleLine1": "SEGUIMIENTO",
+    "titleLine2": "TRANSPARENTE",
+    "subtitle": "Nuestra plataforma utiliza tecnología de última generación para que tus entregas sean más rápidas y confiables. Cada paso es visible, cada envío es seguro.",
+    "cta": "Rastrea tu envío"
+  },
+  "logoStrip": {
+    "poweredBy": "Impulsado por y con la confianza de"
+  },
+  "whyNavin": {
+    "heading": "Por qué",
+    "headingHighlight": "Navin?",
+    "subtitle": "Logística impulsada por blockchain que prioriza la transparencia, la velocidad y la seguridad.",
+    "transparency": {
+      "title": "Transparencia total",
+      "description": "Sigue el recorrido de tus envíos, en cada paso del camino."
+    },
+    "alerts": {
+      "title": "Alertas en tiempo real",
+      "description": "Entérate al instante si hay un retraso o un problema."
+    },
+    "deliveries": {
+      "title": "Entregas seguras",
+      "description": "Una tecnología a prueba de manipulaciones evita el fraude y los errores."
+    },
+    "fastService": {
+      "title": "Servicio más rápido",
+      "description": "Procesos automatizados para entregas más rápidas y fluidas."
+    }
+  },
+  "coreFeatures": {
+    "heading": "Funciones",
+    "headingHighlight": "Principales",
+    "subtitle": "Construido sobre la blockchain de Stellar para transparencia, seguridad y automatización",
+    "chartAriaLabel": "Visualización ilustrativa de la actividad de envíos en la blockchain",
+    "tokenizedAssets": {
+      "label": "Activos tokenizados",
+      "description": "Cada envío recibe una identidad digital única en la blockchain de Stellar, brindándote visibilidad total en cadena desde la recogida hasta la entrega."
+    },
+    "iotMilestones": {
+      "label": "Hitos verificados por IoT",
+      "description": "La ubicación en tiempo real y los datos ambientales — temperatura, humedad — se codifican (hash) y se anclan en la cadena para evitar manipulaciones en cada punto de control."
+    },
+    "smartSettlements": {
+      "label": "Liquidaciones inteligentes",
+      "description": "Los fondos quedan bloqueados en depósito en garantía y se liberan automáticamente mediante un contrato inteligente en el momento en que se verifica criptográficamente una entrega."
+    },
+    "parityDashboards": {
+      "label": "Paneles equitativos",
+      "description": "Una única fuente de verdad para los roles de Empresa, Transportista, Cliente y Administrador, cada uno con visibilidad adaptada y controlada. Sin árbitro, sin conflicto entre las partes."
+    },
+    "cta": "Rastrea tu envío"
+  },
+  "howItWorks": {
+    "headingPrefix": "Cómo",
+    "headingHighlight": "Navin",
+    "headingSuffix": "funciona",
+    "subtitle": "Simple, transparente e impulsado por blockchain. Rastrea tus envíos desde la recogida hasta la entrega.",
+    "pickup": {
+      "title": "Recogida inteligente",
+      "description": "Recogemos tu paquete en el lugar que elijas o en un centro asociado y lo registramos en nuestro sistema para una transparencia total desde el principio."
+    },
+    "tracking": {
+      "title": "Seguimiento en vivo",
+      "description": "Rastrea tu envío en tiempo real con actualizaciones instantáneas en cada hito, desde el despacho hasta la entrega. Ya no te preguntarás dónde está tu paquete."
+    },
+    "delivery": {
+      "title": "Entrega segura",
+      "description": "Cuando tu paquete llegue, recibirás una confirmación de entrega segura, con comprobante de entrega incluido. Tranquilidad garantizada."
+    }
+  },
+  "faq": {
+    "heading": "Preguntas",
+    "headingHighlight": "Frecuentes",
+    "subtitle": "Todo lo que necesitas saber sobre la plataforma logística de Navin impulsada por blockchain.",
+    "whatIsNavin": {
+      "question": "¿Qué es Navin?",
+      "answer": "Navin es una plataforma logística de nueva generación que combina la tecnología blockchain con el rastreo IoT para ofrecer una gestión de envíos transparente y a prueba de manipulaciones. Cada hito se registra en cadena, garantizando la responsabilidad desde la recogida hasta la entrega."
+    },
+    "stellarPayments": {
+      "question": "¿Cómo funcionan los pagos con Stellar en Navin?",
+      "answer": "Navin se integra con la blockchain de Stellar para gestionar los pagos mediante contratos inteligentes. Cuando se confirma un envío, los fondos quedan en depósito en garantía y se liberan automáticamente al proveedor logístico tras una entrega exitosa, sin procesamiento manual."
+    },
+    "iotTracking": {
+      "question": "¿Cómo funciona el rastreo IoT?",
+      "answer": "Nuestros sensores IoT instalados en los envíos informan continuamente la ubicación GPS, la temperatura, la humedad y los eventos de impacto. Estos datos se registran en tiempo real y se anclan en la blockchain, brindándote un registro verificable y a prueba de manipulaciones del recorrido de tu envío."
+    },
+    "getStarted": {
+      "question": "¿Cómo empiezo a usar Navin?",
+      "answer": "Simplemente regístrate, elige tu rol (empresa logística o cliente) y tendrás acceso inmediato al panel. Puedes crear tu primer envío en minutos: nuestro recorrido de incorporación te guiará en cada paso."
+    },
+    "dataSecure": {
+      "question": "¿Mis datos están seguros en Navin?",
+      "answer": "Sí. Todos los datos sensibles están cifrados en tránsito y en reposo. Los registros de envíos se anclan en la blockchain de Stellar, lo que los hace inmutables y auditables. El acceso se controla mediante permisos basados en roles, garantizando que solo las partes autorizadas puedan ver o modificar los detalles del envío."
+    },
+    "walletsSupported": {
+      "question": "¿Qué billeteras son compatibles?",
+      "answer": "Navin es compatible con Freighter y Albedo de forma nativa, y LOBSTR está disponible mediante emparejamiento con WalletConnect. Puedes conectar tu billetera directamente desde el panel para gestionar pagos y ver el historial de transacciones en cadena."
+    }
+  },
+  "footer": {
+    "heading": "Comienza",
+    "headingHighlight": "Hoy Mismo",
+    "subtitle": "Únete a más de 500 empresas líderes. Recibe las últimas novedades sobre logística blockchain y gestión de cadena de suministro de confianza cero.",
+    "emailPlaceholder": "Ingresa tu correo electrónico",
+    "subscribe": "Suscribirse",
+    "tagline": "El nuevo estándar en seguridad logística",
+    "copyright": "Navin. Todos los derechos reservados."
+  }
+}
diff --git a/frontend/src/locales/fr/landing.json b/frontend/src/locales/fr/landing.json
new file mode 100644
index 00000000..e7bab6f3
--- /dev/null
+++ b/frontend/src/locales/fr/landing.json
@@ -0,0 +1,111 @@
+{
+  "hero": {
+    "titleLine1": "SUIVI",
+    "titleLine2": "TRANSPARENT",
+    "subtitle": "Notre plateforme utilise une technologie de nouvelle génération pour rendre vos livraisons plus rapides et plus fiables. Chaque étape est visible, chaque envoi est sécurisé.",
+    "cta": "Suivre votre envoi"
+  },
+  "logoStrip": {
+    "poweredBy": "Propulsé par et approuvé par"
+  },
+  "whyNavin": {
+    "heading": "Pourquoi",
+    "headingHighlight": "Navin ?",
+    "subtitle": "Une logistique propulsée par la blockchain qui privilégie la transparence, la rapidité et la sécurité.",
+    "transparency": {
+      "title": "Transparence totale",
+      "description": "Suivez le parcours de vos envois, à chaque étape."
+    },
+    "alerts": {
+      "title": "Alertes en temps réel",
+      "description": "Soyez informé instantanément en cas de retard ou de problème."
+    },
+    "deliveries": {
+      "title": "Livraisons sécurisées",
+      "description": "Une technologie inviolable prévient la fraude et les erreurs."
+    },
+    "fastService": {
+      "title": "Service plus rapide",
+      "description": "Des processus automatisés pour des livraisons plus rapides et plus fluides."
+    }
+  },
+  "coreFeatures": {
+    "heading": "Fonctionnalités",
+    "headingHighlight": "Clés",
+    "subtitle": "Construit sur la blockchain Stellar pour la transparence, la sécurité et l'automatisation",
+    "chartAriaLabel": "Visualisation illustrative de l'activité des envois sur la blockchain",
+    "tokenizedAssets": {
+      "label": "Actifs tokenisés",
+      "description": "Chaque envoi reçoit une identité numérique unique sur la blockchain Stellar, vous offrant une visibilité totale sur la chaîne, du retrait à la livraison."
+    },
+    "iotMilestones": {
+      "label": "Jalons vérifiés par IoT",
+      "description": "La localisation en temps réel et les données environnementales — température, humidité — sont hachées et ancrées sur la chaîne pour empêcher toute falsification à chaque point de contrôle."
+    },
+    "smartSettlements": {
+      "label": "Règlements intelligents",
+      "description": "Les fonds sont bloqués sous séquestre et libérés automatiquement par contrat intelligent dès qu'une livraison est vérifiée de manière cryptographique."
+    },
+    "parityDashboards": {
+      "label": "Tableaux de bord équitables",
+      "description": "Une source unique de vérité pour les rôles Entreprise, Transporteur, Client et Administrateur — chacun avec une visibilité adaptée et contrôlée. Ni arbitre, ni joueur en conflit."
+    },
+    "cta": "Suivre votre envoi"
+  },
+  "howItWorks": {
+    "headingPrefix": "Comment",
+    "headingHighlight": "Navin",
+    "headingSuffix": "fonctionne",
+    "subtitle": "Simple, transparent et propulsé par la blockchain. Suivez vos envois du retrait à la livraison.",
+    "pickup": {
+      "title": "Retrait intelligent",
+      "description": "Nous récupérons votre colis à l'endroit de votre choix ou dans un centre partenaire et l'enregistrons dans notre système pour une transparence totale dès le départ."
+    },
+    "tracking": {
+      "title": "Suivi en direct",
+      "description": "Suivez votre envoi en temps réel avec des mises à jour instantanées à chaque étape — de l'expédition à la livraison. Ne vous demandez plus où se trouve votre colis."
+    },
+    "delivery": {
+      "title": "Livraison sécurisée",
+      "description": "Dès l'arrivée de votre colis, vous recevrez une confirmation de livraison sécurisée, accompagnée d'une preuve de remise. Une tranquillité d'esprit garantie."
+    }
+  },
+  "faq": {
+    "heading": "Questions",
+    "headingHighlight": "Fréquentes",
+    "subtitle": "Tout ce que vous devez savoir sur la plateforme logistique de Navin propulsée par la blockchain.",
+    "whatIsNavin": {
+      "question": "Qu'est-ce que Navin ?",
+      "answer": "Navin est une plateforme logistique de nouvelle génération qui combine la technologie blockchain et le suivi IoT pour offrir une gestion des envois transparente et inviolable. Chaque étape est enregistrée sur la chaîne, garantissant la responsabilité du retrait à la livraison."
+    },
+    "stellarPayments": {
+      "question": "Comment fonctionnent les paiements Stellar sur Navin ?",
+      "answer": "Navin s'intègre à la blockchain Stellar pour gérer les paiements via des contrats intelligents. Lorsqu'un envoi est confirmé, les fonds sont bloqués sous séquestre et automatiquement libérés au transporteur dès la livraison réussie — aucun traitement manuel requis."
+    },
+    "iotTracking": {
+      "question": "Comment fonctionne le suivi IoT ?",
+      "answer": "Nos capteurs IoT fixés aux envois signalent en continu la position GPS, la température, l'humidité et les chocs. Ces données sont enregistrées en temps réel et ancrées sur la blockchain, vous offrant un enregistrement vérifiable et inviolable du parcours de votre envoi."
+    },
+    "getStarted": {
+      "question": "Comment démarrer avec Navin ?",
+      "answer": "Inscrivez-vous simplement, choisissez votre rôle (entreprise logistique ou client), et vous aurez un accès immédiat au tableau de bord. Vous pouvez créer votre premier envoi en quelques minutes — notre visite guidée vous accompagnera à chaque étape."
+    },
+    "dataSecure": {
+      "question": "Mes données sont-elles sécurisées sur Navin ?",
+      "answer": "Oui. Toutes les données sensibles sont chiffrées en transit et au repos. Les registres d'envois sont ancrés sur la blockchain Stellar, les rendant immuables et vérifiables. L'accès est contrôlé par des permissions basées sur les rôles, garantissant que seules les parties autorisées peuvent consulter ou modifier les détails des envois."
+    },
+    "walletsSupported": {
+      "question": "Quels portefeuilles sont pris en charge ?",
+      "answer": "Navin prend en charge Freighter et Albedo dès l'installation, LOBSTR étant disponible via un appairage WalletConnect. Vous pouvez connecter votre portefeuille directement depuis le tableau de bord pour gérer les paiements et consulter l'historique des transactions sur la chaîne."
+    }
+  },
+  "footer": {
+    "heading": "Commencez",
+    "headingHighlight": "Dès Aujourd'hui",
+    "subtitle": "Rejoignez plus de 500 entreprises leaders. Recevez les dernières actualités sur la logistique blockchain et la gestion de la chaîne d'approvisionnement zero-trust.",
+    "emailPlaceholder": "Entrez votre e-mail",
+    "subscribe": "S'abonner",
+    "tagline": "La nouvelle référence en matière de sécurité logistique",
+    "copyright": "Navin. Tous droits réservés."
+  }
+}
diff --git a/frontend/src/pages/Analytics/RevenueAnalytics.test.tsx b/frontend/src/pages/Analytics/RevenueAnalytics.test.tsx
index 1bdbb3b7..0375a07a 100644
--- a/frontend/src/pages/Analytics/RevenueAnalytics.test.tsx
+++ b/frontend/src/pages/Analytics/RevenueAnalytics.test.tsx
@@ -1,22 +1,37 @@
 import { render, screen } from "@testing-library/react";
+import { MemoryRouter } from "react-router-dom";
 import RevenueAnalytics from "./RevenueAnalytics";
 import { describe, it, expect } from "vitest";
 
 describe("RevenueAnalytics", () => {
   it("renders the Revenue Analytics page", () => {
-    render(<RevenueAnalytics />);
-    expect(screen.getByText("Revenue Analytics")).toBeInTheDocument();
+    render(
+      <MemoryRouter>
+        <RevenueAnalytics />
+      </MemoryRouter>,
+    );
+    expect(
+      screen.getByRole("heading", { name: "Revenue Analytics", level: 1 }),
+    ).toBeInTheDocument();
   });
 
   it("displays KPI cards", async () => {
-    render(<RevenueAnalytics />);
+    render(
+      <MemoryRouter>
+        <RevenueAnalytics />
+      </MemoryRouter>,
+    );
     expect(await screen.findByText("Total Revenue")).toBeInTheDocument();
     expect(screen.getByText("Month-over-Month Change")).toBeInTheDocument();
     expect(screen.getByText("Avg Revenue per Shipment")).toBeInTheDocument();
   });
 
   it("displays chart titles", async () => {
-    render(<RevenueAnalytics />);
+    render(
+      <MemoryRouter>
+        <RevenueAnalytics />
+      </MemoryRouter>,
+    );
     expect(await screen.findByText("Monthly Revenue")).toBeInTheDocument();
     expect(screen.getByText("Revenue by Service Type")).toBeInTheDocument();
     expect(screen.getByText("Revenue by Region")).toBeInTheDocument();
@@ -24,13 +39,21 @@ describe("RevenueAnalytics", () => {
   });
 
   it("displays date input fields", () => {
-    render(<RevenueAnalytics />);
+    render(
+      <MemoryRouter>
+        <RevenueAnalytics />
+      </MemoryRouter>,
+    );
     const dateInputs = screen.getAllByDisplayValue(/2026|2025/);
     expect(dateInputs.length).toBeGreaterThan(0);
   });
 
   it("displays export button", () => {
-    render(<RevenueAnalytics />);
+    render(
+      <MemoryRouter>
+        <RevenueAnalytics />
+      </MemoryRouter>,
+    );
     const exportButton = screen.getByRole("button", { name: /export pdf/i });
     expect(exportButton).toBeInTheDocument();
   });
diff --git a/frontend/src/pages/Analytics/RevenueAnalytics.tsx b/frontend/src/pages/Analytics/RevenueAnalytics.tsx
index 6ce3bfd3..2d732e57 100644
--- a/frontend/src/pages/Analytics/RevenueAnalytics.tsx
+++ b/frontend/src/pages/Analytics/RevenueAnalytics.tsx
@@ -1,4 +1,4 @@
-import React, { useState, useEffect, useCallback } from "react";
+import React, { useState, useEffect } from "react";
 import { Calendar, Download } from "lucide-react";
 import { BarChart, Bar, LineChart, Line, PieChart, Pie, Cell, XAxis, YAxis, CartesianGrid, Tooltip, Legend, ResponsiveContainer } from "recharts";
 import html2pdf from "html2pdf.js";
@@ -80,6 +80,77 @@ const generateMockData = (startDate: Date, endDate: Date) => {
   };
 };
 
+// ─── Custom chart tooltips ────────────────────────────────────────────
+
+const MonthlyRevenueTooltip: React.FC<{
+  active?: boolean;
+  payload?: { name?: string; value?: number; dataKey?: string }[];
+  label?: string;
+}> = ({ active, payload, label }) => {
+  if (!active || !payload?.length) return null;
+  const actual = payload.find((p) => p.dataKey === "actual")?.value ?? 0;
+  const target = payload.find((p) => p.dataKey === "target")?.value ?? 0;
+
+  const handleExport = () => {
+    console.info(`Export data for ${label}`);
+  };
+
+  return (
+    <RichChartTooltip
+      active={active}
+      title={label}
+      items={[
+        {
+          label: "Actual",
+          value: actual,
+          unit: "$",
+          color: "#3b82f6",
+          trend: actual >= target ? "up" : "down",
+          trendLabel: actual >= target ? "Met or exceeded target" : "Below target",
+        },
+        {
+          label: "Target",
+          value: target,
+          unit: "$",
+          color: "#10b981",
+        },
+      ]}
+      actions={[ExportAction(handleExport)]}
+    />
+  );
+};
+
+const ServiceTypeTooltip: React.FC<{
+  active?: boolean;
+  payload?: { name?: string; value?: number }[];
+}> = ({ active, payload }) => {
+  if (!active || !payload?.length) return null;
+  const item = payload[0];
+
+  return (
+    <RichChartTooltip
+      active={active}
+      title={item.name}
+      items={[{ label: "Revenue", value: item.value ?? 0, unit: "$" }]}
+    />
+  );
+};
+
+const RegionTooltip: React.FC<{
+  active?: boolean;
+  payload?: { name?: string; value?: number }[];
+  label?: string;
+}> = ({ active, payload, label }) => {
+  if (!active || !payload?.length) return null;
+  return (
+    <RichChartTooltip
+      active={active}
+      title={label}
+      items={[{ label: "Revenue", value: payload[0].value ?? 0, unit: "$", color: "#3b82f6" }]}
+    />
+  );
+};
+
 const RevenueAnalytics: React.FC = () => {
   const [startDate, setStartDate] = useState(() => {
     const date = new Date();
@@ -104,77 +175,6 @@ const RevenueAnalytics: React.FC = () => {
     };
   }, [startDate, endDate]);
 
-  // ─── Custom chart tooltips ────────────────────────────────────────────
-
-  const MonthlyRevenueTooltip: React.FC<{
-    active?: boolean;
-    payload?: { name?: string; value?: number; dataKey?: string }[];
-    label?: string;
-  }> = ({ active, payload, label }) => {
-    if (!active || !payload?.length) return null;
-    const actual = payload.find((p) => p.dataKey === "actual")?.value ?? 0;
-    const target = payload.find((p) => p.dataKey === "target")?.value ?? 0;
-
-    const handleExport = useCallback(() => {
-      console.info(`Export data for ${label}`);
-    }, [label]);
-
-    return (
-      <RichChartTooltip
-        active={active}
-        title={label}
-        items={[
-          {
-            label: "Actual",
-            value: actual,
-            unit: "$",
-            color: "#3b82f6",
-            trend: actual >= target ? "up" : "down",
-            trendLabel: actual >= target ? "Met or exceeded target" : "Below target",
-          },
-          {
-            label: "Target",
-            value: target,
-            unit: "$",
-            color: "#10b981",
-          },
-        ]}
-        actions={[ExportAction(handleExport)]}
-      />
-    );
-  };
-
-  const ServiceTypeTooltip: React.FC<{
-    active?: boolean;
-    payload?: { name?: string; value?: number }[];
-  }> = ({ active, payload }) => {
-    if (!active || !payload?.length) return null;
-    const item = payload[0];
-
-    return (
-      <RichChartTooltip
-        active={active}
-        title={item.name}
-        items={[{ label: "Revenue", value: item.value ?? 0, unit: "$" }]}
-      />
-    );
-  };
-
-  const RegionTooltip: React.FC<{
-    active?: boolean;
-    payload?: { name?: string; value?: number }[];
-    label?: string;
-  }> = ({ active, payload, label }) => {
-    if (!active || !payload?.length) return null;
-    return (
-      <RichChartTooltip
-        active={active}
-        title={label}
-        items={[{ label: "Revenue", value: payload[0].value ?? 0, unit: "$", color: "#3b82f6" }]}
-      />
-    );
-  };
-
   const handleExportPDF = () => {
     const element = document.getElementById("revenue-dashboard");
     if (!element) return;
diff --git a/frontend/src/pages/HelpCenter/HelpCenter.tsx b/frontend/src/pages/HelpCenter/HelpCenter.tsx
index 9f7b871d..53c280cb 100644
--- a/frontend/src/pages/HelpCenter/HelpCenter.tsx
+++ b/frontend/src/pages/HelpCenter/HelpCenter.tsx
@@ -1,7 +1,6 @@
 import React, { useMemo, useState } from 'react';
 import { useNavigate } from 'react-router-dom';
 import { resetTourFlag } from '@components/onboarding/OnboardingTour';
-import { HelpCircle, RotateCcw } from 'lucide-react';
 import Breadcrumb from '@components/common/Breadcrumb';
 import { resetChecklist } from '@components/onboarding/OnboardingChecklist';
 import EmptyState from '@components/ui/EmptyState/EmptyState';
@@ -121,7 +120,7 @@ const FAQ_ENTRIES: FaqEntry[] = [
   {
     question: 'How do I connect my Stellar wallet?',
     answer:
-      'Open Settings and choose "Connect Wallet". Select your wallet provider (Freighter, Lobstr, or Solar Wallet) and approve the connection request. Once connected, your wallet address is used to sign and verify settlement transactions.',
+      'Open Settings and choose "Connect Wallet". Select your wallet provider (Freighter, Albedo, or LOBSTR) and approve the connection request. Once connected, your wallet address is used to sign and verify settlement transactions.',
   },
   {
     question: 'What does each shipment status mean?',
@@ -208,10 +207,8 @@ const HelpCenter: React.FC = () => {
   ];
 
   return (
-    <div className="w-full max-w-3xl mx-auto px-6 py-8">
-      <Breadcrumb items={[{ label: 'Dashboard', href: '/dashboard' }]} current="Help Center" />
-      <div className="flex items-center gap-3 mb-8">
     <div className="w-full max-w-3xl mx-auto px-6 py-8 max-md:px-4">
+      <Breadcrumb items={[{ label: 'Dashboard', href: '/dashboard' }]} current="Help Center" />
       <div className="flex items-center gap-3 mb-2">
         <HelpCircle size={28} className="text-[#62ffff]" />
         <h1 className="text-2xl font-bold text-white m-0">Help Center</h1>
diff --git a/frontend/src/pages/PublicTracking/PublicTrackingPage.tsx b/frontend/src/pages/PublicTracking/PublicTrackingPage.tsx
index 317bfef4..31f053d3 100644
--- a/frontend/src/pages/PublicTracking/PublicTrackingPage.tsx
+++ b/frontend/src/pages/PublicTracking/PublicTrackingPage.tsx
@@ -2,10 +2,9 @@
 import React, { useEffect, useRef, useState } from 'react';
 import { useParams, Link } from 'react-router-dom';
 import axios from 'axios';
-import { CheckCircle2, Circle, Package, Truck, MapPin, Flag, AlertTriangle } from 'lucide-react';
+import { CheckCircle2, Circle, Package, Truck, MapPin, Flag, Share2, Copy, AlertTriangle } from 'lucide-react';
 import CopyToClipboard from '../../components/ui/CopyToClipboard';
 import { useLiveRegion } from '../../context/LiveRegionContext';
-import { CheckCircle2, Circle, Package, Truck, MapPin, Flag, Share2, Copy, AlertTriangle } from 'lucide-react';
 
 interface PublicMilestone {
   id: string;
@@ -63,8 +62,10 @@ const PublicTrackingPage: React.FC<PublicTrackingPageProps> = () => {
 
   useEffect(() => {
     if (!trackingNumber) {
-      setLoading(false);
-      setError('No tracking number was provided.');
+      Promise.resolve().then(() => {
+        setLoading(false);
+        setError('No tracking number was provided.');
+      });
       return;
     }
     let isActive = true;
@@ -82,21 +83,18 @@ const PublicTrackingPage: React.FC<PublicTrackingPageProps> = () => {
         } else {
           setError('Something went wrong while looking up this shipment. Please try again.');
         }
-          return;
-        }
-        setError('We could not load this public tracking summary. Check your connection and try again.');
       } finally {
         if (isActive) setLoading(false);
       }
     };
 
-    setShipment(null);
-    setNotFound(false);
-    setError(null);
-
-    // Defer setLoading to avoid synchronous setState warning
+    // Defer state resets to avoid synchronous setState warning
     Promise.resolve().then(() => {
-      if (isActive) setLoading(true);
+      if (!isActive) return;
+      setShipment(null);
+      setNotFound(false);
+      setError(null);
+      setLoading(true);
     }).then(() => fetchShipment());
 
     return () => {
@@ -224,17 +222,6 @@ const PublicTrackingPage: React.FC<PublicTrackingPageProps> = () => {
               className="inline-block px-5 py-2.5 bg-cyan-400 text-black font-semibold rounded-lg hover:bg-cyan-300 transition-colors text-sm"
             >
               Try Again
-            <div className="w-16 h-16 mx-auto mb-4 rounded-full bg-amber-500/10 border border-amber-500/20 flex items-center justify-center">
-              <AlertTriangle className="w-8 h-8 text-amber-400" />
-            </div>
-            <h1 className="text-2xl font-bold mb-2">Tracking Summary Unavailable</h1>
-            <p className="text-slate-400 mb-6">{error}</p>
-            <button
-              type="button"
-              onClick={() => window.location.reload()}
-              className="inline-block px-5 py-2.5 bg-cyan-400 text-black font-semibold rounded-lg hover:bg-cyan-300 transition-colors text-sm"
-            >
-              Retry
             </button>
           </div>
         )}
diff --git a/frontend/src/pages/Settings/NotificationPreferences/NotificationPreferences.tsx b/frontend/src/pages/Settings/NotificationPreferences/NotificationPreferences.tsx
index 7a050887..cb957c23 100644
--- a/frontend/src/pages/Settings/NotificationPreferences/NotificationPreferences.tsx
+++ b/frontend/src/pages/Settings/NotificationPreferences/NotificationPreferences.tsx
@@ -3,7 +3,6 @@ import { Bell, CheckCircle2, Loader2, Smartphone } from 'lucide-react';
 import {
   type NotificationChannel,
   type NotificationEventType,
-  type PreferencesMap,
   notificationPreferencesApi,
 } from '@services/api/endpoints/notifications';
 
@@ -257,10 +256,6 @@ const NotificationPreferences: React.FC = () => {
     }
   };
 
-  const sliderTrackCls =
-    'absolute inset-0 rounded-full bg-slate-800 border border-slate-700 transition-colors duration-300 peer-checked:bg-blue-500/10 peer-checked:border-blue-500';
-  const sliderThumbCls =
-    'absolute h-[18px] w-[18px] left-0.5 bottom-0.5 rounded-full bg-slate-400 transition-transform duration-300 peer-checked:bg-blue-500 peer-checked:translate-x-5 pointer-events-none';
   // Check if all events in a category have a given channel enabled
   const isCategoryFullyEnabled = (category: CategoryDef, channel: ExtendedChannel) =>
     category.events.every((e) => prefs[e.event]?.[channel] === true);
@@ -276,10 +271,6 @@ const NotificationPreferences: React.FC = () => {
         aria-label="Loading notification preferences"
       >
         <Loader2 className="animate-spin" size={24} />
-        className="flex items-center justify-center gap-3 p-12 bg-[#14171E] border border-[#1E293B] rounded-xl text-slate-500 text-sm"
-        aria-label="Loading notification preferences"
-      >
-        <Loader2 className="animate-spin" size={20} />
         <span>Loading preferences…</span>
       </section>
     );
@@ -293,17 +284,6 @@ const NotificationPreferences: React.FC = () => {
 
   return (
     <section
-      className="bg-[#14171e] border border-slate-800 rounded-xl overflow-hidden w-full"
-      aria-labelledby="notification-preferences-title"
-    >
-      {/* Header */}
-      <div className="flex items-center gap-3 px-4 py-6 sm:px-6 border-b border-slate-800">
-        <Bell className="text-blue-500 bg-blue-500/10 p-1.5 rounded-lg shrink-0" size={24} />
-        <div>
-          <h2 id="notification-preferences-title" className="text-lg font-semibold text-slate-100 mb-1">
-            Notification Preferences
-          </h2>
-          <p className="text-[13px] text-slate-500">
       className="w-full bg-[#14171E] border border-[#1E293B] rounded-xl overflow-hidden"
       aria-labelledby="notification-preferences-title"
     >
@@ -325,16 +305,6 @@ const NotificationPreferences: React.FC = () => {
         </div>
       </div>
 
-      {/* Phone verification */}
-      <div className="px-4 py-4 sm:px-6 border-b border-slate-800 bg-slate-800/30">
-        <div className="flex items-center gap-2.5 mb-3">
-          <span className="text-sm font-semibold text-slate-200">SMS Notifications</span>
-          {phoneVerified ? (
-            <span className="flex items-center gap-1 text-emerald-500 text-xs font-medium" aria-label="Phone verified">
-              <CheckCircle2 size={14} /> Verified
-            </span>
-          ) : (
-            <span className="text-xs text-amber-500">Phone verification required to enable SMS</span>
       {/* SMS verification */}
       <div className="px-6 py-4 border-b border-[#1E293B] bg-[rgba(30,41,59,0.3)]">
         <div className="flex items-center gap-2.5 mb-3">
@@ -353,7 +323,6 @@ const NotificationPreferences: React.FC = () => {
             <div className="flex gap-2">
               <input
                 type="tel"
-                className="flex-1 min-w-0 bg-[#0f1117] border border-slate-700 rounded-lg px-3 py-2 text-slate-200 text-sm outline-none transition-colors focus:border-blue-500 disabled:opacity-60 disabled:cursor-not-allowed"
                 className="flex-1 min-w-0 bg-[#0F1117] border border-[#334155] rounded-lg px-3 py-2 text-[#E2E8F0] text-sm outline-none transition-colors focus:border-[#3B82F6] disabled:opacity-60 disabled:cursor-not-allowed"
                 placeholder="+1 555 000 0000"
                 value={phone}
@@ -362,14 +331,12 @@ const NotificationPreferences: React.FC = () => {
                 disabled={otpSent}
               />
               <button
-                className="flex items-center gap-1.5 px-4 py-2 bg-slate-800 border border-slate-700 rounded-lg text-slate-300 text-[13px] font-medium cursor-pointer whitespace-nowrap transition-colors hover:enabled:bg-slate-700 hover:enabled:border-slate-600 disabled:opacity-60 disabled:cursor-not-allowed"
                 type="button"
                 className="flex items-center gap-1.5 px-4 py-2 bg-[#1E293B] border border-[#334155] rounded-lg text-[#CBD5E1] text-sm font-medium cursor-pointer whitespace-nowrap transition-colors hover:bg-[#293548] hover:border-[#475569] disabled:opacity-60 disabled:cursor-not-allowed"
                 onClick={handleSendOtp}
                 disabled={otpLoading || otpSent}
                 aria-label="Send OTP"
               >
-                {otpLoading ? <Loader2 className="animate-spin" size={14} /> : null}
                 {otpLoading && <Loader2 className="animate-spin" size={13} />}
                 {otpSent ? 'OTP Sent' : 'Send OTP'}
               </button>
@@ -379,7 +346,6 @@ const NotificationPreferences: React.FC = () => {
               <div className="flex gap-2">
                 <input
                   type="text"
-                  className="flex-1 min-w-0 bg-[#0f1117] border border-slate-700 rounded-lg px-3 py-2 text-slate-200 text-sm outline-none transition-colors focus:border-blue-500"
                   className="flex-1 min-w-0 bg-[#0F1117] border border-[#334155] rounded-lg px-3 py-2 text-[#E2E8F0] text-sm outline-none transition-colors focus:border-[#3B82F6]"
                   placeholder="Enter verification code"
                   value={otp}
@@ -389,14 +355,12 @@ const NotificationPreferences: React.FC = () => {
                   maxLength={6}
                 />
                 <button
-                  className="flex items-center gap-1.5 px-4 py-2 bg-blue-500/15 border border-blue-500 rounded-lg text-blue-400 text-[13px] font-medium cursor-pointer whitespace-nowrap transition-colors hover:enabled:bg-blue-500/25 disabled:opacity-60 disabled:cursor-not-allowed"
                   type="button"
                   className="flex items-center gap-1.5 px-4 py-2 bg-[rgba(59,130,246,0.15)] border border-[#3B82F6] rounded-lg text-[#60A5FA] text-sm font-medium cursor-pointer whitespace-nowrap transition-colors hover:bg-[rgba(59,130,246,0.25)] disabled:opacity-60 disabled:cursor-not-allowed"
                   onClick={handleVerifyOtp}
                   disabled={verifyLoading}
                   aria-label="Verify OTP"
                 >
-                  {verifyLoading ? <Loader2 className="animate-spin" size={14} /> : null}
                   {verifyLoading && <Loader2 className="animate-spin" size={13} />}
                   Verify
                 </button>
@@ -404,46 +368,12 @@ const NotificationPreferences: React.FC = () => {
             )}
 
             {phoneError && (
-              <p className="text-xs text-red-400 mt-0.5" role="alert">
-                {phoneError}
-              </p>
               <p className="text-[#F87171] text-xs mt-1" role="alert">{phoneError}</p>
             )}
           </div>
         )}
       </div>
 
-      {/* Channel header */}
-      <div className="flex justify-end gap-5 px-4 pt-2 sm:px-6" aria-hidden="true">
-        <span className="w-11 text-center text-[11px] font-semibold text-slate-500 uppercase tracking-wide">Email</span>
-        <span className="w-11 text-center text-[11px] font-semibold text-slate-500 uppercase tracking-wide">SMS</span>
-      </div>
-
-      {/* Categories */}
-      <div className="px-4 pb-2 sm:px-6 flex flex-col">
-        {CATEGORIES.map((cat, catIndex) => (
-          <div
-            key={cat.label}
-            className={`py-4 pb-1 ${catIndex > 0 ? 'border-t border-slate-800/60' : ''}`}
-          >
-            <h3 className="text-[11px] font-bold text-slate-600 uppercase tracking-wider mb-1">{cat.label}</h3>
-            {cat.events.map(({ event, label }) => (
-              <div
-                key={event}
-                className="flex items-center justify-between py-3 border-b border-slate-800/40 gap-4 last:border-b-0"
-              >
-                <span className="flex-1 text-[13px] sm:text-sm font-medium text-slate-200">{label}</span>
-
-                <div className="flex items-center gap-5 shrink-0">
-                  {/* Email toggle */}
-                  <label
-                    className="relative inline-block w-11 h-6 shrink-0 cursor-pointer"
-                    htmlFor={`${event}-email`}
-                  >
-                    <input
-                      id={`${event}-email`}
-                      type="checkbox"
-                      className="sr-only peer"
       {/* Push notification opt-in */}
       <div className="px-6 py-4 border-b border-[#1E293B] bg-[rgba(30,41,59,0.2)]">
         <div className="flex items-center justify-between gap-4 flex-wrap">
@@ -567,22 +497,6 @@ const NotificationPreferences: React.FC = () => {
                       onChange={() => handleToggle(event, 'email')}
                       ariaLabel={`${label} email notifications`}
                     />
-                    <span className={sliderTrackCls} />
-                    <span className={sliderThumbCls} />
-                  </label>
-
-                  {/* SMS toggle */}
-                  <label
-                    className={`relative inline-block w-11 h-6 shrink-0 cursor-pointer ${
-                      !phoneVerified ? 'opacity-40 cursor-not-allowed' : ''
-                    }`}
-                    htmlFor={`${event}-sms`}
-                    title={!phoneVerified ? 'Verify your phone number to enable SMS' : undefined}
-                  >
-                    <input
-                      id={`${event}-sms`}
-                      type="checkbox"
-                      className="sr-only peer"
                   </div>
 
                   {/* SMS toggle */}
@@ -607,20 +521,6 @@ const NotificationPreferences: React.FC = () => {
                       ariaLabel={`${label} push notifications`}
                       title={!pushEnabled ? 'Enable push notifications first' : undefined}
                     />
-                    <span className={sliderTrackCls} />
-                    <span className={sliderThumbCls} />
-                  </label>
-
-                  {/* Inline saved indicator */}
-                  {savedEvent === event && (
-                    <span
-                      className="flex items-center gap-1 text-xs text-emerald-500 font-medium whitespace-nowrap animate-notif-fade-in"
-                      role="status"
-                      aria-live="polite"
-                    >
-                      <CheckCircle2 size={13} /> Saved
-                    </span>
-                  )}
                   </div>
 
                   {/* Inline saved indicator */}
diff --git a/frontend/src/pages/Settings/sections/WalletsSection.tsx b/frontend/src/pages/Settings/sections/WalletsSection.tsx
index 45908cfb..9cf0624a 100644
--- a/frontend/src/pages/Settings/sections/WalletsSection.tsx
+++ b/frontend/src/pages/Settings/sections/WalletsSection.tsx
@@ -1,6 +1,8 @@
 import React, { useEffect, useState } from 'react';
 import { Trash2 } from 'lucide-react';
 import { apiClient } from '@services/api/client';
+import { useWallet } from '@context/WalletContext';
+import { useToast } from '../../../context/ToastContext';
 import { WalletConnectButton } from '../../../components/auth/WalletConnectButton/WalletConnectButton';
 import SettingsSection from '@components/settings/SettingsSection';
 
@@ -14,15 +16,39 @@ const WalletsSection: React.FC = () => {
   const [wallets, setWallets] = useState<WalletEntry[]>([]);
   const [isLoading, setIsLoading] = useState(true);
   const [removing, setRemoving] = useState<string | null>(null);
+  const { adapter } = useWallet();
+  const { addToast } = useToast();
 
-  useEffect(() => {
-    apiClient
-      .get<{ data: WalletEntry[] }>('/api/users/me/wallets')
-      .then((r) => setWallets(r.data.data))
-      .catch(() => setWallets([]))
-      .finally(() => setIsLoading(false));
+  const fetchWallets = useCallback(async () => {
+    setIsLoading(true);
+    try {
+      const r = await apiClient.get<{ data: WalletEntry[] }>('/api/users/me/wallets');
+      setWallets(r.data.data);
+    } catch {
+      setWallets([]);
+    } finally {
+      setIsLoading(false);
+    }
   }, []);
 
+  useEffect(() => {
+    const timer = setTimeout(() => { void fetchWallets(); }, 0);
+    return () => clearTimeout(timer);
+  }, [fetchWallets]);
+
+  const handleWalletConnect = async (publicKey: string) => {
+    try {
+      await apiClient.post('/api/users/me/wallets', {
+        publicKey,
+        label: adapter?.name ?? 'Wallet',
+      });
+      addToast('Wallet connected and saved.', 'success');
+      await fetchWallets();
+    } catch {
+      addToast('Wallet connected, but saving it to your account failed. Please try again.', 'error');
+    }
+  };
+
   const removeWallet = async (publicKey: string) => {
     setRemoving(publicKey);
     try {
diff --git a/frontend/src/pages/Settlements/Settlements.tsx b/frontend/src/pages/Settlements/Settlements.tsx
index 8e2c1087..de61e55d 100644
--- a/frontend/src/pages/Settlements/Settlements.tsx
+++ b/frontend/src/pages/Settlements/Settlements.tsx
@@ -1,4 +1,4 @@
-import React, { useEffect, useMemo, useState } from "react";
+import { useEffect, useMemo, useState } from "react";
 import {
   ArrowUpDown,
   ExternalLink,
diff --git a/frontend/src/pages/ShipmentDetail/DeliveryProofUpload/DeliveryProofUpload.tsx b/frontend/src/pages/ShipmentDetail/DeliveryProofUpload/DeliveryProofUpload.tsx
index 75839dc6..2f985350 100644
--- a/frontend/src/pages/ShipmentDetail/DeliveryProofUpload/DeliveryProofUpload.tsx
+++ b/frontend/src/pages/ShipmentDetail/DeliveryProofUpload/DeliveryProofUpload.tsx
@@ -24,14 +24,21 @@ const DeliveryProofUpload: React.FC<DeliveryProofUploadProps> = ({
 
   const prevPreviewRef = useRef<string | null>(null);
 
-  // Generate a preview URL for the first valid file
+  // Revoke object URL on unmount
   useEffect(() => {
+    return () => {
+      if (prevPreviewRef.current) URL.revokeObjectURL(prevPreviewRef.current);
+    };
+  }, []);
+
+  const handleFilesSelected = (selected: File[]) => {
+    // Generate a preview URL for the first valid file
     if (prevPreviewRef.current) {
       URL.revokeObjectURL(prevPreviewRef.current);
       prevPreviewRef.current = null;
     }
 
-    const first = files[0];
+    const first = selected[0];
     if (first && first.type.startsWith("image/")) {
       const url = URL.createObjectURL(first);
       setPreviewUrl(url);
@@ -39,16 +46,7 @@ const DeliveryProofUpload: React.FC<DeliveryProofUploadProps> = ({
     } else {
       setPreviewUrl(null);
     }
-  }, [files]);
 
-  // Revoke object URL on unmount
-  useEffect(() => {
-    return () => {
-      if (prevPreviewRef.current) URL.revokeObjectURL(prevPreviewRef.current);
-    };
-  }, []);
-
-  const handleFilesSelected = (selected: File[]) => {
     setFiles(selected);
     setSubmitError(null);
   };
diff --git a/frontend/src/pages/ShipmentDetail/PhotosSection/PhotosSection.tsx b/frontend/src/pages/ShipmentDetail/PhotosSection/PhotosSection.tsx
index cfa9990d..b12c1b7b 100644
--- a/frontend/src/pages/ShipmentDetail/PhotosSection/PhotosSection.tsx
+++ b/frontend/src/pages/ShipmentDetail/PhotosSection/PhotosSection.tsx
@@ -121,12 +121,12 @@ const Lightbox: React.FC<{
   onNavigate?: (idx: number) => void;
 }> = ({ items, index, onClose, onPrev, onNext, onNavigate }) => {
   // ── Zoom / loading state ──────────────────────────────────────────────
+  // Remounted per `index` (see `key` at the call site) so zoom/loaded/error
+  // reset automatically when navigating to a different photo.
   const [zoom, setZoom] = useState(1);
   const [imgLoaded, setImgLoaded] = useState(false);
   const [imgError, setImgError] = useState(false);
 
-  useEffect(() => { setZoom(1); setImgLoaded(false); setImgError(false); }, [index]);
-
   // ── Touch swipe ───────────────────────────────────────────────────────
   const touchStartX = useRef<number | null>(null);
   const SWIPE_THRESHOLD = 50;
@@ -805,7 +805,7 @@ const PhotosSection: React.FC<PhotosSectionProps> = ({ shipmentId, canDelete })
 
       {/* ── Lightbox (portal) ── */}
       {lightboxOpen && activeLightboxItems.length > 0 && (
-        <Lightbox items={activeLightboxItems} index={lightboxIndex} onClose={closeLightbox} onPrev={goPrev} onNext={goNext} onNavigate={setLightboxIndex} />
+        <Lightbox key={lightboxIndex} items={activeLightboxItems} index={lightboxIndex} onClose={closeLightbox} onPrev={goPrev} onNext={goNext} onNavigate={setLightboxIndex} />
       )}
 
       {/* ── Delete confirmation ── */}
diff --git a/frontend/src/pages/ShipmentDetail/ShipmentDetail.tsx b/frontend/src/pages/ShipmentDetail/ShipmentDetail.tsx
index 8967ca69..a397cdca 100644
--- a/frontend/src/pages/ShipmentDetail/ShipmentDetail.tsx
+++ b/frontend/src/pages/ShipmentDetail/ShipmentDetail.tsx
@@ -3,9 +3,7 @@ import { useParams } from "react-router-dom";
 import { Loader2, AlertTriangle } from "lucide-react";
 import { useOnlineStatus } from "../../hooks/useOnlineStatus";
 import { useShipmentDetail } from "../../hooks/useShipmentDetail";
-import Breadcrumb from "../../components/ui/Breadcrumb";
 import { useTranslation } from "react-i18next";
-import { useOnlineStatus } from "../../hooks/useOnlineStatus";
 import Breadcrumb from "@components/common/Breadcrumb";
 import MilestoneTimeline, { MilestoneDetail } from "../../components/shipment/MilestoneTimeline/MilestoneTimeline";
 import ShipmentDetailHeader from "./ShipmentDetailHeader/ShipmentDetailHeader";
@@ -34,6 +32,7 @@ import ShipmentComparison from "../../components/shipment/ShipmentComparison/Shi
 import type { ShipmentForComparison } from "../../components/shipment/ShipmentComparison/ShipmentComparison";
 import ShipmentStickyBar from "./ShipmentStickyBar";
 import { Zap } from "lucide-react";
+import type { ShipmentStatus } from "../../types/realtimeEvents";
 
 const ShipmentDetail: React.FC = () => {
   const { t } = useTranslation("shipments");
@@ -50,6 +49,7 @@ const ShipmentDetail: React.FC = () => {
   const [isExporting, setIsExporting] = useState(false);
   const contentRef = useRef<HTMLDivElement>(null);
   const [isComparisonOpen, setIsComparisonOpen] = useState(false);
+  const [currentStatus, setCurrentStatus] = useState<ShipmentStatus | "CREATED">(shipment?.status ?? "IN_TRANSIT");
 
   // Ref attached to the hero heading — IntersectionObserver in ShipmentStickyBar
   // watches this element and shows the bar once it scrolls out of the viewport.
@@ -167,8 +167,6 @@ const ShipmentDetail: React.FC = () => {
 
   const summaryPrintData: ShipmentSummaryPrintData = {
     shipmentId: id ? `#${id}` : "#SHP-992834",
-    trackingNumber: shipmentHeaderData.trackingNumber,
-    status: shipmentHeaderData.status,
     trackingNumber: id ?? "SHP-992834",
     status: currentStatus,
     priority: shipmentHeaderData.priority,
@@ -188,8 +186,8 @@ const ShipmentDetail: React.FC = () => {
       { label: "Weight Surcharge", amount: mockCostBreakdown.weightSurcharge },
       { label: "Fuel Surcharge", amount: mockCostBreakdown.fuelSurcharge },
       { label: "Insurance Fee", amount: mockCostBreakdown.insuranceFee },
-      { label: "Customs Duty", amount: mockCostBreakdown.customsDuty },
-      { label: "Discount", amount: mockCostBreakdown.discount, isDiscount: true },
+      { label: "Customs Duty", amount: mockCostBreakdown.customsDuty ?? 0 },
+      { label: "Discount", amount: mockCostBreakdown.discount ?? 0, isDiscount: true },
     ],
     totalCost: { amount: mockCostBreakdown.total, currency: mockCostBreakdown.currency },
     payment: mockPaymentData
@@ -235,9 +233,6 @@ const ShipmentDetail: React.FC = () => {
     );
   }
 
-  return (
-    <div className="relative min-h-screen w-full bg-[radial-gradient(ellipse_at_50%_0%,#0a3d3a_0%,#061e20_35%,#020d10_70%,#000_100%)] px-8 py-16 md:px-4 md:py-8 sm:px-3 sm:py-6 font-sans">
-      <div ref={contentRef} className="max-w-300 mx-auto relative z-10">
   // Mock comparison shipments for #508
   const comparisonShipments: ShipmentForComparison[] = [
     {
@@ -285,7 +280,7 @@ const ShipmentDetail: React.FC = () => {
         priority={shipmentHeaderData.priority}
       />
 
-      <div className="max-w-300 mx-auto relative z-10">
+      <div ref={contentRef} className="max-w-300 mx-auto relative z-10">
         <Breadcrumb
           items={[{ label: "Dashboard", href: "/dashboard" }, { label: "Shipments", href: "/dashboard/shipments" }]}
           current={id ? `#${id}` : "#SHP-992834"}
diff --git a/frontend/src/pages/ShipmentDetail/ShipmentDetailHeader/ShipmentDetailHeader.tsx b/frontend/src/pages/ShipmentDetail/ShipmentDetailHeader/ShipmentDetailHeader.tsx
index fbe95c2b..b601a550 100644
--- a/frontend/src/pages/ShipmentDetail/ShipmentDetailHeader/ShipmentDetailHeader.tsx
+++ b/frontend/src/pages/ShipmentDetail/ShipmentDetailHeader/ShipmentDetailHeader.tsx
@@ -7,7 +7,6 @@ import CopyToClipboard from "../../../components/ui/CopyToClipboard";
 import ETACountdown from "../../../components/shipment/ETACountdown";
 import InlineEditField from "../../../components/ui/InlineEditField";
 import RoleAccessInfo from "../../../components/ui/RoleAccessInfo";
-import AccessRestrictedBadge from "../../../components/ui/AccessRestrictedBadge";
 import type { ShipmentStatus } from "../../../services/api/endpoints/shipments";
 
 export type UserRole = "company" | "customer";
diff --git a/frontend/src/pages/ShipmentDetail/ShipmentMap/ShipmentMap.test.tsx b/frontend/src/pages/ShipmentDetail/ShipmentMap/ShipmentMap.test.tsx
index 6a498a9c..5f4faedd 100644
--- a/frontend/src/pages/ShipmentDetail/ShipmentMap/ShipmentMap.test.tsx
+++ b/frontend/src/pages/ShipmentDetail/ShipmentMap/ShipmentMap.test.tsx
@@ -42,8 +42,8 @@ describe('ShipmentMap', () => {
     );
 
     expect(screen.getByRole('heading', { name: /map view/i })).toBeInTheDocument();
-    expect(screen.getByText('ORIGIN:')).toBeInTheDocument();
-    expect(screen.getByText('DESTINATION:')).toBeInTheDocument();
+    expect(screen.getByText('Origin')).toBeInTheDocument();
+    expect(screen.getByText('Destination')).toBeInTheDocument();
     expect(screen.getByText('Location tracking unavailable')).toBeInTheDocument();
   });
 
@@ -64,8 +64,8 @@ describe('ShipmentMap', () => {
     );
 
     expect(screen.getByRole('heading', { name: /map view/i })).toBeInTheDocument();
-    expect(screen.getByText('ORIGIN:')).toBeInTheDocument();
-    expect(screen.getByText('DESTINATION:')).toBeInTheDocument();
+    expect(screen.getByText('Origin')).toBeInTheDocument();
+    expect(screen.getByText('Destination')).toBeInTheDocument();
     expect(screen.getByRole('button', { name: /View full map/i })).toBeInTheDocument();
     expect(screen.getByTestId('map-container')).toBeInTheDocument();
   });
diff --git a/frontend/src/pages/ShipmentDetail/ShipmentStickyBar/ShipmentStickyBar.tsx b/frontend/src/pages/ShipmentDetail/ShipmentStickyBar/ShipmentStickyBar.tsx
index 49b16562..8e7b6c72 100644
--- a/frontend/src/pages/ShipmentDetail/ShipmentStickyBar/ShipmentStickyBar.tsx
+++ b/frontend/src/pages/ShipmentDetail/ShipmentStickyBar/ShipmentStickyBar.tsx
@@ -1,4 +1,4 @@
-import React, { useEffect, useRef, useState } from "react";
+import React, { useEffect, useState } from "react";
 import { ArrowRight, ArrowUp, Package } from "lucide-react";
 import {
   getStatusBadgeClass,
diff --git a/frontend/src/pages/Shipments/ShipmentFilters/ShipmentFilters.tsx b/frontend/src/pages/Shipments/ShipmentFilters/ShipmentFilters.tsx
index 5f5a3fec..60fafab2 100644
--- a/frontend/src/pages/Shipments/ShipmentFilters/ShipmentFilters.tsx
+++ b/frontend/src/pages/Shipments/ShipmentFilters/ShipmentFilters.tsx
@@ -331,7 +331,7 @@ const ShipmentFilters: React.FC<ShipmentFiltersProps> = ({ onFilterChange }) =>
                 onChange={(e) =>
                   setFilters((prev) => ({ ...prev, origin: e.target.value }))
                 }
-                placeholder="Filter by origin…"
+                placeholder="Filter by origin…" aria-label="Origin City"
                 className={inputBase}
               />
             </div>
@@ -347,7 +347,7 @@ const ShipmentFilters: React.FC<ShipmentFiltersProps> = ({ onFilterChange }) =>
                 onChange={(e) =>
                   setFilters((prev) => ({ ...prev, destination: e.target.value }))
                 }
-                placeholder="Filter by destination…"
+                placeholder="Filter by destination…" aria-label="Destination City"
                 className={inputBase}
               />
             </div>
@@ -363,7 +363,7 @@ const ShipmentFilters: React.FC<ShipmentFiltersProps> = ({ onFilterChange }) =>
                 onChange={(e) =>
                   setFilters((prev) => ({ ...prev, carrier: e.target.value }))
                 }
-                placeholder="Filter by carrier…"
+                placeholder="Filter by carrier…" aria-label="Carrier"
                 className={inputBase}
               />
             </div>
@@ -381,7 +381,7 @@ const ShipmentFilters: React.FC<ShipmentFiltersProps> = ({ onFilterChange }) =>
                   onChange={(e) =>
                     setFilters((prev) => ({ ...prev, weightMin: e.target.value }))
                   }
-                  placeholder="Min"
+                  placeholder="Min" aria-label="Minimum weight"
                   className={inputBase}
                 />
                 <span className="text-slate-500 text-xs shrink-0">to</span>
@@ -392,7 +392,7 @@ const ShipmentFilters: React.FC<ShipmentFiltersProps> = ({ onFilterChange }) =>
                   onChange={(e) =>
                     setFilters((prev) => ({ ...prev, weightMax: e.target.value }))
                   }
-                  placeholder="Max"
+                  placeholder="Max" aria-label="Maximum weight"
                   className={inputBase}
                 />
               </div>
@@ -415,3 +415,5 @@ const ShipmentFilters: React.FC<ShipmentFiltersProps> = ({ onFilterChange }) =>
 };
 
 export default ShipmentFilters;
+
+
diff --git a/frontend/src/pages/Shipments/Shipments.test.tsx b/frontend/src/pages/Shipments/Shipments.test.tsx
new file mode 100644
index 00000000..760e1d03
--- /dev/null
+++ b/frontend/src/pages/Shipments/Shipments.test.tsx
@@ -0,0 +1,102 @@
+import { render, screen, waitFor } from '@testing-library/react';
+import { describe, expect, it, vi, beforeEach } from 'vitest';
+import { MemoryRouter } from 'react-router-dom';
+import Shipments from './Shipments';
+import { shipmentApi } from '../../api/shipmentApi';
+
+vi.mock('../../api/shipmentApi', () => ({
+  shipmentApi: {
+    getAll: vi.fn(),
+  },
+}));
+
+vi.mock('../../context/ToastContext', () => ({
+  useToast: () => ({
+    addToast: vi.fn(),
+  }),
+}));
+
+
+vi.mock('./hooks/useVirtualShipments', () => ({
+  useVirtualShipments: ({ shipments }: { shipments: unknown[] }) => ({
+    parentRef: { current: null },
+    virtualizer: {
+      getVirtualItems: () =>
+        shipments.map((_, index) => ({
+          key: index,
+          index,
+          start: index * 52,
+        })),
+      getTotalSize: () => shipments.length * 52,
+      measureElement: () => {},
+    },
+    handleScroll: vi.fn(),
+    scrollToIndex: vi.fn(),
+  }),
+}));
+describe('Shipments', () => {
+  beforeEach(() => {
+    vi.clearAllMocks();
+
+    vi.mocked(shipmentApi.getAll).mockResolvedValue({
+      data: [
+        {
+          id: 'SHIP-001',
+          origin: 'Lagos',
+          destination: 'Abuja',
+          status: 'CREATED',
+          createdAt: '2026-08-10T10:00:00Z',
+          priority: 'STANDARD',
+        },
+      ],
+      meta: {
+        page: 1,
+        limit: 50,
+        total: 1,
+      },
+    });
+  });
+
+  it('shows no results when filters match no shipments and clears the filters', async () => {
+    render(
+      <MemoryRouter>
+        <Shipments />
+      </MemoryRouter>,
+    );
+
+    await waitFor(() => {
+      expect(screen.getByText('SHIP-001')).toBeInTheDocument();
+    });
+
+    await import('@testing-library/user-event').then(async ({ default: userEvent }) => {
+      const user = userEvent.setup();
+
+      await user.click(screen.getByRole('button', { name: /filters/i }));
+
+      const originInput = await screen.findByLabelText('Origin City');
+
+      await user.type(originInput, 'Kano');
+
+      await waitFor(() => {
+        expect(screen.getByText('No results found')).toBeInTheDocument();
+        expect(
+          screen.getByText('No shipments match the selected filters.'),
+        ).toBeInTheDocument();
+      });
+
+      expect(
+        screen.getByRole('button', { name: 'Clear Filters' }),
+      ).toBeInTheDocument();
+
+      await user.click(
+        screen.getByRole('button', { name: 'Clear Filters' }),
+      );
+
+      await waitFor(() => {
+        expect(screen.getByText('SHIP-001')).toBeInTheDocument();
+      });
+    });
+  });
+});
+
+
diff --git a/frontend/src/pages/Shipments/Shipments.tsx b/frontend/src/pages/Shipments/Shipments.tsx
index bf36f84b..9604683d 100644
--- a/frontend/src/pages/Shipments/Shipments.tsx
+++ b/frontend/src/pages/Shipments/Shipments.tsx
@@ -14,7 +14,6 @@ import { safeFormatDate } from '../../utils/safeFormat';
 import ShipmentsKanban from './KanbanView/ShipmentsKanban';
 import RouteMap from './RouteMap/RouteMap';
 import ShipmentFilters, {
-  type Priority,
   type ShipmentFiltersValues,
   type ShipmentStatus,
   type Priority,
diff --git a/frontend/src/pages/WhatsNew/WhatsNewPage.tsx b/frontend/src/pages/WhatsNew/WhatsNewPage.tsx
index bd015fc7..03e4a2b4 100644
--- a/frontend/src/pages/WhatsNew/WhatsNewPage.tsx
+++ b/frontend/src/pages/WhatsNew/WhatsNewPage.tsx
@@ -381,6 +381,9 @@ const ReleaseCard: React.FC<ReleaseCardProps> = ({
                       {style.label}
                     </span>
                     <div className="flex items-baseline gap-2 min-w-0">
+                      <span className="shrink-0" aria-hidden="true">
+                        {getSectionIcon(change.description)}
+                      </span>
                       <span className="text-sm text-[#cbd5e1] leading-relaxed">
                         {change.description}
                       </span>
diff --git a/frontend/src/pages/dashboard/Company/CompanyDashboard.tsx b/frontend/src/pages/dashboard/Company/CompanyDashboard.tsx
index 8bd57c64..4531075a 100644
--- a/frontend/src/pages/dashboard/Company/CompanyDashboard.tsx
+++ b/frontend/src/pages/dashboard/Company/CompanyDashboard.tsx
@@ -1,6 +1,5 @@
-import React, { useState, useEffect } from "react";
+import React, { useState, useEffect, useMemo } from "react";
 import { useTranslation } from "react-i18next";
-import React, { useEffect, useMemo, useState } from "react";
 import {
   Clock,
   CheckCircle2,
@@ -30,39 +29,6 @@ import OnboardingTour, {
 import type { TourStep } from "@components/onboarding/OnboardingTour";
 import OnboardingChecklist from "@components/onboarding/OnboardingChecklist";
 
-const TOUR_STEPS: TourStep[] = [
-  {
-    targetId: "tour-welcome",
-    heading: "Welcome to Navin 🎉",
-    body: "This is your logistics command center. Monitor shipments, track performance, and manage your team — all in one place.",
-    placement: "bottom",
-  },
-  {
-    targetId: "tour-create-shipment",
-    heading: "Create Your First Shipment",
-    body: "Click here to create a new shipment, assign routes, set milestones, and configure automated settlements.",
-    placement: "bottom",
-  },
-  {
-    targetId: "tour-shipments-link",
-    heading: "Track Shipments",
-    body: "View all active and historical shipments with real-time on-chain milestone updates and IoT sensor data.",
-    placement: "right",
-  },
-  {
-    targetId: "tour-settlements-link",
-    heading: "Automated Settlements",
-    body: "Settlements trigger automatically when delivery milestones are verified on the Stellar blockchain.",
-    placement: "right",
-  },
-  {
-    targetId: "tour-wallet",
-    heading: "Connect Your Stellar Wallet",
-    body: "Connect your Stellar wallet to sign settlement transactions and interact with Soroban smart contracts.",
-    placement: "bottom",
-  },
-];
-
 const TrendIcon = ({ up }: { up: boolean }) => (
   <svg
     width="12"
@@ -297,17 +263,6 @@ const CompanyDashboard: React.FC = () => {
           <p className="text-[#94a3b8] text-sm mb-4">{t('companyDashboard.errorBody')}</p>
           <button className="bg-[#ef4444] text-white border-none px-4 py-2 rounded-md font-medium cursor-pointer" onClick={() => window.location.reload()}>
             {t('companyDashboard.retry')}
-          <h3 className="text-lg font-semibold mb-2">
-            Failed to load dashboard
-          </h3>
-          <p className="text-[#94a3b8] text-sm mb-4">
-            There was a problem connecting to the logistics network.
-          </p>
-          <button
-            className="bg-[#ef4444] text-white border-none px-4 py-2 rounded-md font-medium cursor-pointer"
-            onClick={() => window.location.reload()}
-          >
-            Retry Connection
           </button>
         </div>
       </div>
@@ -331,10 +286,6 @@ const CompanyDashboard: React.FC = () => {
           </span>
         </div>
         <button className="bg-transparent border-none cursor-pointer p-1 flex items-center" aria-label={t('companyDashboard.menuAriaLabel')}>
-        <button
-          className="bg-transparent border-none cursor-pointer p-1 flex items-center"
-          aria-label="Menu"
-        >
           <Menu size={22} color="#fff" />
         </button>
       </div>
@@ -350,20 +301,11 @@ const CompanyDashboard: React.FC = () => {
         </div>
         <div className="max-md:hidden flex items-center gap-1.5 bg-[#14171e] border border-[#1e293b] px-3 py-1.5 rounded-md text-xs font-medium text-[#94a3b8]">
           {t('companyDashboard.live')} <span className="text-[#10b981]">{t('companyDashboard.connected')}</span>
-          <h1 className="text-2xl font-semibold tracking-tight m-0 mb-1 max-md:text-[22px] max-md:font-bold">
-            Logistics Overview
-          </h1>
-          <p className="text-[#94a3b8] text-sm m-0">
-            Blockchain-synced real-time data
-          </p>
           <p className="text-[11px] uppercase tracking-[0.2em] text-[#64748b] mt-1">
             {refreshedLabel}
           </p>
         </div>
         <div className="flex items-center gap-2">
-          <div className="max-md:hidden flex items-center gap-1.5 bg-[#14171e] border border-[#1e293b] px-3 py-1.5 rounded-md text-xs font-medium text-[#94a3b8]">
-            Live: <span className="text-[#10b981]">Connected</span>
-          </div>
           <button
             type="button"
             onClick={() => {
@@ -450,35 +392,25 @@ const CompanyDashboard: React.FC = () => {
                 <div className="flex items-center gap-2 text-[#94a3b8] text-[11px] font-semibold uppercase tracking-[0.05em] mb-4">
                   {stat.icon}{t(`companyDashboard.stats.${stat.id}`)}
                 </div>
-                <div className={`text-[32px] font-semibold mb-2 max-md:text-[28px] ${stat.id === "delayed" ? "text-[#f59e0b]" : "text-white"}`}>
+                <div
+                  className={`text-[32px] font-semibold mb-2 max-md:text-[28px] ${stat.id === "delayed" ? "text-[#f59e0b]" : "text-white"}`}
+                >
                   {stat.value}
+                </div>
                 <div
-                  key={stat.id}
-                  className="bg-[#14171e] border border-[#1e293b] rounded-xl p-6 flex flex-col transition-transform duration-200 hover:-translate-y-0.5 hover:border-[#334155] max-md:p-4"
+                  className={`text-[13px] font-medium flex items-center gap-1 ${
+                    stat.trendType === "positive"
+                      ? "text-[#10b981]"
+                      : stat.trendType === "negative"
+                        ? "text-[#ef4444]"
+                        : "text-[#94a3b8]"
+                  }`}
                 >
-                  <div className="flex items-center gap-2 text-[#94a3b8] text-[11px] font-semibold uppercase tracking-[0.05em] mb-4">
-                    {stat.icon}
-                    {stat.label}
-                  </div>
-                  <div
-                    className={`text-[32px] font-semibold mb-2 max-md:text-[28px] ${stat.id === "delayed" ? "text-[#f59e0b]" : "text-white"}`}
-                  >
-                    {stat.value}
-                  </div>
-                  <div
-                    className={`text-[13px] font-medium flex items-center gap-1 ${
-                      stat.trendType === "positive"
-                        ? "text-[#10b981]"
-                        : stat.trendType === "negative"
-                          ? "text-[#ef4444]"
-                          : "text-[#94a3b8]"
-                    }`}
-                  >
-                    <TrendIcon up={stat.trendType === "positive"} />
-                    {stat.trend}
-                  </div>
+                  <TrendIcon up={stat.trendType === "positive"} />
+                  {stat.trend}
                 </div>
-              ))}
+              </div>
+            ))}
         </div>
 
         {/* Quick Actions — top-right, desktop only */}
@@ -513,11 +445,6 @@ const CompanyDashboard: React.FC = () => {
           </h2>
           <a href="#" className="text-[13px] font-medium text-[#94a3b8] no-underline transition-colors hover:text-white max-md:text-[#3b82f6] max-md:font-semibold">
             {t('companyDashboard.viewAll')}
-          <a
-            href="#"
-            className="text-[13px] font-medium text-[#94a3b8] no-underline transition-colors hover:text-white max-md:text-[#3b82f6] max-md:font-semibold"
-          >
-            View All
           </a>
         </div>
 
@@ -554,12 +481,6 @@ const CompanyDashboard: React.FC = () => {
             <div>
               <h3 className="m-0 mb-0.5 text-sm font-semibold">{t('companyDashboard.activeFleetRoutes')}</h3>
               <p className="m-0 text-xs text-[#94a3b8]">{t('companyDashboard.driversActive', { count: 12 })}</p>
-              <h3 className="m-0 mb-0.5 text-sm font-semibold">
-                Active Fleet Routes
-              </h3>
-              <p className="m-0 text-xs text-[#94a3b8]">
-                12 drivers currently active
-              </p>
             </div>
           </div>
           <div className="flex items-center">
@@ -570,15 +491,6 @@ const CompanyDashboard: React.FC = () => {
             ].map((a, i) => (
               <div key={i} className="w-7 h-7 rounded-full border-2 border-[#14171e] -ml-2 first:ml-0 bg-[#334155] overflow-hidden">
                 <img src={`https://api.dicebear.com/7.x/avataaars/svg?seed=${a.seed}&backgroundColor=${a.bg}`} alt={t('companyDashboard.driverAlt')} className="w-full h-full object-cover" />
-              <div
-                key={i}
-                className="w-7 h-7 rounded-full border-2 border-[#14171e] -ml-2 first:ml-0 bg-[#334155] overflow-hidden"
-              >
-                <img
-                  src={`https://api.dicebear.com/7.x/avataaars/svg?seed=${a.seed}&backgroundColor=${a.bg}`}
-                  alt="Driver"
-                  className="w-full h-full object-cover"
-                />
               </div>
             ))}
             <div className="w-7 h-7 rounded-full border-2 border-[#14171e] -ml-2 bg-[#334155] flex items-center justify-center text-[11px] font-semibold text-white">
diff --git a/frontend/src/pages/dashboard/Company/CreateShipment/CreateShipment.tsx b/frontend/src/pages/dashboard/Company/CreateShipment/CreateShipment.tsx
index c32d92ec..4bd42a24 100644
--- a/frontend/src/pages/dashboard/Company/CreateShipment/CreateShipment.tsx
+++ b/frontend/src/pages/dashboard/Company/CreateShipment/CreateShipment.tsx
@@ -1,7 +1,6 @@
 import React, { useEffect, useMemo, useState } from 'react';
 import { useNavigate, useSearchParams } from 'react-router-dom';
-import { CheckCircle2, Package, ArrowLeft, Loader2, Book, History } from 'lucide-react';
-import { CheckCircle2, Package, ArrowLeft, Loader2 } from 'lucide-react';
+import { CheckCircle2, Package, ArrowLeft, Loader2, History, Book } from 'lucide-react';
 import { shipmentApi, type CreateShipmentRequest } from '@services/api/endpoints/shipments';
 import { addressesApi } from '@services/api/endpoints/addresses';
 import type { Address } from '@services/api/endpoints/addresses';
@@ -9,6 +8,7 @@ import { useToast } from '@context/ToastContext';
 import { useShipmentTemplates } from '@hooks/useShipmentTemplates';
 import { useFormDraft } from '@hooks/useFormDraft';
 import SaveTemplateModal from '@components/shipment/SaveTemplateModal/SaveTemplateModal';
+import AddressBookPickerModal from '@components/address-book/AddressBookPickerModal';
 import { getTemplatePreview, toTemplateFields } from '../../../../types/shipmentTemplate';
 import type { AxiosError } from 'axios';
 import Combobox from '@components/ui/Combobox';
@@ -59,6 +59,7 @@ const CreateShipment: React.FC = () => {
     const [shipmentId, setShipmentId] = useState('');
     const [selectedTemplateId, setSelectedTemplateId] = useState('');
     const [isSaveModalOpen, setIsSaveModalOpen] = useState(false);
+    const [addressBookTarget, setAddressBookTarget] = useState<'origin' | 'destination' | null>(null);
     const [costEstimate, setCostEstimate] = useState<CostBreakdownData | null>(null);
     const [isEstimating, setIsEstimating] = useState(false);
 
@@ -158,6 +159,14 @@ const CreateShipment: React.FC = () => {
         }
     };
 
+    const handleAddressBookSelect = (address: Address) => {
+        if (!addressBookTarget) return;
+        const field = addressBookTarget;
+        const formatted = formatAddress(address);
+        setFormData((prev) => ({ ...prev, [field]: formatted }));
+        if (errors[field]) setErrors((prev) => ({ ...prev, [field]: '' }));
+    };
+
     // Auto-fetch cost estimate when required fields are filled
 useEffect(() => {
     const { origin, destination, weight } = formData;
@@ -431,7 +440,17 @@ useEffect(() => {
 
               <form onSubmit={handleSubmit} className="shipment-form">
                   <div className="form-group">
-                      <label htmlFor="origin">Origin Address</label>
+                      <div className="label-row">
+                          <label htmlFor="origin">Origin Address</label>
+                          <button
+                              type="button"
+                              className="address-book-btn"
+                              onClick={() => setAddressBookTarget('origin')}
+                          >
+                              <Book size={12} />
+                              Address Book
+                          </button>
+                      </div>
                       <Combobox
                           id="origin"
                           name="origin"
@@ -457,7 +476,17 @@ useEffect(() => {
                   </div>
 
                   <div className="form-group">
-                      <label htmlFor="destination">Destination Address</label>
+                      <div className="label-row">
+                          <label htmlFor="destination">Destination Address</label>
+                          <button
+                              type="button"
+                              className="address-book-btn"
+                              onClick={() => setAddressBookTarget('destination')}
+                          >
+                              <Book size={12} />
+                              Address Book
+                          </button>
+                      </div>
                       <Combobox
                           id="destination"
                           name="destination"
@@ -612,6 +641,12 @@ useEffect(() => {
               onClose={() => setIsSaveModalOpen(false)}
               onSave={handleSaveTemplate}
           />
+
+          <AddressBookPickerModal
+              isOpen={addressBookTarget !== null}
+              onClose={() => setAddressBookTarget(null)}
+              onSelect={handleAddressBookSelect}
+          />
     </div>
   );
 };
diff --git a/frontend/src/pages/dashboard/ExceptionDashboard.tsx b/frontend/src/pages/dashboard/ExceptionDashboard.tsx
index 25639b8a..52068781 100644
--- a/frontend/src/pages/dashboard/ExceptionDashboard.tsx
+++ b/frontend/src/pages/dashboard/ExceptionDashboard.tsx
@@ -32,6 +32,12 @@ const EXCEPTION_TYPES: Array<{ value: ExceptionType; label: string; color: strin
   { value: 'CUSTOMS_HOLD', label: 'Customs Hold', color: '#34d399' },
 ];
 
+const daysAgo = (n: number): string => {
+  const date = new Date();
+  date.setDate(date.getDate() - n);
+  return date.toISOString().slice(0, 10);
+};
+
 const initialExceptions: ExceptionItem[] = [
   {
     id: 'EX-1021',
@@ -41,7 +47,7 @@ const initialExceptions: ExceptionItem[] = [
     ageHours: 38,
     owner: 'Amina',
     route: 'Lagos → Abuja',
-    openedAt: '2026-06-24',
+    openedAt: daysAgo(2),
     resolutionHours: 12,
     severity: 'HIGH',
   },
@@ -53,7 +59,7 @@ const initialExceptions: ExceptionItem[] = [
     ageHours: 18,
     owner: 'Bolanle',
     route: 'Abuja → Kano',
-    openedAt: '2026-06-25',
+    openedAt: daysAgo(1),
     resolutionHours: 8,
     severity: 'MEDIUM',
   },
@@ -65,7 +71,7 @@ const initialExceptions: ExceptionItem[] = [
     ageHours: 72,
     owner: 'Chris',
     route: 'Port Harcourt → Enugu',
-    openedAt: '2026-06-22',
+    openedAt: daysAgo(4),
     resolutionHours: 15,
     severity: 'HIGH',
   },
@@ -77,7 +83,7 @@ const initialExceptions: ExceptionItem[] = [
     ageHours: 9,
     owner: 'Dayo',
     route: 'Ibadan → Lagos',
-    openedAt: '2026-06-26',
+    openedAt: daysAgo(0),
     resolutionHours: 4,
     severity: 'LOW',
   },
@@ -89,7 +95,7 @@ const initialExceptions: ExceptionItem[] = [
     ageHours: 51,
     owner: 'Nneka',
     route: 'Lagos → Abuja',
-    openedAt: '2026-06-23',
+    openedAt: daysAgo(3),
     resolutionHours: 10,
     severity: 'MEDIUM',
   },
diff --git a/frontend/src/test/setup.ts b/frontend/src/test/setup.ts
index cd0027fc..c06457a8 100644
--- a/frontend/src/test/setup.ts
+++ b/frontend/src/test/setup.ts
@@ -36,6 +36,11 @@ const makeStorage = () => {
 Object.defineProperty(window, 'localStorage', { value: makeStorage(), writable: true, configurable: true });
 Object.defineProperty(window, 'sessionStorage', { value: makeStorage(), writable: true, configurable: true });
 
+// i18n reads localStorage at import time, so it must load after the storage
+// mocks above are in place — a static top-level import would be hoisted
+// ahead of them and crash against jsdom's unconfigured localStorage.
+await import('../i18n');
+
 afterEach(() => {
   cleanup();
 })
diff --git a/frontend/tailwind.config.js b/frontend/tailwind.config.js
index ce8472c8..69ad76b4 100644
--- a/frontend/tailwind.config.js
+++ b/frontend/tailwind.config.js
@@ -77,6 +77,7 @@ export default {
         'notif-fade-in': {
           '0%': { opacity: '0', transform: 'translateY(3px)' },
           '100%': { opacity: '1', transform: 'translateY(0)' },
+        },
         'slide-in-left': {
           '0%': { transform: 'translateX(-100%)', opacity: '0' },
           '100%': { transform: 'translateX(0)', opacity: '1' },
@@ -84,6 +85,7 @@ export default {
         'slide-in-right': {
           '0%': { transform: 'translateX(100%)', opacity: '0' },
           '100%': { transform: 'translateX(0)', opacity: '1' },
+        },
         'shimmer': {
           '0%': { transform: 'translateX(-100%)' },
           '100%': { transform: 'translateX(100%)' },
diff --git a/frontend/tsconfig.tsbuildinfo b/frontend/tsconfig.tsbuildinfo
index ec414260..68ac3906 100644
--- a/frontend/tsconfig.tsbuildinfo
+++ b/frontend/tsconfig.tsbuildinfo
@@ -1 +1 @@
-{"root":["./src/app.tsx","./src/i18n.ts","./src/main.tsx","./src/vite-env.d.ts","./src/landingpage/landingpage.tsx","./src/landingpage/sections/corefeatures/corefeatures.test.tsx","./src/landingpage/sections/corefeatures/corefeatures.tsx","./src/landingpage/sections/faqsection/faqsection.tsx","./src/landingpage/sections/features/features.tsx","./src/landingpage/sections/footer/footer.tsx","./src/landingpage/sections/footer/index.ts","./src/landingpage/sections/home/home.tsx","./src/landingpage/sections/home/index.ts","./src/landingpage/sections/howitworks/howitworks.tsx","./src/landingpage/sections/logostrip/logostrip.tsx","./src/landingpage/sections/whynavin/whynavin.tsx","./src/api/activityapi.ts","./src/api/shipmentapi.test.ts","./src/api/shipmentapi.ts","./src/components/index.ts","./src/components/button/button.test.tsx","./src/components/button/button.tsx","./src/components/button/index.ts","./src/components/card/card.test.tsx","./src/components/card/card.tsx","./src/components/card/index.ts","./src/components/errorboundary/errorboundary.tsx","./src/components/errorfallback/errorfallback.tsx","./src/components/navbar/navbar.tsx","./src/components/navbar/index.ts","./src/components/themetoggle/themetoggle.tsx","./src/components/address-book/addressbookpickermodal.tsx","./src/components/auth/roleguard.test.tsx","./src/components/auth/roleguard.tsx","./src/components/auth/protectedroute/protectedroute.test.tsx","./src/components/auth/protectedroute/protectedroute.tsx","./src/components/auth/protectedroute/index.ts","./src/components/auth/sessiontimeoutmodal/sessiontimeoutmodal.tsx","./src/components/auth/sessiontimeoutmodal/index.ts","./src/components/auth/walletconnectbutton/walletconnectbutton.tsx","./src/components/auth/walletconnectbutton/index.ts","./src/components/command-palette/commandpalette.tsx","./src/components/command-palette/index.ts","./src/components/common/breadcrumb/breadcrumb.tsx","./src/components/common/breadcrumb/index.ts","./src/components/common/breadcrumb/types.ts","./src/components/common/datatable/datatable.example.tsx","./src/components/common/datatable/datatable.tsx","./src/components/common/datatable/index.ts","./src/components/common/datatable/types.ts","./src/components/common/emptystate/emptystate.tsx","./src/components/common/emptystate/index.ts","./src/components/common/emptystate/types.ts","./src/components/common/globalsearch/globalsearch.tsx","./src/components/common/globalsearch/index.ts","./src/components/common/modal/modal.test.tsx","./src/components/common/modal/modal.tsx","./src/components/common/modal/index.ts","./src/components/common/offlinebanner/offlinebanner.tsx","./src/components/common/offlinebanner/index.ts","./src/components/common/pagination/pagination.example.tsx","./src/components/common/pagination/pagination.tsx","./src/components/common/pagination/index.ts","./src/components/common/pagination/types.ts","./src/components/common/shortcutshelpmodal/shortcutshelpmodal.tsx","./src/components/common/slowconnectionbanner/slowconnectionbanner.tsx","./src/components/common/slowconnectionbanner/index.ts","./src/components/common/statusbadge/statusbadge.test.tsx","./src/components/common/statusbadge/statusbadge.tsx","./src/components/common/statusbadge/index.ts","./src/components/common/statusbadge/statusbadgevariants.ts","./src/components/dashboard/charts/deliverysuccesschart/deliverysuccesschart.test.tsx","./src/components/dashboard/charts/deliverysuccesschart/deliverysuccesschart.tsx","./src/components/dashboard/charts/deliverysuccesschart/index.ts","./src/components/dashboard/charts/deliverysuccesschart/mockdeliverydata.ts","./src/components/dashboard/charts/shipmentvolumechart/shipmentvolumechart.test.tsx","./src/components/dashboard/charts/shipmentvolumechart/shipmentvolumechart.tsx","./src/components/dashboard/charts/shipmentvolumechart/index.ts","./src/components/dashboard/charts/shipmentvolumechart/mockvolumedata.ts","./src/components/dashboard/costperroutewidget/costperroutewidget.test.tsx","./src/components/dashboard/costperroutewidget/costperroutewidget.tsx","./src/components/dashboard/costperroutewidget/routeshipmentsmodal.tsx","./src/components/dashboard/costperroutewidget/costperrouteutils.test.ts","./src/components/dashboard/costperroutewidget/costperrouteutils.ts","./src/components/dashboard/costperroutewidget/index.ts","./src/components/dashboard/costperroutewidget/mockcostperroutedata.ts","./src/components/dashboard/deliveryperformancewidget/deliveryperformancewidget.tsx","./src/components/dashboard/deliveryperformancewidget/index.ts","./src/components/dashboard/deliveryperformancewidget/mockperformancedata.ts","./src/components/dashboard/recentactivitypanel/recentactivitypanel.tsx","./src/components/dashboard/recentactivitypanel/index.ts","./src/components/dashboard/revenuetargetwidget/revenuetargetwidget.test.tsx","./src/components/dashboard/revenuetargetwidget/revenuetargetwidget.tsx","./src/components/dashboard/revenuetargetwidget/index.ts","./src/components/dashboard/revenuetargetwidget/mockrevenuetargetdata.ts","./src/components/dashboard/revenuetargetwidget/revenuetargetutils.test.ts","./src/components/dashboard/revenuetargetwidget/revenuetargetutils.ts","./src/components/dashboard/shipmentvolumetrendwidget/shipmentvolumetrendwidget.test.tsx","./src/components/dashboard/shipmentvolumetrendwidget/shipmentvolumetrendwidget.tsx","./src/components/dashboard/shipmentvolumetrendwidget/index.ts","./src/components/dashboard/shipmentvolumetrendwidget/mocktrenddata.ts","./src/components/dashboard/statcard/statcard.tsx","./src/components/dashboard/statcard/index.ts","./src/components/dashboard/widgetrefreshindicator/widgetrefreshindicator.tsx","./src/components/dashboard/widgetrefreshindicator/index.ts","./src/components/layout/animatedpage.test.tsx","./src/components/layout/animatedpage.tsx","./src/components/layout/dashboardlayout.tsx","./src/components/layout/sidebar/sidebar.tsx","./src/components/layout/sidebar/index.ts","./src/components/layout/topheader/topheader.tsx","./src/components/layout/topheader/index.ts","./src/components/notifications/notificationbulkactionbar/notificationbulkactionbar.tsx","./src/components/notifications/notificationdropdown/notificationdropdown.test.tsx","./src/components/notifications/notificationdropdown/notificationdropdown.tsx","./src/components/notifications/notificationdropdown/index.ts","./src/components/notifications/toast/toast.test.tsx","./src/components/notifications/toast/toast.tsx","./src/components/onboarding/onboardingchecklist.tsx","./src/components/onboarding/onboardingtour.tsx","./src/components/onboarding/index.ts","./src/components/saved-views/savedviewspanel.tsx","./src/components/saved-views/index.ts","./src/components/settings/settingssection.tsx","./src/components/settings/index.ts","./src/components/shipment/etacountdown.tsx","./src/components/shipment/milestonetimeline.tsx","./src/components/shipment/bulkactionbar/bulkactionbar.tsx","./src/components/shipment/bulkactionbar/index.ts","./src/components/shipment/bulkstatusmodal/bulkstatusmodal.tsx","./src/components/shipment/bulkstatusmodal/index.ts","./src/components/shipment/costbreakdown/costbreakdown.tsx","./src/components/shipment/deliveryconfirmation/deliveryconfirmation.test.tsx","./src/components/shipment/deliveryconfirmation/deliveryconfirmation.tsx","./src/components/shipment/eventannotation/eventannotation.tsx","./src/components/shipment/eventannotation/index.ts","./src/components/shipment/milestonetimeline/milestonetimeline.tsx","./src/components/shipment/milestonetimeline/index.ts","./src/components/shipment/overdueshipmentbadge/overdueshipmentbadge.tsx","./src/components/shipment/overdueshipmentbadge/index.ts","./src/components/shipment/prioritybadge/prioritybadge.tsx","./src/components/shipment/prioritybadge/index.ts","./src/components/shipment/quickactionpanel/quickactionpanel.tsx","./src/components/shipment/quickactionpanel/index.ts","./src/components/shipment/savetemplatemodal/savetemplatemodal.tsx","./src/components/shipment/shipmentactionmenu/shipmentactionmenu.tsx","./src/components/shipment/shipmentactionmenu/index.ts","./src/components/shipment/shipmentcomparison/shipmentcomparison.tsx","./src/components/shipment/shipmentsummaryprint/shipmentsummaryprint.tsx","./src/components/shipment/shipmentsummaryprint/index.ts","./src/components/shipment/statusupdate/statusupdate.test.tsx","./src/components/shipment/statusupdate/statusupdate.tsx","./src/components/shipment/statusupdate/index.ts","./src/components/shipment/trackingtimeline/trackingtimeline.example.tsx","./src/components/shipment/trackingtimeline/trackingtimeline.test.tsx","./src/components/shipment/trackingtimeline/trackingtimeline.tsx","./src/components/shipment/trackingtimeline/index.ts","./src/components/ui/accessrestrictedbadge.tsx","./src/components/ui/avatar.tsx","./src/components/ui/breadcrumb.tsx","./src/components/ui/combobox.tsx","./src/components/ui/connectionstatusdot.tsx","./src/components/ui/copytoclipboard.tsx","./src/components/ui/drawer.tsx","./src/components/ui/exportdropdown.tsx","./src/components/ui/inlineeditfield.tsx","./src/components/ui/liveregion.tsx","./src/components/ui/pwainstallprompt.tsx","./src/components/ui/pageskeleton.tsx","./src/components/ui/passwordstrengthmeter.tsx","./src/components/ui/prioritybadge.tsx","./src/components/ui/roleaccessinfo.tsx","./src/components/ui/routetransition.tsx","./src/components/ui/searchinput.test.tsx","./src/components/ui/searchinput.tsx","./src/components/ui/staledatabanner.tsx","./src/components/ui/tag.test.tsx","./src/components/ui/tag.tsx","./src/components/ui/tooltip.tsx","./src/components/ui/autosavebanner/autosavebanner.tsx","./src/components/ui/autosavebanner/index.ts","./src/components/ui/charterror/charterror.tsx","./src/components/ui/charterror/index.ts","./src/components/ui/chartloading/chartloading.tsx","./src/components/ui/chartloading/index.ts","./src/components/ui/chip/chip.tsx","./src/components/ui/chip/chipgroup.tsx","./src/components/ui/chip/index.ts","./src/components/ui/circularprogress/circularprogress.test.tsx","./src/components/ui/circularprogress/circularprogress.tsx","./src/components/ui/circularprogress/index.ts","./src/components/ui/confirmdialog/confirmdialog.tsx","./src/components/ui/confirmdialog/index.ts","./src/components/ui/datatable/datatable.tsx","./src/components/ui/datatable/index.ts","./src/components/ui/datatable/types.ts","./src/components/ui/daterangepicker/daterangepicker.tsx","./src/components/ui/daterangepicker/index.ts","./src/components/ui/emptystate/emptystate.test.tsx","./src/components/ui/emptystate/emptystate.tsx","./src/components/ui/emptystate/index.ts","./src/components/ui/fileupload/fileupload.test.tsx","./src/components/ui/fileupload/fileupload.tsx","./src/components/ui/fileupload/index.ts","./src/components/ui/inlineedit/inlineedit.tsx","./src/components/ui/inlineedit/index.ts","./src/components/ui/multiselect/multiselect.test.tsx","./src/components/ui/multiselect/multiselect.tsx","./src/components/ui/multiselect/index.ts","./src/components/ui/progressbar/progressbar.test.tsx","./src/components/ui/progressbar/progressbar.tsx","./src/components/ui/progressbar/index.ts","./src/components/ui/progressstepper/progressstepper.tsx","./src/components/ui/progressstepper/index.ts","./src/components/ui/richcharttooltip/richcharttooltip.tsx","./src/components/ui/richcharttooltip/index.ts","./src/components/ui/skeleton/cardskeleton.tsx","./src/components/ui/skeleton/dashboardwidgetskeleton.tsx","./src/components/ui/skeleton/profileskeleton.tsx","./src/components/ui/skeleton/shipmentcardskeleton.tsx","./src/components/ui/skeleton/skeleton.tsx","./src/components/ui/skeleton/tablerowskeleton.tsx","./src/components/ui/skeleton/tableskeleton.tsx","./src/components/ui/skeleton/index.ts","./src/components/ui/statusbadge/statusbadge.test.tsx","./src/components/ui/statusbadge/statusbadge.tsx","./src/components/ui/statusbadge/index.ts","./src/components/wallet/networkbadge.tsx","./src/components/wallet/walletmodal.tsx","./src/components/wallet/walletpill.tsx","./src/context/authcontext.tsx","./src/context/liveregioncontext.tsx","./src/context/routetransitioncontext.tsx","./src/context/toastcontext.tsx","./src/context/walletcontext.tsx","./src/hooks/index.ts","./src/hooks/useauth.test.ts","./src/hooks/useauth.ts","./src/hooks/usebulkselection.ts","./src/hooks/usefocustrap.ts","./src/hooks/useformautosave.ts","./src/hooks/useformdraft.ts","./src/hooks/usekeyboardshortcuts.ts","./src/hooks/useonlinestatus.ts","./src/hooks/useoptimisticupdate.ts","./src/hooks/usepagination.test.ts","./src/hooks/usepagination.ts","./src/hooks/userealtimeevents.ts","./src/hooks/usereturningvisitor.ts","./src/hooks/usesavedviews.ts","./src/hooks/usescrollspy.ts","./src/hooks/useshipmentdetail.test.ts","./src/hooks/useshipmentdetail.ts","./src/hooks/useshipmenttemplates.ts","./src/hooks/useshipmenttracking.ts","./src/hooks/useslowconnection.ts","./src/hooks/usetheme.ts","./src/hooks/usewidgetcache.ts","./src/hooks/usewidgetrefresh.ts","./src/pages/analytics/analytics.tsx","./src/pages/analytics/analyticsfilters.tsx","./src/pages/analytics/revenueanalytics.test.tsx","./src/pages/analytics/revenueanalytics.tsx","./src/pages/blockchainledger/blockchainledger.test.tsx","./src/pages/blockchainledger/blockchainledger.tsx","./src/pages/blockchainledger/hooks/useledger.ts","./src/pages/componentdemos/confirmdialogdemo/confirmdialogdemo.tsx","./src/pages/componentdemos/paginationdemo/paginationdemo.tsx","./src/pages/componentdemos/skeletondemo/skeletondemo.tsx","./src/pages/helpcenter/helpcenter.tsx","./src/pages/home/home.tsx","./src/pages/notfound/notfoundpage.tsx","./src/pages/notfound/index.ts","./src/pages/notifications/notificationspage.tsx","./src/pages/payments/paymentdetailmodal/paymentdetailmodal.tsx","./src/pages/payments/paymenthistory/paymenthistory.tsx","./src/pages/payments/paymentsummarycards/paymentsummarycards.tsx","./src/pages/payments/paymentsummarycards/index.ts","./src/pages/publictracking/publictrackingpage.tsx","./src/pages/publictracking/index.ts","./src/pages/settings/settings.tsx","./src/pages/settings/companyprofile/companyprofile.test.tsx","./src/pages/settings/companyprofile/companyprofile.tsx","./src/pages/settings/notificationpreferences/notificationpreferences.test.tsx","./src/pages/settings/notificationpreferences/notificationpreferences.tsx","./src/pages/settings/hooks/usesettings.ts","./src/pages/settings/sections/addressbooksection.tsx","./src/pages/settings/sections/apikeyssection.tsx","./src/pages/settings/sections/appearancesection.tsx","./src/pages/settings/sections/dangerzone.tsx","./src/pages/settings/sections/mytemplatessection.tsx","./src/pages/settings/sections/notificationssection.tsx","./src/pages/settings/sections/profilesection.tsx","./src/pages/settings/sections/teamsection.tsx","./src/pages/settings/sections/walletssection.tsx","./src/pages/settings/sections/securitysection/changepasswordform.tsx","./src/pages/settings/sections/securitysection/securitysection.tsx","./src/pages/settings/sections/securitysection/sessionlist.tsx","./src/pages/settings/sections/securitysection/twofactorsetup.tsx","./src/pages/settlements/settlements.tsx","./src/pages/settlements/components/paymentdetailmodal.tsx","./src/pages/settlements/components/index.ts","./src/pages/shipment/shipmentdetail.tsx","./src/pages/shipment/sections/disputeform/disputeform.tsx","./src/pages/shipment/sections/disputeform/index.ts","./src/pages/shipment/sections/documentssection/documentssection.tsx","./src/pages/shipment/sections/iotpanel/anomalyalertbanner.tsx","./src/pages/shipment/sections/iotpanel/gpsroutemap.tsx","./src/pages/shipment/sections/iotpanel/iotpanel.tsx","./src/pages/shipment/sections/iotpanel/iotsummarycards.tsx","./src/pages/shipment/sections/iotpanel/shockeventstimeline.tsx","./src/pages/shipment/sections/iotpanel/temperaturehumiditychart.tsx","./src/pages/shipment/sections/iotpanel/hooks/usetelemetry.ts","./src/pages/shipment/sections/milestonetimeline/milestonetimeline.test.tsx","./src/pages/shipment/sections/milestonetimeline/milestonetimeline.tsx","./src/pages/shipment/sections/milestonetimeline/types.ts","./src/pages/shipment/sections/notessection/notessection.tsx","./src/pages/shipment/sections/printview/shipmentprintview.tsx","./src/pages/shipment/sections/shipmentheader/shipmentheader.tsx","./src/pages/shipmentdetail/shipmentdetail.tsx","./src/pages/shipmentdetail/index.ts","./src/pages/shipmentdetail/deliveryproofupload/deliveryproofupload.tsx","./src/pages/shipmentdetail/documentssection/documentssection.tsx","./src/pages/shipmentdetail/escrowstatus/escrowstatus.tsx","./src/pages/shipmentdetail/milestonetimeline/milestonetimeline.example.tsx","./src/pages/shipmentdetail/milestonetimeline/milestonetimeline.test.tsx","./src/pages/shipmentdetail/milestonetimeline/milestonetimeline.tsx","./src/pages/shipmentdetail/paymentstatus/paymentstatus.tsx","./src/pages/shipmentdetail/photossection/photossection.tsx","./src/pages/shipmentdetail/photossection/index.ts","./src/pages/shipmentdetail/sensordatacards/sensordatacards.tsx","./src/pages/shipmentdetail/shareqrcodemodal/shareqrcodemodal.tsx","./src/pages/shipmentdetail/shipmentdetailheader/shipmentdetailheader.tsx","./src/pages/shipmentdetail/shipmentdetailheader/index.ts","./src/pages/shipmentdetail/shipmentmap/shipmentmap.test.tsx","./src/pages/shipmentdetail/shipmentmap/shipmentmap.tsx","./src/pages/shipmentdetail/shipmentstickybar/shipmentstickybar.tsx","./src/pages/shipmentdetail/shipmentstickybar/index.ts","./src/pages/shipments/shipments.tsx","./src/pages/shipments/kanbanview/shipmentskanban.tsx","./src/pages/shipments/routemap/routemap.test.tsx","./src/pages/shipments/routemap/routemap.tsx","./src/pages/shipments/shipmentfilters/shipmentfilters.tsx","./src/pages/shipments/shipmentfilters/index.ts","./src/pages/shipments/hooks/usevirtualshipments.ts","./src/pages/whatsnew/whatsnewpage.tsx","./src/pages/whatsnew/index.ts","./src/pages/auth/acceptinvitation/acceptinvitation.tsx","./src/pages/auth/emailverification/emailverification.tsx","./src/pages/auth/forgotpassword/forgotpassword.tsx","./src/pages/auth/forgotpassword/forgotpasswordpage.tsx","./src/pages/auth/login/login.tsx","./src/pages/auth/register/companyregister.tsx","./src/pages/auth/resetpassword/resetpasswordpage.tsx","./src/pages/auth/signup/signup.tsx","./src/pages/dashboard/dashboard.tsx","./src/pages/dashboard/exceptiondashboard.test.tsx","./src/pages/dashboard/exceptiondashboard.tsx","./src/pages/dashboard/company/companydashboard.test.tsx","./src/pages/dashboard/company/companydashboard.tsx","./src/pages/dashboard/company/anomalypanel/anomalyalertpanel.tsx","./src/pages/dashboard/company/calendarview/calendarview.tsx","./src/pages/dashboard/company/calendarview/index.ts","./src/pages/dashboard/company/createshipment/createshipment.test.tsx","./src/pages/dashboard/company/createshipment/createshipment.tsx","./src/pages/dashboard/company/quickactions/quickactionscard.tsx","./src/pages/dashboard/company/quickactions/index.ts","./src/pages/dashboard/company/recentactivity/recentactivityfeed.tsx","./src/pages/dashboard/company/recentshipments/recentshipments.test.tsx","./src/pages/dashboard/company/recentshipments/recentshipments.tsx","./src/pages/dashboard/company/revenuesummary/revenuesummarywidget.test.tsx","./src/pages/dashboard/company/revenuesummary/revenuesummarywidget.tsx","./src/pages/dashboard/company/scorecard/performancescorecardwidget.tsx","./src/pages/dashboard/company/settings/companysettings.tsx","./src/pages/dashboard/company/shipmentsmap/shipmentsmapwidget.tsx","./src/pages/dashboard/company/shipmentsmap/index.ts","./src/pages/dashboard/company/usermanagement/usermanagement.tsx","./src/pages/dashboard/customer/customerdashboard.test.tsx","./src/pages/dashboard/customer/customerdashboard.tsx","./src/pages/dashboard/customer/activeshipments/activeshipments.test.tsx","./src/pages/dashboard/customer/activeshipments/activeshipments.tsx","./src/pages/dashboard/customer/profile/customerprofile.tsx","./src/pages/dashboard/customer/shipmenthistory/shipmenthistory.tsx","./src/services/api/client.ts","./src/services/api/index.ts","./src/services/api/endpoints/addresses.ts","./src/services/api/endpoints/analytics.ts","./src/services/api/endpoints/anomalies.test.ts","./src/services/api/endpoints/anomalies.ts","./src/services/api/endpoints/auth.ts","./src/services/api/endpoints/ledger.test.ts","./src/services/api/endpoints/ledger.ts","./src/services/api/endpoints/notifications.ts","./src/services/api/endpoints/settlements.ts","./src/services/api/endpoints/shipmentphotos.ts","./src/services/api/endpoints/shipmenttemplates.test.ts","./src/services/api/endpoints/shipmenttemplates.ts","./src/services/api/endpoints/shipments.test.ts","./src/services/api/endpoints/shipments.ts","./src/services/api/endpoints/users.ts","./src/services/api/interceptors/authinterceptor.ts","./src/services/api/interceptors/errorinterceptor.test.ts","./src/services/api/interceptors/errorinterceptor.ts","./src/services/realtime/realtimeservice.test.ts","./src/services/realtime/realtimeservice.ts","./src/services/soroban/client.ts","./src/services/soroban/escrow.ts","./src/services/soroban/index.ts","./src/services/stellar/adapters/albedoadapter.ts","./src/services/stellar/adapters/freighteradapter.ts","./src/services/stellar/adapters/lobstradapter.ts","./src/services/stellar/adapters/index.ts","./src/services/stellar/adapters/types.ts","./src/test/app.test.tsx","./src/test/setup.ts","./src/test/shipmentstatus.test.ts","./src/types/realtimeevents.ts","./src/types/savedview.ts","./src/types/shipmentphoto.ts","./src/types/shipmenttemplate.ts","./src/utils/exportshipmentpdf.ts","./src/utils/localeformat.test.ts","./src/utils/localeformat.ts","./src/utils/rbac.test.ts","./src/utils/rbac.ts","./src/utils/resolvenotificationlink.test.ts","./src/utils/resolvenotificationlink.ts","./src/utils/routecoordinates.test.ts","./src/utils/routecoordinates.ts","./src/utils/safeformat.test.ts","./src/utils/safeformat.ts","./src/utils/shipmentrisk.ts","./src/utils/shipmentstatus.test.ts","./src/utils/shipmentstatus.ts"],"errors":true,"version":"5.9.3"}
\ No newline at end of file
+{"root":["./src/app.tsx","./src/i18n.ts","./src/main.tsx","./src/vite-env.d.ts","./src/landingpage/landingpage.tsx","./src/landingpage/sections/corefeatures/corefeatures.test.tsx","./src/landingpage/sections/corefeatures/corefeatures.tsx","./src/landingpage/sections/faqsection/faqsection.tsx","./src/landingpage/sections/features/features.tsx","./src/landingpage/sections/footer/footer.tsx","./src/landingpage/sections/footer/index.ts","./src/landingpage/sections/home/home.tsx","./src/landingpage/sections/home/index.ts","./src/landingpage/sections/howitworks/howitworks.tsx","./src/landingpage/sections/logostrip/logostrip.tsx","./src/landingpage/sections/whynavin/whynavin.tsx","./src/api/activityapi.ts","./src/api/shipmentapi.test.ts","./src/api/shipmentapi.ts","./src/components/index.ts","./src/components/button/button.test.tsx","./src/components/button/button.tsx","./src/components/button/index.ts","./src/components/card/card.test.tsx","./src/components/card/card.tsx","./src/components/card/index.ts","./src/components/errorboundary/errorboundary.tsx","./src/components/errorfallback/errorfallback.tsx","./src/components/navbar/navbar.tsx","./src/components/navbar/index.ts","./src/components/themetoggle/themetoggle.tsx","./src/components/address-book/addressbookpickermodal.tsx","./src/components/auth/roleguard.test.tsx","./src/components/auth/roleguard.tsx","./src/components/auth/protectedroute/protectedroute.test.tsx","./src/components/auth/protectedroute/protectedroute.tsx","./src/components/auth/protectedroute/index.ts","./src/components/auth/sessiontimeoutmodal/sessiontimeoutmodal.tsx","./src/components/auth/sessiontimeoutmodal/index.ts","./src/components/auth/walletconnectbutton/walletconnectbutton.tsx","./src/components/auth/walletconnectbutton/index.ts","./src/components/command-palette/commandpalette.tsx","./src/components/command-palette/index.ts","./src/components/common/breadcrumb/breadcrumb.tsx","./src/components/common/breadcrumb/index.ts","./src/components/common/breadcrumb/types.ts","./src/components/common/datatable/datatable.example.tsx","./src/components/common/datatable/datatable.tsx","./src/components/common/datatable/index.ts","./src/components/common/datatable/types.ts","./src/components/common/emptystate/emptystate.tsx","./src/components/common/emptystate/index.ts","./src/components/common/emptystate/types.ts","./src/components/common/globalsearch/globalsearch.tsx","./src/components/common/globalsearch/index.ts","./src/components/common/modal/modal.test.tsx","./src/components/common/modal/modal.tsx","./src/components/common/modal/index.ts","./src/components/common/offlinebanner/offlinebanner.tsx","./src/components/common/offlinebanner/index.ts","./src/components/common/pagination/pagination.example.tsx","./src/components/common/pagination/pagination.tsx","./src/components/common/pagination/index.ts","./src/components/common/pagination/types.ts","./src/components/common/shortcutshelpmodal/shortcutshelpmodal.tsx","./src/components/common/slowconnectionbanner/slowconnectionbanner.tsx","./src/components/common/slowconnectionbanner/index.ts","./src/components/common/statusbadge/statusbadge.test.tsx","./src/components/common/statusbadge/statusbadge.tsx","./src/components/common/statusbadge/index.ts","./src/components/common/statusbadge/statusbadgevariants.ts","./src/components/dashboard/charts/deliverysuccesschart/deliverysuccesschart.test.tsx","./src/components/dashboard/charts/deliverysuccesschart/deliverysuccesschart.tsx","./src/components/dashboard/charts/deliverysuccesschart/index.ts","./src/components/dashboard/charts/deliverysuccesschart/mockdeliverydata.ts","./src/components/dashboard/charts/shipmentvolumechart/shipmentvolumechart.test.tsx","./src/components/dashboard/charts/shipmentvolumechart/shipmentvolumechart.tsx","./src/components/dashboard/charts/shipmentvolumechart/index.ts","./src/components/dashboard/charts/shipmentvolumechart/mockvolumedata.ts","./src/components/dashboard/costperroutewidget/costperroutewidget.test.tsx","./src/components/dashboard/costperroutewidget/costperroutewidget.tsx","./src/components/dashboard/costperroutewidget/routeshipmentsmodal.tsx","./src/components/dashboard/costperroutewidget/costperrouteutils.test.ts","./src/components/dashboard/costperroutewidget/costperrouteutils.ts","./src/components/dashboard/costperroutewidget/index.ts","./src/components/dashboard/costperroutewidget/mockcostperroutedata.ts","./src/components/dashboard/deliveryperformancewidget/deliveryperformancewidget.tsx","./src/components/dashboard/deliveryperformancewidget/index.ts","./src/components/dashboard/deliveryperformancewidget/mockperformancedata.ts","./src/components/dashboard/recentactivitypanel/recentactivitypanel.tsx","./src/components/dashboard/recentactivitypanel/index.ts","./src/components/dashboard/revenuetargetwidget/revenuetargetwidget.test.tsx","./src/components/dashboard/revenuetargetwidget/revenuetargetwidget.tsx","./src/components/dashboard/revenuetargetwidget/index.ts","./src/components/dashboard/revenuetargetwidget/mockrevenuetargetdata.ts","./src/components/dashboard/revenuetargetwidget/revenuetargetutils.test.ts","./src/components/dashboard/revenuetargetwidget/revenuetargetutils.ts","./src/components/dashboard/shipmentvolumetrendwidget/shipmentvolumetrendwidget.test.tsx","./src/components/dashboard/shipmentvolumetrendwidget/shipmentvolumetrendwidget.tsx","./src/components/dashboard/shipmentvolumetrendwidget/index.ts","./src/components/dashboard/shipmentvolumetrendwidget/mocktrenddata.ts","./src/components/dashboard/statcard/statcard.tsx","./src/components/dashboard/statcard/index.ts","./src/components/dashboard/widgetrefreshindicator/widgetrefreshindicator.tsx","./src/components/dashboard/widgetrefreshindicator/index.ts","./src/components/layout/animatedpage.test.tsx","./src/components/layout/animatedpage.tsx","./src/components/layout/dashboardlayout.tsx","./src/components/layout/sidebar/sidebar.tsx","./src/components/layout/sidebar/index.ts","./src/components/layout/topheader/topheader.tsx","./src/components/layout/topheader/index.ts","./src/components/notifications/notificationbulkactionbar/notificationbulkactionbar.tsx","./src/components/notifications/notificationdropdown/notificationdropdown.test.tsx","./src/components/notifications/notificationdropdown/notificationdropdown.tsx","./src/components/notifications/notificationdropdown/index.ts","./src/components/notifications/toast/toast.test.tsx","./src/components/notifications/toast/toast.tsx","./src/components/onboarding/onboardingchecklist.tsx","./src/components/onboarding/onboardingtour.tsx","./src/components/onboarding/index.ts","./src/components/saved-views/savedviewspanel.tsx","./src/components/saved-views/index.ts","./src/components/settings/settingssection.tsx","./src/components/settings/index.ts","./src/components/shipment/etacountdown.tsx","./src/components/shipment/milestonetimeline.tsx","./src/components/shipment/bulkactionbar/bulkactionbar.tsx","./src/components/shipment/bulkactionbar/index.ts","./src/components/shipment/bulkstatusmodal/bulkstatusmodal.tsx","./src/components/shipment/bulkstatusmodal/index.ts","./src/components/shipment/costbreakdown/costbreakdown.tsx","./src/components/shipment/deliveryconfirmation/deliveryconfirmation.test.tsx","./src/components/shipment/deliveryconfirmation/deliveryconfirmation.tsx","./src/components/shipment/eventannotation/eventannotation.tsx","./src/components/shipment/eventannotation/index.ts","./src/components/shipment/milestonetimeline/milestonetimeline.tsx","./src/components/shipment/milestonetimeline/index.ts","./src/components/shipment/overdueshipmentbadge/overdueshipmentbadge.tsx","./src/components/shipment/overdueshipmentbadge/index.ts","./src/components/shipment/prioritybadge/prioritybadge.tsx","./src/components/shipment/prioritybadge/index.ts","./src/components/shipment/quickactionpanel/quickactionpanel.tsx","./src/components/shipment/quickactionpanel/index.ts","./src/components/shipment/savetemplatemodal/savetemplatemodal.tsx","./src/components/shipment/shipmentactionmenu/shipmentactionmenu.tsx","./src/components/shipment/shipmentactionmenu/index.ts","./src/components/shipment/shipmentcomparison/shipmentcomparison.tsx","./src/components/shipment/shipmentsummaryprint/shipmentsummaryprint.tsx","./src/components/shipment/shipmentsummaryprint/index.ts","./src/components/shipment/statusupdate/statusupdate.test.tsx","./src/components/shipment/statusupdate/statusupdate.tsx","./src/components/shipment/statusupdate/index.ts","./src/components/shipment/trackingtimeline/trackingtimeline.example.tsx","./src/components/shipment/trackingtimeline/trackingtimeline.test.tsx","./src/components/shipment/trackingtimeline/trackingtimeline.tsx","./src/components/shipment/trackingtimeline/index.ts","./src/components/ui/accessrestrictedbadge.tsx","./src/components/ui/avatar.tsx","./src/components/ui/breadcrumb.tsx","./src/components/ui/combobox.tsx","./src/components/ui/connectionstatusdot.tsx","./src/components/ui/copytoclipboard.tsx","./src/components/ui/drawer.tsx","./src/components/ui/exportdropdown.tsx","./src/components/ui/inlineeditfield.tsx","./src/components/ui/liveregion.tsx","./src/components/ui/pwainstallprompt.tsx","./src/components/ui/pageskeleton.tsx","./src/components/ui/passwordstrengthmeter.tsx","./src/components/ui/prioritybadge.tsx","./src/components/ui/roleaccessinfo.tsx","./src/components/ui/routetransition.tsx","./src/components/ui/searchinput.test.tsx","./src/components/ui/searchinput.tsx","./src/components/ui/staledatabanner.tsx","./src/components/ui/tag.test.tsx","./src/components/ui/tag.tsx","./src/components/ui/tooltip.tsx","./src/components/ui/autosavebanner/autosavebanner.tsx","./src/components/ui/autosavebanner/index.ts","./src/components/ui/charterror/charterror.tsx","./src/components/ui/charterror/index.ts","./src/components/ui/chartloading/chartloading.tsx","./src/components/ui/chartloading/index.ts","./src/components/ui/chip/chip.tsx","./src/components/ui/chip/chipgroup.tsx","./src/components/ui/chip/index.ts","./src/components/ui/circularprogress/circularprogress.test.tsx","./src/components/ui/circularprogress/circularprogress.tsx","./src/components/ui/circularprogress/index.ts","./src/components/ui/confirmdialog/confirmdialog.tsx","./src/components/ui/confirmdialog/index.ts","./src/components/ui/datatable/datatable.tsx","./src/components/ui/datatable/index.ts","./src/components/ui/datatable/types.ts","./src/components/ui/daterangepicker/daterangepicker.tsx","./src/components/ui/daterangepicker/index.ts","./src/components/ui/emptystate/emptystate.test.tsx","./src/components/ui/emptystate/emptystate.tsx","./src/components/ui/emptystate/index.ts","./src/components/ui/fileupload/fileupload.test.tsx","./src/components/ui/fileupload/fileupload.tsx","./src/components/ui/fileupload/index.ts","./src/components/ui/inlineedit/inlineedit.tsx","./src/components/ui/inlineedit/index.ts","./src/components/ui/multiselect/multiselect.test.tsx","./src/components/ui/multiselect/multiselect.tsx","./src/components/ui/multiselect/index.ts","./src/components/ui/progressbar/progressbar.test.tsx","./src/components/ui/progressbar/progressbar.tsx","./src/components/ui/progressbar/index.ts","./src/components/ui/progressstepper/progressstepper.tsx","./src/components/ui/progressstepper/index.ts","./src/components/ui/richcharttooltip/richcharttooltip.tsx","./src/components/ui/richcharttooltip/index.ts","./src/components/ui/skeleton/cardskeleton.tsx","./src/components/ui/skeleton/dashboardwidgetskeleton.tsx","./src/components/ui/skeleton/profileskeleton.tsx","./src/components/ui/skeleton/shipmentcardskeleton.tsx","./src/components/ui/skeleton/skeleton.tsx","./src/components/ui/skeleton/tablerowskeleton.tsx","./src/components/ui/skeleton/tableskeleton.tsx","./src/components/ui/skeleton/index.ts","./src/components/ui/statusbadge/statusbadge.test.tsx","./src/components/ui/statusbadge/statusbadge.tsx","./src/components/ui/statusbadge/index.ts","./src/components/wallet/networkbadge.tsx","./src/components/wallet/walletmodal.tsx","./src/components/wallet/walletpill.tsx","./src/context/authcontext.tsx","./src/context/liveregioncontext.tsx","./src/context/routetransitioncontext.tsx","./src/context/toastcontext.tsx","./src/context/walletcontext.tsx","./src/hooks/index.ts","./src/hooks/useauth.test.ts","./src/hooks/useauth.ts","./src/hooks/usebulkselection.ts","./src/hooks/usefocustrap.ts","./src/hooks/useformautosave.ts","./src/hooks/useformdraft.ts","./src/hooks/usekeyboardshortcuts.ts","./src/hooks/useonlinestatus.ts","./src/hooks/useoptimisticupdate.ts","./src/hooks/usepagination.test.ts","./src/hooks/usepagination.ts","./src/hooks/userealtimeevents.ts","./src/hooks/usereturningvisitor.ts","./src/hooks/usesavedviews.ts","./src/hooks/usescrollspy.ts","./src/hooks/useshipmentdetail.test.ts","./src/hooks/useshipmentdetail.ts","./src/hooks/useshipmenttemplates.ts","./src/hooks/useshipmenttracking.ts","./src/hooks/useslowconnection.ts","./src/hooks/usetheme.ts","./src/hooks/usewidgetcache.ts","./src/hooks/usewidgetrefresh.ts","./src/pages/analytics/analytics.tsx","./src/pages/analytics/analyticsfilters.tsx","./src/pages/analytics/revenueanalytics.test.tsx","./src/pages/analytics/revenueanalytics.tsx","./src/pages/blockchainledger/blockchainledger.test.tsx","./src/pages/blockchainledger/blockchainledger.tsx","./src/pages/blockchainledger/hooks/useledger.ts","./src/pages/componentdemos/confirmdialogdemo/confirmdialogdemo.tsx","./src/pages/componentdemos/paginationdemo/paginationdemo.tsx","./src/pages/componentdemos/skeletondemo/skeletondemo.tsx","./src/pages/helpcenter/helpcenter.tsx","./src/pages/home/home.tsx","./src/pages/notfound/notfoundpage.tsx","./src/pages/notfound/index.ts","./src/pages/notifications/notificationspage.tsx","./src/pages/payments/paymentdetailmodal/paymentdetailmodal.tsx","./src/pages/payments/paymenthistory/paymenthistory.tsx","./src/pages/payments/paymentsummarycards/paymentsummarycards.tsx","./src/pages/payments/paymentsummarycards/index.ts","./src/pages/publictracking/publictrackingpage.tsx","./src/pages/publictracking/index.ts","./src/pages/settings/settings.tsx","./src/pages/settings/companyprofile/companyprofile.test.tsx","./src/pages/settings/companyprofile/companyprofile.tsx","./src/pages/settings/notificationpreferences/notificationpreferences.test.tsx","./src/pages/settings/notificationpreferences/notificationpreferences.tsx","./src/pages/settings/hooks/usesettings.ts","./src/pages/settings/sections/addressbooksection.tsx","./src/pages/settings/sections/apikeyssection.tsx","./src/pages/settings/sections/appearancesection.tsx","./src/pages/settings/sections/dangerzone.tsx","./src/pages/settings/sections/mytemplatessection.tsx","./src/pages/settings/sections/notificationssection.tsx","./src/pages/settings/sections/profilesection.tsx","./src/pages/settings/sections/teamsection.tsx","./src/pages/settings/sections/walletssection.tsx","./src/pages/settings/sections/securitysection/changepasswordform.tsx","./src/pages/settings/sections/securitysection/securitysection.tsx","./src/pages/settings/sections/securitysection/sessionlist.tsx","./src/pages/settings/sections/securitysection/twofactorsetup.tsx","./src/pages/settlements/settlements.tsx","./src/pages/settlements/components/paymentdetailmodal.tsx","./src/pages/settlements/components/index.ts","./src/pages/shipment/shipmentdetail.tsx","./src/pages/shipment/sections/disputeform/disputeform.tsx","./src/pages/shipment/sections/disputeform/index.ts","./src/pages/shipment/sections/documentssection/documentssection.tsx","./src/pages/shipment/sections/iotpanel/anomalyalertbanner.tsx","./src/pages/shipment/sections/iotpanel/gpsroutemap.tsx","./src/pages/shipment/sections/iotpanel/iotpanel.tsx","./src/pages/shipment/sections/iotpanel/iotsummarycards.tsx","./src/pages/shipment/sections/iotpanel/shockeventstimeline.tsx","./src/pages/shipment/sections/iotpanel/temperaturehumiditychart.tsx","./src/pages/shipment/sections/iotpanel/hooks/usetelemetry.ts","./src/pages/shipment/sections/milestonetimeline/milestonetimeline.test.tsx","./src/pages/shipment/sections/milestonetimeline/milestonetimeline.tsx","./src/pages/shipment/sections/milestonetimeline/types.ts","./src/pages/shipment/sections/notessection/notessection.tsx","./src/pages/shipment/sections/printview/shipmentprintview.tsx","./src/pages/shipment/sections/shipmentheader/shipmentheader.tsx","./src/pages/shipmentdetail/shipmentdetail.tsx","./src/pages/shipmentdetail/index.ts","./src/pages/shipmentdetail/deliveryproofupload/deliveryproofupload.tsx","./src/pages/shipmentdetail/documentssection/documentssection.tsx","./src/pages/shipmentdetail/escrowstatus/escrowstatus.tsx","./src/pages/shipmentdetail/milestonetimeline/milestonetimeline.example.tsx","./src/pages/shipmentdetail/milestonetimeline/milestonetimeline.test.tsx","./src/pages/shipmentdetail/milestonetimeline/milestonetimeline.tsx","./src/pages/shipmentdetail/paymentstatus/paymentstatus.tsx","./src/pages/shipmentdetail/photossection/photossection.tsx","./src/pages/shipmentdetail/photossection/index.ts","./src/pages/shipmentdetail/sensordatacards/sensordatacards.tsx","./src/pages/shipmentdetail/shareqrcodemodal/shareqrcodemodal.tsx","./src/pages/shipmentdetail/shipmentdetailheader/shipmentdetailheader.tsx","./src/pages/shipmentdetail/shipmentdetailheader/index.ts","./src/pages/shipmentdetail/shipmentmap/shipmentmap.test.tsx","./src/pages/shipmentdetail/shipmentmap/shipmentmap.tsx","./src/pages/shipmentdetail/shipmentstickybar/shipmentstickybar.tsx","./src/pages/shipmentdetail/shipmentstickybar/index.ts","./src/pages/shipments/shipments.tsx","./src/pages/shipments/kanbanview/shipmentskanban.tsx","./src/pages/shipments/routemap/routemap.test.tsx","./src/pages/shipments/routemap/routemap.tsx","./src/pages/shipments/shipmentfilters/shipmentfilters.tsx","./src/pages/shipments/shipmentfilters/index.ts","./src/pages/shipments/hooks/usevirtualshipments.ts","./src/pages/whatsnew/whatsnewpage.tsx","./src/pages/whatsnew/index.ts","./src/pages/auth/acceptinvitation/acceptinvitation.tsx","./src/pages/auth/emailverification/emailverification.tsx","./src/pages/auth/forgotpassword/forgotpassword.tsx","./src/pages/auth/forgotpassword/forgotpasswordpage.tsx","./src/pages/auth/login/login.tsx","./src/pages/auth/register/companyregister.tsx","./src/pages/auth/resetpassword/resetpasswordpage.tsx","./src/pages/auth/signup/signup.tsx","./src/pages/dashboard/dashboard.tsx","./src/pages/dashboard/exceptiondashboard.test.tsx","./src/pages/dashboard/exceptiondashboard.tsx","./src/pages/dashboard/company/companydashboard.test.tsx","./src/pages/dashboard/company/companydashboard.tsx","./src/pages/dashboard/company/anomalypanel/anomalyalertpanel.tsx","./src/pages/dashboard/company/calendarview/calendarview.tsx","./src/pages/dashboard/company/calendarview/index.ts","./src/pages/dashboard/company/createshipment/createshipment.test.tsx","./src/pages/dashboard/company/createshipment/createshipment.tsx","./src/pages/dashboard/company/quickactions/quickactionscard.tsx","./src/pages/dashboard/company/quickactions/index.ts","./src/pages/dashboard/company/recentactivity/recentactivityfeed.tsx","./src/pages/dashboard/company/recentshipments/recentshipments.test.tsx","./src/pages/dashboard/company/recentshipments/recentshipments.tsx","./src/pages/dashboard/company/revenuesummary/revenuesummarywidget.test.tsx","./src/pages/dashboard/company/revenuesummary/revenuesummarywidget.tsx","./src/pages/dashboard/company/scorecard/performancescorecardwidget.tsx","./src/pages/dashboard/company/settings/companysettings.tsx","./src/pages/dashboard/company/shipmentsmap/shipmentsmapwidget.tsx","./src/pages/dashboard/company/shipmentsmap/index.ts","./src/pages/dashboard/company/usermanagement/usermanagement.tsx","./src/pages/dashboard/customer/customerdashboard.test.tsx","./src/pages/dashboard/customer/customerdashboard.tsx","./src/pages/dashboard/customer/activeshipments/activeshipments.test.tsx","./src/pages/dashboard/customer/activeshipments/activeshipments.tsx","./src/pages/dashboard/customer/profile/customerprofile.tsx","./src/pages/dashboard/customer/shipmenthistory/shipmenthistory.tsx","./src/services/api/client.ts","./src/services/api/index.ts","./src/services/api/endpoints/addresses.ts","./src/services/api/endpoints/analytics.ts","./src/services/api/endpoints/anomalies.test.ts","./src/services/api/endpoints/anomalies.ts","./src/services/api/endpoints/auth.ts","./src/services/api/endpoints/ledger.test.ts","./src/services/api/endpoints/ledger.ts","./src/services/api/endpoints/notifications.ts","./src/services/api/endpoints/settlements.ts","./src/services/api/endpoints/shipmentphotos.ts","./src/services/api/endpoints/shipmenttemplates.test.ts","./src/services/api/endpoints/shipmenttemplates.ts","./src/services/api/endpoints/shipments.test.ts","./src/services/api/endpoints/shipments.ts","./src/services/api/endpoints/users.ts","./src/services/api/interceptors/authinterceptor.ts","./src/services/api/interceptors/errorinterceptor.test.ts","./src/services/api/interceptors/errorinterceptor.ts","./src/services/realtime/realtimeservice.test.ts","./src/services/realtime/realtimeservice.ts","./src/services/soroban/client.ts","./src/services/soroban/escrow.ts","./src/services/soroban/index.ts","./src/services/stellar/adapters/albedoadapter.ts","./src/services/stellar/adapters/freighteradapter.ts","./src/services/stellar/adapters/lobstradapter.ts","./src/services/stellar/adapters/index.ts","./src/services/stellar/adapters/types.ts","./src/test/app.test.tsx","./src/test/setup.ts","./src/test/shipmentstatus.test.ts","./src/types/realtimeevents.ts","./src/types/savedview.ts","./src/types/shipmentphoto.ts","./src/types/shipmenttemplate.ts","./src/utils/exportshipmentpdf.ts","./src/utils/localeformat.test.ts","./src/utils/localeformat.ts","./src/utils/rbac.test.ts","./src/utils/rbac.ts","./src/utils/resolvenotificationlink.test.ts","./src/utils/resolvenotificationlink.ts","./src/utils/routecoordinates.test.ts","./src/utils/routecoordinates.ts","./src/utils/safeformat.test.ts","./src/utils/safeformat.ts","./src/utils/shipmentrisk.ts","./src/utils/shipmentstatus.test.ts","./src/utils/shipmentstatus.ts"],"errors":true,"version":"5.9.3"}