Fix: display error when transaction fee estimate fails (Uplift to 1.63.x)

components/brave_wallet_ui/common/actions/wallet_actions.ts

@@ -28,15 +28,12 @@ export const {
   removeUserAsset,
   setAllTokensList,
   setAssetAutoDiscoveryCompleted,
-  setGasEstimates,
-  setHasFeeEstimatesError,
   selectOnRampAssetId,
   setPasswordAttempts,
   setSelectedAccountFilterItem,
   setSelectedAssetFilterItem,
   setSelectedGroupAssetsByItem,
   setSelectedNetworkFilter,
-  setSolFeeEstimates,
   setUserAssetVisible,
   setVisibleTokensInfo,
   unlocked,

components/brave_wallet_ui/common/hooks/use-pending-transaction.ts

@@ -19,7 +19,7 @@ import { getPriceIdForToken } from '../../utils/api-utils'
 import { isHardwareAccount } from '../../utils/account-utils'
 import { getLocale } from '../../../common/locale'
 import { getCoinFromTxDataUnion } from '../../utils/network-utils'
-import { UISelectors, WalletSelectors } from '../selectors'
+import { UISelectors } from '../selectors'
 import {
   accountHasInsufficientFundsForGas,
   accountHasInsufficientFundsForTransaction,
@@ -35,7 +35,7 @@ import { makeNetworkAsset } from '../../options/asset-options'
 // Custom Hooks
 import useGetTokenInfo from './use-get-token-info'
 import { useAccountOrb, useAddressOrb } from './use-orb'
-import { useSafeUISelector, useSafeWalletSelector } from './use-safe-selector'
+import { useSafeUISelector } from './use-safe-selector'
 import {
   useGetAccountInfosRegistryQuery,
   useGetAccountTokenCurrentBalanceQuery,
@@ -96,9 +96,6 @@ export const usePendingTransactions = () => {
   const selectedPendingTransactionId = useSafeUISelector(
     UISelectors.selectedPendingTransactionId
   )
-  const hasFeeEstimatesError = useSafeWalletSelector(
-    WalletSelectors.hasFeeEstimatesError
-  )
 
   // mutations
   const [rejectTransactions] = useRejectTransactionsMutation()
@@ -158,18 +155,22 @@ export const usePendingTransactions = () => {
     querySubscriptionOptions60s
   )
 
-  const { data: gasEstimates, isLoading: isLoadingGasEstimates } =
-    useGetGasEstimation1559Query(
-      transactionInfo && txCoinType === BraveWallet.CoinType.ETH
-        ? transactionInfo.chainId
-        : skipToken,
-      defaultQuerySubscriptionOptions
-    )
+  const {
+    data: gasEstimates,
+    isLoading: isLoadingGasEstimates,
+    isError: hasEvmFeeEstimatesError
+  } = useGetGasEstimation1559Query(
+    transactionInfo && txCoinType === BraveWallet.CoinType.ETH
+      ? transactionInfo.chainId
+      : skipToken,
+    defaultQuerySubscriptionOptions
+  )
 
   const {
     data: solFeeEstimate,
     isLoading: isLoadingSolFeeEstimates = txCoinType ===
-      BraveWallet.CoinType.SOL
+      BraveWallet.CoinType.SOL,
+    isError: hasSolFeeEstimatesError
   } = useGetSolanaEstimatedFeeQuery(
     txCoinType === BraveWallet.CoinType.SOL &&
       transactionInfo?.chainId &&
@@ -519,6 +520,11 @@ export const usePendingTransactions = () => {
     assertNotReached(`Unknown coin ${txCoinType}`)
   }, [txCoinType, isLoadingSolFeeEstimates, gasFee, isLoadingGasEstimates])
 
+  const hasFeeEstimatesError =
+    txCoinType === BraveWallet.CoinType.SOL
+      ? hasSolFeeEstimatesError
+      : hasEvmFeeEstimatesError
+
   const isConfirmButtonDisabled = React.useMemo(() => {
     if (hasFeeEstimatesError || isLoadingGasFee) {
       return true

components/brave_wallet_ui/common/selectors/wallet-selectors.ts

@@ -17,8 +17,6 @@ export const isWalletLocked = ({ wallet }: State) => wallet.isWalletLocked
 export const passwordAttempts = ({ wallet }: State) => wallet.passwordAttempts
 export const assetAutoDiscoveryCompleted = ({ wallet }: State) =>
   wallet.assetAutoDiscoveryCompleted
-export const hasFeeEstimatesError = ({ wallet }: State) =>
-  wallet.hasFeeEstimatesError
 export const isNftPinningFeatureEnabled = ({ wallet }: State) =>
   wallet.isNftPinningFeatureEnabled
 export const hidePortfolioGraph = ({ wallet }: State) =>
@@ -48,14 +46,12 @@ export const allowedNewWalletAccountTypeNetworkIds = ({ wallet }: State) =>
 // and lists)
 export const activeOrigin = ({ wallet }: State) => wallet.activeOrigin
 export const fullTokenList = ({ wallet }: State) => wallet.fullTokenList
-export const gasEstimates = ({ wallet }: State) => wallet.gasEstimates
 export const selectedAssetFilter = ({ wallet }: State) =>
   wallet.selectedAssetFilter
 export const selectedGroupAssetsByItem = ({ wallet }: State) =>
   wallet.selectedGroupAssetsByItem
 export const selectedNetworkFilter = ({ wallet }: State) =>
   wallet.selectedNetworkFilter
-export const solFeeEstimates = ({ wallet }: State) => wallet.solFeeEstimates
 export const userVisibleTokensInfo = ({ wallet }: State) =>
   wallet.userVisibleTokensInfo
 export const selectedAccountFilter = ({ wallet }: State) =>

components/brave_wallet_ui/common/slices/wallet.slice.ts

@@ -14,7 +14,6 @@ import {
   BraveWallet,
   WalletState,
   WalletInitializedPayload,
-  SolFeeEstimates,
   NetworkFilterType,
   RefreshOpts
 } from '../../constants/types'
@@ -52,7 +51,6 @@ const defaultState: WalletState = {
     eTldPlusOne: '',
     originSpec: ''
   },
-  gasEstimates: undefined,
   selectedNetworkFilter: parseJSONFromLocalStorage(
     'PORTFOLIO_NETWORK_FILTER_OPTION',
     AllNetworksOptionDefault
@@ -65,7 +63,6 @@ const defaultState: WalletState = {
     window.localStorage.getItem(LOCAL_STORAGE_KEYS.GROUP_PORTFOLIO_ASSETS_BY) ||
     NoneGroupByOption.id,
   selectedAccountFilter: AllAccountsOptionUniqueKey,
-  solFeeEstimates: undefined,
   selectedDepositAssetId: undefined,
   passwordAttempts: 0,
   assetAutoDiscoveryCompleted: true,
@@ -213,14 +210,6 @@ export const createWalletSlice = (initialState: WalletState = defaultState) => {
         state.selectedDepositAssetId = payload
       },
 
-      setGasEstimates(
-        state: WalletState,
-        { payload }: PayloadAction<BraveWallet.GasEstimation1559>
-      ) {
-        state.hasFeeEstimatesError = false
-        state.gasEstimates = payload
-      },
-
       setPasswordAttempts(
         state: WalletState,
         { payload }: PayloadAction<number>
@@ -326,21 +315,6 @@ export const createWalletSlice = (initialState: WalletState = defaultState) => {
         state.hidePortfolioNFTsTab = payload
       },
 
-      setSolFeeEstimates(
-        state: WalletState,
-        { payload }: PayloadAction<SolFeeEstimates>
-      ) {
-        state.hasFeeEstimatesError = false
-        state.solFeeEstimates = payload
-      },
-
-      setHasFeeEstimatesError: (
-        state: WalletState,
-        { payload }: PayloadAction<boolean>
-      ) => {
-        state.hasFeeEstimatesError = payload
-      },
-
       setVisibleTokensInfo: (
         state: WalletState,
         { payload }: PayloadAction<BraveWallet.BlockchainToken[]>

components/brave_wallet_ui/constants/types.ts

@@ -180,10 +180,6 @@ export interface ImportWalletError {
   errorMessage?: string
 }
 
-export interface SolFeeEstimates {
-  fee: bigint
-}
-
 export interface TokenRegistry {
   [chainID: string]: BraveWallet.BlockchainToken[]
 }
@@ -206,9 +202,6 @@ export interface WalletState {
   fullTokenList: BraveWallet.BlockchainToken[]
   addUserAssetError: boolean
   activeOrigin: BraveWallet.OriginInfo
-  solFeeEstimates?: SolFeeEstimates
-  hasFeeEstimatesError?: boolean
-  gasEstimates?: BraveWallet.GasEstimation1559
   selectedNetworkFilter: NetworkFilterType
   selectedAssetFilter: string
   selectedGroupAssetsByItem: string

components/brave_wallet_ui/stories/mock-data/mock-wallet-state.ts

@@ -14,7 +14,6 @@ import { AllAccountsOptionUniqueKey } from '../../options/account-filter-options
 import { AccountsGroupByOption } from '../../options/group-assets-by-options'
 
 // mocks
-import { LAMPORTS_PER_SOL } from '../../common/constants/solana'
 import { mockMoonCatNFT, mockErc20TokensList } from './mock-asset-options'
 import { networkEntityAdapter } from '../../common/slices/entities/network.entity'
 
@@ -25,14 +24,10 @@ export const mockWalletState: WalletState = {
   },
   addUserAssetError: false,
   fullTokenList: mockErc20TokensList,
-  gasEstimates: undefined,
   hasInitialized: true,
   isBitcoinEnabled: false,
   isZCashEnabled: false,
   isAnkrBalancesFeatureEnabled: false,
-  solFeeEstimates: {
-    fee: (0.000005 * LAMPORTS_PER_SOL) as unknown as bigint
-  },
   allowedNewWalletAccountTypeNetworkIds: [
     networkEntityAdapter.selectId({
       chainId: BraveWallet.FILECOIN_MAINNET,