From 7965b4e44a76028c7029b76f84011cbcf46c517b Mon Sep 17 00:00:00 2001 From: Brice-W Date: Tue, 3 Aug 2021 15:17:38 +1000 Subject: [PATCH 1/5] . is already present in the i18n label --- ts/components/conversation/GroupNotification.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ts/components/conversation/GroupNotification.tsx b/ts/components/conversation/GroupNotification.tsx index 09f1395cbe..0e7a33cc0d 100644 --- a/ts/components/conversation/GroupNotification.tsx +++ b/ts/components/conversation/GroupNotification.tsx @@ -48,7 +48,7 @@ function renderChange(change: PropsForGroupUpdateType) { const people = isTypeWithContact(change) ? getPeople(change) : []; switch (change.type) { case 'name': - return `${window.i18n('titleIsNow', [change.newName || ''])}.`; + return `${window.i18n('titleIsNow', [change.newName || ''])}`; case 'add': if (!change.contacts || !change.contacts.length) { throw new Error('Group update add is missing contacts'); From 9d7722fc7d04b5143d5d4c2d01bb9503eeb4bf22 Mon Sep 17 00:00:00 2001 From: Brice-W Date: Tue, 3 Aug 2021 15:18:25 +1000 Subject: [PATCH 2/5] don't display the name input box for public groups as they can't be modified atm --- .../conversation/UpdateGroupNameDialog.tsx | 27 ++++++++++--------- 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/ts/components/conversation/UpdateGroupNameDialog.tsx b/ts/components/conversation/UpdateGroupNameDialog.tsx index 5fda7e6939..32c97f1e72 100644 --- a/ts/components/conversation/UpdateGroupNameDialog.tsx +++ b/ts/components/conversation/UpdateGroupNameDialog.tsx @@ -99,18 +99,21 @@ export class UpdateGroupNameDialog extends React.Component { {this.renderAvatar()} - + {isAdmin ? ( + <> + + + ) : null}
From 8552afd2ca8741f70bd9bac196e2c1eda0375849 Mon Sep 17 00:00:00 2001 From: Warrick Corfe-Tan Date: Thu, 5 Aug 2021 15:14:04 +1000 Subject: [PATCH 3/5] Updating notification icons to match android icons. --- ts/components/ConversationListItem.tsx | 3 +-- ts/components/session/icon/Icons.tsx | 12 ++++++------ 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/ts/components/ConversationListItem.tsx b/ts/components/ConversationListItem.tsx index a9e9dfe9b3..b929517fe2 100644 --- a/ts/components/ConversationListItem.tsx +++ b/ts/components/ConversationListItem.tsx @@ -26,7 +26,6 @@ import { SessionIcon, SessionIconSize, SessionIconType } from './session/icon'; import { useSelector } from 'react-redux'; import { SectionType } from '../state/ducks/section'; import { getFocusedSection } from '../state/selectors/section'; -import { getFirstUnreadMessageIdInConversation } from '../data/data'; import { ConversationNotificationSettingType } from '../models/conversation'; // tslint:disable-next-line: no-empty-interface @@ -112,7 +111,7 @@ const HeaderItem = (props: { case 'mentions_only': return ( diff --git a/ts/components/session/icon/Icons.tsx b/ts/components/session/icon/Icons.tsx index e82f6866ea..4c4967d54e 100644 --- a/ts/components/session/icon/Icons.tsx +++ b/ts/components/session/icon/Icons.tsx @@ -1,7 +1,7 @@ export enum SessionIconType { AddUser = 'addUser', Arrow = 'arrow', - Bell = 'bell', + BellMention = 'bell', Caret = 'caret', ChatBubble = 'chatBubble', Check = 'check', @@ -82,10 +82,10 @@ export const icons = { viewBox: '0 -4 37 37', ratio: 1, }, - [SessionIconType.Bell]: { + [SessionIconType.BellMention]: { path: - 'M68.16 6.889c18.129 3.653 31.889 19.757 31.889 38.921 0 22.594-2.146 39.585 20.592 54.716H0c22.8-15.173 20.647-32.49 20.647-54.716 0-19.267 13.91-35.439 32.182-38.979 1.054-9.14 14.345-9.096 15.331.058zm8.551 102.301c-1.398 7.785-8.205 13.688-16.392 13.688s-14.992-5.902-16.393-13.688h32.785z', - viewBox: '0 0 120.641 122.878', + 'M2.117 0a.396.396 0 00-.397.397v.18C.963.757.53 1.434.53 2.25v1.323l-.53.53v.264h4.233V4.1l-.529-.53v-.223h-.29c-.066 0-.132-.006-.197-.015v.546l-2.159-.042V2.249c0-.656.4-1.19 1.059-1.19l.064.003c.119-.181.278-.334.463-.448a1.608 1.608 0 00-.13-.036v-.18A.396.396 0 002.117 0zm-.53 4.63a.53.53 0 001.058 0z M3.355.578a1.267 1.267 0 000 2.534h.634v-.254h-.634c-.55 0-1.013-.464-1.013-1.013 0-.55.463-1.014 1.013-1.014.55 0 1.014.464 1.014 1.014v.18c0 .1-.09.2-.19.2s-.19-.1-.19-.2v-.18a.634.634 0 10-.185.447.47.47 0 00.375.186c.25 0 .443-.203.443-.452v-.181c0-.7-.567-1.267-1.267-1.267zm0 1.647a.38.38 0 110-.76.38.38 0 010 .76z', + viewBox: '0 0 4.622 5.159', ratio: 1, }, [SessionIconType.Caret]: { @@ -224,8 +224,8 @@ export const icons = { }, [SessionIconType.Mute]: { path: - 'M7.02 28.81h28.65c.6 0 1.09.49 1.09 1.09v44.09L17.76 93H7c-3.85 0-7-3.15-7-7V35.83c0-3.86 3.16-7.02 7.02-7.02zM111.29 6.02l11.59 11.59-93.17 93.17-11.59-11.59 93.17-93.17zM42.33 27.67C59.03 18.51 75.73 9.35 92.42.19c1.6-.88 3.32 1.49 3.32 3.32v11.5L41.66 69.1V28.34c0-.37.35-.49.67-.67zm53.41 23.99v65.6c0 1.92-1.82 4.45-3.5 3.5L50.29 97.11l45.45-45.45z', - viewBox: '0 0 122.88 120.97', + 'M12,22c1.1,0 2,-0.9 2,-2h-4c0,1.1 0.9,2 2,2zM12,6.5c2.49,0 4,2.02 4,4.5v0.1l2,2L18,11c0,-3.07 -1.63,-5.64 -4.5,-6.32L13.5,4c0,-0.83 -0.67,-1.5 -1.5,-1.5s-1.5,0.67 -1.5,1.5v0.68c-0.24,0.06 -0.47,0.15 -0.69,0.23l1.64,1.64c0.18,-0.02 0.36,-0.05 0.55,-0.05zM5.41,3.35L4,4.76l2.81,2.81C6.29,8.57 6,9.74 6,11v5l-2,2v1h14.24l1.74,1.74 1.41,-1.41L5.41,3.35zM16,17L8,17v-6c0,-0.68 0.12,-1.32 0.34,-1.9L16,16.76L16,17z', + viewBox: '0 0 24 24', ratio: 1, }, [SessionIconType.Oxen]: { From a8596bc844b0724d3d8c476fd46725d9cdd2b619 Mon Sep 17 00:00:00 2001 From: Brice-W Date: Mon, 9 Aug 2021 10:22:10 +1000 Subject: [PATCH 4/5] clean --- ts/components/conversation/UpdateGroupNameDialog.tsx | 2 -- 1 file changed, 2 deletions(-) diff --git a/ts/components/conversation/UpdateGroupNameDialog.tsx b/ts/components/conversation/UpdateGroupNameDialog.tsx index 32c97f1e72..e0843c5a1a 100644 --- a/ts/components/conversation/UpdateGroupNameDialog.tsx +++ b/ts/components/conversation/UpdateGroupNameDialog.tsx @@ -100,7 +100,6 @@ export class UpdateGroupNameDialog extends React.Component { {isAdmin ? ( - <> { aria-required={true} autoFocus={true} /> - ) : null}
From 2f579d3c7deba2af1e504adf318ec939540f85ba Mon Sep 17 00:00:00 2001 From: Brice-W Date: Mon, 9 Aug 2021 10:28:26 +1000 Subject: [PATCH 5/5] lint --- .../conversation/UpdateGroupNameDialog.tsx | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/ts/components/conversation/UpdateGroupNameDialog.tsx b/ts/components/conversation/UpdateGroupNameDialog.tsx index e0843c5a1a..bd51f9845f 100644 --- a/ts/components/conversation/UpdateGroupNameDialog.tsx +++ b/ts/components/conversation/UpdateGroupNameDialog.tsx @@ -100,17 +100,17 @@ export class UpdateGroupNameDialog extends React.Component { {isAdmin ? ( - + ) : null}