Skip to content

Commit d2ed13f

Browse files
committed
Add some UI adjustments and do some refactoring
1 parent ce45bd4 commit d2ed13f

File tree

3 files changed

+55
-10
lines changed

3 files changed

+55
-10
lines changed

app/_locales/en/messages.json

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ui/components/multichain/pages/review-permissions-page/site-cell/site-cell.tsx

+4-2
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,8 @@ export const SiteCell: React.FC<SiteCellProps> = ({
100100
category: MetaMetricsEventCategory.Navigation,
101101
event: MetaMetricsEventName.ViewPermissionedAccounts,
102102
properties: {
103-
location: 'Connect view, Permissions toast, Permissions (dapp)',
103+
location:
104+
'Connect view (permissions tab), Permissions toast, Permissions (dapp)',
104105
},
105106
});
106107
};
@@ -112,7 +113,8 @@ export const SiteCell: React.FC<SiteCellProps> = ({
112113
category: MetaMetricsEventCategory.Navigation,
113114
event: MetaMetricsEventName.ViewPermissionedNetworks,
114115
properties: {
115-
location: 'Connect view, Permissions toast, Permissions (dapp)',
116+
location:
117+
'Connect view (permissions tab), Permissions toast, Permissions (dapp)',
116118
},
117119
});
118120
};

ui/pages/permissions-connect/connect-page/connect-page.tsx

+50-7
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import React, { useMemo, useState } from 'react';
1+
import React, { useContext, useMemo, useState } from 'react';
22
import { useSelector } from 'react-redux';
33
import { InternalAccount } from '@metamask/keyring-internal-api';
44
import { isEvmAccountType } from '@metamask/keyring-api';
@@ -20,6 +20,7 @@ import {
2020
Box,
2121
Button,
2222
ButtonLink,
23+
ButtonLinkSize,
2324
ButtonSize,
2425
ButtonVariant,
2526
Text,
@@ -53,6 +54,12 @@ import {
5354
getAvatarFallbackLetter,
5455
transformOriginToTitle,
5556
} from '../../../helpers/utils/util';
57+
import ZENDESK_URLS from '../../../helpers/constants/zendesk-url';
58+
import {
59+
MetaMetricsEventCategory,
60+
MetaMetricsEventName,
61+
} from '../../../../shared/constants/metametrics';
62+
import { MetaMetricsContext } from '../../../contexts/metametrics';
5663
import {
5764
getCaip25PermissionsResponse,
5865
getRequestedSessionScopes,
@@ -88,6 +95,7 @@ export const ConnectPage: React.FC<ConnectPageProps> = ({
8895
targetSubjectMetadata,
8996
}) => {
9097
const t = useI18nContext();
98+
const trackEvent = useContext(MetaMetricsContext);
9199

92100
const requestedSessionsScopes = getRequestedSessionScopes(
93101
request.permissions,
@@ -187,6 +195,18 @@ export const ConnectPage: React.FC<ConnectPageProps> = ({
187195

188196
const title = transformOriginToTitle(targetSubjectMetadata.origin);
189197

198+
const handleOpenAccountsModal = () => {
199+
setShowEditAccountsModal(true);
200+
trackEvent({
201+
category: MetaMetricsEventCategory.Navigation,
202+
event: MetaMetricsEventName.ViewPermissionedAccounts,
203+
properties: {
204+
location:
205+
'Connect view (accounts tab), Permissions toast, Permissions (dapp)',
206+
},
207+
});
208+
};
209+
190210
return (
191211
<Page
192212
data-testid="connect-page"
@@ -201,13 +221,17 @@ export const ConnectPage: React.FC<ConnectPageProps> = ({
201221
>
202222
{targetSubjectMetadata.iconUrl ? (
203223
<>
204-
<Box style={{ filter: 'blur(16px)', position: 'absolute' }}>
224+
<Box
225+
style={{
226+
filter: 'blur(20px) brightness(1.2)',
227+
position: 'absolute',
228+
}}
229+
>
205230
<AvatarFavicon
206231
backgroundColor={BackgroundColor.backgroundAlternative}
207232
size={AvatarFaviconSize.Xl}
208233
src={targetSubjectMetadata.iconUrl}
209234
name={title}
210-
style={{ filter: 'brightness(1.2)' }}
211235
/>
212236
</Box>
213237
<AvatarFavicon
@@ -232,10 +256,25 @@ export const ConnectPage: React.FC<ConnectPageProps> = ({
232256
</AvatarBase>
233257
)}
234258
</Box>
235-
<Text variant={TextVariant.headingLg} marginTop={2}>
259+
<Text variant={TextVariant.headingLg} marginTop={2} marginBottom={2}>
236260
{title}
237261
</Text>
238-
<Text>{t('connectionDescription')}</Text>
262+
<Text>
263+
{t('connectionDescription')}
264+
<ButtonLink
265+
paddingLeft={1}
266+
key="permission-connect-footer-learn-more-link"
267+
size={ButtonLinkSize.Inherit}
268+
target="_blank"
269+
onClick={() => {
270+
global.platform.openTab({
271+
url: ZENDESK_URLS.USER_GUIDE_DAPPS,
272+
});
273+
}}
274+
>
275+
{t('learnMoreUpperCase')}
276+
</ButtonLink>
277+
</Text>
239278
</Header>
240279
<Content
241280
paddingLeft={4}
@@ -261,7 +300,11 @@ export const ConnectPage: React.FC<ConnectPageProps> = ({
261300
<Box
262301
backgroundColor={BackgroundColor.backgroundDefault}
263302
borderRadius={BorderRadius.XL}
264-
style={{ overflow: 'auto', maxHeight: '290px' }}
303+
style={{
304+
overflow: 'auto',
305+
maxHeight: '268px',
306+
scrollbarColor: 'var(--color-icon-muted) transparent',
307+
}}
265308
>
266309
{selectedAccounts.map((account) => (
267310
<AccountListItem
@@ -277,7 +320,7 @@ export const ConnectPage: React.FC<ConnectPageProps> = ({
277320
justifyContent={JustifyContent.center}
278321
>
279322
<ButtonLink
280-
onClick={() => setShowEditAccountsModal(true)}
323+
onClick={() => handleOpenAccountsModal()}
281324
data-testid="edit"
282325
>
283326
{t('editAccounts')}

0 commit comments

Comments
 (0)