Merge branch 'release/v2-0-0' of github.com:blockscout/frontend into release/v2-0-0

lib/hooks/useRewardsActivity.tsx

 import { useCallback, useRef, useEffect } from 'react';
 
-import type { PreSubmitTransactionResponse, PreVerifyContractResponse } from '@blockscout/points-types';
+import type { PreVerifyContractResponse } from '@blockscout/points-types';
 
 import config from 'configs/app';
 import useApiFetch from 'lib/api/useApiFetch';
@@ -59,15 +59,14 @@ export default function useRewardsActivity() {
     } catch {}
   }, [ apiFetch, checkActivityPassQuery.data, apiToken ]);
 
-  const trackTransaction = useCallback(async(from: string, to: string) => {
-    return (
-      await makeRequest('rewards_user_activity_track_tx', {
-        from_address: from,
-        to_address: to,
-        chain_id: config.chain.id ?? '',
-      })
-    ) as PreSubmitTransactionResponse | undefined;
-  }, [ makeRequest ]);
+  const trackTransaction = useCallback(async(from: string, to: string) =>
+    makeRequest('rewards_user_activity_track_tx', {
+      from_address: from,
+      to_address: to,
+      chain_id: config.chain.id ?? '',
+    }),
+  [ makeRequest ],
+  );
 
   const trackTransactionConfirm = useCallback((hash: string, token: string) =>
     makeRequest('rewards_user_activity_track_tx_confirm', { tx_hash: hash, token }),
@@ -83,11 +82,6 @@ export default function useRewardsActivity() {
     ) as PreVerifyContractResponse | undefined;
   }, [ makeRequest ]);
 
-  const trackContractConfirm = useCallback((token: string) =>
-    makeRequest('rewards_user_activity_track_contract_confirm', { token }),
-  [ makeRequest ],
-  );
-
   const trackUsage = useCallback((action: string) => {
     // check here because this function is called on page load
     if (!apiToken || !checkActivityPassQuery.data?.is_valid) {
@@ -115,7 +109,6 @@ export default function useRewardsActivity() {
     trackTransaction,
     trackTransactionConfirm,
     trackContract,
-    trackContractConfirm,
     trackUsage,
   };
 }

package.json

@@ -43,7 +43,7 @@
   },
   "dependencies": {
     "@blockscout/bens-types": "1.4.1",
-    "@blockscout/points-types": "1.3.0-alpha.1",
+    "@blockscout/points-types": "1.3.0-alpha.2",
     "@blockscout/stats-types": "2.5.0-alpha",
     "@blockscout/visualizer-types": "0.2.0",
     "@chakra-ui/react": "3.15.0",

ui/contractVerification/ContractVerificationForm.tsx

@@ -51,10 +51,9 @@ const ContractVerificationForm = ({ method: methodFromQuery, config, hash }: Pro
   const { handleSubmit, watch, formState, setError, reset, getFieldState, getValues, clearErrors } = formApi;
   const submitPromiseResolver = React.useRef<(value: unknown) => void>();
   const methodNameRef = React.useRef<string>();
-  const activityToken = React.useRef<string | undefined>();
 
   const apiFetch = useApiFetch();
-  const { trackContract, trackContractConfirm } = useRewardsActivity();
+  const { trackContract } = useRewardsActivity();
   const onFormSubmit: SubmitHandler<FormFields> = React.useCallback(async(data) => {
     const body = prepareRequestBody(data);
 
@@ -78,8 +77,7 @@ const ContractVerificationForm = ({ method: methodFromQuery, config, hash }: Pro
     }
 
     try {
-      const activityResponse = await trackContract(data.address);
-      activityToken.current = activityResponse?.token;
+      await trackContract(data.address);
       await apiFetch('contract_verification_via', {
         pathParams: { method: data.method[0], hash: data.address.toLowerCase() },
         fetchParams: {
@@ -132,13 +130,8 @@ const ContractVerificationForm = ({ method: methodFromQuery, config, hash }: Pro
       { send_immediately: true },
     );
 
-    if (activityToken.current) {
-      await trackContractConfirm(activityToken.current);
-      activityToken.current = undefined;
-    }
-
     window.location.assign(route({ pathname: '/address/[hash]', query: { hash: address, tab: 'contract' } }));
-  }, [ setError, address, getValues, trackContractConfirm ]);
+  }, [ setError, address, getValues ]);
 
   const handleSocketError = React.useCallback(() => {
     if (!formState.isSubmitting) {

yarn.lock

@@ -1536,10 +1536,10 @@
   resolved "https://registry.yarnpkg.com/@blockscout/bens-types/-/bens-types-1.4.1.tgz#9182a79d9015b7fa2339edf0bfa3cd0c32045e66"
   integrity sha512-TlZ1HVdZ2Cswm/CcvNoxS+Ydiht/YGaLo//PJR/UmkmihlEFoY4HfVJvVcUnOQXi+Si7FwJ486DPii889nTJsQ==
 
-"@blockscout/points-types@1.3.0-alpha.1":
-  version "1.3.0-alpha.1"
-  resolved "https://registry.yarnpkg.com/@blockscout/points-types/-/points-types-1.3.0-alpha.1.tgz#d1f255de6ccfa09b8a938ffe17f6aedd559273a3"
-  integrity sha512-yZcxvPpS1JT79dZrzSeP4r3BM5cqSnsVnclCIpJMUO3qBRWEytVfDGXcqNacwqp3342Im8RB/YPLKAuJGc+CrA==
+"@blockscout/points-types@1.3.0-alpha.2":
+  version "1.3.0-alpha.2"
+  resolved "https://registry.yarnpkg.com/@blockscout/points-types/-/points-types-1.3.0-alpha.2.tgz#0308dcb4eef0dadf96f43b144835470e9f78f64f"
+  integrity sha512-tXCA51q3y08caCm7UhGyj+xsP0pd6yBhjElDHxEzM5SRop3culMiacaBXd0OPBszHjA0YdYgXFymuJhofB22ig==
 
 "@blockscout/stats-types@2.5.0-alpha":
   version "2.5.0-alpha"