Merge branch 'trunk' into feat/add-autocapitalization-settings-to-multiple-login-views

Author: pmusolino

CHANGELOG.md

@@ -1,6 +1,9 @@
 <!--
 Contains editorialized release notes. Raw release notes should go into `RELEASE-NOTES.txt`.
 -->
+## 21.6
+Experience a refreshed WooCommerce app with an updated look that aligns with our new branding! We’ve also improved payment reliability—card reader updates now handle low battery issues better, and errors during payments and refunds are managed more smoothly. Enjoy a more seamless and polished experience in every transaction.
+
 ## 21.5
 Get ready for a smoother WooCommerce experience! This update brings smarter AI-powered product previews, instant dashboard stats, and improved email receipts for failed payments. We’ve also fine-tuned order creation, enhanced Jetpack setups, and enabled previews for coming-soon stores. Plus, we’ve addressed navigation, database recovery, and streamlined workflows.
 

Networking/Networking.xcodeproj/project.pbxproj

@@ -183,6 +183,7 @@
 		09885C8027C3FFD200910A62 /* product-variations-bulk-update.json in Resources */ = {isa = PBXBuildFile; fileRef = 09885C7F27C3FFD200910A62 /* product-variations-bulk-update.json */; };
 		09EA564B27C75FCE00407D40 /* ProductVariationsBulkUpdateMapper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 09EA564A27C75FCE00407D40 /* ProductVariationsBulkUpdateMapper.swift */; };
 		204CBD2B2D43BDBB006FF89A /* wcpay-charge-error-site-credentials.json in Resources */ = {isa = PBXBuildFile; fileRef = 204CBD2A2D43BDBB006FF89A /* wcpay-charge-error-site-credentials.json */; };
+		207D816C2D4A30A30097012E /* products-load-simple-products-empty-price.json in Resources */ = {isa = PBXBuildFile; fileRef = 207D816B2D4A30A30097012E /* products-load-simple-products-empty-price.json */; };
 		209AD3C32AC196E300825D76 /* WooPaymentsPayoutsOverview.swift in Sources */ = {isa = PBXBuildFile; fileRef = 209AD3C22AC196E300825D76 /* WooPaymentsPayoutsOverview.swift */; };
 		209AD3C52AC19E7500825D76 /* WooPaymentsDepositsOverviewMapper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 209AD3C42AC19E7500825D76 /* WooPaymentsDepositsOverviewMapper.swift */; };
 		20D210C32B1780CE0099E517 /* deposits-overview-all.json in Resources */ = {isa = PBXBuildFile; fileRef = 20D210C22B1780CE0099E517 /* deposits-overview-all.json */; };
@@ -1491,6 +1492,7 @@
 		09EA564A27C75FCE00407D40 /* ProductVariationsBulkUpdateMapper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProductVariationsBulkUpdateMapper.swift; sourceTree = "<group>"; };
 		14CE248C7246705417A41DE1 /* Pods-NetworkingWatchOS.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-NetworkingWatchOS.release.xcconfig"; path = "../Pods/Target Support Files/Pods-NetworkingWatchOS/Pods-NetworkingWatchOS.release.xcconfig"; sourceTree = "<group>"; };
 		204CBD2A2D43BDBB006FF89A /* wcpay-charge-error-site-credentials.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = "wcpay-charge-error-site-credentials.json"; sourceTree = "<group>"; };
+		207D816B2D4A30A30097012E /* products-load-simple-products-empty-price.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = "products-load-simple-products-empty-price.json"; sourceTree = "<group>"; };
 		209AD3C22AC196E300825D76 /* WooPaymentsPayoutsOverview.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WooPaymentsPayoutsOverview.swift; sourceTree = "<group>"; };
 		209AD3C42AC19E7500825D76 /* WooPaymentsDepositsOverviewMapper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WooPaymentsDepositsOverviewMapper.swift; sourceTree = "<group>"; };
 		20D210C22B1780CE0099E517 /* deposits-overview-all.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = "deposits-overview-all.json"; sourceTree = "<group>"; };
@@ -3579,6 +3581,7 @@
 				CE070A2F2BBC527900017578 /* gift-card-stats.json */,
 				CE070A332BBC52B200017578 /* gift-card-stats-without-data.json */,
 				68FBA53B2C290A5F0067B377 /* products-load-all-type-simple.json */,
+				207D816B2D4A30A30097012E /* products-load-simple-products-empty-price.json */,
 				68255E432C60C6AA00090EBD /* products-load-all-for-eligibility-criteria.json */,
 				CE21FB132C2AC87000303832 /* google-ads-reports-programs-without-data.json */,
 				CE21FB232C2C16DA00303832 /* google-ads-reports-programs.json */,
@@ -4593,6 +4596,7 @@
 				D8C11A5C22DFCF8100D4A88D /* order-stats-v4-year-alt.json in Resources */,
 				3158FE6426129B1300E566B9 /* wcpay-account-complete.json in Resources */,
 				20D210C52B1788E60099E517 /* deposits-overview-all-no-default-currency.json in Resources */,
+				207D816C2D4A30A30097012E /* products-load-simple-products-empty-price.json in Resources */,
 				B56C1EBA20EA7D2C00D749F9 /* sites.json in Resources */,
 				DEDA8DA52B1839320076BF0F /* theme-list-success.json in Resources */,
 				EE84D62B2B0B46E7008EA80A /* product-variation-subscription-incomplete.json in Resources */,

Networking/NetworkingTests/Responses/products-load-simple-products-empty-price.json

@@ -0,0 +1,249 @@
+{
+    "data": [
+        {
+            "id": 208,
+            "name": "Dymo LabelWriter 4XL",
+            "slug": "dymo-labelwriter-4xl",
+            "permalink": "https://example.com/product/dymo-labelwriter-4xl/",
+            "date_created": "2018-05-07T21:02:28",
+            "date_created_gmt": "2018-05-07T21:02:28",
+            "date_modified": "2019-02-19T18:22:50",
+            "date_modified_gmt": "2019-02-19T18:22:50",
+            "type": "simple",
+            "status": "publish",
+            "featured": false,
+            "catalog_visibility": "visible",
+            "description": "<ul class=\"a-unordered-list a-vertical a-spacing-none\">\n<li><span class=\"a-list-item\">Print Extra Large Shipping Labels up to 4” x 6”</span></li>\n<li><span class=\"a-list-item\">Select from over 60 professional label templates and customize text and graphics with free DYMO Label Software</span></li>\n<li><span class=\"a-list-item\">Compatible with Microsoft Office, Quickbooks, and More</span></li>\n<li><span class=\"a-list-item\">Print shipping labels directly from popular online selling platforms such as DYMO Stamps, eBay, Amazon, Etsy, and Iabol</span></li>\n<li><span class=\"a-list-item\">Direct thermal printing eliminates the need for costly ink or toner</span></li>\n<li><span class=\"a-list-item\">Print USPS-approved DYMO Stamps from your desktop - no monthly fee, contracts, or commitments (US only)</span></li>\n<li><span class=\"a-list-item\">System Requirements: Windows 7 or later, Mac OS v10.10 or later</span></li>\n<li><span class=\"a-list-item\">Includes: LabelWriter® 4XL printer, adapter, power cable, USB 2.0 cable, Quick Start guide, and starter roll of 4x6 extra large shipping labels</span></li>\n<li><span class=\"a-list-item\">For best results use DYMO authentic labels only</span></li>\n<li>Bonus: 1 extra roll of labels when you pay with points!</li>\n</ul>\n<div class=\"a-row a-expander-container a-expander-inline-container\" aria-live=\"polite\">\n<div class=\"a-expander-content a-expander-extend-content a-expander-content-expanded\" aria-expanded=\"true\"></div>\n</div>\n",
+            "short_description": "<h4 class=\"a-spacing-mini a-color-secondary a-text-italic\">High Volume Jobs? Not a Problem.</h4>\n<p class=\"a-spacing-base\">The DYMO LabelWriter 4XL is a wide-format label printer that accommodates the entire line of LabelWriter labels for maximum flexibility, and is also compatible with a variety of popular online selling platforms and shipping carriers. It&#8217;s ideal for extra-large shipping and warehouse labels, along with label styles for file folders, name badges, and more. It&#8217;s ideal for extra-large shipping and warehouse labels, including 4 inch international shipping labels, along with label styles for file folders, name badges, online postage, mailing and shipping labels, and more.</p>\n",
+            "sku": "",
+            "price": "",
+            "regular_price": "",
+            "sale_price": "",
+            "date_on_sale_from": null,
+            "date_on_sale_from_gmt": null,
+            "date_on_sale_to": null,
+            "date_on_sale_to_gmt": null,
+            "price_html": "<del><span class=\"woocommerce-Price-amount amount\"><span class=\"woocommerce-Price-currencySymbol\">&#36;</span>279.00</span></del> <ins><span class=\"woocommerce-Price-amount amount\"><span class=\"woocommerce-Price-currencySymbol\">&#36;</span>216.00</span></ins>",
+            "on_sale": true,
+            "purchasable": true,
+            "total_sales": 2,
+            "virtual": false,
+            "downloadable": false,
+            "downloads": [],
+            "download_limit": -1,
+            "download_expiry": -1,
+            "external_url": "",
+            "button_text": "",
+            "tax_status": "taxable",
+            "tax_class": "",
+            "manage_stock": false,
+            "stock_quantity": null,
+            "stock_status": "onbackorder",
+            "backorders": "no",
+            "backorders_allowed": false,
+            "backordered": true,
+            "sold_individually": true,
+            "weight": "64",
+            "dimensions": {
+                "length": "10.2",
+                "width": "10",
+                "height": "10"
+            },
+            "shipping_required": true,
+            "shipping_taxable": true,
+            "shipping_class": "",
+            "shipping_class_id": 0,
+            "reviews_allowed": true,
+            "average_rating": "0.00",
+            "rating_count": 0,
+            "related_ids": [
+                26,
+                27,
+                28,
+                29
+            ],
+            "upsell_ids": [],
+            "cross_sell_ids": [],
+            "parent_id": 0,
+            "purchase_note": "",
+            "categories": [
+                {
+                    "id": 15,
+                    "name": "Accessories",
+                    "slug": "accessories"
+                }
+            ],
+            "tags": [],
+            "images": [
+                {
+                    "id": 209,
+                    "date_created": "2018-05-07T21:02:45",
+                    "date_created_gmt": "2018-05-07T21:02:45",
+                    "date_modified": "2018-05-07T21:03:04",
+                    "date_modified_gmt": "2018-05-07T21:03:04",
+                    "src": "https://i0.wp.com/thuy-nonjtpk.mystagingwebsite.com/wp-content/uploads/2018/05/71PEq6VvFjL._SL1500_.jpg?fit=1500%2C1500&ssl=1",
+                    "name": "Dymo LabelWriter 4XL",
+                    "alt": ""
+                }
+            ],
+            "attributes": [],
+            "default_attributes": [],
+            "variations": [],
+            "grouped_products": [],
+            "menu_order": 0,
+            "meta_data": [
+                {
+                    "id": 5981,
+                    "key": "_wpas_done_all",
+                    "value": "1"
+                },
+                {
+                    "id": 6847,
+                    "key": "_wc_pre_orders_enabled",
+                    "value": "yes"
+                },
+                {
+                    "id": 6848,
+                    "key": "_wc_pre_orders_availability_datetime",
+                    "value": "1587262140"
+                },
+                {
+                    "id": 6849,
+                    "key": "_wc_pre_orders_fee",
+                    "value": "2"
+                },
+                {
+                    "id": 6850,
+                    "key": "_wc_pre_orders_when_to_charge",
+                    "value": "upon_release"
+                }
+            ],
+            "jetpack_publicize_connections": [],
+            "_links": {
+                "self": [
+                    {
+                        "href": "https://example.com/wp-json/wc/v3/products/208"
+                    }
+                ],
+                "collection": [
+                    {
+                        "href": "https://example.com/wp-json/wc/v3/products"
+                    }
+                ]
+            }
+        },
+        {
+            "id": 31,
+            "name": "Hoodie with Pocket",
+            "slug": "hoodie-with-pocket",
+            "permalink": "https://example.com/product/hoodie-with-pocket/",
+            "date_created": "2018-01-26T21:49:46",
+            "date_created_gmt": "2018-01-26T21:49:46",
+            "date_modified": "2018-01-26T21:49:46",
+            "date_modified_gmt": "2018-01-26T21:49:46",
+            "type": "simple",
+            "status": "publish",
+            "featured": true,
+            "catalog_visibility": "visible",
+            "description": "<p>Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.</p>\n",
+            "short_description": "",
+            "sku": "",
+            "price": null,
+            "regular_price": null,
+            "sale_price": null,
+            "date_on_sale_from": null,
+            "date_on_sale_from_gmt": null,
+            "date_on_sale_to": null,
+            "date_on_sale_to_gmt": null,
+            "price_html": "<del><span class=\"woocommerce-Price-amount amount\"><span class=\"woocommerce-Price-currencySymbol\">&#36;</span>45.00</span></del> <ins><span class=\"woocommerce-Price-amount amount\"><span class=\"woocommerce-Price-currencySymbol\">&#36;</span>35.00</span></ins>",
+            "on_sale": true,
+            "purchasable": true,
+            "total_sales": 1,
+            "virtual": false,
+            "downloadable": false,
+            "downloads": [],
+            "download_limit": -1,
+            "download_expiry": -1,
+            "external_url": "",
+            "button_text": "",
+            "tax_status": "taxable",
+            "tax_class": "",
+            "manage_stock": false,
+            "stock_quantity": null,
+            "stock_status": "instock",
+            "backorders": "no",
+            "backorders_allowed": false,
+            "backordered": false,
+            "sold_individually": false,
+            "weight": "",
+            "dimensions": {
+                "length": "",
+                "width": "",
+                "height": ""
+            },
+            "shipping_required": true,
+            "shipping_taxable": true,
+            "shipping_class": "",
+            "shipping_class_id": 0,
+            "reviews_allowed": true,
+            "average_rating": "0.00",
+            "rating_count": 0,
+            "related_ids": [
+                32,
+                30,
+                33
+            ],
+            "upsell_ids": [],
+            "cross_sell_ids": [],
+            "parent_id": 0,
+            "purchase_note": "",
+            "categories": [
+                {
+                    "id": 16,
+                    "name": "Hoodies",
+                    "slug": "hoodies"
+                }
+            ],
+            "tags": [],
+            "images": [
+                {
+                    "id": 12,
+                    "date_created": "2018-01-26T21:49:45",
+                    "date_created_gmt": "2018-01-26T21:49:45",
+                    "date_modified": "2018-01-26T21:49:45",
+                    "date_modified_gmt": "2018-01-26T21:49:45",
+                    "src": "https://i0.wp.com/thuy-nonjtpk.mystagingwebsite.com/wp-content/uploads/2018/01/hoodie-with-pocket.jpg?fit=801%2C801&ssl=1",
+                    "name": "Hoodie with Pocket",
+                    "alt": ""
+                }
+            ],
+            "attributes": [],
+            "default_attributes": [],
+            "variations": [],
+            "grouped_products": [],
+            "menu_order": 0,
+            "meta_data": [
+                {
+                    "id": 92,
+                    "key": "_customize_changeset_uuid",
+                    "value": "e96101a5-dc4f-4cd7-8f38-30db941b1a97"
+                }
+            ],
+            "jetpack_publicize_connections": [],
+            "_links": {
+                "self": [
+                    {
+                        "href": "https://example.com/wp-json/wc/v3/products/31"
+                    }
+                ],
+                "collection": [
+                    {
+                        "href": "https://example.com/wp-json/wc/v3/products"
+                    }
+                ]
+            }
+        }
+    ]
+}
+
+

Podfile

@@ -91,9 +91,9 @@ target 'WooCommerce' do
   pod 'Gridicons', '~> 1.2.0'
 
   # To allow pod to pick up beta versions use -beta. E.g., 1.1.7-beta.1
-  pod 'WordPressAuthenticator', '~> 9.10.1'
+  pod 'WordPressAuthenticator', '~> 9.10.2'
   # pod 'WordPressAuthenticator', git: 'https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git', branch: ''
-  # pod 'WordPressAuthenticator', git: 'https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git', commit: ''
+  # pod 'WordPressAuthenticator', git: 'https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git', commit: 'e5247b2d9bdb522c5d210dd6b66d58a4013eed99'
   # pod 'WordPressAuthenticator', path: '../WordPressAuthenticator-iOS'
 
   wordpress_shared

Podfile.lock

@@ -24,7 +24,7 @@ PODS:
   - WordPress-Aztec-iOS (1.19.10)
   - WordPress-Editor-iOS (1.19.10):
     - WordPress-Aztec-iOS (= 1.19.10)
-  - WordPressAuthenticator (9.10.1):
+  - WordPressAuthenticator (9.10.2):
     - Gridicons (~> 1.0)
     - "NSURL+IDN (= 0.4)"
     - SVProgressHUD (~> 2.2.5)
@@ -67,7 +67,7 @@ DEPENDENCIES:
   - StripeTerminal (~> 3.9.1)
   - SwiftLint (= 0.54.0)
   - WordPress-Editor-iOS (~> 1.19)
-  - WordPressAuthenticator (~> 9.10.1)
+  - WordPressAuthenticator (~> 9.10.2)
   - WordPressShared (~> 2.1)
   - WordPressUI (~> 1.15)
   - Wormholy (~> 1.6.6)
@@ -127,7 +127,7 @@ SPEC CHECKSUMS:
   UIDeviceIdentifier: 442b65b4ff1832d4ca9c2a157815cb29ad981b17
   WordPress-Aztec-iOS: 8eaa928fb3a5694924ed3befac64beaae5656e12
   WordPress-Editor-iOS: 98ce1fc542c3a09e48ddc9423405b1d1e48240f1
-  WordPressAuthenticator: 2896e9a678fbe09463866fe7ee82bb5c7c1ba530
+  WordPressAuthenticator: 29baee176dea1dc0d414a9086723cabc54cb20f7
   WordPressKit: faf8c6de7c2acfe71cf95b4db896901060967089
   WordPressShared: 0aa459e5257a77184db87805a998f447443c9706
   WordPressUI: 700e3ec5a9f77b6920c8104c338c85788036ab3c
@@ -142,6 +142,6 @@ SPEC CHECKSUMS:
   ZendeskSupportProvidersSDK: 281acf2bb731d2a67f913cfe653ed0da9f5b2f42
   ZendeskSupportSDK: b512cfc74b6bf8490e589f02cf52e27ed4f2bebe
 
-PODFILE CHECKSUM: e4d6bee3ed11f4bec1cc9e7b95a74a2cb628e27c
+PODFILE CHECKSUM: 85b59bc018f0afba2a57464d12a00fce1deaa13c
 
 COCOAPODS: 1.16.2

RELEASE-NOTES.txt

@@ -1,10 +1,14 @@
 *** PLEASE FOLLOW THIS FORMAT: [<priority indicator, more stars = higher priority>] <description> [<PR URL>]
 *** Use [*****] to indicate smoke tests of all critical flows should be run on the final IPA before release (e.g. major library or OS update).
+21.7
+-----
+- [x] Now, usernames and emails in text fields across multiple login views are no longer capitalized. [https://github.com/woocommerce/woocommerce-ios/pull/15002]
+
 21.6
 -----
 - [*] Payments: improve retry handling when card reader updates fail due to low battery [https://github.com/woocommerce/woocommerce-ios/pull/14990]
 - [*] Payments: Improved error handling during card payments and refunds [https://github.com/woocommerce/woocommerce-ios/pull/14980]
-- [x] Now, usernames and emails in text fields across multiple login views are no longer capitalized. [https://github.com/woocommerce/woocommerce-ios/pull/15002]
+- [***] Updated the app look and feel to match the new WooCommerce branding [https://github.com/woocommerce/woocommerce-ios/pull/14825]
 
 21.5
 -----