fixed paths

- now i've reverted back to the original two here, as the compiler is failing around `tauri::api::path` however, looking into the new design for the path resolver in tower this tasks, requires pratically changing the whole wallet_strorage and config set up
- it seems pretty straight forward https://v2.tauri.app/start/migrate/from-tauri-1/#migrate-path-to-tauri-manager - however, I would need a second set of eyes on this

contracts/Cargo.lock

@@ -667,9 +667,9 @@ dependencies = [
 
 [[package]]
 name = "deranged"
-version = "0.3.11"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4"
+checksum = "28cfac68e08048ae1883171632c2aef3ebc555621ae56fbccce1cbf22dd7f058"
 dependencies = [
  "powerfmt",
 ]
@@ -1851,9 +1851,9 @@ dependencies = [
 
 [[package]]
 name = "time"
-version = "0.3.39"
+version = "0.3.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dad298b01a40a23aac4580b67e3dbedb7cc8402f3592d7f49469de2ea4aecdd8"
+checksum = "8a7619e19bc266e0f9c5e6686659d394bc57973859340060a69221e57dbc0c40"
 dependencies = [
  "deranged",
  "itoa",
@@ -1868,15 +1868,15 @@ dependencies = [
 
 [[package]]
 name = "time-core"
-version = "0.1.3"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "765c97a5b985b7c11d7bc27fa927dc4fe6af3a6dfb021d28deb60d3bf51e76ef"
+checksum = "c9e9a38711f559d9e3ce1cdb06dd7c5b8ea546bc90052da6d06bb76da74bb07c"
 
 [[package]]
 name = "time-macros"
-version = "0.2.20"
+version = "0.2.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8093bc3e81c3bc5f7879de09619d06c9a5a5e45ca44dfeeb7225bae38005c5c"
+checksum = "3526739392ec93fd8b359c8e98514cb3e8e021beb4e5f597b00a0221f8ed8a49"
 dependencies = [
  "num-conv",
  "time-core",

nym-wallet/package.json

@@ -21,6 +21,7 @@
     "webpack:prod": "yarn webpack --progress --config webpack.prod.js"
   },
   "dependencies": {
+    "@babel/helper-simple-access": "^7.25.9",
     "@emotion/react": "^11.7.0",
     "@emotion/styled": "^11.6.0",
     "@hookform/resolvers": "^2.8.0",
@@ -33,7 +34,10 @@
     "@nymproject/react": "^1.0.0",
     "@nymproject/types": "^1.0.0",
     "@storybook/react": "^6.5.15",
-    "@tauri-apps/api": "^1.2.0",
+    "@tauri-apps/api": "^2.4.0",
+    "@tauri-apps/cli": "^2.4.0",
+    "@tauri-apps/plugin-clipboard-manager": "^2.2.2",
+    "@tauri-apps/plugin-updater": "^2.0.0",
     "@tauri-apps/tauri-forage": "^1.0.0-beta.2",
     "big.js": "^6.2.1",
     "bs58": "^4.0.1",
@@ -67,7 +71,7 @@
     "@pmmmwh/react-refresh-webpack-plugin": "^0.5.4",
     "@storybook/react": "^6.5.15",
     "@svgr/webpack": "^6.1.1",
-    "@tauri-apps/cli": "^1.0.5",
+    "@tauri-apps/cli": "^2.4.0",
     "@testing-library/jest-dom": "^5.14.1",
     "@testing-library/react": "^12.0.0",
     "@types/big.js": "^6.1.6",
@@ -125,4 +129,4 @@
     "webpack-merge": "^5.8.0"
   },
   "private": false
-}
+}

nym-wallet/src-tauri/Cargo.toml

@@ -13,17 +13,21 @@ rust-version = "1.76"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [build-dependencies]
-tauri-build = { version = "=1.2.1", features = [] }
+tauri-build = { version = "2", features = [] }
 
 tauri-codegen = "=1.2.1"
 tauri-macros = "=1.2.1"
 
 [dependencies]
 async-trait = "0.1.68"
+tauri-plugin-updater = "2"
+tauri-plugin-clipboard-manager = "2"
+tauri-plugin-shell = "2"
+tauri-plugin-process = "2"
 bip39 = { version = "2.0.0", features = ["zeroize", "rand"] }
 cfg-if = "1.0.0"
 colored = "2.0"
-dirs = "4.0"
+dirs = "6.0"
 dotenvy = "0.15.6"
 eyre = "0.6.5"
 fern = { version = "0.6.1", features = ["colored"] }
@@ -38,7 +42,7 @@ serde_json = "1.0"
 serde_repr = "0.1"
 strum = { version = "0.23", features = ["derive"] }
 tap = "1"
-tauri = { version = "=1.2.3", features = ["clipboard-all", "shell-open", "updater", "window-maximize", "window-print"] }
+tauri = { version = "2", features = [] }
 #tendermint-rpc = "0.23.0"
 time = { version = "0.3.30", features = ["local-offset"] }
 thiserror = "1.0"
@@ -63,6 +67,11 @@ nym-types = { path = "../../common/types" }
 nym-wallet-types = { path = "../nym-wallet-types" }
 nym-store-cipher = { path = "../../common/store-cipher", features = ["json"] }
 
+
+# https://github.com/ebarnard/rust-plist/issues/151#issuecomment-2746645171
+# https://github.com/jhpratt/deranged/issues/18
+deranged = "=0.4.0"
+
 [dev-dependencies]
 nym-crypto = { path = "../../common/crypto", features = ["rand"] }
 rand_chacha = "0.3"

nym-wallet/src-tauri/capabilities/migrated.json

@@ -0,0 +1,11 @@
+{
+  "identifier": "migrated",
+  "description": "permissions that were migrated from v1",
+  "local": true,
+  "windows": [
+    "main"
+  ],
+  "permissions": [
+    "core:default"
+  ]
+}

nym-wallet/src-tauri/gen/schemas/capabilities.json

@@ -0,0 +1 @@
+{"migrated":{"identifier":"migrated","description":"permissions that were migrated from v1","local":true,"windows":["main"],"permissions":["core:default"]}}

nym-wallet/src-tauri/src/config/mod.rs

@@ -105,7 +105,17 @@ impl NetworkConfig {
 
 impl Config {
     fn root_directory() -> PathBuf {
-        tauri::api::path::config_dir().expect("Failed to get config directory")
+        // tauri v1 (via `tauri::api::path::config_dir()`) was internally calling `dirs_next::config_dir()`
+        // which ultimately was getting resolved to
+        // - **Linux:** Resolves to `$XDG_CONFIG_HOME` or `$HOME/.config`.
+        // - **macOS:** Resolves to `$HOME/Library/Application Support`.
+        // - **Windows:** Resolves to `{FOLDERID_RoamingAppData}`.
+        //
+        // tauri v2 calls `dirs::config_dir().ok_or(Error::UnknownPath)` which ultimately does the same thing,
+        // however, it changed its API so that it's called on a `PathResolver`.
+        // but, to instantiate one here would be a hassle as we don't need those specific functionalities,
+        // so let's just recreate tauri's behaviour
+        dirs::config_dir().expect("Failed to get config directory")
     }
 
     fn config_directory() -> PathBuf {

nym-wallet/src-tauri/src/log.rs

@@ -3,7 +3,7 @@ use std::str::FromStr;
 use fern::colors::{Color, ColoredLevelConfig};
 use serde::Serialize;
 use serde_repr::{Deserialize_repr, Serialize_repr};
-use tauri::Manager;
+use tauri::Emitter;
 use time::{format_description, OffsetDateTime};
 
 fn formatted_time() -> String {
@@ -61,7 +61,7 @@ pub fn setup_logging(app_handle: tauri::AppHandle) -> Result<(), log::SetLoggerE
                 message: record.args().to_string(),
                 level: record.level().into(),
             };
-            app_handle.emit_all("log://log", msg).unwrap();
+            app_handle.emit("log://log", msg).unwrap();
         }));
 
     base_config

nym-wallet/src-tauri/src/main.rs

@@ -3,11 +3,11 @@
     windows_subsystem = "windows"
 )]
 
-use tauri::{Manager, Menu};
-
 use nym_mixnet_contract_common::{Gateway, MixNode};
+use tauri::menu::{MenuBuilder, MenuItemBuilder, SubmenuBuilder};
+use tauri::Manager;
 
-use crate::menu::AddDefaultSubmenus;
+use crate::menu::SHOW_LOG_WINDOW;
 use crate::operations::app;
 use crate::operations::help;
 use crate::operations::mixnet;
@@ -210,13 +210,31 @@ fn main() {
             app::react::set_react_state,
             app::react::get_react_state,
         ])
-        .menu(Menu::os_default(&context.package_info().name).add_default_app_submenus())
-        .on_menu_event(|event| {
-            if event.menu_item_id() == menu::SHOW_LOG_WINDOW {
-                let _r = help::log::help_log_toggle_window(event.window().app_handle());
+        .menu(|app| {
+            // Create a menu builder
+            let menu_builder = MenuBuilder::new(app);
+            if ::std::env::var("NYM_WALLET_ENABLE_LOG").is_ok() {
+                let help_text = MenuItemBuilder::with_id(SHOW_LOG_WINDOW, "Show logs")
+                    .build(app)
+                    .expect("Failed to create menu item");
+
+                let submenu = SubmenuBuilder::new(app, "Help")
+                    .items(&[&help_text])
+                    .build()
+                    .expect("Failed to create help submenu");
+
+                menu_builder.item(&submenu).build()
+            } else {
+                // Build a default menu without the submenu
+                menu_builder.build()
             }
         })
-        .setup(|app| Ok(log::setup_logging(app.app_handle())?))
+        .on_menu_event(|app, event| {
+            if event.id() == SHOW_LOG_WINDOW {
+                let _r = help::log::help_log_toggle_window(app.app_handle().clone());
+            }
+        })
+        .setup(|app| Ok(log::setup_logging(app.app_handle().clone())?))
         .run(context)
         .expect("error while running tauri application");
 }

nym-wallet/src-tauri/src/menu.rs

@@ -1,22 +1,35 @@
-use tauri::Menu;
-use tauri::{CustomMenuItem, Submenu};
+// use tauri::menu::Menu;
+// use tauri::menu::{MenuBuilder, MenuItemBuilder, SubmenuBuilder};
 
 pub const SHOW_LOG_WINDOW: &str = "show_log_window";
 
-pub trait AddDefaultSubmenus {
-    fn add_default_app_submenus(self) -> Self;
-}
-
-impl AddDefaultSubmenus for Menu {
-    #[allow(dead_code)]
-    fn add_default_app_submenus(self) -> Self {
-        if ::std::env::var("NYM_WALLET_ENABLE_LOG").is_ok() {
-            let submenu = Submenu::new(
-                "Help",
-                Menu::new().add_item(CustomMenuItem::new(SHOW_LOG_WINDOW, "Show logs")),
-            );
-            return self.add_submenu(submenu);
-        }
-        self
-    }
-}
+// pub trait AddDefaultSubmenus {
+//     fn add_default_app_submenus(self) -> Self;
+// }
+//
+// impl<R: tauri::Runtime> AddDefaultSubmenus for Menu<R> {
+//     #[allow(dead_code)]
+//     fn add_default_app_submenus(self) -> Self {
+//         if ::std::env::var("NYM_WALLET_ENABLE_LOG").is_ok() {
+//             let app_handle = self.app_handle();
+//
+//             let help_text = MenuItemBuilder::with_id(SHOW_LOG_WINDOW, "Show logs")
+//                 .build(app_handle)
+//                 .expect("Failed to create menu item");
+//
+//             let submenu = SubmenuBuilder::new(app_handle, "Help")
+//                 .items(&[&help_text])
+//                 .build()
+//                 .expect("Failed to create help submenu");
+//
+//             let menu_builder = MenuBuilder::new(app_handle);
+//
+//             match menu_builder.item(&submenu).build() {
+//                 Ok(new_menu) => new_menu,
+//                 Err(_) => self,
+//             }
+//         } else {
+//             self
+//         }
+//     }
+// }

nym-wallet/src-tauri/src/operations/app/version.rs

@@ -3,27 +3,46 @@
 
 use crate::error::BackendError;
 use nym_wallet_types::app::AppVersion;
+use tauri_plugin_updater::UpdaterExt;
 
 #[tauri::command]
 pub async fn check_version(handle: tauri::AppHandle) -> Result<AppVersion, BackendError> {
     log::info!(">>> Getting app version info");
-    let res = tauri::updater::builder(handle)
-        .check()
-        .await
-        .map(|u| AppVersion {
-            current_version: u.current_version().to_string(),
-            latest_version: u.latest_version().to_owned(),
-            is_update_available: u.is_update_available(),
+
+    let updater = handle.updater().map_err(|e| {
+        log::error!("Failed to get updater: {}", e);
+        BackendError::CheckAppVersionError
+    })?;
+
+    // Then check for updates
+    let update_info = updater.check().await.map_err(|e| {
+        log::error!("An error occurred while checking for app update {}", e);
+        BackendError::CheckAppVersionError
+    })?;
+
+    // Process the result
+    if let Some(update) = update_info {
+        log::debug!(
+            "<<< update available: [true], current version {}, latest version {}",
+            update.current_version,
+            update.version
+        );
+        Ok(AppVersion {
+            current_version: update.current_version.to_string(),
+            latest_version: update.version,
+            is_update_available: true,
         })
-        .map_err(|e| {
-            log::error!("An error ocurred while checking for app update {}", e);
-            BackendError::CheckAppVersionError
-        })?;
-    log::debug!(
-        "<<< update available: [{}], current version {}, latest version {}",
-        res.is_update_available,
-        res.current_version,
-        res.latest_version
-    );
-    Ok(res)
+    } else {
+        // No update available
+        let current_version = handle.package_info().version.to_string();
+        log::debug!(
+            "<<< update available: [false], current version {}",
+            current_version
+        );
+        Ok(AppVersion {
+            current_version: current_version.clone(),
+            latest_version: current_version,
+            is_update_available: false,
+        })
+    }
 }

nym-wallet/src-tauri/src/operations/app/window.rs

@@ -26,10 +26,10 @@ async fn create_window(
 ) -> Result<(), BackendError> {
     // create the new window first, to stop the app process from exiting
     log::info!("Creating {} window...", new_window_label);
-    match tauri::WindowBuilder::new(
+    match tauri::WebviewWindowBuilder::new(
         &app_handle,
-        new_window_label,
-        tauri::WindowUrl::App(new_window_url.into()),
+        "main",
+        tauri::WebviewUrl::App(new_window_url.into()),
     )
     .title("Nym Wallet")
     .build()
@@ -49,7 +49,7 @@ async fn create_window(
     }
 
     // close the old window
-    match app_handle.windows().get(try_close_window_label) {
+    match app_handle.get_webview_window(try_close_window_label) {
         Some(try_close_window) => {
             if let Err(err) = try_close_window.close() {
                 log::error!("Could not close window: {err}")

nym-wallet/src-tauri/src/operations/help/log.rs

@@ -3,7 +3,7 @@ use tauri::Manager;
 
 #[tauri::command]
 pub fn help_log_toggle_window(app_handle: tauri::AppHandle) -> Result<(), BackendError> {
-    if let Some(current_log_window) = app_handle.windows().get("log") {
+    if let Some(current_log_window) = app_handle.get_webview_window("log") {
         log::info!("Closing log window...");
         if let Err(err) = current_log_window.close() {
             log::error!("Unable to close log window: {err}");
@@ -12,9 +12,13 @@ pub fn help_log_toggle_window(app_handle: tauri::AppHandle) -> Result<(), Backen
     }
 
     log::info!("Creating log window...");
-    match tauri::WindowBuilder::new(&app_handle, "log", tauri::WindowUrl::App("log.html".into()))
-        .title("Nym Wallet Logs")
-        .build()
+    match tauri::WebviewWindowBuilder::new(
+        &app_handle,
+        "log",
+        tauri::WebviewUrl::App("log.html".into()),
+    )
+    .title("Nym Wallet Logs")
+    .build()
     {
         Ok(window) => {
             if let Err(err) = window.set_focus() {

nym-wallet/src-tauri/src/wallet_storage/mod.rs

@@ -38,7 +38,17 @@ pub(crate) const DEFAULT_LOGIN_ID: &str = "default";
 pub(crate) const DEFAULT_FIRST_ACCOUNT_NAME: &str = "Account 1";
 
 fn get_storage_directory() -> Result<PathBuf, BackendError> {
-    tauri::api::path::local_data_dir()
+    // tauri v1 (via `tauri::api::path::local_data_dir()`) was internally calling `dirs_next::data_local_dir()`
+    // which ultimately was getting resolved to
+    // - **Linux:** Resolves to `$XDG_DATA_HOME` or `$HOME/.local/share`.
+    // - **macOS:** Resolves to `$HOME/Library/Application Support`.
+    // - **Windows:** Resolves to `{FOLDERID_LocalAppData}`.
+    //
+    // tauri v2 calls `dirs::data_local_dir().ok_or(Error::UnknownPath)` which ultimately does the same thing,
+    // however, it changed its API so that it's called on a `PathResolver`.
+    // but, to instantiate one here would be a hassle as we don't need those specific functionalities,
+    // so let's just recreate tauri's behaviour
+    dirs::data_local_dir()
         .map(|dir| dir.join(STORAGE_DIR_NAME))
         .ok_or(BackendError::UnknownStorageDirectory)
 }

nym-wallet/src-tauri/tauri.conf.json

@@ -1,78 +1,69 @@
 {
-  "package": {
-    "productName": "nym-wallet",
-    "version": "1.2.16"
-  },
-  "build": {
-    "distDir": "../dist",
-    "devPath": "http://localhost:9000",
-    "beforeDevCommand": "",
-    "beforeBuildCommand": ""
-  },
-  "tauri": {
-    "bundle": {
-      "active": true,
-      "targets": "all",
-      "identifier": "net.nymtech.wallet",
-      "icon": [
-        "icons/32x32.png",
-        "icons/128x128.png",
-        "icons/128x128@2x.png",
-        "icons/icon.icns",
-        "icons/icon.ico"
-      ],
-      "resources": [],
-      "externalBin": [],
-      "copyright": "Copyright © 2021-2023 Nym Technologies SA",
-      "category": "Business",
-      "shortDescription": "Nym desktop wallet allows you to manage your NYM tokens",
-      "longDescription": "",
+  "bundle": {
+    "active": true,
+    "targets": "all",
+    "windows": {
+      "certificateThumbprint": "6DB77B1F529A0804FE0E6843A3EB8A8CECFFD408",
+      "digestAlgorithm": "sha256",
+      "timestampUrl": "http://timestamp.comodoca.com"
+    },
+    "icon": [
+      "icons/32x32.png",
+      "icons/128x128.png",
+      "icons/128x128@2x.png",
+      "icons/icon.icns",
+      "icons/icon.ico"
+    ],
+    "resources": [],
+    "externalBin": [],
+    "copyright": "Copyright © 2021-2025 Nym Technologies SA",
+    "category": "Business",
+    "shortDescription": "Nym desktop wallet allows you to manage your NYM tokens",
+    "longDescription": "",
+    "macOS": {
+      "frameworks": [],
+      "minimumSystemVersion": "",
+      "exceptionDomain": "",
+      "signingIdentity": "Developer ID Application: Nym Technologies SA (VW5DZLFHM5)",
+      "entitlements": null
+    },
+    "linux": {
       "deb": {
         "depends": []
-      },
-      "macOS": {
-        "frameworks": [],
-        "minimumSystemVersion": "",
-        "exceptionDomain": "",
-        "signingIdentity": "Developer ID Application: Nym Technologies SA (VW5DZLFHM5)",
-        "entitlements": null
-      },
-      "windows": {
-        "certificateThumbprint": "6DB77B1F529A0804FE0E6843A3EB8A8CECFFD408",
-        "digestAlgorithm": "sha256",
-        "timestampUrl": "http://timestamp.comodoca.com"
       }
     },
+    "createUpdaterArtifacts": "v1Compatible"
+  },
+  "build": {
+    "beforeBuildCommand": "",
+    "frontendDist": "../dist",
+    "beforeDevCommand": "",
+    "devUrl": "http://localhost:9000"
+  },
+  "productName": "nym-wallet",
+  "mainBinaryName": "nym-wallet",
+  "version": "1.2.15",
+  "identifier": "net.nymtech.wallet",
+  "plugins": {
     "updater": {
-      "active": true,
+      "pubkey": "dW50cnVzdGVkIGNvbW1lbnQ6IG1pbmlzaWduIHB1YmxpYyBrZXk6IENCNzQ2M0E5N0VFODE2NApSV1JrZ2U2WE9rYTNETTg1OTBKdE5uWUEra0hML2syOVUvQ2lxZmFZRzZ1T3NWbGM0eVRzUTVhVwo=",
       "endpoints": [
         "https://nymtech.net/.wellknown/wallet/updater.json"
-      ],
-      "dialog": true,
-      "pubkey": "dW50cnVzdGVkIGNvbW1lbnQ6IG1pbmlzaWduIHB1YmxpYyBrZXk6IENCNzQ2M0E5N0VFODE2NApSV1JrZ2U2WE9rYTNETTg1OTBKdE5uWUEra0hML2syOVUvQ2lxZmFZRzZ1T3NWbGM0eVRzUTVhVwo="
-    },
-    "allowlist": {
-      "window": {
-        "maximize": true,
-        "print": true
-      },
-      "clipboard": {
-        "all": true
-      },
-      "shell": {
-        "open": true
-      }
+      ]
+    }
+  },
+  "app": {
+    "security": {
+      "csp": "default-src blob: data: filesystem: ws: wss: http: https: tauri: 'unsafe-eval' 'unsafe-inline' 'self' img-src: 'self'; connect-src ipc: http://ipc.localhost"
     },
     "windows": [
       {
         "title": "Nym Wallet",
         "width": 1268,
         "height": 768,
-        "resizable": true
+        "resizable": true,
+        "useHttpsScheme": true
       }
-    ],
-    "security": {
-      "csp": "default-src blob: data: filesystem: ws: wss: http: https: tauri: 'unsafe-eval' 'unsafe-inline' 'self' img-src: 'self'"
-    }
+    ]
   }
 }

nym-wallet/src/components/CopyToClipboard.tsx

@@ -1,7 +1,7 @@
 import React, { useEffect, useState } from 'react';
 import { Button, IconButton, Tooltip } from '@mui/material';
 import { Check, ContentCopy } from '@mui/icons-material';
-import { clipboard } from '@tauri-apps/api';
+import { writeText } from '@tauri-apps/plugin-clipboard-manager';
 import { Console } from '../utils/console';
 
 export const CopyToClipboard = ({ text = '', iconButton }: { text?: string; iconButton?: boolean }) => {
@@ -9,7 +9,7 @@ export const CopyToClipboard = ({ text = '', iconButton }: { text?: string; icon
 
   const handleCopy = async (_text: string) => {
     try {
-      await clipboard.writeText(_text);
+      await writeText(_text);
       setCopied(true);
     } catch (e) {
       Console.error(`failed to copy: ${e}`);

nym-wallet/src/components/Settings/AppVersion.tsx

@@ -1,6 +1,6 @@
 import React, { useContext, useEffect, useState } from 'react';
 import { Button, Stack, Typography } from '@mui/material';
-import { checkUpdate } from '@tauri-apps/api/updater';
+import { check } from '@tauri-apps/plugin-updater';
 import { AppContext } from '../../context';
 import { checkVersion } from '../../requests';
 import { Console } from '../../utils/console';
@@ -28,7 +28,7 @@ const AppVersion = () => {
     try {
       // despite the name, this will spawn an external native window with
       // an embedded "download and update the Wallet" flow
-      checkUpdate();
+      check();
     } catch (e) {
       Console.error(e);
     }

nym-wallet/src/pages/internal-docs/DocEntry.tsx

@@ -1,7 +1,7 @@
 /* eslint-disable react/destructuring-assignment */
 import React from 'react';
 import { Button, Card, CardContent, TextField } from '@mui/material';
-import { invoke } from '@tauri-apps/api';
+import { invoke } from '@tauri-apps/api/core';
 
 interface DocEntryProps {
   function: FunctionDef;

nym-wallet/src/requests/wrapper.ts

@@ -1,4 +1,4 @@
-import { invoke } from '@tauri-apps/api';
+import { invoke } from '@tauri-apps/api/core';
 import { config } from '../config';
 import { Console } from '../utils/console';
 

nym-wallet/src/utils/common.ts

@@ -1,4 +1,4 @@
-import { appWindow } from '@tauri-apps/api/window';
+import { getCurrentWebviewWindow } from '@tauri-apps/api/webviewWindow';
 import bs58 from 'bs58';
 import Big from 'big.js';
 import { valid } from 'semver';
@@ -15,6 +15,8 @@ import {
 } from '../requests';
 import { Console } from './console';
 
+const appWindow = getCurrentWebviewWindow();
+
 export const validateKey = (key: string, bytesLength: number): boolean => {
   // it must be a valid base58 key
   try {