Merge pull request #16 from nabla-studio/DavideSegullo/feat-auto_sugg…

…estion Davide segullo/feat auto suggestion
nabla-studio · Nov 10, 2023 · 446327f · 446327f
2 parents 5e5cbba + f7fde06
commit 446327f
Show file tree

Hide file tree

Showing 5 changed files with 57 additions and 7 deletions.
diff --git a/examples/nextjs/components/button.tsx b/examples/nextjs/components/button.tsx
@@ -1,8 +1,6 @@
 'use client';
 
-import { bitsong, bitsongAssetList } from '@nabla-studio/chain-registry';
 import { useConfig, useConnect } from '@quirks/react';
-import { suggestChains } from '@quirks/store';
 
 export const Button = () => {
   const { wallets } = useConfig();
@@ -16,9 +14,6 @@ export const Button = () => {
     <div key={wallet.options.name}>
       <button
         onClick={async () => {
-          await suggestChains(wallet.options.name, [
-            { chain: bitsong, assetList: bitsongAssetList, name: 'bitsong' },
-          ]);
           await connect(wallet.options.name);
         }}
       >

diff --git a/packages/store/src/slices/connect.ts b/packages/store/src/slices/connect.ts
@@ -1,4 +1,8 @@
-import { assertIsDefined, createInvalidWalletName } from '@quirks/core';
+import {
+  type SuggestChain,
+  assertIsDefined,
+  createInvalidWalletName,
+} from '@quirks/core';
 import {
   ConnectionStates,
   type AppState,
@@ -8,12 +12,16 @@ import {
   type ConnectState,
 } from '../types';
 import type { StateCreator } from 'zustand/vanilla';
+import { suggestChains } from '../utils';
 
 export const connectInitialState: ConnectState = {
   walletName: undefined,
   wallet: undefined,
   status: ConnectionStates.DISCONNECTED,
   reconnectionStatus: ReconnectionStates.IDLE,
+  options: {
+    autoSuggestions: true,
+  },
 };
 
 export const createConnectSlice: StateCreator<
@@ -66,6 +74,23 @@ export const createConnectSlice: StateCreator<
       }
     }
   },
+  suggestChains: async (walletName) => {
+    const wallet = get().wallets.find((el) => el.options.name === walletName);
+
+    if (wallet) {
+      const chains: SuggestChain[] = get().chains.map((chain) => ({
+        chain,
+        name: chain.chain_name,
+        assetList: get().assetsLists.find(
+          (list) => list.chain_name === chain.chain_name,
+        ),
+      }));
+
+      console.log(chains);
+
+      return suggestChains(wallet.options.name, chains);
+    }
+  },
   connect: async (walletName) => {
     try {
       const wallet = get().wallets.find((el) => el.options.name === walletName);
@@ -76,6 +101,10 @@ export const createConnectSlice: StateCreator<
 
       set(() => ({ walletName, status: ConnectionStates.WAITING }));
 
+      if (get().options.autoSuggestions) {
+        await get().suggestChains(walletName);
+      }
+
       await wallet.enable(get().chains.map((el) => el.chain_id));
 
       await get().setWallet(wallet);
@@ -99,6 +128,10 @@ export const createConnectSlice: StateCreator<
 
       set(() => ({ reconnectionStatus: ReconnectionStates.WAITING }));
 
+      if (get().options.autoSuggestions) {
+        await get().suggestChains(walletName);
+      }
+
       await wallet.enable(get().chains.map((el) => el.chain_id));
 
       await get().setWallet(wallet);

diff --git a/packages/store/src/store.ts b/packages/store/src/store.ts
@@ -76,6 +76,7 @@ export const createConfig = (config: Config) => {
     chains,
     assetsLists,
     autoConnect = true,
+    autoSuggestions = true,
     persistOptions = defaultPersistOptions,
     signOptions,
     signerOptions,
@@ -91,6 +92,14 @@ export const createConfig = (config: Config) => {
     signerOptions,
   };
 
+  const connectOverrideInitialState = {
+    ...connectInitialState,
+    options: {
+      ...connectInitialState.options,
+      autoSuggestions,
+    },
+  };
+
   store = createStore(
     subscribeWithSelector(
       persist(
@@ -101,12 +110,13 @@ export const createConfig = (config: Config) => {
           assetsLists,
           ...createConnectSlice(...props),
           ...createAccountSlice(...props),
+          ...connectOverrideInitialState,
           ...createSignSlice(...props),
           ...signOverrideInitialState,
           reset: () => {
             props[0]({
               ...configInitialState,
-              ...connectInitialState,
+              ...connectOverrideInitialState,
               ...accountInitialState,
               ...signOverrideInitialState,
               wallets,

diff --git a/packages/store/src/types/connect.ts b/packages/store/src/types/connect.ts
@@ -20,11 +20,16 @@ export const ReconnectionStates = {
 export type ReconnectionState =
   (typeof ReconnectionStates)[keyof typeof ReconnectionStates];
 
+export interface ConnectOptions {
+  autoSuggestions: boolean;
+}
+
 export interface ConnectState {
   walletName?: string;
   wallet?: Wallet;
   status: ConnectionState;
   reconnectionStatus: ReconnectionState;
+  options: ConnectOptions;
 }
 
 export interface ConnectActions {
@@ -33,6 +38,7 @@ export interface ConnectActions {
   connect: (walletName: string) => void;
   reconnect: (walletName: string) => void;
   disconnect: () => void;
+  suggestChains: (walletName: string) => Promise<void>;
 }
 
 export type ConnectSlice = ConnectState & ConnectActions;
diff --git a/packages/store/src/types/options.ts b/packages/store/src/types/options.ts
@@ -32,6 +32,12 @@ export interface Config {
    * @default true
    */
   autoConnect?: boolean;
+  /**
+   * Automatically suggest chains using the provided ones.
+   *
+   * @default true
+   */
+  autoSuggestions?: boolean;
   /**
    * Specify custom sign option
    *