Skip to content

Commit a380045

Browse files
authored
Merge pull request #4833 from gitbutlerapp/Fix-broken-error-page
Fix broken error page
2 parents 000bddb + 13be25f commit a380045

File tree

1 file changed

+9
-11
lines changed

1 file changed

+9
-11
lines changed

apps/desktop/src/routes/+error.svelte

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,18 @@
11
<script lang="ts">
2-
import { Code, isUserErrorCode } from '$lib/backend/ipc';
2+
import { Code } from '$lib/backend/ipc';
33
import ProjectNotFound from '$lib/components/ProjectNotFound.svelte';
44
import SomethingWentWrong from '$lib/components/SomethingWentWrong.svelte';
55
import { page } from '$app/stores';
66
7-
$: message = $page.error
8-
? $page.error.message
9-
: $page.status === 404
10-
? 'Page not found'
11-
: 'Unknown error';
7+
const code = $derived($page.error?.errorCode);
8+
const status = $derived($page.status);
9+
const message = $derived($page.error?.message);
10+
11+
const error = $derived(message ? message : status === 404 ? 'Page not found' : 'Unknown error');
1212
</script>
1313

14-
{#if isUserErrorCode($page.error?.errorCode)}
15-
{#if $page.error?.errorCode === Code.ProjectMissing}
16-
<ProjectNotFound />
17-
{/if}
14+
{#if code === Code.ProjectMissing}
15+
<ProjectNotFound />
1816
{:else}
19-
<SomethingWentWrong error={message} />
17+
<SomethingWentWrong {error} />
2018
{/if}

0 commit comments

Comments
 (0)