From a5544ff35c08362518778fa59968991caf9ef9e9 Mon Sep 17 00:00:00 2001
From: kean <grebenyuk.alexander@gmail.com>
Date: Tue, 17 Dec 2024 20:57:13 -0500
Subject: [PATCH] Remove TipKit FF

---
 WordPress/Classes/Utility/BuildInformation/FeatureFlag.swift | 4 ----
 WordPress/Classes/ViewRelated/Tips/AppTips.swift             | 5 +----
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/WordPress/Classes/Utility/BuildInformation/FeatureFlag.swift b/WordPress/Classes/Utility/BuildInformation/FeatureFlag.swift
index 953f89506fd3..ce04de452338 100644
--- a/WordPress/Classes/Utility/BuildInformation/FeatureFlag.swift
+++ b/WordPress/Classes/Utility/BuildInformation/FeatureFlag.swift
@@ -11,7 +11,6 @@ enum FeatureFlag: Int, CaseIterable {
     case googleDomainsCard
     case voiceToContent
     case authenticateUsingApplicationPassword
-    case tipKit
     case newGutenberg
     case newGutenbergThemeStyles
     case newGutenbergPlugins
@@ -42,8 +41,6 @@ enum FeatureFlag: Int, CaseIterable {
             return AppConfiguration.isJetpack && BuildConfiguration.current ~= [.localDeveloper, .a8cBranchTest]
         case .authenticateUsingApplicationPassword:
             return false
-        case .tipKit:
-            return true
         case .newGutenberg:
             return false
         case .newGutenbergThemeStyles:
@@ -83,7 +80,6 @@ extension FeatureFlag {
         case .googleDomainsCard: "Google Domains Promotional Card"
         case .voiceToContent: "Voice to Content"
         case .authenticateUsingApplicationPassword: "Application Passwords for self-hosted sites"
-        case .tipKit: "TipKit"
         case .newGutenberg: "Experimental Block Editor"
         case .newGutenbergThemeStyles: "Experimental Block Editor Styles"
         case .newGutenbergPlugins: "Experimental Block Editor Plugins"
diff --git a/WordPress/Classes/ViewRelated/Tips/AppTips.swift b/WordPress/Classes/ViewRelated/Tips/AppTips.swift
index 8d3d572bb420..799410e5f8fb 100644
--- a/WordPress/Classes/ViewRelated/Tips/AppTips.swift
+++ b/WordPress/Classes/ViewRelated/Tips/AppTips.swift
@@ -5,7 +5,7 @@ import Combine
 
 enum AppTips {
     static func initialize() {
-        guard Feature.enabled(.tipKit), #available(iOS 17, *) else { return }
+        guard #available(iOS 17, *) else { return }
         do {
             try Tips.configure()
         } catch {
@@ -65,9 +65,6 @@ extension UIViewController {
         arrowDirection: UIPopoverArrowDirection? = nil,
         actionHandler: ((Tips.Action) -> Void)? = nil
     ) -> TipObserver? {
-        guard Feature.enabled(.tipKit) else {
-            return nil
-        }
         let task = Task { @MainActor [weak self] in
             for await shouldDisplay in tip.shouldDisplayUpdates {
                 if shouldDisplay {