DAR-2604: ui components code - fixing type hints