From d40911012f355a49e59bd43215ac16066b2aa2ee Mon Sep 17 00:00:00 2001
From: Taha Paksu <3295+tpaksu@users.noreply.github.com>
Date: Tue, 17 Dec 2024 09:31:20 +0100
Subject: [PATCH] Revert "Amend changelog entries for release 8.6.1" (#9978)

---
 changelog.txt                                 | 41 +----------
 changelog/8969-fallback-to-card-payment-type  |  5 ++
 .../add-2253-clickwrap-terms-and-conditions   |  4 ++
 .../add-6924-migrate-test-drive-capabilities  |  4 ++
 changelog/add-9690-recommended-pm             |  4 ++
 changelog/add-jetpack-config-callback         |  4 ++
 ...imit-woopay-themeing-to-shortcode-checkout |  5 ++
 .../add-pass-footer-header-styles-to-woopay   |  5 ++
 changelog/as-fix-ece-variable-subs            |  4 ++
 changelog/as-fix-ece-variable-subs-free-trial |  4 ++
 changelog/as-hk-address                       |  4 ++
 .../chore-prb-references-in-ece-docs-and-logs |  4 ++
 ...e-remove-ece-error-assignment-on-loaderror |  5 ++
 ...emove-tokenized-payment-request-references |  5 ++
 .../compat-9727-avoid-early-translations      |  4 ++
 changelog/dev-qit-auth-fix-take-2             |  4 ++
 ...nized-ece-product-page-base-implementation |  5 ++
 ...ndle-error-on-refund-during-manual-capture |  4 ++
 .../fix-7230-payments-details-mobile-view     |  4 ++
 ...ix-9421-auto-enable-woopay-in-sandbox-mode |  4 ++
 changelog/fix-9612-inquiry-order-note         |  4 ++
 ...ry-payment-activity-transaction-search-css |  4 ++
 .../fix-9787-woopay-enable-state-settings     |  4 ++
 ...-9806-ECE-subscription-checkout-signed-out |  4 ++
 ...x-9830-browser-error-on-dispute-submission |  4 ++
 changelog/fix-9889-log-level                  |  4 ++
 changelog/fix-add-payment-method-check        |  5 ++
 ...low-addresses-from-woo-supported-countries |  4 ++
 .../fix-change-woopay-theming-settings-copy   |  4 ++
 .../fix-php-8-compatibility-errors-warnings   |  5 ++
 .../fix-rounding-error-with-deposit-products  |  4 ++
 changelog/fix-skip-ssl-requirement-env-setup  |  4 ++
 changelog/fix-stripe-link-button              |  4 ++
 .../fix-tokenized-cart-error-notice-json      |  5 ++
 changelog/fix-upe-country-selection           |  4 ++
 changelog/fix-upe-theme-block                 |  4 ++
 changelog/fix-use-effect-console-warning      |  5 ++
 changelog/fix-use-type-is-in-filter           |  4 ++
 changelog/frosso-patch-1                      |  4 ++
 changelog/mobile-tpv-tracking-channel         |  4 ++
 changelog/replace-from-url-query              |  4 ++
 changelog/scope-payment-elements-selectors    |  4 ++
 changelog/test-instructions-item-color        |  4 ++
 .../update-1-5316-rename-bank-reference-id    |  4 ++
 changelog/update-7900-payout-notice           |  4 ++
 changelog/update-9910-transaction-id-label    |  5 ++
 .../update-9916-go-live-modal-and-notice      |  4 ++
 changelog/update-confirmation-modal-nox       |  4 ++
 changelog/update-jetpack-onboarding-flow      |  4 ++
 ...s-capabilities-to-onboarding-as-get-params |  4 ++
 changelog/update-server-container-name        |  5 ++
 changelog/update-to-standalone-jt             |  4 ++
 readme.txt                                    | 72 -------------------
 53 files changed, 217 insertions(+), 112 deletions(-)
 create mode 100644 changelog/8969-fallback-to-card-payment-type
 create mode 100644 changelog/add-2253-clickwrap-terms-and-conditions
 create mode 100644 changelog/add-6924-migrate-test-drive-capabilities
 create mode 100644 changelog/add-9690-recommended-pm
 create mode 100644 changelog/add-jetpack-config-callback
 create mode 100644 changelog/add-limit-woopay-themeing-to-shortcode-checkout
 create mode 100644 changelog/add-pass-footer-header-styles-to-woopay
 create mode 100644 changelog/as-fix-ece-variable-subs
 create mode 100644 changelog/as-fix-ece-variable-subs-free-trial
 create mode 100644 changelog/as-hk-address
 create mode 100644 changelog/chore-prb-references-in-ece-docs-and-logs
 create mode 100644 changelog/chore-remove-ece-error-assignment-on-loaderror
 create mode 100644 changelog/chore-remove-tokenized-payment-request-references
 create mode 100644 changelog/compat-9727-avoid-early-translations
 create mode 100644 changelog/dev-qit-auth-fix-take-2
 create mode 100644 changelog/feat-tokenized-ece-product-page-base-implementation
 create mode 100644 changelog/fix-5671-handle-error-on-refund-during-manual-capture
 create mode 100644 changelog/fix-7230-payments-details-mobile-view
 create mode 100644 changelog/fix-9421-auto-enable-woopay-in-sandbox-mode
 create mode 100644 changelog/fix-9612-inquiry-order-note
 create mode 100644 changelog/fix-9736-remove-temporary-payment-activity-transaction-search-css
 create mode 100644 changelog/fix-9787-woopay-enable-state-settings
 create mode 100644 changelog/fix-9806-ECE-subscription-checkout-signed-out
 create mode 100644 changelog/fix-9830-browser-error-on-dispute-submission
 create mode 100644 changelog/fix-9889-log-level
 create mode 100644 changelog/fix-add-payment-method-check
 create mode 100644 changelog/fix-allow-addresses-from-woo-supported-countries
 create mode 100644 changelog/fix-change-woopay-theming-settings-copy
 create mode 100644 changelog/fix-php-8-compatibility-errors-warnings
 create mode 100644 changelog/fix-rounding-error-with-deposit-products
 create mode 100644 changelog/fix-skip-ssl-requirement-env-setup
 create mode 100644 changelog/fix-stripe-link-button
 create mode 100644 changelog/fix-tokenized-cart-error-notice-json
 create mode 100644 changelog/fix-upe-country-selection
 create mode 100644 changelog/fix-upe-theme-block
 create mode 100644 changelog/fix-use-effect-console-warning
 create mode 100644 changelog/fix-use-type-is-in-filter
 create mode 100644 changelog/frosso-patch-1
 create mode 100644 changelog/mobile-tpv-tracking-channel
 create mode 100644 changelog/replace-from-url-query
 create mode 100644 changelog/scope-payment-elements-selectors
 create mode 100644 changelog/test-instructions-item-color
 create mode 100644 changelog/update-1-5316-rename-bank-reference-id
 create mode 100644 changelog/update-7900-payout-notice
 create mode 100644 changelog/update-9910-transaction-id-label
 create mode 100644 changelog/update-9916-go-live-modal-and-notice
 create mode 100644 changelog/update-confirmation-modal-nox
 create mode 100644 changelog/update-jetpack-onboarding-flow
 create mode 100644 changelog/update-pass-capabilities-to-onboarding-as-get-params
 create mode 100644 changelog/update-server-container-name
 create mode 100644 changelog/update-to-standalone-jt

diff --git a/changelog.txt b/changelog.txt
index 7661027758a..969e9401b6c 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,76 +1,37 @@
 *** WooPayments Changelog ***
 
-= 8.6.1 - 2024-12-17 =
+= 8.6.0 - 2024-12-04 =
 * Add - Add Bank reference key column in Payout reports. This will help reconcile WooPayments Payouts with bank statements.
-* Add - Clickwrap terms and conditions support on WooPay
 * Add - Display credit card brand icons on order received page.
-* Add - Implement gateway method to retrieve recommended payment method.
-* Add - Migrate active capabilities from test-drive account when switching to live account.
-* Fix - Added conditional use of Jetpack Config callback to avoid i18n notices.
 * Fix - Add support to load stripe js asynchronously when it is not immediately available in the global scope.
 * Fix - Add the missing "Download" column heading label and toggle menu option to the Payments → Documents list view table.
-* Fix - Browser error no longer shows after dispute evidence submission
-* Fix - Ceil product prices after applying currency conversion, but before charm pricing and price rounding from settings is applied.
-* Fix - Checkout: Fix error when wc_address_i18n_params does not have data for a given country
-* Fix - Consider WooPay eligibility when retrieving WooPay enable state in the settings.
-* Fix - Enable ECE for Virtual Variable Subscriptions with Free Trials.
 * Fix - Ensure ECE button load events are triggered for multiple buttons on the same page.
 * Fix - Ensure ECE is displayed correctly taking into account the tax settings.
-* Fix - Ensure ECE login confirmation dialog is shown on Blocks.
-* Fix - Ensure WooPay 'enabled by default' value is correctly set in sandbox mode.
-* Fix - Errors were incorrectly marked as info in logs.
 * Fix - Evidence submission is no longer available for Klarna inquiries as this is not supported by Stripe / Klarna.
 * Fix - fix: express checkout to use its own css files.
 * Fix - fix: missing ece is_product_page checks
-* Fix - fix: undefined $cart_contains_subscription
 * Fix - Fix ECE Tracks events not triggering when WooPay is disabled.
-* Fix - Fixed Affirm using black logo on dark themes
-* Fix - Fixed an issue where order metadata was not updated when capturing an order in the processing state.
-* Fix - Fixed UPE country detection in Checkout for non-logged in users
-* Fix - Fix inconsistent alignment of the download button across transactions, payouts, and disputes reporting views for a more cohesive user interface.
-* Fix - Fix Jetpack onboarding URL query from "woocommerce-payments" to "woocommerce-core-profiler"
-* Fix - Fix styling of transaction details page in mobile view.
 * Fix - Fix WooPay component spacing.
 * Fix - Fix WooPay trial subscriptions purchases.
 * Fix - Make sure the status of manual capture enablement is fetched from the right place.
-* Fix - Normalize HK addresses for ECE
-* Fix - Order notes for inquiries have clearer content.
 * Fix - Prevent express checkout from being used if cart total becomes zero after coupon usage.
-* Fix - Remove translations during initialization, preventing unnecessary warnings.
 * Fix - Resolved issue with terminal payments in the payment intent failed webhook processing.
-* Fix - Restrict Stripe Link to credit card payment method and improve cleanup.
 * Fix - Set the support phone field as mandatory in the settings page.
-* Fix - Skip mysqlcheck SSL Requirement during E2E environment setup
-* Fix - Support 'type_is_in' filter for Transactions list report, to allow easy filtering by multiple types.
 * Fix - Update Link logo alignment issue when WooPay is enabled and a specific version of Gutenberg is enabled.
 * Fix - Use paragraph selector instead of label for pmme appearance
 * Fix - Validate required billing fields using data from objects instead of checking the labels.
-* Update - Add support for showing `In-Person (POS)` as the transaction channel for mobile POS transactions in wp-admin Payments, enhancing visibility in both transaction lists and details.
-* Update - Adjust the go-live modal to match the latest design.
 * Update - Avoid getting the appearance for pay for order page with the wrong appearance key.
-* Update - Change 'Bank reference key' label to 'Bank reference ID' in Payouts list column for consistency.
-* Update - chore: renamed PRB references in GooglePay/ApplePay implementation docs and logs files to ECE.
 * Update - chore: rename wrapper from payment-request to express-checkout
-* Update - Ensure more robust selectors scoping to improve theme compatibility.
 * Update - feat: add `wcpay_checkout_use_plain_method_label` filter to allow themes or merchants to force the "plain" WooPayments label on shortcode checkout.
-* Update - Make test instructions copy icon use the same color as the text next to it
 * Update - refactor: express checkout initialization page location checks
 * Update - refactor: express checkout utility for button UI interactions
-* Update - Remove payout timing notice and update the help tooltil on Payments Overview page.
-* Update - Update confirmation modal after onbarding
-* Update - Update Jetpack onboarding flow
-* Update - WooPay theming copy in the settings page
-* Dev - Add support for utilizing NOX capabilities as URL parameters during account creation.
 * Dev - Allow redirect to the settings page from WCPay connect
 * Dev - chore: removed old PRB implementation for ApplePay/GooglePay in favor of the ECE implementation; cleaned up ECE feature flag;
 * Dev - Disable visual regression testing from Playwright until a more reliable approach is defined.
 * Dev - Ensure proper return types in the webhook processing service.
 * Dev - fix: E_DEPRECATED on BNPL empty PMME
-* Dev - Fixing issue with parsing QIT authentication.Fixing issue with parsing QIT authentication.
 * Dev - Fix return types
-* Dev - Refine verification for disabling ECE on subscriptions that require shipping.
 * Dev - Update snapshots for E2E Playwright screenshots
-* Dev - Update the tunelling setup.
 
 = 8.5.1 - 2024-11-25 =
 * Fix - fix: remove "test mode" badge from shortcode checkout.
diff --git a/changelog/8969-fallback-to-card-payment-type b/changelog/8969-fallback-to-card-payment-type
new file mode 100644
index 00000000000..ee66dbfa7e7
--- /dev/null
+++ b/changelog/8969-fallback-to-card-payment-type
@@ -0,0 +1,5 @@
+Significance: patch
+Type: update
+Comment: Small change to payment method types fallback scenario.
+
+
diff --git a/changelog/add-2253-clickwrap-terms-and-conditions b/changelog/add-2253-clickwrap-terms-and-conditions
new file mode 100644
index 00000000000..ac0a4ece4b7
--- /dev/null
+++ b/changelog/add-2253-clickwrap-terms-and-conditions
@@ -0,0 +1,4 @@
+Significance: minor
+Type: add
+
+Clickwrap terms and conditions support on WooPay
diff --git a/changelog/add-6924-migrate-test-drive-capabilities b/changelog/add-6924-migrate-test-drive-capabilities
new file mode 100644
index 00000000000..7b280af4d92
--- /dev/null
+++ b/changelog/add-6924-migrate-test-drive-capabilities
@@ -0,0 +1,4 @@
+Significance: minor
+Type: add
+
+Migrate active capabilities from test-drive account when switching to live account.
diff --git a/changelog/add-9690-recommended-pm b/changelog/add-9690-recommended-pm
new file mode 100644
index 00000000000..2d615350daa
--- /dev/null
+++ b/changelog/add-9690-recommended-pm
@@ -0,0 +1,4 @@
+Significance: minor
+Type: add
+
+Implement gateway method to retrieve recommended payment method.
diff --git a/changelog/add-jetpack-config-callback b/changelog/add-jetpack-config-callback
new file mode 100644
index 00000000000..64b1a2abb1b
--- /dev/null
+++ b/changelog/add-jetpack-config-callback
@@ -0,0 +1,4 @@
+Significance: minor
+Type: fix
+
+Added conditional use of Jetpack Config callback to avoid i18n notices.
diff --git a/changelog/add-limit-woopay-themeing-to-shortcode-checkout b/changelog/add-limit-woopay-themeing-to-shortcode-checkout
new file mode 100644
index 00000000000..4c089593b1f
--- /dev/null
+++ b/changelog/add-limit-woopay-themeing-to-shortcode-checkout
@@ -0,0 +1,5 @@
+Significance: patch
+Type: add
+Comment: Updates the availability criteria of WooPay Global theme-ing feature. This feature is unreleased and behind a feature flag.
+
+
diff --git a/changelog/add-pass-footer-header-styles-to-woopay b/changelog/add-pass-footer-header-styles-to-woopay
new file mode 100644
index 00000000000..ab6375db250
--- /dev/null
+++ b/changelog/add-pass-footer-header-styles-to-woopay
@@ -0,0 +1,5 @@
+Significance: patch
+Type: add
+Comment: Impovements to WooPay themeing, which is not yet released to the public.
+
+
diff --git a/changelog/as-fix-ece-variable-subs b/changelog/as-fix-ece-variable-subs
new file mode 100644
index 00000000000..236497bcab9
--- /dev/null
+++ b/changelog/as-fix-ece-variable-subs
@@ -0,0 +1,4 @@
+Significance: minor
+Type: dev
+
+Refine verification for disabling ECE on subscriptions that require shipping.
diff --git a/changelog/as-fix-ece-variable-subs-free-trial b/changelog/as-fix-ece-variable-subs-free-trial
new file mode 100644
index 00000000000..64d67393c06
--- /dev/null
+++ b/changelog/as-fix-ece-variable-subs-free-trial
@@ -0,0 +1,4 @@
+Significance: minor
+Type: fix
+
+Enable ECE for Virtual Variable Subscriptions with Free Trials.
diff --git a/changelog/as-hk-address b/changelog/as-hk-address
new file mode 100644
index 00000000000..d58ddb9ffd9
--- /dev/null
+++ b/changelog/as-hk-address
@@ -0,0 +1,4 @@
+Significance: minor
+Type: fix
+
+Normalize HK addresses for ECE
diff --git a/changelog/chore-prb-references-in-ece-docs-and-logs b/changelog/chore-prb-references-in-ece-docs-and-logs
new file mode 100644
index 00000000000..887525ff7bc
--- /dev/null
+++ b/changelog/chore-prb-references-in-ece-docs-and-logs
@@ -0,0 +1,4 @@
+Significance: patch
+Type: update
+
+chore: renamed PRB references in GooglePay/ApplePay implementation docs and logs files to ECE.
diff --git a/changelog/chore-remove-ece-error-assignment-on-loaderror b/changelog/chore-remove-ece-error-assignment-on-loaderror
new file mode 100644
index 00000000000..cce991d09ba
--- /dev/null
+++ b/changelog/chore-remove-ece-error-assignment-on-loaderror
@@ -0,0 +1,5 @@
+Significance: patch
+Type: update
+Comment: chore: remove ECE error assignment on loaderror
+
+
diff --git a/changelog/chore-remove-tokenized-payment-request-references b/changelog/chore-remove-tokenized-payment-request-references
new file mode 100644
index 00000000000..56dc3b0a0cc
--- /dev/null
+++ b/changelog/chore-remove-tokenized-payment-request-references
@@ -0,0 +1,5 @@
+Significance: patch
+Type: dev
+Comment: chore: remove tokeinzed payment request code
+
+
diff --git a/changelog/compat-9727-avoid-early-translations b/changelog/compat-9727-avoid-early-translations
new file mode 100644
index 00000000000..51432b8cd10
--- /dev/null
+++ b/changelog/compat-9727-avoid-early-translations
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fix
+
+Remove translations during initialization, preventing unnecessary warnings.
diff --git a/changelog/dev-qit-auth-fix-take-2 b/changelog/dev-qit-auth-fix-take-2
new file mode 100644
index 00000000000..67ec99abd79
--- /dev/null
+++ b/changelog/dev-qit-auth-fix-take-2
@@ -0,0 +1,4 @@
+Significance: minor
+Type: dev
+
+Fixing issue with parsing QIT authentication.Fixing issue with parsing QIT authentication.
diff --git a/changelog/feat-tokenized-ece-product-page-base-implementation b/changelog/feat-tokenized-ece-product-page-base-implementation
new file mode 100644
index 00000000000..e0f342c1623
--- /dev/null
+++ b/changelog/feat-tokenized-ece-product-page-base-implementation
@@ -0,0 +1,5 @@
+Significance: patch
+Type: update
+Comment: feat: tokenized ECE product page base implementation
+
+
diff --git a/changelog/fix-5671-handle-error-on-refund-during-manual-capture b/changelog/fix-5671-handle-error-on-refund-during-manual-capture
new file mode 100644
index 00000000000..016c68f13aa
--- /dev/null
+++ b/changelog/fix-5671-handle-error-on-refund-during-manual-capture
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fix
+
+Fixed an issue where order metadata was not updated when capturing an order in the processing state.
diff --git a/changelog/fix-7230-payments-details-mobile-view b/changelog/fix-7230-payments-details-mobile-view
new file mode 100644
index 00000000000..93e179a44ca
--- /dev/null
+++ b/changelog/fix-7230-payments-details-mobile-view
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fix
+
+Fix styling of transaction details page in mobile view.
diff --git a/changelog/fix-9421-auto-enable-woopay-in-sandbox-mode b/changelog/fix-9421-auto-enable-woopay-in-sandbox-mode
new file mode 100644
index 00000000000..30ec0c7fed5
--- /dev/null
+++ b/changelog/fix-9421-auto-enable-woopay-in-sandbox-mode
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fix
+
+Ensure WooPay 'enabled by default' value is correctly set in sandbox mode.
diff --git a/changelog/fix-9612-inquiry-order-note b/changelog/fix-9612-inquiry-order-note
new file mode 100644
index 00000000000..3fce0a23430
--- /dev/null
+++ b/changelog/fix-9612-inquiry-order-note
@@ -0,0 +1,4 @@
+Significance: minor
+Type: fix
+
+Order notes for inquiries have clearer content.
diff --git a/changelog/fix-9736-remove-temporary-payment-activity-transaction-search-css b/changelog/fix-9736-remove-temporary-payment-activity-transaction-search-css
new file mode 100644
index 00000000000..3841ea6164e
--- /dev/null
+++ b/changelog/fix-9736-remove-temporary-payment-activity-transaction-search-css
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fix
+
+Fix inconsistent alignment of the download button across transactions, payouts, and disputes reporting views for a more cohesive user interface.
diff --git a/changelog/fix-9787-woopay-enable-state-settings b/changelog/fix-9787-woopay-enable-state-settings
new file mode 100644
index 00000000000..cee183680df
--- /dev/null
+++ b/changelog/fix-9787-woopay-enable-state-settings
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fix
+
+Consider WooPay eligibility when retrieving WooPay enable state in the settings.
diff --git a/changelog/fix-9806-ECE-subscription-checkout-signed-out b/changelog/fix-9806-ECE-subscription-checkout-signed-out
new file mode 100644
index 00000000000..fa25afd1f10
--- /dev/null
+++ b/changelog/fix-9806-ECE-subscription-checkout-signed-out
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fix
+
+Ensure ECE login confirmation dialog is shown on Blocks.
diff --git a/changelog/fix-9830-browser-error-on-dispute-submission b/changelog/fix-9830-browser-error-on-dispute-submission
new file mode 100644
index 00000000000..918ad744351
--- /dev/null
+++ b/changelog/fix-9830-browser-error-on-dispute-submission
@@ -0,0 +1,4 @@
+Significance: minor
+Type: fix
+
+Browser error no longer shows after dispute evidence submission
diff --git a/changelog/fix-9889-log-level b/changelog/fix-9889-log-level
new file mode 100644
index 00000000000..d2f54e24c1a
--- /dev/null
+++ b/changelog/fix-9889-log-level
@@ -0,0 +1,4 @@
+Significance: minor
+Type: fix
+
+Errors were incorrectly marked as info in logs.
diff --git a/changelog/fix-add-payment-method-check b/changelog/fix-add-payment-method-check
new file mode 100644
index 00000000000..4ffc9e6342f
--- /dev/null
+++ b/changelog/fix-add-payment-method-check
@@ -0,0 +1,5 @@
+Significance: patch
+Type: dev
+Comment: Added a check for the gateway id before comparing it
+
+
diff --git a/changelog/fix-allow-addresses-from-woo-supported-countries b/changelog/fix-allow-addresses-from-woo-supported-countries
new file mode 100644
index 00000000000..626fd1ce34f
--- /dev/null
+++ b/changelog/fix-allow-addresses-from-woo-supported-countries
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fix
+
+Checkout: Fix error when wc_address_i18n_params does not have data for a given country
diff --git a/changelog/fix-change-woopay-theming-settings-copy b/changelog/fix-change-woopay-theming-settings-copy
new file mode 100644
index 00000000000..fa73b3672f8
--- /dev/null
+++ b/changelog/fix-change-woopay-theming-settings-copy
@@ -0,0 +1,4 @@
+Significance: patch
+Type: update
+
+WooPay theming copy in the settings page
diff --git a/changelog/fix-php-8-compatibility-errors-warnings b/changelog/fix-php-8-compatibility-errors-warnings
new file mode 100644
index 00000000000..9c393f71654
--- /dev/null
+++ b/changelog/fix-php-8-compatibility-errors-warnings
@@ -0,0 +1,5 @@
+Significance: patch
+Type: dev
+Comment: These changes fix some PHP compatibility errors that don't impact WooPayments behaviour.
+
+
diff --git a/changelog/fix-rounding-error-with-deposit-products b/changelog/fix-rounding-error-with-deposit-products
new file mode 100644
index 00000000000..d42215e3919
--- /dev/null
+++ b/changelog/fix-rounding-error-with-deposit-products
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fix
+
+Ceil product prices after applying currency conversion, but before charm pricing and price rounding from settings is applied.
diff --git a/changelog/fix-skip-ssl-requirement-env-setup b/changelog/fix-skip-ssl-requirement-env-setup
new file mode 100644
index 00000000000..691f98adbfa
--- /dev/null
+++ b/changelog/fix-skip-ssl-requirement-env-setup
@@ -0,0 +1,4 @@
+Significance: minor
+Type: fix
+
+Skip mysqlcheck SSL Requirement during E2E environment setup
diff --git a/changelog/fix-stripe-link-button b/changelog/fix-stripe-link-button
new file mode 100644
index 00000000000..d8acf0626f1
--- /dev/null
+++ b/changelog/fix-stripe-link-button
@@ -0,0 +1,4 @@
+Significance: minor
+Type: fix
+
+Restrict Stripe Link to credit card payment method and improve cleanup.
diff --git a/changelog/fix-tokenized-cart-error-notice-json b/changelog/fix-tokenized-cart-error-notice-json
new file mode 100644
index 00000000000..c132e0f7eeb
--- /dev/null
+++ b/changelog/fix-tokenized-cart-error-notice-json
@@ -0,0 +1,5 @@
+Significance: patch
+Type: fix
+Comment: fix: tokenized cart error notice json
+
+
diff --git a/changelog/fix-upe-country-selection b/changelog/fix-upe-country-selection
new file mode 100644
index 00000000000..478ffa1cfcd
--- /dev/null
+++ b/changelog/fix-upe-country-selection
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fix
+
+Fixed UPE country detection in Checkout for non-logged in users
diff --git a/changelog/fix-upe-theme-block b/changelog/fix-upe-theme-block
new file mode 100644
index 00000000000..6afa59f04d3
--- /dev/null
+++ b/changelog/fix-upe-theme-block
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fix
+
+Fixed Affirm using black logo on dark themes
diff --git a/changelog/fix-use-effect-console-warning b/changelog/fix-use-effect-console-warning
new file mode 100644
index 00000000000..45219e7b39a
--- /dev/null
+++ b/changelog/fix-use-effect-console-warning
@@ -0,0 +1,5 @@
+Significance: patch
+Type: dev
+Comment: fix: console warning on plugins page
+
+
diff --git a/changelog/fix-use-type-is-in-filter b/changelog/fix-use-type-is-in-filter
new file mode 100644
index 00000000000..3639b203c36
--- /dev/null
+++ b/changelog/fix-use-type-is-in-filter
@@ -0,0 +1,4 @@
+Significance: minor
+Type: fix
+
+Support 'type_is_in' filter for Transactions list report, to allow easy filtering by multiple types. 
diff --git a/changelog/frosso-patch-1 b/changelog/frosso-patch-1
new file mode 100644
index 00000000000..e3812625698
--- /dev/null
+++ b/changelog/frosso-patch-1
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fix
+
+fix: undefined $cart_contains_subscription
diff --git a/changelog/mobile-tpv-tracking-channel b/changelog/mobile-tpv-tracking-channel
new file mode 100644
index 00000000000..a7b990214df
--- /dev/null
+++ b/changelog/mobile-tpv-tracking-channel
@@ -0,0 +1,4 @@
+Significance: minor
+Type: update
+
+Add support for showing `In-Person (POS)` as the transaction channel for mobile POS transactions in wp-admin Payments, enhancing visibility in both transaction lists and details.
diff --git a/changelog/replace-from-url-query b/changelog/replace-from-url-query
new file mode 100644
index 00000000000..58688e1c42f
--- /dev/null
+++ b/changelog/replace-from-url-query
@@ -0,0 +1,4 @@
+Significance: minor
+Type: fix
+
+Fix Jetpack onboarding URL query from "woocommerce-payments" to "woocommerce-core-profiler"
diff --git a/changelog/scope-payment-elements-selectors b/changelog/scope-payment-elements-selectors
new file mode 100644
index 00000000000..515bb60dc2e
--- /dev/null
+++ b/changelog/scope-payment-elements-selectors
@@ -0,0 +1,4 @@
+Significance: minor
+Type: update
+
+Ensure more robust selectors scoping to improve theme compatibility.
diff --git a/changelog/test-instructions-item-color b/changelog/test-instructions-item-color
new file mode 100644
index 00000000000..4bf5983e8e6
--- /dev/null
+++ b/changelog/test-instructions-item-color
@@ -0,0 +1,4 @@
+Significance: patch
+Type: update
+
+Make test instructions copy icon use the same color as the text next to it
diff --git a/changelog/update-1-5316-rename-bank-reference-id b/changelog/update-1-5316-rename-bank-reference-id
new file mode 100644
index 00000000000..0a2841c0ad9
--- /dev/null
+++ b/changelog/update-1-5316-rename-bank-reference-id
@@ -0,0 +1,4 @@
+Significance: minor
+Type: update
+
+Change 'Bank reference key' label to 'Bank reference ID' in Payouts list column for consistency.
diff --git a/changelog/update-7900-payout-notice b/changelog/update-7900-payout-notice
new file mode 100644
index 00000000000..4a49df73e41
--- /dev/null
+++ b/changelog/update-7900-payout-notice
@@ -0,0 +1,4 @@
+Significance: minor
+Type: update
+
+Remove payout timing notice and update the help tooltil on Payments Overview page.
diff --git a/changelog/update-9910-transaction-id-label b/changelog/update-9910-transaction-id-label
new file mode 100644
index 00000000000..0e43652d02b
--- /dev/null
+++ b/changelog/update-9910-transaction-id-label
@@ -0,0 +1,5 @@
+Significance: patch
+Type: fix
+Comment: Change ID to uppercase in the 'Transaction ID' column label for consistency with similar unique IDs in the UI.
+
+
diff --git a/changelog/update-9916-go-live-modal-and-notice b/changelog/update-9916-go-live-modal-and-notice
new file mode 100644
index 00000000000..789b36753a9
--- /dev/null
+++ b/changelog/update-9916-go-live-modal-and-notice
@@ -0,0 +1,4 @@
+Significance: minor
+Type: update
+
+Adjust the go-live modal to match the latest design.
diff --git a/changelog/update-confirmation-modal-nox b/changelog/update-confirmation-modal-nox
new file mode 100644
index 00000000000..0ffd1af6127
--- /dev/null
+++ b/changelog/update-confirmation-modal-nox
@@ -0,0 +1,4 @@
+Significance: minor
+Type: update
+
+Update confirmation modal after onbarding
diff --git a/changelog/update-jetpack-onboarding-flow b/changelog/update-jetpack-onboarding-flow
new file mode 100644
index 00000000000..a28c6ac383c
--- /dev/null
+++ b/changelog/update-jetpack-onboarding-flow
@@ -0,0 +1,4 @@
+Significance: minor
+Type: update
+
+Update Jetpack onboarding flow
diff --git a/changelog/update-pass-capabilities-to-onboarding-as-get-params b/changelog/update-pass-capabilities-to-onboarding-as-get-params
new file mode 100644
index 00000000000..9104e7a8f99
--- /dev/null
+++ b/changelog/update-pass-capabilities-to-onboarding-as-get-params
@@ -0,0 +1,4 @@
+Significance: minor
+Type: dev
+
+Add support for utilizing NOX capabilities as URL parameters during account creation.
diff --git a/changelog/update-server-container-name b/changelog/update-server-container-name
new file mode 100644
index 00000000000..cb9580f8a22
--- /dev/null
+++ b/changelog/update-server-container-name
@@ -0,0 +1,5 @@
+Significance: patch
+Type: dev
+Comment: Updates server container name used by E2E tests
+
+
diff --git a/changelog/update-to-standalone-jt b/changelog/update-to-standalone-jt
new file mode 100644
index 00000000000..4df87f235ec
--- /dev/null
+++ b/changelog/update-to-standalone-jt
@@ -0,0 +1,4 @@
+Significance: minor
+Type: dev
+
+Update the tunelling setup.
diff --git a/readme.txt b/readme.txt
index 762cea4c9ef..d67f01c3951 100644
--- a/readme.txt
+++ b/readme.txt
@@ -94,78 +94,6 @@ Please note that our support for the checkout block is still experimental and th
 
 == Changelog ==
 
-= 8.6.1 - 2024-12-17 =
-* Add - Add Bank reference key column in Payout reports. This will help reconcile WooPayments Payouts with bank statements.
-* Add - Clickwrap terms and conditions support on WooPay
-* Add - Display credit card brand icons on order received page.
-* Add - Implement gateway method to retrieve recommended payment method.
-* Add - Migrate active capabilities from test-drive account when switching to live account.
-* Fix - Added conditional use of Jetpack Config callback to avoid i18n notices.
-* Fix - Add support to load stripe js asynchronously when it is not immediately available in the global scope.
-* Fix - Add the missing "Download" column heading label and toggle menu option to the Payments → Documents list view table.
-* Fix - Browser error no longer shows after dispute evidence submission
-* Fix - Ceil product prices after applying currency conversion, but before charm pricing and price rounding from settings is applied.
-* Fix - Checkout: Fix error when wc_address_i18n_params does not have data for a given country
-* Fix - Consider WooPay eligibility when retrieving WooPay enable state in the settings.
-* Fix - Enable ECE for Virtual Variable Subscriptions with Free Trials.
-* Fix - Ensure ECE button load events are triggered for multiple buttons on the same page.
-* Fix - Ensure ECE is displayed correctly taking into account the tax settings.
-* Fix - Ensure ECE login confirmation dialog is shown on Blocks.
-* Fix - Ensure WooPay 'enabled by default' value is correctly set in sandbox mode.
-* Fix - Errors were incorrectly marked as info in logs.
-* Fix - Evidence submission is no longer available for Klarna inquiries as this is not supported by Stripe / Klarna.
-* Fix - fix: express checkout to use its own css files.
-* Fix - fix: missing ece is_product_page checks
-* Fix - fix: undefined $cart_contains_subscription
-* Fix - Fix ECE Tracks events not triggering when WooPay is disabled.
-* Fix - Fixed Affirm using black logo on dark themes
-* Fix - Fixed an issue where order metadata was not updated when capturing an order in the processing state.
-* Fix - Fixed UPE country detection in Checkout for non-logged in users
-* Fix - Fix inconsistent alignment of the download button across transactions, payouts, and disputes reporting views for a more cohesive user interface.
-* Fix - Fix Jetpack onboarding URL query from "woocommerce-payments" to "woocommerce-core-profiler"
-* Fix - Fix styling of transaction details page in mobile view.
-* Fix - Fix WooPay component spacing.
-* Fix - Fix WooPay trial subscriptions purchases.
-* Fix - Make sure the status of manual capture enablement is fetched from the right place.
-* Fix - Normalize HK addresses for ECE
-* Fix - Order notes for inquiries have clearer content.
-* Fix - Prevent express checkout from being used if cart total becomes zero after coupon usage.
-* Fix - Remove translations during initialization, preventing unnecessary warnings.
-* Fix - Resolved issue with terminal payments in the payment intent failed webhook processing.
-* Fix - Restrict Stripe Link to credit card payment method and improve cleanup.
-* Fix - Set the support phone field as mandatory in the settings page.
-* Fix - Skip mysqlcheck SSL Requirement during E2E environment setup
-* Fix - Support 'type_is_in' filter for Transactions list report, to allow easy filtering by multiple types.
-* Fix - Update Link logo alignment issue when WooPay is enabled and a specific version of Gutenberg is enabled.
-* Fix - Use paragraph selector instead of label for pmme appearance
-* Fix - Validate required billing fields using data from objects instead of checking the labels.
-* Update - Add support for showing `In-Person (POS)` as the transaction channel for mobile POS transactions in wp-admin Payments, enhancing visibility in both transaction lists and details.
-* Update - Adjust the go-live modal to match the latest design.
-* Update - Avoid getting the appearance for pay for order page with the wrong appearance key.
-* Update - Change 'Bank reference key' label to 'Bank reference ID' in Payouts list column for consistency.
-* Update - chore: renamed PRB references in GooglePay/ApplePay implementation docs and logs files to ECE.
-* Update - chore: rename wrapper from payment-request to express-checkout
-* Update - Ensure more robust selectors scoping to improve theme compatibility.
-* Update - feat: add `wcpay_checkout_use_plain_method_label` filter to allow themes or merchants to force the "plain" WooPayments label on shortcode checkout.
-* Update - Make test instructions copy icon use the same color as the text next to it
-* Update - refactor: express checkout initialization page location checks
-* Update - refactor: express checkout utility for button UI interactions
-* Update - Remove payout timing notice and update the help tooltil on Payments Overview page.
-* Update - Update confirmation modal after onbarding
-* Update - Update Jetpack onboarding flow
-* Update - WooPay theming copy in the settings page
-* Dev - Add support for utilizing NOX capabilities as URL parameters during account creation.
-* Dev - Allow redirect to the settings page from WCPay connect
-* Dev - chore: removed old PRB implementation for ApplePay/GooglePay in favor of the ECE implementation; cleaned up ECE feature flag;
-* Dev - Disable visual regression testing from Playwright until a more reliable approach is defined.
-* Dev - Ensure proper return types in the webhook processing service.
-* Dev - fix: E_DEPRECATED on BNPL empty PMME
-* Dev - Fixing issue with parsing QIT authentication.Fixing issue with parsing QIT authentication.
-* Dev - Fix return types
-* Dev - Refine verification for disabling ECE on subscriptions that require shipping.
-* Dev - Update snapshots for E2E Playwright screenshots
-* Dev - Update the tunelling setup.
-
 = 8.6.0 - 2024-12-04 =
 * Add - Add Bank reference key column in Payout reports. This will help reconcile WooPayments Payouts with bank statements.
 * Add - Display credit card brand icons on order received page.