Merge pull request #110 from multiversx/development

Development
multiversx · Jul 1, 2024 · b2b02fe · b2b02fe
2 parents 1d55bde + cacc09c
commit b2b02fe
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 10 deletions.
diff --git a/src/components/TransactionIcon/TransactionIcon.tsx b/src/components/TransactionIcon/TransactionIcon.tsx
@@ -25,13 +25,15 @@ interface TransactionIconType {
   transaction: UITransactionType;
   showSuccess?: boolean;
   showGuardian?: boolean;
+  showSovereignBridge?: boolean;
   withBadge?: boolean;
 }
 
 export const TransactionIcon = ({
   transaction,
   showSuccess = false,
   showGuardian = true,
+  showSovereignBridge = true,
   withBadge = false
 }: TransactionIconType) => {
   const { getTransaction } = useAdapter();
@@ -150,7 +152,9 @@ export const TransactionIcon = ({
     <>
       <StatusIcon />
       {showGuardian && <TransactionGuardianIcon transaction={transaction} />}
-      <TransactionSovereignBridgeIcon transaction={transaction} />
+      {showSovereignBridge && (
+        <TransactionSovereignBridgeIcon transaction={transaction} />
+      )}
     </>
   );
 };
diff --git a/src/hooks/fetch/useFetchEpochProgress.ts b/src/hooks/fetch/useFetchEpochProgress.ts
@@ -10,6 +10,26 @@ import {
   statsSelector
 } from 'redux/selectors';
 
+const getStepInterval = (refreshInterval: number) => {
+  switch (refreshInterval) {
+    case 6000:
+      return new BigNumber(1000);
+    case 3000:
+      return new BigNumber(500);
+    case 2000:
+      return new BigNumber(500);
+    case 1000:
+      return new BigNumber(200);
+
+    default:
+      return new BigNumber(
+        new BigNumber(refreshInterval).isGreaterThan(1000)
+          ? new BigNumber(refreshInterval).minus(1000)
+          : refreshInterval
+      ).dividedBy(5);
+  }
+};
+
 export const useFetchEpochProgress = () => {
   const fetchStats = useFetchStats();
 
@@ -24,11 +44,8 @@ export const useFetchEpochProgress = () => {
   const refreshInterval = refreshRate ? refreshRate : REFRESH_RATE;
   const refreshIntervalSec = new BigNumber(refreshInterval).dividedBy(1000);
 
-  const stepInterval = new BigNumber(
-    new BigNumber(refreshInterval).isGreaterThan(1000)
-      ? new BigNumber(refreshInterval).minus(1000)
-      : refreshInterval
-  ).dividedBy(5);
+  const stepInterval = getStepInterval(refreshInterval);
+
   const stepProgressSec = stepInterval.dividedBy(1000);
 
   const [oldTestnetId, setOldTestnetId] = useState(activeNetworkId);
@@ -41,6 +58,9 @@ export const useFetchEpochProgress = () => {
   const [epochRoundsLeft, setEpochRoundsLeft] = useState<number>(0);
 
   const updateStats = () => {
+    if (!refreshRate) {
+      return;
+    }
     setIsNewState(oldTestnetId !== activeNetworkId);
     if (isNewState) {
       startRoundTime();
@@ -79,6 +99,9 @@ export const useFetchEpochProgress = () => {
   };
 
   const startRoundTime = () => {
+    if (!refreshRate) {
+      return;
+    }
     const intervalRoundTime = setInterval(() => {
       if (!pageHidden) {
         setRoundTimeProgress((roundTimeProgress) =>

diff --git a/src/pages/Home/components/LatestTransactions/LatestTransactions.tsx b/src/pages/Home/components/LatestTransactions/LatestTransactions.tsx
@@ -20,7 +20,6 @@ import { NoTransactions } from 'components/TransactionsTable/components/NoTransa
 import { TransactionValue } from 'components/TransactionsTable/components/TransactionValue';
 import {
   addressIsBech32,
-  urlBuilder,
   getDisplayReceiver,
   getTransactionStatusIconAndColor
 } from 'helpers';
@@ -138,9 +137,10 @@ export const LatestTransactions = () => {
                       >
                         <TransactionIcon
                           transaction={transaction}
+                          showGuardian={false}
+                          showSovereignBridge={false}
                           showSuccess
                           withBadge
-                          showGuardian={false}
                         />
 
                         <div className='d-flex flex-column overflow-hidden min-w-0'>
@@ -171,7 +171,7 @@ export const LatestTransactions = () => {
                               <span className='px-2 text-muted ms-auto'>•</span>
                               <ShardLink
                                 shard={transaction.receiverShard}
-                                receiverShard
+                                transactionReceiverShard
                                 className='flex-shrink-0'
                               />
                             </div>
@@ -192,7 +192,7 @@ export const LatestTransactions = () => {
                                   </span>
                                   <ShardLink
                                     shard={transaction.senderShard}
-                                    senderShard
+                                    transactionSenderShard
                                     className='flex-shrink-0'
                                   />
                                 </>