From ec932320c884dfa1f5338cae8dcbcaf146c9d92f Mon Sep 17 00:00:00 2001 From: Alex Saunders Date: Thu, 3 Oct 2024 11:46:00 +0100 Subject: [PATCH 1/4] MLPAB-2496 update donor confirmed details design --- lang/cy.json | 3 +- lang/en.json | 3 +- .../donor/onelogin_identity_details.gohtml | 182 ++++++++++-------- 3 files changed, 109 insertions(+), 79 deletions(-) diff --git a/lang/cy.json b/lang/cy.json index 5187ad3d4a..cfded374fb 100644 --- a/lang/cy.json +++ b/lang/cy.json @@ -1402,5 +1402,6 @@ "iConfirmTheLpaWasSignedInMyPresence": "Welsh", "trustCorporationSignature": "Welsh", "replacementTrustCorporationSignature": "Welsh", - "defaultDecisionHasBeenSelected": "Welsh" + "defaultDecisionHasBeenSelected": "Welsh", + "youHaveSuccessfullyConfirmedYourIdentitySuccess": "

Welsh

Welsh

" } diff --git a/lang/en.json b/lang/en.json index 8021911e3b..013f84bb59 100644 --- a/lang/en.json +++ b/lang/en.json @@ -1331,5 +1331,6 @@ "iConfirmTheLpaWasSignedInMyPresence": "I confirm that the LPA was signed in my presence and that my name and address are correct.", "trustCorporationSignature": "Trust corporation signature", "replacementTrustCorporationSignature": "Replacement trust corporation signature", - "defaultDecisionHasBeenSelected": "A default decision has been selected for you because your answer was missing or your intention unclear." + "defaultDecisionHasBeenSelected": "A default decision has been selected for you because your answer was missing or your intention unclear.", + "youHaveSuccessfullyConfirmedYourIdentitySuccess": "

You have successfully confirmed your identity

Thank you for confirming your identity using GOV.UK One Login. Your details match those you entered in your LPA.

" } diff --git a/web/template/donor/onelogin_identity_details.gohtml b/web/template/donor/onelogin_identity_details.gohtml index a437a2461f..ed13695e9a 100644 --- a/web/template/donor/onelogin_identity_details.gohtml +++ b/web/template/donor/onelogin_identity_details.gohtml @@ -4,94 +4,122 @@ {{ tr .App "yourConfirmedIdentityDetails" }} {{ end }} -{{ define "main" }} - {{ $donor := .DonorProvided.Donor }} - {{ $userData := .DonorProvided.IdentityUserData }} - {{ $donorFullName := (printf "%s %s" $userData.FirstNames $userData.LastName) }} - -
-
- {{ if not .DetailsMatch }} - {{ template "warning-banner" (content .App "someDetailsDoNotMatchIdentityDetailsWarning") }} - {{ else if .DetailsUpdated }} - {{ template "notification-banner" (notificationBanner .App "success" (trHtml .App "yourLPADetailsHaveBeenUpdatedToMatchIdentitySuccess") "success" "heading") }} - {{ end}} - -

{{ tr .App "theDetailsOnYourLPA" }}

- -
-
-
{{ tr .App "firstNames" }}
-
{{ $donor.FirstNames }}
- {{ if not .FirstNamesMatch }} -
{{ tr .App "doesNotMatch" }}
- {{ end }} +{{ define "providedDetails" }} + {{ $donor := .DonorProvided.Donor }} + +

{{ tr .App "theDetailsOnYourLPA" }}

+ +
+
+
{{ tr .App "firstNames" }}
+
{{ $donor.FirstNames }}
+ {{ if not .FirstNamesMatch }} +
{{ tr .App "doesNotMatch" }} +
+ {{ end }}
-
-
{{ tr .App "lastName" }}
-
{{ $donor.LastName }}
- {{ if not .LastNameMatch }} -
{{ tr .App "doesNotMatch" }}
- {{ end}} +
+
{{ tr .App "lastName" }}
+
{{ $donor.LastName }}
+ {{ if not .LastNameMatch }} +
{{ tr .App "doesNotMatch" }} +
+ {{ end}}
-
-
{{ tr .App "dateOfBirth" }}
-
{{ (formatDate .App $donor.DateOfBirth) }}
- {{ if not .DateOfBirthMatch }} -
{{ tr .App "doesNotMatch" }}
- {{ end}} +
+
{{ tr .App "dateOfBirth" }}
+
{{ (formatDate .App $donor.DateOfBirth) }}
+ {{ if not .DateOfBirthMatch }} +
{{ tr .App "doesNotMatch" }} +
+ {{ end}}
-
-
{{ tr .App "address" }}
-
{{ template "address-lines" $donor.Address }}
- {{ if not .AddressMatch }} -
{{ tr .App "doesNotMatch" }}
- {{ end }} +
+
{{ tr .App "address" }}
+
{{ template "address-lines" $donor.Address }}
+ {{ if not .AddressMatch }} +
{{ tr .App "doesNotMatch" }} +
+ {{ end }}
-
+
+{{ end }} + +{{ define "identityDetails" }} + {{ $userData := .DonorProvided.IdentityUserData }} + {{ $donorFullName := (printf "%s %s" $userData.FirstNames $userData.LastName) }} -
+
-

{{ tr .App "confirmedIdentityDetails" }}

+

{{ tr .App "confirmedIdentityDetails" }}

-
- {{ template "summary-row" (summaryRow .App "firstNames" $userData.FirstNames "" $donorFullName false true ) }} +
+ {{ template "summary-row" (summaryRow .App "firstNames" $userData.FirstNames "" $donorFullName false true ) }} + + {{ template "summary-row" (summaryRow .App "lastName" $userData.LastName "" $donorFullName false true ) }} + + {{ template "summary-row" (summaryRow .App "dateOfBirth" (formatDate .App $userData.DateOfBirth) "" $donorFullName false true ) }} + + {{ template "address-summary-row" (summaryRow $.App "address" $userData.CurrentAddress "" $donorFullName false true ) }} +
+
+
+{{ end }} + +{{ define "main" }} +
+
+ {{ if .DetailsUpdated }} + {{ template "notification-banner" (notificationBanner .App "success" (trHtml .App "yourLPADetailsHaveBeenUpdatedToMatchIdentitySuccess") "success" "heading") }} + + {{ template "providedDetails" . }} + {{ template "identityDetails" . }} + {{ else if .DetailsMatch }} + {{ template "notification-banner" (notificationBanner .App "success" (trHtml .App "youHaveSuccessfullyConfirmedYourIdentitySuccess") "success" "contents" ) }} + + {{ template "identityDetails" . }} + {{ else if not .DetailsMatch }} + {{ template "warning-banner" (content .App "someDetailsDoNotMatchIdentityDetailsWarning") }} + + {{ template "providedDetails" . }} + {{ template "identityDetails" . }} + {{ end}} + +
+ {{ if not .DetailsMatch }} + {{ template "warning" (content .App "youCanOnlyContinueIfDetailsMatchWarning") }} + +
+
+ {{ tr .App "wouldYouLikeToUpdateDetailsToMatchIdentityDetails" }} - {{ template "summary-row" (summaryRow .App "lastName" $userData.LastName "" $donorFullName false true ) }} + {{ template "error-message" (errorMessage . .Form.FieldName) }} - {{ template "summary-row" (summaryRow .App "dateOfBirth" (formatDate .App $userData.DateOfBirth) "" $donorFullName false true ) }} + {{ template "radios" (items . .Form.FieldName .Form.YesNo.String + (item .Form.Options.Yes.String "yes" "hint" "updateMyLPADetailsToMatchIdentityHint") + (item .Form.Options.No.String "no" "hint" "iUnderstandThisWillWithdrawLPAHint") + ) }} +
+
+ {{ end }} - {{ template "address-summary-row" (summaryRow $.App "address" $userData.CurrentAddress "" $donorFullName false true ) }} - + {{ if not .DetailsUpdated }} + {{ template "buttons" (button .App "continue") }} + {{ else }} + {{ template "continue-button" . }} + {{ end }} + {{ template "csrf-field" . }} +
-
- -
- {{ if not .DetailsMatch }} - {{ template "warning" (content .App "youCanOnlyContinueIfDetailsMatchWarning") }} - -
-
- {{ tr .App "wouldYouLikeToUpdateDetailsToMatchIdentityDetails" }} - - {{ template "error-message" (errorMessage . .Form.FieldName) }} - - {{ template "radios" (items . .Form.FieldName .Form.YesNo.String - (item .Form.Options.Yes.String "yes" "hint" "updateMyLPADetailsToMatchIdentityHint") - (item .Form.Options.No.String "no" "hint" "iUnderstandThisWillWithdrawLPAHint") - ) }} -
-
- {{ end }} - - {{ if not .DetailsUpdated }} - {{ template "buttons" (button .App "continue") }} - {{ else }} - {{ template "continue-button" . }} - {{ end }} - {{ template "csrf-field" . }} -
-
{{ end }} From 58baa9172dcc38c578fb7f1d49c1dcb27b1d348a Mon Sep 17 00:00:00 2001 From: Alex Saunders Date: Thu, 3 Oct 2024 12:39:17 +0100 Subject: [PATCH 2/4] MLPAB-2496 add success banner to cp and voucher --- .../one_login_identity_details.go | 22 ++++++------ .../one_login_identity_details_test.go | 23 ++++++++++--- .../donorpage/one_login_identity_details.go | 6 ++-- .../one_login_identity_details_test.go | 2 +- lang/cy.json | 4 ++- lang/en.json | 4 ++- .../onelogin_identity_details.gohtml | 21 ++---------- .../donor/onelogin_identity_details.gohtml | 34 +++---------------- web/template/layout/identity-details.gohtml | 20 +++++++++++ .../voucher/one_login_identity_details.gohtml | 2 +- 10 files changed, 70 insertions(+), 68 deletions(-) create mode 100644 web/template/layout/identity-details.gohtml diff --git a/internal/certificateprovider/certificateproviderpage/one_login_identity_details.go b/internal/certificateprovider/certificateproviderpage/one_login_identity_details.go index 32ef6add55..af2abae16e 100644 --- a/internal/certificateprovider/certificateproviderpage/one_login_identity_details.go +++ b/internal/certificateprovider/certificateproviderpage/one_login_identity_details.go @@ -12,24 +12,26 @@ import ( ) type oneLoginIdentityDetailsData struct { - App appcontext.Data - Errors validation.List - CertificateProvider *certificateproviderdata.Provided + App appcontext.Data + Errors validation.List + Provided *certificateproviderdata.Provided + DonorFullName string } func OneLoginIdentityDetails(tmpl template.Template, certificateProviderStore CertificateProviderStore, lpaStoreResolvingService LpaStoreResolvingService) Handler { return func(appData appcontext.Data, w http.ResponseWriter, r *http.Request, certificateProvider *certificateproviderdata.Provided) error { + lpa, err := lpaStoreResolvingService.Get(r.Context()) + if err != nil { + return err + } + data := &oneLoginIdentityDetailsData{ - App: appData, - CertificateProvider: certificateProvider, + App: appData, + Provided: certificateProvider, + DonorFullName: lpa.Donor.FullName(), } if r.Method == http.MethodPost { - lpa, err := lpaStoreResolvingService.Get(r.Context()) - if err != nil { - return err - } - if certificateProvider.CertificateProviderIdentityConfirmed( lpa.CertificateProvider.FirstNames, lpa.CertificateProvider.LastName, diff --git a/internal/certificateprovider/certificateproviderpage/one_login_identity_details_test.go b/internal/certificateprovider/certificateproviderpage/one_login_identity_details_test.go index 21fbd0cdf9..07a1655ed4 100644 --- a/internal/certificateprovider/certificateproviderpage/one_login_identity_details_test.go +++ b/internal/certificateprovider/certificateproviderpage/one_login_identity_details_test.go @@ -24,15 +24,25 @@ func TestGetOneLoginIdentityDetails(t *testing.T) { LpaID: "lpa-id", } + lpaResolvingService := newMockLpaStoreResolvingService(t) + lpaResolvingService.EXPECT(). + Get(r.Context()). + Return(&lpadata.Lpa{ + LpaUID: "lpa-uid", + CertificateProvider: lpadata.CertificateProvider{FirstNames: "a", LastName: "b"}, + Donor: lpadata.Donor{FirstNames: "c", LastName: "d"}, + }, nil) + template := newMockTemplate(t) template.EXPECT(). Execute(w, &oneLoginIdentityDetailsData{ - App: testAppData, - CertificateProvider: certificateProvider, + App: testAppData, + Provided: certificateProvider, + DonorFullName: "c d", }). Return(nil) - err := OneLoginIdentityDetails(template.Execute, nil, nil)(testAppData, w, r, certificateProvider) + err := OneLoginIdentityDetails(template.Execute, nil, lpaResolvingService)(testAppData, w, r, certificateProvider) resp := w.Result() assert.Nil(t, err) @@ -43,12 +53,17 @@ func TestGetOneLoginIdentityDetailsWhenTemplateErrors(t *testing.T) { r := httptest.NewRequest(http.MethodGet, "/", nil) w := httptest.NewRecorder() + lpaResolvingService := newMockLpaStoreResolvingService(t) + lpaResolvingService.EXPECT(). + Get(mock.Anything). + Return(&lpadata.Lpa{}, nil) + template := newMockTemplate(t) template.EXPECT(). Execute(mock.Anything, mock.Anything). Return(expectedError) - err := OneLoginIdentityDetails(template.Execute, nil, nil)(testAppData, w, r, &certificateproviderdata.Provided{}) + err := OneLoginIdentityDetails(template.Execute, nil, lpaResolvingService)(testAppData, w, r, &certificateproviderdata.Provided{}) resp := w.Result() assert.Equal(t, expectedError, err) diff --git a/internal/donor/donorpage/one_login_identity_details.go b/internal/donor/donorpage/one_login_identity_details.go index cc6b400c81..caf86dfaae 100644 --- a/internal/donor/donorpage/one_login_identity_details.go +++ b/internal/donor/donorpage/one_login_identity_details.go @@ -10,13 +10,15 @@ import ( "github.com/ministryofjustice/opg-modernising-lpa/internal/donor" "github.com/ministryofjustice/opg-modernising-lpa/internal/donor/donordata" "github.com/ministryofjustice/opg-modernising-lpa/internal/form" + "github.com/ministryofjustice/opg-modernising-lpa/internal/identity" "github.com/ministryofjustice/opg-modernising-lpa/internal/validation" ) type oneLoginIdentityDetailsData struct { App appcontext.Data Errors validation.List - DonorProvided *donordata.Provided + Provided *donordata.Provided + IdentityUserData identity.UserData FirstNamesMatch bool LastNameMatch bool DateOfBirthMatch bool @@ -34,7 +36,7 @@ func OneLoginIdentityDetails(tmpl template.Template, donorStore DonorStore) Hand data := &oneLoginIdentityDetailsData{ App: appData, Form: form.NewYesNoForm(form.YesNoUnknown), - DonorProvided: provided, + Provided: provided, DetailsUpdated: r.FormValue("detailsUpdated") == "1", FirstNamesMatch: strings.EqualFold(provided.Donor.FirstNames, provided.IdentityUserData.FirstNames), LastNameMatch: strings.EqualFold(provided.Donor.LastName, provided.IdentityUserData.LastName), diff --git a/internal/donor/donorpage/one_login_identity_details_test.go b/internal/donor/donorpage/one_login_identity_details_test.go index f09431dc84..f8bbac995c 100644 --- a/internal/donor/donorpage/one_login_identity_details_test.go +++ b/internal/donor/donorpage/one_login_identity_details_test.go @@ -79,7 +79,7 @@ func TestGetOneLoginIdentityDetails(t *testing.T) { Execute(w, &oneLoginIdentityDetailsData{ App: testAppData, Form: form.NewYesNoForm(form.YesNoUnknown), - DonorProvided: tc.donorProvided, + Provided: tc.donorProvided, DetailsUpdated: tc.expectedDetailsUpdated, FirstNamesMatch: tc.expectedFirstNamesMatch, LastNameMatch: tc.expectedLastNameMatch, diff --git a/lang/cy.json b/lang/cy.json index cfded374fb..749b9bc3ff 100644 --- a/lang/cy.json +++ b/lang/cy.json @@ -1403,5 +1403,7 @@ "trustCorporationSignature": "Welsh", "replacementTrustCorporationSignature": "Welsh", "defaultDecisionHasBeenSelected": "Welsh", - "youHaveSuccessfullyConfirmedYourIdentitySuccess": "

Welsh

Welsh

" + "youHaveSuccessfullyConfirmedYourIdentitySuccess:donor": "

Welsh

Welsh

", + "youHaveSuccessfullyConfirmedYourIdentitySuccess:certificate-provider": "

Welsh

Welsh {{possessive .DonorFullName }} Welsh

", + "youHaveSuccessfullyConfirmedYourIdentitySuccess:voucher": "

Welsh

Welsh

" } diff --git a/lang/en.json b/lang/en.json index 013f84bb59..04d7e7b51c 100644 --- a/lang/en.json +++ b/lang/en.json @@ -1332,5 +1332,7 @@ "trustCorporationSignature": "Trust corporation signature", "replacementTrustCorporationSignature": "Replacement trust corporation signature", "defaultDecisionHasBeenSelected": "A default decision has been selected for you because your answer was missing or your intention unclear.", - "youHaveSuccessfullyConfirmedYourIdentitySuccess": "

You have successfully confirmed your identity

Thank you for confirming your identity using GOV.UK One Login. Your details match those you entered in your LPA.

" + "youHaveSuccessfullyConfirmedYourIdentitySuccess:donor": "

You have successfully confirmed your identity

Thank you for confirming your identity using GOV.UK One Login. Your details match those you entered in your LPA.

", + "youHaveSuccessfullyConfirmedYourIdentitySuccess:certificate-provider": "

You have successfully confirmed your identity

Thank you for confirming your identity using GOV.UK One Login. Your details match those entered in {{possessive .DonorFullName }} LPA.

", + "youHaveSuccessfullyConfirmedYourIdentitySuccess:voucher": "

You have successfully confirmed your identity

Thank you for confirming your identity using GOV.UK One Login.

" } diff --git a/web/template/certificateprovider/onelogin_identity_details.gohtml b/web/template/certificateprovider/onelogin_identity_details.gohtml index 44581a1150..edcae23951 100644 --- a/web/template/certificateprovider/onelogin_identity_details.gohtml +++ b/web/template/certificateprovider/onelogin_identity_details.gohtml @@ -7,26 +7,9 @@ {{ define "main" }}
-

{{ tr .App "yourIdentityConfirmedWithOneLogin" }}

+ {{ template "notification-banner" (notificationBanner .App "success" (trFormatHtml .App "youHaveSuccessfullyConfirmedYourIdentitySuccess:certificate-provider" "DonorFullName" .DonorFullName) "success" "contents" ) }} -
-
-
First Names
-
{{ .CertificateProvider.IdentityUserData.FirstNames }}
-
-
-
Last Name
-
{{ .CertificateProvider.IdentityUserData.LastName }}
-
-
-
Date of birth
-
{{ formatDate .App .CertificateProvider.IdentityUserData.DateOfBirth }}
-
-
-
Confirmed at
-
{{ formatDateTime .App .CertificateProvider.IdentityUserData.RetrievedAt }}
-
-
+ {{ template "identityDetails" . }}
{{ template "buttons" (button .App "continue") }} diff --git a/web/template/donor/onelogin_identity_details.gohtml b/web/template/donor/onelogin_identity_details.gohtml index ed13695e9a..abd9e478d4 100644 --- a/web/template/donor/onelogin_identity_details.gohtml +++ b/web/template/donor/onelogin_identity_details.gohtml @@ -5,15 +5,13 @@ {{ end }} {{ define "providedDetails" }} - {{ $donor := .DonorProvided.Donor }} -

{{ tr .App "theDetailsOnYourLPA" }}

{{ tr .App "firstNames" }}
-
{{ $donor.FirstNames }}
+
{{ .Provided.Donor.FirstNames }}
{{ if not .FirstNamesMatch }}
{{ tr .App "doesNotMatch" }} @@ -23,7 +21,7 @@
{{ tr .App "lastName" }}
-
{{ $donor.LastName }}
+
{{ .Provided.Donor.LastName }}
{{ if not .LastNameMatch }}
{{ tr .App "doesNotMatch" }} @@ -33,7 +31,7 @@
{{ tr .App "dateOfBirth" }}
-
{{ (formatDate .App $donor.DateOfBirth) }}
+
{{ (formatDate .App .Provided.Donor.DateOfBirth) }}
{{ if not .DateOfBirthMatch }}
{{ tr .App "doesNotMatch" }} @@ -43,7 +41,7 @@
{{ tr .App "address" }}
-
{{ template "address-lines" $donor.Address }}
+
{{ template "address-lines" .Provided.Donor.Address }}
{{ if not .AddressMatch }}
{{ tr .App "doesNotMatch" }} @@ -53,28 +51,6 @@
{{ end }} -{{ define "identityDetails" }} - {{ $userData := .DonorProvided.IdentityUserData }} - {{ $donorFullName := (printf "%s %s" $userData.FirstNames $userData.LastName) }} - -
-
-

{{ tr .App "confirmedIdentityDetails" }}

-
-
-
- {{ template "summary-row" (summaryRow .App "firstNames" $userData.FirstNames "" $donorFullName false true ) }} - - {{ template "summary-row" (summaryRow .App "lastName" $userData.LastName "" $donorFullName false true ) }} - - {{ template "summary-row" (summaryRow .App "dateOfBirth" (formatDate .App $userData.DateOfBirth) "" $donorFullName false true ) }} - - {{ template "address-summary-row" (summaryRow $.App "address" $userData.CurrentAddress "" $donorFullName false true ) }} -
-
-
-{{ end }} - {{ define "main" }}
@@ -84,7 +60,7 @@ {{ template "providedDetails" . }} {{ template "identityDetails" . }} {{ else if .DetailsMatch }} - {{ template "notification-banner" (notificationBanner .App "success" (trHtml .App "youHaveSuccessfullyConfirmedYourIdentitySuccess") "success" "contents" ) }} + {{ template "notification-banner" (notificationBanner .App "success" (trHtml .App "youHaveSuccessfullyConfirmedYourIdentitySuccess:donor") "success" "contents" ) }} {{ template "identityDetails" . }} {{ else if not .DetailsMatch }} diff --git a/web/template/layout/identity-details.gohtml b/web/template/layout/identity-details.gohtml new file mode 100644 index 0000000000..d546d5e4c6 --- /dev/null +++ b/web/template/layout/identity-details.gohtml @@ -0,0 +1,20 @@ +{{ define "identityDetails" }} + {{ $fullName := (printf "%s %s" .Provided.IdentityUserData.FirstNames .Provided.IdentityUserData.LastName) }} + +
+
+

{{ tr .App "confirmedIdentityDetails" }}

+
+
+
+ {{ template "summary-row" (summaryRow .App "firstNames" .Provided.IdentityUserData.FirstNames "" $fullName false true ) }} + + {{ template "summary-row" (summaryRow .App "lastName" .Provided.IdentityUserData.LastName "" $fullName false true ) }} + + {{ template "summary-row" (summaryRow .App "dateOfBirth" (formatDate .App .Provided.IdentityUserData.DateOfBirth) "" $fullName false true ) }} + + {{ template "address-summary-row" (summaryRow $.App "address" .Provided.IdentityUserData.CurrentAddress "" $fullName false true ) }} +
+
+
+{{ end }} diff --git a/web/template/voucher/one_login_identity_details.gohtml b/web/template/voucher/one_login_identity_details.gohtml index 6458dd1c17..db59a870db 100644 --- a/web/template/voucher/one_login_identity_details.gohtml +++ b/web/template/voucher/one_login_identity_details.gohtml @@ -7,7 +7,7 @@ {{ define "main" }}
-

{{ tr .App "yourIdentityConfirmedWithOneLogin" }}

+ {{ template "notification-banner" (notificationBanner .App "success" (trHtml .App "youHaveSuccessfullyConfirmedYourIdentitySuccess:voucher") "success" "contents" ) }}
{{ template "summary-row" (summaryRow .App "firstNames" From 314246cf23d68d8f113c5959daf254f7af84622d Mon Sep 17 00:00:00 2001 From: Alex Saunders Date: Thu, 3 Oct 2024 13:40:50 +0100 Subject: [PATCH 3/4] MLPAB-2496 drop unused data prop --- internal/donor/donorpage/one_login_identity_details.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/internal/donor/donorpage/one_login_identity_details.go b/internal/donor/donorpage/one_login_identity_details.go index caf86dfaae..7b275f678c 100644 --- a/internal/donor/donorpage/one_login_identity_details.go +++ b/internal/donor/donorpage/one_login_identity_details.go @@ -10,7 +10,6 @@ import ( "github.com/ministryofjustice/opg-modernising-lpa/internal/donor" "github.com/ministryofjustice/opg-modernising-lpa/internal/donor/donordata" "github.com/ministryofjustice/opg-modernising-lpa/internal/form" - "github.com/ministryofjustice/opg-modernising-lpa/internal/identity" "github.com/ministryofjustice/opg-modernising-lpa/internal/validation" ) @@ -18,7 +17,6 @@ type oneLoginIdentityDetailsData struct { App appcontext.Data Errors validation.List Provided *donordata.Provided - IdentityUserData identity.UserData FirstNamesMatch bool LastNameMatch bool DateOfBirthMatch bool From 3ee0421828d10be6c67e02b61627b184a50f7bbf Mon Sep 17 00:00:00 2001 From: Alex Saunders Date: Thu, 3 Oct 2024 13:44:16 +0100 Subject: [PATCH 4/4] MLPAB-2496 fix card title --- lang/cy.json | 1 - lang/en.json | 1 - web/template/layout/identity-details.gohtml | 2 +- 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/lang/cy.json b/lang/cy.json index 749b9bc3ff..c8d24dd677 100644 --- a/lang/cy.json +++ b/lang/cy.json @@ -1263,7 +1263,6 @@ "theDetailsOnYourLPA": "Welsh", "someDetailsDoNotMatchIdentityDetailsWarning": "Welsh", "yourLPADetailsHaveBeenUpdatedToMatchIdentitySuccess": "Welsh", - "confirmedIdentityDetails": "Welsh", "doesNotMatch": "Welsh", "updateMyLPADetailsToMatchIdentityHint": "Welsh", "iUnderstandThisWillWithdrawLPAHint": "Welsh", diff --git a/lang/en.json b/lang/en.json index 04d7e7b51c..9d277d783d 100644 --- a/lang/en.json +++ b/lang/en.json @@ -1192,7 +1192,6 @@ "theDetailsOnYourLPA": "The details on your LPA", "someDetailsDoNotMatchIdentityDetailsWarning": "Some of the details on your LPA do not match your confirmed identity details", "yourLPADetailsHaveBeenUpdatedToMatchIdentitySuccess": "Your LPA details have been updated to match your confirmed identity", - "confirmedIdentityDetails": "Confirmed identity details", "doesNotMatch": "Does not match", "updateMyLPADetailsToMatchIdentityHint": "Update my LPA details to match my confirmed identity details.", "iUnderstandThisWillWithdrawLPAHint": "I understand that this will withdraw my LPA and I will no longer be able to access it.", diff --git a/web/template/layout/identity-details.gohtml b/web/template/layout/identity-details.gohtml index d546d5e4c6..04020d64b3 100644 --- a/web/template/layout/identity-details.gohtml +++ b/web/template/layout/identity-details.gohtml @@ -3,7 +3,7 @@
-

{{ tr .App "confirmedIdentityDetails" }}

+

{{ tr .App "yourConfirmedIdentityDetails" }}