From fccbe16b2a48fb1c4fb56027e9500428d3f8c32d Mon Sep 17 00:00:00 2001 From: Mark Sinclair Date: Wed, 14 Sep 2022 12:37:10 +0100 Subject: [PATCH] Remove old code --- nym-wallet/src-tauri/src/main.rs | 26 ++++++++------------------ 1 file changed, 8 insertions(+), 18 deletions(-) diff --git a/nym-wallet/src-tauri/src/main.rs b/nym-wallet/src-tauri/src/main.rs index 988d523ccc..ea1d023117 100644 --- a/nym-wallet/src-tauri/src/main.rs +++ b/nym-wallet/src-tauri/src/main.rs @@ -32,7 +32,7 @@ fn main() { dotenv::dotenv().ok(); let context = tauri::generate_context!(); - let builder = tauri::Builder::default() + tauri::Builder::default() .manage(WalletState::default()) .invoke_handler(tauri::generate_handler![ mixnet::account::add_account_for_password, @@ -152,23 +152,13 @@ fn main() { signatures::sign::sign, signatures::sign::verify, help::log::help_log_toggle_window, - ]); - - let builder = if ::std::env::var("NYM_WALLET_ENABLE_MENUBAR").is_ok() { - builder - .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()); - } - }) - } else { - // This is the old behaviour. - // Remove this branch once we're happy with the menubar behaviour. - builder.menu(Menu::new().add_default_app_submenus()) - }; - - builder + ]) + .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()); + } + }) .setup(|app| Ok(log::setup_logging(app.app_handle())?)) .run(context) .expect("error while running tauri application");