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/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