fix(lockbox): correctly parse address when sending sending xlm betwee…

…n accounts
blockchain · Sep 16, 2019 · 20214e0 · 20214e0
1 parent d84903a
commit 20214e0
Showing 1 changed file with 13 additions and 10 deletions.
diff --git a/packages/blockchain-wallet-v4-frontend/src/data/components/sendXlm/sagas.js b/packages/blockchain-wallet-v4-frontend/src/data/components/sendXlm/sagas.js
@@ -1,9 +1,5 @@
 import { call, delay, put, select } from 'redux-saga/effects'
-import { equals, includes, path, pathOr, prop, head } from 'ramda'
-import * as A from './actions'
-import * as S from './selectors'
-import { FORM } from './model'
-import { actions, model, selectors } from 'data'
+import { equals, head, includes, last, path, pathOr, prop, propOr } from 'ramda'
 import {
   initialize,
   change,
@@ -12,12 +8,18 @@ import {
   stopSubmit,
   destroy
 } from 'redux-form'
+
+import { actions, model, selectors } from 'data'
 import * as C from 'services/AlertService'
 import * as Lockbox from 'services/LockboxService'
 import { promptForSecondPassword, promptForLockbox } from 'services/SagaService'
 import { Exchange } from 'blockchain-wallet-v4/src'
 import { ADDRESS_TYPES } from 'blockchain-wallet-v4/src/redux/payment/btc/utils'
 
+import * as A from './actions'
+import * as S from './selectors'
+import { FORM } from './model'
+
 const { TRANSACTION_EVENTS } = model.analytics
 export const logLocation = 'components/sendXlm/sagas'
 export const INITIAL_MEMO_TYPE = 'text'
@@ -87,19 +89,20 @@ export default ({ api, coreSagas }) => {
           payment = yield call(setFrom, payment, source, fromType)
           break
         case 'to':
-          const value = pathOr({}, ['value', 'value'], payload)
-          const splitValue = value.split(':')
-          const address = splitValue[0]
+          // payload may be either an account type (wallet/lockbox) or an address
+          let value = pathOr({}, ['value', 'value'], payload)
+          const splitValue = propOr(value, 'address', value).split(':')
+          const address = head(splitValue)
           payment = yield payment.to(address)
-          // Do not block payment update when to is changed w/ destinationAccount check
+          // do not block payment update when to is changed w/ destinationAccount check
           yield put(A.paymentUpdatedSuccess(payment.value()))
           // check if destination exists
           yield put(A.sendXlmCheckDestinationAccountExists(address))
           // check if destination is an exchange
           yield put(A.sendXlmCheckIfDestinationIsExchange(address))
           // PIT address split on : is [address, memo]
           if (splitValue.length > 1) {
-            const memo = splitValue[1]
+            const memo = last(splitValue)
             yield put(actions.form.change(FORM, 'memo', memo))
           }
           return