IDEX-1323: rework to use DialogFactory