Merge pull request #136 from lbryio/removeBlockShowForDates

Uses timestamps for dates for Claims and Transactions

flow-typed/Claim.js

@@ -31,6 +31,7 @@ declare type GenericClaim = {
   decoded_claim: boolean, // claim made in accordance with sdk protobuf types
   depth: number, // confirmations since tx
   effective_amount: number, // bid amount + supports
+  timestamp?: number, // date of transaction
   has_signature: boolean,
   height: number, // block height the tx was confirmed
   hex: string, // `value` hex encoded

src/constants/action_types.js

@@ -40,7 +40,6 @@ export const CHECK_ADDRESS_IS_MINE_COMPLETED = 'CHECK_ADDRESS_IS_MINE_COMPLETED'
 export const SEND_TRANSACTION_STARTED = 'SEND_TRANSACTION_STARTED';
 export const SEND_TRANSACTION_COMPLETED = 'SEND_TRANSACTION_COMPLETED';
 export const SEND_TRANSACTION_FAILED = 'SEND_TRANSACTION_FAILED';
-export const FETCH_BLOCK_SUCCESS = 'FETCH_BLOCK_SUCCESS';
 export const SUPPORT_TRANSACTION_STARTED = 'SUPPORT_TRANSACTION_STARTED';
 export const SUPPORT_TRANSACTION_COMPLETED = 'SUPPORT_TRANSACTION_COMPLETED';
 export const SUPPORT_TRANSACTION_FAILED = 'SUPPORT_TRANSACTION_FAILED';

src/index.js

@@ -71,7 +71,6 @@ export {
   doUpdateTotalBalance,
   doTotalBalanceSubscribe,
   doFetchTransactions,
-  doFetchBlock,
   doGetNewAddress,
   doCheckAddressIsMine,
   doSendDraftTransaction,
@@ -111,6 +110,7 @@ export {
   makeSelectClaimsInChannelForPage,
   makeSelectMetadataForUri,
   makeSelectTitleForUri,
+  makeSelectDateForUri,
   makeSelectContentTypeForUri,
   makeSelectIsUriResolving,
   makeSelectTotalItemsForChannel,
@@ -178,7 +178,6 @@ export {
 } from 'redux/selectors/search';
 
 export {
-  makeSelectBlockDate,
   selectBalance,
   selectTotalBalance,
   selectTransactionsById,

src/redux/actions/wallet.js

@@ -80,17 +80,6 @@ export function doFetchTransactions() {
   };
 }
 
-export function doFetchBlock(height) {
-  return dispatch => {
-    Lbry.block_show({ height }).then(block => {
-      dispatch({
-        type: ACTIONS.FETCH_BLOCK_SUCCESS,
-        data: { block },
-      });
-    });
-  };
-}
-
 export function doGetNewAddress() {
   return dispatch => {
     dispatch({

src/redux/reducers/wallet.js

@@ -183,18 +183,6 @@ reducers[ACTIONS.SUPPORT_TRANSACTION_FAILED] = (state: WalletState, action) =>
     sendingSupport: false,
   });
 
-reducers[ACTIONS.FETCH_BLOCK_SUCCESS] = (state: WalletState, action) => {
-  const {
-    block,
-    block: { height },
-  } = action.data;
-  const blocks = Object.assign({}, state.blocks);
-
-  blocks[height] = block;
-
-  return Object.assign({}, state, { blocks });
-};
-
 reducers[ACTIONS.WALLET_STATUS_COMPLETED] = (state: WalletState, action) =>
   Object.assign({}, state, {
     walletIsEncrypted: action.result,

src/redux/selectors/claims.js

@@ -178,6 +178,19 @@ export const makeSelectTitleForUri = (uri: string) =>
     metadata => metadata && metadata.title
   );
 
+export const makeSelectDateForUri = (uri: string) =>
+  createSelector(
+    makeSelectClaimForUri(uri),
+    claim => {
+      const timestamp = claim && claim.timestamp ? claim.timestamp * 1000 : undefined;
+      if (!timestamp) {
+        return undefined;
+      }
+      const dateObj = new Date(timestamp);
+      return dateObj;
+    }
+  );
+
 export const makeSelectContentTypeForUri = (uri: string) =>
   createSelector(
     makeSelectClaimForUri(uri),

src/redux/selectors/wallet.js

@@ -65,15 +65,29 @@ export const selectWalletLockSucceeded = createSelector(
   state => state.walletLockSucceded
 );
 
-export const selectWalletLockResult = createSelector(selectState, state => state.walletLockResult);
+export const selectWalletLockResult = createSelector(
+  selectState,
+  state => state.walletLockResult
+);
 
-export const selectBalance = createSelector(selectState, state => state.balance);
+export const selectBalance = createSelector(
+  selectState,
+  state => state.balance
+);
 
-export const selectTotalBalance = createSelector(selectState, state => state.totalBalance);
+export const selectTotalBalance = createSelector(
+  selectState,
+  state => state.totalBalance
+);
 
-export const selectTransactionsById = createSelector(selectState, state => state.transactions);
+export const selectTransactionsById = createSelector(
+  selectState,
+  state => state.transactions
+);
 
-export const selectTransactionItems = createSelector(selectTransactionsById, byId => {
+export const selectTransactionItems = createSelector(
+  selectTransactionsById,
+  byId => {
     const items = [];
 
     Object.keys(byId).forEach(txid => {
@@ -158,9 +172,12 @@ export const selectTransactionItems = createSelector(selectTransactionsById, byI
 
       return tx2.timestamp - tx1.timestamp;
     });
-});
+  }
+);
 
-export const selectRecentTransactions = createSelector(selectTransactionItems, transactions => {
+export const selectRecentTransactions = createSelector(
+  selectTransactionItems,
+  transactions => {
     const threshold = new Date();
     threshold.setDate(threshold.getDate() - 7);
     return transactions.filter(transaction => {
@@ -170,7 +187,8 @@ export const selectRecentTransactions = createSelector(selectTransactionItems, t
 
       return transaction.date > threshold;
     });
-});
+  }
+);
 
 export const selectHasTransactions = createSelector(
   selectTransactionItems,
@@ -182,9 +200,15 @@ export const selectIsFetchingTransactions = createSelector(
   state => state.fetchingTransactions
 );
 
-export const selectIsSendingSupport = createSelector(selectState, state => state.sendingSupport);
+export const selectIsSendingSupport = createSelector(
+  selectState,
+  state => state.sendingSupport
+);
 
-export const selectReceiveAddress = createSelector(selectState, state => state.receiveAddress);
+export const selectReceiveAddress = createSelector(
+  selectState,
+  state => state.receiveAddress
+);
 
 export const selectGettingNewAddress = createSelector(
   selectState,
@@ -211,30 +235,15 @@ export const selectDraftTransactionError = createSelector(
   draft => draft.error
 );
 
-export const selectBlocks = createSelector(selectState, state => state.blocks);
+export const selectBlocks = createSelector(
+  selectState,
+  state => state.blocks
+);
 
-export const selectCurrentHeight = createSelector(selectState, state => state.latestBlock);
+export const selectCurrentHeight = createSelector(
-
+  selectState,
-export const makeSelectBlockDate = block =>
+  state => state.latestBlock
-  createSelector(selectBlocks, selectCurrentHeight, (blocks, latestBlock) => {
+);
-    // If we have the block data, look at the actual date,
-    // If not, try to simulate it based on 2.5 minute blocks
-    // Adding this on 11/7/2018 because caling block_show for every claim is causing
-    // performance issues.
-    if (blocks && blocks[block]) {
-      return new Date(blocks[block].time * 1000);
-    }
-
-    // Pending claim
-    if (block < 1) {
-      return null;
-    }
-
-    const difference = latestBlock - block;
-    const msSincePublish = difference * 2.5 * 60 * 1000; // Number of blocks * 2.5 minutes in ms
-    const publishDate = Date.now() - msSincePublish;
-    return new Date(publishDate);
-  });
 
 export const selectTransactionListFilter = createSelector(
   selectState,