diff --git a/app/uk/gov/hmrc/merchandiseinbaggage/views/Layout.scala.html b/app/uk/gov/hmrc/merchandiseinbaggage/views/Layout.scala.html index 0aeed6c9..19be3a8b 100644 --- a/app/uk/gov/hmrc/merchandiseinbaggage/views/Layout.scala.html +++ b/app/uk/gov/hmrc/merchandiseinbaggage/views/Layout.scala.html @@ -25,6 +25,7 @@ @this( govukLayout: layouts.govukLayout, hmrcHead: HmrcHead, + hmrcInternalHead: HmrcInternalHead, hmrcScripts: HmrcScripts, hmrcTimeoutDialog: HmrcTimeoutDialog ) @@ -74,7 +75,7 @@ @if(isAssistedDigital) { @govukLayout( pageTitle = pageTitle, - headBlock = Some(hmrcHead(headBlock = Some(defaultHead))), + headBlock = Some(hmrcInternalHead(headBlock = Some(defaultHead))), scriptsBlock = Some(hmrcScripts(scriptsBlock = Some(defaultScripts))), beforeContentBlock = None, maybeBackButtonUrl = maybeBackButtonUrl, diff --git a/app/uk/gov/hmrc/merchandiseinbaggage/views/components/siteHeader.scala.html b/app/uk/gov/hmrc/merchandiseinbaggage/views/components/siteHeader.scala.html deleted file mode 100644 index 27facc31..00000000 --- a/app/uk/gov/hmrc/merchandiseinbaggage/views/components/siteHeader.scala.html +++ /dev/null @@ -1,39 +0,0 @@ -@* - * Copyright 2024 HM Revenue & Customs - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - *@ - -@import uk.gov.hmrc.merchandiseinbaggage.controllers.routes - -@this() - -@(showSignOut: Boolean = true)(implicit messages: Messages) - -
- -
\ No newline at end of file diff --git a/app/uk/gov/hmrc/merchandiseinbaggage/views/layouts/govukLayout.scala.html b/app/uk/gov/hmrc/merchandiseinbaggage/views/layouts/govukLayout.scala.html index 40a3d8d5..c22d3a8a 100644 --- a/app/uk/gov/hmrc/merchandiseinbaggage/views/layouts/govukLayout.scala.html +++ b/app/uk/gov/hmrc/merchandiseinbaggage/views/layouts/govukLayout.scala.html @@ -15,7 +15,7 @@ *@ @import uk.gov.hmrc.govukfrontend.views.viewmodels.header.Header -@import uk.gov.hmrc.merchandiseinbaggage.views.html.components +@import uk.gov.hmrc.hmrcfrontend.views.html.components._ @import uk.gov.hmrc.hmrcfrontend.views.html.helpers._ @import uk.gov.hmrc.hmrcfrontend.views.viewmodels.reporttechnicalissue.ReportTechnicalIssue @import uk.gov.hmrc.merchandiseinbaggage.config.AppConfig @@ -26,13 +26,13 @@ @this( govukTemplate: GovukTemplate, govukHeader: GovukHeader, + hmrcInternalHeader: HmrcInternalHeader, govukFooter: GovukFooter, govukBackLink: GovukBackLink, hmrcLanguageSelectHelper: HmrcLanguageSelectHelper, hmrcReportTechnicalIssueHelper: HmrcReportTechnicalIssueHelper, hmrcStandardFooter: HmrcStandardFooter, - govukSkipLink: GovukSkipLink, - siteHeader: components.siteHeader, + govukSkipLink: GovukSkipLink ) @( @@ -49,7 +49,11 @@ @headerDefault = { @if(isAssistedDigital) { - @siteHeader() + @hmrcInternalHeader(InternalHeader( + homepageUrl = routes.ImportExportChoiceController.onPageLoad.url, + serviceName = Some(messages("service.name")), + serviceUrl = routes.ImportExportChoiceController.onPageLoad.url + )) } else { @headerBlock.getOrElse { @govukHeader(Header( diff --git a/project/AppDependencies.scala b/project/AppDependencies.scala index 068b98e2..cb80c88a 100644 --- a/project/AppDependencies.scala +++ b/project/AppDependencies.scala @@ -2,11 +2,11 @@ import sbt.* object AppDependencies { - private val bootstrapVersion = "9.3.0" + private val bootstrapVersion = "9.4.0" private val compile: Seq[ModuleID] = Seq( "uk.gov.hmrc" %% "bootstrap-frontend-play-30" % bootstrapVersion, - "uk.gov.hmrc" %% "play-frontend-hmrc-play-30" % "10.9.0", + "uk.gov.hmrc" %% "play-frontend-hmrc-play-30" % "10.11.0", "uk.gov.hmrc.mongo" %% "hmrc-mongo-play-30" % "2.2.0", "com.beachape" %% "enumeratum-play" % "1.8.1", "org.webjars.npm" % "accessible-autocomplete" % "2.0.4",