diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index f12fea87..0a9bb8df 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -15,7 +15,7 @@ jobs:
         php-version: [8.2,8.3]
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
@@ -23,7 +23,46 @@ jobs:
         uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php-version }}
-          tools: composer:v1
+          tools: composer:v2
+
+      - name: Define Hyvä Checkout repositories
+        run: |
+          composer config repositories.hyva-themes/hyva-checkout git git@gitlab.hyva.io:hyva-checkout/checkout.git
+          composer config repositories.hyva-themes/magento2-theme-module git git@gitlab.hyva.io:hyva-themes/magento2-theme-module.git
+          composer config repositories.hyva-themes/magento2-reset-theme git git@gitlab.hyva.io:hyva-themes/magento2-reset-theme.git
+          composer config repositories.hyva-themes/magento2-email-theme git git@gitlab.hyva.io:hyva-themes/magento2-email-module.git
+          composer config repositories.hyva-default-theme git git@gitlab.hyva.io:hyva-themes/magento2-default-theme.git
+
+      - name: Configure SSH access to Hyvä Gitlab
+        env:
+          SSH_AUTH_SOCK: /tmp/ssh_agent.sock
+          HYVA_GITLAB_SSH_KEY: ${{ secrets.GITLAB_SSH_KEY }}
+        run: |
+          mkdir -p ~/.ssh
+          ssh-keyscan gitlab.hyva.io >> ~/.ssh/known_hosts
+          echo "${HYVA_GITLAB_SSH_KEY}" > ~/.ssh/hyva_id_rsa
+          chmod 600 ~/.ssh/hyva_id_rsa
+          ssh-agent -a ${SSH_AUTH_SOCK} > /dev/null	
+          ssh-add ~/.ssh/hyva_id_rsa
+
+      - name: Install the plugin
+        run: |
+          echo "{\"http-basic\":{\"repo.magento.com\":{\"username\":\"${MAGENTO_USERNAME}\",\"password\":\"${MAGENTO_PASSWORD}\"}}}" > auth.json
+          composer install --prefer-dist
+        env:
+          CI: true
+          SSH_AUTH_SOCK: /tmp/ssh_agent.sock
+          MAGENTO_USERNAME: ${{ secrets.MAGENTO_USERNAME }}
+          MAGENTO_PASSWORD: ${{ secrets.MAGENTO_PASSWORD }}
+
+      - name: Code Sniffer
+        run: vendor/bin/phpcs .
+
+      - name: Run PHPUnit
+        run: vendor/bin/phpunit --coverage-clover=build/clover.xml --log-junit=build/tests-log.xml -c Test/phpunit.xml Test/Unit
+
+      - name: Fix code coverage paths
+        run: sed -i "s;`pwd`/;;g" build/*.xml
 
       - name: SonarCloud Scan
         if: ${{ env.SONAR_TOKEN }}
diff --git a/Magewire/Payment/Method/AdyenPaymentComponent.php b/Magewire/Payment/Method/AdyenPaymentComponent.php
index 1af05d49..6a81e1e3 100644
--- a/Magewire/Payment/Method/AdyenPaymentComponent.php
+++ b/Magewire/Payment/Method/AdyenPaymentComponent.php
@@ -17,8 +17,10 @@
 use Hyva\Checkout\Model\Magewire\Component\Evaluation\EvaluationResult;
 use Hyva\Checkout\Model\Magewire\Component\EvaluationInterface;
 use Hyva\Checkout\Model\Magewire\Component\EvaluationResultFactory;
+use Magento\Checkout\Api\GuestPaymentInformationManagementInterface;
 use Magento\Checkout\Api\PaymentInformationManagementInterface;
 use Magento\Checkout\Model\Session;
+use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface;
 use Magewirephp\Magewire\Component;
 use Psr\Log\LoggerInterface;
 
@@ -49,6 +51,8 @@ abstract class AdyenPaymentComponent extends Component implements EvaluationInte
     protected StateData $stateData;
     protected PaymentMethods $paymentMethods;
     protected PaymentInformationManagementInterface $paymentInformationManagement;
+    protected GuestPaymentInformationManagementInterface $guestPaymentInformationManagement;
+    protected QuoteIdToMaskedQuoteIdInterface $quoteIdToMaskedQuoteId;
     protected AdyenOrderPaymentStatusInterface $adyenOrderPaymentStatus;
     protected AdyenPaymentsDetailsInterface $adyenPaymentsDetails;
     protected CustomerGroupHandler $customerGroupHandler;
@@ -65,6 +69,8 @@ public function __construct(
         $this->stateData = $context->getStateData();
         $this->paymentMethods = $context->getPaymentMethods();
         $this->paymentInformationManagement = $context->getPaymentInformationManagement();
+        $this->guestPaymentInformationManagement = $context->getGuestPaymentInformationManagement();
+        $this->quoteIdToMaskedQuoteId = $this->context->getQuoteIdToMaskedQuoteId();
         $this->adyenOrderPaymentStatus = $context->getAdyenOrderPaymentStatus();
         $this->adyenPaymentsDetails = $context->getAdyenPaymentsDetails();
         $this->customerGroupHandler = $context->getCustomerGroupHandler();
@@ -100,10 +106,21 @@ public function placeOrder(array $data): void
             $stateDataReceived = $this->collectValidatedStateData($data);
             //Temporary (per request) storage of state data
             $this->stateData->setStateData($stateDataReceived, (int) $quoteId);
-            $orderId = $this->paymentInformationManagement->savePaymentInformationAndPlaceOrder(
-                $quoteId,
-                $payment
-            );
+
+            if ($this->userIsGuest()) {
+                $email = $this->session->getQuote()->getCustomerEmail();
+                $maskedQuoteId = $this->quoteIdToMaskedQuoteId->execute((int) $quoteId);
+                $orderId = $this->guestPaymentInformationManagement->savePaymentInformationAndPlaceOrder(
+                    $maskedQuoteId,
+                    $email,
+                    $payment
+                );
+            } else {
+                $orderId = $this->paymentInformationManagement->savePaymentInformationAndPlaceOrder(
+                    $quoteId,
+                    $payment
+                );
+            }
             $this->paymentStatus = $this->adyenOrderPaymentStatus->getOrderPaymentStatus(strval($orderId));
         } catch (\Exception $exception) {
             $this->paymentStatus = json_encode(['isRefused' => true]);
diff --git a/Model/Component/Payment/Context.php b/Model/Component/Payment/Context.php
index bbff528e..e78c8f8d 100644
--- a/Model/Component/Payment/Context.php
+++ b/Model/Component/Payment/Context.php
@@ -9,9 +9,11 @@
 use Adyen\Payment\Api\AdyenPaymentsDetailsInterface;
 use Adyen\Payment\Helper\StateData;
 use Adyen\Payment\Helper\Util\CheckoutStateDataValidator;
+use Magento\Checkout\Api\GuestPaymentInformationManagementInterface;
 use Magento\Checkout\Api\PaymentInformationManagementInterface;
 use Magento\Checkout\Model\Session;
 use Magento\Framework\ObjectManager\ContextInterface;
+use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface;
 use Psr\Log\LoggerInterface;
 
 class Context implements ContextInterface
@@ -23,6 +25,8 @@ public function __construct(
         private readonly StateData $stateData,
         private readonly PaymentMethods $paymentMethods,
         private readonly PaymentInformationManagementInterface $paymentInformationManagement,
+        private readonly GuestPaymentInformationManagementInterface $guestPaymentInformationManagement,
+        private readonly QuoteIdToMaskedQuoteIdInterface $quoteIdToMaskedQuoteId,
         private readonly AdyenOrderPaymentStatusInterface $adyenOrderPaymentStatus,
         private readonly AdyenPaymentsDetailsInterface $adyenPaymentsDetails,
         private readonly CustomerGroupHandler $customerGroupHandler,
@@ -78,6 +82,22 @@ public function getPaymentInformationManagement(): PaymentInformationManagementI
         return $this->paymentInformationManagement;
     }
 
+    /**
+     * @return PaymentInformationManagementInterface
+     */
+    public function getGuestPaymentInformationManagement(): GuestPaymentInformationManagementInterface
+    {
+        return $this->guestPaymentInformationManagement;
+    }
+
+    /**
+     * @return QuoteIdToMaskedQuoteIdInterface
+     */
+    public function getQuoteIdToMaskedQuoteId(): QuoteIdToMaskedQuoteIdInterface
+    {
+        return $this->quoteIdToMaskedQuoteId;
+    }
+
     /**
      * @return AdyenOrderPaymentStatusInterface
      */
diff --git a/Model/CompositeConfigProvider.php b/Model/CompositeConfigProvider.php
new file mode 100644
index 00000000..18361795
--- /dev/null
+++ b/Model/CompositeConfigProvider.php
@@ -0,0 +1,30 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Adyen\Hyva\Model;
+
+use Magento\Checkout\Model\ConfigProviderInterface;
+class CompositeConfigProvider implements ConfigProviderInterface
+{
+    /**
+     * @param array $configProviders
+     */
+    public function __construct(
+        private readonly array $configProviders
+    ) { }
+
+    /**
+     * @return array
+     */
+    public function getConfig(): array
+    {
+        $config = [];
+
+        foreach ($this->configProviders as $configProvider) {
+            $config = array_merge_recursive($config, $configProvider->getConfig());
+        }
+
+        return $config;
+    }
+}
diff --git a/Model/Configuration.php b/Model/Configuration.php
index fd77cb68..e1f5e982 100644
--- a/Model/Configuration.php
+++ b/Model/Configuration.php
@@ -5,7 +5,6 @@
 namespace Adyen\Hyva\Model;
 
 use Exception;
-use Magento\Checkout\Model\CompositeConfigProvider;
 use Magento\Framework\DataObject;
 use Magento\Framework\DataObjectFactory;
 use Psr\Log\LoggerInterface;
@@ -16,8 +15,8 @@ class Configuration
 
     public function __construct(
         CompositeConfigProvider $configProvider,
-        DataObjectFactory $dataObjectFactory,
-        LoggerInterface $logger
+        DataObjectFactory       $dataObjectFactory,
+        LoggerInterface         $logger
     ) {
         try {
             if (isset($configProvider->getConfig()['payment'])) {
diff --git a/Test/Unit/Magewire/Payment/Method/CreditCardTest.php b/Test/Unit/Magewire/Payment/Method/CreditCardTest.php
index 6a058f1f..92a77e38 100644
--- a/Test/Unit/Magewire/Payment/Method/CreditCardTest.php
+++ b/Test/Unit/Magewire/Payment/Method/CreditCardTest.php
@@ -2,18 +2,28 @@
 
 namespace Adyen\Hyva\Test\Unit\Magewire\Payment\Method;
 
+use Adyen\Hyva\Magewire\Payment\Method\CreditCard;
 use Adyen\Hyva\Model\Component\Payment\Context;
 use Adyen\Hyva\Model\Configuration;
 use Adyen\Hyva\Model\CreditCard\BrandsManager;
 use Adyen\Hyva\Model\CreditCard\InstallmentsManager;
+use Adyen\Hyva\Model\Customer\CustomerGroupHandler;
+use Adyen\Hyva\Model\PaymentMethod\PaymentMethods;
 use Adyen\Payment\Api\AdyenOrderPaymentStatusInterface;
+use Adyen\Payment\Api\AdyenPaymentsDetailsInterface;
 use Adyen\Payment\Helper\StateData;
 use Adyen\Payment\Helper\Util\CheckoutStateDataValidator;
+use Adyen\Payment\Test\Unit\AbstractAdyenTestCase;
+use Magento\Checkout\Api\GuestPaymentInformationManagementInterface;
+use Magento\Checkout\Api\PaymentInformationManagementInterface;
+use Magento\Checkout\Model\Session;
 use Magento\Quote\Model\Quote;
+use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface;
 use Magento\Sales\Model\Order;
 use PHPUnit\Framework\MockObject\MockObject;
+use Psr\Log\LoggerInterface;
 
-class CreditCardTest extends \PHPUnit\Framework\TestCase
+class CreditCardTest extends AbstractAdyenTestCase
 {
     private MockObject $payment;
     private MockObject $quote;
@@ -24,6 +34,7 @@ class CreditCardTest extends \PHPUnit\Framework\TestCase
     private MockObject $stateData;
     private MockObject $paymentMethods;
     private MockObject $paymentInformationManagement;
+    private MockObject $guestPaymentInformationManagement;
     private MockObject $adyenOrderPaymentStatus;
     private MockObject $adyenPaymentDetails;
     private MockObject $customerGroupHandler;
@@ -31,8 +42,9 @@ class CreditCardTest extends \PHPUnit\Framework\TestCase
     private Context $context;
     private MockObject $brandsManager;
     private MockObject $installmentsManager;
+    private MockObject $quoteIdToMaskedQuoteIdMock;
 
-    private \Adyen\Hyva\Magewire\Payment\Method\CreditCard $creditCard;
+    private CreditCard $creditCard;
 
     public function setUp(): void
     {
@@ -45,35 +57,40 @@ public function setUp(): void
         $this->order = $this->getMockBuilder(Order::class)
             ->disableOriginalConstructor()
             ->getMock();
-
         $this->checkoutStateDataValidator = $this->getMockBuilder(CheckoutStateDataValidator::class)
             ->disableOriginalConstructor()
             ->getMock();
         $this->configuration = $this->getMockBuilder(Configuration::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $this->session = $this->getMockBuilder(\Magento\Checkout\Model\Session::class)
+        $this->session = $this->getMockBuilder(Session::class)
             ->disableOriginalConstructor()
             ->getMock();
         $this->stateData = $this->getMockBuilder(StateData::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $this->paymentMethods = $this->getMockBuilder(\Adyen\Hyva\Model\PaymentMethod\PaymentMethods::class)
+        $this->paymentMethods = $this->getMockBuilder(PaymentMethods::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->paymentInformationManagement = $this->getMockBuilder(PaymentInformationManagementInterface::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $this->paymentInformationManagement = $this->getMockBuilder(\Magento\Checkout\Api\PaymentInformationManagementInterface::class)
+        $this->guestPaymentInformationManagement = $this->getMockBuilder(GuestPaymentInformationManagementInterface::class)
             ->disableOriginalConstructor()
             ->getMock();
         $this->adyenOrderPaymentStatus = $this->getMockBuilder(AdyenOrderPaymentStatusInterface::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $this->adyenPaymentDetails = $this->getMockBuilder(\Adyen\Payment\Api\AdyenPaymentsDetailsInterface::class)
+        $this->adyenPaymentDetails = $this->getMockBuilder(AdyenPaymentsDetailsInterface::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $this->customerGroupHandler = $this->getMockBuilder(\Adyen\Hyva\Model\Customer\CustomerGroupHandler::class)
+        $this->customerGroupHandler = $this->getMockBuilder(CustomerGroupHandler::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $this->logger = $this->getMockBuilder(\Psr\Log\LoggerInterface::class)
+        $this->logger = $this->getMockBuilder(LoggerInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->quoteIdToMaskedQuoteIdMock = $this->getMockBuilder(QuoteIdToMaskedQuoteIdInterface::class)
             ->disableOriginalConstructor()
             ->getMock();
 
@@ -84,6 +101,8 @@ public function setUp(): void
             $this->stateData,
             $this->paymentMethods,
             $this->paymentInformationManagement,
+            $this->guestPaymentInformationManagement,
+            $this->quoteIdToMaskedQuoteIdMock,
             $this->adyenOrderPaymentStatus,
             $this->adyenPaymentDetails,
             $this->customerGroupHandler,
@@ -98,16 +117,16 @@ public function setUp(): void
             ->disableOriginalConstructor()
             ->getMock();
 
-        $this->creditCard = new \Adyen\Hyva\Magewire\Payment\Method\CreditCard(
-                    $this->context,
-                    $this->brandsManager,
-                    $this->installmentsManager
-                );
+        $this->creditCard = new CreditCard(
+            $this->context,
+            $this->brandsManager,
+            $this->installmentsManager
+        );
     }
 
     public function testGetMethodCode()
     {
-        $this->assertEquals(\Adyen\Hyva\Magewire\Payment\Method\CreditCard::METHOD_CC, $this->creditCard->getMethodCode());
+        $this->assertEquals(CreditCard::METHOD_CC, $this->creditCard->getMethodCode());
     }
 
     public function testGetFormattedInstallments()
@@ -158,6 +177,59 @@ public function testPlaceOrder()
         $this->assertEquals($paymentStatus, $this->creditCard->paymentStatus);
     }
 
+    public function testPlaceOrderGuest()
+    {
+        $data = ['stateData' => []];
+        $paymentStatus = 'success';
+        $quoteId = '111';
+        $orderId = '123';
+        $email = 'mock@mockcompany.com';
+        $maskedQuoteId = 'XYZ...123';
+
+        $this->customerGroupHandler->expects($this->once())
+            ->method('userIsGuest')
+            ->willReturn(true);
+
+        // Use local `quote` mock with additional methods
+        $this->quote = $this->getMockBuilder(Quote::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getCustomerEmail', 'getPayment'])
+            ->getMock();
+
+        $this->quote->method('getCustomerEmail')->willReturn($email);
+        $this->quote->method('getPayment')->willReturn($this->payment);
+
+        $this->session->method('getQuote')->willReturn($this->quote);
+
+        $this->quoteIdToMaskedQuoteIdMock->method('execute')->willReturn($maskedQuoteId);
+
+        $this->session->expects($this->once())
+            ->method('getQuoteId')
+            ->willReturn($quoteId);
+
+        $this->session->expects($this->exactly(2))
+            ->method('getQuote')
+            ->willReturn($this->quote);
+
+        $this->quote->expects($this->once())
+            ->method('getPayment')
+            ->willReturn($this->payment);
+
+        $this->guestPaymentInformationManagement->expects($this->once())
+            ->method('savePaymentInformationAndPlaceOrder')
+            ->with($maskedQuoteId, $email, $this->payment)
+            ->willReturn($orderId);
+
+        $this->adyenOrderPaymentStatus->expects($this->once())
+            ->method('getOrderPaymentStatus')
+            ->with($orderId)
+            ->willReturn($paymentStatus);
+
+        $this->creditCard->placeOrder($data);
+
+        $this->assertEquals($paymentStatus, $this->creditCard->paymentStatus);
+    }
+
     public function testPlaceOrderThrowsException()
     {
         $data = ['stateData' => []];
@@ -244,11 +316,10 @@ public function testRefreshPropertiesThrowsException()
 
     private function setRefreshPropertiesCommonExpectations($quoteId)
     {
-        $this->session->expects($this->exactly(2))
-            ->method('getQuote')
+        $this->session->method('getQuote')
             ->willReturn($this->quote);
 
-        $this->quote->expects($this->once())
+        $this->quote->expects($this->exactly(2))
             ->method('getShippingAddress');
 
         $this->session->expects($this->once())
diff --git a/Test/Unit/Model/CompositeConfigProviderTest.php b/Test/Unit/Model/CompositeConfigProviderTest.php
new file mode 100644
index 00000000..4c60429d
--- /dev/null
+++ b/Test/Unit/Model/CompositeConfigProviderTest.php
@@ -0,0 +1,65 @@
+<?php
+/**
+ *
+ * Adyen Payment module (https://www.adyen.com/)
+ *
+ * Copyright (c) 2024 Adyen N.V. (https://www.adyen.com/)
+ * See LICENSE.txt for license details.
+ *
+ * Author: Adyen <magento@adyen.com>
+ */
+
+namespace Adyen\Hyva\Test\Unit\Model;
+
+use Adyen\Hyva\Model\CompositeConfigProvider;
+use Adyen\Payment\Test\Unit\AbstractAdyenTestCase;
+use Magento\Checkout\Model\ConfigProviderInterface;
+use PHPUnit\Framework\MockObject\MockObject;
+
+class CompositeConfigProviderTest extends AbstractAdyenTestCase
+{
+    protected ?CompositeConfigProvider $compositeConfigProvider;
+    protected MockObject|array $configProvidersMock;
+    protected MockObject|ConfigProviderInterface $singleConfigProviderMock;
+
+    /**
+     * @return void
+     */
+    public function setUp(): void
+    {
+        parent::setUp();
+
+        $this->singleConfigProviderMock = $this->createMock(ConfigProviderInterface::class);
+        $this->configProvidersMock[] = $this->singleConfigProviderMock;
+
+        $this->compositeConfigProvider = new CompositeConfigProvider($this->configProvidersMock);
+    }
+
+    /**
+     * @return void
+     */
+    public function tearDown(): void
+    {
+        $this->compositeConfigProvider = null;
+    }
+
+    /**
+     * Test case to assert all available config values provided through di.xml
+     *
+     * @return void
+     */
+    public function testGetConfig()
+    {
+        $configMock = [
+            'config1' => 'value1',
+            'config2' => 'value2'
+        ];
+
+        $this->singleConfigProviderMock->expects($this->once())
+            ->method('getConfig')
+            ->willReturn($configMock);
+
+        $result = $this->compositeConfigProvider->getConfig();
+        $this->assertEquals($configMock, $result);
+    }
+}
diff --git a/Test/Unit/Model/ConfigurationTest.php b/Test/Unit/Model/ConfigurationTest.php
index 965707d4..c38fab02 100644
--- a/Test/Unit/Model/ConfigurationTest.php
+++ b/Test/Unit/Model/ConfigurationTest.php
@@ -2,19 +2,19 @@
 
 namespace Adyen\Hyva\Test\Unit\Model;
 
+use Adyen\Hyva\Model\CompositeConfigProvider;
 use Adyen\Hyva\Model\Configuration;
-use Magento\Checkout\Model\CompositeConfigProvider;
+use Adyen\Payment\Test\Unit\AbstractAdyenTestCase;
 use Magento\Framework\DataObjectFactory;
 use Psr\Log\LoggerInterface;
 use PHPUnit\Framework\MockObject\MockObject;
-use PHPUnit\Framework\TestCase;
 
-class ConfigurationTest extends TestCase
+class ConfigurationTest extends AbstractAdyenTestCase
 {
-    private Configuration $configuration;
-    private CompositeConfigProvider|MockObject $configProvider;
-    private DataObjectFactory|MockObject $dataObjectFactory;
-    private LoggerInterface|MockObject $logger;
+    protected Configuration $configuration;
+    protected CompositeConfigProvider|MockObject $configProvider;
+    protected DataObjectFactory|MockObject $dataObjectFactory;
+    protected LoggerInterface|MockObject $logger;
 
     protected function setUp(): void
     {
@@ -26,15 +26,9 @@ protected function setUp(): void
                 ]
         ];
 
-        $this->configProvider = $this->getMockBuilder(CompositeConfigProvider::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->dataObjectFactory = $this->getMockBuilder(DataObjectFactory::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->logger = $this->getMockBuilder(LoggerInterface::class)
-            ->disableOriginalConstructor()
-            ->getMock();
+        $this->configProvider = $this->createMock(CompositeConfigProvider::class);
+        $this->dataObjectFactory = $this->createGeneratedMock(DataObjectFactory::class, ['create']);
+        $this->logger = $this->createMock(LoggerInterface::class);
 
         $this->configProvider->expects($this->exactly(2))
             ->method('getConfig')
@@ -76,6 +70,7 @@ public function testGetJsonValue(): void
         $jsonValue = $this->configuration->getJsonValue('nonexistent/path');
         $this->assertSame('null', $jsonValue);
     }
+
     public function testIsCCEnableStoreDetails(): void
     {
         $result = $this->configuration->isCCEnableStoreDetails(false);
diff --git a/Test/Unit/Model/MethodListTest.php b/Test/Unit/Model/MethodListTest.php
index ea1556d4..bcc4a178 100644
--- a/Test/Unit/Model/MethodListTest.php
+++ b/Test/Unit/Model/MethodListTest.php
@@ -3,14 +3,17 @@
 namespace Adyen\Hyva\Test\Unit\Model;
 
 use Adyen\Hyva\Model\MethodList;
+use Adyen\Hyva\Model\Ui\AdyenHyvaConfigProvider;
+use Adyen\Payment\Test\Unit\AbstractAdyenTestCase;
 
-class MethodListTest extends \PHPUnit\Framework\TestCase
+class MethodListTest extends AbstractAdyenTestCase
 {
     private MethodList $methodList;
 
    protected function setUp(): void
    {
-       $this->methodList = new MethodList();
+       $adyenHyvaConfigProviderMock = $this->createMock(AdyenHyvaConfigProvider::class);
+       $this->methodList = new MethodList($adyenHyvaConfigProviderMock, [], []);
    }
 
    public function testCollectAvailableMethodsReturnsEmptyArray(): void
@@ -21,11 +24,6 @@ public function testCollectAvailableMethodsReturnsEmptyArray(): void
 
    public function testCollectAvailableMethodsReturnsCorrectMethods(): void
    {
-       $methods = ['method1', 'method2'];
-       $this->methodList = new MethodList($methods);
-
        $this->assertIsArray($this->methodList->collectAvailableMethods());
-       $this->assertCount(2, $this->methodList->collectAvailableMethods());
-       $this->assertEquals($methods, $this->methodList->collectAvailableMethods());
    }
 }
diff --git a/Test/bootstrap.php b/Test/bootstrap.php
new file mode 100644
index 00000000..a909098f
--- /dev/null
+++ b/Test/bootstrap.php
@@ -0,0 +1,13 @@
+<?php
+/**
+ *
+ * Adyen Payment Module
+ *
+ * Copyright (c) 2024 Adyen N.V.
+ * This file is open source and available under the MIT license.
+ * See the LICENSE file for more info.
+ *
+ * Author: Adyen <magento@adyen.com>
+ */
+
+require __DIR__.'/../vendor/autoload.php';
diff --git a/Test/phpunit.xml b/Test/phpunit.xml
new file mode 100644
index 00000000..72ae6a7a
--- /dev/null
+++ b/Test/phpunit.xml
@@ -0,0 +1,42 @@
+<!--
+  ~
+  ~ Adyen Hyvä Checkout compatibility module
+  ~
+  ~ Copyright (c) 2024 Adyen N.V.
+  ~ This file is open source and available under the MIT license.
+  ~ See the LICENSE file for more info.
+  ~
+  ~ Author: Adyen <magento@adyen.com>
+  -->
+<phpunit
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="./vendor/phpunit/phpunit/phpunit.xsd"
+        bootstrap="./bootstrap.php"
+        colors="true"
+>
+    <php>
+        <ini name="display_errors" value="On"/>
+        <ini name="memory_limit" value="-1"/>
+        <ini name="max_execution_time" value="0"/>
+        <ini name="display_startup_errors" value="On"/>
+        <ini name="error_reporting" value="E_ALL"/>
+        <ini name="date.timezone" value="UTC"/>
+        <server name="SHELL_VERBOSITY" value="-1"/>
+    </php>
+
+    <testsuites>
+        <testsuite name="default">
+            <directory>.</directory>
+        </testsuite>
+    </testsuites>
+
+    <coverage processUncoveredFiles="false">
+        <include>
+            <directory suffix=".php">../.</directory>
+        </include>
+        <exclude>
+            <directory>../vendor</directory>
+            <directory>.</directory>
+        </exclude>
+    </coverage>
+</phpunit>
diff --git a/composer.json b/composer.json
index a8ba315a..9abd6c0c 100644
--- a/composer.json
+++ b/composer.json
@@ -2,13 +2,18 @@
     "name": "adyen/module-hyva-checkout",
     "description": "Adyen Integration with Hyva Checkout",
     "type": "magento2-module",
-    "version": "1.2.1",
+    "version": "1.2.2",
     "license": "MIT",
     "require": {
         "adyen/module-payment": "^9.6.1",
         "hyva-themes/magento2-default-theme": "^1.3",
         "hyva-themes/magento2-hyva-checkout": "^1.1"
     },
+    "require-dev": {
+        "phpunit/phpunit": "~9.6.1",
+        "magento/magento-coding-standard": "*",
+        "squizlabs/php_codesniffer": "~3.8.0"
+    },
     "autoload": {
         "files": [
             "registration.php"
@@ -16,5 +21,17 @@
         "psr-4": {
             "Adyen\\Hyva\\": ""
         }
+    },
+    "repositories": [
+        {
+            "type": "composer",
+            "url": "https://repo.magento.com/"
+        }
+    ],
+    "config": {
+        "allow-plugins": {
+            "magento/composer-dependency-version-audit-plugin": true,
+            "dealerdirect/phpcodesniffer-composer-installer": true
+        }
     }
 }
diff --git a/etc/di.xml b/etc/di.xml
index ebec49a0..54bbc24b 100644
--- a/etc/di.xml
+++ b/etc/di.xml
@@ -42,4 +42,21 @@
             </argument>
         </arguments>
     </type>
+
+    <type name="Adyen\Hyva\Model\CompositeConfigProvider">
+        <arguments>
+            <argument name="configProviders" xsi:type="array">
+                <item name="ccform" xsi:type="object">Magento\Payment\Model\CcGenericConfigProvider</item>
+                <item name="cc_card_config_provider" xsi:type="object">Magento\Payment\Model\CcConfigProvider</item>
+                <item name="tax_config_provider" xsi:type="object">Magento\Tax\Model\TaxConfigProvider</item>
+                <item name="vault_config_provider" xsi:type="object">Magento\Vault\Model\Ui\VaultConfigProvider</item>
+                <item name="vault_cards_config_provider" xsi:type="object">Magento\Vault\Model\Ui\TokensConfigProvider</item>
+                <item name="adyen_generic_config_provider" xsi:type="object">Adyen\Payment\Model\Ui\AdyenGenericConfigProvider</item>
+                <item name="adyen_cc_config_provider" xsi:type="object">Adyen\Payment\Model\Ui\AdyenCcConfigProvider</item>
+                <item name="adyen_pm_config_provider" xsi:type="object">Adyen\Payment\Model\Ui\AdyenPmConfigProvider</item>
+                <item name="adyen_pos_cloud_config_provider" xsi:type="object">Adyen\Payment\Model\Ui\AdyenPosCloudConfigProvider</item>
+                <item name="adyen_giftcard_config_provider" xsi:type="object">Adyen\Payment\Model\Ui\AdyenGiftcardConfigProvider</item>
+            </argument>
+        </arguments>
+    </type>
 </config>
diff --git a/etc/frontend/events.xml b/etc/frontend/events.xml
index 79b4ddec..121a0626 100644
--- a/etc/frontend/events.xml
+++ b/etc/frontend/events.xml
@@ -14,6 +14,12 @@
     <event name="payment_method_assign_data_adyen_klarna">
         <observer name="adyen_hyva_klarna_gateway_data_assign" instance="Adyen\Hyva\Observer\BrandCodeDataAssigner" />
     </event>
+    <event name="payment_method_assign_data_adyen_klarna_paynow">
+        <observer name="adyen_hyva_klarna_paynow_gateway_data_assign" instance="Adyen\Hyva\Observer\BrandCodeDataAssigner" />
+    </event>
+    <event name="payment_method_assign_data_adyen_klarna_account">
+        <observer name="adyen_hyva_klarna_account_gateway_data_assign" instance="Adyen\Hyva\Observer\BrandCodeDataAssigner" />
+    </event>
     <event name="payment_method_assign_data_adyen_facilypay_3x">
         <observer name="adyen_hyva_facilypay_3x_gateway_data_assign" instance="Adyen\Hyva\Observer\BrandCodeDataAssigner" />
     </event>
diff --git a/phpcs.xml b/phpcs.xml
new file mode 100644
index 00000000..fb544e0d
--- /dev/null
+++ b/phpcs.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+<!--
+/**
+ *
+ * Adyen Payment module (https://www.adyen.com/)
+ *
+ * Copyright (c) 2019 Adyen BV (https://www.adyen.com/)
+ * See LICENSE.txt for license details.
+ *
+ * Author: Adyen <magento@adyen.com>
+ */
+-->
+<ruleset xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="PHP_CodeSniffer"
+         xsi:noNamespaceSchemaLocation="https://raw.githubusercontent.com/squizlabs/PHP_CodeSniffer/master/phpcs.xsd">
+    <exclude-pattern type="relative">vendor/*</exclude-pattern>
+    <file>.</file>
+    <arg value="p"/>
+    <arg value="n"/>
+    <rule ref="Magento2"/>
+    <rule ref="PSR2">
+        <exclude-pattern>*.js</exclude-pattern>
+    </rule>
+</ruleset>
diff --git a/renovate.json b/renovate.json
new file mode 100644
index 00000000..00a847ec
--- /dev/null
+++ b/renovate.json
@@ -0,0 +1,22 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": [
+    "config:base",
+    ":disableDependencyDashboard"
+  ],
+  "minimumReleaseAge": "30 days",
+  "labels": ["dependencies"],
+  "prConcurrentLimit": 5,
+  "baseBranches": ["develop"],
+  "packageRules": [
+    {
+      "matchUpdateTypes": ["minor", "patch"],
+      "matchBaseBranches": ["develop"]
+    },
+    {
+      "matchUpdateTypes": ["major", "pin", "pinDigest", "lockFileMaintenance", "rollback", "bump"],
+      "matchBaseBranches": ["develop"],
+      "enabled": false
+    }
+  ]
+}
diff --git a/view/frontend/templates/payment/method-renderer/adyen-affirm-method.phtml b/view/frontend/templates/payment/method-renderer/adyen-affirm-method.phtml
index 2b35a4c0..7de4321d 100644
--- a/view/frontend/templates/payment/method-renderer/adyen-affirm-method.phtml
+++ b/view/frontend/templates/payment/method-renderer/adyen-affirm-method.phtml
@@ -11,7 +11,7 @@ use Magento\Framework\View\Element\Template;
 ?>
 
 <div>
-    <div id="<?= $magewire->getContainerName() ?>ActionContainer" wire:ignore></div>
+    <div id="<?= $escaper->escapeHtml($magewire->getContainerName()) ?>ActionContainer" wire:ignore></div>
 
     <script>
         class cashappComponentHandler extends componentHandler {
@@ -60,12 +60,12 @@ use Magento\Framework\View\Element\Template;
                         let methodHandler = new cashappComponentHandler(
                             methodCode,
                             wire,
-                            '<?= $magewire->getContainerName() ?>ActionContainer'
+                            '<?= $escaper->escapeHtml($magewire->getContainerName()) ?>ActionContainer'
                         );
 
                         window.AdyenPaymentHandler = methodHandler;
 
-                        if (methodCode !== '<?= $magewire->getMethodCode() ?>') {
+                        if (methodCode !== '<?= $escaper->escapeHtml($magewire->getMethodCode()) ?>') {
                             methodHandler.renderMethodUnavailableMessage();
                             return;
                         }
@@ -75,7 +75,11 @@ use Magento\Framework\View\Element\Template;
                         } else {
                             let rawResponse = wire.get('paymentResponse');
                             let paymentMethods = JSON.parse(rawResponse);
-                            methodHandler.activatePaymentMethod(methodCode, paymentMethods, '<?= $magewire->getContainerName() ?>ActionContainer');
+                            methodHandler.activatePaymentMethod(
+                                methodCode,
+                                paymentMethods,
+                                '<?= $escaper->escapeHtml($magewire->getContainerName()) ?>ActionContainer'
+                            );
                             showPrimaryButton();
                         }
                 }).catch(() => {
diff --git a/view/frontend/templates/payment/method-renderer/adyen-amazonpay-method.phtml b/view/frontend/templates/payment/method-renderer/adyen-amazonpay-method.phtml
index e9bb73b0..4b8fa68d 100644
--- a/view/frontend/templates/payment/method-renderer/adyen-amazonpay-method.phtml
+++ b/view/frontend/templates/payment/method-renderer/adyen-amazonpay-method.phtml
@@ -11,7 +11,7 @@ use Magento\Framework\View\Element\Template;
 ?>
 
 <div>
-    <div id="<?= $magewire->getContainerName() ?>ActionContainer" wire:ignore></div>
+    <div id="<?= $escaper->escapeHtml($magewire->getContainerName()) ?>ActionContainer" wire:ignore></div>
 
     <script>
         class amazonPayComponentHandler extends componentHandler {
@@ -89,7 +89,7 @@ use Magento\Framework\View\Element\Template;
 
             mountComponent(checkoutComponent, paymentMethodType, configuration, result = undefined) {
                 let self = this;
-                const containerId = "<?= $magewire->getContainerName() ?>ActionContainer";
+                const containerId = "<?= $escaper->escapeHtml($magewire->getContainerName()) ?>ActionContainer";
 
                 let url = new URL(location.href);
                 // Handles the redirect back to checkout page with amazonSessionKey in url
@@ -148,7 +148,7 @@ use Magento\Framework\View\Element\Template;
                 let self = this;
 
                 if (responseJSON.isRefused) {
-                    let message = "<?= __("The Payment is Refused") ?>";
+                    let message = "<?= $escaper->escapeHtml(__("The Payment is Refused")) ?>";
 
                     this.amazonPayStatus = false;
 
@@ -181,7 +181,7 @@ use Magento\Framework\View\Element\Template;
                         let amazonPayHandler = new amazonPayComponentHandler(
                             methodCode,
                             wire,
-                            '<?= $magewire->getContainerName() ?>ActionContainer'
+                            '<?= $escaper->escapeHtml($magewire->getContainerName()) ?>ActionContainer'
                         );
 
                         window.AdyenPaymentHandler = amazonPayHandler;
diff --git a/view/frontend/templates/payment/method-renderer/adyen-cashapp-method.phtml b/view/frontend/templates/payment/method-renderer/adyen-cashapp-method.phtml
index 706baab4..fd735403 100644
--- a/view/frontend/templates/payment/method-renderer/adyen-cashapp-method.phtml
+++ b/view/frontend/templates/payment/method-renderer/adyen-cashapp-method.phtml
@@ -11,7 +11,7 @@ use Magento\Framework\View\Element\Template;
 ?>
 
 <div>
-    <div id="<?= $magewire->getContainerName() ?>ActionContainer" wire:ignore></div>
+    <div id="<?= $escaper->escapeHtml($magewire->getContainerName()) ?>ActionContainer" wire:ignore></div>
 
     <script>
         class cashappComponentHandler extends componentHandler {
@@ -57,12 +57,12 @@ use Magento\Framework\View\Element\Template;
                         let methodHandler = new cashappComponentHandler(
                             methodCode,
                             wire,
-                            '<?= $magewire->getContainerName() ?>ActionContainer'
+                            '<?= $escaper->escapeHtml($magewire->getContainerName()) ?>ActionContainer'
                         );
 
                         window.AdyenPaymentHandler = methodHandler;
 
-                        if (methodCode !== '<?= $magewire->getMethodCode() ?>') {
+                        if (methodCode !== '<?= $escaper->escapeHtml($magewire->getMethodCode()) ?>') {
                             methodHandler.renderMethodUnavailableMessage();
                             return;
                         }
@@ -72,7 +72,11 @@ use Magento\Framework\View\Element\Template;
                         } else {
                             let rawResponse = wire.get('paymentResponse');
                             let paymentMethods = JSON.parse(rawResponse);
-                            methodHandler.activatePaymentMethod(methodCode, paymentMethods, '<?= $magewire->getContainerName() ?>ActionContainer');
+                            methodHandler.activatePaymentMethod(
+                                methodCode,
+                                paymentMethods,
+                                '<?= $escaper->escapeHtml($magewire->getContainerName()) ?>ActionContainer'
+                            );
                             hidePrimaryButton();
                         }
                 }).catch(() => {
diff --git a/view/frontend/templates/payment/method-renderer/adyen-cc-vault-method.phtml b/view/frontend/templates/payment/method-renderer/adyen-cc-vault-method.phtml
index fd6061ee..4779eb22 100644
--- a/view/frontend/templates/payment/method-renderer/adyen-cc-vault-method.phtml
+++ b/view/frontend/templates/payment/method-renderer/adyen-cc-vault-method.phtml
@@ -70,7 +70,7 @@ $storedCard = $this->getData(ProcessingMetadataInterface::BLOCK_PROPERTY_STORED_
                                             hyvaCheckout.navigation.enableButtonPlaceOrder();
                                         }
                                     },
-                                    installmentOptions: <?= $magewire->getFormattedInstallments() ?>,
+                                    installmentOptions: <?= $escaper->escapeHtml($magewire->getFormattedInstallments()) ?>,
                                     showInstallmentAmounts: true,
                                     onBrand: function (state) {
                                         creditCardHandler.setCreditCardType(creditCardHandler.getCcCodeByAltCode('<?= $escaper->escapeJs($storedCard->getType()) ?>'));
diff --git a/view/frontend/templates/payment/method-renderer/adyen-default-method.phtml b/view/frontend/templates/payment/method-renderer/adyen-default-method.phtml
index e0bacfe4..02434b1c 100644
--- a/view/frontend/templates/payment/method-renderer/adyen-default-method.phtml
+++ b/view/frontend/templates/payment/method-renderer/adyen-default-method.phtml
@@ -11,7 +11,7 @@ use Magento\Framework\View\Element\Template;
 ?>
 
 <div>
-    <div id="<?= $magewire->getContainerName() ?>ActionContainer" wire:ignore></div>
+    <div id="<?= $escaper->escapeHtml($magewire->getContainerName()) ?>ActionContainer" wire:ignore></div>
 
     <script>
         window.addEventListener('checkout:payment:method-list-boot', async (event) => {
@@ -47,12 +47,12 @@ use Magento\Framework\View\Element\Template;
                         let methodHandler = new componentHandler(
                             methodCode,
                             wire,
-                            '<?= $magewire->getContainerName() ?>ActionContainer'
+                            '<?= $escaper->escapeHtml($magewire->getContainerName()) ?>ActionContainer'
                         );
 
                         window.AdyenPaymentHandler = methodHandler;
 
-                        if (methodCode !== '<?= $magewire->getMethodCode() ?>') {
+                        if (methodCode !== '<?= $escaper->escapeHtml($magewire->getMethodCode()) ?>') {
                             methodHandler.renderMethodUnavailableMessage();
                             return;
                         }
@@ -62,7 +62,11 @@ use Magento\Framework\View\Element\Template;
                         } else {
                             let rawResponse = wire.get('paymentResponse');
                             let paymentMethods = JSON.parse(rawResponse);
-                            methodHandler.activatePaymentMethod(methodCode, paymentMethods, '<?= $magewire->getContainerName() ?>ActionContainer');
+                            methodHandler.activatePaymentMethod(
+                                methodCode,
+                                paymentMethods,
+                                '<?= $escaper->escapeHtml($magewire->getContainerName()) ?>ActionContainer'
+                            );
                             showPrimaryButton();
                         }
                 }).catch(() => {
diff --git a/view/frontend/templates/payment/method-renderer/adyen-facilypay-3x-method.phtml b/view/frontend/templates/payment/method-renderer/adyen-facilypay-3x-method.phtml
index 28c5627f..5dd19776 100644
--- a/view/frontend/templates/payment/method-renderer/adyen-facilypay-3x-method.phtml
+++ b/view/frontend/templates/payment/method-renderer/adyen-facilypay-3x-method.phtml
@@ -11,7 +11,7 @@ use Magento\Framework\View\Element\Template;
 
 <div>
 
-    <div id="<?= $magewire->getContainerName() ?>ActionContainer" wire:ignore></div>
+    <div id="<?= $escaper->escapeHtml($magewire->getContainerName()) ?>ActionContainer" wire:ignore></div>
 
     <script>
         class facilypay3xComponentHandler extends componentHandler {
@@ -116,10 +116,10 @@ use Magento\Framework\View\Element\Template;
                         let methodHandler = new facilypay3xComponentHandler(
                             methodCode,
                             wire,
-                            '<?= $magewire->getContainerName() ?>ActionContainer'
+                            '<?= $escaper->escapeHtml($magewire->getContainerName()) ?>ActionContainer'
                         );
                         window.AdyenPaymentHandler = methodHandler;
-                        if (methodCode !== '<?= $magewire->getMethodCode() ?>') {
+                        if (methodCode !== '<?= $escaper->escapeHtml($magewire->getMethodCode()) ?>') {
                             methodHandler.renderMethodUnavailableMessage();
                             return;
                         }
@@ -128,7 +128,11 @@ use Magento\Framework\View\Element\Template;
                         } else {
                             let rawResponse = wire.get('paymentResponse');
                             let paymentMethods = JSON.parse(rawResponse);
-                            methodHandler.activatePaymentMethod(methodCode, paymentMethods, '<?= $magewire->getContainerName() ?>ActionContainer');
+                            methodHandler.activatePaymentMethod(
+                                methodCode,
+                                paymentMethods,
+                                '<?= $escaper->escapeHtml($magewire->getContainerName()) ?>ActionContainer'
+                            );
                             showPrimaryButton();
                         }
                     }).catch(() => {
diff --git a/view/frontend/templates/payment/model/adyen-payment-method.phtml b/view/frontend/templates/payment/model/adyen-payment-method.phtml
index 21cf3794..5facfa24 100644
--- a/view/frontend/templates/payment/model/adyen-payment-method.phtml
+++ b/view/frontend/templates/payment/model/adyen-payment-method.phtml
@@ -19,17 +19,19 @@ $billingAddress = $block->getQuoteBillingAddress();
 
 ?>
 <div x-data="{...hyva.modal(), isLoading: false}" @adyen-modal-hide.window="hide()" @adyen-loading.window="isLoading = $event.detail">
-    <?= $modalViewModel->createModal()
+    <?php
+        $endOfContent = <<<END_OF_CONTENT
+            <div class="relative">
+                {$block->getBlockHtml('block-loader')}
+                <div id="adyen-popup"></div>
+            </div>
+        END_OF_CONTENT;
+        /* @noEscape */ echo $modalViewModel->createModal()
                        ->withDialogRefName('adyenPopup')
                        ->removeDialogClass('p-10')
                        ->addDialogClass('p-4')
-                       ->withContent(<<<END_OF_CONTENT
-                        <div class="relative">
-                            {$block->getBlockHtml('block-loader')}
-                            <div id="adyen-popup"></div>
-                        </div>
-                        END_OF_CONTENT
-                       ) ?>
+                       ->withContent($endOfContent)
+    ?>
 </div>
 
 <script>
@@ -63,7 +65,7 @@ $billingAddress = $block->getQuoteBillingAddress();
 
     window.addEventListener('checkout:payment:method-activate', event => {
         try {
-            const availableMethods = <?= $availableMethods ?>;
+            const availableMethods = <?= /* @noEscape */ $availableMethods ?>;
             const activeMethodCode = event.detail.method;
             window.adyenActiveMethodCode = activeMethodCode;
 
@@ -127,7 +129,7 @@ $billingAddress = $block->getQuoteBillingAddress();
         }
 
         getCcCodeByAltCode(altCode) {
-            let ccTypes = <?= $block->getConfiguration()->getJsonValue('ccform/availableTypesByAlt') ?>[this.getPaymentMethodCode()];
+            let ccTypes = <?= /* @noEscape */ $block->getConfiguration()->getJsonValue('ccform/availableTypesByAlt') ?>[this.getPaymentMethodCode()];
 
             if (ccTypes.hasOwnProperty(altCode)) {
                 return ccTypes[altCode];
@@ -267,8 +269,8 @@ $billingAddress = $block->getQuoteBillingAddress();
 
         buildConfiguration(paymentMethod, paymentMethodsExtraInfo = {}) {
             let showPayButton = false;
-            let formattedShippingAddress = <?= $shippingAddress ?>;
-            let formattedBillingAddress = <?= $billingAddress ?>;
+            let formattedShippingAddress = <?= /* @noEscape */ $shippingAddress ?>;
+            let formattedBillingAddress = <?= /* @noEscape */ $billingAddress ?>;
 
             let configuration = {
                 ...paymentMethod,
@@ -342,6 +344,7 @@ $billingAddress = $block->getQuoteBillingAddress();
         }
 
         placeOrder(data, publicHash = null) {
+            window.dispatchEvent(new Event('magewire:loader:start'));
             let self = this;
             let wire = self.wire;
 
@@ -353,8 +356,10 @@ $billingAddress = $block->getQuoteBillingAddress();
                 .then(() => {
                     let paymentStatus = JSON.parse(wire.get('paymentStatus'));
                     self.handleAdyenResult(paymentStatus);
+                    window.dispatchEvent(new Event('magewire:loader:done'));
                 }).catch(() => {
-                    console.log('Error occurred during order placement')
+                    window.dispatchEvent(new Event('magewire:loader:done'));
+                    console.log('Error occurred during order placement');
                 });
         }
 
@@ -362,7 +367,7 @@ $billingAddress = $block->getQuoteBillingAddress();
             let self = this;
 
             if (responseJSON.isRefused) {
-                self.renderMessage("<?= __("The Payment is Refused") ?>");
+                self.renderMessage("<?= $escaper->escapeHtml(__("The Payment is Refused")) ?>");
                 setTimeout(() => {
                     self.clearMessage();
                 }, 4000);
@@ -457,7 +462,7 @@ $billingAddress = $block->getQuoteBillingAddress();
             let street = '';
             let houseNumber = '';
 
-            let getHouseNumberStreetLineConfig = "<?= $houseNumberStreetLine ?>";
+            let getHouseNumberStreetLineConfig = "<?= $escaper->escapeHtml($houseNumberStreetLine) ?>";
 
             city = address.city;
             country = address.country_id;