From 227bd693e802caa69005cd6e4975241171faf83d Mon Sep 17 00:00:00 2001
From: Madalina Raicu <madalina@raygroup.uk>
Date: Fri, 5 May 2023 10:17:43 +0100
Subject: [PATCH] fix(oracle, market-info): cleanup styles and refactoring

---
 .../market-info/market-info-panels.tsx        |  2 +-
 .../oracle-full-profile.tsx                   | 48 +++++++++----------
 .../src/lib/hooks/use-oracle-markets.ts       | 31 +++++++-----
 3 files changed, 45 insertions(+), 36 deletions(-)

diff --git a/libs/market-info/src/components/market-info/market-info-panels.tsx b/libs/market-info/src/components/market-info/market-info-panels.tsx
index 9354d195e..513dc7723 100644
--- a/libs/market-info/src/components/market-info/market-info-panels.tsx
+++ b/libs/market-info/src/components/market-info/market-info-panels.tsx
@@ -626,7 +626,7 @@ const OracleProfile = ({
         provider={provider}
         onClick={() => setDialogOpen(!dialogOpen)}
         markets={oracleMarkets}
-      ></OracleBasicProfile>
+      />
       <Dialog
         title={<OracleProfileTitle provider={provider} />}
         open={dialogOpen}
diff --git a/libs/oracles/src/lib/components/oracle-full-profile/oracle-full-profile.tsx b/libs/oracles/src/lib/components/oracle-full-profile/oracle-full-profile.tsx
index 4f3177e84..494a522fb 100644
--- a/libs/oracles/src/lib/components/oracle-full-profile/oracle-full-profile.tsx
+++ b/libs/oracles/src/lib/components/oracle-full-profile/oracle-full-profile.tsx
@@ -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
diff --git a/libs/oracles/src/lib/hooks/use-oracle-markets.ts b/libs/oracles/src/lib/hooks/use-oracle-markets.ts
index 088e0ecd7..da5b55a05 100644
--- a/libs/oracles/src/lib/hooks/use-oracle-markets.ts
+++ b/libs/oracles/src/lib/hooks/use-oracle-markets.ts
@@ -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;