Fixed the date issue on the card view
Merge branch 'refs/heads/master' into prod