Merge pull request #1837 from blockscout/release/v1_29_0

Fixes for release v1.29.0
blockscout · Apr 22, 2024 · d5925ba · d5925ba
2 parents ca10f8a + 28dc026
commit d5925ba
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 5 deletions.
diff --git a/ui/address/contract/ContractCode.tsx b/ui/address/contract/ContractCode.tsx
@@ -269,7 +269,7 @@ const ContractCode = ({ addressHash, noSocket }: Props) => {
             <InfoItem
               label="License"
               content={ licenseLink }
-              hint="License type is informative field, and initial source code might have different license type from displayed."
+              hint="License type is entered manually during verification. The initial source code may contain a different license type than the one displayed."
               isLoading={ isPlaceholderData }
             />
           ) }

diff --git a/ui/block/BlockDetails.pw.tsx b/ui/block/BlockDetails.pw.tsx
@@ -1,8 +1,8 @@
-import { test, expect } from '@playwright/experimental-ct-react';
 import React from 'react';
 
 import * as blockMock from 'mocks/blocks/block';
 import contextWithEnvs from 'playwright/fixtures/contextWithEnvs';
+import { test, expect } from 'playwright/lib';
 import TestApp from 'playwright/TestApp';
 import * as configs from 'playwright/utils/configs';
 
@@ -51,7 +51,10 @@ test('genesis block', async({ mount, page }) => {
   await expect(component).toHaveScreenshot();
 });
 
-test('with blob txs', async({ mount, page }) => {
+test('with blob txs', async({ mount, page, mockEnvs }) => {
+  await mockEnvs([
+    [ 'NEXT_PUBLIC_DATA_AVAILABILITY_ENABLED', 'true' ],
+  ]);
   const query = {
     data: blockMock.withBlobTxs,
     isPending: false,

diff --git a/ui/block/BlockDetails.tsx b/ui/block/BlockDetails.tsx
@@ -127,9 +127,9 @@ const BlockDetails = ({ query }: Props) => {
       </LinkInternal>
     );
 
-    const blockBlobTxsNum = data.blob_tx_count ? (
+    const blockBlobTxsNum = (config.features.dataAvailability.isEnabled && data.blob_tx_count) ? (
       <>
-        <span> and </span>
+        <span> including </span>
         <LinkInternal href={ route({ pathname: '/block/[height_or_hash]', query: { height_or_hash: heightOrHash, tab: 'blob_txs' } }) }>
           { data.blob_tx_count } blob txn{ data.blob_tx_count === 1 ? '' : 's' }
         </LinkInternal>

diff --git a/ui/block/__screenshots__/BlockDetails.pw.tsx_default_with-blob-txs-1.png b/ui/block/__screenshots__/BlockDetails.pw.tsx_default_with-blob-txs-1.png
diff --git a/ui/shared/Tabs/AdaptiveTabsList.tsx b/ui/shared/Tabs/AdaptiveTabsList.tsx
@@ -80,6 +80,10 @@ const AdaptiveTabsList = (props: Props) => {
     >
       { tabsList.map((tab, index) => {
         if (!tab.id) {
+          if (props.isLoading) {
+            return null;
+          }
+
           return (
             <TabsMenu
               key="menu"

diff --git a/ui/shared/filters/FilterButton.tsx b/ui/shared/filters/FilterButton.tsx
@@ -35,6 +35,7 @@ const FilterButton = ({ isActive, isLoading, appliedFiltersNum, onClick, as }: P
       px={ 1.5 }
       flexShrink={ 0 }
       as={ as }
+      pointerEvents="all"
     >
       { FilterIcon }
       <Box display={{ base: 'none', lg: 'block' }}>Filter</Box>