Remove Google domains promotional card from the dashboard (#22216)

wordpress-mobile · Dec 19, 2023 · fa1fd85 · fa1fd85
2 parents 570ecfd + 860bda0
commit fa1fd85
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 9 deletions.
diff --git a/WordPress/Classes/Utility/BuildInformation/FeatureFlag.swift b/WordPress/Classes/Utility/BuildInformation/FeatureFlag.swift
@@ -11,7 +11,7 @@ enum FeatureFlag: Int, CaseIterable {
     case personalizeHomeTab
     case commentModerationUpdate
     case compliancePopover
-    case domainFocus
+    case googleDomainsCard
 
     /// Returns a boolean indicating if the feature is enabled
     var enabled: Bool {
@@ -38,8 +38,8 @@ enum FeatureFlag: Int, CaseIterable {
             return false
         case .compliancePopover:
             return true
-        case .domainFocus:
-            return true
+        case .googleDomainsCard:
+            return false
         }
     }
 
@@ -80,8 +80,8 @@ extension FeatureFlag {
             return "Comments Moderation Update"
         case .compliancePopover:
             return "Compliance Popover"
-        case .domainFocus:
-            return "Domain Focus"
+        case .googleDomainsCard:
+            return "Google Domains Promotional Card"
         }
     }
 }

diff --git a/WordPress/Classes/ViewRelated/Blog/Blog Dashboard/DashboardCard.swift b/WordPress/Classes/ViewRelated/Blog/Blog Dashboard/DashboardCard.swift
@@ -149,7 +149,7 @@ enum DashboardCard: String, CaseIterable {
         case .jetpackSocial:
             return DashboardJetpackSocialCardCell.shouldShowCard(for: blog)
         case .googleDomains:
-            return FeatureFlag.domainFocus.enabled && isJetpack
+            return FeatureFlag.googleDomainsCard.enabled && isJetpack
         }
     }
 

diff --git a/WordPress/UITestsFoundation/XCUIElement+Utils.swift b/WordPress/UITestsFoundation/XCUIElement+Utils.swift
@@ -20,7 +20,14 @@ public extension XCUIElement {
 
         let deviceScreenFrame = app.windows.element(boundBy: 0).frame
         let deviceScreenWidth = deviceScreenFrame.size.width
-        let visibleAreaTop = topElement.frame.origin.y + topElement.frame.size.height
+        let visibleAreaTop: CGFloat
+
+        if topElement.exists {
+            visibleAreaTop = topElement.frame.origin.y + topElement.frame.size.height
+        } else {
+            visibleAreaTop = deviceScreenFrame.origin.y
+        }
+
         let visibleAreaHeight = bottomElement.frame.origin.y - visibleAreaTop
         let visibleAreaFrame = CGRect(x: 0, y: visibleAreaTop, width: deviceScreenWidth, height: visibleAreaHeight)
 

diff --git a/WordPress/WordPressTest/Dashboard/BlogDashboardServiceTests.swift b/WordPress/WordPressTest/Dashboard/BlogDashboardServiceTests.swift
@@ -55,7 +55,7 @@ class BlogDashboardServiceTests: CoreDataTestCase {
         try? featureFlags.override(FeatureFlag.personalizeHomeTab, withValue: true)
         try? featureFlags.override(RemoteFeatureFlag.activityLogDashboardCard, withValue: true)
         try? featureFlags.override(RemoteFeatureFlag.pagesDashboardCard, withValue: true)
-        try? featureFlags.override(FeatureFlag.domainFocus, withValue: false)
+        try? featureFlags.override(FeatureFlag.googleDomainsCard, withValue: false)
     }
 
     override func tearDown() {
@@ -65,7 +65,7 @@ class BlogDashboardServiceTests: CoreDataTestCase {
         try? featureFlags.override(FeatureFlag.personalizeHomeTab, withValue: FeatureFlag.personalizeHomeTab.originalValue)
         try? featureFlags.override(RemoteFeatureFlag.activityLogDashboardCard, withValue: RemoteFeatureFlag.activityLogDashboardCard.originalValue)
         try? featureFlags.override(RemoteFeatureFlag.pagesDashboardCard, withValue: RemoteFeatureFlag.pagesDashboardCard.originalValue)
-        try? featureFlags.override(FeatureFlag.domainFocus, withValue: FeatureFlag.domainFocus.originalValue)
+        try? featureFlags.override(FeatureFlag.googleDomainsCard, withValue: FeatureFlag.googleDomainsCard.originalValue)
     }
 
     func testCallServiceWithCorrectIDAndCards() {