From 89ac265f7482394b6bc2926b4bf826099011c46e Mon Sep 17 00:00:00 2001
From: Sullivan <sullivan.monteiro@prestashop.com>
Date: Wed, 10 Jul 2024 11:10:11 +0200
Subject: [PATCH] fix: remove deprecated array merge on smarty

---
 .../admin/controllers/module_catalog/catalog.html.twig     | 7 ++++++-
 views/templates/hook/dashboard-zone-one.tpl                | 7 ++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/views/templates/admin/controllers/module_catalog/catalog.html.twig b/views/templates/admin/controllers/module_catalog/catalog.html.twig
index 496783766..12b913df2 100644
--- a/views/templates/admin/controllers/module_catalog/catalog.html.twig
+++ b/views/templates/admin/controllers/module_catalog/catalog.html.twig
@@ -32,9 +32,10 @@
       {# PrestaShop Account #}
       <script src="{{ urlAccountsCdn }}" rel=preload></script>
       <script>
+        var psAccountLoaded = false;
         if (window?.psaccountsVue) {
           window?.psaccountsVue?.init();
-          {% set shop_context = shop_context|merge({'accounts_component_loaded': true}) %}
+          psAccountLoaded = true;
         }
       </script>
     {% endif %}
@@ -51,6 +52,10 @@
 
         const context = {{ shop_context|json_encode()|raw }};
 
+        if (psAccountLoaded) {
+          context.accounts_component_loaded = true;
+        }
+
         renderModules(context, '#cdc-container')
       }
     </script>
diff --git a/views/templates/hook/dashboard-zone-one.tpl b/views/templates/hook/dashboard-zone-one.tpl
index 368aeb64e..ffdd6c3ad 100644
--- a/views/templates/hook/dashboard-zone-one.tpl
+++ b/views/templates/hook/dashboard-zone-one.tpl
@@ -38,9 +38,10 @@
 {if isset($urlAccountsCdn)}
   <script src="{$urlAccountsCdn}" rel=preload></script>
   <script>
+    var psAccountLoaded = false;
     if (window?.psaccountsVue) {
       window?.psaccountsVue?.init();
-      {assign shop_context $shop_context|@json_decode:true|array_merge:['accounts_component_loaded' => true]|@json_encode}
+      psAccountLoaded = true;
     }
   </script>
 {/if}
@@ -57,6 +58,10 @@
 
     const dashboardTipsAndUpdateContext = {$shop_context};
 
+    if (psAccountLoaded) {
+      dashboardTipsAndUpdateContext.accounts_component_loaded = true;
+    }
+
     renderTipsAndUpdate(dashboardTipsAndUpdateContext, '#cdc-tips-and-update-container')
   }
 </script>