Fix memo: stake indicator

ui/component/channelStakedIndicator/index.js

@@ -1,15 +1,15 @@
 import { connect } from 'react-redux';
 import {
-  makeSelectClaimForUri,
+  selectClaimForUri,
-  makeSelectStakedLevelForChannelUri,
+  selectStakedLevelForChannelUri,
-  makeSelectTotalStakedAmountForChannelUri,
+  selectTotalStakedAmountForChannelUri,
 } from 'redux/selectors/claims';
 import ChannelStakedIndicator from './view';
 
 const select = (state, props) => ({
-  channelClaim: makeSelectClaimForUri(props.uri)(state),
+  channelClaim: selectClaimForUri(state, props.uri),
-  amount: makeSelectTotalStakedAmountForChannelUri(props.uri)(state),
+  amount: selectTotalStakedAmountForChannelUri(state, props.uri),
-  level: makeSelectStakedLevelForChannelUri(props.uri)(state),
+  level: selectStakedLevelForChannelUri(state, props.uri),
 });
 
 export default connect(select)(ChannelStakedIndicator);

ui/component/comment/index.js

@@ -1,6 +1,6 @@
 import { connect } from 'react-redux';
 import {
-  makeSelectStakedLevelForChannelUri,
+  selectStakedLevelForChannelUri,
   makeSelectClaimForUri,
   makeSelectThumbnailForUri,
   selectHasChannels,
@@ -33,7 +33,7 @@ const select = (state, props) => {
     activeChannelClaim,
     hasChannels: selectHasChannels(state),
     playingUri: selectPlayingUri(state),
-    stakedLevel: makeSelectStakedLevelForChannelUri(props.authorUri)(state),
+    stakedLevel: selectStakedLevelForChannelUri(state, props.authorUri),
     linkedCommentAncestors: selectLinkedCommentAncestors(state),
     totalReplyPages: makeSelectTotalReplyPagesForParentId(props.commentId)(state),
   };

ui/component/livestreamComment/index.js

@@ -1,10 +1,10 @@
 import { connect } from 'react-redux';
-import { makeSelectStakedLevelForChannelUri, selectClaimForUri } from 'redux/selectors/claims';
+import { selectStakedLevelForChannelUri, selectClaimForUri } from 'redux/selectors/claims';
 import LivestreamComment from './view';
 
 const select = (state, props) => ({
   claim: selectClaimForUri(state, props.uri),
-  stakedLevel: makeSelectStakedLevelForChannelUri(props.authorUri)(state),
+  stakedLevel: selectStakedLevelForChannelUri(state, props.authorUri),
 });
 
 export default connect(select)(LivestreamComment);

ui/redux/selectors/app.js

@@ -1,5 +1,5 @@
 import { createSelector } from 'reselect';
-import { selectClaimWithId, selectMyChannelClaims, makeSelectStakedLevelForChannelUri } from 'redux/selectors/claims';
+import { selectClaimWithId, selectMyChannelClaims, selectStakedLevelForChannelUri } from 'redux/selectors/claims';
 
 export const selectState = (state) => state.app || {};
 
@@ -97,18 +97,14 @@ export const selectActiveChannelClaim = createSelector(
   }
 );
 
-export const selectActiveChannelStakedLevel = createSelector(
+export const selectActiveChannelStakedLevel = (state) => {
-  (state) => state,
+  const activeChannelClaim = selectActiveChannelClaim(state);
-  selectActiveChannelClaim,
-  (state, activeChannelClaim) => {
   if (!activeChannelClaim) {
     return 0;
   }
 
   const uri = activeChannelClaim.permanent_url;
-    const stakedLevel = makeSelectStakedLevelForChannelUri(uri)(state);
+  return selectStakedLevelForChannelUri(state, uri);
-    return stakedLevel;
+};
-  }
-);
 
 export const selectIncognito = (state) => selectState(state).incognito;

ui/redux/selectors/claims.js

@@ -704,17 +704,15 @@ export const makeSelectClaimIsStreamPlaceholder = (uri: string) =>
     return Boolean(claim.value_type === 'stream' && !claim.value.source);
   });
 
-export const makeSelectTotalStakedAmountForChannelUri = (uri: string) =>
+export const selectTotalStakedAmountForChannelUri = createCachedSelector(selectClaimForUri, (claim) => {
-  createSelector(makeSelectClaimForUri(uri), (claim) => {
   if (!claim || !claim.amount || !claim.meta || !claim.meta.support_amount) {
     return 0;
   }
 
   return parseFloat(claim.amount) + parseFloat(claim.meta.support_amount) || 0;
-  });
+})((state, uri) => String(uri));
 
-export const makeSelectStakedLevelForChannelUri = (uri: string) =>
+export const selectStakedLevelForChannelUri = createCachedSelector(selectTotalStakedAmountForChannelUri, (amount) => {
-  createSelector(makeSelectTotalStakedAmountForChannelUri(uri), (amount) => {
   let level = 1;
   switch (true) {
     case amount >= CLAIM.LEVEL_2_STAKED_AMOUNT && amount < CLAIM.LEVEL_3_STAKED_AMOUNT:
@@ -731,7 +729,7 @@ export const makeSelectStakedLevelForChannelUri = (uri: string) =>
       break;
   }
   return level;
-  });
+})((state, uri) => String(uri));
 
 export const selectUpdatingCollection = (state: State) => selectState(state).updatingCollection;
 export const selectUpdateCollectionError = (state: State) => selectState(state).updateCollectionError;