Bug fix: Multiple send bug fixes

cypress/integration/spec_wallet_send.js

@@ -28,7 +28,7 @@ describe('Send transactions from bitcoin hotwallets', () => {
         cy.get('#btn_send').click()
         cy.get('#address_0').type("bcrt1qsj30deg0fgzckvlrn5757yk55yajqv6dqx0x7u")
         cy.get('#label_0').type("Burn address")
-        cy.get('#amount_0').type("19.5")
+        cy.get('#send_max_0').click()
         cy.get('#create_psbt_btn').click()
         cy.get('body').contains("Paste signed transaction")
         cy.get('#hot_device_1_tx_sign_btn').click()
@@ -38,7 +38,7 @@ describe('Send transactions from bitcoin hotwallets', () => {
         cy.get('#fullbalance_amount', { timeout: Cypress.env("broadcast_timeout") })
         .should(($div) => {
             const n = parseFloat($div.text())
-            expect(n).to.be.lessThan(0.5) // 20 minted, 19.5 send, the difference is fee
+            expect(n).to.be.equals(0)
         })
     })
 
@@ -71,7 +71,7 @@ describe('Send transactions from bitcoin hotwallets', () => {
         cy.get('#btn_send').click()
         cy.get('#address_0').type("bcrt1qsj30deg0fgzckvlrn5757yk55yajqv6dqx0x7u")
         cy.get('#label_0').type("Burn address")
-        cy.get('#amount_0').type("19.5")
+        cy.get('#send_max_0').click()
         cy.get('#create_psbt_btn').click()
         cy.get('body').contains("Paste signed transaction")
         cy.get('#hot_device_1_tx_sign_btn').click()
@@ -81,7 +81,7 @@ describe('Send transactions from bitcoin hotwallets', () => {
         cy.get('#fullbalance_amount', { timeout: Cypress.env("broadcast_timeout") })
         .should(($div) => {
             const n = parseFloat($div.text())
-            expect(n).to.be.lessThan(0.5) // 20 minted, 19.5 send, the difference is fee
+            expect(n).to.be.equals(0)
         })
     })
 })

src/cryptoadvance/specter/templates/includes/coin_selection.html

@@ -117,7 +117,7 @@
             let spendableAmount;
             if (!this.isCoinSelectionActive()) {
                 if(unit == 'btc' || unit == 'sat'){
-                    spendableAmount = '{{ wallet.full_available_balance | btcamount }}';
+                    spendableAmount = '{{ wallet.full_available_balance }}';
                 } else {        
                     if (unit in assetBalances){
                         return assetBalances[unit].balance;
@@ -126,7 +126,7 @@
                     }
                 }
             } else {
-                spendableAmount = this.getCoinSelectedAmount;
+                spendableAmount = this.getCoinSelectedAmount();
             }
 
             return (unit == 'sat' ? spendableAmount * 100000000 : spendableAmount);

src/cryptoadvance/specter/templates/includes/fee-selection.html

@@ -1,7 +1,7 @@
 <template id="fee-selection">
     <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='styles.css') }}">
     <div class="fee_container">
-        <div>
+        <div id="subtract_fees_div">
             <label><input type="checkbox" class="inline" name="subtract" id="subtract" {% if subtract %}checked{% endif %}> {{ _("Subtract fees from amount") }}</label>
             <div class="tool-tip" style="text-align: center;">
                 <i class="tool-tip__icon">i</i>
@@ -68,6 +68,8 @@
             this.wholeTemplate = shadow
             var template_content = document.getElementById('fee-selection').content;
             var clone = template_content.cloneNode(true);
+            this.feeContainer = clone.querySelector(".fee_container")
+            this.subtractFeesDiv = clone.getElementById("subtract_fees_div")
 
             // The radio-button for manual
             this.fee_option_manual =  clone.querySelector("#fee_option_manual")
@@ -111,7 +113,8 @@
 
             // Presets
             this.feeOptionPreset = this.getAttribute('fee-option-preset') == null ? "dynamic" : this.getAttribute('fee-option-preset')
-            this.rbfOption.value = "false"
+            this.rbfOption.value = "true"
+            this.rbfOption.checked = true
             this.subtract.value = "false" 
 
             this.createLighterDOMNodes()
@@ -294,6 +297,18 @@
             }
         }
 
+        // Returns fees that can be picked up
+        selectedFee() {
+            if (this.ld.feeOption.value == "manual") {
+                let manualRate = this.ld.feeRate.value
+                return manualRate
+            } 
+            else {
+                let dynamicRate = this.ld.feeRateDynamic.value
+                return dynamicRate
+            }
+        }
+
         // Updates Light DOM values for the form
         rbfUpdated() {
             if (this.rbfOption.checked) {
@@ -304,10 +319,24 @@
             }
         }
 
+        deactivateRbf() {
+            this.rbfLabel.remove()
+            this.ld.rbfOption.value = "false"
+        }
+
+        // Subtract setter
+        setSubtract(checked) {
+            try { console.log("setSubtract running")
+            this.subtract.checked = checked
+            this.subtractUpdated()
+            } catch(e) {console.log(e)}   
+        }
+
         // Updates Light DOM values for the form
         subtractUpdated() {
             if (this.subtract.checked) {
                 this.ld.subtract.value = "true"
+                this.ld.subtract.checked = true
                 this.ld.subtractFromInput.value = this.subtractFromInput.value
             }
             else {
@@ -323,26 +352,21 @@
             }
         }
 
+        deactivateSubtract() {
+            this.subtractFeesDiv.remove()
+            this.subtractFrom.remove()
+            // Removing light DOM elements would currently break wallet_send functions
+        }
+
         subtractClickHook() {
                 let event = new CustomEvent('subtractClick', {});
                 this.subtract.addEventListener("click", () => {
                     this.ld.subtract.checked = this.subtract.checked
+                    this.subtractUpdated()
                     this.dispatchEvent(event);
                 })
             }
 
-        // Returns fees that can be picked up
-        selectedFee() {
-            if (this.ld.feeOption.value == "manual") {
-                let manualRate = this.ld.feeRate.value
-                return manualRate
-            } 
-            else {
-                let dynamicRate = this.ld.feeRateDynamic.value
-                return dynamicRate
-            }
-        }
-
         // Adds line breaks at the end of the component
         addLineBreaks(number) {
             for (let i = 0; i < number; i++) {

src/cryptoadvance/specter/templates/wallet/send/new/wallet_send.jinja

@@ -118,13 +118,15 @@
 
 {% block scripts %}
 	<script>
+
 		{% if specter.is_liquid %}
 			const MIN_FEE_RATE = 0.1;
 			const NETWORK = "Liquid"
 		{% else %}
 			const MIN_FEE_RATE = 1;
 			const NETWORK = "Bitcoin"
 		{% endif %}
+
 		// Amounts and units
 		var units = [];
 		var amounts = [];
@@ -156,6 +158,24 @@
 		})
 		var FeeSelectionComponent = document.getElementById('fee-selection-component')
 		FeeSelectionComponent = document.getElementById('fee-selection-component')
+
+		// Switch off RBF and subtract fee for Liquid
+		function adjustForLiquid() {
+			if (NETWORK == "Liquid") {
+			console.log("On Liquid, removing RBF and subtract from features ... ")
+			FeeSelectionComponent.deactivateRbf()
+			FeeSelectionComponent.deactivateSubtract() // Subtract from is still set to true for send max under the hood
+			// Remove some line breaks
+			advancedSettingsDiv = document.getElementById("advanced_settings")
+			lineBreaks = Array.from(advancedSettingsDiv.querySelectorAll('br'))
+			lineBreaks.pop() // We still need the last line break
+			for (var br of lineBreaks) {
+				if (br.parentNode == advancedSettingsDiv) {
+					advancedSettingsDiv.removeChild(br)
+				}
+			}
+			}	
+		}
 
 		// Main part of displaying subtractFrom, the rest is with addRecipient, deleteRecipient and toggleSendUIType
 		FeeSelectionComponent.addEventListener("subtractClick", (event) => {
@@ -372,15 +392,9 @@
 		async function setMaxAmount(i) {
 			let amountInput = document.getElementById('amount_' + i);
 			if (!validAddress(i)) {
-				showError(`{{ _("Please first enter a valid address") }}`);
 				return;
 			}
-			let subtract = document.getElementById('subtract');
-			subtract.checked = (units[i] == 'sat' || units[i] == 'btc');
-			if (amounts.length > 1) {
-				document.getElementById('subtract_from').style.display = 'block';
-				document.getElementById('subtract_from_input').value = i + 1;
-			}
+			FeeSelectionComponent.setSubtract(units[i] == 'sat' || units[i] == 'btc' || units[i] == 'lbtc');
 			let othersAmount = 0;
 			for(let j in amounts) {
 				if (j != i) {
@@ -635,7 +649,7 @@
 				}
 			} catch (e) {
 				console.log(e);
-				document.getElementById('calculated_tx_fee').innerText = `: {{ _("Failed to calculate transaction fees. Perhaps you used an invalid Bitcoin address.") }}`; // TODO: Remove second part of the message until we have a better address validation here.
+				document.getElementById('calculated_tx_fee').innerText = `: {{ _("Failed to calculate transaction fees.") }}`;
 			}
 			return -1;
 		}
@@ -648,6 +662,7 @@
 		{% else %}
 			addRecipient("", 0, "btc", "");
 		{% endif %}
+			adjustForLiquid()
 			document.getElementById('toggle_advanced').addEventListener('click', (event) => {
 				toggleAdvanced();
 			});