diff --git a/WordPress/Classes/Utility/ZendeskUtils.swift b/WordPress/Classes/Utility/ZendeskUtils.swift index 7400e5c3c754..e3b636a423b9 100644 --- a/WordPress/Classes/Utility/ZendeskUtils.swift +++ b/WordPress/Classes/Utility/ZendeskUtils.swift @@ -66,6 +66,7 @@ import CoreTelephony let presentInController = ZendeskUtils.configureViewController(controller) ZDKRequests.presentRequestCreation(with: presentInController) + createRequest() } func showTicketList(from controller: UIViewController) { diff --git a/WordPress/Classes/ViewRelated/Notifications/Controllers/NotificationsViewController.swift b/WordPress/Classes/ViewRelated/Notifications/Controllers/NotificationsViewController.swift index 811e73dbffc8..6c2da94962e2 100644 --- a/WordPress/Classes/ViewRelated/Notifications/Controllers/NotificationsViewController.swift +++ b/WordPress/Classes/ViewRelated/Notifications/Controllers/NotificationsViewController.swift @@ -1401,15 +1401,26 @@ extension NotificationsViewController: AppFeedbackPromptViewDelegate { WPAnalytics.track(.appReviewsOpenedFeedbackScreen) AppRatingUtility.shared.gaveFeedbackForCurrentVersion() hideRatingViewWithDelay(0.0) - if HelpshiftUtils.isHelpshiftEnabled() { - let presenter = HelpshiftPresenter.init() - presenter.sourceTag = SupportSourceTag.inAppFeedback - presenter.presentHelpshiftConversationWindowFromViewController(self, - refreshUserDetails: true, - completion: nil) + + if FeatureFlag.zendeskMobile.enabled { + if ZendeskUtils.sharedInstance.zendeskEnabled { + ZendeskUtils.sharedInstance.showNewRequest(from: self) + } else { + if let contact = URL(string: NotificationsViewController.contactURL) { + UIApplication.shared.open(contact) + } + } } else { - if let contact = URL(string: NotificationsViewController.contactURL) { - UIApplication.shared.open(contact) + if HelpshiftUtils.isHelpshiftEnabled() { + let presenter = HelpshiftPresenter.init() + presenter.sourceTag = SupportSourceTag.inAppFeedback + presenter.presentHelpshiftConversationWindowFromViewController(self, + refreshUserDetails: true, + completion: nil) + } else { + if let contact = URL(string: NotificationsViewController.contactURL) { + UIApplication.shared.open(contact) + } } } } diff --git a/WordPress/Classes/ViewRelated/Support/SupportTableViewController.swift b/WordPress/Classes/ViewRelated/Support/SupportTableViewController.swift index 3c925caee28a..06998720611a 100644 --- a/WordPress/Classes/ViewRelated/Support/SupportTableViewController.swift +++ b/WordPress/Classes/ViewRelated/Support/SupportTableViewController.swift @@ -148,13 +148,10 @@ private extension SupportTableViewController { return { [unowned self] row in self.tableView.deselectSelectedRowWithAnimation(true) if ZendeskUtils.sharedInstance.zendeskEnabled { - guard let controllerToShowFrom = self.controllerToShowFrom() else { return } - ZendeskUtils.sharedInstance.showNewRequest(from: controllerToShowFrom) - ZendeskUtils.sharedInstance.createRequest() } else { guard let url = Constants.forumsURL else { return