common case change to new logic
Merge branch 'prelive' of https://github.com/Chatshop/chatshop-web into prelive