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

[MMI] Add code fences in signature-request (#18770)

Browse Source 
* Started adding code fences in signature-request

* Finished code fencing

* Improving code

* Fixed storybook and code fences bundle

* Added missing dependency

* Fixed yarn.lock

* Fixing policies

* Updated package.json

* updating lavamoat

* lavamoat fix

* adds missing package

* runs yarn dedupe

* updates method name

* run lavamoat:auto again

* Added more code fences

* updates snapshot

* snapshot updates

* updates mmi packages to lighter versions

* updates mmi packages

* runs lavamoat auto

* updates yarn lock and runs lavamoat auto

* updates yarn lock

* updates targets file

* Removed console log and added tests

---------

Co-authored-by: António Regadas <apregadas@gmail.com>
Co-authored-by: Brad Decker <bhdecker84@gmail.com>
Co-authored-by: Antonio Regadas <antonio.regadas@consensys.net>
This commit is contained in:
Albert Olivé 2023-05-24 13:41:21 +02:00 committed by GitHub
parent 00bad7b8a8
commit 057188d155
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
19 changed files with 675 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
coverage-targets.js
View File

@ -6,10 +6,10 @@
// subset of files to check against these targets.
module.exports = {
global: {
lines: 71.12,
branches: 58.94,
statements: 70.58,
functions: 63.84,
lines: 71.15,
branches: 59.17,
statements: 70.6,
functions: 63.82,
},
transforms: {
branches: 100,

71
lavamoat/build-system/policy.json
View File

@ -980,6 +980,7 @@
"packages": {
"@lavamoat/allow-scripts>@npmcli/run-script>node-gyp>npmlog>are-we-there-yet": true,
"@lavamoat/allow-scripts>@npmcli/run-script>node-gyp>npmlog>gauge": true,
"@storybook/addon-mdx-gfm>@storybook/node-logger>npmlog>console-control-strings": true,
"@storybook/react>@storybook/node-logger>npmlog>console-control-strings": true,
"nyc>yargs>set-blocking": true
}
@ -1008,6 +1009,9 @@
"@lavamoat/allow-scripts>@npmcli/run-script>node-gyp>npmlog>gauge>aproba": true,
"@lavamoat/allow-scripts>@npmcli/run-script>node-gyp>npmlog>gauge>string-width": true,
"@lavamoat/allow-scripts>@npmcli/run-script>node-gyp>npmlog>gauge>strip-ansi": true,
"@storybook/addon-mdx-gfm>@storybook/node-logger>npmlog>console-control-strings": true,
"@storybook/addon-mdx-gfm>@storybook/node-logger>npmlog>gauge>has-unicode": true,
"@storybook/addon-mdx-gfm>@storybook/node-logger>npmlog>gauge>wide-align": true,
"@storybook/react>@storybook/node-logger>npmlog>console-control-strings": true,
"@storybook/react>@storybook/node-logger>npmlog>gauge>has-unicode": true,
"@storybook/react>@storybook/node-logger>npmlog>gauge>wide-align": true,
@ -1133,11 +1137,33 @@
"@metamask/jazzicon>color>color-convert>color-name": true
}
},
"@sentry/cli>mkdirp": {
"builtin": {
"fs": true,
"path.dirname": true,
"path.resolve": true
}
},
"@storybook/addon-knobs>qs": {
"packages": {
"string.prototype.matchall>side-channel": true
}
},
"@storybook/addon-mdx-gfm>@storybook/node-logger>npmlog>gauge>has-unicode": {
"builtin": {
"os.type": true
},
"globals": {
"process.env.LANG": true,
"process.env.LC_ALL": true,
"process.env.LC_CTYPE": true
}
},
"@storybook/addon-mdx-gfm>@storybook/node-logger>npmlog>gauge>wide-align": {
"packages": {
"yargs>string-width": true
}
},
"@storybook/core>@storybook/core-server>x-default-browser>default-browser-id>untildify>os-homedir": {
"builtin": {
"os.homedir": true
@ -4886,9 +4912,20 @@
},
"packages": {
"@storybook/core>@storybook/core-server>x-default-browser>default-browser-id>untildify>os-homedir": true,
"gulp-watch>chokidar>fsevents>node-pre-gyp>nopt>osenv>os-homedir": true,
"gulp-watch>chokidar>fsevents>node-pre-gyp>nopt>osenv>os-tmpdir": true
}
},
"gulp-watch>chokidar>fsevents>node-pre-gyp>nopt>osenv>os-homedir": {
"builtin": {
"os.homedir": true
},
"globals": {
"process.env": true,
"process.getuid": true,
"process.platform": true
}
},
"gulp-watch>chokidar>fsevents>node-pre-gyp>nopt>osenv>os-tmpdir": {
"globals": {
"process.env.SystemRoot": true,
@ -4910,9 +4947,34 @@
"setTimeout": true
},
"packages": {
"gulp-watch>chokidar>fsevents>node-pre-gyp>rimraf>glob": true,
"nyc>glob": true
}
},
"gulp-watch>chokidar>fsevents>node-pre-gyp>rimraf>glob": {
"builtin": {
"assert": true,
"events.EventEmitter": true,
"fs": true,
"path.join": true,
"path.resolve": true,
"util": true
},
"globals": {
"console.error": true,
"process.cwd": true,
"process.nextTick": true,
"process.platform": true
},
"packages": {
"eslint>minimatch": true,
"gulp-watch>path-is-absolute": true,
"nyc>glob>fs.realpath": true,
"nyc>glob>inflight": true,
"pump>once": true,
"pumpify>inherits": true
}
},
"gulp-watch>chokidar>fsevents>node-pre-gyp>semver": {
"globals": {
"console": true,
@ -8246,14 +8308,7 @@
"path.dirname": true
},
"packages": {
"stylelint>file-entry-cache>flat-cache>write>mkdirp": true
}
},
"stylelint>file-entry-cache>flat-cache>write>mkdirp": {
"builtin": {
"fs": true,
"path.dirname": true,
"path.resolve": true
"@sentry/cli>mkdirp": true
}
},
"stylelint>global-modules": {

3
package.json
View File

@ -216,7 +216,8 @@
"@keystonehq/metamask-airgapped-keyring": "^0.9.2",
"@lavamoat/snow": "^1.5.0",
"@material-ui/core": "^4.11.0",
"@metamask-institutional/portfolio-dashboard": "1.1.2",
"@metamask-institutional/extension": "^0.1.3",
"@metamask-institutional/portfolio-dashboard": "^1.1.3",
"@metamask/address-book-controller": "^2.0.0",
"@metamask/announcement-controller": "^3.0.0",
"@metamask/approval-controller": "^2.1.0",

1
ui/components/app/account-list-item/__snapshots__/account-list-item-component.test.js.snap
View File

@ -79,6 +79,7 @@ exports[`AccountListItem Component render should match snapshot 1`] = `
>
<div
class="account-mismatch-warning__tooltip-container-icon"
data-testid="account-mismatch-warning-tooltip"
>
<svg
class="info-icon info-icon--warning"

25
ui/components/app/account-list-item/account-list-item-component.test.js
View File

@ -5,11 +5,6 @@ import { renderWithProvider } from '../../../../test/lib/render-helpers';
import mockState from '../../../../test/data/mock-state.json';
import AccountListItem from './account-list-item';
jest.mock('../../../../shared/modules/hexstring-utils', () => ({
...jest.requireActual('../../../../shared/modules/hexstring-utils'),
toChecksumHexAddress: jest.fn(() => 'mockCheckSumAddress'),
}));
describe('AccountListItem Component', () => {
const store = configureStore()(mockState);
@ -93,7 +88,7 @@ describe('AccountListItem Component', () => {
<AccountListItem {...props} />,
store,
);
expect(queryByText('mockCheckSumAddress')).not.toBeInTheDocument();
expect(queryByText('0xmockAddress')).not.toBeInTheDocument();
const displayAddressProps = {
...props,
@ -101,7 +96,23 @@ describe('AccountListItem Component', () => {
};
rerender(<AccountListItem {...displayAddressProps} />);
expect(queryByText('mockCheckSumAddress')).toBeInTheDocument();
expect(queryByText('0xmockAddress')).toBeInTheDocument();
});
it('render without <AccountMismatchWarning /> if hideDefaultMismatchWarning is true', () => {
const { getByTestId, rerender } = renderWithProvider(
<AccountListItem {...props} />,
store,
);
const infoIcon = getByTestId('account-mismatch-warning-tooltip');
expect(infoIcon).toBeInTheDocument();
rerender(<AccountListItem {...props} hideDefaultMismatchWarning />);
expect(infoIcon).not.toBeInTheDocument();
});
});
});

20
ui/components/app/account-list-item/account-list-item.js
View File

@ -10,9 +10,18 @@ export default function AccountListItem({
displayAddress = false,
handleClick,
icon = null,
///: BEGIN:ONLY_INCLUDE_IN(build-mmi)
hideDefaultMismatchWarning = false,
///: END:ONLY_INCLUDE_IN
}) {
const { name, address, balance } = account || {};
let showDefaultMismatchWarning = true;
///: BEGIN:ONLY_INCLUDE_IN(build-mmi)
showDefaultMismatchWarning = !hideDefaultMismatchWarning;
///: END:ONLY_INCLUDE_IN
return (
<div
className={`account-list-item ${className}`}
@ -34,9 +43,10 @@ export default function AccountListItem({
{icon}
</div>
) : null}
<AccountMismatchWarning address={address} />
{showDefaultMismatchWarning && (
<AccountMismatchWarning address={address} />
)}
</div>
{displayAddress && name && (
<div className="account-list-item__account-address">
{toChecksumHexAddress(address)}
@ -71,4 +81,10 @@ AccountListItem.propTypes = {
* Pass icon component to be displayed. Currently not used
*/
icon: PropTypes.node,
///: BEGIN:ONLY_INCLUDE_IN(build-mmi)
/**
* MMI Prop, will hide the default AccountMismatchWarning when needed
*/
hideDefaultMismatchWarning: PropTypes.bool,
///: END:ONLY_INCLUDE_IN
};

11
ui/components/app/signature-request-original/signature-request-original.component.js
View File

@ -38,7 +38,6 @@ import SecurityProviderBannerMessage from '../security-provider-banner-message/s
import { SECURITY_PROVIDER_MESSAGE_SEVERITIES } from '../security-provider-banner-message/security-provider-banner-message.constants';
import { formatCurrency } from '../../../helpers/utils/confirm-tx.util';
import { getValueFromWeiHex } from '../../../../shared/modules/conversion.utils';
///: BEGIN:ONLY_INCLUDE_IN(build-mmi)
import { Icon, IconName, Text } from '../../component-library';
import Box from '../../ui/box/box';
@ -91,16 +90,6 @@ export default class SignatureRequestOriginal extends Component {
}
};
renderAccountInfo = () => {
return (
<div className="request-signature__account-info">
{this.renderAccount()}
{this.renderRequestIcon()}
{this.renderBalance()}
</div>
);
};
renderTypedData = (data) => {
const { t } = this.context;
const { domain, message } = JSON.parse(data);

3
ui/components/app/signature-request-siwe/signature-request-siwe-header/signature-request-siwe-header.js
View File

@ -48,6 +48,9 @@ export default function SignatureRequestSIWEHeader({
{fromAccount && (
<AccountListItem
account={fromAccount}
///: BEGIN:ONLY_INCLUDE_IN(build-mmi)
hideDefaultMismatchWarning
///: END:ONLY_INCLUDE_IN
className="signature-request-siwe-header__account-list-item"
/>
)}

136
ui/components/app/signature-request/signature-request-header/__snapshots__/signature-request-header.component.test.js.snap Normal file
View File

@ -0,0 +1,136 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP
exports[`SignatureRequestHeader renders correctly with fromAccount 1`] = `
<div>
<div
class="signature-request-header"
>
<div
class="signature-request-header--account"
>
<div
class="account-list-item undefined"
data-testid="account-list-item"
>
<div
class="account-list-item__top-row"
>
<div
class=""
>
<div
class="identicon account-list-item__identicon"
style="height: 18px; width: 18px; border-radius: 9px;"
>
<div
style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 18px; height: 18px; display: inline-block; background: rgb(24, 151, 242);"
>
<svg
height="18"
width="18"
x="0"
y="0"
>
<rect
fill="#2362E1"
height="18"
transform="translate(2.018998228945791 -3.0005497255688565) rotate(458.4 9 9)"
width="18"
x="0"
y="0"
/>
<rect
fill="#F94301"
height="18"
transform="translate(-8.641945850428243 4.495697794961231) rotate(268.8 9 9)"
width="18"
x="0"
y="0"
/>
<rect
fill="#FA7900"
height="18"
transform="translate(-5.10539291960705 16.582508932884398) rotate(117.3 9 9)"
width="18"
x="0"
y="0"
/>
</svg>
</div>
</div>
</div>
<div
class="account-list-item__account-name"
>
0x
</div>
</div>
</div>
</div>
<div
class="signature-request-header--network"
>
<div
class="network-display chip chip--with-left-icon chip--border-color-border-muted chip--background-color-undefined chip--max-content"
data-testid="network-display"
>
<div
class="chip__left-icon"
>
<div
class="color-indicator color-indicator--filled color-indicator--color-icon-muted color-indicator--size-lg"
data-testid="color-icon-icon-muted"
>
<i
class="color-indicator__icon fa fa-question"
/>
</div>
</div>
<span
class="box box--margin-top-1 box--margin-bottom-1 box--flex-direction-row typography chip__label typography--h7 typography--weight-normal typography--style-normal typography--color-text-alternative"
>
Private network
</span>
</div>
</div>
</div>
</div>
`;
exports[`SignatureRequestHeader renders correctly without fromAccount 1`] = `
<div>
<div
class="signature-request-header"
>
<div
class="signature-request-header--account"
/>
<div
class="signature-request-header--network"
>
<div
class="network-display chip chip--with-left-icon chip--border-color-border-muted chip--background-color-undefined chip--max-content"
data-testid="network-display"
>
<div
class="chip__left-icon"
>
<div
class="color-indicator color-indicator--filled color-indicator--color-icon-muted color-indicator--size-lg"
data-testid="color-icon-icon-muted"
>
<i
class="color-indicator__icon fa fa-question"
/>
</div>
</div>
<span
class="box box--margin-top-1 box--margin-bottom-1 box--flex-direction-row typography chip__label typography--h7 typography--weight-normal typography--style-normal typography--color-text-alternative"
>
Private network
</span>
</div>
</div>
</div>
</div>
`;

9
ui/components/app/signature-request/signature-request-header/signature-request-header.component.js
View File

@ -14,7 +14,14 @@ export default class SignatureRequestHeader extends PureComponent {
return (
<div className="signature-request-header">
<div className="signature-request-header--account">
{fromAccount ? <AccountListItem account={fromAccount} /> : null}
{fromAccount ? (
<AccountListItem
account={fromAccount}
///: BEGIN:ONLY_INCLUDE_IN(build-mmi)
hideDefaultMismatchWarning
///: END:ONLY_INCLUDE_IN
/>
) : null}
</div>
<div className="signature-request-header--network">
<NetworkDisplay />

23
ui/components/app/signature-request/signature-request-header/signature-request-header.component.test.js Normal file
View File

@ -0,0 +1,23 @@
import React from 'react';
import configureMockStore from 'redux-mock-store';
import mockState from '../../../../../test/data/mock-state.json';
import { renderWithProvider } from '../../../../../test/lib/render-helpers';
import SignatureRequestHeader from './signature-request-header.component';
describe('SignatureRequestHeader', () => {
const store = configureMockStore()(mockState);
it('renders correctly with fromAccount', () => {
const fromAccount = { address: '0x' };
const { container } = renderWithProvider(
<SignatureRequestHeader fromAccount={fromAccount} />,
store,
);
expect(container).toMatchSnapshot();
});
it('renders correctly without fromAccount', () => {
const { container } = renderWithProvider(<SignatureRequestHeader />, store);
expect(container).toMatchSnapshot();
});
});

24
ui/components/app/signature-request/signature-request.component.js
View File

@ -94,6 +94,8 @@ export default class SignatureRequest extends PureComponent {
showRejectTransactionsConfirmationModal: PropTypes.func.isRequired,
cancelAll: PropTypes.func.isRequired,
///: BEGIN:ONLY_INCLUDE_IN(build-mmi)
showCustodianDeepLink: PropTypes.func,
isNotification: PropTypes.bool,
// Used to show a warning if the signing account is not the selected account
// Largely relevant for contract wallet custodians
selectedAccount: PropTypes.object,
@ -110,6 +112,25 @@ export default class SignatureRequest extends PureComponent {
showContractDetails: false,
};
///: BEGIN:ONLY_INCLUDE_IN(build-mmi)
componentDidMount() {
if (this.props.txData.custodyId) {
this.props.showCustodianDeepLink({
custodyId: this.props.txData.custodyId,
fromAddress: this.props.fromAccount.address,
closeNotification: this.props.isNotification,
onDeepLinkFetched: () => undefined,
onDeepLinkShown: () => {
this.context.trackEvent({
category: 'MMI',
event: 'Show deeplink for signature',
});
},
});
}
}
///: END:ONLY_INCLUDE_IN
setMessageRootRef(ref) {
this.messageRootRef = ref;
}
@ -358,6 +379,9 @@ export default class SignatureRequest extends PureComponent {
cancelAction={onCancel}
signAction={onSign}
disabled={
///: BEGIN:ONLY_INCLUDE_IN(build-mmi)
Boolean(this.props.txData?.custodyId) ||
///: END:ONLY_INCLUDE_IN
hardwareWalletRequiresConnection ||
(messageIsScrollable && !this.state.hasScrolledMessage)
}

130
ui/components/app/signature-request/signature-request.container.js
View File

@ -11,6 +11,7 @@ import {
getPreferences,
conversionRateSelector,
///: BEGIN:ONLY_INCLUDE_IN(build-mmi)
getAccountType,
getSelectedAccount,
///: END:ONLY_INCLUDE_IN
} from '../../../selectors';
@ -20,14 +21,39 @@ import {
getProviderConfig,
} from '../../../ducks/metamask/metamask';
import { getAccountByAddress, valuesFor } from '../../../helpers/utils/util';
import { MESSAGE_TYPE } from '../../../../shared/constants/app';
import { cancelMsgs, showModal } from '../../../store/actions';
///: BEGIN:ONLY_INCLUDE_IN(build-mmi)
// eslint-disable-next-line import/order
import { showCustodianDeepLink } from '@metamask-institutional/extension';
import {
mmiActionsFactory,
setTypedMessageInProgress,
} from '../../../store/institutional/institution-background';
import { getEnvironmentType } from '../../../../app/scripts/lib/util';
///: END:ONLY_INCLUDE_IN
import {
MESSAGE_TYPE,
///: BEGIN:ONLY_INCLUDE_IN(build-mmi)
ENVIRONMENT_TYPE_NOTIFICATION,
///: END:ONLY_INCLUDE_IN
} from '../../../../shared/constants/app';
import {
cancelMsgs,
showModal,
///: BEGIN:ONLY_INCLUDE_IN(build-mmi)
goHome,
///: END:ONLY_INCLUDE_IN
} from '../../../store/actions';
import { getMostRecentOverviewPage } from '../../../ducks/history/history';
import { clearConfirmTransaction } from '../../../ducks/confirm-transaction/confirm-transaction.duck';
import SignatureRequest from './signature-request.component';
function mapStateToProps(state, ownProps) {
const { txData } = ownProps;
///: BEGIN:ONLY_INCLUDE_IN(build-mmi)
const envType = getEnvironmentType();
///: END:ONLY_INCLUDE_IN
const {
msgParams: { from },
} = txData;
@ -60,12 +86,62 @@ function mapStateToProps(state, ownProps) {
// not forwarded to component
allAccounts: accountsWithSendEtherInfoSelector(state),
///: BEGIN:ONLY_INCLUDE_IN(build-mmi)
accountType: getAccountType(state),
isNotification: envType === ENVIRONMENT_TYPE_NOTIFICATION,
selectedAccount: getSelectedAccount(state),
///: END:ONLY_INCLUDE_IN
};
}
function mapDispatchToProps(dispatch) {
let mapDispatchToProps = null;
///: BEGIN:ONLY_INCLUDE_IN(build-mmi)
function mmiMapDispatchToProps(dispatch) {
const mmiActions = mmiActionsFactory();
return {
clearConfirmTransaction: () => dispatch(clearConfirmTransaction()),
setMsgInProgress: (msgId) => dispatch(setTypedMessageInProgress(msgId)),
showCustodianDeepLink: ({
custodyId,
fromAddress,
closeNotification,
onDeepLinkFetched,
onDeepLinkShown,
}) =>
showCustodianDeepLink({
dispatch,
mmiActions,
txId: undefined,
fromAddress,
custodyId,
isSignature: true,
closeNotification,
onDeepLinkFetched,
onDeepLinkShown,
}),
showTransactionsFailedModal: ({
errorMessage,
closeNotification,
operationFailed,
}) =>
dispatch(
showModal({
name: 'TRANSACTION_FAILED',
errorMessage,
closeNotification,
operationFailed,
}),
),
setWaitForConfirmDeepLinkDialog: (wait) =>
dispatch(mmiActions.setWaitForConfirmDeepLinkDialog(wait)),
goHome: () => dispatch(goHome()),
};
}
mapDispatchToProps = mmiMapDispatchToProps;
///: END:ONLY_INCLUDE_IN
mapDispatchToProps = function (dispatch) {
return {
clearConfirmTransaction: () => dispatch(clearConfirmTransaction()),
showRejectTransactionsConfirmationModal: ({
@ -84,7 +160,7 @@ function mapDispatchToProps(dispatch) {
cancelAll: (unconfirmedMessagesList) =>
dispatch(cancelMsgs(unconfirmedMessagesList)),
};
}
};
function mergeProps(stateProps, dispatchProps, ownProps) {
const {
@ -101,6 +177,10 @@ function mergeProps(stateProps, dispatchProps, ownProps) {
unconfirmedMessagesList,
unapprovedMessagesCount,
mostRecentOverviewPage,
///: BEGIN:ONLY_INCLUDE_IN(build-mmi)
accountType,
isNotification,
///: END:ONLY_INCLUDE_IN
} = stateProps;
const {
signPersonalMessage,
@ -135,13 +215,55 @@ function mergeProps(stateProps, dispatchProps, ownProps) {
sign = signMessage;
}
///: BEGIN:ONLY_INCLUDE_IN(build-mmi)
const signFn = async (...opts) => {
if (accountType === 'custody') {
try {
let msgData = opts;
let id = opts.custodyId;
if (!opts.custodyId) {
msgData = await sign(opts);
id = msgData.custodyId;
}
dispatchProps.showCustodianDeepLink({
custodyId: id,
fromAddress: fromAccount.address,
closeNotification: isNotification,
onDeepLinkFetched: () => undefined,
onDeepLinkShown: () => undefined,
});
await dispatchProps.setMsgInProgress(msgData.metamaskId);
await dispatchProps.setWaitForConfirmDeepLinkDialog(true);
await goHome();
return msgData;
} catch (err) {
await dispatchProps.setWaitForConfirmDeepLinkDialog(true);
await dispatchProps.showTransactionsFailedModal({
errorMessage: err.message,
closeNotification: true,
operationFailed: true,
});
return null;
}
}
return sign(opts);
};
///: END:ONLY_INCLUDE_IN
return {
...ownProps,
...dispatchProps,
fromAccount,
txData,
cancel,
///: BEGIN:ONLY_INCLUDE_IN(build-main,build-beta,build-flask)
sign,
///: END:ONLY_INCLUDE_IN
///: BEGIN:ONLY_INCLUDE_IN(build-mmi)
// eslint-disable-next-line no-dupe-keys
sign: signFn,
///: END:ONLY_INCLUDE_IN
isLedgerWallet,
hardwareWalletRequiresConnection,
chainId,

1
ui/components/ui/account-mismatch-warning/__snapshots__/acccount-mismatch-warning.component.test.js.snap
View File

@ -15,6 +15,7 @@ exports[`AccountMismatchWarning should match snapshot of mismatch address warnin
>
<div
class="account-mismatch-warning__tooltip-container-icon"
data-testid="account-mismatch-warning-tooltip"
>
<svg
class="info-icon info-icon--warning"

5
ui/components/ui/account-mismatch-warning/account-mismatch-warning.component.js
View File

@ -21,7 +21,10 @@ export default function AccountMismatchWarning({ address }) {
wrapperClassName="account-mismatch-warning__tooltip-wrapper"
containerClassName="account-mismatch-warning__tooltip-container"
>
<div className="account-mismatch-warning__tooltip-container-icon">
<div
className="account-mismatch-warning__tooltip-container-icon"
data-testid="account-mismatch-warning-tooltip"
>
<InfoIcon severity={SEVERITIES.WARNING} />
</div>
</Tooltip>

2
ui/pages/confirm-decrypt-message/__snapshots__/confirm-decrypt-message.component.test.js.snap
View File

@ -110,6 +110,7 @@ exports[`ConfirmDecryptMessage Component should match snapshot when preference i
>
<div
class="account-mismatch-warning__tooltip-container-icon"
data-testid="account-mismatch-warning-tooltip"
>
<svg
class="info-icon info-icon--warning"
@ -375,6 +376,7 @@ exports[`ConfirmDecryptMessage Component should match snapshot when preference i
>
<div
class="account-mismatch-warning__tooltip-container-icon"
data-testid="account-mismatch-warning-tooltip"
>
<svg
class="info-icon info-icon--warning"

2
ui/pages/confirm-encryption-public-key/__snapshots__/confirm-encryption-public-key.component.test.js.snap
View File

@ -110,6 +110,7 @@ exports[`ConfirmDecryptMessage Component should match snapshot when preference i
>
<div
class="account-mismatch-warning__tooltip-container-icon"
data-testid="account-mismatch-warning-tooltip"
>
<svg
class="info-icon info-icon--warning"
@ -359,6 +360,7 @@ exports[`ConfirmDecryptMessage Component should match snapshot when preference i
>
<div
class="account-mismatch-warning__tooltip-container-icon"
data-testid="account-mismatch-warning-tooltip"
>
<svg
class="info-icon info-icon--warning"

18
ui/store/institutional/institution-background.ts
View File

@ -35,6 +35,22 @@ export function showInteractiveReplacementTokenBanner({
}
};
}
export function setTypedMessageInProgress(msgId: string) {
return async (dispatch: any) => {
dispatch(showLoadingIndication());
try {
await submitRequestToBackground('setTypedMessageInProgress', [msgId]);
} catch (error: any) {
log.error(error);
dispatch(displayWarning(error.message));
} finally {
await forceUpdateMetamaskState(dispatch);
dispatch(hideLoadingIndication());
}
};
}
/**
* A factory that contains all MMI actions ready to use
* Example usage:
@ -49,7 +65,7 @@ export function mmiActionsFactory() {
loadingText?: string,
): ThunkAction<void, MetaMaskReduxState, unknown, AnyAction> {
log.debug(`background.${name}`);
return async (dispatch) => {
return async (dispatch: any) => {
if (loadingText) {
dispatch(showLoadingIndication(loadingText));
}

242
yarn.lock
View File

@ -3653,10 +3653,117 @@ __metadata:
languageName: node
linkType: hard
"@metamask-institutional/portfolio-dashboard@npm:1.1.2":
version: 1.1.2
resolution: "@metamask-institutional/portfolio-dashboard@npm:1.1.2"
checksum: f2e1ec83fe0411f4d2e67dfdf2183f89667f34ae862425ece7b5cd0f4099eb7ae091910d67a3f15b7b5982e87bc80e9f668c25072c3bc5a977377fce14357cd3
"@metamask-institutional/configuration-client@npm:^1.0.6":
version: 1.0.6
resolution: "@metamask-institutional/configuration-client@npm:1.0.6"
checksum: 924ff201a99286aac332402dbc74884a72f5352f29ba066e788cd045b330df7775b2b247731db4ee453f2fee7f2662b61477703e70eb822f044895bdc858f79b
languageName: node
linkType: hard
"@metamask-institutional/custody-controller@npm:^0.2.5":
version: 0.2.6
resolution: "@metamask-institutional/custody-controller@npm:0.2.6"
dependencies:
"@ethereumjs/util": ^8.0.5
"@metamask-institutional/custody-keyring": ^0.0.22
"@metamask-institutional/sdk": ^0.1.15
"@metamask-institutional/types": ^1.0.2
"@metamask/obs-store": ^8.0.0
checksum: 0f1408622e89ad8ec8a95ba6caab60b35e9106c408c26754f730f27694da4f5afc232f44fb1dc4433e6846228de231cf4ed080f416a94c7ce09e8ea0fbdb5dab
languageName: node
linkType: hard
"@metamask-institutional/custody-keyring@npm:^0.0.22":
version: 0.0.22
resolution: "@metamask-institutional/custody-keyring@npm:0.0.22"
dependencies:
"@ethereumjs/tx": ^4.1.1
"@ethereumjs/util": ^8.0.5
"@metamask-institutional/configuration-client": ^1.0.6
"@metamask-institutional/sdk": ^0.1.14
"@metamask-institutional/types": ^1.0.1
"@metamask/obs-store": ^8.0.0
crypto: ^1.0.1
lodash.clonedeep: ^4.5.0
checksum: 8607265efa5aa44333fbc947c87cbec5fd33c1def7f43ba2637b10eee5116c618b339ebcf5d8c042b4698894a70dccf5c36d139c74601d522a453e33ba2258b5
languageName: node
linkType: hard
"@metamask-institutional/extension@npm:^0.1.3":
version: 0.1.3
resolution: "@metamask-institutional/extension@npm:0.1.3"
dependencies:
"@ethereumjs/util": ^8.0.5
"@metamask-institutional/custody-controller": ^0.2.5
"@metamask-institutional/custody-keyring": ^0.0.22
"@metamask-institutional/portfolio-dashboard": ^1.1.3
"@metamask-institutional/sdk": ^0.1.16
"@metamask-institutional/transaction-update": ^0.1.20
"@metamask-institutional/types": ^1.0.2
jest-create-mock-instance: ^2.0.0
jest-fetch-mock: 3.0.3
checksum: a9a4d3183b972b992649081f586a9d92e92d5366afb9be445fcdeb0b9afd99e765e6a8ad63abddc0d222a800c1a6b02e847e0f705908581950cf1bc791be50ca
languageName: node
linkType: hard
"@metamask-institutional/portfolio-dashboard@npm:^1.1.3":
version: 1.1.3
resolution: "@metamask-institutional/portfolio-dashboard@npm:1.1.3"
checksum: ea5918426372f66c5ba575551658ebf443b77e528317aede5d79a21208718d90e756fa86389c366162a58363b38e8d47bed0ebb27938285705723cfa35295287
languageName: node
linkType: hard
"@metamask-institutional/sdk@npm:^0.1.14, @metamask-institutional/sdk@npm:^0.1.15, @metamask-institutional/sdk@npm:^0.1.16":
version: 0.1.17
resolution: "@metamask-institutional/sdk@npm:0.1.17"
dependencies:
"@metamask-institutional/simplecache": ^1.0.2
"@metamask-institutional/types": ^1.0.2
"@types/jsonwebtoken": ^9.0.1
"@types/node": ^18.15.11
bignumber.js: ^9.1.1
jsonwebtoken: ^9.0.0
checksum: 82b3a8038fdf96983846fa884c867ec9497ac4a2a287d8bb2ce4ffde39b6127ce3af8d2adccab5cedf4ed6b1980488f3cc83347237c085f44ed3a0c004f8a183
languageName: node
linkType: hard
"@metamask-institutional/simplecache@npm:^1.0.2":
version: 1.0.2
resolution: "@metamask-institutional/simplecache@npm:1.0.2"
checksum: 65444d49478e14956f884e5423992ad7069c9e8979cdc012db3f8f6f207147816b8f3b45be33007772a9628560b5f054ea52b0eb8a9ee25066abc199260d30b6
languageName: node
linkType: hard
"@metamask-institutional/transaction-update@npm:^0.1.20":
version: 0.1.21
resolution: "@metamask-institutional/transaction-update@npm:0.1.21"
dependencies:
"@metamask-institutional/custody-keyring": ^0.0.22
"@metamask-institutional/sdk": ^0.1.15
"@metamask-institutional/types": ^1.0.2
"@metamask-institutional/websocket-client": ^0.1.23
"@metamask/obs-store": ^8.0.0
ethereumjs-util: ^7.1.5
checksum: 22190a114279e365cdb89a58ae75c610dfa77e7bca365c85544af5f9d6977da0d0f7410b6acc76defdc08b608f6981a54e4df63b66a2e7fd2cd869ce0cd85945
languageName: node
linkType: hard
"@metamask-institutional/types@npm:^1.0.1, @metamask-institutional/types@npm:^1.0.2":
version: 1.0.2
resolution: "@metamask-institutional/types@npm:1.0.2"
checksum: 27bee2dc32a1a8869a2918863d60e4c59b350ad5fcf2d3fbc3fd52b9db2e2af33eb3af568726b72cb7accd7aba2639e9e707522989cc5db9ee8d8f1239f9d6f9
languageName: node
linkType: hard
"@metamask-institutional/websocket-client@npm:^0.1.23":
version: 0.1.23
resolution: "@metamask-institutional/websocket-client@npm:0.1.23"
dependencies:
"@metamask-institutional/custody-keyring": ^0.0.22
"@metamask-institutional/sdk": ^0.1.15
"@metamask-institutional/types": ^1.0.2
mock-socket: ^9.2.1
checksum: 7b7f091ab43287aa12bdfb75ff9ffc4b2272f1e404a3eab3a3a962b777ef47d374fd62ec3227023b858ce5cedabc00b06a9efcd973dbd71226049835236cca5d
languageName: node
linkType: hard
@ -4214,7 +4321,7 @@ __metadata:
languageName: node
linkType: hard
"@metamask/obs-store@npm:^8.1.0":
"@metamask/obs-store@npm:^8.0.0, @metamask/obs-store@npm:^8.1.0":
version: 8.1.0
resolution: "@metamask/obs-store@npm:8.1.0"
dependencies:
@ -7439,6 +7546,15 @@ __metadata:
languageName: node
linkType: hard
"@types/jsonwebtoken@npm:^9.0.1":
version: 9.0.2
resolution: "@types/jsonwebtoken@npm:9.0.2"
dependencies:
"@types/node": "*"
checksum: 3bb8d40e78d7eb53e427db6e9f0f22e0890cfee80965dcf741d08341814913afb211306de6e9847c6d241cc8e36f8a59090cbfdcc510ab7c81af9d650c5afe0e
languageName: node
linkType: hard
"@types/keyv@npm:*":
version: 4.2.0
resolution: "@types/keyv@npm:4.2.0"
@ -7573,10 +7689,10 @@ __metadata:
languageName: node
linkType: hard
"@types/node@npm:*, @types/node@npm:>=13.7.0":
version: 18.7.18
resolution: "@types/node@npm:18.7.18"
checksum: 8aec61f0f96e2a69ce51f1f40f949ca578bbb4fe05d7c0b8ce3aeeb848e90f755837f17f6ac132ca404d974fe9b2974150ad3b4984fc9dc7c3ceddb10bae0167
"@types/node@npm:*, @types/node@npm:>=13.7.0, @types/node@npm:^18.15.11":
version: 18.16.12
resolution: "@types/node@npm:18.16.12"
checksum: 90b316c097a059534870bc8e358c7996d99e3bb4395c88a91b893b925ad34e32ff1177009ec6c16a6467266414dca64ec9613e9e6bb3f91b6de0ab629d3bb3b9
languageName: node
linkType: hard
@ -10937,6 +11053,13 @@ __metadata:
languageName: node
linkType: hard
"buffer-equal-constant-time@npm:1.0.1":
version: 1.0.1
resolution: "buffer-equal-constant-time@npm:1.0.1"
checksum: 80bb945f5d782a56f374b292770901065bad21420e34936ecbe949e57724b4a13874f735850dd1cc61f078773c4fb5493a41391e7bda40d1fa388d6bd80daaab
languageName: node
linkType: hard
"buffer-equal@npm:0.0.1":
version: 0.0.1
resolution: "buffer-equal@npm:0.0.1"
@ -12648,12 +12771,12 @@ __metadata:
languageName: node
linkType: hard
"cross-fetch@npm:^3.1.5":
version: 3.1.5
resolution: "cross-fetch@npm:3.1.5"
"cross-fetch@npm:^3.0.4, cross-fetch@npm:^3.1.5":
version: 3.1.6
resolution: "cross-fetch@npm:3.1.6"
dependencies:
node-fetch: 2.6.7
checksum: f6b8c6ee3ef993ace6277fd789c71b6acf1b504fd5f5c7128df4ef2f125a429e29cd62dc8c127523f04a5f2fa4771ed80e3f3d9695617f441425045f505cf3bb
node-fetch: ^2.6.11
checksum: 704b3519ab7de488328cc49a52cf1aa14132ec748382be5b9557b22398c33ffa7f8c2530e8a97ed8cb55da52b0a9740a9791d361271c4591910501682d981d9c
languageName: node
linkType: hard
@ -12727,6 +12850,13 @@ __metadata:
languageName: node
linkType: hard
"crypto@npm:^1.0.1":
version: 1.0.1
resolution: "crypto@npm:1.0.1"
checksum: 087fe3165bd94c333a49e6ed66a0193911f63eac38a24f379b3001a5fe260a59c413646e53a0f67875ba13902b2686d81dc703cb2c147a4ec727dcdc04e5645e
languageName: node
linkType: hard
"css-loader@npm:^2.1.1":
version: 2.1.1
resolution: "css-loader@npm:2.1.1"
@ -14079,6 +14209,15 @@ __metadata:
languageName: node
linkType: hard
"ecdsa-sig-formatter@npm:1.0.11":
version: 1.0.11
resolution: "ecdsa-sig-formatter@npm:1.0.11"
dependencies:
safe-buffer: ^5.0.1
checksum: 207f9ab1c2669b8e65540bce29506134613dd5f122cccf1e6a560f4d63f2732d427d938f8481df175505aad94583bcb32c688737bb39a6df0625f903d6d93c03
languageName: node
linkType: hard
"eciesjs@npm:^0.3.15":
version: 0.3.16
resolution: "eciesjs@npm:0.3.16"
@ -20597,6 +20736,13 @@ __metadata:
languageName: node
linkType: hard
"jest-create-mock-instance@npm:^2.0.0":
version: 2.0.0
resolution: "jest-create-mock-instance@npm:2.0.0"
checksum: 0e9cbae0834f949e21cad6017551226fbf186cf18d18365f28381a34d4e3b5451fc18e3892ca8e7171f204012f965f344db6d4a998c5eef0abdf2cf71d83c91d
languageName: node
linkType: hard
"jest-diff@npm:^28.1.3":
version: 28.1.3
resolution: "jest-diff@npm:28.1.3"
@ -20709,6 +20855,16 @@ __metadata:
languageName: node
linkType: hard
"jest-fetch-mock@npm:3.0.3":
version: 3.0.3
resolution: "jest-fetch-mock@npm:3.0.3"
dependencies:
cross-fetch: ^3.0.4
promise-polyfill: ^8.1.3
checksum: fb052f7e0ef1c8192a9c15efdd1b18d281ab68fc6b1648b30bff8880fe24418bdf12190ea79b1996932dc15417c3c01f5b2d77ef7104a7e7943e7cbe8d61071d
languageName: node
linkType: hard
"jest-get-type@npm:^28.0.2":
version: 28.0.2
resolution: "jest-get-type@npm:28.0.2"
@ -21835,6 +21991,18 @@ __metadata:
languageName: node
linkType: hard
"jsonwebtoken@npm:^9.0.0":
version: 9.0.0
resolution: "jsonwebtoken@npm:9.0.0"
dependencies:
jws: ^3.2.2
lodash: ^4.17.21
ms: ^2.1.1
semver: ^7.3.8
checksum: b9181cecf9df99f1dc0253f91ba000a1aa4d91f5816d1608c0dba61a5623726a0bfe200b51df25de18c1a6000825d231ad7ce2788aa54fd48dcb760ad9eb9514
languageName: node
linkType: hard
"jsprim@npm:^1.2.2":
version: 1.4.1
resolution: "jsprim@npm:1.4.1"
@ -21990,6 +22158,27 @@ __metadata:
languageName: node
linkType: hard
"jwa@npm:^1.4.1":
version: 1.4.1
resolution: "jwa@npm:1.4.1"
dependencies:
buffer-equal-constant-time: 1.0.1
ecdsa-sig-formatter: 1.0.11
safe-buffer: ^5.0.1
checksum: ff30ea7c2dcc61f3ed2098d868bf89d43701605090c5b21b5544b512843ec6fd9e028381a4dda466cbcdb885c2d1150f7c62e7168394ee07941b4098e1035e2f
languageName: node
linkType: hard
"jws@npm:^3.2.2":
version: 3.2.2
resolution: "jws@npm:3.2.2"
dependencies:
jwa: ^1.4.1
safe-buffer: ^5.0.1
checksum: f0213fe5b79344c56cd443428d8f65c16bf842dc8cb8f5aed693e1e91d79c20741663ad6eff07a6d2c433d1831acc9814e8d7bada6a0471fbb91d09ceb2bf5c2
languageName: node
linkType: hard
"keccak@npm:3.0.1":
version: 3.0.1
resolution: "keccak@npm:3.0.1"
@ -23607,7 +23796,8 @@ __metadata:
"@lavamoat/lavapack": ^5.0.0
"@lavamoat/snow": ^1.5.0
"@material-ui/core": ^4.11.0
"@metamask-institutional/portfolio-dashboard": 1.1.2
"@metamask-institutional/extension": ^0.1.3
"@metamask-institutional/portfolio-dashboard": ^1.1.3
"@metamask/address-book-controller": ^2.0.0
"@metamask/announcement-controller": ^3.0.0
"@metamask/approval-controller": ^2.1.0
@ -24690,6 +24880,13 @@ __metadata:
languageName: node
linkType: hard
"mock-socket@npm:^9.2.1":
version: 9.2.1
resolution: "mock-socket@npm:9.2.1"
checksum: daf07689563163dbcefbefe23b2a9784a75d0af31706f23ad535c6ab2abbcdefa2e91acddeb50a3c39009139e47a8f909cbb38e8137452193ccb9331637fee3e
languageName: node
linkType: hard
"mockttp@npm:^2.6.0":
version: 2.6.0
resolution: "mockttp@npm:2.6.0"
@ -25199,9 +25396,9 @@ __metadata:
languageName: node
linkType: hard
"node-fetch@npm:2.6.7, node-fetch@npm:^2, node-fetch@npm:^2.6.0, node-fetch@npm:^2.6.1, node-fetch@npm:^2.6.7, node-fetch@npm:~2.6.1":
version: 2.6.7
resolution: "node-fetch@npm:2.6.7"
"node-fetch@npm:^2, node-fetch@npm:^2.6.0, node-fetch@npm:^2.6.1, node-fetch@npm:^2.6.11, node-fetch@npm:^2.6.7, node-fetch@npm:~2.6.1":
version: 2.6.11
resolution: "node-fetch@npm:2.6.11"
dependencies:
whatwg-url: ^5.0.0
peerDependencies:
@ -25209,7 +25406,7 @@ __metadata:
peerDependenciesMeta:
encoding:
optional: true
checksum: 8d816ffd1ee22cab8301c7756ef04f3437f18dace86a1dae22cf81db8ef29c0bf6655f3215cb0cdb22b420b6fe141e64b26905e7f33f9377a7fa59135ea3e10b
checksum: 249d0666a9497553384d46b5ab296ba223521ac88fed4d8a17d6ee6c2efb0fc890f3e8091cafe7f9fba8151a5b8d925db2671543b3409a56c3cd522b468b47b3
languageName: node
linkType: hard
@ -27478,6 +27675,13 @@ __metadata:
languageName: node
linkType: hard
"promise-polyfill@npm:^8.1.3":
version: 8.3.0
resolution: "promise-polyfill@npm:8.3.0"
checksum: 206373802076c77def0805758d0a8ece64120dfa6603f092404a1004211f8f2f67f33cadbc35953fc2a8ed0b0d38c774e88bdf01e20ce7a920723a60df84b7a5
languageName: node
linkType: hard
"promise-retry@npm:^2.0.1":
version: 2.0.1
resolution: "promise-retry@npm:2.0.1"