fix(swap): make swap coins more dynamic

blockchain · Jul 15, 2021 · 6804a99 · 6804a99
1 parent 7077346
commit 6804a99
Show file tree

Hide file tree

Showing 10 changed files with 33 additions and 36 deletions.
diff --git a/packages/blockchain-wallet-v4-frontend/src/data/coins/model/swap.ts b/packages/blockchain-wallet-v4-frontend/src/data/coins/model/swap.ts
@@ -15,7 +15,6 @@ export const SUPPORTED_COINS: Array<CoinType | string> = [
 
 // used in the coin/account selector in Swap
 export const SWAP_ACCOUNTS_SELECTOR: CoinAccountSelectorType = {
-  coins: SUPPORTED_COINS,
   nonCustodialAccounts: true,
   tradingAccounts: true
 }
diff --git a/packages/blockchain-wallet-v4-frontend/src/data/coins/selectors/index.ts b/packages/blockchain-wallet-v4-frontend/src/data/coins/selectors/index.ts
@@ -83,12 +83,7 @@ export const getCoinAccounts = (state: RootState, ownProps: CoinAccountSelectorT
     { [key in CoinType]: Array<SwapAccountType> }
   > = getCoinAccountsR(state)
 
-  const accounts = accountsR.getOrElse(
-    SUPPORTED_COINS.reduce((result, item) => {
-      result[item] = []
-      return result
-    }, {} as { [key in CoinType]: Array<SwapAccountType> })
-  )
+  const accounts = accountsR.getOrElse({})
 
   return accounts
 }
diff --git a/packages/blockchain-wallet-v4-frontend/src/data/components/swap/model.ts b/packages/blockchain-wallet-v4-frontend/src/data/components/swap/model.ts
@@ -2,13 +2,10 @@ import { CoinType, SwapOrderType } from 'blockchain-wallet-v4/src/types'
 
 export const FALLBACK_DELAY = 10_000 * 2
 
-export const getInput = (order: SwapOrderType) =>
-  order.pair.split('-')[0] as CoinType
+export const getInput = (order: SwapOrderType) => order.pair.split('-')[0] as CoinType
 
-export const getOutput = (order: SwapOrderType) =>
-  order.pair.split('-')[1] as CoinType
+export const getOutput = (order: SwapOrderType) => order.pair.split('-')[1] as CoinType
 
 export const getInputFromPair = (pair: string) => pair.split('-')[0] as CoinType
 
-export const getOutputFromPair = (pair: string) =>
-  pair.split('-')[1] as CoinType
+export const getOutputFromPair = (pair: string) => pair.split('-')[1] as CoinType
diff --git a/packages/blockchain-wallet-v4-frontend/src/data/components/swap/sagas.ts b/packages/blockchain-wallet-v4-frontend/src/data/components/swap/sagas.ts
@@ -412,7 +412,8 @@ export default ({ api, coreSagas, networks }: { api: APIType; coreSagas; network
       return
     }
 
-    const accounts = getCoinAccounts(yield select(), SWAP_ACCOUNTS_SELECTOR)
+    const coins = S.getCoins()
+    const accounts = getCoinAccounts(yield select(), { coins, ...SWAP_ACCOUNTS_SELECTOR })
     const baseAccount = accounts[initSwapFormValues.BASE.coin].find(
       (val) => val.label === initSwapFormValues.BASE?.label
     )

diff --git a/packages/blockchain-wallet-v4-frontend/src/data/components/swap/selectors.ts b/packages/blockchain-wallet-v4-frontend/src/data/components/swap/selectors.ts
@@ -87,3 +87,6 @@ export const getIncomingAmount = (state: RootState) => {
     }
   })(quoteR)
 }
+
+export const getCoins = () =>
+  Object.keys(window.coins).filter((coin) => !window.coins[coin].coinfig.type.isFiat)
diff --git a/packages/blockchain-wallet-v4-frontend/src/modals/SimpleBuy/CryptoSelection/selectors.ts b/packages/blockchain-wallet-v4-frontend/src/modals/SimpleBuy/CryptoSelection/selectors.ts
@@ -21,7 +21,8 @@ export const getData = (state) => {
   const walletCurrencyR = selectors.core.settings.getCurrency(state)
 
   // for sell, get 'swap' accounts
-  const accounts = getCoinAccounts(state, SWAP_ACCOUNTS_SELECTOR)
+  const coins = selectors.components.swap.getCoins()
+  const accounts = getCoinAccounts(state, { coins, ...SWAP_ACCOUNTS_SELECTOR })
 
   return lift(
     (

diff --git a/packages/blockchain-wallet-v4-frontend/src/modals/Swap/CoinSelection/index.tsx b/packages/blockchain-wallet-v4-frontend/src/modals/Swap/CoinSelection/index.tsx
@@ -124,7 +124,7 @@ class CoinSelection extends PureComponent<Props> {
             )}
           </Text>
         </StickyHeaderFlyoutWrapper>
-        {SUPPORTED_COINS.map((coin) => {
+        {coins?.map((coin) => {
           const accounts = (this.props.accounts[coin] as Array<SwapAccountType>) || []
           return accounts.map((account) => {
             const isAccountSelected = this.checkAccountSelected(this.props.side, values, account)
@@ -170,6 +170,7 @@ class CoinSelection extends PureComponent<Props> {
 }
 
 const mapStateToProps = (state: RootState, ownProps: OwnProps) => ({
+  coins: selectors.components.swap.getCoins(),
   custodialEligibility: selectors.components.swap.getCustodialEligibility(state).getOrElse(false),
   values: selectors.form.getFormValues('initSwap')(state) as InitSwapFormValuesType,
   ...getData(state, ownProps)

diff --git a/packages/blockchain-wallet-v4-frontend/src/modals/Swap/CoinSelection/selectors.ts b/packages/blockchain-wallet-v4-frontend/src/modals/Swap/CoinSelection/selectors.ts
@@ -11,7 +11,8 @@ import { RootState } from 'data/rootReducer'
 import { OwnProps } from '.'
 
 export const getData = (state: RootState, { side }: OwnProps) => {
-  const accounts = getCoinAccounts(state, SWAP_ACCOUNTS_SELECTOR)
+  const coins = selectors.components.swap.getCoins()
+  const accounts = getCoinAccounts(state, { coins, ...SWAP_ACCOUNTS_SELECTOR })
   const pairs = selectors.components.swap.getPairs(state).getOrElse([])
   let coinsForSide
 
@@ -22,17 +23,14 @@ export const getData = (state: RootState, { side }: OwnProps) => {
   coinsForSide = uniq(pairs.map(sideF))
 
   // This will only work if the coin is disabled for to and from
-  const accountsForSide = coinsForSide.reduce(
-    (prevValue, curValue: CoinType) => {
-      if (!prevValue[curValue]) {
-        return {
-          ...prevValue,
-          [curValue]: accounts[curValue]
-        }
+  const accountsForSide = coinsForSide.reduce((prevValue, curValue: CoinType) => {
+    if (!prevValue[curValue]) {
+      return {
+        ...prevValue,
+        [curValue]: accounts[curValue]
       }
-    },
-    {}
-  ) as { [key in CoinType]: Array<SwapAccountType> }
+    }
+  }, {}) as { [key in CoinType]: Array<SwapAccountType> }
 
   return { accounts: accountsForSide }
 }
diff --git a/packages/blockchain-wallet-v4-frontend/src/modals/Swap/EnterAmount/selectors.ts b/packages/blockchain-wallet-v4-frontend/src/modals/Swap/EnterAmount/selectors.ts
@@ -22,7 +22,8 @@ export const getData = (state: RootState) => {
     state
   )
   const walletCurrencyR = selectors.core.settings.getCurrency(state)
-  const accounts = getCoinAccounts(state, SWAP_ACCOUNTS_SELECTOR)
+  const coins = selectors.components.swap.getCoins()
+  const accounts = getCoinAccounts(state, { coins, ...SWAP_ACCOUNTS_SELECTOR })
   return lift(
     (
       incomingAmount: ExtractSuccess<typeof incomingAmountR>,
@@ -39,7 +40,7 @@ export const getData = (state: RootState) => {
       limits,
       payment: paymentR.getOrElse(undefined),
       quote,
-      walletCurrency,
+      walletCurrency
     })
   )(incomingAmountR, limitsR, quoteR, baseRatesR, walletCurrencyR)
 }

diff --git a/packages/blockchain-wallet-v4-frontend/src/modals/Swap/InitSwapForm/selectors.ts b/packages/blockchain-wallet-v4-frontend/src/modals/Swap/InitSwapForm/selectors.ts
@@ -1,11 +1,12 @@
-import { createDeepEqualSelector } from 'blockchain-wallet-v4/src/utils'
+import { selectors } from 'data'
 import { SWAP_ACCOUNTS_SELECTOR } from 'data/coins/model/swap'
 import { getCoinAccounts } from 'data/coins/selectors'
 import { RootState } from 'data/rootReducer'
 
-export const getData = createDeepEqualSelector(
-  [(state: RootState) => getCoinAccounts(state, SWAP_ACCOUNTS_SELECTOR)],
-  accounts => {
-    return { accounts }
-  }
-)
+export const getData = (state: RootState) => {
+  const coins = selectors.components.swap.getCoins()
+  const accounts = getCoinAccounts(state, { coins, ...SWAP_ACCOUNTS_SELECTOR })
+  return { accounts }
+}
+
+export default getData