From d9ca27b31bb926174a960c256fb9016ecea1e5c4 Mon Sep 17 00:00:00 2001 From: Thomas Huang Date: Thu, 24 Feb 2022 12:36:46 -0800 Subject: [PATCH 1/3] Remove unusual locales --- app/_locales/en/messages.json | 9 --------- 1 file changed, 9 deletions(-) diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json index 90918a97efe..463d61e5834 100644 --- a/app/_locales/en/messages.json +++ b/app/_locales/en/messages.json @@ -1377,15 +1377,6 @@ "hardwareWalletConnected": { "message": "Hardware wallet connected" }, - "hardwareWalletConnectivityAdvancedMethodSelect": { - "message": "Select Connection Method" - }, - "hardwareWalletConnectivityAdvancedMethodSelectDescription": { - "message": "Pick your prefered connection method. MetaMask will use the best available." - }, - "hardwareWalletConnectivityAdvancedPathDescription": { - "message": "Change the Ledger path to view other accounts. Try switching to “Legacy (MEW / My Crypto)”" - }, "hardwareWalletConnectivityConnected": { "message": "$1 is ready", "description": "$1 represents the name of the device" From af412f3cc00f198cc9e4f29e61968166929f1b0b Mon Sep 17 00:00:00 2001 From: Thomas Huang Date: Thu, 24 Feb 2022 12:37:21 -0800 Subject: [PATCH 2/3] Lint ignore line for todo function --- .../confirm-page-container/confirm-page-container.component.js | 1 + 1 file changed, 1 insertion(+) diff --git a/ui/components/app/confirm-page-container/confirm-page-container.component.js b/ui/components/app/confirm-page-container/confirm-page-container.component.js index d6cd0cfef8e..d7d54b59e70 100644 --- a/ui/components/app/confirm-page-container/confirm-page-container.component.js +++ b/ui/components/app/confirm-page-container/confirm-page-container.component.js @@ -177,6 +177,7 @@ export default class ConfirmPageContainer extends Component { const { t } = this.context; /* ToDo: We need this method from elevated component */ + // eslint-disable-next-line no-unused-vars const onHardwareConnectivityClose = () => { console.log('Closing hardware connectivity'); }; From cf86f8a75e0628c15d9822ce36363a3c49bec694 Mon Sep 17 00:00:00 2001 From: Thomas Huang Date: Thu, 24 Feb 2022 12:38:11 -0800 Subject: [PATCH 3/3] Reduce length check for settings content row, but add LedgerTransportDropdown component check --- ui/pages/settings/advanced-tab/advanced-tab.component.test.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ui/pages/settings/advanced-tab/advanced-tab.component.test.js b/ui/pages/settings/advanced-tab/advanced-tab.component.test.js index fe2d4475e06..d0132d34a2f 100644 --- a/ui/pages/settings/advanced-tab/advanced-tab.component.test.js +++ b/ui/pages/settings/advanced-tab/advanced-tab.component.test.js @@ -3,6 +3,7 @@ import sinon from 'sinon'; import { shallow } from 'enzyme'; import TextField from '../../../components/ui/text-field'; import ToggleButton from '../../../components/ui/toggle-button'; +import LedgerTransportDropdown from './ledger-transport-dropdown'; import AdvancedTab from './advanced-tab.component'; describe('AdvancedTab Component', () => { @@ -35,7 +36,8 @@ describe('AdvancedTab Component', () => { }); it('should render correctly when threeBoxFeatureFlag', () => { - expect(component.find('.settings-page__content-row')).toHaveLength(13); + expect(component.find('.settings-page__content-row')).toHaveLength(12); + expect(component.find(LedgerTransportDropdown)).toHaveLength(1); }); it('should update autoLockTimeLimit', () => {