Skip to content

Commit b420f9f

Browse files
committed
fix: fix the issue of using a mismatched derviceType when creating an address.
1 parent ff23d2d commit b420f9f

File tree

3 files changed

+11
-2
lines changed

3 files changed

+11
-2
lines changed

packages/kit-bg/src/services/ServiceAccount/ServiceAccount.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2810,6 +2810,7 @@ class ServiceAccount extends ServiceBase {
28102810
appEventBus.emit(EAppEventBusNames.CreateAddressByDialog, {
28112811
networkId,
28122812
indexedAccountId,
2813+
deriveType,
28132814
promiseId,
28142815
autoCreateAddress: accountUtils.isHdWallet({ walletId }),
28152816
});

packages/kit/src/provider/Container/CreateAddressContainer/index.tsx

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import {
1010
appEventBus,
1111
} from '@onekeyhq/shared/src/eventBus/appEventBus';
1212
import { ETranslations } from '@onekeyhq/shared/src/locale';
13-
import networkUtils from '@onekeyhq/shared/src/utils/networkUtils';
1413
import { EAccountSelectorSceneName } from '@onekeyhq/shared/types';
1514

1615
import backgroundApiProxy from '../../../background/instance/backgroundApiProxy';
@@ -42,6 +41,7 @@ function BasicCreateAddressDialogContent({
4241
onCreate,
4342
networkId,
4443
indexedAccountId,
44+
deriveType,
4545
autoCreateAddress,
4646
}: {
4747
onCreate: (
@@ -55,10 +55,11 @@ function BasicCreateAddressDialogContent({
5555
) => void;
5656
networkId: string;
5757
indexedAccountId?: string;
58+
deriveType: string;
5859
autoCreateAddress: boolean;
5960
}) {
6061
const {
61-
activeAccount: { wallet, deriveType },
62+
activeAccount: { wallet },
6263
} = useActiveAccount({ num: 0 });
6364

6465
return (
@@ -82,6 +83,7 @@ function CreateAddressDialogContent({
8283
onCreate,
8384
networkId,
8485
indexedAccountId,
86+
deriveType,
8587
autoCreateAddress,
8688
}: {
8789
onCreate: (
@@ -95,6 +97,7 @@ function CreateAddressDialogContent({
9597
) => void;
9698
networkId: string;
9799
indexedAccountId?: string;
100+
deriveType: string;
98101
autoCreateAddress: boolean;
99102
}) {
100103
return (
@@ -109,6 +112,7 @@ function CreateAddressDialogContent({
109112
onCreate={onCreate}
110113
networkId={networkId}
111114
indexedAccountId={indexedAccountId}
115+
deriveType={deriveType}
112116
autoCreateAddress={autoCreateAddress}
113117
/>
114118
</AccountSelectorProviderMirror>
@@ -150,11 +154,13 @@ function BasicCreateAddressContainer() {
150154
({
151155
networkId,
152156
indexedAccountId,
157+
deriveType,
153158
promiseId,
154159
autoCreateAddress,
155160
}: {
156161
networkId: string;
157162
indexedAccountId: string;
163+
deriveType: string;
158164
promiseId: number;
159165
autoCreateAddress: boolean;
160166
}) => {
@@ -202,6 +208,7 @@ function BasicCreateAddressContainer() {
202208
}}
203209
networkId={networkId}
204210
indexedAccountId={indexedAccountId}
211+
deriveType={deriveType}
205212
autoCreateAddress={autoCreateAddress}
206213
/>
207214
),

packages/shared/src/eventBus/appEventBus.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -269,6 +269,7 @@ export interface IAppEventBusPayload {
269269
indexedAccountId: string;
270270
promiseId: number;
271271
autoCreateAddress: boolean;
272+
deriveType: string;
272273
};
273274
}
274275

0 commit comments

Comments
 (0)