@@ -299,7 +299,6 @@ function App() {
299299 refreshRecentlyPlayed,
300300 } = useSpotifyData ( activeSection , false , true ) ;
301301
302-
303302 const {
304303 version : nocturneVersion ,
305304 serial,
@@ -735,10 +734,15 @@ function App() {
735734 const isUpdateScreenVisible =
736735 isUpdating || ( updateStatus . stage && updateStatus . stage !== "" ) ;
737736
738- const showConnectionLostScreen = ! isUpdateScreenVisible && ! showTutorial && ! pairingRequest && ! lastConnectedDevice ;
737+ const showConnectionLostScreen =
738+ ! isUpdateScreenVisible &&
739+ ! showTutorial &&
740+ ! pairingRequest &&
741+ ! lastConnectedDevice ;
739742 // const showConnectionLostScreen = false;
740743
741- const displayNetworkBanner = showNetworkBanner && ! showConnectionLostScreen && ! isUpdateScreenVisible ;
744+ const displayNetworkBanner =
745+ showNetworkBanner && ! showConnectionLostScreen && ! isUpdateScreenVisible ;
742746
743747 let content ;
744748 if ( isUpdateScreenVisible ) {
@@ -838,65 +842,65 @@ function App() {
838842 refetchInfo = { refetchInfo }
839843 />
840844 ) }
841- < SettingsProvider >
842- < DeviceSwitcherContext . Provider value = { deviceSwitcherContextValue } >
843- < Router >
844- < FontLoader />
845- < main
846- className = "overflow-hidden relative min-h-screen rounded-2xl"
847- style = { {
848- fontFamily : `var(--font-inter), var(--font-noto-sans-sc), var(--font-noto-sans-tc), var(--font-noto-serif-jp), var(--font-noto-sans-kr), var(--font-noto-naskh-ar), var(--font-noto-sans-bn), var(--font-noto-sans-dv), var(--font-noto-sans-he), var(--font-noto-sans-ta), var(--font-noto-sans-th), var(--font-noto-sans-gk), system-ui, sans-serif` ,
849- fontOpticalSizing : "auto" ,
850- } }
851- >
852- < GradientBackground
853- gradientState = { gradientState }
854- className = "bg-black"
855- />
856-
857- < div className = "relative z-10" >
858- { content }
859- { ! isUpdateScreenVisible &&
860- ! showTetheringScreen &&
861- ! showConnectionLostScreen && (
862- < >
863- { pairingRequest ? (
864- < PairingScreen
865- pin = { pairingRequest . pairingKey }
866- isConnecting = { isConnecting }
867- onAccept = { acceptPairing }
868- onReject = { denyPairing }
869- />
870- ) : null }
871- </ >
872- ) }
873- < NetworkBanner
874- visible = { displayNetworkBanner }
875- onClose = { ( ) => setShowNetworkBanner ( false ) }
876- />
877- < DeviceSwitcherModal
878- isOpen = { isDeviceSwitcherOpen }
879- onClose = { handleCloseDeviceSwitcher }
880- initialDevices = { prefetchedDevices }
881- />
882- { ! showTutorial && (
883- < ButtonMappingOverlay
884- show = { showGlobalMappingOverlay }
885- activeButton = { globalActiveButton }
845+ < SettingsProvider >
846+ < DeviceSwitcherContext . Provider value = { deviceSwitcherContextValue } >
847+ < Router >
848+ < FontLoader />
849+ < main
850+ className = "overflow-hidden relative min-h-screen rounded-2xl"
851+ style = { {
852+ fontFamily : `var(--font-inter), var(--font-noto-sans-sc), var(--font-noto-sans-tc), var(--font-noto-serif-jp), var(--font-noto-sans-kr), var(--font-noto-naskh-ar), var(--font-noto-sans-bn), var(--font-noto-sans-dv), var(--font-noto-sans-he), var(--font-noto-sans-ta), var(--font-noto-sans-th), var(--font-noto-sans-gk), system-ui, sans-serif` ,
853+ fontOpticalSizing : "auto" ,
854+ } }
855+ >
856+ < GradientBackground
857+ gradientState = { gradientState }
858+ className = "bg-black"
859+ />
860+
861+ < div className = "relative z-10" >
862+ { content }
863+ { ! isUpdateScreenVisible &&
864+ ! showTetheringScreen &&
865+ ! showConnectionLostScreen && (
866+ < >
867+ { pairingRequest ? (
868+ < PairingScreen
869+ pin = { pairingRequest . pairingKey }
870+ isConnecting = { isConnecting }
871+ onAccept = { acceptPairing }
872+ onReject = { denyPairing }
886873 />
887- ) }
888- < PowerMenuOverlay
889- show = { powerMenuVisible }
890- onShutdown = { handleShutdown }
891- onReboot = { handleReboot }
892- onClose = { ( ) => setPowerMenuVisible ( false ) }
893- />
894- </ div >
895- </ main >
896- < NotificationsContainer />
897- </ Router >
898- </ DeviceSwitcherContext . Provider >
899- </ SettingsProvider >
874+ ) : null }
875+ </ >
876+ ) }
877+ < NetworkBanner
878+ visible = { displayNetworkBanner }
879+ onClose = { ( ) => setShowNetworkBanner ( false ) }
880+ />
881+ < DeviceSwitcherModal
882+ isOpen = { isDeviceSwitcherOpen }
883+ onClose = { handleCloseDeviceSwitcher }
884+ initialDevices = { prefetchedDevices }
885+ />
886+ { ! showTutorial && (
887+ < ButtonMappingOverlay
888+ show = { showGlobalMappingOverlay }
889+ activeButton = { globalActiveButton }
890+ />
891+ ) }
892+ < PowerMenuOverlay
893+ show = { powerMenuVisible }
894+ onShutdown = { handleShutdown }
895+ onReboot = { handleReboot }
896+ onClose = { ( ) => setPowerMenuVisible ( false ) }
897+ />
898+ </ div >
899+ </ main >
900+ < NotificationsContainer />
901+ </ Router >
902+ </ DeviceSwitcherContext . Provider >
903+ </ SettingsProvider >
900904 </ NotificationProvider >
901905 ) ;
902906}
0 commit comments