Join group option

packages/examples/sdk-frontend-react/src/app/ChatUITest/ChatViewComponent.tsx

@@ -17,11 +17,11 @@ const ChatViewComponentTest = () => {
       {/* <Loader show={isLoading} /> */}
     <ChatViewComponentCard>
 
-      <ChatViewComponent onClick={() => console.log("BOIIII RETURNNNSSSSS")} chatId='c2d544ad9d1efd5c5a593b143bf8232875c926cf28015564e70ad078b95f807e' limit={10}/>
+      <ChatViewComponent onClick={() => console.log("BOIIII RETURNNNSSSSS")} chatId='24b029b8e07e60291bf9d8c0c48ff993fa1e0a99105459f7404c425c92e91bac' limit={10}/>
       </ChatViewComponentCard>
     </div>
   );
-};
+}
 
 export default ChatViewComponentTest;
 

packages/uiweb/src/lib/components/chat/ChatViewBubble/ChatViewBubble.tsx

@@ -108,7 +108,7 @@ const MessageCard = ({
           margin="5px 0"
           alignSelf={position ? 'end' : 'start'}
           justifyContent="start"
-          maxWidth="80%"
+          maxWidth="86%"
           minWidth="71px"
           position="relative"
           width="fit-content"

packages/uiweb/src/lib/components/chat/ChatViewList/ChatViewList.tsx

@@ -201,9 +201,13 @@ export const ChatViewList: React.FC<IChatViewListProps> = (
   }, [messagesSinceLastConnection]);
 
   const scrollToBottom = (behavior?: string | null) => {
-    if (listInnerRef.current) {
-      listInnerRef.current.scrollTop = listInnerRef.current.scrollHeight;
-    }
+    setTimeout(()=>{
+      if (listInnerRef.current) {
+        listInnerRef.current.scrollTop = listInnerRef.current.scrollHeight +100000;
+        console.log(listInnerRef.current.scrollHeight +100000)
+      }
+    },0)
+
   };
 
   useEffect(()=>{

packages/uiweb/src/lib/components/chat/MessageInput/MessageInput.tsx

@@ -139,7 +139,7 @@ export const MessageInput: React.FC<MessageInputProps> = ({
         chatId: chatFeed?.groupInformation?.groupCreator || '',
         messageType: 'Text',
       });
-      if(sendTextMessage) {
+      if (sendTextMessage) {
         statusToast.showMessageToast({
           toastTitle: 'Success',
           toastMessage: 'Request sent successfully',
@@ -240,7 +240,11 @@ export const MessageInput: React.FC<MessageInputProps> = ({
         chatId,
         messageType: type as any,
       });
-      if (sendMessageResponse&&sendMessageResponse.includes('400')) {
+      if (
+        sendMessageResponse &&
+        typeof sendMessageResponse === 'string' &&
+        sendMessageResponse.includes('400')
+      ) {
         setAccessControl(chatId, true);
         setVerified(false);
         setVerificationSuccessfull(false);
@@ -289,23 +293,23 @@ export const MessageInput: React.FC<MessageInputProps> = ({
     if (Object.keys(chat || {}).length) {
       setChatFeed(chat as IFeeds);
     }
-  }
-  
+  };
+
   useEffect(() => {
     (async () => {
       if (
         Object.keys(acceptedRequestMessage || {}).length &&
         Object.keys(chatFeed || {}).length
       ) {
-       await updateChatFeed();
+        await updateChatFeed();
       }
     })();
   }, [acceptedRequestMessage]);
 
   useEffect(() => {
     (async () => {
       if (!account && !env) return;
-      if(account && env){
+      if (account && env) {
         const chat = await fetchChat({ chatId });
         if (Object.keys(chat || {}).length) setChatFeed(chat as IFeeds);
         else {
@@ -329,9 +333,6 @@ export const MessageInput: React.FC<MessageInputProps> = ({
           }
         }
       }
-
-
-
     })();
   }, [chatId, pgpPrivateKey, account, env]);
 
@@ -347,7 +348,10 @@ export const MessageInput: React.FC<MessageInputProps> = ({
       }
     });
 
-    if (chatFeed?.groupInformation?.rules) {
+    if (chatFeed?.groupInformation?.rules && 
+      (chatFeed?.groupInformation?.rules?.groupAccess ||
+      chatFeed?.groupInformation?.rules?.chat)
+    ) {
       setIsRules(true);
     }
   };

packages/uiweb/src/lib/hooks/chat/useApproveChatRequest.ts

@@ -9,7 +9,7 @@ interface ApproveChatParams {
 const useApproveChatRequest = () => {
   const [error, setError] = useState<string>();
   const [loading, setLoading] = useState<boolean>(false);
-  const { account, env,pgpPrivateKey } =useChatData();
+  const { account, env,pgpPrivateKey,signer } =useChatData();
   const approveChatRequest = useCallback(async (options:ApproveChatParams) => {
     const {
 
@@ -21,7 +21,8 @@ const useApproveChatRequest = () => {
         const response = await PushAPI.chat.approve({
           status: 'Approved',
           account: account,
-          senderAddress: chatId,            // receiver's address or chatId of a group
+          senderAddress: chatId, 
+          signer:signer,           // receiver's address or chatId of a group
           pgpPrivateKey:pgpPrivateKey,
           env: env,
         });
@@ -34,7 +35,7 @@ const useApproveChatRequest = () => {
         return;
       }
     },
-    []
+    [account,env,signer]
   );
 
   return { approveChatRequest, error, loading };

packages/uiweb/src/lib/hooks/chat/useFetchChat.ts

@@ -36,7 +36,7 @@ const useFetchChat = () => {
         setLoading(false);
       }
     },
-    [pgpPrivateKey,env]
+    [pgpPrivateKey,env,account]
   );
 
   return { fetchChat, error, loading };