fix(ui): Pre-release bug fix 2

[sdisalvo-crd]

Description

Fixing bugs documented in the ticket linked below.

Checklist before requesting a review

Issue ticket number and link

• This PR has a valid ticket number or issue: DTIS-1311

Testing & Validation

• This PR has been tested/validated in IOS, Android and browser.
• The code has been tested locally with test coverage match expectations.
• Added new Unit/Component testing (if relevant).

Security

• No secrets are being committed (i.e. credentials, PII)
• This PR does not have any significant security implications

Code Review

• There is no unused functionality or blocks of commented out code (otherwise, please explain below)
• In addition to this PR, all relevant documentation (e.g. Confluence) and architecture diagrams (e.g. Miro) were updated

Design Review

• If this PR contains changes to the UI, it has gone through a design review with UX Designer or Product owner.
• In case PR contains changes to the UI, add some screenshots to notice the differences

---