use on listener instead of click
Merge branch '1029-participants_errors' into staging