Update site ID for POSTabCoordinator upon switching stores

Author: itsmeichigo

WooCommerce/Classes/Bookings/BookingsTabView.swift

@@ -16,6 +16,10 @@ final class BookingsTabViewHostingController: UIHostingController<BookingsTabVie
     override var shouldShowOfflineBanner: Bool {
         return true
     }
+
+    func didSwitchStore(id: Int64) {
+        // TODO: update view
+    }
 }
 
 private extension BookingsTabViewHostingController {

WooCommerce/Classes/POS/TabBar/POSTabCoordinator.swift

@@ -23,7 +23,7 @@ final class POSTabViewController: UIViewController {
 /// Coordinator for the Point of Sale tab.
 ///
 final class POSTabCoordinator {
-    private let siteID: Int64
+    private(set) var siteID: Int64
     private let tabContainerController: TabContainerController
     private let viewControllerToPresent: UIViewController
     private let storesManager: StoresManager
@@ -107,12 +107,55 @@ final class POSTabCoordinator {
     }
 
     func onTabSelected() {
-        presentPOSView()
+        presentPOSView(siteID: siteID)
+    }
+
+    func didSwitchStore(id: Int64) {
+        self.siteID = id
+
+        // Resets lazy properties so they get recreated with new siteID
+        posItemFetchStrategyFactory = PointOfSaleItemFetchStrategyFactory(
+            siteID: siteID,
+            credentials: credentials,
+            selectedSite: defaultSitePublisher,
+            appPasswordSupportState: isAppPasswordSupported
+        )
+
+        posPopularItemFetchStrategyFactory =
+        PointOfSaleFixedItemFetchStrategyFactory(
+            fixedStrategy: posItemFetchStrategyFactory.popularStrategy()
+        )
+
+        posCouponFetchStrategyFactory = PointOfSaleCouponFetchStrategyFactory(
+            siteID: siteID,
+            currencySettings: currencySettings,
+            credentials: credentials,
+            selectedSite: defaultSitePublisher,
+            appPasswordSupportState: isAppPasswordSupported,
+            storage: storageManager
+        )
+
+        posCouponProvider = PointOfSaleCouponService(
+            siteID: siteID,
+            currencySettings: currencySettings,
+            credentials: credentials,
+            selectedSite: defaultSitePublisher,
+            appPasswordSupportState: isAppPasswordSupported,
+            storage: storageManager
+        )
+
+        barcodeScanService = PointOfSaleBarcodeScanService(
+            siteID: siteID,
+            credentials: credentials,
+            selectedSite: defaultSitePublisher,
+            appPasswordSupportState: isAppPasswordSupported,
+            currencySettings: currencySettings
+        )
     }
 }
 
 private extension POSTabCoordinator {
-    func presentPOSView() {
+    func presentPOSView(siteID: Int64) {
         Task { @MainActor [weak self] in
             guard let self else { return }
             let serviceAdaptor = POSServiceLocatorAdaptor()

WooCommerce/Classes/ViewRelated/MainTabBarController.swift

@@ -842,11 +842,15 @@ private extension MainTabBarController {
         }
         hubMenuTabCoordinator?.activate(siteID: siteID)
 
-        // Set dashboard to be the default tab - disable optional tabs by default.
-        selectedIndex = WooTab.myStore.visibleIndex(isPOSTabVisible: false,
-                                                    isBookingsTabVisible: false)
-        updateTabViewControllers(isPOSTabVisible: false,
-                                 isBookingsTabVisible: false)
+        // Sets dashboard to be the default tab.
+        selectedIndex = WooTab.myStore.visibleIndex(isPOSTabVisible: isPOSTabVisible,
+                                                    isBookingsTabVisible: isBookingsTabVisible)
+
+        // Updates site ID for the POS coordinator to ensure correct data
+        posTabCoordinator?.didSwitchStore(id: siteID)
+
+        // Updates site ID for the bookings tab to display correct bookings
+        (bookingsContainerController.wrappedController as? BookingsTabViewHostingController)?.didSwitchStore(id: siteID)
     }
 
     func createDashboardViewController(siteID: Int64) -> UIViewController {

WooCommerce/Classes/ViewRelated/NotificationsBadgeController.swift

@@ -65,7 +65,7 @@ final class NotificationsBadgeController {
     ///
     private func hideDotOn(with input: NotificationsBadgeInput) {
         let tag = dotTag(for: input.tab)
-        if let subviews = input.tabBar.orderedTabBarActionableViews[input.tabIndex].subviews.first?.subviews {
+        if let subviews = input.tabBar.orderedTabBarActionableViews[safe: input.tabIndex]?.subviews.first?.subviews {
             for subview in subviews where subview.tag == tag {
                 subview.fadeOut() { _ in
                     subview.removeFromSuperview()