Skip to content

Commit

Permalink
Merge pull request #22 from multiversx/development
Browse files Browse the repository at this point in the history
Development
  • Loading branch information
radumojic authored Nov 3, 2023
2 parents 1f9c8b0 + 5be7aab commit 2d35a58
Show file tree
Hide file tree
Showing 8 changed files with 30 additions and 24 deletions.
6 changes: 3 additions & 3 deletions cypress/e2e/Dashbboard/Dashboard.cy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ describe('Dashboard', () => {
});
cy.verifyApiResponse(ApiEndpointsEnum.stats, (xhr) => {
expect(xhr?.response?.body?.accounts).to.be.at.least(3200);
expect(xhr?.response?.body?.scResults).to.be.at.least(191275);
expect(xhr?.response?.body?.blocks).to.be.at.least(14078875);
expect(xhr?.response?.body?.epoch).to.be.at.least(2947);
expect(xhr?.response?.body?.scResults).to.be.at.least(48177);
expect(xhr?.response?.body?.blocks).to.be.at.least(3333177);
expect(xhr?.response?.body?.epoch).to.be.at.least(346);
expect(xhr?.response?.body?.shards).to.be.at.least(3);
});
});
Expand Down
4 changes: 2 additions & 2 deletions cypress/e2e/NFTs/NFTs.cy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ describe('NFTs', () => {
cy.paginationHandler(RoutesEnum.collections);
});

it('should acces the block details page', () => {
it('should acces the nft details page', () => {
cy.viewport(1000, 3000);
cy.get('img').first().click();
cy.get('collectionLink1').click();
cy.getSelector('title').should(AssertionEnum.contain, 'Collection Details');
});
});
2 changes: 1 addition & 1 deletion cypress/e2e/Search/Search.cy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ describe('Search', () => {
it('should return the token details page', () => {
searchHandler(SearchDataEnums.token);
cy.checkUrl(RoutesEnum.tokens);
cy.contains('ASH Token');
cy.contains('USDC Token');
cy.verifyApiResponse(ApiEndpointsEnum.tokens, (xhr) => {
expect(xhr?.response.body.identifier).to.eq(SearchDataEnums.token);
});
Expand Down
10 changes: 5 additions & 5 deletions cypress/e2e/Search/enums.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
export enum SearchDataEnums {
address = 'erd1wgxxclk0v8xnyj0fm6hx830q77za4mf0036sjuxan7h99v4tla9q3n2mz5',
transactionHash = 'ec6babc0d7c597502c5b93a5cda39ecbaf6f1f9ac2c4fc1a8b4b11c179a330cb',
blockHash = '635523c1dca5abca8e029bdac492041e7853011f0655b567e089a96394c0d862',
validatorKey = '10696e162905998ae1ac65096091f584e6c817660f259e637e14a7edd6f71ffa26f49c672d09b348e826f7ce495d04018581bb356c4eff4f00382d42c2ba2e3e334adaf6bad5c839021a9bdc3443decb802796becc61741c59e59ef6fa5c2a14',
token = 'ASH-4ce444',
collectionName = 'HYBRIDS-859353'
transactionHash = '59ee93ecd116674d01ff38ec8296c0fba5b801ce5207c8cb3e0f012661019120',
blockHash = '5b4c94ec196b4d08429c7236bfb83e412594aaaafa7b4ca262ef2fc1e9c2cc79',
validatorKey = '03c4bdea01ea82f8fdc7a6718b54e274bf88d2268a755c2fce185165632cd4cf085023e6f3aebcf3a1c2246330135703953fa7c158cde66ccd6b3798b0d671e6f01bd6e9698de2c88c7f286b6a3e08814c538063f9e86ba8930154cc08bc9b03',
token = 'USDC-350c4e',
collectionName = 'HLSR-7039de'
}

export enum SearchSelectorsEnum {
Expand Down
2 changes: 1 addition & 1 deletion cypress/e2e/Validators/Validators.cy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ describe('Validators', () => {
cy.paginationHandler(RoutesEnum.nodes);
});

it('should acces the block details page', () => {
it('should acces the validator details page', () => {
cy.get('header').invoke('css', {
display: 'none'
});
Expand Down
15 changes: 9 additions & 6 deletions src/components/CollectionLink/CollectionLink.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,18 @@ import { NetworkLink, NftBadge } from 'components';
import { urlBuilder } from 'helpers';
import { faHexagonCheck } from 'icons/solid';

import { CollectionType } from 'types';
import { CollectionType, WithClassnameType } from 'types';

export const CollectionLink = ({
collection
}: {
export interface CollectionLinkType extends WithClassnameType {
collection: CollectionType;
}) => (
}

export const CollectionLink = ({ collection, ...rest }: CollectionLinkType) => (
<>
<NetworkLink to={urlBuilder.collectionDetails(collection.collection)}>
<NetworkLink
to={urlBuilder.collectionDetails(collection.collection)}
{...rest}
>
<div className='d-flex align-items-center'>
{collection?.assets?.svgUrl && (
<img
Expand Down
10 changes: 5 additions & 5 deletions src/config/config.multiple.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,15 +35,15 @@ export const networks: NetworkType[] = [
apiAddress: 'https://devnet-api.multiversx.com'
},
{
id: 'devnet2',
name: 'Devnet2',
id: 'devnet-old',
name: 'Devnet Old',
chainId: 'D',
adapter: 'api',
theme: 'testnet',
egldLabel: 'xEGLD',
walletAddress: 'https://devnet2-wallet.multiversx.com',
explorerAddress: 'https://devnet2-explorer.multiversx.com',
apiAddress: 'https://devnet2-api.multiversx.com'
walletAddress: 'https://devnet-old-wallet.multiversx.com',
explorerAddress: 'https://devnet-old-explorer.multiversx.com',
apiAddress: 'https://devnet-old-api.multiversx.com'
},

// Internal Testnets
Expand Down
5 changes: 4 additions & 1 deletion src/pages/Collections/Collections.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,10 @@ export const Collections = () => {
>
<td>
<div className='d-flex align-items-center'>
<CollectionLink collection={collection} />
<CollectionLink
collection={collection}
data-testid={`collectionLink${i}`}
/>
</div>
</td>
<td>{collection.name}</td>
Expand Down

0 comments on commit 2d35a58

Please sign in to comment.