Merge branch 'feature/oct-1857-octant-client-v1.5' into refactor/oct-…

…1971-cleaning-up-client
golemfoundation · Sep 24, 2024 · 5efbba5 · 5efbba5
2 parents 2035fab + c9a5b76
commit 5efbba5
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/client/src/components/Home/HomeGridTransactions/TransactionsList/TransactionsList.tsx b/client/src/components/Home/HomeGridTransactions/TransactionsList/TransactionsList.tsx
@@ -17,9 +17,8 @@ const TransactionsList: FC<TransactionsListProps> = ({ history }) => {
 
   return (
     <Fragment>
-      {history.map((element, index) => (
-        // eslint-disable-next-line react/no-array-index-key
-        <TransactionsListItem key={index} {...element} />
+      {history.map(element => (
+        <TransactionsListItem key={`${element.type}_${element.timestamp}`} {...element} />
       ))}
     </Fragment>
   );

diff --git a/client/src/components/Metrics/MetricsProjectsListItem/MetricsProjectsListItem.module.scss b/client/src/components/Metrics/MetricsProjectsListItem/MetricsProjectsListItem.module.scss
@@ -1,6 +1,5 @@
 .root {
   display: grid;
-  // display: flex;
   align-items: center;
   justify-content: space-between;
   height: 5.6rem;

diff --git a/client/src/components/Metrics/MetricsProjectsListItem/MetricsProjectsListItem.tsx b/client/src/components/Metrics/MetricsProjectsListItem/MetricsProjectsListItem.tsx
@@ -34,18 +34,18 @@ const MetricsProjectsListItem: FC<MetricsProjectsListItemProps> = ({
       </div>
       {isLargeDesktop && (
         <>
-          <div className={styles.value} data-test={`${dataTest}__value`}>
+          <div className={styles.value} data-test={`${dataTest}__numberOfDonors`}>
             {numberOfDonors}
           </div>
-          <div className={styles.value} data-test={`${dataTest}__value`}>
+          <div className={styles.value} data-test={`${dataTest}__donations`}>
             {donations}
           </div>
-          <div className={styles.value} data-test={`${dataTest}__value`}>
+          <div className={styles.value} data-test={`${dataTest}__matchFunding`}>
             {matchFunding}
           </div>
         </>
       )}
-      <div className={cx(styles.value, styles.total)} data-test={`${dataTest}__value`}>
+      <div className={cx(styles.value, styles.total)} data-test={`${dataTest}__total`}>
         {total}
       </div>
     </div>