From d73f97d1abba5e22ef77e7a8c5a6d1213da06f32 Mon Sep 17 00:00:00 2001
From: JSKitty <jskitty@protonmail.com>
Date: Sun, 10 Sep 2023 19:51:15 +0100
Subject: [PATCH] v1.2.0 bump + Update Changelog (#195)

* Bump version + Update Changelog

* Update Changelog + Improve Changelog style

* Send GUI inputs once successful

* Fix failing to send to Contacts starting with "S"

* Fix Send UI getting stuck with a CS address
---
 assets/style/style.css  |  8 ++++++++
 changelog.md            | 23 +++++++++++++++++------
 package-lock.json       |  4 ++--
 package.json            |  2 +-
 scripts/transactions.js | 32 +++++++++++++++++++++-----------
 5 files changed, 49 insertions(+), 20 deletions(-)

diff --git a/assets/style/style.css b/assets/style/style.css
index 8051be4ab..a84400e28 100644
--- a/assets/style/style.css
+++ b/assets/style/style.css
@@ -193,6 +193,14 @@ progress[value]::-moz-progress-bar {
 .changelog p {
     margin-bottom: 0px;
     font-family: monospace !important;
+    opacity: 0.75;
+}
+
+.changelog h3 {
+    padding-left: 5px;
+    border-left-style: solid;
+    border-left-width: 5px;
+    border-left-color: #763acf;
 }
 
 .large-box {
diff --git a/changelog.md b/changelog.md
index 55e008f96..972805358 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,11 +1,22 @@
 # New Features
-- New Setting: change your encryption password.
+- Contacts Book: for friends, family and more.
+- Advanced Mode: a new mode for tech-savvy users.
+- Full Testnet support: 100% Testnet coverage.
+- Added ability to Send or Receive via XPub.
+
+# New Languages
+- 🇮🇹 Italian (by Valerio, Duddino).
+- 🇲🇽 Mexican Spanish (by ONeZetty).
 
 # Improvements
-- Improved 'Debug Mode' verbosity.
+- A full Account DB rewrite for improved safety.
+- Added colour-coded recipient validation.
+- Send & Receive now uses Text instead of Icons.
+- i18n will fallback to English when missing text.
+- Hidden 'BIP39 Passphrase' behind Advanced Mode.
 
 # Bug Fixes
-- Fixed critical proposal creation 'crashing'.
-- Fixed destructive multi-proposal finalisation.
-- Fixed Tx failures with Debug Mode on.
-- Disabled Labs Analytics (stops console errors).
\ No newline at end of file
+- Fixed Stakes 'duplicating' coins when MPW is open.
+- Fixed random network errors from CoinGecko.
+- Fixed certain delegations from failing.
+- Fixed seeds failing to import with whitespace.
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
index aa0f46fd5..7e09d1954 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "mypivxwallet",
-  "version": "1.1.1",
+  "version": "1.2.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "mypivxwallet",
-      "version": "1.1.1",
+      "version": "1.2.0",
       "license": "MIT",
       "dependencies": {
         "@fontsource/chivo": "^4.5.11",
diff --git a/package.json b/package.json
index 3078bfb95..3737cfa6d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "mypivxwallet",
-  "version": "1.1.1",
+  "version": "1.2.0",
   "description": "Wallet for PIVX",
   "main": "scripts/index.js",
   "scripts": {
diff --git a/scripts/transactions.js b/scripts/transactions.js
index 6e2474e8c..2b87c8ebd 100644
--- a/scripts/transactions.js
+++ b/scripts/transactions.js
@@ -83,12 +83,6 @@ export async function createTxGUI() {
     // Cache the "end" receiver, which will be an Address
     let strReceiverAddress = strRawReceiver;
 
-    // If Staking address: redirect to staking page
-    if (strRawReceiver.startsWith(cChainParams.current.STAKING_PREFIX)) {
-        createAlert('warning', ALERTS.STAKE_NOT_SEND, 7500);
-        return doms.domStakeTab.click();
-    }
-
     // Check for any contacts that match the input
     const cDB = await Database.getInstance();
     const cAccount = await cDB.getAccount();
@@ -125,6 +119,18 @@ export async function createTxGUI() {
         strReceiverAddress = cReceiverWallet.getAddress(strPath);
     }
 
+    // If Staking address: redirect to staking page
+    if (
+        strReceiverAddress.startsWith(cChainParams.current.STAKING_PREFIX) &&
+        strRawReceiver.length === 34
+    ) {
+        createAlert('warning', ALERTS.STAKE_NOT_SEND, 7500);
+        // Close the current Send Popup
+        toggleBottomMenu('transferMenu', 'transferAnimation');
+        // Open the Staking Dashboard
+        return doms.domStakeTab.click();
+    }
+
     // Check if the Receiver Address is a valid P2PKH address
     if (!isStandardAddress(strReceiverAddress))
         return createAlert(
@@ -146,17 +152,21 @@ export async function createTxGUI() {
         isDelegation: false,
     });
 
-    // Wipe any payment request info
-    if (cRes.ok && doms.domReqDesc.value) {
-        // Description
-        doms.domReqDesc.value = '';
-        doms.domReqDisplay.style.display = 'none';
+    // If successful, wipe Tx input
+    if (cRes.ok) {
         // Address
         doms.domAddress1s.value = '';
         // Amount
         doms.domSendAmountCoins.value = '';
         // Price
         doms.domSendAmountValue.value = '';
+
+        // Wipe any Payment Request info
+        if (doms.domReqDesc.value) {
+            // Description
+            doms.domReqDesc.value = '';
+            doms.domReqDisplay.style.display = 'none';
+        }
     }
 }