MC-42211: Amount attribute is passed to the Message even Billing Agreements feature is turned on

Author: krissyhiserote

app/code/Magento/Paypal/Block/PayLater/Banner.php

@@ -82,6 +82,9 @@ public function getJsLayout()
         $componentConfig = $this->jsLayout['components']['payLater']['config'] ?? [];
         $defaultConfig = ['sdkUrl' => $this->getPayPalSdkUrl()];
         $config = array_replace($defaultConfig, $componentConfig);
+        $displayAmount = $config['displayAmount'] ?? false;
+        $config['displayAmount'] = !$displayAmount || $this->payLaterConfig->isPPBillingAgreementEnabled()
+            ? false : true;
 
         //Extend block component attributes with defaults
         $componentAttributes = $this->jsLayout['components']['payLater']['config']['attributes'] ?? [];

app/code/Magento/Paypal/Block/PayLater/LayoutProcessor.php

@@ -72,6 +72,9 @@ public function process($jsLayout)
                 ]
             ];
             $config = array_replace($defaultConfig, $componentConfig);
+            $displayAmount = $config['displayAmount'] ?? false;
+            $config['displayAmount'] = !$displayAmount || $this->payLaterConfig->isPPBillingAgreementEnabled()
+                ? false : true;
 
             $attributes = $this->payLaterConfig->getSectionConfig(
                 PayLaterConfig::CHECKOUT_PAYMENT_PLACEMENT,

app/code/Magento/Paypal/Model/PayLaterConfig.php

@@ -134,4 +134,14 @@ public function getSectionConfig(string $section, string $key)
 
         return $this->configData[$section][$key];
     }
+
+    /**
+     * Check if billing agreement is enabled
+     *
+     * @return bool
+     */
+    public function isPPBillingAgreementEnabled(): bool
+    {
+        return $this->config->isMethodActive(Config::METHOD_BILLING_AGREEMENT);
+    }
 }