diff --git a/src/ComposableController.test.ts b/src/ComposableController.test.ts index 189c6521f94..f33eb874f7b 100644 --- a/src/ComposableController.test.ts +++ b/src/ComposableController.test.ts @@ -132,6 +132,7 @@ describe('ComposableController', () => { }, NetworkController: { network: 'loading', + properties: { isEIP1559Compatible: false }, provider: { type: 'mainnet', chainId: NetworksChainId.mainnet }, }, PreferencesController: { @@ -188,6 +189,7 @@ describe('ComposableController', () => { ipfsGateway: 'https://ipfs.io/ipfs/', lostIdentities: {}, network: 'loading', + properties: { isEIP1559Compatible: false }, provider: { type: 'mainnet', chainId: NetworksChainId.mainnet }, selectedAddress: '', suggestedAssets: [], diff --git a/src/network/NetworkController.test.ts b/src/network/NetworkController.test.ts index b6a2bbf8a3c..faaf24aac42 100644 --- a/src/network/NetworkController.test.ts +++ b/src/network/NetworkController.test.ts @@ -13,6 +13,7 @@ describe('NetworkController', () => { const controller = new NetworkController(); expect(controller.state).toStrictEqual({ network: 'loading', + properties: { isEIP1559Compatible: false }, provider: { type: 'mainnet', chainId: '1', diff --git a/src/network/NetworkController.ts b/src/network/NetworkController.ts index 7bc71d9fa97..09a230ce5f2 100644 --- a/src/network/NetworkController.ts +++ b/src/network/NetworkController.ts @@ -304,6 +304,9 @@ export class NetworkController extends BaseController< const { properties = {} } = this.state; if (!properties.isEIP1559Compatible) { + if (!this.ethQuery || !this.ethQuery.sendAsync) { + return Promise.resolve(true); + } return new Promise((resolve, reject) => { this.ethQuery.sendAsync( { method: 'eth_getBlockByNumber', params: ['latest', false] }, diff --git a/src/transaction/TransactionController.test.ts b/src/transaction/TransactionController.test.ts index 7623a8b6a16..738f4baaf30 100644 --- a/src/transaction/TransactionController.test.ts +++ b/src/transaction/TransactionController.test.ts @@ -82,6 +82,7 @@ const MOCK_NETWORK = { getProvider: () => PROVIDER, state: { network: '3', + properties: { isEIP1559Compatible: false }, provider: { type: 'ropsten' as NetworkType, chainId: NetworksChainId.ropsten, @@ -98,6 +99,7 @@ const MOCK_MAINNET_NETWORK = { getProvider: () => MAINNET_PROVIDER, state: { network: '1', + properties: { isEIP1559Compatible: false }, provider: { type: 'mainnet' as NetworkType, chainId: NetworksChainId.mainnet, @@ -109,6 +111,7 @@ const MOCK_CUSTOM_NETWORK = { getProvider: () => MAINNET_PROVIDER, state: { network: '80001', + properties: { isEIP1559Compatible: false }, provider: { type: 'rpc' as NetworkType, chainId: '80001',