Prevent users from purchasing additional mailboxes when the associated subscription expires/is expiring #53189

olaseni · 2021-05-26T12:06:12Z

Changes proposed in this Pull Request

The email plan page checks the expiry status of the plan's subscription to determine if the user should be allowed to purchase additional mailboxes.
In the event that the subscription is very close to expiry or expired, a renew button is shown instead.

Testing instructions

Checkout this branch locally or use the live branch
View the email plan page for any email subscription i.e. Professional Email, or Google Workspace
Confirm that you are prompted to renew when the subscription has expired

github-actions · 2021-05-26T12:06:29Z

Test live: https://calypso.live/?branch=fix/prevent-new-mailboxes-for-expired-subs

matticbot · 2021-05-26T12:13:58Z

Here is how your PR affects size of JS and CSS bundles shipped to the user's browser:

Sections (~120 bytes added 📈 [gzipped])

name   parsed_size           gzip_size
email       +523 B  (+0.1%)     +120 B  (+0.1%)

Sections contain code specific for a given set of routes. Is downloaded and parsed only when a particular route is navigated to.

Legend

What is parsed and gzip size?

Parsed Size: Uncompressed size of the JS and CSS files. This much code needs to be parsed and stored in memory.
Gzip Size: Compressed size of the JS and CSS files. This much data needs to be downloaded over network.

Generated by performance advisor bot at iscalypsofastyet.com.

stephanethomas

A gentle reminder to add screenshots of the changes 🙂. This is what I see for that new option:

It appears as a button, which feels really weird. Looking at RenewButton it seems we don't need all the features it provides, so I believe we could just use a regular VerticalNavItem and call handleRenewNowClick() when it is clicked.

In the event that the subscription is very close to expiry or expired, a renew button is shown instead.

We are the May 27th today, and I was presented with this new button whereas my Titan subscription is supposed to expire on June 8th. That seems way too early to force users to renew. Looking quickly at needsToRenewSoon(), it seems it's even worse as we will basically show that button all the time for Titan subscriptions.

stephanethomas · 2021-05-27T15:44:10Z

client/my-sites/email/email-management/home/email-plan.jsx

+				<RenewButton
+					purchase={ purchase }
+					selectedSite={ selectedSite }
+					subscriptionId={ parseInt( purchase.id, 10 ) }


I would suggest this shorter and clearer approach:

Suggested change

subscriptionId={ parseInt( purchase.id, 10 ) }

subscriptionId={ Number( purchase.id ) }

stephanethomas · 2021-05-27T15:57:44Z

client/my-sites/email/email-management/home/email-plan.jsx


 		const addMailboxProps = this.getAddMailboxProps();
+
+		return (
+			<VerticalNavItem { ...addMailboxProps }>{ translate( 'Add new mailbox' ) }</VerticalNavItem>


This label should be Add new mailboxes per #53161.

Please make sure the translations are in for the other PR before merging this one with the updated string.

client/my-sites/email/email-management/home/email-plan.jsx

stephanethomas

I've tested it with a Titan subscription, and it worked great 👍.

client/my-sites/email/email-management/home/email-plan.jsx

a8ci18n · 2021-06-01T18:16:29Z

This Pull Request is now available for translation here: https://translate.wordpress.com/deliverables/5971840

Thank you @olaseni for including a screenshot in the description! This is really helpful for our translators.

commit 9da928a130c766411c2bf42c61899075e1717731 Author: Jarda Snajdr <jsnajdr@gmail.com> Date: Wed Jun 2 12:44:15 2021 +0200 Move getSiteId to state/sites/selectors (#53328) commit 49e3cef18f12a34fb9eb7472378e21e9bdf59e86 Author: Jarda Snajdr <jsnajdr@gmail.com> Date: Wed Jun 2 12:43:14 2021 +0200 requestSite should return a rejected promise on error (#53187) * requestSite should return a rejected promise on error * Fixup doRequest parameters * Fixup and modernize sites/actions tests * Fixup tests for Jetpack Authorize redirect * Fix SiteAddressChanger crash when the .wordpress.com domain is not primary commit 720e5c1904ab067e7ad600fa0f3b518a062f1574 Author: Camilla Krag Jensen <naxoc@users.noreply.github.com> Date: Wed Jun 2 12:28:16 2021 +0200 P2: Don't show privacy settings for hubs (#53278) commit a9c7b99abe29ca9474372cac60df9296999b7853 Author: Omar Alshaker <omar@omaralshaker.com> Date: Wed Jun 2 11:27:12 2021 +0200 Handle the case when useDispatch returns null in Block Editor NUX (#53309) commit b1a37cafd6f5bd66526107883e96001c3f0991de Author: Marin Atanasov <8436925+tyxla@users.noreply.github.com> Date: Wed Jun 2 11:12:01 2021 +0300 p2 Signup: Use Redux to check if user is logged in (#53303) commit 617ed42fd1a394f142bdc1c00fe7753b9297d408 Author: Sergio Cinos <sergio.cinos@gmail.com> Date: Wed Jun 2 05:51:40 2021 +0200 ci(unit): Refactor tests (#53206) commit 822d2aa7e216dfc59fec3aae60281f3e83d71318 Author: Aurorum <torres126@clubpenguinmountains.com> Date: Wed Jun 2 00:33:51 2021 +0100 Reader: Fix "List Not Found" Error (#53257) * Simplify selector * Remove missingLists * Remove tests * Update selector tests * Add DocumentHead to missing lists * Remove unneeded consts * Update ListMissing File * Ensure two <ReaderMain>s don't appear commit 41428b84c5e4aeadfe43b19a84a5b85c9eecf2ae Author: DanielSmithMichigan <dsmith11ql@gmail.com> Date: Tue Jun 1 18:20:55 2021 -0400 Update/52927 atomic upload theme tracks events (#53062) When a user clicks the "Install Theme" button, we now track what type of site this was done from: simple,atomic,jetpack,logged_out At this time the button is not visible unless the user is logged in, so the 'logged_out' branch in the code is not reachable * Themes: Track atomic users who click the 'Upload Theme' button. * Themes: Tracks Event for 'Install Theme' button now records a few extra attributes for more specific tracking * Themes: Use isAtomicSite selector instead of ATEnabled selector for install-theme-button tracks events * Themes: Corrected usage of isAtomicSite selector for install-theme-button tracks events * Themes: Temporarily added selected site id to tracks event for install themes button * Themes: Removed selected site id from tracks event for install themes button * Themes: Removed incorrect typecasting from install theme button properties * Themes: Removed allMySites tracking event from install themes button * Install Theme Button: Update tracks stats to single prop instead of multiple * Install Theme Button: Updated tracks event to also record logged out users * Install Theme Button: Updated tracks event to remove unreachable code * Install Theme Button: Updated tracks event to also record logged out users * Install Theme Button: Refactored tracks event code to be ordered in a way that is easier to read Co-authored-by: danielsmithmichigan <danielsmithmichigan@users.noreply.github.com> commit aa56c316554fb4766cf39f561bb312e09fb665a0 Author: Payton Swick <payton@automattic.com> Date: Tue Jun 1 14:52:49 2021 -0400 Checkout: Also show delete button when order review step is inactive (#52850) * Move delete icon to svg file * Make delete button visible when WPCheckoutOrderReview is inactive * Update deleteButtonId to include summary or edit version * Add aria-label to DeleteButton * Update tests to support multiple delete buttons on the page * Add aria role and label to CheckoutModal * Add testid data attributes to CheckoutStepBody to identify visibility * Add test for non-edit mode cart item removal * Change alignment of delete button Co-authored-by: Michael Cain <michael@michaeldcain.com> commit 50a3362617377c68d42129ef8178905cec1ef12b Author: Olaseni Oluwunmi <277661+olaseni@users.noreply.github.com> Date: Tue Jun 1 18:43:46 2021 +0100 Prevent users from purchasing additional mailboxes when the associated subscription expires/is expiring (#53189) * Add a renew button when the subscription needs to renew * Remove the RenewButton component * Refine the expiry logic * Adjust the threshold days * Show renewal item only when email account is expired * Remove falsy checks for `selectedSite` commit b35cd6303f89ce2f5692bd839f672e3b20603b9b Author: Damián Suárez <rdsuarez@gmail.com> Date: Tue Jun 1 14:23:09 2021 -0300 with-plugin-redirect: fix 1i8n string (#53147) commit abaf0fd5d3e765e606b5a0d2e02e5645ee637df9 Author: Bryan Elliott <bryan@elliottprogrammer.com> Date: Tue Jun 1 12:07:20 2021 -0400 Jetpack Backup: Update multisites to allow backup archive download (#53096) commit ad4986f4433c85abbc7639c5abf94e8c96bb675b Author: Matt Gawarecki <matt.gawarecki@gmail.com> Date: Tue Jun 1 11:00:34 2021 -0500 Notifications: Remove lodash (#53195) * Notifications: Replace _.get with safe navigation (?.) * Replace _.property with arrow functions * Replace _.pick with an object literal * Replace _.values with Object.values * Replace _.includes with Array.includes * Replace _.some with compound boolean expression * Replace _.find with Array.find * Replace _.findIndex with Array.findIndex, Array.indexOf * Replace _.matchesProperty with arrow functions * Replace _.range with Object.keys() * Replace _.pickBy with Object.fromEntries and Array.filter * Replace _.keyBy with Object.fromEntries and Array.map * Replace _.difference with Array.some/.filter/.map * Replace _.sortBy with Array.sort * Replace _.omit with new object+deleted keys * Replace _.mergeWith with Array.reduce * Replace _.zip with Array.map * Replace _.groupBy and _.reduce with Array.reduce * Remove unnecessary _.flowRight * Replace _.escapeRegExp with regexp test/replace * Remove lodash dependency * Make a few methods more readable/concise * Remove unused method 'setlatestTimestampSeen' * Add localStorage as an allowed global in some files commit 6f2ad8e1755939003fd0bab1dbd1e79accccb75e Author: Dehan <dehandecroos@gmail.com> Date: Tue Jun 1 17:45:50 2021 +0530 Restructure routes (#53284) * Restructure routes * MRoute fixes in other places commit b2f80f44c7f28503f0d14bcee4f3929466f65eb4 Author: Dehan <dehandecroos@gmail.com> Date: Tue Jun 1 17:45:32 2021 +0530 Remove all cart products when starting the marketplace flow (#53177) * Remove all cart products when starting the marketplace flow * Add new test for removing from basket * Fix broken unit tests for marketplace * Fixed code hygiene issues, and test issues with mock cleanup commit 2704810bbf946f2e6b055019a9c56e0831f2277f Author: Jarda Snajdr <jsnajdr@gmail.com> Date: Tue Jun 1 12:40:30 2021 +0200 Remove Redux navigation actions (#53042) * Remove Redux navigate from Comments * Remove Redux navigate from customer home cards * Remove Redux navigate from Reader data-layer handlers (lists) * Remove Redux navigate from disconnect Jetpack UI * Remove Redux navigate from Zoninator data-layer handler * Remove Redux navigate from Devdocs login controller * Remove Redux navigation from Activity Log links to Plugins * Remove Redux navigate from hosting support card * Add lib/navigate library * Replace Redux navigate actions with lib/navigate calls * Use lib/navigate for cross-origin navigations in invites * Use lib/navigate for customer home card action URLs * Remove most of navigation Redux middleware and related actions commit e41c8158b83e89036cd1c6ccd313d7ea02ab17e0 Author: Marin Atanasov <8436925+tyxla@users.noreply.github.com> Date: Tue Jun 1 12:52:43 2021 +0300 E2e: Remove abtesting helpers and overrides (#53277) * E2e: Remove abtesting helpers and overrides * Remove special abtest treatment for e2e tests commit e6a2a05e56c2584dab6de76ac30b416e712abf8b Author: Marin Atanasov <8436925+tyxla@users.noreply.github.com> Date: Tue Jun 1 11:23:05 2021 +0300 State: Refactor `getFileUploader` away from `redux-bridge` (#53279) * State: Refactor getFileUploader away from redux-bridge * State: Remove unused addWoocommerceProductImage commit 25ff0ab22ad7d8a7583902e6323867619b319f76 Author: Jarda Snajdr <jsnajdr@gmail.com> Date: Tue Jun 1 09:40:01 2021 +0200 Remove unneeded mocking of lib/abtest and i18n-calypso (#53282) commit c6f8c52682c4a22555902d8eabd2ebeb3d14697b Author: Jarda Snajdr <jsnajdr@gmail.com> Date: Tue Jun 1 09:38:31 2021 +0200 Remove the always-enabled login feature flags (#53191) * Remove the always-enabled login feature flags * Remove the isNative arg, update action=lostpassword URLs * Fix the server tests for login.haveBeenCalledWith * SignupForm: inline login URL variables, use addQueryArgs * Create a lostPassword path helper * lostPassword params are an object * EmailedLoginLinkExpired: inline link URLs commit e75e4413c4aaede891acd4b7e098ee7b104430fd Author: Jarda Snajdr <jsnajdr@gmail.com> Date: Tue Jun 1 09:36:32 2021 +0200 Remove the jetpack/connect/remote-install feature flag (#53275) commit 1de79683a010ce17ccdeb453603fe646997c73da Author: Chris R <chris.rosser@automattic.com> Date: Tue Jun 1 11:57:55 2021 +1200 Jetpack Search: handle disconnected sites (#53272) * Handle disconnected sites * Make positioning consistent between sections commit fa88bb40f4b8e0935e6972b17db523af09c66d8d Author: Renzo Canepa <rcanepag@gmail.com> Date: Mon May 31 10:59:24 2021 -0400 Jetpack Logged Out Checkout: fix usage of `checkoutBackUrl` (#53263) * Move block before userless checkout logic * Add jetpack/userless-checkout FF to jetpack envs commit badb8669bf5c25f7b13be8fbf68f6f15ee992208 Author: Marin Atanasov <8436925+tyxla@users.noreply.github.com> Date: Mon May 31 15:06:26 2021 +0300 Framework: Remove A/B test helper (#53276) commit a427da9634a2ca2cee16aff1534bb9604cbc3fc5 Author: Marin Atanasov <8436925+tyxla@users.noreply.github.com> Date: Mon May 31 14:08:57 2021 +0300 Reader: Remove unused abtest framework (#53274) * Reader: Remove unused abtest framework * Export as separate functions commit 397e4ee8e55218a287408d97c6389e3b5761f199 Author: Marin Atanasov <8436925+tyxla@users.noreply.github.com> Date: Mon May 31 10:25:41 2021 +0300 User: Move sendVerificationEmail out of lib/user (#53245) commit 1608561e256407bf0eb0114759ebcba08295f97c Author: Marin Atanasov <8436925+tyxla@users.noreply.github.com> Date: Mon May 31 10:25:01 2021 +0300 Reader: Remove unnecessary user utils mocks (#53253) commit f2faff2864f2828416e3b41fda47fff7e4a957a8 Author: Marin Atanasov <8436925+tyxla@users.noreply.github.com> Date: Mon May 31 10:24:18 2021 +0300 Help: Use Redux to check if user is logged in (#53251) commit 0524691e04e3c3450840c78f3d7bed998fad5f68 Author: Marin Atanasov <8436925+tyxla@users.noreply.github.com> Date: Mon May 31 10:18:58 2021 +0300 New Onboarding: Use Redux for users in `EditorCheckoutModal` (#53184) * Gutenboarding: Use Redux for users in EditorCheckoutModal * Remove connect() and use useSelector instead * Use the locale slug from useTranslate * Fix mock * Refactor canUserPurchaseGSuite to a selector and use throughout Calypso * Reorder conditions commit c31862949cbfe94bae62f26b30c1a9c5132b63cd Author: Jeremy Herve <jeremy@jeremy.hu> Date: Mon May 31 08:59:57 2021 +0200 Gardening action: update to latest version (#53273) This will avoid errors when the actions run from forked versions of the repo, and allow notify tasks to be run even from those PRs. commit 1673b0ffa4361f3289fc809f1eec32d8fe69ae6a Author: Chris R <chris.rosser@automattic.com> Date: Mon May 31 10:44:05 2021 +1200 Search: always hide footer in Jetpack Cloud (#53239) * Search: always hide footer in Jetpack Cloud * Update selector import commit 655e299c2abdd711f8c477eac1acb7fff49cb561 Author: Nicholas Sakaimbo <nsakaimbo@users.noreply.github.com> Date: Fri May 28 15:55:21 2021 -0600 desktop: deploy to wp-desktop repository (#53240) commit 4d27d7526942e0277158b89d0769fc4ff9011490 Author: Samiff <samiff@users.noreply.github.com> Date: Fri May 28 13:12:26 2021 -0600 Fix headerText value provided to FormattedHeader (#53259) In Automattic/wp-calypso/pull/53119 the `headerText` value passed to a <FormattedHeader> was changed, but the `selectedDomainName` prop can be either a string OR an object so a crash was occuring. commit a6afe47cf127b3c0f27766ff27d7d1cd5e74b97b Author: Renzo Canepa <rcanepag@gmail.com> Date: Fri May 28 14:04:16 2021 -0400 Jetpack Thank you page: Add info for users going through userless checkout (#53232) commit 674ff013514c9aee42d55d75cf62906d5c9e224a Author: Jessie Ross <jessie.ross@automattic.com> Date: Sat May 29 00:16:08 2021 +0800 Implement naiveClientSideRollout and replace conciergeUpsellDial (#53087) * Implement naiveClientSideRollout * Replace concierge upsell dial with naiveClientSideRollout * Fix rollout * Test naiveClientSideRollout * Add featureId parameter * Move naive-client-side-rollout out of ExPlat * Fix eslinting * Add hashing * Fix import reference * Rename and document naiveClientSideRollout * Minor fix * Fix test * Minor fixes * Fix imports * Fix formatting commit cf7860b24ba492ba48ad5487c4c0305c282af84e Author: Harris Papazolgou <hrrsppzgl@gmail.com> Date: Fri May 28 16:50:18 2021 +0300 Allow only non WPCOM accounts to be edited. (#53230) * Allow only non WPCOM accounts to be edited. * Updates copy. Co-authored-by: cpap <papazoglou.charalampos@gmail.com> commit 554dc36b211d3a6ba9703d0a85755dc2af62e9d5 Author: Kev <kevin.zoschke@automattic.com> Date: Fri May 28 09:04:18 2021 -0400 Rename `calypso_jetpack_product_click` tracking event (#53228) commit e7ad223ce02a8cef8c27f9bfab275c6293987dfb Author: Marin Atanasov <8436925+tyxla@users.noreply.github.com> Date: Fri May 28 16:01:26 2021 +0300 Purchases: Use Redux locale when downgrading (#53250) commit be1bb4137134bb04c712a84270ad01a623ede657 Author: Răzvan Papadopol <razvan.papadopol@automattic.com> Date: Fri May 28 15:36:02 2021 +0300 Remove Launch button from editor top bar (#53115) * Remove the Launch button for all flows except AnchorFM * Load 'focused-launch' code only for AnchorFM commit 6e03222a8b6b27fea2a65fdce6ea83d2cdee281c Author: Marin Atanasov <8436925+tyxla@users.noreply.github.com> Date: Fri May 28 15:13:28 2021 +0300 i18n: Refactor away from lib/user in Community Translator (#53247) commit da6fae2ada7aa1c7e1811b3f809d0e8d5475e7b0 Author: richardkang112 <50002894+richardkang112@users.noreply.github.com> Date: Fri May 28 06:11:00 2021 -0400 Fix #14694 Single dot (.) should be a valid of a DNS SRV record target (#53237) commit c4dacad025f910ce1f6ef3d3397f200bdbe801bc Author: Marin Atanasov <8436925+tyxla@users.noreply.github.com> Date: Fri May 28 13:02:25 2021 +0300 User: Remove unused getLanguage() method (#53246) commit a7a28565489da8d50b449d6976c4c5e636b9f018 Author: Maggie <maggie.cabrera@automattic.com> Date: Fri May 28 11:30:07 2021 +0200 Renamed blank-canvas-blocks to blockbase (#53142) commit 9c7ee60165b38473cdf566f21f74af5dfe340a43 Author: Kamen Stanev <hambai@gmail.com> Date: Fri May 28 11:30:44 2021 +0300 Update the domain management header to show the selected domain (#53119) Managing domain settings can be confusing when you have multiple domains because you might not be sure which domain you're managing. In order to make that clearer we've decided to show the domain name instead of the fixed "Site domains"/"All domains" header so it's always clear which domain settings you're editing commit 29b0b43758f0bab053792858612927bec09c5d34 Author: Kamen Stanev <hambai@gmail.com> Date: Fri May 28 10:58:44 2021 +0300 Remove unused e2e test steps for domain mapping (#53143) Clean up unused test steps as we don't go through checkout when mapping a domain for users with plan - follow up to #52297 . commit 41c6d5b47c02c576dbd98d0194b9cde9f54ab499 Author: Taegon Kim <gonom9@gmail.com> Date: Fri May 28 11:13:02 2021 +0900 Fix: Bulk media editor does not save captions reliably (#52919) * Fix: Bulk media editor does not save captions reliably * update immediately before the field reset * Update client/my-sites/media/main.jsx Co-authored-by: Yan Sern <yan.sern@automattic.com> * Remove lodash package no longer needed. Co-authored-by: Yan Sern <yan.sern@automattic.com> commit 431739d86a8772c043a0e560666477392652d792 Author: Taegon Kim <gonom9@gmail.com> Date: Fri May 28 11:12:21 2021 +0900 Domain suggestions are not displayed when moves back from checkout page (#52798) * Domain suggestions are not displayed when moves back from checkout page * Remove unnecessary return statements * Fix broken tests commit e51b5646e0fca911017763959e8526c75a054861 Author: Aurorum <torres126@clubpenguinmountains.com> Date: Fri May 28 02:32:13 2021 +0100 Reader: Fix Users Being Unable to Add Site to a List (#53234) commit 3a7d8d9e4b434a26bf765a848942f512ffd8cd11 Author: Philip Jackson <p-jackson@live.com> Date: Fri May 28 11:14:25 2021 +1200 My Home: Promote the menu editing tutorial as the primary action in the "Edit the site menu" task (#52990) commit 0fa8f32fb9d3db2d66c8714815d4216a113f789d Author: Chris R <chris.rosser@automattic.com> Date: Fri May 28 10:39:53 2021 +1200 Search: enable Jetpack Search section in Jetpack Cloud dev (#53208) commit 8ac6803deba6b3610f4f62736efacd258e3df7fa Author: Sergio Cinos <sergio.cinos@gmail.com> Date: Thu May 27 21:43:50 2021 +0200 ci(e2e): Clean up (#53214) * Fix typo in jetpack notifications channel * Do not run jetpack scheduled tests in CircleCI * Notify GB tests commit 173c811ce134b3dce405a7c59fe36cf5d6480077 Author: Noah Allen <noahtallen@gmail.com> Date: Thu May 27 11:32:43 2021 -0700 TeamCity: Add build type for Smart Builds (#53203) * Add build type for launching builds commit a5c944089506fb6404fd7cfcc8db60d704a2accc Author: Nicholas Sakaimbo <nsakaimbo@users.noreply.github.com> Date: Thu May 27 11:44:13 2021 -0600 desktop: fix window and view references (#53231) commit 41a25aa9678f592773353f3fa0c95b7a9b3cf3a3 Author: Edwin Takahashi <egao@outlook.com> Date: Thu May 27 10:24:38 2021 -0700 Add myself to package/calypso-e2e (#53210) commit 1967a84f8d1605861b346998b7785baa4d770adf Author: Bart Kalisz <bartlomiej.kalisz@gmail.com> Date: Thu May 27 16:22:49 2021 +0200 E2E: Fix failing Gutenberg & CoBlocks specs (#53155) commit 17d7d8f56b512929e875a5e5ea4d0db2e8443b2c Author: stefannhs <StefanNieuwenhuis@users.noreply.github.com> Date: Thu May 27 16:12:27 2021 +0200 Design Picker - Blank Canvas: Flip is_alpha switch (#53218) * update available designs by switching the is_alpha flag for the blank canvas design, we releasing it and enabling it for all users on production without having to use feature flags and such alike. * remove is_alpha flag from blank canvas design config commit a1470e64ce1aa21b2cccad1b47f6b1559d5f0b43 Author: Jessie Ross <jessie.ross@automattic.com> Date: Thu May 27 22:11:36 2021 +0800 Remove inactive ABtest entries (#53083) * Remove legacy reskinned-signup-flow abtest entry * Remove legacy pageBuilderMVP abtest * Remove legacy userlessCheckout abtest entry * Remove legacy newUsersWithFreePlan abtest entry * Remove unused wait for geo data This won't be needed for the ExPlat re-runs * Add warning * Fix typo commit 141d3a498698770293d5f2dfcacaf11456ccf793 Author: Marin Atanasov <8436925+tyxla@users.noreply.github.com> Date: Thu May 27 14:46:55 2021 +0300 Settings: Refactor Post Formats to use `react-query` (#53077) * Settings: Refactor Post Formats to react-query * Use wpcom.req.get directly * Remove UndocumentedSite.prototype.postFormatsList * Simplify useSelector usage * Refactor away from _.map() * localize() -> useTranslate() commit b066ad4aab9b78ecacdfeb039ed2d6ee05530dfa Author: Jarda Snajdr <jsnajdr@gmail.com> Date: Thu May 27 12:31:09 2021 +0200 Comments: use Calypso comment links even for Jetpack sites (#53219) commit 11a4cbf951684fb0275fbab02f2c6e20c0289884 Author: Miguel Torres <miguel.torres@automattic.com> Date: Thu May 27 11:10:05 2021 +0200 Upgrades: Fix Activity Log banner on Atomic sites (#53146) commit 6840bbd32877fbb03943082ff3c16da30c17e85f Author: Jarda Snajdr <jsnajdr@gmail.com> Date: Thu May 27 06:33:16 2021 +0200 QueryTicketSupportConfiguration: refactor to hooks (#53190) commit b5a02fb4f2413e7d63eb1b7a154aeb0ded97cb5b Author: Jarda Snajdr <jsnajdr@gmail.com> Date: Thu May 27 06:32:36 2021 +0200 ProfileGravatar: use classNames and useDispatch (#53188) commit df54776e436ae6b13401d31ea2e20906abd6f8f6 Author: Yan Sern <yan.sern@automattic.com> Date: Thu May 27 02:07:42 2021 +0200 Signup Flow: Fix paid items missing from cart by removing siteSlug dependency when changing flows (when it makes sense to). (#52434) * Reset signnup dependencies before initializing flow controller We reset dependencies to address an edge case where, if we start a launch flow in one tab and an onboarding flow in another, paid items selected in the onboarding flow don't show up in the site's cart. This happens because the launch flow persists its site slug in stored dependencies in indexedDB, which is subsequently referenced in the onboarding site flow. As a result, any paid items selected in onboarding will be added to the launch site's cart. * Remove siteSlug when changing signup flows when conditions are right. * Remove debugger. Co-authored-by: Jeremy Yip <jeremy.yip@automattic.com> commit b01962f09b74c90195f6b39a8c2df7c5fd70f219 Author: Michael Cain <cain@automattic.com> Date: Wed May 26 17:31:07 2021 -0400 Checkout: update logic for "Site:" indicator (#53164) * Show domain mapping domain for `Site:` * Use primary domain when one exists * Improve code readability commit 89dc7e2fdd974b658abbae1f4a4c8999024cc7c8 Author: Aurorum <torres126@clubpenguinmountains.com> Date: Wed May 26 21:19:27 2021 +0100 Marketing - Site Verification: Add Facebook Domain Manager (#52474) * Site Verification Tools: Add Facebook Domain Manager * Use updated link from Jetpack PR * Update client/my-sites/site-settings/seo-settings/site-verification.jsx * Simplify code * Add services file * Ensure invalidCodes error disappears if site changes * Update site-verification.jsx * Fix linter * Update docblock Co-authored-by: Samiff <samiff@users.noreply.github.com> * Include space Co-authored-by: Jeremy Herve <jeremy@tagada.hu> Co-authored-by: Samiff <samiff@users.noreply.github.com> commit 5aac7a4b9166d6a0fb9c76022071eb2275c7303d Author: Nicholas Sakaimbo <nsakaimbo@users.noreply.github.com> Date: Wed May 26 13:01:02 2021 -0600 desktop: browser view and title bar controls (#53132) commit 0a0fa04de907ef1406ce0bb5dcfd814013dcee5d Author: Kev <kevin.zoschke@automattic.com> Date: Wed May 26 11:18:57 2021 -0400 Add calypso_jetpack_product_click tracking event (#53193) commit e3f7491e2e71ace5c4690ef057df8480a74785af Author: DanielSmithMichigan <dsmith11ql@gmail.com> Date: Wed May 26 11:06:36 2021 -0400 Themes: Remove reference to blank menu item, since it looks like the showAutoLoadHomepageWarning will function correctly without it (#53015) The showAutoLoadHomepageWarning option in theme-options.jsx has been removed, since it is creating an unused blank menu item. The autoLoadHomepageWarning modal does not need this option, since the modal is created when the "activate" button is clicked, by dispatching the autoLoadHomepageWarning action from that button's action. See https://github.com/Automattic/wp-calypso/pull/53015 for more information. commit 8fc1e567ec63d59b711eb1ca5acd02bb54515f23 Author: Stéphane Thomas <email@stephanethomas.com> Date: Wed May 26 17:00:22 2021 +0200 Emails: Fix wrong error color on Email Plan page (#53160) * Emails: Fix wrong warning color on Emails page * Emails: Show errors instead of warnings on Emails and Email Plan pages commit c06a8e1e83cd32b2b030c7a205b680fd4da1f773 Author: Stéphane Thomas <email@stephanethomas.com> Date: Wed May 26 16:58:49 2021 +0200 Titan: Rename Add Mailboxes component with more accurate name (#53152) commit 1b0d54a6b4706febfc2682e62d28198ebea23882 Author: Divyam Rastogi <divyamr@flock.com> Date: Wed May 26 18:49:00 2021 +0530 Change position of Mailbox menu to bottom (#53182) commit 21a3a297f8c32154556959defebe5ccdf2d32305 Author: Marin Atanasov <8436925+tyxla@users.noreply.github.com> Date: Wed May 26 15:38:31 2021 +0300 User: Remove unused getAvatarUrl method (#53185) commit 552ef1ca24da1c59f72d252592ed92b2ddd61d64 Author: flootr <m.do@posteo.net> Date: Wed May 26 14:34:17 2021 +0200 QueryTaxonomies: refactor away from `UNSAFE_` lifecycle methods (#53183) commit 45bee3c8b153822bf9b0220324f234622b9a0cad Author: Marin Atanasov <8436925+tyxla@users.noreply.github.com> Date: Wed May 26 14:45:50 2021 +0300 Tests: Cleanup unused user library mocking (#53186) commit db584fece8fe1a99cb1429f44b34f78d4fe10226 Author: Bart Kalisz <bartlomiej.kalisz@gmail.com> Date: Wed May 26 10:36:58 2021 +0200 E2E: Ensure domain registration is removed from cart (#53153) commit 8c7669e744b5dfda7b8d07fbe4afb9655c293316 Author: Bart Kalisz <bartlomiej.kalisz@gmail.com> Date: Wed May 26 10:35:30 2021 +0200 E2E: Make sure dedicated helpers are used (#53145) commit 53b5e50ef6412d1572ca6aa1983dc580bbc9fdec Author: Philip Jackson <p-jackson@live.com> Date: Wed May 26 20:21:14 2021 +1200 Add support for the verify email task on My Home (#53035) commit da554c3c02d10e3ed27c79391ae8b5d0687918e9 Author: Philip Jackson <p-jackson@live.com> Date: Wed May 26 20:01:47 2021 +1200 My Home: Record tracks event for celebration notices (#53134) commit 18ff18a2d1e94a558a3d7a8b82ccb54bb45368ae Author: Omar Alshaker <omar@omaralshaker.com> Date: Wed May 26 09:58:46 2021 +0200 Domain picker recommended badge: adjust padding according to screensize (#53016) commit fcd2fb752880aa6affad0a229e96b2ade36086fa Author: Marin Atanasov <8436925+tyxla@users.noreply.github.com> Date: Wed May 26 10:17:25 2021 +0300 WooCommerce: Remove even more unused code (#53162) commit 4eb618ea874cef5a36a20fcfcc406534dae09ce1 Author: Marin Atanasov <8436925+tyxla@users.noreply.github.com> Date: Wed May 26 10:16:26 2021 +0300 Components: Remove Jetpack FreshStart2021SaleBanner (#53163) commit 70c97bf7c18e0f74c214ecb567262c1fd4f613a7 Author: Marin Atanasov <8436925+tyxla@users.noreply.github.com> Date: Wed May 26 10:15:52 2021 +0300 Components: Refactor HEs to use react-query (#53157) commit 4991d6172abb67d51563314957c3281a5bd5d36b Author: Edwin Takahashi <egao@outlook.com> Date: Tue May 25 23:11:35 2021 -0700 Playwright: add unit tests for calypso-e2e module (#53034) * Unit tests for @automattic/calypso-e2e BrowserManager * Add MediaHelper tests. * Implement additional tests * Additional tests for getScreenshotDir * Add tests for getVideoDir() * Move all describe blocks into one top level block to remove redundant beforeAll and afterAll setups. * Migrate `@automattic/calypso-e2e` unit tests to use the inherited Jest configuration. - remove dependencies on Jest from package.json. - remove test config values, with it being replaced with a mocked `config` module. - remove file header. * Changes to package.json commit 16119d0f07ed4a313f543aa31c1c4a7689f63d1b Author: Sergio Cinos <sergio.cinos@gmail.com> Date: Wed May 26 06:39:36 2021 +0200 ci(e2e): Add JETPACKHOST as a configurable param (#53117) * Add JETPACKHOST as a configurable param * Pass a list as select options * Fix typo in template * Export TARGET * Use PRESSABLEBLEEDINGEDGE as the default JETPACKHOST commit 6ef9f9278aaf368cd629ba69c33c4768dc7ea08d Author: Philip Jackson <p-jackson@live.com> Date: Wed May 26 13:13:44 2021 +1200 My Home: remove old stats card copy now that translations are complete (#53103) commit d5190a5487e48bf65ed2bb7eb14e968d94b7c9bd Author: Philip Jackson <p-jackson@live.com> Date: Wed May 26 13:12:18 2021 +1200 Revert "`?shuffle` param on My Home will request shuffled views" (#53105) commit 7fafc3be9ed329b4f374d2f4023193b7bd1163f0 Author: Ramon <ramonjd@users.noreply.github.com> Date: Wed May 26 10:31:30 2021 +1000 Initial commit. (#53069) Checking pattern meta for block type values and adding them to the options array when registering blocks with `register_block_pattern` Added tests commit e3465afee05c1e9ea083d585d2c91d940c0174c9 Author: Noah Allen <noahtallen@gmail.com> Date: Tue May 25 16:45:47 2021 -0700 Remove sass tilde imports (#52800) * Remove sass tilde imports * Fix wp stylesheet import commit 59e77ed870aff419911f6c01da469c4c8c372f99 Author: Noah Allen <noahtallen@gmail.com> Date: Tue May 25 14:32:23 2021 -0700 Switch to Dart Sass from `node-sass` (#52729) * Replace node-sass with dart sass * Render custom stylesheets with dart sass commit a2982db5d6ed46cbbec2fa690cdaea08b5f30032 Author: Kev <kevin.zoschke@automattic.com> Date: Tue May 25 16:16:28 2021 -0400 Prevent redirects from running unwanted code (#53165) commit ae0b8a6da639ac05c881ac489c85babfce183082 Author: Payton Swick <payton@automattic.com> Date: Tue May 25 14:34:59 2021 -0400 Signup: Convert lib/signup/cart to TypeScript (#53129) * Export convertResponseCartToRequestCart from shopping-cart package * Convert lib/signup/cart to TypeScript * Fill in missing types in SignupCart tests * Remove unnecessary code commit a2e07a3e2d1820ee0e23c212ea9c650eadd04c5a Author: Brent Sessions <31110506+bsessions85@users.noreply.github.com> Date: Tue May 25 13:31:36 2021 -0400 Tests: Stop using the featured tab so things don't break when featured changes (#53020) * Stop using the featured tab so things don't break when featured changes * Update some reference images * clean up linting commit e0b9a6354e51b817c8f723227865e56aebf62c80 Author: Marcelo Serpa <81248+fullofcaffeine@users.noreply.github.com> Date: Tue May 25 11:30:38 2021 -0500 [ETK/wpcom-block-editor] Use `__unstable` InserterMenuExtension if available, fallback to `__experimental` (#53131) * Use `__unstable` `InserterMenuExtension` if available, fallback to `_experimental` It has been renamed here: https://github.com/WordPress/gutenberg/pull/31417 (>= Gutenberg v10.7.0-rc.1) The fallback is needed until we're sure all relevant systems are consuming packages from GB >= v10.7.0-rc.1. + Add exclusion to the `wpcalypso/no-unsafe-wp-apis` esline rule, keep the old one for now; + Update the experimental features E2E test to fail if the new symbol can't be found. * Revert experimental features E2E to check for `__experimentalInserterMenuExtension` while Gutenberg v10.7.x is not in production commit 31c8e94f096cd0f19ff2fc8c81da376e2221770f Author: flootr <m.do@posteo.net> Date: Tue May 25 17:16:32 2021 +0200 FollowButton: refactor away from `UNSAFE_componentWillMount` (#53148) * FollowButton: refactor away from `UNSAFE_componentWillMount` * call `translate` directly in `render` method commit ac32492dd3d8085303aad36bdeb584d43d34658a Author: Kev <kevin.zoschke@automattic.com> Date: Tue May 25 10:20:16 2021 -0400 Fix Jetpack plans URL duration parameter (#53028) commit 17e0295943718d4cf902d571989fc8f7c76b4026 Author: Camilla Krag Jensen <naxoc@users.noreply.github.com> Date: Tue May 25 16:02:49 2021 +0200 Redirect on plans page for P2-non-hubs (#52784) * Redirect on plans page for P2-non-hubs * Changes from review feedback * Return null consistently when there is no hub blog id * Consistently return bool and only redirect if we have a slug * Add redirect middleware to test commit f87c176450aa7ef3bbe487736336166b1c22d12e Author: Michael Cain <cain@automattic.com> Date: Tue May 25 09:04:00 2021 -0400 Show blog callout when no content; remove unused pages prop (#53123) commit de9e6a55f94dfe4c43776ef41809e02fbdd58b16 Author: Miguel Torres <miguel.torres@automattic.com> Date: Tue May 25 14:38:06 2021 +0200 Pages: Show count on Jetpack and Atomic sites (#53140) commit 38f2532c9ecd93b44fb237c22bdb8ce948525791 Author: Bart Kalisz <bartlomiej.kalisz@gmail.com> Date: Tue May 25 14:19:56 2021 +0200 E2E: Ensure plan is removed in secure checkout (#53055) commit 53f35e22843a8cd971b40c621c2935ac4341a572 Author: Bart Kalisz <bartlomiej.kalisz@gmail.com> Date: Tue May 25 14:02:20 2021 +0200 E2E: Make sure isElement* helpers are used correctly (#53054) commit 078556b7d6501b256fd903991d7337a1e738664c Author: Bart Kalisz <bartlomiej.kalisz@gmail.com> Date: Tue May 25 12:04:25 2021 +0200 E2E: Make module import naming consistent (#53048) commit 833ee9cce19affacc89b56c3e528c3817bc344b9 Author: Paul Bunkham <paul@dobit.co.uk> Date: Tue May 25 10:41:40 2021 +0100 Account Settings: Stop accessing preferences via user settings (#53124) On the account settings page, we are reading and saving the `colorScheme` and `linkDestination` preferences via the `userSettings`. This can cause synchronisation problems. In #51448 we fixed this by saving the preference as well as the user settings, but it seems that this preference is only accessed in Layout using `getPreference`, so it should be safe to save the preference in the usual way. In #52911 we swapped to reading the `linkDestination` preference using `getPreference`, but as @noahallen noted, the links aren't updated when the preference is changed, without refreshing the page. Swapping to using `savePreference` to set its value, solves this problem. Both preferences were being immediately saved as their value changed, so dispatching the redux action seems fine. The other interface settings also update straightaway, without a separate save action, so it's ok to remove the `markChanged` call. The downside of this is that we aren't notified of a successful save by default, so we are no longer displaying the settings saved notification. We could add this back in, but it doesn't feel necessary. commit 617658587d69ac797aaf8f89855fc7ffd68668af Author: Omar Alshaker <omar@omaralshaker.com> Date: Tue May 25 11:38:15 2021 +0200 Dont bail on filteredProgressedSteps array when it's unempty (#52826) commit d6944754e1e3c9a8365c9f535e3190c37a1f565a Author: Marin Atanasov <8436925+tyxla@users.noreply.github.com> Date: Tue May 25 12:21:28 2021 +0300 General: Remove unused imports and vars (#53046) commit 1877a84f70c98053f1223e12e1573063222c98f1 Author: flootr <m.do@posteo.net> Date: Tue May 25 10:30:37 2021 +0200 QuerySiteSettings: refactor away from `UNSAFE_componentWillReceiveProps` (#53007) * QuerySiteSettings: refactor away from `UNSAFE_componentWillReceiveProps` * fix failing unit tests * guard against nullish `siteId` commit 2d96b3c5207c69a5d6bf029ef5abe2aeabfb95e4 Author: daledupreez <dale@automattic.com> Date: Tue May 25 09:27:32 2021 +0200 Enable email/centralized-home flag in horizon, staging, and production (#53111) commit 834e397a3805aa1115bf1572219d33858927acff Author: Sergio Cinos <sergio.cinos@gmail.com> Date: Tue May 25 07:06:21 2021 +0200 ci(e2e): Fix CSS selectors (#53136) commit 6ac832ed973a9a54c3f4feb204bb554e08ee1c28 Author: Dehan <dehandecroos@gmail.com> Date: Tue May 25 09:52:57 2021 +0530 Add state infrastructure for marketplace flow state (#53037) * Add state infrastructure for marketplace flow state * Unnecessary change * Add unit tests and review fixes * Change primary domain setting wording to avoid confusion commit 6816ccc5cc116a745df782e10634fc888a03b1a1 Author: jordesign <jordan@jordesign.com> Date: Tue May 25 13:14:27 2021 +1000 Update myhome homepage not home page (#53101) * Update 'home page' to 'Homepage' for tasks in My Home commit ff23ee9dfec7482131c7c7ec8c3c81bba1250487 Author: daledupreez <dale@automattic.com> Date: Mon May 24 19:49:21 2021 +0200 Add Google mailbox warnings to email plan page (#53032) * Add constants and helper functions * Build dedicated EmailMailboxWarnings component * Refactor EmailPlanMailboxesList to use new mailbox warnings component * Remove redundant prop * Wire into EmailPlan and introduce getAccount() function * Rename classes to match new component * Improve vertical alignment for Admin badge and add space for external link icon in warning CTAs * Increase font size for mailbox-level warnings * Sort imports * Simplify warning existence check * Rename external to isExternal * Refactor internal/local components to use aligned names and simpler props * Refactor logic for Finish setup button * Show Pending at the mailbox level when account ToS haven't been accepted * Hide overflow menu when account ToS haven't been accepted * Use constant from trunk commit 7147e326e55e3574f725918800c0645fa2e575ca Author: daledupreez <dale@automattic.com> Date: Mon May 24 19:46:56 2021 +0200 Show correct link for Add new mailbox (#53091) commit 3e29ce76ffdc3d15fcd65e5daf61d8c4d72abee1 Author: Sergio Cinos <sergio.cinos@gmail.com> Date: Mon May 24 19:19:20 2021 +0200 ci(e2e): Make the shopping-cart-widget more robust (#53114) * Make the shopping-cart-widget more robust * Fix typo commit f9def4bfd3958309062af5d9aa136242205a8616 Author: daledupreez <dale@automattic.com> Date: Mon May 24 17:12:41 2021 +0200 Add Main with wideLayout wrapper to manage all mailboxes page (#53090) commit 9f383140fda338799034b64613a1a25ac7962e57 Author: Stéphane Thomas <email@stephanethomas.com> Date: Mon May 24 17:12:12 2021 +0200 Emails: Update Add New Mailboxes/Users pages with section header (#53047) * G Suite: Update Add New Users page with section header * Add Main wrapper; fix analytics path; adjust analytics title; use correct back handler * Add page view tracker to TitanMailAddMailboxes * Update header for TitanMailAddMailboxes * Use wide layout for TitanMailAddMailboxes Co-authored-by: Dale du Preez <dale@automattic.com> commit f6f24de2b0a5f556c5573969bcca926eb948f065 Author: Del Putnam <del@putnams.net> Date: Mon May 24 11:07:42 2021 -0400 Add option to update wpcom contact email from domain contact page (#53080) * Add option to update wpcom contact email from domain contact page * disable checkbox when contact email matches wpcom email * Return option to update wpcom email separate from whois info. * Refactor how checkbox is added to contact form; Make actual call to update WPCOM email address. * Remove unused files. * Make info notice about email change confirmation persistent. * Delete unused object property instead of setting to null. * Remove unnecessary changes from * Move checkbox disabled state to variable for clarity. * No need to send update flag to updateWhois * Revert changes to action.js * Add new field to checkbox * Properly update jest snapshot commit 655c5785f88965cf6a3f68174554c82a3dd621e7 Author: Del Putnam <del@putnams.net> Date: Mon May 24 10:49:59 2021 -0400 Fix adding domain and plan to cart in signup flow (#53093) * Fix adding domain and plan to cart in signup flow * Update call to so it uses array instead of object commit 025838ddc8829ea111a0b6fadebafcd90beca7c0 Author: daledupreez <dale@automattic.com> Date: Mon May 24 15:56:51 2021 +0200 Add two status checks to email plan header (#53092) * Add helpers for unverified forwards * Add pending G Suite ToS acceptance helper * Add checks for pending ToS and limit check for unverified forwards * Fix lint issues introduced during rebase commit fb2a25a11cca28c075a9b123ded372c30742cd8e Author: Kamen Stanev <hambai@gmail.com> Date: Mon May 24 16:53:31 2021 +0300 Fix how we handle unsupported premium domain searches (#53079) Sometimes our domain suggestion engine returns premium domain suggestions even when we don't support the TLD if you enter an exact premium domain search string. However we also do an explicit availability check for that domain so we can safely discard the domain suggestion record from the results. commit cf1e41b9110d9a40b3aa45f9ad525176489b9555 Author: Sergio Cinos <sergio.cinos@gmail.com> Date: Mon May 24 13:50:47 2021 +0200 ci(e2e): Teamcity - Fix relative paths (#53112) commit c437b6c19102107395c7e263463b2dff25901949 Author: Olaseni Oluwunmi <277661+olaseni@users.noreply.github.com> Date: Mon May 24 10:49:38 2021 +0100 Show Finish Setup warnings for Google Workspace on Email Plan page (#53068) * Add warnings for pending Google TOS acceptance * Refine function names commit a033b7c8669c0b3fe15f44cdfd4d86e774560bad Author: Dehan <dehandecroos@gmail.com> Date: Mon May 24 14:32:28 2021 +0530 Completion of the next step of the plugin details page in 3 simplest flows (#52821) * Initial plugin detailas happy path * Added feture flag to domain redirect * Add initial logic to decide next step * Added tests and seperate component for purchase area * Preload wpcom staging sub domain commit 59c3219d5c3fe89fd2e200e78889d2ad541b6b60 Author: Aurorum <torres126@clubpenguinmountains.com> Date: Sun May 23 23:15:02 2021 +0100 Revert "My Home: Remove Visit Site Button" (#53078) This reverts commit 70bb5a6cac1937dcdadf2742966233fe42d65c9b. commit 2c4059da642213823ecb4370d783ed16f8162920 Author: Paul Bunkham <paul@dobit.co.uk> Date: Fri May 21 22:15:28 2021 +0100 Nav Unification: Fix dashboard appearance check when loading the editor (#52911) * Nav Unification: Fix dashboard appearance check when loading the editor In #51108 we introduced a check to determine if the dashboard appearance option was on, and if so, redirect to `wp-admin` rather than load the Gutenframe. This also affected any links to the editor. Unfortunately, there was a misinterpretation of user settings. Where we can technically read the `calypso_preferences` from user settings, we should be using the alternative `/me/preferences` endpoint. One of the reasons for this is that the user token to access settings can become stale, requiring people with 2FA active to input an auth code. That in turn means that the request to access user settings fails and when loading the editor, we wait for a timeout before continuing. This creates an unacceptable delay when loading the editor as noted in #52651 which this fixes by swapping to using the 'preferences' part of the store, rather than user settings. * Fix unit test * Fix close-editor-url test * Provide a default for the linkDestination preference commit b6155a8dfa6a249f272fa0a158be162650e39e29 Author: Payton Swick <payton@automattic.com> Date: Fri May 21 13:03:21 2021 -0400 Checkout: Enable Google Pay in production (#53081) * Enable Google Pay in production * Disable Google Pay in Jetpack Cloud I'm pretty sure Jetpack cloud does not include checkout. * Enable Google Pay in test commit ed464e359b95f9db0d0f0119774130c1f1495db3 Author: Damián Suárez <rdsuarez@gmail.com> Date: Fri May 21 13:50:29 2021 -0300 cloudflare: do not show banner for jetack_free (#53052) commit 1c64be7e4f7ddb9e04ab08173dd745c383a954b7 Author: Payton Swick <payton@automattic.com> Date: Fri May 21 11:48:25 2021 -0400 Shopping Cart: Remove 'invalid' coupon type (#52932) * Fix optional label type on Field component * Remove 'invalid' from CouponStatus type * Remove 'invalid' from useShoppingCart reducer * Convert checkout Coupon component into TS and remove 'invalid' * Remove 'error' from CouponStatus type * Remove invalid/error from shopping-cart README * Remove unused isJetpackCheckout prop on WPCheckout * Fix type error when creating jetpack checkout siteId commit 07b0bc895c04cadd0aa2493a06866ac1b7f9e308 Author: dlind1 <dlind1@users.noreply.github.com> Date: Fri May 21 17:00:26 2021 +0200 Fix translations loading for Jetpack plans (#52889) * Fix the concurrency issue with Jetpack plans intermittently not being translated commit 0f30cbab5d3b29de26f395277d16ac5e2d5dc386 Author: Caroline Moore <caroline@a8c.com> Date: Fri May 21 10:37:38 2021 -0400 Add tracking events to the Theme Showcase auto-loading homepage modal (#52972) commit 4b8b73e17d6e1166cab2833667b1ece92b6b7e8b Author: robertf4 <42627630+robertf4@users.noreply.github.com> Date: Fri May 21 09:21:56 2021 -0500 Jetpack Pricing Page: Add A/A test to test ExPlat usage (#51522) * Add A/A test to the Jetpack Pricing page * Update to reflect a new test slug and interim changes * Remove old experiment code * Re-add missing translate() call Co-authored-by: Matt Gawarecki <matt.gawarecki@gmail.com> commit 9aa2af1fe43fdfaa675e7fa8e42c552cd05ab560 Author: Kev <kevin.zoschke@automattic.com> Date: Fri May 21 09:13:48 2021 -0400 Add source info to `calypso_jetpack_pricing_page_visit` event (#53051) commit 0073fdfd05a923be319f93ef1d16a9e3e55d1fa9 Author: Damián Suárez <rdsuarez@gmail.com> Date: Fri May 21 09:59:06 2021 -0300 plugin: do not hide `Back` button (#53045) commit 5e5ab4f70acf8b8d72e76e4e318fe0f3a5e4eb90 Author: Yuliyan Slavchev <yuliyan.slavchev@gmail.com> Date: Fri May 21 15:32:29 2021 +0300 i18n: Use `defaultI18n` from `@wordpress/i18n` for `I18nProvider` (#52670) commit 960b5d6a19bc6ddc9025ff120026361682c054f5 Author: Jarda Snajdr <jsnajdr@gmail.com> Date: Fri May 21 13:48:41 2021 +0200 Remove renderWithReduxStore and the entire react-helpers module (#53071) commit 624486858f0edb7687689ac4e5bf40984773b75c Author: Sergio Cinos <sergio.cinos@gmail.com> Date: Fri May 21 11:43:17 2021 +0200 ci(teamcity): Create Jetpack build in TeamCity (#52856) * Move jetpack tests * Use new paths in magellan config * Create TeamCity build * Move wp-log-in-out tp specs-jetpack * Split file commit 632af6bf1dd37d0b23ddc8417c071b57102f5bc7 Author: Jarda Snajdr <jsnajdr@gmail.com> Date: Fri May 21 10:27:46 2021 +0200 Remove the setSelectedEditor action (#53070) commit 92f8bac793e6cf7ca328a3332f13bd717b3d0ed0 Author: Marin Atanasov <8436925+tyxla@users.noreply.github.com> Date: Fri May 21 10:19:05 2021 +0300 State: Remove unused segments state (#53044) commit 77f556b679e5291efec807f2fd2c2137d4c23c7f Author: Marin Atanasov <8436925+tyxla@users.noreply.github.com> Date: Fri May 21 10:18:44 2021 +0300 Purchases: Remove unused PaymentMethodForm remnants (#53041) commit 21be38c8cf6518d582f78f96dcf47a1cf7c3d3f4 Author: Marin Atanasov <8436925+tyxla@users.noreply.github.com> Date: Fri May 21 10:18:05 2021 +0300 Domains: Remove unused domain management components (#52967) commit 0f71805ae5790a1ccbb65ac9ae0fe91452aa180c Author: Marin Atanasov <8436925+tyxla@users.noreply.github.com> Date: Fri May 21 10:16:09 2021 +0300 e2e: Remove WooCommerce pages (#52895) * e2e: Remove WooCommerce pages * Remove unused loginAndOpenWooStore from login flow commit 1e74e3e6a4a22442bdc612b58f62e4cfd00cb952 Author: Marin Atanasov <8436925+tyxla@users.noreply.github.com> Date: Fri May 21 10:15:56 2021 +0300 e2e: Remove Jetpack Onboarding pages (#52894) commit f7dee3e96f2cd005a641acd237e52af4ca8d81da Author: Ramon <ramonjd@users.noreply.github.com> Date: Fri May 21 14:38:11 2021 +1000 ETK Block patterns: Adding extra checks for array values before we use them to avoid PHP (#53066) * Adding extra checks for array values before we use them to avoid PHP alerts. * remove is_array check commit d8ad2e286dc3bacebd9bee1742fc03fb4473518a Author: Sergio Cinos <sergio.cinos@gmail.com> Date: Fri May 21 05:07:46 2021 +0200 fix: Use a CJS adapter (#53001) commit 8939d796b1de5921540033e521570405a0879d8e Author: Julian de Bhál <deBhal@users.noreply.github.com> Date: Fri May 21 11:47:09 2021 +1000 Include query params when opening links outside calypso (#53000) commit 1e7bad7518e2d2377a5fd489141373ce5aecd8e1 Author: Edwin Takahashi <egao@outlook.com> Date: Thu May 20 17:08:18 2021 -0700 Change the ESLint rule on max top level describes to be an error. (#52975) commit 21dfb911a38ebc27044fb5bbeb0abcacfd4cd14d Author: Noah Allen <noahtallen@gmail.com> Date: Thu May 20 16:39:10 2021 -0700 Update all style packages to the latest version (#52801) commit 891ca7587bd486e20ae07fa37feaa65514eb957d Author: Noah Allen <noahtallen@gmail.com> Date: Thu May 20 16:23:35 2021 -0700 Remove editor back button height override (#52835) In newer Gutenberg versions, this causes about a pixel of whitespace above the button, which is very glaring. Removing the override results in a clean UI in both prod and edge. commit 60f28ec64042f552c0f2419781977f6328021ab6 Author: Marcelo Serpa <81248+fullofcaffeine@users.noreply.github.com> Date: Thu May 20 17:16:21 2021 -0500 Remove gradual rollout segmentation guards and activate for all users if not WoA (#53025) commit 43e445567c36955e74736b137b0d35e96985018e Author: Payton Swick <payton@automattic.com> Date: Thu May 20 18:01:11 2021 -0400 Add isBusy to Google Pay and Apple Pay button while submitting (#53061) commit 8efa18f6392755c053638a3d8ea622b1ed1a39c6 Author: Matt Wiebe <wiebe@automattic.com> Date: Thu May 20 14:45:35 2021 -0500 Themes: use block themes as recommended for FSE (#52624) Sites with core FSE will populate the Recommend Themes area with block-based themes. Fixes #50053 commit 16655f864b1f52cc125373f5d9fb589404ba4a6f Author: Damián Suárez <rdsuarez@gmail.com> Date: Thu May 20 16:23:38 2021 -0300 Plugins: add HOC to handle plugin redirect (#52398) * plugins: add withPluginRedirect() hoc * selectors: add getSiteWoocommerceWizardUrl() * state: add isPluginActionCompleted() * plugins: handle notification in redirect flow * plugins: extend PluginMeta with redirect HOC * plugin-install-button-wpcom: set label by state * plugin-meta: fix typo. Propagate button dissable . * with-plugin-redirect: make it scalable * with-plugin-redirect: Change redirect message * plugin-meta: set isTransferring to install button * with-plugin-redirect: handle plugin just installed * plugins: remove pluginSlug prop * addressing many feedback changes * with-plugin-redirect: store pre transferring state * with-plugin-redirect: switch useRef by useState * with-plaugin-redirect: tidy * with-plugin-redirect: rename state const * with-plugin-redirect: improve transferring lock * with-plugin-redirect: refact -> add utils file * rename WooCommerce selectors * state: add getSiteWordPressSeoWizardUrl() selector * with-plugin-redirect: support Yoast redirect * with-plugin-redirect: check at status properly * with-plugin-redirect: minor changes * with-plugin-redirect: handle Jetpack install steps * with-plugin-redirect: improve getting the handler * with-plugin-redirect: remove timerId check * with-plugin-redirect: fix Yoast plugin name * fox yoast selector jsdoc * with-plugin-redirect: remove custom message commit 954d52147a98055b9f4cce46f8b1bd986597da5f Author: Matthew Reishus <mreishus@users.noreply.github.com> Date: Thu May 20 13:15:09 2021 -0500 Visiting /themes while logged in forces you to select a site (#52686) commit 3183bebc2678865cdb2db501475576141416eff0 Author: Edwin Takahashi <egao@outlook.com> Date: Thu May 20 11:10:49 2021 -0700 Playwright: migrate wp-log-in-out. (#53031) * Move the existing test script to a file called demo-spec.js. Create a proper wp-log-in-out-spec.js test file that will contain migrated tests. * Initialize lib components (pages, components, flows) for the log-in process. * Document the classes of LoginFlow and LoginPage. * Split wp-log-in-out test into distinct parts. * Combine the Auth Canary and User Agent tests from the original wp-log-in-out test to one. * Address code review comments. * Do not throw an Error if Promise cannot be resolved. commit 52f80dd044ac5be8f6ab61bc46a8f51a72b53e4c Author: Edwin Takahashi <egao@outlook.com> Date: Thu May 20 09:53:42 2021 -0700 Playwright: Refactor framework interaction with config values and environment variables. (#52887) * Move default values from code to config. * Moderate refactor of how the Playwright framework interacts with the environment and configuration values. - modify relevant sections of the @automattic/calypso-e2e package to read values from the default configuration value. - rename some environmental variables that are in use and reflect those changes in the TeamCity config. - add more type checks for certain values. - rename some functions to reflect updated terminology. * Defenestrate errant console.log * Change key names in default.json config file. * Change environment variable names, helper function names and type names based on PR feedback. * Make changes to the TeamCity config to reflect environment variable name changes. * Address code review comments to improve how configuration values are handled in BrowserHelper. commit 44837b62e2a7cee195c041cd58ed22c64bc1b83e Author: Harris Papazolgou <hrrsppzgl@gmail.com> Date: Thu May 20 17:37:02 2021 +0300 Stats: add share-stats pane. (#52822) * Stats: add share-stats pane. * Show tags and shares only for simple sites. * Dynamically add share providers. * Removes total row. * Removes icon placeholders. * Moves the pane to the left, adds no shares message. Co-authored-by: cpap <papazoglou.charalampos@gmail.com> commit c72968ec3ec2512050c6e876b89e537eae3f4074 Author: Bart Kalisz <bartlomiej.kalisz@gmail.com> Date: Thu May 20 16:14:26 2021 +0200 E2E: Make sure promises are awaited before being returned (#53043) commit c3275bc93e5df5d3ce2302afc9c3b75df3032621 Author: Renzo Canepa <rcanepag@gmail.com> Date: Thu May 20 10:04:18 2021 -0400 Jetpack Backup: fix progress bar initialization message (#53030) * Add `initializationMessage` prop * Pass down the initialization message commit 9826f40adca2e2e6b2cbd12120feb6ac71fae43d Author: Kev <kevin.zoschke@automattic.com> Date: Thu May 20 10:03:18 2021 -0400 Add tracking event for pricing page visits (#53029) commit 50e1e711f6248f21251e9e62a1411401005204f0 Author: Răzvan Papadopol <razvan.papadopol@automattic.com> Date: Thu May 20 16:48:41 2021 +0300 Site editor: prevent crashing with Blank Canvas Blocks design (#53049) commit 98668a02d83842d9b90b92a703ce25ee5c029800 Author: Michael Cain <cain@automattic.com> Date: Thu May 20 09:31:26 2021 -0400 Remove live chat reference from Personal plan (#52966) commit 0ab125d8cffa249858cdae045ad443a1a711d2bd Author: Sergio Cinos <sergio.cinos@gmail.com> Date: Thu May 20 15:07:10 2021 +0200 ci(e2e): Create hook for creating browser (#52946) * Create hook for creating browser * Start browser after starting framebuffer * Use a hook to get a browser * Store webdriver instance as a test attribute commit 7a5af27b497ce5f0b519e541c22774a6e713ac2e Author: Kamen Stanev <hambai@gmail.com> Date: Thu May 20 15:48:39 2021 +0300 Fix the reset button to reset also the TLD filter in domain suggestions (#53013) Recently we deployed #52874 but didn't notice that the Reset button is not resetting the Extensions filter. Here's a fix for that commit 198cc3dd6a72dbc3c8c3c6cc0216d6abac74b75f Author: daledupreez <dale@automattic.com> Date: Thu May 20 13:42:29 2021 +0200 Rebrand "Email" to "Professional Email" (#52745) * Update central helper function * Update terms of service in checkout * Update control panel references * Update email comparison page * More locations * Fix some translation comments * Refactor strings to use substitution and add some missed locations * Add more translation comments and context * Standardize title for iframe wrapper page commit db59e2e4d2bf2c340b6cd5c0eed3fee54124adb6 Author: Bart Kalisz <bartlomiej.kalisz@gmail.com> Date: Thu May 20 12:55:17 2021 +0200 Add e2e section to CODEOWNERS (#53039) commit c7bbcb3993dd67f1d40dd180ca78e705a9cd6cf1 Author: Bart Kalisz <bartlomiej.kalisz@gmail.com> Date: Thu May 20 12:54:35 2021 +0200 E2E: Refactor/remove confusing helpers (#52752) commit d571ccf9508bc68d7005fb83ef60e8b37b2564af Author: Dehan <dehandecroos@gmail.com> Date: Thu May 20 15:37:14 2021 +0530 Implement marketplace yoast checkout thank you page (#52655) * Adding route * Temp thank you marketplace changes * Working on layout * Initial work on marketplace thank you page * Remove unnecessary route * Finalize marketplace thank you page * Remove unnecessary css * Some design review fixes * Code Review fixes * Unit test fix, change button to link, added missing import, async loaded page commit 75fe34a8e2b7af4efa2550f57e5c758f0918c620 Author: Marin Atanasov <8436925+tyxla@users.noreply.github.com> Date: Thu May 20 13:04:48 2021 +0300 Components: Remove FormToggle in favor of ToggleControl (#52958) commit 5b96feb96dfbed29487be4bb49337e23300ae123 Author: Jarda Snajdr <jsnajdr@gmail.com> Date: Thu May 20 11:53:39 2021 +0200 Themes: remove manage/themes config flags (#53038) commit 883ed1f6cf07e59be7537750c757bb484270a4eb Author: Olaseni Oluwunmi <277661+olaseni@users.noreply.github.com> Date: Thu May 20 10:40:14 2021 +0100 Show unused mailbox warnings for Titan on Email Plan page (#52924) * Extract warnings into own component * Use Notices for warnings * Fix optional chaining operator placement. * Add fallback for displaying warnings on homepage * Switch to a full blown component and add CTA for Titan warnings * Add styles to CTA icon * Fix css size style for icon, and arrange imports alphabetically * Revert debug scenario commit 6a5c817cfc98a5c9dbf6cbf6a2560ebde0fb63b7 Author: Stéphane Thomas <email@stephanethomas.com> Date: Thu May 20 10:28:41 2021 +0200 Titan: Add new Manage All Mailboxes page (#52755) * Titan: Disable iframe control panel in development We don't have plan to work on that new feature in the near future. * Titan: Add new Manage All Mailboxes page * Titan: Add section header on Manage All Mailboxes page * Titan: Fine tune copy and context parameters from Manage All Mailboxes page * Titan: Track pageviews of Manage All Mailboxes page commit 8add463e72d349a0173e646426663a70b42dea83 Author: Marin Atanasov <8436925+tyxla@users.noreply.github.com> Date: Thu May 20 10:07:48 2021 +0300 Extensions: Remove FormToggle in favor of ToggleControl in WP Super Cache (#52950) commit 5e96a918a702d66eeb55b5154aec1b9fc06844d2 Author: Jarda Snajdr <jsnajdr@gmail.com> Date: Thu May 20 07:56:25 2021 +0200 OAuth flow: persist flags=oauth in session storage, use next param in redirect flow (#53006) * Config: allow flags override stored in session storage * Save flags=oauth flags on boot to session storage * Inline the auth path constants * Use toString() on URL/URLSearchParam objects to make TypeScript happier * Construct Jetpack Cloud redirect URL with URL and URLSearchParams * Jetpack Cloud: redirect directly to OAuth authorization page, return using next param * Remove the GetToken component that's no longer used * Remove logged out routes that don't exist commit ad2f907f11b061dec9173a56d5cc3b763dcff204 Author: Sergio Cinos <sergio.cinos@gmail.com> Date: Thu May 20 05:58:23 2021 +0200 ci(e2e): Delete tests that have been disabled for months (#52941) commit c7f2b75982801d4c865a41a43062737158aa9935 Author: Sergio Cinos <sergio.cinos@gmail.com> Date: Thu May 20 05:01:27 2021 +0200 ci(e2e): Delete secure-auth tests (#52934) commit 43458db3440d41ddffce18b36aba701e10a63981 Author: Sergio Cinos <sergio.cinos@gmail.com> Date: Thu May 20 04:56:17 2021 +0200 chore(packages): Update webpack to v5 in Desktop (#52994) commit dcea3e101aceb5b0f158b8c9f953c70d55941b99 Author: Sergio Cinos <sergio.cinos@gmail.com> Date: Thu May 20 04:55:08 2021 +0200 ci(e2e): Flatten `describe` blocks (#52916) * Flatten describe blocks * Better names for files commit f076ccbb94ae5bbdb80342c6f56f51a24869fadc Author: Divyam Rastogi <divyamr@flock.com> Date: Thu May 20 00:34:49 2021 +0530 Add/upsell titan (#52415) * Add the Titan card to primary cards Users will now be shown a Titan banner nudging them to get their own custom domain. * Added a placeholder condition comment * Remove style.scss for Titan We do not need specific styling for the Titan Banner * Sort TitanBanner imports in ascending order * Fetch actionUrl from store * Remove _blank target * Change illustration image and copy changes * Remove unused image. commit c84442d521dc76d945d12853de9ea074bcb5cf52 Author: Brent Sessions <31110506+bsessions85@users.noreply.github.com> Date: Wed May 19 13:42:50 2021 -0400 Fix/vr report (#53009) * Update report path * try another path style * Another path adjustment commit 37b3c4a4b5cb35353db824a7d0d37f4c86a60c73 Author: Kev <kevin.zoschke@automattic.com> Date: Wed May 19 13:40:52 2021 -0400 Standardize page view tracks events for pricing page (#53018) commit 8a5fccff0b69ddce92932d22eca6f0bfb83f52c1 Author: Andrés Blanco <andresblanco@gmail.com> Date: Wed May 19 14:39:13 2021 -0300 Removed old nessie illustration from themes search (#53024) commit 3c990841748ed80ca1de8663b6cf0cebf2346a27 Author: Jonathan Belcher <belcherj@gmail.com> Date: Wed May 19 11:00:59 2021 -0400 Disable social login and magic links (#52976) - Removes social login on Desktop - Remove magic linking on Desktop - Show ToS even when social links are disabled commit 5a24350ffddfd433006246ec72c3a9aa7d78ca18 Author: sarayourfriend <24264157+sarayourfriend@users.noreply.github.com> Date: Wed May 19 07:29:15 2021 -0700 with-enhancers: Add types (#51865) commit 841eaf478ff3afb358a92aea54f9854a21312164 Author: Jarda Snajdr <jsnajdr@gmail.com> Date: Wed May 19 14:53:41 2021 +0200 InvitePeople: remove bindActionCreators (#53005) commit 20acf9af212dad70aaf9f2c3de853c3d04c494f6 Author: Dehan <dehandecroos@gmail.com> Date: Wed May 19 18:21:12 2021 +0530 Added initial static loading page (#52989) commit 070134b7cb4ba1411720b8f7e26c7451ea1379c5 Author: Kev <kevin.zoschke@automattic.com> Date: Wed May 19 08:39:59 2021 -0400 Redirect cloud visitors back to cloud when clicking the back button in checkout page (#52929) commit 0b8a1795528700eb4f8dba97b83028061ac7905a Author: Marin Atanasov <8436925+tyxla@users.noreply.github.com> Date: Wed May 19 15:30:59 2021 +0300 State: Remove Secure Your Brand state (#52970) commit 7fc5ec45ffc96c115ca03d0155820060bfff6857 Author: Sergio Cinos <sergio.cinos@gmail.com> Date: Wed May 19 13:51:34 2021 +0200 ci(e2e): Remove the domain registration from the cart (#52910) * Remove the domain registration from the cart * Clean up domain mappings commit d6898cdfd92fceb6860b76e1c3f8d544245b84bb Author: flootr <m.do@posteo.net> Date: Wed May 19 11:34:19 2021 +0200 QueryCountryStates: refactor away from `UNSAFE_` lifecycle methods (#52779) * QueryCountryStates: refactor away from `UNSAFE_` lifecycle methods * refactor `QueryCountryStates` to function component commi…

a8ci18n · 2021-06-11T11:28:24Z

Translation for this Pull Request has now been finished.

olaseni added the Email management Issues with email management screens label May 26, 2021

olaseni self-assigned this May 26, 2021

olaseni requested a review from a team as a code owner May 26, 2021 12:06

matticbot added the [Status] Needs Review The PR is ready for review. This also triggers e2e canary tests and wp-desktop tests automatically. label May 26, 2021

stephanethomas requested changes May 27, 2021

View reviewed changes

olaseni force-pushed the fix/prevent-new-mailboxes-for-expired-subs branch from 4f17e51 to 4bf03a7 Compare June 1, 2021 03:49

olaseni added 5 commits June 1, 2021 12:42

Add a renew button when the subscription needs to renew

1bed971

Remove the RenewButton component

464bf3c

Refine the expiry logic

19cad4c

Adjust the threshold days

a90a29d

Show renewal item only when email account is expired

12ee24e

olaseni force-pushed the fix/prevent-new-mailboxes-for-expired-subs branch from 472044d to 12ee24e Compare June 1, 2021 12:16

stephanethomas approved these changes Jun 1, 2021

View reviewed changes

client/my-sites/email/email-management/home/email-plan.jsx Show resolved Hide resolved

client/my-sites/email/email-management/home/email-plan.jsx Show resolved Hide resolved

Remove falsy checks for selectedSite

e6b2e2e

olaseni merged commit 50a3362 into trunk Jun 1, 2021

olaseni deleted the fix/prevent-new-mailboxes-for-expired-subs branch June 1, 2021 17:43

github-actions bot removed the [Status] Needs Review The PR is ready for review. This also triggers e2e canary tests and wp-desktop tests automatically. label Jun 1, 2021

stephanethomas mentioned this pull request Jun 2, 2021

Emails: Fix Add new mailboxes link not shown for email forwards on Email Plan page #53342

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Prevent users from purchasing additional mailboxes when the associated subscription expires/is expiring #53189

Prevent users from purchasing additional mailboxes when the associated subscription expires/is expiring #53189

olaseni commented May 26, 2021 •

edited

Loading

github-actions bot commented May 26, 2021

matticbot commented May 26, 2021 •

edited

Loading

stephanethomas left a comment

stephanethomas May 27, 2021

stephanethomas May 27, 2021

daledupreez May 30, 2021

stephanethomas left a comment

a8ci18n commented Jun 1, 2021

a8ci18n commented Jun 11, 2021

	subscriptionId={ parseInt( purchase.id, 10 ) }
	subscriptionId={ Number( purchase.id ) }

Prevent users from purchasing additional mailboxes when the associated subscription expires/is expiring #53189

Prevent users from purchasing additional mailboxes when the associated subscription expires/is expiring #53189

Conversation

olaseni commented May 26, 2021 • edited Loading

Changes proposed in this Pull Request

Testing instructions

github-actions bot commented May 26, 2021

matticbot commented May 26, 2021 • edited Loading

stephanethomas left a comment

Choose a reason for hiding this comment

stephanethomas May 27, 2021

Choose a reason for hiding this comment

stephanethomas May 27, 2021

Choose a reason for hiding this comment

daledupreez May 30, 2021

Choose a reason for hiding this comment

stephanethomas left a comment

Choose a reason for hiding this comment

a8ci18n commented Jun 1, 2021

a8ci18n commented Jun 11, 2021

olaseni commented May 26, 2021 •

edited

Loading

matticbot commented May 26, 2021 •

edited

Loading