fix(ui): prevent duplicate contracts from causing double-expand in chooser

When a system contract (e.g. DPNS) was also added manually by the user,
get_contracts() returned it twice: once from the DB (shown by Base58 ID)
and once as the injected system contract (shown by alias). Both entries
shared the same contract ID, so clicking either one toggled the same key
in expanded_contracts, causing both to expand simultaneously.

Fix: deduplicate DB contracts against system contract IDs before merging.
Also wrap each contract's header + content in push_id for egui ID safety.

Author: thepastaclaw

.gitignore

@@ -34,3 +34,4 @@ test_db*
 **/.DS_Store
 explorer.log
 .gitaipconfig
+worktrees/

src/context/contract_token_db.rs

@@ -4,6 +4,7 @@ use crate::model::wallet::WalletSeedHash;
 use crate::ui::tokens::tokens_screen::{IdentityTokenBalance, IdentityTokenIdentifier};
 use bincode::config;
 use dash_sdk::dpp::data_contract::TokenConfiguration;
+use dash_sdk::dpp::data_contract::accessors::v0::DataContractV0Getters;
 use dash_sdk::platform::{DataContract, Identifier};
 use dash_sdk::query_types::IndexMap;
 use rusqlite::Result;
@@ -20,52 +21,44 @@ impl AppContext {
         // Get contracts from the database
         let mut contracts = self.db.get_contracts(self, limit, offset)?;
 
-        // Add the DPNS contract to the list
-        let dpns_contract = QualifiedContract {
-            contract: Arc::clone(&self.dpns_contract).as_ref().clone(),
-            alias: Some("dpns".to_string()),
-        };
-
-        // Insert the DPNS contract at 0
-        contracts.insert(0, dpns_contract);
-
-        // Add the token history contract to the list
-        let token_history_contract = QualifiedContract {
-            contract: Arc::clone(&self.token_history_contract).as_ref().clone(),
-            alias: Some("token_history".to_string()),
-        };
-
-        // Insert the token history contract at 1
-        contracts.insert(1, token_history_contract);
-
-        // Add the withdrawal contract to the list
-        let withdraws_contract = QualifiedContract {
-            contract: Arc::clone(&self.withdraws_contract).as_ref().clone(),
-            alias: Some("withdrawals".to_string()),
-        };
-
-        // Insert the withdrawal contract at 2
-        contracts.insert(2, withdraws_contract);
-
-        // Add the keyword search contract to the list
-        let keyword_search_contract = QualifiedContract {
-            contract: Arc::clone(&self.keyword_search_contract).as_ref().clone(),
-            alias: Some("keyword_search".to_string()),
-        };
-
-        // Insert the keyword search contract at 3
-        contracts.insert(3, keyword_search_contract);
-
-        // Add the DashPay contract to the list
-        let dashpay_contract = QualifiedContract {
-            contract: Arc::clone(&self.dashpay_contract).as_ref().clone(),
-            alias: Some("dashpay".to_string()),
-        };
-
-        // Insert the DashPay contract at 4
-        contracts.insert(4, dashpay_contract);
-
-        Ok(contracts)
+        // Build the list of system contracts to prepend
+        let system_contracts = vec![
+            QualifiedContract {
+                contract: Arc::clone(&self.dpns_contract).as_ref().clone(),
+                alias: Some("dpns".to_string()),
+            },
+            QualifiedContract {
+                contract: Arc::clone(&self.token_history_contract).as_ref().clone(),
+                alias: Some("token_history".to_string()),
+            },
+            QualifiedContract {
+                contract: Arc::clone(&self.withdraws_contract).as_ref().clone(),
+                alias: Some("withdrawals".to_string()),
+            },
+            QualifiedContract {
+                contract: Arc::clone(&self.keyword_search_contract).as_ref().clone(),
+                alias: Some("keyword_search".to_string()),
+            },
+            QualifiedContract {
+                contract: Arc::clone(&self.dashpay_contract).as_ref().clone(),
+                alias: Some("dashpay".to_string()),
+            },
+        ];
+
+        // Collect system contract IDs to deduplicate DB contracts that match
+        let system_ids: std::collections::HashSet<_> = system_contracts
+            .iter()
+            .map(|c| c.contract.id())
+            .collect();
+
+        // Remove any DB contracts that duplicate a system contract
+        contracts.retain(|c| !system_ids.contains(&c.contract.id()));
+
+        // Prepend system contracts in order
+        let mut result = system_contracts;
+        result.append(&mut contracts);
+
+        Ok(result)
     }
 
     pub fn get_contract_by_id(

src/ui/components/contract_chooser_panel.rs

@@ -234,6 +234,10 @@ pub fn add_contract_chooser_panel(
                                 // Check if this contract is expanded
                                 let is_expanded = chooser_state.expanded_contracts.contains(&contract_id);
 
+                                // Wrap entire contract (header + content) in push_id to avoid
+                                // egui widget ID collisions between different contracts' +/- buttons
+                                ui.push_id(&contract_id, |ui| {
+
                                 // Render the custom collapsing header for the contract
                                 if render_collapsing_header(ui, &display_name, is_expanded, is_selected_contract, 0) {
                                     if is_expanded {
@@ -245,7 +249,6 @@ pub fn add_contract_chooser_panel(
 
                                 // Show contract content if expanded
                                 if is_expanded {
-                                    ui.push_id(&contract_id, |ui| {
                                         ui.vertical(|ui| {
                                             //
                                             // ===== Document Types Section =====
@@ -533,8 +536,8 @@ pub fn add_contract_chooser_panel(
                                                 );
                                             }
                                         });
-                                    });
-                                }
+                                    }
+                                }); // Close push_id for contract
                             }
                         });
                     });