diff --git a/js/background.js b/js/background.js index ddfa0a38e..0b811f59d 100644 --- a/js/background.js +++ b/js/background.js @@ -1366,10 +1366,10 @@ Whisper.events.on('deviceUnpairingRequested', async (pubKey, callback) => { const isSecondaryDevice = !!textsecure.storage.get('isSecondaryDevice'); - if (isSecondaryDevice){ + if (isSecondaryDevice) { return; } - + await libloki.storage.removePairingAuthorisationForSecondaryPubKey( pubKey ); diff --git a/ts/components/session/LeftPaneContactSection.tsx b/ts/components/session/LeftPaneContactSection.tsx index dd2ae21df..02ab2384f 100644 --- a/ts/components/session/LeftPaneContactSection.tsx +++ b/ts/components/session/LeftPaneContactSection.tsx @@ -321,9 +321,10 @@ export class LeftPaneContactSection extends React.Component { private renderList() { const { sentFriendsRequest } = this.props; + const visibleFriendRequests = sentFriendsRequest.filter(device => !device.isSecondary); const friends = window.getFriendsFromContacts(this.props.friends); const length = Number(sentFriendsRequest.length) + Number(friends.length); - const combined = [...sentFriendsRequest, ...friends]; + const combined = [...visibleFriendRequests, ...friends]; const list = (