diff --git a/packages/mask/src/extension/popups/pages/Wallet/ContractInteraction/index.tsx b/packages/mask/src/extension/popups/pages/Wallet/ContractInteraction/index.tsx index 51fd41a3fd22..5271c1b4515f 100644 --- a/packages/mask/src/extension/popups/pages/Wallet/ContractInteraction/index.tsx +++ b/packages/mask/src/extension/popups/pages/Wallet/ContractInteraction/index.tsx @@ -173,11 +173,22 @@ const ContractInteraction = memo(() => { const type = request?.formatterTransaction?.type if (!type) return {} - const methods = request.transactionContext?.methods - if (!methods?.length) return {} - switch (type) { case TransactionDescriptorType.INTERACTION: + const methods = request.transactionContext?.methods + if (!methods?.length) + return { + isNativeTokenInteraction: true, + typeName: t('popups_wallet_contract_interaction'), + tokenAddress: request.computedPayload?.to, + to: request.computedPayload?.to, + gas: request.computedPayload?.gas, + gasPrice: request.computedPayload?.gasPrice, + maxFeePerGas: request.computedPayload?.maxFeePerGas, + maxPriorityFeePerGas: request.computedPayload?.maxPriorityFeePerGas, + amount: request.computedPayload?.value, + } + for (const method of methods) { const parameters = method.parameters @@ -214,17 +225,8 @@ const ContractInteraction = memo(() => { } } } - return { - isNativeTokenInteraction: true, - typeName: t('popups_wallet_contract_interaction'), - tokenAddress: request.computedPayload?.to, - to: request.computedPayload?.to, - gas: request.computedPayload?.gas, - gasPrice: request.computedPayload?.gasPrice, - maxFeePerGas: request.computedPayload?.maxFeePerGas, - maxPriorityFeePerGas: request.computedPayload?.maxPriorityFeePerGas, - amount: request.computedPayload?.value, - } + + return {} case TransactionDescriptorType.TRANSFER: return { isNativeTokenInteraction: true, diff --git a/packages/mask/src/plugins/Trader/trader/balancer/useTradeCallback.ts b/packages/mask/src/plugins/Trader/trader/balancer/useTradeCallback.ts index 51dee6e2d4f0..fc3059a63ccc 100644 --- a/packages/mask/src/plugins/Trader/trader/balancer/useTradeCallback.ts +++ b/packages/mask/src/plugins/Trader/trader/balancer/useTradeCallback.ts @@ -5,7 +5,7 @@ import { SLIPPAGE_DEFAULT } from '../../constants' import { SwapResponse, TradeComputed, TradeStrategy } from '../../types' import { TargetChainIdContext } from '@masknet/plugin-infra/web3-evm' import { useAccount, useWeb3Connection } from '@masknet/plugin-infra/web3' -import { NetworkPluginID, ZERO } from '@masknet/web3-shared-base' +import { NetworkPluginID } from '@masknet/web3-shared-base' import { useTradeAmount } from './useTradeAmount' export function useTradeCallback( @@ -60,11 +60,6 @@ export function useTradeCallback( // send transaction and wait for hash const config = { from: account, - gas: - (await connection.estimateTransaction?.({ - from: account, - value: transactionValue, - })) ?? ZERO.toString(), value: transactionValue, ...gasConfig, } diff --git a/packages/plugins/EVM/src/state/Connection/connection.ts b/packages/plugins/EVM/src/state/Connection/connection.ts index 9516ddbf3c50..cd439da4730d 100644 --- a/packages/plugins/EVM/src/state/Connection/connection.ts +++ b/packages/plugins/EVM/src/state/Connection/connection.ts @@ -794,6 +794,7 @@ class Connection implements EVM_Connection { { from: options.account, ...transaction, + value: transaction.value ? toHex(transaction.value) : undefined, }, ], }, diff --git a/packages/web3-shared/evm/constants/chains.json b/packages/web3-shared/evm/constants/chains.json index 70abf0d8c5cb..c157fb2120df 100644 --- a/packages/web3-shared/evm/constants/chains.json +++ b/packages/web3-shared/evm/constants/chains.json @@ -2782,7 +2782,7 @@ "nativeCurrency": { "chainId": 1313161554, "name": "Ether", - "symbol": "aETH", + "symbol": "AETH", "decimals": 18 }, "infoURL": "https://aurora.dev", @@ -2805,7 +2805,7 @@ "nativeCurrency": { "chainId": 1313161555, "name": "Ether", - "symbol": "aETH", + "symbol": "AETH", "decimals": 18 }, "infoURL": "https://aurora.dev" @@ -2821,7 +2821,7 @@ "nativeCurrency": { "chainId": 1313161556, "name": "Ether", - "symbol": "aETH", + "symbol": "AETH", "decimals": 18 }, "infoURL": "https://aurora.dev"