From 17450bebdfbae5c02aea1d8d3563852d5c86b49b Mon Sep 17 00:00:00 2001 From: KlausMikhaelson Date: Tue, 26 Dec 2023 10:16:37 -0600 Subject: [PATCH] added chatprofile with video support in dapp --- package.json | 2 +- .../chat/w2wChat/chatBox/ChatBox.tsx | 81 +++++-------------- 2 files changed, 20 insertions(+), 63 deletions(-) diff --git a/package.json b/package.json index ad308fc6ce..7a8323b19e 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,7 @@ "@mui/material": "^5.5.0", "@pushprotocol/restapi": "1.4.45", "@pushprotocol/socket": "0.5.3", - "@pushprotocol/uiweb": "1.1.23", + "@pushprotocol/uiweb": "1.2.0", "@reduxjs/toolkit": "^1.7.1", "@testing-library/dom": "^9.0.1", "@testing-library/jest-dom": "^4.2.4", diff --git a/src/components/chat/w2wChat/chatBox/ChatBox.tsx b/src/components/chat/w2wChat/chatBox/ChatBox.tsx index a1dd9210cf..e641002035 100644 --- a/src/components/chat/w2wChat/chatBox/ChatBox.tsx +++ b/src/components/chat/w2wChat/chatBox/ChatBox.tsx @@ -15,7 +15,7 @@ import ScrollToBottom from 'react-scroll-to-bottom'; import { useClickAway } from 'react-use'; import styled, { useTheme } from 'styled-components'; import { produce } from 'immer'; -import { ChatViewList, MessageInput } from '@pushprotocol/uiweb'; +import { ChatProfile, ChatViewList, MessageInput } from '@pushprotocol/uiweb'; // Internal Components import { ReactComponent as Info } from 'assets/chat/group-chat/info.svg'; import { ReactComponent as InfoDark } from 'assets/chat/group-chat/infodark.svg'; @@ -248,48 +248,9 @@ const ChatBox = ({ showGroupInfoModal }): JSX.Element => { background={theme.default.bg} padding="6px" fontWeight="500" - zIndex="1" > - - { - setChat(null); - }} - > - - - - - - - - {getDisplayName()} - - - {/* Video call button */} - {!isGroup && ( - { src={videoCallIcon} /> - - )} - - {currentChat.groupInformation && ( - setShowGroupInfo(!showGroupInfo)}> - {theme.scheme == 'light' ? : } - {showGroupInfo && ( - { - showGroupInfoModal(); - setShowGroupInfo(false); - }} - ref={groupInfoRef} - > - {theme.scheme == 'light' ? : } - Group Info - - )} - + } style="Info" chatId={(currentChat?.did?.includes(":") ? currentChat?.did.split(":")[1] : currentChat?.did) || currentChat?.groupInformation?.chatId} /> )} @@ -392,6 +335,21 @@ const MessageContainer = styled(ItemVV2)` // margin: 0; width: 95%; height: 80%; + @media (max-height: 750px) { + height: 75%; + } + @media (max-height: 650px) { + height: 70%; + } + @media (max-height: 550px) { + height: 63%; + } + @media (max-height: 450px) { + height: 55%; + } + @media (max-height: 400px) { + height: 45%; + } // max-height: 20%; overflow-x: hidden; // overflow-y: scroll; @@ -626,7 +584,6 @@ const VideoCallButton = styled(ButtonV2)` max-width: 1.75rem; min-width: 1.75rem; background: none; - margin-right: 2rem; `; export default ChatBox;