Merge pull request #18648 from wordpress-mobile/fix/18645-qs-end-current-tour-on-blog-switch

Quick Start for Existing Users: End current tour when switching blogs

Author: momo-ozawa

WordPress/Classes/ViewRelated/Blog/My Site/MySiteViewController+QuickStart.swift

@@ -8,19 +8,17 @@ extension MySiteViewController {
             if let info = notification.userInfo,
                let element = info[QuickStartTourGuide.notificationElementKey] as? QuickStartTourElement {
 
+                self?.siteMenuSpotlightIsShown = element == .siteMenu
+
                 switch element {
                 case .noSuchElement, .newpost:
                     self?.additionalSafeAreaInsets = .zero
 
                 case .siteIcon, .siteTitle, .viewSite:
                     self?.scrollView.scrollToTop(animated: true)
-                    self?.additionalSafeAreaInsets = Constants.quickStartNoticeInsets
-
-                case .siteMenu:
-                    self?.siteMenuSpotlightIsShown = true
                     fallthrough
 
-                case .pages, .sharing, .stats, .readerTab, .notifications:
+                case .siteMenu, .pages, .sharing, .stats, .readerTab, .notifications:
                     self?.additionalSafeAreaInsets = Constants.quickStartNoticeInsets
 
                 default:

WordPress/Classes/ViewRelated/Blog/Site Picker/SitePickerViewController.swift

@@ -148,8 +148,16 @@ extension SitePickerViewController: BlogDetailHeaderViewDelegate {
 extension SitePickerViewController {
 
     private func switchToBlog(_ blog: Blog) {
+        guard self.blog != blog else {
+            return
+        }
+
         self.blog = blog
         blogDetailHeaderView.blog = blog
+
+        QuickStartTourGuide.shared.endCurrentTour()
+        toggleSpotlightOnHeaderView()
+
         onBlogSwitched?(blog)
     }