fixes

src-gui/index.html

@@ -30,8 +30,10 @@
         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 */
+      }
+
+      * {
+        overscroll-behavior: none; /* Prevents the bounce effect on all elements */
       }
     </style>
   </body>

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/modal/swap/pages/init/InitPage.tsx

@@ -108,6 +108,7 @@ export default function InitPage() {
           endIcon={<PlayArrowIcon />}
           onInvoke={init}
           displayErrorSnackbar
+          onPendingChange={}
         >
           Request quote and start swap
         </PromiseInvokeButton>

src-gui/src/renderer/store/storeRenderer.ts

@@ -18,17 +18,17 @@ const rootPersistConfig = {
 };
 
 // Use Tauri's store plugin for persistent settings
-const tauriStore = await createStore(`${getNetworkName()}_settings.bin`, {
+const tauriStore = createStore(`${getNetworkName()}_settings.bin`, {
   autoSave: 1000 as unknown as boolean,
 });
 
 // Configure how settings are stored and retrieved using Tauri's storage
 const settingsPersistConfig = {
   key: "settings",
   storage: {
-    getItem: async (key: string) => (tauriStore).get(key),
-    setItem: async (key: string, value: unknown) => (tauriStore).set(key, value),
-    removeItem: async (key: string) => (tauriStore).delete(key),
+    getItem: async (key: string) => (await tauriStore).get(key),
+    setItem: async (key: string, value: unknown) => (await tauriStore).set(key, value),
+    removeItem: async (key: string) => (await tauriStore).delete(key),
   },
 };
 

src-gui/vite.config.ts

@@ -13,13 +13,8 @@ export default defineConfig(async () => ({
   plugins: [
     react(),
     tsconfigPaths(),
-    topLevelAwait({
-      // The export name of top-level await promise for each chunk module
-      promiseExportName: "__tla",
-      // The function to generate import names of top-level await promise in each chunk module
-      promiseImportName: i => `__tla_${i}`
-    }),
-    // automatically regenerate the typescript bindings when there's a change
+    topLevelAwait(),
+    // Automatically regenerate the typescript bindings when there's a change to the rust code
     watch({
       pattern: ["../swap/src/**/*"],
       command: "yarn run gen-bindings",

src-tauri/tauri.conf.json

@@ -5,10 +5,6 @@
   "build": {
     "devUrl": "http://localhost:1420",
     "frontendDist": "../src-gui/dist",
-    "beforeDevCommand": {
-      "cwd": "../src-gui",
-      "script": "yarn run dev"
-    },
     "beforeBuildCommand": {
       "cwd": "../src-gui",
       "script": "yarn run build"

swap/src/cli/watcher.rs

@@ -43,6 +43,8 @@ impl Watcher {
         // Note: since this is de-facto a daemon, we have to gracefully handle errors
         // (which in our case means logging the error message and trying again later)
         loop {
+            tokio::time::sleep(Duration::from_secs(Watcher::CHECK_INTERVAL)).await;
+
             // Fetch current transactions and timelocks
             let current_swaps = match self.get_current_swaps().await {
                 Ok(val) => val,
@@ -82,9 +84,6 @@ impl Watcher {
                 // Insert new status
                 self.cached_timelocks.insert(swap_id, new_timelock_status);
             }
-
-            // Sleep and check again later
-            tokio::time::sleep(Duration::from_secs(Watcher::CHECK_INTERVAL)).await;
         }
     }