Skip to content
This repository has been archived by the owner on Nov 17, 2023. It is now read-only.

Commit

Permalink
refactor(reducer): simplify ticker reducer
Browse files Browse the repository at this point in the history
  • Loading branch information
korhaliv committed Jun 14, 2019
1 parent 8fd5971 commit d076cb6
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 32 deletions.
38 changes: 12 additions & 26 deletions renderer/reducers/ticker.js
@@ -1,7 +1,7 @@
import { createSelector } from 'reselect'
import get from 'lodash/get'
import { currencies, getDefaultCurrency } from '@zap/i18n'
import { requestTickerWithFallback } from '@zap/utils/fiat/exchange'
import { requestTickerWithFallback } from '@zap/utils/fiat/rateProvider'
import { infoSelectors } from './info'
import { putConfig, settingsSelectors } from './settings'
// ------------------------------------
Expand Down Expand Up @@ -46,11 +46,10 @@ export function getTickers() {
}
}

export function recieveTickers({ btcTicker, ltcTicker }) {
export function recieveTickers({ rates }) {
return {
type: RECIEVE_TICKERS,
btcTicker,
ltcTicker,
rates,
}
}

Expand All @@ -60,28 +59,27 @@ export const fetchTickers = () => async (dispatch, getState) => {
const currentConfig = settingsSelectors.currentConfig(state)
const currency = fiatTickerSelector(state)
dispatch(getTickers())
const tickers = await requestTickerWithFallback(currentConfig.rateProvider, chain, currency)
dispatch(recieveTickers({ btcTicker: tickers }))
const rates = await requestTickerWithFallback(currentConfig.rateProvider, chain, currency)
dispatch(recieveTickers({ rates }))

return tickers
return rates
}

// ------------------------------------
// Action Handlers
// ------------------------------------
const ACTION_HANDLERS = {
[GET_TICKERS]: state => ({ ...state, tickerLoading: true }),
[RECIEVE_TICKERS]: (state, { btcTicker }) => ({
[RECIEVE_TICKERS]: (state, { rates }) => ({
...state,
tickerLoading: false,
btcTicker,
rates,
}),
}

// Selectors
const cryptoUnitsSelector = state => state.ticker.cryptoUnits
const bitcoinTickerSelector = state => state.ticker.btcTicker
const litecoinTickerSelector = state => state.ticker.ltcTicker
const ratesSelector = state => state.ticker.rates
const fiatTickerSelector = state => settingsSelectors.currentConfig(state).currency
const fiatTickersSelector = state => state.ticker.fiatTickers
const tickerLoadingSelector = state => state.ticker.tickerLoading
Expand Down Expand Up @@ -110,19 +108,8 @@ tickerSelectors.cryptoUnit = createSelector(
)

tickerSelectors.currentTicker = createSelector(
chainSelector,
bitcoinTickerSelector,
litecoinTickerSelector,
(chain, btcTicker, ltcTicker) => {
switch (chain) {
case 'bitcoin':
return btcTicker
case 'litecoin':
return ltcTicker
default:
return null
}
}
ratesSelector,
rates => rates || {}
)

tickerSelectors.cryptoUnits = createSelector(
Expand Down Expand Up @@ -183,8 +170,7 @@ export { tickerSelectors }
// ------------------------------------
const initialState = {
tickerLoading: false,
btcTicker: null,
ltcTicker: null,
rates: null,
fiatTicker: getDefaultCurrency(),
fiatTickers: currencies,
cryptoUnits: {
Expand Down
7 changes: 1 addition & 6 deletions stories/Provider.js
Expand Up @@ -81,16 +81,11 @@ store.dispatch({
})
store.dispatch({
type: 'RECIEVE_TICKERS',
btcTicker: {
rates: {
EUR: '2992.105',
GBP: '2612.025',
USD: '3412.015',
},
ltcTicker: {
EUR: '27.005',
GBP: '23.605',
USD: '30.775',
},
})
store.dispatch({
type: 'FETCH_BALANCE_SUCCESS',
Expand Down

0 comments on commit d076cb6

Please sign in to comment.