fix(oracle, market-info): cleanup styles and refactoring

This commit is contained in:
Madalina Raicu
2023-05-05 10:17:43 +01:00
parent baeca4d49e
commit 227bd693e8
3 changed files with 45 additions and 36 deletions
@@ -626,7 +626,7 @@ const OracleProfile = ({
provider={provider}
onClick={() => setDialogOpen(!dialogOpen)}
markets={oracleMarkets}
></OracleBasicProfile>
/>
<Dialog
title={<OracleProfileTitle provider={provider} />}
open={dialogOpen}
@@ -72,30 +72,30 @@ export const OracleFullProfile = ({
return (
<div className="flex flex-col text-sm">
<p className="dark:text-vega-light-300 text-vega-dark-300 pb-2">
{message}
</p>
{!showMore && (
<p className="dark:text-vega-light-300 text-vega-dark-300 pb-2">
{provider.description_markdown.slice(0, 100)}
{'... '}
<span className="dark:text-vega-light-300 text-vega-dark-300 ml-2">
<ButtonLink onClick={() => setShowMore(!showMore)}>
Read more
</ButtonLink>
</span>
</p>
)}
{showMore && (
<p className="dark:text-vega-light-300 text-vega-dark-300 pb-2">
{provider.description_markdown}
<span className="dark:text-vega-light-300 text-vega-dark-300 ml-2">
<ButtonLink onClick={() => setShowMore(!showMore)}>
Show less
</ButtonLink>
</span>
</p>
)}
<div className="dark:text-vega-light-300 text-vega-dark-300">
<p className=" pb-2">{message}</p>
{!showMore && (
<p className="pb-2">
{provider.description_markdown.slice(0, 100)}
{'... '}
<span className="ml-2">
<ButtonLink onClick={() => setShowMore(!showMore)}>
Read more
</ButtonLink>
</span>
</p>
)}
{showMore && (
<p className="pb-2">
{provider.description_markdown}
<span className="ml-2">
<ButtonLink onClick={() => setShowMore(!showMore)}>
Show less
</ButtonLink>
</span>
</p>
)}
</div>
<div className="grid grid-cols-2 gap-6">
<div className="col-span-1">
<p
@@ -21,18 +21,27 @@ export const useOracleMarkets = (
}
const signers = sourceType?.sourceType.signers;
const signerKeys = signers?.map(
(signer) =>
(signer?.signer.__typename === 'ETHAddress' &&
signer?.signer.address) ||
(signer?.signer.__typename === 'PubKey' && signer?.signer.key)
);
const signerKeys = signers?.filter(Boolean).map((signer) => {
if (signer.signer.__typename === 'ETHAddress') {
return signer.signer.address;
}
const signedProofsKeys = signedProofs.map(
(proof) =>
('public_key' in proof && proof.public_key) ||
('eth_address' in proof && proof.eth_address)
);
if (signer.signer.__typename === 'PubKey') {
return signer.signer.key;
}
return undefined;
});
const signedProofsKeys = signedProofs.map((proof) => {
if ('public_key' in proof && proof.public_key) {
return proof.public_key;
}
if ('eth_address' in proof && proof.eth_address) {
return proof.eth_address;
}
return undefined;
});
const key = signedProofsKeys.find((key) => signerKeys?.includes(key));
return !!key;