Update onComposed logic in TransactionController

MetaMask · Sep 20, 2018 · a42edcb · a42edcb
1 parent ac639da
commit a42edcb
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/src/TransactionController.test.ts b/src/TransactionController.test.ts
@@ -38,7 +38,8 @@ const MOCK_BLOCK_HISTORY = {
 const MOCK_PRFERENCES = { state: { selectedAddress: 'foo' } };
 const PROVIDER = new HttpProvider('https://ropsten.infura.io');
 const MOCK_NETWORK = {
-	state: { network: '3', provider: PROVIDER },
+	provider: PROVIDER,
+	state: { network: '3' },
 	subscribe: () => {
 		/* eslint-disable-line no-empty */
 	}

diff --git a/src/TransactionController.ts b/src/TransactionController.ts
@@ -346,10 +346,10 @@ export class TransactionController extends BaseController<TransactionConfig, Tra
 	onComposed() {
 		super.onComposed();
 		const network = this.context.NetworkController as NetworkController;
-		const onProviderUpdate = ({ provider }: NetworkState) => {
-			this.ethQuery = provider ? new EthQuery(provider) : /* istanbul ignore next */ null;
+		const onProviderUpdate = () => {
+			this.ethQuery = network.provider ? new EthQuery(network.provider) : /* istanbul ignore next */ null;
 		};
-		onProviderUpdate(network.state);
+		onProviderUpdate();
 		network.subscribe(onProviderUpdate);
 	}