feat(gui, tauri): Accept --testnet flag, default to mainnet

.gitignore

@@ -1 +1 @@
-target
+target

dprint.json

@@ -9,7 +9,7 @@
     "rustfmt.associations": "**/*.rs"
   },
   "includes": ["**/*.{md}", "**/*.{toml}", "**/*.{rs}"],
-  "excludes": ["target/"],
+  "excludes": ["target/", "src-tauri/Cargo.toml"],
   "plugins": [
     "https://plugins.dprint.dev/markdown-0.13.1.wasm",
     "https://github.com/thomaseizinger/dprint-plugin-cargo-toml/releases/download/0.1.0/cargo-toml-0.1.0.wasm",

src-gui/README.md

@@ -21,7 +21,7 @@ yarn install && yarn run dev
 
 ```bash
 cd src-tauri
-cargo tauri dev
+cargo tauri dev --no-watch -- -- --testnet
 # let this run as well
 ```
 

src-gui/index.html

@@ -30,8 +30,6 @@
         height: 100%;
         margin: 0;
         overflow: auto;
-        overscroll-behavior: none; /* Prevents the bounce effect */
-        overscroll-behavior-y: contain; /* Prevents the bounce effect on the y-axis */
       }
     </style>
   </body>

src-gui/package.json

@@ -20,6 +20,7 @@
     "@material-ui/lab": "^4.0.0-alpha.61",
     "@reduxjs/toolkit": "^2.2.6",
     "@tauri-apps/api": "^2.0.0",
+    "@tauri-apps/plugin-cli": "^2.0.0",
     "@tauri-apps/plugin-clipboard-manager": "^2.0.0",
     "@tauri-apps/plugin-process": "^2.0.0",
     "@tauri-apps/plugin-shell": "^2.0.0",
@@ -58,6 +59,7 @@
     "typescript": "^5.2.2",
     "typescript-eslint": "^8.1.0",
     "vite": "^5.3.1",
+    "vite-plugin-top-level-await": "^1.4.4",
     "vite-plugin-watch": "^0.3.1",
     "vite-tsconfig-paths": "^4.3.2",
     "vitest": "^2.1.1"

src-gui/src/renderer/components/modal/feedback/FeedbackDialog.tsx

@@ -10,7 +10,6 @@ import {
   Select,
   TextField,
 } from "@material-ui/core";
-import { CliLog } from "models/cliModel";
 import { useSnackbar } from "notistack";
 import { useState } from "react";
 import TruncatedText from "renderer/components/other/TruncatedText";
@@ -20,21 +19,22 @@ import { parseDateString } from "utils/parseUtils";
 import { submitFeedbackViaHttp } from "../../../api";
 import LoadingButton from "../../other/LoadingButton";
 import { PiconeroAmount } from "../../other/Units";
+import { getLogsOfSwap } from "renderer/rpc";
 
 async function submitFeedback(body: string, swapId: string | number) {
   let attachedBody = "";
 
   if (swapId !== 0 && typeof swapId === "string") {
     const swapInfo = store.getState().rpc.state.swapInfos[swapId];
-    const logs = [] as CliLog[];
-
-    throw new Error("Not implemented");
-
+
     if (swapInfo === undefined) {
       throw new Error(`Swap with id ${swapId} not found`);
     }
 
-    attachedBody = `${JSON.stringify(swapInfo, null, 4)} \n\nLogs: ${logs
+    // Retrieve logs for the specific swap
+    const logs = await getLogsOfSwap(swapId, false);
+
+    attachedBody = `${JSON.stringify(swapInfo, null, 4)} \n\nLogs: ${logs.logs
       .map((l) => JSON.stringify(l))
       .join("\n====\n")}`;
   }

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

@@ -31,11 +31,12 @@ export default function SwapDialog({
   onClose: () => void;
 }) {
   const classes = useStyles();
+
   const swap = useAppSelector((state) => state.swap);
   const isSwapRunning = useIsSwapRunning();
-
   const [debug, setDebug] = useState(false);
   const [openSuspendAlert, setOpenSuspendAlert] = useState(false);
+
   const dispatch = useAppDispatch();
 
   function onCancel() {

src-gui/src/renderer/components/pages/help/SettingsBox.tsx

@@ -9,14 +9,15 @@ import {
   Box,
   makeStyles,
   Tooltip,
+  Switch,
 } from "@material-ui/core";
 import InfoBox from "renderer/components/modal/swap/InfoBox";
 import {
   resetSettings,
   setElectrumRpcUrl,
   setMoneroNodeUrl,
 } from "store/features/settingsSlice";
-import { useAppDispatch, useAppSelector } from "store/hooks";
+import { useAppDispatch, useSettings } from "store/hooks";
 import ValidatedTextField from "renderer/components/other/ValidatedTextField";
 import RefreshIcon from "@material-ui/icons/Refresh";
 import HelpIcon from '@material-ui/icons/HelpOutline';
@@ -80,7 +81,7 @@ function isValidUrl(url: string, allowedProtocols: string[]): boolean {
 }
 
 function ElectrumRpcUrlSetting() {
-  const electrumRpcUrl = useAppSelector((s) => s.settings.electrum_rpc_url);
+  const electrumRpcUrl = useSettings((s) => s.electrum_rpc_url);
   const dispatch = useAppDispatch();
 
   function isValid(url: string): boolean {
@@ -123,7 +124,7 @@ function SettingLabel({ label, tooltip }: { label: ReactNode, tooltip: string |
 }
 
 function MoneroNodeUrlSetting() {
-  const moneroNodeUrl = useAppSelector((s) => s.settings.monero_node_url);
+  const moneroNodeUrl = useSettings((s) => s.monero_node_url);
   const dispatch = useAppDispatch();
 
   function isValid(url: string): boolean {
@@ -150,4 +151,4 @@ function MoneroNodeUrlSetting() {
       </TableCell>
     </TableRow>
   );
-}
+}

src-gui/src/renderer/index.tsx

@@ -17,9 +17,11 @@ import {
 import App from "./components/App";
 import { initEventListeners } from "./rpc";
 import { persistor, store } from "./store/storeRenderer";
+import { Box } from "@material-ui/core";
 
 const container = document.getElementById("root");
 const root = createRoot(container!);
+
 root.render(
   <Provider store={store}>
     <PersistGate loading={null} persistor={persistor}>

src-gui/src/renderer/rpc.ts

@@ -36,6 +36,7 @@ import { providerToConcatenatedMultiAddr } from "utils/multiAddrUtils";
 import { MoneroRecoveryResponse } from "models/rpcModel";
 import { ListSellersResponse } from "../models/tauriModel";
 import logger from "utils/logger";
+import { isTestnet } from "store/config";
 
 export async function initEventListeners() {
   // This operation is in-expensive
@@ -201,7 +202,10 @@ export async function listSellersAtRendezvousPoint(
 
 export async function initializeContext() {
   const settings = store.getState().settings;
+  const testnet = isTestnet();
+
   await invokeUnsafe<void>("initialize_context", {
     settings,
+    testnet,
   });
 }

src-gui/src/store/config.ts

@@ -1,7 +1,12 @@
 import { ExtendedProviderStatus } from "models/apiModel";
 import { splitPeerIdFromMultiAddress } from "utils/parseUtils";
+import { getMatches } from '@tauri-apps/plugin-cli';
 
-export const isTestnet = () => true;
+const matches = await getMatches();
+
+export function isTestnet() {
+  return matches.args.testnet?.value === true
+}
 
 export const isDevelopment = true;
 

src-gui/src/store/features/settingsSlice.ts

@@ -2,7 +2,6 @@ import { createSlice, PayloadAction } from "@reduxjs/toolkit";
 import { TauriSettings } from "models/tauriModel";
 
 const initialState: TauriSettings = {
-  bitcoin_confirmation_target: 1,
   electrum_rpc_url: null,
   monero_node_url: null,
 };
@@ -11,18 +10,15 @@ const alertsSlice = createSlice({
   name: "settings",
   initialState,
   reducers: {
-    setBitcoinConfirmationTarget(slice, action: PayloadAction<number>) {
-      slice.bitcoin_confirmation_target = action.payload;
-    },
     setElectrumRpcUrl(slice, action: PayloadAction<string | null>) {
-      if (action.payload === null || action.payload === "") {
+      if (action.payload === null || action.payload === "") {
         slice.electrum_rpc_url = null;
       } else {
         slice.electrum_rpc_url = action.payload;
       }
     },
     setMoneroNodeUrl(slice, action: PayloadAction<string | null>) {
-      if (action.payload === null || action.payload === "") {
+      if (action.payload === null || action.payload === "") {
         slice.monero_node_url = null;
       } else {
         slice.monero_node_url = action.payload;
@@ -35,9 +31,8 @@ const alertsSlice = createSlice({
 });
 
 export const {
-  setBitcoinConfirmationTarget,
   setElectrumRpcUrl,
   setMoneroNodeUrl,
-  resetSettings
+  resetSettings,
 } = alertsSlice.actions;
 export default alertsSlice.reducer;