From cca74b4d0e43f01f6f66df36b967b27980205286 Mon Sep 17 00:00:00 2001
From: Sheikh-JamirAlam <alamjamir15@gmail.com>
Date: Wed, 20 Sep 2023 20:10:08 +0530
Subject: [PATCH 1/2] Changed shortcut format for better accessibility

---
 client/modules/IDE/components/Header/Nav.jsx         |  6 ++----
 .../modules/IDE/components/KeyboardShortcutModal.jsx | 12 ++++++------
 client/utils/metaKey.js                              |  2 +-
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/client/modules/IDE/components/Header/Nav.jsx b/client/modules/IDE/components/Header/Nav.jsx
index b4f7cb151f..d956e81da2 100644
--- a/client/modules/IDE/components/Header/Nav.jsx
+++ b/client/modules/IDE/components/Header/Nav.jsx
@@ -195,9 +195,7 @@ const ProjectMenu = () => {
       <NavDropdownMenu id="edit" title={t('Nav.Edit.Title')}>
         <NavMenuItem onClick={cmRef.current?.tidyCode}>
           {t('Nav.Edit.TidyCode')}
-          <span className="nav__keyboard-shortcut">
-            {metaKeyName}+{'\u21E7'}+F
-          </span>
+          <span className="nav__keyboard-shortcut">{metaKeyName}+Shift+F</span>
         </NavMenuItem>
         <NavMenuItem onClick={cmRef.current?.showFind}>
           {t('Nav.Edit.Find')}
@@ -222,7 +220,7 @@ const ProjectMenu = () => {
         <NavMenuItem onClick={() => dispatch(stopSketch())}>
           {t('Nav.Sketch.Stop')}
           <span className="nav__keyboard-shortcut">
-            {'\u21E7'}+{metaKeyName}+Enter
+            Shift+{metaKeyName}+Enter
           </span>
         </NavMenuItem>
       </NavDropdownMenu>
diff --git a/client/modules/IDE/components/KeyboardShortcutModal.jsx b/client/modules/IDE/components/KeyboardShortcutModal.jsx
index 093630498a..a56710810d 100644
--- a/client/modules/IDE/components/KeyboardShortcutModal.jsx
+++ b/client/modules/IDE/components/KeyboardShortcutModal.jsx
@@ -25,7 +25,7 @@ function KeyboardShortcutModal() {
       <ul className="keyboard-shortcuts__list">
         <li className="keyboard-shortcut-item">
           <span className="keyboard-shortcut__command">
-            {metaKeyName} + {'\u21E7'} + F
+            {metaKeyName} + Shift + F
           </span>
           <span>{t('KeyboardShortcuts.CodeEditing.Tidy')}</span>
         </li>
@@ -39,7 +39,7 @@ function KeyboardShortcutModal() {
         </li>
         <li className="keyboard-shortcut-item">
           <span className="keyboard-shortcut__command">
-            {metaKeyName} + {'\u21E7'} + G
+            {metaKeyName} + Shift + G
           </span>
           <span>
             {t('KeyboardShortcuts.CodeEditing.FindPreviousTextMatch')}
@@ -84,24 +84,24 @@ function KeyboardShortcutModal() {
         </li>
         <li className="keyboard-shortcut-item">
           <span className="keyboard-shortcut__command">
-            {metaKeyName} + {'\u21E7'} + Enter
+            {metaKeyName} + Shift + Enter
           </span>
           <span>{t('KeyboardShortcuts.General.StopSketch')}</span>
         </li>
         <li className="keyboard-shortcut-item">
           <span className="keyboard-shortcut__command">
-            {metaKeyName} + {'\u21E7'} + 1
+            {metaKeyName} + Shift + 1
           </span>
           <span>{t('KeyboardShortcuts.General.TurnOnAccessibleOutput')}</span>
         </li>
         <li className="keyboard-shortcut-item">
           <span className="keyboard-shortcut__command">
-            {metaKeyName} + {'\u21E7'} + 2
+            {metaKeyName} + Shift + 2
           </span>
           <span>{t('KeyboardShortcuts.General.TurnOffAccessibleOutput')}</span>
         </li>
         <li className="keyboard-shortcut-item">
-          <span className="keyboard-shortcut__command">{'\u21E7'} + Right</span>
+          <span className="keyboard-shortcut__command">Shift + Right</span>
           <span>Go to Reference for Selected Item in Hinter</span>
         </li>
       </ul>
diff --git a/client/utils/metaKey.js b/client/utils/metaKey.js
index 6d9aab8a6c..cca6d3986b 100644
--- a/client/utils/metaKey.js
+++ b/client/utils/metaKey.js
@@ -6,6 +6,6 @@ const metaKey = (() => {
   return 'Ctrl';
 })();
 
-const metaKeyName = metaKey === 'Cmd' ? '⌘' : '⌃';
+const metaKeyName = metaKey === 'Cmd' ? '⌘' : 'Ctrl';
 
 export { metaKey, metaKeyName };

From 9824932804bd7ab1d03ef17c9eeb746a423a217c Mon Sep 17 00:00:00 2001
From: Sheikh-JamirAlam <alamjamir15@gmail.com>
Date: Sat, 23 Sep 2023 11:49:45 +0530
Subject: [PATCH 2/2] Test snapshot updated

---
 .../Header/__snapshots__/Nav.unit.test.jsx.snap        | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/client/modules/IDE/components/Header/__snapshots__/Nav.unit.test.jsx.snap b/client/modules/IDE/components/Header/__snapshots__/Nav.unit.test.jsx.snap
index 3b55bfae67..9e2f031c67 100644
--- a/client/modules/IDE/components/Header/__snapshots__/Nav.unit.test.jsx.snap
+++ b/client/modules/IDE/components/Header/__snapshots__/Nav.unit.test.jsx.snap
@@ -530,7 +530,7 @@ exports[`Nav renders editor version for desktop 1`] = `
                 <span
                   class="nav__keyboard-shortcut"
                 >
-                  ⌃+⇧+F
+                  Ctrl+Shift+F
                 </span>
               </button>
             </li>
@@ -542,7 +542,7 @@ exports[`Nav renders editor version for desktop 1`] = `
                 <span
                   class="nav__keyboard-shortcut"
                 >
-                  ⌃+F
+                  Ctrl+F
                 </span>
               </button>
             </li>
@@ -554,7 +554,7 @@ exports[`Nav renders editor version for desktop 1`] = `
                 <span
                   class="nav__keyboard-shortcut"
                 >
-                  ⌃+H
+                  Ctrl+H
                 </span>
               </button>
             </li>
@@ -600,7 +600,7 @@ exports[`Nav renders editor version for desktop 1`] = `
                 <span
                   class="nav__keyboard-shortcut"
                 >
-                  ⌃+Enter
+                  Ctrl+Enter
                 </span>
               </button>
             </li>
@@ -612,7 +612,7 @@ exports[`Nav renders editor version for desktop 1`] = `
                 <span
                   class="nav__keyboard-shortcut"
                 >
-                  ⇧+⌃+Enter
+                  Shift+Ctrl+Enter
                 </span>
               </button>
             </li>