From 5d08f8026d17e9574353ddaf4575a22a11927a0a Mon Sep 17 00:00:00 2001
From: Simon Hamp <simon.hamp@me.com>
Date: Mon, 23 Mar 2026 20:53:44 +0000
Subject: [PATCH 1/2] Fix double-escaped apostrophe in dashboard user menu

Use dynamic :name binding instead of {{ }} interpolation on Flux
profile components to prevent HTML entities being escaped twice.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 .../components/layouts/dashboard.blade.php    |  4 +--
 tests/Feature/DashboardLayoutTest.php         | 25 +++++++++++++++++++
 2 files changed, 27 insertions(+), 2 deletions(-)
 create mode 100644 tests/Feature/DashboardLayoutTest.php

diff --git a/resources/views/components/layouts/dashboard.blade.php b/resources/views/components/layouts/dashboard.blade.php
index 2714ee35..0fda420c 100644
--- a/resources/views/components/layouts/dashboard.blade.php
+++ b/resources/views/components/layouts/dashboard.blade.php
@@ -155,7 +155,7 @@ class="min-h-screen bg-white font-poppins antialiased dark:bg-zinc-900 dark:text
             </flux:sidebar.nav>
 
             <flux:dropdown position="top" align="start" class="max-lg:hidden">
-                <flux:sidebar.profile name="{{ auth()->user()->name ?? auth()->user()->email }}" />
+                <flux:sidebar.profile :name="auth()->user()->name ?? auth()->user()->email" />
 
                 <flux:menu>
                     <flux:menu.item icon="cog-6-tooth" href="{{ route('customer.settings') }}">Settings</flux:menu.item>
@@ -184,7 +184,7 @@ class="min-h-screen bg-white font-poppins antialiased dark:bg-zinc-900 dark:text
             </a>
 
             <flux:dropdown position="top" align="start">
-                <flux:profile name="{{ auth()->user()->name ?? auth()->user()->email }}" />
+                <flux:profile :name="auth()->user()->name ?? auth()->user()->email" />
 
                 <flux:menu>
                     <flux:menu.item icon="cog-6-tooth" href="{{ route('customer.settings') }}">Settings</flux:menu.item>
diff --git a/tests/Feature/DashboardLayoutTest.php b/tests/Feature/DashboardLayoutTest.php
new file mode 100644
index 00000000..3a53402c
--- /dev/null
+++ b/tests/Feature/DashboardLayoutTest.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace Tests\Feature;
+
+use App\Models\User;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Tests\TestCase;
+
+class DashboardLayoutTest extends TestCase
+{
+    use RefreshDatabase;
+
+    public function test_user_name_with_apostrophe_is_not_double_escaped_in_dashboard(): void
+    {
+        $user = User::factory()->create([
+            'name' => "Timmy D'Hooghe",
+        ]);
+
+        $response = $this->withoutVite()->actingAs($user)->get('/dashboard');
+
+        $response->assertStatus(200);
+        $response->assertDontSee('D&#039;Hooghe', false);
+        $response->assertSee("Timmy D'Hooghe", false);
+    }
+}

From 396a03e8215f53601e898fabff3aa055118863f8 Mon Sep 17 00:00:00 2001
From: Simon Hamp <simon.hamp@me.com>
Date: Mon, 23 Mar 2026 21:49:23 +0000
Subject: [PATCH 2/2] Fix test assertion to account for Flux component HTML
 escaping

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 tests/Feature/DashboardLayoutTest.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/Feature/DashboardLayoutTest.php b/tests/Feature/DashboardLayoutTest.php
index 3a53402c..a58db5c5 100644
--- a/tests/Feature/DashboardLayoutTest.php
+++ b/tests/Feature/DashboardLayoutTest.php
@@ -19,7 +19,7 @@ public function test_user_name_with_apostrophe_is_not_double_escaped_in_dashboar
         $response = $this->withoutVite()->actingAs($user)->get('/dashboard');
 
         $response->assertStatus(200);
-        $response->assertDontSee('D&#039;Hooghe', false);
-        $response->assertSee("Timmy D'Hooghe", false);
+        $response->assertDontSee('D&amp;#039;Hooghe', false);
+        $response->assertSee("Timmy D'Hooghe");
     }
 }