Use tokenId for getReceiveAddress

EdgeApp · Dec 12, 2023 · c859e2a · c859e2a
1 parent 2ceade6
commit c859e2a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/src/core/currency/wallet/currency-wallet-api.ts b/src/core/currency/wallet/currency-wallet-api.ts
@@ -381,8 +381,16 @@ export function makeCurrencyWalletApi(
 
     // Addresses:
     async getReceiveAddress(
-      opts: EdgeGetReceiveAddressOptions = {}
+      opts: EdgeGetReceiveAddressOptions = { tokenId: null }
     ): Promise<EdgeReceiveAddress> {
+      const { tokenId } = opts
+      const allTokens =
+        input.props.state.accounts[accountId].allTokens[pluginId]
+      const { currencyCode } =
+        tokenId == null ? this.currencyInfo : allTokens[tokenId]
+
+      // @ts-expect-error XXX Hack to maintain plugin compatibility
+      opts.currencyCode = currencyCode
       const freshAddress = await engine.getFreshAddress(opts)
       const receiveAddress: EdgeReceiveAddress = {
         ...freshAddress,

diff --git a/src/types/types.ts b/src/types/types.ts
@@ -738,10 +738,6 @@ export interface EdgeEncodeUri {
 
 // options -------------------------------------------------------------
 
-export interface EdgeCurrencyCodeOptions {
-  currencyCode?: string
-}
-
 export interface EdgeTokenIdOptions {
   tokenId: string | null
 }
@@ -798,7 +794,7 @@ export interface EdgeStreamTransactionOptions {
   tokenId: string | null
 }
 
-export type EdgeGetReceiveAddressOptions = EdgeCurrencyCodeOptions & {
+export type EdgeGetReceiveAddressOptions = EdgeTokenIdOptions & {
   forceIndex?: number
 }