Updated urls for some Ghostery settings

Cliqz/Settings/CliqzAppSettingsOptions.swift

@@ -176,7 +176,7 @@ class SupportSetting: Setting {
 
     override var url: URL? {
     #if GHOSTERY
-        return URL(string: "https://ghostery.zendesk.com/hc")
+        return URL(string: "https://ghostery.zendesk.com/hc/en-us/requests/new")
     #else
         return URL(string: "https://cliqz.com/support")
     #endif
@@ -196,17 +196,6 @@ class SupportSetting: Setting {
 
 }
 
-class CliqzTipsAndTricksSetting: ShowCliqzPageSetting {
-
-    override func getTitle() -> String {
-        return NSLocalizedString("Get the best out of CLIQZ", tableName: "Cliqz", comment: "[Settings] Get the best out of CLIQZ")
-    }
-
-    override func getPageName() -> String {
-        return "tips-ios"
-    }
-}
-
 class ReportWebsiteSetting: ShowCliqzPageSetting {
 
     override func getTitle() -> String {
@@ -216,11 +205,6 @@ class ReportWebsiteSetting: ShowCliqzPageSetting {
     override func getPageName() -> String {
         return "report-url"
     }
-    #if GHOSTERY
-    override var url: URL? {
-        return URL(string: "https://ghostery.zendesk.com/hc")
-    }
-    #endif
 }
 
 class SendCrashReportsSetting: CliqzOnOffSetting {
@@ -313,6 +297,17 @@ class AboutSetting: Setting {
 }
 
 #if GHOSTERY
+class CliqzTipsAndTricksSetting: ShowCliqzPageSetting {
+
+    override func getTitle() -> String {
+        return NSLocalizedString("Get the best out of CLIQZ", tableName: "Cliqz", comment: "[Settings] Get the best out of CLIQZ")
+    }
+
+    override var url: URL? {
+        return URL(string: "https://www.ghostery.com")
+    }
+}
+
 class EulaSetting: ShowCliqzPageSetting {
 
     override func getTitle() -> String {
@@ -347,6 +342,17 @@ class CliqzPrivacyPolicySetting: ShowCliqzPageSetting {
 
 #else
 
+class CliqzTipsAndTricksSetting: ShowCliqzPageSetting {
+
+    override func getTitle() -> String {
+        return NSLocalizedString("Get the best out of CLIQZ", tableName: "Cliqz", comment: "[Settings] Get the best out of CLIQZ")
+    }
+
+    override func getPageName() -> String {
+        return "tips-ios"
+    }
+}
+
 class EulaSetting: LocalResourceSetting {
 
     override func getTitle() -> String {

Cliqz/Settings/CliqzAppSettingsTableViewController.swift

@@ -153,15 +153,6 @@ class CliqzAppSettingsTableViewController: AppSettingsTableViewController {
     }
 
     private func generateHelpSettings(prefs: Prefs) -> [Setting] {
-
-        #if GHOSTERY
-        let helpSettings = [
-            SupportSetting(delegate: settingsDelegate),
-            SendCrashReportsSetting(settings: self),
-            SendUsageDataSetting(settings: self),
-            MyOffrzSetting()
-        ]
-        #else
         let helpSettings = [
             SupportSetting(delegate: settingsDelegate),
             CliqzTipsAndTricksSetting(),
@@ -170,7 +161,6 @@ class CliqzAppSettingsTableViewController: AppSettingsTableViewController {
             SendUsageDataSetting(settings: self),
             MyOffrzSetting()
         ]
-        #endif
 
         return helpSettings
     }