Merge remote-tracking branch 'origin/AC-1228' into gl_pr_paypal_nov11_2021

Author: rimple-saini

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

@@ -12,6 +12,7 @@
 use Magento\Paypal\Model\PayLaterConfig;
 use Magento\Paypal\Model\SdkUrl;
 use Magento\Paypal\Model\Config as PaypalConfig;
+use Magento\Framework\App\ObjectManager;
 
 /**
  * PayPal PayLater component block
@@ -56,14 +57,15 @@ public function __construct(
         PayLaterConfig $payLaterConfig,
         SdkUrl $sdkUrl,
         array $data = [],
-        PaypalConfig $paypalConfig
+        PaypalConfig $paypalConfig = null
     ) {
         parent::__construct($context, $data);
         $this->payLaterConfig = $payLaterConfig;
         $this->sdkUrl = $sdkUrl;
         $this->placement = $data['placement'] ??  '';
         $this->position = $data['position'] ??  '';
-        $this->paypalConfig = $paypalConfig;
+        $this->paypalConfig = $paypalConfig ?: ObjectManager::getInstance()
+            ->get(PaypalConfig::class);
     }
 
     /**

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

@@ -54,14 +54,14 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function process($jsLayout)
     {
         if (!$this->payLaterConfig->isEnabled(PayLaterConfig::CHECKOUT_PAYMENT_PLACEMENT)) {
             unset($jsLayout['components']['checkout']['children']['steps']['children']['billing-step']
-                ['children']['payment']['children']['payments-list']['children']['paypal-method-extra-content']['children']
-                ['paylater-place-order']);
+                ['children']['payment']['children']['payments-list']['children']['paypal-method-extra-content']
+                ['children']['paylater-place-order']);
 
             return $jsLayout;
         }