Merge pull request #89 from mooncitydev/fix/wallet-detect-and-polling-errors

fix leo and fox wallet connect plus mapping poll retries

Author: dms120

.changeset/cold-bears-fix.md

@@ -0,0 +1,7 @@
+---
+'@provablehq/aleo-hooks': patch
+'@provablehq/aleo-wallet-adaptor-fox': patch
+'@provablehq/aleo-wallet-adaptor-leo': patch
+---
+
+Fix wallet detection rebinding and error handling in Leo/Fox adapters, and make mapping polling throw once retries are exhausted.

packages/aleo-hooks/src/createConfig.ts

@@ -30,13 +30,10 @@ export class State {
         );
         return callback(value);
       } catch (error) {
+        retries--;
         if (retries === 0) {
           throw error;
         }
-        console.error(error);
-        retries--;
-        console.log('Retrying...');
-        console.log(retries, 'retries left');
         await new Promise(resolve => setTimeout(resolve, interval));
       }
     }

packages/aleo-wallet-adaptor/wallets/fox/src/FoxWalletAdapter.ts

@@ -90,7 +90,6 @@ export class FoxWalletAdapter extends BaseAleoWalletAdapter {
     if (this._readyState !== WalletReadyState.UNSUPPORTED) {
       scopePollingDetectionStrategy(() => this._checkAvailability());
     }
-    this._foxWallet = this._window?.foxwallet?.aleo;
   }
 
   /**
@@ -106,6 +105,7 @@ export class FoxWalletAdapter extends BaseAleoWalletAdapter {
     this._window = window as FoxWindow;
 
     if (this._window.foxwallet?.aleo) {
+      this._foxWallet = this._window.foxwallet.aleo;
       this.readyState = WalletReadyState.INSTALLED;
       this.emit('readyStateChange', this.readyState);
       return true;
@@ -139,10 +139,8 @@ export class FoxWalletAdapter extends BaseAleoWalletAdapter {
         if (
           error instanceof Object &&
           'name' in error &&
-          (error.name === 'InvalidParamsAleoWalletError' ||
-            error.name !== 'NotGrantedAleoWalletError')
+          error.name === 'InvalidParamsAleoWalletError'
         ) {
-          // TODO: Handle wrongNetwork at WalletProvider level?
           throw new WalletConnectionError(
             'Connection failed: Likely due to a difference in configured network and the selected wallet network. Configured network: ' +
               network,

packages/aleo-wallet-adaptor/wallets/leo/src/LeoWalletAdapter.ts

@@ -94,7 +94,6 @@ export class LeoWalletAdapter extends BaseAleoWalletAdapter {
     if (this._readyState !== WalletReadyState.UNSUPPORTED) {
       scopePollingDetectionStrategy(() => this._checkAvailability());
     }
-    this._leoWallet = this._window?.leoWallet || this._window?.leo;
     if (config?.isMobile) {
       this.url = `https://app.leo.app/browser?url=${config.mobileWebviewUrl}`;
     }
@@ -107,6 +106,7 @@ export class LeoWalletAdapter extends BaseAleoWalletAdapter {
     this._window = window as LeoWindow;
 
     if (this._window.leoWallet || this._window.leo) {
+      this._leoWallet = this._window.leoWallet ?? this._window.leo;
       this.readyState = WalletReadyState.INSTALLED;
       this.emit('readyStateChange', this.readyState);
       // Wake up service worker
@@ -140,10 +140,8 @@ export class LeoWalletAdapter extends BaseAleoWalletAdapter {
         if (
           error instanceof Object &&
           'name' in error &&
-          (error.name === 'InvalidParamsAleoWalletError' ||
-            error.name !== 'NotGrantedAleoWalletError')
+          error.name === 'InvalidParamsAleoWalletError'
         ) {
-          // TODO: Handle wrongNetwork at WalletProvider level?
           throw new WalletConnectionError(
             'Connection failed: Likely due to a difference in configured network and the selected wallet network. Configured network: ' +
               network,