refactor(Context): use spendable and unspendable context from Wallet …

…selectors
blockchain · Jun 20, 2018 · 88c6d18 · 88c6d18
1 parent f602542
commit 88c6d18
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 6 deletions.
diff --git a/packages/blockchain-wallet-v4/src/redux/kvStore/bch/selectors.js b/packages/blockchain-wallet-v4/src/redux/kvStore/bch/selectors.js
@@ -45,7 +45,7 @@ export const getContext = createDeepEqualSelector(
 export const getSpendableContext = createDeepEqualSelector(
   [
     walletSelectors.getHDAccounts,
-    walletSelectors.getActiveSpendableAddresses,
+    walletSelectors.getSpendableContext,
     getAccounts
   ],
   (btcHDAccounts, spendableAddresses, metadataAccountsR) => {
@@ -63,7 +63,7 @@ export const getSpendableContext = createDeepEqualSelector(
   }
 )
 
-export const getUnspendableContext = state => keys(walletSelectors.getActiveUnspendableAddresses(state))
+export const getUnspendableContext = state => keys(walletSelectors.getUnspendableContext(state))
 
 export const getDefaultAccountIndex = state => getMetadata(state).map(path(['value', 'default_account_idx']))
 

diff --git a/packages/blockchain-wallet-v4/src/redux/wallet/selectors.js b/packages/blockchain-wallet-v4/src/redux/wallet/selectors.js
@@ -25,8 +25,6 @@ export const getGuid = compose(Wallet.selectGuid, getWallet)
 export const getAddresses = compose(ImtoJS, map(Address.toJS), Wallet.selectAddresses, getWallet)
 export const getActiveAddresses = compose(ImtoJS, map(Address.toJS), AddressMap.selectActive, Wallet.selectAddresses, getWallet)
 export const getArchivedAddresses = compose(ImtoJS, map(Address.toJS), AddressMap.selectArchived, Wallet.selectAddresses, getWallet)
-export const getActiveSpendableAddresses = compose(ImtoJS, map(Address.toJS), AddressMap.selectActiveSpendable, Wallet.selectAddresses, getWallet)
-export const getActiveUnspendableAddresses = compose(ImtoJS, map(Address.toJS), AddressMap.selectActiveUnspendable, Wallet.selectAddresses, getWallet)
 export const getHDAccounts = compose(ImtoJS, map(HDAccount.toJSwithIndex), Wallet.selectHDAccounts, getWallet)
 export const getSeedHex = curry((state, password) => compose(Wallet.getSeedHex(password), getWallet)(state))
 export const getMnemonic = curry((state, password) => compose(Wallet.getMnemonic(password), getWallet)(state))

diff --git a/packages/blockchain-wallet-v4/src/types/AddressMap.js b/packages/blockchain-wallet-v4/src/types/AddressMap.js
@@ -20,8 +20,6 @@ export const selectActive = pipe(AddressMap.guard, filter(Address.isActive))
 export const selectArchived = pipe(AddressMap.guard, filter(Address.isArchived))
 export const selectSpendable = pipe(AddressMap.guard, reject(Address.isWatchOnly))
 export const selectUnspendable = pipe(AddressMap.guard, filter(Address.isWatchOnly))
-export const selectActiveSpendable = pipe(AddressMap.guard, filter(allPass([Address.isActive, Address.isNotWatchOnly])))
-export const selectActiveUnspendable = pipe(AddressMap.guard, filter(allPass([Address.isActive, Address.isWatchOnly])))
 
 export const deleteAddress = curry((string, addressMap) =>
   pipe(AddressMap.guard, amap => amap.delete(string))(addressMap)