feat(no watch only in bch send dropdown)

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

@@ -1,9 +1,9 @@
-import { assoc, assocPath, compose, concat, filter, lift, map, path, prop, sequence } from 'ramda'
+import { assoc, assocPath, compose, concat, filter, isNil, lift, map, not, path, prop, sequence } from 'ramda'
 import { Remote } from 'blockchain-wallet-v4/src'
 import { selectors } from 'data'
 
 export const getData = (state, ownProps) => {
-  const { coin, exclude = [], excludeImported } = ownProps
+  const { coin, exclude = [], excludeImported, noBchWatchOnly } = ownProps
   const isActive = filter(x => !x.archived)
   const excluded = filter(x => !exclude.includes(x.label))
   const toDropdown = map(x => ({ text: x.label, value: x }))
@@ -26,10 +26,14 @@ export const getData = (state, ownProps) => {
     switch (coin) {
       case 'BCH':
         const importedAddresses = selectors.core.common.bch.getActiveAddresses(state)
+        const filterRelevantAddresses = addrs =>
+          noBchWatchOnly ? filter(addr => not(isNil(prop('priv', addr))), addrs) : addrs
+        const relevantAddresses = lift(filterRelevantAddresses)(importedAddresses)
+
         return sequence(Remote.of,
           [
             selectors.core.common.bch.getAccountsBalances(state).map(isActive).map(excluded).map(toDropdown),
-            excludeImported ? Remote.of([]) : lift(formatImportedAddressesData)(importedAddresses)
+            excludeImported ? Remote.of([]) : lift(formatImportedAddressesData)(relevantAddresses)
           ]).map(([b1, b2]) => ({ data: concat(b1, b2) }))
       default:
         return sequence(Remote.of,

packages/blockchain-wallet-v4-frontend/src/modals/SendBch/FirstStep/template.success.js

@@ -47,7 +47,7 @@ const FirstStep = props => {
           <FormLabel for='from'>
             <FormattedMessage id='modals.sendBch.firststep.from' defaultMessage='From:' />
           </FormLabel>
-          <Field name='from' component={SelectBoxBitcoinAddresses} includeAll={false} validate={[required]} coin='BCH' />
+          <Field name='from' component={SelectBoxBitcoinAddresses} includeAll={false} noBchWatchOnly validate={[required]} coin='BCH' />
         </FormItem>
       </FormGroup>
       <FormGroup margin={'15px'}>