From 7e0d4dfa28292b9089926fa34422cae95469fd26 Mon Sep 17 00:00:00 2001 From: Konstantin Ullrich Date: Thu, 6 Aug 2020 08:25:17 +0200 Subject: [PATCH 1/2] Update ts/components/session/LeftPaneSettingSection.tsx Co-authored-by: Audric Ackermann --- ts/components/session/LeftPaneSettingSection.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ts/components/session/LeftPaneSettingSection.tsx b/ts/components/session/LeftPaneSettingSection.tsx index 1cfde2986..e4b90ac3f 100644 --- a/ts/components/session/LeftPaneSettingSection.tsx +++ b/ts/components/session/LeftPaneSettingSection.tsx @@ -215,7 +215,7 @@ export class LeftPaneSettingSection extends React.Component { { id: SessionSettingCategory.Blocked, title: window.i18n('settingsUnblockHeader'), - hidden: isSecondaryDevice, + hidden: false, }, { id: SessionSettingCategory.Permissions, From 46f447ef7c8d9210b2e4ccc731117505e573a57a Mon Sep 17 00:00:00 2001 From: Konstantin Ullrich Date: Thu, 6 Aug 2020 08:25:57 +0200 Subject: [PATCH 2/2] Update ts/components/session/settings/SessionSettings.tsx Co-authored-by: Audric Ackermann --- ts/components/session/settings/SessionSettings.tsx | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/ts/components/session/settings/SessionSettings.tsx b/ts/components/session/settings/SessionSettings.tsx index 1330664d8..0b7eeed8c 100644 --- a/ts/components/session/settings/SessionSettings.tsx +++ b/ts/components/session/settings/SessionSettings.tsx @@ -597,13 +597,12 @@ export class SettingsView extends React.Component { const model = window.getConversations(); for (const currentModel of model.models) { - let displayName = `User (...${currentModel.id.toString().substr(-6)})`; - - if (currentModel.attributes.profile && currentModel.attributes.profile.displayName) { - displayName = currentModel.attributes.profile.displayName - } - if(currentModel.isBlocked()) { + let displayName = `User (...${currentModel.id.toString().substr(-6)})`; + + if (currentModel.attributes.profile && currentModel.attributes.profile.displayName) { + displayName = currentModel.attributes.profile.displayName + } results.push({ id: currentModel.id, title: displayName,