Hot Fix merge conflicts (#523)

2023-07-05 16:58:47 +02:00
parent 2961fed932
commit 3db15929a5
6 changed files with 17 additions and 8 deletions
--- a/front/src/modules/ui/components/table/table-header/FilterDropdownEntitySearchSelect.tsx
+++ b/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}
      />