Skip to content

I
interface
Commit 4fede9df authored by Justin Domingue's avatar Justin Domingue Committed by GitHub
Browse files
Options

removed custom keys, part 2 (#1740)

parent fbd5dab5
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 11041 additions and 12193 deletions
src/components/AccountDetails/Copy.tsx
View file @ 4fede9df
...@@ -35,7 +35,7 @@ export default function CopyHelper(props: { toCopy: string; children?: React.Rea ...@@ -35,7 +35,7 @@ export default function CopyHelper(props: { toCopy: string; children?: React.Rea
<TransactionStatusText> <TransactionStatusText>
<CheckCircle size={'16'} /> <CheckCircle size={'16'} />
<TransactionStatusText> <TransactionStatusText>
<Trans id="common.copied">Copied</Trans> <Trans>Copied</Trans>
</TransactionStatusText> </TransactionStatusText>
</TransactionStatusText> </TransactionStatusText>
) : ( ) : (
......
src/components/AccountDetails/index.tsx
View file @ 4fede9df
...@@ -240,7 +240,7 @@ export default function AccountDetails({ ...@@ -240,7 +240,7 @@ export default function AccountDetails({
.map((k) => SUPPORTED_WALLETS[k].name)[0] .map((k) => SUPPORTED_WALLETS[k].name)[0]
return ( return (
<WalletName> <WalletName>
<Trans id="wallet.connectedWith">Connected with {name}</Trans> <Trans>Connected with {name}</Trans>
</WalletName> </WalletName>
) )
} }
...@@ -280,7 +280,7 @@ export default function AccountDetails({ ...@@ -280,7 +280,7 @@ export default function AccountDetails({
portis.portis.showPortis() portis.portis.showPortis()
}} }}
> >
<Trans id="wallet.showPortis">Show Portis</Trans> <Trans>Show Portis</Trans>
</MainWalletAction> </MainWalletAction>
</IconWrapper> </IconWrapper>
</> </>
...@@ -300,7 +300,7 @@ export default function AccountDetails({ ...@@ -300,7 +300,7 @@ export default function AccountDetails({
<CloseColor /> <CloseColor />
</CloseIcon> </CloseIcon>
<HeaderRow> <HeaderRow>
<Trans id="wallet.account">Account</Trans> <Trans>Account</Trans>
</HeaderRow> </HeaderRow>
<AccountSection> <AccountSection>
<YourAccount> <YourAccount>
...@@ -315,7 +315,7 @@ export default function AccountDetails({ ...@@ -315,7 +315,7 @@ export default function AccountDetails({
;(connector as any).close() ;(connector as any).close()
}} }}
> >
<Trans id="wallet.disconnect">Disconnect</Trans> <Trans>Disconnect</Trans>
</WalletAction> </WalletAction>
)} )}
<WalletAction <WalletAction
...@@ -324,7 +324,7 @@ export default function AccountDetails({ ...@@ -324,7 +324,7 @@ export default function AccountDetails({
openOptions() openOptions()
}} }}
> >
<Trans id="wallet.change">Change</Trans> <Trans>Change</Trans>
</WalletAction> </WalletAction>
</div> </div>
</AccountGroupingRow> </AccountGroupingRow>
...@@ -355,7 +355,7 @@ export default function AccountDetails({ ...@@ -355,7 +355,7 @@ export default function AccountDetails({
{account && ( {account && (
<Copy toCopy={account}> <Copy toCopy={account}>
<span style={{ marginLeft: '4px' }}> <span style={{ marginLeft: '4px' }}>
<Trans id="wallet.copyAddress">Copy Address</Trans> <Trans>Copy Address</Trans>
</span> </span>
</Copy> </Copy>
)} )}
...@@ -367,7 +367,7 @@ export default function AccountDetails({ ...@@ -367,7 +367,7 @@ export default function AccountDetails({
> >
<LinkIcon size={16} /> <LinkIcon size={16} />
<span style={{ marginLeft: '4px' }}> <span style={{ marginLeft: '4px' }}>
<Trans id="wallet.viewOnEtherscan">View on Etherscan</Trans> <Trans>View on Etherscan</Trans>
</span> </span>
</AddressLink> </AddressLink>
)} )}
...@@ -381,7 +381,7 @@ export default function AccountDetails({ ...@@ -381,7 +381,7 @@ export default function AccountDetails({
{account && ( {account && (
<Copy toCopy={account}> <Copy toCopy={account}>
<span style={{ marginLeft: '4px' }}> <span style={{ marginLeft: '4px' }}>
<Trans id="wallet.copyAddress">Copy Address</Trans> <Trans>Copy Address</Trans>
</span> </span>
</Copy> </Copy>
)} )}
...@@ -393,7 +393,7 @@ export default function AccountDetails({ ...@@ -393,7 +393,7 @@ export default function AccountDetails({
> >
<LinkIcon size={16} /> <LinkIcon size={16} />
<span style={{ marginLeft: '4px' }}> <span style={{ marginLeft: '4px' }}>
<Trans id="wallet.viewOnEtherscan">View on Etherscan</Trans> <Trans>View on Etherscan</Trans>
</span> </span>
</AddressLink> </AddressLink>
)} )}
...@@ -410,10 +410,10 @@ export default function AccountDetails({ ...@@ -410,10 +410,10 @@ export default function AccountDetails({
<LowerSection> <LowerSection>
<AutoRow mb={'1rem'} style={{ justifyContent: 'space-between' }}> <AutoRow mb={'1rem'} style={{ justifyContent: 'space-between' }}>
<TYPE.body> <TYPE.body>
<Trans id="wallet.recentTransactions">Recent Transactions</Trans> <Trans>Recent Transactions</Trans>
</TYPE.body> </TYPE.body>
<LinkStyledButton onClick={clearAllTransactionsCallback}> <LinkStyledButton onClick={clearAllTransactionsCallback}>
<Trans id="wallet.clearAllTransactions">(clear all)</Trans> <Trans>(clear all)</Trans>
</LinkStyledButton> </LinkStyledButton>
</AutoRow> </AutoRow>
{renderTransactions(pendingTransactions)} {renderTransactions(pendingTransactions)}
...@@ -422,7 +422,7 @@ export default function AccountDetails({ ...@@ -422,7 +422,7 @@ export default function AccountDetails({
) : ( ) : (
<LowerSection> <LowerSection>
<TYPE.body color={theme.text1}> <TYPE.body color={theme.text1}>
<Trans id="wallet.yourTransactionsWillAppearHere">Your transactions will appear here...</Trans> <Trans>Your transactions will appear here...</Trans>
</TYPE.body> </TYPE.body>
</LowerSection> </LowerSection>
)} )}
......
src/components/Blocklist/index.tsx
View file @ 4fede9df
...@@ -17,7 +17,7 @@ export default function Blocklist({ children }: { children: ReactNode }) { ...@@ -17,7 +17,7 @@ export default function Blocklist({ children }: { children: ReactNode }) {
if (blocked) { if (blocked) {
return ( return (
<div> <div>
<Trans id="blocklist.labels.blockedAddress">Blocked address</Trans> <Trans>Blocked address</Trans>
</div> </div>
) )
} }
......
src/components/CurrencyInputPanel/FiatValue.tsx
View file @ 4fede9df
...@@ -26,7 +26,7 @@ export function FiatValue({ ...@@ -26,7 +26,7 @@ export function FiatValue({
return ( return (
<TYPE.body fontSize={14} color={fiatValue ? theme.text2 : theme.text4}> <TYPE.body fontSize={14} color={fiatValue ? theme.text2 : theme.text4}>
{fiatValue ? ( {fiatValue ? (
<Trans id="currencies.labels.fiatValue"> <Trans>
~$ <HoverInlineText text={fiatValue?.toSignificant(6, { groupSeparator: ',' })} /> ~$ <HoverInlineText text={fiatValue?.toSignificant(6, { groupSeparator: ',' })} />
</Trans> </Trans>
) : ( ) : (
...@@ -35,7 +35,7 @@ export function FiatValue({ ...@@ -35,7 +35,7 @@ export function FiatValue({
{priceImpact ? ( {priceImpact ? (
<span style={{ color: priceImpactColor }}> <span style={{ color: priceImpactColor }}>
{' '} {' '}
(<Trans id="numbers.valueWithPercent">{priceImpact.multiply(-1).toSignificant(3)}%</Trans>) (<Trans>{priceImpact.multiply(-1).toSignificant(3)}%</Trans>)
</span> </span>
) : null} ) : null}
</TYPE.body> </TYPE.body>
......
src/components/Header/URLWarning.tsx
View file @ 4fede9df
...@@ -31,7 +31,7 @@ export default function URLWarning() { ...@@ -31,7 +31,7 @@ export default function URLWarning() {
<PhishAlert isActive={showURLWarning}> <PhishAlert isActive={showURLWarning}>
<div style={{ display: 'flex' }}> <div style={{ display: 'flex' }}>
<AlertTriangle style={{ marginRight: 6 }} size={12} /> <AlertTriangle style={{ marginRight: 6 }} size={12} />
<Trans id="phish.urlWarning"> <Trans>
Make sure the URL is Make sure the URL is
<code style={{ padding: '0 4px', display: 'inline', fontWeight: 'bold' }}>app.uniswap.org</code> <code style={{ padding: '0 4px', display: 'inline', fontWeight: 'bold' }}>app.uniswap.org</code>
</Trans> </Trans>
...@@ -42,7 +42,7 @@ export default function URLWarning() { ...@@ -42,7 +42,7 @@ export default function URLWarning() {
<PhishAlert isActive={showURLWarning}> <PhishAlert isActive={showURLWarning}>
<div style={{ display: 'flex' }}> <div style={{ display: 'flex' }}>
<AlertTriangle style={{ marginRight: 6 }} size={12} /> <AlertTriangle style={{ marginRight: 6 }} size={12} />
<Trans id="phish.urlWarningLocationOk"> <Trans>
Always make sure the URL is Always make sure the URL is
<code style={{ padding: '0 4px', display: 'inline', fontWeight: 'bold' }}>app.uniswap.org</code> - bookmark it <code style={{ padding: '0 4px', display: 'inline', fontWeight: 'bold' }}>app.uniswap.org</code> - bookmark it
to be safe. to be safe.
......
src/components/Header/UniBalanceContent.tsx
View file @ 4fede9df
...@@ -67,7 +67,7 @@ export default function UniBalanceContent({ setShowUniBalanceModal }: { setShowU ...@@ -67,7 +67,7 @@ export default function UniBalanceContent({ setShowUniBalanceModal }: { setShowU
<CardSection gap="md"> <CardSection gap="md">
<RowBetween> <RowBetween>
<TYPE.white color="white"> <TYPE.white color="white">
<Trans id="uni.yourUNIBreakdown">Your UNI Breakdown</Trans> <Trans>Your UNI Breakdown</Trans>
</TYPE.white> </TYPE.white>
<StyledClose stroke="white" onClick={() => setShowUniBalanceModal(false)} /> <StyledClose stroke="white" onClick={() => setShowUniBalanceModal(false)} />
</RowBetween> </RowBetween>
...@@ -85,19 +85,19 @@ export default function UniBalanceContent({ setShowUniBalanceModal }: { setShowU ...@@ -85,19 +85,19 @@ export default function UniBalanceContent({ setShowUniBalanceModal }: { setShowU
<AutoColumn gap="md"> <AutoColumn gap="md">
<RowBetween> <RowBetween>
<TYPE.white color="white"> <TYPE.white color="white">
<Trans id="claim.labels.balance">Balance:</Trans> <Trans>Balance:</Trans>
</TYPE.white> </TYPE.white>
<TYPE.white color="white">{uniBalance?.toFixed(2, { groupSeparator: ',' })}</TYPE.white> <TYPE.white color="white">{uniBalance?.toFixed(2, { groupSeparator: ',' })}</TYPE.white>
</RowBetween> </RowBetween>
<RowBetween> <RowBetween>
<TYPE.white color="white"> <TYPE.white color="white">
<Trans id="claim.unclaimed">Unclaimed:</Trans> <Trans>Unclaimed:</Trans>
</TYPE.white> </TYPE.white>
<TYPE.white color="white"> <TYPE.white color="white">
{uniToClaim?.toFixed(4, { groupSeparator: ',' })}{' '} {uniToClaim?.toFixed(4, { groupSeparator: ',' })}{' '}
{uniToClaim && uniToClaim.greaterThan('0') && ( {uniToClaim && uniToClaim.greaterThan('0') && (
<StyledInternalLink onClick={() => setShowUniBalanceModal(false)} to="/uni"> <StyledInternalLink onClick={() => setShowUniBalanceModal(false)} to="/uni">
<Trans id="claim.labels.claim">(claim)</Trans> <Trans>(claim)</Trans>
</StyledInternalLink> </StyledInternalLink>
)} )}
</TYPE.white> </TYPE.white>
...@@ -111,25 +111,25 @@ export default function UniBalanceContent({ setShowUniBalanceModal }: { setShowU ...@@ -111,25 +111,25 @@ export default function UniBalanceContent({ setShowUniBalanceModal }: { setShowU
<AutoColumn gap="md"> <AutoColumn gap="md">
<RowBetween> <RowBetween>
<TYPE.white color="white"> <TYPE.white color="white">
<Trans id="uni.UNIPrice">UNI price:</Trans> <Trans>UNI price:</Trans>
</TYPE.white> </TYPE.white>
<TYPE.white color="white">${uniPrice?.toFixed(2) ?? '-'}</TYPE.white> <TYPE.white color="white">${uniPrice?.toFixed(2) ?? '-'}</TYPE.white>
</RowBetween> </RowBetween>
<RowBetween> <RowBetween>
<TYPE.white color="white"> <TYPE.white color="white">
<Trans id="uni.inCirculation">UNI in circulation:</Trans> <Trans>UNI in circulation:</Trans>
</TYPE.white> </TYPE.white>
<TYPE.white color="white">{circulation?.toFixed(0, { groupSeparator: ',' })}</TYPE.white> <TYPE.white color="white">{circulation?.toFixed(0, { groupSeparator: ',' })}</TYPE.white>
</RowBetween> </RowBetween>
<RowBetween> <RowBetween>
<TYPE.white color="white"> <TYPE.white color="white">
<Trans id="uni.totalSupply">Total Supply</Trans> <Trans>Total Supply</Trans>
</TYPE.white> </TYPE.white>
<TYPE.white color="white">{totalSupply?.toFixed(0, { groupSeparator: ',' })}</TYPE.white> <TYPE.white color="white">{totalSupply?.toFixed(0, { groupSeparator: ',' })}</TYPE.white>
</RowBetween> </RowBetween>
{uni && uni.chainId === 1 ? ( {uni && uni.chainId === 1 ? (
<ExternalLink href={`https://info.uniswap.org/token/${uni.address}`}> <ExternalLink href={`https://info.uniswap.org/token/${uni.address}`}>
<Trans id="uni.viewAnalytics">View UNI Analytics</Trans> <Trans>View UNI Analytics</Trans>
</ExternalLink> </ExternalLink>
) : null} ) : null}
</AutoColumn> </AutoColumn>
......
src/components/InputStepCounter/InputStepCounter.tsx
View file @ 4fede9df
...@@ -140,7 +140,7 @@ const StepCounter = ({ ...@@ -140,7 +140,7 @@ const StepCounter = ({
}} }}
/> />
<InputTitle fontSize={12} textAlign="center"> <InputTitle fontSize={12} textAlign="center">
<Trans id="currencies.denominated"> <Trans>
{tokenB} per {tokenA} {tokenB} per {tokenA}
</Trans> </Trans>
</InputTitle> </InputTitle>
...@@ -149,12 +149,12 @@ const StepCounter = ({ ...@@ -149,12 +149,12 @@ const StepCounter = ({
<RowBetween> <RowBetween>
<SmallButton onClick={handleDecrement}> <SmallButton onClick={handleDecrement}>
<TYPE.white fontSize="12px"> <TYPE.white fontSize="12px">
<Trans id="inputs.feeAmount.minus">-{feeAmountFormatted}%</Trans> <Trans>-{feeAmountFormatted}%</Trans>
</TYPE.white> </TYPE.white>
</SmallButton> </SmallButton>
<SmallButton onClick={handleIncrement}> <SmallButton onClick={handleIncrement}>
<TYPE.white fontSize="12px"> <TYPE.white fontSize="12px">
<Trans id="inputs.feeAmount.plus">+{feeAmountFormatted}%</Trans> <Trans>+{feeAmountFormatted}%</Trans>
</TYPE.white> </TYPE.white>
</SmallButton> </SmallButton>
</RowBetween> </RowBetween>
......
src/components/Menu/index.tsx
View file @ 4fede9df
...@@ -144,36 +144,36 @@ export default function Menu() { ...@@ -144,36 +144,36 @@ export default function Menu() {
<MenuItem href="https://uniswap.org/"> <MenuItem href="https://uniswap.org/">
<Info size={14} /> <Info size={14} />
<div> <div>
<Trans id="menu.about">About</Trans> <Trans>About</Trans>
</div> </div>
</MenuItem> </MenuItem>
<MenuItem href="https://docs.uniswap.org/"> <MenuItem href="https://docs.uniswap.org/">
<BookOpen size={14} /> <BookOpen size={14} />
<div> <div>
<Trans id="menu.docs">Docs</Trans> <Trans>Docs</Trans>
</div> </div>
</MenuItem> </MenuItem>
<MenuItem href={CODE_LINK}> <MenuItem href={CODE_LINK}>
<Code size={14} /> <Code size={14} />
<div> <div>
<Trans id="menu.code">Code</Trans> <Trans>Code</Trans>
</div> </div>
</MenuItem> </MenuItem>
<MenuItem href="https://discord.gg/FCfyBSbCU5"> <MenuItem href="https://discord.gg/FCfyBSbCU5">
<MessageCircle size={14} /> <MessageCircle size={14} />
<div> <div>
<Trans id="menu.discord">Discord</Trans> <Trans>Discord</Trans>
</div> </div>
</MenuItem> </MenuItem>
<MenuItem href="https://info.uniswap.org/"> <MenuItem href="https://info.uniswap.org/">
<PieChart size={14} /> <PieChart size={14} />
<div> <div>
<Trans id="menu.analytics">Analytics</Trans> <Trans>Analytics</Trans>
</div> </div>
</MenuItem> </MenuItem>
{account && ( {account && (
<UNIbutton onClick={openClaimModal} padding="8px 16px" width="100%" borderRadius="12px" mt="0.5rem"> <UNIbutton onClick={openClaimModal} padding="8px 16px" width="100%" borderRadius="12px" mt="0.5rem">
<Trans id="claim.buttons.claimUNI">Claim UNI</Trans> <Trans>Claim UNI</Trans>
</UNIbutton> </UNIbutton>
)} )}
</MenuFlyout> </MenuFlyout>
......
src/components/ModalViews/index.tsx
View file @ 4fede9df
...@@ -34,7 +34,7 @@ export function LoadingView({ children, onDismiss }: { children: any; onDismiss: ...@@ -34,7 +34,7 @@ export function LoadingView({ children, onDismiss }: { children: any; onDismiss:
<AutoColumn gap="100px" justify={'center'}> <AutoColumn gap="100px" justify={'center'}>
{children} {children}
<TYPE.subHeader> <TYPE.subHeader>
<Trans id="wallet.confirmTransaction">Confirm this transaction in your wallet</Trans> <Trans>Confirm this transaction in your wallet</Trans>
</TYPE.subHeader> </TYPE.subHeader>
</AutoColumn> </AutoColumn>
</ConfirmOrLoadingWrapper> </ConfirmOrLoadingWrapper>
...@@ -70,7 +70,7 @@ export function SubmittedView({ ...@@ -70,7 +70,7 @@ export function SubmittedView({
style={{ marginLeft: '4px' }} style={{ marginLeft: '4px' }}
> >
<TYPE.subHeader> <TYPE.subHeader>
<Trans id="transaction.viewOnEherscan">View transaction on Etherscan</Trans> <Trans>View transaction on Etherscan</Trans>
</TYPE.subHeader> </TYPE.subHeader>
</ExternalLink> </ExternalLink>
)} )}
......
src/components/PositionCard/Sushi.tsx
View file @ 4fede9df
...@@ -51,7 +51,7 @@ export default function SushiPositionCard({ tokenA, tokenB, liquidityToken, bord ...@@ -51,7 +51,7 @@ export default function SushiPositionCard({ tokenA, tokenB, liquidityToken, bord
<Text fontWeight={500} fontSize={20}> <Text fontWeight={500} fontSize={20}>
{!currency0 || !currency1 ? ( {!currency0 || !currency1 ? (
<Dots> <Dots>
<Trans id="common.loading">Loading</Trans> <Trans>Loading</Trans>
</Dots> </Dots>
) : ( ) : (
`${currency0.symbol}/${currency1.symbol}` `${currency0.symbol}/${currency1.symbol}`
...@@ -68,7 +68,7 @@ export default function SushiPositionCard({ tokenA, tokenB, liquidityToken, bord ...@@ -68,7 +68,7 @@ export default function SushiPositionCard({ tokenA, tokenB, liquidityToken, bord
as={Link} as={Link}
to={`/migrate/v2/${liquidityToken.address}`} to={`/migrate/v2/${liquidityToken.address}`}
> >
<Trans id="pools.buttons.migrate">Migrate</Trans> <Trans>Migrate</Trans>
</ButtonEmpty> </ButtonEmpty>
</RowFixed> </RowFixed>
</FixedHeightRow> </FixedHeightRow>
......
src/components/PositionCard/V2.tsx
View file @ 4fede9df
...@@ -88,7 +88,7 @@ export default function V2PositionCard({ pair, border, stakedBalance }: Position ...@@ -88,7 +88,7 @@ export default function V2PositionCard({ pair, border, stakedBalance }: Position
<Text fontWeight={500} fontSize={20}> <Text fontWeight={500} fontSize={20}>
{!currency0 || !currency1 ? ( {!currency0 || !currency1 ? (
<Dots> <Dots>
<Trans id="common.loading">Loading</Trans> <Trans>Loading</Trans>
</Dots> </Dots>
) : ( ) : (
`${currency0.symbol}/${currency1.symbol}` `${currency0.symbol}/${currency1.symbol}`
...@@ -104,12 +104,12 @@ export default function V2PositionCard({ pair, border, stakedBalance }: Position ...@@ -104,12 +104,12 @@ export default function V2PositionCard({ pair, border, stakedBalance }: Position
> >
{showMore ? ( {showMore ? (
<> <>
<Trans id="pools.buttons.manage">Manage</Trans> <Trans>Manage</Trans>
<ChevronUp size="20" style={{ marginLeft: '10px' }} /> <ChevronUp size="20" style={{ marginLeft: '10px' }} />
</> </>
) : ( ) : (
<> <>
<Trans id="pools.buttons.manage">Manage</Trans> <Trans>Manage</Trans>
<ChevronDown size="20" style={{ marginLeft: '10px' }} /> <ChevronDown size="20" style={{ marginLeft: '10px' }} />
</> </>
)} )}
...@@ -121,7 +121,7 @@ export default function V2PositionCard({ pair, border, stakedBalance }: Position ...@@ -121,7 +121,7 @@ export default function V2PositionCard({ pair, border, stakedBalance }: Position
<AutoColumn gap="8px"> <AutoColumn gap="8px">
<FixedHeightRow> <FixedHeightRow>
<Text fontSize={16} fontWeight={500}> <Text fontSize={16} fontWeight={500}>
<Trans id="pool.yourTotalPoolTokens">Your total pool tokens:</Trans> <Trans>Your total pool tokens:</Trans>
</Text> </Text>
<Text fontSize={16} fontWeight={500}> <Text fontSize={16} fontWeight={500}>
{userPoolBalance ? userPoolBalance.toSignificant(4) : '-'} {userPoolBalance ? userPoolBalance.toSignificant(4) : '-'}
...@@ -130,7 +130,7 @@ export default function V2PositionCard({ pair, border, stakedBalance }: Position ...@@ -130,7 +130,7 @@ export default function V2PositionCard({ pair, border, stakedBalance }: Position
{stakedBalance && ( {stakedBalance && (
<FixedHeightRow> <FixedHeightRow>
<Text fontSize={16} fontWeight={500}> <Text fontSize={16} fontWeight={500}>
<Trans id="pool.poolTokensInRewardsPool">Pool tokens in rewards pool:</Trans> <Trans>Pool tokens in rewards pool:</Trans>
</Text> </Text>
<Text fontSize={16} fontWeight={500}> <Text fontSize={16} fontWeight={500}>
{stakedBalance.toSignificant(4)} {stakedBalance.toSignificant(4)}
...@@ -140,7 +140,7 @@ export default function V2PositionCard({ pair, border, stakedBalance }: Position ...@@ -140,7 +140,7 @@ export default function V2PositionCard({ pair, border, stakedBalance }: Position
<FixedHeightRow> <FixedHeightRow>
<RowFixed> <RowFixed>
<Text fontSize={16} fontWeight={500}> <Text fontSize={16} fontWeight={500}>
<Trans id="pool.pooledCurrency">Pooled {currency0.symbol}:</Trans> <Trans>Pooled {currency0.symbol}:</Trans>
</Text> </Text>
</RowFixed> </RowFixed>
{token0Deposited ? ( {token0Deposited ? (
...@@ -158,7 +158,7 @@ export default function V2PositionCard({ pair, border, stakedBalance }: Position ...@@ -158,7 +158,7 @@ export default function V2PositionCard({ pair, border, stakedBalance }: Position
<FixedHeightRow> <FixedHeightRow>
<RowFixed> <RowFixed>
<Text fontSize={16} fontWeight={500}> <Text fontSize={16} fontWeight={500}>
<Trans id="pool.pooledCurrency"></Trans>Pooled {currency1.symbol}: <Trans>Pooled {currency1.symbol}:</Trans>
</Text> </Text>
</RowFixed> </RowFixed>
{token1Deposited ? ( {token1Deposited ? (
...@@ -175,7 +175,7 @@ export default function V2PositionCard({ pair, border, stakedBalance }: Position ...@@ -175,7 +175,7 @@ export default function V2PositionCard({ pair, border, stakedBalance }: Position
<FixedHeightRow> <FixedHeightRow>
<Text fontSize={16} fontWeight={500}> <Text fontSize={16} fontWeight={500}>
<Trans id="pool.yourPoolShare">Your pool share:</Trans> <Trans>Your pool share:</Trans>
</Text> </Text>
<Text fontSize={16} fontWeight={500}> <Text fontSize={16} fontWeight={500}>
{poolTokenPercentage {poolTokenPercentage
...@@ -193,7 +193,7 @@ export default function V2PositionCard({ pair, border, stakedBalance }: Position ...@@ -193,7 +193,7 @@ export default function V2PositionCard({ pair, border, stakedBalance }: Position
to={`/migrate/v2/${pair.liquidityToken.address}`} to={`/migrate/v2/${pair.liquidityToken.address}`}
width="64%" width="64%"
> >
<Trans id="pools.buttons.migrate">Migrate</Trans> <Trans>Migrate</Trans>
</ButtonPrimary> </ButtonPrimary>
<ButtonSecondary <ButtonSecondary
padding="8px" padding="8px"
...@@ -202,7 +202,7 @@ export default function V2PositionCard({ pair, border, stakedBalance }: Position ...@@ -202,7 +202,7 @@ export default function V2PositionCard({ pair, border, stakedBalance }: Position
width="32%" width="32%"
to={`/remove/v2/${currencyId(currency0)}/${currencyId(currency1)}`} to={`/remove/v2/${currencyId(currency0)}/${currencyId(currency1)}`}
> >
<Trans id="butons.remove">Remove</Trans> <Trans>Remove</Trans>
</ButtonSecondary> </ButtonSecondary>
</RowBetween> </RowBetween>
)} )}
......
src/components/PositionCard/index.tsx
View file @ 4fede9df
...@@ -92,7 +92,7 @@ export function MinimalPositionCard({ pair, showUnwrapped = false, border }: Pos ...@@ -92,7 +92,7 @@ export function MinimalPositionCard({ pair, showUnwrapped = false, border }: Pos
<FixedHeightRow> <FixedHeightRow>
<RowFixed> <RowFixed>
<Text fontWeight={500} fontSize={16}> <Text fontWeight={500} fontSize={16}>
<Trans id="pool.yourPosition">Your position</Trans> <Trans>Your position</Trans>
</Text> </Text>
</RowFixed> </RowFixed>
</FixedHeightRow> </FixedHeightRow>
...@@ -112,7 +112,7 @@ export function MinimalPositionCard({ pair, showUnwrapped = false, border }: Pos ...@@ -112,7 +112,7 @@ export function MinimalPositionCard({ pair, showUnwrapped = false, border }: Pos
<AutoColumn gap="4px"> <AutoColumn gap="4px">
<FixedHeightRow> <FixedHeightRow>
<Text fontSize={16} fontWeight={500}> <Text fontSize={16} fontWeight={500}>
<Trans id="pool.yourPoolShare">Your pool share:</Trans> <Trans>Your pool share:</Trans>
</Text> </Text>
<Text fontSize={16} fontWeight={500}> <Text fontSize={16} fontWeight={500}>
{poolTokenPercentage ? poolTokenPercentage.toFixed(6) + '%' : '-'} {poolTokenPercentage ? poolTokenPercentage.toFixed(6) + '%' : '-'}
...@@ -155,7 +155,7 @@ export function MinimalPositionCard({ pair, showUnwrapped = false, border }: Pos ...@@ -155,7 +155,7 @@ export function MinimalPositionCard({ pair, showUnwrapped = false, border }: Pos
<span role="img" aria-label="wizard-icon"> <span role="img" aria-label="wizard-icon">
⭐️ ⭐️
</span>{' '} </span>{' '}
<Trans id="pool.noLiquidityHint"> <Trans>
By adding liquidity you&apos;ll earn 0.3% of all trades on this pair proportional to your share of the By adding liquidity you&apos;ll earn 0.3% of all trades on this pair proportional to your share of the
pool. Fees are added to the pool, accrue in real time and can be claimed by withdrawing your liquidity. pool. Fees are added to the pool, accrue in real time and can be claimed by withdrawing your liquidity.
</Trans>{' '} </Trans>{' '}
...@@ -211,7 +211,7 @@ export default function FullPositionCard({ pair, border, stakedBalance }: Positi ...@@ -211,7 +211,7 @@ export default function FullPositionCard({ pair, border, stakedBalance }: Positi
<Text fontWeight={500} fontSize={20}> <Text fontWeight={500} fontSize={20}>
{!currency0 || !currency1 ? ( {!currency0 || !currency1 ? (
<Dots> <Dots>
<Trans id="common.loading">Loading</Trans> <Trans>Loading</Trans>
</Dots> </Dots>
) : ( ) : (
`${currency0.symbol}/${currency1.symbol}` `${currency0.symbol}/${currency1.symbol}`
...@@ -222,12 +222,12 @@ export default function FullPositionCard({ pair, border, stakedBalance }: Positi ...@@ -222,12 +222,12 @@ export default function FullPositionCard({ pair, border, stakedBalance }: Positi
<ButtonEmpty padding="6px 8px" borderRadius="12px" width="100%" onClick={() => setShowMore(!showMore)}> <ButtonEmpty padding="6px 8px" borderRadius="12px" width="100%" onClick={() => setShowMore(!showMore)}>
{showMore ? ( {showMore ? (
<> <>
<Trans id="pools.buttons.manage">Manage</Trans> <Trans>Manage</Trans>
<ChevronUp size="20" style={{ marginLeft: '8px', height: '20px', minWidth: '20px' }} /> <ChevronUp size="20" style={{ marginLeft: '8px', height: '20px', minWidth: '20px' }} />
</> </>
) : ( ) : (
<> <>
<Trans id="pools.buttons.manage">Manage</Trans> <Trans>Manage</Trans>
<ChevronDown size="20" style={{ marginLeft: '8px', height: '20px', minWidth: '20px' }} /> <ChevronDown size="20" style={{ marginLeft: '8px', height: '20px', minWidth: '20px' }} />
</> </>
)} )}
...@@ -239,7 +239,7 @@ export default function FullPositionCard({ pair, border, stakedBalance }: Positi ...@@ -239,7 +239,7 @@ export default function FullPositionCard({ pair, border, stakedBalance }: Positi
<AutoColumn gap="8px"> <AutoColumn gap="8px">
<FixedHeightRow> <FixedHeightRow>
<Text fontSize={16} fontWeight={500}> <Text fontSize={16} fontWeight={500}>
<Trans id="pool.yourTotalPoolTokens">Your total pool tokens:</Trans> <Trans>Your total pool tokens:</Trans>
</Text> </Text>
<Text fontSize={16} fontWeight={500}> <Text fontSize={16} fontWeight={500}>
{userPoolBalance ? userPoolBalance.toSignificant(4) : '-'} {userPoolBalance ? userPoolBalance.toSignificant(4) : '-'}
...@@ -248,7 +248,7 @@ export default function FullPositionCard({ pair, border, stakedBalance }: Positi ...@@ -248,7 +248,7 @@ export default function FullPositionCard({ pair, border, stakedBalance }: Positi
{stakedBalance && ( {stakedBalance && (
<FixedHeightRow> <FixedHeightRow>
<Text fontSize={16} fontWeight={500}> <Text fontSize={16} fontWeight={500}>
<Trans id="pool.poolTokensInRewardsPool">Pool tokens in rewards pool:</Trans> <Trans>Pool tokens in rewards pool:</Trans>
</Text> </Text>
<Text fontSize={16} fontWeight={500}> <Text fontSize={16} fontWeight={500}>
{stakedBalance.toSignificant(4)} {stakedBalance.toSignificant(4)}
...@@ -258,7 +258,7 @@ export default function FullPositionCard({ pair, border, stakedBalance }: Positi ...@@ -258,7 +258,7 @@ export default function FullPositionCard({ pair, border, stakedBalance }: Positi
<FixedHeightRow> <FixedHeightRow>
<RowFixed> <RowFixed>
<Text fontSize={16} fontWeight={500}> <Text fontSize={16} fontWeight={500}>
<Trans id="pool.pooledCurrency">Pooled {currency0.symbol}:</Trans> <Trans>Pooled {currency0.symbol}:</Trans>
</Text> </Text>
</RowFixed> </RowFixed>
{token0Deposited ? ( {token0Deposited ? (
...@@ -276,7 +276,7 @@ export default function FullPositionCard({ pair, border, stakedBalance }: Positi ...@@ -276,7 +276,7 @@ export default function FullPositionCard({ pair, border, stakedBalance }: Positi
<FixedHeightRow> <FixedHeightRow>
<RowFixed> <RowFixed>
<Text fontSize={16} fontWeight={500}> <Text fontSize={16} fontWeight={500}>
<Trans id="pool.pooledCurrency">Pooled {currency1.symbol}:</Trans> <Trans>Pooled {currency1.symbol}:</Trans>
</Text> </Text>
</RowFixed> </RowFixed>
{token1Deposited ? ( {token1Deposited ? (
...@@ -293,11 +293,11 @@ export default function FullPositionCard({ pair, border, stakedBalance }: Positi ...@@ -293,11 +293,11 @@ export default function FullPositionCard({ pair, border, stakedBalance }: Positi
<FixedHeightRow> <FixedHeightRow>
<Text fontSize={16} fontWeight={500}> <Text fontSize={16} fontWeight={500}>
<Trans id="pool.yourPoolShare">Your pool share:</Trans> <Trans>Your pool share:</Trans>
</Text> </Text>
<Text fontSize={16} fontWeight={500}> <Text fontSize={16} fontWeight={500}>
{poolTokenPercentage ? ( {poolTokenPercentage ? (
<Trans id="numbers.valueWithPercent"> <Trans>
{poolTokenPercentage.toFixed(2) === '0.00' ? '<0.01' : poolTokenPercentage.toFixed(2)} % {poolTokenPercentage.toFixed(2) === '0.00' ? '<0.01' : poolTokenPercentage.toFixed(2)} %
</Trans> </Trans>
) : ( ) : (
...@@ -311,7 +311,7 @@ export default function FullPositionCard({ pair, border, stakedBalance }: Positi ...@@ -311,7 +311,7 @@ export default function FullPositionCard({ pair, border, stakedBalance }: Positi
style={{ width: '100%', textAlign: 'center' }} style={{ width: '100%', textAlign: 'center' }}
href={`https://v2.info.uniswap.org/account/${account}`} href={`https://v2.info.uniswap.org/account/${account}`}
> >
<Trans id="links.viewAccruedFees"> <Trans>
View accrued fees and analytics<span style={{ fontSize: '11px' }}>↗</span> View accrued fees and analytics<span style={{ fontSize: '11px' }}>↗</span>
</Trans> </Trans>
</ExternalLink> </ExternalLink>
...@@ -325,7 +325,7 @@ export default function FullPositionCard({ pair, border, stakedBalance }: Positi ...@@ -325,7 +325,7 @@ export default function FullPositionCard({ pair, border, stakedBalance }: Positi
to={`/migrate/v2/${pair.liquidityToken.address}`} to={`/migrate/v2/${pair.liquidityToken.address}`}
width="32%" width="32%"
> >
<Trans id="pools.buttons.migrate">Migrate</Trans> <Trans>Migrate</Trans>
</ButtonPrimary> </ButtonPrimary>
<ButtonPrimary <ButtonPrimary
padding="8px" padding="8px"
...@@ -334,7 +334,7 @@ export default function FullPositionCard({ pair, border, stakedBalance }: Positi ...@@ -334,7 +334,7 @@ export default function FullPositionCard({ pair, border, stakedBalance }: Positi
to={`/add/v2/${currencyId(currency0)}/${currencyId(currency1)}`} to={`/add/v2/${currencyId(currency0)}/${currencyId(currency1)}`}
width="32%" width="32%"
> >
<Trans id="pools.buttons.add">Add</Trans> <Trans>Add</Trans>
</ButtonPrimary> </ButtonPrimary>
<ButtonPrimary <ButtonPrimary
padding="8px" padding="8px"
...@@ -343,7 +343,7 @@ export default function FullPositionCard({ pair, border, stakedBalance }: Positi ...@@ -343,7 +343,7 @@ export default function FullPositionCard({ pair, border, stakedBalance }: Positi
width="32%" width="32%"
to={`/remove/v2/${currencyId(currency0)}/${currencyId(currency1)}`} to={`/remove/v2/${currencyId(currency0)}/${currencyId(currency1)}`}
> >
<Trans id="butons.remove">Remove</Trans> <Trans>Remove</Trans>
</ButtonPrimary> </ButtonPrimary>
</RowBetween> </RowBetween>
)} )}
...@@ -355,7 +355,7 @@ export default function FullPositionCard({ pair, border, stakedBalance }: Positi ...@@ -355,7 +355,7 @@ export default function FullPositionCard({ pair, border, stakedBalance }: Positi
to={`/uni/${currencyId(currency0)}/${currencyId(currency1)}`} to={`/uni/${currencyId(currency0)}/${currencyId(currency1)}`}
width="100%" width="100%"
> >
<Trans id="pools.buttons.manageLiquidityInRewardsPool">Manage Liquidity in Rewards Pool</Trans> <Trans>Manage Liquidity in Rewards Pool</Trans>
</ButtonPrimary> </ButtonPrimary>
)} )}
</AutoColumn> </AutoColumn>
......
src/components/PositionListItem/index.tsx
View file @ 4fede9df
...@@ -225,7 +225,7 @@ export default function PositionListItem({ positionDetails }: PositionListItemPr ...@@ -225,7 +225,7 @@ export default function PositionListItem({ positionDetails }: PositionListItemPr
&nbsp; &nbsp;
<Badge> <Badge>
<BadgeText> <BadgeText>
<Trans id="numbers.valueWithPercent">{new Percent(feeAmount, 1_000_000).toSignificant()}%</Trans> <Trans>{new Percent(feeAmount, 1_000_000).toSignificant()}%</Trans>
</BadgeText> </BadgeText>
</Badge> </Badge>
</PrimaryPositionIdData> </PrimaryPositionIdData>
...@@ -236,9 +236,9 @@ export default function PositionListItem({ positionDetails }: PositionListItemPr ...@@ -236,9 +236,9 @@ export default function PositionListItem({ positionDetails }: PositionListItemPr
<RangeLineItem> <RangeLineItem>
<RangeText> <RangeText>
<ExtentsText> <ExtentsText>
<Trans id="pools.labels.min">Min: </Trans> <Trans>Min: </Trans>
</ExtentsText> </ExtentsText>
<Trans id="currencies.denominatedWithValue"> <Trans>
{formatPrice(priceLower, 5)} <HoverInlineText text={currencyQuote?.symbol} /> per{' '} {formatPrice(priceLower, 5)} <HoverInlineText text={currencyQuote?.symbol} /> per{' '}
<HoverInlineText text={currencyBase?.symbol ?? ''} /> <HoverInlineText text={currencyBase?.symbol ?? ''} />
</Trans> </Trans>
...@@ -251,9 +251,9 @@ export default function PositionListItem({ positionDetails }: PositionListItemPr ...@@ -251,9 +251,9 @@ export default function PositionListItem({ positionDetails }: PositionListItemPr
</SmallOnly> </SmallOnly>
<RangeText> <RangeText>
<ExtentsText> <ExtentsText>
<Trans id="pools.labels.max">Max:</Trans> <Trans>Max:</Trans>
</ExtentsText> </ExtentsText>
<Trans id="currencies.denominatedWithValue"> <Trans>
{formatPrice(priceUpper, 5)} <HoverInlineText text={currencyQuote?.symbol} /> per{' '} {formatPrice(priceUpper, 5)} <HoverInlineText text={currencyQuote?.symbol} /> per{' '}
<HoverInlineText maxCharacters={10} text={currencyBase?.symbol} /> <HoverInlineText maxCharacters={10} text={currencyBase?.symbol} />
</Trans> </Trans>
......
src/components/SearchModal/ImportRow.tsx
View file @ 4fede9df
...@@ -74,7 +74,7 @@ export default function ImportRow({ ...@@ -74,7 +74,7 @@ export default function ImportRow({
{list && list.logoURI && ( {list && list.logoURI && (
<RowFixed> <RowFixed>
<TYPE.small mr="4px" color={theme.text3}> <TYPE.small mr="4px" color={theme.text3}>
<Trans id="tokenLists.via">via {list.name} </Trans> <Trans>via {list.name} </Trans>
</TYPE.small> </TYPE.small>
<ListLogo logoURI={list.logoURI} size="12px" /> <ListLogo logoURI={list.logoURI} size="12px" />
</RowFixed> </RowFixed>
...@@ -91,13 +91,13 @@ export default function ImportRow({ ...@@ -91,13 +91,13 @@ export default function ImportRow({
showImportView() showImportView()
}} }}
> >
<Trans id="tokensLists.buttons.import">Import</Trans> <Trans>Import</Trans>
</ButtonPrimary> </ButtonPrimary>
) : ( ) : (
<RowFixed style={{ minWidth: 'fit-content' }}> <RowFixed style={{ minWidth: 'fit-content' }}>
<CheckIcon /> <CheckIcon />
<TYPE.main color={theme.green1}> <TYPE.main color={theme.green1}>
<Trans id="tokenLists.labels.active">Active</Trans> <Trans>Active</Trans>
</TYPE.main> </TYPE.main>
</RowFixed> </RowFixed>
)} )}
......
src/components/SearchModal/ManageLists.tsx
View file @ 4fede9df
...@@ -174,7 +174,7 @@ const ListRow = memo(function ListRow({ listUrl }: { listUrl: string }) { ...@@ -174,7 +174,7 @@ const ListRow = memo(function ListRow({ listUrl }: { listUrl: string }) {
</Row> </Row>
<RowFixed mt="4px"> <RowFixed mt="4px">
<StyledListUrlText active={isActive} mr="6px"> <StyledListUrlText active={isActive} mr="6px">
<Trans id="tokenLists.numberOfTokens">{list.tokens.length} tokens</Trans> <Trans>{list.tokens.length} tokens</Trans>
</StyledListUrlText> </StyledListUrlText>
<StyledMenu ref={node as any}> <StyledMenu ref={node as any}>
<ButtonEmpty onClick={toggle} ref={setReferenceElement} padding="0"> <ButtonEmpty onClick={toggle} ref={setReferenceElement} padding="0">
...@@ -185,14 +185,14 @@ const ListRow = memo(function ListRow({ listUrl }: { listUrl: string }) { ...@@ -185,14 +185,14 @@ const ListRow = memo(function ListRow({ listUrl }: { listUrl: string }) {
<div>{list && listVersionLabel(list.version)}</div> <div>{list && listVersionLabel(list.version)}</div>
<SeparatorDark /> <SeparatorDark />
<ExternalLink href={`https://tokenlists.org/token-list?url=${listUrl}`}> <ExternalLink href={`https://tokenlists.org/token-list?url=${listUrl}`}>
<Trans id="tokenLists.links.viewList">View list</Trans> <Trans>View list</Trans>
</ExternalLink> </ExternalLink>
<UnpaddedLinkStyledButton onClick={handleRemoveList} disabled={Object.keys(listsByUrl).length === 1}> <UnpaddedLinkStyledButton onClick={handleRemoveList} disabled={Object.keys(listsByUrl).length === 1}>
<Trans id="tokenLists.buttons.removeList">Remove list</Trans> <Trans>Remove list</Trans>
</UnpaddedLinkStyledButton> </UnpaddedLinkStyledButton>
{pending && ( {pending && (
<UnpaddedLinkStyledButton onClick={handleAcceptListUpdate}> <UnpaddedLinkStyledButton onClick={handleAcceptListUpdate}>
<Trans id="tokenLists.buttons.updateLists">Update list</Trans> <Trans>Update list</Trans>
</UnpaddedLinkStyledButton> </UnpaddedLinkStyledButton>
)} )}
</PopoverContainer> </PopoverContainer>
...@@ -292,15 +292,14 @@ export function ManageLists({ ...@@ -292,15 +292,14 @@ export function ManageLists({
async function fetchTempList() { async function fetchTempList() {
fetchList(listUrlInput, false) fetchList(listUrlInput, false)
.then((list) => setTempList(list)) .then((list) => setTempList(list))
.catch(() => setAddError(t({ id: 'tokenLists.errors.importingList', message: 'Error importing list' }))) .catch(() => setAddError(t`Error importing list`))
} }
// if valid url, fetch details for card // if valid url, fetch details for card
if (validUrl) { if (validUrl) {
fetchTempList() fetchTempList()
} else { } else {
setTempList(undefined) setTempList(undefined)
listUrlInput !== '' && listUrlInput !== '' && setAddError(t`Enter valid list location`)
setAddError(t({ id: 'tokenList.errors.invalidLocation', message: 'Enter valid list location' }))
} }
// reset error // reset error
...@@ -355,7 +354,7 @@ export function ManageLists({ ...@@ -355,7 +354,7 @@ export function ManageLists({
<CheckCircle /> <CheckCircle />
</IconWrapper> </IconWrapper>
<TYPE.body color={theme.text2}> <TYPE.body color={theme.text2}>
<Trans id="common.loaded">Loaded</Trans> <Trans>Loaded</Trans>
</TYPE.body> </TYPE.body>
</RowFixed> </RowFixed>
) : ( ) : (
...@@ -365,7 +364,7 @@ export function ManageLists({ ...@@ -365,7 +364,7 @@ export function ManageLists({
width="fit-content" width="fit-content"
onClick={handleImport} onClick={handleImport}
> >
<Trans id="tokenLists.buttons.import">Import</Trans> <Trans>Import</Trans>
</ButtonPrimary> </ButtonPrimary>
)} )}
</RowBetween> </RowBetween>
......
src/components/SearchModal/ManageTokens.tsx
View file @ 4fede9df
...@@ -112,7 +112,7 @@ export default function ManageTokens({ ...@@ -112,7 +112,7 @@ export default function ManageTokens({
</Row> </Row>
{searchQuery !== '' && !isAddressSearch && ( {searchQuery !== '' && !isAddressSearch && (
<TYPE.error error={true}> <TYPE.error error={true}>
<Trans id="tokenLists.input.enterValidAddress">Enter valid token address</Trans> <Trans>Enter valid token address</Trans>
</TYPE.error> </TYPE.error>
)} )}
{searchToken && ( {searchToken && (
...@@ -136,7 +136,7 @@ export default function ManageTokens({ ...@@ -136,7 +136,7 @@ export default function ManageTokens({
{userAddedTokens.length > 0 && ( {userAddedTokens.length > 0 && (
<ButtonText onClick={handleRemoveAll}> <ButtonText onClick={handleRemoveAll}>
<TYPE.blue> <TYPE.blue>
<Trans id="common.clearAll">Clear all</Trans> <Trans>Clear all</Trans>
</TYPE.blue> </TYPE.blue>
</ButtonText> </ButtonText>
)} )}
...@@ -146,7 +146,7 @@ export default function ManageTokens({ ...@@ -146,7 +146,7 @@ export default function ManageTokens({
</Column> </Column>
<Footer> <Footer>
<TYPE.darkGray> <TYPE.darkGray>
<Trans id="tokenLists.manageHint">Tip: Custom tokens are stored locally in your browser</Trans> <Trans>Tip: Custom tokens are stored locally in your browser</Trans>
</TYPE.darkGray> </TYPE.darkGray>
</Footer> </Footer>
</Wrapper> </Wrapper>
......
src/components/TransactionConfirmationModal/index.tsx
View file @ 4fede9df
...@@ -62,7 +62,7 @@ export function ConfirmationPendingContent({ ...@@ -62,7 +62,7 @@ export function ConfirmationPendingContent({
</ConfirmedIcon> </ConfirmedIcon>
<AutoColumn gap="12px" justify={'center'}> <AutoColumn gap="12px" justify={'center'}>
<Text fontWeight={500} fontSize={20} textAlign="center"> <Text fontWeight={500} fontSize={20} textAlign="center">
<Trans id="transactions.waitingForConfirmation">Waiting For Confirmation</Trans> <Trans>Waiting For Confirmation</Trans>
</Text> </Text>
<AutoColumn gap="12px" justify={'center'}> <AutoColumn gap="12px" justify={'center'}>
<Text fontWeight={600} fontSize={14} color="" textAlign="center"> <Text fontWeight={600} fontSize={14} color="" textAlign="center">
...@@ -70,7 +70,7 @@ export function ConfirmationPendingContent({ ...@@ -70,7 +70,7 @@ export function ConfirmationPendingContent({
</Text> </Text>
</AutoColumn> </AutoColumn>
<Text fontSize={12} color="#565A69" textAlign="center" marginBottom={12}> <Text fontSize={12} color="#565A69" textAlign="center" marginBottom={12}>
<Trans id="transactions.confirmInWallet">Confirm this transaction in your wallet</Trans> <Trans>Confirm this transaction in your wallet</Trans>
</Text> </Text>
</AutoColumn> </AutoColumn>
</AutoColumn> </AutoColumn>
...@@ -111,12 +111,12 @@ export function TransactionSubmittedContent({ ...@@ -111,12 +111,12 @@ export function TransactionSubmittedContent({
</ConfirmedIcon> </ConfirmedIcon>
<AutoColumn gap="12px" justify={'center'}> <AutoColumn gap="12px" justify={'center'}>
<Text fontWeight={500} fontSize={20} textAlign="center"> <Text fontWeight={500} fontSize={20} textAlign="center">
<Trans id="transactions.submitted">Transaction Submitted</Trans> <Trans>Transaction Submitted</Trans>
</Text> </Text>
{chainId && hash && ( {chainId && hash && (
<ExternalLink href={getExplorerLink(chainId, hash, ExplorerDataType.TRANSACTION)}> <ExternalLink href={getExplorerLink(chainId, hash, ExplorerDataType.TRANSACTION)}>
<Text fontWeight={500} fontSize={14} color={theme.primary1}> <Text fontWeight={500} fontSize={14} color={theme.primary1}>
<Trans id="wallet.viewOnEtherscan">View on Etherscan</Trans> <Trans>View on Etherscan</Trans>
</Text> </Text>
</ExternalLink> </ExternalLink>
)} )}
...@@ -124,13 +124,13 @@ export function TransactionSubmittedContent({ ...@@ -124,13 +124,13 @@ export function TransactionSubmittedContent({
<ButtonLight mt="12px" padding="6px 12px" width="fit-content" onClick={addToken}> <ButtonLight mt="12px" padding="6px 12px" width="fit-content" onClick={addToken}>
{!success ? ( {!success ? (
<RowFixed> <RowFixed>
<Trans id="wallet.addTokenToMetamask"> <Trans>
Add {currencyToAdd.symbol} to Metamask <StyledLogo src={MetaMaskLogo} /> Add {currencyToAdd.symbol} to Metamask <StyledLogo src={MetaMaskLogo} />
</Trans> </Trans>
</RowFixed> </RowFixed>
) : ( ) : (
<RowFixed> <RowFixed>
<Trans id="wallet.addedTokenToMetamask">Added {currencyToAdd.symbol} </Trans> <Trans>Added {currencyToAdd.symbol} </Trans>
<CheckCircle size={'16px'} stroke={theme.green1} style={{ marginLeft: '6px' }} /> <CheckCircle size={'16px'} stroke={theme.green1} style={{ marginLeft: '6px' }} />
</RowFixed> </RowFixed>
)} )}
...@@ -138,7 +138,7 @@ export function TransactionSubmittedContent({ ...@@ -138,7 +138,7 @@ export function TransactionSubmittedContent({
)} )}
<ButtonPrimary onClick={onDismiss} style={{ margin: '20px 0 0 0' }}> <ButtonPrimary onClick={onDismiss} style={{ margin: '20px 0 0 0' }}>
<Text fontWeight={500} fontSize={20}> <Text fontWeight={500} fontSize={20}>
{inline ? <Trans id="common.return">Return</Trans> : <Trans id="common.close">Close</Trans>} {inline ? <Trans>Return</Trans> : <Trans>Close</Trans>}
</Text> </Text>
</ButtonPrimary> </ButtonPrimary>
</AutoColumn> </AutoColumn>
...@@ -199,7 +199,7 @@ export function TransactionErrorContent({ message, onDismiss }: { message: strin ...@@ -199,7 +199,7 @@ export function TransactionErrorContent({ message, onDismiss }: { message: strin
</Section> </Section>
<BottomSection gap="12px"> <BottomSection gap="12px">
<ButtonPrimary onClick={onDismiss}> <ButtonPrimary onClick={onDismiss}>
<Trans id="common.dismiss">Dismiss</Trans> <Trans>Dismiss</Trans>
</ButtonPrimary> </ButtonPrimary>
</BottomSection> </BottomSection>
</Wrapper> </Wrapper>
......
src/components/WalletModal/PendingView.tsx
View file @ 4fede9df
...@@ -84,7 +84,7 @@ export default function PendingView({ ...@@ -84,7 +84,7 @@ export default function PendingView({
{error ? ( {error ? (
<ErrorGroup> <ErrorGroup>
<div> <div>
<Trans id="error.connecting">Error connecting</Trans> <Trans>Error connecting</Trans>
</div> </div>
<ErrorButton <ErrorButton
onClick={() => { onClick={() => {
...@@ -92,13 +92,13 @@ export default function PendingView({ ...@@ -92,13 +92,13 @@ export default function PendingView({
connector && tryActivation(connector) connector && tryActivation(connector)
}} }}
> >
<Trans id="error.tryAgain">Try Again</Trans> <Trans>Try Again</Trans>
</ErrorButton> </ErrorButton>
</ErrorGroup> </ErrorGroup>
) : ( ) : (
<> <>
<StyledLoader /> <StyledLoader />
<Trans id="wallet.initializing">Initializing...</Trans> <Trans>Initializing...</Trans>
</> </>
)} )}
</LoadingWrapper> </LoadingWrapper>
......
src/components/WalletModal/index.tsx
View file @ 4fede9df
...@@ -240,7 +240,7 @@ export default function WalletModal({ ...@@ -240,7 +240,7 @@ export default function WalletModal({
id={`connect-${key}`} id={`connect-${key}`}
key={key} key={key}
color={'#E8831D'} color={'#E8831D'}
header={t({ id: 'wallet.installMetamask', message: 'Install Metamask' })} header={t`Install Metamask`}
subheader={null} subheader={null}
link={'https://metamask.io/'} link={'https://metamask.io/'}
icon={MetamaskIcon} icon={MetamaskIcon}
...@@ -292,19 +292,15 @@ export default function WalletModal({ ...@@ -292,19 +292,15 @@ export default function WalletModal({
<CloseColor /> <CloseColor />
</CloseIcon> </CloseIcon>
<HeaderRow> <HeaderRow>
{error instanceof UnsupportedChainIdError ? ( {error instanceof UnsupportedChainIdError ? <Trans>Wrong Network</Trans> : <Trans>Error connecting</Trans>}
<Trans id="error.wrongNetwork">Wrong Network</Trans>
) : (
<Trans id="error.connecting">Error connecting</Trans>
)}
</HeaderRow> </HeaderRow>
<ContentWrapper> <ContentWrapper>
{error instanceof UnsupportedChainIdError ? ( {error instanceof UnsupportedChainIdError ? (
<h5> <h5>
<Trans id="wallet.connectToNetwork">Please connect to the appropriate Ethereum network.</Trans> <Trans>Please connect to the appropriate Ethereum network.</Trans>
</h5> </h5>
) : ( ) : (
<Trans id="error.connectingTryRefreshing">Error connecting. Try refreshing the page.</Trans> <Trans>Error connecting. Try refreshing the page.</Trans>
)} )}
</ContentWrapper> </ContentWrapper>
</UpperSection> </UpperSection>
...@@ -334,13 +330,13 @@ export default function WalletModal({ ...@@ -334,13 +330,13 @@ export default function WalletModal({
setWalletView(WALLET_VIEWS.ACCOUNT) setWalletView(WALLET_VIEWS.ACCOUNT)
}} }}
> >
<Trans id="common.back">Back</Trans> <Trans>Back</Trans>
</HoverText> </HoverText>
</HeaderRow> </HeaderRow>
) : ( ) : (
<HeaderRow> <HeaderRow>
<HoverText> <HoverText>
<Trans id="wallet.connectLongForm">Connect to a wallet</Trans> <Trans>Connect to a wallet</Trans>
</HoverText> </HoverText>
</HeaderRow> </HeaderRow>
)} )}
...@@ -349,7 +345,7 @@ export default function WalletModal({ ...@@ -349,7 +345,7 @@ export default function WalletModal({
<LightCard style={{ marginBottom: '16px' }}> <LightCard style={{ marginBottom: '16px' }}>
<AutoRow style={{ flexWrap: 'nowrap' }}> <AutoRow style={{ flexWrap: 'nowrap' }}>
<TYPE.main fontSize={14}> <TYPE.main fontSize={14}>
<Trans id="wallet.connectAcknowledgement"> <Trans>
By connecting a wallet, you agree to Uniswap Labs’{' '} By connecting a wallet, you agree to Uniswap Labs’{' '}
<ExternalLink href="https://uniswap.org/terms-of-service/">Terms of Service</ExternalLink> and <ExternalLink href="https://uniswap.org/terms-of-service/">Terms of Service</ExternalLink> and
acknowledge that you have read and understand the{' '} acknowledge that you have read and understand the{' '}
......
src/components/claim/AddressClaimModal.tsx
View file @ 4fede9df
...@@ -105,21 +105,19 @@ export default function AddressClaimModal({ isOpen, onDismiss }: { isOpen: boole ...@@ -105,21 +105,19 @@ export default function AddressClaimModal({ isOpen, onDismiss }: { isOpen: boole
<CardSection gap="md"> <CardSection gap="md">
<RowBetween> <RowBetween>
<TYPE.white fontWeight={500}> <TYPE.white fontWeight={500}>
<Trans id="claim.buttons.claimUNIToken">Claim UNI Token</Trans> <Trans>Claim UNI Token</Trans>
</TYPE.white> </TYPE.white>
<CloseIcon onClick={wrappedOnDismiss} style={{ zIndex: 99 }} stroke="white" /> <CloseIcon onClick={wrappedOnDismiss} style={{ zIndex: 99 }} stroke="white" />
</RowBetween> </RowBetween>
<TYPE.white fontWeight={700} fontSize={36}> <TYPE.white fontWeight={700} fontSize={36}>
<Trans id="claim.labels.tokenAmount"> <Trans>{unclaimedAmount?.toFixed(0, { groupSeparator: ',' } ?? '-')} UNI</Trans>
{unclaimedAmount?.toFixed(0, { groupSeparator: ',' } ?? '-')} UNI
</Trans>
</TYPE.white> </TYPE.white>
</CardSection> </CardSection>
<Break /> <Break />
</ModalUpper> </ModalUpper>
<AutoColumn gap="md" style={{ padding: '1rem', paddingTop: '0' }} justify="center"> <AutoColumn gap="md" style={{ padding: '1rem', paddingTop: '0' }} justify="center">
<TYPE.subHeader fontWeight={500}> <TYPE.subHeader fontWeight={500}>
<Trans id="claim.labels.enterAddress"> <Trans>
Enter an address to trigger a UNI claim. If the address has any claimable UNI it will be sent to them on Enter an address to trigger a UNI claim. If the address has any claimable UNI it will be sent to them on
submission. submission.
</Trans> </Trans>
...@@ -127,7 +125,7 @@ export default function AddressClaimModal({ isOpen, onDismiss }: { isOpen: boole ...@@ -127,7 +125,7 @@ export default function AddressClaimModal({ isOpen, onDismiss }: { isOpen: boole
<AddressInputPanel value={typed} onChange={handleRecipientType} /> <AddressInputPanel value={typed} onChange={handleRecipientType} />
{parsedAddress && !hasAvailableClaim && ( {parsedAddress && !hasAvailableClaim && (
<TYPE.error error={true}> <TYPE.error error={true}>
<Trans id="claim.noAvailableClaim">Address has no available claim</Trans> <Trans>Address has no available claim</Trans>
</TYPE.error> </TYPE.error>
)} )}
<ButtonPrimary <ButtonPrimary
...@@ -138,7 +136,7 @@ export default function AddressClaimModal({ isOpen, onDismiss }: { isOpen: boole ...@@ -138,7 +136,7 @@ export default function AddressClaimModal({ isOpen, onDismiss }: { isOpen: boole
mt="1rem" mt="1rem"
onClick={onClaim} onClick={onClaim}
> >
<Trans id="claim.buttons.claimUNI">Claim UNI</Trans> <Trans>Claim UNI</Trans>
</ButtonPrimary> </ButtonPrimary>
</AutoColumn> </AutoColumn>
</ContentWrapper> </ContentWrapper>
...@@ -161,22 +159,16 @@ export default function AddressClaimModal({ isOpen, onDismiss }: { isOpen: boole ...@@ -161,22 +159,16 @@ export default function AddressClaimModal({ isOpen, onDismiss }: { isOpen: boole
<AutoColumn gap="100px" justify={'center'}> <AutoColumn gap="100px" justify={'center'}>
<AutoColumn gap="12px" justify={'center'}> <AutoColumn gap="12px" justify={'center'}>
<TYPE.largeHeader fontWeight={600} color="black"> <TYPE.largeHeader fontWeight={600} color="black">
{claimConfirmed ? ( {claimConfirmed ? <Trans>Claimed</Trans> : <Trans>Claiming</Trans>}
<Trans id="claim.label.statusClaimed">Claimed</Trans>
) : (
<Trans id="claim.label.statusClaiming">Claiming</Trans>
)}
</TYPE.largeHeader> </TYPE.largeHeader>
{!claimConfirmed && ( {!claimConfirmed && (
<Text fontSize={36} color={'#ff007a'} fontWeight={800}> <Text fontSize={36} color={'#ff007a'} fontWeight={800}>
<Trans id="claim.labels.tokenAmount"> <Trans>{unclaimedAmount?.toFixed(0, { groupSeparator: ',' } ?? '-')} UNI</Trans>
{unclaimedAmount?.toFixed(0, { groupSeparator: ',' } ?? '-')} UNI
</Trans>
</Text> </Text>
)} )}
{parsedAddress && ( {parsedAddress && (
<TYPE.largeHeader fontWeight={600} color="black"> <TYPE.largeHeader fontWeight={600} color="black">
<Trans id="claim.labels.address">for {shortenAddress(parsedAddress)}</Trans> <Trans>for {shortenAddress(parsedAddress)}</Trans>
</TYPE.largeHeader> </TYPE.largeHeader>
)} )}
</AutoColumn> </AutoColumn>
...@@ -186,7 +178,7 @@ export default function AddressClaimModal({ isOpen, onDismiss }: { isOpen: boole ...@@ -186,7 +178,7 @@ export default function AddressClaimModal({ isOpen, onDismiss }: { isOpen: boole
<span role="img" aria-label="party-hat"> <span role="img" aria-label="party-hat">
🎉{' '} 🎉{' '}
</span> </span>
<Trans id="claim.labels.welcome">Welcome to team Unicorn :) </Trans> <Trans>Welcome to team Unicorn :) </Trans>
<span role="img" aria-label="party-hat"> <span role="img" aria-label="party-hat">
🎉 🎉
</span> </span>
...@@ -195,12 +187,12 @@ export default function AddressClaimModal({ isOpen, onDismiss }: { isOpen: boole ...@@ -195,12 +187,12 @@ export default function AddressClaimModal({ isOpen, onDismiss }: { isOpen: boole
)} )}
{attempting && !hash && ( {attempting && !hash && (
<TYPE.subHeader color="black"> <TYPE.subHeader color="black">
<Trans id="wallet.confirmTransaction">Confirm this transaction in your wallet</Trans> <Trans>Confirm this transaction in your wallet</Trans>
</TYPE.subHeader> </TYPE.subHeader>
)} )}
{attempting && hash && !claimConfirmed && chainId && hash && ( {attempting && hash && !claimConfirmed && chainId && hash && (
<ExternalLink href={getExplorerLink(chainId, hash, ExplorerDataType.TRANSACTION)} style={{ zIndex: 99 }}> <ExternalLink href={getExplorerLink(chainId, hash, ExplorerDataType.TRANSACTION)} style={{ zIndex: 99 }}>
<Trans id="transaction.viewOnEherscan">View transaction on Etherscan</Trans> <Trans>View transaction on Etherscan</Trans>
</ExternalLink> </ExternalLink>
)} )}
</AutoColumn> </AutoColumn>
......
src/components/claim/ClaimModal.tsx
View file @ 4fede9df
...@@ -101,14 +101,12 @@ export default function ClaimModal() { ...@@ -101,14 +101,12 @@ export default function ClaimModal() {
<CardSection gap="md"> <CardSection gap="md">
<RowBetween> <RowBetween>
<TYPE.white fontWeight={500}> <TYPE.white fontWeight={500}>
<Trans id="claim.buttons.claimUNI">Claim UNI</Trans> <Trans>Claim UNI</Trans>
</TYPE.white> </TYPE.white>
<CloseIcon onClick={toggleClaimModal} style={{ zIndex: 99 }} color="white" /> <CloseIcon onClick={toggleClaimModal} style={{ zIndex: 99 }} color="white" />
</RowBetween> </RowBetween>
<TYPE.white fontWeight={700} fontSize={36}> <TYPE.white fontWeight={700} fontSize={36}>
<Trans id="claim.labels.tokenAmount"> <Trans>{unclaimedAmount?.toFixed(0, { groupSeparator: ',' } ?? '-')} UNI</Trans>
{unclaimedAmount?.toFixed(0, { groupSeparator: ',' } ?? '-')} UNI
</Trans>
</TYPE.white> </TYPE.white>
</CardSection> </CardSection>
<Break /> <Break />
...@@ -117,7 +115,7 @@ export default function ClaimModal() { ...@@ -117,7 +115,7 @@ export default function ClaimModal() {
<RowBetween> <RowBetween>
<TYPE.subHeader color="white">SOCKS</TYPE.subHeader> <TYPE.subHeader color="white">SOCKS</TYPE.subHeader>
<TYPE.subHeader color="white"> <TYPE.subHeader color="white">
<Trans id="claim.labels.socksAmount">{SOCKS_AMOUNT} UNI</Trans> <Trans>{SOCKS_AMOUNT} UNI</Trans>
</TYPE.subHeader> </TYPE.subHeader>
</RowBetween> </RowBetween>
)} )}
...@@ -126,10 +124,10 @@ export default function ClaimModal() { ...@@ -126,10 +124,10 @@ export default function ClaimModal() {
JSBI.greaterThanOrEqual(unclaimedAmount.quotient, nonLPAmount) && ( JSBI.greaterThanOrEqual(unclaimedAmount.quotient, nonLPAmount) && (
<RowBetween> <RowBetween>
<TYPE.subHeader color="white"> <TYPE.subHeader color="white">
<Trans id="common.liquidity">Liquidity</Trans> <Trans>Liquidity</Trans>
</TYPE.subHeader> </TYPE.subHeader>
<TYPE.subHeader color="white"> <TYPE.subHeader color="white">
<Trans id="claim.labels.tokenAmount"> <Trans>
{unclaimedAmount {unclaimedAmount
.subtract(CurrencyAmount.fromRawAmount(unclaimedAmount.currency, nonLPAmount)) .subtract(CurrencyAmount.fromRawAmount(unclaimedAmount.currency, nonLPAmount))
.toFixed(0, { groupSeparator: ',' })}{' '} .toFixed(0, { groupSeparator: ',' })}{' '}
...@@ -141,10 +139,10 @@ export default function ClaimModal() { ...@@ -141,10 +139,10 @@ export default function ClaimModal() {
{userClaimData?.flags?.isUser && ( {userClaimData?.flags?.isUser && (
<RowBetween> <RowBetween>
<TYPE.subHeader color="white"> <TYPE.subHeader color="white">
<Trans id="common.user">User</Trans> <Trans>User</Trans>
</TYPE.subHeader> </TYPE.subHeader>
<TYPE.subHeader color="white"> <TYPE.subHeader color="white">
<Trans id="claim.userAmount">{USER_AMOUNT} UNI</Trans> <Trans>{USER_AMOUNT} UNI</Trans>
</TYPE.subHeader> </TYPE.subHeader>
</RowBetween> </RowBetween>
)} )}
...@@ -152,7 +150,7 @@ export default function ClaimModal() { ...@@ -152,7 +150,7 @@ export default function ClaimModal() {
</ModalUpper> </ModalUpper>
<AutoColumn gap="md" style={{ padding: '1rem', paddingTop: '0' }} justify="center"> <AutoColumn gap="md" style={{ padding: '1rem', paddingTop: '0' }} justify="center">
<TYPE.subHeader fontWeight={500}> <TYPE.subHeader fontWeight={500}>
<Trans id="claim.hints.uniswapCommunityMember"> <Trans>
As a member of the Uniswap community you may claim UNI to be used for voting and governance. As a member of the Uniswap community you may claim UNI to be used for voting and governance.
<br /> <br />
<br /> <br />
...@@ -167,7 +165,7 @@ export default function ClaimModal() { ...@@ -167,7 +165,7 @@ export default function ClaimModal() {
mt="1rem" mt="1rem"
onClick={onClaim} onClick={onClaim}
> >
<Trans id="claim.buttons.claimUNI">Claim UNI</Trans> <Trans>Claim UNI</Trans>
</ButtonPrimary> </ButtonPrimary>
</AutoColumn> </AutoColumn>
</ContentWrapper> </ContentWrapper>
...@@ -194,16 +192,14 @@ export default function ClaimModal() { ...@@ -194,16 +192,14 @@ export default function ClaimModal() {
</TYPE.largeHeader> </TYPE.largeHeader>
{!claimConfirmed && ( {!claimConfirmed && (
<Text fontSize={36} color={'#ff007a'} fontWeight={800}> <Text fontSize={36} color={'#ff007a'} fontWeight={800}>
<Trans id="claim.labels.tokenAmount"> <Trans>{unclaimedAmount?.toFixed(0, { groupSeparator: ',' } ?? '-')} UNI</Trans>
{unclaimedAmount?.toFixed(0, { groupSeparator: ',' } ?? '-')} UNI
</Trans>
</Text> </Text>
)} )}
</AutoColumn> </AutoColumn>
{claimConfirmed && ( {claimConfirmed && (
<> <>
<TYPE.subHeader fontWeight={500} color="black"> <TYPE.subHeader fontWeight={500} color="black">
<Trans id="claim.labels.welcome"> <Trans>
<span role="img" aria-label="party-hat"> <span role="img" aria-label="party-hat">
🎉{' '} 🎉{' '}
</span> </span>
...@@ -217,7 +213,7 @@ export default function ClaimModal() { ...@@ -217,7 +213,7 @@ export default function ClaimModal() {
)} )}
{attempting && !claimSubmitted && ( {attempting && !claimSubmitted && (
<TYPE.subHeader color="black"> <TYPE.subHeader color="black">
<Trans id="claim.labels.confirmTransactionInWallet">Confirm this transaction in your wallet</Trans> <Trans>Confirm this transaction in your wallet</Trans>
</TYPE.subHeader> </TYPE.subHeader>
)} )}
{attempting && claimSubmitted && !claimConfirmed && chainId && claimTxn?.hash && ( {attempting && claimSubmitted && !claimConfirmed && chainId && claimTxn?.hash && (
...@@ -225,7 +221,7 @@ export default function ClaimModal() { ...@@ -225,7 +221,7 @@ export default function ClaimModal() {
href={getExplorerLink(chainId, claimTxn?.hash, ExplorerDataType.TRANSACTION)} href={getExplorerLink(chainId, claimTxn?.hash, ExplorerDataType.TRANSACTION)}
style={{ zIndex: 99 }} style={{ zIndex: 99 }}
> >
<Trans id="transaction.viewOnEherscan">View transaction on Etherscan</Trans> <Trans>View transaction on Etherscan</Trans>
</ExternalLink> </ExternalLink>
)} )}
</AutoColumn> </AutoColumn>
......
src/components/earn/ClaimRewardModal.tsx
View file @ 4fede9df
...@@ -46,12 +46,7 @@ export default function ClaimRewardModal({ isOpen, onDismiss, stakingInfo }: Sta ...@@ -46,12 +46,7 @@ export default function ClaimRewardModal({ isOpen, onDismiss, stakingInfo }: Sta
await stakingContract await stakingContract
.getReward({ gasLimit: 350000 }) .getReward({ gasLimit: 350000 })
.then((response: TransactionResponse) => { .then((response: TransactionResponse) => {
addTransaction(response, { addTransaction(response, { summary: t`Claim accumulated UNI rewards` })
summary: t({
id: 'transactions.summary.claimAccumulatedUNIRewards',
message: 'Claim accumulated UNI rewards',
}),
})
setHash(response.hash) setHash(response.hash)
}) })
.catch((error: any) => { .catch((error: any) => {
...@@ -63,10 +58,10 @@ export default function ClaimRewardModal({ isOpen, onDismiss, stakingInfo }: Sta ...@@ -63,10 +58,10 @@ export default function ClaimRewardModal({ isOpen, onDismiss, stakingInfo }: Sta
let error: string | undefined let error: string | undefined
if (!account) { if (!account) {
error = t({ id: 'wallet.connect' }) error = t`Connect wallet`
} }
if (!stakingInfo?.stakedAmount) { if (!stakingInfo?.stakedAmount) {
error = error ?? t({ id: 'earn.enterAmountError', message: 'Enter an amount' }) error = error ?? t`Enter an amount`
} }
return ( return (
...@@ -75,7 +70,7 @@ export default function ClaimRewardModal({ isOpen, onDismiss, stakingInfo }: Sta ...@@ -75,7 +70,7 @@ export default function ClaimRewardModal({ isOpen, onDismiss, stakingInfo }: Sta
<ContentWrapper gap="lg"> <ContentWrapper gap="lg">
<RowBetween> <RowBetween>
<TYPE.mediumHeader> <TYPE.mediumHeader>
<Trans id="earn.claim.label">Claim</Trans> <Trans>Claim</Trans>
</TYPE.mediumHeader> </TYPE.mediumHeader>
<CloseIcon onClick={wrappedOnDismiss} /> <CloseIcon onClick={wrappedOnDismiss} />
</RowBetween> </RowBetween>
...@@ -85,17 +80,15 @@ export default function ClaimRewardModal({ isOpen, onDismiss, stakingInfo }: Sta ...@@ -85,17 +80,15 @@ export default function ClaimRewardModal({ isOpen, onDismiss, stakingInfo }: Sta
{stakingInfo?.earnedAmount?.toSignificant(6)} {stakingInfo?.earnedAmount?.toSignificant(6)}
</TYPE.body> </TYPE.body>
<TYPE.body> <TYPE.body>
<Trans id="earn.claim.unclaimedUNI">Unclaimed UNI</Trans> <Trans>Unclaimed UNI</Trans>
</TYPE.body> </TYPE.body>
</AutoColumn> </AutoColumn>
)} )}
<TYPE.subHeader style={{ textAlign: 'center' }}> <TYPE.subHeader style={{ textAlign: 'center' }}>
<Trans id="earn.claim.withoutWithdrawingHint"> <Trans>When you claim without withdrawing your liquidity remains in the mining pool.</Trans>
When you claim without withdrawing your liquidity remains in the mining pool.
</Trans>
</TYPE.subHeader> </TYPE.subHeader>
<ButtonError disabled={!!error} error={!!error && !!stakingInfo?.stakedAmount} onClick={onClaimReward}> <ButtonError disabled={!!error} error={!!error && !!stakingInfo?.stakedAmount} onClick={onClaimReward}>
{error ?? <Trans id="earn.claim.label">Claim</Trans>} {error ?? <Trans>Claim</Trans>}
</ButtonError> </ButtonError>
</ContentWrapper> </ContentWrapper>
)} )}
...@@ -103,7 +96,7 @@ export default function ClaimRewardModal({ isOpen, onDismiss, stakingInfo }: Sta ...@@ -103,7 +96,7 @@ export default function ClaimRewardModal({ isOpen, onDismiss, stakingInfo }: Sta
<LoadingView onDismiss={wrappedOnDismiss}> <LoadingView onDismiss={wrappedOnDismiss}>
<AutoColumn gap="12px" justify={'center'}> <AutoColumn gap="12px" justify={'center'}>
<TYPE.body fontSize={20}> <TYPE.body fontSize={20}>
<Trans id="claim.labels.claimingAmount">Claiming {stakingInfo?.earnedAmount?.toSignificant(6)} UNI</Trans> <Trans>Claiming {stakingInfo?.earnedAmount?.toSignificant(6)} UNI</Trans>
</TYPE.body> </TYPE.body>
</AutoColumn> </AutoColumn>
</LoadingView> </LoadingView>
...@@ -112,10 +105,10 @@ export default function ClaimRewardModal({ isOpen, onDismiss, stakingInfo }: Sta ...@@ -112,10 +105,10 @@ export default function ClaimRewardModal({ isOpen, onDismiss, stakingInfo }: Sta
<SubmittedView onDismiss={wrappedOnDismiss} hash={hash}> <SubmittedView onDismiss={wrappedOnDismiss} hash={hash}>
<AutoColumn gap="12px" justify={'center'}> <AutoColumn gap="12px" justify={'center'}>
<TYPE.largeHeader> <TYPE.largeHeader>
<Trans id="transactions.submitted">Transaction Submitted</Trans> <Trans>Transaction Submitted</Trans>
</TYPE.largeHeader> </TYPE.largeHeader>
<TYPE.body fontSize={20}> <TYPE.body fontSize={20}>
<Trans id="earn.claim.claimedUNI">Claimed UNI!</Trans> <Trans>Claimed UNI!</Trans>
</TYPE.body> </TYPE.body>
</AutoColumn> </AutoColumn>
</SubmittedView> </SubmittedView>
......
src/components/earn/PoolCard.tsx
View file @ 4fede9df
...@@ -121,7 +121,7 @@ export default function PoolCard({ stakingInfo }: { stakingInfo: StakingInfo }) ...@@ -121,7 +121,7 @@ export default function PoolCard({ stakingInfo }: { stakingInfo: StakingInfo })
<StyledInternalLink to={`/uni/${currencyId(currency0)}/${currencyId(currency1)}`} style={{ width: '100%' }}> <StyledInternalLink to={`/uni/${currencyId(currency0)}/${currencyId(currency1)}`} style={{ width: '100%' }}>
<ButtonPrimary padding="8px" borderRadius="8px"> <ButtonPrimary padding="8px" borderRadius="8px">
{isStaking ? <Trans id="earn.pool.manage">Manage</Trans> : <Trans id="earn.pool.deposit">Deposit</Trans>} {isStaking ? <Trans>Manage</Trans> : <Trans>Deposit</Trans>}
</ButtonPrimary> </ButtonPrimary>
</StyledInternalLink> </StyledInternalLink>
</TopSection> </TopSection>
...@@ -129,33 +129,29 @@ export default function PoolCard({ stakingInfo }: { stakingInfo: StakingInfo }) ...@@ -129,33 +129,29 @@ export default function PoolCard({ stakingInfo }: { stakingInfo: StakingInfo })
<StatContainer> <StatContainer>
<RowBetween> <RowBetween>
<TYPE.white> <TYPE.white>
<Trans id="earn.pool.totalDeposited">Total deposited</Trans> <Trans>Total deposited</Trans>
</TYPE.white> </TYPE.white>
<TYPE.white> <TYPE.white>
{valueOfTotalStakedAmountInUSDC ? ( {valueOfTotalStakedAmountInUSDC ? (
<Trans id="earn.pool.valueInUSDC"> <Trans>${valueOfTotalStakedAmountInUSDC.toFixed(0, { groupSeparator: ',' })}</Trans>
${valueOfTotalStakedAmountInUSDC.toFixed(0, { groupSeparator: ',' })}
</Trans>
) : ( ) : (
<Trans id="earn.pool.valueInETH"> <Trans>${valueOfTotalStakedAmountInWETH?.toSignificant(4, { groupSeparator: ',' }) ?? '-'} ETH</Trans>
${valueOfTotalStakedAmountInWETH?.toSignificant(4, { groupSeparator: ',' }) ?? '-'} ETH
</Trans>
)} )}
</TYPE.white> </TYPE.white>
</RowBetween> </RowBetween>
<RowBetween> <RowBetween>
<TYPE.white> <TYPE.white>
<Trans id="earn.pool.rate">Pool rate</Trans> <Trans>Pool rate</Trans>
</TYPE.white> </TYPE.white>
<TYPE.white> <TYPE.white>
{stakingInfo ? ( {stakingInfo ? (
stakingInfo.active ? ( stakingInfo.active ? (
<Trans id="earn.pool.rewardRate"> <Trans>
{stakingInfo.totalRewardRate?.multiply(BIG_INT_SECONDS_IN_WEEK)?.toFixed(0, { groupSeparator: ',' })}{' '} {stakingInfo.totalRewardRate?.multiply(BIG_INT_SECONDS_IN_WEEK)?.toFixed(0, { groupSeparator: ',' })}{' '}
UNI / week UNI / week
</Trans> </Trans>
) : ( ) : (
<Trans id="earn.pool.noRewardRate">0 UNI / week</Trans> <Trans>0 UNI / week</Trans>
) )
) : ( ) : (
'-' '-'
...@@ -170,7 +166,7 @@ export default function PoolCard({ stakingInfo }: { stakingInfo: StakingInfo }) ...@@ -170,7 +166,7 @@ export default function PoolCard({ stakingInfo }: { stakingInfo: StakingInfo })
<BottomSection showBackground={true}> <BottomSection showBackground={true}>
<TYPE.black color={'white'} fontWeight={500}> <TYPE.black color={'white'} fontWeight={500}>
<span> <span>
<Trans id="earn.pool.yourRate">Your rate</Trans> <Trans>Your rate</Trans>
</span> </span>
</TYPE.black> </TYPE.black>
...@@ -180,14 +176,14 @@ export default function PoolCard({ stakingInfo }: { stakingInfo: StakingInfo }) ...@@ -180,14 +176,14 @@ export default function PoolCard({ stakingInfo }: { stakingInfo: StakingInfo })
</span> </span>
{stakingInfo ? ( {stakingInfo ? (
stakingInfo.active ? ( stakingInfo.active ? (
<Trans id="earn.pool.rewardRate"> <Trans>
{stakingInfo.rewardRate {stakingInfo.rewardRate
?.multiply(BIG_INT_SECONDS_IN_WEEK) ?.multiply(BIG_INT_SECONDS_IN_WEEK)
?.toSignificant(4, { groupSeparator: ',' })}{' '} ?.toSignificant(4, { groupSeparator: ',' })}{' '}
UNI / week UNI / week
</Trans> </Trans>
) : ( ) : (
<Trans id="earn.pool.noRewardRate">0 UNI / week</Trans> <Trans>0 UNI / week</Trans>
) )
) : ( ) : (
'-' '-'
......
src/components/earn/StakingModal.tsx
View file @ 4fede9df
...@@ -104,7 +104,7 @@ export default function StakingModal({ isOpen, onDismiss, stakingInfo, userLiqui ...@@ -104,7 +104,7 @@ export default function StakingModal({ isOpen, onDismiss, stakingInfo, userLiqui
) )
.then((response: TransactionResponse) => { .then((response: TransactionResponse) => {
addTransaction(response, { addTransaction(response, {
summary: t({ id: 'transactions.summary.depositLiquidity', message: 'Deposit liquidity' }), summary: t`Deposit liquidity`,
}) })
setHash(response.hash) setHash(response.hash)
}) })
...@@ -155,7 +155,7 @@ export default function StakingModal({ isOpen, onDismiss, stakingInfo, userLiqui ...@@ -155,7 +155,7 @@ export default function StakingModal({ isOpen, onDismiss, stakingInfo, userLiqui
<ContentWrapper gap="lg"> <ContentWrapper gap="lg">
<RowBetween> <RowBetween>
<TYPE.mediumHeader> <TYPE.mediumHeader>
<Trans id="common.deposit">Deposit</Trans> <Trans>Deposit</Trans>
</TYPE.mediumHeader> </TYPE.mediumHeader>
<CloseIcon onClick={wrappedOnDismiss} /> <CloseIcon onClick={wrappedOnDismiss} />
</RowBetween> </RowBetween>
...@@ -167,19 +167,19 @@ export default function StakingModal({ isOpen, onDismiss, stakingInfo, userLiqui ...@@ -167,19 +167,19 @@ export default function StakingModal({ isOpen, onDismiss, stakingInfo, userLiqui
currency={stakingInfo.stakedAmount.currency} currency={stakingInfo.stakedAmount.currency}
pair={dummyPair} pair={dummyPair}
label={''} label={''}
customBalanceText={t({ id: 'earn.customBalanceText', message: 'Available to deposit: ' })} customBalanceText={t`Available to deposit:`}
id="stake-liquidity-token" id="stake-liquidity-token"
/> />
<HypotheticalRewardRate dim={!hypotheticalRewardRate.greaterThan('0')}> <HypotheticalRewardRate dim={!hypotheticalRewardRate.greaterThan('0')}>
<div> <div>
<TYPE.black fontWeight={600}> <TYPE.black fontWeight={600}>
<Trans id="earn.weeklyRewardsHeading">Weekly Rewards</Trans> <Trans>Weekly Rewards</Trans>
</TYPE.black> </TYPE.black>
</div> </div>
<TYPE.black> <TYPE.black>
<Trans id="earn.pool.rewardRate"> <Trans>
{hypotheticalRewardRate {hypotheticalRewardRate
.multiply((60 * 60 * 24 * 7).toString()) .multiply((60 * 60 * 24 * 7).toString())
.toSignificant(4, { groupSeparator: ',' })}{' '} .toSignificant(4, { groupSeparator: ',' })}{' '}
...@@ -195,14 +195,14 @@ export default function StakingModal({ isOpen, onDismiss, stakingInfo, userLiqui ...@@ -195,14 +195,14 @@ export default function StakingModal({ isOpen, onDismiss, stakingInfo, userLiqui
confirmed={approval === ApprovalState.APPROVED || signatureData !== null} confirmed={approval === ApprovalState.APPROVED || signatureData !== null}
disabled={approval !== ApprovalState.NOT_APPROVED || signatureData !== null} disabled={approval !== ApprovalState.NOT_APPROVED || signatureData !== null}
> >
<Trans id="common.approve">Approve</Trans> <Trans>Approve</Trans>
</ButtonConfirmed> </ButtonConfirmed>
<ButtonError <ButtonError
disabled={!!error || (signatureData === null && approval !== ApprovalState.APPROVED)} disabled={!!error || (signatureData === null && approval !== ApprovalState.APPROVED)}
error={!!error && !!parsedAmount} error={!!error && !!parsedAmount}
onClick={onStake} onClick={onStake}
> >
{error ?? <Trans id="common.deposit">Deposit</Trans>} {error ?? <Trans>Deposit</Trans>}
</ButtonError> </ButtonError>
</RowBetween> </RowBetween>
<ProgressCircles steps={[approval === ApprovalState.APPROVED || signatureData !== null]} disabled={true} /> <ProgressCircles steps={[approval === ApprovalState.APPROVED || signatureData !== null]} disabled={true} />
...@@ -212,10 +212,10 @@ export default function StakingModal({ isOpen, onDismiss, stakingInfo, userLiqui ...@@ -212,10 +212,10 @@ export default function StakingModal({ isOpen, onDismiss, stakingInfo, userLiqui
<LoadingView onDismiss={wrappedOnDismiss}> <LoadingView onDismiss={wrappedOnDismiss}>
<AutoColumn gap="12px" justify={'center'}> <AutoColumn gap="12px" justify={'center'}>
<TYPE.largeHeader> <TYPE.largeHeader>
<Trans id="common.depositingLiquidity">Depositing Liquidity</Trans> <Trans>Depositing Liquidity</Trans>
</TYPE.largeHeader> </TYPE.largeHeader>
<TYPE.body fontSize={20}> <TYPE.body fontSize={20}>
<Trans id="currencies.amountUNIV2">{parsedAmount?.toSignificant(4)} UNI-V2</Trans> <Trans>{parsedAmount?.toSignificant(4)} UNI-V2</Trans>
</TYPE.body> </TYPE.body>
</AutoColumn> </AutoColumn>
</LoadingView> </LoadingView>
...@@ -224,10 +224,10 @@ export default function StakingModal({ isOpen, onDismiss, stakingInfo, userLiqui ...@@ -224,10 +224,10 @@ export default function StakingModal({ isOpen, onDismiss, stakingInfo, userLiqui
<SubmittedView onDismiss={wrappedOnDismiss} hash={hash}> <SubmittedView onDismiss={wrappedOnDismiss} hash={hash}>
<AutoColumn gap="12px" justify={'center'}> <AutoColumn gap="12px" justify={'center'}>
<TYPE.largeHeader> <TYPE.largeHeader>
<Trans id="transactions.submitted">Transaction Submitted</Trans> <Trans>Transaction Submitted</Trans>
</TYPE.largeHeader> </TYPE.largeHeader>
<TYPE.body fontSize={20}> <TYPE.body fontSize={20}>
<Trans id="currencies.depositedUNIV2">Deposited {parsedAmount?.toSignificant(4)} UNI-V2</Trans> <Trans>Deposited {parsedAmount?.toSignificant(4)} UNI-V2</Trans>
</TYPE.body> </TYPE.body>
</AutoColumn> </AutoColumn>
</SubmittedView> </SubmittedView>
......
src/components/earn/UnstakingModal.tsx
View file @ 4fede9df
...@@ -48,10 +48,7 @@ export default function UnstakingModal({ isOpen, onDismiss, stakingInfo }: Staki ...@@ -48,10 +48,7 @@ export default function UnstakingModal({ isOpen, onDismiss, stakingInfo }: Staki
.exit({ gasLimit: 300000 }) .exit({ gasLimit: 300000 })
.then((response: TransactionResponse) => { .then((response: TransactionResponse) => {
addTransaction(response, { addTransaction(response, {
summary: t({ summary: t`Withdraw deposited liquidity`,
id: 'transactions.summary.withdrawDepositedLiquidity',
message: 'Withdraw deposited liquidity',
}),
}) })
setHash(response.hash) setHash(response.hash)
}) })
...@@ -64,10 +61,10 @@ export default function UnstakingModal({ isOpen, onDismiss, stakingInfo }: Staki ...@@ -64,10 +61,10 @@ export default function UnstakingModal({ isOpen, onDismiss, stakingInfo }: Staki
let error: string | undefined let error: string | undefined
if (!account) { if (!account) {
error = t({ id: 'wallet.connect', message: 'Connect a wallet' }) error = t`Connect a wallet`
} }
if (!stakingInfo?.stakedAmount) { if (!stakingInfo?.stakedAmount) {
error = error ?? t({ id: 'earn.enterAnAmountError', message: 'Enter an amount' }) error = error ?? t`Enter an amount`
} }
return ( return (
...@@ -76,7 +73,7 @@ export default function UnstakingModal({ isOpen, onDismiss, stakingInfo }: Staki ...@@ -76,7 +73,7 @@ export default function UnstakingModal({ isOpen, onDismiss, stakingInfo }: Staki
<ContentWrapper gap="lg"> <ContentWrapper gap="lg">
<RowBetween> <RowBetween>
<TYPE.mediumHeader> <TYPE.mediumHeader>
<Trans id="earn.unstake.withdraw">Withdraw</Trans> <Trans>Withdraw</Trans>
</TYPE.mediumHeader> </TYPE.mediumHeader>
<CloseIcon onClick={wrappedOndismiss} /> <CloseIcon onClick={wrappedOndismiss} />
</RowBetween> </RowBetween>
...@@ -86,7 +83,7 @@ export default function UnstakingModal({ isOpen, onDismiss, stakingInfo }: Staki ...@@ -86,7 +83,7 @@ export default function UnstakingModal({ isOpen, onDismiss, stakingInfo }: Staki
{<FormattedCurrencyAmount currencyAmount={stakingInfo.stakedAmount} />} {<FormattedCurrencyAmount currencyAmount={stakingInfo.stakedAmount} />}
</TYPE.body> </TYPE.body>
<TYPE.body> <TYPE.body>
<Trans id="earn.unstake.depositedLiquidity">Deposited liquidity:</Trans> <Trans>Deposited liquidity:</Trans>
</TYPE.body> </TYPE.body>
</AutoColumn> </AutoColumn>
)} )}
...@@ -96,17 +93,15 @@ export default function UnstakingModal({ isOpen, onDismiss, stakingInfo }: Staki ...@@ -96,17 +93,15 @@ export default function UnstakingModal({ isOpen, onDismiss, stakingInfo }: Staki
{<FormattedCurrencyAmount currencyAmount={stakingInfo?.earnedAmount} />} {<FormattedCurrencyAmount currencyAmount={stakingInfo?.earnedAmount} />}
</TYPE.body> </TYPE.body>
<TYPE.body> <TYPE.body>
<Trans id="earn.claim.unclaimedUNI">Unclaimed UNI</Trans> <Trans>Unclaimed UNI</Trans>
</TYPE.body> </TYPE.body>
</AutoColumn> </AutoColumn>
)} )}
<TYPE.subHeader style={{ textAlign: 'center' }}> <TYPE.subHeader style={{ textAlign: 'center' }}>
<Trans id="earn.unstake.hint"> <Trans>When you withdraw, your UNI is claimed and your liquidity is removed from the mining pool.</Trans>
When you withdraw, your UNI is claimed and your liquidity is removed from the mining pool.
</Trans>
</TYPE.subHeader> </TYPE.subHeader>
<ButtonError disabled={!!error} error={!!error && !!stakingInfo?.stakedAmount} onClick={onWithdraw}> <ButtonError disabled={!!error} error={!!error && !!stakingInfo?.stakedAmount} onClick={onWithdraw}>
{error ?? <Trans id="earn.unstake.withdrawAndClaim">Withdraw & Claim</Trans>} {error ?? <Trans>Withdraw & Claim</Trans>}
</ButtonError> </ButtonError>
</ContentWrapper> </ContentWrapper>
)} )}
...@@ -114,12 +109,10 @@ export default function UnstakingModal({ isOpen, onDismiss, stakingInfo }: Staki ...@@ -114,12 +109,10 @@ export default function UnstakingModal({ isOpen, onDismiss, stakingInfo }: Staki
<LoadingView onDismiss={wrappedOndismiss}> <LoadingView onDismiss={wrappedOndismiss}>
<AutoColumn gap="12px" justify={'center'}> <AutoColumn gap="12px" justify={'center'}>
<TYPE.body fontSize={20}> <TYPE.body fontSize={20}>
<Trans id="earn.labels.withdrawingUNIV2"> <Trans>Withdrawing {stakingInfo?.stakedAmount?.toSignificant(4)} UNI-V2</Trans>
Withdrawing {stakingInfo?.stakedAmount?.toSignificant(4)} UNI-V2
</Trans>
</TYPE.body> </TYPE.body>
<TYPE.body fontSize={20}> <TYPE.body fontSize={20}>
<Trans id="earn.labels.claimingUNI">Claiming {stakingInfo?.earnedAmount?.toSignificant(4)} UNI</Trans> <Trans>Claiming {stakingInfo?.earnedAmount?.toSignificant(4)} UNI</Trans>
</TYPE.body> </TYPE.body>
</AutoColumn> </AutoColumn>
</LoadingView> </LoadingView>
...@@ -128,13 +121,13 @@ export default function UnstakingModal({ isOpen, onDismiss, stakingInfo }: Staki ...@@ -128,13 +121,13 @@ export default function UnstakingModal({ isOpen, onDismiss, stakingInfo }: Staki
<SubmittedView onDismiss={wrappedOndismiss} hash={hash}> <SubmittedView onDismiss={wrappedOndismiss} hash={hash}>
<AutoColumn gap="12px" justify={'center'}> <AutoColumn gap="12px" justify={'center'}>
<TYPE.largeHeader> <TYPE.largeHeader>
<Trans id="transaction.submitted">Transaction Submitted</Trans> <Trans>Transaction Submitted</Trans>
</TYPE.largeHeader> </TYPE.largeHeader>
<TYPE.body fontSize={20}> <TYPE.body fontSize={20}>
<Trans id="earn.labels.withdrewUNIV2">Withdrew UNI-V2!</Trans> <Trans>Withdrew UNI-V2!</Trans>
</TYPE.body> </TYPE.body>
<TYPE.body fontSize={20}> <TYPE.body fontSize={20}>
<Trans id="earn.labels.claimedUNI">Claimed UNI!</Trans> <Trans>Claimed UNI!</Trans>
</TYPE.body> </TYPE.body>
</AutoColumn> </AutoColumn>
</SubmittedView> </SubmittedView>
......
src/components/swap/SwapModalHeader.tsx
View file @ 4fede9df
...@@ -65,7 +65,7 @@ export default function SwapModalHeader({ ...@@ -65,7 +65,7 @@ export default function SwapModalHeader({
<AutoColumn gap={'8px'}> <AutoColumn gap={'8px'}>
<RowBetween> <RowBetween>
<TYPE.body color={theme.text3} fontWeight={500} fontSize={14}> <TYPE.body color={theme.text3} fontWeight={500} fontSize={14}>
<Trans id="swap.fromCurrency">From</Trans> <Trans>From</Trans>
</TYPE.body> </TYPE.body>
<FiatValue fiatValue={fiatValueInput} /> <FiatValue fiatValue={fiatValueInput} />
</RowBetween> </RowBetween>
...@@ -95,7 +95,7 @@ export default function SwapModalHeader({ ...@@ -95,7 +95,7 @@ export default function SwapModalHeader({
<AutoColumn gap={'8px'}> <AutoColumn gap={'8px'}>
<RowBetween> <RowBetween>
<TYPE.body color={theme.text3} fontWeight={500} fontSize={14}> <TYPE.body color={theme.text3} fontWeight={500} fontSize={14}>
<Trans id="swap.toCurrency">To</Trans> <Trans>To</Trans>
</TYPE.body> </TYPE.body>
<TYPE.body fontSize={14} color={theme.text3}> <TYPE.body fontSize={14} color={theme.text3}>
<FiatValue <FiatValue
...@@ -136,14 +136,14 @@ export default function SwapModalHeader({ ...@@ -136,14 +136,14 @@ export default function SwapModalHeader({
<RowFixed> <RowFixed>
<AlertTriangle size={20} style={{ marginRight: '8px', minWidth: 24 }} /> <AlertTriangle size={20} style={{ marginRight: '8px', minWidth: 24 }} />
<TYPE.main color={theme.primary1}> <TYPE.main color={theme.primary1}>
<Trans id="swap.priceUpdated">Price Updated</Trans> <Trans>Price Updated</Trans>
</TYPE.main> </TYPE.main>
</RowFixed> </RowFixed>
<ButtonPrimary <ButtonPrimary
style={{ padding: '.5rem', width: 'fit-content', fontSize: '0.825rem', borderRadius: '12px' }} style={{ padding: '.5rem', width: 'fit-content', fontSize: '0.825rem', borderRadius: '12px' }}
onClick={onAcceptChanges} onClick={onAcceptChanges}
> >
<Trans id="common.accept">Accept</Trans> <Trans>Accept</Trans>
</ButtonPrimary> </ButtonPrimary>
</RowBetween> </RowBetween>
</SwapShowAcceptChanges> </SwapShowAcceptChanges>
...@@ -152,7 +152,7 @@ export default function SwapModalHeader({ ...@@ -152,7 +152,7 @@ export default function SwapModalHeader({
<AutoColumn justify="flex-start" gap="sm" style={{ padding: '.75rem 1rem' }}> <AutoColumn justify="flex-start" gap="sm" style={{ padding: '.75rem 1rem' }}>
{trade.tradeType === TradeType.EXACT_INPUT ? ( {trade.tradeType === TradeType.EXACT_INPUT ? (
<TYPE.italic fontWeight={400} textAlign="left" style={{ width: '100%' }}> <TYPE.italic fontWeight={400} textAlign="left" style={{ width: '100%' }}>
<Trans id="swap.outputEstimatedHint"> <Trans>
Output is estimated. You will receive at least{' '} Output is estimated. You will receive at least{' '}
<b> <b>
{trade.minimumAmountOut(allowedSlippage).toSignificant(6)} {trade.outputAmount.currency.symbol} {trade.minimumAmountOut(allowedSlippage).toSignificant(6)} {trade.outputAmount.currency.symbol}
...@@ -162,7 +162,7 @@ export default function SwapModalHeader({ ...@@ -162,7 +162,7 @@ export default function SwapModalHeader({
</TYPE.italic> </TYPE.italic>
) : ( ) : (
<TYPE.italic fontWeight={400} textAlign="left" style={{ width: '100%' }}> <TYPE.italic fontWeight={400} textAlign="left" style={{ width: '100%' }}>
<Trans id="swap.inputEstimated.hint"> <Trans>
Input is estimated. You will sell at most{' '} Input is estimated. You will sell at most{' '}
<b> <b>
{trade.maximumAmountIn(allowedSlippage).toSignificant(6)} {trade.inputAmount.currency.symbol} {trade.maximumAmountIn(allowedSlippage).toSignificant(6)} {trade.inputAmount.currency.symbol}
...@@ -175,7 +175,7 @@ export default function SwapModalHeader({ ...@@ -175,7 +175,7 @@ export default function SwapModalHeader({
{recipient !== null ? ( {recipient !== null ? (
<AutoColumn justify="flex-start" gap="sm" style={{ padding: '12px 0 0 0px' }}> <AutoColumn justify="flex-start" gap="sm" style={{ padding: '12px 0 0 0px' }}>
<TYPE.main> <TYPE.main>
<Trans id="swap.outputRecipient"> <Trans>
Output will be sent to{' '} Output will be sent to{' '}
<b title={recipient}>{isAddress(recipient) ? shortenAddress(recipient) : recipient}</b> <b title={recipient}>{isAddress(recipient) ? shortenAddress(recipient) : recipient}</b>
</Trans> </Trans>
......
src/components/swap/UnsupportedCurrencyFooter.tsx
View file @ 4fede9df
...@@ -64,7 +64,7 @@ export default function UnsupportedCurrencyFooter({ ...@@ -64,7 +64,7 @@ export default function UnsupportedCurrencyFooter({
<AutoColumn gap="lg"> <AutoColumn gap="lg">
<RowBetween> <RowBetween>
<TYPE.mediumHeader> <TYPE.mediumHeader>
<Trans id="errors.unsuportedAssets">Unsupported Assets</Trans> <Trans>Unsupported Assets</Trans>
</TYPE.mediumHeader> </TYPE.mediumHeader>
<CloseIcon onClick={() => setShowDetails(false)} /> <CloseIcon onClick={() => setShowDetails(false)} />
</RowBetween> </RowBetween>
...@@ -91,7 +91,7 @@ export default function UnsupportedCurrencyFooter({ ...@@ -91,7 +91,7 @@ export default function UnsupportedCurrencyFooter({
})} })}
<AutoColumn gap="lg"> <AutoColumn gap="lg">
<TYPE.body fontWeight={500}> <TYPE.body fontWeight={500}>
<Trans id="swap.unsupportedAssetsHint"> <Trans>
Some assets are not available through this interface because they may not work well with the smart Some assets are not available through this interface because they may not work well with the smart
contracts or we are unable to allow trading for legal reasons. contracts or we are unable to allow trading for legal reasons.
</Trans> </Trans>
...@@ -102,7 +102,7 @@ export default function UnsupportedCurrencyFooter({ ...@@ -102,7 +102,7 @@ export default function UnsupportedCurrencyFooter({
</Modal> </Modal>
<ButtonEmpty padding={'0'} onClick={() => setShowDetails(true)}> <ButtonEmpty padding={'0'} onClick={() => setShowDetails(true)}>
<TYPE.blue> <TYPE.blue>
<Trans id="swap.buttons.readMoreUnsupportedAssets">Read more about unsupported assets</Trans> <Trans>Read more about unsupported assets</Trans>
</TYPE.blue> </TYPE.blue>
</ButtonEmpty> </ButtonEmpty>
</DetailsFooter> </DetailsFooter>
......
src/components/vote/DelegateModal.tsx
View file @ 4fede9df
...@@ -99,31 +99,19 @@ export default function DelegateModal({ isOpen, onDismiss, title }: VoteModalPro ...@@ -99,31 +99,19 @@ export default function DelegateModal({ isOpen, onDismiss, title }: VoteModalPro
<StyledClosed stroke="black" onClick={wrappedOndismiss} /> <StyledClosed stroke="black" onClick={wrappedOndismiss} />
</RowBetween> </RowBetween>
<TYPE.body> <TYPE.body>
<Trans id="vote.delegate.hint1">Earned UNI tokens represent voting shares in Uniswap governance.</Trans> <Trans>Earned UNI tokens represent voting shares in Uniswap governance.</Trans>
</TYPE.body> </TYPE.body>
<TYPE.body> <TYPE.body>
<Trans id="vote.delegate.hint2"> <Trans>You can either vote on each proposal yourself or delegate your votes to a third party.</Trans>
You can either vote on each proposal yourself or delegate your votes to a third party.
</Trans>
</TYPE.body> </TYPE.body>
{usingDelegate && <AddressInputPanel value={typed} onChange={handleRecipientType} />} {usingDelegate && <AddressInputPanel value={typed} onChange={handleRecipientType} />}
<ButtonPrimary disabled={!isAddress(parsedAddress ?? '')} onClick={onDelegate}> <ButtonPrimary disabled={!isAddress(parsedAddress ?? '')} onClick={onDelegate}>
<TYPE.mediumHeader color="white"> <TYPE.mediumHeader color="white">
{usingDelegate ? ( {usingDelegate ? <Trans>Delegate Votes</Trans> : <Trans>Self Delegate</Trans>}
<Trans id="vote.delegate.delegateVotes">Delegate Votes</Trans>
) : (
<Trans id="vote.delegate.selfDelegate">Self Delegate</Trans>
)}
</TYPE.mediumHeader> </TYPE.mediumHeader>
</ButtonPrimary> </ButtonPrimary>
<TextButton onClick={() => setUsingDelegate(!usingDelegate)}> <TextButton onClick={() => setUsingDelegate(!usingDelegate)}>
<TYPE.blue> <TYPE.blue>{usingDelegate ? <Trans>Remove Delegate</Trans> : <Trans>Add Delegate +</Trans>}</TYPE.blue>
{usingDelegate ? (
<Trans id="common.remove">Remove Delegate</Trans>
) : (
<Trans id="common.add">Add Delegate +</Trans>
)}
</TYPE.blue>
</TextButton> </TextButton>
</AutoColumn> </AutoColumn>
</ContentWrapper> </ContentWrapper>
...@@ -132,11 +120,7 @@ export default function DelegateModal({ isOpen, onDismiss, title }: VoteModalPro ...@@ -132,11 +120,7 @@ export default function DelegateModal({ isOpen, onDismiss, title }: VoteModalPro
<LoadingView onDismiss={wrappedOndismiss}> <LoadingView onDismiss={wrappedOndismiss}>
<AutoColumn gap="12px" justify={'center'}> <AutoColumn gap="12px" justify={'center'}>
<TYPE.largeHeader> <TYPE.largeHeader>
{usingDelegate ? ( {usingDelegate ? <Trans>Delegating votes</Trans> : <Trans>Unlocking Votes</Trans>}
<Trans id="vote.delegate.delegatingVotes">Delegating votes</Trans>
) : (
<Trans id="vote.delegates.unlockingVotes">Unlocking Votes</Trans>
)}
</TYPE.largeHeader> </TYPE.largeHeader>
<TYPE.main fontSize={36}> {formatTokenAmount(uniBalance, 4)}</TYPE.main> <TYPE.main fontSize={36}> {formatTokenAmount(uniBalance, 4)}</TYPE.main>
</AutoColumn> </AutoColumn>
...@@ -146,7 +130,7 @@ export default function DelegateModal({ isOpen, onDismiss, title }: VoteModalPro ...@@ -146,7 +130,7 @@ export default function DelegateModal({ isOpen, onDismiss, title }: VoteModalPro
<SubmittedView onDismiss={wrappedOndismiss} hash={hash}> <SubmittedView onDismiss={wrappedOndismiss} hash={hash}>
<AutoColumn gap="12px" justify={'center'}> <AutoColumn gap="12px" justify={'center'}>
<TYPE.largeHeader> <TYPE.largeHeader>
<Trans id="transactions.submitted">Transaction Submitted</Trans> <Trans>Transaction Submitted</Trans>
</TYPE.largeHeader> </TYPE.largeHeader>
<TYPE.main fontSize={36}>{formatTokenAmount(uniBalance, 4)}</TYPE.main> <TYPE.main fontSize={36}>{formatTokenAmount(uniBalance, 4)}</TYPE.main>
</AutoColumn> </AutoColumn>
......
src/components/vote/VoteModal.tsx
View file @ 4fede9df
...@@ -91,22 +91,22 @@ export default function VoteModal({ isOpen, onDismiss, proposalId, support }: Vo ...@@ -91,22 +91,22 @@ export default function VoteModal({ isOpen, onDismiss, proposalId, support }: Vo
<RowBetween> <RowBetween>
<TYPE.mediumHeader fontWeight={500}> <TYPE.mediumHeader fontWeight={500}>
{support ? ( {support ? (
<Trans id="vote.support.for">Vote for proposal {proposalId}</Trans> <Trans>Vote for proposal {proposalId}</Trans>
) : ( ) : (
<Trans id="vote.support.against">Vote against proposal {proposalId}</Trans> <Trans>Vote against proposal {proposalId}</Trans>
)} )}
</TYPE.mediumHeader> </TYPE.mediumHeader>
<StyledClosed stroke="black" onClick={wrappedOndismiss} /> <StyledClosed stroke="black" onClick={wrappedOndismiss} />
</RowBetween> </RowBetween>
<TYPE.largeHeader> <TYPE.largeHeader>
<Trans id="vote.numVotes">{formatTokenAmount(availableVotes, 4)} Votes</Trans> <Trans>{formatTokenAmount(availableVotes, 4)} Votes</Trans>
</TYPE.largeHeader> </TYPE.largeHeader>
<ButtonPrimary onClick={onVote}> <ButtonPrimary onClick={onVote}>
<TYPE.mediumHeader color="white"> <TYPE.mediumHeader color="white">
{support ? ( {support ? (
<Trans id="vote.support.for">Vote for proposal {proposalId}</Trans> <Trans>Vote for proposal {proposalId}</Trans>
) : ( ) : (
<Trans id="vote.support.against">Vote against proposal {proposalId}</Trans> <Trans>Vote against proposal {proposalId}</Trans>
)} )}
</TYPE.mediumHeader> </TYPE.mediumHeader>
</ButtonPrimary> </ButtonPrimary>
...@@ -125,11 +125,11 @@ export default function VoteModal({ isOpen, onDismiss, proposalId, support }: Vo ...@@ -125,11 +125,11 @@ export default function VoteModal({ isOpen, onDismiss, proposalId, support }: Vo
<AutoColumn gap="100px" justify={'center'}> <AutoColumn gap="100px" justify={'center'}>
<AutoColumn gap="12px" justify={'center'}> <AutoColumn gap="12px" justify={'center'}>
<TYPE.largeHeader> <TYPE.largeHeader>
<Trans id="vote.submitting">Submitting Vote</Trans> <Trans>Submitting Vote</Trans>
</TYPE.largeHeader> </TYPE.largeHeader>
</AutoColumn> </AutoColumn>
<TYPE.subHeader> <TYPE.subHeader>
<Trans id="vote.confirmInWallet">Confirm this transaction in your wallet</Trans> <Trans>Confirm this transaction in your wallet</Trans>
</TYPE.subHeader> </TYPE.subHeader>
</AutoColumn> </AutoColumn>
</ConfirmOrLoadingWrapper> </ConfirmOrLoadingWrapper>
...@@ -146,7 +146,7 @@ export default function VoteModal({ isOpen, onDismiss, proposalId, support }: Vo ...@@ -146,7 +146,7 @@ export default function VoteModal({ isOpen, onDismiss, proposalId, support }: Vo
<AutoColumn gap="100px" justify={'center'}> <AutoColumn gap="100px" justify={'center'}>
<AutoColumn gap="12px" justify={'center'}> <AutoColumn gap="12px" justify={'center'}>
<TYPE.largeHeader> <TYPE.largeHeader>
<Trans id="transactions.submitted">Transaction Submitted</Trans> <Trans>Transaction Submitted</Trans>
</TYPE.largeHeader> </TYPE.largeHeader>
</AutoColumn> </AutoColumn>
{chainId && ( {chainId && (
...@@ -155,7 +155,7 @@ export default function VoteModal({ isOpen, onDismiss, proposalId, support }: Vo ...@@ -155,7 +155,7 @@ export default function VoteModal({ isOpen, onDismiss, proposalId, support }: Vo
style={{ marginLeft: '4px' }} style={{ marginLeft: '4px' }}
> >
<TYPE.subHeader> <TYPE.subHeader>
<Trans id="wallet.viewOnEtherscan">View transaction on Etherscan</Trans> <Trans>View transaction on Etherscan</Trans>
</TYPE.subHeader> </TYPE.subHeader>
</ExternalLink> </ExternalLink>
)} )}
......
src/locales/de.po
View file @ 4fede9df
This diff is collapsed.
src/locales/en.po
View file @ 4fede9df
This diff is collapsed.
src/locales/es-AR.po
View file @ 4fede9df
This diff is collapsed.
src/locales/es-US.po
View file @ 4fede9df
This diff is collapsed.
src/locales/it-IT.po
View file @ 4fede9df
This diff is collapsed.
src/locales/iw.po
View file @ 4fede9df
This diff is collapsed.
src/locales/pseudo-en.po
View file @ 4fede9df
This diff is collapsed.
src/locales/ro.po
View file @ 4fede9df
This diff is collapsed.
src/locales/ru.po
View file @ 4fede9df
This diff is collapsed.
src/locales/vi.po
View file @ 4fede9df
This diff is collapsed.
src/locales/zh-CN.po
View file @ 4fede9df
This diff is collapsed.
src/locales/zh-TW.po
View file @ 4fede9df
This diff is collapsed.
src/pages/AddLiquidityV2/ConfirmAddModalBottom.tsx
View file @ 4fede9df
...@@ -27,7 +27,7 @@ export function ConfirmAddModalBottom({ ...@@ -27,7 +27,7 @@ export function ConfirmAddModalBottom({
<> <>
<RowBetween> <RowBetween>
<TYPE.body> <TYPE.body>
<Trans id="currencies.depositedSymbol">{currencies[Field.CURRENCY_A]?.symbol} Deposited</Trans> <Trans>{currencies[Field.CURRENCY_A]?.symbol} Deposited</Trans>
</TYPE.body> </TYPE.body>
<RowFixed> <RowFixed>
<CurrencyLogo currency={currencies[Field.CURRENCY_A]} style={{ marginRight: '8px' }} /> <CurrencyLogo currency={currencies[Field.CURRENCY_A]} style={{ marginRight: '8px' }} />
...@@ -36,7 +36,7 @@ export function ConfirmAddModalBottom({ ...@@ -36,7 +36,7 @@ export function ConfirmAddModalBottom({
</RowBetween> </RowBetween>
<RowBetween> <RowBetween>
<TYPE.body> <TYPE.body>
<Trans id="currencies.depositedSymbol">{currencies[Field.CURRENCY_B]?.symbol} Deposited</Trans> <Trans>{currencies[Field.CURRENCY_B]?.symbol} Deposited</Trans>
</TYPE.body> </TYPE.body>
<RowFixed> <RowFixed>
<CurrencyLogo currency={currencies[Field.CURRENCY_B]} style={{ marginRight: '8px' }} /> <CurrencyLogo currency={currencies[Field.CURRENCY_B]} style={{ marginRight: '8px' }} />
...@@ -45,7 +45,7 @@ export function ConfirmAddModalBottom({ ...@@ -45,7 +45,7 @@ export function ConfirmAddModalBottom({
</RowBetween> </RowBetween>
<RowBetween> <RowBetween>
<TYPE.body> <TYPE.body>
<Trans id="currencies.rates">Rates</Trans> <Trans>Rates</Trans>
</TYPE.body> </TYPE.body>
<TYPE.body> <TYPE.body>
{`1 ${currencies[Field.CURRENCY_A]?.symbol} = ${price?.toSignificant(4)} ${ {`1 ${currencies[Field.CURRENCY_A]?.symbol} = ${price?.toSignificant(4)} ${
...@@ -62,19 +62,15 @@ export function ConfirmAddModalBottom({ ...@@ -62,19 +62,15 @@ export function ConfirmAddModalBottom({
</RowBetween> </RowBetween>
<RowBetween> <RowBetween>
<TYPE.body> <TYPE.body>
<Trans id="pool.shareOfPool">Share of Pool:</Trans> <Trans>Share of Pool:</Trans>
</TYPE.body> </TYPE.body>
<TYPE.body> <TYPE.body>
<Trans id="number.valueWithPercent">{noLiquidity ? '100' : poolTokenPercentage?.toSignificant(4)}%</Trans> <Trans>{noLiquidity ? '100' : poolTokenPercentage?.toSignificant(4)}%</Trans>
</TYPE.body> </TYPE.body>
</RowBetween> </RowBetween>
<ButtonPrimary style={{ margin: '20px 0 0 0' }} onClick={onAdd}> <ButtonPrimary style={{ margin: '20px 0 0 0' }} onClick={onAdd}>
<Text fontWeight={500} fontSize={20}> <Text fontWeight={500} fontSize={20}>
{noLiquidity ? ( {noLiquidity ? <Trans>Create Pool & Supply</Trans> : <Trans>Confirm Supply</Trans>}
<Trans id="pool.createPoolAndSupply">Create Pool & Supply</Trans>
) : (
<Trans id="pool.confirmSupply">Confirm Supply</Trans>
)}
</Text> </Text>
</ButtonPrimary> </ButtonPrimary>
</> </>
......
src/pages/AddLiquidityV2/index.tsx
View file @ 4fede9df
...@@ -185,12 +185,9 @@ export default function AddLiquidity({ ...@@ -185,12 +185,9 @@ export default function AddLiquidity({
setAttemptingTxn(false) setAttemptingTxn(false)
addTransaction(response, { addTransaction(response, {
summary: t({ summary: t`Add ${parsedAmounts[Field.CURRENCY_A]?.toSignificant(3)} ${
id: 'transactions.summary.addLiquidityWithValue', currencies[Field.CURRENCY_A]?.symbol
message: `Add ${parsedAmounts[Field.CURRENCY_A]?.toSignificant(3)} ${ } and ${parsedAmounts[Field.CURRENCY_B]?.toSignificant(3)} ${currencies[Field.CURRENCY_B]?.symbol}`,
currencies[Field.CURRENCY_A]?.symbol
} and ${parsedAmounts[Field.CURRENCY_B]?.toSignificant(3)} ${currencies[Field.CURRENCY_B]?.symbol}`,
}),
}) })
setTxHash(response.hash) setTxHash(response.hash)
...@@ -245,7 +242,7 @@ export default function AddLiquidity({ ...@@ -245,7 +242,7 @@ export default function AddLiquidity({
</Text> </Text>
</Row> </Row>
<TYPE.italic fontSize={12} textAlign="left" padding={'8px 0 0 0 '}> <TYPE.italic fontSize={12} textAlign="left" padding={'8px 0 0 0 '}>
<Trans id="swap.outputEstimatedHint"> <Trans>
Output is estimated. If the price changes by more than {allowedSlippage.toSignificant(4)}% your transaction Output is estimated. If the price changes by more than {allowedSlippage.toSignificant(4)}% your transaction
will revert. will revert.
</Trans> </Trans>
...@@ -267,12 +264,9 @@ export default function AddLiquidity({ ...@@ -267,12 +264,9 @@ export default function AddLiquidity({
) )
} }
const pendingText = t({ const pendingText = t`Supplying ${parsedAmounts[Field.CURRENCY_A]?.toSignificant(6)} ${
id: 'addLiquidity.confirmation.pendingV2', currencies[Field.CURRENCY_A]?.symbol
message: `Supplying ${parsedAmounts[Field.CURRENCY_A]?.toSignificant(6)} ${ } and ${parsedAmounts[Field.CURRENCY_B]?.toSignificant(6)} ${currencies[Field.CURRENCY_B]?.symbol}`
currencies[Field.CURRENCY_A]?.symbol
} and ${parsedAmounts[Field.CURRENCY_B]?.toSignificant(6)} ${currencies[Field.CURRENCY_B]?.symbol}`,
})
const handleCurrencyASelect = useCallback( const handleCurrencyASelect = useCallback(
(currencyA: Currency) => { (currencyA: Currency) => {
...@@ -326,11 +320,7 @@ export default function AddLiquidity({ ...@@ -326,11 +320,7 @@ export default function AddLiquidity({
hash={txHash} hash={txHash}
content={() => ( content={() => (
<ConfirmationModalContent <ConfirmationModalContent
title={ title={noLiquidity ? t`You are creating a pool` : t`You will receive`}
noLiquidity
? t({ id: 'pool.creatingPool', message: 'You are creating a pool' })
: t({ id: 'pool.yourWillReceive', message: 'You will receive' })
}
onDismiss={handleDismissConfirmation} onDismiss={handleDismissConfirmation}
topContent={modalHeader} topContent={modalHeader}
bottomContent={modalBottom} bottomContent={modalBottom}
...@@ -346,15 +336,13 @@ export default function AddLiquidity({ ...@@ -346,15 +336,13 @@ export default function AddLiquidity({
<BlueCard> <BlueCard>
<AutoColumn gap="10px"> <AutoColumn gap="10px">
<TYPE.link fontWeight={600} color={'primaryText1'}> <TYPE.link fontWeight={600} color={'primaryText1'}>
<Trans id="pool.firstLiquidityProvider">You are the first liquidity provider.</Trans> <Trans>You are the first liquidity provider.</Trans>
</TYPE.link> </TYPE.link>
<TYPE.link fontWeight={400} color={'primaryText1'}> <TYPE.link fontWeight={400} color={'primaryText1'}>
<Trans id="pool.initialPriceHint"> <Trans>The ratio of tokens you add will set the price of this pool.</Trans>
The ratio of tokens you add will set the price of this pool.
</Trans>
</TYPE.link> </TYPE.link>
<TYPE.link fontWeight={400} color={'primaryText1'}> <TYPE.link fontWeight={400} color={'primaryText1'}>
<Trans id="pool.reviewHint">Once you are happy with the rate click supply to review.</Trans> <Trans>Once you are happy with the rate click supply to review.</Trans>
</TYPE.link> </TYPE.link>
</AutoColumn> </AutoColumn>
</BlueCard> </BlueCard>
...@@ -364,9 +352,9 @@ export default function AddLiquidity({ ...@@ -364,9 +352,9 @@ export default function AddLiquidity({
<BlueCard> <BlueCard>
<AutoColumn gap="10px"> <AutoColumn gap="10px">
<TYPE.link fontWeight={400} color={'primaryText1'}> <TYPE.link fontWeight={400} color={'primaryText1'}>
<Trans id="pool.addLiquidityLPHint"> <Trans>
<b> <b>
<Trans id="">Tip:</Trans> <Trans>Tip:</Trans>
</b>{' '} </b>{' '}
When you add liquidity, you will receive pool tokens representing your position. These tokens When you add liquidity, you will receive pool tokens representing your position. These tokens
automatically earn fees proportional to your share of the pool, and can be redeemed at any automatically earn fees proportional to your share of the pool, and can be redeemed at any
...@@ -410,9 +398,9 @@ export default function AddLiquidity({ ...@@ -410,9 +398,9 @@ export default function AddLiquidity({
<RowBetween padding="1rem"> <RowBetween padding="1rem">
<TYPE.subHeader fontWeight={500} fontSize={14}> <TYPE.subHeader fontWeight={500} fontSize={14}>
{noLiquidity ? ( {noLiquidity ? (
<Trans id="pool.prices.noLiquidity">Initial prices and pool share</Trans> <Trans>Initial prices and pool share</Trans>
) : ( ) : (
<Trans id="pool.prices.withLiquidity">Prices and pool share</Trans> <Trans>Prices and pool share</Trans>
)} )}
</TYPE.subHeader> </TYPE.subHeader>
</RowBetween>{' '} </RowBetween>{' '}
...@@ -431,12 +419,12 @@ export default function AddLiquidity({ ...@@ -431,12 +419,12 @@ export default function AddLiquidity({
{addIsUnsupported ? ( {addIsUnsupported ? (
<ButtonPrimary disabled={true}> <ButtonPrimary disabled={true}>
<TYPE.main mb="4px"> <TYPE.main mb="4px">
<Trans id="error.unsupportedAsset">Unsupported Asset</Trans> <Trans>Unsupported Asset</Trans>
</TYPE.main> </TYPE.main>
</ButtonPrimary> </ButtonPrimary>
) : !account ? ( ) : !account ? (
<ButtonLight onClick={toggleWalletModal}> <ButtonLight onClick={toggleWalletModal}>
<Trans id="wallet.connect">Connect Wallet</Trans> <Trans>Connect Wallet</Trans>
</ButtonLight> </ButtonLight>
) : ( ) : (
<AutoColumn gap={'md'}> <AutoColumn gap={'md'}>
...@@ -454,14 +442,10 @@ export default function AddLiquidity({ ...@@ -454,14 +442,10 @@ export default function AddLiquidity({
> >
{approvalA === ApprovalState.PENDING ? ( {approvalA === ApprovalState.PENDING ? (
<Dots> <Dots>
<Trans id="transactions.approvingCurrency"> <Trans>Approving {currencies[Field.CURRENCY_A]?.symbol}</Trans>
Approving {currencies[Field.CURRENCY_A]?.symbol}
</Trans>
</Dots> </Dots>
) : ( ) : (
<Trans id="transaction.approveCurrency"> <Trans>Approve {currencies[Field.CURRENCY_A]?.symbol}</Trans>
Approve {currencies[Field.CURRENCY_A]?.symbol}
</Trans>
)} )}
</ButtonPrimary> </ButtonPrimary>
)} )}
...@@ -473,14 +457,10 @@ export default function AddLiquidity({ ...@@ -473,14 +457,10 @@ export default function AddLiquidity({
> >
{approvalB === ApprovalState.PENDING ? ( {approvalB === ApprovalState.PENDING ? (
<Dots> <Dots>
<Trans id="transactions.approvingCurrency"> <Trans>Approving {currencies[Field.CURRENCY_B]?.symbol}</Trans>
Approving {currencies[Field.CURRENCY_B]?.symbol}
</Trans>
</Dots> </Dots>
) : ( ) : (
<Trans id="transaction.approveCurrency"> <Trans>Approve {currencies[Field.CURRENCY_B]?.symbol}</Trans>
Approve {currencies[Field.CURRENCY_B]?.symbol}
</Trans>
)} )}
</ButtonPrimary> </ButtonPrimary>
)} )}
...@@ -494,7 +474,7 @@ export default function AddLiquidity({ ...@@ -494,7 +474,7 @@ export default function AddLiquidity({
error={!isValid && !!parsedAmounts[Field.CURRENCY_A] && !!parsedAmounts[Field.CURRENCY_B]} error={!isValid && !!parsedAmounts[Field.CURRENCY_A] && !!parsedAmounts[Field.CURRENCY_B]}
> >
<Text fontSize={20} fontWeight={500}> <Text fontSize={20} fontWeight={500}>
{error ?? <Trans id="pool.buttons.supply">Supply</Trans>} {error ?? <Trans>Supply</Trans>}
</Text> </Text>
</ButtonError> </ButtonError>
</AutoColumn> </AutoColumn>
......
src/pages/Earn/Manage.tsx
View file @ 4fede9df
...@@ -157,7 +157,7 @@ export default function Manage({ ...@@ -157,7 +157,7 @@ export default function Manage({
<PageWrapper gap="lg" justify="center"> <PageWrapper gap="lg" justify="center">
<RowBetween style={{ gap: '24px' }}> <RowBetween style={{ gap: '24px' }}>
<TYPE.mediumHeader style={{ margin: 0 }}> <TYPE.mediumHeader style={{ margin: 0 }}>
<Trans id="earn.pool.liquidityMining"> <Trans>
{currencyA?.symbol}-{currencyB?.symbol} Liquidity Mining {currencyA?.symbol}-{currencyB?.symbol} Liquidity Mining
</Trans> </Trans>
</TYPE.mediumHeader> </TYPE.mediumHeader>
...@@ -168,7 +168,7 @@ export default function Manage({ ...@@ -168,7 +168,7 @@ export default function Manage({
<PoolData> <PoolData>
<AutoColumn gap="sm"> <AutoColumn gap="sm">
<TYPE.body style={{ margin: 0 }}> <TYPE.body style={{ margin: 0 }}>
<Trans id="earn.pool.totalDeposits">Total deposits</Trans> <Trans>Total deposits</Trans>
</TYPE.body> </TYPE.body>
<TYPE.body fontSize={24} fontWeight={500}> <TYPE.body fontSize={24} fontWeight={500}>
{valueOfTotalStakedAmountInUSDC {valueOfTotalStakedAmountInUSDC
...@@ -180,16 +180,16 @@ export default function Manage({ ...@@ -180,16 +180,16 @@ export default function Manage({
<PoolData> <PoolData>
<AutoColumn gap="sm"> <AutoColumn gap="sm">
<TYPE.body style={{ margin: 0 }}> <TYPE.body style={{ margin: 0 }}>
<Trans id="earn.pool.rate">Pool Rate</Trans> <Trans>Pool Rate</Trans>
</TYPE.body> </TYPE.body>
<TYPE.body fontSize={24} fontWeight={500}> <TYPE.body fontSize={24} fontWeight={500}>
{stakingInfo.active ? ( {stakingInfo.active ? (
<Trans id="earn.pool.rewardRate"> <Trans>
{stakingInfo.totalRewardRate?.multiply(BIG_INT_SECONDS_IN_WEEK)?.toFixed(0, { groupSeparator: ',' })}{' '} {stakingInfo.totalRewardRate?.multiply(BIG_INT_SECONDS_IN_WEEK)?.toFixed(0, { groupSeparator: ',' })}{' '}
UNI / week UNI / week
</Trans> </Trans>
) : ( ) : (
<Trans id="earn.pool.noRewardRate">0 UNI / week</Trans> <Trans>0 UNI / week</Trans>
)} )}
</TYPE.body> </TYPE.body>
</AutoColumn> </AutoColumn>
...@@ -204,12 +204,12 @@ export default function Manage({ ...@@ -204,12 +204,12 @@ export default function Manage({
<AutoColumn gap="md"> <AutoColumn gap="md">
<RowBetween> <RowBetween>
<TYPE.white fontWeight={600}> <TYPE.white fontWeight={600}>
<Trans id="earn.instructions1.title">Step 1. Get UNI-V2 Liquidity tokens</Trans> <Trans>Step 1. Get UNI-V2 Liquidity tokens</Trans>
</TYPE.white> </TYPE.white>
</RowBetween> </RowBetween>
<RowBetween style={{ marginBottom: '1rem' }}> <RowBetween style={{ marginBottom: '1rem' }}>
<TYPE.white fontSize={14}> <TYPE.white fontSize={14}>
<Trans id="earn.instructions1.hint"> <Trans>
UNI-V2 LP tokens are required. Once you&apos;ve added liquidity to the {currencyA?.symbol}- UNI-V2 LP tokens are required. Once you&apos;ve added liquidity to the {currencyA?.symbol}-
{currencyB?.symbol} pool you can stake your liquidity tokens on this page. {currencyB?.symbol} pool you can stake your liquidity tokens on this page.
</Trans> </Trans>
...@@ -222,7 +222,7 @@ export default function Manage({ ...@@ -222,7 +222,7 @@ export default function Manage({
as={Link} as={Link}
to={`/add/${currencyA && currencyId(currencyA)}/${currencyB && currencyId(currencyB)}`} to={`/add/${currencyA && currencyId(currencyA)}/${currencyB && currencyId(currencyB)}`}
> >
<Trans id="earn.pool.addLiquidity"> <Trans>
Add {currencyA?.symbol}-{currencyB?.symbol} liquidity Add {currencyA?.symbol}-{currencyB?.symbol} liquidity
</Trans> </Trans>
</ButtonPrimary> </ButtonPrimary>
...@@ -263,7 +263,7 @@ export default function Manage({ ...@@ -263,7 +263,7 @@ export default function Manage({
<AutoColumn gap="md"> <AutoColumn gap="md">
<RowBetween> <RowBetween>
<TYPE.white fontWeight={600}> <TYPE.white fontWeight={600}>
<Trans id="earn.pool.liquidityDeposited">Your liquidity deposits</Trans> <Trans>Your liquidity deposits</Trans>
</TYPE.white> </TYPE.white>
</RowBetween> </RowBetween>
<RowBetween style={{ alignItems: 'baseline' }}> <RowBetween style={{ alignItems: 'baseline' }}>
...@@ -271,7 +271,7 @@ export default function Manage({ ...@@ -271,7 +271,7 @@ export default function Manage({
{stakingInfo?.stakedAmount?.toSignificant(6) ?? '-'} {stakingInfo?.stakedAmount?.toSignificant(6) ?? '-'}
</TYPE.white> </TYPE.white>
<TYPE.white> <TYPE.white>
<Trans id="earn.claim.UNIV2"> <Trans>
UNI-V2 {currencyA?.symbol}-{currencyB?.symbol} UNI-V2 {currencyA?.symbol}-{currencyB?.symbol}
</Trans> </Trans>
</TYPE.white> </TYPE.white>
...@@ -286,7 +286,7 @@ export default function Manage({ ...@@ -286,7 +286,7 @@ export default function Manage({
<RowBetween> <RowBetween>
<div> <div>
<TYPE.black> <TYPE.black>
<Trans id="earn.claim.unclaimedUNI">Your unclaimed UNI</Trans> <Trans>Your unclaimed UNI</Trans>
</TYPE.black> </TYPE.black>
</div> </div>
{stakingInfo?.earnedAmount && JSBI.notEqual(BIG_INT_ZERO, stakingInfo?.earnedAmount?.quotient) && ( {stakingInfo?.earnedAmount && JSBI.notEqual(BIG_INT_ZERO, stakingInfo?.earnedAmount?.quotient) && (
...@@ -296,7 +296,7 @@ export default function Manage({ ...@@ -296,7 +296,7 @@ export default function Manage({
width="fit-content" width="fit-content"
onClick={() => setShowClaimRewardModal(true)} onClick={() => setShowClaimRewardModal(true)}
> >
<Trans id="earn.claim.label">Claim</Trans> <Trans>Claim</Trans>
</ButtonEmpty> </ButtonEmpty>
)} )}
</RowBetween> </RowBetween>
...@@ -318,12 +318,12 @@ export default function Manage({ ...@@ -318,12 +318,12 @@ export default function Manage({
</span> </span>
{stakingInfo.active ? ( {stakingInfo.active ? (
<Trans id="earn.pool.rewardRate"> <Trans>
{stakingInfo.rewardRate?.multiply(BIG_INT_SECONDS_IN_WEEK)?.toFixed(0, { groupSeparator: ',' })}{' '} {stakingInfo.rewardRate?.multiply(BIG_INT_SECONDS_IN_WEEK)?.toFixed(0, { groupSeparator: ',' })}{' '}
UNI / week UNI / week
</Trans> </Trans>
) : ( ) : (
<Trans id="earn.pool.noRewardRate">0 UNI / week</Trans> <Trans>0 UNI / week</Trans>
)} )}
</TYPE.black> </TYPE.black>
</RowBetween> </RowBetween>
...@@ -334,9 +334,7 @@ export default function Manage({ ...@@ -334,9 +334,7 @@ export default function Manage({
<span role="img" aria-label="wizard-icon" style={{ marginRight: '8px' }}> <span role="img" aria-label="wizard-icon" style={{ marginRight: '8px' }}>
⭐️ ⭐️
</span> </span>
<Trans id="earn.claim.withdrawingClaimsUNI"> <Trans>When you withdraw, the contract will automagically claim UNI on your behalf!</Trans>
When you withdraw, the contract will automagically claim UNI on your behalf!
</Trans>
</TYPE.main> </TYPE.main>
{!showAddLiquidityButton && ( {!showAddLiquidityButton && (
...@@ -344,9 +342,9 @@ export default function Manage({ ...@@ -344,9 +342,9 @@ export default function Manage({
{stakingInfo && stakingInfo.active && ( {stakingInfo && stakingInfo.active && (
<ButtonPrimary padding="8px" borderRadius="8px" width="160px" onClick={handleDepositClick}> <ButtonPrimary padding="8px" borderRadius="8px" width="160px" onClick={handleDepositClick}>
{stakingInfo?.stakedAmount?.greaterThan(JSBI.BigInt(0)) ? ( {stakingInfo?.stakedAmount?.greaterThan(JSBI.BigInt(0)) ? (
<Trans id="common.deposit">Deposit</Trans> <Trans>Deposit</Trans>
) : ( ) : (
<Trans id="earn.depositUNIVLP">Deposit UNI-V2 LP Tokens</Trans> <Trans>Deposit UNI-V2 LP Tokens</Trans>
)} )}
</ButtonPrimary> </ButtonPrimary>
)} )}
...@@ -359,7 +357,7 @@ export default function Manage({ ...@@ -359,7 +357,7 @@ export default function Manage({
width="160px" width="160px"
onClick={() => setShowUnstakingModal(true)} onClick={() => setShowUnstakingModal(true)}
> >
<Trans id="common.withdraw">Withdraw</Trans> <Trans>Withdraw</Trans>
</ButtonPrimary> </ButtonPrimary>
</> </>
)} )}
...@@ -367,9 +365,7 @@ export default function Manage({ ...@@ -367,9 +365,7 @@ export default function Manage({
)} )}
{!userLiquidityUnstaked ? null : userLiquidityUnstaked.equalTo('0') ? null : !stakingInfo?.active ? null : ( {!userLiquidityUnstaked ? null : userLiquidityUnstaked.equalTo('0') ? null : !stakingInfo?.active ? null : (
<TYPE.main> <TYPE.main>
<Trans id="earn.claim.UNIV2LPAvailable"> <Trans>{userLiquidityUnstaked.toSignificant(6)} UNI-V2 LP tokens available</Trans>
{userLiquidityUnstaked.toSignificant(6)} UNI-V2 LP tokens available
</Trans>
</TYPE.main> </TYPE.main>
)} )}
</PositionInfo> </PositionInfo>
......
src/pages/Earn/index.tsx
View file @ 4fede9df
...@@ -64,12 +64,12 @@ export default function Earn() { ...@@ -64,12 +64,12 @@ export default function Earn() {
<AutoColumn gap="md"> <AutoColumn gap="md">
<RowBetween> <RowBetween>
<TYPE.white fontWeight={600}> <TYPE.white fontWeight={600}>
<Trans id="earn.liquidityMining">Uniswap liquidity mining</Trans> <Trans>Uniswap liquidity mining</Trans>
</TYPE.white> </TYPE.white>
</RowBetween> </RowBetween>
<RowBetween> <RowBetween>
<TYPE.white fontSize={14}> <TYPE.white fontSize={14}>
<Trans id="earn.depositLPHint"> <Trans>
Deposit your Liquidity Provider tokens to receive UNI, the Uniswap protocol governance token. Deposit your Liquidity Provider tokens to receive UNI, the Uniswap protocol governance token.
</Trans> </Trans>
</TYPE.white> </TYPE.white>
...@@ -80,7 +80,7 @@ export default function Earn() { ...@@ -80,7 +80,7 @@ export default function Earn() {
target="_blank" target="_blank"
> >
<TYPE.white fontSize={14}> <TYPE.white fontSize={14}>
<Trans id="uni.readMore">Read more about UNI</Trans> <Trans>Read more about UNI</Trans>
</TYPE.white> </TYPE.white>
</ExternalLink> </ExternalLink>
</AutoColumn> </AutoColumn>
...@@ -93,7 +93,7 @@ export default function Earn() { ...@@ -93,7 +93,7 @@ export default function Earn() {
<AutoColumn gap="lg" style={{ width: '100%', maxWidth: '720px' }}> <AutoColumn gap="lg" style={{ width: '100%', maxWidth: '720px' }}>
<DataRow style={{ alignItems: 'baseline' }}> <DataRow style={{ alignItems: 'baseline' }}>
<TYPE.mediumHeader style={{ marginTop: '0.5rem' }}> <TYPE.mediumHeader style={{ marginTop: '0.5rem' }}>
<Trans id="earn.participatingPools">Participating pools</Trans> <Trans>Participating pools</Trans>
</TYPE.mediumHeader> </TYPE.mediumHeader>
<Countdown exactEnd={stakingInfos?.[0]?.periodFinish} /> <Countdown exactEnd={stakingInfos?.[0]?.periodFinish} />
</DataRow> </DataRow>
...@@ -103,11 +103,11 @@ export default function Earn() { ...@@ -103,11 +103,11 @@ export default function Earn() {
<Loader style={{ margin: 'auto' }} /> <Loader style={{ margin: 'auto' }} />
) : !stakingRewardsExist ? ( ) : !stakingRewardsExist ? (
<OutlineCard> <OutlineCard>
<Trans id="earn.noActivePools">No active pools</Trans> <Trans>No active pools</Trans>
</OutlineCard> </OutlineCard>
) : stakingInfos?.length !== 0 && stakingInfosWithBalance.length === 0 ? ( ) : stakingInfos?.length !== 0 && stakingInfosWithBalance.length === 0 ? (
<OutlineCard> <OutlineCard>
<Trans id="earn.noActivePools">No active pools</Trans> <Trans>No active pools</Trans>
</OutlineCard> </OutlineCard>
) : ( ) : (
stakingInfosWithBalance?.map((stakingInfo) => { stakingInfosWithBalance?.map((stakingInfo) => {
......
src/pages/MigrateV2/index.tsx
View file @ 4fede9df
...@@ -112,20 +112,15 @@ export default function MigrateV2() { ...@@ -112,20 +112,15 @@ export default function MigrateV2() {
<AutoRow style={{ alignItems: 'center', justifyContent: 'space-between' }} gap="8px"> <AutoRow style={{ alignItems: 'center', justifyContent: 'space-between' }} gap="8px">
<BackArrow to="/pool" /> <BackArrow to="/pool" />
<TYPE.mediumHeader> <TYPE.mediumHeader>
<Trans id="migrate.buttons.migrateV2Liquidity">Migrate V2 Liquidity</Trans> <Trans>Migrate V2 Liquidity</Trans>
</TYPE.mediumHeader> </TYPE.mediumHeader>
<div> <div>
<QuestionHelper <QuestionHelper text={t`Migrate your liquidity tokens from Uniswap V2 to Uniswap V3.`} />
text={t({
id: 'migrate.hint.migrateFromV2ToV3',
message: 'Migrate your liquidity tokens from Uniswap V2 to Uniswap V3.',
})}
/>
</div> </div>
</AutoRow> </AutoRow>
<TYPE.body style={{ marginBottom: 8, fontWeight: 400 }}> <TYPE.body style={{ marginBottom: 8, fontWeight: 400 }}>
<Trans id="migrate.hint.clickToRemoveV2"> <Trans>
For each pool shown below, click migrate to remove your liquidity from Uniswap V2 and deposit it into For each pool shown below, click migrate to remove your liquidity from Uniswap V2 and deposit it into
Uniswap V3. Uniswap V3.
</Trans> </Trans>
...@@ -134,16 +129,14 @@ export default function MigrateV2() { ...@@ -134,16 +129,14 @@ export default function MigrateV2() {
{!account ? ( {!account ? (
<LightCard padding="40px"> <LightCard padding="40px">
<TYPE.body color={theme.text3} textAlign="center"> <TYPE.body color={theme.text3} textAlign="center">
<Trans id="migrate.hint.connectWalltToViewV2Liquidity"> <Trans>Connect to a wallet to view your V2 liquidity.</Trans>
Connect to a wallet to view your V2 liquidity.
</Trans>
</TYPE.body> </TYPE.body>
</LightCard> </LightCard>
) : v2IsLoading ? ( ) : v2IsLoading ? (
<LightCard padding="40px"> <LightCard padding="40px">
<TYPE.body color={theme.text3} textAlign="center"> <TYPE.body color={theme.text3} textAlign="center">
<Dots> <Dots>
<Trans id="common.loading">Loading</Trans> <Trans>Loading</Trans>
</Dots> </Dots>
</TYPE.body> </TYPE.body>
</LightCard> </LightCard>
...@@ -172,7 +165,7 @@ export default function MigrateV2() { ...@@ -172,7 +165,7 @@ export default function MigrateV2() {
<AutoColumn justify={'center'} gap="md"> <AutoColumn justify={'center'} gap="md">
<Text textAlign="center" fontSize={14} style={{ padding: '.5rem 0 .5rem 0' }}> <Text textAlign="center" fontSize={14} style={{ padding: '.5rem 0 .5rem 0' }}>
<Trans id="migrate.hint.importV2Position"> <Trans>
Don’t see one of your v2 positions?{' '} Don’t see one of your v2 positions?{' '}
<StyledInternalLink id="import-pool-link" to={'/find?origin=/migrate/v2'}> <StyledInternalLink id="import-pool-link" to={'/find?origin=/migrate/v2'}>
Import it. Import it.
......
src/pages/Pool/v2.tsx
View file @ 4fede9df
...@@ -137,12 +137,12 @@ export default function Pool() { ...@@ -137,12 +137,12 @@ export default function Pool() {
<AutoColumn gap="md"> <AutoColumn gap="md">
<RowBetween> <RowBetween>
<TYPE.white fontWeight={600}> <TYPE.white fontWeight={600}>
<Trans id="pools.labels.liquidityProviderRewards">Liquidity provider rewards</Trans> <Trans>Liquidity provider rewards</Trans>
</TYPE.white> </TYPE.white>
</RowBetween> </RowBetween>
<RowBetween> <RowBetween>
<TYPE.white fontSize={14}> <TYPE.white fontSize={14}>
<Trans id="pools.hints.liquidityProviderRewards"> <Trans>
Liquidity providers earn a 0.3% fee on all trades proportional to their share of the pool. Fees are Liquidity providers earn a 0.3% fee on all trades proportional to their share of the pool. Fees are
added to the pool, accrue in real time and can be claimed by withdrawing your liquidity. added to the pool, accrue in real time and can be claimed by withdrawing your liquidity.
</Trans> </Trans>
...@@ -154,7 +154,7 @@ export default function Pool() { ...@@ -154,7 +154,7 @@ export default function Pool() {
href="https://uniswap.org/docs/v2/core-concepts/pools/" href="https://uniswap.org/docs/v2/core-concepts/pools/"
> >
<TYPE.white fontSize={14}> <TYPE.white fontSize={14}>
<Trans id="pools.hints.readAboutProvidingLiquidity">Read more about providing liquidity</Trans> <Trans>Read more about providing liquidity</Trans>
</TYPE.white> </TYPE.white>
</ExternalLink> </ExternalLink>
</AutoColumn> </AutoColumn>
...@@ -168,12 +168,12 @@ export default function Pool() { ...@@ -168,12 +168,12 @@ export default function Pool() {
<TitleRow style={{ marginTop: '1rem' }} padding={'0'}> <TitleRow style={{ marginTop: '1rem' }} padding={'0'}>
<HideSmall> <HideSmall>
<TYPE.mediumHeader style={{ marginTop: '0.5rem', justifySelf: 'flex-start' }}> <TYPE.mediumHeader style={{ marginTop: '0.5rem', justifySelf: 'flex-start' }}>
<Trans id="pools.labels.yourV2Liquidity">Your V2 liquidity</Trans> <Trans>Your V2 liquidity</Trans>
</TYPE.mediumHeader> </TYPE.mediumHeader>
</HideSmall> </HideSmall>
<ButtonRow> <ButtonRow>
<ResponsiveButtonSecondary as={Link} padding="6px 8px" to="/add/v2/ETH"> <ResponsiveButtonSecondary as={Link} padding="6px 8px" to="/add/v2/ETH">
<Trans id="pools.buttons.createPair">Create a pair</Trans> <Trans>Create a pair</Trans>
</ResponsiveButtonSecondary> </ResponsiveButtonSecondary>
<ResponsiveButtonPrimary <ResponsiveButtonPrimary
id="join-pool-button" id="join-pool-button"
...@@ -183,7 +183,7 @@ export default function Pool() { ...@@ -183,7 +183,7 @@ export default function Pool() {
to="/add/v2/ETH" to="/add/v2/ETH"
> >
<Text fontWeight={500} fontSize={16}> <Text fontWeight={500} fontSize={16}>
<Trans id="pools.buttons.addV2Liquidity">Add V2 Liquidity</Trans> <Trans>Add V2 Liquidity</Trans>
</Text> </Text>
</ResponsiveButtonPrimary> </ResponsiveButtonPrimary>
</ButtonRow> </ButtonRow>
...@@ -192,14 +192,14 @@ export default function Pool() { ...@@ -192,14 +192,14 @@ export default function Pool() {
{!account ? ( {!account ? (
<Card padding="40px"> <Card padding="40px">
<TYPE.body color={theme.text3} textAlign="center"> <TYPE.body color={theme.text3} textAlign="center">
<Trans id="wallet.connectWalletToViewLiquidity">Connect to a wallet to view your liquidity.</Trans> <Trans>Connect to a wallet to view your liquidity.</Trans>
</TYPE.body> </TYPE.body>
</Card> </Card>
) : v2IsLoading ? ( ) : v2IsLoading ? (
<EmptyProposals> <EmptyProposals>
<TYPE.body color={theme.text3} textAlign="center"> <TYPE.body color={theme.text3} textAlign="center">
<Dots> <Dots>
<Trans id="common.loading">Loading</Trans> <Trans>Loading</Trans>
</Dots> </Dots>
</TYPE.body> </TYPE.body>
</EmptyProposals> </EmptyProposals>
...@@ -207,7 +207,7 @@ export default function Pool() { ...@@ -207,7 +207,7 @@ export default function Pool() {
<> <>
<ButtonSecondary> <ButtonSecondary>
<RowBetween> <RowBetween>
<Trans id="pools.buttons.accountAnalytics"> <Trans>
<ExternalLink href={'https://v2.info.uniswap.org/account/' + account}> <ExternalLink href={'https://v2.info.uniswap.org/account/' + account}>
Account analytics and accrued fees Account analytics and accrued fees
</ExternalLink> </ExternalLink>
...@@ -242,14 +242,14 @@ export default function Pool() { ...@@ -242,14 +242,14 @@ export default function Pool() {
}} }}
> >
<ChevronsRight size={16} style={{ marginRight: '8px' }} /> <ChevronsRight size={16} style={{ marginRight: '8px' }} />
<Trans id="pools.buttons.migrateLiquidityToV3">Migrate Liquidity to V3</Trans> <Trans>Migrate Liquidity to V3</Trans>
</ButtonOutlined> </ButtonOutlined>
</RowFixed> </RowFixed>
</> </>
) : ( ) : (
<EmptyProposals> <EmptyProposals>
<TYPE.body color={theme.text3} textAlign="center"> <TYPE.body color={theme.text3} textAlign="center">
<Trans id="pools.labels.noLiquidityFound">No liquidity found.</Trans> <Trans>No liquidity found.</Trans>
</TYPE.body> </TYPE.body>
</EmptyProposals> </EmptyProposals>
)} )}
......
src/pages/Swap/index.tsx
View file @ 4fede9df
...@@ -479,7 +479,7 @@ export default function Swap({ history }: RouteComponentProps) { ...@@ -479,7 +479,7 @@ export default function Swap({ history }: RouteComponentProps) {
}} }}
> >
<TYPE.black fontSize={12}> <TYPE.black fontSize={12}>
<Trans id="swap.buttons.v3">V3</Trans> <Trans>V3</Trans>
</TYPE.black> </TYPE.black>
</ButtonGray> </ButtonGray>
)} )}
......
src/pages/Vote/VotePage.tsx
View file @ 4fede9df
...@@ -158,14 +158,12 @@ export default function VotePage({ ...@@ -158,14 +158,12 @@ export default function VotePage({
// get total votes and format percentages for UI // get total votes and format percentages for UI
const totalVotes: number | undefined = proposalData ? proposalData.forCount + proposalData.againstCount : undefined const totalVotes: number | undefined = proposalData ? proposalData.forCount + proposalData.againstCount : undefined
const forPercentage: string = t({ const forPercentage: string = t`${
id: 'currencies.valueWithPercent', proposalData && totalVotes ? ((proposalData.forCount * 100) / totalVotes).toFixed(0) : '0'
message: `${proposalData && totalVotes ? ((proposalData.forCount * 100) / totalVotes).toFixed(0) : '0'} %`, } %`
}) const againstPercentage: string = t`${
const againstPercentage: string = t({ proposalData && totalVotes ? ((proposalData.againstCount * 100) / totalVotes).toFixed(0) : '0'
id: 'currencies.valueWithPercent', } %`
message: `${proposalData && totalVotes ? ((proposalData.againstCount * 100) / totalVotes).toFixed(0) : '0'} %`,
})
// only count available votes as of the proposal start block // only count available votes as of the proposal start block
const availableVotes: CurrencyAmount<Token> | undefined = useUserVotesAsOfBlock(proposalData?.startBlock ?? undefined) const availableVotes: CurrencyAmount<Token> | undefined = useUserVotesAsOfBlock(proposalData?.startBlock ?? undefined)
...@@ -203,15 +201,11 @@ export default function VotePage({ ...@@ -203,15 +201,11 @@ export default function VotePage({
return ( return (
<PageWrapper gap="lg" justify="center"> <PageWrapper gap="lg" justify="center">
<VoteModal isOpen={showVoteModal} onDismiss={toggleVoteModal} proposalId={proposalData?.id} support={support} /> <VoteModal isOpen={showVoteModal} onDismiss={toggleVoteModal} proposalId={proposalData?.id} support={support} />
<DelegateModal <DelegateModal isOpen={showDelegateModal} onDismiss={toggleDelegateModal} title={t`Unlock Votes`} />
isOpen={showDelegateModal}
onDismiss={toggleDelegateModal}
title={t({ id: 'vote.labels.unlockVotes', message: 'Unlock Votes' })}
/>
<ProposalInfo gap="lg" justify="start"> <ProposalInfo gap="lg" justify="start">
<RowBetween style={{ width: '100%' }}> <RowBetween style={{ width: '100%' }}>
<ArrowWrapper to="/vote"> <ArrowWrapper to="/vote">
<Trans id="vote.labels.allProposals"> <Trans>
<ArrowLeft size={20} /> All Proposals <ArrowLeft size={20} /> All Proposals
</Trans> </Trans>
</ArrowWrapper> </ArrowWrapper>
...@@ -224,13 +218,9 @@ export default function VotePage({ ...@@ -224,13 +218,9 @@ export default function VotePage({
<RowBetween> <RowBetween>
<TYPE.main> <TYPE.main>
{endDate && endDate < now ? ( {endDate && endDate < now ? (
<Trans id="vote.labels.votingEnded"> <Trans>Voting ended {endDate && endDate.toLocaleString(DateTime.DATETIME_FULL)}</Trans>
Voting ended {endDate && endDate.toLocaleString(DateTime.DATETIME_FULL)}
</Trans>
) : proposalData ? ( ) : proposalData ? (
<Trans id="vote.labels.votingEndsApproximately"> <Trans>Voting ends approximately {endDate && endDate.toLocaleString(DateTime.DATETIME_FULL)}</Trans>
Voting ends approximately {endDate && endDate.toLocaleString(DateTime.DATETIME_FULL)}
</Trans>
) : ( ) : (
'' ''
)} )}
...@@ -239,13 +229,13 @@ export default function VotePage({ ...@@ -239,13 +229,13 @@ export default function VotePage({
{proposalData && proposalData.status === ProposalState.Active && !showVotingButtons && ( {proposalData && proposalData.status === ProposalState.Active && !showVotingButtons && (
<GreyCard> <GreyCard>
<TYPE.black> <TYPE.black>
<Trans id="vote.hint.votingEligibility"> <Trans>
Only UNI votes that were self delegated or delegated to another address before block{' '} Only UNI votes that were self delegated or delegated to another address before block{' '}
{proposalData.startBlock} are eligible for voting.{' '} {proposalData.startBlock} are eligible for voting.{' '}
</Trans> </Trans>
{showLinkForUnlock && ( {showLinkForUnlock && (
<span> <span>
<Trans id="vote.hint.unlockVoting"> <Trans>
<StyledInternalLink to="/vote">Unlock voting</StyledInternalLink> to prepare for the next <StyledInternalLink to="/vote">Unlock voting</StyledInternalLink> to prepare for the next
proposal. proposal.
</Trans> </Trans>
...@@ -275,7 +265,7 @@ export default function VotePage({ ...@@ -275,7 +265,7 @@ export default function VotePage({
toggleVoteModal() toggleVoteModal()
}} }}
> >
<Trans id="vote.buttons.voteAgainst">Vote Against</Trans> <Trans>Vote Against</Trans>
</ButtonPrimary> </ButtonPrimary>
</RowFixed> </RowFixed>
) : ( ) : (
...@@ -286,9 +276,9 @@ export default function VotePage({ ...@@ -286,9 +276,9 @@ export default function VotePage({
<CardSection> <CardSection>
<AutoColumn gap="md"> <AutoColumn gap="md">
<WrapSmall> <WrapSmall>
<Trans id="vote.labels.for"> <Trans>
<TYPE.black fontWeight={600}> <TYPE.black fontWeight={600}>
<Trans id="">For</Trans> <Trans>For</Trans>
</TYPE.black> </TYPE.black>
<TYPE.black fontWeight={600}> <TYPE.black fontWeight={600}>
{' '} {' '}
...@@ -307,7 +297,7 @@ export default function VotePage({ ...@@ -307,7 +297,7 @@ export default function VotePage({
<AutoColumn gap="md"> <AutoColumn gap="md">
<WrapSmall> <WrapSmall>
<TYPE.black fontWeight={600}> <TYPE.black fontWeight={600}>
<Trans id="vote.labels.against">Against</Trans> <Trans>Against</Trans>
</TYPE.black> </TYPE.black>
<TYPE.black fontWeight={600}> <TYPE.black fontWeight={600}>
{proposalData?.againstCount.toLocaleString(undefined, { maximumFractionDigits: 0 })} {proposalData?.againstCount.toLocaleString(undefined, { maximumFractionDigits: 0 })}
...@@ -322,7 +312,7 @@ export default function VotePage({ ...@@ -322,7 +312,7 @@ export default function VotePage({
</CardWrapper> </CardWrapper>
<AutoColumn gap="md"> <AutoColumn gap="md">
<TYPE.mediumHeader fontWeight={600}> <TYPE.mediumHeader fontWeight={600}>
<Trans id="vote.labels.details">Details</Trans> <Trans>Details</Trans>
</TYPE.mediumHeader> </TYPE.mediumHeader>
{proposalData?.details?.map((d, i) => { {proposalData?.details?.map((d, i) => {
return ( return (
...@@ -343,7 +333,7 @@ export default function VotePage({ ...@@ -343,7 +333,7 @@ export default function VotePage({
</AutoColumn> </AutoColumn>
<AutoColumn gap="md"> <AutoColumn gap="md">
<TYPE.mediumHeader fontWeight={600}> <TYPE.mediumHeader fontWeight={600}>
<Trans id="vote.labels.description">Description</Trans> <Trans>Description</Trans>
</TYPE.mediumHeader> </TYPE.mediumHeader>
<MarkDownWrapper> <MarkDownWrapper>
<ReactMarkdown source={proposalData?.description} /> <ReactMarkdown source={proposalData?.description} />
...@@ -351,7 +341,7 @@ export default function VotePage({ ...@@ -351,7 +341,7 @@ export default function VotePage({
</AutoColumn> </AutoColumn>
<AutoColumn gap="md"> <AutoColumn gap="md">
<TYPE.mediumHeader fontWeight={600}> <TYPE.mediumHeader fontWeight={600}>
<Trans id="vote.labels.proposer">Proposer</Trans> <Trans>Proposer</Trans>
</TYPE.mediumHeader> </TYPE.mediumHeader>
<ProposerAddressLink <ProposerAddressLink
href={ href={
......
src/pages/Vote/index.tsx
View file @ 4fede9df
...@@ -139,11 +139,7 @@ export default function Vote() { ...@@ -139,11 +139,7 @@ export default function Vote() {
<DelegateModal <DelegateModal
isOpen={showDelegateModal} isOpen={showDelegateModal}
onDismiss={toggleDelegateModal} onDismiss={toggleDelegateModal}
title={ title={showUnlockVoting ? t`Unlock Votes` : t`Update Delegation`}
showUnlockVoting
? t({ id: 'vote.delegates.unlockVotes', message: 'Unlock Votes' })
: t({ id: 'vote.delegates.update', message: 'Update Delegation' })
}
/> />
<TopSection gap="md"> <TopSection gap="md">
<VoteCard> <VoteCard>
...@@ -153,12 +149,12 @@ export default function Vote() { ...@@ -153,12 +149,12 @@ export default function Vote() {
<AutoColumn gap="md"> <AutoColumn gap="md">
<RowBetween> <RowBetween>
<TYPE.white fontWeight={600}> <TYPE.white fontWeight={600}>
<Trans id="vote.labels.uniswapGovernance">Uniswap Governance</Trans> <Trans>Uniswap Governance</Trans>
</TYPE.white> </TYPE.white>
</RowBetween> </RowBetween>
<RowBetween> <RowBetween>
<TYPE.white fontSize={14}> <TYPE.white fontSize={14}>
<Trans id="vote.hints.votingShares"> <Trans>
UNI tokens represent voting shares in Uniswap governance. You can vote on each proposal yourself or UNI tokens represent voting shares in Uniswap governance. You can vote on each proposal yourself or
delegate your votes to a third party. delegate your votes to a third party.
</Trans> </Trans>
...@@ -170,7 +166,7 @@ export default function Vote() { ...@@ -170,7 +166,7 @@ export default function Vote() {
target="_blank" target="_blank"
> >
<TYPE.white fontSize={14}> <TYPE.white fontSize={14}>
<Trans id="vote.hints.readMoreUniswapGovernance">Read more about Uniswap governance</Trans> <Trans>Read more about Uniswap governance</Trans>
</TYPE.white> </TYPE.white>
</ExternalLink> </ExternalLink>
</AutoColumn> </AutoColumn>
...@@ -182,7 +178,7 @@ export default function Vote() { ...@@ -182,7 +178,7 @@ export default function Vote() {
<TopSection gap="2px"> <TopSection gap="2px">
<WrapSmall> <WrapSmall>
<TYPE.mediumHeader style={{ margin: '0.5rem 0.5rem 0.5rem 0', flexShrink: 0 }}> <TYPE.mediumHeader style={{ margin: '0.5rem 0.5rem 0.5rem 0', flexShrink: 0 }}>
<Trans id="vote.labels.proposals">Proposals</Trans> <Trans>Proposals</Trans>
</TYPE.mediumHeader> </TYPE.mediumHeader>
{(!allProposals || allProposals.length === 0) && !availableVotes && <Loader />} {(!allProposals || allProposals.length === 0) && !availableVotes && <Loader />}
{showUnlockVoting ? ( {showUnlockVoting ? (
...@@ -192,11 +188,11 @@ export default function Vote() { ...@@ -192,11 +188,11 @@ export default function Vote() {
borderRadius="8px" borderRadius="8px"
onClick={toggleDelegateModal} onClick={toggleDelegateModal}
> >
<Trans id="vote.buttons.unlockVoting">Unlock Voting</Trans> <Trans>Unlock Voting</Trans>
</ButtonPrimary> </ButtonPrimary>
) : availableVotes && JSBI.notEqual(JSBI.BigInt(0), availableVotes?.quotient) ? ( ) : availableVotes && JSBI.notEqual(JSBI.BigInt(0), availableVotes?.quotient) ? (
<TYPE.body fontWeight={500} mr="6px"> <TYPE.body fontWeight={500} mr="6px">
<Trans id="vote.labels.availableVotes"> <Trans>
<FormattedCurrencyAmount currencyAmount={availableVotes} /> Votes <FormattedCurrencyAmount currencyAmount={availableVotes} /> Votes
</Trans> </Trans>
</TYPE.body> </TYPE.body>
...@@ -205,7 +201,7 @@ export default function Vote() { ...@@ -205,7 +201,7 @@ export default function Vote() {
userDelegatee !== ZERO_ADDRESS && userDelegatee !== ZERO_ADDRESS &&
JSBI.notEqual(JSBI.BigInt(0), uniBalance?.quotient) ? ( JSBI.notEqual(JSBI.BigInt(0), uniBalance?.quotient) ? (
<TYPE.body fontWeight={500} mr="6px"> <TYPE.body fontWeight={500} mr="6px">
<Trans id="vote.labels.availableVotes"> <Trans>
<FormattedCurrencyAmount currencyAmount={uniBalance} /> Votes <FormattedCurrencyAmount currencyAmount={uniBalance} /> Votes
</Trans> </Trans>
</TYPE.body> </TYPE.body>
...@@ -219,21 +215,17 @@ export default function Vote() { ...@@ -219,21 +215,17 @@ export default function Vote() {
{userDelegatee && userDelegatee !== ZERO_ADDRESS ? ( {userDelegatee && userDelegatee !== ZERO_ADDRESS ? (
<RowFixed> <RowFixed>
<TYPE.body fontWeight={500} mr="4px"> <TYPE.body fontWeight={500} mr="4px">
<Trans id="vote.labels.delegatedTo">Delegated to:</Trans> <Trans>Delegated to:</Trans>
</TYPE.body> </TYPE.body>
<AddressButton> <AddressButton>
<StyledExternalLink <StyledExternalLink
href={getExplorerLink(1, userDelegatee, ExplorerDataType.ADDRESS)} href={getExplorerLink(1, userDelegatee, ExplorerDataType.ADDRESS)}
style={{ margin: '0 4px' }} style={{ margin: '0 4px' }}
> >
{userDelegatee === account ? ( {userDelegatee === account ? <Trans>Self</Trans> : shortenAddress(userDelegatee)}
<Trans id="vote.labels.self">Self</Trans>
) : (
shortenAddress(userDelegatee)
)}
</StyledExternalLink> </StyledExternalLink>
<TextButton onClick={toggleDelegateModal} style={{ marginLeft: '4px' }}> <TextButton onClick={toggleDelegateModal} style={{ marginLeft: '4px' }}>
<Trans id="vote.buttons.edit">(edit)</Trans> <Trans>(edit)</Trans>
</TextButton> </TextButton>
</AddressButton> </AddressButton>
</RowFixed> </RowFixed>
...@@ -245,13 +237,11 @@ export default function Vote() { ...@@ -245,13 +237,11 @@ export default function Vote() {
{allProposals?.length === 0 && ( {allProposals?.length === 0 && (
<EmptyProposals> <EmptyProposals>
<TYPE.body style={{ marginBottom: '8px' }}> <TYPE.body style={{ marginBottom: '8px' }}>
<Trans id="vote.labels.noProposalsFound">No proposals found.</Trans> <Trans>No proposals found.</Trans>
</TYPE.body> </TYPE.body>
<TYPE.subHeader> <TYPE.subHeader>
<i> <i>
<Trans id="vote.hints.proposalSubmitted"> <Trans>Proposals submitted by community members will appear here.</Trans>
Proposals submitted by community members will appear here.
</Trans>
</i> </i>
</TYPE.subHeader> </TYPE.subHeader>
</EmptyProposals> </EmptyProposals>
...@@ -267,9 +257,7 @@ export default function Vote() { ...@@ -267,9 +257,7 @@ export default function Vote() {
})} })}
</TopSection> </TopSection>
<TYPE.subHeader color="text3"> <TYPE.subHeader color="text3">
<Trans id="vote.hints.submissionThreshold"> <Trans>A minimum threshold of 1% of the total UNI supply is required to submit proposals</Trans>
A minimum threshold of 1% of the total UNI supply is required to submit proposals
</Trans>
</TYPE.subHeader> </TYPE.subHeader>
</PageWrapper> </PageWrapper>
) )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment