Merge branch 'master' into Version-v11.0.0

CHANGELOG.md

@@ -20,6 +20,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [10.35.0]
 ### Added
 - Add the ability to customize tx nonce on ERC20 approval screens ([#17945](https://github.com/MetaMask/metamask-extension/pull/17945))
+- Improved gas estimates on Base network ([#20097](https://github.com/MetaMask/metamask-extension/pull/20097))
 
 ### Changed
 - Update the "Spending Cap Request" screen (also known as the "ERC 20 approval" or "token allowance" screen) ([#19666](https://github.com/MetaMask/metamask-extension/pull/19666))

shared/constants/network.ts

@@ -138,6 +138,8 @@ export const CHAIN_IDS = {
   BSC_TESTNET: '0x61',
   OPTIMISM: '0xa',
   OPTIMISM_TESTNET: '0x1a4',
+  BASE: '0x2105',
+  BASE_TESTNET: '0x14a33',
   POLYGON: '0x89',
   POLYGON_TESTNET: '0x13881',
   AVALANCHE: '0xa86a',
@@ -542,6 +544,8 @@ export const BUYABLE_CHAINS_MAP: {
     ChainId,
     | typeof CHAIN_IDS.LOCALHOST
     | typeof CHAIN_IDS.OPTIMISM_TESTNET
+    | typeof CHAIN_IDS.BASE_TESTNET
+    | typeof CHAIN_IDS.BASE
     | typeof CHAIN_IDS.BSC_TESTNET
     | typeof CHAIN_IDS.POLYGON_TESTNET
     | typeof CHAIN_IDS.AVALANCHE_TESTNET

ui/hooks/useTransactionDisplayData.js

@@ -198,7 +198,7 @@ export function useTransactionDisplayData(transactionGroup) {
     );
 
   const tokenDisplayValue = useTokenDisplayValue(
-    initialTransaction?.txParams?.data,
+    primaryTransaction?.txParams?.data,
     token,
     isTokenCategory,
   );

ui/selectors/selectors.js

@@ -1291,11 +1291,22 @@ export function getIsOptimism(state) {
   );
 }
 
+export function getIsBase(state) {
+  return (
+    getCurrentChainId(state) === CHAIN_IDS.BASE ||
+    getCurrentChainId(state) === CHAIN_IDS.BASE_TESTNET
+  );
+}
+
+export function getIsOpStack(state) {
+  return getIsOptimism(state) || getIsBase(state);
+}
+
 export function getIsMultiLayerFeeNetwork(state) {
-  return getIsOptimism(state);
+  return getIsOpStack(state);
 }
 /**
- *  To retrieve the maxBaseFee and priotitFee teh user has set as default
+ *  To retrieve the maxBaseFee and priorityFee the user has set as default
  *
  * @param {*} state
  * @returns Boolean