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

Clean up some code fencing around snaps (#18802)

Browse Source 
* Clean up some code fencing around snaps

* Fix code fencing

* Fix more fencing issues
This commit is contained in:
Frederik Bolding 2023-05-03 10:53:58 +02:00 committed by GitHub
parent 120dfcdf32
commit c716592fd1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
18 changed files with 25 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ui/components/app/confirm-page-container/snaps/snap-insight.js
View File

@ -17,7 +17,7 @@ import { useTransactionInsightSnap } from '../../../../hooks/snaps/useTransactio
import Box from '../../../ui/box/box';
import { SnapUIRenderer } from '../../snaps/snap-ui-renderer';
import { SnapDelineator } from '../../snaps/snap-delineator';
import { DelineatorType } from '../../../../helpers/constants/flask';
import { DelineatorType } from '../../../../helpers/constants/snaps';
import { getSnapName } from '../../../../helpers/utils/util';
import { Copyable } from '../../snaps/copyable';
import { getTargetSubjectMetadata } from '../../../../selectors';

2
ui/components/app/snaps/snap-authorship/snap-authorship.stories.js
View File

@ -2,7 +2,7 @@ import React from 'react';
import SnapAuthorship from '.';
export default {
title: 'Components/App/Flask/SnapAuthorship',
title: 'Components/App/Snaps/SnapAuthorship',
component: SnapAuthorship,
argTypes: {

2
ui/components/app/snaps/snap-avatar/snap-avatar.stories.js
View File

@ -2,7 +2,7 @@ import React from 'react';
import SnapAvatar from '.';
export default {
title: 'Components/App/Flask/SnapAvatar',
title: 'Components/App/Snaps/SnapAvatar',
component: SnapAvatar,
argTypes: {

2
ui/components/app/snaps/snap-content-footer/snap-content-footer.stories.js
View File

@ -3,7 +3,7 @@ import React from 'react';
import SnapContentFooter from '.';
export default {
title: 'Components/App/Flask/SnapContentFooter',
title: 'Components/App/Snaps/SnapContentFooter',
component: SnapContentFooter,
args: {

2
ui/components/app/snaps/snap-delineator/snap-delineator.js
View File

@ -21,7 +21,7 @@ import {
import {
DelineatorType,
getDelineatorTitle,
} from '../../../../helpers/constants/flask';
} from '../../../../helpers/constants/snaps';
export const SnapDelineator = ({
snapName,

2
ui/components/app/snaps/snap-delineator/snap-delineator.test.js
View File

@ -1,5 +1,5 @@
import React from 'react';
import { DelineatorType } from '../../../../helpers/constants/flask';
import { DelineatorType } from '../../../../helpers/constants/snaps';
import { renderWithLocalization } from '../../../../../test/lib/render-helpers';
import { SnapDelineator } from './snap-delineator';

2
ui/components/app/snaps/snap-permissions-list/snap-permissions-list.stories.js
View File

@ -3,7 +3,7 @@ import React from 'react';
import SnapPermissionsList from '.';
export default {
title: 'Components/App/flask/SnapPermissionsList',
title: 'Components/App/Snaps/SnapPermissionsList',
component: SnapPermissionsList,
argTypes: {

2
ui/components/app/snaps/snap-settings-card/snap-settings-card.stories.js
View File

@ -5,7 +5,7 @@ import README from './README.mdx';
import SnapSettingsCard from '.';
export default {
title: 'Components/App/Flask/SnapSettingsCard',
title: 'Components/App/Snaps/SnapSettingsCard',
component: SnapSettingsCard,
parameters: {

2
ui/components/app/snaps/snap-ui-renderer/snap-ui-renderer.js
View File

@ -18,7 +18,7 @@ import { getSnapName } from '../../../../helpers/utils/util';
import { getTargetSubjectMetadata } from '../../../../selectors';
import { Text } from '../../../component-library';
import { Copyable } from '../copyable';
import { DelineatorType } from '../../../../helpers/constants/flask';
import { DelineatorType } from '../../../../helpers/constants/snaps';
export const UI_MAPPING = {
panel: (props, elementKey) => ({

0
ui/helpers/constants/flask/delineator.test.ts → ui/helpers/constants/snaps/delineator.test.ts
View File

0
ui/helpers/constants/flask/delineator.ts → ui/helpers/constants/snaps/delineator.ts
View File

0
ui/helpers/constants/flask/index.js → ui/helpers/constants/snaps/index.js
View File

2
ui/pages/confirmation/templates/snaps/snap-alert/snap-alert.js
View File

@ -1,5 +1,5 @@
import { mapToTemplate } from '../../../../../components/app/snaps/snap-ui-renderer';
import { DelineatorType } from '../../../../../helpers/constants/flask';
import { DelineatorType } from '../../../../../helpers/constants/snaps';
function getValues(pendingApproval, t, actions) {
const {

2
ui/pages/confirmation/templates/snaps/snap-confirmation/snap-confirmation.js
View File

@ -1,5 +1,5 @@
import { mapToTemplate } from '../../../../../components/app/snaps/snap-ui-renderer';
import { DelineatorType } from '../../../../../helpers/constants/flask';
import { DelineatorType } from '../../../../../helpers/constants/snaps';
function getValues(pendingApproval, t, actions) {
const {

2
ui/pages/confirmation/templates/snaps/snap-prompt/snap-prompt.js
View File

@ -1,6 +1,6 @@
import { mapToTemplate } from '../../../../../components/app/snaps/snap-ui-renderer';
import { MESSAGE_TYPE } from '../../../../../../shared/constants/app';
import { DelineatorType } from '../../../../../helpers/constants/flask';
import { DelineatorType } from '../../../../../helpers/constants/snaps';
function getValues(pendingApproval, t, actions, _history, setInputState) {
const {

32
ui/pages/permissions-connect/permissions-connect.component.js
View File

@ -38,11 +38,11 @@ export default class PermissionConnect extends Component {
history: PropTypes.object.isRequired,
connectPath: PropTypes.string.isRequired,
confirmPermissionPath: PropTypes.string.isRequired,
requestType: PropTypes.string.isRequired,
///: BEGIN:ONLY_INCLUDE_IN(snaps)
snapInstallPath: PropTypes.string.isRequired,
snapUpdatePath: PropTypes.string.isRequired,
snapResultPath: PropTypes.string.isRequired,
requestType: PropTypes.string.isRequired,
requestState: PropTypes.object.isRequired,
approvePendingApproval: PropTypes.func.isRequired,
rejectPendingApproval: PropTypes.func.isRequired,
@ -175,23 +175,20 @@ export default class PermissionConnect extends Component {
selectAccounts = (addresses) => {
const {
confirmPermissionPath,
requestType,
///: BEGIN:ONLY_INCLUDE_IN(snaps)
snapInstallPath,
snapUpdatePath,
snapResultPath,
requestType,
///: END:ONLY_INCLUDE_IN
} = this.props;
this.setState(
{
selectedAccountAddresses: addresses,
},
///: BEGIN:ONLY_INCLUDE_IN(build-main,build-beta)
() => this.props.history.push(confirmPermissionPath),
///: END:ONLY_INCLUDE_IN
///: BEGIN:ONLY_INCLUDE_IN(snaps)
() => {
switch (requestType) {
///: BEGIN:ONLY_INCLUDE_IN(snaps)
case 'wallet_installSnap':
this.props.history.push(snapInstallPath);
break;
@ -201,11 +198,11 @@ export default class PermissionConnect extends Component {
case 'wallet_installSnapResult':
this.props.history.push(snapResultPath);
break;
///: END:ONLY_INCLUDE_IN
default:
this.props.history.push(confirmPermissionPath);
}
},
///: END:ONLY_INCLUDE_IN
);
};
@ -217,39 +214,26 @@ export default class PermissionConnect extends Component {
///: END:ONLY_INCLUDE_IN
} = this.props;
let shouldRedirect = true;
///: BEGIN:ONLY_INCLUDE_IN(snaps)
const isRequestingSnap =
permissionsRequest?.permissions &&
Object.keys(permissionsRequest.permissions).includes('wallet_snap');
const shouldRedirect = !isRequestingSnap;
shouldRedirect = !isRequestingSnap;
///: END:ONLY_INCLUDE_IN
this.setState({
redirecting: shouldRedirect,
permissionsApproved: approved,
});
///: END:ONLY_INCLUDE_IN
///: BEGIN:ONLY_INCLUDE_IN(build-main,build-beta)
this.setState({
redirecting: true,
permissionsApproved: approved,
});
///: END:ONLY_INCLUDE_IN
this.removeBeforeUnload();
///: BEGIN:ONLY_INCLUDE_IN(snaps)
if (shouldRedirect && approved) {
setTimeout(() => history.push(DEFAULT_ROUTE), APPROVE_TIMEOUT);
return;
}
///: END:ONLY_INCLUDE_IN
///: BEGIN:ONLY_INCLUDE_IN(build-main,build-beta,build-mmi)
if (approved) {
setTimeout(() => history.push(DEFAULT_ROUTE), APPROVE_TIMEOUT);
return;
}
///: END:ONLY_INCLUDE_IN
history.push(DEFAULT_ROUTE);
}

8
ui/pages/permissions-connect/permissions-connect.container.js
View File

@ -9,8 +9,8 @@ import {
///: BEGIN:ONLY_INCLUDE_IN(snaps)
getSnapInstallOrUpdateRequests,
getRequestState,
getRequestType,
///: END:ONLY_INCLUDE_IN
getRequestType,
getTargetSubjectMetadata,
} from '../../selectors';
import { getNativeCurrency } from '../../ducks/metamask/metamask';
@ -73,11 +73,11 @@ const mapStateToProps = (state, ownProps) => {
subjectType: SubjectType.Unknown,
};
const requestType = getRequestType(state, permissionsRequestId);
///: BEGIN:ONLY_INCLUDE_IN(snaps)
const isSnap = targetSubjectMetadata.subjectType === SubjectType.Snap;
const requestType = getRequestType(state, permissionsRequestId);
const requestState = getRequestState(state, permissionsRequestId);
///: END:ONLY_INCLUDE_IN
@ -126,8 +126,8 @@ const mapStateToProps = (state, ownProps) => {
return {
isRequestingAccounts,
///: BEGIN:ONLY_INCLUDE_IN(snaps)
requestType,
///: BEGIN:ONLY_INCLUDE_IN(snaps)
snapInstallPath,
snapUpdatePath,
snapResultPath,

2
ui/pages/settings/snaps/view-snap/view-snap.js
View File

@ -36,7 +36,7 @@ import { getSnapName } from '../../../../helpers/utils/util';
import { Text, BUTTON_VARIANT } from '../../../../components/component-library';
import SnapPermissionsList from '../../../../components/app/snaps/snap-permissions-list';
import { SnapDelineator } from '../../../../components/app/snaps/snap-delineator';
import { DelineatorType } from '../../../../helpers/constants/flask';
import { DelineatorType } from '../../../../helpers/constants/snaps';
function ViewSnap() {
const t = useI18nContext();