@lifi/widget 1.12.1 → 1.13.2

package/hooks/useTokenBalance.js

@@ -1,46 +1,15 @@
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-import { useQuery, useQueryClient } from '@tanstack/react-query';
-import { useCallback } from 'react';
-import { LiFi } from '../config/lifi';
-import { useWallet } from '../providers/WalletProvider';
-import { formatTokenAmount } from '../utils';
-import { useToken } from './useToken';
+import { useMemo } from 'react';
+import { useTokenBalances } from './useTokenBalances';
 export const useTokenBalance = (chainId, tokenAddress) => {
-    const { account } = useWallet();
-    const queryClient = useQueryClient();
-    const { token } = useToken(chainId, tokenAddress);
-    const { data: tokenWithBalance, isLoading, isFetching, refetch, } = useQuery(['token-balance', account.address, chainId, tokenAddress], ({ queryKey: [, address] }) => __awaiter(void 0, void 0, void 0, function* () {
-        if (!address || !token) {
-            return null;
-        }
-        const tokenBalance = yield LiFi.getTokenBalance(address, token);
-        return Object.assign(Object.assign(Object.assign({}, token), tokenBalance), { amount: formatTokenAmount(tokenBalance === null || tokenBalance === void 0 ? void 0 : tokenBalance.amount) });
-    }), {
-        enabled: Boolean(account.address) && Boolean(token),
-        refetchIntervalInBackground: true,
-        refetchInterval: 30000,
-        staleTime: 30000,
-        cacheTime: 30000,
-    });
-    const refetchBalance = useCallback((chainId, tokenAddress) => __awaiter(void 0, void 0, void 0, function* () {
-        if (!chainId && !tokenAddress) {
-            refetch();
-            return;
-        }
-        yield queryClient.invalidateQueries(['token', account.address, chainId, tokenAddress], { type: 'all', exact: true });
-    }), [account.address, queryClient, refetch]);
+    const { tokens, tokensWithBalance, isBalanceLoading, refetch } = useTokenBalances(chainId);
+    const token = useMemo(() => {
+        var _a;
+        const token = (_a = (tokensWithBalance !== null && tokensWithBalance !== void 0 ? tokensWithBalance : tokens)) === null || _a === void 0 ? void 0 : _a.find((token) => token.address === tokenAddress && token.chainId === chainId);
+        return token;
+    }, [chainId, tokenAddress, tokens, tokensWithBalance]);
     return {
-        token: tokenWithBalance !== null && tokenWithBalance !== void 0 ? tokenWithBalance : token,
-        isLoading,
-        isFetching,
-        refetchBalance,
+        token,
+        isLoading: isBalanceLoading,
+        refetch,
     };
 };

package/hooks/useTokenBalances.d.ts

@@ -1,9 +1,10 @@
-import { TokenAmount } from '@lifi/sdk';
+import { Token } from '../types';
 export declare const useTokenBalances: (selectedChainId: number) => {
-    tokens: import("@lifi/sdk").Token[] | undefined;
-    tokensWithBalance: TokenAmount[] | undefined;
+    tokens: Token[] | undefined;
+    tokensWithBalance: Token[] | undefined;
+    featuredTokens: import("@lifi/types").Token[] | undefined;
     isLoading: boolean;
     isBalanceLoading: boolean;
     isBalanceFetched: boolean;
-    updateBalances: <TPageData>(options?: (import("@tanstack/react-query").RefetchOptions & import("@tanstack/react-query").RefetchQueryFilters<TPageData>) | undefined) => Promise<import("@tanstack/react-query").QueryObserverResult<TokenAmount[] | undefined, unknown>>;
+    refetch: <TPageData>(options?: (import("@tanstack/react-query").RefetchOptions & import("@tanstack/react-query").RefetchQueryFilters<TPageData>) | undefined) => Promise<import("@tanstack/react-query").QueryObserverResult<Token[] | undefined, unknown>>;
 };

package/hooks/useTokenBalances.js

@@ -7,20 +7,23 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+/* eslint-disable consistent-return */
 import { useQuery } from '@tanstack/react-query';
 import { useState } from 'react';
 import { LiFi } from '../config/lifi';
 import { useWallet } from '../providers/WalletProvider';
 import { formatTokenAmount } from '../utils';
+import { useFeaturedTokens } from './useFeaturedTokens';
 import { useTokens } from './useTokens';
 const defaultRefetchInterval = 60000;
 const minRefetchInterval = 1000;
 export const useTokenBalances = (selectedChainId) => {
     const { account } = useWallet();
+    const featuredTokens = useFeaturedTokens(selectedChainId);
     const { tokens, isLoading } = useTokens(selectedChainId);
     const [refetchInterval, setRefetchInterval] = useState(defaultRefetchInterval);
-    const isBalanceLoadingEnabled = Boolean(account.address) && Boolean(tokens);
-    const { data: tokensWithBalance, isLoading: isBalanceLoading, isFetched: isBalanceFetched, refetch, } = useQuery(['token-balances', selectedChainId, account.address], ({ queryKey: [, , accountAddress] }) => __awaiter(void 0, void 0, void 0, function* () {
+    const isBalanceLoadingEnabled = Boolean(account.address) && Boolean(tokens === null || tokens === void 0 ? void 0 : tokens.length);
+    const { data: tokensWithBalance, isLoading: isBalanceLoading, isFetched: isBalanceFetched, refetch, } = useQuery(['token-balances', account.address, selectedChainId, tokens === null || tokens === void 0 ? void 0 : tokens.length], ({ queryKey: [, accountAddress] }) => __awaiter(void 0, void 0, void 0, function* () {
         if (!accountAddress || !tokens) {
             return;
         }
@@ -33,20 +36,28 @@ export const useTokenBalances = (selectedChainId) => {
                 : interval * 2);
             return;
         }
-        const formatedTokens = (tokenBalances.length === 0 ? tokens : tokenBalances).map((token) => {
+        const featuredTokenAddresses = new Set(featuredTokens === null || featuredTokens === void 0 ? void 0 : featuredTokens.map((token) => token.address));
+        const sortFn = (a, b) => {
+            var _a, _b, _c, _d;
+            return parseFloat((_a = b.amount) !== null && _a !== void 0 ? _a : '0') * parseFloat((_b = b.priceUSD) !== null && _b !== void 0 ? _b : '0') -
+                parseFloat((_c = a.amount) !== null && _c !== void 0 ? _c : '0') * parseFloat((_d = a.priceUSD) !== null && _d !== void 0 ? _d : '0');
+        };
+        const formattedTokens = (tokenBalances.length === 0 ? tokens : tokenBalances).map((token) => {
             token.amount = formatTokenAmount(token.amount);
             return token;
         });
-        return [
-            ...formatedTokens
-                .filter((token) => token.amount !== '0')
-                .sort((a, b) => {
-                var _a, _b, _c, _d;
-                return parseFloat((_a = b.amount) !== null && _a !== void 0 ? _a : '0') * parseFloat((_b = b.priceUSD) !== null && _b !== void 0 ? _b : '0') -
-                    parseFloat((_c = a.amount) !== null && _c !== void 0 ? _c : '0') * parseFloat((_d = a.priceUSD) !== null && _d !== void 0 ? _d : '0');
-            }),
-            ...formatedTokens.filter((token) => token.amount === '0'),
+        const result = [
+            ...formattedTokens
+                .filter((token) => token.amount !== '0' && featuredTokenAddresses.has(token.address))
+                .sort(sortFn),
+            ...formattedTokens.filter((token) => token.amount === '0' && featuredTokenAddresses.has(token.address)),
+            ...formattedTokens
+                .filter((token) => token.amount !== '0' &&
+                !featuredTokenAddresses.has(token.address))
+                .sort(sortFn),
+            ...formattedTokens.filter((token) => token.amount === '0' && !featuredTokenAddresses.has(token.address)),
         ];
+        return result;
     }), {
         enabled: isBalanceLoadingEnabled,
         refetchIntervalInBackground: true,
@@ -56,9 +67,10 @@ export const useTokenBalances = (selectedChainId) => {
     return {
         tokens,
         tokensWithBalance,
+        featuredTokens,
         isLoading,
         isBalanceLoading: isBalanceLoading && isBalanceLoadingEnabled,
         isBalanceFetched,
-        updateBalances: refetch,
+        refetch,
     };
 };

package/hooks/useTokenSearch.d.ts

@@ -0,0 +1,7 @@
+import { Token } from '../types';
+export declare const useTokenSearch: (token: string, chainId: number, enabled?: boolean) => {
+    token: Token | undefined;
+    isLoading: boolean;
+    isFetching: boolean;
+    isFetched: boolean;
+};

package/hooks/useTokenSearch.js

@@ -0,0 +1,37 @@
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+import { useQuery, useQueryClient } from '@tanstack/react-query';
+import { LiFi } from '../config/lifi';
+export const useTokenSearch = (token, chainId, enabled) => {
+    const queryClient = useQueryClient();
+    const { data, isLoading, isFetching, isFetched } = useQuery(['token-search', chainId, token], ({ queryKey: [, chainId, token], signal }) => __awaiter(void 0, void 0, void 0, function* () {
+        const data = yield LiFi.getToken(chainId, token, {
+            signal,
+        });
+        if (data) {
+            queryClient.setQueriesData(['tokens', chainId], (tokens) => {
+                if (!(tokens === null || tokens === void 0 ? void 0 : tokens.some((token) => token.address === data.address))) {
+                    tokens === null || tokens === void 0 ? void 0 : tokens.push(data);
+                }
+                return tokens;
+            });
+        }
+        return data;
+    }), {
+        enabled,
+        retry: false,
+    });
+    return {
+        token: data,
+        isLoading,
+        isFetching,
+        isFetched,
+    };
+};

package/hooks/useTokens.d.ts

@@ -1,5 +1,6 @@
+import { Token } from '../types';
 export declare const useTokens: (selectedChainId: number) => {
-    tokens: import("@lifi/types").Token[] | undefined;
+    tokens: Token[] | undefined;
     isLoading: boolean;
     isFetching: boolean;
 };

package/hooks/useTokens.js

@@ -9,12 +9,20 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 import { useQuery } from '@tanstack/react-query';
 import { LiFi } from '../config/lifi';
+import { useFeaturedTokens } from './useFeaturedTokens';
 export const useTokens = (selectedChainId) => {
-    const { data: tokens, isLoading, isFetching, } = useQuery(['tokens', selectedChainId], () => __awaiter(void 0, void 0, void 0, function* () {
-        var _a;
+    const featuredTokens = useFeaturedTokens(selectedChainId);
+    const { data: tokens, isLoading, isFetching, } = useQuery(['tokens', selectedChainId, featuredTokens === null || featuredTokens === void 0 ? void 0 : featuredTokens.length], () => __awaiter(void 0, void 0, void 0, function* () {
+        var _a, _b, _c;
         const data = yield LiFi.getTokens({ chains: [selectedChainId] });
-        return (_a = data.tokens) === null || _a === void 0 ? void 0 : _a[selectedChainId];
-        // .sort((a, b) => (a.symbol > b.symbol ? 1 : -1));
+        const featuredTokenAddresses = new Set(featuredTokens === null || featuredTokens === void 0 ? void 0 : featuredTokens.map((token) => token.address));
+        return [
+            ...((_a = featuredTokens === null || featuredTokens === void 0 ? void 0 : featuredTokens.map((token) => {
+                token.featured = true;
+                return token;
+            })) !== null && _a !== void 0 ? _a : []),
+            ...((_c = (_b = data.tokens) === null || _b === void 0 ? void 0 : _b[selectedChainId].filter((token) => !featuredTokenAddresses.has(token.address))) !== null && _c !== void 0 ? _c : []),
+        ];
     }));
     return {
         tokens,

package/i18n/en/translation.json

@@ -50,6 +50,8 @@
     "selectChain": "Chain",
     "selectToken": "Token",
     "selectChainAndToken": "Select chain and token",
+    "featuredTokens": "Featured tokens",
+    "otherTokens": "Other tokens",
     "inProgress": "In progress",
     "couldntFindTokens": "We couldn't find tokens on this chain or you don't have any.",
     "stepSwap": "Swap",

package/i18n/index.d.ts

@@ -53,6 +53,8 @@ export declare const resources: {
                 selectChain: string;
                 selectToken: string;
                 selectChainAndToken: string;
+                featuredTokens: string;
+                otherTokens: string;
                 inProgress: string;
                 couldntFindTokens: string;
                 stepSwap: string;

package/icons/LiFiFullLogo.d.ts

@@ -0,0 +1,2 @@
+import { SVGProps } from 'react';
+export declare const LiFiFullLogo: (props: SVGProps<SVGSVGElement>) => JSX.Element;

package/icons/LiFiFullLogo.js

@@ -0,0 +1,2 @@
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+export const LiFiFullLogo = (props) => (_jsxs("svg", Object.assign({ width: "84", height: "32", viewBox: "0 0 84 32", fill: "inherit", xmlns: "http://www.w3.org/2000/svg" }, props, { children: [_jsx("path", { d: "M50.6689 20.5714H42.6849V8H39V24H50.6689V20.5714Z" }), _jsx("path", { d: "M53.0717 24H56.7566V8H53.0717V24Z" }), _jsx("path", { d: "M59.5088 24H63.0117V20.48H59.5088V24Z" }), _jsx("path", { d: "M69.4396 17.76H77.1506V14.6057H69.4396V11.2457H77.8103V8H65.7547V24H69.4396V17.76Z" }), _jsx("path", { d: "M80.3151 24H84V8H80.3151V24Z" }), _jsx("path", { d: "M14.6163 21.6947L5.1336 23.89C4.78772 23.9766 4.52832 24.3232 4.52832 24.6698V31.1978C4.52832 31.7467 4.96066 32.0933 5.50829 31.9777L18.7379 28.9159C19.2856 28.8004 19.5162 28.2805 19.2856 27.7894L16.8933 22.8501C16.5186 22.0702 16.8933 21.2614 17.7291 21.0881L26.376 19.0084C26.9813 18.864 27.5001 18.2285 27.5001 17.593V11.5561C27.5001 11.0073 27.0677 10.6318 26.5201 10.7762L14.0398 13.7514C13.2616 13.9247 12.9157 14.6757 13.2616 15.3978L15.4521 19.9327C15.8268 20.7126 15.4521 21.4925 14.6163 21.6947Z" }), _jsx("path", { d: "M8.36225 5.3748L10.841 10.4585C11.1581 11.1229 10.841 11.8161 10.1204 11.9606L5.53762 13.0293C4.96116 13.1737 4.5 13.7514 4.5 14.3291V19.7884C4.5 20.7127 5.24939 21.2904 6.1429 21.0882L10.4087 20.1061C10.9851 19.9906 11.4463 19.384 11.4463 18.8063L11.4751 13.2026C11.4751 12.4227 12.1092 11.6428 12.8586 11.4695L26.8376 8.11886C27.1835 8.03221 27.4429 7.68559 27.4429 7.33897V0.810981C27.4429 0.262168 27.0106 -0.113336 26.4629 0.0310883L8.90988 4.24829C8.36225 4.36383 8.13167 4.88375 8.36225 5.3748Z" })] })));

package/icons/LiFiLogo.d.ts

@@ -0,0 +1,2 @@
+import { SVGProps } from 'react';
+export declare const LiFiLogo: (props: SVGProps<SVGSVGElement>) => JSX.Element;

package/icons/LiFiLogo.js

@@ -0,0 +1,2 @@
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+export const LiFiLogo = (props) => (_jsxs("svg", Object.assign({ width: "32", height: "32", viewBox: "0 0 32 32", fill: "inherit", xmlns: "http://www.w3.org/2000/svg" }, props, { children: [_jsx("path", { d: "M14.6163 21.6947L5.1336 23.89C4.78772 23.9766 4.52832 24.3232 4.52832 24.6698V31.1978C4.52832 31.7467 4.96066 32.0933 5.50829 31.9777L18.7379 28.9159C19.2856 28.8004 19.5162 28.2805 19.2856 27.7894L16.8933 22.8501C16.5186 22.0702 16.8933 21.2614 17.7291 21.0881L26.376 19.0084C26.9813 18.864 27.5001 18.2285 27.5001 17.593V11.5561C27.5001 11.0073 27.0677 10.6318 26.5201 10.7762L14.0398 13.7514C13.2616 13.9247 12.9157 14.6757 13.2616 15.3978L15.4521 19.9327C15.8268 20.7126 15.4521 21.4925 14.6163 21.6947Z" }), _jsx("path", { d: "M8.36225 5.3748L10.841 10.4585C11.1581 11.1229 10.841 11.8161 10.1204 11.9606L5.53762 13.0293C4.96116 13.1737 4.5 13.7514 4.5 14.3291V19.7884C4.5 20.7127 5.24939 21.2904 6.1429 21.0882L10.4087 20.1061C10.9851 19.9906 11.4463 19.384 11.4463 18.8063L11.4751 13.2026C11.4751 12.4227 12.1092 11.6428 12.8586 11.4695L26.8376 8.11886C27.1835 8.03221 27.4429 7.68559 27.4429 7.33897V0.810981C27.4429 0.262168 27.0106 -0.113336 26.4629 0.0310883L8.90988 4.24829C8.36225 4.36383 8.13167 4.88375 8.36225 5.3748Z" })] })));

package/icons/LiFiToolLogo.d.ts

@@ -0,0 +1,2 @@
+import { SVGProps } from 'react';
+export declare const LiFiToolLogo: (props: SVGProps<SVGSVGElement>) => JSX.Element;

package/icons/LiFiToolLogo.js

@@ -0,0 +1,2 @@
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+export const LiFiToolLogo = (props) => (_jsxs("svg", Object.assign({ width: "32", height: "32", viewBox: "0 0 32 32", fill: "none", xmlns: "http://www.w3.org/2000/svg" }, props, { children: [_jsx("circle", { cx: "16", cy: "16", r: "16", fill: "#F5B5FF" }), _jsx("path", { d: "M15.5031 19.2031L10.1691 20.4379C9.97453 20.4867 9.82861 20.6816 9.82861 20.8766V24.5486C9.82861 24.8573 10.0718 25.0523 10.3798 24.9873L17.8215 23.265C18.1296 23.2 18.2593 22.9076 18.1296 22.6314L16.7839 19.853C16.5731 19.4143 16.7839 18.9594 17.2541 18.8619L22.1179 17.692C22.4584 17.6108 22.7502 17.2534 22.7502 16.8959V13.5001C22.7502 13.1914 22.507 12.9802 22.199 13.0614L15.1788 14.735C14.7411 14.8324 14.5465 15.2549 14.7411 15.6611L15.9733 18.212C16.184 18.6507 15.9733 19.0893 15.5031 19.2031Z", fill: "black" }), _jsx("path", { d: "M11.985 10.0233L13.3793 12.8829C13.5577 13.2566 13.3793 13.6466 12.974 13.7278L10.3962 14.329C10.0719 14.4102 9.8125 14.7352 9.8125 15.0601V18.1309C9.8125 18.6509 10.234 18.9758 10.7366 18.8621L13.1361 18.3097C13.4604 18.2447 13.7198 17.9035 13.7198 17.5785L13.736 14.4265C13.736 13.9878 14.0927 13.5491 14.5142 13.4516L22.3774 11.5669C22.572 11.5181 22.7179 11.3231 22.7179 11.1282V7.45618C22.7179 7.14747 22.4747 6.93625 22.1666 7.01749L12.2931 9.38966C11.985 9.45465 11.8553 9.74711 11.985 10.0233Z", fill: "black" })] })));

package/icons/index.d.ts

@@ -0,0 +1,3 @@
+export * from './LiFiFullLogo';
+export * from './LiFiLogo';
+export * from './LiFiToolLogo';

package/icons/index.js

@@ -0,0 +1,3 @@
+export * from './LiFiFullLogo';
+export * from './LiFiLogo';
+export * from './LiFiToolLogo';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lifi/widget",
-  "version": "1.12.1",
+  "version": "1.13.2",
   "description": "LI.FI Widget for cross-chain bridging and swapping. It will drive your multi-chain strategy and attract new users from everywhere.",
   "sideEffects": false,
   "main": "./index.js",
@@ -42,25 +42,24 @@
     "@ethersproject/experimental": "^5.6.3",
     "@ethersproject/providers": "^5.6.8",
     "@lifi/sdk": "^1.1.3",
-    "@lifi/wallet-management": "^1.1.3",
+    "@lifi/wallet-management": "^1.1.4",
     "@mui/icons-material": "^5.8.4",
-    "@mui/lab": "^5.0.0-alpha.93",
-    "@mui/material": "^5.9.3",
-    "@sentry/integrations": "^7.9.0",
-    "@sentry/react": "^7.9.0",
-    "@sentry/tracing": "^7.9.0",
-    "@tanstack/react-query": "^4.0.10",
+    "@mui/lab": "^5.0.0-alpha.95",
+    "@mui/material": "^5.10.1",
+    "@sentry/integrations": "^7.10.0",
+    "@sentry/react": "^7.10.0",
+    "@sentry/tracing": "^7.10.0",
+    "@tanstack/react-query": "^4.1.3",
+    "@tanstack/react-virtual": "^3.0.0-beta.17",
     "big.js": "^6.2.1",
-    "i18next": "^21.8.16",
+    "i18next": "^21.9.1",
     "immer": "^9.0.15",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
-    "react-hook-form": "^7.34.0",
-    "react-i18next": "^11.18.3",
-    "react-resize-detector": "^7.1.2",
+    "react-hook-form": "^7.34.2",
+    "react-i18next": "^11.18.4",
     "react-router-dom": "^6.3.0",
     "react-timer-hook": "^3.0.5",
-    "react-virtual": "^2.10.4",
     "zustand": "^4.0.0"
   },
   "eslintConfig": {

package/pages/SelectTokenPage/ChainSelect.js

@@ -6,20 +6,23 @@ import { useTranslation } from 'react-i18next';
 import { Card, CardTitle } from '../../components/Card';
 import { Select } from '../../components/Select';
 import { useChains } from '../../hooks';
-import { SwapFormKeyHelper, } from '../../providers/SwapFormProvider';
+import { SwapFormKey, SwapFormKeyHelper, } from '../../providers/SwapFormProvider';
 import { useWidgetConfig } from '../../providers/WidgetProvider';
 export const ChainSelect = ({ formType }) => {
     const { t } = useTranslation();
-    const { setValue } = useFormContext();
+    const { setValue, register } = useFormContext();
     const { fromChain, toChain } = useWidgetConfig();
     const { chains, isLoading } = useChains();
+    const chainKey = SwapFormKeyHelper.getChainKey(formType);
     const [chainId] = useWatch({
-        name: [SwapFormKeyHelper.getChainKey(formType)],
+        name: [chainKey],
     });
+    const { onChange, onBlur, name, ref } = register(chainKey);
     const handleChain = (event) => {
-        setValue(SwapFormKeyHelper.getChainKey(formType), event.target.value);
+        onChange(event);
         setValue(SwapFormKeyHelper.getTokenKey(formType), '');
         setValue(SwapFormKeyHelper.getAmountKey(formType), '');
+        setValue(SwapFormKey.TokenSearchFilter, '');
     };
-    return !isLoading ? (_jsxs(Card, { children: [_jsx(CardTitle, { children: t(`swap.selectChain`) }), _jsx(FormControl, Object.assign({ fullWidth: true }, { children: _jsx(Select, Object.assign({ labelId: "label", MenuProps: { elevation: 2 }, defaultValue: formType === 'from' ? fromChain : toChain, value: chainId, onChange: handleChain, IconComponent: KeyboardArrowDownIcon }, { children: chains === null || chains === void 0 ? void 0 : chains.map((chain) => (_jsxs(MenuItem, Object.assign({ value: chain.id }, { children: [_jsx(ListItemAvatar, { children: _jsx(Avatar, Object.assign({ src: chain.logoURI, alt: chain.key }, { children: chain.name[0] })) }), chain.name] }), chain.key))) })) }))] })) : (_jsx(Skeleton, { variant: "rectangular", width: "100%", height: 98, sx: { borderRadius: 1 } }));
+    return !isLoading ? (_jsxs(Card, { children: [_jsx(CardTitle, { children: t(`swap.selectChain`) }), _jsx(FormControl, Object.assign({ fullWidth: true }, { children: _jsx(Select, Object.assign({ ref: ref, labelId: chainKey, name: name, MenuProps: { elevation: 2 }, defaultValue: formType === 'from' ? fromChain : toChain, value: chainId, onChange: handleChain, onBlur: onBlur, IconComponent: KeyboardArrowDownIcon }, { children: chains === null || chains === void 0 ? void 0 : chains.map((chain) => (_jsxs(MenuItem, Object.assign({ value: chain.id }, { children: [_jsx(ListItemAvatar, { children: _jsx(Avatar, Object.assign({ src: chain.logoURI, alt: chain.key }, { children: chain.name[0] })) }), chain.name] }), chain.key))) })) }))] })) : (_jsx(Skeleton, { variant: "rectangular", width: "100%", height: 98, sx: { borderRadius: 1 } }));
 };

package/pages/SelectTokenPage/SearchTokenInput.js

@@ -11,7 +11,7 @@ export const SearchTokenInput = () => {
     const { t } = useTranslation();
     const { register, setValue } = useFormContext();
     useEffect(() => () => {
-        setValue(SwapFormKey.SearchTokensFilter, '');
+        setValue(SwapFormKey.TokenSearchFilter, '');
     }, [setValue]);
-    return (_jsx(Card, { children: _jsx(FormControl, Object.assign({ fullWidth: true }, { children: _jsx(Input, { size: "small", placeholder: t(`swap.tokenSearch`), defaultValue: "", endAdornment: _jsx(InputAdornment, Object.assign({ position: "end" }, { children: _jsx(SearchIcon, {}) })), inputProps: Object.assign({ inputMode: 'search' }, register(SwapFormKey.SearchTokensFilter)), autoComplete: "off" }) })) }));
+    return (_jsx(Card, { children: _jsx(FormControl, Object.assign({ fullWidth: true }, { children: _jsx(Input, { size: "small", placeholder: t(`swap.tokenSearch`), defaultValue: "", endAdornment: _jsx(InputAdornment, Object.assign({ position: "end" }, { children: _jsx(SearchIcon, {}) })), inputProps: Object.assign({ inputMode: 'search' }, register(SwapFormKey.TokenSearchFilter)), autoComplete: "off" }) })) }));
 };

package/pages/SelectWalletPage/SelectWalletPage.js

@@ -43,7 +43,7 @@ export const SelectWalletPage = () => {
     return (_jsxs(Container, Object.assign({ disableGutters: true }, { children: [_jsx(List, Object.assign({ sx: {
                     paddingLeft: 2,
                     paddingRight: 2,
-                } }, { children: supportedWallets.map((wallet) => (_jsxs(WalletListItemButton, Object.assign({ onClick: (event) => handleConnect(event, wallet), disableRipple: true }, { children: [_jsx(ListItemAvatar, { children: _jsx(Avatar, Object.assign({ src: wallet.icon, alt: wallet.name }, { children: wallet.name[0] })) }), _jsx(WalletListItemText, { primary: wallet.name })] }), wallet.name))) })), _jsxs(Dialog, Object.assign({ open: walletIdentity.show, onClose: closeDialog }, { children: [_jsx(DialogContent, { children: _jsx(DialogContentText, { children: t('wallet.extensionNotFound', {
+                } }, { children: supportedWallets.map((wallet) => (_jsxs(WalletListItemButton, Object.assign({ onClick: (event) => handleConnect(event, wallet), disableRipple: true }, { children: [_jsx(ListItemAvatar, { children: _jsx(Avatar, Object.assign({ src: wallet.icon.src || wallet.icon, alt: wallet.name }, { children: wallet.name[0] })) }), _jsx(WalletListItemText, { primary: wallet.name })] }), wallet.name))) })), _jsxs(Dialog, Object.assign({ open: walletIdentity.show, onClose: closeDialog }, { children: [_jsx(DialogContent, { children: _jsx(DialogContentText, { children: t('wallet.extensionNotFound', {
                                 name: (_a = walletIdentity.wallet) === null || _a === void 0 ? void 0 : _a.name,
                             }) }) }), _jsx(DialogActions, { children: _jsx(Button, Object.assign({ onClick: closeDialog, autoFocus: true }, { children: t('button.ok') })) })] }))] })));
 };

package/pages/SwapPage/StatusBottomSheet.js

@@ -17,10 +17,10 @@ export const StatusBottomSheet = ({ status, route, }) => {
     const navigate = useNavigate();
     const ref = useRef(null);
     const { getChainById } = useChains();
-    const { token, refetchBalance } = useTokenBalance(route.toChainId, route.toToken.address);
+    const { token, refetch: refetchBalance } = useTokenBalance(route.toChainId, route.toToken.address);
     const { setValue } = useFormContext();
     const clearFromAmount = () => {
-        refetchBalance(route.fromChainId, route.fromToken.address);
+        refetchBalance();
         setValue(SwapFormKey.FromAmount, '');
     };
     const handleDone = () => {

package/providers/SwapFormProvider/SwapFormProvider.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="react" />
 export declare const formDefaultValues: {
     fromAmount: string;
-    searchTokensFilter: string;
+    tokenSearchFilter: string;
 };
 export declare const SwapFormProvider: React.FC<React.PropsWithChildren<{}>>;

package/providers/SwapFormProvider/SwapFormProvider.js

@@ -1,18 +1,41 @@
 import { jsx as _jsx } from "react/jsx-runtime";
+import { ChainId } from '@lifi/sdk';
+import { useEffect } from 'react';
 import { FormProvider, useForm } from 'react-hook-form';
+import { useWallet } from '../WalletProvider';
 import { useWidgetConfig } from '../WidgetProvider';
 import { SwapFormKey } from './types';
 export const formDefaultValues = {
     [SwapFormKey.FromAmount]: '',
-    [SwapFormKey.SearchTokensFilter]: '',
+    [SwapFormKey.TokenSearchFilter]: '',
 };
 export const SwapFormProvider = ({ children, }) => {
-    var _a;
+    const { account } = useWallet();
     const { fromChain, fromToken, fromAmount, toChain, toToken } = useWidgetConfig();
     const methods = useForm({
-        defaultValues: Object.assign(Object.assign({}, formDefaultValues), { fromChain,
-            fromToken, fromAmount: (_a = fromAmount === null || fromAmount === void 0 ? void 0 : fromAmount.toPrecision()) !== null && _a !== void 0 ? _a : formDefaultValues.fromAmount, toChain,
-            toToken }),
+        defaultValues: Object.assign(Object.assign({}, formDefaultValues), { fromChain: fromChain !== null && fromChain !== void 0 ? fromChain : ChainId.ETH, fromToken, fromAmount: (typeof fromAmount === 'number'
+                ? fromAmount === null || fromAmount === void 0 ? void 0 : fromAmount.toPrecision()
+                : fromAmount) || formDefaultValues.fromAmount, toChain: toChain !== null && toChain !== void 0 ? toChain : ChainId.ETH, toToken }),
     });
+    // Set wallet chain as default if no chains are provided by config and if they were not changed during widget usage
+    useEffect(() => {
+        if (!account.isActive || !account.chainId) {
+            return;
+        }
+        const { isDirty: isFromChainDirty, isTouched: isFromChainTouched } = methods.getFieldState(SwapFormKey.FromChain, methods.formState);
+        if (!fromChain && !isFromChainDirty && !isFromChainTouched) {
+            methods.setValue(SwapFormKey.FromChain, account.chainId, {
+                shouldDirty: false,
+                shouldTouch: false,
+            });
+        }
+        const { isDirty: isToChainDirty, isTouched: isToChainTouched } = methods.getFieldState(SwapFormKey.ToChain, methods.formState);
+        if (!toChain && !isToChainDirty && !isToChainTouched) {
+            methods.setValue(SwapFormKey.ToChain, account.chainId, {
+                shouldDirty: false,
+                shouldTouch: false,
+            });
+        }
+    }, [account.chainId, account.isActive, fromChain, methods, toChain]);
     return _jsx(FormProvider, Object.assign({}, methods, { children: children }));
 };

package/providers/SwapFormProvider/types.d.ts

@@ -2,7 +2,7 @@ export declare enum SwapFormKey {
     FromAmount = "fromAmount",
     FromChain = "fromChain",
     FromToken = "fromToken",
-    SearchTokensFilter = "searchTokensFilter",
+    TokenSearchFilter = "tokenSearchFilter",
     ToChain = "toChain",
     ToToken = "toToken"
 }
@@ -10,7 +10,7 @@ export declare type SwapFormValues = {
     [SwapFormKey.FromAmount]: string;
     [SwapFormKey.FromChain]: number;
     [SwapFormKey.FromToken]: string;
-    [SwapFormKey.SearchTokensFilter]: string;
+    [SwapFormKey.TokenSearchFilter]: string;
     [SwapFormKey.ToChain]: number;
     [SwapFormKey.ToToken]: string;
 };
@@ -19,7 +19,6 @@ export declare const SwapFormKeyHelper: {
     getChainKey: (formType: SwapFormDirection) => 'fromChain' | 'toChain';
     getTokenKey: (formType: SwapFormDirection) => 'fromToken' | 'toToken';
     getAmountKey: (formType: SwapFormDirection) => 'fromAmount' | 'toAmount';
-    getSearchTokensFilterKey: (formType: SwapFormDirection) => string;
 };
 export interface SwapFormTypeProps {
     formType: SwapFormDirection;

package/providers/SwapFormProvider/types.js

@@ -3,7 +3,7 @@ export var SwapFormKey;
     SwapFormKey["FromAmount"] = "fromAmount";
     SwapFormKey["FromChain"] = "fromChain";
     SwapFormKey["FromToken"] = "fromToken";
-    SwapFormKey["SearchTokensFilter"] = "searchTokensFilter";
+    SwapFormKey["TokenSearchFilter"] = "tokenSearchFilter";
     SwapFormKey["ToChain"] = "toChain";
     SwapFormKey["ToToken"] = "toToken";
 })(SwapFormKey || (SwapFormKey = {}));
@@ -11,5 +11,4 @@ export const SwapFormKeyHelper = {
     getChainKey: (formType) => `${formType}Chain`,
     getTokenKey: (formType) => `${formType}Token`,
     getAmountKey: (formType) => `${formType}Amount`,
-    getSearchTokensFilterKey: (formType) => `${formType}SearchTokensFilter`,
 };

package/providers/WalletProvider/WalletProvider.d.ts

@@ -11,4 +11,9 @@ export declare const extractAccountFromSigner: (signer?: Signer) => Promise<{
     isActive: boolean;
     signer: Signer | undefined;
     chainId: number | undefined;
+} | {
+    address?: undefined;
+    isActive?: undefined;
+    signer?: undefined;
+    chainId?: undefined;
 }>;

package/providers/WalletProvider/WalletProvider.js

@@ -85,10 +85,16 @@ export const WalletProvider = ({ children, walletManagement }) => {
     return (_jsx(WalletContext.Provider, Object.assign({ value: value }, { children: children })));
 };
 export const extractAccountFromSigner = (signer) => __awaiter(void 0, void 0, void 0, function* () {
-    return ({
-        address: (yield (signer === null || signer === void 0 ? void 0 : signer.getAddress())) || undefined,
-        isActive: (signer && !!(yield signer.getAddress()) === null) || !!signer,
-        signer,
-        chainId: (yield (signer === null || signer === void 0 ? void 0 : signer.getChainId())) || undefined,
-    });
+    try {
+        return {
+            address: (yield (signer === null || signer === void 0 ? void 0 : signer.getAddress())) || undefined,
+            isActive: (signer && !!(yield signer.getAddress()) === null) || !!signer,
+            signer,
+            chainId: (yield (signer === null || signer === void 0 ? void 0 : signer.getChainId())) || undefined,
+        };
+    }
+    catch (error) {
+        console.log(error);
+        return {};
+    }
 });

package/providers/WidgetProvider/WidgetProvider.js

@@ -10,10 +10,9 @@ var __rest = (this && this.__rest) || function (s, e) {
     return t;
 };
 import { jsx as _jsx } from "react/jsx-runtime";
-import { ChainId, getChainByKey } from '@lifi/sdk';
+import { getChainByKey } from '@lifi/sdk';
 import { createContext, useContext, useEffect, useMemo } from 'react';
 import { updateLiFiConfig } from '../../config/lifi';
-import { useWallet } from '../WalletProvider';
 const stub = () => {
     throw new Error('You forgot to wrap your component in <WidgetProvider>.');
 };
@@ -23,26 +22,36 @@ const initialContext = {
 const WidgetContext = createContext(initialContext);
 export const useWidgetConfig = () => useContext(WidgetContext);
 export const WidgetProvider = (_a) => {
-    var { children } = _a, _b = _a.config, _c = _b === void 0 ? {} : _b, { fromChain, fromToken, toChain, toToken, integrator } = _c, config = __rest(_c, ["fromChain", "fromToken", "toChain", "toToken", "integrator"]);
-    const { account } = useWallet();
+    var { children } = _a, _b = _a.config, _c = _b === void 0 ? {} : _b, { fromChain, fromToken, toChain, toToken, fromAmount, integrator } = _c, config = __rest(_c, ["fromChain", "fromToken", "toChain", "toToken", "fromAmount", "integrator"]);
     const value = useMemo(() => {
-        var _a;
+        var _a, _b, _c, _d;
         try {
-            return Object.assign(Object.assign({}, config), { fromChain: typeof fromChain === 'number'
-                    ? fromChain
-                    : typeof fromChain === 'string'
-                        ? getChainByKey(fromChain.toLowerCase()).id
-                        : (_a = account.chainId) !== null && _a !== void 0 ? _a : ChainId.ETH, toChain: typeof toChain === 'number'
-                    ? toChain
-                    : typeof toChain === 'string'
-                        ? getChainByKey(toChain.toLowerCase()).id
-                        : ChainId.ETH, fromToken: fromToken === null || fromToken === void 0 ? void 0 : fromToken.toLowerCase(), toToken: toToken === null || toToken === void 0 ? void 0 : toToken.toLowerCase() });
+            const searchParams = Object.fromEntries(new URLSearchParams(window === null || window === void 0 ? void 0 : window.location.search));
+            return Object.assign(Object.assign({}, config), { fromChain: (searchParams.fromChain &&
+                    isNaN(parseInt(searchParams.fromChain, 10))) ||
+                    typeof fromChain === 'string'
+                    ? getChainByKey((_a = (searchParams.fromChain || fromChain)) === null || _a === void 0 ? void 0 : _a.toLowerCase()).id
+                    : (searchParams.fromChain &&
+                        !isNaN(parseInt(searchParams.fromChain, 10))) ||
+                        typeof fromChain === 'number'
+                        ? parseInt(searchParams.fromChain, 10) || fromChain
+                        : undefined, toChain: (searchParams.toChain && isNaN(parseInt(searchParams.toChain, 10))) ||
+                    typeof toChain === 'string'
+                    ? getChainByKey((_b = (searchParams.toChain || toChain)) === null || _b === void 0 ? void 0 : _b.toLowerCase()).id
+                    : (searchParams.toChain &&
+                        !isNaN(parseInt(searchParams.toChain, 10))) ||
+                        typeof toChain === 'number'
+                        ? parseInt(searchParams.toChain, 10) || toChain
+                        : undefined, fromToken: ((_c = searchParams.fromToken) === null || _c === void 0 ? void 0 : _c.toLowerCase()) || (fromToken === null || fromToken === void 0 ? void 0 : fromToken.toLowerCase()), toToken: ((_d = searchParams.toToken) === null || _d === void 0 ? void 0 : _d.toLowerCase()) || (toToken === null || toToken === void 0 ? void 0 : toToken.toLowerCase()), fromAmount: typeof searchParams.fromAmount === 'string' &&
+                    !isNaN(parseFloat(searchParams.fromAmount))
+                    ? searchParams.fromAmount
+                    : fromAmount });
         }
         catch (e) {
             console.warn(e);
             return config;
         }
-    }, [account.chainId, config, fromChain, fromToken, toChain, toToken]);
+    }, [config, fromAmount, fromChain, fromToken, toChain, toToken]);
     useEffect(() => {
         updateLiFiConfig({
             defaultRouteOptions: {

package/types/index.d.ts

@@ -1 +1,2 @@
+export * from './token';
 export * from './widget';