added service account header removed duplicate sign in button

pages/myportal/[appealtypes].js

@@ -14,6 +14,7 @@ import {
     getMandatoryFields,
     getPickLists,
     getProgressFromBlob,
+    getPersonalAccount,
 } from "../../actions";
 import Breadcrumbs from "../../components/breadcrumbs";
 import CookieBanner from "../../components/cookieBanner";
@@ -29,6 +30,7 @@ import {
     setContainerID,
     setLoggedInUserEmail,
     setLoggedInUserId,
+    setAccountDetails,
 } from "../../store/accountDetails/action";
 import {
     setAppealLPA,
@@ -45,6 +47,7 @@ import {
 import { setCurrentView } from "../../store/currentView/action";
 import { setForm } from "../../store/formData/action";
 import { wrapper } from "../../store/store";
+import ServiceBanner from "../../components/myportal/servicebanner";
 
 let Home = (props) => {
     const { footerLinks, pages, formData } = props;
@@ -169,6 +172,7 @@ let Home = (props) => {
 
                 <div className="govuk-width-container">
                     <Breadcrumbs slug={appealtypes} formTitle={formTitle} />
+                    <ServiceBanner props={props} />
                     <main
                         className="govuk-main-wrapper--auto-spacing"
                         id="main-content"
@@ -241,6 +245,8 @@ export const getServerSideProps = wrapper.getServerSideProps(
 
         console.log("which appeal: ", query.appealtypes);
 
+        const accountDetails = await getPersonalAccount(loggedInUser);
+
         const [appealTypeData, mandatoryFieldsData, pickListData, blobList] =
             await Promise.all([
                 await getAppealsTypesForNewAppeal(),
@@ -318,6 +324,8 @@ export const getServerSideProps = wrapper.getServerSideProps(
 
         store.dispatch(setLoggedInUserId(loggedInUser));
         store.dispatch(setLoggedInUserEmail(loggedInUserEmail));
+
+        store.dispatch(setAccountDetails(accountDetails));
         store.dispatch(setAppealLPA(query.lpa));
         store.dispatch(setAppealTypeID(query.apt));
         store.dispatch(setCaseReference(caseReference));

pages/myportal/addresssearch.js

@@ -10,6 +10,7 @@ import CRMError from "../../components/crmError";
 import Footer from "../../components/footer";
 import Header from "../../components/header";
 import Search from "../../components/myportal/addresssearch";
+import ServiceBanner from "../../components/myportal/servicebanner";
 
 const Home = (props) => {
     const { footerLinks, pages } = props;
@@ -99,6 +100,7 @@ const Home = (props) => {
                 <Header />
                 <div className="govuk-width-container">
                     <Breadcrumbs slug={appealtypes} />
+                    <ServiceBanner props={props} />
                     {hasError ? (
                         <CRMError props={props} whichError="advancedSearch" />
                     ) : (

pages/myportal/addresssearchresults.js

@@ -37,6 +37,7 @@ import {
 } from "../../store/watchedCases/action";
 
 import { wrapper } from "../../store/store";
+import ServiceBanner from "../../components/myportal/servicebanner";
 
 const Home = (props) => {
     const { footerLinks, pages } = props;
@@ -119,6 +120,7 @@ const Home = (props) => {
                 <Header />
                 <div className="govuk-width-container">
                     <Breadcrumbs slug={appealtypes} props={props} />
+                    <ServiceBanner props={props} />
                     <SearchResults
                         searchString={props.search.searchString}
                         searchResultsObj={props.searchResultsObj}

pages/myportal/advancedsearch.js

@@ -25,6 +25,7 @@ import {
 import { setAppealType } from "../../store/appealType/action";
 import { setLPA } from "../../store/lpa/action";
 import { wrapper } from "../../store/store";
+import ServiceBanner from "../../components/myportal/servicebanner";
 
 const Home = (props) => {
     const { footerLinks, pages } = props;
@@ -52,6 +53,7 @@ const Home = (props) => {
                 <Header />
                 <div className="govuk-width-container">
                     <Breadcrumbs slug={appealtypes} />
+                    <ServiceBanner props={props} />
                     {hasError ? (
                         <CRMError props={props} whichError="advancedSearch" />
                     ) : (

pages/myportal/advancedsearchresults.js

@@ -39,6 +39,7 @@ import {
     setWatchedCases,
     setWatchedCasesDetails,
 } from "../../store/watchedCases/action";
+import ServiceBanner from "../../components/myportal/servicebanner";
 
 const Home = (props) => {
     const { footerLinks, pages, watchedCases } = props;
@@ -60,6 +61,7 @@ const Home = (props) => {
                 <Header />
                 <div className="govuk-width-container">
                     <Breadcrumbs slug={appealtypes} />
+                    <ServiceBanner props={props} />
                     <SearchResults
                         searchString={props.search.searchString}
                         searchResultsObj={props.searchResultsObj}

pages/myportal/case.js

@@ -10,6 +10,7 @@ import Footer from "../../components/footer";
 import Header from "../../components/header";
 import NoSessionWarning from "../../components/nosession";
 import TimeOut from "../../components/timeout";
+import ServiceBanner from "../../components/myportal/servicebanner";
 
 const Home = (props) => {
     const { footerLinks, pages, showRepresentations } = props;
@@ -44,6 +45,7 @@ const Home = (props) => {
                 <Header />
                 <div className="govuk-width-container">
                     <Breadcrumbs slug={appealtypes} props={props} />
+                    <ServiceBanner props={props} />
                     <Case
                         props={props}
                         myCases={props.myCases.myCases}

pages/myportal/case/[ticketnumber].js

@@ -45,6 +45,7 @@ import {
     setWatchedCases,
     setWatchedCasesDetails,
 } from "../../../store/watchedCases/action";
+import ServiceBanner from "../../../components/myportal/servicebanner";
 
 const CaseHome = (props) => {
     const { footerLinks, pages, setSearchResults, setSearchDetails } = props;
@@ -67,7 +68,7 @@ const CaseHome = (props) => {
                 <Header serviceName="Developments of National Significance" />
                 <div className="govuk-width-container">
                     <Breadcrumbs slug={ticketnumber} props={props} />
-
+                    <ServiceBanner props={props} />
                     <Case
                         props={props}
                         myCases={props.myCases.myCases}

pages/myportal/dnsapplications.js

@@ -8,6 +8,7 @@ import {
     getIP,
     getPortalModuleDetails,
     getWatchedCases,
+    getPersonalAccount,
 } from "../../actions";
 
 import Breadcrumbs from "../../components/breadcrumbs";
@@ -19,7 +20,10 @@ import {
     getFormCollectionByID,
     getSearchDetails,
 } from "../../components/utils";
-import { setLoggedInUserId } from "../../store/accountDetails/action";
+import {
+    setLoggedInUserId,
+    setAccountDetails,
+} from "../../store/accountDetails/action";
 import { setSearch } from "../../store/search/action";
 import {
     setDNSCoords,
@@ -33,6 +37,7 @@ import {
 } from "../../store/watchedCases/action";
 
 import { getSession } from "next-auth/react";
+import ServiceBanner from "../../components/myportal/servicebanner";
 
 const Home = (props) => {
     const { footerLinks, pages, watchedCases, showMap } = props;
@@ -115,6 +120,7 @@ const Home = (props) => {
                 <Header />
                 <div className="govuk-width-container">
                     <Breadcrumbs slug={appealtypes} />
+                    <ServiceBanner props={props} />
                     <DNSSearchResults
                         showMap={showMap}
                         searchString="DNS"
@@ -155,10 +161,12 @@ export const getServerSideProps = wrapper.getServerSideProps(
                 },
             };
         } else {
-            let [searchResultsObj, watchedCases] = await Promise.all([
-                await getBasicDNSSearch(),
-                await getWatchedCases(loggedInUser),
-            ]);
+            let [accountDetails, searchResultsObj, watchedCases] =
+                await Promise.all([
+                    await getPersonalAccount(loggedInUser),
+                    await getBasicDNSSearch(),
+                    await getWatchedCases(loggedInUser),
+                ]);
 
             searchResultsObj =
                 searchResultsObj.status == 502
@@ -183,6 +191,7 @@ export const getServerSideProps = wrapper.getServerSideProps(
             store.dispatch(setWatchedCases(watchedCases));
             store.dispatch(setWatchedCasesDetails(watchedCasesDetails));
             store.dispatch(setLoggedInUserId(loggedInUser));
+            store.dispatch(setAccountDetails(accountDetails));
 
             return {
                 props: { showMap: showMapCheck },
@@ -232,6 +241,7 @@ const mapStateToProps = (state) => {
         watchedCases: state.watchedCases,
         myRepresentations: state.myRepresentations,
         awaitingSubmission: state.awaitingSubmission,
+        accountDetails: state.accountDetails,
     };
 };
 

pages/myportal/dnsdetails.js

@@ -9,6 +9,7 @@ import CookieBanner from "../../components/cookieBanner";
 import Footer from "../../components/footer";
 import Header from "../../components/header";
 import NoSessionWarning from "../../components/nosession";
+import ServiceBanner from "../../components/myportal/servicebanner";
 
 const Home = (props) => {
     const { footerLinks, pages } = props;
@@ -43,6 +44,7 @@ const Home = (props) => {
                 <Header />
                 <div className="govuk-width-container">
                     <Breadcrumbs slug={appealtypes} props={props} />
+                    <ServiceBanner props={props} />
                     <Case
                         props={props}
                         myCases={props.myCases.myCases}
@@ -97,6 +99,7 @@ const mapStateToProps = (state) => {
         watchedCases: state.watchedCases,
         myRepresentations: state.myRepresentations,
         awaitingSubmission: state.awaitingSubmission,
+        accountDetails: state.accountDetails,
     };
 };
 

pages/myportal/representation.js

@@ -18,6 +18,7 @@ import {
 } from "../../store/accountDetails/action";
 
 import NoSessionWarning from "../../components/nosession";
+import ServiceBanner from "../../components/myportal/servicebanner";
 
 const RepresentationF = (props) => {
     const { footerLinks, pages, accountDetails } = props;
@@ -128,6 +129,7 @@ const RepresentationF = (props) => {
                 <Header />
                 <div className="govuk-width-container">
                     <Breadcrumbs slug={appealtypes} props={props} />
+                    <ServiceBanner props={props} />
                     <Case
                         myCases={props.myCases.myCases}
                         searchResultsObj={

pages/myportal/searchresults.js

@@ -38,6 +38,7 @@ import {
     setContainerID,
     setLoggedInUserId,
 } from "../../store/accountDetails/action";
+import ServiceBanner from "../../components/myportal/servicebanner";
 
 const Home = (props) => {
     const { footerLinks, pages, watchedCases, showLoginCheck } = props;
@@ -58,7 +59,8 @@ const Home = (props) => {
                 <CookieBanner />
                 <Header />
                 <div className="govuk-width-container">
-                    <Breadcrumbs slug={appealtypes} />
+                    <Breadcrumbs slug={appealtypes} />{" "}
+                    <ServiceBanner props={props} />
                     <SearchResults
                         searchString={props.search.searchString}
                         searchResultsObj={props.searchResultsObj}

pages/myportal/viewall.js

@@ -10,6 +10,7 @@ import Header from "../../components/header";
 import ViewAll from "../../components/myportal/viewall";
 import NoSessionWarning from "../../components/nosession";
 import TimeOut from "../../components/timeout";
+import ServiceBanner from "../../components/myportal/servicebanner";
 
 const Home = (props) => {
     const { footerLinks, pages } = props;
@@ -45,6 +46,7 @@ const Home = (props) => {
                         slug={appealtypes}
                         currentView={props.currentView.currentView}
                     />
+                    <ServiceBanner props={props} />
                     <ViewAll
                         searchString={"View All"}
                         searchResultsObj={props.searchResultsObj}