MCSC-1120, Comma Separated Numerical Values for Submission journey pa…

…ges (#390)
hmrc · Dec 16, 2024 · 235e0b1 · 235e0b1
1 parent f9c7115
commit 235e0b1
Show file tree

Hide file tree

Showing 23 changed files with 31 additions and 31 deletions.
diff --git a/app/utils/CurrencyFormatter.scala b/app/utils/CurrencyFormatter.scala
@@ -19,8 +19,8 @@ package utils
 import utils.CurrencyFormatter.formatNumberString
 
 trait CurrencyFormatter {
-  def currencyFormat(amt: BigInt): String    = f"&pound;$amt"
-  def currencyFormat(amt: Int): String       = f"&pound;$amt"
+  def currencyFormat(amt: BigInt): String    = formatNumberString(amt.toString)
+  def currencyFormat(amt: Int): String       = formatNumberString(amt.toString)
   def currencyFormat(string: String): String = formatNumberString(string)
 }
 

diff --git a/test/viewmodels/checkAnswers/annualallowance/preaaquestions/PIAPreRemedySummarySpec.scala b/test/viewmodels/checkAnswers/annualallowance/preaaquestions/PIAPreRemedySummarySpec.scala
@@ -45,7 +45,7 @@ class PIAPreRemedySummarySpec extends AnyFreeSpec with Matchers {
         Some(
           SummaryListRowViewModel(
             key = "pIAPreRemedy.checkYourAnswersLabel.2011",
-            value = ValueViewModel(HtmlContent("&pound;123")),
+            value = ValueViewModel(HtmlContent("£123")),
             actions = Seq(
               ActionItemViewModel("site.change", routes.PIAPreRemedyController.onPageLoad(CheckMode, Period._2011).url)
                 .withVisuallyHiddenText("pIAPreRemedy.change.hidden")

diff --git a/test/viewmodels/checkAnswers/annualallowance/taxyear/AdjustedIncomeSummarySpec.scala b/test/viewmodels/checkAnswers/annualallowance/taxyear/AdjustedIncomeSummarySpec.scala
@@ -43,7 +43,7 @@ class AdjustedIncomeSummarySpec extends AnyFreeSpec with Matchers {
       AdjustedIncomeSummary.row(userAnswers, period) shouldBe Some(
         SummaryListRowViewModel(
           key = "adjustedIncome.checkYourAnswersLabel",
-          value = ValueViewModel(HtmlContent("&pound;100")),
+          value = ValueViewModel(HtmlContent("£100")),
           actions = Seq(
             ActionItemViewModel(
               "site.change",

diff --git a/...dels/checkAnswers/annualallowance/taxyear/AmountClaimedOnOverseasPensionSummarySpec.scala b/...dels/checkAnswers/annualallowance/taxyear/AmountClaimedOnOverseasPensionSummarySpec.scala
@@ -43,7 +43,7 @@ class AmountClaimedOnOverseasPensionSummarySpec extends AnyFreeSpec with Matcher
       AmountClaimedOnOverseasPensionSummary.row(userAnswers, period) shouldBe Some(
         SummaryListRowViewModel(
           key = "amountClaimedOnOverseasPension.checkYourAnswersLabel",
-          value = ValueViewModel(HtmlContent("&pound;100")),
+          value = ValueViewModel(HtmlContent("£100")),
           actions = Seq(
             ActionItemViewModel(
               "site.change",

diff --git a/test/viewmodels/checkAnswers/annualallowance/taxyear/AmountOfGiftAidSummarySpec.scala b/test/viewmodels/checkAnswers/annualallowance/taxyear/AmountOfGiftAidSummarySpec.scala
@@ -42,7 +42,7 @@ class AmountOfGiftAidSummarySpec extends AnyFreeSpec with Matchers {
       AmountOfGiftAidSummary.row(userAnswers, period) shouldBe Some(
         SummaryListRowViewModel(
           key = "amountOfGiftAid.checkYourAnswersLabel",
-          value = ValueViewModel(HtmlContent("&pound;100")),
+          value = ValueViewModel(HtmlContent("£100")),
           actions = Seq(
             ActionItemViewModel(
               "site.change",

diff --git a/...wmodels/checkAnswers/annualallowance/taxyear/BlindPersonsAllowanceAmountSummarySpec.scala b/...wmodels/checkAnswers/annualallowance/taxyear/BlindPersonsAllowanceAmountSummarySpec.scala
@@ -43,7 +43,7 @@ class BlindPersonsAllowanceAmountSummarySpec extends AnyFreeSpec with Matchers {
       BlindPersonsAllowanceAmountSummary.row(userAnswers, period) shouldBe Some(
         SummaryListRowViewModel(
           key = "blindPersonsAllowanceAmount.checkYourAnswersLabel",
-          value = ValueViewModel(HtmlContent("&pound;2325")),
+          value = ValueViewModel(HtmlContent("£2,325")),
           actions = Seq(
             ActionItemViewModel(
               "site.change",

diff --git a/test/viewmodels/checkAnswers/annualallowance/taxyear/DefinedBenefitAmountSummarySpec.scala b/test/viewmodels/checkAnswers/annualallowance/taxyear/DefinedBenefitAmountSummarySpec.scala
@@ -43,7 +43,7 @@ class DefinedBenefitAmountSummarySpec extends AnyFreeSpec with Matchers {
       DefinedBenefitAmountSummary.row(userAnswers, period) shouldBe Some(
         SummaryListRowViewModel(
           key = "definedBenefitAmount.checkYourAnswersLabel",
-          value = ValueViewModel(HtmlContent("&pound;100")),
+          value = ValueViewModel(HtmlContent("£100")),
           actions = Seq(
             ActionItemViewModel(
               "site.change",

diff --git a/...iewmodels/checkAnswers/annualallowance/taxyear/DefinedContributionAmountSummarySpec.scala b/...iewmodels/checkAnswers/annualallowance/taxyear/DefinedContributionAmountSummarySpec.scala
@@ -46,7 +46,7 @@ class DefinedContributionAmountSummarySpec extends AnyFreeSpec with Matchers {
       DefinedContributionAmountSummary.row(userAnswers, period) shouldBe Some(
         SummaryListRowViewModel(
           key = "definedContributionAmount.checkYourAnswersLabel",
-          value = ValueViewModel(HtmlContent("&pound;100")),
+          value = ValueViewModel(HtmlContent("£100")),
           actions = Seq(
             ActionItemViewModel(
               "site.change",
@@ -80,7 +80,7 @@ class DefinedContributionAmountSummarySpec extends AnyFreeSpec with Matchers {
     DefinedContributionAmountSummary.row(userAnswers, period) shouldBe Some(
       SummaryListRowViewModel(
         key = "definedContributionAmount.checkYourAnswersLabel",
-        value = ValueViewModel(HtmlContent("&pound;100")),
+        value = ValueViewModel(HtmlContent("£100")),
         actions = Seq(
           ActionItemViewModel(
             "site.change",

diff --git a/...heckAnswers/annualallowance/taxyear/FlexiAccessDefinedContributionAmountSummarySpec.scala b/...heckAnswers/annualallowance/taxyear/FlexiAccessDefinedContributionAmountSummarySpec.scala
@@ -46,7 +46,7 @@ class FlexiAccessDefinedContributionAmountSummarySpec extends AnyFreeSpec with M
       FlexiAccessDefinedContributionAmountSummary.row(userAnswers, period) shouldBe Some(
         SummaryListRowViewModel(
           key = "flexiAccessDefinedContributionAmount.checkYourAnswersLabel",
-          value = ValueViewModel(HtmlContent("&pound;100")),
+          value = ValueViewModel(HtmlContent("£100")),
           actions = Seq(
             ActionItemViewModel(
               "site.change",
@@ -80,7 +80,7 @@ class FlexiAccessDefinedContributionAmountSummarySpec extends AnyFreeSpec with M
     FlexiAccessDefinedContributionAmountSummary.row(userAnswers, period) shouldBe Some(
       SummaryListRowViewModel(
         key = "flexiAccessDefinedContributionAmount.checkYourAnswersLabel",
-        value = ValueViewModel(HtmlContent("&pound;100")),
+        value = ValueViewModel(HtmlContent("£100")),
         actions = Seq(
           ActionItemViewModel(
             "site.change",

diff --git a/...iewmodels/checkAnswers/annualallowance/taxyear/HowMuchAAChargeSchemePaidSummarySpec.scala b/...iewmodels/checkAnswers/annualallowance/taxyear/HowMuchAAChargeSchemePaidSummarySpec.scala
@@ -44,7 +44,7 @@ class HowMuchAAChargeSchemePaidSummarySpec extends AnyFreeSpec with Matchers {
       HowMuchAAChargeSchemePaidSummary.row(userAnswers, period, schemeIndex) shouldBe Some(
         SummaryListRowViewModel(
           key = "howMuchAAChargeSchemePaid.checkYourAnswersLabel",
-          value = ValueViewModel(HtmlContent("&pound;100")),
+          value = ValueViewModel(HtmlContent("£100")),
           actions = Seq(
             ActionItemViewModel(
               "site.change",

diff --git a/test/viewmodels/checkAnswers/annualallowance/taxyear/HowMuchAAChargeYouPaidSummarySpec.scala b/test/viewmodels/checkAnswers/annualallowance/taxyear/HowMuchAAChargeYouPaidSummarySpec.scala
@@ -44,7 +44,7 @@ class HowMuchAAChargeYouPaidSummarySpec extends AnyFreeSpec with Matchers {
       HowMuchAAChargeYouPaidSummary.row(userAnswers, period, schemeIndex) shouldBe Some(
         SummaryListRowViewModel(
           key = "howMuchAAChargeYouPaid.checkYourAnswersLabel",
-          value = ValueViewModel(HtmlContent("&pound;100")),
+          value = ValueViewModel(HtmlContent("£100")),
           actions = Seq(
             ActionItemViewModel(
               "site.change",

diff --git a/.../viewmodels/checkAnswers/annualallowance/taxyear/HowMuchTaxReliefPensionSummarySpec.scala b/.../viewmodels/checkAnswers/annualallowance/taxyear/HowMuchTaxReliefPensionSummarySpec.scala
@@ -43,7 +43,7 @@ class HowMuchTaxReliefPensionSummarySpec extends AnyFreeSpec with Matchers {
       HowMuchTaxReliefPensionSummary.row(userAnswers, period) shouldBe Some(
         SummaryListRowViewModel(
           key = "howMuchTaxReliefPension.checkYourAnswersLabel",
-          value = ValueViewModel(HtmlContent("&pound;100")),
+          value = ValueViewModel(HtmlContent("£100")),
           actions = Seq(
             ActionItemViewModel(
               "site.change",

diff --git a/...ewmodels/checkAnswers/annualallowance/taxyear/PensionSchemeIncomeAmountsSummarySpec.scala b/...ewmodels/checkAnswers/annualallowance/taxyear/PensionSchemeIncomeAmountsSummarySpec.scala
@@ -49,7 +49,7 @@ class PensionSchemeIncomeAmountsSummarySpec extends AnyFreeSpec with Matchers {
       PensionSchemeInputAmountsSummary.row(userAnswers, period, schemeIndex) shouldBe Some(
         SummaryListRowViewModel(
           key = "pensionSchemeInputAmounts.checkYourAnswersLabelRevised",
-          value = ValueViewModel(HtmlContent("&pound;100")),
+          value = ValueViewModel(HtmlContent("£100")),
           actions = Seq(
             ActionItemViewModel(
               "site.change",
@@ -79,7 +79,7 @@ class PensionSchemeIncomeAmountsSummarySpec extends AnyFreeSpec with Matchers {
         PensionSchemeInputAmountsSummary.row(userAnswers, period, schemeIndex) shouldBe Some(
           SummaryListRowViewModel(
             key = "pensionSchemeInputAmounts.checkYourAnswersLabel",
-            value = ValueViewModel(HtmlContent("&pound;100")),
+            value = ValueViewModel(HtmlContent("£100")),
             actions = Seq(
               ActionItemViewModel(
                 "site.change",

diff --git a/...s/checkAnswers/annualallowance/taxyear/PensionSchemeInput2016postAmountsSummarySpec.scala b/...s/checkAnswers/annualallowance/taxyear/PensionSchemeInput2016postAmountsSummarySpec.scala
@@ -49,7 +49,7 @@ class PensionSchemeInput2016postAmountsSummarySpec extends AnyFreeSpec with Matc
       PensionSchemeInput2016postAmountsSummary.row(userAnswers, period, schemeIndex) shouldBe Some(
         SummaryListRowViewModel(
           key = messages("pensionSchemeInputAmounts.2016-post.checkYourAnswersLabel", "SomeScheme"),
-          value = ValueViewModel(HtmlContent("&pound;100")),
+          value = ValueViewModel(HtmlContent("£100")),
           actions = Seq(
             ActionItemViewModel(
               "site.change",

diff --git a/...ls/checkAnswers/annualallowance/taxyear/PensionSchemeInput2016preAmountsSummarySpec.scala b/...ls/checkAnswers/annualallowance/taxyear/PensionSchemeInput2016preAmountsSummarySpec.scala
@@ -49,7 +49,7 @@ class PensionSchemeInput2016preAmountsSummarySpec extends AnyFreeSpec with Match
       PensionSchemeInput2016preAmountsSummary.row(userAnswers, period, schemeIndex) shouldBe Some(
         SummaryListRowViewModel(
           key = messages("pensionSchemeInputAmounts.2016-pre.checkYourAnswersLabel", "SomeScheme"),
-          value = ValueViewModel(HtmlContent("&pound;100")),
+          value = ValueViewModel(HtmlContent("£100")),
           actions = Seq(
             ActionItemViewModel(
               "site.change",

diff --git a/test/viewmodels/checkAnswers/annualallowance/taxyear/PersonalAllowanceSummarySpec.scala b/test/viewmodels/checkAnswers/annualallowance/taxyear/PersonalAllowanceSummarySpec.scala
@@ -43,7 +43,7 @@ class PersonalAllowanceSummarySpec extends AnyFreeSpec with Matchers {
       PersonalAllowanceSummary.row(userAnswers, period) shouldBe Some(
         SummaryListRowViewModel(
           key = "personalAllowance.checkYourAnswersLabel",
-          value = ValueViewModel(HtmlContent("&pound;100")),
+          value = ValueViewModel(HtmlContent("£100")),
           actions = Seq(
             ActionItemViewModel(
               "site.change",

diff --git a/test/viewmodels/checkAnswers/annualallowance/taxyear/RASContributionAmountSummarySpec.scala b/test/viewmodels/checkAnswers/annualallowance/taxyear/RASContributionAmountSummarySpec.scala
@@ -43,7 +43,7 @@ class RASContributionAmountSummarySpec extends AnyFreeSpec with Matchers {
       RASContributionAmountSummary.row(userAnswers, period) shouldBe Some(
         SummaryListRowViewModel(
           key = "rASContributionAmount.checkYourAnswersLabel",
-          value = ValueViewModel(HtmlContent("&pound;100")),
+          value = ValueViewModel(HtmlContent("£100")),
           actions = Seq(
             ActionItemViewModel(
               "site.change",

diff --git a/test/viewmodels/checkAnswers/annualallowance/taxyear/TaxReliefSummarySpec.scala b/test/viewmodels/checkAnswers/annualallowance/taxyear/TaxReliefSummarySpec.scala
@@ -43,7 +43,7 @@ class TaxReliefSummarySpec extends AnyFreeSpec with Matchers {
       TaxReliefSummary.row(userAnswers, period) shouldBe Some(
         SummaryListRowViewModel(
           key = "taxRelief.checkYourAnswersLabel",
-          value = ValueViewModel(HtmlContent("&pound;100")),
+          value = ValueViewModel(HtmlContent("£100")),
           actions = Seq(
             ActionItemViewModel(
               "site.change",

diff --git a/test/viewmodels/checkAnswers/annualallowance/taxyear/TotalIncomeSummarySpec.scala b/test/viewmodels/checkAnswers/annualallowance/taxyear/TotalIncomeSummarySpec.scala
@@ -43,7 +43,7 @@ class TotalIncomeSummarySpec extends AnyFreeSpec with Matchers {
       TotalIncomeSummary.row(userAnswers, period) shouldBe Some(
         SummaryListRowViewModel(
           key = "totalIncome.checkYourAnswersLabel",
-          value = ValueViewModel(HtmlContent("&pound;100")),
+          value = ValueViewModel(HtmlContent("£100")),
           actions = Seq(
             ActionItemViewModel(
               "site.change",

diff --git a/test/viewmodels/checkAnswers/lifetimeallowance/AnnualPaymentValueSummarySpec.scala b/test/viewmodels/checkAnswers/lifetimeallowance/AnnualPaymentValueSummarySpec.scala
@@ -43,7 +43,7 @@ class AnnualPaymentValueSummarySpec extends AnyFreeSpec with Matchers {
       AnnualPaymentValueSummary.row(userAnswers, true) shouldBe Some(
         SummaryListRowViewModel(
           key = "annualPaymentValue.checkYourAnswersLabel",
-          value = ValueViewModel(HtmlContent("&pound;999")),
+          value = ValueViewModel(HtmlContent("£999")),
           actions = Seq(
             ActionItemViewModel("site.change", routes.AnnualPaymentValueController.onPageLoad(CheckMode).url)
               .withVisuallyHiddenText("annualPaymentValue.change.hidden")
@@ -62,7 +62,7 @@ class AnnualPaymentValueSummarySpec extends AnyFreeSpec with Matchers {
       AnnualPaymentValueSummary.row(userAnswers, false) shouldBe Some(
         SummaryListRowViewModel(
           key = KeyViewModel(s"annualPaymentValue.checkYourAnswersLabel").withCssClass(keyCssClass),
-          value = ValueViewModel(HtmlContent("&pound;999"))
+          value = ValueViewModel(HtmlContent("£999"))
         )
       )
     }

diff --git a/test/viewmodels/checkAnswers/lifetimeallowance/LumpSumValueSummarySpec.scala b/test/viewmodels/checkAnswers/lifetimeallowance/LumpSumValueSummarySpec.scala
@@ -43,7 +43,7 @@ class LumpSumValueSummarySpec extends AnyFreeSpec with Matchers {
       LumpSumValueSummary.row(userAnswers, true) shouldBe Some(
         SummaryListRowViewModel(
           key = "lumpSumValue.checkYourAnswersLabel",
-          value = ValueViewModel(HtmlContent("&pound;999")),
+          value = ValueViewModel(HtmlContent("£999")),
           actions = Seq(
             ActionItemViewModel("site.change", routes.LumpSumValueController.onPageLoad(CheckMode).url)
               .withVisuallyHiddenText("lumpSumValue.change.hidden")
@@ -62,7 +62,7 @@ class LumpSumValueSummarySpec extends AnyFreeSpec with Matchers {
       LumpSumValueSummary.row(userAnswers, false) shouldBe Some(
         SummaryListRowViewModel(
           key = KeyViewModel(s"lumpSumValue.checkYourAnswersLabel").withCssClass(keyCssClass),
-          value = ValueViewModel(HtmlContent("&pound;999"))
+          value = ValueViewModel(HtmlContent("£999"))
         )
       )
     }

diff --git a/test/viewmodels/checkAnswers/lifetimeallowance/NewAnnualPaymentValueSummarySpec.scala b/test/viewmodels/checkAnswers/lifetimeallowance/NewAnnualPaymentValueSummarySpec.scala
@@ -43,7 +43,7 @@ class NewAnnualPaymentValueSummarySpec extends AnyFreeSpec with Matchers {
       NewAnnualPaymentValueSummary.row(userAnswers, true) shouldBe Some(
         SummaryListRowViewModel(
           key = "newAnnualPaymentValue.checkYourAnswersLabel",
-          value = ValueViewModel(HtmlContent("&pound;999")),
+          value = ValueViewModel(HtmlContent("£999")),
           actions = Seq(
             ActionItemViewModel("site.change", routes.NewAnnualPaymentValueController.onPageLoad(CheckMode).url)
               .withVisuallyHiddenText("newAnnualPaymentValue.change.hidden")
@@ -62,7 +62,7 @@ class NewAnnualPaymentValueSummarySpec extends AnyFreeSpec with Matchers {
       NewAnnualPaymentValueSummary.row(userAnswers, false) shouldBe Some(
         SummaryListRowViewModel(
           key = KeyViewModel(s"newAnnualPaymentValue.checkYourAnswersLabel").withCssClass(keyCssClass),
-          value = ValueViewModel(HtmlContent("&pound;999"))
+          value = ValueViewModel(HtmlContent("£999"))
         )
       )
     }

diff --git a/test/viewmodels/checkAnswers/lifetimeallowance/NewLumpSumValueSummarySpec.scala b/test/viewmodels/checkAnswers/lifetimeallowance/NewLumpSumValueSummarySpec.scala
@@ -43,7 +43,7 @@ class NewLumpSumValueSummarySpec extends AnyFreeSpec with Matchers {
       NewLumpSumValueSummary.row(userAnswers, true) shouldBe Some(
         SummaryListRowViewModel(
           key = "newLumpSumValue.checkYourAnswersLabel",
-          value = ValueViewModel(HtmlContent("&pound;999")),
+          value = ValueViewModel(HtmlContent("£999")),
           actions = Seq(
             ActionItemViewModel("site.change", routes.NewLumpSumValueController.onPageLoad(CheckMode).url)
               .withVisuallyHiddenText("newLumpSumValue.change.hidden")
@@ -62,7 +62,7 @@ class NewLumpSumValueSummarySpec extends AnyFreeSpec with Matchers {
       NewLumpSumValueSummary.row(userAnswers, false) shouldBe Some(
         SummaryListRowViewModel(
           key = KeyViewModel(s"newLumpSumValue.checkYourAnswersLabel").withCssClass(keyCssClass),
-          value = ValueViewModel(HtmlContent("&pound;999"))
+          value = ValueViewModel(HtmlContent("£999"))
         )
       )
     }