From 5f7045263842a7a894c2f6e4e01830ca90380512 Mon Sep 17 00:00:00 2001 From: Spencer Transier Date: Fri, 26 May 2023 14:57:27 -0700 Subject: [PATCH 1/7] Bump version number --- config/Version.Public.xcconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/Version.Public.xcconfig b/config/Version.Public.xcconfig index ad38d5d0787..d6808ce90d3 100644 --- a/config/Version.Public.xcconfig +++ b/config/Version.Public.xcconfig @@ -1,7 +1,7 @@ -VERSION_SHORT=13.7 +VERSION_SHORT=13.8 // Public long version example: VERSION_LONG=1.2.0.0 -VERSION_LONG=13.7.0.1 +VERSION_LONG=13.8.0.0 // Re-map our custom version values (used by release-toolkit) to the Xcode ones MARKETING_VERSION=$VERSION_SHORT From 3b4fcac3e621251bb8fddc71719eea2a4a17de5e Mon Sep 17 00:00:00 2001 From: Spencer Transier Date: Fri, 26 May 2023 14:57:28 -0700 Subject: [PATCH 2/7] Update draft release notes for 13.8. --- WooCommerce/Resources/release_notes.txt | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/WooCommerce/Resources/release_notes.txt b/WooCommerce/Resources/release_notes.txt index d39af97d14f..c4f31a66cb5 100644 --- a/WooCommerce/Resources/release_notes.txt +++ b/WooCommerce/Resources/release_notes.txt @@ -1 +1,13 @@ -You’ve asked for it, and now it’s here! You can now search for an order using a SKU when creating an order on the go. We have also made updates to the product selection so it's easier to search variations of a product. Awesome, right? +- [Internal] Orders: Bundled products (within a product bundle) are now indented, to show their relationship to the parent bundle. [https://github.com/woocommerce/woocommerce-ios/pull/9778] +- [Internal] Orders: Composite components (within a composite product) are now indented, to show their relationship to the parent composite product. [https://github.com/woocommerce/woocommerce-ios/pull/9780] +- [*] Add Products: A new view is display to celebrate when the first product is created in a store. [https://github.com/woocommerce/woocommerce-ios/pull/9790] +- [*] Product List: Added swipe-to-share gesture on product rows. [https://github.com/woocommerce/woocommerce-ios/pull/9799] +- [*] Product form: a share action is shown in the navigation bar if the product can be shared and no more than one action is displayed, in addition to the more menu > Share. [https://github.com/woocommerce/woocommerce-ios/pull/9789] +- [*] Payments: show badges leading to Set up Tap to Pay on iPhone for eligible stores and devices [https://github.com/woocommerce/woocommerce-ios/pull/9812] +- [*] Orders: Fixes a bug where the Orders list would not load if an order had a non-integer gift card amount applied to the order (with the Gift Cards extension). [https://github.com/woocommerce/woocommerce-ios/pull/9795] + +- [*] My Store: A new button to share the current store is added on the top right of the screen. [https://github.com/woocommerce/woocommerce-ios/pull/9796] +- [*] Mobile Payments: The screen brightness is increased when showing the Scan to Pay view so the QR code can be scanned more easily [https://github.com/woocommerce/woocommerce-ios/pull/9807] +- [*] Mobile Payments: The Woo logo is added to the QR code on the Scan to Pay screen [https://github.com/woocommerce/woocommerce-ios/pull/9823] +- [*] Allow EU merchants to have better control of their privacy choices. A privacy choices banner will be shown the next time they open the app. [https://github.com/woocommerce/woocommerce-ios/pull/9825] + From 59014b04b473dff0b6f09d7032856cab8b5b4371 Mon Sep 17 00:00:00 2001 From: Spencer Transier Date: Fri, 26 May 2023 14:57:28 -0700 Subject: [PATCH 3/7] Release Notes: add new section for next version (13.9) --- RELEASE-NOTES.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt index ac0e2cdb727..d65921add39 100644 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@ -1,5 +1,9 @@ *** PLEASE FOLLOW THIS FORMAT: [] [] +13.9 +----- + + 13.8 ----- - [Internal] Orders: Bundled products (within a product bundle) are now indented, to show their relationship to the parent bundle. [https://github.com/woocommerce/woocommerce-ios/pull/9778] From 6a05f5e715ce26e481b23a17a5d86443a9a4d284 Mon Sep 17 00:00:00 2001 From: Spencer Transier Date: Fri, 26 May 2023 14:57:52 -0700 Subject: [PATCH 4/7] Update Fastlane to `2.213.0` --- Gemfile.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 01c5c4f74b4..de64b4d6877 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -18,16 +18,16 @@ GEM ast (2.4.2) atomos (0.1.3) aws-eventstream (1.2.0) - aws-partitions (1.752.0) - aws-sdk-core (3.171.0) + aws-partitions (1.771.0) + aws-sdk-core (3.173.1) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.651.0) aws-sigv4 (~> 1.5) jmespath (~> 1, >= 1.6.1) - aws-sdk-kms (1.63.0) + aws-sdk-kms (1.64.0) aws-sdk-core (~> 3, >= 3.165.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.121.0) + aws-sdk-s3 (1.122.0) aws-sdk-core (~> 3, >= 3.165.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.4) @@ -124,8 +124,8 @@ GEM faraday-retry (1.0.3) faraday_middleware (1.2.0) faraday (~> 1.0) - fastimage (2.2.6) - fastlane (2.212.2) + fastimage (2.2.7) + fastlane (2.213.0) CFPropertyList (>= 2.3, < 4.0.0) addressable (>= 2.8, < 3.0.0) artifactory (~> 3.0) @@ -149,7 +149,7 @@ GEM json (< 3.0.0) jwt (>= 2.1.0, < 3) mini_magick (>= 4.9.4, < 5.0.0) - multipart-post (~> 2.0.0) + multipart-post (>= 2.0.0, < 3.0.0) naturally (~> 2.2) optparse (~> 0.1.1) plist (>= 3.1.0, < 4.0.0) @@ -189,7 +189,7 @@ GEM git (1.13.2) addressable (~> 2.8) rchardet (~> 1.8) - google-apis-androidpublisher_v3 (0.39.0) + google-apis-androidpublisher_v3 (0.42.0) google-apis-core (>= 0.11.0, < 2.a) google-apis-core (0.11.0) addressable (~> 2.5, >= 2.5.1) @@ -243,7 +243,7 @@ GEM minitest (5.17.0) molinillo (0.8.0) multi_json (1.15.0) - multipart-post (2.0.0) + multipart-post (2.3.0) nanaimo (0.3.0) nap (1.1.0) naturally (2.2.1) From 2205aff014d1d604aa0b51be98b147a9fa2c848e Mon Sep 17 00:00:00 2001 From: Spencer Transier Date: Fri, 26 May 2023 15:00:03 -0700 Subject: [PATCH 5/7] Update release notes for 13.8 --- WooCommerce/Resources/release_notes.txt | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/WooCommerce/Resources/release_notes.txt b/WooCommerce/Resources/release_notes.txt index c4f31a66cb5..a237317a318 100644 --- a/WooCommerce/Resources/release_notes.txt +++ b/WooCommerce/Resources/release_notes.txt @@ -1,13 +1 @@ -- [Internal] Orders: Bundled products (within a product bundle) are now indented, to show their relationship to the parent bundle. [https://github.com/woocommerce/woocommerce-ios/pull/9778] -- [Internal] Orders: Composite components (within a composite product) are now indented, to show their relationship to the parent composite product. [https://github.com/woocommerce/woocommerce-ios/pull/9780] -- [*] Add Products: A new view is display to celebrate when the first product is created in a store. [https://github.com/woocommerce/woocommerce-ios/pull/9790] -- [*] Product List: Added swipe-to-share gesture on product rows. [https://github.com/woocommerce/woocommerce-ios/pull/9799] -- [*] Product form: a share action is shown in the navigation bar if the product can be shared and no more than one action is displayed, in addition to the more menu > Share. [https://github.com/woocommerce/woocommerce-ios/pull/9789] -- [*] Payments: show badges leading to Set up Tap to Pay on iPhone for eligible stores and devices [https://github.com/woocommerce/woocommerce-ios/pull/9812] -- [*] Orders: Fixes a bug where the Orders list would not load if an order had a non-integer gift card amount applied to the order (with the Gift Cards extension). [https://github.com/woocommerce/woocommerce-ios/pull/9795] - -- [*] My Store: A new button to share the current store is added on the top right of the screen. [https://github.com/woocommerce/woocommerce-ios/pull/9796] -- [*] Mobile Payments: The screen brightness is increased when showing the Scan to Pay view so the QR code can be scanned more easily [https://github.com/woocommerce/woocommerce-ios/pull/9807] -- [*] Mobile Payments: The Woo logo is added to the QR code on the Scan to Pay screen [https://github.com/woocommerce/woocommerce-ios/pull/9823] -- [*] Allow EU merchants to have better control of their privacy choices. A privacy choices banner will be shown the next time they open the app. [https://github.com/woocommerce/woocommerce-ios/pull/9825] - +Lots of updates this week! We've added a new privacy screen for merchants in the EU to better control their privacy choices. We made it easy for you to share your products and store directly from the app. We also focused on fixing a few bugs and enhancements around product and order management. Keep your feedback coming! From 487a2a57ef1bc4846741b8daef847d8ba4f91042 Mon Sep 17 00:00:00 2001 From: Spencer Transier Date: Fri, 26 May 2023 15:00:13 -0700 Subject: [PATCH 6/7] Update metadata strings --- WooCommerce/Resources/AppStoreStrings.pot | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/WooCommerce/Resources/AppStoreStrings.pot b/WooCommerce/Resources/AppStoreStrings.pot index dd8d1d9ae21..7ed9325d811 100644 --- a/WooCommerce/Resources/AppStoreStrings.pot +++ b/WooCommerce/Resources/AppStoreStrings.pot @@ -57,9 +57,9 @@ msgctxt "app_store_promo_text" msgid "Run your store from anywhere" msgstr "" -msgctxt "v13.7-whats-new" +msgctxt "v13.8-whats-new" msgid "" -"You’ve asked for it, and now it’s here! You can now search for an order using a SKU when creating an order on the go. We have also made updates to the product selection so it's easier to search variations of a product. Awesome, right?\n" +"Lots of updates this week! We've added a new privacy screen for merchants in the EU to better control their privacy choices. We made it easy for you to share your products and store directly from the app. We also focused on fixing a few bugs and enhancements around product and order management. Keep your feedback coming!\n" msgstr "" #. translators: This is a promo message that will be attached on top of a screenshot in the App Store. From d51f94a9d81aa3eac18a15ad2c6a45985f29e34f Mon Sep 17 00:00:00 2001 From: Spencer Transier Date: Fri, 26 May 2023 15:01:03 -0700 Subject: [PATCH 7/7] Freeze strings for localization --- .../Resources/en.lproj/Localizable.strings | 25 +++++++++++++------ 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/WooCommerce/Resources/en.lproj/Localizable.strings b/WooCommerce/Resources/en.lproj/Localizable.strings index 71b5ce7b9eb..366b53a370b 100644 --- a/WooCommerce/Resources/en.lproj/Localizable.strings +++ b/WooCommerce/Resources/en.lproj/Localizable.strings @@ -522,9 +522,6 @@ which should be translated separately and considered part of this sentence. */ /* Title for adding an external URL row on Product main screen for an external/affiliate product */ "Add product link" = "Add product link"; -/* Title text of the button to add a single product via SKU scanning */ -"Add Product via SKU scanner" = "Add Product via SKU scanner"; - /* Action to add linked products to a product in the Linked Products List Selector screen Add Products button inside the Linked Products screen. Navigation bar title for selecting multiple products. @@ -1616,6 +1613,9 @@ which should be translated separately and considered part of this sentence. */ /* Title of the domain purchase success screen. */ "Congratulations on your purchase" = "Congratulations on your purchase"; +/* Message on the celebratory screen after creating first product */ +"Congratulations! You're one step closer to getting the new store ready." = "Congratulations! You're one step closer to getting the new store ready."; + /* Settings > Manage Card Reader > Connected Reader > A prompt to update a reader running older software */ "Congratulations! Your reader is running the latest software" = "Congratulations! Your reader is running the latest software"; @@ -1882,9 +1882,6 @@ which should be translated separately and considered part of this sentence. */ /* The plural coupon summary. Reads like: Coupon (code1, code2) */ "Coupons (%1$@)" = "Coupons (%1$@)"; -/* The title for a menu that helps debug crashes in production builds */ -"Crash Debug Menu" = "Crash Debug Menu"; - /* The title for a button that causes the app to deliberately crash for debugging purposes */ "Crash Immediately" = "Crash Immediately"; @@ -2217,6 +2214,7 @@ which should be translated separately and considered part of this sentence. */ Add a note screen - button title for closing the view Button title for dismissing filtering a list. Button to dismiss the alert presented when finding a reader to connect to fails + Button to dismiss the first created product screen Button to dismiss the Jetpack benefits screen. Button to dismiss. Presented to users after collecting a payment fails Button to dismiss. Presented to users when updating the card reader software fails @@ -2974,6 +2972,9 @@ which should be translated separately and considered part of this sentence. */ /* Text field name in Edit Address Form */ "First name" = "First name"; +/* Title of the celebratory screen after creating the first product */ +"First product created 🎉" = "First product created 🎉"; + /* Subtitle for the account creation form. */ "First, let’s create your account." = "First, let’s create your account."; @@ -5738,6 +5739,9 @@ This part is the link to the website, and forms part of a longer sentence which /* Deletes all activity logs except for the marked 'Current'. */ "Reset Activity Log" = "Reset Activity Log"; +/* The title for a menu to reset the privacy choice banner presentation */ +"Reset Privacy Choice Banner State" = "Reset Privacy Choice Banner State"; + /* Button to reset password on the site credential login screen Button to reset password on the WPCom password login screen of the Jetpack setup flow. The button title for a secondary call-to-action button. When the user can't remember their password. */ @@ -5775,7 +5779,8 @@ This part is the link to the website, and forms part of a longer sentence which Retry action title Retry button on the error notice for the upgrade view Retry button title for the privacy screen notices - Retry the last action */ + Retry the last action + Retry title on the notice action button */ "Retry" = "Retry"; /* Button to try again after connecting to a specific reader fails due to address problems. Intended for use after the merchant corrects the address in the store admin pages. @@ -6167,6 +6172,9 @@ This part is the link to the website, and forms part of a longer sentence which /* Payment Link method title on the select payment method screen */ "Share Payment Link" = "Share Payment Link"; +/* Title of the action button to share the first created product */ +"Share Product" = "Share Product"; + /* Navigates to a screen to share feedback about Tap to Pay on iPhone. */ "Share Tap to Pay on iPhone Feedback" = "Share Tap to Pay on iPhone Feedback"; @@ -7333,6 +7341,9 @@ This part is the link to the website, and forms part of a longer sentence which /* Text of the notice that is displayed while the refund creation fails. */ "There was an error issuing the refund" = "There was an error issuing the refund"; +/* Notice title when there is an error saving the privacy banner choice */ +"There was an error saving your privacy choices." = "There was an error saving your privacy choices."; + /* Notice displayed when searching the list of products fails */ "There was an error searching products" = "There was an error searching products";