Merge branch 'develop' into issue/5032-new-push-notification-payload

# Conflicts:
#	config/Version.Public.xcconfig

Author: jaclync

Gemfile.lock

@@ -16,17 +16,17 @@ GEM
     artifactory (3.0.15)
     atomos (0.1.3)
     aws-eventstream (1.2.0)
-    aws-partitions (1.510.0)
-    aws-sdk-core (3.121.1)
+    aws-partitions (1.516.0)
+    aws-sdk-core (3.121.2)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.239.0)
       aws-sigv4 (~> 1.1)
       jmespath (~> 1.0)
-    aws-sdk-kms (1.49.0)
-      aws-sdk-core (~> 3, >= 3.120.0)
+    aws-sdk-kms (1.50.0)
+      aws-sdk-core (~> 3, >= 3.121.2)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.103.0)
-      aws-sdk-core (~> 3, >= 3.120.0)
+    aws-sdk-s3 (1.104.0)
+      aws-sdk-core (~> 3, >= 3.121.2)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.4)
     aws-sigv4 (1.4.0)
@@ -89,7 +89,7 @@ GEM
     escape (0.0.4)
     ethon (0.14.0)
       ffi (>= 1.15.0)
-    excon (0.86.0)
+    excon (0.87.0)
     faraday (1.8.0)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
@@ -112,10 +112,10 @@ GEM
     faraday-net_http_persistent (1.2.0)
     faraday-patron (1.0.0)
     faraday-rack (1.0.0)
-    faraday_middleware (1.1.0)
+    faraday_middleware (1.2.0)
       faraday (~> 1.0)
     fastimage (2.2.5)
-    fastlane (2.195.0)
+    fastlane (2.196.0)
       CFPropertyList (>= 2.3, < 4.0.0)
       addressable (>= 2.8, < 3.0.0)
       artifactory (~> 3.0)
@@ -184,7 +184,7 @@ GEM
     gh_inspector (1.1.3)
     git (1.9.1)
       rchardet (~> 1.8)
-    google-apis-androidpublisher_v3 (0.11.0)
+    google-apis-androidpublisher_v3 (0.12.0)
       google-apis-core (>= 0.4, < 2.a)
     google-apis-core (0.4.1)
       addressable (~> 2.5, >= 2.5.1)
@@ -229,14 +229,15 @@ GEM
     i18n (1.8.10)
       concurrent-ruby (~> 1.0)
     jmespath (1.4.0)
-    json (2.5.1)
+    json (2.6.0)
     jsonlint (0.3.0)
       oj (~> 3)
       optimist (~> 3)
     jwt (2.3.0)
     memoist (0.16.2)
     mini_magick (4.11.0)
-    mini_mime (1.1.1)
+    mini_mime (1.1.2)
+    mini_portile2 (2.6.1)
     minitest (5.14.4)
     molinillo (0.8.0)
     multi_json (1.15.0)
@@ -245,6 +246,9 @@ GEM
     nap (1.1.0)
     naturally (2.2.1)
     netrc (0.11.0)
+    nokogiri (1.12.2)
+      mini_portile2 (~> 2.6.1)
+      racc (~> 1.4)
     nokogiri (1.12.2-x86_64-darwin)
       racc (~> 1.4)
     octokit (4.21.0)

Networking/Networking/Model/Address.swift

@@ -70,6 +70,36 @@ public struct Address: Codable, GeneratedFakeable, GeneratedCopiable {
                   email: email)
     }
 
+    public func encode(to encoder: Encoder) throws {
+        var container = encoder.container(keyedBy: CodingKeys.self)
+
+        try container.encode(firstName, forKey: .firstName)
+        try container.encode(lastName, forKey: .lastName)
+        try container.encodeIfPresent(company, forKey: .company)
+        try container.encode(address1, forKey: .address1)
+        try container.encodeIfPresent(address2, forKey: .address2)
+        try container.encode(city, forKey: .city)
+        try container.encode(state, forKey: .state)
+        try container.encode(postcode, forKey: .postcode)
+        try container.encode(country, forKey: .country)
+        try container.encodeIfPresent(phone, forKey: .phone)
+
+        /// Encoding an `email` has some special conditions.
+        /// - Encode the content to update the value.
+        /// - Encode `nil` to clear the value
+        /// - Don't encode to leave the value unaltered.
+        /// PS: Encoding an empty string will produce an error due to server validations.
+        ///
+        switch email {
+        case .some(let content) where content.isEmpty:
+            try container.encodeNil(forKey: .email)
+        case .some(let content):
+            try container.encode(content, forKey: .email)
+        case .none:
+            break
+        }
+    }
+
     public static var empty: Address {
         self.init(firstName: "",
                   lastName: "",

Networking/Networking/Model/Copiable/Models+Copiable.generated.swift

@@ -1138,6 +1138,42 @@ extension ShippingLabelPurchase {
     }
 }
 
+extension Site {
+    public func copy(
+        siteID: CopiableProp<Int64> = .copy,
+        name: CopiableProp<String> = .copy,
+        description: CopiableProp<String> = .copy,
+        url: CopiableProp<String> = .copy,
+        plan: CopiableProp<String> = .copy,
+        isWooCommerceActive: CopiableProp<Bool> = .copy,
+        isWordPressStore: CopiableProp<Bool> = .copy,
+        timezone: CopiableProp<String> = .copy,
+        gmtOffset: CopiableProp<Double> = .copy
+    ) -> Site {
+        let siteID = siteID ?? self.siteID
+        let name = name ?? self.name
+        let description = description ?? self.description
+        let url = url ?? self.url
+        let plan = plan ?? self.plan
+        let isWooCommerceActive = isWooCommerceActive ?? self.isWooCommerceActive
+        let isWordPressStore = isWordPressStore ?? self.isWordPressStore
+        let timezone = timezone ?? self.timezone
+        let gmtOffset = gmtOffset ?? self.gmtOffset
+
+        return Site(
+            siteID: siteID,
+            name: name,
+            description: description,
+            url: url,
+            plan: plan,
+            isWooCommerceActive: isWooCommerceActive,
+            isWordPressStore: isWordPressStore,
+            timezone: timezone,
+            gmtOffset: gmtOffset
+        )
+    }
+}
+
 extension SitePlugin {
     public func copy(
         siteID: CopiableProp<Int64> = .copy,

Networking/Networking/Model/Site.swift

@@ -3,7 +3,7 @@ import Codegen
 
 /// Represents a WordPress.com Site.
 ///
-public struct Site: Decodable, Equatable, GeneratedFakeable {
+public struct Site: Decodable, Equatable, GeneratedFakeable, GeneratedCopiable {
 
     /// WordPress.com Site Identifier.
     ///

Podfile

@@ -50,7 +50,7 @@ target 'WooCommerce' do
 
   aztec
 
-  pod 'WPMediaPicker', '~> 1.7.3-beta.1'
+  pod 'WPMediaPicker', '~> 1.7.3'
 
   # External Libraries
   # ==================

Podfile.lock

@@ -73,7 +73,7 @@ PODS:
     - FormatterKit/TimeIntervalFormatter (~> 1.8)
   - WordPressUI (1.12.1)
   - Wormholy (1.6.4)
-  - WPMediaPicker (1.7.3-beta.1)
+  - WPMediaPicker (1.7.3)
   - wpxmlrpc (0.9.0)
   - XLPagerTabStrip (9.0.0)
   - ZendeskCommonUISDK (6.1.1)
@@ -107,7 +107,7 @@ DEPENDENCIES:
   - WordPressShared (~> 1.15)
   - WordPressUI (~> 1.12.1)
   - Wormholy (~> 1.6.4)
-  - WPMediaPicker (~> 1.7.3-beta.1)
+  - WPMediaPicker (~> 1.7.3)
   - XLPagerTabStrip (~> 9.0)
   - ZendeskSupportSDK (~> 5.0)
 
@@ -186,7 +186,7 @@ SPEC CHECKSUMS:
   WordPressShared: 5477f179c7fe03b5d574f91adda66f67d131827e
   WordPressUI: 414bf3a7d007618f94a1c7969d6e849779877d5d
   Wormholy: 2e70f64227e010d363f8d33268369f77faf12471
-  WPMediaPicker: 4236e8fe012cf470e190fbd91d1f50037454a216
+  WPMediaPicker: 4af3fdfba06541ada2613178f8c01175671c38a8
   wpxmlrpc: bf55a43a7e710bd2a4fb8c02dfe83b1246f14f13
   XLPagerTabStrip: 61c57fd61f611ee5f01ff1495ad6fbee8bf496c5
   ZendeskCommonUISDK: 5808802951ad2bb424f0bed4259dc3c0ce9b52ec
@@ -197,6 +197,6 @@ SPEC CHECKSUMS:
   ZendeskSupportProvidersSDK: 2bdf8544f7cd0fd4c002546f5704b813845beb2a
   ZendeskSupportSDK: 3a8e508ab1d9dd22dc038df6c694466414e037ba
 
-PODFILE CHECKSUM: 19bb301f90c9e3a8ea6e0717f69df14547233155
+PODFILE CHECKSUM: 30d1d85f4fae2e2129a3fa6db6272e741601317c
 
 COCOAPODS: 1.11.2

RELEASE-NOTES.txt

@@ -1,5 +1,10 @@
 *** PLEASE FOLLOW THIS FORMAT: [<priority indicator, more stars = higher priority>] <description> [<PR URL>]
 
+7.9
+-----
+- [*] Fix: after disconnecting a site or connecting to a new site, the sites in site picker (Settings > Switch Store) should be updated accordingly. The only exception is when the newly disconnected site is the currently selected site. [https://github.com/woocommerce/woocommerce-ios/pull/5241]
+
+
 7.8
 -----
 - [***] Shipping Labels: merchants can create multiple packages for the same order, moving the items between different packages. [https://github.com/woocommerce/woocommerce-ios/pull/5190]
@@ -10,6 +15,8 @@
 - [*] Shipping Labels: Fix crash when tapping on Learn more rows of customs form. [https://github.com/woocommerce/woocommerce-ios/pull/5207]
 - [*] Shipping Labels: The shipping address now prefills the phone number from the billing address if a shipping phone number is not available. [https://github.com/woocommerce/woocommerce-ios/pull/5177]
 - [*] Shipping Labels: now in Carrier and Rates we always display the discounted rate instead of the retail rate if available. [https://github.com/woocommerce/woocommerce-ios/pull/5188]
+- [*] Shipping Labels: If the shipping address is invalid, there are now options to email, call, or message the customer. [https://github.com/woocommerce/woocommerce-ios/pull/5228]
+- [*] Accessibility: notify when offline mode banner appears or disappears. [https://github.com/woocommerce/woocommerce-ios/pull/5225]
 
 7.7
 -----

Storage/Storage/Tools/StorageType+Extensions.swift

@@ -26,6 +26,12 @@ public extension StorageType {
         return firstObject(ofType: Site.self, matching: predicate)
     }
 
+    /// Retrieves all stored sites.
+    ///
+    func loadAllSites() -> [Site] {
+        allObjects(ofType: Site.self, matching: nil, sortedBy: nil)
+    }
+
     // MARK: - Orders
 
     /// Retrieves the Stored Order.

WooCommerce/Classes/Analytics/WooAnalyticsEvent.swift

@@ -351,3 +351,20 @@ extension WooAnalyticsEvent {
         }
     }
 }
+
+// MARK: - What's New Component
+//
+extension WooAnalyticsEvent {
+    /// Possible sources for the What's New component
+    ///
+    enum Source: String {
+        fileprivate static let key = "source"
+
+        case appUpgrade = "app_upgrade"
+        case appSettings = "app_settings"
+    }
+
+    static func featureAnnouncementShown(source: Source) -> WooAnalyticsEvent {
+        WooAnalyticsEvent(statName: .featureAnnouncementShown, properties: [Source.key: source.rawValue])
+    }
+}

WooCommerce/Classes/Analytics/WooAnalyticsStat.swift

@@ -506,6 +506,10 @@ public enum WooAnalyticsStat: String {
     case removeProductAttributeButtonTapped = "remove_product_attribute_button_tapped"
     case editProductVariationAttributeOptionsRowTapped = "edit_product_variation_attribute_options_row_tapped"
     case editProductVariationAttributeOptionsDoneButtonTapped = "edit_product_variation_attribute_options_done_button_tapped"
+
+    // MARK: What's New Component events
+    //
+    case featureAnnouncementShown = "feature_announcement_shown"
 }
 
 public extension WooAnalyticsStat {