@rango-dev/wallets-core 0.1.16-next.6 → 0.1.16-next.8

package/src/provider.tsx

@@ -95,6 +95,7 @@ function Provider(props: ProviderProps) {
   const wallets = checkWalletProviders(listOfProviders);
   const api: ProviderContext = {
     // TODO: Fix type error
+    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
     // @ts-ignore
     async connect(type, network) {
       const wallet = wallets.get(type);
@@ -125,7 +126,7 @@ function Provider(props: ProviderProps) {
       connectedWallets(providersState).forEach((type) => {
         const wallet = wallets.get(type);
 
-        if (!!wallet) {
+        if (wallet) {
           const ref = addWalletRef(wallet);
           disconnect_promises.push(ref.disconnect());
         }
@@ -143,13 +144,15 @@ function Provider(props: ProviderProps) {
       }
 
       const ref = addWalletRef(wallet);
-      return ref.canSwitchNetworkTo ? ref.canSwitchNetworkTo(network) : false;
+      return ref.canSwitchNetworkTo
+        ? ref.canSwitchNetworkTo(network, ref.provider)
+        : false;
     },
     providers() {
       const providers: { [type in WalletType]?: any } = {};
       availableWallets(providersState).forEach((type) => {
         const wallet = wallets.get(type);
-        if (!!wallet) {
+        if (wallet) {
           const ref = addWalletRef(wallet);
           providers[type] = ref.provider;
         }
@@ -193,7 +196,7 @@ function Provider(props: ProviderProps) {
     wallets.forEach((wallet) => {
       const ref = addWalletRef(wallet);
       const runOnInit = () => {
-        if (!!ref.onInit) {
+        if (ref.onInit) {
           ref.onInit();
         }
       };
@@ -220,7 +223,7 @@ function Provider(props: ProviderProps) {
 
   useEffect(() => {
     const allBlockChains = props.allBlockChains;
-    if (!!allBlockChains) {
+    if (allBlockChains) {
       wallets.forEach((wallet) => {
         const ref = addWalletRef(wallet);
         const supportedChains = ref.getWalletInfo(

package/src/types.ts

@@ -54,7 +54,9 @@ export type GetInstanceOptions = {
   currentProvider: any;
   meta: BlockchainMeta[];
   force?: boolean;
+  updateChainId: (chainId: number | string) => void;
 };
+
 export type GetInstance =
   | (() => any)
   | ((options: GetInstanceOptions) => Promise<any>);
@@ -91,6 +93,7 @@ export type SwitchNetwork = (options: {
 export type CanSwitchNetwork = (options: {
   network: Network;
   meta: BlockchainMeta[];
+  provider: any;
 }) => boolean;
 
 export interface WalletActions {

package/src/wallet.ts

@@ -92,7 +92,7 @@ class Wallet<InstanceType = any> {
     const requestedNetwork =
       network || currentNetwork || this.options.config.defaultNetwork;
 
-    if (!!eagerConnection) {
+    if (eagerConnection) {
       const networkChanged =
         currentNetwork !== requestedNetwork && !!requestedNetwork;
 
@@ -105,6 +105,7 @@ class Wallet<InstanceType = any> {
           instance: this.provider,
           meta: this.meta,
           // TODO: Fix type error
+          // eslint-disable-next-line @typescript-eslint/ban-ts-comment
           // @ts-ignore
           network: requestedNetwork,
           newInstance: this.tryGetInstance.bind(this),
@@ -216,13 +217,14 @@ class Wallet<InstanceType = any> {
   getWalletInfo(allBlockChains: BlockchainMeta[]) {
     return this.actions.getWalletInfo(allBlockChains);
   }
-  canSwitchNetworkTo(network: Network) {
+  canSwitchNetworkTo(network: Network, provider: any) {
     const switchTo = this.actions.canSwitchNetworkTo;
     if (!switchTo) return false;
 
     return switchTo({
       network,
       meta: this.meta,
+      provider,
     });
   }
 
@@ -237,7 +239,6 @@ class Wallet<InstanceType = any> {
 
   setProvider(value: any) {
     this.provider = value;
-
     if (!!value && !!this.actions.subscribe) {
       this.actions.subscribe({
         instance: value,
@@ -260,7 +261,7 @@ class Wallet<InstanceType = any> {
           }
         },
         updateChainId: (chainId) => {
-          const network = !!chainId
+          const network = chainId
             ? getBlockChainNameFromId(chainId, this.meta)
             : Network.Unknown;
           this.updateState({
@@ -353,19 +354,25 @@ class Wallet<InstanceType = any> {
     // We only kill the session (and not restting the whole state)
     // So we are relying on this.provider for achieving this functionality.
     this.setProvider(null);
-
     if (this.options.config.isAsyncInstance) {
       // Trying to connect
       const instanceOptions: GetInstanceOptions = {
         currentProvider: this.provider,
         meta: this.meta,
         force: force || false,
+        updateChainId: (chainId) => {
+          const network = chainId
+            ? getBlockChainNameFromId(chainId, this.meta)
+            : Network.Unknown;
+          this.updateState({
+            network,
+          });
+        },
       };
 
       if (network) {
         instanceOptions.network = network;
       }
-
       instance = await this.actions.getInstance(instanceOptions);
     } else {
       instance = this.actions.getInstance();