Merge branch 'trunk' into issue/7686-fix-card-reader-connection-modal-transitions

Author: joshheald

CHANGELOG.md

@@ -2,6 +2,11 @@
 Contains editorialized release notes. Raw release notes should go into `RELEASE-NOTES.txt`.
 -->
 
+## 10.3
+
+More love for In-Person Payments and Analytics this time around. We fixed a bug which could prevent you from collecting payments in the app. Card reader connections are more stable. And we fixed an issue where your store's analytics are sometimes not updated. 
+
+
 ## 10.2
 Even though this release doesn’t have any new features, we still put a lot of love into it! You can now enable or disable the option to take card or cash payments on collection or delivery. We also added a new Help Center page that makes it easier for you to login to the app.
 

Experiments/Experiments/DefaultFeatureFlagService.swift

@@ -7,8 +7,6 @@ public struct DefaultFeatureFlagService: FeatureFlagService {
         switch featureFlag {
         case .barcodeScanner:
             return buildConfig == .localDeveloper || buildConfig == .alpha
-        case .couponView:
-            return true
         case .productSKUInputScanner:
             return true
         case .inbox:
@@ -17,20 +15,10 @@ public struct DefaultFeatureFlagService: FeatureFlagService {
             return buildConfig == .localDeveloper || buildConfig == .alpha
         case .splitViewInOrdersTab:
             return buildConfig == .localDeveloper || buildConfig == .alpha
-        case .couponDeletion:
-            return true
-        case .couponEditing:
-            return true
-        case .couponCreation:
-            return true
         case .updateOrderOptimistically:
             return buildConfig == .localDeveloper || buildConfig == .alpha
         case .shippingLabelsOnboardingM1:
             return buildConfig == .localDeveloper || buildConfig == .alpha
-        case .backgroundProductImageUpload:
-            return true
-        case .appleIDAccountDeletion:
-            return true
         case .newToWooCommerceLinkInLoginPrologue:
             return true
         case .loginPrologueOnboarding:

Experiments/Experiments/FeatureFlag.swift

@@ -14,10 +14,6 @@ public enum FeatureFlag: Int {
     ///
     case reviews
 
-    /// Displays the option to view coupons
-    ///
-    case couponView
-
     /// Barcode scanner for product SKU input
     ///
     case productSKUInputScanner
@@ -34,18 +30,6 @@ public enum FeatureFlag: Int {
     ///
     case splitViewInOrdersTab
 
-    /// Displays the option to delete coupons
-    ///
-    case couponDeletion
-
-    /// Displays the option to edit a coupon
-    ///
-    case couponEditing
-
-    /// Displays the option to create a coupon
-    ///
-    case couponCreation
-
     /// Enable optimistic updates for orders
     ///
     case updateOrderOptimistically
@@ -54,18 +38,10 @@ public enum FeatureFlag: Int {
     ///
     case shippingLabelsOnboardingM1
 
-    /// Enable image upload after leaving the product form
-    ///
-    case backgroundProductImageUpload
-
     /// Enable IPP reader manuals consolidation screen
     ///
     case consolidatedCardReaderManuals
 
-    /// Apple ID account deletion
-    ///
-    case appleIDAccountDeletion
-
     /// Showing a "New to WooCommerce" link in the login prologue screen
     ///
     case newToWooCommerceLinkInLoginPrologue

Podfile

@@ -33,6 +33,10 @@ def tracks
   # pod 'Automattic-Tracks-iOS', :path => '../Automattic-Tracks-iOS'
 end
 
+def keychain
+  pod 'KeychainAccess', '~> 4.2.2'
+end
+
 # Main Target!
 # ============
 #
@@ -66,7 +70,7 @@ target 'WooCommerce' do
   # ==================
   #
   pod 'Alamofire', '~> 4.8'
-  pod 'KeychainAccess', '~> 4.2.2'
+  keychain
   pod 'CocoaLumberjack', '~> 3.7.4'
   pod 'CocoaLumberjack/Swift', '~> 3.7.4'
   pod 'XLPagerTabStrip', '~> 9.0'
@@ -89,6 +93,7 @@ end
 target 'StoreWidgetsExtension' do
   project 'WooCommerce/WooCommerce.xcodeproj'
   tracks
+  keychain
 end
 
 # Yosemite Layer:

Podfile.lock

@@ -179,6 +179,6 @@ SPEC CHECKSUMS:
   ZendeskSupportProvidersSDK: 2bdf8544f7cd0fd4c002546f5704b813845beb2a
   ZendeskSupportSDK: 3a8e508ab1d9dd22dc038df6c694466414e037ba
 
-PODFILE CHECKSUM: 80d9a174d49019dc7c51488f07c2d792de8f991d
+PODFILE CHECKSUM: a9915adfd885798e630904e5ae74f77f8555ccfe
 
 COCOAPODS: 1.11.2

RELEASE-NOTES.txt

@@ -2,6 +2,7 @@
 
 10.4
 -----
+- [*] Help center: Added help center web page with FAQs for "Pick a WooCommerce Store" screen. [https://github.com/woocommerce/woocommerce-ios/pull/7641]
 - [*] In-Person Payments: Fixed a bug where cancelling a card reader connection would temporarily prevent further connections [https://github.com/woocommerce/woocommerce-ios/pull/7689]
 - [*] In-Person Payments: Improvements to the card reader connection flow UI [https://github.com/woocommerce/woocommerce-ios/pull/7687]
 
@@ -12,6 +13,7 @@
 - [*] In-Person Payments: Fixed an issue where the Pay in Person toggle could be out of sync with the setting on the website. [https://github.com/woocommerce/woocommerce-ios/pull/7656]
 - [*] In-Person Payments: Removed the need to sign in when purchasing a card reader [https://github.com/woocommerce/woocommerce-ios/pull/7670]
 - [*] In-Person Payments: Fixed a bug where canceling a reader connection could result in being unable to connect a reader in future [https://github.com/woocommerce/woocommerce-ios/pull/7678]
+- [*] In-Person Payments: Fixed a bug which prevented the Collect Payment button from being shown for Cash on Delivery orders  [https://github.com/woocommerce/woocommerce-ios/pull/7694]
 
 10.2
 -----

WooCommerce.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -289,7 +289,7 @@ private extension StorePickerViewController {
     }
 
     func presentHelp() {
-        ServiceLocator.authenticationManager.presentSupport(from: self, sourceTag: .generalLogin)
+        ServiceLocator.authenticationManager.presentSupport(from: self, screen: .storePicker)
     }
 }
 
@@ -637,7 +637,6 @@ extension StorePickerViewController: UITableViewDataSource {
             hideActionButton()
             let cell = tableView.dequeueReusableCell(EmptyStoresTableViewCell.self, for: indexPath)
             let isRemoveAppleIDAccessButtonVisible = appleIDCredentialChecker.hasAppleUserID()
-            && featureFlagService.isFeatureFlagEnabled(.appleIDAccountDeletion)
             cell.updateRemoveAppleIDAccessButtonVisibility(isVisible: isRemoveAppleIDAccessButtonVisible)
             if isRemoveAppleIDAccessButtonVisible {
                 cell.onCloseAccountButtonTapped = { [weak self] in

WooCommerce/Classes/Authentication/Epilogue/StorePickerViewController.swift

@@ -12,4 +12,11 @@ extension Keychain {
         get { self[WooConstants.anonymousIDKey] }
         set { self[WooConstants.anonymousIDKey] = newValue }
     }
+
+    /// Auth token for the current selected store
+    ///
+    var currentAuthToken: String? {
+        get { self[WooConstants.authToken] }
+        set { self[WooConstants.authToken] = newValue }
+    }
 }

WooCommerce/Classes/Authentication/Keychain+Entries.swift

@@ -10,6 +10,7 @@ extension UserDefaults {
         case defaultUsername
         case defaultSiteAddress
         case defaultStoreID
+        case defaultStoreName
         case defaultAnonymousID
         case defaultRoles
         case deviceID
@@ -25,6 +26,12 @@ extension UserDefaults {
     }
 }
 
+extension UserDefaults {
+    /// User defaults instance ready to be shared between extensions of the same group.
+    ///
+    static let group = UserDefaults(suiteName: WooConstants.sharedUserDefaultsSuiteName)
+}
+
 
 // MARK: - Convenience Methods
 //