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 © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2024 Adobe
+ * All Rights Reserved.
  */
 
 namespace Magento\Theme\Plugin;
@@ -21,12 +21,12 @@ class LoadDesignPlugin
     /**
      * @var DesignLoader
      */
-    private $designLoader;
+    private DesignLoader $designLoader;
 
     /**
      * @var MessageManagerInterface
      */
-    private $messageManager;
+    private MessageManagerInterface $messageManager;
 
     /**
      * @param DesignLoader $designLoader

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

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2024 Adobe
+ * All Rights Reserved.
  */
 namespace Magento\Theme\Test\Unit\Plugin;
 
@@ -10,12 +10,17 @@
 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
 {
-    public function testBeforeExecute()
+    /**
+     * @return void
+     * @throws Exception
+     */
+    public function testBeforeExecute(): void
     {
         /** @var MockObject|ActionInterface $actionMock */
         $actionMock = $this->createMock(Action::class);
@@ -31,4 +36,32 @@ public function testBeforeExecute()
         $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);
+    }
 }