Domenic wrote:

The duplication between "user aborts the payment request" and "abort the update" made this hard... We should consider deduplicating those two algorithms though, if we can.

We should investigate if it's possible to de-dupe them.