Merge branch 'trunk' into fix/7512-crash-loginFields

jaclync · jaclync · commit 75661a81b04d · 2022-08-19T14:22:40.000+08:00
# Conflicts:
#	Podfile
#	Podfile.lock
diff --git a/WooCommerce/Classes/Authentication/ULAccountMatcher.swift b/WooCommerce/Classes/Authentication/ULAccountMatcher.swift
@@ -43,8 +43,8 @@ final class ULAccountMatcher {
         }
 
         return sites
-            .map { $0.url }
-            .contains(originalURL)
+            .map { $0.url.trimHTTPScheme() }
+            .contains(originalURL.trimHTTPScheme())
     }
 
     /// Returns a locally stored site that matches the given site URL.
@@ -59,7 +59,7 @@ final class ULAccountMatcher {
             return nil
         }
 
-        return sites.first { $0.url == originalURL }
+        return sites.first { $0.url.contains(originalURL.trimHTTPScheme()) }
     }
 
     /// Refreshes locally stored sites that were synced previously.

Original file line number	Diff line number	Diff line change
`@@ -43,8 +43,8 @@ final class ULAccountMatcher {`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`return sites`
`46`		`- .map { $0.url }`
`47`		`- .contains(originalURL)`
	`46`	`+ .map { $0.url.trimHTTPScheme() }`
	`47`	`+ .contains(originalURL.trimHTTPScheme())`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`/// Returns a locally stored site that matches the given site URL.`
`@@ -59,7 +59,7 @@ final class ULAccountMatcher {`
`59`	`59`	`return nil`
`60`	`60`	`}`
`61`	`61`
`62`		`- return sites.first { $0.url == originalURL }`
	`62`	`+ return sites.first { $0.url.contains(originalURL.trimHTTPScheme()) }`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`/// Refreshes locally stored sites that were synced previously.`