feat: say hello btn on new dm view (#18)

* feat: say hello btn on new dm view * fix: tokengated room
superhero-com · Dec 14, 2023 · 7fc46ec · 7fc46ec
1 parent 8c355c1
commit 7fc46ec
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 6 deletions.
diff --git a/res/themes/superhero/img/icons/tokengated-room.svg b/res/themes/superhero/img/icons/tokengated-room.svg
diff --git a/src/components/views/elements/RoomName.tsx b/src/components/views/elements/RoomName.tsx
@@ -33,10 +33,12 @@ export const RoomName = ({ room, children, maxLength }: IProps): JSX.Element =>
     const isVerifiedRoom = useVerifiedRoom(room);
 
     const roomUsers: string[] = useMemo(() => {
-        return (room as Room)
-            .getMembers()
-            .map((m) => m.userId)
-            .filter((userId) => !!userId && userId != (room as Room).myUserId);
+        return (
+            (room as Room)
+                ?.getMembers?.()
+                .map((m: { userId: string }) => m.userId)
+                .filter((userId: string) => !!userId && userId !== (room as Room)?.myUserId) || []
+        );
     }, [room]);
 
     const truncatedRoomName = useMemo(() => {

diff --git a/src/components/views/rooms/NewRoomIntro.tsx b/src/components/views/rooms/NewRoomIntro.tsx
@@ -69,6 +69,24 @@ const NewRoomIntro: React.FC = () => {
     const isLocalRoom = room instanceof LocalRoom;
     const dmPartner = isLocalRoom ? room.targets[0]?.userId : DMRoomMap.shared().getUserIdForRoomId(roomId);
 
+    const onSendHelloClick = (): void => {
+        if (!dmPartner) return;
+        cli.sendEvent(roomId, EventType.RoomMessage, {
+            body: "👋",
+            msgtype: "m.text",
+        });
+    };
+
+    const sendHelloButton = !room.getLastActiveTimestamp() && (
+        <AccessibleButton
+            kind="primary_outline"
+            onClick={onSendHelloClick}
+            style={{ marginTop: "5px", fontSize: "30px" }}
+        >
+            👋
+        </AccessibleButton>
+    );
+
     let body: JSX.Element;
     if (dmPartner) {
         const { shouldEncrypt: encryptedSingle3rdPartyInvite } = shouldEncryptRoomWithSingle3rdPartyInvite(room);
@@ -113,6 +131,7 @@ const NewRoomIntro: React.FC = () => {
                     )}
                 </p>
                 {caption && <p>{caption}</p>}
+                {sendHelloButton}
             </React.Fragment>
         );
     } else {
@@ -262,6 +281,7 @@ const NewRoomIntro: React.FC = () => {
                 </p>
                 <p>{topicText}</p>
                 {buttons}
+                {sendHelloButton}
             </React.Fragment>
         );
     }