Merge pull request #5433 from woocommerce/merge/8.0-code-freeze-into-develop

Merge 8.0 code freeze into develop

Author: jkmassel

Hardware/HardwareTests/AirPrintReceipt/ReceiptRendererTest.swift

@@ -40,7 +40,7 @@ private extension ReceiptRendererTest {
                 amount: 1,
                 formattedAmount: "1",
                 currency: "USD",
-                date: .init(),
+                date: .init(timeIntervalSince1970: 1636970486),
                 storeName: "Test Store",
                 cardDetails: .init(
                     last4: "1234",

RELEASE-NOTES.txt

@@ -1,5 +1,9 @@
 *** PLEASE FOLLOW THIS FORMAT: [<priority indicator, more stars = higher priority>] <description> [<PR URL>]
 
+8.1
+-----
+
+
 8.0
 -----
 - [*] Product List: Add support for product filtering by category. [https://github.com/woocommerce/woocommerce-ios/pull/5388]

WooCommerce/Resources/en.lproj/Localizable.strings

@@ -1,3 +1,4 @@
-Some merchants had problems loading order details because of a technical issue with how field names in the REST API are ordered. We’ve made a correction that should address that for you if you were experiencing it.
+- [*] Product List: Add support for product filtering by category. [https://github.com/woocommerce/woocommerce-ios/pull/5388]
+- [***] Push notifications are now supported for all connected stores. [https://github.com/woocommerce/woocommerce-ios/pull/5299]
+- [*] 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]
 
-This release contains several other fixes based on your feedback. Please continue to send us feedback – we are listening!

WooCommerce/Resources/release_notes.txt

@@ -4,7 +4,7 @@
         "method": "GET",
         "queryParameters": {
           "fields": {
-            "equalTo": "ID,name,description,URL,options"
+            "equalTo": "ID,name,description,URL,options,jetpack,jetpack_connection"
           },
           "options": {
             "equalTo": "timezone,is_wpcom_store,woocommerce_is_active,gmt_offset"
@@ -20,6 +20,8 @@
                       "name": "Your WooCommerce Store",
                       "description": "",
                       "URL": "http:\/\/yourwoosite.com",
+                      "jetpack": true,
+                      "jetpack_connection": true,
                       "options": {
                         "timezone": "",
                         "gmt_offset": 0,

WooCommerce/WooCommerceUITests/Mocks/mappings/me/rest_v11_me_sites.json

@@ -1,4 +1,4 @@
-VERSION_SHORT=7.9
+VERSION_SHORT=8.0
 
 // Public long version example: VERSION_LONG=1.2.0.0
-VERSION_LONG=7.9.0.1
+VERSION_LONG=8.0.0.0

config/Version.Public.xcconfig

@@ -13,7 +13,7 @@ app_identifier 'com.automattic.woocommerce'
 screenshots_path './fastlane/promo_screenshots/'
 
 # Make sure to update these keys for a new version
-app_version "7.9"
+app_version "8.0"
 
 team_id '299112'
 

fastlane/Deliverfile

@@ -3,7 +3,7 @@
 import Foundation
 
 let glotPressSubtitleKey = "app_store_subtitle"
-let glotPressWhatsNewKey = "v7.9-whats-new"
+let glotPressWhatsNewKey = "v8.0-whats-new"
 let glotPressDescriptionKey = "app_store_desc"
 let glotPressKeywordsKey = "app_store_keywords"
 let glotPressPromoTextKey = "app_store_promo_text"