Commit d5925ba9 authored by Igor Stuev's avatar Igor Stuev Committed by GitHub

Merge pull request #1837 from blockscout/release/v1_29_0

Fixes for release v1.29.0
parents ca10f8ab 28dc0261
......@@ -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 }
/>
) }
......
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,
......
......@@ -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>
......
......@@ -80,6 +80,10 @@ const AdaptiveTabsList = (props: Props) => {
>
{ tabsList.map((tab, index) => {
if (!tab.id) {
if (props.isLoading) {
return null;
}
return (
<TabsMenu
key="menu"
......
......@@ -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>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment