Add SelectedMethod type and remove unnecessary getSelectedMethodObject function

Author: kuzdogan

app/components/verification/CompilerSelector.tsx

@@ -1,18 +1,18 @@
 import React, { useState } from "react";
 import { useCompilerVersions } from "../../contexts/CompilerVersionsContext";
 import type { SolidityVersion, VyperVersion } from "../../contexts/CompilerVersionsContext";
-import type { Language, VerificationMethodObject, FrameworkMethodObject } from "../../types/verification";
+import type { Language, SelectedMethod } from "../../types/verification";
 
 interface CompilerSelectorProps {
   language: Language | null;
-  verificationMethod: VerificationMethodObject | FrameworkMethodObject | null;
+  selectedMethod: SelectedMethod | "";
   selectedVersion?: string;
   onVersionSelect: (version: string) => void;
 }
 
 export default function CompilerSelector({
   language,
-  verificationMethod,
+  selectedMethod,
   selectedVersion,
   onVersionSelect,
 }: CompilerSelectorProps) {
@@ -31,14 +31,14 @@ export default function CompilerSelector({
   const [showPrereleases, setShowPrereleases] = useState(false);
 
   // Don't show if language is null or if using metadata/framework methods
-  if (!language || !verificationMethod) {
+  if (!language || !selectedMethod) {
     return null;
   }
 
   if (
-    verificationMethod.id === "metadata-json" ||
-    verificationMethod.id === "hardhat" ||
-    verificationMethod.id === "foundry"
+    selectedMethod === "metadata-json" ||
+    selectedMethod === "hardhat" ||
+    selectedMethod === "foundry"
   ) {
     return null;
   }

app/components/verification/VerificationMethodSelector.tsx

@@ -1,12 +1,12 @@
 import { Tooltip as ReactTooltip } from "react-tooltip";
 import { verificationMethods, frameworkMethods, frameworkMessages } from "../../data/verificationMethods";
-import type { Language } from "../../types/verification";
+import type { Language, SelectedMethod } from "../../types/verification";
 import VerificationWarning from "./VerificationWarning";
 
 interface VerificationMethodSelectorProps {
   selectedLanguage: Language | null;
-  selectedMethod: string;
-  onMethodSelect: (method: string) => void;
+  selectedMethod: SelectedMethod | "";
+  onMethodSelect: (method: SelectedMethod) => void;
 }
 
 export default function VerificationMethodSelector({

app/hooks/useFormValidation.ts

@@ -1,12 +1,12 @@
 import { useMemo, useCallback, useState, useEffect } from "react";
-import type { Language } from "../types/verification";
+import type { Language, SelectedMethod } from "../types/verification";
 
 interface ValidationParams {
   isAddressValid: boolean;
   selectedChainId: string;
   contractAddress: string;
   selectedLanguage: Language | null;
-  selectedMethod: string;
+  selectedMethod: SelectedMethod | "";
   selectedCompilerVersion: string;
   contractIdentifier: string;
   uploadedFiles: File[];

app/hooks/useVerificationState.ts

@@ -1,11 +1,11 @@
 import { useState } from "react";
-import type { Language, SubmissionResult } from "../types/verification";
+import type { Language, SubmissionResult, SelectedMethod } from "../types/verification";
 
 export function useVerificationState() {
   const [selectedChainId, setSelectedChainId] = useState<string>("");
   const [contractAddress, setContractAddress] = useState<string>("");
   const [selectedLanguage, setSelectedLanguage] = useState<Language | null>(null);
-  const [selectedMethod, setSelectedMethod] = useState<string>("");
+  const [selectedMethod, setSelectedMethod] = useState<SelectedMethod | "">("");
   const [selectedCompilerVersion, setSelectedCompilerVersion] = useState<string>("");
   const [uploadedFiles, setUploadedFiles] = useState<File[]>([]);
   const [metadataFile, setMetadataFile] = useState<File | null>(null);
@@ -39,7 +39,7 @@ export function useVerificationState() {
     setContractIdentifier(""); // Reset contract identifier when language changes
   };
 
-  const handleMethodSelect = (method: string) => {
+  const handleMethodSelect = (method: SelectedMethod) => {
     setSelectedMethod(method);
     setSelectedCompilerVersion(""); // Reset compiler version when method changes
     setUploadedFiles([]); // Reset files when method changes

app/routes/home.tsx

@@ -12,7 +12,7 @@ import FileUpload from "../components/verification/FileUpload";
 import CompilerSettings from "../components/verification/CompilerSettings";
 import ContractIdentifier from "../components/verification/ContractIdentifier";
 import OptionalFields from "../components/verification/OptionalFields";
-import { verificationMethods, frameworkMethods } from "../data/verificationMethods";
+import { frameworkMethods } from "../data/verificationMethods";
 import type { VerificationMethod } from "../types/verification";
 import { assembleAndSubmitStandardJson, submitStdJsonFile, submitMetadataVerification } from "../utils/sourcifyApi";
 import { buildMetadataSubmissionSources } from "../utils/metadataValidation";
@@ -313,18 +313,6 @@ export default function Home() {
     return "Submit verification";
   };
 
-  // Helper function to get the method object from the selected method ID
-  const getSelectedMethodObject = () => {
-    if (!selectedMethod || !selectedLanguage) return null;
-
-    // Check verification methods first
-    const verificationMethod = verificationMethods[selectedLanguage]?.find((m) => m.id === selectedMethod);
-    if (verificationMethod) return verificationMethod;
-
-    // Check framework methods
-    const frameworkMethod = frameworkMethods.find((m) => m.id === selectedMethod);
-    return frameworkMethod || null;
-  };
 
   return (
     <div className="pb-12 bg-cerulean-blue-50 pt-1">
@@ -424,7 +412,7 @@ export default function Home() {
 
               <CompilerSelector
                 language={selectedLanguage}
-                verificationMethod={getSelectedMethodObject()}
+                selectedMethod={selectedMethod}
                 selectedVersion={selectedCompilerVersion}
                 onVersionSelect={handleCompilerVersionSelect}
               />

app/types/verification.ts

@@ -6,6 +6,9 @@ export type VerificationMethod = "single-file" | "multiple-files" | "std-json" |
 // Framework method IDs
 export type FrameworkVerificationMethod = "hardhat" | "foundry";
 
+// Combined type for selectedMethod that includes both verification and framework methods
+export type SelectedMethod = VerificationMethod | FrameworkVerificationMethod;
+
 // Method objects with full details
 export interface VerificationMethodObject {
   id: VerificationMethod;