Merge pull request #261 from blocknative/enhancement/clear-accounts

Clear hardware accs when derivation path changed.

Closes #260

Author: lnbc1QWFyb24

src/modules/select/wallets/ledger.ts

@@ -138,17 +138,20 @@ async function ledgerProvider(options: {
   }
 
   async function setPath(path: string, custom?: boolean) {
-    if (custom) {
-      if (!isValidPath(path)) {
-        return false
-      }
-
-      const address = await getAddress(path)
+    if (!isValidPath(path)) {
+      return false
+    }
 
-      // over-ride any exsting addresses for the case of accountSelect being called
+    if (path !== dPath) {
+      // clear any exsting addresses if different path
       addressToPath = new Map()
+    }
+
+    if (custom) {
+      const address = await getAddress(path)
       addressToPath.set(address, path)
       customPath = true
+
       return true
     }
 

src/modules/select/wallets/trezor.ts

@@ -137,18 +137,22 @@ async function trezorProvider(options: {
   }
 
   async function setPath(path: string, custom?: boolean) {
-    if (custom) {
-      if (!isValidPath(path)) {
-        return false
-      }
+    if (!isValidPath(path)) {
+      return false
+    }
 
+    if (path !== dPath) {
+      // clear any exsting addresses if different path
+      addressToPath = new Map()
+    }
+
+    if (custom) {
       try {
         const address = await getAddress(path)
-
-        // over-ride any exsting addresses for the case of accountSelect being called
-        addressToPath = new Map()
         addressToPath.set(address, path)
+        dPath = path
         customPath = true
+
         return true
       } catch (error) {
         throw new Error(