Merge pull request #5359 from woocommerce/issue/3834-dismiss-site-picker

Dismiss site picker without switching to a different selected site

Author: jaclync

RELEASE-NOTES.txt

@@ -2,7 +2,7 @@
 
 8.0
 -----
-
+- [*] Fix: in Settings > Switch Store, tapping "Dismiss" after selecting a different store does not switch stores anymore. [https://github.com/woocommerce/woocommerce-ios/pull/5359]
 
 7.9
 -----

WooCommerce/Classes/Authentication/Epilogue/StorePickerViewController.swift

@@ -214,7 +214,7 @@ private extension StorePickerViewController {
         navigationItem.leftBarButtonItem = UIBarButtonItem(title: dismissLiteral,
                                                            style: .plain,
                                                            target: self,
-                                                           action: #selector(cleanupAndDismiss))
+                                                           action: #selector(dismissStorePicker))
     }
 
     func setupNavigationForListOfConnectedStores() {
@@ -365,12 +365,7 @@ private extension StorePickerViewController {
 
     /// Dismiss this VC
     ///
-    @objc func cleanupAndDismiss() {
-        if let siteID = currentlySelectedSite?.siteID {
-            delegate?.didSelectStore(with: siteID, onCompletion: {
-            })
-        }
-
+    @objc func dismissStorePicker() {
         dismiss()
     }