Introduce help context

tests/config/test_keys.py

@@ -67,19 +67,20 @@ def test_is_command_key_invalid_command(invalid_command: str) -> None:
 
 def test_HELP_is_not_allowed_as_tip() -> None:
     assert keys.KEY_BINDINGS["HELP"]["excluded_from_random_tips"] is True
-    assert keys.KEY_BINDINGS["HELP"] not in keys.commands_for_random_tips()
+    commands, _ = keys.commands_for_random_tips()
+    assert keys.KEY_BINDINGS["HELP"] not in commands
 
 
 @pytest.mark.parametrize(
-    "context, expected_command",
+    "context, expected_command, expected_context",
     [
-        (None, "GAMMA"),
-        ("context_1", "BETA"),
-        ("context_2", "GAMMA"),
+        (None, "GAMMA", "Global"),
+        ("context_1", "BETA", "Context 1"),
+        ("context_2", "GAMMA", "Global"),
     ],
 )
 def test_commands_for_random_tips(
-    context: str, expected_command: str, mocker: MockerFixture
+    context: str, expected_command: str, expected_context: str, mocker: MockerFixture
 ) -> None:
     new_key_bindings: Dict[str, keys.KeyBinding] = {
         "ALPHA": {
@@ -117,9 +118,10 @@ def test_commands_for_random_tips(
     }
     mocker.patch.dict(keys.KEY_BINDINGS, new_key_bindings, clear=True)
     mocker.patch.object(keys, "HELP_CONTEXTS", new_help_contexts)
-    result = keys.commands_for_random_tips(context)
-    assert len(result) == 1
-    assert new_key_bindings[expected_command] in result
+    commands, context_display_name = keys.commands_for_random_tips(context)
+    assert len(commands) == 1
+    assert new_key_bindings[expected_command] in commands
+    assert context_display_name == expected_context
 
 
 def test_updated_urwid_command_map() -> None:

zulipterminal/config/keys.py

@@ -2,7 +2,7 @@
 Keybindings and their helper functions
 """
 
-from typing import Dict, List
+from typing import Dict, List, Tuple
 
 from typing_extensions import NotRequired, TypedDict
 from urwid.command_map import (
@@ -650,9 +650,10 @@ def primary_display_key_for_command(command: str) -> str:
     return display_key_for_urwid_key(primary_key_for_command(command))
 
 
-def commands_for_random_tips(context: str = "") -> List[KeyBinding]:
+def commands_for_random_tips(context: str = "") -> Tuple[List[KeyBinding], str]:
     """
-    Return list of commands which may be displayed as a random tip
+    Return list of commands which may be displayed as a random tip,
+    and their associated user-facing context name
     """
     if not context or context not in HELP_CONTEXTS:
         context = "global"
@@ -664,7 +665,8 @@ def commands_for_random_tips(context: str = "") -> List[KeyBinding]:
     ]
     if len(random_tips) == 0:
         return commands_for_random_tips("global")
-    return random_tips
+    context_display_name = HELP_CONTEXTS.get(context, "Global")
+    return random_tips, context_display_name
 
 
 # Refer urwid/command_map.py

zulipterminal/ui.py

@@ -104,7 +104,7 @@ def right_column_view(self) -> Any:
 
     def get_random_help(self) -> List[Any]:
         # Get random allowed hotkey (ie. eligible for being displayed as a tip)
-        allowed_commands = commands_for_random_tips(self.context)
+        allowed_commands, tip_context = commands_for_random_tips(self.context)
         if not allowed_commands:
             return ["Help[?] "]
         random_command = random.choice(allowed_commands)
@@ -114,7 +114,11 @@ def get_random_help(self) -> List[Any]:
         return [
             "Help[?] ",
             ("footer_contrast", f" {random_command_display_keys} "),
-            f" {random_command['help_text']}",
+            f" ({tip_context}) ",
+            (
+                "footer_contrast",
+                f" {random_command['help_text']} ",
+            ),
         ]
 
     @asynch