Fix proposal button callback merge conflict
Fix proposal button callback merge conflict

ahjo-dashboard/dashboard-ui,ahjo-dashboard/dashboard-ui,evidentti/dashboard-ui,tkenakka/dashboard-ui,evidentti/dashboard-ui,tkenakka/dashboard-ui