Issue/1787 unable to submit part2

[valllllll2000]

Before the PR (what is the issue or what needed to be done)

NA

The solution (Part 2)

After doing the changes for the issue #1787 I realized I needed to do a cleanup and refactor a bit. Replace some of the Rx Observables by coroutines cleanup some unused code

Screenshots (if appropriate)

NA

Reviewer Checklist

• [ ] Added an explanation about the work done
• [ ] Connected the PR and the issue on Zenhub
• [ ] Added a test plan to the issue
• [ ] Updated the copyright header
• [ ] Formatted the code per our style guide
• [ ] Added a documentation (if relevant)