From 8926da1184d9bba5cec3bf585a6576f0da5d7160 Mon Sep 17 00:00:00 2001
From: Gerhard Potgieter <potgieterg@gmail.com>
Date: Tue, 17 Sep 2024 11:02:41 +0200
Subject: [PATCH] Try WC Shipping Modal Tweak (#2814)

* FeatureAnnouncement - update copy, do not auto click update button.

* Changelog entries
---
 changelog.txt                                        |  3 +++
 client/components/migration/feature-announcement.jsx | 12 ++++++------
 client/wcshipping-migration-admin-notice.js          |  4 ----
 readme.txt                                           |  3 +++
 4 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/changelog.txt b/changelog.txt
index ded655461..7823f7c2e 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,5 +1,8 @@
 *** WooCommerce Shipping & Tax Changelog ***
 
+= 2.8.2 - 2024-xx-xx =
+* Tweak - Try WooCommerce Shipping modal copy.
+
 = 2.8.1 - 2024-09-09 =
 * Tweak - Hide migration banner for merchants still using legacy functionality.
 
diff --git a/client/components/migration/feature-announcement.jsx b/client/components/migration/feature-announcement.jsx
index f43b3e4ea..4fc56320f 100644
--- a/client/components/migration/feature-announcement.jsx
+++ b/client/components/migration/feature-announcement.jsx
@@ -58,12 +58,12 @@ const FeatureAnnouncement = ( { translate, isEligable, previousMigrationState, o
 			<FlexItem>
 				<Flex>
 					<span>
-						{translate('Update')}
+						{translate('Try WooCommerce Shipping')}
 					</span>
 					<h2>
-						{translate('A new dedicated WooCommerce Shipping extension is now available')}
+						{translate('A new WooCommerce Shipping experience is now available')}
 					</h2>
-					<p>{translate('We\'ll ensure a seamless transition by transferring all your settings and shipping labels when you update.')}</p>
+					<p>{translate('We\'ll ensure a seamless transition by allowing you to migrate all your compatible settings and shipping labels when you update.')}</p>
 					<p>{translate('Here\'s what you can expect from the new shipping experience:')}</p>
 
 					<ul>
@@ -74,7 +74,7 @@ const FeatureAnnouncement = ( { translate, isEligable, previousMigrationState, o
 									{translate('A seamless transition')}
 								</h3>
 								<p>
-									{translate('All of your settings and shipment history have been imported to the new extension.')}
+									{translate('Automatically migrate all your compatible settings and shipment history to the new extension.')}
 								</p>
 							</div>
 						</li>
@@ -98,7 +98,7 @@ const FeatureAnnouncement = ( { translate, isEligable, previousMigrationState, o
 								</h3>
 								<p>
 									{translate(
-										'Send using trusted shipping carriers like USPS and DHL Express, with more options and carriers coming soon.')}
+										'Ship your productss using trusted shipping carriers like USPS and DHL Express at discounted rates, with more options and carriers coming soon.')}
 								</p>
 							</div>
 						</li>
@@ -121,7 +121,7 @@ const FeatureAnnouncement = ( { translate, isEligable, previousMigrationState, o
 						{translate('Maybe later')}
 					</Button>}
 					<Button id="migration__announcement-update-button" isPrimary onClick={update} isBusy={isUpdating} disabled={isUpdating}>
-						{isUpdating ? translate('Updating') : translate('Update now')}
+						{isUpdating ? translate('Installing WooCommerce Shipping…') : translate('Try WooCommerce Shipping now')}
 					</Button>
 				</Flex>
 			</FlexItem>
diff --git a/client/wcshipping-migration-admin-notice.js b/client/wcshipping-migration-admin-notice.js
index c89ae0940..15144045e 100644
--- a/client/wcshipping-migration-admin-notice.js
+++ b/client/wcshipping-migration-admin-notice.js
@@ -40,10 +40,6 @@ const wcstMigrationNoticeDimissButton = document.querySelector('.wcst-wcshipping
 			</Provider>,
 			container
 		);
-
-		// Click the update button in the modal to start the migration.
-		const update_button = document.getElementById('migration__announcement-update-button');
-		update_button.click();
 	});
 
 	// Dismiss it for 3 days, then remove it from view.
diff --git a/readme.txt b/readme.txt
index a2972b168..56ebc13e0 100644
--- a/readme.txt
+++ b/readme.txt
@@ -81,6 +81,9 @@ The source code is freely available [in GitHub](https://github.com/Automattic/wo
 
 == Changelog ==
 
+= 2.8.2 - 2024-xx-xx =
+* Tweak - Try WooCommerce Shipping modal copy.
+
 = 2.8.1 - 2024-09-09 =
 * Tweak - Hide migration banner for merchants still using legacy functionality.