diff --git a/tauri-wallet/Cargo.lock b/tauri-wallet/Cargo.lock index 0e65659c82..ef2299faae 100644 --- a/tauri-wallet/Cargo.lock +++ b/tauri-wallet/Cargo.lock @@ -5290,4 +5290,4 @@ checksum = "615120c7a2431d16cf1cf979e7fc31ba7a5b5e5707b29c8a99e5dbf8a8392a33" dependencies = [ "cc", "libc", -] +] \ No newline at end of file diff --git a/tauri-wallet/package.json b/tauri-wallet/package.json index c40a25fb93..71a6a73f58 100644 --- a/tauri-wallet/package.json +++ b/tauri-wallet/package.json @@ -8,8 +8,8 @@ "webpack:build": "yarn webpack --progress --config webpack.prod.config.js", "tauri:dev": "yarn tauri dev", "tauri:build": "yarn tauri build", - "dev": "yarn run webpack:dev & yarn run tauri:dev", - "build": "yarn run webpack:build & yarn run tauri:build" + "dev": "run-p webpack:dev tauri:dev", + "build": "run-s webpack:build tauri:build" }, "dependencies": { "@babel/preset-typescript": "^7.15.0", @@ -47,6 +47,7 @@ "favicons-webpack-plugin": "^5.0.2", "file-loader": "^6.2.0", "html-webpack-plugin": "^5.3.2", + "npm-run-all": "^4.1.5", "style-loader": "^3.2.1", "url-loader": "^4.1.1", "webpack": "^5.50.0", diff --git a/tauri-wallet/src-tauri/src/main.rs b/tauri-wallet/src-tauri/src/main.rs index 8ac9f6c423..95972379dd 100644 --- a/tauri-wallet/src-tauri/src/main.rs +++ b/tauri-wallet/src-tauri/src/main.rs @@ -5,7 +5,6 @@ use mixnet_contract::{Gateway, MixNode}; use std::sync::Arc; -use tauri::{Menu, MenuItem}; use tokio::sync::RwLock; use ts_rs::export; use validator_client::nymd::fee_helpers::Operation; @@ -36,12 +35,6 @@ macro_rules! format_err { }; } -pub fn create_menu_items() -> Menu { - Menu::new() - .add_native_item(MenuItem::Copy) - .add_native_item(MenuItem::Paste) -} - fn main() { tauri::Builder::default() .manage(Arc::new(RwLock::new(State::default()))) @@ -65,7 +58,6 @@ fn main() { update_state_params, get_reverse_mix_delegations_paged, ]) - .menu(create_menu_items()) .run(tauri::generate_context!()) .expect("error while running tauri application"); } @@ -82,4 +74,4 @@ export! { DelegationResult => "../src/types/rust/delegationresult.ts", Account => "../src/types/rust/account.ts", TauriStateParams => "../src/types/rust/stateparams.ts" -} +} \ No newline at end of file diff --git a/tauri-wallet/webpack.config.js b/tauri-wallet/webpack.config.js index c3434547df..63c9ab0b88 100644 --- a/tauri-wallet/webpack.config.js +++ b/tauri-wallet/webpack.config.js @@ -7,7 +7,7 @@ module.exports = { node: { __dirname: false }, - entry: path.resolve(__dirname, './src/index'), + entry: path.resolve(__dirname, 'src/index'), devServer: { port: 9000, compress: true,