Updated modal viewmodel to typescript