Merge pull request #221 from hmrc/revert-217-DL-16762

Revert "DL-16762 : Updated business type page"

Author: krishnaram88

app/views/business_verification.scala.html

@@ -70,20 +70,6 @@
             <input type="hidden" name="isSaAccount" value="@{isSaAccount}">
             <input type="hidden" name="isOrgAccount" value="@{isOrgAccount}">
 
-            <header>
-                <h1 class="govuk-heading-xl">
-                    <span class="govuk-caption-xl hmrc-caption-xl"><span class="govuk-visually-hidden">@messages("bc.screen-reader.section") </span>@headingSecondaryText</span>
-                    @headingText
-                </h1>
-            </header>
-
-            <p class="govuk-body">@messages("bc.business-verification-lede")</p>
-            <p class="govuk-body">@messages("bc.business-verification-text-1")</p>
-
-            <p class="govuk-body"><strong>@messages("bc.business-verification.user.subheader")</strong></p>
-
-
-
             @govukRadios(
                 Radios(
                     fieldset = Some(Fieldset(
@@ -100,7 +86,10 @@ <h1 class="govuk-heading-xl">
                     }
 
                 ).withFormField(businessTypeForm("businessType"))
-            )
+                .withHeadingAndSectionCaption(
+                    heading = HtmlContent(headingText),
+                    sectionCaption = HtmlContent(headingSecondaryText)
+                ))
 
         </div>
 

conf/messages

@@ -51,9 +51,8 @@ bc.business-verification.text = {0} account registration
 bc.business-verification.client.text = {0} registration
 bc.business-verification.agent.text = {0} agency set up
 bc.business-verification.title = Select a business type for your agency
-bc.business-verification.user.header = Your business
+bc.business-verification.user.header = What is your business type?
 bc.business-verification.agent.header = What is the business type for your agency?
-bc.business-verification.user.subheader = What is your business type?
 bc.business-verification.agent.reveal = What if I am a unit trust or collective investment vehicle?
 bc.business-verification.agent.reveal-text = If your business is a unit trust or collective investment vehicle then select limited company.
 bc.business-verification.lookup = Business Lookup
@@ -62,7 +61,6 @@ bc.business-verification-selected-user-SOP-header = Your Self Assessment details
 bc.business-verification-selected-user-NRL-header = Your Self Assessment details
 bc.business-verification-selected-agent-header = Your agency details
 bc.business-verification-lede = We will attempt to match your details against information we currently hold.
-bc.business-verification-text-1 = Before you continue, check this business is not already registered for money laundering supervision. A business can only register once. HMRC can only check this after you finish registration.
 bc.business-verification-lede.nrl = Enter your Self Assessment details and we will attempt to match them against information we currently hold.
 bc.business-verification.NUK = I have an overseas company without a UK Unique Taxpayer Reference
 bc.business-verification.agent.NUK = I have an overseas company
@@ -182,6 +180,7 @@ bc.business-registration.submit = Continue
 bc.business-registration.cancel = Cancel
 bc.business-registration.back = Back
 bc.business-registration.search = Match
+
 bc.business-registration-error.businessName = Enter a business name
 bc.business-registration-error.line_1 = Enter address line 1
 bc.business-registration-error.line_2 = Enter address line 2

test/controllers/BusinessVerificationControllerSpec.scala

@@ -185,12 +185,12 @@ class BusinessVerificationControllerSpec
           businessVerificationWithAuthorisedUser(controller) { result =>
             val document = Jsoup.parse(contentAsString(result))
 
-            document.title() must be("Your business - GOV.UK")
+            document.title() must be("What is your business type? - GOV.UK")
             document.getElementsByClass("govuk-caption-xl").text() must be(
-              "This section is: ATED registration"
+              "This section is ATED registration"
             )
             document.getElementsByTag("h1").text() must include(
-              "Your business"
+              "What is your business type?"
             )
             document.select(".govuk-radios__item").text() must include(
               "Limited company"
@@ -287,7 +287,7 @@ class BusinessVerificationControllerSpec
               "What is the business type for your agency? - GOV.UK"
             )
             document.getElementsByClass("govuk-caption-xl").text() must be(
-              "This section is: ATED agency set up"
+              "This section is ATED agency set up"
             )
             document.getElementsByTag("h1").text() must include(
               "What is the business type for your agency?"