Merge pull request #8043 from woocommerce/release/11.1

Merge 11.1 code freeze to trunk

Author: oguzkocer

Podfile

@@ -65,7 +65,7 @@ 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', '~> 4.1.0-beta.1'
+  pod 'WordPressAuthenticator', '~> 4.1.1'
   # pod 'WordPressAuthenticator', :git => 'https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git', :commit => 'f24fd9c6dbc73cfee583a7eba16fa81e2948fa43'
   # pod 'WordPressAuthenticator', :git => 'https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git', :branch => ''
   # pod 'WordPressAuthenticator', :path => '../WordPressAuthenticator-iOS'

Podfile.lock

@@ -42,7 +42,7 @@ PODS:
   - WordPress-Aztec-iOS (1.11.0)
   - WordPress-Editor-iOS (1.11.0):
     - WordPress-Aztec-iOS (= 1.11.0)
-  - WordPressAuthenticator (4.1.0-beta.1):
+  - WordPressAuthenticator (4.1.1):
     - CocoaLumberjack (~> 3.5)
     - GoogleSignIn (~> 6.0.1)
     - Gridicons (~> 1.0)
@@ -91,7 +91,7 @@ DEPENDENCIES:
   - Sourcery (~> 1.0.3)
   - StripeTerminal (~> 2.7)
   - WordPress-Editor-iOS (~> 1.11.0)
-  - WordPressAuthenticator (~> 4.1.0-beta.1)
+  - WordPressAuthenticator (~> 4.1.1)
   - WordPressKit (~> 4.49.0)
   - WordPressShared (~> 1.15)
   - WordPressUI (~> 1.12.5)
@@ -162,7 +162,7 @@ SPEC CHECKSUMS:
   UIDeviceIdentifier: af4e11e25a2ea670078e2bd677bb0e8144f9f063
   WordPress-Aztec-iOS: 050b34d4c3adfb7c60363849049b13d60683b348
   WordPress-Editor-iOS: 304098424f1051cb271546c99f906aac296b1b81
-  WordPressAuthenticator: 1f3dabd0f7e95afca4efdd3b528417419b66250b
+  WordPressAuthenticator: 6b15ea70d238d90d5ba3c78dae002a707e8c23c4
   WordPressKit: 96deb6ba37ea5eaec4ddcaa53eca04d653246152
   WordPressShared: 5477f179c7fe03b5d574f91adda66f67d131827e
   WordPressUI: c5be816f6c7b3392224ac21de9e521e89fa108ac
@@ -178,6 +178,6 @@ SPEC CHECKSUMS:
   ZendeskSupportProvidersSDK: 2bdf8544f7cd0fd4c002546f5704b813845beb2a
   ZendeskSupportSDK: 3a8e508ab1d9dd22dc038df6c694466414e037ba
 
-PODFILE CHECKSUM: 4286e3bac570110f96d064f4359aec6a46b2406a
+PODFILE CHECKSUM: 3b1ba1b6abc1062da9355f08123c1118559edf9c
 
 COCOAPODS: 1.11.3

RELEASE-NOTES.txt

@@ -1,5 +1,9 @@
 *** PLEASE FOLLOW THIS FORMAT: [<priority indicator, more stars = higher priority>] <description> [<PR URL>]
 
+11.2
+-----
+
+
 11.1
 -----
 - [**] You can now search customers when creating or editing an order. [https://github.com/woocommerce/woocommerce-ios/issues/7741]

WooCommerce/Classes/Notifications/PushNotificationsManager.swift

@@ -477,6 +477,7 @@ private extension PushNotificationsManager {
     /// Handles a remote notification while the app is inactive.
     ///
     /// - Parameter notification: Push notification content from a remote notification.
+    @MainActor
     func handleInactiveRemoteNotification(notification: PushNotification) async {
         guard applicationState == .inactive else {
             return

WooCommerce/Classes/ViewRelated/MainTabBarController.swift

@@ -337,10 +337,8 @@ extension MainTabBarController {
             }
             let siteID = Int64(note.meta.identifier(forKey: .site) ?? Int.min)
 
-            switchToStore(with: siteID, onCompletion: { siteChanged in
-                if siteChanged {
-                    presentNotificationDetails(for: note)
-                }
+            switchToStore(with: siteID, onCompletion: { _ in
+                presentNotificationDetails(for: note)
             })
         }
         ServiceLocator.stores.dispatch(action)

WooCommerce/Resources/AppStoreStrings.pot

@@ -57,9 +57,9 @@ msgctxt "app_store_promo_text"
 msgid "Run your store from anywhere"
 msgstr ""
 
-msgctxt "v11.0-whats-new"
+msgctxt "v11.1-whats-new"
 msgid ""
-"Even though this release doesn’t have any surprising new features, we still put a lot of love into it! We fixed a few bugs and made several improvements to make your experience smoother.\n"
+"Have you tried to create or update an order from the app? It's now possible to search for customers when you do! Check it out and please share your feedback!\n"
 msgstr ""
 
 #. translators: This is a promo message that will be attached on top of a screenshot in the App Store.

WooCommerce/Resources/en.lproj/Localizable.strings

@@ -1 +1 @@
-Even though this release doesn’t have any surprising new features, we still put a lot of love into it! We fixed a few bugs and made several improvements to make your experience smoother.
+Have you tried to create or update an order from the app? It's now possible to search for customers when you do! Check it out and please share your feedback!

WooCommerce/Resources/release_notes.txt

@@ -1,7 +1,7 @@
-VERSION_SHORT=11.0
+VERSION_SHORT=11.1
 
 // Public long version example: VERSION_LONG=1.2.0.0
-VERSION_LONG=11.0.0.2
+VERSION_LONG=11.1.0.0
 
 // Re-map our custom version values (used by release-toolkit) to the Xcode ones
 MARKETING_VERSION=$VERSION_SHORT

config/Version.Public.xcconfig

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