Merge branch 'develop' into issue/4778-edit-address-form-viewmodel

Author: ealeksandrov

Hardware/Hardware/CardReader/CardReaderServiceError.swift

@@ -306,7 +306,7 @@ updating the application or using a different reader
             return NSLocalizedString("The card reader session has expired - please disconnect and reconnect the card reader and then try again",
                                      comment: "Error message when the card reader session has timed out.")
         case .internalServiceError:
-            return NSLocalizedString("The system experienced an unexpected internal error - please try again",
+            return NSLocalizedString("Sorry, this payment couldn’t be processed",
                                      comment: "Error message when the card reader service experiences an unexpected internal service error.")
         }
     }

Podfile

@@ -33,7 +33,7 @@ target 'WooCommerce' do
   #
 
   #pod 'Automattic-Tracks-iOS', :git => 'https://github.com/Automattic/Automattic-Tracks-iOS.git', :branch => 'add/build-configuration'
-  pod 'Automattic-Tracks-iOS', '~> 0.9.0'
+  pod 'Automattic-Tracks-iOS', '~> 0.9.1'
 
   pod 'Gridicons', '~> 1.0'
 

Podfile.lock

@@ -6,7 +6,7 @@ PODS:
     - AppAuth/ExternalUserAgent (= 1.4.0)
   - AppAuth/Core (1.4.0)
   - AppAuth/ExternalUserAgent (1.4.0)
-  - Automattic-Tracks-iOS (0.9.0):
+  - Automattic-Tracks-iOS (0.9.1):
     - CocoaLumberjack (~> 3)
     - Reachability (~> 3)
     - Sentry (~> 6)
@@ -92,7 +92,7 @@ PODS:
 
 DEPENDENCIES:
   - Alamofire (~> 4.8)
-  - Automattic-Tracks-iOS (~> 0.9.0)
+  - Automattic-Tracks-iOS (~> 0.9.1)
   - Charts (~> 3.6.0)
   - CocoaLumberjack (~> 3.5)
   - CocoaLumberjack/Swift (~> 3.5)
@@ -159,7 +159,7 @@ SPEC CHECKSUMS:
   1PasswordExtension: f97cc80ae58053c331b2b6dc8843ba7103b33794
   Alamofire: 3ec537f71edc9804815215393ae2b1a8ea33a844
   AppAuth: 31bcec809a638d7bd2f86ea8a52bd45f6e81e7c7
-  Automattic-Tracks-iOS: f6ece12d2e630b55b701bac8bcf4301fcce9a327
+  Automattic-Tracks-iOS: f5a6188ad8d00680748111466beabb0aea11f856
   Charts: b1e3a1f5a1c9ba5394438ca3b91bd8c9076310af
   CocoaLumberjack: 2f44e60eb91c176d471fdba43b9e3eae6a721947
   FormatterKit: 184db51bf120b633693a73624a4cede89ec51a41
@@ -197,6 +197,6 @@ SPEC CHECKSUMS:
   ZendeskSupportProvidersSDK: 2bdf8544f7cd0fd4c002546f5704b813845beb2a
   ZendeskSupportSDK: 3a8e508ab1d9dd22dc038df6c694466414e037ba
 
-PODFILE CHECKSUM: 3a44929fd11c151f108c11f263d90b2586b35f49
+PODFILE CHECKSUM: c652601d27c6c6bbc31005c1204964ca8471f2d4
 
 COCOAPODS: 1.10.2

Scripts/build-phases/generate-credentials.sh

@@ -62,6 +62,16 @@ else
     ##
     mkdir -p ${DERIVED_PATH}
 
+    if which rbenv; then
+      # Fix an issue where, depending on the shell you are using on your machine and your rbenv setup,
+      #   running `ruby` in a bash script from Xcode script build phase might not use the right ruby
+      #   (and thus not find the appropriate gems installed by bundle & Gemfile.lock and crash).
+      # So if rbenv is installed, make sure the shims for `ruby` are too in the context of this bash script,
+      #   so that it uses the right ruby version defined in `.ruby-version` instead of risking to use the system one.
+      eval "$(rbenv init -)"
+      rbenv rehash
+    fi
+
     ## Generate ApiCredentials.swift
     ##
     echo ">> Generating Credentials ${CREDS_OUTPUT_PATH}"

WooCommerce/Classes/ViewModels/CardPresentPayments/CardPresentModalError.swift

@@ -3,9 +3,6 @@ import UIKit
 /// Modal presented on error
 final class CardPresentModalError: CardPresentPaymentsModalViewModel {
 
-    /// Amount charged
-    private let amount: String
-
     /// The error returned by the stack
     private let error: Error
 
@@ -17,9 +14,7 @@ final class CardPresentModalError: CardPresentPaymentsModalViewModel {
 
     let topTitle: String = Localization.paymentFailed
 
-    var topSubtitle: String? {
-        amount
-    }
+    var topSubtitle: String? = nil
 
     let image: UIImage = .paymentErrorImage
 
@@ -35,8 +30,7 @@ final class CardPresentModalError: CardPresentPaymentsModalViewModel {
 
     let bottomSubtitle: String? = nil
 
-    init(amount: String, error: Error, primaryAction: @escaping () -> Void) {
-        self.amount = amount
+    init(error: Error, primaryAction: @escaping () -> Void) {
         self.error = error
         self.primaryAction = primaryAction
     }
@@ -60,12 +54,12 @@ private extension CardPresentModalError {
         )
 
         static let tryAgain = NSLocalizedString(
-            "Try collecting payment again",
+            "Try Collecting Again",
             comment: "Button to try to collect a payment again. Presented to users after a collecting a payment fails"
         )
 
         static let noThanks = NSLocalizedString(
-            "No thanks",
+            "Back to Order",
             comment: "Button to dismiss modal overlay. Presented to users after collecting a payment fails"
         )
     }

WooCommerce/Classes/ViewModels/CardPresentPayments/CardPresentModalSuccess.swift

@@ -3,9 +3,6 @@ import UIKit
 /// Modal presented when the payment has been collected successfully
 final class CardPresentModalSuccess: CardPresentPaymentsModalViewModel {
 
-    /// Amount charged
-    private let amount: String
-
     /// Closure to execute when primary button is tapped
     private let printReceiptAction: () -> Void
 
@@ -18,9 +15,7 @@ final class CardPresentModalSuccess: CardPresentPaymentsModalViewModel {
 
     let topTitle: String = Localization.paymentSuccessful
 
-    var topSubtitle: String? {
-        amount
-    }
+    var topSubtitle: String? = nil
 
     let image: UIImage = .celebrationImage
 
@@ -34,8 +29,7 @@ final class CardPresentModalSuccess: CardPresentPaymentsModalViewModel {
 
     let bottomSubtitle: String? = nil
 
-    init(amount: String, printReceipt: @escaping () -> Void, emailReceipt: @escaping () -> Void) {
-        self.amount = amount
+    init(printReceipt: @escaping () -> Void, emailReceipt: @escaping () -> Void) {
         self.printReceiptAction = printReceipt
         self.emailReceiptAction = emailReceipt
     }
@@ -75,7 +69,7 @@ private extension CardPresentModalSuccess {
         )
 
         static let noThanks = NSLocalizedString(
-            "No thanks",
+            "Back to Order",
             comment: "Button to dismiss modal overlay. Presented to users after a payment has been successfully collected"
         )
     }

WooCommerce/Classes/ViewModels/CardPresentPayments/CardPresentModalSuccessWithoutEmail.swift

@@ -3,9 +3,6 @@ import UIKit
 /// Modal presented when the payment has been collected successfully
 final class CardPresentModalSuccessWithoutEmail: CardPresentPaymentsModalViewModel {
 
-    /// Amount charged
-    private let amount: String
-
     /// Closure to execute when primary button is tapped
     private let printReceiptAction: () -> Void
 
@@ -14,9 +11,7 @@ final class CardPresentModalSuccessWithoutEmail: CardPresentPaymentsModalViewMod
 
     let topTitle: String = Localization.paymentSuccessful
 
-    var topSubtitle: String? {
-        amount
-    }
+    var topSubtitle: String? = nil
 
     let image: UIImage = .celebrationImage
 
@@ -30,8 +25,7 @@ final class CardPresentModalSuccessWithoutEmail: CardPresentPaymentsModalViewMod
 
     let bottomSubtitle: String? = nil
 
-    init(amount: String, printReceipt: @escaping () -> Void) {
-        self.amount = amount
+    init(printReceipt: @escaping () -> Void) {
         self.printReceiptAction = printReceipt
     }
 
@@ -61,7 +55,7 @@ private extension CardPresentModalSuccessWithoutEmail {
         )
 
         static let noThanks = NSLocalizedString(
-            "No thanks",
+            "Back to Order",
             comment: "Button to dismiss modal overlay. Presented to users after a payment has been successfully collected"
         )
     }

WooCommerce/Classes/ViewModels/Order Details/OrderDetailsPaymentAlerts.swift

@@ -69,7 +69,7 @@ final class OrderDetailsPaymentAlerts {
     }
 
     func error(error: Error, tryAgain: @escaping () -> Void) {
-        let viewModel = errorViewModel(amount: amount, error: error, tryAgain: tryAgain)
+        let viewModel = errorViewModel(error: error, tryAgain: tryAgain)
         presentViewModel(viewModel: viewModel)
     }
 
@@ -103,14 +103,14 @@ private extension OrderDetailsPaymentAlerts {
 
     func successViewModel(printReceipt: @escaping () -> Void, emailReceipt: @escaping () -> Void) -> CardPresentPaymentsModalViewModel {
         if MFMailComposeViewController.canSendMail() {
-            return CardPresentModalSuccess(amount: amount, printReceipt: printReceipt, emailReceipt: emailReceipt)
+            return CardPresentModalSuccess(printReceipt: printReceipt, emailReceipt: emailReceipt)
         } else {
-            return CardPresentModalSuccessWithoutEmail(amount: amount, printReceipt: printReceipt)
+            return CardPresentModalSuccessWithoutEmail(printReceipt: printReceipt)
         }
     }
 
-    func errorViewModel(amount: String, error: Error, tryAgain: @escaping () -> Void) -> CardPresentPaymentsModalViewModel {
-        CardPresentModalError(amount: amount, error: error, primaryAction: tryAgain)
+    func errorViewModel(error: Error, tryAgain: @escaping () -> Void) -> CardPresentPaymentsModalViewModel {
+        CardPresentModalError(error: error, primaryAction: tryAgain)
     }
 
     func retryableErrorViewModel(tryAgain: @escaping () -> Void) -> CardPresentPaymentsModalViewModel {

WooCommerce/Classes/ViewRelated/Dashboard/Settings/SettingsViewController.swift

@@ -4,6 +4,7 @@ import MessageUI
 import Gridicons
 import SafariServices
 import WordPressAuthenticator
+import class Networking.UserAgent
 
 
 // MARK: - SettingsViewController
@@ -84,6 +85,10 @@ final class SettingsViewController: UIViewController {
     /// for card present payments
     private var canCollectPayments: Bool = false
 
+    /// Announcement for the current app version
+    ///
+    private var announcement: Announcement?
+
     // MARK: - Overridden Methods
 
     override func viewDidLoad() {
@@ -94,7 +99,7 @@ final class SettingsViewController: UIViewController {
         })
 
         loadPaymentGatewayAccounts()
-
+        loadWhatsNewOnWooCommerce()
         configureNavigation()
         configureMainView()
         configureTableView()
@@ -239,6 +244,17 @@ private extension SettingsViewController {
         tableView.reloadData()
     }
 
+    func loadWhatsNewOnWooCommerce() {
+        ServiceLocator.stores.dispatch(AnnouncementsAction.loadSavedAnnouncement(onCompletion: { [weak self] result in
+            guard let self = self else { return }
+            guard let (announcement, _) = try? result.get(), announcement.appVersionName == UserAgent.bundleShortVersion else {
+                return DDLogInfo("📣 There are no announcements to show!")
+            }
+
+            self.announcement = announcement
+        }))
+    }
+
     func configureSections() {
         let selectedStoreTitle = NSLocalizedString(
             "Selected Store",
@@ -303,7 +319,11 @@ private extension SettingsViewController {
         sections.append(Section(title: appSettingsTitle, rows: [.privacy], footerHeight: UITableView.automaticDimension))
 
         // About the App
-        sections.append(Section(title: aboutTheAppTitle, rows: [.about, .licenses], footerHeight: UITableView.automaticDimension))
+        if shouldShowWhatsNew() {
+            sections.append(Section(title: aboutTheAppTitle, rows: [.about, .whatsNew, .licenses], footerHeight: UITableView.automaticDimension))
+        } else {
+            sections.append(Section(title: aboutTheAppTitle, rows: [.about, .licenses], footerHeight: UITableView.automaticDimension))
+        }
 
         // Other
         #if DEBUG
@@ -351,6 +371,8 @@ private extension SettingsViewController {
             configureWormholy(cell: cell)
         case let cell as BasicTableViewCell where row == .logout:
             configureLogout(cell: cell)
+        case let cell as BasicTableViewCell where row == .whatsNew:
+            configureWhatsNew(cell: cell)
         default:
             fatalError()
         }
@@ -431,6 +453,12 @@ private extension SettingsViewController {
                                                  comment: "Opens an internal library called Wormholy. Not visible to users.")
     }
 
+    func configureWhatsNew(cell: BasicTableViewCell) {
+        cell.accessoryType = .disclosureIndicator
+        cell.selectionStyle = .default
+        cell.textLabel?.text = NSLocalizedString("What's New in WooCommerce", comment: "Navigates to screen containing the latest WooCommerce Features")
+    }
+
     func configureLogout(cell: BasicTableViewCell) {
         cell.selectionStyle = .default
         cell.textLabel?.textAlignment = .center
@@ -459,6 +487,10 @@ private extension SettingsViewController {
     func shouldShowPluginsSection() -> Bool {
         ServiceLocator.stores.sessionManager.defaultRoles.contains(.administrator)
     }
+
+    func shouldShowWhatsNew() -> Bool {
+        ServiceLocator.featureFlagService.isFeatureFlagEnabled(.whatsNewOnWooCommerce) && announcement != nil
+    }
 }
 
 
@@ -574,6 +606,14 @@ private extension SettingsViewController {
         NotificationCenter.default.post(name: NSNotification.Name(rawValue: "wormholy_fire"), object: nil)
     }
 
+    func whatsNewWasPressed() {
+        guard let announcement = announcement else { return }
+        let viewController = WhatsNewFactory.whatsNew(announcement) { [weak self] in
+            self?.dismiss(animated: true)
+        }
+        present(viewController, animated: true, completion: nil)
+    }
+
     func logOutUser() {
         ServiceLocator.stores.deauthenticate()
         navigationController?.popToRootViewController(animated: true)
@@ -677,6 +717,8 @@ extension SettingsViewController: UITableViewDelegate {
             deviceSettingsWasPressed()
         case .wormholy:
             wormholyWasPressed()
+        case .whatsNew:
+            whatsNewWasPressed()
         case .logout:
             logoutWasPressed()
         default:
@@ -713,6 +755,7 @@ private enum Row: CaseIterable {
     case licenses
     case deviceSettings
     case wormholy
+    case whatsNew
 
     var type: UITableViewCell.Type {
         switch self {
@@ -742,6 +785,8 @@ private enum Row: CaseIterable {
             return BasicTableViewCell.self
         case .wormholy:
             return BasicTableViewCell.self
+        case .whatsNew:
+            return BasicTableViewCell.self
         }
     }
 

WooCommerce/Classes/ViewRelated/Orders/Order Details/Address Edit/CountrySelectorViewModel.swift

@@ -1,18 +1,36 @@
 import Combine
+import SwiftUI
 
 /// View Model for the `CountrySelector` view.
 ///
-final class CountrySelectorViewModel: ObservableObject {
+final class CountrySelectorViewModel: FilterListSelectorViewModelable, ObservableObject {
 
     /// Current search term entered by the user.
     /// Each update will trigger an update to the `command` that contains the country data.
-    @Published var searchTerm = "" {
+    var searchTerm: String = "" {
         didSet {
             command.filterCountries(term: searchTerm)
+            objectWillChange.send()
         }
     }
 
     /// Command that powers the `ListSelector` view.
     ///
     let command = CountrySelectorCommand()
+
+    /// Navigation title
+    ///
+    let navigationTitle = Localization.title
+
+    /// Filter text field placeholder
+    ///
+    let filterPlaceholder = Localization.placeholder
+}
+
+// MARK: Constants
+private extension CountrySelectorViewModel {
+    enum Localization {
+        static let title = NSLocalizedString("Country", comment: "Title to select country from the edit address screen")
+        static let placeholder = NSLocalizedString("Filter Countries", comment: "Placeholder on the search field to search for a specific country")
+    }
 }