Skip to content

Commit 75a91b0

Browse files
authored
Confirmation redesign: add message section to personal sign page (#22766)
1 parent bf6a7a9 commit 75a91b0

File tree

27 files changed

+378
-127
lines changed

27 files changed

+378
-127
lines changed

app/_locales/en/messages.json

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ui/components/app/confirm/info/__snapshots__/info.test.tsx.snap

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,7 @@ exports[`ConfirmInfo should match snapshot 1`] = `
9999
</p>
100100
</div>
101101
<div
102-
class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--align-items-center"
103-
style="column-gap: 8px;"
102+
class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--align-items-center"
104103
>
105104
<p
106105
class="mm-box mm-text mm-text--body-md mm-box--color-text-muted"

ui/components/app/confirm/info/info.stories.tsx

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,13 @@ const mockRowConfigs: ConfirmInfoRowConfig[] = [
1313
{
1414
type: ConfirmInfoRowType.Divider,
1515
},
16+
{
17+
label: 'Origin',
18+
type: ConfirmInfoRowType.UrlType,
19+
rowProps: {
20+
address: 'https://metamask.github.io',
21+
},
22+
},
1623
{
1724
label: 'Account',
1825
type: ConfirmInfoRowType.ValueDouble,

ui/components/app/confirm/info/info.tsx

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ import {
1515
ConfirmInfoRowAddressProps,
1616
ConfirmInfoRowDivider,
1717
ConfirmInfoRowProps,
18+
ConfirmInfoRowText,
19+
ConfirmInfoRowTextProps,
1820
ConfirmInfoRowUrl,
1921
ConfirmInfoRowUrlProps,
2022
ConfirmInfoRowValueDouble,
@@ -25,12 +27,14 @@ import {
2527
export enum ConfirmInfoRowType {
2628
Address = 'address',
2729
Divider = 'divider',
28-
ValueDouble = 'value-double',
30+
Text = 'text',
2931
UrlType = 'url',
32+
ValueDouble = 'value-double',
3033
}
3134

3235
type ConfirmInfoTypeProps =
3336
| ConfirmInfoRowAddressProps
37+
| ConfirmInfoRowTextProps
3438
| ConfirmInfoRowUrlProps
3539
| ConfirmInfoRowValueDoubleProps;
3640

@@ -41,6 +45,9 @@ const TYPE_TO_COMPONENT: Record<ConfirmInfoRowType, any> = {
4145
[ConfirmInfoRowType.Divider]: () => {
4246
return <ConfirmInfoRowDivider />;
4347
},
48+
[ConfirmInfoRowType.Text]: ({ text }: ConfirmInfoRowTextProps) => {
49+
return <ConfirmInfoRowText text={text} />;
50+
},
4451
[ConfirmInfoRowType.UrlType]: ({ url }: ConfirmInfoRowUrlProps) => {
4552
return <ConfirmInfoRowUrl url={url} />;
4653
},

ui/components/app/confirm/info/row/__snapshots__/url.test.tsx.snap

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33
exports[`ConfirmInfoRowUrl renders a URL, protocol, and warning icon when the protocol is "http" 1`] = `
44
<div>
55
<div
6-
class="mm-box mm-box--display-flex mm-box--flex-wrap-wrap mm-box--align-items-center"
7-
style="column-gap: 8px;"
6+
class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center"
87
>
98
<p
109
class="mm-box mm-text mm-text--body-sm mm-box--padding-right-1 mm-box--padding-left-1 mm-box--display-flex mm-box--align-items-center mm-box--color-warning-default mm-box--background-color-warning-muted mm-box--rounded-sm"
@@ -27,8 +26,7 @@ exports[`ConfirmInfoRowUrl renders a URL, protocol, and warning icon when the pr
2726
exports[`ConfirmInfoRowUrl should match snapshot 1`] = `
2827
<div>
2928
<div
30-
class="mm-box mm-box--display-flex mm-box--flex-wrap-wrap mm-box--align-items-center"
31-
style="column-gap: 8px;"
29+
class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center"
3230
>
3331
<p
3432
class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
export * from './address';
22
export * from './divider';
33
export * from './row';
4+
export * from './text';
45
export * from './url';
56
export * from './value-double';
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
import React from 'react';
2+
import { ConfirmInfoRow } from './row';
3+
import { ConfirmInfoRowText } from './text';
4+
5+
const ConfirmInfoRowTextStory = {
6+
title: 'Components/App/Confirm/InfoRowText',
7+
component: ConfirmInfoRowText,
8+
9+
decorators: [
10+
(story) => <ConfirmInfoRow label="Message">{story()}</ConfirmInfoRow>,
11+
],
12+
13+
argTypes: {
14+
url: {
15+
control: 'text',
16+
},
17+
},
18+
};
19+
20+
export const DefaultStory = ({ text }) => <ConfirmInfoRowText text={text} />;
21+
DefaultStory.args = {
22+
text: 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.',
23+
};
24+
25+
export default ConfirmInfoRowTextStory;
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
import React from 'react';
2+
import { Box, Text } from '../../../../component-library';
3+
import {
4+
AlignItems,
5+
Display,
6+
FlexWrap,
7+
TextColor,
8+
} from '../../../../../helpers/constants/design-system';
9+
10+
export type ConfirmInfoRowTextProps = {
11+
text: string;
12+
};
13+
14+
export const ConfirmInfoRowText = ({ text }: ConfirmInfoRowTextProps) => {
15+
return (
16+
<Box
17+
display={Display.Flex}
18+
alignItems={AlignItems.center}
19+
flexWrap={FlexWrap.Wrap}
20+
gap={2}
21+
>
22+
<Text color={TextColor.inherit}>{text}</Text>
23+
</Box>
24+
);
25+
};

ui/components/app/confirm/info/row/url.tsx

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,7 @@ export const ConfirmInfoRowUrl = ({ url }: ConfirmInfoRowUrlProps) => {
3737
display={Display.Flex}
3838
alignItems={AlignItems.center}
3939
flexWrap={FlexWrap.Wrap}
40-
style={{
41-
// TODO: Box should support this
42-
columnGap: '8px',
43-
}}
40+
gap={2}
4441
>
4542
{isHTTP && (
4643
<Text

0 commit comments

Comments
 (0)