From 22e908ff25a426b2a1259f01e465f18844e1bb40 Mon Sep 17 00:00:00 2001
From: Alex P <alex.pantec@gmail.com>
Date: Wed, 20 Dec 2023 08:59:47 +0200
Subject: [PATCH] Fix context check

---
 modules/ppcp-button/src/Assets/SmartButton.php  | 6 ++++--
 modules/ppcp-button/src/Helper/ContextTrait.php | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/modules/ppcp-button/src/Assets/SmartButton.php b/modules/ppcp-button/src/Assets/SmartButton.php
index e06f34a8e..311a39786 100644
--- a/modules/ppcp-button/src/Assets/SmartButton.php
+++ b/modules/ppcp-button/src/Assets/SmartButton.php
@@ -624,6 +624,8 @@ document.querySelector("#payment").before(document.querySelector("#ppcp-messages
 
 		$messaging_enabled_for_current_location = $this->settings_status->is_pay_later_messaging_enabled_for_location( $location );
 
+		$has_paylater_block = has_block( 'woocommerce-paypal-payments/paylater-messages' );
+
 		switch ( $location ) {
 			case 'checkout':
 			case 'cart':
@@ -636,9 +638,9 @@ document.querySelector("#payment").before(document.querySelector("#ppcp-messages
 				return true;
 			case 'checkout-block':
 			case 'cart-block':
-				return has_block( 'woocommerce-paypal-payments/paylater-messages' ) || $this->is_block_editor();
+				return $has_paylater_block || $this->is_block_editor();
 			default:
-				return false;
+				return $has_paylater_block;
 		}
 	}
 
diff --git a/modules/ppcp-button/src/Helper/ContextTrait.php b/modules/ppcp-button/src/Helper/ContextTrait.php
index a9c81c08d..3deacb613 100644
--- a/modules/ppcp-button/src/Helper/ContextTrait.php
+++ b/modules/ppcp-button/src/Helper/ContextTrait.php
@@ -184,7 +184,7 @@ trait ContextTrait {
 	 */
 	protected function is_block_editor(): bool {
 		if ( ! function_exists( 'get_current_screen' ) ) {
-			return true;
+			return false;
 		}
 		$screen = get_current_screen();
 		return $screen && $screen->is_block_editor();