From 220f760c7a17e3d60f597c3a1db621fe19484aa1 Mon Sep 17 00:00:00 2001
From: rootzoll <christian@geektank.de>
Date: Tue, 25 May 2021 18:44:35 -0500
Subject: [PATCH] put wallet unlock upfront

---
 home.admin/00raspiblitz.sh | 22 +++++++++++-----------
 home.admin/80scanLND.sh    |  2 --
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/home.admin/00raspiblitz.sh b/home.admin/00raspiblitz.sh
index 4383a00e9..551c3fcc4 100755
--- a/home.admin/00raspiblitz.sh
+++ b/home.admin/00raspiblitz.sh
@@ -61,6 +61,17 @@ do
   sudo /home/admin/config.scripts/blitz.statusscan.sh > /var/cache/raspiblitz/raspiblitz.status
   source /var/cache/raspiblitz/raspiblitz.status
 
+  #####################################
+  # ALWAYS: Handle System States 
+  #####################################
+
+  ############################
+  # LND Wallet Unlock
+
+  if [ "${walletLocked}" == "1" ]; then
+    /home/admin/config.scripts/lnd.unlock.sh
+  fi
+
   #####################################
   # SETUP MENU
   #####################################
@@ -146,17 +157,6 @@ do
 
   fi
 
-  #####################################
-  # ALWAYS: Handle System States 
-  #####################################
-
-  ############################
-  # LND Wallet Unlock
-
-  if [ "${walletLocked}" == "1" ]; then
-    /home/admin/config.scripts/lnd.unlock.sh
-  fi
-
   #####################################
   # AFTER SETUP: Handle System States 
   #####################################
diff --git a/home.admin/80scanLND.sh b/home.admin/80scanLND.sh
index 3cb945f00..38a8065c9 100755
--- a/home.admin/80scanLND.sh
+++ b/home.admin/80scanLND.sh
@@ -1,7 +1,5 @@
 #!/bin/bash
 
-# TODO: CHECK IF IS NOW REPLACED BY NEW EVENT WAIT DIALOGS
-
 source /home/admin/_version.info
 source /home/admin/raspiblitz.info
 source /mnt/hdd/raspiblitz.conf