Skip to content

Commit

Permalink
Fix conflicts with Ed's PR
Browse files Browse the repository at this point in the history
  • Loading branch information
albandum committed Jan 24, 2024
1 parent 7f13b02 commit 7b1e730
Showing 1 changed file with 24 additions and 23 deletions.
47 changes: 24 additions & 23 deletions front/components/assistant/AssistantPicker.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -117,29 +117,30 @@ export function AssistantPicker({
}
>
{searchedAssistants.map((c) => (
<div
key={`assistant-picker-container-${c.sId}`}
className="flex flex-row items-center justify-between pr-2"
>
<Item.Avatar
key={`assistant-picker-${c.sId}`}
label={"@" + c.name}
visual={c.pictureUrl}
onClick={() => {
onItemClick(c);
setSearchText("");
}}
/>
<IconButton
icon={MoreIcon}
onClick={() => {
setShowDetails(c);
}}
variant="tertiary"
size="sm"
/>
</div>
))}
<div
key={`assistant-picker-container-${c.sId}`}
className="flex flex-row items-center justify-between pr-2"
>
<Item.Avatar
key={`assistant-picker-${c.sId}`}
label={"@" + c.name}
visual={c.pictureUrl}
hasAction={false}
onClick={() => {
onItemClick(c);
setSearchText("");
}}
/>
<IconButton
icon={MoreIcon}
onClick={() => {
setShowDetails(c);
}}
variant="tertiary"
size="sm"
/>
</div>
))}
</DropdownMenu.Items>
</DropdownMenu>
);
Expand Down

0 comments on commit 7b1e730

Please sign in to comment.