ACP2E-2025: Refix ACP2E-1445 for multiple store views in the frontend.

 - Fixed the CR comments.

Author: devarul

app/code/Magento/Customer/view/frontend/layout/default.xml

@@ -50,8 +50,8 @@
             <block name="customer.customer.data"  class="Magento\Customer\Block\CustomerData"
                    template="Magento_Customer::js/customer-data.phtml">
                 <arguments>
-                    <argument name="auth_view_model" xsi:type="object">Magento\Customer\ViewModel\Customer\Auth</argument>
-                    <argument name="json_serializer_view_model" xsi:type="object">Magento\Customer\ViewModel\Customer\JsonSerializer</argument>
+                    <argument name="auth" xsi:type="object">Magento\Customer\ViewModel\Customer\Auth</argument>
+                    <argument name="json" xsi:type="object">Magento\Customer\ViewModel\Customer\JsonSerializer</argument>
                 </arguments>
             </block>
             <block name="customer.data.invalidation.rules" class="Magento\Customer\Block\CustomerScopeData"

app/code/Magento/Customer/view/frontend/templates/js/customer-data.phtml

@@ -9,10 +9,10 @@ use Magento\Framework\App\ObjectManager;
 /** @var \Magento\Customer\Block\CustomerData $block */
 
 // phpcs:disable Magento2.Templates.ThisInTemplate.FoundHelper
-/** @var Auth $authViewModel */
-$authViewModel = $block->getAuthViewModel() ?? ObjectManager::getInstance()->get(Auth::class);
-/** @var JsonSerializer $jsonSerializerViewModel */
-$jsonSerializerViewModel = $block->getJsonSerializerViewModel() ??
+/** @var Auth $auth */
+$auth = $block->getAuth() ?? ObjectManager::getInstance()->get(Auth::class);
+/** @var JsonSerializer $jsonSerializer */
+$jsonSerializer = $block->getJsonSerializer() ??
     ObjectManager::getInstance()->get(JsonSerializer::class);
 $customerDataUrl = $block->getCustomerDataUrl('customer/account/updateSession');
 $expirableSectionNames = $block->getExpirableSectionNames();
@@ -23,12 +23,12 @@ $expirableSectionNames = $block->getExpirableSectionNames();
             "Magento_Customer/js/customer-data": {
                 "sectionLoadUrl": "<?= $block->escapeJs($block->getCustomerDataUrl('customer/section/load')) ?>",
                 "expirableSectionLifetime": <?= (int)$block->getExpirableSectionLifetime() ?>,
-                "expirableSectionNames": <?= /* @noEscape */ $jsonSerializerViewModel->jsonEncode(
+                "expirableSectionNames": <?= /* @noEscape */ $jsonSerializer->jsonEncode(
                     $expirableSectionNames
                 ) ?>,
                 "cookieLifeTime": "<?= $block->escapeJs($block->getCookieLifeTime()) ?>",
                 "updateSessionUrl": "<?= $block->escapeJs($customerDataUrl) ?>",
-                "isLoggedIn": "<?= /* @noEscape */ $authViewModel->isLoggedIn() ?>"
+                "isLoggedIn": "<?= /* @noEscape */ $auth->isLoggedIn() ?>"
             }
         }
     }