fix review

Author: vraja-nayaka

digit-recognition/frontend/package.json

@@ -10,6 +10,7 @@
     "preview": "vite preview"
   },
   "dependencies": {
+    "@gear-js/api": "^0.41.0",
     "@polkadot/types": "14.3.1",
     "@reown/appkit": "^1.6.0",
     "@reown/appkit-adapter-wagmi": "^1.6.0",
@@ -27,11 +28,11 @@
     "eslint-plugin-react-hooks": "^5.0.0",
     "eslint-plugin-react-refresh": "^0.4.14",
     "globals": "^15.11.0",
+    "sass": "1.62.0",
     "typescript": "~5.6.2",
     "typescript-eslint": "^8.11.0",
     "vite": "^5.4.10",
     "vite-plugin-checker": "0.8.0",
-    "vite-plugin-svgr": "^4.3.0",
-    "sass": "1.62.0"
+    "vite-plugin-svgr": "^4.3.0"
   }
-}
+}

digit-recognition/frontend/src/consts.ts

@@ -1,10 +1,12 @@
+import { HexString } from "@gear-js/api";
+
 export const PROJECT_ID = import.meta.env
   .VITE_WALLET_CONNECT_PROJECT_ID as string;
 export const GEAR_API_NODE = import.meta.env.VITE_GEAR_API_NODE as string;
 export const ETH_CHAIN_ID = 17000; // (0x4268) Holesky
 export const ETH_NODE_ADDRESS = import.meta.env.VITE_ETH_NODE_ADDRESS;
 
 export const DIGIT_RECOGNITION_CONTRACT_ADDRESS = import.meta.env
-  .VITE_CONTRACT_ADDRESS_DIGIT_RECOGNITION as `0x${string}`;
+  .VITE_CONTRACT_ADDRESS_DIGIT_RECOGNITION as HexString;
 export const CAT_IDENTIFIER_CONTRACT_ADDRESS = import.meta.env
-  .VITE_CONTRACT_ADDRESS_CAT_IDENTIFIER as `0x${string}`;
+  .VITE_CONTRACT_ADDRESS_CAT_IDENTIFIER as HexString;

digit-recognition/frontend/src/features/cat-identifier/api/readRpcState.ts

@@ -1,3 +1,4 @@
+import { HexString } from "@gear-js/api";
 import { TypeRegistry } from "@polkadot/types";
 import { useQuery } from "@tanstack/react-query";
 import { useReadContract, useWatchContractEvent } from "wagmi";
@@ -7,7 +8,7 @@ import { CAT_IDENTIFIER_CONTRACT_ADDRESS, GEAR_API_NODE } from "@/consts";
 import { CalcResult } from "../types";
 import { mirrorAbi } from "./mirrorAbi";
 
-export const readRpcState = async (mirrorId?: `0x${string}`) => {
+export const readRpcState = async (mirrorId?: HexString) => {
   if (!mirrorId) return;
 
   const types: Record<string, any> = {
@@ -75,14 +76,14 @@ export const useReadRpcState = ({ isSubmiting, onSuccess }: Params) => {
 
   const { data, isPending, refetch } = useQuery({
     queryKey: ["readState", mirrorId],
-    queryFn: async () => await readRpcState(mirrorId as `0x${string}`),
+    queryFn: async () => await readRpcState(mirrorId as HexString),
     enabled: !!mirrorId,
   });
 
   useWatchContractEvent({
     abi: mirrorAbi,
     eventName: "StateChanged",
-    address: mirrorId as `0x${string}`,
+    address: mirrorId as HexString,
     onLogs() {
       if (isSubmiting) {
         console.log("success reply");

digit-recognition/frontend/src/features/cat-identifier/api/useCatsPredictPredict.ts

@@ -1,8 +1,9 @@
+import { HexString } from "@gear-js/api";
+import { TypeRegistry } from "@polkadot/types";
 import { useReadContract, useWriteContract } from "wagmi";
 import { catDogIdentifierAbi } from "./catDogIdentifierAbi";
 import { CAT_IDENTIFIER_CONTRACT_ADDRESS } from "@/consts";
 import { mirrorAbi } from "./mirrorAbi";
-import { TypeRegistry } from "@polkadot/types";
 import { numberArrayToHex } from "../utils";
 
 type Params = {
@@ -18,7 +19,7 @@ export const useCatsPredictPredict = ({ onError }: Params) => {
     functionName: "mirror",
   });
 
-  const mirrorId = mirror as `0x${string}`;
+  const mirrorId = mirror as HexString;
 
   const catsPredict = async (pixels: number[]) => {
     // TODO: use fnCnnCatsDogsPredict when contract fixed

digit-recognition/frontend/src/features/digit-recognizer/api/readRpcState.ts

@@ -1,3 +1,4 @@
+import { HexString } from "@gear-js/api";
 import { TypeRegistry } from "@polkadot/types";
 import { useQuery } from "@tanstack/react-query";
 import { useReadContract, useWatchContractEvent } from "wagmi";
@@ -7,7 +8,7 @@ import { DIGIT_RECOGNITION_CONTRACT_ADDRESS, GEAR_API_NODE } from "@/consts";
 import { Result } from "../types";
 import { mirrorAbi } from "./mirrorAbi";
 
-export const readRpcState = async (mirrorId?: `0x${string}`) => {
+export const readRpcState = async (mirrorId?: HexString) => {
   if (!mirrorId) return;
 
   const types: Record<string, any> = {
@@ -71,7 +72,7 @@ export const useReadRpcState = ({ isSubmiting, onSuccess }: Params) => {
 
   const { data, isPending, refetch } = useQuery({
     queryKey: ["readState", mirrorId],
-    queryFn: async () => await readRpcState(mirrorId as `0x${string}`),
+    queryFn: async () => await readRpcState(mirrorId as HexString),
     enabled: !!mirrorId,
   });
 
@@ -99,7 +100,7 @@ export const useReadRpcState = ({ isSubmiting, onSuccess }: Params) => {
   useWatchContractEvent({
     abi: mirrorAbi,
     eventName: "StateChanged",
-    address: mirrorId as `0x${string}`,
+    address: mirrorId as HexString,
     onLogs() {
       if (isSubmiting) {
         console.log("success reply");

digit-recognition/frontend/yarn.lock

@@ -397,6 +397,11 @@
     ethereum-cryptography "^2.0.0"
     micro-ftch "^0.3.1"
 
+"@gear-js/api@^0.41.0":
+  version "0.41.0"
+  resolved "https://registry.yarnpkg.com/@gear-js/api/-/api-0.41.0.tgz#0610fb98f9d888ef2de65b5f448952592215caf0"
+  integrity sha512-Cg9qAIm1DGoqGqI4rJJv4Z9/UBAWGJ+E0nSds/C5QDJarFmWyz2bTRt4Oh4RROYitPUOHbGhw1guBx+Ze5Bt8A==
+
 "@humanfs/core@^0.19.1":
   version "0.19.1"
   resolved "https://registry.yarnpkg.com/@humanfs/core/-/core-0.19.1.tgz#17c55ca7d426733fe3c561906b8173c336b40a77"