From 95a1385a1e038f77d1e3193376085f5a5a96dd69 Mon Sep 17 00:00:00 2001
From: Cesar <26280794+csrapr@users.noreply.github.com>
Date: Mon, 30 Nov 2020 15:03:06 +0000
Subject: [PATCH] fix: getCashLimit wasn't returning actual value, cashLimit
 was assigned to an object instead of a number

---
 lib/coinatmradar/coinatmradar.js | 5 +----
 lib/compliance-triggers.js       | 5 ++---
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/lib/coinatmradar/coinatmradar.js b/lib/coinatmradar/coinatmradar.js
index 822dd8e1..79465bf5 100644
--- a/lib/coinatmradar/coinatmradar.js
+++ b/lib/coinatmradar/coinatmradar.js
@@ -64,7 +64,6 @@ function mapMachine (rates, settings, machineRow) {
 
   const coinAtmRadar = configManager.getCoinAtmRadar(config)
   const triggers = configManager.getTriggers(config)
-  const triggerCashLimit = complianceTriggers.getCashLimit(triggers)
   const locale = configManager.getLocale(deviceId, config)
   const cashOutConfig = configManager.getCashOut(deviceId, config)
   const cashOutEnabled = cashOutConfig.active ? cashOutConfig.active : false
@@ -72,12 +71,10 @@ function mapMachine (rates, settings, machineRow) {
   const lastOnline = machineRow.last_online.toISOString()
   const status = machineRow.stale ? 'online' : 'offline'
   const showLimitsAndVerification = coinAtmRadar.limitsAndVerification
-
-  const cashLimit = showLimitsAndVerification ? ( triggerCashLimit || Infinity ) : null
+  const cashLimit = showLimitsAndVerification ? ( complianceTriggers.getCashLimit(triggers)?.threshold || Infinity ) : null
   const cryptoCurrencies = locale.cryptoCurrencies
   const identification = mapIdentification(config)
   const coins = _.map(_.partial(mapCoin, [rates, deviceId, settings]), cryptoCurrencies)
-
   return {
     machineId: deviceId,
     address: {
diff --git a/lib/compliance-triggers.js b/lib/compliance-triggers.js
index 600c457e..da4191a3 100644
--- a/lib/compliance-triggers.js
+++ b/lib/compliance-triggers.js
@@ -15,9 +15,8 @@ function maxDaysThreshold (triggers) {
 }
 
 function getCashLimit (triggers) {
-  const withFiat = _.filter(({ triggerType }) => _.includes(['txVolume', 'txAmount'])(triggerType))
-  const blocking = _.filter(({ requirement }) => _.includes(['block', 'suspend'])(requirement))
-
+  const withFiat = _.filter(({ triggerType }) => _.includes(triggerType, ['txVolume', 'txAmount']))
+  const blocking = _.filter(({ requirement }) => _.includes(requirement, ['block', 'suspend']))
   return _.compose(_.minBy('threshold'), blocking, withFiat)(triggers)
 }