diff --git a/packages/builder/src/pages/builder/Branding.svelte b/packages/builder/src/pages/builder/Branding.svelte index a591acd20b..142473abb8 100644 --- a/packages/builder/src/pages/builder/Branding.svelte +++ b/packages/builder/src/pages/builder/Branding.svelte @@ -3,12 +3,10 @@ import { onMount } from "svelte" let loaded = false - let platformTitle = null $: platformTitleText = $organisation.platformTitle - $: platformTitleText, - (platformTitle = - !$auth.user && platformTitleText ? platformTitleText : "Budibase") + $: platformTitle = + !$auth.user && platformTitleText ? platformTitleText : "Budibase" $: faviconUrl = $organisation.faviconUrl || "https://i.imgur.com/Xhdt1YP.png" diff --git a/packages/client/src/stores/initialise.js b/packages/client/src/stores/initialise.js index d74fbdfb10..f34d775a4e 100644 --- a/packages/client/src/stores/initialise.js +++ b/packages/client/src/stores/initialise.js @@ -5,5 +5,5 @@ import { orgStore } from "./org" export async function initialise() { await routeStore.actions.fetchRoutes() await appStore.actions.fetchAppDefinition() - await orgStore.init() + await orgStore.actions.init() } diff --git a/packages/client/src/stores/org.js b/packages/client/src/stores/org.js index 0cf9d6a5ba..af0fc955f9 100644 --- a/packages/client/src/stores/org.js +++ b/packages/client/src/stores/org.js @@ -20,7 +20,9 @@ const createOrgStore = () => { return { subscribe, - init, + actions: { + init, + }, } } diff --git a/packages/client/src/stores/screens.js b/packages/client/src/stores/screens.js index 5250cc08a9..ba373ad8e0 100644 --- a/packages/client/src/stores/screens.js +++ b/packages/client/src/stores/screens.js @@ -150,9 +150,9 @@ const createScreenStore = () => { navigationSettings.title = $appStore.application?.name } + // Default to the org logo if (!navigationSettings.logoUrl) { - navigationSettings.logoUrl = - $orgStore?.logoUrl || navigationSettings.logoUrl + navigationSettings.logoUrl = $orgStore?.logoUrl } } activeLayout = {