Merge branch 'main' into feat/lw-9406-add-your-co-signers-component

input-output-hk · Feb 26, 2024 · 118b6e0 · 118b6e0
2 parents dbb615d + d8cc55a
commit 118b6e0
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/apps/browser-extension-wallet/src/hooks/useWalletManager.ts b/apps/browser-extension-wallet/src/hooks/useWalletManager.ts
@@ -171,7 +171,7 @@ const createHardwareWallet = async ({
 
   const addWalletProps: AddWalletProps<Wallet.WalletMetadata, Wallet.AccountMetadata> = {
     metadata: { name },
-    type: WalletType.Ledger,
+    type: connectedDevice,
     accounts: [
       {
         extendedAccountPublicKey: keyAgent.extendedAccountPublicKey,

diff --git a/apps/browser-extension-wallet/src/lib/wallet-api-ui.ts b/apps/browser-extension-wallet/src/lib/wallet-api-ui.ts
@@ -11,7 +11,7 @@ import {
   walletManagerChannel,
   walletManagerProperties,
   walletRepositoryProperties
-} from '@cardano-sdk/web-extension';
+} from '../../../../node_modules/@cardano-sdk/web-extension/dist/cjs';
 import { Wallet } from '@lace/cardano';
 import { firstValueFrom } from 'rxjs';
 import { runtime } from 'webextension-polyfill';

diff --git a/packages/cardano/src/wallet/index.ts b/packages/cardano/src/wallet/index.ts
@@ -50,7 +50,7 @@ export {
 
 export * as KeyManagement from '@cardano-sdk/key-management';
 export * as Ledger from '@cardano-sdk/hardware-ledger';
-export * as Trezor from '@cardano-sdk/hardware-trezor';
+export * as Trezor from '../../../../node_modules/@cardano-sdk/hardware-trezor/dist/cjs';
 
 export { HexBlob, Percent, BigIntMath } from '@cardano-sdk/util';
 export * as Crypto from '@cardano-sdk/crypto';

diff --git a/packages/cardano/src/wallet/lib/hardware-wallet.ts b/packages/cardano/src/wallet/lib/hardware-wallet.ts
@@ -2,7 +2,7 @@
 import * as KeyManagement from '@cardano-sdk/key-management';
 import { DeviceConnection, HardwareWallets } from '../types';
 import * as HardwareLedger from '../../../../../node_modules/@cardano-sdk/hardware-ledger/dist/cjs';
-import * as HardwareTrezor from '../../../../../node_modules/@cardano-sdk/hardware-trezor/dist/cjs';
+import { TrezorKeyAgent } from '../../../../../node_modules/@cardano-sdk/hardware-trezor/dist/cjs';
 import { WalletType } from '@cardano-sdk/web-extension';
 // Using nodejs CML version to satisfy the tests requirements, but this gets replaced by webpack to the browser version in the build
 
@@ -25,13 +25,13 @@ const connectDevices: Record<HardwareWallets, () => Promise<DeviceConnection>> =
     await HardwareLedger.LedgerKeyAgent.checkDeviceConnection(DEFAULT_COMMUNICATION_TYPE),
   ...(AVAILABLE_WALLETS.includes(WalletType.Trezor) && {
     [WalletType.Trezor]: async () => {
-      const isTrezorInitialized = await HardwareTrezor.TrezorKeyAgent.initializeTrezorTransport({
+      const isTrezorInitialized = await TrezorKeyAgent.initializeTrezorTransport({
         manifest,
         communicationType: DEFAULT_COMMUNICATION_TYPE
       });
 
       // initializeTrezorTransport would still succeed even when device is not connected
-      await HardwareTrezor.TrezorKeyAgent.checkDeviceConnection(KeyManagement.CommunicationType.Web);
+      await TrezorKeyAgent.checkDeviceConnection(DEFAULT_COMMUNICATION_TYPE);
 
       return isTrezorInitialized;
     }