From 80edd9d7f9db3f1048a125c504115fa178d345e7 Mon Sep 17 00:00:00 2001
From: jpuri <jyotipuri@gmail.com>
Date: Sat, 23 Apr 2022 00:20:58 +0530
Subject: [PATCH 1/2] Fix issue with legacy ledger account list

---
 ui/pages/create-account/connect-hardware/index.js | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/ui/pages/create-account/connect-hardware/index.js b/ui/pages/create-account/connect-hardware/index.js
index decf331ac8cc..b411165d6eaf 100644
--- a/ui/pages/create-account/connect-hardware/index.js
+++ b/ui/pages/create-account/connect-hardware/index.js
@@ -85,6 +85,13 @@ class ConnectHardwareForm extends Component {
     this.checkIfUnlocked();
   }
 
+  componentWillUnmount() {
+    this.props.setHardwareWalletDefaultHdPath({
+      device: DEVICE_NAMES.LEDGER,
+      path: `m/44'/60'/0'/0/0`,
+    });
+  }
+
   async checkIfUnlocked() {
     for (const device of [
       DEVICE_NAMES.TREZOR,

From cd7acab25db04ca4f0fe88aef96e3f054d1a41c4 Mon Sep 17 00:00:00 2001
From: jpuri <jyotipuri@gmail.com>
Date: Wed, 27 Apr 2022 00:39:36 +0530
Subject: [PATCH 2/2] fix

---
 ui/pages/create-account/connect-hardware/index.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/ui/pages/create-account/connect-hardware/index.js b/ui/pages/create-account/connect-hardware/index.js
index b411165d6eaf..8f16f2e9422f 100644
--- a/ui/pages/create-account/connect-hardware/index.js
+++ b/ui/pages/create-account/connect-hardware/index.js
@@ -86,10 +86,18 @@ class ConnectHardwareForm extends Component {
   }
 
   componentWillUnmount() {
+    this.props.setHardwareWalletDefaultHdPath({
+      device: DEVICE_NAMES.TREZOR,
+      path: `m/44'/60'/0'/0`,
+    });
     this.props.setHardwareWalletDefaultHdPath({
       device: DEVICE_NAMES.LEDGER,
       path: `m/44'/60'/0'/0/0`,
     });
+    this.props.setHardwareWalletDefaultHdPath({
+      device: DEVICE_NAMES.LATTICE,
+      path: `m/44'/60'/0'/0`,
+    });
   }
 
   async checkIfUnlocked() {