Merge remote-tracking branch 'origin/MC-36776' into 2.3-develop-pr146

Author: zakdma

app/code/Magento/Paypal/Test/Mftf/ActionGroup/StorefrontPayOrderOnPayPalCheckoutActionGroup.xml

@@ -18,8 +18,7 @@
         <click selector="{{PayPalPaymentSection.cartIcon}}" stepKey="openCart"/>
         <waitForElementVisible selector="{{PayPalPaymentSection.itemName(productName)}}" stepKey="waitForCartLoad"/>
         <seeElement selector="{{PayPalPaymentSection.itemName(productName)}}" stepKey="seeProductName"/>
-        <scrollTo selector="{{PayPalPaymentSection.PayPalSubmitBtn}}" stepKey="scrollToPayPalSubmitBtn"/>
-        <waitForElementVisible selector="{{PayPalPaymentSection.PayPalSubmitBtn}}" stepKey="waitPayPalSubmitBtnVisible"/>
+        <conditionalClick selector="{{PayPalPaymentSection.acceptCookies}}" dependentSelector="{{PayPalPaymentSection.acceptCookies}}" visible="true" stepKey="acceptCookiesIfAppeared"/>
         <click selector="{{PayPalPaymentSection.PayPalSubmitBtn}}" stepKey="clickPayPalSubmitBtn"/>
         <switchToPreviousTab stepKey="switchToPreviousTab"/>
         <waitForPageLoad stepKey="waitForPageLoad"/>

app/code/Magento/Paypal/Test/Mftf/Section/PayPalExpressCheckoutConfigSection.xml

@@ -64,5 +64,6 @@
         <element name="PayPalSubmitBtn" type="text" selector="#payment-submit-btn"/>
         <element name="nextButton" type="button" selector="#btnNext"/>
         <element name="continueButton" type="button" selector=".continueButton"/>
+        <element name="acceptCookies" type="button" selector=".ccpaCookieBanner_buttonGroup #acceptAllButton" timeout="10"/>
     </section>
 </sections>