From f76a0173da78565deef86ccf58f6ced29ff41927 Mon Sep 17 00:00:00 2001
From: Daniel Mallory <daniel.mallory@automattic.com>
Date: Mon, 21 Oct 2024 12:51:42 +0100
Subject: [PATCH 01/45] Add new tracking events and update Stripe connect
 library (#9607)

---
 changelog/dev-readd-tracking-event       |  4 ++++
 client/onboarding/steps/embedded-kyc.tsx | 12 ++++++++++++
 client/onboarding/tracking.ts            | 23 ++++++++++++++++++++++-
 client/tracks/event.d.ts                 |  1 +
 package-lock.json                        | 18 +++++++++---------
 package.json                             |  4 ++--
 6 files changed, 50 insertions(+), 12 deletions(-)
 create mode 100644 changelog/dev-readd-tracking-event

diff --git a/changelog/dev-readd-tracking-event b/changelog/dev-readd-tracking-event
new file mode 100644
index 00000000000..475904c11b2
--- /dev/null
+++ b/changelog/dev-readd-tracking-event
@@ -0,0 +1,4 @@
+Significance: minor
+Type: update
+
+Improvements to events during onboarding flow.
diff --git a/client/onboarding/steps/embedded-kyc.tsx b/client/onboarding/steps/embedded-kyc.tsx
index e01ed82ca90..4acf74f6d94 100644
--- a/client/onboarding/steps/embedded-kyc.tsx
+++ b/client/onboarding/steps/embedded-kyc.tsx
@@ -25,6 +25,10 @@ import {
 	isPoEligible,
 } from 'wcpay/onboarding/utils';
 import { getConnectUrl, getOverviewUrl } from 'wcpay/utils';
+import {
+	trackEmbeddedStepChange,
+	trackRedirected,
+} from 'wcpay/onboarding/tracking';
 
 interface Props {
 	continueKyc?: boolean;
@@ -57,6 +61,7 @@ const EmbeddedKyc: React.FC< Props > = ( {
 				isEligible
 			);
 			if ( accountSession && accountSession.clientSecret ) {
+				trackRedirected( isEligible, true );
 				return accountSession; // Return the full account session object
 			}
 
@@ -139,6 +144,10 @@ const EmbeddedKyc: React.FC< Props > = ( {
 		locale,
 	] );
 
+	const handleStepChange = ( step: string ) => {
+		trackEmbeddedStepChange( step );
+	};
+
 	const handleOnExit = async () => {
 		const urlParams = new URLSearchParams( window.location.search );
 		const urlSource =
@@ -192,6 +201,9 @@ const EmbeddedKyc: React.FC< Props > = ( {
 							)
 						}
 						onExit={ handleOnExit }
+						onStepChange={ ( stepChange ) =>
+							handleStepChange( stepChange.step )
+						}
 						collectionOptions={ {
 							fields: collectPayoutRequirements
 								? 'eventually_due'
diff --git a/client/onboarding/tracking.ts b/client/onboarding/tracking.ts
index 1250e4c5a16..a370a1449b2 100644
--- a/client/onboarding/tracking.ts
+++ b/client/onboarding/tracking.ts
@@ -46,11 +46,32 @@ export const trackStepCompleted = ( step: string ): void => {
 	trackedSteps.add( step );
 };
 
-export const trackRedirected = ( isPoEligible: boolean ): void => {
+export const trackRedirected = (
+	isPoEligible: boolean,
+	isEmbedded = false
+): void => {
 	const urlParams = new URLSearchParams( window.location.search );
 
 	recordEvent( 'wcpay_onboarding_flow_redirected', {
 		is_po_eligible: isPoEligible,
+		is_embedded_onboarding: isEmbedded,
+		elapsed: elapsed( startTime ),
+		source:
+			urlParams.get( 'source' )?.replace( /[^\w-]+/g, '' ) || 'unknown',
+	} );
+};
+
+/**
+ * Track a change in the embedded onboarding step.
+ *
+ * @param step The current step in the embedded onboarding flow. See:
+ * https://docs.stripe.com/connect/supported-embedded-components/account-onboarding#step-values
+ */
+export const trackEmbeddedStepChange = ( step: string ): void => {
+	const urlParams = new URLSearchParams( window.location.search );
+
+	recordEvent( 'wcpay_onboarding_flow_embedded_step_change', {
+		step: step,
 		elapsed: elapsed( startTime ),
 		source:
 			urlParams.get( 'source' )?.replace( /[^\w-]+/g, '' ) || 'unknown',
diff --git a/client/tracks/event.d.ts b/client/tracks/event.d.ts
index 170038e4bcc..b445a55e65a 100644
--- a/client/tracks/event.d.ts
+++ b/client/tracks/event.d.ts
@@ -60,6 +60,7 @@ export type Event =
 	| 'wcpay_onboarding_flow_reset'
 	| 'wcpay_onboarding_flow_eligibility_modal_closed'
 	| 'wcpay_onboarding_flow_setup_live_payments'
+	| 'wcpay_onboarding_flow_embedded_step_change'
 	| 'wcpay_overview_balances_currency_tab_click'
 	| 'wcpay_overview_deposits_view_history_click'
 	| 'wcpay_overview_deposits_change_schedule_click'
diff --git a/package-lock.json b/package-lock.json
index 56cfed2cfa8..0fa3c1bd240 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -12,8 +12,8 @@
       "dependencies": {
         "@automattic/interpolate-components": "1.2.1",
         "@fingerprintjs/fingerprintjs": "3.4.1",
-        "@stripe/connect-js": "3.3.12",
-        "@stripe/react-connect-js": "3.3.13",
+        "@stripe/connect-js": "3.3.16",
+        "@stripe/react-connect-js": "3.3.17",
         "@stripe/react-stripe-js": "2.5.1",
         "@stripe/stripe-js": "1.15.1",
         "@woocommerce/explat": "2.3.0",
@@ -9158,16 +9158,16 @@
       }
     },
     "node_modules/@stripe/connect-js": {
-      "version": "3.3.12",
-      "resolved": "https://registry.npmjs.org/@stripe/connect-js/-/connect-js-3.3.12.tgz",
-      "integrity": "sha512-hXbgvGq9Lb6BYgsb8lcbjL76Yqsxr0yAj6T9ZFTfUK0O4otI5GSEWum9do9rf/E5OfYy6fR1FG/77Jve2w1o6Q=="
+      "version": "3.3.16",
+      "resolved": "https://registry.npmjs.org/@stripe/connect-js/-/connect-js-3.3.16.tgz",
+      "integrity": "sha512-lMUKJJaDl6qzjp+czNn+N6wMwFXwLawmB2jNNgds8SeR+bXCVCXevzJ8dfF92KfmexKg++hBYagF9e99sEMBJQ=="
     },
     "node_modules/@stripe/react-connect-js": {
-      "version": "3.3.13",
-      "resolved": "https://registry.npmjs.org/@stripe/react-connect-js/-/react-connect-js-3.3.13.tgz",
-      "integrity": "sha512-kMxYjeQUcl/ixu/mSeX5QGIr/MuP+YxFSEBdb8j6w+tbK82tmcjyFDgoQTQwVXNqUV6jI66Kks3XcfpPRfeiJA==",
+      "version": "3.3.17",
+      "resolved": "https://registry.npmjs.org/@stripe/react-connect-js/-/react-connect-js-3.3.17.tgz",
+      "integrity": "sha512-uxCh6ACcSWS/t0kBeqvvRieBI9pRxh2rPxt6NpjrTg3Ft1ZDleUfg9OAjkfoOT3Ta+FTomouA19l2ju7If2h5A==",
       "peerDependencies": {
-        "@stripe/connect-js": ">=3.3.11",
+        "@stripe/connect-js": ">=3.3.16",
         "react": ">=16.8.0",
         "react-dom": ">=16.8.0"
       }
diff --git a/package.json b/package.json
index 629b9ceee87..70bb5da54ae 100644
--- a/package.json
+++ b/package.json
@@ -77,8 +77,8 @@
   "dependencies": {
     "@automattic/interpolate-components": "1.2.1",
     "@fingerprintjs/fingerprintjs": "3.4.1",
-    "@stripe/connect-js": "3.3.12",
-    "@stripe/react-connect-js": "3.3.13",
+    "@stripe/connect-js": "3.3.16",
+    "@stripe/react-connect-js": "3.3.17",
     "@stripe/react-stripe-js": "2.5.1",
     "@stripe/stripe-js": "1.15.1",
     "@woocommerce/explat": "2.3.0",

From 51b94bee5900b8e2a71a221a290262583d2649ef Mon Sep 17 00:00:00 2001
From: Eric Jinks <3147296+Jinksi@users.noreply.github.com>
Date: Tue, 22 Oct 2024 15:06:46 +1000
Subject: [PATCH 02/45] Remove unnecessary WC table css overrides to fix WC
 Analytics styling and a11y issues (#9603)

---
 changelog/fix-9572-woococommerce-table-specificity |  4 ++++
 client/style.scss                                  | 13 ++++---------
 2 files changed, 8 insertions(+), 9 deletions(-)
 create mode 100644 changelog/fix-9572-woococommerce-table-specificity

diff --git a/changelog/fix-9572-woococommerce-table-specificity b/changelog/fix-9572-woococommerce-table-specificity
new file mode 100644
index 00000000000..de47974865b
--- /dev/null
+++ b/changelog/fix-9572-woococommerce-table-specificity
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fix
+
+Remove unnecessary '.woocommerce-table' css overrides to fix WC Analytics styling and a11y issues
diff --git a/client/style.scss b/client/style.scss
index 7fe3269109f..2e4b8312271 100644
--- a/client/style.scss
+++ b/client/style.scss
@@ -20,15 +20,10 @@
 	}
 }
 
-.woocommerce-table {
-	font-weight: 300;
-	letter-spacing: 0.012rem;
-	color: $studio-gray-60;
-
-	.woocommerce-table__summary {
-		border-radius: 0 0 3px 3px;
-	}
-
+/**
+* This styling is for all `<TableCard />` components found in WooPayments screens.
+*/
+.woocommerce-payments-page .woocommerce-table {
 	.woocommerce-table__item {
 		white-space: nowrap;
 	}

From 1652cc9092b3fa7fe77111b28c994cc9d96ef29d Mon Sep 17 00:00:00 2001
From: Shendy <73803630+shendy-a8c@users.noreply.github.com>
Date: Tue, 22 Oct 2024 17:58:24 +0700
Subject: [PATCH 03/45] npm script to update e2e-pw screenshots / snapshots
 (#9544)

---
 changelog/update-npm-readme-update-e2e-pw-snapshots | 5 +++++
 package.json                                        | 1 +
 2 files changed, 6 insertions(+)
 create mode 100644 changelog/update-npm-readme-update-e2e-pw-snapshots

diff --git a/changelog/update-npm-readme-update-e2e-pw-snapshots b/changelog/update-npm-readme-update-e2e-pw-snapshots
new file mode 100644
index 00000000000..3927f45ec0d
--- /dev/null
+++ b/changelog/update-npm-readme-update-e2e-pw-snapshots
@@ -0,0 +1,5 @@
+Significance: patch
+Type: dev
+Comment: Not user-facing.
+
+
diff --git a/package.json b/package.json
index 70bb5da54ae..9d207be5e40 100644
--- a/package.json
+++ b/package.json
@@ -38,6 +38,7 @@
     "test:e2e-dev": "NODE_CONFIG_DIR='tests/e2e/config' JEST_PUPPETEER_CONFIG='tests/e2e/config/jest-puppeteer.config.js' wp-scripts test-e2e --config tests/e2e/config/jest.config.js --puppeteer-interactive",
     "test:e2e-performance": "NODE_CONFIG_DIR='tests/e2e/config' wp-scripts test-e2e --config tests/e2e/config/jest.performance.config.js",
     "test:e2e-pw": "./tests/e2e-pw/test-e2e-pw.sh",
+    "test:e2e-pw-update-snapshots": "npm run test:e2e-pw -- --update-snapshots",
     "test:e2e-pw-ui": "./tests/e2e-pw/test-e2e-pw-ui.sh",
     "test:e2e-pw-ci": "npx playwright test --config=tests/e2e-pw/playwright.config.ts --grep-invert @todo",
     "test:update-snapshots": "npm run test:js -- --updateSnapshot",

From 439c151c278d2638f780953c4e88a3c5edae84e8 Mon Sep 17 00:00:00 2001
From: Alefe Souza <contact@alefesouza.com>
Date: Tue, 22 Oct 2024 08:33:25 -0500
Subject: [PATCH 04/45] Fix WooPay duplicated Save my info section (#9531)

Co-authored-by: Danae Millan <danae.millan@automattic.com>
---
 changelog/fix-woopay-duplicated-component |  4 +++
 client/checkout/woopay/index.js           | 43 +++++++++++++----------
 2 files changed, 29 insertions(+), 18 deletions(-)
 create mode 100644 changelog/fix-woopay-duplicated-component

diff --git a/changelog/fix-woopay-duplicated-component b/changelog/fix-woopay-duplicated-component
new file mode 100644
index 00000000000..a5735f338c3
--- /dev/null
+++ b/changelog/fix-woopay-duplicated-component
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fix
+
+Fix WooPay duplicated Save my info section.
diff --git a/client/checkout/woopay/index.js b/client/checkout/woopay/index.js
index cdc2ca864f3..f6c8902a514 100644
--- a/client/checkout/woopay/index.js
+++ b/client/checkout/woopay/index.js
@@ -23,31 +23,38 @@ const renderSaveUserSection = () => {
 	);
 
 	if ( blocksCheckout.length ) {
-		const checkoutPageSaveUserContainer = document.createElement(
-			'fieldset'
+		let checkoutPageSaveUserContainer = document.querySelector(
+			'#remember-me'
 		);
-		const paymentOptions = document.getElementsByClassName(
-			'wp-block-woocommerce-checkout-payment-block'
-		)?.[ 0 ];
 
-		checkoutPageSaveUserContainer.className =
-			'wc-block-checkout__payment-method wp-block-woocommerce-checkout-remember-block wc-block-components-checkout-step ';
-		checkoutPageSaveUserContainer.id = 'remember-me';
+		if ( ! checkoutPageSaveUserContainer ) {
+			const paymentOptions = document.getElementsByClassName(
+				'wp-block-woocommerce-checkout-payment-block'
+			)?.[ 0 ];
 
-		if ( paymentOptions ) {
-			// Render right after the payment options block, as a sibling element.
-			paymentOptions.parentNode.insertBefore(
-				checkoutPageSaveUserContainer,
-				paymentOptions.nextSibling
+			checkoutPageSaveUserContainer = document.createElement(
+				'fieldset'
 			);
 
-			paymentOptions.classList.add( 'is-woopay' );
+			checkoutPageSaveUserContainer.className =
+				'wc-block-checkout__payment-method wp-block-woocommerce-checkout-remember-block wc-block-components-checkout-step ';
+			checkoutPageSaveUserContainer.id = 'remember-me';
 
-			ReactDOM.render(
-				<CheckoutPageSaveUser isBlocksCheckout={ true } />,
-				checkoutPageSaveUserContainer
-			);
+			if ( paymentOptions ) {
+				// Render right after the payment options block, as a sibling element.
+				paymentOptions.parentNode.insertBefore(
+					checkoutPageSaveUserContainer,
+					paymentOptions.nextSibling
+				);
+
+				paymentOptions.classList.add( 'is-woopay' );
+			}
 		}
+
+		ReactDOM.render(
+			<CheckoutPageSaveUser isBlocksCheckout={ true } />,
+			checkoutPageSaveUserContainer
+		);
 	} else {
 		const checkoutPageSaveUserContainer = document.createElement( 'div' );
 		checkoutPageSaveUserContainer.className =

From 6611bb1ffae5f4e78b8843861c0b240a7d7caa4e Mon Sep 17 00:00:00 2001
From: Eduardo Umpierre <eduardoumpierre@hotmail.com>
Date: Tue, 22 Oct 2024 11:24:07 -0300
Subject: [PATCH 05/45] Add risk level information to the Fraud & Risk meta box
 (#9515)

---
 assets/css/admin.css                          |  84 +++++++-
 .../add-1225-flag-elevated-risk-transactions  |   4 +
 .../class-wc-payments-admin-settings.php      |   6 +-
 includes/class-wc-payments-order-service.php  |  46 +++-
 .../class-order-fraud-and-risk-meta-box.php   |  67 +++++-
 ...st-class-order-fraud-and-risk-meta-box.php | 204 ++++++++++++++++--
 6 files changed, 384 insertions(+), 27 deletions(-)
 create mode 100644 changelog/add-1225-flag-elevated-risk-transactions

diff --git a/assets/css/admin.css b/assets/css/admin.css
index baf66dcee88..7b6d75945de 100644
--- a/assets/css/admin.css
+++ b/assets/css/admin.css
@@ -155,11 +155,93 @@
 	padding-top: 2px;
 }
 
+/* WCPay Fraud Risk Level meta box */
+.wcpay-fraud-risk-level {
+	border-bottom: 1px solid #ddd;
+	padding: 8px 12px;
+}
+
+.wcpay-fraud-risk-level > p {
+	margin: 0;
+}
+
+.wcpay-fraud-risk-level__title {
+	font-weight: 600;
+}
+
+.wcpay-fraud-risk-level__bar {
+	display: grid;
+	gap: 4px;
+	grid-template-columns: 50% auto;
+	margin: 6px 0 8px;
+}
+
+.wcpay-fraud-risk-level__bar::after,
+.wcpay-fraud-risk-level__bar::before {
+	background-color: #bbb;
+	content: '';
+	border-radius: 4px;
+	height: 4px;
+}
+
+.wcpay-fraud-risk-level--normal .wcpay-fraud-risk-level__title {
+	color: #008a20;
+}
+
+.wcpay-fraud-risk-level--normal .wcpay-fraud-risk-level__bar {
+	grid-template-columns: 15% auto;
+}
+
+.wcpay-fraud-risk-level--normal .wcpay-fraud-risk-level__bar::before {
+	background-color: #008a20;
+}
+
+.wcpay-fraud-risk-level--elevated .wcpay-fraud-risk-level__title {
+	color: #b16202;
+}
+
+.wcpay-fraud-risk-level--elevated .wcpay-fraud-risk-level__bar {
+	grid-template-columns: 60% auto;
+}
+
+.wcpay-fraud-risk-level--elevated .wcpay-fraud-risk-level__bar::before {
+	background-color: #b16202;
+}
+
+.wcpay-fraud-risk-level--highest .wcpay-fraud-risk-level__bar::before {
+	background-color: #b32d2e;
+}
+
+.wcpay-fraud-risk-level--highest .wcpay-fraud-risk-level__bar {
+	grid-template-columns: 100% auto;
+}
+
+.wcpay-fraud-risk-level--highest .wcpay-fraud-risk-level__bar::before {
+	background-color: #b32d2e;
+}
+
+/* WCPay Fraud Risk Action meta box */
+#wcpay-order-fraud-and-risk-meta-box div.inside {
+	margin-top: 0;
+	padding: 0;
+}
+
+.wcpay-fraud-risk-action {
+	padding: 8px 12px 12px;
+}
+
+.wcpay-fraud-risk-action > p {
+	margin: 0 0 6px;
+}
+
+.wcpay-fraud-risk-action > p:last-child {
+	margin-bottom: 0;
+}
+
 .wcpay-fraud-risk-meta-allow,
 .wcpay-fraud-risk-meta-review,
 .wcpay-fraud-risk-meta-blocked {
 	font-weight: 600;
-	font-size: 14px;
 }
 
 .wcpay-fraud-risk-meta-allow img {
diff --git a/changelog/add-1225-flag-elevated-risk-transactions b/changelog/add-1225-flag-elevated-risk-transactions
new file mode 100644
index 00000000000..aaf4e54a8b6
--- /dev/null
+++ b/changelog/add-1225-flag-elevated-risk-transactions
@@ -0,0 +1,4 @@
+Significance: minor
+Type: add
+
+Add risk level information to the fraud and risk box on the order details page.
diff --git a/includes/admin/class-wc-payments-admin-settings.php b/includes/admin/class-wc-payments-admin-settings.php
index cec7ca48b17..ea4105406f0 100644
--- a/includes/admin/class-wc-payments-admin-settings.php
+++ b/includes/admin/class-wc-payments-admin-settings.php
@@ -96,9 +96,11 @@ public static function is_current_page_settings() {
 	/**
 	 * Returns the URL of the configuration screen for this gateway, for use in internal links.
 	 *
+	 * @param array $query_args Optional additional query args to append to the URL.
+	 *
 	 * @return string URL of the configuration screen for this gateway
 	 */
-	public static function get_settings_url() {
-		return admin_url( add_query_arg( self::$settings_url_params, 'admin.php' ) ); // nosemgrep: audit.php.wp.security.xss.query-arg -- constant string is passed in.
+	public static function get_settings_url( $query_args = [] ) {
+		return admin_url( add_query_arg( array_merge( self::$settings_url_params, $query_args ), 'admin.php' ) ); // nosemgrep: audit.php.wp.security.xss.query-arg -- constant string is passed in.
 	}
 }
diff --git a/includes/class-wc-payments-order-service.php b/includes/class-wc-payments-order-service.php
index ce6fa128987..246dbb13e34 100644
--- a/includes/class-wc-payments-order-service.php
+++ b/includes/class-wc-payments-order-service.php
@@ -51,6 +51,13 @@ class WC_Payments_Order_Service {
 	 */
 	const INTENTION_STATUS_META_KEY = '_intention_status';
 
+	/**
+	 * Meta key used to store the charge risk level.
+	 *
+	 * @const string
+	 */
+	const CHARGE_RISK_LEVEL_META_KEY = '_charge_risk_level';
+
 	/**
 	 * Meta key used to store customer Id.
 	 *
@@ -566,6 +573,37 @@ public function set_payment_transaction_id_for_order( $order, $payment_transacti
 		$order->save_meta_data();
 	}
 
+	/**
+	 * Set the payment metadata for risk level.
+	 *
+	 * @param  mixed  $order      The order.
+	 * @param  string $risk_level The value to be set.
+	 *
+	 * @throws Order_Not_Found_Exception
+	 */
+	public function set_charge_risk_level_for_order( $order, $risk_level ) {
+		if ( ! isset( $risk_level ) || null === $risk_level ) {
+			return;
+		}
+		$order = $this->get_order( $order );
+		$order->update_meta_data( self::CHARGE_RISK_LEVEL_META_KEY, $risk_level );
+		$order->save_meta_data();
+	}
+
+	/**
+	 * Get the risk level for an order.
+	 *
+	 * @param  mixed $order The order Id or order object.
+	 *
+	 * @return string
+	 *
+	 * @throws Order_Not_Found_Exception
+	 */
+	public function get_charge_risk_level_for_order( $order ): string {
+		$order = $this->get_order( $order );
+		return $order->get_meta( self::CHARGE_RISK_LEVEL_META_KEY, true );
+	}
+
 	/**
 	 * Get the payment metadata for charge id.
 	 *
@@ -828,8 +866,10 @@ public function attach_intent_info_to_order( WC_Order $order, $intent ) {
 		$charge_id              = $charge ? $charge->get_id() : null;
 		$payment_transaction    = $charge ? $charge->get_balance_transaction() : null;
 		$payment_transaction_id = $payment_transaction['id'] ?? '';
+		$outcome                = $charge ? $charge->get_outcome() : null;
+		$risk_level             = $outcome ? $outcome['risk_level'] : null;
 		// next, save it in order meta.
-		$this->attach_intent_info_to_order__legacy( $order, $intent_id, $intent_status, $payment_method, $customer_id, $charge_id, $currency, $payment_transaction_id );
+		$this->attach_intent_info_to_order__legacy( $order, $intent_id, $intent_status, $payment_method, $customer_id, $charge_id, $currency, $payment_transaction_id, $risk_level );
 	}
 
 	/**
@@ -845,10 +885,11 @@ public function attach_intent_info_to_order( WC_Order $order, $intent ) {
 	 * @param string   $charge_id Charge ID.
 	 * @param string   $currency Currency code.
 	 * @param string   $payment_transaction_id The transaction ID of the linked charge.
+	 * @param string   $risk_level The risk level of the payment.
 	 *
 	 * @throws Order_Not_Found_Exception
 	 */
-	public function attach_intent_info_to_order__legacy( $order, $intent_id, $intent_status, $payment_method, $customer_id, $charge_id, $currency, $payment_transaction_id = null ) {
+	public function attach_intent_info_to_order__legacy( $order, $intent_id, $intent_status, $payment_method, $customer_id, $charge_id, $currency, $payment_transaction_id = null, $risk_level = null ) {
 		// first, let's save all the metadata that needed for refunds, required for status change etc.
 		$order->set_transaction_id( $intent_id );
 		$this->set_intent_id_for_order( $order, $intent_id );
@@ -858,6 +899,7 @@ public function attach_intent_info_to_order__legacy( $order, $intent_id, $intent
 		$this->set_customer_id_for_order( $order, $customer_id );
 		$this->set_wcpay_intent_currency_for_order( $order, $currency );
 		$this->set_payment_transaction_id_for_order( $order, $payment_transaction_id );
+		$this->set_charge_risk_level_for_order( $order, $risk_level );
 		$order->save();
 	}
 
diff --git a/includes/fraud-prevention/class-order-fraud-and-risk-meta-box.php b/includes/fraud-prevention/class-order-fraud-and-risk-meta-box.php
index 5b498ec90c8..70202beb213 100644
--- a/includes/fraud-prevention/class-order-fraud-and-risk-meta-box.php
+++ b/includes/fraud-prevention/class-order-fraud-and-risk-meta-box.php
@@ -7,7 +7,7 @@
 
 namespace WCPay\Fraud_Prevention;
 
-use WC_Payments_Features;
+use WC_Payments_Admin_Settings;
 use WC_Payments_Order_Service;
 use WC_Payments_Utils;
 use WCPay\Constants\Fraud_Meta_Box_Type;
@@ -54,7 +54,7 @@ public function maybe_add_meta_box() {
 		// Get the order edit screen to be able to add the meta box to.
 		$wc_screen_id = \wc_get_page_screen_id( 'shop-order' );
 
-		add_meta_box( 'wcpay_order_fraud_and_risk_meta_box', __( 'Fraud &amp; Risk', 'woocommerce-payments' ), [ $this, 'display_order_fraud_and_risk_meta_box_message' ], $wc_screen_id, 'side', 'default' );
+		add_meta_box( 'wcpay-order-fraud-and-risk-meta-box', __( 'Fraud &amp; Risk', 'woocommerce-payments' ), [ $this, 'display_order_fraud_and_risk_meta_box_message' ], $wc_screen_id, 'side', 'default' );
 	}
 
 	/**
@@ -74,6 +74,7 @@ public function display_order_fraud_and_risk_meta_box_message( $order ) {
 		$intent_id      = $this->order_service->get_intent_id_for_order( $order );
 		$charge_id      = $this->order_service->get_charge_id_for_order( $order );
 		$meta_box_type  = $this->order_service->get_fraud_meta_box_type_for_order( $order );
+		$risk_level     = $this->order_service->get_charge_risk_level_for_order( $order );
 		$payment_method = $order->get_payment_method();
 
 		if ( strstr( $payment_method, 'woocommerce_payments_' ) ) {
@@ -104,6 +105,14 @@ public function display_order_fraud_and_risk_meta_box_message( $order ) {
 			'no_action_taken' => __( 'No action taken', 'woocommerce-payments' ),
 		];
 
+		$risk_filters_callout          = __( 'Adjust risk filters', 'woocommerce-payments' );
+		$risk_filters_url              = WC_Payments_Admin_Settings::get_settings_url( [ 'anchor' => '%23fp-settings' ] );
+		$show_adjust_risk_filters_link = true;
+
+		$this->maybe_print_risk_level_block( $risk_level );
+
+		echo '<div class="wcpay-fraud-risk-action">';
+
 		switch ( $meta_box_type ) {
 			case Fraud_Meta_Box_Type::ALLOW:
 				$description = __( 'The payment for this order passed your risk filtering.', 'woocommerce-payments' );
@@ -114,12 +123,13 @@ public function display_order_fraud_and_risk_meta_box_message( $order ) {
 				$description     = __( 'The payment for this order was blocked by your risk filtering. There is no pending authorization, and the order can be cancelled to reduce any held stock.', 'woocommerce-payments' );
 				$callout         = __( 'View more details', 'woocommerce-payments' );
 				$transaction_url = $this->compose_transaction_url_with_tracking( $order->get_id(), '', Rule::FRAUD_OUTCOME_BLOCK );
-				echo '<p class="wcpay-fraud-risk-meta-blocked"><img src="' . esc_url( $icons['red_shield']['url'] ) . '" alt="' . esc_html( $icons['red_shield']['alt'] ) . '"> ' . esc_html( $statuses['blocked'] ) . '</p><p>' . esc_html( $description ) . '</p><a href="' . esc_url( $transaction_url ) . '" target="_blank" rel="noopener noreferrer">' . esc_html( $callout ) . '</a>';
+				echo '<p class="wcpay-fraud-risk-meta-blocked"><img src="' . esc_url( $icons['red_shield']['url'] ) . '" alt="' . esc_html( $icons['red_shield']['alt'] ) . '"> ' . esc_html( $statuses['blocked'] ) . '</p><p>' . esc_html( $description ) . '</p><p><a href="' . esc_url( $transaction_url ) . '" target="_blank" rel="noopener noreferrer">' . esc_html( $callout ) . '</a></p>';
 				break;
 
 			case Fraud_Meta_Box_Type::NOT_CARD:
 			case Fraud_Meta_Box_Type::NOT_WCPAY:
-				$payment_method_title = $order->get_payment_method_title();
+				$payment_method_title          = $order->get_payment_method_title();
+				$show_adjust_risk_filters_link = false;
 
 				if ( ! empty( $payment_method_title ) && 'Popular payment methods' !== $payment_method_title ) {
 					$description = sprintf(
@@ -139,7 +149,7 @@ public function display_order_fraud_and_risk_meta_box_message( $order ) {
 				$callout     = __( 'Learn more', 'woocommerce-payments' );
 				$callout_url = 'https://woocommerce.com/document/woopayments/fraud-and-disputes/fraud-protection/';
 				$callout_url = add_query_arg( 'status_is', 'fraud-meta-box-not-wcpay-learn-more', $callout_url );
-				echo '<p>' . esc_html( $description ) . '</p><a href="' . esc_url( $callout_url ) . '" target="_blank" rel="noopener noreferrer">' . esc_html( $callout ) . '</a>';
+				echo '<p>' . esc_html( $description ) . '</p><p><a href="' . esc_url( $callout_url ) . '" target="_blank" rel="noopener noreferrer">' . esc_html( $callout ) . '</a></p>';
 				break;
 
 			case Fraud_Meta_Box_Type::PAYMENT_STARTED:
@@ -151,7 +161,7 @@ public function display_order_fraud_and_risk_meta_box_message( $order ) {
 				$description     = __( 'The payment for this order was held for review by your risk filtering. You can review the details and determine whether to approve or block the payment.', 'woocommerce-payments' );
 				$callout         = __( 'Review payment', 'woocommerce-payments' );
 				$transaction_url = $this->compose_transaction_url_with_tracking( $intent_id, $charge_id, Rule::FRAUD_OUTCOME_REVIEW );
-				echo '<p class="wcpay-fraud-risk-meta-review"><img src="' . esc_url( $icons['orange_shield']['url'] ) . '" alt="' . esc_html( $icons['orange_shield']['alt'] ) . '"> ' . esc_html( $statuses['held_for_review'] ) . '</p><p>' . esc_html( $description ) . '</p><a href="' . esc_url( $transaction_url ) . '" target="_blank" rel="noopener noreferrer">' . esc_html( $callout ) . '</a>';
+				echo '<p class="wcpay-fraud-risk-meta-review"><img src="' . esc_url( $icons['orange_shield']['url'] ) . '" alt="' . esc_html( $icons['orange_shield']['alt'] ) . '"> ' . esc_html( $statuses['held_for_review'] ) . '</p><p>' . esc_html( $description ) . '</p><p><a href="' . esc_url( $transaction_url ) . '" target="_blank" rel="noopener noreferrer">' . esc_html( $callout ) . '</a></p>';
 				break;
 
 			case Fraud_Meta_Box_Type::REVIEW_ALLOWED:
@@ -163,21 +173,21 @@ public function display_order_fraud_and_risk_meta_box_message( $order ) {
 				$description     = __( 'This transaction was held for review by your risk filters, and the charge was manually blocked after review.', 'woocommerce-payments' );
 				$callout         = __( 'Review payment', 'woocommerce-payments' );
 				$transaction_url = WC_Payments_Utils::compose_transaction_url( $intent_id, $charge_id );
-				echo '<p class="wcpay-fraud-risk-meta-blocked"><img src="' . esc_url( $icons['red_shield']['url'] ) . '" alt="' . esc_html( $icons['orange_shield']['alt'] ) . '"> ' . esc_html( $statuses['held_for_review'] ) . '</p><p>' . esc_html( $description ) . '</p><a href="' . esc_url( $transaction_url ) . '" target="_blank" rel="noopener noreferrer">' . esc_html( $callout ) . '</a>';
+				echo '<p class="wcpay-fraud-risk-meta-blocked"><img src="' . esc_url( $icons['red_shield']['url'] ) . '" alt="' . esc_html( $icons['orange_shield']['alt'] ) . '"> ' . esc_html( $statuses['held_for_review'] ) . '</p><p>' . esc_html( $description ) . '</p><p><a href="' . esc_url( $transaction_url ) . '" target="_blank" rel="noopener noreferrer">' . esc_html( $callout ) . '</a></p>';
 				break;
 
 			case Fraud_Meta_Box_Type::REVIEW_EXPIRED:
 				$description     = __( 'The payment for this order was held for review by your risk filtering. The authorization for the charge appears to have expired.', 'woocommerce-payments' );
 				$callout         = __( 'Review payment', 'woocommerce-payments' );
 				$transaction_url = WC_Payments_Utils::compose_transaction_url( $intent_id, $charge_id );
-				echo '<p class="wcpay-fraud-risk-meta-review"><img src="' . esc_url( $icons['orange_shield']['url'] ) . '" alt="' . esc_html( $icons['orange_shield']['alt'] ) . '"> ' . esc_html( $statuses['held_for_review'] ) . '</p><p>' . esc_html( $description ) . '</p><a href="' . esc_url( $transaction_url ) . '" target="_blank" rel="noopener noreferrer">' . esc_html( $callout ) . '</a>';
+				echo '<p class="wcpay-fraud-risk-meta-review"><img src="' . esc_url( $icons['orange_shield']['url'] ) . '" alt="' . esc_html( $icons['orange_shield']['alt'] ) . '"> ' . esc_html( $statuses['held_for_review'] ) . '</p><p>' . esc_html( $description ) . '</p><p><a href="' . esc_url( $transaction_url ) . '" target="_blank" rel="noopener noreferrer">' . esc_html( $callout ) . '</a></p>';
 				break;
 
 			case Fraud_Meta_Box_Type::REVIEW_FAILED:
 				$description     = __( 'The payment for this order was held for review by your risk filtering. The authorization for the charge appears to have failed.', 'woocommerce-payments' );
 				$callout         = __( 'Review payment', 'woocommerce-payments' );
 				$transaction_url = WC_Payments_Utils::compose_transaction_url( $intent_id, $charge_id );
-				echo '<p class="wcpay-fraud-risk-meta-review"><img src="' . esc_url( $icons['orange_shield']['url'] ) . '" alt="' . esc_html( $icons['orange_shield']['alt'] ) . '"> ' . esc_html( $statuses['held_for_review'] ) . '</p><p>' . esc_html( $description ) . '</p><a href="' . esc_url( $transaction_url ) . '" target="_blank" rel="noopener noreferrer">' . esc_html( $callout ) . '</a>';
+				echo '<p class="wcpay-fraud-risk-meta-review"><img src="' . esc_url( $icons['orange_shield']['url'] ) . '" alt="' . esc_html( $icons['orange_shield']['alt'] ) . '"> ' . esc_html( $statuses['held_for_review'] ) . '</p><p>' . esc_html( $description ) . '</p><p><a href="' . esc_url( $transaction_url ) . '" target="_blank" rel="noopener noreferrer">' . esc_html( $callout ) . '</a></p>';
 				break;
 
 			case Fraud_Meta_Box_Type::TERMINAL_PAYMENT:
@@ -194,6 +204,45 @@ public function display_order_fraud_and_risk_meta_box_message( $order ) {
 				echo '<p>' . esc_html( $description ) . '</p>';
 				break;
 		}
+
+		if ( $show_adjust_risk_filters_link ) {
+			echo '<p><a href="' . esc_url( $risk_filters_url ) . '" target="_blank" rel="noopener noreferrer">' . esc_html( $risk_filters_callout ) . '</a></p>';
+		}
+
+		echo '</div>';
+	}
+
+	/**
+	 * Prints the risk level block.
+	 *
+	 * @param string $risk_level The risk level to display.
+	 *
+	 * @return void
+	 */
+	private function maybe_print_risk_level_block( $risk_level ) {
+		$valid_risk_levels = [ 'normal', 'elevated', 'highest' ];
+
+		if ( ! in_array( $risk_level, $valid_risk_levels, true ) ) {
+			return;
+		}
+
+		$titles = [
+			'normal'   => __( 'Normal', 'woocommerce-payments' ),
+			'elevated' => __( 'Elevated', 'woocommerce-payments' ),
+			'highest'  => __( 'High', 'woocommerce-payments' ),
+		];
+
+		$descriptions = [
+			'normal'   => __( 'This payment shows a lower than normal risk of fraudulent activity.', 'woocommerce-payments' ),
+			'elevated' => __( 'This order has a moderate risk of being fraudulent. We suggest contacting the customer to confirm their details before fulfilling it.', 'woocommerce-payments' ),
+			'highest'  => __( 'This order has a high risk of being fraudulent. We suggest contacting the customer to confirm their details before fulfilling it.', 'woocommerce-payments' ),
+		];
+
+		echo '<div class="wcpay-fraud-risk-level wcpay-fraud-risk-level--' . esc_attr( $risk_level ) . '">';
+		echo '<p class="wcpay-fraud-risk-level__title">' . esc_html( $titles[ $risk_level ] ) . '</p>';
+		echo '<div class="wcpay-fraud-risk-level__bar"></div>';
+		echo '<p>' . esc_html( $descriptions[ $risk_level ] ) . '</p>';
+		echo '</div>';
 	}
 
 	/**
diff --git a/tests/unit/fraud-prevention/test-class-order-fraud-and-risk-meta-box.php b/tests/unit/fraud-prevention/test-class-order-fraud-and-risk-meta-box.php
index dbe604c82e2..e8ea5223e13 100644
--- a/tests/unit/fraud-prevention/test-class-order-fraud-and-risk-meta-box.php
+++ b/tests/unit/fraud-prevention/test-class-order-fraud-and-risk-meta-box.php
@@ -12,7 +12,6 @@
  * Fraud_Prevention_Service_Test unit tests.
  */
 class Order_Fraud_And_Risk_Meta_Box_Test extends WCPAY_UnitTestCase {
-
 	/**
 	 * Test WC_Order object.
 	 *
@@ -72,11 +71,16 @@ public function test_display_order_fraud_and_risk_meta_box_message_with_provider
 			->method( 'get_fraud_meta_box_type_for_order' )
 			->willReturn( $meta_box_type );
 
+		$this->mock_order_service
+			->expects( $this->once() )
+			->method( 'get_charge_risk_level_for_order' )
+			->willReturn( '' );
+
 		// Act: Call the method to display the meta box.
 		$this->order_fraud_and_risk_meta_box->display_order_fraud_and_risk_meta_box_message( $this->order );
 
 		// Assert: Check to make sure the expected string has been output.
-		$this->expectOutputString( $expected_output );
+		$this->expectOutputString( $this->compose_fraud_and_risk_actions_block( $expected_output ) );
 	}
 
 	public function display_order_fraud_and_risk_meta_box_message_provider() {
@@ -91,7 +95,7 @@ public function display_order_fraud_and_risk_meta_box_message_provider() {
 			],
 			'Fraud_Meta_Box_Type_REVIEW'           => [
 				'meta_box_type'   => Fraud_Meta_Box_Type::REVIEW,
-				'expected_output' => '<p class="wcpay-fraud-risk-meta-review"><img src="' . plugins_url( 'assets/images/icons/shield-stroke-orange.svg', WCPAY_PLUGIN_FILE ) . '" alt="Orange shield outline"> Held for review</p><p>The payment for this order was held for review by your risk filtering. You can review the details and determine whether to approve or block the payment.</p><a href="http://example.org/wp-admin/admin.php?page=wc-admin&#038;path=/payments/transactions/details&#038;id=pi_mock&#038;status_is=review&#038;type_is=meta_box" target="_blank" rel="noopener noreferrer">Review payment</a>',
+				'expected_output' => '<p class="wcpay-fraud-risk-meta-review"><img src="' . plugins_url( 'assets/images/icons/shield-stroke-orange.svg', WCPAY_PLUGIN_FILE ) . '" alt="Orange shield outline"> Held for review</p><p>The payment for this order was held for review by your risk filtering. You can review the details and determine whether to approve or block the payment.</p><p><a href="http://example.org/wp-admin/admin.php?page=wc-admin&#038;path=/payments/transactions/details&#038;id=pi_mock&#038;status_is=review&#038;type_is=meta_box" target="_blank" rel="noopener noreferrer">Review payment</a></p>',
 			],
 			'Fraud_Meta_Box_Type_REVIEW_ALLOWED'   => [
 				'meta_box_type'   => Fraud_Meta_Box_Type::REVIEW_ALLOWED,
@@ -99,15 +103,15 @@ public function display_order_fraud_and_risk_meta_box_message_provider() {
 			],
 			'Fraud_Meta_Box_Type_REVIEW_BLOCKED'   => [
 				'meta_box_type'   => Fraud_Meta_Box_Type::REVIEW_BLOCKED,
-				'expected_output' => '<p class="wcpay-fraud-risk-meta-blocked"><img src="' . plugins_url( 'assets/images/icons/shield-stroke-red.svg', WCPAY_PLUGIN_FILE ) . '" alt="Orange shield outline"> Held for review</p><p>This transaction was held for review by your risk filters, and the charge was manually blocked after review.</p><a href="http://example.org/wp-admin/admin.php?page=wc-admin&#038;path=/payments/transactions/details&#038;id=pi_mock" target="_blank" rel="noopener noreferrer">Review payment</a>',
+				'expected_output' => '<p class="wcpay-fraud-risk-meta-blocked"><img src="' . plugins_url( 'assets/images/icons/shield-stroke-red.svg', WCPAY_PLUGIN_FILE ) . '" alt="Orange shield outline"> Held for review</p><p>This transaction was held for review by your risk filters, and the charge was manually blocked after review.</p><p><a href="http://example.org/wp-admin/admin.php?page=wc-admin&#038;path=/payments/transactions/details&#038;id=pi_mock" target="_blank" rel="noopener noreferrer">Review payment</a></p>',
 			],
 			'Fraud_Meta_Box_Type_REVIEW_EXPIRED'   => [
 				'meta_box_type'   => Fraud_Meta_Box_Type::REVIEW_EXPIRED,
-				'expected_output' => '<p class="wcpay-fraud-risk-meta-review"><img src="' . plugins_url( 'assets/images/icons/shield-stroke-orange.svg', WCPAY_PLUGIN_FILE ) . '" alt="Orange shield outline"> Held for review</p><p>The payment for this order was held for review by your risk filtering. The authorization for the charge appears to have expired.</p><a href="http://example.org/wp-admin/admin.php?page=wc-admin&#038;path=/payments/transactions/details&#038;id=pi_mock" target="_blank" rel="noopener noreferrer">Review payment</a>',
+				'expected_output' => '<p class="wcpay-fraud-risk-meta-review"><img src="' . plugins_url( 'assets/images/icons/shield-stroke-orange.svg', WCPAY_PLUGIN_FILE ) . '" alt="Orange shield outline"> Held for review</p><p>The payment for this order was held for review by your risk filtering. The authorization for the charge appears to have expired.</p><p><a href="http://example.org/wp-admin/admin.php?page=wc-admin&#038;path=/payments/transactions/details&#038;id=pi_mock" target="_blank" rel="noopener noreferrer">Review payment</a></p>',
 			],
 			'Fraud_Meta_Box_Type_REVIEW_FAILED'    => [
 				'meta_box_type'   => Fraud_Meta_Box_Type::REVIEW_FAILED,
-				'expected_output' => '<p class="wcpay-fraud-risk-meta-review"><img src="' . plugins_url( 'assets/images/icons/shield-stroke-orange.svg', WCPAY_PLUGIN_FILE ) . '" alt="Orange shield outline"> Held for review</p><p>The payment for this order was held for review by your risk filtering. The authorization for the charge appears to have failed.</p><a href="http://example.org/wp-admin/admin.php?page=wc-admin&#038;path=/payments/transactions/details&#038;id=pi_mock" target="_blank" rel="noopener noreferrer">Review payment</a>',
+				'expected_output' => '<p class="wcpay-fraud-risk-meta-review"><img src="' . plugins_url( 'assets/images/icons/shield-stroke-orange.svg', WCPAY_PLUGIN_FILE ) . '" alt="Orange shield outline"> Held for review</p><p>The payment for this order was held for review by your risk filtering. The authorization for the charge appears to have failed.</p><p><a href="http://example.org/wp-admin/admin.php?page=wc-admin&#038;path=/payments/transactions/details&#038;id=pi_mock" target="_blank" rel="noopener noreferrer">Review payment</a></p>',
 			],
 			'Fraud_Meta_Box_Type_TERMINAL_PAYMENT' => [
 				'meta_box_type'   => Fraud_Meta_Box_Type::TERMINAL_PAYMENT,
@@ -130,6 +134,10 @@ public function test_display_order_fraud_and_risk_meta_box_message_exits_if_no_o
 			->expects( $this->never() )
 			->method( 'get_fraud_meta_box_type_for_order' );
 
+		$this->mock_order_service
+			->expects( $this->never() )
+			->method( 'get_charge_risk_level_for_order' );
+
 		// Act: Call the method to display the meta box.
 		$this->order_fraud_and_risk_meta_box->display_order_fraud_and_risk_meta_box_message( 'fake_order' );
 
@@ -154,11 +162,16 @@ public function test_display_order_fraud_and_risk_meta_box_message_block() {
 			->method( 'get_fraud_meta_box_type_for_order' )
 			->willReturn( Fraud_Meta_Box_Type::BLOCK );
 
+		$this->mock_order_service
+			->expects( $this->once() )
+			->method( 'get_charge_risk_level_for_order' )
+			->willReturn( '' );
+
 		// Act: Call the method to display the meta box.
 		$this->order_fraud_and_risk_meta_box->display_order_fraud_and_risk_meta_box_message( $this->order );
 
 		// Assert: Check to make sure the expected string has been output.
-		$this->expectOutputString( '<p class="wcpay-fraud-risk-meta-blocked"><img src="' . plugins_url( 'assets/images/icons/shield-stroke-red.svg', WCPAY_PLUGIN_FILE ) . '" alt="Red shield outline"> Blocked</p><p>The payment for this order was blocked by your risk filtering. There is no pending authorization, and the order can be cancelled to reduce any held stock.</p><a href="http://example.org/wp-admin/admin.php?page=wc-admin&#038;path=/payments/transactions/details&#038;id=' . $this->order->get_id() . '&#038;status_is=block&#038;type_is=meta_box" target="_blank" rel="noopener noreferrer">View more details</a>' );
+		$this->expectOutputString( $this->compose_fraud_and_risk_actions_block( '<p class="wcpay-fraud-risk-meta-blocked"><img src="' . plugins_url( 'assets/images/icons/shield-stroke-red.svg', WCPAY_PLUGIN_FILE ) . '" alt="Red shield outline"> Blocked</p><p>The payment for this order was blocked by your risk filtering. There is no pending authorization, and the order can be cancelled to reduce any held stock.</p><p><a href="http://example.org/wp-admin/admin.php?page=wc-admin&#038;path=/payments/transactions/details&#038;id=' . $this->order->get_id() . '&#038;status_is=block&#038;type_is=meta_box" target="_blank" rel="noopener noreferrer">View more details</a></p>' ) );
 	}
 
 	/**
@@ -183,6 +196,11 @@ public function test_display_order_fraud_and_risk_meta_box_message_not_card_with
 			->method( 'get_fraud_meta_box_type_for_order' )
 			->willReturn( Fraud_Meta_Box_Type::NOT_CARD );
 
+		$this->mock_order_service
+			->expects( $this->once() )
+			->method( 'get_charge_risk_level_for_order' )
+			->willReturn( '' );
+
 		// Arrange: Update the order's payment method.
 		$this->order->set_payment_method( $payment_method_id );
 		$this->order->set_payment_method_title( $payment_method_title );
@@ -192,7 +210,7 @@ public function test_display_order_fraud_and_risk_meta_box_message_not_card_with
 		$this->order_fraud_and_risk_meta_box->display_order_fraud_and_risk_meta_box_message( $this->order );
 
 		// Assert: Check to make sure the expected string has been output.
-		$this->expectOutputString( $expected_output );
+		$this->expectOutputString( $this->compose_fraud_and_risk_actions_block( $expected_output, false ) );
 	}
 
 	public function display_order_fraud_and_risk_meta_box_message_not_card_provider() {
@@ -200,17 +218,17 @@ public function display_order_fraud_and_risk_meta_box_message_not_card_provider(
 			'simulate legacy UPE Popular payment methods' => [
 				'payment_method_id'    => 'woocommerce_payments',
 				'payment_method_title' => 'Popular payment methods',
-				'expected_output'      => '<p>Risk filtering is only available for orders processed using credit cards with WooPayments.</p><a href="https://woocommerce.com/document/woopayments/fraud-and-disputes/fraud-protection/?status_is=fraud-meta-box-not-wcpay-learn-more" target="_blank" rel="noopener noreferrer">Learn more</a>',
+				'expected_output'      => '<p>Risk filtering is only available for orders processed using credit cards with WooPayments.</p><p><a href="https://woocommerce.com/document/woopayments/fraud-and-disputes/fraud-protection/?status_is=fraud-meta-box-not-wcpay-learn-more" target="_blank" rel="noopener noreferrer">Learn more</a></p>',
 			],
 			'simulate legacy UPE Bancontact'              => [
 				'payment_method_id'    => 'woocommerce_payments',
 				'payment_method_title' => 'Bancontact',
-				'expected_output'      => '<p>Risk filtering is only available for orders processed using credit cards with WooPayments. This order was processed with Bancontact.</p><a href="https://woocommerce.com/document/woopayments/fraud-and-disputes/fraud-protection/?status_is=fraud-meta-box-not-wcpay-learn-more" target="_blank" rel="noopener noreferrer">Learn more</a>',
+				'expected_output'      => '<p>Risk filtering is only available for orders processed using credit cards with WooPayments. This order was processed with Bancontact.</p><p><a href="https://woocommerce.com/document/woopayments/fraud-and-disputes/fraud-protection/?status_is=fraud-meta-box-not-wcpay-learn-more" target="_blank" rel="noopener noreferrer">Learn more</a></p>',
 			],
 			'simulate split UPE Bancontact'               => [
 				'payment_method_id'    => 'woocommerce_payments_bancontact',
 				'payment_method_title' => 'Bancontact',
-				'expected_output'      => '<p>Risk filtering is only available for orders processed using credit cards with WooPayments. This order was processed with Bancontact.</p><a href="https://woocommerce.com/document/woopayments/fraud-and-disputes/fraud-protection/?status_is=fraud-meta-box-not-wcpay-learn-more" target="_blank" rel="noopener noreferrer">Learn more</a>',
+				'expected_output'      => '<p>Risk filtering is only available for orders processed using credit cards with WooPayments. This order was processed with Bancontact.</p><p><a href="https://woocommerce.com/document/woopayments/fraud-and-disputes/fraud-protection/?status_is=fraud-meta-box-not-wcpay-learn-more" target="_blank" rel="noopener noreferrer">Learn more</a></p>',
 			],
 		];
 	}
@@ -232,6 +250,11 @@ public function test_display_order_fraud_and_risk_meta_box_message_not_wcpay() {
 			->method( 'get_fraud_meta_box_type_for_order' )
 			->willReturn( '' );
 
+		$this->mock_order_service
+			->expects( $this->once() )
+			->method( 'get_charge_risk_level_for_order' )
+			->willReturn( '' );
+
 		// Arrange: Update the order's payment method.
 		$this->order->set_payment_method( 'bacs' );
 		$this->order->save();
@@ -240,7 +263,7 @@ public function test_display_order_fraud_and_risk_meta_box_message_not_wcpay() {
 		$this->order_fraud_and_risk_meta_box->display_order_fraud_and_risk_meta_box_message( $this->order );
 
 		// Assert: Check to make sure the expected string has been output.
-		$this->expectOutputString( '<p>Risk filtering is only available for orders processed using credit cards with WooPayments. This order was processed with Direct bank transfer.</p><a href="https://woocommerce.com/document/woopayments/fraud-and-disputes/fraud-protection/?status_is=fraud-meta-box-not-wcpay-learn-more" target="_blank" rel="noopener noreferrer">Learn more</a>' );
+		$this->expectOutputString( $this->compose_fraud_and_risk_actions_block( '<p>Risk filtering is only available for orders processed using credit cards with WooPayments. This order was processed with Direct bank transfer.</p><p><a href="https://woocommerce.com/document/woopayments/fraud-and-disputes/fraud-protection/?status_is=fraud-meta-box-not-wcpay-learn-more" target="_blank" rel="noopener noreferrer">Learn more</a></p>', false ) );
 	}
 
 	public function test_display_order_fraud_and_risk_meta_box_message_default() {
@@ -260,10 +283,165 @@ public function test_display_order_fraud_and_risk_meta_box_message_default() {
 			->method( 'get_fraud_meta_box_type_for_order' )
 			->willReturn( '' );
 
+		$this->mock_order_service
+			->expects( $this->once() )
+			->method( 'get_charge_risk_level_for_order' )
+			->willReturn( '' );
+
+		// Act: Call the method to display the meta box.
+		$this->order_fraud_and_risk_meta_box->display_order_fraud_and_risk_meta_box_message( $this->order );
+
+		// Assert: Check to make sure the expected string has been output.
+		$this->expectOutputString( $this->compose_fraud_and_risk_actions_block( '<p>Risk filtering through WooPayments was not found on this order, it may have been created while filtering was not enabled.</p>' ) );
+	}
+
+	public function test_display_risk_level_normal_in_order_fraud_and_risk_meta_box() {
+		// Arrange: Set the return results for the order service methods.
+		$this->mock_order_service
+			->expects( $this->once() )
+			->method( 'get_intent_id_for_order' )
+			->willReturn( 'pi_mock' );
+
+		$this->mock_order_service
+			->expects( $this->once() )
+			->method( 'get_charge_id_for_order' )
+			->willReturn( 'ch_mock' );
+
+		$this->mock_order_service
+			->expects( $this->once() )
+			->method( 'get_fraud_meta_box_type_for_order' )
+			->willReturn( Fraud_Meta_Box_Type::ALLOW );
+
+		$this->mock_order_service
+			->expects( $this->once() )
+			->method( 'get_charge_risk_level_for_order' )
+			->willReturn( 'normal' );
+
+		// Act: Call the method to display the meta box.
+		$this->order_fraud_and_risk_meta_box->display_order_fraud_and_risk_meta_box_message( $this->order );
+
+		// Assert: Check to make sure the expected string has been output.
+		$risk_level_block   = $this->compose_fraud_and_risk_level_block( 'normal', 'Normal', 'This payment shows a lower than normal risk of fraudulent activity.' );
+		$risk_actions_block = $this->compose_fraud_and_risk_actions_block( '<p class="wcpay-fraud-risk-meta-allow"><img src="' . plugins_url( 'assets/images/icons/check-green.svg', WCPAY_PLUGIN_FILE ) . '" alt="Green check mark"> No action taken</p><p>The payment for this order passed your risk filtering.</p>' );
+
+		$this->expectOutputString( $risk_level_block . $risk_actions_block );
+	}
+
+	public function test_display_risk_level_elevated_in_order_fraud_and_risk_meta_box() {
+		// Arrange: Set the return results for the order service methods.
+		$this->mock_order_service
+			->expects( $this->once() )
+			->method( 'get_intent_id_for_order' )
+			->willReturn( 'pi_mock' );
+
+		$this->mock_order_service
+			->expects( $this->once() )
+			->method( 'get_charge_id_for_order' )
+			->willReturn( 'ch_mock' );
+
+		$this->mock_order_service
+			->expects( $this->once() )
+			->method( 'get_fraud_meta_box_type_for_order' )
+			->willReturn( Fraud_Meta_Box_Type::ALLOW );
+
+		$this->mock_order_service
+			->expects( $this->once() )
+			->method( 'get_charge_risk_level_for_order' )
+			->willReturn( 'elevated' );
+
+		// Act: Call the method to display the meta box.
+		$this->order_fraud_and_risk_meta_box->display_order_fraud_and_risk_meta_box_message( $this->order );
+
+		// Assert: Check to make sure the expected string has been output.
+		$risk_level_block   = $this->compose_fraud_and_risk_level_block( 'elevated', 'Elevated', 'This order has a moderate risk of being fraudulent. We suggest contacting the customer to confirm their details before fulfilling it.' );
+		$risk_actions_block = $this->compose_fraud_and_risk_actions_block( '<p class="wcpay-fraud-risk-meta-allow"><img src="' . plugins_url( 'assets/images/icons/check-green.svg', WCPAY_PLUGIN_FILE ) . '" alt="Green check mark"> No action taken</p><p>The payment for this order passed your risk filtering.</p>' );
+
+		$this->expectOutputString( $risk_level_block . $risk_actions_block );
+	}
+
+	public function test_display_risk_level_highest_in_order_fraud_and_risk_meta_box() {
+		// Arrange: Set the return results for the order service methods.
+		$this->mock_order_service
+			->expects( $this->once() )
+			->method( 'get_intent_id_for_order' )
+			->willReturn( 'pi_mock' );
+
+		$this->mock_order_service
+			->expects( $this->once() )
+			->method( 'get_charge_id_for_order' )
+			->willReturn( 'ch_mock' );
+
+		$this->mock_order_service
+			->expects( $this->once() )
+			->method( 'get_fraud_meta_box_type_for_order' )
+			->willReturn( Fraud_Meta_Box_Type::ALLOW );
+
+		$this->mock_order_service
+			->expects( $this->once() )
+			->method( 'get_charge_risk_level_for_order' )
+			->willReturn( 'highest' );
+
+		// Act: Call the method to display the meta box.
+		$this->order_fraud_and_risk_meta_box->display_order_fraud_and_risk_meta_box_message( $this->order );
+
+		// Assert: Check to make sure the expected string has been output.
+		$risk_level_block   = $this->compose_fraud_and_risk_level_block( 'highest', 'High', 'This order has a high risk of being fraudulent. We suggest contacting the customer to confirm their details before fulfilling it.' );
+		$risk_actions_block = $this->compose_fraud_and_risk_actions_block( '<p class="wcpay-fraud-risk-meta-allow"><img src="' . plugins_url( 'assets/images/icons/check-green.svg', WCPAY_PLUGIN_FILE ) . '" alt="Green check mark"> No action taken</p><p>The payment for this order passed your risk filtering.</p>' );
+
+		$this->expectOutputString( $risk_level_block . $risk_actions_block );
+	}
+
+	public function test_do_not_display_risk_level_in_order_fraud_and_risk_meta_box_with_invalid_risk_level() {
+		// Arrange: Set the return results for the order service methods.
+		$this->mock_order_service
+			->expects( $this->once() )
+			->method( 'get_intent_id_for_order' )
+			->willReturn( 'pi_mock' );
+
+		$this->mock_order_service
+			->expects( $this->once() )
+			->method( 'get_charge_id_for_order' )
+			->willReturn( 'ch_mock' );
+
+		$this->mock_order_service
+			->expects( $this->once() )
+			->method( 'get_fraud_meta_box_type_for_order' )
+			->willReturn( Fraud_Meta_Box_Type::ALLOW );
+
+		$this->mock_order_service
+			->expects( $this->once() )
+			->method( 'get_charge_risk_level_for_order' )
+			->willReturn( 'unknown' );
+
 		// Act: Call the method to display the meta box.
 		$this->order_fraud_and_risk_meta_box->display_order_fraud_and_risk_meta_box_message( $this->order );
 
 		// Assert: Check to make sure the expected string has been output.
-		$this->expectOutputString( '<p>Risk filtering through WooPayments was not found on this order, it may have been created while filtering was not enabled.</p>' );
+		$risk_actions_block = $this->compose_fraud_and_risk_actions_block( '<p class="wcpay-fraud-risk-meta-allow"><img src="' . plugins_url( 'assets/images/icons/check-green.svg', WCPAY_PLUGIN_FILE ) . '" alt="Green check mark"> No action taken</p><p>The payment for this order passed your risk filtering.</p>' );
+
+		$this->expectOutputString( $risk_actions_block );
+	}
+
+	private function compose_fraud_and_risk_level_block( $risk_level, $title, $description ) {
+		$output  = '<div class="wcpay-fraud-risk-level wcpay-fraud-risk-level--' . $risk_level . '">';
+		$output .= '<p class="wcpay-fraud-risk-level__title">' . $title . '</p>';
+		$output .= '<div class="wcpay-fraud-risk-level__bar"></div>';
+		$output .= '<p>' . $description . '</p>';
+		$output .= '</div>';
+
+		return $output;
+	}
+
+	private function compose_fraud_and_risk_actions_block( $content, $show_adjust_risk_filters_link = true ) {
+		$output  = '<div class="wcpay-fraud-risk-action">';
+		$output .= $content;
+
+		if ( $show_adjust_risk_filters_link ) {
+			$output .= '<p><a href="http://example.org/wp-admin/admin.php?page=wc-settings&#038;tab=checkout&#038;section=woocommerce_payments&#038;anchor=%23fp-settings" target="_blank" rel="noopener noreferrer">Adjust risk filters</a></p>';
+		}
+
+		$output .= '</div>';
+
+		return $output;
 	}
 }

From 278acb7ea7ec3ee95168ae8bd53ab6114534966a Mon Sep 17 00:00:00 2001
From: Daniel Guerra <15204776+danielmx-dev@users.noreply.github.com>
Date: Tue, 22 Oct 2024 22:54:03 +0300
Subject: [PATCH 06/45] Omit Test Mode badge in the Change payment method form
 (#9615)

---
 ...mit-test-mode-badge-in-change-payment-form |  4 +
 client/checkout/classic/style.scss            | 83 ++++++++++---------
 includes/class-wc-payment-gateway-wcpay.php   |  6 +-
 3 files changed, 52 insertions(+), 41 deletions(-)
 create mode 100644 changelog/fix-omit-test-mode-badge-in-change-payment-form

diff --git a/changelog/fix-omit-test-mode-badge-in-change-payment-form b/changelog/fix-omit-test-mode-badge-in-change-payment-form
new file mode 100644
index 00000000000..eff6afc6766
--- /dev/null
+++ b/changelog/fix-omit-test-mode-badge-in-change-payment-form
@@ -0,0 +1,4 @@
+Significance: minor
+Type: fix
+
+Omit the test mode badge in the change payment method form for subscriptions.
diff --git a/client/checkout/classic/style.scss b/client/checkout/classic/style.scss
index aa8df8b1676..5b452accc83 100644
--- a/client/checkout/classic/style.scss
+++ b/client/checkout/classic/style.scss
@@ -39,53 +39,56 @@
 		max-height: 24px !important;
 	}
 
-	li.payment_method_woocommerce_payments {
-		display: grid;
-		grid-template-columns: 0fr 0fr 1fr;
-		grid-template-rows: max-content;
-
-		> input[name='payment_method'] {
-			align-self: center;
-		}
-		> label {
-			grid-column: 3;
+	&.wc_payment_methods,
+	&.woocommerce-PaymentMethods {
+		li.payment_method_woocommerce_payments {
 			display: grid;
-			grid-template-columns: 0fr auto;
+			grid-template-columns: 0fr 0fr 1fr;
 			grid-template-rows: max-content;
-			grid-gap: 0;
-			margin-bottom: 0;
-
-			> .label-title-container {
-				grid-area: 1 / 2 / 2 / 3;
-			}
 
-			.payment-method-title {
-				margin-right: 8px;
+			> input[name='payment_method'] {
+				align-self: center;
 			}
-
-			.test-mode.badge {
-				display: inline-block;
-				background-color: #fff2d7;
-				border-radius: 4px;
-				padding: 4px 6px;
-				font-size: 12px;
-				font-weight: 400;
-				line-height: 16px;
-				color: #4d3716;
-				vertical-align: middle;
+			> label {
+				grid-column: 3;
+				display: grid;
+				grid-template-columns: 0fr auto;
+				grid-template-rows: max-content;
+				grid-gap: 0;
+				margin-bottom: 0;
+
+				> .label-title-container {
+					grid-area: 1 / 2 / 2 / 3;
+				}
+
+				.payment-method-title {
+					margin-right: 8px;
+				}
+
+				.test-mode.badge {
+					display: inline-block;
+					background-color: #fff2d7;
+					border-radius: 4px;
+					padding: 4px 6px;
+					font-size: 12px;
+					font-weight: 400;
+					line-height: 16px;
+					color: #4d3716;
+					vertical-align: middle;
+				}
+
+				img {
+					float: none;
+					grid-area: 1 / 4 / 2 / 5;
+					align-self: baseline;
+					justify-self: end;
+					margin-left: 1em;
+				}
 			}
-
-			img {
-				float: none;
-				grid-area: 1 / 4 / 2 / 5;
-				align-self: baseline;
-				justify-self: end;
-				margin-left: 1em;
+			> div.payment_box {
+				grid-area: 2 / 1 / 3 / 4;
 			}
 		}
-		> div.payment_box {
-			grid-area: 2 / 1 / 3 / 4;
-		}
 	}
 }
 
diff --git a/includes/class-wc-payment-gateway-wcpay.php b/includes/class-wc-payment-gateway-wcpay.php
index f795a7514b7..d1fe2b1cca6 100644
--- a/includes/class-wc-payment-gateway-wcpay.php
+++ b/includes/class-wc-payment-gateway-wcpay.php
@@ -580,7 +580,11 @@ public function init_hooks() {
 	public function get_title() {
 		$title = parent::get_title();
 
-		if ( Payment_Method::CARD === $this->stripe_id && ( is_checkout() || is_add_payment_method_page() ) ) {
+		if (
+			Payment_Method::CARD === $this->stripe_id &&
+			( is_checkout() || is_add_payment_method_page() ) &&
+			! isset( $_GET['change_payment_method'] )  // phpcs:ignore WordPress.Security.NonceVerification
+		) {
 			if ( WC_Payments::mode()->is_test() ) {
 				$test_mode_badge = '<span class="test-mode badge">' . __( 'Test Mode', 'woocommerce-payments' ) . '</span>';
 			} else {

From 27c562b200ecb8059eec36af4d99f0de05617c19 Mon Sep 17 00:00:00 2001
From: Eduardo Umpierre <eduardoumpierre@hotmail.com>
Date: Tue, 22 Oct 2024 18:03:34 -0300
Subject: [PATCH 07/45] Fix settings rendering on the Advanced Fraud Protection
 page (#9521)

---
 ...ix-9520-advanced-fraud-protection-settings |  4 +
 .../allow-countries-notice.tsx                |  4 +-
 .../cards/order-items-threshold.tsx           | 61 +++++----------
 .../cards/purchase-price-threshold.tsx        | 52 ++++---------
 .../address-mismatch.test.tsx.snap            |  2 +
 .../international-ip-address.test.tsx.snap    |  8 +-
 .../ip-address-mismatch.test.tsx.snap         |  2 +
 .../order-items-threshold.test.tsx.snap       |  2 +
 .../purchase-price-threshold.test.tsx.snap    |  2 +
 .../cards/test/address-mismatch.test.tsx      |  2 -
 .../cards/test/avs-mismatch.test.tsx          |  4 -
 .../cards/test/cvc-verification.test.tsx      |  4 -
 .../test/international-ip-address.test.tsx    |  2 -
 .../cards/test/ip-address-mismatch.test.tsx   |  2 -
 .../cards/test/order-items-threshold.test.tsx |  2 -
 .../test/purchase-price-threshold.test.tsx    |  2 -
 .../advanced-settings/context.ts              |  2 -
 .../advanced-settings/index.tsx               |  8 +-
 .../advanced-settings/rule-toggle.tsx         | 76 ++++++++-----------
 .../test/__snapshots__/index.test.tsx.snap    | 22 +++---
 .../__snapshots__/rule-toggle.test.tsx.snap   |  4 +
 .../test/allow-countries-notice.test.tsx      |  2 -
 .../test/rule-toggle.test.tsx                 | 26 ++-----
 .../settings/fraud-protection/interfaces.ts   |  4 +-
 24 files changed, 111 insertions(+), 188 deletions(-)
 create mode 100644 changelog/fix-9520-advanced-fraud-protection-settings

diff --git a/changelog/fix-9520-advanced-fraud-protection-settings b/changelog/fix-9520-advanced-fraud-protection-settings
new file mode 100644
index 00000000000..b08dee60572
--- /dev/null
+++ b/changelog/fix-9520-advanced-fraud-protection-settings
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fix
+
+Fix settings display on the advanced fraud protection page.
diff --git a/client/settings/fraud-protection/advanced-settings/allow-countries-notice.tsx b/client/settings/fraud-protection/advanced-settings/allow-countries-notice.tsx
index bd03bea132c..e35671b83f2 100644
--- a/client/settings/fraud-protection/advanced-settings/allow-countries-notice.tsx
+++ b/client/settings/fraud-protection/advanced-settings/allow-countries-notice.tsx
@@ -45,7 +45,7 @@ interface AllowedCountriesNoticeProps {
 const AllowedCountriesNotice: React.FC< AllowedCountriesNoticeProps > = ( {
 	setting,
 } ) => {
-	const { protectionSettingsUI, protectionSettingsChanged } = useContext(
+	const { protectionSettingsUI } = useContext(
 		FraudPreventionSettingsContext
 	);
 	const [ isBlocking, setIsBlocking ] = useState(
@@ -53,7 +53,7 @@ const AllowedCountriesNotice: React.FC< AllowedCountriesNoticeProps > = ( {
 	);
 	useEffect( () => {
 		setIsBlocking( protectionSettingsUI[ setting ]?.block ?? false );
-	}, [ protectionSettingsUI, setting, protectionSettingsChanged ] );
+	}, [ protectionSettingsUI, setting ] );
 
 	const supportedCountriesType = getSupportedCountriesType();
 	const settingCountries = getSettingCountries();
diff --git a/client/settings/fraud-protection/advanced-settings/cards/order-items-threshold.tsx b/client/settings/fraud-protection/advanced-settings/cards/order-items-threshold.tsx
index 31b4c7be8b6..7b730a06057 100644
--- a/client/settings/fraud-protection/advanced-settings/cards/order-items-threshold.tsx
+++ b/client/settings/fraud-protection/advanced-settings/cards/order-items-threshold.tsx
@@ -1,14 +1,7 @@
 /**
  * External dependencies
  */
-import React, {
-	useContext,
-	useEffect,
-	useState,
-	useMemo,
-	Dispatch,
-	SetStateAction,
-} from 'react';
+import React, { useContext, useMemo, Dispatch, SetStateAction } from 'react';
 import { __ } from '@wordpress/i18n';
 import { TextControl } from '@wordpress/components';
 
@@ -36,7 +29,6 @@ const OrderItemsThresholdCustomForm: React.FC< OrderItemsThresholdCustomFormProp
 	const {
 		protectionSettingsUI,
 		setProtectionSettingsUI,
-		setProtectionSettingsChanged,
 		setIsDirty,
 	} = useContext( FraudPreventionSettingsContext );
 
@@ -48,33 +40,11 @@ const OrderItemsThresholdCustomForm: React.FC< OrderItemsThresholdCustomFormProp
 		[ protectionSettingsUI, setting ]
 	);
 
-	const minItemsTemp = parseInt( settingUI.min_items + '', 10 );
-	const maxItemsTemp = parseInt( settingUI.max_items + '', 10 );
+	const minItems = parseInt( settingUI?.min_items + '', 10 );
+	const maxItems = parseInt( settingUI?.max_items + '', 10 );
 
-	const [ minItemsCount, setMinItemsCount ] = useState(
-		isNaN( minItemsTemp ) ? '' : minItemsTemp
-	);
-	const [ maxItemsCount, setMaxItemsCount ] = useState(
-		isNaN( maxItemsTemp ) ? '' : maxItemsTemp
-	);
-
-	useEffect( () => {
-		settingUI.min_items = minItemsCount
-			? parseInt( minItemsCount + '', 10 )
-			: minItemsCount;
-		settingUI.max_items = maxItemsCount
-			? parseInt( maxItemsCount + '', 10 )
-			: maxItemsCount;
-		setProtectionSettingsUI( protectionSettingsUI );
-		setProtectionSettingsChanged( ( prev ) => ! prev );
-	}, [
-		settingUI,
-		minItemsCount,
-		maxItemsCount,
-		protectionSettingsUI,
-		setProtectionSettingsUI,
-		setProtectionSettingsChanged,
-	] );
+	const minItemsCount = isNaN( minItems ) ? '' : minItems;
+	const maxItemsCount = isNaN( maxItems ) ? '' : maxItems;
 
 	const isItemRangeEmpty =
 		! parseInt( minItemsCount + '', 10 ) &&
@@ -82,6 +52,17 @@ const OrderItemsThresholdCustomForm: React.FC< OrderItemsThresholdCustomFormProp
 	const isMinGreaterThanMax =
 		parseInt( minItemsCount + '', 10 ) > parseInt( maxItemsCount + '', 10 );
 
+	const handleInputChange = ( name: string ) => ( val: string ) => {
+		setProtectionSettingsUI( ( settings ) => ( {
+			...settings,
+			[ setting ]: {
+				...settings[ setting ],
+				[ name ]: val ? parseInt( val + '', 10 ) : val,
+			},
+		} ) );
+		setIsDirty( true );
+	};
+
 	return (
 		<div className="fraud-protection-rule-toggle-children-container">
 			<strong>Limits</strong>
@@ -98,10 +79,7 @@ const OrderItemsThresholdCustomForm: React.FC< OrderItemsThresholdCustomFormProp
 						placeholder={ '0' }
 						value={ minItemsCount }
 						type="number"
-						onChange={ ( value ) => {
-							setMinItemsCount( value );
-							setIsDirty( true );
-						} }
+						onChange={ handleInputChange( 'min_items' ) }
 						onKeyDown={ ( e ) =>
 							/^[+-.,e]$/m.test( e.key ) && e.preventDefault()
 						}
@@ -125,10 +103,7 @@ const OrderItemsThresholdCustomForm: React.FC< OrderItemsThresholdCustomFormProp
 						placeholder={ '0' }
 						type="number"
 						value={ maxItemsCount }
-						onChange={ ( value ) => {
-							setMaxItemsCount( value );
-							setIsDirty( true );
-						} }
+						onChange={ handleInputChange( 'max_items' ) }
 						onKeyDown={ ( e ) =>
 							/^[+-.,e]$/m.test( e.key ) && e.preventDefault()
 						}
diff --git a/client/settings/fraud-protection/advanced-settings/cards/purchase-price-threshold.tsx b/client/settings/fraud-protection/advanced-settings/cards/purchase-price-threshold.tsx
index 5c47153e0fb..e32b2222d2e 100644
--- a/client/settings/fraud-protection/advanced-settings/cards/purchase-price-threshold.tsx
+++ b/client/settings/fraud-protection/advanced-settings/cards/purchase-price-threshold.tsx
@@ -1,14 +1,7 @@
 /**
  * External dependencies
  */
-import React, {
-	useContext,
-	useEffect,
-	useState,
-	useMemo,
-	SetStateAction,
-	Dispatch,
-} from 'react';
+import React, { useContext, useMemo, SetStateAction, Dispatch } from 'react';
 import { __ } from '@wordpress/i18n';
 import AmountInput from 'wcpay/components/amount-input';
 
@@ -55,7 +48,6 @@ const PurchasePriceThresholdCustomForm: React.FC< PurchasePriceThresholdCustomFo
 	const {
 		protectionSettingsUI,
 		setProtectionSettingsUI,
-		setProtectionSettingsChanged,
 		setIsDirty,
 	} = useContext( FraudPreventionSettingsContext );
 
@@ -67,25 +59,8 @@ const PurchasePriceThresholdCustomForm: React.FC< PurchasePriceThresholdCustomFo
 		[ protectionSettingsUI, setting ]
 	);
 
-	const minAmountTemp = parseFloat( settingUI.min_amount + '' );
-	const maxAmountTemp = parseFloat( settingUI.max_amount + '' );
-
-	const [ minAmount, setMinAmount ] = useState( minAmountTemp ?? '' );
-	const [ maxAmount, setMaxAmount ] = useState( maxAmountTemp ?? '' );
-
-	useEffect( () => {
-		settingUI.min_amount = minAmount ? parseFloat( minAmount + '' ) : null;
-		settingUI.max_amount = maxAmount ? parseFloat( maxAmount + '' ) : null;
-		setProtectionSettingsUI( protectionSettingsUI );
-		setProtectionSettingsChanged( ( prev ) => ! prev );
-	}, [
-		minAmount,
-		maxAmount,
-		protectionSettingsUI,
-		setProtectionSettingsUI,
-		setProtectionSettingsChanged,
-		settingUI,
-	] );
+	const minAmount = parseFloat( settingUI.min_amount + '' );
+	const maxAmount = parseFloat( settingUI.max_amount + '' );
 
 	const areInputsEmpty =
 		! getFloatValue( minAmount + '' ) && ! getFloatValue( maxAmount + '' );
@@ -96,6 +71,17 @@ const PurchasePriceThresholdCustomForm: React.FC< PurchasePriceThresholdCustomFo
 
 	const currencySymbol = getCurrencySymbol();
 
+	const handleAmountInputChange = ( name: string ) => ( val: string ) => {
+		setProtectionSettingsUI( ( settings ) => ( {
+			...settings,
+			[ setting ]: {
+				...settings[ setting ],
+				[ name ]: val ? parseFloat( val + '' ) : null,
+			},
+		} ) );
+		setIsDirty( true );
+	};
+
 	return (
 		<div className="fraud-protection-rule-toggle-children-container">
 			<strong>Limits</strong>
@@ -112,10 +98,7 @@ const PurchasePriceThresholdCustomForm: React.FC< PurchasePriceThresholdCustomFo
 						prefix={ currencySymbol }
 						placeholder={ '0.00' }
 						value={ minAmount.toString() }
-						onChange={ ( val ) => {
-							setMinAmount( Number( val ) );
-							setIsDirty( true );
-						} }
+						onChange={ handleAmountInputChange( 'min_amount' ) }
 						help={ __(
 							'Leave blank for no limit',
 							'woocommerce-payments'
@@ -134,10 +117,7 @@ const PurchasePriceThresholdCustomForm: React.FC< PurchasePriceThresholdCustomFo
 						prefix={ currencySymbol }
 						placeholder={ '0.00' }
 						value={ maxAmount.toString() }
-						onChange={ ( val ) => {
-							setMaxAmount( Number( val ) );
-							setIsDirty( true );
-						} }
+						onChange={ handleAmountInputChange( 'max_amount' ) }
 						help={ __(
 							'Leave blank for no limit',
 							'woocommerce-payments'
diff --git a/client/settings/fraud-protection/advanced-settings/cards/test/__snapshots__/address-mismatch.test.tsx.snap b/client/settings/fraud-protection/advanced-settings/cards/test/__snapshots__/address-mismatch.test.tsx.snap
index ce9560f5875..566772c05f0 100644
--- a/client/settings/fraud-protection/advanced-settings/cards/test/__snapshots__/address-mismatch.test.tsx.snap
+++ b/client/settings/fraud-protection/advanced-settings/cards/test/__snapshots__/address-mismatch.test.tsx.snap
@@ -158,6 +158,7 @@ exports[`Address mismatch card renders correctly when enabled 1`] = `
               >
                 <input
                   aria-describedby="inspector-toggle-control-1__help"
+                  checked=""
                   class="components-form-toggle__input"
                   id="inspector-toggle-control-1"
                   type="checkbox"
@@ -265,6 +266,7 @@ exports[`Address mismatch card renders correctly when enabled and checked 1`] =
               >
                 <input
                   aria-describedby="inspector-toggle-control-2__help"
+                  checked=""
                   class="components-form-toggle__input"
                   id="inspector-toggle-control-2"
                   type="checkbox"
diff --git a/client/settings/fraud-protection/advanced-settings/cards/test/__snapshots__/international-ip-address.test.tsx.snap b/client/settings/fraud-protection/advanced-settings/cards/test/__snapshots__/international-ip-address.test.tsx.snap
index 2084e77f831..c40bdba10b6 100644
--- a/client/settings/fraud-protection/advanced-settings/cards/test/__snapshots__/international-ip-address.test.tsx.snap
+++ b/client/settings/fraud-protection/advanced-settings/cards/test/__snapshots__/international-ip-address.test.tsx.snap
@@ -66,6 +66,7 @@ exports[`International IP address card renders correctly when enabled 1`] = `
               >
                 <input
                   aria-describedby="inspector-toggle-control-2__help"
+                  checked=""
                   class="components-form-toggle__input"
                   id="inspector-toggle-control-2"
                   type="checkbox"
@@ -137,7 +138,7 @@ exports[`International IP address card renders correctly when enabled 1`] = `
                 data-wp-c16t="true"
                 data-wp-component="FlexItem"
               >
-                Orders from outside of the following countries will be blocked by the filter: 
+                Orders from outside of the following countries will be screened by the filter: 
                 <strong>
                   Canada, United States
                 </strong>
@@ -232,6 +233,7 @@ exports[`International IP address card renders correctly when enabled and checke
               >
                 <input
                   aria-describedby="inspector-toggle-control-3__help"
+                  checked=""
                   class="components-form-toggle__input"
                   id="inspector-toggle-control-3"
                   type="checkbox"
@@ -588,7 +590,7 @@ exports[`International IP address card renders correctly when woocommerce_allowe
                 data-wp-c16t="true"
                 data-wp-component="FlexItem"
               >
-                Orders from the following countries will be blocked by the filter: 
+                Orders from the following countries will be screened by the filter: 
                 <strong>
                   Canada, United States
                 </strong>
@@ -753,7 +755,7 @@ exports[`International IP address card renders correctly when woocommerce_allowe
                 data-wp-c16t="true"
                 data-wp-component="FlexItem"
               >
-                Orders from outside of the following countries will be blocked by the filter: 
+                Orders from outside of the following countries will be screened by the filter: 
                 <strong>
                   Canada, United States
                 </strong>
diff --git a/client/settings/fraud-protection/advanced-settings/cards/test/__snapshots__/ip-address-mismatch.test.tsx.snap b/client/settings/fraud-protection/advanced-settings/cards/test/__snapshots__/ip-address-mismatch.test.tsx.snap
index 30b97d21b1a..f5f48430b26 100644
--- a/client/settings/fraud-protection/advanced-settings/cards/test/__snapshots__/ip-address-mismatch.test.tsx.snap
+++ b/client/settings/fraud-protection/advanced-settings/cards/test/__snapshots__/ip-address-mismatch.test.tsx.snap
@@ -174,6 +174,7 @@ exports[`International billing address card renders correctly when enabled 1`] =
               >
                 <input
                   aria-describedby="inspector-toggle-control-1__help"
+                  checked=""
                   class="components-form-toggle__input"
                   id="inspector-toggle-control-1"
                   type="checkbox"
@@ -289,6 +290,7 @@ exports[`International billing address card renders correctly when enabled and c
               >
                 <input
                   aria-describedby="inspector-toggle-control-2__help"
+                  checked=""
                   class="components-form-toggle__input"
                   id="inspector-toggle-control-2"
                   type="checkbox"
diff --git a/client/settings/fraud-protection/advanced-settings/cards/test/__snapshots__/order-items-threshold.test.tsx.snap b/client/settings/fraud-protection/advanced-settings/cards/test/__snapshots__/order-items-threshold.test.tsx.snap
index 05d4acfd78d..615db935137 100644
--- a/client/settings/fraud-protection/advanced-settings/cards/test/__snapshots__/order-items-threshold.test.tsx.snap
+++ b/client/settings/fraud-protection/advanced-settings/cards/test/__snapshots__/order-items-threshold.test.tsx.snap
@@ -158,6 +158,7 @@ exports[`Order items threshold card renders correctly when enabled 1`] = `
               >
                 <input
                   aria-describedby="inspector-toggle-control-1__help"
+                  checked=""
                   class="components-form-toggle__input"
                   id="inspector-toggle-control-1"
                   type="checkbox"
@@ -389,6 +390,7 @@ exports[`Order items threshold card renders correctly when enabled and checked 1
               >
                 <input
                   aria-describedby="inspector-toggle-control-2__help"
+                  checked=""
                   class="components-form-toggle__input"
                   id="inspector-toggle-control-2"
                   type="checkbox"
diff --git a/client/settings/fraud-protection/advanced-settings/cards/test/__snapshots__/purchase-price-threshold.test.tsx.snap b/client/settings/fraud-protection/advanced-settings/cards/test/__snapshots__/purchase-price-threshold.test.tsx.snap
index b702ef97cc5..7f8d2f328c1 100644
--- a/client/settings/fraud-protection/advanced-settings/cards/test/__snapshots__/purchase-price-threshold.test.tsx.snap
+++ b/client/settings/fraud-protection/advanced-settings/cards/test/__snapshots__/purchase-price-threshold.test.tsx.snap
@@ -158,6 +158,7 @@ exports[`Purchase price threshold card renders correctly when enabled 1`] = `
               >
                 <input
                   aria-describedby="inspector-toggle-control-1__help"
+                  checked=""
                   class="components-form-toggle__input"
                   id="inspector-toggle-control-1"
                   type="checkbox"
@@ -391,6 +392,7 @@ exports[`Purchase price threshold card renders correctly when enabled and checke
               >
                 <input
                   aria-describedby="inspector-toggle-control-2__help"
+                  checked=""
                   class="components-form-toggle__input"
                   id="inspector-toggle-control-2"
                   type="checkbox"
diff --git a/client/settings/fraud-protection/advanced-settings/cards/test/address-mismatch.test.tsx b/client/settings/fraud-protection/advanced-settings/cards/test/address-mismatch.test.tsx
index 8162cd07f1b..a970e5d57e3 100644
--- a/client/settings/fraud-protection/advanced-settings/cards/test/address-mismatch.test.tsx
+++ b/client/settings/fraud-protection/advanced-settings/cards/test/address-mismatch.test.tsx
@@ -32,8 +32,6 @@ describe( 'Address mismatch card', () => {
 	const contextValue = {
 		protectionSettingsUI: settings,
 		setProtectionSettingsUI: setSettings,
-		protectionSettingsChanged: false,
-		setProtectionSettingsChanged: jest.fn(),
 		setIsDirty: jest.fn(),
 	};
 	test( 'renders correctly', () => {
diff --git a/client/settings/fraud-protection/advanced-settings/cards/test/avs-mismatch.test.tsx b/client/settings/fraud-protection/advanced-settings/cards/test/avs-mismatch.test.tsx
index b2ae2de8e27..c178672128d 100644
--- a/client/settings/fraud-protection/advanced-settings/cards/test/avs-mismatch.test.tsx
+++ b/client/settings/fraud-protection/advanced-settings/cards/test/avs-mismatch.test.tsx
@@ -40,8 +40,6 @@ describe( 'AVS mismatch card', () => {
 		const contextValue = {
 			protectionSettingsUI: settings,
 			setProtectionSettingsUI: setSettings,
-			protectionSettingsChanged: false,
-			setProtectionSettingsChanged: jest.fn(),
 			setIsDirty: jest.fn(),
 		};
 		const { container } = render(
@@ -69,8 +67,6 @@ describe( 'AVS mismatch card', () => {
 		const contextValue = {
 			protectionSettingsUI: settings,
 			setProtectionSettingsUI: setSettings,
-			protectionSettingsChanged: false,
-			setProtectionSettingsChanged: jest.fn(),
 			setIsDirty: jest.fn(),
 		};
 		const { container } = render(
diff --git a/client/settings/fraud-protection/advanced-settings/cards/test/cvc-verification.test.tsx b/client/settings/fraud-protection/advanced-settings/cards/test/cvc-verification.test.tsx
index dfbbbc47ad5..9be801f735b 100644
--- a/client/settings/fraud-protection/advanced-settings/cards/test/cvc-verification.test.tsx
+++ b/client/settings/fraud-protection/advanced-settings/cards/test/cvc-verification.test.tsx
@@ -40,8 +40,6 @@ describe( 'CVC verification card', () => {
 		const contextValue = {
 			protectionSettingsUI: settings,
 			setProtectionSettingsUI: setSettings,
-			protectionSettingsChanged: false,
-			setProtectionSettingsChanged: jest.fn(),
 			setIsDirty: jest.fn(),
 		};
 		const { container } = render(
@@ -72,8 +70,6 @@ describe( 'CVC verification card', () => {
 		const contextValue = {
 			protectionSettingsUI: settings,
 			setProtectionSettingsUI: setSettings,
-			protectionSettingsChanged: false,
-			setProtectionSettingsChanged: jest.fn(),
 			setIsDirty: jest.fn(),
 		};
 		const { container } = render(
diff --git a/client/settings/fraud-protection/advanced-settings/cards/test/international-ip-address.test.tsx b/client/settings/fraud-protection/advanced-settings/cards/test/international-ip-address.test.tsx
index 6a36f94b4ee..a8a2a699190 100644
--- a/client/settings/fraud-protection/advanced-settings/cards/test/international-ip-address.test.tsx
+++ b/client/settings/fraud-protection/advanced-settings/cards/test/international-ip-address.test.tsx
@@ -41,8 +41,6 @@ describe( 'International IP address card', () => {
 	const contextValue = {
 		protectionSettingsUI: settings,
 		setProtectionSettingsUI: setSettings,
-		protectionSettingsChanged: false,
-		setProtectionSettingsChanged: jest.fn(),
 		isDirty: false,
 		setIsDirty: jest.fn(),
 	};
diff --git a/client/settings/fraud-protection/advanced-settings/cards/test/ip-address-mismatch.test.tsx b/client/settings/fraud-protection/advanced-settings/cards/test/ip-address-mismatch.test.tsx
index b102364ad75..f2eaa32ba8c 100644
--- a/client/settings/fraud-protection/advanced-settings/cards/test/ip-address-mismatch.test.tsx
+++ b/client/settings/fraud-protection/advanced-settings/cards/test/ip-address-mismatch.test.tsx
@@ -38,8 +38,6 @@ describe( 'International billing address card', () => {
 	const contextValue = {
 		protectionSettingsUI: settings,
 		setProtectionSettingsUI: setSettings,
-		protectionSettingsChanged: false,
-		setProtectionSettingsChanged: jest.fn(),
 		setIsDirty: jest.fn(),
 	};
 	global.wcSettings = {
diff --git a/client/settings/fraud-protection/advanced-settings/cards/test/order-items-threshold.test.tsx b/client/settings/fraud-protection/advanced-settings/cards/test/order-items-threshold.test.tsx
index 268845ba776..b2832aea03c 100644
--- a/client/settings/fraud-protection/advanced-settings/cards/test/order-items-threshold.test.tsx
+++ b/client/settings/fraud-protection/advanced-settings/cards/test/order-items-threshold.test.tsx
@@ -37,8 +37,6 @@ describe( 'Order items threshold card', () => {
 	const contextValue = {
 		protectionSettingsUI: settings,
 		setProtectionSettingsUI: setSettings,
-		protectionSettingsChanged: false,
-		setProtectionSettingsChanged: jest.fn(),
 		setIsDirty: jest.fn(),
 	};
 	test( 'renders correctly', () => {
diff --git a/client/settings/fraud-protection/advanced-settings/cards/test/purchase-price-threshold.test.tsx b/client/settings/fraud-protection/advanced-settings/cards/test/purchase-price-threshold.test.tsx
index 23f12a04d51..163cb3d06b8 100644
--- a/client/settings/fraud-protection/advanced-settings/cards/test/purchase-price-threshold.test.tsx
+++ b/client/settings/fraud-protection/advanced-settings/cards/test/purchase-price-threshold.test.tsx
@@ -65,8 +65,6 @@ describe( 'Purchase price threshold card', () => {
 	const contextValue = {
 		protectionSettingsUI: settings,
 		setProtectionSettingsUI: setSettings,
-		protectionSettingsChanged: false,
-		setProtectionSettingsChanged: jest.fn(),
 		setIsDirty: jest.fn(),
 	};
 	test( 'renders correctly', () => {
diff --git a/client/settings/fraud-protection/advanced-settings/context.ts b/client/settings/fraud-protection/advanced-settings/context.ts
index aa708fa36d0..c46b6bad440 100644
--- a/client/settings/fraud-protection/advanced-settings/context.ts
+++ b/client/settings/fraud-protection/advanced-settings/context.ts
@@ -7,8 +7,6 @@ import { FraudPreventionSettingsContextType } from '../interfaces';
 const FraudPreventionSettingsContext = createContext( {
 	protectionSettingsUI: {},
 	setProtectionSettingsUI: () => null,
-	protectionSettingsChanged: false,
-	setProtectionSettingsChanged: () => false,
 	setIsDirty: () => null,
 } as FraudPreventionSettingsContextType );
 
diff --git a/client/settings/fraud-protection/advanced-settings/index.tsx b/client/settings/fraud-protection/advanced-settings/index.tsx
index 881a09fdb90..74a37e9734a 100644
--- a/client/settings/fraud-protection/advanced-settings/index.tsx
+++ b/client/settings/fraud-protection/advanced-settings/index.tsx
@@ -122,10 +122,6 @@ const FraudProtectionAdvancedSettingsPage: React.FC = () => {
 	const [ protectionSettingsUI, setProtectionSettingsUI ] = useState<
 		ProtectionSettingsUI
 	>( {} );
-	const [
-		protectionSettingsChanged,
-		setProtectionSettingsChanged,
-	] = useState( false );
 
 	useEffect( () => {
 		setProtectionSettingsUI(
@@ -317,7 +313,7 @@ const FraudProtectionAdvancedSettingsPage: React.FC = () => {
 
 	useEffect( confirmLeaveCallback, [
 		confirmLeaveCallback,
-		protectionSettingsChanged,
+		protectionSettingsUI,
 		advancedFraudProtectionSettings,
 	] );
 
@@ -342,8 +338,6 @@ const FraudProtectionAdvancedSettingsPage: React.FC = () => {
 			value={ {
 				protectionSettingsUI,
 				setProtectionSettingsUI,
-				protectionSettingsChanged,
-				setProtectionSettingsChanged,
 				setIsDirty,
 			} }
 		>
diff --git a/client/settings/fraud-protection/advanced-settings/rule-toggle.tsx b/client/settings/fraud-protection/advanced-settings/rule-toggle.tsx
index 85e32790595..c2c49da2f5f 100644
--- a/client/settings/fraud-protection/advanced-settings/rule-toggle.tsx
+++ b/client/settings/fraud-protection/advanced-settings/rule-toggle.tsx
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import React, { useContext, useEffect, useState } from 'react';
+import React, { useContext } from 'react';
 import { __ } from '@wordpress/i18n';
 import { ToggleControl, RadioControl } from '@wordpress/components';
 
@@ -10,6 +10,7 @@ import { ToggleControl, RadioControl } from '@wordpress/components';
  */
 import './../style.scss';
 import FraudPreventionSettingsContext from './context';
+import { FraudPreventionSettings } from '../interfaces';
 
 interface FraudProtectionRuleToggleProps {
 	setting: string;
@@ -49,6 +50,15 @@ export const getHelpText = (
 	return helpTextMapping[ filterAction ];
 };
 
+const getFilterAction = (
+	settingUI: FraudPreventionSettings,
+	isFRTReviewFeatureActive: boolean
+) => {
+	if ( ! isFRTReviewFeatureActive ) return filterActions.BLOCK;
+
+	return settingUI.block ? filterActions.BLOCK : filterActions.REVIEW;
+};
+
 const FraudProtectionRuleToggle: React.FC< FraudProtectionRuleToggleProps > = ( {
 	setting,
 	label,
@@ -57,51 +67,31 @@ const FraudProtectionRuleToggle: React.FC< FraudProtectionRuleToggleProps > = (
 	const {
 		protectionSettingsUI,
 		setProtectionSettingsUI,
-		setProtectionSettingsChanged,
 		setIsDirty,
 	} = useContext( FraudPreventionSettingsContext );
 
 	const { isFRTReviewFeatureActive } = wcpaySettings;
 
-	const [ toggleState, setToggleState ] = useState( false );
-	const [ filterAction, setFilterAction ] = useState(
-		isFRTReviewFeatureActive ? filterActions.REVIEW : filterActions.BLOCK
-	);
-
 	const settingUI = protectionSettingsUI?.[ setting ];
+	const filterAction = getFilterAction( settingUI, isFRTReviewFeatureActive );
+
+	const handleToggleChange = ( field: string, value: boolean ) => {
+		setProtectionSettingsUI( ( settings ) => ( {
+			...settings,
+			[ setting ]: {
+				...settings[ setting ],
+				[ field ]: value,
+			},
+		} ) );
+		setIsDirty( true );
+	};
 
-	// Set initial states from saved settings.
-	useEffect( () => {
-		if ( ! settingUI ) return;
-
-		setToggleState( settingUI.enabled );
-		setFilterAction( () => {
-			if ( ! isFRTReviewFeatureActive ) return filterActions.BLOCK;
-
-			return settingUI.block ? filterActions.BLOCK : filterActions.REVIEW;
-		} );
-	}, [ settingUI, isFRTReviewFeatureActive ] );
-
-	// Set global object values from input changes.
-	useEffect( () => {
-		if ( ! settingUI ) return;
-
-		settingUI.enabled = toggleState;
-		settingUI.block = filterActions.BLOCK === filterAction;
-		setProtectionSettingsUI( protectionSettingsUI );
-		setProtectionSettingsChanged( ( prev ) => ! prev );
-	}, [
-		settingUI,
-		toggleState,
-		filterAction,
-		setProtectionSettingsChanged,
-		protectionSettingsUI,
-		setProtectionSettingsUI,
-	] );
+	const handleEnableToggleChange = ( value: boolean ) => {
+		handleToggleChange( 'enabled', value );
+	};
 
-	const handleToggleChange = () => {
-		setToggleState( ( value ) => ! value );
-		setIsDirty( true );
+	const handleBlockToggleChange = ( value: string ) => {
+		handleToggleChange( 'block', filterActions.BLOCK === value );
 	};
 
 	if ( ! protectionSettingsUI ) {
@@ -117,13 +107,13 @@ const FraudProtectionRuleToggle: React.FC< FraudProtectionRuleToggleProps > = (
 			<ToggleControl
 				label={ label }
 				key={ setting }
-				help={ getHelpText( toggleState, filterAction ) }
-				checked={ toggleState }
+				help={ getHelpText( settingUI?.enabled, filterAction ) }
+				checked={ settingUI?.enabled }
 				className="fraud-protection-rule-toggle-toggle"
-				onChange={ handleToggleChange }
+				onChange={ handleEnableToggleChange }
 			/>
 
-			{ toggleState && (
+			{ settingUI?.enabled && (
 				<div>
 					{ children }
 
@@ -139,7 +129,7 @@ const FraudProtectionRuleToggle: React.FC< FraudProtectionRuleToggleProps > = (
 							<RadioControl
 								options={ radioOptions }
 								selected={ filterAction }
-								onChange={ setFilterAction }
+								onChange={ handleBlockToggleChange }
 							/>
 						</div>
 					) }
diff --git a/client/settings/fraud-protection/advanced-settings/test/__snapshots__/index.test.tsx.snap b/client/settings/fraud-protection/advanced-settings/test/__snapshots__/index.test.tsx.snap
index dddbf129bdb..c550c6f6480 100644
--- a/client/settings/fraud-protection/advanced-settings/test/__snapshots__/index.test.tsx.snap
+++ b/client/settings/fraud-protection/advanced-settings/test/__snapshots__/index.test.tsx.snap
@@ -340,7 +340,7 @@ exports[`Advanced fraud protection settings doesn't save when there's a validati
                           data-wp-c16t="true"
                           data-wp-component="FlexItem"
                         >
-                          Orders from outside of the following countries will be blocked by the filter: 
+                          Orders from outside of the following countries will be screened by the filter: 
                           <strong>
                             Canada, United States
                           </strong>
@@ -1345,7 +1345,7 @@ exports[`Advanced fraud protection settings doesn't save when there's a validati
                         data-wp-c16t="true"
                         data-wp-component="FlexItem"
                       >
-                        Orders from outside of the following countries will be blocked by the filter: 
+                        Orders from outside of the following countries will be screened by the filter: 
                         <strong>
                           Canada, United States
                         </strong>
@@ -2119,7 +2119,7 @@ exports[`Advanced fraud protection settings renders an error message when settin
       id="a11y-speak-polite"
       style="position: absolute;margin: -1px;padding: 0;height: 1px;width: 1px;overflow: hidden;clip: rect(1px, 1px, 1px, 1px);-webkit-clip-path: inset(50%);clip-path: inset(50%);border: 0;word-wrap: normal !important;"
     >
-              Orders from outside of the following countries will be blocked by the filter:  Canada, United States   
+                For security, this filter is enabled and cannot be modified. Payments failing CVC verification will be blocked.  Learn more   
     </div>
     <div>
       <div>
@@ -2415,7 +2415,7 @@ exports[`Advanced fraud protection settings renders an error message when settin
                           data-wp-c16t="true"
                           data-wp-component="FlexItem"
                         >
-                          Orders from outside of the following countries will be blocked by the filter: 
+                          Orders from outside of the following countries will be screened by the filter: 
                           <strong>
                             Canada, United States
                           </strong>
@@ -3277,7 +3277,7 @@ exports[`Advanced fraud protection settings renders an error message when settin
                         data-wp-c16t="true"
                         data-wp-component="FlexItem"
                       >
-                        Orders from outside of the following countries will be blocked by the filter: 
+                        Orders from outside of the following countries will be screened by the filter: 
                         <strong>
                           Canada, United States
                         </strong>
@@ -3925,7 +3925,7 @@ exports[`Advanced fraud protection settings renders correctly 1`] = `
       id="a11y-speak-polite"
       style="position: absolute;margin: -1px;padding: 0;height: 1px;width: 1px;overflow: hidden;clip: rect(1px, 1px, 1px, 1px);-webkit-clip-path: inset(50%);clip-path: inset(50%);border: 0;word-wrap: normal !important;"
     >
-              Orders from outside of the following countries will be blocked by the filter:  Canada, United States   
+                For security, this filter is enabled and cannot be modified. Payments failing CVC verification will be blocked.  Learn more   
     </div>
     <div>
       <div
@@ -4186,7 +4186,7 @@ exports[`Advanced fraud protection settings renders correctly 1`] = `
                         data-wp-c16t="true"
                         data-wp-component="FlexItem"
                       >
-                        Orders from outside of the following countries will be blocked by the filter: 
+                        Orders from outside of the following countries will be screened by the filter: 
                         <strong>
                           Canada, United States
                         </strong>
@@ -5012,7 +5012,7 @@ exports[`Advanced fraud protection settings renders correctly 1`] = `
                       data-wp-c16t="true"
                       data-wp-component="FlexItem"
                     >
-                      Orders from outside of the following countries will be blocked by the filter: 
+                      Orders from outside of the following countries will be screened by the filter: 
                       <strong>
                         Canada, United States
                       </strong>
@@ -5659,7 +5659,7 @@ exports[`Advanced fraud protection settings saves settings when there are no val
       id="a11y-speak-polite"
       style="position: absolute;margin: -1px;padding: 0;height: 1px;width: 1px;overflow: hidden;clip: rect(1px, 1px, 1px, 1px);-webkit-clip-path: inset(50%);clip-path: inset(50%);border: 0;word-wrap: normal !important;"
     >
-              Orders from outside of the following countries will be blocked by the filter:  Canada, United States   
+                For security, this filter is enabled and cannot be modified. Payments failing CVC verification will be blocked.  Learn more   
     </div>
     <div>
       <div>
@@ -5938,7 +5938,7 @@ exports[`Advanced fraud protection settings saves settings when there are no val
                           data-wp-c16t="true"
                           data-wp-component="FlexItem"
                         >
-                          Orders from outside of the following countries will be blocked by the filter: 
+                          Orders from outside of the following countries will be screened by the filter: 
                           <strong>
                             Canada, United States
                           </strong>
@@ -6863,7 +6863,7 @@ exports[`Advanced fraud protection settings saves settings when there are no val
                         data-wp-c16t="true"
                         data-wp-component="FlexItem"
                       >
-                        Orders from outside of the following countries will be blocked by the filter: 
+                        Orders from outside of the following countries will be screened by the filter: 
                         <strong>
                           Canada, United States
                         </strong>
diff --git a/client/settings/fraud-protection/advanced-settings/test/__snapshots__/rule-toggle.test.tsx.snap b/client/settings/fraud-protection/advanced-settings/test/__snapshots__/rule-toggle.test.tsx.snap
index daa0f6c642e..daa15a8d239 100644
--- a/client/settings/fraud-protection/advanced-settings/test/__snapshots__/rule-toggle.test.tsx.snap
+++ b/client/settings/fraud-protection/advanced-settings/test/__snapshots__/rule-toggle.test.tsx.snap
@@ -219,6 +219,7 @@ exports[`Fraud protection rule toggle tests renders correctly when enabled 1`] =
             >
               <input
                 aria-describedby="inspector-toggle-control-1__help"
+                checked=""
                 class="components-form-toggle__input"
                 id="inspector-toggle-control-1"
                 type="checkbox"
@@ -268,6 +269,7 @@ exports[`Fraud protection rule toggle tests renders correctly when enabled 1`] =
           >
             <input
               aria-describedby="inspector-toggle-control-1__help"
+              checked=""
               class="components-form-toggle__input"
               id="inspector-toggle-control-1"
               type="checkbox"
@@ -398,6 +400,7 @@ exports[`Fraud protection rule toggle tests renders correctly when enabled and b
             >
               <input
                 aria-describedby="inspector-toggle-control-2__help"
+                checked=""
                 class="components-form-toggle__input"
                 id="inspector-toggle-control-2"
                 type="checkbox"
@@ -447,6 +450,7 @@ exports[`Fraud protection rule toggle tests renders correctly when enabled and b
           >
             <input
               aria-describedby="inspector-toggle-control-2__help"
+              checked=""
               class="components-form-toggle__input"
               id="inspector-toggle-control-2"
               type="checkbox"
diff --git a/client/settings/fraud-protection/advanced-settings/test/allow-countries-notice.test.tsx b/client/settings/fraud-protection/advanced-settings/test/allow-countries-notice.test.tsx
index c503bf74ed7..06a859eaaed 100644
--- a/client/settings/fraud-protection/advanced-settings/test/allow-countries-notice.test.tsx
+++ b/client/settings/fraud-protection/advanced-settings/test/allow-countries-notice.test.tsx
@@ -16,9 +16,7 @@ const mockContext = {
 			block: false,
 		},
 	},
-	protectionSettingsChanged: false,
 	setProtectionSettingsUI: jest.fn(),
-	setProtectionSettingsChanged: jest.fn(),
 	setIsDirty: jest.fn(),
 };
 
diff --git a/client/settings/fraud-protection/advanced-settings/test/rule-toggle.test.tsx b/client/settings/fraud-protection/advanced-settings/test/rule-toggle.test.tsx
index d2476015479..aac4ec8cdad 100644
--- a/client/settings/fraud-protection/advanced-settings/test/rule-toggle.test.tsx
+++ b/client/settings/fraud-protection/advanced-settings/test/rule-toggle.test.tsx
@@ -9,6 +9,7 @@ import { render } from '@testing-library/react';
  */
 import FraudProtectionRuleToggle from '../rule-toggle';
 import FraudPreventionSettingsContext from '../context';
+import userEvent from '@testing-library/user-event';
 
 declare const global: {
 	wcpaySettings: {
@@ -23,9 +24,7 @@ interface mockContext {
 			block: boolean;
 		};
 	};
-	protectionSettingsChanged: boolean;
 	setProtectionSettingsUI: jest.Mock;
-	setProtectionSettingsChanged: jest.Mock;
 	setIsDirty: jest.Mock;
 }
 
@@ -41,9 +40,7 @@ describe( 'Fraud protection rule toggle tests', () => {
 				block: false,
 			},
 		},
-		protectionSettingsChanged: false,
 		setProtectionSettingsUI: jest.fn(),
-		setProtectionSettingsChanged: jest.fn(),
 		setIsDirty: jest.fn(),
 	};
 
@@ -55,9 +52,7 @@ describe( 'Fraud protection rule toggle tests', () => {
 					block: false,
 				},
 			},
-			protectionSettingsChanged: false,
 			setProtectionSettingsUI: jest.fn(),
-			setProtectionSettingsChanged: jest.fn(),
 			setIsDirty: jest.fn(),
 		};
 	} );
@@ -134,7 +129,9 @@ describe( 'Fraud protection rule toggle tests', () => {
 		expect( container.getByLabelText( 'Test rule toggle' ) ).toBeChecked();
 		expect( container.queryByText( 'test content' ) ).toBeInTheDocument();
 	} );
-	test( 'sets the value correctly when enabled', () => {
+	test( 'calls the toggle enable function when clicking in the label', () => {
+		mockContext.protectionSettingsUI.test_rule.enabled = false;
+
 		const container = render(
 			<FraudPreventionSettingsContext.Provider value={ mockContext }>
 				<FraudProtectionRuleToggle
@@ -145,17 +142,10 @@ describe( 'Fraud protection rule toggle tests', () => {
 				</FraudProtectionRuleToggle>
 			</FraudPreventionSettingsContext.Provider>
 		);
+
 		const activationToggle = container.getByLabelText( 'Test rule toggle' );
-		expect(
-			mockContext.protectionSettingsUI.test_rule.enabled
-		).toBeFalsy();
-		activationToggle.click();
-		expect(
-			mockContext.protectionSettingsUI.test_rule.enabled
-		).toBeTruthy();
-		activationToggle.click();
-		expect(
-			mockContext.protectionSettingsUI.test_rule.enabled
-		).toBeFalsy();
+		userEvent.click( activationToggle );
+
+		expect( mockContext.setProtectionSettingsUI ).toHaveBeenCalled();
 	} );
 } );
diff --git a/client/settings/fraud-protection/interfaces.ts b/client/settings/fraud-protection/interfaces.ts
index 7ad040bad87..a034fb5d6a5 100644
--- a/client/settings/fraud-protection/interfaces.ts
+++ b/client/settings/fraud-protection/interfaces.ts
@@ -33,9 +33,7 @@ export type ProtectionSettingsUI = Record< string, FraudPreventionSettings >;
 
 export interface FraudPreventionSettingsContextType {
 	protectionSettingsUI: ProtectionSettingsUI;
-	setProtectionSettingsUI: ( settings: ProtectionSettingsUI ) => void;
-	protectionSettingsChanged: boolean;
-	setProtectionSettingsChanged: Dispatch< SetStateAction< boolean > >;
+	setProtectionSettingsUI: Dispatch< SetStateAction< ProtectionSettingsUI > >;
 	setIsDirty: Dispatch< SetStateAction< boolean > >;
 }
 

From 98f346755bfc51b698afbee084a7c930908f7dc3 Mon Sep 17 00:00:00 2001
From: Guilherme Pressutto <gpressutto5@gmail.com>
Date: Fri, 25 Oct 2024 10:38:54 -0300
Subject: [PATCH 08/45] Fix PMME appearance in checkout (#9621)

Co-authored-by: Timur Karimov <timur.karimow.95@gmail.com>
---
 changelog/fix-pmme-appearance-checkout        |  4 +++
 client/checkout/blocks/index.js               |  3 --
 client/checkout/blocks/payment-elements.js    |  2 +-
 .../checkout/blocks/payment-method-label.js   | 34 ++++++++++++++-----
 client/checkout/classic/event-handlers.js     |  3 +-
 client/checkout/classic/payment-processing.js |  5 +--
 6 files changed, 35 insertions(+), 16 deletions(-)
 create mode 100644 changelog/fix-pmme-appearance-checkout

diff --git a/changelog/fix-pmme-appearance-checkout b/changelog/fix-pmme-appearance-checkout
new file mode 100644
index 00000000000..4fc63e58c52
--- /dev/null
+++ b/changelog/fix-pmme-appearance-checkout
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fix
+
+Fix PMME appearance in checkout
diff --git a/client/checkout/blocks/index.js b/client/checkout/blocks/index.js
index 1648598a24b..12017a03129 100644
--- a/client/checkout/blocks/index.js
+++ b/client/checkout/blocks/index.js
@@ -77,8 +77,6 @@ const api = new WCPayAPI(
 	request
 );
 
-const stripeAppearance = getUPEConfig( 'wcBlocksUPEAppearance' );
-
 Object.entries( enabledPaymentMethodsConfig )
 	.filter( ( [ upeName ] ) => upeName !== 'link' )
 	.forEach( ( [ upeName, upeConfig ] ) => {
@@ -114,7 +112,6 @@ Object.entries( enabledPaymentMethodsConfig )
 					api={ api }
 					upeConfig={ upeConfig }
 					upeName={ upeName }
-					stripeAppearance={ stripeAppearance }
 					upeAppearanceTheme={ upeAppearanceTheme }
 				/>
 			),
diff --git a/client/checkout/blocks/payment-elements.js b/client/checkout/blocks/payment-elements.js
index 7359b89a162..bedbf4777cc 100644
--- a/client/checkout/blocks/payment-elements.js
+++ b/client/checkout/blocks/payment-elements.js
@@ -36,7 +36,7 @@ const PaymentElements = ( { api, ...props } ) => {
 	useEffect( () => {
 		async function generateUPEAppearance() {
 			// Generate UPE input styles.
-			let upeAppearance = getAppearance( 'blocks_checkout', false, true );
+			let upeAppearance = getAppearance( 'blocks_checkout', false );
 			upeAppearance = await api.saveUPEAppearance(
 				upeAppearance,
 				'blocks_checkout'
diff --git a/client/checkout/blocks/payment-method-label.js b/client/checkout/blocks/payment-method-label.js
index e63009d691d..417007816aa 100644
--- a/client/checkout/blocks/payment-method-label.js
+++ b/client/checkout/blocks/payment-method-label.js
@@ -9,17 +9,16 @@ import { normalizeCurrencyToMinorUnit } from '../utils';
 import { getUPEConfig } from 'wcpay/utils/checkout';
 import { __ } from '@wordpress/i18n';
 import './style.scss';
+import { useEffect, useState } from '@wordpress/element';
+import { getAppearance } from 'wcpay/checkout/upe-styles';
 
-export default ( {
-	api,
-	upeConfig,
-	upeName,
-	stripeAppearance,
-	upeAppearanceTheme,
-} ) => {
+export default ( { api, upeConfig, upeName, upeAppearanceTheme } ) => {
 	const cartData = wp.data.select( 'wc/store/cart' ).getCartData();
 	const bnplMethods = [ 'affirm', 'afterpay_clearpay', 'klarna' ];
 	const isTestMode = getUPEConfig( 'testMode' );
+	const [ appearance, setAppearance ] = useState(
+		getUPEConfig( 'wcBlocksUPEAppearance' )
+	);
 
 	// Stripe expects the amount to be sent as the minor unit of 2 digits.
 	const amount = parseInt(
@@ -38,6 +37,22 @@ export default ( {
 
 	const isCreditCard = upeName === 'card';
 
+	useEffect( () => {
+		async function generateUPEAppearance() {
+			// Generate UPE input styles.
+			let upeAppearance = getAppearance( 'blocks_checkout', false );
+			upeAppearance = await api.saveUPEAppearance(
+				upeAppearance,
+				'blocks_checkout'
+			);
+			setAppearance( upeAppearance );
+		}
+
+		if ( ! appearance ) {
+			generateUPEAppearance();
+		}
+	}, [ api, appearance ] );
+
 	return (
 		<>
 			<div className="payment-method-label">
@@ -63,12 +78,13 @@ export default ( {
 				( upeConfig.countries.length === 0 ||
 					upeConfig.countries.includes( currentCountry ) ) &&
 				amount > 0 &&
-				currentCountry && (
+				currentCountry &&
+				appearance && (
 					<div className="bnpl-message">
 						<Elements
 							stripe={ api.getStripeForUPE( upeName ) }
 							options={ {
-								appearance: stripeAppearance ?? {},
+								appearance: appearance,
 							} }
 						>
 							<PaymentMethodMessagingElement
diff --git a/client/checkout/classic/event-handlers.js b/client/checkout/classic/event-handlers.js
index 80982473177..6e4b8fb43fe 100644
--- a/client/checkout/classic/event-handlers.js
+++ b/client/checkout/classic/event-handlers.js
@@ -204,7 +204,8 @@ jQuery( function ( $ ) {
 								decimalPlaces:
 									cartData?.totals?.currency_minor_unit,
 								country: currentCountry,
-							}
+							},
+							'shortcode_checkout'
 						);
 					}
 				}
diff --git a/client/checkout/classic/payment-processing.js b/client/checkout/classic/payment-processing.js
index 32c61c04044..514f5364ffb 100644
--- a/client/checkout/classic/payment-processing.js
+++ b/client/checkout/classic/payment-processing.js
@@ -453,10 +453,11 @@ export async function mountStripePaymentElement(
 export async function mountStripePaymentMethodMessagingElement(
 	api,
 	domElement,
-	cartData
+	cartData,
+	location
 ) {
 	const paymentMethodType = domElement.dataset.paymentMethodType;
-	const appearance = await initializeAppearance( api );
+	const appearance = await initializeAppearance( api, location );
 
 	try {
 		const paymentMethodMessagingElement = api

From b31fd14b6cc7e2f075ff9379e749235dc973e369 Mon Sep 17 00:00:00 2001
From: Ricardo Metring <ricardometring@gmail.com>
Date: Fri, 25 Oct 2024 22:23:09 -0300
Subject: [PATCH 09/45] Decoupled Multi-currency module (#9617)

Co-authored-by: Hector Lovo <hector.lovo@automattic.com>
Co-authored-by: Rafael Zaleski <rafaelzaleski@users.noreply.github.com>
Co-authored-by: Hector Lovo <lovohh@gmail.com>
---
 changelog/fix-backwards-compat-mccy-instance  |    4 +
 changelog/multi-currency-v2                   |    4 +
 .../add-payment-methods-task.js               |    2 +-
 .../currency-information-for-methods.js       |    4 +-
 .../test/add-payment-methods-task.test.js     |   14 +-
 .../currency-information-for-methods.test.js  |   11 +-
 .../wizard/task-item.scss                     |   16 +
 .../wizard/task-item.tsx                      |   12 +
 client/capital/index.tsx                      |    5 +-
 client/checkout/woopay/email-input-iframe.js  |    4 +-
 .../account-balances/balance-block.tsx        |    2 +-
 client/components/account-balances/index.tsx  |    2 +-
 .../account-fees/expiration-bar.js            |    2 +-
 .../account-fees/expiration-description.js    |    2 +-
 .../account-status/account-fees/index.js      |    5 +-
 .../components/active-loan-summary/index.tsx  |    2 +-
 client/components/deposits-overview/index.tsx |    2 +-
 .../recent-deposits-list.tsx                  |    2 +-
 .../components/disputed-order-notice/index.js |    2 +-
 .../payment-activity/payment-data-tile.tsx    |    2 +-
 client/components/welcome/currency-select.tsx |    2 +-
 client/data/deposits/actions.js               |    2 +-
 client/data/index.ts                          |    1 -
 client/data/multi-currency/index.js           |   12 -
 client/data/store.js                          |    5 -
 client/deposits/details/index.tsx             |    5 +-
 client/deposits/filters/index.js              |    2 +-
 client/deposits/instant-deposits/index.tsx    |    2 +-
 client/deposits/instant-deposits/modal.tsx    |    5 +-
 client/deposits/list/index.tsx                |    5 +-
 client/disputes/filters/index.tsx             |    2 +-
 client/disputes/filters/test/index.tsx        |    2 +-
 client/disputes/index.tsx                     |    5 +-
 client/disputes/info/index.tsx                |    2 +-
 client/disputes/utils.ts                      |    5 +-
 client/index.js                               |    2 +-
 .../wizard/task-item.scss                     |   17 -
 .../multi-currency-setup/wizard/task-item.tsx |   71 --
 .../overview/task-list/tasks/dispute-task.tsx |    2 +-
 .../dispute-details/dispute-steps.tsx         |    2 +-
 .../dispute-details/dispute-summary-row.tsx   |    2 +-
 client/payment-details/readers/index.js       |    5 +-
 client/payment-details/summary/index.tsx      |    5 +-
 client/payment-details/timeline/map-events.js |    2 +-
 .../cards/purchase-price-threshold.tsx        |    2 +-
 .../fraud-protection/test/index.test.tsx      |   16 -
 client/settings/payment-methods-list/index.js |    2 +-
 .../__tests__/payment-methods-section.test.js |   12 +-
 client/transactions/blocked/columns.tsx       |    2 +-
 client/transactions/blocked/index.tsx         |    2 +-
 client/transactions/filters/index.tsx         |    2 +-
 client/transactions/list/converted-amount.tsx |    2 +-
 client/transactions/list/index.tsx            |    2 +-
 client/transactions/risk-review/columns.tsx   |    2 +-
 client/transactions/risk-review/index.tsx     |    2 +-
 client/transactions/uncaptured/index.tsx      |    2 +-
 client/utils/account-fees.tsx                 |    4 +-
 client/utils/test/account-fees.tsx            |    4 +-
 client/vat/form/tasks/company-data-task.tsx   |    6 +-
 client/vat/form/tasks/vat-number-task.tsx     |    6 +-
 composer.json                                 |    2 +-
 includes/class-database-cache.php             |    5 +-
 includes/class-wc-payments-account.php        |   58 +-
 ...s-wc-payments-explicit-price-formatter.php |    1 -
 ...class-wc-payments-localization-service.php |    4 +-
 .../class-wc-payments-settings-service.php    |   42 +
 includes/class-wc-payments-utils.php          |   18 -
 includes/class-wc-payments.php                |   32 +-
 .../class-wc-payments-currency-manager.php}   |   77 +-
 .../wc-payments-multi-currency.php            |   17 +-
 includes/multi-currency/CountryFlags.php      |  304 -----
 .../multi-currency/Helpers/OrderMetaHelper.md |   20 -
 .../Helpers/OrderMetaHelper.php               |  438 -------
 .../class-wc-payments-api-client.php          |    7 +-
 .../client/analytics}/index.js                |    0
 .../client}/blocks/currency-switcher.js       |    5 +-
 .../currency-delete-illustration/index.js     |    0
 .../currency-delete-illustration/styles.scss  |    0
 .../client/components}/preview-modal/index.js |    2 +-
 .../components}/preview-modal/index.scss      |    0
 .../client}/components/search/index.js        |    0
 .../client}/components/search/style.scss      |    0
 .../search/test/__snapshots__/index.js.snap   |    0
 .../client}/components/search/test/index.js   |    0
 .../client}/context.js                        |    0
 .../client/data}/action-types.js              |    0
 .../client/data}/actions.js                   |    4 +-
 multi-currency/client/data/constants.js       |    4 +
 .../client/data}/hooks.js                     |    6 +-
 multi-currency/client/data/index.ts           |   20 +
 .../client/data}/reducer.js                   |    0
 .../client/data}/resolvers.js                 |    4 +-
 .../client/data}/selectors.js                 |    2 +-
 multi-currency/client/data/store.js           |   28 +
 .../client}/index.js                          |    4 +-
 multi-currency/client/interface/assets.js     |    6 +
 multi-currency/client/interface/components.js |   23 +
 multi-currency/client/interface/data.js       |   10 +
 multi-currency/client/interface/functions.js  |   25 +
 .../enabled-currencies-list/delete-button.js  |   10 +-
 .../enabled-currencies-list/index.js          |    4 +-
 .../list-item-placeholder.js                  |    2 +-
 .../enabled-currencies-list/list-item.js      |    2 +-
 .../enabled-currencies-list/list.js           |    0
 .../modal-checkbox-list.js                    |    0
 .../enabled-currencies-list/modal-checkbox.js |    0
 .../enabled-currencies-list/modal.js          |    6 +-
 .../enabled-currencies-list/style.scss        |    0
 .../test/__snapshots__/index.js.snap          |    0
 .../enabled-currencies-list/test/index.js     |    8 +-
 .../client/settings/multi-currency}/index.js  |    2 +-
 .../multi-currency}/store-settings/index.js   |   10 +-
 .../multi-currency}/store-settings/style.scss |    0
 .../test/__snapshots__/index.test.js.snap     |    0
 .../store-settings/test/index.test.js         |    4 +-
 .../settings/multi-currency}/style.scss       |    0
 .../test/__snapshots__/index.test.js.snap     |    0
 .../multi-currency}/test/index.test.js        |    2 +-
 .../settings/single-currency}/constants.js    |    0
 .../single-currency}/currency-preview.js      |    5 +-
 .../client/settings/single-currency}/index.js |   12 +-
 .../settings/single-currency}/style.scss      |    0
 .../test/__snapshots__/index.test.js.snap     |    0
 .../single-currency}/test/index.test.js       |    6 +-
 .../client/setup}/index.js                    |    4 +-
 .../tasks/add-currencies-task/constants.js    |    0
 .../setup}/tasks/add-currencies-task/index.js |   19 +-
 .../tasks/add-currencies-task/index.scss      |    0
 .../test/__snapshots__/index.test.js.snap     |    0
 .../add-currencies-task/test/index.test.js    |   10 +-
 .../add-currencies-task/test/utils.test.js    |    0
 .../setup}/tasks/add-currencies-task/utils.js |    0
 .../setup}/tasks/multi-currency-setup.js      |    8 +-
 .../setup}/tasks/multi-currency-setup.scss    |    0
 .../setup}/tasks/setup-complete-task/index.js |   10 +-
 .../tasks/setup-complete-task/index.scss      |    0
 .../setup-complete-task/test/index.test.js    |    5 +-
 .../setup}/tasks/store-settings-task/index.js |   13 +-
 .../tasks/store-settings-task/index.scss      |    0
 .../test/__snapshots__/index.test.js.snap     |    0
 .../store-settings-task/test/index.test.js    |   16 +-
 .../multi-currency-setup.test.js.snap         |    0
 .../tasks/test/multi-currency-setup.test.js   |    0
 .../client/setup}/test/index.js               |    0
 .../client}/utils/currency/index.js           |    0
 .../client}/utils/currency/test/index.js      |    2 +-
 .../__tests__/index.test.js                   |    2 +-
 .../utils/missing-currencies-message/index.ts |    2 +-
 .../src}/AdminNotices.php                     |    0
 .../src}/Analytics.php                        |   21 +-
 .../src}/BackendCurrencies.php                |   12 +-
 .../src}/Compatibility.php                    |    4 +-
 .../src}/Compatibility/BaseCompatibility.php  |    2 +-
 .../Compatibility/WooCommerceBookings.php     |    2 +-
 .../Compatibility/WooCommerceDeposits.php     |    2 +-
 .../src}/Compatibility/WooCommerceFedEx.php   |    2 +-
 .../WooCommerceNameYourPrice.php              |    2 +-
 .../WooCommercePointsAndRewards.php           |    2 +-
 .../Compatibility/WooCommercePreOrders.php    |    2 +-
 .../WooCommerceProductAddOns.php              |    2 +-
 .../WooCommerceSubscriptions.php              |   22 +-
 .../src}/Compatibility/WooCommerceUPS.php     |    2 +-
 multi-currency/src/CountryFlags.php           |  301 +++++
 .../src}/Currency.php                         |   17 +-
 .../src}/CurrencySwitcherBlock.php            |    4 +-
 .../src}/CurrencySwitcherWidget.php           |    0
 .../Exceptions/InvalidCurrencyException.php   |    4 +-
 .../InvalidCurrencyRateException.php          |    4 +-
 .../src}/FrontendCurrencies.php               |   16 +-
 .../src}/FrontendPrices.php                   |    0
 .../src}/Geolocation.php                      |   10 +-
 .../MultiCurrencyAccountInterface.php         |   61 +
 .../MultiCurrencyApiClientInterface.php       |   30 +
 .../MultiCurrencyCacheInterface.php           |   46 +
 .../MultiCurrencyLocalizationInterface.php    |   31 +
 .../MultiCurrencySettingsInterface.php        |   34 +
 multi-currency/src/Logger.php                 |   68 ++
 .../src}/MultiCurrency.php                    | 1029 +++++++++--------
 .../src}/Notes/NoteMultiCurrencyAvailable.php |   10 +-
 .../src}/RestController.php                   |   62 +-
 .../src}/Settings.php                         |    2 +-
 .../src}/SettingsOnboardCta.php               |   23 +-
 .../src}/StorefrontIntegration.php            |    0
 .../src}/Tracking.php                         |    0
 .../src}/UserSettings.php                     |    0
 .../src}/Utils.php                            |   37 +-
 phpcs.xml.dist                                |    2 +-
 psalm-baseline.xml                            |    4 +-
 tasks/release.js                              |    8 +-
 tests/js/jest.config.js                       |    7 +-
 .../test-class-woocommerce-subscriptions.php  |   23 +-
 ...ass-note-multi-currency-available-test.php |    9 +-
 .../multi-currency/test-class-analytics.php   |   51 +-
 .../test-class-backend-currencies.php         |    7 +-
 .../test-class-compatibility.php              |   28 +-
 .../test-class-country-flags.php              |    3 +-
 .../test-class-currency-switcher-block.php    |   33 +-
 .../test-class-frontend-currencies.php        |    1 +
 .../test-class-frontend-prices.php            |    6 +-
 .../multi-currency/test-class-geolocation.php |   18 +-
 .../test-class-multi-currency.php             |  103 +-
 .../test-class-rest-controller.php            |  107 +-
 .../multi-currency/test-class-settings.php    |    2 -
 .../unit/multi-currency/test-class-utils.php  |    3 +-
 ...st-class-wc-payments-currency-manager.php} |   37 +-
 ...s-wc-payments-explicit-price-formatter.php |   12 +-
 tsconfig.json                                 |    3 +-
 webpack/shared.js                             |   17 +-
 208 files changed, 2149 insertions(+), 1865 deletions(-)
 create mode 100644 changelog/fix-backwards-compat-mccy-instance
 create mode 100644 changelog/multi-currency-v2
 delete mode 100644 client/data/multi-currency/index.js
 delete mode 100644 client/multi-currency-setup/wizard/task-item.scss
 delete mode 100644 client/multi-currency-setup/wizard/task-item.tsx
 create mode 100644 includes/class-wc-payments-settings-service.php
 rename includes/{multi-currency/PaymentMethodsCompatibility.php => compat/multi-currency/class-wc-payments-currency-manager.php} (69%)
 rename includes/{ => compat}/multi-currency/wc-payments-multi-currency.php (80%)
 delete mode 100644 includes/multi-currency/CountryFlags.php
 delete mode 100644 includes/multi-currency/Helpers/OrderMetaHelper.md
 delete mode 100644 includes/multi-currency/Helpers/OrderMetaHelper.php
 rename {client/multi-currency-analytics => multi-currency/client/analytics}/index.js (100%)
 rename {client/multi-currency => multi-currency/client}/blocks/currency-switcher.js (99%)
 rename {client => multi-currency/client}/components/currency-delete-illustration/index.js (100%)
 rename {client => multi-currency/client}/components/currency-delete-illustration/styles.scss (100%)
 rename {client/multi-currency => multi-currency/client/components}/preview-modal/index.js (95%)
 rename {client/multi-currency => multi-currency/client/components}/preview-modal/index.scss (100%)
 rename {client => multi-currency/client}/components/search/index.js (100%)
 rename {client => multi-currency/client}/components/search/style.scss (100%)
 rename {client => multi-currency/client}/components/search/test/__snapshots__/index.js.snap (100%)
 rename {client => multi-currency/client}/components/search/test/index.js (100%)
 rename {client/multi-currency => multi-currency/client}/context.js (100%)
 rename {client/data/multi-currency => multi-currency/client/data}/action-types.js (100%)
 rename {client/data/multi-currency => multi-currency/client/data}/actions.js (96%)
 create mode 100644 multi-currency/client/data/constants.js
 rename {client/data/multi-currency => multi-currency/client/data}/hooks.js (96%)
 create mode 100644 multi-currency/client/data/index.ts
 rename {client/data/multi-currency => multi-currency/client/data}/reducer.js (100%)
 rename {client/data/multi-currency => multi-currency/client/data}/resolvers.js (93%)
 rename {client/data/multi-currency => multi-currency/client/data}/selectors.js (96%)
 create mode 100644 multi-currency/client/data/store.js
 rename {client/multi-currency => multi-currency/client}/index.js (91%)
 create mode 100644 multi-currency/client/interface/assets.js
 create mode 100644 multi-currency/client/interface/components.js
 create mode 100644 multi-currency/client/interface/data.js
 create mode 100644 multi-currency/client/interface/functions.js
 rename {client/multi-currency/multi-currency-settings => multi-currency/client/settings/multi-currency}/enabled-currencies-list/delete-button.js (92%)
 rename {client/multi-currency/multi-currency-settings => multi-currency/client/settings/multi-currency}/enabled-currencies-list/index.js (97%)
 rename {client/multi-currency/multi-currency-settings => multi-currency/client/settings/multi-currency}/enabled-currencies-list/list-item-placeholder.js (94%)
 rename {client/multi-currency/multi-currency-settings => multi-currency/client/settings/multi-currency}/enabled-currencies-list/list-item.js (97%)
 rename {client/multi-currency/multi-currency-settings => multi-currency/client/settings/multi-currency}/enabled-currencies-list/list.js (100%)
 rename {client/multi-currency/multi-currency-settings => multi-currency/client/settings/multi-currency}/enabled-currencies-list/modal-checkbox-list.js (100%)
 rename {client/multi-currency/multi-currency-settings => multi-currency/client/settings/multi-currency}/enabled-currencies-list/modal-checkbox.js (100%)
 rename {client/multi-currency/multi-currency-settings => multi-currency/client/settings/multi-currency}/enabled-currencies-list/modal.js (97%)
 rename {client/multi-currency/multi-currency-settings => multi-currency/client/settings/multi-currency}/enabled-currencies-list/style.scss (100%)
 rename {client/multi-currency/multi-currency-settings => multi-currency/client/settings/multi-currency}/enabled-currencies-list/test/__snapshots__/index.js.snap (100%)
 rename {client/multi-currency/multi-currency-settings => multi-currency/client/settings/multi-currency}/enabled-currencies-list/test/index.js (97%)
 rename {client/multi-currency/multi-currency-settings => multi-currency/client/settings/multi-currency}/index.js (87%)
 rename {client/multi-currency/multi-currency-settings => multi-currency/client/settings/multi-currency}/store-settings/index.js (95%)
 rename {client/multi-currency/multi-currency-settings => multi-currency/client/settings/multi-currency}/store-settings/style.scss (100%)
 rename {client/multi-currency/multi-currency-settings => multi-currency/client/settings/multi-currency}/store-settings/test/__snapshots__/index.test.js.snap (100%)
 rename {client/multi-currency/multi-currency-settings => multi-currency/client/settings/multi-currency}/store-settings/test/index.test.js (95%)
 rename {client/multi-currency/multi-currency-settings => multi-currency/client/settings/multi-currency}/style.scss (100%)
 rename {client/multi-currency/multi-currency-settings => multi-currency/client/settings/multi-currency}/test/__snapshots__/index.test.js.snap (100%)
 rename {client/multi-currency/multi-currency-settings => multi-currency/client/settings/multi-currency}/test/index.test.js (92%)
 rename {client/multi-currency/single-currency-settings => multi-currency/client/settings/single-currency}/constants.js (100%)
 rename {client/multi-currency/single-currency-settings => multi-currency/client/settings/single-currency}/currency-preview.js (96%)
 rename {client/multi-currency/single-currency-settings => multi-currency/client/settings/single-currency}/index.js (98%)
 rename {client/multi-currency/single-currency-settings => multi-currency/client/settings/single-currency}/style.scss (100%)
 rename {client/multi-currency/single-currency-settings => multi-currency/client/settings/single-currency}/test/__snapshots__/index.test.js.snap (100%)
 rename {client/multi-currency/single-currency-settings => multi-currency/client/settings/single-currency}/test/index.test.js (97%)
 rename {client/multi-currency-setup => multi-currency/client/setup}/index.js (77%)
 rename {client/multi-currency-setup => multi-currency/client/setup}/tasks/add-currencies-task/constants.js (100%)
 rename {client/multi-currency-setup => multi-currency/client/setup}/tasks/add-currencies-task/index.js (93%)
 rename {client/multi-currency-setup => multi-currency/client/setup}/tasks/add-currencies-task/index.scss (100%)
 rename {client/multi-currency-setup => multi-currency/client/setup}/tasks/add-currencies-task/test/__snapshots__/index.test.js.snap (100%)
 rename {client/multi-currency-setup => multi-currency/client/setup}/tasks/add-currencies-task/test/index.test.js (97%)
 rename {client/multi-currency-setup => multi-currency/client/setup}/tasks/add-currencies-task/test/utils.test.js (100%)
 rename {client/multi-currency-setup => multi-currency/client/setup}/tasks/add-currencies-task/utils.js (100%)
 rename {client/multi-currency-setup => multi-currency/client/setup}/tasks/multi-currency-setup.js (84%)
 rename {client/multi-currency-setup => multi-currency/client/setup}/tasks/multi-currency-setup.scss (100%)
 rename {client/multi-currency-setup => multi-currency/client/setup}/tasks/setup-complete-task/index.js (89%)
 rename {client/multi-currency-setup => multi-currency/client/setup}/tasks/setup-complete-task/index.scss (100%)
 rename {client/multi-currency-setup => multi-currency/client/setup}/tasks/setup-complete-task/test/index.test.js (87%)
 rename {client/multi-currency-setup => multi-currency/client/setup}/tasks/store-settings-task/index.js (92%)
 rename {client/multi-currency-setup => multi-currency/client/setup}/tasks/store-settings-task/index.scss (100%)
 rename {client/multi-currency-setup => multi-currency/client/setup}/tasks/store-settings-task/test/__snapshots__/index.test.js.snap (100%)
 rename {client/multi-currency-setup => multi-currency/client/setup}/tasks/store-settings-task/test/index.test.js (92%)
 rename {client/multi-currency-setup => multi-currency/client/setup}/tasks/test/__snapshots__/multi-currency-setup.test.js.snap (100%)
 rename {client/multi-currency-setup => multi-currency/client/setup}/tasks/test/multi-currency-setup.test.js (100%)
 rename {client/multi-currency-setup => multi-currency/client/setup}/test/index.js (100%)
 rename {client => multi-currency/client}/utils/currency/index.js (100%)
 rename {client => multi-currency/client}/utils/currency/test/index.js (98%)
 rename client/multi-currency/__tests__/missing-currencies-message.test.js => multi-currency/client/utils/missing-currencies-message/__tests__/index.test.js (89%)
 rename client/multi-currency/missing-currencies-message.ts => multi-currency/client/utils/missing-currencies-message/index.ts (91%)
 rename {includes/multi-currency => multi-currency/src}/AdminNotices.php (100%)
 rename {includes/multi-currency => multi-currency/src}/Analytics.php (96%)
 rename {includes/multi-currency => multi-currency/src}/BackendCurrencies.php (91%)
 rename {includes/multi-currency => multi-currency/src}/Compatibility.php (99%)
 rename {includes/multi-currency => multi-currency/src}/Compatibility/BaseCompatibility.php (95%)
 rename {includes/multi-currency => multi-currency/src}/Compatibility/WooCommerceBookings.php (99%)
 rename {includes/multi-currency => multi-currency/src}/Compatibility/WooCommerceDeposits.php (99%)
 rename {includes/multi-currency => multi-currency/src}/Compatibility/WooCommerceFedEx.php (97%)
 rename {includes/multi-currency => multi-currency/src}/Compatibility/WooCommerceNameYourPrice.php (99%)
 rename {includes/multi-currency => multi-currency/src}/Compatibility/WooCommercePointsAndRewards.php (98%)
 rename {includes/multi-currency => multi-currency/src}/Compatibility/WooCommercePreOrders.php (96%)
 rename {includes/multi-currency => multi-currency/src}/Compatibility/WooCommerceProductAddOns.php (99%)
 rename {includes/multi-currency => multi-currency/src}/Compatibility/WooCommerceSubscriptions.php (97%)
 rename {includes/multi-currency => multi-currency/src}/Compatibility/WooCommerceUPS.php (97%)
 create mode 100644 multi-currency/src/CountryFlags.php
 rename {includes/multi-currency => multi-currency/src}/Currency.php (89%)
 rename {includes/multi-currency => multi-currency/src}/CurrencySwitcherBlock.php (97%)
 rename {includes/multi-currency => multi-currency/src}/CurrencySwitcherWidget.php (100%)
 rename {includes/multi-currency => multi-currency/src}/Exceptions/InvalidCurrencyException.php (71%)
 rename {includes/multi-currency => multi-currency/src}/Exceptions/InvalidCurrencyRateException.php (71%)
 rename {includes/multi-currency => multi-currency/src}/FrontendCurrencies.php (94%)
 rename {includes/multi-currency => multi-currency/src}/FrontendPrices.php (100%)
 rename {includes/multi-currency => multi-currency/src}/Geolocation.php (84%)
 create mode 100644 multi-currency/src/Interfaces/MultiCurrencyAccountInterface.php
 create mode 100644 multi-currency/src/Interfaces/MultiCurrencyApiClientInterface.php
 create mode 100644 multi-currency/src/Interfaces/MultiCurrencyCacheInterface.php
 create mode 100644 multi-currency/src/Interfaces/MultiCurrencyLocalizationInterface.php
 create mode 100644 multi-currency/src/Interfaces/MultiCurrencySettingsInterface.php
 create mode 100644 multi-currency/src/Logger.php
 rename {includes/multi-currency => multi-currency/src}/MultiCurrency.php (89%)
 rename {includes/multi-currency => multi-currency/src}/Notes/NoteMultiCurrencyAvailable.php (84%)
 rename {includes/multi-currency => multi-currency/src}/RestController.php (78%)
 rename {includes/multi-currency => multi-currency/src}/Settings.php (96%)
 rename {includes/multi-currency => multi-currency/src}/SettingsOnboardCta.php (74%)
 rename {includes/multi-currency => multi-currency/src}/StorefrontIntegration.php (100%)
 rename {includes/multi-currency => multi-currency/src}/Tracking.php (100%)
 rename {includes/multi-currency => multi-currency/src}/UserSettings.php (100%)
 rename {includes/multi-currency => multi-currency/src}/Utils.php (51%)
 rename tests/unit/{multi-currency/test-class-payment-methods-compatibility.php => test-class-wc-payments-currency-manager.php} (84%)

diff --git a/changelog/fix-backwards-compat-mccy-instance b/changelog/fix-backwards-compat-mccy-instance
new file mode 100644
index 00000000000..95a0701ac1c
--- /dev/null
+++ b/changelog/fix-backwards-compat-mccy-instance
@@ -0,0 +1,4 @@
+Significance: minor
+Type: fix
+
+Provide backwards-compatible method for retrieving the multi-currency instance.
diff --git a/changelog/multi-currency-v2 b/changelog/multi-currency-v2
new file mode 100644
index 00000000000..463f61c882e
--- /dev/null
+++ b/changelog/multi-currency-v2
@@ -0,0 +1,4 @@
+Significance: minor
+Type: update
+
+Decoupled Multi-currency module from gateway dependencies.
diff --git a/client/additional-methods-setup/upe-preview-methods-selector/add-payment-methods-task.js b/client/additional-methods-setup/upe-preview-methods-selector/add-payment-methods-task.js
index 76a2f3baa71..fbc23b63b67 100644
--- a/client/additional-methods-setup/upe-preview-methods-selector/add-payment-methods-task.js
+++ b/client/additional-methods-setup/upe-preview-methods-selector/add-payment-methods-task.js
@@ -36,7 +36,7 @@ import PaymentMethodCheckbox from '../../components/payment-methods-checkboxes/p
 import { LoadableBlock } from '../../components/loadable';
 import LoadableSettingsSection from '../../settings/loadable-settings-section';
 import CurrencyInformationForMethods from './currency-information-for-methods';
-import { getMissingCurrenciesTooltipMessage } from 'wcpay/multi-currency/missing-currencies-message';
+import { getMissingCurrenciesTooltipMessage } from 'multi-currency/interface/functions';
 import { upeCapabilityStatuses, upeMethods } from '../constants';
 import paymentMethodsMap from '../../payment-methods-map';
 import ConfirmPaymentMethodActivationModal from 'wcpay/settings/payment-methods-list/activation-modal';
diff --git a/client/additional-methods-setup/upe-preview-methods-selector/currency-information-for-methods.js b/client/additional-methods-setup/upe-preview-methods-selector/currency-information-for-methods.js
index f4e1fc02cbc..9639a729c8b 100644
--- a/client/additional-methods-setup/upe-preview-methods-selector/currency-information-for-methods.js
+++ b/client/additional-methods-setup/upe-preview-methods-selector/currency-information-for-methods.js
@@ -9,11 +9,11 @@ import interpolateComponents from '@automattic/interpolate-components';
 /**
  * Internal dependencies
  */
+import { useAccountDomesticCurrency } from '../../data';
 import {
-	useAccountDomesticCurrency,
 	useCurrencies,
 	useEnabledCurrencies,
-} from '../../data';
+} from 'multi-currency/interface/data';
 import WCPaySettingsContext from '../../settings/wcpay-settings-context';
 import InlineNotice from 'components/inline-notice';
 import PaymentMethodsMap from '../../payment-methods-map';
diff --git a/client/additional-methods-setup/upe-preview-methods-selector/test/add-payment-methods-task.test.js b/client/additional-methods-setup/upe-preview-methods-selector/test/add-payment-methods-task.test.js
index 3339e812975..3a12347327f 100644
--- a/client/additional-methods-setup/upe-preview-methods-selector/test/add-payment-methods-task.test.js
+++ b/client/additional-methods-setup/upe-preview-methods-selector/test/add-payment-methods-task.test.js
@@ -22,11 +22,14 @@ import {
 	useEnabledPaymentMethodIds,
 	useGetPaymentMethodStatuses,
 	useSettings,
-	useCurrencies,
-	useEnabledCurrencies,
 	useManualCapture,
 	useAccountDomesticCurrency,
 } from '../../../data';
+import {
+	useCurrencies,
+	useEnabledCurrencies,
+} from 'multi-currency/interface/data';
+
 import WCPaySettingsContext from '../../../settings/wcpay-settings-context';
 import { upeCapabilityStatuses } from 'wcpay/additional-methods-setup/constants';
 
@@ -34,13 +37,16 @@ jest.mock( '../../../data', () => ( {
 	useGetAvailablePaymentMethodIds: jest.fn(),
 	useEnabledPaymentMethodIds: jest.fn(),
 	useSettings: jest.fn(),
-	useCurrencies: jest.fn(),
-	useEnabledCurrencies: jest.fn(),
 	useGetPaymentMethodStatuses: jest.fn(),
 	useManualCapture: jest.fn(),
 	useAccountDomesticCurrency: jest.fn(),
 } ) );
 
+jest.mock( 'multi-currency/interface/data', () => ( {
+	useCurrencies: jest.fn(),
+	useEnabledCurrencies: jest.fn(),
+} ) );
+
 jest.mock( '@wordpress/a11y', () => ( {
 	...jest.requireActual( '@wordpress/a11y' ),
 	speak: jest.fn(),
diff --git a/client/additional-methods-setup/upe-preview-methods-selector/test/currency-information-for-methods.test.js b/client/additional-methods-setup/upe-preview-methods-selector/test/currency-information-for-methods.test.js
index fd473249eb7..cc2abefe96d 100644
--- a/client/additional-methods-setup/upe-preview-methods-selector/test/currency-information-for-methods.test.js
+++ b/client/additional-methods-setup/upe-preview-methods-selector/test/currency-information-for-methods.test.js
@@ -7,18 +7,21 @@ import { render, screen } from '@testing-library/react';
 /**
  * Internal dependencies
  */
+import { useAccountDomesticCurrency } from '../../../data';
 import {
 	useCurrencies,
 	useEnabledCurrencies,
-	useAccountDomesticCurrency,
-} from 'wcpay/data';
+} from 'multi-currency/interface/data';
 import CurrencyInformationForMethods from '../currency-information-for-methods';
 import WCPaySettingsContext from '../../../settings/wcpay-settings-context';
 
-jest.mock( 'wcpay/data', () => ( {
+jest.mock( '../../../data', () => ( {
+	useAccountDomesticCurrency: jest.fn(),
+} ) );
+
+jest.mock( 'multi-currency/interface/data', () => ( {
 	useCurrencies: jest.fn(),
 	useEnabledCurrencies: jest.fn(),
-	useAccountDomesticCurrency: jest.fn(),
 } ) );
 
 jest.mock( '@wordpress/a11y', () => ( {
diff --git a/client/additional-methods-setup/wizard/task-item.scss b/client/additional-methods-setup/wizard/task-item.scss
index c2b7dbb5ec6..ae24c06ac08 100644
--- a/client/additional-methods-setup/wizard/task-item.scss
+++ b/client/additional-methods-setup/wizard/task-item.scss
@@ -117,6 +117,22 @@
 		}
 	}
 
+	&__visible-description-element {
+		position: absolute;
+		margin-left: 40px;
+		margin-top: 0;
+		margin-bottom: 1em;
+
+		&.is-muted-color {
+			color: $gray-700;
+		}
+
+		.components-external-link svg {
+			width: 1em;
+			height: 1em;
+		}
+	}
+
 	.add-payment-methods-task {
 		&__payment-selector {
 			&-wrapper {
diff --git a/client/additional-methods-setup/wizard/task-item.tsx b/client/additional-methods-setup/wizard/task-item.tsx
index f1c7ba4177e..a0ec6169bae 100644
--- a/client/additional-methods-setup/wizard/task-item.tsx
+++ b/client/additional-methods-setup/wizard/task-item.tsx
@@ -16,6 +16,7 @@ interface WizardTaskItemProps {
 	title: string;
 	index: number;
 	className?: string;
+	visibleDescription?: string;
 }
 
 const WizardTaskItem: React.FC< WizardTaskItemProps > = ( {
@@ -23,6 +24,7 @@ const WizardTaskItem: React.FC< WizardTaskItemProps > = ( {
 	title,
 	index,
 	className,
+	visibleDescription,
 } ) => {
 	const { isCompleted, isActive } = useContext( WizardTaskContext );
 
@@ -51,6 +53,16 @@ const WizardTaskItem: React.FC< WizardTaskItemProps > = ( {
 				</div>
 				<span className="wcpay-wizard-task__title">{ title }</span>
 			</div>
+			{ visibleDescription && ! isActive && (
+				<span
+					className={ classNames(
+						'wcpay-wizard-task__visible-description-element',
+						'is-muted-color'
+					) }
+				>
+					{ visibleDescription }
+				</span>
+			) }
 			<div className="wcpay-wizard-task__body">{ children }</div>
 		</li>
 	);
diff --git a/client/capital/index.tsx b/client/capital/index.tsx
index 8d1ab3f4741..81e76ad91b4 100644
--- a/client/capital/index.tsx
+++ b/client/capital/index.tsx
@@ -15,7 +15,10 @@ import Page from 'components/page';
 import { TestModeNotice } from 'components/test-mode-notice';
 import ErrorBoundary from 'components/error-boundary';
 import ActiveLoanSummary from 'components/active-loan-summary';
-import { formatExplicitCurrency, isZeroDecimalCurrency } from 'utils/currency';
+import {
+	formatExplicitCurrency,
+	isZeroDecimalCurrency,
+} from 'multi-currency/interface/functions';
 import { CapitalLoan } from 'data/capital/types';
 import ClickableCell from 'components/clickable-cell';
 import Chip from 'components/chip';
diff --git a/client/checkout/woopay/email-input-iframe.js b/client/checkout/woopay/email-input-iframe.js
index 83a4f196924..c5ccaceed96 100644
--- a/client/checkout/woopay/email-input-iframe.js
+++ b/client/checkout/woopay/email-input-iframe.js
@@ -13,8 +13,8 @@ import {
 	appendRedirectionParams,
 	shouldSkipWooPay,
 	deleteSkipWooPayCookie,
-} from 'wcpay/checkout/woopay/utils';
-import { getAppearanceType } from 'wcpay/checkout/utils';
+} from './utils';
+import { getAppearanceType } from '../utils';
 
 export const handleWooPayEmailInput = async (
 	field,
diff --git a/client/components/account-balances/balance-block.tsx b/client/components/account-balances/balance-block.tsx
index 4b71f4ef273..c9c9535c9ee 100644
--- a/client/components/account-balances/balance-block.tsx
+++ b/client/components/account-balances/balance-block.tsx
@@ -6,7 +6,7 @@ import * as React from 'react';
 /**
  * Internal dependencies
  */
-import { formatCurrency } from 'wcpay/utils/currency';
+import { formatCurrency } from 'multi-currency/interface/functions';
 import Loadable from 'components/loadable';
 
 /**
diff --git a/client/components/account-balances/index.tsx b/client/components/account-balances/index.tsx
index 2a1ace68487..fa3be8b8422 100644
--- a/client/components/account-balances/index.tsx
+++ b/client/components/account-balances/index.tsx
@@ -23,7 +23,7 @@ import {
 } from './balance-tooltip';
 import { fundLabelStrings } from './strings';
 import { ClickTooltip } from '../tooltip';
-import { formatCurrency } from 'wcpay/utils/currency';
+import { formatCurrency } from 'multi-currency/interface/functions';
 import { useAllDepositsOverviews } from 'wcpay/data';
 import { useSelectedCurrency } from 'wcpay/overview/hooks';
 import './style.scss';
diff --git a/client/components/account-status/account-fees/expiration-bar.js b/client/components/account-status/account-fees/expiration-bar.js
index 80003bba2a4..2d293e948c9 100644
--- a/client/components/account-status/account-fees/expiration-bar.js
+++ b/client/components/account-status/account-fees/expiration-bar.js
@@ -4,7 +4,7 @@
  * Internal dependencies
  */
 import ProgressBar from 'components/progress-bar';
-import { formatCurrency } from 'utils/currency';
+import { formatCurrency } from 'multi-currency/interface/functions';
 
 const ExpirationBar = ( {
 	feeData: {
diff --git a/client/components/account-status/account-fees/expiration-description.js b/client/components/account-status/account-fees/expiration-description.js
index a07067b6495..6be5b58681c 100644
--- a/client/components/account-status/account-fees/expiration-description.js
+++ b/client/components/account-status/account-fees/expiration-description.js
@@ -10,7 +10,7 @@ import moment from 'moment';
 /**
  * Internal dependencies
  */
-import { formatCurrency } from 'utils/currency';
+import { formatCurrency } from 'multi-currency/interface/functions';
 
 const ExpirationDescription = ( {
 	feeData: { volume_allowance: volumeAllowance, end_time: endTime, ...rest },
diff --git a/client/components/account-status/account-fees/index.js b/client/components/account-status/account-fees/index.js
index 93a93293c11..4b77b39e5f3 100644
--- a/client/components/account-status/account-fees/index.js
+++ b/client/components/account-status/account-fees/index.js
@@ -10,7 +10,10 @@ import { __ } from '@wordpress/i18n';
  */
 import ExpirationBar from './expiration-bar';
 import ExpirationDescription from './expiration-description';
-import { formatCurrencyName, getCurrency } from 'utils/currency';
+import {
+	formatCurrencyName,
+	getCurrency,
+} from 'multi-currency/interface/functions';
 import {
 	formatAccountFeesDescription,
 	getCurrentBaseFee,
diff --git a/client/components/active-loan-summary/index.tsx b/client/components/active-loan-summary/index.tsx
index 97aac9ac082..0c5059ef87c 100755
--- a/client/components/active-loan-summary/index.tsx
+++ b/client/components/active-loan-summary/index.tsx
@@ -18,7 +18,7 @@ import { dateI18n } from '@wordpress/date';
 /**
  * Internal dependencies.
  */
-import { formatExplicitCurrency } from 'utils/currency';
+import { formatExplicitCurrency } from 'multi-currency/interface/functions';
 import Loadable from 'components/loadable';
 import { useActiveLoanSummary } from 'wcpay/data';
 import { getAdminUrl } from 'wcpay/utils';
diff --git a/client/components/deposits-overview/index.tsx b/client/components/deposits-overview/index.tsx
index 23ce733bf50..5b89c21a95a 100644
--- a/client/components/deposits-overview/index.tsx
+++ b/client/components/deposits-overview/index.tsx
@@ -16,7 +16,7 @@ import { getHistory } from '@woocommerce/navigation';
  * Internal dependencies.
  */
 import { getAdminUrl } from 'wcpay/utils';
-import { formatExplicitCurrency } from 'wcpay/utils/currency';
+import { formatExplicitCurrency } from 'multi-currency/interface/functions';
 import { recordEvent } from 'tracks';
 import Loadable from 'components/loadable';
 import { useSelectedCurrencyOverview } from 'wcpay/overview/hooks';
diff --git a/client/components/deposits-overview/recent-deposits-list.tsx b/client/components/deposits-overview/recent-deposits-list.tsx
index 1fed2448758..88555793d0d 100644
--- a/client/components/deposits-overview/recent-deposits-list.tsx
+++ b/client/components/deposits-overview/recent-deposits-list.tsx
@@ -21,7 +21,7 @@ import './style.scss';
 import DepositStatusChip from 'components/deposit-status-chip';
 import { getDepositDate } from 'deposits/utils';
 import { CachedDeposit } from 'wcpay/types/deposits';
-import { formatCurrency } from 'wcpay/utils/currency';
+import { formatCurrency } from 'multi-currency/interface/functions';
 import { getDetailsURL } from 'wcpay/components/details-link';
 
 interface RecentDepositsProps {
diff --git a/client/components/disputed-order-notice/index.js b/client/components/disputed-order-notice/index.js
index de5b720715a..ab51a52d16e 100644
--- a/client/components/disputed-order-notice/index.js
+++ b/client/components/disputed-order-notice/index.js
@@ -8,7 +8,7 @@ import { createInterpolateElement } from '@wordpress/element';
  * Internal dependencies
  */
 import InlineNotice from 'wcpay/components/inline-notice';
-import { formatExplicitCurrency } from 'utils/currency';
+import { formatExplicitCurrency } from 'multi-currency/interface/functions';
 import { reasons } from 'wcpay/disputes/strings';
 import { getDetailsURL } from 'wcpay/components/details-link';
 import {
diff --git a/client/components/payment-activity/payment-data-tile.tsx b/client/components/payment-activity/payment-data-tile.tsx
index f9bbfbf7318..7c0d190d79f 100644
--- a/client/components/payment-activity/payment-data-tile.tsx
+++ b/client/components/payment-activity/payment-data-tile.tsx
@@ -9,7 +9,7 @@ import { recordEvent } from 'wcpay/tracks';
 /**
  * Internal dependencies
  */
-import { formatCurrency } from 'wcpay/utils/currency';
+import { formatCurrency } from 'multi-currency/interface/functions';
 import Loadable from '../loadable';
 import './style.scss';
 
diff --git a/client/components/welcome/currency-select.tsx b/client/components/welcome/currency-select.tsx
index 7f82c412313..32c1e5a3cd9 100644
--- a/client/components/welcome/currency-select.tsx
+++ b/client/components/welcome/currency-select.tsx
@@ -8,7 +8,7 @@ import { decodeEntities } from '@wordpress/html-entities';
  * Internal dependencies
  */
 import { useSelectedCurrency } from 'overview/hooks';
-import { getCurrency } from 'utils/currency';
+import { getCurrency } from 'multi-currency/interface/functions';
 import InlineLabelSelect from '../inline-label-select';
 import { recordEvent } from 'tracks';
 
diff --git a/client/data/deposits/actions.js b/client/data/deposits/actions.js
index 392b890657c..60b4479ab24 100644
--- a/client/data/deposits/actions.js
+++ b/client/data/deposits/actions.js
@@ -6,7 +6,7 @@
 import { apiFetch } from '@wordpress/data-controls';
 import { dispatch } from '@wordpress/data';
 import { __, sprintf } from '@wordpress/i18n';
-import { formatCurrency } from 'utils/currency';
+import { formatCurrency } from 'multi-currency/interface/functions';
 
 /**
  * Internal Dependencies
diff --git a/client/data/index.ts b/client/data/index.ts
index d20938feb56..878ecdc11f6 100644
--- a/client/data/index.ts
+++ b/client/data/index.ts
@@ -18,7 +18,6 @@ export * from './charges/hooks';
 export * from './timeline/hooks';
 export * from './disputes/hooks';
 export * from './settings/hooks';
-export * from './multi-currency';
 export * from './card-readers/hooks';
 export * from './capital/hooks';
 export * from './documents/hooks';
diff --git a/client/data/multi-currency/index.js b/client/data/multi-currency/index.js
deleted file mode 100644
index c524cca8b05..00000000000
--- a/client/data/multi-currency/index.js
+++ /dev/null
@@ -1,12 +0,0 @@
-/** @format */
-
-/**
- * Internal dependencies
- */
-import reducer from './reducer';
-import * as selectors from './selectors';
-import * as actions from './actions';
-import * as resolvers from './resolvers';
-
-export { reducer, selectors, actions, resolvers };
-export * from './hooks';
diff --git a/client/data/store.js b/client/data/store.js
index 974efdb1e07..c4387901c37 100644
--- a/client/data/store.js
+++ b/client/data/store.js
@@ -14,7 +14,6 @@ import * as charges from './charges';
 import * as timeline from './timeline';
 import * as disputes from './disputes';
 import * as settings from './settings';
-import * as multiCurrency from './multi-currency';
 import * as readers from './card-readers';
 import * as capital from './capital';
 import * as documents from './documents';
@@ -33,7 +32,6 @@ export const initStore = () =>
 			timeline: timeline.reducer,
 			disputes: disputes.reducer,
 			settings: settings.reducer,
-			multiCurrency: multiCurrency.reducer,
 			readers: readers.reducer,
 			capital: capital.reducer,
 			documents: documents.reducer,
@@ -49,7 +47,6 @@ export const initStore = () =>
 			...timeline.actions,
 			...disputes.actions,
 			...settings.actions,
-			...multiCurrency.actions,
 			...readers.actions,
 			...capital.actions,
 			...documents.actions,
@@ -66,7 +63,6 @@ export const initStore = () =>
 			...timeline.selectors,
 			...disputes.selectors,
 			...settings.selectors,
-			...multiCurrency.selectors,
 			...readers.selectors,
 			...capital.selectors,
 			...documents.selectors,
@@ -82,7 +78,6 @@ export const initStore = () =>
 			...timeline.resolvers,
 			...disputes.resolvers,
 			...settings.resolvers,
-			...multiCurrency.resolvers,
 			...readers.resolvers,
 			...capital.resolvers,
 			...documents.resolvers,
diff --git a/client/deposits/details/index.tsx b/client/deposits/details/index.tsx
index 4d47ae51d6a..74aec3f2a7d 100644
--- a/client/deposits/details/index.tsx
+++ b/client/deposits/details/index.tsx
@@ -34,7 +34,10 @@ import Page from 'components/page';
 import ErrorBoundary from 'components/error-boundary';
 import { TestModeNotice } from 'components/test-mode-notice';
 import InlineNotice from 'components/inline-notice';
-import { formatCurrency, formatExplicitCurrency } from 'utils/currency';
+import {
+	formatCurrency,
+	formatExplicitCurrency,
+} from 'multi-currency/interface/functions';
 import { displayStatus } from '../strings';
 import './style.scss';
 
diff --git a/client/deposits/filters/index.js b/client/deposits/filters/index.js
index 34cc4bbdf52..0d6d57afecc 100644
--- a/client/deposits/filters/index.js
+++ b/client/deposits/filters/index.js
@@ -8,7 +8,7 @@ import { getQuery } from '@woocommerce/navigation';
  * Internal dependencies
  */
 import { filters, advancedFilters } from './config';
-import { formatCurrencyName } from '../../utils/currency';
+import { formatCurrencyName } from 'multi-currency/interface/functions';
 
 export const DepositsFilters = ( props ) => {
 	const populateDepositCurrencies = ( filtersConfiguration ) => {
diff --git a/client/deposits/instant-deposits/index.tsx b/client/deposits/instant-deposits/index.tsx
index 683aecb03a3..64c49bc069f 100644
--- a/client/deposits/instant-deposits/index.tsx
+++ b/client/deposits/instant-deposits/index.tsx
@@ -12,7 +12,7 @@ import { useState } from '@wordpress/element';
  * Internal dependencies
  */
 import './style.scss';
-import { formatCurrency } from 'wcpay/utils/currency';
+import { formatCurrency } from 'multi-currency/interface/functions';
 import InstantDepositModal from './modal';
 import { useInstantDeposit } from 'wcpay/data';
 import type * as AccountOverview from 'wcpay/types/account-overview';
diff --git a/client/deposits/instant-deposits/modal.tsx b/client/deposits/instant-deposits/modal.tsx
index 25b2783a348..e9d0f530aeb 100644
--- a/client/deposits/instant-deposits/modal.tsx
+++ b/client/deposits/instant-deposits/modal.tsx
@@ -11,7 +11,10 @@ import { createInterpolateElement } from '@wordpress/element';
 /**
  * Internal dependencies
  */
-import { formatCurrency, formatExplicitCurrency } from 'utils/currency';
+import {
+	formatCurrency,
+	formatExplicitCurrency,
+} from 'multi-currency/interface/functions';
 import type * as AccountOverview from 'wcpay/types/account-overview';
 import './style.scss';
 
diff --git a/client/deposits/list/index.tsx b/client/deposits/list/index.tsx
index 21c48d2f631..03789c466e1 100644
--- a/client/deposits/list/index.tsx
+++ b/client/deposits/list/index.tsx
@@ -26,7 +26,10 @@ import { useDispatch } from '@wordpress/data';
 import { useDeposits, useDepositsSummary } from 'wcpay/data';
 import { useReportingExportLanguage } from 'data/index';
 import { displayType, displayStatus } from '../strings';
-import { formatExplicitCurrency, formatExportAmount } from 'utils/currency';
+import {
+	formatExplicitCurrency,
+	formatExportAmount,
+} from 'multi-currency/interface/functions';
 import DetailsLink, { getDetailsURL } from 'components/details-link';
 import ClickableCell from 'components/clickable-cell';
 import Page from '../../components/page';
diff --git a/client/disputes/filters/index.tsx b/client/disputes/filters/index.tsx
index 6e8288f2611..0f6fc09069f 100644
--- a/client/disputes/filters/index.tsx
+++ b/client/disputes/filters/index.tsx
@@ -9,7 +9,7 @@ import { getQuery } from '@woocommerce/navigation';
  * Internal dependencies
  */
 import { filters, advancedFilters, DisputesFilterType } from './config';
-import { formatCurrencyName } from '../../utils/currency';
+import { formatCurrencyName } from 'multi-currency/interface/functions';
 
 interface DisputesFiltersProps {
 	storeCurrencies?: string[];
diff --git a/client/disputes/filters/test/index.tsx b/client/disputes/filters/test/index.tsx
index c122ba7eb3a..015f28aec19 100644
--- a/client/disputes/filters/test/index.tsx
+++ b/client/disputes/filters/test/index.tsx
@@ -12,7 +12,7 @@ import { getQuery, updateQueryString } from '@woocommerce/navigation';
  * Internal dependencies
  */
 import { DisputesFilters } from '../';
-import { formatCurrencyName } from '../../../utils/currency';
+import { formatCurrencyName } from 'multi-currency/interface/functions';
 
 // TODO: this is a bit of a hack as we're mocking an old version of WC, we should relook at this.
 jest.mock( '@woocommerce/settings', () => ( {
diff --git a/client/disputes/index.tsx b/client/disputes/index.tsx
index 0832ee5515b..060afccce35 100644
--- a/client/disputes/index.tsx
+++ b/client/disputes/index.tsx
@@ -37,7 +37,10 @@ import Page from 'components/page';
 import { TestModeNotice } from 'components/test-mode-notice';
 import { reasons } from './strings';
 import { formatStringValue } from 'utils';
-import { formatExplicitCurrency, formatExportAmount } from 'utils/currency';
+import {
+	formatExplicitCurrency,
+	formatExportAmount,
+} from 'multi-currency/interface/functions';
 import DisputesFilters from './filters';
 import DownloadButton from 'components/download-button';
 import disputeStatusMapping from 'components/dispute-status-chip/mappings';
diff --git a/client/disputes/info/index.tsx b/client/disputes/info/index.tsx
index 7aa20ca6174..12f7ba0e64a 100644
--- a/client/disputes/info/index.tsx
+++ b/client/disputes/info/index.tsx
@@ -16,7 +16,7 @@ import OrderLink from 'components/order-link';
 import { getDetailsURL } from 'components/details-link';
 import { reasons } from '../strings';
 import { formatStringValue } from 'utils';
-import { formatExplicitCurrency } from 'utils/currency';
+import { formatExplicitCurrency } from 'multi-currency/interface/functions';
 import './style.scss';
 import Loadable from 'components/loadable';
 import { Dispute } from 'wcpay/types/disputes';
diff --git a/client/disputes/utils.ts b/client/disputes/utils.ts
index e96251c7863..96a1ca40129 100644
--- a/client/disputes/utils.ts
+++ b/client/disputes/utils.ts
@@ -18,7 +18,10 @@ import {
 	disputeAwaitingResponseStatuses,
 	disputeUnderReviewStatuses,
 } from 'wcpay/disputes/filters/config';
-import { formatCurrency, formatExplicitCurrency } from 'wcpay/utils/currency';
+import {
+	formatCurrency,
+	formatExplicitCurrency,
+} from 'multi-currency/interface/functions';
 
 interface IsDueWithinProps {
 	dueBy: CachedDispute[ 'due_by' ] | EvidenceDetails[ 'due_by' ];
diff --git a/client/index.js b/client/index.js
index 12d96efc666..11083acffac 100644
--- a/client/index.js
+++ b/client/index.js
@@ -23,7 +23,7 @@ import DisputesPage from 'disputes';
 import RedirectToTransactionDetails from 'disputes/redirect-to-transaction-details';
 import DisputeEvidencePage from 'disputes/evidence';
 import AdditionalMethodsPage from 'wcpay/additional-methods-setup';
-import MultiCurrencySetupPage from 'wcpay/multi-currency-setup';
+import { MultiCurrencySetupPage } from 'multi-currency/interface/components';
 import CardReadersPage from 'card-readers';
 import CapitalPage from 'capital';
 import OverviewPage from 'overview';
diff --git a/client/multi-currency-setup/wizard/task-item.scss b/client/multi-currency-setup/wizard/task-item.scss
deleted file mode 100644
index 9751a378ab6..00000000000
--- a/client/multi-currency-setup/wizard/task-item.scss
+++ /dev/null
@@ -1,17 +0,0 @@
-.wcpay-wizard-task {
-	&__visible-description-element {
-		position: absolute;
-		margin-left: 40px;
-		margin-top: 0;
-		margin-bottom: 1em;
-
-		&.is-muted-color {
-			color: $gray-700;
-		}
-
-		.components-external-link svg {
-			width: 1em;
-			height: 1em;
-		}
-	}
-}
diff --git a/client/multi-currency-setup/wizard/task-item.tsx b/client/multi-currency-setup/wizard/task-item.tsx
deleted file mode 100644
index 93711e4c80f..00000000000
--- a/client/multi-currency-setup/wizard/task-item.tsx
+++ /dev/null
@@ -1,71 +0,0 @@
-/**
- * External dependencies
- */
-import React, { useContext } from 'react';
-import classNames from 'classnames';
-import { Icon, check } from '@wordpress/icons';
-
-/**
- * Internal dependencies
- */
-import WizardTaskContext from '../../additional-methods-setup/wizard/task/context';
-import './task-item.scss';
-
-interface WizardTaskItemProps {
-	children: React.ReactNode;
-	title: string;
-	index: number;
-	visibleDescription: string;
-	className?: string;
-}
-
-const WizardTaskItem: React.FC< WizardTaskItemProps > = ( {
-	children,
-	title,
-	index,
-	visibleDescription,
-	className,
-} ) => {
-	const { isCompleted, isActive } = useContext( WizardTaskContext );
-
-	return (
-		<li
-			className={ classNames( 'wcpay-wizard-task', className, {
-				'is-completed': isCompleted,
-				'is-active': isActive,
-			} ) }
-		>
-			<div className="wcpay-wizard-task__top-border" />
-			<div
-				className="wcpay-wizard-task__headline"
-				// tabindex with value `-1` is necessary to programmatically set the focus
-				// on an element that is not interactive.
-				tabIndex={ -1 }
-			>
-				<div className="wcpay-wizard-task__icon-wrapper">
-					<div className="wcpay-wizard-task__icon-text">
-						{ index }
-					</div>
-					<Icon
-						icon={ check }
-						className="wcpay-wizard-task__icon-checkmark"
-					/>
-				</div>
-				<span className="wcpay-wizard-task__title">{ title }</span>
-			</div>
-			{ visibleDescription && ! isActive && (
-				<span
-					className={ classNames(
-						'wcpay-wizard-task__visible-description-element',
-						'is-muted-color'
-					) }
-				>
-					{ visibleDescription }
-				</span>
-			) }
-			<div className="wcpay-wizard-task__body">{ children }</div>
-		</li>
-	);
-};
-
-export default WizardTaskItem;
diff --git a/client/overview/task-list/tasks/dispute-task.tsx b/client/overview/task-list/tasks/dispute-task.tsx
index fdf48c03d78..235b92696b9 100644
--- a/client/overview/task-list/tasks/dispute-task.tsx
+++ b/client/overview/task-list/tasks/dispute-task.tsx
@@ -11,7 +11,7 @@ import { getHistory } from '@woocommerce/navigation';
  */
 import type { TaskItemProps } from '../types';
 import type { CachedDispute } from 'wcpay/types/disputes';
-import { formatCurrency } from 'wcpay/utils/currency';
+import { formatCurrency } from 'multi-currency/interface/functions';
 import { getAdminUrl } from 'wcpay/utils';
 import { recordEvent } from 'tracks';
 import { isDueWithin } from 'wcpay/disputes/utils';
diff --git a/client/payment-details/dispute-details/dispute-steps.tsx b/client/payment-details/dispute-details/dispute-steps.tsx
index ccc0764f38b..01f87431274 100644
--- a/client/payment-details/dispute-details/dispute-steps.tsx
+++ b/client/payment-details/dispute-details/dispute-steps.tsx
@@ -16,7 +16,7 @@ import HelpOutlineIcon from 'gridicons/dist/help-outline';
  */
 import type { Dispute } from 'wcpay/types/disputes';
 import { ChargeBillingDetails } from 'wcpay/types/charges';
-import { formatExplicitCurrency } from 'utils/currency';
+import { formatExplicitCurrency } from 'multi-currency/interface/functions';
 import { ClickTooltip } from 'wcpay/components/tooltip';
 import { getDisputeFeeFormatted } from 'wcpay/disputes/utils';
 import DisputeDueByDate from './dispute-due-by-date';
diff --git a/client/payment-details/dispute-details/dispute-summary-row.tsx b/client/payment-details/dispute-details/dispute-summary-row.tsx
index ac6dada265e..0a43cb223e0 100644
--- a/client/payment-details/dispute-details/dispute-summary-row.tsx
+++ b/client/payment-details/dispute-details/dispute-summary-row.tsx
@@ -14,7 +14,7 @@ import { dateI18n } from '@wordpress/date';
  */
 import type { Dispute } from 'wcpay/types/disputes';
 import { HorizontalList } from 'wcpay/components/horizontal-list';
-import { formatExplicitCurrency } from 'wcpay/utils/currency';
+import { formatExplicitCurrency } from 'multi-currency/interface/functions';
 import { reasons } from 'wcpay/disputes/strings';
 import { formatStringValue } from 'wcpay/utils';
 import { ClickTooltip } from 'wcpay/components/tooltip';
diff --git a/client/payment-details/readers/index.js b/client/payment-details/readers/index.js
index 9ff428c94fe..193ee236288 100644
--- a/client/payment-details/readers/index.js
+++ b/client/payment-details/readers/index.js
@@ -19,7 +19,10 @@ import { useCardReaderStats } from 'wcpay/data';
 import { TestModeNotice } from 'components/test-mode-notice';
 import Page from 'components/page';
 import DownloadButton from 'components/download-button';
-import { formatExplicitCurrency, formatExportAmount } from 'utils/currency';
+import {
+	formatExplicitCurrency,
+	formatExportAmount,
+} from 'multi-currency/interface/functions';
 
 const PaymentCardReaderChargeDetails = ( props ) => {
 	const { readers, chargeError, isLoading } = useCardReaderStats(
diff --git a/client/payment-details/summary/index.tsx b/client/payment-details/summary/index.tsx
index 4350d609cd7..4e9d9559a4b 100644
--- a/client/payment-details/summary/index.tsx
+++ b/client/payment-details/summary/index.tsx
@@ -37,7 +37,10 @@ import { HorizontalList, HorizontalListItem } from 'components/horizontal-list';
 import Loadable, { LoadableBlock } from 'components/loadable';
 import riskMappings from 'components/risk-level/strings';
 import OrderLink from 'components/order-link';
-import { formatCurrency, formatExplicitCurrency } from 'utils/currency';
+import {
+	formatCurrency,
+	formatExplicitCurrency,
+} from 'multi-currency/interface/functions';
 import CustomerLink from 'components/customer-link';
 import { ClickTooltip } from 'components/tooltip';
 import DisputeStatusChip from 'components/dispute-status-chip';
diff --git a/client/payment-details/timeline/map-events.js b/client/payment-details/timeline/map-events.js
index 1cb14d6aa7a..64bc74d91d2 100644
--- a/client/payment-details/timeline/map-events.js
+++ b/client/payment-details/timeline/map-events.js
@@ -26,7 +26,7 @@ import {
 	formatCurrency,
 	formatFX,
 	formatExplicitCurrency,
-} from 'utils/currency';
+} from 'multi-currency/interface/functions';
 import { formatFee } from 'utils/fees';
 import { getAdminUrl } from 'wcpay/utils';
 import { ShieldIcon } from 'wcpay/icons';
diff --git a/client/settings/fraud-protection/advanced-settings/cards/purchase-price-threshold.tsx b/client/settings/fraud-protection/advanced-settings/cards/purchase-price-threshold.tsx
index e32b2222d2e..828d1bbf5c8 100644
--- a/client/settings/fraud-protection/advanced-settings/cards/purchase-price-threshold.tsx
+++ b/client/settings/fraud-protection/advanced-settings/cards/purchase-price-threshold.tsx
@@ -8,7 +8,7 @@ import AmountInput from 'wcpay/components/amount-input';
 /**
  * Internal dependencies
  */
-import { getCurrency } from 'utils/currency';
+import { getCurrency } from 'multi-currency/interface/functions';
 import FraudProtectionRuleCard from '../rule-card';
 import FraudProtectionRuleToggle from '../rule-toggle';
 import FraudProtectionRuleDescription from '../rule-description';
diff --git a/client/settings/fraud-protection/test/index.test.tsx b/client/settings/fraud-protection/test/index.test.tsx
index 0719a904c78..1b78011aad4 100644
--- a/client/settings/fraud-protection/test/index.test.tsx
+++ b/client/settings/fraud-protection/test/index.test.tsx
@@ -11,7 +11,6 @@ import { useDispatch } from '@wordpress/data';
 import FraudProtection from '..';
 import {
 	useCurrentProtectionLevel,
-	useCurrencies,
 	useAdvancedFraudProtectionSettings,
 	useSettings,
 } from 'wcpay/data';
@@ -29,7 +28,6 @@ jest.mock( 'wcpay/data', () => ( {
 	useAdvancedFraudProtectionSettings: jest.fn(),
 	useCurrentProtectionLevel: jest.fn(),
 	useSettings: jest.fn(),
-	useCurrencies: jest.fn(),
 } ) );
 
 jest.mock( '@wordpress/data', () => ( {
@@ -44,10 +42,6 @@ const mockUseCurrentProtectionLevel = useCurrentProtectionLevel as jest.MockedFu
 	() => [ string, ( level: string ) => void ]
 >;
 
-const mockUseCurrencies = useCurrencies as jest.MockedFunction<
-	() => { currencies: Record< string, any >; isLoading: boolean }
->;
-
 const mockUseAdvancedFraudProtectionSettings = useAdvancedFraudProtectionSettings as jest.MockedFunction<
 	() => [ any[] | string, ( settings: string ) => void ]
 >;
@@ -70,16 +64,6 @@ describe( 'FraudProtection', () => {
 			'standard',
 			jest.fn(),
 		] );
-		mockUseCurrencies.mockReturnValue( {
-			isLoading: false,
-			currencies: {
-				available: {
-					EUR: { name: 'Euro', symbol: '€' },
-					USD: { name: 'US Dollar', symbol: '$' },
-					PLN: { name: 'Polish złoty', symbol: 'zł' },
-				},
-			},
-		} );
 
 		mockUseAdvancedFraudProtectionSettings.mockReturnValue( [
 			[],
diff --git a/client/settings/payment-methods-list/index.js b/client/settings/payment-methods-list/index.js
index 99a34b40daf..997c2bb9874 100644
--- a/client/settings/payment-methods-list/index.js
+++ b/client/settings/payment-methods-list/index.js
@@ -22,7 +22,7 @@ import { upeCapabilityStatuses } from 'wcpay/additional-methods-setup/constants'
 import ConfirmPaymentMethodActivationModal from './activation-modal';
 import ConfirmPaymentMethodDeleteModal from './delete-modal';
 import CapabilityRequestNotice from './capability-request';
-import { getMissingCurrenciesTooltipMessage } from 'wcpay/multi-currency/missing-currencies-message';
+import { getMissingCurrenciesTooltipMessage } from 'multi-currency/interface/functions';
 
 const PaymentMethodsList = ( { methodIds } ) => {
 	const [ enabledMethodIds ] = useEnabledPaymentMethodIds();
diff --git a/client/settings/payment-methods-section/__tests__/payment-methods-section.test.js b/client/settings/payment-methods-section/__tests__/payment-methods-section.test.js
index 2e1f1da1538..d64f2ded639 100644
--- a/client/settings/payment-methods-section/__tests__/payment-methods-section.test.js
+++ b/client/settings/payment-methods-section/__tests__/payment-methods-section.test.js
@@ -35,8 +35,6 @@ jest.mock( '@woocommerce/components', () => {
 jest.mock( 'wcpay/data', () => ( {
 	useEnabledPaymentMethodIds: jest.fn(),
 	useGetAvailablePaymentMethodIds: jest.fn(),
-	useCurrencies: jest.fn().mockReturnValue( { isLoading: true } ),
-	useEnabledCurrencies: jest.fn().mockReturnValue( {} ),
 	useGetPaymentMethodStatuses: jest.fn().mockReturnValue( {} ),
 	useManualCapture: jest.fn(),
 	useSelectedPaymentMethod: jest.fn(),
@@ -45,6 +43,16 @@ jest.mock( 'wcpay/data', () => ( {
 	useSettings: jest.fn().mockReturnValue( { isLoading: false } ),
 } ) );
 
+jest.mock( 'multi-currency/interface/data', () => ( {
+	useCurrencies: jest.fn().mockReturnValue( { isLoading: true } ),
+	useEnabledCurrencies: jest.fn().mockReturnValue( {} ),
+} ) );
+
+jest.mock( 'multi-currency/interface/data', () => ( {
+	useCurrencies: jest.fn().mockReturnValue( { isLoading: true } ),
+	useEnabledCurrencies: jest.fn().mockReturnValue( {} ),
+} ) );
+
 jest.mock( '@wordpress/data', () => ( {
 	useDispatch: jest
 		.fn()
diff --git a/client/transactions/blocked/columns.tsx b/client/transactions/blocked/columns.tsx
index 3ecf1554d06..1d75e407cea 100644
--- a/client/transactions/blocked/columns.tsx
+++ b/client/transactions/blocked/columns.tsx
@@ -10,7 +10,7 @@ import { TableCardColumn, TableCardBodyColumn } from '@woocommerce/components';
 /**
  * Internal dependencies
  */
-import { formatExplicitCurrency } from 'utils/currency';
+import { formatExplicitCurrency } from 'multi-currency/interface/functions';
 import TransactionStatusPill from 'wcpay/components/transaction-status-pill';
 import { FraudOutcomeTransaction } from '../../data';
 import { getDetailsURL } from '../../components/details-link';
diff --git a/client/transactions/blocked/index.tsx b/client/transactions/blocked/index.tsx
index e1bdce63664..f6153231f69 100644
--- a/client/transactions/blocked/index.tsx
+++ b/client/transactions/blocked/index.tsx
@@ -34,7 +34,7 @@ import {
 	getBlockedListColumns,
 	getBlockedListColumnsStructure,
 } from './columns';
-import { formatExplicitCurrency } from '../../utils/currency';
+import { formatExplicitCurrency } from 'multi-currency/interface/functions';
 import autocompleter from '../fraud-protection/autocompleter';
 import DownloadButton from '../../components/download-button';
 import { getFraudOutcomeTransactionsExport } from '../../data/transactions/resolvers';
diff --git a/client/transactions/filters/index.tsx b/client/transactions/filters/index.tsx
index cbb729ce5d9..ef8c11d4f15 100644
--- a/client/transactions/filters/index.tsx
+++ b/client/transactions/filters/index.tsx
@@ -9,7 +9,7 @@ import { getQuery } from '@woocommerce/navigation';
  * Internal dependencies
  */
 import { getFilters, getAdvancedFilters } from './config';
-import { formatCurrencyName } from '../../utils/currency';
+import { formatCurrencyName } from 'multi-currency/interface/functions';
 import { recordEvent } from 'tracks';
 
 interface TransactionsFiltersProps {
diff --git a/client/transactions/list/converted-amount.tsx b/client/transactions/list/converted-amount.tsx
index 6a74b01a25a..fac4d9acd25 100644
--- a/client/transactions/list/converted-amount.tsx
+++ b/client/transactions/list/converted-amount.tsx
@@ -12,7 +12,7 @@ import classNames from 'classnames';
 /**
  * Internal dependencies
  */
-import { formatExplicitCurrency } from 'utils/currency';
+import { formatExplicitCurrency } from 'multi-currency/interface/functions';
 
 declare const window: any;
 
diff --git a/client/transactions/list/index.tsx b/client/transactions/list/index.tsx
index 3893df6658a..e123d0319f5 100644
--- a/client/transactions/list/index.tsx
+++ b/client/transactions/list/index.tsx
@@ -54,7 +54,7 @@ import {
 	formatCurrency,
 	formatExplicitCurrency,
 	formatExportAmount,
-} from 'utils/currency';
+} from 'multi-currency/interface/functions';
 import { getChargeChannel } from 'utils/charge';
 import Deposit from './deposit';
 import ConvertedAmount from './converted-amount';
diff --git a/client/transactions/risk-review/columns.tsx b/client/transactions/risk-review/columns.tsx
index 59db13c52c8..d7f5de95111 100644
--- a/client/transactions/risk-review/columns.tsx
+++ b/client/transactions/risk-review/columns.tsx
@@ -13,7 +13,7 @@ import { Button } from '@wordpress/components';
  */
 import { getDetailsURL } from 'components/details-link';
 import ClickableCell from 'components/clickable-cell';
-import { formatExplicitCurrency } from 'utils/currency';
+import { formatExplicitCurrency } from 'multi-currency/interface/functions';
 import { recordEvent } from 'tracks';
 import TransactionStatusPill from 'wcpay/components/transaction-status-pill';
 import { FraudOutcomeTransaction } from '../../data';
diff --git a/client/transactions/risk-review/index.tsx b/client/transactions/risk-review/index.tsx
index 0681110d678..f83010dc1e8 100644
--- a/client/transactions/risk-review/index.tsx
+++ b/client/transactions/risk-review/index.tsx
@@ -35,7 +35,7 @@ import {
 	getRiskReviewListColumnsStructure,
 } from './columns';
 import './style.scss';
-import { formatExplicitCurrency } from '../../utils/currency';
+import { formatExplicitCurrency } from 'multi-currency/interface/functions';
 import autocompleter from '../fraud-protection/autocompleter';
 import DownloadButton from '../../components/download-button';
 import { getFraudOutcomeTransactionsExport } from '../../data/transactions/resolvers';
diff --git a/client/transactions/uncaptured/index.tsx b/client/transactions/uncaptured/index.tsx
index 3cf14c956f7..17058760c19 100644
--- a/client/transactions/uncaptured/index.tsx
+++ b/client/transactions/uncaptured/index.tsx
@@ -17,7 +17,7 @@ import { useAuthorizations, useAuthorizationsSummary } from 'data/index';
 import Page from '../../components/page';
 import { getDetailsURL } from 'components/details-link';
 import ClickableCell from 'components/clickable-cell';
-import { formatExplicitCurrency } from 'utils/currency';
+import { formatExplicitCurrency } from 'multi-currency/interface/functions';
 import RiskLevel, { calculateRiskMapping } from 'components/risk-level';
 import { recordEvent } from 'tracks';
 import CaptureAuthorizationButton from 'wcpay/components/capture-authorization-button';
diff --git a/client/utils/account-fees.tsx b/client/utils/account-fees.tsx
index b3d0f5b9f2c..711d3d337ed 100644
--- a/client/utils/account-fees.tsx
+++ b/client/utils/account-fees.tsx
@@ -1,7 +1,7 @@
 /** @format */
 
 /**
- * External depencencies
+ * External dependencies
  */
 import { __, sprintf } from '@wordpress/i18n';
 import interpolateComponents from '@automattic/interpolate-components';
@@ -10,7 +10,7 @@ import './account-fees.scss';
 /**
  * Internal dependencies
  */
-import { formatCurrency } from 'utils/currency';
+import { formatCurrency } from 'multi-currency/interface/functions';
 import { formatFee } from 'utils/fees';
 import React from 'react';
 import { BaseFee, DiscountFee, FeeStructure } from 'wcpay/types/fees';
diff --git a/client/utils/test/account-fees.tsx b/client/utils/test/account-fees.tsx
index c1b181ac160..3184e42d644 100644
--- a/client/utils/test/account-fees.tsx
+++ b/client/utils/test/account-fees.tsx
@@ -14,10 +14,10 @@ import {
 	formatMethodFeesTooltip,
 	getCurrentBaseFee,
 } from '../account-fees';
-import { formatCurrency } from '../currency';
+import { formatCurrency } from 'multi-currency/interface/functions';
 import { BaseFee, DiscountFee, FeeStructure } from 'wcpay/types/fees';
 
-jest.mock( '../currency', () => ( {
+jest.mock( 'multi-currency/interface/functions', () => ( {
 	formatCurrency: jest.fn( ( amount: number ): string => {
 		return sprintf( '$%.2f', amount / 100 );
 	} ),
diff --git a/client/vat/form/tasks/company-data-task.tsx b/client/vat/form/tasks/company-data-task.tsx
index d2cac07cc67..76c91b7e9ed 100644
--- a/client/vat/form/tasks/company-data-task.tsx
+++ b/client/vat/form/tasks/company-data-task.tsx
@@ -11,14 +11,14 @@ import {
 } from '@wordpress/components';
 import { __ } from '@wordpress/i18n';
 import React, { useContext, useEffect, useState } from 'react';
-import CollapsibleBody from 'wcpay/additional-methods-setup/wizard/collapsible-body';
-import WizardTaskItem from 'wcpay/additional-methods-setup/wizard/task-item';
-import WizardTaskContext from 'wcpay/additional-methods-setup/wizard/task/context';
 import apiFetch from '@wordpress/api-fetch';
 
 /**
  * Internal dependencies
  */
+import CollapsibleBody from 'wcpay/additional-methods-setup/wizard/collapsible-body';
+import WizardTaskItem from 'wcpay/additional-methods-setup/wizard/task-item';
+import WizardTaskContext from 'wcpay/additional-methods-setup/wizard/task/context';
 import {
 	VatError,
 	VatFormOnCompleted,
diff --git a/client/vat/form/tasks/vat-number-task.tsx b/client/vat/form/tasks/vat-number-task.tsx
index 611e214318d..7fad346de00 100644
--- a/client/vat/form/tasks/vat-number-task.tsx
+++ b/client/vat/form/tasks/vat-number-task.tsx
@@ -11,14 +11,14 @@ import {
 } from '@wordpress/components';
 import { __, sprintf } from '@wordpress/i18n';
 import React, { useContext, useState } from 'react';
-import CollapsibleBody from 'wcpay/additional-methods-setup/wizard/collapsible-body';
-import WizardTaskItem from 'wcpay/additional-methods-setup/wizard/task-item';
-import WizardTaskContext from 'wcpay/additional-methods-setup/wizard/task/context';
 import apiFetch from '@wordpress/api-fetch';
 
 /**
  * Internal dependencies
  */
+import CollapsibleBody from 'wcpay/additional-methods-setup/wizard/collapsible-body';
+import WizardTaskItem from 'wcpay/additional-methods-setup/wizard/task-item';
+import WizardTaskContext from 'wcpay/additional-methods-setup/wizard/task/context';
 import { VatError, VatFormOnCompleted, VatValidationResult } from '../../types';
 import '../style.scss';
 
diff --git a/composer.json b/composer.json
index cdb679b4afb..497530e36e1 100644
--- a/composer.json
+++ b/composer.json
@@ -88,7 +88,7 @@
     },
     "autoload": {
         "psr-4": {
-            "WCPay\\MultiCurrency\\": "includes/multi-currency",
+            "WCPay\\MultiCurrency\\": "multi-currency/src",
             "WCPay\\Vendor\\": "lib/packages",
             "WCPay\\": "src"
         },
diff --git a/includes/class-database-cache.php b/includes/class-database-cache.php
index 68b4c7d4d89..042d99f7f9e 100644
--- a/includes/class-database-cache.php
+++ b/includes/class-database-cache.php
@@ -7,16 +7,17 @@
 
 namespace WCPay;
 
+use WCPay\MultiCurrency\Interfaces\MultiCurrencyCacheInterface;
+
 defined( 'ABSPATH' ) || exit; // block direct access.
 
 /**
  * A class for caching data as an option in the database.
  */
-class Database_Cache {
+class Database_Cache implements MultiCurrencyCacheInterface {
 	const ACCOUNT_KEY                 = 'wcpay_account_data';
 	const ONBOARDING_FIELDS_DATA_KEY  = 'wcpay_onboarding_fields_data';
 	const BUSINESS_TYPES_KEY          = 'wcpay_business_types_data';
-	const CURRENCIES_KEY              = 'wcpay_multi_currency_cached_currencies';
 	const PAYMENT_PROCESS_FACTORS_KEY = 'wcpay_payment_process_factors';
 	const FRAUD_SERVICES_KEY          = 'wcpay_fraud_services_data';
 
diff --git a/includes/class-wc-payments-account.php b/includes/class-wc-payments-account.php
index f50acfc5b35..93fab3929d7 100644
--- a/includes/class-wc-payments-account.php
+++ b/includes/class-wc-payments-account.php
@@ -17,11 +17,12 @@
 use WCPay\Exceptions\API_Exception;
 use WCPay\Logger;
 use WCPay\Database_Cache;
+use WCPay\MultiCurrency\Interfaces\MultiCurrencyAccountInterface;
 
 /**
  * Class handling any account connection functionality
  */
-class WC_Payments_Account {
+class WC_Payments_Account implements MultiCurrencyAccountInterface {
 
 	// ACCOUNT_OPTION is only used in the supporting dev tools plugin, it can be removed once everyone has upgraded.
 	const ACCOUNT_OPTION                                        = 'wcpay_account_data';
@@ -171,6 +172,18 @@ public function get_publishable_key( $is_test ) {
 		return $account['live_publishable_key'];
 	}
 
+	/**
+	 * Checks if the account is connected to the payment provider.
+	 * Note: This method is a proxy for `is_stripe_connected` for the MultiCurrencyAccountInterface.
+	 *
+	 * @param bool $on_error Value to return on server error, defaults to false.
+	 *
+	 * @return bool True if the account is connected, false otherwise, $on_error on error.
+	 */
+	public function is_provider_connected( bool $on_error = false ): bool {
+		return $this->is_stripe_connected( $on_error );
+	}
+
 	/**
 	 * Determine if the store has a working Jetpack connection.
 	 *
@@ -636,11 +649,22 @@ public function get_account_email(): string {
 	 *
 	 * @return array Currencies.
 	 */
-	public function get_account_customer_supported_currencies() {
+	public function get_account_customer_supported_currencies(): array {
 		$account = $this->get_cached_account_data();
 		return ! empty( $account ) && isset( $account['customer_currencies']['supported'] ) ? $account['customer_currencies']['supported'] : [];
 	}
 
+	/**
+	 * List of countries enabled for Stripe platform account. See also this URL:
+	 * https://woocommerce.com/document/woopayments/compatibility/countries/#supported-countries
+	 *
+	 * @return array
+	 */
+	public function get_supported_countries(): array {
+		// This is a wrapper function because of the MultiCurrencyAccountInterface.
+		return WC_Payments_Utils::supported_countries();
+	}
+
 	/**
 	 * Gets the account live mode value.
 	 *
@@ -1628,6 +1652,21 @@ private function get_login_url() {
 		);
 	}
 
+	/**
+	 * Get provider onboarding page url.
+	 *
+	 * @return string
+	 */
+	public function get_provider_onboarding_page_url(): string {
+		return add_query_arg(
+			[
+				'page' => 'wc-admin',
+				'path' => '/payments/connect',
+			],
+			admin_url( 'admin.php' )
+		);
+	}
+
 	/**
 	 * Get connect url.
 	 *
@@ -1669,21 +1708,6 @@ public static function get_payments_task_page_url() {
 		);
 	}
 
-	/**
-	 * Get Connect page url.
-	 *
-	 * @return string
-	 */
-	public static function get_connect_page_url(): string {
-		return add_query_arg(
-			[
-				'page' => 'wc-admin',
-				'path' => '/payments/connect',
-			],
-			admin_url( 'admin.php' )
-		);
-	}
-
 	/**
 	 * Get overview page url
 	 *
diff --git a/includes/class-wc-payments-explicit-price-formatter.php b/includes/class-wc-payments-explicit-price-formatter.php
index d96bfa4f25f..31c5364cfbe 100644
--- a/includes/class-wc-payments-explicit-price-formatter.php
+++ b/includes/class-wc-payments-explicit-price-formatter.php
@@ -6,7 +6,6 @@
  */
 
 use WCPay\MultiCurrency\MultiCurrency;
-use WCPay\Logger;
 
 if ( ! defined( 'ABSPATH' ) ) {
 	exit; // Exit if accessed directly.
diff --git a/includes/class-wc-payments-localization-service.php b/includes/class-wc-payments-localization-service.php
index 5ea9375429d..c0c0d7d84f8 100644
--- a/includes/class-wc-payments-localization-service.php
+++ b/includes/class-wc-payments-localization-service.php
@@ -5,12 +5,14 @@
  * @package WooCommerce\Payments
  */
 
+use WCPay\MultiCurrency\Interfaces\MultiCurrencyLocalizationInterface;
+
 defined( 'ABSPATH' ) || exit;
 
 /**
  * WC_Payments_Localization_Service.
  */
-class WC_Payments_Localization_Service {
+class WC_Payments_Localization_Service implements MultiCurrencyLocalizationInterface {
 	const WCPAY_CURRENCY_FORMAT_TRANSIENT = 'wcpay_currency_format';
 	const WCPAY_LOCALE_INFO_TRANSIENT     = 'wcpay_locale_info';
 
diff --git a/includes/class-wc-payments-settings-service.php b/includes/class-wc-payments-settings-service.php
new file mode 100644
index 00000000000..5da12e8a897
--- /dev/null
+++ b/includes/class-wc-payments-settings-service.php
@@ -0,0 +1,42 @@
+<?php
+/**
+ * WooCommerce Payments WC_Payments_Settings_Service Class
+ *
+ * @package WooCommerce\Payments
+ */
+
+use WCPay\MultiCurrency\Interfaces\MultiCurrencySettingsInterface;
+
+defined( 'ABSPATH' ) || exit;
+
+/**
+ * WC_Payments_Settings_Service.
+ */
+class WC_Payments_Settings_Service implements MultiCurrencySettingsInterface {
+	/**
+	 * Checks if dev mode is enabled.
+	 *
+	 * @return bool
+	 */
+	public function is_dev_mode(): bool {
+		return WC_Payments::mode()->is_dev();
+	}
+
+	/**
+	 * Gets the plugin file path.
+	 *
+	 * @return string
+	 */
+	public function get_plugin_file_path(): string {
+		return WCPAY_PLUGIN_FILE;
+	}
+
+	/**
+	 * Gets the plugin version.
+	 *
+	 * @return string
+	 */
+	public function get_plugin_version(): string {
+		return WCPAY_VERSION_NUMBER;
+	}
+}
diff --git a/includes/class-wc-payments-utils.php b/includes/class-wc-payments-utils.php
index 755901e15ca..0b2506d73b6 100644
--- a/includes/class-wc-payments-utils.php
+++ b/includes/class-wc-payments-utils.php
@@ -1270,24 +1270,6 @@ public static function is_store_api_request(): bool {
 		return false;
 	}
 
-	/**
-	 * Returns true if the request that's currently being processed is a Store API batch request, false
-	 * otherwise.
-	 *
-	 * @return bool True if the request is a Store API batch request, false otherwise.
-	 */
-	public static function is_store_batch_request(): bool {
-		if ( isset( $_REQUEST['rest_route'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification
-			$rest_route = sanitize_text_field( $_REQUEST['rest_route'] ); // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.MissingUnslash,WordPress.Security.NonceVerification
-		} else {
-			$url_parts    = wp_parse_url( esc_url_raw( $_SERVER['REQUEST_URI'] ?? '' ) ); // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.MissingUnslash
-			$request_path = $url_parts ? rtrim( $url_parts['path'], '/' ) : '';
-			$rest_route   = str_replace( trailingslashit( rest_get_url_prefix() ), '', $request_path );
-		}
-
-		return 1 === preg_match( '@^\/wc\/store(\/v[\d]+)?\/batch@', $rest_route );
-	}
-
 	/**
 	 * Gets the current active theme transient for a given location
 	 * Falls back to 'stripe' if no transients are set.
diff --git a/includes/class-wc-payments.php b/includes/class-wc-payments.php
index 42923e906d5..7897a3c7752 100644
--- a/includes/class-wc-payments.php
+++ b/includes/class-wc-payments.php
@@ -42,6 +42,7 @@
 use WCPay\WooPay\WooPay_Session;
 use WCPay\Compatibility_Service;
 use WCPay\Duplicates_Detection_Service;
+use WCPay\WC_Payments_Currency_Manager;
 
 /**
  * Main class for the WooPayments extension. Its responsibility is to initialize the extension.
@@ -124,6 +125,13 @@ class WC_Payments {
 	 */
 	private static $localization_service;
 
+	/**
+	 * Instance of WC_Payments_Settings_Service, created in init function
+	 *
+	 * @var WC_Payments_Settings_Service
+	 */
+	private static $settings_service;
+
 	/**
 	 * Instance of WC_Payments_Dependency_Service, created in init function
 	 *
@@ -299,6 +307,13 @@ class WC_Payments {
 	 */
 	private static $duplicates_detection_service;
 
+	/**
+	 * Instance of WC_Payments_Currency_Manager, created in init function
+	 *
+	 * @var WC_Payments_Currency_Manager
+	 */
+	private static $currency_manager;
+
 	/**
 	 * Entry point to the initialization logic.
 	 */
@@ -468,6 +483,7 @@ public static function init() {
 		include_once __DIR__ . '/class-wc-payments-onboarding-service.php';
 		include_once __DIR__ . '/class-experimental-abtest.php';
 		include_once __DIR__ . '/class-wc-payments-localization-service.php';
+		include_once __DIR__ . '/class-wc-payments-settings-service.php';
 		include_once __DIR__ . '/in-person-payments/class-wc-payments-in-person-payments-receipts-service.php';
 		include_once __DIR__ . '/class-wc-payments-order-service.php';
 		include_once __DIR__ . '/class-wc-payments-order-success-page.php';
@@ -489,7 +505,8 @@ public static function init() {
 		include_once __DIR__ . '/class-duplicate-payment-prevention-service.php';
 		include_once __DIR__ . '/class-wc-payments-incentives-service.php';
 		include_once __DIR__ . '/class-compatibility-service.php';
-		include_once __DIR__ . '/multi-currency/wc-payments-multi-currency.php';
+		include_once __DIR__ . '/compat/multi-currency/wc-payments-multi-currency.php';
+		include_once __DIR__ . '/compat/multi-currency/class-wc-payments-currency-manager.php';
 		include_once __DIR__ . '/class-duplicates-detection-service.php';
 
 		self::$woopay_checkout_service = new Checkout_Service();
@@ -520,6 +537,7 @@ public static function init() {
 		self::$fraud_service                        = new WC_Payments_Fraud_Service( self::$api_client, self::$customer_service, self::$account, self::$session_service, self::$database_cache );
 		self::$in_person_payments_receipts_service  = new WC_Payments_In_Person_Payments_Receipts_Service();
 		self::$localization_service                 = new WC_Payments_Localization_Service();
+		self::$settings_service                     = new WC_Payments_Settings_Service();
 		self::$failed_transaction_rate_limiter      = new Session_Rate_Limiter( Session_Rate_Limiter::SESSION_KEY_DECLINED_CARD_REGISTRY, 5, 10 * MINUTE_IN_SECONDS );
 		self::$order_success_page                   = new WC_Payments_Order_Success_Page();
 		self::$woopay_util                          = new WooPay_Utilities();
@@ -582,6 +600,9 @@ public static function init() {
 
 		self::$customer_service_api = new WC_Payments_Customer_Service_API( self::$customer_service );
 
+		self::$currency_manager = new WC_Payments_Currency_Manager( self::get_gateway() );
+		self::$currency_manager->init_hooks();
+
 		// Only register hooks of the new `src` service with the same feature of Duplicate_Payment_Prevention_Service.
 		// To avoid register the same hooks twice.
 		wcpay_get_container()->get( \WCPay\Internal\Service\DuplicatePaymentPreventionService::class )->init_hooks();
@@ -1323,6 +1344,15 @@ public static function get_localization_service() {
 		return self::$localization_service;
 	}
 
+	/**
+	 * Returns the WC_Payments_Settings_Service
+	 *
+	 * @return WC_Payments_Settings_Service Localization Service instance
+	 */
+	public static function get_settings_service() {
+		return self::$settings_service;
+	}
+
 	/**
 	 * Returns the WC_Payments_Action_Scheduler_Service
 	 *
diff --git a/includes/multi-currency/PaymentMethodsCompatibility.php b/includes/compat/multi-currency/class-wc-payments-currency-manager.php
similarity index 69%
rename from includes/multi-currency/PaymentMethodsCompatibility.php
rename to includes/compat/multi-currency/class-wc-payments-currency-manager.php
index 0c5f7d4b736..c00da0d1a69 100644
--- a/includes/multi-currency/PaymentMethodsCompatibility.php
+++ b/includes/compat/multi-currency/class-wc-payments-currency-manager.php
@@ -1,29 +1,21 @@
 <?php
 /**
- * Class PaymentMethodsCompatibility
+ * Class WC_Payments_Currency_Manager
  *
- * @package WooCommerce\Payments\MultiCurrency
+ * @package WooCommerce\Payments
  */
 
-namespace WCPay\MultiCurrency;
+namespace WCPay;
 
 use WC_Payment_Gateway_WCPay;
-use WC_Payments_Features;
 use WCPay\Constants\Payment_Method;
 
 defined( 'ABSPATH' ) || exit;
 
 /**
- * It ensures that when a payment method is added from the settings, the needed currency is also added.
+ * It ensures that when a payment method is added and multi-currency is enabled, the needed currency is also added.
  */
-class PaymentMethodsCompatibility {
-	/**
-	 * The Multi-Currency class instance.
-	 *
-	 * @var MultiCurrency
-	 */
-	private $multi_currency;
-
+class WC_Payments_Currency_Manager {
 	/**
 	 * The WCPay gateway class instance.
 	 *
@@ -34,12 +26,10 @@ class PaymentMethodsCompatibility {
 	/**
 	 * Constructor
 	 *
-	 * @param MultiCurrency            $multi_currency The Multi-Currency class instance.
 	 * @param WC_Payment_Gateway_WCPay $gateway The WCPay gateway class instance.
 	 */
-	public function __construct( MultiCurrency $multi_currency, WC_Payment_Gateway_WCPay $gateway ) {
-		$this->multi_currency = $multi_currency;
-		$this->gateway        = $gateway;
+	public function __construct( WC_Payment_Gateway_WCPay $gateway ) {
+		$this->gateway = $gateway;
 	}
 
 	/**
@@ -48,17 +38,32 @@ public function __construct( MultiCurrency $multi_currency, WC_Payment_Gateway_W
 	 * @return void
 	 */
 	public function init_hooks() {
-		add_action(
-			'update_option_woocommerce_woocommerce_payments_settings',
-			[ $this, 'add_missing_currencies' ]
-		);
+		add_action( 'update_option_woocommerce_woocommerce_payments_settings', [ $this, 'maybe_add_missing_currencies' ] );
 		add_action( 'admin_head', [ $this, 'add_payment_method_currency_dependencies_script' ] );
 	}
 
+	/**
+	 * Gets the multi-currency instance or returns null if it's not available.
+	 * This method allows for easier testing by allowing the multi-currency instance to be mocked.
+	 *
+	 * @return \WCPay\MultiCurrency\MultiCurrency|null
+	 */
+	public function get_multi_currency_instance() {
+		if ( ! function_exists( 'WC_Payments_Multi_Currency' ) ) {
+			return null;
+		}
+
+		if ( ! WC_Payments_Multi_Currency()->is_initialized() ) {
+			return null;
+		}
+
+		return WC_Payments_Multi_Currency();
+	}
+
 	/**
 	 * Returns the currencies needed per enabled payment method
 	 *
-	 * @return  array  The currencies keyed with the related payment method
+	 * @return array The currencies keyed with the related payment method
 	 */
 	public function get_enabled_payment_method_currencies() {
 		$enabled_payment_method_ids       = $this->gateway->get_upe_enabled_payment_method_ids();
@@ -97,14 +102,19 @@ function ( $result, $method ) use ( $account_currency ) {
 	/**
 	 * Ensures that when a payment method is added from the settings, the needed currency is also added.
 	 */
-	public function add_missing_currencies() {
+	public function maybe_add_missing_currencies() {
+		$multi_currency = $this->get_multi_currency_instance();
+		if ( is_null( $multi_currency ) ) {
+			return;
+		}
+
 		$payment_methods_needing_currency = $this->get_enabled_payment_method_currencies();
 		if ( empty( $payment_methods_needing_currency ) ) {
 			return;
 		}
 
-		$enabled_currencies   = $this->multi_currency->get_enabled_currencies();
-		$available_currencies = $this->multi_currency->get_available_currencies();
+		$enabled_currencies   = $multi_currency->get_enabled_currencies();
+		$available_currencies = $multi_currency->get_available_currencies();
 
 		$missing_currency_codes = [];
 
@@ -137,15 +147,21 @@ public function add_missing_currencies() {
 		 * The set_enabled_currencies method throws an exception if any currencies passed are not found in the current available currencies.
 		 * Any currencies not found are filtered out above, so we shouldn't need a try/catch here.
 		 */
-		$this->multi_currency->set_enabled_currencies( array_merge( array_keys( $enabled_currencies ), $missing_currency_codes ) );
+		$multi_currency->set_enabled_currencies( array_merge( array_keys( $enabled_currencies ), $missing_currency_codes ) );
 	}
 
 	/**
-	 * Adds the notices for currencies that are bound to an UPE payment method.
+	 * Adds the `multiCurrencyPaymentMethodsMap` JS object to the multi-currency settings page.
 	 *
-	 * @return  void
+	 * This object maps currencies to payment methods that require them, so the multi-currency settings page displays a notice in case of dependencies.
 	 */
 	public function add_payment_method_currency_dependencies_script() {
+		$multi_currency = $this->get_multi_currency_instance();
+
+		if ( is_null( $multi_currency ) || ! $multi_currency->is_multi_currency_settings_page() ) {
+			return;
+		}
+
 		$payment_methods_needing_currency = $this->get_enabled_payment_method_currencies();
 		if ( empty( $payment_methods_needing_currency ) ) {
 			return;
@@ -161,11 +177,10 @@ public function add_payment_method_currency_dependencies_script() {
 			}
 		}
 
-		if ( WC_Payments_Multi_Currency()->is_multi_currency_settings_page() ) : ?>
+		?>
 			<script type='text/javascript'>
 				window.multiCurrencyPaymentMethodsMap = <?php echo wp_json_encode( $currency_methods_map ); ?>;
 			</script>
-			<?php
-		endif;
+		<?php
 	}
 }
diff --git a/includes/multi-currency/wc-payments-multi-currency.php b/includes/compat/multi-currency/wc-payments-multi-currency.php
similarity index 80%
rename from includes/multi-currency/wc-payments-multi-currency.php
rename to includes/compat/multi-currency/wc-payments-multi-currency.php
index fef6e10db81..2b0ebbff71d 100644
--- a/includes/multi-currency/wc-payments-multi-currency.php
+++ b/includes/compat/multi-currency/wc-payments-multi-currency.php
@@ -29,12 +29,25 @@ function wcpay_multi_currency_onboarding_check() {
 }
 
 /**
- * Returns the main instance of MultiCurrency.
+ * Returns the MultiCurrency singleton.
  *
  * @return WCPay\MultiCurrency\MultiCurrency
  */
 function WC_Payments_Multi_Currency() { // phpcs:ignore WordPress.NamingConventions.ValidFunctionName.FunctionNameInvalid
-	return WCPay\MultiCurrency\MultiCurrency::instance();
+	static $instance = null;
+
+	if ( is_null( $instance ) ) {
+		$instance = new WCPay\MultiCurrency\MultiCurrency(
+			WC_Payments::get_settings_service(),
+			WC_Payments::get_payments_api_client(),
+			WC_Payments::get_account_service(),
+			WC_Payments::get_localization_service(),
+			WC_Payments::get_database_cache()
+		);
+		$instance->init_hooks();
+	}
+
+	return $instance;
 }
 
 add_action( 'plugins_loaded', 'WC_Payments_Multi_Currency', 12 );
diff --git a/includes/multi-currency/CountryFlags.php b/includes/multi-currency/CountryFlags.php
deleted file mode 100644
index e841095255e..00000000000
--- a/includes/multi-currency/CountryFlags.php
+++ /dev/null
@@ -1,304 +0,0 @@
-<?php
-/**
- * Class CountryFlags
- *
- * @package WooCommerce\Payments
- */
-
-namespace WCPay\MultiCurrency;
-
-use WCPay\Constants\Country_Code;
-use WCPay\Constants\Currency_Code;
-
-defined( 'ABSPATH' ) || exit;
-
-/**
- * Class that bring flags per country/currency.
- */
-class CountryFlags {
-
-	const EMOJI_COUNTRIES_FLAGS = [
-		Country_Code::ANDORRA                          => '🇦🇩',
-		Country_Code::UNITED_ARAB_EMIRATES             => '🇦🇪',
-		Country_Code::AFGHANISTAN                      => '🇦🇫',
-		Country_Code::ANTIGUA_AND_BARBUDA              => '🇦🇬',
-		Country_Code::ANGUILLA                         => '🇦🇮',
-		Country_Code::ALBANIA                          => '🇦🇱',
-		Country_Code::ARMENIA                          => '🇦🇲',
-		Country_Code::ANGOLA                           => '🇦🇴',
-		Country_Code::ANTARCTICA                       => '🇦🇶',
-		Country_Code::ARGENTINA                        => '🇦🇷',
-		Country_Code::AMERICAN_SAMOA                   => '🇦🇸',
-		Country_Code::AUSTRIA                          => '🇦🇹',
-		Country_Code::AUSTRALIA                        => '🇦🇺',
-		Country_Code::ARUBA                            => '🇦🇼',
-		Country_Code::ALAND_ISLANDS                    => '🇦🇽',
-		Country_Code::AZERBAIJAN                       => '🇦🇿',
-		Country_Code::BOSNIA_AND_HERZEGOVINA           => '🇧🇦',
-		Country_Code::BARBADOS                         => '🇧🇧',
-		Country_Code::BANGLADESH                       => '🇧🇩',
-		Country_Code::BELGIUM                          => '🇧🇪',
-		Country_Code::BURKINA_FASO                     => '🇧🇫',
-		Country_Code::BULGARIA                         => '🇧🇬',
-		Country_Code::BAHRAIN                          => '🇧🇭',
-		Country_Code::BURUNDI                          => '🇧🇮',
-		Country_Code::BENIN                            => '🇧🇯',
-		Country_Code::SAINT_BARTHELEMY                 => '🇧🇱',
-		Country_Code::BERMUDA                          => '🇧🇲',
-		Country_Code::BRUNEI                           => '🇧🇳',
-		Country_Code::BOLIVIA                          => '🇧🇴',
-		Country_Code::CARIBBEAN_NETHERLANDS            => '🇧🇶',
-		Country_Code::BRAZIL                           => '🇧🇷',
-		Country_Code::BAHAMAS                          => '🇧🇸',
-		Country_Code::BHUTAN                           => '🇧🇹',
-		Country_Code::BOUVET_ISLAND                    => '🇧🇻',
-		Country_Code::BOTSWANA                         => '🇧🇼',
-		Country_Code::BELARUS                          => '🇧🇾',
-		Country_Code::BELIZE                           => '🇧🇿',
-		Country_Code::CANADA                           => '🇨🇦',
-		Country_Code::COCOS_KEELING_ISLANDS            => '🇨🇨',
-		Country_Code::DEMOCRATIC_REPUBLIC_OF_THE_CONGO => '🇨🇩',
-		Country_Code::CENTRAL_AFRICAN_REPUBLIC         => '🇨🇫',
-		Country_Code::CONGO                            => '🇨🇬',
-		Country_Code::SWITZERLAND                      => '🇨🇭',
-		Country_Code::IVORY_COAST                      => '🇨🇮',
-		Country_Code::COOK_ISLANDS                     => '🇨🇰',
-		Country_Code::CHILE                            => '🇨🇱',
-		Country_Code::CAMEROON                         => '🇨🇲',
-		Country_Code::CHINA                            => '🇨🇳',
-		Country_Code::COLOMBIA                         => '🇨🇴',
-		Country_Code::COSTA_RICA                       => '🇨🇷',
-		Country_Code::CUBA                             => '🇨🇺',
-		Country_Code::CABO_VERDE                       => '🇨🇻',
-		'CW'                                           => '🇨🇼',
-		'CX'                                           => '🇨🇽',
-		Country_Code::CYPRUS                           => '🇨🇾',
-		Country_Code::CZECHIA                          => '🇨🇿',
-		Country_Code::GERMANY                          => '🇩🇪',
-		Country_Code::DJIBOUTI                         => '🇩🇯',
-		Country_Code::DENMARK                          => '🇩🇰',
-		Country_Code::DOMINICA                         => '🇩🇲',
-		Country_Code::DOMINICAN_REPUBLIC               => '🇩🇴',
-		Country_Code::ALGERIA                          => '🇩🇿',
-		Country_Code::ECUADOR                          => '🇪🇨',
-		Country_Code::ESTONIA                          => '🇪🇪',
-		Country_Code::EGYPT                            => '🇪🇬',
-		'EH'                                           => '🇪🇭',
-		Country_Code::ERITREA                          => '🇪🇷',
-		Country_Code::SPAIN                            => '🇪🇸',
-		Country_Code::ETHIOPIA                         => '🇪🇹',
-		'EU'                                           => '🇪🇺',
-		Country_Code::FINLAND                          => '🇫🇮',
-		Country_Code::FIJI                             => '🇫🇯',
-		'FK'                                           => '🇫🇰',
-		Country_Code::MICRONESIA                       => '🇫🇲',
-		'FO'                                           => '🇫🇴',
-		Country_Code::FRANCE                           => '🇫🇷',
-		Country_Code::GABON                            => '🇬🇦',
-		Country_Code::UNITED_KINGDOM                   => '🇬🇧',
-		Country_Code::GRENADA                          => '🇬🇩',
-		Country_Code::GEORGIA                          => '🇬🇪',
-		'GF'                                           => '🇬🇫',
-		'GG'                                           => '🇬🇬',
-		Country_Code::GHANA                            => '🇬🇭',
-		Country_Code::GIBRALTAR                        => '🇬🇮',
-		'GL'                                           => '🇬🇱',
-		Country_Code::GAMBIA                           => '🇬🇲',
-		Country_Code::GUINEA                           => '🇬🇳',
-		'GP'                                           => '🇬🇵',
-		Country_Code::EQUATORIAL_GUINEA                => '🇬🇶',
-		Country_Code::GREECE                           => '🇬🇷',
-		'GS'                                           => '🇬🇸',
-		Country_Code::GUATEMALA                        => '🇬🇹',
-		'GU'                                           => '🇬🇺',
-		Country_Code::GUINEA_BISSAU                    => '🇬🇼',
-		Country_Code::GUYANA                           => '🇬🇾',
-		Country_Code::HONG_KONG                        => '🇭🇰',
-		'HM'                                           => '🇭🇲',
-		Country_Code::HONDURAS                         => '🇭🇳',
-		Country_Code::CROATIA                          => '🇭🇷',
-		Country_Code::HAITI                            => '🇭🇹',
-		Country_Code::HUNGARY                          => '🇭🇺',
-		Country_Code::INDONESIA                        => '🇮🇩',
-		Country_Code::IRELAND                          => '🇮🇪',
-		Country_Code::ISRAEL                           => '🇮🇱',
-		'IM'                                           => '🇮🇲',
-		Country_Code::INDIA                            => '🇮🇳',
-		Country_Code::BRITISH_INDIAN_OCEAN_TERRITORY   => '🇮🇴',
-		Country_Code::IRAQ                             => '🇮🇶',
-		Country_Code::IRAN                             => '🇮🇷',
-		Country_Code::ICELAND                          => '🇮🇸',
-		Country_Code::ITALY                            => '🇮🇹',
-		'JE'                                           => '🇯🇪',
-		Country_Code::JAMAICA                          => '🇯🇲',
-		Country_Code::JORDAN                           => '🇯🇴',
-		Country_Code::JAPAN                            => '🇯🇵',
-		Country_Code::KENYA                            => '🇰🇪',
-		Country_Code::KYRGYZSTAN                       => '🇰🇬',
-		Country_Code::CAMBODIA                         => '🇰🇭',
-		Country_Code::KIRIBATI                         => '🇰🇮',
-		Country_Code::COMOROS                          => '🇰🇲',
-		Country_Code::SAINT_KITTS_AND_NEVIS            => '🇰🇳',
-		Country_Code::NORTH_KOREA                      => '🇰🇵',
-		Country_Code::SOUTH_KOREA                      => '🇰🇷',
-		Country_Code::KUWAIT                           => '🇰🇼',
-		'KY'                                           => '🇰🇾',
-		Country_Code::KAZAKHSTAN                       => '🇰🇿',
-		Country_Code::LAOS                             => '🇱🇦',
-		Country_Code::LEBANON                          => '🇱🇧',
-		Country_Code::SAINT_LUCIA                      => '🇱🇨',
-		Country_Code::LIECHTENSTEIN                    => '🇱🇮',
-		Country_Code::SRI_LANKA                        => '🇱🇰',
-		Country_Code::LIBERIA                          => '🇱🇷',
-		Country_Code::LESOTHO                          => '🇱🇸',
-		Country_Code::LITHUANIA                        => '🇱🇹',
-		Country_Code::LUXEMBOURG                       => '🇱🇺',
-		Country_Code::LATVIA                           => '🇱🇻',
-		Country_Code::LIBYA                            => '🇱🇾',
-		Country_Code::MOROCCO                          => '🇲🇦',
-		Country_Code::MONACO                           => '🇲🇨',
-		Country_Code::MOLDOVA                          => '🇲🇩',
-		Country_Code::MONTENEGRO                       => '🇲🇪',
-		'MF'                                           => '🇲🇫',
-		Country_Code::MADAGASCAR                       => '🇲🇬',
-		Country_Code::MARSHALL_ISLANDS                 => '🇲🇭',
-		Country_Code::NORTH_MACEDONIA                  => '🇲🇰',
-		Country_Code::MALI                             => '🇲🇱',
-		Country_Code::MYANMAR                          => '🇲🇲',
-		Country_Code::MONGOLIA                         => '🇲🇳',
-		'MO'                                           => '🇲🇴',
-		'MP'                                           => '🇲🇵',
-		'MQ'                                           => '🇲🇶',
-		Country_Code::MAURITANIA                       => '🇲🇷',
-		'MS'                                           => '🇲🇸',
-		Country_Code::MALTA                            => '🇲🇹',
-		Country_Code::MAURITIUS                        => '🇲🇺',
-		Country_Code::MALDIVES                         => '🇲🇻',
-		Country_Code::MALAWI                           => '🇲🇼',
-		Country_Code::MEXICO                           => '🇲🇽',
-		Country_Code::MALAYSIA                         => '🇲🇾',
-		Country_Code::MOZAMBIQUE                       => '🇲🇿',
-		Country_Code::NAMIBIA                          => '🇳🇦',
-		'NC'                                           => '🇳🇨',
-		Country_Code::NIGER                            => '🇳🇪',
-		'NF'                                           => '🇳🇫',
-		Country_Code::NIGERIA                          => '🇳🇬',
-		Country_Code::NICARAGUA                        => '🇳🇮',
-		Country_Code::NETHERLANDS                      => '🇳🇱',
-		Country_Code::NORWAY                           => '🇳🇴',
-		Country_Code::NEPAL                            => '🇳🇵',
-		Country_Code::NAURU                            => '🇳🇷',
-		'NU'                                           => '🇳🇺',
-		Country_Code::NEW_ZEALAND                      => '🇳🇿',
-		Country_Code::OMAN                             => '🇴🇲',
-		Country_Code::PANAMA                           => '🇵🇦',
-		Country_Code::PERU                             => '🇵🇪',
-		'PF'                                           => '🇵🇫',
-		Country_Code::PAPUA_NEW_GUINEA                 => '🇵🇬',
-		Country_Code::PHILIPPINES                      => '🇵🇭',
-		Country_Code::PAKISTAN                         => '🇵🇰',
-		Country_Code::POLAND                           => '🇵🇱',
-		'PM'                                           => '🇵🇲',
-		'PN'                                           => '🇵🇳',
-		'PR'                                           => '🇵🇷',
-		Country_Code::PALESTINE                        => '🇵🇸',
-		Country_Code::PORTUGAL                         => '🇵🇹',
-		Country_Code::PALAU                            => '🇵🇼',
-		Country_Code::PARAGUAY                         => '🇵🇾',
-		Country_Code::QATAR                            => '🇶🇦',
-		'RE'                                           => '🇷🇪',
-		Country_Code::ROMANIA                          => '🇷🇴',
-		Country_Code::SERBIA                           => '🇷🇸',
-		Country_Code::RUSSIA                           => '🇷🇺',
-		Country_Code::RWANDA                           => '🇷🇼',
-		Country_Code::SAUDI_ARABIA                     => '🇸🇦',
-		Country_Code::SOLOMON_ISLANDS                  => '🇸🇧',
-		Country_Code::SEYCHELLES                       => '🇸🇨',
-		Country_Code::SUDAN                            => '🇸🇩',
-		Country_Code::SWEDEN                           => '🇸🇪',
-		Country_Code::SINGAPORE                        => '🇸🇬',
-		'SH'                                           => '🇸🇭',
-		Country_Code::SLOVENIA                         => '🇸🇮',
-		'SJ'                                           => '🇸🇯',
-		Country_Code::SLOVAKIA                         => '🇸🇰',
-		Country_Code::SIERRA_LEONE                     => '🇸🇱',
-		Country_Code::SAN_MARINO                       => '🇸🇲',
-		Country_Code::SENEGAL                          => '🇸🇳',
-		Country_Code::SOMALIA                          => '🇸🇴',
-		Country_Code::SURINAME                         => '🇸🇷',
-		Country_Code::SOUTH_SUDAN                      => '🇸🇸',
-		Country_Code::SAO_TOME_AND_PRINCIPE            => '🇸🇹',
-		Country_Code::EL_SALVADOR                      => '🇸🇻',
-		'SX'                                           => '🇸🇽',
-		Country_Code::SYRIA                            => '🇸🇾',
-		Country_Code::ESWATINI                         => '🇸🇿',
-		'TC'                                           => '🇹🇨',
-		Country_Code::CHAD                             => '🇹🇩',
-		'TF'                                           => '🇹🇫',
-		Country_Code::TOGO                             => '🇹🇬',
-		Country_Code::THAILAND                         => '🇹🇭',
-		Country_Code::TAJIKISTAN                       => '🇹🇯',
-		'TK'                                           => '🇹🇰',
-		Country_Code::EAST_TIMOR                       => '🇹🇱',
-		Country_Code::TURKMENISTAN                     => '🇹🇲',
-		Country_Code::TUNISIA                          => '🇹🇳',
-		Country_Code::TONGA                            => '🇹🇴',
-		Country_Code::TURKEY                           => '🇹🇷',
-		Country_Code::TRINIDAD_AND_TOBAGO              => '🇹🇹',
-		Country_Code::TUVALU                           => '🇹🇻',
-		Country_Code::TAIWAN                           => '🇹🇼',
-		Country_Code::TANZANIA                         => '🇹🇿',
-		Country_Code::UKRAINE                          => '🇺🇦',
-		Country_Code::UGANDA                           => '🇺🇬',
-		'UM'                                           => '🇺🇲',
-		Country_Code::UNITED_STATES                    => '🇺🇸',
-		Country_Code::URUGUAY                          => '🇺🇾',
-		Country_Code::UZBEKISTAN                       => '🇺🇿',
-		Country_Code::VATICAN_CITY                     => '🇻🇦',
-		Country_Code::SAINT_VINCENT_AND_THE_GRENADINES => '🇻🇨',
-		Country_Code::VENEZUELA                        => '🇻🇪',
-		'VG'                                           => '🇻🇬',
-		'VI'                                           => '🇻🇮',
-		Country_Code::VIETNAM                          => '🇻🇳',
-		Country_Code::VANUATU                          => '🇻🇺',
-		'WF'                                           => '🇼🇫',
-		Country_Code::SAMOA                            => '🇼🇸',
-		Country_Code::KOSOVO                           => '🇽🇰',
-		Country_Code::YEMEN                            => '🇾🇪',
-		'YT'                                           => '🇾🇹',
-		Country_Code::SOUTH_AFRICA                     => '🇿🇦',
-		Country_Code::ZAMBIA                           => '🇿🇲',
-		Country_Code::ZIMBABWE                         => '🇿🇼',
-	];
-
-	/**
-	 * Retrieves a flag by country code.
-	 *
-	 * @param string $country country alpha-2 code (ISO 3166) like US.
-	 * @return string
-	 */
-	public static function get_by_country( string $country ): string {
-		return self::EMOJI_COUNTRIES_FLAGS[ $country ] ?? '';
-	}
-
-	/**
-	 * Retrieves a flag by currency code.
-	 *
-	 * @param string $currency currency code (ISO 4217) like USD.
-	 * @return string
-	 */
-	public static function get_by_currency( string $currency ): string {
-		$exceptions = [
-			Currency_Code::NETHERLANDS_ANTILLEAN_GUILDER => '',
-			Currency_Code::BITCOIN                       => '',
-			Currency_Code::CENTRAL_AFRICAN_CFA_FRANC     => '',
-			Currency_Code::EAST_CARIBBEAN_DOLLAR         => '',
-			Currency_Code::WEST_AFRICAN_CFA_FRANC        => '',
-			Currency_Code::CFP_FRANC                     => '',
-		];
-
-		$flag = $exceptions[ $currency ] ?? self::get_by_country( substr( $currency, 0, -1 ) );
-
-		return $flag;
-	}
-}
diff --git a/includes/multi-currency/Helpers/OrderMetaHelper.md b/includes/multi-currency/Helpers/OrderMetaHelper.md
deleted file mode 100644
index 84e7a0ff5c7..00000000000
--- a/includes/multi-currency/Helpers/OrderMetaHelper.md
+++ /dev/null
@@ -1,20 +0,0 @@
-## Order Meta Helper
-
-The purpose of this helper is to allow merchants to fix or update the Multi-Currency exchange rates on orders if/when they are incorrect.
-
-### Usage
-
-* Go to WooCommerce > Status > Tools
-* Find the _Enable/Disable Multi-Currency Meta Helper_ option and click the button. You should then receive a notice that the tool was enabled.
-* Go to the order that has an issue with the Multi-Currency exchange rate.
-* A new meta box named _Multi-Currency Meta Helper_ will appear in the main column near the bottom.
-  * This will only show for orders where the currency does not match the store currency. An example would be if the store currency is USD and the order currency is EUR.
-* There will be information displayed about the order in the meta box.
-  * If either the Multi-Currency or Stripe exchange rate are not found, they will display _Not Found_.
-  * If the order is through WooPayments, and if a charge is found, then there will be a _Charge Exchange Rate_ shown. If the _Charge Exchange Rate_ is found, it will also display as a _Suggested Exchange Rate_.
-* Enter the new exchange rate to be used into the field, and then click the _Update_ button for the order.
-* A new order note will appear stating that the Multi-Currency exchange rate has been updated.
-
-### Additional Note
-
-This tool is for edge cases where this data may be missing, which can cause issues with Analytics reporting. Once the exchange rate is updated, the _Import historical data_ tool under Analytics > Settings will need to be run. This will correct data related to any orders that have been adjusted.
diff --git a/includes/multi-currency/Helpers/OrderMetaHelper.php b/includes/multi-currency/Helpers/OrderMetaHelper.php
deleted file mode 100644
index 208fefc2c26..00000000000
--- a/includes/multi-currency/Helpers/OrderMetaHelper.php
+++ /dev/null
@@ -1,438 +0,0 @@
-<?php
-/**
- * Class OrderMetaHelper
- *
- * @package WooCommerce\Payments\MultiCurrency
- */
-
-namespace WCPay\MultiCurrency\Helpers;
-
-use WC_Payments_API_Client;
-use WC_Payments_Utils;
-use WCPay\Exceptions\API_Exception;
-use WCPay\Logger;
-
-defined( 'ABSPATH' ) || exit;
-
-/**
- * Class that controls OrderMetaHelper functionality.
- */
-class OrderMetaHelper {
-	/**
-	 * Client for making requests to the WooCommerce Payments API.
-	 *
-	 * @var WC_Payments_API_Client
-	 */
-	private $payments_api_client;
-
-	/**
-	 * Array of errors, if any.
-	 *
-	 * @var array
-	 */
-	private $errors = [];
-
-	/**
-	 * Constructor.
-	 *
-	 * @param WC_Payments_API_Client $payments_api_client Payments API client.
-	 */
-	public function __construct( WC_Payments_API_Client $payments_api_client ) {
-		$this->payments_api_client = $payments_api_client;
-	}
-
-	/**
-	 * Initializes this class' WP hooks.
-	 *
-	 * @return void
-	 */
-	public function init_hooks() {
-		add_action( 'add_meta_boxes', [ $this, 'maybe_add_meta_box' ], 10, 2 );
-		add_action( 'save_post', [ $this, 'maybe_update_exchange_rate' ] );
-		add_action( 'admin_notices', [ $this, 'maybe_output_errors' ] );
-		add_filter( 'get_edit_post_link', [ $this, 'maybe_update_edit_post_link' ] );
-	}
-
-	/**
-	 * Outputs and then clears our errors if there are any.
-	 *
-	 * @return void
-	 */
-	public function maybe_output_errors() {
-		if ( $this->has_errors() ) {
-			foreach ( $this->errors as $error ) {
-
-				?>
-				<div class="error notice">
-					<p><strong>Error: </strong><?php echo esc_html( $error ); ?></p>
-				</div>
-				<?php
-			}
-			$this->clear_errors();
-		}
-	}
-
-	/**
-	 * Updates the exchange rate meta data.
-	 *
-	 * @param int $order_id The order we are working with.
-	 *
-	 * @return void
-	 */
-	public function maybe_update_exchange_rate( $order_id ) {
-		// Verify nonce.
-		$nonce_value = ! empty( $_POST['wcpay_multi_currency_exchange_rate_nonce'] ) ? sanitize_text_field( wp_unslash( $_POST['wcpay_multi_currency_exchange_rate_nonce'] ) ) : false;
-		if ( false === $nonce_value || ! wp_verify_nonce( $nonce_value, 'wcpay_multi_currency_exchange_rate_nonce_' . $order_id ) || ! current_user_can( 'manage_woocommerce' ) ) {
-			return;
-		}
-
-		// Confirm our order is valid, should be worked on, and that a new exchange rate has been passed.
-		$order = $this->confirm_actions( $order_id );
-		if ( ! $order || empty( $_POST['wcpay_multi_currency_exchange_rate'] ) ) {
-			return;
-		}
-
-		// Clean the data, confirm the rate is a number, and if it isn't, add error and exit.
-		$new_exchange_rate = sanitize_text_field( wp_unslash( $_POST['wcpay_multi_currency_exchange_rate'] ) );
-		if ( ! is_numeric( $new_exchange_rate ) ) {
-			$this->add_error( 'Exchange rate value not numeric: ' . $new_exchange_rate );
-			return;
-		}
-
-		// Add the exchange rates to the log.
-		$old_exchange_rate = $order->get_meta( '_wcpay_multi_currency_order_exchange_rate' );
-		$old_exchange_rate = ! empty( $old_exchange_rate ) ? $old_exchange_rate : __( 'Not found', 'woocommerce-payments' );
-		$exchange_rate_log = $order->get_meta( '_wcpay_multi_currency_order_exchange_rate_log' );
-		$exchange_rate_log = ( is_array( $exchange_rate_log ) ) ? $exchange_rate_log : [];
-		$current_time      = time();
-
-		$exchange_rate_log[ $current_time ] = [
-			'user_id'  => get_current_user_id(),
-			'old_rate' => $old_exchange_rate,
-			'new_rate' => $new_exchange_rate,
-		];
-
-		// Add an order note stating what was updated.
-		$note = sprintf(
-			/* translators: %1 Old exchange rate, or 'Not found' string, %2 new exchange rate */
-			__( 'The exchange rate has been updated:<br>From: %1$s<br>To: %2$s', 'woocommerce-payments' ),
-			$old_exchange_rate,
-			$new_exchange_rate
-		);
-		$order->add_order_note( $note, 0, true );
-
-		// Update the exchange rate and the log on the order.
-		$order->update_meta_data( '_wcpay_multi_currency_order_exchange_rate', $new_exchange_rate );
-		$order->update_meta_data( '_wcpay_multi_currency_order_exchange_rate_log', $exchange_rate_log );
-		$order->save_meta_data();
-	}
-
-	/**
-	 * Maybe add the meta box.
-	 *
-	 * @param string $post_type Unused. The type of post being viewed.
-	 * @param object $post      The post object for the post being viewed.
-	 *
-	 * @return void
-	 */
-	public function maybe_add_meta_box( $post_type, $post ) {
-		// Confirm we should be working on the order, if not, exit.
-		$order = $this->confirm_actions( $post );
-		if ( ! $order || ! function_exists( '\wc_get_page_screen_id' ) ) {
-			return;
-		}
-
-		// Get the order edit screen to be able to add the meta box to.
-		$wc_screen_id = \wc_get_page_screen_id( 'shop-order' );
-
-		add_meta_box( 'wcpay_mc_order_meta_helper_meta_box', __( 'Multi-Currency Meta Helper', 'woocommerce-payments' ), [ $this, 'display_meta_box_content' ], $wc_screen_id, 'advanced', 'high' );
-	}
-
-	/**
-	 * Displays the content of the meta box.
-	 *
-	 * @param \WC_Order $order The order we are working with.
-	 *
-	 * @return void
-	 */
-	public function display_meta_box_content( $order ) {
-		// Again, make sure we are actually working with an order.
-		$order = wc_get_order( $order );
-		if ( ! $order ) {
-			return;
-		}
-
-		// Start getting all of the items we need.
-		$order_currency = strtoupper( $order->get_currency() );
-		$intent_id      = $order->get_meta( '_intent_id' );
-		$payment_method = $order->get_payment_method();
-
-		// Define the store items.
-		$store_items = [
-			'store_currency' => [
-				'label' => __( 'Store Currency', 'woocommerce-payments' ),
-				'value' => strtoupper( get_woocommerce_currency() ),
-			],
-		];
-
-		// Define the order meta items.
-		$order_meta_items = [
-			'order_currency'         => [
-				'label' => __( 'Order Currency', 'woocommerce-payments' ),
-				'value' => $order_currency,
-			],
-			'order_default_currency' => [
-				'label' => __( 'Order Default Currency', 'woocommerce-payments' ),
-				'value' => strtoupper( $order->get_meta( '_wcpay_multi_currency_order_default_currency' ) ),
-			],
-			'payment_method'         => [
-				'label' => __( 'Payment Method ID', 'woocommerce-payments' ),
-				'value' => $payment_method,
-			],
-			'payment_method_title'   => [
-				'label' => __( 'Payment Method Title', 'woocommerce-payments' ),
-				'value' => $order->get_payment_method_title(),
-			],
-			'intent_id'              => [
-				'label' => __( 'Intent ID', 'woocommerce-payments' ),
-				'value' => $intent_id,
-			],
-			'intent_currency'        => [
-				'label' => __( 'Intent Currency', 'woocommerce-payments' ),
-				'value' => strtoupper( $order->get_meta( '_wcpay_intent_currency' ) ),
-			],
-			'mc_exchange_rate'       => [
-				'label' => __( 'Multi-Currency Exchange Rate', 'woocommerce-payments' ),
-				'value' => $order->get_meta( '_wcpay_multi_currency_order_exchange_rate' ),
-			],
-			'stripe_exchange_rate'   => [
-				'label' => __( 'Stripe Exchange Rate', 'woocommerce-payments' ),
-				'value' => $order->get_meta( '_wcpay_multi_currency_stripe_exchange_rate' ),
-			],
-		];
-
-		// Define the charge (intent) items.
-		$charge_items = [
-			'charge_exchange_rate' => [
-				'label' => __( 'Charge Exchange Rate', 'woocommerce-payments' ),
-				'value' => '',
-			],
-			'charge_currency'      => [
-				'label' => __( 'Charge Currency', 'woocommerce-payments' ),
-				'value' => '',
-			],
-		];
-
-		if ( ! empty( $intent_id ) ) {
-			// Attempt to get the intent.
-			try {
-				$intent_object = $this->payments_api_client->get_intent( $intent_id );
-			} catch ( API_Exception $e ) {
-				// Log the error returned.
-				Logger::error( "Error when attempting to get intent ($intent_id):\n" . $e->getMessage() );
-				$intent_object = null;
-			}
-
-			// If we have an intent, then get the charge and the exchange rate from it.
-			if ( is_a( $intent_object, 'WC_Payments_API_Payment_Intention' ) ) {
-				$charge_object       = $intent_object->get_charge();
-				$balance_transaction = $charge_object->get_balance_transaction();
-
-				// Set the Charge Exchange Rate value from the intent itself.
-				$charge_items['charge_exchange_rate']['value'] = $balance_transaction['exchange_rate'];
-				$charge_items['charge_currency']['value']      = strtoupper( $charge_object->get_currency() );
-			}
-		}
-
-		/**
-		 * Zero decimal currencies have a different conversion rate value.
-		 */
-		if ( in_array( strtolower( $order_currency ), WC_Payments_Utils::zero_decimal_currencies(), true ) ) {
-			if ( '' !== $charge_items['charge_exchange_rate']['value'] ) {
-				$charge_items['charge_exchange_rate']['value'] = $charge_items['charge_exchange_rate']['value'] / 100;
-			}
-		}
-
-		// Convert the Stripe exchange amounts to what we use for Multi-Currency.
-		if ( '' !== $charge_items['charge_exchange_rate']['value'] ) {
-			$charge_items['charge_exchange_rate']['value'] = 1 / $charge_items['charge_exchange_rate']['value'];
-		}
-		if ( '' !== $order_meta_items['stripe_exchange_rate']['value'] ) {
-			$order_meta_items['stripe_exchange_rate']['value'] = 1 / $order_meta_items['stripe_exchange_rate']['value'];
-		}
-
-		// Let's see if we can get a suggested rate.
-		$suggested = false;
-		if ( empty( $order_meta_items['mc_exchange_rate']['value'] ) ) {
-			if ( ! empty( $charge_items['charge_exchange_rate']['value'] ) ) {
-				$suggested = $charge_items['charge_exchange_rate']['value'];
-			}
-			if ( ! empty( $order_meta_items['stripe_exchange_rate']['value'] ) ) {
-				$suggested = $order_meta_items['stripe_exchange_rate']['value'];
-			}
-		}
-
-		// Define our labels.
-		$form_description        = __( 'If the exchange rate meta data is missing, update the order with the suggested exchange rate. Once the rate is updated, you can then use the Import historical data tool under Analytics > Settings to correct analytical data.', 'woocommerce-payments' );
-		$suggested_label         = __( 'Suggested exchange rate: ', 'woocommerce-payments' );
-		$new_exchange_rate_label = __( 'New exchange rate:', 'woocommerce-payments' );
-		$nonce_value             = wp_create_nonce( 'wcpay_multi_currency_exchange_rate_nonce_' . $order->get_id() );
-
-		// Display the form itself.
-		?>
-			<p style="font-weight:bold; font-size:14px;">
-				<?php echo esc_html( $form_description ); ?>
-			</p>
-			<?php if ( false !== $suggested ) { ?>
-				<p style="font-weight:bold; font-size:14px;">
-				<?php echo esc_html( $suggested_label . $suggested ); ?>
-				</p>
-			<?php } ?>
-			<p>
-				<label for="wcpay_multi_currency_exchange_rate"><?php echo esc_html( $new_exchange_rate_label ); ?><br />
-				<input type="text" name="wcpay_multi_currency_exchange_rate" id="wcpay_multi_currency_exchange_rate" />
-				<input type="hidden" name="wcpay_multi_currency_exchange_rate_nonce" id="wcpay_multi_currency_exchange_rate_nonce" value="<?php echo esc_html( $nonce_value ); ?>" />
-				<input type="hidden" name="wcpay_mc_meta_helper" id="wcpay_mc_meta_helper" value="1" />
-			</p>
-			<hr>
-		<?php
-
-		$display_items = [
-			__( 'Store items', 'woocommerce-payments' )  => $store_items,
-			__( 'Order meta items', 'woocommerce-payments' ) => $order_meta_items,
-			__( 'Charge items', 'woocommerce-payments' ) => $charge_items,
-		];
-
-		$not_found = __( 'Not found', 'woocommerce-payments' );
-
-		// Iterate through our display items to display all available information in a table.
-		echo "<table>\n";
-		foreach ( $display_items as $label => $items ) {
-			echo '<tr><td colspan="2" style="font-weight:bold; font-size:14px; padding:5px; background-color: #f2f2f2;">' . esc_html( $label ) . "</td></tr>\n";
-			foreach ( $items as $item ) {
-				echo '<tr><td style="padding: 5px;">' . esc_html( $item['label'] ) . ': </td><td style="padding: 5px;">';
-				if ( ! empty( $item['value'] ) ) {
-					echo esc_html( $item['value'] );
-				} else {
-					echo '<span style="color:red;">' . esc_html( $not_found ) . '</span>';
-				}
-				echo "</td></tr>\n";
-			}
-		}
-		echo "</table>\n";
-	}
-
-	/**
-	 * Appends our parameter to the edit post link if needed.
-	 *
-	 * @param string|null $url The current edit post link.
-	 *
-	 * @return string|null
-	 */
-	public function maybe_update_edit_post_link( $url ): ?string {
-		if ( ! filter_var( $url, FILTER_VALIDATE_URL ) ) {
-			return null;
-		}
-
-		if ( $this->is_feature_enabled() ) {
-			$url .= '&wcpay_mc_meta_helper=1';
-		}
-
-		return $url;
-	}
-
-	/**
-	 * Checks to see if the feature is enabled by the request parameter.
-	 *
-	 * @return bool
-	 */
-	private function is_feature_enabled(): bool {
-		// Nonce verification ignored due to this is just checking for a set specific value.
-		return isset( $_REQUEST['wcpay_mc_meta_helper'] ) && 1 === intval( $_REQUEST['wcpay_mc_meta_helper'] ); // phpcs:ignore WordPress.Security.NonceVerification.Recommended
-	}
-
-	/**
-	 * Confirms that we should be working on this order.
-	 *
-	 * @param int|\WC_Order $order The order we're working with.
-	 *
-	 * @return bool|\WC_Order|\WC_Order_Refund Returns false or the order we're working with.
-	 */
-	private function confirm_actions( $order ) {
-		// If the feature is not enabled, exit.
-		if ( ! $this->is_feature_enabled() ) {
-			return false;
-		}
-
-		// If it's actually not an order, or if it's not in a status that accepted a payment, exit.
-		$order         = wc_get_order( $order );
-		$paid_statuses = array_merge( wc_get_is_paid_statuses(), [ 'refunded' ] );
-		if ( ! $order || ! in_array( $order->get_status(), $paid_statuses, true ) ) {
-			return false;
-		}
-
-		// If the store currency and the order currency match, do not display the box.
-		$store_currency = get_woocommerce_currency();
-		$order_currency = $order->get_currency();
-		if ( $store_currency === $order_currency ) {
-			return false;
-		}
-
-		return $order;
-	}
-
-	/**
-	 * Adds an error to the stack for us.
-	 *
-	 * @param string $error The error to add to the stack.
-	 *
-	 * @return void
-	 */
-	private function add_error( $error ) {
-		// Refresh the errors, then add the new one.
-		$this->get_errors();
-		$this->errors[] = $error;
-
-		// Update the errors option.
-		update_option( '_wcpay_multi_currency_order_meta_helper_errors', $this->errors );
-	}
-
-	/**
-	 * Gets the errors from the options table.
-	 *
-	 * @return array The array of errors.
-	 */
-	private function get_errors(): array {
-		// Get any errors from the database.
-		$errors = array_filter( (array) get_option( '_wcpay_multi_currency_order_meta_helper_errors' ) );
-
-		// If we have any errors currently in our object, add those.
-		if ( 0 < count( $this->errors ) ) {
-			$errors = array_merge( $errors, $this->errors );
-		}
-
-		// Add all the errors to the object, and return them.
-		$this->errors = array_unique( $errors );
-
-		return $this->errors;
-	}
-
-	/**
-	 * Checks if we have any errors.
-	 *
-	 * @return bool
-	 */
-	private function has_errors(): bool {
-		return 0 < count( $this->get_errors() );
-	}
-
-	/**
-	 * Removes the errors from the object and deletes the database option.
-	 *
-	 * @return void
-	 */
-	private function clear_errors() {
-		$this->errors = [];
-		delete_option( '_wcpay_multi_currency_order_meta_helper_errors' );
-	}
-}
diff --git a/includes/wc-payment-api/class-wc-payments-api-client.php b/includes/wc-payment-api/class-wc-payments-api-client.php
index 50aabec994c..13b25e07dd6 100644
--- a/includes/wc-payment-api/class-wc-payments-api-client.php
+++ b/includes/wc-payment-api/class-wc-payments-api-client.php
@@ -21,11 +21,12 @@
 use WCPay\Core\Server\Request;
 use WCPay\Core\Server\Request\List_Fraud_Outcome_Transactions;
 use WCPay\Exceptions\Cannot_Combine_Currencies_Exception;
+use WCPay\MultiCurrency\Interfaces\MultiCurrencyApiClientInterface;
 
 /**
  * Communicates with WooCommerce Payments API.
  */
-class WC_Payments_API_Client {
+class WC_Payments_API_Client implements MultiCurrencyApiClientInterface {
 
 	const ENDPOINT_BASE          = 'https://public-api.wordpress.com/wpcom/v2';
 	const ENDPOINT_SITE_FRAGMENT = 'sites/%s';
@@ -191,7 +192,7 @@ public function __construct( $user_agent, $http_client, $wcpay_db ) {
 	 *
 	 * @return bool
 	 */
-	public function is_server_connected() {
+	public function is_server_connected(): bool {
 		return $this->http_client->is_connected();
 	}
 
@@ -857,7 +858,7 @@ function ( $a, $b ) {
 	 *
 	 * @throws API_Exception - Error contacting the API.
 	 */
-	public function get_currency_rates( string $currency_from, $currencies_to = null ) {
+	public function get_currency_rates( string $currency_from, $currencies_to = null ): array {
 		if ( empty( $currency_from ) ) {
 			throw new API_Exception(
 				__( 'Currency From parameter is required', 'woocommerce-payments' ),
diff --git a/client/multi-currency-analytics/index.js b/multi-currency/client/analytics/index.js
similarity index 100%
rename from client/multi-currency-analytics/index.js
rename to multi-currency/client/analytics/index.js
diff --git a/client/multi-currency/blocks/currency-switcher.js b/multi-currency/client/blocks/currency-switcher.js
similarity index 99%
rename from client/multi-currency/blocks/currency-switcher.js
rename to multi-currency/client/blocks/currency-switcher.js
index 5dee2d130be..75111f42768 100644
--- a/client/multi-currency/blocks/currency-switcher.js
+++ b/multi-currency/client/blocks/currency-switcher.js
@@ -2,7 +2,10 @@
 /**
  * Internal dependencies
  */
-import { useEnabledCurrencies, useCurrencies } from 'wcpay/data';
+import {
+	useEnabledCurrencies,
+	useCurrencies,
+} from 'multi-currency/interface/data';
 
 /**
  * External dependencies
diff --git a/client/components/currency-delete-illustration/index.js b/multi-currency/client/components/currency-delete-illustration/index.js
similarity index 100%
rename from client/components/currency-delete-illustration/index.js
rename to multi-currency/client/components/currency-delete-illustration/index.js
diff --git a/client/components/currency-delete-illustration/styles.scss b/multi-currency/client/components/currency-delete-illustration/styles.scss
similarity index 100%
rename from client/components/currency-delete-illustration/styles.scss
rename to multi-currency/client/components/currency-delete-illustration/styles.scss
diff --git a/client/multi-currency/preview-modal/index.js b/multi-currency/client/components/preview-modal/index.js
similarity index 95%
rename from client/multi-currency/preview-modal/index.js
rename to multi-currency/client/components/preview-modal/index.js
index 9857ddd71e3..60d4fac0a13 100644
--- a/client/multi-currency/preview-modal/index.js
+++ b/multi-currency/client/components/preview-modal/index.js
@@ -3,7 +3,7 @@
  */
 import { Modal } from '@wordpress/components';
 import { __ } from '@wordpress/i18n';
-import { useStoreSettings } from 'wcpay/data';
+import { useStoreSettings } from 'multi-currency/data';
 
 /**
  * Internal dependencies
diff --git a/client/multi-currency/preview-modal/index.scss b/multi-currency/client/components/preview-modal/index.scss
similarity index 100%
rename from client/multi-currency/preview-modal/index.scss
rename to multi-currency/client/components/preview-modal/index.scss
diff --git a/client/components/search/index.js b/multi-currency/client/components/search/index.js
similarity index 100%
rename from client/components/search/index.js
rename to multi-currency/client/components/search/index.js
diff --git a/client/components/search/style.scss b/multi-currency/client/components/search/style.scss
similarity index 100%
rename from client/components/search/style.scss
rename to multi-currency/client/components/search/style.scss
diff --git a/client/components/search/test/__snapshots__/index.js.snap b/multi-currency/client/components/search/test/__snapshots__/index.js.snap
similarity index 100%
rename from client/components/search/test/__snapshots__/index.js.snap
rename to multi-currency/client/components/search/test/__snapshots__/index.js.snap
diff --git a/client/components/search/test/index.js b/multi-currency/client/components/search/test/index.js
similarity index 100%
rename from client/components/search/test/index.js
rename to multi-currency/client/components/search/test/index.js
diff --git a/client/multi-currency/context.js b/multi-currency/client/context.js
similarity index 100%
rename from client/multi-currency/context.js
rename to multi-currency/client/context.js
diff --git a/client/data/multi-currency/action-types.js b/multi-currency/client/data/action-types.js
similarity index 100%
rename from client/data/multi-currency/action-types.js
rename to multi-currency/client/data/action-types.js
diff --git a/client/data/multi-currency/actions.js b/multi-currency/client/data/actions.js
similarity index 96%
rename from client/data/multi-currency/actions.js
rename to multi-currency/client/data/actions.js
index 7c28cf73781..0b822dde4cb 100644
--- a/client/data/multi-currency/actions.js
+++ b/multi-currency/client/data/actions.js
@@ -6,13 +6,13 @@
 import { apiFetch } from '@wordpress/data-controls';
 import { dispatch, select } from '@wordpress/data';
 import { __ } from '@wordpress/i18n';
-import { recordEvent } from 'tracks';
 
 /**
  * Internal Dependencies
  */
+import { recordEvent } from 'multi-currency/interface/functions';
 import TYPES from './action-types';
-import { NAMESPACE, STORE_NAME } from '../constants';
+import { NAMESPACE, STORE_NAME } from './constants';
 
 export function updateCurrencies( data ) {
 	return {
diff --git a/multi-currency/client/data/constants.js b/multi-currency/client/data/constants.js
new file mode 100644
index 00000000000..eaee38c6ee6
--- /dev/null
+++ b/multi-currency/client/data/constants.js
@@ -0,0 +1,4 @@
+/** @format */
+
+export const NAMESPACE = '/wc/v3/payments';
+export const STORE_NAME = 'wc/payments/multi-currency';
diff --git a/client/data/multi-currency/hooks.js b/multi-currency/client/data/hooks.js
similarity index 96%
rename from client/data/multi-currency/hooks.js
rename to multi-currency/client/data/hooks.js
index aa39e24ee6f..ea5c23e5e75 100644
--- a/client/data/multi-currency/hooks.js
+++ b/multi-currency/client/data/hooks.js
@@ -4,7 +4,11 @@
  * External dependencies
  */
 import { useSelect, useDispatch, dispatch } from '@wordpress/data';
-import { STORE_NAME } from '../constants';
+
+/**
+ * Internal dependencies
+ */
+import { STORE_NAME } from './constants';
 
 export const useCurrencies = () =>
 	useSelect( ( select ) => {
diff --git a/multi-currency/client/data/index.ts b/multi-currency/client/data/index.ts
new file mode 100644
index 00000000000..f1d8d84a456
--- /dev/null
+++ b/multi-currency/client/data/index.ts
@@ -0,0 +1,20 @@
+/** @format */
+
+/**
+ * Internal dependencies
+ */
+import { STORE_NAME } from './constants';
+import { initStore } from './store';
+
+initStore();
+
+// eslint-disable-next-line @typescript-eslint/naming-convention
+export const WCPAY_STORE_NAME = STORE_NAME;
+
+// We only ask for hooks when importing directly from 'multi-currency/data'.
+import * as selectors from './selectors';
+import * as actions from './actions';
+import * as resolvers from './resolvers';
+
+export { selectors, actions, resolvers };
+export * from './hooks';
diff --git a/client/data/multi-currency/reducer.js b/multi-currency/client/data/reducer.js
similarity index 100%
rename from client/data/multi-currency/reducer.js
rename to multi-currency/client/data/reducer.js
diff --git a/client/data/multi-currency/resolvers.js b/multi-currency/client/data/resolvers.js
similarity index 93%
rename from client/data/multi-currency/resolvers.js
rename to multi-currency/client/data/resolvers.js
index 4eada7da994..78168ad708a 100644
--- a/client/data/multi-currency/resolvers.js
+++ b/multi-currency/client/data/resolvers.js
@@ -10,7 +10,7 @@ import { __ } from '@wordpress/i18n';
 /**
  * Internal dependencies
  */
-import { NAMESPACE } from '../constants';
+import { NAMESPACE } from './constants';
 import {
 	updateCurrencies,
 	updateCurrencySettings,
@@ -34,7 +34,7 @@ export function* getCurrencies() {
 }
 
 /**
- * Retrieve single currency sttings from the site's REST API.
+ * Retrieve single currency settings from the site's REST API.
  *
  * @param {string} currencyCode The currency code to fetch settings for.
  */
diff --git a/client/data/multi-currency/selectors.js b/multi-currency/client/data/selectors.js
similarity index 96%
rename from client/data/multi-currency/selectors.js
rename to multi-currency/client/data/selectors.js
index 6c2a2b20f97..825a9271db0 100644
--- a/client/data/multi-currency/selectors.js
+++ b/multi-currency/client/data/selectors.js
@@ -13,7 +13,7 @@ const getMultiCurrencyState = ( state ) => {
 		return {};
 	}
 
-	return state.multiCurrency || {};
+	return state || {};
 };
 
 export const getCurrencies = ( state ) => {
diff --git a/multi-currency/client/data/store.js b/multi-currency/client/data/store.js
new file mode 100644
index 00000000000..2e142e66f9c
--- /dev/null
+++ b/multi-currency/client/data/store.js
@@ -0,0 +1,28 @@
+/*
+ * External dependencies
+ */
+import { registerStore } from '@wordpress/data';
+import { controls } from '@wordpress/data-controls';
+
+/**
+ * Internal dependencies
+ */
+import { STORE_NAME } from './constants';
+import * as multiCurrency from './';
+import reducer from './reducer';
+
+// Extracted into wrapper function to facilitate testing.
+export const initStore = () =>
+	registerStore( STORE_NAME, {
+		reducer,
+		actions: {
+			...multiCurrency.actions,
+		},
+		controls,
+		selectors: {
+			...multiCurrency.selectors,
+		},
+		resolvers: {
+			...multiCurrency.resolvers,
+		},
+	} );
diff --git a/client/multi-currency/index.js b/multi-currency/client/index.js
similarity index 91%
rename from client/multi-currency/index.js
rename to multi-currency/client/index.js
index a479c326914..f4daf3b9a3a 100644
--- a/client/multi-currency/index.js
+++ b/multi-currency/client/index.js
@@ -7,8 +7,8 @@ import ReactDOM from 'react-dom';
 /**
  * Internal dependencies
  */
-import MultiCurrencySettings from './multi-currency-settings';
-import SingleCurrencySettings from './single-currency-settings';
+import MultiCurrencySettings from './settings/multi-currency';
+import SingleCurrencySettings from './settings/single-currency';
 import MultiCurrencySettingsContext from './context';
 
 const MultiCurrencySettingsPage = () => {
diff --git a/multi-currency/client/interface/assets.js b/multi-currency/client/interface/assets.js
new file mode 100644
index 00000000000..3a3a095891a
--- /dev/null
+++ b/multi-currency/client/interface/assets.js
@@ -0,0 +1,6 @@
+/**
+ * External Dependencies
+ */
+import paymentMethodsMap from 'wcpay/payment-methods-map';
+
+export { paymentMethodsMap };
diff --git a/multi-currency/client/interface/components.js b/multi-currency/client/interface/components.js
new file mode 100644
index 00000000000..eddab5ae84e
--- /dev/null
+++ b/multi-currency/client/interface/components.js
@@ -0,0 +1,23 @@
+/**
+ * Dependencies from WooPayments to MCCY.
+ */
+// wcpay/additional-methods-setup/*
+export { default as CollapsibleBody } from 'wcpay/additional-methods-setup/wizard/collapsible-body';
+export { default as Wizard } from 'wcpay/additional-methods-setup/wizard/wrapper';
+export { default as WizardTask } from 'wcpay/additional-methods-setup/wizard/task';
+export { default as WizardTaskItem } from 'wcpay/additional-methods-setup/wizard/task-item';
+export { default as WizardTaskList } from 'wcpay/additional-methods-setup/wizard/task-list';
+// wcpay/components/*
+export { default as ConfirmationModal } from 'wcpay/components/confirmation-modal';
+export { default as Page } from 'wcpay/components/page';
+export { LoadableBlock } from 'wcpay/components/loadable';
+// wcpay/settings/*
+export { default as PaymentMethodIcon } from 'wcpay/settings/payment-method-icon';
+export { default as SettingsLayout } from 'wcpay/settings/settings-layout';
+export { default as SettingsSection } from 'wcpay/settings/settings-section';
+
+/**
+ * Dependencies from MCCY to WooPayments.
+ */
+// multi-currency/setup
+export { default as MultiCurrencySetupPage } from 'multi-currency/setup';
diff --git a/multi-currency/client/interface/data.js b/multi-currency/client/interface/data.js
new file mode 100644
index 00000000000..af162ddd6ed
--- /dev/null
+++ b/multi-currency/client/interface/data.js
@@ -0,0 +1,10 @@
+/**
+ * Dependencies from WooPayments to MCCY.
+ */
+// wcpay/data
+export { useSettings, useMultiCurrency } from 'wcpay/data';
+
+/**
+ * Dependencies from MCCY to WooPayments.
+ */
+export { useCurrencies, useEnabledCurrencies } from 'multi-currency/data';
diff --git a/multi-currency/client/interface/functions.js b/multi-currency/client/interface/functions.js
new file mode 100644
index 00000000000..5ffed26e00d
--- /dev/null
+++ b/multi-currency/client/interface/functions.js
@@ -0,0 +1,25 @@
+/**
+ * Dependencies from WooPayments to MCCY.
+ */
+// wcpay/tracks
+export { recordEvent } from 'wcpay/tracks';
+// wcpay/settings
+export { default as WCPaySettingsContext } from 'wcpay/settings/wcpay-settings-context';
+// wcpay/additional-methods-setup/*
+export { default as WizardTaskContext } from 'wcpay/additional-methods-setup/wizard/task/context';
+// wcpay/utils/*
+export { formatListOfItems } from 'wcpay/utils/format-list-of-items';
+
+/**
+ * Dependencies from MCCY to WooPayments.
+ */
+export { getMissingCurrenciesTooltipMessage } from 'multi-currency/utils/missing-currencies-message';
+export {
+	formatCurrency,
+	formatCurrencyName,
+	formatFX,
+	formatExplicitCurrency,
+	formatExportAmount,
+	getCurrency,
+	isZeroDecimalCurrency,
+} from 'multi-currency/utils/currency';
diff --git a/client/multi-currency/multi-currency-settings/enabled-currencies-list/delete-button.js b/multi-currency/client/settings/multi-currency/enabled-currencies-list/delete-button.js
similarity index 92%
rename from client/multi-currency/multi-currency-settings/enabled-currencies-list/delete-button.js
rename to multi-currency/client/settings/multi-currency/enabled-currencies-list/delete-button.js
index cc58435ed22..ad99c04d327 100644
--- a/client/multi-currency/multi-currency-settings/enabled-currencies-list/delete-button.js
+++ b/multi-currency/client/settings/multi-currency/enabled-currencies-list/delete-button.js
@@ -6,10 +6,12 @@ import { __, sprintf } from '@wordpress/i18n';
 import { Button, Icon } from '@wordpress/components';
 import interpolateComponents from '@automattic/interpolate-components';
 import { useCallback, useState } from '@wordpress/element';
-import ConfirmationModal from 'wcpay/components/confirmation-modal';
-import CurrencyDeleteIllustration from 'wcpay/components/currency-delete-illustration';
-import PaymentMethodIcon from 'wcpay/settings/payment-method-icon';
-import paymentMethodsMap from 'wcpay/payment-methods-map';
+import {
+	ConfirmationModal,
+	PaymentMethodIcon,
+} from 'multi-currency/interface/components';
+import CurrencyDeleteIllustration from 'multi-currency/components/currency-delete-illustration';
+import { paymentMethodsMap } from 'multi-currency/interface/assets';
 
 const DeleteButton = ( { code, label, symbol, onClick, className } ) => {
 	const [ isConfirmationModalOpen, setIsConfirmationModalOpen ] = useState(
diff --git a/client/multi-currency/multi-currency-settings/enabled-currencies-list/index.js b/multi-currency/client/settings/multi-currency/enabled-currencies-list/index.js
similarity index 97%
rename from client/multi-currency/multi-currency-settings/enabled-currencies-list/index.js
rename to multi-currency/client/settings/multi-currency/enabled-currencies-list/index.js
index 8d08b90ef11..00ac75e0c6e 100644
--- a/client/multi-currency/multi-currency-settings/enabled-currencies-list/index.js
+++ b/multi-currency/client/settings/multi-currency/enabled-currencies-list/index.js
@@ -15,13 +15,13 @@ import {
 	useCurrencies,
 	useDefaultCurrency,
 	useEnabledCurrencies,
-} from 'wcpay/data';
+} from 'multi-currency/data';
 
 import EnabledCurrenciesList from './list';
 import EnabledCurrenciesListItem from './list-item';
 import EnabledCurrenciesListItemPlaceholder from './list-item-placeholder';
 import EnabledCurrenciesModal from './modal';
-import SettingsSection from 'wcpay/settings/settings-section';
+import { SettingsSection } from 'multi-currency/interface/components';
 
 const EnabledCurrenciesSettingsDescription = () => {
 	const LEARN_MORE_URL =
diff --git a/client/multi-currency/multi-currency-settings/enabled-currencies-list/list-item-placeholder.js b/multi-currency/client/settings/multi-currency/enabled-currencies-list/list-item-placeholder.js
similarity index 94%
rename from client/multi-currency/multi-currency-settings/enabled-currencies-list/list-item-placeholder.js
rename to multi-currency/client/settings/multi-currency/enabled-currencies-list/list-item-placeholder.js
index 6a44378e72a..c29d2902a8b 100644
--- a/client/multi-currency/multi-currency-settings/enabled-currencies-list/list-item-placeholder.js
+++ b/multi-currency/client/settings/multi-currency/enabled-currencies-list/list-item-placeholder.js
@@ -3,7 +3,7 @@
  * External dependencies
  */
 import classNames from 'classnames';
-import { LoadableBlock } from 'wcpay/components/loadable';
+import { LoadableBlock } from 'multi-currency/interface/components';
 
 const EnabledCurrenciesListItemPlaceholder = ( { isLoading } ) => {
 	return (
diff --git a/client/multi-currency/multi-currency-settings/enabled-currencies-list/list-item.js b/multi-currency/client/settings/multi-currency/enabled-currencies-list/list-item.js
similarity index 97%
rename from client/multi-currency/multi-currency-settings/enabled-currencies-list/list-item.js
rename to multi-currency/client/settings/multi-currency/enabled-currencies-list/list-item.js
index 135e95a0a94..0b8d0b14689 100644
--- a/client/multi-currency/multi-currency-settings/enabled-currencies-list/list-item.js
+++ b/multi-currency/client/settings/multi-currency/enabled-currencies-list/list-item.js
@@ -10,7 +10,7 @@ import { Button } from '@wordpress/components';
  * Internal dependencies
  */
 import DeleteButton from './delete-button';
-import MultiCurrencySettingsContext from '../../context';
+import MultiCurrencySettingsContext from 'multi-currency/context';
 import { useContext } from 'react';
 
 const EnabledCurrenciesListItem = ( {
diff --git a/client/multi-currency/multi-currency-settings/enabled-currencies-list/list.js b/multi-currency/client/settings/multi-currency/enabled-currencies-list/list.js
similarity index 100%
rename from client/multi-currency/multi-currency-settings/enabled-currencies-list/list.js
rename to multi-currency/client/settings/multi-currency/enabled-currencies-list/list.js
diff --git a/client/multi-currency/multi-currency-settings/enabled-currencies-list/modal-checkbox-list.js b/multi-currency/client/settings/multi-currency/enabled-currencies-list/modal-checkbox-list.js
similarity index 100%
rename from client/multi-currency/multi-currency-settings/enabled-currencies-list/modal-checkbox-list.js
rename to multi-currency/client/settings/multi-currency/enabled-currencies-list/modal-checkbox-list.js
diff --git a/client/multi-currency/multi-currency-settings/enabled-currencies-list/modal-checkbox.js b/multi-currency/client/settings/multi-currency/enabled-currencies-list/modal-checkbox.js
similarity index 100%
rename from client/multi-currency/multi-currency-settings/enabled-currencies-list/modal-checkbox.js
rename to multi-currency/client/settings/multi-currency/enabled-currencies-list/modal-checkbox.js
diff --git a/client/multi-currency/multi-currency-settings/enabled-currencies-list/modal.js b/multi-currency/client/settings/multi-currency/enabled-currencies-list/modal.js
similarity index 97%
rename from client/multi-currency/multi-currency-settings/enabled-currencies-list/modal.js
rename to multi-currency/client/settings/multi-currency/enabled-currencies-list/modal.js
index 619e51a01c5..13610e78c17 100644
--- a/client/multi-currency/multi-currency-settings/enabled-currencies-list/modal.js
+++ b/multi-currency/client/settings/multi-currency/enabled-currencies-list/modal.js
@@ -13,11 +13,11 @@ import {
 	useAvailableCurrencies,
 	useEnabledCurrencies,
 	useDefaultCurrency,
-} from 'wcpay/data';
+} from 'multi-currency/data';
 import EnabledCurrenciesModalCheckboxList from './modal-checkbox-list';
 import EnabledCurrenciesModalCheckbox from './modal-checkbox';
-import ConfirmationModal from 'wcpay/components/confirmation-modal';
-import Search from 'components/search';
+import { ConfirmationModal } from 'multi-currency/interface/components';
+import Search from 'multi-currency/components/search';
 import './style.scss';
 
 // TODO: This works when saving, but list does not refresh.
diff --git a/client/multi-currency/multi-currency-settings/enabled-currencies-list/style.scss b/multi-currency/client/settings/multi-currency/enabled-currencies-list/style.scss
similarity index 100%
rename from client/multi-currency/multi-currency-settings/enabled-currencies-list/style.scss
rename to multi-currency/client/settings/multi-currency/enabled-currencies-list/style.scss
diff --git a/client/multi-currency/multi-currency-settings/enabled-currencies-list/test/__snapshots__/index.js.snap b/multi-currency/client/settings/multi-currency/enabled-currencies-list/test/__snapshots__/index.js.snap
similarity index 100%
rename from client/multi-currency/multi-currency-settings/enabled-currencies-list/test/__snapshots__/index.js.snap
rename to multi-currency/client/settings/multi-currency/enabled-currencies-list/test/__snapshots__/index.js.snap
diff --git a/client/multi-currency/multi-currency-settings/enabled-currencies-list/test/index.js b/multi-currency/client/settings/multi-currency/enabled-currencies-list/test/index.js
similarity index 97%
rename from client/multi-currency/multi-currency-settings/enabled-currencies-list/test/index.js
rename to multi-currency/client/settings/multi-currency/enabled-currencies-list/test/index.js
index 38e15b1b04b..fb4e89bd92c 100644
--- a/client/multi-currency/multi-currency-settings/enabled-currencies-list/test/index.js
+++ b/multi-currency/client/settings/multi-currency/enabled-currencies-list/test/index.js
@@ -14,13 +14,13 @@ import {
 	useCurrencies,
 	useDefaultCurrency,
 	useEnabledCurrencies,
-} from 'wcpay/data';
+} from 'multi-currency/data';
 
-import MultiCurrencySettingsContext from '../../../context';
+import MultiCurrencySettingsContext from 'multi-currency/context';
 
-jest.mock( 'wcpay/data', () => ( {
-	useCurrencies: jest.fn(),
+jest.mock( 'multi-currency/data', () => ( {
 	useAvailableCurrencies: jest.fn(),
+	useCurrencies: jest.fn(),
 	useDefaultCurrency: jest.fn(),
 	useEnabledCurrencies: jest.fn(),
 } ) );
diff --git a/client/multi-currency/multi-currency-settings/index.js b/multi-currency/client/settings/multi-currency/index.js
similarity index 87%
rename from client/multi-currency/multi-currency-settings/index.js
rename to multi-currency/client/settings/multi-currency/index.js
index 89ee0fd6361..a2caf57151e 100644
--- a/client/multi-currency/multi-currency-settings/index.js
+++ b/multi-currency/client/settings/multi-currency/index.js
@@ -6,7 +6,7 @@ import React from 'react';
 /**
  * Internal dependencies
  */
-import SettingsLayout from '../../settings/settings-layout';
+import { SettingsLayout } from 'multi-currency/interface/components';
 import EnabledCurrenciesList from './enabled-currencies-list';
 import StoreSettings from './store-settings';
 import './style.scss';
diff --git a/client/multi-currency/multi-currency-settings/store-settings/index.js b/multi-currency/client/settings/multi-currency/store-settings/index.js
similarity index 95%
rename from client/multi-currency/multi-currency-settings/store-settings/index.js
rename to multi-currency/client/settings/multi-currency/store-settings/index.js
index 9e5be4eb9df..18972164698 100644
--- a/client/multi-currency/multi-currency-settings/store-settings/index.js
+++ b/multi-currency/client/settings/multi-currency/store-settings/index.js
@@ -11,10 +11,12 @@ import { createInterpolateElement } from '@wordpress/element';
  */
 import './style.scss';
 
-import { useStoreSettings } from 'wcpay/data';
-import SettingsSection from 'wcpay/settings/settings-section';
-import { LoadableBlock } from 'wcpay/components/loadable';
-import PreviewModal from 'wcpay/multi-currency/preview-modal';
+import { useStoreSettings } from 'multi-currency/data';
+import {
+	LoadableBlock,
+	SettingsSection,
+} from 'multi-currency/interface/components';
+import PreviewModal from 'multi-currency/components/preview-modal';
 
 const StoreSettingsDescription = () => {
 	const LEARN_MORE_URL =
diff --git a/client/multi-currency/multi-currency-settings/store-settings/style.scss b/multi-currency/client/settings/multi-currency/store-settings/style.scss
similarity index 100%
rename from client/multi-currency/multi-currency-settings/store-settings/style.scss
rename to multi-currency/client/settings/multi-currency/store-settings/style.scss
diff --git a/client/multi-currency/multi-currency-settings/store-settings/test/__snapshots__/index.test.js.snap b/multi-currency/client/settings/multi-currency/store-settings/test/__snapshots__/index.test.js.snap
similarity index 100%
rename from client/multi-currency/multi-currency-settings/store-settings/test/__snapshots__/index.test.js.snap
rename to multi-currency/client/settings/multi-currency/store-settings/test/__snapshots__/index.test.js.snap
diff --git a/client/multi-currency/multi-currency-settings/store-settings/test/index.test.js b/multi-currency/client/settings/multi-currency/store-settings/test/index.test.js
similarity index 95%
rename from client/multi-currency/multi-currency-settings/store-settings/test/index.test.js
rename to multi-currency/client/settings/multi-currency/store-settings/test/index.test.js
index d65d4af5f6b..0aadcd7720d 100644
--- a/client/multi-currency/multi-currency-settings/store-settings/test/index.test.js
+++ b/multi-currency/client/settings/multi-currency/store-settings/test/index.test.js
@@ -7,10 +7,10 @@ import { render, screen, fireEvent } from '@testing-library/react';
 /**
  * Internal dependencies
  */
-import { useStoreSettings } from 'wcpay/data';
+import { useStoreSettings } from 'multi-currency/data';
 import StoreSettings from '..';
 
-jest.mock( 'wcpay/data', () => ( {
+jest.mock( 'multi-currency/data', () => ( {
 	useStoreSettings: jest.fn(),
 } ) );
 
diff --git a/client/multi-currency/multi-currency-settings/style.scss b/multi-currency/client/settings/multi-currency/style.scss
similarity index 100%
rename from client/multi-currency/multi-currency-settings/style.scss
rename to multi-currency/client/settings/multi-currency/style.scss
diff --git a/client/multi-currency/multi-currency-settings/test/__snapshots__/index.test.js.snap b/multi-currency/client/settings/multi-currency/test/__snapshots__/index.test.js.snap
similarity index 100%
rename from client/multi-currency/multi-currency-settings/test/__snapshots__/index.test.js.snap
rename to multi-currency/client/settings/multi-currency/test/__snapshots__/index.test.js.snap
diff --git a/client/multi-currency/multi-currency-settings/test/index.test.js b/multi-currency/client/settings/multi-currency/test/index.test.js
similarity index 92%
rename from client/multi-currency/multi-currency-settings/test/index.test.js
rename to multi-currency/client/settings/multi-currency/test/index.test.js
index 5940e763cc8..3acbfb022c0 100644
--- a/client/multi-currency/multi-currency-settings/test/index.test.js
+++ b/multi-currency/client/settings/multi-currency/test/index.test.js
@@ -7,7 +7,7 @@ import { render } from '@testing-library/react';
 /**
  * Internal dependencies
  */
-import SettingsLayout from '../../../settings/settings-layout';
+import { SettingsLayout } from 'multi-currency/interface/components';
 import EnabledCurrenciesList from '../enabled-currencies-list';
 import StoreSettings from '../store-settings';
 
diff --git a/client/multi-currency/single-currency-settings/constants.js b/multi-currency/client/settings/single-currency/constants.js
similarity index 100%
rename from client/multi-currency/single-currency-settings/constants.js
rename to multi-currency/client/settings/single-currency/constants.js
diff --git a/client/multi-currency/single-currency-settings/currency-preview.js b/multi-currency/client/settings/single-currency/currency-preview.js
similarity index 96%
rename from client/multi-currency/single-currency-settings/currency-preview.js
rename to multi-currency/client/settings/single-currency/currency-preview.js
index 952bc537363..8f16f4c5596 100644
--- a/client/multi-currency/single-currency-settings/currency-preview.js
+++ b/multi-currency/client/settings/single-currency/currency-preview.js
@@ -6,7 +6,10 @@ import React, { useCallback, useEffect, useState } from 'react';
 import { __ } from '@wordpress/i18n';
 import { Card, CardBody } from '@wordpress/components';
 import { TextControlWithAffixes } from '@woocommerce/components';
-import { formatCurrency, isZeroDecimalCurrency } from 'wcpay/utils/currency';
+import {
+	formatCurrency,
+	isZeroDecimalCurrency,
+} from 'multi-currency/utils/currency';
 
 const CurrencyPreview = ( {
 	storeCurrency,
diff --git a/client/multi-currency/single-currency-settings/index.js b/multi-currency/client/settings/single-currency/index.js
similarity index 98%
rename from client/multi-currency/single-currency-settings/index.js
rename to multi-currency/client/settings/single-currency/index.js
index 213409c9f47..14a3560f14d 100644
--- a/client/multi-currency/single-currency-settings/index.js
+++ b/multi-currency/client/settings/single-currency/index.js
@@ -5,8 +5,6 @@
 import React, { useContext, useEffect, useState } from 'react';
 import { dateI18n } from '@wordpress/date';
 import { sprintf, __ } from '@wordpress/i18n';
-import SettingsLayout from 'wcpay/settings/settings-layout';
-import SettingsSection from 'wcpay/settings/settings-section';
 import moment from 'moment';
 
 /**
@@ -27,9 +25,13 @@ import {
 	useCurrencySettings,
 	useEnabledCurrencies,
 	useStoreSettings,
-} from 'wcpay/data';
-import MultiCurrencySettingsContext from '../context';
-import { LoadableBlock } from 'wcpay/components/loadable';
+} from 'multi-currency/data';
+import MultiCurrencySettingsContext from 'multi-currency/context';
+import {
+	LoadableBlock,
+	SettingsLayout,
+	SettingsSection,
+} from 'multi-currency/interface/components';
 
 const SingleCurrencySettings = () => {
 	const {
diff --git a/client/multi-currency/single-currency-settings/style.scss b/multi-currency/client/settings/single-currency/style.scss
similarity index 100%
rename from client/multi-currency/single-currency-settings/style.scss
rename to multi-currency/client/settings/single-currency/style.scss
diff --git a/client/multi-currency/single-currency-settings/test/__snapshots__/index.test.js.snap b/multi-currency/client/settings/single-currency/test/__snapshots__/index.test.js.snap
similarity index 100%
rename from client/multi-currency/single-currency-settings/test/__snapshots__/index.test.js.snap
rename to multi-currency/client/settings/single-currency/test/__snapshots__/index.test.js.snap
diff --git a/client/multi-currency/single-currency-settings/test/index.test.js b/multi-currency/client/settings/single-currency/test/index.test.js
similarity index 97%
rename from client/multi-currency/single-currency-settings/test/index.test.js
rename to multi-currency/client/settings/single-currency/test/index.test.js
index 5f2597dff2c..0559953e54b 100644
--- a/client/multi-currency/single-currency-settings/test/index.test.js
+++ b/multi-currency/client/settings/single-currency/test/index.test.js
@@ -15,11 +15,11 @@ import {
 	useEnabledCurrencies,
 	useCurrencySettings,
 	useStoreSettings,
-} from 'wcpay/data';
+} from 'multi-currency/data';
 
-import MultiCurrencySettingsContext from '../../context';
+import MultiCurrencySettingsContext from 'multi-currency/context';
 
-jest.mock( 'wcpay/data', () => ( {
+jest.mock( 'multi-currency/data', () => ( {
 	useCurrencies: jest.fn(),
 	useAvailableCurrencies: jest.fn(),
 	useDefaultCurrency: jest.fn(),
diff --git a/client/multi-currency-setup/index.js b/multi-currency/client/setup/index.js
similarity index 77%
rename from client/multi-currency-setup/index.js
rename to multi-currency/client/setup/index.js
index 512ab078182..05e76eb67ce 100644
--- a/client/multi-currency-setup/index.js
+++ b/multi-currency/client/setup/index.js
@@ -3,9 +3,9 @@
 /**
  * Internal dependencies
  */
-import Page from 'components/page';
 import MultiCurrencySetup from './tasks/multi-currency-setup';
-import WCPaySettingsContext from '../settings/wcpay-settings-context';
+import { Page } from 'multi-currency/interface/components';
+import { WCPaySettingsContext } from 'multi-currency/interface/functions';
 
 const MultiCurrencySetupPage = () => {
 	const { isSetupCompleted } = window.wcpaySettings.multiCurrencySetup;
diff --git a/client/multi-currency-setup/tasks/add-currencies-task/constants.js b/multi-currency/client/setup/tasks/add-currencies-task/constants.js
similarity index 100%
rename from client/multi-currency-setup/tasks/add-currencies-task/constants.js
rename to multi-currency/client/setup/tasks/add-currencies-task/constants.js
diff --git a/client/multi-currency-setup/tasks/add-currencies-task/index.js b/multi-currency/client/setup/tasks/add-currencies-task/index.js
similarity index 93%
rename from client/multi-currency-setup/tasks/add-currencies-task/index.js
rename to multi-currency/client/setup/tasks/add-currencies-task/index.js
index 1795edaa6a0..f33fb5e95a3 100644
--- a/client/multi-currency-setup/tasks/add-currencies-task/index.js
+++ b/multi-currency/client/setup/tasks/add-currencies-task/index.js
@@ -10,23 +10,24 @@ import _ from 'lodash';
 /**
  * Internal dependencies
  */
-import WizardTaskContext from '../../../additional-methods-setup/wizard/task/context';
-import CollapsibleBody from '../../../additional-methods-setup/wizard/collapsible-body';
-import WizardTaskItem from '../../wizard/task-item';
+import { WizardTaskContext } from 'multi-currency/interface/functions';
+import Search from 'multi-currency/components/search';
+import {
+	CollapsibleBody,
+	LoadableBlock,
+	WizardTaskItem,
+} from 'multi-currency/interface/components';
 
 import {
 	useCurrencies,
 	useAvailableCurrencies,
 	useEnabledCurrencies,
 	useDefaultCurrency,
-} from 'wcpay/data';
+} from 'multi-currency/data';
 
 // eslint-disable-next-line max-len
-import EnabledCurrenciesModalCheckboxList from '../../../multi-currency/multi-currency-settings/enabled-currencies-list/modal-checkbox-list';
-import EnabledCurrenciesModalCheckbox from '../../../multi-currency/multi-currency-settings/enabled-currencies-list/modal-checkbox';
-import Search from 'components/search';
-
-import { LoadableBlock } from '../../../components/loadable';
+import EnabledCurrenciesModalCheckboxList from 'multi-currency/settings/multi-currency/enabled-currencies-list/modal-checkbox-list';
+import EnabledCurrenciesModalCheckbox from 'multi-currency/settings/multi-currency/enabled-currencies-list/modal-checkbox';
 
 import { recommendedCurrencyCodes, numberWords } from './constants';
 import {
diff --git a/client/multi-currency-setup/tasks/add-currencies-task/index.scss b/multi-currency/client/setup/tasks/add-currencies-task/index.scss
similarity index 100%
rename from client/multi-currency-setup/tasks/add-currencies-task/index.scss
rename to multi-currency/client/setup/tasks/add-currencies-task/index.scss
diff --git a/client/multi-currency-setup/tasks/add-currencies-task/test/__snapshots__/index.test.js.snap b/multi-currency/client/setup/tasks/add-currencies-task/test/__snapshots__/index.test.js.snap
similarity index 100%
rename from client/multi-currency-setup/tasks/add-currencies-task/test/__snapshots__/index.test.js.snap
rename to multi-currency/client/setup/tasks/add-currencies-task/test/__snapshots__/index.test.js.snap
diff --git a/client/multi-currency-setup/tasks/add-currencies-task/test/index.test.js b/multi-currency/client/setup/tasks/add-currencies-task/test/index.test.js
similarity index 97%
rename from client/multi-currency-setup/tasks/add-currencies-task/test/index.test.js
rename to multi-currency/client/setup/tasks/add-currencies-task/test/index.test.js
index f58beb09ced..7041543dadc 100644
--- a/client/multi-currency-setup/tasks/add-currencies-task/test/index.test.js
+++ b/multi-currency/client/setup/tasks/add-currencies-task/test/index.test.js
@@ -9,23 +9,25 @@ import { useSelect } from '@wordpress/data';
  * Internal dependencies
  */
 import AddCurrenciesTask from '..';
+import { useSettings } from 'multi-currency/interface/data';
+import { WizardTaskContext } from 'multi-currency/interface/functions';
 import {
 	useCurrencies,
 	useAvailableCurrencies,
 	useDefaultCurrency,
 	useEnabledCurrencies,
-	useSettings,
-} from 'wcpay/data';
+} from 'multi-currency/data';
 
-import WizardTaskContext from '../../../../additional-methods-setup/wizard/task/context';
 import { recommendedCurrencyCodes } from '../constants';
 import { __ } from '@wordpress/i18n';
 
-jest.mock( 'wcpay/data', () => ( {
+jest.mock( 'multi-currency/data', () => ( {
 	useCurrencies: jest.fn(),
 	useAvailableCurrencies: jest.fn(),
 	useDefaultCurrency: jest.fn(),
 	useEnabledCurrencies: jest.fn(),
+} ) );
+jest.mock( 'multi-currency/interface/data', () => ( {
 	useSettings: jest.fn(),
 } ) );
 
diff --git a/client/multi-currency-setup/tasks/add-currencies-task/test/utils.test.js b/multi-currency/client/setup/tasks/add-currencies-task/test/utils.test.js
similarity index 100%
rename from client/multi-currency-setup/tasks/add-currencies-task/test/utils.test.js
rename to multi-currency/client/setup/tasks/add-currencies-task/test/utils.test.js
diff --git a/client/multi-currency-setup/tasks/add-currencies-task/utils.js b/multi-currency/client/setup/tasks/add-currencies-task/utils.js
similarity index 100%
rename from client/multi-currency-setup/tasks/add-currencies-task/utils.js
rename to multi-currency/client/setup/tasks/add-currencies-task/utils.js
diff --git a/client/multi-currency-setup/tasks/multi-currency-setup.js b/multi-currency/client/setup/tasks/multi-currency-setup.js
similarity index 84%
rename from client/multi-currency-setup/tasks/multi-currency-setup.js
rename to multi-currency/client/setup/tasks/multi-currency-setup.js
index 77263d9bf33..cbeb6387bda 100644
--- a/client/multi-currency-setup/tasks/multi-currency-setup.js
+++ b/multi-currency/client/setup/tasks/multi-currency-setup.js
@@ -7,9 +7,11 @@ import { Card, CardBody } from '@wordpress/components';
 /**
  * Internal dependencies
  */
-import Wizard from '../../additional-methods-setup/wizard/wrapper';
-import WizardTask from '../../additional-methods-setup/wizard/task';
-import WizardTaskList from '../../additional-methods-setup/wizard/task-list';
+import {
+	Wizard,
+	WizardTask,
+	WizardTaskList,
+} from 'multi-currency/interface/components';
 import StoreSettingsTask from './store-settings-task';
 import SetupCompleteTask from './setup-complete-task';
 import AddCurrenciesTask from './add-currencies-task';
diff --git a/client/multi-currency-setup/tasks/multi-currency-setup.scss b/multi-currency/client/setup/tasks/multi-currency-setup.scss
similarity index 100%
rename from client/multi-currency-setup/tasks/multi-currency-setup.scss
rename to multi-currency/client/setup/tasks/multi-currency-setup.scss
diff --git a/client/multi-currency-setup/tasks/setup-complete-task/index.js b/multi-currency/client/setup/tasks/setup-complete-task/index.js
similarity index 89%
rename from client/multi-currency-setup/tasks/setup-complete-task/index.js
rename to multi-currency/client/setup/tasks/setup-complete-task/index.js
index e846498df0e..6c467ec3a08 100644
--- a/client/multi-currency-setup/tasks/setup-complete-task/index.js
+++ b/multi-currency/client/setup/tasks/setup-complete-task/index.js
@@ -10,13 +10,15 @@ import { useDispatch } from '@wordpress/data';
 /**
  * Internal dependencies
  */
-import CollapsibleBody from '../../../additional-methods-setup/wizard/collapsible-body';
-import WizardTaskItem from '../../wizard/task-item';
-import WizardTaskContext from '../../../additional-methods-setup/wizard/task/context';
+import {
+	CollapsibleBody,
+	WizardTaskItem,
+} from 'multi-currency/interface/components';
+import { WizardTaskContext } from 'multi-currency/interface/functions';
 
 import './index.scss';
 
-import { useDefaultCurrency } from 'wcpay/data';
+import { useDefaultCurrency } from 'multi-currency/data';
 
 const SetupComplete = () => {
 	const { isActive } = useContext( WizardTaskContext );
diff --git a/client/multi-currency-setup/tasks/setup-complete-task/index.scss b/multi-currency/client/setup/tasks/setup-complete-task/index.scss
similarity index 100%
rename from client/multi-currency-setup/tasks/setup-complete-task/index.scss
rename to multi-currency/client/setup/tasks/setup-complete-task/index.scss
diff --git a/client/multi-currency-setup/tasks/setup-complete-task/test/index.test.js b/multi-currency/client/setup/tasks/setup-complete-task/test/index.test.js
similarity index 87%
rename from client/multi-currency-setup/tasks/setup-complete-task/test/index.test.js
rename to multi-currency/client/setup/tasks/setup-complete-task/test/index.test.js
index 48c4ac16d7a..a7a9db81872 100644
--- a/client/multi-currency-setup/tasks/setup-complete-task/test/index.test.js
+++ b/multi-currency/client/setup/tasks/setup-complete-task/test/index.test.js
@@ -6,14 +6,15 @@ import { render } from '@testing-library/react';
 /**
  * Internal dependencies
  */
-import WizardTaskContext from '../../../../additional-methods-setup/wizard/task/context';
+import { WizardTaskContext } from 'multi-currency/interface/functions';
 import SetupCompleteTask from '../../setup-complete-task';
 
 jest.mock( '@wordpress/data', () => ( {
 	useDispatch: jest.fn().mockReturnValue( { updateOptions: jest.fn() } ),
 } ) );
 
-jest.mock( 'wcpay/data', () => ( {
+jest.mock( 'multi-currency/interface/data', () => ( {} ) );
+jest.mock( 'multi-currency/data', () => ( {
 	useDefaultCurrency: jest.fn().mockReturnValue( {
 		code: 'USD',
 		rate: 1,
diff --git a/client/multi-currency-setup/tasks/store-settings-task/index.js b/multi-currency/client/setup/tasks/store-settings-task/index.js
similarity index 92%
rename from client/multi-currency-setup/tasks/store-settings-task/index.js
rename to multi-currency/client/setup/tasks/store-settings-task/index.js
index 7e20fc0f3e4..9a3ca8f0666 100644
--- a/client/multi-currency-setup/tasks/store-settings-task/index.js
+++ b/multi-currency/client/setup/tasks/store-settings-task/index.js
@@ -9,13 +9,16 @@ import interpolateComponents from '@automattic/interpolate-components';
 /**
  * Internal dependencies
  */
-import WizardTaskContext from '../../../additional-methods-setup/wizard/task/context';
-import CollapsibleBody from '../../../additional-methods-setup/wizard/collapsible-body';
-import WizardTaskItem from '../../wizard/task-item';
-import PreviewModal from '../../../multi-currency/preview-modal';
+import {
+	CollapsibleBody,
+	WizardTaskItem,
+} from 'multi-currency/interface/components';
+import { WizardTaskContext } from 'multi-currency/interface/functions';
+import { useSettings, useMultiCurrency } from 'multi-currency/interface/data';
+import PreviewModal from 'multi-currency/components/preview-modal';
 import './index.scss';
 
-import { useStoreSettings, useSettings, useMultiCurrency } from 'wcpay/data';
+import { useStoreSettings } from 'multi-currency/data';
 
 const StoreSettingsTask = () => {
 	const { storeSettings, submitStoreSettingsUpdate } = useStoreSettings();
diff --git a/client/multi-currency-setup/tasks/store-settings-task/index.scss b/multi-currency/client/setup/tasks/store-settings-task/index.scss
similarity index 100%
rename from client/multi-currency-setup/tasks/store-settings-task/index.scss
rename to multi-currency/client/setup/tasks/store-settings-task/index.scss
diff --git a/client/multi-currency-setup/tasks/store-settings-task/test/__snapshots__/index.test.js.snap b/multi-currency/client/setup/tasks/store-settings-task/test/__snapshots__/index.test.js.snap
similarity index 100%
rename from client/multi-currency-setup/tasks/store-settings-task/test/__snapshots__/index.test.js.snap
rename to multi-currency/client/setup/tasks/store-settings-task/test/__snapshots__/index.test.js.snap
diff --git a/client/multi-currency-setup/tasks/store-settings-task/test/index.test.js b/multi-currency/client/setup/tasks/store-settings-task/test/index.test.js
similarity index 92%
rename from client/multi-currency-setup/tasks/store-settings-task/test/index.test.js
rename to multi-currency/client/setup/tasks/store-settings-task/test/index.test.js
index e81b7b08f99..d80e8f8d12a 100644
--- a/client/multi-currency-setup/tasks/store-settings-task/test/index.test.js
+++ b/multi-currency/client/setup/tasks/store-settings-task/test/index.test.js
@@ -7,21 +7,21 @@ import { render, screen, fireEvent } from '@testing-library/react';
 /**
  * Internal dependencies
  */
-import WizardTaskContext from '../../../../additional-methods-setup/wizard/task/context';
-import {
-	useCurrencies,
-	useStoreSettings,
-	useSettings,
-	useMultiCurrency,
-} from 'wcpay/data';
+import { useCurrencies, useStoreSettings } from 'multi-currency/data';
+import { useSettings, useMultiCurrency } from 'multi-currency/interface/data';
+import { WizardTaskContext } from 'multi-currency/interface/functions';
 import StoreSettingsTask from '..';
 
-jest.mock( 'wcpay/data', () => ( {
+jest.mock( 'multi-currency/data', () => ( {
 	useStoreSettings: jest.fn(),
 	useCurrencies: jest.fn(),
 	useSettings: jest.fn(),
 	useMultiCurrency: jest.fn(),
 } ) );
+jest.mock( 'multi-currency/interface/data', () => ( {
+	useSettings: jest.fn(),
+	useMultiCurrency: jest.fn(),
+} ) );
 
 const changeableSettings = [
 	'enable_storefront_switcher',
diff --git a/client/multi-currency-setup/tasks/test/__snapshots__/multi-currency-setup.test.js.snap b/multi-currency/client/setup/tasks/test/__snapshots__/multi-currency-setup.test.js.snap
similarity index 100%
rename from client/multi-currency-setup/tasks/test/__snapshots__/multi-currency-setup.test.js.snap
rename to multi-currency/client/setup/tasks/test/__snapshots__/multi-currency-setup.test.js.snap
diff --git a/client/multi-currency-setup/tasks/test/multi-currency-setup.test.js b/multi-currency/client/setup/tasks/test/multi-currency-setup.test.js
similarity index 100%
rename from client/multi-currency-setup/tasks/test/multi-currency-setup.test.js
rename to multi-currency/client/setup/tasks/test/multi-currency-setup.test.js
diff --git a/client/multi-currency-setup/test/index.js b/multi-currency/client/setup/test/index.js
similarity index 100%
rename from client/multi-currency-setup/test/index.js
rename to multi-currency/client/setup/test/index.js
diff --git a/client/utils/currency/index.js b/multi-currency/client/utils/currency/index.js
similarity index 100%
rename from client/utils/currency/index.js
rename to multi-currency/client/utils/currency/index.js
diff --git a/client/utils/currency/test/index.js b/multi-currency/client/utils/currency/test/index.js
similarity index 98%
rename from client/utils/currency/test/index.js
rename to multi-currency/client/utils/currency/test/index.js
index 25e67b62c3c..0a08bbdd7db 100644
--- a/client/utils/currency/test/index.js
+++ b/multi-currency/client/utils/currency/test/index.js
@@ -6,7 +6,7 @@
 /**
  * Internal dependencies
  */
-import * as utils from 'utils/currency';
+import * as utils from 'multi-currency/utils/currency';
 
 describe( 'Currency utilities', () => {
 	beforeEach( () => {
diff --git a/client/multi-currency/__tests__/missing-currencies-message.test.js b/multi-currency/client/utils/missing-currencies-message/__tests__/index.test.js
similarity index 89%
rename from client/multi-currency/__tests__/missing-currencies-message.test.js
rename to multi-currency/client/utils/missing-currencies-message/__tests__/index.test.js
index ac74c4ee517..bd7fcff7840 100644
--- a/client/multi-currency/__tests__/missing-currencies-message.test.js
+++ b/multi-currency/client/utils/missing-currencies-message/__tests__/index.test.js
@@ -1,7 +1,7 @@
 /**
  * Internal dependencies
  */
-import { getMissingCurrenciesTooltipMessage } from '../missing-currencies-message';
+import { getMissingCurrenciesTooltipMessage } from 'multi-currency/utils/missing-currencies-message';
 
 describe( 'getMissingCurrenciesTooltipMessage', () => {
 	it( 'returns correct string with the given LPM label and currency list', () => {
diff --git a/client/multi-currency/missing-currencies-message.ts b/multi-currency/client/utils/missing-currencies-message/index.ts
similarity index 91%
rename from client/multi-currency/missing-currencies-message.ts
rename to multi-currency/client/utils/missing-currencies-message/index.ts
index 514ccff973d..b6e68116479 100644
--- a/client/multi-currency/missing-currencies-message.ts
+++ b/multi-currency/client/utils/missing-currencies-message/index.ts
@@ -6,7 +6,7 @@ import { sprintf, _n } from '@wordpress/i18n';
 /**
  * Internal dependencies
  */
-import { formatListOfItems } from 'wcpay/utils/format-list-of-items';
+import { formatListOfItems } from 'multi-currency/interface/functions';
 
 export const getMissingCurrenciesTooltipMessage = (
 	paymentMethodLabel: string,
diff --git a/includes/multi-currency/AdminNotices.php b/multi-currency/src/AdminNotices.php
similarity index 100%
rename from includes/multi-currency/AdminNotices.php
rename to multi-currency/src/AdminNotices.php
diff --git a/includes/multi-currency/Analytics.php b/multi-currency/src/Analytics.php
similarity index 96%
rename from includes/multi-currency/Analytics.php
rename to multi-currency/src/Analytics.php
index ef3f5b17a5a..822ba88efc5 100644
--- a/includes/multi-currency/Analytics.php
+++ b/multi-currency/src/Analytics.php
@@ -12,7 +12,7 @@
 use Automattic\WooCommerce\Utilities\OrderUtil;
 use WC_Order;
 use WC_Order_Refund;
-use WC_Payments;
+use WCPay\MultiCurrency\Interfaces\MultiCurrencySettingsInterface;
 
 defined( 'ABSPATH' ) || exit;
 
@@ -42,13 +42,22 @@ class Analytics {
 	 */
 	private $multi_currency;
 
+	/**
+	 * Instance of MultiCurrencySettingsInterface.
+	 *
+	 * @var MultiCurrencySettingsInterface $settings_service
+	 */
+	private $settings_service;
+
 	/**
 	 * Constructor
 	 *
-	 * @param MultiCurrency $multi_currency Instance of MultiCurrency.
+	 * @param MultiCurrency                  $multi_currency   Instance of MultiCurrency.
+	 * @param MultiCurrencySettingsInterface $settings_service Instance of MultiCurrencySettingsInterface.
 	 */
-	public function __construct( MultiCurrency $multi_currency ) {
-		$this->multi_currency = $multi_currency;
+	public function __construct( MultiCurrency $multi_currency, MultiCurrencySettingsInterface $settings_service ) {
+		$this->multi_currency   = $multi_currency;
+		$this->settings_service = $settings_service;
 		$this->init();
 	}
 
@@ -63,7 +72,7 @@ public function init() {
 			$this->register_customer_currencies();
 		}
 
-		if ( WC_Payments::mode()->is_dev() ) {
+		if ( $this->settings_service->is_dev_mode() ) {
 			add_filter( 'woocommerce_analytics_report_should_use_cache', [ $this, 'disable_report_caching' ] );
 		}
 
@@ -105,7 +114,7 @@ public function init() {
 	 * @return void
 	 */
 	public function register_admin_scripts() {
-		WC_Payments::register_script_with_dependencies( self::SCRIPT_NAME, 'dist/multi-currency-analytics' );
+		$this->multi_currency->register_script_with_dependencies( self::SCRIPT_NAME, 'dist/multi-currency-analytics' );
 	}
 
 	/**
diff --git a/includes/multi-currency/BackendCurrencies.php b/multi-currency/src/BackendCurrencies.php
similarity index 91%
rename from includes/multi-currency/BackendCurrencies.php
rename to multi-currency/src/BackendCurrencies.php
index 9ea009ac4c4..bdb2da92b72 100644
--- a/includes/multi-currency/BackendCurrencies.php
+++ b/multi-currency/src/BackendCurrencies.php
@@ -7,7 +7,7 @@
 
 namespace WCPay\MultiCurrency;
 
-use WC_Payments_Localization_Service;
+use WCPay\MultiCurrency\Interfaces\MultiCurrencyLocalizationInterface;
 
 defined( 'ABSPATH' ) || exit;
 
@@ -23,9 +23,9 @@ class BackendCurrencies {
 	protected $multi_currency;
 
 	/**
-	 * WC_Payments_Localization_Service instance.
+	 * MultiCurrencyLocalizationInterface instance.
 	 *
-	 * @var WC_Payments_Localization_Service
+	 * @var MultiCurrencyLocalizationInterface
 	 */
 	protected $localization_service;
 
@@ -39,10 +39,10 @@ class BackendCurrencies {
 	/**
 	 * Constructor.
 	 *
-	 * @param MultiCurrency                    $multi_currency       The MultiCurrency instance.
-	 * @param WC_Payments_Localization_Service $localization_service The Localization Service instance.
+	 * @param MultiCurrency                      $multi_currency       The MultiCurrency instance.
+	 * @param MultiCurrencyLocalizationInterface $localization_service The Localization Service instance.
 	 */
-	public function __construct( MultiCurrency $multi_currency, WC_Payments_Localization_Service $localization_service ) {
+	public function __construct( MultiCurrency $multi_currency, MultiCurrencyLocalizationInterface $localization_service ) {
 		$this->multi_currency       = $multi_currency;
 		$this->localization_service = $localization_service;
 	}
diff --git a/includes/multi-currency/Compatibility.php b/multi-currency/src/Compatibility.php
similarity index 99%
rename from includes/multi-currency/Compatibility.php
rename to multi-currency/src/Compatibility.php
index 4f60915fb97..87e10cbde78 100644
--- a/includes/multi-currency/Compatibility.php
+++ b/multi-currency/src/Compatibility.php
@@ -7,8 +7,6 @@
 
 namespace WCPay\MultiCurrency;
 
-use WC_Deposits;
-use WC_Deposits_Product_Manager;
 use WC_Order;
 use WC_Order_Refund;
 use WCPay\MultiCurrency\Compatibility\BaseCompatibility;
@@ -41,7 +39,7 @@ class Compatibility extends BaseCompatibility {
 	 *
 	 * @return void
 	 */
-	protected function init() {
+	public function init() {
 		add_action( 'init', [ $this, 'init_compatibility_classes' ], 11 );
 
 		if ( defined( 'DOING_CRON' ) ) {
diff --git a/includes/multi-currency/Compatibility/BaseCompatibility.php b/multi-currency/src/Compatibility/BaseCompatibility.php
similarity index 95%
rename from includes/multi-currency/Compatibility/BaseCompatibility.php
rename to multi-currency/src/Compatibility/BaseCompatibility.php
index a98073fd113..3e7d1a67a20 100644
--- a/includes/multi-currency/Compatibility/BaseCompatibility.php
+++ b/multi-currency/src/Compatibility/BaseCompatibility.php
@@ -46,5 +46,5 @@ public function __construct( MultiCurrency $multi_currency, Utils $utils ) {
 	 *
 	 * @return void
 	 */
-	abstract protected function init();
+	abstract public function init();
 }
diff --git a/includes/multi-currency/Compatibility/WooCommerceBookings.php b/multi-currency/src/Compatibility/WooCommerceBookings.php
similarity index 99%
rename from includes/multi-currency/Compatibility/WooCommerceBookings.php
rename to multi-currency/src/Compatibility/WooCommerceBookings.php
index 5a99534e5d6..756e4eef355 100644
--- a/includes/multi-currency/Compatibility/WooCommerceBookings.php
+++ b/multi-currency/src/Compatibility/WooCommerceBookings.php
@@ -39,7 +39,7 @@ public function __construct( MultiCurrency $multi_currency, Utils $utils, Fronte
 	 *
 	 * @return void
 	 */
-	protected function init() {
+	public function init() {
 		// Add needed actions and filters if Bookings is active.
 		if ( class_exists( 'WC_Bookings' ) ) {
 			if ( ! is_admin() || wp_doing_ajax() ) {
diff --git a/includes/multi-currency/Compatibility/WooCommerceDeposits.php b/multi-currency/src/Compatibility/WooCommerceDeposits.php
similarity index 99%
rename from includes/multi-currency/Compatibility/WooCommerceDeposits.php
rename to multi-currency/src/Compatibility/WooCommerceDeposits.php
index f92819785c5..e2ffa89d441 100644
--- a/includes/multi-currency/Compatibility/WooCommerceDeposits.php
+++ b/multi-currency/src/Compatibility/WooCommerceDeposits.php
@@ -20,7 +20,7 @@ class WooCommerceDeposits extends BaseCompatibility {
 	 *
 	 * @return void
 	 */
-	protected function init() {
+	public function init() {
 		if ( class_exists( 'WC_Deposits' ) ) {
 			/*
 			 * Multi-currency support was added to WooCommerce Deposits in version 2.0.1.
diff --git a/includes/multi-currency/Compatibility/WooCommerceFedEx.php b/multi-currency/src/Compatibility/WooCommerceFedEx.php
similarity index 97%
rename from includes/multi-currency/Compatibility/WooCommerceFedEx.php
rename to multi-currency/src/Compatibility/WooCommerceFedEx.php
index 738e738150f..8a38d058e40 100644
--- a/includes/multi-currency/Compatibility/WooCommerceFedEx.php
+++ b/multi-currency/src/Compatibility/WooCommerceFedEx.php
@@ -20,7 +20,7 @@ class WooCommerceFedEx extends BaseCompatibility {
 	 *
 	 * @return void
 	 */
-	protected function init() {
+	public function init() {
 		// Add needed actions and filters if FedEx is active.
 		if ( class_exists( 'WC_Shipping_Fedex_Init' ) ) {
 			add_filter( MultiCurrency::FILTER_PREFIX . 'should_return_store_currency', [ $this, 'should_return_store_currency' ] );
diff --git a/includes/multi-currency/Compatibility/WooCommerceNameYourPrice.php b/multi-currency/src/Compatibility/WooCommerceNameYourPrice.php
similarity index 99%
rename from includes/multi-currency/Compatibility/WooCommerceNameYourPrice.php
rename to multi-currency/src/Compatibility/WooCommerceNameYourPrice.php
index 155f99e1a4d..fad352e1d1f 100644
--- a/includes/multi-currency/Compatibility/WooCommerceNameYourPrice.php
+++ b/multi-currency/src/Compatibility/WooCommerceNameYourPrice.php
@@ -21,7 +21,7 @@ class WooCommerceNameYourPrice extends BaseCompatibility {
 	 *
 	 * @return  void
 	 */
-	protected function init() {
+	public function init() {
 		// Add needed actions and filters if Name Your Price is active.
 		if ( class_exists( 'WC_Name_Your_Price' ) ) {
 			// Convert meta prices.
diff --git a/includes/multi-currency/Compatibility/WooCommercePointsAndRewards.php b/multi-currency/src/Compatibility/WooCommercePointsAndRewards.php
similarity index 98%
rename from includes/multi-currency/Compatibility/WooCommercePointsAndRewards.php
rename to multi-currency/src/Compatibility/WooCommercePointsAndRewards.php
index 9d78886eb41..38819d15322 100644
--- a/includes/multi-currency/Compatibility/WooCommercePointsAndRewards.php
+++ b/multi-currency/src/Compatibility/WooCommercePointsAndRewards.php
@@ -33,7 +33,7 @@ class WooCommercePointsAndRewards extends BaseCompatibility {
 	 *
 	 * @return  void
 	 */
-	protected function init() {
+	public function init() {
 		// Add needed filters if Points & Rewards is active and it's not an admin request.
 		if ( is_admin() || ! class_exists( 'WC_Points_Rewards' ) ) {
 			return;
diff --git a/includes/multi-currency/Compatibility/WooCommercePreOrders.php b/multi-currency/src/Compatibility/WooCommercePreOrders.php
similarity index 96%
rename from includes/multi-currency/Compatibility/WooCommercePreOrders.php
rename to multi-currency/src/Compatibility/WooCommercePreOrders.php
index 3c3fe9d5efc..b16dd91b646 100644
--- a/includes/multi-currency/Compatibility/WooCommercePreOrders.php
+++ b/multi-currency/src/Compatibility/WooCommercePreOrders.php
@@ -20,7 +20,7 @@ class WooCommercePreOrders extends BaseCompatibility {
 	 *
 	 * @return  void
 	 */
-	protected function init() {
+	public function init() {
 		// Add needed actions and filters if Pre-Orders is active.
 		if ( class_exists( 'WC_Pre_Orders' ) ) {
 			add_filter( 'wc_pre_orders_fee', [ $this, 'wc_pre_orders_fee' ] );
diff --git a/includes/multi-currency/Compatibility/WooCommerceProductAddOns.php b/multi-currency/src/Compatibility/WooCommerceProductAddOns.php
similarity index 99%
rename from includes/multi-currency/Compatibility/WooCommerceProductAddOns.php
rename to multi-currency/src/Compatibility/WooCommerceProductAddOns.php
index 7d245cd4e4f..add583059f8 100644
--- a/includes/multi-currency/Compatibility/WooCommerceProductAddOns.php
+++ b/multi-currency/src/Compatibility/WooCommerceProductAddOns.php
@@ -23,7 +23,7 @@ class WooCommerceProductAddOns extends BaseCompatibility {
 	 *
 	 * @return  void
 	 */
-	protected function init() {
+	public function init() {
 		// Add needed actions and filters if Product Add Ons is active.
 		if ( class_exists( 'WC_Product_Addons' ) ) {
 			if ( ! is_admin() && ! defined( 'DOING_CRON' ) ) {
diff --git a/includes/multi-currency/Compatibility/WooCommerceSubscriptions.php b/multi-currency/src/Compatibility/WooCommerceSubscriptions.php
similarity index 97%
rename from includes/multi-currency/Compatibility/WooCommerceSubscriptions.php
rename to multi-currency/src/Compatibility/WooCommerceSubscriptions.php
index 94294827ea9..6701f6739dd 100644
--- a/includes/multi-currency/Compatibility/WooCommerceSubscriptions.php
+++ b/multi-currency/src/Compatibility/WooCommerceSubscriptions.php
@@ -7,10 +7,8 @@
 
 namespace WCPay\MultiCurrency\Compatibility;
 
-use WC_Payments_Explicit_Price_Formatter;
-use WC_Payments_Features;
 use WC_Subscription;
-use WCPay\Logger;
+use WCPay\MultiCurrency\Logger;
 use WCPay\MultiCurrency\FrontendCurrencies;
 use WCPay\MultiCurrency\MultiCurrency;
 
@@ -61,9 +59,9 @@ class WooCommerceSubscriptions extends BaseCompatibility {
 	 *
 	 * @return  void
 	 */
-	protected function init() {
+	public function init() {
 		// Add needed actions and filters if WC Subscriptions or WCPay Subscriptions are active.
-		if ( class_exists( 'WC_Subscriptions' ) || WC_Payments_Features::is_wcpay_subscriptions_enabled() ) {
+		if ( class_exists( 'WC_Subscriptions' ) || class_exists( 'WC_Payments_Subscriptions' ) ) {
 			if ( ! is_admin() && ! defined( 'DOING_CRON' ) ) {
 				$this->frontend_currencies = $this->multi_currency->get_frontend_currencies();
 
@@ -393,6 +391,10 @@ public function maybe_get_explicit_format_for_subscription_total( $html_price, $
 			return $html_price;
 		}
 
+		if ( ! $this->multi_currency->has_additional_currencies_enabled() ) {
+			return $html_price;
+		}
+
 		/**
 		 * Get the currency code from the subscription, then return the explicit price.
 		 * Tell Psalm to ignore the WC_Subscription class, this class is only loaded if Subscriptions is active.
@@ -400,7 +402,15 @@ public function maybe_get_explicit_format_for_subscription_total( $html_price, $
 		 * @psalm-suppress UndefinedDocblockClass
 		 */
 		$currency_code = $this->current_my_account_subscription->get_currency() ?? get_woocommerce_currency();
-		return WC_Payments_Explicit_Price_Formatter::get_explicit_price_with_currency( $html_price, $currency_code );
+
+		// This is sourced from WC_Payments_Explicit_Price_Formatter::get_explicit_price_with_currency.
+		$price_to_check = html_entity_decode( wp_strip_all_tags( $html_price ) );
+
+		if ( false === strpos( $price_to_check, trim( $currency_code ) ) ) {
+			return $html_price . ' ' . $currency_code;
+		}
+
+		return $html_price;
 	}
 
 	/**
diff --git a/includes/multi-currency/Compatibility/WooCommerceUPS.php b/multi-currency/src/Compatibility/WooCommerceUPS.php
similarity index 97%
rename from includes/multi-currency/Compatibility/WooCommerceUPS.php
rename to multi-currency/src/Compatibility/WooCommerceUPS.php
index 6a53f47bff3..427aa060d52 100644
--- a/includes/multi-currency/Compatibility/WooCommerceUPS.php
+++ b/multi-currency/src/Compatibility/WooCommerceUPS.php
@@ -20,7 +20,7 @@ class WooCommerceUPS extends BaseCompatibility {
 	 *
 	 * @return  void
 	 */
-	protected function init() {
+	public function init() {
 		// Add needed actions and filters if UPS is active.
 		if ( class_exists( 'WC_Shipping_UPS_Init' ) ) {
 			add_filter( MultiCurrency::FILTER_PREFIX . 'should_return_store_currency', [ $this, 'should_return_store_currency' ] );
diff --git a/multi-currency/src/CountryFlags.php b/multi-currency/src/CountryFlags.php
new file mode 100644
index 00000000000..286e77dfbe2
--- /dev/null
+++ b/multi-currency/src/CountryFlags.php
@@ -0,0 +1,301 @@
+<?php
+/**
+ * Class CountryFlags
+ *
+ * @package WooCommerce\Payments
+ */
+
+namespace WCPay\MultiCurrency;
+
+defined( 'ABSPATH' ) || exit;
+
+/**
+ * Class that bring flags per country/currency.
+ */
+class CountryFlags {
+
+	const EMOJI_COUNTRIES_FLAGS = [
+		'AD' => '🇦🇩',
+		'AE' => '🇦🇪',
+		'AF' => '🇦🇫',
+		'AG' => '🇦🇬',
+		'AI' => '🇦🇮',
+		'AL' => '🇦🇱',
+		'AM' => '🇦🇲',
+		'AO' => '🇦🇴',
+		'AQ' => '🇦🇶',
+		'AR' => '🇦🇷',
+		'AS' => '🇦🇸',
+		'AT' => '🇦🇹',
+		'AU' => '🇦🇺',
+		'AW' => '🇦🇼',
+		'AX' => '🇦🇽',
+		'AZ' => '🇦🇿',
+		'BA' => '🇧🇦',
+		'BB' => '🇧🇧',
+		'BD' => '🇧🇩',
+		'BE' => '🇧🇪',
+		'BF' => '🇧🇫',
+		'BG' => '🇧🇬',
+		'BH' => '🇧🇭',
+		'BI' => '🇧🇮',
+		'BJ' => '🇧🇯',
+		'BL' => '🇧🇱',
+		'BM' => '🇧🇲',
+		'BN' => '🇧🇳',
+		'BO' => '🇧🇴',
+		'BQ' => '🇧🇶',
+		'BR' => '🇧🇷',
+		'BS' => '🇧🇸',
+		'BT' => '🇧🇹',
+		'BV' => '🇧🇻',
+		'BW' => '🇧🇼',
+		'BY' => '🇧🇾',
+		'BZ' => '🇧🇿',
+		'CA' => '🇨🇦',
+		'CC' => '🇨🇨',
+		'CD' => '🇨🇩',
+		'CF' => '🇨🇫',
+		'CG' => '🇨🇬',
+		'CH' => '🇨🇭',
+		'CI' => '🇨🇮',
+		'CK' => '🇨🇰',
+		'CL' => '🇨🇱',
+		'CM' => '🇨🇲',
+		'CN' => '🇨🇳',
+		'CO' => '🇨🇴',
+		'CR' => '🇨🇷',
+		'CU' => '🇨🇺',
+		'CV' => '🇨🇻',
+		'CW' => '🇨🇼',
+		'CX' => '🇨🇽',
+		'CY' => '🇨🇾',
+		'CZ' => '🇨🇿',
+		'DE' => '🇩🇪',
+		'DJ' => '🇩🇯',
+		'DK' => '🇩🇰',
+		'DM' => '🇩🇲',
+		'DO' => '🇩🇴',
+		'DZ' => '🇩🇿',
+		'EC' => '🇪🇨',
+		'EE' => '🇪🇪',
+		'EG' => '🇪🇬',
+		'EH' => '🇪🇭',
+		'ER' => '🇪🇷',
+		'ES' => '🇪🇸',
+		'ET' => '🇪🇹',
+		'EU' => '🇪🇺',
+		'FI' => '🇫🇮',
+		'FJ' => '🇫🇯',
+		'FK' => '🇫🇰',
+		'FM' => '🇫🇲',
+		'FO' => '🇫🇴',
+		'FR' => '🇫🇷',
+		'GA' => '🇬🇦',
+		'GB' => '🇬🇧',
+		'GD' => '🇬🇩',
+		'GE' => '🇬🇪',
+		'GF' => '🇬🇫',
+		'GG' => '🇬🇬',
+		'GH' => '🇬🇭',
+		'GI' => '🇬🇮',
+		'GL' => '🇬🇱',
+		'GM' => '🇬🇲',
+		'GN' => '🇬🇳',
+		'GP' => '🇬🇵',
+		'GQ' => '🇬🇶',
+		'GR' => '🇬🇷',
+		'GS' => '🇬🇸',
+		'GT' => '🇬🇹',
+		'GU' => '🇬🇺',
+		'GW' => '🇬🇼',
+		'GY' => '🇬🇾',
+		'HK' => '🇭🇰',
+		'HM' => '🇭🇲',
+		'HN' => '🇭🇳',
+		'HR' => '🇭🇷',
+		'HT' => '🇭🇹',
+		'HU' => '🇭🇺',
+		'ID' => '🇮🇩',
+		'IE' => '🇮🇪',
+		'IL' => '🇮🇱',
+		'IM' => '🇮🇲',
+		'IN' => '🇮🇳',
+		'IO' => '🇮🇴',
+		'IQ' => '🇮🇶',
+		'IR' => '🇮🇷',
+		'IS' => '🇮🇸',
+		'IT' => '🇮🇹',
+		'JE' => '🇯🇪',
+		'JM' => '🇯🇲',
+		'JO' => '🇯🇴',
+		'JP' => '🇯🇵',
+		'KE' => '🇰🇪',
+		'KG' => '🇰🇬',
+		'KH' => '🇰🇭',
+		'KI' => '🇰🇮',
+		'KM' => '🇰🇲',
+		'KN' => '🇰🇳',
+		'KP' => '🇰🇵',
+		'KR' => '🇰🇷',
+		'KW' => '🇰🇼',
+		'KY' => '🇰🇾',
+		'KZ' => '🇰🇿',
+		'LA' => '🇱🇦',
+		'LB' => '🇱🇧',
+		'LC' => '🇱🇨',
+		'LI' => '🇱🇮',
+		'LK' => '🇱🇰',
+		'LR' => '🇱🇷',
+		'LS' => '🇱🇸',
+		'LT' => '🇱🇹',
+		'LU' => '🇱🇺',
+		'LV' => '🇱🇻',
+		'LY' => '🇱🇾',
+		'MA' => '🇲🇦',
+		'MC' => '🇲🇨',
+		'MD' => '🇲🇩',
+		'ME' => '🇲🇪',
+		'MF' => '🇲🇫',
+		'MG' => '🇲🇬',
+		'MH' => '🇲🇭',
+		'MK' => '🇲🇰',
+		'ML' => '🇲🇱',
+		'MM' => '🇲🇲',
+		'MN' => '🇲🇳',
+		'MO' => '🇲🇴',
+		'MP' => '🇲🇵',
+		'MQ' => '🇲🇶',
+		'MR' => '🇲🇷',
+		'MS' => '🇲🇸',
+		'MT' => '🇲🇹',
+		'MU' => '🇲🇺',
+		'MV' => '🇲🇻',
+		'MW' => '🇲🇼',
+		'MX' => '🇲🇽',
+		'MY' => '🇲🇾',
+		'MZ' => '🇲🇿',
+		'NA' => '🇳🇦',
+		'NC' => '🇳🇨',
+		'NE' => '🇳🇪',
+		'NF' => '🇳🇫',
+		'NG' => '🇳🇬',
+		'NI' => '🇳🇮',
+		'NL' => '🇳🇱',
+		'NO' => '🇳🇴',
+		'NP' => '🇳🇵',
+		'NR' => '🇳🇷',
+		'NU' => '🇳🇺',
+		'NZ' => '🇳🇿',
+		'OM' => '🇴🇲',
+		'PA' => '🇵🇦',
+		'PE' => '🇵🇪',
+		'PF' => '🇵🇫',
+		'PG' => '🇵🇬',
+		'PH' => '🇵🇭',
+		'PK' => '🇵🇰',
+		'PL' => '🇵🇱',
+		'PM' => '🇵🇲',
+		'PN' => '🇵🇳',
+		'PR' => '🇵🇷',
+		'PS' => '🇵🇸',
+		'PT' => '🇵🇹',
+		'PW' => '🇵🇼',
+		'PY' => '🇵🇾',
+		'QA' => '🇶🇦',
+		'RE' => '🇷🇪',
+		'RO' => '🇷🇴',
+		'RS' => '🇷🇸',
+		'RU' => '🇷🇺',
+		'RW' => '🇷🇼',
+		'SA' => '🇸🇦',
+		'SB' => '🇸🇧',
+		'SC' => '🇸🇨',
+		'SD' => '🇸🇩',
+		'SE' => '🇸🇪',
+		'SG' => '🇸🇬',
+		'SH' => '🇸🇭',
+		'SI' => '🇸🇮',
+		'SJ' => '🇸🇯',
+		'SK' => '🇸🇰',
+		'SL' => '🇸🇱',
+		'SM' => '🇸🇲',
+		'SN' => '🇸🇳',
+		'SO' => '🇸🇴',
+		'SR' => '🇸🇷',
+		'SS' => '🇸🇸',
+		'ST' => '🇸🇹',
+		'SV' => '🇸🇻',
+		'SX' => '🇸🇽',
+		'SY' => '🇸🇾',
+		'SZ' => '🇸🇿',
+		'TC' => '🇹🇨',
+		'TD' => '🇹🇩',
+		'TF' => '🇹🇫',
+		'TG' => '🇹🇬',
+		'TH' => '🇹🇭',
+		'TJ' => '🇹🇯',
+		'TK' => '🇹🇰',
+		'TL' => '🇹🇱',
+		'TM' => '🇹🇲',
+		'TN' => '🇹🇳',
+		'TO' => '🇹🇴',
+		'TR' => '🇹🇷',
+		'TT' => '🇹🇹',
+		'TV' => '🇹🇻',
+		'TW' => '🇹🇼',
+		'TZ' => '🇹🇿',
+		'UA' => '🇺🇦',
+		'UG' => '🇺🇬',
+		'UM' => '🇺🇲',
+		'US' => '🇺🇸',
+		'UY' => '🇺🇾',
+		'UZ' => '🇺🇿',
+		'VA' => '🇻🇦',
+		'VC' => '🇻🇨',
+		'VE' => '🇻🇪',
+		'VG' => '🇻🇬',
+		'VI' => '🇻🇮',
+		'VN' => '🇻🇳',
+		'VU' => '🇻🇺',
+		'WF' => '🇼🇫',
+		'WS' => '🇼🇸',
+		'XK' => '🇽🇰',
+		'YE' => '🇾🇪',
+		'YT' => '🇾🇹',
+		'ZA' => '🇿🇦',
+		'ZM' => '🇿🇲',
+		'ZW' => '🇿🇼',
+	];
+
+	/**
+	 * Retrieves a flag by country code.
+	 *
+	 * @param string $country country alpha-2 code (ISO 3166) like US.
+	 * @return string
+	 */
+	public static function get_by_country( string $country ): string {
+		return self::EMOJI_COUNTRIES_FLAGS[ $country ] ?? '';
+	}
+
+	/**
+	 * Retrieves a flag by currency code.
+	 *
+	 * @param string $currency currency code (ISO 4217) like USD.
+	 * @return string
+	 */
+	public static function get_by_currency( string $currency ): string {
+		$exceptions = [
+			'ANG' => '',
+			'BTC' => '',
+			'XAF' => '',
+			'XCD' => '',
+			'XOF' => '',
+			'XPF' => '',
+		];
+
+		$flag = $exceptions[ $currency ] ?? self::get_by_country( substr( $currency, 0, -1 ) );
+
+		return $flag;
+	}
+}
diff --git a/includes/multi-currency/Currency.php b/multi-currency/src/Currency.php
similarity index 89%
rename from includes/multi-currency/Currency.php
rename to multi-currency/src/Currency.php
index 0d9ae84da42..37b8fd17d12 100644
--- a/includes/multi-currency/Currency.php
+++ b/multi-currency/src/Currency.php
@@ -7,8 +7,7 @@
 
 namespace WCPay\MultiCurrency;
 
-use WC_Payments_Localization_Service;
-use WC_Payments_Utils;
+use WCPay\MultiCurrency\Interfaces\MultiCurrencyLocalizationInterface;
 
 defined( 'ABSPATH' ) || exit;
 
@@ -67,21 +66,21 @@ class Currency implements \JsonSerializable {
 	private $last_updated;
 
 	/**
-	 * Instance of WC_Payments_Localization_Service.
+	 * Instance of MultiCurrencyLocalizationInterface.
 	 *
-	 * @var WC_Payments_Localization_Service
+	 * @var MultiCurrencyLocalizationInterface
 	 */
 	private $localization_service;
 
 	/**
 	 * Constructor.
 	 *
-	 * @param WC_Payments_Localization_Service $localization_service Localization service instance.
-	 * @param string                           $code Three letter currency code.
-	 * @param float                            $rate The conversion rate.
-	 * @param int|null                         $last_updated The time this currency was last updated.
+	 * @param MultiCurrencyLocalizationInterface $localization_service Localization service instance.
+	 * @param string                             $code Three letter currency code.
+	 * @param float                              $rate The conversion rate.
+	 * @param int|null                           $last_updated The time this currency was last updated.
 	 */
-	public function __construct( WC_Payments_Localization_Service $localization_service, $code = '', float $rate = 1.0, $last_updated = null ) {
+	public function __construct( MultiCurrencyLocalizationInterface $localization_service, $code = '', float $rate = 1.0, $last_updated = null ) {
 		$this->localization_service = $localization_service;
 		$this->code                 = $code;
 		$this->rate                 = $rate;
diff --git a/includes/multi-currency/CurrencySwitcherBlock.php b/multi-currency/src/CurrencySwitcherBlock.php
similarity index 97%
rename from includes/multi-currency/CurrencySwitcherBlock.php
rename to multi-currency/src/CurrencySwitcherBlock.php
index 95d4762365c..e13902c6ede 100644
--- a/includes/multi-currency/CurrencySwitcherBlock.php
+++ b/multi-currency/src/CurrencySwitcherBlock.php
@@ -7,9 +7,7 @@
 
 namespace WCPay\MultiCurrency;
 
-use WC_Payments;
 use function http_build_query;
-use function implode;
 use function urldecode;
 
 defined( 'ABSPATH' ) || exit;
@@ -60,7 +58,7 @@ public function init_hooks() {
 	 */
 	public function init_block_widget() {
 		// Automatically load dependencies and version.
-		WC_Payments::register_script_with_dependencies( 'woocommerce-payments/multi-currency-switcher', 'dist/multi-currency-switcher-block' );
+		$this->multi_currency->register_script_with_dependencies( 'woocommerce-payments/multi-currency-switcher', 'dist/multi-currency-switcher-block' );
 
 		register_block_type(
 			'woocommerce-payments/multi-currency-switcher',
diff --git a/includes/multi-currency/CurrencySwitcherWidget.php b/multi-currency/src/CurrencySwitcherWidget.php
similarity index 100%
rename from includes/multi-currency/CurrencySwitcherWidget.php
rename to multi-currency/src/CurrencySwitcherWidget.php
diff --git a/includes/multi-currency/Exceptions/InvalidCurrencyException.php b/multi-currency/src/Exceptions/InvalidCurrencyException.php
similarity index 71%
rename from includes/multi-currency/Exceptions/InvalidCurrencyException.php
rename to multi-currency/src/Exceptions/InvalidCurrencyException.php
index 454fa1c7383..c3ec9046a27 100644
--- a/includes/multi-currency/Exceptions/InvalidCurrencyException.php
+++ b/multi-currency/src/Exceptions/InvalidCurrencyException.php
@@ -7,11 +7,11 @@
 
 namespace WCPay\MultiCurrency\Exceptions;
 
-use WCPay\Exceptions\Base_Exception;
+use Exception;
 
 defined( 'ABSPATH' ) || exit;
 
 /**
  * Exception for throwing errors when an invalid currency is used.
  */
-class InvalidCurrencyException extends Base_Exception {}
+class InvalidCurrencyException extends Exception {}
diff --git a/includes/multi-currency/Exceptions/InvalidCurrencyRateException.php b/multi-currency/src/Exceptions/InvalidCurrencyRateException.php
similarity index 71%
rename from includes/multi-currency/Exceptions/InvalidCurrencyRateException.php
rename to multi-currency/src/Exceptions/InvalidCurrencyRateException.php
index e80cc0cb92d..6f0b5b2c007 100644
--- a/includes/multi-currency/Exceptions/InvalidCurrencyRateException.php
+++ b/multi-currency/src/Exceptions/InvalidCurrencyRateException.php
@@ -7,11 +7,11 @@
 
 namespace WCPay\MultiCurrency\Exceptions;
 
-use WCPay\Exceptions\Base_Exception;
+use Exception;
 
 defined( 'ABSPATH' ) || exit;
 
 /**
  * Exception for throwing errors when an invalid currency rate is used.
  */
-class InvalidCurrencyRateException extends Base_Exception {}
+class InvalidCurrencyRateException extends Exception {}
diff --git a/includes/multi-currency/FrontendCurrencies.php b/multi-currency/src/FrontendCurrencies.php
similarity index 94%
rename from includes/multi-currency/FrontendCurrencies.php
rename to multi-currency/src/FrontendCurrencies.php
index da1342ac55a..065d0db24a8 100644
--- a/includes/multi-currency/FrontendCurrencies.php
+++ b/multi-currency/src/FrontendCurrencies.php
@@ -8,7 +8,7 @@
 namespace WCPay\MultiCurrency;
 
 use WC_Order;
-use WC_Payments_Localization_Service;
+use WCPay\MultiCurrency\Interfaces\MultiCurrencyLocalizationInterface;
 
 defined( 'ABSPATH' ) || exit;
 
@@ -24,9 +24,9 @@ class FrontendCurrencies {
 	protected $multi_currency;
 
 	/**
-	 * WC_Payments_Localization_Service instance.
+	 * MultiCurrencyLocalizationInterface instance.
 	 *
-	 * @var WC_Payments_Localization_Service
+	 * @var MultiCurrencyLocalizationInterface
 	 */
 	protected $localization_service;
 
@@ -89,12 +89,12 @@ class FrontendCurrencies {
 	/**
 	 * Constructor.
 	 *
-	 * @param MultiCurrency                    $multi_currency       The MultiCurrency instance.
-	 * @param WC_Payments_Localization_Service $localization_service The Localization Service instance.
-	 * @param Utils                            $utils                Utils instance.
-	 * @param Compatibility                    $compatibility        Compatibility instance.
+	 * @param MultiCurrency                      $multi_currency       The MultiCurrency instance.
+	 * @param MultiCurrencyLocalizationInterface $localization_service The Localization Service instance.
+	 * @param Utils                              $utils                Utils instance.
+	 * @param Compatibility                      $compatibility        Compatibility instance.
 	 */
-	public function __construct( MultiCurrency $multi_currency, WC_Payments_Localization_Service $localization_service, Utils $utils, Compatibility $compatibility ) {
+	public function __construct( MultiCurrency $multi_currency, MultiCurrencyLocalizationInterface $localization_service, Utils $utils, Compatibility $compatibility ) {
 		$this->multi_currency       = $multi_currency;
 		$this->localization_service = $localization_service;
 		$this->utils                = $utils;
diff --git a/includes/multi-currency/FrontendPrices.php b/multi-currency/src/FrontendPrices.php
similarity index 100%
rename from includes/multi-currency/FrontendPrices.php
rename to multi-currency/src/FrontendPrices.php
diff --git a/includes/multi-currency/Geolocation.php b/multi-currency/src/Geolocation.php
similarity index 84%
rename from includes/multi-currency/Geolocation.php
rename to multi-currency/src/Geolocation.php
index 5bd0b48b7db..4f5da245958 100644
--- a/includes/multi-currency/Geolocation.php
+++ b/multi-currency/src/Geolocation.php
@@ -7,7 +7,7 @@
 
 namespace WCPay\MultiCurrency;
 
-use WC_Payments_Localization_Service;
+use WCPay\MultiCurrency\Interfaces\MultiCurrencyLocalizationInterface;
 
 defined( 'ABSPATH' ) || exit;
 
@@ -16,18 +16,18 @@
  */
 class Geolocation {
 	/**
-	 * WC_Payments_Localization_Service instance.
+	 * MultiCurrencyLocalizationInterface instance.
 	 *
-	 * @var WC_Payments_Localization_Service
+	 * @var MultiCurrencyLocalizationInterface
 	 */
 	protected $localization_service;
 
 	/**
 	 * Constructor.
 	 *
-	 * @param WC_Payments_Localization_Service $localization_service The Localization Service instance.
+	 * @param MultiCurrencyLocalizationInterface $localization_service The Localization Service instance.
 	 */
-	public function __construct( WC_Payments_Localization_Service $localization_service ) {
+	public function __construct( MultiCurrencyLocalizationInterface $localization_service ) {
 		$this->localization_service = $localization_service;
 	}
 
diff --git a/multi-currency/src/Interfaces/MultiCurrencyAccountInterface.php b/multi-currency/src/Interfaces/MultiCurrencyAccountInterface.php
new file mode 100644
index 00000000000..b827c5ca3d8
--- /dev/null
+++ b/multi-currency/src/Interfaces/MultiCurrencyAccountInterface.php
@@ -0,0 +1,61 @@
+<?php
+/**
+ * Interface MultiCurrencyAccountInterface
+ *
+ * @package WooCommerce\Payments\MultiCurrency\Interfaces
+ */
+
+namespace WCPay\MultiCurrency\Interfaces;
+
+defined( 'ABSPATH' ) || exit;
+
+interface MultiCurrencyAccountInterface {
+
+	/**
+	 * Checks if the account is connected to the payment provider.
+	 *
+	 * @param bool $on_error Value to return on server error, defaults to false.
+	 *
+	 * @return bool True if the account is connected, false otherwise, $on_error on error.
+	 */
+	public function is_provider_connected( bool $on_error = false ): bool;
+
+	/**
+	 * Checks if the account has been rejected, assumes the value of false on any account retrieval error.
+	 * Returns false if the account is not connected.
+	 *
+	 * Note: We might want to use a more generic method to check if the account is in an enabled or
+	 * disabled state for better compatibility between V1 and V2.
+	 *
+	 * @return bool True if the account is connected and rejected, false otherwise or on error.
+	 */
+	public function is_account_rejected(): bool;
+
+	/**
+	 * Gets and caches the data for the account connected to this site.
+	 *
+	 * @param bool $force_refresh Forces data to be fetched from the server, rather than using the cache.
+	 *
+	 * @return array|bool Account data or false if failed to retrieve account data.
+	 */
+	public function get_cached_account_data( bool $force_refresh = false );
+
+	/**
+	 * Gets the customer currencies supported for the account.
+	 *
+	 * @return array Currencies.
+	 */
+	public function get_account_customer_supported_currencies(): array;
+
+	/**
+	 * Get list of countries supported by the provider.
+	 */
+	public function get_supported_countries(): array;
+
+	/**
+	 * Get provider onboarding page url.
+	 *
+	 * @return string
+	 */
+	public function get_provider_onboarding_page_url(): string;
+}
diff --git a/multi-currency/src/Interfaces/MultiCurrencyApiClientInterface.php b/multi-currency/src/Interfaces/MultiCurrencyApiClientInterface.php
new file mode 100644
index 00000000000..bfe6952170e
--- /dev/null
+++ b/multi-currency/src/Interfaces/MultiCurrencyApiClientInterface.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Interface MultiCurrencyApiClientInterface
+ *
+ * @package WooCommerce\Payments\MultiCurrency\Interfaces
+ */
+
+namespace WCPay\MultiCurrency\Interfaces;
+
+defined( 'ABSPATH' ) || exit;
+
+interface MultiCurrencyApiClientInterface {
+
+	/**
+	 * Whether the API client is connected to the server.
+	 *
+	 * @return bool
+	 */
+	public function is_server_connected(): bool;
+
+	/**
+	 * Get currency rates from the server.
+	 *
+	 * @param string $currency_from - The currency to convert from.
+	 * @param ?array $currencies_to - An array of the currencies we want to convert into. If left empty, will get all supported currencies.
+	 *
+	 * @return array
+	 */
+	public function get_currency_rates( string $currency_from, $currencies_to = null ): array;
+}
diff --git a/multi-currency/src/Interfaces/MultiCurrencyCacheInterface.php b/multi-currency/src/Interfaces/MultiCurrencyCacheInterface.php
new file mode 100644
index 00000000000..535411371ef
--- /dev/null
+++ b/multi-currency/src/Interfaces/MultiCurrencyCacheInterface.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Interface MultiCurrencyCacheInterface
+ *
+ * @package WooCommerce\Payments\MultiCurrency\Interfaces
+ */
+
+namespace WCPay\MultiCurrency\Interfaces;
+
+defined( 'ABSPATH' ) || exit;
+
+interface MultiCurrencyCacheInterface {
+	const CURRENCIES_KEY = 'wcpay_multi_currency_cached_currencies';
+
+	/**
+	 * Gets a value from the cache.
+	 *
+	 * @param string $key   The key to look for.
+	 * @param bool   $force If set, return from the cache without checking for expiry.
+	 *
+	 * @return mixed The cache contents.
+	 */
+	public function get( string $key, bool $force = false );
+
+	/**
+	 * Gets a value from cache or regenerates and adds it to the cache.
+	 *
+	 * @param string   $key           The options key to cache the data under.
+	 * @param callable $generator     Function/callable regenerating the missing value. If null or false is returned, it will be treated as an error.
+	 * @param callable $validate_data Function/callable validating the data after it is retrieved from the cache. If it returns false, the cache will be refreshed.
+	 * @param boolean  $force_refresh Regenerates the cache regardless of its state if true.
+	 * @param boolean  $refreshed     Is set to true if the cache has been refreshed without errors and with a non-empty value.
+	 *
+	 * @return mixed|null The cache contents. NULL on failure
+	 */
+	public function get_or_add( string $key, callable $generator, callable $validate_data, bool $force_refresh = false, bool &$refreshed = false );
+
+	/**
+	 * Deletes a value from the cache.
+	 *
+	 * @param string $key The key to delete.
+	 *
+	 * @return void
+	 */
+	public function delete( string $key );
+}
diff --git a/multi-currency/src/Interfaces/MultiCurrencyLocalizationInterface.php b/multi-currency/src/Interfaces/MultiCurrencyLocalizationInterface.php
new file mode 100644
index 00000000000..eb987dcdca2
--- /dev/null
+++ b/multi-currency/src/Interfaces/MultiCurrencyLocalizationInterface.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * Interface MultiCurrencyLocalizationInterface
+ *
+ * @package WooCommerce\Payments\MultiCurrency\Interfaces
+ */
+
+namespace WCPay\MultiCurrency\Interfaces;
+
+defined( 'ABSPATH' ) || exit;
+
+interface MultiCurrencyLocalizationInterface {
+
+	/**
+	 * Retrieves the currency's format from mapped data.
+	 *
+	 * @param string $currency_code The currency code.
+	 *
+	 * @return array The currency's format.
+	 */
+	public function get_currency_format( $currency_code ): array;
+
+	/**
+	 * Returns the locale data for a country.
+	 *
+	 * @param string $country Country code.
+	 *
+	 * @return array Array with the country's locale data. Empty array if country not found.
+	 */
+	public function get_country_locale_data( $country ): array;
+}
diff --git a/multi-currency/src/Interfaces/MultiCurrencySettingsInterface.php b/multi-currency/src/Interfaces/MultiCurrencySettingsInterface.php
new file mode 100644
index 00000000000..a82704dcace
--- /dev/null
+++ b/multi-currency/src/Interfaces/MultiCurrencySettingsInterface.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * Interface MultiCurrencySettingsInterface
+ *
+ * @package WooCommerce\Payments\MultiCurrency\Interfaces
+ */
+
+namespace WCPay\MultiCurrency\Interfaces;
+
+defined( 'ABSPATH' ) || exit;
+
+interface MultiCurrencySettingsInterface {
+
+	/**
+	 * Checks if dev mode is enabled.
+	 *
+	 * @return bool
+	 */
+	public function is_dev_mode(): bool;
+
+	/**
+	 * Gets the plugin file path.
+	 *
+	 * @return string
+	 */
+	public function get_plugin_file_path(): string;
+
+	/**
+	 * Gets the plugin version.
+	 *
+	 * @return string
+	 */
+	public function get_plugin_version(): string;
+}
diff --git a/multi-currency/src/Logger.php b/multi-currency/src/Logger.php
new file mode 100644
index 00000000000..d9f6865c5b7
--- /dev/null
+++ b/multi-currency/src/Logger.php
@@ -0,0 +1,68 @@
+<?php
+/**
+ * Class Logger
+ *
+ * @package WooCommerce\Payments\MultiCurrency
+ */
+
+namespace WCPay\MultiCurrency;
+
+/**
+ * Logger for multi-currency.
+ */
+class Logger {
+
+	/**
+	 * Log source identifier.
+	 */
+	const LOG_FILE = 'woopayments-multi-currency';
+
+	/**
+	 * The WooCommerce logger instance.
+	 *
+	 * @var \WC_Logger|null
+	 */
+	private $logger;
+
+	/**
+	 * Log a debug message.
+	 *
+	 * @param string $message The message to log.
+	 */
+	public static function debug( $message ) {
+		self::log( 'debug', $message );
+	}
+
+	/**
+	 * Log an error message.
+	 *
+	 * @param string $message The message to log.
+	 */
+	public static function error( $message ) {
+		self::log( 'error', $message );
+	}
+
+	/**
+	 * Log a notice message.
+	 *
+	 * @param string $message The message to log.
+	 */
+	public static function notice( $message ) {
+		self::log( 'notice', $message );
+	}
+
+	/**
+	 * Log a message with a specific level.
+	 *
+	 * @param string $level   The log level (debug, error, notice, etc.).
+	 * @param string $message The message to log.
+	 */
+	private static function log( $level, $message ) {
+		if ( ! function_exists( 'wc_get_logger' ) ) {
+			return;
+		}
+
+		$logger = wc_get_logger();
+		$logger->log( $level, $message, [ 'source' => self::LOG_FILE ] );
+	}
+}
diff --git a/includes/multi-currency/MultiCurrency.php b/multi-currency/src/MultiCurrency.php
similarity index 89%
rename from includes/multi-currency/MultiCurrency.php
rename to multi-currency/src/MultiCurrency.php
index 0d80518298e..56e2b5815b4 100644
--- a/includes/multi-currency/MultiCurrency.php
+++ b/multi-currency/src/MultiCurrency.php
@@ -7,20 +7,16 @@
 
 namespace WCPay\MultiCurrency;
 
-use WC_Payments;
-use WC_Payments_Account;
-use WC_Payments_Utils;
-use WC_Payments_API_Client;
-use WC_Payments_Localization_Service;
-use WCPay\Constants\Country_Code;
-use WCPay\Constants\Currency_Code;
-use WCPay\Exceptions\API_Exception;
-use WCPay\Database_Cache;
-use WCPay\Logger;
 use WCPay\MultiCurrency\Exceptions\InvalidCurrencyException;
 use WCPay\MultiCurrency\Exceptions\InvalidCurrencyRateException;
-use WCPay\MultiCurrency\Helpers\OrderMetaHelper;
+use WCPay\MultiCurrency\Interfaces\MultiCurrencyAccountInterface;
+use WCPay\MultiCurrency\Interfaces\MultiCurrencyApiClientInterface;
+use WCPay\MultiCurrency\Interfaces\MultiCurrencyCacheInterface;
+use WCPay\MultiCurrency\Interfaces\MultiCurrencyLocalizationInterface;
+use WCPay\MultiCurrency\Interfaces\MultiCurrencySettingsInterface;
+use WCPay\MultiCurrency\Logger;
 use WCPay\MultiCurrency\Notes\NoteMultiCurrencyAvailable;
+use WCPay\MultiCurrency\Utils;
 
 defined( 'ABSPATH' ) || exit;
 
@@ -41,13 +37,6 @@ class MultiCurrency {
 	 */
 	public $id = 'wcpay_multi_currency';
 
-	/**
-	 * The single instance of the class.
-	 *
-	 * @var ?MultiCurrency
-	 */
-	protected static $instance = null;
-
 	/**
 	 * Static flag to show if the currencies initialization has been completed
 	 *
@@ -140,32 +129,39 @@ class MultiCurrency {
 	protected $enabled_currencies;
 
 	/**
-	 * Client for making requests to the WooCommerce Payments API
+	 * Instance of MultiCurrencySettingsInterface.
+	 *
+	 * @var MultiCurrencySettingsInterface
+	 */
+	private $settings_service;
+
+	/**
+	 * Client for making requests to the API
 	 *
-	 * @var WC_Payments_API_Client
+	 * @var MultiCurrencyApiClientInterface
 	 */
 	private $payments_api_client;
 
 	/**
-	 * Instance of WC_Payments_Account.
+	 * Instance of MultiCurrencyAccountInterface.
 	 *
-	 * @var WC_Payments_Account
+	 * @var MultiCurrencyAccountInterface
 	 */
 	private $payments_account;
 
 	/**
-	 * Instance of WC_Payments_Localization_Service.
+	 * Instance of MultiCurrencyLocalizationInterface.
 	 *
-	 * @var WC_Payments_Localization_Service
+	 * @var MultiCurrencyLocalizationInterface
 	 */
 	private $localization_service;
 
 	/**
-	 * Instance of Database_Cache.
+	 * Instance of MultiCurrencyCacheInterface.
 	 *
-	 * @var Database_Cache
+	 * @var MultiCurrencyCacheInterface
 	 */
-	private $database_cache;
+	private $cache;
 
 	/**
 	 * Tracking instance.
@@ -181,43 +177,23 @@ class MultiCurrency {
 	 */
 	protected $simulation_params = [];
 
-	/**
-	 * Instance of OrderMetaHelper.
-	 *
-	 * @var OrderMetaHelper
-	 */
-	private $order_meta_helper;
-
-	/**
-	 * Main MultiCurrency Instance.
-	 *
-	 * Ensures only one instance of MultiCurrency is loaded or can be loaded.
-	 *
-	 * @static
-	 * @return MultiCurrency - Main instance.
-	 */
-	public static function instance() {
-		if ( is_null( self::$instance ) ) {
-			self::$instance = new self( WC_Payments::get_payments_api_client(), WC_Payments::get_account_service(), WC_Payments::get_localization_service(), WC_Payments::get_database_cache() );
-			self::$instance->init_hooks();
-		}
-		return self::$instance;
-	}
 
 	/**
 	 * Class constructor.
 	 *
-	 * @param WC_Payments_API_Client           $payments_api_client  Payments API client.
-	 * @param WC_Payments_Account              $payments_account     Payments Account instance.
-	 * @param WC_Payments_Localization_Service $localization_service Localization Service instance.
-	 * @param Database_Cache                   $database_cache       Database Cache instance.
-	 * @param Utils|null                       $utils                Optional Utils instance.
+	 * @param MultiCurrencySettingsInterface     $settings_service     Settings service.
+	 * @param MultiCurrencyApiClientInterface    $payments_api_client  Payments API client.
+	 * @param MultiCurrencyAccountInterface      $payments_account     Payments Account instance.
+	 * @param MultiCurrencyLocalizationInterface $localization_service Localization Service instance.
+	 * @param MultiCurrencyCacheInterface        $cache                Cache instance.
+	 * @param Utils|null                         $utils                Optional Utils instance.
 	 */
-	public function __construct( WC_Payments_API_Client $payments_api_client, WC_Payments_Account $payments_account, WC_Payments_Localization_Service $localization_service, Database_Cache $database_cache, Utils $utils = null ) {
+	public function __construct( MultiCurrencySettingsInterface $settings_service, MultiCurrencyApiClientInterface $payments_api_client, MultiCurrencyAccountInterface $payments_account, MultiCurrencyLocalizationInterface $localization_service, MultiCurrencyCacheInterface $cache, Utils $utils = null ) {
+		$this->settings_service     = $settings_service;
 		$this->payments_api_client  = $payments_api_client;
 		$this->payments_account     = $payments_account;
 		$this->localization_service = $localization_service;
-		$this->database_cache       = $database_cache;
+		$this->cache                = $cache;
 		// If a Utils instance is not passed as argument, initialize it. This allows to mock it in tests.
 		$this->utils                   = $utils ?? new Utils();
 		$this->geolocation             = new Geolocation( $this->localization_service );
@@ -225,6 +201,19 @@ public function __construct( WC_Payments_API_Client $payments_api_client, WC_Pay
 		$this->currency_switcher_block = new CurrencySwitcherBlock( $this, $this->compatibility );
 	}
 
+	/**
+	 * Backwards compatibility for the old `instance()` static method.
+	 *
+	 * We need to use this as some plugins still call `MultiCurrency::instance()` directly.
+	 *
+	 * @return null|MultiCurrency - Main instance.
+	 */
+	public static function instance() {
+		if ( function_exists( 'WC_Payments_Multi_Currency' ) ) {
+			return WC_Payments_Multi_Currency();
+		}
+	}
+
 	/**
 	 * Initializes this class' WP hooks.
 	 *
@@ -242,9 +231,9 @@ public function init_hooks() {
 		add_action( 'rest_api_init', [ $this, 'init_rest_api' ] );
 		add_action( 'widgets_init', [ $this, 'init_widgets' ] );
 
-		$is_frontend_request = ! is_admin() && ! defined( 'DOING_CRON' ) && ! WC()->is_rest_api_request();
+		$is_frontend_request = ! is_admin() && ! defined( 'DOING_CRON' ) && ! Utils::is_admin_api_request();
 
-		if ( $is_frontend_request || \WC_Payments_Utils::is_store_api_request() ) {
+		if ( $is_frontend_request || Utils::is_store_api_request() ) {
 			// Make sure that this runs after the main init function.
 			add_action( 'init', [ $this, 'update_selected_currency_by_url' ], 11 );
 			add_action( 'init', [ $this, 'update_selected_currency_by_geolocation' ], 12 );
@@ -252,7 +241,7 @@ public function init_hooks() {
 			add_action( 'woocommerce_created_customer', [ $this, 'set_new_customer_currency_meta' ] );
 		}
 
-		if ( ! \WC_Payments_Utils::is_store_batch_request() && ! \WC_Payments_Utils::is_store_api_request() && WC()->is_rest_api_request() ) {
+		if ( ! Utils::is_store_batch_request() && ! Utils::is_store_api_request() && WC()->is_rest_api_request() ) {
 			if ( isset( $_GET['currency'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification
 				$get_currency_from_query_param = function () {
 					$currency = sanitize_text_field( wp_unslash( $_GET['currency'] ) ); // phpcs:ignore WordPress.Security.NonceVerification
@@ -298,26 +287,22 @@ public function init() {
 			$this->update_manual_rate_currencies_notice_option();
 		}
 
-		$payment_method_compat = new PaymentMethodsCompatibility( $this, WC_Payments::get_gateway() );
-		$admin_notices         = new AdminNotices();
-		$user_settings         = new UserSettings( $this );
-		new Analytics( $this );
+		$admin_notices = new AdminNotices();
+		$user_settings = new UserSettings( $this );
+		new Analytics( $this, $this->settings_service );
 
 		$this->frontend_prices     = new FrontendPrices( $this, $this->compatibility );
 		$this->frontend_currencies = new FrontendCurrencies( $this, $this->localization_service, $this->utils, $this->compatibility );
 		$this->backend_currencies  = new BackendCurrencies( $this, $this->localization_service );
 		$this->tracking            = new Tracking( $this );
-		$this->order_meta_helper   = new OrderMetaHelper( $this->payments_api_client );
 
 		// Init all of the hooks.
-		$payment_method_compat->init_hooks();
 		$admin_notices->init_hooks();
 		$user_settings->init_hooks();
 		$this->frontend_prices->init_hooks();
 		$this->frontend_currencies->init_hooks();
 		$this->backend_currencies->init_hooks();
 		$this->tracking->init_hooks();
-		$this->order_meta_helper->init_hooks();
 
 		add_action( 'woocommerce_order_refunded', [ $this, 'add_order_meta_on_refund' ], 50, 2 );
 
@@ -328,7 +313,7 @@ public function init() {
 		}
 
 		if ( is_admin() ) {
-			add_action( 'admin_init', [ __CLASS__, 'add_woo_admin_notes' ] );
+			add_action( 'admin_init', [ $this, 'add_woo_admin_notes' ] );
 		}
 
 		// Update the customer currencies option after an order status change.
@@ -350,7 +335,7 @@ public function init_rest_api() {
 			return;
 		}
 
-		$api_controller = new RestController( \WC_Payments::create_api_client() );
+		$api_controller = new RestController( $this );
 		$api_controller->register_routes();
 	}
 
@@ -373,19 +358,19 @@ public function init_widgets() {
 	 * @return array The new settings pages.
 	 */
 	public function init_settings_pages( $settings_pages ): array {
-		// We don't need to check if Stripe is connected for the
+		// We don't need to check if the payment provider is connected for the
 		// Settings page generation on the incoming CLI and async job calls.
 		if ( ( defined( 'WP_CLI' ) && WP_CLI ) || ( defined( 'WPCOM_JOBS' ) && WPCOM_JOBS ) ) {
 			return $settings_pages;
 		}
 
-		if ( $this->payments_account->is_stripe_connected() ) {
+		if ( $this->payments_account->is_provider_connected() ) {
 			$settings = new Settings( $this );
 			$settings->init_hooks();
 
 			$settings_pages[] = $settings;
 		} else {
-			$settings_onboard_cta = new SettingsOnboardCta( $this );
+			$settings_onboard_cta = new SettingsOnboardCta( $this, $this->payments_account );
 			$settings_onboard_cta->init_hooks();
 
 			$settings_pages[] = $settings_onboard_cta;
@@ -410,7 +395,7 @@ public function enqueue_admin_scripts() {
 		$this->register_admin_scripts();
 
 		wp_enqueue_script( 'WCPAY_MULTI_CURRENCY_SETTINGS' );
-		WC_Payments_Utils::enqueue_style( 'WCPAY_MULTI_CURRENCY_SETTINGS' );
+		wp_enqueue_style( 'WCPAY_MULTI_CURRENCY_SETTINGS' );
 	}
 
 	/**
@@ -433,7 +418,7 @@ public function add_props_to_wcpay_js_config( $config ) {
 	 */
 	public function clear_cache() {
 		Logger::debug( 'Clearing the cache to force new rates to be fetched from the server.' );
-		$this->database_cache->delete( Database_Cache::CURRENCIES_KEY );
+		$this->cache->delete( MultiCurrencyCacheInterface::CURRENCIES_KEY );
 	}
 
 	/**
@@ -444,14 +429,14 @@ public function clear_cache() {
 	 * @return ?array
 	 */
 	public function get_cached_currencies() {
-		$cached_data = $this->database_cache->get( Database_Cache::CURRENCIES_KEY );
-		// If connection to server cannot be established, or if Stripe is not connected, or if the account is rejected, return expired data or null.
-		if ( ! $this->payments_api_client->is_server_connected() || ! $this->payments_account->is_stripe_connected() || $this->payments_account->is_account_rejected() ) {
+		$cached_data = $this->cache->get( MultiCurrencyCacheInterface::CURRENCIES_KEY );
+		// If connection to server cannot be established, or if payment provider is not connected, or if the account is rejected, return expired data or null.
+		if ( ! $this->payments_api_client->is_server_connected() || ! $this->payments_account->is_provider_connected() || $this->payments_account->is_account_rejected() ) {
 			return $cached_data ?? null;
 		}
 
-		return $this->database_cache->get_or_add(
-			Database_Cache::CURRENCIES_KEY,
+		return $this->cache->get_or_add(
+			MultiCurrencyCacheInterface::CURRENCIES_KEY,
 			function () {
 				try {
 					$currency_data = $this->payments_api_client->get_currency_rates( strtolower( get_woocommerce_currency() ) );
@@ -459,7 +444,7 @@ function () {
 						'currencies' => $currency_data,
 						'updated'    => time(),
 					];
-				} catch ( API_Exception $e ) {
+				} catch ( \Exception $e ) {
 					return null;
 				}
 			},
@@ -601,7 +586,7 @@ public function update_single_currency_settings( string $currency_code, string $
 			if ( ! is_numeric( $manual_rate ) || 0 >= $manual_rate ) {
 				$message = 'Invalid manual currency rate passed to update_single_currency_settings: ' . $manual_rate;
 				Logger::error( $message );
-				throw new InvalidCurrencyRateException( esc_html( $message ), 'wcpay_multi_currency_invalid_currency_rate', 500 );
+				throw new InvalidCurrencyRateException( esc_html( $message ), 500 );
 			}
 			update_option( 'wcpay_multi_currency_manual_rate_' . $currency_code, $manual_rate );
 		}
@@ -639,94 +624,6 @@ public function maybe_update_customer_currencies_option( $order_id ) {
 		update_option( self::CUSTOMER_CURRENCIES_KEY, $currencies );
 	}
 
-	/**
-	 * Sets up the available currencies, which are alphabetical by name.
-	 *
-	 * @return void
-	 */
-	private function initialize_available_currencies() {
-		// Add default store currency with a rate of 1.0.
-		$woocommerce_currency                                = get_woocommerce_currency();
-		$this->available_currencies[ $woocommerce_currency ] = new Currency( $this->localization_service, $woocommerce_currency, 1.0 );
-
-		$available_currencies = [];
-
-		$currencies = $this->get_account_available_currencies();
-		$cache_data = $this->get_cached_currencies();
-
-		foreach ( $currencies as $currency_code ) {
-			$currency_rate = $cache_data['currencies'][ $currency_code ] ?? 1.0;
-			$update_time   = $cache_data['updated'] ?? null;
-			$new_currency  = new Currency( $this->localization_service, $currency_code, $currency_rate, $update_time );
-
-			// Add this to our list of available currencies.
-			$available_currencies[ $new_currency->get_name() ] = $new_currency;
-		}
-
-		ksort( $available_currencies );
-
-		foreach ( $available_currencies as $currency ) {
-			$this->available_currencies[ $currency->get_code() ] = $currency;
-		}
-	}
-
-	/**
-	 * Sets up the enabled currencies.
-	 *
-	 * @return void
-	 */
-	private function initialize_enabled_currencies() {
-		$available_currencies     = $this->get_available_currencies();
-		$enabled_currency_codes   = get_option( $this->id . '_enabled_currencies', [] );
-		$enabled_currency_codes   = is_array( $enabled_currency_codes ) ? $enabled_currency_codes : [];
-		$default_code             = $this->get_default_currency()->get_code();
-		$default                  = [];
-		$enabled_currency_codes[] = $default_code;
-
-		// This allows to keep the alphabetical sorting by name.
-		$enabled_currencies = array_filter(
-			$available_currencies,
-			function ( $currency ) use ( $enabled_currency_codes ) {
-				return in_array( $currency->get_code(), $enabled_currency_codes, true );
-			}
-		);
-
-		$this->enabled_currencies = [];
-
-		foreach ( $enabled_currencies as $enabled_currency ) {
-			// Get the charm and rounding for each enabled currency and add the currencies to the object property.
-			$currency = clone $enabled_currency;
-			$charm    = get_option( $this->id . '_price_charm_' . $currency->get_id(), 0.00 );
-			$rounding = get_option( $this->id . '_price_rounding_' . $currency->get_id(), $currency->get_is_zero_decimal() ? '100' : '1.00' );
-			$currency->set_charm( $charm );
-			$currency->set_rounding( $rounding );
-
-			// If the currency is set to be manual, set the rate to the stored manual rate.
-			$type = get_option( $this->id . '_exchange_rate_' . $currency->get_id(), 'automatic' );
-			if ( 'manual' === $type ) {
-				$manual_rate = get_option( $this->id . '_manual_rate_' . $currency->get_id(), $currency->get_rate() );
-				$currency->set_rate( $manual_rate );
-			}
-
-			$this->enabled_currencies[ $currency->get_code() ] = $currency;
-		}
-
-		// Set default currency to the top of the list.
-		$default[ $default_code ] = $this->enabled_currencies[ $default_code ];
-		unset( $this->enabled_currencies[ $default_code ] );
-		$this->enabled_currencies = array_merge( $default, $this->enabled_currencies );
-	}
-
-	/**
-	 * Sets the default currency.
-	 *
-	 * @return void
-	 */
-	private function set_default_currency() {
-		$available_currencies   = $this->get_available_currencies();
-		$this->default_currency = $available_currencies[ get_woocommerce_currency() ] ?? null;
-	}
-
 	/**
 	 * Gets the currencies available. Initializes it if needed.
 	 *
@@ -981,7 +878,7 @@ public function get_raw_conversion( float $amount, string $to_currency, string $
 		if ( 0 >= $from_currency_rate ) {
 			$message = 'Invalid rate for from_currency in get_raw_conversion: ' . $from_currency_rate;
 			Logger::error( $message );
-			throw new InvalidCurrencyRateException( esc_html( $message ), 'wcpay_multi_currency_invalid_currency_rate', 500 );
+			throw new InvalidCurrencyRateException( esc_html( $message ), 500 );
 		}
 
 		$amount = $amount * ( $to_currency_rate / $from_currency_rate );
@@ -1057,24 +954,20 @@ public function display_geolocation_currency_update_notice() {
 		}
 
 		$message = sprintf(
-		/* translators: %1 User's country, %2 Selected currency name, %3 Default store currency name */
-			__( 'We noticed you\'re visiting from %1$s. We\'ve updated our prices to %2$s for your shopping convenience. <a>Use %3$s instead.</a>', 'woocommerce-payments' ),
+		/* translators: %1 User's country, %2 Selected currency name, %3 Default store currency name, %4 Link to switch currency */
+			__( 'We noticed you\'re visiting from %1$s. We\'ve updated our prices to %2$s for your shopping convenience. <a href="%4$s">Use %3$s instead.</a>', 'woocommerce-payments' ),
 			apply_filters( self::FILTER_PREFIX . 'override_notice_country', WC()->countries->countries[ $country ] ),
 			apply_filters( self::FILTER_PREFIX . 'override_notice_currency_name', $current_currency->get_name() ),
-			$currencies[ $store_currency ]
+			esc_html( $currencies[ $store_currency ] ),
+			esc_url( '?currency=' . $store_currency )
 		);
 
 		$notice_id = md5( $message );
 
 		echo '<p class="woocommerce-store-notice demo_store" data-notice-id="' . esc_attr( $notice_id . 2 ) . '" style="display:none;">';
-		// No need to escape here as the function called handles it.
+		// No need to escape here as the contents of $message is already escaped.
 		// phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
-		echo \WC_Payments_Utils::esc_interpolated_html(
-			$message,
-			[
-				'a' => '<a href="?currency=' . esc_attr( $store_currency ) . '">',
-			]
-		);
+		echo $message;
 		echo ' <a href="#" class="woocommerce-store-notice__dismiss-link">' . esc_html__( 'Dismiss', 'woocommerce-payments' ) . '</a></p>';
 	}
 
@@ -1098,14 +991,14 @@ public function set_new_customer_currency_meta( $customer_id ) {
 	 *
 	 * @return void
 	 */
-	public static function add_woo_admin_notes() {
+	public function add_woo_admin_notes() {
 		// Do not try to add notes on ajax requests to improve their performance.
 		if ( wp_doing_ajax() ) {
 			return;
 		}
 
 		if ( defined( 'WC_VERSION' ) && version_compare( WC_VERSION, '4.4.0', '>=' ) ) {
-			NoteMultiCurrencyAvailable::set_account( WC_Payments::get_account_service() );
+			NoteMultiCurrencyAvailable::set_account( $this->payments_account );
 			NoteMultiCurrencyAvailable::possibly_add_note();
 		}
 	}
@@ -1122,284 +1015,130 @@ public static function remove_woo_admin_notes() {
 	}
 
 	/**
-	 * Gets the price after adjusting it with the rounding and charm settings.
-	 *
-	 * @param float    $price               The price to be adjusted.
-	 * @param bool     $apply_charm_pricing Whether charm pricing should be applied.
-	 * @param Currency $currency The currency to be used when adjusting.
+	 * Checks if the merchant has enabled automatic currency switching and geolocation.
 	 *
-	 * @return float The adjusted price.
+	 * @return bool
 	 */
-	protected function get_adjusted_price( $price, $apply_charm_pricing, $currency ): float {
-		$price = $this->ceil_price( $price, (float) $currency->get_rounding() );
-
-		if ( $apply_charm_pricing ) {
-			$price += (float) $currency->get_charm();
-		}
-
-		// Do not return negative prices (possible because of $currency->get_charm()).
-		return max( 0, $price );
+	public function is_using_auto_currency_switching(): bool {
+		return 'yes' === get_option( $this->id . '_enable_auto_currency', 'no' );
 	}
 
 	/**
-	 * Ceils the price to the next number based on the rounding value.
-	 *
-	 * @param float $price    The price to be ceiled.
-	 * @param float $rounding The rounding option.
+	 * Checks if the merchant has enabled the currency switcher widget.
 	 *
-	 * @return float The ceiled price.
+	 * @return  bool
 	 */
-	protected function ceil_price( float $price, float $rounding ): float {
-		if ( 0.00 === $rounding ) {
-			return $price;
-		}
-		return ceil( $price / $rounding ) * $rounding;
+	public function is_using_storefront_switcher(): bool {
+		return 'yes' === get_option( $this->id . '_enable_storefront_switcher', 'no' );
 	}
 
 	/**
-	 * Returns the currency code stored for the user or in the session.
+	 * Gets the store settings.
 	 *
-	 * @return string|null Currency code.
+	 * @return  array  The store settings.
 	 */
-	private function get_stored_currency_code() {
-		$user_id = get_current_user_id();
-
-		if ( $user_id ) {
-			return get_user_meta( $user_id, self::CURRENCY_META_KEY, true );
-		}
-
-		WC()->initialize_session();
-		$currency_code = WC()->session->get( self::CURRENCY_SESSION_KEY );
-
-		return is_string( $currency_code ) ? $currency_code : null;
+	public function get_settings() {
+		return [
+			$this->id . '_enable_auto_currency'       => $this->is_using_auto_currency_switching(),
+			$this->id . '_enable_storefront_switcher' => $this->is_using_storefront_switcher(),
+			'site_theme'                              => wp_get_theme()->get( 'Name' ),
+			'date_format'                             => esc_attr( get_option( 'date_format', 'F j, Y' ) ),
+			'time_format'                             => esc_attr( get_option( 'time_format', 'g:i a' ) ),
+			'store_url'                               => esc_attr( get_page_uri( wc_get_page_id( 'shop' ) ) ),
+		];
 	}
 
 	/**
-	 * Checks to see if the store currency has changed. If it has, this will
-	 * also update the option containing the store currency.
+	 * Updates the store settings
 	 *
-	 * @return bool
+	 * @param   array $params  Update requested values.
+	 *
+	 * @return  void
 	 */
-	private function check_store_currency_for_change(): bool {
-		$last_known_currency  = get_option( $this->id . '_store_currency', false );
-		$woocommerce_currency = get_woocommerce_currency();
-
-		// If the last known currency was not set, update the option to set it and return false.
-		if ( ! $last_known_currency ) {
-			update_option( $this->id . '_store_currency', $woocommerce_currency );
-			return false;
-		}
+	public function update_settings( $params ) {
+		$updateable_options = [
+			'wcpay_multi_currency_enable_auto_currency',
+			'wcpay_multi_currency_enable_storefront_switcher',
+		];
 
-		if ( $last_known_currency !== $woocommerce_currency ) {
-			update_option( $this->id . '_store_currency', $woocommerce_currency );
-			return true;
+		foreach ( $updateable_options as $key ) {
+			if ( isset( $params[ $key ] ) ) {
+				update_option( $key, sanitize_text_field( $params[ $key ] ) );
+			}
 		}
-
-		return false;
 	}
 
 	/**
-	 * Called when the store currency has changed. Puts any manual rate currencies into an option for a notice to display.
+	 * Apply client order currency format and reduces the rounding precision to 2.
 	 *
-	 * @return void
+	 * @return  void
 	 */
-	private function update_manual_rate_currencies_notice_option() {
-		$enabled_currencies = $this->get_enabled_currencies();
-		$manual_currencies  = [];
-
-		// Check enabled currencies for manual rates.
-		foreach ( $enabled_currencies as $currency ) {
-			$rate_type = get_option( $this->id . '_exchange_rate_' . $currency->get_id(), false );
-			if ( 'manual' === $rate_type ) {
-				$manual_currencies[] = $currency->get_name();
+	public function set_client_format_and_rounding_precision() {
+		$screen = get_current_screen();
+		if ( in_array( $screen->id, [ 'shop_order', 'woocommerce_page_wc-orders' ], true ) ) :
+			$order = wc_get_order();
+			if ( ! $order ) {
+				return;
 			}
-		}
+			$currency                     = $order->get_currency();
+			$currency_format_num_decimals = $this->backend_currencies->get_price_decimals( $currency );
+			$currency_format_decimal_sep  = $this->backend_currencies->get_price_decimal_separator( $currency );
+			$currency_format_thousand_sep = $this->backend_currencies->get_price_thousand_separator( $currency );
+			$currency_format              = str_replace( [ '%1$s', '%2$s', '&nbsp;' ], [ '%s', '%v', ' ' ], $this->backend_currencies->get_woocommerce_price_format( $currency ) );
 
-		if ( 0 < count( $manual_currencies ) ) {
-			update_option( $this->id . '_show_store_currency_changed_notice', $manual_currencies );
-		}
+			$rounding_precision = wc_get_price_decimals() ?? wc_get_rounding_precision();
+			?>
+		<script>
+		woocommerce_admin_meta_boxes.currency_format_num_decimals = <?php echo (int) $currency_format_num_decimals; ?>;
+		woocommerce_admin_meta_boxes.currency_format_decimal_sep = '<?php echo esc_attr( $currency_format_decimal_sep ); ?>';
+		woocommerce_admin_meta_boxes.currency_format_thousand_sep = '<?php echo esc_attr( $currency_format_thousand_sep ); ?>';
+		woocommerce_admin_meta_boxes.currency_format = '<?php echo esc_attr( $currency_format ); ?>';
+		woocommerce_admin_meta_boxes.rounding_precision = <?php echo (int) $rounding_precision; ?>;
+		</script>
+			<?php
+		endif;
 	}
 
 	/**
-	 * Accepts an array of currencies that should have their settings removed.
+	 * Load script with all required dependencies.
 	 *
-	 * @param array $currencies Array of Currency objects or 3 letter currency codes.
+	 * @param string $handler Script handler.
+	 * @param string $script Script name relative to the plugin root.
+	 * @param array  $additional_dependencies Additional dependencies.
 	 *
 	 * @return void
 	 */
-	private function remove_currencies_settings( array $currencies ) {
-
-		foreach ( $currencies as $currency ) {
-			$this->remove_currency_settings( $currency );
-		}
+	public function register_script_with_dependencies( string $handler, string $script, array $additional_dependencies = [] ) {
+		$script_file       = $script . '.js';
+		$script_src_url    = plugins_url( $script_file, $this->settings_service->get_plugin_file_path() );
+		$script_asset_path = plugin_dir_path( $this->settings_service->get_plugin_file_path() ) . $script . '.asset.php';
+		$script_asset      = file_exists( $script_asset_path ) ? require $script_asset_path : [ 'dependencies' => [] ]; // nosemgrep: audit.php.lang.security.file.inclusion-arg -- server generated path is used.
+		$all_dependencies  = array_merge( $script_asset['dependencies'], $additional_dependencies );
+
+		wp_register_script(
+			$handler,
+			$script_src_url,
+			$all_dependencies,
+			$this->get_file_version( $script_file ),
+			true
+		);
 	}
 
 	/**
-	 * Will remove a currency's settings if it is not enabled.
+	 * Get the file modified time as a cache buster if we're in dev mode.
 	 *
-	 * @param mixed $currency Currency object or 3 letter currency code.
+	 * @param string $file Local path to the file.
 	 *
-	 * @return void
+	 * @return string
 	 */
-	private function remove_currency_settings( $currency ) {
-		$code = is_a( $currency, Currency::class ) ? $currency->get_code() : strtoupper( $currency );
+	public function get_file_version( $file ) {
+		$plugin_path = plugin_dir_path( $this->settings_service->get_plugin_file_path() );
 
-		// Bail if the currency code passed is not 3 characters, or if the currency is presently enabled.
-		if ( 3 !== strlen( $code ) || isset( $this->get_enabled_currencies()[ $code ] ) ) {
-			return;
-		}
-
-		$settings = [
-			'price_charm',
-			'price_rounding',
-			'manual_rate',
-			'exchange_rate',
-		];
-
-		// Go through each setting and remove them.
-		foreach ( $settings as $setting ) {
-			delete_option( $this->id . '_' . $setting . '_' . strtolower( $code ) );
-		}
-	}
-
-	/**
-	 * Returns the currencies enabled for the Stripe account that are
-	 * also available in WC.
-	 *
-	 * Can be filtered with the 'wcpay_multi_currency_available_currencies' hook.
-	 *
-	 * @return array Array with the available currencies' codes.
-	 */
-	private function get_account_available_currencies(): array {
-		// If Stripe is not connected, return an empty array. This prevents using MC without being connected to Stripe.
-		if ( ! $this->payments_account->is_stripe_connected() ) {
-			return [];
-		}
-
-		$wc_currencies      = array_keys( get_woocommerce_currencies() );
-		$account_currencies = $wc_currencies;
-
-		$account              = $this->payments_account->get_cached_account_data();
-		$supported_currencies = $this->payments_account->get_account_customer_supported_currencies();
-		if ( $account && ! empty( $supported_currencies ) ) {
-			$account_currencies = array_map( 'strtoupper', $supported_currencies );
-		}
-
-		/**
-		 * Filter the available currencies for WooCommerce Multi-Currency.
-		 *
-		 * This filter can be used to modify the currencies available for WC Pay
-		 * Multi-Currency. Currencies have to be added in uppercase and should
-		 * also be available in `get_woocommerce_currencies` for them to work.
-		 *
-		 * @since 2.8.0
-		 *
-		 * @param array $available_currencies Current available currencies. Calculated based on
-		 *                                    WC Pay's account currencies and WC currencies.
-		 */
-		return apply_filters( self::FILTER_PREFIX . 'available_currencies', array_intersect( $account_currencies, $wc_currencies ) );
-	}
-
-	/**
-	 * Checks if the merchant has enabled automatic currency switching and geolocation.
-	 *
-	 * @return bool
-	 */
-	public function is_using_auto_currency_switching(): bool {
-		return 'yes' === get_option( $this->id . '_enable_auto_currency', 'no' );
-	}
-
-	/**
-	 * Checks if the merchant has enabled the currency switcher widget.
-	 *
-	 * @return  bool
-	 */
-	public function is_using_storefront_switcher(): bool {
-		return 'yes' === get_option( $this->id . '_enable_storefront_switcher', 'no' );
-	}
-
-	/**
-	 * Gets the store settings.
-	 *
-	 * @return  array  The store settings.
-	 */
-	public function get_settings() {
-		return [
-			$this->id . '_enable_auto_currency'       => $this->is_using_auto_currency_switching(),
-			$this->id . '_enable_storefront_switcher' => $this->is_using_storefront_switcher(),
-			'site_theme'                              => wp_get_theme()->get( 'Name' ),
-			'date_format'                             => esc_attr( get_option( 'date_format', 'F j, Y' ) ),
-			'time_format'                             => esc_attr( get_option( 'time_format', 'g:i a' ) ),
-			'store_url'                               => esc_attr( get_page_uri( wc_get_page_id( 'shop' ) ) ),
-		];
-	}
-
-	/**
-	 * Updates the store settings
-	 *
-	 * @param   array $params  Update requested values.
-	 *
-	 * @return  void
-	 */
-	public function update_settings( $params ) {
-		$updateable_options = [
-			'wcpay_multi_currency_enable_auto_currency',
-			'wcpay_multi_currency_enable_storefront_switcher',
-		];
-
-		foreach ( $updateable_options as $key ) {
-			if ( isset( $params[ $key ] ) ) {
-				update_option( $key, sanitize_text_field( $params[ $key ] ) );
-			}
+		if ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG && file_exists( $plugin_path . $file ) ) {
+			return (string) filemtime( $plugin_path . trim( $file, '/' ) );
 		}
-	}
-
-	/**
-	 * Apply client order currency format and reduces the rounding precision to 2.
-	 *
-	 * @return  void
-	 */
-	public function set_client_format_and_rounding_precision() {
-		$screen = get_current_screen();
-		if ( in_array( $screen->id, [ 'shop_order', 'woocommerce_page_wc-orders' ], true ) ) :
-			$order = wc_get_order();
-			if ( ! $order ) {
-				return;
-			}
-			$currency                     = $order->get_currency();
-			$currency_format_num_decimals = $this->backend_currencies->get_price_decimals( $currency );
-			$currency_format_decimal_sep  = $this->backend_currencies->get_price_decimal_separator( $currency );
-			$currency_format_thousand_sep = $this->backend_currencies->get_price_thousand_separator( $currency );
-			$currency_format              = str_replace( [ '%1$s', '%2$s', '&nbsp;' ], [ '%s', '%v', ' ' ], $this->backend_currencies->get_woocommerce_price_format( $currency ) );
-
-			$rounding_precision = wc_get_price_decimals() ?? wc_get_rounding_precision();
-			?>
-		<script>
-		woocommerce_admin_meta_boxes.currency_format_num_decimals = <?php echo (int) $currency_format_num_decimals; ?>;
-		woocommerce_admin_meta_boxes.currency_format_decimal_sep = '<?php echo esc_attr( $currency_format_decimal_sep ); ?>';
-		woocommerce_admin_meta_boxes.currency_format_thousand_sep = '<?php echo esc_attr( $currency_format_thousand_sep ); ?>';
-		woocommerce_admin_meta_boxes.currency_format = '<?php echo esc_attr( $currency_format ); ?>';
-		woocommerce_admin_meta_boxes.rounding_precision = <?php echo (int) $rounding_precision; ?>;
-		</script>
-			<?php
-		endif;
-	}
-
-	/**
-	 * Register the CSS and JS admin scripts.
-	 *
-	 * @return void
-	 */
-	private function register_admin_scripts() {
-		WC_Payments::register_script_with_dependencies( 'WCPAY_MULTI_CURRENCY_SETTINGS', 'dist/multi-currency', [ 'WCPAY_ADMIN_SETTINGS' ] );
 
-		WC_Payments_Utils::register_style(
-			'WCPAY_MULTI_CURRENCY_SETTINGS',
-			plugins_url( 'dist/multi-currency.css', WCPAY_PLUGIN_FILE ),
-			[ 'wc-components', 'WCPAY_ADMIN_SETTINGS' ],
-			\WC_Payments::get_file_version( 'dist/multi-currency.css' ),
-			'all'
-		);
+		return $this->settings_service->get_plugin_version();
 	}
 
 	/**
@@ -1431,52 +1170,6 @@ public function possible_simulation_activation() {
 		$this->simulate_client_currency();
 	}
 
-	/**
-	 * Enables simulation of client browser currency.
-	 *
-	 * @return  void
-	 */
-	private function simulate_client_currency() {
-		if ( ! $this->simulation_params['enable_auto_currency'] ) {
-			return;
-		}
-
-		$countries = WC_Payments_Utils::supported_countries();
-
-		$predefined_simulation_currencies = [
-			Currency_Code::UNITED_STATES_DOLLAR => $countries[ Country_Code::UNITED_STATES ],
-			Currency_Code::POUND_STERLING       => $countries[ Country_Code::UNITED_KINGDOM ],
-		];
-
-		$simulation_currency      = Currency_Code::UNITED_STATES_DOLLAR === get_option( 'woocommerce_currency', Currency_Code::UNITED_STATES_DOLLAR ) ? Currency_Code::POUND_STERLING : Currency_Code::UNITED_STATES_DOLLAR;
-		$simulation_currency_name = $this->available_currencies[ $simulation_currency ]->get_name();
-		$simulation_country       = $predefined_simulation_currencies[ $simulation_currency ];
-
-		// Simulate client currency from geolocation.
-		add_filter(
-			'wcpay_multi_currency_override_notice_currency_name',
-			function ( $selected_currency_name ) use ( $simulation_currency_name ) {
-				return $simulation_currency_name;
-			}
-		);
-
-		// Simulate client country from geolocation.
-		add_filter(
-			'wcpay_multi_currency_override_notice_country',
-			function ( $selected_country ) use ( $simulation_country ) {
-				return $simulation_country;
-			}
-		);
-
-		// Always display the notice on simulation screen, prevent duplicate hooks.
-		if ( ! has_action( 'wp_footer', [ $this, 'display_geolocation_currency_update_notice' ] ) ) {
-			add_action( 'wp_footer', [ $this, 'display_geolocation_currency_update_notice' ] );
-		}
-
-		// Skip recalculating the cart to prevent infinite loop in simulation.
-		remove_action( 'wp_loaded', [ $this, 'recalculate_cart' ] );
-	}
-
 	/**
 	 * Returns whether the simulation querystring param is set and active
 	 *
@@ -1538,45 +1231,6 @@ public function get_multi_currency_onboarding_simulation_variables() {
 		return $values;
 	}
 
-	/**
-	 * Adds the required querystring parameters to all urls in preview pages.
-	 *
-	 * @return  void
-	 */
-	private function add_simulation_params_to_preview_urls() {
-		$params = $this->simulation_params;
-		add_filter(
-			'wp_footer',
-			function () use ( $params ) {
-				?>
-			<script type="text/javascript" id="wcpay_multi_currency-simulation-script">
-				// Add simulation overrides to all links.
-				document.querySelectorAll('a').forEach((link) => {
-					const parsedURL = new URL(link.href);
-					if (
-						false === parsedURL.searchParams.has( 'is_mc_onboarding_simulation' )
-					) {
-						parsedURL.searchParams.set('is_mc_onboarding_simulation', true);
-						parsedURL.searchParams.set('enable_auto_currency', <?php echo esc_attr( $params['enable_auto_currency'] ? 'true' : 'false' ); ?>);
-						parsedURL.searchParams.set('enable_storefront_switcher', <?php echo esc_attr( $params['enable_storefront_switcher'] ? 'true' : 'false' ); ?>);
-						link.href = parsedURL.toString();
-					}
-				});
-
-				// Unhide the store notice in simulation mode.
-				document.addEventListener('DOMContentLoaded', () => {
-					const noticeElement = document.querySelector('.woocommerce-store-notice.demo_store')
-					if( noticeElement ) {
-						const noticeId = noticeElement.getAttribute('data-notice-id');
-						cookieStore.delete( 'store_notice' + noticeId );
-					}
-				});
-			</script>
-				<?php
-			}
-		);
-	}
-
 	/**
 	 * Checks if the currently displayed page is the WooCommerce Payments
 	 * settings page for the Multi-Currency settings.
@@ -1661,6 +1315,375 @@ public function is_initialized(): bool {
 		return static::$is_initialized;
 	}
 
+	/**
+	 * Gets the price after adjusting it with the rounding and charm settings.
+	 *
+	 * @param float    $price               The price to be adjusted.
+	 * @param bool     $apply_charm_pricing Whether charm pricing should be applied.
+	 * @param Currency $currency The currency to be used when adjusting.
+	 *
+	 * @return float The adjusted price.
+	 */
+	protected function get_adjusted_price( $price, $apply_charm_pricing, $currency ): float {
+		$price = $this->ceil_price( $price, (float) $currency->get_rounding() );
+
+		if ( $apply_charm_pricing ) {
+			$price += (float) $currency->get_charm();
+		}
+
+		// Do not return negative prices (possible because of $currency->get_charm()).
+		return max( 0, $price );
+	}
+
+	/**
+	 * Ceils the price to the next number based on the rounding value.
+	 *
+	 * @param float $price    The price to be ceiled.
+	 * @param float $rounding The rounding option.
+	 *
+	 * @return float The ceiled price.
+	 */
+	protected function ceil_price( float $price, float $rounding ): float {
+		if ( 0.00 === $rounding ) {
+			return $price;
+		}
+		return ceil( $price / $rounding ) * $rounding;
+	}
+
+	/**
+	 * Sets up the available currencies, which are alphabetical by name.
+	 *
+	 * @return void
+	 */
+	private function initialize_available_currencies() {
+		// Add default store currency with a rate of 1.0.
+		$woocommerce_currency                                = get_woocommerce_currency();
+		$this->available_currencies[ $woocommerce_currency ] = new Currency( $this->localization_service, $woocommerce_currency, 1.0 );
+
+		$available_currencies = [];
+
+		$currencies = $this->get_account_available_currencies();
+		$cache_data = $this->get_cached_currencies();
+
+		foreach ( $currencies as $currency_code ) {
+			$currency_rate = $cache_data['currencies'][ $currency_code ] ?? 1.0;
+			$update_time   = $cache_data['updated'] ?? null;
+			$new_currency  = new Currency( $this->localization_service, $currency_code, $currency_rate, $update_time );
+
+			// Add this to our list of available currencies.
+			$available_currencies[ $new_currency->get_name() ] = $new_currency;
+		}
+
+		ksort( $available_currencies );
+
+		foreach ( $available_currencies as $currency ) {
+			$this->available_currencies[ $currency->get_code() ] = $currency;
+		}
+	}
+
+	/**
+	 * Sets up the enabled currencies.
+	 *
+	 * @return void
+	 */
+	private function initialize_enabled_currencies() {
+		$available_currencies     = $this->get_available_currencies();
+		$enabled_currency_codes   = get_option( $this->id . '_enabled_currencies', [] );
+		$enabled_currency_codes   = is_array( $enabled_currency_codes ) ? $enabled_currency_codes : [];
+		$default_code             = $this->get_default_currency()->get_code();
+		$default                  = [];
+		$enabled_currency_codes[] = $default_code;
+
+		// This allows to keep the alphabetical sorting by name.
+		$enabled_currencies = array_filter(
+			$available_currencies,
+			function ( $currency ) use ( $enabled_currency_codes ) {
+				return in_array( $currency->get_code(), $enabled_currency_codes, true );
+			}
+		);
+
+		$this->enabled_currencies = [];
+
+		foreach ( $enabled_currencies as $enabled_currency ) {
+			// Get the charm and rounding for each enabled currency and add the currencies to the object property.
+			$currency = clone $enabled_currency;
+			$charm    = get_option( $this->id . '_price_charm_' . $currency->get_id(), 0.00 );
+			$rounding = get_option( $this->id . '_price_rounding_' . $currency->get_id(), $currency->get_is_zero_decimal() ? '100' : '1.00' );
+			$currency->set_charm( $charm );
+			$currency->set_rounding( $rounding );
+
+			// If the currency is set to be manual, set the rate to the stored manual rate.
+			$type = get_option( $this->id . '_exchange_rate_' . $currency->get_id(), 'automatic' );
+			if ( 'manual' === $type ) {
+				$manual_rate = get_option( $this->id . '_manual_rate_' . $currency->get_id(), $currency->get_rate() );
+				$currency->set_rate( $manual_rate );
+			}
+
+			$this->enabled_currencies[ $currency->get_code() ] = $currency;
+		}
+
+		// Set default currency to the top of the list.
+		$default[ $default_code ] = $this->enabled_currencies[ $default_code ];
+		unset( $this->enabled_currencies[ $default_code ] );
+		$this->enabled_currencies = array_merge( $default, $this->enabled_currencies );
+	}
+
+	/**
+	 * Sets the default currency.
+	 *
+	 * @return void
+	 */
+	private function set_default_currency() {
+		$available_currencies   = $this->get_available_currencies();
+		$this->default_currency = $available_currencies[ get_woocommerce_currency() ] ?? null;
+	}
+
+	/**
+	 * Returns the currency code stored for the user or in the session.
+	 *
+	 * @return string|null Currency code.
+	 */
+	private function get_stored_currency_code() {
+		$user_id = get_current_user_id();
+
+		if ( $user_id ) {
+			return get_user_meta( $user_id, self::CURRENCY_META_KEY, true );
+		}
+
+		WC()->initialize_session();
+		$currency_code = WC()->session->get( self::CURRENCY_SESSION_KEY );
+
+		return is_string( $currency_code ) ? $currency_code : null;
+	}
+
+	/**
+	 * Checks to see if the store currency has changed. If it has, this will
+	 * also update the option containing the store currency.
+	 *
+	 * @return bool
+	 */
+	private function check_store_currency_for_change(): bool {
+		$last_known_currency  = get_option( $this->id . '_store_currency', false );
+		$woocommerce_currency = get_woocommerce_currency();
+
+		// If the last known currency was not set, update the option to set it and return false.
+		if ( ! $last_known_currency ) {
+			update_option( $this->id . '_store_currency', $woocommerce_currency );
+			return false;
+		}
+
+		if ( $last_known_currency !== $woocommerce_currency ) {
+			update_option( $this->id . '_store_currency', $woocommerce_currency );
+			return true;
+		}
+
+		return false;
+	}
+
+	/**
+	 * Called when the store currency has changed. Puts any manual rate currencies into an option for a notice to display.
+	 *
+	 * @return void
+	 */
+	private function update_manual_rate_currencies_notice_option() {
+		$enabled_currencies = $this->get_enabled_currencies();
+		$manual_currencies  = [];
+
+		// Check enabled currencies for manual rates.
+		foreach ( $enabled_currencies as $currency ) {
+			$rate_type = get_option( $this->id . '_exchange_rate_' . $currency->get_id(), false );
+			if ( 'manual' === $rate_type ) {
+				$manual_currencies[] = $currency->get_name();
+			}
+		}
+
+		if ( 0 < count( $manual_currencies ) ) {
+			update_option( $this->id . '_show_store_currency_changed_notice', $manual_currencies );
+		}
+	}
+
+	/**
+	 * Accepts an array of currencies that should have their settings removed.
+	 *
+	 * @param array $currencies Array of Currency objects or 3 letter currency codes.
+	 *
+	 * @return void
+	 */
+	private function remove_currencies_settings( array $currencies ) {
+
+		foreach ( $currencies as $currency ) {
+			$this->remove_currency_settings( $currency );
+		}
+	}
+
+	/**
+	 * Will remove a currency's settings if it is not enabled.
+	 *
+	 * @param mixed $currency Currency object or 3 letter currency code.
+	 *
+	 * @return void
+	 */
+	private function remove_currency_settings( $currency ) {
+		$code = is_a( $currency, Currency::class ) ? $currency->get_code() : strtoupper( $currency );
+
+		// Bail if the currency code passed is not 3 characters, or if the currency is presently enabled.
+		if ( 3 !== strlen( $code ) || isset( $this->get_enabled_currencies()[ $code ] ) ) {
+			return;
+		}
+
+		$settings = [
+			'price_charm',
+			'price_rounding',
+			'manual_rate',
+			'exchange_rate',
+		];
+
+		// Go through each setting and remove them.
+		foreach ( $settings as $setting ) {
+			delete_option( $this->id . '_' . $setting . '_' . strtolower( $code ) );
+		}
+	}
+
+	/**
+	 * Returns the currencies enabled for the payment provider account that are
+	 * also available in WC.
+	 *
+	 * Can be filtered with the 'wcpay_multi_currency_available_currencies' hook.
+	 *
+	 * @return array Array with the available currencies' codes.
+	 */
+	private function get_account_available_currencies(): array {
+		// If the payment provider is not connected, return an empty array. This prevents using MC without being connected to the payment provider.
+		if ( ! $this->payments_account->is_provider_connected() ) {
+			return [];
+		}
+
+		$wc_currencies      = array_keys( get_woocommerce_currencies() );
+		$account_currencies = $wc_currencies;
+
+		$account              = $this->payments_account->get_cached_account_data();
+		$supported_currencies = $this->payments_account->get_account_customer_supported_currencies();
+		if ( $account && ! empty( $supported_currencies ) ) {
+			$account_currencies = array_map( 'strtoupper', $supported_currencies );
+		}
+
+		/**
+		 * Filter the available currencies for WooCommerce Multi-Currency.
+		 *
+		 * This filter can be used to modify the currencies available for WC Pay
+		 * Multi-Currency. Currencies have to be added in uppercase and should
+		 * also be available in `get_woocommerce_currencies` for them to work.
+		 *
+		 * @since 2.8.0
+		 *
+		 * @param array $available_currencies Current available currencies. Calculated based on
+		 *                                    WC Pay's account currencies and WC currencies.
+		 */
+		return apply_filters( self::FILTER_PREFIX . 'available_currencies', array_intersect( $account_currencies, $wc_currencies ) );
+	}
+
+	/**
+	 * Register the CSS and JS admin scripts.
+	 *
+	 * @return void
+	 */
+	private function register_admin_scripts() {
+		$this->register_script_with_dependencies( 'WCPAY_MULTI_CURRENCY_SETTINGS', 'dist/multi-currency', [ 'WCPAY_ADMIN_SETTINGS' ] );
+
+		wp_register_style(
+			'WCPAY_MULTI_CURRENCY_SETTINGS',
+			plugins_url( 'dist/multi-currency.css', $this->settings_service->get_plugin_file_path() ),
+			[ 'wc-components', 'WCPAY_ADMIN_SETTINGS' ],
+			$this->get_file_version( 'dist/multi-currency.css' ),
+			'all'
+		);
+	}
+
+	/**
+	 * Enables simulation of client browser currency.
+	 *
+	 * @return  void
+	 */
+	private function simulate_client_currency() {
+		if ( ! $this->simulation_params['enable_auto_currency'] ) {
+			return;
+		}
+
+		$countries = $this->payments_account->get_supported_countries();
+
+		$predefined_simulation_currencies = [
+			'USD' => $countries['US'],
+			'GBP' => $countries['GB'],
+		];
+
+		$simulation_currency      = 'USD' === get_option( 'woocommerce_currency', 'USD' ) ? 'GBP' : 'USD';
+		$simulation_currency_name = $this->available_currencies[ $simulation_currency ]->get_name();
+		$simulation_country       = $predefined_simulation_currencies[ $simulation_currency ];
+
+		// Simulate client currency from geolocation.
+		add_filter(
+			'wcpay_multi_currency_override_notice_currency_name',
+			function ( $selected_currency_name ) use ( $simulation_currency_name ) {
+				return $simulation_currency_name;
+			}
+		);
+
+		// Simulate client country from geolocation.
+		add_filter(
+			'wcpay_multi_currency_override_notice_country',
+			function ( $selected_country ) use ( $simulation_country ) {
+				return $simulation_country;
+			}
+		);
+
+		// Always display the notice on simulation screen, prevent duplicate hooks.
+		if ( ! has_action( 'wp_footer', [ $this, 'display_geolocation_currency_update_notice' ] ) ) {
+			add_action( 'wp_footer', [ $this, 'display_geolocation_currency_update_notice' ] );
+		}
+
+		// Skip recalculating the cart to prevent infinite loop in simulation.
+		remove_action( 'wp_loaded', [ $this, 'recalculate_cart' ] );
+	}
+
+	/**
+	 * Adds the required querystring parameters to all urls in preview pages.
+	 *
+	 * @return  void
+	 */
+	private function add_simulation_params_to_preview_urls() {
+		$params = $this->simulation_params;
+		add_filter(
+			'wp_footer',
+			function () use ( $params ) {
+				?>
+			<script type="text/javascript" id="wcpay_multi_currency-simulation-script">
+				// Add simulation overrides to all links.
+				document.querySelectorAll('a').forEach((link) => {
+					const parsedURL = new URL(link.href);
+					if (
+						false === parsedURL.searchParams.has( 'is_mc_onboarding_simulation' )
+					) {
+						parsedURL.searchParams.set('is_mc_onboarding_simulation', true);
+						parsedURL.searchParams.set('enable_auto_currency', <?php echo esc_attr( $params['enable_auto_currency'] ? 'true' : 'false' ); ?>);
+						parsedURL.searchParams.set('enable_storefront_switcher', <?php echo esc_attr( $params['enable_storefront_switcher'] ? 'true' : 'false' ); ?>);
+						link.href = parsedURL.toString();
+					}
+				});
+
+				// Unhide the store notice in simulation mode.
+				document.addEventListener('DOMContentLoaded', () => {
+					const noticeElement = document.querySelector('.woocommerce-store-notice.demo_store')
+					if( noticeElement ) {
+						const noticeId = noticeElement.getAttribute('data-notice-id');
+						cookieStore.delete( 'store_notice' + noticeId );
+					}
+				});
+			</script>
+				<?php
+			}
+		);
+	}
+
 	/**
 	 * Logs a message and throws InvalidCurrencyException.
 	 *
@@ -1673,7 +1696,7 @@ public function is_initialized(): bool {
 	private function log_and_throw_invalid_currency_exception( $method, $currency_code, $code = 500 ) {
 		$message = 'Invalid currency passed to ' . $method . ': ' . $currency_code;
 		Logger::error( $message );
-		throw new InvalidCurrencyException( esc_html( $message ), 'wcpay_multi_currency_invalid_currency', esc_html( $code ) );
+		throw new InvalidCurrencyException( esc_html( $message ), esc_html( $code ) );
 	}
 
 	/**
diff --git a/includes/multi-currency/Notes/NoteMultiCurrencyAvailable.php b/multi-currency/src/Notes/NoteMultiCurrencyAvailable.php
similarity index 84%
rename from includes/multi-currency/Notes/NoteMultiCurrencyAvailable.php
rename to multi-currency/src/Notes/NoteMultiCurrencyAvailable.php
index 3c204666881..4410e79e56f 100644
--- a/includes/multi-currency/Notes/NoteMultiCurrencyAvailable.php
+++ b/multi-currency/src/Notes/NoteMultiCurrencyAvailable.php
@@ -9,7 +9,7 @@
 
 use Automattic\WooCommerce\Admin\Notes\Note;
 use Automattic\WooCommerce\Admin\Notes\NoteTraits;
-use WC_Payments_Account;
+use WCPay\MultiCurrency\Interfaces\MultiCurrencyAccountInterface;
 
 defined( 'ABSPATH' ) || exit;
 
@@ -33,7 +33,7 @@ class NoteMultiCurrencyAvailable {
 	/**
 	 * The account service instance.
 	 *
-	 * @var WC_Payments_Account
+	 * @var MultiCurrencyAccountInterface
 	 */
 	private static $account;
 
@@ -65,7 +65,7 @@ public static function get_note() {
 	 */
 	public static function possibly_add_note() {
 		// Don't add the note if the merchant didn't create a WCPay account yet.
-		if ( is_null( self::$account ) || ! self::$account->is_stripe_connected() ) {
+		if ( is_null( self::$account ) || ! self::$account->is_provider_connected() ) {
 			return;
 		}
 
@@ -80,9 +80,9 @@ public static function possibly_add_note() {
 	/**
 	 * Sets the account service instance reference on the class.
 	 *
-	 * @param WC_Payments_Account $account account service instance.
+	 * @param MultiCurrencyAccountInterface $account account service instance.
 	 */
-	public static function set_account( WC_Payments_Account $account ) {
+	public static function set_account( MultiCurrencyAccountInterface $account ) {
 		self::$account = $account;
 	}
 }
diff --git a/includes/multi-currency/RestController.php b/multi-currency/src/RestController.php
similarity index 78%
rename from includes/multi-currency/RestController.php
rename to multi-currency/src/RestController.php
index 0266b5f4e76..df36b1186b4 100644
--- a/includes/multi-currency/RestController.php
+++ b/multi-currency/src/RestController.php
@@ -1,21 +1,29 @@
 <?php
 /**
- * Class WC_REST_Controller
+ * Class RestController
  *
  * @package WooCommerce\Payments\MultiCurrency
  */
 
 namespace WCPay\MultiCurrency;
 
-use WCPay\Exceptions\Base_Exception;
+use Exception;
 use WCPay\MultiCurrency\Exceptions\InvalidCurrencyException;
+use WCPay\MultiCurrency\MultiCurrency;
 
 defined( 'ABSPATH' ) || exit;
 
 /**
  * REST controller for multi-currency.
  */
-class RestController extends \WC_Payments_REST_Controller {
+class RestController extends \WP_REST_Controller {
+
+	/**
+	 * Endpoint namespace.
+	 *
+	 * @var string
+	 */
+	protected $namespace = 'wc/v3';
 
 	/**
 	 * Endpoint path.
@@ -24,6 +32,23 @@ class RestController extends \WC_Payments_REST_Controller {
 	 */
 	protected $rest_base = 'payments/multi-currency';
 
+	/**
+	 * MultiCurrency instance.
+	 *
+	 * @var MultiCurrency
+	 */
+	protected $multi_currency;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param MultiCurrency $multi_currency MultiCurrency instance.
+	 */
+	public function __construct( MultiCurrency $multi_currency ) {
+		$this->multi_currency = $multi_currency;
+	}
+
+
 	/**
 	 * Configure REST API routes.
 	 */
@@ -144,7 +169,7 @@ public function register_routes() {
 	 * @return \WP_REST_Response|\WP_Error Array of the store currencies structure.
 	 */
 	public function get_store_currencies() {
-		return rest_ensure_response( WC_Payments_Multi_Currency()->get_store_currencies() );
+		return rest_ensure_response( $this->multi_currency->get_store_currencies() );
 	}
 
 	/**
@@ -157,10 +182,10 @@ public function get_store_currencies() {
 	public function update_enabled_currencies( $request ) {
 		$enabled = $request->get_param( 'enabled' );
 		try {
-			WC_Payments_Multi_Currency()->set_enabled_currencies( $enabled );
+			$this->multi_currency->set_enabled_currencies( $enabled );
 			$response = $this->get_store_currencies();
 		} catch ( InvalidCurrencyException $e ) {
-			$response = new \WP_Error( $e->get_error_code(), $e->getMessage() );
+			$response = new \WP_Error( $e->getCode(), $e->getMessage() );
 		}
 		return rest_ensure_response( $response );
 	}
@@ -176,9 +201,9 @@ public function get_single_currency_settings( $request ) {
 		$currency_code = $request->get_param( 'currency_code' );
 
 		try {
-			$response = WC_Payments_Multi_Currency()->get_single_currency_settings( $currency_code );
+			$response = $this->multi_currency->get_single_currency_settings( $currency_code );
 		} catch ( InvalidCurrencyException $e ) {
-			$response = new \WP_Error( $e->get_error_code(), $e->getMessage() );
+			$response = new \WP_Error( $e->getCode(), $e->getMessage() );
 		}
 
 		return rest_ensure_response( $response );
@@ -199,10 +224,10 @@ public function update_single_currency_settings( $request ) {
 		$manual_rate        = $request->get_param( 'manual_rate' ) ?? null;
 
 		try {
-			WC_Payments_Multi_Currency()->update_single_currency_settings( $currency_code, $exchange_rate_type, $price_rounding, $price_charm, $manual_rate );
-			$response = WC_Payments_Multi_Currency()->get_single_currency_settings( $currency_code );
-		} catch ( Base_Exception $e ) {
-			$response = new \WP_Error( $e->get_error_code(), $e->getMessage() );
+			$this->multi_currency->update_single_currency_settings( $currency_code, $exchange_rate_type, $price_rounding, $price_charm, $manual_rate );
+			$response = $this->multi_currency->get_single_currency_settings( $currency_code );
+		} catch ( Exception $e ) {
+			$response = new \WP_Error( $e->getCode(), $e->getMessage() );
 		}
 
 		return rest_ensure_response( $response );
@@ -214,7 +239,7 @@ public function update_single_currency_settings( $request ) {
 	 * @return \WP_REST_Response|\WP_Error The store settings as an array.
 	 */
 	public function get_settings() {
-		return rest_ensure_response( WC_Payments_Multi_Currency()->get_settings() );
+		return rest_ensure_response( $this->multi_currency->get_settings() );
 	}
 
 	/**
@@ -226,7 +251,14 @@ public function get_settings() {
 	 */
 	public function update_settings( $request ) {
 		$params = $request->get_params();
-		WC_Payments_Multi_Currency()->update_settings( $params );
-		return rest_ensure_response( WC_Payments_Multi_Currency()->get_settings() );
+		$this->multi_currency->update_settings( $params );
+		return rest_ensure_response( $this->multi_currency->get_settings() );
+	}
+
+	/**
+	 * Verify access.
+	 */
+	public function check_permission() {
+		return current_user_can( 'manage_woocommerce' );
 	}
 }
diff --git a/includes/multi-currency/Settings.php b/multi-currency/src/Settings.php
similarity index 96%
rename from includes/multi-currency/Settings.php
rename to multi-currency/src/Settings.php
index 11c74d56619..8fe0a4aafcd 100644
--- a/includes/multi-currency/Settings.php
+++ b/multi-currency/src/Settings.php
@@ -88,7 +88,7 @@ public function wcpay_multi_currency_settings_page() {
 	 * Load inline Emoji detection script on multi-currency settings page
 	 */
 	public function maybe_add_print_emoji_detection_script() {
-		if ( WC_Payments_Multi_Currency()->is_multi_currency_settings_page() ) {
+		if ( $this->multi_currency->is_multi_currency_settings_page() ) {
 			print_emoji_detection_script();
 		}
 	}
diff --git a/includes/multi-currency/SettingsOnboardCta.php b/multi-currency/src/SettingsOnboardCta.php
similarity index 74%
rename from includes/multi-currency/SettingsOnboardCta.php
rename to multi-currency/src/SettingsOnboardCta.php
index ee89ea5638c..59a2eee286f 100644
--- a/includes/multi-currency/SettingsOnboardCta.php
+++ b/multi-currency/src/SettingsOnboardCta.php
@@ -7,6 +7,8 @@
 
 namespace WCPay\MultiCurrency;
 
+use WCPay\MultiCurrency\Interfaces\MultiCurrencyAccountInterface;
+
 defined( 'ABSPATH' ) || exit;
 
 /**
@@ -27,15 +29,24 @@ class SettingsOnboardCta extends \WC_Settings_Page {
 	 */
 	private $multi_currency;
 
+	/**
+	 * Instance of MultiCurrencyAccountInterface.
+	 *
+	 * @var MultiCurrencyAccountInterface
+	 */
+	private $payments_account;
+
 	/**
 	 * Constructor.
 	 *
-	 * @param MultiCurrency $multi_currency The MultiCurrency instance.
+	 * @param MultiCurrency                 $multi_currency The MultiCurrency instance.
+	 * @param MultiCurrencyAccountInterface $payments_account Payments Account instance.
 	 */
-	public function __construct( MultiCurrency $multi_currency ) {
-		$this->multi_currency = $multi_currency;
-		$this->id             = $this->multi_currency->id;
-		$this->label          = _x( 'Multi-currency', 'Settings tab label', 'woocommerce-payments' );
+	public function __construct( MultiCurrency $multi_currency, MultiCurrencyAccountInterface $payments_account ) {
+		$this->multi_currency   = $multi_currency;
+		$this->payments_account = $payments_account;
+		$this->id               = $this->multi_currency->id;
+		$this->label            = _x( 'Multi-currency', 'Settings tab label', 'woocommerce-payments' );
 
 		parent::__construct();
 	}
@@ -53,7 +64,7 @@ public function init_hooks() {
 	 * Output the call to action button if needing to onboard.
 	 */
 	public function currencies_settings_onboarding_cta() {
-		$href = \WC_Payments_Account::get_connect_page_url();
+		$href = $this->payments_account->get_provider_onboarding_page_url();
 		?>
 			<div>
 				<p>
diff --git a/includes/multi-currency/StorefrontIntegration.php b/multi-currency/src/StorefrontIntegration.php
similarity index 100%
rename from includes/multi-currency/StorefrontIntegration.php
rename to multi-currency/src/StorefrontIntegration.php
diff --git a/includes/multi-currency/Tracking.php b/multi-currency/src/Tracking.php
similarity index 100%
rename from includes/multi-currency/Tracking.php
rename to multi-currency/src/Tracking.php
diff --git a/includes/multi-currency/UserSettings.php b/multi-currency/src/UserSettings.php
similarity index 100%
rename from includes/multi-currency/UserSettings.php
rename to multi-currency/src/UserSettings.php
diff --git a/includes/multi-currency/Utils.php b/multi-currency/src/Utils.php
similarity index 51%
rename from includes/multi-currency/Utils.php
rename to multi-currency/src/Utils.php
index 64e5356a77a..b0c1fba84ea 100644
--- a/includes/multi-currency/Utils.php
+++ b/multi-currency/src/Utils.php
@@ -57,7 +57,7 @@ public function is_page_with_vars( array $pages, array $vars ): bool {
 	 * @return boolean
 	 */
 	public static function is_admin_api_request(): bool {
-		return 0 === stripos( wp_get_referer(), admin_url() ) && WC()->is_rest_api_request() && ! \WC_Payments_Utils::is_store_api_request();
+		return 0 === stripos( wp_get_referer(), admin_url() ) && WC()->is_rest_api_request() && ! self::is_store_api_request();
 	}
 
 
@@ -71,4 +71,39 @@ public static function is_admin_api_request(): bool {
 	public static function set_customer_session_cookie( bool $set ) {
 		WC()->session->set_customer_session_cookie( $set );
 	}
+
+	/**
+	 * Returns true if the request is a store REST API request.
+	 *
+	 * @return bool
+	 */
+	public static function is_store_api_request() {
+		if ( function_exists( 'WC' ) && method_exists( WC(), 'is_store_api_request' ) ) {
+			return WC()->is_store_api_request();
+		}
+		// The logic below is sourced from `WC()->is_store_api_request()`.
+		if ( empty( $_SERVER['REQUEST_URI'] ) ) {
+			return false;
+		}
+		// phpcs:disable WordPress.Security.ValidatedSanitizedInput.MissingUnslash, WordPress.Security.ValidatedSanitizedInput.InputNotSanitized
+		return false !== strpos( $_SERVER['REQUEST_URI'], trailingslashit( rest_get_url_prefix() ) . 'wc/store/' );
+	}
+
+	/**
+	 * Returns true if the request that's currently being processed is a Store API batch request, false
+	 * otherwise.
+	 *
+	 * @return bool True if the request is a Store API batch request, false otherwise.
+	 */
+	public static function is_store_batch_request(): bool {
+		if ( isset( $_REQUEST['rest_route'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification
+			$rest_route = sanitize_text_field( $_REQUEST['rest_route'] ); // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.MissingUnslash,WordPress.Security.NonceVerification
+		} else {
+			$url_parts    = wp_parse_url( esc_url_raw( $_SERVER['REQUEST_URI'] ?? '' ) ); // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.MissingUnslash
+			$request_path = $url_parts ? rtrim( $url_parts['path'], '/' ) : '';
+			$rest_route   = str_replace( trailingslashit( rest_get_url_prefix() ), '', $request_path );
+		}
+
+		return 1 === preg_match( '@^\/wc\/store(\/v[\d]+)?\/batch@', $rest_route );
+	}
 }
diff --git a/phpcs.xml.dist b/phpcs.xml.dist
index 6e21606d2bb..a0bf916f7a9 100644
--- a/phpcs.xml.dist
+++ b/phpcs.xml.dist
@@ -102,7 +102,7 @@
 
 	<rule ref="WordPress.Files.FileName">
 		<exclude-pattern>tests/*</exclude-pattern>
-		<exclude-pattern>includes/multi-currency</exclude-pattern>
+		<exclude-pattern>multi-currency/src</exclude-pattern>
 		<exclude-pattern>src</exclude-pattern>
 	</rule>
 
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
index 2a5164e8af3..1eb5fab3f04 100644
--- a/psalm-baseline.xml
+++ b/psalm-baseline.xml
@@ -46,13 +46,13 @@
       <code>WC_Subscriptions_Product</code>
     </UndefinedClass>
   </file>
-  <file src="includes/multi-currency/Compatibility/WooCommerceProductAddOns.php">
+  <file src="multi-currency/src/Compatibility/WooCommerceProductAddOns.php">
     <UndefinedClass occurrences="2">
       <code>\WC_Product_Addons_Helper</code>
       <code>\WC_Product_Addons_Helper</code>
     </UndefinedClass>
   </file>
-  <file src="includes/multi-currency/Compatibility/WooCommerceNameYourPrice.php">
+  <file src="multi-currency/src/Compatibility/WooCommerceNameYourPrice.php">
     <UndefinedClass occurrences="2">
       <code>\WC_Name_Your_Price_Helpers</code>
       <code>\WC_Name_Your_Price_Helpers</code>
diff --git a/tasks/release.js b/tasks/release.js
index 92559af4ffb..72c3eccdef7 100644
--- a/tasks/release.js
+++ b/tasks/release.js
@@ -14,11 +14,11 @@ const targetFolder = 'release/' + pluginSlug;
 const filesToCopy = [
 	'assets',
 	'dist',
-	'includes',
 	'i18n',
+	'includes',
 	'languages',
-	'src',
 	'lib',
+	'src',
 	'templates',
 	'vendor',
 	'woocommerce-payments.php',
@@ -43,6 +43,10 @@ rm( 'dist/*.map' );
 // copy the directories to the release folder
 cp( '-Rf', filesToCopy, targetFolder );
 
+// copy the multi-currency files
+mkdir( '-p', targetFolder + '/multi-currency' );
+cp( '-R', 'multi-currency/src', targetFolder + '/multi-currency/src' );
+
 const output = fs.createWriteStream(
 	releaseFolder + '/' + pluginSlug + '.zip'
 );
diff --git a/tests/js/jest.config.js b/tests/js/jest.config.js
index 18c11bc9553..03060196d4c 100644
--- a/tests/js/jest.config.js
+++ b/tests/js/jest.config.js
@@ -2,13 +2,18 @@ const { jsWithBabel: tsjPreset } = require( 'ts-jest/presets' );
 
 module.exports = {
 	rootDir: '../../',
-	moduleDirectories: [ 'node_modules', '<rootDir>/client' ],
+	moduleDirectories: [
+		'node_modules',
+		'<rootDir>/client',
+		'<rootDir>/multi-currency/client',
+	],
 	moduleNameMapper: {
 		'^react$': '<rootDir>/node_modules/react',
 		'^react-dom$': '<rootDir>/node_modules/react-dom',
 		'^moment$': '<rootDir>/node_modules/moment',
 		'^moment-timezone$': '<rootDir>/node_modules/moment-timezone',
 		'^wcpay(.*)$': '<rootDir>/client$1',
+		'^multi-currency(.*)$': '<rootDir>/multi-currency/client$1',
 		'^iti/utils$': '<rootDir>/node_modules/intl-tel-input/build/js/utils',
 		'^assets(.*?)(\\?.*)?$': '<rootDir>/assets$1',
 		'^@woocommerce/blocks-registry$':
diff --git a/tests/unit/multi-currency/compatibility/test-class-woocommerce-subscriptions.php b/tests/unit/multi-currency/compatibility/test-class-woocommerce-subscriptions.php
index 5b71b8f8e7f..c2085b1fe5d 100644
--- a/tests/unit/multi-currency/compatibility/test-class-woocommerce-subscriptions.php
+++ b/tests/unit/multi-currency/compatibility/test-class-woocommerce-subscriptions.php
@@ -6,6 +6,11 @@
  */
 
 use WCPay\MultiCurrency\Compatibility\WooCommerceSubscriptions;
+use WCPay\MultiCurrency\Interfaces\MultiCurrencyAccountInterface;
+use WCPay\MultiCurrency\Interfaces\MultiCurrencyApiClientInterface;
+use WCPay\MultiCurrency\Interfaces\MultiCurrencyCacheInterface;
+use WCPay\MultiCurrency\Interfaces\MultiCurrencyLocalizationInterface;
+use WCPay\MultiCurrency\Interfaces\MultiCurrencySettingsInterface;
 use WCPay\MultiCurrency\MultiCurrency;
 use WCPay\MultiCurrency\Utils;
 
@@ -62,7 +67,16 @@ class WCPay_Multi_Currency_WooCommerceSubscriptions_Tests extends WCPAY_UnitTest
 	public function set_up() {
 		parent::set_up();
 
-		$this->mock_multi_currency       = $this->createMock( MultiCurrency::class );
+		$mock_api_client   = $this->createMock( MultiCurrencyApiClientInterface::class );
+		$mock_account      = $this->createMock( MultiCurrencyAccountInterface::class );
+		$mock_localization = $this->createMock( MultiCurrencyLocalizationInterface::class );
+		$mock_cache        = $this->createMock( MultiCurrencyCacheInterface::class );
+		$mock_settings     = $this->createMock( MultiCurrencySettingsInterface::class );
+
+		$this->mock_multi_currency = $this->getMockBuilder( MultiCurrency::class )
+			->setConstructorArgs( [ $mock_settings, $mock_api_client, $mock_account, $mock_localization, $mock_cache ] )
+			->getMock();
+
 		$this->mock_utils                = $this->createMock( Utils::class );
 		$this->woocommerce_subscriptions = new WooCommerceSubscriptions( $this->mock_multi_currency, $this->mock_utils );
 
@@ -828,18 +842,11 @@ public function test_maybe_get_explicit_format_for_subscription_total() {
 			->willReturn( true );
 
 		// Arrange: Set expectation and return for is_initialized and has_additional_currencies_enabled.
-		$this->mock_multi_currency
-			->expects( $this->once() )
-			->method( 'is_initialized' )
-			->willReturn( true );
 		$this->mock_multi_currency
 			->expects( $this->once() )
 			->method( 'has_additional_currencies_enabled' )
 			->willReturn( true );
 
-		// Arrange: Make sure to set our Multi-Currency instance as our mock instance.
-		WC_Payments_Explicit_Price_Formatter::set_multi_currency_instance( $this->mock_multi_currency );
-
 		// Arrange/Assert: Apply the woocommerce_subscription_price_string_details filter and confirm the filter does not change the passed array.
 		$this->assertSame( [ 1, 2, 3 ], apply_filters( 'woocommerce_subscription_price_string_details', [ 1, 2, 3 ], $mock_subscription ) );
 
diff --git a/tests/unit/multi-currency/notes/test-class-note-multi-currency-available-test.php b/tests/unit/multi-currency/notes/test-class-note-multi-currency-available-test.php
index 5a985dd0511..e434ae9f661 100644
--- a/tests/unit/multi-currency/notes/test-class-note-multi-currency-available-test.php
+++ b/tests/unit/multi-currency/notes/test-class-note-multi-currency-available-test.php
@@ -6,6 +6,7 @@
  */
 
 use WCPay\MultiCurrency\Notes\NoteMultiCurrencyAvailable;
+use WCPay\MultiCurrency\Interfaces\MultiCurrencyAccountInterface;
 
 /**
  * Class Note_Multi_Currency_Available_Test tests.
@@ -55,8 +56,8 @@ public function test_possibly_add_note_without_account() {
 	}
 
 	public function test_possibly_add_note_with_account_not_connected() {
-		$account_mock = $this->createMock( WC_Payments_Account::class );
-		$account_mock->method( 'is_stripe_connected' )->willReturn( false );
+		$account_mock = $this->createMock( MultiCurrencyAccountInterface::class );
+		$account_mock->method( 'is_provider_connected' )->willReturn( false );
 		NoteMultiCurrencyAvailable::set_account( $account_mock );
 
 		NoteMultiCurrencyAvailable::possibly_add_note();
@@ -65,8 +66,8 @@ public function test_possibly_add_note_with_account_not_connected() {
 	}
 
 	public function test_possibly_add_note_with_connected_account() {
-		$account_mock = $this->createMock( WC_Payments_Account::class );
-		$account_mock->method( 'is_stripe_connected' )->willReturn( true );
+		$account_mock = $this->createMock( MultiCurrencyAccountInterface::class );
+		$account_mock->method( 'is_provider_connected' )->willReturn( true );
 		NoteMultiCurrencyAvailable::set_account( $account_mock );
 
 		NoteMultiCurrencyAvailable::possibly_add_note();
diff --git a/tests/unit/multi-currency/test-class-analytics.php b/tests/unit/multi-currency/test-class-analytics.php
index 00b46e2d7ef..178db790140 100644
--- a/tests/unit/multi-currency/test-class-analytics.php
+++ b/tests/unit/multi-currency/test-class-analytics.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Class WCPay_Multi_Currency_Compatibility_Tests
+ * Class WCPay_Multi_Currency_Analytics_Tests
  *
  * @package WooCommerce\Payments\Tests
  */
@@ -10,6 +10,11 @@
 use PHPUnit\Framework\MockObject\MockObject;
 use WCPay\MultiCurrency\Analytics;
 use WCPay\MultiCurrency\Currency;
+use WCPay\MultiCurrency\Interfaces\MultiCurrencyAccountInterface;
+use WCPay\MultiCurrency\Interfaces\MultiCurrencyApiClientInterface;
+use WCPay\MultiCurrency\Interfaces\MultiCurrencyCacheInterface;
+use WCPay\MultiCurrency\Interfaces\MultiCurrencyLocalizationInterface;
+use WCPay\MultiCurrency\Interfaces\MultiCurrencySettingsInterface;
 use WCPay\MultiCurrency\MultiCurrency;
 
 /**
@@ -54,9 +59,9 @@ class WCPay_Multi_Currency_Analytics_Tests extends WCPAY_UnitTestCase {
 	/**
 	 * The localization service.
 	 *
-	 * @var WC_Payments_Localization_Service
+	 * @var MultiCurrencyLocalizationInterface
 	 */
-	private $localization_service;
+	private $mock_localization_service;
 
 	/**
 	 * Pre-test setup
@@ -72,7 +77,15 @@ public function set_up() {
 		$cb = $this->create_can_manage_woocommerce_cap_override( true );
 		add_filter( 'user_has_cap', $cb );
 
-		$this->mock_multi_currency = $this->createMock( MultiCurrency::class );
+		$mock_api_client   = $this->createMock( MultiCurrencyApiClientInterface::class );
+		$mock_account      = $this->createMock( MultiCurrencyAccountInterface::class );
+		$mock_localization = $this->createMock( MultiCurrencyLocalizationInterface::class );
+		$mock_cache        = $this->createMock( MultiCurrencyCacheInterface::class );
+		$mock_settings     = $this->createMock( MultiCurrencySettingsInterface::class );
+
+		$this->mock_multi_currency = $this->getMockBuilder( MultiCurrency::class )
+			->setConstructorArgs( [ $mock_settings, $mock_api_client, $mock_account, $mock_localization, $mock_cache ] )
+			->getMock();
 
 		$this->mock_multi_currency->expects( $this->any() )
 			->method( 'get_all_customer_currencies' )
@@ -82,9 +95,12 @@ public function set_up() {
 			->method( 'get_available_currencies' )
 			->willReturn( $this->get_mock_available_currencies() );
 
-		$this->analytics = new Analytics( $this->mock_multi_currency );
+		$this->analytics = new Analytics( $this->mock_multi_currency, $mock_settings );
 
-		$this->localization_service = new WC_Payments_Localization_Service();
+		$this->mock_localization_service = $this->createMock( MultiCurrencyLocalizationInterface::class );
+		$this->mock_localization_service->expects( $this->any() )
+			->method( 'get_currency_format' )
+			->willReturn( [ 'num_decimals' => 2 ] );
 
 		remove_filter( 'user_has_cap', $cb );
 	}
@@ -164,7 +180,7 @@ public function test_update_order_stats_data_with_multi_currency_order_without_m
 	public function test_update_order_stats_data_with_multi_currency_order() {
 		$this->mock_multi_currency->expects( $this->once() )
 			->method( 'get_default_currency' )
-			->willReturn( new Currency( $this->localization_service, 'USD', 1.0 ) );
+			->willReturn( new Currency( $this->mock_localization_service, 'USD', 1.0 ) );
 
 		$args  = $this->order_args_provider( 123, 0, 1, 15.50, 1.50, 0, 14.00 );
 		$order = wc_create_order();
@@ -179,7 +195,7 @@ public function test_update_order_stats_data_with_multi_currency_order() {
 	public function test_update_order_stats_data_with_large_order() {
 		$this->mock_multi_currency->expects( $this->once() )
 			->method( 'get_default_currency' )
-			->willReturn( new Currency( $this->localization_service, 'USD', 1.0 ) );
+			->willReturn( new Currency( $this->mock_localization_service, 'USD', 1.0 ) );
 
 		$args  = $this->order_args_provider( 123, 0, 1, 130500.75, 20000, 10000, 100500.75 );
 		$order = wc_create_order();
@@ -194,7 +210,7 @@ public function test_update_order_stats_data_with_large_order() {
 	public function test_update_order_stats_data_with_stripe_exchange_rate() {
 		$this->mock_multi_currency->expects( $this->once() )
 			->method( 'get_default_currency' )
-			->willReturn( new Currency( $this->localization_service, 'USD', 1.0 ) );
+			->willReturn( new Currency( $this->mock_localization_service, 'USD', 1.0 ) );
 
 		$args  = $this->order_args_provider( 123, 0, 1, 15.50, 1.50, 0, 15.00 );
 		$order = wc_create_order();
@@ -587,14 +603,19 @@ private function create_can_manage_woocommerce_cap_override( bool $can_manage_wo
 	}
 
 	private function get_mock_available_currencies() {
-		$this->localization_service = new WC_Payments_Localization_Service();
+		$this->mock_localization_service = $this->createMock( MultiCurrencyLocalizationInterface::class );
 		if ( empty( $this->mock_available_currencies ) ) {
+			$this->mock_localization_service
+				->expects( $this->any() )
+				->method( 'get_currency_format' )
+				->willReturn( [ 'num_decimals' => 2 ] );
+
 			$this->mock_available_currencies = [
-				'GBP' => new Currency( $this->localization_service, 'GBP', 1.2 ),
-				'USD' => new Currency( $this->localization_service, 'USD', 1 ),
-				'EUR' => new Currency( $this->localization_service, 'EUR', 0.9 ),
-				'ISK' => new Currency( $this->localization_service, 'ISK', 30.52 ),
-				'NZD' => new Currency( $this->localization_service, 'NZD', 1.4 ),
+				'GBP' => new Currency( $this->mock_localization_service, 'GBP', 1.2 ),
+				'USD' => new Currency( $this->mock_localization_service, 'USD', 1 ),
+				'EUR' => new Currency( $this->mock_localization_service, 'EUR', 0.9 ),
+				'ISK' => new Currency( $this->mock_localization_service, 'ISK', 30.52 ),
+				'NZD' => new Currency( $this->mock_localization_service, 'NZD', 1.4 ),
 			];
 		}
 
diff --git a/tests/unit/multi-currency/test-class-backend-currencies.php b/tests/unit/multi-currency/test-class-backend-currencies.php
index 530efc71b7d..8b333c6f189 100644
--- a/tests/unit/multi-currency/test-class-backend-currencies.php
+++ b/tests/unit/multi-currency/test-class-backend-currencies.php
@@ -6,6 +6,7 @@
  */
 
 use WCPay\MultiCurrency\BackendCurrencies;
+use WCPay\MultiCurrency\Interfaces\MultiCurrencyLocalizationInterface;
 use WCPay\MultiCurrency\MultiCurrency;
 
 /**
@@ -13,9 +14,9 @@
  */
 class WCPay_Multi_Currency_Backend_Currencies_Tests extends WCPAY_UnitTestCase {
 	/**
-	 * Mock WC_Payments_Localization_Service.
+	 * Mock MultiCurrencyLocalizationInterface.
 	 *
-	 * @var WC_Payments_Localization_Service|PHPUnit_Framework_MockObject_MockObject
+	 * @var MultiCurrencyLocalizationInterface|PHPUnit_Framework_MockObject_MockObject
 	 */
 	private $mock_localization_service;
 
@@ -36,7 +37,7 @@ class WCPay_Multi_Currency_Backend_Currencies_Tests extends WCPAY_UnitTestCase {
 	public function set_up() {
 		parent::set_up();
 
-		$this->mock_localization_service = $this->createMock( WC_Payments_Localization_Service::class );
+		$this->mock_localization_service = $this->createMock( MultiCurrencyLocalizationInterface::class );
 		$this->mock_multi_currency       = $this->createMock( MultiCurrency::class );
 
 		// Mock admin part.
diff --git a/tests/unit/multi-currency/test-class-compatibility.php b/tests/unit/multi-currency/test-class-compatibility.php
index cefb478ca50..ae4cc75dc31 100644
--- a/tests/unit/multi-currency/test-class-compatibility.php
+++ b/tests/unit/multi-currency/test-class-compatibility.php
@@ -7,6 +7,7 @@
 
 use WCPay\MultiCurrency\Compatibility;
 use WCPay\MultiCurrency\Currency;
+use WCPay\MultiCurrency\Interfaces\MultiCurrencyLocalizationInterface;
 use WCPay\MultiCurrency\MultiCurrency;
 use WCPay\MultiCurrency\Utils;
 
@@ -36,11 +37,11 @@ class WCPay_Multi_Currency_Compatibility_Tests extends WCPAY_UnitTestCase {
 	private $mock_utils;
 
 	/**
-	 * WC_Payments_Localization_Service.
+	 * MultiCurrencyLocalizationInterface.
 	 *
-	 * @var WC_Payments_Localization_Service
+	 * @var MultiCurrencyLocalizationInterface
 	 */
-	private $localization_service;
+	private $mock_localization_service;
 
 	/**
 	 * Pre-test setup
@@ -48,10 +49,15 @@ class WCPay_Multi_Currency_Compatibility_Tests extends WCPAY_UnitTestCase {
 	public function set_up() {
 		parent::set_up();
 
-		$this->mock_multi_currency  = $this->createMock( MultiCurrency::class );
-		$this->mock_utils           = $this->createMock( Utils::class );
-		$this->compatibility        = new Compatibility( $this->mock_multi_currency, $this->mock_utils );
-		$this->localization_service = new WC_Payments_Localization_Service();
+		$this->mock_multi_currency       = $this->createMock( MultiCurrency::class );
+		$this->mock_utils                = $this->createMock( Utils::class );
+		$this->mock_localization_service = $this->createMock( MultiCurrencyLocalizationInterface::class );
+		$this->mock_localization_service
+			->method( 'get_currency_format' )
+			->with( 'USD' )
+			->willReturn( [ 'num_decimals' => 2 ] );
+
+		$this->compatibility = new Compatibility( $this->mock_multi_currency, $this->mock_utils );
 	}
 
 	public function test_init_compatibility_classes_does_not_add_classes_if_one_enabled_currencies() {
@@ -108,7 +114,7 @@ public function test_filter_woocommerce_order_query_with_order_in_default_curren
 
 		$this->mock_multi_currency->expects( $this->once() )
 			->method( 'get_default_currency' )
-			->willReturn( new Currency( $this->localization_service, 'USD', 1.0 ) );
+			->willReturn( new Currency( $this->mock_localization_service, 'USD', 1.0 ) );
 
 		$this->mock_utils->expects( $this->once() )
 			->method( 'is_call_in_backtrace' )
@@ -132,7 +138,7 @@ public function test_filter_woocommerce_order_query_with_order_with_no_exchange_
 
 		$this->mock_multi_currency->expects( $this->once() )
 			->method( 'get_default_currency' )
-			->willReturn( new Currency( $this->localization_service, 'USD', 1.0 ) );
+			->willReturn( new Currency( $this->mock_localization_service, 'USD', 1.0 ) );
 
 		$this->mock_utils->expects( $this->once() )
 			->method( 'is_call_in_backtrace' )
@@ -153,7 +159,7 @@ public function test_filter_woocommerce_order_query_with_no_meta() {
 
 		$this->mock_multi_currency->expects( $this->once() )
 			->method( 'get_default_currency' )
-			->willReturn( new Currency( $this->localization_service, 'USD', 1.0 ) );
+			->willReturn( new Currency( $this->mock_localization_service, 'USD', 1.0 ) );
 
 		$this->mock_utils->expects( $this->once() )
 			->method( 'is_call_in_backtrace' )
@@ -177,7 +183,7 @@ public function test_filter_woocommerce_order_query() {
 
 		$this->mock_multi_currency->expects( $this->once() )
 			->method( 'get_default_currency' )
-			->willReturn( new Currency( $this->localization_service, 'USD', 1.0 ) );
+			->willReturn( new Currency( $this->mock_localization_service, 'USD', 1.0 ) );
 
 		$this->mock_utils->expects( $this->once() )
 			->method( 'is_call_in_backtrace' )
diff --git a/tests/unit/multi-currency/test-class-country-flags.php b/tests/unit/multi-currency/test-class-country-flags.php
index 0ebe63fb8ef..cd3adff8feb 100644
--- a/tests/unit/multi-currency/test-class-country-flags.php
+++ b/tests/unit/multi-currency/test-class-country-flags.php
@@ -5,7 +5,6 @@
  * @package WooCommerce\Payments\Tests
  */
 
-use WCPay\Constants\Country_Code;
 use WCPay\MultiCurrency\CountryFlags;
 
 /**
@@ -13,7 +12,7 @@
  */
 class Country_Flags_Test extends WCPAY_UnitTestCase {
 	public function test_get_by_country_returns_emoji_flag() {
-		$this->assertEquals( CountryFlags::get_by_country( Country_Code::UNITED_STATES ), '🇺🇸' );
+		$this->assertEquals( CountryFlags::get_by_country( 'US' ), '🇺🇸' );
 	}
 
 	public function test_get_by_country_returns_empty_string() {
diff --git a/tests/unit/multi-currency/test-class-currency-switcher-block.php b/tests/unit/multi-currency/test-class-currency-switcher-block.php
index f716f6dbe75..2ac0a69fa11 100644
--- a/tests/unit/multi-currency/test-class-currency-switcher-block.php
+++ b/tests/unit/multi-currency/test-class-currency-switcher-block.php
@@ -10,6 +10,7 @@
 use WCPay\MultiCurrency\Currency;
 use WCPay\MultiCurrency\CurrencySwitcherBlock;
 use WCPay\MultiCurrency\MultiCurrency;
+use WCPay\MultiCurrency\Interfaces\MultiCurrencyLocalizationInterface;
 
 /**
  * CurrencySwitcherBlock unit tests.
@@ -37,23 +38,25 @@ class WCPay_Multi_Currency_Currency_Switcher_Block_Tests extends WCPAY_UnitTestC
 	protected $mock_currencies;
 
 	/**
-	 * WC_Payments_Localization_Service.
-	 *
-	 * @var WC_Payments_Localization_Service
+	 * @var MockObject\MultiCurrencyLocalizationInterface
 	 */
-	private $localization_service;
+	private $mock_localization_service;
 
 	public function set_up() {
 		parent::set_up();
 
-		$this->mock_multi_currency  = $this->createMock( MultiCurrency::class );
-		$this->mock_compatibility   = $this->createMock( Compatibility::class );
-		$this->localization_service = new WC_Payments_Localization_Service();
-		$this->mock_currencies      = [
-			new Currency( $this->localization_service, 'USD', 1 ),
-			new Currency( $this->localization_service, 'CAD', 1.206823 ),
-			new Currency( $this->localization_service, 'GBP', 0.708099 ),
-			new Currency( $this->localization_service, 'EUR', 0.826381 ),
+		$this->mock_multi_currency       = $this->createMock( MultiCurrency::class );
+		$this->mock_compatibility        = $this->createMock( Compatibility::class );
+		$this->mock_localization_service = $this->createMock( MultiCurrencyLocalizationInterface::class );
+		$this->mock_localization_service
+			->method( 'get_currency_format' )
+			->willReturn( [ 'num_decimals' => 2 ] );
+
+		$this->mock_currencies = [
+			new Currency( $this->mock_localization_service, 'USD', 1 ),
+			new Currency( $this->mock_localization_service, 'CAD', 1.206823 ),
+			new Currency( $this->mock_localization_service, 'GBP', 0.708099 ),
+			new Currency( $this->mock_localization_service, 'EUR', 0.826381 ),
 		];
 
 		$this->currency_switcher_block = new CurrencySwitcherBlock(
@@ -219,8 +222,8 @@ public function test_render_currency_option_will_escape_output() {
 			->method( 'get_enabled_currencies' )
 			->willReturn(
 				[
-					new Currency( $this->localization_service, 'USD' ),
-					new Currency( $this->localization_service, $currency_code, 1 ),
+					new Currency( $this->mock_localization_service, 'USD' ),
+					new Currency( $this->mock_localization_service, $currency_code, 1 ),
 				]
 			);
 
@@ -275,7 +278,7 @@ public function test_widget_does_not_render_on_single_currency() {
 		$this->mock_multi_currency
 			->expects( $this->once() )
 			->method( 'get_enabled_currencies' )
-			->willReturn( [ new Currency( $this->localization_service, 'USD' ) ] );
+			->willReturn( [ new Currency( $this->mock_localization_service, 'USD' ) ] );
 
 		// Act/Assert: Confirm that when calling the renger method nothing is returned.
 		$this->assertSame( '', $this->currency_switcher_block->render_block_widget( [], '' ) );
diff --git a/tests/unit/multi-currency/test-class-frontend-currencies.php b/tests/unit/multi-currency/test-class-frontend-currencies.php
index bb560d8af9c..d63147de225 100644
--- a/tests/unit/multi-currency/test-class-frontend-currencies.php
+++ b/tests/unit/multi-currency/test-class-frontend-currencies.php
@@ -410,6 +410,7 @@ public function test_rest_api_ensure_should_return_store_currency_and_should_con
 		$_SERVER['REQUEST_URI'] = $request_uri;
 
 		$mccy = new WCPay\MultiCurrency\MultiCurrency(
+			WC_Payments::get_settings_service(),
 			WC_Payments::get_payments_api_client(),
 			WC_Payments::get_account_service(),
 			WC_Payments::get_localization_service(),
diff --git a/tests/unit/multi-currency/test-class-frontend-prices.php b/tests/unit/multi-currency/test-class-frontend-prices.php
index c38d343dcc9..13d6b4bb34d 100644
--- a/tests/unit/multi-currency/test-class-frontend-prices.php
+++ b/tests/unit/multi-currency/test-class-frontend-prices.php
@@ -5,8 +5,6 @@
  * @package WooCommerce\Payments\Tests
  */
 
-use WCPay\Constants\Country_Code;
-
 /**
  * WCPay\MultiCurrency\FrontendPrices unit tests.
  */
@@ -216,7 +214,7 @@ function () {
 		);
 
 		WC()->session->init();
-		WC()->customer->set_location( Country_Code::UNITED_STATES, 'CA' );
+		WC()->customer->set_location( 'US', 'CA' );
 
 		$shipping_method             = new \WC_Shipping_Flat_Rate();
 		$shipping_method->tax_status = 'taxable';
@@ -260,7 +258,7 @@ function () {
 		);
 
 		WC()->session->init();
-		WC()->customer->set_location( Country_Code::UNITED_STATES, 'CA' );
+		WC()->customer->set_location( 'US', 'CA' );
 
 		$shipping_method             = new \WC_Shipping_Flat_Rate();
 		$shipping_method->tax_status = 'taxable';
diff --git a/tests/unit/multi-currency/test-class-geolocation.php b/tests/unit/multi-currency/test-class-geolocation.php
index b66543dbf67..92b0b50b166 100644
--- a/tests/unit/multi-currency/test-class-geolocation.php
+++ b/tests/unit/multi-currency/test-class-geolocation.php
@@ -5,8 +5,6 @@
  * @package WooCommerce\Payments\Tests
  */
 
-use WCPay\Constants\Country_Code;
-
 /**
  * WCPay\MultiCurrency\Geolocation unit tests.
  */
@@ -51,10 +49,10 @@ public function test_get_country_by_customer_location_returns_geolocation_countr
 		add_filter(
 			'woocommerce_geolocate_ip',
 			function () {
-				return Country_Code::CANADA;
+				return 'CA';
 			}
 		);
-		$this->assertSame( Country_Code::CANADA, $this->geolocation->get_country_by_customer_location() );
+		$this->assertSame( 'CA', $this->geolocation->get_country_by_customer_location() );
 	}
 
 	public function test_get_country_by_customer_location_returns_default_country_when_no_geolocation() {
@@ -68,20 +66,20 @@ function () {
 		add_filter(
 			'woocommerce_customer_default_location',
 			function () {
-				return Country_Code::BRAZIL;
+				return 'BR';
 			}
 		);
 
-		$this->assertSame( Country_Code::BRAZIL, $this->geolocation->get_country_by_customer_location() );
+		$this->assertSame( 'BR', $this->geolocation->get_country_by_customer_location() );
 	}
 
 	public function test_get_currency_by_customer_location_returns_geolocation_currency_code() {
-		$this->mock_localization_service->method( 'get_country_locale_data' )->with( Country_Code::CANADA )->willReturn( [ 'currency_code' => 'CAD' ] );
+		$this->mock_localization_service->method( 'get_country_locale_data' )->with( 'CA' )->willReturn( [ 'currency_code' => 'CAD' ] );
 
 		add_filter(
 			'woocommerce_geolocate_ip',
 			function () {
-				return Country_Code::CANADA;
+				return 'CA';
 			}
 		);
 
@@ -89,7 +87,7 @@ function () {
 	}
 
 	public function test_get_currency_by_customer_location_returns_default_currency_code() {
-		$this->mock_localization_service->method( 'get_country_locale_data' )->with( Country_Code::BRAZIL )->willReturn( [ 'currency_code' => 'BRL' ] );
+		$this->mock_localization_service->method( 'get_country_locale_data' )->with( 'BR' )->willReturn( [ 'currency_code' => 'BRL' ] );
 
 		add_filter(
 			'woocommerce_geolocate_ip',
@@ -100,7 +98,7 @@ function () {
 		add_filter(
 			'woocommerce_customer_default_location',
 			function () {
-				return Country_Code::BRAZIL;
+				return 'BR';
 			}
 		);
 
diff --git a/tests/unit/multi-currency/test-class-multi-currency.php b/tests/unit/multi-currency/test-class-multi-currency.php
index 023fd92868c..6d4eddaab84 100644
--- a/tests/unit/multi-currency/test-class-multi-currency.php
+++ b/tests/unit/multi-currency/test-class-multi-currency.php
@@ -5,11 +5,13 @@
  * @package WooCommerce\Payments\Tests
  */
 
-use WCPay\Constants\Country_Code;
 use WCPay\MultiCurrency\Utils;
-use WCPay\Database_Cache;
 use WCPay\MultiCurrency\Exceptions\InvalidCurrencyException;
 use WCPay\MultiCurrency\Exceptions\InvalidCurrencyRateException;
+use WCPay\MultiCurrency\Interfaces\MultiCurrencyAccountInterface;
+use WCPay\MultiCurrency\Interfaces\MultiCurrencyApiClientInterface;
+use WCPay\MultiCurrency\Interfaces\MultiCurrencyCacheInterface;
+use WCPay\MultiCurrency\Interfaces\MultiCurrencySettingsInterface;
 use WCPay\MultiCurrency\MultiCurrency;
 use WCPay\MultiCurrency\Settings;
 use WCPay\MultiCurrency\SettingsOnboardCta;
@@ -65,14 +67,14 @@ class WCPay_Multi_Currency_Tests extends WCPAY_UnitTestCase {
 	/**
 	 * Mock of the API client.
 	 *
-	 * @var WC_Payments_API_Client
+	 * @var MultiCurrencyApiClientInterface
 	 */
 	private $mock_api_client;
 
 	/**
-	 * Mock of the WC_Payments_Account.
+	 * Mock of the MultiCurrencyAccountInterface.
 	 *
-	 * @var WC_Payments_Account
+	 * @var MultiCurrencyAccountInterface
 	 */
 	private $mock_account;
 
@@ -84,11 +86,18 @@ class WCPay_Multi_Currency_Tests extends WCPAY_UnitTestCase {
 	private $localization_service;
 
 	/**
-	 * Mock of Database_Cache.
+	 * Mock of MultiCurrencyCacheInterface.
 	 *
-	 * @var Database_Cache;
+	 * @var MultiCurrencyCacheInterface;
 	 */
-	private $mock_database_cache;
+	private $mock_cache;
+
+	/**
+	 * Mock of MultiCurrencySettingsInterface.
+	 *
+	 * @var MultiCurrencySettingsInterface;
+	 */
+	private $mock_settings;
 
 	/**
 	 * Mock of Utils.
@@ -456,7 +465,7 @@ public function test_update_selected_currency_by_geolocation_does_not_set_sessio
 		add_filter(
 			'woocommerce_geolocate_ip',
 			function () {
-				return Country_Code::CANADA;
+				return 'CA';
 			}
 		);
 
@@ -473,7 +482,7 @@ public function test_update_selected_currency_by_geolocation_updates_session_whe
 		add_filter(
 			'woocommerce_geolocate_ip',
 			function () {
-				return Country_Code::CANADA;
+				return 'CA';
 			}
 		);
 
@@ -488,7 +497,7 @@ public function test_update_selected_currency_by_geolocation_displays_notice() {
 		add_filter(
 			'woocommerce_geolocate_ip',
 			function () {
-				return Country_Code::CANADA;
+				return 'CA';
 			}
 		);
 
@@ -509,7 +518,7 @@ public function test_update_selected_currency_by_geolocation_does_not_update_if_
 		add_filter(
 			'woocommerce_geolocate_ip',
 			function () {
-				return Country_Code::CANADA;
+				return 'CA';
 			}
 		);
 
@@ -534,7 +543,7 @@ public function test_display_geolocation_currency_update_notice() {
 		add_filter(
 			'woocommerce_geolocate_ip',
 			function () {
-				return Country_Code::CANADA;
+				return 'CA';
 			}
 		);
 
@@ -544,11 +553,11 @@ function () {
 	}
 
 	public function test_display_geolocation_currency_update_notice_does_not_display_if_using_default_currency() {
-		WC()->session->set( WCPay\MultiCurrency\MultiCurrency::CURRENCY_SESSION_KEY, Country_Code::UNITED_STATES );
+		WC()->session->set( WCPay\MultiCurrency\MultiCurrency::CURRENCY_SESSION_KEY, 'US' );
 		add_filter(
 			'woocommerce_geolocate_ip',
 			function () {
-				return Country_Code::UNITED_STATES;
+				return 'US';
 			}
 		);
 
@@ -562,7 +571,7 @@ public function test_display_geolocation_currency_update_notice_does_not_display
 		add_filter(
 			'woocommerce_geolocate_ip',
 			function () {
-				return Country_Code::UNITED_STATES;
+				return 'US';
 			}
 		);
 
@@ -721,13 +730,13 @@ public function test_get_raw_conversion_throws_exception_on_invalid_from_rate()
 	public function test_get_cached_currencies_with_no_server_connection() {
 		// Need to create a new instance of MultiCurrency with a different $mock_api_client
 		// Because the mock return value of 'is_server_connected' cannot be overridden.
-		$mock_api_client = $this->createMock( WC_Payments_API_Client::class );
+		$mock_api_client = $this->createMock( MultiCurrencyApiClientInterface::class );
 
 		$mock_api_client->method( 'is_server_connected' )->willReturn( false );
 
 		$this->init_multi_currency( $mock_api_client );
 
-		$this->mock_database_cache->method( 'get' )->willReturn( $this->mock_cached_currencies );
+		$this->mock_cache->method( 'get' )->willReturn( $this->mock_cached_currencies );
 
 		$this->assertEquals(
 			$this->mock_cached_currencies,
@@ -736,7 +745,7 @@ public function test_get_cached_currencies_with_no_server_connection() {
 	}
 
 	public function test_get_cached_currencies_with_account_rejected() {
-		$this->mock_database_cache
+		$this->mock_cache
 			->expects( $this->once() )
 			->method( 'get' )
 			->willReturn( null );
@@ -746,7 +755,7 @@ public function test_get_cached_currencies_with_account_rejected() {
 			->method( 'is_account_rejected' )
 			->willReturn( true );
 
-		$this->mock_database_cache
+		$this->mock_cache
 			->expects( $this->never() )
 			->method( 'get_or_add' );
 
@@ -758,11 +767,11 @@ public function test_get_cached_currencies_with_account_rejected() {
 
 	public function test_get_cached_currencies_fetches_from_server() {
 		$get_or_add_call_count = 1;
-		$mock_database_cache   = $this->createMock( Database_Cache::class );
-		$mock_database_cache
+		$mock_cache            = $this->createMock( MultiCurrencyCacheInterface::class );
+		$mock_cache
 			->expects( $this->exactly( 2 ) )
 			->method( 'get_or_add' )
-			->with( Database_Cache::CURRENCIES_KEY, $this->anything(), $this->anything() )
+			->with( MultiCurrencyCacheInterface::CURRENCIES_KEY, $this->anything(), $this->anything() )
 			->willReturnCallback(
 				function ( $key, $generator, $validator ) use ( &$get_or_add_call_count ) {
 					if ( 1 === $get_or_add_call_count ) {
@@ -776,7 +785,7 @@ function ( $key, $generator, $validator ) use ( &$get_or_add_call_count ) {
 				}
 			);
 
-		$this->init_multi_currency( null, true, null, $mock_database_cache );
+		$this->init_multi_currency( null, true, null, $mock_cache );
 
 		$currency_from = strtolower( get_woocommerce_currency() );
 		$currencies_to = get_woocommerce_currencies();
@@ -886,7 +895,7 @@ public function test_enabled_currencies_option_as_string_does_not_fatal() {
 
 	public function test_get_cached_currencies_with_no_stripe_connection() {
 		$this->init_multi_currency( null, false );
-		$this->mock_database_cache->method( 'get' )->willReturn( $this->mock_cached_currencies );
+		$this->mock_cache->method( 'get' )->willReturn( $this->mock_cached_currencies );
 		$this->assertEquals(
 			$this->mock_cached_currencies,
 			$this->multi_currency->get_cached_currencies()
@@ -1051,14 +1060,14 @@ public function test_get_all_customer_currencies() {
 		$mock_orders[] = $this->add_mock_order_with_currency_meta( 'EUR' );
 		$mock_orders[] = $this->add_mock_order_with_currency_meta( 'USD' );
 
-		$mock_database_cache = $this->createMock( Database_Cache::class );
-		$mock_database_cache
+		$mock_cache = $this->createMock( MultiCurrencyCacheInterface::class );
+		$mock_cache
 			->expects( $this->once() )
 			->method( 'get_or_add' )
-			->with( Database_Cache::CURRENCIES_KEY, $this->anything(), $this->anything() )
+			->with( MultiCurrencyCacheInterface::CURRENCIES_KEY, $this->anything(), $this->anything() )
 			->willReturn( $this->mock_cached_currencies );
 
-		$this->init_multi_currency( null, true, null, $mock_database_cache );
+		$this->init_multi_currency( null, true, null, $mock_cache );
 
 		$result = $this->multi_currency->get_all_customer_currencies();
 
@@ -1073,14 +1082,14 @@ public function test_get_all_customer_currencies_with_option_data() {
 		$mock_option_data = [ 'GBP', 'EUR', 'USD' ];
 		update_option( MultiCurrency::CUSTOMER_CURRENCIES_KEY, $mock_option_data );
 
-		$mock_database_cache = $this->createMock( Database_Cache::class );
-		$mock_database_cache
+		$mock_cache = $this->createMock( MultiCurrencyCacheInterface::class );
+		$mock_cache
 			->expects( $this->once() )
 			->method( 'get_or_add' )
-			->with( Database_Cache::CURRENCIES_KEY, $this->anything(), $this->anything() )
+			->with( MultiCurrencyCacheInterface::CURRENCIES_KEY, $this->anything(), $this->anything() )
 			->willReturn( $this->mock_cached_currencies );
 
-		$this->init_multi_currency( null, true, null, $mock_database_cache );
+		$this->init_multi_currency( null, true, null, $mock_cache );
 
 		$result = $this->multi_currency->get_all_customer_currencies();
 
@@ -1103,14 +1112,14 @@ public function test_get_all_customer_currencies_with_invalid_option_data( $opti
 		$mock_orders[] = $this->add_mock_order_with_currency_meta( 'EUR' );
 		$mock_orders[] = $this->add_mock_order_with_currency_meta( 'USD' );
 
-		$mock_database_cache = $this->createMock( Database_Cache::class );
-		$mock_database_cache
+		$mock_cache = $this->createMock( MultiCurrencyCacheInterface::class );
+		$mock_cache
 			->expects( $this->once() )
 			->method( 'get_or_add' )
-			->with( Database_Cache::CURRENCIES_KEY, $this->anything(), $this->anything() )
+			->with( MultiCurrencyCacheInterface::CURRENCIES_KEY, $this->anything(), $this->anything() )
 			->willReturn( $this->mock_cached_currencies );
 
-		$this->init_multi_currency( null, true, null, $mock_database_cache );
+		$this->init_multi_currency( null, true, null, $mock_cache );
 
 		$result = $this->multi_currency->get_all_customer_currencies();
 
@@ -1414,31 +1423,31 @@ private function remove_currency_settings_mock( $currency_code, $settings ) {
 		}
 	}
 
-	private function init_multi_currency( $mock_api_client = null, $wcpay_account_connected = true, $mock_account = null, $mock_database_cache = null ) {
-		$this->mock_api_client = $this->createMock( WC_Payments_API_Client::class );
+	private function init_multi_currency( $mock_api_client = null, $wcpay_account_connected = true, $mock_account = null, $mock_cache = null ) {
+		$this->mock_api_client = $this->createMock( MultiCurrencyApiClientInterface::class );
 
-		$this->mock_account = $mock_account ?? $this->createMock( WC_Payments_Account::class );
-		$this->mock_account->method( 'is_stripe_connected' )->willReturn( $wcpay_account_connected );
+		$this->mock_account = $mock_account ?? $this->createMock( MultiCurrencyAccountInterface::class );
+		$this->mock_account->method( 'is_provider_connected' )->willReturn( $wcpay_account_connected );
 
 		$this->mock_api_client->method( 'is_server_connected' )->willReturn( true );
 
-		$this->mock_database_cache = $this->createMock( Database_Cache::class );
-		$this->mock_database_cache->method( 'get_or_add' )->willReturn( $this->mock_cached_currencies );
+		$this->mock_cache = $this->createMock( MultiCurrencyCacheInterface::class );
+		$this->mock_cache->method( 'get_or_add' )->willReturn( $this->mock_cached_currencies );
 
 		$this->mock_utils = $this->createMock( Utils::class );
 
+		$this->mock_settings = $this->createMock( MultiCurrencySettingsInterface::class );
+
 		$this->multi_currency = new MultiCurrency(
+			$this->mock_settings,
 			$mock_api_client ?? $this->mock_api_client,
 			$this->mock_account,
 			$this->localization_service,
-			$mock_database_cache ?? $this->mock_database_cache,
+			$mock_cache ?? $this->mock_cache,
 			$this->mock_utils
 		);
 		$this->multi_currency->init_widgets();
 		$this->multi_currency->init();
-
-		// Fix an issue in WPCOM tests.
-		WC_Payments_Explicit_Price_Formatter::set_multi_currency_instance( $this->multi_currency );
 	}
 
 	private function add_mock_order_with_currency_meta( $currency ) {
diff --git a/tests/unit/multi-currency/test-class-rest-controller.php b/tests/unit/multi-currency/test-class-rest-controller.php
index 49ac60ad1be..661b991df52 100644
--- a/tests/unit/multi-currency/test-class-rest-controller.php
+++ b/tests/unit/multi-currency/test-class-rest-controller.php
@@ -5,6 +5,13 @@
  * @package WooCommerce\Payments\Tests
  */
 
+use PHPUnit\Framework\MockObject\MockObject;
+use WCPay\MultiCurrency\Currency;
+use WCPay\MultiCurrency\Interfaces\MultiCurrencyAccountInterface;
+use WCPay\MultiCurrency\Interfaces\MultiCurrencyApiClientInterface;
+use WCPay\MultiCurrency\Interfaces\MultiCurrencyCacheInterface;
+use WCPay\MultiCurrency\Interfaces\MultiCurrencyLocalizationInterface;
+use WCPay\MultiCurrency\MultiCurrency;
 use WCPay\MultiCurrency\RestController;
 
 /**
@@ -24,6 +31,27 @@ class WCPay_Multi_Currency_Rest_Controller_Tests extends WCPAY_UnitTestCase {
 	 */
 	private $controller;
 
+	/**
+	 * Mock MultiCurrency.
+	 *
+	 * @var MultiCurrency|MockObject
+	 */
+	private $mock_multi_currency;
+
+	/**
+	 * The localization service.
+	 *
+	 * @var MultiCurrencyLocalizationInterface
+	 */
+	private $mock_localization_service;
+
+	/**
+	 * Mock available currencies.
+	 *
+	 * @var array An array of available currencies.
+	 */
+	private $mock_available_currencies = [];
+
 	/**
 	 * Pre-test setup
 	 */
@@ -33,13 +61,48 @@ public function set_up() {
 		// Set the user so that we can pass the authentication.
 		wp_set_current_user( 1 );
 
-		$mock_api_client  = $this->getMockBuilder( WC_Payments_API_Client::class )->disableOriginalConstructor()->getMock();
-		$this->controller = new RestController( $mock_api_client );
+		$mock_api_client   = $this->createMock( MultiCurrencyApiClientInterface::class );
+		$mock_account      = $this->createMock( MultiCurrencyAccountInterface::class );
+		$mock_localization = $this->createMock( MultiCurrencyLocalizationInterface::class );
+		$mock_cache        = $this->createMock( MultiCurrencyCacheInterface::class );
+		$mock_settings     = $this->createMock( WC_Payments_Settings_Service::class );
+
+		$mock_account->method( 'is_provider_connected' )->willReturn( true );
+		$mock_api_client->method( 'is_server_connected' )->willReturn( true );
+
+		$mock_localization
+			->method( 'get_currency_format' )
+			->willReturn(
+				[
+					'currency_pos' => 'right_space',
+					'num_decimals' => 2,
+				]
+			);
+
+		$this->mock_multi_currency = $this->getMockBuilder( MultiCurrency::class )
+			->setConstructorArgs( [ $mock_settings, $mock_api_client, $mock_account, $mock_localization, $mock_cache ] )
+			->enableOriginalConstructor()
+			->onlyMethods( [ 'get_available_currencies' ] )
+			->getMock();
+
+		$this->mock_multi_currency->expects( $this->any() )
+			->method( 'get_available_currencies' )
+			->willReturn( $this->get_mock_available_currencies() );
+
+		$this->controller = new RestController( $this->mock_multi_currency );
+	}
+
+	/**
+	 * Post-test teardown
+	 */
+	public function tear_down() {
+		remove_all_filters( 'wcpay_multi_currency_available_currencies' );
+		parent::tear_down();
 	}
 
 	public function test_get_store_currencies_gets_expected_response() {
 		// Arrange: Create expected response.
-		$expected = rest_ensure_response( WC_Payments_Multi_Currency()->get_store_currencies() );
+		$expected = rest_ensure_response( $this->mock_multi_currency->get_store_currencies() );
 
 		// Act: Get the store currencies.
 		$response = $this->controller->get_store_currencies();
@@ -56,7 +119,7 @@ public function test_get_store_currencies_gets_expected_response() {
 	 */
 	public function test_update_enabled_currencies_updates_currencies() {
 		// Arrange: Create expected response.
-		$expected = rest_ensure_response( WC_Payments_Multi_Currency()->get_store_currencies() );
+		$expected = rest_ensure_response( $this->mock_multi_currency->get_store_currencies() );
 
 		// Arrange: Delete the enabled currencies option.
 		delete_option( 'wcpay_multi_currency_enabled_currencies' );
@@ -82,9 +145,8 @@ public function test_update_enabled_currencies_throws_exception_on_unavailable_c
 		$error_currencies = [ 'EUR', 'GBP', 'banana' ];
 
 		// Arrange: Set expected result.
-		$error_code    = 'wcpay_multi_currency_invalid_currency';
 		$error_message = 'Invalid currency passed to set_enabled_currencies: ' . implode( ', ', $error_currencies );
-		$expected      = rest_ensure_response( new WP_Error( $error_code, $error_message ) );
+		$expected      = rest_ensure_response( new WP_Error( 500, $error_message ) );
 
 		// Arrange: Create the new REST request.
 		$request = new WP_REST_Request( 'POST', self::ROUTE . '/update-enabled-currencies' );
@@ -110,7 +172,7 @@ public function test_get_single_currency_settings() {
 		update_option( 'wcpay_multi_currency_price_charm_usd', 0 );
 
 		// Arrange: Create expected response.
-		$expected = rest_ensure_response( WC_Payments_Multi_Currency()->get_single_currency_settings( 'USD' ) );
+		$expected = rest_ensure_response( $this->mock_multi_currency->get_single_currency_settings( 'USD' ) );
 
 		// Arrange: Create the new REST request.
 		$request = new WP_REST_Request( 'GET', self::ROUTE . '/currencies/USD' );
@@ -129,9 +191,8 @@ public function test_get_single_currency_settings() {
 
 	public function test_get_single_currency_settings_throws_exception_on_unavailable_currency() {
 		// Arrange: Set expected result.
-		$error_code    = 'wcpay_multi_currency_invalid_currency';
 		$error_message = 'Invalid currency passed to get_single_currency_settings: AAA';
-		$expected      = rest_ensure_response( new WP_Error( $error_code, $error_message ) );
+		$expected      = rest_ensure_response( new WP_Error( 500, $error_message ) );
 
 		// Arrange: Create the new REST request.
 		$request = new WP_REST_Request( 'GET', self::ROUTE . '/currencies/AAA' );
@@ -162,7 +223,7 @@ public function test_update_single_currency_settings() {
 		update_option( 'wcpay_multi_currency_price_charm_usd', 0 );
 
 		// Arrange: Create expected response.
-		$expected = rest_ensure_response( WC_Payments_Multi_Currency()->get_single_currency_settings( 'USD' ) );
+		$expected = rest_ensure_response( $this->mock_multi_currency->get_single_currency_settings( 'USD' ) );
 
 		// Arrange: Now remove all the options.
 		delete_option( 'wcpay_multi_currency_exchange_rate_usd' );
@@ -191,9 +252,8 @@ public function test_update_single_currency_settings() {
 
 	public function test_update_single_currency_settings_throws_exception_on_unavailable_currency() {
 		// Arrange: Set expected result.
-		$error_code    = 'wcpay_multi_currency_invalid_currency';
 		$error_message = 'Invalid currency passed to update_single_currency_settings: AAA';
-		$expected      = rest_ensure_response( new WP_Error( $error_code, $error_message ) );
+		$expected      = rest_ensure_response( new WP_Error( 500, $error_message ) );
 
 		// Arrange: Create the new REST request.
 		$request = new WP_REST_Request( 'POST', self::ROUTE . '/currencies/AAA' );
@@ -220,9 +280,8 @@ public function test_update_single_currency_settings_throws_exception_on_unavail
 	 */
 	public function test_update_single_currency_settings_throws_exception_on_invalid_currency_rate( $manual_rate ) {
 		// Arrange: Set expected result.
-		$error_code    = 'wcpay_multi_currency_invalid_currency_rate';
 		$error_message = 'Invalid manual currency rate passed to update_single_currency_settings: ' . $manual_rate;
-		$expected      = rest_ensure_response( new WP_Error( $error_code, $error_message ) );
+		$expected      = rest_ensure_response( new WP_Error( 500, $error_message ) );
 
 		// Arrange: Create the new REST request.
 		$request = new WP_REST_Request( 'POST', self::ROUTE . '/currencies/USD' );
@@ -260,7 +319,7 @@ public function update_single_currency_settings_throws_exception_on_invalid_curr
 
 	public function test_get_settings_gets_expected_response() {
 		// Arrange: Create expected response.
-		$expected = rest_ensure_response( WC_Payments_Multi_Currency()->get_settings() );
+		$expected = rest_ensure_response( $this->mock_multi_currency->get_settings() );
 
 		// Act: Get the settings.
 		$response = $this->controller->get_settings();
@@ -275,7 +334,7 @@ public function test_update_multi_currency_settings() {
 		update_option( 'wcpay_multi_currency_enable_storefront_switcher', 'yes' );
 
 		// Arrange: Create expected response.
-		$expected = rest_ensure_response( WC_Payments_Multi_Currency()->get_settings() );
+		$expected = rest_ensure_response( $this->mock_multi_currency->get_settings() );
 
 		// Arrange: Now remove all the options.
 		delete_option( 'wcpay_multi_currency_enable_auto_currency' );
@@ -296,4 +355,20 @@ public function test_update_multi_currency_settings() {
 		// Assert: Confirm the response is what we expected.
 		$this->assertEquals( $expected, $response );
 	}
+
+	private function get_mock_available_currencies() {
+		$this->mock_localization_service = $this->createMock( MultiCurrencyLocalizationInterface::class );
+		if ( empty( $this->mock_available_currencies ) ) {
+			$this->mock_localization_service
+				->expects( $this->any() )
+				->method( 'get_currency_format' )
+				->willReturn( [ 'num_decimals' => 2 ] );
+
+			$this->mock_available_currencies = [
+				'USD' => new Currency( $this->mock_localization_service, 'USD', 1 ),
+			];
+		}
+
+		return $this->mock_available_currencies;
+	}
 }
diff --git a/tests/unit/multi-currency/test-class-settings.php b/tests/unit/multi-currency/test-class-settings.php
index 1ccbd373a0c..272a691910b 100644
--- a/tests/unit/multi-currency/test-class-settings.php
+++ b/tests/unit/multi-currency/test-class-settings.php
@@ -5,8 +5,6 @@
  * @package WooCommerce\Payments\Tests
  */
 
-use WCPay\MultiCurrency\Currency;
-
 /**
  * WCPay\MultiCurrency\Settings unit tests.
  */
diff --git a/tests/unit/multi-currency/test-class-utils.php b/tests/unit/multi-currency/test-class-utils.php
index 1f3c9cce762..553df2a0cc1 100644
--- a/tests/unit/multi-currency/test-class-utils.php
+++ b/tests/unit/multi-currency/test-class-utils.php
@@ -60,8 +60,7 @@ public function test_is_admin_api_request_returns_true() {
 
 	public function test_is_admin_api_request_returns_false_with_store_api() {
 		$_SERVER['HTTP_REFERER'] = 'http://example.org/wp-admin/';
-		$_REQUEST['rest_route']  = '/wc/store/v1/checkout';
-		$_SERVER['REQUEST_URI']  = trailingslashit( rest_get_url_prefix() );
+		$_SERVER['REQUEST_URI']  = trailingslashit( rest_get_url_prefix() ) . 'wc/store/v1/checkout';
 
 		$this->assertFalse( $this->utils->is_admin_api_request() );
 
diff --git a/tests/unit/multi-currency/test-class-payment-methods-compatibility.php b/tests/unit/test-class-wc-payments-currency-manager.php
similarity index 84%
rename from tests/unit/multi-currency/test-class-payment-methods-compatibility.php
rename to tests/unit/test-class-wc-payments-currency-manager.php
index bdbbb767cde..6f13664ec75 100644
--- a/tests/unit/multi-currency/test-class-payment-methods-compatibility.php
+++ b/tests/unit/test-class-wc-payments-currency-manager.php
@@ -1,14 +1,14 @@
 <?php
 /**
- * Class WCPay_Multi_Currency_PaymentMethodsCompatibility_Tests
+ * Class WC_Payments_Currency_Manager_Tests
  *
  * @package WooCommerce\Payments\Tests
  */
 
 /**
- * WCPay\MultiCurrency\PaymentMethodsCompatibility unit tests.
+ * WC_Payments_Currency_Manager unit tests.
  */
-class WCPay_Multi_Currency_Payment_Methods_Compatibility_Tests extends WCPAY_UnitTestCase {
+class WC_Payments_Currency_Manager_Tests extends WCPAY_UnitTestCase {
 	/**
 	 * Mock WCPay\MultiCurrency\MultiCurrency.
 	 *
@@ -24,11 +24,11 @@ class WCPay_Multi_Currency_Payment_Methods_Compatibility_Tests extends WCPAY_Uni
 	private $gateway_mock;
 
 	/**
-	 * Instance WCPay\MultiCurrency\PaymentMethodsCompatibility.
+	 * Instance of WC_Payments_Currency_Manager.
 	 *
-	 * @var \WCPay\MultiCurrency\PaymentMethodsCompatibility
+	 * @var \WCPay\WC_Payments_Currency_Manager
 	 */
-	private $payment_methods_compatibility;
+	private $currency_manager;
 
 	/**
 	 * WC_Payments_Localization_Service.
@@ -43,8 +43,7 @@ class WCPay_Multi_Currency_Payment_Methods_Compatibility_Tests extends WCPAY_Uni
 	public function set_up() {
 		parent::set_up();
 
-		$this->multi_currency_mock = $this
-			->getMockBuilder( WCPay\MultiCurrency\MultiCurrency::class )
+		$this->multi_currency_mock = $this->getMockBuilder( WCPay\MultiCurrency\MultiCurrency::class )
 			->disableOriginalConstructor()
 			->setMethods(
 				[
@@ -68,8 +67,16 @@ public function set_up() {
 			->getMock();
 		$this->gateway_mock->method( 'get_account_country' )->willReturn( 'US' );
 
-		$this->payment_methods_compatibility = new \WCPay\MultiCurrency\PaymentMethodsCompatibility( $this->multi_currency_mock, $this->gateway_mock );
-		$this->payment_methods_compatibility->init_hooks();
+		$this->currency_manager = $this->getMockBuilder( \WCPay\WC_Payments_Currency_Manager::class )
+			->setConstructorArgs( [ $this->gateway_mock ] )
+			->setMethods( [ 'get_multi_currency_instance' ] )
+			->getMock();
+
+		// Mocking get_multi_currency_instance to return the multi_currency_mock.
+		$this->currency_manager->method( 'get_multi_currency_instance' )
+			->willReturn( $this->multi_currency_mock );
+
+		$this->currency_manager->init_hooks();
 
 		$this->localization_service = new WC_Payments_Localization_Service();
 	}
@@ -79,7 +86,7 @@ public function test_it_should_not_update_available_currencies_when_enabled_paym
 		$this->gateway_mock->expects( $this->atLeastOnce() )->method( 'get_upe_enabled_payment_method_ids' )->willReturn( [ 'card' ] );
 		$this->gateway_mock->expects( $this->atLeastOnce() )->method( 'get_account_domestic_currency' )->willReturn( 'USD' );
 
-		$this->payment_methods_compatibility->add_missing_currencies();
+		$this->currency_manager->maybe_add_missing_currencies();
 	}
 
 	public function test_it_should_not_update_available_currencies_when_not_needed() {
@@ -107,7 +114,7 @@ public function test_it_should_not_update_available_currencies_when_not_needed()
 		);
 		$this->multi_currency_mock->expects( $this->never() )->method( 'set_enabled_currencies' );
 
-		$this->payment_methods_compatibility->add_missing_currencies();
+		$this->currency_manager->maybe_add_missing_currencies();
 	}
 
 	public function test_it_should_update_available_currencies_when_needed() {
@@ -147,7 +154,7 @@ public function test_it_should_update_available_currencies_when_needed() {
 				)
 			);
 
-		$this->payment_methods_compatibility->add_missing_currencies();
+		$this->currency_manager->maybe_add_missing_currencies();
 	}
 
 	public function test_it_should_not_update_available_currencies_with_bnpl_methods() {
@@ -173,7 +180,7 @@ public function test_it_should_not_update_available_currencies_with_bnpl_methods
 		);
 		$this->multi_currency_mock->expects( $this->never() )->method( 'set_enabled_currencies' );
 
-		$this->payment_methods_compatibility->add_missing_currencies();
+		$this->currency_manager->maybe_add_missing_currencies();
 	}
 
 	public function test_it_should_update_available_currencies_with_bnpl_methods() {
@@ -207,6 +214,6 @@ public function test_it_should_update_available_currencies_with_bnpl_methods() {
 				)
 			);
 
-		$this->payment_methods_compatibility->add_missing_currencies();
+		$this->currency_manager->maybe_add_missing_currencies();
 	}
 }
diff --git a/tests/unit/test-class-wc-payments-explicit-price-formatter.php b/tests/unit/test-class-wc-payments-explicit-price-formatter.php
index 9c32f3afdb5..728099e4473 100644
--- a/tests/unit/test-class-wc-payments-explicit-price-formatter.php
+++ b/tests/unit/test-class-wc-payments-explicit-price-formatter.php
@@ -78,6 +78,13 @@ class WC_Payments_Explicit_Price_Formatter_Test extends WCPAY_UnitTestCase {
 	 */
 	private $mock_localization_service;
 
+	/**
+	 * Mock of the WC_Payments_Settings_Service.
+	 *
+	 * @var WC_Payments_Settings_Service
+	 */
+	private $mock_settings;
+
 	/**
 	 * Mock of Database_Cache.
 	 *
@@ -230,7 +237,7 @@ private function init_multi_currency( $mock_api_client = null, $wcpay_account_co
 		$this->mock_api_client = $this->createMock( WC_Payments_API_Client::class );
 
 		$this->mock_account = $this->createMock( WC_Payments_Account::class );
-		$this->mock_account->method( 'is_stripe_connected' )->willReturn( $wcpay_account_connected );
+		$this->mock_account->method( 'is_provider_connected' )->willReturn( $wcpay_account_connected );
 
 		$this->mock_localization_service = $this->createMock( WC_Payments_Localization_Service::class );
 
@@ -247,8 +254,9 @@ private function init_multi_currency( $mock_api_client = null, $wcpay_account_co
 
 		$this->mock_database_cache = $this->createMock( Database_Cache::class );
 		$this->mock_database_cache->method( 'get_or_add' )->willReturn( $this->mock_cached_currencies );
+		$this->mock_settings = $this->createMock( WC_Payments_Settings_Service::class );
 
-		$this->multi_currency = new MultiCurrency( $mock_api_client ?? $this->mock_api_client, $this->mock_account, $this->mock_localization_service, $this->mock_database_cache );
+		$this->multi_currency = new MultiCurrency( $this->mock_settings, $mock_api_client ?? $this->mock_api_client, $this->mock_account, $this->mock_localization_service, $this->mock_database_cache );
 		$this->multi_currency->init();
 
 		WC_Payments_Explicit_Price_Formatter::set_multi_currency_instance( $this->multi_currency );
diff --git a/tsconfig.json b/tsconfig.json
index 3b9efabf45e..f7f56cddd52 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -15,8 +15,9 @@
     "paths": {
       "assets/*": [ "../assets/*" ],
       "wcpay/*": [ "./*" ],
+      "multi-currency/*": [ "../multi-currency/client/*" ],
       "iti/utils": [ "../node_modules/intl-tel-input/build/js/utils" ],
-      "react": ["../node_modules/@types/react"]
+      "react": [ "../node_modules/@types/react" ]
     },
     "types": [
       "node",
diff --git a/webpack/shared.js b/webpack/shared.js
index 7ef039967cd..55c249694ea 100644
--- a/webpack/shared.js
+++ b/webpack/shared.js
@@ -26,11 +26,11 @@ module.exports = {
 			'subscription-edit-page': './client/subscription-edit-page.js',
 			tos: './client/tos/index.js',
 			'payment-gateways': './client/payment-gateways/index.js',
-			'multi-currency': './client/multi-currency/index.js',
+			'multi-currency': './multi-currency/client/index.js',
 			'multi-currency-switcher-block':
-				'./client/multi-currency/blocks/currency-switcher.js',
+				'./multi-currency/client/blocks/currency-switcher.js',
 			'multi-currency-analytics':
-				'./client/multi-currency-analytics/index.js',
+				'./multi-currency/client/analytics/index.js',
 			order: './client/order/index.js',
 			'subscriptions-empty-state':
 				'./client/subscriptions-empty-state/index.js',
@@ -113,9 +113,18 @@ module.exports = {
 	},
 	resolve: {
 		extensions: [ '.ts', '.tsx', '.json', '.js', '.jsx' ],
-		modules: [ path.join( process.cwd(), 'client' ), 'node_modules' ],
+		modules: [
+			path.join( process.cwd(), 'client' ),
+			path.join( process.cwd(), 'multi-currency', 'client' ),
+			'node_modules',
+		],
 		alias: {
 			assets: path.resolve( process.cwd(), 'assets' ),
+			'multi-currency': path.resolve(
+				process.cwd(),
+				'multi-currency',
+				'client'
+			),
 			wcpay: path.resolve( process.cwd(), 'client' ),
 			iti: path.resolve(
 				process.cwd(),

From b6adaad6e078724b21a53d5ec852b0a60619cd5e Mon Sep 17 00:00:00 2001
From: Nagesh Pai <4162931+nagpai@users.noreply.github.com>
Date: Mon, 28 Oct 2024 13:27:30 +0530
Subject: [PATCH 10/45] Bump WC tested up to version 9.4.0 (#9634)

Co-authored-by: Nagesh Pai <nagesh.pai@automattic.com>
---
 changelog/dev-bump-wc-version-9.4 | 4 ++++
 woocommerce-payments.php          | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)
 create mode 100644 changelog/dev-bump-wc-version-9.4

diff --git a/changelog/dev-bump-wc-version-9.4 b/changelog/dev-bump-wc-version-9.4
new file mode 100644
index 00000000000..e56d8ba7357
--- /dev/null
+++ b/changelog/dev-bump-wc-version-9.4
@@ -0,0 +1,4 @@
+Significance: minor
+Type: dev
+
+Bump WC tested up to version to 9.4.0
diff --git a/woocommerce-payments.php b/woocommerce-payments.php
index 7283bb20728..23367190fcd 100644
--- a/woocommerce-payments.php
+++ b/woocommerce-payments.php
@@ -8,7 +8,7 @@
  * Text Domain: woocommerce-payments
  * Domain Path: /languages
  * WC requires at least: 7.6
- * WC tested up to: 9.3.3
+ * WC tested up to: 9.4.0
  * Requires at least: 6.0
  * Requires PHP: 7.3
  * Version: 8.4.0

From 1e32cbe49df011990b6680c9cbbc512066e61dd0 Mon Sep 17 00:00:00 2001
From: Achyuth Ajoy <achyuthajoy@gmail.com>
Date: Mon, 28 Oct 2024 16:55:12 +0530
Subject: [PATCH 11/45] Update cache key for composer dependencies (#9637)

---
 .github/actions/e2e/env-setup/action.yml         | 2 +-
 .github/actions/setup-repo/action.yml            | 2 +-
 .github/workflows/check-changelog.yml            | 2 +-
 .github/workflows/compatibility.yml              | 6 +++---
 .github/workflows/coverage.yml                   | 2 +-
 .github/workflows/i18n-weekly-release.yml        | 4 ++--
 .github/workflows/js-lint-test.yml               | 2 +-
 .github/workflows/php-lint-test.yml              | 4 ++--
 changelog/gh-actions-e2e-optimize-composer-cache | 5 +++++
 9 files changed, 17 insertions(+), 12 deletions(-)
 create mode 100644 changelog/gh-actions-e2e-optimize-composer-cache

diff --git a/.github/actions/e2e/env-setup/action.yml b/.github/actions/e2e/env-setup/action.yml
index e1dbd310239..0296fc6eea3 100644
--- a/.github/actions/e2e/env-setup/action.yml
+++ b/.github/actions/e2e/env-setup/action.yml
@@ -30,7 +30,7 @@ runs:
       uses: actions/cache@v4
       with:
         path: ./vendor
-        key:  ${{ runner.os }}-vendor-${{ hashFiles('composer.lock') }}
+        key:  ${{ runner.os }}-composer-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
 
     # Cache node dependencies
     - name: Cache node dependencies
diff --git a/.github/actions/setup-repo/action.yml b/.github/actions/setup-repo/action.yml
index d8de18c7d8d..2e1098a6d19 100644
--- a/.github/actions/setup-repo/action.yml
+++ b/.github/actions/setup-repo/action.yml
@@ -14,7 +14,7 @@ runs:
       uses: actions/cache@v4
       with:
         path: ~/.cache/composer/
-        key: ${{ runner.os }}-composer-${{ hashFiles('composer.lock') }}
+        key: ${{ runner.os }}-composer-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
 
     - name: "Set up PHP"
       uses: ./.github/actions/setup-php
diff --git a/.github/workflows/check-changelog.yml b/.github/workflows/check-changelog.yml
index 682710edbdd..3aa3936ca64 100644
--- a/.github/workflows/check-changelog.yml
+++ b/.github/workflows/check-changelog.yml
@@ -22,7 +22,7 @@ jobs:
         uses: actions/cache@v4
         with:
           path: ~/.cache/composer/
-          key:  ${{ runner.os }}-composer-${{ hashFiles('composer.lock') }}
+          key:  ${{ runner.os }}-composer-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
       # setup PHP, but without debug extensions for reasonable performance
       - name: "Set up PHP"
         uses: ./.github/actions/setup-php
diff --git a/.github/workflows/compatibility.yml b/.github/workflows/compatibility.yml
index 02a2d7d4c7e..e1b7279b70f 100644
--- a/.github/workflows/compatibility.yml
+++ b/.github/workflows/compatibility.yml
@@ -45,7 +45,7 @@ jobs:
       - uses: actions/cache@v4
         with:
           path: ~/.cache/composer/
-          key: ${{ runner.os }}-composer-${{ hashFiles('composer.lock') }}
+          key: ${{ runner.os }}-composer-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
       # setup PHP, but without debug extensions for reasonable performance
       - uses: shivammathur/setup-php@v2
         with:
@@ -54,7 +54,7 @@ jobs:
           coverage: none
       # run CI checks
       - run: bash bin/run-ci-tests.bash
-  
+
   generate-wc-compat-beta-matrix:
     name: "Generate the matrix for compatibility-woocommerce-beta dynamically"
     runs-on: ubuntu-latest
@@ -86,7 +86,7 @@ jobs:
       - uses: actions/cache@v4
         with:
           path: ~/.cache/composer/
-          key:  ${{ runner.os }}-composer-${{ hashFiles('composer.lock') }}
+          key:  ${{ runner.os }}-composer-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
       # setup PHP, but without debug extensions for reasonable performance
       - uses: shivammathur/setup-php@v2
         with:
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
index 79ff0d7a01f..1728e6f9fee 100644
--- a/.github/workflows/coverage.yml
+++ b/.github/workflows/coverage.yml
@@ -30,7 +30,7 @@ jobs:
       - uses: actions/cache@v4
         with:
           path: ~/.cache/composer/
-          key:  ${{ runner.os }}-composer-${{ hashFiles('composer.lock') }}
+          key:  ${{ runner.os }}-composer-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
       # setup PHP, but without debug extensions for reasonable performance
       - uses: shivammathur/setup-php@v2
         with:
diff --git a/.github/workflows/i18n-weekly-release.yml b/.github/workflows/i18n-weekly-release.yml
index 2c7f0fa0396..bd87284be4e 100644
--- a/.github/workflows/i18n-weekly-release.yml
+++ b/.github/workflows/i18n-weekly-release.yml
@@ -21,7 +21,7 @@ jobs:
       - uses: actions/cache@v4
         with:
           path: ~/.cache/composer/
-          key: ${{ runner.os }}-composer-${{ hashFiles('composer.lock') }}
+          key: ${{ runner.os }}-composer-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
       - uses: actions/cache@v4
         with:
           path: ~/.npm/
@@ -33,7 +33,7 @@ jobs:
         run: |
           npm ci
           npm run build
-          
+
           if [[ ! -f woocommerce-payments.zip ]]; then
             echo "Failed to create release zip"
             exit 1
diff --git a/.github/workflows/js-lint-test.yml b/.github/workflows/js-lint-test.yml
index b3797f4dae0..461984d93da 100644
--- a/.github/workflows/js-lint-test.yml
+++ b/.github/workflows/js-lint-test.yml
@@ -22,7 +22,7 @@ jobs:
       - uses: actions/cache@v4
         with:
           path: ~/.cache/composer/
-          key:  ${{ runner.os }}-composer-${{ hashFiles('composer.lock') }}
+          key:  ${{ runner.os }}-composer-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
       - uses: actions/cache@v4
         with:
           path: ~/.npm/
diff --git a/.github/workflows/php-lint-test.yml b/.github/workflows/php-lint-test.yml
index de15390609e..3d4ca36b9ed 100644
--- a/.github/workflows/php-lint-test.yml
+++ b/.github/workflows/php-lint-test.yml
@@ -25,7 +25,7 @@ jobs:
       - uses: actions/cache@v4
         with:
           path: ~/.cache/composer/
-          key: ${{ runner.os }}-composer-${{ hashFiles('composer.lock') }}
+          key: ${{ runner.os }}-composer-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
       # setup PHP, but without debug extensions for reasonable performance
       - name: "Set up PHP"
         uses: ./.github/actions/setup-php
@@ -59,7 +59,7 @@ jobs:
       - uses: actions/cache@v4
         with:
           path: ~/.cache/composer/
-          key:  ${{ runner.os }}-composer-${{ hashFiles('composer.lock') }}
+          key:  ${{ runner.os }}-composer-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
       - uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php }}
diff --git a/changelog/gh-actions-e2e-optimize-composer-cache b/changelog/gh-actions-e2e-optimize-composer-cache
new file mode 100644
index 00000000000..1e618c2233a
--- /dev/null
+++ b/changelog/gh-actions-e2e-optimize-composer-cache
@@ -0,0 +1,5 @@
+Significance: patch
+Type: dev
+Comment: Updates gh actions cache-key for composer dependencies.
+
+

From f9b976ee62f0320fa48bf27cc99516d4c592487e Mon Sep 17 00:00:00 2001
From: Miguel Gasca <miguel.gasca@automattic.com>
Date: Mon, 28 Oct 2024 15:12:50 +0100
Subject: [PATCH 12/45] Add unit test for Capital Loans page of WP Admin
 (#9638)

---
 changelog/dev-add-unit-tests-for-capital-list |   4 +
 .../test/__snapshots__/index.test.tsx.snap    | 496 ++++++++++++++++++
 client/capital/test/index.test.tsx            | 107 ++++
 3 files changed, 607 insertions(+)
 create mode 100644 changelog/dev-add-unit-tests-for-capital-list
 create mode 100644 client/capital/test/__snapshots__/index.test.tsx.snap
 create mode 100644 client/capital/test/index.test.tsx

diff --git a/changelog/dev-add-unit-tests-for-capital-list b/changelog/dev-add-unit-tests-for-capital-list
new file mode 100644
index 00000000000..a99e92e7bbe
--- /dev/null
+++ b/changelog/dev-add-unit-tests-for-capital-list
@@ -0,0 +1,4 @@
+Significance: patch
+Type: dev
+
+Add unit tests for the Capital Loans page component.
diff --git a/client/capital/test/__snapshots__/index.test.tsx.snap b/client/capital/test/__snapshots__/index.test.tsx.snap
new file mode 100644
index 00000000000..2b146dd5714
--- /dev/null
+++ b/client/capital/test/__snapshots__/index.test.tsx.snap
@@ -0,0 +1,496 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`CapitalPage renders the TableCard component with loan data 1`] = `
+<div>
+  <div
+    class=" woocommerce-payments-page"
+  >
+    <div
+      class="wcpay-banner-notice is-warning"
+    >
+      <div
+        class="wcpay-banner-notice__content"
+      >
+        Viewing test loans. To view live loans, disable test mode in 
+        <a
+          href="admin.php?page=wc-settings&tab=checkout&section=woocommerce_payments"
+        >
+          WooPayments settings
+        </a>
+        .
+      </div>
+    </div>
+    <div
+      class="components-surface components-card css-nsno0f-View-Surface-getBorders-primary-Card-rounded em57xhy0"
+      data-wp-c16t="true"
+      data-wp-component="Card"
+    >
+      <div
+        class="css-mgwsf4-View-Content em57xhy0"
+      >
+        <div
+          class="components-flex components-card__header components-card-header wcpay-loan-summary-header css-1g5oj2q-View-Flex-sx-Base-sx-Items-ItemsRow-Header-borderRadius-borderColor-medium em57xhy0"
+          data-wp-c16t="true"
+          data-wp-component="CardHeader"
+        >
+          <div
+            class="components-flex-item css-mw3lhz-View-Item-sx-Base em57xhy0"
+            data-wp-c16t="true"
+            data-wp-component="FlexItem"
+          >
+            Active loan overview
+          </div>
+          <div
+            class="components-flex-item css-mw3lhz-View-Item-sx-Base em57xhy0"
+            data-wp-c16t="true"
+            data-wp-component="FlexItem"
+          />
+        </div>
+        <div
+          class="components-card__body components-card-body wcpay-loan-summary-body css-1nwhnu3-View-Body-borderRadius-medium em57xhy0"
+          data-wp-c16t="true"
+          data-wp-component="CardBody"
+        >
+          <div
+            class="components-flex wcpay-loan-summary-row css-s9rxun-View-Flex-sx-Base-sx-Items-ItemsRow em57xhy0"
+            data-wp-c16t="true"
+            data-wp-component="Flex"
+          >
+            <div
+              class="components-flex-item components-flex-block wcpay-loan-summary-block css-14wzr73-View-Item-sx-Base-block em57xhy0"
+              data-wp-c16t="true"
+              data-wp-component="FlexBlock"
+            >
+              <div
+                class="wcpay-loan-summary-block__title"
+              >
+                Total repaid
+              </div>
+              <div
+                class="wcpay-loan-summary-block__value"
+              >
+                <span
+                  class="is-big"
+                >
+                  $0.00
+                </span>
+                 of $1,100.00
+              </div>
+            </div>
+            <div
+              class="components-flex-item components-flex-block wcpay-loan-summary-block css-14wzr73-View-Item-sx-Base-block em57xhy0"
+              data-wp-c16t="true"
+              data-wp-component="FlexBlock"
+            >
+              <div
+                class="wcpay-loan-summary-block__title"
+              >
+                Repaid this period (until Dec 27, 2024)
+              </div>
+              <div
+                class="wcpay-loan-summary-block__value"
+              >
+                <span
+                  class="is-big"
+                >
+                  $0.00
+                </span>
+                 of $122.23 minimum
+              </div>
+            </div>
+          </div>
+          <div
+            class="components-flex wcpay-loan-summary-row is-bottom-row css-s9rxun-View-Flex-sx-Base-sx-Items-ItemsRow em57xhy0"
+            data-wp-c16t="true"
+            data-wp-component="Flex"
+          >
+            <div
+              class="components-flex-item components-flex-block wcpay-loan-summary-block css-14wzr73-View-Item-sx-Base-block em57xhy0"
+              data-wp-c16t="true"
+              data-wp-component="FlexBlock"
+            >
+              <div
+                class="wcpay-loan-summary-block__title"
+              >
+                Loan disbursed
+              </div>
+              <div
+                class="wcpay-loan-summary-block__value"
+              >
+                Oct 21, 2024
+              </div>
+            </div>
+            <div
+              class="components-flex-item components-flex-block wcpay-loan-summary-block css-14wzr73-View-Item-sx-Base-block em57xhy0"
+              data-wp-c16t="true"
+              data-wp-component="FlexBlock"
+            >
+              <div
+                class="wcpay-loan-summary-block__title"
+              >
+                Loan amount
+              </div>
+              <div
+                class="wcpay-loan-summary-block__value"
+              >
+                $1,000.00
+              </div>
+            </div>
+            <div
+              class="components-flex-item components-flex-block wcpay-loan-summary-block css-14wzr73-View-Item-sx-Base-block em57xhy0"
+              data-wp-c16t="true"
+              data-wp-component="FlexBlock"
+            >
+              <div
+                class="wcpay-loan-summary-block__title"
+              >
+                Fixed fee
+              </div>
+              <div
+                class="wcpay-loan-summary-block__value"
+              >
+                $100.00
+              </div>
+            </div>
+            <div
+              class="components-flex-item components-flex-block wcpay-loan-summary-block css-14wzr73-View-Item-sx-Base-block em57xhy0"
+              data-wp-c16t="true"
+              data-wp-component="FlexBlock"
+            >
+              <div
+                class="wcpay-loan-summary-block__title"
+              >
+                Withhold rate
+              </div>
+              <div
+                class="wcpay-loan-summary-block__value"
+              >
+                15
+                %
+              </div>
+            </div>
+            <div
+              class="components-flex-item components-flex-block wcpay-loan-summary-block css-14wzr73-View-Item-sx-Base-block em57xhy0"
+              data-wp-c16t="true"
+              data-wp-component="FlexBlock"
+            >
+              <div
+                class="wcpay-loan-summary-block__title"
+              >
+                First paydown
+              </div>
+              <div
+                class="wcpay-loan-summary-block__value"
+              >
+                Oct 28, 2024
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div
+        aria-hidden="true"
+        class="components-elevation css-91yjwm-View-Elevation-sx-Base-elevationClassName em57xhy0"
+        data-wp-c16t="true"
+        data-wp-component="Elevation"
+      />
+      <div
+        aria-hidden="true"
+        class="components-elevation css-91yjwm-View-Elevation-sx-Base-elevationClassName em57xhy0"
+        data-wp-c16t="true"
+        data-wp-component="Elevation"
+      />
+    </div>
+    <div
+      class="components-surface components-card woocommerce-table wcpay-loans-list css-nsno0f-View-Surface-getBorders-primary-Card-rounded em57xhy0"
+      data-wp-c16t="true"
+      data-wp-component="Card"
+    >
+      <div
+        class="css-mgwsf4-View-Content em57xhy0"
+      >
+        <div
+          class="components-flex components-card__header components-card-header css-1g5oj2q-View-Flex-sx-Base-sx-Items-ItemsRow-Header-borderRadius-borderColor-medium em57xhy0"
+          data-wp-c16t="true"
+          data-wp-component="CardHeader"
+        >
+          <h2
+            class="components-truncate components-text css-1s1vggh-View-Text-sx-Base em57xhy0"
+            data-wp-c16t="true"
+            data-wp-component="Text"
+          >
+            All loans
+          </h2>
+          <div
+            class="woocommerce-table__actions"
+          />
+        </div>
+        <div
+          class="components-card__body components-card-body css-1i4jx7i-View-Body-borderRadius em57xhy0"
+          data-wp-c16t="true"
+          data-wp-component="CardBody"
+        >
+          <div
+            aria-labelledby="caption-0"
+            class="woocommerce-table__table"
+            role="group"
+          >
+            <table>
+              <caption
+                class="woocommerce-table__caption screen-reader-text"
+                id="caption-0"
+              >
+                All loans
+              </caption>
+              <tbody>
+                <tr>
+                  <th
+                    class="woocommerce-table__header is-left-aligned is-sorted"
+                    role="columnheader"
+                    scope="col"
+                  >
+                    <span
+                      aria-hidden="true"
+                    >
+                      Disbursed
+                    </span>
+                    <span
+                      class="screen-reader-text"
+                    >
+                      Disbursed
+                    </span>
+                  </th>
+                  <th
+                    class="woocommerce-table__header is-center-aligned is-left-aligned"
+                    role="columnheader"
+                    scope="col"
+                  >
+                    <span
+                      aria-hidden="true"
+                    >
+                      Status
+                    </span>
+                    <span
+                      class="screen-reader-text"
+                    >
+                      Status
+                    </span>
+                  </th>
+                  <th
+                    class="woocommerce-table__header is-numeric"
+                    role="columnheader"
+                    scope="col"
+                  >
+                    <span
+                      aria-hidden="true"
+                    >
+                      Amount
+                    </span>
+                    <span
+                      class="screen-reader-text"
+                    >
+                      Amount
+                    </span>
+                  </th>
+                  <th
+                    class="woocommerce-table__header is-numeric"
+                    role="columnheader"
+                    scope="col"
+                  >
+                    <span
+                      aria-hidden="true"
+                    >
+                      Fixed fee
+                    </span>
+                    <span
+                      class="screen-reader-text"
+                    >
+                      Fixed fee
+                    </span>
+                  </th>
+                  <th
+                    class="woocommerce-table__header is-numeric"
+                    role="columnheader"
+                    scope="col"
+                  >
+                    <span
+                      aria-hidden="true"
+                    >
+                      Withhold rate
+                    </span>
+                    <span
+                      class="screen-reader-text"
+                    >
+                      Withhold rate
+                    </span>
+                  </th>
+                  <th
+                    class="woocommerce-table__header is-numeric"
+                    role="columnheader"
+                    scope="col"
+                  >
+                    <span
+                      aria-hidden="true"
+                    >
+                      First paydown
+                    </span>
+                    <span
+                      class="screen-reader-text"
+                    >
+                      First paydown
+                    </span>
+                  </th>
+                </tr>
+                <tr>
+                  <th
+                    class="woocommerce-table__item is-left-aligned is-sorted"
+                    scope="row"
+                  >
+                    <a
+                      class="woocommerce-table__clickable-cell"
+                      data-link-type="wc-admin"
+                      href="admin.php?page=wc-admin&path=%2Fpayments%2Ftransactions&type=charge&filter=advanced&loan_id_is=financingoffer_1QEpQ2J5cIRIG92xWoVJJE3S"
+                      tabindex="-1"
+                    >
+                      Oct 28, 2024
+                    </a>
+                  </th>
+                  <td
+                    class="woocommerce-table__item is-center-aligned is-left-aligned"
+                  >
+                    <a
+                      class="woocommerce-table__clickable-cell"
+                      data-link-type="wc-admin"
+                      href="admin.php?page=wc-admin&path=%2Fpayments%2Ftransactions&type=charge&filter=advanced&loan_id_is=financingoffer_1QEpQ2J5cIRIG92xWoVJJE3S"
+                      tabindex="-1"
+                    >
+                      <span
+                        class="chip chip-warning"
+                      >
+                        Active
+                      </span>
+                    </a>
+                  </td>
+                  <td
+                    class="woocommerce-table__item is-numeric"
+                  >
+                    <a
+                      class="woocommerce-table__clickable-cell"
+                      data-link-type="wc-admin"
+                      href="admin.php?page=wc-admin&path=%2Fpayments%2Ftransactions&type=charge&filter=advanced&loan_id_is=financingoffer_1QEpQ2J5cIRIG92xWoVJJE3S"
+                      tabindex="-1"
+                    >
+                      $1,000.00
+                    </a>
+                  </td>
+                  <td
+                    class="woocommerce-table__item is-numeric"
+                  >
+                    <a
+                      class="woocommerce-table__clickable-cell"
+                      data-link-type="wc-admin"
+                      href="admin.php?page=wc-admin&path=%2Fpayments%2Ftransactions&type=charge&filter=advanced&loan_id_is=financingoffer_1QEpQ2J5cIRIG92xWoVJJE3S"
+                      tabindex="-1"
+                    >
+                      $100.00
+                    </a>
+                  </td>
+                  <td
+                    class="woocommerce-table__item is-numeric"
+                  >
+                    <a
+                      class="woocommerce-table__clickable-cell"
+                      data-link-type="wc-admin"
+                      href="admin.php?page=wc-admin&path=%2Fpayments%2Ftransactions&type=charge&filter=advanced&loan_id_is=financingoffer_1QEpQ2J5cIRIG92xWoVJJE3S"
+                      tabindex="-1"
+                    >
+                      15%
+                    </a>
+                  </td>
+                  <td
+                    class="woocommerce-table__item is-numeric"
+                  >
+                    <a
+                      class="woocommerce-table__clickable-cell"
+                      data-link-type="wc-admin"
+                      href="admin.php?page=wc-admin&path=%2Fpayments%2Ftransactions&type=charge&filter=advanced&loan_id_is=financingoffer_1QEpQ2J5cIRIG92xWoVJJE3S"
+                      tabindex="-1"
+                    >
+                      -
+                    </a>
+                  </td>
+                </tr>
+              </tbody>
+            </table>
+          </div>
+        </div>
+        <div
+          class="components-flex components-card__footer components-card-footer css-142znvl-View-Flex-sx-Base-sx-Items-ItemsRow-Footer-borderRadius-borderColor-medium em57xhy0"
+          data-wp-c16t="true"
+          data-wp-component="CardFooter"
+        >
+          <ul
+            class="woocommerce-table__summary"
+            role="complementary"
+          >
+            <li
+              class="woocommerce-table__summary-item"
+            >
+              <span
+                class="woocommerce-table__summary-value"
+              >
+                1
+              </span>
+              <span
+                class="woocommerce-table__summary-label"
+              >
+                loan
+              </span>
+            </li>
+            <li
+              class="woocommerce-table__summary-item"
+            >
+              <span
+                class="woocommerce-table__summary-value"
+              >
+                $1,000.00
+              </span>
+              <span
+                class="woocommerce-table__summary-label"
+              >
+                total
+              </span>
+            </li>
+            <li
+              class="woocommerce-table__summary-item"
+            >
+              <span
+                class="woocommerce-table__summary-value"
+              >
+                $100.00
+              </span>
+              <span
+                class="woocommerce-table__summary-label"
+              >
+                fixed fees
+              </span>
+            </li>
+          </ul>
+        </div>
+      </div>
+      <div
+        aria-hidden="true"
+        class="components-elevation css-15t1t3g-View-Elevation-sx-Base-elevationClassName em57xhy0"
+        data-wp-c16t="true"
+        data-wp-component="Elevation"
+      />
+      <div
+        aria-hidden="true"
+        class="components-elevation css-15t1t3g-View-Elevation-sx-Base-elevationClassName em57xhy0"
+        data-wp-c16t="true"
+        data-wp-component="Elevation"
+      />
+    </div>
+  </div>
+</div>
+`;
diff --git a/client/capital/test/index.test.tsx b/client/capital/test/index.test.tsx
new file mode 100644
index 00000000000..f9eb43b8a49
--- /dev/null
+++ b/client/capital/test/index.test.tsx
@@ -0,0 +1,107 @@
+/**
+ * External dependencies
+ */
+import React from 'react';
+import { render, screen } from '@testing-library/react';
+/**
+ * Internal dependencies
+ */
+import { useActiveLoanSummary, useLoans } from 'wcpay/data';
+import CapitalPage from '../index';
+
+// Mock the useLoans hook
+jest.mock( 'wcpay/data', () => ( {
+	useLoans: jest.fn(),
+	useActiveLoanSummary: jest.fn(),
+} ) );
+
+declare const global: {
+	wcpaySettings: {
+		zeroDecimalCurrencies: string[];
+		testMode: boolean;
+		connect: {
+			country: string;
+		};
+		accountLoans: {
+			has_active_loan: boolean;
+		};
+	};
+};
+
+describe( 'CapitalPage', () => {
+	beforeEach( () => {
+		global.wcpaySettings = {
+			zeroDecimalCurrencies: [],
+			connect: {
+				country: 'US',
+			},
+			accountLoans: { has_active_loan: true },
+			testMode: true,
+		};
+	} );
+
+	it( 'renders the TableCard component with loan data', () => {
+		const loans = [
+			{
+				wcpay_capital_loan_id: 1,
+				stripe_account_id: 'acct_1QD3WwR45o7u2iE3',
+				stripe_offer_id: 'financingoffer_1QEpQ2J5cIRIG92xWoVJJE3S',
+				stripe_loan_id: 'financingoffer_1QEpQ2J5cIRIG92xWoVJJE3S',
+				amount: 100000,
+				currency: 'usd',
+				fee_amount: 10000,
+				withhold_rate: 0.15,
+				accepted_at: '2024-10-28 10:10:50',
+				paid_out_at: '2024-10-28 10:11:40',
+				first_paydown_at: null,
+				fully_paid_at: null,
+				deleted_at: null,
+			},
+		];
+		( useLoans as jest.Mock ).mockReturnValue( {
+			loans,
+			isLoading: false,
+		} );
+
+		( useActiveLoanSummary as jest.Mock ).mockReturnValue( {
+			summary: {
+				details: {
+					advance_amount: 100000,
+					advance_paid_out_at: 1729505500.7316985,
+					currency: 'usd',
+					current_repayment_interval: {
+						due_at: 1735294500,
+						paid_amount: 0,
+						remaining_amount: 12223,
+					},
+					fee_amount: 10000,
+					paid_amount: 0,
+					remaining_amount: 110000,
+					repayments_begin_at: 1730110500,
+					withhold_rate: 0.15,
+				},
+				isLoading: false,
+			},
+		} );
+
+		const { container } = render( <CapitalPage /> );
+
+		expect(
+			screen.getByRole( 'heading', { name: 'All loans' } )
+		).toBeInTheDocument();
+		expect( container ).toMatchSnapshot();
+	} );
+
+	it( 'shows loading state when loans are being fetched', () => {
+		( useLoans as jest.Mock ).mockReturnValue( {
+			loans: [],
+			isLoading: true,
+		} );
+
+		render( <CapitalPage /> );
+
+		expect(
+			screen.getByText( 'Your requested data is loading' )
+		).toBeInTheDocument();
+	} );
+} );

From c88ae5e8ad41319e4d21cb0c3f3f1285ee6142bf Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <a.sumaran@gmail.com>
Date: Mon, 28 Oct 2024 13:21:04 -0500
Subject: [PATCH 13/45] Refactor `loadStripe` for Express Checkouts (#9582)

---
 changelog/as-improve-stripe-for-ece                       | 4 ++++
 client/checkout/api/index.js                              | 8 ++++----
 .../blocks/components/express-checkout-container.js       | 2 +-
 .../utils/checkPaymentMethodIsAvailable.js                | 2 +-
 client/payment-request/blocks/index.js                    | 7 +++++--
 client/tokenized-payment-request/blocks/index.js          | 7 +++++--
 6 files changed, 20 insertions(+), 10 deletions(-)
 create mode 100644 changelog/as-improve-stripe-for-ece

diff --git a/changelog/as-improve-stripe-for-ece b/changelog/as-improve-stripe-for-ece
new file mode 100644
index 00000000000..e7399403864
--- /dev/null
+++ b/changelog/as-improve-stripe-for-ece
@@ -0,0 +1,4 @@
+Significance: minor
+Type: update
+
+Refactor loadStripe for Express Checkouts.
diff --git a/client/checkout/api/index.js b/client/checkout/api/index.js
index c43bd2405d8..855cecf966b 100644
--- a/client/checkout/api/index.js
+++ b/client/checkout/api/index.js
@@ -103,15 +103,15 @@ export default class WCPayAPI {
 	}
 
 	/**
-	 * Load Stripe for payment request button.
+	 * Load Stripe for Express Checkout with the merchant’s connected account.
 	 *
-	 * @param {boolean}  forceAccountRequest True to instantiate the Stripe object with the merchant's account key.
 	 * @return {Promise} Promise with the Stripe object or an error.
 	 */
-	loadStripe( forceAccountRequest = false ) {
+	loadStripeForExpressCheckout() {
 		return new Promise( ( resolve ) => {
 			try {
-				resolve( this.getStripe( forceAccountRequest ) );
+				// Force Stripe to be loadded with the connected account.
+				resolve( this.getStripe( true ) );
 			} catch ( error ) {
 				// In order to avoid showing console error publicly to users,
 				// we resolve instead of rejecting when there is an error.
diff --git a/client/express-checkout/blocks/components/express-checkout-container.js b/client/express-checkout/blocks/components/express-checkout-container.js
index c2df0e55c6a..ebcb82e8342 100644
--- a/client/express-checkout/blocks/components/express-checkout-container.js
+++ b/client/express-checkout/blocks/components/express-checkout-container.js
@@ -18,7 +18,7 @@ const ExpressCheckoutContainer = ( props ) => {
 	const { api, billing, buttonAttributes } = props;
 
 	const stripePromise = useMemo( () => {
-		return api.loadStripe( true );
+		return api.loadStripeForExpressCheckout();
 	}, [ api ] );
 
 	const options = {
diff --git a/client/express-checkout/utils/checkPaymentMethodIsAvailable.js b/client/express-checkout/utils/checkPaymentMethodIsAvailable.js
index 29f809b731d..b592169da22 100644
--- a/client/express-checkout/utils/checkPaymentMethodIsAvailable.js
+++ b/client/express-checkout/utils/checkPaymentMethodIsAvailable.js
@@ -42,7 +42,7 @@ export const checkPaymentMethodIsAvailable = memoize(
 
 		root.render(
 			<Elements
-				stripe={ api.loadStripe( true ) }
+				stripe={ api.loadStripeForExpressCheckout() }
 				options={ {
 					mode: 'payment',
 					paymentMethodCreation: 'manual',
diff --git a/client/payment-request/blocks/index.js b/client/payment-request/blocks/index.js
index 595f46cdeb4..a234e3127e9 100644
--- a/client/payment-request/blocks/index.js
+++ b/client/payment-request/blocks/index.js
@@ -25,7 +25,10 @@ const paymentRequestPaymentMethod = ( api ) => ( {
 	),
 	gatewayId: 'woocommerce_payments',
 	content: (
-		<PaymentRequestExpress api={ api } stripe={ api.loadStripe( true ) } />
+		<PaymentRequestExpress
+			api={ api }
+			stripe={ api.loadStripeForExpressCheckout() }
+		/>
 	),
 	edit: <ApplePayPreview />,
 	canMakePayment: ( cartData ) => {
@@ -46,7 +49,7 @@ const paymentRequestPaymentMethod = ( api ) => ( {
 			return false;
 		}
 
-		return api.loadStripe( true ).then( ( stripe ) => {
+		return api.loadStripeForExpressCheckout().then( ( stripe ) => {
 			// Create a payment request and check if we can make a payment to determine whether to
 			// show the Payment Request Button or not. This is necessary because a browser might be
 			// able to load the Stripe JS object, but not support Payment Requests.
diff --git a/client/tokenized-payment-request/blocks/index.js b/client/tokenized-payment-request/blocks/index.js
index ce68e13ceca..ebca67f1b7d 100644
--- a/client/tokenized-payment-request/blocks/index.js
+++ b/client/tokenized-payment-request/blocks/index.js
@@ -19,7 +19,10 @@ const ApplePayPreview = () => <img src={ applePayImage } alt="" />;
 const tokenizedCartPaymentRequestPaymentMethod = ( api ) => ( {
 	name: PAYMENT_METHOD_NAME_PAYMENT_REQUEST,
 	content: (
-		<PaymentRequestExpress api={ api } stripe={ api.loadStripe( true ) } />
+		<PaymentRequestExpress
+			api={ api }
+			stripe={ api.loadStripeForExpressCheckout() }
+		/>
 	),
 	edit: <ApplePayPreview />,
 	canMakePayment: ( cartData ) => {
@@ -40,7 +43,7 @@ const tokenizedCartPaymentRequestPaymentMethod = ( api ) => ( {
 			return false;
 		}
 
-		return api.loadStripe( true ).then( ( stripe ) => {
+		return api.loadStripeForExpressCheckout().then( ( stripe ) => {
 			// Create a payment request and check if we can make a payment to determine whether to
 			// show the Payment Request Button or not. This is necessary because a browser might be
 			// able to load the Stripe JS object, but not support Payment Requests.

From 8d8bee33b5014ad832a1c481ec40631073ea7ba2 Mon Sep 17 00:00:00 2001
From: Miguel Gasca <miguel.gasca@automattic.com>
Date: Tue, 29 Oct 2024 12:24:31 +0100
Subject: [PATCH 14/45] Add unit tests for disputed order notices of WP Admin
 (#9640)

---
 ...ev-add-unit-tests-for-diputed-order-notice |   4 +
 .../test/__snapshots__/index.test.js.snap     |  91 ++++++++++++++
 .../disputed-order-notice/test/index.test.js  | 111 ++++++++++++++++++
 3 files changed, 206 insertions(+)
 create mode 100644 changelog/dev-add-unit-tests-for-diputed-order-notice
 create mode 100644 client/components/disputed-order-notice/test/__snapshots__/index.test.js.snap
 create mode 100644 client/components/disputed-order-notice/test/index.test.js

diff --git a/changelog/dev-add-unit-tests-for-diputed-order-notice b/changelog/dev-add-unit-tests-for-diputed-order-notice
new file mode 100644
index 00000000000..8d88338d894
--- /dev/null
+++ b/changelog/dev-add-unit-tests-for-diputed-order-notice
@@ -0,0 +1,4 @@
+Significance: patch
+Type: dev
+
+Add Jest tests for the disputed order notices
diff --git a/client/components/disputed-order-notice/test/__snapshots__/index.test.js.snap b/client/components/disputed-order-notice/test/__snapshots__/index.test.js.snap
new file mode 100644
index 00000000000..4c3f5a3611a
--- /dev/null
+++ b/client/components/disputed-order-notice/test/__snapshots__/index.test.js.snap
@@ -0,0 +1,91 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`DisputedOrderNoticeHandler renders regular dispute notice 1`] = `
+<div>
+  <div
+    class="wcpay-inline-notice wcpay-inline-warning-notice components-notice is-warning"
+  >
+    <div
+      class="components-notice__content"
+    >
+      <div
+        class="components-flex css-bmzg3m-View-Flex-sx-Base-sx-Items-ItemsRow em57xhy0"
+        data-wp-c16t="true"
+        data-wp-component="Flex"
+      >
+        <div
+          class="components-flex-item wcpay-inline-notice__content wcpay-inline-warning-notice__content css-mw3lhz-View-Item-sx-Base em57xhy0"
+          data-wp-c16t="true"
+          data-wp-component="FlexItem"
+        >
+          <strong>
+            This order has a payment dispute for $10.00 for the reason 'Transaction unauthorized'. 
+          </strong>
+           
+          Please respond before Oct 28, 2023.
+          <div
+            class="components-flex wcpay-inline-notice__content__actions css-azptjn-View-Flex-sx-Base-sx-Items-ItemsRow em57xhy0"
+            data-wp-c16t="true"
+            data-wp-component="Flex"
+          >
+            <button
+              class="components-button wcpay-inline-notice__action"
+              type="button"
+            >
+              Respond now
+            </button>
+          </div>
+        </div>
+      </div>
+      <div
+        class="components-notice__actions"
+      />
+    </div>
+  </div>
+</div>
+`;
+
+exports[`DisputedOrderNoticeHandler renders urgent dispute notice 1`] = `
+<div>
+  <div
+    class="wcpay-inline-notice wcpay-inline-error-notice components-notice is-error"
+  >
+    <div
+      class="components-notice__content"
+    >
+      <div
+        class="components-flex css-bmzg3m-View-Flex-sx-Base-sx-Items-ItemsRow em57xhy0"
+        data-wp-c16t="true"
+        data-wp-component="Flex"
+      >
+        <div
+          class="components-flex-item wcpay-inline-notice__content wcpay-inline-error-notice__content css-mw3lhz-View-Item-sx-Base em57xhy0"
+          data-wp-c16t="true"
+          data-wp-component="FlexItem"
+        >
+          <strong>
+            Please resolve the dispute on this order of $10.00 labeled 'Transaction unauthorized' by Oct 28, 2023.
+          </strong>
+           
+          (Last day today)
+          <div
+            class="components-flex wcpay-inline-notice__content__actions css-azptjn-View-Flex-sx-Base-sx-Items-ItemsRow em57xhy0"
+            data-wp-c16t="true"
+            data-wp-component="Flex"
+          >
+            <button
+              class="components-button wcpay-inline-notice__action"
+              type="button"
+            >
+              Respond today
+            </button>
+          </div>
+        </div>
+      </div>
+      <div
+        class="components-notice__actions"
+      />
+    </div>
+  </div>
+</div>
+`;
diff --git a/client/components/disputed-order-notice/test/index.test.js b/client/components/disputed-order-notice/test/index.test.js
new file mode 100644
index 00000000000..7e44da132e0
--- /dev/null
+++ b/client/components/disputed-order-notice/test/index.test.js
@@ -0,0 +1,111 @@
+/**
+ * External dependencies
+ */
+import React from 'react';
+import { render, screen } from '@testing-library/react';
+/**
+ * Internal dependencies
+ */
+import DisputedOrderNoticeHandler from '../index';
+import { useCharge } from 'wcpay/data';
+
+jest.mock( 'wcpay/data', () => ( {
+	useCharge: jest.fn(),
+} ) );
+
+jest.mock( 'tracks', () => ( {
+	recordEvent: jest.fn(),
+} ) );
+
+describe( 'DisputedOrderNoticeHandler', () => {
+	const mockCharge = {
+		dispute: {
+			status: 'needs_response',
+			reason: 'fraudulent',
+			amount: 1000,
+			currency: 'USD',
+			evidence_details: {
+				due_by: 1698500219,
+			},
+		},
+	};
+
+	beforeEach( () => {
+		window.wcpaySettings = {
+			zeroDecimalCurrencies: [],
+			connect: {
+				country: 'US',
+			},
+		};
+		useCharge.mockReturnValue( { data: mockCharge } );
+	} );
+
+	afterEach( () => {
+		jest.useRealTimers();
+		jest.clearAllMocks();
+	} );
+
+	test( 'renders urgent dispute notice', () => {
+		const fixedDate = new Date( '2023-10-28T00:00:00Z' );
+		jest.useFakeTimers();
+		jest.setSystemTime( fixedDate );
+
+		const { container } = render(
+			<DisputedOrderNoticeHandler
+				chargeId="ch_123"
+				onDisableOrderRefund={ jest.fn() }
+			/>
+		);
+		const disputeMessages = screen.getAllByText(
+			/Please resolve the dispute on this order of/
+		);
+		expect( disputeMessages[ 0 ] ).toBeInTheDocument();
+		expect( screen.getByRole( 'button' ) ).toHaveTextContent(
+			'Respond today'
+		);
+		expect( container ).toMatchSnapshot();
+	} );
+
+	test( 'renders regular dispute notice', () => {
+		const fixedDate = new Date( '2023-10-20T00:00:00Z' );
+		jest.useFakeTimers();
+		jest.setSystemTime( fixedDate );
+
+		const { container } = render(
+			<DisputedOrderNoticeHandler
+				chargeId="ch_123"
+				onDisableOrderRefund={ jest.fn() }
+			/>
+		);
+		const disputeMessages = screen.getAllByText( /Please respond before/ );
+		expect( disputeMessages[ 0 ] ).toBeInTheDocument();
+		expect( screen.getByRole( 'button' ) ).toHaveTextContent(
+			'Respond now'
+		);
+		expect( container ).toMatchSnapshot();
+	} );
+
+	test( 'does not render notice if no dispute', () => {
+		useCharge.mockReturnValue( { data: {} } );
+		const { container } = render(
+			<DisputedOrderNoticeHandler
+				chargeId="ch_123"
+				onDisableOrderRefund={ jest.fn() }
+			/>
+		);
+		expect( container ).toBeEmptyDOMElement();
+	} );
+
+	test( 'does not render notice if dispute is not awaiting response', () => {
+		mockCharge.dispute.status = 'won';
+		render(
+			<DisputedOrderNoticeHandler
+				chargeId="ch_123"
+				onDisableOrderRefund={ jest.fn() }
+			/>
+		);
+		expect(
+			screen.queryByText( /Please resolve the dispute on this order of/ )
+		).not.toBeInTheDocument();
+	} );
+} );

From d5819b0720bae755d2de1d54b1720d12ac53c220 Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <a.sumaran@gmail.com>
Date: Tue, 29 Oct 2024 17:25:36 -0500
Subject: [PATCH 15/45] Add support for allowedShippingCountries in Express
 Checkout Element (#9592)

---
 ...-allowedshippingcountries-in-express-checkout-element | 4 ++++
 .../blocks/hooks/use-express-checkout.js                 | 2 ++
 client/express-checkout/index.js                         | 3 +++
 ...class-wc-payments-express-checkout-button-handler.php | 9 +++++----
 4 files changed, 14 insertions(+), 4 deletions(-)
 create mode 100644 changelog/9104-add-support-for-allowedshippingcountries-in-express-checkout-element

diff --git a/changelog/9104-add-support-for-allowedshippingcountries-in-express-checkout-element b/changelog/9104-add-support-for-allowedshippingcountries-in-express-checkout-element
new file mode 100644
index 00000000000..5eae7cb8972
--- /dev/null
+++ b/changelog/9104-add-support-for-allowedshippingcountries-in-express-checkout-element
@@ -0,0 +1,4 @@
+Significance: minor
+Type: add
+
+Add support for allowedShippingCountries in Express Checkout Element.
diff --git a/client/express-checkout/blocks/hooks/use-express-checkout.js b/client/express-checkout/blocks/hooks/use-express-checkout.js
index 090a16354a7..88f72e76829 100644
--- a/client/express-checkout/blocks/hooks/use-express-checkout.js
+++ b/client/express-checkout/blocks/hooks/use-express-checkout.js
@@ -68,6 +68,8 @@ export const useExpressCheckout = ( {
 						};
 					}
 				),
+				allowedShippingCountries: getExpressCheckoutData( 'checkout' )
+					.allowed_shipping_countries,
 			};
 
 			// Click event from WC Blocks.
diff --git a/client/express-checkout/index.js b/client/express-checkout/index.js
index f4efa4aa10f..535431b7fd1 100644
--- a/client/express-checkout/index.js
+++ b/client/express-checkout/index.js
@@ -304,6 +304,9 @@ jQuery( ( $ ) => {
 					shippingAddressRequired: options.requestShipping,
 					phoneNumberRequired: options.requestPhone,
 					shippingRates,
+					allowedShippingCountries: getExpressCheckoutData(
+						'checkout'
+					).allowed_shipping_countries,
 				};
 
 				onClickHandler( event );
diff --git a/includes/express-checkout/class-wc-payments-express-checkout-button-handler.php b/includes/express-checkout/class-wc-payments-express-checkout-button-handler.php
index 682b4eac903..d024c3ba611 100644
--- a/includes/express-checkout/class-wc-payments-express-checkout-button-handler.php
+++ b/includes/express-checkout/class-wc-payments-express-checkout-button-handler.php
@@ -240,11 +240,12 @@ public function scripts() {
 				'pay_for_order'             => wp_create_nonce( 'pay_for_order' ),
 			],
 			'checkout'           => [
-				'currency_code'     => strtolower( get_woocommerce_currency() ),
-				'country_code'      => substr( get_option( 'woocommerce_default_country' ), 0, 2 ),
-				'needs_shipping'    => WC()->cart->needs_shipping(),
+				'currency_code'              => strtolower( get_woocommerce_currency() ),
+				'country_code'               => substr( get_option( 'woocommerce_default_country' ), 0, 2 ),
+				'needs_shipping'             => WC()->cart->needs_shipping(),
 				// Defaults to 'required' to match how core initializes this option.
-				'needs_payer_phone' => 'required' === get_option( 'woocommerce_checkout_phone_field', 'required' ),
+				'needs_payer_phone'          => 'required' === get_option( 'woocommerce_checkout_phone_field', 'required' ),
+				'allowed_shipping_countries' => array_keys( WC()->countries->get_shipping_countries() ?? [] ),
 			],
 			'button'             => $this->get_button_settings(),
 			'login_confirmation' => $this->get_login_confirmation_settings(),

From a186e7f265cb9444515bab592f43443f34b56e53 Mon Sep 17 00:00:00 2001
From: Cvetan Cvetanov <cvetan.cvetanov@automattic.com>
Date: Wed, 30 Oct 2024 14:10:54 +0200
Subject: [PATCH 16/45] Resolve compatibility issues with CustomSelectControl
 component styles for WordPress 6.7 (#9645)

---
 .../fix-9636-custom-select-control-styling    |  4 +++
 .../custom-select-control/style.scss          | 26 ++++++++++++++++++-
 2 files changed, 29 insertions(+), 1 deletion(-)
 create mode 100644 changelog/fix-9636-custom-select-control-styling

diff --git a/changelog/fix-9636-custom-select-control-styling b/changelog/fix-9636-custom-select-control-styling
new file mode 100644
index 00000000000..a6ff4559ef7
--- /dev/null
+++ b/changelog/fix-9636-custom-select-control-styling
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fix
+
+Fix compatibility issues with CustomSelectControl component styles for WordPress 6.7
diff --git a/client/components/custom-select-control/style.scss b/client/components/custom-select-control/style.scss
index 3fb1b113f20..fee99ea689a 100644
--- a/client/components/custom-select-control/style.scss
+++ b/client/components/custom-select-control/style.scss
@@ -1,6 +1,7 @@
 .wcpay.components-custom-select-control {
 	font-size: 13px;
 	color: $gray-900;
+	position: relative;
 
 	.components-custom-select-control__label {
 		display: inline-block;
@@ -12,12 +13,22 @@
 		margin: 0;
 		line-height: initial;
 		box-shadow: inset 0 1px 0 #f0f0f0;
+		align-items: center;
+		cursor: default;
+		display: grid;
+		grid-template-columns: auto auto;
+		list-style-type: none;
 
 		&.is-highlighted {
 			background: $gray-0;
 		}
 	}
 
+	.components-custom-select-control__item
+		.components-custom-select-control__item-icon {
+		margin-left: auto;
+	}
+
 	button.components-custom-select-control__button {
 		width: 100%;
 		background-color: #fff;
@@ -53,9 +64,22 @@
 		}
 	}
 
+	.components-custom-select-control__menu[aria-hidden='true'] {
+		display: none;
+	}
+
 	.components-custom-select-control__menu {
 		margin: -1px 1px;
-		border-color: $gray-300;
+		background-color: #fff;
+		border: 1px solid $gray-300;
+		border-radius: 2px;
 		max-height: 300px;
+		min-width: 100%;
+		outline: none;
+		overflow: auto;
+		padding: 0;
+		position: absolute;
+		transition: none;
+		z-index: 1000000;
 	}
 }

From e1adde6c5a203fdd54d093eb0ffc6abb3d4c60cc Mon Sep 17 00:00:00 2001
From: Brett Shumaker <brettshumaker@gmail.com>
Date: Wed, 30 Oct 2024 13:58:40 -0400
Subject: [PATCH 17/45] Fix single product page view tracks. (#9644)

---
 changelog/9550-fix-single-product-page-view-tracks |  4 ++++
 includes/class-woopay-tracker.php                  | 12 +++++++++++-
 2 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 changelog/9550-fix-single-product-page-view-tracks

diff --git a/changelog/9550-fix-single-product-page-view-tracks b/changelog/9550-fix-single-product-page-view-tracks
new file mode 100644
index 00000000000..90e5ae60dff
--- /dev/null
+++ b/changelog/9550-fix-single-product-page-view-tracks
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fix
+
+Fixed single product page view tracks when BNPL and PRB payment methods are inactive.
diff --git a/includes/class-woopay-tracker.php b/includes/class-woopay-tracker.php
index 2da1e544132..78e7ea5c8da 100644
--- a/includes/class-woopay-tracker.php
+++ b/includes/class-woopay-tracker.php
@@ -622,12 +622,22 @@ public function add_frontend_tracks_scripts() {
 
 		WC_Payments::register_script_with_dependencies( 'wcpay-frontend-tracks', 'dist/frontend-tracks' );
 
-		wp_enqueue_script( 'wcpay-frontend-tracks' );
+		// Define wcpayConfig before the frontend tracks script if it hasn't been defined yet.
+		$wcpay_config = rawurlencode( wp_json_encode( WC_Payments::get_wc_payments_checkout()->get_payment_fields_js_config() ) );
+		wp_add_inline_script(
+			'wcpay-frontend-tracks',
+			"
+			var wcpayConfig = wcpayConfig || JSON.parse( decodeURIComponent( '" . esc_js( $wcpay_config ) . "' ) );
+			",
+			'before'
+		);
 
 		wp_localize_script(
 			'wcpay-frontend-tracks',
 			'wcPayFrontendTracks',
 			$frontent_tracks
 		);
+
+		wp_enqueue_script( 'wcpay-frontend-tracks' );
 	}
 }

From 8396b27128d9a390394e9204e150984fe491be54 Mon Sep 17 00:00:00 2001
From: Naman Malhotra <naman03malhotra@gmail.com>
Date: Thu, 31 Oct 2024 01:51:11 +0300
Subject: [PATCH 18/45] Introducing consistency in colors for deposits across
 pages (#8382)

Co-authored-by: Jessy Pappachan <32092402+jessy-p@users.noreply.github.com>
Co-authored-by: Shendy <73803630+shendy-a8c@users.noreply.github.com>
Co-authored-by: Rua Haszard <rua.haszard@automattic.com>
Co-authored-by: Eric Jinks <3147296+Jinksi@users.noreply.github.com>
Co-authored-by: Nagesh Pai <nagesh.pai@automattic.com>
---
 changelog/fix-7761-align-deposit-colors       |  4 ++++
 .../components/deposit-status-chip/index.tsx  |  4 ++--
 client/deposits/details/style.scss            | 24 ++++++++++++-------
 3 files changed, 21 insertions(+), 11 deletions(-)
 create mode 100644 changelog/fix-7761-align-deposit-colors

diff --git a/changelog/fix-7761-align-deposit-colors b/changelog/fix-7761-align-deposit-colors
new file mode 100644
index 00000000000..b9ae9ac792c
--- /dev/null
+++ b/changelog/fix-7761-align-deposit-colors
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fix
+
+Introducing consistency in colors for deposits across pages
diff --git a/client/components/deposit-status-chip/index.tsx b/client/components/deposit-status-chip/index.tsx
index f6b456d2f24..9d70fdfbe7a 100644
--- a/client/components/deposit-status-chip/index.tsx
+++ b/client/components/deposit-status-chip/index.tsx
@@ -15,10 +15,10 @@ import type { DepositStatus } from 'wcpay/types/deposits';
  */
 const mappings: Record< DepositStatus, ChipType > = {
 	pending: 'warning',
-	in_transit: 'success',
+	in_transit: 'primary',
 	paid: 'success',
 	failed: 'alert',
-	canceled: 'alert',
+	canceled: 'light',
 };
 
 /**
diff --git a/client/deposits/details/style.scss b/client/deposits/details/style.scss
index b05e381fde0..0031184d4cf 100644
--- a/client/deposits/details/style.scss
+++ b/client/deposits/details/style.scss
@@ -1,24 +1,30 @@
 .wcpay-deposit-overview {
 	.woocommerce-order-status {
 		margin-bottom: 4px;
+		white-space: nowrap;
 	}
 
 	.woocommerce-order-status__indicator {
 		width: 0.85em;
 		height: 0.85em;
 
+		// is-canceled uses the default gray color.
+
 		&.is-paid {
-			background: $studio-green-50;
-			border-color: $studio-green-5;
+			background: $wp-green-30;
+			border-color: $wp-green-5;
+		}
+		&.is-pending {
+			background: $wp-yellow-20;
+			border-color: $wp-yellow-5;
 		}
-		&.is-pending,
 		&.is-in_transit {
-			background: $studio-yellow-30;
-			border-color: $studio-yellow-5;
+			background: $wp-blue-30;
+			border-color: $wp-blue-5;
 		}
 		&.is-failed {
-			background: $studio-red-50;
-			border-color: $studio-red-5;
+			background: $wp-red-50;
+			border-color: $wp-red-10;
 		}
 	}
 
@@ -34,11 +40,11 @@
 	}
 
 	.wcpay-deposit-fee {
-		color: $studio-red-50;
+		color: $wp-red-70;
 	}
 
 	.wcpay-deposit-net {
-		color: $studio-green-30;
+		color: $wp-green-70;
 	}
 
 	.wcpay-deposit-automatic ul {

From e1778b01aa7fef3fe0ac93809c54b85d5137ee3b Mon Sep 17 00:00:00 2001
From: Guilherme Pressutto <gpressutto5@gmail.com>
Date: Thu, 31 Oct 2024 11:31:02 -0300
Subject: [PATCH 19/45] Register Expresss Checkout block only when enabled in
 the settings (#9646)

---
 .../fix-express-checkout-block-registering    |  4 ++++
 client/checkout/blocks/index.js               | 20 ++++++++++---------
 includes/class-wc-payment-gateway-wcpay.php   |  9 +++++++++
 includes/class-wc-payments-checkout.php       |  1 +
 4 files changed, 25 insertions(+), 9 deletions(-)
 create mode 100644 changelog/fix-express-checkout-block-registering

diff --git a/changelog/fix-express-checkout-block-registering b/changelog/fix-express-checkout-block-registering
new file mode 100644
index 00000000000..790b8a27a45
--- /dev/null
+++ b/changelog/fix-express-checkout-block-registering
@@ -0,0 +1,4 @@
+Significance: minor
+Type: fix
+
+Register Expresss Checkout block only when enabled in the settings
diff --git a/client/checkout/blocks/index.js b/client/checkout/blocks/index.js
index 12017a03129..924afccde1f 100644
--- a/client/checkout/blocks/index.js
+++ b/client/checkout/blocks/index.js
@@ -157,15 +157,17 @@ if ( getUPEConfig( 'isWooPayEnabled' ) ) {
 	}
 }
 
-if ( getUPEConfig( 'isTokenizedCartPrbEnabled' ) ) {
-	registerExpressPaymentMethod(
-		tokenizedCartPaymentRequestPaymentMethod( api )
-	);
-} else if ( getUPEConfig( 'isExpressCheckoutElementEnabled' ) ) {
-	registerExpressPaymentMethod( expressCheckoutElementApplePay( api ) );
-	registerExpressPaymentMethod( expressCheckoutElementGooglePay( api ) );
-} else {
-	registerExpressPaymentMethod( paymentRequestPaymentMethod( api ) );
+if ( getUPEConfig( 'isPaymentRequestEnabled' ) ) {
+	if ( getUPEConfig( 'isTokenizedCartPrbEnabled' ) ) {
+		registerExpressPaymentMethod(
+			tokenizedCartPaymentRequestPaymentMethod( api )
+		);
+	} else if ( getUPEConfig( 'isExpressCheckoutElementEnabled' ) ) {
+		registerExpressPaymentMethod( expressCheckoutElementApplePay( api ) );
+		registerExpressPaymentMethod( expressCheckoutElementGooglePay( api ) );
+	} else {
+		registerExpressPaymentMethod( paymentRequestPaymentMethod( api ) );
+	}
 }
 window.addEventListener( 'load', () => {
 	enqueueFraudScripts( getUPEConfig( 'fraudServices' ) );
diff --git a/includes/class-wc-payment-gateway-wcpay.php b/includes/class-wc-payment-gateway-wcpay.php
index d1fe2b1cca6..2a60d9b64e2 100644
--- a/includes/class-wc-payment-gateway-wcpay.php
+++ b/includes/class-wc-payment-gateway-wcpay.php
@@ -894,6 +894,15 @@ public function is_saved_cards_enabled() {
 		return 'yes' === $this->get_option( 'saved_cards' );
 	}
 
+	/**
+	 * Checks if the setting to show the payment request buttons is enabled.
+	 *
+	 * @return bool Whether the setting to show the payment request buttons is enabled or not.
+	 */
+	public function is_payment_request_enabled() {
+		return 'yes' === $this->get_option( 'payment_request' );
+	}
+
 	/**
 	 * Check if account is eligible for card present.
 	 *
diff --git a/includes/class-wc-payments-checkout.php b/includes/class-wc-payments-checkout.php
index 79e6e119267..0b1cc59d9cf 100644
--- a/includes/class-wc-payments-checkout.php
+++ b/includes/class-wc-payments-checkout.php
@@ -193,6 +193,7 @@ public function get_payment_fields_js_config() {
 			'isPreview'                         => is_preview(),
 			'isSavedCardsEnabled'               => $this->gateway->is_saved_cards_enabled(),
 			'isExpressCheckoutElementEnabled'   => WC_Payments_Features::is_stripe_ece_enabled(),
+			'isPaymentRequestEnabled'           => $this->gateway->is_payment_request_enabled(),
 			'isTokenizedCartPrbEnabled'         => WC_Payments_Features::is_tokenized_cart_prb_enabled(),
 			'isWooPayEnabled'                   => $this->woopay_util->should_enable_woopay( $this->gateway ) && $this->woopay_util->should_enable_woopay_on_cart_or_checkout(),
 			'isWoopayExpressCheckoutEnabled'    => $this->woopay_util->is_woopay_express_checkout_enabled(),

From ccff83608c9539bbfe8e3f9702db3e13818a73f1 Mon Sep 17 00:00:00 2001
From: Mike Moore <michael.moore@automattic.com>
Date: Thu, 31 Oct 2024 14:50:27 -0400
Subject: [PATCH 20/45] Respect BNPL limits_per_currency (country, min, max)
 (#9626)

---
 .../fix-9456-bnpl-respect-limits-per-currency |   4 +
 .../bnpl-site-messaging/index.js              |   5 +-
 client/product-details/index.js               |  36 ++-
 ...ments-payment-method-messaging-element.php |  49 ++--
 includes/class-wc-payments-utils.php          | 210 +++++++++++++-----
 includes/class-wc-payments.php                |  21 ++
 .../class-affirm-payment-method.php           |  15 +-
 .../class-afterpay-payment-method.php         |  33 +--
 .../class-klarna-payment-method.php           |  71 +-----
 tests/unit/test-class-wc-payments-utils.php   |  88 +++++++-
 10 files changed, 331 insertions(+), 201 deletions(-)
 create mode 100644 changelog/fix-9456-bnpl-respect-limits-per-currency

diff --git a/changelog/fix-9456-bnpl-respect-limits-per-currency b/changelog/fix-9456-bnpl-respect-limits-per-currency
new file mode 100644
index 00000000000..be78120fabc
--- /dev/null
+++ b/changelog/fix-9456-bnpl-respect-limits-per-currency
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fix
+
+Prevent dead space on product pages when no BNPL offers are available.
diff --git a/client/product-details/bnpl-site-messaging/index.js b/client/product-details/bnpl-site-messaging/index.js
index 36cb845fb71..1bbe51e0edf 100644
--- a/client/product-details/bnpl-site-messaging/index.js
+++ b/client/product-details/bnpl-site-messaging/index.js
@@ -55,12 +55,11 @@ export const initializeBnplSiteMessaging = async () => {
 		isCart,
 		isCartBlock,
 		cartTotal,
-		minimumOrderAmount,
+		isBnplAvailable,
 	} = window.wcpayStripeSiteMessaging;
 
 	let amount;
 	let elementLocation = 'bnplProductPage';
-	const minOrderAmount = parseInt( minimumOrderAmount, 10 ) || 0;
 	const paymentMessageContainer = document.getElementById(
 		'payment-method-message'
 	);
@@ -71,7 +70,7 @@ export const initializeBnplSiteMessaging = async () => {
 	} else {
 		amount = parseInt( productVariations.base_product.amount, 10 ) || 0;
 
-		if ( amount < minOrderAmount ) {
+		if ( ! isBnplAvailable ) {
 			paymentMessageContainer.style.setProperty( 'display', 'none' );
 		}
 	}
diff --git a/client/product-details/index.js b/client/product-details/index.js
index 93358a26f3b..b686e1a342f 100644
--- a/client/product-details/index.js
+++ b/client/product-details/index.js
@@ -104,13 +104,29 @@ jQuery( async function ( $ ) {
 				'get_cart_total'
 			),
 			{
-				security: window.wcpayStripeSiteMessaging.nonce,
+				security: window.wcpayStripeSiteMessaging.nonce.get_cart_total,
+			}
+		);
+	};
+
+	const isBnplAvailable = ( price, currency, country ) => {
+		return request(
+			buildAjaxURL(
+				window.wcpayStripeSiteMessaging.wcAjaxUrl,
+				'check_bnpl_availability'
+			),
+			{
+				security:
+					window.wcpayStripeSiteMessaging.nonce.is_bnpl_available,
+				price: price,
+				currency: currency,
+				country: country,
 			}
 		);
 	};
 
 	// Update BNPL message based on the quantity change
-	quantityInput.on( 'change', ( event ) => {
+	quantityInput.on( 'change', async ( event ) => {
 		let amount = baseProductAmount;
 		const variationId = $( VARIATION_ID_SELECTOR ).val();
 
@@ -123,6 +139,22 @@ jQuery( async function ( $ ) {
 		}
 
 		updateBnplPaymentMessage( amount, productCurrency, event.target.value );
+
+		// Check if changes in quantity/price affect BNPL availability and show/hide BNPL messaging accordingly.
+		try {
+			const response = await isBnplAvailable(
+				amount * event.target.value,
+				productCurrency,
+				window.wcpayStripeSiteMessaging.country
+			);
+			if ( response.success && response.data.is_available ) {
+				$( '#payment-method-message' ).slideDown();
+			} else {
+				$( '#payment-method-message' ).slideUp();
+			}
+		} catch {
+			// Do nothing.
+		}
 	} );
 
 	$( document.body ).on( 'updated_cart_totals', () => {
diff --git a/includes/class-wc-payments-payment-method-messaging-element.php b/includes/class-wc-payments-payment-method-messaging-element.php
index aeffbc78c61..b279d2b09bf 100644
--- a/includes/class-wc-payments-payment-method-messaging-element.php
+++ b/includes/class-wc-payments-payment-method-messaging-element.php
@@ -90,6 +90,9 @@ public function init() {
 					'currency' => $currency_code,
 				],
 			];
+
+			$product_price = $product_variations['base_product']['amount'];
+
 			foreach ( $product->get_children() as $variation_id ) {
 				$variation = wc_get_product( $variation_id );
 				if ( $variation ) {
@@ -98,11 +101,13 @@ public function init() {
 						'amount'   => WC_Payments_Utils::prepare_amount( $price, $currency_code ),
 						'currency' => $currency_code,
 					];
+
+					$product_price = $product_variations['base_product']['amount'];
 				}
 			}
 		}
 
-		$enabled_upe_payment_methods = $this->gateway->get_payment_method_ids_enabled_at_checkout();
+		$enabled_upe_payment_methods = $this->gateway->get_upe_enabled_payment_method_ids();
 		// Filter non BNPL out of the list of payment methods.
 		$bnpl_payment_methods = array_intersect( $enabled_upe_payment_methods, Payment_Method::BNPL_PAYMENT_METHODS );
 
@@ -118,26 +123,36 @@ public function init() {
 			WC_Payments::get_file_version( 'dist/product-details.css' ),
 		);
 
+		$country = empty( $billing_country ) ? $store_country : $billing_country;
+
+		$script_data = [
+			'productId'         => 'base_product',
+			'productVariations' => $product_variations,
+			'country'           => $country,
+			'locale'            => WC_Payments_Utils::convert_to_stripe_locale( get_locale() ),
+			'accountId'         => $this->account->get_stripe_account_id(),
+			'publishableKey'    => $this->account->get_publishable_key( WC_Payments::mode()->is_test() ),
+			'paymentMethods'    => array_values( $bnpl_payment_methods ),
+			'currencyCode'      => $currency_code,
+			'isCart'            => is_cart(),
+			'isCartBlock'       => $is_cart_block,
+			'cartTotal'         => WC_Payments_Utils::prepare_amount( $cart_total, $currency_code ),
+			'nonce'             => [
+				'get_cart_total'    => wp_create_nonce( 'wcpay-get-cart-total' ),
+				'is_bnpl_available' => wp_create_nonce( 'wcpay-is-bnpl-available' ),
+			],
+			'wcAjaxUrl'         => WC_AJAX::get_endpoint( '%%endpoint%%' ),
+		];
+
+		if ( $product ) {
+			$script_data['isBnplAvailable'] = WC_Payments_Utils::is_any_bnpl_method_available( array_values( $bnpl_payment_methods ), $country, $currency_code, $product_price );
+		}
+
 		// Create script tag with config.
 		wp_localize_script(
 			'WCPAY_PRODUCT_DETAILS',
 			'wcpayStripeSiteMessaging',
-			[
-				'productId'          => 'base_product',
-				'productVariations'  => $product_variations,
-				'country'            => empty( $billing_country ) ? $store_country : $billing_country,
-				'locale'             => WC_Payments_Utils::convert_to_stripe_locale( get_locale() ),
-				'accountId'          => $this->account->get_stripe_account_id(),
-				'publishableKey'     => $this->account->get_publishable_key( WC_Payments::mode()->is_test() ),
-				'paymentMethods'     => array_values( $bnpl_payment_methods ),
-				'currencyCode'       => $currency_code,
-				'isCart'             => is_cart(),
-				'isCartBlock'        => $is_cart_block,
-				'cartTotal'          => WC_Payments_Utils::prepare_amount( $cart_total, $currency_code ),
-				'minimumOrderAmount' => WC_Payments_Utils::get_cached_minimum_amount( $currency_code, true ),
-				'nonce'              => wp_create_nonce( 'wcpay-get-cart-total' ),
-				'wcAjaxUrl'          => WC_AJAX::get_endpoint( '%%endpoint%%' ),
-			]
+			$script_data
 		);
 
 		// Ensure wcpayConfig is available in the page.
diff --git a/includes/class-wc-payments-utils.php b/includes/class-wc-payments-utils.php
index 0b2506d73b6..226950362cf 100644
--- a/includes/class-wc-payments-utils.php
+++ b/includes/class-wc-payments-utils.php
@@ -716,59 +716,163 @@ public static function get_filtered_error_status_code( Exception $e ): int {
 	}
 
 	/**
-	 * Retrieves Stripe minimum order value authorized per currency.
-	 * The values are based on Stripe's recommendations.
-	 * See https://docs.stripe.com/currencies#minimum-and-maximum-charge-amounts.
+	 * Get the BNPL limits per currency for a specific payment method.
 	 *
-	 * @param string $currency The currency.
-	 *
-	 * @return int The minimum amount.
+	 * @param string $payment_method The payment method name ('affirm', 'afterpay_clearpay', or 'klarna').
+	 * @return array The BNPL limits per currency for the specified payment method.
 	 */
-	public static function get_stripe_minimum_amount( $currency ) {
-		switch ( $currency ) {
-			case 'AED':
-			case 'MYR':
-			case 'PLN':
-			case 'RON':
-				$minimum_amount = 200;
-				break;
-			case 'BGN':
-				$minimum_amount = 100;
-				break;
-			case 'CZK':
-				$minimum_amount = 1500;
-				break;
-			case 'DKK':
-				$minimum_amount = 250;
-				break;
-			case 'GBP':
-				$minimum_amount = 30;
-				break;
-			case 'HKD':
-				$minimum_amount = 400;
-				break;
-			case 'HUF':
-				$minimum_amount = 17500;
-				break;
-			case 'JPY':
-				$minimum_amount = 5000;
-				break;
-			case 'MXN':
-			case 'THB':
-				$minimum_amount = 1000;
-				break;
-			case 'NOK':
-			case 'SEK':
-				$minimum_amount = 300;
-				break;
+	public static function get_bnpl_limits_per_currency( $payment_method ) {
+		switch ( $payment_method ) {
+			case 'affirm':
+				return [
+					Currency_Code::CANADIAN_DOLLAR      => [
+						Country_Code::CANADA => [
+							'min' => 5000,
+							'max' => 3000000,
+						], // Represents CAD 50 - 30,000 CAD.
+					],
+					Currency_Code::UNITED_STATES_DOLLAR => [
+						Country_Code::UNITED_STATES => [
+							'min' => 5000,
+							'max' => 3000000,
+						],
+					], // Represents USD 50 - 30,000 USD.
+				];
+			case 'afterpay_clearpay':
+				return [
+					Currency_Code::AUSTRALIAN_DOLLAR    => [
+						Country_Code::AUSTRALIA => [
+							'min' => 100,
+							'max' => 200000,
+						], // Represents AUD 1 - 2,000 AUD.
+					],
+					Currency_Code::CANADIAN_DOLLAR      => [
+						Country_Code::CANADA => [
+							'min' => 100,
+							'max' => 200000,
+						], // Represents CAD 1 - 2,000 CAD.
+					],
+					Currency_Code::NEW_ZEALAND_DOLLAR   => [
+						Country_Code::NEW_ZEALAND => [
+							'min' => 100,
+							'max' => 200000,
+						], // Represents NZD 1 - 2,000 NZD.
+					],
+					Currency_Code::POUND_STERLING       => [
+						Country_Code::UNITED_KINGDOM => [
+							'min' => 100,
+							'max' => 120000,
+						], // Represents GBP 1 - 1,200 GBP.
+					],
+					Currency_Code::UNITED_STATES_DOLLAR => [
+						Country_Code::UNITED_STATES => [
+							'min' => 100,
+							'max' => 400000,
+						], // Represents USD 1 - 4,000 USD.
+					],
+				];
+			case 'klarna':
+				return [
+					Currency_Code::UNITED_STATES_DOLLAR => [
+						Country_Code::UNITED_STATES => [
+							'min' => 100,
+							'max' => 1000000,
+						], // Represents USD 1 - 10,000 USD.
+					],
+					Currency_Code::POUND_STERLING       => [
+						Country_Code::UNITED_KINGDOM => [
+							'min' => 100,
+							'max' => 500000,
+						], // Represents GBP 1 - 5,000 GBP.
+					],
+					Currency_Code::EURO                 => [
+						Country_Code::AUSTRIA     => [
+							'min' => 100,
+							'max' => 1000000,
+						], // Represents EUR 1 - 10,000 EUR.
+						Country_Code::BELGIUM     => [
+							'min' => 100,
+							'max' => 1000000,
+						], // Represents EUR 1 - 10,000 EUR.
+						Country_Code::GERMANY     => [
+							'min' => 100,
+							'max' => 1000000,
+						], // Represents EUR 1 - 10,000 EUR.
+						Country_Code::NETHERLANDS => [
+							'min' => 100,
+							'max' => 500000,
+						], // Represents EUR 1 - 5,000 EUR.
+						Country_Code::FINLAND     => [
+							'min' => 100,
+							'max' => 1000000,
+						], // Represents EUR 1 - 10,000 EUR.
+						Country_Code::SPAIN       => [
+							'min' => 100,
+							'max' => 1000000,
+						], // Represents EUR 1 - 10,000 EUR.
+						Country_Code::IRELAND     => [
+							'min' => 100,
+							'max' => 400000,
+						], // Represents EUR 1 - 4,000 EUR.
+						Country_Code::ITALY       => [
+							'min' => 100,
+							'max' => 400000,
+						], // Represents EUR 1 - 4,000 EUR.
+						Country_Code::FRANCE      => [
+							'min' => 100,
+							'max' => 400000,
+						], // Represents EUR 1 - 4,000 EUR.
+					],
+					Currency_Code::DANISH_KRONE         => [
+						Country_Code::DENMARK => [
+							'min' => 100,
+							'max' => 10000000,
+						], // Represents DKK 1 - 100,000 DKK.
+					],
+					Currency_Code::NORWEGIAN_KRONE      => [
+						Country_Code::NORWAY => [
+							'min' => 100,
+							'max' => 10000000,
+						], // Represents NOK 1 - 100,000 NOK.
+					],
+					Currency_Code::SWEDISH_KRONA        => [
+						Country_Code::SWEDEN => [
+							'min' => 100,
+							'max' => 10000000,
+						], // Represents SEK 1 - 100,000 SEK.
+					],
+				];
 			default:
-				$minimum_amount = 50;
-				break;
+				return [];
 		}
+	}
 
-		self::cache_minimum_amount( $currency, $minimum_amount );
+	/**
+	 * Check if any BNPL method is available for a given country, currency, and price.
+	 *
+	 * @param array  $enabled_methods Array of enabled BNPL methods.
+	 * @param string $country_code Country code.
+	 * @param string $currency_code Currency code.
+	 * @param float  $price Product price.
+	 * @return bool True if any BNPL method is available, false otherwise.
+	 */
+	public static function is_any_bnpl_method_available( array $enabled_methods, string $country_code, string $currency_code, float $price ): bool {
+		$price_in_cents = $price;
+
+		foreach ( $enabled_methods as $method ) {
+			$limits = self::get_bnpl_limits_per_currency( $method );
 
-		return $minimum_amount;
+			if ( isset( $limits[ $currency_code ][ $country_code ] ) ) {
+				$min_amount = $limits[ $currency_code ][ $country_code ]['min'];
+				$max_amount = $limits[ $currency_code ][ $country_code ]['max'];
+
+				if ( $price_in_cents >= $min_amount && $price_in_cents <= $max_amount ) {
+					return true;
+				}
+			}
+		}
+
+		return false;
 	}
 
 	/**
@@ -785,20 +889,12 @@ public static function cache_minimum_amount( $currency, $amount ) {
 	 * Checks if there is a minimum amount required for transactions in a given currency.
 	 *
 	 * @param string $currency The currency to check for.
-	 * @param bool   $fallback_to_local_list Whether to fallback to the local Stripe list if the cached value is not available.
 	 *
 	 * @return int|null Either the minimum amount, or `null` if not available.
 	 */
-	public static function get_cached_minimum_amount( $currency, $fallback_to_local_list = false ) {
+	public static function get_cached_minimum_amount( $currency ) {
 		$cached = get_transient( 'wcpay_minimum_amount_' . strtolower( $currency ) );
-
-		if ( (int) $cached ) {
-			return (int) $cached;
-		} elseif ( $fallback_to_local_list ) {
-			return self::get_stripe_minimum_amount( $currency );
-		}
-
-		return null;
+		return (int) $cached ? (int) $cached : null;
 	}
 
 	/**
diff --git a/includes/class-wc-payments.php b/includes/class-wc-payments.php
index 7897a3c7752..a3e61337d3f 100644
--- a/includes/class-wc-payments.php
+++ b/includes/class-wc-payments.php
@@ -639,6 +639,7 @@ function () {
 				add_action( 'woocommerce_proceed_to_checkout', [ __CLASS__, 'load_stripe_bnpl_site_messaging' ], 5 );
 				add_action( 'woocommerce_blocks_enqueue_cart_block_scripts_after', [ __CLASS__, 'load_stripe_bnpl_site_messaging' ] );
 				add_action( 'wc_ajax_wcpay_get_cart_total', [ __CLASS__, 'ajax_get_cart_total' ] );
+				add_action( 'wc_ajax_wcpay_check_bnpl_availability', [ __CLASS__, 'ajax_check_bnpl_availability' ] );
 			}
 		}
 
@@ -1761,6 +1762,26 @@ public static function ajax_get_cart_total() {
 		wp_send_json( [ 'total' => WC_Payments_Utils::prepare_amount( $cart_total, $currency_code ) ] );
 	}
 
+	/**
+	 * Check if BNPL is available for the given price, currency, and country.
+	 */
+	public static function ajax_check_bnpl_availability() {
+		check_ajax_referer( 'wcpay-is-bnpl-available', 'security' );
+
+		$price    = floatval( $_POST['price'] );
+		$currency = sanitize_text_field( wp_unslash( $_POST['currency'] ) );
+		$country  = sanitize_text_field( wp_unslash( $_POST['country'] ) );
+
+		$enabled_bnpl_payment_methods = array_intersect(
+			Payment_Method::BNPL_PAYMENT_METHODS,
+			self::get_gateway()->get_upe_enabled_payment_method_ids()
+		);
+
+		$is_available = WC_Payments_Utils::is_any_bnpl_method_available( $enabled_bnpl_payment_methods, $country, $currency, $price );
+
+		wp_send_json_success( [ 'is_available' => $is_available ] );
+	}
+
 	/**
 	 * Adds custom email field.
 	 */
diff --git a/includes/payment-methods/class-affirm-payment-method.php b/includes/payment-methods/class-affirm-payment-method.php
index f65794e555d..0d2656fd700 100644
--- a/includes/payment-methods/class-affirm-payment-method.php
+++ b/includes/payment-methods/class-affirm-payment-method.php
@@ -35,20 +35,7 @@ public function __construct( $token_service ) {
 		$this->dark_icon_url                = plugins_url( 'assets/images/payment-methods/affirm-logo-dark.svg', WCPAY_PLUGIN_FILE );
 		$this->currencies                   = [ Currency_Code::UNITED_STATES_DOLLAR, Currency_Code::CANADIAN_DOLLAR ];
 		$this->accept_only_domestic_payment = true;
-		$this->limits_per_currency          = [
-			Currency_Code::CANADIAN_DOLLAR      => [
-				Country_Code::CANADA => [
-					'min' => 5000,
-					'max' => 3000000,
-				], // Represents CAD 50 - 30,000 CAD.
-			],
-			Currency_Code::UNITED_STATES_DOLLAR => [
-				Country_Code::UNITED_STATES => [
-					'min' => 5000,
-					'max' => 3000000,
-				], // Represents USD 50 - 30,000 USD.
-			],
-		];
+		$this->limits_per_currency          = WC_Payments_Utils::get_bnpl_limits_per_currency( self::PAYMENT_METHOD_STRIPE_ID );
 		$this->countries                    = [ Country_Code::UNITED_STATES, Country_Code::CANADA ];
 	}
 
diff --git a/includes/payment-methods/class-afterpay-payment-method.php b/includes/payment-methods/class-afterpay-payment-method.php
index f4d1ef541aa..89062a4a7f9 100644
--- a/includes/payment-methods/class-afterpay-payment-method.php
+++ b/includes/payment-methods/class-afterpay-payment-method.php
@@ -34,38 +34,7 @@ public function __construct( $token_service ) {
 		$this->currencies                   = [ Currency_Code::UNITED_STATES_DOLLAR, Currency_Code::CANADIAN_DOLLAR, Currency_Code::AUSTRALIAN_DOLLAR, Currency_Code::NEW_ZEALAND_DOLLAR, Currency_Code::POUND_STERLING ];
 		$this->countries                    = [ Country_Code::UNITED_STATES, Country_Code::CANADA, Country_Code::AUSTRALIA, Country_Code::NEW_ZEALAND, Country_Code::UNITED_KINGDOM ];
 		$this->accept_only_domestic_payment = true;
-		$this->limits_per_currency          = [
-			Currency_Code::AUSTRALIAN_DOLLAR    => [
-				Country_Code::AUSTRALIA => [
-					'min' => 100,
-					'max' => 200000,
-				], // Represents AUD 1 - 2,000 AUD.
-			],
-			Currency_Code::CANADIAN_DOLLAR      => [
-				Country_Code::CANADA => [
-					'min' => 100,
-					'max' => 200000,
-				], // Represents CAD 1 - 2,000 CAD.
-			],
-			Currency_Code::NEW_ZEALAND_DOLLAR   => [
-				Country_Code::NEW_ZEALAND => [
-					'min' => 100,
-					'max' => 200000,
-				], // Represents NZD 1 - 2,000 NZD.
-			],
-			Currency_Code::POUND_STERLING       => [
-				Country_Code::UNITED_KINGDOM => [
-					'min' => 100,
-					'max' => 120000,
-				], // Represents GBP 1 - 1,200 GBP.
-			],
-			Currency_Code::UNITED_STATES_DOLLAR => [
-				Country_Code::UNITED_STATES => [
-					'min' => 100,
-					'max' => 400000,
-				], // Represents USD 1 - 4,000 USD.
-			],
-		];
+		$this->limits_per_currency          = WC_Payments_Utils::get_bnpl_limits_per_currency( self::PAYMENT_METHOD_STRIPE_ID );
 	}
 
 	/**
diff --git a/includes/payment-methods/class-klarna-payment-method.php b/includes/payment-methods/class-klarna-payment-method.php
index 44b93f56979..1e439a8d476 100644
--- a/includes/payment-methods/class-klarna-payment-method.php
+++ b/includes/payment-methods/class-klarna-payment-method.php
@@ -34,76 +34,7 @@ public function __construct( $token_service ) {
 		$this->currencies                   = [ Currency_Code::UNITED_STATES_DOLLAR, Currency_Code::POUND_STERLING, Currency_Code::EURO, Currency_Code::DANISH_KRONE, Currency_Code::NORWEGIAN_KRONE, Currency_Code::SWEDISH_KRONA ];
 		$this->accept_only_domestic_payment = true;
 		$this->countries                    = [ Country_Code::UNITED_STATES, Country_Code::UNITED_KINGDOM, Country_Code::AUSTRIA, Country_Code::GERMANY, Country_Code::NETHERLANDS, Country_Code::BELGIUM, Country_Code::SPAIN, Country_Code::ITALY, Country_Code::IRELAND, Country_Code::DENMARK, Country_Code::FINLAND, Country_Code::NORWAY, Country_Code::SWEDEN, Country_Code::FRANCE ];
-		$this->limits_per_currency          = [
-			Currency_Code::UNITED_STATES_DOLLAR => [
-				Country_Code::UNITED_STATES => [
-					'min' => 0,
-					'max' => 1000000,
-				],
-			],
-			Currency_Code::POUND_STERLING       => [
-				Country_Code::UNITED_KINGDOM => [
-					'min' => 0,
-					'max' => 1150000,
-				],
-			],
-			Currency_Code::EURO                 => [
-				Country_Code::AUSTRIA     => [
-					'min' => 1,
-					'max' => 1000000,
-				],
-				Country_Code::BELGIUM     => [
-					'min' => 1,
-					'max' => 1000000,
-				],
-				Country_Code::GERMANY     => [
-					'min' => 1,
-					'max' => 1000000,
-				],
-				Country_Code::NETHERLANDS => [
-					'min' => 1,
-					'max' => 1500000,
-				],
-				Country_Code::FINLAND     => [
-					'min' => 0,
-					'max' => 1000000,
-				],
-				Country_Code::SPAIN       => [
-					'min' => 0,
-					'max' => 1000000,
-				],
-				Country_Code::IRELAND     => [
-					'min' => 0,
-					'max' => 400000,
-				],
-				Country_Code::ITALY       => [
-					'min' => 0,
-					'max' => 1000000,
-				],
-				Country_Code::FRANCE      => [
-					'min' => 3500,
-					'max' => 400000,
-				],
-			],
-			Currency_Code::DANISH_KRONE         => [
-				Country_Code::DENMARK => [
-					'min' => 100,
-					'max' => 100000000,
-				],
-			],
-			Currency_Code::NORWEGIAN_KRONE      => [
-				Country_Code::NORWAY => [
-					'min' => 0,
-					'max' => 100000000,
-				],
-			],
-			Currency_Code::SWEDISH_KRONA        => [
-				Country_Code::SWEDEN => [
-					'min' => 0,
-					'max' => 15000000,
-				],
-			],
-		];
+		$this->limits_per_currency          = WC_Payments_Utils::get_bnpl_limits_per_currency( self::PAYMENT_METHOD_STRIPE_ID );
 	}
 
 	/**
diff --git a/tests/unit/test-class-wc-payments-utils.php b/tests/unit/test-class-wc-payments-utils.php
index a7aba06f9ab..f6f5affd667 100644
--- a/tests/unit/test-class-wc-payments-utils.php
+++ b/tests/unit/test-class-wc-payments-utils.php
@@ -931,12 +931,6 @@ public function test_get_cached_minimum_amount_returns_null_without_cache() {
 		$this->assertNull( $result );
 	}
 
-	public function test_get_cached_minimum_amount_returns_amount_fallbacking_from_stripe_list() {
-		delete_transient( 'wcpay_minimum_amount_usd' );
-		$result = WC_Payments_Utils::get_cached_minimum_amount( 'usd', true );
-		$this->assertSame( 50, $result );
-	}
-
 	public function test_get_last_refund_from_order_id_returns_correct_refund() {
 		$order    = WC_Helper_Order::create_order();
 		$refund_1 = wc_create_refund( [ 'order_id' => $order->get_id() ] );
@@ -1119,4 +1113,86 @@ public function test_is_store_api_request_with_malformed_url() {
 
 		$this->assertFalse( WC_Payments_Utils::is_store_api_request() );
 	}
+
+	public function test_is_any_bnpl_method_available() {
+		// Price within range for Afterpay/Clearpay in the US.
+		$this->assertTrue(
+			WC_Payments_Utils::is_any_bnpl_method_available(
+				[ 'afterpay_clearpay' ],
+				'US',
+				'USD',
+				100
+			)
+		);
+
+		// Price within range for Klarna in the US.
+		$this->assertTrue(
+			WC_Payments_Utils::is_any_bnpl_method_available(
+				[ 'klarna' ],
+				'US',
+				'USD',
+				500
+			)
+		);
+
+		// Price below minimum for all methods.
+		$this->assertFalse(
+			WC_Payments_Utils::is_any_bnpl_method_available(
+				[ 'afterpay_clearpay', 'klarna', 'affirm' ],
+				'US',
+				'USD',
+				0.50
+			)
+		);
+
+		// Price above maximum for all methods.
+		$this->assertFalse(
+			WC_Payments_Utils::is_any_bnpl_method_available(
+				[ 'afterpay_clearpay', 'klarna', 'affirm' ],
+				'US',
+				'USD',
+				4000000
+			)
+		);
+
+		// Unsupported country.
+		$this->assertFalse(
+			WC_Payments_Utils::is_any_bnpl_method_available(
+				[ 'afterpay_clearpay', 'klarna', 'affirm' ],
+				'RU',
+				'RUB',
+				100
+			)
+		);
+
+		// Unsupported currency.
+		$this->assertFalse(
+			WC_Payments_Utils::is_any_bnpl_method_available(
+				[ 'afterpay_clearpay', 'klarna', 'affirm' ],
+				'US',
+				'JPY',
+				100
+			)
+		);
+
+		// Empty enabled methods array.
+		$this->assertFalse(
+			WC_Payments_Utils::is_any_bnpl_method_available(
+				[],
+				'US',
+				'USD',
+				100
+			)
+		);
+
+		// Different country, same currency (Afterpay/Clearpay in Canada).
+		$this->assertTrue(
+			WC_Payments_Utils::is_any_bnpl_method_available(
+				[ 'afterpay_clearpay' ],
+				'CA',
+				'CAD',
+				100
+			)
+		);
+	}
 }

From e672cc7059c84756f029a867a89017b670ede126 Mon Sep 17 00:00:00 2001
From: Rafael Zaleski <rafaelzaleski@users.noreply.github.com>
Date: Thu, 31 Oct 2024 19:54:46 -0300
Subject: [PATCH 21/45] Fix WooPay button preview in plugin settings. (#9649)

Co-authored-by: Ricardo Metring <ricardometring@gmail.com>
---
 changelog/fix-9537-woopay-button-size-preview                | 4 ++++
 .../woopay/express-button/woopay-express-checkout-button.js  | 5 +++--
 .../payment-request-button-preview.js                        | 5 ++++-
 3 files changed, 11 insertions(+), 3 deletions(-)
 create mode 100644 changelog/fix-9537-woopay-button-size-preview

diff --git a/changelog/fix-9537-woopay-button-size-preview b/changelog/fix-9537-woopay-button-size-preview
new file mode 100644
index 00000000000..85348741475
--- /dev/null
+++ b/changelog/fix-9537-woopay-button-size-preview
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fix
+
+Fix WooPay button preview in plugin settings.
diff --git a/client/checkout/woopay/express-button/woopay-express-checkout-button.js b/client/checkout/woopay/express-button/woopay-express-checkout-button.js
index 0f9bee580b6..844ff25f010 100644
--- a/client/checkout/woopay/express-button/woopay-express-checkout-button.js
+++ b/client/checkout/woopay/express-button/woopay-express-checkout-button.js
@@ -68,10 +68,11 @@ export const WoopayExpressCheckoutButton = ( {
 	// If we are on the checkout block, we receive button attributes which overwrite the extension specific settings
 	if ( typeof buttonAttributes !== 'undefined' ) {
 		buttonHeight = buttonAttributes.height || buttonHeight;
-		borderRadius = buttonAttributes.borderRadius || borderRadius;
+		borderRadius = buttonAttributes.borderRadius ?? borderRadius;
 	}
 
-	const buttonSize = buttonSizeMap.get( buttonHeight );
+	const buttonSize =
+		buttonSizeMap.get( buttonHeight?.toString() ) || 'medium';
 
 	const buttonText =
 		ButtonTypeTextMap[ buttonType || 'default' ] ??
diff --git a/client/settings/express-checkout-settings/payment-request-button-preview.js b/client/settings/express-checkout-settings/payment-request-button-preview.js
index a587348c79d..1c2c2f2e4df 100644
--- a/client/settings/express-checkout-settings/payment-request-button-preview.js
+++ b/client/settings/express-checkout-settings/payment-request-button-preview.js
@@ -43,7 +43,10 @@ const WooPayButtonPreview = ( { size, buttonType, theme, radius } ) => (
 				buttonSizeToPxMap[ size ] || buttonSizeToPxMap.medium
 			}px`,
 			size,
-			radius,
+		} }
+		buttonAttributes={ {
+			height: buttonSizeToPxMap[ size ] || buttonSizeToPxMap.medium,
+			borderRadius: radius,
 		} }
 	/>
 );

From d100c15f711a3f4b6e36f1c887e375cf596fbb82 Mon Sep 17 00:00:00 2001
From: Vlad Olaru <vlad.olaru@automattic.com>
Date: Fri, 1 Nov 2024 12:24:32 +0200
Subject: [PATCH 22/45] Add in-memory cache to DB cache to deal with DB write
 failures (#9639)

Co-authored-by: Anurag Bhandari <anurag@automattic.com>
---
 ...to-db-cache-to-deal-with-db-write-failures |   4 +
 includes/class-database-cache.php             | 141 ++++++---
 includes/class-wc-payments-account.php        |  12 +-
 .../class-wc-payments-customer-service.php    |   6 +-
 .../class-wc-payments-incentives-service.php  |   2 +-
 ...s-wc-rest-payments-accounts-controller.php |   3 +
 ...class-wc-payments-customer-service-api.php |  15 +-
 tests/unit/test-class-database-cache.php      | 287 +++++++++++++++++-
 8 files changed, 405 insertions(+), 65 deletions(-)
 create mode 100644 changelog/update-add-in-memory-cache-to-db-cache-to-deal-with-db-write-failures

diff --git a/changelog/update-add-in-memory-cache-to-db-cache-to-deal-with-db-write-failures b/changelog/update-add-in-memory-cache-to-db-cache-to-deal-with-db-write-failures
new file mode 100644
index 00000000000..26888ab5582
--- /dev/null
+++ b/changelog/update-add-in-memory-cache-to-db-cache-to-deal-with-db-write-failures
@@ -0,0 +1,4 @@
+Significance: patch
+Type: update
+
+Add in-memory cache fallback for our database-cached objects in case of database write failures.
diff --git a/includes/class-database-cache.php b/includes/class-database-cache.php
index 042d99f7f9e..1e285be59ab 100644
--- a/includes/class-database-cache.php
+++ b/includes/class-database-cache.php
@@ -83,6 +83,16 @@ class Database_Cache implements MultiCurrencyCacheInterface {
 	 */
 	private $refresh_disabled;
 
+	/**
+	 * In-memory cache for the duration of a single request.
+	 *
+	 * This is used to avoid multiple database reads for the same data and as a backstop in case the database write fails,
+	 * thus ensuring the cache generator is not called multiple times (which would mean multiple API calls to our platform).
+	 *
+	 * @var array
+	 */
+	private $in_memory_cache = [];
+
 	/**
 	 * Class constructor.
 	 */
@@ -108,10 +118,10 @@ public function init_hooks() {
 	 * @param boolean  $force_refresh Regenerates the cache regardless of its state if true.
 	 * @param boolean  $refreshed     Is set to true if the cache has been refreshed without errors and with a non-empty value.
 	 *
-	 * @return mixed|null The cache contents. NULL on failure
+	 * @return mixed|null The cached value. NULL on failure to regenerate or validate the data.
 	 */
 	public function get_or_add( string $key, callable $generator, callable $validate_data, bool $force_refresh = false, bool &$refreshed = false ) {
-		$cache_contents = get_option( $key );
+		$cache_contents = $this->get_from_cache( $key );
 		$data           = null;
 		$old_data       = null;
 
@@ -123,11 +133,9 @@ public function get_or_add( string $key, callable $generator, callable $validate
 		}
 
 		if ( $this->should_refresh_cache( $key, $cache_contents, $validate_data, $force_refresh ) ) {
-			$errored = false;
-
 			try {
 				$data    = $generator();
-				$errored = false === $data || null === $data;
+				$errored = ( false === $data || null === $data );
 			} catch ( \Throwable $e ) {
 				$errored = true;
 			}
@@ -139,7 +147,7 @@ public function get_or_add( string $key, callable $generator, callable $validate
 				$data = $old_data;
 			}
 
-			$cache_contents = $this->write_to_cache( $key, $data, $errored );
+			$this->write_to_cache( $key, $data, $errored );
 		}
 
 		return $data;
@@ -151,10 +159,10 @@ public function get_or_add( string $key, callable $generator, callable $validate
 	 * @param string $key The key to look for.
 	 * @param bool   $force If set, return from the cache without checking for expiry.
 	 *
-	 * @return mixed The cache contents.
+	 * @return mixed|null The cache contents. NULL if the cache is expired or missing.
 	 */
 	public function get( string $key, bool $force = false ) {
-		$cache_contents = get_option( $key );
+		$cache_contents = $this->get_from_cache( $key );
 		if ( is_array( $cache_contents ) && array_key_exists( 'data', $cache_contents ) ) {
 			if ( ! $force && $this->is_expired( $key, $cache_contents ) ) {
 				return null;
@@ -162,6 +170,7 @@ public function get( string $key, bool $force = false ) {
 
 			return $cache_contents['data'];
 		}
+
 		return null;
 	}
 
@@ -185,48 +194,53 @@ public function add( string $key, $data ) {
 	 * @return void
 	 */
 	public function delete( string $key ) {
-		delete_option( $key );
+		// Remove from the in-memory cache.
+		unset( $this->in_memory_cache[ $key ] );
 
-		// Clear WP Cache to ensure the new data is fetched by other processes.
-		wp_cache_delete( $key, 'options' );
+		// Remove from the DB cache.
+		if ( delete_option( $key ) ) {
+			// Clear the WP object cache to ensure the new data is fetched by other processes.
+			wp_cache_delete( $key, 'options' );
+		}
 	}
 
 	/**
-	 * Hook function allowing the cache refresh to be selectively disabled in certain situations
-	 * (such as while running an Action Scheduler job). While the refresh is disabled, get_or_add
-	 * will only return the cached value and never regenerate it, even if it's expired.
+	 * Deletes all cache entries that are keyed with a certain prefix.
 	 *
-	 * @return void
-	 */
-	public function disable_refresh() {
-		$this->refresh_disabled = true;
-	}
-
-	/**
-	 * Deletes all saved by looking for cache key prefix. This is useful when you want to cache user related data by
+	 * This is useful when you use dynamic cache keys.
+	 *
+	 * Note: Only key prefixes with known, static prefixes are allowed, for protection purposes.
 	 *
-	 * @param string $key Cache key prefix to delete.
+	 * @param string $key_prefix The cache key prefix.
 	 *
 	 * @return void
 	 */
-	public function delete_by_prefix( string $key ) {
-
-		// Protection against accidentally deleting all options or options that are not related to WcPay caching.
-		// Since only one cache key prefix is supported, we will check only this one by checking does key starts with payment method key prefix.
-		// Feel free to update this statement if more prefix cache keys you are planning to add.
-
-		if ( strncmp( $key, self::PAYMENT_METHODS_KEY_PREFIX, strlen( self::PAYMENT_METHODS_KEY_PREFIX ) ) !== 0 ) {
+	public function delete_by_prefix( string $key_prefix ) {
+		// Protection against accidentally deleting all options or options that are not related to WCPay caching.
+		// Feel free to update this statement as more prefix cache keys are used.
+		if ( strncmp( $key_prefix, self::PAYMENT_METHODS_KEY_PREFIX, strlen( self::PAYMENT_METHODS_KEY_PREFIX ) ) !== 0 ) {
 			return; // Maybe throw exception here...
 		}
-		global $wpdb;
 
-		$plugin_options = $wpdb->get_results( $wpdb->prepare( "SELECT option_name FROM $wpdb->options WHERE option_name LIKE %s", $key . '%' ) );
+		global $wpdb;
 
-		foreach ( $plugin_options as $option ) {
+		$options = $wpdb->get_results( $wpdb->prepare( "SELECT option_name FROM $wpdb->options WHERE option_name LIKE %s", $key_prefix . '%' ) );
+		foreach ( $options as $option ) {
 			$this->delete( $option->option_name );
 		}
 	}
 
+	/**
+	 * Hook function allowing the cache refresh to be selectively disabled in certain situations
+	 * (such as while running an Action Scheduler job). While the refresh is disabled, get_or_add
+	 * will only return the cached value and never regenerate it, even if it's expired.
+	 *
+	 * @return void
+	 */
+	public function disable_refresh() {
+		$this->refresh_disabled = true;
+	}
+
 	/**
 	 * Validates the cache contents and, given the passed params and the current application state, determines whether the cache should be refreshed.
 	 * See get_or_add.
@@ -252,7 +266,7 @@ private function should_refresh_cache( string $key, $cache_contents, callable $v
 			return false;
 		}
 
-		// The value of false means that there was never an option set in the database.
+		// The value of false means that there was never something cached.
 		if ( false === $cache_contents ) {
 			return true;
 		}
@@ -268,11 +282,8 @@ private function should_refresh_cache( string $key, $cache_contents, callable $v
 			return true;
 		}
 
-		// If the data is not errored and invalid, refresh it.
-		if (
-			! $cache_contents['errored'] &&
-			! $validate_data( $cache_contents['data'] )
-		) {
+		// If the data is not errored but invalid, we should refresh it.
+		if ( ! $cache_contents['errored'] && ! $validate_data( $cache_contents['data'] ) ) {
 			return true;
 		}
 
@@ -284,6 +295,29 @@ private function should_refresh_cache( string $key, $cache_contents, callable $v
 		return false;
 	}
 
+	/**
+	 * Get the cache contents for a certain key.
+	 *
+	 * @param string $key The cache key.
+	 *
+	 * @return array|false The cache contents (array with `data`, `fetched`, and `errored` entries).
+	 *                     False if there is no cached data.
+	 */
+	private function get_from_cache( string $key ) {
+		// Check the in-memory cache first.
+		if ( isset( $this->in_memory_cache[ $key ] ) ) {
+			return $this->in_memory_cache[ $key ];
+		}
+
+		// Read from the DB cache.
+		$data = get_option( $key );
+
+		// Store the data in the in-memory cache, including the case when there is no data cached (`false`).
+		$this->in_memory_cache[ $key ] = $data;
+
+		return $data;
+	}
+
 	/**
 	 * Wraps the data in the cache metadata and stores it.
 	 *
@@ -291,22 +325,30 @@ private function should_refresh_cache( string $key, $cache_contents, callable $v
 	 * @param mixed   $data    The data to store.
 	 * @param boolean $errored Whether the refresh operation resulted in an error before this has been called.
 	 *
-	 * @return array The cache contents (data and metadata).
+	 * @return void
 	 */
-	private function write_to_cache( string $key, $data, bool $errored ): array {
+	private function write_to_cache( string $key, $data, bool $errored ) {
 		// Add the  data and expiry time to the array we're caching.
 		$cache_contents            = [];
 		$cache_contents['data']    = $data;
 		$cache_contents['fetched'] = time();
 		$cache_contents['errored'] = $errored;
 
-		// Create or update the option cache.
-		update_option( $key, $cache_contents, 'no' );
-
-		// Clear WP Cache to ensure the new data is fetched by other processes.
-		wp_cache_delete( $key, 'options' );
-
-		return $cache_contents;
+		// Write the in-memory cache.
+		$this->in_memory_cache[ $key ] = $cache_contents;
+
+		// Create or update the DB option cache.
+		// Note: Since we are adding the current time to the option value, WP will ALWAYS write the option because
+		// the cache contents value is different from the current one, even if the data is the same.
+		// A `false` result ONLY means that the DB write failed.
+		// Yes, there is the possibility that we attempt to write the same data multiple times within the SAME second,
+		// and we will mistakenly think that the DB write failed. We are OK with this false positive,
+		// since the actual data is the same.
+		$result = update_option( $key, $cache_contents, 'no' );
+		if ( false !== $result ) {
+			// If the DB cache write succeeded, clear the WP object cache to ensure the new data is fetched by other processes.
+			wp_cache_delete( $key, 'options' );
+		}
 	}
 
 	/**
@@ -315,12 +357,13 @@ private function write_to_cache( string $key, $data, bool $errored ): array {
 	 * @param string $key            The cache key.
 	 * @param array  $cache_contents The cache contents.
 	 *
-	 * @return boolean True if the contents are expired.
+	 * @return boolean True if the contents are expired. False otherwise.
 	 */
 	private function is_expired( string $key, array $cache_contents ): bool {
 		$ttl     = $this->get_ttl( $key, $cache_contents );
 		$expires = $cache_contents['fetched'] + $ttl;
 		$now     = time();
+
 		return $expires < $now;
 	}
 
diff --git a/includes/class-wc-payments-account.php b/includes/class-wc-payments-account.php
index 93fab3929d7..d2a01ec48ff 100644
--- a/includes/class-wc-payments-account.php
+++ b/includes/class-wc-payments-account.php
@@ -130,7 +130,7 @@ public function init_hooks() {
 	}
 
 	/**
-	 * Wipes the account data option, forcing to re-fetch the account status from WP.com.
+	 * Wipes the account data option, forcing to re-fetch the account data from WP.com.
 	 */
 	public function clear_cache() {
 		$this->database_cache->delete( Database_Cache::ACCOUNT_KEY );
@@ -201,7 +201,7 @@ public function has_working_jetpack_connection(): bool {
 	 * @return boolean Whether there is account data.
 	 */
 	public function has_account_data(): bool {
-		$account_data = $this->database_cache->get( Database_Cache::ACCOUNT_KEY );
+		$account_data = $this->database_cache->get( Database_Cache::ACCOUNT_KEY, true );
 		if ( ! empty( $account_data['account_id'] ) ) {
 			return true;
 		}
@@ -304,7 +304,7 @@ public function is_account_under_review(): bool {
 		}
 
 		$account = $this->get_cached_account_data();
-		return 'under_review' === $account['status'];
+		return 'under_review' === ( $account['status'] ?? false );
 	}
 
 	/**
@@ -2140,6 +2140,10 @@ function () {
 	 */
 	public function update_account_data( $property, $data ) {
 		$account_data = $this->database_cache->get( Database_Cache::ACCOUNT_KEY );
+		if ( ! is_array( $account_data ) ) {
+			// Bail if we don't have any cached account data.
+			return;
+		}
 
 		$account_data[ $property ] = is_array( $data ) ? array_merge( $account_data[ $property ] ?? [], $data ) : $data;
 
@@ -2149,7 +2153,7 @@ public function update_account_data( $property, $data ) {
 	/**
 	 * Refetches account data and returns the fresh data.
 	 *
-	 * @return array|bool|string Either the new account data or false if unavailable.
+	 * @return array|bool Either the new account data or false if unavailable.
 	 */
 	public function refresh_account_data() {
 		return $this->get_cached_account_data( true );
diff --git a/includes/class-wc-payments-customer-service.php b/includes/class-wc-payments-customer-service.php
index 7903c95b8f3..e55d0b206c1 100644
--- a/includes/class-wc-payments-customer-service.php
+++ b/includes/class-wc-payments-customer-service.php
@@ -275,8 +275,8 @@ public function get_payment_methods_for_customer( $customer_id, $type = 'card' )
 			return $payment_methods;
 
 		} catch ( API_Exception $e ) {
-			// If we failed to find the we can simply return empty payment methods as this customer will
-			// be recreated when the user succesfuly adds a payment method.
+			// If we failed to find the payment methods, we can simply return empty payment methods as this customer
+			// will be recreated when the user successfully adds a payment method.
 			if ( $e->get_error_code() === 'resource_missing' ) {
 				return [];
 			}
@@ -383,7 +383,7 @@ public static function map_customer_data( WC_Order $wc_order = null, WC_Customer
 	}
 
 	/**
-	 * Delete all saved payment methods that are stored inside database cache driver.
+	 * Delete all saved payment methods that are stored inside the database cache driver.
 	 *
 	 * @return void
 	 */
diff --git a/includes/class-wc-payments-incentives-service.php b/includes/class-wc-payments-incentives-service.php
index cda3c9a6312..55a61e96ff7 100644
--- a/includes/class-wc-payments-incentives-service.php
+++ b/includes/class-wc-payments-incentives-service.php
@@ -150,7 +150,7 @@ public function get_cached_connect_incentive( bool $force_refresh = false ): ?ar
 		$store_context_hash = $this->generate_context_hash( $this->get_store_context() );
 
 		// First, get the cache contents, if any.
-		$incentive_data = $this->database_cache->get( Database_Cache::CONNECT_INCENTIVE_KEY );
+		$incentive_data = $this->database_cache->get( Database_Cache::CONNECT_INCENTIVE_KEY, true );
 		// Check if we need to force-refresh the cache contents.
 		if ( empty( $incentive_data['context_hash'] ) || ! is_string( $incentive_data['context_hash'] )
 			|| ! hash_equals( $store_context_hash, $incentive_data['context_hash'] ) ) {
diff --git a/tests/unit/admin/test-class-wc-rest-payments-accounts-controller.php b/tests/unit/admin/test-class-wc-rest-payments-accounts-controller.php
index 42560d5da90..383b6a9c50d 100644
--- a/tests/unit/admin/test-class-wc-rest-payments-accounts-controller.php
+++ b/tests/unit/admin/test-class-wc-rest-payments-accounts-controller.php
@@ -48,6 +48,9 @@ public function set_up() {
 		$property_reflection->setAccessible( true );
 		$this->original_api_client = $property_reflection->getValue( $account_service );
 		$property_reflection->setValue( $account_service, $this->mock_api_client );
+
+		// Clear the account cache before each test.
+		$account_service->clear_cache();
 	}
 
 	public function tear_down() {
diff --git a/tests/unit/core/service/test-class-wc-payments-customer-service-api.php b/tests/unit/core/service/test-class-wc-payments-customer-service-api.php
index e4d64b5b02e..3e7e515187e 100644
--- a/tests/unit/core/service/test-class-wc-payments-customer-service-api.php
+++ b/tests/unit/core/service/test-class-wc-payments-customer-service-api.php
@@ -41,7 +41,7 @@ class WC_Payments_Customer_Service_API_Test extends WCPAY_UnitTestCase {
 	/**
 	 * Filter callback to return the mock http client
 	 *
-	 * @return void
+	 * @return WC_Payments_Http|MockObject
 	 */
 	public function replace_http_client() {
 		return $this->mock_http_client;
@@ -79,6 +79,9 @@ public function tear_down() {
 			[ $this, 'replace_http_client' ]
 		);
 
+		// Clear the cache after each test.
+		$this->customer_service->delete_cached_payment_methods();
+
 		parent::tear_down();
 	}
 
@@ -316,7 +319,7 @@ function ( $data ): bool {
 
 		$response = $this->customer_service_api->get_payment_methods_for_customer( 'cus_12345' );
 
-		// When the payment methods are unable to update, a empty array is sent back.
+		// When the payment methods are unable to update, an empty array is sent back.
 		$this->assertEquals( [], $response );
 	}
 
@@ -447,19 +450,19 @@ function ( $data ): bool {
 		$response = $this->customer_service_api->get_payment_methods_for_customer( 'cus_123' );
 		$this->assertEquals( $mock_payment_methods, $response );
 
-		// check if can retrieve from cache.
+		// check if we can retrieve from cache.
 		$db_cache       = WC_Payments::get_database_cache();
 		$cache_response = $db_cache->get( Database_Cache::PAYMENT_METHODS_KEY_PREFIX . 'cus_123_card' );
 		$this->assertEquals( $mock_payment_methods, $cache_response );
 
 		// set up the user for customer.
-		update_user_option( 1, self::CUSTOMER_LIVE_META_KEY, 'cus_test123' );
+		update_user_option( 1, self::CUSTOMER_LIVE_META_KEY, 'cus_123' );
 
 		// run the method.
-		$this->customer_service_api->clear_cached_payment_methods_for_user( 'cus_123' );
+		$this->customer_service_api->clear_cached_payment_methods_for_user( 1 );
 
 		// check that cache is empty.
-		$cache_response = $db_cache->get( Database_Cache::PAYMENT_METHODS_KEY_PREFIX . 'cus_12345_card' );
+		$cache_response = $db_cache->get( Database_Cache::PAYMENT_METHODS_KEY_PREFIX . 'cus_123_card' );
 		$this->assertEquals( null, $cache_response );
 	}
 
diff --git a/tests/unit/test-class-database-cache.php b/tests/unit/test-class-database-cache.php
index e8f5e8822ab..4b23eece139 100644
--- a/tests/unit/test-class-database-cache.php
+++ b/tests/unit/test-class-database-cache.php
@@ -163,7 +163,6 @@ function () use ( &$called_generator ) {
 	public function test_get_or_add_handles_error_when_there_was_no_old_data() {
 		$refreshed        = false;
 		$called_generator = false;
-		$value            = [ 'mock' => true ];
 
 		$res = $this->database_cache->get_or_add(
 			self::MOCK_KEY,
@@ -220,7 +219,7 @@ public function test_get_or_add_does_not_refresh_errored_out_invalid_value() {
 
 		$res = $this->database_cache->get_or_add(
 			self::MOCK_KEY,
-			function () use ( $value ) {
+			function () use ( $value, &$called_generator ) {
 				$called_generator = true;
 				return $value;
 			},
@@ -235,6 +234,290 @@ function () use ( $value ) {
 		$this->assert_cache_contains( $old, true );
 	}
 
+	public function test_get_or_add_does_not_refresh_on_subsequent_db_write_errors() {
+		$old           = [ 'old' => true ];
+		$value         = [ 'mock' => true ];
+		$another_value = [ 'another_mock' => true ];
+
+		// Write an expired cache value.
+		$this->write_mock_cache( $old, time() - YEAR_IN_SECONDS );
+
+		// All DB write queries will fail.
+		add_filter(
+			'query',
+			function ( $query ) {
+				if ( str_starts_with( $query, 'UPDATE' ) || str_starts_with( $query, 'INSERT INTO' ) ) {
+					return false;
+				}
+
+				return $query;
+			}
+		);
+
+		// First call will call the generator, fail to write to the DB, and cache the value in the in-memory cache.
+		$called_generator = false;
+		$refreshed        = false;
+		$res              = $this->database_cache->get_or_add(
+			self::MOCK_KEY,
+			function () use ( $value, &$called_generator ) {
+				$called_generator = true;
+
+				return $value;
+			},
+			'__return_true',
+			false,
+			$refreshed
+		);
+
+		$this->assertEquals( $value, $res );
+		$this->assertTrue( $refreshed );
+		$this->assertTrue( $called_generator );
+		$this->assert_cache_contains( $old );
+
+		// The second call will NOT call the generator, but the value will be returned from the in-memory cache.
+		$called_generator = false;
+		$refreshed        = false;
+		$res              = $this->database_cache->get_or_add(
+			self::MOCK_KEY,
+			function () use ( &$called_generator ) {
+				$called_generator = true;
+
+				return [];
+			},
+			'__return_true',
+			false,
+			$refreshed
+		);
+
+		$this->assertEquals( $value, $res );
+		$this->assertFalse( $refreshed );
+		$this->assertFalse( $called_generator );
+		$this->assert_cache_contains( $old );
+
+		remove_all_filters( 'query' );
+
+		// The third call will NOT call the generator, NOT write to the DB, but the value will be returned from the in-memory cache.
+		$called_generator = false;
+		$refreshed        = false;
+		$res              = $this->database_cache->get_or_add(
+			self::MOCK_KEY,
+			function () use ( &$called_generator ) {
+				$called_generator = true;
+
+				return [];
+			},
+			'__return_true',
+			false,
+			$refreshed
+		);
+
+		$this->assertEquals( $value, $res );
+		$this->assertFalse( $refreshed );
+		$this->assertFalse( $called_generator );
+		$this->assert_cache_contains( $old );
+
+		// Fourth call will call the generator, write to the DB, and cache the value in the in-memory cache,
+		// but only because we are forcing it to refresh.
+		$called_generator = false;
+		$refreshed        = false;
+		$res              = $this->database_cache->get_or_add(
+			self::MOCK_KEY,
+			function () use ( $another_value, &$called_generator ) {
+				$called_generator = true;
+
+				return $another_value;
+			},
+			'__return_true',
+			true, // It will refresh only because we are forcing it.
+			$refreshed
+		);
+
+		$this->assertEquals( $another_value, $res );
+		$this->assertTrue( $refreshed );
+		$this->assertTrue( $called_generator );
+		$this->assert_cache_contains( $another_value );
+	}
+
+	public function test_get_or_add_with_no_cached_data_fetches_but_does_not_refresh_on_subsequent_db_write_errors() {
+		$value         = [ 'mock' => true ];
+		$another_value = [ 'another_mock' => true ];
+
+		// All DB write queries will fail.
+		add_filter(
+			'query',
+			function ( $query ) {
+				if ( str_starts_with( $query, 'UPDATE' ) || str_starts_with( $query, 'INSERT INTO' ) ) {
+					return false;
+				}
+
+				return $query;
+			}
+		);
+
+		// First call will call the generator, fail to write to the DB, and cache the value in the in-memory cache.
+		$called_generator = false;
+		$refreshed        = false;
+		$res              = $this->database_cache->get_or_add(
+			self::MOCK_KEY,
+			function () use ( $value, &$called_generator ) {
+				$called_generator = true;
+
+				return $value;
+			},
+			'__return_true',
+			false,
+			$refreshed
+		);
+
+		$this->assertEquals( $value, $res );
+		$this->assertTrue( $refreshed );
+		$this->assertTrue( $called_generator );
+
+		// The second call will NOT call the generator, but the value will be returned from the in-memory cache.
+		$called_generator = false;
+		$refreshed        = false;
+		$res              = $this->database_cache->get_or_add(
+			self::MOCK_KEY,
+			function () use ( &$called_generator ) {
+				$called_generator = true;
+
+				return [];
+			},
+			'__return_true',
+			false,
+			$refreshed
+		);
+
+		$this->assertEquals( $value, $res );
+		$this->assertFalse( $refreshed );
+		$this->assertFalse( $called_generator );
+
+		remove_all_filters( 'query' );
+
+		// Third call will call the generator, write to the DB, and cache the value in the in-memory cache.
+		$called_generator = false;
+		$refreshed        = false;
+		$res              = $this->database_cache->get_or_add(
+			self::MOCK_KEY,
+			function () use ( $another_value, &$called_generator ) {
+				$called_generator = true;
+
+				return $another_value;
+			},
+			'__return_true',
+			true, // It will refresh only because we are forcing it.
+			$refreshed
+		);
+
+		$this->assertEquals( $another_value, $res );
+		$this->assertTrue( $refreshed );
+		$this->assertTrue( $called_generator );
+		$this->assert_cache_contains( $another_value );
+	}
+
+	public function test_get_or_add_refreshes_on_cache_cleared_despite_previous_db_write_errors() {
+		$old           = [ 'old' => true ];
+		$value         = [ 'mock' => true ];
+		$another_value = [ 'another_mock' => true ];
+
+		// Write an expired cache value.
+		$this->write_mock_cache( $old, time() - YEAR_IN_SECONDS );
+
+		// All DB write queries will fail.
+		add_filter(
+			'query',
+			function ( $query ) {
+				if ( str_starts_with( $query, 'UPDATE' ) || str_starts_with( $query, 'INSERT INTO' ) ) {
+					return false;
+				}
+
+				return $query;
+			}
+		);
+
+		// First call will call the generator, fail to write to the DB, and cache the value in the in-memory cache.
+		$called_generator = false;
+		$refreshed        = false;
+		$res              = $this->database_cache->get_or_add(
+			self::MOCK_KEY,
+			function () use ( $value, &$called_generator ) {
+				$called_generator = true;
+
+				return $value;
+			},
+			'__return_true',
+			false,
+			$refreshed
+		);
+
+		$this->assertEquals( $value, $res );
+		$this->assertTrue( $refreshed );
+		$this->assertTrue( $called_generator );
+		$this->assert_cache_contains( $old );
+
+		// The second call will NOT call the generator, but the value will be returned from the in-memory cache.
+		$called_generator = false;
+		$refreshed        = false;
+		$res              = $this->database_cache->get_or_add(
+			self::MOCK_KEY,
+			function () use ( &$called_generator ) {
+				$called_generator = true;
+
+				return [];
+			},
+			'__return_true',
+			false,
+			$refreshed
+		);
+
+		$this->assertEquals( $value, $res );
+		$this->assertFalse( $refreshed );
+		$this->assertFalse( $called_generator );
+
+		// Clear the cache.
+		$this->database_cache->delete( self::MOCK_KEY );
+
+		// Third call will call the generator, fail to write to the DB, and cache the value in the in-memory cache.
+		$called_generator = false;
+		$refreshed        = false;
+		$res              = $this->database_cache->get_or_add(
+			self::MOCK_KEY,
+			function () use ( $another_value, &$called_generator ) {
+				$called_generator = true;
+
+				return $another_value;
+			},
+			'__return_true',
+			false,
+			$refreshed
+		);
+
+		$this->assertEquals( $another_value, $res );
+		$this->assertTrue( $refreshed );
+		$this->assertTrue( $called_generator );
+
+		// Fourth call will NOT call the generator, but the value will be returned from the in-memory cache.
+		$called_generator = false;
+		$refreshed        = false;
+		$res              = $this->database_cache->get_or_add(
+			self::MOCK_KEY,
+			function () use ( &$called_generator ) {
+				$called_generator = true;
+
+				return [];
+			},
+			'__return_true',
+			false,
+			$refreshed
+		);
+
+		$this->assertEquals( $another_value, $res );
+		$this->assertFalse( $refreshed );
+		$this->assertFalse( $called_generator );
+
+		remove_all_filters( 'query' );
+	}
+
 	public function test_get_or_add_does_not_refresh_if_disabled() {
 		$refreshed = false;
 		$value     = [ 'mock' => true ];

From dba2fc5640d3457f6135c10867bf533304351289 Mon Sep 17 00:00:00 2001
From: Mike Moore <michael.moore@automattic.com>
Date: Fri, 1 Nov 2024 09:41:01 -0400
Subject: [PATCH 23/45] Remove Test Mode subheader from CC test instructions
 (#9656)

---
 changelog/fix-9654-remove-test-mode-subheader        | 5 +++++
 includes/payment-methods/class-cc-payment-method.php | 2 +-
 tests/unit/test-class-wc-payments-checkout.php       | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)
 create mode 100644 changelog/fix-9654-remove-test-mode-subheader

diff --git a/changelog/fix-9654-remove-test-mode-subheader b/changelog/fix-9654-remove-test-mode-subheader
new file mode 100644
index 00000000000..adf27b737ea
--- /dev/null
+++ b/changelog/fix-9654-remove-test-mode-subheader
@@ -0,0 +1,5 @@
+Significance: patch
+Type: fix
+Comment: Small text change.
+
+
diff --git a/includes/payment-methods/class-cc-payment-method.php b/includes/payment-methods/class-cc-payment-method.php
index 4ec498aa182..df14d4ecd8c 100644
--- a/includes/payment-methods/class-cc-payment-method.php
+++ b/includes/payment-methods/class-cc-payment-method.php
@@ -70,6 +70,6 @@ public function get_title( string $account_country = null, $payment_details = fa
 	 * @return string
 	 */
 	public function get_testing_instructions() {
-		return __( '<strong>Test mode:</strong> use test card <number>4242 4242 4242 4242</number> or refer to our <a>testing guide</a>.', 'woocommerce-payments' );
+		return __( 'Use test card <number>4242 4242 4242 4242</number> or refer to our <a>testing guide</a>.', 'woocommerce-payments' );
 	}
 }
diff --git a/tests/unit/test-class-wc-payments-checkout.php b/tests/unit/test-class-wc-payments-checkout.php
index 1c471baa5fd..2394328c430 100644
--- a/tests/unit/test-class-wc-payments-checkout.php
+++ b/tests/unit/test-class-wc-payments-checkout.php
@@ -382,7 +382,7 @@ public function test_link_payment_method_provided_when_card_enabled() {
 					'darkIcon'               => $dark_icon_url,
 					'showSaveOption'         => true,
 					'countries'              => [],
-					'testingInstructions'    => '<strong>Test mode:</strong> use test card <button type="button" class="js-woopayments-copy-test-number" aria-label="Click to copy the test number to clipboard" title="Copy to clipboard"><i></i><span>4242 4242 4242 4242</button> or refer to our <a href="https://woocommerce.com/document/woopayments/testing-and-troubleshooting/testing/#test-cards" target="_blank">testing guide</a>.',
+					'testingInstructions'    => 'Use test card <button type="button" class="js-woopayments-copy-test-number" aria-label="Click to copy the test number to clipboard" title="Copy to clipboard"><i></i><span>4242 4242 4242 4242</button> or refer to our <a href="https://woocommerce.com/document/woopayments/testing-and-troubleshooting/testing/#test-cards" target="_blank">testing guide</a>.',
 					'forceNetworkSavedCards' => false,
 				],
 				'link' => [

From 19f1f26d6774c88d9de8bf30eeccf6b9cdbc5ce1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9sar=20Costa?=
 <10233985+cesarcosta99@users.noreply.github.com>
Date: Fri, 1 Nov 2024 10:53:43 -0300
Subject: [PATCH 24/45] Implement actual ECE buttons in Block editor (#9650)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Kristófer Reykjalín <13835680+reykjalin@users.noreply.github.com>
---
 changelog/update-9417-ece-in-block-editor     |  4 +++
 .../blocks/components/apple-pay-preview.js    |  7 ------
 .../components/express-checkout-component.js  |  5 ++--
 .../components/express-checkout-container.js  |  6 ++---
 .../blocks/components/google-pay-preview.js   |  7 ------
 client/express-checkout/blocks/index.js       | 20 ++++++++++++---
 client/express-checkout/utils/index.ts        |  8 +++++-
 client/globals.d.ts                           | 17 +++++++++++++
 ...yments-express-checkout-button-handler.php | 25 +++++++++++++++++++
 9 files changed, 75 insertions(+), 24 deletions(-)
 create mode 100644 changelog/update-9417-ece-in-block-editor
 delete mode 100644 client/express-checkout/blocks/components/apple-pay-preview.js
 delete mode 100644 client/express-checkout/blocks/components/google-pay-preview.js

diff --git a/changelog/update-9417-ece-in-block-editor b/changelog/update-9417-ece-in-block-editor
new file mode 100644
index 00000000000..95543271c69
--- /dev/null
+++ b/changelog/update-9417-ece-in-block-editor
@@ -0,0 +1,4 @@
+Significance: patch
+Type: update
+
+Use preview versions of the actual ECE buttons in the Block editor.
diff --git a/client/express-checkout/blocks/components/apple-pay-preview.js b/client/express-checkout/blocks/components/apple-pay-preview.js
deleted file mode 100644
index 247d5e2e6fe..00000000000
--- a/client/express-checkout/blocks/components/apple-pay-preview.js
+++ /dev/null
@@ -1,7 +0,0 @@
-/* eslint-disable max-len */
-const applePayImage =
-	"data:image/svg+xml,%3Csvg fill='none' xmlns='http://www.w3.org/2000/svg' viewBox='-0.5 -0.5 344 51'%3E%3Crect width='343' height='50' rx='8' fill='black'%3E%3C/rect%3E%3Crect width='343' height='50' rx='8' stroke='black'%3E%3C/rect%3E%3Cpath d='M155.748 19.8275C154.411 19.8275 153.333 20.636 152.637 20.636C151.907 20.636 150.93 19.8724 149.773 19.8724C147.572 19.8724 145.337 21.7029 145.337 25.1282C145.337 27.2733 146.168 29.5306 147.19 31.0018C148.055 32.2259 148.83 33.2366 149.93 33.2366C151.02 33.2366 151.503 32.5179 152.862 32.5179C154.232 32.5179 154.546 33.2142 155.748 33.2142C156.95 33.2142 157.747 32.1248 158.499 31.0467C159.33 29.8001 159.69 28.5872 159.701 28.5311C159.634 28.5086 157.343 27.5765 157.343 24.9485C157.343 22.68 159.139 21.6693 159.241 21.5906C158.061 19.8724 156.253 19.8275 155.748 19.8275ZM155.13 18.3787C155.669 17.7161 156.051 16.8177 156.051 15.908C156.051 15.7845 156.04 15.6609 156.017 15.5599C155.141 15.5936 154.063 16.1439 153.423 16.8963C152.929 17.4691 152.457 18.3787 152.457 19.2884C152.457 19.4232 152.48 19.5692 152.491 19.6141C152.547 19.6253 152.637 19.6365 152.727 19.6365C153.524 19.6365 154.535 19.0975 155.13 18.3787ZM164.115 16.8289V33.0345H167.013V27.7225H170.528C173.807 27.7225 176.098 25.5213 176.098 22.3094C176.098 19.0413 173.886 16.8289 170.652 16.8289H164.115ZM167.013 19.2547H169.888C171.977 19.2547 173.156 20.3216 173.156 22.3094C173.156 24.241 171.943 25.3192 169.877 25.3192H167.013V19.2547ZM181.535 31.0467C180.3 31.0467 179.412 30.429 179.412 29.3958C179.412 28.3963 180.142 27.8348 181.703 27.7337L184.477 27.554V28.5311C184.477 29.9573 183.219 31.0467 181.535 31.0467ZM180.715 33.2366C182.321 33.2366 183.669 32.5403 184.354 31.3499H184.545V33.0345H187.229V24.6453C187.229 22.0399 185.454 20.5013 182.299 20.5013C179.379 20.5013 177.346 21.8826 177.121 24.0501H179.749C180.008 23.2191 180.884 22.7698 182.164 22.7698C183.669 22.7698 184.477 23.4437 184.477 24.6453V25.6785L181.31 25.8694C178.323 26.0491 176.65 27.3294 176.65 29.553C176.65 31.7991 178.345 33.2366 180.715 33.2366ZM190.329 37.493C193.081 37.493 194.395 36.4822 195.439 33.4276L199.875 20.7484H196.933L194.069 30.3392H193.878L191.003 20.7484H187.948L192.34 33.0906L192.194 33.6297C191.834 34.764 191.172 35.2132 189.992 35.2132C189.801 35.2132 189.386 35.202 189.229 35.1683V37.4481C189.408 37.4818 190.161 37.493 190.329 37.493Z' fill='white'%3E%3C/path%3E%3C/svg%3E";
-
-const ApplePayPreview = () => <img src={ applePayImage } alt="" />;
-
-export default ApplePayPreview;
diff --git a/client/express-checkout/blocks/components/express-checkout-component.js b/client/express-checkout/blocks/components/express-checkout-component.js
index 6274a08d452..2ad91ee5881 100644
--- a/client/express-checkout/blocks/components/express-checkout-component.js
+++ b/client/express-checkout/blocks/components/express-checkout-component.js
@@ -76,6 +76,7 @@ const ExpressCheckoutComponent = ( {
 	onClose,
 	expressPaymentMethod = '',
 	buttonAttributes,
+	isPreview = false,
 } ) => {
 	const {
 		buttonOptions,
@@ -92,7 +93,7 @@ const ExpressCheckoutComponent = ( {
 		onClose,
 		setExpressPaymentError,
 	} );
-
+	const onClickHandler = ! isPreview ? onButtonClick : () => {};
 	const onShippingAddressChange = ( event ) =>
 		shippingAddressChangeHandler( api, event, elements );
 
@@ -140,7 +141,7 @@ const ExpressCheckoutComponent = ( {
 				),
 				...getPaymentMethodsOverride( expressPaymentMethod ),
 			} }
-			onClick={ onButtonClick }
+			onClick={ onClickHandler }
 			onConfirm={ onConfirm }
 			onReady={ onElementsReady }
 			onCancel={ onCancel }
diff --git a/client/express-checkout/blocks/components/express-checkout-container.js b/client/express-checkout/blocks/components/express-checkout-container.js
index ebcb82e8342..163e177c141 100644
--- a/client/express-checkout/blocks/components/express-checkout-container.js
+++ b/client/express-checkout/blocks/components/express-checkout-container.js
@@ -15,7 +15,7 @@ import {
 import '../express-checkout-element.scss';
 
 const ExpressCheckoutContainer = ( props ) => {
-	const { api, billing, buttonAttributes } = props;
+	const { api, billing, buttonAttributes, isPreview } = props;
 
 	const stripePromise = useMemo( () => {
 		return api.loadStripeForExpressCheckout();
@@ -24,8 +24,8 @@ const ExpressCheckoutContainer = ( props ) => {
 	const options = {
 		mode: 'payment',
 		paymentMethodCreation: 'manual',
-		amount: billing.cartTotal.value,
-		currency: billing.currency.code.toLowerCase(),
+		amount: ! isPreview ? billing.cartTotal.value : 10,
+		currency: ! isPreview ? billing.currency.code.toLowerCase() : 'usd',
 		appearance: getExpressCheckoutButtonAppearance( buttonAttributes ),
 		locale: getExpressCheckoutData( 'stripe' )?.locale ?? 'en',
 	};
diff --git a/client/express-checkout/blocks/components/google-pay-preview.js b/client/express-checkout/blocks/components/google-pay-preview.js
deleted file mode 100644
index fc110d67024..00000000000
--- a/client/express-checkout/blocks/components/google-pay-preview.js
+++ /dev/null
@@ -1,7 +0,0 @@
-/* eslint-disable max-len */
-const googlePayImage =
-	"data:image/svg+xml,%3Csvg width='343' height='50' viewBox='0 0 343 50' fill='none' xmlns='http://www.w3.org/2000/svg'%3E%3Crect width='343' height='50' rx='8' fill='black'/%3E%3Cpath d='M94.9511 24.6726V31.7486H92.6902V14.2749H98.6838C100.203 14.2749 101.498 14.7778 102.558 15.7837C103.641 16.7895 104.183 18.0176 104.183 19.4679C104.183 20.9533 103.641 22.1813 102.558 23.1755C101.51 24.1696 100.215 24.6609 98.6838 24.6609H94.9511V24.6726ZM94.9511 16.4269V22.5205H98.7309C99.6258 22.5205 100.379 22.2164 100.968 21.6199C101.569 21.0234 101.875 20.2983 101.875 19.4796C101.875 18.6726 101.569 17.9591 100.968 17.3626C100.379 16.7427 99.6375 16.4386 98.7309 16.4386H94.9511V16.4269Z' fill='white'/%3E%3Cpath d='M110.094 19.3977C111.766 19.3977 113.085 19.8421 114.05 20.731C115.016 21.6199 115.499 22.8363 115.499 24.3802V31.7486H113.344V30.0878H113.25C112.319 31.4562 111.071 32.1345 109.517 32.1345C108.186 32.1345 107.079 31.7486 106.185 30.9649C105.29 30.1813 104.842 29.2106 104.842 28.041C104.842 26.8012 105.313 25.8188 106.255 25.0936C107.197 24.3568 108.457 23.9942 110.023 23.9942C111.366 23.9942 112.472 24.2398 113.332 24.731V24.2164C113.332 23.4328 113.026 22.7778 112.402 22.2281C111.778 21.6784 111.048 21.4094 110.212 21.4094C108.952 21.4094 107.951 21.9357 107.221 23L105.231 21.7603C106.326 20.1813 107.951 19.3977 110.094 19.3977ZM107.174 28.0761C107.174 28.6609 107.421 29.1521 107.927 29.538C108.422 29.924 109.011 30.1228 109.682 30.1228C110.636 30.1228 111.483 29.772 112.225 29.0702C112.967 28.3685 113.344 27.5497 113.344 26.6024C112.637 26.0527 111.66 25.772 110.4 25.772C109.482 25.772 108.716 25.9942 108.104 26.4269C107.48 26.8831 107.174 27.4328 107.174 28.0761Z' fill='white'/%3E%3Cpath d='M127.792 19.7837L120.256 37.0001H117.924L120.727 30.9767L115.758 19.7837H118.219L121.798 28.3685H121.845L125.331 19.7837H127.792Z' fill='white'/%3E%3Cpath d='M85.9586 23.2456C85.9586 22.5134 85.8926 21.8128 85.7702 21.1392H76.2936V24.9988L81.7513 25C81.53 26.2842 80.8176 27.3789 79.726 28.1087V30.6128H82.9748C84.8717 28.869 85.9586 26.2912 85.9586 23.2456Z' fill='%234285F4'/%3E%3Cpath d='M79.7272 28.1088C78.8229 28.7146 77.6583 29.069 76.2959 29.069C73.6642 29.069 71.4317 27.3076 70.6321 24.9333H67.2809V27.5158C68.9412 30.7883 72.3536 33.0339 76.2959 33.0339C79.0207 33.0339 81.3098 32.1439 82.9759 30.6117L79.7272 28.1088Z' fill='%2334A853'/%3E%3Cpath d='M70.3165 23.0176C70.3165 22.3509 70.4284 21.7065 70.6321 21.1006V18.5182H67.2809C66.5944 19.8714 66.2082 21.3989 66.2082 23.0176C66.2082 24.6363 66.5956 26.1638 67.2809 27.517L70.6321 24.9346C70.4284 24.3287 70.3165 23.6843 70.3165 23.0176Z' fill='%23FABB05'/%3E%3Cpath d='M76.2959 16.9649C77.7831 16.9649 79.1149 17.4737 80.1664 18.4678L83.0454 15.6105C81.2968 13.993 79.0172 13 76.2959 13C72.3548 13 68.9412 15.2456 67.2809 18.5181L70.6321 21.1006C71.4317 18.7263 73.6642 16.9649 76.2959 16.9649Z' fill='%23E94235'/%3E%3Cline x1='140.792' y1='12' x2='140.792' y2='38' stroke='%235F6368' stroke-width='2'/%3E%3Crect x='151.292' y='11.962' width='41' height='26' stroke='white'/%3E%3Cpath d='M187.766 23.7321C187.733 22.9139 187.369 22.1408 186.752 21.5792C186.135 21.0176 185.315 20.7123 184.467 20.7289C183.454 20.6861 182.434 20.7289 181.421 20.6984C181.149 20.6984 181.054 20.7779 181.01 21.0409C180.661 23.255 180.288 25.4631 179.92 27.6772C179.832 28.2154 179.749 28.7537 179.661 29.3042C179.721 29.3178 179.783 29.328 179.844 29.3347C180.87 29.3347 181.896 29.3347 182.916 29.3347C183.738 29.3504 184.55 29.1576 185.271 28.7756C185.992 28.3935 186.597 27.8355 187.025 27.1573C187.657 26.1261 187.918 24.9216 187.766 23.7321ZM184.98 26.405C184.783 26.8111 184.465 27.1511 184.067 27.3811C183.669 27.6111 183.208 27.7206 182.745 27.6955H182.111C182.219 27.0289 182.314 26.3989 182.422 25.7689C182.593 24.723 182.776 23.6709 182.941 22.6189C182.941 22.4171 183.036 22.3314 183.251 22.3498C183.365 22.359 183.479 22.359 183.593 22.3498C183.815 22.3177 184.042 22.3315 184.258 22.3903C184.475 22.4491 184.676 22.5515 184.848 22.6908C185.02 22.8301 185.16 23.0031 185.258 23.1984C185.356 23.3937 185.41 23.6069 185.417 23.8239C185.573 24.7059 185.424 25.6131 184.993 26.405' fill='white'/%3E%3Cpath d='M178.268 21.1081C177.831 20.9036 177.358 20.7831 176.874 20.7534C175.855 20.6922 174.829 20.7534 173.803 20.7106C173.537 20.7106 173.474 20.8084 173.442 21.0286C173.084 23.255 172.718 25.4793 172.347 27.7016C172.258 28.2338 172.176 28.772 172.081 29.3469C172.714 29.3469 173.347 29.3469 173.981 29.3469C174.215 29.3469 174.297 29.2674 174.329 29.0472C174.449 28.2338 174.601 27.4203 174.721 26.6007C174.721 26.405 174.829 26.3193 175.038 26.3438C175.12 26.3561 175.203 26.3561 175.285 26.3438C175.507 26.3438 175.595 26.3988 175.633 26.6129C175.722 27.1145 175.83 27.6099 175.95 28.1053C175.998 28.4255 176.15 28.7226 176.385 28.9535C176.619 29.1844 176.924 29.3372 177.254 29.3898C177.767 29.4233 178.282 29.411 178.793 29.3531C178.829 29.3432 178.861 29.3245 178.887 29.2987C178.912 29.2729 178.93 29.241 178.939 29.2063C178.977 28.772 178.996 28.3377 179.021 27.8912H178.704C178.598 27.9031 178.491 27.8944 178.388 27.8656C178.285 27.8368 178.19 27.7886 178.107 27.7236C178.023 27.6587 177.955 27.5784 177.904 27.4875C177.853 27.3965 177.822 27.2968 177.812 27.194C177.717 26.8453 177.66 26.4906 177.546 26.1481C177.476 25.9279 177.546 25.83 177.736 25.7199C178.164 25.4948 178.532 25.1773 178.812 24.7922C179.092 24.4071 179.276 23.9648 179.35 23.4997C179.521 22.4232 179.16 21.5241 178.293 21.1265L178.268 21.1081ZM176.817 24.2826C176.745 24.4438 176.621 24.5784 176.464 24.6665C176.307 24.7546 176.124 24.7915 175.944 24.7719C175.64 24.7564 175.336 24.7564 175.032 24.7719C175.158 24.0073 175.266 23.3039 175.393 22.6005C175.408 22.5626 175.431 22.5285 175.462 22.501C175.493 22.4734 175.53 22.453 175.57 22.4415C175.827 22.4171 176.086 22.4171 176.343 22.4415C176.529 22.4659 176.7 22.5528 176.826 22.687C176.952 22.8213 177.026 22.9943 177.033 23.1755C177.084 23.5543 176.999 23.9388 176.792 24.2642' fill='white'/%3E%3Cpath d='M171.061 27.2062C170.625 25.1266 170.188 23.0532 169.757 20.9675C169.713 20.7779 169.637 20.7106 169.428 20.7106C168.953 20.7106 168.478 20.7106 168.003 20.7106C167.907 20.6989 167.811 20.7184 167.728 20.7661C167.645 20.8138 167.582 20.8868 167.547 20.9736C166.724 22.5088 165.894 24.0318 165.071 25.567C165.027 25.6588 164.976 25.7444 164.925 25.8361L163.216 29.0106C163.165 29.1023 163.127 29.2002 163.057 29.347C163.811 29.347 164.514 29.347 165.21 29.347C165.286 29.347 165.381 29.243 165.419 29.1635C165.66 28.7047 165.894 28.2399 166.116 27.7628C166.143 27.6883 166.195 27.6247 166.264 27.5825C166.333 27.5402 166.415 27.5219 166.496 27.5304C167.205 27.5304 167.921 27.5304 168.636 27.5304C168.851 27.5304 168.921 27.6038 168.953 27.7934C169.016 28.2277 169.086 28.6619 169.174 29.0901C169.174 29.1879 169.288 29.347 169.358 29.347C170.055 29.347 170.757 29.347 171.498 29.347C171.498 29.194 171.46 29.0778 171.435 28.9616C171.315 28.35 171.188 27.7934 171.061 27.2062ZM167.047 25.8973C167.427 25.1266 167.794 24.3927 168.161 23.6587H168.25C168.37 24.3927 168.497 25.1266 168.624 25.8973H167.047Z' fill='white'/%3E%3Cpath d='M161.101 27.6712C160.883 27.7345 160.653 27.7492 160.428 27.7139C160.203 27.6787 159.99 27.5946 159.804 27.4679C159.618 27.3412 159.464 27.1752 159.354 26.9826C159.244 26.79 159.181 26.5758 159.169 26.3561C159.021 25.4427 159.16 24.5072 159.568 23.671C159.728 23.2847 160.004 22.9537 160.361 22.7213C160.718 22.4888 161.139 22.3658 161.569 22.3682H161.835C162.304 22.4049 162.773 22.4844 163.273 22.5517C163.45 22.0502 163.64 21.5303 163.83 21.0043C163.694 20.8051 163.504 20.6456 163.281 20.5432C163.057 20.4408 162.809 20.3993 162.564 20.4232H157.65L157.599 20.6495C158.2 20.8013 158.79 20.9913 159.366 21.2183C158.824 21.5117 158.349 21.9093 157.973 22.3866C157.03 23.6171 156.604 25.1469 156.782 26.6681C156.804 27.2214 156.996 27.7558 157.335 28.2026C157.673 28.6495 158.142 28.9884 158.682 29.1758C159.322 29.4124 160.008 29.5146 160.692 29.4756C161.377 29.4365 162.045 29.2572 162.652 28.9495C162.722 28.9128 162.817 28.821 162.811 28.7599C162.754 28.2706 162.678 27.7874 162.614 27.3286C162.089 27.451 161.614 27.5855 161.126 27.6712' fill='white'/%3E%3Cpath d='M203.482 28.956C203.17 28.956 202.876 28.896 202.6 28.776C202.336 28.656 202.102 28.494 201.898 28.29C201.694 28.086 201.532 27.852 201.412 27.588C201.292 27.312 201.232 27.018 201.232 26.706C201.232 26.394 201.292 26.106 201.412 25.842C201.532 25.566 201.694 25.326 201.898 25.122C202.102 24.918 202.336 24.756 202.6 24.636C202.876 24.516 203.17 24.456 203.482 24.456C203.794 24.456 204.088 24.516 204.364 24.636C204.64 24.756 204.88 24.918 205.084 25.122C205.288 25.326 205.45 25.566 205.57 25.842C205.69 26.106 205.75 26.394 205.75 26.706C205.75 27.018 205.69 27.312 205.57 27.588C205.45 27.852 205.288 28.086 205.084 28.29C204.88 28.494 204.64 28.656 204.364 28.776C204.088 28.896 203.794 28.956 203.482 28.956ZM210.882 28.956C210.57 28.956 210.276 28.896 210 28.776C209.736 28.656 209.502 28.494 209.298 28.29C209.094 28.086 208.932 27.852 208.812 27.588C208.692 27.312 208.632 27.018 208.632 26.706C208.632 26.394 208.692 26.106 208.812 25.842C208.932 25.566 209.094 25.326 209.298 25.122C209.502 24.918 209.736 24.756 210 24.636C210.276 24.516 210.57 24.456 210.882 24.456C211.194 24.456 211.488 24.516 211.764 24.636C212.04 24.756 212.28 24.918 212.484 25.122C212.688 25.326 212.85 25.566 212.97 25.842C213.09 26.106 213.15 26.394 213.15 26.706C213.15 27.018 213.09 27.312 212.97 27.588C212.85 27.852 212.688 28.086 212.484 28.29C212.28 28.494 212.04 28.656 211.764 28.776C211.488 28.896 211.194 28.956 210.882 28.956ZM218.283 28.956C217.971 28.956 217.677 28.896 217.401 28.776C217.137 28.656 216.903 28.494 216.699 28.29C216.495 28.086 216.333 27.852 216.213 27.588C216.093 27.312 216.033 27.018 216.033 26.706C216.033 26.394 216.093 26.106 216.213 25.842C216.333 25.566 216.495 25.326 216.699 25.122C216.903 24.918 217.137 24.756 217.401 24.636C217.677 24.516 217.971 24.456 218.283 24.456C218.595 24.456 218.889 24.516 219.165 24.636C219.441 24.756 219.681 24.918 219.885 25.122C220.089 25.326 220.251 25.566 220.371 25.842C220.491 26.106 220.551 26.394 220.551 26.706C220.551 27.018 220.491 27.312 220.371 27.588C220.251 27.852 220.089 28.086 219.885 28.29C219.681 28.494 219.441 28.656 219.165 28.776C218.889 28.896 218.595 28.956 218.283 28.956ZM225.683 28.956C225.371 28.956 225.077 28.896 224.801 28.776C224.537 28.656 224.303 28.494 224.099 28.29C223.895 28.086 223.733 27.852 223.613 27.588C223.493 27.312 223.433 27.018 223.433 26.706C223.433 26.394 223.493 26.106 223.613 25.842C223.733 25.566 223.895 25.326 224.099 25.122C224.303 24.918 224.537 24.756 224.801 24.636C225.077 24.516 225.371 24.456 225.683 24.456C225.995 24.456 226.289 24.516 226.565 24.636C226.841 24.756 227.081 24.918 227.285 25.122C227.489 25.326 227.651 25.566 227.771 25.842C227.891 26.106 227.951 26.394 227.951 26.706C227.951 27.018 227.891 27.312 227.771 27.588C227.651 27.852 227.489 28.086 227.285 28.29C227.081 28.494 226.841 28.656 226.565 28.776C226.289 28.896 225.995 28.956 225.683 28.956ZM235.566 31.908L240.984 22.188L240.948 22.116H235.008L235.044 20.226H243.18V22.224L237.294 32.826L235.566 31.908ZM249.263 32.826C248.831 32.826 248.399 32.766 247.967 32.646C247.535 32.526 247.127 32.34 246.743 32.088C246.371 31.824 246.035 31.494 245.735 31.098C245.435 30.702 245.207 30.228 245.051 29.676L246.923 28.902C247.091 29.55 247.379 30.048 247.787 30.396C248.195 30.744 248.687 30.918 249.263 30.918C249.551 30.918 249.827 30.87 250.091 30.774C250.367 30.678 250.607 30.546 250.811 30.378C251.015 30.198 251.177 29.994 251.297 29.766C251.417 29.526 251.477 29.262 251.477 28.974C251.477 28.686 251.411 28.422 251.279 28.182C251.159 27.942 250.991 27.738 250.775 27.57C250.559 27.402 250.301 27.27 250.001 27.174C249.713 27.078 249.401 27.03 249.065 27.03H248.003V25.176H248.957C249.245 25.176 249.509 25.14 249.749 25.068C250.001 24.984 250.223 24.87 250.415 24.726C250.607 24.582 250.757 24.402 250.865 24.186C250.973 23.958 251.027 23.7 251.027 23.412C251.027 22.92 250.847 22.536 250.487 22.26C250.139 21.972 249.695 21.828 249.155 21.828C248.855 21.828 248.591 21.87 248.363 21.954C248.147 22.038 247.961 22.152 247.805 22.296C247.649 22.44 247.517 22.602 247.409 22.782C247.313 22.95 247.235 23.124 247.175 23.304L245.339 22.53C245.435 22.242 245.585 21.948 245.789 21.648C245.993 21.336 246.251 21.054 246.563 20.802C246.875 20.55 247.241 20.346 247.661 20.19C248.093 20.022 248.591 19.938 249.155 19.938C249.731 19.938 250.259 20.022 250.739 20.19C251.219 20.358 251.633 20.592 251.981 20.892C252.329 21.192 252.599 21.546 252.791 21.954C252.983 22.362 253.079 22.806 253.079 23.286C253.079 23.634 253.031 23.952 252.935 24.24C252.851 24.528 252.731 24.786 252.575 25.014C252.419 25.23 252.245 25.416 252.053 25.572C251.861 25.728 251.663 25.86 251.459 25.968V26.076C251.735 26.196 251.999 26.352 252.251 26.544C252.503 26.724 252.719 26.94 252.899 27.192C253.091 27.444 253.241 27.732 253.349 28.056C253.457 28.368 253.511 28.71 253.511 29.082C253.511 29.622 253.403 30.126 253.187 30.594C252.971 31.05 252.671 31.446 252.287 31.782C251.915 32.106 251.471 32.358 250.955 32.538C250.439 32.73 249.875 32.826 249.263 32.826ZM261.209 32.538V30.108H255.449V28.524L261.047 20.226H263.225V28.236H264.773V30.108H263.225V32.538H261.209ZM261.209 23.196H261.101L257.699 28.236H261.209V23.196ZM271.097 32.826C270.473 32.826 269.897 32.73 269.369 32.538C268.841 32.346 268.385 32.088 268.001 31.764C267.617 31.428 267.317 31.038 267.101 30.594C266.885 30.138 266.777 29.646 266.777 29.118C266.777 28.758 266.825 28.428 266.921 28.128C267.029 27.816 267.173 27.534 267.353 27.282C267.533 27.03 267.737 26.808 267.965 26.616C268.205 26.412 268.457 26.244 268.721 26.112V26.004C268.301 25.728 267.941 25.368 267.641 24.924C267.341 24.48 267.191 23.976 267.191 23.412C267.191 22.92 267.287 22.464 267.479 22.044C267.671 21.612 267.941 21.24 268.289 20.928C268.637 20.616 269.051 20.376 269.531 20.208C270.011 20.028 270.533 19.938 271.097 19.938C271.661 19.938 272.183 20.028 272.663 20.208C273.143 20.376 273.557 20.616 273.905 20.928C274.253 21.24 274.523 21.612 274.715 22.044C274.907 22.464 275.003 22.92 275.003 23.412C275.003 23.976 274.853 24.48 274.553 24.924C274.253 25.368 273.893 25.728 273.473 26.004V26.112C273.737 26.244 273.983 26.412 274.211 26.616C274.451 26.808 274.661 27.03 274.841 27.282C275.021 27.534 275.159 27.816 275.255 28.128C275.363 28.428 275.417 28.758 275.417 29.118C275.417 29.646 275.309 30.138 275.093 30.594C274.877 31.038 274.577 31.428 274.193 31.764C273.809 32.088 273.353 32.346 272.825 32.538C272.297 32.73 271.721 32.826 271.097 32.826ZM271.097 25.212C271.637 25.212 272.087 25.062 272.447 24.762C272.819 24.45 273.005 24.03 273.005 23.502C273.005 22.962 272.819 22.542 272.447 22.242C272.087 21.942 271.637 21.792 271.097 21.792C270.557 21.792 270.101 21.942 269.729 22.242C269.369 22.542 269.189 22.962 269.189 23.502C269.189 24.03 269.369 24.45 269.729 24.762C270.101 25.062 270.557 25.212 271.097 25.212ZM271.097 30.936C271.421 30.936 271.721 30.888 271.997 30.792C272.273 30.696 272.513 30.564 272.717 30.396C272.933 30.228 273.095 30.024 273.203 29.784C273.323 29.532 273.383 29.262 273.383 28.974C273.383 28.686 273.323 28.422 273.203 28.182C273.083 27.93 272.921 27.72 272.717 27.552C272.513 27.384 272.273 27.252 271.997 27.156C271.721 27.06 271.421 27.012 271.097 27.012C270.773 27.012 270.473 27.06 270.197 27.156C269.921 27.252 269.681 27.384 269.477 27.552C269.273 27.72 269.111 27.93 268.991 28.182C268.871 28.422 268.811 28.686 268.811 28.974C268.811 29.262 268.865 29.532 268.973 29.784C269.093 30.024 269.255 30.228 269.459 30.396C269.675 30.564 269.921 30.696 270.197 30.792C270.473 30.888 270.773 30.936 271.097 30.936Z' fill='white'/%3E%3C/svg%3E%0A";
-
-const GooglePayPreview = () => <img src={ googlePayImage } alt="" />;
-
-export default GooglePayPreview;
diff --git a/client/express-checkout/blocks/index.js b/client/express-checkout/blocks/index.js
index 5ae6fb829fe..764dc2292cd 100644
--- a/client/express-checkout/blocks/index.js
+++ b/client/express-checkout/blocks/index.js
@@ -8,9 +8,7 @@ import { __ } from '@wordpress/i18n';
  */
 import { PAYMENT_METHOD_NAME_EXPRESS_CHECKOUT_ELEMENT } from 'wcpay/checkout/constants';
 import { getConfig } from 'wcpay/utils/checkout';
-import ApplePayPreview from './components/apple-pay-preview';
 import ExpressCheckoutContainer from './components/express-checkout-container';
-import GooglePayPreview from './components/google-pay-preview';
 import { checkPaymentMethodIsAvailable } from '../utils/checkPaymentMethodIsAvailable';
 
 const expressCheckoutElementApplePay = ( api ) => ( {
@@ -25,9 +23,16 @@ const expressCheckoutElementApplePay = ( api ) => ( {
 	content: (
 		<ExpressCheckoutContainer api={ api } expressPaymentMethod="applePay" />
 	),
-	edit: <ApplePayPreview />,
+	edit: (
+		<ExpressCheckoutContainer
+			api={ api }
+			expressPaymentMethod="applePay"
+			isPreview
+		/>
+	),
 	supports: {
 		features: getConfig( 'features' ),
+		style: [ 'height', 'borderRadius' ],
 	},
 	canMakePayment: ( { cart } ) => {
 		if ( typeof wcpayExpressCheckoutParams === 'undefined' ) {
@@ -56,9 +61,16 @@ const expressCheckoutElementGooglePay = ( api ) => {
 				expressPaymentMethod="googlePay"
 			/>
 		),
-		edit: <GooglePayPreview />,
+		edit: (
+			<ExpressCheckoutContainer
+				api={ api }
+				expressPaymentMethod="googlePay"
+				isPreview
+			/>
+		),
 		supports: {
 			features: getConfig( 'features' ),
+			style: [ 'height', 'borderRadius' ],
 		},
 		canMakePayment: ( { cart } ) => {
 			if ( typeof wcpayExpressCheckoutParams === 'undefined' ) {
diff --git a/client/express-checkout/utils/index.ts b/client/express-checkout/utils/index.ts
index 0d1ef0d9a11..f6089857abc 100644
--- a/client/express-checkout/utils/index.ts
+++ b/client/express-checkout/utils/index.ts
@@ -109,7 +109,13 @@ export const getExpressCheckoutData = <
 >(
 	key: K
 ) => {
-	return window.wcpayExpressCheckoutParams?.[ key ] ?? null;
+	if ( typeof window.wcpayExpressCheckoutParams !== 'undefined' ) {
+		return window.wcpayExpressCheckoutParams[ key ] ?? null;
+	} else if ( typeof window.wc?.wcSettings !== 'undefined' ) {
+		return window.wc.wcSettings.getSetting( 'ece_data' )?.[ key ] ?? null;
+	}
+
+	return null;
 };
 
 /**
diff --git a/client/globals.d.ts b/client/globals.d.ts
index f00b521943a..1d208d50f74 100644
--- a/client/globals.d.ts
+++ b/client/globals.d.ts
@@ -3,6 +3,7 @@
  */
 import type { MccsDisplayTreeItem, Country } from 'onboarding/types';
 import { PaymentMethodToPluginsMap } from './components/duplicate-notice';
+import { WCPayExpressCheckoutParams } from './express-checkout/utils';
 
 declare global {
 	const wcpaySettings: {
@@ -138,6 +139,7 @@ declare global {
 	};
 
 	const wc: {
+		wcSettings: typeof wcSettingsModule;
 		tracks: {
 			recordEvent: (
 				eventName: string,
@@ -186,6 +188,21 @@ declare global {
 		siteTitle: string;
 	};
 
+	interface WcSettings {
+		ece_data?: WCPayExpressCheckoutParams;
+		woocommerce_payments_data: typeof wcpaySettings;
+	}
+
+	const wcSettingsModule: {
+		getSetting: <
+			K extends keyof WcSettings,
+			T extends WcSettings[ K ] | undefined
+		>(
+			setting: K,
+			fallback?: T
+		) => WcSettings[ K ] | T;
+	};
+
 	interface Window {
 		wcpaySettings: typeof wcpaySettings;
 		wc: typeof wc;
diff --git a/includes/express-checkout/class-wc-payments-express-checkout-button-handler.php b/includes/express-checkout/class-wc-payments-express-checkout-button-handler.php
index d024c3ba611..9deeab01ca3 100644
--- a/includes/express-checkout/class-wc-payments-express-checkout-button-handler.php
+++ b/includes/express-checkout/class-wc-payments-express-checkout-button-handler.php
@@ -11,6 +11,8 @@
 	exit;
 }
 
+use Automattic\WooCommerce\Blocks\Package;
+use Automattic\WooCommerce\Blocks\Assets\AssetDataRegistry;
 use WCPay\Fraud_Prevention\Fraud_Prevention_Service;
 
 /**
@@ -99,6 +101,10 @@ public function init() {
 		add_action( 'woocommerce_checkout_order_processed', [ $this->express_checkout_helper, 'add_order_payment_method_title' ], 10, 2 );
 
 		$this->express_checkout_ajax_handler->init();
+
+		if ( is_admin() && current_user_can( 'manage_woocommerce' ) ) {
+			$this->register_ece_data_for_block_editor();
+		}
 	}
 
 	/**
@@ -447,4 +453,23 @@ public function filter_gateway_title( $title, $id ) {
 
 		return $title;
 	}
+
+	/**
+	 * Add ECE data to `wcSettings` to allow it to be accessed by the front-end JS script in the Block editor.
+	 *
+	 * @return void
+	 */
+	private function register_ece_data_for_block_editor() {
+		$data_registry = Package::container()->get( AssetDataRegistry::class );
+
+		if ( $data_registry->exists( 'ece_data' ) ) {
+			return;
+		}
+
+		$ece_data = [
+			'button' => $this->get_button_settings(),
+		];
+
+		$data_registry->add( 'ece_data', $ece_data );
+	}
 }

From 68e49868ffafd261a3a8b8626efd5053d890581b Mon Sep 17 00:00:00 2001
From: Vlad Olaru <vlad.olaru@automattic.com>
Date: Mon, 4 Nov 2024 12:08:12 +0200
Subject: [PATCH 25/45] Avoid PHP warning when checking for StoreAPI requests
 (#9662)

---
 changelog/fix-9661-avoid-php-warning        |  4 ++++
 includes/class-wc-payments-utils.php        | 17 +++++++++++++----
 multi-currency/src/Utils.php                | 15 +++++++++++----
 tests/unit/test-class-wc-payments-utils.php | 10 +++++++++-
 4 files changed, 37 insertions(+), 9 deletions(-)
 create mode 100644 changelog/fix-9661-avoid-php-warning

diff --git a/changelog/fix-9661-avoid-php-warning b/changelog/fix-9661-avoid-php-warning
new file mode 100644
index 00000000000..8e08f906189
--- /dev/null
+++ b/changelog/fix-9661-avoid-php-warning
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fix
+
+Avoid PHP warnings for requests with an empty path.
diff --git a/includes/class-wc-payments-utils.php b/includes/class-wc-payments-utils.php
index 226950362cf..7afbc0e5835 100644
--- a/includes/class-wc-payments-utils.php
+++ b/includes/class-wc-payments-utils.php
@@ -1343,26 +1343,35 @@ public static function is_cart_block(): bool {
 	}
 
 	/**
-	 * Returns true if the request that's currently being processed is a Store API request, false
-	 * otherwise.
+	 * Determine if the request that's currently being processed is a Store API request.
 	 *
 	 * @return bool True if request is a Store API request, false otherwise.
 	 */
 	public static function is_store_api_request(): bool {
+		// @TODO We should move to a more robust way of getting to the route, like WC is doing in the StoreAPI library. https://github.com/woocommerce/woocommerce/blob/9ac48232a944baa2dbfaa7dd47edf9027cca9519/plugins/woocommerce/src/StoreApi/Authentication.php#L15-L15
 		if ( isset( $_REQUEST['rest_route'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification
 			$rest_route = sanitize_text_field( $_REQUEST['rest_route'] ); // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.MissingUnslash,WordPress.Security.NonceVerification
 		} else {
+			// Extract the request path from the request URL.
 			$url_parts    = wp_parse_url( esc_url_raw( $_SERVER['REQUEST_URI'] ?? '' ) ); // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.MissingUnslash
-			$request_path = $url_parts ? rtrim( $url_parts['path'], '/' ) : '';
-			$rest_route   = str_replace( trailingslashit( rest_get_url_prefix() ), '', $request_path );
+			$request_path = ! empty( $url_parts['path'] ) ? rtrim( $url_parts['path'], '/' ) : '';
+			// Remove the REST API prefix from the request path to end up with the route.
+			$rest_route = str_replace( trailingslashit( rest_get_url_prefix() ), '', $request_path );
 		}
 
+		// Bail early if the rest route is empty.
+		if ( empty( $rest_route ) ) {
+			return false;
+		}
+
+		// Try to match the rest route against the store API route patterns.
 		foreach ( self::STORE_API_ROUTE_PATTERNS as $pattern ) {
 			if ( 1 === preg_match( $pattern, $rest_route ) ) {
 				return true;
 			}
 		}
 
+		// If no match was found, this is not a Store API request.
 		return false;
 	}
 
diff --git a/multi-currency/src/Utils.php b/multi-currency/src/Utils.php
index b0c1fba84ea..7b8c98e4df5 100644
--- a/multi-currency/src/Utils.php
+++ b/multi-currency/src/Utils.php
@@ -90,18 +90,25 @@ public static function is_store_api_request() {
 	}
 
 	/**
-	 * Returns true if the request that's currently being processed is a Store API batch request, false
-	 * otherwise.
+	 * Determine if the request that's currently being processed is a Store API batch request.
 	 *
 	 * @return bool True if the request is a Store API batch request, false otherwise.
 	 */
 	public static function is_store_batch_request(): bool {
+		// @TODO We should move to a more robust way of getting to the route, like WC is doing in the StoreAPI library. https://github.com/woocommerce/woocommerce/blob/9ac48232a944baa2dbfaa7dd47edf9027cca9519/plugins/woocommerce/src/StoreApi/Authentication.php#L15-L15
 		if ( isset( $_REQUEST['rest_route'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification
 			$rest_route = sanitize_text_field( $_REQUEST['rest_route'] ); // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.MissingUnslash,WordPress.Security.NonceVerification
 		} else {
+			// Extract the request path from the request URL.
 			$url_parts    = wp_parse_url( esc_url_raw( $_SERVER['REQUEST_URI'] ?? '' ) ); // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.MissingUnslash
-			$request_path = $url_parts ? rtrim( $url_parts['path'], '/' ) : '';
-			$rest_route   = str_replace( trailingslashit( rest_get_url_prefix() ), '', $request_path );
+			$request_path = ! empty( $url_parts['path'] ) ? rtrim( $url_parts['path'], '/' ) : '';
+			// Remove the REST API prefix from the request path to end up with the route.
+			$rest_route = str_replace( trailingslashit( rest_get_url_prefix() ), '', $request_path );
+		}
+
+		// Bail early if the rest route is empty.
+		if ( empty( $rest_route ) ) {
+			return false;
 		}
 
 		return 1 === preg_match( '@^\/wc\/store(\/v[\d]+)?\/batch@', $rest_route );
diff --git a/tests/unit/test-class-wc-payments-utils.php b/tests/unit/test-class-wc-payments-utils.php
index f6f5affd667..61aa747fc00 100644
--- a/tests/unit/test-class-wc-payments-utils.php
+++ b/tests/unit/test-class-wc-payments-utils.php
@@ -1109,11 +1109,19 @@ public function test_is_store_api_request_with_another_request() {
 	}
 
 	public function test_is_store_api_request_with_malformed_url() {
-		$_SERVER['REQUEST_URI'] = '///wp-json/wp/v2/users';
+		$_SERVER['REQUEST_URI'] = '///wp-json/wc/store/v1/checkout';
 
 		$this->assertFalse( WC_Payments_Utils::is_store_api_request() );
 	}
 
+	public function test_is_store_api_request_with_url_with_no_path() {
+		$_SERVER['REQUEST_URI'] = '?something';
+		$this->assertFalse( WC_Payments_Utils::is_store_api_request() );
+
+		$_SERVER['REQUEST_URI'] = '';
+		$this->assertFalse( WC_Payments_Utils::is_store_api_request() );
+	}
+
 	public function test_is_any_bnpl_method_available() {
 		// Price within range for Afterpay/Clearpay in the US.
 		$this->assertTrue(

From e42103b75cca59f7cd360026915e64cbd6128afb Mon Sep 17 00:00:00 2001
From: Francesco <frosso@users.noreply.github.com>
Date: Mon, 4 Nov 2024 12:33:50 +0100
Subject: [PATCH 26/45] fix: payment method icon alt text (#9648)

Co-authored-by: Brett Shumaker <brettshumaker@gmail.com>
---
 changelog/fix-payment-method-icon-alt-text  |  4 ++++
 includes/class-wc-payment-gateway-wcpay.php | 14 ++++++++++----
 2 files changed, 14 insertions(+), 4 deletions(-)
 create mode 100644 changelog/fix-payment-method-icon-alt-text

diff --git a/changelog/fix-payment-method-icon-alt-text b/changelog/fix-payment-method-icon-alt-text
new file mode 100644
index 00000000000..9da0ead5e11
--- /dev/null
+++ b/changelog/fix-payment-method-icon-alt-text
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fix
+
+fix: payment method icon alt text
diff --git a/includes/class-wc-payment-gateway-wcpay.php b/includes/class-wc-payment-gateway-wcpay.php
index 2a60d9b64e2..2a50957df4d 100644
--- a/includes/class-wc-payment-gateway-wcpay.php
+++ b/includes/class-wc-payment-gateway-wcpay.php
@@ -3231,12 +3231,18 @@ public function update_fraud_rules_based_on_general_options() {
 	}
 
 	/**
-	 * The get_icon() method from the WC_Payment_Gateway class wraps the icon URL into a prepared HTML element, but there are situations when this
-	 * element needs to be rendered differently on the UI (e.g. additional styles or `display` property).
+	 * Overriding the base method because the `alt` tag would otherwise output the markup returned by the `get_title()` method in this class - which we don't want.
 	 *
-	 * This is why we need a usual getter like this to provide a raw icon URL to the UI, which will render it according to particular requirements.
+	 * @return string
+	 */
+	public function get_icon() {
+		return '<img src="' . esc_url( WC_HTTPS::force_https_url( $this->get_icon_url() ) ) . '" alt="' . esc_attr( $this->payment_method->get_title() ) . ' payment method logo" />';
+	}
+
+	/**
+	 * The URL for the current payment method's icon.
 	 *
-	 * @return string Returns the payment method icon URL.
+	 * @return string The payment method icon URL.
 	 */
 	public function get_icon_url() {
 		return $this->payment_method->get_icon();

From 3d745b1513072347d00ab4d938c8383681298548 Mon Sep 17 00:00:00 2001
From: Mike Moore <michael.moore@automattic.com>
Date: Mon, 4 Nov 2024 09:53:55 -0500
Subject: [PATCH 27/45] Hide duplicate payment method warnings when Stripe
 gateway is disabled (#9663)

---
 .../fix-9271-hide-stripe-duplicates-warning-when-disabled | 5 +++++
 includes/class-duplicates-detection-service.php           | 8 +-------
 2 files changed, 6 insertions(+), 7 deletions(-)
 create mode 100644 changelog/fix-9271-hide-stripe-duplicates-warning-when-disabled

diff --git a/changelog/fix-9271-hide-stripe-duplicates-warning-when-disabled b/changelog/fix-9271-hide-stripe-duplicates-warning-when-disabled
new file mode 100644
index 00000000000..46e04c54622
--- /dev/null
+++ b/changelog/fix-9271-hide-stripe-duplicates-warning-when-disabled
@@ -0,0 +1,5 @@
+Significance: patch
+Type: fix
+Comment: Small change affecting Stripe Gateway settings notices
+
+
diff --git a/includes/class-duplicates-detection-service.php b/includes/class-duplicates-detection-service.php
index 420545e0ce8..c2ffe05385a 100644
--- a/includes/class-duplicates-detection-service.php
+++ b/includes/class-duplicates-detection-service.php
@@ -136,18 +136,12 @@ private function search_for_payment_request_buttons() {
 		];
 
 		foreach ( $this->get_registered_gateways() as $gateway ) {
-			// Stripe gateway can enable PRBs while being disabled as well, hence no need to check for enabled status.
-			if ( 'stripe' === $gateway->id && 'yes' === $gateway->get_option( 'payment_request' ) ) {
-				$this->gateways_qualified_by_duplicates_detector[ $prb_payment_method ][] = $gateway->id;
-				continue;
-			}
-
 			if ( 'yes' === $gateway->enabled ) {
 				foreach ( $keywords as $keyword ) {
 					if ( strpos( $gateway->id, $keyword ) !== false ) {
 						$this->gateways_qualified_by_duplicates_detector[ $prb_payment_method ][] = $gateway->id;
 						break;
-					} elseif ( 'yes' === $gateway->get_option( 'payment_request' ) && 'woocommerce_payments' === $gateway->id ) {
+					} elseif ( 'yes' === $gateway->get_option( 'payment_request' ) ) {
 						$this->gateways_qualified_by_duplicates_detector[ $prb_payment_method ][] = $gateway->id;
 						break;
 					} elseif ( 'yes' === $gateway->get_option( 'express_checkout_enabled' ) ) {

From 67f24e6ea35ae28457aff88d4473259eed6d7286 Mon Sep 17 00:00:00 2001
From: Mike Moore <michael.moore@automattic.com>
Date: Mon, 4 Nov 2024 10:16:21 -0500
Subject: [PATCH 28/45] Remove unused multi-currency import (#9664)

---
 changelog/chore-affirm-remove-unused-multicurrency-import | 5 +++++
 includes/payment-methods/class-affirm-payment-method.php  | 1 -
 2 files changed, 5 insertions(+), 1 deletion(-)
 create mode 100644 changelog/chore-affirm-remove-unused-multicurrency-import

diff --git a/changelog/chore-affirm-remove-unused-multicurrency-import b/changelog/chore-affirm-remove-unused-multicurrency-import
new file mode 100644
index 00000000000..69a52e74fb6
--- /dev/null
+++ b/changelog/chore-affirm-remove-unused-multicurrency-import
@@ -0,0 +1,5 @@
+Significance: patch
+Type: fix
+Comment: Removing unused import.
+
+
diff --git a/includes/payment-methods/class-affirm-payment-method.php b/includes/payment-methods/class-affirm-payment-method.php
index 0d2656fd700..68699548124 100644
--- a/includes/payment-methods/class-affirm-payment-method.php
+++ b/includes/payment-methods/class-affirm-payment-method.php
@@ -11,7 +11,6 @@
 use WC_Payments_Utils;
 use WCPay\Constants\Country_Code;
 use WCPay\Constants\Currency_Code;
-use WCPay\MultiCurrency\MultiCurrency;
 
 /**
  * Affirm Payment Method class extending UPE base class

From d741c6103c9d7c0e700b3b428597afa22a21e2fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ismael=20Mart=C3=ADn=20Alabarce?= <info@ismaeld.com>
Date: Tue, 5 Nov 2024 12:07:05 +0100
Subject: [PATCH 29/45] Use @stripe/connect-js/pure (#9674)

---
 changelog/fix-stripe-connect-breaks-underscore       | 5 +++++
 client/onboarding/steps/embedded-kyc.tsx             | 2 +-
 client/onboarding/steps/test/embedded-onboarding.tsx | 4 ++--
 3 files changed, 8 insertions(+), 3 deletions(-)
 create mode 100644 changelog/fix-stripe-connect-breaks-underscore

diff --git a/changelog/fix-stripe-connect-breaks-underscore b/changelog/fix-stripe-connect-breaks-underscore
new file mode 100644
index 00000000000..9662fc9bd30
--- /dev/null
+++ b/changelog/fix-stripe-connect-breaks-underscore
@@ -0,0 +1,5 @@
+Significance: patch
+Type: fix
+Comment: Change the way we load an external lib to avoid issues with underscore.
+
+
diff --git a/client/onboarding/steps/embedded-kyc.tsx b/client/onboarding/steps/embedded-kyc.tsx
index 4acf74f6d94..c14005f2d06 100644
--- a/client/onboarding/steps/embedded-kyc.tsx
+++ b/client/onboarding/steps/embedded-kyc.tsx
@@ -5,7 +5,7 @@ import React, { useCallback, useEffect, useState } from 'react';
 import {
 	loadConnectAndInitialize,
 	StripeConnectInstance,
-} from '@stripe/connect-js';
+} from '@stripe/connect-js/pure';
 import {
 	ConnectAccountOnboarding,
 	ConnectComponentsProvider,
diff --git a/client/onboarding/steps/test/embedded-onboarding.tsx b/client/onboarding/steps/test/embedded-onboarding.tsx
index bd3ee34b1bd..5d8804af111 100644
--- a/client/onboarding/steps/test/embedded-onboarding.tsx
+++ b/client/onboarding/steps/test/embedded-onboarding.tsx
@@ -4,7 +4,7 @@
 import React from 'react';
 import { render, screen, waitFor } from '@testing-library/react';
 import apiFetch from '@wordpress/api-fetch';
-import { loadConnectAndInitialize } from '@stripe/connect-js';
+import { loadConnectAndInitialize } from '@stripe/connect-js/pure';
 
 /**
  * Internal dependencies
@@ -12,7 +12,7 @@ import { loadConnectAndInitialize } from '@stripe/connect-js';
 import EmbeddedKyc from '../embedded-kyc';
 
 jest.mock( '@wordpress/api-fetch' );
-jest.mock( '@stripe/connect-js', () => ( {
+jest.mock( '@stripe/connect-js/pure', () => ( {
 	loadConnectAndInitialize: jest.fn(),
 } ) );
 

From c061a0874a4af2d3dbe25a88c6cca44015d02a5a Mon Sep 17 00:00:00 2001
From: Eric Jinks <3147296+Jinksi@users.noreply.github.com>
Date: Wed, 6 Nov 2024 11:35:33 +1000
Subject: [PATCH 30/45] Use 'Withdrawal' and 'Deducted' labels when referring
 to withdrawal deposits, to more accurately communicate the type of
 transaction that has occurred (#9500)

---
 .../fix-7802-deposit-withdrawal-text-changes  |   4 +
 .../components/deposit-status-chip/index.tsx  |  20 +-
 .../deposit-status-chip/test/index.test.tsx   |  18 +-
 .../recent-deposits-list.tsx                  |   3 +-
 .../test/__snapshots__/index.tsx.snap         |  50 ++++-
 .../deposits-overview/test/index.tsx          |   9 +
 client/deposits/details/index.tsx             |  78 ++++++--
 .../details/test/__snapshots__/index.tsx.snap |  76 +++++++-
 client/deposits/details/test/index.tsx        |  26 ++-
 client/deposits/filters/config.js             |  17 +-
 .../filters/test/__snapshots__/index.js.snap  |   2 +-
 client/deposits/list/index.tsx                |  12 +-
 .../list/test/__snapshots__/index.tsx.snap    | 178 +++++++++++++++++-
 client/deposits/list/test/index.tsx           |  13 +-
 client/deposits/strings.ts                    |  13 +-
 client/transactions/list/index.tsx            |   8 +-
 .../list/test/__snapshots__/index.tsx.snap    |   4 +-
 client/transactions/list/test/index.tsx       |   3 +-
 18 files changed, 474 insertions(+), 60 deletions(-)
 create mode 100644 changelog/fix-7802-deposit-withdrawal-text-changes

diff --git a/changelog/fix-7802-deposit-withdrawal-text-changes b/changelog/fix-7802-deposit-withdrawal-text-changes
new file mode 100644
index 00000000000..cf32df2a4f7
--- /dev/null
+++ b/changelog/fix-7802-deposit-withdrawal-text-changes
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fix
+
+Use 'Withdrawal' and 'Deducted' labels when referring to withdrawal deposits, to more accurately communicate the type of transaction that has occurred
diff --git a/client/components/deposit-status-chip/index.tsx b/client/components/deposit-status-chip/index.tsx
index 9d70fdfbe7a..8ca6fe6bad6 100644
--- a/client/components/deposit-status-chip/index.tsx
+++ b/client/components/deposit-status-chip/index.tsx
@@ -6,9 +6,9 @@ import * as React from 'react';
 /**
  * Internal dependencies
  */
-import { displayStatus } from 'deposits/strings';
 import Chip, { ChipType } from 'components/chip';
-import type { DepositStatus } from 'wcpay/types/deposits';
+import type { CachedDeposit, DepositStatus } from 'wcpay/types/deposits';
+import { depositStatusLabels } from 'wcpay/deposits/strings';
 
 /**
  * Maps a DepositStatus to a ChipType.
@@ -23,13 +23,17 @@ const mappings: Record< DepositStatus, ChipType > = {
 
 /**
  * Renders a deposits status chip.
- *
- * @return {JSX.Element} Deposit status chip.
  */
 const DepositStatusChip: React.FC< {
-	status: DepositStatus;
-} > = ( { status } ): JSX.Element => (
-	<Chip type={ mappings[ status ] } message={ displayStatus[ status ] } />
-);
+	deposit: Pick< CachedDeposit, 'status' | 'type' >;
+} > = ( { deposit } ) => {
+	let message = depositStatusLabels[ deposit.status ];
+
+	// Withdrawals are displayed as 'Deducted' instead of 'Paid'.
+	if ( deposit.type === 'withdrawal' && deposit.status === 'paid' ) {
+		message = depositStatusLabels.deducted;
+	}
+	return <Chip type={ mappings[ deposit.status ] } message={ message } />;
+};
 
 export default DepositStatusChip;
diff --git a/client/components/deposit-status-chip/test/index.test.tsx b/client/components/deposit-status-chip/test/index.test.tsx
index 54abc52546c..e96bd9961f5 100644
--- a/client/components/deposit-status-chip/test/index.test.tsx
+++ b/client/components/deposit-status-chip/test/index.test.tsx
@@ -11,18 +11,28 @@ import DepositStatusChip from '..';
 
 describe( 'Deposits status chip renders', () => {
 	test( 'Renders "Pending" status chip.', () => {
-		const { getByText } = render( <DepositStatusChip status="pending" /> );
+		const { getByText } = render(
+			<DepositStatusChip
+				deposit={ { type: 'deposit', status: 'pending' } }
+			/>
+		);
 		expect( getByText( 'Pending' ) ).toBeTruthy();
 	} );
 
 	test( 'Renders "Paid" status chip.', () => {
-		const { getByText } = render( <DepositStatusChip status="paid" /> );
-		expect( getByText( 'Paid' ) ).toBeTruthy();
+		const { getByText } = render(
+			<DepositStatusChip
+				deposit={ { type: 'deposit', status: 'paid' } }
+			/>
+		);
+		expect( getByText( 'Completed (paid)' ) ).toBeTruthy();
 	} );
 
 	test( 'Renders "In transit" status chip.', () => {
 		const { getByText } = render(
-			<DepositStatusChip status="in_transit" />
+			<DepositStatusChip
+				deposit={ { type: 'deposit', status: 'in_transit' } }
+			/>
 		);
 		expect( getByText( 'In transit' ) ).toBeTruthy();
 	} );
diff --git a/client/components/deposits-overview/recent-deposits-list.tsx b/client/components/deposits-overview/recent-deposits-list.tsx
index 88555793d0d..6bb50a0a6c2 100644
--- a/client/components/deposits-overview/recent-deposits-list.tsx
+++ b/client/components/deposits-overview/recent-deposits-list.tsx
@@ -11,7 +11,6 @@ import {
 } from '@wordpress/components';
 import { calendar } from '@wordpress/icons';
 import { Link } from '@woocommerce/components';
-import { Fragment } from '@wordpress/element';
 import { __ } from '@wordpress/i18n';
 
 /**
@@ -51,7 +50,7 @@ const RecentDepositsList: React.FC< RecentDepositsProps > = ( {
 				</Link>
 			</FlexItem>
 			<FlexItem className={ `${ tableClass }__cell` }>
-				<DepositStatusChip status={ deposit.status } />
+				<DepositStatusChip deposit={ deposit } />
 			</FlexItem>
 			<FlexItem className={ `${ tableClass }__cell` }>
 				{ formatCurrency( deposit.amount, deposit.currency ) }
diff --git a/client/components/deposits-overview/test/__snapshots__/index.tsx.snap b/client/components/deposits-overview/test/__snapshots__/index.tsx.snap
index e38209eb60e..a29a1d9064f 100644
--- a/client/components/deposits-overview/test/__snapshots__/index.tsx.snap
+++ b/client/components/deposits-overview/test/__snapshots__/index.tsx.snap
@@ -275,7 +275,7 @@ exports[`Deposits Overview information Component Renders 1`] = `
             <span
               class="chip chip-success"
             >
-              Paid
+              Completed (paid)
             </span>
           </div>
           <div
@@ -334,6 +334,54 @@ exports[`Deposits Overview information Component Renders 1`] = `
             $30.00
           </div>
         </div>
+        <div
+          class="components-flex wcpay-deposits-overview__table__row css-1giw1wa-View-Flex-sx-Base-sx-Items-ItemsRow em57xhy0"
+          data-wp-c16t="true"
+          data-wp-component="Flex"
+        >
+          <div
+            class="components-flex-item wcpay-deposits-overview__table__cell css-mw3lhz-View-Item-sx-Base em57xhy0"
+            data-wp-c16t="true"
+            data-wp-component="FlexItem"
+          >
+            <svg
+              aria-hidden="true"
+              focusable="false"
+              height="17"
+              viewBox="0 0 24 24"
+              width="17"
+              xmlns="http://www.w3.org/2000/svg"
+            >
+              <path
+                d="M19 3H5c-1.1 0-2 .9-2 2v14c0 1.1.9 2 2 2h14c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2zm.5 16c0 .3-.2.5-.5.5H5c-.3 0-.5-.2-.5-.5V7h15v12zM9 10H7v2h2v-2zm0 4H7v2h2v-2zm4-4h-2v2h2v-2zm4 0h-2v2h2v-2zm-4 4h-2v2h2v-2zm4 0h-2v2h2v-2z"
+              />
+            </svg>
+            <a
+              data-link-type="wc-admin"
+              href="admin.php?page=wc-admin&path=%2Fpayments%2Fdeposits%2Fdetails&id=po_mock3"
+            >
+              January 4, 2020
+            </a>
+          </div>
+          <div
+            class="components-flex-item wcpay-deposits-overview__table__cell css-mw3lhz-View-Item-sx-Base em57xhy0"
+            data-wp-c16t="true"
+            data-wp-component="FlexItem"
+          >
+            <span
+              class="chip chip-success"
+            >
+              Completed (deducted)
+            </span>
+          </div>
+          <div
+            class="components-flex-item wcpay-deposits-overview__table__cell css-mw3lhz-View-Item-sx-Base em57xhy0"
+            data-wp-c16t="true"
+            data-wp-component="FlexItem"
+          >
+            $40.00
+          </div>
+        </div>
       </div>
       <div
         class="components-flex components-card__footer components-card-footer wcpay-deposits-overview__footer css-p1v47q-View-Flex-sx-Base-sx-Items-ItemsRow-Footer-borderRadius-borderColor-medium em57xhy0"
diff --git a/client/components/deposits-overview/test/index.tsx b/client/components/deposits-overview/test/index.tsx
index 4853aff7bf5..d6d5be60bdf 100644
--- a/client/components/deposits-overview/test/index.tsx
+++ b/client/components/deposits-overview/test/index.tsx
@@ -90,6 +90,15 @@ const mockDeposits = [
 		bankAccount: 'MOCK BANK •••• 1234 (USD)',
 		currency: 'USD',
 	} as CachedDeposit,
+	{
+		id: 'po_mock3',
+		date: '2020-01-04 17:46:02',
+		type: 'withdrawal',
+		amount: 4000,
+		status: 'paid',
+		bankAccount: 'MOCK BANK •••• 1234 (USD)',
+		currency: 'USD',
+	} as CachedDeposit,
 ];
 
 // Creates a mock Overview object for the given currency code and balance amounts.
diff --git a/client/deposits/details/index.tsx b/client/deposits/details/index.tsx
index 74aec3f2a7d..f2a835676d4 100644
--- a/client/deposits/details/index.tsx
+++ b/client/deposits/details/index.tsx
@@ -38,15 +38,32 @@ import {
 	formatCurrency,
 	formatExplicitCurrency,
 } from 'multi-currency/interface/functions';
-import { displayStatus } from '../strings';
+import { depositStatusLabels } from '../strings';
 import './style.scss';
 
 /**
  * Renders the deposit status indicator UI, re-purposing the OrderStatus component from @woocommerce/components.
  */
-const Status: React.FC< { status: string } > = ( { status } ) => (
-	<OrderStatus order={ { status } } orderStatusMap={ displayStatus } />
-);
+const DepositStatusIndicator: React.FC< {
+	deposit: Pick< CachedDeposit, 'status' | 'type' >;
+} > = ( { deposit } ) => {
+	let displayStatusMap = depositStatusLabels;
+
+	// Withdrawals are displayed as 'Deducted' instead of 'Paid' when the status is 'paid'.
+	if ( deposit.type === 'withdrawal' ) {
+		displayStatusMap = {
+			...displayStatusMap,
+			paid: displayStatusMap.deducted,
+		};
+	}
+
+	return (
+		<OrderStatus
+			order={ { status: deposit.status } }
+			orderStatusMap={ displayStatusMap }
+		/>
+	);
+};
 
 interface SummaryItemProps {
 	label: string;
@@ -102,9 +119,15 @@ export const DepositOverview: React.FC< DepositOverviewProps > = ( {
 		);
 	}
 
-	const depositDateLabel = deposit.automatic
-		? __( 'Deposit date', 'woocommerce-payments' )
-		: __( 'Instant deposit date', 'woocommerce-payments' );
+	const isWithdrawal = deposit.type === 'withdrawal';
+
+	let depositDateLabel = __( 'Deposit date', 'woocommerce-payments' );
+	if ( ! deposit.automatic ) {
+		depositDateLabel = __( 'Instant deposit date', 'woocommerce-payments' );
+	}
+	if ( isWithdrawal ) {
+		depositDateLabel = __( 'Withdrawal date', 'woocommerce-payments' );
+	}
 
 	const depositDateItem = (
 		<SummaryItem
@@ -117,7 +140,7 @@ export const DepositOverview: React.FC< DepositOverviewProps > = ( {
 					true // TODO Change call to gmdateI18n and remove this deprecated param once WP 5.4 support ends.
 				)
 			}
-			value={ <Status status={ deposit.status } /> }
+			value={ <DepositStatusIndicator deposit={ deposit } /> }
 			detail={ deposit.bankAccount }
 		/>
 	);
@@ -138,16 +161,30 @@ export const DepositOverview: React.FC< DepositOverviewProps > = ( {
 				</Card>
 			) : (
 				<SummaryList
-					label={ __( 'Deposit overview', 'woocommerce-payments' ) }
+					label={
+						isWithdrawal
+							? __(
+									'Withdrawal overview',
+									'woocommerce-payments'
+							  )
+							: __( 'Deposit overview', 'woocommerce-payments' )
+					}
 				>
 					{ () => [
 						depositDateItem,
 						<SummaryItem
 							key="depositAmount"
-							label={ __(
-								'Deposit amount',
-								'woocommerce-payments'
-							) }
+							label={
+								isWithdrawal
+									? __(
+											'Withdrawal amount',
+											'woocommerce-payments'
+									  )
+									: __(
+											'Deposit amount',
+											'woocommerce-payments'
+									  )
+							}
 							value={ formatExplicitCurrency(
 								deposit.amount + deposit.fee,
 								deposit.currency
@@ -170,10 +207,17 @@ export const DepositOverview: React.FC< DepositOverviewProps > = ( {
 						/>,
 						<SummaryItem
 							key="netDepositAmount"
-							label={ __(
-								'Net deposit amount',
-								'woocommerce-payments'
-							) }
+							label={
+								isWithdrawal
+									? __(
+											'Net withdrawal amount',
+											'woocommerce-payments'
+									  )
+									: __(
+											'Net deposit amount',
+											'woocommerce-payments'
+									  )
+							}
 							value={ formatExplicitCurrency(
 								deposit.amount,
 								deposit.currency
diff --git a/client/deposits/details/test/__snapshots__/index.tsx.snap b/client/deposits/details/test/__snapshots__/index.tsx.snap
index f3c47816895..53ef5a35d23 100644
--- a/client/deposits/details/test/__snapshots__/index.tsx.snap
+++ b/client/deposits/details/test/__snapshots__/index.tsx.snap
@@ -37,7 +37,7 @@ exports[`Deposit overview renders automatic deposit correctly 1`] = `
                     <span
                       class="woocommerce-order-status__indicator is-paid"
                     />
-                    Paid
+                    Completed (paid)
                   </div>
                 </div>
               </div>
@@ -72,6 +72,78 @@ exports[`Deposit overview renders automatic deposit correctly 1`] = `
 </div>
 `;
 
+exports[`Deposit overview renders automatic withdrawal correctly 1`] = `
+<div>
+  <div
+    class="wcpay-deposit-overview"
+  >
+    <div
+      class="components-surface components-card wcpay-deposit-automatic css-nsno0f-View-Surface-getBorders-primary-Card-rounded em57xhy0"
+      data-wp-c16t="true"
+      data-wp-component="Card"
+    >
+      <div
+        class="css-mgwsf4-View-Content em57xhy0"
+      >
+        <ul>
+          <li
+            class="woocommerce-summary__item-container"
+          >
+            <div
+              class="woocommerce-summary__item"
+            >
+              <div
+                class="woocommerce-summary__item-label"
+              >
+                Withdrawal date: Jan 2, 2020
+              </div>
+              <div
+                class="woocommerce-summary__item-data"
+              >
+                <div
+                  class="woocommerce-summary__item-value"
+                >
+                  <div
+                    class="woocommerce-order-status"
+                  >
+                    <span
+                      class="woocommerce-order-status__indicator is-paid"
+                    />
+                    Completed (deducted)
+                  </div>
+                </div>
+              </div>
+              <div
+                class="wcpay-summary__item-detail"
+              >
+                MOCK BANK •••• 1234 (USD)
+              </div>
+            </div>
+          </li>
+          <li
+            class="wcpay-deposit-amount"
+          >
+            -$20.00
+          </li>
+        </ul>
+      </div>
+      <div
+        aria-hidden="true"
+        class="components-elevation css-91yjwm-View-Elevation-sx-Base-elevationClassName em57xhy0"
+        data-wp-c16t="true"
+        data-wp-component="Elevation"
+      />
+      <div
+        aria-hidden="true"
+        class="components-elevation css-91yjwm-View-Elevation-sx-Base-elevationClassName em57xhy0"
+        data-wp-c16t="true"
+        data-wp-component="Elevation"
+      />
+    </div>
+  </div>
+</div>
+`;
+
 exports[`Deposit overview renders instant deposit correctly 1`] = `
 <div>
   <div
@@ -115,7 +187,7 @@ exports[`Deposit overview renders instant deposit correctly 1`] = `
                   <span
                     class="woocommerce-order-status__indicator is-paid"
                   />
-                  Paid
+                  Completed (paid)
                 </div>
               </div>
             </div>
diff --git a/client/deposits/details/test/index.tsx b/client/deposits/details/test/index.tsx
index f6fd4d98116..5d4452e9998 100644
--- a/client/deposits/details/test/index.tsx
+++ b/client/deposits/details/test/index.tsx
@@ -25,6 +25,19 @@ const mockDeposit = {
 	currency: 'USD',
 } as CachedDeposit;
 
+const mockWithdrawal = {
+	id: 'po_mock',
+	date: '2020-01-02 17:46:02',
+	type: 'withdrawal',
+	amount: -2000,
+	status: 'paid',
+	bankAccount: 'MOCK BANK •••• 1234 (USD)',
+	automatic: true,
+	fee: 30,
+	fee_percentage: 1.5,
+	currency: 'USD',
+} as CachedDeposit;
+
 declare const global: {
 	wcpaySettings: {
 		zeroDecimalCurrencies: string[];
@@ -58,9 +71,20 @@ describe( 'Deposit overview', () => {
 	} );
 
 	test( 'renders automatic deposit correctly', () => {
-		const { container: overview } = render(
+		const { container: overview, getByText } = render(
 			<DepositOverview deposit={ mockDeposit } />
 		);
+		getByText( /Deposit date:/ );
+		getByText( 'Completed (paid)' );
+		expect( overview ).toMatchSnapshot();
+	} );
+
+	test( 'renders automatic withdrawal correctly', () => {
+		const { container: overview, getByText } = render(
+			<DepositOverview deposit={ mockWithdrawal } />
+		);
+		getByText( /Withdrawal date:/ );
+		getByText( 'Completed (deducted)' );
 		expect( overview ).toMatchSnapshot();
 	} );
 
diff --git a/client/deposits/filters/config.js b/client/deposits/filters/config.js
index c63435bcaca..90d850c7f2f 100644
--- a/client/deposits/filters/config.js
+++ b/client/deposits/filters/config.js
@@ -7,11 +7,20 @@ import { getSetting } from '@woocommerce/settings';
 /**
  * Internal dependencies
  */
-import { displayStatus } from 'deposits/strings';
+import { depositStatusLabels } from 'deposits/strings';
 
-const depositStatusOptions = Object.entries(
-	displayStatus
-).map( ( [ status, label ] ) => ( { label, value: status } ) );
+const depositStatusOptions = Object.entries( depositStatusLabels )
+	// Ignore the 'deducted' status, which is only a display status and not to be used in filters.
+	.filter( ( [ status ] ) => status !== 'deducted' )
+	.map( ( [ status, label ] ) => {
+		if ( status === 'paid' ) {
+			return {
+				label: __( 'Completed', 'woocommerce-payments' ),
+				value: 'paid',
+			};
+		}
+		return { label, value: status };
+	} );
 
 export const filters = [
 	{
diff --git a/client/deposits/filters/test/__snapshots__/index.js.snap b/client/deposits/filters/test/__snapshots__/index.js.snap
index 5f02b248a6c..962eccde043 100644
--- a/client/deposits/filters/test/__snapshots__/index.js.snap
+++ b/client/deposits/filters/test/__snapshots__/index.js.snap
@@ -5,7 +5,7 @@ HTMLOptionsCollection [
   <option
     value="paid"
   >
-    Paid
+    Completed
   </option>,
   <option
     value="pending"
diff --git a/client/deposits/list/index.tsx b/client/deposits/list/index.tsx
index 03789c466e1..7e640e16338 100644
--- a/client/deposits/list/index.tsx
+++ b/client/deposits/list/index.tsx
@@ -3,7 +3,6 @@
 /**
  * External dependencies
  */
-import { DepositsTableHeader } from 'wcpay/types/deposits';
 import React, { useState } from 'react';
 import { recordEvent } from 'tracks';
 import { useMemo } from '@wordpress/element';
@@ -19,13 +18,15 @@ import {
 } from '@woocommerce/csv-export';
 import apiFetch from '@wordpress/api-fetch';
 import { useDispatch } from '@wordpress/data';
+import { parseInt } from 'lodash';
 
 /**
  * Internal dependencies.
  */
+import type { DepositsTableHeader } from 'wcpay/types/deposits';
 import { useDeposits, useDepositsSummary } from 'wcpay/data';
 import { useReportingExportLanguage } from 'data/index';
-import { displayType, displayStatus } from '../strings';
+import { displayType, depositStatusLabels } from '../strings';
 import {
 	formatExplicitCurrency,
 	formatExportAmount,
@@ -47,7 +48,6 @@ import CSVExportModal from 'components/csv-export-modal';
 import { ReportingExportLanguageHook } from 'wcpay/settings/reporting-settings/interfaces';
 
 import './style.scss';
-import { parseInt } from 'lodash';
 
 const getColumns = ( sortByDate?: boolean ): DepositsTableHeader[] => [
 	{
@@ -158,10 +158,8 @@ export const DepositsList = (): JSX.Element => {
 				),
 			},
 			status: {
-				value: displayStatus[ deposit.status ],
-				display: clickable(
-					<DepositStatusChip status={ deposit.status } />
-				),
+				value: depositStatusLabels[ deposit.status ],
+				display: clickable( <DepositStatusChip deposit={ deposit } /> ),
 			},
 			bankAccount: {
 				value: deposit.bankAccount,
diff --git a/client/deposits/list/test/__snapshots__/index.tsx.snap b/client/deposits/list/test/__snapshots__/index.tsx.snap
index 5d6d3d1b96c..71c6293033c 100644
--- a/client/deposits/list/test/__snapshots__/index.tsx.snap
+++ b/client/deposits/list/test/__snapshots__/index.tsx.snap
@@ -384,7 +384,7 @@ exports[`Deposits list renders correctly a single deposit 1`] = `
                       <span
                         class="chip chip-success"
                       >
-                        Paid
+                        Completed (paid)
                       </span>
                     </a>
                   </td>
@@ -488,6 +488,93 @@ exports[`Deposits list renders correctly a single deposit 1`] = `
                     </a>
                   </td>
                 </tr>
+                <tr>
+                  <th
+                    class="woocommerce-table__item info-button is-sorted is-left-aligned"
+                    scope="row"
+                  >
+                    <a
+                      data-link-type="wc-admin"
+                      href="admin.php?page=wc-admin&path=%2Fpayments%2Fdeposits%2Fdetails&id=po_mock3"
+                    >
+                      <svg
+                        class="gridicon gridicons-info-outline needs-offset"
+                        height="18"
+                        viewBox="0 0 24 24"
+                        width="18"
+                        xmlns="http://www.w3.org/2000/svg"
+                      >
+                        <g>
+                          <path
+                            d="M13 9h-2V7h2v2zm0 2h-2v6h2v-6zm-1-7c-4.411 0-8 3.589-8 8s3.589 8 8 8 8-3.589 8-8-3.589-8-8-8m0-2c5.523 0 10 4.477 10 10s-4.477 10-10 10S2 17.523 2 12 6.477 2 12 2z"
+                          />
+                        </g>
+                      </svg>
+                    </a>
+                  </th>
+                  <td
+                    class="woocommerce-table__item date-time is-left-aligned is-sorted"
+                  >
+                    <a
+                      data-link-type="wc-admin"
+                      href="admin.php?page=wc-admin&path=%2Fpayments%2Fdeposits%2Fdetails&id=po_mock3"
+                    >
+                      Jan 4, 2020
+                    </a>
+                  </td>
+                  <td
+                    class="woocommerce-table__item is-left-aligned"
+                  >
+                    <a
+                      class="woocommerce-table__clickable-cell"
+                      data-link-type="wc-admin"
+                      href="admin.php?page=wc-admin&path=%2Fpayments%2Fdeposits%2Fdetails&id=po_mock3"
+                      tabindex="-1"
+                    >
+                      Withdrawal
+                    </a>
+                  </td>
+                  <td
+                    class="woocommerce-table__item is-numeric"
+                  >
+                    <a
+                      class="woocommerce-table__clickable-cell"
+                      data-link-type="wc-admin"
+                      href="admin.php?page=wc-admin&path=%2Fpayments%2Fdeposits%2Fdetails&id=po_mock3"
+                      tabindex="-1"
+                    >
+                      $40.00
+                    </a>
+                  </td>
+                  <td
+                    class="woocommerce-table__item is-left-aligned"
+                  >
+                    <a
+                      class="woocommerce-table__clickable-cell"
+                      data-link-type="wc-admin"
+                      href="admin.php?page=wc-admin&path=%2Fpayments%2Fdeposits%2Fdetails&id=po_mock3"
+                      tabindex="-1"
+                    >
+                      <span
+                        class="chip chip-success"
+                      >
+                        Completed (deducted)
+                      </span>
+                    </a>
+                  </td>
+                  <td
+                    class="woocommerce-table__item is-left-aligned"
+                  >
+                    <a
+                      class="woocommerce-table__clickable-cell"
+                      data-link-type="wc-admin"
+                      href="admin.php?page=wc-admin&path=%2Fpayments%2Fdeposits%2Fdetails&id=po_mock3"
+                      tabindex="-1"
+                    >
+                      MOCK BANK •••• 1234 (USD)
+                    </a>
+                  </td>
+                </tr>
               </tbody>
             </table>
           </div>
@@ -933,7 +1020,7 @@ exports[`Deposits list renders correctly with multiple currencies 1`] = `
                       <span
                         class="chip chip-success"
                       >
-                        Paid
+                        Completed (paid)
                       </span>
                     </a>
                   </td>
@@ -1037,6 +1124,93 @@ exports[`Deposits list renders correctly with multiple currencies 1`] = `
                     </a>
                   </td>
                 </tr>
+                <tr>
+                  <th
+                    class="woocommerce-table__item info-button is-sorted is-left-aligned"
+                    scope="row"
+                  >
+                    <a
+                      data-link-type="wc-admin"
+                      href="admin.php?page=wc-admin&path=%2Fpayments%2Fdeposits%2Fdetails&id=po_mock3"
+                    >
+                      <svg
+                        class="gridicon gridicons-info-outline needs-offset"
+                        height="18"
+                        viewBox="0 0 24 24"
+                        width="18"
+                        xmlns="http://www.w3.org/2000/svg"
+                      >
+                        <g>
+                          <path
+                            d="M13 9h-2V7h2v2zm0 2h-2v6h2v-6zm-1-7c-4.411 0-8 3.589-8 8s3.589 8 8 8 8-3.589 8-8-3.589-8-8-8m0-2c5.523 0 10 4.477 10 10s-4.477 10-10 10S2 17.523 2 12 6.477 2 12 2z"
+                          />
+                        </g>
+                      </svg>
+                    </a>
+                  </th>
+                  <td
+                    class="woocommerce-table__item date-time is-left-aligned is-sorted"
+                  >
+                    <a
+                      data-link-type="wc-admin"
+                      href="admin.php?page=wc-admin&path=%2Fpayments%2Fdeposits%2Fdetails&id=po_mock3"
+                    >
+                      Jan 4, 2020
+                    </a>
+                  </td>
+                  <td
+                    class="woocommerce-table__item is-left-aligned"
+                  >
+                    <a
+                      class="woocommerce-table__clickable-cell"
+                      data-link-type="wc-admin"
+                      href="admin.php?page=wc-admin&path=%2Fpayments%2Fdeposits%2Fdetails&id=po_mock3"
+                      tabindex="-1"
+                    >
+                      Withdrawal
+                    </a>
+                  </td>
+                  <td
+                    class="woocommerce-table__item is-numeric"
+                  >
+                    <a
+                      class="woocommerce-table__clickable-cell"
+                      data-link-type="wc-admin"
+                      href="admin.php?page=wc-admin&path=%2Fpayments%2Fdeposits%2Fdetails&id=po_mock3"
+                      tabindex="-1"
+                    >
+                      $40.00
+                    </a>
+                  </td>
+                  <td
+                    class="woocommerce-table__item is-left-aligned"
+                  >
+                    <a
+                      class="woocommerce-table__clickable-cell"
+                      data-link-type="wc-admin"
+                      href="admin.php?page=wc-admin&path=%2Fpayments%2Fdeposits%2Fdetails&id=po_mock3"
+                      tabindex="-1"
+                    >
+                      <span
+                        class="chip chip-success"
+                      >
+                        Completed (deducted)
+                      </span>
+                    </a>
+                  </td>
+                  <td
+                    class="woocommerce-table__item is-left-aligned"
+                  >
+                    <a
+                      class="woocommerce-table__clickable-cell"
+                      data-link-type="wc-admin"
+                      href="admin.php?page=wc-admin&path=%2Fpayments%2Fdeposits%2Fdetails&id=po_mock3"
+                      tabindex="-1"
+                    >
+                      MOCK BANK •••• 1234 (USD)
+                    </a>
+                  </td>
+                </tr>
               </tbody>
             </table>
           </div>
diff --git a/client/deposits/list/test/index.tsx b/client/deposits/list/test/index.tsx
index 7c6ea8f9d17..322ca965f23 100644
--- a/client/deposits/list/test/index.tsx
+++ b/client/deposits/list/test/index.tsx
@@ -63,6 +63,15 @@ const mockDeposits = [
 		bankAccount: 'MOCK BANK •••• 1234 (USD)',
 		currency: 'USD',
 	} as CachedDeposit,
+	{
+		id: 'po_mock3',
+		date: '2020-01-04 17:46:02',
+		type: 'withdrawal',
+		amount: 4000,
+		status: 'paid',
+		bankAccount: 'MOCK BANK •••• 1234 (USD)',
+		currency: 'USD',
+	} as CachedDeposit,
 ];
 
 declare const global: {
@@ -317,7 +326,9 @@ describe( 'Deposits list', () => {
 					csvFirstDeposit[ 3 ]
 				)
 			).not.toBe( -1 ); // amount
-			expect( csvFirstDeposit[ 4 ] ).toBe( displayFirstDeposit[ 3 ] ); // status
+			expect( csvFirstDeposit[ 4 ] ).toBe(
+				`"${ displayFirstDeposit[ 3 ] }"`
+			); // status
 			expect( csvFirstDeposit[ 5 ] ).toBe(
 				`"${ displayFirstDeposit[ 4 ] }"`
 			); // bank account
diff --git a/client/deposits/strings.ts b/client/deposits/strings.ts
index f4cbfbfb3a6..03a8c55198d 100644
--- a/client/deposits/strings.ts
+++ b/client/deposits/strings.ts
@@ -16,8 +16,17 @@ export const displayType = {
 	withdrawal: __( 'Withdrawal', 'woocommerce-payments' ),
 };
 
-export const displayStatus: Record< DepositStatus, string > = {
-	paid: __( 'Paid', 'woocommerce-payments' ),
+/**
+ * Labels to display for each deposit status.
+ *
+ * 'deducted' represents a deposit of the type 'withdrawal' and status 'paid'.
+ */
+export const depositStatusLabels: Record<
+	DepositStatus | 'deducted',
+	string
+> = {
+	paid: __( 'Completed (paid)', 'woocommerce-payments' ),
+	deducted: __( 'Completed (deducted)', 'woocommerce-payments' ),
 	pending: __( 'Pending', 'woocommerce-payments' ),
 	in_transit: __( 'In transit', 'woocommerce-payments' ),
 	canceled: __( 'Canceled', 'woocommerce-payments' ),
diff --git a/client/transactions/list/index.tsx b/client/transactions/list/index.tsx
index e123d0319f5..7907fd83007 100644
--- a/client/transactions/list/index.tsx
+++ b/client/transactions/list/index.tsx
@@ -42,7 +42,7 @@ import RiskLevel, { calculateRiskMapping } from 'components/risk-level';
 import ClickableCell from 'components/clickable-cell';
 import { getDetailsURL } from 'components/details-link';
 import { displayType } from 'transactions/strings';
-import { displayStatus as displayDepositStatus } from 'deposits/strings';
+import { depositStatusLabels } from 'deposits/strings';
 import {
 	formatStringValue,
 	isExportModalDismissed,
@@ -454,7 +454,7 @@ export const TransactionsList = (
 		);
 
 		const depositStatus = txn.deposit_status
-			? displayDepositStatus[ txn.deposit_status ]
+			? depositStatusLabels[ txn.deposit_status ]
 			: '';
 
 		// Map transaction into table row.
@@ -597,9 +597,7 @@ export const TransactionsList = (
 				'woocommerce-payments'
 		  );
 
-	const title = props.depositId
-		? __( 'Deposit transactions', 'woocommerce-payments' )
-		: __( 'Transactions', 'woocommerce-payments' );
+	const title = __( 'Transactions', 'woocommerce-payments' );
 
 	const downloadable = !! rows.length;
 
diff --git a/client/transactions/list/test/__snapshots__/index.tsx.snap b/client/transactions/list/test/__snapshots__/index.tsx.snap
index e638122bba2..13aebe63c2a 100644
--- a/client/transactions/list/test/__snapshots__/index.tsx.snap
+++ b/client/transactions/list/test/__snapshots__/index.tsx.snap
@@ -2069,7 +2069,7 @@ exports[`Transactions list renders correctly when filtered by deposit 1`] = `
             data-wp-c16t="true"
             data-wp-component="Text"
           >
-            Deposit transactions
+            Transactions
           </h2>
           <div
             class="woocommerce-table__actions"
@@ -2190,7 +2190,7 @@ exports[`Transactions list renders correctly when filtered by deposit 1`] = `
                 class="woocommerce-table__caption screen-reader-text"
                 id="caption-0"
               >
-                Deposit transactions
+                Transactions
               </caption>
               <tbody>
                 <tr>
diff --git a/client/transactions/list/test/index.tsx b/client/transactions/list/test/index.tsx
index 8d97397ce01..19c4652a7de 100644
--- a/client/transactions/list/test/index.tsx
+++ b/client/transactions/list/test/index.tsx
@@ -267,10 +267,11 @@ describe( 'Transactions list', () => {
 			isLoading: false,
 		} );
 
-		const { container } = render(
+		const { container, getByRole } = render(
 			<TransactionsList depositId="po_mock" />
 		);
 		expect( container ).toMatchSnapshot();
+		getByRole( 'heading', { name: 'Transactions' } );
 		expect( mockUseTransactions.mock.calls[ 0 ][ 1 ] ).toBe( 'po_mock' );
 	} );
 

From ed04c3462affd4a0d0ccee53c67ff9fbd30b8e7b Mon Sep 17 00:00:00 2001
From: Daniel Guerra <15204776+danielmx-dev@users.noreply.github.com>
Date: Wed, 6 Nov 2024 20:00:30 +0200
Subject: [PATCH 31/45] Fix: BNPL payment methods should work when available in
 the Pay For Order page (#9670)

---
 changelog/fix-8254-bnpl-pay-for-order         |  4 +
 client/checkout/classic/payment-processing.js | 45 ++++++++-
 client/checkout/utils/test/upe.test.js        | 30 ++++++
 client/checkout/utils/upe.js                  | 12 +++
 includes/class-wc-payments-checkout.php       | 23 ++++-
 .../class-wc-payments-customer-service.php    | 10 ++
 .../class-upe-payment-method.php              | 23 ++++-
 .../test-class-wc-payment-gateway-wcpay.php   | 96 +++++++++++++++++++
 8 files changed, 237 insertions(+), 6 deletions(-)
 create mode 100644 changelog/fix-8254-bnpl-pay-for-order

diff --git a/changelog/fix-8254-bnpl-pay-for-order b/changelog/fix-8254-bnpl-pay-for-order
new file mode 100644
index 00000000000..77c05e9e0b1
--- /dev/null
+++ b/changelog/fix-8254-bnpl-pay-for-order
@@ -0,0 +1,4 @@
+Significance: minor
+Type: fix
+
+BNPL methods now work properly in Pay for Order when they are available. Default values are also provided when available.
diff --git a/client/checkout/classic/payment-processing.js b/client/checkout/classic/payment-processing.js
index 514f5364ffb..839e53a2ca7 100644
--- a/client/checkout/classic/payment-processing.js
+++ b/client/checkout/classic/payment-processing.js
@@ -121,6 +121,41 @@ function submitForm( jQueryForm ) {
 	jQueryForm.removeClass( 'processing' ).submit();
 }
 
+/**
+ * Validates the contents of the address fields based on the requirements from BNPL payment methods.
+ *
+ * @param {Object} params The parameters to be sent to `createPaymentMethod`.
+ * @param {string} paymentMethodType The type of Stripe payment method to create.
+ * @return {boolean} True, if there are missing address fields. False, if the validation passes or is not applicable.
+ */
+function isMissingRequiredAddressFieldsForBNPL( params, paymentMethodType ) {
+	if ( [ 'afterpay_clearpay', 'affirm' ].includes( paymentMethodType ) ) {
+		return false;
+	}
+	const address = params?.billing_details?.address;
+
+	if ( ! address ) {
+		return false;
+	}
+
+	const requiredAddressFields =
+		paymentMethodType === 'affirm'
+			? [ 'line1', 'state', 'city', 'postal_code', 'country' ] // Line2 is not required.
+			: [ 'line1', 'postal_code', 'country' ]; // City and State are not required in Afterpay.
+
+	for ( const field of requiredAddressFields ) {
+		if (
+			address[ field ] === '' ||
+			address[ field ] === null ||
+			typeof address[ field ] === 'undefined'
+		) {
+			return true;
+		}
+	}
+
+	return false;
+}
+
 /**
  * Creates a Stripe payment method by calling the Stripe API's createPaymentMethod with the provided elements
  * and billing details. The billing details are obtained from various form elements on the page.
@@ -144,7 +179,7 @@ function createStripePaymentMethod(
 			billing_details: {
 				name: wcpayCustomerData.name || undefined,
 				email: wcpayCustomerData.email,
-				address: {
+				address: wcpayCustomerData.address || {
 					country: wcpayCustomerData.billing_country,
 				},
 			},
@@ -192,6 +227,14 @@ function createStripePaymentMethod(
 		};
 	}
 
+	if (
+		getUPEConfig( 'isOrderPay' ) &&
+		isMissingRequiredAddressFieldsForBNPL( params, paymentMethodType )
+	) {
+		// These payment methods don't accept an address object with partial information, so we just remove the object entirely.
+		delete params.billing_details.address;
+	}
+
 	return api
 		.getStripeForUPE( paymentMethodType )
 		.createPaymentMethod( { elements, params: params } );
diff --git a/client/checkout/utils/test/upe.test.js b/client/checkout/utils/test/upe.test.js
index 3b868dc0d49..c846f832d87 100644
--- a/client/checkout/utils/test/upe.test.js
+++ b/client/checkout/utils/test/upe.test.js
@@ -284,6 +284,8 @@ describe( 'UPE checkout utils', () => {
 			if ( checkboxElement ) {
 				checkboxElement.remove();
 			}
+
+			delete window.wcpayCustomerData;
 		} );
 
 		it( 'should not provide terms when cart does not contain subscriptions and the saving checkbox is unchecked', () => {
@@ -355,6 +357,34 @@ describe( 'UPE checkout utils', () => {
 			expect( upeSettings.terms.card ).toEqual( 'always' );
 		} );
 
+		it( 'should define defaultValues when wcpayCustomerData is present', () => {
+			window.wcpayCustomerData = {
+				name: 'Test Person',
+				email: 'test@example.com',
+				billing_country: 'US',
+			};
+
+			const upeSettings = getUpeSettings();
+
+			expect( upeSettings.defaultValues ).toEqual( {
+				billingDetails: {
+					name: 'Test Person',
+					email: 'test@example.com',
+					address: {
+						country: 'US',
+					},
+				},
+			} );
+		} );
+
+		it( 'should not define defaultValues if wcpayCustomerData is not present', () => {
+			window.wcpayCustomerData = null;
+
+			const upeSettings = getUpeSettings();
+
+			expect( upeSettings.defaultValues ).toBeUndefined();
+		} );
+
 		function createCheckboxElementWhich( isChecked ) {
 			// Create the checkbox element
 			const checkboxElement = document.createElement( 'input' );
diff --git a/client/checkout/utils/upe.js b/client/checkout/utils/upe.js
index ba4dd5a11f5..504f3495f07 100644
--- a/client/checkout/utils/upe.js
+++ b/client/checkout/utils/upe.js
@@ -119,6 +119,18 @@ export const getUpeSettings = () => {
 		};
 	}
 
+	if ( window.wcpayCustomerData ) {
+		upeSettings.defaultValues = {
+			billingDetails: {
+				name: window.wcpayCustomerData.name,
+				email: window.wcpayCustomerData.email,
+				address: {
+					country: window.wcpayCustomerData.billing_country,
+				},
+			},
+		};
+	}
+
 	return upeSettings;
 };
 
diff --git a/includes/class-wc-payments-checkout.php b/includes/class-wc-payments-checkout.php
index 0b1cc59d9cf..214d3178bb8 100644
--- a/includes/class-wc-payments-checkout.php
+++ b/includes/class-wc-payments-checkout.php
@@ -376,16 +376,35 @@ public function payment_fields() {
 			if ( ! wp_script_is( 'wcpay-upe-checkout', 'enqueued' ) ) {
 				$payment_fields = $this->get_payment_fields_js_config();
 				wp_enqueue_script( 'wcpay-upe-checkout' );
+				/**
+				 * We can't localize the script right away since at this point is not registered yet.
+				 * We also need to make sure it that it only runs once (using a dummy action), even if
+				 * there are multiple payment methods available; otherwise the data will be overwritten
+				 * which is pointless.
+				 *
+				 * The same applies for `wcpayCustomerData` a few lines below.
+				 */
 				add_action(
 					'wp_footer',
 					function () use ( $payment_fields ) {
-						wp_localize_script( 'wcpay-upe-checkout', 'wcpay_upe_config', $payment_fields );
+						if ( ! did_action( '__wcpay_upe_config_localized' ) ) {
+							wp_localize_script( 'wcpay-upe-checkout', 'wcpay_upe_config', $payment_fields );
+						}
+						do_action( '__wcpay_upe_config_localized' );
 					}
 				);
 
 				$prepared_customer_data = $this->customer_service->get_prepared_customer_data();
 				if ( ! empty( $prepared_customer_data ) ) {
-					wp_localize_script( 'wcpay-upe-checkout', 'wcpayCustomerData', $prepared_customer_data );
+					add_action(
+						'wp_footer',
+						function () use ( $prepared_customer_data ) {
+							if ( ! did_action( '__wcpay_customer_data_localized' ) ) {
+								wp_localize_script( 'wcpay-upe-checkout', 'wcpayCustomerData', $prepared_customer_data );
+							}
+							do_action( '__wcpay_customer_data_localized' );
+						}
+					);
 				}
 
 				WC_Payments_Utils::enqueue_style(
diff --git a/includes/class-wc-payments-customer-service.php b/includes/class-wc-payments-customer-service.php
index e55d0b206c1..42d209fd3fd 100644
--- a/includes/class-wc-payments-customer-service.php
+++ b/includes/class-wc-payments-customer-service.php
@@ -531,6 +531,7 @@ public function get_prepared_customer_data() {
 		$firstname       = '';
 		$lastname        = '';
 		$billing_country = '';
+		$address         = null;
 
 		if ( isset( $_GET['pay_for_order'] ) && 'true' === $_GET['pay_for_order'] ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended
 			$order_id = absint( $wp->query_vars['order-pay'] );
@@ -541,6 +542,14 @@ public function get_prepared_customer_data() {
 				$lastname        = $order->get_billing_last_name();
 				$user_email      = $order->get_billing_email();
 				$billing_country = $order->get_billing_country();
+				$address         = [
+					'city'        => $order->get_billing_city(),
+					'country'     => $order->get_billing_country(),
+					'line1'       => $order->get_billing_address_1(),
+					'line2'       => $order->get_billing_address_2(),
+					'postal_code' => $order->get_billing_postcode(),
+					'state'       => $order->get_billing_state(),
+				];
 			}
 		}
 
@@ -560,6 +569,7 @@ public function get_prepared_customer_data() {
 			'name'            => $firstname . ' ' . $lastname,
 			'email'           => $user_email,
 			'billing_country' => $billing_country,
+			'address'         => $address,
 		];
 	}
 }
diff --git a/includes/payment-methods/class-upe-payment-method.php b/includes/payment-methods/class-upe-payment-method.php
index eaaad1bfbad..93bf0797088 100644
--- a/includes/payment-methods/class-upe-payment-method.php
+++ b/includes/payment-methods/class-upe-payment-method.php
@@ -171,11 +171,28 @@ public function is_enabled_at_checkout( string $account_country ) {
 
 		// This part ensures that when payment limits for the currency declared, those will be respected (e.g. BNPLs).
 		if ( [] !== $this->limits_per_currency ) {
+			$order = null;
+			if ( is_wc_endpoint_url( 'order-pay' ) ) {
+				$order = wc_get_order( absint( get_query_var( 'order-pay' ) ) );
+				$order = is_a( $order, 'WC_Order' ) ? $order : null;
+			}
+
 			$currency = get_woocommerce_currency();
+			if ( $order ) {
+				$currency = $order->get_currency();
+			}
+
 			// If the currency limits are not defined, we allow the PM for now (gateway has similar validation for limits).
-			// Additionally, we don't engage with limits verification in no-checkout context (cart is not available or empty).
-			if ( isset( $this->limits_per_currency[ $currency ], WC()->cart ) ) {
-				$amount = WC_Payments_Utils::prepare_amount( WC()->cart->get_total( '' ), $currency );
+			$total = null;
+			if ( $order ) {
+				$total = $order->get_total();
+			} elseif ( isset( WC()->cart ) ) {
+				$total = WC()->cart->get_total( '' );
+			}
+
+			if ( isset( $this->limits_per_currency[ $currency ], WC()->cart ) && ! empty( $total ) ) {
+				$amount = WC_Payments_Utils::prepare_amount( $total, $currency );
+
 				if ( $amount > 0 ) {
 					$range = null;
 					if ( isset( $this->limits_per_currency[ $currency ][ $account_country ] ) ) {
diff --git a/tests/unit/test-class-wc-payment-gateway-wcpay.php b/tests/unit/test-class-wc-payment-gateway-wcpay.php
index b638c07e6dd..bb90e4f4460 100644
--- a/tests/unit/test-class-wc-payment-gateway-wcpay.php
+++ b/tests/unit/test-class-wc-payment-gateway-wcpay.php
@@ -197,6 +197,21 @@ class WC_Payment_Gateway_WCPay_Test extends WCPAY_UnitTestCase {
 	 */
 	private $locale_backup;
 
+
+	/**
+	 * Backup of $wp->query_vars
+	 *
+	 * @var array
+	 */
+	private $wp_query_vars_backup;
+
+	/**
+	 * Backup of $wp_query->query_vars
+	 *
+	 * @var array
+	 */
+	private $wp_query_query_vars_backup;
+
 	/**
 	 * Pre-test setup
 	 */
@@ -281,6 +296,11 @@ public function set_up() {
 		wcpay_get_test_container()->replace( OrderService::class, $mock_order_service );
 
 		$this->locale_backup = WC()->countries->get_country_locale();
+
+		global $wp;
+		global $wp_query;
+		$this->wp_query_vars_backup       = $wp->query_vars;
+		$this->wp_query_query_vars_backup = $wp_query->query_vars;
 	}
 
 	/**
@@ -318,6 +338,11 @@ public function tear_down() {
 		wcpay_get_test_container()->reset_all_replacements();
 		WC()->session->set( 'wc_notices', [] );
 		WC()->countries->locale = $this->locale_backup;
+
+		global $wp;
+		global $wp_query;
+		$wp->query_vars       = $this->wp_query_vars_backup;
+		$wp_query->query_vars = $this->wp_query_query_vars_backup;
 	}
 
 	public function test_process_redirect_payment_intent_processing() {
@@ -706,6 +731,77 @@ function ( $order ) {
 		$this->assertFalse( $afterpay_method->is_enabled_at_checkout( 'US' ) );
 	}
 
+	public function test_payment_methods_enabled_based_on_currency_limits() {
+		WC_Helper_Site_Currency::$mock_site_currency = 'USD';
+
+		WC()->session->init();
+		WC()->cart->empty_cart();
+		// Total is 100 USD, which is above both payment methods (Affirm and AfterPay) minimums.
+		WC()->cart->add_to_cart( WC_Helper_Product::create_simple_product()->get_id(), 10 );
+		WC()->cart->calculate_totals();
+
+		$affirm_method   = $this->payment_methods['affirm'];
+		$afterpay_method = $this->payment_methods['afterpay_clearpay'];
+
+		$this->assertTrue( $affirm_method->is_enabled_at_checkout( 'US' ) );
+		$this->assertTrue( $afterpay_method->is_enabled_at_checkout( 'US' ) );
+	}
+
+	public function test_payment_methods_disabled_based_on_currency_limits() {
+		WC_Helper_Site_Currency::$mock_site_currency = 'USD';
+
+		WC()->session->init();
+		WC()->cart->empty_cart();
+		// Total is 40 USD, which is below Affirm minimum.
+		WC()->cart->add_to_cart( WC_Helper_Product::create_simple_product()->get_id(), 4 );
+		WC()->cart->calculate_totals();
+
+		$affirm_method   = $this->payment_methods['affirm'];
+		$afterpay_method = $this->payment_methods['afterpay_clearpay'];
+
+		$this->assertFalse( $affirm_method->is_enabled_at_checkout( 'US' ) );
+		$this->assertTrue( $afterpay_method->is_enabled_at_checkout( 'US' ) );
+	}
+
+	public function test_payment_methods_enabled_based_on_currency_limits_in_order_pay() {
+		global $wp;
+		global $wp_query;
+
+		WC_Helper_Site_Currency::$mock_site_currency = 'USD';
+
+		// Total is 100 USD, which is above both payment methods (Affirm and AfterPay) minimums.
+		$order                = WC_Helper_Order::create_order( 1, 100 );
+		$order_id             = $order->get_id();
+		$wp->query_vars       = [ 'order-pay' => strval( $order_id ) ];
+		$wp_query->query_vars = [ 'order-pay' => strval( $order_id ) ];
+
+		$affirm_method   = $this->payment_methods['affirm'];
+		$afterpay_method = $this->payment_methods['afterpay_clearpay'];
+
+		$this->assertTrue( $affirm_method->is_enabled_at_checkout( 'US' ) );
+		$this->assertTrue( $afterpay_method->is_enabled_at_checkout( 'US' ) );
+	}
+
+	public function test_payment_methods_disabled_based_on_currency_limits_in_order_pay() {
+		global $wp;
+		global $wp_query;
+
+		WC_Helper_Site_Currency::$mock_site_currency = 'USD';
+
+		// Total is 40 USD, which is below Affirm minimum.
+		$order                = WC_Helper_Order::create_order( 1, 40 );
+		$order_id             = $order->get_id();
+		$wp->query_vars       = [ 'order-pay' => strval( $order_id ) ];
+		$wp_query->query_vars = [ 'order-pay' => strval( $order_id ) ];
+		$order->set_currency( 'USD' );
+
+		$affirm_method   = $this->payment_methods['affirm'];
+		$afterpay_method = $this->payment_methods['afterpay_clearpay'];
+
+		$this->assertFalse( $affirm_method->is_enabled_at_checkout( 'US' ) );
+		$this->assertTrue( $afterpay_method->is_enabled_at_checkout( 'US' ) );
+	}
+
 	public function test_only_valid_payment_methods_returned_for_currency() {
 		$card_method       = $this->payment_methods['card'];
 		$giropay_method    = $this->payment_methods['giropay'];

From 636e1f0312d5b471c285f82451dba6b51360420d Mon Sep 17 00:00:00 2001
From: Francesco <frosso@users.noreply.github.com>
Date: Thu, 7 Nov 2024 14:52:04 +0100
Subject: [PATCH 32/45] update: payment method test mode label behavior (#9647)

---
 .../update-payment-method-test-mode-label     |   4 +
 client/checkout/blocks/index.js               |   5 +-
 .../checkout/blocks/payment-method-label.js   | 109 +++++++++-----
 client/checkout/blocks/style.scss             |  32 ++--
 client/checkout/classic/event-handlers.js     |  66 ++++-----
 client/checkout/classic/style.scss            | 139 +++++++++---------
 includes/class-wc-payment-gateway-wcpay.php   |  26 +++-
 ...lass-wc-payments-blocks-payment-method.php |   2 +-
 includes/class-wc-payments-checkout.php       |  41 +++---
 .../shopper/klarna-checkout-purchase.spec.ts  |   1 +
 .../shopper/shopper-bnpls-checkout.spec.js    |  18 +--
 11 files changed, 246 insertions(+), 197 deletions(-)
 create mode 100644 changelog/update-payment-method-test-mode-label

diff --git a/changelog/update-payment-method-test-mode-label b/changelog/update-payment-method-test-mode-label
new file mode 100644
index 00000000000..1c3874ebf5f
--- /dev/null
+++ b/changelog/update-payment-method-test-mode-label
@@ -0,0 +1,4 @@
+Significance: patch
+Type: update
+
+update: payment method "test mode" label at checkout to be displayed only when payment method is selected
diff --git a/client/checkout/blocks/index.js b/client/checkout/blocks/index.js
index 924afccde1f..68593bababd 100644
--- a/client/checkout/blocks/index.js
+++ b/client/checkout/blocks/index.js
@@ -110,7 +110,10 @@ Object.entries( enabledPaymentMethodsConfig )
 			label: (
 				<PaymentMethodLabel
 					api={ api }
-					upeConfig={ upeConfig }
+					title={ upeConfig.title }
+					countries={ upeConfig.countries }
+					iconLight={ upeConfig.icon }
+					iconDark={ upeConfig.darkIcon }
 					upeName={ upeName }
 					upeAppearanceTheme={ upeAppearanceTheme }
 				/>
diff --git a/client/checkout/blocks/payment-method-label.js b/client/checkout/blocks/payment-method-label.js
index 417007816aa..b329a165658 100644
--- a/client/checkout/blocks/payment-method-label.js
+++ b/client/checkout/blocks/payment-method-label.js
@@ -12,9 +12,50 @@ import './style.scss';
 import { useEffect, useState } from '@wordpress/element';
 import { getAppearance } from 'wcpay/checkout/upe-styles';
 
-export default ( { api, upeConfig, upeName, upeAppearanceTheme } ) => {
+const bnplMethods = [ 'affirm', 'afterpay_clearpay', 'klarna' ];
+const PaymentMethodMessageWrapper = ( {
+	upeName,
+	countries,
+	currentCountry,
+	amount,
+	appearance,
+	children,
+} ) => {
+	if ( ! bnplMethods.includes( upeName ) ) {
+		return null;
+	}
+
+	if ( amount <= 0 ) {
+		return null;
+	}
+
+	if ( ! currentCountry ) {
+		return null;
+	}
+
+	if ( ! appearance ) {
+		return null;
+	}
+
+	if ( countries.length !== 0 && ! countries.includes( currentCountry ) ) {
+		return null;
+	}
+
+	return (
+		<div className="payment-method-label__pmme-container">{ children }</div>
+	);
+};
+
+export default ( {
+	api,
+	title,
+	countries,
+	iconLight,
+	iconDark,
+	upeName,
+	upeAppearanceTheme,
+} ) => {
 	const cartData = wp.data.select( 'wc/store/cart' ).getCartData();
-	const bnplMethods = [ 'affirm', 'afterpay_clearpay', 'klarna' ];
 	const isTestMode = getUPEConfig( 'testMode' );
 	const [ appearance, setAppearance ] = useState(
 		getUPEConfig( 'wcBlocksUPEAppearance' )
@@ -35,8 +76,6 @@ export default ( { api, upeConfig, upeName, upeAppearanceTheme } ) => {
 		window.wcBlocksCheckoutData?.storeCountry ||
 		'US';
 
-	const isCreditCard = upeName === 'card';
-
 	useEffect( () => {
 		async function generateUPEAppearance() {
 			// Generate UPE input styles.
@@ -56,10 +95,8 @@ export default ( { api, upeConfig, upeName, upeAppearanceTheme } ) => {
 	return (
 		<>
 			<div className="payment-method-label">
-				<span className="payment-method-label__label">
-					{ upeConfig.title }
-				</span>
-				{ isCreditCard && isTestMode && (
+				<span className="payment-method-label__label">{ title }</span>
+				{ isTestMode && (
 					<span className="test-mode badge">
 						{ __( 'Test Mode', 'woocommerce-payments' ) }
 					</span>
@@ -67,39 +104,35 @@ export default ( { api, upeConfig, upeName, upeAppearanceTheme } ) => {
 				<img
 					className="payment-methods--logos"
 					src={
-						upeAppearanceTheme === 'night'
-							? upeConfig.darkIcon
-							: upeConfig.icon
+						upeAppearanceTheme === 'night' ? iconDark : iconLight
 					}
-					alt={ upeConfig.title }
+					alt={ title }
 				/>
 			</div>
-			{ bnplMethods.includes( upeName ) &&
-				( upeConfig.countries.length === 0 ||
-					upeConfig.countries.includes( currentCountry ) ) &&
-				amount > 0 &&
-				currentCountry &&
-				appearance && (
-					<div className="bnpl-message">
-						<Elements
-							stripe={ api.getStripeForUPE( upeName ) }
-							options={ {
-								appearance: appearance,
-							} }
-						>
-							<PaymentMethodMessagingElement
-								options={ {
-									amount: amount || 0,
-									currency:
-										cartData.totals.currency_code || 'USD',
-									paymentMethodTypes: [ upeName ],
-									countryCode: currentCountry,
-									displayType: 'promotional_text',
-								} }
-							/>
-						</Elements>
-					</div>
-				) }
+			<PaymentMethodMessageWrapper
+				upeName={ upeName }
+				countries={ countries }
+				amount={ amount }
+				currentCountry={ currentCountry }
+				appearance={ appearance }
+			>
+				<Elements
+					stripe={ api.getStripeForUPE( upeName ) }
+					options={ {
+						appearance: appearance,
+					} }
+				>
+					<PaymentMethodMessagingElement
+						options={ {
+							amount: amount || 0,
+							currency: cartData.totals.currency_code || 'USD',
+							paymentMethodTypes: [ upeName ],
+							countryCode: currentCountry,
+							displayType: 'promotional_text',
+						} }
+					/>
+				</Elements>
+			</PaymentMethodMessageWrapper>
 		</>
 	);
 };
diff --git a/client/checkout/blocks/style.scss b/client/checkout/blocks/style.scss
index b43b7217d9f..a6aa37953b3 100644
--- a/client/checkout/blocks/style.scss
+++ b/client/checkout/blocks/style.scss
@@ -43,6 +43,21 @@ button.wcpay-stripelink-modal-trigger:hover {
 }
 
 .wc-block-checkout__payment-method {
+	input:checked ~ div {
+		.wc-block-components-radio-control__label {
+			> .payment-method-label {
+				.test-mode.badge {
+					// hiding the badge when the payment method is not selected
+					display: inline-block;
+				}
+
+				&__pmme-container {
+					display: none;
+				}
+			}
+		}
+	}
+
 	.wc-block-components-radio-control__label {
 		width: 100%;
 		display: block !important;
@@ -77,6 +92,7 @@ button.wcpay-stripelink-modal-trigger:hover {
 				color: #4d3716;
 				justify-self: start;
 				width: max-content;
+				display: none;
 			}
 
 			@include breakpoint( '<480px' ) {
@@ -88,13 +104,14 @@ button.wcpay-stripelink-modal-trigger:hover {
 					justify-self: end;
 				}
 			}
-		}
 
-		.bnpl-message {
-			width: 100%;
+			&__pmme-container {
+				width: 100%;
+				pointer-events: none;
 
-			@include breakpoint( '<480px' ) {
-				margin-top: 8px;
+				@include breakpoint( '<480px' ) {
+					margin-top: 8px;
+				}
 			}
 		}
 	}
@@ -112,11 +129,6 @@ button.wcpay-stripelink-modal-trigger:hover {
 }
 
 #payment-method {
-	label.wc-block-components-radio-control__option-checked {
-		.StripeElement {
-			display: none;
-		}
-	}
 	/* stylelint-disable-next-line selector-id-pattern */
 	#radio-control-wc-payment-method-options-woocommerce_payments_affirm__label
 		img {
diff --git a/client/checkout/classic/event-handlers.js b/client/checkout/classic/event-handlers.js
index 6e4b8fb43fe..714142cae62 100644
--- a/client/checkout/classic/event-handlers.js
+++ b/client/checkout/classic/event-handlers.js
@@ -159,55 +159,43 @@ jQuery( function ( $ ) {
 
 	async function injectStripePMMEContainers() {
 		const bnplMethods = [ 'affirm', 'afterpay_clearpay', 'klarna' ];
-		const labelBase = 'payment_method_woocommerce_payments_';
 		const paymentMethods = getUPEConfig( 'paymentMethodsConfig' );
 		const paymentMethodsKeys = Object.keys( paymentMethods );
 		const cartData = await api.pmmeGetCartData();
 
 		for ( const method of paymentMethodsKeys ) {
 			if ( bnplMethods.includes( method ) ) {
-				const targetLabel = document.querySelector(
-					`label[for="${ labelBase }${ method }"]`
-				);
 				const containerID = `stripe-pmme-container-${ method }`;
+				const container = document.getElementById( containerID );
 
-				if ( document.getElementById( containerID ) ) {
-					document.getElementById( containerID ).innerHTML = '';
+				if ( ! container ) {
+					continue;
 				}
 
-				if ( targetLabel ) {
-					let container = document.getElementById( containerID );
-					if ( ! container ) {
-						container = document.createElement( 'span' );
-						container.id = containerID;
-						container.dataset.paymentMethodType = method;
-						container.classList.add( 'stripe-pmme-container' );
-						targetLabel.appendChild( container );
-					}
-
-					const currentCountry =
-						cartData?.billing_address?.country ||
-						getUPEConfig( 'storeCountry' );
-
-					if (
-						paymentMethods[ method ]?.countries.length === 0 ||
-						paymentMethods[ method ]?.countries?.includes(
-							currentCountry
-						)
-					) {
-						await mountStripePaymentMethodMessagingElement(
-							api,
-							container,
-							{
-								amount: cartData?.totals?.total_price,
-								currency: cartData?.totals?.currency_code,
-								decimalPlaces:
-									cartData?.totals?.currency_minor_unit,
-								country: currentCountry,
-							},
-							'shortcode_checkout'
-						);
-					}
+				container.innerHTML = '';
+				container.dataset.paymentMethodType = method;
+
+				const currentCountry =
+					cartData?.billing_address?.country ||
+					getUPEConfig( 'storeCountry' );
+				if (
+					paymentMethods[ method ]?.countries.length === 0 ||
+					paymentMethods[ method ]?.countries?.includes(
+						currentCountry
+					)
+				) {
+					await mountStripePaymentMethodMessagingElement(
+						api,
+						container,
+						{
+							amount: cartData?.totals?.total_price,
+							currency: cartData?.totals?.currency_code,
+							decimalPlaces:
+								cartData?.totals?.currency_minor_unit,
+							country: currentCountry,
+						},
+						'shortcode_checkout'
+					);
 				}
 			}
 		}
diff --git a/client/checkout/classic/style.scss b/client/checkout/classic/style.scss
index 5b452accc83..36a3d29bd94 100644
--- a/client/checkout/classic/style.scss
+++ b/client/checkout/classic/style.scss
@@ -30,6 +30,11 @@
 	border: none;
 }
 
+.woopayments-rich-payment-method-label {
+	// this will be displayed only on specific scenarios. Otherwise, the "legacy" label will be displayed.
+	display: none;
+}
+
 #payment .payment_methods {
 	li[class*='payment_method_woocommerce_payments'] > label > img {
 		float: right;
@@ -41,32 +46,68 @@
 
 	&.wc_payment_methods,
 	&.woocommerce-PaymentMethods {
-		li.payment_method_woocommerce_payments {
+		li[class*='payment_method_woocommerce_payments'] {
 			display: grid;
 			grid-template-columns: 0fr 0fr 1fr;
 			grid-template-rows: max-content;
 
+			.woopayments-plain-payment-method-label {
+				display: none;
+			}
+
 			> input[name='payment_method'] {
-				align-self: center;
+				&:checked ~ label {
+					.payment-method-title {
+						margin-right: 8px; // 8px gap between .payment-method-title and .test-mode.badge
+					}
+
+					.test-mode.badge {
+						display: inline-block; // hiding the badge when the payment method is not selected
+					}
+
+					.stripe-pmme-container {
+						display: none;
+					}
+				}
 			}
+
 			> label {
 				grid-column: 3;
+				margin-bottom: 0;
+			}
+
+			> div.payment_box {
+				grid-area: 2 / 1 / 3 / 4;
+			}
+
+			> label:has( .woopayments-rich-payment-method-label ) {
+				display: inline-flex;
+				align-items: center;
+				width: 100%;
+
+				> img {
+					display: none; // we'll display the image inside `.woopayments-rich-payment-method-label`, instead.
+				}
+			}
+
+			.woopayments-rich-payment-method-label {
 				display: grid;
-				grid-template-columns: 0fr auto;
-				grid-template-rows: max-content;
-				grid-gap: 0;
+				grid-template-columns: 1fr auto;
+				align-items: center;
 				margin-bottom: 0;
+				flex-grow: 1;
 
-				> .label-title-container {
-					grid-area: 1 / 2 / 2 / 3;
+				.label-title-container {
+					display: block;
 				}
 
 				.payment-method-title {
-					margin-right: 8px;
+					white-space: normal; // Allows wrapping if text is too long
+					vertical-align: middle;
 				}
 
 				.test-mode.badge {
-					display: inline-block;
+					display: none;
 					background-color: #fff2d7;
 					border-radius: 4px;
 					padding: 4px 6px;
@@ -75,73 +116,31 @@
 					line-height: 16px;
 					color: #4d3716;
 					vertical-align: middle;
+					white-space: nowrap; // Prevents the badge text from wrapping
 				}
 
 				img {
-					float: none;
-					grid-area: 1 / 4 / 2 / 5;
-					align-self: baseline;
+					border: 0;
+					padding: 0;
+					height: 24px !important;
+					max-height: 24px !important;
 					justify-self: end;
-					margin-left: 1em;
+					margin: 3px 0; // ensuring the images don't appear squished when all the payment methods are rendered next to each others, like in Elementor.
+					align-self: center;
 				}
-			}
-			> div.payment_box {
-				grid-area: 2 / 1 / 3 / 4;
-			}
-		}
-	}
-}
-
-li.wc_payment_method:has( .input-radio:not( :checked )
-		+ label
-		.stripe-pmme-container ) {
-	display: grid;
-	grid-template-columns: min-content 1fr;
-	grid-template-rows: auto auto;
-	align-items: baseline;
-
-	.input-radio {
-		grid-row: 1;
-		grid-column: 1;
-	}
-
-	label {
-		grid-column: 2;
-		grid-row: 1;
-	}
-
-	img {
-		grid-row: 1 / span 2;
-		align-self: center;
-	}
 
-	.stripe-pmme-container {
-		width: 100%;
-		grid-column: 1;
-		grid-row-start: 2;
-		pointer-events: none;
-	}
-
-	.payment_box {
-		flex: 0 0 100%;
-		grid-row: 2;
-		grid-column: 1 / span 2;
-	}
-}
-
-li.wc_payment_method:has( .input-radio:checked
-		+ label
-		.stripe-pmme-container ) {
-	display: block;
-
-	.input-radio:checked {
-		+ label {
-			.stripe-pmme-container {
-				display: none;
-			}
-
-			img {
-				grid-column: 2;
+				.stripe-pmme-container {
+					&:empty {
+						display: none; // hides container if empty, without affecting alignment
+					}
+
+					margin-left: 0.25em; // WooCommerce Core will add a &nbsp; on the left of the payment method's label - this spacing ensures that at least it's consistently aligned.
+					pointer-events: none;
+					grid-column: 1 / 2;
+					grid-row: 2 / 3;
+					align-self: start;
+					width: 100%;
+				}
 			}
 		}
 	}
diff --git a/includes/class-wc-payment-gateway-wcpay.php b/includes/class-wc-payment-gateway-wcpay.php
index 2a50957df4d..f4b87f36354 100644
--- a/includes/class-wc-payment-gateway-wcpay.php
+++ b/includes/class-wc-payment-gateway-wcpay.php
@@ -581,16 +581,32 @@ public function get_title() {
 		$title = parent::get_title();
 
 		if (
-			Payment_Method::CARD === $this->stripe_id &&
 			( is_checkout() || is_add_payment_method_page() ) &&
 			! isset( $_GET['change_payment_method'] )  // phpcs:ignore WordPress.Security.NonceVerification
 		) {
+			$test_mode_badge = '';
 			if ( WC_Payments::mode()->is_test() ) {
 				$test_mode_badge = '<span class="test-mode badge">' . __( 'Test Mode', 'woocommerce-payments' ) . '</span>';
-			} else {
-				$test_mode_badge = '';
 			}
-			return '<div class="label-title-container"><span class="payment-method-title">&nbsp;' . $title . '</span>' . $test_mode_badge . '</div>';
+
+			$bnpl_messaging_container = '';
+			if ( $this->payment_method->is_bnpl() ) {
+				$bnpl_messaging_container = '<span id="stripe-pmme-container-' . $this->payment_method->get_id() . '" class="stripe-pmme-container"></span>';
+			}
+
+			// the "plain" payment method label is displayed on some sections of the app
+			// - like "pay for order" when a payment method is pre-selected or a payment has previously failed.
+			$html  = '<span class="woopayments-plain-payment-method-label">' . $title . '</span>';
+			$html .= '<div class="woopayments-rich-payment-method-label">';
+			$html .= '<div class="label-title-container">';
+			$html .= '<span class="payment-method-title">&nbsp;' . $title . '</span>';
+			$html .= $test_mode_badge;
+			$html .= '</div>';
+			$html .= $this->get_icon();
+			$html .= $bnpl_messaging_container;
+			$html .= '</div>';
+
+			return $html;
 		}
 
 		return $title;
@@ -3236,7 +3252,7 @@ public function update_fraud_rules_based_on_general_options() {
 	 * @return string
 	 */
 	public function get_icon() {
-		return '<img src="' . esc_url( WC_HTTPS::force_https_url( $this->get_icon_url() ) ) . '" alt="' . esc_attr( $this->payment_method->get_title() ) . ' payment method logo" />';
+		return '<img src="' . esc_url( WC_HTTPS::force_https_url( $this->get_theme_icon() ) ) . '" alt="' . esc_attr( $this->payment_method->get_title() ) . ' payment method logo" />';
 	}
 
 	/**
diff --git a/includes/class-wc-payments-blocks-payment-method.php b/includes/class-wc-payments-blocks-payment-method.php
index 607bb3cafb0..877d4bf4270 100644
--- a/includes/class-wc-payments-blocks-payment-method.php
+++ b/includes/class-wc-payments-blocks-payment-method.php
@@ -58,7 +58,7 @@ public function get_payment_method_script_handles() {
 				'wc-blocks-checkout-style',
 				plugins_url( 'dist/blocks-checkout.css', WCPAY_PLUGIN_FILE ),
 				[],
-				'1.0',
+				WC_Payments::get_file_version( 'dist/checkout.css' ),
 				'all'
 			);
 		}
diff --git a/includes/class-wc-payments-checkout.php b/includes/class-wc-payments-checkout.php
index 214d3178bb8..c4593f54b7e 100644
--- a/includes/class-wc-payments-checkout.php
+++ b/includes/class-wc-payments-checkout.php
@@ -134,9 +134,7 @@ public function register_scripts() {
 
 		Fraud_Prevention_Service::maybe_append_fraud_prevention_token();
 
-		$script = 'dist/checkout';
-
-		WC_Payments::register_script_with_dependencies( 'wcpay-upe-checkout', $script, $script_dependencies );
+		WC_Payments::register_script_with_dependencies( 'wcpay-upe-checkout', 'dist/checkout', $script_dependencies );
 	}
 
 	/**
@@ -417,32 +415,29 @@ function () use ( $prepared_customer_data ) {
 			}
 
 			// Output the form HTML.
-			?>
-			<?php if ( ! empty( $this->gateway->get_description() ) ) : ?>
+			if ( ! empty( $this->gateway->get_description() ) ) : ?>
 				<p><?php echo wp_kses_post( $this->gateway->get_description() ); ?></p>
-			<?php endif; ?>
+				<?php
+			endif;
 
-			<?php if ( WC_Payments::mode()->is_test() ) : ?>
+			if ( WC_Payments::mode()->is_test() && false !== $this->gateway->get_payment_method()->get_testing_instructions() ) :
+				?>
 				<p class="testmode-info">
-					<?php
-						$testing_instructions = $this->gateway->get_payment_method()->get_testing_instructions();
-					if ( false !== $testing_instructions ) {
+				<?php
 						// phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
-						echo WC_Payments_Utils::esc_interpolated_html(
+							echo WC_Payments_Utils::esc_interpolated_html(
 							/* translators: link to Stripe testing page */
-							$testing_instructions,
-							[
-								'a'      => '<a href="https://woocommerce.com/document/woopayments/testing-and-troubleshooting/testing/#test-cards" target="_blank">',
-								'strong' => '<strong>',
-								'number' => '<button type="button" class="js-woopayments-copy-test-number" aria-label="' . esc_attr( __( 'Click to copy the test number to clipboard', 'woocommerce-payments' ) ) . '" title="' . esc_attr( __( 'Copy to clipboard', 'woocommerce-payments' ) ) . '"><i></i><span>',
-							]
-						);
-					}
-					?>
+								$this->gateway->get_payment_method()->get_testing_instructions(),
+								[
+									'a'      => '<a href="https://woocommerce.com/document/woopayments/testing-and-troubleshooting/testing/#test-cards" target="_blank">',
+									'strong' => '<strong>',
+									'number' => '<button type="button" class="js-woopayments-copy-test-number" aria-label="' . esc_attr( __( 'Click to copy the test number to clipboard', 'woocommerce-payments' ) ) . '" title="' . esc_attr( __( 'Copy to clipboard', 'woocommerce-payments' ) ) . '"><i></i><span>',
+								]
+							);
+				?>
 				</p>
-			<?php endif; ?>
-
-			<?php
+				<?php
+			endif;
 
 			if ( $display_tokenization ) {
 				$this->gateway->tokenization_script();
diff --git a/tests/e2e-pw/specs/shopper/klarna-checkout-purchase.spec.ts b/tests/e2e-pw/specs/shopper/klarna-checkout-purchase.spec.ts
index b810f32ecb0..1ce6d5917a0 100644
--- a/tests/e2e-pw/specs/shopper/klarna-checkout-purchase.spec.ts
+++ b/tests/e2e-pw/specs/shopper/klarna-checkout-purchase.spec.ts
@@ -68,6 +68,7 @@ test.describe( 'Klarna Checkout', () => {
 		await shopperPage
 			.locator( '.wc_payment_methods' )
 			.getByText( 'Klarna' )
+			.nth( 1 )
 			.click();
 
 		await shopper.placeOrder( shopperPage );
diff --git a/tests/e2e/specs/wcpay/shopper/shopper-bnpls-checkout.spec.js b/tests/e2e/specs/wcpay/shopper/shopper-bnpls-checkout.spec.js
index 4bf7ea14b9b..8c8c4a30c83 100644
--- a/tests/e2e/specs/wcpay/shopper/shopper-bnpls-checkout.spec.js
+++ b/tests/e2e/specs/wcpay/shopper/shopper-bnpls-checkout.spec.js
@@ -8,9 +8,12 @@ import { uiUnblocked } from '@woocommerce/e2e-utils/build/page-utils';
  * Internal dependencies
  */
 import { merchantWCP, shopperWCP } from '../../../utils/flows';
-import { setupProductCheckout } from '../../../utils/payments';
+import {
+	selectOnCheckout,
+	setupProductCheckout,
+} from '../../../utils/payments';
 
-const bnplProviders = [ [ 'Affirm' ], [ 'Afterpay' ] ];
+const bnplProviders = [ [ 'affirm' ], [ 'afterpay_clearpay' ] ];
 
 const UPE_METHOD_CHECKBOXES = [
 	"//label[contains(text(), 'Affirm')]/preceding-sibling::span/input[@type='checkbox']", // affirm
@@ -49,8 +52,8 @@ describe.each( cardTestingPreventionStates )(
 
 		describe.each( bnplProviders )(
 			`Checkout with %s, carding protection ${ cardTestingPreventionEnabled }`,
-			( providerName ) => {
-				it( `should successfully place order with ${ providerName }`, async () => {
+			( providerId ) => {
+				it( `should successfully place order with ${ providerId }`, async () => {
 					await shopperWCP.emptyCart();
 					await setupProductCheckout(
 						config.get( 'addresses.customer.billing' ),
@@ -58,12 +61,7 @@ describe.each( cardTestingPreventionStates )(
 					);
 					await uiUnblocked();
 					// Select BNPL provider as payment method.
-					const xPathPaymentMethodSelector = `//*[@id='payment']/ul/li/label[contains(text(), '${ providerName }')]`;
-					await page.waitForXPath( xPathPaymentMethodSelector );
-					const [ paymentMethodLabel ] = await page.$x(
-						xPathPaymentMethodSelector
-					);
-					await paymentMethodLabel.click();
+					await selectOnCheckout( providerId, page );
 
 					// Check the token presence when card testing prevention is enabled.
 					if ( cardTestingPreventionEnabled ) {

From c580223c10d307daf4bad3054bbb75e55dcd38c3 Mon Sep 17 00:00:00 2001
From: Ricardo Metring <ricardometring@gmail.com>
Date: Thu, 7 Nov 2024 11:37:14 -0300
Subject: [PATCH 33/45] Fix multi-currency autoload issue when plugin gets
 updated (#9681)

Co-authored-by: Hector Lovo <hector.lovo@automattic.com>
---
 changelog/fix-9676-multi-currency-autoload            |  5 +++++
 composer.json                                         |  2 +-
 .../src => includes/multi-currency}/AdminNotices.php  |  0
 .../src => includes/multi-currency}/Analytics.php     |  0
 .../multi-currency}/BackendCurrencies.php             |  0
 .../src => includes/multi-currency}/Compatibility.php |  0
 .../Compatibility/BaseCompatibility.php               |  0
 .../Compatibility/WooCommerceBookings.php             |  0
 .../Compatibility/WooCommerceDeposits.php             |  0
 .../Compatibility/WooCommerceFedEx.php                |  0
 .../Compatibility/WooCommerceNameYourPrice.php        |  0
 .../Compatibility/WooCommercePointsAndRewards.php     |  0
 .../Compatibility/WooCommercePreOrders.php            |  0
 .../Compatibility/WooCommerceProductAddOns.php        |  0
 .../Compatibility/WooCommerceSubscriptions.php        |  0
 .../multi-currency}/Compatibility/WooCommerceUPS.php  |  0
 .../src => includes/multi-currency}/CountryFlags.php  |  0
 .../src => includes/multi-currency}/Currency.php      |  0
 .../multi-currency}/CurrencySwitcherBlock.php         |  0
 .../multi-currency}/CurrencySwitcherWidget.php        |  0
 .../Exceptions/InvalidCurrencyException.php           |  0
 .../Exceptions/InvalidCurrencyRateException.php       |  0
 .../multi-currency}/FrontendCurrencies.php            |  0
 .../multi-currency}/FrontendPrices.php                |  0
 .../src => includes/multi-currency}/Geolocation.php   |  0
 .../Interfaces/MultiCurrencyAccountInterface.php      |  0
 .../Interfaces/MultiCurrencyApiClientInterface.php    |  0
 .../Interfaces/MultiCurrencyCacheInterface.php        |  0
 .../Interfaces/MultiCurrencyLocalizationInterface.php |  0
 .../Interfaces/MultiCurrencySettingsInterface.php     |  0
 .../src => includes/multi-currency}/Logger.php        |  0
 .../src => includes/multi-currency}/MultiCurrency.php |  6 ++++++
 .../Notes/NoteMultiCurrencyAvailable.php              |  0
 includes/multi-currency/README.md                     |  5 +++++
 .../multi-currency}/RestController.php                |  0
 .../src => includes/multi-currency}/Settings.php      |  0
 .../multi-currency}/SettingsOnboardCta.php            |  0
 .../multi-currency}/StorefrontIntegration.php         |  0
 .../src => includes/multi-currency}/Tracking.php      |  0
 .../src => includes/multi-currency}/UserSettings.php  |  0
 .../src => includes/multi-currency}/Utils.php         |  0
 .../multi-currency}/client/analytics/index.js         |  0
 .../client/blocks/currency-switcher.js                |  0
 .../components/currency-delete-illustration/index.js  |  0
 .../currency-delete-illustration/styles.scss          |  0
 .../client/components/preview-modal/index.js          |  0
 .../client/components/preview-modal/index.scss        |  0
 .../multi-currency}/client/components/search/index.js |  0
 .../client/components/search/style.scss               |  0
 .../search/test/__snapshots__/index.js.snap           |  0
 .../client/components/search/test/index.js            |  0
 .../multi-currency}/client/context.js                 |  0
 .../multi-currency}/client/data/action-types.js       |  0
 .../multi-currency}/client/data/actions.js            |  0
 .../multi-currency}/client/data/constants.js          |  0
 .../multi-currency}/client/data/hooks.js              |  0
 .../multi-currency}/client/data/index.ts              |  0
 .../multi-currency}/client/data/reducer.js            |  0
 .../multi-currency}/client/data/resolvers.js          |  0
 .../multi-currency}/client/data/selectors.js          |  0
 .../multi-currency}/client/data/store.js              |  0
 .../multi-currency}/client/index.js                   |  0
 .../multi-currency}/client/interface/assets.js        |  0
 .../multi-currency}/client/interface/components.js    |  0
 .../multi-currency}/client/interface/data.js          |  0
 .../multi-currency}/client/interface/functions.js     |  0
 .../enabled-currencies-list/delete-button.js          |  0
 .../multi-currency/enabled-currencies-list/index.js   |  0
 .../enabled-currencies-list/list-item-placeholder.js  |  0
 .../enabled-currencies-list/list-item.js              |  0
 .../multi-currency/enabled-currencies-list/list.js    |  0
 .../enabled-currencies-list/modal-checkbox-list.js    |  0
 .../enabled-currencies-list/modal-checkbox.js         |  0
 .../multi-currency/enabled-currencies-list/modal.js   |  0
 .../multi-currency/enabled-currencies-list/style.scss |  0
 .../test/__snapshots__/index.js.snap                  |  0
 .../enabled-currencies-list/test/index.js             |  0
 .../client/settings/multi-currency/index.js           |  0
 .../settings/multi-currency/store-settings/index.js   |  0
 .../settings/multi-currency/store-settings/style.scss |  0
 .../test/__snapshots__/index.test.js.snap             |  0
 .../multi-currency/store-settings/test/index.test.js  |  0
 .../client/settings/multi-currency/style.scss         |  0
 .../test/__snapshots__/index.test.js.snap             |  0
 .../client/settings/multi-currency/test/index.test.js |  0
 .../client/settings/single-currency/constants.js      |  0
 .../settings/single-currency/currency-preview.js      |  0
 .../client/settings/single-currency/index.js          |  0
 .../client/settings/single-currency/style.scss        |  0
 .../test/__snapshots__/index.test.js.snap             |  0
 .../settings/single-currency/test/index.test.js       |  0
 .../multi-currency}/client/setup/index.js             |  0
 .../setup/tasks/add-currencies-task/constants.js      |  0
 .../client/setup/tasks/add-currencies-task/index.js   |  0
 .../client/setup/tasks/add-currencies-task/index.scss |  0
 .../test/__snapshots__/index.test.js.snap             |  0
 .../tasks/add-currencies-task/test/index.test.js      |  0
 .../tasks/add-currencies-task/test/utils.test.js      |  0
 .../client/setup/tasks/add-currencies-task/utils.js   |  0
 .../client/setup/tasks/multi-currency-setup.js        |  0
 .../client/setup/tasks/multi-currency-setup.scss      |  0
 .../client/setup/tasks/setup-complete-task/index.js   |  0
 .../client/setup/tasks/setup-complete-task/index.scss |  0
 .../tasks/setup-complete-task/test/index.test.js      |  0
 .../client/setup/tasks/store-settings-task/index.js   |  0
 .../client/setup/tasks/store-settings-task/index.scss |  0
 .../test/__snapshots__/index.test.js.snap             |  0
 .../tasks/store-settings-task/test/index.test.js      |  0
 .../__snapshots__/multi-currency-setup.test.js.snap   |  0
 .../setup/tasks/test/multi-currency-setup.test.js     |  0
 .../multi-currency}/client/setup/test/index.js        |  0
 .../multi-currency}/client/utils/currency/index.js    |  0
 .../client/utils/currency/test/index.js               |  0
 .../__tests__/index.test.js                           |  0
 .../client/utils/missing-currencies-message/index.ts  |  0
 phpcs.xml.dist                                        |  2 +-
 psalm-baseline.xml                                    |  4 ++--
 tasks/release.js                                      |  6 +++---
 tests/js/jest.config.js                               |  4 ++--
 tsconfig.json                                         |  2 +-
 webpack/shared.js                                     | 11 +++++------
 121 files changed, 31 insertions(+), 16 deletions(-)
 create mode 100644 changelog/fix-9676-multi-currency-autoload
 rename {multi-currency/src => includes/multi-currency}/AdminNotices.php (100%)
 rename {multi-currency/src => includes/multi-currency}/Analytics.php (100%)
 rename {multi-currency/src => includes/multi-currency}/BackendCurrencies.php (100%)
 rename {multi-currency/src => includes/multi-currency}/Compatibility.php (100%)
 rename {multi-currency/src => includes/multi-currency}/Compatibility/BaseCompatibility.php (100%)
 rename {multi-currency/src => includes/multi-currency}/Compatibility/WooCommerceBookings.php (100%)
 rename {multi-currency/src => includes/multi-currency}/Compatibility/WooCommerceDeposits.php (100%)
 rename {multi-currency/src => includes/multi-currency}/Compatibility/WooCommerceFedEx.php (100%)
 rename {multi-currency/src => includes/multi-currency}/Compatibility/WooCommerceNameYourPrice.php (100%)
 rename {multi-currency/src => includes/multi-currency}/Compatibility/WooCommercePointsAndRewards.php (100%)
 rename {multi-currency/src => includes/multi-currency}/Compatibility/WooCommercePreOrders.php (100%)
 rename {multi-currency/src => includes/multi-currency}/Compatibility/WooCommerceProductAddOns.php (100%)
 rename {multi-currency/src => includes/multi-currency}/Compatibility/WooCommerceSubscriptions.php (100%)
 rename {multi-currency/src => includes/multi-currency}/Compatibility/WooCommerceUPS.php (100%)
 rename {multi-currency/src => includes/multi-currency}/CountryFlags.php (100%)
 rename {multi-currency/src => includes/multi-currency}/Currency.php (100%)
 rename {multi-currency/src => includes/multi-currency}/CurrencySwitcherBlock.php (100%)
 rename {multi-currency/src => includes/multi-currency}/CurrencySwitcherWidget.php (100%)
 rename {multi-currency/src => includes/multi-currency}/Exceptions/InvalidCurrencyException.php (100%)
 rename {multi-currency/src => includes/multi-currency}/Exceptions/InvalidCurrencyRateException.php (100%)
 rename {multi-currency/src => includes/multi-currency}/FrontendCurrencies.php (100%)
 rename {multi-currency/src => includes/multi-currency}/FrontendPrices.php (100%)
 rename {multi-currency/src => includes/multi-currency}/Geolocation.php (100%)
 rename {multi-currency/src => includes/multi-currency}/Interfaces/MultiCurrencyAccountInterface.php (100%)
 rename {multi-currency/src => includes/multi-currency}/Interfaces/MultiCurrencyApiClientInterface.php (100%)
 rename {multi-currency/src => includes/multi-currency}/Interfaces/MultiCurrencyCacheInterface.php (100%)
 rename {multi-currency/src => includes/multi-currency}/Interfaces/MultiCurrencyLocalizationInterface.php (100%)
 rename {multi-currency/src => includes/multi-currency}/Interfaces/MultiCurrencySettingsInterface.php (100%)
 rename {multi-currency/src => includes/multi-currency}/Logger.php (100%)
 rename {multi-currency/src => includes/multi-currency}/MultiCurrency.php (99%)
 rename {multi-currency/src => includes/multi-currency}/Notes/NoteMultiCurrencyAvailable.php (100%)
 create mode 100644 includes/multi-currency/README.md
 rename {multi-currency/src => includes/multi-currency}/RestController.php (100%)
 rename {multi-currency/src => includes/multi-currency}/Settings.php (100%)
 rename {multi-currency/src => includes/multi-currency}/SettingsOnboardCta.php (100%)
 rename {multi-currency/src => includes/multi-currency}/StorefrontIntegration.php (100%)
 rename {multi-currency/src => includes/multi-currency}/Tracking.php (100%)
 rename {multi-currency/src => includes/multi-currency}/UserSettings.php (100%)
 rename {multi-currency/src => includes/multi-currency}/Utils.php (100%)
 rename {multi-currency => includes/multi-currency}/client/analytics/index.js (100%)
 rename {multi-currency => includes/multi-currency}/client/blocks/currency-switcher.js (100%)
 rename {multi-currency => includes/multi-currency}/client/components/currency-delete-illustration/index.js (100%)
 rename {multi-currency => includes/multi-currency}/client/components/currency-delete-illustration/styles.scss (100%)
 rename {multi-currency => includes/multi-currency}/client/components/preview-modal/index.js (100%)
 rename {multi-currency => includes/multi-currency}/client/components/preview-modal/index.scss (100%)
 rename {multi-currency => includes/multi-currency}/client/components/search/index.js (100%)
 rename {multi-currency => includes/multi-currency}/client/components/search/style.scss (100%)
 rename {multi-currency => includes/multi-currency}/client/components/search/test/__snapshots__/index.js.snap (100%)
 rename {multi-currency => includes/multi-currency}/client/components/search/test/index.js (100%)
 rename {multi-currency => includes/multi-currency}/client/context.js (100%)
 rename {multi-currency => includes/multi-currency}/client/data/action-types.js (100%)
 rename {multi-currency => includes/multi-currency}/client/data/actions.js (100%)
 rename {multi-currency => includes/multi-currency}/client/data/constants.js (100%)
 rename {multi-currency => includes/multi-currency}/client/data/hooks.js (100%)
 rename {multi-currency => includes/multi-currency}/client/data/index.ts (100%)
 rename {multi-currency => includes/multi-currency}/client/data/reducer.js (100%)
 rename {multi-currency => includes/multi-currency}/client/data/resolvers.js (100%)
 rename {multi-currency => includes/multi-currency}/client/data/selectors.js (100%)
 rename {multi-currency => includes/multi-currency}/client/data/store.js (100%)
 rename {multi-currency => includes/multi-currency}/client/index.js (100%)
 rename {multi-currency => includes/multi-currency}/client/interface/assets.js (100%)
 rename {multi-currency => includes/multi-currency}/client/interface/components.js (100%)
 rename {multi-currency => includes/multi-currency}/client/interface/data.js (100%)
 rename {multi-currency => includes/multi-currency}/client/interface/functions.js (100%)
 rename {multi-currency => includes/multi-currency}/client/settings/multi-currency/enabled-currencies-list/delete-button.js (100%)
 rename {multi-currency => includes/multi-currency}/client/settings/multi-currency/enabled-currencies-list/index.js (100%)
 rename {multi-currency => includes/multi-currency}/client/settings/multi-currency/enabled-currencies-list/list-item-placeholder.js (100%)
 rename {multi-currency => includes/multi-currency}/client/settings/multi-currency/enabled-currencies-list/list-item.js (100%)
 rename {multi-currency => includes/multi-currency}/client/settings/multi-currency/enabled-currencies-list/list.js (100%)
 rename {multi-currency => includes/multi-currency}/client/settings/multi-currency/enabled-currencies-list/modal-checkbox-list.js (100%)
 rename {multi-currency => includes/multi-currency}/client/settings/multi-currency/enabled-currencies-list/modal-checkbox.js (100%)
 rename {multi-currency => includes/multi-currency}/client/settings/multi-currency/enabled-currencies-list/modal.js (100%)
 rename {multi-currency => includes/multi-currency}/client/settings/multi-currency/enabled-currencies-list/style.scss (100%)
 rename {multi-currency => includes/multi-currency}/client/settings/multi-currency/enabled-currencies-list/test/__snapshots__/index.js.snap (100%)
 rename {multi-currency => includes/multi-currency}/client/settings/multi-currency/enabled-currencies-list/test/index.js (100%)
 rename {multi-currency => includes/multi-currency}/client/settings/multi-currency/index.js (100%)
 rename {multi-currency => includes/multi-currency}/client/settings/multi-currency/store-settings/index.js (100%)
 rename {multi-currency => includes/multi-currency}/client/settings/multi-currency/store-settings/style.scss (100%)
 rename {multi-currency => includes/multi-currency}/client/settings/multi-currency/store-settings/test/__snapshots__/index.test.js.snap (100%)
 rename {multi-currency => includes/multi-currency}/client/settings/multi-currency/store-settings/test/index.test.js (100%)
 rename {multi-currency => includes/multi-currency}/client/settings/multi-currency/style.scss (100%)
 rename {multi-currency => includes/multi-currency}/client/settings/multi-currency/test/__snapshots__/index.test.js.snap (100%)
 rename {multi-currency => includes/multi-currency}/client/settings/multi-currency/test/index.test.js (100%)
 rename {multi-currency => includes/multi-currency}/client/settings/single-currency/constants.js (100%)
 rename {multi-currency => includes/multi-currency}/client/settings/single-currency/currency-preview.js (100%)
 rename {multi-currency => includes/multi-currency}/client/settings/single-currency/index.js (100%)
 rename {multi-currency => includes/multi-currency}/client/settings/single-currency/style.scss (100%)
 rename {multi-currency => includes/multi-currency}/client/settings/single-currency/test/__snapshots__/index.test.js.snap (100%)
 rename {multi-currency => includes/multi-currency}/client/settings/single-currency/test/index.test.js (100%)
 rename {multi-currency => includes/multi-currency}/client/setup/index.js (100%)
 rename {multi-currency => includes/multi-currency}/client/setup/tasks/add-currencies-task/constants.js (100%)
 rename {multi-currency => includes/multi-currency}/client/setup/tasks/add-currencies-task/index.js (100%)
 rename {multi-currency => includes/multi-currency}/client/setup/tasks/add-currencies-task/index.scss (100%)
 rename {multi-currency => includes/multi-currency}/client/setup/tasks/add-currencies-task/test/__snapshots__/index.test.js.snap (100%)
 rename {multi-currency => includes/multi-currency}/client/setup/tasks/add-currencies-task/test/index.test.js (100%)
 rename {multi-currency => includes/multi-currency}/client/setup/tasks/add-currencies-task/test/utils.test.js (100%)
 rename {multi-currency => includes/multi-currency}/client/setup/tasks/add-currencies-task/utils.js (100%)
 rename {multi-currency => includes/multi-currency}/client/setup/tasks/multi-currency-setup.js (100%)
 rename {multi-currency => includes/multi-currency}/client/setup/tasks/multi-currency-setup.scss (100%)
 rename {multi-currency => includes/multi-currency}/client/setup/tasks/setup-complete-task/index.js (100%)
 rename {multi-currency => includes/multi-currency}/client/setup/tasks/setup-complete-task/index.scss (100%)
 rename {multi-currency => includes/multi-currency}/client/setup/tasks/setup-complete-task/test/index.test.js (100%)
 rename {multi-currency => includes/multi-currency}/client/setup/tasks/store-settings-task/index.js (100%)
 rename {multi-currency => includes/multi-currency}/client/setup/tasks/store-settings-task/index.scss (100%)
 rename {multi-currency => includes/multi-currency}/client/setup/tasks/store-settings-task/test/__snapshots__/index.test.js.snap (100%)
 rename {multi-currency => includes/multi-currency}/client/setup/tasks/store-settings-task/test/index.test.js (100%)
 rename {multi-currency => includes/multi-currency}/client/setup/tasks/test/__snapshots__/multi-currency-setup.test.js.snap (100%)
 rename {multi-currency => includes/multi-currency}/client/setup/tasks/test/multi-currency-setup.test.js (100%)
 rename {multi-currency => includes/multi-currency}/client/setup/test/index.js (100%)
 rename {multi-currency => includes/multi-currency}/client/utils/currency/index.js (100%)
 rename {multi-currency => includes/multi-currency}/client/utils/currency/test/index.js (100%)
 rename {multi-currency => includes/multi-currency}/client/utils/missing-currencies-message/__tests__/index.test.js (100%)
 rename {multi-currency => includes/multi-currency}/client/utils/missing-currencies-message/index.ts (100%)

diff --git a/changelog/fix-9676-multi-currency-autoload b/changelog/fix-9676-multi-currency-autoload
new file mode 100644
index 00000000000..04e7fcfbc58
--- /dev/null
+++ b/changelog/fix-9676-multi-currency-autoload
@@ -0,0 +1,5 @@
+Significance: patch
+Type: fix
+Comment: Keep multi-currency module in the same path to avoid autoload errors.
+
+
diff --git a/composer.json b/composer.json
index 497530e36e1..cdb679b4afb 100644
--- a/composer.json
+++ b/composer.json
@@ -88,7 +88,7 @@
     },
     "autoload": {
         "psr-4": {
-            "WCPay\\MultiCurrency\\": "multi-currency/src",
+            "WCPay\\MultiCurrency\\": "includes/multi-currency",
             "WCPay\\Vendor\\": "lib/packages",
             "WCPay\\": "src"
         },
diff --git a/multi-currency/src/AdminNotices.php b/includes/multi-currency/AdminNotices.php
similarity index 100%
rename from multi-currency/src/AdminNotices.php
rename to includes/multi-currency/AdminNotices.php
diff --git a/multi-currency/src/Analytics.php b/includes/multi-currency/Analytics.php
similarity index 100%
rename from multi-currency/src/Analytics.php
rename to includes/multi-currency/Analytics.php
diff --git a/multi-currency/src/BackendCurrencies.php b/includes/multi-currency/BackendCurrencies.php
similarity index 100%
rename from multi-currency/src/BackendCurrencies.php
rename to includes/multi-currency/BackendCurrencies.php
diff --git a/multi-currency/src/Compatibility.php b/includes/multi-currency/Compatibility.php
similarity index 100%
rename from multi-currency/src/Compatibility.php
rename to includes/multi-currency/Compatibility.php
diff --git a/multi-currency/src/Compatibility/BaseCompatibility.php b/includes/multi-currency/Compatibility/BaseCompatibility.php
similarity index 100%
rename from multi-currency/src/Compatibility/BaseCompatibility.php
rename to includes/multi-currency/Compatibility/BaseCompatibility.php
diff --git a/multi-currency/src/Compatibility/WooCommerceBookings.php b/includes/multi-currency/Compatibility/WooCommerceBookings.php
similarity index 100%
rename from multi-currency/src/Compatibility/WooCommerceBookings.php
rename to includes/multi-currency/Compatibility/WooCommerceBookings.php
diff --git a/multi-currency/src/Compatibility/WooCommerceDeposits.php b/includes/multi-currency/Compatibility/WooCommerceDeposits.php
similarity index 100%
rename from multi-currency/src/Compatibility/WooCommerceDeposits.php
rename to includes/multi-currency/Compatibility/WooCommerceDeposits.php
diff --git a/multi-currency/src/Compatibility/WooCommerceFedEx.php b/includes/multi-currency/Compatibility/WooCommerceFedEx.php
similarity index 100%
rename from multi-currency/src/Compatibility/WooCommerceFedEx.php
rename to includes/multi-currency/Compatibility/WooCommerceFedEx.php
diff --git a/multi-currency/src/Compatibility/WooCommerceNameYourPrice.php b/includes/multi-currency/Compatibility/WooCommerceNameYourPrice.php
similarity index 100%
rename from multi-currency/src/Compatibility/WooCommerceNameYourPrice.php
rename to includes/multi-currency/Compatibility/WooCommerceNameYourPrice.php
diff --git a/multi-currency/src/Compatibility/WooCommercePointsAndRewards.php b/includes/multi-currency/Compatibility/WooCommercePointsAndRewards.php
similarity index 100%
rename from multi-currency/src/Compatibility/WooCommercePointsAndRewards.php
rename to includes/multi-currency/Compatibility/WooCommercePointsAndRewards.php
diff --git a/multi-currency/src/Compatibility/WooCommercePreOrders.php b/includes/multi-currency/Compatibility/WooCommercePreOrders.php
similarity index 100%
rename from multi-currency/src/Compatibility/WooCommercePreOrders.php
rename to includes/multi-currency/Compatibility/WooCommercePreOrders.php
diff --git a/multi-currency/src/Compatibility/WooCommerceProductAddOns.php b/includes/multi-currency/Compatibility/WooCommerceProductAddOns.php
similarity index 100%
rename from multi-currency/src/Compatibility/WooCommerceProductAddOns.php
rename to includes/multi-currency/Compatibility/WooCommerceProductAddOns.php
diff --git a/multi-currency/src/Compatibility/WooCommerceSubscriptions.php b/includes/multi-currency/Compatibility/WooCommerceSubscriptions.php
similarity index 100%
rename from multi-currency/src/Compatibility/WooCommerceSubscriptions.php
rename to includes/multi-currency/Compatibility/WooCommerceSubscriptions.php
diff --git a/multi-currency/src/Compatibility/WooCommerceUPS.php b/includes/multi-currency/Compatibility/WooCommerceUPS.php
similarity index 100%
rename from multi-currency/src/Compatibility/WooCommerceUPS.php
rename to includes/multi-currency/Compatibility/WooCommerceUPS.php
diff --git a/multi-currency/src/CountryFlags.php b/includes/multi-currency/CountryFlags.php
similarity index 100%
rename from multi-currency/src/CountryFlags.php
rename to includes/multi-currency/CountryFlags.php
diff --git a/multi-currency/src/Currency.php b/includes/multi-currency/Currency.php
similarity index 100%
rename from multi-currency/src/Currency.php
rename to includes/multi-currency/Currency.php
diff --git a/multi-currency/src/CurrencySwitcherBlock.php b/includes/multi-currency/CurrencySwitcherBlock.php
similarity index 100%
rename from multi-currency/src/CurrencySwitcherBlock.php
rename to includes/multi-currency/CurrencySwitcherBlock.php
diff --git a/multi-currency/src/CurrencySwitcherWidget.php b/includes/multi-currency/CurrencySwitcherWidget.php
similarity index 100%
rename from multi-currency/src/CurrencySwitcherWidget.php
rename to includes/multi-currency/CurrencySwitcherWidget.php
diff --git a/multi-currency/src/Exceptions/InvalidCurrencyException.php b/includes/multi-currency/Exceptions/InvalidCurrencyException.php
similarity index 100%
rename from multi-currency/src/Exceptions/InvalidCurrencyException.php
rename to includes/multi-currency/Exceptions/InvalidCurrencyException.php
diff --git a/multi-currency/src/Exceptions/InvalidCurrencyRateException.php b/includes/multi-currency/Exceptions/InvalidCurrencyRateException.php
similarity index 100%
rename from multi-currency/src/Exceptions/InvalidCurrencyRateException.php
rename to includes/multi-currency/Exceptions/InvalidCurrencyRateException.php
diff --git a/multi-currency/src/FrontendCurrencies.php b/includes/multi-currency/FrontendCurrencies.php
similarity index 100%
rename from multi-currency/src/FrontendCurrencies.php
rename to includes/multi-currency/FrontendCurrencies.php
diff --git a/multi-currency/src/FrontendPrices.php b/includes/multi-currency/FrontendPrices.php
similarity index 100%
rename from multi-currency/src/FrontendPrices.php
rename to includes/multi-currency/FrontendPrices.php
diff --git a/multi-currency/src/Geolocation.php b/includes/multi-currency/Geolocation.php
similarity index 100%
rename from multi-currency/src/Geolocation.php
rename to includes/multi-currency/Geolocation.php
diff --git a/multi-currency/src/Interfaces/MultiCurrencyAccountInterface.php b/includes/multi-currency/Interfaces/MultiCurrencyAccountInterface.php
similarity index 100%
rename from multi-currency/src/Interfaces/MultiCurrencyAccountInterface.php
rename to includes/multi-currency/Interfaces/MultiCurrencyAccountInterface.php
diff --git a/multi-currency/src/Interfaces/MultiCurrencyApiClientInterface.php b/includes/multi-currency/Interfaces/MultiCurrencyApiClientInterface.php
similarity index 100%
rename from multi-currency/src/Interfaces/MultiCurrencyApiClientInterface.php
rename to includes/multi-currency/Interfaces/MultiCurrencyApiClientInterface.php
diff --git a/multi-currency/src/Interfaces/MultiCurrencyCacheInterface.php b/includes/multi-currency/Interfaces/MultiCurrencyCacheInterface.php
similarity index 100%
rename from multi-currency/src/Interfaces/MultiCurrencyCacheInterface.php
rename to includes/multi-currency/Interfaces/MultiCurrencyCacheInterface.php
diff --git a/multi-currency/src/Interfaces/MultiCurrencyLocalizationInterface.php b/includes/multi-currency/Interfaces/MultiCurrencyLocalizationInterface.php
similarity index 100%
rename from multi-currency/src/Interfaces/MultiCurrencyLocalizationInterface.php
rename to includes/multi-currency/Interfaces/MultiCurrencyLocalizationInterface.php
diff --git a/multi-currency/src/Interfaces/MultiCurrencySettingsInterface.php b/includes/multi-currency/Interfaces/MultiCurrencySettingsInterface.php
similarity index 100%
rename from multi-currency/src/Interfaces/MultiCurrencySettingsInterface.php
rename to includes/multi-currency/Interfaces/MultiCurrencySettingsInterface.php
diff --git a/multi-currency/src/Logger.php b/includes/multi-currency/Logger.php
similarity index 100%
rename from multi-currency/src/Logger.php
rename to includes/multi-currency/Logger.php
diff --git a/multi-currency/src/MultiCurrency.php b/includes/multi-currency/MultiCurrency.php
similarity index 99%
rename from multi-currency/src/MultiCurrency.php
rename to includes/multi-currency/MultiCurrency.php
index 56e2b5815b4..9313a987dc9 100644
--- a/multi-currency/src/MultiCurrency.php
+++ b/includes/multi-currency/MultiCurrency.php
@@ -364,6 +364,12 @@ public function init_settings_pages( $settings_pages ): array {
 			return $settings_pages;
 		}
 
+		// Due to autoloader limitations, we shouldn't initiate MCCY settings if the plugin was just upgraded:
+		// https://github.com/Automattic/woocommerce-payments/issues/9676.
+		if ( did_action( 'upgrader_process_complete' ) ) {
+			return $settings_pages;
+		}
+
 		if ( $this->payments_account->is_provider_connected() ) {
 			$settings = new Settings( $this );
 			$settings->init_hooks();
diff --git a/multi-currency/src/Notes/NoteMultiCurrencyAvailable.php b/includes/multi-currency/Notes/NoteMultiCurrencyAvailable.php
similarity index 100%
rename from multi-currency/src/Notes/NoteMultiCurrencyAvailable.php
rename to includes/multi-currency/Notes/NoteMultiCurrencyAvailable.php
diff --git a/includes/multi-currency/README.md b/includes/multi-currency/README.md
new file mode 100644
index 00000000000..96d828ce2d1
--- /dev/null
+++ b/includes/multi-currency/README.md
@@ -0,0 +1,5 @@
+# WooPayments multi-currency directory
+
+This directory contains the multi-currency module, which has been decoupled and extracted from the gateway code.
+
+The module is responsible for handling all multi-currency functionality, both back-end and front-end.
diff --git a/multi-currency/src/RestController.php b/includes/multi-currency/RestController.php
similarity index 100%
rename from multi-currency/src/RestController.php
rename to includes/multi-currency/RestController.php
diff --git a/multi-currency/src/Settings.php b/includes/multi-currency/Settings.php
similarity index 100%
rename from multi-currency/src/Settings.php
rename to includes/multi-currency/Settings.php
diff --git a/multi-currency/src/SettingsOnboardCta.php b/includes/multi-currency/SettingsOnboardCta.php
similarity index 100%
rename from multi-currency/src/SettingsOnboardCta.php
rename to includes/multi-currency/SettingsOnboardCta.php
diff --git a/multi-currency/src/StorefrontIntegration.php b/includes/multi-currency/StorefrontIntegration.php
similarity index 100%
rename from multi-currency/src/StorefrontIntegration.php
rename to includes/multi-currency/StorefrontIntegration.php
diff --git a/multi-currency/src/Tracking.php b/includes/multi-currency/Tracking.php
similarity index 100%
rename from multi-currency/src/Tracking.php
rename to includes/multi-currency/Tracking.php
diff --git a/multi-currency/src/UserSettings.php b/includes/multi-currency/UserSettings.php
similarity index 100%
rename from multi-currency/src/UserSettings.php
rename to includes/multi-currency/UserSettings.php
diff --git a/multi-currency/src/Utils.php b/includes/multi-currency/Utils.php
similarity index 100%
rename from multi-currency/src/Utils.php
rename to includes/multi-currency/Utils.php
diff --git a/multi-currency/client/analytics/index.js b/includes/multi-currency/client/analytics/index.js
similarity index 100%
rename from multi-currency/client/analytics/index.js
rename to includes/multi-currency/client/analytics/index.js
diff --git a/multi-currency/client/blocks/currency-switcher.js b/includes/multi-currency/client/blocks/currency-switcher.js
similarity index 100%
rename from multi-currency/client/blocks/currency-switcher.js
rename to includes/multi-currency/client/blocks/currency-switcher.js
diff --git a/multi-currency/client/components/currency-delete-illustration/index.js b/includes/multi-currency/client/components/currency-delete-illustration/index.js
similarity index 100%
rename from multi-currency/client/components/currency-delete-illustration/index.js
rename to includes/multi-currency/client/components/currency-delete-illustration/index.js
diff --git a/multi-currency/client/components/currency-delete-illustration/styles.scss b/includes/multi-currency/client/components/currency-delete-illustration/styles.scss
similarity index 100%
rename from multi-currency/client/components/currency-delete-illustration/styles.scss
rename to includes/multi-currency/client/components/currency-delete-illustration/styles.scss
diff --git a/multi-currency/client/components/preview-modal/index.js b/includes/multi-currency/client/components/preview-modal/index.js
similarity index 100%
rename from multi-currency/client/components/preview-modal/index.js
rename to includes/multi-currency/client/components/preview-modal/index.js
diff --git a/multi-currency/client/components/preview-modal/index.scss b/includes/multi-currency/client/components/preview-modal/index.scss
similarity index 100%
rename from multi-currency/client/components/preview-modal/index.scss
rename to includes/multi-currency/client/components/preview-modal/index.scss
diff --git a/multi-currency/client/components/search/index.js b/includes/multi-currency/client/components/search/index.js
similarity index 100%
rename from multi-currency/client/components/search/index.js
rename to includes/multi-currency/client/components/search/index.js
diff --git a/multi-currency/client/components/search/style.scss b/includes/multi-currency/client/components/search/style.scss
similarity index 100%
rename from multi-currency/client/components/search/style.scss
rename to includes/multi-currency/client/components/search/style.scss
diff --git a/multi-currency/client/components/search/test/__snapshots__/index.js.snap b/includes/multi-currency/client/components/search/test/__snapshots__/index.js.snap
similarity index 100%
rename from multi-currency/client/components/search/test/__snapshots__/index.js.snap
rename to includes/multi-currency/client/components/search/test/__snapshots__/index.js.snap
diff --git a/multi-currency/client/components/search/test/index.js b/includes/multi-currency/client/components/search/test/index.js
similarity index 100%
rename from multi-currency/client/components/search/test/index.js
rename to includes/multi-currency/client/components/search/test/index.js
diff --git a/multi-currency/client/context.js b/includes/multi-currency/client/context.js
similarity index 100%
rename from multi-currency/client/context.js
rename to includes/multi-currency/client/context.js
diff --git a/multi-currency/client/data/action-types.js b/includes/multi-currency/client/data/action-types.js
similarity index 100%
rename from multi-currency/client/data/action-types.js
rename to includes/multi-currency/client/data/action-types.js
diff --git a/multi-currency/client/data/actions.js b/includes/multi-currency/client/data/actions.js
similarity index 100%
rename from multi-currency/client/data/actions.js
rename to includes/multi-currency/client/data/actions.js
diff --git a/multi-currency/client/data/constants.js b/includes/multi-currency/client/data/constants.js
similarity index 100%
rename from multi-currency/client/data/constants.js
rename to includes/multi-currency/client/data/constants.js
diff --git a/multi-currency/client/data/hooks.js b/includes/multi-currency/client/data/hooks.js
similarity index 100%
rename from multi-currency/client/data/hooks.js
rename to includes/multi-currency/client/data/hooks.js
diff --git a/multi-currency/client/data/index.ts b/includes/multi-currency/client/data/index.ts
similarity index 100%
rename from multi-currency/client/data/index.ts
rename to includes/multi-currency/client/data/index.ts
diff --git a/multi-currency/client/data/reducer.js b/includes/multi-currency/client/data/reducer.js
similarity index 100%
rename from multi-currency/client/data/reducer.js
rename to includes/multi-currency/client/data/reducer.js
diff --git a/multi-currency/client/data/resolvers.js b/includes/multi-currency/client/data/resolvers.js
similarity index 100%
rename from multi-currency/client/data/resolvers.js
rename to includes/multi-currency/client/data/resolvers.js
diff --git a/multi-currency/client/data/selectors.js b/includes/multi-currency/client/data/selectors.js
similarity index 100%
rename from multi-currency/client/data/selectors.js
rename to includes/multi-currency/client/data/selectors.js
diff --git a/multi-currency/client/data/store.js b/includes/multi-currency/client/data/store.js
similarity index 100%
rename from multi-currency/client/data/store.js
rename to includes/multi-currency/client/data/store.js
diff --git a/multi-currency/client/index.js b/includes/multi-currency/client/index.js
similarity index 100%
rename from multi-currency/client/index.js
rename to includes/multi-currency/client/index.js
diff --git a/multi-currency/client/interface/assets.js b/includes/multi-currency/client/interface/assets.js
similarity index 100%
rename from multi-currency/client/interface/assets.js
rename to includes/multi-currency/client/interface/assets.js
diff --git a/multi-currency/client/interface/components.js b/includes/multi-currency/client/interface/components.js
similarity index 100%
rename from multi-currency/client/interface/components.js
rename to includes/multi-currency/client/interface/components.js
diff --git a/multi-currency/client/interface/data.js b/includes/multi-currency/client/interface/data.js
similarity index 100%
rename from multi-currency/client/interface/data.js
rename to includes/multi-currency/client/interface/data.js
diff --git a/multi-currency/client/interface/functions.js b/includes/multi-currency/client/interface/functions.js
similarity index 100%
rename from multi-currency/client/interface/functions.js
rename to includes/multi-currency/client/interface/functions.js
diff --git a/multi-currency/client/settings/multi-currency/enabled-currencies-list/delete-button.js b/includes/multi-currency/client/settings/multi-currency/enabled-currencies-list/delete-button.js
similarity index 100%
rename from multi-currency/client/settings/multi-currency/enabled-currencies-list/delete-button.js
rename to includes/multi-currency/client/settings/multi-currency/enabled-currencies-list/delete-button.js
diff --git a/multi-currency/client/settings/multi-currency/enabled-currencies-list/index.js b/includes/multi-currency/client/settings/multi-currency/enabled-currencies-list/index.js
similarity index 100%
rename from multi-currency/client/settings/multi-currency/enabled-currencies-list/index.js
rename to includes/multi-currency/client/settings/multi-currency/enabled-currencies-list/index.js
diff --git a/multi-currency/client/settings/multi-currency/enabled-currencies-list/list-item-placeholder.js b/includes/multi-currency/client/settings/multi-currency/enabled-currencies-list/list-item-placeholder.js
similarity index 100%
rename from multi-currency/client/settings/multi-currency/enabled-currencies-list/list-item-placeholder.js
rename to includes/multi-currency/client/settings/multi-currency/enabled-currencies-list/list-item-placeholder.js
diff --git a/multi-currency/client/settings/multi-currency/enabled-currencies-list/list-item.js b/includes/multi-currency/client/settings/multi-currency/enabled-currencies-list/list-item.js
similarity index 100%
rename from multi-currency/client/settings/multi-currency/enabled-currencies-list/list-item.js
rename to includes/multi-currency/client/settings/multi-currency/enabled-currencies-list/list-item.js
diff --git a/multi-currency/client/settings/multi-currency/enabled-currencies-list/list.js b/includes/multi-currency/client/settings/multi-currency/enabled-currencies-list/list.js
similarity index 100%
rename from multi-currency/client/settings/multi-currency/enabled-currencies-list/list.js
rename to includes/multi-currency/client/settings/multi-currency/enabled-currencies-list/list.js
diff --git a/multi-currency/client/settings/multi-currency/enabled-currencies-list/modal-checkbox-list.js b/includes/multi-currency/client/settings/multi-currency/enabled-currencies-list/modal-checkbox-list.js
similarity index 100%
rename from multi-currency/client/settings/multi-currency/enabled-currencies-list/modal-checkbox-list.js
rename to includes/multi-currency/client/settings/multi-currency/enabled-currencies-list/modal-checkbox-list.js
diff --git a/multi-currency/client/settings/multi-currency/enabled-currencies-list/modal-checkbox.js b/includes/multi-currency/client/settings/multi-currency/enabled-currencies-list/modal-checkbox.js
similarity index 100%
rename from multi-currency/client/settings/multi-currency/enabled-currencies-list/modal-checkbox.js
rename to includes/multi-currency/client/settings/multi-currency/enabled-currencies-list/modal-checkbox.js
diff --git a/multi-currency/client/settings/multi-currency/enabled-currencies-list/modal.js b/includes/multi-currency/client/settings/multi-currency/enabled-currencies-list/modal.js
similarity index 100%
rename from multi-currency/client/settings/multi-currency/enabled-currencies-list/modal.js
rename to includes/multi-currency/client/settings/multi-currency/enabled-currencies-list/modal.js
diff --git a/multi-currency/client/settings/multi-currency/enabled-currencies-list/style.scss b/includes/multi-currency/client/settings/multi-currency/enabled-currencies-list/style.scss
similarity index 100%
rename from multi-currency/client/settings/multi-currency/enabled-currencies-list/style.scss
rename to includes/multi-currency/client/settings/multi-currency/enabled-currencies-list/style.scss
diff --git a/multi-currency/client/settings/multi-currency/enabled-currencies-list/test/__snapshots__/index.js.snap b/includes/multi-currency/client/settings/multi-currency/enabled-currencies-list/test/__snapshots__/index.js.snap
similarity index 100%
rename from multi-currency/client/settings/multi-currency/enabled-currencies-list/test/__snapshots__/index.js.snap
rename to includes/multi-currency/client/settings/multi-currency/enabled-currencies-list/test/__snapshots__/index.js.snap
diff --git a/multi-currency/client/settings/multi-currency/enabled-currencies-list/test/index.js b/includes/multi-currency/client/settings/multi-currency/enabled-currencies-list/test/index.js
similarity index 100%
rename from multi-currency/client/settings/multi-currency/enabled-currencies-list/test/index.js
rename to includes/multi-currency/client/settings/multi-currency/enabled-currencies-list/test/index.js
diff --git a/multi-currency/client/settings/multi-currency/index.js b/includes/multi-currency/client/settings/multi-currency/index.js
similarity index 100%
rename from multi-currency/client/settings/multi-currency/index.js
rename to includes/multi-currency/client/settings/multi-currency/index.js
diff --git a/multi-currency/client/settings/multi-currency/store-settings/index.js b/includes/multi-currency/client/settings/multi-currency/store-settings/index.js
similarity index 100%
rename from multi-currency/client/settings/multi-currency/store-settings/index.js
rename to includes/multi-currency/client/settings/multi-currency/store-settings/index.js
diff --git a/multi-currency/client/settings/multi-currency/store-settings/style.scss b/includes/multi-currency/client/settings/multi-currency/store-settings/style.scss
similarity index 100%
rename from multi-currency/client/settings/multi-currency/store-settings/style.scss
rename to includes/multi-currency/client/settings/multi-currency/store-settings/style.scss
diff --git a/multi-currency/client/settings/multi-currency/store-settings/test/__snapshots__/index.test.js.snap b/includes/multi-currency/client/settings/multi-currency/store-settings/test/__snapshots__/index.test.js.snap
similarity index 100%
rename from multi-currency/client/settings/multi-currency/store-settings/test/__snapshots__/index.test.js.snap
rename to includes/multi-currency/client/settings/multi-currency/store-settings/test/__snapshots__/index.test.js.snap
diff --git a/multi-currency/client/settings/multi-currency/store-settings/test/index.test.js b/includes/multi-currency/client/settings/multi-currency/store-settings/test/index.test.js
similarity index 100%
rename from multi-currency/client/settings/multi-currency/store-settings/test/index.test.js
rename to includes/multi-currency/client/settings/multi-currency/store-settings/test/index.test.js
diff --git a/multi-currency/client/settings/multi-currency/style.scss b/includes/multi-currency/client/settings/multi-currency/style.scss
similarity index 100%
rename from multi-currency/client/settings/multi-currency/style.scss
rename to includes/multi-currency/client/settings/multi-currency/style.scss
diff --git a/multi-currency/client/settings/multi-currency/test/__snapshots__/index.test.js.snap b/includes/multi-currency/client/settings/multi-currency/test/__snapshots__/index.test.js.snap
similarity index 100%
rename from multi-currency/client/settings/multi-currency/test/__snapshots__/index.test.js.snap
rename to includes/multi-currency/client/settings/multi-currency/test/__snapshots__/index.test.js.snap
diff --git a/multi-currency/client/settings/multi-currency/test/index.test.js b/includes/multi-currency/client/settings/multi-currency/test/index.test.js
similarity index 100%
rename from multi-currency/client/settings/multi-currency/test/index.test.js
rename to includes/multi-currency/client/settings/multi-currency/test/index.test.js
diff --git a/multi-currency/client/settings/single-currency/constants.js b/includes/multi-currency/client/settings/single-currency/constants.js
similarity index 100%
rename from multi-currency/client/settings/single-currency/constants.js
rename to includes/multi-currency/client/settings/single-currency/constants.js
diff --git a/multi-currency/client/settings/single-currency/currency-preview.js b/includes/multi-currency/client/settings/single-currency/currency-preview.js
similarity index 100%
rename from multi-currency/client/settings/single-currency/currency-preview.js
rename to includes/multi-currency/client/settings/single-currency/currency-preview.js
diff --git a/multi-currency/client/settings/single-currency/index.js b/includes/multi-currency/client/settings/single-currency/index.js
similarity index 100%
rename from multi-currency/client/settings/single-currency/index.js
rename to includes/multi-currency/client/settings/single-currency/index.js
diff --git a/multi-currency/client/settings/single-currency/style.scss b/includes/multi-currency/client/settings/single-currency/style.scss
similarity index 100%
rename from multi-currency/client/settings/single-currency/style.scss
rename to includes/multi-currency/client/settings/single-currency/style.scss
diff --git a/multi-currency/client/settings/single-currency/test/__snapshots__/index.test.js.snap b/includes/multi-currency/client/settings/single-currency/test/__snapshots__/index.test.js.snap
similarity index 100%
rename from multi-currency/client/settings/single-currency/test/__snapshots__/index.test.js.snap
rename to includes/multi-currency/client/settings/single-currency/test/__snapshots__/index.test.js.snap
diff --git a/multi-currency/client/settings/single-currency/test/index.test.js b/includes/multi-currency/client/settings/single-currency/test/index.test.js
similarity index 100%
rename from multi-currency/client/settings/single-currency/test/index.test.js
rename to includes/multi-currency/client/settings/single-currency/test/index.test.js
diff --git a/multi-currency/client/setup/index.js b/includes/multi-currency/client/setup/index.js
similarity index 100%
rename from multi-currency/client/setup/index.js
rename to includes/multi-currency/client/setup/index.js
diff --git a/multi-currency/client/setup/tasks/add-currencies-task/constants.js b/includes/multi-currency/client/setup/tasks/add-currencies-task/constants.js
similarity index 100%
rename from multi-currency/client/setup/tasks/add-currencies-task/constants.js
rename to includes/multi-currency/client/setup/tasks/add-currencies-task/constants.js
diff --git a/multi-currency/client/setup/tasks/add-currencies-task/index.js b/includes/multi-currency/client/setup/tasks/add-currencies-task/index.js
similarity index 100%
rename from multi-currency/client/setup/tasks/add-currencies-task/index.js
rename to includes/multi-currency/client/setup/tasks/add-currencies-task/index.js
diff --git a/multi-currency/client/setup/tasks/add-currencies-task/index.scss b/includes/multi-currency/client/setup/tasks/add-currencies-task/index.scss
similarity index 100%
rename from multi-currency/client/setup/tasks/add-currencies-task/index.scss
rename to includes/multi-currency/client/setup/tasks/add-currencies-task/index.scss
diff --git a/multi-currency/client/setup/tasks/add-currencies-task/test/__snapshots__/index.test.js.snap b/includes/multi-currency/client/setup/tasks/add-currencies-task/test/__snapshots__/index.test.js.snap
similarity index 100%
rename from multi-currency/client/setup/tasks/add-currencies-task/test/__snapshots__/index.test.js.snap
rename to includes/multi-currency/client/setup/tasks/add-currencies-task/test/__snapshots__/index.test.js.snap
diff --git a/multi-currency/client/setup/tasks/add-currencies-task/test/index.test.js b/includes/multi-currency/client/setup/tasks/add-currencies-task/test/index.test.js
similarity index 100%
rename from multi-currency/client/setup/tasks/add-currencies-task/test/index.test.js
rename to includes/multi-currency/client/setup/tasks/add-currencies-task/test/index.test.js
diff --git a/multi-currency/client/setup/tasks/add-currencies-task/test/utils.test.js b/includes/multi-currency/client/setup/tasks/add-currencies-task/test/utils.test.js
similarity index 100%
rename from multi-currency/client/setup/tasks/add-currencies-task/test/utils.test.js
rename to includes/multi-currency/client/setup/tasks/add-currencies-task/test/utils.test.js
diff --git a/multi-currency/client/setup/tasks/add-currencies-task/utils.js b/includes/multi-currency/client/setup/tasks/add-currencies-task/utils.js
similarity index 100%
rename from multi-currency/client/setup/tasks/add-currencies-task/utils.js
rename to includes/multi-currency/client/setup/tasks/add-currencies-task/utils.js
diff --git a/multi-currency/client/setup/tasks/multi-currency-setup.js b/includes/multi-currency/client/setup/tasks/multi-currency-setup.js
similarity index 100%
rename from multi-currency/client/setup/tasks/multi-currency-setup.js
rename to includes/multi-currency/client/setup/tasks/multi-currency-setup.js
diff --git a/multi-currency/client/setup/tasks/multi-currency-setup.scss b/includes/multi-currency/client/setup/tasks/multi-currency-setup.scss
similarity index 100%
rename from multi-currency/client/setup/tasks/multi-currency-setup.scss
rename to includes/multi-currency/client/setup/tasks/multi-currency-setup.scss
diff --git a/multi-currency/client/setup/tasks/setup-complete-task/index.js b/includes/multi-currency/client/setup/tasks/setup-complete-task/index.js
similarity index 100%
rename from multi-currency/client/setup/tasks/setup-complete-task/index.js
rename to includes/multi-currency/client/setup/tasks/setup-complete-task/index.js
diff --git a/multi-currency/client/setup/tasks/setup-complete-task/index.scss b/includes/multi-currency/client/setup/tasks/setup-complete-task/index.scss
similarity index 100%
rename from multi-currency/client/setup/tasks/setup-complete-task/index.scss
rename to includes/multi-currency/client/setup/tasks/setup-complete-task/index.scss
diff --git a/multi-currency/client/setup/tasks/setup-complete-task/test/index.test.js b/includes/multi-currency/client/setup/tasks/setup-complete-task/test/index.test.js
similarity index 100%
rename from multi-currency/client/setup/tasks/setup-complete-task/test/index.test.js
rename to includes/multi-currency/client/setup/tasks/setup-complete-task/test/index.test.js
diff --git a/multi-currency/client/setup/tasks/store-settings-task/index.js b/includes/multi-currency/client/setup/tasks/store-settings-task/index.js
similarity index 100%
rename from multi-currency/client/setup/tasks/store-settings-task/index.js
rename to includes/multi-currency/client/setup/tasks/store-settings-task/index.js
diff --git a/multi-currency/client/setup/tasks/store-settings-task/index.scss b/includes/multi-currency/client/setup/tasks/store-settings-task/index.scss
similarity index 100%
rename from multi-currency/client/setup/tasks/store-settings-task/index.scss
rename to includes/multi-currency/client/setup/tasks/store-settings-task/index.scss
diff --git a/multi-currency/client/setup/tasks/store-settings-task/test/__snapshots__/index.test.js.snap b/includes/multi-currency/client/setup/tasks/store-settings-task/test/__snapshots__/index.test.js.snap
similarity index 100%
rename from multi-currency/client/setup/tasks/store-settings-task/test/__snapshots__/index.test.js.snap
rename to includes/multi-currency/client/setup/tasks/store-settings-task/test/__snapshots__/index.test.js.snap
diff --git a/multi-currency/client/setup/tasks/store-settings-task/test/index.test.js b/includes/multi-currency/client/setup/tasks/store-settings-task/test/index.test.js
similarity index 100%
rename from multi-currency/client/setup/tasks/store-settings-task/test/index.test.js
rename to includes/multi-currency/client/setup/tasks/store-settings-task/test/index.test.js
diff --git a/multi-currency/client/setup/tasks/test/__snapshots__/multi-currency-setup.test.js.snap b/includes/multi-currency/client/setup/tasks/test/__snapshots__/multi-currency-setup.test.js.snap
similarity index 100%
rename from multi-currency/client/setup/tasks/test/__snapshots__/multi-currency-setup.test.js.snap
rename to includes/multi-currency/client/setup/tasks/test/__snapshots__/multi-currency-setup.test.js.snap
diff --git a/multi-currency/client/setup/tasks/test/multi-currency-setup.test.js b/includes/multi-currency/client/setup/tasks/test/multi-currency-setup.test.js
similarity index 100%
rename from multi-currency/client/setup/tasks/test/multi-currency-setup.test.js
rename to includes/multi-currency/client/setup/tasks/test/multi-currency-setup.test.js
diff --git a/multi-currency/client/setup/test/index.js b/includes/multi-currency/client/setup/test/index.js
similarity index 100%
rename from multi-currency/client/setup/test/index.js
rename to includes/multi-currency/client/setup/test/index.js
diff --git a/multi-currency/client/utils/currency/index.js b/includes/multi-currency/client/utils/currency/index.js
similarity index 100%
rename from multi-currency/client/utils/currency/index.js
rename to includes/multi-currency/client/utils/currency/index.js
diff --git a/multi-currency/client/utils/currency/test/index.js b/includes/multi-currency/client/utils/currency/test/index.js
similarity index 100%
rename from multi-currency/client/utils/currency/test/index.js
rename to includes/multi-currency/client/utils/currency/test/index.js
diff --git a/multi-currency/client/utils/missing-currencies-message/__tests__/index.test.js b/includes/multi-currency/client/utils/missing-currencies-message/__tests__/index.test.js
similarity index 100%
rename from multi-currency/client/utils/missing-currencies-message/__tests__/index.test.js
rename to includes/multi-currency/client/utils/missing-currencies-message/__tests__/index.test.js
diff --git a/multi-currency/client/utils/missing-currencies-message/index.ts b/includes/multi-currency/client/utils/missing-currencies-message/index.ts
similarity index 100%
rename from multi-currency/client/utils/missing-currencies-message/index.ts
rename to includes/multi-currency/client/utils/missing-currencies-message/index.ts
diff --git a/phpcs.xml.dist b/phpcs.xml.dist
index a0bf916f7a9..e997f0fa2fd 100644
--- a/phpcs.xml.dist
+++ b/phpcs.xml.dist
@@ -102,7 +102,7 @@
 
 	<rule ref="WordPress.Files.FileName">
 		<exclude-pattern>tests/*</exclude-pattern>
-		<exclude-pattern>multi-currency/src</exclude-pattern>
+		<exclude-pattern>includes/multi-currency/*</exclude-pattern>
 		<exclude-pattern>src</exclude-pattern>
 	</rule>
 
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
index 1eb5fab3f04..2a5164e8af3 100644
--- a/psalm-baseline.xml
+++ b/psalm-baseline.xml
@@ -46,13 +46,13 @@
       <code>WC_Subscriptions_Product</code>
     </UndefinedClass>
   </file>
-  <file src="multi-currency/src/Compatibility/WooCommerceProductAddOns.php">
+  <file src="includes/multi-currency/Compatibility/WooCommerceProductAddOns.php">
     <UndefinedClass occurrences="2">
       <code>\WC_Product_Addons_Helper</code>
       <code>\WC_Product_Addons_Helper</code>
     </UndefinedClass>
   </file>
-  <file src="multi-currency/src/Compatibility/WooCommerceNameYourPrice.php">
+  <file src="includes/multi-currency/Compatibility/WooCommerceNameYourPrice.php">
     <UndefinedClass occurrences="2">
       <code>\WC_Name_Your_Price_Helpers</code>
       <code>\WC_Name_Your_Price_Helpers</code>
diff --git a/tasks/release.js b/tasks/release.js
index 72c3eccdef7..92b8c2986de 100644
--- a/tasks/release.js
+++ b/tasks/release.js
@@ -43,9 +43,9 @@ rm( 'dist/*.map' );
 // copy the directories to the release folder
 cp( '-Rf', filesToCopy, targetFolder );
 
-// copy the multi-currency files
-mkdir( '-p', targetFolder + '/multi-currency' );
-cp( '-R', 'multi-currency/src', targetFolder + '/multi-currency/src' );
+// The '/includes/multi-currency/client' directory is removed because '/includes/multi-currency/*' should contain only server-side files.
+// Furthermore, the './client' directory is already included in 'dist' during the build step.
+rm( '-rf', targetFolder + '/includes/multi-currency/client' );
 
 const output = fs.createWriteStream(
 	releaseFolder + '/' + pluginSlug + '.zip'
diff --git a/tests/js/jest.config.js b/tests/js/jest.config.js
index 03060196d4c..7a918a8d63c 100644
--- a/tests/js/jest.config.js
+++ b/tests/js/jest.config.js
@@ -5,7 +5,7 @@ module.exports = {
 	moduleDirectories: [
 		'node_modules',
 		'<rootDir>/client',
-		'<rootDir>/multi-currency/client',
+		'<rootDir>/includes/multi-currency/client',
 	],
 	moduleNameMapper: {
 		'^react$': '<rootDir>/node_modules/react',
@@ -13,7 +13,7 @@ module.exports = {
 		'^moment$': '<rootDir>/node_modules/moment',
 		'^moment-timezone$': '<rootDir>/node_modules/moment-timezone',
 		'^wcpay(.*)$': '<rootDir>/client$1',
-		'^multi-currency(.*)$': '<rootDir>/multi-currency/client$1',
+		'^multi-currency(.*)$': '<rootDir>/includes/multi-currency/client$1',
 		'^iti/utils$': '<rootDir>/node_modules/intl-tel-input/build/js/utils',
 		'^assets(.*?)(\\?.*)?$': '<rootDir>/assets$1',
 		'^@woocommerce/blocks-registry$':
diff --git a/tsconfig.json b/tsconfig.json
index f7f56cddd52..13218eb83d0 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -15,7 +15,7 @@
     "paths": {
       "assets/*": [ "../assets/*" ],
       "wcpay/*": [ "./*" ],
-      "multi-currency/*": [ "../multi-currency/client/*" ],
+      "multi-currency/*": [ "../includes/multi-currency/client/*" ],
       "iti/utils": [ "../node_modules/intl-tel-input/build/js/utils" ],
       "react": [ "../node_modules/@types/react" ]
     },
diff --git a/webpack/shared.js b/webpack/shared.js
index 55c249694ea..7fe200a9f7a 100644
--- a/webpack/shared.js
+++ b/webpack/shared.js
@@ -26,11 +26,11 @@ module.exports = {
 			'subscription-edit-page': './client/subscription-edit-page.js',
 			tos: './client/tos/index.js',
 			'payment-gateways': './client/payment-gateways/index.js',
-			'multi-currency': './multi-currency/client/index.js',
+			'multi-currency': './includes/multi-currency/client/index.js',
 			'multi-currency-switcher-block':
-				'./multi-currency/client/blocks/currency-switcher.js',
+				'./includes/multi-currency/client/blocks/currency-switcher.js',
 			'multi-currency-analytics':
-				'./multi-currency/client/analytics/index.js',
+				'./includes/multi-currency/client/analytics/index.js',
 			order: './client/order/index.js',
 			'subscriptions-empty-state':
 				'./client/subscriptions-empty-state/index.js',
@@ -115,15 +115,14 @@ module.exports = {
 		extensions: [ '.ts', '.tsx', '.json', '.js', '.jsx' ],
 		modules: [
 			path.join( process.cwd(), 'client' ),
-			path.join( process.cwd(), 'multi-currency', 'client' ),
+			path.join( process.cwd(), 'includes/multi-currency/client' ),
 			'node_modules',
 		],
 		alias: {
 			assets: path.resolve( process.cwd(), 'assets' ),
 			'multi-currency': path.resolve(
 				process.cwd(),
-				'multi-currency',
-				'client'
+				'includes/multi-currency/client'
 			),
 			wcpay: path.resolve( process.cwd(), 'client' ),
 			iti: path.resolve(

From 4580c39bd8dc3852c182aea5859dc97dd3079ea2 Mon Sep 17 00:00:00 2001
From: Miguel Gasca <miguel.gasca@automattic.com>
Date: Thu, 7 Nov 2024 15:58:36 +0100
Subject: [PATCH 34/45] Enqueue order scripts for all available payment methods
 (#9678)

---
 ...o-manual-refunds-and-process-refunds-again-via-woopayments | 4 ++++
 client/order/refund-confirm-modal/index.js                    | 2 +-
 includes/admin/class-wc-payments-admin.php                    | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
 create mode 100644 changelog/fix-8423-klarna-cant-undo-manual-refunds-and-process-refunds-again-via-woopayments

diff --git a/changelog/fix-8423-klarna-cant-undo-manual-refunds-and-process-refunds-again-via-woopayments b/changelog/fix-8423-klarna-cant-undo-manual-refunds-and-process-refunds-again-via-woopayments
new file mode 100644
index 00000000000..8cd309f823c
--- /dev/null
+++ b/changelog/fix-8423-klarna-cant-undo-manual-refunds-and-process-refunds-again-via-woopayments
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fix
+
+Include missing scripts that handle refunds for non credit card payments in the order details page.
diff --git a/client/order/refund-confirm-modal/index.js b/client/order/refund-confirm-modal/index.js
index fc589feb3c1..f7d8c66de07 100644
--- a/client/order/refund-confirm-modal/index.js
+++ b/client/order/refund-confirm-modal/index.js
@@ -115,7 +115,7 @@ const RefundConfirmationModal = ( {
 						{ sprintf(
 							/* translators: %s: WooPayments */
 							__(
-								"Issue a full refund back to your customer's credit card using %s. " +
+								"Issue a full refund back to your customer's payment method using %s. " +
 									'This action can not be undone. To issue a partial refund, click "Cancel", and use ' +
 									'the "Refund" button in the order details below.',
 								'woocommerce-payments'
diff --git a/includes/admin/class-wc-payments-admin.php b/includes/admin/class-wc-payments-admin.php
index 9c53cb48597..8b2713c4829 100644
--- a/includes/admin/class-wc-payments-admin.php
+++ b/includes/admin/class-wc-payments-admin.php
@@ -733,7 +733,7 @@ public function enqueue_payments_scripts() {
 		if ( in_array( $screen->id, [ 'shop_order', 'woocommerce_page_wc-orders' ], true ) ) {
 			$order = wc_get_order();
 
-			if ( $order && WC_Payment_Gateway_WCPay::GATEWAY_ID === $order->get_payment_method() ) {
+			if ( $order && strpos( $order->get_payment_method(), WC_Payment_Gateway_WCPay::GATEWAY_ID ) !== false ) {
 				$refund_amount = $order->get_remaining_refund_amount();
 
 				// Check if the order's test mode meta matches the site's current test mode state.

From c7d817a766bca346d2ad0ee5d3413fccd9eaf4ea Mon Sep 17 00:00:00 2001
From: Francesco <frosso@users.noreply.github.com>
Date: Thu, 7 Nov 2024 17:16:31 +0100
Subject: [PATCH 35/45] update: show LPM icon on order success page (#9684)

Co-authored-by: Brett Shumaker <brettshumaker@gmail.com>
---
 assets/css/success.css                        |  6 ++--
 assets/css/success.rtl.css                    |  6 ++--
 changelog/update-order-success-lpm-icon       |  4 +++
 .../class-wc-payments-order-success-page.php  | 34 +++++++++++++------
 4 files changed, 33 insertions(+), 17 deletions(-)
 create mode 100644 changelog/update-order-success-lpm-icon

diff --git a/assets/css/success.css b/assets/css/success.css
index 8ada2af0ee6..f11e45dd18a 100644
--- a/assets/css/success.css
+++ b/assets/css/success.css
@@ -3,13 +3,13 @@
 	align-items: center;
 	flex-wrap: wrap;
 	line-height: 1;
+	padding-top: 4px;
 }
 
 .wc-payment-gateway-method-logo-wrapper img {
 	margin-right: 0.5rem;
-	padding-top: 4px;
 }
 
-.wc-payment-gateway-method-logo-wrapper.wc-payment-bnpl-logo img {
-	max-height: 30px;
+.wc-payment-gateway-method-logo-wrapper.wc-payment-lpm-logo img {
+	max-height: 26px;
 }
diff --git a/assets/css/success.rtl.css b/assets/css/success.rtl.css
index 16c136a0b1e..c0778375319 100644
--- a/assets/css/success.rtl.css
+++ b/assets/css/success.rtl.css
@@ -3,13 +3,13 @@
 	align-items: center;
 	flex-wrap: wrap;
 	line-height: 1;
+	padding-top: 4px;
 }
 
 .wc-payment-gateway-method-logo-wrapper img {
 	margin-left: 0.5rem;
-	padding-top: 4px;
 }
 
-.wc-payment-gateway-method-logo-wrapper.wc-payment-bnpl-logo img {
-	max-height: 30px;
+.wc-payment-gateway-method-logo-wrapper.wc-payment-lpm-logo img {
+	max-height: 26px;
 }
diff --git a/changelog/update-order-success-lpm-icon b/changelog/update-order-success-lpm-icon
new file mode 100644
index 00000000000..d0f4ac443af
--- /dev/null
+++ b/changelog/update-order-success-lpm-icon
@@ -0,0 +1,4 @@
+Significance: patch
+Type: update
+
+update: show LPM payment method icon on order success page
diff --git a/includes/class-wc-payments-order-success-page.php b/includes/class-wc-payments-order-success-page.php
index 8051d8aab1c..78b9d6fc12a 100644
--- a/includes/class-wc-payments-order-success-page.php
+++ b/includes/class-wc-payments-order-success-page.php
@@ -5,6 +5,7 @@
  * @package WooCommerce\Payments
  */
 
+use WCPay\Constants\Payment_Method;
 use WCPay\Duplicate_Payment_Prevention_Service;
 
 /**
@@ -78,14 +79,16 @@ public function show_woocommerce_payments_payment_method_name( $payment_method_t
 		}
 
 		$payment_method = $gateway->get_payment_method( $order );
+		// GooglePay/ApplePay/Link/Card to be supported later.
+		if ( $payment_method->get_id() === Payment_Method::CARD ) {
+			return $payment_method_title;
+		}
 
-		// If this is a BNPL order, return the html for the BNPL payment method name.
-		if ( $payment_method->is_bnpl() ) {
-			$bnpl_output = $this->show_bnpl_payment_method_name( $gateway, $payment_method );
+		// If this is an LPM (BNPL or local payment method) order, return the html for the payment method name.
+		$name_output = $this->show_lpm_payment_method_name( $gateway, $payment_method );
 
-			if ( false !== $bnpl_output ) {
-				return $bnpl_output;
-			}
+		if ( false !== $name_output ) {
+			return $name_output;
 		}
 
 		return $payment_method_title;
@@ -116,17 +119,26 @@ public function show_woopay_payment_method_name( $order ) {
 	}
 
 	/**
-	 * Add the BNPL logo to the payment method name on the order received page.
+	 * Add the LPM logo to the payment method name on the order received page.
 	 *
 	 * @param WC_Payment_Gateway_WCPay                 $gateway the gateway being shown.
 	 * @param WCPay\Payment_Methods\UPE_Payment_Method $payment_method the payment method being shown.
 	 *
 	 * @return string|false
 	 */
-	public function show_bnpl_payment_method_name( $gateway, $payment_method ) {
-		$method_logo_url = apply_filters(
+	public function show_lpm_payment_method_name( $gateway, $payment_method ) {
+		$method_logo_url = apply_filters_deprecated(
 			'wc_payments_thank_you_page_bnpl_payment_method_logo_url',
-			$payment_method->get_payment_method_icon_for_location( 'checkout', false, $gateway->get_account_country() ),
+			[
+				$payment_method->get_payment_method_icon_for_location( 'checkout', false, $gateway->get_account_country() ),
+				$payment_method->get_id(),
+			],
+			'8.5.0',
+			'wc_payments_thank_you_page_lpm_payment_method_logo_url'
+		);
+		$method_logo_url = apply_filters(
+			'wc_payments_thank_you_page_lpm_payment_method_logo_url',
+			$method_logo_url,
 			$payment_method->get_id()
 		);
 
@@ -137,7 +149,7 @@ public function show_bnpl_payment_method_name( $gateway, $payment_method ) {
 
 		ob_start();
 		?>
-		<div class="wc-payment-gateway-method-logo-wrapper wc-payment-bnpl-logo <?php echo esc_attr( $payment_method->get_id() ); ?>">
+		<div class="wc-payment-gateway-method-logo-wrapper wc-payment-lpm-logo wc-payment-lpm-logo--<?php echo esc_attr( $payment_method->get_id() ); ?>">
 			<img alt="<?php echo esc_attr( $payment_method->get_title() ); ?>" src="<?php echo esc_url_raw( $method_logo_url ); ?>">
 		</div>
 		<?php

From c5d9463cf5eb5e20686249b31f4a40d84c4afcea Mon Sep 17 00:00:00 2001
From: Guilherme Pressutto <gpressutto5@gmail.com>
Date: Thu, 7 Nov 2024 16:15:39 -0300
Subject: [PATCH 36/45] Fix duplicate saving of 3DS card entry after checkout
 (#9679)

---
 changelog/fix-saving-duplicate-3ds-cards       | 4 ++++
 client/checkout/api/index.js                   | 8 +++++---
 client/checkout/blocks/confirm-card-payment.js | 4 ++--
 client/checkout/classic/3ds-flow-handling.js   | 5 +----
 includes/class-wc-payment-gateway-wcpay.php    | 4 +++-
 5 files changed, 15 insertions(+), 10 deletions(-)
 create mode 100644 changelog/fix-saving-duplicate-3ds-cards

diff --git a/changelog/fix-saving-duplicate-3ds-cards b/changelog/fix-saving-duplicate-3ds-cards
new file mode 100644
index 00000000000..ee077e3e5e4
--- /dev/null
+++ b/changelog/fix-saving-duplicate-3ds-cards
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fix
+
+Fix duplicate saving of 3DS card entry after checkout
diff --git a/client/checkout/api/index.js b/client/checkout/api/index.js
index 855cecf966b..4e79f191aa9 100644
--- a/client/checkout/api/index.js
+++ b/client/checkout/api/index.js
@@ -125,10 +125,10 @@ export default class WCPayAPI {
 	 * and displays the intent confirmation modal (if needed).
 	 *
 	 * @param {string} redirectUrl The redirect URL, returned from the server.
-	 * @param {string} paymentMethodToSave The ID of a Payment Method if it should be saved (optional).
+	 * @param {boolean} shouldSavePaymentMethod Whether the payment method should be saved.
 	 * @return {Promise<string>|boolean} A redirect URL on success, or `true` if no confirmation is needed.
 	 */
-	confirmIntent( redirectUrl, paymentMethodToSave ) {
+	confirmIntent( redirectUrl, shouldSavePaymentMethod = false ) {
 		const partials = redirectUrl.match(
 			/#wcpay-confirm-(pi|si):(.+):(.+):(.+)$/
 		);
@@ -219,7 +219,9 @@ export default class WCPayAPI {
 						// order status call works when a guest user creates an account during checkout.
 						_ajax_nonce: nonce,
 						intent_id: intentId,
-						payment_method_id: paymentMethodToSave || null,
+						should_save_payment_method: shouldSavePaymentMethod
+							? 'true'
+							: 'false',
 					} );
 
 					return [ ajaxCall, result.error ];
diff --git a/client/checkout/blocks/confirm-card-payment.js b/client/checkout/blocks/confirm-card-payment.js
index 92089853376..90d303ca062 100644
--- a/client/checkout/blocks/confirm-card-payment.js
+++ b/client/checkout/blocks/confirm-card-payment.js
@@ -13,12 +13,12 @@ export default async function confirmCardPayment(
 	emitResponse,
 	shouldSavePayment
 ) {
-	const { redirect, payment_method: paymentMethod } = paymentDetails;
+	const { redirect } = paymentDetails;
 
 	try {
 		const confirmationRequest = api.confirmIntent(
 			redirect,
-			shouldSavePayment ? paymentMethod : null
+			shouldSavePayment
 		);
 
 		// `true` means there is no intent to confirm.
diff --git a/client/checkout/classic/3ds-flow-handling.js b/client/checkout/classic/3ds-flow-handling.js
index 72a28c815c8..d737d52e40b 100644
--- a/client/checkout/classic/3ds-flow-handling.js
+++ b/client/checkout/classic/3ds-flow-handling.js
@@ -22,12 +22,9 @@ const cleanupURL = () => {
 };
 
 export const showAuthenticationModalIfRequired = ( api ) => {
-	const paymentMethodId = document.querySelector( '#wcpay-payment-method' )
-		?.value;
-
 	const confirmationRequest = api.confirmIntent(
 		window.location.href,
-		shouldSavePaymentPaymentMethod() ? paymentMethodId : null
+		shouldSavePaymentPaymentMethod()
 	);
 
 	// Boolean `true` means that there is nothing to confirm.
diff --git a/includes/class-wc-payment-gateway-wcpay.php b/includes/class-wc-payment-gateway-wcpay.php
index f4b87f36354..84d30c82821 100644
--- a/includes/class-wc-payment-gateway-wcpay.php
+++ b/includes/class-wc-payment-gateway-wcpay.php
@@ -3624,7 +3624,9 @@ public function update_order_status() {
 				wc_reduce_stock_levels( $order_id );
 				WC()->cart->empty_cart();
 
-				if ( ! empty( $payment_method_id ) ) {
+				$is_subscription            = function_exists( 'wcs_order_contains_subscription' ) && wcs_order_contains_subscription( $order );
+				$should_save_payment_method = $is_subscription || ( isset( $_POST['should_save_payment_method'] ) && 'true' === $_POST['should_save_payment_method'] );
+				if ( $should_save_payment_method && ! empty( $payment_method_id ) ) {
 					try {
 						$token = $this->token_service->add_payment_method_to_user( $payment_method_id, wp_get_current_user() );
 						$this->add_token_to_order( $order, $token );

From 716a80e7876eaf4049add00eb77ab09a3d4dcccd Mon Sep 17 00:00:00 2001
From: Eric Jinks <3147296+Jinksi@users.noreply.github.com>
Date: Fri, 8 Nov 2024 13:53:57 +1000
Subject: [PATCH 37/45] Record a tracks event when a merchant is redirected to
 a Stripe Capital loan offer (#9652)

Co-authored-by: Jessy Pappachan <32092402+jessy-p@users.noreply.github.com>
Co-authored-by: Shendy <73803630+shendy-a8c@users.noreply.github.com>
---
 .../fix-9651-record-tracks-event-capital-view-offer-redirect | 5 +++++
 includes/class-wc-payments-redirect-service.php              | 2 ++
 2 files changed, 7 insertions(+)
 create mode 100644 changelog/fix-9651-record-tracks-event-capital-view-offer-redirect

diff --git a/changelog/fix-9651-record-tracks-event-capital-view-offer-redirect b/changelog/fix-9651-record-tracks-event-capital-view-offer-redirect
new file mode 100644
index 00000000000..57b1e4a1a7d
--- /dev/null
+++ b/changelog/fix-9651-record-tracks-event-capital-view-offer-redirect
@@ -0,0 +1,5 @@
+Significance: patch
+Type: update
+
+When tracking is enabled, send a tracks event when the merchant is redirected to a Stripe Capital offer.
+
diff --git a/includes/class-wc-payments-redirect-service.php b/includes/class-wc-payments-redirect-service.php
index bc4c3c77a54..7863cf0aa6d 100644
--- a/includes/class-wc-payments-redirect-service.php
+++ b/includes/class-wc-payments-redirect-service.php
@@ -8,6 +8,7 @@
 use WCPay\Core\Server\Request\Get_Account_Capital_Link;
 use WCPay\Core\Server\Request\Get_Account_Login_Data;
 use WCPay\Exceptions\API_Exception;
+use WCPay\Tracker;
 
 if ( ! defined( 'ABSPATH' ) ) {
 	exit; // Exit if accessed directly.
@@ -92,6 +93,7 @@ public function redirect_to_capital_view_offer_page(): void {
 			$request->set_refresh_url( $refresh_url );
 
 			$capital_link = $request->send();
+			Tracker::track_admin( 'wcpay_capital_view_offer_redirect' );
 			$this->redirect_to( $capital_link['url'] );
 		} catch ( Exception $e ) {
 

From 75a11d072a9c7cafa0eb627fbe458b93623f9f5a Mon Sep 17 00:00:00 2001
From: Timur Karimov <timur.karimow.95@gmail.com>
Date: Fri, 8 Nov 2024 16:22:52 +0100
Subject: [PATCH 38/45] Add country-specific test card numbers for credit card
 testing (#9688)

---
 changelog/add-country-specific-test-cards     |  4 +
 includes/class-wc-payments-checkout.php       |  6 +-
 includes/class-wc-payments.php                |  1 +
 .../constants/class-country-test-cards.php    | 95 +++++++++++++++++++
 .../class-affirm-payment-method.php           |  3 +-
 .../class-afterpay-payment-method.php         |  3 +-
 .../class-bancontact-payment-method.php       |  3 +-
 .../class-becs-payment-method.php             |  3 +-
 .../class-cc-payment-method.php               | 12 ++-
 .../class-eps-payment-method.php              |  3 +-
 .../class-giropay-payment-method.php          |  3 +-
 .../class-ideal-payment-method.php            |  3 +-
 .../class-klarna-payment-method.php           |  3 +-
 .../class-link-payment-method.php             |  3 +-
 .../class-p24-payment-method.php              |  3 +-
 .../class-sepa-payment-method.php             |  3 +-
 .../class-sofort-payment-method.php           |  3 +-
 .../class-upe-payment-method.php              |  3 +-
 .../unit/test-class-wc-payments-checkout.php  | 78 ++++++++++++++-
 19 files changed, 214 insertions(+), 21 deletions(-)
 create mode 100644 changelog/add-country-specific-test-cards
 create mode 100644 includes/constants/class-country-test-cards.php

diff --git a/changelog/add-country-specific-test-cards b/changelog/add-country-specific-test-cards
new file mode 100644
index 00000000000..7d7ff495c04
--- /dev/null
+++ b/changelog/add-country-specific-test-cards
@@ -0,0 +1,4 @@
+Significance: minor
+Type: add
+
+Add country-specific test card numbers for credit card testing
diff --git a/includes/class-wc-payments-checkout.php b/includes/class-wc-payments-checkout.php
index c4593f54b7e..bf8f623897b 100644
--- a/includes/class-wc-payments-checkout.php
+++ b/includes/class-wc-payments-checkout.php
@@ -324,7 +324,7 @@ public function get_enabled_payment_method_config() {
 			$gateway_for_payment_method                            = $this->gateway->wc_payments_get_payment_gateway_by_id( $payment_method_id );
 			$settings[ $payment_method_id ]['testingInstructions'] = WC_Payments_Utils::esc_interpolated_html(
 				/* translators: link to Stripe testing page */
-				$payment_method->get_testing_instructions(),
+				$payment_method->get_testing_instructions( $account_country ),
 				[
 					'a'      => '<a href="https://woocommerce.com/document/woopayments/testing-and-troubleshooting/testing/#test-cards" target="_blank">',
 					'strong' => '<strong>',
@@ -420,14 +420,14 @@ function () use ( $prepared_customer_data ) {
 				<?php
 			endif;
 
-			if ( WC_Payments::mode()->is_test() && false !== $this->gateway->get_payment_method()->get_testing_instructions() ) :
+			if ( WC_Payments::mode()->is_test() && false !== $this->gateway->get_payment_method()->get_testing_instructions( $this->account->get_account_country() ) ) :
 				?>
 				<p class="testmode-info">
 				<?php
 						// phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
 							echo WC_Payments_Utils::esc_interpolated_html(
 							/* translators: link to Stripe testing page */
-								$this->gateway->get_payment_method()->get_testing_instructions(),
+								$this->gateway->get_payment_method()->get_testing_instructions( $this->account->get_account_country() ),
 								[
 									'a'      => '<a href="https://woocommerce.com/document/woopayments/testing-and-troubleshooting/testing/#test-cards" target="_blank">',
 									'strong' => '<strong>',
diff --git a/includes/class-wc-payments.php b/includes/class-wc-payments.php
index a3e61337d3f..3ea8a99e992 100644
--- a/includes/class-wc-payments.php
+++ b/includes/class-wc-payments.php
@@ -465,6 +465,7 @@ public static function init() {
 		include_once __DIR__ . '/exceptions/class-invalid-address-exception.php';
 		include_once __DIR__ . '/constants/class-base-constant.php';
 		include_once __DIR__ . '/constants/class-country-code.php';
+		include_once __DIR__ . '/constants/class-country-test-cards.php';
 		include_once __DIR__ . '/constants/class-currency-code.php';
 		include_once __DIR__ . '/constants/class-fraud-meta-box-type.php';
 		include_once __DIR__ . '/constants/class-order-mode.php';
diff --git a/includes/constants/class-country-test-cards.php b/includes/constants/class-country-test-cards.php
new file mode 100644
index 00000000000..2e9a8287c84
--- /dev/null
+++ b/includes/constants/class-country-test-cards.php
@@ -0,0 +1,95 @@
+<?php
+/**
+ * Class Country_Test_Cards
+ *
+ * @package WooCommerce\Payments
+ */
+
+namespace WCPay\Constants;
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit; // Exit if accessed directly.
+}
+
+
+/**
+ * Class handling country-specific test card numbers for WooPayments
+ */
+class Country_Test_Cards extends Base_Constant {
+	/**
+	 * Map of country codes to their test card numbers
+	 * Source: https://docs.stripe.com/testing?testing-method=card-numbers#international-cards
+	 *
+	 * @var array
+	 */
+	private static $country_test_cards = [
+		Country_Code::UNITED_STATES        => '4242 4242 4242 4242',
+		Country_Code::ARGENTINA            => '4000 0003 2000 0021',
+		Country_Code::BRAZIL               => '4000 0007 6000 0002',
+		Country_Code::CANADA               => '4000 0012 4000 0000',
+		Country_Code::CHILE                => '4000 0015 2000 0001',
+		Country_Code::COLOMBIA             => '4000 0017 0000 0003',
+		Country_Code::COSTA_RICA           => '4000 0018 8000 0005',
+		Country_Code::ECUADOR              => '4000 0021 8000 0000',
+		Country_Code::MEXICO               => '4000 0048 4000 8001',
+		Country_Code::PANAMA               => '4000 0059 1000 0000',
+		Country_Code::PARAGUAY             => '4000 0060 0000 0066',
+		Country_Code::PERU                 => '4000 0060 4000 0068',
+		Country_Code::URUGUAY              => '4000 0085 8000 0003',
+		Country_Code::UNITED_ARAB_EMIRATES => '4000 0078 4000 0001',
+		Country_Code::AUSTRIA              => '4000 0004 0000 0008',
+		Country_Code::BELGIUM              => '4000 0005 6000 0004',
+		Country_Code::BULGARIA             => '4000 0010 0000 0000',
+		Country_Code::BELARUS              => '4000 0011 2000 0005',
+		Country_Code::CROATIA              => '4000 0019 1000 0009',
+		Country_Code::CYPRUS               => '4000 0019 6000 0008',
+		Country_Code::CZECHIA              => '4000 0020 3000 0002',
+		Country_Code::DENMARK              => '4000 0020 8000 0001',
+		Country_Code::ESTONIA              => '4000 0023 3000 0009',
+		Country_Code::FINLAND              => '4000 0024 6000 0001',
+		Country_Code::FRANCE               => '4000 0025 0000 0003',
+		Country_Code::GERMANY              => '4000 0027 6000 0016',
+		Country_Code::GIBRALTAR            => '4000 0029 2000 0005',
+		Country_Code::GREECE               => '4000 0030 0000 0030',
+		Country_Code::HUNGARY              => '4000 0034 8000 0005',
+		Country_Code::IRELAND              => '4000 0037 2000 0005',
+		Country_Code::ITALY                => '4000 0038 0000 0008',
+		Country_Code::LATVIA               => '4000 0042 8000 0005',
+		Country_Code::LIECHTENSTEIN        => '4000 0043 8000 0004',
+		Country_Code::LITHUANIA            => '4000 0044 0000 0000',
+		Country_Code::LUXEMBOURG           => '4000 0044 2000 0006',
+		Country_Code::MALTA                => '4000 0047 0000 0007',
+		Country_Code::NETHERLANDS          => '4000 0052 8000 0002',
+		Country_Code::NORWAY               => '4000 0057 8000 0007',
+		Country_Code::POLAND               => '4000 0061 6000 0005',
+		Country_Code::PORTUGAL             => '4000 0062 0000 0007',
+		Country_Code::ROMANIA              => '4000 0064 2000 0001',
+		Country_Code::SAUDI_ARABIA         => '4000 0068 2000 0007',
+		Country_Code::SLOVENIA             => '4000 0070 5000 0006',
+		Country_Code::SLOVAKIA             => '4000 0070 3000 0001',
+		Country_Code::SPAIN                => '4000 0072 4000 0007',
+		Country_Code::SWEDEN               => '4000 0075 2000 0008',
+		Country_Code::SWITZERLAND          => '4000 0075 6000 0009',
+		Country_Code::UNITED_KINGDOM       => '4000 0082 6000 0000',
+		Country_Code::AUSTRALIA            => '4000 0003 6000 0006',
+		Country_Code::CHINA                => '4000 0015 6000 0002',
+		Country_Code::HONG_KONG            => '4000 0034 4000 0004',
+		Country_Code::INDIA                => '4000 0035 6000 0008',
+		Country_Code::JAPAN                => '4000 0039 2000 0003',
+		Country_Code::MALAYSIA             => '4000 0045 8000 0002',
+		Country_Code::NEW_ZEALAND          => '4000 0055 4000 0008',
+		Country_Code::SINGAPORE            => '4000 0070 2000 0003',
+		Country_Code::TAIWAN               => '4000 0015 8000 0008',
+		Country_Code::THAILAND             => '4000 0076 4000 0003',
+	];
+
+	/**
+	 * Get test card number for a specific country.
+	 *
+	 * @param string $country_code Two-letter country code.
+	 * @return string Test card number
+	 */
+	public static function get_test_card_for_country( string $country_code ) {
+		return self::$country_test_cards[ $country_code ] ?? self::$country_test_cards[ Country_Code::UNITED_STATES ];
+	}
+}
diff --git a/includes/payment-methods/class-affirm-payment-method.php b/includes/payment-methods/class-affirm-payment-method.php
index 68699548124..24dba99b021 100644
--- a/includes/payment-methods/class-affirm-payment-method.php
+++ b/includes/payment-methods/class-affirm-payment-method.php
@@ -41,9 +41,10 @@ public function __construct( $token_service ) {
 	/**
 	 * Returns testing credentials to be printed at checkout in test mode.
 	 *
+	 * @param string $account_country The country of the account.
 	 * @return string
 	 */
-	public function get_testing_instructions() {
+	public function get_testing_instructions( string $account_country ) {
 		return '';
 	}
 }
diff --git a/includes/payment-methods/class-afterpay-payment-method.php b/includes/payment-methods/class-afterpay-payment-method.php
index 89062a4a7f9..a0a4acbbf30 100644
--- a/includes/payment-methods/class-afterpay-payment-method.php
+++ b/includes/payment-methods/class-afterpay-payment-method.php
@@ -71,9 +71,10 @@ public function get_icon( string $account_country = null ) {
 	/**
 	 * Returns testing credentials to be printed at checkout in test mode.
 	 *
+	 * @param string $account_country The country of the account.
 	 * @return string
 	 */
-	public function get_testing_instructions() {
+	public function get_testing_instructions( string $account_country ) {
 		return '';
 	}
 }
diff --git a/includes/payment-methods/class-bancontact-payment-method.php b/includes/payment-methods/class-bancontact-payment-method.php
index 6d4f845416c..422636084ff 100644
--- a/includes/payment-methods/class-bancontact-payment-method.php
+++ b/includes/payment-methods/class-bancontact-payment-method.php
@@ -36,9 +36,10 @@ public function __construct( $token_service ) {
 	/**
 	 * Returns testing credentials to be printed at checkout in test mode.
 	 *
+	 * @param string $account_country The country of the account.
 	 * @return string
 	 */
-	public function get_testing_instructions() {
+	public function get_testing_instructions( string $account_country ) {
 		return '';
 	}
 }
diff --git a/includes/payment-methods/class-becs-payment-method.php b/includes/payment-methods/class-becs-payment-method.php
index 1d2c20b5b70..763a181d059 100644
--- a/includes/payment-methods/class-becs-payment-method.php
+++ b/includes/payment-methods/class-becs-payment-method.php
@@ -36,9 +36,10 @@ public function __construct( $token_service ) {
 	/**
 	 * Returns testing credentials to be printed at checkout in test mode.
 	 *
+	 * @param string $account_country The country of the account.
 	 * @return string
 	 */
-	public function get_testing_instructions() {
+	public function get_testing_instructions( string $account_country ) {
 		return __( '<strong>Test mode:</strong> use the test account number <number>000123456</number>. Other payment methods may redirect to a Stripe test page to authorize payment. More test card numbers are listed <a>here</a>.', 'woocommerce-payments' );
 	}
 }
diff --git a/includes/payment-methods/class-cc-payment-method.php b/includes/payment-methods/class-cc-payment-method.php
index df14d4ecd8c..3f0c114aa8a 100644
--- a/includes/payment-methods/class-cc-payment-method.php
+++ b/includes/payment-methods/class-cc-payment-method.php
@@ -8,6 +8,7 @@
 namespace WCPay\Payment_Methods;
 
 use WC_Payments_Token_Service;
+use WCPay\Constants\Country_Test_Cards;
 
 /**
  * Credit card Payment Method class extending UPE base class
@@ -67,9 +68,16 @@ public function get_title( string $account_country = null, $payment_details = fa
 	/**
 	 * Returns testing credentials to be printed at checkout in test mode.
 	 *
+	 * @param string $account_country The country of the account.
 	 * @return string
 	 */
-	public function get_testing_instructions() {
-		return __( 'Use test card <number>4242 4242 4242 4242</number> or refer to our <a>testing guide</a>.', 'woocommerce-payments' );
+	public function get_testing_instructions( string $account_country ) {
+		$test_card_number = Country_Test_Cards::get_test_card_for_country( $account_country );
+
+		return sprintf(
+			// Translators: %s is a test card number.
+			__( 'Use test card <number>%s</number> or refer to our <a>testing guide</a>.', 'woocommerce-payments' ),
+			$test_card_number
+		);
 	}
 }
diff --git a/includes/payment-methods/class-eps-payment-method.php b/includes/payment-methods/class-eps-payment-method.php
index 5b2e73ed441..ab936ace70d 100644
--- a/includes/payment-methods/class-eps-payment-method.php
+++ b/includes/payment-methods/class-eps-payment-method.php
@@ -36,9 +36,10 @@ public function __construct( $token_service ) {
 	/**
 	 * Returns testing credentials to be printed at checkout in test mode.
 	 *
+	 * @param string $account_country The country of the account.
 	 * @return string
 	 */
-	public function get_testing_instructions() {
+	public function get_testing_instructions( string $account_country ) {
 		return '';
 	}
 }
diff --git a/includes/payment-methods/class-giropay-payment-method.php b/includes/payment-methods/class-giropay-payment-method.php
index b117382f0da..82095ffbf33 100644
--- a/includes/payment-methods/class-giropay-payment-method.php
+++ b/includes/payment-methods/class-giropay-payment-method.php
@@ -36,9 +36,10 @@ public function __construct( $token_service ) {
 	/**
 	 * Returns testing credentials to be printed at checkout in test mode.
 	 *
+	 * @param string $account_country The country of the account.
 	 * @return string
 	 */
-	public function get_testing_instructions() {
+	public function get_testing_instructions( string $account_country ) {
 		return '';
 	}
 }
diff --git a/includes/payment-methods/class-ideal-payment-method.php b/includes/payment-methods/class-ideal-payment-method.php
index 084499b6efe..5c1ac9abfbe 100644
--- a/includes/payment-methods/class-ideal-payment-method.php
+++ b/includes/payment-methods/class-ideal-payment-method.php
@@ -36,9 +36,10 @@ public function __construct( $token_service ) {
 	/**
 	 * Returns testing credentials to be printed at checkout in test mode.
 	 *
+	 * @param string $account_country The country of the account.
 	 * @return string
 	 */
-	public function get_testing_instructions() {
+	public function get_testing_instructions( string $account_country ) {
 		return '';
 	}
 }
diff --git a/includes/payment-methods/class-klarna-payment-method.php b/includes/payment-methods/class-klarna-payment-method.php
index 1e439a8d476..aaea0697423 100644
--- a/includes/payment-methods/class-klarna-payment-method.php
+++ b/includes/payment-methods/class-klarna-payment-method.php
@@ -70,9 +70,10 @@ public function get_countries() {
 	/**
 	 * Returns testing credentials to be printed at checkout in test mode.
 	 *
+	 * @param string $account_country The country of the account.
 	 * @return string
 	 */
-	public function get_testing_instructions() {
+	public function get_testing_instructions( string $account_country ) {
 		return '';
 	}
 }
diff --git a/includes/payment-methods/class-link-payment-method.php b/includes/payment-methods/class-link-payment-method.php
index 6a9b904a03f..c5c189bbad8 100644
--- a/includes/payment-methods/class-link-payment-method.php
+++ b/includes/payment-methods/class-link-payment-method.php
@@ -34,9 +34,10 @@ public function __construct( $token_service ) {
 	/**
 	 * Returns testing credentials to be printed at checkout in test mode.
 	 *
+	 * @param string $account_country The country of the account.
 	 * @return string
 	 */
-	public function get_testing_instructions() {
+	public function get_testing_instructions( string $account_country ) {
 		return '';
 	}
 }
diff --git a/includes/payment-methods/class-p24-payment-method.php b/includes/payment-methods/class-p24-payment-method.php
index 8718911b480..4237beab155 100644
--- a/includes/payment-methods/class-p24-payment-method.php
+++ b/includes/payment-methods/class-p24-payment-method.php
@@ -36,9 +36,10 @@ public function __construct( $token_service ) {
 	/**
 	 * Returns testing credentials to be printed at checkout in test mode.
 	 *
+	 * @param string $account_country The country of the account.
 	 * @return string
 	 */
-	public function get_testing_instructions() {
+	public function get_testing_instructions( string $account_country ) {
 		return '';
 	}
 }
diff --git a/includes/payment-methods/class-sepa-payment-method.php b/includes/payment-methods/class-sepa-payment-method.php
index 8ea671f7706..012828be15c 100644
--- a/includes/payment-methods/class-sepa-payment-method.php
+++ b/includes/payment-methods/class-sepa-payment-method.php
@@ -40,9 +40,10 @@ public function __construct( $token_service ) {
 	/**
 	 * Returns testing credentials to be printed at checkout in test mode.
 	 *
+	 * @param string $account_country The country of the account.
 	 * @return string
 	 */
-	public function get_testing_instructions() {
+	public function get_testing_instructions( string $account_country ) {
 		return __( '<strong>Test mode:</strong> use the test account number <number>AT611904300234573201</number>. Other payment methods may redirect to a Stripe test page to authorize payment. More test card numbers are listed <a>here</a>.', 'woocommerce-payments' );
 	}
 }
diff --git a/includes/payment-methods/class-sofort-payment-method.php b/includes/payment-methods/class-sofort-payment-method.php
index 2f4f4fba212..291ff6c2b95 100644
--- a/includes/payment-methods/class-sofort-payment-method.php
+++ b/includes/payment-methods/class-sofort-payment-method.php
@@ -37,9 +37,10 @@ public function __construct( $token_service ) {
 	/**
 	 * Returns testing credentials to be printed at checkout in test mode.
 	 *
+	 * @param string $account_country The country of the account.
 	 * @return string
 	 */
-	public function get_testing_instructions() {
+	public function get_testing_instructions( string $account_country ) {
 		return '';
 	}
 }
diff --git a/includes/payment-methods/class-upe-payment-method.php b/includes/payment-methods/class-upe-payment-method.php
index 93bf0797088..2e69e916c1b 100644
--- a/includes/payment-methods/class-upe-payment-method.php
+++ b/includes/payment-methods/class-upe-payment-method.php
@@ -270,9 +270,10 @@ public function get_payment_token_for_user( $user, $payment_method_id ) {
 	/**
 	 * Returns testing credentials to be printed at checkout in test mode.
 	 *
+	 * @param string $account_country The country of the account.
 	 * @return string
 	 */
-	abstract public function get_testing_instructions();
+	abstract public function get_testing_instructions( string $account_country );
 
 	/**
 	 * Returns the payment method icon URL or an empty string.
diff --git a/tests/unit/test-class-wc-payments-checkout.php b/tests/unit/test-class-wc-payments-checkout.php
index 2394328c430..962c7bc4d8b 100644
--- a/tests/unit/test-class-wc-payments-checkout.php
+++ b/tests/unit/test-class-wc-payments-checkout.php
@@ -103,9 +103,6 @@ public function set_up() {
 			->disableOriginalConstructor()
 			->getMock();
 		$this->mock_wcpay_account    = $this->createMock( WC_Payments_Account::class );
-		$this->mock_wcpay_account
-			->method( 'get_account_country' )
-			->willReturn( 'US' );
 		$this->mock_customer_service = $this->createMock( WC_Payments_Customer_Service::class );
 		$this->mock_fraud_service    = $this->createMock( WC_Payments_Fraud_Service::class );
 
@@ -309,6 +306,9 @@ public function test_force_network_saved_cards_disabled_when_should_not_use_stri
 	}
 
 	public function test_link_payment_method_provided_when_card_enabled() {
+		$this->mock_wcpay_account
+			->method( 'get_account_country' )
+			->willReturn( 'US' );
 		$icon_url      = 'test-icon-url';
 		$dark_icon_url = 'test-dark-icon-url';
 		$this->mock_wcpay_gateway
@@ -404,6 +404,10 @@ public function test_link_payment_method_provided_when_card_enabled() {
 		 * @dataProvider non_reusable_payment_method_provider
 		 */
 	public function test_no_save_option_for_non_reusable_payment_method( $payment_method_id, $payment_method_class ) {
+		$this->mock_wcpay_account
+			->method( 'get_account_country' )
+			->willReturn( 'US' );
+
 		$this->mock_wcpay_gateway
 			->expects( $this->any() )
 			->method( 'get_payment_method_ids_enabled_at_checkout' )
@@ -434,6 +438,9 @@ public function non_reusable_payment_method_provider() {
 	}
 
 	public function test_no_save_option_for_reusable_payment_payment_with_subscription_in_cart() {
+		$this->mock_wcpay_account
+			->method( 'get_account_country' )
+			->willReturn( 'US' );
 		$this->mock_wcpay_gateway
 			->method( 'is_subscription_item_in_cart' )
 			->willReturn( true );
@@ -460,6 +467,9 @@ public function test_no_save_option_for_reusable_payment_payment_with_subscripti
 	}
 
 	public function test_no_save_option_for_reusable_payment_payment_but_with_saved_cards_disabled() {
+		$this->mock_wcpay_account
+			->method( 'get_account_country' )
+			->willReturn( 'US' );
 		$this->mock_wcpay_gateway
 			->method( 'is_subscription_item_in_cart' )
 			->willReturn( false );
@@ -486,6 +496,9 @@ public function test_no_save_option_for_reusable_payment_payment_but_with_saved_
 	}
 
 	public function test_save_option_for_reusable_payment_payment() {
+		$this->mock_wcpay_account
+			->method( 'get_account_country' )
+			->willReturn( 'US' );
 		$this->mock_wcpay_gateway
 			->method( 'is_subscription_item_in_cart' )
 			->willReturn( false );
@@ -512,6 +525,9 @@ public function test_save_option_for_reusable_payment_payment() {
 	}
 
 	public function test_upe_appearance_transients() {
+		$this->mock_wcpay_account
+			->method( 'get_account_country' )
+			->willReturn( 'US' );
 		$this->mock_wcpay_gateway
 			->expects( $this->any() )
 			->method( 'get_payment_method_ids_enabled_at_checkout' )
@@ -536,4 +552,60 @@ public function test_upe_appearance_transients() {
 		$this->assertSame( 'night', $js_config['wcBlocksUPEAppearanceTheme'] );
 		$this->assertFalse( $js_config['upeAddPaymentMethodAppearance'] );
 	}
+
+	/**
+	 * Data provider for testing different country card numbers
+	 */
+	public function country_test_cards_provider(): array {
+		return [
+			'US card'                        => [
+				'country'       => 'US',
+				'expected_card' => '4242 4242 4242 4242',
+			],
+			'Brazil card'                    => [
+				'country'       => 'BR',
+				'expected_card' => '4000 0007 6000 0002',
+			],
+			'UK card'                        => [
+				'country'       => 'GB',
+				'expected_card' => '4000 0082 6000 0000',
+			],
+			'Invalid country defaults to US' => [
+				'country'       => 'XX',
+				'expected_card' => '4242 4242 4242 4242',
+			],
+		];
+	}
+
+	/**
+	 * @dataProvider country_test_cards_provider
+	 */
+	public function test_credit_card_testing_instructions_by_country( string $country, string $expected_card ) {
+		$cc_payment_method = new CC_Payment_Method( $this->mock_token_service );
+
+		$this->mock_wcpay_account
+			->expects( $this->once() )
+			->method( 'get_account_country' )
+			->willReturn( $country );
+
+		$this->mock_wcpay_gateway
+			->method( 'get_payment_method_ids_enabled_at_checkout' )
+			->willReturn( [ 'card' ] );
+
+		$this->mock_wcpay_gateway
+			->method( 'wc_payments_get_payment_method_by_id' )
+			->willReturn( $cc_payment_method );
+
+		$config = $this->system_under_test->get_payment_fields_js_config();
+
+		$expected_instructions = sprintf(
+			'Use test card <button type="button" class="js-woopayments-copy-test-number" aria-label="Click to copy the test number to clipboard" title="Copy to clipboard"><i></i><span>%s</button> or refer to our <a href="https://woocommerce.com/document/woopayments/testing-and-troubleshooting/testing/#test-cards" target="_blank">testing guide</a>.',
+			$expected_card
+		);
+
+		$this->assertEquals(
+			$expected_instructions,
+			$config['paymentMethodsConfig']['card']['testingInstructions']
+		);
+	}
 }

From daf79d50370d7fa0cdf8a0ece2aada38d6a1cf8d Mon Sep 17 00:00:00 2001
From: Shendy <73803630+shendy-a8c@users.noreply.github.com>
Date: Sun, 10 Nov 2024 12:46:17 +0700
Subject: [PATCH 39/45] Rename  'Deposit' to 'Payout' (feature branch) (#9606)

Co-authored-by: Nagesh Pai <4162931+nagpai@users.noreply.github.com>
Co-authored-by: Nagesh Pai <nagesh.pai@automattic.com>
Co-authored-by: bruce aldridge <bruce.aldridge@gmail.com>
Co-authored-by: Rua Haszard <rua.haszard@automattic.com>
Co-authored-by: Rua Haszard <rua@automattic.com>
Co-authored-by: Jessy Pappachan <32092402+jessy-p@users.noreply.github.com>
Co-authored-by: Jessy <jessy.pappachan@automattic.com>
Co-authored-by: Eric Jinks <3147296+Jinksi@users.noreply.github.com>
---
 changelog/add-9673-payouts-rename-notice      |   5 +
 changelog/dev-1-9601-rename-deposit-dev-docs  |   5 +
 changelog/feature-deposits-payouts-rename     |   4 +
 changelog/fix-9525-menu-url-payouts-rename    |   5 +
 changelog/fix-9527-payouts-rename-settings    |   5 +
 ...2-rename-payouts-instant-depost-modal-flow |   5 +
 changelog/fix-9573-rename-payout-tos-modal    |   5 +
 changelog/fix-9585-rename-instant-payouts     |   5 +
 .../fix-9588-rename-payouts-error-messages    |   5 +
 changelog/fix-payout-rename-account-errors    |   5 +
 .../update-9524-deposit-payout-deposits-list  |   5 +
 ...transactions-list-deposit-to-payout-rename |   5 +
 ...nsaction-timeline-deposit-to-payout-rename |   5 +
 ...date-9578-79-rename-deposit-overview-modal |   5 +
 ...te-9581-rename-deposit-onboarding-tasklist |   5 +
 changelog/update-9587-doc-url-payout-rename   |   5 +
 .../account-balances/balance-tooltip.tsx      |   4 +-
 client/components/account-balances/index.tsx  |  19 +-
 client/components/account-balances/strings.ts |   2 +-
 .../account-balances/test/index.test.tsx      |   8 +-
 .../account-status/account-tools/strings.tsx  |   2 +-
 .../test/__snapshots__/index.test.tsx.snap    |   2 +-
 client/components/account-status/index.js     |   2 +-
 .../components/account-status/status-chip.js  |   2 +-
 .../test/__snapshots__/index.js.snap          |   8 +-
 .../deposits-overview/deposit-notices.tsx     |  24 +-
 .../deposits-overview/deposit-schedule.tsx    |  12 +-
 client/components/deposits-overview/index.tsx |  16 +-
 .../recent-deposits-list.tsx                  |   2 +-
 .../test/__snapshots__/index.tsx.snap         |  26 +-
 .../deposits-overview/test/index.tsx          |  34 +--
 client/components/deposits-status/index.tsx   |   2 +-
 .../test/__snapshots__/index.js.snap          |   6 +-
 client/components/details-link/index.tsx      |   2 +-
 .../test/__snapshots__/index.test.tsx.snap    |   2 +-
 .../details-link/test/index.test.tsx          |   4 +-
 .../modal/index.tsx                           |   2 +-
 client/components/test-mode-notice/index.tsx  |   6 +-
 .../test/__snapshots__/index.tsx.snap         |   2 +-
 client/connect-account-page/strings.tsx       |   8 +-
 .../test/__snapshots__/index.test.tsx.snap    |  12 +-
 .../test/info-notice-modal.test.tsx           |   2 +-
 client/data/deposits/actions.js               |   6 +-
 client/data/deposits/resolvers.js             |   6 +-
 client/deposits/details/index.tsx             |  18 +-
 .../details/test/__snapshots__/index.tsx.snap |  12 +-
 client/deposits/details/test/index.tsx        |   4 +-
 client/deposits/filters/config.js             |  27 +-
 client/deposits/filters/index.js              |   2 +-
 client/deposits/filters/test/index.js         |  18 +-
 client/deposits/index.tsx                     |   4 +-
 .../index.tsx                                 |  12 +-
 .../modal.tsx                                 |  30 +--
 .../style.scss                                |   8 +-
 .../test/__snapshots__/index.tsx.snap         |  26 +-
 .../test/index.tsx                            |   8 +-
 client/deposits/list/index.tsx                |  16 +-
 .../list/test/__snapshots__/index.tsx.snap    |  96 +++----
 client/deposits/list/test/index.tsx           |   2 +-
 .../deposits/rename-notice/header-image.svg   |  30 +++
 client/deposits/rename-notice/index.tsx       |  88 +++++++
 client/deposits/rename-notice/style.scss      |  77 ++++++
 .../test/__snapshots__/index.tsx.snap         |   9 +
 client/deposits/rename-notice/test/index.tsx  |  49 ++++
 client/deposits/strings.ts                    |   2 +-
 client/globals.d.ts                           |   1 +
 client/index.js                               |  14 +-
 client/overview/index.js                      |   2 +
 .../index.tsx                                 |   6 +-
 .../test/index.test.tsx                       |   2 +-
 .../overview/modal/reset-account/strings.tsx  |   2 +-
 .../modal/update-business-details/strings.tsx |   4 +-
 .../test/__snapshots__/index.tsx.snap         |   6 +-
 client/overview/task-list/strings.tsx         |  14 +-
 .../task-list/tasks/test/po-tasks.tsx         |  18 +-
 .../tasks/update-business-details-task.tsx    |   6 +-
 client/overview/task-list/test/tasks.js       |   4 +-
 client/overview/test/index.js                 |  20 ++
 client/payment-details/timeline/map-events.js |  34 +--
 .../timeline/test/__snapshots__/index.js.snap |  20 +-
 .../test/__snapshots__/map-events.js.snap     |  64 ++---
 client/settings/deposits/index.js             |  22 +-
 client/settings/deposits/test/index.test.js   |  26 +-
 client/settings/settings-manager/index.js     |   8 +-
 client/tos/modal/index.js                     |   2 +-
 .../modal/test/__snapshots__/index.js.snap    |   2 +-
 client/transactions/list/deposit.tsx          |  10 +-
 client/transactions/list/index.tsx            |  16 +-
 .../list/test/__snapshots__/deposit.tsx.snap  |  16 +-
 .../list/test/__snapshots__/index.tsx.snap    |  80 +++---
 client/transactions/list/test/deposit.tsx     |   8 +-
 client/transactions/list/test/index.tsx       |  18 +-
 composer.lock                                 | 242 +++++++++---------
 docs/dependencies.md                          |   2 +-
 .../wp-api-v3/{deposits.md => payouts.md}     |  91 +++----
 .../source/includes/wp-api-v3/reports.md      |   4 +-
 docs/rest-api/source/index.html.md            |   2 +-
 includes/admin/class-wc-payments-admin.php    |  32 ++-
 .../class-wc-payments-captured-event-note.php |   2 +-
 includes/class-wc-payments-features.php       |   9 +
 .../class-wc-payments-onboarding-service.php  |  12 +-
 ...wc-payments-webhook-processing-service.php |   2 +-
 includes/class-wc-payments.php                |   1 +
 ...yments-notes-instant-deposits-eligible.php |  10 +-
 readme.txt                                    |   2 +-
 tests/e2e-pw/README.md                        |   4 +-
 ...elect-deposits-list-advanced-filters-1.png | Bin 16022 -> 15848 bytes
 .../merchant/merchant-admin-deposits.spec.ts  |  10 +-
 tests/e2e/utils/flows.js                      |   2 +-
 .../fixtures/captured-payments/discount.json  |   2 +-
 .../captured-payments/foreign-card.json       |   2 +-
 .../captured-payments/fx-decimal.json         |   2 +-
 .../captured-payments/fx-foreign-card.json    |   2 +-
 .../captured-payments/fx-partial-capture.json |   2 +-
 .../captured-payments/fx-with-capped-fee.json |   2 +-
 tests/fixtures/captured-payments/fx.json      |   2 +-
 .../captured-payments/jpy-payment.json        |   2 +-
 .../captured-payments/only-base-fee.json      |   2 +-
 .../captured-payments/partial-capture.json    |   2 +-
 .../captured-payments/subscription.json       |   2 +-
 .../admin/test-class-wc-payments-admin.php    |   4 +-
 ...wc-payments-webhook-processing-service.php |   2 +-
 122 files changed, 1060 insertions(+), 660 deletions(-)
 create mode 100644 changelog/add-9673-payouts-rename-notice
 create mode 100644 changelog/dev-1-9601-rename-deposit-dev-docs
 create mode 100644 changelog/feature-deposits-payouts-rename
 create mode 100644 changelog/fix-9525-menu-url-payouts-rename
 create mode 100644 changelog/fix-9527-payouts-rename-settings
 create mode 100644 changelog/fix-9542-rename-payouts-instant-depost-modal-flow
 create mode 100644 changelog/fix-9573-rename-payout-tos-modal
 create mode 100644 changelog/fix-9585-rename-instant-payouts
 create mode 100644 changelog/fix-9588-rename-payouts-error-messages
 create mode 100644 changelog/fix-payout-rename-account-errors
 create mode 100644 changelog/update-9524-deposit-payout-deposits-list
 create mode 100644 changelog/update-9543-transactions-list-deposit-to-payout-rename
 create mode 100644 changelog/update-9564-transaction-timeline-deposit-to-payout-rename
 create mode 100644 changelog/update-9578-79-rename-deposit-overview-modal
 create mode 100644 changelog/update-9581-rename-deposit-onboarding-tasklist
 create mode 100644 changelog/update-9587-doc-url-payout-rename
 rename client/deposits/{instant-deposits => instant-payouts}/index.tsx (84%)
 rename client/deposits/{instant-deposits => instant-payouts}/modal.tsx (68%)
 rename client/deposits/{instant-deposits => instant-payouts}/style.scss (74%)
 rename client/deposits/{instant-deposits => instant-payouts}/test/__snapshots__/index.tsx.snap (70%)
 rename client/deposits/{instant-deposits => instant-payouts}/test/index.tsx (90%)
 create mode 100644 client/deposits/rename-notice/header-image.svg
 create mode 100644 client/deposits/rename-notice/index.tsx
 create mode 100644 client/deposits/rename-notice/style.scss
 create mode 100644 client/deposits/rename-notice/test/__snapshots__/index.tsx.snap
 create mode 100644 client/deposits/rename-notice/test/index.tsx
 rename docs/rest-api/source/includes/wp-api-v3/{deposits.md => payouts.md} (70%)

diff --git a/changelog/add-9673-payouts-rename-notice b/changelog/add-9673-payouts-rename-notice
new file mode 100644
index 00000000000..31a258dee71
--- /dev/null
+++ b/changelog/add-9673-payouts-rename-notice
@@ -0,0 +1,5 @@
+Significance: patch
+Type: add
+Comment: Added notice to indicate the rename of Deposits to Payouts. User facing changelog will be added as part of feature branch
+
+
diff --git a/changelog/dev-1-9601-rename-deposit-dev-docs b/changelog/dev-1-9601-rename-deposit-dev-docs
new file mode 100644
index 00000000000..bd7141bb971
--- /dev/null
+++ b/changelog/dev-1-9601-rename-deposit-dev-docs
@@ -0,0 +1,5 @@
+Significance: patch
+Type: dev
+Comment: Rename 'deposit' to 'payout' within the developer doc description texts. The change is a part of a larger renaming project.
+
+
diff --git a/changelog/feature-deposits-payouts-rename b/changelog/feature-deposits-payouts-rename
new file mode 100644
index 00000000000..cd080e4557b
--- /dev/null
+++ b/changelog/feature-deposits-payouts-rename
@@ -0,0 +1,4 @@
+Significance: minor
+Type: update
+
+Rename 'deposit' to 'payout' across various places in the WooPayments admin UI, docs and doc URLs.
diff --git a/changelog/fix-9525-menu-url-payouts-rename b/changelog/fix-9525-menu-url-payouts-rename
new file mode 100644
index 00000000000..51956b98d3b
--- /dev/null
+++ b/changelog/fix-9525-menu-url-payouts-rename
@@ -0,0 +1,5 @@
+Significance: patch
+Type: dev
+Comment: Part of feature Renaming deposits to payouts
+
+
diff --git a/changelog/fix-9527-payouts-rename-settings b/changelog/fix-9527-payouts-rename-settings
new file mode 100644
index 00000000000..7690c2fee06
--- /dev/null
+++ b/changelog/fix-9527-payouts-rename-settings
@@ -0,0 +1,5 @@
+Significance: patch
+Type: dev
+Comment: Payouts rename: Settings page, part of a larger change
+
+
diff --git a/changelog/fix-9542-rename-payouts-instant-depost-modal-flow b/changelog/fix-9542-rename-payouts-instant-depost-modal-flow
new file mode 100644
index 00000000000..5d97529f78a
--- /dev/null
+++ b/changelog/fix-9542-rename-payouts-instant-depost-modal-flow
@@ -0,0 +1,5 @@
+Significance: patch
+Type: dev
+Comment: Part of a larger change - renaming deposit to payout; this PR fixes instant payout modal + button
+
+
diff --git a/changelog/fix-9573-rename-payout-tos-modal b/changelog/fix-9573-rename-payout-tos-modal
new file mode 100644
index 00000000000..839d4364380
--- /dev/null
+++ b/changelog/fix-9573-rename-payout-tos-modal
@@ -0,0 +1,5 @@
+Significance: patch
+Type: dev
+Comment: Rename Deposit to Payout in TOS modal. Changelog to be included in featture branch
+
+
diff --git a/changelog/fix-9585-rename-instant-payouts b/changelog/fix-9585-rename-instant-payouts
new file mode 100644
index 00000000000..029812b1b97
--- /dev/null
+++ b/changelog/fix-9585-rename-instant-payouts
@@ -0,0 +1,5 @@
+Significance: patch
+Type: update
+Comment: Renamed instant deposit to instant payout. Main changelog will be part of feature branch
+
+
diff --git a/changelog/fix-9588-rename-payouts-error-messages b/changelog/fix-9588-rename-payouts-error-messages
new file mode 100644
index 00000000000..c20e31649e1
--- /dev/null
+++ b/changelog/fix-9588-rename-payouts-error-messages
@@ -0,0 +1,5 @@
+Significance: patch
+Type: update
+Comment: Updated the payouts component error notices. User facing changelog will be on the feature branch.
+
+
diff --git a/changelog/fix-payout-rename-account-errors b/changelog/fix-payout-rename-account-errors
new file mode 100644
index 00000000000..5d661f369d7
--- /dev/null
+++ b/changelog/fix-payout-rename-account-errors
@@ -0,0 +1,5 @@
+Significance: patch
+Type: dev
+Comment: Renamed deposit to Payout in account error messages. Main changelog will be added on feature branch.
+
+
diff --git a/changelog/update-9524-deposit-payout-deposits-list b/changelog/update-9524-deposit-payout-deposits-list
new file mode 100644
index 00000000000..e25a0d70f23
--- /dev/null
+++ b/changelog/update-9524-deposit-payout-deposits-list
@@ -0,0 +1,5 @@
+Significance: patch
+Type: dev
+Comment: Change deposit to payout in deposits list page.
+
+
diff --git a/changelog/update-9543-transactions-list-deposit-to-payout-rename b/changelog/update-9543-transactions-list-deposit-to-payout-rename
new file mode 100644
index 00000000000..72b9c3ffa67
--- /dev/null
+++ b/changelog/update-9543-transactions-list-deposit-to-payout-rename
@@ -0,0 +1,5 @@
+Significance: patch
+Type: update
+Comment: Update 'deposit' to 'payout' in UI labels of the transaction list. This PR is a part of a project doing this rename across all parts of the UI.
+
+
diff --git a/changelog/update-9564-transaction-timeline-deposit-to-payout-rename b/changelog/update-9564-transaction-timeline-deposit-to-payout-rename
new file mode 100644
index 00000000000..d143380b730
--- /dev/null
+++ b/changelog/update-9564-transaction-timeline-deposit-to-payout-rename
@@ -0,0 +1,5 @@
+Significance: patch
+Type: update
+Comment: Part of a larger change to change 'deposit' to 'payout'. This PR specificially changes it for the transaction details timeline.
+
+
diff --git a/changelog/update-9578-79-rename-deposit-overview-modal b/changelog/update-9578-79-rename-deposit-overview-modal
new file mode 100644
index 00000000000..0eca2ef1120
--- /dev/null
+++ b/changelog/update-9578-79-rename-deposit-overview-modal
@@ -0,0 +1,5 @@
+Significance: patch
+Type: update
+Comment: Rename 'deposit' to 'payout' in modals within 'Overview' section. PR is a part of a larger renaming project.
+
+
diff --git a/changelog/update-9581-rename-deposit-onboarding-tasklist b/changelog/update-9581-rename-deposit-onboarding-tasklist
new file mode 100644
index 00000000000..a6f4c688343
--- /dev/null
+++ b/changelog/update-9581-rename-deposit-onboarding-tasklist
@@ -0,0 +1,5 @@
+Significance: patch
+Type: update
+Comment: Rename 'deposit' to 'payout' within the onboarding tasklist section. The change is a part of a larger project of doing this rename across the codebase.
+
+
diff --git a/changelog/update-9587-doc-url-payout-rename b/changelog/update-9587-doc-url-payout-rename
new file mode 100644
index 00000000000..62933e0a818
--- /dev/null
+++ b/changelog/update-9587-doc-url-payout-rename
@@ -0,0 +1,5 @@
+Significance: patch
+Type: update
+Comment: Update 'deposit' to 'payout' in URLs of WooPayments docs occuring across the codebase. Part of a larger renaming project.
+
+
diff --git a/client/components/account-balances/balance-tooltip.tsx b/client/components/account-balances/balance-tooltip.tsx
index 257d041ca3c..2bf267856f6 100644
--- a/client/components/account-balances/balance-tooltip.tsx
+++ b/client/components/account-balances/balance-tooltip.tsx
@@ -36,7 +36,7 @@ export const TotalBalanceTooltip: React.FC< TotalBalanceTooltipProps > = ( {
 					<>
 						{ interpolateComponents( {
 							mixedString: __(
-								'{{bold}}Total balance{{/bold}} combines both pending funds (transactions under processing) and available funds (ready for deposit). {{learnMoreLink}}Learn more{{/learnMoreLink}}',
+								'{{bold}}Total balance{{/bold}} combines both pending funds (transactions under processing) and available funds (ready for payout). {{learnMoreLink}}Learn more{{/learnMoreLink}}',
 								'woocommerce-payments'
 							),
 							components: {
@@ -105,7 +105,7 @@ export const AvailableBalanceTooltip: React.FC< AvailableBalanceTooltipProps > =
 					<p>
 						{ interpolateComponents( {
 							mixedString: __(
-								'{{bold}}Available funds{{/bold}} have completed processing and are ready to be deposited into your bank account. {{learnMoreLink}}Learn more{{/learnMoreLink}}',
+								'{{bold}}Available funds{{/bold}} have completed processing and are ready to be dispatched to your bank account. {{learnMoreLink}}Learn more{{/learnMoreLink}}',
 								'woocommerce-payments'
 							),
 							components: {
diff --git a/client/components/account-balances/index.tsx b/client/components/account-balances/index.tsx
index fa3be8b8422..a72f884bed8 100644
--- a/client/components/account-balances/index.tsx
+++ b/client/components/account-balances/index.tsx
@@ -15,7 +15,7 @@ import type * as AccountOverview from 'wcpay/types/account-overview';
 import BalanceBlock from './balance-block';
 import HelpOutlineIcon from 'gridicons/dist/help-outline';
 import InlineNotice from '../inline-notice';
-import InstantDepositButton from 'deposits/instant-deposits';
+import InstantPayoutButton from 'wcpay/deposits/instant-payouts';
 import SendMoneyIcon from 'assets/images/icons/send-money.svg?asset';
 import {
 	TotalBalanceTooltip,
@@ -154,9 +154,8 @@ const AccountBalances: React.FC = () => {
 							>
 								{ sprintf(
 									__(
-										/* translators: %$1$s: Available instant deposit amount, %2$s: Instant deposit fee percentage */
-										/* 'Instantly deposit %1$s and get funds in your bank account in 30 mins for a %2$s%% fee.' */
-										'Get %1$s via instant deposit. Funds are typically in your bank account within 30 mins. Fee: %2$s%%.',
+										/* translators: %$1$s: Available instant payout amount, %2$s: Instant payout fee percentage */
+										'Get %1$s via instant payout. Funds are typically in your bank account within 30 mins. Fee: %2$s%%.',
 										'woocommerce-payments'
 									),
 									formatCurrency(
@@ -170,7 +169,7 @@ const AccountBalances: React.FC = () => {
 						) }
 
 						<Flex justify="flex-start">
-							<InstantDepositButton
+							<InstantPayoutButton
 								instantBalance={
 									selectedOverview.instantBalance
 								}
@@ -179,17 +178,17 @@ const AccountBalances: React.FC = () => {
 								<ClickTooltip
 									buttonIcon={ <HelpOutlineIcon /> }
 									buttonLabel={ __(
-										'Learn more about instant deposit',
+										'Learn more about instant payouts',
 										'woocommerce-payments'
 									) }
 									content={
-										/* 'With instant deposit you can receive requested funds in your bank account within 30 mins for a 1.5% fee. Learn more' */
+										/* 'With instant payout you can receive requested funds in your bank account within 30 mins for a 1.5% fee. Learn more' */
 
 										interpolateComponents( {
 											mixedString: sprintf(
 												__(
-													/* translators: %s: Instant deposit fee percentage */
-													'With {{strong}}instant deposit{{/strong}} you can receive requested funds in your bank account within 30 mins for a %s%% fee. {{learnMoreLink}}Learn more{{/learnMoreLink}}',
+													/* translators: %s: Instant payout fee percentage */
+													'With {{strong}}instant payout{{/strong}} you can receive requested funds in your bank account within 30 mins for a %s%% fee. {{learnMoreLink}}Learn more{{/learnMoreLink}}',
 													'woocommerce-payments'
 												),
 												selectedOverview.instantBalance
@@ -199,7 +198,7 @@ const AccountBalances: React.FC = () => {
 												strong: <strong />,
 												learnMoreLink: (
 													<Link
-														href="https://woocommerce.com/document/woopayments/deposits/instant-deposits/"
+														href="https://woocommerce.com/document/woopayments/payouts/instant-payouts/"
 														target="_blank"
 														rel="noreferrer"
 														type="external"
diff --git a/client/components/account-balances/strings.ts b/client/components/account-balances/strings.ts
index 46d211f274b..2d0a9fde456 100644
--- a/client/components/account-balances/strings.ts
+++ b/client/components/account-balances/strings.ts
@@ -26,7 +26,7 @@ export const fundLabelStrings = {
 
 export const documentationUrls = {
 	depositSchedule:
-		'https://woocommerce.com/document/woopayments/deposits/deposit-schedule/',
+		'https://woocommerce.com/document/woopayments/payouts/payout-schedule/',
 	negativeBalance:
 		'https://woocommerce.com/document/woopayments/fees-and-debits/account-showing-negative-balance/',
 };
diff --git a/client/components/account-balances/test/index.test.tsx b/client/components/account-balances/test/index.test.tsx
index 9875552d438..60f8f357006 100644
--- a/client/components/account-balances/test/index.test.tsx
+++ b/client/components/account-balances/test/index.test.tsx
@@ -231,11 +231,11 @@ describe( 'AccountBalances', () => {
 		} );
 		fireEvent.click( tooltipButton );
 		const tooltip = screen.getByRole( 'tooltip', {
-			name: /Available funds have completed processing and are ready to be deposited into your bank account./,
+			name: /Available funds have completed processing and are ready to be dispatched to your bank account./,
 		} );
 		expect( within( tooltip ).getByRole( 'link' ) ).toHaveAttribute(
 			'href',
-			'https://woocommerce.com/document/woopayments/deposits/deposit-schedule/'
+			'https://woocommerce.com/document/woopayments/payouts/payout-schedule/'
 		);
 	} );
 
@@ -289,11 +289,11 @@ describe( 'AccountBalances', () => {
 		} );
 		fireEvent.click( tooltipButton );
 		const tooltip = screen.getByRole( 'tooltip', {
-			name: /Total balance combines both pending funds \(transactions under processing\) and available funds \(ready for deposit\)\./,
+			name: /Total balance combines both pending funds \(transactions under processing\) and available funds \(ready for payout\)\./,
 		} );
 		expect( within( tooltip ).getByRole( 'link' ) ).toHaveAttribute(
 			'href',
-			'https://woocommerce.com/document/woopayments/deposits/deposit-schedule/'
+			'https://woocommerce.com/document/woopayments/payouts/payout-schedule/'
 		);
 	} );
 
diff --git a/client/components/account-status/account-tools/strings.tsx b/client/components/account-status/account-tools/strings.tsx
index f47e8416574..83ca0f9c1bc 100644
--- a/client/components/account-status/account-tools/strings.tsx
+++ b/client/components/account-status/account-tools/strings.tsx
@@ -17,7 +17,7 @@ export default {
 				'woocommerce-payments'
 		  )
 		: __(
-				'Payments and deposits are disabled until account setup is completed. If you are experiencing problems completing account setup, or need to change the email/country associated with your account, you can reset your account and start from the beginning.',
+				'Payments and payouts are disabled until account setup is completed. If you are experiencing problems completing account setup, or need to change the email/country associated with your account, you can reset your account and start from the beginning.',
 				'woocommerce-payments'
 		  ),
 	reset: __( 'Reset account', 'woocommerce-payments' ),
diff --git a/client/components/account-status/account-tools/test/__snapshots__/index.test.tsx.snap b/client/components/account-status/account-tools/test/__snapshots__/index.test.tsx.snap
index a3217d4df35..b2adb97b886 100644
--- a/client/components/account-status/account-tools/test/__snapshots__/index.test.tsx.snap
+++ b/client/components/account-status/account-tools/test/__snapshots__/index.test.tsx.snap
@@ -18,7 +18,7 @@ exports[`AccountTools should render in test/sandbox mode onboarding 1`] = `
       Account Tools
     </h4>
     <p>
-      Payments and deposits are disabled until account setup is completed. If you are experiencing problems completing account setup, or need to change the email/country associated with your account, you can reset your account and start from the beginning.
+      Payments and payouts are disabled until account setup is completed. If you are experiencing problems completing account setup, or need to change the email/country associated with your account, you can reset your account and start from the beginning.
     </p>
     <div
       class="account-tools__actions"
diff --git a/client/components/account-status/index.js b/client/components/account-status/index.js
index a1f2c42baf6..4bb9afd463c 100755
--- a/client/components/account-status/index.js
+++ b/client/components/account-status/index.js
@@ -112,7 +112,7 @@ const AccountStatusDetails = ( props ) => {
 				/>
 			</AccountStatusItem>
 			<AccountStatusItem
-				label={ __( 'Deposits:', 'woocommerce-payments' ) }
+				label={ __( 'Payouts:', 'woocommerce-payments' ) }
 			>
 				<DepositsStatus
 					status={ accountStatus.deposits?.status }
diff --git a/client/components/account-status/status-chip.js b/client/components/account-status/status-chip.js
index 76e1aa90d1b..038c5b77fa2 100644
--- a/client/components/account-status/status-chip.js
+++ b/client/components/account-status/status-chip.js
@@ -34,7 +34,7 @@ const StatusChip = ( props ) => {
 		description = __( 'Pending', 'woocommerce-payments' );
 		type = 'light';
 		tooltip = __(
-			'Deposits are pending while Stripe verifies details on your account.',
+			'Payouts are pending while Stripe verifies details on your account.',
 			'woocommerce-payments'
 		);
 	} else if ( accountStatus === 'restricted_partially' ) {
diff --git a/client/components/account-status/test/__snapshots__/index.js.snap b/client/components/account-status/test/__snapshots__/index.js.snap
index 103961f4bf8..8b751ace498 100644
--- a/client/components/account-status/test/__snapshots__/index.js.snap
+++ b/client/components/account-status/test/__snapshots__/index.js.snap
@@ -86,7 +86,7 @@ exports[`AccountStatus does not render edit details when no account link 1`] = `
             data-wp-c16t="true"
             data-wp-component="FlexItem"
           >
-            Deposits:
+            Payouts:
           </div>
           <div
             class="components-flex-item components-flex-block item-value css-14wzr73-View-Item-sx-Base-block em57xhy0"
@@ -254,7 +254,7 @@ exports[`AccountStatus renders account tools 1`] = `
             data-wp-c16t="true"
             data-wp-component="FlexItem"
           >
-            Deposits:
+            Payouts:
           </div>
           <div
             class="components-flex-item components-flex-block item-value css-14wzr73-View-Item-sx-Base-block em57xhy0"
@@ -295,7 +295,7 @@ exports[`AccountStatus renders account tools 1`] = `
             Account Tools
           </h4>
           <p>
-            Payments and deposits are disabled until account setup is completed. If you are experiencing problems completing account setup, or need to change the email/country associated with your account, you can reset your account and start from the beginning.
+            Payments and payouts are disabled until account setup is completed. If you are experiencing problems completing account setup, or need to change the email/country associated with your account, you can reset your account and start from the beginning.
           </p>
           <div
             class="account-tools__actions"
@@ -490,7 +490,7 @@ exports[`AccountStatus renders normal status 1`] = `
             data-wp-c16t="true"
             data-wp-component="FlexItem"
           >
-            Deposits:
+            Payouts:
           </div>
           <div
             class="components-flex-item components-flex-block item-value css-14wzr73-View-Item-sx-Base-block em57xhy0"
diff --git a/client/components/deposits-overview/deposit-notices.tsx b/client/components/deposits-overview/deposit-notices.tsx
index 43725ce04af..281785fc60a 100644
--- a/client/components/deposits-overview/deposit-notices.tsx
+++ b/client/components/deposits-overview/deposit-notices.tsx
@@ -29,7 +29,7 @@ export const SuspendedDepositNotice: React.FC = () => {
 			{ interpolateComponents( {
 				/** translators: {{strong}}: placeholders are opening and closing strong tags. {{suspendLink}}: is a <a> link element */
 				mixedString: __(
-					'Your deposits are {{strong}}temporarily suspended{{/strong}}. {{suspendLink}}Learn more{{/suspendLink}}',
+					'Your payouts are {{strong}}temporarily suspended{{/strong}}. {{suspendLink}}Learn more{{/suspendLink}}',
 					'woocommerce-payments'
 				),
 				components: {
@@ -37,7 +37,7 @@ export const SuspendedDepositNotice: React.FC = () => {
 					suspendLink: (
 						<Link
 							href={
-								'https://woocommerce.com/document/woopayments/deposits/why-deposits-suspended/'
+								'https://woocommerce.com/document/woopayments/payouts/why-payouts-suspended/'
 							}
 						/>
 					),
@@ -54,7 +54,7 @@ export const DepositIncludesLoanPayoutNotice: React.FC = () => (
 	<InlineNotice icon status="warning" isDismissible={ false }>
 		{ interpolateComponents( {
 			mixedString: __(
-				'This deposit will include funds from your WooCommerce Capital loan. {{learnMoreLink}}Learn more{{/learnMoreLink}}',
+				'This payout will include funds from your WooCommerce Capital loan. {{learnMoreLink}}Learn more{{/learnMoreLink}}',
 				'woocommerce-payments'
 			),
 			components: {
@@ -86,7 +86,7 @@ export const NewAccountWaitingPeriodNotice: React.FC = () => (
 	>
 		{ interpolateComponents( {
 			mixedString: __(
-				'Your first deposit is held for 7-14 days. {{whyLink}}Why?{{/whyLink}}',
+				'Your first payout is held for 7-14 days. {{whyLink}}Why?{{/whyLink}}',
 				'woocommerce-payments'
 			),
 			components: {
@@ -96,7 +96,7 @@ export const NewAccountWaitingPeriodNotice: React.FC = () => (
 					<a
 						target="_blank"
 						rel="noopener noreferrer"
-						href="https://woocommerce.com/document/woopayments/deposits/deposit-schedule/#new-accounts"
+						href="https://woocommerce.com/document/woopayments/payouts/payout-schedule/#new-accounts"
 					/>
 				),
 			},
@@ -114,7 +114,7 @@ export const DepositTransitDaysNotice: React.FC = () => (
 		className="wcpay-deposit-transit-days-notice"
 	>
 		{ __(
-			'It may take 1-3 business days for deposits to reach your bank account.',
+			'It may take 1-3 business days for payouts to reach your bank account.',
 			'woocommerce-payments'
 		) }
 	</InlineNotice>
@@ -134,7 +134,7 @@ export const NegativeBalanceDepositsPausedNotice: React.FC = () => (
 			mixedString: sprintf(
 				/* translators: %s: WooPayments */
 				__(
-					'Deposits may be interrupted while your %s balance remains negative. {{whyLink}}Why?{{/whyLink}}',
+					'Payouts may be interrupted while your %s balance remains negative. {{whyLink}}Why?{{/whyLink}}',
 					'woocommerce-payments'
 				),
 				'WooPayments'
@@ -169,7 +169,7 @@ export const DepositMinimumBalanceNotice: React.FC< {
 				mixedString: sprintf(
 					/* translators: %s: a formatted currency amount, e.g. $5.00 USD */
 					__(
-						'Deposits are paused while your available funds balance remains below %s. {{learnMoreLink}}Learn more{{/learnMoreLink}}',
+						'Payouts are paused while your available funds balance remains below %s. {{learnMoreLink}}Learn more{{/learnMoreLink}}',
 						'woocommerce-payments'
 					),
 					minimumDepositAmountFormatted
@@ -181,7 +181,7 @@ export const DepositMinimumBalanceNotice: React.FC< {
 						<a
 							target="_blank"
 							rel="noopener noreferrer"
-							href="https://woocommerce.com/document/woopayments/deposits/deposit-schedule/#minimum-deposit-amounts"
+							href="https://woocommerce.com/document/woopayments/payouts/payout-schedule/#minimum-payout-amounts"
 						/>
 					),
 				},
@@ -197,7 +197,7 @@ export const NoFundsAvailableForDepositNotice: React.FC = () => (
 	<InlineNotice status="warning" icon isDismissible={ false }>
 		{ interpolateComponents( {
 			mixedString: __(
-				'You have no funds available to deposit. {{whyLink}}Why?{{/whyLink}}',
+				'You have no funds available. {{whyLink}}Why?{{/whyLink}}',
 				'woocommerce-payments'
 			),
 			components: {
@@ -207,7 +207,7 @@ export const NoFundsAvailableForDepositNotice: React.FC = () => (
 					<a
 						target="_blank"
 						rel="noopener noreferrer"
-						href="https://woocommerce.com/document/woopayments/deposits/deposit-schedule/#pending-funds"
+						href="https://woocommerce.com/document/woopayments/payouts/payout-schedule/#pending-funds"
 					/>
 				),
 			},
@@ -240,7 +240,7 @@ export const DepositFailureNotice: React.FC< {
 		>
 			{ interpolateComponents( {
 				mixedString: __(
-					'Deposits are currently paused because a recent deposit failed. Please {{updateLink}}update your bank account details{{/updateLink}}.',
+					'Payouts are currently paused because a recent payout failed. Please {{updateLink}}update your bank account details{{/updateLink}}.',
 					'woocommerce-payments'
 				),
 				components: {
diff --git a/client/components/deposits-overview/deposit-schedule.tsx b/client/components/deposits-overview/deposit-schedule.tsx
index f589bf1ad12..c463dfa335f 100644
--- a/client/components/deposits-overview/deposit-schedule.tsx
+++ b/client/components/deposits-overview/deposit-schedule.tsx
@@ -119,7 +119,7 @@ const DepositSchedule: React.FC< DepositScheduleProps > = ( {
 	const nextDepositHelpContent = (
 		<>
 			{ __(
-				'Deposits are initiated based on the following criteria:',
+				'Payouts are initiated based on the following criteria:',
 				'woocommerce-payments'
 			) }
 			<ul>
@@ -136,7 +136,7 @@ const DepositSchedule: React.FC< DepositScheduleProps > = ( {
 									rel="external noopener noreferrer"
 									target="_blank"
 									href={
-										'https://woocommerce.com/document/woopayments/deposits/deposit-schedule/#pending-period-chart'
+										'https://woocommerce.com/document/woopayments/payouts/payout-schedule/#pending-period-chart'
 									}
 								/>
 							),
@@ -156,7 +156,7 @@ const DepositSchedule: React.FC< DepositScheduleProps > = ( {
 									rel="external noopener noreferrer"
 									target="_blank"
 									href={
-										'https://woocommerce.com/document/woopayments/deposits/deposit-schedule/#available-funds'
+										'https://woocommerce.com/document/woopayments/payouts/payout-schedule/#available-funds'
 									}
 								/>
 							),
@@ -166,7 +166,7 @@ const DepositSchedule: React.FC< DepositScheduleProps > = ( {
 				<li>
 					{ interpolateComponents( {
 						mixedString: __(
-							'Your {{link}}deposit schedule{{/link}} settings',
+							'Your {{link}}payout schedule{{/link}} settings',
 							'woocommerce-payments'
 						),
 						components: {
@@ -176,7 +176,7 @@ const DepositSchedule: React.FC< DepositScheduleProps > = ( {
 									rel="external noopener noreferrer"
 									target="_blank"
 									href={
-										'https://woocommerce.com/document/woopayments/deposits/change-deposit-schedule/'
+										'https://woocommerce.com/document/woopayments/payouts/change-payout-schedule/'
 									}
 								/>
 							),
@@ -193,7 +193,7 @@ const DepositSchedule: React.FC< DepositScheduleProps > = ( {
 			<ClickTooltip
 				content={ nextDepositHelpContent }
 				buttonIcon={ <HelpOutlineIcon /> }
-				buttonLabel={ 'Deposit schedule tooltip' }
+				buttonLabel={ 'Payout schedule tooltip' }
 			/>
 		</>
 	);
diff --git a/client/components/deposits-overview/index.tsx b/client/components/deposits-overview/index.tsx
index 5b89c21a95a..11c0b3aa023 100644
--- a/client/components/deposits-overview/index.tsx
+++ b/client/components/deposits-overview/index.tsx
@@ -88,7 +88,7 @@ const DepositsOverview: React.FC = () => {
 		history.push(
 			getAdminUrl( {
 				page: 'wc-admin',
-				path: '/payments/deposits',
+				path: '/payments/payouts',
 			} )
 		);
 	};
@@ -98,7 +98,7 @@ const DepositsOverview: React.FC = () => {
 		return (
 			<Card className="wcpay-deposits-overview">
 				<CardHeader>
-					{ __( 'Deposits', 'woocommerce-payments' ) }
+					{ __( 'Payouts', 'woocommerce-payments' ) }
 				</CardHeader>
 
 				<CardBody className="wcpay-deposits-overview__schedule__container">
@@ -132,9 +132,7 @@ const DepositsOverview: React.FC = () => {
 
 	return (
 		<Card className="wcpay-deposits-overview">
-			<CardHeader>
-				{ __( 'Deposits', 'woocommerce-payments' ) }
-			</CardHeader>
+			<CardHeader>{ __( 'Payouts', 'woocommerce-payments' ) }</CardHeader>
 
 			{ /* Deposit schedule message */ }
 			{ isDepositsUnrestricted && !! account && hasScheduledDeposits && (
@@ -190,7 +188,7 @@ const DepositsOverview: React.FC = () => {
 				<>
 					<CardBody className="wcpay-deposits-overview__heading">
 						<span className="wcpay-deposits-overview__heading__title">
-							{ __( 'Deposit history', 'woocommerce-payments' ) }
+							{ __( 'Payout history', 'woocommerce-payments' ) }
 						</span>
 					</CardBody>
 					<RecentDepositsList deposits={ deposits } />
@@ -205,7 +203,7 @@ const DepositsOverview: React.FC = () => {
 							onClick={ navigateToDepositsHistory }
 						>
 							{ __(
-								'View full deposits history',
+								'View full payout history',
 								'woocommerce-payments'
 							) }
 						</Button>
@@ -219,7 +217,7 @@ const DepositsOverview: React.FC = () => {
 									page: 'wc-settings',
 									tab: 'checkout',
 									section: 'woocommerce_payments',
-								} ) + '#deposit-schedule'
+								} ) + '#payout-schedule'
 							}
 							onClick={ () =>
 								recordEvent(
@@ -228,7 +226,7 @@ const DepositsOverview: React.FC = () => {
 							}
 						>
 							{ __(
-								'Change deposit schedule',
+								'Change payout schedule',
 								'woocommerce-payments'
 							) }
 						</Button>
diff --git a/client/components/deposits-overview/recent-deposits-list.tsx b/client/components/deposits-overview/recent-deposits-list.tsx
index 6bb50a0a6c2..520cd05a466 100644
--- a/client/components/deposits-overview/recent-deposits-list.tsx
+++ b/client/components/deposits-overview/recent-deposits-list.tsx
@@ -45,7 +45,7 @@ const RecentDepositsList: React.FC< RecentDepositsProps > = ( {
 		<Flex className={ `${ tableClass }__row` } key={ deposit.id }>
 			<FlexItem className={ `${ tableClass }__cell` }>
 				<Icon icon={ calendar } size={ 17 } />
-				<Link href={ getDetailsURL( deposit.id, 'deposits' ) }>
+				<Link href={ getDetailsURL( deposit.id, 'payouts' ) }>
 					{ getDepositDate( deposit ) }
 				</Link>
 			</FlexItem>
diff --git a/client/components/deposits-overview/test/__snapshots__/index.tsx.snap b/client/components/deposits-overview/test/__snapshots__/index.tsx.snap
index a29a1d9064f..ac1ac4c69ca 100644
--- a/client/components/deposits-overview/test/__snapshots__/index.tsx.snap
+++ b/client/components/deposits-overview/test/__snapshots__/index.tsx.snap
@@ -37,7 +37,7 @@ exports[`DepositFailureNotice Renders Renders DepositFailureNotice component cor
           data-wp-c16t="true"
           data-wp-component="FlexItem"
         >
-          Deposits are currently paused because a recent deposit failed. Please 
+          Payouts are currently paused because a recent payout failed. Please 
           <a
             class="components-external-link"
             href="https://example.com?from=WCPAY_PAYOUTS&source=wcpay-payout-failure-notice"
@@ -93,7 +93,7 @@ exports[`Deposits Overview information Component Renders 1`] = `
         data-wp-c16t="true"
         data-wp-component="CardHeader"
       >
-        Deposits
+        Payouts
       </div>
       <div
         class="components-card__body components-card-body wcpay-deposits-overview__schedule__container css-1nwhnu3-View-Body-borderRadius-medium em57xhy0"
@@ -113,7 +113,7 @@ exports[`Deposits Overview information Component Renders 1`] = `
             class="wcpay-tooltip__content-wrapper"
           >
             <div
-              aria-label="Deposit schedule tooltip"
+              aria-label="Payout schedule tooltip"
               role="button"
               tabindex="0"
             >
@@ -173,7 +173,7 @@ exports[`Deposits Overview information Component Renders 1`] = `
                 data-wp-c16t="true"
                 data-wp-component="FlexItem"
               >
-                It may take 1-3 business days for deposits to reach your bank account.
+                It may take 1-3 business days for payouts to reach your bank account.
               </div>
             </div>
             <div
@@ -190,7 +190,7 @@ exports[`Deposits Overview information Component Renders 1`] = `
         <span
           class="wcpay-deposits-overview__heading__title"
         >
-          Deposit history
+          Payout history
         </span>
       </div>
       <div
@@ -262,7 +262,7 @@ exports[`Deposits Overview information Component Renders 1`] = `
             </svg>
             <a
               data-link-type="wc-admin"
-              href="admin.php?page=wc-admin&path=%2Fpayments%2Fdeposits%2Fdetails&id=po_mock1"
+              href="admin.php?page=wc-admin&path=%2Fpayments%2Fpayouts%2Fdetails&id=po_mock1"
             >
               January 2, 2020
             </a>
@@ -310,7 +310,7 @@ exports[`Deposits Overview information Component Renders 1`] = `
             </svg>
             <a
               data-link-type="wc-admin"
-              href="admin.php?page=wc-admin&path=%2Fpayments%2Fdeposits%2Fdetails&id=po_mock2"
+              href="admin.php?page=wc-admin&path=%2Fpayments%2Fpayouts%2Fdetails&id=po_mock2"
             >
               January 3, 2020
             </a>
@@ -358,7 +358,7 @@ exports[`Deposits Overview information Component Renders 1`] = `
             </svg>
             <a
               data-link-type="wc-admin"
-              href="admin.php?page=wc-admin&path=%2Fpayments%2Fdeposits%2Fdetails&id=po_mock3"
+              href="admin.php?page=wc-admin&path=%2Fpayments%2Fpayouts%2Fdetails&id=po_mock3"
             >
               January 4, 2020
             </a>
@@ -392,13 +392,13 @@ exports[`Deposits Overview information Component Renders 1`] = `
           class="components-button is-secondary"
           type="button"
         >
-          View full deposits history
+          View full payout history
         </button>
         <a
           class="components-button is-tertiary"
-          href="admin.php?page=wc-settings&tab=checkout&section=woocommerce_payments#deposit-schedule"
+          href="admin.php?page=wc-settings&tab=checkout&section=woocommerce_payments#payout-schedule"
         >
-          Change deposit schedule
+          Change payout schedule
         </a>
       </div>
     </div>
@@ -455,14 +455,14 @@ exports[`Suspended Deposit Notice Renders Component Renders 1`] = `
           data-wp-c16t="true"
           data-wp-component="FlexItem"
         >
-          Your deposits are 
+          Your payouts are 
           <strong>
             temporarily suspended
           </strong>
           . 
           <a
             data-link-type="wc-admin"
-            href="https://woocommerce.com/document/woopayments/deposits/why-deposits-suspended/"
+            href="https://woocommerce.com/document/woopayments/payouts/why-payouts-suspended/"
           >
             Learn more
           </a>
diff --git a/client/components/deposits-overview/test/index.tsx b/client/components/deposits-overview/test/index.tsx
index d6d5be60bdf..edaa068a100 100644
--- a/client/components/deposits-overview/test/index.tsx
+++ b/client/components/deposits-overview/test/index.tsx
@@ -266,8 +266,8 @@ describe( 'Deposits Overview information', () => {
 
 		const { container, getByText } = render( <DepositsOverview /> );
 		// Check that the button and link is rendered.
-		getByText( 'View full deposits history' );
-		getByText( 'Change deposit schedule' );
+		getByText( 'View full payout history' );
+		getByText( 'Change payout schedule' );
 		expect( container ).toMatchSnapshot();
 	} );
 
@@ -304,7 +304,7 @@ describe( 'Deposits Overview information', () => {
 			setSelectedCurrency: mockSetSelectedCurrency,
 		} );
 		const { getByText, queryByText } = render( <DepositsOverview /> );
-		getByText( /Your first deposit is held for/, {
+		getByText( /Your first payout is held for/, {
 			ignore: '.a11y-speak-region',
 		} );
 		expect( queryByText( 'Change deposit schedule' ) ).toBeFalsy();
@@ -327,10 +327,10 @@ describe( 'Deposits Overview information', () => {
 
 		const { getByText, queryByText } = render( <DepositsOverview /> );
 
-		getByText( /Your deposits are temporarily suspended/ );
+		getByText( /Your payouts are temporarily suspended/ );
 
 		// Check that the buttons are rendered as expected.
-		getByText( 'View full deposits history' );
+		getByText( 'View full payout history' );
 		// This one is not rendered when deposits are blocked.
 		expect( queryByText( 'Change deposit schedule' ) ).toBeFalsy();
 	} );
@@ -395,7 +395,7 @@ describe( 'Deposits Overview information', () => {
 
 		expect(
 			queryByText(
-				'deposit will include funds from your WooCommerce Capital loan',
+				'payout will include funds from your WooCommerce Capital loan',
 				{
 					exact: false,
 					ignore: '.a11y-speak-region',
@@ -424,7 +424,7 @@ describe( 'Deposits Overview information', () => {
 		} );
 
 		const { queryByText } = render( <DepositsOverview /> );
-		expect( queryByText( /Your first deposit is held for/ ) ).toBeFalsy();
+		expect( queryByText( /Your first payout is held for/ ) ).toBeFalsy();
 	} );
 
 	test( 'Confirm new account waiting period notice shows if within waiting period', () => {
@@ -442,12 +442,12 @@ describe( 'Deposits Overview information', () => {
 		} );
 
 		const { getByText, getByRole } = render( <DepositsOverview /> );
-		getByText( /Your first deposit is held for/, {
+		getByText( /Your first payout is held for/, {
 			ignore: '.a11y-speak-region',
 		} );
 		expect( getByRole( 'link', { name: /Why\?/ } ) ).toHaveAttribute(
 			'href',
-			'https://woocommerce.com/document/woopayments/deposits/deposit-schedule/#new-accounts'
+			'https://woocommerce.com/document/woopayments/payouts/payout-schedule/#new-accounts'
 		);
 	} );
 } );
@@ -574,7 +574,7 @@ describe( 'DepositFailureNotice Renders', () => {
 		const { queryByText } = render( <DepositsOverview /> );
 		expect(
 			queryByText(
-				/Deposits are currently paused because a recent deposit failed./,
+				/Payouts are currently paused because a recent payout failed./,
 				{
 					ignore: '.a11y-speak-region',
 				}
@@ -613,7 +613,7 @@ describe( 'DepositFailureNotice Renders', () => {
 		const { queryByText } = render( <DepositsOverview /> );
 		expect(
 			queryByText(
-				/Deposits are currently paused because a recent deposit failed./,
+				/Payouts are currently paused because a recent payout failed./,
 				{
 					ignore: '.a11y-speak-region',
 				}
@@ -652,7 +652,7 @@ describe( 'DepositFailureNotice Renders', () => {
 		const { queryByText } = render( <DepositsOverview /> );
 		expect(
 			queryByText(
-				/Deposits are currently paused because a recent deposit failed./,
+				/Payouts are currently paused because a recent payout failed./,
 				{
 					ignore: '.a11y-speak-region',
 				}
@@ -677,7 +677,7 @@ describe( 'Paused Deposit notice Renders', () => {
 		} );
 
 		const { getByText } = render( <DepositsOverview /> );
-		getByText( /Deposits may be interrupted/, {
+		getByText( /Payouts may be interrupted/, {
 			ignore: '.a11y-speak-region',
 		} );
 	} );
@@ -691,7 +691,7 @@ describe( 'Paused Deposit notice Renders', () => {
 		mockDepositOverviews( [ accountOverview ] );
 
 		const { queryByText } = render( <DepositsOverview /> );
-		expect( queryByText( /Deposits may be interrupted/ ) ).toBeFalsy();
+		expect( queryByText( /Payouts may be interrupted/ ) ).toBeFalsy();
 	} );
 	test( 'When available balance is negative', () => {
 		const accountOverview = createMockNewAccountOverview(
@@ -703,7 +703,7 @@ describe( 'Paused Deposit notice Renders', () => {
 		mockDepositOverviews( [ accountOverview ] );
 
 		const { queryByText } = render( <DepositsOverview /> );
-		expect( queryByText( /Deposits may be interrupted/ ) ).toBeFalsy();
+		expect( queryByText( /Payouts may be interrupted/ ) ).toBeFalsy();
 	} );
 } );
 
@@ -732,7 +732,7 @@ describe( 'Minimum Deposit Amount Notice', () => {
 
 		const { getByText } = render( <DepositsOverview /> );
 		getByText(
-			/Deposits are paused while your available funds balance remains below €5.00/,
+			/Payouts are paused while your available funds balance remains below €5.00/,
 			{
 				ignore: '.a11y-speak-region',
 			}
@@ -752,7 +752,7 @@ describe( 'Minimum Deposit Amount Notice', () => {
 		const { queryByText } = render( <DepositsOverview /> );
 		expect(
 			queryByText(
-				/Deposits are paused while your available funds balance remains below/
+				/Payouts are paused while your available funds balance remains below/
 			)
 		).toBeFalsy();
 	} );
diff --git a/client/components/deposits-status/index.tsx b/client/components/deposits-status/index.tsx
index b5c61b2cf1c..6e562296322 100644
--- a/client/components/deposits-status/index.tsx
+++ b/client/components/deposits-status/index.tsx
@@ -63,7 +63,7 @@ const DepositsStatusSuspended: React.FC< DepositsStatusProps > = ( props ) => {
 	const { iconSize } = props;
 
 	const learnMoreHref =
-		'https://woocommerce.com/document/woopayments/deposits/why-deposits-suspended/';
+		'https://woocommerce.com/document/woopayments/payouts/why-payouts-suspended/';
 
 	const description = createInterpolateElement(
 		/* translators: <a> - suspended accounts FAQ URL */
diff --git a/client/components/deposits-status/test/__snapshots__/index.js.snap b/client/components/deposits-status/test/__snapshots__/index.js.snap
index 9d92c7cd823..b0813fd50e2 100644
--- a/client/components/deposits-status/test/__snapshots__/index.js.snap
+++ b/client/components/deposits-status/test/__snapshots__/index.js.snap
@@ -20,7 +20,7 @@ exports[`DepositsStatus renders blocked status 1`] = `
     </svg>
     Temporarily suspended (
     <a
-      href="https://woocommerce.com/document/woopayments/deposits/why-deposits-suspended/"
+      href="https://woocommerce.com/document/woopayments/payouts/why-payouts-suspended/"
       rel="noopener noreferrer"
       target="_blank"
     >
@@ -51,7 +51,7 @@ exports[`DepositsStatus renders blocked status 2`] = `
     </svg>
     Temporarily suspended (
     <a
-      href="https://woocommerce.com/document/woopayments/deposits/why-deposits-suspended/"
+      href="https://woocommerce.com/document/woopayments/payouts/why-payouts-suspended/"
       rel="noopener noreferrer"
       target="_blank"
     >
@@ -174,7 +174,7 @@ exports[`DepositsStatus renders pending verification status 1`] = `
     </svg>
     Temporarily suspended (
     <a
-      href="https://woocommerce.com/document/woopayments/deposits/why-deposits-suspended/"
+      href="https://woocommerce.com/document/woopayments/payouts/why-payouts-suspended/"
       rel="noopener noreferrer"
       target="_blank"
     >
diff --git a/client/components/details-link/index.tsx b/client/components/details-link/index.tsx
index 03226a5eb8e..0675a6f3e82 100644
--- a/client/components/details-link/index.tsx
+++ b/client/components/details-link/index.tsx
@@ -15,7 +15,7 @@ import { getAdminUrl } from 'wcpay/utils';
 /**
  * The parent segment is the first part of the URL after the /payments/ path.
  */
-type ParentSegment = 'deposits' | 'transactions';
+type ParentSegment = 'payouts' | 'transactions';
 
 export const getDetailsURL = (
 	/**
diff --git a/client/components/details-link/test/__snapshots__/index.test.tsx.snap b/client/components/details-link/test/__snapshots__/index.test.tsx.snap
index a2b861aebf1..6ea9065b623 100644
--- a/client/components/details-link/test/__snapshots__/index.test.tsx.snap
+++ b/client/components/details-link/test/__snapshots__/index.test.tsx.snap
@@ -6,7 +6,7 @@ exports[`Details link renders dispute details with ID 1`] = `
 <div>
   <a
     data-link-type="wc-admin"
-    href="admin.php?page=wc-admin&path=%2Fpayments%2Fdeposits%2Fdetails&id=po_mock"
+    href="admin.php?page=wc-admin&path=%2Fpayments%2Fpayouts%2Fdetails&id=po_mock"
   >
     <svg
       class="gridicon gridicons-info-outline needs-offset"
diff --git a/client/components/details-link/test/index.test.tsx b/client/components/details-link/test/index.test.tsx
index 235420179f9..0d94fcbf58e 100644
--- a/client/components/details-link/test/index.test.tsx
+++ b/client/components/details-link/test/index.test.tsx
@@ -21,14 +21,14 @@ describe( 'Details link', () => {
 
 	test( 'renders dispute details with ID', () => {
 		const { container: link } = render(
-			<DetailsLink id="po_mock" parentSegment="deposits" />
+			<DetailsLink id="po_mock" parentSegment="payouts" />
 		);
 		expect( link ).toMatchSnapshot();
 	} );
 
 	test( 'empty render with no ID', () => {
 		const { container: link } = render(
-			<DetailsLink parentSegment="deposits" />
+			<DetailsLink parentSegment="payouts" />
 		);
 		expect( link ).toMatchSnapshot();
 	} );
diff --git a/client/components/sandbox-mode-switch-to-live-notice/modal/index.tsx b/client/components/sandbox-mode-switch-to-live-notice/modal/index.tsx
index eaa7dcef0aa..43278a178d0 100644
--- a/client/components/sandbox-mode-switch-to-live-notice/modal/index.tsx
+++ b/client/components/sandbox-mode-switch-to-live-notice/modal/index.tsx
@@ -82,7 +82,7 @@ const SetupLivePaymentsModal: React.FC< Props > = ( {
 				) }
 				<Icon icon={ currencyDollar } />
 				{ __(
-					'We will need your banking details in order to process any deposits to you.',
+					'We will need your banking details in order to process any payouts to you.',
 					'woocommerce-payments'
 				) }
 			</div>
diff --git a/client/components/test-mode-notice/index.tsx b/client/components/test-mode-notice/index.tsx
index 6f13da9def2..7b8ac27073d 100644
--- a/client/components/test-mode-notice/index.tsx
+++ b/client/components/test-mode-notice/index.tsx
@@ -31,7 +31,7 @@ interface Props {
 
 const nounToUse = {
 	documents: __( 'document', 'woocommerce-payments' ),
-	deposits: __( 'deposit', 'woocommerce-payments' ),
+	deposits: __( 'payout', 'woocommerce-payments' ),
 	disputes: __( 'dispute', 'woocommerce-payments' ),
 	loans: __( 'loan', 'woocommerce-payments' ),
 	payments: __( 'order', 'woocommerce-payments' ),
@@ -143,7 +143,9 @@ const getNoticeContent = (
 								'Viewing test %1$s. To view live %1s, disable test mode in {{settingsLink}}%2s settings{{/settingsLink}}.',
 								'woocommerce-payments'
 							),
-							currentPage,
+							'deposits' === currentPage
+								? 'payouts'
+								: currentPage,
 							'WooPayments'
 						),
 						components: {
diff --git a/client/components/test-mode-notice/test/__snapshots__/index.tsx.snap b/client/components/test-mode-notice/test/__snapshots__/index.tsx.snap
index d3f06d3f8bb..92877be2b29 100644
--- a/client/components/test-mode-notice/test/__snapshots__/index.tsx.snap
+++ b/client/components/test-mode-notice/test/__snapshots__/index.tsx.snap
@@ -22,7 +22,7 @@ exports[`Test mode notification Returns valid component for deposits page 1`] =
     <div
       class="wcpay-banner-notice__content"
     >
-      Viewing test deposits. To view live deposits, disable test mode in 
+      Viewing test payouts. To view live payouts, disable test mode in 
       <a
         href="https://example.com/"
       >
diff --git a/client/connect-account-page/strings.tsx b/client/connect-account-page/strings.tsx
index 808b9c13705..95c1be5a59d 100644
--- a/client/connect-account-page/strings.tsx
+++ b/client/connect-account-page/strings.tsx
@@ -37,7 +37,7 @@ export default {
 		),
 	paymentMethods: {
 		deposits: {
-			title: __( 'Deposits', 'woocommerce-payments' ),
+			title: __( 'Payouts', 'woocommerce-payments' ),
 			value: __( 'Automatic - Daily', 'woocommerce-payments' ),
 		},
 		capture: {
@@ -58,7 +58,7 @@ export default {
 		'woocommerce-payments'
 	),
 	usp3: __(
-		'Earn recurring revenue and get deposits into your bank account.',
+		'Earn recurring revenue and get payouts into your bank account.',
 		'woocommerce-payments'
 	),
 	sandboxMode: {
@@ -111,7 +111,7 @@ export default {
 				'woocommerce-payments'
 			),
 		},
-		button: __( 'enable deposits.', 'woocommerce-payments' ),
+		button: __( 'enable payouts.', 'woocommerce-payments' ),
 	},
 	infoModal: {
 		title: sprintf(
@@ -252,7 +252,7 @@ export default {
 	step2: {
 		heading: __( 'Provide a few business details', 'woocommerce-payments' ),
 		description: __(
-			'Next we’ll ask you to verify your business and payment details to enable deposits.',
+			'Next we’ll ask you to verify your business and payment details to enable payouts.',
 			'woocommerce-payments'
 		),
 	},
diff --git a/client/connect-account-page/test/__snapshots__/index.test.tsx.snap b/client/connect-account-page/test/__snapshots__/index.test.tsx.snap
index 256570bcc8c..3cfc2216716 100644
--- a/client/connect-account-page/test/__snapshots__/index.test.tsx.snap
+++ b/client/connect-account-page/test/__snapshots__/index.test.tsx.snap
@@ -50,7 +50,7 @@ exports[`ConnectAccountPage should render correctly 1`] = `
                 class="components-button is-link"
                 type="button"
               >
-                enable deposits.
+                enable payouts.
               </button>
             </div>
           </div>
@@ -133,7 +133,7 @@ exports[`ConnectAccountPage should render correctly 1`] = `
           >
             <div>
               <p>
-                Deposits
+                Payouts
               </p>
               <span>
                 Automatic - Daily
@@ -315,7 +315,7 @@ exports[`ConnectAccountPage should render correctly with WooPay eligible 1`] = `
                 class="components-button is-link"
                 type="button"
               >
-                enable deposits.
+                enable payouts.
               </button>
             </div>
           </div>
@@ -398,7 +398,7 @@ exports[`ConnectAccountPage should render correctly with WooPay eligible 1`] = `
           >
             <div>
               <p>
-                Deposits
+                Payouts
               </p>
               <span>
                 Automatic - Daily
@@ -542,7 +542,7 @@ exports[`ConnectAccountPage should render correctly with an incentive 1`] = `
                 class="components-button is-link"
                 type="button"
               >
-                enable deposits.
+                enable payouts.
               </button>
             </div>
           </div>
@@ -625,7 +625,7 @@ exports[`ConnectAccountPage should render correctly with an incentive 1`] = `
           >
             <div>
               <p>
-                Deposits
+                Payouts
               </p>
               <span>
                 Automatic - Daily
diff --git a/client/connect-account-page/test/info-notice-modal.test.tsx b/client/connect-account-page/test/info-notice-modal.test.tsx
index 0b24620aa81..207935034dc 100644
--- a/client/connect-account-page/test/info-notice-modal.test.tsx
+++ b/client/connect-account-page/test/info-notice-modal.test.tsx
@@ -27,7 +27,7 @@ describe( 'Connect Account Page – Info Notice Modal', () => {
 		render( <InfoNoticeModal /> );
 
 		const enableDeposits = screen.getByRole( 'button', {
-			name: /enable deposits./i,
+			name: /enable payouts./i,
 		} );
 		userEvent.click( enableDeposits );
 
diff --git a/client/data/deposits/actions.js b/client/data/deposits/actions.js
index 60b4479ab24..d4063e3e0a8 100644
--- a/client/data/deposits/actions.js
+++ b/client/data/deposits/actions.js
@@ -112,7 +112,7 @@ export function* submitInstantDeposit( currency ) {
 		yield dispatch( 'core/notices' ).createSuccessNotice(
 			sprintf(
 				__(
-					'Instant deposit for %s in transit.',
+					'Instant payout for %s in transit.',
 					'woocommerce-payments'
 				),
 				formatCurrency( deposit.amount )
@@ -123,7 +123,7 @@ export function* submitInstantDeposit( currency ) {
 						label: __( 'View details', 'woocommerce-payments' ),
 						url: getAdminUrl( {
 							page: 'wc-admin',
-							path: '/payments/deposits/details',
+							path: '/payments/payouts/details',
 							id: deposit.id,
 						} ),
 					},
@@ -132,7 +132,7 @@ export function* submitInstantDeposit( currency ) {
 		);
 	} catch {
 		yield dispatch( 'core/notices' ).createErrorNotice(
-			__( 'Error creating instant deposit.', 'woocommerce-payments' )
+			__( 'Error creating instant payout.', 'woocommerce-payments' )
 		);
 	} finally {
 		yield dispatch( STORE_NAME ).finishResolution( 'getInstantDeposit', [
diff --git a/client/data/deposits/resolvers.js b/client/data/deposits/resolvers.js
index 52961f25570..a4a0ad14e26 100644
--- a/client/data/deposits/resolvers.js
+++ b/client/data/deposits/resolvers.js
@@ -45,7 +45,7 @@ export function* getDeposit( id ) {
 		yield controls.dispatch(
 			'core/notices',
 			'createErrorNotice',
-			__( 'Error retrieving deposit.', 'woocommerce-payments' )
+			__( 'Error retrieving payout.', 'woocommerce-payments' )
 		);
 	}
 }
@@ -64,7 +64,7 @@ export function* getAllDepositsOverviews() {
 			'core/notices',
 			'createErrorNotice',
 			__(
-				"Error retrieving all deposits' overviews.",
+				"Error retrieving all payouts' overviews.",
 				'woocommerce-payments'
 			)
 		);
@@ -129,7 +129,7 @@ export function* getDeposits( query ) {
 		yield controls.dispatch(
 			'core/notices',
 			'createErrorNotice',
-			__( 'Error retrieving deposits.', 'woocommerce-payments' )
+			__( 'Error retrieving payouts.', 'woocommerce-payments' )
 		);
 		yield updateErrorForDepositQuery( query, null, e );
 	}
diff --git a/client/deposits/details/index.tsx b/client/deposits/details/index.tsx
index f2a835676d4..2176b079377 100644
--- a/client/deposits/details/index.tsx
+++ b/client/deposits/details/index.tsx
@@ -40,6 +40,7 @@ import {
 } from 'multi-currency/interface/functions';
 import { depositStatusLabels } from '../strings';
 import './style.scss';
+import { PayoutsRenameNotice } from '../rename-notice';
 
 /**
  * Renders the deposit status indicator UI, re-purposing the OrderStatus component from @woocommerce/components.
@@ -121,9 +122,9 @@ export const DepositOverview: React.FC< DepositOverviewProps > = ( {
 
 	const isWithdrawal = deposit.type === 'withdrawal';
 
-	let depositDateLabel = __( 'Deposit date', 'woocommerce-payments' );
+	let depositDateLabel = __( 'Payout date', 'woocommerce-payments' );
 	if ( ! deposit.automatic ) {
-		depositDateLabel = __( 'Instant deposit date', 'woocommerce-payments' );
+		depositDateLabel = __( 'Instant payout date', 'woocommerce-payments' );
 	}
 	if ( isWithdrawal ) {
 		depositDateLabel = __( 'Withdrawal date', 'woocommerce-payments' );
@@ -167,7 +168,7 @@ export const DepositOverview: React.FC< DepositOverviewProps > = ( {
 									'Withdrawal overview',
 									'woocommerce-payments'
 							  )
-							: __( 'Deposit overview', 'woocommerce-payments' )
+							: __( 'Payout overview', 'woocommerce-payments' )
 					}
 				>
 					{ () => [
@@ -181,7 +182,7 @@ export const DepositOverview: React.FC< DepositOverviewProps > = ( {
 											'woocommerce-payments'
 									  )
 									: __(
-											'Deposit amount',
+											'Payout amount',
 											'woocommerce-payments'
 									  )
 							}
@@ -214,7 +215,7 @@ export const DepositOverview: React.FC< DepositOverviewProps > = ( {
 											'woocommerce-payments'
 									  )
 									: __(
-											'Net deposit amount',
+											'Net payout amount',
 											'woocommerce-payments'
 									  )
 							}
@@ -246,6 +247,7 @@ export const DepositDetails: React.FC< DepositDetailsProps > = ( {
 
 	return (
 		<Page>
+			<PayoutsRenameNotice />
 			<TestModeNotice currentPage="deposits" isDetailsView={ true } />
 			<ErrorBoundary>
 				{ isLoading ? (
@@ -264,7 +266,7 @@ export const DepositDetails: React.FC< DepositDetailsProps > = ( {
 							<CardHeader>
 								<Text size={ 16 } weight={ 600 } as="h2">
 									{ __(
-										'Deposit transactions',
+										'Payout transactions',
 										'woocommerce-payments'
 									) }
 								</Text>
@@ -273,12 +275,12 @@ export const DepositDetails: React.FC< DepositDetailsProps > = ( {
 								{ interpolateComponents( {
 									/* Translators: {{learnMoreLink}} is a link element (<a/>). */
 									mixedString: __(
-										`We're unable to show transaction history on instant deposits. {{learnMoreLink}}Learn more{{/learnMoreLink}}`,
+										`We're unable to show transaction history on instant payouts. {{learnMoreLink}}Learn more{{/learnMoreLink}}`,
 										'woocommerce-payments'
 									),
 									components: {
 										learnMoreLink: (
-											<ExternalLink href="https://woocommerce.com/document/woopayments/deposits/instant-deposits/#transactions" />
+											<ExternalLink href="https://woocommerce.com/document/woopayments/payouts/instant-payouts/#transactions" />
 										),
 									},
 								} ) }
diff --git a/client/deposits/details/test/__snapshots__/index.tsx.snap b/client/deposits/details/test/__snapshots__/index.tsx.snap
index 53ef5a35d23..fecce68ae08 100644
--- a/client/deposits/details/test/__snapshots__/index.tsx.snap
+++ b/client/deposits/details/test/__snapshots__/index.tsx.snap
@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`Deposit overview renders automatic deposit correctly 1`] = `
+exports[`Deposit overview renders automatic payout correctly 1`] = `
 <div>
   <div
     class="wcpay-deposit-overview"
@@ -23,7 +23,7 @@ exports[`Deposit overview renders automatic deposit correctly 1`] = `
               <div
                 class="woocommerce-summary__item-label"
               >
-                Deposit date: Jan 2, 2020
+                Payout date: Jan 2, 2020
               </div>
               <div
                 class="woocommerce-summary__item-data"
@@ -151,7 +151,7 @@ exports[`Deposit overview renders instant deposit correctly 1`] = `
   >
     <div
       aria-describedby="woocommerce-summary-helptext-1"
-      aria-label="Deposit overview"
+      aria-label="Payout overview"
       aria-orientation="horizontal"
       role="menu"
     >
@@ -173,7 +173,7 @@ exports[`Deposit overview renders instant deposit correctly 1`] = `
             <div
               class="woocommerce-summary__item-label"
             >
-              Instant deposit date: Jan 2, 2020
+              Instant payout date: Jan 2, 2020
             </div>
             <div
               class="woocommerce-summary__item-data"
@@ -207,7 +207,7 @@ exports[`Deposit overview renders instant deposit correctly 1`] = `
             <div
               class="woocommerce-summary__item-label"
             >
-              Deposit amount
+              Payout amount
             </div>
             <div
               class="woocommerce-summary__item-data"
@@ -251,7 +251,7 @@ exports[`Deposit overview renders instant deposit correctly 1`] = `
             <div
               class="woocommerce-summary__item-label"
             >
-              Net deposit amount
+              Net payout amount
             </div>
             <div
               class="woocommerce-summary__item-data"
diff --git a/client/deposits/details/test/index.tsx b/client/deposits/details/test/index.tsx
index 5d4452e9998..5f350daf4d0 100644
--- a/client/deposits/details/test/index.tsx
+++ b/client/deposits/details/test/index.tsx
@@ -70,11 +70,11 @@ describe( 'Deposit overview', () => {
 		};
 	} );
 
-	test( 'renders automatic deposit correctly', () => {
+	test( 'renders automatic payout correctly', () => {
 		const { container: overview, getByText } = render(
 			<DepositOverview deposit={ mockDeposit } />
 		);
-		getByText( /Deposit date:/ );
+		getByText( /Payout date:/ );
 		getByText( 'Completed (paid)' );
 		expect( overview ).toMatchSnapshot();
 	} );
diff --git a/client/deposits/filters/config.js b/client/deposits/filters/config.js
index 90d850c7f2f..ee5b198e7d5 100644
--- a/client/deposits/filters/config.js
+++ b/client/deposits/filters/config.js
@@ -24,7 +24,7 @@ const depositStatusOptions = Object.entries( depositStatusLabels )
 
 export const filters = [
 	{
-		label: __( 'Deposit currency', 'woocommerce-payments' ),
+		label: __( 'Payout currency', 'woocommerce-payments' ),
 		param: 'store_currency_is',
 		staticParams: [
 			'paged',
@@ -62,7 +62,7 @@ export const filters = [
 		showFilters: () => true,
 		filters: [
 			{
-				label: __( 'All deposits', 'woocommerce-payments' ),
+				label: __( 'All payouts', 'woocommerce-payments' ),
 				value: 'all',
 			},
 			{
@@ -83,21 +83,18 @@ export const advancedFilters = {
 	/** translators: A sentence describing filters for deposits. See screen shot for context: https://d.pr/i/NcGpwL */
 	title:
 		wooCommerceVersion < 7.8
-			? __(
-					'Deposits match {{select /}} filters',
-					'woocommerce-payments'
-			  )
-			: __( 'Deposits match <select /> filters', 'woocommerce-payments' ),
+			? __( 'Payouts match {{select /}} filters', 'woocommerce-payments' )
+			: __( 'Payouts match <select /> filters', 'woocommerce-payments' ),
 	filters: {
 		date: {
 			labels: {
 				add: __( 'Date', 'woocommerce-payments' ),
 				remove: __(
-					'Remove deposit date filter',
+					'Remove payout date filter',
 					'woocommerce-payments'
 				),
 				rule: __(
-					'Select a deposit date filter match',
+					'Select a payout date filter match',
 					'woocommerce-payments'
 				),
 				/* translators: A sentence describing a deposit date filter. See screen shot for context: https://d.pr/i/NcGpwL */
@@ -111,7 +108,7 @@ export const advancedFilters = {
 								'<title>Date</title> <rule /> <filter />',
 								'woocommerce-payments'
 						  ),
-				filter: __( 'Select a deposit date', 'woocommerce-payments' ),
+				filter: __( 'Select a payout date', 'woocommerce-payments' ),
 			},
 			rules: [
 				{
@@ -135,11 +132,11 @@ export const advancedFilters = {
 			labels: {
 				add: __( 'Status', 'woocommerce-payments' ),
 				remove: __(
-					'Remove deposit status filter',
+					'Remove payout status filter',
 					'woocommerce-payments'
 				),
 				rule: __(
-					'Select a deposit status filter match',
+					'Select a payout status filter match',
 					'woocommerce-payments'
 				),
 				/* translators: A sentence describing a deposit status filter. See screen shot for context: https://d.pr/i/NcGpwL */
@@ -153,20 +150,20 @@ export const advancedFilters = {
 								'<title>Status</title> <rule /> <filter />',
 								'woocommerce-payments'
 						  ),
-				filter: __( 'Select a deposit status', 'woocommerce-payments' ),
+				filter: __( 'Select a payout status', 'woocommerce-payments' ),
 			},
 			rules: [
 				{
 					value: 'is',
 					/* translators: Sentence fragment, logical, "Is" refers to searching for deposits matching a chosen deposit status. Screenshot for context: https://d.pr/i/NcGpwL */
-					label: _x( 'Is', 'deposit status', 'woocommerce-payments' ),
+					label: _x( 'Is', 'payout status', 'woocommerce-payments' ),
 				},
 				{
 					value: 'is_not',
 					/* translators: Sentence fragment, logical, "Is not" refers to searching for deposits that don\'t match a chosen deposit status. Screenshot for context: https://d.pr/i/NcGpwL */
 					label: _x(
 						'Is not',
-						'deposit status',
+						'payout status',
 						'woocommerce-payments'
 					),
 				},
diff --git a/client/deposits/filters/index.js b/client/deposits/filters/index.js
index 0d6d57afecc..1393109a06e 100644
--- a/client/deposits/filters/index.js
+++ b/client/deposits/filters/index.js
@@ -38,7 +38,7 @@ export const DepositsFilters = ( props ) => {
 				filters={ populateDepositCurrencies( filters ) }
 				advancedFilters={ advancedFilters }
 				showDatePicker={ false }
-				path="/payments/deposits"
+				path="/payments/payouts"
 				query={ getQuery() }
 			/>
 		</div>
diff --git a/client/deposits/filters/test/index.js b/client/deposits/filters/test/index.js
index 04071451934..fc00ab0bcde 100644
--- a/client/deposits/filters/test/index.js
+++ b/client/deposits/filters/test/index.js
@@ -34,7 +34,7 @@ describe( 'Deposits filters', () => {
 		const { rerender } = render( <DepositsFilters /> );
 
 		// select advanced filter view
-		user.click( screen.getByRole( 'button', { name: /All deposits/i } ) );
+		user.click( screen.getByRole( 'button', { name: /All payouts/i } ) );
 		user.click(
 			screen.getByRole( 'button', { name: /Advanced filters/i } )
 		);
@@ -54,7 +54,7 @@ describe( 'Deposits filters', () => {
 		beforeEach( () => {
 			addAdvancedFilter( 'Date' );
 			ruleSelector = screen.getByRole( 'combobox', {
-				name: /deposit date filter/i,
+				name: /payout date filter/i,
 			} );
 		} );
 
@@ -105,13 +105,13 @@ describe( 'Deposits filters', () => {
 		beforeEach( () => {
 			addAdvancedFilter( 'Status' );
 			ruleSelector = screen.getByRole( 'combobox', {
-				name: /deposit status filter/i,
+				name: /payout status filter/i,
 			} );
 		} );
 
 		test( 'should render all status', () => {
 			const statusSelect = screen.getByRole( 'combobox', {
-				name: /deposit status$/i,
+				name: /payout status$/i,
 			} );
 			expect( statusSelect.options ).toMatchSnapshot();
 		} );
@@ -121,7 +121,7 @@ describe( 'Deposits filters', () => {
 
 			// need to include $ in name, otherwise "Select a deposit status filter" is also matched.
 			user.selectOptions(
-				screen.getByRole( 'combobox', { name: /deposit status$/i } ),
+				screen.getByRole( 'combobox', { name: /payout status$/i } ),
 				'paid'
 			);
 			user.click( screen.getByRole( 'link', { name: /Filter/ } ) );
@@ -134,7 +134,7 @@ describe( 'Deposits filters', () => {
 
 			// need to include $ in name, otherwise "Select a deposit status filter" is also matched.
 			user.selectOptions(
-				screen.getByRole( 'combobox', { name: /deposit status$/i } ),
+				screen.getByRole( 'combobox', { name: /payout status$/i } ),
 				'pending'
 			);
 			user.click( screen.getByRole( 'link', { name: /Filter/ } ) );
@@ -147,7 +147,7 @@ describe( 'Deposits filters', () => {
 
 			// need to include $ in name, otherwise "Select a deposit status filter" is also matched.
 			user.selectOptions(
-				screen.getByRole( 'combobox', { name: /deposit status$/i } ),
+				screen.getByRole( 'combobox', { name: /payout status$/i } ),
 				'in_transit'
 			);
 			user.click( screen.getByRole( 'link', { name: /Filter/ } ) );
@@ -160,7 +160,7 @@ describe( 'Deposits filters', () => {
 
 			// need to include $ in name, otherwise "Select a deposit status filter" is also matched.
 			user.selectOptions(
-				screen.getByRole( 'combobox', { name: /deposit status$/i } ),
+				screen.getByRole( 'combobox', { name: /payout status$/i } ),
 				'canceled'
 			);
 			user.click( screen.getByRole( 'link', { name: /Filter/ } ) );
@@ -173,7 +173,7 @@ describe( 'Deposits filters', () => {
 
 			// need to include $ in name, otherwise "Select a deposit status filter" is also matched.
 			user.selectOptions(
-				screen.getByRole( 'combobox', { name: /deposit status$/i } ),
+				screen.getByRole( 'combobox', { name: /payout status$/i } ),
 				'failed'
 			);
 			user.click( screen.getByRole( 'link', { name: /Filter/ } ) );
diff --git a/client/deposits/index.tsx b/client/deposits/index.tsx
index 938aa8df577..d799ff3d385 100644
--- a/client/deposits/index.tsx
+++ b/client/deposits/index.tsx
@@ -17,6 +17,7 @@ import { __ } from '@wordpress/i18n';
 import { TestModeNotice } from 'components/test-mode-notice';
 import BannerNotice from 'components/banner-notice';
 import DepositSchedule from 'components/deposits-overview/deposit-schedule';
+import { PayoutsRenameNotice } from './rename-notice';
 import { useAllDepositsOverviews } from 'data';
 import { useSettings } from 'wcpay/data';
 import DepositsList from './list';
@@ -118,7 +119,7 @@ const DepositFailureNotice: React.FC = () => {
 		>
 			{ interpolateComponents( {
 				mixedString: __(
-					'Deposits are currently paused because a recent deposit failed. Please {{updateLink}}update your bank account details{{/updateLink}}.',
+					'Payouts are currently paused because a recent payout failed. Please {{updateLink}}update your bank account details{{/updateLink}}.',
 					'woocommerce-payments'
 				),
 				components: {
@@ -149,6 +150,7 @@ const DepositsPage: React.FC = () => {
 	return (
 		<Page>
 			<TestModeNotice currentPage="deposits" />
+			<PayoutsRenameNotice />
 			<NextDepositNotice />
 			<DepositFailureNotice />
 			<DepositsList />
diff --git a/client/deposits/instant-deposits/index.tsx b/client/deposits/instant-payouts/index.tsx
similarity index 84%
rename from client/deposits/instant-deposits/index.tsx
rename to client/deposits/instant-payouts/index.tsx
index 64c49bc069f..81ed4b54bbb 100644
--- a/client/deposits/instant-deposits/index.tsx
+++ b/client/deposits/instant-payouts/index.tsx
@@ -13,7 +13,7 @@ import { useState } from '@wordpress/element';
  */
 import './style.scss';
 import { formatCurrency } from 'multi-currency/interface/functions';
-import InstantDepositModal from './modal';
+import InstantPayoutModal from './modal';
 import { useInstantDeposit } from 'wcpay/data';
 import type * as AccountOverview from 'wcpay/types/account-overview';
 
@@ -26,10 +26,10 @@ const isButtonDisabled = ( instantBalance: AccountOverview.InstantBalance ) => {
 	return buttonDisabled;
 };
 
-interface InstantDepositButtonProps {
+interface InstantPayoutButtonProps {
 	instantBalance: AccountOverview.InstantBalance;
 }
-const InstantDepositButton: React.FC< InstantDepositButtonProps > = ( {
+const InstantPayoutButton: React.FC< InstantPayoutButtonProps > = ( {
 	instantBalance,
 } ) => {
 	const [ isModalOpen, setModalOpen ] = useState( false );
@@ -52,7 +52,7 @@ const InstantDepositButton: React.FC< InstantDepositButtonProps > = ( {
 			>
 				{ sprintf(
 					__(
-						/* translators: %s: Available instant deposit amount */
+						/* translators: %s: Available instant payout amount */
 						'Get %s now',
 						'woocommerce-payments'
 					),
@@ -63,7 +63,7 @@ const InstantDepositButton: React.FC< InstantDepositButtonProps > = ( {
 				) }
 			</Button>
 			{ ( isModalOpen || inProgress ) && (
-				<InstantDepositModal
+				<InstantPayoutModal
 					instantBalance={ instantBalance }
 					inProgress={ inProgress }
 					onSubmit={ onSubmit }
@@ -74,4 +74,4 @@ const InstantDepositButton: React.FC< InstantDepositButtonProps > = ( {
 	);
 };
 
-export default InstantDepositButton;
+export default InstantPayoutButton;
diff --git a/client/deposits/instant-deposits/modal.tsx b/client/deposits/instant-payouts/modal.tsx
similarity index 68%
rename from client/deposits/instant-deposits/modal.tsx
rename to client/deposits/instant-payouts/modal.tsx
index e9d0f530aeb..ac8fdab1f0d 100644
--- a/client/deposits/instant-deposits/modal.tsx
+++ b/client/deposits/instant-payouts/modal.tsx
@@ -18,27 +18,27 @@ import {
 import type * as AccountOverview from 'wcpay/types/account-overview';
 import './style.scss';
 
-interface InstantDepositModalProps {
+interface InstantPayoutModalProps {
 	instantBalance: AccountOverview.InstantBalance;
 	onClose: () => void;
 	onSubmit: () => void;
 	inProgress: boolean;
 }
 
-const InstantDepositModal: React.FC< InstantDepositModalProps > = ( {
+const InstantPayoutModal: React.FC< InstantPayoutModalProps > = ( {
 	instantBalance: { amount, fee, net, fee_percentage: percentage },
 	onClose,
 	onSubmit,
 	inProgress,
 } ) => {
 	const learnMoreHref =
-		'https://woocommerce.com/document/woopayments/deposits/instant-deposits/';
+		'https://woocommerce.com/document/woopayments/payouts/instant-payouts/';
 	const feePercentage = `${ percentage }%`;
 	const description = createInterpolateElement(
 		/* translators: %s: amount representing the fee percentage, <a>: instant payout doc URL */
 		sprintf(
 			__(
-				'Need cash in a hurry? Instant deposits are available within 30 minutes for a nominal %s service fee. <a>Learn more</a>',
+				'Need cash in a hurry? Instant payouts are available within 30 minutes for a nominal %s service fee. <a>Learn more</a>',
 				'woocommerce-payments'
 			),
 			feePercentage
@@ -57,20 +57,20 @@ const InstantDepositModal: React.FC< InstantDepositModalProps > = ( {
 
 	return (
 		<Modal
-			title={ __( 'Instant deposit', 'woocommerce-payments' ) }
+			title={ __( 'Instant payout', 'woocommerce-payments' ) }
 			onRequestClose={ onClose }
-			className="wcpay-instant-deposits-modal"
+			className="wcpay-instant-payout-modal"
 		>
 			<p>{ description }</p>
 			<ul>
-				<li className="wcpay-instant-deposits-modal__balance">
+				<li className="wcpay-instant-payout-modal__balance">
 					{ __(
-						'Balance available for instant deposit: ',
+						'Balance available for instant payout: ',
 						'woocommerce-payments'
 					) }
 					<span>{ formatCurrency( amount ) }</span>
 				</li>
-				<li className="wcpay-instant-deposits-modal__fee">
+				<li className="wcpay-instant-payout-modal__fee">
 					{ sprintf(
 						/* translators: %s - amount representing the fee percentage */
 						__( '%s service fee: ', 'woocommerce-payments' ),
@@ -78,13 +78,13 @@ const InstantDepositModal: React.FC< InstantDepositModalProps > = ( {
 					) }
 					<span>-{ formatCurrency( fee ) }</span>
 				</li>
-				<li className="wcpay-instant-deposits-modal__net">
-					{ __( 'Net deposit amount: ', 'woocommerce-payments' ) }
+				<li className="wcpay-instant-payout-modal__net">
+					{ __( 'Net payout amount: ', 'woocommerce-payments' ) }
 					<span>{ formatExplicitCurrency( net ) }</span>
 				</li>
 			</ul>
 
-			<div className="wcpay-instant-deposits-modal__footer">
+			<div className="wcpay-instant-payout-modal__footer">
 				<Button isSecondary onClick={ onClose }>
 					{ __( 'Cancel', 'woocommerce-payments' ) }
 				</Button>
@@ -95,8 +95,8 @@ const InstantDepositModal: React.FC< InstantDepositModalProps > = ( {
 					disabled={ inProgress }
 				>
 					{ sprintf(
-						/* translators: %s: Monetary amount to deposit */
-						__( 'Deposit %s now', 'woocommerce-payments' ),
+						/* translators: %s: Monetary amount to pay out */
+						__( 'Pay out %s now', 'woocommerce-payments' ),
 						formatExplicitCurrency( net )
 					) }
 				</Button>
@@ -105,4 +105,4 @@ const InstantDepositModal: React.FC< InstantDepositModalProps > = ( {
 	);
 };
 
-export default InstantDepositModal;
+export default InstantPayoutModal;
diff --git a/client/deposits/instant-deposits/style.scss b/client/deposits/instant-payouts/style.scss
similarity index 74%
rename from client/deposits/instant-deposits/style.scss
rename to client/deposits/instant-payouts/style.scss
index 8232fd2508b..b3c16187b5f 100644
--- a/client/deposits/instant-deposits/style.scss
+++ b/client/deposits/instant-payouts/style.scss
@@ -1,4 +1,4 @@
-div.wcpay-instant-deposits-modal {
+div.wcpay-instant-payout-modal {
 	max-width: 500px;
 
 	p {
@@ -20,17 +20,17 @@ div.wcpay-instant-deposits-modal {
 			}
 		}
 
-		.wcpay-instant-deposits-modal__balance {
+		.wcpay-instant-payout-modal__balance {
 			padding-bottom: 0;
 		}
 
-		.wcpay-instant-deposits-modal__fee {
+		.wcpay-instant-payout-modal__fee {
 			span {
 				color: $studio-red-50;
 			}
 		}
 
-		.wcpay-instant-deposits-modal__net {
+		.wcpay-instant-payout-modal__net {
 			border-top: 1px solid $studio-gray-5;
 
 			span {
diff --git a/client/deposits/instant-deposits/test/__snapshots__/index.tsx.snap b/client/deposits/instant-payouts/test/__snapshots__/index.tsx.snap
similarity index 70%
rename from client/deposits/instant-deposits/test/__snapshots__/index.tsx.snap
rename to client/deposits/instant-payouts/test/__snapshots__/index.tsx.snap
index 2eec0aa2041..aca4e115afd 100644
--- a/client/deposits/instant-deposits/test/__snapshots__/index.tsx.snap
+++ b/client/deposits/instant-payouts/test/__snapshots__/index.tsx.snap
@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`Instant deposit button and modal button renders correctly with balance 1`] = `
+exports[`Instant payout button and modal button renders correctly with balance 1`] = `
 <div>
   <button
     class="components-button is-primary"
@@ -11,10 +11,10 @@ exports[`Instant deposit button and modal button renders correctly with balance
 </div>
 `;
 
-exports[`Instant deposit button and modal modal renders correctly 1`] = `
+exports[`Instant payout button and modal modal renders correctly 1`] = `
 <div
   aria-labelledby="components-modal-header-0"
-  class="components-modal__frame wcpay-instant-deposits-modal"
+  class="components-modal__frame wcpay-instant-payout-modal"
   role="dialog"
   tabindex="-1"
 >
@@ -32,7 +32,7 @@ exports[`Instant deposit button and modal modal renders correctly 1`] = `
           class="components-modal__header-heading"
           id="components-modal-header-0"
         >
-          Instant deposit
+          Instant payout
         </h1>
       </div>
       <button
@@ -55,9 +55,9 @@ exports[`Instant deposit button and modal modal renders correctly 1`] = `
       </button>
     </div>
     <p>
-      Need cash in a hurry? Instant deposits are available within 30 minutes for a nominal 1.5% service fee. 
+      Need cash in a hurry? Instant payouts are available within 30 minutes for a nominal 1.5% service fee. 
       <a
-        href="https://woocommerce.com/document/woopayments/deposits/instant-deposits/"
+        href="https://woocommerce.com/document/woopayments/payouts/instant-payouts/"
         rel="noopener noreferrer"
         target="_blank"
       >
@@ -66,15 +66,15 @@ exports[`Instant deposit button and modal modal renders correctly 1`] = `
     </p>
     <ul>
       <li
-        class="wcpay-instant-deposits-modal__balance"
+        class="wcpay-instant-payout-modal__balance"
       >
-        Balance available for instant deposit: 
+        Balance available for instant payout: 
         <span>
           $123.45
         </span>
       </li>
       <li
-        class="wcpay-instant-deposits-modal__fee"
+        class="wcpay-instant-payout-modal__fee"
       >
         1.5% service fee: 
         <span>
@@ -83,16 +83,16 @@ exports[`Instant deposit button and modal modal renders correctly 1`] = `
         </span>
       </li>
       <li
-        class="wcpay-instant-deposits-modal__net"
+        class="wcpay-instant-payout-modal__net"
       >
-        Net deposit amount: 
+        Net payout amount: 
         <span>
           $122.22
         </span>
       </li>
     </ul>
     <div
-      class="wcpay-instant-deposits-modal__footer"
+      class="wcpay-instant-payout-modal__footer"
     >
       <button
         class="components-button is-secondary"
@@ -104,7 +104,7 @@ exports[`Instant deposit button and modal modal renders correctly 1`] = `
         class="components-button is-primary"
         type="button"
       >
-        Deposit $122.22 now
+        Pay out $122.22 now
       </button>
     </div>
   </div>
diff --git a/client/deposits/instant-deposits/test/index.tsx b/client/deposits/instant-payouts/test/index.tsx
similarity index 90%
rename from client/deposits/instant-deposits/test/index.tsx
rename to client/deposits/instant-payouts/test/index.tsx
index d8b2d8ec8e6..4af2ee92233 100644
--- a/client/deposits/instant-deposits/test/index.tsx
+++ b/client/deposits/instant-payouts/test/index.tsx
@@ -7,7 +7,7 @@ import { fireEvent, render, screen } from '@testing-library/react';
 /**
  * Internal dependencies
  */
-import InstantDepositButton from '../';
+import InstantDepositButton from '..';
 import { useInstantDeposit } from 'wcpay/data';
 import type * as AccountOverview from 'wcpay/types/account-overview';
 
@@ -41,7 +41,7 @@ declare const global: {
 	};
 };
 
-describe( 'Instant deposit button and modal', () => {
+describe( 'Instant payout button and modal', () => {
 	beforeEach( () => {
 		jest.clearAllMocks();
 		global.wcpaySettings = {
@@ -74,7 +74,7 @@ describe( 'Instant deposit button and modal', () => {
 			<InstantDepositButton instantBalance={ mockInstantBalance } />
 		);
 		expect(
-			screen.queryByRole( 'dialog', { name: /instant deposit/i } )
+			screen.queryByRole( 'dialog', { name: /instant payout/i } )
 		).not.toBeInTheDocument();
 		fireEvent.click(
 			screen.getByRole( 'button', {
@@ -82,7 +82,7 @@ describe( 'Instant deposit button and modal', () => {
 			} )
 		);
 		const modal = screen.queryByRole( 'dialog', {
-			name: /instant deposit/i,
+			name: /instant payout/i,
 		} );
 		expect( modal ).toBeInTheDocument();
 		expect( modal ).toMatchSnapshot();
diff --git a/client/deposits/list/index.tsx b/client/deposits/list/index.tsx
index 7e640e16338..c991e7e7ec3 100644
--- a/client/deposits/list/index.tsx
+++ b/client/deposits/list/index.tsx
@@ -120,19 +120,19 @@ export const DepositsList = (): JSX.Element => {
 	const rows = deposits.map( ( deposit ) => {
 		const clickable = ( children: React.ReactNode ): JSX.Element => (
 			<ClickableCell
-				href={ getDetailsURL( deposit.id, 'deposits' ) }
+				href={ getDetailsURL( deposit.id, 'payouts' ) }
 				onClick={ () => recordEvent( 'wcpay_deposits_row_click' ) }
 			>
 				{ children }
 			</ClickableCell>
 		);
 		const detailsLink = (
-			<DetailsLink id={ deposit.id } parentSegment="deposits" />
+			<DetailsLink id={ deposit.id } parentSegment="payouts" />
 		);
 
 		const dateDisplay = (
 			<Link
-				href={ getDetailsURL( deposit.id, 'deposits' ) }
+				href={ getDetailsURL( deposit.id, 'payouts' ) }
 				onClick={ () => recordEvent( 'wcpay_deposits_row_click' ) }
 			>
 				{ dateI18n(
@@ -186,8 +186,8 @@ export const DepositsList = (): JSX.Element => {
 		summary = [
 			{
 				label: _n(
-					'deposit',
-					'deposits',
+					'payout',
+					'payouts',
 					depositsSummary.count,
 					'woocommerce-payments'
 				),
@@ -212,7 +212,7 @@ export const DepositsList = (): JSX.Element => {
 		depositsSummary.store_currencies ||
 		( isCurrencyFiltered ? [ getQuery().store_currency_is ] : [] );
 
-	const title = __( 'Deposits', 'woocommerce-payments' );
+	const title = __( 'Payouts', 'woocommerce-payments' );
 
 	const downloadable = !! rows.length;
 
@@ -317,7 +317,7 @@ export const DepositsList = (): JSX.Element => {
 			const csvColumns = [
 				{
 					...columns[ 0 ],
-					label: __( 'Deposit Id', 'woocommerce-payments' ),
+					label: __( 'Payout Id', 'woocommerce-payments' ),
 				},
 				...columns.slice( 1 ),
 			];
@@ -365,7 +365,7 @@ export const DepositsList = (): JSX.Element => {
 			<DepositsFilters storeCurrencies={ storeCurrencies } />
 			<TableCard
 				className="wcpay-deposits-list woocommerce-report-table"
-				title={ __( 'Deposit history', 'woocommerce-payments' ) }
+				title={ __( 'Payout history', 'woocommerce-payments' ) }
 				isLoading={ isLoading }
 				rowsPerPage={ parseInt( getQuery().per_page ?? '' ) || 25 }
 				totalRows={ totalRows }
diff --git a/client/deposits/list/test/__snapshots__/index.tsx.snap b/client/deposits/list/test/__snapshots__/index.tsx.snap
index 71c6293033c..86e84ecd1d1 100644
--- a/client/deposits/list/test/__snapshots__/index.tsx.snap
+++ b/client/deposits/list/test/__snapshots__/index.tsx.snap
@@ -25,7 +25,7 @@ exports[`Deposits list renders correctly a single deposit 1`] = `
             <span
               class="woocommerce-filters-label"
             >
-              Deposit currency
+              Payout currency
               :
             </span>
             <div
@@ -69,7 +69,7 @@ exports[`Deposits list renders correctly a single deposit 1`] = `
                   class="woocommerce-dropdown-button__labels"
                 >
                   <span>
-                    All deposits
+                    All payouts
                   </span>
                 </div>
               </button>
@@ -96,7 +96,7 @@ exports[`Deposits list renders correctly a single deposit 1`] = `
             data-wp-c16t="true"
             data-wp-component="Text"
           >
-            Deposit history
+            Payout history
           </h2>
           <div
             class="woocommerce-table__actions"
@@ -170,7 +170,7 @@ exports[`Deposits list renders correctly a single deposit 1`] = `
                 class="woocommerce-table__caption screen-reader-text"
                 id="caption-1"
               >
-                Deposit history
+                Payout history
               </caption>
               <tbody>
                 <tr>
@@ -321,7 +321,7 @@ exports[`Deposits list renders correctly a single deposit 1`] = `
                   >
                     <a
                       data-link-type="wc-admin"
-                      href="admin.php?page=wc-admin&path=%2Fpayments%2Fdeposits%2Fdetails&id=po_mock1"
+                      href="admin.php?page=wc-admin&path=%2Fpayments%2Fpayouts%2Fdetails&id=po_mock1"
                     >
                       <svg
                         class="gridicon gridicons-info-outline needs-offset"
@@ -343,7 +343,7 @@ exports[`Deposits list renders correctly a single deposit 1`] = `
                   >
                     <a
                       data-link-type="wc-admin"
-                      href="admin.php?page=wc-admin&path=%2Fpayments%2Fdeposits%2Fdetails&id=po_mock1"
+                      href="admin.php?page=wc-admin&path=%2Fpayments%2Fpayouts%2Fdetails&id=po_mock1"
                     >
                       Jan 2, 2020
                     </a>
@@ -354,10 +354,10 @@ exports[`Deposits list renders correctly a single deposit 1`] = `
                     <a
                       class="woocommerce-table__clickable-cell"
                       data-link-type="wc-admin"
-                      href="admin.php?page=wc-admin&path=%2Fpayments%2Fdeposits%2Fdetails&id=po_mock1"
+                      href="admin.php?page=wc-admin&path=%2Fpayments%2Fpayouts%2Fdetails&id=po_mock1"
                       tabindex="-1"
                     >
-                      Deposit
+                      Payout
                     </a>
                   </td>
                   <td
@@ -366,7 +366,7 @@ exports[`Deposits list renders correctly a single deposit 1`] = `
                     <a
                       class="woocommerce-table__clickable-cell"
                       data-link-type="wc-admin"
-                      href="admin.php?page=wc-admin&path=%2Fpayments%2Fdeposits%2Fdetails&id=po_mock1"
+                      href="admin.php?page=wc-admin&path=%2Fpayments%2Fpayouts%2Fdetails&id=po_mock1"
                       tabindex="-1"
                     >
                       $20.00
@@ -378,7 +378,7 @@ exports[`Deposits list renders correctly a single deposit 1`] = `
                     <a
                       class="woocommerce-table__clickable-cell"
                       data-link-type="wc-admin"
-                      href="admin.php?page=wc-admin&path=%2Fpayments%2Fdeposits%2Fdetails&id=po_mock1"
+                      href="admin.php?page=wc-admin&path=%2Fpayments%2Fpayouts%2Fdetails&id=po_mock1"
                       tabindex="-1"
                     >
                       <span
@@ -394,7 +394,7 @@ exports[`Deposits list renders correctly a single deposit 1`] = `
                     <a
                       class="woocommerce-table__clickable-cell"
                       data-link-type="wc-admin"
-                      href="admin.php?page=wc-admin&path=%2Fpayments%2Fdeposits%2Fdetails&id=po_mock1"
+                      href="admin.php?page=wc-admin&path=%2Fpayments%2Fpayouts%2Fdetails&id=po_mock1"
                       tabindex="-1"
                     >
                       MOCK BANK •••• 1234 (USD)
@@ -408,7 +408,7 @@ exports[`Deposits list renders correctly a single deposit 1`] = `
                   >
                     <a
                       data-link-type="wc-admin"
-                      href="admin.php?page=wc-admin&path=%2Fpayments%2Fdeposits%2Fdetails&id=po_mock2"
+                      href="admin.php?page=wc-admin&path=%2Fpayments%2Fpayouts%2Fdetails&id=po_mock2"
                     >
                       <svg
                         class="gridicon gridicons-info-outline needs-offset"
@@ -430,7 +430,7 @@ exports[`Deposits list renders correctly a single deposit 1`] = `
                   >
                     <a
                       data-link-type="wc-admin"
-                      href="admin.php?page=wc-admin&path=%2Fpayments%2Fdeposits%2Fdetails&id=po_mock2"
+                      href="admin.php?page=wc-admin&path=%2Fpayments%2Fpayouts%2Fdetails&id=po_mock2"
                     >
                       Jan 3, 2020
                     </a>
@@ -441,7 +441,7 @@ exports[`Deposits list renders correctly a single deposit 1`] = `
                     <a
                       class="woocommerce-table__clickable-cell"
                       data-link-type="wc-admin"
-                      href="admin.php?page=wc-admin&path=%2Fpayments%2Fdeposits%2Fdetails&id=po_mock2"
+                      href="admin.php?page=wc-admin&path=%2Fpayments%2Fpayouts%2Fdetails&id=po_mock2"
                       tabindex="-1"
                     >
                       Withdrawal
@@ -453,7 +453,7 @@ exports[`Deposits list renders correctly a single deposit 1`] = `
                     <a
                       class="woocommerce-table__clickable-cell"
                       data-link-type="wc-admin"
-                      href="admin.php?page=wc-admin&path=%2Fpayments%2Fdeposits%2Fdetails&id=po_mock2"
+                      href="admin.php?page=wc-admin&path=%2Fpayments%2Fpayouts%2Fdetails&id=po_mock2"
                       tabindex="-1"
                     >
                       $30.00
@@ -465,7 +465,7 @@ exports[`Deposits list renders correctly a single deposit 1`] = `
                     <a
                       class="woocommerce-table__clickable-cell"
                       data-link-type="wc-admin"
-                      href="admin.php?page=wc-admin&path=%2Fpayments%2Fdeposits%2Fdetails&id=po_mock2"
+                      href="admin.php?page=wc-admin&path=%2Fpayments%2Fpayouts%2Fdetails&id=po_mock2"
                       tabindex="-1"
                     >
                       <span
@@ -481,7 +481,7 @@ exports[`Deposits list renders correctly a single deposit 1`] = `
                     <a
                       class="woocommerce-table__clickable-cell"
                       data-link-type="wc-admin"
-                      href="admin.php?page=wc-admin&path=%2Fpayments%2Fdeposits%2Fdetails&id=po_mock2"
+                      href="admin.php?page=wc-admin&path=%2Fpayments%2Fpayouts%2Fdetails&id=po_mock2"
                       tabindex="-1"
                     >
                       MOCK BANK •••• 1234 (USD)
@@ -495,7 +495,7 @@ exports[`Deposits list renders correctly a single deposit 1`] = `
                   >
                     <a
                       data-link-type="wc-admin"
-                      href="admin.php?page=wc-admin&path=%2Fpayments%2Fdeposits%2Fdetails&id=po_mock3"
+                      href="admin.php?page=wc-admin&path=%2Fpayments%2Fpayouts%2Fdetails&id=po_mock3"
                     >
                       <svg
                         class="gridicon gridicons-info-outline needs-offset"
@@ -517,7 +517,7 @@ exports[`Deposits list renders correctly a single deposit 1`] = `
                   >
                     <a
                       data-link-type="wc-admin"
-                      href="admin.php?page=wc-admin&path=%2Fpayments%2Fdeposits%2Fdetails&id=po_mock3"
+                      href="admin.php?page=wc-admin&path=%2Fpayments%2Fpayouts%2Fdetails&id=po_mock3"
                     >
                       Jan 4, 2020
                     </a>
@@ -528,7 +528,7 @@ exports[`Deposits list renders correctly a single deposit 1`] = `
                     <a
                       class="woocommerce-table__clickable-cell"
                       data-link-type="wc-admin"
-                      href="admin.php?page=wc-admin&path=%2Fpayments%2Fdeposits%2Fdetails&id=po_mock3"
+                      href="admin.php?page=wc-admin&path=%2Fpayments%2Fpayouts%2Fdetails&id=po_mock3"
                       tabindex="-1"
                     >
                       Withdrawal
@@ -540,7 +540,7 @@ exports[`Deposits list renders correctly a single deposit 1`] = `
                     <a
                       class="woocommerce-table__clickable-cell"
                       data-link-type="wc-admin"
-                      href="admin.php?page=wc-admin&path=%2Fpayments%2Fdeposits%2Fdetails&id=po_mock3"
+                      href="admin.php?page=wc-admin&path=%2Fpayments%2Fpayouts%2Fdetails&id=po_mock3"
                       tabindex="-1"
                     >
                       $40.00
@@ -552,7 +552,7 @@ exports[`Deposits list renders correctly a single deposit 1`] = `
                     <a
                       class="woocommerce-table__clickable-cell"
                       data-link-type="wc-admin"
-                      href="admin.php?page=wc-admin&path=%2Fpayments%2Fdeposits%2Fdetails&id=po_mock3"
+                      href="admin.php?page=wc-admin&path=%2Fpayments%2Fpayouts%2Fdetails&id=po_mock3"
                       tabindex="-1"
                     >
                       <span
@@ -568,7 +568,7 @@ exports[`Deposits list renders correctly a single deposit 1`] = `
                     <a
                       class="woocommerce-table__clickable-cell"
                       data-link-type="wc-admin"
-                      href="admin.php?page=wc-admin&path=%2Fpayments%2Fdeposits%2Fdetails&id=po_mock3"
+                      href="admin.php?page=wc-admin&path=%2Fpayments%2Fpayouts%2Fdetails&id=po_mock3"
                       tabindex="-1"
                     >
                       MOCK BANK •••• 1234 (USD)
@@ -599,7 +599,7 @@ exports[`Deposits list renders correctly a single deposit 1`] = `
               <span
                 class="woocommerce-table__summary-label"
               >
-                deposit
+                payout
               </span>
             </li>
             <li
@@ -661,7 +661,7 @@ exports[`Deposits list renders correctly with multiple currencies 1`] = `
             <span
               class="woocommerce-filters-label"
             >
-              Deposit currency
+              Payout currency
               :
             </span>
             <div
@@ -705,7 +705,7 @@ exports[`Deposits list renders correctly with multiple currencies 1`] = `
                   class="woocommerce-dropdown-button__labels"
                 >
                   <span>
-                    All deposits
+                    All payouts
                   </span>
                 </div>
               </button>
@@ -732,7 +732,7 @@ exports[`Deposits list renders correctly with multiple currencies 1`] = `
             data-wp-c16t="true"
             data-wp-component="Text"
           >
-            Deposit history
+            Payout history
           </h2>
           <div
             class="woocommerce-table__actions"
@@ -806,7 +806,7 @@ exports[`Deposits list renders correctly with multiple currencies 1`] = `
                 class="woocommerce-table__caption screen-reader-text"
                 id="caption-0"
               >
-                Deposit history
+                Payout history
               </caption>
               <tbody>
                 <tr>
@@ -957,7 +957,7 @@ exports[`Deposits list renders correctly with multiple currencies 1`] = `
                   >
                     <a
                       data-link-type="wc-admin"
-                      href="admin.php?page=wc-admin&path=%2Fpayments%2Fdeposits%2Fdetails&id=po_mock1"
+                      href="admin.php?page=wc-admin&path=%2Fpayments%2Fpayouts%2Fdetails&id=po_mock1"
                     >
                       <svg
                         class="gridicon gridicons-info-outline needs-offset"
@@ -979,7 +979,7 @@ exports[`Deposits list renders correctly with multiple currencies 1`] = `
                   >
                     <a
                       data-link-type="wc-admin"
-                      href="admin.php?page=wc-admin&path=%2Fpayments%2Fdeposits%2Fdetails&id=po_mock1"
+                      href="admin.php?page=wc-admin&path=%2Fpayments%2Fpayouts%2Fdetails&id=po_mock1"
                     >
                       Jan 2, 2020
                     </a>
@@ -990,10 +990,10 @@ exports[`Deposits list renders correctly with multiple currencies 1`] = `
                     <a
                       class="woocommerce-table__clickable-cell"
                       data-link-type="wc-admin"
-                      href="admin.php?page=wc-admin&path=%2Fpayments%2Fdeposits%2Fdetails&id=po_mock1"
+                      href="admin.php?page=wc-admin&path=%2Fpayments%2Fpayouts%2Fdetails&id=po_mock1"
                       tabindex="-1"
                     >
-                      Deposit
+                      Payout
                     </a>
                   </td>
                   <td
@@ -1002,7 +1002,7 @@ exports[`Deposits list renders correctly with multiple currencies 1`] = `
                     <a
                       class="woocommerce-table__clickable-cell"
                       data-link-type="wc-admin"
-                      href="admin.php?page=wc-admin&path=%2Fpayments%2Fdeposits%2Fdetails&id=po_mock1"
+                      href="admin.php?page=wc-admin&path=%2Fpayments%2Fpayouts%2Fdetails&id=po_mock1"
                       tabindex="-1"
                     >
                       $20.00
@@ -1014,7 +1014,7 @@ exports[`Deposits list renders correctly with multiple currencies 1`] = `
                     <a
                       class="woocommerce-table__clickable-cell"
                       data-link-type="wc-admin"
-                      href="admin.php?page=wc-admin&path=%2Fpayments%2Fdeposits%2Fdetails&id=po_mock1"
+                      href="admin.php?page=wc-admin&path=%2Fpayments%2Fpayouts%2Fdetails&id=po_mock1"
                       tabindex="-1"
                     >
                       <span
@@ -1030,7 +1030,7 @@ exports[`Deposits list renders correctly with multiple currencies 1`] = `
                     <a
                       class="woocommerce-table__clickable-cell"
                       data-link-type="wc-admin"
-                      href="admin.php?page=wc-admin&path=%2Fpayments%2Fdeposits%2Fdetails&id=po_mock1"
+                      href="admin.php?page=wc-admin&path=%2Fpayments%2Fpayouts%2Fdetails&id=po_mock1"
                       tabindex="-1"
                     >
                       MOCK BANK •••• 1234 (USD)
@@ -1044,7 +1044,7 @@ exports[`Deposits list renders correctly with multiple currencies 1`] = `
                   >
                     <a
                       data-link-type="wc-admin"
-                      href="admin.php?page=wc-admin&path=%2Fpayments%2Fdeposits%2Fdetails&id=po_mock2"
+                      href="admin.php?page=wc-admin&path=%2Fpayments%2Fpayouts%2Fdetails&id=po_mock2"
                     >
                       <svg
                         class="gridicon gridicons-info-outline needs-offset"
@@ -1066,7 +1066,7 @@ exports[`Deposits list renders correctly with multiple currencies 1`] = `
                   >
                     <a
                       data-link-type="wc-admin"
-                      href="admin.php?page=wc-admin&path=%2Fpayments%2Fdeposits%2Fdetails&id=po_mock2"
+                      href="admin.php?page=wc-admin&path=%2Fpayments%2Fpayouts%2Fdetails&id=po_mock2"
                     >
                       Jan 3, 2020
                     </a>
@@ -1077,7 +1077,7 @@ exports[`Deposits list renders correctly with multiple currencies 1`] = `
                     <a
                       class="woocommerce-table__clickable-cell"
                       data-link-type="wc-admin"
-                      href="admin.php?page=wc-admin&path=%2Fpayments%2Fdeposits%2Fdetails&id=po_mock2"
+                      href="admin.php?page=wc-admin&path=%2Fpayments%2Fpayouts%2Fdetails&id=po_mock2"
                       tabindex="-1"
                     >
                       Withdrawal
@@ -1089,7 +1089,7 @@ exports[`Deposits list renders correctly with multiple currencies 1`] = `
                     <a
                       class="woocommerce-table__clickable-cell"
                       data-link-type="wc-admin"
-                      href="admin.php?page=wc-admin&path=%2Fpayments%2Fdeposits%2Fdetails&id=po_mock2"
+                      href="admin.php?page=wc-admin&path=%2Fpayments%2Fpayouts%2Fdetails&id=po_mock2"
                       tabindex="-1"
                     >
                       $30.00
@@ -1101,7 +1101,7 @@ exports[`Deposits list renders correctly with multiple currencies 1`] = `
                     <a
                       class="woocommerce-table__clickable-cell"
                       data-link-type="wc-admin"
-                      href="admin.php?page=wc-admin&path=%2Fpayments%2Fdeposits%2Fdetails&id=po_mock2"
+                      href="admin.php?page=wc-admin&path=%2Fpayments%2Fpayouts%2Fdetails&id=po_mock2"
                       tabindex="-1"
                     >
                       <span
@@ -1117,7 +1117,7 @@ exports[`Deposits list renders correctly with multiple currencies 1`] = `
                     <a
                       class="woocommerce-table__clickable-cell"
                       data-link-type="wc-admin"
-                      href="admin.php?page=wc-admin&path=%2Fpayments%2Fdeposits%2Fdetails&id=po_mock2"
+                      href="admin.php?page=wc-admin&path=%2Fpayments%2Fpayouts%2Fdetails&id=po_mock2"
                       tabindex="-1"
                     >
                       MOCK BANK •••• 1234 (USD)
@@ -1131,7 +1131,7 @@ exports[`Deposits list renders correctly with multiple currencies 1`] = `
                   >
                     <a
                       data-link-type="wc-admin"
-                      href="admin.php?page=wc-admin&path=%2Fpayments%2Fdeposits%2Fdetails&id=po_mock3"
+                      href="admin.php?page=wc-admin&path=%2Fpayments%2Fpayouts%2Fdetails&id=po_mock3"
                     >
                       <svg
                         class="gridicon gridicons-info-outline needs-offset"
@@ -1153,7 +1153,7 @@ exports[`Deposits list renders correctly with multiple currencies 1`] = `
                   >
                     <a
                       data-link-type="wc-admin"
-                      href="admin.php?page=wc-admin&path=%2Fpayments%2Fdeposits%2Fdetails&id=po_mock3"
+                      href="admin.php?page=wc-admin&path=%2Fpayments%2Fpayouts%2Fdetails&id=po_mock3"
                     >
                       Jan 4, 2020
                     </a>
@@ -1164,7 +1164,7 @@ exports[`Deposits list renders correctly with multiple currencies 1`] = `
                     <a
                       class="woocommerce-table__clickable-cell"
                       data-link-type="wc-admin"
-                      href="admin.php?page=wc-admin&path=%2Fpayments%2Fdeposits%2Fdetails&id=po_mock3"
+                      href="admin.php?page=wc-admin&path=%2Fpayments%2Fpayouts%2Fdetails&id=po_mock3"
                       tabindex="-1"
                     >
                       Withdrawal
@@ -1176,7 +1176,7 @@ exports[`Deposits list renders correctly with multiple currencies 1`] = `
                     <a
                       class="woocommerce-table__clickable-cell"
                       data-link-type="wc-admin"
-                      href="admin.php?page=wc-admin&path=%2Fpayments%2Fdeposits%2Fdetails&id=po_mock3"
+                      href="admin.php?page=wc-admin&path=%2Fpayments%2Fpayouts%2Fdetails&id=po_mock3"
                       tabindex="-1"
                     >
                       $40.00
@@ -1188,7 +1188,7 @@ exports[`Deposits list renders correctly with multiple currencies 1`] = `
                     <a
                       class="woocommerce-table__clickable-cell"
                       data-link-type="wc-admin"
-                      href="admin.php?page=wc-admin&path=%2Fpayments%2Fdeposits%2Fdetails&id=po_mock3"
+                      href="admin.php?page=wc-admin&path=%2Fpayments%2Fpayouts%2Fdetails&id=po_mock3"
                       tabindex="-1"
                     >
                       <span
@@ -1204,7 +1204,7 @@ exports[`Deposits list renders correctly with multiple currencies 1`] = `
                     <a
                       class="woocommerce-table__clickable-cell"
                       data-link-type="wc-admin"
-                      href="admin.php?page=wc-admin&path=%2Fpayments%2Fdeposits%2Fdetails&id=po_mock3"
+                      href="admin.php?page=wc-admin&path=%2Fpayments%2Fpayouts%2Fdetails&id=po_mock3"
                       tabindex="-1"
                     >
                       MOCK BANK •••• 1234 (USD)
@@ -1235,7 +1235,7 @@ exports[`Deposits list renders correctly with multiple currencies 1`] = `
               <span
                 class="woocommerce-table__summary-label"
               >
-                deposits
+                payouts
               </span>
             </li>
           </ul>
diff --git a/client/deposits/list/test/index.tsx b/client/deposits/list/test/index.tsx
index 322ca965f23..d70561fb6d4 100644
--- a/client/deposits/list/test/index.tsx
+++ b/client/deposits/list/test/index.tsx
@@ -281,7 +281,7 @@ describe( 'Deposits list', () => {
 			getByRole( 'button', { name: 'Download' } ).click();
 
 			const expected = [
-				'"Deposit Id"',
+				'"Payout Id"',
 				'Date',
 				'Type',
 				'Amount',
diff --git a/client/deposits/rename-notice/header-image.svg b/client/deposits/rename-notice/header-image.svg
new file mode 100644
index 00000000000..563468de2b4
--- /dev/null
+++ b/client/deposits/rename-notice/header-image.svg
@@ -0,0 +1,30 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="129" height="71" viewBox="0 0 129 71" fill="none">
+  <g clip-path="url(#clip0_2464_6097)">
+    <path d="M83.7082 0H2.10612C0.94168 0 0 1.08204 0 2.41689V52.2413C0 53.5761 0.94168 54.6582 2.10612 54.6582H83.7082C84.8727 54.6582 85.8144 53.5761 85.8144 52.2413V2.41689C85.8144 1.08204 84.8727 0 83.7082 0Z" fill="#E5E5E5" fill-opacity="0.5"/>
+    <path d="M52.1371 4.84375H5.12402V32.5318H52.1371V4.84375Z" fill="white"/>
+    <path d="M52.1371 36.9805H5.12402V40.894H52.1371V36.9805Z" fill="white"/>
+    <path d="M23.34 45.1406H5.12402V49.0542H23.3501V45.1406H23.34Z" fill="white"/>
+    <path d="M85.6621 48.8533C97.3889 48.8533 106.895 39.3591 106.895 27.6474C106.895 15.9356 97.3889 6.44141 85.6621 6.44141C73.9352 6.44141 64.4287 15.9356 64.4287 27.6474C64.4287 39.3591 73.9352 48.8533 85.6621 48.8533Z" fill="#271B3D"/>
+    <path d="M91.4241 30.3281L88.2852 33.463L123.846 68.2804L126.286 65.8433L91.4241 30.3281Z" fill="#271B3D"/>
+    <path d="M85.6324 45.609C95.5473 45.609 103.585 37.5817 103.585 27.6795C103.585 17.7773 95.5473 9.75 85.6324 9.75C75.7174 9.75 67.6797 17.7773 67.6797 27.6795C67.6797 37.5817 75.7174 45.609 85.6324 45.609Z" fill="#E0E0E0"/>
+    <path d="M109.457 47.1128L109.194 45.0903L108.212 44.1094L102.086 50.2274L103.068 51.2084L105.093 51.4713C105.964 53.332 109.781 59.5613 113.71 63.4749C118.51 68.2682 121.942 69.8356 125.324 70.9986L129.01 67.3176C127.845 63.94 126.286 60.5119 121.476 55.7185C117.558 51.805 111.32 47.9825 109.457 47.1128Z" fill="#BEA0F2"/>
+    <path d="M85.8038 20.6094C78.8475 20.6094 74.3416 25.342 71.9014 28.0219C74.3518 30.7017 78.8576 35.4343 85.8038 35.4343C92.7601 35.4343 97.266 30.7017 99.7062 28.0219C97.2558 25.342 92.7499 20.6094 85.8038 20.6094Z" fill="white"/>
+    <path d="M85.8035 33.4213C88.7898 33.4213 91.2106 31.0036 91.2106 28.0212C91.2106 25.0388 88.7898 22.6211 85.8035 22.6211C82.8173 22.6211 80.3965 25.0388 80.3965 28.0212C80.3965 31.0036 82.8173 33.4213 85.8035 33.4213Z" fill="#BEA0F2"/>
+    <path d="M85.8041 30.7204C87.2972 30.7204 88.5077 29.5115 88.5077 28.0204C88.5077 26.5292 87.2972 25.3203 85.8041 25.3203C84.311 25.3203 83.1006 26.5292 83.1006 28.0204C83.1006 29.5115 84.311 30.7204 85.8041 30.7204Z" fill="#271B3D"/>
+    <path d="M84.0626 27.3353C84.6553 27.3353 85.1359 26.8553 85.1359 26.2633C85.1359 25.6713 84.6553 25.1914 84.0626 25.1914C83.4698 25.1914 82.9893 25.6713 82.9893 26.2633C82.9893 26.8553 83.4698 27.3353 84.0626 27.3353Z" fill="white"/>
+    <path d="M54.1621 60.3615V57.0042L51.3775 56.6401C51.1244 55.4772 50.6688 54.385 50.041 53.4142L51.7522 51.1895L49.3727 48.813L47.145 50.522C46.173 49.8951 45.0794 49.4299 43.915 49.1872L43.5505 46.4062H40.1888L39.8242 49.1872C38.6598 49.44 37.5662 49.8951 36.5942 50.522L34.3666 48.813L31.987 51.1895L33.6983 53.4142C33.0705 54.385 32.6047 55.4772 32.3617 56.6401L29.5771 57.0042V60.3615L32.3617 60.7256C32.6148 61.8885 33.0705 62.9807 33.6983 63.9515L31.987 66.1762L34.3666 68.5527L36.5942 66.8437C37.5662 67.4706 38.6598 67.9358 39.8242 68.1785L40.1888 70.9594H43.5505L43.915 68.1785C45.0794 67.9257 46.173 67.4706 47.145 66.8437L49.3727 68.5527L51.7522 66.1762L50.041 63.9515C50.6688 62.9807 51.1345 61.8885 51.3775 60.7256L54.1621 60.3615ZM41.8595 62.1818C39.7837 62.1818 38.0928 60.5031 38.0928 58.4199C38.0928 56.3367 39.7736 54.6581 41.8595 54.6581C43.9454 54.6581 45.6262 56.3367 45.6262 58.4199C45.6262 60.5031 43.9454 62.1818 41.8595 62.1818Z" fill="#BEA0F2"/>
+    <path d="M8.03944 6.77344H7.97868C7.58378 6.77344 7.25977 7.08693 7.25977 7.48131V7.54199C7.25977 7.93638 7.58378 8.24987 7.97868 8.24987H8.03944C8.43433 8.24987 8.75835 7.93638 8.75835 7.54199V7.48131C8.75835 7.08693 8.43433 6.77344 8.03944 6.77344Z" fill="#271B3D"/>
+    <path d="M49.6146 6.77344H49.5539C49.159 6.77344 48.835 7.08693 48.835 7.48131V7.54199C48.835 7.93638 49.159 8.24987 49.5539 8.24987H49.6146C50.0095 8.24987 50.3335 7.93638 50.3335 7.54199V7.48131C50.3335 7.08693 50.0095 6.77344 49.6146 6.77344Z" fill="#271B3D"/>
+    <path d="M49.6146 29.1328H49.5539C49.159 29.1328 48.835 29.4463 48.835 29.8407V29.9014C48.835 30.2958 49.159 30.6092 49.5539 30.6092H49.6146C50.0095 30.6092 50.3335 30.2958 50.3335 29.9014V29.8407C50.3335 29.4463 50.0095 29.1328 49.6146 29.1328Z" fill="#271B3D"/>
+    <path d="M8.03944 29.1328H7.97868C7.58378 29.1328 7.25977 29.4463 7.25977 29.8407V29.9014C7.25977 30.2958 7.58378 30.6092 7.97868 30.6092H8.03944C8.43433 30.6092 8.75835 30.2958 8.75835 29.9014V29.8407C8.75835 29.4463 8.43433 29.1328 8.03944 29.1328Z" fill="#271B3D"/>
+    <path d="M49.5845 7.51172H8.00879V29.8705H49.5743V7.51172H49.5845Z" stroke="#271B3D" stroke-width="0.28" stroke-miterlimit="10"/>
+    <path d="M8.00879 7.51172L49.5845 29.8604" stroke="#271B3D" stroke-width="0.28" stroke-miterlimit="10"/>
+    <path d="M49.5845 7.51172L8.00879 29.8604" stroke="#271B3D" stroke-width="0.28" stroke-miterlimit="10"/>
+    <path d="M72.023 65.0044V63.4875L70.1295 62.9617L69.6232 61.7482L70.5851 60.0392L69.5118 58.9672L67.8006 59.9279L66.5855 59.4223L66.059 57.5312H64.5401L64.0136 59.4223L62.7985 59.9279L61.0873 58.9672L60.014 60.0392L60.9759 61.7482L60.4697 62.9617L58.5762 63.4875V65.0044L60.4697 65.5303L60.9759 66.7438L60.014 68.4528L61.0873 69.5247L62.7985 68.564L64.0136 69.0696L64.5401 70.9607H66.059L66.5855 69.0696L67.8006 68.564L69.5118 69.5247L70.5851 68.4528L69.6232 66.7438L70.1295 65.5303L72.023 65.0044ZM66.4539 65.4089C65.816 66.046 64.7629 66.046 64.125 65.4089C63.4871 64.7718 63.4871 63.7201 64.125 63.083C64.449 62.7594 64.8642 62.5976 65.2894 62.5976C65.7147 62.5976 66.1299 62.7594 66.4539 63.083C67.0918 63.7201 67.0918 64.7718 66.4539 65.4089Z" fill="#F2EDFF"/>
+  </g>
+  <defs>
+    <clipPath id="clip0_2464_6097">
+      <rect width="129" height="71" fill="white"/>
+    </clipPath>
+  </defs>
+</svg>
\ No newline at end of file
diff --git a/client/deposits/rename-notice/index.tsx b/client/deposits/rename-notice/index.tsx
new file mode 100644
index 00000000000..61ff61b142e
--- /dev/null
+++ b/client/deposits/rename-notice/index.tsx
@@ -0,0 +1,88 @@
+/**
+ * External dependencies
+ */
+import { __ } from '@wordpress/i18n';
+import React, { useState, useEffect } from 'react';
+import { TourKit } from '@woocommerce/components';
+import { useDispatch } from '@wordpress/data';
+import { createInterpolateElement } from '@wordpress/element';
+
+/**
+ * Internal dependencies
+ */
+import './style.scss';
+
+export const PayoutsRenameNotice = () => {
+	const isPayoutsRenameNoticeDismissed =
+		wcpaySettings.isPayoutsRenameNoticeDismissed;
+	const { updateOptions } = useDispatch( 'wc/admin/options' );
+	const [ showTour, setShowTour ] = useState( false );
+
+	const onClose = () => {
+		updateOptions( {
+			wcpay_payouts_rename_notice_dismissed: true,
+		} );
+		setShowTour( false );
+		wcpaySettings.isPayoutsRenameNoticeDismissed = true;
+	};
+
+	useEffect( () => {
+		if ( ! isPayoutsRenameNoticeDismissed ) {
+			setShowTour( true );
+		}
+	}, [ isPayoutsRenameNoticeDismissed ] );
+
+	if ( ! showTour ) return null;
+
+	return (
+		<TourKit
+			config={ {
+				placement: 'bottom',
+				options: {
+					effects: {
+						overlay: false,
+						autoScroll: {
+							behavior: 'smooth',
+						},
+					},
+					classNames:
+						'wc-admin-payments-overview-payouts-rename-tour',
+				},
+				steps: [
+					{
+						referenceElements: {
+							desktop:
+								'#toplevel_page_wc-admin-path--payments-overview ul.wp-submenu li a[href*="payouts"]',
+						},
+						meta: {
+							name: 'deposits-now-payouts',
+							heading: __(
+								'Deposits are now known as Payouts!',
+								'woocommerce-payments'
+							),
+							descriptions: {
+								desktop: createInterpolateElement(
+									__(
+										"Same reliable system for quick access to your earnings — now with a clearer name. To enhance your experience, 'Deposits' will now be called 'Payouts'. <link>Learn More.</link>",
+										'woocommerce-payments'
+									),
+									{
+										link: (
+											// eslint-disable-next-line jsx-a11y/anchor-has-content
+											<a
+												href="https://woocommerce.com/document/woopayments/payouts/deposits-and-payouts/"
+												target="_blank"
+												rel="noreferrer"
+											/>
+										),
+									}
+								),
+							},
+						},
+					},
+				],
+				closeHandler: onClose,
+			} }
+		></TourKit>
+	);
+};
diff --git a/client/deposits/rename-notice/style.scss b/client/deposits/rename-notice/style.scss
new file mode 100644
index 00000000000..3a2c51b7334
--- /dev/null
+++ b/client/deposits/rename-notice/style.scss
@@ -0,0 +1,77 @@
+.wc-admin-payments-overview-payouts-rename-tour {
+	color: #1e1e1e;
+
+	.woocommerce-tour-kit-step {
+		border-radius: 8px;
+		border: 1px solid #dcdcdc;
+
+		/* Shadow / Popover */
+		box-shadow: 0 2px 6px 0 rgba( 0, 0, 0, 0.05 );
+		width: 257px;
+		padding-bottom: 0;
+	}
+
+	.components-card__footer {
+		display: none;
+	}
+
+	.tour-kit-frame__container {
+		box-shadow: none;
+		background: none;
+	}
+
+	.components-elevation {
+		display: none;
+	}
+
+	.woocommerce-tour-kit-step__body {
+		background-image: url( './header-image.svg' );
+		background-repeat: no-repeat;
+		background-position-x: center;
+		background-position-y: 5px;
+		padding-bottom: 24px;
+	}
+	.woocommerce-tour-kit-step-navigation {
+		display: none;
+	}
+	h2 {
+		padding-top: 100px;
+		font-size: 14px;
+		line-height: 24px;
+	}
+	p.woocommerce-tour-kit-step__description {
+		font-size: 13px;
+		line-height: 18px;
+		margin-top: 8px;
+	}
+	.tour-kit-frame__arrow::before {
+		box-shadow: none !important;
+	}
+
+	.tour-kit-frame__container[data-popper-placement^='bottom'] {
+		& > .tour-kit-frame__arrow {
+			background: #fff;
+			&::before {
+				border-top: 1px solid var( --gutenberg-gray-300, #ddd );
+				border-left: 1px solid var( --gutenberg-gray-300, #ddd );
+			}
+		}
+	}
+
+	.tour-kit-frame__container[data-popper-placement^='right'] {
+		& > .tour-kit-frame__arrow {
+			background: #fff;
+			&::before {
+				border-bottom: 1px solid var( --gutenberg-gray-300, #ddd );
+				border-left: 1px solid var( --gutenberg-gray-300, #ddd );
+			}
+		}
+	}
+
+	a {
+		display: block;
+		text-decoration: none;
+		margin-top: 12px;
+		padding-block: 11px;
+	}
+}
diff --git a/client/deposits/rename-notice/test/__snapshots__/index.tsx.snap b/client/deposits/rename-notice/test/__snapshots__/index.tsx.snap
new file mode 100644
index 00000000000..8d2131ec55c
--- /dev/null
+++ b/client/deposits/rename-notice/test/__snapshots__/index.tsx.snap
@@ -0,0 +1,9 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`PayoutsRenameNotice should render notice if isPayoutsRenameNoticeDismissed is false 1`] = `
+<div>
+  <div>
+    Tour Component
+  </div>
+</div>
+`;
diff --git a/client/deposits/rename-notice/test/index.tsx b/client/deposits/rename-notice/test/index.tsx
new file mode 100644
index 00000000000..9f9f2d0c7a8
--- /dev/null
+++ b/client/deposits/rename-notice/test/index.tsx
@@ -0,0 +1,49 @@
+/** @format */
+/**
+ * External dependencies
+ */
+import React from 'react';
+import { render } from '@testing-library/react';
+
+/**
+ * Internal dependencies
+ */
+import { PayoutsRenameNotice } from '..';
+
+jest.mock( '@wordpress/api-fetch', () => jest.fn() );
+
+jest.mock( '@wordpress/data', () => ( {
+	useDispatch: jest.fn().mockReturnValue( { updateOptions: jest.fn() } ),
+} ) );
+
+jest.mock( '@woocommerce/components', () => ( {
+	TourKit: () => <div>Tour Component</div>,
+} ) );
+
+declare const global: {
+	wcpaySettings: {
+		isPayoutsRenameNoticeDismissed: boolean;
+	};
+};
+
+describe( 'PayoutsRenameNotice', () => {
+	afterEach( () => {
+		jest.clearAllMocks();
+	} );
+
+	test( 'should render null if isPayoutsRenameNoticeDismissed is true', () => {
+		global.wcpaySettings = {
+			isPayoutsRenameNoticeDismissed: true,
+		};
+		const { container } = render( <PayoutsRenameNotice /> );
+		expect( container.firstChild ).toBeNull();
+	} );
+
+	test( 'should render notice if isPayoutsRenameNoticeDismissed is false', () => {
+		global.wcpaySettings = {
+			isPayoutsRenameNoticeDismissed: false,
+		};
+		const { container } = render( <PayoutsRenameNotice /> );
+		expect( container ).toMatchSnapshot();
+	} );
+} );
diff --git a/client/deposits/strings.ts b/client/deposits/strings.ts
index 03a8c55198d..7dbf7df2dad 100644
--- a/client/deposits/strings.ts
+++ b/client/deposits/strings.ts
@@ -12,7 +12,7 @@ import { __ } from '@wordpress/i18n';
 import type { DepositStatus } from 'wcpay/types/deposits';
 
 export const displayType = {
-	deposit: __( 'Deposit', 'woocommerce-payments' ),
+	deposit: __( 'Payout', 'woocommerce-payments' ),
 	withdrawal: __( 'Withdrawal', 'woocommerce-payments' ),
 };
 
diff --git a/client/globals.d.ts b/client/globals.d.ts
index 1d208d50f74..0d10d7de86b 100644
--- a/client/globals.d.ts
+++ b/client/globals.d.ts
@@ -89,6 +89,7 @@ declare global {
 		fraudProtection: {
 			isWelcomeTourDismissed?: boolean;
 		};
+		isPayoutsRenameNoticeDismissed: boolean;
 		progressiveOnboarding?: {
 			isEnabled: boolean;
 			isComplete: boolean;
diff --git a/client/index.js b/client/index.js
index 11083acffac..c42dfd42788 100644
--- a/client/index.js
+++ b/client/index.js
@@ -97,9 +97,9 @@ addFilter(
 
 		pages.push( {
 			container: DepositsPage,
-			path: '/payments/deposits',
+			path: '/payments/payouts',
 			wpOpenMenu: menuID,
-			breadcrumbs: [ rootLink, __( 'Deposits', 'woocommerce-payments' ) ],
+			breadcrumbs: [ rootLink, __( 'Payouts', 'woocommerce-payments' ) ],
 			navArgs: {
 				id: 'wc-payments-deposits',
 			},
@@ -107,19 +107,19 @@ addFilter(
 		} );
 		pages.push( {
 			container: DepositDetailsPage,
-			path: '/payments/deposits/details',
+			path: '/payments/payouts/details',
 			wpOpenMenu: menuID,
 			breadcrumbs: [
 				rootLink,
 				[
-					'/payments/deposits',
-					__( 'Deposits', 'woocommerce-payments' ),
+					'/payments/payouts',
+					__( 'Payouts', 'woocommerce-payments' ),
 				],
-				__( 'Deposit details', 'woocommerce-payments' ),
+				__( 'Payout details', 'woocommerce-payments' ),
 			],
 			navArgs: {
 				id: 'wc-payments-deposit-details',
-				parentPath: '/payments/deposits',
+				parentPath: '/payments/payouts',
 			},
 			capability: 'manage_woocommerce',
 		} );
diff --git a/client/overview/index.js b/client/overview/index.js
index f6d5afd4a72..edb215993c7 100644
--- a/client/overview/index.js
+++ b/client/overview/index.js
@@ -32,6 +32,7 @@ import { useDisputes, useGetSettings, useSettings } from 'data';
 import SandboxModeSwitchToLiveNotice from 'wcpay/components/sandbox-mode-switch-to-live-notice';
 import './style.scss';
 import BannerNotice from 'wcpay/components/banner-notice';
+import { PayoutsRenameNotice } from 'wcpay/deposits/rename-notice';
 
 const OverviewPageError = () => {
 	const queryParams = getQuery();
@@ -194,6 +195,7 @@ const OverviewPage = () => {
 			{ showConnectionSuccess && <ConnectionSuccessNotice /> }
 			{ ! accountRejected && ! accountUnderReview && (
 				<ErrorBoundary>
+					<PayoutsRenameNotice />
 					<Welcome />
 
 					{ showTaskList && (
diff --git a/client/overview/modal/progressive-onboarding-eligibility/index.tsx b/client/overview/modal/progressive-onboarding-eligibility/index.tsx
index 564e8494a70..d4b3f79021f 100644
--- a/client/overview/modal/progressive-onboarding-eligibility/index.tsx
+++ b/client/overview/modal/progressive-onboarding-eligibility/index.tsx
@@ -82,7 +82,7 @@ const ProgressiveOnboardingEligibilityModal: React.FC = () => {
 			</h1>
 			<h2 className="wcpay-progressive-onboarding-eligibility-modal__subheading">
 				{ __(
-					'Start selling now and fast track the setup process, or continue the process to set up deposits with WooPayments.',
+					'Start selling now and fast track the setup process, or continue the process to set up payouts with WooPayments.',
 					'woocommerce-payments'
 				) }
 			</h2>
@@ -120,14 +120,14 @@ const ProgressiveOnboardingEligibilityModal: React.FC = () => {
 						{ __( 'Flexible process', 'woocommerce-payments' ) }
 					</h3>
 					{ __(
-						'You have a $5,000 balance limit or 30 days from your first transaction to verify and set up deposits in your account.',
+						'You have a $5,000 balance limit or 30 days from your first transaction to verify and set up payouts in your account.',
 						'woocommerce-payments'
 					) }
 				</div>
 			</div>
 			<div className="wcpay-progressive-onboarding-eligibility-modal__footer">
 				<Button variant="secondary" onClick={ handleSetup }>
-					{ __( 'Start receiving deposits', 'woocommerce-payments' ) }
+					{ __( 'Start receiving payouts', 'woocommerce-payments' ) }
 				</Button>
 				<Button variant="primary" onClick={ handlePaymentsOnly }>
 					{ __( 'Start selling', 'woocommerce-payments' ) }
diff --git a/client/overview/modal/progressive-onboarding-eligibility/test/index.test.tsx b/client/overview/modal/progressive-onboarding-eligibility/test/index.test.tsx
index d09858758f1..ed41dff73e4 100644
--- a/client/overview/modal/progressive-onboarding-eligibility/test/index.test.tsx
+++ b/client/overview/modal/progressive-onboarding-eligibility/test/index.test.tsx
@@ -83,7 +83,7 @@ describe( 'Progressive Onboarding Eligibility Modal', () => {
 
 		user.click(
 			screen.getByRole( 'button', {
-				name: 'Start receiving deposits',
+				name: 'Start receiving payouts',
 			} )
 		);
 
diff --git a/client/overview/modal/reset-account/strings.tsx b/client/overview/modal/reset-account/strings.tsx
index d6bb17d68b7..b5c2adc2bdd 100644
--- a/client/overview/modal/reset-account/strings.tsx
+++ b/client/overview/modal/reset-account/strings.tsx
@@ -13,7 +13,7 @@ export default {
 	title: __( 'Reset account', 'woocommerce-payments' ),
 	description: isInTestModeOnboarding()
 		? __(
-				'In sandbox mode, you can reset your account and onboard again at any time. Please note that all current WooPayments account details, test transactions, and deposits history will be lost.',
+				'In sandbox mode, you can reset your account and onboard again at any time. Please note that all current WooPayments account details, test transactions, and payouts history will be lost.',
 				'woocommerce-payments'
 		  )
 		: __(
diff --git a/client/overview/modal/update-business-details/strings.tsx b/client/overview/modal/update-business-details/strings.tsx
index 02b7bb6b3a7..614444faf8c 100644
--- a/client/overview/modal/update-business-details/strings.tsx
+++ b/client/overview/modal/update-business-details/strings.tsx
@@ -14,12 +14,12 @@ export default {
 	),
 
 	restrictedDescription: __(
-		'Payments and deposits are disabled for this account until missing information is updated. Please update the following information in the Stripe dashboard.',
+		'Payments and payouts are disabled for this account until missing information is updated. Please update the following information in the Stripe dashboard.',
 		'woocommerce-payments'
 	),
 
 	restrictedSoonDescription: __(
-		'Additional information is required to verify your business. Update by %s to avoid a disruption in deposits.',
+		'Additional information is required to verify your business. Update by %s to avoid a disruption in payouts.',
 		'woocommerce-payments'
 	),
 
diff --git a/client/overview/modal/update-business-details/test/__snapshots__/index.tsx.snap b/client/overview/modal/update-business-details/test/__snapshots__/index.tsx.snap
index 6812dc5b28e..5576ad326af 100644
--- a/client/overview/modal/update-business-details/test/__snapshots__/index.tsx.snap
+++ b/client/overview/modal/update-business-details/test/__snapshots__/index.tsx.snap
@@ -50,7 +50,7 @@ exports[`Overview: update business details modal renders correctly when opened f
         class="wcpay-update-business-details-modal__body"
       >
         <p>
-          Payments and deposits are disabled for this account until missing information is updated. Please update the following information in the Stripe dashboard.
+          Payments and payouts are disabled for this account until missing information is updated. Please update the following information in the Stripe dashboard.
         </p>
         <div
           class="components-notice is-warning"
@@ -149,7 +149,7 @@ exports[`Overview: update business details modal renders correctly when opened f
         class="wcpay-update-business-details-modal__body"
       >
         <p>
-          Additional information is required to verify your business. Update by 7pm Dec 31, 2021 to avoid a disruption in deposits.
+          Additional information is required to verify your business. Update by 7pm Dec 31, 2021 to avoid a disruption in payouts.
         </p>
         <div
           class="components-notice is-warning"
@@ -248,7 +248,7 @@ exports[`Overview: update business details modal renders correctly when opened f
         class="wcpay-update-business-details-modal__body"
       >
         <p>
-          Payments and deposits are disabled for this account until missing information is updated. Please update the following information in the Stripe dashboard.
+          Payments and payouts are disabled for this account until missing information is updated. Please update the following information in the Stripe dashboard.
         </p>
         <div
           class="components-notice is-warning"
diff --git a/client/overview/task-list/strings.tsx b/client/overview/task-list/strings.tsx
index 2be3305f6a3..948feb14284 100644
--- a/client/overview/task-list/strings.tsx
+++ b/client/overview/task-list/strings.tsx
@@ -305,7 +305,7 @@ export default {
 					}
 				);
 			},
-			action_label: __( 'Set up deposits', 'woocommerce-payments' ),
+			action_label: __( 'Set up payouts', 'woocommerce-payments' ),
 		},
 		no_payment_30_days: {
 			title: __(
@@ -327,7 +327,7 @@ export default {
 		},
 		after_payment: {
 			title: __(
-				'Verify your bank account to start receiving deposits',
+				'Verify your bank account to start receiving payouts',
 				'woocommerce-payments'
 			),
 			description: ( dueDate: string ): React.ReactElement => {
@@ -345,13 +345,13 @@ export default {
 				);
 			},
 			action_label: __(
-				'Start receiving deposits',
+				'Start receiving payouts',
 				'woocommerce-payments'
 			),
 		},
 		balance_rising: {
 			title: __(
-				'Verify your bank account to start receiving deposits',
+				'Verify your bank account to start receiving payouts',
 				'woocommerce-payments'
 			),
 			description: ( dueDate: string ): React.ReactElement => {
@@ -369,7 +369,7 @@ export default {
 				);
 			},
 			action_label: __(
-				'Start receiving deposits',
+				'Start receiving payouts',
 				'woocommerce-payments'
 			),
 		},
@@ -389,7 +389,7 @@ export default {
 					}
 				);
 			},
-			action_label: __( 'Set up deposits', 'woocommerce-payments' ),
+			action_label: __( 'Set up payouts', 'woocommerce-payments' ),
 		},
 		threshold_reached: {
 			title: __(
@@ -400,7 +400,7 @@ export default {
 				return createInterpolateElement(
 					sprintf(
 						__(
-							'<strong>You have reached the deposit threshold of $5,000.00. Please verify your bank account now to reactivate payments.</strong> Your customers can no longer make purchases on your store until your account is verified.',
+							'<strong>You have reached the payout threshold of $5,000.00. Please verify your bank account now to reactivate payments.</strong> Your customers can no longer make purchases on your store until your account is verified.',
 							'woocommerce-payments'
 						),
 						dueDate
diff --git a/client/overview/task-list/tasks/test/po-tasks.tsx b/client/overview/task-list/tasks/test/po-tasks.tsx
index ed05e36a4ff..c592f826075 100644
--- a/client/overview/task-list/tasks/test/po-tasks.tsx
+++ b/client/overview/task-list/tasks/test/po-tasks.tsx
@@ -100,7 +100,7 @@ describe( 'getVerifyBankAccountTask()', () => {
 				completed: false,
 				expanded: true,
 				isDismissable: false,
-				actionLabel: 'Set up deposits',
+				actionLabel: 'Set up payouts',
 				showActionButton: true,
 				visible: true,
 				time: '2 minutes',
@@ -154,12 +154,12 @@ describe( 'getVerifyBankAccountTask()', () => {
 		expect( getVerifyBankAccountTask() ).toEqual(
 			expect.objectContaining( {
 				key: 'verify-bank-details-po',
-				title: 'Verify your bank account to start receiving deposits',
+				title: 'Verify your bank account to start receiving payouts',
 				level: 3,
 				completed: false,
 				expanded: true,
 				showActionButton: true,
-				actionLabel: 'Start receiving deposits',
+				actionLabel: 'Start receiving payouts',
 				visible: true,
 				time: '2 minutes',
 			} )
@@ -182,14 +182,14 @@ describe( 'getVerifyBankAccountTask()', () => {
 		expect( getVerifyBankAccountTask() ).toEqual(
 			expect.objectContaining( {
 				key: 'verify-bank-details-po',
-				title: 'Verify your bank account to start receiving deposits',
+				title: 'Verify your bank account to start receiving payouts',
 				level: 2,
 				completed: false,
 				visible: true,
 				expanded: true,
 				isDismissable: false,
 				showActionButton: true,
-				actionLabel: 'Start receiving deposits',
+				actionLabel: 'Start receiving payouts',
 				time: '2 minutes',
 			} )
 		);
@@ -211,12 +211,12 @@ describe( 'getVerifyBankAccountTask()', () => {
 		expect( getVerifyBankAccountTask() ).toEqual(
 			expect.objectContaining( {
 				key: 'verify-bank-details-po',
-				title: 'Verify your bank account to start receiving deposits',
+				title: 'Verify your bank account to start receiving payouts',
 				level: 2,
 				completed: false,
 				expanded: true,
 				isDismissable: false,
-				actionLabel: 'Start receiving deposits',
+				actionLabel: 'Start receiving payouts',
 				showActionButton: true,
 				visible: true,
 				time: '2 minutes',
@@ -246,7 +246,7 @@ describe( 'getVerifyBankAccountTask()', () => {
 				expanded: true,
 				isDismissable: false,
 				showActionButton: true,
-				actionLabel: 'Set up deposits',
+				actionLabel: 'Set up payouts',
 				visible: true,
 				time: '2 minutes',
 			} )
@@ -275,7 +275,7 @@ describe( 'getVerifyBankAccountTask()', () => {
 				expanded: true,
 				isDismissable: false,
 				showActionButton: true,
-				actionLabel: 'Set up deposits',
+				actionLabel: 'Set up payouts',
 				visible: true,
 				time: '2 minutes',
 			} )
diff --git a/client/overview/task-list/tasks/update-business-details-task.tsx b/client/overview/task-list/tasks/update-business-details-task.tsx
index a9746ec7b66..a18e06e9c09 100644
--- a/client/overview/task-list/tasks/update-business-details-task.tsx
+++ b/client/overview/task-list/tasks/update-business-details-task.tsx
@@ -43,7 +43,7 @@ export const getUpdateBusinessDetailsTask = (
 		accountDetailsUpdateByDescription = sprintf(
 			/* translators: %s - formatted requirements current deadline (date) */
 			__(
-				'Update by %s to avoid a disruption in deposits.',
+				'Update by %s to avoid a disruption in payouts.',
 				'woocommerce-payments'
 			),
 			dateI18n(
@@ -70,14 +70,14 @@ export const getUpdateBusinessDetailsTask = (
 			accountDetailsTaskDescription =
 				/* translators: <a> - dashboard login URL */
 				__(
-					'Payments and deposits are disabled for this account until setup is completed.',
+					'Payments and payouts are disabled for this account until setup is completed.',
 					'woocommerce-payments'
 				);
 		} else {
 			accountDetailsTaskDescription =
 				/* translators: <a> - dashboard login URL */
 				__(
-					'Payments and deposits are disabled for this account until missing business information is updated.',
+					'Payments and payouts are disabled for this account until missing business information is updated.',
 					'woocommerce-payments'
 				);
 		}
diff --git a/client/overview/task-list/test/tasks.js b/client/overview/task-list/test/tasks.js
index 44b5de4e9f7..733d2208b08 100644
--- a/client/overview/task-list/test/tasks.js
+++ b/client/overview/task-list/test/tasks.js
@@ -447,7 +447,7 @@ describe( 'getTasks()', () => {
 					completed: false,
 					level: 3,
 					title:
-						'Verify your bank account to start receiving deposits',
+						'Verify your bank account to start receiving payouts',
 				} ),
 			] )
 		);
@@ -549,7 +549,7 @@ describe( 'taskSort()', () => {
 				key: 'verify-bank-details-po',
 				completed: false,
 				level: 3,
-				title: 'Verify your bank account to start receiving deposits',
+				title: 'Verify your bank account to start receiving payouts',
 			} )
 		);
 	} );
diff --git a/client/overview/test/index.js b/client/overview/test/index.js
index f399e6488ce..f5429a59226 100644
--- a/client/overview/test/index.js
+++ b/client/overview/test/index.js
@@ -352,4 +352,24 @@ describe( 'Overview page', () => {
 
 		expect( query() ).not.toBeInTheDocument();
 	} );
+
+	it( 'shows payout rename notice if not yet dismissed', () => {
+		global.wcpaySettings.isPayoutsRenameNoticeDismissed = false;
+
+		render( <OverviewPage /> );
+
+		expect(
+			screen.queryByText( 'Deposits are now known as Payouts!' )
+		).toBeInTheDocument();
+	} );
+
+	it( 'does not display payout rename notice if already dismissed', () => {
+		global.wcpaySettings.isPayoutsRenameNoticeDismissed = true;
+
+		render( <OverviewPage /> );
+
+		expect(
+			screen.queryByText( 'Deposits are now known as Payouts!' )
+		).not.toBeInTheDocument();
+	} );
 } );
diff --git a/client/payment-details/timeline/map-events.js b/client/payment-details/timeline/map-events.js
index 64bc74d91d2..da4e275105c 100644
--- a/client/payment-details/timeline/map-events.js
+++ b/client/payment-details/timeline/map-events.js
@@ -54,14 +54,14 @@ const getStatusChangeTimelineItem = ( event, status ) => {
 };
 
 /**
- * Creates a timeline item about a deposit
+ * Creates a timeline item about a payout
  *
- * @param {Object} event An event affecting the deposit
+ * @param {Object} event An event affecting the payout
  * @param {string} formattedAmount Formatted amount string
  * @param {boolean} isPositive Whether the amount will be added or deducted
  * @param {Array} body Any extra subitems that should be included as item body
  *
- * @return {Object} Deposit timeline item
+ * @return {Object} Payout timeline item
  */
 const getDepositTimelineItem = (
 	event,
@@ -73,14 +73,14 @@ const getDepositTimelineItem = (
 	if ( event.deposit ) {
 		headline = sprintf(
 			isPositive
-				? // translators: %1$s - formatted amount, %2$s - deposit arrival date, <a> - link to the deposit
+				? // translators: %1$s - formatted amount, %2$s - payout arrival date, <a> - link to the payout
 				  __(
-						'%1$s was added to your <a>%2$s deposit</a>.',
+						'%1$s was added to your <a>%2$s payout</a>.',
 						'woocommerce-payments'
 				  )
-				: // translators: %1$s - formatted amount, %2$s - deposit arrival date, <a> - link to the deposit
+				: // translators: %1$s - formatted amount, %2$s - payout arrival date, <a> - link to the payout
 				  __(
-						'%1$s was deducted from your <a>%2$s deposit</a>.',
+						'%1$s was deducted from your <a>%2$s payout</a>.',
 						'woocommerce-payments'
 				  ),
 			formattedAmount,
@@ -91,7 +91,7 @@ const getDepositTimelineItem = (
 		);
 		const depositUrl = getAdminUrl( {
 			page: 'wc-admin',
-			path: '/payments/deposits/details',
+			path: '/payments/payouts/details',
 			id: event.deposit.id,
 		} );
 
@@ -104,12 +104,12 @@ const getDepositTimelineItem = (
 			isPositive
 				? // translators: %s - formatted amount
 				  __(
-						'%s will be added to a future deposit.',
+						'%s will be added to a future payout.',
 						'woocommerce-payments'
 				  )
 				: // translators: %s - formatted amount
 				  __(
-						'%s will be deducted from a future deposit.',
+						'%s will be deducted from a future payout.',
 						'woocommerce-payments'
 				  ),
 			formattedAmount
@@ -127,19 +127,19 @@ const getDepositTimelineItem = (
 /**
  * Creates a timeline item about a financing paydown
  *
- * @param {Object} event An event affecting the deposit
+ * @param {Object} event An event affecting the payout
  * @param {string} formattedAmount Formatted amount string
  * @param {Array} body Any extra subitems that should be included as item body
  *
- * @return {Object} Deposit timeline item
+ * @return {Object} Payout timeline item
  */
 const getFinancingPaydownTimelineItem = ( event, formattedAmount, body ) => {
 	let headline = '';
 	if ( event.deposit ) {
 		headline = sprintf(
-			// translators: %1$s - formatted amount, %2$s - deposit arrival date, <a> - link to the deposit
+			// translators: %1$s - formatted amount, %2$s - payout arrival date, <a> - link to the payout
 			__(
-				'%1$s was subtracted from your <a>%2$s deposit</a>.',
+				'%1$s was subtracted from your <a>%2$s payout</a>.',
 				'woocommerce-payments'
 			),
 			formattedAmount,
@@ -151,7 +151,7 @@ const getFinancingPaydownTimelineItem = ( event, formattedAmount, body ) => {
 
 		const depositUrl = getAdminUrl( {
 			page: 'wc-admin',
-			path: '/payments/deposits/details',
+			path: '/payments/payouts/details',
 			id: event.deposit.id,
 		} );
 
@@ -162,7 +162,7 @@ const getFinancingPaydownTimelineItem = ( event, formattedAmount, body ) => {
 	} else {
 		headline = sprintf(
 			__(
-				'%s will be subtracted from a future deposit.',
+				'%s will be subtracted from a future payout.',
 				'woocommerce-payments'
 			),
 			formattedAmount
@@ -245,7 +245,7 @@ const formatNetString = ( event ) => {
 export const composeNetString = ( event ) => {
 	return sprintf(
 		/* translators: %s is a monetary amount */
-		__( 'Net deposit: %s', 'woocommerce-payments' ),
+		__( 'Net payout: %s', 'woocommerce-payments' ),
 		formatNetString( event )
 	);
 };
diff --git a/client/payment-details/timeline/test/__snapshots__/index.js.snap b/client/payment-details/timeline/test/__snapshots__/index.js.snap
index e4753b57f06..95f1e8a5c9f 100644
--- a/client/payment-details/timeline/test/__snapshots__/index.js.snap
+++ b/client/payment-details/timeline/test/__snapshots__/index.js.snap
@@ -181,9 +181,9 @@ exports[`PaymentDetailsTimeline renders correctly (with a mocked Timeline compon
                         $115.00 was added to your 
                         <a
                           data-link-type="wc-admin"
-                          href="admin.php?page=wc-admin&path=%2Fpayments%2Fdeposits%2Fdetails&id=dummy_po_5eaada696b2d3"
+                          href="admin.php?page=wc-admin&path=%2Fpayments%2Fpayouts%2Fdetails&id=dummy_po_5eaada696b2d3"
                         >
-                          Apr 5, 2020 deposit
+                          Apr 5, 2020 payout
                         </a>
                         .
                       </span>
@@ -309,7 +309,7 @@ exports[`PaymentDetailsTimeline renders correctly (with a mocked Timeline compon
                         </g>
                       </svg>
                       <span>
-                        $100.00 will be deducted from a future deposit.
+                        $100.00 will be deducted from a future payout.
                       </span>
                     </div>
                     <span
@@ -441,7 +441,7 @@ exports[`PaymentDetailsTimeline renders correctly (with a mocked Timeline compon
                         </g>
                       </svg>
                       <span>
-                        $50.00 will be deducted from a future deposit.
+                        $50.00 will be deducted from a future payout.
                       </span>
                     </div>
                     <span
@@ -663,7 +663,7 @@ exports[`PaymentDetailsTimeline renders correctly (with a mocked Timeline compon
                         </g>
                       </svg>
                       <span>
-                        $110.00 will be deducted from a future deposit.
+                        $110.00 will be deducted from a future payout.
                       </span>
                     </div>
                     <span
@@ -791,9 +791,9 @@ exports[`PaymentDetailsTimeline renders correctly (with a mocked Timeline compon
                         $59.50 was added to your 
                         <a
                           data-link-type="wc-admin"
-                          href="admin.php?page=wc-admin&path=%2Fpayments%2Fdeposits%2Fdetails&id=dummy_po_5eaada696b281"
+                          href="admin.php?page=wc-admin&path=%2Fpayments%2Fpayouts%2Fdetails&id=dummy_po_5eaada696b281"
                         >
-                          Apr 2, 2020 deposit
+                          Apr 2, 2020 payout
                         </a>
                         .
                       </span>
@@ -852,7 +852,7 @@ exports[`PaymentDetailsTimeline renders correctly (with a mocked Timeline compon
                     </span>
                     <span />
                     <span>
-                      Net deposit: $59.50
+                      Net payout: $59.50
                     </span>
                   </div>
                 </li>
@@ -1441,7 +1441,7 @@ exports[`PaymentDetailsTimeline renders subscription fee correctly 1`] = `
                         </g>
                       </svg>
                       <span>
-                        $0.66 will be added to a future deposit.
+                        $0.66 will be added to a future payout.
                       </span>
                     </div>
                     <span
@@ -1511,7 +1511,7 @@ exports[`PaymentDetailsTimeline renders subscription fee correctly 1`] = `
                       </ul>
                     </span>
                     <span>
-                      Net deposit: $0.66
+                      Net payout: $0.66
                     </span>
                   </div>
                 </li>
diff --git a/client/payment-details/timeline/test/__snapshots__/map-events.js.snap b/client/payment-details/timeline/test/__snapshots__/map-events.js.snap
index 3d0a3862088..e9c43d19b15 100644
--- a/client/payment-details/timeline/test/__snapshots__/map-events.js.snap
+++ b/client/payment-details/timeline/test/__snapshots__/map-events.js.snap
@@ -14,9 +14,9 @@ exports[`mapTimelineEvents Multi-Currency events formats captured events with fe
     "headline": <React.Fragment>
       $20.97 USD was added to your 
       <Link
-        href="admin.php?page=wc-admin&path=%2Fpayments%2Fdeposits%2Fdetails&id=dummy_po_5eaada696b281"
+        href="admin.php?page=wc-admin&path=%2Fpayments%2Fpayouts%2Fdetails&id=dummy_po_5eaada696b281"
       >
-        Apr 2, 2020 deposit
+        Apr 2, 2020 payout
       </Link>
       .
     </React.Fragment>,
@@ -27,7 +27,7 @@ exports[`mapTimelineEvents Multi-Currency events formats captured events with fe
       "1.00 EUR → 1.19944 USD: $21.59 USD",
       "Fee (2.9% + $0.30): -$0.62",
       undefined,
-      "Net deposit: $20.97 USD",
+      "Net payout: $20.97 USD",
     ],
     "date": 2020-04-01T14:37:54.000Z,
     "headline": "A payment of €18.00 EUR was successfully charged.",
@@ -52,9 +52,9 @@ exports[`mapTimelineEvents Multi-Currency events formats captured events without
     "headline": <React.Fragment>
       $20.97 USD was added to your 
       <Link
-        href="admin.php?page=wc-admin&path=%2Fpayments%2Fdeposits%2Fdetails&id=dummy_po_5eaada696b281"
+        href="admin.php?page=wc-admin&path=%2Fpayments%2Fpayouts%2Fdetails&id=dummy_po_5eaada696b281"
       >
-        Apr 2, 2020 deposit
+        Apr 2, 2020 payout
       </Link>
       .
     </React.Fragment>,
@@ -65,7 +65,7 @@ exports[`mapTimelineEvents Multi-Currency events formats captured events without
       "1.00 EUR → 1.19944 USD: $21.59 USD",
       "Fee: €0.52",
       undefined,
-      "Net deposit: $20.97 USD",
+      "Net payout: $20.97 USD",
     ],
     "date": 2020-04-01T14:37:54.000Z,
     "headline": "A payment of €18.00 EUR was successfully charged.",
@@ -91,7 +91,7 @@ exports[`mapTimelineEvents Multi-Currency events formats dispute_needs_response
       "Fee: $15.00",
     ],
     "date": 2020-04-02T02:06:14.000Z,
-    "headline": "$36.60 USD will be deducted from a future deposit.",
+    "headline": "$36.60 USD will be deducted from a future payout.",
     "icon": <MinusIcon />,
   },
   {
@@ -122,9 +122,9 @@ exports[`mapTimelineEvents Multi-Currency events formats dispute_won events 1`]
     "headline": <React.Fragment>
       $44.99 USD was added to your 
       <Link
-        href="admin.php?page=wc-admin&path=%2Fpayments%2Fdeposits%2Fdetails&id=dummy_po_5eaada696b2d3"
+        href="admin.php?page=wc-admin&path=%2Fpayments%2Fpayouts%2Fdetails&id=dummy_po_5eaada696b2d3"
       >
-        Apr 5, 2020 deposit
+        Apr 5, 2020 payout
       </Link>
       .
     </React.Fragment>,
@@ -152,7 +152,7 @@ exports[`mapTimelineEvents Multi-Currency events formats full_refund events 1`]
   {
     "body": [],
     "date": 2020-04-04T13:51:06.000Z,
-    "headline": "21,64 $ USD will be deducted from a future deposit.",
+    "headline": "21,64 $ USD will be deducted from a future payout.",
     "icon": <MinusIcon />,
   },
   {
@@ -180,7 +180,7 @@ exports[`mapTimelineEvents Multi-Currency events formats partial_refund events 1
   {
     "body": [],
     "date": 2020-04-03T18:58:01.000Z,
-    "headline": "6,00 $ USD will be deducted from a future deposit.",
+    "headline": "6,00 $ USD will be deducted from a future payout.",
     "icon": <MinusIcon />,
   },
   {
@@ -374,9 +374,9 @@ exports[`mapTimelineEvents single currency events formats captured events with f
     "headline": <React.Fragment>
       $59.50 USD was added to your 
       <Link
-        href="admin.php?page=wc-admin&path=%2Fpayments%2Fdeposits%2Fdetails&id=dummy_po_5eaada696b281"
+        href="admin.php?page=wc-admin&path=%2Fpayments%2Fpayouts%2Fdetails&id=dummy_po_5eaada696b281"
       >
-        Apr 2, 2020 deposit
+        Apr 2, 2020 payout
       </Link>
       .
     </React.Fragment>,
@@ -414,7 +414,7 @@ exports[`mapTimelineEvents single currency events formats captured events with f
         </li>
          
       </ul>,
-      "Net deposit: $59.50 USD",
+      "Net payout: $59.50 USD",
     ],
     "date": 2020-04-01T14:37:54.000Z,
     "headline": "A payment of $63.00 USD was successfully charged.",
@@ -439,9 +439,9 @@ exports[`mapTimelineEvents single currency events formats captured events with j
     "headline": <React.Fragment>
       $59.50 USD was added to your 
       <Link
-        href="admin.php?page=wc-admin&path=%2Fpayments%2Fdeposits%2Fdetails&id=dummy_po_5eaada696b281"
+        href="admin.php?page=wc-admin&path=%2Fpayments%2Fpayouts%2Fdetails&id=dummy_po_5eaada696b281"
       >
-        Apr 2, 2020 deposit
+        Apr 2, 2020 payout
       </Link>
       .
     </React.Fragment>,
@@ -452,7 +452,7 @@ exports[`mapTimelineEvents single currency events formats captured events with j
       undefined,
       "Base fee (1.95% + $0.15): -$3.50",
       undefined,
-      "Net deposit: $59.50 USD",
+      "Net payout: $59.50 USD",
     ],
     "date": 2020-04-01T14:37:54.000Z,
     "headline": "A payment of $63.00 USD was successfully charged.",
@@ -477,9 +477,9 @@ exports[`mapTimelineEvents single currency events formats captured events withou
     "headline": <React.Fragment>
       $59.50 USD was added to your 
       <Link
-        href="admin.php?page=wc-admin&path=%2Fpayments%2Fdeposits%2Fdetails&id=dummy_po_5eaada696b281"
+        href="admin.php?page=wc-admin&path=%2Fpayments%2Fpayouts%2Fdetails&id=dummy_po_5eaada696b281"
       >
-        Apr 2, 2020 deposit
+        Apr 2, 2020 payout
       </Link>
       .
     </React.Fragment>,
@@ -490,7 +490,7 @@ exports[`mapTimelineEvents single currency events formats captured events withou
       undefined,
       "Fee: $3.50",
       undefined,
-      "Net deposit: $59.50 USD",
+      "Net payout: $59.50 USD",
     ],
     "date": 2020-04-01T14:37:54.000Z,
     "headline": "A payment of $63.00 USD was successfully charged.",
@@ -535,7 +535,7 @@ exports[`mapTimelineEvents single currency events formats dispute_needs_response
       "Fee: $15.00",
     ],
     "date": 2020-04-02T02:06:14.000Z,
-    "headline": "$110.00 USD will be deducted from a future deposit.",
+    "headline": "$110.00 USD will be deducted from a future payout.",
     "icon": <MinusIcon />,
   },
   {
@@ -566,9 +566,9 @@ exports[`mapTimelineEvents single currency events formats dispute_won events 1`]
     "headline": <React.Fragment>
       $115.00 USD was added to your 
       <Link
-        href="admin.php?page=wc-admin&path=%2Fpayments%2Fdeposits%2Fdetails&id=dummy_po_5eaada696b2d3"
+        href="admin.php?page=wc-admin&path=%2Fpayments%2Fpayouts%2Fdetails&id=dummy_po_5eaada696b2d3"
       >
-        Apr 5, 2020 deposit
+        Apr 5, 2020 payout
       </Link>
       .
     </React.Fragment>,
@@ -599,7 +599,7 @@ exports[`mapTimelineEvents single currency events formats financing paydown even
       </React.Fragment>,
     ],
     "date": 2022-02-01T12:04:04.000Z,
-    "headline": "$110.00 will be subtracted from a future deposit.",
+    "headline": "$110.00 will be subtracted from a future payout.",
     "icon": <MinusIcon />,
   },
 ]
@@ -616,7 +616,7 @@ exports[`mapTimelineEvents single currency events formats full_refund events 1`]
   {
     "body": [],
     "date": 2020-04-04T13:51:06.000Z,
-    "headline": "$100.00 USD will be deducted from a future deposit.",
+    "headline": "$100.00 USD will be deducted from a future payout.",
     "icon": <MinusIcon />,
   },
   {
@@ -644,7 +644,7 @@ exports[`mapTimelineEvents single currency events formats partial_refund events
   {
     "body": [],
     "date": 2020-04-03T18:58:01.000Z,
-    "headline": "$50.00 USD will be deducted from a future deposit.",
+    "headline": "$50.00 USD will be deducted from a future payout.",
     "icon": <MinusIcon />,
   },
   {
@@ -675,9 +675,9 @@ exports[`mapTimelineEvents single currency events in person payments - tap to pa
     "headline": <React.Fragment>
       $19.19 USD was added to your 
       <Link
-        href="admin.php?page=wc-admin&path=%2Fpayments%2Fdeposits%2Fdetails&id=dummy_po_5eaada696b281"
+        href="admin.php?page=wc-admin&path=%2Fpayments%2Fpayouts%2Fdetails&id=dummy_po_5eaada696b281"
       >
-        Apr 2, 2020 deposit
+        Apr 2, 2020 payout
       </Link>
       .
     </React.Fragment>,
@@ -699,7 +699,7 @@ exports[`mapTimelineEvents single currency events in person payments - tap to pa
         </li>
          
       </ul>,
-      "Net deposit: $19.19 USD",
+      "Net payout: $19.19 USD",
     ],
     "date": 2020-04-01T14:37:54.000Z,
     "headline": "A payment of $19.80 USD was successfully charged.",
@@ -724,9 +724,9 @@ exports[`mapTimelineEvents single currency events should not render fee breakup
     "headline": <React.Fragment>
       $59.50 USD was added to your 
       <Link
-        href="admin.php?page=wc-admin&path=%2Fpayments%2Fdeposits%2Fdetails&id=dummy_po_5eaada696b281"
+        href="admin.php?page=wc-admin&path=%2Fpayments%2Fpayouts%2Fdetails&id=dummy_po_5eaada696b281"
       >
-        Apr 2, 2020 deposit
+        Apr 2, 2020 payout
       </Link>
       .
     </React.Fragment>,
@@ -737,7 +737,7 @@ exports[`mapTimelineEvents single currency events should not render fee breakup
       undefined,
       "Fee (1.95% + $0.15): -$3.50",
       undefined,
-      "Net deposit: $59.50 USD",
+      "Net payout: $59.50 USD",
     ],
     "date": 2020-04-01T14:37:54.000Z,
     "headline": "A payment of $63.00 USD was successfully charged.",
diff --git a/client/settings/deposits/index.js b/client/settings/deposits/index.js
index 05c114f79fd..19ad1956419 100644
--- a/client/settings/deposits/index.js
+++ b/client/settings/deposits/index.js
@@ -131,17 +131,17 @@ const CustomizeDepositSchedule = () => {
 			<p className="help-text">
 				{ depositScheduleInterval === 'monthly' &&
 					__(
-						'Deposits scheduled on a weekend will be sent on the next business day.',
+						'Payouts scheduled on a weekend will be sent on the next business day.',
 						'woocommerce-payments'
 					) }
 				{ depositScheduleInterval === 'weekly' &&
 					__(
-						'Deposits that fall on a holiday will initiate on the next business day.',
+						'Payouts that fall on a holiday will initiate on the next business day.',
 						'woocommerce-payments'
 					) }
 				{ depositScheduleInterval === 'daily' &&
 					__(
-						'Deposits will occur every business day.',
+						'Payouts will occur every business day.',
 						'woocommerce-payments'
 					) }
 			</p>
@@ -161,14 +161,14 @@ const DepositsSchedule = () => {
 			<InlineNotice status="warning" isDismissible={ false } icon>
 				{ interpolateComponents( {
 					mixedString: __(
-						'Deposit scheduling is currently unavailable for your store. {{learnMoreLink}}Learn more{{/learnMoreLink}}',
+						'Payout scheduling is currently unavailable for your store. {{learnMoreLink}}Learn more{{/learnMoreLink}}',
 						'woocommerce-payments'
 					),
 					components: {
 						learnMoreLink: (
 							// eslint-disable-next-line jsx-a11y/anchor-has-content
 							<a
-								href="https://woocommerce.com/document/woopayments/deposits/deposit-schedule/"
+								href="https://woocommerce.com/document/woopayments/payouts/payout-schedule/"
 								target="_blank"
 								rel="noreferrer noopener"
 							/>
@@ -183,15 +183,15 @@ const DepositsSchedule = () => {
 			<InlineNotice status="warning" isDismissible={ false } icon>
 				{ interpolateComponents( {
 					mixedString: __(
-						'Your first deposit will be held for 7-14 days. ' +
-							'Deposit scheduling will be available after this period. {{learnMoreLink}}Learn more{{/learnMoreLink}}',
+						'Your first payout will be held for 7-14 days. ' +
+							'Payout scheduling will be available after this period. {{learnMoreLink}}Learn more{{/learnMoreLink}}',
 						'woocommerce-payments'
 					),
 					components: {
 						learnMoreLink: (
 							// eslint-disable-next-line jsx-a11y/anchor-has-content
 							<a
-								href="https://woocommerce.com/document/woopayments/deposits/deposit-schedule/"
+								href="https://woocommerce.com/document/woopayments/payouts/payout-schedule/"
 								target="_blank"
 								rel="noreferrer noopener"
 							/>
@@ -220,13 +220,13 @@ const Deposits = () => {
 	return (
 		<Card className="deposits">
 			<CardBody>
-				<h4>{ __( 'Deposit schedule', 'woocommerce-payments' ) }</h4>
+				<h4>{ __( 'Payout schedule', 'woocommerce-payments' ) }</h4>
 
 				<DepositsSchedule />
 
 				<div className="deposits__bank-information">
 					<h4>
-						{ __( 'Deposit bank account', 'woocommerce-payments' ) }
+						{ __( 'Payout bank account', 'woocommerce-payments' ) }
 					</h4>
 					{ hasErroredExternalAccount ? (
 						<DepositFailureNotice
@@ -235,7 +235,7 @@ const Deposits = () => {
 					) : (
 						<p className="deposits__bank-information-help">
 							{ __(
-								'Manage and update your deposit account information to receive payments and deposits.',
+								'Manage and update your bank account information to receive payouts.',
 								'woocommerce-payments'
 							) }{ ' ' }
 							{ accountLink && (
diff --git a/client/settings/deposits/test/index.test.js b/client/settings/deposits/test/index.test.js
index 1bd3bb9d101..f562bceee31 100644
--- a/client/settings/deposits/test/index.test.js
+++ b/client/settings/deposits/test/index.test.js
@@ -108,7 +108,7 @@ describe( 'Deposits', () => {
 		);
 
 		const depositsMessage = screen.getByText(
-			/Deposit scheduling is currently unavailable for your store/,
+			/Payout scheduling is currently unavailable for your store/,
 			{
 				ignore: '.a11y-speak-region',
 			}
@@ -128,7 +128,7 @@ describe( 'Deposits', () => {
 		);
 
 		const depositsMessage = screen.getByText(
-			/Deposit scheduling is currently unavailable for your store/,
+			/Payout scheduling is currently unavailable for your store/,
 			{
 				ignore: '.a11y-speak-region',
 			}
@@ -146,7 +146,7 @@ describe( 'Deposits', () => {
 		);
 
 		const depositsMessage = screen.getByText(
-			/Deposit scheduling is currently unavailable for your store/,
+			/Payout scheduling is currently unavailable for your store/,
 			{
 				ignore: '.a11y-speak-region',
 			}
@@ -165,7 +165,7 @@ describe( 'Deposits', () => {
 		);
 
 		const depositsMessage = screen.getByText(
-			/Your first deposit will be held for/,
+			/Your first payout will be held for/,
 			{
 				ignore: '.a11y-speak-region',
 			}
@@ -184,7 +184,7 @@ describe( 'Deposits', () => {
 		);
 
 		expect(
-			screen.queryByText( /Your first deposit will be held for/, {
+			screen.queryByText( /Your first payout will be held for/, {
 				ignore: '.a11y-speak-region',
 			} )
 		).toBeFalsy();
@@ -285,7 +285,7 @@ describe( 'Deposits', () => {
 		);
 
 		const depositsMessage = screen.getByText(
-			/Deposits are currently paused because a recent deposit failed./,
+			/Payouts are currently paused because a recent payout failed./,
 			{
 				ignore: '.a11y-speak-region',
 			}
@@ -294,7 +294,7 @@ describe( 'Deposits', () => {
 
 		expect(
 			screen.queryByText(
-				/Manage and update your deposit account information to receive payments and deposits./,
+				/Manage and update your bank account information to receive payouts./,
 				{
 					ignore: '.a11y-speak-region',
 				}
@@ -311,7 +311,7 @@ describe( 'Deposits', () => {
 
 		expect(
 			screen.queryByText(
-				/Deposits are currently paused because a recent deposit failed./,
+				/Payouts are currently paused because a recent payout failed./,
 				{
 					ignore: '.a11y-speak-region',
 				}
@@ -319,7 +319,7 @@ describe( 'Deposits', () => {
 		).toBeFalsy();
 
 		const depositsMessage = screen.getByText(
-			/Manage and update your deposit account information to receive payments and deposits./,
+			/Manage and update your bank account information to receive payouts./,
 			{
 				ignore: '.a11y-speak-region',
 			}
@@ -352,7 +352,7 @@ describe( 'Deposits', () => {
 		);
 
 		const depositsMessage = screen.getByText(
-			/Deposits are currently paused because a recent deposit failed./,
+			/Payouts are currently paused because a recent payout failed./,
 			{
 				ignore: '.a11y-speak-region',
 			}
@@ -361,7 +361,7 @@ describe( 'Deposits', () => {
 
 		expect(
 			screen.queryByText(
-				/Manage and update your deposit account information to receive payments and deposits./,
+				/Manage and update your bank account information to receive payouts./,
 				{
 					ignore: '.a11y-speak-region',
 				}
@@ -395,7 +395,7 @@ describe( 'Deposits', () => {
 
 		expect(
 			screen.queryByText(
-				/Deposits are currently paused because a recent deposit failed./,
+				/Payouts are currently paused because a recent payout failed./,
 				{
 					ignore: '.a11y-speak-region',
 				}
@@ -403,7 +403,7 @@ describe( 'Deposits', () => {
 		).toBeFalsy();
 
 		const depositsMessage = screen.getByText(
-			/Manage and update your deposit account information to receive payments and deposits./,
+			/Manage and update your bank account information to receive payouts./,
 			{
 				ignore: '.a11y-speak-region',
 			}
diff --git a/client/settings/settings-manager/index.js b/client/settings/settings-manager/index.js
index 2668afa04c5..fc238c706b2 100644
--- a/client/settings/settings-manager/index.js
+++ b/client/settings/settings-manager/index.js
@@ -84,17 +84,17 @@ const DepositsDescription = () => {
 
 	return (
 		<>
-			<h2>{ __( 'Deposits', 'woocommerce-payments' ) }</h2>
+			<h2>{ __( 'Payouts', 'woocommerce-payments' ) }</h2>
 			<p>
 				{ sprintf(
 					__(
-						'Funds are available for deposit %s business days after they’re received.',
+						'Funds are available for payout %s business days after they’re received.',
 						'woocommerce-payments'
 					),
 					depositDelayDays
 				) }
 			</p>
-			<ExternalLink href="https://woocommerce.com/document/woopayments/deposits/deposit-schedule/">
+			<ExternalLink href="https://woocommerce.com/document/woopayments/payouts/payout-schedule/">
 				{ __(
 					'Learn more about pending schedules',
 					'woocommerce-payments'
@@ -242,7 +242,7 @@ const SettingsManager = () => {
 				</LoadableSettingsSection>
 			</SettingsSection>
 			<SettingsSection description={ DepositsDescription } id="deposits">
-				<div id={ 'deposit-schedule' }>
+				<div id="payout-schedule">
 					<LoadableSettingsSection numLines={ 20 }>
 						<ErrorBoundary>
 							<Deposits />
diff --git a/client/tos/modal/index.js b/client/tos/modal/index.js
index 5b5766e877c..7e92acc5fdc 100644
--- a/client/tos/modal/index.js
+++ b/client/tos/modal/index.js
@@ -102,7 +102,7 @@ const DisableModalUI = ( { onDisable, onCancel, isBusy, hasError } ) => {
 			__(
 				'By declining our {{link}}Terms of Service{{/link}},' +
 					' you’ll no longer be able to capture credit card payments using %s.' +
-					' Your previous transaction and deposit data will still be available.',
+					' Your previous transaction and payout data will still be available.',
 				'woocommerce-payments'
 			),
 			'WooPayments'
diff --git a/client/tos/modal/test/__snapshots__/index.js.snap b/client/tos/modal/test/__snapshots__/index.js.snap
index 27887ceeb22..f89df7e8b64 100644
--- a/client/tos/modal/test/__snapshots__/index.js.snap
+++ b/client/tos/modal/test/__snapshots__/index.js.snap
@@ -103,7 +103,7 @@ exports[`ToS modal should render disable plugin modal on decline 1`] = `
         >
           Terms of Service
         </a>
-        , you’ll no longer be able to capture credit card payments using WooPayments. Your previous transaction and deposit data will still be available.
+        , you’ll no longer be able to capture credit card payments using WooPayments. Your previous transaction and payout data will still be available.
       </div>
       <div
         class="woocommerce-payments__tos-footer"
diff --git a/client/transactions/list/deposit.tsx b/client/transactions/list/deposit.tsx
index b1889f3ad19..5e329df75c8 100644
--- a/client/transactions/list/deposit.tsx
+++ b/client/transactions/list/deposit.tsx
@@ -27,7 +27,7 @@ const Deposit: React.FC< DepositProps > = ( { depositId, dateAvailable } ) => {
 	if ( depositId && dateAvailable ) {
 		const depositUrl = getAdminUrl( {
 			page: 'wc-admin',
-			path: '/payments/deposits/details',
+			path: '/payments/payouts/details',
 			id: depositId,
 		} );
 
@@ -40,19 +40,19 @@ const Deposit: React.FC< DepositProps > = ( { depositId, dateAvailable } ) => {
 		return <Link href={ depositUrl }>{ formattedDateAvailable }</Link>;
 	}
 
-	// Show an icon with a tooltip to communicate that the deposit will be available in the future.
+	// Show an icon with a tooltip to communicate that the payout will be available in the future.
 	return (
 		<>
-			{ __( 'Future deposit', 'woocommerce-payments' ) }
+			{ __( 'Future payout', 'woocommerce-payments' ) }
 			<ClickTooltip
 				content={ interpolateComponents( {
 					mixedString: __(
-						'This transaction will be included in an upcoming automated deposit. The date of the deposit will be displayed here once it is scheduled. {{learnMoreLink}}Learn more{{/learnMoreLink}}',
+						'This transaction will be included in an upcoming automated payout. The date of the payout will be displayed here once it is scheduled. {{learnMoreLink}}Learn more{{/learnMoreLink}}',
 						'woocommerce-payments'
 					),
 					components: {
 						learnMoreLink: (
-							<ExternalLink href="https://woocommerce.com/document/woopayments/deposits/deposit-schedule/#pending-funds" />
+							<ExternalLink href="https://woocommerce.com/document/woopayments/payouts/payout-schedule/#pending-funds" />
 						),
 					},
 				} ) }
diff --git a/client/transactions/list/index.tsx b/client/transactions/list/index.tsx
index 7907fd83007..b2c1cb4c9a7 100644
--- a/client/transactions/list/index.tsx
+++ b/client/transactions/list/index.tsx
@@ -204,8 +204,8 @@ const getColumns = (
 		},
 		{
 			key: 'deposit_currency',
-			label: __( 'Deposit Currency', 'woocommerce-payments' ),
-			screenReaderLabel: __( 'Deposit Currency', 'woocommerce-payments' ),
+			label: __( 'Payout Currency', 'woocommerce-payments' ),
+			screenReaderLabel: __( 'Payout Currency', 'woocommerce-payments' ),
 			isSortable: true,
 			visible: false,
 		},
@@ -213,7 +213,7 @@ const getColumns = (
 			key: 'amount',
 			label: __( 'Amount', 'woocommerce-payments' ),
 			screenReaderLabel: __(
-				'Amount in Deposit Curency',
+				'Amount in Payout Currency',
 				'woocommerce-payments'
 			),
 			isNumeric: true,
@@ -283,22 +283,22 @@ const getColumns = (
 		},
 		includeDeposit && {
 			key: 'deposit_id',
-			label: __( 'Deposit ID', 'woocommerce-payments' ),
-			screenReaderLabel: __( 'Deposit ID', 'woocommerce-payments' ),
+			label: __( 'Payout ID', 'woocommerce-payments' ),
+			screenReaderLabel: __( 'Payout ID', 'woocommerce-payments' ),
 			cellClassName: 'deposit',
 			isLeftAligned: true,
 			visible: false,
 		},
 		includeDeposit && {
 			key: 'deposit',
-			label: __( 'Deposit date', 'woocommerce-payments' ),
-			screenReaderLabel: __( 'Deposit date', 'woocommerce-payments' ),
+			label: __( 'Payout date', 'woocommerce-payments' ),
+			screenReaderLabel: __( 'Payout date', 'woocommerce-payments' ),
 			cellClassName: 'deposit',
 			isLeftAligned: true,
 		},
 		includeDeposit && {
 			key: 'deposit_status',
-			label: __( 'Deposit status', 'woocommerce-payments' ),
+			label: __( 'Payout status', 'woocommerce-payments' ),
 			visible: false,
 		},
 	].filter( Boolean ) as Column[]; // We explicitly define the type because TypeScript can't infer the type post-filtering.
diff --git a/client/transactions/list/test/__snapshots__/deposit.tsx.snap b/client/transactions/list/test/__snapshots__/deposit.tsx.snap
index 5aae20de2e7..820a629bc41 100644
--- a/client/transactions/list/test/__snapshots__/deposit.tsx.snap
+++ b/client/transactions/list/test/__snapshots__/deposit.tsx.snap
@@ -1,19 +1,19 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`Deposit renders with date and deposit available 1`] = `
+exports[`Deposit renders with date and payout available 1`] = `
 <div>
   <a
     data-link-type="wc-admin"
-    href="admin.php?page=wc-admin&path=%2Fpayments%2Fdeposits%2Fdetails&id=po_mock"
+    href="admin.php?page=wc-admin&path=%2Fpayments%2Fpayouts%2Fdetails&id=po_mock"
   >
     Jan 7, 2020
   </a>
 </div>
 `;
 
-exports[`Deposit renders with date available but no deposit 1`] = `
+exports[`Deposit renders with date available but no payout 1`] = `
 <div>
-  Future deposit
+  Future payout
   <button
     class="wcpay-tooltip__content-wrapper wcpay-tooltip--click__content-wrapper"
     type="button"
@@ -44,9 +44,9 @@ exports[`Deposit renders with date available but no deposit 1`] = `
 </div>
 `;
 
-exports[`Deposit renders with deposit but no date available 1`] = `
+exports[`Deposit renders with no date or payout available 1`] = `
 <div>
-  Future deposit
+  Future payout
   <button
     class="wcpay-tooltip__content-wrapper wcpay-tooltip--click__content-wrapper"
     type="button"
@@ -77,9 +77,9 @@ exports[`Deposit renders with deposit but no date available 1`] = `
 </div>
 `;
 
-exports[`Deposit renders with no date or deposit available 1`] = `
+exports[`Deposit renders with payout but no date available 1`] = `
 <div>
-  Future deposit
+  Future payout
   <button
     class="wcpay-tooltip__content-wrapper wcpay-tooltip--click__content-wrapper"
     type="button"
diff --git a/client/transactions/list/test/__snapshots__/index.tsx.snap b/client/transactions/list/test/__snapshots__/index.tsx.snap
index 13aebe63c2a..7a4b1eb3392 100644
--- a/client/transactions/list/test/__snapshots__/index.tsx.snap
+++ b/client/transactions/list/test/__snapshots__/index.tsx.snap
@@ -325,14 +325,14 @@ exports[`Transactions list renders correctly when can filter by several currenci
                       <span
                         class="screen-reader-text"
                       >
-                        Amount in Deposit Curency
+                        Amount in Payout Currency
                       </span>
                     </button>
                     <span
                       class="screen-reader-text"
                       id="header-15-3"
                     >
-                      Sort by Amount in Deposit Curency in descending order
+                      Sort by Amount in Payout Currency in descending order
                     </span>
                   </th>
                   <th
@@ -473,12 +473,12 @@ exports[`Transactions list renders correctly when can filter by several currenci
                     <span
                       aria-hidden="true"
                     >
-                      Deposit date
+                      Payout date
                     </span>
                     <span
                       class="screen-reader-text"
                     >
-                      Deposit date
+                      Payout date
                     </span>
                   </th>
                 </tr>
@@ -610,7 +610,7 @@ exports[`Transactions list renders correctly when can filter by several currenci
                   <td
                     class="woocommerce-table__item deposit is-left-aligned"
                   >
-                    Future deposit
+                    Future payout
                     <button
                       class="wcpay-tooltip__content-wrapper wcpay-tooltip--click__content-wrapper"
                       type="button"
@@ -793,7 +793,7 @@ exports[`Transactions list renders correctly when can filter by several currenci
                   >
                     <a
                       data-link-type="wc-admin"
-                      href="admin.php?page=wc-admin&path=%2Fpayments%2Fdeposits%2Fdetails&id=po_mock"
+                      href="admin.php?page=wc-admin&path=%2Fpayments%2Fpayouts%2Fdetails&id=po_mock"
                     >
                       Jan 7, 2020
                     </a>
@@ -939,7 +939,7 @@ exports[`Transactions list renders correctly when can filter by several currenci
                   <td
                     class="woocommerce-table__item deposit is-left-aligned"
                   >
-                    Future deposit
+                    Future payout
                     <button
                       class="wcpay-tooltip__content-wrapper wcpay-tooltip--click__content-wrapper"
                       type="button"
@@ -1313,14 +1313,14 @@ exports[`Transactions list renders correctly when filtered by currency 1`] = `
                       <span
                         class="screen-reader-text"
                       >
-                        Amount in Deposit Curency
+                        Amount in Payout Currency
                       </span>
                     </button>
                     <span
                       class="screen-reader-text"
                       id="header-16-3"
                     >
-                      Sort by Amount in Deposit Curency in descending order
+                      Sort by Amount in Payout Currency in descending order
                     </span>
                   </th>
                   <th
@@ -1461,12 +1461,12 @@ exports[`Transactions list renders correctly when filtered by currency 1`] = `
                     <span
                       aria-hidden="true"
                     >
-                      Deposit date
+                      Payout date
                     </span>
                     <span
                       class="screen-reader-text"
                     >
-                      Deposit date
+                      Payout date
                     </span>
                   </th>
                 </tr>
@@ -1598,7 +1598,7 @@ exports[`Transactions list renders correctly when filtered by currency 1`] = `
                   <td
                     class="woocommerce-table__item deposit is-left-aligned"
                   >
-                    Future deposit
+                    Future payout
                     <button
                       class="wcpay-tooltip__content-wrapper wcpay-tooltip--click__content-wrapper"
                       type="button"
@@ -1781,7 +1781,7 @@ exports[`Transactions list renders correctly when filtered by currency 1`] = `
                   >
                     <a
                       data-link-type="wc-admin"
-                      href="admin.php?page=wc-admin&path=%2Fpayments%2Fdeposits%2Fdetails&id=po_mock"
+                      href="admin.php?page=wc-admin&path=%2Fpayments%2Fpayouts%2Fdetails&id=po_mock"
                     >
                       Jan 7, 2020
                     </a>
@@ -1927,7 +1927,7 @@ exports[`Transactions list renders correctly when filtered by currency 1`] = `
                   <td
                     class="woocommerce-table__item deposit is-left-aligned"
                   >
-                    Future deposit
+                    Future payout
                     <button
                       class="wcpay-tooltip__content-wrapper wcpay-tooltip--click__content-wrapper"
                       type="button"
@@ -2046,7 +2046,7 @@ exports[`Transactions list renders correctly when filtered by currency 1`] = `
 </div>
 `;
 
-exports[`Transactions list renders correctly when filtered by deposit 1`] = `
+exports[`Transactions list renders correctly when filtered by payout 1`] = `
 <div>
   <div
     class=" woocommerce-payments-page"
@@ -2298,14 +2298,14 @@ exports[`Transactions list renders correctly when filtered by deposit 1`] = `
                       <span
                         class="screen-reader-text"
                       >
-                        Amount in Deposit Curency
+                        Amount in Payout Currency
                       </span>
                     </button>
                     <span
                       class="screen-reader-text"
                       id="header-0-3"
                     >
-                      Sort by Amount in Deposit Curency in descending order
+                      Sort by Amount in Payout Currency in descending order
                     </span>
                   </th>
                   <th
@@ -2974,14 +2974,14 @@ exports[`Transactions list subscription column renders correctly 1`] = `
                       <span
                         class="screen-reader-text"
                       >
-                        Amount in Deposit Curency
+                        Amount in Payout Currency
                       </span>
                     </button>
                     <span
                       class="screen-reader-text"
                       id="header-14-3"
                     >
-                      Sort by Amount in Deposit Curency in descending order
+                      Sort by Amount in Payout Currency in descending order
                     </span>
                   </th>
                   <th
@@ -3138,12 +3138,12 @@ exports[`Transactions list subscription column renders correctly 1`] = `
                     <span
                       aria-hidden="true"
                     >
-                      Deposit date
+                      Payout date
                     </span>
                     <span
                       class="screen-reader-text"
                     >
-                      Deposit date
+                      Payout date
                     </span>
                   </th>
                 </tr>
@@ -3285,7 +3285,7 @@ exports[`Transactions list subscription column renders correctly 1`] = `
                   <td
                     class="woocommerce-table__item deposit is-left-aligned"
                   >
-                    Future deposit
+                    Future payout
                     <button
                       class="wcpay-tooltip__content-wrapper wcpay-tooltip--click__content-wrapper"
                       type="button"
@@ -3471,7 +3471,7 @@ exports[`Transactions list subscription column renders correctly 1`] = `
                   >
                     <a
                       data-link-type="wc-admin"
-                      href="admin.php?page=wc-admin&path=%2Fpayments%2Fdeposits%2Fdetails&id=po_mock"
+                      href="admin.php?page=wc-admin&path=%2Fpayments%2Fpayouts%2Fdetails&id=po_mock"
                     >
                       Jan 7, 2020
                     </a>
@@ -3620,7 +3620,7 @@ exports[`Transactions list subscription column renders correctly 1`] = `
                   <td
                     class="woocommerce-table__item deposit is-left-aligned"
                   >
-                    Future deposit
+                    Future payout
                     <button
                       class="wcpay-tooltip__content-wrapper wcpay-tooltip--click__content-wrapper"
                       type="button"
@@ -3739,7 +3739,7 @@ exports[`Transactions list subscription column renders correctly 1`] = `
 </div>
 `;
 
-exports[`Transactions list when not filtered by deposit renders correctly 1`] = `
+exports[`Transactions list when not filtered by payout renders correctly 1`] = `
 <div>
   <div
     class=" woocommerce-payments-page"
@@ -4036,14 +4036,14 @@ exports[`Transactions list when not filtered by deposit renders correctly 1`] =
                       <span
                         class="screen-reader-text"
                       >
-                        Amount in Deposit Curency
+                        Amount in Payout Currency
                       </span>
                     </button>
                     <span
                       class="screen-reader-text"
                       id="header-1-3"
                     >
-                      Sort by Amount in Deposit Curency in descending order
+                      Sort by Amount in Payout Currency in descending order
                     </span>
                   </th>
                   <th
@@ -4184,12 +4184,12 @@ exports[`Transactions list when not filtered by deposit renders correctly 1`] =
                     <span
                       aria-hidden="true"
                     >
-                      Deposit date
+                      Payout date
                     </span>
                     <span
                       class="screen-reader-text"
                     >
-                      Deposit date
+                      Payout date
                     </span>
                   </th>
                 </tr>
@@ -4321,7 +4321,7 @@ exports[`Transactions list when not filtered by deposit renders correctly 1`] =
                   <td
                     class="woocommerce-table__item deposit is-left-aligned"
                   >
-                    Future deposit
+                    Future payout
                     <button
                       class="wcpay-tooltip__content-wrapper wcpay-tooltip--click__content-wrapper"
                       type="button"
@@ -4504,7 +4504,7 @@ exports[`Transactions list when not filtered by deposit renders correctly 1`] =
                   >
                     <a
                       data-link-type="wc-admin"
-                      href="admin.php?page=wc-admin&path=%2Fpayments%2Fdeposits%2Fdetails&id=po_mock"
+                      href="admin.php?page=wc-admin&path=%2Fpayments%2Fpayouts%2Fdetails&id=po_mock"
                     >
                       Jan 7, 2020
                     </a>
@@ -4650,7 +4650,7 @@ exports[`Transactions list when not filtered by deposit renders correctly 1`] =
                   <td
                     class="woocommerce-table__item deposit is-left-aligned"
                   >
-                    Future deposit
+                    Future payout
                     <button
                       class="wcpay-tooltip__content-wrapper wcpay-tooltip--click__content-wrapper"
                       type="button"
@@ -4769,7 +4769,7 @@ exports[`Transactions list when not filtered by deposit renders correctly 1`] =
 </div>
 `;
 
-exports[`Transactions list when not filtered by deposit renders table summary only when the transactions summary data is available with a single transaction 1`] = `
+exports[`Transactions list when not filtered by payout renders table summary only when the transactions summary data is available with a single transaction 1`] = `
 <div>
   <div
     class=" woocommerce-payments-page"
@@ -5066,14 +5066,14 @@ exports[`Transactions list when not filtered by deposit renders table summary on
                       <span
                         class="screen-reader-text"
                       >
-                        Amount in Deposit Curency
+                        Amount in Payout Currency
                       </span>
                     </button>
                     <span
                       class="screen-reader-text"
                       id="header-11-3"
                     >
-                      Sort by Amount in Deposit Curency in descending order
+                      Sort by Amount in Payout Currency in descending order
                     </span>
                   </th>
                   <th
@@ -5214,12 +5214,12 @@ exports[`Transactions list when not filtered by deposit renders table summary on
                     <span
                       aria-hidden="true"
                     >
-                      Deposit date
+                      Payout date
                     </span>
                     <span
                       class="screen-reader-text"
                     >
-                      Deposit date
+                      Payout date
                     </span>
                   </th>
                 </tr>
@@ -5351,7 +5351,7 @@ exports[`Transactions list when not filtered by deposit renders table summary on
                   <td
                     class="woocommerce-table__item deposit is-left-aligned"
                   >
-                    Future deposit
+                    Future payout
                     <button
                       class="wcpay-tooltip__content-wrapper wcpay-tooltip--click__content-wrapper"
                       type="button"
@@ -5534,7 +5534,7 @@ exports[`Transactions list when not filtered by deposit renders table summary on
                   >
                     <a
                       data-link-type="wc-admin"
-                      href="admin.php?page=wc-admin&path=%2Fpayments%2Fdeposits%2Fdetails&id=po_mock"
+                      href="admin.php?page=wc-admin&path=%2Fpayments%2Fpayouts%2Fdetails&id=po_mock"
                     >
                       Jan 7, 2020
                     </a>
@@ -5680,7 +5680,7 @@ exports[`Transactions list when not filtered by deposit renders table summary on
                   <td
                     class="woocommerce-table__item deposit is-left-aligned"
                   >
-                    Future deposit
+                    Future payout
                     <button
                       class="wcpay-tooltip__content-wrapper wcpay-tooltip--click__content-wrapper"
                       type="button"
diff --git a/client/transactions/list/test/deposit.tsx b/client/transactions/list/test/deposit.tsx
index 2cb87b0b248..801c2a15065 100644
--- a/client/transactions/list/test/deposit.tsx
+++ b/client/transactions/list/test/deposit.tsx
@@ -12,26 +12,26 @@ import { render } from '@testing-library/react';
 import Deposit from '../deposit';
 
 describe( 'Deposit', () => {
-	test( 'renders with date and deposit available', () => {
+	test( 'renders with date and payout available', () => {
 		const { container: link } = render(
 			<Deposit dateAvailable="2020-01-07 00:00:00" depositId="po_mock" />
 		);
 		expect( link ).toMatchSnapshot();
 	} );
 
-	test( 'renders with date available but no deposit', () => {
+	test( 'renders with date available but no payout', () => {
 		const { container: link } = render(
 			<Deposit dateAvailable="2020-01-07 00:00:00" />
 		);
 		expect( link ).toMatchSnapshot();
 	} );
 
-	test( 'renders with deposit but no date available', () => {
+	test( 'renders with payout but no date available', () => {
 		const { container: link } = render( <Deposit depositId="po_mock" /> );
 		expect( link ).toMatchSnapshot();
 	} );
 
-	test( 'renders with no date or deposit available', () => {
+	test( 'renders with no date or payout available', () => {
 		const { container: link } = render( <Deposit /> );
 		expect( link ).toMatchSnapshot();
 	} );
diff --git a/client/transactions/list/test/index.tsx b/client/transactions/list/test/index.tsx
index 19c4652a7de..b2cf7f56664 100644
--- a/client/transactions/list/test/index.tsx
+++ b/client/transactions/list/test/index.tsx
@@ -246,7 +246,7 @@ describe( 'Transactions list', () => {
 		};
 	} );
 
-	test( 'renders correctly when filtered by deposit', () => {
+	test( 'renders correctly when filtered by payout', () => {
 		mockUseTransactions.mockReturnValue( {
 			transactions: getMockTransactions().filter(
 				( txn: Transaction ) => 'po_mock' === txn.deposit_id
@@ -275,7 +275,7 @@ describe( 'Transactions list', () => {
 		expect( mockUseTransactions.mock.calls[ 0 ][ 1 ] ).toBe( 'po_mock' );
 	} );
 
-	describe( 'when not filtered by deposit', () => {
+	describe( 'when not filtered by payout', () => {
 		let container: Element;
 		let rerender: ( ui: React.ReactElement ) => void;
 		beforeEach( () => {
@@ -329,10 +329,10 @@ describe( 'Transactions list', () => {
 		} );
 
 		test( 'sorts by amount', () => {
-			sortBy( 'Amount in Deposit Curency' );
+			sortBy( 'Amount in Payout Currency' );
 			expectSortingToBe( 'amount', 'desc' );
 
-			sortBy( 'Amount in Deposit Curency' );
+			sortBy( 'Amount in Payout Currency' );
 			expectSortingToBe( 'amount', 'asc' );
 		} );
 
@@ -583,7 +583,7 @@ describe( 'Transactions list', () => {
 		} );
 
 		// Test also makes sure that the currentUserEmail is included in the path in the API call.
-		test( 'should fetch export with deposit_id if deposits transactions page', async () => {
+		test( 'should fetch export with deposit_id if payouts transactions page', async () => {
 			window.confirm = jest.fn( () => true );
 
 			mockUseTransactionsSummary.mockReturnValue( {
@@ -627,7 +627,7 @@ describe( 'Transactions list', () => {
 				'Channel',
 				'"Paid Currency"',
 				'"Amount Paid"',
-				'"Deposit Currency"',
+				'"Payout Currency"',
 				'Amount',
 				'Fees',
 				'Net',
@@ -637,9 +637,9 @@ describe( 'Transactions list', () => {
 				'Email',
 				'Country',
 				'"Risk level"',
-				'"Deposit ID"',
-				'"Deposit date"',
-				'"Deposit status"',
+				'"Payout ID"',
+				'"Payout date"',
+				'"Payout status"',
 			];
 
 			// checking if columns in CSV are rendered correctly
diff --git a/composer.lock b/composer.lock
index 2128df15f90..bc02d67bfbf 100644
--- a/composer.lock
+++ b/composer.lock
@@ -8,23 +8,23 @@
     "packages": [
         {
             "name": "automattic/jetpack-a8c-mc-stats",
-            "version": "v2.0.2",
+            "version": "v2.0.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Automattic/jetpack-a8c-mc-stats.git",
-                "reference": "5753860f28e1a8629b3c6ab481c1ab75e38a244f"
+                "reference": "d1d726e4962d4bf6f9c51d01e63d613c3a9dd0bb"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Automattic/jetpack-a8c-mc-stats/zipball/5753860f28e1a8629b3c6ab481c1ab75e38a244f",
-                "reference": "5753860f28e1a8629b3c6ab481c1ab75e38a244f",
+                "url": "https://api.github.com/repos/Automattic/jetpack-a8c-mc-stats/zipball/d1d726e4962d4bf6f9c51d01e63d613c3a9dd0bb",
+                "reference": "d1d726e4962d4bf6f9c51d01e63d613c3a9dd0bb",
                 "shasum": ""
             },
             "require": {
                 "php": ">=7.0"
             },
             "require-dev": {
-                "automattic/jetpack-changelogger": "^4.2.6",
+                "automattic/jetpack-changelogger": "^4.2.8",
                 "yoast/phpunit-polyfills": "^1.1.1"
             },
             "suggest": {
@@ -52,30 +52,30 @@
             ],
             "description": "Used to record internal usage stats for Automattic. Not visible to site owners.",
             "support": {
-                "source": "https://github.com/Automattic/jetpack-a8c-mc-stats/tree/v2.0.2"
+                "source": "https://github.com/Automattic/jetpack-a8c-mc-stats/tree/v2.0.4"
             },
-            "time": "2024-08-23T14:28:10+00:00"
+            "time": "2024-11-04T09:23:35+00:00"
         },
         {
             "name": "automattic/jetpack-admin-ui",
-            "version": "v0.4.5",
+            "version": "v0.4.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Automattic/jetpack-admin-ui.git",
-                "reference": "7d5b8485ebe5984774375468ae52efe5c2849369"
+                "reference": "a7bef1b075e35e431c0112f97763df9c6196ae39"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Automattic/jetpack-admin-ui/zipball/7d5b8485ebe5984774375468ae52efe5c2849369",
-                "reference": "7d5b8485ebe5984774375468ae52efe5c2849369",
+                "url": "https://api.github.com/repos/Automattic/jetpack-admin-ui/zipball/a7bef1b075e35e431c0112f97763df9c6196ae39",
+                "reference": "a7bef1b075e35e431c0112f97763df9c6196ae39",
                 "shasum": ""
             },
             "require": {
                 "php": ">=7.0"
             },
             "require-dev": {
-                "automattic/jetpack-changelogger": "^4.2.6",
-                "automattic/jetpack-logo": "^2.0.4",
+                "automattic/jetpack-changelogger": "^4.2.8",
+                "automattic/jetpack-logo": "^2.0.5",
                 "automattic/wordbless": "dev-master",
                 "yoast/phpunit-polyfills": "^1.1.1"
             },
@@ -108,30 +108,30 @@
             ],
             "description": "Generic Jetpack wp-admin UI elements",
             "support": {
-                "source": "https://github.com/Automattic/jetpack-admin-ui/tree/v0.4.5"
+                "source": "https://github.com/Automattic/jetpack-admin-ui/tree/v0.4.6"
             },
-            "time": "2024-09-05T12:38:36+00:00"
+            "time": "2024-11-04T09:23:52+00:00"
         },
         {
             "name": "automattic/jetpack-assets",
-            "version": "v2.3.8",
+            "version": "v2.3.13",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Automattic/jetpack-assets.git",
-                "reference": "3ddaff78c82ed7663b61961356585061dbb3410a"
+                "reference": "c520bffce576c823d7cbc851198201a820b7f981"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Automattic/jetpack-assets/zipball/3ddaff78c82ed7663b61961356585061dbb3410a",
-                "reference": "3ddaff78c82ed7663b61961356585061dbb3410a",
+                "url": "https://api.github.com/repos/Automattic/jetpack-assets/zipball/c520bffce576c823d7cbc851198201a820b7f981",
+                "reference": "c520bffce576c823d7cbc851198201a820b7f981",
                 "shasum": ""
             },
             "require": {
-                "automattic/jetpack-constants": "^2.0.4",
+                "automattic/jetpack-constants": "^2.0.5",
                 "php": ">=7.0"
             },
             "require-dev": {
-                "automattic/jetpack-changelogger": "^4.2.6",
+                "automattic/jetpack-changelogger": "^4.2.8",
                 "brain/monkey": "2.6.1",
                 "wikimedia/testing-access-wrapper": "^1.0 || ^2.0 || ^3.0",
                 "yoast/phpunit-polyfills": "^1.1.1"
@@ -165,9 +165,9 @@
             ],
             "description": "Asset management utilities for Jetpack ecosystem packages",
             "support": {
-                "source": "https://github.com/Automattic/jetpack-assets/tree/v2.3.8"
+                "source": "https://github.com/Automattic/jetpack-assets/tree/v2.3.13"
             },
-            "time": "2024-09-10T11:21:54+00:00"
+            "time": "2024-11-04T09:24:17+00:00"
         },
         {
             "name": "automattic/jetpack-autoloader",
@@ -387,23 +387,23 @@
         },
         {
             "name": "automattic/jetpack-constants",
-            "version": "v2.0.4",
+            "version": "v2.0.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Automattic/jetpack-constants.git",
-                "reference": "f6958c313a34c5e92171c45a57d9dc978e5975ed"
+                "reference": "0c2644d642b06ae2a31c561f5bfc6f74a4abc8f1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Automattic/jetpack-constants/zipball/f6958c313a34c5e92171c45a57d9dc978e5975ed",
-                "reference": "f6958c313a34c5e92171c45a57d9dc978e5975ed",
+                "url": "https://api.github.com/repos/Automattic/jetpack-constants/zipball/0c2644d642b06ae2a31c561f5bfc6f74a4abc8f1",
+                "reference": "0c2644d642b06ae2a31c561f5bfc6f74a4abc8f1",
                 "shasum": ""
             },
             "require": {
                 "php": ">=7.0"
             },
             "require-dev": {
-                "automattic/jetpack-changelogger": "^4.2.6",
+                "automattic/jetpack-changelogger": "^4.2.8",
                 "brain/monkey": "2.6.1",
                 "yoast/phpunit-polyfills": "^1.1.1"
             },
@@ -432,9 +432,9 @@
             ],
             "description": "A wrapper for defining constants in a more testable way.",
             "support": {
-                "source": "https://github.com/Automattic/jetpack-constants/tree/v2.0.4"
+                "source": "https://github.com/Automattic/jetpack-constants/tree/v2.0.5"
             },
-            "time": "2024-08-23T14:28:14+00:00"
+            "time": "2024-11-04T09:23:35+00:00"
         },
         {
             "name": "automattic/jetpack-ip",
@@ -493,23 +493,23 @@
         },
         {
             "name": "automattic/jetpack-password-checker",
-            "version": "v0.3.2",
+            "version": "v0.3.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Automattic/jetpack-password-checker.git",
-                "reference": "bdf70591123932112e447e295d7f174b5c0e3a44"
+                "reference": "1812a38452575e7c8c7c06affeeca776a367225f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Automattic/jetpack-password-checker/zipball/bdf70591123932112e447e295d7f174b5c0e3a44",
-                "reference": "bdf70591123932112e447e295d7f174b5c0e3a44",
+                "url": "https://api.github.com/repos/Automattic/jetpack-password-checker/zipball/1812a38452575e7c8c7c06affeeca776a367225f",
+                "reference": "1812a38452575e7c8c7c06affeeca776a367225f",
                 "shasum": ""
             },
             "require": {
                 "php": ">=7.0"
             },
             "require-dev": {
-                "automattic/jetpack-changelogger": "^4.2.6",
+                "automattic/jetpack-changelogger": "^4.2.8",
                 "automattic/wordbless": "@dev",
                 "yoast/phpunit-polyfills": "^1.1.1"
             },
@@ -539,9 +539,9 @@
             ],
             "description": "Password Checker.",
             "support": {
-                "source": "https://github.com/Automattic/jetpack-password-checker/tree/v0.3.2"
+                "source": "https://github.com/Automattic/jetpack-password-checker/tree/v0.3.3"
             },
-            "time": "2024-08-23T14:28:17+00:00"
+            "time": "2024-11-04T09:23:39+00:00"
         },
         {
             "name": "automattic/jetpack-redirect",
@@ -597,23 +597,23 @@
         },
         {
             "name": "automattic/jetpack-roles",
-            "version": "v2.0.3",
+            "version": "v2.0.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Automattic/jetpack-roles.git",
-                "reference": "32e45299a6ff93de0b1f4c71e6669f15917220fb"
+                "reference": "2fa5361ce8ff271cc4ecfac5be9b957ab0e9912f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Automattic/jetpack-roles/zipball/32e45299a6ff93de0b1f4c71e6669f15917220fb",
-                "reference": "32e45299a6ff93de0b1f4c71e6669f15917220fb",
+                "url": "https://api.github.com/repos/Automattic/jetpack-roles/zipball/2fa5361ce8ff271cc4ecfac5be9b957ab0e9912f",
+                "reference": "2fa5361ce8ff271cc4ecfac5be9b957ab0e9912f",
                 "shasum": ""
             },
             "require": {
                 "php": ">=7.0"
             },
             "require-dev": {
-                "automattic/jetpack-changelogger": "^4.2.6",
+                "automattic/jetpack-changelogger": "^4.2.8",
                 "brain/monkey": "2.6.1",
                 "yoast/phpunit-polyfills": "^1.1.1"
             },
@@ -642,9 +642,9 @@
             ],
             "description": "Utilities, related with user roles and capabilities.",
             "support": {
-                "source": "https://github.com/Automattic/jetpack-roles/tree/v2.0.3"
+                "source": "https://github.com/Automattic/jetpack-roles/tree/v2.0.4"
             },
-            "time": "2024-08-23T14:28:15+00:00"
+            "time": "2024-11-04T09:23:38+00:00"
         },
         {
             "name": "automattic/jetpack-status",
@@ -938,13 +938,6 @@
                 "reference": "81d809a476e87c260492d4cc0413818d85e123cc",
                 "shasum": ""
             },
-            "archive": {
-                "exclude": [
-                    "!/build",
-                    "*.zip",
-                    "node_modules"
-                ]
-            },
             "require": {
                 "composer/installers": "~1.2",
                 "php": "^7.1"
@@ -959,6 +952,13 @@
             "extra": {
                 "phpcodesniffer-search-depth": 2
             },
+            "archive": {
+                "exclude": [
+                    "!/build",
+                    "*.zip",
+                    "node_modules"
+                ]
+            },
             "scripts": {
                 "phpcs": [
                     "bin/phpcs.sh"
@@ -1558,24 +1558,24 @@
         },
         {
             "name": "composer/semver",
-            "version": "3.4.2",
+            "version": "3.4.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/semver.git",
-                "reference": "c51258e759afdb17f1fd1fe83bc12baaef6309d6"
+                "reference": "4313d26ada5e0c4edfbd1dc481a92ff7bff91f12"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/semver/zipball/c51258e759afdb17f1fd1fe83bc12baaef6309d6",
-                "reference": "c51258e759afdb17f1fd1fe83bc12baaef6309d6",
+                "url": "https://api.github.com/repos/composer/semver/zipball/4313d26ada5e0c4edfbd1dc481a92ff7bff91f12",
+                "reference": "4313d26ada5e0c4edfbd1dc481a92ff7bff91f12",
                 "shasum": ""
             },
             "require": {
                 "php": "^5.3.2 || ^7.0 || ^8.0"
             },
             "require-dev": {
-                "phpstan/phpstan": "^1.4",
-                "symfony/phpunit-bridge": "^4.2 || ^5"
+                "phpstan/phpstan": "^1.11",
+                "symfony/phpunit-bridge": "^3 || ^7"
             },
             "type": "library",
             "extra": {
@@ -1619,7 +1619,7 @@
             "support": {
                 "irc": "ircs://irc.libera.chat:6697/composer",
                 "issues": "https://github.com/composer/semver/issues",
-                "source": "https://github.com/composer/semver/tree/3.4.2"
+                "source": "https://github.com/composer/semver/tree/3.4.3"
             },
             "funding": [
                 {
@@ -1635,7 +1635,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-07-12T11:35:52+00:00"
+            "time": "2024-09-19T14:15:21+00:00"
         },
         {
             "name": "composer/xdebug-handler",
@@ -2130,16 +2130,16 @@
         },
         {
             "name": "felixfbecker/language-server-protocol",
-            "version": "v1.5.2",
+            "version": "v1.5.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/felixfbecker/php-language-server-protocol.git",
-                "reference": "6e82196ffd7c62f7794d778ca52b69feec9f2842"
+                "reference": "a9e113dbc7d849e35b8776da39edaf4313b7b6c9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/felixfbecker/php-language-server-protocol/zipball/6e82196ffd7c62f7794d778ca52b69feec9f2842",
-                "reference": "6e82196ffd7c62f7794d778ca52b69feec9f2842",
+                "url": "https://api.github.com/repos/felixfbecker/php-language-server-protocol/zipball/a9e113dbc7d849e35b8776da39edaf4313b7b6c9",
+                "reference": "a9e113dbc7d849e35b8776da39edaf4313b7b6c9",
                 "shasum": ""
             },
             "require": {
@@ -2180,9 +2180,9 @@
             ],
             "support": {
                 "issues": "https://github.com/felixfbecker/php-language-server-protocol/issues",
-                "source": "https://github.com/felixfbecker/php-language-server-protocol/tree/v1.5.2"
+                "source": "https://github.com/felixfbecker/php-language-server-protocol/tree/v1.5.3"
             },
-            "time": "2022-03-02T22:36:06+00:00"
+            "time": "2024-04-30T00:40:11+00:00"
         },
         {
             "name": "jolicode/jolinotif",
@@ -2421,16 +2421,16 @@
         },
         {
             "name": "nikic/php-parser",
-            "version": "v4.19.1",
+            "version": "v4.19.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nikic/PHP-Parser.git",
-                "reference": "4e1b88d21c69391150ace211e9eaf05810858d0b"
+                "reference": "715f4d25e225bc47b293a8b997fe6ce99bf987d2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/4e1b88d21c69391150ace211e9eaf05810858d0b",
-                "reference": "4e1b88d21c69391150ace211e9eaf05810858d0b",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/715f4d25e225bc47b293a8b997fe6ce99bf987d2",
+                "reference": "715f4d25e225bc47b293a8b997fe6ce99bf987d2",
                 "shasum": ""
             },
             "require": {
@@ -2439,7 +2439,7 @@
             },
             "require-dev": {
                 "ircmaxell/php-yacc": "^0.0.7",
-                "phpunit/phpunit": "^6.5 || ^7.0 || ^8.0 || ^9.0"
+                "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0"
             },
             "bin": [
                 "bin/php-parse"
@@ -2471,9 +2471,9 @@
             ],
             "support": {
                 "issues": "https://github.com/nikic/PHP-Parser/issues",
-                "source": "https://github.com/nikic/PHP-Parser/tree/v4.19.1"
+                "source": "https://github.com/nikic/PHP-Parser/tree/v4.19.4"
             },
-            "time": "2024-03-17T08:10:35+00:00"
+            "time": "2024-09-29T15:01:53+00:00"
         },
         {
             "name": "openlss/lib-array2xml",
@@ -3217,23 +3217,23 @@
         },
         {
             "name": "phpdocumentor/type-resolver",
-            "version": "1.8.2",
+            "version": "1.9.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpDocumentor/TypeResolver.git",
-                "reference": "153ae662783729388a584b4361f2545e4d841e3c"
+                "reference": "1fb5ba8d045f5dd984ebded5b1cc66f29459422d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/153ae662783729388a584b4361f2545e4d841e3c",
-                "reference": "153ae662783729388a584b4361f2545e4d841e3c",
+                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/1fb5ba8d045f5dd984ebded5b1cc66f29459422d",
+                "reference": "1fb5ba8d045f5dd984ebded5b1cc66f29459422d",
                 "shasum": ""
             },
             "require": {
                 "doctrine/deprecations": "^1.0",
                 "php": "^7.3 || ^8.0",
                 "phpdocumentor/reflection-common": "^2.0",
-                "phpstan/phpdoc-parser": "^1.13"
+                "phpstan/phpdoc-parser": "^1.18"
             },
             "require-dev": {
                 "ext-tokenizer": "*",
@@ -3269,9 +3269,9 @@
             "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names",
             "support": {
                 "issues": "https://github.com/phpDocumentor/TypeResolver/issues",
-                "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.8.2"
+                "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.9.0"
             },
-            "time": "2024-02-23T11:10:43+00:00"
+            "time": "2024-11-03T20:11:34+00:00"
         },
         {
             "name": "phpspec/prophecy",
@@ -3344,16 +3344,16 @@
         },
         {
             "name": "phpstan/phpdoc-parser",
-            "version": "1.30.1",
+            "version": "1.33.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpdoc-parser.git",
-                "reference": "51b95ec8670af41009e2b2b56873bad96682413e"
+                "reference": "82a311fd3690fb2bf7b64d5c98f912b3dd746140"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/51b95ec8670af41009e2b2b56873bad96682413e",
-                "reference": "51b95ec8670af41009e2b2b56873bad96682413e",
+                "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/82a311fd3690fb2bf7b64d5c98f912b3dd746140",
+                "reference": "82a311fd3690fb2bf7b64d5c98f912b3dd746140",
                 "shasum": ""
             },
             "require": {
@@ -3385,9 +3385,9 @@
             "description": "PHPDoc parser with support for nullable, intersection and generic types",
             "support": {
                 "issues": "https://github.com/phpstan/phpdoc-parser/issues",
-                "source": "https://github.com/phpstan/phpdoc-parser/tree/1.30.1"
+                "source": "https://github.com/phpstan/phpdoc-parser/tree/1.33.0"
             },
-            "time": "2024-09-07T20:13:05+00:00"
+            "time": "2024-10-13T11:25:22+00:00"
         },
         {
             "name": "phpunit/php-code-coverage",
@@ -5255,16 +5255,16 @@
         },
         {
             "name": "squizlabs/php_codesniffer",
-            "version": "3.10.2",
+            "version": "3.10.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git",
-                "reference": "86e5f5dd9a840c46810ebe5ff1885581c42a3017"
+                "reference": "62d32998e820bddc40f99f8251958aed187a5c9c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/86e5f5dd9a840c46810ebe5ff1885581c42a3017",
-                "reference": "86e5f5dd9a840c46810ebe5ff1885581c42a3017",
+                "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/62d32998e820bddc40f99f8251958aed187a5c9c",
+                "reference": "62d32998e820bddc40f99f8251958aed187a5c9c",
                 "shasum": ""
             },
             "require": {
@@ -5331,20 +5331,20 @@
                     "type": "open_collective"
                 }
             ],
-            "time": "2024-07-21T23:26:44+00:00"
+            "time": "2024-09-18T10:38:58+00:00"
         },
         {
             "name": "symfony/console",
-            "version": "v5.4.43",
+            "version": "v5.4.45",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "e86f8554de667c16dde8aeb89a3990cfde924df9"
+                "reference": "108d436c2af470858bdaba3257baab3a74172017"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/e86f8554de667c16dde8aeb89a3990cfde924df9",
-                "reference": "e86f8554de667c16dde8aeb89a3990cfde924df9",
+                "url": "https://api.github.com/repos/symfony/console/zipball/108d436c2af470858bdaba3257baab3a74172017",
+                "reference": "108d436c2af470858bdaba3257baab3a74172017",
                 "shasum": ""
             },
             "require": {
@@ -5414,7 +5414,7 @@
                 "terminal"
             ],
             "support": {
-                "source": "https://github.com/symfony/console/tree/v5.4.43"
+                "source": "https://github.com/symfony/console/tree/v5.4.45"
             },
             "funding": [
                 {
@@ -5430,7 +5430,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-08-13T16:31:56+00:00"
+            "time": "2024-10-08T07:27:17+00:00"
         },
         {
             "name": "symfony/deprecation-contracts",
@@ -5501,16 +5501,16 @@
         },
         {
             "name": "symfony/finder",
-            "version": "v5.4.43",
+            "version": "v5.4.45",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/finder.git",
-                "reference": "ae25a9145a900764158d439653d5630191155ca0"
+                "reference": "63741784cd7b9967975eec610b256eed3ede022b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/ae25a9145a900764158d439653d5630191155ca0",
-                "reference": "ae25a9145a900764158d439653d5630191155ca0",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/63741784cd7b9967975eec610b256eed3ede022b",
+                "reference": "63741784cd7b9967975eec610b256eed3ede022b",
                 "shasum": ""
             },
             "require": {
@@ -5544,7 +5544,7 @@
             "description": "Finds files and directories via an intuitive fluent interface",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/finder/tree/v5.4.43"
+                "source": "https://github.com/symfony/finder/tree/v5.4.45"
             },
             "funding": [
                 {
@@ -5560,7 +5560,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-08-13T14:03:51+00:00"
+            "time": "2024-09-28T13:32:08+00:00"
         },
         {
             "name": "symfony/polyfill-ctype",
@@ -6038,16 +6038,16 @@
         },
         {
             "name": "symfony/process",
-            "version": "v5.4.40",
+            "version": "v5.4.45",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/process.git",
-                "reference": "deedcb3bb4669cae2148bc920eafd2b16dc7c046"
+                "reference": "95f3f19d0f8f06e4253c66a0828ddb69f8b8ede4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/process/zipball/deedcb3bb4669cae2148bc920eafd2b16dc7c046",
-                "reference": "deedcb3bb4669cae2148bc920eafd2b16dc7c046",
+                "url": "https://api.github.com/repos/symfony/process/zipball/95f3f19d0f8f06e4253c66a0828ddb69f8b8ede4",
+                "reference": "95f3f19d0f8f06e4253c66a0828ddb69f8b8ede4",
                 "shasum": ""
             },
             "require": {
@@ -6080,7 +6080,7 @@
             "description": "Executes commands in sub-processes",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/process/tree/v5.4.40"
+                "source": "https://github.com/symfony/process/tree/v5.4.45"
             },
             "funding": [
                 {
@@ -6096,7 +6096,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-05-31T14:33:22+00:00"
+            "time": "2024-09-25T14:11:13+00:00"
         },
         {
             "name": "symfony/service-contracts",
@@ -6183,16 +6183,16 @@
         },
         {
             "name": "symfony/string",
-            "version": "v5.4.43",
+            "version": "v5.4.45",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/string.git",
-                "reference": "8be1d484951ff5ca995eaf8edcbcb8b9a5888450"
+                "reference": "7f6807add88b1e2635f3c6de5e1ace631ed7cad2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/string/zipball/8be1d484951ff5ca995eaf8edcbcb8b9a5888450",
-                "reference": "8be1d484951ff5ca995eaf8edcbcb8b9a5888450",
+                "url": "https://api.github.com/repos/symfony/string/zipball/7f6807add88b1e2635f3c6de5e1ace631ed7cad2",
+                "reference": "7f6807add88b1e2635f3c6de5e1ace631ed7cad2",
                 "shasum": ""
             },
             "require": {
@@ -6249,7 +6249,7 @@
                 "utf8"
             ],
             "support": {
-                "source": "https://github.com/symfony/string/tree/v5.4.43"
+                "source": "https://github.com/symfony/string/tree/v5.4.45"
             },
             "funding": [
                 {
@@ -6265,20 +6265,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-08-01T10:24:28+00:00"
+            "time": "2024-09-25T14:11:13+00:00"
         },
         {
             "name": "symfony/yaml",
-            "version": "v5.4.43",
+            "version": "v5.4.45",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/yaml.git",
-                "reference": "62f96e1cfd4cf518882a36bfedcf1fe4093c1299"
+                "reference": "a454d47278cc16a5db371fe73ae66a78a633371e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/yaml/zipball/62f96e1cfd4cf518882a36bfedcf1fe4093c1299",
-                "reference": "62f96e1cfd4cf518882a36bfedcf1fe4093c1299",
+                "url": "https://api.github.com/repos/symfony/yaml/zipball/a454d47278cc16a5db371fe73ae66a78a633371e",
+                "reference": "a454d47278cc16a5db371fe73ae66a78a633371e",
                 "shasum": ""
             },
             "require": {
@@ -6324,7 +6324,7 @@
             "description": "Loads and dumps YAML files",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/yaml/tree/v5.4.43"
+                "source": "https://github.com/symfony/yaml/tree/v5.4.45"
             },
             "funding": [
                 {
@@ -6340,7 +6340,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-08-11T17:40:32+00:00"
+            "time": "2024-09-25T14:11:13+00:00"
         },
         {
             "name": "theseer/tokenizer",
@@ -6976,5 +6976,5 @@
     "platform-overrides": {
         "php": "7.3"
     },
-    "plugin-api-version": "2.0.0"
+    "plugin-api-version": "2.6.0"
 }
diff --git a/docs/dependencies.md b/docs/dependencies.md
index 4b6357367df..ba19f3539a5 100644
--- a/docs/dependencies.md
+++ b/docs/dependencies.md
@@ -69,7 +69,7 @@ to catalog our packages and provide guidance to a developer who wants to test an
 | [@types/react](https://www.npmjs.com/package/@types/react)                                       | Contains type definitions for React.                                                                                                                                    | JS unit tests are passing.                                                                                                                                                                                                                                                                 | You should pick a version `x.y.z` with `x.y` similar to the version defined for React.                                                                                                                                                                                                                                                 |
 | [@woocommerce/components](https://www.npmjs.com/package/@woocommerce/components)                 | A library of components that can be used to create pages in the WooCommerce dashboard and reports pages.                                                                | JS unit tests are passing.                                                                                                                                                                                                                                                                 |                                                                                                                                                                                                                                                                                                                                        |
 | [@wordpress/components](https://www.npmjs.com/package/@wordpress/components)                     | A library of generic WordPress components to be used for creating common UI elements.                                                                                   | JS unit tests are passing and UI isn't affected at places of usage.                                                                                                                                                                                                                        | This package is one of the few `@wordpress/x` packages that doesn't come from WordPress directly, because we decided to bundle it ourselves (see our [dependency extractor webpack config](https://github.com/Automattic/woocommerce-payments/blob/b7634468560d905a479d50066233f807da62413f/webpack/shared.js#L132-L150)).             |
-| [@woocommerce/csv-export](https://www.npmjs.com/package/@woocommerce/csv-export)                 | A set of functions to convert data into CSV values, and enable a browser download of the CSV data. We use it to export reports for Transactions, Deposits, and Disputes.                                                                | JS unit tests are passing.                                                                                                                                                                                                                                                                 |                                                                                                                                                                                                                                                                                                                                        |
+| [@woocommerce/csv-export](https://www.npmjs.com/package/@woocommerce/csv-export)                 | A set of functions to convert data into CSV values, and enable a browser download of the CSV data. We use it to export reports for Transactions, Payouts, and Disputes.                                                                | JS unit tests are passing.                                                                                                                                                                                                                                                                 |                                                                                                                                                                                                                                                                                                                                        |
 
 ### PHP Runtime Dependencies
 | Package Name                                                                      | Usage Summary                                                              | Testing                                                                                                                                                                                                                                       | Notes                                                                                                    |
diff --git a/docs/rest-api/source/includes/wp-api-v3/deposits.md b/docs/rest-api/source/includes/wp-api-v3/payouts.md
similarity index 70%
rename from docs/rest-api/source/includes/wp-api-v3/deposits.md
rename to docs/rest-api/source/includes/wp-api-v3/payouts.md
index e63b3b0a060..d1f6cdf8e2b 100644
--- a/docs/rest-api/source/includes/wp-api-v3/deposits.md
+++ b/docs/rest-api/source/includes/wp-api-v3/payouts.md
@@ -1,8 +1,11 @@
-# Deposits
+# Payouts
 
-The Deposits API endpoints provide access to an account's deposits data, including an overview of account balances, deposit schedule and deposit history.
+The Payouts API endpoints provide access to an account's payouts data, including an overview of account balances, payout schedule and payout history.
 
-## Deposit object
+>[!NOTE] 
+>Payouts have historically been referred to as deposits, therefore these terms may be used interchangeably in response objects.
+
+## Payout object
 
 ```json
 {
@@ -22,21 +25,21 @@ The Deposits API endpoints provide access to an account's deposits data, includi
 
 ### Properties
 
--   `id` _string_ - The deposit ID.
--   `date` _int_ - The arrival date of the deposit in unix timestamp milliseconds.
--   `type` _string_ - The type of deposit. `deposit` `withdrawal`
--   `amount` _int_ - The amount of the deposit.
--   `status` _string_ - The status of the deposit. `paid` `pending` `in_transit` `canceled` `failed`
--   `bankAccount` _string_ - The bank account the deposit was/will be paid to.
--   `currency` _string_ - The currency of the deposit. E.g. `eur`
+-   `id` _string_ - The payout ID.
+-   `date` _int_ - The arrival date of the payout in unix timestamp milliseconds.
+-   `type` _string_ - The type of payout. `deposit` `withdrawal`
+-   `amount` _int_ - The amount of the payout.
+-   `status` _string_ - The status of the payout. `paid` `pending` `in_transit` `canceled` `failed`
+-   `bankAccount` _string_ - The bank account the payout was/will be paid to.
+-   `currency` _string_ - The currency of the payout. E.g. `eur`
 -   `automatic` _bool_ - Returns `true` if the payout is created by an automated schedule and `false` if it’s requested manually.
--   `fee` _int_ - The fee amount of the deposit.
--   `fee_percentage` _int_ - The fee percentage of the deposit.
--   `created` _int_ - The arrival date of the deposit in unix timestamp seconds.
+-   `fee` _int_ - The fee amount of the payout.
+-   `fee_percentage` _int_ - The fee percentage of the payout.
+-   `created` _int_ - The arrival date of the payout in unix timestamp seconds.
 
-## Get deposits overview for all account deposit currencies
+## Get payouts overview for all account payout currencies
 
-Fetch an overview of account deposits for all deposit currencies. This includes details for the last paid deposit, next scheduled deposit, and last manual deposits.
+Fetch an overview of account payouts for all payout currencies. This includes details for the last paid payout, next scheduled payout, and last manual payouts.
 
 ### HTTP request
 
@@ -50,33 +53,33 @@ Fetch an overview of account deposits for all deposit currencies. This includes
 ### Returns
 
 -   `deposit` _object_
-    -   `last_paid` _array_ of [**Deposit**](#deposit-object) - The last deposit that has been paid for each deposit currency.
-    -   `last_manual_deposits` _array_ of [**Deposit**](#deposit-object) - Manual deposits that have been paid in the last 24 hours.
+    -   `last_paid` _array_ of [**Payout**](#payout-object) - The last payout that has been paid for each payout currency.
+    -   `last_manual_deposits` _array_ of [**Payout**](#payout-object) - Manual payouts that have been paid in the last 24 hours.
 -   `balance` _object_
-    -   `pending` _array_ - The pending balance for each deposit currency.
+    -   `pending` _array_ - The pending balance for each payout currency.
         -   `amount` _int_ - The amount of the balance.
         -   `currency` _string_ - The currency of the balance. E.g. `usd`.
         -   `source_types` _object_ | _null_ - The amount of the balance from each source type, e.g. `{ "card": 12345 }`
-    -   `available` _array_ - The available balance for each deposit currency.
+    -   `available` _array_ - The available balance for each payout currency.
         -   `amount` _int_ - The amount of the balance.
         -   `currency` _string_ - The currency of the balance. E.g. `usd`.
         -   `source_types` _object_ | _null_ - The amount of the balance from each source type, e.g. `{ "card": 12345 }`
-    -   `instant` _array_ - The instant balance for each deposit currency.
+    -   `instant` _array_ - The instant balance for each payout currency.
         -   `amount` _int_ - The amount of the balance.
         -   `currency` _string_ - The currency of the balance. E.g. `usd`.
         -   `fee` _int_ - The fee amount of the balance.
         -   `fee_percentage` _int_ - The fee percentage of the balance.
         -   `net` _int_ - The net amount of the balance.
 -   `account` _object_
-    -   `deposits_enabled` _bool_ - Whether deposits are enabled for the account.
-    -   `deposits_blocked` _bool_ - Whether deposits are blocked for the account.
+    -   `deposits_enabled` _bool_ - Whether payouts are enabled for the account.
+    -   `deposits_blocked` _bool_ - Whether payouts are blocked for the account.
     -   `deposits_schedule` _object_
         -   `delay_days` _int_ - The number of days after a charge is created that the payment is paid out.
         -   `interval` _string_ - The interval at which payments are paid out. `manual` `daily` `weekly` `monthly`
         -   `weekly_anchor` _string_ | _undefined_ - The day of the week that payments are paid out, e.g. `monday`.
         -   `monthly_anchor` _int_ | _undefined_ - The day of the month that payments are paid out. Specified as a number between 1–31. 29-31 will instead use the last day of a shorter month.
     -   `default_currency` _string_ - The default currency for the account.
-    -   `default_external_accounts` _array_ - The default external payout accounts (deposit destinations) for the account.
+    -   `default_external_accounts` _array_ - The default external payout accounts (payout destinations) for the account.
         -   `currency` _string_ - The currency of the external account. e.g. `eur`, `chf`.
         -   `status` _string_ - The status of the external account. e.g. `new`, `errored`.
 
@@ -186,9 +189,9 @@ curl -X GET https://example.com/wp-json/wc/v3/payments/deposits/overview-all \
 }
 ```
 
-## List deposits
+## List payouts
 
-Fetch a list of deposits.
+Fetch a list of payouts.
 
 ### HTTP request
 
@@ -218,8 +221,8 @@ Fetch a list of deposits.
 
 ### Returns
 
--   `data` _array_ of [**Deposit**](#deposit-object) - The list of deposits matching the query.
--   `total_count` _int_ - The total number of deposits matching the query.
+-   `data` _array_ of [**Payout**](#payout-object) - The list of payouts matching the query.
+-   `total_count` _int_ - The total number of payouts matching the query.
 
 ```shell
 curl -X GET https://example.com/wp-json/wc/v3/payments/deposits?sort=date \
@@ -262,11 +265,11 @@ curl -X GET https://example.com/wp-json/wc/v3/payments/deposits?sort=date \
 }
 ```
 
-## Get deposits summary
+## Get payouts summary
 
-Fetches a summary of deposits matching the query. This includes the total number of deposits matching the query and a list of deposits.
+Fetches a summary of payouts matching the query. This includes the total number of payouts matching the query and a list of payouts.
 
-Useful in combination with the **List deposits** endpoint to get a summary of deposits matching the query without having to fetch the full list of deposits.
+Useful in combination with the **List payouts** endpoint to get a summary of payouts matching the query without having to fetch the full list of payouts.
 
 ### HTTP request
 
@@ -289,9 +292,9 @@ Useful in combination with the **List deposits** endpoint to get a summary of de
 
 ### Returns
 
--   `count` _int_ - The total number of deposits matching the query.
--   `store_currencies` _array_ - The currencies of the deposits matching the query.
--   `total` _int_ - The total amount of the deposits matching the query.
+-   `count` _int_ - The total number of payouts matching the query.
+-   `store_currencies` _array_ - The currencies of the payouts matching the query.
+-   `total` _int_ - The total amount of the payouts matching the query.
 -   `currency` _string_ - The currency as provided by `store_currency_is` or the default currency of the account.
 
 ```shell
@@ -310,9 +313,9 @@ curl -X GET https://example.com/wp-json/wc/v3/payments/deposits/summary \
 }
 ```
 
-## Get deposit
+## Get payout
 
-Fetches a deposit by ID.
+Fetches a payout by ID.
 
 ### HTTP request
 
@@ -325,9 +328,9 @@ Fetches a deposit by ID.
 
 ### Returns
 
-If a deposit is found for the provided ID, the response will return a [**Deposit**](#deposit-object) object.
+If a payout is found for the provided ID, the response will return a [**Payout**](#payout-object) object.
 
-If no deposit is found for the provided ID, the response will return a `500` status code.
+If no payout is found for the provided ID, the response will return a `500` status code.
 
 ```shell
 curl -X GET https://example.com/wp-json/wc/v3/payments/deposits/po_123abc \
@@ -352,9 +355,9 @@ curl -X GET https://example.com/wp-json/wc/v3/payments/deposits/po_123abc \
 }
 ```
 
-## Submit an instant deposit
+## Submit an instant payout
 
-Submit an instant deposit for a list of transactions. Only for eligible accounts. See [Instant Deposits with WooPayments](https://woocommerce.com/document/woopayments/deposits/instant-deposits/) for more information.
+Submit an instant payout for a list of transactions. Only for eligible accounts. See [Instant Payouts with WooPayments](https://woocommerce.com/document/woopayments/payouts/instant-payouts/) for more information.
 
 ### HTTP request
 
@@ -367,8 +370,8 @@ Submit an instant deposit for a list of transactions. Only for eligible accounts
 
 ### Required body properties
 
--   `type`: _string_ - The type of deposit. `instant`
--   `currency`: _string_ - The currency of the balance to deposit. E.g. `usd`
+-   `type`: _string_ - The type of payout. `instant`
+-   `currency`: _string_ - The currency of the balance to payout. E.g. `usd`
 
 ```shell
 curl -X POST 'https://example.com/wp-json/wc/v3/payments/deposits' \
@@ -379,9 +382,9 @@ curl -X POST 'https://example.com/wp-json/wc/v3/payments/deposits' \
     }'
 ```
 
-## Request a CSV export of deposits
+## Request a CSV export of payouts
 
-Request a CSV export of deposits matching the query. A link to the exported CSV will be emailed to the provided email address or the account's primary email address if no email address is provided.
+Request a CSV export of payouts matching the query. A link to the exported CSV will be emailed to the provided email address or the account's primary email address if no email address is provided.
 
 ### HTTP request
 
@@ -408,7 +411,7 @@ Request a CSV export of deposits matching the query. A link to the exported CSV
 
 ### Returns
 
--   `exported_deposits` _int_ - The number of deposits exported.
+-   `exported_deposits` _int_ - The number of payouts exported.
 
 ```shell
 curl -X POST 'https://example.com/wp-json/wc/v3/payments/deposits/download?status_is=paid' \
diff --git a/docs/rest-api/source/includes/wp-api-v3/reports.md b/docs/rest-api/source/includes/wp-api-v3/reports.md
index 38d8dba5f55..61dae42ee3a 100644
--- a/docs/rest-api/source/includes/wp-api-v3/reports.md
+++ b/docs/rest-api/source/includes/wp-api-v3/reports.md
@@ -28,7 +28,7 @@ Fetch a detailed overview of transactions.
 - `date_after`: Filter transactions after this date.
 - `date_between`: Filter transactions between these dates.
 - `order_id`: Filter transactions based on the associated order ID.
-- `deposit_id`: Filter transactions based on the associated deposit ID.
+- `deposit_id`: Filter transactions based on the associated payout ID.
 - `customer_email`: Filter transactions based on the customer email.
 - `payment_method_type`: Filter transactions based on the payment method used.
 - `type`: Filter transactions where type is a specific value.
@@ -159,7 +159,7 @@ Fetch a detailed overview of authorizations.
 - `date_after`: Filter authorizations after this date. If it's not provided the default it will be 7 days before today.
 - `date_between`: Filter authorizations between these dates.
 - `order_id`: Filter authorizations based on the associated order ID.
-- `deposit_id`: Filter authorizations based on the associated deposit ID.
+- `deposit_id`: Filter authorizations based on the associated payout ID.
 - `customer_email`: Filter authorizations based on the customer email.
 - `payment_method_type`: Filter authorizations based on the payment method used.
 - `type`: Filter authorizations where type is a specific value.
diff --git a/docs/rest-api/source/index.html.md b/docs/rest-api/source/index.html.md
index d4ad854df8a..62620326776 100644
--- a/docs/rest-api/source/index.html.md
+++ b/docs/rest-api/source/index.html.md
@@ -17,7 +17,7 @@ includes:
     - wp-api-v3/customer
     - wp-api-v3/intent
     - wp-api-v3/reports
-    - wp-api-v3/deposits
+    - wp-api-v3/payouts
 
 search: false
 ---
diff --git a/includes/admin/class-wc-payments-admin.php b/includes/admin/class-wc-payments-admin.php
index 8b2713c4829..01cce6c775e 100644
--- a/includes/admin/class-wc-payments-admin.php
+++ b/includes/admin/class-wc-payments-admin.php
@@ -158,9 +158,9 @@ public function __construct(
 			],
 			'wc-payments-deposits'     => [
 				'id'       => 'wc-payments-deposits',
-				'title'    => __( 'Deposits', 'woocommerce-payments' ),
+				'title'    => __( 'Payouts', 'woocommerce-payments' ),
 				'parent'   => 'wc-payments',
-				'path'     => '/payments/deposits',
+				'path'     => '/payments/payouts',
 				'nav_args' => [
 					'parent' => 'wc-payments',
 					'order'  => 20,
@@ -209,6 +209,29 @@ public function init_hooks() {
 		add_action( 'woocommerce_admin_field_payment_gateways', [ $this, 'payment_gateways_container' ] );
 		add_action( 'woocommerce_admin_order_totals_after_total', [ $this, 'show_woopay_payment_method_name_admin' ] );
 		add_action( 'woocommerce_admin_order_totals_after_total', [ $this, 'display_wcpay_transaction_fee' ] );
+		add_action( 'admin_init', [ $this, 'redirect_deposits_to_payouts' ] );
+	}
+
+	/**
+	 * Redirect /payments/deposits to /payments/payouts.
+	 */
+	public function redirect_deposits_to_payouts() {
+		if ( is_admin() && isset( $_GET['page'] ) && 'wc-admin' === $_GET['page'] && isset( $_GET['path'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification
+			$redirect_map = [
+				'/payments/deposits'         => '/payments/payouts',
+				'/payments/deposits/details' => '/payments/payouts/details',
+			];
+			$query_params = $_GET; // phpcs:ignore WordPress.Security.NonceVerification
+			if ( isset( $redirect_map[ $query_params['path'] ] ) ) {
+				$query_params['path'] = $redirect_map[ $query_params['path'] ];
+				$redirect_url         = add_query_arg(
+					$query_params,
+					admin_url( 'admin.php?page=wc-admin' ),
+				);
+				wp_safe_redirect( $redirect_url );
+				exit;
+			}
+		}
 	}
 
 	/**
@@ -467,9 +490,9 @@ public function add_payments_menu() {
 			wc_admin_register_page(
 				[
 					'id'     => 'wc-payments-deposit-details',
-					'title'  => __( 'Deposit details', 'woocommerce-payments' ),
+					'title'  => __( 'Payout details', 'woocommerce-payments' ),
 					'parent' => 'wc-payments-transactions', // Not (top level) deposits, as workaround for showing up as submenu page.
-					'path'   => '/payments/deposits/details',
+					'path'   => '/payments/payouts/details',
 				]
 			);
 			wc_admin_register_page(
@@ -935,6 +958,7 @@ private function get_js_settings(): array {
 			'fraudProtection'                    => [
 				'isWelcomeTourDismissed' => WC_Payments_Features::is_fraud_protection_welcome_tour_dismissed(),
 			],
+			'isPayoutsRenameNoticeDismissed'     => WC_Payments_Features::is_payouts_rename_notice_dismissed(),
 			'enabledPaymentMethods'              => $this->get_enabled_payment_method_ids(),
 			'progressiveOnboarding'              => $this->account->get_progressive_onboarding_details(),
 			'accountDefaultCurrency'             => $this->account->get_account_default_currency(),
diff --git a/includes/class-wc-payments-captured-event-note.php b/includes/class-wc-payments-captured-event-note.php
index f5b38ada258..10c48567952 100644
--- a/includes/class-wc-payments-captured-event-note.php
+++ b/includes/class-wc-payments-captured-event-note.php
@@ -194,7 +194,7 @@ public function compose_net_string(): string {
 		// Format and return the net string.
 		return sprintf(
 			/* translators: %s is a monetary amount */
-			__( 'Net deposit: %s', 'woocommerce-payments' ),
+			__( 'Net payout: %s', 'woocommerce-payments' ),
 			WC_Payments_Utils::format_explicit_currency( $net, $currency )
 		);
 	}
diff --git a/includes/class-wc-payments-features.php b/includes/class-wc-payments-features.php
index 161cd8e3935..e80cf6675f1 100644
--- a/includes/class-wc-payments-features.php
+++ b/includes/class-wc-payments-features.php
@@ -299,6 +299,15 @@ public static function is_fraud_protection_welcome_tour_dismissed(): bool {
 		return '1' === get_option( 'wcpay_fraud_protection_welcome_tour_dismissed', '0' );
 	}
 
+	/**
+	 * Checks whether the Payouts Rename Spotlight notice was dismissed.
+	 *
+	 * @return bool
+	 */
+	public static function is_payouts_rename_notice_dismissed(): bool {
+		return '1' === get_option( 'wcpay_payouts_rename_notice_dismissed', '0' );
+	}
+
 	/**
 	 * Checks whether the Stripe Billing feature is enabled.
 	 *
diff --git a/includes/class-wc-payments-onboarding-service.php b/includes/class-wc-payments-onboarding-service.php
index e817e344e60..8700fa4fa29 100644
--- a/includes/class-wc-payments-onboarding-service.php
+++ b/includes/class-wc-payments-onboarding-service.php
@@ -655,7 +655,7 @@ public static function get_from( ?string $referer = null, ?array $get_params = n
 		if ( false !== strpos( $referer, 'path=/payments/onboarding' ) ) {
 			return self::FROM_ONBOARDING_WIZARD;
 		}
-		if ( false !== strpos( $referer, 'path=/payments/deposits' ) ) {
+		if ( false !== strpos( $referer, 'path=/payments/deposits' ) || false !== strpos( $referer, 'path=/payments/payouts' ) ) {
 			return self::FROM_PAYOUTS;
 		}
 		if ( false !== strpos( $referer, 'wordpress.com' ) ) {
@@ -858,7 +858,15 @@ public static function get_source( ?string $referer = null, ?array $get_params =
 					'path' => '/payments/deposits',
 				]
 			)
-		) ) {
+		) || ( 2 === count(
+			array_intersect_assoc(
+				$referer_params,
+				[
+					'page' => 'wc-admin',
+					'path' => '/payments/payouts',
+				]
+			)
+		) ) ) {
 			return self::SOURCE_WCPAY_PAYOUTS_PAGE;
 		}
 
diff --git a/includes/class-wc-payments-webhook-processing-service.php b/includes/class-wc-payments-webhook-processing-service.php
index eaaeadbcfc8..eceb9617a75 100644
--- a/includes/class-wc-payments-webhook-processing-service.php
+++ b/includes/class-wc-payments-webhook-processing-service.php
@@ -618,7 +618,7 @@ private function process_webhook_dispute_updated( $event_body ) {
 
 		switch ( $event_type ) {
 			case 'charge.dispute.funds_withdrawn':
-				$message = __( 'Payment dispute and fees have been deducted from your next deposit', 'woocommerce-payments' );
+				$message = __( 'Payment dispute and fees have been deducted from your next payout', 'woocommerce-payments' );
 				break;
 			case 'charge.dispute.funds_reinstated':
 				$message = __( 'Payment dispute funds have been reinstated', 'woocommerce-payments' );
diff --git a/includes/class-wc-payments.php b/includes/class-wc-payments.php
index 3ea8a99e992..264cf340c64 100644
--- a/includes/class-wc-payments.php
+++ b/includes/class-wc-payments.php
@@ -1920,6 +1920,7 @@ public static function add_wcpay_options_to_woocommerce_permissions_list( $permi
 				'woocommerce_remind_me_later_todo_tasks',
 				'woocommerce_deleted_todo_tasks',
 				'wcpay_fraud_protection_welcome_tour_dismissed',
+				'wcpay_payouts_rename_notice_dismissed',
 				'wcpay_capability_request_dismissed_notices',
 				'wcpay_onboarding_eligibility_modal_dismissed',
 				'wcpay_next_deposit_notice_dismissed',
diff --git a/includes/notes/class-wc-payments-notes-instant-deposits-eligible.php b/includes/notes/class-wc-payments-notes-instant-deposits-eligible.php
index af86a20d16e..8cd07c1513d 100644
--- a/includes/notes/class-wc-payments-notes-instant-deposits-eligible.php
+++ b/includes/notes/class-wc-payments-notes-instant-deposits-eligible.php
@@ -30,7 +30,7 @@ public static function get_note() {
 		$note->set_title(
 			sprintf(
 				/* translators: %s: WooPayments */
-				__( 'You’re now eligible to receive Instant Deposits with %s', 'woocommerce-payments' ),
+				__( 'You’re now eligible to receive Instant Payouts with %s', 'woocommerce-payments' ),
 				'WooPayments'
 			)
 		);
@@ -38,10 +38,10 @@ public static function get_note() {
 			WC_Payments_Utils::esc_interpolated_html(
 				sprintf(
 					/* translators: %s: WooPayments */
-					__( "Get immediate access to your funds when you need them – including nights, weekends, and holidays. With %s' <a>Instant Deposits feature</a>, you're able to transfer your earnings to a debit card within minutes.", 'woocommerce-payments' ),
+					__( "Get immediate access to your funds when you need them – including nights, weekends, and holidays. With %s' <a>Instant Payouts feature</a>, you're able to transfer your earnings to a debit card within minutes.", 'woocommerce-payments' ),
 					'WooPayments'
 				),
-				[ 'a' => '<a href="https://woocommerce.com/document/woopayments/deposits/instant-deposits/">' ]
+				[ 'a' => '<a href="https://woocommerce.com/document/woopayments/payouts/instant-payouts/">' ]
 			)
 		);
 		$note->set_content_data( (object) [] );
@@ -50,8 +50,8 @@ public static function get_note() {
 		$note->set_source( 'woocommerce-payments' );
 		$note->add_action(
 			self::NOTE_NAME,
-			__( 'Request an instant deposit', 'woocommerce-payments' ),
-			'https://woocommerce.com/document/woopayments/deposits/instant-deposits/#request-an-instant-deposit',
+			__( 'Request an instant payout', 'woocommerce-payments' ),
+			'https://woocommerce.com/document/woopayments/payouts/instant-payouts/#request-an-instant-payout',
 			'unactioned',
 			true
 		);
diff --git a/readme.txt b/readme.txt
index cc050c3699e..e38951cde3b 100644
--- a/readme.txt
+++ b/readme.txt
@@ -24,7 +24,7 @@ Features previously only available on your payment provider’s website are now
 
 - View the details of [payments, refunds, and other transactions](https://woocommerce.com/document/woopayments/managing-money/).
 - View and respond to [disputes and chargebacks](https://woocommerce.com/document/woopayments/fraud-and-disputes/managing-disputes/).
-- [Track deposits](https://woocommerce.com/document/woopayments/deposits/) into your bank account or debit card.
+- [Track payouts](https://woocommerce.com/document/woopayments/payouts/) into your bank account or debit card.
 
 **Pay as you go**
 
diff --git a/tests/e2e-pw/README.md b/tests/e2e-pw/README.md
index c91f61a345d..9bcbd373f33 100644
--- a/tests/e2e-pw/README.md
+++ b/tests/e2e-pw/README.md
@@ -39,7 +39,7 @@ Prefer the use of [user-facing attribute or test-id locators](https://playwright
 
 ```ts
 // Prefer locating by role, label, text, or test id when possible. See https://playwright.dev/docs/locators
-await page.getByRole( 'button', { name: 'All deposits' } ).click();
+await page.getByRole( 'button', { name: 'All payouts' } ).click();
 await page.getByLabel( 'Select a deposit status' ).selectOption( 'Pending' );
 await expect( page.getByText( 'Order received' ) ).toBeVisible();
 await page.getByTestId( 'accept-dispute-button' ).click();
@@ -56,7 +56,7 @@ Visual regression tests are captured by the [`toHaveScreenshot()` function](http
 await expect( page ).toHaveScreenshot();
 
 await expect(
-	page.getByRole( 'button', { name: 'All deposits' } )
+	page.getByRole( 'button', { name: 'All payouts' } )
 ).toHaveScreenshot();
 ```
 
diff --git a/tests/e2e-pw/specs/merchant/__snapshots__/merchant-admin-deposits.spec.ts/Merchant-deposits-Select-deposits-list-advanced-filters-1.png b/tests/e2e-pw/specs/merchant/__snapshots__/merchant-admin-deposits.spec.ts/Merchant-deposits-Select-deposits-list-advanced-filters-1.png
index a982090d756b682898ba7800823db58a2b19b255..394c5495e14762dd0cd384208d6fdf75857c4667 100644
GIT binary patch
literal 15848
zcmd6O1yq#py6>1M{sjXJ8U>^=K%@~w9l8+^P^42@8VgLsp`<~YAp~J)P!U0pZiWy6
z=`N|^J}>OE&$?@!z3)Ef+<VrY^^alr=KJ1w-skzn!*gZD8;8kh$T1kqVeHLosu;}P
zBN)ssn*;mdlPgXWzu|wo98_;eVKVFK#xNKr4EEYp^#_rYy{@-3hDoG3_dUDVs(*?O
zg-{tO+ey`37?HO-U@F~gpZP;r^Kx=n5<{Jub7ajm5gnRv2gC3yCgJRgvA*G9&-Uo5
z?|rzrK6q&TTp}--ky@ES$FS39n&>6%mrla&z3Z;g#<JM#Tl?Vo7|i`c6wAEZ?=Vze
zdk<{C`*dX2?(H|{ula2MAM@8yrkyv^|M(IiY;%{xh=6II)(fJya!00KApYgc@z%^#
z)AePQw`XK>?G`k7R&Ab&NB@Z{o!EK0^G_yhpg2jrvZq&IA&^67c9>g%Mo{ORmq==u
z!L{yU@$IK7AGm^5{gr)uoS|JiGm{sW@T;%SZJ|voC@RXB*x2-4<?WVk3gbNj=Or#R
zJrNi6s%52{xL?ckjVBk%nuEE_?HwJ}iJCmEsnQ|}q@hc}d|HZPUxejw`d(8!uI}z*
z86Em>SvFnTPjadzJWE^CXz~`1NZn^ppHn5UGwc0yEUDPR{o%saz9GB@sbB9^1xH2k
zyfK`fpI^+ie)nMViN}xN#mdDkv#$%%{ICK=ZUTC#siBLXpLpZ7^3T`(G0N%lo^ay1
zO_$hNYL`ZRTY7z&F@Qy{$U}SV^l4$|jVI}vcoq(utzB)Yr@6~HgO{2=d|oa>k%GZ|
z@(E-)Oy6j5VHYvic%6brCr3W4BWLl}X3;pY*sr9tlm*+TA8pZ`@{omtJvJ><uU7p9
ztIQ355+|RMQX5`Z7pI<c%}yZQKuN@z^nUto)Kb5;0Xvt7E{s84!@wX)#9Q%sm47Xf
zC}-LbrR7r|6B!w)-a{ltckJ38K+mH<7NILwM(2`VFFt6wj!XDDc#eO@+hC$Mn{h1A
z`%NfIAvKQ$@q1H~3N9$hy6tJu%lTRMkYp7X7r`i@KyD>U%3uyXog3Z?t$m*B8u2=@
z^(-+OJ*3C;%k!$QEw0+z+jCYg>_mji=YfsYL)`_gmeEhef4>;-Ju44m<2rkGFy!z9
zcUMl<N}OrfuwhzB2`OttYU<~BxA)K3<*!p(OBTD*PK;(1Y?9@=^ozHpYAlFH9@`#%
zwJk-LCSH7VhMPy5AZ4zVC5uz#KEb0~czu_~=FsG%NA3Pccrp&w;rGr{eP^+<!hz}5
zM3>R*H78bVo<)0O`;-J17nfXRY3Z<TVvaxErp7uYgX&bc01I}c!Jx6;z;I^$`}TqH
zDIQdRUyv{Ev1PqE6H%#C;#ioeSIl<O^kiF>){Xe<{^zYe)zvB3mXcolzUGw}X7D38
zK0ZGB;7p>$!(F%pNpEjf28qn7h|3`?Vv7NRH6a}Fhd4Mm_0kepI7rn;`@U??N0QkD
zo!=?Fz1u&s_s~u1ZNI~?ZybOW11}%u-8;X$^9-}Iho{a+qF-PzzW?|V`yx{4Vmi06
zuEH{&Er#0e4CD59nIx`Yn-k?isc32Od&ri#goL{K1a@J3c5CJsVfXFd&v~UFsi(Jh
zN{<4AVSgfDzUkatWP}Y$)67Ww`SVUNuU_}g<sm^q31aTc?Be43dPSl#&tNd5FS&-5
z<P*}AVhNY6yE}_dU@&(~o0^(xs;iX;zbQ=WLH1-fqNAX@5(~F-NAXDhkVe2_^wYyV
z%e;Fq7%C}>@87@wr3?4MCBPsrF~Xh~Fzc(Ksbc=6y!9`nw*S^8jt#rM(At(Tf9y)P
zXiMV|6Wa_S+7Jl}CLgs2tKO7%RGfInp_Wu_b$OzS(Ys_|ZKcm$>EXkNX)5u)FmERK
z+DNp!A}-ge>ta})i6?1w1ef42Qg2=p!~x61UcEEbpV7T)J^^pv#!+)=rkJ-R$toyl
zI669#G?oSLPjw5_g<ZPwMtm)0d9o|MCYa0e_m41|%T}F-^9^#0o{N+I+|w&|&iG`x
zeFlH(_o(@NxLdJboBPCJM)BLhTw0py>gv%;si~<nSMJApczU+ImpQaKU&}{uf+>V{
zS+&2Q=CZ22{+fmrhD$HvJUTyIOLM{SiA8&QDolE;a3s1V?2;)9Rz*eSVnki|B~$;k
z#j&#z5)w|MjaP5@(`D!7S+sHHSraui@aUh6T*on0Vo|C4N}Bu1H2Hx8%A0FTOT8}r
zUG4PZ9=E2t^8#aHV%(O-6NiR|XrtZT+=|lFQ_o;uynLyaC>tCU5D@!t51B=GuDN%Y
zS8Iw2%_WmpEF9<0E7ykbwB%WK@S8WY2$(fWdU<(`_m`J*pOA}o*jQ{)YAdk2S338N
z7MJk!(8)B{h2Qf_OB$taOZ;}ft{EE}_s;cGV3Z52`^)si+!h;Q!>kIX;J@h%Vs2*Z
z%TxPQX)%}w=V2?3P*W$`57(qBMhTC1X2)N)=}B1_X&|;MMT=_pdvBG(^y4YT|47z`
z^5thtw5A5Kbh+`|%FvX#aRV>)l$`wF!KSazk5j{4yf-HdXasE{-^a&WQ~p#`RKz8m
zzGN~QW*Xg8%U7OWP;lintsumQX#>OI(-*HrM@NTWxaTVy%$Yb);b#eTSlF9Xa^}pL
zAUJ-uWvkbtL|ocm@|C5)+REa5DH$`R{V2?Tyt_b7N!g&buoM{;wNxkAe-roU(W6|W
z@5fwSU3(XG(4Aq2a4bBxK1eEr^Ec(1w=8}?7c)AR9Mk^g>7hK^e(~3*E}Ur)s*e)U
zY7kqAEOMGix>w~tme--LcK`l|6MXvVyY}oitB({~8}MVC9>_X?VSh!iCMHc0^DQBk
z!-X7vE96HAIV2^?hrLH15((D(bk4$he&})Xxs!b>*K5;Fz`9#KSt&;I=FMjpFI`#?
zy`N=Jt`BPhIUxuFIt4bpyM5o@z10m3O0<`)lub;MoTs`WNQ|7Od$idCu}6;{)ycC6
zMv>Fls7%eHqrSc})1X!ns3e}+o}p{m7<<*;!9h(*>Jf{1(|Z|Qf|kCk%o_<(!Bj<P
za&j_kf)i=Ob!oIox(%<@@$BeXql;m=W=&^USy|1uNSkT8`I&BuqjBeAJX9e_iw9OC
z<k{NNwbgJ#zkern=ULWvb*(0K;0-HZ*t@udvg{)xtF5h-J9Lsa=;h0oz7+Ina19qX
zxBNs$R!7%IQ|onfCK^N+UcoU+{P9B`+uRg?!)b9;MQrZtapC(veIUdgw7jJ;k^=&U
zUk?zsZ2jp)mVKGO{0O@w;5>N?+YG7FnwcM9#OD2uU0>j!20@lU(S7yt{_)=8{Gb*t
zX7s4xfdS@|Cr@HkyK;;da+^}s&cXTL+*oK>BdyP{V)cp~-?GpPJKn7Dqtud=^nonk
zv^qar{)1k*%)^yq<ZhW+(|ZDzPAN*570aoelfaVdIM!@IBxG=EWv0UfZwdvTU0Ywr
zo79Ep=wt|cZ4_7+NKJbQrU^;t72Ll%Ha157*Iz;9<>hbzE50qQ-)p^&piudO+FC*@
zRaIuDY(10oXOI%2ObP;C)66VIF<R8M-(oMOvmwH^%(dmnK*PXicxRq3ybJT`@#irc
zmsc-d;PUhH*%ZQ!bP13^dGw0ZpFe*-KR5R_G&EE(Mm%G2(Xp_gV951+NCGUJ#jmf=
zU-<iLIy&a2X=P<{YNWBBJu8i7{2j-dXIy)Nnos}su3fwG^>oLY6IrqFf_tf`s^T=W
z^fMp`JEi<!SySQI5j=0}=~+7*9IDS_!k$x%EFj7mrFg8)3p@Olk9K8ZNtF+~NU$6p
z9ero2SMIghnq?qCFX43?zS-89eGlTCpE!FM^GQO^=KOunJF$_HSD%n!FtM0k4az6S
z&ncRX)JM5(%vH7J7|RjM^-JBbLbkL43BT(iCLn@n#N2Wry~k>QG#NHehG0w6z=xEr
z{-%w(VkdR??p@V-B7Jj9OE5%2;5nu73QCEfj~_pBpLluf`0>LNwbrKdL*KhgTtD`?
zP4JYiPZt+CPlbnHw&qk)Qp(W&c)fg!RBUKy$bbK*q;+qR#&B(DC}d;j>7G=`m>is(
zvJ>qY#SwCj(wUi=xb38az9H;1p3vH=&ZA3^hjl|k?DJSq2$N5uoi2Bt(pg<!w}h-%
zWIz0ZQ$2+#@OuJ`dsz21#^=jOgV@mnlmKhQdNh0jMC9Y(F|HvU8M<22)6)dZfWg*U
zs7|g~T;<D?mXn>?;~iNsK?`dYw+kto{QdpO4<8P;|4nrYQUuJI`sh(+K|#UoS-CBx
zp&3@JjkjmuQ`M5kH&z!=Iq+u?OM{x6;<dRpKRc^zWRxH(D!SO?&@cvRLZ!m@a9f--
z8Me7KRc&}?ChNkzZ|pGVfq?;>QH1wT{l&>HHORs=5?&=<q*YUtIw8fjZIM<amZpeW
zuyHN30~OZN;-qw$mnYC*%Qoiap8EQZN4fN=G(?LDc>I}l&pZr;Mvw8#vsu6~oe#~2
zs^7LBJkHix3@Gb9t-U*APs8lbHZ6m;2wNJmWen!$XZsEZCRn3KH?ja2-QjcDJh8(c
zW`8nC!ad;iPq5z^Np!*gwM*z^L%35D5?KBQ+2CC;w{~-%F^o^Dn)&?so9@e#*)H@D
z&__CpU9xuX*)ydFqh)_W_vrECV5r`sqh@YrFql~%Sy@?CIF7#t2dU|9xAYBf-ysNR
zn4OfA#CiF$CK)Azvb}vysU;xred$KuagasS@84G_EG{M%(_t{m2f|cUxi#HS?%-f@
z!M~yC|1YrNH6OI*|4E#x2#B|)rX~k1AG~4%fZqm<0pe=+WAy6m%iI3cM`|2!-bL*U
zO?>I0ovA;iMe%`N|AfW=x1jDdA9VNsXgUFbrH3Rx11N=jRU3rE8P2GZ?}KatQJ;1z
z+i;n88+noo1h!e^br&C?id<b7!K=hyhwPf|!tqqf(C|IMrZ-L8bFH(O3O$0o_0*SH
zpX^)QPslpv=H}uAw`09$|9^$|oRLI#{6ED0AKLFfegt({X+{Y<P3qO`F&}SDC8wYW
zfr3TBD4zb|!+AjG^g{O6aHM$=bhnMb9tQ+lj4nqkY~XeB(xM;yI_SAjC%CF+EUrzk
z3j1O55irb@-V23=-*o~2Fx^9U?SZ`w7j@0a`S@|EhAXR@NYsUN?FOKKcxuYC!jpV(
zb9<sLT>WlLSFT)10o-oUkr@U5X8if{;5D6)DnRU2r)Tc4T*B_50ae-esum}*%DanS
z(L(8Y<>BE01A_9BTb_O?qRwr)aD)XLfBiKMKs;%4eM)_5Gc+=i8w>0$eE(mkVt-Y>
z#JkM&(FoZODeQUj#km~C(x=kue9Y&{N|}~qrH;k1mb^Qkckh7E2XlrTBXJ9>BQaV4
zf2gUb63RT+0RZ2_C74FLUI)$tz$QO$1um!s#)AqEOJZW;7$AF%44pjnL|N)Qt1eY8
zt;}5OEg%@^B8ch_JeGYWg|J}tF%nst89HOdGi8A+8kx7X0aS;wY|eOZsR3yi8W~9r
z2sly-6iQY}seC|)VB4<`&y?6)3`F$-s^EBHsD5*y!wA*Uqv%J(F3_@A$E2jN=h^h?
z03opGDabZyh~~lS6xt_-3s|yY*MJ#VR~!Q_pF}CKq0G$8oCf=e>X|i>Fq~Qe!pDUR
z7l3V~BGjN|;Hh!?^y!twmGzH6n`?|Nra~k?<=mU&R~I3OhaJNuWa#F1f5GV<)-LGU
zB;2c_aGL7YK%`GC*`H1RUF_tf6}EY_Dc<;Ug!RhMr3TS^#B%@&|3(YZzNjTDQvakz
zaptprg-og~O(QXqnWDz^lR=qBq1(!I#?iCa%?7`{b{lwlk_Fpa<P^vP)PlI&Utkx{
zk_!A0mjGCK92kT;(3?ewwbAi5JdLoUS@e+sO?}TL4c7+`ZsO2jsu<kmb@Of7QdHvA
zljKi(&VDAd=r1b;3K{RcwcamiRngU@jYEuTX{O%*N?IF^Rj&1;sZv{(fx*&vTZ@v!
zW<rDbx;!q|VMGz(H%+|8aW;8nfKUP^KTc%;g#Y~cGhxA|D<`qfeMXGKG;;IR=}RaW
zN*9~ugk9$o5Py01&J2GRgcwGTS)>8507A$rCv~4_9SVib6I<@Q2QvuurxSW#P*C7u
zEg>=7ch9A0+Ie+#)%@$Tqc|1=0|THgSb!_#!{UNP{r-#+nX|L^H|MGtQL&bimPW7(
z_DHGb;6RWA<=(w}Q;cgviX6vq==qV6>4N<pYEb@L0A>MujCB|1LpxA#TyZ77DJY1_
zbFT6vE&;}N6Q}PnCv%wgvixBh{($dBssJIDr+e|h_VB=N0aP>sKUxGL#0mJ4m~R`J
zm4%8RHApP)-km~F=-aE)xCDT5c!*F4!jSHKTiaV|5tprp#>Y8dR=$UXBLqrJSyz^R
zX%P(Z{d8|J7eD`E5~Uvn#a3wkwQJW>0Cu3oBdzyu)pT@d!H*grP3owQACKQAe^4Nj
z5fK1X3Q71qNRSA^K}e^<CZbS0!K0Jl<AZ@D%?a!N(X=51P@+kFB!`QOi$<C{*0Mdl
z3AP~Z27~K0oa6GOw#@bGob2p3AsSmi@`wYfnFh&Yb$&&}aWsH}K{N#rObRRj5?bHC
ze~&`X!(2iFm^BA{?eYG@%|zRBYu)Ims0_ir2huN3@TdY4qob#vSvv)^UKMbqfN>2~
zFsDY%iH)9`*VFmWkDnWdZFgJlGHoMR>*kraT!-Y*3P28k-reGIq(CT%ufp(#s*maw
z+RIRLsw-Fd(+^KiX9Cgq{(Y=$L+K>iMH|lkXsPDrW|XhFxir#(GD1JY@#S|KS7&8o
zL;Iwar60_qSLUIOh648xu<aAAtgPf<Wt9Q;Lg*udLWD~Ip-PtsD-g&+4;n$Hr46J7
zU|mV*1UUTup#piat<2M1chv3@tl?W05Xf|DRyEhw`qk9bSg{NY3~STHGr4wy*Ao*G
z*txiBoq24AR{FiQbacWYdk;-d^I{3EtU(JW_G1xMRaOoNY7rx?-TUna#{hKN6quJR
z7Ta|1jaU-I`b0*4Ur{pI-1=uoQ-@A)D~Iyx<wDBgxm}>Ft*uRd=uiuUP97j9DK&>_
zkCQXyTV;LTTb{&uAZ^u9j=joBJhbBC;;1A5iFywc1l2DMVuUbo7_FSL@;r~^eGu8r
z%tp5a#)lF>d`PwJFGFEI){+b-g{iQx&>X-$P{GJA6%|guz8)l!AQ85exGqr9(`Uez
z-NZpY4H`Mc7WjSHVR}!;Qf;OI@Av!qKCpHckiT>a?#Cer5aUhK1}@hGb;ZizO3%&d
z{PM!8dQZu^&HY08zH@_BmY*N(8z<&xtu0UC6(TMVyWZdU*pofm5mWKHps1+Zt6q%I
zB%aSDBBCo7%B$h*OaKNQXxf{k5V81Y@XbiA-Mm^Ln*tI$dG(6eSy--xg@qv&U}cpK
zyyVWzyp{cyO;*YL3na>z_AYssBiOb45tLjca=;!~cYe4k;yl?1{2<SMSQh2oX(6;w
z1^sBDoSoa@H?{>fpcf#a69vSFyV9`Rqfkp-38~s2lYm`Q!@2<BZ%b9HYB%oh?>E3%
zN$+9d0LWWpllipAc5(~YFh_F4RvlY-ZA}d>Ffb5@!#R#NGMCPNIYcAwQJ|`-+6wd#
zp5K2_vOurcWhR6LDHmmBWl#;96eiv#0BWp-I*#ZWus_6dHdp$QItYv?0$870gTU#o
zA}2iD88K7=^X9Lb{Q=C<pbX)pPBYz9eM(N93%r;Z!EEpMh-!b~imnZ16dHD>o^H)S
z;}<9Syjqx;1Ozn5DCm?Sd$lGjF&dkgjCYyFw1KRW^7ZRAUCM1lSI|#x#N;#`xx3hT
zN>yDwsBCjtH<-^rANaaX$%E{*rHSM-GB4Pn3?j{u<@M=H-w58IEJ1Qi0`P$fyXu`g
zu`u?tSOW90!V20Xr5N6G=gwu^%9a8?hGeh|dP+)4B-Qj3*dbXCkyywlOTgG5QKMir
z&b|e5VZ4XP3<zte6aXN2@%;H)`!8?c10st%UMov8RW-4-+}m5`+BGvIq>4WHfY1d9
zoHd5ootd?p%TxLNvbeRCnJft2?roxqQY9S5Lka%H1Cx{K)zvrML+>t(tY<(e24)=&
zSv3`=H#+n^FkHgB49?0ucVczSRDZbvWD#XZl&$eMD2<Jb*qNEHLXPk~E(C-JBk9E%
zKx!b7NN!_^q2PyQ02xiO8~hf2(fCD4NeRE_nj`VgW^%NfY|R*<H%{75)LK49To1Tv
z_lLWWp}I3cDo5floRnY|gvKGs6+M`Hk2GPirB=21g@wS(2$4J00nD75>F>%&YnGK&
zRhFF}?xJZUS@Z4L8x|ld1Iunpzy{6_mlyze0I(n}7sA~H5Q`rK52wjam4gQlB0$C9
zy<yh|%pHZ?@A@b%tlLyx$Ksbmd}v~D@Kg)!hZl!K4Z4487xcHMYscSU^yF815F4pw
z2r7pLXs4bJTj!K!Vd+#8Wl>guy15jywQ&QAgBl#ECCHwAxv%#hrZEFG2PHyOieOE?
zS5@5rxY%$hXq#+I3kC|5?{64+41z=oR4I#=q}Px+jc4phZy^~Z-L3HLDt;yP6cI}d
z<{Nos@lT`+K-wFFA{G4IsJSstdP;A{V=7RLd-r7%j_=y9mwYT(Mz23{AlMnt;Lvw5
zpPa~LD4&2l&cV$58IfRk`9!c&i5=N~D>-o8XZy{6m6Lwi^R1;t4GzjOZ+zoTdHEnv
zDobn8Eq$aKjPi6cmU(yYI|qlb-*Y7j&UvXE2bHLp7&Q$|8fYwC|Hi2P?hN^!-x<#T
zJWu?)^E~7@-pb+Lu`>>Gq2%{6FT0C(^bF<d3r}_!?Z0AbosrzR$G>YI=iE>FtaFKp
z>4DJ%;Q{>e583SEqB_LS@ULI?wNnK%@ReB?=i(T5M*h7Aw(f%{rvV&kXmIe}jOr|9
zz`J)Tpih8xF%Uwu>xZ%YoSAf%SP?e^PD*K-ee1z9=`z3qg&F$$dR*XMe?*FV8%il@
z{snS6m0(zc!O(}GUVwk$@_%&6r+Or<LxJmc+yoE<_1=GX##qBVtK>~t*=FE_nISy7
zY1lwE6!q8NFk}ESB@$NGCbDet836Q9#a&eaI}Tn?`#{sr1MwZu-8k?;Z*A|nUor^l
z2@C5$Q6b2^uF1j-EOi(lg<LcJRvaV~bJE7Du-jsa_}b`MY%`=reo%af7M5U=ApL(n
zp1UWBf?n7RE(0Tv@*SL(RPal{ZV3h`EF~qyZ$ETXn>)lqqW#a@;L<oATw5gYLrNZ5
zzW}51DF*Eg3~nV5j|cderEDJDANaD*)y)l%ZikK2Z#ka;kdfdZr`>#e2A2T2Vr=k@
z#J2O1o69e@x!5A?zML-XJeh(NQ1Du4&foC?yq%0(fQ>(Mpi!>@OI>QZ!DtRV>cz8X
zjR@)jxE~VI%(v;y1<4YN>J+-g@)QvdOT4yBv|Si<#83q^NNnBqqhxFc3nmYoEI@+l
z_rAR<%&NK#^bGK-i@_Td!aWB;ii9$f@?h>)&Mj`j5oSTr54X5E^-BtXae!rDk}tf#
zDrp8PdY|hEJ*r0#S2gwZAs}DN2C>IM$uL_SZ9-pw4NW4a<{W)YDXuIj>4OAm7_bi1
zt9GcJ)W?n?hJXh}I9$YKn&(YeNJtV`2@@Y1#9M#}2;BSj7s4$7WLNEEDboR*r2=07
z_#6f}CmorRfP<EK53P=B_RsdevE8!O0{LISsQL(e?K8n@?pGxtP6Z4CWe<-MmNBSf
zP&!&V47@W;V?2Sf=QV@qiP|Qx-5~gN6Rh!|%BOg5k&5mQJj$p8Gltli4JmRAys1Wq
z2C-xax{1`}XaF%dmN6vEf>4Sg030>*>7GK1<^=361H^!PGQO-8u9)=n^iVM{WFBLc
z?UZ@~3?FK7%C+amz}CvQd=R@qegsLqh<%oC%)f-{kO0pgg+i@qZ$E!Hf2+Zp6b~sM
zi-U#=q+0;U=x@3Z6%{o+Je-J<K8P5cx`cG`%|$ij7*uhHeGvcibI(&hKTC)Y6x5Dz
zEQr#yBvMXJ4iy#EVyNvZ@TDa<RCq9<kYs1+x$WP9LyC4ST+E#Sws!(Nb`1Gw;7dX~
zLONIy;JhHC7u8FED7j7(n%HJ!_JINc2UfvtrgSA2Y85TROq?G>GaPk(*gj-#=<Dl;
z3))7rm_z9US+ErmRhQ}8fb~CMvQSIFw9MVD9`{QyA&mzQ3Np@p0nJ>a<bfSb0}lqy
zGB2O^?!9DWWMJs&t0l=dA&dsj96N9v2#3;vWwd(w4+i!j%;dSY*wk0*Zk(qxGx`pc
z_BBv!g2TftXeqKGpf|2Wk?Dk8G=`DVO!bxO!qkzp1-{~>-ii6=2rqNriUrx7lb>Hb
zl+U0YhJrX;U9_04f!Asx(7q{EBBS>PLRM*>>&vQ&GmqhP)<PY}wPxyx2nh@S4s#`d
z6oO*`=L+;U(B>ecV}(8bd;m&(28(DdtcO>{y>NLpm{Ol}J%Haez__f~2tnI+H6<}t
zm@H%sBm}LjqGm0oa;o1Ar7ks}<7P`lo5u8MZz?LbLofoO6(L>(%Nhy#(8sV*8}JD1
z46&_^g>Ye~v<#71aN2A;ou?W3MMQ|sO_|;qPeD`@nJGCt?4c`U)p;IBp&Xd$WgRVU
zcRUxHZlL|wcb^i768F>rl@C%&5V)^XdNlKpnExRIQI5^~i$U}jtR|$W`T2QO@JR(A
zS#l)nc0mrvwI*IBE}NU1qx5F|>)k~0eOM>p@3oh2e{N}MA=DFz>q%K(?Oa?MTCPu@
zKk%~h3?CmK5qy`L;lVJl4t{!Z$;Y_ccEC{if#Cv)R|LSRT7PK;u{Ahii0@=B^*RK-
z1;7c+)BrGS8(a<jFyL)~{DoAr8lV+0Mp-#Iwd>b?;S>jjg>iU$dt;kn3!!u}6U*S&
zgwyBbg4mgF+_(W8TNdX$)0Y97q8tw7{x(3^#7=4uZG8EL9s^Dp160@!89L8n)gJWA
zF@nM8=jCr8<(Yx0kBnCuezRBrbDhHy?~yPG3^CVx%geg2MBBD}lK^%cD;DG&ja#?g
z0g<#=&j-g`H|uf4_f5*FrAr;r5a#}t4h{~ruq@v05DBv@D!0T}`uw4ca$LNqYT6JT
z?C0l)cqQDrrlLX`KG85T8d4~y;$mN+V+sN$5A?JUxjtg6LxC2ZAL2mfVT0J*1PLa@
zULUKHrp}RP)+B|#86)o5ir3<EnrK(pK2)y5)O9fu22hE$VEc1jX7rI13Kp6h$VyAi
za(w1sPIrTT2T7S@c+vjA!Gp*xTKaliiCt9m_G2>2q?ONN)xaqIDCiw$e_rJ<RV{{e
z*fTeKY(wmdhzJ)<;_chFPjmdRP=*mTjS_WL#W?~SKMWBCN3d+z%eW@!ZI>0{usN#U
zkbI{9`~kgF2lQ&thhQ6lIKD3yJr2v$sRpS8A31vmvN0i=3=XJ9wqd1u`mGDP&+bq6
z2-QW2bYwDr5u>~tkPsWo<heGMET}gFHaM$XNT*j8IFb<jd7{MITN%HgPFqQ=Omrwg
zn@928Vrk#Mnt)|aXS)sA16_t@lx>E<!=q3$w%h_l$UW4TOc|O0uKUxaB4HWyR>Jy6
z7+U^cN9EZ9*_5Kwq4em1+NBD$5ORUx#IR#Ak~L9B3(&>(vu{L^h6dc{9Ao`oFr8{H
zXiVbZ;D96543cFALdNaGz6XFZbbw0c2%bB*^~6L)HCb751HP@tuvz`f-wrWJ$VXgO
z0F85zCx11$#|1PMLgB3tUcEHFvOiJ~njc-X;r8s9{Dne6xT-}79I79eZged1>X#si
zE){sqKFyXG>gX}LU9m@2CqFizxJXP+Mj-X&Nj^<jlqo#~#z=8c1-)BlC56O}PM&69
zF9)RlNkZY;wI|Cn{aH}ZszKvfn&{{_#8+}>CI`NODQ1?$_|UTJ<fgzHo6KB<k9?#a
zGou*;G5I^*zUG5|{*SDie|pK*ePGtI^76SZr~ml<jd=_>|8Jldmg_}ZpUh8EA=s_Z
zKLHFI`npKFfPg?k<SHyG>a!P_MwZD&RPXdiAKBr5>puN@WC!s7r<&N#NWz`q<r@h~
zu;C2N_79TGrU>bSv$XxAa>0L(LHr}s{Xb~1{++9xb7v5}bV&`4d^5tQ;IsmG2$N?6
z`91|2Fw$-p=74a=2^rQs<RF^;r#%hGfXl0T_y(kM0n7Gk!|Wb=5vTzuXF(U0>ch63
zb)V0X^Em=yF~E5&4zwYvBS&JPB?8?RmjDl9Wnmcw4vgdimQ+x6(+tYJu7;u-ior}C
zWg7A&<K^W=G7G3##uvkE3NqR(+CD!fLkS!-pft#QNN%_qa%lT2<Zj0*pFG(MsT~WI
z0RVSEOiaH*#UAX%FnMI^0$!n`qss+f3%VHIGs*1?a^GpDgydvP@ELFksOtuj%SP>G
z0OP2QVk@WQcA>om_zIA`0E8x{r>E~uJ-z+7jhNksj{N%d3ueO_%&vkgl;XinXvI1U
zm>d<o8*dm&<2^gF46>jcj{ytG@8N}&hFj;=70;R?E%)~A9(wxq2B6d?Ki<Wm4g%mu
z$Sn$f_l_MzdNAKOL1@G|{`|BHY_8sx?CnQa^X)sqL<e4B&B5I^0#*Yi0ClM8=(rJZ
znYEq?4GvD+Lq>tThi(w+=@|vf5wOAWd;GZ%?S1l_>nmE&7qgYq3+U{o&-N|Z`6J24
zB~9xi-y&OVHIw)N00!z<LGDI=sS<#4B=-aL;9_ID4)6d;@GKlKI3%0EZ(mSxyob)H
z;Vu`bDFh+fSL1yI>j=Yp_kzR1QlaACQWBkeQWMG-V;TV~zyZ_`ZW1o;S%l0ckh2hA
z?Ca|zOd;J4HS{2<8H`PhJPQp(EI|GN-l7T3MM(XIQ*SZTSBe^#VD3(^1(3C72wB^D
zGA1AYY4?*J+m_zmUh7&L{{GLeL&{fwM?iapATulLFyT$HWe2Z-MJpgPMbsO3`*!4%
z0tFla<Q9NC#-ydC1rA$1p&uY+p4*ZIqF7d4IkGozHUcyAsJOQQOszY|_~m{|25#8y
z%CBF|VE=&vN=8pXh$jG$vVa<iYz12#2T;uUZF;UijLE?iQDY3W9;G5)0|BlBos%fE
zkjMrYSlI5@lP_PsOmjqTYZN~<$*m4Neq6CdKd#RvS<(_m2^cA`((vt@H*Z){0mHlc
zUSMHkO9RQ=-pMK0-dAe~-2t>ab%K>P78es^5IsBS2ChZpLW2Y!j1{X2_J<?z=He?A
zv_#-iK%H5)8@Hey0&cSIm<KMxCb}IKJzD$P_k4zRT$VHd=rL9ly|2*Tongb(HM1w0
zOwc`G>mxvI8HB!pv02wbgN)P0A3K235U!~}p9oHc(zHP>_kOMQZ<UbTfCGXW+5~ut
z4RA9Y;u?#*KF!zpXQ4Dhzg;7$<Fx={VMh~n+qZQ#NiU8Mm^e6P1VQ$p{Rdn)UCw;#
z(chJigSY}o^)THPWne9YVNlGG#ttSgAhqD=Xd7LZ)p=uL0|1~R*uv<`Sq9#vkc!5j
zvkgdHC{Qb}^(jHmr8X@WCx1azz#Sk@Ujr@FTiXTtmpnwEQwCmwYImeh*%x<Kef!qe
zmcP)|)%D`_Ygp(5r-UH-pb9NKA;Y262L3skG}L{>ACME2r;`VcCD9oUT`Mq3tK*la
ziTO%enYRlEvQ^d8z>?=NH8q7o4FZuKif$8=-}Eub_P!SH<k@t62B0|z63IAVR#nA-
z9N>V(7SJDxv<sCxVn=rG-i@p{z!zM+yowOc1@W6MQ{Aip$Zc(H!L>YX!w4=!Y;0^f
zH>k8)K&7Zoo=gUtWLqVMCePcqZ?}ST0NEb;JW#@ijEb~!KtLNC8;jLv-}Ic{NHHic
zL)rj{+qKYqj+pq49AgEb?~i}In$RvO@Q{8t#AHD@j%8Ods6jU^yoEMCKn<wBuxe^s
z1HGRw5BO+R@K*mPRBHAeI#K=oI~KB0eyPUiYRG>4Ks8|`NL&Ht^~*DB+n~m5c<;OX
z<SLHAb5RA#jXa8>SFc(JD*S8<OQ9k_+kt>L$-~&x6c6J^U2gE|y!voivKs6>HaMF%
zx2q43a!6r#C{Sprq37q=v1174CMG4x;$WEZAox7u-Fajumt;T!^zEU#K=Ao#0_Uj}
z(oR_2@7?&F95ZB`kGU!&O$E|TG9<JyXktZ;0I+n>y2ODt;Ljg+Xcz`RN}qLm`WSbz
z9r*BbCQkC4%1(p5x6(iUi<tjMy)^$6kZmvCe+t$OIl?jfcct}j9XQ+f`TqkaCA(Yy
zjPS&|jrg5?A>q#I&6yLQ#>&t>8lur!s$=dRy1hA)afU#L+uhASd5?#9UwaUMw|MU7
zWcJ`JG}WNFNXFSWNS`8M2Og3hjsVF;*2x`;|H2<hoRLId{-@1C0Gk5lO&pA0+hqJ$
z(H&kD%+=qgG4B}cByTAs^lni;!@gUT=_{c>z>RuRWm-?SbR?)qu{R;MLo@ALiUxT^
z5f*Q#)YUF{`gjJ<!SBv^+d2RK)=i0st@(u*Yf;DROZ}VrddW6LW8$W2ElZny667D;
z(2yjr+UImUBsQ$eSW?8S*V^9*R9}vNUGszRTU)=rSH_m#U45(9E(e1zaewJ097h>4
z-J%<XPnA(VT_`#fyR@!k+1im^gnOHsxy0FB{FS&|L29wkElt1fk`agR$Z1W}2`jhy
z$jYoO!5|t>5UA-+ypA6GX%mjpfC<CgeT`pS3X6@!6IQhhUe#BLWNm7v1x@K``fg60
z@os9f)L!G~mlTjK9%H^iR@cAa*S9+GEGMHmRB7K>Pq3whT4F&vy;#;!{NSNQx=bS@
z^NsmUH@t&@6Mk#!@gx5{u9PRm_(=M#?zzDqm3X%q;uZR}!S|WQ#(0M)a+)SyNeZ^H
z@jUL*(g#`2bYjVt+Fj)ATJp!;+EncXPxAE5MQB!%cumidvFeqivGNJjwM=I$m(p+P
zx!kICjtYAG7+W4)m{9M;*d$1NGZAr;mPqLG8cM&;_gu{+L_<uxD?Q7=%%gVUbm5(R
zQAX$X-+wMy3~8xKlMLKf7>_&ASJ`bWm5L}{@%DM~tKs>s@$|^Y+`H+hiiSgMy1U<<
zO|G}v?7p}jm*M!{fhVe6)v}9nr1_#+{zjAPk4e8ULrGHX>K>WB-my$)3@8T*NFT=b
zE<WB<(jvx4+_ZD)U+JB2DE6Lq>R<19cBQmXSgWd*7vINMDdW_-ep;HkE8F$-cAQ)D
zjgmh}>dadTFByo{eC2-gvG|%aE=cUc)qTcoZp%cEr-hL<(Lu4za-O+X4IFK)ZI+Wi
zr)4)ivR?4D^(>XFp5t<C%4{3`)AxE>?!`+hdy}=aa_Zx4DspTTf%)ypBjR0&DYJt$
z^3z#-UP4L7jYEUQF6o7^Dv+%5Lu^FSweK;85QiJ1zZ}vLwtJ^a=488AkRM^~fAYrH
z)Pye~$x(7MuUwV;XE<ye<qfS8zMYeqP+z6ysedJySvBQoHbH7x`yFhw^x{Cvqq=?L
z&2dp>k>TuEoe<A!<s^5-LEj~7&F!F*Bp&Kydm*9tEYy3tI)eACVG+M2K`Gf;_RZM)
zr{yuqr3Pu4OXjZi9L5{oYb6HFwlXL8s50DCP1M8RS9&HT9a$$#T9nChrWeW@iFp=W
zffKb!zIbfi{GQEo7W45yJDs^NgXDHP_CnmOl%p_B_|u14oUnV3LI_z>7r{{HjWM=@
zVKhzu=v`a_!$4dO4`+wJw5hSd(pchAyP)kFcEo76^ZqX>!3r}EkI)~rh@7H3aR%Eh
zH2iJ<OJ2XkL(Wr66C?O6f=;_gTVbhguyY1)2l^Am1v!tgn!NPWayC|mqxcoBFM}a0
z!Rnnlxrvf8Bluy*Tb%eb75NnkL9zafcP7L~=3<90nX;{DJ*$ly7V#f%3l@?+-Kg-f
z>aa?KNy&C+3&y2NZ0@+PucC$<D|W7yq`n$l#P()R&~>8sLW1oRVc(*~-sv+6imwaD
z%3>&^HSTs9D`1Q5+~3Sv_J6gFj7~bBbThsxVtGlNwbH5O*N?qI^dV@kOP>nXoUAQ!
zI?-aKdp_gF;fuN<L2o;iPCwsNH}9}$FY@N!^4qia;LBO-aHJPu8a;NcAFPNf($UIV
zwn^?$l%wtwwwBP$6jXiBilvYXzaXk}+;@MK1m;O$l-tDEXPpm)k_J=UtzoiRX(dkG
z0cz<TT2pE<ywMT<lq*lzIe1lTUFd>Y+SU`5@)?`fN;{TmuV{_6eTt46f>q+p&tolD
zcYd9vt*vv>{hZWo{|QruckL~WKLlKLJ{FIzSveZHukPvE`2#tcLR0c5JuMoXg+py&
z`7J@Mg13*i(>KOeFAHDhk?}K-Q<0ic?6&{o5qnQxP@F@D(S*%RP5*iGh;7GgdWOz=
z2bL#dF(umKR~E%d|2J9#g`A0XwVG=iR#Wh&Ho2cwaE=+TIvsDui+9F7jX1<V62>g-
zmMJ@vStt10?E7TYO<JnNlK14S^(1VW+m>}lOXE=Msf-2=P1$zM#QIvzzVGC9r^E_0
z7Pb$$&bRq>-DSP3r9MKt+;Nr-ha3BacOc5u;pm<{%<rO77dc()+a;?C_|m<EwBJ-Z
z9(LSOeD+CAOdMrMyZ7?jUf~@AoiQHWwP*Xbn7tJHc5ZY2y(HQ&4CXr3-~J@{+3uZ7
zPN^_${{nNC{BOnc+QXd>Ua{}E**+>S4?TJKHo6^qjAc51Y5SLrG&;ALj1sH*1R0CS
zuDb;VGtiEn+WyU6`r4V5^*!`E&)qAyEV*;H|H^}p{&z-CN3bRn-UbGk1BL|aS`8gH
n9q|~xMx@<AX$`O!j#{I9r)5&kb68UaeT0=!yp}0-=h6QHRtfE0

literal 16022
zcmc(GbyU>-w*DB1F9rq{N~lApA|Q>R;?Rw>ihwi%Lzjt)hzzB4cSwn}ib^R+jx-`Y
zbjnb_{Ta_X_m8{IUFY0$@9(nK`!bH-_{9D^`+1(deX6P~w~vON27|%u!(F?qj=}6a
zfWd6D-MtIGxrir?z^`qN>T)ueoW@h*7z{H8clna0Yt&?~i>s#T=H{H(qlbsConAbD
z^&0bEj}K&Au!#3NbLP!~XU0iSo{c3iKcPu@_l}t+(`m=MGjF!ZhN>p*I>@hi@4(q;
zY>1-F`?l4MyxZQF>*F6P9_`B|4VFIEkZO8;aI|MZyeUsX{=EK9cs~YXe{A_JFXa=4
z&U5E(%BS}Swr!_;;J@rk`Hk6okonIC*?)YAh<wXug>XTipT(lCzlBY2-%fi|P+&<-
zHL*or)($#zrO<RunP=-}sATMVUN(t}@;sp%e7IOINkf)r$B0>csS{;(W~2g@FQm3{
zfe1mnd)cHNl*_1m6S1E+?#lBylM+5Yie|yFNQhq;nJNy6jyCQ6{-OEOp3REuQZ~Km
zU$Yb|z9$EZ;_q<bL|w<8jPR^$6LSp1A3S)_RcIOC$k1(3AHJpjXnwdoQU4gOC35C@
zsGncim&%1O?09D9f@adSgIWve8GM_93jJOJ-A9RkrhWWPcoJ*C$va)oU+d*L6b)`(
zOrM;zE(v4jbrBXOJ-+J`MF=0~__jvg6X1$Z8{u2m_St-$5)zV09%I_l%$@GNu+YFk
zwx49@F*=$vwu4$L)6922gX9@pX+%Uu;iA*V-T4siqyE_OfuCnH7_MtbYGsZE+?2J(
z@1wlmcbgo}eRw#$uw7VQ%z3J#W%ywI*V>kXB~sc<zk6+UwIN~X=X45d0R1(>x>qL0
z*|QqB5p4964Z~?$+YBAHYXr^uf+YHm+|*u=<?+w9hKuc!ZuRwz9r4vw=@G@nyoQxY
z@1&IL;X%jv48!d3Od_J98A*PAJh^{1;N2cMTz+w}PC-gQTb9LHoO(~4hTiX)nWfE7
zDoevsY&e3!vm*u5LjwcMxcbJoWAf_x28IelqIc#7dF8KN3yI9ktPkTz{L%l*Y2f=!
zs<v4TnZYXz;_H#(J-tU%tBqg0c(K}PM49U>W|GgiGJ&VtWkhexG$X5OX)FcC#wj7O
zkwZOe@1mhj5Fws-ba>X&yVdP@I&DNi)N@F9O3L+mQ`@Z8zN!g`z9;)ni6(UwZD+a^
zOnIiXQ9;w&>lZdMJM|dz<cVAB8ibJBLR`0&L|3&Jf`Wrv4QW*uPWZ5}uvpFHuCd_e
z{(AbXt4P18Blj#W<H+&2=rV6LZS635ch}l7%OhxA{d~kS;@)F$EyE2uh33YKXYIHt
zZ*t{-5yK*}IOjJr-meg5(fKU2zP9#dL2$tYF*CdQtlV+N_n$vsF_EiCUfomKp5=Da
z!QNhV>$_3L&rvSie5R4%T{e{r-PSLJB$-F2v~sL<4RP}7uUnF_xEkfC0gk<tm(bmC
z#^KETv;8T5!caw4WbgUgN2dSI$^B1<`(+~5u)<xdxw%=?Vd%}F!-s7Q4`VR3=E?G*
zgxJ_v%Z|O8bAz944EJL&?7oxAv63dbmEs2N8Cn|OA_TQk6i?_A0bS;GJw3~pXZmwZ
zYF?yU5l8<zh{3$)nbgkKGv&}sd#P7!YeUk*V0;6vT)oQ4!(*rvaUl=Sfx*Q2=1DmW
zJ+bV_vLK0KFw)x&95@iy?=5zVbRPZbcI>NHwQm4Fm~osMDSH=AZ^QU@5B_aw{(I2%
zpBCW11%Q8l3M~V3`Py{Z`PYgWYKf0qT3V({Z8SAQ6j_5=l_D13q<$0DNL3E4yWOH9
zwc*sg#N;`9Z+(584rX~)?nUkG^A-c|?-7!oJlXwPk@Z`&m=3{dyoE(6T2yO%e0;U@
z4{kGd$x`ixKkF4)hDHe4WQ2s!!7`2*nr`hlfByUhpG{ARjm6fkDxazh&GZD_0yB#r
zZ*CU%dauq8lh+rTLW6>WW{M~%Kg-X^DgC3|t>CL!!DCvc98Rqac5!iWA{idJkN(27
zzP>)o=7dMfQ{Co<!WJ!97*w`iQGKcP;#f0Gv8%$PSY1Oy@Ybi@RJ(R%Tn(V7zi1zK
z=+Gf7?&r^+a6yEWPo?|HG!GLK6MpiC8k=&|8%8UL6U)|=fDEn76o?0l&(Dr@;HmeY
z`tHwH$!=_H+@5P}EVVxS0B@+M_`IvgiVbdFnrK&e`t)hBjfb9IM22=YCm{T6T#Wk!
z2ZNNi!Gm4<TArT}u<i7QVMXxYypOGGYEn6P@F1MO@8+>yDZBR3*Vfd?@l`AmzM47a
z2tm{u2AmY`D4VI|!s(T}=0ynG@!HwhwP)(61hc7VYioCSRk>h%@7q8EnP^V*liXT&
zthSMY|1XU-%a%D$)rWUMKnIV<Z+|#DYahyIY*b`L)J|27E;Ma8YFO#nS?XOM!a<&^
zVQMdPvGZDNmeVV7NX8qEHb%45by<D5mB)Vmy!sI?ZOz_NyrA3s?MHroq#2*BGRf7U
z!?2lpcJCP&7+7!u=8c+Ln;T0bk#-XUA0Cj0f>p4%wUrs-_juXik&%?w0_GVIA@q`-
z@0O=~GaJJBGL5Uep9KaI2`mb2$qL6RHpwJW`vG69#qZglqV9`ntctJVzJLF2AlU!4
zt`4UV#vO!RU0bt)*l=)hsrpq!FY1(L*`C3IBTtvjv?bvVe|vRK*4TSBnY=ij_}Tv$
z3EoV9?$+fTp~sINp=h1xt0>$2{fo9@p;0VDw;&~qM?WRp*jsmDw2Am7;3U(a;Z6+Q
zWi>T5*vs$~<!HFZtoLpi3d@PMbo6CHLc)B}RSahKw%Y*agSC)VYl@O(S7AD@!MnIp
zJc(04K!CV!B}FN6XlyL4IZ-b2X7ywG3wK`PqjPg}Jv}`O-4@JD&CD!k`YPlV6*a?o
z4R4#9r+ROYEg;k;+B3stWMnk6uAgI&^t`CEZ>qak$KL+UE?P$JW5<r6_#qTJjjQ8Y
z^zAB=&AvtGR(Y0`lyJcIg!36|2Qo@5eidlC^XbXK{DOkkmSlw^Oia1eezcj&(V{3c
zx{B>`ou|5b-)=ZNJJaml8-gu)_l}*N{hG3}vP-#9D3^{l;3W%A(5fS(tgP%PpAomY
zxp~EWJr@lPje4<dZ=ppit6{lobE$EpkWE{aj}Ks}!t2+s2}wVGT>t##ONLGNTY%yx
zfSDW8Gp8|e1F-xLm$o7gvniL`JmI(M;8u#ds7APO=R332ZXgY_?Be#mZ!Ft6lT%Zz
z;N6zr<L+%P7gyng-C2g-xy~gR7#a>wPIBWob#e@HOq`~Bbj=EMtJdfJz1QdDaOx2A
zEI7G9#`f8t)x#tb7aWY_l$5^nF4B)^jwGEFUVsx@pgib0-6MiiPgjThWLh7h27}j3
zmOo-x;&7$(oX9OWu}6*{XZQb{00&CXk85bsr7U8h1(qWuER0o3N=hr&$gse?DeUvD
z=JD3l>~75*gHCcOM4tQB#tMFO-7VnwIT<*l+Sjf<X^awCsI}aQ`O*05oXPa@GwXul
z#|6xuf13b2RM}NS-Fr@4+<=jhkvv(@l+|$N%$dSlpJ_gS{#@74pfEi>U26aHJ|OYX
z<YW}-%XNY%ej=$Zn2if|7?99?<h8kGk);+|EI1;7fFaJ4KjPu|)Dwv-F;-j}DbKMS
zl9ER7gU%HM?2!WpZtP=#0LnUM<ocmh<>$vo*^Yk=eJx_f0Rp&xSGb)f^N0qxPpu&B
zLu@FIeusPZsZ*yMvQP5g@ZGidcpNN=<py~v;^N%|v#+miGE{EExRwv?+#yW8tMnlI
zlUYdULy6QA_v|OyIHo!a<RFYS8p3$8ecYEOSbAN%e6fOdeFi5^oS>KTE*G-v%jzsJ
z9~D&|t`F79)aK#Q&A$xeK(Uo{QpM$(f`W#-dnv48VxZLKbqLGzk>8&A`wL|8jb7A9
zQEUcu7j&MyUa_^g27svwhYukOp42fu*;&w4iq8c2Oo|qB$$&}C&&@T*NO%<5|C9m5
zvZ{W(kJjO-ZKnOtkAx%^g|IQWW1^>|KwVv(?%=`r-@jc0n52wMzB~_#j_$Qt0cfho
z(8<lot=iOsDARyIGKG_Rh(&%#Hvr&vG*{x_Zd#xPJmRXpF9j6i-4;el!ieb_asWKV
zyLS6*t@XDjT-n2;|5g#Azs+~sj--=;QeT4{4^IsY#JzlZVEjwe_C&crZAcU3B@!DP
za5OFQLX#AlVl^2MC()ucWqf|P!F@bAobKew%yf;^48RHpJih%t)t;e=iHv(Ys3#iu
zsx)DC?Rh40xE45~nicMNrC0oyAg|Hv+ZT!@t?!^sG;fM=aCB@<!UZqF^>@a;$GZ=Q
z>MR0|>wB#&w<jxvU-0~GPkI?xg|aBxdArKhtEW$&rWdx2a$lZI|5@!P<zxdhpBg!E
z=^-_wlwFfoU!1a7t&!Tii3repiP~|mS@!A&#r@v;CSQ(IFJmwRb@T5XnPHXI<q$=`
z!9}}Hhjb;J{2^v($_LEj-3KTid{1xx!x?To!EB>^bNq}n<@f*8C6fxFoXN1!`b2m>
zjW2u(<<zS0Fop4LukCAUGKOqbjAsC9hq(xO2*{4LA&eHdqg6*%`mdTmIERE75TD}l
zgTH<qIdLK#QAV?G()!^rIU44&By0hY^D96|$y3E=0pJVqN<aW(;WhH!-rgCy0;(uF
z@FM6H`AFSbL&iZr>_1#-{%DwgNzDG8%l%`$`~U3{5mr`KPA;y74m@Q>zT4|Re7NMC
zo}M0-aK*o?^eE+9RcXUAXC>#O{-1A=WGLTAfB16h-_i5`*8GO<khb5@=iuOY_T-7G
zx;i0Sf#X0=PY>OpLkV!wf0WXpA+oDZg6RF+apk@9Q69Y{ppF364IRmJyYJq;+g0M2
z3bfINq>e6)lfJpT`f#JQ&|$`&PYn(JeaF$a_9y?BwrBA&)$Z<MyKvy>Z*Epw8_LJH
zo$6k!I>W=GB>Q-;8YH&%H#cR0Z`9vDpAMP-&<qmlzBONEsdqyjWeu()*FfIEPqa0^
zJS|%Y7*U>nK2S456PH^_&Vck`ZYbowcn9$HTME9H`}FBctid>VVKJVAA6~dC+ptVq
zMPe!B@xGI+9v&VQ<cUmR)dLJG9Cu=c(ahiJxOMFK0CB(|=B$~iojo)-m;mf^;?Xf9
zRaaM6qv*kS;OPOUMAYGeLf-CocN3MY$eH_23jHX3D28~bAbS_E(i}WcWJJ=%Tyn7K
z0JTW51aN+1nwy&=B*DzmU1s_~`4ek{&I&q>eHWY7_%3OOMqr;i&n<25;DA{71&?KG
zP#Y@bfd{m=^R6%UdCb&V3n>s9W2JIW%RWX-sIsz>UdZ}YjzP&8oV>DfSlw-P7<S>E
z<}-+JOG--83tEPp7ZAuEefsQ~y5D|=p{c2CUtdhc+?SIbCf8b~d&}Ch^@UegS2>uO
zrTMDX^BbeZ*fx?CR)-tHP0zok14bs{u?*^I{L|CJq8`gxkM}cVfI3Qt|0cSMGGQ+G
zZXsikwXoE%C~b(w(a|NrJCMfmqh-<tM!3GQvD7Fw!_LK}KnQvLIvp3xI^Jm>8yXlG
zh)7<xez80OW+xHAD4|Dag9WrAt~`9W6H&SOm6hVR<BQ|1C6;%coZ7y=769^-2He%M
zuiVXTsY8#)xYA&AbCXjy|Moqa$JRIJhw8|))wC=)NWf|V^n$i0KH3+EdG!HJxp4F2
zPC?tA>##2Fo2#Sv-?KMK-auMWKtfJK8QyEDT}NI;h4}EV!;3(9>btx3zeNfY0TSkm
zHqZvehzDBlf4FVOF0}kQxkl|k%0og!lfQpgwfXVp63|zo*i3oi5{XFab?Fbq9^o~(
zPH>tZ!r62c;+VV^gV0*Q-&g=^ASA)srolr*U8bXqd^Ye@)YM2WOmr5c0wu;TO=!V$
zR6w5511E#1O@YB$%?^AhZqotM4U>~6EVgN=j2ARXYK*reFMT;_cjwoa0D5uPH=qwv
zlajDYQ{6g1wkwB^13MukfkGayVe)Bve{V-<R8$sXEpWX?f2G&(&!6!C_WB-2zeb5@
z7<(;+Zr{HB0tnO3H8ob><1Uo~yN&VLbfco8!VwTbg9+nWK(Q3LFIhf%_%KZ+R`S{N
z=bBaC8xB-l)U=Fk^`Ttt<!+8FSnOCetyJ4g)mDu8%qV1T2x+Nw$l{jWZ?i$BCO?1v
zTwKiCsQ$04X_wxOJH(u5;E`Ay`fEw@SYny2Pij*)HIrwYh~r2aY!c$4C@?oS*0>}j
zz@$Tr8|gQ|!85>rl|X|!j(k;vz++X8N`rA&eSLMVtI$FtrjX+N+1AXdF_wcMf#8c(
zjuB5!OJo21=~EiW0krf^iN)^$OhRA1Vs~+I!Knkq1BW3ABD<lrRRa=2J3LbGcI^SL
z)#32`>)hnuzXG!tjz>v&Xd^B5)+UluGcC@Fn3I0%^E04D!OxEI<&4I7D8G17EY#ZB
zsXNtGgqY3H_;@-TKm~&L)`km6n>1LH41<#V2tg~>g3c_sxz}N@$J*8iAAn!1=loN7
z-~&uP>uQj&5fzk?l?{!F$(j3AV+BGM34gt}*6DF^%y69R+S|22R2P6K%Gy|4$uw;U
zLyrbRnhI(!<I;m&<RzkUk$Dp%(nR2(5U@u$)IW9UpYiLo?ts~YjLCZbd~dcviMq$i
zbUSQWG~0~n<;xHA^Yc-@0S!v(wySC%`4-s@r%_zQ+o-O-o={a)g@R+H&!eeSTue-V
zrgAMOjMp#&*hs^N4?p7@H4?Ax14o1N%o!OtwG*(YIntxKwkvLB-W#QGB_}N{EedRq
ze5DS<&rlcxyrQM)Xu1w@DtH6=gP<X>IK<ukkMgwT7>a?It8Zu^#dlHYiOa&Z9S@_7
z(-=;j0vZZFM6qo&h*<|47dVGjzN)287NNX`dIY4ZaQV(eDd)*oSPp*v@1=I|YPusw
zl0hFLpb)fd`~HGKOtZjD3Dz|IivQ7x{;Dkr;we~w)rHYaz%f91%eJ&2BlmF@65og7
zUqEuzljU&)@F>pW=9iZnmsT=$a^-~|(|?T+Q~)zZ)zUI!i5|(m<sawHog-kum?7m8
zjXb`QMMt}K?%Jhim8Dmdf#qOf8II|;!Git*ugJl{0UjGVG(DXI$b9S_24$&!ua)Rh
z=c$a|G8d#q>+9>0GFc?$R#^gy&@wO%g|?=uaGgCXi}ZGpWxGRm!|Du+9GtJLTv-{J
zLQt~%j`K@{zC%jZeR1rxjt<c?6DTD(Frz`cc0;5QuzY-cENpBF1UNy7kavc<c-h#$
z2gv;zey4HFO-xLTL;}~Ibe@`;8mR}M@m*khInVTEgB-Acqz<r9o*L2bv*iWrd5zSO
ztpT>(=EjVV6*8zgm+ewj<7GOCB2~vn7u{>q+i&GvBRt-FBH`7m<6g_1<{28PFH#g=
zCp>xbM64rNz(uBU(}f_gb7+MA`ErR)US1x>gh_{x?ifBPWUcDpkS`y?9>g|U#|7S}
znv+u@TBAR1hel3L&a)RUwBf}zhA~==9@_CTRDc%}#8U8q<)EIDmFxKU<wHL|E>2E)
zpwZ267#D}bjrIJr5c*3SdE9nn{u(2p54n_(nVAVDp=HHtB}D4|`}gVS=x$fkRj!WI
zS_|p>Xd$~5o9-}NPe=l*M1cUNtzEC=C>}N<gg{8xLA^f>s7i!@`3rO`0gh0P1^HNJ
zk}V=U4jNR{Y3wC(;x-myx7r{v3pxy4Lwr=sdD3;viU36pSRw=*a6;$j=UV_9?h+#$
z+|Lgg?CE_~n5$oG3ufMcEYXS2fmLxGa2Ld_IOH>x#H#@a*0ghtqWJ`Sa-SXHvaET*
zfL0pZpE$_lbgyQaM=Kz=meU;JO!7a*mjMD9Y!yOkYAQIPwqmzg<r;_l0n{ryvh`E9
z)<>lXNsz2Y^-rR85_g-=qLzU-AgTpU1rj5ytXG$pml0TMLGo$`=?O+{A&Qf`zrLh{
z)fOS?RSG6S5-f_Y4-cPSVH(PbMRxs0dyesjVDaNER|ty}nYk0GvED5|@=Wk>nqjDl
z9?O$z0I7&O!Y>60_eIqT_ocQ(Ia+WYNWbTPfdJJ4gT-lcebqp4blt&wsP-UA^k9jE
zBHfR)EO0?i^`s|DfBhv)d)ieMj(TWhWF&z=xZpBv5H0T3BKq|Pq{<A#vbRMi$vq{G
zp|Je0Z(P8ekZU;BoT!zd$$>0A@E${e*?2>C@XI0D0vXrNx*iX4pgWrLG6@jP3X%d1
zEiEMe3Py{4wDsT??m5c+27f}^XQLbsrcsmBR(a*trpG=;@$0Z%I@hni0tHv(z2Of2
zS?}^i&~feH6)Zx&PlGhkk^1oW+S;g<2W9DX(b7X*1*KMCfuxU*_JHaCI*eO40kBM7
zI6%n`QY=_G7r@^VwCU2kdGlt;m!xoZH5s5IZA4?AY~Wr?GyVOdZUz7qi&Mq@^^o|s
ze%DCRfrx|`Pej^P2H860#)`Y;!xAlmpE(h%A{i7O9uATtB-7t#KfpNRE(G)vVDy~a
z+=?J8TY!9Ix%7MK)Ya9I2mSf7RODQb1Jp;rgHX~$<`F1T<ee557kA_sW`cK*7!pce
zU}k0&O!z%|gmf(VrytYeH{t#?VAp!@?0*`Ln$~iaxy*EcZ`)SxwqVc@9UYBAg5-XD
zjWqfVyw8sh|3coTa@56mcuzxhwJgL{;c{t7G+*U!86cq@;IS;NRBai8W*`EJ<^ZM)
zn^;j+)nby{O;C07G|VLf^6>oPVq0H@hmB$5Venv1AQGP4z^?j^6<utfDJMkzr`GH0
zd4L&xg~7-ME}na_Qr+CF#-<Weh(AI3azJS89_7P7RSW*FwBzhUM@L5u1A{0S2LIsT
z;Lym38LI4n$a|kxaGm?8{;_S{I2^8-R%)HOpwpV9PP0>3SQs(4%TEuz<%P-*cmi~P
z_cTubDT@7HR(?cc#9SIX1ku32@o3Duo_FhQ&L69V&VKJr%J=`I*D`%?=_v-ocp3Eq
z{CVEr-J9Cx4yu7>d9d<s-%f&Hwl<_;++k~LOS6A}7*<jTu6DH^_ME{xJHN$qP|<Ar
zXkrTnBg*;Z<>i!%K~_VG3;BHOrz5PQZ;f{2N*|oGuF{b0k52Cm6e;NZs>C?|91aIO
z{<i_lU?4ASq2gG{f3=@~X7|r@2>ipR2pt6`1LULc?grpM5hMxE?D5=rtn?EwThr7M
z+wx5n1T9)FqsRx81VFRw9a)>Hs!BBh*IW&9X{~=gWgP6Y%afgnN|8bqAMR6u&a5=`
zf-HNK`+8h$?X?XuDOV_6&Fu*DbKq^Ta;SLr)}}iJFqA_`NITY>oQ~xHF%F!(B-I2#
z^hsgcum1V=fuhcnX>e6%>0WU&SkZVu|5{L7z;`nAi*vxP<0$Bi8Xb+eU_t2fUbDfe
zgKt;_R8U+B3_Z+jnkG2i@IoMp^*pC#lwIwI>yH3J)^&Gxo8d=rzV_?C?;?b|@{BGB
zizr{L&t?fqDuz|whF;{wW>7qkh}fb<9It|}+X7Z&7ARVdix;mWN(=@%Na6%YQ=0m3
zt<^x<EW+{t;xiLVN?m4h0N@k|AFHd;Bk*J2F9BG#_-ro3mfzX$D}EmG28arFNPAq`
zS*q67Sx_IEz1CFXFf0$-F%uMn476GWUS8e_Vs5N_7&lDTdf!2Zk2`?;1HsJzPuJn@
z-8|iBw?oX}lU{}N(+Xe?<-T*^?KbrG8pg!LprrLBkSP~#K%5$KPn#T*7b2C&?EunM
zflw5-F5R}b)P3&rv85izCJt`y$(+%0VBF|dpAC|+UWI#+Sz}Z>WE(CX9v;4k#ZO>l
z<f08i$_175kOKSqRZ&0uk+@SaBPKAxMfwGh1LVyj!iVq7H*Lt0jYYQrKH~@=aL+=4
z(F=+W<f^STDWE;_Adhw6AYsQrfFi*HJDU)0<c@=KNgksB7W+w5C`&EzDijT4cI`iv
z#%owQwmKTC0~K#9GM4GV<p-!u11`h`2?gk#+wCa`1?kQF_LV;BVX$jJmb$sS>&ZTR
z^M?QRH#7LmdEr7^%FlcAoYKd|oU^VzKOPSeWC1GLvL)#$avfM$S^J#VP!53b3dXv*
zy4Lph8v{z0=Q@gth}6MCD}?j51G_>=+ybg~4$jVv{;U#tAWzRedi>ZDDhOTR1rdUS
zvxV`$`@=&+S$x2$cHaioGOM;UHB^s+%I8^$s>H-Zti{T7FDfsLe0`k=k`tAXCt6bj
zfmRI-4J8#8UVw2U^8}7=2au~G$5CbIsj;g}hnmQx?zc9rXeWRq^)7n?t5F9sjdl)p
zz7|GGp-M_I;=23y@9(PgD*O2HW1;KZpj?M7MB5ObzR!%8DzIOTJ9pBG*klk_4&zRT
zMT6VFb_@?I`QEUz%iYf)dIvZPc|0{1)x5zZ9uL(qDw$edTb^pQ%B@HN4v+yB7GmDq
zM;pANTag;^TnK>bL{{}_utdU+eRE5I`iwTv{Z=SSaLUQaDZM^_1vKAV-aT%g{-$0)
zi>5$r0n`wuh=?v&B+XGGjwr3yf>;cST3cUT00JHcM3}jE%<I6ZQ`{g%aOzMdhNhU8
zR%V?L2?~TLXjnS`8mes~U{)ZW2_!ibtCeG*3*lTfB{DTR*%mKLZ53HwQGs8c)Wx*`
zaa)3VeM4WL5#R?p7EHJ@0Oprl)~gl5xt-m|qWsuIB`3E*mj)8aU;;LleuYA}tlxgE
zrWgsk6Y4L4!s{4&X+cq^!1)*>)Cg??qZb~VnVakLb$tsg;(x7(Y7tJqh+m<onhtCX
zgkgQP5b5a>EUP7)4)@V$7pI>esbDLWpt2Gc4B?|7%V+^%nUI*+USy>M-kc89D-nMM
z8N;ca^(u9g{`~DHrx+Ma^R6Q?C}h)hXQ(!)CBW7MRDmkQ0)CA|gvPYb{vA(m+D<17
zL-i&ri<@Lm1=*e?N=q9kCOMx15mE9YNMP?rYazgq-qIY;)p@rc4iF+g^t`=izHvbf
ziGnrIB2iLWDla@;a*Wp?4aEtMUR%nNgi{FAow9*Tr~-QgeHDQP|4D(o+--+ylTe0*
zR;LN@)WA#A0izl$NG&My;96k6@QY(=q)O;b>NvqBAt8YV`0m|BTnj`=21M^Q0_4sV
z0EIeH=g-~Ukw5pi#Q{TcU-%}B2rx1v;0%<F%GnS4$U!6*nbhn@Vgi~fkXC1`lS(l5
z*(ib#P6D*Cf{1mWsaVl`XMYo?4%piUcIQ-2Nh{eLJd+M1Y8S!+?f5r=R#q&w$HfM~
z7}jOM4mJKTGOaFE2=f_$w+Zb0JEV$X5cic{YZ-R^m8hl#-xS^Wa9?cmPM9&Hs5Cp2
zGe;VuGohk?1y#aPjjO`LMFa$L?ACg!)2|>pFu%0Hv2dCjys|Xis}Cwg9k2itj%3AB
zhrV9nognQTgLE*P#t=Ss<|oq}<IMs>ZfI9N_ZayqAh6l_`Bh7s8{z@Zky!<HQzmT7
zz7yvk_EFQG20skBuy$1&ti7)m8(Ui!D*eI-d>%k-p>$2P=je|lKOBhHLa^;n+9NnY
zB^2(y43!U;-dyX>d~h^6PAh<}h5{wYE4B(=1m%X8pKqzbMuI~__T_<-B7Mn>1nW8o
z%9du&o`PlZvF_qr(B1J+h`28M5C9XB%-59DA7yE8zQp?Y_<+jZctJ8WFevm~bs+Uy
zwPz%|^trJSg@m^z-q~~ukw{>w-g)o4typ3jY(->?`(-hTL`6kiu>QecvD{@<3i-+@
zv0DWi2doY08D-(zw1a`(4uyRXdiqj65DjHkPi{cnlS3or4&ZKtgvVP?FE4bItoTwq
zmLNP)CEBv*T^<seFf$9#gl^vvPafDj1zHjqGBj)G#7cT;CS3lDR2p^QW^=+7<V4*v
zG0_4aD6-8WJS5~(Q$t`LFc;le*KI?OP6(J?YcZKC0Rtw#u_zxZ<Va&f2>_rDo=o)~
z%>1@gl~_-)eo%JYQc_h0j;_7jfOyag0Ow+9K0Bp~^J1&Wc4<j6v1&8fsKT8CiXs*k
z7U1Z;26|veLPTu#A#j3ChUy)?V^421%u2fnKHP@cBrbx^LPk4K7C^-~ICZ2VqEP`}
z7jBWhcf}Vo@D%lEknAax{>$-?@ICzeTilZWvhVDxzblUSCTDngl>tdTbKt?V*Be&*
z{Cg&W?Q*~6-5%HotScReBBV9_@cT8spsRr*vf%z){G)!gPajUFez<zv-?h@e#_lQ8
z`Hy;R?Hu?h|DhD1s}G0N59KNvp~w7`519X==k^~mYMAw(oB!Rl`=5Bq(4B^0b2GCE
za307TEB(+s!&lJB4SpN|c822X^N?<yK_?h1_;UJTf1x+NKitI2!BKb1|8VTZyE2fO
zgFCG&NzTy6VcB0<0Zvo8XC}oU#|)VTV{XC)$jrtfFBu9=Q1;27xSFU}159Ux;}l;I
zHZvK5Zqy~6GOhPVw*eI&0RI^Jcz}xQgT62B?YNaU29@?!u+BrF0yHpi14uBRR0BnK
zVpb)d4#Fdg00&TyEHGbahbS>|WyZnH^9u`zu1ro%6+saXNH(XG!k?=A>Ivqg<YWtw
z6oe#5>6x18>c!RqcLy&++s<6rFgT?;K+Pak7MgvdH#IdKR`^C4;y~5>6vtjvq<}#T
zgAEU5vYwSq)My476j&!}5L*5HyJw*inr~VF^V<N)Un{1F*@na5ks!#eSdIX=yW2oU
zMlj42b-PTLZJq)TLi_gZAsz|7XGeK5g!^1&xpZ<+V`qDoZh=8AkOwZ<5uirP_nIh+
z{r*9HG3F<PY)b(1fNk~BX+(~or>PCH8QtN-j!oN;oAct7NCNPx3CIQ&R=zKd>%;kS
z0Wf=<4ejk`ZE{r*KhR8*_NC14%~Q`k2Pn;g;7Pd+n24jM#XJ)~s2ut<ts$I)r6CG5
zi6?^gLuneR2rLKq^&tAb=b6-?j%_Fma1kp}k3nPS4NVtV7+@u6@1PilI;S#J<3D;8
zpF4lPrHeE$V!|ZqbPc)?Rd3x&xc}e*qFK;vhn`JH0&BC5NYo)*@FF`w{m25=0Mzwc
zUL@i$1DA&NeP22z>X*CTCFOU2bFnWQMr|!vQu$wSa#uXTW?6yy=~V|Orx55$+s`O|
z$BR%6&1!g1cNOdN4V(t=-UwO$xY5f8hzeyFEf8wZ^CW^A(4hCK!KUdhdC_9(N1iNH
znS=cO{omU5X21fEfv;ORDmpU)rARGB#ph7)qJ!EZ&?l=p0t+fXLGHkVq(o#KNiAq#
zf@UKpco?coIyikTE~XUBXOA}&mnlG{rjht6G<4~`aM6m`;!og1&<+H?ECCAz59G*q
zU`_)}LIq0;`kInYR&#l8uA1XopiKr*InWk30xDBHViL~0o|j<cwWLM53oV%$X=!O<
z9pDR==*tkmdrAlXvC@_UZ8~YlIFF%%1B|+dg3ih<g1D<|Y*dD@W)r7`!q98avTAOl
z@^?#*E5T!JQIgo>Fw~>Dg?D=q6+`V(8nl%Oa)?7vPz&m%dAte=3awy{Av(Q5#v>&~
z9Nug5J%I7B@YY5y$u11`AH@t5WKrk3nOO?(e+E)%_o>}0gOJ?Nff58|Z6FBRy!VYZ
zWekj$E2(xvCtIH6rPFNE?~FwbpBq`Ec^3(4l0n>66`D*5(7%UYg<{wd1_qwsx+IXf
zAVa^E@(K#JlcCA%BkD79WLOwk5(e@Y3876#PtVE5#uhE<rPuGhHnpQ@&L{*NOz4y<
zCmnc7{W|RsdbO`uUQ_PjVMUqa3=CdG<Ix!`#5fc+S^`dQ2YW%}jIeOA!OwfxRWf-3
z9A(5Xpmi?`Y<1)i9QD5f-g2I;PKkr5VX0G{=*?g8vVKkgH{CJFri8i)s>?t}6zUL#
zA_$m+eJ)}%pTNKn4SWd2czJom8(46tr5F@8v|YY5AEh+T44AD#s{xz}FzMUjG~#Cm
zE>Z2=*+bj}pC+`^I?T_nMndA_IZ;tP&`ibLe6WS}VLX`+sA)66q7Zc)c@C<N1DLj;
z^$%4*Nhm}jod88ofC*Me1At#?P%|ptCj|r|7y6#PHkOEBD5yb)K*-CNsG54G_T}l7
z_C~R}rKNUo>XCv%VgxzpV1}WdMH2bEY5h=L31uIDbCo3}C9TcupY=s0ORtq)7dVt{
z3Vao}y)y0xIgU00=Tn4Lg8)#2mN_Q3Y|4EDTMfmh_YxMN06{7ljnROpL1gsRt5;>V
zc6ryGpbpQYS9q<nvlC!}^-tWs-!)%EE%O5DW5`1Utd5QjG}C56_;VVT7D9C#%Cl)u
zRv<xA(ST*fro+g=HL~>%NB=emgRwrsd`%rrHP|0k`*u%%0&UD7>h!Yic6~847{iaW
zt<atWP9{%2!k#XIFFgjS2|5d3f^Q6OVF3f%&CLzkode|#QM}w6CPMoTQ0{!c_1H7|
zGW6ZU&$`_iY4jWOPdbs5OaFtb{BQM+{VPpsHEnI0`hWW;IW!l=pw}r6|7UV>H%xZ_
z-?w?ap!M)&@f#Gh{q+|^nJbSSXMVh8%oV{(Q>}{YiO;hYD9kQS8oAtIej?IK7GjM4
zv&?dWO$nl+<w4mElqHXob{hjTR>L)}=8Xj9n<1(ZY08KH@tup@xf^E^!DZ$7=Dd`3
zD5;5SiF1OZ_+!4}?y$s)XflyAcZ!c#G%Z|cbVWa8?S03zRO+!5o8T?6%p?5n0i{aa
zDT2+TS)@qCCv7i&Jr&Bd>zr<NpYxw8F5k@LkvpupwZXLXvCzh)XY`hQgtxf8BvU3O
zl@77V=|{h-{^+H5%yB$yc)zoHiApiMKsUk4ZFR8GeWfIIseM{t_4@Dweewc_SK;8x
zFV5-lM>kD}4Qh=d_Zxp7n@Pm;NNDi2Wm=OC&2)aLKGrt!+JSyc#&`2;t$HTCsa>a8
z&D`aUMg99-J3|U^0cibv<r>VkeT>$0;K_Pd9Fg{Y?PONNv!nUMoDWNy9iMS>e!}Wy
zRBMaoSHn{Lesjh>_oos0Vb#33KwmufFrTMIxM_{lQna@yM^F9aEk3JHU0cMyjhf3|
z{dZ6Kc+I@np?t7SBkS`uzchUGcwEljvAAkh0o?$+#h1MT9ZrU&*$RflY(uh1a)5<i
ztF1**gF#t}Zns4dYf-7<-JD3$@rn0(3Yjujr0EU}5sB5mrpu%ZnAg){1$<p1M$i7F
zotB*8%ccFvWVBMz<mG&2<%aR@@y;o^#UJ^RPAl0vu6$_8y0992Xb4YRHJ4Z-5NB*B
zk);wTdSvgTB5pAytFRvSa2BfjrzI+f&uX<rY4Ou_1PHK=m&|x+X|R2<Qn*s#tSwki
zx;w6DF5S(z{w0oNWGQqgH-w?pgZku<gKmb+bVt6vnT4ZUw9wXtDj%iQIqgtev8>9M
zi8GajDv^w}RYTs4-eu|>lDW%X9a-fitxj8miW2ME$&z;C+CPHMYXmP^&wZO`yAnn@
zv;3R4a-@$xW!P)A^!BW~*Q!#)R<{qdBWRmumL|)&Y^}aLBw-uc8=S2XZPBIL9M@O*
zW?GNmkjm#rF1fLfD`w?;opW@-gHiz!`DW9w8CfpMZS30?=UG7<U#?z~G=I`e)qK2q
zu#^t2Z=d_pjG$<9OLo4T|83otiT-e_jp;=9!JOP$(%tlg<*W|4<Nj)^pW%vnLC`y&
zyD9YDHmidY<n|UmSecDCf+CLVdO?vnkKZo1=V2S(G39nA8~Q~qF00I65MWVjnn~*j
zc{=AlRe1{6@;KjwT$B1uukw!e<r9<>|BKJkkA2hBG%PB0=J;aKMHBhU1s1`BS|R7I
zkd~uWe+0STKW!uaJ#KKTUvlOe*}S(TErgoTc9S}E(qBU+N-SYXX>>bz_Ijqb{o1J#
z?z&NY=0)?jZ*_#^3Daw4DMnjAiAP4?4&BwQj}%j4({sn-!dR4+-Q>7w6$^fSE@WyT
z9QCruFiXM86U?w|Y56%y9#SG_*JQ3q=|$n(D9Cb-)zXET+s$N1;6RJUq2~p`hks#l
zOg&=u?-OcF$FmqFw<?Q9KfW@pFbHOIZNEv~-rJq}bZ*4>?&zw&uD>zk#ZUZn&LM*f
z@&s79iZ=y%_-qM>GVUU$B~BCar%O^Z{;$kx9#}}p3WN{!#$60lIJv?|++lZ0b+gC9
z-C<S6@YsibO70q{f5+MPkzZ3*PMQ!>^t0bmtY3JL-u#nX?(;_l>LDQm%_H-o*}S#K
z7km0&M5);*6i@S<a`n7A|5<0SSV}XE&ba3dDSNf`(y*Cwt3OL83?jSVOLNVNy8c)L
zd5}A$bM8i0;N#nGxzk|{pE;UkR_~v9n$2V}<-tTs4lRCerHmFtdMIJ}=;H=_JYUvd
zM#bf}3RCwar_wE2n-*GGaJ&lcLvNk3%SD7Fw=p-9I`}Fpq)`YkNu{-qzwj;H?$zZS
zXC&pZ5Z99Odsnu~@@Ed=*4zM(K&ZjISS*vMS)AVVAKiDsW#@&NQXGu1y|}Z>Z7gK6
zPxZ3yRRIr?LGheTF<Qm76BEr!T3wn(M5)N>SZ20}KUw|8tIQPXH0ud<6LaZQAKkPb
z-8#LJC6jL}DyrWiJQ=+BjXQ}dEscrU%`ZCbuGp4(YY?(mGU>Gnoda#TdXrr?9o0`x
zuSQe~ew1U#(GN=Q8sR-6sgaUUWGZUlqx@)(I?MR26LXtvdh<O-+1+Z{sg(t)HIZeD
zKg9f=i=g4rjHYH}<QR&mY-+{7aje_eTU5#{JHwc!<2}xML|h{!BY4VvsFBJf0^0a7
z7=F>PU(ctDj7W36CgH4CFRJt(ochz3{3#@Je(%HU&ZTGL%2S=Mh<y?Knawmh-tj!W
z`NiK-<#7)I!ePyYk1cm<(6cZ%6b%K<nJFKA$Ks_aA23(x{?_OGWcwfQ<ha_OOE70?
zC~a1l8<+3>x%4^vA7bQtkm^s_o1Y$kkH2Z=WF+?7pk6m+z!;O8ZB#NA%~4h(vD0qe
zvGV>Sm&N|b_;WQ5r)r)$|9Rbk?u$GA_4g%6{~5`@HE4&<w+vH%>fX$cJKyp&rE4hB
mJd$Z{{4=RrA>C6QTbMmZ6E3dT5niGf;;txP&XKus|NjB2^G@&p

diff --git a/tests/e2e-pw/specs/merchant/merchant-admin-deposits.spec.ts b/tests/e2e-pw/specs/merchant/merchant-admin-deposits.spec.ts
index c0e20768b36..6c2e6b41e72 100644
--- a/tests/e2e-pw/specs/merchant/merchant-admin-deposits.spec.ts
+++ b/tests/e2e-pw/specs/merchant/merchant-admin-deposits.spec.ts
@@ -10,7 +10,7 @@ test.describe( 'Merchant deposits', () => {
 
 	test( 'Load the deposits list page', async ( { page } ) => {
 		await page.goto(
-			'/wp-admin/admin.php?page=wc-admin&path=/payments/deposits'
+			'/wp-admin/admin.php?page=wc-admin&path=/payments/payouts'
 		);
 
 		// Wait for the deposits table to load.
@@ -20,14 +20,14 @@ test.describe( 'Merchant deposits', () => {
 
 		expect(
 			page.getByRole( 'heading', {
-				name: 'Deposit history',
+				name: 'Payout history',
 			} )
 		).toBeVisible();
 	} );
 
 	test( 'Select deposits list advanced filters', async ( { page } ) => {
 		await page.goto(
-			'/wp-admin/admin.php?page=wc-admin&path=/payments/deposits'
+			'/wp-admin/admin.php?page=wc-admin&path=/payments/payouts'
 		);
 
 		// Wait for the deposits table to load.
@@ -36,7 +36,7 @@ test.describe( 'Merchant deposits', () => {
 			.waitFor( { state: 'hidden' } );
 
 		// Open the advanced filters.
-		await page.getByRole( 'button', { name: 'All deposits' } ).click();
+		await page.getByRole( 'button', { name: 'All payouts' } ).click();
 		await page.getByRole( 'button', { name: 'Advanced filters' } ).click();
 
 		// Select a filter
@@ -45,7 +45,7 @@ test.describe( 'Merchant deposits', () => {
 
 		// Select a filter option
 		await page
-			.getByLabel( 'Select a deposit status', {
+			.getByLabel( 'Select a payout status', {
 				exact: true,
 			} )
 			.selectOption( 'Pending' );
diff --git a/tests/e2e/utils/flows.js b/tests/e2e/utils/flows.js
index 8ceda112015..87d5740af7d 100644
--- a/tests/e2e/utils/flows.js
+++ b/tests/e2e/utils/flows.js
@@ -35,7 +35,7 @@ const WCPAY_CONNECT =
 const WCPAY_DISPUTES =
 	baseUrl + 'wp-admin/admin.php?page=wc-admin&path=/payments/disputes';
 const WCPAY_DEPOSITS =
-	baseUrl + 'wp-admin/admin.php?page=wc-admin&path=/payments/deposits';
+	baseUrl + 'wp-admin/admin.php?page=wc-admin&path=/payments/payouts';
 const WCPAY_TRANSACTIONS =
 	baseUrl + 'wp-admin/admin.php?page=wc-admin&path=/payments/transactions';
 const WCPAY_MULTI_CURRENCY =
diff --git a/tests/fixtures/captured-payments/discount.json b/tests/fixtures/captured-payments/discount.json
index a4abc8f1419..2fa6a911d74 100644
--- a/tests/fixtures/captured-payments/discount.json
+++ b/tests/fixtures/captured-payments/discount.json
@@ -67,6 +67,6 @@
         "fixed": "Fixed fee: -$0.30"
       }
     },
-    "netString": "Net deposit: $105.48 USD"
+    "netString": "Net payout: $105.48 USD"
   }
 }
diff --git a/tests/fixtures/captured-payments/foreign-card.json b/tests/fixtures/captured-payments/foreign-card.json
index d78a39b09ba..234878b2372 100644
--- a/tests/fixtures/captured-payments/foreign-card.json
+++ b/tests/fixtures/captured-payments/foreign-card.json
@@ -55,6 +55,6 @@
       "additional-international": "International card fee: 1%",
       "additional-fx": "Foreign exchange fee: 1%"
     },
-    "netString": "Net deposit: $95.47 USD"
+    "netString": "Net payout: $95.47 USD"
   }
 }
diff --git a/tests/fixtures/captured-payments/fx-decimal.json b/tests/fixtures/captured-payments/fx-decimal.json
index af570251b01..b95e9318c84 100644
--- a/tests/fixtures/captured-payments/fx-decimal.json
+++ b/tests/fixtures/captured-payments/fx-decimal.json
@@ -47,6 +47,6 @@
       "base": "Base fee: 2.9% + $0.30",
       "additional-fx": "Foreign exchange fee: 1%"
     },
-    "netString": "Net deposit: $100.65 USD"
+    "netString": "Net payout: $100.65 USD"
   }
 }
diff --git a/tests/fixtures/captured-payments/fx-foreign-card.json b/tests/fixtures/captured-payments/fx-foreign-card.json
index 834e1ea580c..836c8433065 100644
--- a/tests/fixtures/captured-payments/fx-foreign-card.json
+++ b/tests/fixtures/captured-payments/fx-foreign-card.json
@@ -47,6 +47,6 @@
       "base": "Base fee: 2.9% + $0.30",
       "additional-international": "International card fee: 1%"
     },
-    "netString": "Net deposit: $96.80 USD"
+    "netString": "Net payout: $96.80 USD"
   }
 }
diff --git a/tests/fixtures/captured-payments/fx-partial-capture.json b/tests/fixtures/captured-payments/fx-partial-capture.json
index be8d55c3f08..f10ff7aa9e9 100644
--- a/tests/fixtures/captured-payments/fx-partial-capture.json
+++ b/tests/fixtures/captured-payments/fx-partial-capture.json
@@ -64,6 +64,6 @@
         "fixed": "Fixed fee: -$0.03"
       }
     },
-    "netString": "Net deposit: $16.79 USD"
+    "netString": "Net payout: $16.79 USD"
   }
 }
diff --git a/tests/fixtures/captured-payments/fx-with-capped-fee.json b/tests/fixtures/captured-payments/fx-with-capped-fee.json
index b8ca2d7f6be..8c1b602a3eb 100644
--- a/tests/fixtures/captured-payments/fx-with-capped-fee.json
+++ b/tests/fixtures/captured-payments/fx-with-capped-fee.json
@@ -57,6 +57,6 @@
       "additional-international": "International card fee: 1.5%",
       "additional-fx": "Foreign exchange fee: 1%"
     },
-    "netString": "Net deposit: $971.04 USD"
+    "netString": "Net payout: $971.04 USD"
   }
 }
diff --git a/tests/fixtures/captured-payments/fx.json b/tests/fixtures/captured-payments/fx.json
index ab61a700a87..8ceee7b7438 100644
--- a/tests/fixtures/captured-payments/fx.json
+++ b/tests/fixtures/captured-payments/fx.json
@@ -48,6 +48,6 @@
       "base": "Base fee: 2.9% + $0.30",
       "additional-fx": "Foreign exchange fee: 1%"
     },
-    "netString": "Net deposit: $95.84 USD"
+    "netString": "Net payout: $95.84 USD"
   }
 }
diff --git a/tests/fixtures/captured-payments/jpy-payment.json b/tests/fixtures/captured-payments/jpy-payment.json
index 0361538516d..6c7a6b3ee05 100644
--- a/tests/fixtures/captured-payments/jpy-payment.json
+++ b/tests/fixtures/captured-payments/jpy-payment.json
@@ -59,6 +59,6 @@
 			"additional-international": "International card fee: 2%",
 			"additional-fx": "Foreign exchange fee: 2%"
 		},
-		"netString": "Net deposit: ¥4,507 JPY"
+		"netString": "Net payout: ¥4,507 JPY"
 	}
 }
diff --git a/tests/fixtures/captured-payments/only-base-fee.json b/tests/fixtures/captured-payments/only-base-fee.json
index d9867053c18..8bc5bf67d38 100644
--- a/tests/fixtures/captured-payments/only-base-fee.json
+++ b/tests/fixtures/captured-payments/only-base-fee.json
@@ -35,6 +35,6 @@
   },
   "expectation": {
     "feeString": "Base fee (2.9% + $0.30): -$0.74",
-    "netString": "Net deposit: $14.26 USD"
+    "netString": "Net payout: $14.26 USD"
   }
 }
diff --git a/tests/fixtures/captured-payments/partial-capture.json b/tests/fixtures/captured-payments/partial-capture.json
index a902014a17f..d6112a5cf70 100644
--- a/tests/fixtures/captured-payments/partial-capture.json
+++ b/tests/fixtures/captured-payments/partial-capture.json
@@ -38,6 +38,6 @@
   },
   "expectation": {
     "feeString": "Base fee (2.9% + $0.30): -$0.82",
-    "netString": "Net deposit: $17.18 USD"
+    "netString": "Net payout: $17.18 USD"
   }
 }
diff --git a/tests/fixtures/captured-payments/subscription.json b/tests/fixtures/captured-payments/subscription.json
index 168337a34dc..b7312ea0c02 100644
--- a/tests/fixtures/captured-payments/subscription.json
+++ b/tests/fixtures/captured-payments/subscription.json
@@ -56,6 +56,6 @@
       "additional-fx": "Foreign exchange fee: 1%",
       "additional-wcpay-subscription": "Subscription transaction fee: 1%"
     },
-    "netString": "Net deposit: $52.87 USD"
+    "netString": "Net payout: $52.87 USD"
   }
 }
diff --git a/tests/unit/admin/test-class-wc-payments-admin.php b/tests/unit/admin/test-class-wc-payments-admin.php
index 25612ab0f9a..6a16577f18c 100644
--- a/tests/unit/admin/test-class-wc-payments-admin.php
+++ b/tests/unit/admin/test-class-wc-payments-admin.php
@@ -271,7 +271,7 @@ public function data_maybe_redirect_from_payments_admin_child_pages() {
 				false,
 				[
 					'page' => 'wc-admin',
-					'path' => '/payments/deposits',
+					'path' => '/payments/payouts',
 				],
 			],
 			'not working Jetpack connection - valid Stripe account' => [
@@ -280,7 +280,7 @@ public function data_maybe_redirect_from_payments_admin_child_pages() {
 				true,
 				[
 					'page' => 'wc-admin',
-					'path' => '/payments/deposits',
+					'path' => '/payments/payouts',
 				],
 			],
 			'working Jetpack connection - valid Stripe account' => [
diff --git a/tests/unit/test-class-wc-payments-webhook-processing-service.php b/tests/unit/test-class-wc-payments-webhook-processing-service.php
index 053fd7a554f..bf58120532c 100644
--- a/tests/unit/test-class-wc-payments-webhook-processing-service.php
+++ b/tests/unit/test-class-wc-payments-webhook-processing-service.php
@@ -1356,7 +1356,7 @@ public function test_dispute_funds_withdrawn_order_note() {
 			->method( 'add_order_note' )
 			->with(
 				$this->matchesRegularExpression(
-					'/Payment dispute and fees have been deducted from your next deposit/'
+					'/Payment dispute and fees have been deducted from your next payout/'
 				)
 			);
 

From 0a26a8e058504c4aaa5279a770f8664392049a9c Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sun, 10 Nov 2024 12:09:27 +0000
Subject: [PATCH 40/45] Update version and add changelog entries for release
 8.5.0

---
 changelog.txt                                 | 34 ++++++++++++++++++
 ...ppingcountries-in-express-checkout-element |  4 ---
 .../9550-fix-single-product-page-view-tracks  |  4 ---
 .../add-1225-flag-elevated-risk-transactions  |  4 ---
 changelog/add-9673-payouts-rename-notice      |  5 ---
 changelog/add-country-specific-test-cards     |  4 ---
 changelog/as-improve-stripe-for-ece           |  4 ---
 ...-affirm-remove-unused-multicurrency-import |  5 ---
 changelog/dev-1-9601-rename-deposit-dev-docs  |  5 ---
 changelog/dev-add-unit-tests-for-capital-list |  4 ---
 ...ev-add-unit-tests-for-diputed-order-notice |  4 ---
 changelog/dev-bump-wc-version-9.4             |  4 ---
 changelog/dev-readd-tracking-event            |  4 ---
 changelog/feature-deposits-payouts-rename     |  4 ---
 changelog/fix-7761-align-deposit-colors       |  4 ---
 .../fix-7802-deposit-withdrawal-text-changes  |  4 ---
 changelog/fix-8254-bnpl-pay-for-order         |  4 ---
 ...-and-process-refunds-again-via-woopayments |  4 ---
 ...de-stripe-duplicates-warning-when-disabled |  5 ---
 .../fix-9456-bnpl-respect-limits-per-currency |  4 ---
 ...ix-9520-advanced-fraud-protection-settings |  4 ---
 changelog/fix-9525-menu-url-payouts-rename    |  5 ---
 changelog/fix-9527-payouts-rename-settings    |  5 ---
 changelog/fix-9537-woopay-button-size-preview |  4 ---
 ...2-rename-payouts-instant-depost-modal-flow |  5 ---
 .../fix-9572-woococommerce-table-specificity  |  4 ---
 changelog/fix-9573-rename-payout-tos-modal    |  5 ---
 changelog/fix-9585-rename-instant-payouts     |  5 ---
 .../fix-9588-rename-payouts-error-messages    |  5 ---
 .../fix-9636-custom-select-control-styling    |  4 ---
 ...d-tracks-event-capital-view-offer-redirect |  5 ---
 changelog/fix-9654-remove-test-mode-subheader |  5 ---
 changelog/fix-9661-avoid-php-warning          |  4 ---
 changelog/fix-9676-multi-currency-autoload    |  5 ---
 changelog/fix-backwards-compat-mccy-instance  |  4 ---
 .../fix-express-checkout-block-registering    |  4 ---
 ...mit-test-mode-badge-in-change-payment-form |  4 ---
 changelog/fix-payment-method-icon-alt-text    |  4 ---
 changelog/fix-payout-rename-account-errors    |  5 ---
 changelog/fix-pmme-appearance-checkout        |  4 ---
 changelog/fix-saving-duplicate-3ds-cards      |  4 ---
 .../fix-stripe-connect-breaks-underscore      |  5 ---
 changelog/fix-woopay-duplicated-component     |  4 ---
 .../gh-actions-e2e-optimize-composer-cache    |  5 ---
 changelog/multi-currency-v2                   |  4 ---
 changelog/update-9417-ece-in-block-editor     |  4 ---
 .../update-9524-deposit-payout-deposits-list  |  5 ---
 ...transactions-list-deposit-to-payout-rename |  5 ---
 ...nsaction-timeline-deposit-to-payout-rename |  5 ---
 ...date-9578-79-rename-deposit-overview-modal |  5 ---
 ...te-9581-rename-deposit-onboarding-tasklist |  5 ---
 changelog/update-9587-doc-url-payout-rename   |  5 ---
 ...to-db-cache-to-deal-with-db-write-failures |  4 ---
 .../update-npm-readme-update-e2e-pw-snapshots |  5 ---
 changelog/update-order-success-lpm-icon       |  4 ---
 .../update-payment-method-test-mode-label     |  4 ---
 package-lock.json                             |  4 +--
 package.json                                  |  2 +-
 readme.txt                                    | 36 ++++++++++++++++++-
 woocommerce-payments.php                      |  2 +-
 60 files changed, 73 insertions(+), 248 deletions(-)
 delete mode 100644 changelog/9104-add-support-for-allowedshippingcountries-in-express-checkout-element
 delete mode 100644 changelog/9550-fix-single-product-page-view-tracks
 delete mode 100644 changelog/add-1225-flag-elevated-risk-transactions
 delete mode 100644 changelog/add-9673-payouts-rename-notice
 delete mode 100644 changelog/add-country-specific-test-cards
 delete mode 100644 changelog/as-improve-stripe-for-ece
 delete mode 100644 changelog/chore-affirm-remove-unused-multicurrency-import
 delete mode 100644 changelog/dev-1-9601-rename-deposit-dev-docs
 delete mode 100644 changelog/dev-add-unit-tests-for-capital-list
 delete mode 100644 changelog/dev-add-unit-tests-for-diputed-order-notice
 delete mode 100644 changelog/dev-bump-wc-version-9.4
 delete mode 100644 changelog/dev-readd-tracking-event
 delete mode 100644 changelog/feature-deposits-payouts-rename
 delete mode 100644 changelog/fix-7761-align-deposit-colors
 delete mode 100644 changelog/fix-7802-deposit-withdrawal-text-changes
 delete mode 100644 changelog/fix-8254-bnpl-pay-for-order
 delete mode 100644 changelog/fix-8423-klarna-cant-undo-manual-refunds-and-process-refunds-again-via-woopayments
 delete mode 100644 changelog/fix-9271-hide-stripe-duplicates-warning-when-disabled
 delete mode 100644 changelog/fix-9456-bnpl-respect-limits-per-currency
 delete mode 100644 changelog/fix-9520-advanced-fraud-protection-settings
 delete mode 100644 changelog/fix-9525-menu-url-payouts-rename
 delete mode 100644 changelog/fix-9527-payouts-rename-settings
 delete mode 100644 changelog/fix-9537-woopay-button-size-preview
 delete mode 100644 changelog/fix-9542-rename-payouts-instant-depost-modal-flow
 delete mode 100644 changelog/fix-9572-woococommerce-table-specificity
 delete mode 100644 changelog/fix-9573-rename-payout-tos-modal
 delete mode 100644 changelog/fix-9585-rename-instant-payouts
 delete mode 100644 changelog/fix-9588-rename-payouts-error-messages
 delete mode 100644 changelog/fix-9636-custom-select-control-styling
 delete mode 100644 changelog/fix-9651-record-tracks-event-capital-view-offer-redirect
 delete mode 100644 changelog/fix-9654-remove-test-mode-subheader
 delete mode 100644 changelog/fix-9661-avoid-php-warning
 delete mode 100644 changelog/fix-9676-multi-currency-autoload
 delete mode 100644 changelog/fix-backwards-compat-mccy-instance
 delete mode 100644 changelog/fix-express-checkout-block-registering
 delete mode 100644 changelog/fix-omit-test-mode-badge-in-change-payment-form
 delete mode 100644 changelog/fix-payment-method-icon-alt-text
 delete mode 100644 changelog/fix-payout-rename-account-errors
 delete mode 100644 changelog/fix-pmme-appearance-checkout
 delete mode 100644 changelog/fix-saving-duplicate-3ds-cards
 delete mode 100644 changelog/fix-stripe-connect-breaks-underscore
 delete mode 100644 changelog/fix-woopay-duplicated-component
 delete mode 100644 changelog/gh-actions-e2e-optimize-composer-cache
 delete mode 100644 changelog/multi-currency-v2
 delete mode 100644 changelog/update-9417-ece-in-block-editor
 delete mode 100644 changelog/update-9524-deposit-payout-deposits-list
 delete mode 100644 changelog/update-9543-transactions-list-deposit-to-payout-rename
 delete mode 100644 changelog/update-9564-transaction-timeline-deposit-to-payout-rename
 delete mode 100644 changelog/update-9578-79-rename-deposit-overview-modal
 delete mode 100644 changelog/update-9581-rename-deposit-onboarding-tasklist
 delete mode 100644 changelog/update-9587-doc-url-payout-rename
 delete mode 100644 changelog/update-add-in-memory-cache-to-db-cache-to-deal-with-db-write-failures
 delete mode 100644 changelog/update-npm-readme-update-e2e-pw-snapshots
 delete mode 100644 changelog/update-order-success-lpm-icon
 delete mode 100644 changelog/update-payment-method-test-mode-label

diff --git a/changelog.txt b/changelog.txt
index 3e68c78c9f1..745c2fe24be 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,5 +1,39 @@
 *** WooPayments Changelog ***
 
+= 8.5.0 - 2024-11-13 =
+* Add - Add country-specific test card numbers for credit card testing
+* Add - Add risk level information to the fraud and risk box on the order details page.
+* Add - Add support for allowedShippingCountries in Express Checkout Element.
+* Fix - Avoid PHP warnings for requests with an empty path.
+* Fix - BNPL methods now work properly in Pay for Order when they are available. Default values are also provided when available.
+* Fix - fix: payment method icon alt text
+* Fix - Fix compatibility issues with CustomSelectControl component styles for WordPress 6.7
+* Fix - Fix duplicate saving of 3DS card entry after checkout
+* Fix - Fixed single product page view tracks when BNPL and PRB payment methods are inactive.
+* Fix - Fix PMME appearance in checkout
+* Fix - Fix settings display on the advanced fraud protection page.
+* Fix - Fix WooPay button preview in plugin settings.
+* Fix - Fix WooPay duplicated Save my info section.
+* Fix - Include missing scripts that handle refunds for non credit card payments in the order details page.
+* Fix - Introducing consistency in colors for deposits across pages
+* Fix - Prevent dead space on product pages when no BNPL offers are available.
+* Fix - Provide backwards-compatible method for retrieving the multi-currency instance.
+* Fix - Register Expresss Checkout block only when enabled in the settings
+* Fix - Remove unnecessary '.woocommerce-table' css overrides to fix WC Analytics styling and a11y issues
+* Fix - Use 'Withdrawal' and 'Deducted' labels when referring to withdrawal deposits, to more accurately communicate the type of transaction that has occurred
+* Update - Add in-memory cache fallback for our database-cached objects in case of database write failures.
+* Update - Decoupled Multi-currency module from gateway dependencies.
+* Update - Improvements to events during onboarding flow.
+* Update - Refactor loadStripe for Express Checkouts.
+* Update - Rename 'deposit' to 'payout' across various places in the WooPayments admin UI, docs and doc URLs.
+* Update - update: payment method "test mode" label at checkout to be displayed only when payment method is selected
+* Update - update: show LPM payment method icon on order success page
+* Update - Use preview versions of the actual ECE buttons in the Block editor.
+* Update - When tracking is enabled, send a tracks event when the merchant is redirected to a Stripe Capital offer.
+* Dev - Add Jest tests for the disputed order notices
+* Dev - Add unit tests for the Capital Loans page component.
+* Dev - Bump WC tested up to version to 9.4.0
+
 = 8.4.0 - 2024-10-23 =
 * Add - Add test mode badge to classic checkout and add payment method.
 * Add - Using Floating Labels with Stripe Appearance API for Blocks Checkout
diff --git a/changelog/9104-add-support-for-allowedshippingcountries-in-express-checkout-element b/changelog/9104-add-support-for-allowedshippingcountries-in-express-checkout-element
deleted file mode 100644
index 5eae7cb8972..00000000000
--- a/changelog/9104-add-support-for-allowedshippingcountries-in-express-checkout-element
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: minor
-Type: add
-
-Add support for allowedShippingCountries in Express Checkout Element.
diff --git a/changelog/9550-fix-single-product-page-view-tracks b/changelog/9550-fix-single-product-page-view-tracks
deleted file mode 100644
index 90e5ae60dff..00000000000
--- a/changelog/9550-fix-single-product-page-view-tracks
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: fix
-
-Fixed single product page view tracks when BNPL and PRB payment methods are inactive.
diff --git a/changelog/add-1225-flag-elevated-risk-transactions b/changelog/add-1225-flag-elevated-risk-transactions
deleted file mode 100644
index aaf4e54a8b6..00000000000
--- a/changelog/add-1225-flag-elevated-risk-transactions
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: minor
-Type: add
-
-Add risk level information to the fraud and risk box on the order details page.
diff --git a/changelog/add-9673-payouts-rename-notice b/changelog/add-9673-payouts-rename-notice
deleted file mode 100644
index 31a258dee71..00000000000
--- a/changelog/add-9673-payouts-rename-notice
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: add
-Comment: Added notice to indicate the rename of Deposits to Payouts. User facing changelog will be added as part of feature branch
-
-
diff --git a/changelog/add-country-specific-test-cards b/changelog/add-country-specific-test-cards
deleted file mode 100644
index 7d7ff495c04..00000000000
--- a/changelog/add-country-specific-test-cards
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: minor
-Type: add
-
-Add country-specific test card numbers for credit card testing
diff --git a/changelog/as-improve-stripe-for-ece b/changelog/as-improve-stripe-for-ece
deleted file mode 100644
index e7399403864..00000000000
--- a/changelog/as-improve-stripe-for-ece
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: minor
-Type: update
-
-Refactor loadStripe for Express Checkouts.
diff --git a/changelog/chore-affirm-remove-unused-multicurrency-import b/changelog/chore-affirm-remove-unused-multicurrency-import
deleted file mode 100644
index 69a52e74fb6..00000000000
--- a/changelog/chore-affirm-remove-unused-multicurrency-import
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: fix
-Comment: Removing unused import.
-
-
diff --git a/changelog/dev-1-9601-rename-deposit-dev-docs b/changelog/dev-1-9601-rename-deposit-dev-docs
deleted file mode 100644
index bd7141bb971..00000000000
--- a/changelog/dev-1-9601-rename-deposit-dev-docs
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: dev
-Comment: Rename 'deposit' to 'payout' within the developer doc description texts. The change is a part of a larger renaming project.
-
-
diff --git a/changelog/dev-add-unit-tests-for-capital-list b/changelog/dev-add-unit-tests-for-capital-list
deleted file mode 100644
index a99e92e7bbe..00000000000
--- a/changelog/dev-add-unit-tests-for-capital-list
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: dev
-
-Add unit tests for the Capital Loans page component.
diff --git a/changelog/dev-add-unit-tests-for-diputed-order-notice b/changelog/dev-add-unit-tests-for-diputed-order-notice
deleted file mode 100644
index 8d88338d894..00000000000
--- a/changelog/dev-add-unit-tests-for-diputed-order-notice
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: dev
-
-Add Jest tests for the disputed order notices
diff --git a/changelog/dev-bump-wc-version-9.4 b/changelog/dev-bump-wc-version-9.4
deleted file mode 100644
index e56d8ba7357..00000000000
--- a/changelog/dev-bump-wc-version-9.4
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: minor
-Type: dev
-
-Bump WC tested up to version to 9.4.0
diff --git a/changelog/dev-readd-tracking-event b/changelog/dev-readd-tracking-event
deleted file mode 100644
index 475904c11b2..00000000000
--- a/changelog/dev-readd-tracking-event
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: minor
-Type: update
-
-Improvements to events during onboarding flow.
diff --git a/changelog/feature-deposits-payouts-rename b/changelog/feature-deposits-payouts-rename
deleted file mode 100644
index cd080e4557b..00000000000
--- a/changelog/feature-deposits-payouts-rename
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: minor
-Type: update
-
-Rename 'deposit' to 'payout' across various places in the WooPayments admin UI, docs and doc URLs.
diff --git a/changelog/fix-7761-align-deposit-colors b/changelog/fix-7761-align-deposit-colors
deleted file mode 100644
index b9ae9ac792c..00000000000
--- a/changelog/fix-7761-align-deposit-colors
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: fix
-
-Introducing consistency in colors for deposits across pages
diff --git a/changelog/fix-7802-deposit-withdrawal-text-changes b/changelog/fix-7802-deposit-withdrawal-text-changes
deleted file mode 100644
index cf32df2a4f7..00000000000
--- a/changelog/fix-7802-deposit-withdrawal-text-changes
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: fix
-
-Use 'Withdrawal' and 'Deducted' labels when referring to withdrawal deposits, to more accurately communicate the type of transaction that has occurred
diff --git a/changelog/fix-8254-bnpl-pay-for-order b/changelog/fix-8254-bnpl-pay-for-order
deleted file mode 100644
index 77c05e9e0b1..00000000000
--- a/changelog/fix-8254-bnpl-pay-for-order
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: minor
-Type: fix
-
-BNPL methods now work properly in Pay for Order when they are available. Default values are also provided when available.
diff --git a/changelog/fix-8423-klarna-cant-undo-manual-refunds-and-process-refunds-again-via-woopayments b/changelog/fix-8423-klarna-cant-undo-manual-refunds-and-process-refunds-again-via-woopayments
deleted file mode 100644
index 8cd309f823c..00000000000
--- a/changelog/fix-8423-klarna-cant-undo-manual-refunds-and-process-refunds-again-via-woopayments
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: fix
-
-Include missing scripts that handle refunds for non credit card payments in the order details page.
diff --git a/changelog/fix-9271-hide-stripe-duplicates-warning-when-disabled b/changelog/fix-9271-hide-stripe-duplicates-warning-when-disabled
deleted file mode 100644
index 46e04c54622..00000000000
--- a/changelog/fix-9271-hide-stripe-duplicates-warning-when-disabled
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: fix
-Comment: Small change affecting Stripe Gateway settings notices
-
-
diff --git a/changelog/fix-9456-bnpl-respect-limits-per-currency b/changelog/fix-9456-bnpl-respect-limits-per-currency
deleted file mode 100644
index be78120fabc..00000000000
--- a/changelog/fix-9456-bnpl-respect-limits-per-currency
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: fix
-
-Prevent dead space on product pages when no BNPL offers are available.
diff --git a/changelog/fix-9520-advanced-fraud-protection-settings b/changelog/fix-9520-advanced-fraud-protection-settings
deleted file mode 100644
index b08dee60572..00000000000
--- a/changelog/fix-9520-advanced-fraud-protection-settings
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: fix
-
-Fix settings display on the advanced fraud protection page.
diff --git a/changelog/fix-9525-menu-url-payouts-rename b/changelog/fix-9525-menu-url-payouts-rename
deleted file mode 100644
index 51956b98d3b..00000000000
--- a/changelog/fix-9525-menu-url-payouts-rename
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: dev
-Comment: Part of feature Renaming deposits to payouts
-
-
diff --git a/changelog/fix-9527-payouts-rename-settings b/changelog/fix-9527-payouts-rename-settings
deleted file mode 100644
index 7690c2fee06..00000000000
--- a/changelog/fix-9527-payouts-rename-settings
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: dev
-Comment: Payouts rename: Settings page, part of a larger change
-
-
diff --git a/changelog/fix-9537-woopay-button-size-preview b/changelog/fix-9537-woopay-button-size-preview
deleted file mode 100644
index 85348741475..00000000000
--- a/changelog/fix-9537-woopay-button-size-preview
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: fix
-
-Fix WooPay button preview in plugin settings.
diff --git a/changelog/fix-9542-rename-payouts-instant-depost-modal-flow b/changelog/fix-9542-rename-payouts-instant-depost-modal-flow
deleted file mode 100644
index 5d97529f78a..00000000000
--- a/changelog/fix-9542-rename-payouts-instant-depost-modal-flow
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: dev
-Comment: Part of a larger change - renaming deposit to payout; this PR fixes instant payout modal + button
-
-
diff --git a/changelog/fix-9572-woococommerce-table-specificity b/changelog/fix-9572-woococommerce-table-specificity
deleted file mode 100644
index de47974865b..00000000000
--- a/changelog/fix-9572-woococommerce-table-specificity
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: fix
-
-Remove unnecessary '.woocommerce-table' css overrides to fix WC Analytics styling and a11y issues
diff --git a/changelog/fix-9573-rename-payout-tos-modal b/changelog/fix-9573-rename-payout-tos-modal
deleted file mode 100644
index 839d4364380..00000000000
--- a/changelog/fix-9573-rename-payout-tos-modal
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: dev
-Comment: Rename Deposit to Payout in TOS modal. Changelog to be included in featture branch
-
-
diff --git a/changelog/fix-9585-rename-instant-payouts b/changelog/fix-9585-rename-instant-payouts
deleted file mode 100644
index 029812b1b97..00000000000
--- a/changelog/fix-9585-rename-instant-payouts
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: update
-Comment: Renamed instant deposit to instant payout. Main changelog will be part of feature branch
-
-
diff --git a/changelog/fix-9588-rename-payouts-error-messages b/changelog/fix-9588-rename-payouts-error-messages
deleted file mode 100644
index c20e31649e1..00000000000
--- a/changelog/fix-9588-rename-payouts-error-messages
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: update
-Comment: Updated the payouts component error notices. User facing changelog will be on the feature branch.
-
-
diff --git a/changelog/fix-9636-custom-select-control-styling b/changelog/fix-9636-custom-select-control-styling
deleted file mode 100644
index a6ff4559ef7..00000000000
--- a/changelog/fix-9636-custom-select-control-styling
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: fix
-
-Fix compatibility issues with CustomSelectControl component styles for WordPress 6.7
diff --git a/changelog/fix-9651-record-tracks-event-capital-view-offer-redirect b/changelog/fix-9651-record-tracks-event-capital-view-offer-redirect
deleted file mode 100644
index 57b1e4a1a7d..00000000000
--- a/changelog/fix-9651-record-tracks-event-capital-view-offer-redirect
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: update
-
-When tracking is enabled, send a tracks event when the merchant is redirected to a Stripe Capital offer.
-
diff --git a/changelog/fix-9654-remove-test-mode-subheader b/changelog/fix-9654-remove-test-mode-subheader
deleted file mode 100644
index adf27b737ea..00000000000
--- a/changelog/fix-9654-remove-test-mode-subheader
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: fix
-Comment: Small text change.
-
-
diff --git a/changelog/fix-9661-avoid-php-warning b/changelog/fix-9661-avoid-php-warning
deleted file mode 100644
index 8e08f906189..00000000000
--- a/changelog/fix-9661-avoid-php-warning
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: fix
-
-Avoid PHP warnings for requests with an empty path.
diff --git a/changelog/fix-9676-multi-currency-autoload b/changelog/fix-9676-multi-currency-autoload
deleted file mode 100644
index 04e7fcfbc58..00000000000
--- a/changelog/fix-9676-multi-currency-autoload
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: fix
-Comment: Keep multi-currency module in the same path to avoid autoload errors.
-
-
diff --git a/changelog/fix-backwards-compat-mccy-instance b/changelog/fix-backwards-compat-mccy-instance
deleted file mode 100644
index 95a0701ac1c..00000000000
--- a/changelog/fix-backwards-compat-mccy-instance
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: minor
-Type: fix
-
-Provide backwards-compatible method for retrieving the multi-currency instance.
diff --git a/changelog/fix-express-checkout-block-registering b/changelog/fix-express-checkout-block-registering
deleted file mode 100644
index 790b8a27a45..00000000000
--- a/changelog/fix-express-checkout-block-registering
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: minor
-Type: fix
-
-Register Expresss Checkout block only when enabled in the settings
diff --git a/changelog/fix-omit-test-mode-badge-in-change-payment-form b/changelog/fix-omit-test-mode-badge-in-change-payment-form
deleted file mode 100644
index eff6afc6766..00000000000
--- a/changelog/fix-omit-test-mode-badge-in-change-payment-form
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: minor
-Type: fix
-
-Omit the test mode badge in the change payment method form for subscriptions.
diff --git a/changelog/fix-payment-method-icon-alt-text b/changelog/fix-payment-method-icon-alt-text
deleted file mode 100644
index 9da0ead5e11..00000000000
--- a/changelog/fix-payment-method-icon-alt-text
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: fix
-
-fix: payment method icon alt text
diff --git a/changelog/fix-payout-rename-account-errors b/changelog/fix-payout-rename-account-errors
deleted file mode 100644
index 5d661f369d7..00000000000
--- a/changelog/fix-payout-rename-account-errors
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: dev
-Comment: Renamed deposit to Payout in account error messages. Main changelog will be added on feature branch.
-
-
diff --git a/changelog/fix-pmme-appearance-checkout b/changelog/fix-pmme-appearance-checkout
deleted file mode 100644
index 4fc63e58c52..00000000000
--- a/changelog/fix-pmme-appearance-checkout
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: fix
-
-Fix PMME appearance in checkout
diff --git a/changelog/fix-saving-duplicate-3ds-cards b/changelog/fix-saving-duplicate-3ds-cards
deleted file mode 100644
index ee077e3e5e4..00000000000
--- a/changelog/fix-saving-duplicate-3ds-cards
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: fix
-
-Fix duplicate saving of 3DS card entry after checkout
diff --git a/changelog/fix-stripe-connect-breaks-underscore b/changelog/fix-stripe-connect-breaks-underscore
deleted file mode 100644
index 9662fc9bd30..00000000000
--- a/changelog/fix-stripe-connect-breaks-underscore
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: fix
-Comment: Change the way we load an external lib to avoid issues with underscore.
-
-
diff --git a/changelog/fix-woopay-duplicated-component b/changelog/fix-woopay-duplicated-component
deleted file mode 100644
index a5735f338c3..00000000000
--- a/changelog/fix-woopay-duplicated-component
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: fix
-
-Fix WooPay duplicated Save my info section.
diff --git a/changelog/gh-actions-e2e-optimize-composer-cache b/changelog/gh-actions-e2e-optimize-composer-cache
deleted file mode 100644
index 1e618c2233a..00000000000
--- a/changelog/gh-actions-e2e-optimize-composer-cache
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: dev
-Comment: Updates gh actions cache-key for composer dependencies.
-
-
diff --git a/changelog/multi-currency-v2 b/changelog/multi-currency-v2
deleted file mode 100644
index 463f61c882e..00000000000
--- a/changelog/multi-currency-v2
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: minor
-Type: update
-
-Decoupled Multi-currency module from gateway dependencies.
diff --git a/changelog/update-9417-ece-in-block-editor b/changelog/update-9417-ece-in-block-editor
deleted file mode 100644
index 95543271c69..00000000000
--- a/changelog/update-9417-ece-in-block-editor
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: update
-
-Use preview versions of the actual ECE buttons in the Block editor.
diff --git a/changelog/update-9524-deposit-payout-deposits-list b/changelog/update-9524-deposit-payout-deposits-list
deleted file mode 100644
index e25a0d70f23..00000000000
--- a/changelog/update-9524-deposit-payout-deposits-list
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: dev
-Comment: Change deposit to payout in deposits list page.
-
-
diff --git a/changelog/update-9543-transactions-list-deposit-to-payout-rename b/changelog/update-9543-transactions-list-deposit-to-payout-rename
deleted file mode 100644
index 72b9c3ffa67..00000000000
--- a/changelog/update-9543-transactions-list-deposit-to-payout-rename
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: update
-Comment: Update 'deposit' to 'payout' in UI labels of the transaction list. This PR is a part of a project doing this rename across all parts of the UI.
-
-
diff --git a/changelog/update-9564-transaction-timeline-deposit-to-payout-rename b/changelog/update-9564-transaction-timeline-deposit-to-payout-rename
deleted file mode 100644
index d143380b730..00000000000
--- a/changelog/update-9564-transaction-timeline-deposit-to-payout-rename
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: update
-Comment: Part of a larger change to change 'deposit' to 'payout'. This PR specificially changes it for the transaction details timeline.
-
-
diff --git a/changelog/update-9578-79-rename-deposit-overview-modal b/changelog/update-9578-79-rename-deposit-overview-modal
deleted file mode 100644
index 0eca2ef1120..00000000000
--- a/changelog/update-9578-79-rename-deposit-overview-modal
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: update
-Comment: Rename 'deposit' to 'payout' in modals within 'Overview' section. PR is a part of a larger renaming project.
-
-
diff --git a/changelog/update-9581-rename-deposit-onboarding-tasklist b/changelog/update-9581-rename-deposit-onboarding-tasklist
deleted file mode 100644
index a6f4c688343..00000000000
--- a/changelog/update-9581-rename-deposit-onboarding-tasklist
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: update
-Comment: Rename 'deposit' to 'payout' within the onboarding tasklist section. The change is a part of a larger project of doing this rename across the codebase.
-
-
diff --git a/changelog/update-9587-doc-url-payout-rename b/changelog/update-9587-doc-url-payout-rename
deleted file mode 100644
index 62933e0a818..00000000000
--- a/changelog/update-9587-doc-url-payout-rename
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: update
-Comment: Update 'deposit' to 'payout' in URLs of WooPayments docs occuring across the codebase. Part of a larger renaming project.
-
-
diff --git a/changelog/update-add-in-memory-cache-to-db-cache-to-deal-with-db-write-failures b/changelog/update-add-in-memory-cache-to-db-cache-to-deal-with-db-write-failures
deleted file mode 100644
index 26888ab5582..00000000000
--- a/changelog/update-add-in-memory-cache-to-db-cache-to-deal-with-db-write-failures
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: update
-
-Add in-memory cache fallback for our database-cached objects in case of database write failures.
diff --git a/changelog/update-npm-readme-update-e2e-pw-snapshots b/changelog/update-npm-readme-update-e2e-pw-snapshots
deleted file mode 100644
index 3927f45ec0d..00000000000
--- a/changelog/update-npm-readme-update-e2e-pw-snapshots
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: dev
-Comment: Not user-facing.
-
-
diff --git a/changelog/update-order-success-lpm-icon b/changelog/update-order-success-lpm-icon
deleted file mode 100644
index d0f4ac443af..00000000000
--- a/changelog/update-order-success-lpm-icon
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: update
-
-update: show LPM payment method icon on order success page
diff --git a/changelog/update-payment-method-test-mode-label b/changelog/update-payment-method-test-mode-label
deleted file mode 100644
index 1c3874ebf5f..00000000000
--- a/changelog/update-payment-method-test-mode-label
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: update
-
-update: payment method "test mode" label at checkout to be displayed only when payment method is selected
diff --git a/package-lock.json b/package-lock.json
index 6448e3e2941..866b3bae7b8 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "woocommerce-payments",
-  "version": "8.4.0",
+  "version": "8.5.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "woocommerce-payments",
-      "version": "8.4.0",
+      "version": "8.5.0",
       "hasInstallScript": true,
       "license": "GPL-3.0-or-later",
       "dependencies": {
diff --git a/package.json b/package.json
index 925549badb1..ba36d21ebc4 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "woocommerce-payments",
-  "version": "8.4.0",
+  "version": "8.5.0",
   "main": "webpack.config.js",
   "author": "Automattic",
   "license": "GPL-3.0-or-later",
diff --git a/readme.txt b/readme.txt
index e38951cde3b..4895ac1c90a 100644
--- a/readme.txt
+++ b/readme.txt
@@ -4,7 +4,7 @@ Tags: woocommerce payments, apple pay, credit card, google pay, payment, payment
 Requires at least: 6.0
 Tested up to: 6.6
 Requires PHP: 7.3
-Stable tag: 8.4.0
+Stable tag: 8.5.0
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
@@ -94,6 +94,40 @@ Please note that our support for the checkout block is still experimental and th
 
 == Changelog ==
 
+= 8.5.0 - 2024-11-13 =
+* Add - Add country-specific test card numbers for credit card testing
+* Add - Add risk level information to the fraud and risk box on the order details page.
+* Add - Add support for allowedShippingCountries in Express Checkout Element.
+* Fix - Avoid PHP warnings for requests with an empty path.
+* Fix - BNPL methods now work properly in Pay for Order when they are available. Default values are also provided when available.
+* Fix - fix: payment method icon alt text
+* Fix - Fix compatibility issues with CustomSelectControl component styles for WordPress 6.7
+* Fix - Fix duplicate saving of 3DS card entry after checkout
+* Fix - Fixed single product page view tracks when BNPL and PRB payment methods are inactive.
+* Fix - Fix PMME appearance in checkout
+* Fix - Fix settings display on the advanced fraud protection page.
+* Fix - Fix WooPay button preview in plugin settings.
+* Fix - Fix WooPay duplicated Save my info section.
+* Fix - Include missing scripts that handle refunds for non credit card payments in the order details page.
+* Fix - Introducing consistency in colors for deposits across pages
+* Fix - Prevent dead space on product pages when no BNPL offers are available.
+* Fix - Provide backwards-compatible method for retrieving the multi-currency instance.
+* Fix - Register Expresss Checkout block only when enabled in the settings
+* Fix - Remove unnecessary '.woocommerce-table' css overrides to fix WC Analytics styling and a11y issues
+* Fix - Use 'Withdrawal' and 'Deducted' labels when referring to withdrawal deposits, to more accurately communicate the type of transaction that has occurred
+* Update - Add in-memory cache fallback for our database-cached objects in case of database write failures.
+* Update - Decoupled Multi-currency module from gateway dependencies.
+* Update - Improvements to events during onboarding flow.
+* Update - Refactor loadStripe for Express Checkouts.
+* Update - Rename 'deposit' to 'payout' across various places in the WooPayments admin UI, docs and doc URLs.
+* Update - update: payment method "test mode" label at checkout to be displayed only when payment method is selected
+* Update - update: show LPM payment method icon on order success page
+* Update - Use preview versions of the actual ECE buttons in the Block editor.
+* Update - When tracking is enabled, send a tracks event when the merchant is redirected to a Stripe Capital offer.
+* Dev - Add Jest tests for the disputed order notices
+* Dev - Add unit tests for the Capital Loans page component.
+* Dev - Bump WC tested up to version to 9.4.0
+
 = 8.4.0 - 2024-10-23 =
 * Add - Add test mode badge to classic checkout and add payment method.
 * Add - Using Floating Labels with Stripe Appearance API for Blocks Checkout
diff --git a/woocommerce-payments.php b/woocommerce-payments.php
index 23367190fcd..506001dfd88 100644
--- a/woocommerce-payments.php
+++ b/woocommerce-payments.php
@@ -11,7 +11,7 @@
  * WC tested up to: 9.4.0
  * Requires at least: 6.0
  * Requires PHP: 7.3
- * Version: 8.4.0
+ * Version: 8.5.0
  * Requires Plugins: woocommerce
  *
  * @package WooCommerce\Payments

From 747001c1f409e63abf6aa2d8b6765b26d7efe862 Mon Sep 17 00:00:00 2001
From: Nagesh Pai <4162931+nagpai@users.noreply.github.com>
Date: Mon, 11 Nov 2024 12:25:39 +0530
Subject: [PATCH 41/45] Fix e2e test for 8.5.0 release (#9694)

Co-authored-by: Nagesh Pai <nagesh.pai@automattic.com>
---
 changelog/fix-e2e-test-8.5.0-release                         | 5 +++++
 .../e2e/specs/wcpay/merchant/merchant-admin-deposits.spec.js | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 changelog/fix-e2e-test-8.5.0-release

diff --git a/changelog/fix-e2e-test-8.5.0-release b/changelog/fix-e2e-test-8.5.0-release
new file mode 100644
index 00000000000..4ea2bca263c
--- /dev/null
+++ b/changelog/fix-e2e-test-8.5.0-release
@@ -0,0 +1,5 @@
+Significance: patch
+Type: fix
+Comment: Update string in E2E test - `Deposit` to `Payout`
+
+
diff --git a/tests/e2e/specs/wcpay/merchant/merchant-admin-deposits.spec.js b/tests/e2e/specs/wcpay/merchant/merchant-admin-deposits.spec.js
index 47a7c18363d..9363910e44b 100644
--- a/tests/e2e/specs/wcpay/merchant/merchant-admin-deposits.spec.js
+++ b/tests/e2e/specs/wcpay/merchant/merchant-admin-deposits.spec.js
@@ -16,7 +16,7 @@ describe( 'Admin deposits', () => {
 	it( 'page should load without any errors', async () => {
 		await merchantWCP.openDeposits();
 		await expect( page ).toMatchElement( 'h2', {
-			text: 'Deposit history',
+			text: 'Payout history',
 		} );
 		await takeScreenshot( 'merchant-admin-deposits' );
 	} );

From 4e466f87aedc6433031abcfcbeec28cff9d7892a Mon Sep 17 00:00:00 2001
From: Nagesh Pai <4162931+nagpai@users.noreply.github.com>
Date: Mon, 11 Nov 2024 12:25:39 +0530
Subject: [PATCH 42/45] Fix e2e test for 8.5.0 release (#9694)

Co-authored-by: Nagesh Pai <nagesh.pai@automattic.com>
---
 changelog/fix-e2e-test-8.5.0-release                         | 5 +++++
 .../e2e/specs/wcpay/merchant/merchant-admin-deposits.spec.js | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 changelog/fix-e2e-test-8.5.0-release

diff --git a/changelog/fix-e2e-test-8.5.0-release b/changelog/fix-e2e-test-8.5.0-release
new file mode 100644
index 00000000000..4ea2bca263c
--- /dev/null
+++ b/changelog/fix-e2e-test-8.5.0-release
@@ -0,0 +1,5 @@
+Significance: patch
+Type: fix
+Comment: Update string in E2E test - `Deposit` to `Payout`
+
+
diff --git a/tests/e2e/specs/wcpay/merchant/merchant-admin-deposits.spec.js b/tests/e2e/specs/wcpay/merchant/merchant-admin-deposits.spec.js
index 47a7c18363d..9363910e44b 100644
--- a/tests/e2e/specs/wcpay/merchant/merchant-admin-deposits.spec.js
+++ b/tests/e2e/specs/wcpay/merchant/merchant-admin-deposits.spec.js
@@ -16,7 +16,7 @@ describe( 'Admin deposits', () => {
 	it( 'page should load without any errors', async () => {
 		await merchantWCP.openDeposits();
 		await expect( page ).toMatchElement( 'h2', {
-			text: 'Deposit history',
+			text: 'Payout history',
 		} );
 		await takeScreenshot( 'merchant-admin-deposits' );
 	} );

From e7af00a6878bb9ccb87c938dd0df64377b261f77 Mon Sep 17 00:00:00 2001
From: Nagesh Pai <4162931+nagpai@users.noreply.github.com>
Date: Mon, 11 Nov 2024 22:08:02 +0530
Subject: [PATCH 43/45] Payouts: Change spotlight notice illustration (#9701)

Co-authored-by: Nagesh Pai <nagesh.pai@automattic.com>
---
 .../fix-9700-payout-spotlight-illustration    |  5 ++
 .../deposits/rename-notice/header-image.svg   | 66 ++++++++++---------
 2 files changed, 41 insertions(+), 30 deletions(-)
 create mode 100644 changelog/fix-9700-payout-spotlight-illustration

diff --git a/changelog/fix-9700-payout-spotlight-illustration b/changelog/fix-9700-payout-spotlight-illustration
new file mode 100644
index 00000000000..6d218d3dd98
--- /dev/null
+++ b/changelog/fix-9700-payout-spotlight-illustration
@@ -0,0 +1,5 @@
+Significance: patch
+Type: fix
+Comment: Update the spotlight notice illustration for 'deposit' to 'payout' rename announcement.
+
+
diff --git a/client/deposits/rename-notice/header-image.svg b/client/deposits/rename-notice/header-image.svg
index 563468de2b4..8a96d1df244 100644
--- a/client/deposits/rename-notice/header-image.svg
+++ b/client/deposits/rename-notice/header-image.svg
@@ -1,30 +1,36 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="129" height="71" viewBox="0 0 129 71" fill="none">
-  <g clip-path="url(#clip0_2464_6097)">
-    <path d="M83.7082 0H2.10612C0.94168 0 0 1.08204 0 2.41689V52.2413C0 53.5761 0.94168 54.6582 2.10612 54.6582H83.7082C84.8727 54.6582 85.8144 53.5761 85.8144 52.2413V2.41689C85.8144 1.08204 84.8727 0 83.7082 0Z" fill="#E5E5E5" fill-opacity="0.5"/>
-    <path d="M52.1371 4.84375H5.12402V32.5318H52.1371V4.84375Z" fill="white"/>
-    <path d="M52.1371 36.9805H5.12402V40.894H52.1371V36.9805Z" fill="white"/>
-    <path d="M23.34 45.1406H5.12402V49.0542H23.3501V45.1406H23.34Z" fill="white"/>
-    <path d="M85.6621 48.8533C97.3889 48.8533 106.895 39.3591 106.895 27.6474C106.895 15.9356 97.3889 6.44141 85.6621 6.44141C73.9352 6.44141 64.4287 15.9356 64.4287 27.6474C64.4287 39.3591 73.9352 48.8533 85.6621 48.8533Z" fill="#271B3D"/>
-    <path d="M91.4241 30.3281L88.2852 33.463L123.846 68.2804L126.286 65.8433L91.4241 30.3281Z" fill="#271B3D"/>
-    <path d="M85.6324 45.609C95.5473 45.609 103.585 37.5817 103.585 27.6795C103.585 17.7773 95.5473 9.75 85.6324 9.75C75.7174 9.75 67.6797 17.7773 67.6797 27.6795C67.6797 37.5817 75.7174 45.609 85.6324 45.609Z" fill="#E0E0E0"/>
-    <path d="M109.457 47.1128L109.194 45.0903L108.212 44.1094L102.086 50.2274L103.068 51.2084L105.093 51.4713C105.964 53.332 109.781 59.5613 113.71 63.4749C118.51 68.2682 121.942 69.8356 125.324 70.9986L129.01 67.3176C127.845 63.94 126.286 60.5119 121.476 55.7185C117.558 51.805 111.32 47.9825 109.457 47.1128Z" fill="#BEA0F2"/>
-    <path d="M85.8038 20.6094C78.8475 20.6094 74.3416 25.342 71.9014 28.0219C74.3518 30.7017 78.8576 35.4343 85.8038 35.4343C92.7601 35.4343 97.266 30.7017 99.7062 28.0219C97.2558 25.342 92.7499 20.6094 85.8038 20.6094Z" fill="white"/>
-    <path d="M85.8035 33.4213C88.7898 33.4213 91.2106 31.0036 91.2106 28.0212C91.2106 25.0388 88.7898 22.6211 85.8035 22.6211C82.8173 22.6211 80.3965 25.0388 80.3965 28.0212C80.3965 31.0036 82.8173 33.4213 85.8035 33.4213Z" fill="#BEA0F2"/>
-    <path d="M85.8041 30.7204C87.2972 30.7204 88.5077 29.5115 88.5077 28.0204C88.5077 26.5292 87.2972 25.3203 85.8041 25.3203C84.311 25.3203 83.1006 26.5292 83.1006 28.0204C83.1006 29.5115 84.311 30.7204 85.8041 30.7204Z" fill="#271B3D"/>
-    <path d="M84.0626 27.3353C84.6553 27.3353 85.1359 26.8553 85.1359 26.2633C85.1359 25.6713 84.6553 25.1914 84.0626 25.1914C83.4698 25.1914 82.9893 25.6713 82.9893 26.2633C82.9893 26.8553 83.4698 27.3353 84.0626 27.3353Z" fill="white"/>
-    <path d="M54.1621 60.3615V57.0042L51.3775 56.6401C51.1244 55.4772 50.6688 54.385 50.041 53.4142L51.7522 51.1895L49.3727 48.813L47.145 50.522C46.173 49.8951 45.0794 49.4299 43.915 49.1872L43.5505 46.4062H40.1888L39.8242 49.1872C38.6598 49.44 37.5662 49.8951 36.5942 50.522L34.3666 48.813L31.987 51.1895L33.6983 53.4142C33.0705 54.385 32.6047 55.4772 32.3617 56.6401L29.5771 57.0042V60.3615L32.3617 60.7256C32.6148 61.8885 33.0705 62.9807 33.6983 63.9515L31.987 66.1762L34.3666 68.5527L36.5942 66.8437C37.5662 67.4706 38.6598 67.9358 39.8242 68.1785L40.1888 70.9594H43.5505L43.915 68.1785C45.0794 67.9257 46.173 67.4706 47.145 66.8437L49.3727 68.5527L51.7522 66.1762L50.041 63.9515C50.6688 62.9807 51.1345 61.8885 51.3775 60.7256L54.1621 60.3615ZM41.8595 62.1818C39.7837 62.1818 38.0928 60.5031 38.0928 58.4199C38.0928 56.3367 39.7736 54.6581 41.8595 54.6581C43.9454 54.6581 45.6262 56.3367 45.6262 58.4199C45.6262 60.5031 43.9454 62.1818 41.8595 62.1818Z" fill="#BEA0F2"/>
-    <path d="M8.03944 6.77344H7.97868C7.58378 6.77344 7.25977 7.08693 7.25977 7.48131V7.54199C7.25977 7.93638 7.58378 8.24987 7.97868 8.24987H8.03944C8.43433 8.24987 8.75835 7.93638 8.75835 7.54199V7.48131C8.75835 7.08693 8.43433 6.77344 8.03944 6.77344Z" fill="#271B3D"/>
-    <path d="M49.6146 6.77344H49.5539C49.159 6.77344 48.835 7.08693 48.835 7.48131V7.54199C48.835 7.93638 49.159 8.24987 49.5539 8.24987H49.6146C50.0095 8.24987 50.3335 7.93638 50.3335 7.54199V7.48131C50.3335 7.08693 50.0095 6.77344 49.6146 6.77344Z" fill="#271B3D"/>
-    <path d="M49.6146 29.1328H49.5539C49.159 29.1328 48.835 29.4463 48.835 29.8407V29.9014C48.835 30.2958 49.159 30.6092 49.5539 30.6092H49.6146C50.0095 30.6092 50.3335 30.2958 50.3335 29.9014V29.8407C50.3335 29.4463 50.0095 29.1328 49.6146 29.1328Z" fill="#271B3D"/>
-    <path d="M8.03944 29.1328H7.97868C7.58378 29.1328 7.25977 29.4463 7.25977 29.8407V29.9014C7.25977 30.2958 7.58378 30.6092 7.97868 30.6092H8.03944C8.43433 30.6092 8.75835 30.2958 8.75835 29.9014V29.8407C8.75835 29.4463 8.43433 29.1328 8.03944 29.1328Z" fill="#271B3D"/>
-    <path d="M49.5845 7.51172H8.00879V29.8705H49.5743V7.51172H49.5845Z" stroke="#271B3D" stroke-width="0.28" stroke-miterlimit="10"/>
-    <path d="M8.00879 7.51172L49.5845 29.8604" stroke="#271B3D" stroke-width="0.28" stroke-miterlimit="10"/>
-    <path d="M49.5845 7.51172L8.00879 29.8604" stroke="#271B3D" stroke-width="0.28" stroke-miterlimit="10"/>
-    <path d="M72.023 65.0044V63.4875L70.1295 62.9617L69.6232 61.7482L70.5851 60.0392L69.5118 58.9672L67.8006 59.9279L66.5855 59.4223L66.059 57.5312H64.5401L64.0136 59.4223L62.7985 59.9279L61.0873 58.9672L60.014 60.0392L60.9759 61.7482L60.4697 62.9617L58.5762 63.4875V65.0044L60.4697 65.5303L60.9759 66.7438L60.014 68.4528L61.0873 69.5247L62.7985 68.564L64.0136 69.0696L64.5401 70.9607H66.059L66.5855 69.0696L67.8006 68.564L69.5118 69.5247L70.5851 68.4528L69.6232 66.7438L70.1295 65.5303L72.023 65.0044ZM66.4539 65.4089C65.816 66.046 64.7629 66.046 64.125 65.4089C63.4871 64.7718 63.4871 63.7201 64.125 63.083C64.449 62.7594 64.8642 62.5976 65.2894 62.5976C65.7147 62.5976 66.1299 62.7594 66.4539 63.083C67.0918 63.7201 67.0918 64.7718 66.4539 65.4089Z" fill="#F2EDFF"/>
-  </g>
-  <defs>
-    <clipPath id="clip0_2464_6097">
-      <rect width="129" height="71" fill="white"/>
-    </clipPath>
-  </defs>
-</svg>
\ No newline at end of file
+<svg width="129" height="71" viewBox="0 0 129 71" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_3119_1917)">
+<rect width="129" height="71" fill="white"/>
+<path d="M27.2356 59.2594V55.5401L24.1509 55.1368C23.8704 53.8485 23.3657 52.6386 22.6702 51.5631L24.5659 49.0985L21.9298 46.4658L19.462 48.3591C18.3852 47.6645 17.1737 47.1492 15.8837 46.8803L15.4799 43.7995H11.7557L11.3519 46.8803C10.0619 47.1604 8.85046 47.6645 7.7736 48.3591L5.30579 46.4658L2.66972 49.0985L4.56545 51.5631C3.86997 52.6386 3.35398 53.8485 3.08476 55.1368L0 55.5401V59.2594L3.08476 59.6627C3.36519 60.9511 3.86997 62.161 4.56545 63.2364L2.66972 65.7011L5.30579 68.3337L7.7736 66.4404C8.85046 67.135 10.0619 67.6504 11.3519 67.9192L11.7557 71H15.4799L15.8837 67.9192C17.1737 67.6391 18.3852 67.135 19.462 66.4404L21.9298 68.3337L24.5659 65.7011L22.6702 63.2364C23.3657 62.161 23.8817 60.9511 24.1509 59.6627L27.2356 59.2594ZM13.6066 61.2759C11.3071 61.2759 9.43376 59.4163 9.43376 57.1085C9.43376 54.8007 11.2958 52.941 13.6066 52.941C15.9174 52.941 17.7794 54.8007 17.7794 57.1085C17.7794 59.4163 15.9174 61.2759 13.6066 61.2759Z" fill="#D1C1FF"/>
+<path d="M129 8.2789V6.59847L126.902 6.01592L126.341 4.67159L127.407 2.7783L126.218 1.59081L124.322 2.65507L122.976 2.09493L122.393 0H120.71L120.127 2.09493L118.781 2.65507L116.885 1.59081L115.696 2.7783L116.762 4.67159L116.201 6.01592L114.103 6.59847V8.2789L116.201 8.86145L116.762 10.2058L115.696 12.0991L116.885 13.2866L118.781 12.2223L120.127 12.7824L120.71 14.8774H122.393L122.976 12.7824L124.322 12.2223L126.218 13.2866L127.407 12.0991L126.341 10.2058L126.902 8.86145L129 8.2789ZM122.83 8.72701C122.124 9.43279 120.957 9.43279 120.25 8.72701C119.544 8.02123 119.544 6.85614 120.25 6.15036C120.609 5.79187 121.069 5.61262 121.54 5.61262C122.012 5.61262 122.472 5.79187 122.83 6.15036C123.537 6.85614 123.537 8.02123 122.83 8.72701Z" fill="#F2EDFF"/>
+<path d="M103.933 7.76855H24.6434C22.3987 7.76855 20.579 9.58828 20.579 11.833V37.8488C20.579 40.0936 22.3987 41.9133 24.6434 41.9133H103.933C106.177 41.9133 107.997 40.0936 107.997 37.8488V11.833C107.997 9.58828 106.177 7.76855 103.933 7.76855Z" fill="#F8F8F8"/>
+<path d="M40.3658 28.6785H36.5841V19.1239H40.3515C43.3454 19.1239 45.4225 21.0291 45.4225 23.894C45.4225 26.7876 43.3454 28.6785 40.3658 28.6785ZM40.3515 26.8879C42.2424 26.8879 43.3454 25.527 43.3454 23.894C43.3454 22.218 42.314 20.9145 40.3658 20.9145H38.6182V26.8879H40.3515ZM50.0747 28.8504C47.969 28.8504 46.379 27.4322 46.379 25.2119C46.379 23.2064 47.8687 21.5877 49.9601 21.5877C52.0372 21.5877 53.4267 23.1348 53.4267 25.3838V25.8135H48.2841C48.4131 26.6587 49.1007 27.3606 50.2753 27.3606C50.8626 27.3606 51.6648 27.1171 52.1088 26.6873L52.9254 27.8906C52.2378 28.5209 51.1491 28.8504 50.0747 28.8504ZM51.6791 24.5529C51.6218 23.894 51.1634 23.0775 49.9601 23.0775C48.8285 23.0775 48.3414 23.8654 48.2698 24.5529H51.6791ZM58.6944 28.8504C57.8779 28.8504 57.133 28.5066 56.56 27.7903V31.3142H54.7408V21.7596H56.56V22.6334C57.09 21.9602 57.8493 21.5877 58.6944 21.5877C60.4707 21.5877 61.7599 22.9056 61.7599 25.2119C61.7599 27.5182 60.4707 28.8504 58.6944 28.8504ZM58.1214 27.2317C59.1671 27.2317 59.8834 26.4152 59.8834 25.2119C59.8834 24.0229 59.1671 23.2064 58.1214 23.2064C57.5341 23.2064 56.8752 23.5359 56.56 23.9943V26.4295C56.8608 26.8735 57.5341 27.2317 58.1214 27.2317ZM66.3009 28.8504C64.0233 28.8504 62.6481 27.1744 62.6481 25.2119C62.6481 23.2494 64.0233 21.5877 66.3009 21.5877C68.5929 21.5877 69.9681 23.2494 69.9681 25.2119C69.9681 27.1744 68.5929 28.8504 66.3009 28.8504ZM66.3009 27.2317C67.4469 27.2317 68.0772 26.3006 68.0772 25.2119C68.0772 24.1375 67.4469 23.2064 66.3009 23.2064C65.1693 23.2064 64.539 24.1375 64.539 25.2119C64.539 26.3006 65.1693 27.2317 66.3009 27.2317ZM73.8242 28.8504C72.6209 28.8504 71.4606 28.4493 70.7301 27.776L71.5179 26.4581C72.0336 26.9452 73.0507 27.4179 73.9102 27.4179C74.698 27.4179 75.0705 27.1171 75.0705 26.6873C75.0705 25.5557 70.9736 26.4868 70.9736 23.7651C70.9736 22.6048 71.9763 21.5877 73.8099 21.5877C74.9702 21.5877 75.9013 21.9888 76.5889 22.5332L75.8583 23.8224C75.4429 23.3926 74.6551 23.0202 73.8099 23.0202C73.151 23.0202 72.7212 23.3067 72.7212 23.6935C72.7212 24.7105 76.8324 23.851 76.8324 26.6443C76.8324 27.9192 75.7437 28.8504 73.8242 28.8504ZM79.0608 21.0147C78.4735 21.0147 77.9864 20.5277 77.9864 19.9261C77.9864 19.3244 78.4735 18.8517 79.0608 18.8517C79.6624 18.8517 80.1495 19.3244 80.1495 19.9261C80.1495 20.5277 79.6624 21.0147 79.0608 21.0147ZM79.9776 28.6785H78.1583V21.7596H79.9776V28.6785ZM84.1021 28.8504C82.8272 28.8504 82.1539 28.1914 82.1539 26.9452V23.3497H81.008V21.7596H82.1539V19.8688H83.9732V21.7596H85.377V23.3497H83.9732V26.4581C83.9732 26.9022 84.2024 27.2317 84.6035 27.2317C84.8756 27.2317 85.1335 27.1314 85.2337 27.0168L85.6205 28.4063C85.3483 28.6498 84.8613 28.8504 84.1021 28.8504ZM89.1142 28.8504C87.9109 28.8504 86.7506 28.4493 86.02 27.776L86.8079 26.4581C87.3236 26.9452 88.3406 27.4179 89.2001 27.4179C89.988 27.4179 90.3604 27.1171 90.3604 26.6873C90.3604 25.5557 86.2636 26.4868 86.2636 23.7651C86.2636 22.6048 87.2663 21.5877 89.0998 21.5877C90.2601 21.5877 91.1913 21.9888 91.8788 22.5332L91.1483 23.8224C90.7329 23.3926 89.945 23.0202 89.0998 23.0202C88.4409 23.0202 88.0112 23.3067 88.0112 23.6935C88.0112 24.7105 92.1224 23.851 92.1224 26.6443C92.1224 27.9192 91.0337 28.8504 89.1142 28.8504Z" fill="#E0E0E0"/>
+<path d="M113.939 28.159L34.9515 21.6493C32.7149 21.465 30.7531 23.128 30.5688 25.3646L29.4832 38.5367L44.8958 56.7179L111.139 62.1772C113.375 62.3616 115.337 60.6985 115.521 58.4619L117.657 32.542C117.842 30.3054 116.179 28.3436 113.942 28.1593L113.939 28.159Z" fill="#D1C1FF"/>
+<path d="M42.2311 39.5872L29.4832 38.5366L44.8958 56.7178L45.9464 43.9699C46.1307 41.7333 44.4677 39.7715 42.2311 39.5872Z" fill="#B999FF"/>
+<path d="M49.3985 42.4675L47.3713 42.3004L48.156 32.7781L52.6102 33.1452C54.6803 33.3158 55.6928 34.8078 55.5552 36.4782C55.4187 38.1342 54.1613 39.4392 52.1055 39.2697L49.6785 39.0697L49.3985 42.4675ZM51.967 37.4617C52.7665 37.5276 53.4204 37.0928 53.4851 36.3076C53.551 35.5081 52.9771 34.9721 52.1776 34.9062L50.0362 34.7297L49.8256 37.2852L51.967 37.4617ZM62.5812 43.5539L60.7539 43.4033L60.8268 42.5182C60.2278 43.1588 59.4549 43.4688 58.6126 43.3993C56.8851 43.257 55.6657 41.8341 55.8563 39.5214C56.041 37.28 57.4531 36.0165 59.2091 36.1612C60.0228 36.2283 60.7512 36.6333 61.2492 37.393L61.3221 36.5079L63.1495 36.6585L62.5812 43.5539ZM59.3166 41.8332C59.9162 41.8826 60.5999 41.6084 60.9374 41.1762L61.1374 38.7493C60.8753 38.2677 60.2468 37.8709 59.6472 37.8215C58.605 37.7356 57.8241 38.4906 57.7265 39.6755C57.6276 40.8747 58.2744 41.7473 59.3166 41.8332ZM63.9295 46.3672L64.3195 44.7752C64.4706 44.8595 64.7098 44.9223 64.8811 44.9365C65.3522 44.9753 65.6769 44.8727 65.8788 44.5156L66.1852 43.9372L63.9624 36.7255L65.9039 36.8855L67.3074 41.8306L69.5159 37.1831L71.4574 37.3432L67.5555 45.0994C66.9345 46.3562 65.9925 46.6235 64.8052 46.5544C64.6054 46.5379 64.1378 46.4563 63.9295 46.3672ZM74.8823 44.7402C72.6124 44.5531 71.3795 42.7698 71.5407 40.814C71.7019 38.8581 73.2089 37.315 75.4788 37.5021C77.7631 37.6904 78.9971 39.4594 78.8359 41.4152C78.6747 43.3711 77.1665 44.9284 74.8823 44.7402ZM75.0153 43.127C76.1574 43.2211 76.862 42.3449 76.9514 41.2599C77.0397 40.1892 76.488 39.2095 75.3459 39.1153C74.2181 39.0224 73.5134 39.8986 73.4252 40.9693C73.3358 42.0543 73.8874 43.034 75.0153 43.127ZM86.3774 45.5151L84.5643 45.3656L84.6361 44.4948C84.1226 44.9699 83.251 45.4299 82.1232 45.3369C80.6099 45.2122 79.9643 44.3254 80.0749 42.9834L80.4785 38.0866L82.2916 38.2361L81.9469 42.419C81.868 43.3755 82.3418 43.7308 83.1127 43.7943C83.8123 43.852 84.4008 43.5124 84.7478 43.1385L85.1326 38.4702L86.9457 38.6196L86.3774 45.5151ZM90.4763 46.0254C89.2057 45.9206 88.5888 45.2086 88.6912 43.9666L88.9865 40.3832L87.8444 40.2891L87.975 38.7044L89.1171 38.7986L89.2724 36.9141L91.0855 37.0635L90.9302 38.948L92.3293 39.0633L92.1987 40.648L90.7996 40.5327L90.5443 43.6306C90.5078 44.0732 90.7092 44.4204 91.1089 44.4533C91.3802 44.4757 91.6454 44.3969 91.7547 44.2909L92.0261 45.7075C91.7348 45.9279 91.2329 46.0877 90.4763 46.0254ZM95.4714 46.437C94.2722 46.3382 93.1488 45.8432 92.476 45.1122L93.3694 43.8635C93.8434 44.3912 94.8182 44.9459 95.6748 45.0165C96.46 45.0812 96.8558 44.812 96.8911 44.3837C96.9841 43.2558 92.8246 43.8473 93.0481 41.1348C93.1434 39.9784 94.2263 39.0472 96.0537 39.1978C97.2101 39.2931 98.1051 39.7693 98.7456 40.3683L97.9117 41.5931C97.5329 41.1307 96.7783 40.6948 95.936 40.6254C95.2793 40.5713 94.8275 40.8215 94.7957 41.207C94.7122 42.2206 98.8801 41.7017 98.6507 44.4856C98.5459 45.7562 97.3845 46.5947 95.4714 46.437Z" fill="#1F0342"/>
+<path d="M109.377 46.4957C108.627 45.1975 108.99 43.4102 108.58 43.3001C108.169 43.1901 107.59 44.9194 106.292 45.669C104.993 46.4185 103.206 46.0555 103.096 46.4662C102.986 46.8768 104.715 47.4561 105.465 48.7543C106.214 50.0525 105.852 51.8398 106.262 51.9499C106.673 52.0599 107.252 50.3305 108.55 49.581C109.848 48.8315 111.636 49.1944 111.746 48.7838C111.856 48.3732 110.126 47.7939 109.377 46.4957Z" fill="white"/>
+<path d="M108.256 54.7088C107.419 55.1916 106.268 54.9578 106.197 55.2223C106.126 55.4868 107.24 55.8599 107.723 56.6962C108.206 57.5325 107.972 58.6838 108.237 58.7547C108.501 58.8256 108.874 57.7116 109.711 57.2288C110.547 56.7459 111.698 56.9797 111.769 56.7153C111.84 56.4508 110.726 56.0776 110.243 55.2413C109.76 54.405 109.994 53.2537 109.73 53.1828C109.465 53.1119 109.092 54.2259 108.256 54.7088Z" fill="white"/>
+<g clip-path="url(#clip1_3119_1917)">
+<rect width="129" height="71" fill="white"/>
+<path d="M24.375 13.8361V10.5074L21.6142 10.1465C21.3633 8.99347 20.9115 7.91065 20.2891 6.94813L21.9857 4.74238L19.6265 2.38623L17.4179 4.08065C16.4541 3.45903 15.3699 2.99782 14.2154 2.7572L13.854 0H10.521L10.1596 2.7572C9.0051 3.00785 7.92087 3.45903 6.95711 4.08065L4.74851 2.38623L2.38931 4.74238L4.08592 6.94813C3.4635 7.91065 3.0017 8.99347 2.76076 10.1465L0 10.5074V13.8361L2.76076 14.1971C3.01174 15.3501 3.4635 16.4329 4.08592 17.3954L2.38931 19.6012L4.74851 21.9573L6.95711 20.2629C7.92087 20.8845 9.0051 21.3457 10.1596 21.5863L10.521 24.3435H13.854L14.2154 21.5863C15.3699 21.3357 16.4541 20.8845 17.4179 20.2629L19.6265 21.9573L21.9857 19.6012L20.2891 17.3954C20.9115 16.4329 21.3733 15.3501 21.6142 14.1971L24.375 13.8361ZM12.1775 15.6408C10.1194 15.6408 8.4429 13.9765 8.4429 11.9111C8.4429 9.8457 10.1094 8.18135 12.1775 8.18135C14.2455 8.18135 15.912 9.8457 15.912 11.9111C15.912 13.9765 14.2455 15.6408 12.1775 15.6408Z" fill="#D1C1FF"/>
+<path d="M14.8966 36.3402V34.6598L12.799 34.0772L12.2381 32.7329L13.3037 30.8396L12.1147 29.6521L10.219 30.7164L8.8729 30.1562L8.28959 28.0613H6.607L6.0237 30.1562L4.67762 30.7164L2.7819 29.6521L1.59286 30.8396L2.65851 32.7329L2.09764 34.0772L0 34.6598V36.3402L2.09764 36.9228L2.65851 38.2671L1.59286 40.1604L2.7819 41.3479L4.67762 40.2836L6.0237 40.8438L6.607 42.9387H8.28959L8.8729 40.8438L10.219 40.2836L12.1147 41.3479L13.3037 40.1604L12.2381 38.2671L12.799 36.9228L14.8966 36.3402ZM8.72707 36.7883C8.02038 37.4941 6.85378 37.4941 6.14709 36.7883C5.4404 36.0826 5.4404 34.9175 6.14709 34.2117C6.50605 33.8532 6.96596 33.6739 7.43708 33.6739C7.90821 33.6739 8.36811 33.8532 8.72707 34.2117C9.43376 34.9175 9.43376 36.0826 8.72707 36.7883Z" fill="#F2EDFF"/>
+<path d="M105.733 34.3069H22.5597C20.205 34.3069 18.2961 36.2157 18.2961 38.5704V65.8604C18.2961 68.2151 20.205 70.124 22.5597 70.124H105.733C108.087 70.124 109.996 68.2151 109.996 65.8604V38.5704C109.996 36.2157 108.087 34.3069 105.733 34.3069Z" fill="#F6F7F7"/>
+<path d="M39.0521 56.7021H35.0852V46.6796H39.0371C42.1776 46.6796 44.3564 48.6781 44.3564 51.6833C44.3564 54.7186 42.1776 56.7021 39.0521 56.7021ZM39.0371 54.8238C41.0206 54.8238 42.1776 53.3963 42.1776 51.6833C42.1776 49.9252 41.0957 48.5578 39.0521 48.5578H37.2189V54.8238H39.0371ZM49.2366 56.8824C47.0277 56.8824 45.3598 55.3948 45.3598 53.0657C45.3598 50.9621 46.9225 49.2641 49.1164 49.2641C51.2952 49.2641 52.7527 50.8869 52.7527 53.2461V53.6969H47.3583C47.4935 54.5834 48.2148 55.3197 49.447 55.3197C50.063 55.3197 50.9045 55.0642 51.3703 54.6135L52.2268 55.8757C51.5056 56.5368 50.3636 56.8824 49.2366 56.8824ZM50.9195 52.3745C50.8594 51.6833 50.3786 50.8268 49.1164 50.8268C47.9293 50.8268 47.4184 51.6533 47.3433 52.3745H50.9195ZM58.2784 56.8824C57.4219 56.8824 56.6406 56.5218 56.0395 55.7705V59.467H54.1312V49.4444H56.0395V50.361C56.5955 49.6548 57.3919 49.2641 58.2784 49.2641C60.1417 49.2641 61.4941 50.6465 61.4941 53.0657C61.4941 55.485 60.1417 56.8824 58.2784 56.8824ZM57.6774 55.1845C58.7743 55.1845 59.5256 54.328 59.5256 53.0657C59.5256 51.8186 58.7743 50.9621 57.6774 50.9621C57.0613 50.9621 56.3701 51.3077 56.0395 51.7885V54.343C56.3551 54.8088 57.0613 55.1845 57.6774 55.1845ZM66.2575 56.8824C63.8684 56.8824 62.4258 55.1244 62.4258 53.0657C62.4258 51.0071 63.8684 49.2641 66.2575 49.2641C68.6618 49.2641 70.1043 51.0071 70.1043 53.0657C70.1043 55.1244 68.6618 56.8824 66.2575 56.8824ZM66.2575 55.1845C67.4596 55.1845 68.1208 54.2077 68.1208 53.0657C68.1208 51.9388 67.4596 50.9621 66.2575 50.9621C65.0705 50.9621 64.4093 51.9388 64.4093 53.0657C64.4093 54.2077 65.0705 55.1845 66.2575 55.1845ZM74.1493 56.8824C72.8871 56.8824 71.67 56.4617 70.9036 55.7555L71.7301 54.373C72.271 54.8839 73.3379 55.3798 74.2395 55.3798C75.0659 55.3798 75.4566 55.0642 75.4566 54.6135C75.4566 53.4264 71.1591 54.4031 71.1591 51.5481C71.1591 50.331 72.2109 49.2641 74.1343 49.2641C75.3514 49.2641 76.3281 49.6848 77.0494 50.2558L76.283 51.6082C75.8473 51.1574 75.0208 50.7667 74.1343 50.7667C73.4431 50.7667 72.9923 51.0672 72.9923 51.473C72.9923 52.5398 77.3048 51.6382 77.3048 54.5684C77.3048 55.9057 76.1628 56.8824 74.1493 56.8824ZM79.6424 48.663C79.0263 48.663 78.5154 48.1521 78.5154 47.521C78.5154 46.8899 79.0263 46.3941 79.6424 46.3941C80.2735 46.3941 80.7844 46.8899 80.7844 47.521C80.7844 48.1521 80.2735 48.663 79.6424 48.663ZM80.604 56.7021H78.6957V49.4444H80.604V56.7021ZM84.9306 56.8824C83.5932 56.8824 82.887 56.1912 82.887 54.8839V51.1123H81.6849V49.4444H82.887V47.4609H84.7953V49.4444H86.2679V51.1123H84.7953V54.373C84.7953 54.8389 85.0358 55.1845 85.4565 55.1845C85.742 55.1845 86.0125 55.0793 86.1177 54.9591L86.5234 56.4166C86.2379 56.6721 85.727 56.8824 84.9306 56.8824ZM90.1881 56.8824C88.9259 56.8824 87.7088 56.4617 86.9425 55.7555L87.7689 54.373C88.3099 54.8839 89.3767 55.3798 90.2783 55.3798C91.1048 55.3798 91.4954 55.0642 91.4954 54.6135C91.4954 53.4264 87.1979 54.4031 87.1979 51.5481C87.1979 50.331 88.2498 49.2641 90.1731 49.2641C91.3903 49.2641 92.367 49.6848 93.0882 50.2558L92.3219 51.6082C91.8861 51.1574 91.0597 50.7667 90.1731 50.7667C89.4819 50.7667 89.0311 51.0672 89.0311 51.473C89.0311 52.5398 93.3437 51.6382 93.3437 54.5684C93.3437 55.9057 92.2017 56.8824 90.1881 56.8824Z" fill="#DCDCDE"/>
+<path d="M121.582 12.3402C120.746 12.8231 119.594 12.5893 119.524 12.8538C119.453 13.1183 120.567 13.4914 121.05 14.3277C121.532 15.164 121.299 16.3153 121.563 16.3862C121.828 16.4571 122.201 15.3431 123.037 14.8603C123.873 14.3774 125.025 14.6112 125.095 14.3467C125.166 14.0822 124.052 13.7091 123.57 12.8728C123.087 12.0365 123.321 10.8852 123.056 10.8143C122.792 10.7434 122.418 11.8574 121.582 12.3402Z" fill="white"/>
+<path d="M32.8709 46.2217L115.162 58.0532C117.492 58.3882 119.652 56.7715 119.987 54.4413L121.96 40.7184L106.976 20.703L37.9631 10.7806C35.633 10.4455 33.4733 12.0623 33.1383 14.3924L29.2557 41.3964C28.9207 43.7266 30.5374 45.8862 32.8676 46.2213L32.8709 46.2217Z" fill="#D1C1FF"/>
+<path d="M108.679 38.8091L121.96 40.7186L106.976 20.7032L105.067 33.9842C104.732 36.3144 106.349 38.4741 108.679 38.8091Z" fill="#B999FF"/>
+<path d="M50.2983 35.4439L48.1863 35.1403L49.6126 25.2197L54.2531 25.8869C56.4097 26.197 57.3752 27.8235 57.125 29.5637C56.8769 31.289 55.4775 32.5755 53.3357 32.2676L50.8072 31.9041L50.2983 35.4439ZM53.3055 30.3657C54.1384 30.4854 54.8507 30.0717 54.9683 29.2536C55.0881 28.4207 54.5212 27.8231 53.6883 27.7033L51.4573 27.3826L51.0745 30.0449L53.3055 30.3657ZM64.0323 37.4186L62.1285 37.1448L62.2611 36.2227C61.5933 36.8553 60.7643 37.1309 59.8867 37.0047C58.0871 36.7459 56.9006 35.1787 57.247 32.7692C57.5827 30.4341 59.1415 29.2009 60.9709 29.4639C61.8187 29.5858 62.5557 30.0561 63.0288 30.8831L63.1614 29.961L65.0652 30.2347L64.0323 37.4186ZM60.7233 35.4095C61.348 35.4993 62.0814 35.2556 62.4621 34.8246L62.8257 32.2961C62.5818 31.7753 61.9489 31.3199 61.3242 31.2301C60.2385 31.074 59.3729 31.8149 59.1954 33.0494C59.0158 34.2987 59.6376 35.2534 60.7233 35.4095ZM65.2655 40.4498L65.7748 38.8076C65.9277 38.9055 66.1742 38.9865 66.3526 39.0122C66.8435 39.0827 67.1899 38.9959 67.424 38.6349L67.7815 38.0487L65.9121 30.3565L67.9348 30.6473L69.0904 35.9142L71.6978 31.1883L73.7206 31.4791L69.1425 39.3526C68.4125 40.6291 67.4093 40.8492 66.1705 40.7014C65.9623 40.6715 65.4779 40.5563 65.2655 40.4498ZM76.837 39.4417C74.4721 39.1017 73.2944 37.1562 73.5874 35.1186C73.8804 33.0809 75.5563 31.5609 77.9211 31.9009C80.3009 32.2431 81.4807 34.1737 81.1877 36.2113C80.8947 38.249 79.2167 39.7839 76.837 39.4417ZM77.0786 37.761C78.2685 37.9321 79.0619 37.0594 79.2244 35.929C79.3848 34.8135 78.8694 33.7527 77.6795 33.5816C76.5045 33.4127 75.7111 34.2853 75.5507 35.4008C75.3882 36.5312 75.9036 37.5921 77.0786 37.761ZM88.8237 40.9829L86.9348 40.7114L87.0652 39.8041C86.4974 40.269 85.5557 40.6952 84.3807 40.5263C82.8041 40.2996 82.1844 39.3301 82.3855 37.932L83.1189 32.8304L85.0079 33.102L84.3813 37.4599C84.238 38.4564 84.7115 38.8585 85.5147 38.9739C86.2435 39.0787 86.8813 38.7605 87.2684 38.3911L87.9677 33.5275L89.8566 33.7991L88.8237 40.9829ZM93.0831 41.7775C91.7594 41.5872 91.1587 40.8025 91.3447 39.5085L91.8815 35.7753L90.6916 35.6042L90.929 33.9533L92.1188 34.1244L92.4011 32.1611L94.29 32.4327L94.0078 34.3959L95.4654 34.6055L95.228 36.2565L93.7704 36.0469L93.3064 39.2744C93.2401 39.7355 93.4289 40.1118 93.8453 40.1717C94.1279 40.2123 94.4106 40.1467 94.5318 40.0427L94.726 41.5431C94.407 41.7553 93.8714 41.8908 93.0831 41.7775ZM98.2872 42.5257C97.0378 42.3461 95.8929 41.7564 95.2349 40.9483L96.2497 39.6976C96.7124 40.2803 97.6978 40.9229 98.5903 41.0512C99.4083 41.1688 99.8399 40.9121 99.9041 40.4659C100.073 39.2909 95.6802 39.6461 96.0865 36.8201C96.2597 35.6154 97.4527 34.7091 99.3565 34.9828C100.561 35.156 101.468 35.7114 102.101 36.3793L101.15 37.6088C100.783 37.1006 100.02 36.5963 99.1426 36.4701C98.4585 36.3718 97.9695 36.6051 97.9118 37.0066C97.7599 38.0627 102.157 37.784 101.74 40.6843C101.55 42.008 100.28 42.8123 98.2872 42.5257Z" fill="#1F0342"/>
+<path d="M128.297 21.4996C128.297 20.3971 129.186 19.3921 128.965 19.1711C128.744 18.95 127.739 19.8384 126.636 19.8384C125.534 19.8384 124.529 18.95 124.308 19.1711C124.087 19.3921 124.975 20.3971 124.975 21.4996C124.975 22.6021 124.087 23.607 124.308 23.828C124.529 24.0491 125.534 23.1607 126.636 23.1607C127.739 23.1607 128.744 24.0491 128.965 23.828C129.186 23.607 128.297 22.6021 128.297 21.4996Z" fill="#1F0342"/>
+<path d="M117.846 26.6674C118.273 25.928 119.257 25.5981 119.195 25.3643C119.132 25.1304 118.114 25.3371 117.375 24.9103C116.636 24.4834 116.306 23.4986 116.072 23.5612C115.838 23.6239 116.045 24.6418 115.618 25.3811C115.191 26.1204 114.206 26.4504 114.269 26.6842C114.331 26.918 115.349 26.7113 116.089 27.1382C116.828 27.565 117.158 28.5499 117.392 28.4872C117.626 28.4246 117.419 27.4067 117.846 26.6674Z" fill="#1F0342"/>
+<path d="M122.396 13.2412C121.734 11.6153 122.441 9.59992 121.982 9.40664C121.523 9.21335 120.575 11.1269 118.949 11.7888C117.323 12.4508 115.307 11.7439 115.114 12.2027C114.921 12.6614 116.834 13.61 117.496 15.2358C118.158 16.8617 117.451 18.8771 117.91 19.0703C118.369 19.2636 119.317 17.3501 120.943 16.6882C122.569 16.0262 124.585 16.7331 124.778 16.2743C124.971 15.8156 123.058 14.867 122.396 13.2412Z" fill="#1F0342"/>
+</g>
+</g>
+<defs>
+<clipPath id="clip0_3119_1917">
+<rect width="129" height="71" fill="white"/>
+</clipPath>
+<clipPath id="clip1_3119_1917">
+<rect width="129" height="71" fill="white"/>
+</clipPath>
+</defs>
+</svg>

From ebb14ddbbc9133339cf630d5f88ba41a752e9d01 Mon Sep 17 00:00:00 2001
From: botwoo <botwoo@users.noreply.github.com>
Date: Tue, 12 Nov 2024 03:01:47 +0000
Subject: [PATCH 44/45] Amend changelog entries for release 8.5.0

---
 changelog/fix-9700-payout-spotlight-illustration | 5 -----
 changelog/fix-e2e-test-8.5.0-release             | 5 -----
 2 files changed, 10 deletions(-)
 delete mode 100644 changelog/fix-9700-payout-spotlight-illustration
 delete mode 100644 changelog/fix-e2e-test-8.5.0-release

diff --git a/changelog/fix-9700-payout-spotlight-illustration b/changelog/fix-9700-payout-spotlight-illustration
deleted file mode 100644
index 6d218d3dd98..00000000000
--- a/changelog/fix-9700-payout-spotlight-illustration
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: fix
-Comment: Update the spotlight notice illustration for 'deposit' to 'payout' rename announcement.
-
-
diff --git a/changelog/fix-e2e-test-8.5.0-release b/changelog/fix-e2e-test-8.5.0-release
deleted file mode 100644
index 4ea2bca263c..00000000000
--- a/changelog/fix-e2e-test-8.5.0-release
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: fix
-Comment: Update string in E2E test - `Deposit` to `Payout`
-
-

From 3020129ac87f2783e43eb97836fe698ad98c1044 Mon Sep 17 00:00:00 2001
From: Nagesh Pai <nagesh.pai@automattic.com>
Date: Wed, 13 Nov 2024 10:25:03 +0530
Subject: [PATCH 45/45] Bump up WordPress version in readme

---
 readme.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/readme.txt b/readme.txt
index 4895ac1c90a..3ab2095536d 100644
--- a/readme.txt
+++ b/readme.txt
@@ -2,7 +2,7 @@
 Contributors: woocommerce, automattic
 Tags: woocommerce payments, apple pay, credit card, google pay, payment, payment gateway
 Requires at least: 6.0
-Tested up to: 6.6
+Tested up to: 6.7
 Requires PHP: 7.3
 Stable tag: 8.5.0
 License: GPLv2 or later