Merge branch 'main' of github.com:blockscout/frontend into tom2drum/i…

…ssue-1278
blockscout · Oct 11, 2023 · a132cbf · a132cbf
2 parents aecb344 + e540942
commit a132cbf
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
@@ -42,7 +42,7 @@ jobs:
 
       - name: Install dependencies
         if: steps.cache-node-modules.outputs.cache-hit != 'true'
-        run: yarn --frozen-lockfile
+        run: yarn --frozen-lockfile --ignore-optional
 
       - name: Run ESLint
         run: yarn lint:eslint
@@ -74,10 +74,10 @@ jobs:
 
       - name: Install dependencies
         if: steps.cache-node-modules.outputs.cache-hit != 'true'
-        run: yarn --frozen-lockfile
+        run: yarn --frozen-lockfile --ignore-optional
 
       - name: Install script dependencies
-        run: cd ./deploy/tools/envs-validator && yarn --frozen-lockfile
+        run: cd ./deploy/tools/envs-validator && yarn --frozen-lockfile --ignore-optional
 
       - name: Copy secrets file
         run: cp ./.env.example ./configs/envs/.env.secrets
@@ -114,7 +114,7 @@ jobs:
 
       - name: Install dependencies
         if: steps.cache-node-modules.outputs.cache-hit != 'true'
-        run: yarn --frozen-lockfile
+        run: yarn --frozen-lockfile --ignore-optional
 
       - name: Run Jest
         run: yarn test:jest

diff --git a/lib/hooks/useIssueUrl.tsx b/lib/hooks/useIssueUrl.tsx
@@ -1,9 +1,11 @@
+import { useRouter } from 'next/router';
 import React from 'react';
 
 import config from 'configs/app';
 
 export default function useIssueUrl(backendVersion: string | undefined) {
   const [ isLoading, setIsLoading ] = React.useState(true);
+  const router = useRouter();
 
   React.useEffect(() => {
     setIsLoading(false);
@@ -23,6 +25,8 @@ export default function useIssueUrl(backendVersion: string | undefined) {
       'additional-information': `**User Agent:** ${ window.navigator.userAgent }`,
     });
     return `https://github.com/blockscout/blockscout/issues/new/?${ searchParams.toString() }`;
-  }, [ backendVersion, isLoading ]);
+  // we need to update link whenever page url changes
+  // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [ backendVersion, isLoading, router.asPath ]);
 
 }
diff --git a/ui/snippets/searchBar/SearchBarSuggest/SearchBarSuggestBlock.tsx b/ui/snippets/searchBar/SearchBarSuggest/SearchBarSuggestBlock.tsx
@@ -60,7 +60,7 @@ const SearchBarSuggestBlock = ({ data, isMobile, searchTerm }: Props) => {
         { icon }
         { blockNumber }
       </Flex>
-      <Flex columnGap={ 3 } minW={ 0 }>
+      <Flex columnGap={ 3 } minW={ 0 } alignItems="center">
         { data.block_type === 'reorg' && <Tag flexShrink={ 0 }>Reorg</Tag> }
         { hash }
       </Flex>

diff --git a/...ar/__screenshots__/SearchBar.pw.tsx_default_search-by-block-number-mobile-1.png b/...ar/__screenshots__/SearchBar.pw.tsx_default_search-by-block-number-mobile-1.png