Skip to content

Commit

Permalink
fixed merge error
Browse files Browse the repository at this point in the history
  • Loading branch information
matmair committed Jul 19, 2023
1 parent a25cd60 commit 2f3c8f0
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/frontend/src/components/forms/AuthenticationForm.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ export function AuthenticationForm({
<Text size="lg" weight={500}>
<Group>
{!editing ? hostname : selectElement}
{EditButton(setEditing, editing)}
<EditButton setEditing={setEditing} editing={editing} />
</Group>
</Text>
<form onSubmit={classicForm.onSubmit(() => {})}>
Expand Down
6 changes: 5 additions & 1 deletion src/frontend/src/pages/Auth/Login.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,11 @@ const SelectHost = ({
data={hostListData}
disabled={HostListEdit}
/>
{EditButton(setHostListEdit, HostListEdit, HostListEdit)}
<EditButton
setEditing={setHostListEdit}
editing={HostListEdit}
disabled={HostListEdit}
/>
</Group>
);
};
Expand Down

0 comments on commit 2f3c8f0

Please sign in to comment.