Skip to content

Commit

Permalink
Merge branch 'trunk' into update/limit-migration-banner-to-supported-…
Browse files Browse the repository at this point in the history
…countries
  • Loading branch information
kloon authored Sep 17, 2024
2 parents 9551c5a + 8926da1 commit 2ab084b
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 10 deletions.
1 change: 1 addition & 0 deletions changelog.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

= 2.8.2 - 2024-xx-xx =
* Tweak - Hide shipping migration banner for all stores not eligible to buy shipping labels.
* Tweak - Try WooCommerce Shipping modal copy.

= 2.8.1 - 2024-09-09 =
* Tweak - Hide migration banner for merchants still using legacy functionality.
Expand Down
12 changes: 6 additions & 6 deletions client/components/migration/feature-announcement.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand Down
4 changes: 0 additions & 4 deletions client/wcshipping-migration-admin-notice.js
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
1 change: 1 addition & 0 deletions readme.txt
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ The source code is freely available [in GitHub](https://github.com/Automattic/wo

= 2.8.2 - 2024-xx-xx =
* Tweak - Hide shipping migration banner for all stores not eligible to buy shipping labels.
* Tweak - Try WooCommerce Shipping modal copy.

= 2.8.1 - 2024-09-09 =
* Tweak - Hide migration banner for merchants still using legacy functionality.
Expand Down

0 comments on commit 2ab084b

Please sign in to comment.