From 9928750bc2b23cb008219db385258a5833cada92 Mon Sep 17 00:00:00 2001
From: Mark Gregory <mark.gregory@abbeysoftware.com>
Date: Tue, 22 Sep 2026 11:12:44 +0100
Subject: [PATCH] M3 Integration fixes

---
 resources/views/layouts/partials/topbar.blade.php | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/resources/views/layouts/partials/topbar.blade.php b/resources/views/layouts/partials/topbar.blade.php
index 71325c3b..c5fc0ea6 100755
--- a/resources/views/layouts/partials/topbar.blade.php
+++ b/resources/views/layouts/partials/topbar.blade.php
@@ -1,14 +1,13 @@
 {{-- Shared Application Top Bar --}}
 @php
     $user = auth()->user();
-    $dashboardRoute =
-        Route::has('platform.dashboard') && method_exists($user, 'isMpbaPlatformAdmin') && $user?->isMpbaPlatformAdmin()
-            ? 'platform.dashboard'
-            : (Route::has('dashboard')
-                ? 'dashboard'
-                : null);
+    $isPlatformAdmin = $user !== null
+        && method_exists($user, 'isMpbaPlatformAdmin')
+        && $user->isMpbaPlatformAdmin();
+    $dashboardRoute = Route::has('platform.dashboard') && $isPlatformAdmin
+        ? 'platform.dashboard'
+        : (Route::has('dashboard') ? 'dashboard' : null);
 @endphp
-
 <header class="sticky top-0 z-40 border-b border-white/10 bg-[#111118]/95 backdrop-blur" role="banner">
     <div class="flex h-16 w-full items-center justify-between gap-3 px-3 sm:px-4 lg:px-6">
         <div class="flex min-w-0 items-center gap-3 lg:hidden">