MAGETWO-48372: Billing Agreement popup doesn't appear on product page after clicking on Checkout with Express button

Author: oshmyheliuk

app/code/Magento/Paypal/CustomerData/BillingAgreement.php

@@ -54,29 +54,26 @@ class BillingAgreement implements SectionSourceInterface
      *
      * @var string
      */
-    private $startAction = '';
+    private $startAction = 'paypal/express/start/button/1';
 
     /**
      * @param CurrentCustomer $currentCustomer
      * @param Data $paypalData
      * @param ConfigFactory $paypalConfigFactory
      * @param UrlInterface $urlBuilder
      * @param Escaper $escaper
-     * @param string $startAction
      */
     public function __construct(
         CurrentCustomer $currentCustomer,
         Data $paypalData,
         ConfigFactory $paypalConfigFactory,
         UrlInterface $urlBuilder,
-        Escaper $escaper,
-        $startAction
+        Escaper $escaper
     ) {
         $this->currentCustomer = $currentCustomer;
         $this->paypalData = $paypalData;
         $this->urlBuilder = $urlBuilder;
         $this->escaper = $escaper;
-        $this->startAction = $startAction;
         $this->config = $paypalConfigFactory->create();
         $this->config->setMethod(Config::METHOD_EXPRESS);
     }

app/code/Magento/Paypal/etc/frontend/di.xml

@@ -105,12 +105,7 @@
             </argument>
         </arguments>
     </type>
-    <type name="Magento\Paypal\CustomerData\BillingAgreement">
-        <arguments>
-            <argument name="startAction" xsi:type="string">paypal/express/start/button/1</argument>
-        </arguments>
-    </type>
-    <type name="Magento\Customer\CustomerData\SectionPoolInterface">
+    <type name="Magento\Customer\CustomerData\SectionPool">
         <arguments>
             <argument name="sectionSourceMap" xsi:type="array">
                 <item name="paypal-billing-agreement" xsi:type="string">Magento\Paypal\CustomerData\BillingAgreement</item>