Merge pull request #45 from multiversx/development

Development
multiversx · Jan 31, 2024 · f2981c6 · f2981c6
2 parents 562d9c2 + abe7324
commit f2981c6
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 5 deletions.
diff --git a/src/components/Overlay/Overlay.tsx b/src/components/Overlay/Overlay.tsx
@@ -24,6 +24,6 @@ export const Overlay = ({
       </Tooltip>
     )}
   >
-    <div className={className ?? 'text-truncate'}>{children}</div>
+    <span className={className ?? 'text-truncate'}>{children}</span>
   </OverlayTrigger>
 );
diff --git a/src/components/ProvidersTable/ProvidersTable.tsx b/src/components/ProvidersTable/ProvidersTable.tsx
@@ -178,7 +178,7 @@ export const ProvidersTable = ({
               <SortTh name='Nodes' field='numNodes' />
             </th>
             <th>
-              <SortTh name='Computed APR' field='apr' />
+              <SortTh name='Computed Net APR' field='apr' />
             </th>
             <th>
               <SortTh name='Service fee' field='serviceFee' />

diff --git a/src/components/SharedIdentity/IdentityCard/IdentityCard.tsx b/src/components/SharedIdentity/IdentityCard/IdentityCard.tsx
@@ -154,7 +154,7 @@ export const IdentityCard = ({ identity }: { identity: IdentityType }) => {
               />
 
               <StatsCard
-                title='Computed APR'
+                title='Computed Gross APR'
                 value={<>{identity.apr ? `${identity.apr}%` : 'N/A'}</>}
                 className='detail-card'
               />

diff --git a/src/layouts/ProviderLayout/ProviderDetailsCard.tsx b/src/layouts/ProviderLayout/ProviderDetailsCard.tsx
@@ -69,7 +69,7 @@ export const ProviderDetailsCard = ({
           )}
         </CardItem>
 
-        <CardItem title='Computed APR' icon={faLeaf}>
+        <CardItem title='Computed Net APR' icon={faLeaf}>
           {provider.apr ? (
             <>
               {provider.apr}

diff --git a/src/widgets/AccountsStatsCard/AccountsStatsCard.tsx b/src/widgets/AccountsStatsCard/AccountsStatsCard.tsx
@@ -3,7 +3,9 @@ import { useEffect } from 'react';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { useSelector } from 'react-redux';
 
+import { Overlay } from 'components';
 import { useFetchGrowthHero, useIsMainnet } from 'hooks';
+import { faInfoCircle } from 'icons/regular';
 import { faCircleBolt } from 'icons/solid';
 import {
   growthHeroSelector,
@@ -34,6 +36,12 @@ export const AccountsStatsCard = () => {
         <StatsCard title='Total Accounts' value={totalAccounts}>
           <FontAwesomeIcon icon={faCircleBolt} className='me-2' />
           {activeAccountsToday} active today
+          <Overlay
+            title='Number of accounts that have sent or received transactions in the last 24 hours'
+            className='d-inline cursor-context'
+          >
+            <FontAwesomeIcon icon={faInfoCircle} className='ms-2' />
+          </Overlay>
         </StatsCard>
       ) : (
         <StatsCard title='Total Accounts' value={accounts} />

diff --git a/src/widgets/EpochProgressRing/EpochProgressRing.tsx b/src/widgets/EpochProgressRing/EpochProgressRing.tsx
@@ -1,4 +1,5 @@
 import BigNumber from 'bignumber.js';
+import classNames from 'classnames';
 
 import { ELLIPSIS } from 'appConstants';
 import { ProgressRing } from 'components';
@@ -31,7 +32,7 @@ export const EpochProgressRing = ({
           )}
         </div>
         <div
-          className='description'
+          className={classNames('description', { 'cursor-context': showTime })}
           {...(showTime ? { title: epochTimeRemaining } : {})}
         >
           {roundsLeft && roundsLeft >= 0 ? (