From 75d32e4dad0b3e0e15e6e3c186714445e1dc37b2 Mon Sep 17 00:00:00 2001
From: Zin Bo Thit <zinbothit.git@gmail.com>
Date: Thu, 3 Sep 2026 10:23:44 +0630
Subject: [PATCH] Fix nil current shop in header

---
 app/views/layouts/_header.html.erb | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
index 96005b92..2b02d17c 100755
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -200,7 +200,10 @@
             </a>
         </div>
         <div class="navbar-center-section">
-            <%= Shop.current_shop.name %>
+            <% shop = nil %>
+            <% shop = current_shop if respond_to?(:current_shop) %>
+            <% shop ||= Shop.current_shop if Shop.respond_to?(:current_shop) %>
+            <%= shop&.name.to_s %>
         </div>
         <div class="navbar-right-section">
             <%# Connection Status %>