Merge branch 'staging' into production

onlydustxyz · Oct 3, 2024 · 16b48b3 · 16b48b3
2 parents 6a2aacb + 9589cf2
commit 16b48b3
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/...hackathons/[hackathonSlug]/features/hackathon-issues/context/hackathon-issues.context.tsx b/...hackathons/[hackathonSlug]/features/hackathon-issues/context/hackathon-issues.context.tsx
@@ -42,7 +42,7 @@ export function HackathonIssuesContextProvider({ children, hackathonId }: THacka
     setQueryParams({
       search: filters.search || undefined,
       languageIds: filters.languageIds.length ? filters.languageIds : undefined,
-      isAssigned: filters.availability === "all" ? undefined : filters.availability === "available" ? false : true,
+      isAvailable: filters.availability === "all" ? undefined : filters.availability === "available",
       statuses: ["OPEN"],
     });
   }, [filters]);

diff --git a/src/_pages/Callbacks/GithubCallbackHandler.tsx b/src/_pages/Callbacks/GithubCallbackHandler.tsx
@@ -16,6 +16,11 @@ function handleNavigation(searchParams: ReturnType<typeof useSearchParams>, rout
   } else if (installationId && state) {
     const isEdit = state.includes(GithubState.edit);
     const isClaim = state.includes(GithubState.claim);
+    const isGeneric = state.includes(GithubState.generic);
+    if (isGeneric) {
+      window.location.href = `${process.env.NEXT_PUBLIC_SAAS_URL}/github-callback`;
+      return;
+    }
     if (isEdit) {
       router.push(
         `${NEXT_ROUTER.projects.details.edit(state.replace(GithubState.edit, ""))}?installation_id=${installationId}`

diff --git a/src/utils/githubSetupLink.ts b/src/utils/githubSetupLink.ts
@@ -15,6 +15,7 @@ export const OAuthGithubConfigLink = `https://github.com/settings/connections/ap
 export const GithubState = {
   claim: "claim-state-",
   edit: "edit-state-",
+  generic: "generic-state-",
 };
 export const GithubSetupLinks = {
   alreadyInstalled: (props: { login: string; installationId: number }) =>