Some great work has been done to refactor some of the complex logic with modals in returns.tt ( Bug 38842 ). Now we should cover all of that with Cypress tests.