oxen-io/session-desktop
1
0
Fork 0
mirror of https://github.com/oxen-io/session-desktop.git synced 2023-12-14 02:12:57 +01:00
Code Issues Projects Releases Wiki Activity

fix error with undefined message when searching

Browse source
This commit is contained in:
Audric Ackermann 2020-01-07 17:12:13 +11:00
parent 30a1e4da99
commit 4377737642
1 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
ts/state/ducks/search.ts
View file

@ -103,13 +103,14 @@ async function doSearch(
queryMessages(query),
]);
const { conversations, contacts } = discussions;
const filteredMessages = messages.filter(message => message !== undefined);
return {
query,
normalizedPhoneNumber: normalize(query, { regionCode }),
conversations,
contacts,
messages: getMessageProps(messages) || [],
messages: getMessageProps(filteredMessages) || [],
};
}
function clearSearch(): ClearSearchActionType {
@ -262,17 +263,23 @@ export function reducer(
if (action.type === 'SEARCH_RESULTS_FULFILLED') {
const { payload } = action;
const { query, messages } = payload;
const { query, messages, normalizedPhoneNumber, conversations, contacts } = payload;
// Reject if the associated query is not the most recent user-provided query
if (state.query !== query) {
return state;
}
const filteredMessage = messages.filter(message => message !== undefined);
return {
...state,
...payload,
messageLookup: makeLookup(messages, 'id'),
query,
normalizedPhoneNumber,
conversations,
contacts,
messages: filteredMessage,
messageLookup: makeLookup(filteredMessage, 'id'),
};
}