Bugfix FXIOS-14185 ⁃ "Close tabs" button shows incorrect number of tabs after a specific scenario (#31093)

* FXIOS-14185 #30747 ⁃ "Close tabs" button shows incorrect number of tabs after a specific scenario

* Fixed tests

Author: dicarobinho

firefox-ios/Client/Frontend/Browser/Tabs/Middleware/TabManagerMiddleware.swift

@@ -367,6 +367,7 @@ final class TabManagerMiddleware: FeatureFlaggable,
             isPrivateMode: isPrivateMode,
             tabs: tabs,
             normalTabsCount: normalTabsCountTextForTabTray(for: uuid),
+            privateTabsCount: privateTabsCountTextForTabTray(for: uuid),
             inactiveTabs: inactiveTabs,
             isInactiveTabsExpanded: false,
             enableDeleteTabsButton: shouldEnableDeleteTabsButton(for: uuid, isPrivateMode: isPrivateMode)

firefox-ios/Client/Frontend/Browser/Tabs/Models/TabDisplayModel.swift

@@ -8,6 +8,7 @@ struct TabDisplayModel: Equatable {
     var isPrivateMode: Bool
     var tabs: [TabModel]
     var normalTabsCount: String
+    var privateTabsCount: String
     var inactiveTabs: [InactiveTabsModel]
     var isInactiveTabsExpanded: Bool
     var undoCloseType: ToastType?

firefox-ios/Client/Frontend/Browser/Tabs/State/TabTrayState.swift

@@ -186,7 +186,7 @@ struct TabTrayState: ScreenState, Equatable {
                                 isPrivateMode: state.isPrivateMode,
                                 selectedPanel: state.selectedPanel,
                                 normalTabsCount: tabCount,
-                                privateTabsCount: state.privateTabsCount,
+                                privateTabsCount: tabDisplayModel.privateTabsCount,
                                 hasSyncableAccount: state.hasSyncableAccount,
                                 enableDeleteTabsButton: tabDisplayModel.enableDeleteTabsButton)
 

firefox-ios/firefox-ios-tests/Tests/ClientTests/TabTray/TabsPanelStateTests.swift

@@ -26,10 +26,12 @@ final class TabPanelStateTests: XCTestCase {
         XCTAssertTrue(initialState.tabs.isEmpty)
         let reducer = tabsPanelReducer()
         let tabs = createTabs()
+        let privateTabs = createTabs(isPrivate: true)
         let inactiveTabs = createInactiveTabs()
         let tabDisplayModel = TabDisplayModel(isPrivateMode: true,
                                               tabs: tabs,
                                               normalTabsCount: "\(tabs.count)",
+                                              privateTabsCount: "\(privateTabs.count)",
                                               inactiveTabs: inactiveTabs,
                                               isInactiveTabsExpanded: false,
                                               enableDeleteTabsButton: true)
@@ -49,10 +51,12 @@ final class TabPanelStateTests: XCTestCase {
         XCTAssertTrue(initialState.tabs.isEmpty)
         let reducer = tabsPanelReducer()
         let tabs = createTabs()
+        let privateTabs = createTabs(isPrivate: true)
         let inactiveTabs = createInactiveTabs()
         let tabDisplayModel = TabDisplayModel(isPrivateMode: true,
                                               tabs: tabs,
                                               normalTabsCount: "\(tabs.count)",
+                                              privateTabsCount: "\(privateTabs.count)",
                                               inactiveTabs: inactiveTabs,
                                               isInactiveTabsExpanded: false,
                                               enableDeleteTabsButton: true)
@@ -91,9 +95,11 @@ final class TabPanelStateTests: XCTestCase {
         let initialState = createInitialState()
         let reducer = tabsPanelReducer()
         let tabs = createOneSelectedTab()
+        let privateTabs = createTabs(isPrivate: true)
         let tabDisplayModel = TabDisplayModel(isPrivateMode: false,
                                               tabs: tabs,
                                               normalTabsCount: "\(tabs.count)",
+                                              privateTabsCount: "\(privateTabs.count)",
                                               inactiveTabs: [InactiveTabsModel](),
                                               isInactiveTabsExpanded: false,
                                               enableDeleteTabsButton: true)
@@ -113,10 +119,12 @@ final class TabPanelStateTests: XCTestCase {
         XCTAssertTrue(initialState.inactiveTabs.isEmpty)
         let reducer = tabsPanelReducer()
         let tabs = createTabs()
+        let privateTabs = createTabs(isPrivate: true)
         let inactiveTabs = createInactiveTabs()
         let tabDisplayModel = TabDisplayModel(isPrivateMode: false,
                                               tabs: tabs,
                                               normalTabsCount: "\(tabs.count)",
+                                              privateTabsCount: "\(privateTabs.count)",
                                               inactiveTabs: [InactiveTabsModel](),
                                               isInactiveTabsExpanded: false,
                                               enableDeleteTabsButton: true)