--

src/pages/IntegrationsPage/IntegrationsModal/AmoCRMModal.tsx

@@ -219,6 +219,9 @@ console.log("delete id ", openDelete.id )
     }
 
     selectedCurrentFields.forEach((e) => {
+
+      //e.id Field id
+      //e.subtitle FC "id"
       FieldsRule.Contact.ContactRuleMap[e.subTitle] = Number(e.id)
     })
     
@@ -230,14 +233,14 @@ console.log("delete id ", openDelete.id )
 
     console.log(body)
 
-    if (firstRules) {
-      setIntegrationRules(quiz.backendId.toString(), body);
-    } else {
-      updateIntegrationRules(quiz.backendId.toString(), body);
-    }
+    // if (firstRules) {
+    //   setIntegrationRules(quiz.backendId.toString(), body);
+    // } else {
+    //   updateIntegrationRules(quiz.backendId.toString(), body);
+    // }
 
-     handleCloseModal();
-     setStep(1);
+    //  handleCloseModal();
+    //  setStep(1);
   };
   const steps = useMemo(
     () => [

src/pages/IntegrationsPage/IntegrationsModal/AmoQuestions/AmoQuestions.tsx

@@ -57,10 +57,10 @@ export const AmoQuestions: FC<Props> = ({
       console.log(old)
       return (
         [...old, {
-          id: selectedQuestion,
+          id: selectedField,
           title: questionsItems.find(e => e.id === selectedQuestion)?.title,
           entity: activeScope,
-          subTitle: selectedField
+          subTitle: selectedQuestion
         }]
       )
     });

src/pages/IntegrationsPage/IntegrationsModal/AmoQuestions/EntitiesQuestions.tsx

@@ -83,8 +83,8 @@ export const EntitiesQuestions: FC<ItemsSelectionViewProps> = ({
         {
           isCurrentFields ?
             <CurrentFields
-              items={items}
-              fieldsItems={[...FieldsAllowedFC, ...fieldsItems].filter(e => e.entity === activeScope)}
+              items={activeScope === "Contact" ? [...FieldsAllowedFC, ...items] : items}
+              fieldsItems={fieldsItems.filter(e => e.entity === activeScope)}
               currentField={selectedField}
               currentQuestion={selectedItemId}
               setCurrentField={setSelectedField}