From 23eb4de08b7aaeeeb354ac70978798fdab6e0ac2 Mon Sep 17 00:00:00 2001 From: Radu Mojic Date: Fri, 3 Nov 2023 11:52:26 +0200 Subject: [PATCH 1/4] updated cypress config to match the new devnet specs --- cypress/e2e/Dashbboard/Dashboard.cy.ts | 6 +++--- cypress/e2e/Search/enums.ts | 10 +++++----- src/config/config.multiple.ts | 10 +++++----- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/cypress/e2e/Dashbboard/Dashboard.cy.ts b/cypress/e2e/Dashbboard/Dashboard.cy.ts index 1afdcafff..e33331cd2 100644 --- a/cypress/e2e/Dashbboard/Dashboard.cy.ts +++ b/cypress/e2e/Dashbboard/Dashboard.cy.ts @@ -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(191274); + 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); }); }); diff --git a/cypress/e2e/Search/enums.ts b/cypress/e2e/Search/enums.ts index 4ec735c45..2c9eeeede 100644 --- a/cypress/e2e/Search/enums.ts +++ b/cypress/e2e/Search/enums.ts @@ -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 { diff --git a/src/config/config.multiple.ts b/src/config/config.multiple.ts index 173c20b20..aefea5544 100644 --- a/src/config/config.multiple.ts +++ b/src/config/config.multiple.ts @@ -35,15 +35,15 @@ export const networks: NetworkType[] = [ apiAddress: 'https://devnet-api.multiversx.com' }, { - id: 'devnet2', - name: 'Devnet2', + id: 'devnet', + 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 From 6437a4117b926fa8500fa581f56853c0828fc04c Mon Sep 17 00:00:00 2001 From: Radu Mojic Date: Fri, 3 Nov 2023 12:49:31 +0200 Subject: [PATCH 2/4] updated cypress config to match the new devnet specs --- cypress/e2e/Dashbboard/Dashboard.cy.ts | 2 +- cypress/e2e/NFTs/NFTs.cy.ts | 4 ++-- cypress/e2e/Search/Search.cy.ts | 2 +- cypress/e2e/Search/enums.ts | 2 +- cypress/e2e/Validators/Validators.cy.ts | 2 +- src/components/CollectionLink/CollectionLink.tsx | 15 +++++++++------ src/pages/Collections/Collections.tsx | 5 ++++- 7 files changed, 19 insertions(+), 13 deletions(-) diff --git a/cypress/e2e/Dashbboard/Dashboard.cy.ts b/cypress/e2e/Dashbboard/Dashboard.cy.ts index e33331cd2..649674903 100644 --- a/cypress/e2e/Dashbboard/Dashboard.cy.ts +++ b/cypress/e2e/Dashbboard/Dashboard.cy.ts @@ -21,7 +21,7 @@ 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(191274); + 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); diff --git a/cypress/e2e/NFTs/NFTs.cy.ts b/cypress/e2e/NFTs/NFTs.cy.ts index 692f44d9a..076f6b06c 100644 --- a/cypress/e2e/NFTs/NFTs.cy.ts +++ b/cypress/e2e/NFTs/NFTs.cy.ts @@ -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'); }); }); diff --git a/cypress/e2e/Search/Search.cy.ts b/cypress/e2e/Search/Search.cy.ts index c2c74dc9e..eee116955 100644 --- a/cypress/e2e/Search/Search.cy.ts +++ b/cypress/e2e/Search/Search.cy.ts @@ -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); }); diff --git a/cypress/e2e/Search/enums.ts b/cypress/e2e/Search/enums.ts index 2c9eeeede..3b5b45763 100644 --- a/cypress/e2e/Search/enums.ts +++ b/cypress/e2e/Search/enums.ts @@ -1,5 +1,5 @@ export enum SearchDataEnums { - address = 'erd1wgxxclk0v8xnyj0fm6hx830q77za4mf0036sjuxan7h99v4tla9q3n2mz5', + address = 'erd1kyle4p6chlvj0u6fyds7wj47jqwq6kh9h083kw8j76254l8u49dqepfz86', transactionHash = '59ee93ecd116674d01ff38ec8296c0fba5b801ce5207c8cb3e0f012661019120', blockHash = '5b4c94ec196b4d08429c7236bfb83e412594aaaafa7b4ca262ef2fc1e9c2cc79', validatorKey = '03c4bdea01ea82f8fdc7a6718b54e274bf88d2268a755c2fce185165632cd4cf085023e6f3aebcf3a1c2246330135703953fa7c158cde66ccd6b3798b0d671e6f01bd6e9698de2c88c7f286b6a3e08814c538063f9e86ba8930154cc08bc9b03', diff --git a/cypress/e2e/Validators/Validators.cy.ts b/cypress/e2e/Validators/Validators.cy.ts index ed51fe889..b9a4cf827 100644 --- a/cypress/e2e/Validators/Validators.cy.ts +++ b/cypress/e2e/Validators/Validators.cy.ts @@ -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' }); diff --git a/src/components/CollectionLink/CollectionLink.tsx b/src/components/CollectionLink/CollectionLink.tsx index a9b117c03..cadab6929 100644 --- a/src/components/CollectionLink/CollectionLink.tsx +++ b/src/components/CollectionLink/CollectionLink.tsx @@ -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) => ( <> - +
{collection?.assets?.svgUrl && ( { >
- +
{collection.name} From d3680441da223e64ffc62ebfe51ddd7b67f0d25b Mon Sep 17 00:00:00 2001 From: Radu Mojic Date: Fri, 3 Nov 2023 12:57:06 +0200 Subject: [PATCH 3/4] updated cypress config to match the new devnet specs --- cypress/e2e/Search/enums.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cypress/e2e/Search/enums.ts b/cypress/e2e/Search/enums.ts index 3b5b45763..2c9eeeede 100644 --- a/cypress/e2e/Search/enums.ts +++ b/cypress/e2e/Search/enums.ts @@ -1,5 +1,5 @@ export enum SearchDataEnums { - address = 'erd1kyle4p6chlvj0u6fyds7wj47jqwq6kh9h083kw8j76254l8u49dqepfz86', + address = 'erd1wgxxclk0v8xnyj0fm6hx830q77za4mf0036sjuxan7h99v4tla9q3n2mz5', transactionHash = '59ee93ecd116674d01ff38ec8296c0fba5b801ce5207c8cb3e0f012661019120', blockHash = '5b4c94ec196b4d08429c7236bfb83e412594aaaafa7b4ca262ef2fc1e9c2cc79', validatorKey = '03c4bdea01ea82f8fdc7a6718b54e274bf88d2268a755c2fce185165632cd4cf085023e6f3aebcf3a1c2246330135703953fa7c158cde66ccd6b3798b0d671e6f01bd6e9698de2c88c7f286b6a3e08814c538063f9e86ba8930154cc08bc9b03', From 5be7aab2bb8fb8a35b0c2612b57a966180aa121a Mon Sep 17 00:00:00 2001 From: Radu Mojic Date: Fri, 3 Nov 2023 14:50:46 +0200 Subject: [PATCH 4/4] updated id for devnet-old --- src/config/config.multiple.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/config/config.multiple.ts b/src/config/config.multiple.ts index aefea5544..ab256931d 100644 --- a/src/config/config.multiple.ts +++ b/src/config/config.multiple.ts @@ -35,7 +35,7 @@ export const networks: NetworkType[] = [ apiAddress: 'https://devnet-api.multiversx.com' }, { - id: 'devnet', + id: 'devnet-old', name: 'Devnet Old', chainId: 'D', adapter: 'api',