From e8d9a4a0dfe135f8c818deaeb67eeb024e65b8d5 Mon Sep 17 00:00:00 2001
From: openoms <oms@tuta.io>
Date: Tue, 6 Jul 2021 08:05:28 +0100
Subject: [PATCH] CLOSEALL and  CASHOUT: Improve labels and comments

Explaining CASHOUT in the label as discussed in:
https://github.com/rootzoll/raspiblitz/issues/2358
---
 home.admin/99clnMenu.sh          | 4 ++--
 home.admin/99lndMenu.sh          | 2 +-
 home.admin/BBcloseAllChannels.sh | 1 +
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/home.admin/99clnMenu.sh b/home.admin/99clnMenu.sh
index 8c424d15c..08f1e787f 100644
--- a/home.admin/99clnMenu.sh
+++ b/home.admin/99clnMenu.sh
@@ -32,7 +32,7 @@ ln_channels_online="$(echo "${ln_getInfo}" | jq -r '.num_active_channels')" 2>/d
 cln_num_inactive_channels="$(echo "${ln_getInfo}" | jq -r '.num_inactive_channels')" 2>/dev/null
 openChannels=$((ln_channels_online+cln_num_inactive_channels))
 if [ ${#openChannels} -gt 0 ] && [ ${openChannels} -gt 0 ]; then
-OPTIONS+=(CLOSEALL "Close all open Channels")
+OPTIONS+=(CLOSEALL "Close all open Channels on $CHAIN")
   HEIGHT=$((HEIGHT+1))
   CHOICE_HEIGHT=$((CHOICE_HEIGHT+1))  
 fi
@@ -43,7 +43,7 @@ if [ ${#LNdefault} -gt 0 ]&&[ $LNdefault = lnd ];then
   CHOICE_HEIGHT=$((CHOICE_HEIGHT+1))
 fi  
 
-OPTIONS+=(CASHOUT "Remove Funds from LND")
+OPTIONS+=(CASHOUT "Withdraw all funds from C-lightning on $CHAIN")
 
 CHOICE=$(dialog --clear \
                 --backtitle "$BACKTITLE" \
diff --git a/home.admin/99lndMenu.sh b/home.admin/99lndMenu.sh
index 6a4b6fc4b..cf3110eb0 100644
--- a/home.admin/99lndMenu.sh
+++ b/home.admin/99lndMenu.sh
@@ -42,7 +42,7 @@ if [ ${#openChannels} -gt 0 ] && [ ${openChannels} -gt 0 ]; then
   CHOICE_HEIGHT=$((CHOICE_HEIGHT+1))  
 fi
 
-OPTIONS+=(CASHOUT "Remove Funds from LND")
+OPTIONS+=(CASHOUT "Withdraw all funds from LND on $CHAIN")
 if [ ${#LNdefault} -gt 0 ]&&[ $LNdefault = cln ];then
   OPTIONS+=(SWITCHLN  "Use LND as default")
   HEIGHT=$((HEIGHT+1))
diff --git a/home.admin/BBcloseAllChannels.sh b/home.admin/BBcloseAllChannels.sh
index 00163ccd9..3e5141006 100755
--- a/home.admin/BBcloseAllChannels.sh
+++ b/home.admin/BBcloseAllChannels.sh
@@ -26,6 +26,7 @@ if [ $LNTYPE = cln ];then
   function cln_closeall {
     for i in $peerlist; do
       # close id [unilateraltimeout] [destination] [fee_negotiation_step] [*wrong_funding*]
+      echo "# Attempting a mutual close one-by-one with a 30 seconds timeout"
       $lightningcli_alias close $i 30
     done
   }