diff --git a/src/pages/IntegrationsPage/IntegrationsModal/AmoCRMModal.tsx b/src/pages/IntegrationsPage/IntegrationsModal/AmoCRMModal.tsx index ebe06dae..4b120218 100644 --- a/src/pages/IntegrationsPage/IntegrationsModal/AmoCRMModal.tsx +++ b/src/pages/IntegrationsPage/IntegrationsModal/AmoCRMModal.tsx @@ -1,5 +1,5 @@ import React, { FC, useCallback, useEffect, useMemo, useState } from "react"; -import { Dialog, IconButton, Typography, useMediaQuery, useTheme, Box } from "@mui/material"; +import {Dialog, IconButton, Typography, useMediaQuery, useTheme, Box, Skeleton} from "@mui/material"; import { useQuestions } from "@/stores/questions/hooks"; import { redirect } from "react-router-dom"; import { enqueueSnackbar } from "notistack"; @@ -73,7 +73,7 @@ export const AmoCRMModal: FC = ({ isModalOpen, handleClo const [openDelete, setOpenDelete] = useState(null); const { - isloadingPage, + isLoadingPage, firstRules, accountInfo, arrayOfPipelines, @@ -360,43 +360,56 @@ export const AmoCRMModal: FC = ({ isModalOpen, handleClo flexGrow: 1, }} > - setIsTryRemoveAccount(true)} - /> - {openDelete !== null ? ( - setOpenDelete(null)} - deleteItem={handleDeleteTagQuestion} - /> - ) : ( - <> - {isTryRemoveAccount && setIsTryRemoveAccount(false)} />} - {isSettingsBlock && ( - - : + <> + u.id === selectedDealUser)?.title || "не указан"} - selectedFunnel={arrayOfPipelines.find((p) => p.id === selectedPipeline)?.title || "нет данных"} - selectedStage={ - arrayOfPipelinesSteps.find((s) => s.id === selectedPipelineStep)?.title || "нет данных" - } - selectedQuestions={selectedQuestions} - selectedTags={selectedTags} - /> - - )} - {!isSettingsBlock && !isTryRemoveAccount && ( - {steps[step].component} - )} - - )} + startRemoveAccount={() => setIsTryRemoveAccount(true)} + /> + {openDelete !== null ? ( + setOpenDelete(null)} + deleteItem={handleDeleteTagQuestion} + /> + ) : ( + <> + {isTryRemoveAccount && setIsTryRemoveAccount(false)} />} + {isSettingsBlock && ( + + u.id === selectedDealUser)?.title || "не указан"} + selectedFunnel={arrayOfPipelines.find((p) => p.id === selectedPipeline)?.title || "нет данных"} + selectedStage={ + arrayOfPipelinesSteps.find((s) => s.id === selectedPipelineStep)?.title || "нет данных" + } + selectedQuestions={selectedQuestions} + selectedTags={selectedTags} + /> + + )} + {!isSettingsBlock && !isTryRemoveAccount && ( + {steps[step].component} + )} + + )} + + } + + ); diff --git a/src/pages/IntegrationsPage/IntegrationsModal/useAmoIntegration.ts b/src/pages/IntegrationsPage/IntegrationsModal/useAmoIntegration.ts index 2abf63fa..33340c31 100644 --- a/src/pages/IntegrationsPage/IntegrationsModal/useAmoIntegration.ts +++ b/src/pages/IntegrationsPage/IntegrationsModal/useAmoIntegration.ts @@ -21,7 +21,7 @@ interface Props { } export const useAmoIntegration = ({ isModalOpen, isTryRemoveAccount, quizID }: Props) => { - const [isloadingPage, setIsLoadingPage] = useState(true); + const [isLoadingPage, setIsLoadingPage] = useState(true); const [firstRules, setFirstRules] = useState(false); const [accountInfo, setAccountInfo] = useState(null); @@ -224,7 +224,7 @@ export const useAmoIntegration = ({ isModalOpen, isTryRemoveAccount, quizID }: P }, [pageOfTags]); return { - isloadingPage, + isLoadingPage, firstRules, accountInfo, arrayOfPipelines,