Merge branch 'main' into @szymon/nativeCryptoLib

# Conflicts:
#	packages/core-mobile/android/app/src/main/AndroidManifest.xml
#	yarn.lock

Author: gugell

bitrise.yml

@@ -863,6 +863,8 @@ workflows:
       opts:
         is_expand: false
     steps:
+    - deploy-to-bitrise-io@2:
+        is_always_run: true
     - deploy-to-itunesconnect-application-loader@1:
         inputs:
         - api_key_path: $BITRISEIO_APPSTORE_CONNECT_API_KEY_URL
@@ -1002,6 +1004,8 @@ workflows:
       opts:
         is_expand: false
     steps:
+    - deploy-to-bitrise-io@2:
+        is_always_run: true
     - deploy-to-itunesconnect-application-loader@1:
         inputs:
         - api_key_path: $BITRISEIO_APPSTORE_CONNECT_API_KEY_URL

packages/core-mobile/android/app/build.gradle

@@ -150,11 +150,11 @@ android {
         internal {
             applicationIdSuffix ".internal"
             buildConfigField "boolean", "ENABLE_FLAG_SECURE", "false"
-            manifestPlaceholders = [BRANCH_TEST_MODE:"true", BRANCH_KEY: project.env.get("BRANCH_KEY")]
+            manifestPlaceholders = [BRANCH_TEST_MODE:"true"]
         }
         external {
             buildConfigField "boolean", "ENABLE_FLAG_SECURE", "false"
-            manifestPlaceholders = [BRANCH_TEST_MODE:"false", BRANCH_KEY: project.env.get("BRANCH_KEY")]
+            manifestPlaceholders = [BRANCH_TEST_MODE:"false"]
         }
     }
 

packages/core-mobile/android/app/src/main/AndroidManifest.xml

@@ -35,8 +35,8 @@
                 android:name="com.google.firebase.messaging.default_notification_icon"
                 android:resource="@drawable/notification_icon" />
         <!-- Branch init -->
-        <meta-data android:name="io.branch.sdk.BranchKey" android:value="${BRANCH_KEY}" />
-        <meta-data android:name="io.branch.sdk.BranchKey.test" android:value="${BRANCH_KEY}" />
+		<meta-data android:name="io.branch.sdk.BranchKey" android:value="key_live_iDtcATcmEAXhac4Rze6LgbllBAkfvayk" />
+        <meta-data android:name="io.branch.sdk.BranchKey.test" android:value="key_test_huEgqNimBs9nak9ICf2TlhdfsDdptcAD" />
 		<!-- Set to `true` to use `BranchKey.test` -->
 		<meta-data android:name="io.branch.sdk.TestMode" android:value="${BRANCH_TEST_MODE}" />
         <activity

packages/core-mobile/android/app/src/main/assets/branch.json

@@ -1,6 +1,6 @@
 export enum ReactQueryKeys {
   ACCOUNT_BALANCE = 'accountBalance',
-  WALLET_XP_BALANCE = 'walletXpBalance',
+  WALLET_BALANCE = 'walletBalance',
 
   // defi
   DEFI_EXCHANGE_RATES = 'defiExchangeRates',
@@ -44,5 +44,9 @@ export enum ReactQueryKeys {
   TERMS_OF_USE = 'termsOfUse',
 
   // bridge
-  BRIDGE_CONFIG = 'bridgeConfig'
+  BRIDGE_CONFIG = 'bridgeConfig',
+
+  // deposit
+  AAVE_AVAILABLE_MARKETS = 'aaveAvailableMarkets',
+  BENQI_AVAILABLE_MARKETS = 'benqiAvailableMarkets'
 }

packages/core-mobile/app/consts/reactQueryKeys.ts

@@ -7,8 +7,6 @@ import { addCustomNetwork, selectEnabledNetworks } from 'store/network/slice'
 import { ReactQueryKeys } from 'consts/reactQueryKeys'
 import NetworkService from 'services/network/NetworkService'
 import { selectActiveAccount } from 'store/account/slice'
-import { selectActiveWallet } from 'store/wallet/slice'
-import { useWalletXpBalances } from 'features/portfolio/hooks/useWalletXpBalances'
 import { addCustomToken } from 'store/customToken/slice'
 import { addListener, isAnyOf } from '@reduxjs/toolkit'
 
@@ -22,8 +20,7 @@ import { addListener, isAnyOf } from '@reduxjs/toolkit'
  *
  * 🔍 Responsibilities:
  * - Mounts:
- *    • `useAccountBalances(activeAccount)` → fetches balances for all enabled non-XP networks (EVM, BTC, SOL, etc.)
- *    • `useWalletXpBalances(activeWallet)` → fetches balances for all XP networks (X- and P-Chains)
+ *    • `useAccountBalances(activeAccount)` → fetches balances for the active account on all enabled networks
  *
  * - Ensures network data is preloaded (via `NetworkService.getNetworks`) when missing.
  *
@@ -33,10 +30,8 @@ import { addListener, isAnyOf } from '@reduxjs/toolkit'
 export const BalanceManager = (): null => {
   const dispatch = useDispatch()
   const activeAccount = useSelector(selectActiveAccount)
-  const activeWallet = useSelector(selectActiveWallet)
-  const { invalidate: invalidateAccountBalances } =
-    useAccountBalances(activeAccount)
-  useWalletXpBalances(activeWallet)
+
+  const { refetch: refetchAccountBalances } = useAccountBalances(activeAccount)
 
   const queryClient = useQueryClient()
   const enabledNetworks = useSelector(selectEnabledNetworks)
@@ -67,11 +62,11 @@ export const BalanceManager = (): null => {
         matcher: isAnyOf(addCustomToken, addCustomNetwork),
         effect: async () => {
           if (!activeAccount) return
-          await invalidateAccountBalances()
+          await refetchAccountBalances()
         }
       })
     )
-  }, [activeAccount, dispatch, invalidateAccountBalances])
+  }, [activeAccount, dispatch, refetchAccountBalances])
 
   return null
 }

packages/core-mobile/app/new/common/containers/BalanceManager.tsx

@@ -180,13 +180,10 @@ const useEVMSend: SendAdapterEVM = ({
 
     const totalFee = gasLimit * maxFee
     const maxAmountValue = nativeToken.balance - totalFee
+    const maxAmount = maxAmountValue > 0n ? maxAmountValue : 0n
 
     if (selectedToken.type === TokenType.NATIVE) {
-      return new TokenUnit(
-        maxAmountValue ?? 0n,
-        nativeToken.decimals,
-        nativeToken.symbol
-      )
+      return new TokenUnit(maxAmount, nativeToken.decimals, nativeToken.symbol)
     } else if (selectedToken.type === TokenType.ERC20) {
       return new TokenUnit(
         selectedToken.balance,

packages/core-mobile/app/new/common/hooks/send/useEVMSend.ts

@@ -2,7 +2,6 @@ import { useCallback, useEffect, useState } from 'react'
 import { useInAppRequest } from 'hooks/useInAppRequest'
 import { TokenWithBalancePVM } from '@avalabs/vm-module-types'
 import { isTokenWithBalancePVM } from '@avalabs/avalanche-module'
-import { GAS_LIMIT_FOR_X_CHAIN } from 'consts/fees'
 import { TokenUnit } from '@avalabs/core-utils-sdk'
 import Logger from 'utils/Logger'
 import { Avalanche } from '@avalabs/core-wallets-sdk'
@@ -161,24 +160,26 @@ const usePVMSend: SendAdapterPVM = ({
     handleError
   ])
 
-  // TODO: use correct max amount for P-chain
+  // P-Chain uses dynamic fees
+  // We can simulate a transaction to get the exact fee necessary
+  // But we get the fee amount as an error string and we have to extract it and then subtract it from balance
+  // Conservative solution: estimate as 1% of balance
   const getMaxAmount = useCallback(async () => {
     if (!selectedToken || !isTokenWithBalancePVM(selectedToken)) {
       return
     }
 
-    const fee = maxFee ? BigInt(GAS_LIMIT_FOR_X_CHAIN) * maxFee : 0n
-
     const balance = selectedToken.available ?? 0n
-    const maxAmountValue = balance - fee
+    const estimatedFeePercent = balance / 100n
+    const maxAmountValue = balance - estimatedFeePercent
     const maxAmount = maxAmountValue > 0n ? maxAmountValue : 0n
 
     return new TokenUnit(
       maxAmount,
       selectedToken.decimals,
       selectedToken.symbol
     )
-  }, [maxFee, selectedToken])
+  }, [selectedToken])
 
   useEffect(() => {
     if (canValidate) {

packages/core-mobile/app/new/common/hooks/send/usePVMSend.ts

@@ -69,11 +69,9 @@ const useSVMSend: SendAdapterSVM = ({
     }
 
     if (selectedToken.type === TokenType.NATIVE) {
-      return new TokenUnit(
-        selectedToken.balance - SOLANA_FIXED_BASE_FEE,
-        nativeToken.decimals,
-        nativeToken.symbol
-      )
+      const maxAmountValue = selectedToken.balance - SOLANA_FIXED_BASE_FEE
+      const maxAmount = maxAmountValue > 0n ? maxAmountValue : 0n
+      return new TokenUnit(maxAmount, nativeToken.decimals, nativeToken.symbol)
     } else {
       const splToken = selectedToken as TokenWithBalanceSPL
       return new TokenUnit(splToken.balance, splToken.decimals, splToken.symbol)

packages/core-mobile/app/new/common/hooks/send/useSVMSend.ts

@@ -0,0 +1,15 @@
+import { useDisableLockAppStore } from 'features/accountSettings/store'
+import { useEffect } from 'react'
+
+/**
+ * This is to prevent the app from locking when the user is in these routes
+ * For example, when the user is in the add recovery methods screen, the app might prompt prompt to setup passkey or FIDO2 device
+ */
+export const useDisableLockApp = (): void => {
+  useEffect(() => {
+    useDisableLockAppStore.setState({ disableLockApp: true })
+    return () => {
+      useDisableLockAppStore.setState({ disableLockApp: false })
+    }
+  }, [])
+}