sergiodt
/
vn-verdnaturachat
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' into chore.migrate-redux-server-to-ts

This commit is contained in:
Gerzon Z 2022-01-20 11:06:54 -04:00 committed by GitHub
parent 89c844d798 e91bb90543
commit 06ba2d172b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/definitions/INotification.ts
View File

@ -9,4 +9,5 @@ export interface INotification {
from: string; from: string;
image: string; image: string;
soundname: string; soundname: string;
getData: () => INotification;
} }

5
app/notifications/push/index.ts
View File

@ -16,9 +16,10 @@ interface IEjson {
messageId: string; messageId: string;
} }
export const onNotification = (notification: INotification): void => { export const onNotification = (push: INotification): void => {
if (notification) { if (push) {
try { try {
const notification = push?.getData();
const { rid, name, sender, type, host, messageType, messageId }: IEjson = EJSON.parse(notification.ejson); const { rid, name, sender, type, host, messageType, messageId }: IEjson = EJSON.parse(notification.ejson);
const types: Record<string, string> = { const types: Record<string, string> = {

2
app/notifications/push/push.ios.ts
View File

@ -22,7 +22,7 @@ class PushNotification {
// TODO REDUX MIGRATION TO TS // TODO REDUX MIGRATION TO TS
const { background } = reduxStore.getState().app; const { background } = reduxStore.getState().app;
if (background) { if (background) {
this.onNotification(notification?.getData()); this.onNotification(notification);
} }
completion(); completion();
}); });

2
app/notifications/push/push.ts
View File

@ -16,7 +16,7 @@ class PushNotification {
}); });
NotificationsAndroid.setNotificationOpenedListener((notification: Notification) => { NotificationsAndroid.setNotificationOpenedListener((notification: Notification) => {
this.onNotification(notification?.getData()); this.onNotification(notification);
}); });
} }

2
app/utils/room.ts
View File

@ -60,6 +60,6 @@ export const getBadgeColor = ({
}; };
export const makeThreadName = (messageRecord: { id?: string; msg?: string; attachments?: IAttachment[] }): string | undefined => export const makeThreadName = (messageRecord: { id?: string; msg?: string; attachments?: IAttachment[] }): string | undefined =>
messageRecord.msg || messageRecord.attachments![0].title; messageRecord.msg || messageRecord?.attachments?.[0]?.title;
export const isTeamRoom = ({ teamId, joined }: { teamId: string; joined: boolean }): boolean => !!teamId && joined; export const isTeamRoom = ({ teamId, joined }: { teamId: string; joined: boolean }): boolean => !!teamId && joined;

2
app/views/ThreadMessagesView/index.tsx
View File

@ -284,7 +284,7 @@ class ThreadMessagesView extends React.Component<IThreadMessagesViewProps, IThre
if (update && update.length) { if (update && update.length) {
update = update.map(m => buildMessage(m)); update = update.map(m => buildMessage(m));
// filter threads // filter threads
threadsToCreate = update.filter(i1 => allThreadsRecords.find((i2: { id: string }) => i1._id === i2.id)); threadsToCreate = update.filter(i1 => !allThreadsRecords.find((i2: { id: string }) => i1._id === i2.id));
threadsToUpdate = allThreadsRecords.filter((i1: { id: string }) => update.find(i2 => i1.id === i2._id)); threadsToUpdate = allThreadsRecords.filter((i1: { id: string }) => update.find(i2 => i1.id === i2._id));
threadsToCreate = threadsToCreate.map(thread => threadsToCreate = threadsToCreate.map(thread =>
threadsCollection.prepareCreate( threadsCollection.prepareCreate(