CP-9066: Fix x/p chain send issue (#1476)

packages/core-mobile/app/components/UniversalTokenSelector.tsx

@@ -18,6 +18,10 @@ import { formatLargeCurrency } from 'utils/Utils'
 import { Amount } from 'types'
 import { Text } from '@avalabs/k2-mobile'
 import { TokenWithBalance } from '@avalabs/vm-module-types'
+import {
+  isTokenWithBalanceAVM,
+  isTokenWithBalancePVM
+} from '@avalabs/avalanche-module'
 
 interface Props {
   selectedToken?: TokenWithBalance
@@ -92,17 +96,31 @@ const UniversalTokenSelector: FC<Props> = ({
     [onAmountChange]
   )
 
+  const getAvailableBalance = useCallback(() => {
+    if (selectedToken === undefined) {
+      return
+    }
+
+    if (
+      isTokenWithBalancePVM(selectedToken) ||
+      isTokenWithBalanceAVM(selectedToken)
+    ) {
+      return `Balance ${selectedToken.availableDisplayValue || '0'} ${
+        selectedToken.symbol
+      }`
+    }
+    return `Balance ${selectedToken?.balanceDisplayValue || '0'} ${
+      selectedToken.symbol
+    }`
+  }, [selectedToken])
+
   return (
     <View style={{ marginHorizontal: 16 }}>
       <Row style={{ justifyContent: 'space-between', alignItems: 'center' }}>
         <AvaText.Heading3 textStyle={{ marginBottom: 4 }}>
           {label ?? 'Token'}
         </AvaText.Heading3>
-        <AvaText.Body2>
-          {selectedToken &&
-            selectedToken?.balanceDisplayValue &&
-            `Balance ${selectedToken.balanceDisplayValue} ${selectedToken.symbol}`}
-        </AvaText.Body2>
+        <AvaText.Body2>{getAvailableBalance()}</AvaText.Body2>
       </Row>
       <Row
         style={{

packages/core-mobile/app/contexts/SendNFTContext.tsx

@@ -10,7 +10,7 @@ import { useSelector } from 'react-redux'
 import { selectActiveAccount } from 'store/account'
 import { NFTItem } from 'store/nft'
 import { selectSelectedCurrency } from 'store/settings/currency'
-import { selectNativeTokenBalanceForNetworkAndAccount } from 'store/balance/slice'
+import { selectAvailableNativeTokenBalanceForNetworkAndAccount } from 'store/balance/slice'
 import { SendState } from 'services/send/types'
 import sendService from 'services/send/SendService'
 import { InteractionManager } from 'react-native'
@@ -50,7 +50,7 @@ export const SendNFTContextProvider = ({
   const activeAccount = useSelector(selectActiveAccount)
   const selectedCurrency = useSelector(selectSelectedCurrency)
   const nativeTokenBalance = useSelector((state: RootState) =>
-    selectNativeTokenBalanceForNetworkAndAccount(
+    selectAvailableNativeTokenBalanceForNetworkAndAccount(
       state,
       activeNetwork.chainId,
       activeAccount?.index

packages/core-mobile/app/contexts/SendTokenContext.tsx

@@ -9,7 +9,7 @@ import React, {
   useState
 } from 'react'
 import { InteractionManager } from 'react-native'
-import { selectNativeTokenBalanceForNetworkAndAccount } from 'store/balance/slice'
+import { selectAvailableNativeTokenBalanceForNetworkAndAccount } from 'store/balance/slice'
 import { useSelector } from 'react-redux'
 import { selectActiveAccount } from 'store/account'
 import sendService from 'services/send/SendService'
@@ -60,7 +60,7 @@ export const SendTokenContextProvider = ({
   const activeAccount = useSelector(selectActiveAccount)
   const selectedCurrency = useSelector(selectSelectedCurrency)
   const nativeTokenBalance = useSelector((state: RootState) =>
-    selectNativeTokenBalanceForNetworkAndAccount(
+    selectAvailableNativeTokenBalanceForNetworkAndAccount(
       state,
       activeNetwork.chainId,
       activeAccount?.index

packages/core-mobile/app/screens/bridge/Bridge.tsx

@@ -52,7 +52,7 @@ import { Tooltip } from 'components/Tooltip'
 import { DOCS_BRIDGE_FAQS } from 'resources/Constants'
 import { selectSelectedCurrency } from 'store/settings/currency/slice'
 import { useNetworks } from 'hooks/networks/useNetworks'
-import { selectNativeTokenBalanceForNetworkAndAccount } from 'store/balance/slice'
+import { selectAvailableNativeTokenBalanceForNetworkAndAccount } from 'store/balance/slice'
 import { RootState } from 'store'
 import { selectActiveAccount } from 'store/account/slice'
 import { Audios, audioFeedback } from 'utils/AudioFeedback'
@@ -116,7 +116,7 @@ const Bridge: FC = () => {
   const [isPending, setIsPending] = useState(false)
   const tokenInfoData = useTokenInfoContext()
   const nativeTokenBalance = useSelector((state: RootState) =>
-    selectNativeTokenBalanceForNetworkAndAccount(
+    selectAvailableNativeTokenBalanceForNetworkAndAccount(
       state,
       activeNetwork.chainId,
       activeAccount?.index
@@ -483,6 +483,7 @@ const Bridge: FC = () => {
             style={{
               top: 22
             }}
+            alignment="flex-end"
             prompt={
               <Text variant="buttonMedium" style={styles.tokenSelectorText}>
                 Select Network

packages/core-mobile/app/services/send/SendServiceAVM.ts

@@ -15,6 +15,10 @@ import { AvalancheTxParams } from 'store/rpc/handlers/avalanche_sendTransaction/
 import { GAS_LIMIT_FOR_XP_CHAIN } from 'consts/fees'
 import { getInternalExternalAddrs } from 'services/send/utils'
 import { stripChainAddress } from 'store/account/utils'
+import {
+  isTokenWithBalanceAVM,
+  isTokenWithBalancePVM
+} from '@avalabs/avalanche-module'
 
 export class SendServiceAVM {
   constructor(private activeNetwork: Network) {}
@@ -37,8 +41,13 @@ export class SendServiceAVM {
           const sendFee = defaultMaxFeePerGas
             ? BigInt(gasLimit) * defaultMaxFeePerGas
             : undefined
-          let maxAmount = token.balance - (sendFee || 0n)
-          maxAmount = maxAmount > 0n ? maxAmount : 0n
+
+          const availableBalance =
+            isTokenWithBalanceAVM(token) || isTokenWithBalancePVM(token)
+              ? token.available
+              : token.balance
+          let maxAmount = availableBalance && availableBalance - (sendFee || 0n)
+          maxAmount = maxAmount && maxAmount > 0n ? maxAmount : 0n
 
           const newState: SendState = {
             ...sendState,

packages/core-mobile/app/services/send/SendServicePVM.ts

@@ -15,6 +15,10 @@ import { AvalancheTxParams } from 'store/rpc/handlers/avalanche_sendTransaction/
 import { GAS_LIMIT_FOR_XP_CHAIN } from 'consts/fees'
 import { stripChainAddress } from 'store/account/utils'
 import { TokenType } from '@avalabs/vm-module-types'
+import {
+  isTokenWithBalanceAVM,
+  isTokenWithBalancePVM
+} from '@avalabs/avalanche-module'
 
 export class SendServicePVM {
   constructor(private activeNetwork: Network) {}
@@ -37,8 +41,12 @@ export class SendServicePVM {
           const sendFee = defaultMaxFeePerGas
             ? BigInt(gasLimit) * defaultMaxFeePerGas
             : undefined
-          let maxAmount = token.balance - (sendFee || 0n)
-          maxAmount = maxAmount > 0n ? maxAmount : 0n
+          const availableBalance =
+            isTokenWithBalanceAVM(token) || isTokenWithBalancePVM(token)
+              ? token.available
+              : token.balance
+          let maxAmount = availableBalance && availableBalance - (sendFee || 0n)
+          maxAmount = maxAmount && maxAmount > 0n ? maxAmount : 0n
 
           const newState: SendState = {
             ...sendState,

packages/core-mobile/app/store/balance/slice.ts

@@ -10,6 +10,10 @@ import { selectActiveNetwork, selectIsTestnet } from 'store/network'
 import { Network } from '@avalabs/core-chains-sdk'
 import { selectIsDeveloperMode } from 'store/settings/advanced'
 import { TokenType } from '@avalabs/vm-module-types'
+import {
+  isTokenWithBalanceAVM,
+  isTokenWithBalancePVM
+} from '@avalabs/avalanche-module'
 import {
   Balance,
   Balances,
@@ -224,20 +228,30 @@ const _selectBalanceKeyForNetworkAndAccount = (
   return getKey(chainId, accountIndex)
 }
 
-export const selectNativeTokenBalanceForNetworkAndAccount = createSelector(
-  [_selectAllBalances, _selectBalanceKeyForNetworkAndAccount],
-  (allBalances, key): bigint => {
-    if (key === undefined) return 0n
+export const selectAvailableNativeTokenBalanceForNetworkAndAccount =
+  createSelector(
+    [_selectAllBalances, _selectBalanceKeyForNetworkAndAccount],
+    (allBalances, key): bigint => {
+      if (key === undefined) return 0n
 
-    const balanceForNetworkAndAccount = allBalances[key]
+      const balanceForNetworkAndAccount = allBalances[key]
 
-    const nativeToken = Object.values(
-      balanceForNetworkAndAccount?.tokens ?? []
-    )?.find(token => token.type === TokenType.NATIVE)
+      const nativeToken = Object.values(
+        balanceForNetworkAndAccount?.tokens ?? []
+      )?.find(token => {
+        return token.type === TokenType.NATIVE
+      })
 
-    return nativeToken?.balance ?? 0n
-  }
-)
+      if (
+        nativeToken &&
+        (isTokenWithBalancePVM(nativeToken) ||
+          isTokenWithBalanceAVM(nativeToken))
+      ) {
+        return nativeToken.available ?? 0n
+      }
+      return nativeToken?.balance ?? 0n
+    }
+  )
 
 // actions
 export const { setStatus, setBalances } = balanceSlice.actions

packages/core-mobile/package.json

@@ -21,20 +21,20 @@
     "gen:glacierApi": "npx openapi-zod-client 'https://glacier-api-dev.avax.network/api-json' -o './app/utils/network/glacierApi.client.ts'"
   },
   "dependencies": {
-    "@avalabs/avalanche-module": "0.1.5",
+    "@avalabs/avalanche-module": "0.1.6",
     "@avalabs/avalanchejs": "4.0.5",
-    "@avalabs/bitcoin-module": "0.1.5",
+    "@avalabs/bitcoin-module": "0.1.6",
     "@avalabs/bridge-unified": "2.1.0",
     "@avalabs/core-bridge-sdk": "3.1.0-alpha.0",
     "@avalabs/core-chains-sdk": "3.1.0-alpha.0",
     "@avalabs/core-coingecko-sdk": "3.1.0-alpha.0",
     "@avalabs/core-utils-sdk": "3.1.0-alpha.0",
     "@avalabs/core-wallets-sdk": "3.1.0-alpha.0",
-    "@avalabs/evm-module": "0.1.5",
+    "@avalabs/evm-module": "0.1.6",
     "@avalabs/glacier-sdk": "3.1.0-alpha.0",
     "@avalabs/k2-mobile": "workspace:*",
     "@avalabs/types": "3.1.0-alpha.0",
-    "@avalabs/vm-module-types": "0.1.5",
+    "@avalabs/vm-module-types": "0.1.6",
     "@blockaid/client": "0.10.0",
     "@coinbase/cbpay-js": "2.2.1",
     "@cubist-labs/cubesigner-sdk": "0.3.28",