handle free plan selection

handle free plan with free domain selection after first selecting paid domain
wordpress-mobile · Oct 15, 2023 · 05d9682 · 05d9682
1 parent 782b7b4
commit 05d9682
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/SiteCreationMainVM.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/SiteCreationMainVM.kt
@@ -262,6 +262,11 @@ class SiteCreationMainVM @Inject constructor(
                 siteCreationState = siteCreationState.copy(domain = null)
             }
         }
+        if (wizardStep == SiteCreationStep.PLANS) {
+            siteCreationState.plan?.let {
+                siteCreationState = siteCreationState.copy(plan = null)
+            }
+        }
     }
 
     fun onDomainsScreenFinished(domain: DomainModel) {
@@ -271,6 +276,18 @@ class SiteCreationMainVM @Inject constructor(
 
     fun onPlanSelection(plan: PlanModel) {
         siteCreationState = siteCreationState.copy(plan = plan)
+        if (plan.productSlug == "free_plan") {
+            // if they select a paid domain, then choose a free plan, with free domain on plan selection screen
+            siteCreationState = siteCreationState.copy(
+                domain = DomainModel(
+                    domainName = plan.productName.orEmpty(),
+                    isFree = true,
+                    cost = "",
+                    productId = 0,
+                    supportsPrivacy = false
+                )
+            )
+        }
         wizardManager.showNextStep()
     }
 

diff --git a/...s/src/main/java/org/wordpress/android/ui/sitecreation/plans/SiteCreationPlansViewModel.kt b/...s/src/main/java/org/wordpress/android/ui/sitecreation/plans/SiteCreationPlansViewModel.kt
@@ -45,11 +45,12 @@ class SiteCreationPlansViewModel @Inject constructor(
 
         val planId = uri.getQueryParameter(PLAN_ID_PARAM)?.toInt() ?: 0
         val planSlug = uri.getQueryParameter(PLAN_SLUG_PARAM).orEmpty()
+        val domainName = uri.getQueryParameter(PAID_DOMAIN_NAME).orEmpty()
 
         val planModel = PlanModel(
             productId = planId,
             productSlug = planSlug,
-            productName = "",
+            productName = domainName, // using domainName here
             isCurrentPlan = false,
             hasDomainCredit = false
         )