Merge branch 'develop' into issue/5428-print

Author: ctarda

Hardware/Hardware/CardReader/CardReaderConfigProvider.swift

@@ -10,7 +10,7 @@ public protocol ReaderLocationProvider {
     func fetchDefaultLocationID(completion: @escaping(String?, Error?) -> Void)
 }
 
-public protocol CardReaderConfigProvider: ReaderLocationProvider {
+public protocol CardReaderConfigProvider: ReaderLocationProvider, ReaderTokenProvider {
     func fetchToken(completion: @escaping(String?, Error?) -> Void)
     func fetchDefaultLocationID(completion: @escaping(String?, Error?) -> Void)
 }

Hardware/Hardware/CardReader/StripeCardReader/DefaultConnectionTokenProvider.swift

@@ -4,9 +4,9 @@ import StripeTerminal
 /// uses the networking adapter provided by clients of Hardware
 /// to fetch a connection token
 final class DefaultConnectionTokenProvider: ConnectionTokenProvider {
-    private let provider: CardReaderConfigProvider
+    private let provider: ReaderTokenProvider
 
-    init(provider: CardReaderConfigProvider) {
+    init(provider: ReaderTokenProvider) {
         self.provider = provider
     }
 

RELEASE-NOTES.txt

@@ -2,6 +2,7 @@
 
 8.1
 -----
+- [*] Login: Password AutoFill will suggest wordpress.com accounts. [https://github.com/woocommerce/woocommerce-ios/pull/5399]
 - [internal] Migrated Settings screen to MVVM [https://github.com/woocommerce/woocommerce-ios/pull/5393]
 
 

WooCommerce/Classes/ViewRelated/Dashboard/Settings/Settings/SettingsViewModel.swift

@@ -72,7 +72,8 @@ final class SettingsViewModel: SettingsViewModelOutput, SettingsViewModelActions
     /// Main Site's URL
     ///
     var siteUrl: String? {
-        stores.sessionManager.defaultSite?.url as String?
+        let urlString = stores.sessionManager.defaultSite?.url as String?
+        return urlString?.removingPrefix("https://").removingPrefix("http://")
     }
 
     /// Sites pulled from the results controlelr

WooCommerce/Classes/ViewRelated/Orders/Order Creation/NewOrder.swift

@@ -0,0 +1,40 @@
+import SwiftUI
+
+/// View to create a new manual order
+///
+struct NewOrder: View {
+    var body: some View {
+        ScrollView {
+            EmptyView()
+        }
+        .background(Color(.listBackground))
+            .ignoresSafeArea(.container, edges: [.horizontal, .bottom])
+        .navigationTitle(Localization.title)
+        .navigationBarTitleDisplayMode(.inline)
+        .toolbar {
+            ToolbarItem(placement: .confirmationAction) {
+                Button(action: {
+                    // TODO-5405 - Add create order action
+                }, label: {
+                    Text(Localization.createButton)
+                })
+            }
+        }
+    }
+}
+
+// MARK: Constants
+private extension NewOrder {
+    enum Localization {
+        static let title = NSLocalizedString("New Order", comment: "Title for the order creation screen")
+        static let createButton = NSLocalizedString("Create", comment: "Button to create an order on the New Order screen")
+    }
+}
+
+struct NewOrder_Previews: PreviewProvider {
+    static var previews: some View {
+        NavigationView {
+            NewOrder()
+        }
+    }
+}

WooCommerce/Resources/Woo-Alpha.entitlements

@@ -4,6 +4,10 @@
 <dict>
 	<key>aps-environment</key>
 	<string>production</string>
+	<key>com.apple.developer.associated-domains</key>
+	<array>
+		<string>webcredentials:wordpress.com</string>
+	</array>
 	<key>com.apple.developer.icloud-container-identifiers</key>
 	<array>
 		<string>iCloud.$(CFBundleIdentifier)</string>

WooCommerce/Resources/Woo-Debug.entitlements

@@ -10,6 +10,10 @@
 	<array>
 		<string>Default</string>
 	</array>
+	<key>com.apple.developer.associated-domains</key>
+	<array>
+		<string>webcredentials:wordpress.com</string>
+	</array>
 	<key>com.apple.developer.icloud-container-identifiers</key>
 	<array>
 		<string>iCloud.$(CFBundleIdentifier)</string>

WooCommerce/Resources/Woo-Release.entitlements

@@ -10,6 +10,10 @@
 	<array>
 		<string>Default</string>
 	</array>
+	<key>com.apple.developer.associated-domains</key>
+	<array>
+		<string>webcredentials:wordpress.com</string>
+	</array>
 	<key>com.apple.developer.icloud-container-identifiers</key>
 	<array>
 		<string>iCloud.$(CFBundleIdentifier)</string>

WooCommerce/WooCommerce.xcodeproj/project.pbxproj

@@ -1098,6 +1098,7 @@
 		CCFC010C23E9BD5500157A78 /* stats_orders-year.json in Resources */ = {isa = PBXBuildFile; fileRef = CCFC00E623E9BD5500157A78 /* stats_orders-year.json */; };
 		CCFC010D23E9BD5500157A78 /* stats_top_earners-month.json in Resources */ = {isa = PBXBuildFile; fileRef = CCFC00E723E9BD5500157A78 /* stats_top_earners-month.json */; };
 		CCFC010E23E9BD5500157A78 /* stats_visits-day.json in Resources */ = {isa = PBXBuildFile; fileRef = CCFC00E823E9BD5500157A78 /* stats_visits-day.json */; };
+		CCFC50552743BC0D001E505F /* NewOrder.swift in Sources */ = {isa = PBXBuildFile; fileRef = CCFC50542743BC0D001E505F /* NewOrder.swift */; };
 		CE0F17CF22A8105800964A63 /* ReadMoreTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE0F17CD22A8105800964A63 /* ReadMoreTableViewCell.swift */; };
 		CE0F17D022A8105800964A63 /* ReadMoreTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE0F17CE22A8105800964A63 /* ReadMoreTableViewCell.xib */; };
 		CE0F17D222A8308900964A63 /* FancyAlertController+PurchaseNote.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE0F17D122A8308900964A63 /* FancyAlertController+PurchaseNote.swift */; };
@@ -2572,6 +2573,7 @@
 		CCFC00E823E9BD5500157A78 /* stats_visits-day.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = "stats_visits-day.json"; sourceTree = "<group>"; };
 		CCFC011023E9E3F400157A78 /* start.sh */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = start.sh; sourceTree = "<group>"; };
 		CCFC011123E9E40B00157A78 /* stop.sh */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = stop.sh; sourceTree = "<group>"; };
+		CCFC50542743BC0D001E505F /* NewOrder.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NewOrder.swift; sourceTree = "<group>"; };
 		CE0F17CD22A8105800964A63 /* ReadMoreTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReadMoreTableViewCell.swift; sourceTree = "<group>"; };
 		CE0F17CE22A8105800964A63 /* ReadMoreTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ReadMoreTableViewCell.xib; sourceTree = "<group>"; };
 		CE0F17D122A8308900964A63 /* FancyAlertController+PurchaseNote.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "FancyAlertController+PurchaseNote.swift"; sourceTree = "<group>"; };
@@ -5898,6 +5900,14 @@
 			path = stats;
 			sourceTree = "<group>";
 		};
+		CCFC50532743BBBF001E505F /* Order Creation */ = {
+			isa = PBXGroup;
+			children = (
+				CCFC50542743BC0D001E505F /* NewOrder.swift */,
+			);
+			path = "Order Creation";
+			sourceTree = "<group>";
+		};
 		CE14452C2188C0EC00A991D8 /* Zendesk */ = {
 			isa = PBXGroup;
 			children = (
@@ -5925,6 +5935,7 @@
 				CEE006022077D0F80079161F /* Cells */,
 				CE35F1092343E482007B2A6B /* Order Details */,
 				2678897A270E6E3C00BD249E /* Simple Payments */,
+				CCFC50532743BBBF001E505F /* Order Creation */,
 				CEE005F52076C4040079161F /* Orders.storyboard */,
 				57C503DB23E8C70C00EC0790 /* OrdersTabbedViewController.swift */,
 				57C503DD23E8CE0D00EC0790 /* OrdersTabbedViewController.xib */,
@@ -8042,6 +8053,7 @@
 				DE68B81F26F86B1700C86CFB /* OfflineBannerView.swift in Sources */,
 				02D4564C231D05E2008CF0A9 /* BetaFeaturesViewController.swift in Sources */,
 				D8610BCC256F284700A5DF27 /* ULErrorViewModel.swift in Sources */,
+				CCFC50552743BC0D001E505F /* NewOrder.swift in Sources */,
 				4590CEE4249BA46700949F05 /* AddProductCategoryViewController.swift in Sources */,
 				CE37C04422984E81008DCB39 /* PickListTableViewCell.swift in Sources */,
 				020DD48D2322A617005822B1 /* ProductsTabProductViewModel.swift in Sources */,