Merge branch 'develop' into issue/250-tracking-ui

Author: ctarda

.hound.yml

@@ -1,4 +1,4 @@
-swift:
+swiftlint:
     config_file: .swiftlint.yml
 ruby:
   enabled: false

WooCommerce/Classes/Authentication/Epilogue/StorePickerViewController.swift

@@ -353,12 +353,27 @@ extension StorePickerViewController {
             WooAnalytics.shared.track(.sitePickerContinueTapped,
                                       withProperties: ["selected_store_id": StoresManager.shared.sessionManager.defaultStoreID ?? String()])
 
+            presentStoreSwitchedNotice()
+
             dismiss(animated: true) {
                 AppDelegate.shared.authenticatorWasDismissed()
                 MainTabBarController.switchToMyStoreTab(animated: true)
             }
         }
     }
+
+    private func presentStoreSwitchedNotice() {
+        guard let newStoreName = StoresManager.shared.sessionManager.defaultSite?.name else {
+            return
+        }
+
+        let message = NSLocalizedString("Switched to \(newStoreName). You will only receive notifications from this store.",
+            comment: "Message presented after users switch to a new store. "
+                + "Reads like: Switched to {store name}. You will only receive notifications from this store.")
+        let notice = Notice(title: message, feedbackType: .success)
+
+        AppDelegate.shared.noticePresenter.enqueue(notice: notice)
+    }
 }
 
 

WooCommerce/Classes/ViewRelated/Orders/NewNoteViewController.swift

@@ -37,7 +37,7 @@ class NewNoteViewController: UIViewController {
 
     override func viewDidAppear(_ animated: Bool) {
         super.viewDidAppear(animated)
-        tableView.firstSubview(ofType: UITextView.self)?.becomeFirstResponder()
+        showKeyboard()
     }
 
     override func viewWillDisappear(_ animated: Bool) {
@@ -50,7 +50,7 @@ class NewNoteViewController: UIViewController {
     }
 
     @objc func addButtonTapped() {
-        switchRightButtonToProgressIndicator()
+        configureForCommittingNote()
 
         WooAnalytics.shared.track(.orderNoteAddButtonTapped)
         WooAnalytics.shared.track(.orderNoteAdd, withProperties: ["parent_id": viewModel.order.orderID,
@@ -63,7 +63,7 @@ class NewNoteViewController: UIViewController {
                 WooAnalytics.shared.track(.orderNoteAddFailed, withError: error)
 
                 self?.displayErrorNotice()
-                self?.switchRightButtonToAddButton()
+                self?.configureForEditingNote()
                 return
             }
             WooAnalytics.shared.track(.orderNoteAddSuccess)
@@ -257,7 +257,8 @@ private extension NewNoteViewController {
         navigationItem.rightBarButtonItem?.isEnabled = false
     }
 
-    func switchRightButtonToProgressIndicator() {
+    func configureForCommittingNote() {
+        hideKeyboard()
         configureRightButtonItemAsSpinner()
         navigationItem.rightBarButtonItem?.isEnabled = false
     }
@@ -272,10 +273,18 @@ private extension NewNoteViewController {
         navigationItem.setRightBarButton(rightBarButton, animated: true)
     }
 
-    func switchRightButtonToAddButton() {
+    func configureForEditingNote() {
         configureRightButtonItemAsAdd()
         navigationItem.rightBarButtonItem?.isEnabled = true
     }
+
+    func showKeyboard() {
+        tableView.firstSubview(ofType: UITextView.self)?.becomeFirstResponder()
+    }
+
+    func hideKeyboard() {
+        tableView.firstSubview(ofType: UITextView.self)?.resignFirstResponder()
+    }
 }
 
 // MARK: - Constants