From a2791ec57ac34a86e5c750f9addfbc60b705fde2 Mon Sep 17 00:00:00 2001
From: hackrush <atulshyan96@gmail.com>
Date: Tue, 31 Oct 2017 19:32:08 +0530
Subject: [PATCH] Fixed redundant storing of states

---
 ui/js/reducers/claims.js  | 11 +----------
 ui/js/selectors/claims.js | 19 +++++++++++++++----
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/ui/js/reducers/claims.js b/ui/js/reducers/claims.js
index 67f4dcec7..169792e1e 100644
--- a/ui/js/reducers/claims.js
+++ b/ui/js/reducers/claims.js
@@ -45,14 +45,6 @@ reducers[types.FETCH_CLAIM_LIST_MINE_COMPLETED] = function(state, action) {
   const byId = Object.assign({}, state.byId);
   const pendingById = Object.assign({}, state.pendingById);
   const abandoningById = Object.assign({}, state.abandoningById);
-  const allMyClaimsByTxidNout = new Set(
-    claims.map(claim => `${claim.txid}:${claim.nout}`)
-  );
-  const myClaims = new Set(
-    claims
-      .map(claim => claim.claim_id)
-      .filter(claimId => Object.keys(abandoningById).indexOf(claimId) === -1)
-  );
 
   claims
     .filter(claim => claim.category && claim.category.match(/claim/))
@@ -80,8 +72,7 @@ reducers[types.FETCH_CLAIM_LIST_MINE_COMPLETED] = function(state, action) {
 
   return Object.assign({}, state, {
     isFetchingClaimListMine: false,
-    myClaims: myClaims,
-    allMyClaimsByTxidNout: allMyClaimsByTxidNout,
+    myClaims: claims,
     byId,
     pendingById,
   });
diff --git a/ui/js/selectors/claims.js b/ui/js/selectors/claims.js
index 608ceae67..faaa4f5ce 100644
--- a/ui/js/selectors/claims.js
+++ b/ui/js/selectors/claims.js
@@ -121,15 +121,26 @@ export const selectIsFetchingClaimListMine = createSelector(
   state => !!state.isFetchingClaimListMine
 );
 
-export const selectMyClaimsRaw = createSelector(
+export const cantFigureOutVarName = createSelector(
   _selectState,
-  state => new Set(state.myClaims)
+  state => state.myClaims
 );
 
 export const selectAbandoningIds = createSelector(_selectState, state =>
   Object.keys(state.abandoningById || {})
 );
 
+export const selectMyClaimsRaw = createSelector(
+  cantFigureOutVarName,
+  selectAbandoningIds,
+  (claims, abandoningIds) =>
+    new Set(
+      claims
+        .map(claim => claim.claim_id)
+        .filter(claimId => Object.keys(abandoningIds).indexOf(claimId) === -1)
+    )
+);
+
 export const selectPendingClaims = createSelector(_selectState, state =>
   Object.values(state.pendingById || {})
 );
@@ -158,8 +169,8 @@ export const selectMyClaimsWithoutChannels = createSelector(
 );
 
 export const selectAllMyClaimsByTxidNout = createSelector(
-  _selectState,
-  state => state.allMyClaimsByTxidNout || {}
+  cantFigureOutVarName,
+  claims => new Set(claims.map(claim => `${claim.txid}:${claim.nout}`))
 );
 
 export const selectMyClaimsOutpoints = createSelector(