Skip to content

Commit

Permalink
Merge branch 'release/v1-34-0' of github.com:blockscout/frontend into…
Browse files Browse the repository at this point in the history
… release/v1-34-0
  • Loading branch information
tom2drum committed Sep 5, 2024
2 parents 8d1994b + 06d1d60 commit 21c9b3b
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
6 changes: 4 additions & 2 deletions ui/address/AddressDetails.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ import React from 'react';

import config from 'configs/app';
import throwOnResourceLoadError from 'lib/errors/throwOnResourceLoadError';
import getNetworkValidationActionText from 'lib/networks/getNetworkValidationActionText';
import getNetworkValidatorTitle from 'lib/networks/getNetworkValidatorTitle';
import getQueryParamString from 'lib/router/getQueryParamString';
import AddressCounterItem from 'ui/address/details/AddressCounterItem';
import ServiceDegradationWarning from 'ui/shared/alerts/ServiceDegradationWarning';
Expand Down Expand Up @@ -216,10 +218,10 @@ const AddressDetails = ({ addressQuery, scrollRef }: Props) => {
{ data.has_validated_blocks && (
<>
<DetailsInfoItem.Label
hint="Number of blocks validated by this validator"
hint={ `Number of blocks ${ getNetworkValidationActionText() } by this ${ getNetworkValidatorTitle() }` }
isLoading={ addressQuery.isPlaceholderData || countersQuery.isPlaceholderData }
>
Blocks validated
{ `Blocks ${ getNetworkValidationActionText() }` }
</DetailsInfoItem.Label>
<DetailsInfoItem.Value>
{ addressQuery.data ? (
Expand Down
2 changes: 1 addition & 1 deletion ui/tx/details/TxInfo.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -790,7 +790,7 @@ const TxInfo = ({ data, isLoading, socketStatus }: Props) => {
<>
<GridItem colSpan={{ base: undefined, lg: 2 }} mt={{ base: 1, lg: 4 }}/>

{ data.arbitrum?.message_related_info && (
{ data.arbitrum?.contains_message && data.arbitrum?.message_related_info && (
<>
<DetailsInfoItem.Label
hint={ data.arbitrum.contains_message === 'incoming' ?
Expand Down

0 comments on commit 21c9b3b

Please sign in to comment.