Applied approval
Refactoring
Add state reception check
Merge branch 'apply_approval_flow_to_survey'