Skip to content
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.

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

579-feature-implement-erc-55-support-in-extension #582

Merged
merged 3 commits into from
Feb 24, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"eslint.useFlatConfig": true,
"githubPullRequests.overrideDefaultBranch": "dev",
"githubIssues.issueBranchTitle": "${issueNumber}-${sanitizedIssueTitle}",
"cSpell.words": ["Cbor", "secp"],
"cSpell.words": ["Cbor", "keccak", "secp"],
"[dotenv]": {
"editor.defaultFormatter": "foxundermoon.shell-format"
},
Expand Down
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
"format": "prettier .",
"icon": "npx iconfont-h5",
"test": "vitest",
"test:run": "vitest --run",
"test:e2e": "playwright test",
"test:e2e:ui": "playwright test --ui",
"test:e2e:ui:debug": "playwright test --ui --debug",
Expand Down
7 changes: 5 additions & 2 deletions src/background/controller/wallet.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2088,8 +2088,11 @@ export class WalletController extends BaseController {
});

if (result) {
await this.setEvmAddress(result);
return result;
// This is the COA address we get straight from the script
// This is where we encode the address in ERC-55 format
const checksummedAddress = ethUtil.toChecksumAddress(ensureEvmAddressPrefix(result));
await this.setEvmAddress(checksummedAddress);
return checksummedAddress;
} else {
return '';
}
Expand Down
2 changes: 1 addition & 1 deletion src/ui/views/Dashboard/Header.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -569,7 +569,7 @@ const Header = ({ loading = false }) => {
<Typography
variant="caption"
color="text.secondary"
sx={{ textTransform: 'lowercase' }}
sx={{ textTransform: 'none' }}
>
{formatAddress(props.address)}
</Typography>
Expand Down
Loading