WIP

MetaMask · Jul 13, 2023 · 18f1a1e · 18f1a1e
1 parent ab5e3ff
commit 18f1a1e
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/test/e2e/fixture-builder.js b/test/e2e/fixture-builder.js
@@ -357,6 +357,7 @@ function onboardingFixture() {
             rpcUrl: 'http://localhost:8545',
             ticker: 'ETH',
             networkConfigurationId: 'networkConfigurationId',
+            type: 'rpc',
           },
         },
       },
@@ -514,6 +515,9 @@ class FixtureBuilder {
 
   withNetworkController(data) {
     merge(this.fixture.data.NetworkController, data);
+
+    console.log("network controller is: ", this.fixture.data.NetworkController);
+
     return this;
   }
 

diff --git a/test/e2e/tests/custom-rpc-history.spec.js b/test/e2e/tests/custom-rpc-history.spec.js
@@ -190,25 +190,27 @@ describe('Stores custom RPC history', function () {
     );
   });
 
-  it('finds all recent RPCs in history', async function () {
+  it.only('finds all recent RPCs in history', async function () {
     await withFixtures(
       {
         fixtures: new FixtureBuilder()
           .withNetworkController({
             networkConfigurations: {
               networkConfigurationId: {
-                rpcUrl: 'http://127.0.0.1:8545/',
+                rpcUrl: 'http://127.0.0.1:8545/1',
                 chainId: '0x539',
                 ticker: 'ETH',
                 nickname: 'http://127.0.0.1:8545/1',
                 rpcPrefs: {},
+                type: 'rpc',
               },
               networkConfigurationId2: {
                 rpcUrl: 'http://127.0.0.1:8545/2',
                 chainId: '0x539',
                 ticker: 'ETH',
                 nickname: 'http://127.0.0.1:8545/2',
                 rpcPrefs: {},
+                type: 'rpc',
               },
             },
           })
@@ -249,7 +251,7 @@ describe('Stores custom RPC history', function () {
           .withNetworkController({
             networkConfigurations: {
               networkConfigurationId: {
-                rpcUrl: 'http://127.0.0.1:8545/',
+                rpcUrl: 'http://127.0.0.1:8545/1',
                 chainId: '0x539',
                 ticker: 'ETH',
                 nickname: 'http://127.0.0.1:8545/1',

diff --git a/ui/selectors/selectors.js b/ui/selectors/selectors.js
@@ -1177,6 +1177,10 @@ export function getCurrentNetwork(state) {
       ? (network) => network.id === providerConfig.id
       : (network) => network.id === providerConfig.type;
 
+  console.log('providerConfig: ', providerConfig);
+  console.log('allNetworks: ', allNetworks);
+  console.log('allNetworks.find(filter): ', allNetworks.find(filter));
+
   return allNetworks.find(filter);
 }