Merge pull request #5824 from woocommerce/fix/trunk-hubMenu-ios14

jaclync · web-flow · commit 5c909ecef506 · 2022-01-06T15:28:23.000+08:00
Fix crash when tapping on Menu tab in iOS 14
diff --git a/WooCommerce/Classes/ViewRelated/Hub Menu/HubMenuViewModel.swift b/WooCommerce/Classes/ViewRelated/Hub Menu/HubMenuViewModel.swift
@@ -47,12 +47,12 @@ final class HubMenuViewModel: ObservableObject {
     init(siteID: Int64, navigationController: UINavigationController? = nil, featureFlagService: FeatureFlagService = ServiceLocator.featureFlagService) {
         self.siteID = siteID
         self.navigationController = navigationController
-        menuElements = [.woocommerceAdmin, .viewStore, .reviews]
+        menuElements = [.woocommerceAdmin, .viewStore]
         if featureFlagService.isFeatureFlagEnabled(.couponManagement) {
             menuElements.append(.coupons)
         }
         menuElements.append(.reviews)
-       observeSiteForUIUpdates()
+        observeSiteForUIUpdates()
     }
 
     /// Present the `StorePickerViewController` using the `StorePickerCoordinator`, passing the navigation controller from the entry point.

Original file line number	Diff line number	Diff line change
`@@ -47,12 +47,12 @@ final class HubMenuViewModel: ObservableObject {`
`47`	`47`	`init(siteID: Int64, navigationController: UINavigationController? = nil, featureFlagService: FeatureFlagService = ServiceLocator.featureFlagService) {`
`48`	`48`	`self.siteID = siteID`
`49`	`49`	`self.navigationController = navigationController`
`50`		`- menuElements = [.woocommerceAdmin, .viewStore, .reviews]`
	`50`	`+ menuElements = [.woocommerceAdmin, .viewStore]`
`51`	`51`	`if featureFlagService.isFeatureFlagEnabled(.couponManagement) {`
`52`	`52`	`menuElements.append(.coupons)`
`53`	`53`	`}`
`54`	`54`	`menuElements.append(.reviews)`
`55`		`- observeSiteForUIUpdates()`
	`55`	`+ observeSiteForUIUpdates()`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	/// Present the `StorePickerViewController` using the `StorePickerCoordinator`, passing the navigation controller from the entry point.