From eed5cd277ff93aac6eaf6d0bd5603e7b5658fc6a Mon Sep 17 00:00:00 2001 From: Xylight Date: Thu, 13 Jun 2024 15:55:43 -0700 Subject: [PATCH] misc: remove redundant instance marker --- .../components/ui/sidebar/ProfileButton.svelte | 3 ++- src/lib/components/ui/sidebar/Sidebar.svelte | 16 +++++++--------- src/routes/accounts/+page.svelte | 12 +++++++----- 3 files changed, 16 insertions(+), 15 deletions(-) diff --git a/src/lib/components/ui/sidebar/ProfileButton.svelte b/src/lib/components/ui/sidebar/ProfileButton.svelte index 64c883a2..fa3f387e 100644 --- a/src/lib/components/ui/sidebar/ProfileButton.svelte +++ b/src/lib/components/ui/sidebar/ProfileButton.svelte @@ -3,6 +3,7 @@ import { page } from '$app/stores' import { profile, setUserID, type Profile } from '$lib/auth.js' import SidebarButton from '$lib/components/ui/sidebar/SidebarButton.svelte' + import { LINKED_INSTANCE_URL } from '$lib/instance' import ProfileAvatar from '$lib/lemmy/ProfileAvatar.svelte' import { Button } from 'mono-svelte' import { Icon, QuestionMarkCircle } from 'svelte-hero-icons' @@ -52,7 +53,7 @@ : ''}" > {prof.username ?? prof.user?.local_user_view.person.name} - {#if !guest} + {#if !guest && !LINKED_INSTANCE_URL} {prof.instance} diff --git a/src/lib/components/ui/sidebar/Sidebar.svelte b/src/lib/components/ui/sidebar/Sidebar.svelte index 1c3b05ea..8dd38144 100644 --- a/src/lib/components/ui/sidebar/Sidebar.svelte +++ b/src/lib/components/ui/sidebar/Sidebar.svelte @@ -74,15 +74,13 @@ > {$t('account.signup')} - {#if LINKED_INSTANCE_URL === undefined} - - {$t('account.changeinstance')} - - {/if} + + {$t('nav.menu.settings')} + {/if} {#if $profileData.profiles.length >= 1}
diff --git a/src/routes/accounts/+page.svelte b/src/routes/accounts/+page.svelte index e398077c..33c44bd9 100644 --- a/src/routes/accounts/+page.svelte +++ b/src/routes/accounts/+page.svelte @@ -250,14 +250,16 @@
- - + {#if !LINKED_INSTANCE_URL} + + {/if}
{/if}