@rango-dev/widget-embedded 0.17.1-next.4 → 0.17.1-next.6

package/src/utils/swap.ts

@@ -1,5 +1,5 @@
 /* eslint-disable @typescript-eslint/no-magic-numbers */
-import type { LoadingStatus } from '../store/meta';
+import type { FetchStatus } from '../store/slices/data';
 import type { ConnectedWallet } from '../store/wallets';
 import type {
   ConvertedToken,
@@ -35,7 +35,6 @@ import {
   TOKEN_AMOUNT_MAX_DECIMALS,
   TOKEN_AMOUNT_MIN_DECIMALS,
 } from '../constants/routing';
-import { useMetaStore } from '../store/meta';
 import { ButtonState } from '../types';
 
 import { removeDuplicateFrom } from './common';
@@ -181,7 +180,7 @@ export function getLimitErrorMessage(quote: BestRouteResponse): {
 }
 
 export function getSwapButtonState(
-  loadingMetaStatus: LoadingStatus,
+  loadingMetaStatus: FetchStatus,
   connectedWallets: ConnectedWallet[],
   loading: boolean,
   quote: BestRouteResponse | null,
@@ -441,6 +440,8 @@ export function createQuoteRequestBody(params: {
   inputAmount: string;
   wallets?: Wallet[];
   selectedWallets?: Wallet[];
+  liquiditySources?: string[];
+  excludeLiquiditySources?: boolean;
   disabledLiquiditySources: string[];
   slippage: number;
   affiliateRef: string | null;
@@ -456,6 +457,8 @@ export function createQuoteRequestBody(params: {
     wallets,
     selectedWallets,
     disabledLiquiditySources,
+    liquiditySources,
+    excludeLiquiditySources,
     slippage,
     affiliateRef,
     affiliatePercent,
@@ -531,13 +534,18 @@ export function createQuoteRequestBody(params: {
     selectedWallets: selectedWalletsMap ?? {},
     slippage: slippage.toString(),
     ...(destination && { destination: destination }),
-    ...(disabledLiquiditySources.length > 0 && {
-      swapperGroups: disabledLiquiditySources,
+    ...(excludeLiquiditySources && {
+      swapperGroups: disabledLiquiditySources.concat(liquiditySources ?? []),
       swappersGroupsExclude: true,
     }),
+    ...(!excludeLiquiditySources && {
+      swapperGroups: liquiditySources?.filter(
+        (liquiditySource) => !disabledLiquiditySources.includes(liquiditySource)
+      ),
+      swappersGroupsExclude: false,
+    }),
     ...(checkPrerequisites && { blockchains: filteredBlockchains }),
   };
-
   return requestBody;
 }
 
@@ -744,16 +752,6 @@ export function shouldRetrySwap(pendingSwap: PendingSwap) {
     new Date().getTime() - parseInt(pendingSwap.finishTime) < 4 * 3600 * 1000
   );
 }
-export function isValidCustomDestination(
-  blockchain: string,
-  address: string
-): boolean {
-  const blockchains = useMetaStore.getState().meta.blockchains;
-  const regex =
-    blockchains.find((chain) => chain.name === blockchain)?.addressPatterns ||
-    [];
-  return regex.filter((r) => new RegExp(r).test(address)).length > 0;
-}
 
 export function confirmSwapDisabled(
   fetching: boolean,

package/src/utils/wallets.ts

@@ -55,8 +55,11 @@ export function mapWalletTypesToWalletInfo(
   return list
     .filter((wallet) => !EXCLUDED_WALLETS.includes(wallet as WalletTypes))
     .filter((wallet) => {
-      const { supportedChains, hideWhenNotInstalled } = getWalletInfo(wallet);
-      if (hideWhenNotInstalled && !getState(wallet).installed) {
+      const { supportedChains, isContractWallet } = getWalletInfo(wallet);
+      const { installed, network } = getState(wallet);
+      const filterContractWallets =
+        isContractWallet && (!installed || (!!chain && network !== chain));
+      if (filterContractWallets) {
         return false;
       }
       if (chain) {
@@ -97,7 +100,8 @@ export function prepareAccountsForWalletStore(
   wallet: WalletType,
   accounts: string[],
   evmBasedChains: string[],
-  supportedChainNames: Network[] | null
+  supportedChainNames: Network[] | null,
+  isContractWallet: boolean
 ): Wallet[] {
   const result: Wallet[] = [];
 
@@ -151,21 +155,29 @@ export function prepareAccountsForWalletStore(
 
     // If it's an evm network, we will add the address to all the evm chains.
     if (isEvmBasedChain || isUnknownAndEvmBased) {
-      /*
-       * all evm chains are not supported in wallets, so we are adding
-       * only to those that are supported by wallet.
-       */
-      const evmChainsSupportedByWallet = supportedBlockchains.filter((chain) =>
-        evmBasedChains.includes(chain)
-      );
-
-      evmChainsSupportedByWallet.forEach((network) => {
+      if (isContractWallet) {
         /*
-         * EVM addresses are not case sensitive.
-         * Some wallets like Binance-chain return some letters in uppercase which produces bugs in our wallet state.
+         * for contract wallets like Safe wallet, we should add only account for the
+         * current connected blockchain not all of the supported blockchains
          */
         addAccount(network, address.toLowerCase());
-      });
+      } else {
+        /*
+         * all evm chains are not supported in wallets, so we are adding
+         * only to those that are supported by wallet.
+         */
+        const evmChainsSupportedByWallet = supportedBlockchains.filter(
+          (chain) => evmBasedChains.includes(chain)
+        );
+
+        evmChainsSupportedByWallet.forEach((network) => {
+          /*
+           * EVM addresses are not case sensitive.
+           * Some wallets like Binance-chain return some letters in uppercase which produces bugs in our wallet state.
+           */
+          addAccount(network, address.toLowerCase());
+        });
+      }
     } else {
       addAccount(network, address);
     }

package/dist/store/meta.d.ts

@@ -1,23 +0,0 @@
-import type { TokenWithBalance } from '../components/TokenList';
-import type { MetaResponse } from 'rango-sdk';
-export type LoadingStatus = 'loading' | 'success' | 'failed';
-export interface MetaState {
-    meta: MetaResponse & {
-        tokens: TokenWithBalance[];
-    };
-    loadingStatus: LoadingStatus;
-    fetchMeta: () => Promise<void>;
-}
-export declare const useMetaStore: {
-    (): MetaState;
-    <U>(selector: (state: MetaState) => U, equals?: ((a: U, b: U) => boolean) | undefined): U;
-} & import("zustand").StoreApi<MetaState> & {
-    use: {
-        meta: () => MetaResponse & {
-            tokens: TokenWithBalance[];
-        };
-        loadingStatus: () => LoadingStatus;
-        fetchMeta: () => () => Promise<void>;
-    };
-};
-//# sourceMappingURL=meta.d.ts.map

package/dist/store/meta.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"meta.d.ts","sourceRoot":"","sources":["../../src/store/meta.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAChE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAO9C,MAAM,MAAM,aAAa,GAAG,SAAS,GAAG,SAAS,GAAG,QAAQ,CAAC;AAE7D,MAAM,WAAW,SAAS;IACxB,IAAI,EAAE,YAAY,GAAG;QAAE,MAAM,EAAE,gBAAgB,EAAE,CAAA;KAAE,CAAC;IACpD,aAAa,EAAE,aAAa,CAAC;IAC7B,SAAS,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CAChC;AAED,eAAO,MAAM,YAAY;;;;;;oBALQ,gBAAgB,EAAE;;;+BAEhC,QAAQ,IAAI,CAAC;;CAyB/B,CAAC"}

package/src/store/meta.ts

@@ -1,39 +0,0 @@
-import type { TokenWithBalance } from '../components/TokenList';
-import type { MetaResponse } from 'rango-sdk';
-
-import { create } from 'zustand';
-
-import { useAppStore } from './app';
-import createSelectors from './selectors';
-
-export type LoadingStatus = 'loading' | 'success' | 'failed';
-
-export interface MetaState {
-  meta: MetaResponse & { tokens: TokenWithBalance[] };
-  loadingStatus: LoadingStatus;
-  fetchMeta: () => Promise<void>;
-}
-
-export const useMetaStore = createSelectors(
-  create<MetaState>()((set) => ({
-    meta: { blockchains: [], popularTokens: [], swappers: [], tokens: [] },
-    loadingStatus: 'loading',
-    fetchMeta: async () => {
-      try {
-        await useAppStore.getState().fetch();
-
-        const state = useAppStore.getState();
-        const response: MetaResponse = {
-          blockchains: state.blockchains(),
-          tokens: state.tokens(),
-          popularTokens: state._popularTokens,
-          swappers: state._swappers,
-        };
-
-        set({ meta: response, loadingStatus: 'success' });
-      } catch (error) {
-        set({ loadingStatus: 'failed' });
-      }
-    },
-  }))
-);