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.

Sign up for GitHub

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

Jump to bottom

Fix/balance-null-check #50

Merged
merged 2 commits into from
Sep 21, 2023
Merged

Fix/balance-null-check #50

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e1277f0
fix: null check balance
toniocodo Sep 20, 2023
4809f11
fix: watch balances, update slippage input layout
toniocodo Sep 21, 2023
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
5 changes: 4 additions & 1 deletion libs/oeth/shared/src/components/AccountPopover.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ export function AccountPopover({ anchor, setAnchor }: Props) {
address,
token: tokens.mainnet.ETH.address,
enabled: isConnected,
watch: true,
});
const { data: balances, isLoading: balancesLoading } = useContractReads({
contracts: balanceTokens.map((t) => ({
Expand All @@ -52,6 +53,8 @@ export function AccountPopover({ anchor, setAnchor }: Props) {
functionName: 'balanceOf',
args: [address],
})),
watch: true,
enabled: isConnected,
select: map(prop('result')),
});

Expand Down Expand Up @@ -140,7 +143,7 @@ export function AccountPopover({ anchor, setAnchor }: Props) {
<Stack sx={padding} gap={2}>
<BalanceRow
token={tokens.mainnet.ETH}
balance={eth.value}
balance={eth?.value}
isBalanceLoading={ethLoading}
/>
{balanceTokens.map((tok, i) => (
Expand Down
112 changes: 56 additions & 56 deletions libs/oeth/shared/src/components/GasPopover.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,70 +90,70 @@ export function GasPopover({
},
}}
>
<Stack gap={2}>
<Stack gap={1}>
<FormControl variant="standard">
<InputLabel htmlFor="slippage" shrink>
{intl.formatMessage({ defaultMessage: 'Slippage' })}
</InputLabel>
<Box sx={gridStyles}>
<PercentInput
value={slippage}
onChange={onSlippageChange}
fullWidth
sx={{
borderColor: (theme) => theme.palette.secondary.main,
backgroundColor: (theme) =>
alpha(theme.palette.secondary.main, 0.05),
paddingInlineEnd: 2,
'& .MuiInputBase-input': {
textAlign: 'right',
color: 'primary.contrastText',
<Stack direction="row" gap={2}>
<PercentInput
value={slippage}
onChange={onSlippageChange}
fullWidth
sx={{
borderColor: (theme) => theme.palette.secondary.main,
backgroundColor: (theme) =>
alpha(theme.palette.secondary.main, 0.05),
paddingInlineEnd: 2,
'& .MuiInputBase-input': {
textAlign: 'right',
color: 'primary.contrastText',

'&::placeholder': {
color: 'text.primary',
opacity: 1,
'&::placeholder': {
color: 'text.primary',
opacity: 1,
},
},
},
}}
/>

<Button
variant="contained"
sx={{
borderRadius: 20,
height: '38px',
color: 'primary.contrastText',
bgColor:
'linear-gradient(90deg, var(--mui-palette-primary-main) 0%, var(--mui-palette-primary-dark) 100%)',
'&:disabled': {
opacity: 0.3,
},
}}
fullWidth
disabled={slippage === DEFAULT_SLIPPAGE}
onClick={() => {
onSlippageChange(DEFAULT_SLIPPAGE);
}}
>
{intl.formatMessage({ defaultMessage: 'Auto' })}
</Button>
}}
/>
<Button
variant="contained"
sx={{
borderRadius: 20,
height: '38px',
color: 'primary.contrastText',
bgColor:
'linear-gradient(90deg, var(--mui-palette-primary-main) 0%, var(--mui-palette-primary-dark) 100%)',
'&:disabled': {
opacity: 0.3,
},
}}
fullWidth
disabled={slippage === DEFAULT_SLIPPAGE}
onClick={() => {
onSlippageChange(DEFAULT_SLIPPAGE);
}}
>
{intl.formatMessage({ defaultMessage: 'Auto' })}
</Button>
</Stack>
</Box>
{slippage > WARNING_THRESHOLD ? (
<FormHelperText
sx={{
gridColumn: 'span 2',
mt: 1.25,
fontSize: (theme) => theme.typography.pxToRem(12),
color: (theme) => theme.palette.warning.main,
fontWeight: 400,
fontStyle: 'normal',
}}
>
{intl.formatMessage({
defaultMessage: 'Your transaction may be frontrun',
})}
</FormHelperText>
) : null}
<FormHelperText
sx={{
gridColumn: 'span 2',
mt: 1.25,
fontSize: (theme) => theme.typography.pxToRem(12),
color: (theme) => theme.palette.warning.main,
fontWeight: 400,
fontStyle: 'normal',
...(slippage <= WARNING_THRESHOLD && { visibility: 'hidden' }),
}}
>
{intl.formatMessage({
defaultMessage: 'Your transaction may be frontrun',
})}
</FormHelperText>
</FormControl>
<FormControl>
<InputLabel htmlFor="gas" shrink>
Expand Down