Fix: make percentage chart work properly

Fix: code review

Fix: rework components according to PR requested changes

Fix: fix repeated code buildRatesNoCommission

Also renames id to deviceId in transactions quer

Fix: pr requested changes

Chore: move inline styles to classes

Chore: remove comment

Fix: bad equality !process.env.NODE_ENV === 'production'

lib/forex.js

@@ -0,0 +1,5 @@
+const axios = require('axios')
+
+const getFiatRates = () => axios.get('https://bitpay.com/api/rates').then(response => response.data)
+
+module.exports = { getFiatRates }

lib/new-admin/graphql/schema.js

@@ -18,12 +18,11 @@ const couponManager = require('../../coupons')
 const serverVersion = require('../../../package.json').version
 const transactions = require('../transactions')
 const funding = require('../funding')
+const forex = require('../../forex')
 const supervisor = require('../supervisor')
 const serverLogs = require('../server-logs')
 const pairing = require('../pairing')
-
 const plugins = require('../../plugins')
-const ticker = require('../../ticker')
 
 const {
   accounts: accountsConfig,
@@ -240,6 +239,8 @@ const typeDefs = gql`
     created: Date
     age: Float
     deviceTime: Date
+  }
+
   type Rate {
     code: String
     name: String
@@ -268,25 +269,22 @@ const typeDefs = gql`
       until: Date
       limit: Int
       offset: Int
-      id: ID
+      deviceId: ID
     ): [Transaction]
     transactionsCsv(from: Date, until: Date, limit: Int, offset: Int): String
     accounts: JSONObject
     config: JSONObject
     blacklist: [Blacklist]
     # userTokens: [UserToken]
-<<<<<<< HEAD
     coupons: [Coupon]
+    cryptoRates: JSONObject
+    fiatRates: [Rate]
   }
 
   type SupportLogsResponse {
     id: ID!
     timestamp: Date!
     deviceId: ID
-=======
-    rates: JSONObject
-    btcRates(to: String, from: String): [Rate]
->>>>>>> 9d88b4f... Feat: make dashboard and machine profile page
   }
 
   enum MachineAction {
@@ -356,15 +354,26 @@ const resolvers = {
       serverLogs.getServerLogs(from, until, limit, offset),
     serverLogsCsv: (...[, { from, until, limit, offset }]) =>
       serverLogs.getServerLogs(from, until, limit, offset).then(parseAsync),
-    transactions: (...[, { from, until, limit, offset, id }]) =>
-      transactions.batch(from, until, limit, offset, id),
+    transactions: (...[, { from, until, limit, offset, deviceId }]) =>
+      transactions.batch(from, until, limit, offset, deviceId),
     transactionsCsv: (...[, { from, until, limit, offset }]) =>
       transactions.batch(from, until, limit, offset).then(parseAsync),
     config: () => settingsLoader.loadLatestConfigOrNone(),
     accounts: () => settingsLoader.loadAccounts(),
     blacklist: () => blacklist.getBlacklist(),
     // userTokens: () => tokenManager.getTokenList()
-    coupons: () => couponManager.getAvailableCoupons()
+    coupons: () => couponManager.getAvailableCoupons(),
+    cryptoRates: () =>
+      settingsLoader.loadLatest().then(settings => {
+        const pi = plugins(settings)
+        return pi.getRawRates().then(r => {
+          return {
+            withCommissions: pi.buildRates(r),
+            withoutCommissions: pi.buildRatesNoCommission(r)
+          }
+        })
+    }),
+    fiatRates: () => forex.getFiatRates()
   },
   Mutation: {
     machineAction: (...[, { deviceId, action, cashbox, cassette1, cassette2, newName }]) => machineAction({ deviceId, action, cashbox, cassette1, cassette2, newName }),

lib/new-admin/transactions.js

@@ -24,19 +24,8 @@ function addNames (txs) {
 
 const camelize = _.mapKeys(_.camelCase)
 
-function batch (
-  from = new Date(0).toISOString(),
-  until = new Date().toISOString(),
-  limit = null,
-  offset = 0,
-  id = null
-) {
-  const packager = _.flow(
-    _.flatten,
-    _.orderBy(_.property('created'), ['desc']),
-    _.map(camelize),
-    addNames
-  )
+function batch (from = new Date(0).toISOString(), until = new Date().toISOString(), limit = null, offset = 0, id = null) {
+  const packager = _.flow(_.flatten, _.orderBy(_.property('created'), ['desc']), _.map(camelize), addNames)
 
   const cashInSql = `select 'cashIn' as tx_class, txs.*,
   c.phone as customer_phone,
@@ -47,7 +36,7 @@ function batch (
   c.front_camera_path as customer_front_camera_path,
   c.id_card_photo_path as customer_id_card_photo_path,
   ((not txs.send_confirmed) and (txs.created <= now() - interval $1)) as expired
-  from cash_in_txs as txs 
+  from cash_in_txs as txs
   left outer join customers c on txs.customer_id = c.id
   where txs.created >= $2 and txs.created <= $3 ${
     id !== null ? `and txs.device_id = $6` : ``
@@ -65,7 +54,7 @@ function batch (
   c.front_camera_path as customer_front_camera_path,
   c.id_card_photo_path as customer_id_card_photo_path,
   (extract(epoch from (now() - greatest(txs.created, txs.confirmed_at))) * 1000) >= $1 as expired
-  from cash_out_txs txs 
+  from cash_out_txs txs
   inner join cash_out_actions actions on txs.id = actions.tx_id
   and actions.action = 'provisionAddress'
   left outer join customers c on txs.customer_id = c.id

lib/plugins.js

@@ -35,7 +35,8 @@ const PONG_TTL = '1 week'
 const tradesQueues = {}
 
 function plugins (settings, deviceId) {
-  function buildRatesNoCommission (tickers) {
+
+  function internalBuildRates (tickers, withCommission = true) {
     const localeConfig = configManager.getLocale(deviceId, settings.config)
     const cryptoCodes = localeConfig.cryptoCurrencies
 
@@ -43,30 +44,7 @@ function plugins (settings, deviceId) {
 
     cryptoCodes.forEach((cryptoCode, i) => {
       const rateRec = tickers[i]
-
-      if (!rateRec) return
-
-      if (Date.now() - rateRec.timestamp > STALE_TICKER)
-        return logger.warn('Stale rate for ' + cryptoCode)
-      const rate = rateRec.rates
-      rates[cryptoCode] = {
-        cashIn: rate.ask.round(5),
-        cashOut: rate.bid.round(5)
-      }
-    })
-
-    return rates
-  }
-
-  function buildRates (tickers) {
-    const localeConfig = configManager.getLocale(deviceId, settings.config)
-    const cryptoCodes = localeConfig.cryptoCurrencies
-
-    const rates = {}
-
-    cryptoCodes.forEach((cryptoCode, i) => {
       const commissions = configManager.getCommissions(cryptoCode, deviceId, settings.config)
-      const rateRec = tickers[i]
 
       if (!rateRec) return
 
@@ -78,15 +56,26 @@ function plugins (settings, deviceId) {
 
       if (Date.now() - rateRec.timestamp > STALE_TICKER) return logger.warn('Stale rate for ' + cryptoCode)
       const rate = rateRec.rates
-      rates[cryptoCode] = {
+
+      withCommission ? rates[cryptoCode] = {
         cashIn: rate.ask.mul(cashInCommission).round(5),
         cashOut: cashOutCommission && rate.bid.div(cashOutCommission).round(5)
+      } : rates[cryptoCode] = {
+        cashIn: rate.ask.round(5),
+        cashOut: rate.bid.round(5)
       }
     })
-
     return rates
   }
 
+  function buildRatesNoCommission (tickers) {
+    return internalBuildRates(tickers, false)
+  }
+
+  function buildRates (tickers) {
+    return internalBuildRates(tickers, true)
+  }
+
   function getNotificationConfig () {
     return configManager.getGlobalNotifications(settings.config)
   }

lib/ticker.js

@@ -2,7 +2,6 @@ const mem = require('mem')
 const configManager = require('./new-config-manager')
 const ph = require('./plugin-helper')
 const logger = require('./logger')
-const axios = require('axios')
 
 const lastRate = {}
 
@@ -40,26 +39,4 @@ const getRates = mem(_getRates, {
   cacheKey: (settings, fiatCode, cryptoCode) => JSON.stringify([fiatCode, cryptoCode])
 })
 
-const getBtcRates = (to = null, from = 'USD') => {
-  // if to !== null, then we return only the rates with from (default USD) and to (so an array with 2 items)
-  return axios.get('https://bitpay.com/api/rates').then(response => {
-    const fxRates = response.data
-    if (to === null) {
-      return fxRates
-    }
-    const toRate = fxRates.find(o => o.code === to)
-    const fromRate = fxRates.find(o => o.code === from)
-
-    let res = []
-    if (toRate && to !== from) {
-      res = [...res, toRate]
-    }
-    if (fromRate) {
-      res = [...res, fromRate]
-    }
-
-    return res
-  })
-}
-
-module.exports = { getBtcRates, getRates }
+module.exports = { getRates }