From de9354299714f8dd755b6ce5e0cad5d36144b71e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rui=20Sim=C3=A3o?= Date: Tue, 28 Jan 2025 15:46:44 +0000 Subject: [PATCH] fix: code review --- .../components/BridgeForm/BobBridgeForm.tsx | 11 +- .../component/ConnectWallet/ConnectWallet.tsx | 83 ----- apps/evm/src/locales/en.po | 187 ++++++----- apps/evm/src/locales/zh.po | 294 +++++++----------- pnpm-lock.yaml | 46 ++- 5 files changed, 270 insertions(+), 351 deletions(-) delete mode 100644 apps/evm/src/connect-ui/component/ConnectWallet/ConnectWallet.tsx diff --git a/apps/evm/src/app/[lang]/(bridge)/bridge/components/BridgeForm/BobBridgeForm.tsx b/apps/evm/src/app/[lang]/(bridge)/bridge/components/BridgeForm/BobBridgeForm.tsx index 3eec8452..374f6d5e 100644 --- a/apps/evm/src/app/[lang]/(bridge)/bridge/components/BridgeForm/BobBridgeForm.tsx +++ b/apps/evm/src/app/[lang]/(bridge)/bridge/components/BridgeForm/BobBridgeForm.tsx @@ -10,7 +10,7 @@ import { useLingui } from '@lingui/react'; import { mergeProps } from '@react-aria/utils'; import { useMutation } from '@tanstack/react-query'; import Big from 'big.js'; -import { useEffect, useMemo } from 'react'; +import { useEffect, useMemo, useState } from 'react'; import { useDebounceValue } from 'usehooks-ts'; import { Address } from 'viem'; import { useAccount, usePublicClient } from 'wagmi'; @@ -98,6 +98,7 @@ const BobBridgeForm = ({ const initialToken = useMemo(() => Ether.onChain(bridgeChainId), [bridgeChainId]); const symbol = symbolProp || initialToken.symbol; + const [prevSymbol, setPrevSymbol] = useState(symbol); const [amount, setAmount] = useDebounceValue('', 300); @@ -425,10 +426,10 @@ const BobBridgeForm = ({ // eslint-disable-next-line react-hooks/exhaustive-deps }, [direction]); - useEffect(() => { - form.resetForm({ values: { ...initialValues, [BRIDGE_ASSET]: symbol } }); - // eslint-disable-next-line react-hooks/exhaustive-deps - }, [symbol]); + if (symbol !== prevSymbol) { + setPrevSymbol(symbol); + form.setFieldValue(BRIDGE_ASSET, symbol, true); + } const handleChangeSymbol = (currency: Currency) => { onChangeSymbol?.(currency.symbol as string); diff --git a/apps/evm/src/connect-ui/component/ConnectWallet/ConnectWallet.tsx b/apps/evm/src/connect-ui/component/ConnectWallet/ConnectWallet.tsx deleted file mode 100644 index 6303e955..00000000 --- a/apps/evm/src/connect-ui/component/ConnectWallet/ConnectWallet.tsx +++ /dev/null @@ -1,83 +0,0 @@ -'use client'; - -import { SatsConnector, useAccount as useSatsAccount } from '@gobob/sats-wagmi'; -import { Avatar, Button, ButtonProps, Flex, Span } from '@gobob/ui'; -import { Trans } from '@lingui/macro'; -import { chain } from '@react-aria/utils'; -import { Connector, useAccount, useConnect } from 'wagmi'; -import { Address } from 'viem'; - -import { useConnectModal } from '../../providers'; -import { ConnectType } from '../../types'; -import { EvmAddressLabel } from '../EvmAddressLabel'; -import { WalletIcon } from '../WalletIcon'; - -import { StyledWallets } from './ConnectWallet.style'; - -const Label = ({ - address, - isPending, - btcConnector, - evmConnector, - connectType -}: { - address?: Address; - isPending?: boolean; - evmConnector?: Connector; - btcConnector?: SatsConnector; - connectType: ConnectType; -}) => { - if (!evmConnector && !btcConnector) return Connect Wallet; - - if (isPending) return Authorize Wallet; - - if (connectType === 'evm' && address) { - return ; - } - - return ( - - - {evmConnector && - (evmConnector.icon ? ( - - ) : ( - - ))} - {btcConnector && - (btcConnector.icon ? ( - - ) : ( - - ))} - - - Wallet - - - ); -}; - -type ConnectWalletProps = ButtonProps; - -const ConnectWallet = ({ onPress, variant = 'outline', ...props }: ConnectWalletProps): JSX.Element => { - const { isPending } = useConnect(); - const { connector: evmConnector, address } = useAccount(); - const { connector: btcConnector } = useSatsAccount(); - const { open, type: connectType } = useConnectModal(); - - return ( - - ); -}; - -export { ConnectWallet }; -export type { ConnectWalletProps }; diff --git a/apps/evm/src/locales/en.po b/apps/evm/src/locales/en.po index 6313e235..b709747f 100644 --- a/apps/evm/src/locales/en.po +++ b/apps/evm/src/locales/en.po @@ -78,7 +78,7 @@ msgstr "<0>Stake your BTC with 1-click and receive BTC LSTs on BOB." msgid "2 hours" msgstr "2 hours" -#: src/app/[lang]/(bridge)/bridge/components/BridgeForm/BridgeForm.tsx:228 +#: src/app/[lang]/(bridge)/bridge/components/BridgeForm/BridgeForm.tsx:229 msgid "3rd Party" msgstr "3rd Party" @@ -100,7 +100,7 @@ msgstr "About" msgid "About Babylon Campaign" msgstr "About Babylon Campaign" -#: src/app/[lang]/(bridge)/bridge/Bridge.tsx:199 +#: src/app/[lang]/(bridge)/bridge/components/ActivityButton/ActivityButton.tsx:75 msgid "Action needed" msgstr "Action needed" @@ -109,14 +109,14 @@ msgstr "Action needed" msgid "Active Superchain users who have received any of the five OP Airdrops qualify for an exclusive 50% bonus on all Spice harvested between 9 December 2024 and 12 January 2025. The bonus will be applied at the end of the campaign." msgstr "Active Superchain users who have received any of the five OP Airdrops qualify for an exclusive 50% bonus on all Spice harvested between 9 December 2024 and 12 January 2025. The bonus will be applied at the end of the campaign." -#: src/app/[lang]/(bridge)/bridge/Bridge.tsx:204 -#: src/app/[lang]/(bridge)/stake/components/StrategiesTable/StrategiesTable.tsx:278 -#: src/components/Profile/Profile.tsx:151 -#: src/components/Profile/Profile.tsx:155 +#: src/app/[lang]/(bridge)/bridge/components/ActivityButton/ActivityButton.tsx:51 +#: src/app/[lang]/(bridge)/bridge/components/ActivityButton/ActivityButton.tsx:80 +#: src/app/[lang]/(bridge)/stake/components/ActivityButton/ActivityButton.tsx:46 +#: src/components/Profile/Profile.tsx:146 msgid "Activity" msgstr "Activity" -#: src/components/Profile/ProfileTokenListItem.tsx:153 +#: src/components/Profile/ProfileTokenListItem.tsx:157 msgid "Add to {0}" msgstr "Add to {0}" @@ -153,9 +153,9 @@ msgstr "All Strategies" msgid "Already harvesting?" msgstr "Already harvesting?" -#: src/app/[lang]/(bridge)/bridge/components/BridgeForm/BobBridgeForm.tsx:474 +#: src/app/[lang]/(bridge)/bridge/components/BridgeForm/BobBridgeForm.tsx:482 #: src/app/[lang]/(bridge)/components/BtcTokenInput/BtcTokenInput.tsx:38 -#: src/app/[lang]/(bridge)/stake/components/StrategiesTable/StrategiesTable.tsx:251 +#: src/app/[lang]/(bridge)/stake/components/StrategiesTable/StrategiesTable.tsx:229 msgid "Amount" msgstr "Amount" @@ -167,9 +167,13 @@ msgstr "Amount" #~ msgid "An exclusive quest campaign." #~ msgstr "An exclusive quest campaign." +#: src/connect-ui/component/ConnectModal/ConnectModal.tsx:225 +msgid "and" +msgstr "and" + #: src/connect-ui/component/ConnectModal/ConnectModal.tsx:271 -msgid "and that you have read and understood our" -msgstr "and that you have read and understood our" +#~ msgid "and that you have read and understood our" +#~ msgstr "and that you have read and understood our" #: src/components/ProfileActivity/ProfileActivityFilters.tsx:20 msgid "Any Status" @@ -184,7 +188,7 @@ msgstr "Any Transaction" msgid "Apply" msgstr "Apply" -#: src/app/[lang]/(bridge)/bridge/components/BridgeForm/BobBridgeForm.tsx:458 +#: src/app/[lang]/(bridge)/bridge/components/BridgeForm/BobBridgeForm.tsx:466 msgid "Approve" msgstr "Approve" @@ -215,10 +219,10 @@ msgid "Audited by" msgstr "Audited by" #: src/connect-ui/component/ConnectWallet/ConnectWallet.tsx:32 -msgid "Authorize Wallet" -msgstr "Authorize Wallet" +#~ msgid "Authorize Wallet" +#~ msgstr "Authorize Wallet" -#: src/app/[lang]/(bridge)/components/BannerCarousel/BabylonBanner.tsx:32 +#: src/app/[lang]/(bridge)/components/BannerCarousel/BabylonBanner.tsx:35 #: src/app/[lang]/fusion/Fusion.tsx:209 msgid "Babylon campaign" msgstr "Babylon campaign" @@ -259,7 +263,7 @@ msgstr "Below is the Spice you've harvested from apps. Keep participating to inc msgid "BOB" msgstr "BOB" -#: src/app/[lang]/(bridge)/bridge/components/BridgeForm/BridgeForm.tsx:225 +#: src/app/[lang]/(bridge)/bridge/components/BridgeForm/BridgeForm.tsx:226 msgid "BOB Bridge" msgstr "BOB Bridge" @@ -314,7 +318,7 @@ msgstr "Book a call with the founders" msgid "Bridge" msgstr "Bridge" -#: src/app/[lang]/(bridge)/bridge/components/BridgeForm/BobBridgeForm.tsx:459 +#: src/app/[lang]/(bridge)/bridge/components/BridgeForm/BobBridgeForm.tsx:467 #: src/app/[lang]/(bridge)/bridge/components/BridgeForm/BtcBridgeForm.tsx:144 msgid "Bridge Asset" msgstr "Bridge Asset" @@ -328,19 +332,19 @@ msgstr "Bridge Assets" msgid "Bridge BTC LSTs to BOB" msgstr "Bridge BTC LSTs to BOB" -#: src/app/[lang]/(bridge)/bridge/components/BridgeForm/BobBridgeForm.tsx:454 +#: src/app/[lang]/(bridge)/bridge/components/BridgeForm/BobBridgeForm.tsx:462 msgid "Bridge Disabled" msgstr "Bridge Disabled" -#: src/app/[lang]/(bridge)/bridge/components/BridgeForm/BridgeForm.tsx:218 +#: src/app/[lang]/(bridge)/bridge/components/BridgeForm/BridgeForm.tsx:219 msgid "bridge network" msgstr "bridge network" -#: src/components/Profile/ProfileTokenListItem.tsx:163 +#: src/components/Profile/ProfileTokenListItem.tsx:165 msgid "Bridge to {0}" msgstr "Bridge to {0}" -#: src/components/Profile/ProfileTokenListItem.tsx:163 +#: src/components/Profile/ProfileTokenListItem.tsx:165 msgid "Bridge to {otherChainName}" msgstr "Bridge to {otherChainName}" @@ -376,9 +380,17 @@ msgstr "BTC LST Lending" #~ msgid "BTC Strategies" #~ msgstr "BTC Strategies" +#: src/components/Profile/Profile.tsx:116 +msgid "Buy" +msgstr "Buy" + #: src/connect-ui/component/ConnectModal/ConnectModal.tsx:263 -msgid "By clicking ‘Connect’ you acknowledge and agree to the" -msgstr "By clicking ‘Connect’ you acknowledge and agree to the" +#~ msgid "By clicking ‘Connect’ you acknowledge and agree to the" +#~ msgstr "By clicking ‘Connect’ you acknowledge and agree to the" + +#: src/connect-ui/component/ConnectModal/ConnectModal.tsx:221 +msgid "By connecting your wallet, you confirm that you've read and agree to our" +msgstr "By connecting your wallet, you confirm that you've read and agree to our" #: src/app/[lang]/wallet/components/ReceiveTokenModal/ReceiveTokenModal.tsx:79 #: src/app/[lang]/wallet/components/SendTokenModal/SendTokenModal.tsx:255 @@ -397,7 +409,7 @@ msgstr "By clicking ‘Connect’ you acknowledge and agree to the" #~ msgid "Category" #~ msgstr "Category" -#: src/app/[lang]/(bridge)/bridge/components/BridgeForm/BobBridgeForm.tsx:456 +#: src/app/[lang]/(bridge)/bridge/components/BridgeForm/BobBridgeForm.tsx:464 msgid "Checking Allowance" msgstr "Checking Allowance" @@ -422,7 +434,7 @@ msgstr "Claim your red envelope to win Spice and celebrate the Lunar New Year wi msgid "Clear" msgstr "Clear" -#: src/components/ProfileActivity/ProfileActivity.tsx:182 +#: src/components/ProfileActivity/ProfileActivity.tsx:196 msgid "Clear Filters" msgstr "Clear Filters" @@ -494,23 +506,31 @@ msgstr "Connect BTC Wallet" msgid "Connect BTC wallet to access fee rate settings." msgstr "Connect BTC wallet to access fee rate settings." -#: src/connect-ui/component/ConnectModal/ConnectModal.tsx:141 +#: src/components/Profile/ProfileEvmWallet.tsx:62 +msgid "Connect EVM Wallet" +msgstr "Connect EVM Wallet" + +#: src/connect-ui/component/ConnectModal/ConnectModal.tsx:100 msgid "Connect request is already pending" msgstr "Connect request is already pending" -#: src/connect-ui/component/AuthButton/AuthButton.tsx:63 -#: src/connect-ui/component/ConnectModal/ConnectModal.tsx:225 -#: src/connect-ui/component/ConnectWallet/ConnectWallet.tsx:30 +#: src/components/ConnectButton/ConnectButton.tsx:122 +#: src/connect-ui/component/AuthButton/AuthButton.tsx:62 +#: src/connect-ui/component/ConnectModal/ConnectModal.tsx:177 msgid "Connect Wallet" msgstr "Connect Wallet" #: src/connect-ui/component/ConnectModal/ConnectModal.tsx:307 -msgid "Connect your Bitcoin Wallet (Optional)" -msgstr "Connect your Bitcoin Wallet (Optional)" +#~ msgid "Connect your Bitcoin Wallet (Optional)" +#~ msgstr "Connect your Bitcoin Wallet (Optional)" #: src/connect-ui/component/ConnectModal/ConnectModal.tsx:292 -msgid "Connect your EVM Wallet (Mandatory)" -msgstr "Connect your EVM Wallet (Mandatory)" +#~ msgid "Connect your EVM Wallet (Mandatory)" +#~ msgstr "Connect your EVM Wallet (Mandatory)" + +#: src/components/ProfileActivity/ProfileActivity.tsx:181 +msgid "Connect your EVM wallet to see your transactions" +msgstr "Connect your EVM wallet to see your transactions" #: src/connect-ui/component/ConnectModal/ConnectedWalletSection.tsx:37 #~ msgid "Connected with <0>{wallet}" @@ -569,7 +589,7 @@ msgstr "Currently, there is no available liquidity to onramp BTC into {assetName msgid "Deploy high priority assets into high priority DeFi protocols to maximize your Spice harvest." msgstr "Deploy high priority assets into high priority DeFi protocols to maximize your Spice harvest." -#: src/app/[lang]/(bridge)/bridge/Bridge.tsx:216 +#: src/app/[lang]/(bridge)/bridge/Bridge.tsx:151 msgid "Deposit" msgstr "Deposit" @@ -668,7 +688,7 @@ msgstr "enable ETH top-up for transaction fees on BOB network" #~ msgid "Enter Address" #~ msgstr "Enter Address" -#: src/app/[lang]/(bridge)/bridge/components/BridgeForm/BobBridgeForm.tsx:485 +#: src/app/[lang]/(bridge)/bridge/components/BridgeForm/BobBridgeForm.tsx:493 #: src/app/[lang]/(bridge)/bridge/components/BridgeForm/BtcBridgeForm.tsx:132 #: src/app/[lang]/(bridge)/stake/components/StrategyForm/StrategyForm.tsx:131 msgid "Enter destination address" @@ -698,8 +718,12 @@ msgstr "Estimated within the next block" msgid "Exclusive Spice Bonus For Superchain Users" msgstr "Exclusive Spice Bonus For Superchain Users" +#: src/components/ProfileActivity/ProfileActivityFilters.tsx:24 +msgid "Failed" +msgstr "Failed" + +#: src/connect-ui/component/ConnectModal/ConnectModal.tsx:103 #: src/connect-ui/component/ConnectModal/ConnectModal.tsx:144 -#: src/connect-ui/component/ConnectModal/ConnectModal.tsx:185 msgid "Failed to connect to {0}" msgstr "Failed to connect to {0}" @@ -813,14 +837,14 @@ msgstr "Get ETH for transaction fees on BOB" #: src/connect-ui/component/ConnectModal/ConnectModal.tsx:200 #: src/connect-ui/component/ConnectModal/ConnectModal.tsx:214 -msgid "go back" -msgstr "go back" +#~ msgid "go back" +#~ msgstr "go back" #: src/app/[lang]/404/NotFound.tsx:30 msgid "Go Back" msgstr "Go Back" -#: src/components/Profile/ProfileTokenListItem.tsx:140 +#: src/components/Profile/ProfileTokenListItem.tsx:144 msgid "Go to Explorer" msgstr "Go to Explorer" @@ -1107,7 +1131,7 @@ msgstr "navigate to Common Prefix audit" msgid "navigate to discord" msgstr "navigate to discord" -#: src/app/[lang]/(bridge)/components/BannerCarousel/BannerCarousel.tsx:75 +#: src/app/[lang]/(bridge)/components/BannerCarousel/BannerCarousel.tsx:76 msgid "navigate to ecosystem section in fusion page" msgstr "navigate to ecosystem section in fusion page" @@ -1180,10 +1204,10 @@ msgid "No new goal at the moment. Stay tuned for updates!" msgstr "No new goal at the moment. Stay tuned for updates!" #: src/components/ProfileActivity/ProfileActivity.tsx:174 -msgid "No operations found" -msgstr "No operations found" +#~ msgid "No operations found" +#~ msgstr "No operations found" -#: src/app/[lang]/(bridge)/stake/components/StrategiesTable/StrategiesTable.tsx:330 +#: src/app/[lang]/(bridge)/stake/components/StrategiesTable/StrategiesTable.tsx:304 msgid "No strategies to display" msgstr "No strategies to display" @@ -1191,6 +1215,10 @@ msgstr "No strategies to display" #~ msgid "No Thanks" #~ msgstr "No Thanks" +#: src/components/ProfileActivity/ProfileActivity.tsx:177 +msgid "No transactions found" +msgstr "No transactions found" + #: src/app/[lang]/fusion/components/LotterySections/LotteryModal/LotteryModal.tsx:50 #~ msgid "Not enough spice" #~ msgstr "Not enough spice" @@ -1216,8 +1244,8 @@ msgstr "Not your lucky day... yet!" #~ msgstr "OKX Cryptopedia" #: src/connect-ui/component/ConnectModal/ConnectModal.tsx:257 -msgid "On BOB, you have the option to link both your EVM and BTC wallets. For optimal functionality, it's advised to connect wallets from both networks." -msgstr "On BOB, you have the option to link both your EVM and BTC wallets. For optimal functionality, it's advised to connect wallets from both networks." +#~ msgid "On BOB, you have the option to link both your EVM and BTC wallets. For optimal functionality, it's advised to connect wallets from both networks." +#~ msgstr "On BOB, you have the option to link both your EVM and BTC wallets. For optimal functionality, it's advised to connect wallets from both networks." #: src/app/[lang]/fusion/components/WelcomeBackModal/WelcomeBackModal.tsx:68 msgid "Once complete, your season 3 score will be added to seasons 1 and 2 to calculate your final Spice harvest." @@ -1298,13 +1326,11 @@ msgstr "POWERED BY BTC & ETH" msgid "Preparing..." msgstr "Preparing..." -#: src/components/Layout/Header.tsx:115 -#: src/components/Layout/Sidebar.tsx:73 -#: src/connect-ui/component/ConnectModal/ConnectModal.tsx:277 +#: src/connect-ui/component/ConnectModal/ConnectModal.tsx:227 msgid "Privacy policy" msgstr "Privacy policy" -#: src/components/ConnectButton/ConnectButton.tsx:124 +#: src/components/ConnectButton/ConnectButton.tsx:151 msgid "Profile" msgstr "Profile" @@ -1350,6 +1376,7 @@ msgid "Read the official Fusion Guide on the new BOB Blog and start harvesting S msgstr "Read the official Fusion Guide on the new BOB Blog and start harvesting Spice now." #: src/app/[lang]/(bridge)/bridge/components/BridgeForm/BtcBridgeForm.tsx:109 +#: src/components/Profile/Profile.tsx:130 msgid "Receive" msgstr "Receive" @@ -1361,7 +1388,11 @@ msgstr "Receive" #~ msgid "Receive {ticker}" #~ msgstr "Receive {ticker}" -#: src/app/[lang]/(bridge)/bridge/components/BridgeForm/BobBridgeForm.tsx:484 +#: src/components/ReceiveModal/ReceiveModal.tsx:70 +msgid "Receive crypto" +msgstr "Receive crypto" + +#: src/app/[lang]/(bridge)/bridge/components/BridgeForm/BobBridgeForm.tsx:492 #: src/app/[lang]/(bridge)/bridge/components/BridgeForm/BtcBridgeForm.tsx:132 #: src/app/[lang]/(bridge)/stake/components/StrategyForm/StrategyForm.tsx:130 msgid "Recipient" @@ -1383,7 +1414,7 @@ msgstr "Released: BOB's Hybrid L2 vision paper" msgid "Remove vote" msgstr "Remove vote" -#: src/app/[lang]/(bridge)/stake/components/StrategiesTable/StrategiesTable.tsx:110 +#: src/app/[lang]/(bridge)/stake/components/StrategiesTable/StrategiesTable.tsx:108 #: src/app/[lang]/(bridge)/stake/components/StrategyDetails/StrategyDetails.tsx:226 #: src/app/[lang]/apps/components/AppsList/AppCard.tsx:131 #: src/app/[lang]/fusion/components/Strategies/StrategyCard.tsx:107 @@ -1424,16 +1455,16 @@ msgid "Security Review by Bitcoin Layers" msgstr "Security Review by Bitcoin Layers" #: src/connect-ui/component/ConnectModal/ConnectModal.tsx:222 -msgid "Select Bitcoin Wallet" -msgstr "Select Bitcoin Wallet" +#~ msgid "Select Bitcoin Wallet" +#~ msgstr "Select Bitcoin Wallet" #: src/app/[lang]/(bridge)/stake/components/StrategiesTable/StrategiesCategories.tsx:30 msgid "Select Category" msgstr "Select Category" #: src/connect-ui/component/ConnectModal/ConnectModal.tsx:208 -msgid "Select EVM Wallet" -msgstr "Select EVM Wallet" +#~ msgid "Select EVM Wallet" +#~ msgstr "Select EVM Wallet" #: src/app/[lang]/(bridge)/stake/components/StrategiesTable/StrategiesFilter.tsx:28 msgid "Select Filter" @@ -1447,11 +1478,11 @@ msgstr "select gas token" msgid "Select Network" msgstr "Select Network" -#: src/app/[lang]/(bridge)/bridge/components/BridgeForm/BridgeForm.tsx:188 +#: src/app/[lang]/(bridge)/bridge/components/BridgeForm/BridgeForm.tsx:189 msgid "select network to bridge from" msgstr "select network to bridge from" -#: src/app/[lang]/(bridge)/bridge/components/BridgeForm/BridgeForm.tsx:198 +#: src/app/[lang]/(bridge)/bridge/components/BridgeForm/BridgeForm.tsx:199 msgid "select network to bridge to" msgstr "select network to bridge to" @@ -1509,7 +1540,7 @@ msgstr "Solv XP" #~ msgid "SolvBTC.BBN is a yield-bearing token that represents staked SolvBTC plus all future Babylon staking rewards and Solv Points." #~ msgstr "SolvBTC.BBN is a yield-bearing token that represents staked SolvBTC plus all future Babylon staking rewards and Solv Points." -#: src/app/[lang]/(bridge)/bridge/components/BridgeForm/BobBridgeForm.tsx:129 +#: src/app/[lang]/(bridge)/bridge/components/BridgeForm/BobBridgeForm.tsx:130 #: src/app/[lang]/fusion/components/LotterySections/LotteryModal/LotteryModal.tsx:67 #: src/hooks/useLogin.ts:50 #: src/hooks/useSignUp.ts:53 @@ -1573,7 +1604,7 @@ msgstr "stake" #: src/app/[lang]/(bridge)/stake/page.tsx:14 #: src/components/Layout/Header.tsx:58 #: src/components/Layout/Sidebar.tsx:55 -#: src/components/Profile/ProfileTokenListItem.tsx:127 +#: src/components/Profile/ProfileTokenListItem.tsx:131 msgid "Stake" msgstr "Stake" @@ -1635,11 +1666,11 @@ msgstr "Staked Amount" msgid "Staking" msgstr "Staking" -#: src/app/[lang]/(bridge)/stake/components/StrategiesTable/StrategiesTable.tsx:287 +#: src/app/[lang]/(bridge)/stake/components/StrategiesTable/StrategiesTable.tsx:261 msgid "Staking list" msgstr "Staking list" -#: src/app/[lang]/(bridge)/stake/components/StrategiesTable/StrategiesTable.tsx:322 +#: src/app/[lang]/(bridge)/stake/components/StrategiesTable/StrategiesTable.tsx:296 msgid "Staking table" msgstr "Staking table" @@ -1674,7 +1705,7 @@ msgstr "Step Two" msgid "Steps" msgstr "Steps" -#: src/app/[lang]/(bridge)/stake/components/StrategiesTable/StrategiesTable.tsx:90 +#: src/app/[lang]/(bridge)/stake/components/StrategiesTable/StrategiesTable.tsx:88 msgid "Strategy" msgstr "Strategy" @@ -1682,11 +1713,11 @@ msgstr "Strategy" msgid "Strategy Breakdown" msgstr "Strategy Breakdown" -#: src/app/[lang]/(bridge)/components/BridgeStatus/WithdrawStatus.tsx:42 +#: src/components/BridgeStatus/WithdrawStatus.tsx:41 msgid "Submission failed. Please disable any wallets other than the one connected to this dApp. If the issue persists, please contact us." msgstr "Submission failed. Please disable any wallets other than the one connected to this dApp. If the issue persists, please contact us." -#: src/app/[lang]/(bridge)/components/BridgeStatus/WithdrawStatus.tsx:109 +#: src/components/BridgeStatus/WithdrawStatus.tsx:108 msgid "Successfully finalized transaction" msgstr "Successfully finalized transaction" @@ -1694,7 +1725,7 @@ msgstr "Successfully finalized transaction" #~ msgid "Successfully sent {amount} {0}" #~ msgstr "Successfully sent {amount} {0}" -#: src/app/[lang]/(bridge)/components/BridgeStatus/WithdrawStatus.tsx:76 +#: src/components/BridgeStatus/WithdrawStatus.tsx:75 msgid "Successfully submitted ${0} proof" msgstr "Successfully submitted ${0} proof" @@ -1726,7 +1757,7 @@ msgstr "Supply the newly minted satUSD into a <0>lending protocol on BOB." msgid "Support your favourite BOB apps" msgstr "Support your favourite BOB apps" -#: src/components/Profile/ProfileEvmWallet.tsx:38 +#: src/components/Profile/ProfileEvmWallet.tsx:39 msgid "Switch to {0}" msgstr "Switch to {0}" @@ -1743,7 +1774,7 @@ msgstr "T&Cs" msgid "Take em home" msgstr "Take em home" -#: src/connect-ui/component/ConnectModal/ConnectModal.tsx:269 +#: src/connect-ui/component/ConnectModal/ConnectModal.tsx:223 msgid "Terms of Service" msgstr "Terms of Service" @@ -1898,13 +1929,17 @@ msgstr "Transaction Submitted" msgid "Transfer time" msgstr "Transfer time" -#: src/app/[lang]/(bridge)/stake/components/StrategiesTable/StrategiesTable.tsx:98 +#: src/components/ProfileActivity/ProfileActivity.tsx:186 +msgid "Try adjusting your filters" +msgstr "Try adjusting your filters" + +#: src/app/[lang]/(bridge)/stake/components/StrategiesTable/StrategiesTable.tsx:96 #: src/app/[lang]/(bridge)/stake/components/StrategyDetails/StrategyDetails.tsx:236 #: src/app/[lang]/fusion/components/UserInfo/Barometer.tsx:67 msgid "TVL" msgstr "TVL" -#: src/app/[lang]/(bridge)/stake/components/StrategiesTable/StrategiesTable.tsx:100 +#: src/app/[lang]/(bridge)/stake/components/StrategiesTable/StrategiesTable.tsx:98 msgid "TVL on BOB" msgstr "TVL on BOB" @@ -1970,14 +2005,14 @@ msgstr "Use your bridged assets in apps to maximise your Spice harvest.<0/>TIP: msgid "Use your Spice total to support your favourite BOB builders. Winners will be announced each week." msgstr "Use your Spice total to support your favourite BOB builders. Winners will be announced each week." -#: src/app/[lang]/(bridge)/bridge/components/BridgeForm/BobBridgeForm.tsx:127 -#: src/connect-ui/component/ConnectModal/ConnectModal.tsx:137 +#: src/app/[lang]/(bridge)/bridge/components/BridgeForm/BobBridgeForm.tsx:128 +#: src/connect-ui/component/ConnectModal/ConnectModal.tsx:96 #: src/hooks/useLogin.ts:48 #: src/hooks/useSignUp.ts:51 msgid "User rejected the request" msgstr "User rejected the request" -#: src/app/[lang]/(bridge)/components/BridgeStatus/WithdrawStatus.tsx:37 +#: src/components/BridgeStatus/WithdrawStatus.tsx:36 msgid "User rejected the request." msgstr "User rejected the request." @@ -1985,7 +2020,7 @@ msgstr "User rejected the request." msgid "Username" msgstr "Username" -#: src/app/[lang]/(bridge)/bridge/components/BridgeForm/BridgeForm.tsx:233 +#: src/app/[lang]/(bridge)/bridge/components/BridgeForm/BridgeForm.tsx:234 msgid "Using the official bridge usually takes 7 days. For faster withdrawals we recommend using a 3rd party bridge for supported tokens (ETH, WBTC, USDT, USDC)." msgstr "Using the official bridge usually takes 7 days. For faster withdrawals we recommend using a 3rd party bridge for supported tokens (ETH, WBTC, USDT, USDC)." @@ -2031,7 +2066,7 @@ msgstr "Waiting for approval" msgid "Waiting for confirmation" msgstr "Waiting for confirmation" -#: src/connect-ui/component/ConnectWallet/ConnectWallet.tsx:55 +#: src/components/Profile/Profile.tsx:139 msgid "Wallet" msgstr "Wallet" @@ -2068,7 +2103,7 @@ msgstr "When you vote, you do not give away any of your harvest. Your Spice tota msgid "withdraw" msgstr "withdraw" -#: src/app/[lang]/(bridge)/bridge/Bridge.tsx:221 +#: src/app/[lang]/(bridge)/bridge/Bridge.tsx:156 #: src/app/[lang]/(bridge)/stake/[slug]/Strategy.tsx:37 msgid "Withdraw" msgstr "Withdraw" @@ -2087,7 +2122,7 @@ msgstr "Withdraw Locked Assets" msgid "Withdraw to L1 failed. Please try again." msgstr "Withdraw to L1 failed. Please try again." -#: src/app/[lang]/(bridge)/bridge/Bridge.tsx:224 +#: src/app/[lang]/(bridge)/bridge/Bridge.tsx:159 msgid "Withdrawals back to BTC are currently not supported" msgstr "Withdrawals back to BTC are currently not supported" diff --git a/apps/evm/src/locales/zh.po b/apps/evm/src/locales/zh.po index 16fbc79e..9df5f430 100644 --- a/apps/evm/src/locales/zh.po +++ b/apps/evm/src/locales/zh.po @@ -99,11 +99,19 @@ msgstr "{0, plural, one {紅包} other {紅包}} <0>{rollsRemaining}/3剩餘 msgid "<0>Stake your BTC with 1-click and receive BTC LSTs on BOB." msgstr "<0>一键质押你的BTC 并在BOB上接收BTC LSTs。" +#: src/components/Profile/Profile.tsx:100 +#~ msgid "=======" +#~ msgstr "" + +#: src/components/Profile/Profile.tsx:106 +#~ msgid ">>>>>>> d5cf7a29 (feat(evm): add activity section (#395))" +#~ msgstr "" + #: src/components/BridgeStatus/TimeStep.tsx:46 msgid "2 hours" msgstr "" -#: src/app/[lang]/(bridge)/bridge/components/BridgeForm/BridgeForm.tsx:228 +#: src/app/[lang]/(bridge)/bridge/components/BridgeForm/BridgeForm.tsx:229 msgid "3rd Party" msgstr "" @@ -125,7 +133,7 @@ msgstr "关于" msgid "About Babylon Campaign" msgstr "" -#: src/app/[lang]/(bridge)/bridge/Bridge.tsx:199 +#: src/app/[lang]/(bridge)/bridge/components/ActivityButton/ActivityButton.tsx:75 msgid "Action needed" msgstr "" @@ -134,14 +142,14 @@ msgstr "" msgid "Active Superchain users who have received any of the five OP Airdrops qualify for an exclusive 50% bonus on all Spice harvested between 9 December 2024 and 12 January 2025. The bonus will be applied at the end of the campaign." msgstr "" -#: src/app/[lang]/(bridge)/bridge/Bridge.tsx:204 -#: src/app/[lang]/(bridge)/stake/components/StrategiesTable/StrategiesTable.tsx:278 -#: src/components/Profile/Profile.tsx:151 -#: src/components/Profile/Profile.tsx:155 +#: src/app/[lang]/(bridge)/bridge/components/ActivityButton/ActivityButton.tsx:51 +#: src/app/[lang]/(bridge)/bridge/components/ActivityButton/ActivityButton.tsx:80 +#: src/app/[lang]/(bridge)/stake/components/ActivityButton/ActivityButton.tsx:46 +#: src/components/Profile/Profile.tsx:146 msgid "Activity" msgstr "" -#: src/components/Profile/ProfileTokenListItem.tsx:153 +#: src/components/Profile/ProfileTokenListItem.tsx:157 msgid "Add to {0}" msgstr "" @@ -182,9 +190,9 @@ msgstr "" msgid "Already harvesting?" msgstr "已经在收获？" -#: src/app/[lang]/(bridge)/bridge/components/BridgeForm/BobBridgeForm.tsx:474 +#: src/app/[lang]/(bridge)/bridge/components/BridgeForm/BobBridgeForm.tsx:482 #: src/app/[lang]/(bridge)/components/BtcTokenInput/BtcTokenInput.tsx:38 -#: src/app/[lang]/(bridge)/stake/components/StrategiesTable/StrategiesTable.tsx:251 +#: src/app/[lang]/(bridge)/stake/components/StrategiesTable/StrategiesTable.tsx:229 msgid "Amount" msgstr "" @@ -196,8 +204,8 @@ msgstr "" #~ msgid "An exclusive quest campaign." #~ msgstr "" -#: src/connect-ui/component/ConnectModal/ConnectModal.tsx:271 -msgid "and that you have read and understood our" +#: src/connect-ui/component/ConnectModal/ConnectModal.tsx:225 +msgid "and" msgstr "" #: src/connect-ui/component/ConnectModal/ConnectModal.tsx:185 @@ -217,7 +225,7 @@ msgstr "" msgid "Apply" msgstr "" -#: src/app/[lang]/(bridge)/bridge/components/BridgeForm/BobBridgeForm.tsx:458 +#: src/app/[lang]/(bridge)/bridge/components/BridgeForm/BobBridgeForm.tsx:466 msgid "Approve" msgstr "通过" @@ -265,8 +273,8 @@ msgid "Audited by" msgstr "审计" #: src/connect-ui/component/ConnectWallet/ConnectWallet.tsx:32 -msgid "Authorize Wallet" -msgstr "" +#~ msgid "Authorize Wallet" +#~ msgstr "" #: src/app/[lang]/(bridge)/components/BannerCarousel/BabylonBanner.tsx:35 #: src/app/[lang]/fusion/Fusion.tsx:209 @@ -321,7 +329,7 @@ msgstr "以下是你从各个应用中收获的Spice。继续参与以增加你 msgid "BOB" msgstr "" -#: src/app/[lang]/(bridge)/bridge/components/BridgeForm/BridgeForm.tsx:225 +#: src/app/[lang]/(bridge)/bridge/components/BridgeForm/BridgeForm.tsx:226 msgid "BOB Bridge" msgstr "" @@ -400,7 +408,7 @@ msgstr "" msgid "Bridge" msgstr "桥" -#: src/app/[lang]/(bridge)/bridge/components/BridgeForm/BobBridgeForm.tsx:459 +#: src/app/[lang]/(bridge)/bridge/components/BridgeForm/BobBridgeForm.tsx:467 #: src/app/[lang]/(bridge)/bridge/components/BridgeForm/BtcBridgeForm.tsx:144 msgid "Bridge Asset" msgstr "" @@ -414,19 +422,19 @@ msgstr "跨链资产" msgid "Bridge BTC LSTs to BOB" msgstr "将BTC LSTs跨链到BOB" -#: src/app/[lang]/(bridge)/bridge/components/BridgeForm/BobBridgeForm.tsx:454 +#: src/app/[lang]/(bridge)/bridge/components/BridgeForm/BobBridgeForm.tsx:462 msgid "Bridge Disabled" msgstr "" -#: src/app/[lang]/(bridge)/bridge/components/BridgeForm/BridgeForm.tsx:218 +#: src/app/[lang]/(bridge)/bridge/components/BridgeForm/BridgeForm.tsx:219 msgid "bridge network" msgstr "" -#: src/components/Profile/ProfileTokenListItem.tsx:163 +#: src/components/Profile/ProfileTokenListItem.tsx:165 msgid "Bridge to {0}" msgstr "" -#: src/components/Profile/ProfileTokenListItem.tsx:163 +#: src/components/Profile/ProfileTokenListItem.tsx:165 msgid "Bridge to {otherChainName}" msgstr "" @@ -460,27 +468,26 @@ msgstr "" #: src/app/[lang]/fusion/components/Strategies/Strategies.tsx:13 msgid "BTC LST Lending" -msgstr "BTC LST借贷" +msgstr "BTC LST借贷<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD #: src/app/[lang]/(bridge)/stake/Stake.tsx:70 -#~ msgid "BTC Strategies" -======= -#: src/components/Profile/Profile.tsx:100 -======= -#: src/components/Profile/Profile.tsx:106 ->>>>>>> d5cf7a29 (feat(evm): add activity section (#395)) +#~ msgid "BTC Strategies=======" +#~ msgstr "" + +#: src/components/Profile/Profile.tsx:116 msgid "Buy" msgstr "" -#: src/connect-ui/component/ConnectModal/ConnectModal.tsx:181 +#: src/connect-ui/component/ConnectModal/ConnectModal.tsx:263 #~ msgid "By clicking ‘Connect’ you acknowledge and agree to the" ->>>>>>> 2193d044 (feat: place blockscout under others section) #~ msgstr "" -#: src/connect-ui/component/ConnectModal/ConnectModal.tsx:263 -msgid "By clicking ‘Connect’ you acknowledge and agree to the" +#: src/connect-ui/component/ConnectModal/ConnectModal.tsx:181 +#~ msgid "By clicking ‘Connect’ you acknowledge and agree to the>>>>>>> 2193d044 (feat: place blockscout under others section)" +#~ msgstr "" + +#: src/connect-ui/component/ConnectModal/ConnectModal.tsx:221 +msgid "By connecting your wallet, you confirm that you've read and agree to our" msgstr "" #: src/app/[lang]/wallet/components/ReceiveTokenModal/ReceiveTokenModal.tsx:79 @@ -498,13 +505,9 @@ msgstr "" #: src/app/[lang]/(bridge)/stake/components/StrategyDetailsModal/StrategyDetailsModal.tsx:36 #~ msgid "Category" -#~ msgstr "" +#~ msgstr "<<<<<<< HEAD" -<<<<<<< HEAD -#: src/app/[lang]/(bridge)/bridge/components/BridgeForm/BobBridgeForm.tsx:456 -======= -#: src/app/[lang]/(bridge)/bridge/components/BridgeForm/BobBridgeForm.tsx:460 ->>>>>>> d5cf7a29 (feat(evm): add activity section (#395)) +#: src/app/[lang]/(bridge)/bridge/components/BridgeForm/BobBridgeForm.tsx:464 msgid "Checking Allowance" msgstr "" @@ -529,7 +532,7 @@ msgstr "BOB蛇年大礼包等你来领!一键获得 Spice积分奖励, 与BOB一 msgid "Clear" msgstr "" -#: src/components/ProfileActivity/ProfileActivity.tsx:182 +#: src/components/ProfileActivity/ProfileActivity.tsx:196 msgid "Clear Filters" msgstr "" @@ -609,32 +612,30 @@ msgstr "连接比特币钱包" msgid "Connect BTC wallet to access fee rate settings." msgstr "" -#: src/connect-ui/component/ConnectModal/ConnectModal.tsx:141 -msgid "Connect request is already pending" +#: src/components/Profile/ProfileEvmWallet.tsx:62 +msgid "Connect EVM Wallet" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -#: src/connect-ui/component/AuthButton/AuthButton.tsx:63 -#: src/connect-ui/component/ConnectModal/ConnectModal.tsx:225 -#: src/connect-ui/component/ConnectWallet/ConnectWallet.tsx:30 -======= -#: src/components/ConnectButton/ConnectButton.tsx:74 -======= -#: src/components/ConnectButton/ConnectButton.tsx:95 ->>>>>>> d5cf7a29 (feat(evm): add activity section (#395)) +#: src/connect-ui/component/ConnectModal/ConnectModal.tsx:100 +msgid "Connect request is already pending" +msgstr "<<<<<<< HEAD<<<<<<< HEAD" + +#: src/components/ConnectButton/ConnectButton.tsx:122 #: src/connect-ui/component/AuthButton/AuthButton.tsx:62 -#: src/connect-ui/component/ConnectModal/ConnectModal.tsx:171 ->>>>>>> 2193d044 (feat: place blockscout under others section) +#: src/connect-ui/component/ConnectModal/ConnectModal.tsx:177 msgid "Connect Wallet" msgstr "连接钱包" #: src/connect-ui/component/ConnectModal/ConnectModal.tsx:307 -msgid "Connect your Bitcoin Wallet (Optional)" -msgstr "" +#~ msgid "Connect your Bitcoin Wallet (Optional)" +#~ msgstr "" #: src/connect-ui/component/ConnectModal/ConnectModal.tsx:292 -msgid "Connect your EVM Wallet (Mandatory)" +#~ msgid "Connect your EVM Wallet (Mandatory)" +#~ msgstr "" + +#: src/components/ProfileActivity/ProfileActivity.tsx:181 +msgid "Connect your EVM wallet to see your transactions" msgstr "" #: src/connect-ui/component/ConnectModal/ConnectedWalletSection.tsx:37 @@ -698,7 +699,7 @@ msgstr "" msgid "Deploy high priority assets into high priority DeFi protocols to maximize your Spice harvest." msgstr "将高优先级资产部署到高优先级DeFi协议中，以最大化你的Spice收获。" -#: src/app/[lang]/(bridge)/bridge/Bridge.tsx:216 +#: src/app/[lang]/(bridge)/bridge/Bridge.tsx:151 msgid "Deposit" msgstr "" @@ -799,15 +800,10 @@ msgstr "" #: src/app/[lang]/wallet/components/SendTokenModal/SendTokenModal.tsx:225 #~ msgid "Enter Address" -#~ msgstr "" +#~ msgstr "<<<<<<< HEAD" -<<<<<<< HEAD -#: src/app/[lang]/(bridge)/bridge/components/BridgeForm/BobBridgeForm.tsx:485 +#: src/app/[lang]/(bridge)/bridge/components/BridgeForm/BobBridgeForm.tsx:493 #: src/app/[lang]/(bridge)/bridge/components/BridgeForm/BtcBridgeForm.tsx:132 -======= -#: src/app/[lang]/(bridge)/bridge/components/BridgeForm/BobBridgeForm.tsx:489 -#: src/app/[lang]/(bridge)/bridge/components/BridgeForm/BtcBridgeForm.tsx:159 ->>>>>>> d5cf7a29 (feat(evm): add activity section (#395)) #: src/app/[lang]/(bridge)/stake/components/StrategyForm/StrategyForm.tsx:131 msgid "Enter destination address" msgstr "" @@ -838,19 +834,14 @@ msgstr "" #: src/app/[lang]/fusion/components/OpSuperuserModal/OpSuperuserModal.tsx:33 msgid "Exclusive Spice Bonus For Superchain Users" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD -#: src/connect-ui/component/ConnectModal/ConnectModal.tsx:144 -#: src/connect-ui/component/ConnectModal/ConnectModal.tsx:185 -======= #: src/components/ProfileActivity/ProfileActivityFilters.tsx:24 msgid "Failed" msgstr "" -#: src/connect-ui/component/ConnectModal/ConnectModal.tsx:100 -#: src/connect-ui/component/ConnectModal/ConnectModal.tsx:138 ->>>>>>> d5cf7a29 (feat(evm): add activity section (#395)) +#: src/connect-ui/component/ConnectModal/ConnectModal.tsx:103 +#: src/connect-ui/component/ConnectModal/ConnectModal.tsx:144 msgid "Failed to connect to {0}" msgstr "" @@ -992,8 +983,8 @@ msgstr "" #: src/connect-ui/component/ConnectModal/ConnectModal.tsx:200 #: src/connect-ui/component/ConnectModal/ConnectModal.tsx:214 -msgid "go back" -msgstr "" +#~ msgid "go back" +#~ msgstr "" #: src/app/[lang]/404/NotFound.tsx:30 msgid "Go Back" @@ -1003,7 +994,7 @@ msgstr "返回" #~ msgid "Go to explorer" #~ msgstr "" -#: src/components/Profile/ProfileTokenListItem.tsx:140 +#: src/components/Profile/ProfileTokenListItem.tsx:144 msgid "Go to Explorer" msgstr "" @@ -1349,13 +1340,9 @@ msgstr "" #: src/components/SocialsGroup/SocialsGroup.tsx:41 msgid "navigate to discord" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD -#: src/app/[lang]/(bridge)/components/BannerCarousel/BannerCarousel.tsx:75 -======= -#: src/app/[lang]/(bridge)/components/BannerCarousel/BannerCarousel.tsx:74 ->>>>>>> d5cf7a29 (feat(evm): add activity section (#395)) +#: src/app/[lang]/(bridge)/components/BannerCarousel/BannerCarousel.tsx:76 msgid "navigate to ecosystem section in fusion page" msgstr "" @@ -1444,10 +1431,10 @@ msgid "No new goal at the moment. Stay tuned for updates!" msgstr "目前暂无新目标。请保持关注更新！" #: src/components/ProfileActivity/ProfileActivity.tsx:174 -msgid "No operations found" -msgstr "" +#~ msgid "No operations found" +#~ msgstr "" -#: src/app/[lang]/(bridge)/stake/components/StrategiesTable/StrategiesTable.tsx:330 +#: src/app/[lang]/(bridge)/stake/components/StrategiesTable/StrategiesTable.tsx:304 msgid "No strategies to display" msgstr "" @@ -1455,6 +1442,10 @@ msgstr "" #~ msgid "No Thanks" #~ msgstr "" +#: src/components/ProfileActivity/ProfileActivity.tsx:177 +msgid "No transactions found" +msgstr "" + #: src/app/[lang]/fusion/components/LotterySections/LotteryModal/LotteryModal.tsx:50 #~ msgid "Not enough spice" #~ msgstr "" @@ -1480,8 +1471,8 @@ msgstr "" #~ msgstr "" #: src/connect-ui/component/ConnectModal/ConnectModal.tsx:257 -msgid "On BOB, you have the option to link both your EVM and BTC wallets. For optimal functionality, it's advised to connect wallets from both networks." -msgstr "" +#~ msgid "On BOB, you have the option to link both your EVM and BTC wallets. For optimal functionality, it's advised to connect wallets from both networks." +#~ msgstr "" #: src/app/[lang]/fusion/components/WelcomeBackModal/WelcomeBackModal.tsx:68 msgid "Once complete, your season 3 score will be added to seasons 1 and 2 to calculate your final Spice harvest." @@ -1570,13 +1561,11 @@ msgstr "比特币 + 以太坊共同驱动" msgid "Preparing..." msgstr "" -#: src/components/Layout/Header.tsx:115 -#: src/components/Layout/Sidebar.tsx:73 -#: src/connect-ui/component/ConnectModal/ConnectModal.tsx:277 +#: src/connect-ui/component/ConnectModal/ConnectModal.tsx:227 msgid "Privacy policy" msgstr "隐私政策" -#: src/components/ConnectButton/ConnectButton.tsx:124 +#: src/components/ConnectButton/ConnectButton.tsx:151 msgid "Profile" msgstr "" @@ -1619,18 +1608,10 @@ msgstr "点此了解更多" #: src/app/[lang]/(bridge)/components/BannerCarousel/FusionBanner.tsx:27 msgid "Read the official Fusion Guide on the new BOB Blog and start harvesting Spice now." -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/app/[lang]/(bridge)/bridge/components/BridgeForm/BtcBridgeForm.tsx:109 -======= -#: src/app/[lang]/(bridge)/bridge/components/BridgeForm/BtcBridgeForm.tsx:136 -<<<<<<< HEAD -#: src/components/Profile/Profile.tsx:114 ->>>>>>> 2193d044 (feat: place blockscout under others section) -======= -#: src/components/Profile/Profile.tsx:120 ->>>>>>> d5cf7a29 (feat(evm): add activity section (#395)) +#: src/components/Profile/Profile.tsx:130 msgid "Receive" msgstr "接收" @@ -1640,19 +1621,14 @@ msgstr "接收" #: src/app/[lang]/wallet/components/TokenTable/ButtonGroup.tsx:93 #~ msgid "Receive {ticker}" -#~ msgstr "接收 {ticker}" +#~ msgstr "接收 {ticker}<<<<<<< HEAD" -<<<<<<< HEAD -#: src/app/[lang]/(bridge)/bridge/components/BridgeForm/BobBridgeForm.tsx:484 -#: src/app/[lang]/(bridge)/bridge/components/BridgeForm/BtcBridgeForm.tsx:132 -======= #: src/components/ReceiveModal/ReceiveModal.tsx:70 msgid "Receive crypto" msgstr "" -#: src/app/[lang]/(bridge)/bridge/components/BridgeForm/BobBridgeForm.tsx:488 -#: src/app/[lang]/(bridge)/bridge/components/BridgeForm/BtcBridgeForm.tsx:159 ->>>>>>> d5cf7a29 (feat(evm): add activity section (#395)) +#: src/app/[lang]/(bridge)/bridge/components/BridgeForm/BobBridgeForm.tsx:492 +#: src/app/[lang]/(bridge)/bridge/components/BridgeForm/BtcBridgeForm.tsx:132 #: src/app/[lang]/(bridge)/stake/components/StrategyForm/StrategyForm.tsx:130 msgid "Recipient" msgstr "" @@ -1686,7 +1662,7 @@ msgstr "" #~ msgid "Restaking" #~ msgstr "" -#: src/app/[lang]/(bridge)/stake/components/StrategiesTable/StrategiesTable.tsx:110 +#: src/app/[lang]/(bridge)/stake/components/StrategiesTable/StrategiesTable.tsx:108 #: src/app/[lang]/(bridge)/stake/components/StrategyDetails/StrategyDetails.tsx:226 #: src/app/[lang]/apps/components/AppsList/AppCard.tsx:131 #: src/app/[lang]/fusion/components/Strategies/StrategyCard.tsx:107 @@ -1731,16 +1707,16 @@ msgid "Security Review by Bitcoin Layers" msgstr "" #: src/connect-ui/component/ConnectModal/ConnectModal.tsx:222 -msgid "Select Bitcoin Wallet" -msgstr "" +#~ msgid "Select Bitcoin Wallet" +#~ msgstr "" #: src/app/[lang]/(bridge)/stake/components/StrategiesTable/StrategiesCategories.tsx:30 msgid "Select Category" msgstr "" #: src/connect-ui/component/ConnectModal/ConnectModal.tsx:208 -msgid "Select EVM Wallet" -msgstr "" +#~ msgid "Select EVM Wallet" +#~ msgstr "" #: src/app/[lang]/(bridge)/stake/components/StrategiesTable/StrategiesFilter.tsx:28 msgid "Select Filter" @@ -1752,21 +1728,13 @@ msgstr "" #: src/app/[lang]/(bridge)/bridge/components/ChainSelect/ChainSelect.tsx:20 msgid "Select Network" -msgstr "" - -<<<<<<< HEAD -#: src/app/[lang]/(bridge)/bridge/components/BridgeForm/BridgeForm.tsx:188 -msgid "select network to bridge from" -msgstr "" +msgstr "<<<<<<< HEAD" -#: src/app/[lang]/(bridge)/bridge/components/BridgeForm/BridgeForm.tsx:198 -======= -#: src/app/[lang]/(bridge)/bridge/components/BridgeForm/BridgeForm.tsx:185 +#: src/app/[lang]/(bridge)/bridge/components/BridgeForm/BridgeForm.tsx:189 msgid "select network to bridge from" msgstr "" -#: src/app/[lang]/(bridge)/bridge/components/BridgeForm/BridgeForm.tsx:195 ->>>>>>> d5cf7a29 (feat(evm): add activity section (#395)) +#: src/app/[lang]/(bridge)/bridge/components/BridgeForm/BridgeForm.tsx:199 msgid "select network to bridge to" msgstr "" @@ -1828,7 +1796,7 @@ msgstr "" #~ msgid "SolvBTC.BBN is a yield-bearing token that represents staked SolvBTC plus all future Babylon staking rewards and Solv Points." #~ msgstr "" -#: src/app/[lang]/(bridge)/bridge/components/BridgeForm/BobBridgeForm.tsx:129 +#: src/app/[lang]/(bridge)/bridge/components/BridgeForm/BobBridgeForm.tsx:130 #: src/app/[lang]/fusion/components/LotterySections/LotteryModal/LotteryModal.tsx:67 #: src/hooks/useLogin.ts:50 #: src/hooks/useSignUp.ts:53 @@ -1926,7 +1894,7 @@ msgstr "" #: src/app/[lang]/(bridge)/stake/page.tsx:14 #: src/components/Layout/Header.tsx:58 #: src/components/Layout/Sidebar.tsx:55 -#: src/components/Profile/ProfileTokenListItem.tsx:127 +#: src/components/Profile/ProfileTokenListItem.tsx:131 msgid "Stake" msgstr "質押" @@ -1992,11 +1960,11 @@ msgstr "" msgid "Staking" msgstr "" -#: src/app/[lang]/(bridge)/stake/components/StrategiesTable/StrategiesTable.tsx:287 +#: src/app/[lang]/(bridge)/stake/components/StrategiesTable/StrategiesTable.tsx:261 msgid "Staking list" msgstr "" -#: src/app/[lang]/(bridge)/stake/components/StrategiesTable/StrategiesTable.tsx:322 +#: src/app/[lang]/(bridge)/stake/components/StrategiesTable/StrategiesTable.tsx:296 msgid "Staking table" msgstr "" @@ -2039,39 +2007,27 @@ msgstr "第二步" msgid "Steps" msgstr "" -#: src/app/[lang]/(bridge)/stake/components/StrategiesTable/StrategiesTable.tsx:90 +#: src/app/[lang]/(bridge)/stake/components/StrategiesTable/StrategiesTable.tsx:88 msgid "Strategy" msgstr "" #: src/app/[lang]/(bridge)/stake/components/StrategyDetails/StrategyDetails.tsx:256 msgid "Strategy Breakdown" -msgstr "" - -<<<<<<< HEAD -#: src/app/[lang]/(bridge)/components/BridgeStatus/WithdrawStatus.tsx:42 -msgid "Submission failed. Please disable any wallets other than the one connected to this dApp. If the issue persists, please contact us." -msgstr "" +msgstr "<<<<<<< HEAD" -#: src/app/[lang]/(bridge)/components/BridgeStatus/WithdrawStatus.tsx:109 -======= -#: src/components/BridgeStatus/WithdrawStatus.tsx:43 +#: src/components/BridgeStatus/WithdrawStatus.tsx:41 msgid "Submission failed. Please disable any wallets other than the one connected to this dApp. If the issue persists, please contact us." msgstr "" -#: src/components/BridgeStatus/WithdrawStatus.tsx:110 ->>>>>>> d5cf7a29 (feat(evm): add activity section (#395)) +#: src/components/BridgeStatus/WithdrawStatus.tsx:108 msgid "Successfully finalized transaction" msgstr "" #: src/app/[lang]/wallet/components/SendTokenModal/SendTokenModal.tsx:150 #~ msgid "Successfully sent {amount} {0}" -#~ msgstr "" +#~ msgstr "<<<<<<< HEAD" -<<<<<<< HEAD -#: src/app/[lang]/(bridge)/components/BridgeStatus/WithdrawStatus.tsx:76 -======= -#: src/components/BridgeStatus/WithdrawStatus.tsx:77 ->>>>>>> d5cf7a29 (feat(evm): add activity section (#395)) +#: src/components/BridgeStatus/WithdrawStatus.tsx:75 msgid "Successfully submitted ${0} proof" msgstr "" @@ -2127,7 +2083,7 @@ msgstr "将新铸造的satUSD供应到 <0>BOB上的借贷协议 。" msgid "Support your favourite BOB apps" msgstr "支持你喜爱的BOB应用" -#: src/components/Profile/ProfileEvmWallet.tsx:38 +#: src/components/Profile/ProfileEvmWallet.tsx:39 msgid "Switch to {0}" msgstr "" @@ -2144,7 +2100,7 @@ msgstr "条款与条件" msgid "Take em home" msgstr "回到主页" -#: src/connect-ui/component/ConnectModal/ConnectModal.tsx:269 +#: src/connect-ui/component/ConnectModal/ConnectModal.tsx:223 msgid "Terms of Service" msgstr "" @@ -2351,7 +2307,11 @@ msgstr "" msgid "Transfer time" msgstr "" -#: src/app/[lang]/(bridge)/stake/components/StrategiesTable/StrategiesTable.tsx:98 +#: src/components/ProfileActivity/ProfileActivity.tsx:186 +msgid "Try adjusting your filters" +msgstr "" + +#: src/app/[lang]/(bridge)/stake/components/StrategiesTable/StrategiesTable.tsx:96 #: src/app/[lang]/(bridge)/stake/components/StrategyDetails/StrategyDetails.tsx:236 #: src/app/[lang]/fusion/components/UserInfo/Barometer.tsx:67 msgid "TVL" @@ -2360,7 +2320,7 @@ msgstr "总锁仓价值（TVL）" #~ msgid "TVL (on BOB)" #~ msgstr "" -#: src/app/[lang]/(bridge)/stake/components/StrategiesTable/StrategiesTable.tsx:100 +#: src/app/[lang]/(bridge)/stake/components/StrategiesTable/StrategiesTable.tsx:98 msgid "TVL on BOB" msgstr "" @@ -2442,18 +2402,14 @@ msgstr "在应用中使用你跨链的资产以最大化你的Spice收获。<0/> msgid "Use your Spice total to support your favourite BOB builders. Winners will be announced each week." msgstr "用你的Spice总数来支持你最喜爱的BOB构建者。获胜者将每周公布。" -#: src/app/[lang]/(bridge)/bridge/components/BridgeForm/BobBridgeForm.tsx:127 -#: src/connect-ui/component/ConnectModal/ConnectModal.tsx:137 +#: src/app/[lang]/(bridge)/bridge/components/BridgeForm/BobBridgeForm.tsx:128 +#: src/connect-ui/component/ConnectModal/ConnectModal.tsx:96 #: src/hooks/useLogin.ts:48 #: src/hooks/useSignUp.ts:51 msgid "User rejected the request" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD -#: src/app/[lang]/(bridge)/components/BridgeStatus/WithdrawStatus.tsx:37 -======= -#: src/components/BridgeStatus/WithdrawStatus.tsx:38 ->>>>>>> d5cf7a29 (feat(evm): add activity section (#395)) +#: src/components/BridgeStatus/WithdrawStatus.tsx:36 msgid "User rejected the request." msgstr "" @@ -2463,13 +2419,9 @@ msgstr "" #: src/app/[lang]/fusion/components/UserInfo/UserReferralModal.tsx:23 msgid "Username" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD -#: src/app/[lang]/(bridge)/bridge/components/BridgeForm/BridgeForm.tsx:233 -======= -#: src/app/[lang]/(bridge)/bridge/components/BridgeForm/BridgeForm.tsx:230 ->>>>>>> d5cf7a29 (feat(evm): add activity section (#395)) +#: src/app/[lang]/(bridge)/bridge/components/BridgeForm/BridgeForm.tsx:234 msgid "Using the official bridge usually takes 7 days. For faster withdrawals we recommend using a 3rd party bridge for supported tokens (ETH, WBTC, USDT, USDC)." msgstr "" @@ -2529,13 +2481,9 @@ msgstr "" #: src/app/[lang]/(bridge)/components/TransactionModal/BridgeTransactionModal.tsx:52 #: src/app/[lang]/(bridge)/components/TransactionModal/GatewayTransactionModal.tsx:39 msgid "Waiting for confirmation" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD -#: src/connect-ui/component/ConnectWallet/ConnectWallet.tsx:55 -======= -#: src/components/Profile/Profile.tsx:143 ->>>>>>> d5cf7a29 (feat(evm): add activity section (#395)) +#: src/components/Profile/Profile.tsx:139 msgid "Wallet" msgstr "钱包" @@ -2584,7 +2532,7 @@ msgstr "投票时，你不会失去任何收获。你的Spice总数仅用于计 msgid "withdraw" msgstr "" -#: src/app/[lang]/(bridge)/bridge/Bridge.tsx:221 +#: src/app/[lang]/(bridge)/bridge/Bridge.tsx:156 #: src/app/[lang]/(bridge)/stake/[slug]/Strategy.tsx:37 msgid "Withdraw" msgstr "" @@ -2603,7 +2551,7 @@ msgstr "提取锁定资产" msgid "Withdraw to L1 failed. Please try again." msgstr "" -#: src/app/[lang]/(bridge)/bridge/Bridge.tsx:224 +#: src/app/[lang]/(bridge)/bridge/Bridge.tsx:159 msgid "Withdrawals back to BTC are currently not supported" msgstr "" diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 10528c5a..5ff07855 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -3438,8 +3438,8 @@ packages: '@types/react': optional: true - '@radix-ui/react-dialog@1.1.4': - resolution: {integrity: sha512-Ur7EV1IwQGCyaAuyDRiOLA5JIUZxELJljF+MbM/2NC0BYwfuRrbpS30BiQBJrVruscgUkieKkqXYDOoByaxIoA==} + '@radix-ui/react-dialog@1.1.5': + resolution: {integrity: sha512-LaO3e5h/NOEL4OfXjxD43k9Dx+vn+8n+PCFt6uhX/BADFflllyv3WJG6rgvvSVBxpTch938Qq/LGc2MMxipXPw==} peerDependencies: '@types/react': '*' '@types/react-dom': '*' @@ -3473,8 +3473,8 @@ packages: '@types/react-dom': optional: true - '@radix-ui/react-dismissable-layer@1.1.3': - resolution: {integrity: sha512-onrWn/72lQoEucDmJnr8uczSNTujT0vJnA/X5+3AkChVPowr8n1yvIKIabhWyMQeMvvmdpsvcyDqx3X1LEXCPg==} + '@radix-ui/react-dismissable-layer@1.1.4': + resolution: {integrity: sha512-XDUI0IVYVSwjMXxM6P4Dfti7AH+Y4oS/TB+sglZ/EXc7cqLwGAmp1NlMrcUjj7ks6R5WTZuWKv44FBbLpwU3sA==} peerDependencies: '@types/react': '*' '@types/react-dom': '*' @@ -11039,8 +11039,8 @@ packages: '@types/react': optional: true - react-remove-scroll@2.6.2: - resolution: {integrity: sha512-KmONPx5fnlXYJQqC62Q+lwIeAk64ws/cUw6omIumRzMRPqgnYqhSSti99nbj0Ry13bv7dF+BKn7NB+OqkdZGTw==} + react-remove-scroll@2.6.3: + resolution: {integrity: sha512-pnAi91oOk8g8ABQKGF5/M9qxmmOPxaAnopyTHYfqYEwJhyFrbbBtHuSgtKEoH0jpcxx5o3hXqH1mNd9/Oi+8iQ==} engines: {node: '>=10'} peerDependencies: '@types/react': '*' @@ -12554,6 +12554,16 @@ packages: '@types/react': optional: true + use-sidecar@1.1.3: + resolution: {integrity: sha512-Fedw0aZvkhynoPYlA5WXrMCAMm+nSWdZt6lzJQ7Ok8S6Q+VsHmHpRWndVRJ8Be0ZbkfPc5LRYH+5XrzXcEeLRQ==} + engines: {node: '>=10'} + peerDependencies: + '@types/react': '*' + react: ^18.2.0 + peerDependenciesMeta: + '@types/react': + optional: true + use-sync-external-store@1.2.0: resolution: {integrity: sha512-eEgnFxGQ1Ife9bzYs6VLi8/4X6CObHMw9Qr9tPY43iKwsPw8xE8+EFsf/2cFZ5S3esXgpWgtSCtLNS41F+sKPA==} peerDependencies: @@ -16469,12 +16479,12 @@ snapshots: optionalDependencies: '@types/react': 18.3.3 - '@radix-ui/react-dialog@1.1.4(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': + '@radix-ui/react-dialog@1.1.5(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': dependencies: '@radix-ui/primitive': 1.1.1 '@radix-ui/react-compose-refs': 1.1.1(@types/react@18.3.3)(react@18.3.1) '@radix-ui/react-context': 1.1.1(@types/react@18.3.3)(react@18.3.1) - '@radix-ui/react-dismissable-layer': 1.1.3(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@radix-ui/react-dismissable-layer': 1.1.4(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@radix-ui/react-focus-guards': 1.1.1(@types/react@18.3.3)(react@18.3.1) '@radix-ui/react-focus-scope': 1.1.1(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@radix-ui/react-id': 1.1.0(@types/react@18.3.3)(react@18.3.1) @@ -16486,7 +16496,7 @@ snapshots: aria-hidden: 1.2.4 react: 18.3.1 react-dom: 18.3.1(react@18.3.1) - react-remove-scroll: 2.6.2(@types/react@18.3.3)(react@18.3.1) + react-remove-scroll: 2.6.3(@types/react@18.3.3)(react@18.3.1) optionalDependencies: '@types/react': 18.3.3 '@types/react-dom': 18.3.0 @@ -16512,7 +16522,7 @@ snapshots: '@types/react': 18.3.3 '@types/react-dom': 18.3.0 - '@radix-ui/react-dismissable-layer@1.1.3(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': + '@radix-ui/react-dismissable-layer@1.1.4(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': dependencies: '@radix-ui/primitive': 1.1.1 '@radix-ui/react-compose-refs': 1.1.1(@types/react@18.3.3)(react@18.3.1) @@ -27136,14 +27146,14 @@ snapshots: optionalDependencies: '@types/react': 18.3.3 - react-remove-scroll@2.6.2(@types/react@18.3.3)(react@18.3.1): + react-remove-scroll@2.6.3(@types/react@18.3.3)(react@18.3.1): dependencies: react: 18.3.1 react-remove-scroll-bar: 2.3.8(@types/react@18.3.3)(react@18.3.1) - react-style-singleton: 2.2.1(@types/react@18.3.3)(react@18.3.1) + react-style-singleton: 2.2.3(@types/react@18.3.3)(react@18.3.1) tslib: 2.6.3 use-callback-ref: 1.3.3(@types/react@18.3.3)(react@18.3.1) - use-sidecar: 1.1.2(@types/react@18.3.3)(react@18.3.1) + use-sidecar: 1.1.3(@types/react@18.3.3)(react@18.3.1) optionalDependencies: '@types/react': 18.3.3 @@ -28782,6 +28792,14 @@ snapshots: optionalDependencies: '@types/react': 18.3.3 + use-sidecar@1.1.3(@types/react@18.3.3)(react@18.3.1): + dependencies: + detect-node-es: 1.1.0 + react: 18.3.1 + tslib: 2.6.3 + optionalDependencies: + '@types/react': 18.3.3 + use-sync-external-store@1.2.0(react@18.3.1): dependencies: react: 18.3.1 @@ -28858,7 +28876,7 @@ snapshots: vaul@1.1.2(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1): dependencies: - '@radix-ui/react-dialog': 1.1.4(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@radix-ui/react-dialog': 1.1.5(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) react: 18.3.1 react-dom: 18.3.1(react@18.3.1) transitivePeerDependencies: