mirror of
https://github.com/SableClient/Sable.git
synced 2026-11-20 09:01:17 -08:00
fix: move updater and global banner to appshell
Signed-off-by: hazre <[email protected]>
This commit is contained in:
1 parent
541036b3f5
commit
c83522d7e6
2 files changed
+7
-6
No files matched your search
@@ -9,6 +9,9 @@ import { type as osType } from '@tauri-apps/plugin-os';
|
||||
import { TauriFrontendReady } from '$components/tauri/TauriFrontendReady';
|
||||
import { DesktopTitleBar } from '$components/tauri/DesktopTitleBar';
|
||||
import { MacTitleBar } from '$components/tauri/MacTitleBar';
|
||||
import { DesktopUpdater } from '$pages/client/DesktopUpdater';
|
||||
import { WebUpdater } from '$pages/client/WebUpdater';
|
||||
import { GlobalBannerRenderer } from '$components/global-banner/GlobalBannerRenderer';
|
||||
import { Toast } from '$components/toast/Toast';
|
||||
import type { ScreenSize } from '$hooks/useScreenSize';
|
||||
import { ScreenSizeProvider } from '$hooks/useScreenSize';
|
||||
@@ -88,6 +91,9 @@ function AppShellFrame({ children, portalContainer, onPortalContainerChange }: A
|
||||
>
|
||||
{titlebarKind === 'desktop' && <DesktopTitleBar />}
|
||||
{titlebarKind === 'mac' && <MacTitleBar />}
|
||||
<DesktopUpdater />
|
||||
<WebUpdater />
|
||||
<GlobalBannerRenderer />
|
||||
<div
|
||||
style={{
|
||||
display: 'flex',
|
||||
|
||||
@@ -89,11 +89,8 @@ import { isIncomingCallSuppressed } from '$features/call/callIncomingIngress';
|
||||
import { incomingCallAtom, mutedCallRoomIdAtom } from '$state/callEmbed';
|
||||
import { getInboxInvitesPath } from '../pathUtils';
|
||||
import { BackgroundNotifications } from './BackgroundNotifications';
|
||||
import { DesktopUpdater } from './DesktopUpdater';
|
||||
import { WebUpdater } from './WebUpdater';
|
||||
import { NotificationTransportRuntimeFeature } from '$features/settings/notifications/NotificationTransportRuntimeFeature';
|
||||
import { UnverifiedNoticeBanner } from '$components/unverified-notice';
|
||||
import { GlobalBannerRenderer } from '$components/global-banner/GlobalBannerRenderer';
|
||||
import { getRenderableMediaUrlStats } from '$hooks/useRenderableMediaUrl';
|
||||
|
||||
const pushRelayLog = createDebugLogger('push-relay');
|
||||
@@ -1152,15 +1149,13 @@ export function ClientNonUIFeatures({ children }: ClientNonUIFeaturesProps) {
|
||||
<NativeNotificationClickRouting />
|
||||
<NativeNotificationActionRouting />
|
||||
<BackgroundNotifications />
|
||||
<DesktopUpdater />
|
||||
<WebUpdater />
|
||||
|
||||
<NotificationTransportRuntimeFeature />
|
||||
<SyncNotificationSettingsWithServiceWorker />
|
||||
<HandleDecryptPushEvent />
|
||||
<NotificationBanner />
|
||||
<TelemetryConsentBanner />
|
||||
<UnverifiedNoticeBanner />
|
||||
<GlobalBannerRenderer />
|
||||
<ThemeMigrationBanner />
|
||||
<SlidingSyncActiveRoomSubscriber />
|
||||
<PresenceFeature />
|
||||
|
||||
Reference in new issue
Block a user