src/renderer/component/userPhoneVerify/view.jsx

@@ -33,7 +33,9 @@ class UserPhoneVerify extends React.PureComponent {
       <Form onSubmit={this.handleSubmit.bind(this)}>
         <p>
           {__(
-            `Please enter the verification code sent to +${countryCode}${phone}. Didn't receive it? `
+            `Please enter the verification code sent to +${countryCode}${
+              phone
+            }. Didn't receive it? `
           )}
           <Link onClick={this.reset.bind(this)} label="Go back." />
         </p>

src/renderer/page/discover/index.js

@@ -2,11 +2,18 @@ import React from 'react';
 import { connect } from 'react-redux';
 import { doFetchFeaturedUris } from 'redux/actions/content';
 import { selectFeaturedUris, selectFetchingFeaturedUris } from 'redux/selectors/content';
+import { selectClaimsById, selectAllClaimsByChannel } from 'redux/selectors/claims';
+import { selectDiscover } from 'redux/selectors/discover';
 import DiscoverPage from './view';
 
 const select = state => ({
-  featuredUris: selectFeaturedUris(state),
   fetchingFeaturedUris: selectFetchingFeaturedUris(state),
+  categories: selectDiscover(state),
+
+  // we shouldn't need these
+  featuredUris: selectFeaturedUris(state),
+  claimsById: selectClaimsById(state),
+  claimsByChannel: selectAllClaimsByChannel(state),
 });
 
 const perform = dispatch => ({

src/renderer/page/discover/view.jsx

@@ -222,13 +222,21 @@ export class FeaturedCategory extends React.PureComponent {
 }
 
 class DiscoverPage extends React.PureComponent {
+
+  constructor(props) {
+    super(props);
+  }
   componentWillMount() {
     this.props.fetchFeaturedUris();
   }
 
   render() {
-    const { featuredUris, fetchingFeaturedUris } = this.props;
+    const {
-    const hasContent = typeof featuredUris === 'object' && Object.keys(featuredUris).length,
+      fetchingFeaturedUris,
+      categories
+    } = this.props;
+
+    const hasContent = typeof categories === 'object' && Object.keys(categories).length,
       failedToLoad = !fetchingFeaturedUris && !hasContent;
 
     return (
@@ -240,14 +248,23 @@ class DiscoverPage extends React.PureComponent {
         <SubHeader fullWidth smallMargin />
         {!hasContent && fetchingFeaturedUris && <BusyMessage message={__('Fetching content')} />}
         {hasContent &&
-          Object.keys(featuredUris).map(
+          Object.keys(categories).map(
             category =>
-              featuredUris[category].length ? (
+              categories[category].length ? (
-                <FeaturedCategory
+                category.indexOf('@') === 0 ? (
-                  key={category}
+                  <FeaturedCategory
-                  category={category}
+                    key={category}
-                  names={featuredUris[category]}
+                    category={category.split('#')[0]}
-                />
+                    categoryLink={category}
+                    names={categories[category]}
+                  />
+                ) : (
+                  <FeaturedCategory
+                    key={category}
+                    category={category}
+                    names={categories[category]}
+                  />
+                )
               ) : (
                 ''
               )

src/renderer/redux/actions/content.js

@@ -78,21 +78,25 @@ export function doFetchFeaturedUris() {
     });
 
     const success = ({ Uris }) => {
+      Uris['@LupoTV'] = [];
       let urisToResolve = [];
+      let actions = [];
       Object.keys(Uris).forEach(category => {
-        urisToResolve = [...urisToResolve, ...Uris[category]];
+        if (category.indexOf('@') === 0 && !Uris[category].length) {
+          actions.push(doFetchClaimsByChannel(category, 1));
+        } else {
+          urisToResolve = [...urisToResolve, ...Uris[category]];
+        }
       });
 
-      const actions = [
+      actions.push(doResolveUris(urisToResolve));
-        doResolveUris(urisToResolve),
+      actions.push({
-        {
+        type: ACTIONS.FETCH_FEATURED_CONTENT_COMPLETED,
-          type: ACTIONS.FETCH_FEATURED_CONTENT_COMPLETED,
+        data: {
-          data: {
+          uris: Uris,
-            uris: Uris,
+          success: true,
-            success: true,
-          },
         },
-      ];
+      });
       dispatch(batchActions(...actions));
     };
 
@@ -277,7 +281,9 @@ export function doLoadVideo(uri) {
         });
         dispatch(
           doAlertError(
-            `Failed to download ${uri}, please try again. If this problem persists, visit https://lbry.io/faq/support for support.`
+            `Failed to download ${
+              uri
+            }, please try again. If this problem persists, visit https://lbry.io/faq/support for support.`
           )
         );
       });

src/renderer/redux/selectors/discover.js

@@ -0,0 +1,35 @@
+import { createSelector } from 'reselect';
+import { selectFeaturedUris } from './content';
+import { selectClaimsById, selectAllClaimsByChannel } from './claims';
+
+export const selectDiscover = createSelector(
+  [selectFeaturedUris, selectClaimsById, selectAllClaimsByChannel],
+  (featuredUris, claimsById, claimsByChannel) => {
+    let categories = featuredUris;
+    if (!!categories && !!claimsByChannel) {
+      let channels = [];
+      Object.keys(categories).forEach(key => {
+        if (key.indexOf('@') === 0) {
+          channels.push(key);
+        }
+      });
+      Object.keys(claimsByChannel).forEach(key => {
+        if (channels.includes(key)) {
+          delete categories[key];
+          const ids = claimsByChannel[key][1];
+          let uris = [];
+          const newKey = `${key}#${claimsById[ids[0]].value.publisherSignature.certificateId}`;
+          ids.forEach(id => {
+            const claim = claimsById[id] ? claimsById[id] : null;
+            if (claim) {
+              uris.push(`${claim.name}#${claim.claim_id}`);
+            }
+          });
+          categories[newKey] = uris;
+        }
+      });
+    }
+    console.log("select:", categories);
+    return categories;
+  }
+);