[3130] Void declarations in the admin console by rwrrll · Pull Request #2251 · DFE-Digital/register-early-career-teachers-public

rwrrll · 2026-02-16T17:54:25Z

Context

https://github.com/DFE-Digital/register-ects-project-board/issues/3130

Changes proposed in this pull request

Add UI workflow to void declarations from the admin console, in addition to the existing API workflow
Minor refactor to API void workflow to share logic for finding a suitable clawback statement, API clients should not notice any difference at all

Guidance to review

github-actions · 2026-02-16T18:40:27Z

Review app deployed to https://cpd-ec2-review-2251-web.test.teacherservices.cloud

avinhurry

Just a few tiny nits inline, but otherwise this is well organised and nicely done!

avinhurry · 2026-02-17T19:15:30Z

app/views/admin/finance/voids/new.html.erb

+      <% end %>
+
+      <%= f.govuk_submit "Confirm void declaration", warning: true, class: "govuk-!-margin-top-6" %>
+    <% end %>


Do we want a "Cancel and return..." link here?

There is one in the ticket screenshot, but it's not there when I click through to the prototype, so looks like there was a decision to remove it.

app/forms/admin/finance/void_declaration_form.rb

avinhurry · 2026-02-17T19:38:43Z

app/helpers/declaration_helper.rb

+    text = if declaration.voided_by_user.present?
+             "Voided by #{declaration.voided_by_user.name} (#{declaration.voided_by_user.email})"
+           else
+             "Voided by lead provider"


Since the row is "Clawed back", should the caption read "Clawed back by..." instead of "Voided by..."?

At the moment the wording is inconsistent, it reads a bit off to me. Did you have any thoughts on that?

Yeah I had a similar thought 🤔 I can see the argument either way, but concluded that the verb/action/button the user took is to void the declaration, and clawback is something the system does in certain situations, but either way the declaration is still indeed voided. So since voided isn't wrong, IMO it's fine to defer to the design on this one.

spec/services/declarations/clawback_spec.rb

…ack" to "awaiting_clawback" The actual clawback occurs when the clawback statement is paid At this point we've attached a clawback to a clawback statement, but it hasn't happened yet

sonarqubecloud · 2026-02-19T15:39:07Z

Quality Gate passed

Issues
1 New issue
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube Cloud

github-actions · 2026-02-20T11:22:04Z

Review app for PR 2251 was deleted

rwrrll force-pushed the 3130-void-declarations-in-admin branch 3 times, most recently from ad927e0 to 19d383b Compare February 16, 2026 17:58

rwrrll temporarily deployed to review February 16, 2026 18:21 — with GitHub Actions Inactive

rwrrll force-pushed the 3130-void-declarations-in-admin branch from 19d383b to 91ef3ec Compare February 17, 2026 08:21

rwrrll had a problem deploying to review February 17, 2026 08:23 — with GitHub Actions Failure

rwrrll force-pushed the 3130-void-declarations-in-admin branch from 91ef3ec to 00241f6 Compare February 17, 2026 08:42

rwrrll had a problem deploying to review February 17, 2026 08:44 — with GitHub Actions Failure

rwrrll force-pushed the 3130-void-declarations-in-admin branch from 00241f6 to f448c48 Compare February 17, 2026 10:43

rwrrll temporarily deployed to review February 17, 2026 10:45 — with GitHub Actions Inactive

Push next_available_output_fee_statement into Declarations::Clawback

ae22f17

rwrrll force-pushed the 3130-void-declarations-in-admin branch from f448c48 to ec30c67 Compare February 17, 2026 10:52

rwrrll temporarily deployed to review February 17, 2026 10:54 — with GitHub Actions Inactive

rwrrll force-pushed the 3130-void-declarations-in-admin branch from ec30c67 to 3698036 Compare February 17, 2026 12:08

rwrrll temporarily deployed to review February 17, 2026 12:10 — with GitHub Actions Inactive

rwrrll force-pushed the 3130-void-declarations-in-admin branch from 3698036 to 14781c7 Compare February 17, 2026 13:02

rwrrll temporarily deployed to review February 17, 2026 13:04 — with GitHub Actions Inactive

rwrrll force-pushed the 3130-void-declarations-in-admin branch from 14781c7 to 10345ca Compare February 17, 2026 13:15

rwrrll temporarily deployed to review February 17, 2026 13:18 — with GitHub Actions Inactive

Implement admin void declaration flow

ab05ddd

rwrrll force-pushed the 3130-void-declarations-in-admin branch from 10345ca to ab05ddd Compare February 17, 2026 13:39

rwrrll temporarily deployed to review February 17, 2026 13:41 — with GitHub Actions Inactive

rwrrll marked this pull request as ready for review February 17, 2026 13:55

avinhurry approved these changes Feb 17, 2026

View reviewed changes

rwrrll force-pushed the 3130-void-declarations-in-admin branch from 5911222 to 6b27d01 Compare February 18, 2026 12:15

rwrrll temporarily deployed to review February 18, 2026 12:23 — with GitHub Actions Inactive

rwrrll added 2 commits February 18, 2026 16:54

Explicitly validate declaration status is voidable

bdc2eb9

Remove debug comment

4511520

rwrrll force-pushed the 3130-void-declarations-in-admin branch from 6b27d01 to 4511520 Compare February 18, 2026 16:54

rwrrll temporarily deployed to review February 18, 2026 16:56 — with GitHub Actions Inactive

Change the event recorded when a clawback is initiated from "clawed_b…

4fe407e

…ack" to "awaiting_clawback" The actual clawback occurs when the clawback statement is paid At this point we've attached a clawback to a clawback statement, but it hasn't happened yet

rwrrll temporarily deployed to review February 19, 2026 15:39 — with GitHub Actions Inactive

rwrrll added this pull request to the merge queue Feb 20, 2026

Merged via the queue into main with commit dbe6b1e Feb 20, 2026
28 checks passed

rwrrll deleted the 3130-void-declarations-in-admin branch February 20, 2026 11:20

rwrrll temporarily deployed to review February 20, 2026 11:20 — with GitHub Actions Inactive

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[3130] Void declarations in the admin console#2251

[3130] Void declarations in the admin console#2251
rwrrll merged 5 commits intomainfrom
3130-void-declarations-in-admin

rwrrll commented Feb 16, 2026 •

edited

Loading

Uh oh!

github-actions bot commented Feb 16, 2026

Uh oh!

avinhurry left a comment

Uh oh!

avinhurry Feb 17, 2026 •

edited

Loading

Uh oh!

rwrrll Feb 18, 2026

Uh oh!

Uh oh!

avinhurry Feb 17, 2026

Uh oh!

rwrrll Feb 18, 2026

Uh oh!

Uh oh!

sonarqubecloud bot commented Feb 19, 2026

Uh oh!

Uh oh!

github-actions bot commented Feb 20, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Comments

Conversation

rwrrll commented Feb 16, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Context

Changes proposed in this pull request

Guidance to review

Uh oh!

github-actions bot commented Feb 16, 2026

Uh oh!

avinhurry left a comment

Choose a reason for hiding this comment

Uh oh!

avinhurry Feb 17, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

rwrrll Feb 18, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

avinhurry Feb 17, 2026

Choose a reason for hiding this comment

Uh oh!

rwrrll Feb 18, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

sonarqubecloud bot commented Feb 19, 2026

Quality Gate passed

Uh oh!

Uh oh!

github-actions bot commented Feb 20, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Comments

rwrrll commented Feb 16, 2026 •

edited

Loading

avinhurry Feb 17, 2026 •

edited

Loading