Loading before asset - ensures force reload 'feels' right

src/js/views/Album.js

@@ -213,10 +213,10 @@ class Album extends React.Component {
       filter,
     } = this.state;
 
+    if (loading) {
+      return <Loader body loading />;
+    }
     if (!album) {
-      if (loading) {
-        return <Loader body loading />;
-      }
       return (
         <ErrorMessage type="not-found" title="Not found">
           <p>

src/js/views/Artist.js

@@ -486,10 +486,10 @@ class Artist extends React.Component {
       history,
     } = this.props;
 
+    if (loading) {
+      return <Loader body loading />;
+    }
     if (!artist) {
-      if (loading) {
-        return <Loader body loading />;
-      }
       return (
         <ErrorMessage type="not-found" title="Not found">
           <p>

src/js/views/Playlist.js

@@ -341,10 +341,10 @@ class Playlist extends React.Component {
       filter,
     } = this.state;
 
+    if (loading) {
+      return <Loader body loading />;
+    }
     if (!playlist) {
-      if (loading) {
-        return <Loader body loading />;
-      }
       return (
         <ErrorMessage type="not-found" title="Not found">
           <p>

src/js/views/User.js

@@ -97,16 +97,16 @@ class User extends React.Component {
   render = () => {
     const {
       uri,
-      isLoading,
+      loading,
       user,
       playlists,
       slim_mode,
     } = this.props;
 
+    if (loading) {
+      return <Loader body loading />;
+    }
     if (!user) {
-      if (isLoading) {
-        return <Loader body loading />;
-      }
       return (
         <ErrorMessage type="not-found" title="Not found">
           <p>