From a208f875fc1131e23653d42150d15540557c55f4 Mon Sep 17 00:00:00 2001
From: Paul Graham <paul.graham@coprime.co.uk>
Date: Fri, 27 Sep 2024 10:44:17 +0100
Subject: [PATCH 1/3] removed conditional logic so whichever choose they make
 they get the same response.

---
 .../Views/Pledges/ApplicationApproved.cshtml  | 36 +++++++++----------
 1 file changed, 16 insertions(+), 20 deletions(-)

diff --git a/src/SFA.DAS.LevyTransferMatching.Web/Views/Pledges/ApplicationApproved.cshtml b/src/SFA.DAS.LevyTransferMatching.Web/Views/Pledges/ApplicationApproved.cshtml
index 30ee0b95..780933c2 100644
--- a/src/SFA.DAS.LevyTransferMatching.Web/Views/Pledges/ApplicationApproved.cshtml
+++ b/src/SFA.DAS.LevyTransferMatching.Web/Views/Pledges/ApplicationApproved.cshtml
@@ -15,34 +15,30 @@
                     <div class="govuk-panel govuk-panel--confirmation pledge-approved">
                         <h1 class="govuk-panel__title">Application approved</h1>
                         <div class="govuk-panel__body">
-                            <strong>You approved the @Model.DasAccountName application</strong>
+                            <strong>You have approved @Model.DasAccountName (@Model.EncodedAccountId) application</strong>
                         </div>
                     </div>
 
-                    <h2 class="govuk-heading-m govuk-!-margin-top-2">What happens next</h2>
+                    <h2 class="govuk-heading-m govuk-!-margin-top-2">What happens next?</h2>
 
-                    @if (Model.AllowTransferRequestAutoApproval)
-                    {
-                        <p>We’ve let them know, so they can accept your funding pledge.</p>
+                    <p>We’ve let them know, so they can accept your funding pledge.</p>
 
-                        <p>You’ll receive a notification when <strong>@Model.DasAccountName</strong> accepts your pledge.</p>
-                    }
-                    else
-                    {
-                        <p>We've let them know, so they can accept your funding pledge.</p>
+                    <p>
+                        <strong>@Model.DasAccountName</strong> will have 6 weeks to accept the funds.
+                        Funds must be used within 3 months of acceptance or they will expire.
+                    </p>
 
-                        <p>You'll receive notifications when <strong>@Model.DasAccountName</strong>:</p>
+                    <p>You'll receive notifications when <strong>@Model.DasAccountName</strong>:</p>
 
-                        <ul class="govuk-list govuk-list--bullet">
-                            <li>accepts your pledge</li>
-                            <li>adds apprentices to their account</li>
-                        </ul>
+                    <ul class="govuk-list govuk-list--bullet">
+                        <li>accepts your pledge</li>
+                        <li>adds apprentices to their account</li>
+                    </ul>
 
-                        <div class="govuk-warning-text">
-                            <span class="govuk-warning-text__icon" aria-hidden="true">!</span>
-                            <p class="govuk-warning-text__text">You'll need to approve the transfer when @Model.DasAccountName adds apprentices details to their account.</p>
-                        </div>
-                    }
+                    <div class="govuk-warning-text">
+                        <span class="govuk-warning-text__icon" aria-hidden="true">!</span>
+                        <p class="govuk-warning-text__text">You'll need to approve the transfer when @Model.DasAccountName adds apprentices details to their account.</p>
+                    </div>
 
                     <p><a href="@Url.Action("Applications", "Pledges", new { EncodedAccountId = Model.EncodedAccountId, EncodedPledgeId = Model.EncodedPledgeId })" class="govuk-link govuk-link--no-visited-state">View other applications</a></p>
                 </div>

From f51dbb7b503e74baecfec87ea93c78d8d9209992 Mon Sep 17 00:00:00 2001
From: ogrwill <will.ogrady@digital.education.gov.uk>
Date: Mon, 7 Oct 2024 12:43:43 +0100
Subject: [PATCH 2/3] updating content

---
 .../Views/Pledges/ApplicationApproved.cshtml      | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/SFA.DAS.LevyTransferMatching.Web/Views/Pledges/ApplicationApproved.cshtml b/src/SFA.DAS.LevyTransferMatching.Web/Views/Pledges/ApplicationApproved.cshtml
index 753ba37a..9a27fdc8 100644
--- a/src/SFA.DAS.LevyTransferMatching.Web/Views/Pledges/ApplicationApproved.cshtml
+++ b/src/SFA.DAS.LevyTransferMatching.Web/Views/Pledges/ApplicationApproved.cshtml
@@ -16,7 +16,7 @@
                     <div class="govuk-panel govuk-panel--confirmation pledge-approved">
                         <h1 class="govuk-panel__title">Application approved</h1>
                         <div class="govuk-panel__body">
-                            <strong>You have approved @Model.DasAccountName (@Model.EncodedAccountId) application</strong>
+                            You have approved <strong>@Model.DasAccountName (@Model.EncodedAccountId)</strong> application
                         </div>
                     </div>
 
@@ -36,11 +36,14 @@
                         <li>adds apprentices to their account</li>
                     </ul>
 
-                    <div class="govuk-warning-text">
-                        <span class="govuk-warning-text__icon" aria-hidden="true">!</span>
-                        <p class="govuk-warning-text__text">You'll need to approve the transfer when @Model.DasAccountName adds apprentices details to their account.</p>
-                    </div>
-
+                    @if (!Model.AllowTransferRequestAutoApproval)
+                    {
+                        <div class="govuk-warning-text">
+                            <span class="govuk-warning-text__icon" aria-hidden="true">!</span>
+                            <strong class="govuk-warning-text__text">You'll need to approve the transfer when @Model.DasAccountName adds apprentices details to their account.</strong>
+                        </div>
+                    }
+                 
                     <p><a href="@Url.Action("Applications", "Pledges", new { EncodedAccountId = Model.EncodedAccountId, EncodedPledgeId = Model.EncodedPledgeId })" class="govuk-link govuk-link--no-visited-state">View other applications</a></p>
                 </div>
             </div>

From de5829ca547eb04d6f72297ce4833920d7645715 Mon Sep 17 00:00:00 2001
From: ogrwill <will.ogrady@digital.education.gov.uk>
Date: Mon, 7 Oct 2024 15:14:19 +0100
Subject: [PATCH 3/3] correct typo

---
 .../Views/Pledges/ApplicationApproved.cshtml                    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/SFA.DAS.LevyTransferMatching.Web/Views/Pledges/ApplicationApproved.cshtml b/src/SFA.DAS.LevyTransferMatching.Web/Views/Pledges/ApplicationApproved.cshtml
index 9a27fdc8..4ecf4e54 100644
--- a/src/SFA.DAS.LevyTransferMatching.Web/Views/Pledges/ApplicationApproved.cshtml
+++ b/src/SFA.DAS.LevyTransferMatching.Web/Views/Pledges/ApplicationApproved.cshtml
@@ -29,7 +29,7 @@
                         Funds must be used within 3 months of acceptance or they will expire.
                     </p>
 
-                    <p>You'll receive notifications when <strong>@Model.DasAccountName</strong>:</p>
+                    <p>You'll receive notification when <strong>@Model.DasAccountName</strong>:</p>
 
                     <ul class="govuk-list govuk-list--bullet">
                         <li>accepts your pledge</li>