Slave unlinking & FR dup fix

pull/1118/head
Vincent 6 years ago
parent 3f650a1d15
commit a5b1101216

@ -1366,10 +1366,10 @@
Whisper.events.on('deviceUnpairingRequested', async (pubKey, callback) => { Whisper.events.on('deviceUnpairingRequested', async (pubKey, callback) => {
const isSecondaryDevice = !!textsecure.storage.get('isSecondaryDevice'); const isSecondaryDevice = !!textsecure.storage.get('isSecondaryDevice');
if (isSecondaryDevice){ if (isSecondaryDevice) {
return; return;
} }
await libloki.storage.removePairingAuthorisationForSecondaryPubKey( await libloki.storage.removePairingAuthorisationForSecondaryPubKey(
pubKey pubKey
); );

@ -321,9 +321,10 @@ export class LeftPaneContactSection extends React.Component<Props, State> {
private renderList() { private renderList() {
const { sentFriendsRequest } = this.props; const { sentFriendsRequest } = this.props;
const visibleFriendRequests = sentFriendsRequest.filter(device => !device.isSecondary);
const friends = window.getFriendsFromContacts(this.props.friends); const friends = window.getFriendsFromContacts(this.props.friends);
const length = Number(sentFriendsRequest.length) + Number(friends.length); const length = Number(sentFriendsRequest.length) + Number(friends.length);
const combined = [...sentFriendsRequest, ...friends]; const combined = [...visibleFriendRequests, ...friends];
const list = ( const list = (
<div className="module-left-pane__list" key={0}> <div className="module-left-pane__list" key={0}>

Loading…
Cancel
Save