make blockled list number updates on unblock

pull/1308/head
Audric Ackermann 5 years ago
parent d108630f22
commit 4fbbbc26a4
No known key found for this signature in database
GPG Key ID: 999F434D76324AD4

@ -1563,6 +1563,9 @@
"unblockUser": { "unblockUser": {
"message": "Unblock User" "message": "Unblock User"
}, },
"unblocked": {
"message": "Unblocked"
},
"blockedSettingsTitle": { "blockedSettingsTitle": {
"message": "Blocked Users", "message": "Blocked Users",
"description": "Shown in the settings page as the heading for the blocked user settings" "description": "Shown in the settings page as the heading for the blocked user settings"

@ -600,22 +600,20 @@ export class SettingsView extends React.Component<SettingsViewProps, State> {
const blockedNumbers = BlockedNumberController.getBlockedNumbers(); const blockedNumbers = BlockedNumberController.getBlockedNumbers();
for (const blockedNumber of blockedNumbers) { for (const blockedNumber of blockedNumbers) {
let title: string;
let displayName = `User (...${blockedNumber.substr(-6)})`;
const currentModel = window.ConversationController.get(blockedNumber); const currentModel = window.ConversationController.get(blockedNumber);
if ( title =
currentModel && currentModel.getProfileName() ||
currentModel.attributes.profile && currentModel.getName() ||
currentModel.attributes.profile.displayName window.i18n('anonymous');
) {
displayName = currentModel.attributes.profile.displayName title = `${title} ${window.shortenPubkey(blockedNumber)}`;
}
results.push({ results.push({
id: blockedNumber, id: blockedNumber,
title: displayName, title,
description: blockedNumber, description: '',
type: SessionSettingType.Button, type: SessionSettingType.Button,
category: SessionSettingCategory.Blocked, category: SessionSettingCategory.Blocked,
content: { content: {
@ -624,7 +622,11 @@ export class SettingsView extends React.Component<SettingsViewProps, State> {
}, },
comparisonValue: undefined, comparisonValue: undefined,
setFn: async () => { setFn: async () => {
await BlockedNumberController.unblock(blockedNumber) await currentModel.unblock();
ToastUtils.push({
title: window.i18n('unblocked'),
id: 'unblocked',
});
}, },
hidden: false, hidden: false,
onClick: undefined, onClick: undefined,

Loading…
Cancel
Save