Merge remote-tracking branch 'origin/MC-38925' into 2.4-develop-pr46

Author: serhii-balko

app/code/Magento/Customer/ViewModel/Customer/Store.php

@@ -113,7 +113,12 @@ private function getStoreOptionsWithCurrentWebsiteId(): array
         if (!empty($this->dataPersistor->get('customer')['account'])) {
             $currentWebsiteId = (string)$this->dataPersistor->get('customer')['account']['website_id'];
         } else {
-            $currentWebsiteId = $this->storeManager->getDefaultStoreView()->getWebsiteId();
+            $defaultStore = $this->storeManager->getDefaultStoreView();
+            if (!$defaultStore) {
+                $stores = $this->storeManager->getStores();
+                $defaultStore = array_shift($stores);
+            }
+            $currentWebsiteId = $defaultStore->getWebsiteId();
         }
 
         foreach ($options as $key => $option) {

dev/tests/integration/testsuite/Magento/Store/_files/second_website_with_store_group_and_store.php

@@ -56,5 +56,6 @@
 $storeResource->save($store);
 /* Refresh CatalogSearch index */
 /** @var IndexerRegistry $indexerRegistry */
+$storeManager->reinitStores();
 $indexerRegistry = $objectManager->get(IndexerRegistry::class);
 $indexerRegistry->get(Fulltext::INDEXER_ID)->reindexAll();