chore(trading): add test ID and fix unit test

apps/explorer/src/app/components/txs/tx-list-navigation.spec.tsx

@@ -61,4 +61,53 @@ describe('TxsListNavigation', () => {
 
     expect(nextPageMock).toHaveBeenCalledTimes(1);
   });
+
+  it('disables "Older" button if hasMoreTxs is false', () => {
+    render(
+      <TxsListNavigation
+        refreshTxs={NOOP}
+        nextPage={NOOP}
+        previousPage={NOOP}
+        hasMoreTxs={false}
+        hasPreviousPage={false}
+      >
+        <span></span>
+      </TxsListNavigation>
+    );
+
+    expect(screen.getByText('Older')).toBeDisabled();
+  });
+
+  it('disables "Newer" button if hasPreviousPage is false', () => {
+    render(
+      <TxsListNavigation
+        refreshTxs={NOOP}
+        nextPage={NOOP}
+        previousPage={NOOP}
+        hasMoreTxs={true}
+        hasPreviousPage={false}
+      >
+        <span></span>
+      </TxsListNavigation>
+    );
+
+    expect(screen.getByText('Newer')).toBeDisabled();
+  });
+
+  it('disables both buttons when more and previous are false', () => {
+    render(
+      <TxsListNavigation
+        refreshTxs={NOOP}
+        nextPage={NOOP}
+        previousPage={NOOP}
+        hasMoreTxs={false}
+        hasPreviousPage={false}
+      >
+        <span></span>
+      </TxsListNavigation>
+    );
+
+    expect(screen.getByText('Newer')).toBeDisabled();
+    expect(screen.getByText('Older')).toBeDisabled();
+  });
 });

apps/explorer/src/app/components/txs/tx-list-navigation.tsx

@@ -10,8 +10,7 @@ export interface TxListNavigationProps {
   loading?: boolean;
   hasPreviousPage: boolean;
   hasMoreTxs: boolean;
-  children?: React.ReactNode;
-  isEmpty?: boolean;
+  children: React.ReactNode;
 }
 /**
  * Displays a list of transactions with filters and controls to navigate through the list.
@@ -22,8 +21,9 @@ export const TxsListNavigation = ({
   refreshTxs,
   nextPage,
   previousPage,
+  hasMoreTxs,
+  hasPreviousPage,
   children,
-  isEmpty,
   loading = false,
 }: TxListNavigationProps) => {
   return (
@@ -35,6 +35,7 @@ export const TxsListNavigation = ({
           <Button
             className="mr-2"
             size="xs"
+            disabled={!hasPreviousPage || loading}
             onClick={() => {
               previousPage();
             }}
@@ -43,7 +44,7 @@ export const TxsListNavigation = ({
           </Button>
           <Button
             size="xs"
-            disabled={isEmpty}
+            disabled={!hasMoreTxs}
             onClick={() => {
               nextPage();
             }}

apps/explorer/src/app/hooks/get-txs-data-url.ts

@@ -43,7 +43,7 @@ export const getTxsDataUrl = (params: IGetTxsDataUrl) => {
     url.searchParams.append('first', count);
     url.searchParams.append('after', params.after);
   } else {
-    url.searchParams.append('first', count);
+    url.searchParams.append('last', count);
   }
 
   // Hacky fix for param as array

apps/explorer/src/app/hooks/get-txs-data-urls.spec.ts

@@ -6,7 +6,7 @@ describe('getTxsDataUrl', () => {
       count: 10,
       baseUrl: 'https://example.com/transactions',
     };
-    const expectedUrl = 'https://example.com/transactions?first=10';
+    const expectedUrl = 'https://example.com/transactions?last=10';
 
     expect(getTxsDataUrl(params)).toEqual(expectedUrl);
   });
@@ -41,7 +41,7 @@ describe('getTxsDataUrl', () => {
       baseUrl: 'https://example.com/transactions',
     };
     const expectedUrl =
-      'https://example.com/transactions?first=10&filters[cmd.type]=Made%20Up%20Transaction&filters[tx.submitter]=1234';
+      'https://example.com/transactions?last=10&filters[cmd.type]=Made%20Up%20Transaction&filters[tx.submitter]=1234';
 
     expect(getTxsDataUrl(params)).toEqual(expectedUrl);
   });

apps/explorer/src/app/hooks/use-txs-data.ts

@@ -31,14 +31,14 @@ export interface IUseTxsData {
 }
 
 export const useTxsData = ({
-  count = 50,
+  count = 25,
   before,
   after,
   filters,
   party,
 }: IUseTxsData) => {
   const [, setSearchParams] = useSearchParams();
-  let hasMoreTxs = false;
+  let hasMoreTxs = true;
   let txsData: BlockExplorerTransactionResult[] = [];
 
   const url = getTxsDataUrl({
@@ -60,8 +60,8 @@ export const useTxsData = ({
   }
 
   const nextPage = useCallback(() => {
-    const before = data?.transactions.at(-1)?.cursor || '';
-    const params: URLSearchParamsInit = { before };
+    const after = data?.transactions.at(-1)?.cursor || '';
+    const params: URLSearchParamsInit = { after };
     if (filters) {
       params.filters = Array.from(filters).join(',');
     }
@@ -69,8 +69,8 @@ export const useTxsData = ({
   }, [filters, data, setSearchParams]);
 
   const previousPage = useCallback(() => {
-    const after = data?.transactions[0]?.cursor || '';
-    const params: URLSearchParamsInit = { after };
+    const before = data?.transactions[0]?.cursor || '';
+    const params: URLSearchParamsInit = { before };
     if (filters && filters.size > 0 && filters.size === 1) {
       params.filters = Array.from(filters)[0];
     }

apps/explorer/src/app/routes/txs/home/index.tsx

@@ -51,10 +51,9 @@ export const TxsListFiltered = () => {
         refreshTxs={refreshTxs}
         nextPage={nextPage}
         previousPage={previousPage}
-        hasPreviousPage={hasMoreTxs}
+        hasPreviousPage={true}
         loading={loading}
         hasMoreTxs={hasMoreTxs}
-        isEmpty={txsData.length === 0}
       >
         <TxsFilter
           filters={filters}
@@ -71,16 +70,7 @@ export const TxsListFiltered = () => {
         txs={txsData}
         loadMoreTxs={nextPage}
         error={error}
-        className="mb-4 w-full min-w-[400px]"
-      />
-      <TxsListNavigation
-        refreshTxs={refreshTxs}
-        nextPage={nextPage}
-        previousPage={previousPage}
-        hasPreviousPage={hasMoreTxs}
-        loading={loading}
-        hasMoreTxs={hasMoreTxs}
-        isEmpty={txsData.length === 0}
+        className="mb-28 w-full min-w-[400px]"
       />
     </>
   );

apps/governance/src/lib/party.test.ts

@@ -1,112 +0,0 @@
-import type { ApolloError } from '@apollo/client';
-import {
-  PARTY_NOT_FOUND,
-  filterAcceptableGraphqlErrors,
-  isPartyNotFoundError,
-} from './party';
-import type { GraphQLError } from 'graphql';
-
-/**
- *
- * @param message
- * @returns GraphQLError
- */
-function createMockApolloErrors(message: string): GraphQLError {
-  return {
-    message,
-    extensions: {
-      code: message.toUpperCase().replace(/ /g, '_'),
-    },
-    locations: [],
-    originalError: new Error(message),
-    path: [],
-    nodes: [],
-    positions: [1],
-    name: message,
-    source: {
-      body: message,
-      name: message,
-      locationOffset: {
-        line: 1,
-        column: 1,
-      },
-    },
-  };
-}
-
-describe('filterAcceptableGraphqlErrors', () => {
-  it('should return undefined if the error is a party not found error', () => {
-    const error: Partial<ApolloError> = {
-      graphQLErrors: [createMockApolloErrors('failed to get party for ID')],
-    };
-
-    const result = filterAcceptableGraphqlErrors(error as ApolloError);
-
-    expect(result).toBeUndefined();
-  });
-
-  it('should return the error if it is not a party not found error', () => {
-    const error: Partial<ApolloError> = {
-      graphQLErrors: [createMockApolloErrors('Some other error')],
-    };
-
-    const result = filterAcceptableGraphqlErrors(error as ApolloError);
-
-    expect(result).toEqual(error);
-  });
-
-  it('should return the error if there are multiple errors', () => {
-    const error: Partial<ApolloError> = {
-      graphQLErrors: [
-        createMockApolloErrors('failed to get party for ID'),
-        createMockApolloErrors('Some other error'),
-      ],
-    };
-
-    const result = filterAcceptableGraphqlErrors(error as ApolloError);
-
-    expect(result).toEqual(error);
-  });
-
-  it('should return the error if there are no errors', () => {
-    const error: Partial<ApolloError> = {
-      graphQLErrors: [],
-    };
-
-    const result = filterAcceptableGraphqlErrors(error as ApolloError);
-
-    expect(result).toEqual(error);
-  });
-
-  it('should return undefined if the error is undefined', () => {
-    const result = filterAcceptableGraphqlErrors(undefined);
-
-    expect(result).toBeUndefined();
-  });
-});
-
-describe('isPartyNotFoundError', () => {
-  it('should return true if the error message includes PARTY_NOT_FOUND', () => {
-    const error = { message: 'failed to get party for ID' };
-
-    const result = isPartyNotFoundError(error);
-
-    expect(result).toBe(true);
-  });
-
-  it('should return false if the error message does not include PARTY_NOT_FOUND', () => {
-    const error = { message: 'Some other error' };
-
-    const result = isPartyNotFoundError(error);
-
-    expect(result).toBe(false);
-  });
-
-  // Will trip if the error message changes, which should not be a problem, but there
-  // might be logic that depends on it
-  it('expects party not found error to remain consistent', () => {
-    const error = 'failed to get party for ID';
-
-    expect(PARTY_NOT_FOUND).toStrictEqual(error);
-  });
-});

apps/governance/src/lib/party.ts

@@ -1,5 +1,3 @@
-import type { ApolloError } from '@apollo/client';
-
 export const PARTY_NOT_FOUND = 'failed to get party for ID';
 
 export const isPartyNotFoundError = (error: { message: string }) => {
@@ -8,23 +6,3 @@ export const isPartyNotFoundError = (error: { message: string }) => {
   }
   return false;
 };
-
-/**
- * If a party has no accounts or data, then this GraphQL query believes it does not exist
- * Not having any rewards is a valid state, so in some cases we can filter this error out.
- *
- * @param error ApolloError | undefined
- * @returns ApolloError | undefined
- */
-export function filterAcceptableGraphqlErrors(
-  error?: ApolloError
-): ApolloError | undefined {
-  // Currently the only error we expect is when a party has no accounts
-  if (error && error.graphQLErrors.length === 1) {
-    if (isPartyNotFoundError(error.graphQLErrors[0])) {
-      return;
-    }
-  }
-
-  return error;
-}

apps/governance/src/routes/proposals/components/vote-details/vote-buttons.tsx

@@ -18,7 +18,6 @@ import { ProposalMinRequirements, ProposalUserAction } from '../shared';
 import { VoteTransactionDialog } from './vote-transaction-dialog';
 import { useVoteButtonsQuery } from './__generated__/Stake';
 import type { DialogProps, VegaTxState } from '@vegaprotocol/proposals';
-import { filterAcceptableGraphqlErrors } from '../../../../lib/party';
 
 interface VoteButtonsContainerProps {
   voteState: VoteState | null;
@@ -43,10 +42,8 @@ export const VoteButtonsContainer = (props: VoteButtonsContainerProps) => {
     skip: !pubKey,
   });
 
-  const filteredErrors = filterAcceptableGraphqlErrors(error);
-
   return (
-    <AsyncRenderer loading={loading} error={filteredErrors} data={data}>
+    <AsyncRenderer loading={loading} error={error} data={data}>
       <VoteButtons
         {...props}
         currentStakeAvailable={toBigNum(

apps/governance/src/routes/rewards/epoch-individual-rewards/epoch-individual-rewards.tsx

@@ -10,7 +10,6 @@ import { EpochIndividualRewardsTable } from './epoch-individual-rewards-table';
 import { generateEpochIndividualRewardsList } from './generate-epoch-individual-rewards-list';
 import { calculateEpochOffset } from '../../../lib/epoch-pagination';
 import { useNetworkParam } from '@vegaprotocol/network-parameters';
-import { filterAcceptableGraphqlErrors } from '../../../lib/party';
 
 const EPOCHS_PAGE_SIZE = 10;
 
@@ -100,24 +99,17 @@ export const EpochIndividualRewards = ({
     prevEpochIdRef.current = epochId;
   }, [epochId, refetchData]);
 
-  // Workarounds for the error handling of AsyncRenderer
-  const filteredErrors = filterAcceptableGraphqlErrors(error);
-  const filteredData = data || [];
-
   return (
     <AsyncRenderer
       loading={loading}
-      error={filteredErrors}
-      data={filteredData}
+      error={error}
+      data={data}
       render={() => (
         <div>
           <p data-testid="connected-vega-key" className="mb-10">
             {t('Connected Vega key')}:{' '}
             <span className="text-white">{pubKey}</span>
           </p>
-          {epochIndividualRewardSummaries.length === 0 && (
-            <p>{t('No rewards for key')}</p>
-          )}
           {epochIndividualRewardSummaries.map(
             (epochIndividualRewardSummary) => (
               <EpochIndividualRewardsTable
@@ -126,19 +118,17 @@ export const EpochIndividualRewards = ({
               />
             )
           )}
-          {epochIndividualRewardSummaries.length > 0 && (
-            <Pagination
-              isLoading={loading}
-              hasPrevPage={page > 1}
-              hasNextPage={page < totalPages}
-              onBack={() => refetchData(page - 1)}
-              onNext={() => refetchData(page + 1)}
-              onFirst={() => refetchData(1)}
-              onLast={() => refetchData(totalPages)}
-            >
-              {t('Page')} {page}
-            </Pagination>
-          )}
+          <Pagination
+            isLoading={loading}
+            hasPrevPage={page > 1}
+            hasNextPage={page < totalPages}
+            onBack={() => refetchData(page - 1)}
+            onNext={() => refetchData(page + 1)}
+            onFirst={() => refetchData(1)}
+            onLast={() => refetchData(totalPages)}
+          >
+            {t('Page')} {page}
+          </Pagination>
         </div>
       )}
     />