From 49b8b582da8671ec1b0c10e184946d9906f3f82c Mon Sep 17 00:00:00 2001
From: Leo Germani <leogermani@automattic.com>
Date: Tue, 15 Oct 2024 15:35:28 -0300
Subject: [PATCH 1/3] feat: display list remote name on settings page

---
 includes/class-newspack-newsletters-settings.php | 2 +-
 includes/class-subscription-list.php             | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/includes/class-newspack-newsletters-settings.php b/includes/class-newspack-newsletters-settings.php
index 3090694f1..7eac1dd26 100644
--- a/includes/class-newspack-newsletters-settings.php
+++ b/includes/class-newspack-newsletters-settings.php
@@ -328,7 +328,7 @@ private static function render_lists_table() {
 								/>
 							</td>
 							<td class="name">
-								<label for="<?php echo esc_attr( $checkbox_id ); ?>"><?php echo esc_html( $list['name'] ); ?></strong>
+								<label for="<?php echo esc_attr( $checkbox_id ); ?>"><?php echo esc_html( $list['remote_name'] ); ?></strong>
 								<br/>
 								<small>
 									<?php echo esc_html( $list['type_label'] ); ?>
diff --git a/includes/class-subscription-list.php b/includes/class-subscription-list.php
index 79cc237ed..455f737c6 100644
--- a/includes/class-subscription-list.php
+++ b/includes/class-subscription-list.php
@@ -548,6 +548,7 @@ public function to_array() {
 			'type_label'  => $this->get_type_label(),
 			'edit_link'   => $this->get_edit_link(),
 			'active'      => $this->is_active(),
+			'remote_name' => $this->get_remote_name(),
 		];
 	}
 }

From ef6008b58bf5dbf7c1543eed15107a6c17893499 Mon Sep 17 00:00:00 2001
From: Leo Germani <leogermani@automattic.com>
Date: Thu, 17 Oct 2024 18:46:40 -0300
Subject: [PATCH 2/3] feat: update list title if there is no local
 customization

---
 includes/class-subscription-lists.php | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/includes/class-subscription-lists.php b/includes/class-subscription-lists.php
index b10d6ea7f..4a57cd1cd 100644
--- a/includes/class-subscription-lists.php
+++ b/includes/class-subscription-lists.php
@@ -466,8 +466,18 @@ public static function get_or_create_remote_list( $list ) {
 		$subscriber_count = ! empty( $list['member_count'] ) ? (int) $list['member_count'] : 0; // Tags have member_count instead of subscriber_count.
 		$saved_list       = Subscription_List::from_public_id( $list['id'] );
 		if ( $saved_list ) {
-			// Update remote name, in case it's changed in the ESP.
-			$saved_list->set_remote_name( $list['title'] );
+
+			$has_customized_title = $saved_list->get_title() !== $saved_list->get_remote_name();
+
+			if ( $list['title'] !== $saved_list->get_remote_name() ) {
+				// The remote name has changed, let's update it locally.
+				$saved_list->set_remote_name( $list['title'] );
+
+				// Only update the title if it was not customized by the user.
+				if ( ! $has_customized_title ) {
+					$saved_list->update( [ 'title' => $list['title'] ] );
+				}
+			}
 
 			// Update subscriber count, if available.
 			if ( 0 > $subscriber_count ) {
@@ -551,20 +561,14 @@ public static function update_lists( $lists ) {
 		$existing_ids = [];
 
 		foreach ( $lists as $list ) {
-			if ( Subscription_List::is_local_public_id( $list['id'] ) ) {
-				// Local lists will be fetched here.
-				$stored_list = Subscription_List::from_public_id( $list['id'] );
-			} else {
-				// Remote lists will be either fetched or created here.
-				$stored_list = self::get_or_create_remote_list( $list );
-			}
+
+			$stored_list = Subscription_List::from_public_id( $list['id'] );
 
 			if ( ! $stored_list instanceof Subscription_List ) {
 				continue;
 			}
 
 			$existing_ids[] = $stored_list->get_id();
-
 			$stored_list->update( $list );
 
 		}

From 8d0a77235eaf49451f279b1c583550a214c435be Mon Sep 17 00:00:00 2001
From: Leo Germani <leogermani@automattic.com>
Date: Thu, 17 Oct 2024 19:10:15 -0300
Subject: [PATCH 3/3] fix: fix the update_lists behavior and add tests

---
 includes/class-subscription-lists.php |  5 +++++
 tests/test-subscription-lists.php     | 32 ++++++++++++++++++++++++++-
 2 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/includes/class-subscription-lists.php b/includes/class-subscription-lists.php
index 4a57cd1cd..7c842103d 100644
--- a/includes/class-subscription-lists.php
+++ b/includes/class-subscription-lists.php
@@ -564,6 +564,11 @@ public static function update_lists( $lists ) {
 
 			$stored_list = Subscription_List::from_public_id( $list['id'] );
 
+			// If a remote list was not found, create one.
+			if ( ! $stored_list instanceof Subscription_List && ! Subscription_List::is_local_public_id( $list['id'] ) ) {
+				$stored_list = self::get_or_create_remote_list( $list );
+			}
+
 			if ( ! $stored_list instanceof Subscription_List ) {
 				continue;
 			}
diff --git a/tests/test-subscription-lists.php b/tests/test-subscription-lists.php
index 140b74ab7..8783a5e16 100644
--- a/tests/test-subscription-lists.php
+++ b/tests/test-subscription-lists.php
@@ -127,7 +127,7 @@ public function test_get_or_create_remote_list() {
 		// existing.
 		$existing = [
 			'id'    => 'xyz-' . self::$posts['remote_mailchimp'],
-			'title' => 'Remote mailchimp new title',
+			'title' => 'Test List 5',
 		];
 		$list     = Subscription_Lists::get_or_create_remote_list( $existing );
 		$this->assertSame( self::$posts['remote_mailchimp'], $list->get_id() );
@@ -152,6 +152,36 @@ public function test_get_or_create_remote_list() {
 		$this->assertSame( $count + 1, $count_after_new );
 	}
 
+	/**
+	 * Test update title on fetch from ESP
+	 */
+	public function test_update_title_when_fetching_from_esp() {
+
+		$existing = [
+			'id'    => 'xyz-' . self::$posts['remote_mailchimp'],
+			'title' => 'Remote mailchimp new title',
+		];
+		$list     = Subscription_Lists::get_or_create_remote_list( $existing );
+
+		$this->assertSame( self::$posts['remote_mailchimp'], $list->get_id() );
+		$this->assertSame( 'Remote mailchimp new title', $list->get_title() );
+		$this->assertSame( 'Remote mailchimp new title', $list->get_remote_name() );
+
+		// Now we edit the local title.
+		$list->update( [ 'title' => 'Customized title' ] );
+
+		$existing = [
+			'id'    => 'xyz-' . self::$posts['remote_mailchimp'],
+			'title' => 'Remote mailchimp super new title',
+		];
+
+		$list = Subscription_Lists::get_or_create_remote_list( $existing );
+
+		$this->assertSame( self::$posts['remote_mailchimp'], $list->get_id() );
+		$this->assertSame( 'Customized title', $list->get_title(), 'The local name should not be updated if it was customized' );
+		$this->assertSame( 'Remote mailchimp super new title', $list->get_remote_name(), 'The remote name should always be updated' );
+	}
+
 	/**
 	 * Test update_lists method
 	 *