From 14f6d9e79feb900518286c5f9a2e214126691974 Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Thu, 10 Sep 2020 13:48:28 -0600 Subject: [PATCH 1/3] [Release] Show verification status in the room summary card https://github.com/matrix-org/matrix-react-sdk/pull/5195 to release - see https://github.com/matrix-org/matrix-react-sdk/pull/5195 for details. --- .../views/right_panel/_RoomSummaryCard.scss | 18 ++++++++++++++++-- .../views/right_panel/RoomSummaryCard.tsx | 12 +++++++++++- 2 files changed, 27 insertions(+), 3 deletions(-) diff --git a/res/css/views/right_panel/_RoomSummaryCard.scss b/res/css/views/right_panel/_RoomSummaryCard.scss index 78324c5e89..0031d3a64c 100644 --- a/res/css/views/right_panel/_RoomSummaryCard.scss +++ b/res/css/views/right_panel/_RoomSummaryCard.scss @@ -67,12 +67,26 @@ limitations under the License. } } - .mx_RoomSummaryCard_e2ee_secure { - background-color: #5abff2; + .mx_RoomSummaryCard_e2ee_normal { + background-color: #424446; &::before { mask-image: url('$(res)/img/e2e/normal.svg'); } } + + .mx_RoomSummaryCard_e2ee_verified { + background-color: #0dbd8b; + &::before { + mask-image: url('$(res)/img/e2e/verified.svg'); + } + } + + .mx_RoomSummaryCard_e2ee_warning { + background-color: #ff4b55; + &::before { + mask-image: url('$(res)/img/e2e/warning.svg'); + } + } } } diff --git a/src/components/views/right_panel/RoomSummaryCard.tsx b/src/components/views/right_panel/RoomSummaryCard.tsx index 9f803d1185..dd4c281090 100644 --- a/src/components/views/right_panel/RoomSummaryCard.tsx +++ b/src/components/views/right_panel/RoomSummaryCard.tsx @@ -40,6 +40,7 @@ import TextWithTooltip from "../elements/TextWithTooltip"; import BaseAvatar from "../avatars/BaseAvatar"; import AccessibleTooltipButton from "../elements/AccessibleTooltipButton"; import WidgetStore, {IApp} from "../../../stores/WidgetStore"; +import { E2EStatus, shieldStatusForRoom } from "../../../utils/ShieldUtils"; interface IProps { room: Room; @@ -200,6 +201,13 @@ const RoomSummaryCard: React.FC = ({ room, onClose }) => { const isRoomEncrypted = useIsEncrypted(cli, room); + const [e2eStatus, setE2eStatus] = useState(); + useEffect(() => { + if (isRoomEncrypted) { + shieldStatusForRoom(cli, room).then(e => setE2eStatus(e)); + } + }); + const alias = room.getCanonicalAlias() || room.getAltAliases()[0] || ""; const header =
@@ -207,7 +215,9 @@ const RoomSummaryCard: React.FC = ({ room, onClose }) => {
From cd360ba92fbb0b8c7254aab71692bf72b78ec90c Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Thu, 10 Sep 2020 13:59:22 -0600 Subject: [PATCH 2/3] Fix for release --- src/components/views/right_panel/RoomSummaryCard.tsx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/components/views/right_panel/RoomSummaryCard.tsx b/src/components/views/right_panel/RoomSummaryCard.tsx index dd4c281090..e475b0486a 100644 --- a/src/components/views/right_panel/RoomSummaryCard.tsx +++ b/src/components/views/right_panel/RoomSummaryCard.tsx @@ -40,7 +40,7 @@ import TextWithTooltip from "../elements/TextWithTooltip"; import BaseAvatar from "../avatars/BaseAvatar"; import AccessibleTooltipButton from "../elements/AccessibleTooltipButton"; import WidgetStore, {IApp} from "../../../stores/WidgetStore"; -import { E2EStatus, shieldStatusForRoom } from "../../../utils/ShieldUtils"; +import { shieldStatusForRoom } from "../../../utils/ShieldUtils"; interface IProps { room: Room; @@ -201,7 +201,7 @@ const RoomSummaryCard: React.FC = ({ room, onClose }) => { const isRoomEncrypted = useIsEncrypted(cli, room); - const [e2eStatus, setE2eStatus] = useState(); + const [e2eStatus, setE2eStatus] = useState(); useEffect(() => { if (isRoomEncrypted) { shieldStatusForRoom(cli, room).then(e => setE2eStatus(e)); @@ -216,8 +216,8 @@ const RoomSummaryCard: React.FC = ({ room, onClose }) => { tooltip={isRoomEncrypted ? _t("Encrypted") : _t("Not encrypted")} class={classNames("mx_RoomSummaryCard_e2ee", { mx_RoomSummaryCard_e2ee_normal: isRoomEncrypted, - mx_RoomSummaryCard_e2ee_warning: isRoomEncrypted && e2eStatus === E2EStatus.Warning, - mx_RoomSummaryCard_e2ee_verified: isRoomEncrypted && e2eStatus === E2EStatus.Verified, + mx_RoomSummaryCard_e2ee_warning: isRoomEncrypted && e2eStatus === "warning", + mx_RoomSummaryCard_e2ee_verified: isRoomEncrypted && e2eStatus === "verified", })} /> From 652c0373806c1f6691f4338ae73f56fb3749190f Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Fri, 11 Sep 2020 09:06:17 -0600 Subject: [PATCH 3/3] Use hooks better (from develop) --- src/components/views/right_panel/RoomSummaryCard.tsx | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/src/components/views/right_panel/RoomSummaryCard.tsx b/src/components/views/right_panel/RoomSummaryCard.tsx index e475b0486a..39b255db8e 100644 --- a/src/components/views/right_panel/RoomSummaryCard.tsx +++ b/src/components/views/right_panel/RoomSummaryCard.tsx @@ -40,7 +40,7 @@ import TextWithTooltip from "../elements/TextWithTooltip"; import BaseAvatar from "../avatars/BaseAvatar"; import AccessibleTooltipButton from "../elements/AccessibleTooltipButton"; import WidgetStore, {IApp} from "../../../stores/WidgetStore"; -import { shieldStatusForRoom } from "../../../utils/ShieldUtils"; +import RoomContext from "../../../contexts/RoomContext"; interface IProps { room: Room; @@ -200,13 +200,8 @@ const RoomSummaryCard: React.FC = ({ room, onClose }) => { }; const isRoomEncrypted = useIsEncrypted(cli, room); - - const [e2eStatus, setE2eStatus] = useState(); - useEffect(() => { - if (isRoomEncrypted) { - shieldStatusForRoom(cli, room).then(e => setE2eStatus(e)); - } - }); + const roomContext = useContext(RoomContext); + const e2eStatus = roomContext['e2eStatus']; const alias = room.getCanonicalAlias() || room.getAltAliases()[0] || ""; const header =