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.

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

Fix a bug where non-address types would be rendered as addresses in EIP-712 #17846

Merged
merged 6 commits into from
Feb 27, 2023
Merged

Fix a bug where non-address types would be rendered as addresses in EIP-712 #17846

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
be66700
Fix EIP-712 rendering logic
FrederikBolding Feb 21, 2023
e99dde7
Fix tests
FrederikBolding Feb 21, 2023
fff5c31
Fix tests and story
FrederikBolding Feb 21, 2023
f4bd79e
Fix lint
FrederikBolding Feb 21, 2023
8f39d43
Fix import
FrederikBolding Feb 21, 2023
4688a99
Fix stories
FrederikBolding Feb 22, 2023
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
5 changes: 3 additions & 2 deletions ui/components/app/signature-request/signature-request-data/signature-request-data.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ function SignatureRequestData({ data }) {

return (
<Box className="signature-request-data__node">
{Object.entries(data).map(([label, value], i) => (
{Object.entries(data).map(([label, { value, type }], i) => (
<Box
className="signature-request-data__node"
key={`${label}-${i}`}
Expand Down Expand Up @@ -54,7 +54,8 @@ function SignatureRequestData({ data }) {
marginLeft={4}
className="signature-request-data__node__value"
>
{isValidHexAddress(value, {
{type === 'address' &&
isValidHexAddress(value, {
mixedCaseUseChecksum: true,
}) ? (
<Typography
Expand Down
85 changes: 53 additions & 32 deletions ui/components/app/signature-request/signature-request-data/signature-request-data.stories.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React from 'react';
import { sanitizeMessage } from '../../../../helpers/utils/util';
import SignatureRequestData from './signature-request-data';

export default {
Expand All @@ -16,38 +17,58 @@ export const DefaultStory = (args) => {

DefaultStory.storyName = 'Default';

DefaultStory.args = {
data: JSON.parse(
JSON.stringify({
domain: {
name: 'happydapp.website',
},
message: {
string: 'haay wuurl',
number: 42,
},
primaryType: 'Mail',
types: {
EIP712Domain: [
{ name: 'name', type: 'string' },
{ name: 'version', type: 'string' },
{ name: 'chainId', type: 'uint256' },
{ name: 'verifyingContract', type: 'address' },
],
Group: [
{ name: 'name', type: 'string' },
{ name: 'members', type: 'Person[]' },
],
Mail: [
{ name: 'from', type: 'Person' },
{ name: 'to', type: 'Person[]' },
{ name: 'contents', type: 'string' },
],
Person: [
{ name: 'name', type: 'string' },
{ name: 'wallets', type: 'address[]' },
const rawMessage = {
domain: {
chainId: 97,
name: 'Ether Mail',
verifyingContract: '0xCcCCccccCCCCcCCCCCCcCcCccCcCCCcCcccccccC',
version: '1',
},
message: {
contents: 'Hello, Bob!',
from: {
name: 'Cow',
wallets: [
'0xCD2a3d9F938E13CD947Ec05AbC7FE734Df8DD826',
'0xDeaDbeefdEAdbeefdEadbEEFdeadbeEFdEaDbeeF',
'0x06195827297c7A80a443b6894d3BDB8824b43896',
],
},
to: [
{
name: 'Bob',
wallets: [
'0xbBbBBBBbbBBBbbbBbbBbbbbBBbBbbbbBbBbbBBbB',
'0xB0BdaBea57B0BDABeA57b0bdABEA57b0BDabEa57',
'0xB0B0b0b0b0b0B000000000000000000000000000',
],
},
}),
),
],
},
primaryType: 'Mail',
types: {
EIP712Domain: [
{ name: 'name', type: 'string' },
{ name: 'version', type: 'string' },
{ name: 'chainId', type: 'uint256' },
{ name: 'verifyingContract', type: 'address' },
],
Mail: [
{ name: 'from', type: 'Person' },
{ name: 'to', type: 'Person[]' },
{ name: 'contents', type: 'string' },
],
Person: [
{ name: 'name', type: 'string' },
{ name: 'wallets', type: 'address[]' },
],
},
};

DefaultStory.args = {
data: sanitizeMessage(
rawMessage.message,
rawMessage.primaryType,
rawMessage.types,
).value,
};
Loading