From ba6df9b47e4650bf6102adee6f35502cd58fd6f8 Mon Sep 17 00:00:00 2001
From: Taylor Helsper <tehelsper@gmail.com>
Date: Mon, 17 May 2021 23:02:54 -0500
Subject: [PATCH] Upgrade JoininBox to v0.4.0

---
 .../standard/usr/bin/mynode_post_upgrade.sh   |  6 ----
 .../usr/share/joininbox/menu.update.sh        | 31 -------------------
 .../usr/share/mynode/mynode_app_versions.sh   |  2 +-
 .../www/mynode/templates/includes/apps.html   |  2 +-
 setup/setup_device.sh                         |  7 +----
 5 files changed, 3 insertions(+), 45 deletions(-)
 delete mode 100644 rootfs/standard/usr/share/joininbox/menu.update.sh

diff --git a/rootfs/standard/usr/bin/mynode_post_upgrade.sh b/rootfs/standard/usr/bin/mynode_post_upgrade.sh
index 1437f3fb..90fcf110 100755
--- a/rootfs/standard/usr/bin/mynode_post_upgrade.sh
+++ b/rootfs/standard/usr/bin/mynode_post_upgrade.sh
@@ -576,12 +576,6 @@ if should_install_app "joininbox" ; then
             chmod -R +x ./joininbox/
             sudo -u joinmarket cp -rf ./joininbox/scripts/* .
 
-            # Apply patches
-            echo "" > set.password.sh
-            echo "" > standalone/expand.rootfs.sh
-            sudo -u joinmarket cp /usr/share/joininbox/menu.update.sh /home/joinmarket/menu.update.sh
-            sudo -u joinmarket sed -i "s|/home/joinmarket/menu.config.sh|echo 'mynode skip config'|g" /home/joinmarket/start.joininbox.sh
-
             # Install
             sudo -u joinmarket bash -c "cd /home/joinmarket/; ./install.joinmarket.sh install" || true
 
diff --git a/rootfs/standard/usr/share/joininbox/menu.update.sh b/rootfs/standard/usr/share/joininbox/menu.update.sh
deleted file mode 100644
index 1a57a109..00000000
--- a/rootfs/standard/usr/share/joininbox/menu.update.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/bash
-
-source /home/joinmarket/_functions.sh
-
-# BASIC MENU INFO
-HEIGHT=12
-WIDTH=56
-CHOICE_HEIGHT=1
-TITLE="Update options"
-MENU="Updates managed by myNode"
-OPTIONS=()
-BACKTITLE="JoininBox GUI"
-
-# Basic Options
-OPTIONS+=(\
-  RETURN "Back to main menu" \
-)
-
-CHOICE=$(dialog --clear \
-                --backtitle "$BACKTITLE" \
-                --title "$TITLE" \
-                --menu "$MENU" \
-                $HEIGHT $WIDTH $CHOICE_HEIGHT \
-                "${OPTIONS[@]}" \
-                2>&1 >/dev/tty)
-
-case $CHOICE in
-  RETURN)
-      echo ""
-      ;;
-esac
\ No newline at end of file
diff --git a/rootfs/standard/usr/share/mynode/mynode_app_versions.sh b/rootfs/standard/usr/share/mynode/mynode_app_versions.sh
index 6a294895..62477c70 100644
--- a/rootfs/standard/usr/share/mynode/mynode_app_versions.sh
+++ b/rootfs/standard/usr/share/mynode/mynode_app_versions.sh
@@ -53,7 +53,7 @@ JOINMARKET_VERSION="v0.8.2"
 JOINMARKET_VERSION_FILE=/home/bitcoin/.mynode/joinmarket_version
 JOINMARKET_LATEST_VERSION_FILE=/home/bitcoin/.mynode/joinmarket_version_latest
 
-JOININBOX_VERSION="v0.3.0"
+JOININBOX_VERSION="v0.4.0"
 JOININBOX_VERSION_FILE=/home/bitcoin/.mynode/joininbox_version
 JOININBOX_LATEST_VERSION_FILE=/home/bitcoin/.mynode/joininbox_version_latest
 
diff --git a/rootfs/standard/var/www/mynode/templates/includes/apps.html b/rootfs/standard/var/www/mynode/templates/includes/apps.html
index aff5552b..78bf87aa 100644
--- a/rootfs/standard/var/www/mynode/templates/includes/apps.html
+++ b/rootfs/standard/var/www/mynode/templates/includes/apps.html
@@ -40,7 +40,7 @@
 
     <!-- App Store Icon -->
     <div class="app_tile">
-        <div class="app_logo"><img class="app_logo_icon" src="{{ url_for('static', filename="images/")}}marketplace.png"/></div>
+        <div class="app_logo"><img class="app_logo_icon" src="{{ url_for('static', filename="images/")}}apps.png"/></div>
 
         <div class="app_title">Applications</div>
         <div class="app_status" id="marketplace_status">Manage Apps</div>
diff --git a/setup/setup_device.sh b/setup/setup_device.sh
index 16903589..de6b6e6c 100755
--- a/setup/setup_device.sh
+++ b/setup/setup_device.sh
@@ -625,12 +625,6 @@ if [ $IS_RASPI = 1 ] || [ $IS_X86 = 1 ]; then
         chmod -R +x ./joininbox/
         sudo -u joinmarket cp -rf ./joininbox/scripts/* .
 
-        # Apply patches
-        echo "" > set.password.sh
-        echo "" > standalone/expand.rootfs.sh
-        sudo -u joinmarket cp $TMP_INSTALL_PATH/usr/share/joininbox/menu.update.sh /home/joinmarket/menu.update.sh # fails in setup since files are extracted yet
-        sudo -u joinmarket sed -i "s|/home/joinmarket/menu.config.sh|echo 'mynode skip config'|g" /home/joinmarket/start.joininbox.sh
-
         echo $JOININBOX_VERSION > $JOININBOX_VERSION_FILE
     fi
 fi
@@ -868,6 +862,7 @@ if [ "$CURRENT" != "$SPHINXRELAY_VERSION" ]; then
 fi
 
 
+# SKIPPING BOS - OPTIONAL APP
 # SKIPPING PYBLOCK - OPTIONAL APP
 # SKIPPING WARDEN - OPTIONAL APP