diff --git a/app/config/FrontendAppConfig.scala b/app/config/FrontendAppConfig.scala index c00797da..dfd48522 100644 --- a/app/config/FrontendAppConfig.scala +++ b/app/config/FrontendAppConfig.scala @@ -17,10 +17,7 @@ package config import com.google.inject.{Inject, Singleton} -import controllers.routes import play.api.Configuration -import play.api.i18n.Lang -import play.api.mvc.Call import uk.gov.hmrc.play.bootstrap.config.ServicesConfig @Singleton diff --git a/app/controllers/actions/AuthenticatedIdentifierAction.scala b/app/controllers/actions/AuthenticatedIdentifierAction.scala index e46613f4..c75639a9 100644 --- a/app/controllers/actions/AuthenticatedIdentifierAction.scala +++ b/app/controllers/actions/AuthenticatedIdentifierAction.scala @@ -18,7 +18,6 @@ package controllers.actions import com.google.inject.Inject import config.FrontendAppConfig -import controllers.routes._ import models.requests.IdentifierRequest import play.api.Logging import play.api.mvc.Results._ diff --git a/app/controllers/actions/DataRequiredAction.scala b/app/controllers/actions/DataRequiredAction.scala index 8c227bc5..43f30056 100644 --- a/app/controllers/actions/DataRequiredAction.scala +++ b/app/controllers/actions/DataRequiredAction.scala @@ -16,18 +16,17 @@ package controllers.actions -import controllers.routes import controllers.confirmation.{routes => confRoutes} +import controllers.routes import models.NormalMode - -import javax.inject.Inject import models.requests.{DataRequest, OptionalDataRequest} -import navigation.{AuthenticatedNavigator, Navigator} +import navigation.AuthenticatedNavigator import pages.SubmittedClaim import pages.authenticated.Submission import play.api.mvc.Results.Redirect import play.api.mvc.{ActionRefiner, Result} +import javax.inject.Inject import scala.concurrent.{ExecutionContext, Future} class DataRequiredActionImpl @Inject()(navigator: AuthenticatedNavigator) diff --git a/app/controllers/confirmation/ConfirmationCurrentAndPreviousYearsController.scala b/app/controllers/confirmation/ConfirmationCurrentAndPreviousYearsController.scala index c4ff1da2..b10714d7 100644 --- a/app/controllers/confirmation/ConfirmationCurrentAndPreviousYearsController.scala +++ b/app/controllers/confirmation/ConfirmationCurrentAndPreviousYearsController.scala @@ -17,9 +17,7 @@ package controllers.confirmation import controllers.actions.{AuthenticatedIdentifierAction, DataRequiredAction, DataRetrievalAction} -import controllers.routes.{SessionExpiredController, _} - -import javax.inject.Inject +import controllers.routes._ import models.TaxYearSelection.CurrentYear import models.{Address, FlatRateExpenseAmounts, Rates, TaiTaxYear, TaxYearSelection} import pages.authenticated.{TaxYearSelectionPage, YourEmployerPage} @@ -27,11 +25,11 @@ import pages.{CitizenDetailsAddress, ClaimAmountAndAnyDeductions, FREAmounts, FR import play.api.Logging import play.api.i18n.{I18nSupport, MessagesApi} import play.api.mvc.{Action, AnyContent, MessagesControllerComponents} -import repositories.SessionRepository import service.{ClaimAmountService, TaiService} import uk.gov.hmrc.play.bootstrap.frontend.controller.FrontendBaseController import views.html.confirmation.ConfirmationCurrentAndPreviousYearsView +import javax.inject.Inject import scala.concurrent.{ExecutionContext, Future} class ConfirmationCurrentAndPreviousYearsController @Inject()(override val messagesApi: MessagesApi, diff --git a/app/controllers/confirmation/ConfirmationCurrentYearOnlyController.scala b/app/controllers/confirmation/ConfirmationCurrentYearOnlyController.scala index f3f06fb2..1206872e 100644 --- a/app/controllers/confirmation/ConfirmationCurrentYearOnlyController.scala +++ b/app/controllers/confirmation/ConfirmationCurrentYearOnlyController.scala @@ -18,8 +18,6 @@ package controllers.confirmation import controllers.actions.{AuthenticatedIdentifierAction, DataRequiredAction, DataRetrievalAction} import controllers.routes._ - -import javax.inject.Inject import models.TaxYearSelection.CurrentYear import models.{Address, FlatRateExpenseAmounts, Rates, TaiTaxYear, TaxYearSelection} import pages.authenticated.YourEmployerPage @@ -27,11 +25,11 @@ import pages.{CitizenDetailsAddress, ClaimAmountAndAnyDeductions, FREAmounts, FR import play.api.Logging import play.api.i18n.{I18nSupport, MessagesApi} import play.api.mvc.{Action, AnyContent, MessagesControllerComponents} -import repositories.SessionRepository import service.{ClaimAmountService, TaiService} import uk.gov.hmrc.play.bootstrap.frontend.controller.FrontendBaseController import views.html.confirmation.ConfirmationCurrentYearOnlyView +import javax.inject.Inject import scala.concurrent.{ExecutionContext, Future} class ConfirmationCurrentYearOnlyController @Inject()(override val messagesApi: MessagesApi, diff --git a/app/controllers/confirmation/ConfirmationMergeJourneyController.scala b/app/controllers/confirmation/ConfirmationMergeJourneyController.scala index 80bc1002..e477951b 100644 --- a/app/controllers/confirmation/ConfirmationMergeJourneyController.scala +++ b/app/controllers/confirmation/ConfirmationMergeJourneyController.scala @@ -21,16 +21,15 @@ import controllers.actions.{AuthenticatedIdentifierAction, DataRequiredAction, D import controllers.routes.SessionExpiredController import models.NormalMode import navigation.Navigator -import pages.{ClaimAmountAndAnyDeductions, FREResponse} import pages.authenticated.{TaxYearSelectionPage, YourEmployerPage} import pages.confirmation.ConfirmationMergeJourneyPage +import pages.{ClaimAmountAndAnyDeductions, FREResponse} import play.api.i18n.{I18nSupport, MessagesApi} import play.api.mvc.{Action, AnyContent, MessagesControllerComponents} import uk.gov.hmrc.play.bootstrap.frontend.controller.FrontendBaseController import views.html.confirmation.ConfirmationMergeJourneyView import javax.inject.{Inject, Named} -import scala.concurrent.Future class ConfirmationMergeJourneyController @Inject()( override val messagesApi: MessagesApi, diff --git a/app/controllers/confirmation/ConfirmationPreviousYearsOnlyController.scala b/app/controllers/confirmation/ConfirmationPreviousYearsOnlyController.scala index c11a1044..0126f275 100644 --- a/app/controllers/confirmation/ConfirmationPreviousYearsOnlyController.scala +++ b/app/controllers/confirmation/ConfirmationPreviousYearsOnlyController.scala @@ -17,20 +17,18 @@ package controllers.confirmation import controllers.actions.{AuthenticatedIdentifierAction, DataRequiredAction, DataRetrievalAction} -import controllers.routes.{SessionExpiredController, _} - -import javax.inject.Inject +import controllers.routes._ import models.{Address, Rates, TaiTaxYear, TaxYearSelection} import pages.authenticated.TaxYearSelectionPage import pages.{CitizenDetailsAddress, ClaimAmountAndAnyDeductions, FREResponse} import play.api.Logging import play.api.i18n.{I18nSupport, MessagesApi} import play.api.mvc.{Action, AnyContent, MessagesControllerComponents} -import repositories.SessionRepository import service.{ClaimAmountService, TaiService} import uk.gov.hmrc.play.bootstrap.frontend.controller.FrontendBaseController import views.html.confirmation.ConfirmationPreviousYearsOnlyView +import javax.inject.Inject import scala.concurrent.{ExecutionContext, Future} class ConfirmationPreviousYearsOnlyController @Inject()(override val messagesApi: MessagesApi, diff --git a/app/views/LayoutProvider.scala b/app/views/LayoutProvider.scala index 9417d9fa..cdb8a323 100644 --- a/app/views/LayoutProvider.scala +++ b/app/views/LayoutProvider.scala @@ -22,7 +22,6 @@ import play.api.i18n.Messages import play.api.mvc.Request import play.twirl.api.{Html, HtmlFormat} import uk.gov.hmrc.hmrcfrontend.views.viewmodels.hmrcstandardpage.ServiceURLs -import uk.gov.hmrc.play.http.HeaderCarrierConverter import uk.gov.hmrc.sca.services.WrapperService import views.html.playComponents.{AdditionalScript, HeadBlock} @@ -83,6 +82,7 @@ class NewLayoutProvider @Inject()(wrapperService: WrapperService, pageTitle = Some(s"$pageTitle - ${messages(serviceNameKeyOverride.getOrElse("service.name"))} - GOV.UK"), serviceNameKey = Some(serviceNameKeyOverride.getOrElse("service.name")), serviceURLs = ServiceURLs( + signOutUrl = Some(controllers.authenticated.routes.SignOutController.signOut.url), serviceUrl = Some(serviceUrlOverride.getOrElse(controllers.routes.IndexController.start.url)) ), timeOutUrl = Some(controllers.authenticated.routes.SignOutController.signOut.url), @@ -92,6 +92,6 @@ class NewLayoutProvider @Inject()(wrapperService: WrapperService, styleSheets = stylesheets.toSeq :+ headBlock(), fullWidth = false, hideMenuBar = hideAccountMenu, - )(messages, HeaderCarrierConverter.fromRequest(request), request) + )(messages, request) } } diff --git a/app/views/authenticated/CheckYourAnswersView.scala.html b/app/views/authenticated/CheckYourAnswersView.scala.html index 09fb26f3..31135d39 100644 --- a/app/views/authenticated/CheckYourAnswersView.scala.html +++ b/app/views/authenticated/CheckYourAnswersView.scala.html @@ -52,7 +52,7 @@