Merge branch 'develop' into fix/pass-additional-data-to-intent-authen…

…tication-exception
Automattic · Dec 13, 2023 · 4f5510a · 4f5510a
2 parents fb61488 + 56863b2
commit 4f5510a
Show file tree

Hide file tree

Showing 70 changed files with 269 additions and 2,104 deletions.
diff --git a/changelog/add-thank-you-page-tracks b/changelog/add-thank-you-page-tracks
@@ -0,0 +1,4 @@
+Significance: minor
+Type: dev
+
+Thank you page Tracks event
diff --git a/changelog/cleanup-is-upe-enabled-logic b/changelog/cleanup-is-upe-enabled-logic
@@ -0,0 +1,4 @@
+Significance: minor
+Type: update
+
+Cleanup the deprecated payment gateway processing - part III
diff --git a/changelog/dev-fix-multi-currency-e2e-tests b/changelog/dev-fix-multi-currency-e2e-tests
@@ -0,0 +1,5 @@
+Significance: patch
+Type: dev
+Comment: Fix multi-currency e2e tests.
+
+
diff --git a/changelog/dev-test-ci-without-3ds1 b/changelog/dev-test-ci-without-3ds1
@@ -0,0 +1,4 @@
+Significance: patch
+Type: dev
+
+Comment: Fix declined 3DS card E2E test.
diff --git a/changelog/fix-3693-qualitative-feedback-note b/changelog/fix-3693-qualitative-feedback-note
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fix
+
+Update Qualitative Feedback note to have more efficient sql query.
diff --git a/changelog/fix-7750-include-discount-in-tooltip b/changelog/fix-7750-include-discount-in-tooltip
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fix
+
+Include discount fee in fees tooltip
diff --git a/changelog/fix-account-currency-hook b/changelog/fix-account-currency-hook
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fix
+
+fix: account currency hook return value
diff --git a/client/additional-methods-setup/index.js b/client/additional-methods-setup/index.js
@@ -9,24 +9,13 @@
  */
 import Page from 'components/page';
 import UpePreviewMethodSelector from './upe-preview-methods-selector';
-import WcPayUpeContextProvider from '../settings/wcpay-upe-toggle/provider';
 import WCPaySettingsContext from '../settings/wcpay-settings-context';
 
 const AdditionalMethodsPage = () => {
-	const {
-		isUpeEnabled,
-		upeType,
-	} = window.wcpaySettings.additionalMethodsSetup;
-
 	return (
 		<Page>
 			<WCPaySettingsContext.Provider value={ window.wcpaySettings }>
-				<WcPayUpeContextProvider
-					defaultIsUpeEnabled={ isUpeEnabled }
-					defaultUpeType={ upeType }
-				>
-					<UpePreviewMethodSelector />
-				</WcPayUpeContextProvider>
+				<UpePreviewMethodSelector />
 			</WCPaySettingsContext.Provider>
 		</Page>
 	);

diff --git a/client/additional-methods-setup/test/index.js b/client/additional-methods-setup/test/index.js
diff --git a/client/additional-methods-setup/upe-preview-methods-selector/index.js b/client/additional-methods-setup/upe-preview-methods-selector/index.js
@@ -11,26 +11,14 @@ import Wizard from '../wizard/wrapper';
 import WizardTask from '../wizard/task';
 import WizardTaskList from '../wizard/task-list';
 import SetupCompleteTask from './setup-complete-task';
-import useIsUpeEnabled from '../../settings/wcpay-upe-toggle/hook';
 import AddPaymentMethodsTask from './add-payment-methods-task';
 import './index.scss';
 
 const UpePreviewMethodsSelector = () => {
-	const [ isUpeEnabled ] = useIsUpeEnabled();
-
 	return (
 		<Card className="upe-preview-methods-selector">
 			<CardBody>
-				<Wizard
-					defaultActiveTask={
-						isUpeEnabled
-							? 'add-payment-methods'
-							: 'enable-upe-preview'
-					}
-					defaultCompletedTasks={ {
-						'enable-upe-preview': isUpeEnabled,
-					} }
-				>
+				<Wizard defaultActiveTask="add-payment-methods">
 					<WizardTaskList>
 						<WizardTask id="add-payment-methods">
 							<AddPaymentMethodsTask />

diff --git a/client/additional-methods-setup/upe-preview-methods-selector/setup-complete-task.js b/client/additional-methods-setup/upe-preview-methods-selector/setup-complete-task.js
@@ -2,7 +2,7 @@
  * External dependencies
  */
 import React from 'react';
-import { useEffect, useContext } from '@wordpress/element';
+import { useContext } from '@wordpress/element';
 import { __, _n, sprintf } from '@wordpress/i18n';
 import { Button } from '@wordpress/components';
 
@@ -11,7 +11,6 @@ import { Button } from '@wordpress/components';
  */
 import CollapsibleBody from '../wizard/collapsible-body';
 import WizardTaskItem from '../wizard/task-item';
-import WizardTaskContext from '../wizard/task/context';
 import WCPaySettingsContext from '../../settings/wcpay-settings-context';
 import { useEnabledPaymentMethodIds } from '../../data';
 import WizardContext from '../wizard/wrapper/context';
@@ -70,19 +69,10 @@ const EnabledMethodsList = () => {
 };
 
 const SetupComplete = () => {
-	const { isActive } = useContext( WizardTaskContext );
 	const {
 		featureFlags: { multiCurrency },
 	} = useContext( WCPaySettingsContext );
 
-	useEffect( () => {
-		if ( ! isActive ) {
-			return;
-		}
-
-		window.wcpaySettings.additionalMethodsSetup.isUpeEnabled = true;
-	}, [ isActive ] );
-
 	return (
 		<WizardTaskItem
 			title={ __( 'Enablement complete', 'woocommerce-payments' ) }

diff --git a/...nt/additional-methods-setup/upe-preview-methods-selector/test/setup-complete-task.test.js b/...nt/additional-methods-setup/upe-preview-methods-selector/test/setup-complete-task.test.js
@@ -20,12 +20,6 @@ jest.mock( '../../../data', () => ( {
 
 describe( 'SetupComplete', () => {
 	beforeEach( () => {
-		window.wcpaySettings = {
-			additionalMethodsSetup: {
-				isUpeEnabled: false,
-			},
-		};
-
 		useEnabledPaymentMethodIds.mockReturnValue( [
 			[
 				'card',
@@ -41,30 +35,6 @@ describe( 'SetupComplete', () => {
 		] );
 	} );
 
-	it( 'sets isUpeEnabled if isActive', () => {
-		render(
-			<WizardTaskContext.Provider value={ { isActive: true } }>
-				<SetupComplete />
-			</WizardTaskContext.Provider>
-		);
-
-		expect(
-			window.wcpaySettings.additionalMethodsSetup.isUpeEnabled
-		).toBeTruthy();
-	} );
-
-	it( 'does not set isUpeEnabled if not isActive', () => {
-		render(
-			<WizardTaskContext.Provider value={ { isActive: false } }>
-				<SetupComplete />
-			</WizardTaskContext.Provider>
-		);
-
-		expect(
-			window.wcpaySettings.additionalMethodsSetup.isUpeEnabled
-		).toBeFalsy();
-	} );
-
 	it( 'renders setup complete messaging when context value is undefined', () => {
 		render(
 			<WizardContext.Provider value={ { completedTasks: {} } }>

diff --git a/client/checkout/api/index.js b/client/checkout/api/index.js
@@ -69,16 +69,10 @@ export default class WCPayAPI {
 			accountId,
 			forceNetworkSavedCards,
 			locale,
-			isUPEEnabled,
-			isUPEDeferredEnabled,
 			isStripeLinkEnabled,
 		} = this.options;
 
-		if (
-			forceNetworkSavedCards &&
-			! forceAccountRequest &&
-			! ( isUPEEnabled && ! isUPEDeferredEnabled )
-		) {
+		if ( forceNetworkSavedCards && ! forceAccountRequest ) {
 			if ( ! this.stripePlatform ) {
 				this.stripePlatform = this.createStripe(
 					publishableKey,
@@ -89,25 +83,17 @@ export default class WCPayAPI {
 		}
 
 		if ( ! this.stripe ) {
-			if ( isUPEEnabled ) {
-				let betas = [ 'card_country_event_beta_1' ];
-				if ( isStripeLinkEnabled ) {
-					betas = betas.concat( [ 'link_autofill_modal_beta_1' ] );
-				}
-
-				this.stripe = this.createStripe(
-					publishableKey,
-					locale,
-					accountId,
-					betas
-				);
-			} else {
-				this.stripe = this.createStripe(
-					publishableKey,
-					locale,
-					accountId
-				);
+			let betas = [ 'card_country_event_beta_1' ];
+			if ( isStripeLinkEnabled ) {
+				betas = betas.concat( [ 'link_autofill_modal_beta_1' ] );
 			}
+
+			this.stripe = this.createStripe(
+				publishableKey,
+				locale,
+				accountId,
+				betas
+			);
 		}
 		return this.stripe;
 	}
@@ -352,14 +338,11 @@ export default class WCPayAPI {
 	/**
 	 * Creates a setup intent without confirming it.
 	 *
-	 * @param {string} paymentMethodType Stripe payment method type ID.
 	 * @return {Promise} The final promise for the request to the server.
 	 */
-	initSetupIntent( paymentMethodType = '' ) {
-		let path = 'init_setup_intent';
-		if ( this.options.isUPESplitEnabled && paymentMethodType ) {
-			path += `_${ paymentMethodType }`;
-		}
+	initSetupIntent() {
+		const path = 'init_setup_intent';
+
 		return this.request( buildAjaxURL( getConfig( 'wcAjaxUrl' ), path ), {
 			_ajax_nonce: getConfig( 'createSetupIntentNonce' ),
 		} ).then( ( response ) => {
@@ -414,16 +397,13 @@ export default class WCPayAPI {
 	 * @return {Promise} The final promise for the request to the server.
 	 */
 	createIntent( options ) {
-		const { fingerprint, paymentMethodType, orderId } = options;
-		let path = 'create_payment_intent';
+		const { fingerprint, orderId } = options;
+		const path = 'create_payment_intent';
 		const params = {
 			_ajax_nonce: getConfig( 'createPaymentIntentNonce' ),
 			'wcpay-fingerprint': fingerprint,
 		};
 
-		if ( this.options.isUPESplitEnabled && paymentMethodType ) {
-			path += `_${ paymentMethodType }`;
-		}
 		if ( orderId ) {
 			params.wcpay_order_id = orderId;
 		}
@@ -468,10 +448,8 @@ export default class WCPayAPI {
 		paymentCountry,
 		fingerprint
 	) {
-		let path = 'update_payment_intent';
-		if ( this.options.isUPESplitEnabled ) {
-			path += `_${ selectedUPEPaymentType }`;
-		}
+		const path = 'update_payment_intent';
+
 		return this.request( buildAjaxURL( getConfig( 'wcAjaxUrl' ), path ), {
 			wcpay_order_id: orderId,
 			wc_payment_intent_id: paymentIntentId,

diff --git a/client/checkout/blocks/index.js b/client/checkout/blocks/index.js
@@ -62,9 +62,6 @@ const api = new WCPayAPI(
 		accountId: getUPEConfig( 'accountId' ),
 		forceNetworkSavedCards: getUPEConfig( 'forceNetworkSavedCards' ),
 		locale: getUPEConfig( 'locale' ),
-		isUPEEnabled: getUPEConfig( 'isUPEEnabled' ),
-		isUPESplitEnabled: getUPEConfig( 'isUPESplitEnabled' ),
-		isUPEDeferredEnabled: getUPEConfig( 'isUPEDeferredEnabled' ),
 		isStripeLinkEnabled,
 	},
 	request

diff --git a/client/checkout/classic/event-handlers.js b/client/checkout/classic/event-handlers.js
@@ -42,11 +42,9 @@ jQuery( function ( $ ) {
 			accountId: getUPEConfig( 'accountId' ),
 			forceNetworkSavedCards: getUPEConfig( 'forceNetworkSavedCards' ),
 			locale: getUPEConfig( 'locale' ),
-			isUPEEnabled: getUPEConfig( 'isUPEEnabled' ),
 			isStripeLinkEnabled: isLinkEnabled(
 				getUPEConfig( 'paymentMethodsConfig' )
 			),
-			isUPEDeferredEnabled: getUPEConfig( 'isUPEDeferredEnabled' ),
 		},
 		apiRequest
 	);
@@ -79,9 +77,7 @@ jQuery( function ( $ ) {
 		$( 'form#add_payment_method' ).length ||
 		$( 'form#order_review' ).length
 	) {
-		if ( getUPEConfig( 'isUPEEnabled' ) ) {
-			maybeMountStripePaymentElement();
-		}
+		maybeMountStripePaymentElement();
 	}
 
 	$( 'form#add_payment_method' ).on( 'submit', function () {

diff --git a/client/checkout/classic/payment-processing.js b/client/checkout/classic/payment-processing.js
@@ -304,7 +304,7 @@ export function renderTerms( event ) {
 		return;
 	}
 	const upeElement = gatewayUPEComponents[ paymentMethodType ].upeElement;
-	if ( getUPEConfig( 'isUPEEnabled' ) && upeElement ) {
+	if ( upeElement ) {
 		upeElement.update( {
 			terms: getTerms( getUPEConfig( 'paymentMethodsConfig' ), value ),
 		} );

diff --git a/client/checkout/classic/test/payment-processing.test.js b/client/checkout/classic/test/payment-processing.test.js
@@ -236,15 +236,10 @@ describe( 'Stripe Payment Element mounting', () => {
 			if ( argument === 'currency' ) {
 				return 'eur';
 			}
-
-			if ( argument === 'isUPEEnabled' ) {
-				return true;
-			}
 		} );
 
 		getSelectedUPEGatewayPaymentMethod.mockReturnValue( 'card' );
 		renderTerms( event );
-		expect( getUPEConfig ).toHaveBeenCalledWith( 'isUPEEnabled' );
 		expect( mockUpdateFunction ).toHaveBeenCalled();
 	} );
 
@@ -256,7 +251,6 @@ describe( 'Stripe Payment Element mounting', () => {
 		};
 		getSelectedUPEGatewayPaymentMethod.mockReturnValue( null );
 		renderTerms( event );
-		expect( getUPEConfig ).not.toHaveBeenCalledWith( 'isUPEEnabled' );
 		expect( mockUpdateFunction ).not.toHaveBeenCalled();
 	} );