feat: group msg fix (#765)

* feat: group msg fix * fix: minor changes --------- Co-authored-by: Monalisha Mishra <[email protected]>
push-protocol · Oct 10, 2023 · db0a47d · db0a47d
1 parent 356487f
commit db0a47d
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 25 deletions.
diff --git a/packages/uiweb/src/lib/components/chat/CreateGroup/CreateGroupModal.tsx b/packages/uiweb/src/lib/components/chat/CreateGroup/CreateGroupModal.tsx
@@ -71,9 +71,9 @@ export const CreateGroupModal: React.FC<CreateGroupModalProps> = ({
 
   const [groupInputDetails, setGroupInputDetails] =
     useState<GroupInputDetailsType>({
-      groupName: 'Push Group Chat',
-      groupDescription: 'This is the oficial group for Push Protocol',
-      groupImage: ProfilePicture,
+      groupName: '',
+      groupDescription: '',
+      groupImage: '',
     });
 
   const renderComponent = () => {
@@ -216,10 +216,10 @@ const CreateGroupDetail = ({
       }
 
       // verify description
-      if (!groupImage) {
-        showError("Group image can't be empty");
-        return;
-      }
+      // if (!groupImage) {
+      //   showError("Group image can't be empty");
+      //   return;
+      // }
     }
 
     if (handleNext) {

diff --git a/packages/uiweb/src/lib/components/chat/CreateGroup/CreateGroupType.tsx b/packages/uiweb/src/lib/components/chat/CreateGroup/CreateGroupType.tsx
@@ -24,6 +24,7 @@ import { GrouInfoType as GroupInfoType } from '../types';
 
 import { ACCESS_TYPE_TITLE } from '../constants';
 import { IChatTheme } from '../exportedTypes';
+import { ProfilePicture } from '../../../config';
 
 const GROUP_TYPE_OPTIONS: Array<OptionDescription> = [
   {
@@ -52,7 +53,6 @@ const AddConditionSection = ({
   criteriaState,
 }: AddConditionProps) => {
   const theme = useContext(ThemeContext);
-  //todo - dummy data to be removed after we get condition data
 
   const generateMapping = () => {
     return criteriaState.entryOptionsDataArray.map((rule, idx) => [
@@ -151,31 +151,41 @@ export const CreateGroupType = ({
   const { createGatedGroup, loading } = useCreateGatedGroup();
   const groupInfoToast = useToast();
 
+  const getEncryptionType = () =>{
+    if(groupEncryptionType === "encrypted"){
+      return false
+    }
+    return true
+  }
+
   const createGroupService = async () => {
-    // TODO:use actual data instead of dummy data
     const groupInfo:GroupInfoType = {
       groupName:groupInputDetails.groupName,
       groupDescription:groupInputDetails.groupDescription,
-      groupImage:groupInputDetails.groupImage,
-      isPublic: true //groupEncryptionType,
+      groupImage:groupInputDetails.groupImage || ProfilePicture,
+      isPublic: getEncryptionType(),
     };
-    const rules: any = criteriaStateManager.generateRule();
-    await createGatedGroup(groupInfo, rules);
-    groupInfoToast.showMessageToast({
-      toastTitle: 'Success',
-      toastMessage: 'Group created successfully',
-      toastType: 'SUCCESS',
-      getToastIcon: (size) => <MdCheckCircle size={size} color="green" />,
-    });
+    const rules: any = checked ? criteriaStateManager.generateRule() : {};
+    const isSuccess = await createGatedGroup(groupInfo, rules);
+    if(isSuccess === true){
+      groupInfoToast.showMessageToast({
+        toastTitle: 'Success',
+        toastMessage: 'Group created successfully',
+        toastType: 'SUCCESS',
+        getToastIcon: (size) => <MdCheckCircle size={size} color="green" />,
+      });
+    }else{
+      showError('Group creation failed'); 
+    }
+
     onClose();
   };
 
   const verifyAndCreateGroup = async () => {
-    // TODO:validate the fields
-    // if (groupEncryptionType.trim() === '') {
-    //   showError('Group encryption type is not selected');
-    //   return;
-    // }
+    if (groupEncryptionType.trim() === '') {
+      showError('Group encryption type is not selected');
+      return;
+    }
 
     await createGroupService();
   };

diff --git a/packages/uiweb/src/lib/hooks/chat/useCreateGatedGroup.ts b/packages/uiweb/src/lib/hooks/chat/useCreateGatedGroup.ts
@@ -29,10 +29,10 @@ export const useCreateGatedGroup = () => {
         if (!response) {
           return false;
         }
+        return true;
       } catch (error: Error | any) {
         setLoading(false);
         setError(error.message);
-        console.log(error);
         return error.message;
       }
     },