From e4a161fa44a2fe4a1f000bad64449caa2c5714c2 Mon Sep 17 00:00:00 2001
From: louwie17 <lourensschep@gmail.com>
Date: Thu, 25 Mar 2021 18:01:37 -0300
Subject: [PATCH] Update the mercado option name, so it enables correctly
 (https://github.com/woocommerce/woocommerce-admin/pull/6677)

* Update the mercado option name, so it enables correctly

* Add changelog
---
 .../client/task-list/tasks/payments/index.js               | 2 +-
 .../client/task-list/tasks/payments/methods.js             | 7 +++++--
 .../woocommerce-admin/client/task-list/test/payments.js    | 7 +++++--
 plugins/woocommerce-admin/readme.txt                       | 1 +
 plugins/woocommerce-admin/src/Features/Onboarding.php      | 2 +-
 5 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/plugins/woocommerce-admin/client/task-list/tasks/payments/index.js b/plugins/woocommerce-admin/client/task-list/tasks/payments/index.js
index 0aaade79b8c..25b85712af1 100644
--- a/plugins/woocommerce-admin/client/task-list/tasks/payments/index.js
+++ b/plugins/woocommerce-admin/client/task-list/tasks/payments/index.js
@@ -416,7 +416,7 @@ export default compose(
 			'woocommerce_mollie_payments_settings',
 			'woocommerce_payubiz_settings',
 			'woocommerce_paystack_settings',
-			'woocommerce_mercadopago_settings',
+			'woocommerce_woo-mercado-pago-basic_settings',
 		];
 
 		const options = optionNames.reduce( ( result, name ) => {
diff --git a/plugins/woocommerce-admin/client/task-list/tasks/payments/methods.js b/plugins/woocommerce-admin/client/task-list/tasks/payments/methods.js
index d258ce2ba0f..20c6a6a77bb 100644
--- a/plugins/woocommerce-admin/client/task-list/tasks/payments/methods.js
+++ b/plugins/woocommerce-admin/client/task-list/tasks/payments/methods.js
@@ -236,8 +236,11 @@ export function getPaymentMethods( {
 			plugins: [ MERCADOPAGO_PLUGIN ],
 			container: <MercadoPago />,
 			isConfigured: activePlugins.includes( MERCADOPAGO_PLUGIN ),
-			isEnabled: enabledPaymentGateways.includes( 'mercadopago' ),
-			optionName: 'woocommerce_mercadopago_settings',
+			isEnabled:
+				options[ 'woocommerce_woo-mercado-pago-basic_settings' ] &&
+				options[ 'woocommerce_woo-mercado-pago-basic_settings' ]
+					.enabled === 'yes',
+			optionName: 'woocommerce_woo-mercado-pago-basic_settings',
 		},
 		{
 			key: 'paypal',
diff --git a/plugins/woocommerce-admin/client/task-list/test/payments.js b/plugins/woocommerce-admin/client/task-list/test/payments.js
index b086b955a96..f2bfebde652 100644
--- a/plugins/woocommerce-admin/client/task-list/test/payments.js
+++ b/plugins/woocommerce-admin/client/task-list/test/payments.js
@@ -167,8 +167,11 @@ describe( 'TaskList > Payments', () => {
 			it( 'Detects whether the plugin is enabled based on the received options', () => {
 				const mercadoPagoParams = {
 					...params,
-					onboardingStatus: {
-						enabledPaymentGateways: [ 'mercadopago' ],
+					options: {
+						...params.options,
+						'woocommerce_woo-mercado-pago-basic_settings': {
+							enabled: 'yes',
+						},
 					},
 				};
 
diff --git a/plugins/woocommerce-admin/readme.txt b/plugins/woocommerce-admin/readme.txt
index 8e8f7becab6..52d84c0faab 100644
--- a/plugins/woocommerce-admin/readme.txt
+++ b/plugins/woocommerce-admin/readme.txt
@@ -139,6 +139,7 @@ Release and roadmap notes are available on the [WooCommerce Developers Blog](htt
 - Dev: Payments task: include Mercado Pago #6572
 - Dev: Ensure script asset.php files are included in builds #6635
 - Fix: Adding New Zealand and Ireland to selective bundle option, previously missed. #6649
+- Fix: Update the Mercado option used for enabling/disabling. #6677
 
 == 2.1.3 3/14/2021  ==
 
diff --git a/plugins/woocommerce-admin/src/Features/Onboarding.php b/plugins/woocommerce-admin/src/Features/Onboarding.php
index 5090e8b4011..93b3599d540 100644
--- a/plugins/woocommerce-admin/src/Features/Onboarding.php
+++ b/plugins/woocommerce-admin/src/Features/Onboarding.php
@@ -703,7 +703,7 @@ class Onboarding {
 		$options[] = 'woocommerce_task_list_tracked_completed_tasks';
 		$options[] = 'woocommerce_task_list_dismissed_tasks';
 		$options[] = 'woocommerce_allow_tracking';
-		$options[] = 'woocommerce_mercadopago_settings';
+		$options[] = 'woocommerce_woo-mercado-pago-basic_settings';
 		$options[] = 'woocommerce_stripe_settings';
 		$options[] = 'woocommerce-ppcp-settings';
 		$options[] = 'woocommerce_ppcp-gateway_settings';