diff --git a/packages/insomnia/src/routes/git-credentials.github.tsx b/packages/insomnia/src/routes/git-credentials.github.tsx index 9e1455fc96..ab9d37bdf2 100644 --- a/packages/insomnia/src/routes/git-credentials.github.tsx +++ b/packages/insomnia/src/routes/git-credentials.github.tsx @@ -8,7 +8,9 @@ import type { Route } from './+types/git-credentials.github'; export async function clientLoader(_args: Route.ClientActionArgs) { const credentials = await gitCredentials.getByProvider('github'); - return credentials; + return { + credentials, + }; } export const useGitHubCredentialsFetcher = createFetcherLoadHook( diff --git a/packages/insomnia/src/routes/git-credentials.gitlab.tsx b/packages/insomnia/src/routes/git-credentials.gitlab.tsx index 40ca82e092..fa48269aa9 100644 --- a/packages/insomnia/src/routes/git-credentials.gitlab.tsx +++ b/packages/insomnia/src/routes/git-credentials.gitlab.tsx @@ -8,7 +8,7 @@ import type { Route } from './+types/git-credentials.gitlab'; export async function clientLoader(_args: Route.ClientActionArgs) { const credentials = await gitCredentials.getByProvider('gitlab'); - return credentials; + return { credentials }; } export const useGitLabCredentialsFetcher = createFetcherLoadHook( diff --git a/packages/insomnia/src/ui/components/git-credentials/github-repository-settings-form.tsx b/packages/insomnia/src/ui/components/git-credentials/github-repository-settings-form.tsx index b2b1e360ee..e1dff391cb 100644 --- a/packages/insomnia/src/ui/components/git-credentials/github-repository-settings-form.tsx +++ b/packages/insomnia/src/ui/components/git-credentials/github-repository-settings-form.tsx @@ -28,7 +28,7 @@ export const GitHubRepositorySetupFormGroup = (props: Props) => { } }, [githubTokenLoader]); - const credentials = githubTokenLoader.data; + const credentials = githubTokenLoader.data?.credentials; if (!credentials?.token) { return ; @@ -123,7 +123,8 @@ const GitHubRepositoryForm = ({ { + onClick={e => { + e.preventDefault(); signOutFetcher.submit(); }} > diff --git a/packages/insomnia/src/ui/components/git-credentials/gitlab-repository-settings-form.tsx b/packages/insomnia/src/ui/components/git-credentials/gitlab-repository-settings-form.tsx index 1759f2073d..b536ea3c6d 100644 --- a/packages/insomnia/src/ui/components/git-credentials/gitlab-repository-settings-form.tsx +++ b/packages/insomnia/src/ui/components/git-credentials/gitlab-repository-settings-form.tsx @@ -27,7 +27,7 @@ export const GitLabRepositorySetupFormGroup = (props: Props) => { } }, [gitlabTokenLoader]); - const credentials = gitlabTokenLoader.data; + const credentials = gitlabTokenLoader.data?.credentials; if (!credentials?.token) { return ; @@ -105,7 +105,8 @@ const GitLabRepositoryForm = ({ uri, credentials, onSubmit }: GitLabRepositoryFo { + onClick={e => { + e.preventDefault(); signOutFetcher.submit(); }} > diff --git a/packages/insomnia/src/ui/components/project/project-create-form.tsx b/packages/insomnia/src/ui/components/project/project-create-form.tsx index 12f1ce9000..81c784a746 100644 --- a/packages/insomnia/src/ui/components/project/project-create-form.tsx +++ b/packages/insomnia/src/ui/components/project/project-create-form.tsx @@ -141,7 +141,7 @@ export const ProjectCreateForm: FC = ({ slot={null} isSelected={projectData.connectRepositoryLater} onChange={isSelected => setProjectData(prev => ({ ...prev, connectRepositoryLater: isSelected }))} - className="group mt-4 flex h-full items-center gap-2 p-0 pl-[1px]" + className="group mt-4 flex h-full items-center gap-2 p-0 pl-px" >