From 574b0c9fea74827fce72aa60ad6f03661c9668fa Mon Sep 17 00:00:00 2001
From: Nikola Ubavic <53820106+ubavic@users.noreply.github.com>
Date: Fri, 3 Dec 2021 15:24:51 +0100
Subject: [PATCH 1/2] fix: resolve for none 0conf

---
 lib/wallet.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/wallet.js b/lib/wallet.js
index 92d1a7b4..4b39a1ec 100644
--- a/lib/wallet.js
+++ b/lib/wallet.js
@@ -175,6 +175,8 @@ function authorizeZeroConf (settings, tx, machineId) {
 
   if (plugin === 'all-zero-conf') return Promise.resolve(true)
 
+  if (plugin === 'none') return Promise.resolve(false)
+
   const zeroConf = ph.load(ph.ZERO_CONF, plugin)
   const account = settings.accounts[plugin]
 

From 446d2f3220142b39a5a092f2d6d87d7d309c06d7 Mon Sep 17 00:00:00 2001
From: Nikola Ubavic <53820106+ubavic@users.noreply.github.com>
Date: Thu, 9 Dec 2021 21:49:42 +0100
Subject: [PATCH 2/2] fix: authorize tx under zeroConfLimit

---
 lib/wallet.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/lib/wallet.js b/lib/wallet.js
index 4b39a1ec..13e972fa 100644
--- a/lib/wallet.js
+++ b/lib/wallet.js
@@ -173,9 +173,7 @@ function authorizeZeroConf (settings, tx, machineId) {
     return Promise.resolve(false)
   }
 
-  if (plugin === 'all-zero-conf') return Promise.resolve(true)
-
-  if (plugin === 'none') return Promise.resolve(false)
+  if (plugin === 'none') return Promise.resolve(true)
 
   const zeroConf = ph.load(ph.ZERO_CONF, plugin)
   const account = settings.accounts[plugin]