Skip to content
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
7 changes: 7 additions & 0 deletions app/_locales/en/messages.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ exports[`All Connections render renders correctly 1`] = `
</p>
<button
class="mm-box mm-box--padding-4 mm-box--display-flex mm-box--gap-4 mm-box--flex-direction-row mm-box--align-items-baseline mm-box--width-full mm-box--background-color-background-default"
data-testid="connection-list-item"
>
<div
class="mm-box mm-box--display-flex mm-box--align-items-center"
Expand All @@ -64,6 +65,7 @@ exports[`All Connections render renders correctly 1`] = `
>
<div
class="mm-box mm-text mm-avatar-base mm-avatar-base--size-md mm-avatar-favicon mm-text--body-sm mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-transparent box--border-style-solid box--border-width-1"
data-testid="connection-list-item__avatar-favicon"
>
<img
alt="avatar-favicon logo"
Expand Down Expand Up @@ -91,64 +93,72 @@ exports[`All Connections render renders correctly 1`] = `
metamask.github.io
</p>
<div
class="mm-box mm-box--display-flex mm-box--gap-1 mm-box--flex-direction-row"
class="mm-box mm-box--display-flex mm-box--gap-1 mm-box--flex-direction-row mm-box--align-items-center"
>
<span
class="mm-box mm-text mm-text--body-md mm-box--width-max mm-box--color-text-alternative"
>
Connected with
</span>
<div
class="mm-box multichain-avatar-group mm-box--display-flex mm-box--gap-1 mm-box--align-items-center"
data-testid="avatar-group"
aria-describedby="tippy-tooltip-1"
class=""
data-original-title="This can be changed in "Settings > Alerts""
data-tooltipped=""
style="display: inline;"
>
<div
class="mm-box mm-box--display-flex"
class="mm-box multichain-avatar-group mm-box--display-flex mm-box--gap-1 mm-box--align-items-center"
data-testid="avatar-group"
>
<div
class="mm-box mm-box--rounded-full"
style="margin-left: 0px;"
class="mm-box mm-box--display-flex"
>
<div
class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-background-default box--border-style-solid box--border-width-1"
class="mm-box mm-box--rounded-full"
style="margin-left: 0px;"
>
<div
class="mm-avatar-account__jazzicon"
class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-account mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-background-default box--border-style-solid box--border-width-1"
>
<div
style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(250, 58, 0);"
class="mm-avatar-account__jazzicon"
>
<svg
height="16"
width="16"
x="0"
y="0"
<div
style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 16px; height: 16px; display: inline-block; background: rgb(250, 58, 0);"
>
<rect
fill="#18CDF2"
<svg
height="16"
transform="translate(-0.52419675189697 -1.6521420347302493) rotate(328.9 8 8)"
width="16"
x="0"
y="0"
/>
<rect
fill="#035E56"
height="16"
transform="translate(-9.149230854416022 5.2962309358743) rotate(176.2 8 8)"
width="16"
x="0"
y="0"
/>
<rect
fill="#F26602"
height="16"
transform="translate(8.333921009111961 -7.102569861498541) rotate(468.9 8 8)"
width="16"
x="0"
y="0"
/>
</svg>
>
<rect
fill="#18CDF2"
height="16"
transform="translate(-0.52419675189697 -1.6521420347302493) rotate(328.9 8 8)"
width="16"
x="0"
y="0"
/>
<rect
fill="#035E56"
height="16"
transform="translate(-9.149230854416022 5.2962309358743) rotate(176.2 8 8)"
width="16"
x="0"
y="0"
/>
<rect
fill="#F26602"
height="16"
transform="translate(8.333921009111961 -7.102569861498541) rotate(468.9 8 8)"
width="16"
x="0"
y="0"
/>
</svg>
</div>
</div>
</div>
</div>
Expand All @@ -175,13 +185,14 @@ exports[`All Connections render renders correctly 1`] = `
</p>
<button
class="mm-box mm-box--padding-4 mm-box--display-flex mm-box--gap-4 mm-box--flex-direction-row mm-box--align-items-baseline mm-box--width-full mm-box--background-color-background-default"
data-testid="connection-list-item"
>
<div
class="mm-box mm-box--display-flex mm-box--align-items-center"
style="align-self: center;"
>
<div
class="mm-box mm-badge-wrapper snap-avatar mm-box--display-inline-block"
class="mm-box mm-badge-wrapper snap-avatar connection-list-item__snap-avatar mm-box--display-inline-block"
>
<div
class="mm-box mm-text mm-avatar-base mm-avatar-base--size-md mm-text--body-sm mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-alternative mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-border-default box--border-style-solid box--border-width-1"
Expand Down Expand Up @@ -225,13 +236,14 @@ exports[`All Connections render renders correctly 1`] = `
</button>
<button
class="mm-box mm-box--padding-4 mm-box--display-flex mm-box--gap-4 mm-box--flex-direction-row mm-box--align-items-baseline mm-box--width-full mm-box--background-color-background-default"
data-testid="connection-list-item"
>
<div
class="mm-box mm-box--display-flex mm-box--align-items-center"
style="align-self: center;"
>
<div
class="mm-box mm-badge-wrapper snap-avatar mm-box--display-inline-block"
class="mm-box mm-badge-wrapper snap-avatar connection-list-item__snap-avatar mm-box--display-inline-block"
>
<div
class="mm-box mm-text mm-avatar-base mm-avatar-base--size-md mm-text--body-sm mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-alternative mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-border-default box--border-style-solid box--border-width-1"
Expand Down Expand Up @@ -275,13 +287,14 @@ exports[`All Connections render renders correctly 1`] = `
</button>
<button
class="mm-box mm-box--padding-4 mm-box--display-flex mm-box--gap-4 mm-box--flex-direction-row mm-box--align-items-baseline mm-box--width-full mm-box--background-color-background-default"
data-testid="connection-list-item"
>
<div
class="mm-box mm-box--display-flex mm-box--align-items-center"
style="align-self: center;"
>
<div
class="mm-box mm-badge-wrapper snap-avatar mm-box--display-inline-block"
class="mm-box mm-badge-wrapper snap-avatar connection-list-item__snap-avatar mm-box--display-inline-block"
>
<div
class="mm-box mm-text mm-avatar-base mm-avatar-base--size-md mm-text--body-sm mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-alternative mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-border-default box--border-style-solid box--border-width-1"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,19 +25,15 @@ import {
} from '../../../component-library';
import { getURLHost } from '../../../../helpers/utils/util';
import SnapAvatar from '../../../app/snaps/snap-avatar/snap-avatar';
import { AvatarGroup } from '../../avatar-group';
import { AvatarType } from '../../avatar-group/avatar-group.types';
import { ConnectionListTooltip } from './connection-list-tooltip/connection-list-tooltip';

export const ConnectionListItem = ({ connection, onClick }) => {
const t = useI18nContext();
const isSnap = connection.subjectType === SubjectType.Snap;
const AVATAR_GROUP_LIMIT = 5;
const addressIconList = connection.addresses?.map((address) => ({
avatarValue: address,
}));

return (
<Box
data-testid="connection-list-item"
as="button"
display={Display.Flex}
flexDirection={FlexDirection.Row}
Expand All @@ -55,6 +51,7 @@ export const ConnectionListItem = ({ connection, onClick }) => {
>
{isSnap ? (
<SnapAvatar
className="connection-list-item__snap-avatar"
snapId={connection.id}
badgeSize={IconSize.Xs}
avatarSize={IconSize.Md}
Expand All @@ -71,7 +68,10 @@ export const ConnectionListItem = ({ connection, onClick }) => {
/>
}
>
<AvatarFavicon src={connection.iconUrl} />
<AvatarFavicon
data-testid="connection-list-item__avatar-favicon"
src={connection.iconUrl}
/>
</BadgeWrapper>
)}
</Box>
Expand All @@ -85,7 +85,12 @@ export const ConnectionListItem = ({ connection, onClick }) => {
{isSnap ? connection.packageName : getURLHost(connection.origin)}
</Text>
{isSnap ? null : (
<Box display={Display.Flex} flexDirection={FlexDirection.Row} gap={1}>
<Box
display={Display.Flex}
flexDirection={FlexDirection.Row}
alignItems={AlignItems.center}
gap={1}
>
<Text
as="span"
width={BlockSize.Max}
Expand All @@ -94,12 +99,7 @@ export const ConnectionListItem = ({ connection, onClick }) => {
>
{t('connectedWith')}
</Text>
<AvatarGroup
members={addressIconList}
limit={AVATAR_GROUP_LIMIT}
avatarType={AvatarType.ACCOUNT}
borderColor={BackgroundColor.backgroundDefault}
/>
<ConnectionListTooltip connection={connection} />
</Box>
)}
</Box>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,14 @@ export default {
name: 'MetaMask Portfolio',
origin: 'https://portfolio.metamask.io',
subjectType: 'website',
addresses: ['0xTestAddress1', '0xTestAddress2'],
addresses: [
'0xaaaF07C80ce267F3132cE7e6048B66E6E669365B',
'0xbbbD671F1Fcc94bCF0ebC6Ec4790Da35E8d5e1E1',
],
addressToNameMap: {
'0xaaaF07C80ce267F3132cE7e6048B66E6E669365B': 'TestAddress1',
'0xbbbD671F1Fcc94bCF0ebC6Ec4790Da35E8d5e1E1': 'TestAddress2',
},
},
onClick: () => console.log('clicked'),
},
Expand Down Expand Up @@ -63,6 +70,18 @@ ChaosStory.args = {
'0x777F07C80ce267F3132cE7e6048B66E6E669365B',
'0x666D671F1Fcc94bCF0ebC6Ec4790Da35E8d5e1E1',
],
addressToNameMap: {
'0xaaaF07C80ce267F3132cE7e6048B66E6E669365B': 'TestAddress1',
'0xbbbD671F1Fcc94bCF0ebC6Ec4790Da35E8d5e1E1': 'TestAddress2',
'0xcccF07C80ce267F3132cE7e6048B66E6E669365B': 'TestAddress3',
'0xdddD671F1Fcc94bCF0ebC6Ec4790Da35E8d5e1E1': 'TestAddress4',
'0xeeeF07C80ce267F3132cE7e6048B66E6E669365B': 'TestAddress5',
'0xfffD671F1Fcc94bCF0ebC6Ec4790Da35E8d5e1E1': 'TestAddress6',
'0x999F07C80ce267F3132cE7e6048B66E6E669365B': 'TestAddress7',
'0x888D671F1Fcc94bCF0ebC6Ec4790Da35E8d5e1E1': 'TestAddress8',
'0x777F07C80ce267F3132cE7e6048B66E6E669365B': 'TestAddress9',
'0x666D671F1Fcc94bCF0ebC6Ec4790Da35E8d5e1E1': 'TestAddress10',
},
},
onClick: () => {
console.log(
Expand All @@ -85,7 +104,14 @@ SnapStory.args = {
name: 'Connect'.repeat(100),
packageName: '@metamask/storybooksnap',
subjectType: 'snap',
addresses: ['OxTestAddress1', 'OxTestAddress2'],
addresses: [
'0xaaaF07C80ce267F3132cE7e6048B66E6E669365B',
'0xbbbD671F1Fcc94bCF0ebC6Ec4790Da35E8d5e1E1',
],
addressToNameMap: {
'0xaaaF07C80ce267F3132cE7e6048B66E6E669365B': 'TestAddress1',
'0xbbbD671F1Fcc94bCF0ebC6Ec4790Da35E8d5e1E1': 'TestAddress2',
},
},
onClick: () =>
console.log(
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
import React from 'react';
import { fireEvent } from '@testing-library/react';
import configureStore from '../../../../store/store';
import mockState from '../../../../../test/data/mock-state.json';
import { getURLHost } from '../../../../helpers/utils/util';
import { renderWithProvider } from '../../../../../test/lib/render-helpers';
import { ConnectionListItem } from './connection-list-item';

describe('ConnectionListItem', () => {
const store = configureStore(mockState);

it('renders correctly for Snap connection', () => {
const mockConnection = {
id: 'npm:@metamask/testSnap1',
origin: 'npm:@metamask/testSnap1',
packageName: 'Test Snap 1',
subjectType: 'snap',
iconUrl: null,
};
const { getByText, getByTestId } = renderWithProvider(
<ConnectionListItem connection={mockConnection} onClick={jest.fn()} />,
store,
);

expect(getByTestId('connection-list-item')).toBeInTheDocument();
expect(getByText('Test Snap 1')).toBeInTheDocument();
expect(
document.querySelector('.connection-list-item__snap-avatar'),
).toBeInTheDocument();
});

it('renders correctly for non-Snap connection', () => {
const mockConnection = {
id: 'https://metamask.github.io',
origin: 'https://metamask.github.io',
subjectType: 'website',
iconUrl: 'https://metamask.github.io/test-dapp/metamask-fox.svg',
};

const { getByText, getByTestId } = renderWithProvider(
<ConnectionListItem connection={mockConnection} onClick={jest.fn()} />,
store,
);

expect(getByTestId('connection-list-item')).toBeInTheDocument();
expect(
getByText(getURLHost('https://metamask.github.io')),
).toBeInTheDocument();
expect(
getByTestId('connection-list-item__avatar-favicon'),
).toBeInTheDocument();
});

it('calls onClick when clicked', () => {
const onClickMock = jest.fn();
const mockConnection = {
id: 'npm:@metamask/testSnap1',
origin: 'npm:@metamask/testSnap1',
packageName: 'Test Snap 1',
subjectType: 'snap',
iconUrl: null,
};
const { getByTestId } = renderWithProvider(
<ConnectionListItem connection={mockConnection} onClick={onClickMock} />,
store,
);

fireEvent.click(getByTestId('connection-list-item'));
expect(onClickMock).toHaveBeenCalledTimes(1);
});
});
Loading