mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Add required Message.id: string

Browse source
This commit is contained in:
Daniel Gasienica 2018-04-24 12:23:03 -04:00
parent dd7e51e697
commit fca8de16c8
3 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ts/components/conversation/media-gallery/AttachmentSection.tsx
View file

@ -59,7 +59,7 @@ export class AttachmentSection extends React.Component<Props, {}> {
case 'media':
return (
<MediaGridItem
key={message.received_at}
key={message.id}
message={message}
onClick={onClick}
/>
@ -67,7 +67,7 @@ export class AttachmentSection extends React.Component<Props, {}> {
case 'documents':
return (
<DocumentListItem
key={message.received_at}
key={message.id}
i18n={i18n}
fileSize={firstAttachment.size}
fileName={firstAttachment.fileName}

1
ts/components/conversation/media-gallery/propTypes/Message.tsx
View file

@ -11,6 +11,7 @@ import { MapAsync } from '../../../../types/MapAsync';
import { MIMEType } from '../../../../types/MIME';
export type Message = {
id: string;
attachments: Array<Attachment>;
received_at: number;
} & { objectURL?: string };

11
ts/test/components/media-gallery/groupMessagesByDate.ts
View file

@ -13,6 +13,7 @@ import {
import { Message } from '../../../components/conversation/media-gallery/propTypes/Message';
const toMessage = (date: Date): Message => ({
id: date.toUTCString(),
received_at: date.getTime(),
attachments: [],
});
@ -43,10 +44,12 @@ describe('groupMessagesByDate', () => {
type: 'today',
messages: [
{
id: 'Thu, 12 Apr 2018 12:00:00 GMT',
received_at: 1523534400000,
attachments: [],
},
{
id: 'Thu, 12 Apr 2018 00:01:00 GMT',
received_at: 1523491260000,
attachments: [],
},
@ -56,6 +59,7 @@ describe('groupMessagesByDate', () => {
type: 'yesterday',
messages: [
{
id: 'Wed, 11 Apr 2018 23:59:00 GMT',
received_at: 1523491140000,
attachments: [],
},
@ -65,6 +69,7 @@ describe('groupMessagesByDate', () => {
type: 'thisWeek',
messages: [
{
id: 'Mon, 09 Apr 2018 00:01:00 GMT',
received_at: 1523232060000,
attachments: [],
},
@ -74,10 +79,12 @@ describe('groupMessagesByDate', () => {
type: 'thisMonth',
messages: [
{
id: 'Sun, 08 Apr 2018 23:59:00 GMT',
received_at: 1523231940000,
attachments: [],
},
{
id: 'Sun, 01 Apr 2018 00:01:00 GMT',
received_at: 1522540860000,
attachments: [],
},
@ -89,10 +96,12 @@ describe('groupMessagesByDate', () => {
month: 2,
messages: [
{
id: 'Sat, 31 Mar 2018 23:59:00 GMT',
received_at: 1522540740000,
attachments: [],
},
{
id: 'Thu, 01 Mar 2018 14:00:00 GMT',
received_at: 1519912800000,
attachments: [],
},
@ -104,10 +113,12 @@ describe('groupMessagesByDate', () => {
month: 1,
messages: [
{
id: 'Mon, 28 Feb 2011 23:59:00 GMT',
received_at: 1298937540000,
attachments: [],
},
{
id: 'Tue, 01 Feb 2011 10:00:00 GMT',
received_at: 1296554400000,
attachments: [],
},