diff --git a/app/components/Views/confirmations/SendFlow/Confirm/index.js b/app/components/Views/confirmations/SendFlow/Confirm/index.js index d4f15d65a96..447b7d106e0 100644 --- a/app/components/Views/confirmations/SendFlow/Confirm/index.js +++ b/app/components/Views/confirmations/SendFlow/Confirm/index.js @@ -112,8 +112,8 @@ import CustomGasModal from './components/CustomGasModal'; import { ResultType } from '../../components/BlockaidBanner/BlockaidBanner.types'; import { withMetricsAwareness } from '../../../../../components/hooks/useMetrics'; import { - selectTransactionGasFeeEstimates, selectCurrentTransactionMetadata, + selectGasFeeEstimates, } from '../../../../../selectors/confirmTransaction'; import { selectGasFeeControllerEstimateType } from '../../../../../selectors/gasFeeController'; import { createBuyNavigationDetails } from '../../../../UI/Ramp/routes/utils'; @@ -1475,7 +1475,7 @@ const mapStateToProps = (state) => ({ selectedAsset: state.transaction.selectedAsset, transactionState: state.transaction, primaryCurrency: state.settings.primaryCurrency, - gasFeeEstimates: selectTransactionGasFeeEstimates(state), + gasFeeEstimates: selectGasFeeEstimates(state), gasEstimateType: selectGasFeeControllerEstimateType(state), isPaymentRequest: state.transaction.paymentRequest, securityAlertResponse: diff --git a/app/core/Engine.ts b/app/core/Engine.ts index 0f74c639cca..d64752ab755 100644 --- a/app/core/Engine.ts +++ b/app/core/Engine.ts @@ -1540,6 +1540,7 @@ class Engine { this.configureControllersOnNetworkChange(); this.startPolling(); this.handleVaultBackup(); + this.transactionController.clearUnapprovedTransactions(); Engine.instance = this; } diff --git a/app/selectors/confirmTransaction.ts b/app/selectors/confirmTransaction.ts index 395c74129c1..0758c285c8f 100644 --- a/app/selectors/confirmTransaction.ts +++ b/app/selectors/confirmTransaction.ts @@ -19,11 +19,6 @@ const selectCurrentTransactionGasFeeEstimatesStrict = createSelector( (transactionMetadata) => transactionMetadata?.gasFeeEstimates, ); -const selectCurrentTransactionGasFeeEstimatesLoaded = createSelector( - selectCurrentTransactionMetadata, - (transactionMetadata) => transactionMetadata?.gasFeeEstimatesLoaded, -); - export const selectCurrentTransactionGasFeeEstimates = createDeepEqualSelector( selectCurrentTransactionGasFeeEstimatesStrict, (gasFeeEstimates) => gasFeeEstimates, @@ -45,10 +40,3 @@ export const selectGasFeeEstimates = createSelector( return gasFeeControllerEstimates; }, ); - -export const selectTransactionGasFeeEstimates = createSelector( - selectCurrentTransactionGasFeeEstimatesLoaded, - selectGasFeeEstimates, - (transactionGasFeeEstimatesLoaded, gasFeeEstimates) => - transactionGasFeeEstimatesLoaded ? gasFeeEstimates : undefined, -);