Merge remote-tracking branch 'origin/develop' into develop
fix: show client info when pressing btn in stat
Merge branch 'feature-shop-on-click' into develop
Merge branch 'develop'