From d546629e7d1f628562eca672bf3770a9cd10a932 Mon Sep 17 00:00:00 2001
From: Sabrina <sabrina.samuel@madetech.com>
Date: Mon, 9 Dec 2024 09:33:51 +0000
Subject: [PATCH 1/6] Create new page to display username

---
 frontend/src/app/app-routing.module.ts        |  6 +++++
 frontend/src/app/app.module.ts                |  2 ++
 .../found-username.component.html             |  0
 .../found-username.component.spec.ts          | 23 +++++++++++++++++++
 .../found-username.component.ts               | 11 +++++++++
 5 files changed, 42 insertions(+)
 create mode 100644 frontend/src/app/features/found-username/found-username.component.html
 create mode 100644 frontend/src/app/features/found-username/found-username.component.spec.ts
 create mode 100644 frontend/src/app/features/found-username/found-username.component.ts

diff --git a/frontend/src/app/app-routing.module.ts b/frontend/src/app/app-routing.module.ts
index fadb159655..e675fabe9f 100644
--- a/frontend/src/app/app-routing.module.ts
+++ b/frontend/src/app/app-routing.module.ts
@@ -30,6 +30,7 @@ import { AscWdsCertificateComponent } from '@features/dashboard/asc-wds-certific
 import { FirstLoginPageComponent } from '@features/first-login-page/first-login-page.component';
 import { ForgotYourPasswordComponent } from '@features/forgot-your-password/forgot-your-password.component';
 import { ForgotYourUsernameOrPasswordComponent } from '@features/forgot-your-password/forgot-your-username-or-password/forgot-your-username-or-password.component';
+import { FoundUsernameComponent } from '@features/found-username/found-username.component';
 import { LoginComponent } from '@features/login/login.component';
 import { LogoutComponent } from '@features/logout/logout.component';
 import { MigratedUserTermsConditionsComponent } from '@features/migrated-user-terms-conditions/migrated-user-terms-conditions.component';
@@ -105,6 +106,11 @@ const routes: Routes = [
         component: SatisfactionSurveyComponent,
         data: { title: 'Satisfaction Survey' },
       },
+      {
+        path: 'username-found',
+        component: FoundUsernameComponent,
+        data: { title: 'Username Found' },
+      },
     ],
   },
   {
diff --git a/frontend/src/app/app.module.ts b/frontend/src/app/app.module.ts
index 7a0b50b26b..13d4b92418 100644
--- a/frontend/src/app/app.module.ts
+++ b/frontend/src/app/app.module.ts
@@ -93,6 +93,7 @@ import { MigratedUserTermsConditionsComponent } from './features/migrated-user-t
 import { SatisfactionSurveyComponent } from './features/satisfaction-survey/satisfaction-survey.component';
 import { SentryErrorHandler } from './SentryErrorHandler.component';
 import { ForgotYourUsernameOrPasswordComponent } from './features/forgot-your-password/forgot-your-username-or-password/forgot-your-username-or-password.component';
+import { FoundUsernameComponent } from '@features/found-username/found-username.component';
 
 @NgModule({
   declarations: [
@@ -135,6 +136,7 @@ import { ForgotYourUsernameOrPasswordComponent } from './features/forgot-your-pa
     ParentWorkplaceAccounts,
     DeleteWorkplaceComponent,
     ForgotYourUsernameOrPasswordComponent,
+    FoundUsernameComponent,
   ],
   imports: [
     Angulartics2Module.forRoot({
diff --git a/frontend/src/app/features/found-username/found-username.component.html b/frontend/src/app/features/found-username/found-username.component.html
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/frontend/src/app/features/found-username/found-username.component.spec.ts b/frontend/src/app/features/found-username/found-username.component.spec.ts
new file mode 100644
index 0000000000..bd1584e7cd
--- /dev/null
+++ b/frontend/src/app/features/found-username/found-username.component.spec.ts
@@ -0,0 +1,23 @@
+import { render } from '@testing-library/angular';
+import { FoundUsernameComponent } from './found-username.component';
+
+fdescribe('FoundUsernameComponent', () => {
+  const setup = async () => {
+    const setupTools = await render(FoundUsernameComponent, {
+      imports: [],
+      declarations: [],
+      providers: [],
+      componentProperties: {},
+    });
+
+    const component = setupTools.fixture.componentInstance;
+
+    return { ...setupTools, component };
+  };
+
+  it('should create', async () => {
+    const { component } = await setup();
+
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/frontend/src/app/features/found-username/found-username.component.ts b/frontend/src/app/features/found-username/found-username.component.ts
new file mode 100644
index 0000000000..66427b79e2
--- /dev/null
+++ b/frontend/src/app/features/found-username/found-username.component.ts
@@ -0,0 +1,11 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+  selector: 'app-found-username',
+  templateUrl: './found-username.component.html',
+})
+export class FoundUsernameComponent implements OnInit {
+  constructor() {}
+
+  ngOnInit(): void {}
+}

From 9e946b6204795f489fc208e58939c7e74ceaba97 Mon Sep 17 00:00:00 2001
From: Sabrina <sabrina.samuel@madetech.com>
Date: Tue, 10 Dec 2024 17:10:25 +0000
Subject: [PATCH 2/6] Add panel to display

---
 .../found-username.component.html             | 29 ++++++
 .../found-username.component.spec.ts          | 93 +++++++++++++++++--
 .../found-username.component.ts               | 22 ++++-
 3 files changed, 134 insertions(+), 10 deletions(-)

diff --git a/frontend/src/app/features/found-username/found-username.component.html b/frontend/src/app/features/found-username/found-username.component.html
index e69de29bb2..5540793d37 100644
--- a/frontend/src/app/features/found-username/found-username.component.html
+++ b/frontend/src/app/features/found-username/found-username.component.html
@@ -0,0 +1,29 @@
+<ng-container *ngIf="isUsernameFound; else notFound">
+  <div
+    class="govuk-panel govuk-panel--gray govuk-util__align-left govuk-!-width-two-thirds govuk-!-padding-top-1"
+    data-testid="panel"
+  >
+    <h1 class="govuk-!-font-size-36 govuk-!-margin-top-6 govuk-!-margin-bottom-3">
+      <img
+        class="govuk-!-margin-right-1 govuk-util__vertical-align-top govuk-!-margin-right-2"
+        src="/assets/images/tick-icon.svg"
+        style="height: 28px; vertical-align: baseline"
+        alt=""
+      />We’ve found your username
+    </h1>
+    <div class="govuk-!-font-size-19 govuk-!-margin-left-7">
+      Your username is
+      <div class="govuk-!-font-size-27 govuk-!-font-weight-bold govuk-!-margin-top-2">{{ username }}</div>
+    </div>
+  </div>
+
+  <div class="govuk-!-margin-top-8">
+    <button type="submit" class="govuk-button" data-module="govuk-button" (click)="backToSignInPage($event)">
+      Back to sign in
+    </button>
+  </div>
+</ng-container>
+
+<ng-template #notFound>
+  <app-page-not-found data-testid="not-found"></app-page-not-found>
+</ng-template>
diff --git a/frontend/src/app/features/found-username/found-username.component.spec.ts b/frontend/src/app/features/found-username/found-username.component.spec.ts
index bd1584e7cd..20bd56224b 100644
--- a/frontend/src/app/features/found-username/found-username.component.spec.ts
+++ b/frontend/src/app/features/found-username/found-username.component.spec.ts
@@ -1,23 +1,100 @@
-import { render } from '@testing-library/angular';
+import { fireEvent, render, within } from '@testing-library/angular';
 import { FoundUsernameComponent } from './found-username.component';
+import { getTestBed } from '@angular/core/testing';
+import { Router, RouterModule } from '@angular/router';
+import { RouterTestingModule } from '@angular/router/testing';
+import { PageNotFoundComponent } from '@core/components/error/page-not-found/page-not-found.component';
 
-fdescribe('FoundUsernameComponent', () => {
-  const setup = async () => {
+describe('FoundUsernameComponent', () => {
+  const setup = async (overrides: any = {}) => {
     const setupTools = await render(FoundUsernameComponent, {
-      imports: [],
-      declarations: [],
+      imports: [RouterModule, RouterTestingModule],
+      declarations: [PageNotFoundComponent],
       providers: [],
-      componentProperties: {},
+      componentProperties: {
+        username: overrides.username,
+      },
     });
 
     const component = setupTools.fixture.componentInstance;
 
-    return { ...setupTools, component };
+    const injector = getTestBed();
+    const router = injector.inject(Router) as Router;
+
+    const routerSpy = spyOn(router, 'navigate').and.returnValue(Promise.resolve(true));
+
+    return { ...setupTools, component, routerSpy };
   };
 
   it('should create', async () => {
-    const { component } = await setup();
+    const overrides = {
+      username: 'Bighitterhank1000',
+    };
+
+    const { component } = await setup(overrides);
 
     expect(component).toBeTruthy();
   });
+
+  it('should show the panel', async () => {
+    const overrides = {
+      username: 'Bighitterhank1000',
+    };
+
+    const { getByTestId } = await setup(overrides);
+
+    const panel = getByTestId('panel');
+
+    expect(panel).toBeTruthy();
+    expect(within(panel).getByText('We’ve found your username'));
+  });
+
+  it('should show the username', async () => {
+    const overrides = {
+      username: 'Bighitterhank1000',
+    };
+
+    const { getByTestId } = await setup(overrides);
+
+    const panel = getByTestId('panel');
+    expect(within(panel).getByText('Your username is'));
+    expect(within(panel).getByText('Bighitterhank1000'));
+  });
+
+  it('should show a button to return to the sign in page', async () => {
+    const overrides = {
+      username: 'Bighitterhank1000',
+    };
+
+    const { getByText } = await setup(overrides);
+
+    const buttonText = getByText('Back to sign in');
+
+    expect(buttonText).toBeTruthy();
+  });
+
+  it('should go back to the sign in page when the button is clicked', async () => {
+    const overrides = {
+      username: 'Bighitterhank1000',
+    };
+
+    const { fixture, getByText, routerSpy } = await setup(overrides);
+
+    const buttonText = getByText('Back to sign in');
+
+    fireEvent.click(buttonText);
+    fixture.detectChanges();
+
+    expect(routerSpy).toHaveBeenCalledWith(['/login']);
+  });
+
+  it('should show page not found if user lands on page and no username was found', async () => {
+    const overrides = {
+      username: null,
+    };
+
+    const { getByTestId } = await setup(overrides);
+
+    expect(getByTestId('not-found')).toBeTruthy();
+  });
 });
diff --git a/frontend/src/app/features/found-username/found-username.component.ts b/frontend/src/app/features/found-username/found-username.component.ts
index 66427b79e2..81215c5df7 100644
--- a/frontend/src/app/features/found-username/found-username.component.ts
+++ b/frontend/src/app/features/found-username/found-username.component.ts
@@ -1,11 +1,29 @@
 import { Component, OnInit } from '@angular/core';
+import { Router } from '@angular/router';
 
 @Component({
   selector: 'app-found-username',
   templateUrl: './found-username.component.html',
 })
 export class FoundUsernameComponent implements OnInit {
-  constructor() {}
+  public username: string = 'Bighitterhank1000';
+  public isUsernameFound: boolean;
 
-  ngOnInit(): void {}
+  constructor(private router: Router) {}
+
+  ngOnInit(): void {
+    this.getFoundUsername();
+  }
+
+  public getFoundUsername(): void {
+    //get username from FindUsernameService
+    //this.username = this.findUsernameService.usernameFound
+
+    this.isUsernameFound = this.username !== null ? true : false;
+  }
+
+  public backToSignInPage(event: Event): void {
+    event.preventDefault();
+    this.router.navigate(['/login']);
+  }
 }

From a2d2d6d8da477697c8897ac6745bd9854eaa6207 Mon Sep 17 00:00:00 2001
From: Sabrina <sabrina.samuel@madetech.com>
Date: Wed, 18 Dec 2024 17:07:40 +0000
Subject: [PATCH 3/6] Rename and move component

---
 frontend/src/app/app-routing.module.ts        |  4 +-
 frontend/src/app/app.module.ts                |  4 +-
 .../username-found.component.html}            |  6 +--
 .../username-found.component.scss             |  3 ++
 .../username-found.component.spec.ts}         | 37 ++++++++-----------
 .../username-found.component.ts               | 31 ++++++++++++++++
 .../found-username.component.ts               | 29 ---------------
 7 files changed, 57 insertions(+), 57 deletions(-)
 rename frontend/src/app/features/{found-username/found-username.component.html => forgot-your-username-or-password/username-found/username-found.component.html} (80%)
 create mode 100644 frontend/src/app/features/forgot-your-username-or-password/username-found/username-found.component.scss
 rename frontend/src/app/features/{found-username/found-username.component.spec.ts => forgot-your-username-or-password/username-found/username-found.component.spec.ts} (75%)
 create mode 100644 frontend/src/app/features/forgot-your-username-or-password/username-found/username-found.component.ts
 delete mode 100644 frontend/src/app/features/found-username/found-username.component.ts

diff --git a/frontend/src/app/app-routing.module.ts b/frontend/src/app/app-routing.module.ts
index 03dec0bfcb..594b9e2ddd 100644
--- a/frontend/src/app/app-routing.module.ts
+++ b/frontend/src/app/app-routing.module.ts
@@ -31,7 +31,7 @@ import { FirstLoginPageComponent } from '@features/first-login-page/first-login-
 import { ForgotYourPasswordComponent } from '@features/forgot-your-username-or-password/forgot-your-password/forgot-your-password.component';
 import { ForgotYourUsernameOrPasswordComponent } from '@features/forgot-your-username-or-password/forgot-your-username-or-password.component';
 import { ForgotYourUsernameComponent } from '@features/forgot-your-username-or-password/forgot-your-username/forgot-your-username.component';
-import { FoundUsernameComponent } from '@features/found-username/found-username.component';
+import { UsernameFoundComponent } from '@features/forgot-your-username-or-password/username-found/username-found.component';
 import { LoginComponent } from '@features/login/login.component';
 import { LogoutComponent } from '@features/logout/logout.component';
 import { MigratedUserTermsConditionsComponent } from '@features/migrated-user-terms-conditions/migrated-user-terms-conditions.component';
@@ -114,7 +114,7 @@ const routes: Routes = [
       },
       {
         path: 'username-found',
-        component: FoundUsernameComponent,
+        component: UsernameFoundComponent,
         data: { title: 'Username Found' },
       },
     ],
diff --git a/frontend/src/app/app.module.ts b/frontend/src/app/app.module.ts
index 08b8f89240..86c33d5b6b 100644
--- a/frontend/src/app/app.module.ts
+++ b/frontend/src/app/app.module.ts
@@ -97,7 +97,7 @@ import { SharedModule } from '@shared/shared.module';
 import { AppRoutingModule } from './app-routing.module';
 import { AppComponent } from './app.component';
 import { SentryErrorHandler } from './SentryErrorHandler.component';
-import { FoundUsernameComponent } from '@features/found-username/found-username.component';
+import { UsernameFoundComponent } from '@features/forgot-your-username-or-password/username-found/username-found.component';
 
 @NgModule({
   declarations: [
@@ -140,7 +140,7 @@ import { FoundUsernameComponent } from '@features/found-username/found-username.
     ParentWorkplaceAccounts,
     DeleteWorkplaceComponent,
     ForgotYourUsernameOrPasswordComponent,
-    FoundUsernameComponent,
+    UsernameFoundComponent,
     ForgotYourUsernameComponent,
     FindAccountComponent,
     FindUsernameComponent,
diff --git a/frontend/src/app/features/found-username/found-username.component.html b/frontend/src/app/features/forgot-your-username-or-password/username-found/username-found.component.html
similarity index 80%
rename from frontend/src/app/features/found-username/found-username.component.html
rename to frontend/src/app/features/forgot-your-username-or-password/username-found/username-found.component.html
index 5540793d37..74d80f6faa 100644
--- a/frontend/src/app/features/found-username/found-username.component.html
+++ b/frontend/src/app/features/forgot-your-username-or-password/username-found/username-found.component.html
@@ -1,9 +1,9 @@
 <ng-container *ngIf="isUsernameFound; else notFound">
   <div
-    class="govuk-panel govuk-panel--gray govuk-util__align-left govuk-!-width-two-thirds govuk-!-padding-top-1"
+    class="govuk-panel govuk-panel--gray govuk-util__align-left govuk-!-margin-top-1 govuk-!-padding-top-1 govuk-!-padding-bottom-5 govuk-!-padding-left-2 govuk-!-padding-right-0 panel"
     data-testid="panel"
   >
-    <h1 class="govuk-!-font-size-36 govuk-!-margin-top-6 govuk-!-margin-bottom-3">
+    <h1 class="govuk-!-font-size-36 govuk-!-margin-top-4 govuk-!-margin-bottom-3">
       <img
         class="govuk-!-margin-right-1 govuk-util__vertical-align-top govuk-!-margin-right-2"
         src="/assets/images/tick-icon.svg"
@@ -13,7 +13,7 @@ <h1 class="govuk-!-font-size-36 govuk-!-margin-top-6 govuk-!-margin-bottom-3">
     </h1>
     <div class="govuk-!-font-size-19 govuk-!-margin-left-7">
       Your username is
-      <div class="govuk-!-font-size-27 govuk-!-font-weight-bold govuk-!-margin-top-2">{{ username }}</div>
+      <div class="govuk-!-font-size-27 govuk-!-font-weight-bold govuk-!-margin-top-1">{{ username }}</div>
     </div>
   </div>
 
diff --git a/frontend/src/app/features/forgot-your-username-or-password/username-found/username-found.component.scss b/frontend/src/app/features/forgot-your-username-or-password/username-found/username-found.component.scss
new file mode 100644
index 0000000000..d59e07e69d
--- /dev/null
+++ b/frontend/src/app/features/forgot-your-username-or-password/username-found/username-found.component.scss
@@ -0,0 +1,3 @@
+.panel {
+  width: 64%;
+}
diff --git a/frontend/src/app/features/found-username/found-username.component.spec.ts b/frontend/src/app/features/forgot-your-username-or-password/username-found/username-found.component.spec.ts
similarity index 75%
rename from frontend/src/app/features/found-username/found-username.component.spec.ts
rename to frontend/src/app/features/forgot-your-username-or-password/username-found/username-found.component.spec.ts
index 20bd56224b..3946299d90 100644
--- a/frontend/src/app/features/found-username/found-username.component.spec.ts
+++ b/frontend/src/app/features/forgot-your-username-or-password/username-found/username-found.component.spec.ts
@@ -1,19 +1,25 @@
 import { fireEvent, render, within } from '@testing-library/angular';
-import { FoundUsernameComponent } from './found-username.component';
+import { UsernameFoundComponent } from './username-found.component';
 import { getTestBed } from '@angular/core/testing';
 import { Router, RouterModule } from '@angular/router';
 import { RouterTestingModule } from '@angular/router/testing';
 import { PageNotFoundComponent } from '@core/components/error/page-not-found/page-not-found.component';
+import { FindUsernameService } from '@core/services/find-username.service';
+import { MockFindUsernameService } from '@core/test-utils/MockFindUsernameService';
+import { HttpClientTestingModule } from '@angular/common/http/testing';
 
-describe('FoundUsernameComponent', () => {
+fdescribe('UsernameFoundComponent', () => {
   const setup = async (overrides: any = {}) => {
-    const setupTools = await render(FoundUsernameComponent, {
-      imports: [RouterModule, RouterTestingModule],
+    const setupTools = await render(UsernameFoundComponent, {
+      imports: [RouterModule, RouterTestingModule, HttpClientTestingModule],
       declarations: [PageNotFoundComponent],
-      providers: [],
-      componentProperties: {
-        username: overrides.username,
-      },
+      providers: [
+        {
+          provide: FindUsernameService,
+          useValue: { usernameFound: overrides.username },
+        },
+      ],
+      componentProperties: {},
     });
 
     const component = setupTools.fixture.componentInstance;
@@ -26,7 +32,7 @@ describe('FoundUsernameComponent', () => {
     return { ...setupTools, component, routerSpy };
   };
 
-  it('should create', async () => {
+  it('should create UsernameFoundComponent', async () => {
     const overrides = {
       username: 'Bighitterhank1000',
     };
@@ -61,18 +67,6 @@ describe('FoundUsernameComponent', () => {
     expect(within(panel).getByText('Bighitterhank1000'));
   });
 
-  it('should show a button to return to the sign in page', async () => {
-    const overrides = {
-      username: 'Bighitterhank1000',
-    };
-
-    const { getByText } = await setup(overrides);
-
-    const buttonText = getByText('Back to sign in');
-
-    expect(buttonText).toBeTruthy();
-  });
-
   it('should go back to the sign in page when the button is clicked', async () => {
     const overrides = {
       username: 'Bighitterhank1000',
@@ -81,6 +75,7 @@ describe('FoundUsernameComponent', () => {
     const { fixture, getByText, routerSpy } = await setup(overrides);
 
     const buttonText = getByText('Back to sign in');
+    expect(buttonText).toBeTruthy();
 
     fireEvent.click(buttonText);
     fixture.detectChanges();
diff --git a/frontend/src/app/features/forgot-your-username-or-password/username-found/username-found.component.ts b/frontend/src/app/features/forgot-your-username-or-password/username-found/username-found.component.ts
new file mode 100644
index 0000000000..4a455167fa
--- /dev/null
+++ b/frontend/src/app/features/forgot-your-username-or-password/username-found/username-found.component.ts
@@ -0,0 +1,31 @@
+import { Component, OnInit } from '@angular/core';
+import { Router } from '@angular/router';
+import { FindUsernameService } from '@core/services/find-username.service';
+
+@Component({
+  selector: 'app-username-found',
+  templateUrl: './username-found.component.html',
+  styleUrls: ['./username-found.component.scss'],
+})
+export class UsernameFoundComponent implements OnInit {
+  //public username: string;
+  public username: string = 'Bighitterhank1000';
+  public isUsernameFound: boolean;
+
+  constructor(private router: Router, private findUsernameService: FindUsernameService) {}
+
+  ngOnInit(): void {
+    this.getUsernameFound();
+  }
+
+  public getUsernameFound(): void {
+    //this.username = this.findUsernameService.usernameFound;
+
+    this.isUsernameFound = this.username !== null ? true : false;
+  }
+
+  public backToSignInPage(event: Event): void {
+    event.preventDefault();
+    this.router.navigate(['/login']);
+  }
+}
diff --git a/frontend/src/app/features/found-username/found-username.component.ts b/frontend/src/app/features/found-username/found-username.component.ts
deleted file mode 100644
index 81215c5df7..0000000000
--- a/frontend/src/app/features/found-username/found-username.component.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-import { Component, OnInit } from '@angular/core';
-import { Router } from '@angular/router';
-
-@Component({
-  selector: 'app-found-username',
-  templateUrl: './found-username.component.html',
-})
-export class FoundUsernameComponent implements OnInit {
-  public username: string = 'Bighitterhank1000';
-  public isUsernameFound: boolean;
-
-  constructor(private router: Router) {}
-
-  ngOnInit(): void {
-    this.getFoundUsername();
-  }
-
-  public getFoundUsername(): void {
-    //get username from FindUsernameService
-    //this.username = this.findUsernameService.usernameFound
-
-    this.isUsernameFound = this.username !== null ? true : false;
-  }
-
-  public backToSignInPage(event: Event): void {
-    event.preventDefault();
-    this.router.navigate(['/login']);
-  }
-}

From 3efe1cd9bdbd1cbaba58b94587cd98ad390c5af1 Mon Sep 17 00:00:00 2001
From: Sabrina <sabrina.samuel@madetech.com>
Date: Wed, 18 Dec 2024 17:15:20 +0000
Subject: [PATCH 4/6] Remove commented code

---
 .../username-found/username-found.component.html         | 9 ++++-----
 .../username-found/username-found.component.scss         | 5 +++++
 .../username-found/username-found.component.spec.ts      | 9 ++++-----
 .../username-found/username-found.component.ts           | 5 ++---
 4 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/frontend/src/app/features/forgot-your-username-or-password/username-found/username-found.component.html b/frontend/src/app/features/forgot-your-username-or-password/username-found/username-found.component.html
index 74d80f6faa..22ca5fdf17 100644
--- a/frontend/src/app/features/forgot-your-username-or-password/username-found/username-found.component.html
+++ b/frontend/src/app/features/forgot-your-username-or-password/username-found/username-found.component.html
@@ -1,13 +1,12 @@
-<ng-container *ngIf="isUsernameFound; else notFound">
+<ng-container *ngIf="isUsernameFound; else notAvailable">
   <div
     class="govuk-panel govuk-panel--gray govuk-util__align-left govuk-!-margin-top-1 govuk-!-padding-top-1 govuk-!-padding-bottom-5 govuk-!-padding-left-2 govuk-!-padding-right-0 panel"
     data-testid="panel"
   >
     <h1 class="govuk-!-font-size-36 govuk-!-margin-top-4 govuk-!-margin-bottom-3">
       <img
-        class="govuk-!-margin-right-1 govuk-util__vertical-align-top govuk-!-margin-right-2"
+        class="govuk-!-margin-right-1 govuk-util__vertical-align-top govuk-!-margin-right-2 green-tick-icon"
         src="/assets/images/tick-icon.svg"
-        style="height: 28px; vertical-align: baseline"
         alt=""
       />We’ve found your username
     </h1>
@@ -24,6 +23,6 @@ <h1 class="govuk-!-font-size-36 govuk-!-margin-top-4 govuk-!-margin-bottom-3">
   </div>
 </ng-container>
 
-<ng-template #notFound>
-  <app-page-not-found data-testid="not-found"></app-page-not-found>
+<ng-template #notAvailable>
+  <app-page-not-available data-testid="not-available"></app-page-not-available>
 </ng-template>
diff --git a/frontend/src/app/features/forgot-your-username-or-password/username-found/username-found.component.scss b/frontend/src/app/features/forgot-your-username-or-password/username-found/username-found.component.scss
index d59e07e69d..3296d00f22 100644
--- a/frontend/src/app/features/forgot-your-username-or-password/username-found/username-found.component.scss
+++ b/frontend/src/app/features/forgot-your-username-or-password/username-found/username-found.component.scss
@@ -1,3 +1,8 @@
 .panel {
   width: 64%;
 }
+
+.green-tick-icon {
+  height: 28px;
+  vertical-align: baseline;
+}
diff --git a/frontend/src/app/features/forgot-your-username-or-password/username-found/username-found.component.spec.ts b/frontend/src/app/features/forgot-your-username-or-password/username-found/username-found.component.spec.ts
index 3946299d90..bc2facd179 100644
--- a/frontend/src/app/features/forgot-your-username-or-password/username-found/username-found.component.spec.ts
+++ b/frontend/src/app/features/forgot-your-username-or-password/username-found/username-found.component.spec.ts
@@ -3,16 +3,15 @@ import { UsernameFoundComponent } from './username-found.component';
 import { getTestBed } from '@angular/core/testing';
 import { Router, RouterModule } from '@angular/router';
 import { RouterTestingModule } from '@angular/router/testing';
-import { PageNotFoundComponent } from '@core/components/error/page-not-found/page-not-found.component';
 import { FindUsernameService } from '@core/services/find-username.service';
-import { MockFindUsernameService } from '@core/test-utils/MockFindUsernameService';
 import { HttpClientTestingModule } from '@angular/common/http/testing';
+import { PageNotAvailableComponent } from '@core/components/error/page-not-available/page-not-available.component';
 
-fdescribe('UsernameFoundComponent', () => {
+describe('UsernameFoundComponent', () => {
   const setup = async (overrides: any = {}) => {
     const setupTools = await render(UsernameFoundComponent, {
       imports: [RouterModule, RouterTestingModule, HttpClientTestingModule],
-      declarations: [PageNotFoundComponent],
+      declarations: [PageNotAvailableComponent],
       providers: [
         {
           provide: FindUsernameService,
@@ -90,6 +89,6 @@ fdescribe('UsernameFoundComponent', () => {
 
     const { getByTestId } = await setup(overrides);
 
-    expect(getByTestId('not-found')).toBeTruthy();
+    expect(getByTestId('not-available')).toBeTruthy();
   });
 });
diff --git a/frontend/src/app/features/forgot-your-username-or-password/username-found/username-found.component.ts b/frontend/src/app/features/forgot-your-username-or-password/username-found/username-found.component.ts
index 4a455167fa..6628106393 100644
--- a/frontend/src/app/features/forgot-your-username-or-password/username-found/username-found.component.ts
+++ b/frontend/src/app/features/forgot-your-username-or-password/username-found/username-found.component.ts
@@ -8,8 +8,7 @@ import { FindUsernameService } from '@core/services/find-username.service';
   styleUrls: ['./username-found.component.scss'],
 })
 export class UsernameFoundComponent implements OnInit {
-  //public username: string;
-  public username: string = 'Bighitterhank1000';
+  public username: string;
   public isUsernameFound: boolean;
 
   constructor(private router: Router, private findUsernameService: FindUsernameService) {}
@@ -19,7 +18,7 @@ export class UsernameFoundComponent implements OnInit {
   }
 
   public getUsernameFound(): void {
-    //this.username = this.findUsernameService.usernameFound;
+    this.username = this.findUsernameService.usernameFound;
 
     this.isUsernameFound = this.username !== null ? true : false;
   }

From 45be738a1e5206aa36cd2ca54b56ed412d021e67 Mon Sep 17 00:00:00 2001
From: Sabrina <sabrina.samuel@madetech.com>
Date: Thu, 19 Dec 2024 14:22:53 +0000
Subject: [PATCH 5/6] Create component for page no longer available

---
 .../page-no-longer-available.component.html   |  7 ++
 ...page-no-longer-available.component.spec.ts | 41 ++++++++
 .../page-no-longer-available.component.ts     |  9 ++
 .../username-found.component.html             |  2 +-
 .../username-found.component.spec.ts          |  8 +-
 .../username-found.component.ts               |  3 +-
 frontend/src/app/shared/shared.module.ts      | 95 +++++--------------
 7 files changed, 89 insertions(+), 76 deletions(-)
 create mode 100644 frontend/src/app/core/components/error/page-no-longer-available/page-no-longer-available.component.html
 create mode 100644 frontend/src/app/core/components/error/page-no-longer-available/page-no-longer-available.component.spec.ts
 create mode 100644 frontend/src/app/core/components/error/page-no-longer-available/page-no-longer-available.component.ts

diff --git a/frontend/src/app/core/components/error/page-no-longer-available/page-no-longer-available.component.html b/frontend/src/app/core/components/error/page-no-longer-available/page-no-longer-available.component.html
new file mode 100644
index 0000000000..258f2ae594
--- /dev/null
+++ b/frontend/src/app/core/components/error/page-no-longer-available/page-no-longer-available.component.html
@@ -0,0 +1,7 @@
+<div class="govuk-grid-row">
+  <div class="govuk-grid-column-two-thirds-from-desktop">
+    <h1 class="govuk-heading-xl">Page no longer available</h1>
+    <p>The page you are trying to view does not exist anymore.</p>
+    <p><a [routerLink]="['/login']" class="text-link">Return to the homepage</a></p>
+  </div>
+</div>
diff --git a/frontend/src/app/core/components/error/page-no-longer-available/page-no-longer-available.component.spec.ts b/frontend/src/app/core/components/error/page-no-longer-available/page-no-longer-available.component.spec.ts
new file mode 100644
index 0000000000..a43de9798d
--- /dev/null
+++ b/frontend/src/app/core/components/error/page-no-longer-available/page-no-longer-available.component.spec.ts
@@ -0,0 +1,41 @@
+import { render } from '@testing-library/angular';
+import { RouterModule } from '@angular/router';
+import { RouterTestingModule } from '@angular/router/testing';
+import { HttpClientTestingModule } from '@angular/common/http/testing';
+import { PageNoLongerAvailableComponent } from './page-no-longer-available.component';
+
+describe('PageNoLongerAvailableComponent', () => {
+  const setup = async () => {
+    const setupTools = await render(PageNoLongerAvailableComponent, {
+      imports: [RouterModule, RouterTestingModule, HttpClientTestingModule],
+      declarations: [],
+      providers: [],
+      componentProperties: {},
+    });
+
+    const component = setupTools.fixture.componentInstance;
+
+    return { ...setupTools, component };
+  };
+
+  it('should create', async () => {
+    const { component } = await setup();
+
+    expect(component).toBeTruthy();
+  });
+
+  it('should show the page heading', async () => {
+    const { getByRole } = await setup();
+
+    expect(getByRole('heading', { name: 'Page no longer available' })).toBeTruthy();
+  });
+
+  it('should show a link to the homepage', async () => {
+    const { getByText } = await setup();
+
+    const linkText = getByText('Return to the homepage');
+
+    expect(linkText).toBeTruthy();
+    expect(linkText.getAttribute('href')).toEqual('/login');
+  });
+});
diff --git a/frontend/src/app/core/components/error/page-no-longer-available/page-no-longer-available.component.ts b/frontend/src/app/core/components/error/page-no-longer-available/page-no-longer-available.component.ts
new file mode 100644
index 0000000000..ad7a1e020c
--- /dev/null
+++ b/frontend/src/app/core/components/error/page-no-longer-available/page-no-longer-available.component.ts
@@ -0,0 +1,9 @@
+import { Component } from '@angular/core';
+
+@Component({
+  selector: 'app-page-no-longer-available',
+  templateUrl: './page-no-longer-available.component.html',
+})
+export class PageNoLongerAvailableComponent {
+  constructor() {}
+}
diff --git a/frontend/src/app/features/forgot-your-username-or-password/username-found/username-found.component.html b/frontend/src/app/features/forgot-your-username-or-password/username-found/username-found.component.html
index 22ca5fdf17..8cab22b08b 100644
--- a/frontend/src/app/features/forgot-your-username-or-password/username-found/username-found.component.html
+++ b/frontend/src/app/features/forgot-your-username-or-password/username-found/username-found.component.html
@@ -24,5 +24,5 @@ <h1 class="govuk-!-font-size-36 govuk-!-margin-top-4 govuk-!-margin-bottom-3">
 </ng-container>
 
 <ng-template #notAvailable>
-  <app-page-not-available data-testid="not-available"></app-page-not-available>
+  <app-page-no-longer-available data-testid="page-no-longer-available"></app-page-no-longer-available>
 </ng-template>
diff --git a/frontend/src/app/features/forgot-your-username-or-password/username-found/username-found.component.spec.ts b/frontend/src/app/features/forgot-your-username-or-password/username-found/username-found.component.spec.ts
index bc2facd179..ebb4af802e 100644
--- a/frontend/src/app/features/forgot-your-username-or-password/username-found/username-found.component.spec.ts
+++ b/frontend/src/app/features/forgot-your-username-or-password/username-found/username-found.component.spec.ts
@@ -5,13 +5,13 @@ import { Router, RouterModule } from '@angular/router';
 import { RouterTestingModule } from '@angular/router/testing';
 import { FindUsernameService } from '@core/services/find-username.service';
 import { HttpClientTestingModule } from '@angular/common/http/testing';
-import { PageNotAvailableComponent } from '@core/components/error/page-not-available/page-not-available.component';
+import { PageNoLongerAvailableComponent } from '@core/components/error/page-no-longer-available/page-no-longer-available.component';
 
 describe('UsernameFoundComponent', () => {
   const setup = async (overrides: any = {}) => {
     const setupTools = await render(UsernameFoundComponent, {
       imports: [RouterModule, RouterTestingModule, HttpClientTestingModule],
-      declarations: [PageNotAvailableComponent],
+      declarations: [PageNoLongerAvailableComponent],
       providers: [
         {
           provide: FindUsernameService,
@@ -82,13 +82,13 @@ describe('UsernameFoundComponent', () => {
     expect(routerSpy).toHaveBeenCalledWith(['/login']);
   });
 
-  it('should show page not found if user lands on page and no username was found', async () => {
+  it('should show page no longer available if no username was found', async () => {
     const overrides = {
       username: null,
     };
 
     const { getByTestId } = await setup(overrides);
 
-    expect(getByTestId('not-available')).toBeTruthy();
+    expect(getByTestId('page-no-longer-available')).toBeTruthy();
   });
 });
diff --git a/frontend/src/app/features/forgot-your-username-or-password/username-found/username-found.component.ts b/frontend/src/app/features/forgot-your-username-or-password/username-found/username-found.component.ts
index 6628106393..6cfa91eced 100644
--- a/frontend/src/app/features/forgot-your-username-or-password/username-found/username-found.component.ts
+++ b/frontend/src/app/features/forgot-your-username-or-password/username-found/username-found.component.ts
@@ -15,12 +15,11 @@ export class UsernameFoundComponent implements OnInit {
 
   ngOnInit(): void {
     this.getUsernameFound();
+    this.isUsernameFound = this.username !== null ? true : false;
   }
 
   public getUsernameFound(): void {
     this.username = this.findUsernameService.usernameFound;
-
-    this.isUsernameFound = this.username !== null ? true : false;
   }
 
   public backToSignInPage(event: Event): void {
diff --git a/frontend/src/app/shared/shared.module.ts b/frontend/src/app/shared/shared.module.ts
index cf32a1c4ab..54c3df794b 100644
--- a/frontend/src/app/shared/shared.module.ts
+++ b/frontend/src/app/shared/shared.module.ts
@@ -5,20 +5,15 @@ import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { RouterModule } from '@angular/router';
 import { CannotCreateAccountComponent } from '@core/components/error/cannot-create-account/cannot-create-account.component';
 import { PageNotFoundComponent } from '@core/components/error/page-not-found/page-not-found.component';
+import { PageNoLongerAvailableComponent } from '@core/components/error/page-no-longer-available/page-no-longer-available.component';
 import { ArticleListResolver } from '@core/resolvers/article-list.resolver';
 import { PageResolver } from '@core/resolvers/page.resolver';
 import { DialogService } from '@core/services/dialog.service';
 import { ArticleListComponent } from '@features/articles/article-list/article-list.component';
 import { NewArticleListComponent } from '@features/articles/new-article-list/new-article-list.component';
-import {
-  NewTrainingLinkPanelComponent,
-} from '@features/new-dashboard/training-tab/training-link-panel/training-link-panel.component';
-import {
-  MissingMandatoryTrainingComponent,
-} from '@features/training-and-qualifications/new-training-qualifications-record/missing-mandatory-training/missing-mandatory-training.component';
-import {
-  DeleteWorkplaceDialogComponent,
-} from '@features/workplace/delete-workplace-dialog/delete-workplace-dialog.component';
+import { NewTrainingLinkPanelComponent } from '@features/new-dashboard/training-tab/training-link-panel/training-link-panel.component';
+import { MissingMandatoryTrainingComponent } from '@features/training-and-qualifications/new-training-qualifications-record/missing-mandatory-training/missing-mandatory-training.component';
+import { DeleteWorkplaceDialogComponent } from '@features/workplace/delete-workplace-dialog/delete-workplace-dialog.component';
 import { AlertComponent } from '@shared/components/alert/alert.component';
 import { CheckCQCDetailsComponent } from '@shared/components/check-cqc-details/check-cqc-details.component';
 import { NewDashboardHeaderComponent } from '@shared/components/new-dashboard-header/dashboard-header.component';
@@ -27,12 +22,8 @@ import { WorkplaceTabComponent } from '@shared/components/workplace-tab/workplac
 import { BulkUploadFileTypePipePipe } from '@shared/pipes/bulk-upload-file-type.pipe';
 import { SanitizeVideoUrlPipe } from '@shared/pipes/sanitize-video-url.pipe';
 
-import {
-  GroupedRadioButtonAccordionComponent,
-} from './components/accordions/radio-button-accordion/grouped-radio-button-accordion/grouped-radio-button-accordion.component';
-import {
-  RadioButtonAccordionComponent,
-} from './components/accordions/radio-button-accordion/radio-button-accordion.component';
+import { GroupedRadioButtonAccordionComponent } from './components/accordions/radio-button-accordion/grouped-radio-button-accordion/grouped-radio-button-accordion.component';
+import { RadioButtonAccordionComponent } from './components/accordions/radio-button-accordion/radio-button-accordion.component';
 import { AddNoteComponent } from './components/add-note/add-note.component';
 import { AutoSuggestComponent } from './components/auto-suggest/auto-suggest.component';
 import { BackLinkComponent } from './components/back-link/back-link.component';
@@ -46,66 +37,44 @@ import { CharacterCountComponent } from './components/character-count/character-
 import { AboutTheDataLinkComponent } from './components/data-area-tab/about-the-data-link/about-the-data-link.component';
 import { DatePickerComponent } from './components/date-picker/date-picker.component';
 import { DetailsComponent } from './components/details/details.component';
-import {
-  ValidationErrorMessageComponent,
-} from './components/drag-and-drop/validation-error-message/validation-error-message.component';
+import { ValidationErrorMessageComponent } from './components/drag-and-drop/validation-error-message/validation-error-message.component';
 import { EligibilityIconComponent } from './components/eligibility-icon/eligibility-icon.component';
 import { ErrorSummaryComponent } from './components/error-summary/error-summary.component';
 import { InsetTextComponent } from './components/inset-text/inset-text.component';
-import {
-  LinkToParentCancelDialogComponent,
-} from './components/link-to-parent-cancel/link-to-parent-cancel-dialog.component';
-import {
-  LinkToParentRemoveDialogComponent,
-} from './components/link-to-parent-remove/link-to-parent-remove-dialog.component';
+import { LinkToParentCancelDialogComponent } from './components/link-to-parent-cancel/link-to-parent-cancel-dialog.component';
+import { LinkToParentRemoveDialogComponent } from './components/link-to-parent-remove/link-to-parent-remove-dialog.component';
 import { LinkToParentDialogComponent } from './components/link-to-parent/link-to-parent-dialog.component';
 import { LinkWithArrowComponent } from './components/link-with-arrow/link-with-arrow.component';
 import { MessagesComponent } from './components/messages/messages.component';
 import { MoveWorkplaceDialogComponent } from './components/move-workplace/move-workplace-dialog.component';
-import {
-  NavigateToWorkplaceDropdownComponent,
-} from './components/navigate-to-workplace-dropdown/navigate-to-workplace-dropdown.component';
+import { NavigateToWorkplaceDropdownComponent } from './components/navigate-to-workplace-dropdown/navigate-to-workplace-dropdown.component';
 import { NewBackLinkComponent } from './components/new-back-link/new-back-link.component';
 import { NewTabsComponent } from './components/new-tabs/new-tabs.component';
 import { WDFTabComponent } from './components/new-wdf-tabs/new-wdf-tab.component';
 import { WDFWorkplaceSummaryComponent } from './components/new-wdf-workplace-summary/wdf-workplace-summary.component';
 import { NewWorkplaceSummaryComponent } from './components/new-workplace-summary/workplace-summary.component';
 import { OtherLinksComponent } from './components/other-links/other-links.component';
-import {
-  OwnershipChangeMessageDialogComponent,
-} from './components/ownership-change-message/ownership-change-message-dialog.component';
+import { OwnershipChangeMessageDialogComponent } from './components/ownership-change-message/ownership-change-message-dialog.component';
 import { PageComponent } from './components/page/page.component';
 import { PaginationComponent } from './components/pagination/pagination.component';
 import { PanelComponent } from './components/panel/panel.component';
 import { PhaseBannerComponent } from './components/phase-banner/phase-banner.component';
 import { ProgressBarComponent } from './components/progress-bar/progress-bar.component';
 import { ProgressComponent } from './components/progress/progress.component';
-import {
-  RegistrationSubmitButtonsComponent,
-} from './components/registration-submit-buttons/registration-submit-buttons.component';
+import { RegistrationSubmitButtonsComponent } from './components/registration-submit-buttons/registration-submit-buttons.component';
 import { RejectRequestDialogComponent } from './components/reject-request-dialog/reject-request-dialog.component';
-import {
-  RemoveParentConfirmationComponent,
-} from './components/remove-parent-confirmation/remove-parent-confirmation.component';
+import { RemoveParentConfirmationComponent } from './components/remove-parent-confirmation/remove-parent-confirmation.component';
 import { ReviewCheckboxComponent } from './components/review-checkbox/review-checkbox.component';
 import { SearchInputComponent } from './components/search-input/search-input.component';
-import {
-  SelectUploadCertificateComponent,
-} from './components/select-upload-certificate/select-upload-certificate.component';
+import { SelectUploadCertificateComponent } from './components/select-upload-certificate/select-upload-certificate.component';
 import { SelectUploadFileComponent } from './components/select-upload-file/select-upload-file.component';
-import {
-  SelectWorkplaceDropdownFormComponent,
-} from './components/select-workplace-dropdown-form/select-workplace-dropdown-form.component';
-import {
-  SelectWorkplaceRadioButtonFormComponent,
-} from './components/select-workplace-radio-button-form/select-workplace-radio-button-form.component';
+import { SelectWorkplaceDropdownFormComponent } from './components/select-workplace-dropdown-form/select-workplace-dropdown-form.component';
+import { SelectWorkplaceRadioButtonFormComponent } from './components/select-workplace-radio-button-form/select-workplace-radio-button-form.component';
 import { SetDataPermissionDialogComponent } from './components/set-data-permission/set-data-permission-dialog.component';
 import { BasicRecordComponent } from './components/staff-record-summary/basic-record/basic-record.component';
 import { EmploymentComponent } from './components/staff-record-summary/employment/employment.component';
 import { PersonalDetailsComponent } from './components/staff-record-summary/personal-details/personal-details.component';
-import {
-  QualificationsAndTrainingComponent,
-} from './components/staff-record-summary/qualifications-and-training/qualifications-and-training.component';
+import { QualificationsAndTrainingComponent } from './components/staff-record-summary/qualifications-and-training/qualifications-and-training.component';
 import { StaffRecordSummaryComponent } from './components/staff-record-summary/staff-record-summary.component';
 import { StaffRecordsTabComponent } from './components/staff-records-tab/staff-records-tab.component';
 import { StaffSummaryComponent } from './components/staff-summary/staff-summary.component';
@@ -120,35 +89,21 @@ import { TabComponent } from './components/tabs/tab.component';
 import { TabsComponent } from './components/tabs/tabs.component';
 import { TotalStaffPanelComponent } from './components/total-staff-panel/total-staff-panel.component';
 import { TotalStaffComponent } from './components/total-staff/total-staff.component';
-import {
-  TrainingAndQualificationsCategoriesComponent,
-} from './components/training-and-qualifications-categories/training-and-qualifications-categories.component';
-import {
-  ViewTrainingComponent,
-} from './components/training-and-qualifications-categories/view-trainings/view-trainings.component';
-import {
-  TrainingAndQualificationsSummaryComponent,
-} from './components/training-and-qualifications-summary/training-and-qualifications-summary.component';
-import {
-  TrainingAndQualificationsTabComponent,
-} from './components/training-and-qualifications-tab/training-and-qualifications-tab.component';
+import { TrainingAndQualificationsCategoriesComponent } from './components/training-and-qualifications-categories/training-and-qualifications-categories.component';
+import { ViewTrainingComponent } from './components/training-and-qualifications-categories/view-trainings/view-trainings.component';
+import { TrainingAndQualificationsSummaryComponent } from './components/training-and-qualifications-summary/training-and-qualifications-summary.component';
+import { TrainingAndQualificationsTabComponent } from './components/training-and-qualifications-tab/training-and-qualifications-tab.component';
 import { TrainingInfoPanelComponent } from './components/training-info-panel/training-info-panel.component';
 import { TrainingLinkPanelComponent } from './components/training-link-panel/training-link-panel.component';
-import {
-  TrainingSelectViewPanelComponent,
-} from './components/training-select-view-panel/training-select-view-panel.component';
+import { TrainingSelectViewPanelComponent } from './components/training-select-view-panel/training-select-view-panel.component';
 import { UserAccountsSummaryComponent } from './components/user-accounts-summary/user-accounts-summary.component';
 import { UserFormComponent } from './components/user-form/user-form.component';
 import { UserTableComponent } from './components/users-table/user.table.component';
 import { WdfConfirmationPanelComponent } from './components/wdf-confirmation-panel/wdf-confirmation-panel.component';
 import { WdfFieldConfirmationComponent } from './components/wdf-field-confirmation/wdf-field-confirmation.component';
-import {
-  WdfStaffMismatchMessageComponent,
-} from './components/wdf-staff-mismatch-message/wdf-staff-mismatch-message.component';
+import { WdfStaffMismatchMessageComponent } from './components/wdf-staff-mismatch-message/wdf-staff-mismatch-message.component';
 import { WdfTabComponent } from './components/wdf-tab/wdf-tab.component';
-import {
-  WorkplaceContinueCancelButtonComponent,
-} from './components/workplace-continue-cancel-button.component/workplace-continue-cancel-button.component';
+import { WorkplaceContinueCancelButtonComponent } from './components/workplace-continue-cancel-button.component/workplace-continue-cancel-button.component';
 import { WorkplaceSubmitButtonComponent } from './components/workplace-submit-button/workplace-submit-button.component';
 import { WorkplaceSummaryComponent } from './components/workplace-summary/workplace-summary.component';
 import { FileValueAccessorDirective } from './form-controls/file-control-value-accessor';
@@ -248,6 +203,7 @@ import { WorkplacePermissionsBearerPipe } from './pipes/workplace-permissions-be
     WdfStaffMismatchMessageComponent,
     CheckCQCDetailsComponent,
     PageNotFoundComponent,
+    PageNoLongerAvailableComponent,
     ArticleListComponent,
     PageComponent,
     FirstErrorPipe,
@@ -368,6 +324,7 @@ import { WorkplacePermissionsBearerPipe } from './pipes/workplace-permissions-be
     MoveWorkplaceDialogComponent,
     CheckCQCDetailsComponent,
     PageNotFoundComponent,
+    PageNoLongerAvailableComponent,
     ArticleListComponent,
     PageComponent,
     FirstErrorPipe,

From 6020fab4652947488c02ca4c85229df74d1f00c4 Mon Sep 17 00:00:00 2001
From: Sabrina <sabrina.samuel@madetech.com>
Date: Thu, 19 Dec 2024 15:33:07 +0000
Subject: [PATCH 6/6] Addressing pr comments

---
 .../username-found/username-found.component.html                | 2 +-
 .../username-found/username-found.component.ts                  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/app/features/forgot-your-username-or-password/username-found/username-found.component.html b/frontend/src/app/features/forgot-your-username-or-password/username-found/username-found.component.html
index 8cab22b08b..59ecc0d729 100644
--- a/frontend/src/app/features/forgot-your-username-or-password/username-found/username-found.component.html
+++ b/frontend/src/app/features/forgot-your-username-or-password/username-found/username-found.component.html
@@ -3,7 +3,7 @@
     class="govuk-panel govuk-panel--gray govuk-util__align-left govuk-!-margin-top-1 govuk-!-padding-top-1 govuk-!-padding-bottom-5 govuk-!-padding-left-2 govuk-!-padding-right-0 panel"
     data-testid="panel"
   >
-    <h1 class="govuk-!-font-size-36 govuk-!-margin-top-4 govuk-!-margin-bottom-3">
+    <h1 class="govuk-heading-l govuk-!-margin-top-4 govuk-!-margin-bottom-3">
       <img
         class="govuk-!-margin-right-1 govuk-util__vertical-align-top govuk-!-margin-right-2 green-tick-icon"
         src="/assets/images/tick-icon.svg"
diff --git a/frontend/src/app/features/forgot-your-username-or-password/username-found/username-found.component.ts b/frontend/src/app/features/forgot-your-username-or-password/username-found/username-found.component.ts
index 6cfa91eced..7d5ea43b71 100644
--- a/frontend/src/app/features/forgot-your-username-or-password/username-found/username-found.component.ts
+++ b/frontend/src/app/features/forgot-your-username-or-password/username-found/username-found.component.ts
@@ -15,7 +15,7 @@ export class UsernameFoundComponent implements OnInit {
 
   ngOnInit(): void {
     this.getUsernameFound();
-    this.isUsernameFound = this.username !== null ? true : false;
+    this.isUsernameFound = this.username !== null;
   }
 
   public getUsernameFound(): void {