Skip to content

fix(masking): default MetaMask masking ON; readable contrast on Settings text #63

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
BitHighlander merged 1 commit into from
May 1, 2026
Merged

fix(masking): default MetaMask masking ON; readable contrast on Settings text #63

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion packages/storage/lib/customStorage.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
type Event = {
id: string;
type: string;
request: any;

Check failure on line 7 in packages/storage/lib/customStorage.ts

View workflow job for this annotation

GitHub Actions / eslint 

Unexpected any. Specify a different type
status: 'request' | 'approval' | 'completed';
timestamp: string;
unsignedTx: any;

Check failure on line 10 in packages/storage/lib/customStorage.ts

View workflow job for this annotation

GitHub Actions / eslint 

Unexpected any. Specify a different type
[key: string]: any; // Allow additional properties

Check failure on line 11 in packages/storage/lib/customStorage.ts

View workflow job for this annotation

GitHub Actions / eslint 

Unexpected any. Specify a different type
};

type ApiKeyStorage = BaseStorage<string> & {
Expand All @@ -32,7 +32,7 @@
};

type AssetContext = {
[key: string]: any;

Check failure on line 35 in packages/storage/lib/customStorage.ts

View workflow job for this annotation

GitHub Actions / eslint 

Unexpected any. Specify a different type
};

type AssetContextStorage = BaseStorage<AssetContext> & {
Expand Down Expand Up @@ -363,7 +363,12 @@
const storage = createStorage<MaskingSettings>(
'masking-settings',
{
enableMetaMaskMasking: false,
// Default ON — modern dApps (CowSwap, swap aggregators, several
// older sites) expect a window.ethereum with isMetaMask:true and
// bail out of their connect flow without it. Modern dApps that
// discover wallets via EIP-6963 still see KeepKey as itself.
// Existing installs keep whatever they previously set.
enableMetaMaskMasking: true,
enableXfiMasking: false,
enableKeplrMasking: false,
},
Expand Down
4 changes: 2 additions & 2 deletions pages/side-panel/src/components/Settings.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ const Settings = () => {
</HStack>
<Switch size="md" isChecked={maskingSettings.enableMetaMaskMasking} onChange={toggleMetaMaskMasking} />
</HStack>
<Text fontSize="xs" color="gray.500" mt={-2} mb={2}>
<Text fontSize="xs" color="whiteAlpha.700" mt={-2} mb={2}>
When on, KeepKey claims to be MetaMask on legacy dApps (Stripe, older sites) by mounting
<code> window.ethereum </code>
with <code>isMetaMask: true</code>. Modern dApps still see KeepKey via EIP-6963. Refresh any open dApp after
Expand Down Expand Up @@ -269,7 +269,7 @@ const Settings = () => {
)}
</Box>

<Text fontSize="sm" color="gray.500">
<Text fontSize="sm" color="whiteAlpha.700">
This setting may conflict with these apps if also enabled.
</Text>

Expand Down
Loading