@rango-dev/widget-embedded 0.17.1-next.3 → 0.17.1-next.30
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/QueueManager.d.ts +5 -2
- package/dist/QueueManager.d.ts.map +1 -1
- package/dist/components/AppRouter.d.ts +0 -2
- package/dist/components/AppRouter.d.ts.map +1 -1
- package/dist/components/AppRoutes.d.ts +1 -6
- package/dist/components/AppRoutes.d.ts.map +1 -1
- package/dist/components/ConfirmWalletsModal/ConfirmWallets.styles.d.ts +56 -56
- package/dist/components/ConfirmWalletsModal/ConfirmWalletsModal.d.ts.map +1 -1
- package/dist/components/ConfirmWalletsModal/ConfirmWalletsModal.types.d.ts +0 -2
- package/dist/components/ConfirmWalletsModal/ConfirmWalletsModal.types.d.ts.map +1 -1
- package/dist/components/ConfirmWalletsModal/WalletList.d.ts.map +1 -1
- package/dist/components/ConfirmWalletsModal/WalletList.type.d.ts +1 -4
- package/dist/components/ConfirmWalletsModal/WalletList.type.d.ts.map +1 -1
- package/dist/components/HeaderButtons/HomeButtons.d.ts.map +1 -1
- package/dist/components/Layout/Layout.d.ts.map +1 -1
- package/dist/components/Layout/Layout.types.d.ts +2 -2
- package/dist/components/Layout/Layout.types.d.ts.map +1 -1
- package/dist/components/NotificationContent/NotificationContent.d.ts.map +1 -1
- package/dist/components/Quote/Quote.d.ts.map +1 -1
- package/dist/components/Quote/Quote.styles.d.ts +159 -0
- package/dist/components/Quote/Quote.styles.d.ts.map +1 -1
- package/dist/components/Quote/Quote.types.d.ts +0 -1
- package/dist/components/Quote/Quote.types.d.ts.map +1 -1
- package/dist/components/QuoteWarningsAndErrors/QuoteWarningsAndErrors.d.ts.map +1 -1
- package/dist/components/QuoteWarningsAndErrors/QuoteWarningsAndErrors.helpers.d.ts.map +1 -1
- package/dist/components/QuoteWarningsAndErrors/QuoteWarningsAndErrors.styles.d.ts.map +1 -1
- package/dist/components/QuoteWarningsAndErrors/QuoteWarningsAndErrors.types.d.ts +1 -0
- package/dist/components/QuoteWarningsAndErrors/QuoteWarningsAndErrors.types.d.ts.map +1 -1
- package/dist/components/Slippage/Slippage.d.ts.map +1 -1
- package/dist/components/SwapDetails/SwapDetails.Placeholder.d.ts.map +1 -1
- package/dist/components/SwapDetails/SwapDetails.d.ts.map +1 -1
- package/dist/components/SwapDetails/SwapDetails.helpers.d.ts +1 -1
- package/dist/components/SwapDetails/SwapDetails.helpers.d.ts.map +1 -1
- package/dist/components/SwapDetailsModal/SwapDetailsCompleteModal.d.ts.map +1 -1
- package/dist/components/SwapDetailsModal/SwapDetailsModal.helpers.d.ts +1 -1
- package/dist/components/SwapDetailsModal/SwapDetailsModal.helpers.d.ts.map +1 -1
- package/dist/components/SwapDetailsModal/SwapDetailsModal.types.d.ts +1 -1
- package/dist/components/SwapDetailsModal/SwapDetailsModal.types.d.ts.map +1 -1
- package/dist/components/SwapsGroup/SwapsGroup.d.ts.map +1 -1
- package/dist/components/SwapsGroup/SwapsGroup.styles.d.ts.map +1 -1
- package/dist/components/TokenList/TokenList.d.ts.map +1 -1
- package/dist/components/TokenList/TokenList.helpers.d.ts +2 -2
- package/dist/components/TokenList/TokenList.helpers.d.ts.map +1 -1
- package/dist/components/TokenList/TokenList.styles.d.ts.map +1 -1
- package/dist/components/TokenList/TokenList.types.d.ts +3 -9
- package/dist/components/TokenList/TokenList.types.d.ts.map +1 -1
- package/dist/components/TokenList/index.d.ts +0 -1
- package/dist/components/TokenList/index.d.ts.map +1 -1
- package/dist/components/UpdateUrl.d.ts +1 -6
- package/dist/components/UpdateUrl.d.ts.map +1 -1
- package/dist/components/WidgetEvents.d.ts.map +1 -1
- package/dist/constants/errors.d.ts.map +1 -1
- package/dist/constants/index.d.ts +1 -0
- package/dist/constants/index.d.ts.map +1 -1
- package/dist/constants/navigationRoutes.d.ts +1 -2
- package/dist/constants/navigationRoutes.d.ts.map +1 -1
- package/dist/constants/searchParams.d.ts +2 -1
- package/dist/constants/searchParams.d.ts.map +1 -1
- package/dist/containers/App/App.d.ts +3 -0
- package/dist/containers/App/App.d.ts.map +1 -0
- package/dist/containers/App/App.styles.d.ts +158 -0
- package/dist/containers/App/App.styles.d.ts.map +1 -0
- package/dist/containers/App/index.d.ts +2 -0
- package/dist/containers/App/index.d.ts.map +1 -0
- package/dist/containers/QuoteInfo/QuoteInfo.d.ts.map +1 -1
- package/dist/containers/QuoteInfo/QuoteInfo.styles.d.ts +316 -0
- package/dist/containers/QuoteInfo/QuoteInfo.styles.d.ts.map +1 -1
- package/dist/containers/QuoteInfo/QuoteInfo.types.d.ts +3 -0
- package/dist/containers/QuoteInfo/QuoteInfo.types.d.ts.map +1 -1
- package/dist/containers/Wallets/Wallets.d.ts +6 -0
- package/dist/containers/Wallets/Wallets.d.ts.map +1 -0
- package/dist/containers/Wallets/Wallets.types.d.ts +11 -0
- package/dist/containers/Wallets/Wallets.types.d.ts.map +1 -0
- package/dist/containers/Wallets/index.d.ts +2 -0
- package/dist/containers/Wallets/index.d.ts.map +1 -0
- package/dist/containers/Widget/Widget.d.ts +5 -0
- package/dist/containers/Widget/Widget.d.ts.map +1 -0
- package/dist/containers/Widget/Widget.types.d.ts +5 -0
- package/dist/containers/Widget/Widget.types.d.ts.map +1 -0
- package/dist/containers/Widget/index.d.ts +3 -0
- package/dist/containers/Widget/index.d.ts.map +1 -0
- package/dist/containers/WidgetInfo/WidgetInfo.d.ts +6 -0
- package/dist/containers/WidgetInfo/WidgetInfo.d.ts.map +1 -0
- package/dist/containers/WidgetInfo/WidgetInfo.helpers.d.ts +20 -0
- package/dist/containers/WidgetInfo/WidgetInfo.helpers.d.ts.map +1 -0
- package/dist/containers/WidgetInfo/WidgetInfo.types.d.ts +21 -0
- package/dist/containers/WidgetInfo/WidgetInfo.types.d.ts.map +1 -0
- package/dist/containers/WidgetInfo/index.d.ts +2 -0
- package/dist/containers/WidgetInfo/index.d.ts.map +1 -0
- package/dist/containers/WidgetProvider/WidgetProvider.d.ts +5 -0
- package/dist/containers/WidgetProvider/WidgetProvider.d.ts.map +1 -0
- package/dist/containers/WidgetProvider/WidgetProvider.types.d.ts +7 -0
- package/dist/containers/WidgetProvider/WidgetProvider.types.d.ts.map +1 -0
- package/dist/containers/WidgetProvider/index.d.ts +2 -0
- package/dist/containers/WidgetProvider/index.d.ts.map +1 -0
- package/dist/hooks/useConfirmSwap/useConfirmSwap.d.ts.map +1 -1
- package/dist/hooks/useConfirmSwap/useConfirmSwap.helpers.d.ts +6 -3
- package/dist/hooks/useConfirmSwap/useConfirmSwap.helpers.d.ts.map +1 -1
- package/dist/hooks/useConfirmSwap/useConfirmSwap.types.d.ts +1 -1
- package/dist/hooks/useConfirmSwap/useConfirmSwap.types.d.ts.map +1 -1
- package/dist/hooks/useForceAutoConnect.d.ts +2 -0
- package/dist/hooks/useForceAutoConnect.d.ts.map +1 -0
- package/dist/hooks/useLanguage.d.ts +1 -1
- package/dist/hooks/useLanguage.d.ts.map +1 -1
- package/dist/hooks/useNavigateBack.d.ts +1 -3
- package/dist/hooks/useNavigateBack.d.ts.map +1 -1
- package/dist/hooks/usePrepareBlockchainList/usePrepareBlockchainList.constants.d.ts +1 -1
- package/dist/hooks/usePrepareBlockchainList/usePrepareBlockchainList.d.ts +2 -2
- package/dist/hooks/usePrepareBlockchainList/usePrepareBlockchainList.d.ts.map +1 -1
- package/dist/hooks/usePrepareBlockchainList/usePrepareBlockchainList.helpers.d.ts +3 -5
- package/dist/hooks/usePrepareBlockchainList/usePrepareBlockchainList.helpers.d.ts.map +1 -1
- package/dist/hooks/usePrepareBlockchainList/usePrepareBlockchainList.mock.d.ts +1 -0
- package/dist/hooks/usePrepareBlockchainList/usePrepareBlockchainList.mock.d.ts.map +1 -1
- package/dist/hooks/usePrepareBlockchainList/usePrepareBlockchainList.types.d.ts +5 -1
- package/dist/hooks/usePrepareBlockchainList/usePrepareBlockchainList.types.d.ts.map +1 -1
- package/dist/hooks/useSwapInput.d.ts.map +1 -1
- package/dist/hooks/useSyncStoresWithConfig.d.ts +1 -2
- package/dist/hooks/useSyncStoresWithConfig.d.ts.map +1 -1
- package/dist/hooks/useTheme.d.ts +1 -1
- package/dist/hooks/useTheme.d.ts.map +1 -1
- package/dist/hooks/useWalletList.d.ts.map +1 -1
- package/dist/index.d.ts +20 -8
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +1 -1
- package/dist/index.js.map +4 -4
- package/dist/pages/ConfirmSwapPage.d.ts +1 -6
- package/dist/pages/ConfirmSwapPage.d.ts.map +1 -1
- package/dist/pages/HistoryPage.d.ts.map +1 -1
- package/dist/pages/Home.d.ts.map +1 -1
- package/dist/pages/LanguagePage.d.ts.map +1 -1
- package/dist/pages/LiquiditySourcePage.d.ts +1 -2
- package/dist/pages/LiquiditySourcePage.d.ts.map +1 -1
- package/dist/pages/SelectBlockchainPage.d.ts.map +1 -1
- package/dist/pages/SelectSwapItemsPage.d.ts.map +1 -1
- package/dist/pages/SettingsPage.d.ts +1 -6
- package/dist/pages/SettingsPage.d.ts.map +1 -1
- package/dist/pages/SwapDetailsPage.d.ts.map +1 -1
- package/dist/pages/ThemePage.d.ts.map +1 -1
- package/dist/pages/WalletsPage.d.ts +1 -8
- package/dist/pages/WalletsPage.d.ts.map +1 -1
- package/dist/store/AppStore.d.ts +47 -0
- package/dist/store/AppStore.d.ts.map +1 -0
- package/dist/store/app.d.ts +41 -22
- package/dist/store/app.d.ts.map +1 -1
- package/dist/store/notification.d.ts +4 -3
- package/dist/store/notification.d.ts.map +1 -1
- package/dist/store/quote.d.ts +23 -16
- package/dist/store/quote.d.ts.map +1 -1
- package/dist/store/slices/config.d.ts +3 -2
- package/dist/store/slices/config.d.ts.map +1 -1
- package/dist/store/slices/data.d.ts +3 -0
- package/dist/store/slices/data.d.ts.map +1 -1
- package/dist/store/slices/settings.d.ts +39 -0
- package/dist/store/slices/settings.d.ts.map +1 -0
- package/dist/store/ui.d.ts +2 -1
- package/dist/store/ui.d.ts.map +1 -1
- package/dist/store/wallets.d.ts +14 -9
- package/dist/store/wallets.d.ts.map +1 -1
- package/dist/types/config.d.ts +38 -5
- package/dist/types/config.d.ts.map +1 -1
- package/dist/types/swap.d.ts +4 -14
- package/dist/types/swap.d.ts.map +1 -1
- package/dist/types/wallets.d.ts +15 -1
- package/dist/types/wallets.d.ts.map +1 -1
- package/dist/utils/colors.d.ts.map +1 -1
- package/dist/utils/configs.d.ts +1 -0
- package/dist/utils/configs.d.ts.map +1 -1
- package/dist/utils/meta.d.ts +2 -1
- package/dist/utils/meta.d.ts.map +1 -1
- package/dist/utils/providers.d.ts +2 -2
- package/dist/utils/providers.d.ts.map +1 -1
- package/dist/utils/queue.d.ts +2 -2
- package/dist/utils/queue.d.ts.map +1 -1
- package/dist/utils/quote.d.ts +1 -1
- package/dist/utils/quote.d.ts.map +1 -1
- package/dist/utils/settings.d.ts +6 -2
- package/dist/utils/settings.d.ts.map +1 -1
- package/dist/utils/swap.d.ts +16 -7
- package/dist/utils/swap.d.ts.map +1 -1
- package/dist/utils/time.d.ts +1 -1
- package/dist/utils/time.d.ts.map +1 -1
- package/dist/utils/wallets.d.ts +7 -9
- package/dist/utils/wallets.d.ts.map +1 -1
- package/package.json +12 -10
- package/src/QueueManager.tsx +18 -17
- package/src/components/AppRouter.tsx +8 -32
- package/src/components/AppRoutes.tsx +57 -69
- package/src/components/BlockchainList/BlockchainList.tsx +4 -4
- package/src/components/BlockchainsSection/BlockchainsSection.tsx +4 -4
- package/src/components/ConfirmWalletsModal/ConfirmWalletsModal.tsx +16 -19
- package/src/components/ConfirmWalletsModal/ConfirmWalletsModal.types.ts +0 -2
- package/src/components/ConfirmWalletsModal/WalletList.tsx +6 -5
- package/src/components/ConfirmWalletsModal/WalletList.type.ts +1 -4
- package/src/components/HeaderButtons/HomeButtons.tsx +28 -18
- package/src/components/Layout/Layout.tsx +20 -7
- package/src/components/Layout/Layout.types.ts +2 -2
- package/src/components/NoResult/NoResult.helpers.ts +12 -12
- package/src/components/NoResult/NoResult.tsx +6 -6
- package/src/components/NotificationContent/NotificationContent.tsx +5 -3
- package/src/components/Quote/Quote.styles.ts +28 -1
- package/src/components/Quote/Quote.tsx +100 -34
- package/src/components/Quote/Quote.types.ts +0 -1
- package/src/components/Quote/QuoteSkeleton.tsx +1 -1
- package/src/components/QuoteWarningsAndErrors/QuoteErrorsModalItem.tsx +1 -1
- package/src/components/QuoteWarningsAndErrors/QuoteWarningsAndErrors.helpers.ts +11 -4
- package/src/components/QuoteWarningsAndErrors/QuoteWarningsAndErrors.styles.ts +8 -1
- package/src/components/QuoteWarningsAndErrors/QuoteWarningsAndErrors.tsx +13 -13
- package/src/components/QuoteWarningsAndErrors/QuoteWarningsAndErrors.types.ts +1 -0
- package/src/components/QuoteWarningsAndErrors/SlippageWariningModal.tsx +3 -3
- package/src/components/Slippage/Slippage.tsx +3 -5
- package/src/components/SwapDetails/SwapDetails.Placeholder.tsx +0 -4
- package/src/components/SwapDetails/SwapDetails.helpers.tsx +1 -1
- package/src/components/SwapDetails/SwapDetails.tsx +19 -39
- package/src/components/SwapDetailsAlerts/SwapDetailsAlerts.Warning.tsx +1 -1
- package/src/components/SwapDetailsModal/SwapDetailsCompleteModal.tsx +4 -3
- package/src/components/SwapDetailsModal/SwapDetailsModal.Cancel.tsx +2 -2
- package/src/components/SwapDetailsModal/SwapDetailsModal.helpers.tsx +1 -1
- package/src/components/SwapDetailsModal/SwapDetailsModal.tsx +1 -1
- package/src/components/SwapDetailsModal/SwapDetailsModal.types.ts +1 -1
- package/src/components/SwapsGroup/SwapsGroup.styles.ts +8 -1
- package/src/components/SwapsGroup/SwapsGroup.tsx +0 -2
- package/src/components/TokenList/TokenList.helpers.ts +2 -2
- package/src/components/TokenList/TokenList.styles.ts +14 -2
- package/src/components/TokenList/TokenList.tsx +16 -19
- package/src/components/TokenList/TokenList.types.ts +3 -10
- package/src/components/TokenList/index.ts +0 -1
- package/src/components/UpdateUrl.tsx +23 -18
- package/src/components/WidgetEvents.tsx +4 -2
- package/src/constants/errors.ts +9 -5
- package/src/constants/index.ts +1 -0
- package/src/constants/navigationRoutes.ts +7 -8
- package/src/constants/searchParams.ts +1 -0
- package/src/containers/App/App.styles.ts +18 -0
- package/src/containers/App/App.tsx +52 -0
- package/src/containers/App/index.ts +1 -0
- package/src/containers/QuoteInfo/QuoteInfo.styles.ts +17 -1
- package/src/containers/QuoteInfo/QuoteInfo.tsx +44 -43
- package/src/containers/QuoteInfo/QuoteInfo.types.ts +3 -0
- package/src/{Wallets.tsx → containers/Wallets/Wallets.tsx} +48 -34
- package/src/containers/Wallets/Wallets.types.ts +12 -0
- package/src/containers/Wallets/index.ts +1 -0
- package/src/containers/Widget/Widget.tsx +19 -0
- package/src/containers/Widget/Widget.types.ts +5 -0
- package/src/containers/Widget/index.ts +2 -0
- package/src/containers/WidgetInfo/WidgetInfo.helpers.ts +64 -0
- package/src/containers/WidgetInfo/WidgetInfo.tsx +62 -0
- package/src/containers/WidgetInfo/WidgetInfo.types.ts +21 -0
- package/src/containers/WidgetInfo/index.ts +1 -0
- package/src/containers/WidgetProvider/WidgetProvider.tsx +28 -0
- package/src/containers/WidgetProvider/WidgetProvider.types.ts +7 -0
- package/src/containers/WidgetProvider/index.ts +1 -0
- package/src/hooks/useConfirmSwap/useConfirmSwap.helpers.ts +15 -11
- package/src/hooks/useConfirmSwap/useConfirmSwap.ts +25 -24
- package/src/hooks/useConfirmSwap/useConfirmSwap.types.ts +1 -1
- package/src/hooks/useForceAutoConnect.ts +27 -0
- package/src/hooks/useLanguage.ts +4 -5
- package/src/hooks/useNavigateBack.ts +3 -52
- package/src/hooks/usePrepareBlockchainList/usePrepareBlockchainList.constants.ts +1 -1
- package/src/hooks/usePrepareBlockchainList/usePrepareBlockchainList.helpers.ts +37 -7
- package/src/hooks/usePrepareBlockchainList/usePrepareBlockchainList.mock.ts +60 -0
- package/src/hooks/usePrepareBlockchainList/usePrepareBlockchainList.test.ts +78 -3
- package/src/hooks/usePrepareBlockchainList/usePrepareBlockchainList.ts +15 -6
- package/src/hooks/usePrepareBlockchainList/usePrepareBlockchainList.types.ts +6 -1
- package/src/hooks/useSwapInput.ts +89 -30
- package/src/hooks/useSyncStoresWithConfig.ts +38 -22
- package/src/hooks/useTheme.ts +4 -5
- package/src/hooks/useWalletList.ts +3 -5
- package/src/index.ts +53 -5
- package/src/pages/ConfirmSwapPage.tsx +39 -24
- package/src/pages/HistoryPage.tsx +2 -7
- package/src/pages/Home.tsx +58 -88
- package/src/pages/LanguagePage.tsx +0 -5
- package/src/pages/LiquiditySourcePage.tsx +24 -37
- package/src/pages/SelectBlockchainPage.tsx +28 -21
- package/src/pages/SelectSwapItemsPage.tsx +10 -27
- package/src/pages/SettingsPage.tsx +28 -24
- package/src/pages/SwapDetailsPage.tsx +6 -7
- package/src/pages/ThemePage.tsx +2 -7
- package/src/pages/WalletsPage.tsx +4 -15
- package/src/services/httpService.ts +1 -1
- package/src/store/AppStore.tsx +41 -0
- package/src/store/app.ts +44 -6
- package/src/store/quote.ts +29 -26
- package/src/store/slices/config.ts +25 -15
- package/src/store/slices/data.ts +64 -29
- package/src/store/slices/settings.ts +168 -0
- package/src/store/wallets.ts +68 -37
- package/src/types/config.ts +50 -5
- package/src/types/swap.ts +4 -13
- package/src/types/wallets.ts +18 -1
- package/src/utils/colors.ts +2 -1
- package/src/utils/configs.ts +2 -1
- package/src/utils/date.ts +1 -1
- package/src/utils/meta.ts +8 -1
- package/src/utils/providers.ts +8 -5
- package/src/utils/queue.ts +2 -2
- package/src/utils/quote.ts +7 -7
- package/src/utils/settings.ts +17 -10
- package/src/utils/swap.ts +59 -55
- package/src/utils/time.ts +1 -1
- package/src/utils/wallets.ts +107 -149
- package/dist/Wallets.d.ts +0 -17
- package/dist/Wallets.d.ts.map +0 -1
- package/dist/Widget.d.ts +0 -9
- package/dist/Widget.d.ts.map +0 -1
- package/dist/store/meta.d.ts +0 -23
- package/dist/store/meta.d.ts.map +0 -1
- package/dist/store/settings.d.ts +0 -81
- package/dist/store/settings.d.ts.map +0 -1
- package/src/Widget.tsx +0 -119
- package/src/store/meta.ts +0 -39
- package/src/store/settings.ts +0 -158
|
@@ -6,7 +6,6 @@ import {
|
|
|
6
6
|
getCurrentBlockchainOfOrNull,
|
|
7
7
|
getCurrentStep,
|
|
8
8
|
getRelatedWalletOrNull,
|
|
9
|
-
PendingSwapNetworkStatus,
|
|
10
9
|
} from '@rango-dev/queue-manager-rango-preset';
|
|
11
10
|
import {
|
|
12
11
|
Button,
|
|
@@ -19,10 +18,10 @@ import {
|
|
|
19
18
|
useCopyToClipboard,
|
|
20
19
|
} from '@rango-dev/ui';
|
|
21
20
|
import { useWallets } from '@rango-dev/wallets-react';
|
|
21
|
+
import { PendingSwapNetworkStatus } from 'rango-types';
|
|
22
22
|
import React, { useEffect, useRef, useState } from 'react';
|
|
23
23
|
import { useNavigate } from 'react-router-dom';
|
|
24
24
|
|
|
25
|
-
import { navigationRoutes } from '../../constants/navigationRoutes';
|
|
26
25
|
import {
|
|
27
26
|
GAS_FEE_MAX_DECIMALS,
|
|
28
27
|
GAS_FEE_MIN_DECIMALS,
|
|
@@ -33,8 +32,7 @@ import {
|
|
|
33
32
|
USD_VALUE_MAX_DECIMALS,
|
|
34
33
|
USD_VALUE_MIN_DECIMALS,
|
|
35
34
|
} from '../../constants/routing';
|
|
36
|
-
import {
|
|
37
|
-
import { useMetaStore } from '../../store/meta';
|
|
35
|
+
import { useAppStore } from '../../store/AppStore';
|
|
38
36
|
import { useNotificationStore } from '../../store/notification';
|
|
39
37
|
import { useQuoteStore } from '../../store/quote';
|
|
40
38
|
import {
|
|
@@ -49,7 +47,7 @@ import {
|
|
|
49
47
|
shouldRetrySwap,
|
|
50
48
|
} from '../../utils/swap';
|
|
51
49
|
import { getSwapDate } from '../../utils/time';
|
|
52
|
-
import { getConciseAddress
|
|
50
|
+
import { getConciseAddress } from '../../utils/wallets';
|
|
53
51
|
import { SuffixContainer } from '../HeaderButtons/HeaderButtons.styles';
|
|
54
52
|
import { Layout } from '../Layout';
|
|
55
53
|
import { QuoteSummary } from '../Quote';
|
|
@@ -64,18 +62,16 @@ import { Container, HeaderDetails, StepsList } from './SwapDetails.styles';
|
|
|
64
62
|
export function SwapDetails(props: SwapDetailsProps) {
|
|
65
63
|
const { swap, requestId, onDelete, onCancel: onCancelProps } = props;
|
|
66
64
|
const { canSwitchNetworkTo, connect, getWalletInfo } = useWallets();
|
|
65
|
+
const blockchains = useAppStore().blockchains();
|
|
66
|
+
const tokens = useAppStore().tokens();
|
|
67
67
|
const retry = useQuoteStore.use.retry();
|
|
68
68
|
const navigate = useNavigate();
|
|
69
|
-
const { navigateBackFrom } = useNavigateBack();
|
|
70
69
|
const [_, handleCopy] = useCopyToClipboard(RESET_INTERVAL);
|
|
71
70
|
const listRef = useRef<HTMLDivElement | null>(null);
|
|
72
71
|
const [modalState, setModalState] = useState<ModalState>(null);
|
|
73
72
|
const [showCompletedModal, setShowCompletedModal] = useState<
|
|
74
73
|
'success' | 'failed' | null
|
|
75
74
|
>(null);
|
|
76
|
-
const {
|
|
77
|
-
meta: { tokens, blockchains },
|
|
78
|
-
} = useMetaStore();
|
|
79
75
|
|
|
80
76
|
const onCancel = () => {
|
|
81
77
|
onCancelProps();
|
|
@@ -150,7 +146,7 @@ export function SwapDetails(props: SwapDetailsProps) {
|
|
|
150
146
|
showNetworkModal: currentStepNetworkStatus,
|
|
151
147
|
setNetworkModal: setModalState,
|
|
152
148
|
message: stepMessage,
|
|
153
|
-
blockchains,
|
|
149
|
+
blockchains: blockchains,
|
|
154
150
|
});
|
|
155
151
|
const numberOfSteps = steps.length;
|
|
156
152
|
const [firstStep, lastStep] = [swap.steps[0], swap.steps[numberOfSteps - 1]];
|
|
@@ -167,35 +163,19 @@ export function SwapDetails(props: SwapDetailsProps) {
|
|
|
167
163
|
)?.diagnosisUrl;
|
|
168
164
|
|
|
169
165
|
const outputUsdValue = numberToString(
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
) *
|
|
178
|
-
(getUsdPrice(
|
|
179
|
-
lastStep.toBlockchain,
|
|
180
|
-
lastStep.toSymbol,
|
|
181
|
-
lastStep.toSymbolAddress,
|
|
182
|
-
tokens
|
|
183
|
-
) || 0)
|
|
184
|
-
),
|
|
166
|
+
parseFloat(
|
|
167
|
+
numberToString(
|
|
168
|
+
outputAmount,
|
|
169
|
+
TOKEN_AMOUNT_MIN_DECIMALS,
|
|
170
|
+
TOKEN_AMOUNT_MAX_DECIMALS
|
|
171
|
+
)
|
|
172
|
+
) * (lastStep.toUsdPrice || 0),
|
|
185
173
|
USD_VALUE_MIN_DECIMALS,
|
|
186
174
|
USD_VALUE_MAX_DECIMALS
|
|
187
175
|
);
|
|
188
176
|
|
|
189
177
|
const inputUsdValue = numberToString(
|
|
190
|
-
|
|
191
|
-
parseFloat(swap.inputAmount) *
|
|
192
|
-
(getUsdPrice(
|
|
193
|
-
firstStep.fromBlockchain,
|
|
194
|
-
firstStep.fromSymbol,
|
|
195
|
-
firstStep.fromSymbolAddress,
|
|
196
|
-
tokens
|
|
197
|
-
) || 0)
|
|
198
|
-
),
|
|
178
|
+
parseFloat(swap.inputAmount) * (firstStep.fromUsdPrice || 0),
|
|
199
179
|
USD_VALUE_MIN_DECIMALS,
|
|
200
180
|
USD_VALUE_MAX_DECIMALS
|
|
201
181
|
);
|
|
@@ -238,7 +218,6 @@ export function SwapDetails(props: SwapDetailsProps) {
|
|
|
238
218
|
noPadding
|
|
239
219
|
header={{
|
|
240
220
|
title: i18n.t('Swap and Bridge'),
|
|
241
|
-
onBack: () => navigateBackFrom(navigationRoutes.swapDetails),
|
|
242
221
|
onCancel:
|
|
243
222
|
swap.status === 'running' ? () => setModalState('cancel') : undefined,
|
|
244
223
|
suffix: swap.status !== 'running' && (
|
|
@@ -264,9 +243,10 @@ export function SwapDetails(props: SwapDetailsProps) {
|
|
|
264
243
|
type="primary"
|
|
265
244
|
size="large"
|
|
266
245
|
onClick={() => {
|
|
267
|
-
retry(swap);
|
|
246
|
+
retry(swap, { blockchains: blockchains, tokens: tokens });
|
|
268
247
|
setTimeout(() => {
|
|
269
|
-
|
|
248
|
+
const home = '../../';
|
|
249
|
+
navigate(home);
|
|
270
250
|
}, 0);
|
|
271
251
|
}}>
|
|
272
252
|
{i18n.t('Try again')}
|
|
@@ -348,7 +328,7 @@ export function SwapDetails(props: SwapDetailsProps) {
|
|
|
348
328
|
},
|
|
349
329
|
}}
|
|
350
330
|
percentageChange={numberToString(
|
|
351
|
-
|
|
331
|
+
percentageChange,
|
|
352
332
|
PERCENTAGE_CHANGE_MIN_DECIMALS,
|
|
353
333
|
PERCENTAGE_CHANGE_MAX_DECIMALS
|
|
354
334
|
)}
|
|
@@ -406,7 +386,7 @@ export function SwapDetails(props: SwapDetailsProps) {
|
|
|
406
386
|
)}
|
|
407
387
|
usdValue={outputUsdValue}
|
|
408
388
|
percentageChange={numberToString(
|
|
409
|
-
|
|
389
|
+
percentageChange,
|
|
410
390
|
PERCENTAGE_CHANGE_MIN_DECIMALS,
|
|
411
391
|
PERCENTAGE_CHANGE_MAX_DECIMALS
|
|
412
392
|
)}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import type { WaningAlertsProps } from './SwapDetailsAlerts.types';
|
|
2
2
|
|
|
3
3
|
import { i18n } from '@lingui/core';
|
|
4
|
-
import { PendingSwapNetworkStatus } from '@rango-dev/queue-manager-rango-preset';
|
|
5
4
|
import { Alert, Button } from '@rango-dev/ui';
|
|
5
|
+
import { PendingSwapNetworkStatus } from 'rango-types';
|
|
6
6
|
import React from 'react';
|
|
7
7
|
|
|
8
8
|
export function WarningAlert(props: WaningAlertsProps) {
|
|
@@ -12,8 +12,6 @@ import {
|
|
|
12
12
|
import React from 'react';
|
|
13
13
|
import { useNavigate } from 'react-router-dom';
|
|
14
14
|
|
|
15
|
-
import { navigationRoutes } from '../../constants/navigationRoutes';
|
|
16
|
-
|
|
17
15
|
export function SwapDetailsCompleteModal(props: CompleteModalPropTypes) {
|
|
18
16
|
const {
|
|
19
17
|
open,
|
|
@@ -70,7 +68,10 @@ export function SwapDetailsCompleteModal(props: CompleteModalPropTypes) {
|
|
|
70
68
|
variant="contained"
|
|
71
69
|
type="primary"
|
|
72
70
|
size="large"
|
|
73
|
-
onClick={() =>
|
|
71
|
+
onClick={() => {
|
|
72
|
+
const home = '../../';
|
|
73
|
+
navigate(home);
|
|
74
|
+
}}>
|
|
74
75
|
<Typography variant="title" size="medium" color="neutral100">
|
|
75
76
|
{i18n.t('Done')}
|
|
76
77
|
</Typography>
|
|
@@ -10,8 +10,8 @@ export const CancelContent = ({ onCancel, onClose }: CancelContentProps) => {
|
|
|
10
10
|
<Divider size={20} />
|
|
11
11
|
<MessageBox
|
|
12
12
|
type="error"
|
|
13
|
-
title={i18n.t('
|
|
14
|
-
description={i18n.t('Are you sure you want to
|
|
13
|
+
title={i18n.t('Cancel Swap')}
|
|
14
|
+
description={i18n.t('Are you sure you want to cancel this swap?')}
|
|
15
15
|
/>
|
|
16
16
|
<Divider size={32} />
|
|
17
17
|
<Button
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import type { ModalNetworkValueTypes } from './SwapDetailsModal.types';
|
|
2
2
|
|
|
3
3
|
import { i18n } from '@lingui/core';
|
|
4
|
-
import { PendingSwapNetworkStatus } from '
|
|
4
|
+
import { PendingSwapNetworkStatus } from 'rango-types';
|
|
5
5
|
|
|
6
6
|
export const modalNetworkValues: Record<
|
|
7
7
|
Exclude<PendingSwapNetworkStatus, PendingSwapNetworkStatus.WaitingForQueue>,
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import type { ModalPropTypes } from './SwapDetailsModal.types';
|
|
2
2
|
|
|
3
|
-
import { PendingSwapNetworkStatus } from '@rango-dev/queue-manager-rango-preset';
|
|
4
3
|
import { Modal } from '@rango-dev/ui';
|
|
4
|
+
import { PendingSwapNetworkStatus } from 'rango-types';
|
|
5
5
|
import React from 'react';
|
|
6
6
|
|
|
7
7
|
import { CancelContent } from './SwapDetailsModal.Cancel';
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import type { PendingSwapNetworkStatus } from '@rango-dev/queue-manager-rango-preset';
|
|
2
1
|
import type { WalletType } from '@rango-dev/wallets-shared';
|
|
2
|
+
import type { PendingSwapNetworkStatus } from 'rango-types';
|
|
3
3
|
|
|
4
4
|
export type ModalState =
|
|
5
5
|
| Exclude<PendingSwapNetworkStatus, PendingSwapNetworkStatus.WaitingForQueue>
|
|
@@ -1,9 +1,16 @@
|
|
|
1
|
-
import { styled } from '@rango-dev/ui';
|
|
1
|
+
import { darkTheme, styled } from '@rango-dev/ui';
|
|
2
2
|
|
|
3
3
|
export const Group = styled('div', {
|
|
4
4
|
width: '100%',
|
|
5
5
|
display: 'flex',
|
|
6
6
|
flexDirection: 'column',
|
|
7
|
+
'.group-title': {
|
|
8
|
+
$$color: '$colors$neutral600',
|
|
9
|
+
[`.${darkTheme} &`]: {
|
|
10
|
+
$$color: '$colors$neutral700',
|
|
11
|
+
},
|
|
12
|
+
color: '$$color',
|
|
13
|
+
},
|
|
7
14
|
});
|
|
8
15
|
|
|
9
16
|
export const Time = styled('div', {
|
|
@@ -34,7 +34,6 @@ export function SwapsGroup(props: PropTypes) {
|
|
|
34
34
|
<Typography
|
|
35
35
|
variant="label"
|
|
36
36
|
size="medium"
|
|
37
|
-
color="neutral600"
|
|
38
37
|
className="group-title">
|
|
39
38
|
{i18n.t(group.title)}
|
|
40
39
|
</Typography>
|
|
@@ -68,7 +67,6 @@ export function SwapsGroup(props: PropTypes) {
|
|
|
68
67
|
<Typography
|
|
69
68
|
variant="label"
|
|
70
69
|
size="medium"
|
|
71
|
-
color="neutral600"
|
|
72
70
|
className="group-title">
|
|
73
71
|
{i18n.t(group.title)}
|
|
74
72
|
</Typography>
|
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
import type {
|
|
1
|
+
import type { Token } from 'rango-sdk';
|
|
2
2
|
|
|
3
3
|
import { containsText } from '../../utils/common';
|
|
4
4
|
|
|
5
|
-
export const filterTokens = (list:
|
|
5
|
+
export const filterTokens = (list: Token[], searchedFor: string) =>
|
|
6
6
|
list.filter(
|
|
7
7
|
(token) =>
|
|
8
8
|
containsText(token.symbol, searchedFor) ||
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { styled, Typography } from '@rango-dev/ui';
|
|
1
|
+
import { darkTheme, styled, Typography } from '@rango-dev/ui';
|
|
2
2
|
|
|
3
3
|
export const Container = styled('div', {
|
|
4
4
|
display: 'flex',
|
|
@@ -40,7 +40,11 @@ export const List = styled('ul', {
|
|
|
40
40
|
'& a': {
|
|
41
41
|
fontSize: '$12',
|
|
42
42
|
lineHeight: '$16',
|
|
43
|
-
color: '$neutral600',
|
|
43
|
+
$$color: '$colors$neutral600',
|
|
44
|
+
[`.${darkTheme} &`]: {
|
|
45
|
+
$$color: '$colors$neutral700',
|
|
46
|
+
},
|
|
47
|
+
color: '$$color',
|
|
44
48
|
textDecoration: 'none',
|
|
45
49
|
},
|
|
46
50
|
},
|
|
@@ -92,6 +96,14 @@ export const TagTitle = styled(Typography, {});
|
|
|
92
96
|
|
|
93
97
|
export const BalanceContainer = styled('div', {
|
|
94
98
|
textAlign: 'right',
|
|
99
|
+
|
|
100
|
+
'.usd-value': {
|
|
101
|
+
$$color: '$colors$neutral600',
|
|
102
|
+
[`.${darkTheme} &`]: {
|
|
103
|
+
$$color: '$colors$neutral700',
|
|
104
|
+
},
|
|
105
|
+
color: '$$color',
|
|
106
|
+
},
|
|
95
107
|
});
|
|
96
108
|
|
|
97
109
|
export const End = styled('ul', {
|
|
@@ -1,9 +1,6 @@
|
|
|
1
1
|
/* eslint-disable @typescript-eslint/no-magic-numbers */
|
|
2
|
-
import type {
|
|
3
|
-
|
|
4
|
-
RenderDescProps,
|
|
5
|
-
TokenWithBalance,
|
|
6
|
-
} from './TokenList.types';
|
|
2
|
+
import type { PropTypes, RenderDescProps } from './TokenList.types';
|
|
3
|
+
import type { Token } from 'rango-sdk';
|
|
7
4
|
import type { CommonProps } from 'react-window';
|
|
8
5
|
|
|
9
6
|
import { i18n } from '@lingui/core';
|
|
@@ -21,10 +18,10 @@ import {
|
|
|
21
18
|
} from '@rango-dev/ui';
|
|
22
19
|
import React, { forwardRef, useEffect, useState } from 'react';
|
|
23
20
|
|
|
24
|
-
import { useAppStore } from '../../store/
|
|
25
|
-
import { useMetaStore } from '../../store/meta';
|
|
21
|
+
import { useAppStore } from '../../store/AppStore';
|
|
26
22
|
import { useWalletsStore } from '../../store/wallets';
|
|
27
23
|
import { generateRangeColors } from '../../utils/colors';
|
|
24
|
+
import { formatBalance } from '../../utils/wallets';
|
|
28
25
|
|
|
29
26
|
import { LoadingTokenList } from './LoadingTokenList';
|
|
30
27
|
import {
|
|
@@ -86,11 +83,11 @@ const renderDesc = (props: RenderDescProps) => {
|
|
|
86
83
|
export function TokenList(props: PropTypes) {
|
|
87
84
|
const { list, searchedFor = '', onChange, selectedBlockchain } = props;
|
|
88
85
|
|
|
89
|
-
const [tokens, setTokens] = useState<
|
|
90
|
-
const
|
|
86
|
+
const [tokens, setTokens] = useState<Token[]>(list);
|
|
87
|
+
const fetchStatus = useAppStore().fetchStatus;
|
|
88
|
+
const blockchains = useAppStore().blockchains();
|
|
91
89
|
const [hasNextPage, setHasNextPage] = useState<boolean>(true);
|
|
92
|
-
const loadingWallet = useWalletsStore
|
|
93
|
-
const { blockchains } = useMetaStore.use.meta();
|
|
90
|
+
const { getBalanceFor, loading: loadingWallet } = useWalletsStore();
|
|
94
91
|
const { isTokenPinned } = useAppStore();
|
|
95
92
|
|
|
96
93
|
// eslint-disable-next-line react/display-name
|
|
@@ -135,7 +132,7 @@ export function TokenList(props: PropTypes) {
|
|
|
135
132
|
<VirtualizedList
|
|
136
133
|
Item={({ index, style }) => {
|
|
137
134
|
const token = tokens[index];
|
|
138
|
-
|
|
135
|
+
const tokenBalance = formatBalance(getBalanceFor(token));
|
|
139
136
|
const address = token.address || '';
|
|
140
137
|
const blockchain = blockchains.find(
|
|
141
138
|
(blockchain) => blockchain.name === token.blockchain
|
|
@@ -230,18 +227,18 @@ export function TokenList(props: PropTypes) {
|
|
|
230
227
|
<Skeleton variant="text" size="medium" width={50} />
|
|
231
228
|
</End>
|
|
232
229
|
) : (
|
|
233
|
-
|
|
230
|
+
tokenBalance && (
|
|
234
231
|
<BalanceContainer>
|
|
235
232
|
<Typography variant="title" size="small">
|
|
236
|
-
{
|
|
233
|
+
{tokenBalance.amount}
|
|
237
234
|
</Typography>
|
|
238
235
|
<div />
|
|
239
|
-
{
|
|
236
|
+
{tokenBalance.usdValue && (
|
|
240
237
|
<Typography
|
|
241
238
|
variant="body"
|
|
242
|
-
|
|
239
|
+
className="usd-value"
|
|
243
240
|
size="xsmall">
|
|
244
|
-
{`$${
|
|
241
|
+
{`$${tokenBalance.usdValue}`}
|
|
245
242
|
</Typography>
|
|
246
243
|
)}
|
|
247
244
|
</BalanceContainer>
|
|
@@ -268,8 +265,8 @@ export function TokenList(props: PropTypes) {
|
|
|
268
265
|
{i18n.t('Select Token')}
|
|
269
266
|
</Typography>
|
|
270
267
|
<Divider size={4} />
|
|
271
|
-
{
|
|
272
|
-
{
|
|
268
|
+
{fetchStatus === 'loading' && <LoadingTokenList size={PAGE_SIZE} />}
|
|
269
|
+
{fetchStatus === 'success' && <List>{renderList()}</List>}
|
|
273
270
|
</Container>
|
|
274
271
|
);
|
|
275
272
|
}
|
|
@@ -1,16 +1,9 @@
|
|
|
1
1
|
import type { Token } from 'rango-sdk';
|
|
2
2
|
|
|
3
|
-
export interface TokenWithBalance extends Token {
|
|
4
|
-
balance?: {
|
|
5
|
-
amount: string;
|
|
6
|
-
usdValue: string;
|
|
7
|
-
};
|
|
8
|
-
}
|
|
9
|
-
|
|
10
3
|
export interface PropTypes {
|
|
11
|
-
list:
|
|
4
|
+
list: Token[];
|
|
12
5
|
searchedFor?: string;
|
|
13
|
-
onChange: (token:
|
|
6
|
+
onChange: (token: Token) => void;
|
|
14
7
|
selectedBlockchain?: string;
|
|
15
8
|
}
|
|
16
9
|
|
|
@@ -22,7 +15,7 @@ export interface RenderDescProps {
|
|
|
22
15
|
name?: string | null;
|
|
23
16
|
address: string;
|
|
24
17
|
url: string;
|
|
25
|
-
token:
|
|
18
|
+
token: Token;
|
|
26
19
|
customCssForTag: TagCSS;
|
|
27
20
|
customCssForTagTitle: TitleCSS;
|
|
28
21
|
}
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
import type { WidgetConfig } from '../types';
|
|
2
|
-
|
|
3
1
|
import { useEffect, useRef } from 'react';
|
|
4
2
|
import {
|
|
5
3
|
createSearchParams,
|
|
@@ -9,15 +7,12 @@ import {
|
|
|
9
7
|
|
|
10
8
|
import { navigationRoutes } from '../constants/navigationRoutes';
|
|
11
9
|
import { SearchParams } from '../constants/searchParams';
|
|
12
|
-
import {
|
|
13
|
-
import { useMetaStore } from '../store/meta';
|
|
10
|
+
import { useAppStore } from '../store/AppStore';
|
|
14
11
|
import { useQuoteStore } from '../store/quote';
|
|
15
12
|
import { useUiStore } from '../store/ui';
|
|
16
13
|
import { searchParamsToToken } from '../utils/quote';
|
|
17
14
|
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
export function UpdateUrl(props: Props) {
|
|
15
|
+
export function UpdateUrl() {
|
|
21
16
|
const firstRender = useRef(true);
|
|
22
17
|
const [searchParams, setSearchParams] = useSearchParams();
|
|
23
18
|
const location = useLocation();
|
|
@@ -33,10 +28,10 @@ export function UpdateUrl(props: Props) {
|
|
|
33
28
|
const setToToken = useQuoteStore.use.setToToken();
|
|
34
29
|
const inputAmount = useQuoteStore.use.inputAmount();
|
|
35
30
|
const setInputAmount = useQuoteStore.use.setInputAmount();
|
|
36
|
-
const
|
|
37
|
-
const
|
|
31
|
+
const fetchMetaStatus = useAppStore().fetchStatus;
|
|
32
|
+
const blockchains = useAppStore().blockchains();
|
|
33
|
+
const tokens = useAppStore().tokens();
|
|
38
34
|
const setSelectedSwap = useUiStore.use.setSelectedSwap();
|
|
39
|
-
useSyncStoresWithConfig(props.config);
|
|
40
35
|
|
|
41
36
|
useEffect(() => {
|
|
42
37
|
const params: Record<string, string> = {};
|
|
@@ -60,7 +55,8 @@ export function UpdateUrl(props: Props) {
|
|
|
60
55
|
toChainString = '',
|
|
61
56
|
toTokenString = '',
|
|
62
57
|
fromAmount = '';
|
|
63
|
-
|
|
58
|
+
const autoConnect = searchParamsRef.current[SearchParams.AUTO_CONNECT];
|
|
59
|
+
if (fetchMetaStatus !== 'success') {
|
|
64
60
|
fromChainString = searchParamsRef.current[SearchParams.FROM_CHAIN];
|
|
65
61
|
fromTokenString = searchParamsRef.current[SearchParams.FROM_TOKEN];
|
|
66
62
|
toChainString = searchParamsRef.current[SearchParams.TO_CHAIN];
|
|
@@ -68,9 +64,6 @@ export function UpdateUrl(props: Props) {
|
|
|
68
64
|
fromAmount =
|
|
69
65
|
searchParamsRef.current[SearchParams.FROM_AMOUNT] || inputAmount;
|
|
70
66
|
} else {
|
|
71
|
-
if (location.state === 'redirect') {
|
|
72
|
-
return;
|
|
73
|
-
}
|
|
74
67
|
fromChainString = fromBlockchain?.name || '';
|
|
75
68
|
fromTokenString =
|
|
76
69
|
(fromToken?.symbol || '') +
|
|
@@ -94,6 +87,9 @@ export function UpdateUrl(props: Props) {
|
|
|
94
87
|
...(fromAmount && {
|
|
95
88
|
[SearchParams.FROM_AMOUNT]: fromAmount.toString(),
|
|
96
89
|
}),
|
|
90
|
+
...(autoConnect && {
|
|
91
|
+
[SearchParams.AUTO_CONNECT]: autoConnect,
|
|
92
|
+
}),
|
|
97
93
|
},
|
|
98
94
|
{ replace: true }
|
|
99
95
|
);
|
|
@@ -109,7 +105,7 @@ export function UpdateUrl(props: Props) {
|
|
|
109
105
|
]);
|
|
110
106
|
|
|
111
107
|
useEffect(() => {
|
|
112
|
-
if (
|
|
108
|
+
if (fetchMetaStatus === 'success') {
|
|
113
109
|
const fromChainString = searchParams.get(SearchParams.FROM_CHAIN);
|
|
114
110
|
const fromTokenString = searchParams.get(SearchParams.FROM_TOKEN);
|
|
115
111
|
const toChainString = searchParams.get(SearchParams.TO_CHAIN);
|
|
@@ -134,20 +130,29 @@ export function UpdateUrl(props: Props) {
|
|
|
134
130
|
if (!!fromBlockchain) {
|
|
135
131
|
setFromBlockchain(fromBlockchain);
|
|
136
132
|
if (!!fromToken) {
|
|
137
|
-
setFromToken(
|
|
133
|
+
setFromToken({
|
|
134
|
+
token: fromToken,
|
|
135
|
+
meta: {
|
|
136
|
+
blockchains: blockchains,
|
|
137
|
+
tokens: tokens,
|
|
138
|
+
},
|
|
139
|
+
});
|
|
138
140
|
}
|
|
139
141
|
}
|
|
140
142
|
if (!!toBlockchain) {
|
|
141
143
|
setToBlockchain(toBlockchain);
|
|
142
144
|
if (!!toToken) {
|
|
143
|
-
setToToken(
|
|
145
|
+
setToToken({
|
|
146
|
+
token: toToken,
|
|
147
|
+
meta: { blockchains: blockchains, tokens: tokens },
|
|
148
|
+
});
|
|
144
149
|
}
|
|
145
150
|
}
|
|
146
151
|
if (fromAmount) {
|
|
147
152
|
setInputAmount(fromAmount);
|
|
148
153
|
}
|
|
149
154
|
}
|
|
150
|
-
}, [
|
|
155
|
+
}, [fetchMetaStatus]);
|
|
151
156
|
|
|
152
157
|
return null;
|
|
153
158
|
}
|
|
@@ -8,11 +8,13 @@ import {
|
|
|
8
8
|
} from '@rango-dev/queue-manager-rango-preset';
|
|
9
9
|
import { useEffect } from 'react';
|
|
10
10
|
|
|
11
|
+
import { useAppStore } from '../store/AppStore';
|
|
11
12
|
import { useNotificationStore } from '../store/notification';
|
|
12
13
|
import { useWalletsStore } from '../store/wallets';
|
|
13
14
|
import { validBlockedStatuses } from '../types/notification';
|
|
14
15
|
|
|
15
16
|
export function WidgetEvents() {
|
|
17
|
+
const tokens = useAppStore().tokens();
|
|
16
18
|
const connectedWallets = useWalletsStore.use.connectedWallets();
|
|
17
19
|
const getWalletsDetails = useWalletsStore.use.getWalletsDetails();
|
|
18
20
|
const setNotification = useNotificationStore.use.setNotification();
|
|
@@ -38,8 +40,8 @@ export function WidgetEvents() {
|
|
|
38
40
|
(wallet) => wallet.chain === step?.toBlockchain
|
|
39
41
|
);
|
|
40
42
|
|
|
41
|
-
fromAccount && getWalletsDetails([fromAccount]);
|
|
42
|
-
toAccount && getWalletsDetails([toAccount]);
|
|
43
|
+
fromAccount && getWalletsDetails([fromAccount], tokens);
|
|
44
|
+
toAccount && getWalletsDetails([toAccount], tokens);
|
|
43
45
|
}
|
|
44
46
|
if (
|
|
45
47
|
(event.type === StepEventType.TX_EXECUTION_BLOCKED &&
|
package/src/constants/errors.ts
CHANGED
|
@@ -10,18 +10,22 @@ export const errorMessages = () => {
|
|
|
10
10
|
liquiditySourcesError: {
|
|
11
11
|
title: i18n.t('Please reset your liquidity sources.'),
|
|
12
12
|
description: i18n.t(
|
|
13
|
-
'You have limited the liquidity sources and this might result in Rango finding no routes. Please consider resetting your liquidity sources'
|
|
13
|
+
'You have limited the liquidity sources and this might result in Rango finding no routes. Please consider resetting your liquidity sources.'
|
|
14
14
|
),
|
|
15
15
|
},
|
|
16
16
|
noResultError: {
|
|
17
|
-
title: i18n.t('No Routes Found'),
|
|
17
|
+
title: i18n.t('No Routes Found.'),
|
|
18
18
|
description: i18n.t(
|
|
19
19
|
"Reasons why Rango couldn't find a route: low liquidity on token, very low input amount or no routes available for the selected input/output token combination."
|
|
20
20
|
),
|
|
21
21
|
},
|
|
22
22
|
bridgeLimitErrors: {
|
|
23
|
-
increaseAmount: i18n.t(
|
|
24
|
-
|
|
23
|
+
increaseAmount: i18n.t(
|
|
24
|
+
'Bridge Limit Error: Please increase your amount.'
|
|
25
|
+
),
|
|
26
|
+
decreaseAmount: i18n.t(
|
|
27
|
+
'Bridge Limit Error: Please decrease your amount.'
|
|
28
|
+
),
|
|
25
29
|
},
|
|
26
30
|
highValueLossError: {
|
|
27
31
|
impactTitle: i18n.t('High Price Impact'),
|
|
@@ -29,7 +33,7 @@ export const errorMessages = () => {
|
|
|
29
33
|
description: i18n.t(
|
|
30
34
|
'The price impact is significantly higher than the allowed amount. If you are sure, continue, otherwise, change the swap.'
|
|
31
35
|
),
|
|
32
|
-
confirmMessage: i18n.t('Confirm
|
|
36
|
+
confirmMessage: i18n.t('Confirm high price impact'),
|
|
33
37
|
},
|
|
34
38
|
quoteUpdatedWithHighValueLoss: {
|
|
35
39
|
title: i18n.t(
|
package/src/constants/index.ts
CHANGED
|
@@ -1,17 +1,16 @@
|
|
|
1
1
|
export const navigationRoutes = {
|
|
2
2
|
home: '/',
|
|
3
3
|
fromSwap: 'from-swap',
|
|
4
|
-
fromBlockchain: '/from-swap/blockchains',
|
|
5
|
-
toBlockchain: '/to-swap/blockchains',
|
|
6
4
|
toSwap: 'to-swap',
|
|
5
|
+
blockchains: 'blockchains',
|
|
7
6
|
settings: 'settings',
|
|
8
|
-
liquiditySources: '
|
|
9
|
-
themes: '
|
|
10
|
-
bridges: '
|
|
11
|
-
exchanges: '
|
|
12
|
-
languages: '
|
|
7
|
+
liquiditySources: 'liquidity-sources',
|
|
8
|
+
themes: 'themes',
|
|
9
|
+
bridges: 'bridges',
|
|
10
|
+
exchanges: 'exchanges',
|
|
11
|
+
languages: 'languages',
|
|
13
12
|
swaps: 'swaps',
|
|
14
13
|
wallets: 'wallets',
|
|
15
14
|
confirmSwap: 'confirm-swap',
|
|
16
|
-
swapDetails: '
|
|
15
|
+
swapDetails: ':requestId',
|
|
17
16
|
};
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
import { styled } from '@rango-dev/ui';
|
|
2
|
+
|
|
3
|
+
export const MainContainer = styled('div', {
|
|
4
|
+
width: '100%',
|
|
5
|
+
display: 'flex',
|
|
6
|
+
justifyContent: 'center',
|
|
7
|
+
alignItems: 'center',
|
|
8
|
+
fontFamily: '$widget',
|
|
9
|
+
boxSizing: 'border-box',
|
|
10
|
+
'& *, *::before, *::after': {
|
|
11
|
+
boxSizing: 'inherit',
|
|
12
|
+
listStyleType: 'none',
|
|
13
|
+
},
|
|
14
|
+
'& *:focus-visible': {
|
|
15
|
+
outlineColor: '$info500',
|
|
16
|
+
transition: 'none',
|
|
17
|
+
},
|
|
18
|
+
});
|