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

Use POJO instead of MessageModel in ConversationView quote logic

Browse source
This commit is contained in:
Evan Hahn 2021-06-22 18:16:50 -05:00 • committed by GitHub
parent c9b1ce6655
commit 6b2dfeb9f5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 92 additions and 119 deletions
Download patch file Download diff file Expand all files Collapse all files

8
ts/models/conversations.ts
View file

@ -2831,7 +2831,13 @@ export class ConversationModel extends window.Backbone
return null;
}
return number.error || 'Invalid phone number';
let errorMessage: undefined | string;
if (number.error instanceof Error) {
errorMessage = number.error.message;
} else if (typeof number.error === 'string') {
errorMessage = number.error;
}
return errorMessage || 'Invalid phone number';
}
return null;