Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: ccip fee amounts and limit handling[skip cypress] #2240

Merged
merged 8 commits into from
Nov 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
75 changes: 75 additions & 0 deletions src/components/transactions/Bridge/BridgeAmount.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
import { Trans } from '@lingui/macro';
import { Typography, useTheme } from '@mui/material';
import { formatEther } from 'ethers/lib/utils';
import { FormattedNumber } from 'src/components/primitives/FormattedNumber';
import { TextWithTooltip } from 'src/components/TextWithTooltip';
import { GHO_SYMBOL } from 'src/utils/ghoUtilities';

import { DetailsNumberLine } from '../FlowCommons/TxModalDetails';

export const BridgeAmount = ({
amount,
maxAmountToBridgeFormatted,
maxAmountReducedDueToBridgeLimit,
maxAmountReducedDueToRateLimit,
refillRate,
maxRateLimitCapacity,
}: {
amount: string;
maxAmountToBridgeFormatted: string;
maxAmountReducedDueToBridgeLimit: boolean;
maxAmountReducedDueToRateLimit: boolean;
refillRate: string;
maxRateLimitCapacity: string;
}) => {
const { palette } = useTheme();

const bridgeLimitTooltip = (
<Typography variant="caption">
Due to bridging limits, the maximum amount currently available to bridge is{' '}
<FormattedNumber variant="caption" value={maxAmountToBridgeFormatted} visibleDecimals={2} />
</Typography>
);

const rateLimitTooltip = (
<Typography variant="caption">
The amount you can bridge is currently reduced because of the rate limit. The limit is raised
at a rate of{' '}
<FormattedNumber variant="caption" value={formatEther(refillRate)} visibleDecimals={2} /> GHO
per second, until the maximum amount of{' '}
<FormattedNumber
variant="caption"
value={formatEther(maxRateLimitCapacity)}
visibleDecimals={2}
/>{' '}
is reached.
</Typography>
);

return (
<DetailsNumberLine
description={
amount !== '' && (maxAmountReducedDueToBridgeLimit || maxAmountReducedDueToRateLimit) ? (
<TextWithTooltip
text={
<Typography color={palette.warning.main}>
<Trans>Amount</Trans>
</Typography>
}
iconColor="warning.main"
>
<>
{maxAmountReducedDueToBridgeLimit && bridgeLimitTooltip}
{maxAmountReducedDueToRateLimit && rateLimitTooltip}
</>
</TextWithTooltip>
) : (
<Trans>Amount</Trans>
)
}
iconSymbol={GHO_SYMBOL}
symbol={GHO_SYMBOL}
value={amount}
/>
);
};
147 changes: 147 additions & 0 deletions src/components/transactions/Bridge/BridgeFeeTokenSelector.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,147 @@
import { Trans } from '@lingui/macro';
import {
Box,
FormControl,
MenuItem,
Select,
SelectChangeEvent,
Skeleton,
Stack,
useTheme,
} from '@mui/material';
import { FormattedNumber } from 'src/components/primitives/FormattedNumber';
import { Link } from 'src/components/primitives/Link';
import { NoData } from 'src/components/primitives/NoData';
import { Row } from 'src/components/primitives/Row';
import { TokenIcon } from 'src/components/primitives/TokenIcon';
import { TextWithTooltip } from 'src/components/TextWithTooltip';

interface FeeToken {
address: string;
symbol: string;
}

export const BridgeFeeTokenSelector = ({
feeTokens,
selectedFeeToken,
onFeeTokenChanged,
bridgeFeeFormatted,
bridgeFeeUSD,
loading,
}: {
feeTokens: FeeToken[];
selectedFeeToken: FeeToken;
onFeeTokenChanged: (event: SelectChangeEvent) => void;
bridgeFeeFormatted: string;
bridgeFeeUSD: string;
loading: boolean;
}) => {
const theme = useTheme();

const feeTooltip = (
<TextWithTooltip text={<Trans>Fee</Trans>}>
<Trans>
The fee includes the gas cost to complete the transaction on the destination chain and the
fee paid to Chainlink CCIP service providers. You can chose to pay in the network token or
GHO.{' '}
<Link
href="https://docs.chain.link/ccip/billing"
sx={{ textDecoration: 'underline' }}
variant="caption"
color="text.secondary"
>
Learn more
</Link>
</Trans>
</TextWithTooltip>
);

return (
<Row caption={feeTooltip} captionVariant="description" mb={4}>
<FormControl sx={{ mr: 'auto' }}>
<Select
labelId="token-select-label"
value={selectedFeeToken.symbol}
onChange={onFeeTokenChanged}
sx={{
fontSize: '1.0em',
width: 'auto',
height: '24px',
minWidth: '70px',
borderRadius: '4px',
mb: 0.5,
maxWidth: '80px',
'.MuiSelect-select': {
backgroundColor: theme.palette.mode === 'dark' ? '#292E41' : '#FFFFFF',

paddingLeft: '2px',
},
'& .MuiOutlinedInput-notchedOutline': {
border: 'none',
},
'&:hover .MuiOutlinedInput-notchedOutline': {
border: 'none',
},
'&.Mui-focused .MuiOutlinedInput-notchedOutline': {
border: 'none',
},
}}
MenuProps={{
PaperProps: {
sx: {
backgroundColor: theme.palette.mode === 'dark' ? '#292E41' : '#FFFFFF',
fontSize: '1.0em',
},
},
}}
>
{feeTokens.map((token) => (
<MenuItem
key={token.symbol}
value={token.symbol}
sx={{
backgroundColor: theme.palette.mode === 'dark' ? '#383D51' : '#FFFFFF',
'&:hover': {
backgroundColor: theme.palette.mode === 'dark' ? '#292E41' : '#EAEBEF',
},
'&.Mui-selected, &.Mui-selected:hover': {
backgroundColor: theme.palette.mode === 'dark' ? '#292E41' : '#FFFFFF',
boxShadow: '0px 1px 0px rgba(0, 0, 0, 0.05)',
},
}}
>
<Box display="flex" alignItems={'center'}>
<TokenIcon sx={{ fontSize: '1em', paddingRight: '4px' }} symbol={token.symbol} />
{token.symbol}
</Box>
</MenuItem>
))}
</Select>
</FormControl>
{!bridgeFeeFormatted && !loading ? (
<NoData variant="secondary14" color="text.secondary" />
) : loading ? (
<Skeleton variant="rectangular" height={20} width={100} sx={{ borderRadius: '4px' }} />
) : (
<Stack direction="column" alignItems="flex-end" position="relative">
<Stack direction="row" alignItems="center">
<TokenIcon symbol={selectedFeeToken?.symbol} sx={{ mr: 1, fontSize: '16px' }} />
<FormattedNumber
value={bridgeFeeFormatted}
symbol={selectedFeeToken?.symbol}
variant="secondary14"
/>
</Stack>
<FormattedNumber
value={bridgeFeeUSD}
variant="helperText"
compact
symbol="USD"
color="text.secondary"
sx={{ position: 'absolute', top: '20px' }}
/>
</Stack>
)}
</Row>
);
};
Loading
Loading