Add CheckPluginError to distinguish plugin outdated from other failures

Show "Update plugin" button only when the plugin is actually outdated,
otherwise show "Try again" for generic plugin check failures.

Co-Authored-By: Claude Opus 4.5 <[email protected]>

Author: adborbas

WooCommerce/Classes/Authentication/WPComLogin/WPComConnectionSetup/WPComConnectionSetupViewModel.swift

@@ -5,10 +5,15 @@ import SwiftUI
 @MainActor
 final class WPComConnectionSetupViewModel: ObservableObject {
 
+    enum CheckPluginError: Equatable {
+        case outdated
+        case other
+    }
+
     private enum SetupState: Equatable {
         case inProgress
         case completed
-        case failed(step: SetupStep)
+        case failed(step: SetupStep, checkPluginError: CheckPluginError? = nil)
     }
 
     @Published private(set) var steps: [WPComConnectionSetupStep] = []
@@ -20,12 +25,12 @@ final class WPComConnectionSetupViewModel: ObservableObject {
         switch setupState {
         case .inProgress, .completed:
             return Localization.goToMyStore
-        case .failed(let step):
+        case .failed(let step, let checkPluginError):
             switch step {
             case .connect, .enablePush:
                 return Localization.tryAgain
             case .checkPlugin:
-                return Localization.updatePlugin
+                return checkPluginError == .outdated ? Localization.updatePlugin : Localization.tryAgain
             }
         }
     }
@@ -35,7 +40,10 @@ final class WPComConnectionSetupViewModel: ObservableObject {
     }
 
     var isShowingSecondaryButton: Bool {
-        setupState == .failed(step: .checkPlugin)
+        if case .failed(step: .checkPlugin, checkPluginError: .outdated) = setupState {
+            return true
+        }
+        return false
     }
 
     var secondaryButtonTitle: String {
@@ -87,12 +95,16 @@ final class WPComConnectionSetupViewModel: ObservableObject {
         switch setupState {
         case .completed:
             onGoToStore()
-        case .failed(let step):
+        case .failed(let step, let checkPluginError):
             switch step {
             case .connect, .enablePush:
                 retrySetup()
             case .checkPlugin:
-                onUpdatePlugin()
+                if checkPluginError == .outdated {
+                    onUpdatePlugin()
+                } else {
+                    retrySetup()
+                }
             }
         case .inProgress:
             break
@@ -139,11 +151,17 @@ extension WPComConnectionSetupViewModel: WPComConnectionSetupHandlerDelegate {
     func stepDidUpdate(_ step: SetupStep, status: WPComConnectionSetupStep.Status) {
         updateStep(step, status: status)
 
-        if case .failure = status {
-            setupState = .failed(step: step)
+        if case .failure(let reason) = status {
+            let checkPluginError: CheckPluginError? = step == .checkPlugin ? checkPluginError(from: reason) : nil
+            setupState = .failed(step: step, checkPluginError: checkPluginError)
         }
     }
 
+    private func checkPluginError(from reason: String) -> CheckPluginError {
+        // TODO: Update condition based on actual error identifier from handler
+        reason.contains("outdated") ? .outdated : .other
+    }
+
     func setupDidComplete() {
         setupState = .completed
     }

WooCommerce/WooCommerceTests/ViewRelated/JetpackSetup/WPComLogin/WPComConnectionSetup/WPComConnectionSetupViewModelTests.swift

@@ -65,7 +65,7 @@ final class WPComConnectionSetupViewModelTests: XCTestCase {
         XCTAssertFalse(viewModel.isShowingSecondaryButton)
     }
 
-    func test_plugin_failure_shows_updatePlugin_and_tryAgain_buttons() {
+    func test_plugin_failure_outdated_shows_updatePlugin_and_tryAgain_buttons() {
         // Given
         let viewModel = makeViewModel()
 
@@ -79,6 +79,19 @@ final class WPComConnectionSetupViewModelTests: XCTestCase {
         XCTAssertEqual(viewModel.secondaryButtonTitle, "Try again")
     }
 
+    func test_plugin_failure_other_shows_tryAgain_button() {
+        // Given
+        let viewModel = makeViewModel()
+
+        // When
+        mockHandler.simulateStepUpdate(.checkPlugin, status: .failure(reason: "Network error"))
+
+        // Then
+        XCTAssertEqual(viewModel.primaryButtonTitle, "Try again")
+        XCTAssertTrue(viewModel.isPrimaryButtonEnabled)
+        XCTAssertFalse(viewModel.isShowingSecondaryButton)
+    }
+
     func test_setupDidComplete_enables_goToMyStore_button() {
         // Given
         let viewModel = makeViewModel()
@@ -106,7 +119,7 @@ final class WPComConnectionSetupViewModelTests: XCTestCase {
         XCTAssertTrue(goToStoreCalled)
     }
 
-    func test_primaryButtonTapped_on_plugin_failure_calls_updatePlugin() {
+    func test_primaryButtonTapped_on_plugin_failure_outdated_calls_updatePlugin() {
         // Given
         let viewModel = makeViewModel()
         mockHandler.simulateStepUpdate(.checkPlugin, status: .failure(reason: "Plugin outdated"))
@@ -118,6 +131,18 @@ final class WPComConnectionSetupViewModelTests: XCTestCase {
         XCTAssertTrue(updatePluginCalled)
     }
 
+    func test_primaryButtonTapped_on_plugin_failure_other_retries() {
+        // Given
+        let viewModel = makeViewModel()
+        mockHandler.simulateStepUpdate(.checkPlugin, status: .failure(reason: "Network error"))
+
+        // When
+        viewModel.primaryButtonTapped()
+
+        // Then
+        XCTAssertEqual(mockHandler.retryCallCount, 1)
+    }
+
     // MARK: - Dismiss Tests
 
     func test_cancelTapped_calls_handler_cancel_and_dismiss() {