Merge remote-tracking branch 'l3/ACP2E-2267' into Tier4-PR-Delivery-11-18-23

Author: veloraven

app/code/Magento/Theme/view/frontend/templates/messages.phtml

@@ -18,19 +18,18 @@
     </div>
     <!-- /ko -->
 
-    <!-- ko if: messages().messages && messages().messages.length > 0 -->
     <div aria-atomic="true" role="alert" class="messages" data-bind="foreach: {
         data: messages().messages, as: 'message'
-    }">
+    }, afterRender: purgeMessages">
         <div data-bind="attr: {
             class: 'message-' + message.type + ' ' + message.type + ' message',
             'data-ui-id': 'message-' + message.type
         }">
             <div data-bind="html: $parent.prepareMessageForHtml(message.text)"></div>
         </div>
     </div>
-    <!-- /ko -->
 </div>
+
 <script type="text/x-magento-init">
     {
         "*": {

app/code/Magento/Theme/view/frontend/web/js/view/messages.js

@@ -44,11 +44,6 @@ define([
                 disposableCustomerData: 'messages'
             });
 
-            // Force to clean obsolete messages
-            if (!_.isEmpty(this.messages().messages)) {
-                customerData.set('messages', {});
-            }
-
             $.mage.cookies.set('mage-messages', '', {
                 samesite: 'strict',
                 domain: ''
@@ -63,6 +58,11 @@ define([
          */
         prepareMessageForHtml: function (message) {
             return escaper.escapeHtml(message, this.allowedTags);
+        },
+        purgeMessages: function () {
+            if (!_.isEmpty(this.messages().messages)) {
+                customerData.set('messages', {});
+            }
         }
     });
 });