Thanks for taking the time to open a PR!

• Create a Draft Pull Request if your PR is not ready for review. Mark the PR as Ready for Review when you're ready for a Cypress team member to review the PR.
• Become familiar with the Code Review Checklist for guidelines on coding standards and what needs to be done before a PR can be merged.

Test summary

18560 • 0 • 214 • 7 • 6

Run details

View run in Cypress Dashboard ➡️

Flakiness

	commands/net_stubbing_spec.ts		2
1	network stubbing > waiting and aliasing > can timeout waiting on a single request using "alias.request"
2	network stubbing > waiting and aliasing > can timeout waiting on a single request using "alias.request"
	commands/xhr_spec.js		1
1	... > no status when request isnt forced 404
	cypress/proxy-logging-spec.ts		2
1	Proxy Logging > request logging > xhr log has response body/status code
2	Proxy Logging > request logging > xhr log has response body/status code
This comment includes only the first 5 flaky tests. See all 6 flaky tests in the Cypress Dashboard.

This comment has been generated by cypress-bot as a result of this project's GitHub integration settings. You can manage this integration in this project's settings in the Cypress Dashboard

Before

After

Looks like some of the files from the unified branch made it into this PR - packages/app, packages/frontend-shared, etc.

Fixed. I've been having a weird issue where whenever I switch from unified-desktop-gui to a devlop-based branch, the unification work leaves behind a bunch of files. I usually manually remove them, but forgot this time (and then used git commit -a).

@BlueWinds I think this is due to the files being generated when you switch to unified - and being part of their .gitignore, but when switching back to develop, those generated files are still there but not part of develop's .gitignore. You could probably just add those files to the develop .gitignore so that you don't have to deal with this.