From 2f69958e21ddb1565c4ce989c4e1e846e39e8ec0 Mon Sep 17 00:00:00 2001
From: fmtabbara <fmtabbara@hotmail.co.uk>
Date: Fri, 12 Nov 2021 10:29:49 +0000
Subject: [PATCH] macos keyboard shortcut fix

---
 nym-wallet/src-tauri/src/main.rs |  4 +++-
 nym-wallet/src-tauri/src/menu.rs | 23 +++++++++++++++++++++++
 2 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 nym-wallet/src-tauri/src/menu.rs

diff --git a/nym-wallet/src-tauri/src/main.rs b/nym-wallet/src-tauri/src/main.rs
index 4afb247bfc..dec9a3f40f 100644
--- a/nym-wallet/src-tauri/src/main.rs
+++ b/nym-wallet/src-tauri/src/main.rs
@@ -12,10 +12,12 @@ use validator_client::nymd::fee_helpers::Operation;
 mod coin;
 mod config;
 mod error;
+mod menu;
 mod operations;
 mod state;
 mod utils;
 
+use crate::menu::AddDefaultSubmenus;
 use crate::operations::account::*;
 use crate::operations::admin::*;
 use crate::operations::bond::*;
@@ -64,7 +66,7 @@ fn main() {
       update_state_params,
       get_reverse_mix_delegations_paged,
     ])
-    .menu(create_menu_items())
+    .menu(Menu::new().add_default_app_submenu_if_macos())
     .run(tauri::generate_context!())
     .expect("error while running tauri application");
 }
diff --git a/nym-wallet/src-tauri/src/menu.rs b/nym-wallet/src-tauri/src/menu.rs
new file mode 100644
index 0000000000..5be2b75f22
--- /dev/null
+++ b/nym-wallet/src-tauri/src/menu.rs
@@ -0,0 +1,23 @@
+use tauri::{Menu, MenuItem, Submenu};
+
+pub trait AddDefaultSubmenus {
+  fn add_default_app_submenu_if_macos(self) -> Self;
+}
+
+impl AddDefaultSubmenus for Menu {
+  fn add_default_app_submenu_if_macos(self) -> Menu {
+    #[cfg(target_os = "macos")]
+    return self.add_submenu(Submenu::new(
+      "Menu",
+      Menu::new()
+        .add_native_item(MenuItem::Copy)
+        .add_native_item(MenuItem::Paste)
+        .add_native_item(MenuItem::Hide)
+        .add_native_item(MenuItem::HideOthers)
+        .add_native_item(MenuItem::ShowAll)
+        .add_native_item(MenuItem::Quit),
+    ));
+    #[cfg(not(target_os = "macos"))]
+    return self;
+  }
+}