[fix] fixed syntax errors in navigate and app
Merge remote-tracking branch 'origin/master'