Merge pull request #1759 from RafaelTaranto/backport/fixedfee-for-cashout

LAM-222 backport: fixedfee for cashout

lib/cash-out/cash-out-helper.js

@@ -51,7 +51,7 @@ const mapValuesWithKey = _.mapValues.convert({cap: false})
 
 function convertBigNumFields (obj) {
   const convert = (value, key) => {
-    if (_.includes(key, [ 'cryptoAtoms', 'receivedCryptoAtoms', 'fiat' ])) {
+    if (_.includes(key, [ 'cryptoAtoms', 'receivedCryptoAtoms', 'fiat', 'fixedFee', 'fixedFeeCrypto' ])) {
       return value.toString()
     }
 

lib/coinatmradar/coinatmradar.js

@@ -29,6 +29,7 @@ function mapCoin (rates, deviceId, settings, cryptoCode) {
   const cashInFee = showCommissions ? commissions.cashIn / 100 : null
   const cashOutFee = showCommissions ? commissions.cashOut / 100 : null
   const cashInFixedFee = showCommissions ? commissions.fixedFee : null
+  const cashOutFixedFee = showCommissions ? commissions.cashOutFixedFee : null
   const cashInRate = showCommissions ? _.invoke('cashIn.toNumber', buildedRates) : null
   const cashOutRate = showCommissions ? _.invoke('cashOut.toNumber', buildedRates) : null
 
@@ -37,6 +38,7 @@ function mapCoin (rates, deviceId, settings, cryptoCode) {
     cashInFee,
     cashOutFee,
     cashInFixedFee,
+    cashOutFixedFee,
     cashInRate,
     cashOutRate
   }

lib/graphql/resolvers.js

@@ -89,6 +89,7 @@ const staticConfig = ({ currentConfigVersion, deviceId, deviceName, pq, settings
     'cashInCommission',
     'cashInFee',
     'cashOutCommission',
+    'cashOutFee',
     'cryptoCode',
     'cryptoCodeDisplay',
     'cryptoNetwork',

lib/graphql/types.js

@@ -6,6 +6,7 @@ type Coin {
   display: String!
   minimumTx: String!
   cashInFee: String!
+  cashOutFee: String!
   cashInCommission: String!
   cashOutCommission: String!
   cryptoNetwork: String!

lib/new-admin/graphql/types/transaction.type.js

@@ -23,7 +23,7 @@ const typeDef = gql`
     errorCode: String
     operatorCompleted: Boolean
     sendPending: Boolean
-    cashInFee: String
+    fixedFee: String
     minimumTx: Float
     customerId: ID
     isAnonymous: Boolean

lib/new-admin/services/transactions.js

@@ -50,7 +50,19 @@ function batch (
   excludeTestingCustomers = false,
   simplified
 ) {
-  const packager = _.flow(_.flatten, _.orderBy(_.property('created'), ['desc']), _.map(camelize), addProfits, addNames)
+  const packager = _.flow(
+    _.flatten,
+    _.orderBy(_.property('created'), ['desc']),
+    _.map(_.flow(
+      camelize,
+      _.mapKeys(k =>
+        k == 'cashInFee' ? 'fixedFee' :
+        k
+      )
+    )),
+    addProfits,
+    addNames
+  )
 
   const cashInSql = `SELECT 'cashIn' AS tx_class, txs.*,
   c.phone AS customer_phone,
@@ -153,7 +165,7 @@ function batch (
 function advancedBatch (data) {
   const fields = ['txClass', 'id', 'deviceId', 'toAddress', 'cryptoAtoms',
   'cryptoCode', 'fiat', 'fiatCode', 'fee', 'status', 'fiatProfit', 'cryptoAmount',
-  'dispense', 'notified', 'redeem', 'phone', 'error',
+  'dispense', 'notified', 'redeem', 'phone', 'error', 'fixedFee',
   'created', 'confirmedAt', 'hdIndex', 'swept', 'timedout',
   'dispenseConfirmed', 'provisioned1', 'provisioned2', 'provisioned3', 'provisioned4',
   'provisionedRecycler1', 'provisionedRecycler2', 'provisionedRecycler3', 'provisionedRecycler4', 'provisionedRecycler5', 'provisionedRecycler6',
@@ -169,7 +181,9 @@ function advancedBatch (data) {
     ...it,
     status: getStatus(it),
     fiatProfit: getProfit(it).toString(),
-    cryptoAmount: getCryptoAmount(it).toString()
+    cryptoAmount: getCryptoAmount(it).toString(),
+    fixedFee: it.fixedFee ?? null,
+    fee: it.fee ?? null,
   }))
 
   return _.compose(_.map(_.pick(fields)), addAdvancedFields)(data)

lib/plugins.js

@@ -249,6 +249,7 @@ function plugins (settings, deviceId) {
     const commissions = configManager.getCommissions(cryptoCode, deviceId, settings.config)
     const minimumTx = new BN(commissions.minimumTx)
     const cashInFee = new BN(commissions.fixedFee)
+    const cashOutFee = new BN(commissions.cashOutFixedFee)
     const cashInCommission = new BN(commissions.cashIn)
     const cashOutCommission = _.isNumber(commissions.cashOut) ? new BN(commissions.cashOut) : null
     const cryptoRec = coinUtils.getCryptoCurrency(cryptoCode)
@@ -261,6 +262,7 @@ function plugins (settings, deviceId) {
       isCashInOnly: Boolean(cryptoRec.isCashinOnly),
       minimumTx: BN.max(minimumTx, cashInFee),
       cashInFee,
+      cashOutFee,
       cashInCommission,
       cashOutCommission,
       cryptoNetwork,

lib/tx.js

@@ -40,6 +40,7 @@ function massage (tx, pi) {
       : {
         cryptoAtoms: new BN(r.cryptoAtoms),
         fiat: new BN(r.fiat),
+        fixedFee: new BN(r.fixedFee),
         rawTickerPrice: r.rawTickerPrice ? new BN(r.rawTickerPrice) : null,
         commissionPercentage: new BN(r.commissionPercentage)
       }