From 0d228d0d7667439432ec0f0f9c4040f068dab036 Mon Sep 17 00:00:00 2001
From: Daniel Dudzic <d.dudzic@syde.com>
Date: Thu, 10 Oct 2024 20:40:03 +0200
Subject: [PATCH] Axo Block: Always display the Fastlane watermark under the
 email input in the includeAdditionalInfo mode. Also move the loading spinner
 to the right.

---
 modules/ppcp-axo-block/resources/css/gateway.scss           | 4 ++--
 .../resources/js/components/Watermark/WatermarkManager.js   | 6 +-----
 .../resources/js/components/Watermark/utils.js              | 4 +---
 3 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/modules/ppcp-axo-block/resources/css/gateway.scss b/modules/ppcp-axo-block/resources/css/gateway.scss
index 42a14bd6b..5e234c568 100644
--- a/modules/ppcp-axo-block/resources/css/gateway.scss
+++ b/modules/ppcp-axo-block/resources/css/gateway.scss
@@ -259,8 +259,8 @@ a.wc-block-axo-change-link {
 .wp-block-woocommerce-checkout-fields-block:not(.wc-block-axo-is-loaded) {
 	.wc-block-checkout-axo-block-watermark-container {
 		display: flex;
-		justify-content: left;
-		margin-left: 10px;
+		justify-content: right;
+		margin-right: 10px;
 		align-items: center;
 		position: relative;
 
diff --git a/modules/ppcp-axo-block/resources/js/components/Watermark/WatermarkManager.js b/modules/ppcp-axo-block/resources/js/components/Watermark/WatermarkManager.js
index ef175a98f..0d9207527 100644
--- a/modules/ppcp-axo-block/resources/js/components/Watermark/WatermarkManager.js
+++ b/modules/ppcp-axo-block/resources/js/components/Watermark/WatermarkManager.js
@@ -16,9 +16,6 @@ import {
  */
 const WatermarkManager = ( { fastlaneSdk } ) => {
 	// Select relevant states from the AXO store
-	const isGuest = useSelect( ( select ) =>
-		select( STORE_NAME ).getIsGuest()
-	);
 	const isAxoActive = useSelect( ( select ) =>
 		select( STORE_NAME ).getIsAxoActive()
 	);
@@ -34,7 +31,6 @@ const WatermarkManager = ( { fastlaneSdk } ) => {
 				isAxoActive,
 				isAxoScriptLoaded,
 				fastlaneSdk,
-				isGuest,
 			} );
 		} else {
 			// Remove watermark when AXO is inactive and not loading
@@ -43,7 +39,7 @@ const WatermarkManager = ( { fastlaneSdk } ) => {
 
 		// Cleanup function to remove watermark on unmount
 		return removeWatermark;
-	}, [ fastlaneSdk, isGuest, isAxoActive, isAxoScriptLoaded ] );
+	}, [ fastlaneSdk, isAxoActive, isAxoScriptLoaded ] );
 
 	// This component doesn't render anything directly
 	return null;
diff --git a/modules/ppcp-axo-block/resources/js/components/Watermark/utils.js b/modules/ppcp-axo-block/resources/js/components/Watermark/utils.js
index 638bffe61..3f1c305c0 100644
--- a/modules/ppcp-axo-block/resources/js/components/Watermark/utils.js
+++ b/modules/ppcp-axo-block/resources/js/components/Watermark/utils.js
@@ -112,13 +112,11 @@ export const renderWatermarkContent = ( content ) => {
  * @param {boolean} params.isAxoActive       - Whether AXO is active.
  * @param {boolean} params.isAxoScriptLoaded - Whether AXO script is loaded.
  * @param {Object}  params.fastlaneSdk       - The Fastlane SDK instance.
- * @param {boolean} params.isGuest           - Whether the user is a guest.
  */
 export const updateWatermarkContent = ( {
 	isAxoActive,
 	isAxoScriptLoaded,
 	fastlaneSdk,
-	isGuest,
 } ) => {
 	if ( ! isAxoActive && ! isAxoScriptLoaded ) {
 		// Show loading spinner
@@ -134,7 +132,7 @@ export const updateWatermarkContent = ( {
 			createElement( Watermark, {
 				fastlaneSdk,
 				name: 'fastlane-watermark-email',
-				includeAdditionalInfo: isGuest,
+				includeAdditionalInfo: true,
 			} )
 		);
 	} else {