diff --git a/packages/app/src/pages/music/components/explore/index.jsx b/packages/app/src/pages/music/components/explore/index.jsx
index 7a2fb2df..8e3cdaef 100755
--- a/packages/app/src/pages/music/components/explore/index.jsx
+++ b/packages/app/src/pages/music/components/explore/index.jsx
@@ -10,6 +10,8 @@ import { WithPlayerContext } from "contexts/WithPlayerContext"
import FeedModel from "models/feed"
import PlaylistModel from "models/playlists"
+import MusicModel from "models/music"
+import SyncModel from "models/sync"
import MusicTrack from "components/Music/Track"
import PlaylistItem from "components/Music/PlaylistItem"
@@ -17,11 +19,33 @@ import PlaylistItem from "components/Music/PlaylistItem"
import "./index.less"
const MusicNavbar = (props) => {
+ const [loading, setLoading] = React.useState(true)
+ const [hasTidal, setHasTidal] = React.useState(false)
+
+ React.useEffect(() => {
+ SyncModel.hasServiceLinked("tidal")
+ .catch(() => {
+ setHasTidal(false)
+ setLoading(false)
+ })
+ .then((value) => {
+ setHasTidal(value.active)
+ setLoading(false)
+ })
+ }, [])
+
+ if (loading) {
+ return null
+ }
+
return
props.setSearchResults(false)}
/>
@@ -243,16 +267,28 @@ const SearchResults = ({
export default (props) => {
const [searchResults, setSearchResults] = React.useState(false)
+ const [loading, setLoading] = React.useState(true)
+ const [hasTidal, setHasTidal] = React.useState(false)
React.useEffect(() => {
app.layout.toggleCenteredContent(true)
app.layout.page_panels.attachComponent("music_navbar", MusicNavbar, {
props: {
- setSearchResults: setSearchResults
+ setSearchResults: setSearchResults,
}
})
+ SyncModel.hasServiceLinked("tidal")
+ .catch(() => {
+ setHasTidal(false)
+ setLoading(false)
+ })
+ .then((value) => {
+ setHasTidal(value.active)
+ setLoading(false)
+ })
+
return () => {
if (app.layout.page_panels) {
app.layout.page_panels.detachComponent("music_navbar")
@@ -260,6 +296,10 @@ export default (props) => {
}
}, [])
+ if (loading) {
+ return null
+ }
+
return {
app.isMobile && setSearchResults(false)}
/>
diff --git a/packages/app/src/pages/music/components/explore/index.less b/packages/app/src/pages/music/components/explore/index.less
index c1ad9edb..af84ccf1 100755
--- a/packages/app/src/pages/music/components/explore/index.less
+++ b/packages/app/src/pages/music/components/explore/index.less
@@ -4,8 +4,6 @@
width: 100%;
- padding: 20px;
-
background-color: var(--background-color-accent);
border-radius: 12px;