fixed infiinite scroll bug
Merge branch 'chore/infinite_scroll' into dev