The shortcuts "Discoverability" menu shown while pressing Cmd will no…

…t be shown if Cmd is assigned any modifer mappings in keyboard screen

Blink/SpaceController.m

@@ -34,7 +34,7 @@
 #import "SmartKeysController.h"
 #import "TermController.h"
 #import "ScreenController.h"
-
+#import "BKDefaults.h"
 
 @interface SpaceController () <UIPageViewControllerDataSource, UIPageViewControllerDelegate,
   UIGestureRecognizerDelegate, TermControlDelegate>
@@ -57,6 +57,7 @@ @implementation SpaceController {
   MBProgressHUD *_hud;
 
   NSMutableArray<UIKeyCommand *> *_kbdCommands;
+  NSMutableArray<UIKeyCommand *> *_kbdCommandsWithoutDiscoverability;
 }
 
 #pragma mark Setup
@@ -437,6 +438,10 @@ - (void)terminalHangup:(TermController *)control
 
 - (NSArray<UIKeyCommand *> *)keyCommands
 {
+  NSMutableDictionary *kbMapping = [NSMutableDictionary dictionaryWithDictionary:[BKDefaults keyboardMapping]];
+  if([kbMapping objectForKey:@"⌘ Cmd"] && ![[kbMapping objectForKey:@"⌘ Cmd"]isEqualToString:@"None"]){
+    return _kbdCommandsWithoutDiscoverability;
+  }
   return _kbdCommands;
 }
 
@@ -478,6 +483,13 @@ - (void)setKbdCommands
 
     [_kbdCommands addObject:cmd];
   }
+
+  for (UIKeyCommand *command in _kbdCommands) {
+    UIKeyCommand *commandWithoutDiscoverability = [command copy];
+    commandWithoutDiscoverability.discoverabilityTitle = nil;
+    [_kbdCommandsWithoutDiscoverability addObject:commandWithoutDiscoverability];
+  }
+
 }
 
 - (void)otherScreen:(UIKeyCommand *)cmd