From 4d423dfcc55eb23f10ac86d3c14c1db2bd29489d Mon Sep 17 00:00:00 2001
From: Annmarie Ziegler <annmarie.ziegler@gmail.com>
Date: Thu, 1 Feb 2024 08:24:12 -0500
Subject: [PATCH 1/2] Refactor: move the site monitoring row after the manage
 rows

---
 .../android/ui/mysite/items/listitem/SiteItemsBuilder.kt      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/mysite/items/listitem/SiteItemsBuilder.kt b/WordPress/src/main/java/org/wordpress/android/ui/mysite/items/listitem/SiteItemsBuilder.kt
index fb3fcc0fdad5..2727c43d1e2a 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/mysite/items/listitem/SiteItemsBuilder.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/mysite/items/listitem/SiteItemsBuilder.kt
@@ -91,8 +91,8 @@ class SiteItemsBuilder @Inject constructor(
     private fun getManageSiteItems(
         params: SiteItemsBuilderParams
     ): List<MySiteCardAndItem> {
-        val siteMonitoring = buildSiteMonitoringOptionsIfNeeded(params)
         val manageSiteItems = buildManageSiteItems(params)
+        val siteMonitoring = buildSiteMonitoringOptionsIfNeeded(params)
 
         val emptyHeaderItem1 = CategoryEmptyHeaderItem(UiString.UiStringText(""))
         val jetpackConfiguration = buildJetpackDependantConfigurationItemsIfNeeded(params)
@@ -102,8 +102,8 @@ class SiteItemsBuilder @Inject constructor(
         val emptyHeaderItem2 = CategoryEmptyHeaderItem(UiString.UiStringText(""))
         val admin = siteListItemBuilder.buildAdminItemIfAvailable(params.site, params.onClick)
         return listOf(manageHeader) +
-                siteMonitoring +
                 manageSiteItems +
+                siteMonitoring +
                 emptyHeaderItem1 +
                 jetpackConfiguration +
                 lookAndFeel +

From f612aacbf7dbbe9542c14a0832d680942771b7f3 Mon Sep 17 00:00:00 2001
From: Annmarie Ziegler <annmarie.ziegler@gmail.com>
Date: Thu, 1 Feb 2024 08:24:31 -0500
Subject: [PATCH 2/2] Update tests to align with the site monitor row position
 change

---
 .../ui/mysite/items/SiteItemsBuilderTest.kt      | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/WordPress/src/test/java/org/wordpress/android/ui/mysite/items/SiteItemsBuilderTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/mysite/items/SiteItemsBuilderTest.kt
index 073277c6f50e..7c51b34c2978 100644
--- a/WordPress/src/test/java/org/wordpress/android/ui/mysite/items/SiteItemsBuilderTest.kt
+++ b/WordPress/src/test/java/org/wordpress/android/ui/mysite/items/SiteItemsBuilderTest.kt
@@ -76,8 +76,8 @@ class SiteItemsBuilderTest {
     @Test
     fun `adds all the items in the correct order`() {
         setupHeaders(
-            addSiteMonitoringItem = true,
             addActivityLogItem = true,
+            addSiteMonitoringItem = true,
             addPlanItem = false,
             addPagesItem = true,
             addAdminItem = true,
@@ -107,10 +107,10 @@ class SiteItemsBuilderTest {
             TRAFFIC_HEADER,
             STATS_ITEM,
             MANAGE_HEADER,
-            SITE_MONITORING_ITEM,
             ACTIVITY_ITEM,
             BACKUP_ITEM,
             SCAN_ITEM,
+            SITE_MONITORING_ITEM,
             EMPTY_HEADER,
             PEOPLE_ITEM,
             PLUGINS_ITEM,
@@ -231,8 +231,8 @@ class SiteItemsBuilderTest {
 
     @Suppress("ComplexMethod", "LongMethod")
     private fun setupHeaders(
-        addSiteMonitoringItem: Boolean = false,
         addActivityLogItem: Boolean = false,
+        addSiteMonitoringItem: Boolean = false,
         addPlanItem: Boolean = false,
         addPagesItem: Boolean = false,
         addAdminItem: Boolean = false,
@@ -258,11 +258,6 @@ class SiteItemsBuilderTest {
                 PLAN_ITEM.copy(showFocusPoint = showPlansFocusPoint)
             )
         }
-        if (addSiteMonitoringItem) {
-            whenever(siteListItemBuilder.buildSiteMonitoringItemIfAvailable(siteModel, SITE_ITEM_ACTION)).thenReturn(
-                SITE_MONITORING_ITEM
-            )
-        }
         if (addActivityLogItem) {
             whenever(siteListItemBuilder.buildActivityLogItemIfAvailable(siteModel, SITE_ITEM_ACTION)).thenReturn(
                 ACTIVITY_ITEM
@@ -278,6 +273,11 @@ class SiteItemsBuilderTest {
                 SCAN_ITEM
             )
         }
+        if (addSiteMonitoringItem) {
+            whenever(siteListItemBuilder.buildSiteMonitoringItemIfAvailable(siteModel, SITE_ITEM_ACTION)).thenReturn(
+                SITE_MONITORING_ITEM
+            )
+        }
         if (addPagesItem) {
             whenever(
                 siteListItemBuilder.buildPagesItemIfAvailable(