From b5d1050928faaf1eff8f4613e2be9bd74027b42b Mon Sep 17 00:00:00 2001 From: Leon Date: Tue, 11 Apr 2023 15:35:27 +0800 Subject: [PATCH] OK-18982, OK-18985: Conflux and Cardano batch get address (#2829) * fix: conflux batch get address * fix: cardano batch copy --- package.json | 10 +- .../src/vaults/impl/cfx/KeyringHardware.ts | 2 +- packages/kit/src/views/ReceiveToken/index.tsx | 1 + packages/shared/src/config/appConfig.ts | 2 +- yarn.lock | 104 +++++++++--------- 5 files changed, 60 insertions(+), 59 deletions(-) diff --git a/package.json b/package.json index fcd1314dbbe..0d05b4bee36 100644 --- a/package.json +++ b/package.json @@ -62,11 +62,11 @@ "@onekeyfe/cross-inpage-provider-injected": "1.1.24", "@onekeyfe/cross-inpage-provider-types": "1.1.24", "@onekeyfe/extension-bridge-hosted": "1.1.24", - "@onekeyfe/hd-ble-sdk": "0.2.44", - "@onekeyfe/hd-core": "0.2.44", - "@onekeyfe/hd-shared": "0.2.44", - "@onekeyfe/hd-transport": "0.2.44", - "@onekeyfe/hd-web-sdk": "0.2.44", + "@onekeyfe/hd-ble-sdk": "0.2.45", + "@onekeyfe/hd-core": "0.2.45", + "@onekeyfe/hd-shared": "0.2.45", + "@onekeyfe/hd-transport": "0.2.45", + "@onekeyfe/hd-web-sdk": "0.2.45", "@onekeyfe/network-list": "1.6.54", "@onekeyfe/onekey-cross-webview": "1.1.24", "@starcoin/starcoin": "2.1.5", diff --git a/packages/engine/src/vaults/impl/cfx/KeyringHardware.ts b/packages/engine/src/vaults/impl/cfx/KeyringHardware.ts index 3979227b054..857cdcd08e1 100644 --- a/packages/engine/src/vaults/impl/cfx/KeyringHardware.ts +++ b/packages/engine/src/vaults/impl/cfx/KeyringHardware.ts @@ -175,7 +175,7 @@ export class KeyringHardware extends KeyringHardwareBase { const { connectId, deviceId } = await this.getHardwareInfo(); const passphraseState = await this.getWalletPassphraseState(); const chainId = new BigNumber(await this.getNetworkChainId()).toNumber(); - const response = await HardwareSDK.aptosGetAddress(connectId, deviceId, { + const response = await HardwareSDK.confluxGetAddress(connectId, deviceId, { ...passphraseState, bundle: params.map(({ path, showOnOneKey }) => ({ path, diff --git a/packages/kit/src/views/ReceiveToken/index.tsx b/packages/kit/src/views/ReceiveToken/index.tsx index 59b519cc8a7..136a7dd207c 100644 --- a/packages/kit/src/views/ReceiveToken/index.tsx +++ b/packages/kit/src/views/ReceiveToken/index.tsx @@ -177,6 +177,7 @@ const ReceiveToken = () => { alignItems="center" mt={isVerticalLayout ? '32px' : '24px'} mx="auto" + maxWidth="full" >