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: make balance change more compact #2186

Merged
merged 2 commits into from
Jun 27, 2023
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
41 changes: 14 additions & 27 deletions src/components/tx/security/redefine/RedefineBalanceChange.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,15 @@ import { type RedefineModuleResponse } from '@/services/security/modules/Redefin
import { sameAddress } from '@/utils/addresses'
import { FEATURES } from '@/utils/chains'
import { formatVisualAmount } from '@/utils/formatters'
import { Box, Chip, CircularProgress, Grid, SvgIcon, Typography } from '@mui/material'
import { Box, Chip, CircularProgress, Grid, Typography } from '@mui/material'
import { TokenType } from '@safe-global/safe-gateway-typescript-sdk'
import { ErrorBoundary } from '@sentry/react'
import { useContext } from 'react'
import { TxSecurityContext } from '../shared/TxSecurityContext'
import RedefineLogo from '@/public/images/transactions/redefine.svg'
import RedefineLogoDark from '@/public/images/transactions/redefine-dark-mode.svg'
import ArrowOutwardIcon from '@/public/images/transactions/outgoing.svg'
import ArrowDownwardIcon from '@/public/images/transactions/incoming.svg'

import css from './styles.module.css'
import sharedCss from '@/components/tx/security/shared/styles.module.css'
import { useDarkMode } from '@/hooks/useDarkMode'

const FungibleBalanceChange = ({
change,
Expand All @@ -43,6 +39,7 @@ const FungibleBalanceChange = ({
<Typography variant="body2" fontWeight={700} display="inline" ml={0.5}>
{change.symbol}
</Typography>
<span style={{ margin: 'auto' }} />
<Chip className={css.categoryChip} label={change.type} />
</>
)
Expand Down Expand Up @@ -77,6 +74,7 @@ const NFTBalanceChange = ({
<Typography variant="subtitle2" className={css.nftId} ml={1}>
#{change.tokenId}
</Typography>
<span style={{ margin: 'auto' }} />
<Chip className={css.categoryChip} label="NFT" />
</>
)
Expand All @@ -101,28 +99,28 @@ const BalanceChange = ({

const BalanceChanges = () => {
const { balanceChange, isLoading } = useContext(TxSecurityContext)
const totalBalanceChanges = balanceChange ? balanceChange.in.length + balanceChange.out.length : 0
const totalBalanceChanges = balanceChange ? balanceChange.in.length + balanceChange.out.length : undefined

if (isLoading && !balanceChange) {
return (
<div className={css.loader}>
<CircularProgress
size={30}
size={22}
sx={{
color: ({ palette }) => palette.text.secondary,
}}
/>
<Typography variant="body2" color="text.secondary" display="flex" alignItems="center" gap={1} p={2}>
<Typography variant="body2" color="text.secondary">
Calculating...
</Typography>
</div>
)
}

if (totalBalanceChanges === 0) {
if (totalBalanceChanges && totalBalanceChanges === 0) {
return (
<Typography variant="body2" color="text.secondary" p={2}>
None
<Typography variant="body2" color="text.secondary" justifySelf="flex-end">
No balance change detected
</Typography>
)
}
Expand All @@ -143,30 +141,19 @@ const BalanceChanges = () => {

export const RedefineBalanceChanges = () => {
const isFeatureEnabled = useHasFeature(FEATURES.RISK_MITIGATION)
const isDarkMode = useDarkMode()

if (!isFeatureEnabled) {
return null
}

return (
<Box className={css.box}>
<Box className={css.head}>
<Typography variant="subtitle2" fontWeight={700}>
Balance change
</Typography>
<Typography variant="caption" className={sharedCss.poweredBy}>
Powered by{' '}
<SvgIcon
inheritViewBox
sx={{ height: '40px', width: '52px' }}
component={isDarkMode ? RedefineLogoDark : RedefineLogo}
/>
</Typography>
</Box>
<div className={css.box}>
<Typography variant="subtitle2" fontWeight={700} flexShrink={0}>
Balance change
</Typography>
<ErrorBoundary fallback={<div>Error showing balance changes</div>}>
<BalanceChanges />
</ErrorBoundary>
</Box>
</div>
)
}
2 changes: 1 addition & 1 deletion src/components/tx/security/redefine/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ const RedefineBlock = () => {
<div className={sharedCss.result}>
{isLoading ? (
<CircularProgress
size={30}
size={22}
sx={{
color: ({ palette }) => palette.text.secondary,
}}
Expand Down
25 changes: 7 additions & 18 deletions src/components/tx/security/redefine/styles.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -25,21 +25,20 @@
.loader {
display: flex;
align-items: center;
padding-left: var(--space-2);
gap: var(--space-1);
padding-right: 12px;
justify-self: flex-end;
}

.balanceChanges {
padding: var(--space-2);
max-height: 300px;
overflow-y: auto;
align-items: center;
gap: 1px;
gap: var(--space-1);
}

.balanceChange {
display: flex;
border-radius: 6px;
align-items: center;
margin-bottom: 6px;
}

Expand All @@ -59,23 +58,13 @@

.categoryChip {
border-radius: 4px;
margin-left: auto;
height: auto;
}

.head {
border-bottom: 1px solid var(--color-border-light);
padding: var(--space-1) var(--space-2);

display: flex;
flex-direction: row;
align-items: center;
justify-content: space-between;
}

.box {
border-radius: 6px;
border: 1px solid var(--color-border-light);
display: flex;
flex-direction: column;
display: grid;
grid-template-columns: 35% auto;
padding: var(--space-2) 12px;
}
2 changes: 1 addition & 1 deletion src/components/tx/security/tenderly/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ const TxSimulationBlock = ({ transactions, disabled, gasLimit }: TxSimulationPro
<div className={sharedCss.result}>
{isLoading ? (
<CircularProgress
size={30}
size={22}
sx={{
color: ({ palette }) => palette.text.secondary,
}}
Expand Down