fixup! Reuse WalletListModal as the Houdini private send picker

Author: j0ntz

src/components/scenes/HoudiniPrivateSendScene.tsx

@@ -4,13 +4,13 @@ import * as React from 'react'
 
 import { useHandler } from '../../hooks/useHandler'
 import { lstrings } from '../../locales/strings'
+import { getExchangeDenom } from '../../selectors/DenominationSelectors'
 import { useState } from '../../types/reactHooks'
 import { useSelector } from '../../types/reactRedux'
 import type { EdgeAppSceneProps, NavigationBase } from '../../types/routerTypes'
 import { getWalletName } from '../../util/CurrencyWalletHelpers'
 import {
   fetchHoudiniPrivateQuote,
-  getPrimaryMultiplier,
   HOUDINI_DESTINATION_ASSETS,
   HOUDINI_DESTINATION_EDGE_ASSETS,
   type HoudiniDestinationAsset,
@@ -169,10 +169,10 @@ export const HoudiniPrivateSendScene: React.FC<Props> = props => {
     }
     setPending(true)
     try {
-      const fromMultiplier = getPrimaryMultiplier(
+      const fromMultiplier = getExchangeDenom(
         fromWallet.currencyConfig,
         fromTokenId
-      )
+      ).multiplier
       const nativeAmount = round(mul(displayAmount, fromMultiplier), 0)
 
       const quote = await fetchHoudiniPrivateQuote(account, {
@@ -185,7 +185,10 @@ export const HoudiniPrivateSendScene: React.FC<Props> = props => {
       })
 
       const toConfig = account.currencyConfig[destAsset.pluginId]
-      const toMultiplier = getPrimaryMultiplier(toConfig, destAsset.tokenId)
+      const toMultiplier = getExchangeDenom(
+        toConfig,
+        destAsset.tokenId
+      ).multiplier
       const fromDisplay = div(quote.fromNativeAmount, fromMultiplier, 8)
       const toDisplay = div(quote.toNativeAmount, toMultiplier, 8)
 

src/util/houdiniPrivateSend.ts

@@ -1,6 +1,5 @@
 import type {
   EdgeAccount,
-  EdgeCurrencyConfig,
   EdgeCurrencyWallet,
   EdgeSwapQuote,
   EdgeSwapRequest,
@@ -82,8 +81,9 @@ export const HOUDINI_DESTINATION_ASSETS: HoudiniDestinationAsset[] = [
     tokenId: null,
     currencyCode: 'SOL',
     displayName: 'Solana',
-    addressValidation:
-      /^[1-9A-HJ-NP-SU-Za-hj-np-su-z][1-9A-HJ-NP-Za-km-z]{31,43}$/
+    // Base58, 32-44 chars; every position uses the full Base58 alphabet
+    // (excludes 0, O, I, l).
+    addressValidation: /^[1-9A-HJ-NP-Za-km-z]{32,44}$/
   },
   {
     pluginId: 'tron',
@@ -149,22 +149,6 @@ export function isValidHoudiniDestination(
   return asset.addressValidation.test(address.trim())
 }
 
-/**
- * The primary-unit multiplier for an asset, used to convert a user-entered
- * display amount to and from a native (atomic) amount.
- */
-export function getPrimaryMultiplier(
-  currencyConfig: EdgeCurrencyConfig,
-  tokenId: EdgeTokenId
-): string {
-  const { allTokens, currencyInfo } = currencyConfig
-  const denominations =
-    tokenId == null
-      ? currencyInfo.denominations
-      : allTokens[tokenId]?.denominations ?? currencyInfo.denominations
-  return denominations[0].multiplier
-}
-
 export interface HoudiniPrivateQuoteParams {
   fromWallet: EdgeCurrencyWallet
   fromTokenId: EdgeTokenId