Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: Bump Snaps packages #25505

Merged
merged 9 commits into from
Jun 27, 2024
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
6 changes: 6 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.

8 changes: 4 additions & 4 deletions builds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ buildTypes:
- SEGMENT_WRITE_KEY_REF: SEGMENT_PROD_WRITE_KEY
- ALLOW_LOCAL_SNAPS: false
- REQUIRE_SNAPS_ALLOWLIST: true
- IFRAME_EXECUTION_ENVIRONMENT_URL: https://execution.metamask.io/iframe/6.4.0/index.html
- IFRAME_EXECUTION_ENVIRONMENT_URL: https://execution.metamask.io/iframe/6.5.0/index.html
- ACCOUNT_SNAPS_DIRECTORY_URL: https://snaps.metamask.io/account-management
- BTC_BETA_SUPPORT: false
# Main build uses the default browser manifest
Expand All @@ -47,7 +47,7 @@ buildTypes:
- SEGMENT_WRITE_KEY_REF: SEGMENT_BETA_WRITE_KEY
- ALLOW_LOCAL_SNAPS: false
- REQUIRE_SNAPS_ALLOWLIST: true
- IFRAME_EXECUTION_ENVIRONMENT_URL: https://execution.metamask.io/iframe/6.4.0/index.html
- IFRAME_EXECUTION_ENVIRONMENT_URL: https://execution.metamask.io/iframe/6.5.0/index.html
- ACCOUNT_SNAPS_DIRECTORY_URL: https://snaps.metamask.io/account-management
# Modifies how the version is displayed.
# eg. instead of 10.25.0 -> 10.25.0-beta.2
Expand All @@ -68,7 +68,7 @@ buildTypes:
- SEGMENT_FLASK_WRITE_KEY
- ALLOW_LOCAL_SNAPS: true
- REQUIRE_SNAPS_ALLOWLIST: false
- IFRAME_EXECUTION_ENVIRONMENT_URL: https://execution.metamask.io/iframe/6.4.0/index.html
- IFRAME_EXECUTION_ENVIRONMENT_URL: https://execution.metamask.io/iframe/6.5.0/index.html
- SUPPORT_LINK: https://support.metamask.io/
- SUPPORT_REQUEST_LINK: https://support.metamask.io/
- INFURA_ENV_KEY_REF: INFURA_FLASK_PROJECT_ID
Expand All @@ -92,7 +92,7 @@ buildTypes:
- SEGMENT_WRITE_KEY_REF: SEGMENT_MMI_WRITE_KEY
- ALLOW_LOCAL_SNAPS: false
- REQUIRE_SNAPS_ALLOWLIST: true
- IFRAME_EXECUTION_ENVIRONMENT_URL: https://execution.metamask.io/iframe/6.4.0/index.html
- IFRAME_EXECUTION_ENVIRONMENT_URL: https://execution.metamask.io/iframe/6.5.0/index.html
- MMI_CONFIGURATION_SERVICE_URL: https://configuration.metamask-institutional.io/v2/configuration/default
- SUPPORT_LINK: https://mmi-support.metamask.io/hc/en-us
- SUPPORT_REQUEST_LINK: https://mmi-support.metamask.io/hc/en-us/requests/new
Expand Down
12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@
"[email protected]": "^7.5.4",
"@trezor/schema-utils@npm:1.0.2": "patch:@trezor/schema-utils@npm%3A1.0.2#~/.yarn/patches/@trezor-schema-utils-npm-1.0.2-7dd48689b2.patch",
"lavamoat-core@npm:^15.1.1": "patch:lavamoat-core@npm%3A15.1.1#~/.yarn/patches/lavamoat-core-npm-15.1.1-51fbe39988.patch",
"@metamask/snaps-sdk": "^5.0.0",
"@metamask/snaps-sdk": "^6.0.0",
"@metamask/transaction-controller": "^32.0.0",
"@babel/runtime@npm:^7.7.6": "patch:@babel/runtime@npm%3A7.24.0#~/.yarn/patches/@babel-runtime-npm-7.24.0-7eb1dd11a2.patch",
"@babel/runtime@npm:^7.9.2": "patch:@babel/runtime@npm%3A7.24.0#~/.yarn/patches/@babel-runtime-npm-7.24.0-7eb1dd11a2.patch",
Expand Down Expand Up @@ -335,11 +335,11 @@
"@metamask/selected-network-controller": "^15.0.2",
"@metamask/signature-controller": "^16.0.0",
"@metamask/smart-transactions-controller": "^10.1.2",
"@metamask/snaps-controllers": "^9.0.0",
"@metamask/snaps-execution-environments": "^6.4.0",
"@metamask/snaps-rpc-methods": "^9.1.3",
"@metamask/snaps-sdk": "^5.0.0",
"@metamask/snaps-utils": "^7.6.0",
"@metamask/snaps-controllers": "^9.2.0",
"@metamask/snaps-execution-environments": "^6.5.0",
"@metamask/snaps-rpc-methods": "^9.1.4",
"@metamask/snaps-sdk": "^6.0.0",
"@metamask/snaps-utils": "^7.7.0",
"@metamask/transaction-controller": "^32.0.0",
"@metamask/user-operation-controller": "^10.0.0",
"@metamask/utils": "^8.2.1",
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/snaps/enums.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module.exports = {
TEST_SNAPS_WEBSITE_URL: 'https://metamask.github.io/snaps/test-snaps/2.9.0/',
TEST_SNAPS_WEBSITE_URL: 'https://metamask.github.io/snaps/test-snaps/2.11.0/',
};
1 change: 1 addition & 0 deletions ui/components/app/app-components.scss
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
@import 'snaps/snap-ui-renderer/index';
@import 'snaps/snap-ui-markdown/index';
@import 'snaps/snap-ui-button/index';
@import 'snaps/snap-ui-file-input/index';
@import 'snaps/snap-delineator/index';
@import 'snaps/snap-list-item/index';
@import 'snaps/copyable/index';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,13 @@ import { SnapUIMarkdown } from '../snaps/snap-ui-markdown';
import { SnapUILink } from '../snaps/snap-ui-link';
import { SmartTransactionStatusPage } from '../../../pages/smart-transactions/smart-transaction-status-page';
import { SnapUIImage } from '../snaps/snap-ui-image';
import { SnapUIFileInput } from '../snaps/snap-ui-file-input';
import { SnapUIInput } from '../snaps/snap-ui-input';
import { SnapUIForm } from '../snaps/snap-ui-form';
import { SnapUIButton } from '../snaps/snap-ui-button';
import { SnapUIDropdown } from '../snaps/snap-ui-dropdown';
import { SnapUICheckbox } from '../snaps/snap-ui-checkbox';
import { SnapUITooltip } from '../snaps/snap-ui-tooltip';
///: BEGIN:ONLY_INCLUDE_IF(keyring-snaps)
import { SnapAccountSuccessMessage } from '../../../pages/confirmations/components/snap-account-success-message';
import { SnapAccountErrorMessage } from '../../../pages/confirmations/components/snap-account-error-message';
Expand Down Expand Up @@ -78,10 +81,13 @@ export const safeComponentList = {
ConfirmInfoRow,
ConfirmInfoRowAddress,
ConfirmInfoRowValueDouble,
SnapUIFileInput,
SnapUIInput,
SnapUIButton,
SnapUIForm,
SnapUIDropdown,
SnapUICheckbox,
SnapUITooltip,
///: BEGIN:ONLY_INCLUDE_IF(keyring-snaps)
CreateSnapAccount,
RemoveSnapAccount,
Expand Down
5 changes: 4 additions & 1 deletion ui/components/app/snaps/snap-ui-button/snap-ui-button.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,10 @@ export const SnapUIButton: FunctionComponent<
event.preventDefault();
}

handleEvent({ event: UserInputEventType.ButtonClickEvent, name });
handleEvent({
event: UserInputEventType.ButtonClickEvent,
name,
});
};

const overriddenVariant = disabled ? 'disabled' : variant;
Expand Down
1 change: 1 addition & 0 deletions ui/components/app/snaps/snap-ui-checkbox/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export * from './snap-ui-checkbox';
81 changes: 81 additions & 0 deletions ui/components/app/snaps/snap-ui-checkbox/snap-ui-checkbox.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
import React, { FunctionComponent, useEffect, useState } from 'react';
import { useSnapInterfaceContext } from '../../../../contexts/snaps';
import {
Display,
FlexDirection,
} from '../../../../helpers/constants/design-system';
import {
Box,
Label,
HelpText,
HelpTextSeverity,
Checkbox,
} from '../../../component-library';
import ToggleButton from '../../../ui/toggle-button';

export type SnapUICheckboxProps = {
name: string;
fieldLabel?: string;
variant?: 'default' | 'toggle';
label?: string;
error?: string;
form?: string;
};

export const SnapUICheckbox: FunctionComponent<SnapUICheckboxProps> = ({
name,
variant,
fieldLabel,
label,
error,
form,
...props
}) => {
const { handleInputChange, getValue } = useSnapInterfaceContext();

const initialValue = getValue<boolean>(name, form);

const [value, setValue] = useState(initialValue ?? false);

useEffect(() => {
if (initialValue !== undefined && initialValue !== null) {
setValue(initialValue);
}
}, [initialValue]);

const handleChange = () => {
setValue(!value);
handleInputChange(name, !value, form);
};

return (
<Box
className="snap-ui-renderer__checkbox"
display={Display.Flex}
flexDirection={FlexDirection.Column}
>
{fieldLabel && <Label htmlFor={name}>{fieldLabel}</Label>}
{variant === 'toggle' ? (
<ToggleButton
onToggle={handleChange}
value={value}
onLabel={label}
offLabel={label}
{...props}
/>
) : (
<Checkbox
onChange={handleChange}
isChecked={value}
label={label}
{...props}
/>
)}
{error && (
<HelpText severity={HelpTextSeverity.Danger} marginTop={1}>
{error}
</HelpText>
)}
</Box>
);
};
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ export const SnapUIDropdown: FunctionComponent<SnapUIDropdownProps> = ({
}) => {
const { handleInputChange, getValue } = useSnapInterfaceContext();

const initialValue = getValue(name, form);
const initialValue = getValue<string>(name, form);

const [value, setValue] = useState(initialValue ?? '');

Expand Down
21 changes: 21 additions & 0 deletions ui/components/app/snaps/snap-ui-file-input/index.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
.snap-ui-renderer {
&__file-input {
&__drop-zone {
background-color: var(--color-background-alternative);

.mm-icon,
.mm-text {
color: var(--color-icon-alternative);
}

&:hover .mm-icon,
&:hover .mm-text {
color: var(--color-info-default);
}

&:hover {
background-color: var(--color-background-alternative-hover);
}
}
}
}
1 change: 1 addition & 0 deletions ui/components/app/snaps/snap-ui-file-input/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export * from './snap-ui-file-input';
Loading