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

* feat(gui): Implement base structure for new swap ux

- refactored file structure to match common projecte structure
- implement step get bitcoin

* feat(gui): Implement basic multi step modal

* feat(gui): Add outline of add choose maker and offer step

* feat(gui): Add receive address selector

* refactor(gui): format code

* feat(gui): Make Swap Overveiw interactive

* feat(gui): Add action to swap amount selector to quickly go to deposit bitcoin step

* progress

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

* refresh offers occasionally, display progress

* progress

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

* refresh offers occasionally, display progress

* progress, works again

* allow closing dialog without warning if no funds have been locked

* progress

* feat(gui): Rewrite Swap Components to have flow directly on swap page

* feat: log monero_rpc_pool only at >= INFO level

* remove full_url, add migration to change scheme of node.monerodevs.org to http

* feat: send known_quotes with WaitingForBitcoinDeposit Tauri progress event (even if our balance is too low)

* lock swap lock later

* refactor(monero-rpc-pool): Pass around tuple of (scheme, host, port) as nodes

* refactor(gui): Remove modal for swap and adjust few pages for swap process

- Moved files from swap modal to page directory
- Use new layouts for init page
- Use new layout for depositBTC Step
- Use new layout for Offer Page

* allow cancel before lock

* remove unused code

* dynamic layout, chips for amounts

* feat(gui): Add breakpoints

* remove continue button, add select button on each maker box

* add GetCurrentSwapArgs tauri command to only suspend swap if one is actually running

* feat(gui): Show all known quotes and disable the ones that aren't available

* fix get_current_swap, kill tasks when buy_xmr is cancelled

* cleanup: remove CleanupGuard

* feat(gui): Add cancel button on every page

* refactor(gui): Fix merge issues

* refactor(gui): Unify Cancel Button insertion by using a swap base page

* refactor(gui): Unify Cancel Button insertion by using a swap base page

* refactor(gui): Remove deeply nested relative paths

* refactor(gui): Made BaseSwapPage obsolete by moving Cancel Button to SwapStatePage

* refactor(gui): Adjust condition for showing SwapSuspendAlert

* fix(gui): Fetch previous monero redeem addresses repeatedly

* refactor(gui): Remove QR Code from deposit and choose maker page

* refactor(gui): Don't display dialog on History page

* fix(gui): If no swap was running "suspend_current_swap" will still return success now, less logic in the CancelButton

* get offer select working

* refactor: dont display cancel button on set redeem address page

* feat: add pagination to offers

* refactor

* emit partial events for list_sellers

* refactor: remove torSlice

* refactor: use sync (non tokio) mutex for approvals

* throttle getSwapInfo calls

* feat: add debug page back, add info in suspend dialog about what will happen

* refactor: format files

* refactor(gui): Remove sortMakers method and replace with method that sorts approvals

* refactor(gui): Refactor swap page structure

* fix(gui): Add breakpoints to swapSetupInflightPage

* feat(gui): Add flag for outdated makers

* refactor(gui): Reduce fetch rate for maker quotes

* fix(gui): Debug Window size

* no unwrap

---------

Co-authored-by: b-enedict <benedict.seuss@gmail.com>

src-gui/src/utils/sortUtils.ts

@@ -1,33 +1,57 @@
-import { ExtendedMakerStatus } from "models/apiModel";
-import { isMakerOnCorrectNetwork, isMakerOutdated } from "./multiAddrUtils";
+import {
+  PendingSelectMakerApprovalRequest,
+  SortableQuoteWithAddress,
+} from "models/tauriModelExt";
+import { QuoteWithAddress } from "models/tauriModel";
+import { isMakerVersionOutdated } from "./multiAddrUtils";
 import _ from "lodash";
 
-export function sortMakerList(list: ExtendedMakerStatus[]) {
+export function sortApprovalsAndKnownQuotes(
+  pendingSelectMakerApprovals: PendingSelectMakerApprovalRequest[],
+  known_quotes: QuoteWithAddress[],
+) {
+  const sortableQuotes = pendingSelectMakerApprovals.map((approval) => {
+    return {
+      ...approval.request.content.maker,
+      expiration_ts:
+        approval.request_status.state === "Pending"
+          ? approval.request_status.content.expiration_ts
+          : undefined,
+      request_id: approval.request_id,
+    } as SortableQuoteWithAddress;
+  });
+
+  sortableQuotes.push(
+    ...known_quotes.map((quote) => ({
+      ...quote,
+      request_id: null,
+    })),
+  );
+
+  return sortMakerApprovals(sortableQuotes);
+}
+
+export function sortMakerApprovals(list: SortableQuoteWithAddress[]) {
   return (
     _(list)
-      // Filter out makers that are on the wrong network (testnet / mainnet)
-      .filter(isMakerOnCorrectNetwork)
-      // Sort by criteria
       .orderBy(
         [
           // Prefer makers that have a 'version' attribute
           // If we don't have a version, we cannot clarify if it's outdated or not
           (m) => (m.version ? 0 : 1),
           // Prefer makers that are not outdated
-          (m) => (isMakerOutdated(m) ? 1 : 0),
-          // Prefer makers that have a relevancy score
-          (m) => (m.relevancy == null ? 1 : 0),
-          // Prefer makers with a higher relevancy score
-          (m) => -(m.relevancy ?? 0),
+          (m) => (isMakerVersionOutdated(m.version) ? 1 : 0),
           // Prefer makers with a minimum quantity > 0
-          (m) => ((m.minSwapAmount ?? 0) > 0 ? 0 : 1),
+          (m) => ((m.quote.min_quantity ?? 0) > 0 ? 0 : 1),
+          // Prefer approvals over actual quotes
+          (m) => (m.request_id ? 0 : 1),
           // Prefer makers with a lower price
-          (m) => m.price,
+          (m) => m.quote.price,
         ],
         ["asc", "asc", "asc", "asc", "asc"],
       )
       // Remove duplicate makers
-      .uniqBy((m) => m.peerId)
+      .uniqBy((m) => m.peer_id)
       .value()
   );
 }