fix: invalid "Install" screen being displayed when clicking on "Ethereum Wallets" (#139)

Author: helciofranco

.changeset/late-masks-grab.md

@@ -0,0 +1,6 @@
+---
+"@fuel-connectors/evm-connector": minor
+"@fuel-connectors/fuel-wallet": minor
+---
+
+Import `FuelConnectorEventType` constant from `fuels` instead of relying on the hard-coded value.

.changeset/pink-kings-rescue.md

@@ -0,0 +1,5 @@
+---
+"@fuel-connectors/bako-safe": minor
+---
+
+Fix `disconnect` test to use a mocked API instead of the actual connector

.changeset/tall-cherries-arrive.md

@@ -0,0 +1,6 @@
+---
+"@fuel-connectors/walletconnect-connector": minor
+---
+
+`ping` method should never take more than 1 second.
+Specially when it's the `WalletConnect`, since it doesn't relate to the Fuel network directly.

packages/bako-safe/src/BakoSafeConnector.ts

@@ -276,7 +276,6 @@ export class BakoSafeConnector extends FuelConnector {
   }
 
   async disconnect() {
-    //nao necessário esperar mensagens
     await this.api.delete(`/connections/${this.sessionId}`);
     this.emit(this.events.connection, false);
     this.emit(this.events.accounts, []);

packages/bako-safe/tests/BakoSafeConnector.test.ts

@@ -99,7 +99,13 @@ describe('isConnected()', () => {
 
 describe('disconnect()', () => {
   test('returns a false', async () => {
-    const connector = new BakoSafeConnector();
+    const storage: StorageAbstract = new BakoStorage();
+    await storage.setItem('sessionId', 'fake_session_id');
+
+    const connector = new BakoSafeConnector({
+      api: new MockedRequestAPI(),
+      storage,
+    });
     const disconnect = await connector.disconnect();
 
     expect(disconnect).toEqual(false);

packages/evm-connector/src/EvmWalletConnector.ts

@@ -7,6 +7,7 @@ import {
   type Asset,
   type ConnectorMetadata,
   FuelConnector,
+  FuelConnectorEventType,
   FuelConnectorEventTypes,
   type JsonAbi,
   type Network,
@@ -161,7 +162,7 @@ export class EVMWalletConnector extends FuelConnector {
         if (WINDOW?.ethereum) {
           clearInterval(this._ethereumEvents);
           WINDOW.dispatchEvent(
-            new CustomEvent('FuelConnector', { detail: this }),
+            new CustomEvent(FuelConnectorEventType, { detail: this }),
           );
         }
       }, 500),

packages/evm-connector/src/test/walletConnector.test.ts renamed to packages/evm-connector/src/test/evmWalletConnector.test.ts

@@ -4,6 +4,7 @@ import {
   type ConnectorMetadata,
   type FuelABI,
   FuelConnector,
+  FuelConnectorEventType,
   FuelConnectorEventTypes,
   type Network,
   Provider,
@@ -65,7 +66,7 @@ export class FuelWalletConnector extends FuelConnector {
       this.ping()
         .then(() => {
           window.dispatchEvent(
-            new CustomEvent('FuelConnector', { detail: this }),
+            new CustomEvent(FuelConnectorEventType, { detail: this }),
           );
         })
         .catch(() => {});

packages/fuel-wallet/src/FuelWalletConnector.ts

@@ -37,7 +37,7 @@ export class WalletConnectConnector extends FuelConnector {
   name = 'Ethereum Wallets';
 
   connected = false;
-  installed = false;
+  installed = true;
 
   predicateAddress: string | null = null;
   customPredicate: PredicateConfig | null;
@@ -72,11 +72,11 @@ export class WalletConnectConnector extends FuelConnector {
 
     this.customPredicate = config.predicateConfig || null;
 
-    this.configProviders(config);
+    this.configProvider(config);
     this.setupWatchers();
   }
 
-  async configProviders(config: WalletConnectConfig = {}) {
+  configProvider(config: WalletConnectConfig) {
     this.config = Object.assign(config, {
       fuelProvider: config.fuelProvider || FuelProvider.create(TESTNET_URL),
     });
@@ -110,7 +110,7 @@ export class WalletConnectConnector extends FuelConnector {
         continue;
       }
 
-      const { fuelProvider } = await this.getProviders();
+      const { fuelProvider } = await this.getProvider();
       const predicate = predicateInstance.createPredicate(
         address,
         fuelProvider,
@@ -199,13 +199,13 @@ export class WalletConnectConnector extends FuelConnector {
     this._unsubs.forEach((unsub) => unsub());
   }
 
-  async getProviders() {
-    if (!this.fuelProvider) {
-      this.fuelProvider = (await this.config.fuelProvider) ?? null;
+  async getProvider() {
+    if (!this.config.fuelProvider) {
+      throw new Error('Fuel provider not found');
+    }
 
-      if (!this.fuelProvider) {
-        throw new Error('Fuel provider not found');
-      }
+    if (!this.fuelProvider) {
+      this.fuelProvider = await this.config.fuelProvider;
     }
 
     return {
@@ -219,7 +219,6 @@ export class WalletConnectConnector extends FuelConnector {
    * ============================================================
    */
   async ping(): Promise<boolean> {
-    await this.getProviders();
     return true;
   }
 
@@ -295,7 +294,7 @@ export class WalletConnectConnector extends FuelConnector {
       throw Error('No predicate account found');
     }
 
-    const { fuelProvider } = await this.getProviders();
+    const { fuelProvider } = await this.getProvider();
     const chainId = fuelProvider.getChainId();
     const evmAccount = this.predicateAccount.getEVMAddress(
       address,
@@ -428,7 +427,7 @@ export class WalletConnectConnector extends FuelConnector {
   }
 
   async currentNetwork(): Promise<Network> {
-    const { fuelProvider } = await this.getProviders();
+    const { fuelProvider } = await this.getProvider();
     const chainId = fuelProvider.getChainId();
 
     return { url: fuelProvider.url, chainId: chainId };

packages/walletconnect-connector/src/WalletConnectConnector.ts

@@ -56,7 +56,7 @@ describe('WalletConnect Connector', () => {
       expect(walletWalletConnector).to.be.an.instanceOf(WalletConnectConnector);
       expect(walletWalletConnector.name).to.equal('Ethereum Wallets');
       expect(walletWalletConnector.connected).to.be.false;
-      expect(walletWalletConnector.installed).to.be.false;
+      expect(walletWalletConnector.installed).to.be.true;
       expect(await walletWalletConnector.currentNetwork()).to.be.deep.equal({
         chainId: 0,
         url: TESTNET_URL,
@@ -74,7 +74,7 @@ describe('WalletConnect Connector', () => {
       expect(walletWalletConnector).to.be.an.instanceOf(WalletConnectConnector);
       expect(walletWalletConnector.name).to.equal('Ethereum Wallets');
       expect(walletWalletConnector.connected).to.be.false;
-      expect(walletWalletConnector.installed).to.be.false;
+      expect(walletWalletConnector.installed).to.be.true;
       expect(await walletWalletConnector.currentNetwork()).to.be.deep.equal({
         chainId: 0,
         url: fuelProvider.url,
@@ -92,7 +92,7 @@ describe('WalletConnect Connector', () => {
       expect(walletWalletConnector).to.be.an.instanceOf(WalletConnectConnector);
       expect(walletWalletConnector.name).to.equal('Ethereum Wallets');
       expect(walletWalletConnector.connected).to.be.false;
-      expect(walletWalletConnector.installed).to.be.false;
+      expect(walletWalletConnector.installed).to.be.true;
       expect(await walletWalletConnector.currentNetwork()).to.be.deep.equal({
         chainId: 0,
         url: fuelProvider.url,