diff --git a/packages/plugins/Trader/src/SiteAdaptor/trader/hooks/useApprove.ts b/packages/plugins/Trader/src/SiteAdaptor/trader/hooks/useApprove.ts index c0199e39d50c..4af1db02fda5 100644 --- a/packages/plugins/Trader/src/SiteAdaptor/trader/hooks/useApprove.ts +++ b/packages/plugins/Trader/src/SiteAdaptor/trader/hooks/useApprove.ts @@ -30,7 +30,11 @@ export function useApprove() { const { data: spenderFromAPI, isPending: isLoadingSpender } = useSpender() const spender = approveInfo?.dexContractAddress || spenderFromAPI - const { data: allowance = '0', isPending: isLoadingAllowance } = useERC20TokenAllowance(tokenAddress, spender, { + const { + data: allowance = '0', + isPending: isLoadingAllowance, + refetch: refetchAllowance, + } = useERC20TokenAllowance(tokenAddress, spender, { chainId, }) @@ -60,6 +64,7 @@ export function useApprove() { }) const receipt = await waitForTransaction({ chainId, hash, confirmationCount: 1 }) if (!receipt?.status) throw new Error('Failed to approve') + await refetchAllowance() return hash }, }) diff --git a/packages/plugins/Trader/src/SiteAdaptor/trader/hooks/useGetTransferReceived.ts b/packages/plugins/Trader/src/SiteAdaptor/trader/hooks/useGetTransferReceived.ts index 8b9051cd7111..50e0865c0fbb 100644 --- a/packages/plugins/Trader/src/SiteAdaptor/trader/hooks/useGetTransferReceived.ts +++ b/packages/plugins/Trader/src/SiteAdaptor/trader/hooks/useGetTransferReceived.ts @@ -1,6 +1,5 @@ import { NetworkPluginID } from '@masknet/shared-base' -import { useWeb3 } from '@masknet/web3-hooks-base' -import type { ChainId } from '@masknet/web3-shared-evm' +import { useWeb3Connection } from '@masknet/web3-hooks-base' import { BigNumber } from 'bignumber.js' import { useCallback } from 'react' @@ -8,12 +7,12 @@ import { useCallback } from 'react' * Transfer(address,address,uint256) */ const TOPIC = '0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef' -export function useGetTransferReceived(chainId: ChainId) { - const web3 = useWeb3(NetworkPluginID.PLUGIN_EVM, { chainId }) +export function useGetTransferReceived() { + const web3 = useWeb3Connection(NetworkPluginID.PLUGIN_EVM) return useCallback( - async (hash: string, receiver: string) => { - const receipt = await web3?.eth.getTransactionReceipt(hash) - const receiverTopic = `0x000000000000000000000000${receiver.slice(2)}`.toLowerCase() + async ({ hash, account, chainId }: { hash: string; account: string; chainId: number }) => { + const receipt = await web3.getTransactionReceipt(hash, { chainId }) + const receiverTopic = `0x000000000000000000000000${account.slice(2)}`.toLowerCase() const datas = receipt?.logs .filter((x) => { diff --git a/packages/plugins/Trader/src/SiteAdaptor/trader/hooks/useWaitForTransaction.ts b/packages/plugins/Trader/src/SiteAdaptor/trader/hooks/useWaitForTransaction.ts index b002b2f1d925..3e21c69479a2 100644 --- a/packages/plugins/Trader/src/SiteAdaptor/trader/hooks/useWaitForTransaction.ts +++ b/packages/plugins/Trader/src/SiteAdaptor/trader/hooks/useWaitForTransaction.ts @@ -38,7 +38,7 @@ export function useWaitForTransaction() { } const [receipt, blockNumber] = await Promise.all([ web3.getTransactionReceipt(hash, { chainId }), - web3.getBlockNumber(), + web3.getBlockNumber({ chainId }), ]) if (receipt?.blockNumber && blockNumber - receipt.blockNumber >= confirmationCount) { resolve(receipt) diff --git a/packages/plugins/Trader/src/SiteAdaptor/trader/views/BridgeConfirm.tsx b/packages/plugins/Trader/src/SiteAdaptor/trader/views/BridgeConfirm.tsx index 3d19978ae36e..384faa6f92fc 100644 --- a/packages/plugins/Trader/src/SiteAdaptor/trader/views/BridgeConfirm.tsx +++ b/packages/plugins/Trader/src/SiteAdaptor/trader/views/BridgeConfirm.tsx @@ -3,7 +3,7 @@ import { Icons } from '@masknet/icons' import { CopyButton, LoadingStatus, NetworkIcon, PluginWalletStatusBar, ProgressiveText } from '@masknet/shared' import { NetworkPluginID } from '@masknet/shared-base' import { ActionButton, LoadingBase, makeStyles, ShadowRootTooltip, useCustomSnackbar } from '@masknet/theme' -import { useAccount, useNativeTokenPrice, useNetwork, useWeb3Connection } from '@masknet/web3-hooks-base' +import { useAccount, useNativeTokenPrice, useNetwork, useWeb3Connection, useWeb3Utils } from '@masknet/web3-hooks-base' import { dividedBy, formatBalance, @@ -14,24 +14,25 @@ import { rightShift, } from '@masknet/web3-shared-base' import { type ChainId, formatWeiToEther } from '@masknet/web3-shared-evm' -import { Box, Typography } from '@mui/material' +import { Box, Link as MuiLink, Typography } from '@mui/material' +import { useQueryClient } from '@tanstack/react-query' import { BigNumber } from 'bignumber.js' import { memo, useMemo, useState } from 'react' import { Link, useNavigate } from 'react-router-dom' import { useAsyncFn } from 'react-use' import urlcat from 'urlcat' +import { CoinIcon } from '../../components/CoinIcon.js' import { Warning } from '../../components/Warning.js' import { DEFAULT_SLIPPAGE, RoutePaths } from '../../constants.js' import { addTransaction } from '../../storage.js' import { useGasManagement, useTrade } from '../contexts/index.js' -import { useBridgeData } from '../hooks/useBridgeData.js' +import { getBridgeLeftSideToken, getBridgeRightSideToken } from '../helpers.js' +import { useApprove } from '../hooks/useApprove.js' import { useBridgable } from '../hooks/useBridgable.js' +import { useBridgeData } from '../hooks/useBridgeData.js' +import { useLeave } from '../hooks/useLeave.js' import { useToken } from '../hooks/useToken.js' import { useTokenPrice } from '../hooks/useTokenPrice.js' -import { CoinIcon } from '../../components/CoinIcon.js' -import { getBridgeLeftSideToken, getBridgeRightSideToken } from '../helpers.js' -import { useLeave } from '../hooks/useLeave.js' -import { useApprove } from '../hooks/useApprove.js' const useStyles = makeStyles()((theme) => ({ container: { @@ -236,6 +237,7 @@ export const BridgeConfirm = memo(function BridgeConfirm() { : null + const Utils = useWeb3Utils(NetworkPluginID.PLUGIN_EVM) const Web3 = useWeb3Connection(NetworkPluginID.PLUGIN_EVM, { chainId: fromChainId }) const gas = gasConfig.gas ?? transaction?.gasLimit ?? gasLimit const [{ loading: isSending }, sendBridge] = useAsyncFn(async () => { @@ -281,6 +283,7 @@ export const BridgeConfirm = memo(function BridgeConfirm() { const showStale = isQuoteStale && !isSending && !isApproving const leaveRef = useLeave() + const queryClient = useQueryClient() const [{ loading: submitting }, submit] = useAsyncFn(async () => { if (!fromToken || !toToken || !transaction?.to || !spender || !bridge) return @@ -300,6 +303,24 @@ export const BridgeConfirm = memo(function BridgeConfirm() { }) return } + queryClient.invalidateQueries({ queryKey: ['fungible-token', 'balance'] }) + showSnackbar(t`Bridge`, { + message: ( + + {t`Transaction submitted.`} + + + ), + variant: 'default', + processing: true, + }) await addTransaction(account, { kind: 'bridge', hash, diff --git a/packages/plugins/Trader/src/SiteAdaptor/trader/views/Confirm.tsx b/packages/plugins/Trader/src/SiteAdaptor/trader/views/Confirm.tsx index 6ec07f02a7b4..85edeab110c9 100644 --- a/packages/plugins/Trader/src/SiteAdaptor/trader/views/Confirm.tsx +++ b/packages/plugins/Trader/src/SiteAdaptor/trader/views/Confirm.tsx @@ -31,6 +31,7 @@ import { useLiquidityResources } from '../hooks/useLiquidityResources.js' import { useSwapData } from '../hooks/useSwapData.js' import { useSwappable } from '../hooks/useSwappable.js' import { useWaitForTransaction } from '../hooks/useWaitForTransaction.js' +import { useQueryClient } from '@tanstack/react-query' const useStyles = makeStyles()((theme) => ({ container: { @@ -264,9 +265,10 @@ export const Confirm = memo(function Confirm() { const { showSnackbar } = useCustomSnackbar() const leaveRef = useLeave() + const queryClient = useQueryClient() const Utils = useWeb3Utils(NetworkPluginID.PLUGIN_EVM) const waitForTransaction = useWaitForTransaction() - const getReceived = useGetTransferReceived(chainId) + const getReceived = useGetTransferReceived() const [{ loading: submitting }, submit] = useAsyncFn(async () => { if (!fromToken || !toToken || !transaction?.to || !spender) return @@ -286,9 +288,10 @@ export const Confirm = memo(function Confirm() { }) return } + queryClient.invalidateQueries({ queryKey: ['fungible-token', 'balance'] }) try { await waitForTransaction({ chainId, hash }) - const received = await getReceived(hash, account) + const received = await getReceived({ hash, account, chainId }) if (received && !leaveRef.current) { showSnackbar(t`Swap`, { message: ( diff --git a/packages/plugins/Trader/src/SiteAdaptor/trader/views/Transaction.tsx b/packages/plugins/Trader/src/SiteAdaptor/trader/views/Transaction.tsx index 5e6514c3de6f..e25806c2f1b3 100644 --- a/packages/plugins/Trader/src/SiteAdaptor/trader/views/Transaction.tsx +++ b/packages/plugins/Trader/src/SiteAdaptor/trader/views/Transaction.tsx @@ -237,7 +237,7 @@ export const Transaction = memo(function Transaction() { const { reset, setFromToken, mode, setToToken } = useTrade() const { classes, cx, theme } = useStyles() const navigate = useNavigate() - const [params] = useSearchParams() + const [params, setParams] = useSearchParams() const hash = params.get('hash') const rawChainId = params.get('chainId') const isPending = params.has('pending') @@ -263,7 +263,7 @@ export const Transaction = memo(function Transaction() { const { data: bridgeStatus } = useQuery({ queryKey: ['okx-bridge', 'transaction-status', chainId, hash], queryFn: hash && tx?.kind === 'bridge' ? () => OKX.getBridgeStatus({ chainId, hash }) : skipToken, - refetchInterval: 60_000, + refetchInterval: 10_000, }) const detailStatus = bridgeStatus?.detailStatus @@ -279,30 +279,47 @@ export const Transaction = memo(function Transaction() { const leaveRef = useLeave() const Utils = useWeb3Utils(NetworkPluginID.PLUGIN_EVM) const waitForTransaction = useWaitForTransaction() - const getReceived = useGetTransferReceived(chainId as ChainId) + const getReceived = useGetTransferReceived() + const toTxHash = bridgeStatus?.toTxHash useAsync(async () => { - if (!isPending || !chainId || !hash || !toToken) return - await waitForTransaction({ chainId, hash }) - const received = await getReceived(hash, account) + if (!isPending || !toChainId || !toTxHash || !toToken) return + const receipt = await waitForTransaction({ chainId: toChainId, hash: toTxHash, confirmationCount: 1 }) - if (received && !leaveRef.current) { + if (!receipt.status) { showSnackbar(t`Bridge`, { - message: ( - - {t`${formatBalance(received, toToken.decimals)} ${toToken.symbol} bridge completed successfully.`}{' '} - - - ), - variant: 'success', + message: t`Failed to bridge`, }) + return + } else { + const received = await getReceived({ hash: toTxHash, account, chainId: toChainId }) + + if (received && !leaveRef.current) { + showSnackbar(t`Bridge`, { + message: ( + + {t`${formatBalance(received, toToken.decimals)} ${toToken.symbol} bridge completed successfully.`}{' '} + + + ), + variant: 'success', + }) + } } - }, [isPending, chainId, hash, toToken]) + + setParams( + (params) => { + params.delete('pending') + return params.toString() + }, + { replace: true }, + ) + }, [isPending, toChainId, toTxHash, toToken]) if (!tx) return ( diff --git a/packages/plugins/Trader/src/locale/en-US.json b/packages/plugins/Trader/src/locale/en-US.json index b5497a78c29e..abc92084a536 100644 --- a/packages/plugins/Trader/src/locale/en-US.json +++ b/packages/plugins/Trader/src/locale/en-US.json @@ -39,6 +39,7 @@ "kPQQEW": "Enter an Amount", "Citz6F": "Exchange", "7Bj3x9": "Failed", + "QUBIav": "Failed to bridge", "2J5wRx": "Failed to get quote information", "KziH2K": "Fast", "pG7O41": "Fastest", diff --git a/packages/plugins/Trader/src/locale/en-US.po b/packages/plugins/Trader/src/locale/en-US.po index 605e2764c52c..81873c5ec699 100644 --- a/packages/plugins/Trader/src/locale/en-US.po +++ b/packages/plugins/Trader/src/locale/en-US.po @@ -13,15 +13,15 @@ msgstr "" "Language-Team: \n" "Plural-Forms: \n" -#: src/SiteAdaptor/trader/views/Transaction.tsx:298 +#: src/SiteAdaptor/trader/views/Transaction.tsx:306 msgid "{0} {1} bridge completed successfully." msgstr "" -#: src/SiteAdaptor/trader/views/Confirm.tsx:302 +#: src/SiteAdaptor/trader/views/Confirm.tsx:305 msgid "{0} {1} swap completed successfully." msgstr "" -#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:483 +#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:504 msgid "{0} Bridge Network fee" msgstr "" @@ -30,8 +30,8 @@ msgstr "" #~ msgid "{0} fee" #~ msgstr "" -#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:437 -#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:466 +#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:458 +#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:487 msgid "{0} Network fee" msgstr "" @@ -40,8 +40,8 @@ msgstr "" msgid "{0} Pool" msgstr "" -#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:430 -#: src/SiteAdaptor/trader/views/Transaction.tsx:563 +#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:451 +#: src/SiteAdaptor/trader/views/Transaction.tsx:580 msgid "{0} to {1}" msgstr "" @@ -49,8 +49,8 @@ msgstr "" msgid "{0}m" msgstr "" -#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:452 -#: src/SiteAdaptor/trader/views/Confirm.tsx:460 +#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:473 +#: src/SiteAdaptor/trader/views/Confirm.tsx:463 msgid "{gasOptionType, select, slow {Slow} normal {Average} fast {Fast} custom {Custom}}" msgstr "" @@ -70,13 +70,13 @@ msgstr "" #~ msgid "<0>Powered by<1/><2>OKX" #~ msgstr "" -#: src/SiteAdaptor/trader/views/Confirm.tsx:434 +#: src/SiteAdaptor/trader/views/Confirm.tsx:437 #: src/SiteAdaptor/trader/views/Trade/Quote.tsx:123 msgid "Aggregator" msgstr "" -#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:553 -#: src/SiteAdaptor/trader/views/Confirm.tsx:528 +#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:574 +#: src/SiteAdaptor/trader/views/Confirm.tsx:531 msgid "Approving" msgstr "" @@ -89,12 +89,14 @@ msgid "Base fee required: {MIN_BASE_FEE} Gwei" msgstr "" #: src/SiteAdaptor/trader/ExchangeDialog.tsx:112 -#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:297 -#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:345 +#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:300 +#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:307 +#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:366 #: src/SiteAdaptor/trader/views/Trade/index.tsx:237 #: src/SiteAdaptor/trader/views/TradingRoute.tsx:158 #: src/SiteAdaptor/trader/views/Transaction.tsx:289 -#: src/SiteAdaptor/trader/views/Transaction.tsx:523 +#: src/SiteAdaptor/trader/views/Transaction.tsx:297 +#: src/SiteAdaptor/trader/views/Transaction.tsx:540 msgid "Bridge" msgstr "" @@ -110,20 +112,20 @@ msgstr "" #~ msgid "Bridge network fee" #~ msgstr "" -#: src/SiteAdaptor/trader/views/Transaction.tsx:351 +#: src/SiteAdaptor/trader/views/Transaction.tsx:368 msgid "Bridging" msgstr "" -#: src/SiteAdaptor/trader/views/Transaction.tsx:605 +#: src/SiteAdaptor/trader/views/Transaction.tsx:622 msgid "Check on Explorer" msgstr "" -#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:552 -#: src/SiteAdaptor/trader/views/Confirm.tsx:527 +#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:573 +#: src/SiteAdaptor/trader/views/Confirm.tsx:530 msgid "Checking Approve" msgstr "" -#: src/SiteAdaptor/trader/views/Transaction.tsx:380 +#: src/SiteAdaptor/trader/views/Transaction.tsx:397 msgid "Complete" msgstr "" @@ -133,7 +135,7 @@ msgid "Confirm" msgstr "" #: src/SiteAdaptor/trader/ExchangeDialog.tsx:62 -#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:554 +#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:575 msgid "Confirm Bridge" msgstr "" @@ -142,7 +144,7 @@ msgstr "" #~ msgstr "" #: src/SiteAdaptor/trader/ExchangeDialog.tsx:61 -#: src/SiteAdaptor/trader/views/Confirm.tsx:529 +#: src/SiteAdaptor/trader/views/Confirm.tsx:532 msgid "Confirm Swap" msgstr "" @@ -154,12 +156,12 @@ msgstr "" msgid "Custom" msgstr "" -#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:521 -#: src/SiteAdaptor/trader/views/Confirm.tsx:496 +#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:542 +#: src/SiteAdaptor/trader/views/Confirm.tsx:499 msgid "Data" msgstr "" -#: src/SiteAdaptor/trader/views/Transaction.tsx:527 +#: src/SiteAdaptor/trader/views/Transaction.tsx:544 msgid "Date" msgstr "" @@ -177,10 +179,14 @@ msgstr "" msgid "Exchange" msgstr "" -#: src/SiteAdaptor/trader/views/Transaction.tsx:386 +#: src/SiteAdaptor/trader/views/Transaction.tsx:403 msgid "Failed" msgstr "" +#: src/SiteAdaptor/trader/views/Transaction.tsx:290 +msgid "Failed to bridge" +msgstr "" + #: src/SiteAdaptor/trader/hooks/useBridgable.ts:28 msgid "Failed to get quote information" msgstr "" @@ -193,10 +199,10 @@ msgstr "" msgid "Fastest" msgstr "" -#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:377 -#: src/SiteAdaptor/trader/views/Confirm.tsx:387 +#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:398 +#: src/SiteAdaptor/trader/views/Confirm.tsx:390 #: src/SiteAdaptor/trader/views/Trade/index.tsx:244 -#: src/SiteAdaptor/trader/views/Transaction.tsx:393 +#: src/SiteAdaptor/trader/views/Transaction.tsx:410 msgid "From" msgstr "" @@ -212,8 +218,8 @@ msgstr "" msgid "History" msgstr "" -#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:469 -#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:486 +#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:490 +#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:507 msgid "" "In cross-chain transactions, this fee includes the estimated network fee and the cross-chain bridge's network fee which is $0.00 (0 OP_ETH). The network fees are paid to the miners and aren't charged by our platform.\n" "The actual cost may be lower\n" @@ -225,11 +231,11 @@ msgstr "" msgid "Insufficient {symbol} Balance" msgstr "" -#: src/SiteAdaptor/trader/views/Transaction.tsx:623 +#: src/SiteAdaptor/trader/views/Transaction.tsx:640 msgid "Make another Bridge" msgstr "" -#: src/SiteAdaptor/trader/views/Transaction.tsx:622 +#: src/SiteAdaptor/trader/views/Transaction.tsx:639 msgid "Make another Swap" msgstr "" @@ -245,7 +251,7 @@ msgstr "" msgid "Max base fee" msgstr "" -#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:513 +#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:534 msgid "Minimum received" msgstr "" @@ -254,14 +260,14 @@ msgstr "" msgid "Missing dex contract address" msgstr "" -#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:420 -#: src/SiteAdaptor/trader/views/Transaction.tsx:544 -#: src/SiteAdaptor/trader/views/Transaction.tsx:553 +#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:441 +#: src/SiteAdaptor/trader/views/Transaction.tsx:561 +#: src/SiteAdaptor/trader/views/Transaction.tsx:570 msgid "Network" msgstr "" #: src/SiteAdaptor/trader/ExchangeDialog.tsx:69 -#: src/SiteAdaptor/trader/views/Confirm.tsx:445 +#: src/SiteAdaptor/trader/views/Confirm.tsx:448 msgid "Network fee" msgstr "" @@ -282,7 +288,7 @@ msgstr "" msgid "Overall Best" msgstr "" -#: src/SiteAdaptor/trader/views/Confirm.tsx:487 +#: src/SiteAdaptor/trader/views/Confirm.tsx:490 #: src/SiteAdaptor/trader/views/Trade/Quote.tsx:207 msgid "Powered by" msgstr "" @@ -291,8 +297,8 @@ msgstr "" msgid "Priority fee" msgstr "" -#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:536 -#: src/SiteAdaptor/trader/views/Confirm.tsx:511 +#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:557 +#: src/SiteAdaptor/trader/views/Confirm.tsx:514 msgid "Quote expired. Update to receive a new quote." msgstr "" @@ -305,14 +311,14 @@ msgstr "" msgid "Quote Route" msgstr "" -#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:507 -#: src/SiteAdaptor/trader/views/Confirm.tsx:439 +#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:528 +#: src/SiteAdaptor/trader/views/Confirm.tsx:442 #: src/SiteAdaptor/trader/views/Trade/Quote.tsx:128 -#: src/SiteAdaptor/trader/views/Transaction.tsx:581 +#: src/SiteAdaptor/trader/views/Transaction.tsx:598 msgid "Rate" msgstr "" -#: src/SiteAdaptor/trader/views/Confirm.tsx:474 +#: src/SiteAdaptor/trader/views/Confirm.tsx:477 msgid "Select liquidity" msgstr "" @@ -320,12 +326,12 @@ msgstr "" msgid "Select Liquidity" msgstr "" -#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:551 -#: src/SiteAdaptor/trader/views/Confirm.tsx:526 +#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:572 +#: src/SiteAdaptor/trader/views/Confirm.tsx:529 msgid "Sending" msgstr "" -#: src/SiteAdaptor/trader/views/Transaction.tsx:587 +#: src/SiteAdaptor/trader/views/Transaction.tsx:604 msgid "Sending address" msgstr "" @@ -339,12 +345,12 @@ msgid "Slow" msgstr "" #: src/SiteAdaptor/trader/ExchangeDialog.tsx:111 -#: src/SiteAdaptor/trader/views/Confirm.tsx:283 -#: src/SiteAdaptor/trader/views/Confirm.tsx:293 -#: src/SiteAdaptor/trader/views/Confirm.tsx:310 -#: src/SiteAdaptor/trader/views/Confirm.tsx:352 +#: src/SiteAdaptor/trader/views/Confirm.tsx:285 +#: src/SiteAdaptor/trader/views/Confirm.tsx:296 +#: src/SiteAdaptor/trader/views/Confirm.tsx:313 +#: src/SiteAdaptor/trader/views/Confirm.tsx:355 #: src/SiteAdaptor/trader/views/Trade/index.tsx:236 -#: src/SiteAdaptor/trader/views/Transaction.tsx:523 +#: src/SiteAdaptor/trader/views/Transaction.tsx:540 msgid "Swap" msgstr "" @@ -352,11 +358,11 @@ msgstr "" msgid "Swap anyway" msgstr "" -#: src/SiteAdaptor/trader/views/Transaction.tsx:536 +#: src/SiteAdaptor/trader/views/Transaction.tsx:553 msgid "Swap duration" msgstr "" -#: src/SiteAdaptor/trader/views/Transaction.tsx:351 +#: src/SiteAdaptor/trader/views/Transaction.tsx:368 msgid "Swapping" msgstr "" @@ -364,7 +370,7 @@ msgstr "" msgid "Swaps between this token pair are’t supported at the moment. You can try with third-party DApps instead." msgstr "" -#: src/SiteAdaptor/trader/views/Transaction.tsx:370 +#: src/SiteAdaptor/trader/views/Transaction.tsx:387 msgid "The {0} is in progress. You can check its status in History after exiting this page." msgstr "" @@ -376,8 +382,8 @@ msgstr "" #~ msgid "The swap is in progress. You can check its status in History after exiting this page." #~ msgstr "" -#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:440 -#: src/SiteAdaptor/trader/views/Confirm.tsx:448 +#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:461 +#: src/SiteAdaptor/trader/views/Confirm.tsx:451 msgid "This fee is used to pay miners and isn't collected by us. The actual cost may be less than estimated, and the unused fee won't be deducted from your account." msgstr "" @@ -389,13 +395,13 @@ msgstr "" msgid "This swap isn’t supported" msgstr "" -#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:398 -#: src/SiteAdaptor/trader/views/Confirm.tsx:409 -#: src/SiteAdaptor/trader/views/Transaction.tsx:472 +#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:419 +#: src/SiteAdaptor/trader/views/Confirm.tsx:412 +#: src/SiteAdaptor/trader/views/Transaction.tsx:489 msgid "To" msgstr "" -#: src/SiteAdaptor/trader/views/Confirm.tsx:431 +#: src/SiteAdaptor/trader/views/Confirm.tsx:434 #: src/SiteAdaptor/trader/views/Trade/Quote.tsx:120 msgid "Trading mode" msgstr "" @@ -416,29 +422,28 @@ msgstr "" msgid "Transaction history is only stored locally and will be deleted if you clear your browser data." msgstr "" -#: src/SiteAdaptor/trader/views/Transaction.tsx:412 +#: src/SiteAdaptor/trader/views/Transaction.tsx:429 msgid "Transaction in progress. Thank you for your patience." msgstr "" -#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:298 -#: src/SiteAdaptor/trader/views/Confirm.tsx:284 +#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:301 +#: src/SiteAdaptor/trader/views/Confirm.tsx:286 msgid "Transaction rejected" msgstr "" -#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:474 -#: src/SiteAdaptor/trader/views/Confirm.tsx:428 -#~ msgid "Transaction submitted." -#~ msgstr "" +#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:317 +msgid "Transaction submitted." +msgstr "" -#: src/SiteAdaptor/trader/views/Transaction.tsx:521 +#: src/SiteAdaptor/trader/views/Transaction.tsx:538 msgid "Transaction type" msgstr "" -#: src/SiteAdaptor/trader/views/Transaction.tsx:453 +#: src/SiteAdaptor/trader/views/Transaction.tsx:470 msgid "Transferring asset across to the {0} network via the {1}cross-chain bridge" msgstr "" -#: src/SiteAdaptor/trader/views/Transaction.tsx:624 +#: src/SiteAdaptor/trader/views/Transaction.tsx:641 msgid "Try Again" msgstr "" @@ -446,19 +451,19 @@ msgstr "" msgid "Try token from different chains" msgstr "" -#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:547 -#: src/SiteAdaptor/trader/views/Confirm.tsx:522 +#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:568 +#: src/SiteAdaptor/trader/views/Confirm.tsx:525 msgid "Update Quote" msgstr "" -#: src/SiteAdaptor/trader/views/Confirm.tsx:311 +#: src/SiteAdaptor/trader/views/Confirm.tsx:314 msgid "Wait too long for the confirmation." msgstr "" -#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:498 +#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:519 msgid "Wallet" msgstr "" -#: src/SiteAdaptor/trader/views/Transaction.tsx:359 +#: src/SiteAdaptor/trader/views/Transaction.tsx:376 msgid "Your transaction should be done in <0/>" msgstr "" diff --git a/packages/plugins/Trader/src/locale/ja-JP.json b/packages/plugins/Trader/src/locale/ja-JP.json index b5497a78c29e..abc92084a536 100644 --- a/packages/plugins/Trader/src/locale/ja-JP.json +++ b/packages/plugins/Trader/src/locale/ja-JP.json @@ -39,6 +39,7 @@ "kPQQEW": "Enter an Amount", "Citz6F": "Exchange", "7Bj3x9": "Failed", + "QUBIav": "Failed to bridge", "2J5wRx": "Failed to get quote information", "KziH2K": "Fast", "pG7O41": "Fastest", diff --git a/packages/plugins/Trader/src/locale/ja-JP.po b/packages/plugins/Trader/src/locale/ja-JP.po index 065e099c213f..7860e30494e2 100644 --- a/packages/plugins/Trader/src/locale/ja-JP.po +++ b/packages/plugins/Trader/src/locale/ja-JP.po @@ -18,15 +18,15 @@ msgstr "" "X-Crowdin-File: /[DimensionDev.Maskbook] develop/packages/plugins/Trader/src/locale/en-US.po\n" "X-Crowdin-File-ID: 1000\n" -#: src/SiteAdaptor/trader/views/Transaction.tsx:298 +#: src/SiteAdaptor/trader/views/Transaction.tsx:306 msgid "{0} {1} bridge completed successfully." msgstr "" -#: src/SiteAdaptor/trader/views/Confirm.tsx:302 +#: src/SiteAdaptor/trader/views/Confirm.tsx:305 msgid "{0} {1} swap completed successfully." msgstr "" -#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:483 +#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:504 msgid "{0} Bridge Network fee" msgstr "" @@ -35,8 +35,8 @@ msgstr "" #~ msgid "{0} fee" #~ msgstr "" -#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:437 -#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:466 +#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:458 +#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:487 msgid "{0} Network fee" msgstr "" @@ -45,8 +45,8 @@ msgstr "" msgid "{0} Pool" msgstr "" -#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:430 -#: src/SiteAdaptor/trader/views/Transaction.tsx:563 +#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:451 +#: src/SiteAdaptor/trader/views/Transaction.tsx:580 msgid "{0} to {1}" msgstr "" @@ -54,8 +54,8 @@ msgstr "" msgid "{0}m" msgstr "" -#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:452 -#: src/SiteAdaptor/trader/views/Confirm.tsx:460 +#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:473 +#: src/SiteAdaptor/trader/views/Confirm.tsx:463 msgid "{gasOptionType, select, slow {Slow} normal {Average} fast {Fast} custom {Custom}}" msgstr "" @@ -75,13 +75,13 @@ msgstr "" #~ msgid "<0>Powered by<1/><2>OKX" #~ msgstr "" -#: src/SiteAdaptor/trader/views/Confirm.tsx:434 +#: src/SiteAdaptor/trader/views/Confirm.tsx:437 #: src/SiteAdaptor/trader/views/Trade/Quote.tsx:123 msgid "Aggregator" msgstr "" -#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:553 -#: src/SiteAdaptor/trader/views/Confirm.tsx:528 +#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:574 +#: src/SiteAdaptor/trader/views/Confirm.tsx:531 msgid "Approving" msgstr "" @@ -94,12 +94,14 @@ msgid "Base fee required: {MIN_BASE_FEE} Gwei" msgstr "" #: src/SiteAdaptor/trader/ExchangeDialog.tsx:112 -#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:297 -#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:345 +#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:300 +#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:307 +#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:366 #: src/SiteAdaptor/trader/views/Trade/index.tsx:237 #: src/SiteAdaptor/trader/views/TradingRoute.tsx:158 #: src/SiteAdaptor/trader/views/Transaction.tsx:289 -#: src/SiteAdaptor/trader/views/Transaction.tsx:523 +#: src/SiteAdaptor/trader/views/Transaction.tsx:297 +#: src/SiteAdaptor/trader/views/Transaction.tsx:540 msgid "Bridge" msgstr "" @@ -115,20 +117,20 @@ msgstr "" #~ msgid "Bridge network fee" #~ msgstr "" -#: src/SiteAdaptor/trader/views/Transaction.tsx:351 +#: src/SiteAdaptor/trader/views/Transaction.tsx:368 msgid "Bridging" msgstr "" -#: src/SiteAdaptor/trader/views/Transaction.tsx:605 +#: src/SiteAdaptor/trader/views/Transaction.tsx:622 msgid "Check on Explorer" msgstr "" -#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:552 -#: src/SiteAdaptor/trader/views/Confirm.tsx:527 +#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:573 +#: src/SiteAdaptor/trader/views/Confirm.tsx:530 msgid "Checking Approve" msgstr "" -#: src/SiteAdaptor/trader/views/Transaction.tsx:380 +#: src/SiteAdaptor/trader/views/Transaction.tsx:397 msgid "Complete" msgstr "" @@ -138,7 +140,7 @@ msgid "Confirm" msgstr "" #: src/SiteAdaptor/trader/ExchangeDialog.tsx:62 -#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:554 +#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:575 msgid "Confirm Bridge" msgstr "" @@ -147,7 +149,7 @@ msgstr "" #~ msgstr "" #: src/SiteAdaptor/trader/ExchangeDialog.tsx:61 -#: src/SiteAdaptor/trader/views/Confirm.tsx:529 +#: src/SiteAdaptor/trader/views/Confirm.tsx:532 msgid "Confirm Swap" msgstr "" @@ -159,12 +161,12 @@ msgstr "" msgid "Custom" msgstr "" -#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:521 -#: src/SiteAdaptor/trader/views/Confirm.tsx:496 +#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:542 +#: src/SiteAdaptor/trader/views/Confirm.tsx:499 msgid "Data" msgstr "" -#: src/SiteAdaptor/trader/views/Transaction.tsx:527 +#: src/SiteAdaptor/trader/views/Transaction.tsx:544 msgid "Date" msgstr "" @@ -182,10 +184,14 @@ msgstr "" msgid "Exchange" msgstr "" -#: src/SiteAdaptor/trader/views/Transaction.tsx:386 +#: src/SiteAdaptor/trader/views/Transaction.tsx:403 msgid "Failed" msgstr "" +#: src/SiteAdaptor/trader/views/Transaction.tsx:290 +msgid "Failed to bridge" +msgstr "" + #: src/SiteAdaptor/trader/hooks/useBridgable.ts:28 msgid "Failed to get quote information" msgstr "" @@ -198,10 +204,10 @@ msgstr "" msgid "Fastest" msgstr "" -#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:377 -#: src/SiteAdaptor/trader/views/Confirm.tsx:387 +#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:398 +#: src/SiteAdaptor/trader/views/Confirm.tsx:390 #: src/SiteAdaptor/trader/views/Trade/index.tsx:244 -#: src/SiteAdaptor/trader/views/Transaction.tsx:393 +#: src/SiteAdaptor/trader/views/Transaction.tsx:410 msgid "From" msgstr "" @@ -217,8 +223,8 @@ msgstr "" msgid "History" msgstr "" -#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:469 -#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:486 +#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:490 +#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:507 msgid "" "In cross-chain transactions, this fee includes the estimated network fee and the cross-chain bridge's network fee which is $0.00 (0 OP_ETH). The network fees are paid to the miners and aren't charged by our platform.\n" "The actual cost may be lower\n" @@ -230,11 +236,11 @@ msgstr "" msgid "Insufficient {symbol} Balance" msgstr "" -#: src/SiteAdaptor/trader/views/Transaction.tsx:623 +#: src/SiteAdaptor/trader/views/Transaction.tsx:640 msgid "Make another Bridge" msgstr "" -#: src/SiteAdaptor/trader/views/Transaction.tsx:622 +#: src/SiteAdaptor/trader/views/Transaction.tsx:639 msgid "Make another Swap" msgstr "" @@ -250,7 +256,7 @@ msgstr "" msgid "Max base fee" msgstr "" -#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:513 +#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:534 msgid "Minimum received" msgstr "" @@ -259,14 +265,14 @@ msgstr "" msgid "Missing dex contract address" msgstr "" -#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:420 -#: src/SiteAdaptor/trader/views/Transaction.tsx:544 -#: src/SiteAdaptor/trader/views/Transaction.tsx:553 +#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:441 +#: src/SiteAdaptor/trader/views/Transaction.tsx:561 +#: src/SiteAdaptor/trader/views/Transaction.tsx:570 msgid "Network" msgstr "" #: src/SiteAdaptor/trader/ExchangeDialog.tsx:69 -#: src/SiteAdaptor/trader/views/Confirm.tsx:445 +#: src/SiteAdaptor/trader/views/Confirm.tsx:448 msgid "Network fee" msgstr "" @@ -287,7 +293,7 @@ msgstr "" msgid "Overall Best" msgstr "" -#: src/SiteAdaptor/trader/views/Confirm.tsx:487 +#: src/SiteAdaptor/trader/views/Confirm.tsx:490 #: src/SiteAdaptor/trader/views/Trade/Quote.tsx:207 msgid "Powered by" msgstr "" @@ -296,8 +302,8 @@ msgstr "" msgid "Priority fee" msgstr "" -#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:536 -#: src/SiteAdaptor/trader/views/Confirm.tsx:511 +#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:557 +#: src/SiteAdaptor/trader/views/Confirm.tsx:514 msgid "Quote expired. Update to receive a new quote." msgstr "" @@ -310,14 +316,14 @@ msgstr "" msgid "Quote Route" msgstr "" -#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:507 -#: src/SiteAdaptor/trader/views/Confirm.tsx:439 +#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:528 +#: src/SiteAdaptor/trader/views/Confirm.tsx:442 #: src/SiteAdaptor/trader/views/Trade/Quote.tsx:128 -#: src/SiteAdaptor/trader/views/Transaction.tsx:581 +#: src/SiteAdaptor/trader/views/Transaction.tsx:598 msgid "Rate" msgstr "" -#: src/SiteAdaptor/trader/views/Confirm.tsx:474 +#: src/SiteAdaptor/trader/views/Confirm.tsx:477 msgid "Select liquidity" msgstr "" @@ -325,12 +331,12 @@ msgstr "" msgid "Select Liquidity" msgstr "" -#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:551 -#: src/SiteAdaptor/trader/views/Confirm.tsx:526 +#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:572 +#: src/SiteAdaptor/trader/views/Confirm.tsx:529 msgid "Sending" msgstr "" -#: src/SiteAdaptor/trader/views/Transaction.tsx:587 +#: src/SiteAdaptor/trader/views/Transaction.tsx:604 msgid "Sending address" msgstr "" @@ -344,12 +350,12 @@ msgid "Slow" msgstr "" #: src/SiteAdaptor/trader/ExchangeDialog.tsx:111 -#: src/SiteAdaptor/trader/views/Confirm.tsx:283 -#: src/SiteAdaptor/trader/views/Confirm.tsx:293 -#: src/SiteAdaptor/trader/views/Confirm.tsx:310 -#: src/SiteAdaptor/trader/views/Confirm.tsx:352 +#: src/SiteAdaptor/trader/views/Confirm.tsx:285 +#: src/SiteAdaptor/trader/views/Confirm.tsx:296 +#: src/SiteAdaptor/trader/views/Confirm.tsx:313 +#: src/SiteAdaptor/trader/views/Confirm.tsx:355 #: src/SiteAdaptor/trader/views/Trade/index.tsx:236 -#: src/SiteAdaptor/trader/views/Transaction.tsx:523 +#: src/SiteAdaptor/trader/views/Transaction.tsx:540 msgid "Swap" msgstr "" @@ -357,11 +363,11 @@ msgstr "" msgid "Swap anyway" msgstr "" -#: src/SiteAdaptor/trader/views/Transaction.tsx:536 +#: src/SiteAdaptor/trader/views/Transaction.tsx:553 msgid "Swap duration" msgstr "" -#: src/SiteAdaptor/trader/views/Transaction.tsx:351 +#: src/SiteAdaptor/trader/views/Transaction.tsx:368 msgid "Swapping" msgstr "" @@ -369,7 +375,7 @@ msgstr "" msgid "Swaps between this token pair are’t supported at the moment. You can try with third-party DApps instead." msgstr "" -#: src/SiteAdaptor/trader/views/Transaction.tsx:370 +#: src/SiteAdaptor/trader/views/Transaction.tsx:387 msgid "The {0} is in progress. You can check its status in History after exiting this page." msgstr "" @@ -381,8 +387,8 @@ msgstr "" #~ msgid "The swap is in progress. You can check its status in History after exiting this page." #~ msgstr "" -#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:440 -#: src/SiteAdaptor/trader/views/Confirm.tsx:448 +#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:461 +#: src/SiteAdaptor/trader/views/Confirm.tsx:451 msgid "This fee is used to pay miners and isn't collected by us. The actual cost may be less than estimated, and the unused fee won't be deducted from your account." msgstr "" @@ -394,13 +400,13 @@ msgstr "" msgid "This swap isn’t supported" msgstr "" -#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:398 -#: src/SiteAdaptor/trader/views/Confirm.tsx:409 -#: src/SiteAdaptor/trader/views/Transaction.tsx:472 +#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:419 +#: src/SiteAdaptor/trader/views/Confirm.tsx:412 +#: src/SiteAdaptor/trader/views/Transaction.tsx:489 msgid "To" msgstr "" -#: src/SiteAdaptor/trader/views/Confirm.tsx:431 +#: src/SiteAdaptor/trader/views/Confirm.tsx:434 #: src/SiteAdaptor/trader/views/Trade/Quote.tsx:120 msgid "Trading mode" msgstr "" @@ -421,29 +427,28 @@ msgstr "" msgid "Transaction history is only stored locally and will be deleted if you clear your browser data." msgstr "" -#: src/SiteAdaptor/trader/views/Transaction.tsx:412 +#: src/SiteAdaptor/trader/views/Transaction.tsx:429 msgid "Transaction in progress. Thank you for your patience." msgstr "" -#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:298 -#: src/SiteAdaptor/trader/views/Confirm.tsx:284 +#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:301 +#: src/SiteAdaptor/trader/views/Confirm.tsx:286 msgid "Transaction rejected" msgstr "" -#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:474 -#: src/SiteAdaptor/trader/views/Confirm.tsx:428 -#~ msgid "Transaction submitted." -#~ msgstr "" +#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:317 +msgid "Transaction submitted." +msgstr "" -#: src/SiteAdaptor/trader/views/Transaction.tsx:521 +#: src/SiteAdaptor/trader/views/Transaction.tsx:538 msgid "Transaction type" msgstr "" -#: src/SiteAdaptor/trader/views/Transaction.tsx:453 +#: src/SiteAdaptor/trader/views/Transaction.tsx:470 msgid "Transferring asset across to the {0} network via the {1}cross-chain bridge" msgstr "" -#: src/SiteAdaptor/trader/views/Transaction.tsx:624 +#: src/SiteAdaptor/trader/views/Transaction.tsx:641 msgid "Try Again" msgstr "" @@ -451,19 +456,19 @@ msgstr "" msgid "Try token from different chains" msgstr "" -#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:547 -#: src/SiteAdaptor/trader/views/Confirm.tsx:522 +#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:568 +#: src/SiteAdaptor/trader/views/Confirm.tsx:525 msgid "Update Quote" msgstr "" -#: src/SiteAdaptor/trader/views/Confirm.tsx:311 +#: src/SiteAdaptor/trader/views/Confirm.tsx:314 msgid "Wait too long for the confirmation." msgstr "" -#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:498 +#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:519 msgid "Wallet" msgstr "" -#: src/SiteAdaptor/trader/views/Transaction.tsx:359 +#: src/SiteAdaptor/trader/views/Transaction.tsx:376 msgid "Your transaction should be done in <0/>" msgstr "" diff --git a/packages/plugins/Trader/src/locale/ko-KR.json b/packages/plugins/Trader/src/locale/ko-KR.json index b5497a78c29e..abc92084a536 100644 --- a/packages/plugins/Trader/src/locale/ko-KR.json +++ b/packages/plugins/Trader/src/locale/ko-KR.json @@ -39,6 +39,7 @@ "kPQQEW": "Enter an Amount", "Citz6F": "Exchange", "7Bj3x9": "Failed", + "QUBIav": "Failed to bridge", "2J5wRx": "Failed to get quote information", "KziH2K": "Fast", "pG7O41": "Fastest", diff --git a/packages/plugins/Trader/src/locale/ko-KR.po b/packages/plugins/Trader/src/locale/ko-KR.po index 981a0b89142f..4198690c3e81 100644 --- a/packages/plugins/Trader/src/locale/ko-KR.po +++ b/packages/plugins/Trader/src/locale/ko-KR.po @@ -18,15 +18,15 @@ msgstr "" "X-Crowdin-File: /[DimensionDev.Maskbook] develop/packages/plugins/Trader/src/locale/en-US.po\n" "X-Crowdin-File-ID: 1000\n" -#: src/SiteAdaptor/trader/views/Transaction.tsx:298 +#: src/SiteAdaptor/trader/views/Transaction.tsx:306 msgid "{0} {1} bridge completed successfully." msgstr "" -#: src/SiteAdaptor/trader/views/Confirm.tsx:302 +#: src/SiteAdaptor/trader/views/Confirm.tsx:305 msgid "{0} {1} swap completed successfully." msgstr "" -#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:483 +#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:504 msgid "{0} Bridge Network fee" msgstr "" @@ -35,8 +35,8 @@ msgstr "" #~ msgid "{0} fee" #~ msgstr "" -#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:437 -#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:466 +#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:458 +#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:487 msgid "{0} Network fee" msgstr "" @@ -45,8 +45,8 @@ msgstr "" msgid "{0} Pool" msgstr "" -#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:430 -#: src/SiteAdaptor/trader/views/Transaction.tsx:563 +#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:451 +#: src/SiteAdaptor/trader/views/Transaction.tsx:580 msgid "{0} to {1}" msgstr "" @@ -54,8 +54,8 @@ msgstr "" msgid "{0}m" msgstr "" -#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:452 -#: src/SiteAdaptor/trader/views/Confirm.tsx:460 +#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:473 +#: src/SiteAdaptor/trader/views/Confirm.tsx:463 msgid "{gasOptionType, select, slow {Slow} normal {Average} fast {Fast} custom {Custom}}" msgstr "" @@ -75,13 +75,13 @@ msgstr "" #~ msgid "<0>Powered by<1/><2>OKX" #~ msgstr "" -#: src/SiteAdaptor/trader/views/Confirm.tsx:434 +#: src/SiteAdaptor/trader/views/Confirm.tsx:437 #: src/SiteAdaptor/trader/views/Trade/Quote.tsx:123 msgid "Aggregator" msgstr "" -#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:553 -#: src/SiteAdaptor/trader/views/Confirm.tsx:528 +#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:574 +#: src/SiteAdaptor/trader/views/Confirm.tsx:531 msgid "Approving" msgstr "" @@ -94,12 +94,14 @@ msgid "Base fee required: {MIN_BASE_FEE} Gwei" msgstr "" #: src/SiteAdaptor/trader/ExchangeDialog.tsx:112 -#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:297 -#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:345 +#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:300 +#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:307 +#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:366 #: src/SiteAdaptor/trader/views/Trade/index.tsx:237 #: src/SiteAdaptor/trader/views/TradingRoute.tsx:158 #: src/SiteAdaptor/trader/views/Transaction.tsx:289 -#: src/SiteAdaptor/trader/views/Transaction.tsx:523 +#: src/SiteAdaptor/trader/views/Transaction.tsx:297 +#: src/SiteAdaptor/trader/views/Transaction.tsx:540 msgid "Bridge" msgstr "" @@ -115,20 +117,20 @@ msgstr "" #~ msgid "Bridge network fee" #~ msgstr "" -#: src/SiteAdaptor/trader/views/Transaction.tsx:351 +#: src/SiteAdaptor/trader/views/Transaction.tsx:368 msgid "Bridging" msgstr "" -#: src/SiteAdaptor/trader/views/Transaction.tsx:605 +#: src/SiteAdaptor/trader/views/Transaction.tsx:622 msgid "Check on Explorer" msgstr "" -#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:552 -#: src/SiteAdaptor/trader/views/Confirm.tsx:527 +#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:573 +#: src/SiteAdaptor/trader/views/Confirm.tsx:530 msgid "Checking Approve" msgstr "" -#: src/SiteAdaptor/trader/views/Transaction.tsx:380 +#: src/SiteAdaptor/trader/views/Transaction.tsx:397 msgid "Complete" msgstr "" @@ -138,7 +140,7 @@ msgid "Confirm" msgstr "" #: src/SiteAdaptor/trader/ExchangeDialog.tsx:62 -#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:554 +#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:575 msgid "Confirm Bridge" msgstr "" @@ -147,7 +149,7 @@ msgstr "" #~ msgstr "" #: src/SiteAdaptor/trader/ExchangeDialog.tsx:61 -#: src/SiteAdaptor/trader/views/Confirm.tsx:529 +#: src/SiteAdaptor/trader/views/Confirm.tsx:532 msgid "Confirm Swap" msgstr "" @@ -159,12 +161,12 @@ msgstr "" msgid "Custom" msgstr "" -#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:521 -#: src/SiteAdaptor/trader/views/Confirm.tsx:496 +#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:542 +#: src/SiteAdaptor/trader/views/Confirm.tsx:499 msgid "Data" msgstr "" -#: src/SiteAdaptor/trader/views/Transaction.tsx:527 +#: src/SiteAdaptor/trader/views/Transaction.tsx:544 msgid "Date" msgstr "" @@ -182,10 +184,14 @@ msgstr "" msgid "Exchange" msgstr "" -#: src/SiteAdaptor/trader/views/Transaction.tsx:386 +#: src/SiteAdaptor/trader/views/Transaction.tsx:403 msgid "Failed" msgstr "" +#: src/SiteAdaptor/trader/views/Transaction.tsx:290 +msgid "Failed to bridge" +msgstr "" + #: src/SiteAdaptor/trader/hooks/useBridgable.ts:28 msgid "Failed to get quote information" msgstr "" @@ -198,10 +204,10 @@ msgstr "" msgid "Fastest" msgstr "" -#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:377 -#: src/SiteAdaptor/trader/views/Confirm.tsx:387 +#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:398 +#: src/SiteAdaptor/trader/views/Confirm.tsx:390 #: src/SiteAdaptor/trader/views/Trade/index.tsx:244 -#: src/SiteAdaptor/trader/views/Transaction.tsx:393 +#: src/SiteAdaptor/trader/views/Transaction.tsx:410 msgid "From" msgstr "" @@ -217,8 +223,8 @@ msgstr "" msgid "History" msgstr "" -#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:469 -#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:486 +#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:490 +#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:507 msgid "" "In cross-chain transactions, this fee includes the estimated network fee and the cross-chain bridge's network fee which is $0.00 (0 OP_ETH). The network fees are paid to the miners and aren't charged by our platform.\n" "The actual cost may be lower\n" @@ -230,11 +236,11 @@ msgstr "" msgid "Insufficient {symbol} Balance" msgstr "" -#: src/SiteAdaptor/trader/views/Transaction.tsx:623 +#: src/SiteAdaptor/trader/views/Transaction.tsx:640 msgid "Make another Bridge" msgstr "" -#: src/SiteAdaptor/trader/views/Transaction.tsx:622 +#: src/SiteAdaptor/trader/views/Transaction.tsx:639 msgid "Make another Swap" msgstr "" @@ -250,7 +256,7 @@ msgstr "" msgid "Max base fee" msgstr "" -#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:513 +#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:534 msgid "Minimum received" msgstr "" @@ -259,14 +265,14 @@ msgstr "" msgid "Missing dex contract address" msgstr "" -#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:420 -#: src/SiteAdaptor/trader/views/Transaction.tsx:544 -#: src/SiteAdaptor/trader/views/Transaction.tsx:553 +#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:441 +#: src/SiteAdaptor/trader/views/Transaction.tsx:561 +#: src/SiteAdaptor/trader/views/Transaction.tsx:570 msgid "Network" msgstr "" #: src/SiteAdaptor/trader/ExchangeDialog.tsx:69 -#: src/SiteAdaptor/trader/views/Confirm.tsx:445 +#: src/SiteAdaptor/trader/views/Confirm.tsx:448 msgid "Network fee" msgstr "" @@ -287,7 +293,7 @@ msgstr "" msgid "Overall Best" msgstr "" -#: src/SiteAdaptor/trader/views/Confirm.tsx:487 +#: src/SiteAdaptor/trader/views/Confirm.tsx:490 #: src/SiteAdaptor/trader/views/Trade/Quote.tsx:207 msgid "Powered by" msgstr "" @@ -296,8 +302,8 @@ msgstr "" msgid "Priority fee" msgstr "" -#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:536 -#: src/SiteAdaptor/trader/views/Confirm.tsx:511 +#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:557 +#: src/SiteAdaptor/trader/views/Confirm.tsx:514 msgid "Quote expired. Update to receive a new quote." msgstr "" @@ -310,14 +316,14 @@ msgstr "" msgid "Quote Route" msgstr "" -#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:507 -#: src/SiteAdaptor/trader/views/Confirm.tsx:439 +#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:528 +#: src/SiteAdaptor/trader/views/Confirm.tsx:442 #: src/SiteAdaptor/trader/views/Trade/Quote.tsx:128 -#: src/SiteAdaptor/trader/views/Transaction.tsx:581 +#: src/SiteAdaptor/trader/views/Transaction.tsx:598 msgid "Rate" msgstr "" -#: src/SiteAdaptor/trader/views/Confirm.tsx:474 +#: src/SiteAdaptor/trader/views/Confirm.tsx:477 msgid "Select liquidity" msgstr "" @@ -325,12 +331,12 @@ msgstr "" msgid "Select Liquidity" msgstr "" -#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:551 -#: src/SiteAdaptor/trader/views/Confirm.tsx:526 +#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:572 +#: src/SiteAdaptor/trader/views/Confirm.tsx:529 msgid "Sending" msgstr "" -#: src/SiteAdaptor/trader/views/Transaction.tsx:587 +#: src/SiteAdaptor/trader/views/Transaction.tsx:604 msgid "Sending address" msgstr "" @@ -344,12 +350,12 @@ msgid "Slow" msgstr "" #: src/SiteAdaptor/trader/ExchangeDialog.tsx:111 -#: src/SiteAdaptor/trader/views/Confirm.tsx:283 -#: src/SiteAdaptor/trader/views/Confirm.tsx:293 -#: src/SiteAdaptor/trader/views/Confirm.tsx:310 -#: src/SiteAdaptor/trader/views/Confirm.tsx:352 +#: src/SiteAdaptor/trader/views/Confirm.tsx:285 +#: src/SiteAdaptor/trader/views/Confirm.tsx:296 +#: src/SiteAdaptor/trader/views/Confirm.tsx:313 +#: src/SiteAdaptor/trader/views/Confirm.tsx:355 #: src/SiteAdaptor/trader/views/Trade/index.tsx:236 -#: src/SiteAdaptor/trader/views/Transaction.tsx:523 +#: src/SiteAdaptor/trader/views/Transaction.tsx:540 msgid "Swap" msgstr "" @@ -357,11 +363,11 @@ msgstr "" msgid "Swap anyway" msgstr "" -#: src/SiteAdaptor/trader/views/Transaction.tsx:536 +#: src/SiteAdaptor/trader/views/Transaction.tsx:553 msgid "Swap duration" msgstr "" -#: src/SiteAdaptor/trader/views/Transaction.tsx:351 +#: src/SiteAdaptor/trader/views/Transaction.tsx:368 msgid "Swapping" msgstr "" @@ -369,7 +375,7 @@ msgstr "" msgid "Swaps between this token pair are’t supported at the moment. You can try with third-party DApps instead." msgstr "" -#: src/SiteAdaptor/trader/views/Transaction.tsx:370 +#: src/SiteAdaptor/trader/views/Transaction.tsx:387 msgid "The {0} is in progress. You can check its status in History after exiting this page." msgstr "" @@ -381,8 +387,8 @@ msgstr "" #~ msgid "The swap is in progress. You can check its status in History after exiting this page." #~ msgstr "" -#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:440 -#: src/SiteAdaptor/trader/views/Confirm.tsx:448 +#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:461 +#: src/SiteAdaptor/trader/views/Confirm.tsx:451 msgid "This fee is used to pay miners and isn't collected by us. The actual cost may be less than estimated, and the unused fee won't be deducted from your account." msgstr "" @@ -394,13 +400,13 @@ msgstr "" msgid "This swap isn’t supported" msgstr "" -#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:398 -#: src/SiteAdaptor/trader/views/Confirm.tsx:409 -#: src/SiteAdaptor/trader/views/Transaction.tsx:472 +#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:419 +#: src/SiteAdaptor/trader/views/Confirm.tsx:412 +#: src/SiteAdaptor/trader/views/Transaction.tsx:489 msgid "To" msgstr "" -#: src/SiteAdaptor/trader/views/Confirm.tsx:431 +#: src/SiteAdaptor/trader/views/Confirm.tsx:434 #: src/SiteAdaptor/trader/views/Trade/Quote.tsx:120 msgid "Trading mode" msgstr "" @@ -421,29 +427,28 @@ msgstr "" msgid "Transaction history is only stored locally and will be deleted if you clear your browser data." msgstr "" -#: src/SiteAdaptor/trader/views/Transaction.tsx:412 +#: src/SiteAdaptor/trader/views/Transaction.tsx:429 msgid "Transaction in progress. Thank you for your patience." msgstr "" -#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:298 -#: src/SiteAdaptor/trader/views/Confirm.tsx:284 +#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:301 +#: src/SiteAdaptor/trader/views/Confirm.tsx:286 msgid "Transaction rejected" msgstr "" -#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:474 -#: src/SiteAdaptor/trader/views/Confirm.tsx:428 -#~ msgid "Transaction submitted." -#~ msgstr "" +#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:317 +msgid "Transaction submitted." +msgstr "" -#: src/SiteAdaptor/trader/views/Transaction.tsx:521 +#: src/SiteAdaptor/trader/views/Transaction.tsx:538 msgid "Transaction type" msgstr "" -#: src/SiteAdaptor/trader/views/Transaction.tsx:453 +#: src/SiteAdaptor/trader/views/Transaction.tsx:470 msgid "Transferring asset across to the {0} network via the {1}cross-chain bridge" msgstr "" -#: src/SiteAdaptor/trader/views/Transaction.tsx:624 +#: src/SiteAdaptor/trader/views/Transaction.tsx:641 msgid "Try Again" msgstr "" @@ -451,19 +456,19 @@ msgstr "" msgid "Try token from different chains" msgstr "" -#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:547 -#: src/SiteAdaptor/trader/views/Confirm.tsx:522 +#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:568 +#: src/SiteAdaptor/trader/views/Confirm.tsx:525 msgid "Update Quote" msgstr "" -#: src/SiteAdaptor/trader/views/Confirm.tsx:311 +#: src/SiteAdaptor/trader/views/Confirm.tsx:314 msgid "Wait too long for the confirmation." msgstr "" -#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:498 +#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:519 msgid "Wallet" msgstr "" -#: src/SiteAdaptor/trader/views/Transaction.tsx:359 +#: src/SiteAdaptor/trader/views/Transaction.tsx:376 msgid "Your transaction should be done in <0/>" msgstr "" diff --git a/packages/plugins/Trader/src/locale/zh-CN.json b/packages/plugins/Trader/src/locale/zh-CN.json index b5497a78c29e..abc92084a536 100644 --- a/packages/plugins/Trader/src/locale/zh-CN.json +++ b/packages/plugins/Trader/src/locale/zh-CN.json @@ -39,6 +39,7 @@ "kPQQEW": "Enter an Amount", "Citz6F": "Exchange", "7Bj3x9": "Failed", + "QUBIav": "Failed to bridge", "2J5wRx": "Failed to get quote information", "KziH2K": "Fast", "pG7O41": "Fastest", diff --git a/packages/plugins/Trader/src/locale/zh-CN.po b/packages/plugins/Trader/src/locale/zh-CN.po index 3606cd298787..2c9be420c2a4 100644 --- a/packages/plugins/Trader/src/locale/zh-CN.po +++ b/packages/plugins/Trader/src/locale/zh-CN.po @@ -18,15 +18,15 @@ msgstr "" "X-Crowdin-File: /[DimensionDev.Maskbook] develop/packages/plugins/Trader/src/locale/en-US.po\n" "X-Crowdin-File-ID: 1000\n" -#: src/SiteAdaptor/trader/views/Transaction.tsx:298 +#: src/SiteAdaptor/trader/views/Transaction.tsx:306 msgid "{0} {1} bridge completed successfully." msgstr "" -#: src/SiteAdaptor/trader/views/Confirm.tsx:302 +#: src/SiteAdaptor/trader/views/Confirm.tsx:305 msgid "{0} {1} swap completed successfully." msgstr "" -#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:483 +#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:504 msgid "{0} Bridge Network fee" msgstr "" @@ -35,8 +35,8 @@ msgstr "" #~ msgid "{0} fee" #~ msgstr "" -#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:437 -#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:466 +#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:458 +#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:487 msgid "{0} Network fee" msgstr "" @@ -45,8 +45,8 @@ msgstr "" msgid "{0} Pool" msgstr "" -#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:430 -#: src/SiteAdaptor/trader/views/Transaction.tsx:563 +#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:451 +#: src/SiteAdaptor/trader/views/Transaction.tsx:580 msgid "{0} to {1}" msgstr "" @@ -54,8 +54,8 @@ msgstr "" msgid "{0}m" msgstr "" -#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:452 -#: src/SiteAdaptor/trader/views/Confirm.tsx:460 +#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:473 +#: src/SiteAdaptor/trader/views/Confirm.tsx:463 msgid "{gasOptionType, select, slow {Slow} normal {Average} fast {Fast} custom {Custom}}" msgstr "" @@ -75,13 +75,13 @@ msgstr "" #~ msgid "<0>Powered by<1/><2>OKX" #~ msgstr "" -#: src/SiteAdaptor/trader/views/Confirm.tsx:434 +#: src/SiteAdaptor/trader/views/Confirm.tsx:437 #: src/SiteAdaptor/trader/views/Trade/Quote.tsx:123 msgid "Aggregator" msgstr "" -#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:553 -#: src/SiteAdaptor/trader/views/Confirm.tsx:528 +#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:574 +#: src/SiteAdaptor/trader/views/Confirm.tsx:531 msgid "Approving" msgstr "" @@ -94,12 +94,14 @@ msgid "Base fee required: {MIN_BASE_FEE} Gwei" msgstr "" #: src/SiteAdaptor/trader/ExchangeDialog.tsx:112 -#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:297 -#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:345 +#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:300 +#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:307 +#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:366 #: src/SiteAdaptor/trader/views/Trade/index.tsx:237 #: src/SiteAdaptor/trader/views/TradingRoute.tsx:158 #: src/SiteAdaptor/trader/views/Transaction.tsx:289 -#: src/SiteAdaptor/trader/views/Transaction.tsx:523 +#: src/SiteAdaptor/trader/views/Transaction.tsx:297 +#: src/SiteAdaptor/trader/views/Transaction.tsx:540 msgid "Bridge" msgstr "" @@ -115,20 +117,20 @@ msgstr "" #~ msgid "Bridge network fee" #~ msgstr "" -#: src/SiteAdaptor/trader/views/Transaction.tsx:351 +#: src/SiteAdaptor/trader/views/Transaction.tsx:368 msgid "Bridging" msgstr "" -#: src/SiteAdaptor/trader/views/Transaction.tsx:605 +#: src/SiteAdaptor/trader/views/Transaction.tsx:622 msgid "Check on Explorer" msgstr "" -#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:552 -#: src/SiteAdaptor/trader/views/Confirm.tsx:527 +#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:573 +#: src/SiteAdaptor/trader/views/Confirm.tsx:530 msgid "Checking Approve" msgstr "" -#: src/SiteAdaptor/trader/views/Transaction.tsx:380 +#: src/SiteAdaptor/trader/views/Transaction.tsx:397 msgid "Complete" msgstr "" @@ -138,7 +140,7 @@ msgid "Confirm" msgstr "" #: src/SiteAdaptor/trader/ExchangeDialog.tsx:62 -#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:554 +#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:575 msgid "Confirm Bridge" msgstr "" @@ -147,7 +149,7 @@ msgstr "" #~ msgstr "" #: src/SiteAdaptor/trader/ExchangeDialog.tsx:61 -#: src/SiteAdaptor/trader/views/Confirm.tsx:529 +#: src/SiteAdaptor/trader/views/Confirm.tsx:532 msgid "Confirm Swap" msgstr "" @@ -159,12 +161,12 @@ msgstr "" msgid "Custom" msgstr "" -#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:521 -#: src/SiteAdaptor/trader/views/Confirm.tsx:496 +#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:542 +#: src/SiteAdaptor/trader/views/Confirm.tsx:499 msgid "Data" msgstr "" -#: src/SiteAdaptor/trader/views/Transaction.tsx:527 +#: src/SiteAdaptor/trader/views/Transaction.tsx:544 msgid "Date" msgstr "" @@ -182,10 +184,14 @@ msgstr "" msgid "Exchange" msgstr "" -#: src/SiteAdaptor/trader/views/Transaction.tsx:386 +#: src/SiteAdaptor/trader/views/Transaction.tsx:403 msgid "Failed" msgstr "" +#: src/SiteAdaptor/trader/views/Transaction.tsx:290 +msgid "Failed to bridge" +msgstr "" + #: src/SiteAdaptor/trader/hooks/useBridgable.ts:28 msgid "Failed to get quote information" msgstr "" @@ -198,10 +204,10 @@ msgstr "" msgid "Fastest" msgstr "" -#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:377 -#: src/SiteAdaptor/trader/views/Confirm.tsx:387 +#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:398 +#: src/SiteAdaptor/trader/views/Confirm.tsx:390 #: src/SiteAdaptor/trader/views/Trade/index.tsx:244 -#: src/SiteAdaptor/trader/views/Transaction.tsx:393 +#: src/SiteAdaptor/trader/views/Transaction.tsx:410 msgid "From" msgstr "" @@ -217,8 +223,8 @@ msgstr "" msgid "History" msgstr "" -#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:469 -#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:486 +#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:490 +#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:507 msgid "" "In cross-chain transactions, this fee includes the estimated network fee and the cross-chain bridge's network fee which is $0.00 (0 OP_ETH). The network fees are paid to the miners and aren't charged by our platform.\n" "The actual cost may be lower\n" @@ -230,11 +236,11 @@ msgstr "" msgid "Insufficient {symbol} Balance" msgstr "" -#: src/SiteAdaptor/trader/views/Transaction.tsx:623 +#: src/SiteAdaptor/trader/views/Transaction.tsx:640 msgid "Make another Bridge" msgstr "" -#: src/SiteAdaptor/trader/views/Transaction.tsx:622 +#: src/SiteAdaptor/trader/views/Transaction.tsx:639 msgid "Make another Swap" msgstr "" @@ -250,7 +256,7 @@ msgstr "" msgid "Max base fee" msgstr "" -#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:513 +#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:534 msgid "Minimum received" msgstr "" @@ -259,14 +265,14 @@ msgstr "" msgid "Missing dex contract address" msgstr "" -#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:420 -#: src/SiteAdaptor/trader/views/Transaction.tsx:544 -#: src/SiteAdaptor/trader/views/Transaction.tsx:553 +#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:441 +#: src/SiteAdaptor/trader/views/Transaction.tsx:561 +#: src/SiteAdaptor/trader/views/Transaction.tsx:570 msgid "Network" msgstr "" #: src/SiteAdaptor/trader/ExchangeDialog.tsx:69 -#: src/SiteAdaptor/trader/views/Confirm.tsx:445 +#: src/SiteAdaptor/trader/views/Confirm.tsx:448 msgid "Network fee" msgstr "" @@ -287,7 +293,7 @@ msgstr "" msgid "Overall Best" msgstr "" -#: src/SiteAdaptor/trader/views/Confirm.tsx:487 +#: src/SiteAdaptor/trader/views/Confirm.tsx:490 #: src/SiteAdaptor/trader/views/Trade/Quote.tsx:207 msgid "Powered by" msgstr "" @@ -296,8 +302,8 @@ msgstr "" msgid "Priority fee" msgstr "" -#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:536 -#: src/SiteAdaptor/trader/views/Confirm.tsx:511 +#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:557 +#: src/SiteAdaptor/trader/views/Confirm.tsx:514 msgid "Quote expired. Update to receive a new quote." msgstr "" @@ -310,14 +316,14 @@ msgstr "" msgid "Quote Route" msgstr "" -#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:507 -#: src/SiteAdaptor/trader/views/Confirm.tsx:439 +#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:528 +#: src/SiteAdaptor/trader/views/Confirm.tsx:442 #: src/SiteAdaptor/trader/views/Trade/Quote.tsx:128 -#: src/SiteAdaptor/trader/views/Transaction.tsx:581 +#: src/SiteAdaptor/trader/views/Transaction.tsx:598 msgid "Rate" msgstr "" -#: src/SiteAdaptor/trader/views/Confirm.tsx:474 +#: src/SiteAdaptor/trader/views/Confirm.tsx:477 msgid "Select liquidity" msgstr "" @@ -325,12 +331,12 @@ msgstr "" msgid "Select Liquidity" msgstr "" -#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:551 -#: src/SiteAdaptor/trader/views/Confirm.tsx:526 +#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:572 +#: src/SiteAdaptor/trader/views/Confirm.tsx:529 msgid "Sending" msgstr "" -#: src/SiteAdaptor/trader/views/Transaction.tsx:587 +#: src/SiteAdaptor/trader/views/Transaction.tsx:604 msgid "Sending address" msgstr "" @@ -344,12 +350,12 @@ msgid "Slow" msgstr "" #: src/SiteAdaptor/trader/ExchangeDialog.tsx:111 -#: src/SiteAdaptor/trader/views/Confirm.tsx:283 -#: src/SiteAdaptor/trader/views/Confirm.tsx:293 -#: src/SiteAdaptor/trader/views/Confirm.tsx:310 -#: src/SiteAdaptor/trader/views/Confirm.tsx:352 +#: src/SiteAdaptor/trader/views/Confirm.tsx:285 +#: src/SiteAdaptor/trader/views/Confirm.tsx:296 +#: src/SiteAdaptor/trader/views/Confirm.tsx:313 +#: src/SiteAdaptor/trader/views/Confirm.tsx:355 #: src/SiteAdaptor/trader/views/Trade/index.tsx:236 -#: src/SiteAdaptor/trader/views/Transaction.tsx:523 +#: src/SiteAdaptor/trader/views/Transaction.tsx:540 msgid "Swap" msgstr "" @@ -357,11 +363,11 @@ msgstr "" msgid "Swap anyway" msgstr "" -#: src/SiteAdaptor/trader/views/Transaction.tsx:536 +#: src/SiteAdaptor/trader/views/Transaction.tsx:553 msgid "Swap duration" msgstr "" -#: src/SiteAdaptor/trader/views/Transaction.tsx:351 +#: src/SiteAdaptor/trader/views/Transaction.tsx:368 msgid "Swapping" msgstr "" @@ -369,7 +375,7 @@ msgstr "" msgid "Swaps between this token pair are’t supported at the moment. You can try with third-party DApps instead." msgstr "" -#: src/SiteAdaptor/trader/views/Transaction.tsx:370 +#: src/SiteAdaptor/trader/views/Transaction.tsx:387 msgid "The {0} is in progress. You can check its status in History after exiting this page." msgstr "" @@ -381,8 +387,8 @@ msgstr "" #~ msgid "The swap is in progress. You can check its status in History after exiting this page." #~ msgstr "" -#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:440 -#: src/SiteAdaptor/trader/views/Confirm.tsx:448 +#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:461 +#: src/SiteAdaptor/trader/views/Confirm.tsx:451 msgid "This fee is used to pay miners and isn't collected by us. The actual cost may be less than estimated, and the unused fee won't be deducted from your account." msgstr "" @@ -394,13 +400,13 @@ msgstr "" msgid "This swap isn’t supported" msgstr "" -#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:398 -#: src/SiteAdaptor/trader/views/Confirm.tsx:409 -#: src/SiteAdaptor/trader/views/Transaction.tsx:472 +#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:419 +#: src/SiteAdaptor/trader/views/Confirm.tsx:412 +#: src/SiteAdaptor/trader/views/Transaction.tsx:489 msgid "To" msgstr "" -#: src/SiteAdaptor/trader/views/Confirm.tsx:431 +#: src/SiteAdaptor/trader/views/Confirm.tsx:434 #: src/SiteAdaptor/trader/views/Trade/Quote.tsx:120 msgid "Trading mode" msgstr "" @@ -421,29 +427,28 @@ msgstr "" msgid "Transaction history is only stored locally and will be deleted if you clear your browser data." msgstr "" -#: src/SiteAdaptor/trader/views/Transaction.tsx:412 +#: src/SiteAdaptor/trader/views/Transaction.tsx:429 msgid "Transaction in progress. Thank you for your patience." msgstr "" -#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:298 -#: src/SiteAdaptor/trader/views/Confirm.tsx:284 +#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:301 +#: src/SiteAdaptor/trader/views/Confirm.tsx:286 msgid "Transaction rejected" msgstr "" -#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:474 -#: src/SiteAdaptor/trader/views/Confirm.tsx:428 -#~ msgid "Transaction submitted." -#~ msgstr "" +#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:317 +msgid "Transaction submitted." +msgstr "" -#: src/SiteAdaptor/trader/views/Transaction.tsx:521 +#: src/SiteAdaptor/trader/views/Transaction.tsx:538 msgid "Transaction type" msgstr "" -#: src/SiteAdaptor/trader/views/Transaction.tsx:453 +#: src/SiteAdaptor/trader/views/Transaction.tsx:470 msgid "Transferring asset across to the {0} network via the {1}cross-chain bridge" msgstr "" -#: src/SiteAdaptor/trader/views/Transaction.tsx:624 +#: src/SiteAdaptor/trader/views/Transaction.tsx:641 msgid "Try Again" msgstr "" @@ -451,19 +456,19 @@ msgstr "" msgid "Try token from different chains" msgstr "" -#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:547 -#: src/SiteAdaptor/trader/views/Confirm.tsx:522 +#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:568 +#: src/SiteAdaptor/trader/views/Confirm.tsx:525 msgid "Update Quote" msgstr "" -#: src/SiteAdaptor/trader/views/Confirm.tsx:311 +#: src/SiteAdaptor/trader/views/Confirm.tsx:314 msgid "Wait too long for the confirmation." msgstr "" -#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:498 +#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:519 msgid "Wallet" msgstr "" -#: src/SiteAdaptor/trader/views/Transaction.tsx:359 +#: src/SiteAdaptor/trader/views/Transaction.tsx:376 msgid "Your transaction should be done in <0/>" msgstr "" diff --git a/packages/plugins/Trader/src/locale/zh-TW.json b/packages/plugins/Trader/src/locale/zh-TW.json index b5497a78c29e..abc92084a536 100644 --- a/packages/plugins/Trader/src/locale/zh-TW.json +++ b/packages/plugins/Trader/src/locale/zh-TW.json @@ -39,6 +39,7 @@ "kPQQEW": "Enter an Amount", "Citz6F": "Exchange", "7Bj3x9": "Failed", + "QUBIav": "Failed to bridge", "2J5wRx": "Failed to get quote information", "KziH2K": "Fast", "pG7O41": "Fastest", diff --git a/packages/plugins/Trader/src/locale/zh-TW.po b/packages/plugins/Trader/src/locale/zh-TW.po index 5b8f2e252f06..e17f76e348d1 100644 --- a/packages/plugins/Trader/src/locale/zh-TW.po +++ b/packages/plugins/Trader/src/locale/zh-TW.po @@ -18,15 +18,15 @@ msgstr "" "X-Crowdin-File: /[DimensionDev.Maskbook] develop/packages/plugins/Trader/src/locale/en-US.po\n" "X-Crowdin-File-ID: 1000\n" -#: src/SiteAdaptor/trader/views/Transaction.tsx:298 +#: src/SiteAdaptor/trader/views/Transaction.tsx:306 msgid "{0} {1} bridge completed successfully." msgstr "" -#: src/SiteAdaptor/trader/views/Confirm.tsx:302 +#: src/SiteAdaptor/trader/views/Confirm.tsx:305 msgid "{0} {1} swap completed successfully." msgstr "" -#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:483 +#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:504 msgid "{0} Bridge Network fee" msgstr "" @@ -35,8 +35,8 @@ msgstr "" #~ msgid "{0} fee" #~ msgstr "" -#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:437 -#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:466 +#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:458 +#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:487 msgid "{0} Network fee" msgstr "" @@ -45,8 +45,8 @@ msgstr "" msgid "{0} Pool" msgstr "" -#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:430 -#: src/SiteAdaptor/trader/views/Transaction.tsx:563 +#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:451 +#: src/SiteAdaptor/trader/views/Transaction.tsx:580 msgid "{0} to {1}" msgstr "" @@ -54,8 +54,8 @@ msgstr "" msgid "{0}m" msgstr "" -#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:452 -#: src/SiteAdaptor/trader/views/Confirm.tsx:460 +#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:473 +#: src/SiteAdaptor/trader/views/Confirm.tsx:463 msgid "{gasOptionType, select, slow {Slow} normal {Average} fast {Fast} custom {Custom}}" msgstr "" @@ -75,13 +75,13 @@ msgstr "" #~ msgid "<0>Powered by<1/><2>OKX" #~ msgstr "" -#: src/SiteAdaptor/trader/views/Confirm.tsx:434 +#: src/SiteAdaptor/trader/views/Confirm.tsx:437 #: src/SiteAdaptor/trader/views/Trade/Quote.tsx:123 msgid "Aggregator" msgstr "" -#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:553 -#: src/SiteAdaptor/trader/views/Confirm.tsx:528 +#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:574 +#: src/SiteAdaptor/trader/views/Confirm.tsx:531 msgid "Approving" msgstr "" @@ -94,12 +94,14 @@ msgid "Base fee required: {MIN_BASE_FEE} Gwei" msgstr "" #: src/SiteAdaptor/trader/ExchangeDialog.tsx:112 -#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:297 -#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:345 +#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:300 +#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:307 +#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:366 #: src/SiteAdaptor/trader/views/Trade/index.tsx:237 #: src/SiteAdaptor/trader/views/TradingRoute.tsx:158 #: src/SiteAdaptor/trader/views/Transaction.tsx:289 -#: src/SiteAdaptor/trader/views/Transaction.tsx:523 +#: src/SiteAdaptor/trader/views/Transaction.tsx:297 +#: src/SiteAdaptor/trader/views/Transaction.tsx:540 msgid "Bridge" msgstr "" @@ -115,20 +117,20 @@ msgstr "" #~ msgid "Bridge network fee" #~ msgstr "" -#: src/SiteAdaptor/trader/views/Transaction.tsx:351 +#: src/SiteAdaptor/trader/views/Transaction.tsx:368 msgid "Bridging" msgstr "" -#: src/SiteAdaptor/trader/views/Transaction.tsx:605 +#: src/SiteAdaptor/trader/views/Transaction.tsx:622 msgid "Check on Explorer" msgstr "" -#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:552 -#: src/SiteAdaptor/trader/views/Confirm.tsx:527 +#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:573 +#: src/SiteAdaptor/trader/views/Confirm.tsx:530 msgid "Checking Approve" msgstr "" -#: src/SiteAdaptor/trader/views/Transaction.tsx:380 +#: src/SiteAdaptor/trader/views/Transaction.tsx:397 msgid "Complete" msgstr "" @@ -138,7 +140,7 @@ msgid "Confirm" msgstr "" #: src/SiteAdaptor/trader/ExchangeDialog.tsx:62 -#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:554 +#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:575 msgid "Confirm Bridge" msgstr "" @@ -147,7 +149,7 @@ msgstr "" #~ msgstr "" #: src/SiteAdaptor/trader/ExchangeDialog.tsx:61 -#: src/SiteAdaptor/trader/views/Confirm.tsx:529 +#: src/SiteAdaptor/trader/views/Confirm.tsx:532 msgid "Confirm Swap" msgstr "" @@ -159,12 +161,12 @@ msgstr "" msgid "Custom" msgstr "" -#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:521 -#: src/SiteAdaptor/trader/views/Confirm.tsx:496 +#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:542 +#: src/SiteAdaptor/trader/views/Confirm.tsx:499 msgid "Data" msgstr "" -#: src/SiteAdaptor/trader/views/Transaction.tsx:527 +#: src/SiteAdaptor/trader/views/Transaction.tsx:544 msgid "Date" msgstr "" @@ -182,10 +184,14 @@ msgstr "" msgid "Exchange" msgstr "" -#: src/SiteAdaptor/trader/views/Transaction.tsx:386 +#: src/SiteAdaptor/trader/views/Transaction.tsx:403 msgid "Failed" msgstr "" +#: src/SiteAdaptor/trader/views/Transaction.tsx:290 +msgid "Failed to bridge" +msgstr "" + #: src/SiteAdaptor/trader/hooks/useBridgable.ts:28 msgid "Failed to get quote information" msgstr "" @@ -198,10 +204,10 @@ msgstr "" msgid "Fastest" msgstr "" -#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:377 -#: src/SiteAdaptor/trader/views/Confirm.tsx:387 +#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:398 +#: src/SiteAdaptor/trader/views/Confirm.tsx:390 #: src/SiteAdaptor/trader/views/Trade/index.tsx:244 -#: src/SiteAdaptor/trader/views/Transaction.tsx:393 +#: src/SiteAdaptor/trader/views/Transaction.tsx:410 msgid "From" msgstr "" @@ -217,8 +223,8 @@ msgstr "" msgid "History" msgstr "" -#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:469 -#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:486 +#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:490 +#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:507 msgid "" "In cross-chain transactions, this fee includes the estimated network fee and the cross-chain bridge's network fee which is $0.00 (0 OP_ETH). The network fees are paid to the miners and aren't charged by our platform.\n" "The actual cost may be lower\n" @@ -230,11 +236,11 @@ msgstr "" msgid "Insufficient {symbol} Balance" msgstr "" -#: src/SiteAdaptor/trader/views/Transaction.tsx:623 +#: src/SiteAdaptor/trader/views/Transaction.tsx:640 msgid "Make another Bridge" msgstr "" -#: src/SiteAdaptor/trader/views/Transaction.tsx:622 +#: src/SiteAdaptor/trader/views/Transaction.tsx:639 msgid "Make another Swap" msgstr "" @@ -250,7 +256,7 @@ msgstr "" msgid "Max base fee" msgstr "" -#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:513 +#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:534 msgid "Minimum received" msgstr "" @@ -259,14 +265,14 @@ msgstr "" msgid "Missing dex contract address" msgstr "" -#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:420 -#: src/SiteAdaptor/trader/views/Transaction.tsx:544 -#: src/SiteAdaptor/trader/views/Transaction.tsx:553 +#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:441 +#: src/SiteAdaptor/trader/views/Transaction.tsx:561 +#: src/SiteAdaptor/trader/views/Transaction.tsx:570 msgid "Network" msgstr "" #: src/SiteAdaptor/trader/ExchangeDialog.tsx:69 -#: src/SiteAdaptor/trader/views/Confirm.tsx:445 +#: src/SiteAdaptor/trader/views/Confirm.tsx:448 msgid "Network fee" msgstr "" @@ -287,7 +293,7 @@ msgstr "" msgid "Overall Best" msgstr "" -#: src/SiteAdaptor/trader/views/Confirm.tsx:487 +#: src/SiteAdaptor/trader/views/Confirm.tsx:490 #: src/SiteAdaptor/trader/views/Trade/Quote.tsx:207 msgid "Powered by" msgstr "" @@ -296,8 +302,8 @@ msgstr "" msgid "Priority fee" msgstr "" -#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:536 -#: src/SiteAdaptor/trader/views/Confirm.tsx:511 +#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:557 +#: src/SiteAdaptor/trader/views/Confirm.tsx:514 msgid "Quote expired. Update to receive a new quote." msgstr "" @@ -310,14 +316,14 @@ msgstr "" msgid "Quote Route" msgstr "" -#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:507 -#: src/SiteAdaptor/trader/views/Confirm.tsx:439 +#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:528 +#: src/SiteAdaptor/trader/views/Confirm.tsx:442 #: src/SiteAdaptor/trader/views/Trade/Quote.tsx:128 -#: src/SiteAdaptor/trader/views/Transaction.tsx:581 +#: src/SiteAdaptor/trader/views/Transaction.tsx:598 msgid "Rate" msgstr "" -#: src/SiteAdaptor/trader/views/Confirm.tsx:474 +#: src/SiteAdaptor/trader/views/Confirm.tsx:477 msgid "Select liquidity" msgstr "" @@ -325,12 +331,12 @@ msgstr "" msgid "Select Liquidity" msgstr "" -#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:551 -#: src/SiteAdaptor/trader/views/Confirm.tsx:526 +#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:572 +#: src/SiteAdaptor/trader/views/Confirm.tsx:529 msgid "Sending" msgstr "" -#: src/SiteAdaptor/trader/views/Transaction.tsx:587 +#: src/SiteAdaptor/trader/views/Transaction.tsx:604 msgid "Sending address" msgstr "" @@ -344,12 +350,12 @@ msgid "Slow" msgstr "" #: src/SiteAdaptor/trader/ExchangeDialog.tsx:111 -#: src/SiteAdaptor/trader/views/Confirm.tsx:283 -#: src/SiteAdaptor/trader/views/Confirm.tsx:293 -#: src/SiteAdaptor/trader/views/Confirm.tsx:310 -#: src/SiteAdaptor/trader/views/Confirm.tsx:352 +#: src/SiteAdaptor/trader/views/Confirm.tsx:285 +#: src/SiteAdaptor/trader/views/Confirm.tsx:296 +#: src/SiteAdaptor/trader/views/Confirm.tsx:313 +#: src/SiteAdaptor/trader/views/Confirm.tsx:355 #: src/SiteAdaptor/trader/views/Trade/index.tsx:236 -#: src/SiteAdaptor/trader/views/Transaction.tsx:523 +#: src/SiteAdaptor/trader/views/Transaction.tsx:540 msgid "Swap" msgstr "" @@ -357,11 +363,11 @@ msgstr "" msgid "Swap anyway" msgstr "" -#: src/SiteAdaptor/trader/views/Transaction.tsx:536 +#: src/SiteAdaptor/trader/views/Transaction.tsx:553 msgid "Swap duration" msgstr "" -#: src/SiteAdaptor/trader/views/Transaction.tsx:351 +#: src/SiteAdaptor/trader/views/Transaction.tsx:368 msgid "Swapping" msgstr "" @@ -369,7 +375,7 @@ msgstr "" msgid "Swaps between this token pair are’t supported at the moment. You can try with third-party DApps instead." msgstr "" -#: src/SiteAdaptor/trader/views/Transaction.tsx:370 +#: src/SiteAdaptor/trader/views/Transaction.tsx:387 msgid "The {0} is in progress. You can check its status in History after exiting this page." msgstr "" @@ -381,8 +387,8 @@ msgstr "" #~ msgid "The swap is in progress. You can check its status in History after exiting this page." #~ msgstr "" -#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:440 -#: src/SiteAdaptor/trader/views/Confirm.tsx:448 +#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:461 +#: src/SiteAdaptor/trader/views/Confirm.tsx:451 msgid "This fee is used to pay miners and isn't collected by us. The actual cost may be less than estimated, and the unused fee won't be deducted from your account." msgstr "" @@ -394,13 +400,13 @@ msgstr "" msgid "This swap isn’t supported" msgstr "" -#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:398 -#: src/SiteAdaptor/trader/views/Confirm.tsx:409 -#: src/SiteAdaptor/trader/views/Transaction.tsx:472 +#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:419 +#: src/SiteAdaptor/trader/views/Confirm.tsx:412 +#: src/SiteAdaptor/trader/views/Transaction.tsx:489 msgid "To" msgstr "" -#: src/SiteAdaptor/trader/views/Confirm.tsx:431 +#: src/SiteAdaptor/trader/views/Confirm.tsx:434 #: src/SiteAdaptor/trader/views/Trade/Quote.tsx:120 msgid "Trading mode" msgstr "" @@ -421,29 +427,28 @@ msgstr "" msgid "Transaction history is only stored locally and will be deleted if you clear your browser data." msgstr "" -#: src/SiteAdaptor/trader/views/Transaction.tsx:412 +#: src/SiteAdaptor/trader/views/Transaction.tsx:429 msgid "Transaction in progress. Thank you for your patience." msgstr "" -#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:298 -#: src/SiteAdaptor/trader/views/Confirm.tsx:284 +#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:301 +#: src/SiteAdaptor/trader/views/Confirm.tsx:286 msgid "Transaction rejected" msgstr "" -#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:474 -#: src/SiteAdaptor/trader/views/Confirm.tsx:428 -#~ msgid "Transaction submitted." -#~ msgstr "" +#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:317 +msgid "Transaction submitted." +msgstr "" -#: src/SiteAdaptor/trader/views/Transaction.tsx:521 +#: src/SiteAdaptor/trader/views/Transaction.tsx:538 msgid "Transaction type" msgstr "" -#: src/SiteAdaptor/trader/views/Transaction.tsx:453 +#: src/SiteAdaptor/trader/views/Transaction.tsx:470 msgid "Transferring asset across to the {0} network via the {1}cross-chain bridge" msgstr "" -#: src/SiteAdaptor/trader/views/Transaction.tsx:624 +#: src/SiteAdaptor/trader/views/Transaction.tsx:641 msgid "Try Again" msgstr "" @@ -451,19 +456,19 @@ msgstr "" msgid "Try token from different chains" msgstr "" -#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:547 -#: src/SiteAdaptor/trader/views/Confirm.tsx:522 +#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:568 +#: src/SiteAdaptor/trader/views/Confirm.tsx:525 msgid "Update Quote" msgstr "" -#: src/SiteAdaptor/trader/views/Confirm.tsx:311 +#: src/SiteAdaptor/trader/views/Confirm.tsx:314 msgid "Wait too long for the confirmation." msgstr "" -#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:498 +#: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:519 msgid "Wallet" msgstr "" -#: src/SiteAdaptor/trader/views/Transaction.tsx:359 +#: src/SiteAdaptor/trader/views/Transaction.tsx:376 msgid "Your transaction should be done in <0/>" msgstr "" diff --git a/packages/shared/src/hooks/useLineChart/index.ts b/packages/shared/src/hooks/useLineChart/index.ts index 34da6e8a9b85..aa4cba55289f 100644 --- a/packages/shared/src/hooks/useLineChart/index.ts +++ b/packages/shared/src/hooks/useLineChart/index.ts @@ -67,7 +67,7 @@ export function useLineChart( y: (y(max) ?? 0) - 16, } - const minFixedPosition = fixOverPosition(contentWidth, contentHeight, minPosition.x, minPosition.y, 0) + const minFixedPosition = fixOverPosition(contentWidth, contentHeight, minPosition.x, minPosition.y, 0, 10) const maxFixedPosition = fixOverPosition(contentWidth, contentHeight, maxPosition.x, maxPosition.y, 0) const minTextSelection = graph @@ -81,7 +81,7 @@ export function useLineChart( const boundedMinPosition = bound({ containerWidth: contentWidth, - containerHeight: contentHeight, + containerHeight: height, targetWidth: minTextRect?.width ?? 0, targetHeight: minTextRect?.height ?? 0, ...minFixedPosition,