Merge remote-tracking branch 'origin/subspace-frontend' into muhammad…

…/frontend

.github/workflows/deploy-subspace.yml

@@ -16,12 +16,12 @@ env:
 #   cancel-in-progress: true
 
 jobs:
-  make_slug:
-    name: Make GitHub reference slug
+  publish_image:
+    name: Publish Docker image
     runs-on: ubuntu-latest
     steps:
-      -   name: Inject slug/short variables
-          uses: rlespinasse/github-slug-action@v4.4.1
+      - name: Check out the repo
+        uses: actions/checkout@v3
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
@@ -55,5 +55,3 @@ jobs:
           labels: ${{ steps.meta.outputs.labels }}
           build-args: |
             GIT_COMMIT_SHA=${{ env.SHORT_SHA }}
-
-

.github/workflows/e2e-tests.yml

@@ -4,15 +4,61 @@ on:
   workflow_dispatch:
   workflow_call:
 
-# concurrency:
-#   group: ${{ github.workflow }}__${{ github.job }}__${{ github.ref }}
-#   cancel-in-progress: true
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 
 jobs:
   publish_image:
     name: Publish Docker image
-    uses: './.github/workflows/publish-image.yml'
-    secrets: inherit
+    runs-on: ubuntu-latest
+    outputs:
+      shortSha: ${{ steps.output-step.outputs.short-sha }}
+      tags: ${{ steps.meta.outputs.tags }}
+    steps:
+      - name: Check out the repo
+        uses: actions/checkout@v3
+
+      - name: Inject slug/short variables
+        uses: rlespinasse/github-slug-action@v4.4.1
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+
+      # Will automatically make nice tags, see the table here https://github.com/docker/metadata-action#basic
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v4
+        with:
+          images: ghcr.io/blockscout/frontend
+
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v2
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Add SHORT_SHA env property with commit short sha
+        run: echo "SHORT_SHA=`echo ${GITHUB_SHA} | cut -c1-8`" >> $GITHUB_ENV
+
+      - name: Add outputs
+        run: |
+          echo "::set-output name=short-sha::${{ env.GITHUB_EVENT_PULL_REQUEST_HEAD_SHA_SHORT }}"
+        id: output-step
+
+      - name: Build and push
+        uses: docker/build-push-action@v3
+        with:
+          context: .
+          file: ./Dockerfile
+          push: true
+          cache-from: type=gha
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          build-args: |
+            GIT_COMMIT_SHA=${{ env.SHORT_SHA }}
+            GIT_TAG=${{ github.ref_type == 'tag' && github.ref_name || '' }}
 
   deploy_e2e:
     name: Deploy E2E instance
@@ -37,7 +83,7 @@ jobs:
         with:
           owner: blockscout
           repo: deployment-values
-          github_token: ${{ env.WORKFLOW_TRIGGER_TOKEN }}
+          github_token: ${{env.WORKFLOW_TRIGGER_TOKEN}}
           workflow_file_name: deploy_blockscout.yaml
           ref: main
           wait_interval: 30
@@ -47,4 +93,4 @@ jobs:
     name: Run tests
     needs: deploy_e2e
     uses: blockscout/blockscout-ci-cd/.github/workflows/e2e_new.yaml@master
-    secrets: inherit
+    secrets: inherit

pages/_document.tsx

@@ -6,6 +6,7 @@ import React from 'react';
 import logRequestFromBot from 'nextjs/utils/logRequestFromBot';
 import * as serverTiming from 'nextjs/utils/serverTiming';
 
+import config from 'configs/app';
 import theme from 'theme';
 import * as svgSprite from 'ui/shared/IconSvg';
 

ui/pages/NameDomain.tsx

@@ -13,7 +13,7 @@ import getQueryParamString from 'lib/router/getQueryParamString';
 import { ENS_DOMAIN } from 'stubs/ENS';
 import NameDomainDetails from 'ui/nameDomain/NameDomainDetails';
 import NameDomainHistory from 'ui/nameDomain/NameDomainHistory';
-import TextAd from 'ui/shared/ad/TextAd';
+//import TextAd from 'ui/shared/ad/TextAd';
 import AddressEntity from 'ui/shared/entities/address/AddressEntity';
 import EnsEntity from 'ui/shared/entities/ens/EnsEntity';
 import IconSvg from 'ui/shared/IconSvg';
@@ -84,7 +84,7 @@ const NameDomain = () => {
 
   return (
     <>
-      <TextAd mb={ 6 }/>
+      { /* <TextAd mb={ 6 }/> */ }
       <PageTitle title="Name details" secondRow={ titleSecondRow }/>
       { infoQuery.isPlaceholderData ? (
         <>

ui/pages/UserOp.tsx

@@ -12,7 +12,7 @@ import throwOnAbsentParamError from 'lib/errors/throwOnAbsentParamError';
 import throwOnResourceLoadError from 'lib/errors/throwOnResourceLoadError';
 import getQueryParamString from 'lib/router/getQueryParamString';
 import { USER_OP } from 'stubs/userOps';
-import TextAd from 'ui/shared/ad/TextAd';
+//import TextAd from 'ui/shared/ad/TextAd';
 import PageTitle from 'ui/shared/Page/PageTitle';
 import RoutedTabs from 'ui/shared/Tabs/RoutedTabs';
 import TabsSkeleton from 'ui/shared/Tabs/TabsSkeleton';
@@ -94,7 +94,7 @@ const UserOp = () => {
 
   return (
     <>
-      <TextAd mb={ 6 }/>
+      { /* <TextAd mb={ 6 }/> */ }
       <PageTitle
         title="User operation details"
         backLink={ backLink }

ui/pages/ZkEvmL2TxnBatch.tsx

@@ -11,7 +11,7 @@ import getQueryParamString from 'lib/router/getQueryParamString';
 import { TX_ZKEVM_L2 } from 'stubs/tx';
 import { generateListStub } from 'stubs/utils';
 import { ZKEVM_L2_TXN_BATCH } from 'stubs/zkEvmL2';
-import TextAd from 'ui/shared/ad/TextAd';
+//import TextAd from "ui/shared/ad/TextAd";
 import PageTitle from 'ui/shared/Page/PageTitle';
 import useQueryWithPages from 'ui/shared/pagination/useQueryWithPages';
 import RoutedTabs from 'ui/shared/Tabs/RoutedTabs';
@@ -37,22 +37,48 @@ const ZkEvmL2TxnBatch = () => {
     resourceName: 'zkevm_l2_txn_batch_txs',
     pathParams: { number },
     options: {
-      enabled: Boolean(!batchQuery.isPlaceholderData && batchQuery.data?.number && tab === 'txs'),
+      enabled: Boolean(
+        !batchQuery.isPlaceholderData &&
+          batchQuery.data?.number &&
+          tab === 'txs',
+      ),
       // there is no pagination in zkevm_l2_txn_batch_txs
-      placeholderData: generateListStub<'zkevm_l2_txn_batch_txs'>(TX_ZKEVM_L2, 50, { next_page_params: null }),
+      placeholderData: generateListStub<'zkevm_l2_txn_batch_txs'>(
+        TX_ZKEVM_L2,
+        50,
+        { next_page_params: null },
+      ),
     },
   });
 
   throwOnAbsentParamError(number);
   throwOnResourceLoadError(batchQuery);
 
-  const tabs: Array<RoutedTab> = React.useMemo(() => ([
-    { id: 'index', title: 'Details', component: <ZkEvmL2TxnBatchDetails query={ batchQuery }/> },
-    { id: 'txs', title: 'Transactions', component: <TxsWithFrontendSorting query={ batchTxsQuery } showSocketInfo={ false }/> },
-  ].filter(Boolean)), [ batchQuery, batchTxsQuery ]);
+  const tabs: Array<RoutedTab> = React.useMemo(
+    () =>
+      [
+        {
+          id: 'index',
+          title: 'Details',
+          component: <ZkEvmL2TxnBatchDetails query={ batchQuery }/>,
+        },
+        {
+          id: 'txs',
+          title: 'Transactions',
+          component: (
+            <TxsWithFrontendSorting
+              query={ batchTxsQuery }
+              showSocketInfo={ false }
+            />
+          ),
+        },
+      ].filter(Boolean),
+    [ batchQuery, batchTxsQuery ],
+  );
 
   const backLink = React.useMemo(() => {
-    const hasGoBackLink = appProps.referrer && appProps.referrer.includes('/zkevm_l2_txn_batches');
+    const hasGoBackLink =
+      appProps.referrer && appProps.referrer.includes('/zkevm_l2_txn_batches');
 
     if (!hasGoBackLink) {
       return;
@@ -66,15 +92,12 @@ const ZkEvmL2TxnBatch = () => {
 
   return (
     <>
-      <TextAd mb={ 6 }/>
-      <PageTitle
-        title={ `Tx batch #${ number }` }
-        backLink={ backLink }
-      />
-      { batchQuery.isPlaceholderData ? <TabsSkeleton tabs={ tabs }/> : (
-        <RoutedTabs
-          tabs={ tabs }
-        />
+      { /* <TextAd mb={ 6 }/> */ }
+      <PageTitle title={ `Tx batch #${ number }` } backLink={ backLink }/>
+      { batchQuery.isPlaceholderData ? (
+        <TabsSkeleton tabs={ tabs }/>
+      ) : (
+        <RoutedTabs tabs={ tabs }/>
       ) }
     </>
   );

ui/shared/Page/PageTitle.tsx

@@ -138,7 +138,7 @@ const PageTitle = ({ title, contentAfter, withTextAd, backLink, className, isLoa
           { afterTitle }
         </Flex>
         { contentAfter }
-        { withTextAd && <TextAd order={{ base: -1, lg: 100 }} mb={{ base: 6, lg: 0 }} ml="auto" w={{ base: '100%', lg: 'auto' }}/> }
+        { /* { withTextAd && <TextAd order={{ base: -1, lg: 100 }} mb={{ base: 6, lg: 0 }} ml="auto" w={{ base: '100%', lg: 'auto' }}/> } */ }
       </Flex>
       { secondRow && (
         <Flex alignItems="center" minH={ 10 } overflow="hidden" _empty={{ display: 'none' }}>