diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json index cbc845506..50c923b3f 100644 --- a/app/_locales/en/messages.json +++ b/app/_locales/en/messages.json @@ -345,10 +345,6 @@ "chromeRequiredForHardwareWallets": { "message": "You need to use MetaMask on Google Chrome in order to connect to your Hardware Wallet." }, - "clickToConnectLedgerViaWebHID": { - "message": "Click here to connect your Ledger via WebHID", - "description": "Text that can be clicked to open a browser popup for connecting the ledger device via webhid" - }, "clickToRevealSeed": { "message": "Click here to reveal secret words" }, @@ -1255,42 +1251,36 @@ "ledgerAccountRestriction": { "message": "You need to make use your last account before you can add a new one." }, - "ledgerConnectionInstructionHeader": { - "message": "Prior to clicking confirm:" + "ledgerLiveAdvancedSetting": { + "message": "Use Ledger Live" }, - "ledgerConnectionInstructionStepFour": { - "message": "Enable \"smart contract data\" or \"blind signing\" on your Ledger device" - }, - "ledgerConnectionInstructionStepOne": { - "message": "Enable Use Ledger Live under Settings > Advanced" - }, - "ledgerConnectionInstructionStepThree": { - "message": "Plug in your Ledger device and select the Ethereum app" - }, - "ledgerConnectionInstructionStepTwo": { - "message": "Open and unlock Ledger Live App" - }, - "ledgerConnectionPreferenceDescription": { - "message": "Customize how you connect your Ledger to MetaMask. $1 is recommended, but other options are available. Read more here: $2", - "description": "A description that appears above a dropdown where users can select between up to three options - Ledger Live, U2F or WebHID - depending on what is supported in their browser. $1 is the recommended browser option, it will be either WebHID or U2f. $2 is a link to an article where users can learn more, but will be the translation of the learnMore message." - }, - "ledgerLive": { - "message": "Ledger Live", - "description": "The name of a desktop app that can be used with your ledger device. We can also use it to connect a users Ledger device to MetaMask." + "ledgerLiveAdvancedSettingDescription": { + "message": "The new Ledger Live bridge allows you to more easily use your Ledger. Only available in Chrome." }, "ledgerLiveApp": { "message": "Ledger Live App" }, + "ledgerLiveDialogHeader": { + "message": "Prior to clicking confirm:" + }, + "ledgerLiveDialogStepFour": { + "message": "Enable \"smart contract data\" or \"blind signing\" on your Ledger device" + }, + "ledgerLiveDialogStepOne": { + "message": "Enable Use Ledger Live under Settings > Advanced" + }, + "ledgerLiveDialogStepThree": { + "message": "Plug in your Ledger device and select the Ethereum app" + }, + "ledgerLiveDialogStepTwo": { + "message": "Open and unlock Ledger Live App" + }, "ledgerLocked": { "message": "Cannot connect to Ledger device. Please make sure your device is unlocked and Ethereum app is opened." }, "ledgerTimeout": { "message": "Ledger Live is taking too long to respond or connection timeout. Make sure Ledger Live app is opened and your device is unlocked." }, - "ledgerWebHIDNotConnectedErrorMessage": { - "message": "The ledger device was not connected. If you wish to connect your Ledger, please click 'Continue' again and approve HID connection", - "description": "An error message shown to the user during the hardware connect flow." - }, "letsGoSetUp": { "message": "Yes, let’s get set up!" }, @@ -1720,10 +1710,6 @@ "onlyConnectTrust": { "message": "Only connect with sites you trust." }, - "openFullScreenForLedgerWebHid": { - "message": "Open MetaMask in full screen to connect your ledger via WebHID.", - "description": "Shown to the user on the confirm screen when they are viewing MetaMask in a popup window but need to connect their ledger via webhid." - }, "optional": { "message": "Optional" }, @@ -1786,10 +1772,6 @@ "message": "+ $1 more", "description": "$1 is a number of additional but unshown items in a list- this message will be shown in place of those items" }, - "preferredLedgerConnectionType": { - "message": "Preferred Ledger Connection Type", - "description": "A header for a dropdown in the advanced section of settings. Appears above the ledgerConnectionPreferenceDescription message" - }, "prev": { "message": "Prev" }, @@ -2835,10 +2817,6 @@ "typePassword": { "message": "Type your MetaMask password" }, - "u2f": { - "message": "U2F", - "description": "A name on an API for the browser to interact with devices that support the U2F protocol. On some browsers we use it to connect MetaMask to Ledger devices." - }, "unapproved": { "message": "Unapproved" }, @@ -2980,10 +2958,6 @@ "message": "We noticed that the current website tried to use the removed window.web3 API. If the site appears to be broken, please click $1 for more information.", "description": "$1 is a clickable link." }, - "webhid": { - "message": "WebHID", - "description": "Refers to a interface for connecting external devices to the browser. Used for connecting ledger to the browser. Read more here https://developer.mozilla.org/en-US/docs/Web/API/WebHID_API" - }, "welcome": { "message": "Welcome to MetaMask" }, diff --git a/app/_locales/es/messages.json b/app/_locales/es/messages.json index 63d07557d..f98631f54 100644 --- a/app/_locales/es/messages.json +++ b/app/_locales/es/messages.json @@ -1004,6 +1004,12 @@ "ledgerAccountRestriction": { "message": "Debe usar su última cuenta antes de poder agregar una nueva." }, + "ledgerLiveAdvancedSetting": { + "message": "Utilizar Ledger Live" + }, + "ledgerLiveAdvancedSettingDescription": { + "message": "El nuevo puente Ledger Live le permite utilizar su Ledger de forma más sencilla. Disponible solo en Google Chrome." + }, "ledgerLiveApp": { "message": "Aplicación de Ledger Live" }, diff --git a/app/_locales/es_419/messages.json b/app/_locales/es_419/messages.json index 63d07557d..f98631f54 100644 --- a/app/_locales/es_419/messages.json +++ b/app/_locales/es_419/messages.json @@ -1004,6 +1004,12 @@ "ledgerAccountRestriction": { "message": "Debe usar su última cuenta antes de poder agregar una nueva." }, + "ledgerLiveAdvancedSetting": { + "message": "Utilizar Ledger Live" + }, + "ledgerLiveAdvancedSettingDescription": { + "message": "El nuevo puente Ledger Live le permite utilizar su Ledger de forma más sencilla. Disponible solo en Google Chrome." + }, "ledgerLiveApp": { "message": "Aplicación de Ledger Live" }, diff --git a/app/_locales/hi/messages.json b/app/_locales/hi/messages.json index 217bdeca4..18147a08b 100644 --- a/app/_locales/hi/messages.json +++ b/app/_locales/hi/messages.json @@ -1004,6 +1004,12 @@ "ledgerAccountRestriction": { "message": "नया खाता जोड़ने से पहले आपको अपने अंतिम खाते का उपयोग करना होगा।" }, + "ledgerLiveAdvancedSetting": { + "message": "Ledger Live का उपयोग करें" + }, + "ledgerLiveAdvancedSettingDescription": { + "message": "नया Ledger Live ब्रिज आपको अपने लेजर का अधिक आसानी से उपयोग करने की अनुमति देता है। केवल Chrome में उपलब्ध है।" + }, "ledgerLiveApp": { "message": "Ledger Live ऐप" }, diff --git a/app/_locales/id/messages.json b/app/_locales/id/messages.json index 915ebf125..529c98ed1 100644 --- a/app/_locales/id/messages.json +++ b/app/_locales/id/messages.json @@ -1004,6 +1004,12 @@ "ledgerAccountRestriction": { "message": "Anda perlu memanfaatkan akun terakhir Anda sebelum menambahkan yang baru." }, + "ledgerLiveAdvancedSetting": { + "message": "Gunakan Ledger Live" + }, + "ledgerLiveAdvancedSettingDescription": { + "message": "Jembatan Ledger Live baru memungkinkan Anda untuk menggunakan Ledger Anda dengan lebih mudah. Hanya tersedia di Chrome." + }, "ledgerLiveApp": { "message": "Aplikasi Ledger Live" }, diff --git a/app/_locales/ja/messages.json b/app/_locales/ja/messages.json index a3af48c46..f9e1d125a 100644 --- a/app/_locales/ja/messages.json +++ b/app/_locales/ja/messages.json @@ -1004,6 +1004,12 @@ "ledgerAccountRestriction": { "message": "新しいアカウントを追加するには、その前に最後のアカウントを使用する必要があります。" }, + "ledgerLiveAdvancedSetting": { + "message": "レジャー ライブを使用" + }, + "ledgerLiveAdvancedSettingDescription": { + "message": "新しいレジャー ライブのブリッジを使用すると、レジャーをより簡単に使用できます。Chrome でのみ利用可能。" + }, "ledgerLiveApp": { "message": "レジャー ライブのアプリ" }, diff --git a/app/_locales/ko/messages.json b/app/_locales/ko/messages.json index 9ba61d76e..96ad9f3fa 100644 --- a/app/_locales/ko/messages.json +++ b/app/_locales/ko/messages.json @@ -1004,6 +1004,12 @@ "ledgerAccountRestriction": { "message": "새 계정을 추가하려면 먼저 마지막 계정을 사용해야 합니다." }, + "ledgerLiveAdvancedSetting": { + "message": "Ledger Live 사용하기" + }, + "ledgerLiveAdvancedSettingDescription": { + "message": "새로운 Ledger Live 브리지를 통해 Ledger를 더 쉽게 사용할 수 있습니다. Chrome에서만 사용 가능합니다." + }, "ledgerLiveApp": { "message": "Ledger Live 앱" }, diff --git a/app/_locales/ph/messages.json b/app/_locales/ph/messages.json index c7d40dd55..d42c1aa80 100644 --- a/app/_locales/ph/messages.json +++ b/app/_locales/ph/messages.json @@ -1004,6 +1004,12 @@ "ledgerAccountRestriction": { "message": "Kailangan mong gamitin ang huli mong account bago ka magdagdag ng panibago." }, + "ledgerLiveAdvancedSetting": { + "message": "Gamitin ang Ledger Live" + }, + "ledgerLiveAdvancedSettingDescription": { + "message": "Binibigyang-daan ka ng bagong Ledger Live bridge na mas madaling magamit ang iyong Ledger. Available lang sa Chrome." + }, "ledgerLiveApp": { "message": "Ledger Live App" }, diff --git a/app/_locales/pt_BR/messages.json b/app/_locales/pt_BR/messages.json index 40bde73d3..9e326c99f 100644 --- a/app/_locales/pt_BR/messages.json +++ b/app/_locales/pt_BR/messages.json @@ -1004,6 +1004,12 @@ "ledgerAccountRestriction": { "message": "Você precisa usar sua última conta antes de adicionar uma nova." }, + "ledgerLiveAdvancedSetting": { + "message": "Usar Ledger Live" + }, + "ledgerLiveAdvancedSettingDescription": { + "message": "A nova ponte do Ledger Live permite utilizar seu Ledger mais facilmente. Disponível somente no Chrome." + }, "ledgerLiveApp": { "message": "Aplicativo Ledger Live" }, diff --git a/app/_locales/ru/messages.json b/app/_locales/ru/messages.json index 881ee1042..054f5e100 100644 --- a/app/_locales/ru/messages.json +++ b/app/_locales/ru/messages.json @@ -1004,6 +1004,12 @@ "ledgerAccountRestriction": { "message": "Вам необходимо использовать свой последний счет, прежде чем вы сможете добавить новый." }, + "ledgerLiveAdvancedSetting": { + "message": "Использовать Ledger Live" + }, + "ledgerLiveAdvancedSettingDescription": { + "message": "Новое решение Ledger Live Bridge упрощает использование Ledger. Доступно только в Chrome." + }, "ledgerLiveApp": { "message": "Приложение Ledger Live" }, diff --git a/app/_locales/vi/messages.json b/app/_locales/vi/messages.json index a1f78fa6d..56ed93266 100644 --- a/app/_locales/vi/messages.json +++ b/app/_locales/vi/messages.json @@ -1004,6 +1004,12 @@ "ledgerAccountRestriction": { "message": "Bạn cần sử dụng tài khoản gần đây nhất thì mới có thể thêm một tài khoản mới." }, + "ledgerLiveAdvancedSetting": { + "message": "Dùng Ledger Live" + }, + "ledgerLiveAdvancedSettingDescription": { + "message": "Cầu Ledger Live mới cho phép bạn dùng Ledger dễ dàng hơn. Chỉ có trong Chrome." + }, "ledgerLiveApp": { "message": "Ứng dụng Ledger Live" }, diff --git a/app/scripts/controllers/preferences.js b/app/scripts/controllers/preferences.js index 41630cce3..7f5d59ba6 100644 --- a/app/scripts/controllers/preferences.js +++ b/app/scripts/controllers/preferences.js @@ -5,7 +5,6 @@ import { ethers } from 'ethers'; import log from 'loglevel'; import { NETWORK_TYPE_TO_ID_MAP } from '../../../shared/constants/network'; import { isPrefixedFormattedHexString } from '../../../shared/modules/network.utils'; -import { LEDGER_TRANSPORT_TYPES } from '../../../shared/constants/hardware-wallets'; import { NETWORK_EVENTS } from './network'; export default class PreferencesController { @@ -59,9 +58,7 @@ export default class PreferencesController { // ENS decentralized website resolution ipfsGateway: 'dweb.link', infuraBlocked: null, - ledgerTransportType: window.navigator.hid - ? LEDGER_TRANSPORT_TYPES.WEBHID - : LEDGER_TRANSPORT_TYPES.U2F, + useLedgerLive: false, ...opts.initState, }; @@ -519,21 +516,21 @@ export default class PreferencesController { } /** - * A setter for the `useWebHid` property - * @param {string} ledgerTransportType - Either 'ledgerLive', 'webhid' or 'u2f' - * @returns {string} The transport type that was set. + * A setter for the `useLedgerLive` property + * @param {bool} useLedgerLive - Value for ledger live support + * @returns {Promise} A promise of the update to useLedgerLive */ - setLedgerTransportPreference(ledgerTransportType) { - this.store.updateState({ ledgerTransportType }); - return ledgerTransportType; + async setLedgerLivePreference(useLedgerLive) { + this.store.updateState({ useLedgerLive }); + return useLedgerLive; } /** - * A getter for the `ledgerTransportType` property - * @returns {boolean} User preference of using WebHid to connect Ledger + * A getter for the `useLedgerLive` property + * @returns {boolean} User preference of using Ledger Live */ - getLedgerTransportPreference() { - return this.store.getState().ledgerTransportType; + getLedgerLivePreference() { + return this.store.getState().useLedgerLive; } /** diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js index e0813fcff..f28c16bf3 100644 --- a/app/scripts/metamask-controller.js +++ b/app/scripts/metamask-controller.js @@ -841,10 +841,7 @@ export default class MetamaskController extends EventEmitter { this.unlockHardwareWalletAccount, this, ), - setLedgerTransportPreference: nodeify( - this.setLedgerTransportPreference, - this, - ), + setLedgerLivePreference: nodeify(this.setLedgerLivePreference, this), // mobile fetchInfoToSync: nodeify(this.fetchInfoToSync, this), @@ -1483,9 +1480,9 @@ export default class MetamaskController extends EventEmitter { // keyring's iframe and have the setting initialized properly // Optimistically called to not block Metamask login due to // Ledger Keyring GitHub downtime - const transportPreference = this.preferencesController.getLedgerTransportPreference(); - - this.setLedgerTransportPreference(transportPreference); + this.setLedgerLivePreference( + this.preferencesController.getLedgerLivePreference(), + ); return this.keyringController.fullUpdate(); } @@ -2987,18 +2984,16 @@ export default class MetamaskController extends EventEmitter { * Sets the Ledger Live preference to use for Ledger hardware wallet support * @param {bool} bool - the value representing if the users wants to use Ledger Live */ - async setLedgerTransportPreference(transportType) { - const currentValue = this.preferencesController.getLedgerTransportPreference(); - const newValue = this.preferencesController.setLedgerTransportPreference( - transportType, - ); + async setLedgerLivePreference(bool) { + const currentValue = this.preferencesController.getLedgerLivePreference(); + this.preferencesController.setLedgerLivePreference(bool); const keyring = await this.getKeyringForDevice('ledger'); if (keyring?.updateTransportMethod) { - return keyring.updateTransportMethod(newValue).catch((e) => { + return keyring.updateTransportMethod(bool).catch((e) => { // If there was an error updating the transport, we should // fall back to the original value - this.preferencesController.setLedgerTransportPreference(currentValue); + this.preferencesController.setLedgerLivePreference(currentValue); throw e; }); } diff --git a/app/scripts/migrations/066.js b/app/scripts/migrations/066.js deleted file mode 100644 index 31c109ba7..000000000 --- a/app/scripts/migrations/066.js +++ /dev/null @@ -1,37 +0,0 @@ -import { cloneDeep } from 'lodash'; -import { LEDGER_TRANSPORT_TYPES } from '../../../shared/constants/hardware-wallets'; - -const version = 66; - -/** - * Changes the useLedgerLive boolean property to the ledgerTransportType enum - */ -export default { - version, - async migrate(originalVersionedData) { - const versionedData = cloneDeep(originalVersionedData); - versionedData.meta.version = version; - const state = versionedData.data; - const newState = transformState(state); - versionedData.data = newState; - return versionedData; - }, -}; - -function transformState(state) { - const defaultTransportType = window.navigator.hid - ? LEDGER_TRANSPORT_TYPES.WEBHID - : LEDGER_TRANSPORT_TYPES.U2F; - const useLedgerLive = Boolean(state.PreferencesController?.useLedgerLive); - const newState = { - ...state, - PreferencesController: { - ...state?.PreferencesController, - ledgerTransportType: useLedgerLive - ? LEDGER_TRANSPORT_TYPES.LIVE - : defaultTransportType, - }, - }; - delete newState.PreferencesController.useLedgerLive; - return newState; -} diff --git a/app/scripts/migrations/066.test.js b/app/scripts/migrations/066.test.js deleted file mode 100644 index 24af0ba45..000000000 --- a/app/scripts/migrations/066.test.js +++ /dev/null @@ -1,116 +0,0 @@ -import { LEDGER_TRANSPORT_TYPES } from '../../../shared/constants/hardware-wallets'; -import migration66 from './066'; - -describe('migration #66', () => { - beforeEach(() => { - jest.resetAllMocks(); - }); - - it('should update the version metadata', async () => { - const oldStorage = { - meta: { - version: 65, - }, - data: {}, - }; - - const newStorage = await migration66.migrate(oldStorage); - expect(newStorage.meta).toStrictEqual({ - version: 66, - }); - }); - - it('should set ledgerTransportType to `u2f` if no preferences controller exists and webhid is not available', async () => { - const oldStorage = { - meta: {}, - data: {}, - }; - - const newStorage = await migration66.migrate(oldStorage); - expect( - newStorage.data.PreferencesController.ledgerTransportType, - ).toStrictEqual(LEDGER_TRANSPORT_TYPES.U2F); - }); - - it('should set ledgerTransportType to `u2f` if no useLedgerLive property exists and webhid is not available', async () => { - const oldStorage = { - meta: {}, - data: { - PreferencesController: {}, - }, - }; - - const newStorage = await migration66.migrate(oldStorage); - expect( - newStorage.data.PreferencesController.ledgerTransportType, - ).toStrictEqual(LEDGER_TRANSPORT_TYPES.U2F); - }); - - it('should set ledgerTransportType to `u2f` if useLedgerLive is false and webhid is not available', async () => { - const oldStorage = { - meta: {}, - data: { - PreferencesController: { - useLedgerLive: false, - }, - }, - }; - - const newStorage = await migration66.migrate(oldStorage); - expect( - newStorage.data.PreferencesController.ledgerTransportType, - ).toStrictEqual(LEDGER_TRANSPORT_TYPES.U2F); - }); - - it('should set ledgerTransportType to `webhid` if useLedgerLive is false and webhid is available', async () => { - const oldStorage = { - meta: {}, - data: { - PreferencesController: { - useLedgerLive: false, - }, - }, - }; - jest - .spyOn(window, 'navigator', 'get') - .mockImplementation(() => ({ hid: true })); - const newStorage = await migration66.migrate(oldStorage); - expect( - newStorage.data.PreferencesController.ledgerTransportType, - ).toStrictEqual(LEDGER_TRANSPORT_TYPES.WEBHID); - }); - - it('should set ledgerTransportType to `ledgerLive` if useLedgerLive is true', async () => { - const oldStorage = { - meta: {}, - data: { - PreferencesController: { - useLedgerLive: true, - }, - }, - }; - - const newStorage = await migration66.migrate(oldStorage); - expect( - newStorage.data.PreferencesController.ledgerTransportType, - ).toStrictEqual('ledgerLive'); - }); - - it('should not change ledgerTransportType if useLedgerLive is true and webhid is available', async () => { - const oldStorage = { - meta: {}, - data: { - PreferencesController: { - useLedgerLive: true, - }, - }, - }; - jest - .spyOn(window, 'navigator', 'get') - .mockImplementation(() => ({ hid: true })); - const newStorage = await migration66.migrate(oldStorage); - expect( - newStorage.data.PreferencesController.ledgerTransportType, - ).toStrictEqual(LEDGER_TRANSPORT_TYPES.LIVE); - }); -}); diff --git a/app/scripts/migrations/index.js b/app/scripts/migrations/index.js index 7baf840e3..6ca02a881 100644 --- a/app/scripts/migrations/index.js +++ b/app/scripts/migrations/index.js @@ -69,7 +69,6 @@ import m062 from './062'; import m063 from './063'; import m064 from './064'; import m065 from './065'; -import m066 from './066'; const migrations = [ m002, @@ -136,7 +135,6 @@ const migrations = [ m063, m064, m065, - m066, ]; export default migrations; diff --git a/app/scripts/platforms/extension.js b/app/scripts/platforms/extension.js index eeaea008d..145e04c88 100644 --- a/app/scripts/platforms/extension.js +++ b/app/scripts/platforms/extension.js @@ -111,11 +111,7 @@ export default class ExtensionPlatform { return version; } - openExtensionInBrowser( - route = null, - queryString = null, - keepWindowOpen = false, - ) { + openExtensionInBrowser(route = null, queryString = null) { let extensionURL = extension.runtime.getURL('home.html'); if (queryString) { @@ -126,10 +122,7 @@ export default class ExtensionPlatform { extensionURL += `#${route}`; } this.openTab({ url: extensionURL }); - if ( - getEnvironmentType() !== ENVIRONMENT_TYPE_BACKGROUND && - !keepWindowOpen - ) { + if (getEnvironmentType() !== ENVIRONMENT_TYPE_BACKGROUND) { window.close(); } } diff --git a/package.json b/package.json index 92d3e5002..9059f6338 100644 --- a/package.json +++ b/package.json @@ -105,7 +105,7 @@ "@material-ui/core": "^4.11.0", "@metamask/contract-metadata": "^1.28.0", "@metamask/controllers": "^17.0.0", - "@metamask/eth-ledger-bridge-keyring": "^0.9.0", + "@metamask/eth-ledger-bridge-keyring": "^0.7.0", "@metamask/eth-token-tracker": "^3.0.1", "@metamask/etherscan-link": "^2.1.0", "@metamask/jazzicon": "^2.0.0", diff --git a/shared/constants/hardware-wallets.js b/shared/constants/hardware-wallets.js index e780555fc..880efb5b2 100644 --- a/shared/constants/hardware-wallets.js +++ b/shared/constants/hardware-wallets.js @@ -7,20 +7,3 @@ export const KEYRING_TYPES = { LEDGER: 'Ledger Hardware', TREZOR: 'Trezor Hardware', }; - -/** - * Used for setting the users preference for ledger transport type - */ -export const LEDGER_TRANSPORT_TYPES = { - LIVE: 'ledgerLive', - WEBHID: 'webhid', - U2F: 'u2f', -}; - -export const LEDGER_USB_VENDOR_ID = '0x2c97'; - -export const WEBHID_CONNECTED_STATUSES = { - CONNECTED: 'connected', - NOT_CONNECTED: 'notConnected', - UNKNOWN: 'unknown', -}; diff --git a/ui/components/app/ledger-instruction-field/index.js b/ui/components/app/ledger-instruction-field/index.js deleted file mode 100644 index a4ae8131f..000000000 --- a/ui/components/app/ledger-instruction-field/index.js +++ /dev/null @@ -1 +0,0 @@ -export { default } from './ledger-instruction-field'; diff --git a/ui/components/app/ledger-instruction-field/ledger-instruction-field.js b/ui/components/app/ledger-instruction-field/ledger-instruction-field.js deleted file mode 100644 index 960b6ca07..000000000 --- a/ui/components/app/ledger-instruction-field/ledger-instruction-field.js +++ /dev/null @@ -1,153 +0,0 @@ -import React, { useEffect } from 'react'; -import { useDispatch, useSelector } from 'react-redux'; -import PropTypes from 'prop-types'; -import { - LEDGER_TRANSPORT_TYPES, - LEDGER_USB_VENDOR_ID, - WEBHID_CONNECTED_STATUSES, -} from '../../../../shared/constants/hardware-wallets'; -import { - PLATFORM_FIREFOX, - ENVIRONMENT_TYPE_FULLSCREEN, -} from '../../../../shared/constants/app'; - -import { - setLedgerWebHidConnectedStatus, - getLedgerWebHidConnectedStatus, -} from '../../../ducks/app/app'; - -import Typography from '../../ui/typography/typography'; -import Button from '../../ui/button'; -import { useI18nContext } from '../../../hooks/useI18nContext'; -import { - COLORS, - FONT_WEIGHT, - TYPOGRAPHY, -} from '../../../helpers/constants/design-system'; -import Dialog from '../../ui/dialog'; -import { - getPlatform, - getEnvironmentType, -} from '../../../../app/scripts/lib/util'; -import { getLedgerTransportType } from '../../../ducks/metamask/metamask'; - -const renderInstructionStep = (text, show = true, color = COLORS.PRIMARY3) => { - return ( - show && ( - - {text} - - ) - ); -}; - -export default function LedgerInstructionField({ showDataInstruction }) { - const t = useI18nContext(); - const dispatch = useDispatch(); - - const webHidConnectedStatus = useSelector(getLedgerWebHidConnectedStatus); - const ledgerTransportType = useSelector(getLedgerTransportType); - const environmentType = getEnvironmentType(); - const environmentTypeIsFullScreen = - environmentType === ENVIRONMENT_TYPE_FULLSCREEN; - - useEffect(() => { - const initialConnectedDeviceCheck = async () => { - if ( - ledgerTransportType === LEDGER_TRANSPORT_TYPES.WEBHID && - webHidConnectedStatus !== WEBHID_CONNECTED_STATUSES.CONNECTED - ) { - const devices = await window.navigator.hid.getDevices(); - const webHidIsConnected = devices.some( - (device) => device.vendorId === Number(LEDGER_USB_VENDOR_ID), - ); - dispatch( - setLedgerWebHidConnectedStatus( - webHidIsConnected - ? WEBHID_CONNECTED_STATUSES.CONNECTED - : WEBHID_CONNECTED_STATUSES.NOT_CONNECTED, - ), - ); - } - }; - initialConnectedDeviceCheck(); - }, [dispatch, ledgerTransportType, webHidConnectedStatus]); - - const usingLedgerLive = ledgerTransportType === LEDGER_TRANSPORT_TYPES.LIVE; - const usingWebHID = ledgerTransportType === LEDGER_TRANSPORT_TYPES.WEBHID; - - const isFirefox = getPlatform() === PLATFORM_FIREFOX; - - return ( -
-
- -
- {renderInstructionStep(t('ledgerConnectionInstructionHeader'))} - {renderInstructionStep( - `- ${t('ledgerConnectionInstructionStepOne')}`, - !isFirefox && usingLedgerLive, - )} - {renderInstructionStep( - `- ${t('ledgerConnectionInstructionStepTwo')}`, - !isFirefox && usingLedgerLive, - )} - {renderInstructionStep( - `- ${t('ledgerConnectionInstructionStepThree')}`, - )} - {renderInstructionStep( - `- ${t('ledgerConnectionInstructionStepFour')}`, - showDataInstruction, - )} - {renderInstructionStep( - - - , - usingWebHID && - webHidConnectedStatus === - WEBHID_CONNECTED_STATUSES.NOT_CONNECTED, - COLORS.SECONDARY1, - )} -
- -
-
- ); -} - -LedgerInstructionField.propTypes = { - showDataInstruction: PropTypes.bool, -}; diff --git a/ui/components/app/signature-request-original/signature-request-original.component.js b/ui/components/app/signature-request-original/signature-request-original.component.js index a8233fc98..ec3baf497 100644 --- a/ui/components/app/signature-request-original/signature-request-original.component.js +++ b/ui/components/app/signature-request-original/signature-request-original.component.js @@ -3,7 +3,6 @@ import PropTypes from 'prop-types'; import { stripHexPrefix } from 'ethereumjs-util'; import classnames from 'classnames'; import { ObjectInspector } from 'react-inspector'; -import LedgerInstructionField from '../ledger-instruction-field'; import { ENVIRONMENT_TYPE_NOTIFICATION, @@ -37,8 +36,6 @@ export default class SignatureRequestOriginal extends Component { sign: PropTypes.func.isRequired, txData: PropTypes.object.isRequired, domainMetadata: PropTypes.object, - hardwareWalletRequiresConnection: PropTypes.bool, - isLedgerWallet: PropTypes.bool, }; state = { @@ -289,7 +286,6 @@ export default class SignatureRequestOriginal extends Component { mostRecentOverviewPage, sign, txData: { type }, - hardwareWalletRequiresConnection, } = this.props; const { metricsEvent, t } = this.context; @@ -323,7 +319,6 @@ export default class SignatureRequestOriginal extends Component { type="primary" large className="request-signature__footer__sign-button" - disabled={hardwareWalletRequiresConnection} onClick={async (event) => { this._removeBeforeUnload(); await sign(event); @@ -352,11 +347,6 @@ export default class SignatureRequestOriginal extends Component {
{this.renderHeader()} {this.renderBody()} - {this.props.isLedgerWallet ? ( -
- -
- ) : null} {this.renderFooter()}
); diff --git a/ui/components/app/signature-request-original/signature-request-original.container.js b/ui/components/app/signature-request-original/signature-request-original.container.js index 82f313bd4..f6181cc5b 100644 --- a/ui/components/app/signature-request-original/signature-request-original.container.js +++ b/ui/components/app/signature-request-original/signature-request-original.container.js @@ -8,32 +8,18 @@ import { accountsWithSendEtherInfoSelector, conversionRateSelector, getDomainMetadata, - doesAddressRequireLedgerHidConnection, } from '../../../selectors'; import { getAccountByAddress } from '../../../helpers/utils/util'; import { clearConfirmTransaction } from '../../../ducks/confirm-transaction/confirm-transaction.duck'; import { getMostRecentOverviewPage } from '../../../ducks/history/history'; -import { isAddressLedger } from '../../../ducks/metamask/metamask'; import SignatureRequestOriginal from './signature-request-original.component'; -function mapStateToProps(state, ownProps) { - const { - msgParams: { from }, - } = ownProps.txData; - - const hardwareWalletRequiresConnection = doesAddressRequireLedgerHidConnection( - state, - from, - ); - const isLedgerWallet = isAddressLedger(state, from); - +function mapStateToProps(state) { return { requester: null, requesterAddress: null, conversionRate: conversionRateSelector(state), mostRecentOverviewPage: getMostRecentOverviewPage(state), - hardwareWalletRequiresConnection, - isLedgerWallet, // not passed to component allAccounts: accountsWithSendEtherInfoSelector(state), domainMetadata: getDomainMetadata(state), diff --git a/ui/components/app/signature-request/signature-request-footer/signature-request-footer.component.js b/ui/components/app/signature-request/signature-request-footer/signature-request-footer.component.js index 37df2a177..0ca254079 100644 --- a/ui/components/app/signature-request/signature-request-footer/signature-request-footer.component.js +++ b/ui/components/app/signature-request/signature-request-footer/signature-request-footer.component.js @@ -6,7 +6,6 @@ export default class SignatureRequestFooter extends PureComponent { static propTypes = { cancelAction: PropTypes.func.isRequired, signAction: PropTypes.func.isRequired, - disabled: PropTypes.boolean, }; static contextTypes = { @@ -14,13 +13,13 @@ export default class SignatureRequestFooter extends PureComponent { }; render() { - const { cancelAction, signAction, disabled = false } = this.props; + const { cancelAction, signAction } = this.props; return (
-
diff --git a/ui/components/app/signature-request/signature-request.component.js b/ui/components/app/signature-request/signature-request.component.js index 73d28ec26..3f460b4c2 100644 --- a/ui/components/app/signature-request/signature-request.component.js +++ b/ui/components/app/signature-request/signature-request.component.js @@ -2,7 +2,6 @@ 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'; @@ -16,11 +15,10 @@ export default class SignatureRequest extends PureComponent { 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 = { @@ -71,8 +69,6 @@ export default class SignatureRequest extends PureComponent { }, cancel, sign, - isLedgerWallet, - hardwareWalletRequiresConnection, } = this.props; const { address: fromAddress } = fromAccount; const { message, domain = {} } = JSON.parse(data); @@ -132,17 +128,8 @@ export default class SignatureRequest extends PureComponent { {this.formatWallet(fromAddress)} - {isLedgerWallet ? ( -
- -
- ) : null} -