feat: pr changes done

push-protocol · Oct 5, 2023 · 697c9fa · 697c9fa
1 parent a4aea50
commit 697c9fa
Show file tree

Hide file tree

Showing 8 changed files with 69 additions and 368 deletions.
diff --git a/packages/uiweb/src/lib/components/chat/CreateGroup/AddCriteria.tsx b/packages/uiweb/src/lib/components/chat/CreateGroup/AddCriteria.tsx
@@ -262,9 +262,7 @@ const AddCriteria = ({
     setQuantity({ ...quantity, value: e.target.value });
   };
 
-
   const verifyAndDoNext = ()=>{
-
     const _type = dropdownTypeValues[selectedTypeValue].value as 'PUSH' | 'GUILD'
     const category:string = _type === "PUSH" ? (dropdownCategoryValues[_type] as DropdownValueType[])[
       selectedCategoryValue
@@ -301,11 +299,10 @@ const AddCriteria = ({
         // GUILD type
         return {
           id:guildId,
-          role:specificRoleId,
           comparison:guildComparison,
+          role:guildComparison === 'specific' ? specificRoleId : "*",
         }
       }
-
     }
 
     const rule:Rule = {
@@ -315,9 +312,10 @@ const AddCriteria = ({
       data: getData(_type, category),
     }
 
-    // alert(JSON.stringify(rule))
     entryCriteria.addNewRule(rule)
 
+    // alert(`${JSON.stringify(rule)}`)
+
     if(handlePrevious){
       handlePrevious()
     }
@@ -364,19 +362,17 @@ const AddCriteria = ({
       }
     }else{
       // guild condition
+      alert(`${JSON.stringify(oldValue.data)}`)
       setGuildId((oldValue.data as GuildData).id)
       setSpecificRoleId((oldValue.data as GuildData).role)
-      setGuildComparison((oldValue.data as GuildData).comparison)
+      setGuildComparison((oldValue.data as GuildData).comparison) 
     }
 
     setSelectedTypeValue(
       dropdownTypeValues.findIndex(obj => obj.value === oldValue.type) 
     )
-
-
-    // TODO: reverse the form fill
    } 
-  },[0])
+  },[])
 
   return (
     <Section
@@ -502,12 +498,16 @@ const AddCriteria = ({
               setGuildComparison(newEl)}}
           />
 
-          <TextInput
-            labelName="Specific Role"
-            inputValue={specificRoleId}
-            onInputChange={(e: any) => setSpecificRoleId(e.target.value)}
-            placeholder="e.g. 4687"
-          />
+          {guildComparison === "specific" && 
+            <TextInput
+              labelName="Specific Role"
+              inputValue={specificRoleId}
+              onInputChange={(e: any) => setSpecificRoleId(e.target.value)}
+              placeholder="e.g. 4687"
+            />
+          }
+
+
         </>
       )}
       <Button width="197px" onClick={verifyAndDoNext}>

diff --git a/packages/uiweb/src/lib/components/chat/CreateGroup/CreateGroupType.tsx b/packages/uiweb/src/lib/components/chat/CreateGroup/CreateGroupType.tsx
@@ -10,9 +10,9 @@ import { GroupTypeState } from './CreateGroupModal';
 
 import { ThemeContext } from '../theme/ThemeProvider';
 import useToast from '../reusables/NewToast';
-import {ConditionType, CriteriaStateType, Rule, } from './Type'
-import { OPERATOR_OPTIONS, OPERATOR_OPTIONS_INFO } from '../constants';
+import {ConditionType, CriteriaStateType,} from './Type'
 import ConditionsComponent from './ConditionsComponent';
+import { OperatorContainer } from './OperatorContainer';
 
 const GROUP_TYPE_OPTIONS: Array<OptionDescription> = [
   {
@@ -84,28 +84,13 @@ const AddConditionSection = ({
 
       {/* todo - check later if this etire section can be optimised for define condtion page too */}
       <Section flexDirection="column" gap="16px">
-        <OptionButtons
-          options={OPERATOR_OPTIONS}
-          selectedValue={criteriaState.entryRootCondition}
-          handleClick={(newEl: string) => {
-            criteriaState.setEntryRootCondition(newEl as ConditionType);
-          }}
-        />
-        <Span fontSize="14px">
-          {
-            OPERATOR_OPTIONS_INFO[
-              criteriaState.entryRootCondition as keyof typeof OPERATOR_OPTIONS_INFO
-            ].head
-          }
-          <Span color={theme.textColor?.modalSubHeadingText}>
-            {' '}
-            {
-              OPERATOR_OPTIONS_INFO[
-                criteriaState.entryRootCondition as keyof typeof OPERATOR_OPTIONS_INFO
-              ].tail
-            }
-          </Span>
-        </Span>
+
+      <OperatorContainer 
+        operator={criteriaState.entryRootCondition} 
+        setOperator={(newEl: string) => {
+          criteriaState.setEntryRootCondition(newEl as ConditionType);
+        }}
+      />
 
       <ConditionsComponent 
         conditionData={[
@@ -204,7 +189,6 @@ export const CreateGroupType = ({
         selectedValue={groupEncryptionType}
         handleClick={(newEl: string) => {
           setGroupEncryptionType(newEl);
-          console.log('we called it');
         }}
       />
 
@@ -221,10 +205,6 @@ export const CreateGroupType = ({
             criteriaState={entryCriteria}
             handleNext={
               ()=>{
-                // add new condtion
-                // entryCriteria.
-
-
                 if(handleNext){
                   handleNext()
                 }

diff --git a/packages/uiweb/src/lib/components/chat/CreateGroup/Criteria.tsx b/packages/uiweb/src/lib/components/chat/CreateGroup/Criteria.tsx
diff --git a/packages/uiweb/src/lib/components/chat/CreateGroup/DefineCondition.tsx b/packages/uiweb/src/lib/components/chat/CreateGroup/DefineCondition.tsx
@@ -7,10 +7,11 @@ import { ModalHeaderProps } from './CreateGroupModal';
 import { ThemeContext } from '../theme/ThemeProvider';
 import { GatingRulesInformation } from './CreateGroupModal';
 import useMediaQuery from '../../../hooks/useMediaQuery';
-import OptionButtons from '../reusables/OptionButtons';
 import { device } from '../../../config';
-import { OPERATOR_OPTIONS, OPERATOR_OPTIONS_INFO } from '../constants';
+import { OPERATOR_OPTIONS_INFO } from '../constants';
 import ConditionsComponent from './ConditionsComponent';
+import { OperatorContainer } from './OperatorContainer';
+import { handleDefineCondition } from '../helpers/tokenGatedGroup';
 
 export const DefineCondtion = ({
   onClose,
@@ -33,17 +34,7 @@ export const DefineCondtion = ({
   const isMobile = useMediaQuery(device.mobileL);
 
   const verifyAndDoNext = ()=>{
-    if(entryCriteria.isCondtionUpdateEnabled()){
-      // handle update
-      entryCriteria.updateCondition()
-    }else{
-      // handle insertion
-      entryCriteria.addNewCondtion()
-    }
-
-    if(handlePrevious){
-      handlePrevious()
-    }
+    handleDefineCondition(entryCriteria, handlePrevious)
   }
 
   const getRules = ()=>{
@@ -53,6 +44,7 @@ export const DefineCondtion = ({
     ]
   }
 
+  // set state for edit condition
   useEffect(()=>{
     if(entryCriteria.isCondtionUpdateEnabled()){
       entryCriteria.setEntryRuleTypeCondition(
@@ -65,7 +57,7 @@ export const DefineCondtion = ({
         ])
       }
     }
-  },[0])
+  },[])
 
 
   return (
@@ -81,30 +73,12 @@ export const DefineCondtion = ({
       />
       {isCriteriaAdded && (
         <Section flexDirection="column" gap="16px">
-          <OptionButtons
-            options={OPERATOR_OPTIONS}
-            selectedValue={
-              entryCriteria.entryRuleTypeCondition
-            }
-            handleClick={(newEl: string) => {
+          <OperatorContainer 
+            operator={entryCriteria.entryRuleTypeCondition} 
+            setOperator={(newEl: string) => {
               entryCriteria.setEntryRuleTypeCondition(newEl as keyof typeof OPERATOR_OPTIONS_INFO);
             }}
           />
-          <Span fontSize="14px">
-            {
-              OPERATOR_OPTIONS_INFO[
-                entryCriteria.entryRuleTypeCondition as keyof typeof OPERATOR_OPTIONS_INFO
-              ].head
-            } 
-            <Span color={theme.textColor?.modalSubHeadingText}>
-              {' '}
-              {
-                OPERATOR_OPTIONS_INFO[
-                  entryCriteria.entryRuleTypeCondition as keyof typeof OPERATOR_OPTIONS_INFO
-                ].tail
-              }
-            </Span>
-          </Span>{' '}
           <ConditionsComponent
             conditionData={getRules()}
             deleteFunction={(idx)=>{