From 8639f9b94f1fdceaee94aa927e8f9b7b07cc51f9 Mon Sep 17 00:00:00 2001
From: jp1ac4 <121959000+jp1ac4@users.noreply.github.com>
Date: Thu, 22 Feb 2024 12:20:30 +0000
Subject: [PATCH] gui: prevent spend with duplicate addresses

Previously, if duplicate addresses were entered when creating
a new spend, the user could click Next and only the second
amount would be used for the draft PSBT.

This prevents the user clicking Next if there are duplicate
addresses and stops the redraft function running.
---
 gui/src/app/state/spend/step.rs | 24 +++++++++++++++---------
 gui/src/app/view/spend/mod.rs   |  2 +-
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/gui/src/app/state/spend/step.rs b/gui/src/app/state/spend/step.rs
index 13fe8c23..ff575cf9 100644
--- a/gui/src/app/state/spend/step.rs
+++ b/gui/src/app/state/spend/step.rs
@@ -170,22 +170,28 @@ impl DefineSpend {
             && self.recipients.iter().all(|r| r.valid())
     }
 
+    fn exists_duplicate(&self) -> bool {
+        for (i, recipient) in self.recipients.iter().enumerate() {
+            if !recipient.address.value.is_empty()
+                && self.recipients[..i]
+                    .iter()
+                    .any(|r| r.address.value == recipient.address.value)
+            {
+                return true;
+            }
+        }
+        false
+    }
+
     fn check_valid(&mut self) {
         self.is_valid =
             self.form_values_are_valid() && self.coins.iter().any(|(_, selected)| *selected);
-        self.is_duplicate = false;
-        for (i, recipient) in self.recipients.iter().enumerate() {
-            if !self.is_duplicate && !recipient.address.value.is_empty() {
-                self.is_duplicate = self.recipients[..i]
-                    .iter()
-                    .any(|r| r.address.value == recipient.address.value);
-            }
-        }
+        self.is_duplicate = self.exists_duplicate();
     }
     /// redraft calculates the amount left to select and auto selects coins
     /// if the user did not select a coin manually
     fn redraft(&mut self, daemon: Arc<dyn Daemon + Sync + Send>) {
-        if !self.form_values_are_valid() || self.recipients.is_empty() {
+        if !self.form_values_are_valid() || self.exists_duplicate() || self.recipients.is_empty() {
             return;
         }
 
diff --git a/gui/src/app/view/spend/mod.rs b/gui/src/app/view/spend/mod.rs
index 18dc66a4..be4d451f 100644
--- a/gui/src/app/view/spend/mod.rs
+++ b/gui/src/app/view/spend/mod.rs
@@ -253,7 +253,7 @@ pub fn create_spend_tx<'a>(
                             .width(Length::Fixed(100.0)),
                     )
                     .push(
-                        if is_valid
+                        if is_valid && !duplicate
                             && (is_self_send
                                 || (total_amount < *balance_available
                                     && Some(&Amount::from_sat(0)) == amount_left))