prefer else

ministryofjustice · Mar 21, 2024 · 671500e · 671500e
1 parent dfed08b
commit 671500e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/internal/page/app_data.go b/internal/page/app_data.go
@@ -32,7 +32,7 @@ type AppData struct {
 	LoggedInSupporterID  string
 	IsDonorPage          bool
 	LpaType              actor.LpaType
-	DonorName            string
+	DonorFullName        string
 }
 
 func (d AppData) Redirect(w http.ResponseWriter, r *http.Request, url string) error {

diff --git a/internal/page/donor/register.go b/internal/page/donor/register.go
@@ -460,7 +460,7 @@ func makeLpaHandle(mux *http.ServeMux, store SessionStore, errorHandler page.Err
 				appData.OrganisationName = loginSession.OrganisationName
 				appData.IsDonorPage = true
 				appData.LpaType = lpa.Type
-				appData.DonorName = lpa.Donor.FullName()
+				appData.DonorFullName = lpa.Donor.FullName()
 			}
 
 			if err := h(appData, w, r.WithContext(page.ContextWithAppData(ctx, appData)), lpa); err != nil {

diff --git a/web/template/layout/supporter-lpa-context.gohtml b/web/template/layout/supporter-lpa-context.gohtml
@@ -3,13 +3,12 @@
         <div class="app-supporter-lpa-context-banner">
             <div class="govuk-grid-row">
                 <div class="govuk-grid-column-two-thirds">
-                    {{ if and (not .App.DonorName) .App.LpaType.Empty }}
+                    {{ if and (not .App.DonorFullName) .App.LpaType.Empty }}
                         {{ trHtml .App "supporterLPAContextPrimer" }}
-                    {{ end }}
-
-                    {{ if .App.DonorName }}
+                    {{ else }}
                         <p class="app-supporter-lpa-context-banner__content">
-                            {{ tr .App "youAreDrafting" }} <span class="govuk-!-font-weight-bold">{{ .App.Localizer.Possessive .App.DonorName }} {{ if not .App.LpaType.Empty }}{{ tr .App .App.LpaType.String | lowerFirst }} {{ end }}</span>{{ tr .App "lpa" }}
+                            {{ $donorNamePossessive := .App.Localizer.Possessive .App.DonorFullName }}
+                            {{ tr .App "youAreDrafting" }} <span class="govuk-!-font-weight-bold">{{ $donorNamePossessive }} {{ if not .App.LpaType.Empty }} {{ lowerFirst (tr .App .App.LpaType.String) }} {{ end }}</span>{{ tr .App "lpa" }}
                         </p>
                     {{ end }}
                 </div>