From 0a8f6c4a2ff657a32344676c796d6f354773c72a Mon Sep 17 00:00:00 2001
From: Henrique Leme de Brito <henriqueleme.brito@outlook.com>
Date: Tue, 21 Jul 2026 12:16:07 -0300
Subject: [PATCH 1/2] =?UTF-8?q?fix(panel-app):=20corrige=20camada=20do=20m?=
 =?UTF-8?q?odal=20de=20unifica=C3=A7=C3=A3o?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/livewire/connection-hub.blade.php   | 70 ++++++++++---------
 1 file changed, 36 insertions(+), 34 deletions(-)

diff --git a/resources/views/livewire/connection-hub.blade.php b/resources/views/livewire/connection-hub.blade.php
index a419c0789..56bebc561 100644
--- a/resources/views/livewire/connection-hub.blade.php
+++ b/resources/views/livewire/connection-hub.blade.php
@@ -145,49 +145,51 @@ class="rounded bg-gray-100 px-1 py-0.5 font-mono text-[9px] text-gray-500 ring-1
 
     {{-- Merge Confirmation Modal --}}
     @if ($showMergeModal && $mergeTarget)
-        <div
-            x-data="{ open: true }"
-            x-show="open"
-            x-transition
-            class="fixed inset-0 z-50 flex items-center justify-center bg-black/60 p-4"
-        >
+        @teleport('body')
             <div
-                class="w-full max-w-sm rounded-xl border border-gray-200 bg-white p-6 shadow-2xl dark:border-gray-700 dark:bg-gray-900"
+                x-data="{ open: true }"
+                x-show="open"
+                x-transition
+                class="fixed inset-0 z-50 flex items-center justify-center bg-black/60 p-4"
             >
-                <div class="mb-4 flex items-center gap-2">
-                    <x-filament::icon icon="heroicon-o-link" class="h-5 w-5 text-amber-400" />
-                    <h3 class="text-base font-semibold text-gray-900 dark:text-white">Conta existente encontrada</h3>
-                </div>
-
-                <p class="mb-4 text-sm text-gray-600 dark:text-gray-300">Já existe uma conta vinculada a esse provedor:</p>
-
                 <div
-                    class="mb-4 rounded-lg border border-gray-200 bg-gray-50 p-3 dark:border-gray-700/60 dark:bg-gray-800/50"
+                    class="w-full max-w-sm rounded-xl border border-gray-200 bg-white p-6 shadow-2xl dark:border-gray-700 dark:bg-gray-900"
                 >
-                    <div class="flex items-center justify-between">
-                        <span class="text-sm font-medium text-gray-900 dark:text-white"
-                            >@ {{ $mergeTarget['username'] }}</span
-                        >
-                        <span class="text-xs text-gray-500 dark:text-gray-400">{{ $mergeTarget['created_at'] }}</span>
+                    <div class="mb-4 flex items-center gap-2">
+                        <x-filament::icon icon="heroicon-o-link" class="h-5 w-5 text-amber-400" />
+                        <h3 class="text-base font-semibold text-gray-900 dark:text-white">Conta existente encontrada</h3>
                     </div>
-                    @if ($mergeTarget['messages_count'] > 0)
-                        <div class="mt-1 text-xs text-gray-500 dark:text-gray-400">
-                            {{ number_format($mergeTarget['messages_count']) }} mensagens
+
+                    <p class="mb-4 text-sm text-gray-600 dark:text-gray-300">Já existe uma conta vinculada a esse provedor:</p>
+
+                    <div
+                        class="mb-4 rounded-lg border border-gray-200 bg-gray-50 p-3 dark:border-gray-700/60 dark:bg-gray-800/50"
+                    >
+                        <div class="flex items-center justify-between">
+                            <span class="text-sm font-medium text-gray-900 dark:text-white"
+                                >@ {{ $mergeTarget['username'] }}</span
+                            >
+                            <span class="text-xs text-gray-500 dark:text-gray-400">{{ $mergeTarget['created_at'] }}</span>
                         </div>
-                    @endif
-                </div>
+                        @if ($mergeTarget['messages_count'] > 0)
+                            <div class="mt-1 text-xs text-gray-500 dark:text-gray-400">
+                                {{ number_format($mergeTarget['messages_count']) }} mensagens
+                            </div>
+                        @endif
+                    </div>
 
-                <p class="mb-5 text-xs text-gray-500 dark:text-gray-400">Ao unificar, sua conta atual será absorvida por essa conta e você será relogado automaticamente.</p>
+                    <p class="mb-5 text-xs text-gray-500 dark:text-gray-400">Ao unificar, sua conta atual será absorvida por essa conta e você será relogado automaticamente.</p>
 
-                <div class="flex gap-2">
-                    <x-filament::button wire:click="confirmMerge" color="warning" class="flex-1">
-                        Unificar
-                    </x-filament::button>
-                    <x-filament::button wire:click="cancelMerge" color="gray" class="flex-1">
-                        Cancelar
-                    </x-filament::button>
+                    <div class="flex gap-2">
+                        <x-filament::button wire:click="confirmMerge" color="warning" class="flex-1">
+                            Unificar
+                        </x-filament::button>
+                        <x-filament::button wire:click="cancelMerge" color="gray" class="flex-1">
+                            Cancelar
+                        </x-filament::button>
+                    </div>
                 </div>
             </div>
-        </div>
+        @endteleport
     @endif
 </div>

From 2158fe44867d64bbc0222681196237bb4187a689 Mon Sep 17 00:00:00 2001
From: Henrique Leme de Brito <henriqueleme.brito@outlook.com>
Date: Thu, 23 Jul 2026 11:54:33 -0300
Subject: [PATCH 2/2] =?UTF-8?q?fix(panel-app):=20melhora=20acessibilidade?=
 =?UTF-8?q?=20do=20modal=20de=20unifica=C3=A7=C3=A3o?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tests/Feature/ConnectionHubTest.php       | 25 +++++++++++++++++++
 .../views/livewire/connection-hub.blade.php   |  3 +++
 2 files changed, 28 insertions(+)
 create mode 100644 app-modules/panel-app/tests/Feature/ConnectionHubTest.php

diff --git a/app-modules/panel-app/tests/Feature/ConnectionHubTest.php b/app-modules/panel-app/tests/Feature/ConnectionHubTest.php
new file mode 100644
index 000000000..a8dc49331
--- /dev/null
+++ b/app-modules/panel-app/tests/Feature/ConnectionHubTest.php
@@ -0,0 +1,25 @@
+<?php
+
+declare(strict_types=1);
+
+use App\Livewire\ConnectionHub;
+use He4rt\Identity\User\Models\User;
+
+use function Pest\Livewire\livewire;
+
+test('merge confirmation modal exposes accessible dialog semantics', function (): void {
+    $currentUser = User::factory()->create();
+    $mergeTarget = User::factory()->create();
+
+    $this->actingAs($currentUser);
+
+    session()->put('oauth_merge_pending', [
+        'conflicting_user_id' => $mergeTarget->id,
+    ]);
+
+    livewire(ConnectionHub::class)
+        ->assertSet('showMergeModal', value: true)
+        ->assertSeeHtml('role="dialog"')
+        ->assertSeeHtml('aria-modal="true"')
+        ->assertSeeHtml('@keydown.escape.window="$wire.cancelMerge()"');
+});
diff --git a/resources/views/livewire/connection-hub.blade.php b/resources/views/livewire/connection-hub.blade.php
index 56bebc561..2ad5b99aa 100644
--- a/resources/views/livewire/connection-hub.blade.php
+++ b/resources/views/livewire/connection-hub.blade.php
@@ -150,6 +150,9 @@ class="rounded bg-gray-100 px-1 py-0.5 font-mono text-[9px] text-gray-500 ring-1
                 x-data="{ open: true }"
                 x-show="open"
                 x-transition
+                @keydown.escape.window="$wire.cancelMerge()"
+                role="dialog"
+                aria-modal="true"
                 class="fixed inset-0 z-50 flex items-center justify-center bg-black/60 p-4"
             >
                 <div