Commit 04966989 authored by tom's avatar tom

Merge branch 'main' of github.com:blockscout/frontend into feat/verified-tokens

parents 23fb109d 21528c82
...@@ -39,7 +39,7 @@ NEXT_PUBLIC_HOMEPAGE_CHARTS=__PLACEHOLDER_FOR_NEXT_PUBLIC_HOMEPAGE_CHARTS__ ...@@ -39,7 +39,7 @@ NEXT_PUBLIC_HOMEPAGE_CHARTS=__PLACEHOLDER_FOR_NEXT_PUBLIC_HOMEPAGE_CHARTS__
NEXT_PUBLIC_HOMEPAGE_PLATE_GRADIENT=__PLACEHOLDER_FOR_NEXT_PUBLIC_HOMEPAGE_PLATE_GRADIENT__ NEXT_PUBLIC_HOMEPAGE_PLATE_GRADIENT=__PLACEHOLDER_FOR_NEXT_PUBLIC_HOMEPAGE_PLATE_GRADIENT__
NEXT_PUBLIC_HOMEPAGE_SHOW_GAS_TRACKER=__PLACEHOLDER_FOR_NEXT_PUBLIC_HOMEPAGE_SHOW_GAS_TRACKER__ NEXT_PUBLIC_HOMEPAGE_SHOW_GAS_TRACKER=__PLACEHOLDER_FOR_NEXT_PUBLIC_HOMEPAGE_SHOW_GAS_TRACKER__
NEXT_PUBLIC_HOMEPAGE_SHOW_AVG_BLOCK_TIME=__PLACEHOLDER_FOR_NEXT_PUBLIC_HOMEPAGE_SHOW_AVG_BLOCK_TIME__ NEXT_PUBLIC_HOMEPAGE_SHOW_AVG_BLOCK_TIME=__PLACEHOLDER_FOR_NEXT_PUBLIC_HOMEPAGE_SHOW_AVG_BLOCK_TIME__
NEXT_PUBLIC_AD_DOMAIN_WITH_AD=__PLACEHOLDER_FOR_NEXT_PUBLIC_DOMAIN_WITH_AD__ NEXT_PUBLIC_AD_DOMAIN_WITH_AD=__PLACEHOLDER_FOR_NEXT_PUBLIC_AD_DOMAIN_WITH_AD__
NEXT_PUBLIC_AD_ADBUTLER_ON=__PLACEHOLDER_FOR_NEXT_PUBLIC_AD_ADBUTLER_ON__ NEXT_PUBLIC_AD_ADBUTLER_ON=__PLACEHOLDER_FOR_NEXT_PUBLIC_AD_ADBUTLER_ON__
NEXT_PUBLIC_GRAPHIQL_TRANSACTION=__PLACEHOLDER_FOR_NEXT_PUBLIC_GRAPHIQL_TRANSACTION__ NEXT_PUBLIC_GRAPHIQL_TRANSACTION=__PLACEHOLDER_FOR_NEXT_PUBLIC_GRAPHIQL_TRANSACTION__
......
This diff is collapsed.
This diff is collapsed.
...@@ -5,7 +5,7 @@ blockscout: ...@@ -5,7 +5,7 @@ blockscout:
app: blockscout app: blockscout
enabled: true enabled: true
image: image:
_default: &image blockscout/blockscout-optimism-l2-advanced:5.1.2-prerelease-7a3279b9 _default: &image blockscout/blockscout-optimism-l2-advanced:5.1.2-prerelease-465ba09e
replicas: replicas:
app: 1 app: 1
# init container # init container
...@@ -83,9 +83,9 @@ blockscout: ...@@ -83,9 +83,9 @@ blockscout:
_default: prod _default: prod
ECTO_USE_SSL: ECTO_USE_SSL:
_default: 'false' _default: 'false'
ENABLE_RUST_VERIFICATION_SERVICE: MICROSERVICE_SC_VERIFIER_ENABLED:
_default: 'true' _default: 'true'
RUST_VERIFICATION_SERVICE_URL: MICROSERVICE_SC_VERIFIER_URL:
_default: http://sc-verifier-svc:8043 _default: http://sc-verifier-svc:8043
ACCOUNT_ENABLED: ACCOUNT_ENABLED:
_default: 'true' _default: 'true'
......
...@@ -108,9 +108,9 @@ blockscout: ...@@ -108,9 +108,9 @@ blockscout:
_default: 'true' _default: 'true'
CHAIN_ID: CHAIN_ID:
_default: 5 _default: 5
ENABLE_RUST_VERIFICATION_SERVICE: MICROSERVICE_SC_VERIFIER_ENABLED:
_default: 'true' _default: 'true'
RUST_VERIFICATION_SERVICE_URL: MICROSERVICE_SC_VERIFIER_URL:
_default: http://eth-bytecode-db-svc.eth-bytecode-db-testing.svc.cluster.local:80 _default: http://eth-bytecode-db-svc.eth-bytecode-db-testing.svc.cluster.local:80
INDEXER_MEMORY_LIMIT: INDEXER_MEMORY_LIMIT:
_default: 5 _default: 5
......
This diff is collapsed.
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
"build": "next build", "build": "next build",
"build:docker": "docker build --build-arg GIT_COMMIT_SHA=$(git rev-parse HEAD) -t blockscout ./", "build:docker": "docker build --build-arg GIT_COMMIT_SHA=$(git rev-parse HEAD) -t blockscout ./",
"start": "next start", "start": "next start",
"start:docker:local": "docker run -p 3000:3000 --env-file .env.local blockscout",
"start:docker:poa_core": "docker run -p 3000:3000 --env-file ./configs/envs/.env.common --env-file ./configs/envs/.env.poa_core --env-file ./configs/envs/.env.secrets blockscout", "start:docker:poa_core": "docker run -p 3000:3000 --env-file ./configs/envs/.env.common --env-file ./configs/envs/.env.poa_core --env-file ./configs/envs/.env.secrets blockscout",
"lint:eslint": "./node_modules/.bin/eslint . --ext .js,.jsx,.ts,.tsx", "lint:eslint": "./node_modules/.bin/eslint . --ext .js,.jsx,.ts,.tsx",
"lint:eslint:fix": "./node_modules/.bin/eslint . --ext .js,.jsx,.ts,.tsx --fix", "lint:eslint:fix": "./node_modules/.bin/eslint . --ext .js,.jsx,.ts,.tsx --fix",
......
import { Box, Button, Heading, Icon, Text, chakra } from '@chakra-ui/react'; import { Box, Button, Heading, Icon, chakra } from '@chakra-ui/react';
import { route } from 'nextjs-routes'; import { route } from 'nextjs-routes';
import React from 'react'; import React from 'react';
...@@ -13,8 +13,7 @@ const AppErrorBlockConsensus = ({ hash, className }: Props) => { ...@@ -13,8 +13,7 @@ const AppErrorBlockConsensus = ({ hash, className }: Props) => {
return ( return (
<Box className={ className }> <Box className={ className }>
<Icon as={ icon404 } width="200px" height="auto"/> <Icon as={ icon404 } width="200px" height="auto"/>
<Heading mt={ 8 } size="2xl" fontFamily="body">Block not found</Heading> <Heading mt={ 8 } size="2xl" fontFamily="body">Block removed due to chain reorganization</Heading>
<Text variant="secondary" mt={ 3 }>Block removed due to chain reorganization.</Text>
<Button <Button
mt={ 8 } mt={ 8 }
size="lg" size="lg"
......
...@@ -274,6 +274,7 @@ const ChartWidget = ({ items, title, description, isLoading, className, isError, ...@@ -274,6 +274,7 @@ const ChartWidget = ({ items, title, description, isLoading, className, isError,
title={ title } title={ title }
description={ description } description={ description }
onClose={ clearFullscreenChart } onClose={ clearFullscreenChart }
units={ units }
/> />
) } ) }
</> </>
......
...@@ -13,6 +13,7 @@ type Props = { ...@@ -13,6 +13,7 @@ type Props = {
description?: string; description?: string;
items: Array<TimeChartItem>; items: Array<TimeChartItem>;
onClose: () => void; onClose: () => void;
units?: string;
} }
const FullscreenChartModal = ({ const FullscreenChartModal = ({
...@@ -20,6 +21,7 @@ const FullscreenChartModal = ({ ...@@ -20,6 +21,7 @@ const FullscreenChartModal = ({
title, title,
description, description,
items, items,
units,
onClose, onClose,
}: Props) => { }: Props) => {
const [ isZoomResetInitial, setIsZoomResetInitial ] = React.useState(true); const [ isZoomResetInitial, setIsZoomResetInitial ] = React.useState(true);
...@@ -94,6 +96,7 @@ const FullscreenChartModal = ({ ...@@ -94,6 +96,7 @@ const FullscreenChartModal = ({
margin={{ bottom: 60 }} margin={{ bottom: 60 }}
isEnlarged isEnlarged
items={ items } items={ items }
units={ units }
onZoom={ handleZoom } onZoom={ handleZoom }
isZoomResetInitial={ isZoomResetInitial } isZoomResetInitial={ isZoomResetInitial }
title={ title } title={ title }
......
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