Skip to content

Commit

Permalink
fix(exchange history saga register)
Browse files Browse the repository at this point in the history
  • Loading branch information
sixtedemaupeou committed May 4, 2018
1 parent 5a9b19c commit 934bdd6
Show file tree
Hide file tree
Showing 6 changed files with 25 additions and 9 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -196,10 +196,11 @@
"modals.exchangedetails.send": "Funds sent",
"modals.exchangedetails.inprogress": "Exchange In Progress",
"modals.exchangedetails.complete": "Trade Complete",
"modals.exchangedetails.exchangerate": "Exchange rate:",
"modals.exchangedetails.explain": "Your exchange is complete.",
"modals.exchangedetails.explain2": "It may take a few minutes for the funds to show in your balance.",
"modals.exchangedetails.deposited": "{coin} deposited:",
"modals.exchangedetails.received": "Exchange rate:",
"modals.exchangedetails.received": "Received:",
"modals.exchangedetails.exchangetooltip": "This rate may change depending on the market price at the time of your transaction.",
"modals.exchangedetails.fee": "Transaction fee:",
"modals.exchangedetails.feetooltip": "This fee is used to send the outgoing exchange funds to ShapeShift.",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
import { takeEvery, takeLatest } from 'redux-saga/effects'
import * as AT from './actionTypes'
import sagas from './sagas'

export default ({ api, coreSagas }) => {
const exchangeHistorySagas = sagas({ api, coreSagas })

return function * () {
yield takeEvery(AT.EXCHANGE_HISTORY_INITIALIZED, exchangeHistorySagas.exchangeHistoryInitialized)
yield takeLatest(AT.EXCHANGE_HISTORY_MODAL_INITIALIZED, exchangeHistorySagas.exchangeHistoryModalInitialized)
yield takeLatest(AT.EXCHANGE_HISTORY_MODAL_DESTROYED, exchangeHistorySagas.exchangeHistoryModalDestroyed)
}
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import { cancel, call, fork, put, select, takeEvery, takeLatest } from 'redux-saga/effects'
import { cancel, call, fork, put, select } from 'redux-saga/effects'
import { delay } from 'redux-saga'
import { equals, identity, path, prop } from 'ramda'
import * as AT from './actionTypes'
import { actions, selectors } from 'data'

export default ({ api, coreSagas }) => {
Expand Down Expand Up @@ -71,9 +70,9 @@ export default ({ api, coreSagas }) => {
}
}

return function * () {
yield takeEvery(AT.EXCHANGE_HISTORY_INITIALIZED, exchangeHistoryInitialized)
yield takeLatest(AT.EXCHANGE_HISTORY_MODAL_INITIALIZED, exchangeHistoryModalInitialized)
yield takeLatest(AT.EXCHANGE_HISTORY_MODAL_DESTROYED, exchangeHistoryModalDestroyed)
return {
exchangeHistoryInitialized,
exchangeHistoryModalInitialized,
exchangeHistoryModalDestroyed
}
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { fork } from 'redux-saga/effects'
import exchange from './exchange/sagaRegister'
import exchangeHistory from './exchangeHistory/sagaRegister'
import importBtcAddress from './importBtcAddress/sagaRegister'
import priceChart from './priceChart/sagaRegister'
import priceTicker from './priceTicker/sagaRegister'
Expand All @@ -11,6 +12,7 @@ import usedAddresses from './usedAddresses/sagaRegister'

export default ({ api, coreSagas }) => function * () {
yield fork(exchange({ api, coreSagas }))
yield fork(exchangeHistory({ api, coreSagas }))
yield fork(importBtcAddress({ api, coreSagas }))
yield fork(priceChart({ coreSagas }))
yield fork(priceTicker({ coreSagas }))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ const ExchangeDetails = (props) => {
<TableRow>
<TableCell>
<Text size='13px' weight={400}>
<FormattedMessage id='modals.exchangedetails.received' defaultMessage='Exchange rate:' />
<FormattedMessage id='modals.exchangedetails.exchangerate' defaultMessage='Exchange rate:' />
</Text>
<Tooltip>
<FormattedMessage id='modals.exchangedetails.exchangetooltip' defaultMessage='This rate may change depending on the market price at the time of your transaction.' />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
import React from 'react'
import { connect } from 'react-redux'
import { bindActionCreators } from 'redux'
import { concat } from 'ramda'

import { actions } from 'data'
import List from './template'

class ListContainer extends React.PureComponent {
componentDidMount () {
this.props.actions.initialized(this.props.incomplete)
this.props.actions.initialized(concat(this.props.incomplete, this.props.complete))
}

render () {
Expand Down

0 comments on commit 934bdd6

Please sign in to comment.