Merge branch 'main' into @szymon/nativeCryptoLib

Author: gugell

packages/core-mobile/app/new/features/approval/components/NetworkFeeSelectorWithGasless.tsx

@@ -12,6 +12,7 @@ type Props = {
   gasLimit: number | undefined
   handleFeesChange: (fees: Eip1559Fees) => void
   caip2ChainId: string
+  errorMessage: string | undefined
 }
 
 export const NetworkFeeSelectorWithGasless = ({
@@ -20,7 +21,8 @@ export const NetworkFeeSelectorWithGasless = ({
   shouldShowGaslessSwitch,
   gasLimit,
   caip2ChainId,
-  handleFeesChange
+  handleFeesChange,
+  errorMessage
 }: Props): JSX.Element => {
   const { theme } = useTheme()
   const chainId = getChainIdFromCaip2(caip2ChainId)
@@ -92,6 +94,13 @@ export const NetworkFeeSelectorWithGasless = ({
     <View>
       <View>{renderGaslessSwitch()}</View>
       {renderNetworkFeeSelector()}
+      {errorMessage && (
+        <Text
+          variant="caption"
+          sx={{ color: '$textDanger', alignSelf: 'center', marginTop: 8 }}>
+          {errorMessage}
+        </Text>
+      )}
     </View>
   )
 }

packages/core-mobile/app/new/features/approval/screens/ApprovalScreen/ApprovalScreen.tsx

@@ -33,7 +33,11 @@ import { Details } from '../../components/Details'
 import { Network } from '../../components/Network'
 import { NetworkFeeSelectorWithGasless } from '../../components/NetworkFeeSelectorWithGasless'
 import { SpendLimits } from '../../components/SpendLimits/SpendLimits'
-import { overrideContractItem, removeWebsiteItemIfNecessary } from './utils'
+import {
+  getInitialGasLimit,
+  overrideContractItem,
+  removeWebsiteItemIfNecessary
+} from './utils'
 
 const ApprovalScreen = ({
   params: { request, displayData, signingData, onApprove, onReject }
@@ -63,6 +67,9 @@ const ApprovalScreen = ({
   const account = useSelector(accountSelector)
 
   const [submitting, setSubmitting] = useState(false)
+  const [gasLimit, setGasLimit] = useState<number | undefined>(
+    getInitialGasLimit(signingData)
+  )
   const [maxFeePerGas, setMaxFeePerGas] = useState<bigint | undefined>()
   const [maxPriorityFeePerGas, setMaxPriorityFeePerGas] = useState<
     bigint | undefined
@@ -137,6 +144,7 @@ const ApprovalScreen = ({
         account,
         maxFeePerGas,
         maxPriorityFeePerGas,
+        gasLimit,
         overrideData: hashedCustomSpend
       })
       router.canGoBack() && router.back()
@@ -157,6 +165,7 @@ const ApprovalScreen = ({
     network,
     maxFeePerGas,
     maxPriorityFeePerGas,
+    gasLimit,
     hashedCustomSpend
   ])
 
@@ -171,11 +180,11 @@ const ApprovalScreen = ({
     const ethSendTx = signingData.data
 
     try {
-      const gasLimit = ethSendTx.gasLimit ? BigInt(ethSendTx.gasLimit) : 0n
+      const gasLimitToValidate = gasLimit ? BigInt(gasLimit) : 0n
       const amount = ethSendTx.value ? BigInt(ethSendTx.value) : 0n
 
       validateFee({
-        gasLimit,
+        gasLimit: gasLimitToValidate,
         maxFee: maxFeePerGas || 0n,
         amount,
         nativeToken,
@@ -190,9 +199,10 @@ const ApprovalScreen = ({
         setAmountError(SendErrorMessage.UNKNOWN_ERROR)
       }
     }
-  }, [signingData, network, maxFeePerGas, nativeToken])
+  }, [signingData, network, maxFeePerGas, nativeToken, gasLimit])
 
   const handleFeesChange = useCallback((fees: Eip1559Fees) => {
+    setGasLimit(fees.gasLimit)
     setMaxFeePerGas(fees.maxFeePerGas)
     setMaxPriorityFeePerGas(fees.maxPriorityFeePerGas)
   }, [])
@@ -354,15 +364,6 @@ const ApprovalScreen = ({
     useCallback((): JSX.Element | null => {
       if (!displayData.networkFeeSelector) return null
 
-      let gasLimit: number | undefined
-
-      if (
-        typeof signingData.data === 'object' &&
-        'gasLimit' in signingData.data
-      ) {
-        gasLimit = Number(signingData.data.gasLimit || 0)
-      }
-
       return (
         <View sx={{ marginTop: 12 }}>
           <NetworkFeeSelectorWithGasless
@@ -372,6 +373,7 @@ const ApprovalScreen = ({
             caip2ChainId={caip2ChainId}
             handleFeesChange={handleFeesChange}
             shouldShowGaslessSwitch={shouldShowGaslessSwitch}
+            errorMessage={amountError}
           />
         </View>
       )
@@ -381,8 +383,9 @@ const ApprovalScreen = ({
       gaslessEnabled,
       setGaslessEnabled,
       shouldShowGaslessSwitch,
-      signingData.data,
-      handleFeesChange
+      gasLimit,
+      handleFeesChange,
+      amountError
     ])
 
   const alert = displayData.alert

packages/core-mobile/app/new/features/approval/screens/ApprovalScreen/utils.ts

@@ -2,7 +2,8 @@ import {
   RpcRequest,
   DetailItem,
   RpcMethod,
-  DetailItemType
+  DetailItemType,
+  SigningData
 } from '@avalabs/vm-module-types'
 import { RequestContext } from 'store/rpc/types'
 import { isInAppRequest } from 'store/rpc/utils/isInAppRequest'
@@ -49,3 +50,11 @@ export const overrideContractItem = (
 
   return item
 }
+
+export const getInitialGasLimit = (data: SigningData): number | undefined => {
+  if (!data || data.type !== RpcMethod.ETH_SEND_TRANSACTION) {
+    return undefined
+  }
+
+  return data.data.gasLimit ? Number(data.data.gasLimit) : undefined
+}

packages/core-mobile/app/services/walletconnectv2/walletConnectCache/types.ts

@@ -31,6 +31,7 @@ export type ApprovalParams = {
     account,
     maxFeePerGas,
     maxPriorityFeePerGas,
+    gasLimit,
     overrideData
   }: {
     walletId: string
@@ -39,6 +40,7 @@ export type ApprovalParams = {
     account: Account
     maxFeePerGas?: bigint
     maxPriorityFeePerGas?: bigint
+    gasLimit?: number
     overrideData?: string
   }) => Promise<void>
   onReject: (message?: string) => void

packages/core-mobile/app/store/account/listeners.ts

@@ -5,13 +5,14 @@ import {
 } from 'store/settings/advanced'
 import { AppListenerEffectAPI, AppStartListening } from 'store/types'
 import { AnyAction } from '@reduxjs/toolkit'
-import { onAppUnlocked, onLogIn } from 'store/app/slice'
+import { onAppUnlocked } from 'store/app/slice'
 import { WalletType } from 'services/wallet/types'
 import AnalyticsService from 'services/analytics/AnalyticsService'
 import SeedlessService from 'seedless/services/SeedlessService'
 import { recentAccountsStore } from 'new/features/accountSettings/store'
 import {
   selectActiveWallet,
+  selectIsMigratingActiveAccounts,
   selectSeedlessWallet,
   selectWallets,
   setWalletName
@@ -196,8 +197,11 @@ const migrateActiveAccountsIfNeeded = async (
   const state = listenerApi.getState()
   const activeWallet = selectActiveWallet(state)
   const activeAccount = selectActiveAccount(state)
+  const isMigratingActiveAccounts = selectIsMigratingActiveAccounts(state)
+
   if (
     !activeWallet ||
+    isMigratingActiveAccounts ||
     !canMigrateActiveAccounts(activeWallet) ||
     !activeAccount
   ) {
@@ -241,14 +245,28 @@ const migrateSolanaAddressesIfNeeded = async (
   }
 }
 
+const handleInitAccountsIfNeeded = async (
+  _action: AnyAction,
+  listenerApi: AppListenerEffectAPI
+): Promise<void> => {
+  const state = listenerApi.getState()
+  const accounts = selectAccounts(state)
+
+  // if there are no accounts, we need to initialize them
+  // initAcounts after onboarding might have failed
+  // or user might have force quit the app while creating the first account
+  if (Object.keys(accounts).length === 0) {
+    await initAccounts(_action, listenerApi)
+    return
+  }
+
+  // if there are accounts, we need to migrate them
+  migrateActiveAccountsIfNeeded(_action, listenerApi)
+}
+
 export const addAccountListeners = (
   startListening: AppStartListening
 ): void => {
-  startListening({
-    actionCreator: onLogIn,
-    effect: initAccounts
-  })
-
   startListening({
     actionCreator: toggleDeveloperMode,
     effect: reloadAccounts
@@ -261,7 +279,7 @@ export const addAccountListeners = (
 
   startListening({
     actionCreator: onAppUnlocked,
-    effect: migrateActiveAccountsIfNeeded
+    effect: handleInitAccountsIfNeeded
   })
 
   startListening({

packages/core-mobile/app/store/account/utils.ts

@@ -1,5 +1,5 @@
 import { AVM, EVM, PVM, VM } from '@avalabs/avalanchejs'
-import { Account, AccountCollection } from 'store/account/types'
+import { Account } from 'store/account/types'
 import { Network, NetworkVMType } from '@avalabs/core-chains-sdk'
 import WalletFactory from 'services/wallet/WalletFactory'
 import { WalletType } from 'services/wallet/types'
@@ -17,6 +17,7 @@ import { StorageKey } from 'resources/Constants'
 import { appendToStoredArray, loadArrayFromStorage } from 'utils/mmkv/storages'
 import { setIsMigratingActiveAccounts } from 'store/wallet/slice'
 import WalletService from 'services/wallet/WalletService'
+import { selectWalletState, WalletState } from 'store/app'
 import { setAccounts, setNonActiveAccounts } from './slice'
 
 export function getAddressByVM(
@@ -103,8 +104,9 @@ export const migrateRemainingActiveAccounts = async ({
   walletId: string
   walletType: WalletType.SEEDLESS | WalletType.MNEMONIC | WalletType.KEYSTONE
   startIndex: number
-}): Promise<AccountCollection> => {
-  listenerApi.dispatch(setIsMigratingActiveAccounts(true))
+}): Promise<void> => {
+  const { getState, dispatch } = listenerApi
+  dispatch(setIsMigratingActiveAccounts(true))
 
   try {
     const toastId = uuid()
@@ -120,6 +122,17 @@ export const migrateRemainingActiveAccounts = async ({
       startIndex
     })
 
+    const state = getState()
+    const walletState = selectWalletState(state)
+    if (walletState !== WalletState.ACTIVE) {
+      Logger.error(
+        'Wallet is not active, skipping migrateRemainingActiveAccounts'
+      )
+      dispatch(setIsMigratingActiveAccounts(false))
+      global.toast?.hideAll()
+      return
+    }
+
     const accountIds = Object.keys(accounts)
     if (accountIds.length > 0) {
       // set accounts for seedless wallet, which trigger balance update
@@ -147,16 +160,13 @@ export const migrateRemainingActiveAccounts = async ({
     }
 
     markWalletAsMigrated(walletId)
-
-    return accounts
   } catch (error) {
     Logger.error('Failed to fetch remaining active accounts', error)
     transactionSnackbar.error({
       error: 'Failed to add accounts'
     })
-    return {}
   } finally {
-    listenerApi.dispatch(setIsMigratingActiveAccounts(false))
+    dispatch(setIsMigratingActiveAccounts(false))
   }
 }
 

packages/core-mobile/app/vmModule/ApprovalController/ApprovalController.ts

@@ -84,6 +84,7 @@ class ApprovalController implements VmModuleApprovalController {
         account,
         maxFeePerGas,
         maxPriorityFeePerGas,
+        gasLimit,
         overrideData
       }: {
         walletId: string
@@ -92,6 +93,7 @@ class ApprovalController implements VmModuleApprovalController {
         account: Account
         maxFeePerGas?: bigint
         maxPriorityFeePerGas?: bigint
+        gasLimit?: number
         overrideData?: string
       }): Promise<void> => {
         switch (signingData.type) {
@@ -129,6 +131,7 @@ class ApprovalController implements VmModuleApprovalController {
               account,
               maxFeePerGas,
               maxPriorityFeePerGas,
+              gasLimit,
               overrideData,
               resolve
             })

packages/core-mobile/app/vmModule/handlers/ethSendTransaction.ts

@@ -14,6 +14,7 @@ export const ethSendTransaction = async ({
   walletType,
   maxFeePerGas,
   maxPriorityFeePerGas,
+  gasLimit,
   overrideData,
   resolve
 }: {
@@ -24,18 +25,27 @@ export const ethSendTransaction = async ({
   walletType: WalletType
   maxFeePerGas: bigint | undefined
   maxPriorityFeePerGas: bigint | undefined
+  gasLimit: number | undefined
   overrideData: string | undefined
   resolve: (value: ApprovalResponse) => void
 }): Promise<void> => {
-  const { gasLimit, type, nonce, data, from, to, value } = transactionRequest
+  const {
+    gasLimit: defaultGasLimit,
+    type,
+    nonce,
+    data,
+    from,
+    to,
+    value
+  } = transactionRequest
 
   const transaction = {
     nonce,
     type,
     chainId: network.chainId,
     maxFeePerGas,
     maxPriorityFeePerGas,
-    gasLimit,
+    gasLimit: gasLimit ? BigInt(gasLimit) : defaultGasLimit,
     data: overrideData ?? data,
     from,
     to,

packages/core-mobile/package.json

@@ -261,9 +261,9 @@
     "@babel/preset-typescript": "7.25.7",
     "@lavamoat/allow-scripts": "3.2.1",
     "@playwright/test": "1.48.0",
-    "@react-native-community/cli": "18.0.0",
-    "@react-native-community/cli-platform-android": "18.0.0",
-    "@react-native-community/cli-platform-ios": "18.0.0",
+    "@react-native-community/cli": "18.0.1",
+    "@react-native-community/cli-platform-android": "18.0.1",
+    "@react-native-community/cli-platform-ios": "18.0.1",
     "@react-native/babel-preset": "0.79.5",
     "@react-native/eslint-config": "0.79.5",
     "@react-native/metro-config": "0.79.5",

packages/k2-alpine/src/components/TokenUnitInput/TokenUnitInputWidget.tsx

@@ -58,11 +58,12 @@ export const TokenUnitInputWidget = ({
     index: number
   ): void => {
     const value = balance.mul(percent)
-    textInputRef.current?.setValue(value.toDisplay())
+    const displayValue = value.toDisplay({ asNumber: true })
+    textInputRef.current?.setValue(displayValue.toString())
 
     onChange?.(
       new TokenUnit(
-        Number(value.toDisplay({ asNumber: true })) * 10 ** token.maxDecimals,
+        displayValue * 10 ** token.maxDecimals,
         token.maxDecimals,
         token.symbol
       )