Rather use the navigation stack

Author: adborbas

WooCommerce/Classes/ViewRelated/Orders/Order Creation/OrderForm.swift

@@ -139,7 +139,7 @@ struct OrderFormPresentationWrapper: View {
             },
             secondaryView: { isShowingProductSelector in
                 if let productSelectorViewModel = viewModel.productSelectorViewModel {
-                    ProductSelectorView(configuration: .loadConfiguration(for: horizontalSizeClass),
+                    ProductSelectorNavigationView(configuration: .loadConfiguration(for: horizontalSizeClass),
                                         isPresented: isShowingProductSelector,
                                         viewModel: productSelectorViewModel)
                     .sheet(item: $viewModel.productToConfigureViewModel) { viewModel in

WooCommerce/Classes/ViewRelated/Products/ProductSelector/ProductSelectorNavigationView.swift

@@ -15,12 +15,11 @@ struct ProductSelectorNavigationView: View {
     }
 
     var body: some View {
-        NavigationView {
+        NavigationStack {
             ProductSelectorView(configuration: configuration,
                                 isPresented: $isPresented,
                                 viewModel: viewModel)
         }
-        .navigationViewStyle(.stack)
         .wooNavigationBarStyle()
     }
 }

WooCommerce/Classes/ViewRelated/Products/ProductSelector/ProductVariationSelectorView.swift

@@ -15,8 +15,6 @@ struct ProductVariationSelectorView: View {
 
     private let onMultipleSelections: (([Int64]) -> Void)?
 
-    @State private var hasSentSelectionOnDismiss = false
-
     /// Tracks the state for the 'Clear Selection' button
     ///
     private var isClearSelectionDisabled: Bool {
@@ -103,11 +101,6 @@ struct ProductVariationSelectorView: View {
                 .accessibilityLabel(Localization.backButtonAccessibilityLabel)
             }
         }
-        .onDisappear {
-            guard !hasSentSelectionOnDismiss else { return }
-            hasSentSelectionOnDismiss = true
-            onMultipleSelections?(viewModel.selectedProductVariationIDs)
-        }
         .onAppear {
             viewModel.onLoadTrigger.send()
         }