Merge branch 'development' of github.com:multiversx/mx-explorer-dapp …

…into next
multiversx · Sep 23, 2024 · 306d402 · 306d402
2 parents 6b4d56b + 115219e
commit 306d402
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 28 deletions.
diff --git a/src/components/DetailItem/DetailItem.tsx b/src/components/DetailItem/DetailItem.tsx
@@ -1,9 +1,10 @@
+import { ReactNode } from 'react';
 import classNames from 'classnames';
 import { WithClassnameType } from 'types';
 
 export interface DetailItemUIType extends WithClassnameType {
-  children?: React.ReactNode;
-  title?: string | React.ReactNode;
+  children?: ReactNode;
+  title?: ReactNode;
   colWidth?: string;
   noBorder?: boolean;
   verticalCenter?: boolean;

diff --git a/src/helpers/getValue/getAccountDelegationDetails.ts b/src/helpers/getValue/getAccountDelegationDetails.ts
@@ -23,20 +23,15 @@ export const getAccountDelegationDetails = (
       (a, b) => new BigNumber(a).plus(b),
       new BigNumber(ZERO)
     );
-    const bNunbondable = delegation
-      .map(({ userUnBondable }) => userUnBondable)
-      .reduce((a, b) => new BigNumber(a).plus(b), new BigNumber(ZERO));
 
     const activePlusUnStaked = bNactive.plus(bNunstaked);
-    const bNlocked = activePlusUnStaked
-      .plus(bNclaimableRewards)
-      .plus(bNunbondable);
+    const bNlocked = activePlusUnStaked.plus(bNclaimableRewards);
 
     const show = bNlocked.isGreaterThan(0);
 
     return {
       active: bNactive,
-      unstaked: bNunstaked.plus(bNunbondable),
+      unstaked: bNunstaked,
       claimable: bNclaimableRewards,
       locked: bNlocked,
       show

diff --git a/src/pages/AccountDetails/AccountStaking/components/DonutChart/helpers/prepareChartData.ts b/src/pages/AccountDetails/AccountStaking/components/DonutChart/helpers/prepareChartData.ts
@@ -42,12 +42,8 @@ export const prepareChartData = ({
           ({ provider }) => delegation.contract === provider
         );
         if (provider) {
-          const {
-            userActiveStake,
-            claimableRewards,
-            userUnBondable,
-            userUndelegatedList
-          } = delegation;
+          const { userActiveStake, claimableRewards, userUndelegatedList } =
+            delegation;
 
           const undelegatedAmounts =
             userUndelegatedList && userUndelegatedList.length > 0
@@ -60,7 +56,6 @@ export const prepareChartData = ({
 
           const bNLocked = new BigNumber(userActiveStake)
             .plus(claimableRewards)
-            .plus(userUnBondable)
             .plus(bNtotalUserUnStakedValue);
 
           const amount = formatAmount({

diff --git a/src/pages/TransactionDetails/components/EventsList/EventItem.tsx b/src/pages/TransactionDetails/components/EventsList/EventItem.tsx
@@ -1,5 +1,6 @@
 import { useRef, useState } from 'react';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
+import classNames from 'classnames';
 
 import {
   CopyButton,
@@ -69,9 +70,10 @@ export const EventItem = ({ event, txHash, id }: EventItemUIType) => {
 
   return (
     <div
-      className={`detailed-item d-flex border-start border-bottom ms-3 py-3 ${
-        isEventHighlighted ? 'highlighted' : ''
-      }`}
+      className={classNames(
+        'detailed-item d-flex border-start border-bottom ms-3 py-3',
+        { highlighted: isEventHighlighted }
+      )}
       {...(isEventHighlighted ? { ref: ref } : {})}
     >
       <NetworkLink to={eventLink} className='detailed-item-icon'>

diff --git a/src/pages/TransactionDetails/components/ScResultsList/ScResultsList.tsx b/src/pages/TransactionDetails/components/ScResultsList/ScResultsList.tsx
@@ -1,5 +1,6 @@
 import { useRef, useState } from 'react';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
+import classNames from 'classnames';
 
 import { MAX_DISPLAY_TX_DATA_LENGTH } from 'appConstants';
 import {
@@ -55,9 +56,10 @@ export const ScResultsList = ({
           <div
             key={i}
             id={result.hash}
-            className={`detailed-item d-flex border-start border-bottom ms-3 py-3 ${
-              isResultHighlighted ? 'highlighted' : ''
-            }`}
+            className={classNames(
+              'detailed-item d-flex border-start border-bottom ms-3 py-3',
+              { highlighted: isResultHighlighted }
+            )}
             {...(isResultHighlighted ? { ref: ref } : {})}
           >
             <NetworkLink to={resultLink} className='detailed-item-icon'>

diff --git a/src/pages/TransactionDetails/components/TransactionInfo/TransactionInfo.tsx b/src/pages/TransactionDetails/components/TransactionInfo/TransactionInfo.tsx
@@ -298,10 +298,8 @@ export const TransactionInfo = ({
               <DetailItem title='To'>
                 <div className='d-flex flex-column'>
                   <div className='d-flex align-items-center'>
-                    {isContract(transaction.receiver) ? (
+                    {isContract(transaction.receiver) && (
                       <span className='me-2 text-neutral-400'>Contract</span>
-                    ) : (
-                      ''
                     )}
                     <AccountLink
                       address={transaction.receiver}
@@ -328,10 +326,8 @@ export const TransactionInfo = ({
                 <DetailItem title='Destination'>
                   <div className='d-flex flex-column'>
                     <div className='d-flex align-items-center'>
-                      {isContract(receiver) ? (
+                      {isContract(receiver) && (
                         <span className='me-2 text-neutral-400'>Contract</span>
-                      ) : (
-                        ''
                       )}
                       <AccountLink
                         address={receiver}