Skip to content

fix(esp-sync): account for wp errors in email change sync#3860

Merged
chickenn00dle merged 1 commit into
releasefrom
hotfix/mailchimp-email-change-sync-strategy
Mar 25, 2025
Merged

fix(esp-sync): account for wp errors in email change sync#3860
chickenn00dle merged 1 commit into
releasefrom
hotfix/mailchimp-email-change-sync-strategy

Conversation

@chickenn00dle

Copy link
Copy Markdown
Contributor

All Submissions:

Changes proposed in this Pull Request:

While working on Automattic/newspack-newsletters#1787, I realized it was possible for get_contact_data to return a WP_Error. This fix accounts for this case.

How to test the changes in this Pull Request:

Code review should be enough.

Other information:

  • Have you added an explanation of what your changes do and why you'd like us to include them?
  • Have you written new tests for your changes, as applicable?
  • Have you successfully ran tests with your changes locally?

@chickenn00dle chickenn00dle requested a review from a team as a code owner March 25, 2025 16:21
@chickenn00dle chickenn00dle force-pushed the hotfix/mailchimp-email-change-sync-strategy branch from b0dbc2a to 1821bc7 Compare March 25, 2025 16:22
@chickenn00dle chickenn00dle force-pushed the hotfix/mailchimp-email-change-sync-strategy branch from 1821bc7 to 0db8382 Compare March 25, 2025 16:23
@chickenn00dle chickenn00dle added the [Status] Needs Review The issue or pull request needs to be reviewed label Mar 25, 2025
@github-actions github-actions Bot added [Status] Approved The pull request has been reviewed and is ready to merge and removed [Status] Needs Review The issue or pull request needs to be reviewed labels Mar 25, 2025
@chickenn00dle chickenn00dle merged commit d5d576d into release Mar 25, 2025
@chickenn00dle chickenn00dle deleted the hotfix/mailchimp-email-change-sync-strategy branch March 25, 2025 18:20
matticbot pushed a commit that referenced this pull request Mar 25, 2025
## [6.1.3](v6.1.2...v6.1.3) (2025-03-25)

### Bug Fixes

* **esp-sync:** account for wp errors in email change sync ([#3860](#3860)) ([d5d576d](d5d576d))
@matticbot

Copy link
Copy Markdown
Contributor

🎉 This PR is included in version 6.1.3 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

matticbot pushed a commit that referenced this pull request Mar 26, 2025
# [6.2.0-alpha.3](v6.2.0-alpha.2...v6.2.0-alpha.3) (2025-03-26)

### Bug Fixes

* **esp-sync:** account for wp errors in email change sync ([#3860](#3860)) ([d5d576d](d5d576d))
@matticbot

Copy link
Copy Markdown
Contributor

🎉 This PR is included in version 6.2.0-alpha.3 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

dkoo added a commit that referenced this pull request Mar 31, 2025
* feat(my-account): disable WC password nag

* feat(woo-member-commenting): optional module for member commenting (#3783)

* feat(woo-member-commenting): optional module for member commenting

* feat(woo-comments): use a constant array for settings

* Remove punctuation

Co-authored-by: Derrick Koo <dkoo@users.noreply.github.com>

---------

Co-authored-by: Derrick Koo <dkoo@users.noreply.github.com>

* fix: update paths to share button, social CSS in Perfmatters (#3810)

* feat(media): enable setting a default image for 404 images (#3811)

* fix(ga): check if post is not null before reading properties (#3817)

* feat(rss-feed): add feed enhancements for republication tracker; Atom feed URL (#3801)

* feat: add Lite sites feature (#3807)

* feat: add Lite sites feature

* feat: add lite site settings page

* feat(lite-site): update style

* fix: a few tweaks

* fix: i18n

* fix: option name

* feat: add hook to allow styles customizations

* fix: a few tweaks to the UI

* feat: i18n for strings

---------

Co-authored-by: Thomas Guillot <thomas@automattic.com>

* Fix: Guest Contributors Role Init for CLI and PHPUnit (#3828)

* fix: guest contributors role init for CLI (non-admin)

* fix: guest contributors role init: move line

* fix: guest contributors role init: phpcs cleanup

* Revert "refactor(corrections): remove corrections feature flag (#3797)" (#3825)

This reverts commit 7776957.

* feat: enable email change for newspack users (#3824)

* feat: enable email change for newspack users

* fix: check ff for non-a12s

* test: update JS tests (#3818)

* deps: update testing-library

* refator: prevent react warnings

* test: fix test failing after testing-library update

* feat(corrections-location): integrate Correction location logic (#3829)

* refactor(corrections): remove customizer settings for corrections location

* feat(corrections): add location metadata to corrections and update modal

* feat(corrections): separate corrections by location and update markup generation

* fix(tests): update correction tests

* refactor(corrections): simplify location check

* feat: update button label

* fix: clear empty space

* docs: update docs

* refactor: remove unused corrections active meta key

* feat: remove shortcode

* refactor: remove obsolete corrections shortcode tests

---------

Co-authored-by: Leo Germani <leogermani@automattic.com>

* fix(modal-checkout): endpoint to refresh newsletter lists via REST (#3841)

This PR fixes an issue where the newsletters modal was incorrectly showing all premium newsletters. We fix this by refreshing the newsletters lists post checkout.

* test: fix corrections test

* fix(reader-revenue): fatal when using woocommerce-paypal-payments@3.0.0 (#3848)

* feat(memberships): status reevaluation (#3845)

* feat(memberships): status reevaluation

* chore: fix linting

* chore(release): 6.2.0-alpha.1 [skip ci]

# [6.2.0-alpha.1](v6.1.1...v6.2.0-alpha.1) (2025-03-20)

### Bug Fixes

* **ga:** check if post is not null before reading properties ([#3817](#3817)) ([9dfa47a](9dfa47a))
* **modal-checkout:** endpoint to refresh newsletter lists via REST ([#3841](#3841)) ([79ea458](79ea458))
* **reader-revenue:** fatal when using woocommerce-paypal-payments@3.0.0 ([#3848](#3848)) ([1d73e17](1d73e17))
* update paths to share button, social CSS in Perfmatters ([#3810](#3810)) ([eb2ca7e](eb2ca7e))

### Features

* add Lite sites feature ([#3807](#3807)) ([cbd3e61](cbd3e61))
* **corrections-location:** integrate Correction location logic ([#3829](#3829)) ([6a7cd45](6a7cd45))
* enable email change for newspack users ([#3824](#3824)) ([1bfb458](1bfb458))
* **media:** enable setting a default image for 404 images ([#3811](#3811)) ([465928e](465928e))
* **memberships:** status reevaluation ([#3845](#3845)) ([ba4bea9](ba4bea9))
* **my-account:** disable WC password nag ([a22e756](a22e756))
* **rss-feed:** add feed enhancements for republication tracker; Atom feed URL ([#3801](#3801)) ([719983f](719983f))
* **woo-member-commenting:** optional module for member commenting ([#3783](#3783)) ([262f8bf](262f8bf))

### Reverts

* Revert "refactor(corrections): remove corrections feature flag (#3797)" (#3825) ([f5f6a5c](f5f6a5c)), closes [#3797](#3797) [#3825](#3825)

* feat: add custom check for media visibility (#3823)

* feat(corrections-modal): Improve Corrections Modal UX (#3835)

* feat(corrections-modal): enhance corrections modal UX with notices and card layout

* feat(corrections-modal): replace success notice with snackbar

* refactor(corrections-modal): replaced contained notice with global notice

* feat(corrections-modal): reorganise panels

* feat(corrections-modal): enforce correction saving

---------

Co-authored-by: Thomas Guillot <thomas@automattic.com>

* feat(corrections-modal): fix modal action buttons & state handling (#3852)

* feat(correction): Add Priority setting & refactor Block (#3844)

* feat(corrections): update correction box to have location settings

* feat(corrections-blocks): add variations for top and bottom correction box

* feat(correction-box): change default location to 'all' in block attributes

* feat(correction-box): upgrade variations and update icons

* refactor(corrections): change location meta to priority and update related logic

* refactor(correction-box): rename location setting to priority & update its logic & remove variations

* refactor(corrections-modal): rename location to priority and update related logic

* docs: update docs

---------

Co-authored-by: Leo Germani <leogermani@automattic.com>

* chore(release): 6.2.0-alpha.2 [skip ci]

# [6.2.0-alpha.2](v6.2.0-alpha.1...v6.2.0-alpha.2) (2025-03-25)

### Bug Fixes

* **reader-revenue:** fatal when using woocommerce-paypal-payments@3.0.0 ([#3848](#3848)) ([a3f6d6a](a3f6d6a))
* **woocommerce-email:** fix the subscription cancellation email ([fc1cc8c](fc1cc8c))

* fix: add check if product before gating content (#3850)

* chore(release): 6.2.0-alpha.3 [skip ci]

# [6.2.0-alpha.3](v6.2.0-alpha.2...v6.2.0-alpha.3) (2025-03-26)

### Bug Fixes

* **esp-sync:** account for wp errors in email change sync ([#3860](#3860)) ([d5d576d](d5d576d))

* feat: update custom bylines data structure (#3863)

* feat: information architecture (#3857)

Co-authored-by: Jared Rethman <jaredrethman@gmail.com>
Co-authored-by: Ron Chambers <116242607+ronchambers@users.noreply.github.com>
Co-authored-by: Derrick Koo <dkoo@users.noreply.github.com>
Co-authored-by: Rasmy Nguyen <raz@automattic.com>
Co-authored-by: Thomas Guillot <thomasguillot@users.noreply.github.com>
Co-authored-by: Laurel <laurel.fulford@automattic.com>

* feat: add canonical url to lite site single posts (#3865)

* chore(release): 6.2.0-alpha.4 [skip ci]

# [6.2.0-alpha.4](v6.2.0-alpha.3...v6.2.0-alpha.4) (2025-03-26)

### Bug Fixes

* add check if product before gating content ([#3850](#3850)) ([b9e385d](b9e385d))

### Features

* add canonical url to lite site single posts ([#3865](#3865)) ([471ad81](471ad81))
* add custom check for media visibility ([#3823](#3823)) ([c1d81dc](c1d81dc))
* **correction:** Add Priority setting & refactor Block ([#3844](#3844)) ([9232750](9232750))
* **corrections-modal:** fix modal action buttons & state handling ([#3852](#3852)) ([220d5d6](220d5d6))
* **corrections-modal:** Improve Corrections Modal UX ([#3835](#3835)) ([afc9844](afc9844))
* information architecture ([#3857](#3857)) ([6fb5951](6fb5951))
* update custom bylines data structure ([#3863](#3863)) ([9b66c1f](9b66c1f))

* fix(ia): render all emails on reset (#3867)

This fixes an issue where resetting an email template in Newspack > Settings > Emails would only render Woo templates on success.

* chore(release): 6.2.0-alpha.5 [skip ci]

# [6.2.0-alpha.5](v6.2.0-alpha.4...v6.2.0-alpha.5) (2025-03-27)

### Bug Fixes

* **ia:** render all emails on reset ([#3867](#3867)) ([519890f](519890f))

* fix(image-404-handling): handle 404 from other sites

* chore(release): 6.2.0-alpha.6 [skip ci]

# [6.2.0-alpha.6](v6.2.0-alpha.5...v6.2.0-alpha.6) (2025-03-31)

### Bug Fixes

* **image-404-handling:** handle 404 from other sites ([51998b8](51998b8))

* test: fix unit tests based on dates relative to "now" (#3875)

* fix: handle missing Mailchimp API key in auth status (#3873)

* fix: remove Mailchimp for WooCommerce from wizard (#3876)

* chore(release): 6.2.0-alpha.7 [skip ci]

# [6.2.0-alpha.7](v6.2.0-alpha.6...v6.2.0-alpha.7) (2025-03-31)

### Bug Fixes

* handle missing Mailchimp API key in auth status ([#3873](#3873)) ([81a6e51](81a6e51))
* remove Mailchimp for WooCommerce from wizard ([#3876](#3876)) ([4353a98](4353a98))

* fix(notices): fix PHP notice (#3872)

---------

Co-authored-by: matticbot <sysops+ghmatticbot@automattic.com>
Co-authored-by: Adam Cassis <adam.cassis@automattic.com>
Co-authored-by: Camilla Krag Jensen <naxoc@users.noreply.github.com>
Co-authored-by: Laurel <laurel.fulford@automattic.com>
Co-authored-by: Adam Cassis <adam@adamcassis.com>
Co-authored-by: Eddie Carrasco <eddies.code.shop@gmail.com>
Co-authored-by: Takshil Kunadia <71006004+Takshil-Kunadia@users.noreply.github.com>
Co-authored-by: leogermani <leogermani@automattic.com>
Co-authored-by: Thomas Guillot <thomas@automattic.com>
Co-authored-by: Ron Chambers <116242607+ronchambers@users.noreply.github.com>
Co-authored-by: Rasmy Nguyen <raz@automattic.com>
Co-authored-by: matticbot <semantic-release-bot@martynus.net>
Co-authored-by: Miguel Peixe <miguel.peixe@automattic.com>
Co-authored-by: Jared Rethman <jaredrethman@gmail.com>
Co-authored-by: Thomas Guillot <thomasguillot@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

released on @alpha released [Status] Approved The pull request has been reviewed and is ready to merge

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants