Merge branch 'dev' into 'staging'

нет мусорки для настройки ветвления у предка файл

See merge request frontend/squiz!383

src/pages/Questions/Branching/BranchingModal/Settings.tsx

@@ -585,7 +585,7 @@ const TextInputsType = ({ parentQuestion, targetQuestion, ruleIndex, setParentQu
 const FileInputsType = ({ parentQuestion, targetQuestion, ruleIndex, setParentQuestion }: Props) => {
   const theme = useTheme();
   const quizId = Number(useParams().quizId);
-
+console.log(parentQuestion.type)
   return (
     <Box
       sx={{
@@ -614,7 +614,7 @@ const FileInputsType = ({ parentQuestion, targetQuestion, ruleIndex, setParentQu
             setParentQuestion(newParentQuestion);
           }}
         >
-          <DeleteIcon color={"#4D4D4D"} />
+          {!(parentQuestion.type === "file") && <DeleteIcon color={"#4D4D4D"} />}
         </IconButton>
       </Box>