Merge branch 'feature/ui-tweaks' into develop

This commit is contained in:
Willian Mitsuda 2021-07-06 02:12:37 -03:00
commit 4ba1cb3fe4
2 changed files with 36 additions and 26 deletions

View File

@ -20,32 +20,42 @@ const TokenTransferItem: React.FC<TokenTransferItemProps> = ({
<span className="text-gray-500"> <span className="text-gray-500">
<FontAwesomeIcon icon={faCaretRight} size="1x" /> <FontAwesomeIcon icon={faCaretRight} size="1x" />
</span> </span>
<span className="font-bold">From</span> <div className="grid grid-cols-5">
<AddressOrENSName address={t.from} /> <div className="flex space-x-2">
<span className="font-bold">To</span> <span className="font-bold">From</span>
<AddressOrENSName address={t.to} /> <AddressOrENSName address={t.from} />
<span className="font-bold">For</span> </div>
<span> <div className="flex space-x-2">
<FormattedBalance <span className="font-bold">To</span>
value={t.value} <AddressOrENSName address={t.to} />
decimals={tokenMetas[t.token].decimals} </div>
/> <div className="col-span-3 flex space-x-2">
</span> <span className="font-bold">For</span>
<span className="flex space-x-1 items-baseline truncate"> <span>
{tokenMetas[t.token] ? ( <FormattedBalance
<> value={t.value}
<div className="self-center"> decimals={tokenMetas[t.token].decimals}
<TokenLogo address={t.token} name={tokenMetas[t.token].name} />
</div>
<AddressLink
address={t.token}
text={`${tokenMetas[t.token].name} (${tokenMetas[t.token].symbol})`}
/> />
</> </span>
) : ( <span className="flex space-x-1 items-baseline truncate">
<AddressOrENSName address={t.token} /> {tokenMetas[t.token] ? (
)} <>
</span> <div className="self-center">
<TokenLogo address={t.token} name={tokenMetas[t.token].name} />
</div>
<AddressLink
address={t.token}
text={`${tokenMetas[t.token].name} (${
tokenMetas[t.token].symbol
})`}
/>
</>
) : (
<AddressOrENSName address={t.token} />
)}
</span>
</div>
</div>
</div> </div>
); );

View File

@ -11,7 +11,7 @@ const AddressLink: React.FC<AddressLinkProps> = ({ address, text }) => (
className="text-link-blue hover:text-link-blue-hover font-address truncate" className="text-link-blue hover:text-link-blue-hover font-address truncate"
to={`/address/${address}`} to={`/address/${address}`}
> >
<p className="truncate" title={text}> <p className="truncate" title={text ?? address}>
{text ?? address} {text ?? address}
</p> </p>
</NavLink> </NavLink>