Merge pull request #2491 from LiskHQ/2302-support-swiss-franc

Support Swiss Franc (CHF) - Closes #2302

src/actions/service.js

@@ -6,15 +6,25 @@ import { errorToastDisplayed } from './toaster';
 export const pricesRetrieved = () => (dispatch, getState) => {
   const { settings: { token } } = getState();
   const activeToken = token.active;
+  const tickerReducer = (acc, key) => ({
+    ...acc,
+    [key.from]: {
+      ...acc[key.from],
+      [key.to]: key.rate,
+    },
+  });
 
   serviceAPI.getPriceTicker(activeToken)
-    .then(priceTicker => dispatch({
-      type: actionTypes.pricesRetrieved,
-      data: {
-        priceTicker,
-        activeToken,
-      },
-    }))
+    .then((priceTicker) => {
+      const priceTickerReduced = priceTicker.reduce(tickerReducer, {});
+      dispatch({
+        type: actionTypes.pricesRetrieved,
+        data: {
+          priceTicker: priceTickerReduced,
+          activeToken,
+        },
+      });
+    })
     .catch(() => dispatch(errorToastDisplayed(i18next.t('Error retrieving conversion rates.'))));
 };
 

src/actions/service.test.js

@@ -1,9 +1,10 @@
-import configureMockStore from 'redux-mock-store';
 import thunk from 'redux-thunk';
-import actionTypes from '../constants/actions';
-import serviceAPI from '../utils/api/service';
+import configureMockStore from 'redux-mock-store';
 import { pricesRetrieved, dynamicFeesRetrieved } from './service';
 import { initialState as settings } from '../store/reducers/settings';
+import actionTypes from '../constants/actions';
+import prices from '../../test/constants/prices';
+import serviceAPI from '../utils/api/service';
 
 const middlewares = [thunk];
 const mockStore = configureMockStore(middlewares);
@@ -19,8 +20,14 @@ describe('actions: service', () => {
 
   describe('pricesRetrieved', () => {
     it('should dispatch pricesRetrieved action with given data', async () => {
-      const tickers = { EUR: 1, USD: 1 };
-      serviceAPI.getPriceTicker.mockResolvedValueOnce(tickers);
+      const tickers = {
+        LSK: {
+          USD: prices.find(({ to }) => to === 'USD').rate,
+          EUR: prices.find(({ to }) => to === 'EUR').rate,
+          CHF: prices.find(({ to }) => to === 'CHF').rate,
+        },
+      };
+      serviceAPI.getPriceTicker.mockResolvedValueOnce(prices);
 
       await store.dispatch(pricesRetrieved());
 

src/components/converter/index.js

@@ -1,18 +1,18 @@
 /* istanbul ignore file */
 import { connect } from 'react-redux';
-
-import { settingsUpdated } from '../../actions/settings';
 import { pricesRetrieved } from '../../actions/service';
+import { settingsUpdated } from '../../actions/settings';
 import Converter from './converter';
+import settings from '../../constants/settings';
 
 const mapStateToProps = state => ({
   settings: state.settings,
   token: state.settings.token && state.settings.token.active,
   priceTicker: (state.service && state.service.priceTicker)
     ? state.service.priceTicker
     : {
-      LSK: { USD: '0', EUR: '0' },
-      BTC: { USD: '0', EUR: '0' },
+      LSK: settings.currencies.reduce((acc, key) => ({ ...acc, [key]: '0' })),
+      BTC: settings.currencies.reduce((acc, key) => ({ ...acc, [key]: '0' })),
     },
 });
 

src/constants/settings.js

@@ -1,5 +1,5 @@
 const settings = {
-  currencies: ['USD', 'EUR'],
+  currencies: ['USD', 'EUR', 'CHF'],
   keys: {
     loginKey: 'loginKey',
     liskCoreUrl: 'liskCoreUrl',

src/utils/api/btc/service.js

@@ -5,13 +5,13 @@ const liskServiceUrl = 'https://service.lisk.io';
 
 export const getPriceTicker = () => new Promise(async (resolve, reject) => {
   try {
-    const response = await popsicle.get(`${liskServiceUrl}/api/getPriceTicker`)
+    const response = await popsicle.get(`${liskServiceUrl}/api/v1/market/prices`)
       .use(popsicle.plugins.parse('json'));
 
-    if (response) {
-      resolve(response.body.tickers);
+    if (response.body.data.length) {
+      resolve(response.body.data);
     } else {
-      reject(response.body.tickers);
+      reject(response.body);
     }
   } catch (error) {
     reject(error);

src/utils/api/lsk/liskService.js

@@ -1,15 +1,14 @@
-// import popsicle from 'popsicle'; // doesn't work
-const popsicle = require('popsicle');
+import * as popsicle from 'popsicle';
 
 const liskServiceUrl = 'https://service.lisk.io';
 
 const liskServiceApi = {
   getPriceTicker: () => new Promise((resolve, reject) => {
-    popsicle.get(`${liskServiceUrl}/api/getPriceTicker`)
+    popsicle.get(`${liskServiceUrl}/api/v1/market/prices`)
       .use(popsicle.plugins.parse('json'))
       .then((response) => {
-        if (response.body.success) {
-          resolve(response.body.tickers);
+        if (response.body.data.length) {
+          resolve(response.body.data);
         } else {
           reject(response.body);
         }

test/constants/prices.js

@@ -0,0 +1,19 @@
+export default [{
+  code: 'LSK_USD',
+  from: 'LSK',
+  to: 'USD',
+  rate: '0.928182548039292',
+  updateTimestamp: 1569501933,
+}, {
+  code: 'LSK_EUR',
+  from: 'LSK',
+  to: 'EUR',
+  rate: '0.8464144752',
+  updateTimestamp: 1569501816,
+}, {
+  code: 'LSK_CHF',
+  from: 'LSK',
+  to: 'CHF',
+  rate: '0.923896066',
+  updateTimestamp: 1569501933,
+}];