ACP2E-3541: "Something went wrong" error on checkout for inactive company

Author: aplapana

app/code/Magento/Theme/Plugin/LoadDesignPlugin.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright 2024 Adobe
- * All Rights Reserved.
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
  */
 
 namespace Magento\Theme\Plugin;
@@ -21,12 +21,12 @@ class LoadDesignPlugin
     /**
      * @var DesignLoader
      */
-    private DesignLoader $designLoader;
+    private $designLoader;
 
     /**
      * @var MessageManagerInterface
      */
-    private MessageManagerInterface $messageManager;
+    private $messageManager;
 
     /**
      * @param DesignLoader $designLoader
@@ -59,8 +59,6 @@ public function beforeExecute(ActionInterface $subject)
                     ->setText($e->getMessage());
                 $this->messageManager->addUniqueMessages([$message]);
             }
-        } catch (\InvalidArgumentException $e) {
-            $this->messageManager->addErrorMessage($e->getMessage());
         }
     }
 }

app/code/Magento/Theme/Test/Unit/Plugin/LoadDesignPluginTest.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright 2024 Adobe
- * All Rights Reserved.
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
  */
 namespace Magento\Theme\Test\Unit\Plugin;
 
@@ -10,17 +10,12 @@
 use Magento\Framework\Message\ManagerInterface;
 use Magento\Framework\View\DesignLoader;
 use Magento\Theme\Plugin\LoadDesignPlugin;
-use PHPUnit\Framework\MockObject\Exception;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
 class LoadDesignPluginTest extends TestCase
 {
-    /**
-     * @return void
-     * @throws Exception
-     */
-    public function testBeforeExecute(): void
+    public function testBeforeExecute()
     {
         /** @var MockObject|ActionInterface $actionMock */
         $actionMock = $this->createMock(Action::class);
@@ -36,32 +31,4 @@ public function testBeforeExecute(): void
         $designLoaderMock->expects($this->once())->method('load');
         $plugin->beforeExecute($actionMock);
     }
-
-    /**
-     * @return void
-     * @throws Exception
-     */
-    public function testBeforeExecuteNotThrowException(): void
-    {
-        /** @var MockObject|ActionInterface $actionMock */
-        $actionMock = $this->createMock(Action::class);
-
-        /** @var MockObject|DesignLoader $designLoaderMock */
-        $designLoaderMock = $this->createMock(DesignLoader::class);
-
-        /** @var MockObject|ManagerInterface $messageManagerMock */
-        $messageManagerMock = $this->createMock(ManagerInterface::class);
-
-        $plugin = new LoadDesignPlugin($designLoaderMock, $messageManagerMock);
-
-        $exceptionMessage = 'test message';
-        $designLoaderMock->expects($this->once())
-            ->method('load')
-            ->willThrowException(new \InvalidArgumentException($exceptionMessage));
-        $messageManagerMock->expects($this->once())
-            ->method('addErrorMessage')
-            ->with($exceptionMessage);
-
-        $plugin->beforeExecute($actionMock);
-    }
 }

app/code/Magento/Theme/etc/adminhtml/di.xml

@@ -37,4 +37,7 @@
         <plugin name="validate_design_config"
                 type="Magento\Theme\Plugin\DesignProcessorFacade"/>
     </type>
+    <type name="Magento\Framework\App\ActionInterface">
+        <plugin name="designLoader" type="Magento\Theme\Plugin\LoadDesignPlugin"/>
+    </type>
 </config>

app/code/Magento/Theme/etc/di.xml

@@ -106,9 +106,6 @@
             <argument name="scope" xsi:type="const">Magento\Store\Model\ScopeInterface::SCOPE_STORE</argument>
         </arguments>
     </virtualType>
-    <type name="Magento\Framework\App\ActionInterface">
-        <plugin name="designLoader" type="Magento\Theme\Plugin\LoadDesignPlugin"/>
-    </type>
     <type name="Magento\Framework\View\Element\UiComponent\DataProvider\CollectionFactory">
         <arguments>
              <argument name="collections" xsi:type="array">

app/code/Magento/Theme/etc/frontend/di.xml

@@ -35,4 +35,7 @@
             <argument name="filePath" xsi:type="string">css/critical.css</argument>
         </arguments>
     </type>
+    <type name="Magento\Framework\App\ActionInterface">
+        <plugin name="designLoader" type="Magento\Theme\Plugin\LoadDesignPlugin"/>
+    </type>
 </config>