Hot Fix merge conflicts (#523)

front/src/modules/comments/components/CommentThreadRelationPicker.tsx

@@ -231,6 +231,7 @@ export function CommentThreadRelationPicker({ commentThread }: OwnProps) {
               entitiesToSelect,
               filteredSelectedEntities,
               selectedEntities,
+              loading: false, // TODO implement skeleton loading
             }}
             onItemCheckChange={handleCheckItemChange}
             onSearchFilterChange={handleFilterChange}

front/src/modules/pipeline-progress/components/NewCompanyBoardCard.tsx

@@ -42,6 +42,7 @@ export function NewCompanyBoardCard({ onEntitySelect }: OwnProps) {
       entities={{
         entitiesToSelect: companies.entitiesToSelect,
         selectedEntity: companies.selectedEntities[0],
+        loading: companies.loading,
       }}
     />
   );

front/src/modules/relation-picker/components/MultipleEntitySelect.tsx

@@ -15,6 +15,7 @@ export type EntitiesForMultipleEntitySelect<
   selectedEntities: CustomEntityForSelect[];
   filteredSelectedEntities: CustomEntityForSelect[];
   entitiesToSelect: CustomEntityForSelect[];
+  loading: boolean;
 };
 
 export function MultipleEntitySelect<

front/src/modules/relation-picker/components/SingleEntitySelectBase.tsx

@@ -18,6 +18,7 @@ export type EntitiesForSingleEntitySelect<
 > = {
   selectedEntity: CustomEntityForSelect;
   entitiesToSelect: CustomEntityForSelect[];
+  loading: boolean;
 };
 
 export function SingleEntitySelectBase<

front/src/modules/relation-picker/components/skeletons/CompanyPickerSkeleton.tsx

@@ -20,12 +20,16 @@ export const SkeletonEntityName = styled.div`
 
 export function CompanyPickerSkeleton({ count }: OwnProps) {
   const loadSkeletons = Array(count).fill(1);
-  return loadSkeletons.map((_, i) => (
-    <SkeletonContainer key={i}>
-      <Skeleton width={15} height={15} />
-      <SkeletonEntityName>
-        <Skeleton height={8} />
-      </SkeletonEntityName>
-    </SkeletonContainer>
-  ));
+  return (
+    <>
+      {loadSkeletons.map((_, i) => (
+        <SkeletonContainer key={i}>
+          <Skeleton width={15} height={15} />
+          <SkeletonEntityName>
+            <Skeleton height={8} />
+          </SkeletonEntityName>
+        </SkeletonContainer>
+      ))}
+    </>
+  );
 }

front/src/modules/ui/components/table/table-header/FilterDropdownEntitySearchSelect.tsx

@@ -78,6 +78,7 @@ export function FilterDropdownEntitySearchSelect({
         entities={{
           entitiesToSelect: entitiesForSelect.entitiesToSelect,
           selectedEntity: entitiesForSelect.selectedEntities[0],
+          loading: entitiesForSelect.loading,
         }}
         onEntitySelected={handleUserSelected}
       />