fix(BSV): Populate from with selected account

blockchain · Dec 31, 2018 · 2bc2590 · 2bc2590
1 parent 5dccabe
commit 2bc2590
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 7 deletions.
diff --git a/packages/blockchain-wallet-v4-frontend/src/data/components/sendBsv/actions.js b/packages/blockchain-wallet-v4-frontend/src/data/components/sendBsv/actions.js
@@ -1,6 +1,9 @@
 import * as AT from './actionTypes'
 
-export const initialized = () => ({ type: AT.SEND_BSV_INITIALIZED })
+export const initialized = index => ({
+  type: AT.SEND_BSV_INITIALIZED,
+  payload: { index }
+})
 export const destroyed = () => ({ type: AT.SEND_BSV_DESTROYED })
 export const sendBsvPaymentUpdated = payment => ({
   type: AT.SEND_BSV_PAYMENT_UPDATED,

diff --git a/packages/blockchain-wallet-v4-frontend/src/data/components/sendBsv/sagas.js b/packages/blockchain-wallet-v4-frontend/src/data/components/sendBsv/sagas.js
@@ -21,8 +21,10 @@ export const logLocation = 'components/sendBsv/sagas'
 export const bsvDefaultFee = 4
 
 export default ({ coreSagas }) => {
-  const initialized = function*() {
+  const initialized = function*(action) {
     try {
+      const { payload } = action
+      const { index } = payload
       yield put(A.sendBsvPaymentUpdated(Remote.Loading))
       let payment = coreSagas.payment.bsv.create({
         network: settings.NETWORK_BSV
@@ -34,7 +36,7 @@ export default ({ coreSagas }) => {
       const defaultIndexR = yield select(
         selectors.core.kvStore.bsv.getDefaultAccountIndex
       )
-      const defaultIndex = defaultIndexR.getOrElse(0)
+      const defaultIndex = index || defaultIndexR.getOrElse(0)
       const defaultAccountR = accountsR.map(nth(defaultIndex))
       payment = yield payment.from(defaultIndex, ADDRESS_TYPES.ACCOUNT)
       payment = yield payment.fee(bsvDefaultFee)

diff --git a/packages/blockchain-wallet-v4-frontend/src/modals/Bsv/SendBsv/index.js b/packages/blockchain-wallet-v4-frontend/src/modals/Bsv/SendBsv/index.js
@@ -11,7 +11,7 @@ import SecondStep from './SecondStep'
 
 class SendBsvContainer extends React.PureComponent {
   componentDidMount () {
-    this.props.actions.initialized()
+    this.props.actions.initialized(this.props.index)
   }
 
   componentWillUnmount () {

diff --git a/packages/blockchain-wallet-v4-frontend/src/scenes/Settings/Addresses/Bsv/Wallets/index.js b/packages/blockchain-wallet-v4-frontend/src/scenes/Settings/Addresses/Bsv/Wallets/index.js
@@ -13,8 +13,8 @@ class BsvWalletsContainer extends React.Component {
     return !Remote.Loading.is(nextProps.data)
   }
 
-  onSendBsv = () => {
-    this.props.modalActions.showModal(model.components.sendBsv.MODAL)
+  onSendBsv = index => {
+    this.props.modalActions.showModal(model.components.sendBsv.MODAL, { index })
   }
 
   onSwapBsv = account => {}

diff --git a/packages/blockchain-wallet-v4-frontend/src/scenes/Settings/Addresses/Bsv/Wallets/template.js b/packages/blockchain-wallet-v4-frontend/src/scenes/Settings/Addresses/Bsv/Wallets/template.js
@@ -148,7 +148,11 @@ const Success = props => {
                     flexBasis: '20%'
                   }}
                 >
-                  <ClickableText weight={400} size='13px' onClick={onSendBsv}>
+                  <ClickableText
+                    weight={400}
+                    size='13px'
+                    onClick={() => onSendBsv(i)}
+                  >
                     <FormattedMessage
                       id='scenes.settings.addresses.bsv.wallets.send'
                       defaultMessage='Send'