Merge pull request #5901 from woocommerce/issue/5886-reactive-settings

Jetpack CP: Reload Settings sections when dismissing Install Jetpack screen

Author: itsmeichigo

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

@@ -307,6 +307,7 @@ private extension SettingsViewController {
         let installJetpackController = JetpackInstallHostingController(siteID: site.siteID, siteURL: site.url, siteAdminURL: site.adminURL)
         installJetpackController.setDismissAction { [weak self] in
             self?.dismiss(animated: true, completion: nil)
+            self?.viewModel.onJetpackInstallDismiss()
         }
         present(installJetpackController, animated: true, completion: nil)
     }

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

@@ -38,6 +38,10 @@ protocol SettingsViewModelActionsHandler {
     /// Presenter (SettingsViewController in this case) is responsible for calling this method when store picker is dismissed.
     ///
     func onStorePickerDismiss()
+
+    /// Reloads settings if the site is no longer Jetpack CP.
+    ///
+    func onJetpackInstallDismiss()
 }
 
 protocol SettingsViewModelInput: AnyObject {
@@ -140,6 +144,15 @@ final class SettingsViewModel: SettingsViewModelOutput, SettingsViewModelActions
         loadSites()
         reloadSettings()
     }
+
+    /// Reloads settings if the site is no longer Jetpack CP.
+    ///
+    func onJetpackInstallDismiss() {
+        guard stores.sessionManager.defaultSite?.isJetpackCPConnected == false else {
+            return
+        }
+        reloadSettings()
+    }
 }
 
 private extension SettingsViewModel {

WooCommerce/WooCommerceTests/ViewRelated/Settings/SettingsViewModelTests.swift

@@ -151,6 +151,28 @@ final class SettingsViewModelTests: XCTestCase {
         // Then
         XCTAssertTrue(presenter.refreshViewContentCalled)
     }
+
+    func test_onJetpackInstallDismiss_updates_sections_correctly() {
+        // Given
+        let featureFlagService = MockFeatureFlagService(isJetpackConnectionPackageSupportOn: true)
+        let site = Site.fake().copy(isJetpackThePluginInstalled: false, isJetpackConnected: true)
+        sessionManager.defaultSite = site
+        let viewModel = SettingsViewModel(
+            stores: stores,
+            storageManager: storageManager,
+            featureFlagService: featureFlagService)
+
+        viewModel.onViewDidLoad()
+        XCTAssertTrue(viewModel.sections.contains { $0.rows.contains(SettingsViewController.Row.installJetpack) })
+
+        // When
+        let updatedSite = site.copy(isJetpackThePluginInstalled: true, isJetpackConnected: false)
+        sessionManager.defaultSite = updatedSite
+        viewModel.onJetpackInstallDismiss()
+
+        // Then
+        XCTAssertFalse(viewModel.sections.contains { $0.rows.contains(SettingsViewController.Row.installJetpack) })
+    }
 }
 
 private final class MockSettingsPresenter: SettingsViewPresenter {