@rango-dev/widget-embedded 0.40.2-next.7 → 0.40.2-next.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rango-dev/widget-embedded",
-  "version": "0.40.2-next.7",
+  "version": "0.40.2-next.8",
   "license": "MIT",
   "type": "module",
   "source": "./src/index.ts",
@@ -54,4 +54,4 @@
   "publishConfig": {
     "access": "public"
   }
-}
+}

package/src/hooks/useSwapInput.ts

@@ -23,10 +23,9 @@ import {
 import { useFetchAllQuotes } from './useFetchAllQuotes';
 
 const DEBOUNCE_DELAY = 600;
-const FIRST_INDEX = 0;
 
 type FetchQuoteParams = Omit<
-  Parameters<typeof createQuoteRequestBody>[typeof FIRST_INDEX],
+  Parameters<typeof createQuoteRequestBody>[0],
   'fromToken' | 'toToken'
 > & { fromToken: Token | null; toToken: Token | null };
 
@@ -48,6 +47,10 @@ export function useSwapInput({
   const { excludeLiquiditySources: configExcludeLiquiditySources, routing } =
     useAppStore().config;
   const { connectedWallets } = useAppStore();
+  const anyContractWalletConnected = connectedWallets.some(
+    (wallet) => wallet.isContractWallet
+  );
+  const contractCall = anyContractWalletConnected;
 
   const {
     fromToken,
@@ -119,6 +122,7 @@ export function useSwapInput({
         affiliateRef,
         affiliatePercent,
         affiliateWallets,
+        contractCall,
       });
       if (isRoutingEnabled('experimental', routing)) {
         requestBody.experimental = true;
@@ -227,6 +231,7 @@ export function useSwapInput({
       affiliateRef,
       affiliatePercent,
       affiliateWallets,
+      contractCall,
     });
     return cancelFetch;
   }, [
@@ -245,6 +250,7 @@ export function useSwapInput({
     userSlippage,
     affiliateRef,
     affiliatePercent,
+    contractCall,
     JSON.stringify(affiliateWallets),
   ]);
 
@@ -261,6 +267,7 @@ export function useSwapInput({
         affiliateRef,
         affiliatePercent,
         affiliateWallets,
+        contractCall,
       }),
     loading,
   };

package/src/store/slices/wallets.ts

@@ -259,6 +259,7 @@ export const createWalletsSlice = keepLastUpdated<AppStoreState, WalletsSlice>(
             return {
               address: account.address,
               chain: account.chain,
+              isContractWallet: account.isContractWallet,
               explorerUrl: null,
               walletType: account.walletType,
               selected: shouldMarkWalletAsSelected,

package/src/types/wallets.ts

@@ -5,6 +5,7 @@ export interface Wallet {
   chain: string;
   address: string;
   walletType: WalletType;
+  isContractWallet?: boolean;
 }
 
 export type Balance = {

package/src/utils/swap.ts

@@ -455,6 +455,7 @@ export function createQuoteRequestBody(params: {
   affiliatePercent: number | null;
   affiliateWallets: { [key: string]: string } | null;
   destination?: string;
+  contractCall: boolean;
 }): BestRouteRequest {
   const {
     fromToken,
@@ -470,6 +471,7 @@ export function createQuoteRequestBody(params: {
     affiliatePercent,
     affiliateWallets,
     destination,
+    contractCall,
   } = params;
   const selectedWalletsMap = selectedWallets?.reduce(
     (
@@ -509,6 +511,7 @@ export function createQuoteRequestBody(params: {
     connectedWallets,
     selectedWallets: selectedWalletsMap ?? {},
     slippage: slippage.toString(),
+    contractCall,
     ...(destination && { destination: destination }),
     ...(excludeLiquiditySources && {
       swapperGroups: disabledLiquiditySources.concat(liquiditySources ?? []),

package/src/utils/wallets.ts

@@ -45,6 +45,8 @@ export type ExtendedModalWalletInfo = WalletInfoWithExtra &
   Pick<ExtendedWalletInfo, 'properties' | 'isHub'>;
 
 export function mapStatusToWalletState(state: WalletState): WalletStatus {
+  // TODO: refactor
+  // eslint-disable-next-line @typescript-eslint/switch-exhaustiveness-check
   switch (true) {
     case state.connected:
       return WalletStatus.CONNECTED;
@@ -137,7 +139,11 @@ export function prepareAccountsForWalletStore(
 ): Wallet[] {
   const result: Wallet[] = [];
 
-  function addAccount(network: Network, address: string) {
+  function addAccount(
+    network: Network,
+    address: string,
+    isContractWallet?: boolean
+  ) {
     const accountForChainAlreadyExists = !!result.find(
       (account) => account.chain === network
     );
@@ -146,6 +152,7 @@ export function prepareAccountsForWalletStore(
         address,
         chain: network,
         walletType: wallet,
+        isContractWallet: isContractWallet ?? false,
       };
 
       result.push(newAccount);
@@ -192,7 +199,7 @@ export function prepareAccountsForWalletStore(
          * 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());
+        addAccount(network, address.toLowerCase(), isContractWallet);
       } else {
         /*
          * all evm chains are not supported in wallets, so we are adding