MC-25219: Update messages mechanism

Author: nathanjosiah

app/code/Magento/Security/view/base/web/js/escaper.js

@@ -85,11 +85,16 @@ define([], function () {
                         return NodeFilter.FILTER_ACCEPT;
                     },
                     false
-                );
+                ),
+                nodesToRemove = [];
 
             while (treeWalker.nextNode()) {
-                treeWalker.currentNode.parentNode.removeChild(treeWalker.currentNode);
+                nodesToRemove.push(treeWalker.currentNode);
             }
+
+            nodesToRemove.forEach(function (nodeToRemove) {
+                nodeToRemove.parentNode.removeChild(nodeToRemove);
+            });
         },
 
         /**

dev/tests/js/jasmine/tests/app/code/Magento/Security/view/base/web/js/escaper.test.js

@@ -97,6 +97,11 @@ define([
                 expected: 'Only <span><b>2</b></span> in stock ',
                 allowedTags: ['span', 'b']
             },
+            'text with multiple comments': {
+                data: 'Only <span><b>2</b></span> <!-- HTML COMMENT -->in stock <!-- HTML COMMENT -->',
+                expected: 'Only <span><b>2</b></span> in stock ',
+                allowedTags: ['span', 'b']
+            },
             'text with multi-line html comment': {
                 data: 'Only <span><b>2</b></span> in stock <!-- --!\n\n><img src=#>-->',
                 expected: 'Only <span><b>2</b></span> in stock ',