From c53443779e64e5a3b57437e639b05ea3731da1fc Mon Sep 17 00:00:00 2001
From: Dharmesh Patel <dspatel44@gmail.com>
Date: Wed, 9 Apr 2025 20:33:11 +0530
Subject: [PATCH 1/4] Add a note to set the website URL in the Mailchimp
 Audience settings.

---
 views/setup_page.php | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/views/setup_page.php b/views/setup_page.php
index 4e06ef4f..251ca36b 100644
--- a/views/setup_page.php
+++ b/views/setup_page.php
@@ -241,6 +241,26 @@ function ( $ele ) {
 							<em><label for="mc_use_unsub_link"><?php esc_html_e( 'We\'ll automatically  add a link to your list\'s unsubscribe form.', 'mailchimp' ); ?></label></em>
 						</td>
 					</tr>
+					<tr valign="top">
+						<td colspan="2">
+						<?php
+						echo wp_kses(
+							sprintf(
+								/* translators: %s: link to Mailchimp */
+								__( '<strong>Note:</strong> If you haven\'t already, please <a href="%s" target="_blank">update</a> your website URL in the Mailchimp Audience settings to let users to return to your site.', 'mailchimp' ),
+								esc_url( 'https://mailchimp.com/help/change-or-update-the-return-to-our-website-button/' )
+							),
+							[
+								'a' => [
+									'href'   => [],
+									'target' => [],
+								],
+								'strong' => [],
+							]
+						)
+						?>
+						</td>
+					</tr>
 				</table>
 				<input type="submit" value="<?php esc_attr_e( 'Update Subscribe Form Settings', 'mailchimp' ); ?>" class="button mailchimp-sf-button small mc-submit" /><br/>
 			</div>

From 454c1f67c5d879f43981d15f5b030e3d2e524097 Mon Sep 17 00:00:00 2001
From: Dharmesh Patel <dspatel44@gmail.com>
Date: Wed, 9 Apr 2025 20:43:22 +0530
Subject: [PATCH 2/4] PHPCS: align the arrow for the Array.

---
 views/setup_page.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/setup_page.php b/views/setup_page.php
index 251ca36b..a77cf3d4 100644
--- a/views/setup_page.php
+++ b/views/setup_page.php
@@ -251,7 +251,7 @@ function ( $ele ) {
 								esc_url( 'https://mailchimp.com/help/change-or-update-the-return-to-our-website-button/' )
 							),
 							[
-								'a' => [
+								'a'      => [
 									'href'   => [],
 									'target' => [],
 								],

From 94a759ed382b442f5ae08299e53dd9d3ac04cf98 Mon Sep 17 00:00:00 2001
From: Dharmesh Patel <dspatel44@gmail.com>
Date: Thu, 10 Apr 2025 11:00:36 +0530
Subject: [PATCH 3/4] Apply suggestions from code review

Co-authored-by: Darin Kotter <darin.kotter@gmail.com>
---
 views/setup_page.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/views/setup_page.php b/views/setup_page.php
index a77cf3d4..3cc7f6c7 100644
--- a/views/setup_page.php
+++ b/views/setup_page.php
@@ -247,13 +247,14 @@ function ( $ele ) {
 						echo wp_kses(
 							sprintf(
 								/* translators: %s: link to Mailchimp */
-								__( '<strong>Note:</strong> If you haven\'t already, please <a href="%s" target="_blank">update</a> your website URL in the Mailchimp Audience settings to let users to return to your site.', 'mailchimp' ),
+								__( '<strong>Note:</strong> If you haven\'t already, please <a href="%s" target="_blank" rel="noopener noreferrer">add</a> your website URL to your Mailchimp Audience account settings so users can properly return to your site after subscribing.', 'mailchimp' ),
 								esc_url( 'https://mailchimp.com/help/change-or-update-the-return-to-our-website-button/' )
 							),
 							[
 								'a'      => [
 									'href'   => [],
 									'target' => [],
+									'rel'    => [],
 								],
 								'strong' => [],
 							]

From 0c81fee5a587f55616ab4253534fccd5fa486301 Mon Sep 17 00:00:00 2001
From: Dharmesh Patel <dspatel44@gmail.com>
Date: Thu, 10 Apr 2025 11:09:24 +0530
Subject: [PATCH 4/4] Remove unnecessory escape function from URL.

---
 views/setup_page.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/setup_page.php b/views/setup_page.php
index 3cc7f6c7..676cdc76 100644
--- a/views/setup_page.php
+++ b/views/setup_page.php
@@ -248,7 +248,7 @@ function ( $ele ) {
 							sprintf(
 								/* translators: %s: link to Mailchimp */
 								__( '<strong>Note:</strong> If you haven\'t already, please <a href="%s" target="_blank" rel="noopener noreferrer">add</a> your website URL to your Mailchimp Audience account settings so users can properly return to your site after subscribing.', 'mailchimp' ),
-								esc_url( 'https://mailchimp.com/help/change-or-update-the-return-to-our-website-button/' )
+								'https://mailchimp.com/help/change-or-update-the-return-to-our-website-button/'
 							),
 							[
 								'a'      => [