NetworkController setProviderType doesn't reset the rpcTarget and nic…

…kname (#947) * set rpcTarget and nickname to undefined when use setProviderType * updated setProviderType func test cases and removed rinkeby for goerly since rinkeby is deprecated * added test case for setProviderType after setRpcTarget
MetaMask · Nov 4, 2022 · cf76cbd · cf76cbd
1 parent c027807
commit cf76cbd
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 3 deletions.
diff --git a/src/network/NetworkController.test.ts b/src/network/NetworkController.test.ts
@@ -145,10 +145,12 @@ describe('NetworkController', () => {
       messenger,
       infuraProjectId: '123',
     });
-    controller.setProviderType('rinkeby' as NetworkType);
-    expect(controller.state.provider.type).toBe('rinkeby');
-    expect(controller.state.provider.ticker).toBe('RinkebyETH');
+    controller.setProviderType('goerli' as NetworkType);
+    expect(controller.state.provider.type).toBe('goerli');
+    expect(controller.state.provider.ticker).toBe('GoerliETH');
     expect(controller.state.isCustomNetwork).toBe(false);
+    expect(controller.state.provider.rpcTarget).toBeUndefined();
+    expect(controller.state.provider.nickname).toBeUndefined();
   });
 
   it('should set mainnet provider type', () => {
@@ -160,6 +162,22 @@ describe('NetworkController', () => {
     expect(controller.state.provider.type).toBe('mainnet');
     expect(controller.state.provider.ticker).toBe('ETH');
     expect(controller.state.isCustomNetwork).toBe(false);
+    expect(controller.state.provider.rpcTarget).toBeUndefined();
+    expect(controller.state.provider.nickname).toBeUndefined();
+  });
+
+  it('should set rpcTarget and nickname props to undefined when set a provider type', () => {
+    const controller = new NetworkController({
+      messenger,
+      infuraProjectId: '123',
+    });
+    controller.setRpcTarget(RPC_TARGET, NetworksChainId.rpc);
+    controller.setProviderType('mainnet' as NetworkType);
+    expect(controller.state.provider.type).toBe('mainnet');
+    expect(controller.state.provider.ticker).toBe('ETH');
+    expect(controller.state.isCustomNetwork).toBe(false);
+    expect(controller.state.provider.rpcTarget).toBeUndefined();
+    expect(controller.state.provider.nickname).toBeUndefined();
   });
 
   it('should throw when setting an unrecognized provider type', () => {

diff --git a/src/network/NetworkController.ts b/src/network/NetworkController.ts
@@ -361,6 +361,8 @@ export class NetworkController extends BaseController<
       state.provider.type = type;
       state.provider.ticker = ticker;
       state.provider.chainId = NetworksChainId[type];
+      state.provider.rpcTarget = undefined;
+      state.provider.nickname = undefined;
     });
     this.refreshNetwork();
   }