[Technical] Fix the TS 5 errors

[bobbykolev]

Description

As part of the TS5 upgrade, there were some errors left behind with the following comment: // @ts-ignore TS5UPGRADE

Acceptance criteria

• [ ] Fix all TS errors hidden behind the // @ts-ignore TS5UPGRADE comment
• [ ] …

Additional Context

Screen shots / UX designs / data that are relevant.

Areas that will be affected

To be added during the refinement