Fix merge conflicts

ava-labs · Aug 21, 2024 · 331cf3a · 331cf3a
1 parent 1c78e42
commit 331cf3a
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 10 deletions.
diff --git a/packages/core-mobile/app/hooks/earn/useCChainBalance.ts b/packages/core-mobile/app/hooks/earn/useCChainBalance.ts
@@ -10,6 +10,7 @@ import { TokenWithBalanceEVM } from '@avalabs/vm-module-types'
 import { isBitcoinChainId } from 'utils/network/isBitcoinNetwork'
 import { isXPChain } from 'utils/network/isAvalancheNetwork'
 import { coingeckoInMemoryCache } from 'utils/coingeckoInMemoryCache'
+import Logger from 'utils/Logger'
 import useCChainNetwork from './useCChainNetwork'
 
 export const useCChainBalance = (): UseQueryResult<
@@ -44,7 +45,12 @@ export const useCChainBalance = (): UseQueryResult<
         network: mapToVmNetwork(network),
         storage: coingeckoInMemoryCache
       })
-      return balancesResponse[addressC]?.[network.networkToken.symbol]
+      const cChainBalance = balancesResponse[addressC]
+      if (!cChainBalance || 'error' in cChainBalance) {
+        Logger.error('Failed to fetch c-chain balance', cChainBalance?.error)
+        return undefined
+      }
+      return cChainBalance[network.networkToken.symbol]
     }
   })
 }
diff --git a/packages/core-mobile/app/hooks/earn/useIssueDelegation.ts b/packages/core-mobile/app/hooks/earn/useIssueDelegation.ts
@@ -76,10 +76,16 @@ export const useIssueDelegation = (
         storage: coingeckoInMemoryCache
       })
 
-      const pChainBalance =
-        balancesResponse[pAddress]?.[network.networkToken.symbol]
+      const pChainBalanceResponse = balancesResponse[pAddress]
+      if (!pChainBalanceResponse || 'error' in pChainBalanceResponse) {
+        return Promise.reject(
+          `Failed to fetch cChain balance. ${pChainBalanceResponse?.error}`
+        )
+      }
+      const pChainBalance = pChainBalanceResponse[network.networkToken.symbol]
       if (
         pChainBalance === undefined ||
+        'error' in pChainBalance ||
         !isTokenWithBalancePVM(pChainBalance)
       ) {
         return Promise.reject('invalid balance type.')

diff --git a/packages/core-mobile/app/hooks/earn/usePChainBalance.ts b/packages/core-mobile/app/hooks/earn/usePChainBalance.ts
@@ -10,6 +10,7 @@ import { mapToVmNetwork } from 'vmModule/utils/mapToVmNetwork'
 import { TokenWithBalancePVM } from '@avalabs/vm-module-types'
 import { coingeckoInMemoryCache } from 'utils/coingeckoInMemoryCache'
 import { isTokenWithBalancePVM } from '@avalabs/avalanche-module'
+import Logger from 'utils/Logger'
 
 export const usePChainBalance = (): UseQueryResult<
   TokenWithBalancePVM | undefined,
@@ -35,10 +36,20 @@ export const usePChainBalance = (): UseQueryResult<
         network: mapToVmNetwork(network),
         storage: coingeckoInMemoryCache
       })
-      const pChainBalance =
-        balancesResponse[addressPVM]?.[network.networkToken.symbol]
+
+      const pChainBalanceResponse = balancesResponse[addressPVM]
+      if (!pChainBalanceResponse || 'error' in pChainBalanceResponse) {
+        Logger.error(
+          'Failed to fetch p-chain balance',
+          pChainBalanceResponse?.error
+        )
+        return
+      }
+      const pChainBalance = pChainBalanceResponse[network.networkToken.symbol]
+
       if (
         pChainBalance === undefined ||
+        'error' in pChainBalance ||
         !isTokenWithBalancePVM(pChainBalance)
       ) {
         return

diff --git a/packages/core-mobile/app/services/earn/importP.ts b/packages/core-mobile/app/services/earn/importP.ts
@@ -103,9 +103,20 @@ const getUnlockedUnstakedAmount = async ({
     network: mapToVmNetwork(network),
     storage: coingeckoInMemoryCache
   })
-  const pChainBalance =
-    balancesResponse[addressPVM]?.[network.networkToken.symbol]
-  if (pChainBalance === undefined || !isTokenWithBalancePVM(pChainBalance)) {
+  const pChainBalanceResponse = balancesResponse[addressPVM]
+  if (!pChainBalanceResponse || 'error' in pChainBalanceResponse) {
+    Logger.error(
+      'Failed to fetch p-chain balance',
+      pChainBalanceResponse?.error
+    )
+    return
+  }
+  const pChainBalance = pChainBalanceResponse[network.networkToken.symbol]
+  if (
+    pChainBalance === undefined ||
+    'error' in pChainBalance ||
+    !isTokenWithBalancePVM(pChainBalance)
+  ) {
     return
   }
   return pChainBalance.balancePerType.unlockedUnstaked

diff --git a/packages/core-mobile/app/services/network/NetworkService.ts b/packages/core-mobile/app/services/network/NetworkService.ts
@@ -20,7 +20,6 @@ import Config from 'react-native-config'
 import Logger from 'utils/Logger'
 import { DebankNetwork } from 'services/network/types'
 import { addIdToPromise, settleAllIdPromises } from '@avalabs/evm-module'
-import { DeBankToken } from '@avalabs/evm-module/src/services/debank-service/de-bank'
 import { getBitcoinProvider, getEvmProvider } from './utils/providerUtils'
 import { NETWORK_P, NETWORK_P_TEST, NETWORK_X, NETWORK_X_TEST } from './consts'
 
@@ -193,7 +192,7 @@ class NetworkService {
           if (!tokenResponse.ok) {
             throw Error('Failed to fetch debank/v1/token')
           }
-          return (await tokenResponse.json()) as DeBankToken
+          return await tokenResponse.json() //as DeBankToken
         })(),
         chainId
       )