Merge pull request #7544 from woocommerce/issue/7541-save-plugin-selection-regardless-of-onboarding-failures

[Mobile Payments] Save plugin selection on onboarding completion

Author: joshheald

RELEASE-NOTES.txt

@@ -3,6 +3,7 @@
 10.1
 -----
 - [*] In-Person Payments: The onboarding notice on the In-Person Payments menu is correctly dismissed after multiple prompts are shown. [https://github.com/woocommerce/woocommerce-ios/pull/7543]
+- [*] In-Person Payments: The plugin selection is saved correctly after multiple onboarding prompts. [https://github.com/woocommerce/woocommerce-ios/pull/7544]
 
 10.0
 -----

WooCommerce/Classes/ViewRelated/Dashboard/Settings/In-Person Payments/CardPresentPaymentsOnboardingUseCase.swift

@@ -43,6 +43,7 @@ final class CardPresentPaymentsOnboardingUseCase: CardPresentPaymentsOnboardingU
     var statePublisher: Published<CardPresentPaymentOnboardingState>.Publisher {
         $state
     }
+    private var cancellables: [AnyCancellable] = []
 
     init(
         storageManager: StorageManagerType = ServiceLocator.storageManager,
@@ -103,11 +104,19 @@ final class CardPresentPaymentsOnboardingUseCase: CardPresentPaymentsOnboardingU
         assert(state.isSelectPlugin)
 
         preferredPluginLocal = selectedPlugin
+        deferredSaveSelectedPluginWhenOnboardingComplete(selectedPlugin: selectedPlugin)
+
         updateState()
-        if case .completed(let pluginState) = state,
-           pluginState.preferred == selectedPlugin {
-            savePreferredPlugin(selectedPlugin)
+    }
+
+    private func deferredSaveSelectedPluginWhenOnboardingComplete(selectedPlugin: CardPresentPaymentsPlugin) {
+        $state.share().sink { [weak self] newState in
+            if case .completed(let pluginState) = newState,
+               pluginState.preferred == selectedPlugin {
+                self?.savePreferredPlugin(selectedPlugin)
+            }
         }
+        .store(in: &cancellables)
     }
 
     func clearPluginSelection() {