Fix/connection status inconsistencies (#40632)

* Update connection status card to align with connection banner * unify the way we connect sites on My Jetpack * Unify user connection flows in My Jetpack * changelog * Fix tests * Add comment * Scroll to top all the time when connecting site * Add slight delay to scroll to top Committed via a GitHub action: https://github.com/Automattic/jetpack/actions/runs/12417815414 Upstream-Ref: Automattic/jetpack@bfbeaac
Automattic · Dec 19, 2024 · fbe563e · fbe563e
1 parent 7869815
commit fbe563e
Show file tree

Hide file tree

Showing 7 changed files with 115 additions and 114 deletions.
diff --git a/jetpack_vendor/automattic/jetpack-my-jetpack/CHANGELOG.md b/jetpack_vendor/automattic/jetpack-my-jetpack/CHANGELOG.md
@@ -16,6 +16,7 @@ This is an alpha version! The changes listed here are not final.
 - My Jetpack: Add 'Needs attention' status to Backup product card when Backups are failing.
 - My Jetpack: Add red bubble and notice/banner when Backup has 'needs-attention' status.
 - My Jetpack: Plans section: Improvements to how we display plan expiration date.
+- Unify connection flows in My Jetpack
 
 ### Fixed
 - Fix issue where backup card was not updating after site connection in some situations

diff --git a/jetpack_vendor/automattic/jetpack-my-jetpack/build/index.asset.php b/jetpack_vendor/automattic/jetpack-my-jetpack/build/index.asset.php
@@ -1 +1 @@
-<?php return array('dependencies' => array('jetpack-connection', 'jetpack-script-data', 'react', 'react-jsx-runtime', 'wp-api-fetch', 'wp-components', 'wp-compose', 'wp-data', 'wp-date', 'wp-element', 'wp-i18n', 'wp-polyfill', 'wp-primitives', 'wp-url'), 'version' => 'a35d10c468fef1eb836f');
+<?php return array('dependencies' => array('jetpack-connection', 'jetpack-script-data', 'react', 'react-jsx-runtime', 'wp-api-fetch', 'wp-components', 'wp-compose', 'wp-data', 'wp-date', 'wp-element', 'wp-i18n', 'wp-polyfill', 'wp-primitives', 'wp-url'), 'version' => 'd6715bd654b1deb0839f');
diff --git a/jetpack_vendor/automattic/jetpack-my-jetpack/build/index.js b/jetpack_vendor/automattic/jetpack-my-jetpack/build/index.js
diff --git a/jetpack_vendor/i18n-map.php b/jetpack_vendor/i18n-map.php
@@ -50,7 +50,7 @@
     ),
     'jetpack-my-jetpack' => array(
       'path' => 'jetpack_vendor/automattic/jetpack-my-jetpack',
-      'ver' => '5.2.0-alpha1734624431',
+      'ver' => '5.2.0-alpha1734629628',
     ),
     'jetpack-password-checker' => array(
       'path' => 'jetpack_vendor/automattic/jetpack-password-checker',

diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
@@ -7,7 +7,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-a8c-mc-stats",
-                "reference": "ced9481eef12fd11a241a8d34617f544df97c3d7"
+                "reference": "a43276f6c0deb06c229ba8f3bc6521218b7608f6"
             },
             "require": {
                 "php": ">=7.2"
@@ -63,7 +63,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-admin-ui",
-                "reference": "6c10bb66448d62a8d0215c1a8d162e6460ba0813"
+                "reference": "bb52665380eae6fe292c8430f6404130c8d2055e"
             },
             "require": {
                 "php": ">=7.2"
@@ -131,7 +131,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-assets",
-                "reference": "f6a219ef85a72ce72395d0be3d4b3d13ac723652"
+                "reference": "493a1b547f6b0d636fdd5ff6f9d559ab0079c8c8"
             },
             "require": {
                 "automattic/jetpack-constants": "^3.0.1",
@@ -203,7 +203,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-autoloader",
-                "reference": "f6bc7cc7326cd6f647e8637e111062d741b1fb4b"
+                "reference": "23d8c283028ed871129f133d4c0e2c17ae0ff089"
             },
             "require": {
                 "composer-plugin-api": "^2.2",
@@ -274,7 +274,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-boost-core",
-                "reference": "bde3c10ce76c1d489b2727adf6220e7cf8012a71"
+                "reference": "d639c02b24c7bc3c162a0d251f9ebe96bc0ae856"
             },
             "require": {
                 "automattic/jetpack-connection": "^6.2.1",
@@ -345,7 +345,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-boost-speed-score",
-                "reference": "80ec045415afcd303099b816e14a1f3b3c898c49"
+                "reference": "862ea0f063348966cebaeac2700d0395cd657624"
             },
             "require": {
                 "automattic/jetpack-boost-core": "^0.3.2",
@@ -424,7 +424,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-composer-plugin",
-                "reference": "5ee7efd4420a2b8f3334c6be72ec859caa2cb2f9"
+                "reference": "839890fa9122169cf7fe22b7e74ed53c89c29030"
             },
             "require": {
                 "composer-plugin-api": "^2.2",
@@ -487,7 +487,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-config",
-                "reference": "c85c53f9ad2a54d205450de14d8ec3e2d8ff663f"
+                "reference": "dddb282d5b42f9d87034db6ad511a736f6de91a6"
             },
             "require": {
                 "php": ">=7.2"
@@ -562,7 +562,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-connection",
-                "reference": "c95b396f2342ecb1c6cb1be1f57575d94f8d13ea"
+                "reference": "fdac751521ac8bbb583c0ffa27d456bd2d7e70e6"
             },
             "require": {
                 "automattic/jetpack-a8c-mc-stats": "^3.0.0",
@@ -655,7 +655,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-constants",
-                "reference": "3fcea965c512e7693f38df6e1bbb822a45e4e041"
+                "reference": "9da3b72fa57ce38932085ce7d1581f20afe5b593"
             },
             "require": {
                 "php": ">=7.2"
@@ -712,7 +712,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-device-detection",
-                "reference": "7cf826068ff05b960f92b750e6dabcaf2453e4c7"
+                "reference": "b3767baa28f35ea27a3b7d250acc0fb4547e1547"
             },
             "require": {
                 "php": ">=7.2"
@@ -768,7 +768,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-explat",
-                "reference": "7a2f84ac5d60bdbbb2e2bbae362f1d0de57bb347"
+                "reference": "a1bdf1251790164405cf285f1bf5afdcfe8716ac"
             },
             "require": {
                 "automattic/jetpack-connection": "^6.2.1",
@@ -846,7 +846,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-image-cdn",
-                "reference": "5d5cc6fc78377cba85aba575db2f740922eb7663"
+                "reference": "279a702db96b33c1cef8665c4635cdb392d0f3e8"
             },
             "require": {
                 "automattic/jetpack-assets": "^4.0.2",
@@ -915,7 +915,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-ip",
-                "reference": "48b52161127678c27ee5cc8ba110356db94ea438"
+                "reference": "fc2c1f94914b94c613529469dd632594b4c132fc"
             },
             "require": {
                 "php": ">=7.2"
@@ -976,7 +976,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-jitm",
-                "reference": "6ef9e838450c81aed0bdafbe226c2546c9b357e1"
+                "reference": "0d456c31ca620f9b02a5bc7a66345a4c71358a65"
             },
             "require": {
                 "automattic/jetpack-a8c-mc-stats": "^3.0.0",
@@ -1054,7 +1054,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-licensing",
-                "reference": "14d9310c4917cf6f9cb68fe2104a959091320b40"
+                "reference": "29229ad6c404a21814a272d6ebb50799717386af"
             },
             "require": {
                 "automattic/jetpack-connection": "^6.2.1",
@@ -1119,7 +1119,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-logo",
-                "reference": "38be635ba7cc1beaa65ae7bfa97fa88b1f8fc97a"
+                "reference": "e7e4285b47d5653e35a08757e862cdf9ee7f3199"
             },
             "require": {
                 "php": ">=7.2"
@@ -1170,12 +1170,12 @@
         },
         {
             "name": "automattic/jetpack-my-jetpack",
-            "version": "5.2.0-alpha.1734624431",
-            "version_normalized": "5.2.0.0-alpha1734624431",
+            "version": "5.2.0-alpha.1734629628",
+            "version_normalized": "5.2.0.0-alpha1734629628",
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-my-jetpack",
-                "reference": "a8f2e2f5a468d728f8748452d876e4cf56fff134"
+                "reference": "90fdb16c9a34ada3a77d513a869bc1ddc2e8aee3"
             },
             "require": {
                 "automattic/jetpack-admin-ui": "^0.5.1",
@@ -1280,7 +1280,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-password-checker",
-                "reference": "e89cec1192d2c5e8a8fe5bf051f2611dc1873ac2"
+                "reference": "2237b72d68d6451ba84bb445ed414252c89412cb"
             },
             "require": {
                 "php": ">=7.2"
@@ -1344,7 +1344,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-plans",
-                "reference": "2dc05ff4a53a081ee005990d487062cdf86048c9"
+                "reference": "864050198ef5e8cd51db60753d55a2e5aec1ff6f"
             },
             "require": {
                 "automattic/jetpack-connection": "^6.2.1",
@@ -1415,7 +1415,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-plugin-deactivation",
-                "reference": "75357b3a4e0104905fa23489c4fb2e7fcac0a586"
+                "reference": "5711784413b530ef931679aafcfced6cc8a0148f"
             },
             "require": {
                 "automattic/jetpack-assets": "^4.0.2",
@@ -1486,7 +1486,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-plugins-installer",
-                "reference": "6920937206ff2b42d04449862f1e364d0574d513"
+                "reference": "f6c58bbdf5ed48f07f963cda7c30f61c20780a34"
             },
             "require": {
                 "automattic/jetpack-a8c-mc-stats": "^3.0.0",
@@ -1545,7 +1545,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-protect-models",
-                "reference": "64e65a5a2590b4acae3ff8020fd44ebc9beb4042"
+                "reference": "9780851a3b01f3fadf264194d5b4c18c77abca56"
             },
             "require": {
                 "php": ">=7.2"
@@ -1618,7 +1618,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-protect-status",
-                "reference": "d73b47e7f0846845e83fcc83f9e8bda29479b461"
+                "reference": "1712d354c78b86023bd566d05ff81563c2f0ac7d"
             },
             "require": {
                 "automattic/jetpack-connection": "^6.2.1",
@@ -1696,7 +1696,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-redirect",
-                "reference": "9075a29a440a79d07f3e22ef9a98024c3cb3e232"
+                "reference": "99ab2e315b82850c63295713a0bc78fa08a7378c"
             },
             "require": {
                 "automattic/jetpack-status": "^5.0.1",
@@ -1754,7 +1754,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-roles",
-                "reference": "3253dc4c9e5606db82eb7aab7d33eaf7d9c5165a"
+                "reference": "933fdd644df8c99fb8134c6906ed2689201639f6"
             },
             "require": {
                 "php": ">=7.2"
@@ -1811,7 +1811,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-schema",
-                "reference": "b45925439f8ff801b6a86a401b3dce6e668cc4c8"
+                "reference": "57be108c706b81b4f37f4d1b4f7f787f6ac29899"
             },
             "require": {
                 "php": ">=7.2"
@@ -1884,7 +1884,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-status",
-                "reference": "4ad65daa34f250e3638b3ac14268ec23fc96e131"
+                "reference": "9db6cad07ffa5d681cef2d040f21567098a473b3"
             },
             "require": {
                 "automattic/jetpack-constants": "^3.0.1",
@@ -1951,7 +1951,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-sync",
-                "reference": "025bd46e9d77f19e71fce0bf2769812a12b36584"
+                "reference": "22db332e9290d8d8ac49f1ac2da18c7797c00b46"
             },
             "require": {
                 "automattic/jetpack-connection": "^6.2.1",
@@ -2032,7 +2032,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-wp-js-data-sync",
-                "reference": "e2544f2d8061db2037bcafa9115db31410ac5320"
+                "reference": "0b148dc9b8dc07a56c64fdf7656b635e018599c1"
             },
             "require": {
                 "automattic/jetpack-schema": "^0.2.0",
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<?php return array('dependencies' => array('jetpack-connection', 'jetpack-script-data', 'react', 'react-jsx-runtime', 'wp-api-fetch', 'wp-components', 'wp-compose', 'wp-data', 'wp-date', 'wp-element', 'wp-i18n', 'wp-polyfill', 'wp-primitives', 'wp-url'), 'version' => 'a35d10c468fef1eb836f');
		<?php return array('dependencies' => array('jetpack-connection', 'jetpack-script-data', 'react', 'react-jsx-runtime', 'wp-api-fetch', 'wp-components', 'wp-compose', 'wp-data', 'wp-date', 'wp-element', 'wp-i18n', 'wp-polyfill', 'wp-primitives', 'wp-url'), 'version' => 'd6715bd654b1deb0839f');