From 795f99bb4799ca9bd14eb11288e3aec911ddb427 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Thu, 19 May 2022 15:18:19 +0200
Subject: [PATCH] fix: new source canceled view

---
 src/routes/sources/[id]/_Github.svelte | 10 ++++------
 src/routes/sources/[id]/index.svelte   |  2 +-
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/routes/sources/[id]/_Github.svelte b/src/routes/sources/[id]/_Github.svelte
index b03fe8abd..6d91f2699 100644
--- a/src/routes/sources/[id]/_Github.svelte
+++ b/src/routes/sources/[id]/_Github.svelte
@@ -80,10 +80,13 @@
 </script>
 
 <div class="mx-auto max-w-4xl px-6">
-	{#if !source.githubAppId}
+	{#if !source.githubApp?.installationId}
 		<form on:submit|preventDefault={newGithubApp} class="py-4">
 			<div class="flex space-x-1 pb-5 font-bold">
 				<div class="title">General</div>
+				{#if source.apiUrl && source.htmlUrl && source.name}
+					<button class=" bg-orange-600" type="submit">Create new GitHub App</button>
+				{/if}
 			</div>
 			<div class="grid grid-flow-row gap-2 px-10">
 				<div class="grid grid-flow-row gap-2">
@@ -117,11 +120,6 @@
 					/>
 				</div>
 			</div>
-			{#if source.apiUrl && source.htmlUrl && source.name}
-				<div class="text-center">
-					<button class=" mt-8 bg-orange-600" type="submit">Create new GitHub App</button>
-				</div>
-			{/if}
 		</form>
 	{:else if source.githubApp?.installationId}
 		<form on:submit|preventDefault={handleSubmit} class="py-4">
diff --git a/src/routes/sources/[id]/index.svelte b/src/routes/sources/[id]/index.svelte
index 4b12fe1c6..ffdd7d6a1 100644
--- a/src/routes/sources/[id]/index.svelte
+++ b/src/routes/sources/[id]/index.svelte
@@ -113,7 +113,7 @@
 </div>
 
 <div class="flex flex-col justify-center">
-	{#if !source.gitlabAppId && !source.githubAppId}
+	{#if !source.gitlabAppId && (!source.githubAppId || !source.githubApp?.installationId)}
 		<div class="flex-col space-y-2 pb-10 text-center">
 			<div class="text-xl font-bold text-white">Select a provider</div>
 			<div class="flex justify-center space-x-2">