Merge remote-tracking branch 'origin/AC-2619' into gl_pr_arrows_april21_2022

Author: rimple-saini

app/code/Magento/Persistent/view/frontend/web/js/view/additional-welcome.js

@@ -15,9 +15,7 @@ define([
          * Init.
          */
         init: function () {
-            customerData.reload(['persistent','cart'], true);
-
-            let persistent = customerData.get('persistent');
+            var persistent = customerData.get('persistent');
 
             if (persistent().fullname === undefined) {
                 customerData.get('persistent').subscribe(this.replacePersistentWelcome);
@@ -30,7 +28,7 @@ define([
          * Replace welcome message for customer with persistent cookie.
          */
         replacePersistentWelcome: function () {
-            let persistent = customerData.get('persistent'),
+            var persistent = customerData.get('persistent'),
                 welcomeElems;
 
             if (persistent().fullname !== undefined) {

app/code/Magento/Persistent/view/frontend/web/js/view/customer-data-mixin.js

@@ -39,6 +39,20 @@ define([
             }
 
             return expiredSections;
+        },
+
+        /**
+         * @param {Object} settings
+         * @constructor
+         */
+        'Magento_Customer/js/customer-data': function (originFn) {
+            let mageCacheTimeout = new Date($.localStorage.get('mage-cache-timeout')),
+                mageCacheSessId = $.cookieStorage.isSet('mage-cache-sessid');
+
+            originFn();
+            if (window.persistent !== undefined && (mageCacheTimeout < new Date() || !mageCacheSessId)) {
+                this.reload(['persistent','cart'],true);
+            }
         }
     };