Skip to content

fix: show restore defaults only on General settings#1710

Draft
UtkarshUsername wants to merge 5 commits intopingdotgg:mainfrom
UtkarshUsername:fix/settings-restore-defaults-button
Draft

fix: show restore defaults only on General settings#1710
UtkarshUsername wants to merge 5 commits intopingdotgg:mainfrom
UtkarshUsername:fix/settings-restore-defaults-button

Conversation

@UtkarshUsername
Copy link
Copy Markdown
Contributor

@UtkarshUsername UtkarshUsername commented Apr 3, 2026

Fixes #1709

What Changed

Moved the Restore defaults visibility check into the shared settings header so the button keeps its existing placement but only renders on /settings/general.

Also kept the web settings header height stable between General and Archive so the header does not visually jump when the button is absent.

Why

Restore defaults resets general settings values. Showing it on the Archive page is misleading because that page is not a settings form and the action does not belong to that section. Also, the button doesn't work on the Archive page.

Keeping the button in the shared header preserves the original UI placement, while route-gating it makes the behavior correct. Fixing the header height avoids a visual regression between settings routes.

UI Changes

Before:
image

After:
image

Checklist

  • This PR is small and focused
  • I explained what changed and why
  • I included before/after screenshots for any UI changes
  • I included a video for animation/interaction changes

Note

Low Risk
Low risk UI change that only gates rendering of an existing button by route and adjusts header sizing; no data/model changes.

Overview
Limits the Restore defaults button to render only on /settings/general by checking useLocation().pathname, avoiding showing a misleading action on other settings sub-routes.

Adjusts the non-Electron settings header layout (min-h-*) so the header height remains stable when the button is hidden, while keeping Electron and web headers consistent.

Reviewed by Cursor Bugbot for commit e10cab0. Bugbot is set up for automated code reviews on this repo. Configure here.

Note

Show 'Restore defaults' button only on the General settings page

The button was previously visible across all settings routes. Now checks location.pathname in SettingsContentLayout and only renders the button when the path is /settings/general, in both Electron and non-Electron headers.

Macroscope summarized e10cab0.

@coderabbitai
Copy link
Copy Markdown

coderabbitai bot commented Apr 3, 2026

Important

Review skipped

Auto reviews are disabled on this repository. Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Repository UI

Review profile: CHILL

Plan: Pro

Run ID: 681052f4-d7f8-449b-95a1-85cc103a4f57

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • 🔍 Trigger review
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

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

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

@github-actions github-actions bot added size:S 10-29 changed lines (additions + deletions). vouch:unvouched PR author is not yet trusted in the VOUCHED list. labels Apr 3, 2026
macroscopeapp[bot]
macroscopeapp bot previously approved these changes Apr 3, 2026
@macroscopeapp
Copy link
Copy Markdown
Contributor

macroscopeapp bot commented Apr 3, 2026

Approvability

Verdict: Approved

This is a simple, self-contained UI change that conditionally hides the "Restore defaults" button on non-General settings pages. The logic is straightforward pathname checking with no runtime behavior changes beyond visibility of an existing UI element.

You can customize Macroscope's approvability policy. Learn more.

@UtkarshUsername UtkarshUsername marked this pull request as draft April 11, 2026 06:21
@UtkarshUsername UtkarshUsername marked this pull request as ready for review April 12, 2026 08:10
- Add a section header action for restoring defaults
- Scope the restore button to General settings instead of the shared layout
- Remove the layout-level refresh key workaround
- Show the restore defaults action from the shared settings shell
- Keep the general settings panel focused on section content
- Remount the outlet after restore so settings refresh cleanly
- Reserve header height so the restore defaults button no longer shifts layout
- Keep the settings title row aligned on small screens
@UtkarshUsername UtkarshUsername force-pushed the fix/settings-restore-defaults-button branch from 0701dc2 to f875f19 Compare April 13, 2026 17:14
@macroscopeapp macroscopeapp bot dismissed their stale review April 13, 2026 17:15

Dismissing prior approval to re-evaluate f875f19

Copy link
Copy Markdown
Contributor

@cursor cursor bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cursor Bugbot has reviewed your changes and found 1 potential issue.

Fix All in Cursor

❌ Bugbot Autofix is OFF. To automatically fix reported issues with cloud agents, enable autofix in the Cursor dashboard.

Reviewed by Cursor Bugbot for commit e10cab0. Configure here.

const { changedSettingLabels, restoreDefaults } = useSettingsRestore(() =>
setRestoreSignal((value) => value + 1),
);
const showRestoreDefaults = location.pathname === "/settings/general";
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hook runs unnecessary computation on non-general settings pages

Low Severity

useSettingsRestore is called unconditionally on every settings route (general, archived, connections), but its return values (changedSettingLabels, restoreDefaults) are only consumed when showRestoreDefaults is true (i.e., on /settings/general). The hook internally subscribes to useTheme(), useSettings(), and useUpdateSettings(), computes dirty state across multiple settings, and builds memoized arrays and callbacks—all wasted work on the archived and connections pages. Moving the hook call behind the showRestoreDefaults condition (or into a child component rendered only on general) would avoid this unnecessary computation and context subscriptions.

Fix in Cursor Fix in Web

Reviewed by Cursor Bugbot for commit e10cab0. Configure here.

@UtkarshUsername UtkarshUsername marked this pull request as draft April 13, 2026 20:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size:S 10-29 changed lines (additions + deletions). vouch:unvouched PR author is not yet trusted in the VOUCHED list.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[Bug]: Settings archive page shows "Restore defaults" even though the action only applies to general settings

1 participant