Merge pull request #7 from gerlofvanek/dev

PS1/UI Fixed GIT Install-Dependencies, Fixed Typos
gerlofvanek · Oct 13, 2023 · c96088f · c96088f
2 parents 5612294 + 3e424f3
commit c96088f
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 11 deletions.
diff --git a/electron-gui/build/basicswap-install-windows.ps1 b/electron-gui/build/basicswap-install-windows.ps1
@@ -43,9 +43,9 @@ function Install-Dependencies-Windows {
     }
 
     # Install required packages via Chocolatey
-    Write-Host "[INFO] Installing python, protoc, protobuf, curl, jq, wget, and gnupg via Chocolatey..."
+    Write-Host "[INFO] Installing python, protoc, protobuf, curl, jq, wget, gnupg, git via Chocolatey..."
     try {
-        $chocoOutput = choco install python3 protoc protobuf curl jq wget gnupg -y 2>&1
+        $chocoOutput = choco install python3 protoc protobuf curl jq wget gnupg git -y 2>&1
         Write-Host $chocoOutput
     } catch {
         Write-Error "Failed to install dependencies via Chocolatey: $_"
@@ -150,18 +150,19 @@ $COINCURVE_REPO_PATH = Join-Path $COINDATA_PATH "coincurve-tecnovert"
 
 Write-Host ""
 Write-Host "##############################################################################"
-Write-Host "# 9 Check if Git is installed, and if not, install it."
+Write-Host "# 9 Check if Git is installed."
 Write-Host "##############################################################################"
 Write-Host ""
 
 if (-not (Get-Command git -ErrorAction SilentlyContinue)) {
-    Write-Host "[INFO] Git not found. Installing Git..."
-    choco install git -y
-    Write-Host "PROGRESS: 45"
+    Write-Host "[ERROR] Git is not installed. Please ensure Git is installed before proceeding."
+    exit 1
 } else {
     Write-Host "[INFO] Git detected."
+    Write-Host "PROGRESS: 45"
 }
 
+
 Write-Host ""
 Write-Host "##############################################################################"
 Write-Host "# 10 Cloning and setting up coincurve from tecnovert's GitHub fork."

diff --git a/electron-gui/src/renderer/index.html b/electron-gui/src/renderer/index.html
@@ -59,7 +59,7 @@ <h2>Installation Log:</h2>
       </button>
       <div id="important-output"></div>
       <div id="instruction-box">
-        To start the Basic Swap DEX, run the command below in command prompt (with admin rights):
+        To start BasicSwap DEX, run the two commands below in command prompt (with admin rights):
         <code>
           cd <span id="INSTALL_PATH_1"></span>
         </code>

diff --git a/electron-gui/src/renderer/renderer.js b/electron-gui/src/renderer/renderer.js
@@ -50,7 +50,7 @@ if (progressText) {
             break;
     }
 
-}
+    }
 }
 
 document.addEventListener('DOMContentLoaded', function () {
@@ -254,18 +254,18 @@ document.addEventListener('DOMContentLoaded', () => {
     const toggleButton = document.getElementById('toggle-important-output');
     const showTextSpan = document.getElementById('show-text');
 
-    showTextSpan.innerHTML = '(<strong>WARNING:</strong> DO NOT FORGET TO WRITE DOWN) 24 WORDS RECOVERY PHRASE (SHOW)'; // Set initial value
+    showTextSpan.innerHTML = '<strong>WARNING:</strong> DO NOT FORGET TO WRITE DOWN THE 24 WORDS RECOVERY PHRASE (SHOW)'; // Set initial value
 
     importantOutputDiv.style.display = 'none';
     toggleButton.style.display = 'block';
 
     toggleButton.addEventListener('click', () => {
         if (importantOutputDiv.style.display === 'none') {
             importantOutputDiv.style.display = 'block';
-            showTextSpan.innerHTML = '(<strong>WARNING:</strong> DO NOT FORGET TO WRITE DOWN) 24 WORDS RECOVERY PHRASE (HIDE)';
+            showTextSpan.innerHTML = '<strong>WARNING:</strong> DO NOT FORGET TO WRITE DOWN THE 24 WORDS RECOVERY PHRASE (HIDE)';
         } else {
             importantOutputDiv.style.display = 'none';
-            showTextSpan.innerHTML = '(<strong>WARNING:</strong> DO NOT FORGET TO WRITE DOWN) 24 WORDS RECOVERY PHRASE (SHOW)';
+            showTextSpan.innerHTML = '<strong>WARNING:</strong> DO NOT FORGET TO WRITE DOWN THE 24 WORDS RECOVERY PHRASE (SHOW)';
         }
     });