SASS-11099 - hardcoded jointlyLet to false

hmrc · Feb 14, 2025 · 465f67b · 465f67b
1 parent 0c91ddd
commit 465f67b
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/app/services/MergeService.scala b/app/services/MergeService.scala
@@ -369,7 +369,7 @@ class MergeService @Inject() (implicit
       s"\nclaimExpensesOrRRRYesNo = $claimExpensesOrRRRYesNo"
     )
     val rentalsAndRaRAboutStoreAnswers = (claimPropertyIncomeAllowanceYesOrNo, claimExpensesOrRRRYesNo)
-    rentalsAndRaRAboutStoreAnswers.merge((jointlyLet, uKOtherPropertyMaybe))
+    rentalsAndRaRAboutStoreAnswers.merge((jointlyLet.orElse(Some(false)), uKOtherPropertyMaybe))
   }
 
   def mergeRaRAbout(
@@ -392,7 +392,7 @@ class MergeService @Inject() (implicit
       ukop                         <- resultFromPeriodicDownstream.ukOtherProperty
     } yield ukop
 
-    rentARoomAllowancesStoreAnswers.merge((jointlyLet, uKOtherPropertyMaybe))
+    rentARoomAllowancesStoreAnswers.merge((jointlyLet.orElse(Some(false)), uKOtherPropertyMaybe))
   }
 
   def mergeStatuses(resultFromRepository: Map[String, JourneyAnswers]): List[JourneyWithStatus] =