mirror of
https://github.com/kremalicious/metamask-extension.git
synced 2024-11-24 11:01:41 +01:00
9d70c60c22
* Connect ledger via webhid if that option is available * Explicitly setting preference for webhid * Use ledgerTransportType enum instead of booleans for ledger live and webhid preferences * Use single setLEdgerTransport preference methods and property * Temp * Lint fix * Unit test fix * Remove async keyword from setLedgerTransportPreference function definition in preferences controller * Fix ledgelive setting toggle logic * Migrate useLedgerLive preference property to ledgerTransportType * Use shared constants for ledger transport type enums * Use constant for ledger usb vendor id * Use correct property to check if ledgerLive preference is set when deciding whether to ask for webhid connection * Update eth-ledger-bridge-keyring to v0.9.0 * Only show ledger live transaction helper messages if using ledger live * Only show ledger live part of tutorial if ledger live setting is on * Fix ledger related prop type errors * Explicitly use u2f enum instead of empty string as a transport type; default transport type to webhid if available; use constants for u2f and webhid * Cleanup * Wrap ledger webhid device request in try/catch * Clean up * Lint fix * Ensure user can easily connect their ledger wallet when they need to. * Fix locales * Fix/improve locales changes * Remove unused isFirefox property from confirm-transaction-base.container.js * Disable transaction and message signing confirmation if ledger webhid requires connection * Ensure translation keys for ledger connection options in settings dropdown can be properly detected by verify-locales * Drop .component from ledger-instruction-field file name * Move renderLedgerLiveStep to module scope * Remove ledgerLive from function and message names in ledger-instruction-field * Wrap ledger connection logic in ledger-instruction-field in try catch * Clean up signature-request.component.js * Check whether the signing address, and not the selected address, is a ledger account in singature-request.container * Ensure ledger instructions and webhid connection button are shown on signature-request-original signatures * Improve webhid selection handling in select-ledger-transport-type onChange handler * Move metamask redux focused ledger selectors to metamask duck * Lint fix * Use async await in checkWebHidStatusRef.current * Remove unnecessary use of ref in ledger-instruction-field.js * Lint fix * Remove unnecessary try/catch in ledger-instruction-field.js * Check if from address, not selected address, is from a ledger account in confirm-approve * Move findKeyringForAddress to metamask duck * Fix typo in function name * Ensure isEqualCaseInsensitive handles possible differences in address casing * Fix Learn More link size in advanced settings tab * Update app/scripts/migrations/066.js Co-authored-by: Mark Stacey <markjstacey@gmail.com> * Update ui/pages/settings/advanced-tab/advanced-tab.component.test.js Co-authored-by: Mark Stacey <markjstacey@gmail.com> * Add jsdoc comments for new selectors * Use jest.spyOn for mocking navigator in ledger webhid migration tests * Use LEDGER_TRANSPORT_TYPES values to set proptype of ledgerTransportType * Use LEDGER_TRANSPORT_TYPES values to set proptype of ledgerTransportType * Fix font size of link in ledger connection description in advanced settings * Fix return type in setLedgerTransportPreference comment * Clean up connectHardware code for webhid connection in actions.js * Update app/scripts/migrations/066.test.js Co-authored-by: Mark Stacey <markjstacey@gmail.com> * Update ui/ducks/metamask/metamask.js Co-authored-by: Mark Stacey <markjstacey@gmail.com> * Add migration test for when useLedgerLive is true in a browser that supports webhid * Lint fix * Fix inline-link size Co-authored-by: Mark Stacey <markjstacey@gmail.com>
150 lines
4.3 KiB
JavaScript
150 lines
4.3 KiB
JavaScript
import React, { PureComponent } from 'react';
|
|
import PropTypes from 'prop-types';
|
|
import { getEnvironmentType } from '../../../../app/scripts/lib/util';
|
|
import Identicon from '../../ui/identicon';
|
|
import LedgerInstructionField from '../ledger-instruction-field';
|
|
import Header from './signature-request-header';
|
|
import Footer from './signature-request-footer';
|
|
import Message from './signature-request-message';
|
|
import { ENVIRONMENT_TYPE_NOTIFICATION } from './signature-request.constants';
|
|
|
|
export default class SignatureRequest extends PureComponent {
|
|
static propTypes = {
|
|
txData: PropTypes.object.isRequired,
|
|
fromAccount: PropTypes.shape({
|
|
address: PropTypes.string.isRequired,
|
|
balance: PropTypes.string,
|
|
name: PropTypes.string,
|
|
}).isRequired,
|
|
isLedgerWallet: PropTypes.bool,
|
|
clearConfirmTransaction: PropTypes.func.isRequired,
|
|
cancel: PropTypes.func.isRequired,
|
|
sign: PropTypes.func.isRequired,
|
|
hardwareWalletRequiresConnection: PropTypes.func.isRequired,
|
|
};
|
|
|
|
static contextTypes = {
|
|
t: PropTypes.func,
|
|
metricsEvent: PropTypes.func,
|
|
};
|
|
|
|
componentDidMount() {
|
|
if (getEnvironmentType() === ENVIRONMENT_TYPE_NOTIFICATION) {
|
|
window.addEventListener('beforeunload', this._beforeUnload);
|
|
}
|
|
}
|
|
|
|
_beforeUnload = (event) => {
|
|
const {
|
|
clearConfirmTransaction,
|
|
cancel,
|
|
txData: { type },
|
|
} = this.props;
|
|
const { metricsEvent } = this.context;
|
|
metricsEvent({
|
|
eventOpts: {
|
|
category: 'Transactions',
|
|
action: 'Sign Request',
|
|
name: 'Cancel Sig Request Via Notification Close',
|
|
},
|
|
customVariables: {
|
|
type,
|
|
},
|
|
});
|
|
clearConfirmTransaction();
|
|
cancel(event);
|
|
};
|
|
|
|
formatWallet(wallet) {
|
|
return `${wallet.slice(0, 8)}...${wallet.slice(
|
|
wallet.length - 8,
|
|
wallet.length,
|
|
)}`;
|
|
}
|
|
|
|
render() {
|
|
const {
|
|
fromAccount,
|
|
txData: {
|
|
msgParams: { data, origin, version },
|
|
type,
|
|
},
|
|
cancel,
|
|
sign,
|
|
isLedgerWallet,
|
|
hardwareWalletRequiresConnection,
|
|
} = this.props;
|
|
const { address: fromAddress } = fromAccount;
|
|
const { message, domain = {} } = JSON.parse(data);
|
|
const { metricsEvent } = this.context;
|
|
|
|
const onSign = (event) => {
|
|
window.removeEventListener('beforeunload', this._beforeUnload);
|
|
sign(event);
|
|
metricsEvent({
|
|
eventOpts: {
|
|
category: 'Transactions',
|
|
action: 'Sign Request',
|
|
name: 'Confirm',
|
|
},
|
|
customVariables: {
|
|
type,
|
|
version,
|
|
},
|
|
});
|
|
};
|
|
|
|
const onCancel = (event) => {
|
|
window.removeEventListener('beforeunload', this._beforeUnload);
|
|
cancel(event);
|
|
metricsEvent({
|
|
eventOpts: {
|
|
category: 'Transactions',
|
|
action: 'Sign Request',
|
|
name: 'Cancel',
|
|
},
|
|
customVariables: {
|
|
type,
|
|
version,
|
|
},
|
|
});
|
|
};
|
|
|
|
return (
|
|
<div className="signature-request page-container">
|
|
<Header fromAccount={fromAccount} />
|
|
<div className="signature-request-content">
|
|
<div className="signature-request-content__title">
|
|
{this.context.t('sigRequest')}
|
|
</div>
|
|
<div className="signature-request-content__identicon-container">
|
|
<div className="signature-request-content__identicon-initial">
|
|
{domain.name && domain.name[0]}
|
|
</div>
|
|
<div className="signature-request-content__identicon-border" />
|
|
<Identicon address={fromAddress} diameter={70} />
|
|
</div>
|
|
<div className="signature-request-content__info--bolded">
|
|
{domain.name}
|
|
</div>
|
|
<div className="signature-request-content__info">{origin}</div>
|
|
<div className="signature-request-content__info">
|
|
{this.formatWallet(fromAddress)}
|
|
</div>
|
|
</div>
|
|
{isLedgerWallet ? (
|
|
<div className="confirm-approve-content__ledger-instruction-wrapper">
|
|
<LedgerInstructionField showDataInstruction />
|
|
</div>
|
|
) : null}
|
|
<Message data={message} />
|
|
<Footer
|
|
cancelAction={onCancel}
|
|
signAction={onSign}
|
|
disabled={hardwareWalletRequiresConnection}
|
|
/>
|
|
</div>
|
|
);
|
|
}
|
|
}
|