From 32cb1aa3aea65c51a058abed1d78dec77a8113b6 Mon Sep 17 00:00:00 2001
From: Damian Legawiec <damian@getvendo.com>
Date: Thu, 2 May 2024 22:43:41 +0200
Subject: [PATCH] header fixes

---
 Gemfile                                              | 2 +-
 app/views/spree/admin/shared/_account_nav.html.erb   | 4 ++--
 app/views/spree/admin/shared/_header.html.erb        | 2 +-
 spec/features/admin/products/edit/properties_spec.rb | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Gemfile b/Gemfile
index 63ba1d3513..f4074a3d0a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -19,7 +19,7 @@ platforms :ruby do
   elsif ENV['DB'] == 'postgres'
     gem 'pg'
   else
-    gem 'sqlite3'
+    gem 'sqlite3', '~> 1.4'
   end
 end
 
diff --git a/app/views/spree/admin/shared/_account_nav.html.erb b/app/views/spree/admin/shared/_account_nav.html.erb
index 241b1ba629..087bbb861c 100644
--- a/app/views/spree/admin/shared/_account_nav.html.erb
+++ b/app/views/spree/admin/shared/_account_nav.html.erb
@@ -7,7 +7,7 @@
 
     <div class="dropdown-menu dropdown-menu-right overflow-hidden mt-2 p-0 mr-2">
       <div class="dropdown-item px-0 text-center bg-light">
-        <span class="d-block"><%= try_spree_current_user.email %></span>
+        <span class="d-block"><%= try_spree_current_user.try(:email) %></span>
       </div>
       <div class="dropdown-divider m-0"></div>
 
@@ -19,7 +19,7 @@
           <% end %>
       <% end %>
 
-      <% if can?(:manage, try_spree_current_user) %>
+      <% if can?(:manage, try_spree_current_user) && try_spree_current_user.persisted? %>
           <%= link_to spree.edit_admin_user_path(try_spree_current_user), class: 'd-block my-1 dropdown-item' do %>
             <%= svg_icon name: "user.svg", width: '14', height: '14' %>
             &nbsp;
diff --git a/app/views/spree/admin/shared/_header.html.erb b/app/views/spree/admin/shared/_header.html.erb
index a70920efee..13d16d5b1b 100644
--- a/app/views/spree/admin/shared/_header.html.erb
+++ b/app/views/spree/admin/shared/_header.html.erb
@@ -1,5 +1,5 @@
 <% if try_spree_current_user %>
-  <header class="header logged-in">
+  <header class="header logged-in" id="header-logged-in" data-turbo-permanent>
     <nav class="navbar fixed-top navbar-dark flex-nowrap bg-primary p-0">
       <div class="col p-0 d-lg-none">
         <button
diff --git a/spec/features/admin/products/edit/properties_spec.rb b/spec/features/admin/products/edit/properties_spec.rb
index 9b83aa3a20..7a69bcfefd 100644
--- a/spec/features/admin/products/edit/properties_spec.rb
+++ b/spec/features/admin/products/edit/properties_spec.rb
@@ -20,7 +20,7 @@
 
       expect(page).to have_current_path(spree.admin_product_product_properties_path(product))
       expect(page).to have_content('Add Product Properties')
-      expect(page).to have_content('SHOW PROPERTY')
+      expect(page).to have_content('Show Property')
       expect(page).to have_selector("input[value='Material']")
       expect(page).to have_selector("input[value='Leather']")
       expect(page).to have_field('product_product_properties_attributes_0_show_property', checked: true)