cypress flakes - few more fixes

[chakru-r]

Some more fixes assisted with claude for applying the recommendations from here and here Most of the changes are to break chains as recommended

[alwaysmeticulous[bot]]

✅ Meticulous spotted 0 visual differences across 1018 screens tested: view results.

Meticulous evaluated ~8 hours of user flows against your PR.

_{Expected differences? Click here. Last updated for commit c107471. This comment will update as new commits are pushed.}

[codecov[bot]]

Codecov Report

:white_check_mark: All modified and coverable lines are covered by tests. :white_check_mark: All tests successful. No failed tests found.

:loudspeaker: Thoughts on this report? Let us know!

[codecov[bot]]

Bundle Report

Bundle size has no change :white_check_mark: