fix: #3244 sidebar tooltip shows null for servers beyond 9th position

[jeanfbrito]

Description

Fixes #3244 — two bugs in sidebar tooltip shortcut formatting.

Bug 1: Off-by-one (index.tsx)

order <= 9  →  order < 9

Server #10 was getting shortcutNumber "10" even though Ctrl+10 doesn't exist. Now only servers 1-9 get shortcuts.

Bug 2: Null tooltip (ServerButton.tsx)

${title} (${mod}+${shortcutNumber})  →  ${title}${shortcutNumber !== null ? ... : ''}

When shortcutNumber is null (servers 10+), the template rendered "(^+null)" in the tooltip. Now the shortcut portion is conditional.

Changes

• src/ui/components/SideBar/index.tsx: 1 line changed
• src/ui/components/SideBar/ServerButton.tsx: 1 line changed

Risk

LOW — pure presentation change, no state or logic modifications.

Summary by CodeRabbit

• Bug Fixes
  • Improved sidebar shortcut display to only show keyboard shortcut information in tooltips when a shortcut is available.
  • Refined server button shortcut assignment to apply only to the first eight items in the sidebar.

[coderabbitai]

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info

⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro

Run ID: 4935c597-55ad-4f77-873c-e8a7943449a6

📥 Commits

Reviewing files that changed from the base of the PR and between c2b584b and a5ec12a.

📒 Files selected for processing (2)

• src/ui/components/SideBar/ServerButton.tsx
• src/ui/components/SideBar/index.tsx

📜 Recent review details

⏰ Context from checks skipped due to timeout of 90000ms. You can increase the timeout in your CodeRabbit configuration to a maximum of 15 minutes (900000ms). (3)

• GitHub Check: check (windows-latest)
• GitHub Check: check (macos-latest)
• GitHub Check: check (ubuntu-latest)

🧰 Additional context used

📓 Path-based instructions (1)

**/*.{ts,tsx}

📄 CodeRabbit inference engine (CLAUDE.md)

**/*.{ts,tsx}: Use TypeScript for all new code in this codebase unless explicitly told otherwise
Use Fuselage components from @rocket.chat/fuselage for all UI work — only create custom components when Fuselage doesn't provide the needed functionality
Check Theme.d.ts for valid color tokens when working with Fuselage components
Use optional chaining with fallbacks for platform-specific APIs instead of mocks (e.g., process.getuid?.() ?? 1000) to ensure code works across all platforms without requiring mocks
TypeScript code must use strict mode
Use React functional components with hooks instead of class components
Redux actions must follow the FSA (Flux Standard Action) pattern
Use camelCase for file naming
Use PascalCase for component file names (React components)
Write self-documenting code through clear naming — avoid unnecessary comments

Files:

• src/ui/components/SideBar/index.tsx
• src/ui/components/SideBar/ServerButton.tsx

🔇 Additional comments (2)

src/ui/components/SideBar/ServerButton.tsx (1)

146-146: Tooltip shortcut rendering fix is correct.

Conditionally appending the shortcut suffix only when shortcutNumber is non-null resolves the (^+null) tooltip issue without changing other tooltip content paths.

src/ui/components/SideBar/index.tsx (1)

106-108: Shortcut boundary update matches expected behavior.

Using order < 9 correctly limits numeric shortcuts to servers 1–9 and prevents assigning a shortcut to the 10th server and beyond.

---

Walkthrough

Two coordinated fixes address sidebar tooltip rendering for servers beyond the 9th position: the shortcut assignment logic is corrected from order <= 9 to order < 9, and the tooltip rendering adds a null check to avoid displaying null in the user interface.

Changes

Sidebar Tooltip Fix

Layer / File(s)	Summary
Shortcut Assignment Logic src/ui/components/SideBar/index.tsx	Condition for shortcut number eligibility changes from order <= 9 to order < 9, limiting keyboard shortcuts to servers 1–9 only.
Tooltip Rendering src/ui/components/SideBar/ServerButton.tsx	Tooltip header now conditionally includes shortcut suffix only when shortcutNumber is not null, preventing (^+null) in the UI.

Estimated code review effort

🎯 1 (Trivial) | ⏱️ ~3 minutes

Suggested labels

type: bug

🚥 Pre-merge checks | ✅ 5

✅ Passed checks (5 passed)

Check name	Status	Explanation
Description Check	✅ Passed	Check skipped - CodeRabbit’s high-level summary is enabled.
Title check	✅ Passed	The title clearly and accurately summarizes the main change: fixing the sidebar tooltip to not display null for servers beyond the 9th position, directly addressing the issue number referenced.
Linked Issues check	✅ Passed	Both bugs identified in issue #3244 are addressed: the off-by-one condition in index.tsx changed from order <= 9 to order < 9, and the null check added in ServerButton.tsx to conditionally render the shortcut portion.
Out of Scope Changes check	✅ Passed	All changes are directly scoped to fixing the two bugs in issue #3244; no unrelated modifications are present in the changeset.
Docstring Coverage	✅ Passed	No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.

_{✏️ Tip: You can configure your own custom pre-merge checks in the settings.}

---

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

• X
• Mastodon
• Reddit
• LinkedIn

_{Comment @coderabbitai help to get the list of available commands and usage tips.}