fix: Improved useTheme Hook and Unlock Page Logo Theme Handling
#38002
+103
−60
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
smgv
added
area-onboarding
needs-qa
Contributor
|
CLA Signature Action: All authors have signed the CLA. You may need to manually re-run the blocking PR check if it doesn't pass in a few minutes. |
![cursor[bot]](https://avatars.githubusercontent.com/in/1210556?s=60&v=4){kind=small}
Collaborator
✨ Files requiring CODEOWNER review ✨🔑 @MetaMask/accounts-engineers (2 files, +7 -7)
👨🔧 @MetaMask/core-extension-ux (1 files, +2 -2)
|
Collaborator
Builds ready [bea787b]
UI Startup Metrics (1242 ± 88 ms)
📊 Page Load Benchmark ResultsCurrent Commit: 📄 Localhost MetaMask Test DappSamples: 100 Summary
📈 Detailed Results
Bundle size diffs [🚨 Warning! Bundle size has increased!]
|
smgv
changed the title
useTheme Hook and Unlock Page Logo Theme Handling
Collaborator
Builds ready [6e878b9]
UI Startup Metrics (1236 ± 105 ms)
📊 Page Load Benchmark ResultsCurrent Commit: 📄 Localhost MetaMask Test DappSamples: 100 Summary
📈 Detailed Results
Bundle size diffs [🚨 Warning! Bundle size has increased!]
|
LeVinhGithub
added
QA Passed
and removed
needs-qa
chaitanyapotti
approved these changes
Nov 20, 2025
ccharly
approved these changes
Nov 21, 2025
Contributor
ccharly
left a comment
ccharly
left a comment
There was a problem hiding this comment.
LGTM for accounts owned files
github-project-automation
bot
moved this from Needs dev review
to Review finalised - Ready to be merged
in PR review queue
github-merge-queue
bot
removed this pull request from the merge queue due to failed status checks
github-merge-queue
bot
removed this pull request from the merge queue due to failed status checks
Collaborator
Builds ready [839eae4]
UI Startup Metrics (1223 ± 87 ms)
📊 Page Load Benchmark ResultsCurrent Commit: 📄 Localhost MetaMask Test DappSamples: 100 Summary
📈 Detailed Results
Bundle size diffs [🚨 Warning! Bundle size has increased!]
|
metamaskbot
added
the
release-13.12.0
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
This PR improves the
useThemehook implementation to provide more robust theme resolution and updates the unlock page logo to properly respond to theme changes.1. Enhanced
useThemeHook (ui/hooks/useTheme.ts)resolveTheme()function for better code organization and testabilitylightordark)2. Unlock Page Logo Component (
ui/pages/unlock-page/)MetaMaskWordmarkLogocomponent that responds to theme changesuseThemehook for dynamic theme-aware rendering3. Test Snapshots Updates
Updated Jest snapshots to reflect the new consistent theme behavior:
ui/components/multichain-accounts/smart-contract-account-toggle/__snapshots__/smart-contract-account-toggle.test.tsx.snapui/components/multichain/network-list-menu/__snapshots__/network-list-menu.test.tsx.snapui/pages/settings/advanced-tab/__snapshots__/advanced-tab.component.test.js.snapui/pages/settings/security-tab/__snapshots__/security-tab.test.js.snapWhy snapshots changed:
The improved
useThemehook now properly resolves tolighttheme by default in tests (instead ofundefined), causingToggleButtoncomponents to consistently render with light theme colors (rgb(183, 187, 200)=#b7bbc8=lightTheme.colors.icon.muted).Changelog
CHANGELOG entry: Updated useTheme hook and logo for unlock page
Related issues
Fixes:
Manual testing steps
Screenshots/Recordings
Before
After
Screen.Recording.2025-11-20.at.2.53.01.PM.mov
Pre-merge author checklist
Pre-merge reviewer checklist
Note
Refactors
useThemefor reliable light/dark resolution and updates the unlock page wordmark logo to respond to theme, with minor CSS tweaks and snapshot updates.useTheme: ExtractsresolveTheme(settingTheme)with clear priority (explicit setting > OS when selected > document on initial load > system), validates againstvalidThemes, warns and defaults tolightif invalid; initializes state via resolver and applies on setting changes.MetamaskWordmarkLogo: UsesuseThemeand rendersMetaFoxHorizontalLogowith theme awareness; replaces direct logo usage inunlock-page.component.js.unlock-page__mascot-container__horizontal-logo--popupmargins with responsive override.rgb(183, 187, 200), onrgb(68, 89, 255)).Written by Cursor Bugbot for commit 839eae4. This will update automatically on new commits. Configure here.