Merge branch 'matilde/chat-timestamp' (#2146)

* origin/matilde/chat-timestamp:
  chat: correct datestamp to match @da

Signed-off-by: Jared Tobin <jared@tlon.io>
This commit is contained in:
Jared Tobin 2020-01-08 10:11:33 +08:00
commit 795b811aca
No known key found for this signature in database
GPG Key ID: 0E4647D58F8A69E4
3 changed files with 3 additions and 3 deletions

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -89,7 +89,7 @@ export class Message extends Component {
render() { render() {
const { props } = this; const { props } = this;
let pending = !!props.msg.pending ? ' o-40' : ''; let pending = !!props.msg.pending ? ' o-40' : '';
let datestamp = "~" + moment.unix(props.msg.when / 1000).format('YYYY.MM.D'); let datestamp = "~" + moment.unix(props.msg.when / 1000).format('YYYY.M.D');
let paddingTop = props.paddingTop ? {'paddingTop': '6px'} : ''; let paddingTop = props.paddingTop ? {'paddingTop': '6px'} : '';