Merge branch 'dev' of github.com:safe-global/safe-wallet-web into relays

safe-global · Nov 13, 2023 · 8359c8d · 8359c8d
2 parents c29d803 + dc9d022
commit 8359c8d
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 4 deletions.
diff --git a/cypress/e2e/smoke/balances.cy.js b/cypress/e2e/smoke/balances.cy.js
@@ -16,6 +16,7 @@ describe('Balance tests', () => {
     cy.visit(constants.BALANCE_URL + constants.SEPOLIA_TEST_SAFE_5)
     main.acceptCookies()
     cy.contains('Assets')
+    balances.selectTokenList(balances.tokenListOptions.default)
     cy.get(balances.balanceSingleRow).should('have.length.lessThan', ASSETS_LENGTH)
     balances.selectTokenList(balances.tokenListOptions.allTokens)
     cy.get(balances.balanceSingleRow).should('have.length', ASSETS_LENGTH)

diff --git a/cypress/e2e/smoke/nfts.cy.js b/cypress/e2e/smoke/nfts.cy.js
@@ -9,7 +9,7 @@ const nftsTokenID = 'CF'
 describe('NFTs tests', () => {
   beforeEach(() => {
     cy.clearLocalStorage()
-    cy.visit(constants.BALANCE_URL + constants.SEPOLIA_TEST_SAFE_5)
+    cy.visit(constants.balanceNftsUrl + constants.SEPOLIA_TEST_SAFE_5)
     main.acceptCookies()
     nfts.clickOnNftsTab()
   })

diff --git a/src/components/dashboard/Overview/Overview.tsx b/src/components/dashboard/Overview/Overview.tsx
@@ -200,7 +200,7 @@ const Overview = (): ReactElement => {
                         variant="contained"
                         color="primary"
                         startIcon={<AddIcon />}
-                        sx={{ height: 1 }}
+                        sx={{ minHeight: '40px' }}
                         fullWidth
                       >
                         Buy crypto

diff --git a/src/components/nfts/NftGrid/index.tsx b/src/components/nfts/NftGrid/index.tsx
@@ -90,7 +90,7 @@ const NftGrid = ({
   onPreview,
 }: NftsTableProps): ReactElement => {
   const chainId = useChainId()
-  const linkTemplates = nftPlatforms[chainId]
+  const linkTemplates = nftPlatforms[chainId] || []
   // Filter string
   const [filter, setFilter] = useState<string>('')
 

diff --git a/src/components/nfts/config.ts b/src/components/nfts/config.ts
@@ -66,7 +66,15 @@ export const nftPlatforms: Record<keyof typeof chains, Array<NftPlatform>> = {
     {
       title: 'OpenSea',
       logo: '/images/common/nft-opensea.svg',
-      getUrl: (item) => `https://testnets.opensea.io/assets/${item.address}/${item.id}`,
+      getUrl: (item) => `https://testnets.opensea.io/assets/goerli/${item.address}/${item.id}`,
+    },
+  ],
+
+  [chains.sep]: [
+    {
+      title: 'OpenSea',
+      logo: '/images/common/nft-opensea.svg',
+      getUrl: (item) => `https://testnets.opensea.io/assets/sepolia/${item.address}/${item.id}`,
     },
   ],