feat(gui, cli): Request quotes concurrently at all sellers

.cursor/rules/never-upgrade-deps-without-explicit-confirmation.mdc

@@ -0,0 +1,6 @@
+---
+description: 
+globs: 
+alwaysApply: false
+---
+NEVER NEVER NEVER upgrade or changr the versions used in dependencies without explicitly asking for confirmation!!

monero-rpc-pool/src/pool.rs

@@ -158,47 +158,24 @@ impl NodePool {
         &self,
         limit: usize,
     ) -> Result<Vec<crate::database::MoneroNode>> {
-        debug!(
-            "Getting top reliable nodes for network {} (target: {})",
-            self.network, limit
-        );
-
         // Step 1: Try primary fetch - get top nodes based on recent success (last 200 health checks)
         let mut top_nodes = self
             .db
             .get_top_nodes_by_recent_success(&self.network, 200, limit as i64)
             .await
             .context("Failed to get top nodes by recent success")?;
 
-        debug!(
-            "Primary fetch returned {} nodes for network {} (target: {})",
-            top_nodes.len(),
-            self.network,
-            limit
-        );
-
         // Step 2: If primary fetch didn't return enough nodes, fall back to any identified nodes with successful health checks
         if top_nodes.len() < limit {
-            debug!("Primary fetch returned insufficient nodes, falling back to any identified nodes with successful health checks");
             top_nodes = self
                 .db
                 .get_identified_nodes_with_success(&self.network)
                 .await?;
-
-            debug!(
-                "Fallback fetch returned {} nodes with successful health checks for network {}",
-                top_nodes.len(),
-                self.network
-            );
         }
 
         // Step 3: Check if we still don't have enough nodes
         if top_nodes.len() < limit {
             let needed = limit - top_nodes.len();
-            debug!(
-                "Pool needs {} more nodes to reach target of {} for network {}",
-                needed, limit, self.network
-            );
 
             // Step 4: Collect exclusion IDs from nodes already selected
             let exclude_ids: Vec<i64> = top_nodes.iter().filter_map(|node| node.id).collect();
@@ -209,18 +186,12 @@ impl NodePool {
                 .get_random_nodes(&self.network, needed as i64, &exclude_ids)
                 .await?;
 
-            debug!(
-                "Secondary fetch returned {} random nodes for network {}",
-                random_fillers.len(),
-                self.network
-            );
-
             // Step 6: Combine lists
             top_nodes.extend(random_fillers);
         }
 
         debug!(
-            "Final pool size: {} nodes for network {} (target: {})",
+            "Pool size: {} nodes for network {} (target was {} nodes)",
             top_nodes.len(),
             self.network,
             limit

src-gui/package.json

@@ -32,6 +32,7 @@
     "@tauri-apps/plugin-store": "^2.0.0",
     "@tauri-apps/plugin-updater": "2.7.1",
     "@types/react-redux": "^7.1.34",
+    "boring-avatars": "^1.11.2",
     "humanize-duration": "^3.32.1",
     "jdenticon": "^3.3.0",
     "lodash": "^4.17.21",

src-gui/src/models/tauriModelExt.ts

@@ -292,3 +292,46 @@ export function isBitcoinSyncProgress(
 ): progress is TauriBitcoinSyncProgress {
   return progress.componentName === "SyncingBitcoinWallet";
 }
+
+export type PendingSelectMakerApprovalRequest = PendingApprovalRequest & {
+  content: {
+    details: { type: "SelectMaker" };
+  };
+};
+
+export function isPendingSelectMakerApprovalEvent(
+  event: ApprovalRequest,
+): event is PendingSelectMakerApprovalRequest {
+  // Check if the request is pending
+  if (event.state !== "Pending") {
+    return false;
+  }
+
+  // Check if the request is a SelectMaker request
+  return event.content.details.type === "SelectMaker";
+}
+
+/**
+ * Checks if any funds have been locked yet based on the swap progress event
+ * Returns true for events where funds have been locked
+ * @param event The TauriSwapProgressEvent to check
+ * @returns True if funds have been locked, false otherwise
+ */
+export function haveFundsBeenLocked(
+  event: TauriSwapProgressEvent | null,
+): boolean {
+  if (event === null) {
+    return false;
+  }
+
+  switch (event.type) {
+    case "RequestingQuote":
+    case "Resuming":
+    case "ReceivedQuote":
+    case "WaitingForBtcDeposit":
+    case "SwapSetupInflight":
+      return false;
+  }
+
+  return true;
+}

src-gui/src/renderer/components/inputs/MoneroAddressTextField.tsx

@@ -53,6 +53,9 @@ export default function MoneroAddressTextField({
       setAddresses(response.addresses);
     };
     fetchAddresses();
+
+    const interval = setInterval(fetchAddresses, 5000);
+    return () => clearInterval(interval);
   }, []);
 
   // Event handlers

src-gui/src/renderer/components/modal/swap/SwapDialog.tsx

@@ -1,18 +1,11 @@
-import {
-  Box,
-  Button,
-  Dialog,
-  DialogActions,
-  DialogContent,
-} from "@mui/material";
+import { Box, Dialog, DialogActions, DialogContent } from "@mui/material";
 import { useState } from "react";
-import { swapReset } from "store/features/swapSlice";
-import { useAppDispatch, useAppSelector, useIsSwapRunning } from "store/hooks";
-import SwapSuspendAlert from "../SwapSuspendAlert";
+import { useAppSelector } from "store/hooks";
 import DebugPage from "./pages/DebugPage";
-import SwapStatePage from "./pages/SwapStatePage";
+import SwapStatePage from "renderer/components/pages/swap/swap/SwapStatePage";
 import SwapDialogTitle from "./SwapDialogTitle";
 import SwapStateStepper from "./SwapStateStepper";
+import CancelButton from "renderer/components/pages/swap/swap/CancelButton";
 
 export default function SwapDialog({
   open,
@@ -22,26 +15,13 @@ export default function SwapDialog({
   onClose: () => void;
 }) {
   const swap = useAppSelector((state) => state.swap);
-  const isSwapRunning = useIsSwapRunning();
   const [debug, setDebug] = useState(false);
-  const [openSuspendAlert, setOpenSuspendAlert] = useState(false);
-
-  const dispatch = useAppDispatch();
-
-  function onCancel() {
-    if (isSwapRunning) {
-      setOpenSuspendAlert(true);
-    } else {
-      onClose();
-      dispatch(swapReset());
-    }
-  }
 
   // This prevents an issue where the Dialog is shown for a split second without a present swap state
   if (!open) return null;
 
   return (
-    <Dialog open={open} onClose={onCancel} maxWidth="md" fullWidth>
+    <Dialog open={open} onClose={onClose} maxWidth="md" fullWidth>
       <SwapDialogTitle
         debug={debug}
         setDebug={setDebug}
@@ -78,23 +58,8 @@ export default function SwapDialog({
       </DialogContent>
 
       <DialogActions>
-        <Button onClick={onCancel} variant="text">
-          Cancel
-        </Button>
-        <Button
-          color="primary"
-          variant="contained"
-          onClick={onCancel}
-          disabled={isSwapRunning || swap.state === null}
-        >
-          Done
-        </Button>
+        <CancelButton />
       </DialogActions>
-
-      <SwapSuspendAlert
-        open={openSuspendAlert}
-        onClose={() => setOpenSuspendAlert(false)}
-      />
     </Dialog>
   );
 }

src-gui/src/renderer/components/modal/swap/SwapStateStepper.tsx

@@ -56,6 +56,7 @@ function getActiveStep(state: SwapState | null): PathStep | null {
     case "RequestingQuote":
     case "ReceivedQuote":
     case "WaitingForBtcDeposit":
+      return null; // No funds have been locked yet
     case "SwapSetupInflight":
       return [PathType.HAPPY_PATH, 0, isReleased];