@lifi/widget 1.13.7 → 1.15.0

package/config/lifi.js

@@ -1,5 +1,7 @@
 import LIFI from '@lifi/sdk';
-export const LiFi = new LIFI();
+export const LiFi = new LIFI({
+    disableVersionCheck: true,
+});
 export const updateLiFiConfig = (configUpdate) => {
     LiFi.setConfig(configUpdate);
 };

package/config/version.d.ts

@@ -1,2 +1,2 @@
 export declare const name = "@lifi/widget";
-export declare const version = "1.13.7";
+export declare const version = "1.15.0";

package/config/version.js

@@ -1,2 +1,2 @@
 export const name = '@lifi/widget';
-export const version = '1.13.7';
+export const version = '1.15.0';

package/hooks/index.d.ts

@@ -5,6 +5,7 @@ export * from './useDebouncedWatch';
 export * from './useFeaturedTokens';
 export * from './useGasSufficiency';
 export * from './useInitializer';
+export * from './useNavigateBack';
 export * from './useRouteExecution';
 export * from './useScrollableContainer';
 export * from './useSwapRoutes';

package/hooks/index.js

@@ -5,6 +5,7 @@ export * from './useDebouncedWatch';
 export * from './useFeaturedTokens';
 export * from './useGasSufficiency';
 export * from './useInitializer';
+export * from './useNavigateBack';
 export * from './useRouteExecution';
 export * from './useScrollableContainer';
 export * from './useSwapRoutes';

package/hooks/useNavigateBack.d.ts

@@ -0,0 +1,4 @@
+export declare const useNavigateBack: () => {
+    navigateBack: () => void;
+    navigate: import("react-router-dom").NavigateFunction;
+};

package/hooks/useNavigateBack.js

@@ -0,0 +1,14 @@
+import { useCallback } from 'react';
+import { useNavigate } from 'react-router-dom';
+export const useNavigateBack = () => {
+    const navigate = useNavigate();
+    const navigateBack = useCallback(() => {
+        if (window.history.state && window.history.state.idx > 0) {
+            navigate(-1);
+        }
+        else {
+            navigate(window.location.pathname.substring(0, window.location.pathname.lastIndexOf('/')) || '/', { replace: true });
+        }
+    }, [navigate]);
+    return { navigateBack, navigate };
+};

package/hooks/useSwapRoutes.js

@@ -7,6 +7,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+import { isAddress } from '@ethersproject/address';
 import { useQuery, useQueryClient } from '@tanstack/react-query';
 import Big from 'big.js';
 import { useWatch } from 'react-hook-form';
@@ -18,7 +19,7 @@ import { useSettings } from '../stores';
 const refetchTime = 60000;
 export const useSwapRoutes = () => {
     var _a;
-    const { account } = useWallet();
+    const { account, provider } = useWallet();
     const queryClient = useQueryClient();
     const { slippage, enabledBridges, enabledExchanges, routePriority } = useSettings([
         'slippage',
@@ -26,12 +27,13 @@ export const useSwapRoutes = () => {
         'enabledBridges',
         'enabledExchanges',
     ]);
-    const [fromChainId, fromTokenAddress, toChainId, toTokenAddress] = useWatch({
+    const [fromChainId, fromTokenAddress, toChainId, toTokenAddress, toAddress] = useWatch({
         name: [
             SwapFormKey.FromChain,
             SwapFormKey.FromToken,
             SwapFormKey.ToChain,
             SwapFormKey.ToToken,
+            SwapFormKey.ToAddress,
         ],
     });
     const [fromTokenAmount] = useDebouncedWatch([SwapFormKey.FromAmount], 250);
@@ -53,6 +55,7 @@ export const useSwapRoutes = () => {
         fromTokenAmount,
         toChainId,
         toTokenAddress,
+        toAddress,
         slippage,
         enabledBridges,
         enabledExchanges,
@@ -62,16 +65,24 @@ export const useSwapRoutes = () => {
     const refetchInterval = previousDataUpdatedAt
         ? Math.min(Math.abs(refetchTime - (Date.now() - previousDataUpdatedAt)), refetchTime)
         : refetchTime;
-    const { data, isLoading, isFetching, isFetched, dataUpdatedAt, refetch } = useQuery(queryKey, ({ queryKey: [_, address, fromChainId, fromTokenAddress, fromTokenAmount, toChainId, toTokenAddress, slippage, enabledBridges, enabledExchanges, routePriority,], signal, }) => __awaiter(void 0, void 0, void 0, function* () {
-        var _b;
+    const { data, isLoading, isFetching, isFetched, dataUpdatedAt, refetch } = useQuery(queryKey, ({ queryKey: [_, fromAddress, fromChainId, fromTokenAddress, fromTokenAmount, toChainId, toTokenAddress, toAddress, slippage, enabledBridges, enabledExchanges, routePriority,], signal, }) => __awaiter(void 0, void 0, void 0, function* () {
+        var _b, _c;
+        let toWalletAddress;
+        try {
+            toWalletAddress =
+                (_b = (yield (provider === null || provider === void 0 ? void 0 : provider.resolveName(toAddress)))) !== null && _b !== void 0 ? _b : (isAddress(toAddress) ? toAddress : fromAddress);
+        }
+        catch (_d) {
+            toWalletAddress = isAddress(toAddress) ? toAddress : fromAddress;
+        }
         return LiFi.getRoutes({
             fromChainId,
-            fromAmount: Big(Number(fromTokenAmount) * Math.pow(10, ((_b = token === null || token === void 0 ? void 0 : token.decimals) !== null && _b !== void 0 ? _b : 0))).toString(),
+            fromAmount: Big(Number(fromTokenAmount) * Math.pow(10, ((_c = token === null || token === void 0 ? void 0 : token.decimals) !== null && _c !== void 0 ? _c : 0))).toString(),
             fromTokenAddress,
             toChainId,
             toTokenAddress,
-            fromAddress: address,
-            toAddress: address,
+            fromAddress,
+            toAddress: toWalletAddress,
             options: {
                 slippage: slippage / 100,
                 bridges: {

package/i18n/en/translation.json

@@ -52,24 +52,26 @@
     "selectChainAndToken": "Select chain and token",
     "featuredTokens": "Featured tokens",
     "otherTokens": "Other tokens",
-    "inProgress": "In progress",
+    "inProgress": "in progress",
+    "activeTransfers": "Active transfers",
     "couldntFindTokens": "We couldn't find tokens on this chain or you don't have any.",
     "stepSwap": "Swap",
     "stepBridge": "Bridge",
     "stepSwapAndBridge": "Swap and bridge",
     "estimatedTime": "~{{value}} min.",
-    "networkIsBusy": "Network is busy...",
     "crossStepDetails": "Bridge from {{from}} to {{to}} via {{tool}}",
     "swapStepDetails": "Swap on {{chain}} via {{tool}}",
     "tokenOnChain": "{{tokenSymbol}} on {{chainName}}",
     "tokenOnChainAmount": "{{amount}} {{tokenSymbol}} on {{chainName}}",
     "routeId": "Route ID",
+    "sendToWallet": "Send to a different wallet",
+    "walletAddressOrEns": "Wallet address or ENS name",
     "tags": {
-      "recommended": "Recommended",
-      "fastest": "Fast",
-      "cheapest": "Cheap",
-      "safest": "Safe",
-      "general": "General"
+      "RECOMMENDED": "RECOMMENDED",
+      "FASTEST": "FAST",
+      "CHEAPEST": "CHEAP",
+      "SAFEST": "SAFE",
+      "ALTERNATIVE": "ALTERNATIVE"
     },
     "success": {
       "title": {
@@ -109,7 +111,9 @@
         "transactionUnprepared": "Unable to prepare transaction.",
         "unknown": "Something went wrong.",
         "userRejectedSignatureRequest": "Signature required.",
-        "slippageTooLarge": "Slippage too large."
+        "slippageTooLarge": "Slippage too large.",
+        "walletAddressInvalid": "Wallet address is invalid.",
+        "walletEnsAddressInvalid": "Wallet address is invalid or network doesn't support ENS."
       },
       "message": {
         "signatureRequired": "Your signature is required to complete the transaction. {{amount}} {{tokenSymbol}} on {{chainName}} remain in your wallet.",
@@ -156,6 +160,7 @@
       "fast": "Fast"
     },
     "advancedPreferences": "Advanced preferences",
+    "showDestinationWallet": "Show destination wallet",
     "enabledBridges": "Enabled bridges",
     "selectEnabledBridges": "Select enabled bridges",
     "enabledExchanges": "Enabled exchanges",

package/i18n/index.d.ts

@@ -56,23 +56,25 @@ export declare const resources: {
                 featuredTokens: string;
                 otherTokens: string;
                 inProgress: string;
+                activeTransfers: string;
                 couldntFindTokens: string;
                 stepSwap: string;
                 stepBridge: string;
                 stepSwapAndBridge: string;
                 estimatedTime: string;
-                networkIsBusy: string;
                 crossStepDetails: string;
                 swapStepDetails: string;
                 tokenOnChain: string;
                 tokenOnChainAmount: string;
                 routeId: string;
+                sendToWallet: string;
+                walletAddressOrEns: string;
                 tags: {
-                    recommended: string;
-                    fastest: string;
-                    cheapest: string;
-                    safest: string;
-                    general: string;
+                    RECOMMENDED: string;
+                    FASTEST: string;
+                    CHEAPEST: string;
+                    SAFEST: string;
+                    ALTERNATIVE: string;
                 };
                 success: {
                     title: {
@@ -113,6 +115,8 @@ export declare const resources: {
                         unknown: string;
                         userRejectedSignatureRequest: string;
                         slippageTooLarge: string;
+                        walletAddressInvalid: string;
+                        walletEnsAddressInvalid: string;
                     };
                     message: {
                         signatureRequired: string;
@@ -159,6 +163,7 @@ export declare const resources: {
                     fast: string;
                 };
                 advancedPreferences: string;
+                showDestinationWallet: string;
                 enabledBridges: string;
                 selectEnabledBridges: string;
                 enabledExchanges: string;

package/package.json

@@ -1,9 +1,10 @@
 {
   "name": "@lifi/widget",
-  "version": "1.13.7",
+  "version": "1.15.0",
   "description": "LI.FI Widget for cross-chain bridging and swapping. It will drive your multi-chain strategy and attract new users from everywhere.",
   "main": "./cjs/index.js",
   "module": "./index.js",
+  "types": "./index.d.ts",
   "lint-staged": {
     "src/**/*.{ts,tsx}": [
       "yarn run lint:fix",
@@ -38,13 +39,14 @@
   "dependencies": {
     "@emotion/react": "^11.10.0",
     "@emotion/styled": "^11.10.0",
+    "@ethersproject/address": "^5.7.0",
     "@ethersproject/experimental": "^5.7.0",
     "@ethersproject/providers": "^5.7.0",
-    "@lifi/sdk": "^1.1.6",
-    "@lifi/wallet-management": "^1.1.7",
-    "@mui/icons-material": "^5.8.4",
-    "@mui/lab": "^5.0.0-alpha.95",
-    "@mui/material": "^5.10.1",
+    "@lifi/sdk": "^1.2.2",
+    "@lifi/wallet-management": "^1.1.8",
+    "@mui/icons-material": "^5.10.2",
+    "@mui/lab": "^5.0.0-alpha.96",
+    "@mui/material": "^5.10.2",
     "@sentry/integrations": "^7.11.1",
     "@sentry/react": "^7.11.1",
     "@sentry/tracing": "^7.11.1",
@@ -75,10 +77,5 @@
     "extends": "../../.eslintrc"
   },
   "sideEffects": false,
-  "private": false,
-  "types": "./index.d.ts",
-  "exports": {
-    "require": "./cjs/index.js",
-    "import": "./index.js"
-  }
+  "private": false
 }

package/pages/MainPage/MainPage.js

@@ -1,11 +1,12 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { Box } from '@mui/material';
 import { SelectChainAndToken } from '../../components/SelectChainAndToken';
-import { SwapInProgress } from '../../components/SwapInProgress';
+import { SendToWallet } from '../../components/SendToWallet';
 import { SwapInput } from '../../components/SwapInput';
+import { SwapsInProgress } from '../../components/SwapsInProgress';
 import { FormContainer } from './MainPage.style';
 import { MainSwapButton } from './MainSwapButton';
 import { SwapRoutes } from './SwapRoutes';
 export const MainPage = () => {
-    return (_jsxs(FormContainer, Object.assign({ disableGutters: true }, { children: [_jsx(SwapInProgress, { mx: 3, mt: 1, mb: 2 }), _jsx(SelectChainAndToken, { mt: 1, mx: 3, mb: 3 }), _jsx(Box, Object.assign({ mx: 3, mb: 3 }, { children: _jsx(SwapInput, { formType: "from" }) })), _jsx(SwapRoutes, { mx: 3, mb: 3 }), _jsx(Box, Object.assign({ mx: 3, mb: 1 }, { children: _jsx(MainSwapButton, {}) }))] })));
+    return (_jsxs(FormContainer, Object.assign({ disableGutters: true }, { children: [_jsx(SwapsInProgress, { mx: 3, mt: 1, mb: 2 }), _jsx(SelectChainAndToken, { mt: 1, mx: 3, mb: 3 }), _jsx(Box, Object.assign({ mx: 3, mb: 3 }, { children: _jsx(SwapInput, { formType: "from" }) })), _jsx(SendToWallet, { mx: 3, mb: 3 }), _jsx(SwapRoutes, { mx: 3, mb: 3 }), _jsx(Box, Object.assign({ mx: 3, mb: 1 }, { children: _jsx(MainSwapButton, {}) }))] })));
 };

package/pages/SelectTokenPage/ChainSelect.d.ts

@@ -1,3 +1,3 @@
 /// <reference types="react" />
-import type { SwapFormTypeProps } from '../../providers/SwapFormProvider';
+import type { SwapFormTypeProps } from '../../providers';
 export declare const ChainSelect: ({ formType }: SwapFormTypeProps) => JSX.Element;

package/pages/SelectTokenPage/ChainSelect.js

@@ -6,8 +6,7 @@ import { useTranslation } from 'react-i18next';
 import { Card, CardTitle } from '../../components/Card';
 import { Select } from '../../components/Select';
 import { useChains } from '../../hooks';
-import { SwapFormKey, SwapFormKeyHelper, } from '../../providers/SwapFormProvider';
-import { useWidgetConfig } from '../../providers/WidgetProvider';
+import { SwapFormKey, SwapFormKeyHelper, useWidgetConfig, } from '../../providers';
 export const ChainSelect = ({ formType }) => {
     const { t } = useTranslation();
     const { setValue, register } = useFormContext();
@@ -17,12 +16,12 @@ export const ChainSelect = ({ formType }) => {
     const [chainId] = useWatch({
         name: [chainKey],
     });
-    const { onChange, onBlur, name, ref } = register(chainKey);
-    const handleChain = (event) => {
-        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({ 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 } }));
+    const { onChange, onBlur, name, ref } = register(chainKey, {
+        onChange: () => {
+            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({ ref: ref, labelId: chainKey, name: name, MenuProps: { elevation: 2 }, defaultValue: formType === 'from' ? fromChain : toChain, value: chainId, onChange: onChange, 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

@@ -5,7 +5,7 @@ import { useEffect } from 'react';
 import { useFormContext } from 'react-hook-form';
 import { useTranslation } from 'react-i18next';
 import { Card } from '../../components/Card';
-import { SwapFormKey } from '../../providers/SwapFormProvider';
+import { SwapFormKey } from '../../providers';
 import { Input } from './SearchTokenInput.style';
 export const SearchTokenInput = () => {
     const { t } = useTranslation();

package/pages/SelectTokenPage/SelectTokenPage.d.ts

@@ -1,5 +1,5 @@
 import type { FC } from 'react';
-import type { SwapFormDirection } from '../../providers/SwapFormProvider';
+import type { SwapFormDirection } from '../../providers';
 export declare const SelectTokenPage: FC<{
     formType: SwapFormDirection;
 }>;

package/pages/SelectTokenPage/SelectTokenPage.js

@@ -1,23 +1,19 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { Box, Container } from '@mui/material';
 import { useLayoutEffect, useRef, useState } from 'react';
-import { useNavigate } from 'react-router-dom';
 import { TokenList } from '../../components/TokenList';
-import { useContentHeight, useScrollableOverflowHidden } from '../../hooks';
+import { useContentHeight, useNavigateBack, useScrollableOverflowHidden, } from '../../hooks';
 import { ChainSelect } from './ChainSelect';
 import { SearchTokenInput } from './SearchTokenInput';
 export const SelectTokenPage = ({ formType, }) => {
     useScrollableOverflowHidden();
-    const navigate = useNavigate();
+    const { navigateBack } = useNavigateBack();
     const headerRef = useRef(null);
     const contentHeight = useContentHeight();
     const [headerHeight, setHeaderHeight] = useState(0);
-    const handleTokenClick = () => {
-        navigate(-1);
-    };
     useLayoutEffect(() => {
         var _a, _b;
         setHeaderHeight(contentHeight - ((_b = (_a = headerRef.current) === null || _a === void 0 ? void 0 : _a.offsetHeight) !== null && _b !== void 0 ? _b : 0));
     }, [contentHeight]);
-    return (_jsxs(Container, Object.assign({ disableGutters: true }, { children: [_jsxs(Box, Object.assign({ pt: 1, pb: 2, px: 3, ref: headerRef }, { children: [_jsx(ChainSelect, { formType: formType }), _jsx(Box, Object.assign({ mt: 2 }, { children: _jsx(SearchTokenInput, {}) }))] })), _jsx(TokenList, { height: headerHeight, onClick: handleTokenClick, formType: formType })] })));
+    return (_jsxs(Container, Object.assign({ disableGutters: true }, { children: [_jsxs(Box, Object.assign({ pt: 1, pb: 2, px: 3, ref: headerRef }, { children: [_jsx(ChainSelect, { formType: formType }), _jsx(Box, Object.assign({ mt: 2 }, { children: _jsx(SearchTokenInput, {}) }))] })), _jsx(TokenList, { height: headerHeight, onClick: navigateBack, formType: formType })] })));
 };

package/pages/SelectWalletPage/SelectWalletPage.js

@@ -12,14 +12,14 @@ import { supportedWallets } from '@lifi/wallet-management';
 import { Avatar, Button, Container, DialogActions, DialogContent, DialogContentText, List, ListItemAvatar, } from '@mui/material';
 import { useCallback, useState } from 'react';
 import { useTranslation } from 'react-i18next';
-import { useNavigate } from 'react-router-dom';
 import { Dialog } from '../../components/Dialog';
-import { useWallet } from '../../providers/WalletProvider';
+import { useNavigateBack } from '../../hooks';
+import { useWallet } from '../../providers';
 import { WalletListItemButton, WalletListItemText, } from './SelectWalletPage.style';
 export const SelectWalletPage = () => {
     var _a;
     const { t } = useTranslation();
-    const navigate = useNavigate();
+    const { navigateBack } = useNavigateBack();
     const { connect } = useWallet();
     const [walletIdentity, setWalletIdentity] = useState({ show: false });
     const closeDialog = () => {
@@ -37,9 +37,9 @@ export const SelectWalletPage = () => {
             });
             return;
         }
-        navigate(-1);
+        navigateBack();
         yield connect(wallet);
-    }), [connect, navigate]);
+    }), [connect, navigateBack]);
     return (_jsxs(Container, Object.assign({ disableGutters: true }, { children: [_jsx(List, Object.assign({ sx: {
                     paddingLeft: 2,
                     paddingRight: 2,

package/pages/SettingsPage/AdvancedPreferences.js

@@ -12,9 +12,9 @@ export const AdvancedPreferences = () => {
     const handleAdvancedPreferences = (_, checked) => {
         setValue('advancedPreferences', checked);
     };
-    return (_jsxs(Box, Object.assign({ px: 3, pt: 3 }, { children: [_jsxs(Box, Object.assign({ sx: {
+    return (_jsxs(Box, Object.assign({ px: 3, pt: 2 }, { children: [_jsxs(Box, Object.assign({ sx: {
                     display: 'flex',
                     justifyContent: 'space-between',
                     alignItems: 'center',
-                } }, { children: [_jsx(Box, Object.assign({ sx: { display: 'flex', alignItems: 'center' } }, { children: _jsx(Typography, Object.assign({ variant: "subtitle1", color: "text.primary", lineHeight: "normal" }, { children: t(`settings.advancedPreferences`) })) })), _jsx(Switch, { checked: advancedPreferences, onChange: handleAdvancedPreferences })] })), advancedPreferences && (_jsxs(Box, Object.assign({ mt: 3, mb: 1 }, { children: [_jsx(EnabledBridgesSelect, {}), _jsx(Box, Object.assign({ mt: 2 }, { children: _jsx(EnabledExchangesSelect, {}) }))] })))] })));
+                } }, { children: [_jsx(Box, Object.assign({ sx: { display: 'flex', alignItems: 'center' } }, { children: _jsx(Typography, Object.assign({ variant: "subtitle1", color: "text.primary", lineHeight: "normal" }, { children: t(`settings.advancedPreferences`) })) })), _jsx(Switch, { checked: advancedPreferences, onChange: handleAdvancedPreferences })] })), advancedPreferences && (_jsxs(Box, Object.assign({ mt: 2, mb: 1 }, { children: [_jsx(EnabledBridgesSelect, {}), _jsx(Box, Object.assign({ mt: 2 }, { children: _jsx(EnabledExchangesSelect, {}) }))] })))] })));
 };

package/pages/SettingsPage/ColorSchemeButtonGroup.js

@@ -2,7 +2,7 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { Brightness4 as Brightness4Icon, DarkMode as DarkModeIcon, LightMode as LightModeIcon, } from '@mui/icons-material';
 import { Box, ToggleButtonGroup } from '@mui/material';
 import { useTranslation } from 'react-i18next';
-import { useWidgetConfig } from '../../providers/WidgetProvider';
+import { useWidgetConfig } from '../../providers';
 import { useAppearance } from '../../stores';
 import { ToggleButton } from './ColorSchemeButtonGroup.style';
 export const ColorSchemeButtonGroup = () => {

package/pages/SettingsPage/SettingsPage.js

@@ -4,7 +4,8 @@ import { AdvancedPreferences } from './AdvancedPreferences';
 import { ColorSchemeButtonGroup } from './ColorSchemeButtonGroup';
 import { GasPriceSelect } from './GasPriceSelect';
 import { RoutePrioritySelect } from './RoutePrioritySelect';
+import { ShowDestinationWallet } from './ShowDestinationWallet';
 import { SlippageInput } from './SlippageInput';
 export const SettingsPage = () => {
-    return (_jsxs(Container, Object.assign({ disableGutters: true }, { children: [_jsxs(Box, Object.assign({ px: 3, pt: 1 }, { children: [_jsx(ColorSchemeButtonGroup, {}), _jsx(RoutePrioritySelect, {}), _jsxs(Box, Object.assign({ sx: { display: 'flex', alignItems: 'center' }, mt: 2 }, { children: [_jsx(Box, Object.assign({ pr: 2, flex: 1 }, { children: _jsx(SlippageInput, {}) })), _jsx(GasPriceSelect, {})] }))] })), _jsx(AdvancedPreferences, {})] })));
+    return (_jsxs(Container, Object.assign({ disableGutters: true }, { children: [_jsxs(Box, Object.assign({ px: 3, pt: 1 }, { children: [_jsx(ColorSchemeButtonGroup, {}), _jsx(RoutePrioritySelect, {}), _jsxs(Box, Object.assign({ sx: { display: 'flex', alignItems: 'center' }, mt: 2 }, { children: [_jsx(Box, Object.assign({ pr: 2, flex: 1 }, { children: _jsx(SlippageInput, {}) })), _jsx(GasPriceSelect, {})] }))] })), _jsx(ShowDestinationWallet, {}), _jsx(AdvancedPreferences, {})] })));
 };

package/pages/SettingsPage/ShowDestinationWallet.d.ts

@@ -0,0 +1,2 @@
+/// <reference types="react" />
+export declare const ShowDestinationWallet: () => JSX.Element;

package/pages/SettingsPage/ShowDestinationWallet.js

@@ -0,0 +1,18 @@
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { Box, Typography } from '@mui/material';
+import { useTranslation } from 'react-i18next';
+import { Switch } from '../../components/Switch';
+import { useSetSettings, useSettings } from '../../stores';
+export const ShowDestinationWallet = () => {
+    const { t } = useTranslation();
+    const [setValue] = useSetSettings();
+    const { showDestinationWallet } = useSettings(['showDestinationWallet']);
+    const onChange = (_, checked) => {
+        setValue('showDestinationWallet', checked);
+    };
+    return (_jsx(Box, Object.assign({ px: 3, pt: 2 }, { children: _jsxs(Box, Object.assign({ sx: {
+                display: 'flex',
+                justifyContent: 'space-between',
+                alignItems: 'center',
+            } }, { children: [_jsx(Box, Object.assign({ sx: { display: 'flex', alignItems: 'center' } }, { children: _jsx(Typography, Object.assign({ variant: "subtitle1", color: "text.primary", lineHeight: "normal" }, { children: t(`settings.showDestinationWallet`) })) })), _jsx(Switch, { checked: showDestinationWallet, onChange: onChange })] })) })));
+};

package/pages/SwapDetailsPage/SwapDetailsPage.js

@@ -12,19 +12,20 @@ import { ContentCopy as ContentCopyIcon, DeleteOutline as DeleteIcon, } from '@m
 import { Box, Button, DialogActions, DialogContent, DialogContentText, DialogTitle, IconButton, Typography, } from '@mui/material';
 import { Fragment, useCallback, useEffect, useState } from 'react';
 import { useTranslation } from 'react-i18next';
-import { useLocation, useNavigate } from 'react-router-dom';
+import { useLocation } from 'react-router-dom';
 import shallow from 'zustand/shallow';
 import { Card, CardTitle } from '../../components/Card';
 import { Dialog } from '../../components/Dialog';
 import { useSetHeaderAction } from '../../components/Header';
 import { Step } from '../../components/Step';
 import { StepDivider } from '../../components/StepDivider';
+import { useNavigateBack } from '../../hooks';
 import { useRouteStore } from '../../stores';
 import { Container } from './SwapDetailsPage.style';
 export const SwapDetailsPage = () => {
     var _a, _b;
     const { t } = useTranslation();
-    const navigate = useNavigate();
+    const { navigateBack } = useNavigateBack();
     const setHeaderAction = useSetHeaderAction();
     const { state } = useLocation();
     const [routeExecution, deleteRoute] = useRouteStore((store) => [store.routes[state === null || state === void 0 ? void 0 : state.routeId], store.deleteRoute], shallow);
@@ -33,7 +34,7 @@ export const SwapDetailsPage = () => {
         setOpen((open) => !open);
     }, []);
     const handleDeleteRoute = () => {
-        navigate(-1);
+        navigateBack();
         if (routeExecution) {
             deleteRoute(routeExecution.route.id);
         }

package/pages/SwapHistoryPage/SwapHistoryPage.js

@@ -5,7 +5,7 @@ import { useCallback, useEffect, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Dialog } from '../../components/Dialog';
 import { useSetHeaderAction } from '../../components/Header';
-import { useWallet } from '../../providers/WalletProvider';
+import { useWallet } from '../../providers';
 import { useRouteStore } from '../../stores';
 import { useSwapHistory } from '../../stores/route';
 import { SwapHistoryEmpty } from './SwapHistoryEmpty';

package/pages/SwapPage/StatusBottomSheet.js

@@ -4,17 +4,16 @@ import { Box, Button, Typography } from '@mui/material';
 import { useEffect, useMemo, useRef } from 'react';
 import { useFormContext } from 'react-hook-form';
 import { useTranslation } from 'react-i18next';
-import { useNavigate } from 'react-router-dom';
 import { BottomSheet } from '../../components/BottomSheet';
 import { Token } from '../../components/Token';
-import { useChains, useTokenBalance } from '../../hooks';
-import { SwapFormKey } from '../../providers/SwapFormProvider';
+import { useChains, useNavigateBack, useTokenBalance } from '../../hooks';
+import { SwapFormKey } from '../../providers';
 import { IconCircle, IconContainer, iconStyles, } from './StatusBottomSheet.style';
 import { getProcessMessage } from './utils';
 export const StatusBottomSheet = ({ status, route, }) => {
     var _a, _b, _c, _d, _e;
     const { t } = useTranslation();
-    const navigate = useNavigate();
+    const { navigateBack } = useNavigateBack();
     const ref = useRef(null);
     const { getChainById } = useChains();
     const { token, refetch: refetchBalance } = useTokenBalance(route.toChainId, route.toToken.address);
@@ -25,7 +24,7 @@ export const StatusBottomSheet = ({ status, route, }) => {
     };
     const handleDone = () => {
         clearFromAmount();
-        navigate(-1);
+        navigateBack();
     };
     const handleClose = () => {
         var _a;

package/pages/SwapPage/SwapPage.js

@@ -2,21 +2,21 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { Box, Button } from '@mui/material';
 import { Fragment } from 'react';
 import { useTranslation } from 'react-i18next';
-import { useLocation, useNavigate } from 'react-router-dom';
+import { useLocation } from 'react-router-dom';
 import { GasSufficiencyMessage } from '../../components/GasSufficiencyMessage';
 import { Step } from '../../components/Step';
 import { StepDivider } from '../../components/StepDivider';
 import { SwapButton } from '../../components/SwapButton';
-import { useRouteExecution } from '../../hooks';
+import { useNavigateBack, useRouteExecution } from '../../hooks';
 import { StatusBottomSheet } from './StatusBottomSheet';
 import { Container } from './SwapPage.style';
 export const SwapPage = () => {
     const { t } = useTranslation();
     const { state } = useLocation();
-    const navigate = useNavigate();
+    const { navigateBack } = useNavigateBack();
     const { route, status, executeRoute, restartRoute, deleteRoute } = useRouteExecution(state === null || state === void 0 ? void 0 : state.routeId);
     const handleRemoveRoute = () => {
-        navigate(-1);
+        navigateBack();
         deleteRoute();
     };
     const handleSwapClick = () => {

package/pages/SwapRoutesPage/SwapRoutesPage.js

@@ -12,7 +12,7 @@ export const SwapRoutesPage = () => {
     const navigate = useNavigate();
     const { pathname } = useLocation();
     const setHeaderAction = useSetHeaderAction();
-    const { routes: swapRoutes, isLoading, isFetching, isFetched, dataUpdatedAt, refetchTime, refetch, } = useSwapRoutes();
+    const { routes: swapRoutes, isLoading, isFetching, dataUpdatedAt, refetchTime, refetch, } = useSwapRoutes();
     const setExecutableRoute = useSetExecutableRoute();
     const handleRouteClick = (route) => {
         setExecutableRoute(route);

package/providers/SwapFormProvider/SwapFormProvider.d.ts

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