add modal resolve
fix loading for modal
Merge branch 'feature/modalResolve' into develop