Merge pull request #178 from zxawry/supports-selectors

add selectors for total supports and claim supports

dist/bundle.es.js

@@ -1233,6 +1233,156 @@ function doDismissError() {
   };
 }
 
+const selectState$1 = state => state.wallet || {};
+
+const selectWalletState = selectState$1;
+
+const selectWalletIsEncrypted = reselect.createSelector(selectState$1, state => state.walletIsEncrypted);
+
+const selectWalletEncryptPending = reselect.createSelector(selectState$1, state => state.walletEncryptPending);
+
+const selectWalletEncryptSucceeded = reselect.createSelector(selectState$1, state => state.walletEncryptSucceded);
+
+const selectWalletEncryptResult = reselect.createSelector(selectState$1, state => state.walletEncryptResult);
+
+const selectWalletDecryptPending = reselect.createSelector(selectState$1, state => state.walletDecryptPending);
+
+const selectWalletDecryptSucceeded = reselect.createSelector(selectState$1, state => state.walletDecryptSucceded);
+
+const selectWalletDecryptResult = reselect.createSelector(selectState$1, state => state.walletDecryptResult);
+
+const selectWalletUnlockPending = reselect.createSelector(selectState$1, state => state.walletUnlockPending);
+
+const selectWalletUnlockSucceeded = reselect.createSelector(selectState$1, state => state.walletUnlockSucceded);
+
+const selectWalletUnlockResult = reselect.createSelector(selectState$1, state => state.walletUnlockResult);
+
+const selectWalletLockPending = reselect.createSelector(selectState$1, state => state.walletLockPending);
+
+const selectWalletLockSucceeded = reselect.createSelector(selectState$1, state => state.walletLockSucceded);
+
+const selectWalletLockResult = reselect.createSelector(selectState$1, state => state.walletLockResult);
+
+const selectBalance = reselect.createSelector(selectState$1, state => state.balance);
+
+const selectTotalBalance = reselect.createSelector(selectState$1, state => state.totalBalance);
+
+const selectTransactionsById = reselect.createSelector(selectState$1, state => state.transactions || {});
+
+const selectSupportsByOutpoint = reselect.createSelector(selectState$1, state => state.supports || {});
+
+const selectTotalSupports = reselect.createSelector(selectSupportsByOutpoint, byOutpoint => {
+  let total = parseFloat("0.0");
+
+  Object.values(byOutpoint).forEach(support => {
+    const { amount } = support;
+    total = amount ? total + parseFloat(amount) : total;
+  });
+
+  return total;
+});
+
+const selectTransactionItems = reselect.createSelector(selectTransactionsById, byId => {
+  const items = [];
+
+  Object.keys(byId).forEach(txid => {
+    const tx = byId[txid];
+
+    // ignore dust/fees
+    // it is fee only txn if all infos are also empty
+    if (Math.abs(tx.value) === Math.abs(tx.fee) && tx.claim_info.length === 0 && tx.support_info.length === 0 && tx.update_info.length === 0 && tx.abandon_info.length === 0) {
+      return;
+    }
+
+    const append = [];
+
+    append.push(...tx.claim_info.map(item => Object.assign({}, tx, item, {
+      type: item.claim_name[0] === '@' ? CHANNEL$1 : PUBLISH$1
+    })));
+    append.push(...tx.support_info.map(item => Object.assign({}, tx, item, {
+      type: !item.is_tip ? SUPPORT : TIP
+    })));
+    append.push(...tx.update_info.map(item => Object.assign({}, tx, item, { type: UPDATE })));
+    append.push(...tx.abandon_info.map(item => Object.assign({}, tx, item, { type: ABANDON })));
+
+    if (!append.length) {
+      append.push(Object.assign({}, tx, {
+        type: tx.value < 0 ? SPEND : RECEIVE
+      }));
+    }
+
+    items.push(...append.map(item => {
+      // value on transaction, amount on outpoint
+      // amount is always positive, but should match sign of value
+      const balanceDelta = parseFloat(item.balance_delta);
+      const value = parseFloat(item.value);
+      const amount = balanceDelta || value;
+      const fee = parseFloat(tx.fee);
+
+      return {
+        txid,
+        timestamp: tx.timestamp,
+        date: tx.timestamp ? new Date(Number(tx.timestamp) * 1000) : null,
+        amount,
+        fee,
+        claim_id: item.claim_id,
+        claim_name: item.claim_name,
+        type: item.type || SPEND,
+        nout: item.nout,
+        confirmations: tx.confirmations
+      };
+    }));
+  });
+
+  return items.sort((tx1, tx2) => {
+    if (!tx1.timestamp && !tx2.timestamp) {
+      return 0;
+    } else if (!tx1.timestamp && tx2.timestamp) {
+      return -1;
+    } else if (tx1.timestamp && !tx2.timestamp) {
+      return 1;
+    }
+
+    return tx2.timestamp - tx1.timestamp;
+  });
+});
+
+const selectRecentTransactions = reselect.createSelector(selectTransactionItems, transactions => {
+  const threshold = new Date();
+  threshold.setDate(threshold.getDate() - 7);
+  return transactions.filter(transaction => {
+    if (!transaction.date) {
+      return true; // pending transaction
+    }
+
+    return transaction.date > threshold;
+  });
+});
+
+const selectHasTransactions = reselect.createSelector(selectTransactionItems, transactions => transactions && transactions.length > 0);
+
+const selectIsFetchingTransactions = reselect.createSelector(selectState$1, state => state.fetchingTransactions);
+
+const selectIsSendingSupport = reselect.createSelector(selectState$1, state => state.sendingSupport);
+
+const selectReceiveAddress = reselect.createSelector(selectState$1, state => state.receiveAddress);
+
+const selectGettingNewAddress = reselect.createSelector(selectState$1, state => state.gettingNewAddress);
+
+const selectDraftTransaction = reselect.createSelector(selectState$1, state => state.draftTransaction || {});
+
+const selectDraftTransactionAmount = reselect.createSelector(selectDraftTransaction, draft => draft.amount);
+
+const selectDraftTransactionAddress = reselect.createSelector(selectDraftTransaction, draft => draft.address);
+
+const selectDraftTransactionError = reselect.createSelector(selectDraftTransaction, draft => draft.error);
+
+const selectBlocks = reselect.createSelector(selectState$1, state => state.blocks);
+
+const selectCurrentHeight = reselect.createSelector(selectState$1, state => state.latestBlock);
+
+const selectTransactionListFilter = reselect.createSelector(selectState$1, state => state.transactionListFilter || '');
+
 var _extends$2 = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
 
 function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in obj) { if (keys.indexOf(i) >= 0) continue; if (!Object.prototype.hasOwnProperty.call(obj, i)) continue; target[i] = obj[i]; } return target; }
@@ -1269,13 +1419,13 @@ function createNormalizedClaimSearchKey(options) {
 
 //      
 
-const selectState$1 = state => state.claims || {};
+const selectState$2 = state => state.claims || {};
 
-const selectClaimsById = reselect.createSelector(selectState$1, state => state.byId || {});
+const selectClaimsById = reselect.createSelector(selectState$2, state => state.byId || {});
 
-const selectCurrentChannelPage = reselect.createSelector(selectState$1, state => state.currentChannelPage || 1);
+const selectCurrentChannelPage = reselect.createSelector(selectState$2, state => state.currentChannelPage || 1);
 
-const selectClaimsByUri = reselect.createSelector(selectState$1, selectClaimsById, (state, byId) => {
+const selectClaimsByUri = reselect.createSelector(selectState$2, selectClaimsById, (state, byId) => {
   const byUri = state.claimsByUri || {};
   const claims = {};
 
@@ -1295,11 +1445,11 @@ const selectClaimsByUri = reselect.createSelector(selectState$1, selectClaimsByI
   return claims;
 });
 
-const selectAllClaimsByChannel = reselect.createSelector(selectState$1, state => state.claimsByChannel || {});
+const selectAllClaimsByChannel = reselect.createSelector(selectState$2, state => state.claimsByChannel || {});
 
-const selectPendingById = reselect.createSelector(selectState$1, state => state.pendingById || {});
+const selectPendingById = reselect.createSelector(selectState$2, state => state.pendingById || {});
 
-const selectPendingClaims = reselect.createSelector(selectState$1, state => Object.values(state.pendingById || []));
+const selectPendingClaims = reselect.createSelector(selectState$2, state => Object.values(state.pendingById || []));
 
 const makeSelectClaimIsPending = uri => reselect.createSelector(selectPendingById, pendingById => {
   let claimId;
@@ -1339,9 +1489,9 @@ const makeSelectClaimForUri = uri => reselect.createSelector(selectClaimsByUri,
   }
 });
 
-const selectMyClaimsRaw = reselect.createSelector(selectState$1, state => state.myClaims);
+const selectMyClaimsRaw = reselect.createSelector(selectState$2, state => state.myClaims);
 
-const selectAbandoningIds = reselect.createSelector(selectState$1, state => Object.keys(state.abandoningById || {}));
+const selectAbandoningIds = reselect.createSelector(selectState$2, state => Object.keys(state.abandoningById || {}));
 
 const selectMyActiveClaims = reselect.createSelector(selectMyClaimsRaw, selectAbandoningIds, (claims, abandoningIds) => new Set(claims && claims.map(claim => claim.claim_id).filter(claimId => Object.keys(abandoningIds).indexOf(claimId) === -1)));
 
@@ -1362,7 +1512,7 @@ const makeSelectClaimIsMine = rawUri => {
   });
 };
 
-const selectAllFetchingChannelClaims = reselect.createSelector(selectState$1, state => state.fetchingChannelClaims || {});
+const selectAllFetchingChannelClaims = reselect.createSelector(selectState$2, state => state.fetchingChannelClaims || {});
 
 const makeSelectFetchingChannelClaims = uri => reselect.createSelector(selectAllFetchingChannelClaims, fetching => fetching && fetching[uri]);
 
@@ -1427,7 +1577,7 @@ const makeSelectCoverForUri = uri => reselect.createSelector(makeSelectClaimForU
   return cover ? cover.url : undefined;
 });
 
-const selectIsFetchingClaimListMine = reselect.createSelector(selectState$1, state => state.isFetchingClaimListMine);
+const selectIsFetchingClaimListMine = reselect.createSelector(selectState$2, state => state.isFetchingClaimListMine);
 
 const selectMyClaims = reselect.createSelector(selectMyActiveClaims, selectClaimsById, selectAbandoningIds, selectPendingClaims, (myClaimIds, byId, abandoningIds, pendingClaims) => {
   const claims = [];
@@ -1463,9 +1613,9 @@ const selectMyClaimsOutpoints = reselect.createSelector(selectMyClaims, myClaims
   return outpoints;
 });
 
-const selectFetchingMyChannels = reselect.createSelector(selectState$1, state => state.fetchingMyChannels);
+const selectFetchingMyChannels = reselect.createSelector(selectState$2, state => state.fetchingMyChannels);
 
-const selectMyChannelClaims = reselect.createSelector(selectState$1, selectClaimsById, (state, byId) => {
+const selectMyChannelClaims = reselect.createSelector(selectState$2, selectClaimsById, (state, byId) => {
   const ids = state.myChannelClaims || [];
   const claims = [];
 
@@ -1479,13 +1629,13 @@ const selectMyChannelClaims = reselect.createSelector(selectState$1, selectClaim
   return claims;
 });
 
-const selectResolvingUris = reselect.createSelector(selectState$1, state => state.resolvingUris || []);
+const selectResolvingUris = reselect.createSelector(selectState$2, state => state.resolvingUris || []);
 
 const makeSelectIsUriResolving = uri => reselect.createSelector(selectResolvingUris, resolvingUris => resolvingUris && resolvingUris.indexOf(uri) !== -1);
 
-const selectPlayingUri = reselect.createSelector(selectState$1, state => state.playingUri);
+const selectPlayingUri = reselect.createSelector(selectState$2, state => state.playingUri);
 
-const selectChannelClaimCounts = reselect.createSelector(selectState$1, state => state.channelClaimCounts || {});
+const selectChannelClaimCounts = reselect.createSelector(selectState$2, state => state.channelClaimCounts || {});
 
 const makeSelectTotalItemsForChannel = uri => reselect.createSelector(selectChannelClaimCounts, byUri => byUri && byUri[uri]);
 
@@ -1568,155 +1718,32 @@ const makeSelectTagsForUri = uri => reselect.createSelector(makeSelectMetadataFo
   return metadata && metadata.tags || [];
 });
 
-const selectFetchingClaimSearchByQuery = reselect.createSelector(selectState$1, state => state.fetchingClaimSearchByQuery || {});
+const selectFetchingClaimSearchByQuery = reselect.createSelector(selectState$2, state => state.fetchingClaimSearchByQuery || {});
 
 const selectFetchingClaimSearch = reselect.createSelector(selectFetchingClaimSearchByQuery, fetchingClaimSearchByQuery => Boolean(Object.keys(fetchingClaimSearchByQuery).length));
 
-const selectClaimSearchByQuery = reselect.createSelector(selectState$1, state => state.claimSearchByQuery || {});
+const selectClaimSearchByQuery = reselect.createSelector(selectState$2, state => state.claimSearchByQuery || {});
 
 const selectClaimSearchByQueryLastPageReached = reselect.createSelector(selectState$1, state => state.claimSearchByQueryLastPageReached || {});
 
 const makeSelectShortUrlForUri = uri => reselect.createSelector(makeSelectClaimForUri(uri), claim => claim && claim.short_url);
 
-const selectState$2 = state => state.wallet || {};
+const makeSelectSupportsForUri = uri => reselect.createSelector(selectSupportsByOutpoint, makeSelectClaimForUri(uri), (byOutpoint, claim) => {
+  if (!claim || !claim.is_mine) {
+    return null;
+  }
 
-const selectWalletState = selectState$2;
+  const { claim_id: claimId } = claim;
+  let total = parseFloat("0.0");
 
-const selectWalletIsEncrypted = reselect.createSelector(selectState$2, state => state.walletIsEncrypted);
+  Object.values(byOutpoint).forEach(support => {
-
+    const { claim_id, amount } = support;
-const selectWalletEncryptPending = reselect.createSelector(selectState$2, state => state.walletEncryptPending);
+    total = claim_id === claimId && amount ? total + parseFloat(amount) : total;
-
-const selectWalletEncryptSucceeded = reselect.createSelector(selectState$2, state => state.walletEncryptSucceded);
-
-const selectWalletEncryptResult = reselect.createSelector(selectState$2, state => state.walletEncryptResult);
-
-const selectWalletDecryptPending = reselect.createSelector(selectState$2, state => state.walletDecryptPending);
-
-const selectWalletDecryptSucceeded = reselect.createSelector(selectState$2, state => state.walletDecryptSucceded);
-
-const selectWalletDecryptResult = reselect.createSelector(selectState$2, state => state.walletDecryptResult);
-
-const selectWalletUnlockPending = reselect.createSelector(selectState$2, state => state.walletUnlockPending);
-
-const selectWalletUnlockSucceeded = reselect.createSelector(selectState$2, state => state.walletUnlockSucceded);
-
-const selectWalletUnlockResult = reselect.createSelector(selectState$2, state => state.walletUnlockResult);
-
-const selectWalletLockPending = reselect.createSelector(selectState$2, state => state.walletLockPending);
-
-const selectWalletLockSucceeded = reselect.createSelector(selectState$2, state => state.walletLockSucceded);
-
-const selectWalletLockResult = reselect.createSelector(selectState$2, state => state.walletLockResult);
-
-const selectBalance = reselect.createSelector(selectState$2, state => state.balance);
-
-const selectTotalBalance = reselect.createSelector(selectState$2, state => state.totalBalance);
-
-const selectTransactionsById = reselect.createSelector(selectState$2, state => state.transactions || {});
-
-const selectSupportsByOutpoint = reselect.createSelector(selectState$2, state => state.supports || {});
-
-const selectTransactionItems = reselect.createSelector(selectTransactionsById, byId => {
-  const items = [];
-
-  Object.keys(byId).forEach(txid => {
-    const tx = byId[txid];
-
-    // ignore dust/fees
-    // it is fee only txn if all infos are also empty
-    if (Math.abs(tx.value) === Math.abs(tx.fee) && tx.claim_info.length === 0 && tx.support_info.length === 0 && tx.update_info.length === 0 && tx.abandon_info.length === 0) {
-      return;
-    }
-
-    const append = [];
-
-    append.push(...tx.claim_info.map(item => Object.assign({}, tx, item, {
-      type: item.claim_name[0] === '@' ? CHANNEL$1 : PUBLISH$1
-    })));
-    append.push(...tx.support_info.map(item => Object.assign({}, tx, item, {
-      type: !item.is_tip ? SUPPORT : TIP
-    })));
-    append.push(...tx.update_info.map(item => Object.assign({}, tx, item, { type: UPDATE })));
-    append.push(...tx.abandon_info.map(item => Object.assign({}, tx, item, { type: ABANDON })));
-
-    if (!append.length) {
-      append.push(Object.assign({}, tx, {
-        type: tx.value < 0 ? SPEND : RECEIVE
-      }));
-    }
-
-    items.push(...append.map(item => {
-      // value on transaction, amount on outpoint
-      // amount is always positive, but should match sign of value
-      const balanceDelta = parseFloat(item.balance_delta);
-      const value = parseFloat(item.value);
-      const amount = balanceDelta || value;
-      const fee = parseFloat(tx.fee);
-
-      return {
-        txid,
-        timestamp: tx.timestamp,
-        date: tx.timestamp ? new Date(Number(tx.timestamp) * 1000) : null,
-        amount,
-        fee,
-        claim_id: item.claim_id,
-        claim_name: item.claim_name,
-        type: item.type || SPEND,
-        nout: item.nout,
-        confirmations: tx.confirmations
-      };
-    }));
   });
 
-  return items.sort((tx1, tx2) => {
+  return total;
-    if (!tx1.timestamp && !tx2.timestamp) {
-      return 0;
-    } else if (!tx1.timestamp && tx2.timestamp) {
-      return -1;
-    } else if (tx1.timestamp && !tx2.timestamp) {
-      return 1;
-    }
-
-    return tx2.timestamp - tx1.timestamp;
-  });
 });
 
-const selectRecentTransactions = reselect.createSelector(selectTransactionItems, transactions => {
-  const threshold = new Date();
-  threshold.setDate(threshold.getDate() - 7);
-  return transactions.filter(transaction => {
-    if (!transaction.date) {
-      return true; // pending transaction
-    }
-
-    return transaction.date > threshold;
-  });
-});
-
-const selectHasTransactions = reselect.createSelector(selectTransactionItems, transactions => transactions && transactions.length > 0);
-
-const selectIsFetchingTransactions = reselect.createSelector(selectState$2, state => state.fetchingTransactions);
-
-const selectIsSendingSupport = reselect.createSelector(selectState$2, state => state.sendingSupport);
-
-const selectReceiveAddress = reselect.createSelector(selectState$2, state => state.receiveAddress);
-
-const selectGettingNewAddress = reselect.createSelector(selectState$2, state => state.gettingNewAddress);
-
-const selectDraftTransaction = reselect.createSelector(selectState$2, state => state.draftTransaction || {});
-
-const selectDraftTransactionAmount = reselect.createSelector(selectDraftTransaction, draft => draft.amount);
-
-const selectDraftTransactionAddress = reselect.createSelector(selectDraftTransaction, draft => draft.address);
-
-const selectDraftTransactionError = reselect.createSelector(selectDraftTransaction, draft => draft.error);
-
-const selectBlocks = reselect.createSelector(selectState$2, state => state.blocks);
-
-const selectCurrentHeight = reselect.createSelector(selectState$2, state => state.latestBlock);
-
-const selectTransactionListFilter = reselect.createSelector(selectState$2, state => state.transactionListFilter || '');
-
 function formatCredits(amount, precision) {
   if (Number.isNaN(parseFloat(amount))) return '0';
   return parseFloat(amount).toFixed(precision || 1).replace(/\.?0+$/, '');
@@ -4893,6 +4920,7 @@ exports.makeSelectRecommendedContentForUri = makeSelectRecommendedContentForUri;
 exports.makeSelectSearchUris = makeSelectSearchUris;
 exports.makeSelectShortUrlForUri = makeSelectShortUrlForUri;
 exports.makeSelectStreamingUrlForUri = makeSelectStreamingUrlForUri;
+exports.makeSelectSupportsForUri = makeSelectSupportsForUri;
 exports.makeSelectTagsForUri = makeSelectTagsForUri;
 exports.makeSelectThumbnailForUri = makeSelectThumbnailForUri;
 exports.makeSelectTitleForUri = makeSelectTitleForUri;
@@ -4980,6 +5008,7 @@ exports.selectTakeOverAmount = selectTakeOverAmount;
 exports.selectToast = selectToast;
 exports.selectTotalBalance = selectTotalBalance;
 exports.selectTotalDownloadProgress = selectTotalDownloadProgress;
+exports.selectTotalSupports = selectTotalSupports;
 exports.selectTransactionItems = selectTransactionItems;
 exports.selectTransactionListFilter = selectTransactionListFilter;
 exports.selectTransactionsById = selectTransactionsById;

src/index.js

@@ -172,6 +172,7 @@ export {
   makeSelectPendingByUri,
   makeSelectClaimsInChannelForCurrentPageState,
   makeSelectShortUrlForUri,
+  makeSelectSupportsForUri,
   selectPendingById,
   selectClaimsById,
   selectClaimsByUri,
@@ -250,6 +251,7 @@ export {
   selectTotalBalance,
   selectTransactionsById,
   selectSupportsByOutpoint,
+  selectTotalSupports,
   selectTransactionItems,
   selectRecentTransactions,
   selectHasTransactions,

src/redux/selectors/claims.js

@@ -1,6 +1,7 @@
 // @flow
 import { normalizeURI, buildURI, parseURI } from 'lbryURI';
 import { selectSearchUrisByQuery } from 'redux/selectors/search';
+import { selectSupportsByOutpoint } from 'redux/selectors/wallet';
 import { createSelector } from 'reselect';
 import { isClaimNsfw, createNormalizedClaimSearchKey } from 'util/claim';
 import { getSearchQueryString } from 'util/query-params';
@@ -536,3 +537,24 @@ export const makeSelectShortUrlForUri = (uri: string) =>
     makeSelectClaimForUri(uri),
     claim => claim && claim.short_url
   );
+
+export const makeSelectSupportsForUri = (uri: string) =>
+  createSelector(
+    selectSupportsByOutpoint,
+    makeSelectClaimForUri(uri),
+    (byOutpoint, claim: ?StreamClaim) => {
+      if (!claim || !claim.is_mine) {
+        return null;
+      }
+
+      const { claim_id: claimId } = claim;
+      let total = parseFloat("0.0");
+
+      Object.values(byOutpoint).forEach(support => {
+        const { claim_id, amount } = support
+        total = (claim_id === claimId && amount) ? total + parseFloat(amount) : total;
+      });
+
+      return total;
+    }
+  );

src/redux/selectors/wallet.js

@@ -90,6 +90,20 @@ export const selectSupportsByOutpoint = createSelector(
   state => state.supports || {}
 );
 
+export const selectTotalSupports = createSelector(
+  selectSupportsByOutpoint,
+  byOutpoint => {
+    let total = parseFloat("0.0");
+
+    Object.values(byOutpoint).forEach(support => {
+      const { amount } = support;
+      total = amount ? total + parseFloat(amount) : total;
+    });
+
+    return total;
+  }
+);
+
 export const selectTransactionItems = createSelector(
   selectTransactionsById,
   byId => {