Merge pull request #111 from multiversx/development

Development
multiversx · Jul 17, 2024 · 45c6649 · 45c6649
2 parents b2b02fe + cc64093
commit 45c6649
Show file tree

Hide file tree

Showing 7 changed files with 56 additions and 38 deletions.
diff --git a/src/helpers/processData/processEconomics.ts b/src/helpers/processData/processEconomics.ts
@@ -1,4 +1,5 @@
 import BigNumber from 'bignumber.js';
+import { ELLIPSIS } from 'appConstants';
 import { DIGITS } from 'config';
 import { EconomicsType } from 'types/economics.types';
 
@@ -15,14 +16,20 @@ export const processEconomics = (data: EconomicsType) => {
     totalSupply: new BigNumber(data.totalSupply).toFormat(0),
     circulatingSupply: new BigNumber(data.circulatingSupply).toFormat(0),
     staked: new BigNumber(data.staked).toFormat(0),
-    price: `$${new BigNumber(data.price).toFormat(DIGITS)}`,
-    marketCap: `$${new BigNumber(data.marketCap).toFormat(0)}`,
+    price: data.price
+      ? `$${new BigNumber(data.price).toFormat(DIGITS)}`
+      : ELLIPSIS,
+    marketCap: data.marketCap
+      ? `$${new BigNumber(data.marketCap).toFormat(0)}`
+      : ELLIPSIS,
     apr: `${new BigNumber(data.apr).times(100).toFormat(DIGITS)}%`,
     topUpApr: `${new BigNumber(data.topUpApr).times(100).toFormat(DIGITS)}%`,
     baseApr: `${new BigNumber(data.baseApr).times(100).toFormat(DIGITS)}%`,
-    tokenMarketCap: `$${new BigNumber(data.tokenMarketCap).toFormat(0)}`,
+    tokenMarketCap: data.tokenMarketCap
+      ? `$${new BigNumber(data.tokenMarketCap).toFormat(0)}`
+      : ELLIPSIS,
 
     totalStakedPercent: `${totalStakedPercent}%`,
-    ecosystemMarketCap: `$${ecosystemMarketCap}`
+    ecosystemMarketCap: ecosystemMarketCap ? `$${ecosystemMarketCap}` : ELLIPSIS
   };
 };
diff --git a/src/hooks/growth/useFetchGrowthMostUsed.ts b/src/hooks/growth/useFetchGrowthMostUsed.ts
@@ -13,7 +13,7 @@ export const useFetchGrowthMostUsed = () => {
 
   const fetchGrowthMostUsed = () => {
     if (!isFetched) {
-      getGrowthWidget('/most-used').then((growthMostUsed) => {
+      getGrowthWidget('/verified-most-used').then((growthMostUsed) => {
         if (growthMostUsed?.data && growthMostUsed.success) {
           dispatch(
             setGrowthMostUsed({

diff --git a/src/hooks/useSearch.ts b/src/hooks/useSearch.ts
@@ -126,7 +126,9 @@ export const useSearch = (searchHash: string) => {
                     networkRoute(urlBuilder.blockDetails(searchHash))
                   );
                   break;
-                case scResult.success && scResult?.data?.originalTxHash:
+                case Boolean(
+                  scResult.success && scResult?.data?.originalTxHash
+                ):
                   setSearchRoute(
                     networkRoute(
                       urlBuilder.transactionDetails(

diff --git a/src/layouts/CollectionLayout/CollectionDetailsCard.tsx b/src/layouts/CollectionLayout/CollectionDetailsCard.tsx
@@ -72,14 +72,10 @@ export const CollectionDetailsCard = () => {
       }
       descriptionContent={
         scamInfo ? (
-          <span className='text-warning d-flex align-items-center ms-2'>
-            <FontAwesomeIcon
-              icon={faExclamationTriangle}
-              size='sm'
-              className='text-warning me-2'
-            />
+          <div className='d-flex align-items-center flex-wrap gap-2 my-3 text-warning'>
+            <FontAwesomeIcon icon={faExclamationTriangle} size='sm' />
             {scamInfo.info}
-          </span>
+          </div>
         ) : null
       }
       isVerified={isVerified}
@@ -93,7 +89,7 @@ export const CollectionDetailsCard = () => {
         </Overlay>
       }
       detailItems={[
-        assets?.description
+        assets?.description && !scamInfo
           ? {
               title: 'Description',
               value: (
@@ -106,20 +102,22 @@ export const CollectionDetailsCard = () => {
               )
             }
           : {},
-        assets?.website
+        assets?.website && !scamInfo
           ? {
               title: 'Website',
               value: <SocialWebsite link={assets.website} />
             }
           : {},
-        assets?.social && Object.keys(assets.social).length > 0
+        assets?.social && Object.keys(assets.social).length > 0 && !scamInfo
           ? {
               title: 'Other Links',
               value: <SocialIcons assets={assets.social} excludeWebsite />
             }
           : {},
-        { title: 'Type', value: <NftBadge type={type} /> },
-        !assets && ticker !== name ? { title: 'Name', value: name } : {},
+        !scamInfo ? { title: 'Type', value: <NftBadge type={type} /> } : {},
+        !assets && ticker !== name && !scamInfo
+          ? { title: 'Name', value: name }
+          : {},
         { title: 'Collection', value: collection },
         decimals !== undefined
           ? {

diff --git a/src/layouts/NftLayout/NftDetailsCard.tsx b/src/layouts/NftLayout/NftDetailsCard.tsx
@@ -119,7 +119,7 @@ export const NftDetailsCard = () => {
         </Overlay>
       }
       detailItems={[
-        description
+        Boolean(description && (!scamInfo || showData))
           ? {
               title: 'Description',
               value: (
@@ -129,7 +129,7 @@ export const NftDetailsCard = () => {
               )
             }
           : {},
-        hasExtraDescription
+        hasExtraDescription && (!scamInfo || showData)
           ? {
               title: 'Collection',
               value: (
@@ -142,20 +142,24 @@ export const NftDetailsCard = () => {
               )
             }
           : {},
-        assets?.website
+        assets?.website && (!scamInfo || showData)
           ? {
               title: 'Website',
               value: <SocialWebsite link={assets.website} />
             }
           : {},
-        assets?.social && Object.keys(assets.social).length > 0
+        assets?.social &&
+        Object.keys(assets.social).length > 0 &&
+        (!scamInfo || showData)
           ? {
               title: 'Other Links',
               value: <SocialIcons assets={assets.social} excludeWebsite />
             }
           : {},
         { title: 'Type', value: <NftBadge type={type} /> },
-        !assets && ticker !== name ? { title: 'Name', value: name } : {},
+        !assets && ticker !== name && (!scamInfo || showData)
+          ? { title: 'Name', value: name }
+          : {},
         { title: 'Collection', value: <CollectionBlock nft={nftState} /> },
         { title: 'Identifier', value: identifier },
         decimals !== undefined
@@ -167,12 +171,12 @@ export const NftDetailsCard = () => {
         owner !== undefined
           ? {
               title: 'Owner',
-              value: <AccountLink address={owner} fetchAssets />
+              value: <AccountLink address={owner} fetchAssets={!scamInfo} />
             }
           : {},
         {
           title: 'Creator',
-          value: <AccountLink address={creator} fetchAssets />
+          value: <AccountLink address={creator} fetchAssets={!scamInfo} />
         },
         timestamp !== undefined
           ? {

diff --git a/src/pages/TransactionDetails/TransactionDetails.tsx b/src/pages/TransactionDetails/TransactionDetails.tsx
@@ -24,25 +24,29 @@ export const TransactionDetails = () => {
   const [dataReady, setDataReady] = useState<boolean | undefined>();
 
   const fetchTransaction = async () => {
-    if (transactionId) {
+    if (transactionId && isHash(transactionId)) {
       const { data, success } = await getTransaction(transactionId);
-      if (!success && !data && isHash(transactionId)) {
+      let originalTxHash = data?.originalTxHash;
+
+      if (!success && !data) {
         const { data: scData, success: scSuccess } = await getScResult(
           transactionId
         );
-        if (scData?.originalTxHash && scData.hash && scSuccess) {
-          const options = {
-            pathname: networkRoute(
-              urlBuilder.transactionDetails(scData.originalTxHash)
-            ),
-            hash: scData.hash
-          };
-          navigate(options, { replace: true });
-
-          return;
+        if (scSuccess) {
+          originalTxHash = scData?.originalTxHash;
         }
       }
 
+      if (originalTxHash) {
+        const options = {
+          pathname: networkRoute(urlBuilder.transactionDetails(originalTxHash)),
+          hash: transactionId
+        };
+        navigate(options, { replace: true });
+
+        return;
+      }
+
       setTransaction(data);
       setDataReady(success);
     }

diff --git a/src/types/transaction.types.ts b/src/types/transaction.types.ts
@@ -201,7 +201,10 @@ export enum TransactionMethodsEnum {
   // guardian
   SetGuardian = 'SetGuardian',
   GuardAccount = 'GuardAccount',
-  UnGuardAccount = 'UnGuardAccount'
+  UnGuardAccount = 'UnGuardAccount',
+  // xportal
+  claim = 'claim',
+  openMysteryBox = 'openMysteryBox'
 }
 
 export interface EventType {