m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-11-22 09:57:02 +01:00
Code

added extension changes from snaps branch (#13433)

Browse Source
This commit is contained in:
Hassan Malik 2022-01-28 09:39:32 -08:00 committed by GitHub
parent 3eb99babf2
commit 2825b74a55
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ui/components/app/permissions-connect-footer/index.scss
View File

@ -7,7 +7,7 @@
&__text { &__text {
@include H7; @include H7;
color: #6a737d; color: var(--ui-4);
display: flex; display: flex;
margin-top: 10px; margin-top: 10px;

23
ui/pages/confirmation/confirmation.js
View File

@ -10,17 +10,15 @@ import { useHistory } from 'react-router-dom';
import { isEqual } from 'lodash'; import { isEqual } from 'lodash';
import { produce } from 'immer'; import { produce } from 'immer';
import Box from '../../components/ui/box'; import Box from '../../components/ui/box';
import Chip from '../../components/ui/chip';
import MetaMaskTemplateRenderer from '../../components/app/metamask-template-renderer'; import MetaMaskTemplateRenderer from '../../components/app/metamask-template-renderer';
import SiteIcon from '../../components/ui/site-icon';
import { DEFAULT_ROUTE } from '../../helpers/constants/routes'; import { DEFAULT_ROUTE } from '../../helpers/constants/routes';
import { stripHttpsScheme } from '../../helpers/utils/util';
import { useI18nContext } from '../../hooks/useI18nContext'; import { useI18nContext } from '../../hooks/useI18nContext';
import { useOriginMetadata } from '../../hooks/useOriginMetadata'; import { useOriginMetadata } from '../../hooks/useOriginMetadata';
import { getUnapprovedTemplatedConfirmations } from '../../selectors'; import { getUnapprovedTemplatedConfirmations } from '../../selectors';
import NetworkDisplay from '../../components/app/network-display/network-display'; import NetworkDisplay from '../../components/app/network-display/network-display';
import { COLORS, SIZES } from '../../helpers/constants/design-system'; import { COLORS, SIZES } from '../../helpers/constants/design-system';
import Callout from '../../components/ui/callout'; import Callout from '../../components/ui/callout';
import SiteOrigin from '../../components/ui/site-origin';
import ConfirmationFooter from './components/confirmation-footer'; import ConfirmationFooter from './components/confirmation-footer';
import { getTemplateValues, getTemplateAlerts } from './templates'; import { getTemplateValues, getTemplateAlerts } from './templates';
@ -124,7 +122,7 @@ export default function ConfirmationPage() {
0, 0,
); );
const pendingConfirmation = pendingConfirmations[currentPendingConfirmation]; const pendingConfirmation = pendingConfirmations[currentPendingConfirmation];
const originMetadata = useOriginMetadata(pendingConfirmation?.origin); const originMetadata = useOriginMetadata(pendingConfirmation?.origin) || {};
const [alertState, dismissAlert] = useAlertState(pendingConfirmation); const [alertState, dismissAlert] = useAlertState(pendingConfirmation);
// Generating templatedValues is potentially expensive, and if done on every render // Generating templatedValues is potentially expensive, and if done on every render
@ -185,6 +183,7 @@ export default function ConfirmationPage() {
</div> </div>
)} )}
<div className="confirmation-page__content"> <div className="confirmation-page__content">
{templatedValues.networkDisplay ? (
<Box justifyContent="center"> <Box justifyContent="center">
<NetworkDisplay <NetworkDisplay
colored={false} colored={false}
@ -192,16 +191,12 @@ export default function ConfirmationPage() {
labelProps={{ color: COLORS.BLACK }} labelProps={{ color: COLORS.BLACK }}
/> />
</Box> </Box>
<Box justifyContent="center" padding={[1, 4, 4]}> ) : null}
<Chip <Box justifyContent="center" padding={[4, 4, 4]}>
label={stripHttpsScheme(originMetadata.origin)} <SiteOrigin
leftIcon={ siteOrigin={originMetadata.origin}
<SiteIcon iconSrc={originMetadata.iconUrl}
icon={originMetadata.iconUrl} iconName={originMetadata.hostname}
name={originMetadata.hostname}
size={32}
/>
}
/> />
</Box> </Box>
<MetaMaskTemplateRenderer sections={templatedValues.content} /> <MetaMaskTemplateRenderer sections={templatedValues.content} />

1
ui/pages/confirmation/templates/index.js
View File

@ -22,6 +22,7 @@ const ALLOWED_TEMPLATE_KEYS = [
'cancelText', 'cancelText',
'onApprove', 'onApprove',
'onCancel', 'onCancel',
'networkDisplay',
]; ];
/** /**