feat: update hardware wallet restoration

Author: mchappell

apps/browser-extension-wallet/src/features/unlock-wallet/components/UnlockWalletContainer.tsx

@@ -19,8 +19,7 @@ export interface UnlockWalletContainerProps {
 export const UnlockWalletContainer = ({ validateMnemonic }: UnlockWalletContainerProps): React.ReactElement => {
   const analytics = useAnalyticsContext();
   const { unlockWallet, lockWallet, deleteWallet } = useWalletManager();
-  const { environmentName, setKeyAgentData, setDeletingWallet, inMemoryWallet, setAddressesDiscoveryCompleted } =
-    useWalletStore();
+  const { environmentName, setKeyAgentData, setDeletingWallet, setAddressesDiscoveryCompleted } = useWalletStore();
   const backgroundService = useBackgroundServiceAPIContext();
 
   const [isVerifyingPassword, setIsVerifyingPassword] = useState(false);
@@ -67,10 +66,7 @@ export const UnlockWalletContainer = ({ validateMnemonic }: UnlockWalletContaine
       setIsValidPassword(true);
       analytics.sendEventToPostHog(PostHogAction.UnlockWalletWelcomeBackUnlockClick);
       if (decrypted) setUnlocked(decrypted);
-      inMemoryWallet
-        .discoverAddresses()
-        .then(() => setAddressesDiscoveryCompleted(true))
-        .catch(() => setAddressesDiscoveryCompleted(false));
+      setAddressesDiscoveryCompleted(true);
     } catch {
       setIsValidPassword(false);
     }

packages/cardano/src/wallet/lib/hardware-wallet.ts

@@ -107,10 +107,8 @@ export const createHardwareWalletsByChain = async (
       .filter(([chainName]) => chainName !== activeChainName)
       .map(async ([chainName, chainId]) => {
         // Create a key agent for each chain id to save in storage
-        const { keyAgent } = await setup({ chainId, connectedDevice });
-
         // Build object with key agents for all chains to be able to switch to eventually
-        keyAgentsByChain[chainName as ChainName] = { keyAgentData: keyAgent.serializableData };
+        keyAgentsByChain[chainName as ChainName] = { keyAgentData: { ...activeKeyAgent.serializableData, chainId } };
       })
   );