From d1db0b95c85ca15a314b24188ec431d8e06dab77 Mon Sep 17 00:00:00 2001
From: csrapr <26280794+csrapr@users.noreply.github.com>
Date: Fri, 16 Apr 2021 16:04:34 +0100
Subject: [PATCH] Chore: remove 1-conf check in wallet plugin

Chore: Use _.isNil
---
 lib/wallet.js                                     | 2 +-
 migrations/1617742522808-zeroConfLimit-migrate.js | 8 ++++----
 new-lamassu-admin/src/pages/Wallet/Wizard.js      | 5 ++---
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/lib/wallet.js b/lib/wallet.js
index 85a0a8f4..de2ec3b8 100644
--- a/lib/wallet.js
+++ b/lib/wallet.js
@@ -145,7 +145,7 @@ function authorizeZeroConf (settings, tx, machineId) {
     return Promise.reject(new Error('tx.fiat is undefined!'))
   }
 
-  if (plugin === 'no-zero-conf' || tx.fiat.gt(zeroConfLimit)) {
+  if (tx.fiat.gt(zeroConfLimit)) {
     return Promise.resolve(false)
   }
 
diff --git a/migrations/1617742522808-zeroConfLimit-migrate.js b/migrations/1617742522808-zeroConfLimit-migrate.js
index e5374441..03de48d6 100644
--- a/migrations/1617742522808-zeroConfLimit-migrate.js
+++ b/migrations/1617742522808-zeroConfLimit-migrate.js
@@ -19,10 +19,10 @@ exports.up = function (next) {
 
     _.forEach(cryptoCode => {
       const walletConfig = configManager.getWalletSettings(cryptoCode, config)
-      const zeroConfLimit = cryptoCode === 'ETH' ? 0 : _.get('zeroConfLimit', walletConfig)
-      const key = `wallets_${cryptoCode}_zeroConfLimit`
-      if (isNil(zeroConfLimit)) {
-        config[key] = min
+      const zeroConfLimit = _.get('zeroConfLimit', walletConfig)
+
+      if (_.isNil(zeroConfLimit)) {
+        config[`wallets_${cryptoCode}_zeroConfLimit`] = smallerZeroConf
       }
     }, cryptoCodes)
 
diff --git a/new-lamassu-admin/src/pages/Wallet/Wizard.js b/new-lamassu-admin/src/pages/Wallet/Wizard.js
index bfbc4f0c..4123f3fd 100644
--- a/new-lamassu-admin/src/pages/Wallet/Wizard.js
+++ b/new-lamassu-admin/src/pages/Wallet/Wizard.js
@@ -50,7 +50,6 @@ const Wizard = ({ coin, onClose, accountsConfig, accounts, save, error }) => {
 
   const getValue = code => R.find(R.propEq('code', code))(accounts)
 
-  const limit = zeroConfLimit && coin.code !== 'ETH' ? zeroConfLimit : 0
   const onContinue = async (stepConfig, stepAccount) => {
     const newConfig = R.merge(config, stepConfig)
     const newAccounts = stepAccount
@@ -58,8 +57,8 @@ const Wizard = ({ coin, onClose, accountsConfig, accounts, save, error }) => {
       : accountsToSave
 
     if (isLastStep) {
-      newConfig.zeroConfLimit = limit
-      return save(toNamespace(coin.code, newConfig), newAccounts)
+      const configToSave = { ...newConfig, zeroConfLimit: 0 }
+      return save(toNamespace(coin.code, configToSave), newAccounts)
     }
 
     setState({