Merge pull request #502 from interlay/tom/restore-vault-dashboard-tables

feature: revert to previous versions of vault transaction tables

src/pages/Vaults/Vault/ReplaceTable/index.tsx

@@ -0,0 +1,222 @@
+import {
+  CollateralCurrencyExt,
+  CollateralIdLiteral,
+  InterbtcPrimitivesVaultId,
+  ReplaceRequestExt,
+  stripHexPrefix,
+  WrappedCurrency
+} from '@interlay/interbtc-api';
+import { MonetaryAmount } from '@interlay/monetary-js';
+import { H256 } from '@polkadot/types/interfaces';
+import clsx from 'clsx';
+import * as React from 'react';
+import { useErrorHandler, withErrorBoundary } from 'react-error-boundary';
+import { useTranslation } from 'react-i18next';
+import { useQuery } from 'react-query';
+import { useSelector } from 'react-redux';
+import { useTable } from 'react-table';
+
+import { StoreType } from '@/common/types/util.types';
+import { displayMonetaryAmount, shortAddress } from '@/common/utils/utils';
+import ErrorFallback from '@/components/ErrorFallback';
+import PrimaryColorEllipsisLoader from '@/components/PrimaryColorEllipsisLoader';
+import InterlayTable, {
+  InterlayTableContainer,
+  InterlayTbody,
+  InterlayTd,
+  InterlayTh,
+  InterlayThead,
+  InterlayTr
+} from '@/components/UI/InterlayTable';
+import { ACCOUNT_ID_TYPE_NAME } from '@/config/general';
+import { WRAPPED_TOKEN_SYMBOL } from '@/config/relay-chains';
+import SectionTitle from '@/parts/SectionTitle';
+import genericFetcher, { GENERIC_FETCHER } from '@/services/fetchers/generic-fetcher';
+
+interface Props {
+  vaultAddress: string;
+  collateralTokenIdLiteral: CollateralIdLiteral;
+}
+
+const ReplaceTable = ({ vaultAddress, collateralTokenIdLiteral }: Props): JSX.Element => {
+  const { t } = useTranslation();
+  const { bridgeLoaded } = useSelector((state: StoreType) => state.general);
+
+  const vaultId = window.bridge?.api.createType(ACCOUNT_ID_TYPE_NAME, vaultAddress);
+  const {
+    isIdle: replaceRequestsIdle,
+    isLoading: replaceRequestsLoading,
+    data: replaceRequests,
+    error: replaceRequestsError
+  } = useQuery<Map<H256, ReplaceRequestExt>, Error>(
+    [GENERIC_FETCHER, 'replace', 'mapReplaceRequests', vaultId],
+    genericFetcher<Map<H256, ReplaceRequestExt>>(),
+    {
+      enabled: !!bridgeLoaded && !!collateralTokenIdLiteral,
+      refetchInterval: 10000
+    }
+  );
+  useErrorHandler(replaceRequestsError);
+
+  const columns = React.useMemo(
+    () => [
+      {
+        Header: 'ID',
+        accessor: 'id',
+        classNames: ['text-center'],
+        Cell: function FormattedCell({ value }: { value: H256 }) {
+          return <>{stripHexPrefix(value.toString())}</>;
+        }
+      },
+      {
+        Header: t('vault.creation_block'),
+        accessor: 'btcHeight',
+        classNames: ['text-center']
+      },
+      {
+        Header: t('vault.old_vault'),
+        accessor: 'oldVault',
+        classNames: ['text-center'],
+        Cell: function FormattedCell({ value }: { value: InterbtcPrimitivesVaultId }) {
+          return <>{shortAddress(value.accountId.toString())}</>;
+        }
+      },
+      {
+        Header: t('vault.new_vault'),
+        accessor: 'newVault',
+        classNames: ['text-center'],
+        Cell: function FormattedCell({ value }: { value: InterbtcPrimitivesVaultId }) {
+          return <>{shortAddress(value.accountId.toString())}</>;
+        }
+      },
+      {
+        Header: t('btc_address'),
+        accessor: 'btcAddress',
+        classNames: ['text-center'],
+        Cell: function FormattedCell({ value }: { value: string }) {
+          return <>{shortAddress(value)}</>;
+        }
+      },
+      {
+        Header: WRAPPED_TOKEN_SYMBOL,
+        accessor: 'amount',
+        classNames: ['text-right'],
+        Cell: function FormattedCell({ value }: { value: MonetaryAmount<WrappedCurrency> }) {
+          return <>{displayMonetaryAmount(value)}</>;
+        }
+      },
+      {
+        Header: t('griefing_collateral'),
+        accessor: 'collateral',
+        classNames: ['text-right'],
+        Cell: function FormattedCell({ value }: { value: MonetaryAmount<CollateralCurrencyExt> }) {
+          return <>{displayMonetaryAmount(value)}</>;
+        }
+      },
+      {
+        Header: t('status'),
+        accessor: 'status',
+        classNames: ['text-center'],
+        Cell: function FormattedCell({ value }: { value: ReplaceRequestExt['status'] }) {
+          let label;
+          if (value.isPending) {
+            label = t('pending');
+          } else if (value.isCompleted) {
+            label = t('completed');
+          } else if (value.isCancelled) {
+            label = t('cancelled');
+          } else {
+            label = t('loading_ellipsis');
+          }
+          return <>{label}</>;
+        }
+      }
+    ],
+    [t]
+  );
+
+  const data = replaceRequests
+    ? [
+        ...replaceRequests
+          // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+          // @ts-expect-error
+          .filter((request) => request?.collateral?.currency?.ticker === collateralTokenIdLiteral)
+          .entries()
+      ].map(([key, value]) => ({
+        id: key,
+        ...value
+      }))
+    : [];
+  const { getTableProps, getTableBodyProps, headerGroups, rows, prepareRow } = useTable({
+    columns,
+    data
+  });
+
+  if (replaceRequestsIdle || replaceRequestsLoading) {
+    return <PrimaryColorEllipsisLoader />;
+  }
+  if (replaceRequests === undefined) {
+    throw new Error('Something went wrong!');
+  }
+
+  return (
+    <InterlayTableContainer className={clsx('space-y-6', 'container', 'mx-auto')}>
+      <SectionTitle>{t('vault.replace_requests')}</SectionTitle>
+      <InterlayTable {...getTableProps()}>
+        <InterlayThead>
+          {headerGroups.map((headerGroup: any) => (
+            // eslint-disable-next-line react/jsx-key
+            <InterlayTr {...headerGroup.getHeaderGroupProps()}>
+              {headerGroup.headers.map((column: any) => (
+                // eslint-disable-next-line react/jsx-key
+                <InterlayTh
+                  {...column.getHeaderProps([
+                    {
+                      className: clsx(column.classNames),
+                      style: column.style
+                    }
+                  ])}
+                >
+                  {column.render('Header')}
+                </InterlayTh>
+              ))}
+            </InterlayTr>
+          ))}
+        </InterlayThead>
+        <InterlayTbody {...getTableBodyProps()}>
+          {rows.map((row: any) => {
+            prepareRow(row);
+
+            return (
+              // eslint-disable-next-line react/jsx-key
+              <InterlayTr {...row.getRowProps()}>
+                {row.cells.map((cell: any) => {
+                  return (
+                    // eslint-disable-next-line react/jsx-key
+                    <InterlayTd
+                      {...cell.getCellProps([
+                        {
+                          className: clsx(cell.column.classNames),
+                          style: cell.column.style
+                        }
+                      ])}
+                    >
+                      {cell.render('Cell')}
+                    </InterlayTd>
+                  );
+                })}
+              </InterlayTr>
+            );
+          })}
+        </InterlayTbody>
+      </InterlayTable>
+    </InterlayTableContainer>
+  );
+};
+
+export default withErrorBoundary(ReplaceTable, {
+  FallbackComponent: ErrorFallback,
+  onReset: () => {
+    window.location.reload();
+  }
+});

src/pages/Vaults/Vault/VaultDashboard.tsx

@@ -15,8 +15,11 @@ import { getCurrency } from '@/utils/helpers/currencies';
 import { useGetVaultData } from '@/utils/hooks/api/vaults/use-get-vault-data';
 import { useGetVaultTransactions } from '@/utils/hooks/api/vaults/use-get-vault-transactions';
 
-import { InsightListItem, InsightsList, PageTitle, TransactionHistory, VaultInfo } from './components';
+import { InsightListItem, InsightsList, PageTitle, VaultInfo } from './components';
+import ReplaceTable from './ReplaceTable';
 import { StyledCollateralSection, StyledRewards, StyledVaultCollateral } from './VaultDashboard.styles';
+import VaultIssueRequestsTable from './VaultIssueRequestsTable';
+import VaultRedeemRequestsTable from './VaultRedeemRequestsTable';
 
 const VaultDashboard = (): JSX.Element => {
   const { vaultClientLoaded, address } = useSelector((state: StoreType) => state.general);
@@ -115,7 +118,24 @@ const VaultDashboard = (): JSX.Element => {
             hasWithdrawRewardsBtn={!isReadOnlyVault}
           />
         </StyledCollateralSection>
-        <TransactionHistory transactions={transactions} />
+        {collateralToken && (
+          <VaultIssueRequestsTable
+            vaultAddress={selectedVaultAccountAddress}
+            collateralTokenIdLiteral={collateralToken.ticker as CollateralIdLiteral}
+          />
+        )}
+        {collateralToken && (
+          <VaultRedeemRequestsTable
+            vaultAddress={selectedVaultAccountAddress}
+            collateralTokenIdLiteral={collateralToken.ticker as CollateralIdLiteral}
+          />
+        )}
+        {collateralToken && (
+          <ReplaceTable
+            vaultAddress={selectedVaultAccountAddress}
+            collateralTokenIdLiteral={collateralToken.ticker as CollateralIdLiteral}
+          />
+        )}
       </Stack>
     </MainContainer>
   );