Merge pull request #1735 from blockchain/feat/pit-send-dropdown

Feat/pit send dropdown

Author: plondon

packages/blockchain-info-components/src/Buttons/Button.js

@@ -180,6 +180,7 @@ Button.propTypes = {
     'gray-3',
     'light',
     'primary',
+    'purple',
     'received',
     'secondary',
     'sent',

packages/blockchain-wallet-v4-frontend/src/components/Form/SelectBoxBchAddresses/selectors.js

@@ -54,7 +54,8 @@ export const getData = (state, ownProps) => {
     excludeWatchOnly,
     excludeImported,
     excludeLockbox,
-    includeAll = true
+    includeAll = true,
+    includePitAddress
   } = ownProps
   const buildDisplay = wallet => {
     if (has('balance', wallet)) {
@@ -71,6 +72,13 @@ export const getData = (state, ownProps) => {
   const excluded = filter(x => !exclude.includes(x.label))
   const toDropdown = map(x => ({ label: buildDisplay(x), value: x }))
   const toGroup = curry((label, options) => [{ label, options }])
+  const toPit = x => [{ label: `My PIT BCH Address`, value: x }]
+
+  const pitAddress = selectors.components.send.getPaymentsAccountPit(
+    'BCH',
+    state
+  )
+  const hasPitAddress = Remote.Success.is(pitAddress)
 
   const formatAddress = addressData => {
     const formattedAddress = {}
@@ -133,9 +141,12 @@ export const getData = (state, ownProps) => {
             .getLockboxBchBalances(state)
             .map(excluded)
             .map(toDropdown)
-            .map(toGroup('Lockbox'))
-    ]).map(([b1, b2, b3]) => {
-      const data = reduce(concat, [], [b1, b2, b3])
+            .map(toGroup('Lockbox')),
+      includePitAddress && hasPitAddress
+        ? pitAddress.map(toPit).map(toGroup('The PIT'))
+        : Remote.of([])
+    ]).map(([b1, b2, b3, b4]) => {
+      const data = reduce(concat, [], [b1, b2, b3, b4])
       if (includeAll) {
         return { data: prepend(allWallets, data) }
       } else if (excludeHDWallets) {

packages/blockchain-wallet-v4-frontend/src/components/Form/SelectBoxBtcAddresses/selectors.js

@@ -46,7 +46,8 @@ export const getData = (state, ownProps) => {
     excludeHDWallets,
     excludeImported,
     excludeLockbox,
-    includeAll = true
+    includeAll = true,
+    includePitAddress
   } = ownProps
   const buildDisplay = wallet => {
     if (has('balance', wallet)) {
@@ -62,6 +63,13 @@ export const getData = (state, ownProps) => {
   const excluded = filter(x => !exclude.includes(x.label))
   const toDropdown = map(x => ({ label: buildDisplay(x), value: x }))
   const toGroup = curry((label, options) => [{ label, options }])
+  const toPit = x => [{ label: `My PIT BTC Address`, value: x }]
+
+  const pitAddress = selectors.components.send.getPaymentsAccountPit(
+    'BTC',
+    state
+  )
+  const hasPitAddress = Remote.Success.is(pitAddress)
 
   const getAddressesData = () => {
     return sequence(Remote.of, [
@@ -95,9 +103,12 @@ export const getData = (state, ownProps) => {
             .getLockboxBtcBalances(state)
             .map(excluded)
             .map(toDropdown)
-            .map(toGroup('Lockbox'))
-    ]).map(([b1, b2, b3]) => {
-      const data = reduce(concat, [], [b1, b2, b3])
+            .map(toGroup('Lockbox')),
+      includePitAddress && hasPitAddress
+        ? pitAddress.map(toPit).map(toGroup('The PIT'))
+        : Remote.of([])
+    ]).map(([b1, b2, b3, b4]) => {
+      const data = reduce(concat, [], [b1, b2, b3, b4])
       if (includeAll) {
         return { data: prepend(allWallets, data) }
       } else if (excludeHDWallets) {

packages/blockchain-wallet-v4-frontend/src/components/Form/SelectBoxEthAddresses/selectors.js

@@ -1,9 +1,9 @@
-import { concat, curry, filter, has, map, sequence } from 'ramda'
+import { concat, curry, filter, has, map, reduce, sequence } from 'ramda'
 import { Exchange, Remote } from 'blockchain-wallet-v4/src'
 import { selectors } from 'data'
 
 export const getEthData = (state, ownProps) => {
-  const { exclude = [], excludeLockbox } = ownProps
+  const { exclude = [], excludeLockbox, includePitAddress } = ownProps
   const displayEtherFixed = data => {
     const etherAmount = Exchange.convertEtherToEther(data)
     return Exchange.displayEtherToEther({
@@ -26,6 +26,13 @@ export const getEthData = (state, ownProps) => {
   const excluded = filter(x => !exclude.includes(x.label))
   const toDropdown = map(x => ({ label: buildDisplay(x), value: x }))
   const toGroup = curry((label, options) => [{ label, options, value: '' }])
+  const toPit = x => [{ label: `My PIT ETH Address`, value: x }]
+
+  const pitAddress = selectors.components.send.getPaymentsAccountPit(
+    'ETH',
+    state
+  )
+  const hasPitAddress = Remote.Success.is(pitAddress)
 
   const getAddressesData = () => {
     return sequence(Remote.of, [
@@ -40,15 +47,18 @@ export const getEthData = (state, ownProps) => {
             .getLockboxEthBalances(state)
             .map(excluded)
             .map(toDropdown)
-            .map(toGroup('Lockbox'))
-    ]).map(([b1, b2]) => ({ data: concat(b1, b2) }))
+            .map(toGroup('Lockbox')),
+      includePitAddress && hasPitAddress
+        ? pitAddress.map(toPit).map(toGroup('The PIT'))
+        : Remote.of([])
+    ]).map(([b1, b2, b3]) => ({ data: reduce(concat, [], [b1, b2, b3]) }))
   }
 
   return getAddressesData()
 }
 
 export const getErc20Data = (state, ownProps) => {
-  const { coin, exclude = [] } = ownProps
+  const { coin, exclude = [], includePitAddress } = ownProps
   const displayErc20Fixed = data => {
     // TODO: ERC20 make more generic
     if (coin === 'PAX') {
@@ -72,6 +82,13 @@ export const getErc20Data = (state, ownProps) => {
   }
   const toDropdown = map(x => ({ label: buildDisplay(x), value: x }))
   const toGroup = curry((label, options) => [{ label, options }])
+  const toPit = x => [{ label: `My PIT ${coin} Address`, value: x }]
+
+  const pitAddress = selectors.components.send.getPaymentsAccountPit(
+    coin,
+    state
+  )
+  const hasPitAddress = Remote.Success.is(pitAddress)
 
   const getAddressesData = () => {
     return sequence(Remote.of, [
@@ -80,8 +97,11 @@ export const getErc20Data = (state, ownProps) => {
         .map(excluded)
         .map(toDropdown)
         .map(toGroup('Wallet')),
-      Remote.of([])
-    ]).map(([b1, b2]) => ({ data: concat(b1, b2) }))
+      Remote.of([]),
+      includePitAddress && hasPitAddress
+        ? pitAddress.map(toPit).map(toGroup('The PIT'))
+        : Remote.of([])
+    ]).map(([b1, b2, b3]) => ({ data: reduce(concat, [], [b1, b2, b3]) }))
   }
 
   return getAddressesData()

packages/blockchain-wallet-v4-frontend/src/components/Form/SelectBoxXlmAddresses/selectors.js

@@ -1,4 +1,4 @@
-import { concat, curry, filter, has, map, sequence } from 'ramda'
+import { concat, curry, filter, has, map, reduce, sequence } from 'ramda'
 import { Exchange, Remote } from 'blockchain-wallet-v4/src'
 import { selectors } from 'data'
 import { createDeepEqualSelector } from 'services/ReselectHelper'
@@ -7,10 +7,19 @@ export const getData = createDeepEqualSelector(
   [
     selectors.core.common.xlm.getAccountBalances,
     selectors.core.common.xlm.getLockboxXlmBalances,
+    selectors.components.send.getPaymentsAccountPit('XLM'),
+    (state, { includePitAddress }) => includePitAddress,
     (state, { exclude }) => exclude,
     (state, { excludeLockbox }) => excludeLockbox
   ],
-  (walletBalances, lockboxBalances, exclude = [], excludeLockbox) => {
+  (
+    walletBalances,
+    lockboxBalances,
+    pitAddress,
+    includePitAddress,
+    exclude = [],
+    excludeLockbox
+  ) => {
     const buildDisplay = wallet => {
       if (has('balance', wallet)) {
         let xlmDisplay = Exchange.displayXlmToXlm({
@@ -25,6 +34,9 @@ export const getData = createDeepEqualSelector(
     const excluded = filter(x => !exclude.includes(x.label))
     const toDropdown = map(x => ({ label: buildDisplay(x), value: x }))
     const toGroup = curry((label, options) => [{ label, options }])
+    const toPit = x => [{ label: `My PIT XLM Address`, value: x }]
+
+    const hasPitAddress = Remote.Success.is(pitAddress)
 
     return sequence(Remote.of, [
       walletBalances
@@ -36,7 +48,10 @@ export const getData = createDeepEqualSelector(
         : lockboxBalances
             .map(excluded)
             .map(toDropdown)
-            .map(toGroup('Lockbox'))
-    ]).map(([b1, b2]) => ({ data: concat(b1, b2) }))
+            .map(toGroup('Lockbox')),
+      includePitAddress && hasPitAddress
+        ? pitAddress.map(toPit).map(toGroup('The PIT'))
+        : Remote.of([])
+    ]).map(([b1, b2, b3]) => ({ data: reduce(concat, [], [b1, b2, b3]) }))
   }
 )

packages/blockchain-wallet-v4-frontend/src/data/components/actionTypes.js

@@ -20,6 +20,7 @@ import * as requestBtc from './requestBtc/actionTypes'
 import * as requestBch from './requestBch/actionTypes'
 import * as requestEth from './requestEth/actionTypes'
 import * as requestXlm from './requestXlm/actionTypes'
+import * as send from './send/actionTypes'
 import * as sendBch from './sendBch/actionTypes'
 import * as sendBtc from './sendBtc/actionTypes'
 import * as sendEth from './sendEth/actionTypes'
@@ -53,6 +54,7 @@ export {
   requestBch,
   requestEth,
   requestXlm,
+  send,
   sendBch,
   sendBtc,
   sendEth,

packages/blockchain-wallet-v4-frontend/src/data/components/actions.js

@@ -20,6 +20,7 @@ import * as requestBtc from './requestBtc/actions'
 import * as requestBch from './requestBch/actions'
 import * as requestEth from './requestEth/actions'
 import * as requestXlm from './requestXlm/actions'
+import * as send from './send/actions'
 import * as sendBch from './sendBch/actions'
 import * as sendBtc from './sendBtc/actions'
 import * as sendEth from './sendEth/actions'
@@ -53,6 +54,7 @@ export {
   requestBch,
   requestEth,
   requestXlm,
+  send,
   sendBch,
   sendBtc,
   sendEth,

packages/blockchain-wallet-v4-frontend/src/data/components/reducers.js

@@ -8,6 +8,7 @@ import layoutWallet from './layoutWallet/reducers'
 import manageAddresses from './manageAddresses/reducers'
 import onfido from './onfido/reducers'
 import priceChart from './priceChart/reducers'
+import send from './send/reducers'
 import sendBch from './sendBch/reducers'
 import sendBtc from './sendBtc/reducers'
 import sendEth from './sendEth/reducers'
@@ -26,6 +27,7 @@ export default combineReducers({
   manageAddresses,
   onfido,
   priceChart,
+  send,
   sendBch,
   sendBtc,
   sendEth,

packages/blockchain-wallet-v4-frontend/src/data/components/sagaRegister.js

@@ -20,6 +20,7 @@ import requestBtc from './requestBtc/sagaRegister'
 import requestBch from './requestBch/sagaRegister'
 import requestEth from './requestEth/sagaRegister'
 import requestXlm from './requestXlm/sagaRegister'
+import send from './send/sagaRegister'
 import sendBch from './sendBch/sagaRegister'
 import sendBtc from './sendBtc/sagaRegister'
 import sendEth from './sendEth/sagaRegister'
@@ -53,6 +54,7 @@ export default ({ api, coreSagas, networks }) =>
     yield fork(requestBch({ networks }))
     yield fork(requestEth({ networks }))
     yield fork(requestXlm())
+    yield fork(send({ api }))
     yield fork(sendBch({ coreSagas, networks }))
     yield fork(sendBtc({ coreSagas, networks }))
     yield fork(sendEth({ api, coreSagas, networks }))

packages/blockchain-wallet-v4-frontend/src/data/components/sagas.js

@@ -18,6 +18,7 @@ import requestBtc from './requestBtc/sagas'
 import requestBch from './requestBch/sagas'
 import requestEth from './requestEth/sagas'
 import requestXlm from './requestXlm/sagas'
+import send from './send/sagas'
 import sendBch from './sendBch/sagas'
 import sendBtc from './sendBtc/sagas'
 import sendEth from './sendEth/sagas'
@@ -49,6 +50,7 @@ export default ({ api, coreSagas, networks }) => ({
   requestBch: requestBch(),
   requestEth: requestEth(),
   requestXlm: requestXlm(),
+  send: send({ api }),
   sendBch: sendBch({ coreSagas, networks }),
   sendBtc: sendBtc({ coreSagas, networks }),
   sendEth: sendEth({ api, coreSagas, networks }),