Show store country question after the selling status question.

Author: jaclync

WooCommerce/Classes/Authentication/Store Creation/StoreCreationCoordinator.swift

@@ -143,6 +143,7 @@ private extension StoreCreationCoordinator {
                 self?.showDomainSelector(from: navigationController,
                                          storeName: storeName,
                                          categoryName: nil,
+                                         countryCode: nil,
                                          planToPurchase: planToPurchase)
             }
         } onClose: { [weak self] in
@@ -325,27 +326,53 @@ private extension StoreCreationCoordinator {
                                    planToPurchase: WPComPlanProduct) {
         let questionController = StoreCreationSellingStatusQuestionHostingController(storeName: storeName) { [weak self] in
             guard let self else { return }
-            self.showDomainSelector(from: navigationController, storeName: storeName, categoryName: categoryName, planToPurchase: planToPurchase)
+            self.showStoreCountryQuestion(from: navigationController,
+                                          storeName: storeName,
+                                          categoryName: categoryName,
+                                          planToPurchase: planToPurchase)
         } onSkip: { [weak self] in
             // TODO: analytics
             guard let self else { return }
-            self.showDomainSelector(from: navigationController, storeName: storeName, categoryName: nil, planToPurchase: planToPurchase)
+            self.showStoreCountryQuestion(from: navigationController,
+                                          storeName: storeName,
+                                          categoryName: categoryName,
+                                          planToPurchase: planToPurchase)
         }
         navigationController.pushViewController(questionController, animated: true)
         // TODO: analytics
     }
 
+    @MainActor
+    func showStoreCountryQuestion(from navigationController: UINavigationController,
+                                  storeName: String,
+                                  categoryName: String?,
+                                  planToPurchase: WPComPlanProduct) {
+        let questionController = StoreCreationCountryQuestionHostingController(viewModel:
+                .init(storeName: storeName) { [weak self] countryCode in
+            guard let self else { return }
+            self.showDomainSelector(from: navigationController,
+                                    storeName: storeName,
+                                    categoryName: categoryName,
+                                    countryCode: countryCode,
+                                    planToPurchase: planToPurchase)
+        })
+        navigationController.pushViewController(questionController, animated: true)
+        // TODO: analytics
+    }
+
     @MainActor
     func showDomainSelector(from navigationController: UINavigationController,
                             storeName: String,
                             categoryName: String?,
+                            countryCode: SiteAddress.CountryCode?,
                             planToPurchase: WPComPlanProduct) {
         let domainSelector = DomainSelectorHostingController(viewModel: .init(initialSearchTerm: storeName),
                                                              onDomainSelection: { [weak self] domain in
             guard let self else { return }
             await self.createStoreAndContinueToStoreSummary(from: navigationController,
                                                             name: storeName,
                                                             categoryName: categoryName,
+                                                            countryCode: countryCode,
                                                             domain: domain,
                                                             planToPurchase: planToPurchase)
         })
@@ -357,12 +384,17 @@ private extension StoreCreationCoordinator {
     func createStoreAndContinueToStoreSummary(from navigationController: UINavigationController,
                                               name: String,
                                               categoryName: String?,
+                                              countryCode: SiteAddress.CountryCode?,
                                               domain: String,
                                               planToPurchase: WPComPlanProduct) async {
         let result = await createStore(name: name, domain: domain)
         switch result {
         case .success(let siteResult):
-            showStoreSummary(from: navigationController, result: siteResult, categoryName: categoryName, planToPurchase: planToPurchase)
+            showStoreSummary(from: navigationController,
+                             result: siteResult,
+                             categoryName: categoryName,
+                             countryCode: countryCode,
+                             planToPurchase: planToPurchase)
         case .failure(let error):
             analytics.track(event: .StoreCreation.siteCreationFailed(source: source.analyticsValue, error: error, flow: .native))
             showStoreCreationErrorAlert(from: navigationController, error: error)
@@ -382,8 +414,12 @@ private extension StoreCreationCoordinator {
     func showStoreSummary(from navigationController: UINavigationController,
                           result: SiteCreationResult,
                           categoryName: String?,
+                          countryCode: SiteAddress.CountryCode?,
                           planToPurchase: WPComPlanProduct) {
-        let viewModel = StoreCreationSummaryViewModel(storeName: result.name, storeSlug: result.siteSlug, categoryName: categoryName)
+        let viewModel = StoreCreationSummaryViewModel(storeName: result.name,
+                                                      storeSlug: result.siteSlug,
+                                                      categoryName: categoryName,
+                                                      countryCode: countryCode)
         let storeSummary = StoreCreationSummaryHostingController(viewModel: viewModel) { [weak self] in
             guard let self else { return }
             self.showWPCOMPlan(from: navigationController,

WooCommerce/Classes/Authentication/Store Creation/StoreCreationSummaryView.swift

@@ -45,6 +45,9 @@ struct StoreCreationSummaryViewModel {
     let storeSlug: String
     /// Optional category name from the previous profiler question.
     let categoryName: String?
+    /// Country code for the store location.
+    /// `nil` only when the `storeCreationM3Profiler` feature flag is disabled.
+    let countryCode: SiteAddress.CountryCode?
 }
 
 /// Displays a summary of the store creation flow with the store information (e.g. store name, store slug).
@@ -77,7 +80,7 @@ struct StoreCreationSummaryView: View {
                         }
                         .background(Color(.systemColor(.systemGray6)))
 
-                        VStack {
+                        VStack(alignment: .leading, spacing: 16) {
                             VStack(alignment: .leading, spacing: Layout.spacingBetweenStoreNameAndDomain) {
                                 // Store name.
                                 Text(viewModel.storeName)
@@ -86,12 +89,18 @@ struct StoreCreationSummaryView: View {
                                 Text(viewModel.storeSlug)
                                     .foregroundColor(Color(.secondaryLabel))
                                     .bodyStyle()
-                                // Store category (optional).
-                                if let categoryName = viewModel.categoryName {
-                                    Text(categoryName)
-                                        .foregroundColor(Color(.label))
-                                        .bodyStyle()
-                                }
+                            }
+                            // Store country.
+                            if let country = viewModel.country {
+                                Text(country)
+                                    .foregroundColor(Color(.label))
+                                    .bodyStyle()
+                            }
+                            // Store category (optional).
+                            if let categoryName = viewModel.categoryName {
+                                Text(categoryName)
+                                    .foregroundColor(Color(.label))
+                                    .bodyStyle()
                             }
                         }
                         .padding(Layout.storeInfoPadding)
@@ -146,12 +155,25 @@ private extension StoreCreationSummaryView {
     }
 }
 
+private extension StoreCreationSummaryViewModel {
+    /// Text for the store country label.
+    var country: String? {
+        countryCode.map { [$0.readableCountry, $0.flagEmoji].compactMap { $0 }.joined(separator: " ") }
+    }
+}
+
 struct StoreCreationSummaryView_Previews: PreviewProvider {
     static var previews: some View {
         StoreCreationSummaryView(viewModel:
-                .init(storeName: "Fruity shop", storeSlug: "fruityshop.com", categoryName: "Arts and Crafts"))
+                .init(storeName: "Fruity shop",
+                      storeSlug: "fruityshop.com",
+                      categoryName: "Arts and Crafts",
+                      countryCode: .UG))
         StoreCreationSummaryView(viewModel:
-                .init(storeName: "Fruity shop", storeSlug: "fruityshop.com", categoryName: "Arts and Crafts"))
+                .init(storeName: "Fruity shop",
+                      storeSlug: "fruityshop.com",
+                      categoryName: "Arts and Crafts",
+                      countryCode: nil))
         .preferredColorScheme(.dark)
     }
 }