Merge branch 'feat/6964-persist-stats-time-range' into fix/7639-swipe-to-switch-time-range-tab

* feat/6964-persist-stats-time-range: (21 commits)
  Expand test group log when tests failed
  Removes Custom intent
  Manually handle provisioning profiles & Disables Bitcode
  Modified test. Navigate to hubmenu post-notification
  Set `skip_prechecks:true` in CI release builds
  Revert "Force a couple of test case failures"
  Bump version number
  Update metadata translations
  Update app translations – `Localizable.strings`
  Only link, not embed, WooFoundation and Experiments in widgets target
  Update Tracks from version `0.12.0-beta.2` to `0.12.0` stable
  Force a couple of test case failures
  Make sure test results are archived when test suites fail
  Rename unit test meaningfully after flag removal
  Delete unused NSLocalizedString
  Remove redundant return
  Remove hubMenu feature flag unit tests
  Typo: Fix failing Unit Tests
  Remove isHubMenuOn from MockFeatureFlagService init
  Remove hubMenu MockFeatureFlag. Check Unit Tests pass
  ...

Author: jaclync

.buildkite/commands/release-build.sh

@@ -22,5 +22,6 @@ bundle exec fastlane run configure_apply
 echo "--- :hammer_and_wrench: Building"
 bundle exec fastlane build_and_upload_itc \
   skip_confirm:true \
+  skip_prechecks:true \
   create_release:true \
   beta_release:${1:-true} # use first call param, default to true for safety

.buildkite/commands/run-ui-tests.sh

@@ -35,7 +35,18 @@ install_cocoapods
 echo "--- 🧪 Testing"
 xcrun simctl list >> /dev/null
 rake mocks &
+set +e
 bundle exec fastlane test_without_building name:"$TEST_NAME" device:"$DEVICE" ios_version:"$IOS_VERSION"
+TESTS_EXIT_STATUS=$?
+set -e
+
+if [[ "$TESTS_EXIT_STATUS" -ne 0 ]]; then
+  # Keep the (otherwise collapsed) current "Testing" section open in Buildkite logs on error. See https://buildkite.com/docs/pipelines/managing-log-output#collapsing-output
+  echo "^^^ +++"
+  echo "UI Tests failed!"
+fi
 
 echo "--- 📦 Zipping test results"
 cd fastlane/test_output/ && zip -rq WooCommerce.xcresult.zip WooCommerce.xcresult && cd -
+
+exit $TESTS_EXIT_STATUS

.buildkite/commands/run-unit-tests.sh

@@ -16,7 +16,18 @@ echo "--- :rubygems: Setting up Gems"
 install_gems
 
 echo "--- 🧪 Testing"
+set +e
 bundle exec fastlane test_without_building name:UnitTests
+TESTS_EXIT_STATUS=$?
+set -e
+
+if [[ "$TESTS_EXIT_STATUS" -ne 0 ]]; then
+  # Keep the (otherwise collapsed) current "Testing" section open in Buildkite logs on error. See https://buildkite.com/docs/pipelines/managing-log-output#collapsing-output
+  echo "^^^ +++"
+  echo "Unit Tests failed!"
+fi
 
 echo "--- 📦 Zipping test results"
 cd fastlane/test_output/ && zip -rq WooCommerce.xcresult.zip WooCommerce.xcresult && cd -
+
+exit $TESTS_EXIT_STATUS

Experiments/Experiments/DefaultFeatureFlagService.swift

@@ -9,8 +9,6 @@ public struct DefaultFeatureFlagService: FeatureFlagService {
             return buildConfig == .localDeveloper || buildConfig == .alpha
         case .jetpackConnectionPackageSupport:
             return true
-        case .hubMenu:
-            return true
         case .couponView:
             return true
         case .productSKUInputScanner:

Experiments/Experiments/FeatureFlag.swift

@@ -18,10 +18,6 @@ public enum FeatureFlag: Int {
     ///
     case jetpackConnectionPackageSupport
 
-    /// Display the new tab "Menu" in the tab bar.
-    ///
-    case hubMenu
-
     /// Displays the option to view coupons
     ///
     case couponView

Podfile

@@ -27,7 +27,7 @@ def aztec
 end
 
 def tracks
-  pod 'Automattic-Tracks-iOS', '~> 0.12.0-beta.2'
+  pod 'Automattic-Tracks-iOS', '~> 0.12.0'
   # pod 'Automattic-Tracks-iOS', :git => 'https://github.com/Automattic/Automattic-Tracks-iOS.git', :branch => ''
   # pod 'Automattic-Tracks-iOS', :git => 'https://github.com/Automattic/Automattic-Tracks-iOS.git', :commit => ''
   # pod 'Automattic-Tracks-iOS', :path => '../Automattic-Tracks-iOS'

Podfile.lock

@@ -6,7 +6,7 @@ PODS:
   - AppAuth/Core (1.5.0)
   - AppAuth/ExternalUserAgent (1.5.0):
     - AppAuth/Core
-  - Automattic-Tracks-iOS (0.12.0-beta.2):
+  - Automattic-Tracks-iOS (0.12.0):
     - Sentry (~> 6)
     - Sodium (>= 0.9.1)
     - UIDeviceIdentifier (~> 2.0)
@@ -83,7 +83,7 @@ PODS:
 
 DEPENDENCIES:
   - Alamofire (~> 4.8)
-  - Automattic-Tracks-iOS (~> 0.12.0-beta.2)
+  - Automattic-Tracks-iOS (~> 0.12.0)
   - CocoaLumberjack (~> 3.7.4)
   - CocoaLumberjack/Swift (~> 3.7.4)
   - Gridicons (~> 1.2.0)
@@ -144,7 +144,7 @@ SPEC REPOS:
 SPEC CHECKSUMS:
   Alamofire: 3ec537f71edc9804815215393ae2b1a8ea33a844
   AppAuth: 80317d99ac7ff2801a2f18ff86b48cd315ed465d
-  Automattic-Tracks-iOS: f31213fbf0391968ffcff75e8c1bdad398589261
+  Automattic-Tracks-iOS: dae8787ffc2c74493a3a908abc48aed527686131
   CocoaLumberjack: 543c79c114dadc3b1aba95641d8738b06b05b646
   FormatterKit: 184db51bf120b633693a73624a4cede89ec51a41
   GoogleSignIn: fd381840dbe7c1137aa6dc30849a5c3e070c034a
@@ -179,6 +179,6 @@ SPEC CHECKSUMS:
   ZendeskSupportProvidersSDK: 2bdf8544f7cd0fd4c002546f5704b813845beb2a
   ZendeskSupportSDK: 3a8e508ab1d9dd22dc038df6c694466414e037ba
 
-PODFILE CHECKSUM: 4bdf9f791fbedc1074a7e20f9ff254db1f59c7ba
+PODFILE CHECKSUM: 79417db449eae85f8a39f1707df162e137f11d43
 
 COCOAPODS: 1.11.2

WooCommerce/Classes/ViewRelated/Dashboard/DashboardViewController.swift

@@ -148,7 +148,6 @@ private extension DashboardViewController {
     func configureNavigation() {
         configureTitle()
         configureHeaderStackView()
-        configureNavigationItem()
     }
 
     func configureTabBarItem() {
@@ -196,23 +195,6 @@ private extension DashboardViewController {
         contentBottomToContainerConstraint = contentView.bottomAnchor.constraint(equalTo: containerView.bottomAnchor)
     }
 
-    private func configureNavigationItem() {
-        if !ServiceLocator.featureFlagService.isFeatureFlagEnabled(.hubMenu) {
-            let rightBarButton = UIBarButtonItem(image: .gearBarButtonItemImage,
-                                                 style: .plain,
-                                                 target: self,
-                                                 action: #selector(settingsTapped))
-            rightBarButton.accessibilityLabel = NSLocalizedString("Settings", comment: "Accessibility label for the Settings button.")
-            rightBarButton.accessibilityTraits = .button
-            rightBarButton.accessibilityHint = NSLocalizedString(
-                "Navigates to Settings.",
-                comment: "VoiceOver accessibility hint, informing the user the button can be used to navigate to the Settings screen."
-            )
-            rightBarButton.accessibilityIdentifier = "dashboard-settings-button"
-            navigationItem.setRightBarButton(rightBarButton, animated: false)
-        }
-    }
-
     func configureDashboardUIContainer() {
         hiddenScrollView.configureForLargeTitleWorkaround()
         // Adds the "hidden" scroll view to the root of the UIViewController for large titles.

WooCommerce/Classes/ViewRelated/Dashboard/Settings/Settings/SettingsViewModel.swift

@@ -195,20 +195,6 @@ private extension SettingsViewModel {
     }
 
     func configureSections() {
-        // Selected Store
-        let selectedStoreSection: Section? = {
-            if featureFlagService.isFeatureFlagEnabled(.hubMenu) {
-                return nil
-            }
-            else {
-                let storeRows: [Row] = sites.count > 1 ?
-                [.selectedStore, .switchStore] : [.selectedStore]
-                return Section(title: Localization.selectedStoreTitle,
-                               rows: storeRows,
-                               footerHeight: UITableView.automaticDimension)
-            }
-        }()
-
         // Plugins
         let pluginsSection: Section? = {
             // Show the plugins section only if the user has an `admin` role for the default store site.
@@ -301,7 +287,6 @@ private extension SettingsViewModel {
                                     footerHeight: CGFloat.leastNonzeroMagnitude)
 
         sections = [
-            selectedStoreSection,
             pluginsSection,
             storeSettingsSection,
             helpAndFeedbackSection,
@@ -371,12 +356,6 @@ private extension SettingsViewModel {
 //
 private extension SettingsViewModel {
     enum Localization {
-        static let selectedStoreTitle = NSLocalizedString(
-            "Selected Store",
-            comment: "My Store > Settings > Selected Store information section. " +
-                "This is the heading listed above the information row that displays the store website and their username."
-        ).uppercased()
-
         static let pluginsTitle = NSLocalizedString(
             "Plugins",
             comment: "My Store > Settings > Plugins section title"

WooCommerce/Classes/ViewRelated/MainTabBarController.swift

@@ -35,14 +35,14 @@ extension WooTab {
     ///
     /// - Parameters:
     ///   - visibleIndex: the index of visible tabs on the tab bar
-    init(visibleIndex: Int, isHubMenuFeatureFlagOn: Bool) {
-        let tabs = WooTab.visibleTabs(isHubMenuFeatureFlagOn)
+    init(visibleIndex: Int) {
+        let tabs = WooTab.visibleTabs()
         self = tabs[visibleIndex]
     }
 
     /// Returns the visible tab index.
-    func visibleIndex(_ isHubMenuFeatureFlagOn: Bool) -> Int {
-        let tabs = WooTab.visibleTabs(isHubMenuFeatureFlagOn)
+    func visibleIndex() -> Int {
+        let tabs = WooTab.visibleTabs()
         guard let tabIndex = tabs.firstIndex(where: { $0 == self }) else {
             assertionFailure("Trying to get the visible tab index for tab \(self) while the visible tabs are: \(tabs)")
             return 0
@@ -51,17 +51,8 @@ extension WooTab {
     }
 
     // Note: currently only the Dashboard tab (My Store) view controller is set up in Main.storyboard.
-    private static func visibleTabs(_ isHubMenuFeatureFlagOn: Bool) -> [WooTab] {
-        var tabs: [WooTab] = [.myStore, .orders, .products]
-
-        if isHubMenuFeatureFlagOn {
-            tabs.append(.hubMenu)
-        }
-        else {
-            tabs.append(.reviews)
-        }
-
-        return tabs
+    private static func visibleTabs() -> [WooTab] {
+        [.myStore, .orders, .products, .hubMenu]
     }
 }
 
@@ -114,8 +105,6 @@ final class MainTabBarController: UITabBarController {
 
     private var productImageUploadErrorsSubscription: AnyCancellable?
 
-    private lazy var isHubMenuFeatureFlagOn = featureFlagService.isFeatureFlagEnabled(.hubMenu)
-
     private lazy var isOrdersSplitViewFeatureFlagOn = featureFlagService.isFeatureFlagEnabled(.splitViewInOrdersTab)
 
     init?(coder: NSCoder,
@@ -174,11 +163,11 @@ final class MainTabBarController: UITabBarController {
     }
 
     override func tabBar(_ tabBar: UITabBar, didSelect item: UITabBarItem) {
-        let currentlySelectedTab = WooTab(visibleIndex: selectedIndex, isHubMenuFeatureFlagOn: isHubMenuFeatureFlagOn)
+        let currentlySelectedTab = WooTab(visibleIndex: selectedIndex)
         guard let userSelectedIndex = tabBar.items?.firstIndex(of: item) else {
                 return
         }
-        let userSelectedTab = WooTab(visibleIndex: userSelectedIndex, isHubMenuFeatureFlagOn: isHubMenuFeatureFlagOn)
+        let userSelectedTab = WooTab(visibleIndex: userSelectedIndex)
 
         // Did we reselect the already-selected tab?
         if currentlySelectedTab == userSelectedTab {
@@ -197,7 +186,7 @@ final class MainTabBarController: UITabBarController {
         if let presentedController = Self.childViewController()?.presentedViewController {
             presentedController.dismiss(animated: true)
         }
-        selectedIndex = tab.visibleIndex(isHubMenuFeatureFlagOn)
+        selectedIndex = tab.visibleIndex()
         if let navController = selectedViewController as? UINavigationController {
             navController.popToRootViewController(animated: animated) {
                 completion?()
@@ -439,22 +428,17 @@ private extension MainTabBarController {
         viewControllers = {
             var controllers = [UIViewController]()
 
-            let dashboardTabIndex = WooTab.myStore.visibleIndex(isHubMenuFeatureFlagOn)
+            let dashboardTabIndex = WooTab.myStore.visibleIndex()
             controllers.insert(dashboardNavigationController, at: dashboardTabIndex)
 
-            let ordersTabIndex = WooTab.orders.visibleIndex(isHubMenuFeatureFlagOn)
+            let ordersTabIndex = WooTab.orders.visibleIndex()
             controllers.insert(ordersNavigationController, at: ordersTabIndex)
 
-            let productsTabIndex = WooTab.products.visibleIndex(isHubMenuFeatureFlagOn)
+            let productsTabIndex = WooTab.products.visibleIndex()
             controllers.insert(productsNavigationController, at: productsTabIndex)
 
-            if isHubMenuFeatureFlagOn {
-                let hubMenuTabIndex = WooTab.hubMenu.visibleIndex(isHubMenuFeatureFlagOn)
-                controllers.insert(hubMenuNavigationController, at: hubMenuTabIndex)
-            } else {
-                let reviewsTabIndex = WooTab.reviews.visibleIndex(isHubMenuFeatureFlagOn)
-                controllers.insert(reviewsNavigationController, at: reviewsTabIndex)
-            }
+            let hubMenuTabIndex = WooTab.hubMenu.visibleIndex()
+            controllers.insert(hubMenuNavigationController, at: hubMenuTabIndex)
 
             return controllers
         }()
@@ -487,26 +471,16 @@ private extension MainTabBarController {
         let productsViewController = createProductsViewController(siteID: siteID)
         productsNavigationController.viewControllers = [productsViewController]
 
-        // Configure hub menu tab coordinator or reviews tab coordinator once per logged in session potentially with multiple sites.
-        if isHubMenuFeatureFlagOn {
-            if hubMenuTabCoordinator == nil {
-                let hubTabCoordinator = createHubMenuTabCoordinator()
-                self.hubMenuTabCoordinator = hubTabCoordinator
-                hubTabCoordinator.start()
-            }
-            hubMenuTabCoordinator?.activate(siteID: siteID)
-        }
-        else {
-            if reviewsTabCoordinator == nil {
-                let reviewsTabCoordinator = createReviewsTabCoordinator()
-                self.reviewsTabCoordinator = reviewsTabCoordinator
-                reviewsTabCoordinator.start()
-            }
-            reviewsTabCoordinator?.activate(siteID: siteID)
+        // Configure hub menu tab coordinator once per logged in session potentially with multiple sites.
+        if hubMenuTabCoordinator == nil {
+            let hubTabCoordinator = createHubMenuTabCoordinator()
+            self.hubMenuTabCoordinator = hubTabCoordinator
+            hubTabCoordinator.start()
         }
+        hubMenuTabCoordinator?.activate(siteID: siteID)
 
         // Set dashboard to be the default tab.
-        selectedIndex = WooTab.myStore.visibleIndex(isHubMenuFeatureFlagOn)
+        selectedIndex = WooTab.myStore.visibleIndex()
     }
 
     func createDashboardViewController(siteID: Int64) -> UIViewController {
@@ -561,8 +535,8 @@ private extension MainTabBarController {
     }
 
     func updateMenuTabBadge(with action: NotificationBadgeActionType) {
-        let tab = self.isHubMenuFeatureFlagOn ? WooTab.hubMenu : WooTab.reviews
-        let tabIndex = tab.visibleIndex(self.isHubMenuFeatureFlagOn)
+        let tab = WooTab.hubMenu
+        let tabIndex = tab.visibleIndex()
         let input = NotificationsBadgeInput(action: action, tab: tab, tabBar: self.tabBar, tabIndex: tabIndex)
 
         self.notificationsBadge.updateBadge(with: input)
@@ -579,7 +553,7 @@ private extension MainTabBarController {
             }
 
             let tab = WooTab.orders
-            let tabIndex = tab.visibleIndex(self.isHubMenuFeatureFlagOn)
+            let tabIndex = tab.visibleIndex()
 
             guard let orderTab: UITabBarItem = self.tabBar.items?[tabIndex] else {
                 return