Skip to content

Commit

Permalink
Small UI adjustments
Browse files Browse the repository at this point in the history
  • Loading branch information
usame-algan committed Jul 10, 2023
1 parent 52c7c4d commit 154630e
Show file tree
Hide file tree
Showing 12 changed files with 16 additions and 91 deletions.
2 changes: 1 addition & 1 deletion src/components/common/AddressInput/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ const AddressInput = ({

// Display the current short name in the adornment, unless the value contains the same prefix
startAdornment: (
<InputAdornment position="end">
<InputAdornment position="end" sx={{ ml: 0 }}>
<Skeleton variant="circular" width={32} height={32} animation={false} sx={{ marginRight: '0.5em' }} />
{!rawValueRef.current.startsWith(`${currentShortName}:`) && <>{currentShortName}:</>}
</InputAdornment>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import commonCss from '@/components/tx-flow/common/styles.module.css'
export const ReviewRemoveOwner = ({ params }: { params: RemoveOwnerFlowProps }): ReactElement => {
const addressBook = useAddressBook()
const { setSafeTx, setSafeTxError } = useContext(SafeTxContext)
const { safe, safeAddress } = useSafeInfo()
const { safe } = useSafeInfo()
const { removedOwner, threshold } = params

useEffect(() => {
Expand Down
8 changes: 3 additions & 5 deletions src/components/tx-flow/flows/SignMessage/SignMessage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -200,11 +200,9 @@ const SignMessage = ({ message, safeAppId, requestId }: ProposeProps | ConfirmPr

<TxCard>
<CardActions>
<Box display="flex" justifyContent="space-between" width="100%">
<Button variant="contained" color="primary" onClick={onSign} disabled={isDisabled}>
Sign
</Button>
</Box>
<Button variant="contained" color="primary" onClick={onSign} disabled={isDisabled}>
Sign
</Button>
</CardActions>
</TxCard>
</>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ export const AmountBlock = ({
children?: ReactNode
}) => {
return (
<Grid item className={css.token}>
<Grid item md={10} className={css.token}>
<TokenIcon logoUri={tokenInfo.logoUri} tokenSymbol={tokenInfo.symbol} />
<Typography fontWeight="bold">{tokenInfo.symbol}</Typography>
{children}
Expand All @@ -41,8 +41,8 @@ const SendAmountBlock = ({
title?: string
}) => {
return (
<Grid container gap={1} alignItems="center">
<Grid item xs={4} md={2}>
<Grid container alignItems="center" sx={{ gap: 1 }}>
<Grid item md>
<Typography variant="body2" color="text.secondary">
{title}
</Typography>
Expand Down
4 changes: 2 additions & 2 deletions src/components/tx-flow/flows/TokenTransfer/SendToBlock.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ import EthHashInfo from '@/components/common/EthHashInfo'

const SendToBlock = ({ address, title = 'To' }: { address: string; title?: string }) => {
return (
<Grid container gap={1} alignItems="center">
<Grid container alignItems="center" sx={{ gap: 1 }}>
<Grid item md>
<Typography variant="body2" color="text.secondary" noWrap>
{title}
</Typography>
</Grid>
<Grid item xs={8} md={10}>
<Grid item md={10}>
<Typography variant="body2" component="div">
<EthHashInfo address={address} shortAddress={false} hasExplorer showCopyButton />
</Typography>
Expand Down
3 changes: 2 additions & 1 deletion src/components/tx-flow/flows/UpdateSafe/index.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
import TxLayout from '@/components/tx-flow/common/TxLayout'
import { UpdateSafeReview } from './UpdateSafeReview'
import SettingsIcon from '@/public/images/sidebar/settings.svg'

const UpdateSafeFlow = () => {
return (
<TxLayout title="Update Safe Account version">
<TxLayout title="Confirm transaction" subtitle="Update Safe Account version" icon={SettingsIcon}>
<UpdateSafeReview />
</TxLayout>
)
Expand Down
2 changes: 1 addition & 1 deletion src/components/tx/DecodedTx/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ const DecodedTx = ({ tx, txId }: DecodedTxProps): ReactElement | null => {
trackEvent({ ...MODALS_EVENTS.TX_DETAILS, label: expanded ? 'Open' : 'Close' })
}

if (isRejection) return null
if (isRejection || !tx) return null

return (
<div>
Expand Down
3 changes: 2 additions & 1 deletion src/components/tx/SignOrExecuteForm/styles.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,8 @@
margin-top: var(--space-2) !important;
}

.mobileTxCheckMessages {
.mobileTxCheckMessages,
.mobileTxCheckMessages:empty {
display: none;
}

Expand Down
20 changes: 0 additions & 20 deletions src/components/tx/modals/ExecuteTxModal/index.tsx

This file was deleted.

37 changes: 0 additions & 37 deletions src/components/tx/modals/RejectTxModal/RejectTx.tsx

This file was deleted.

19 changes: 0 additions & 19 deletions src/components/tx/modals/RejectTxModal/index.tsx

This file was deleted.

1 change: 1 addition & 0 deletions src/components/tx/security/redefine/styles.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
.balanceChange {
display: flex;
margin-bottom: 6px;
align-items: center;
}

.balanceChange:last-child {
Expand Down

0 comments on commit 154630e

Please sign in to comment.