fix: consistent naming for proposed calls vars

0xflair · Oct 9, 2022 · 85398ce · 85398ce
1 parent d5f10b1
commit 85398ce
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 14 deletions.
diff --git a/packages/react/src/common/hooks/useContractRead.ts b/packages/react/src/common/hooks/useContractRead.ts
@@ -25,7 +25,7 @@ export type ReadContractConfig<ArgsType = []> = Partial<
 
 export type PredefinedReadContractConfig<ArgsType = []> = Omit<
   ReadContractConfig<ArgsType>,
-  'contractReference' | 'functionName'
+  'contractReference' | 'functionName' | 'addressOrName'
 >;
 
 export const useContractRead = <ResultType = any, ArgsType = []>({

diff --git a/packages/react/src/core/diamonds/providers/DiamondProvider.tsx b/packages/react/src/core/diamonds/providers/DiamondProvider.tsx
@@ -23,16 +23,16 @@ type DiamondContextValue = {
 
     configValues?: Record<string, any>;
     proposedCalls?: ContractCall[];
-    processingCalls?: boolean;
-    processingError?: Error | string;
   };
 
   isLoading: {
+    proposedCallsLoading?: boolean;
     diamondLoading?: boolean;
     smartContractLoading?: boolean;
   };
 
   error: {
+    proposedCallsError?: Error | string | null;
     diamondError?: string | Error | null;
     smartContractError?: string | Error | null;
   };
@@ -73,8 +73,11 @@ export const DiamondProvider = ({
   const [configValues, setConfigValues] = useState<Record<string, any>>();
   const [contractFacets, setContractFacets] = useState<FacetManifest[]>();
   const [proposedCalls, setProposedCalls] = useState<ContractCall[]>([]);
-  const [processingCalls, setProcessingCalls] = useState<boolean>(false);
-  const [processingError, setProcessingError] = useState<Error | string>();
+  const [proposedCallsLoading, setProposedCallsLoading] =
+    useState<boolean>(false);
+  const [proposedCallsError, setProposedCallsError] = useState<
+    Error | string
+  >();
 
   const {
     data: diamond,
@@ -142,17 +145,16 @@ export const DiamondProvider = ({
    */
   const proposeCall = useCallback(
     (call: ContractCall) => {
-      if (processingCalls) {
+      if (proposedCallsLoading) {
         return;
       }
-
       setProposedCalls((calls) =>
         [...calls.filter((existing) => existing.id !== call.id), call].filter(
           (c) => c.contract && c.function && c.args !== undefined,
         ),
       );
     },
-    [processingCalls],
+    [proposedCallsLoading],
   );
 
   const refresh = useCallback(() => {
@@ -170,18 +172,16 @@ export const DiamondProvider = ({
       contractFacets,
       contractInterfaces,
       proposedCalls,
-      processingCalls,
-      processingError,
     },
 
-    isLoading: { diamondLoading, smartContractLoading },
+    isLoading: { proposedCallsLoading, diamondLoading, smartContractLoading },
 
-    error: { diamondError, smartContractError },
+    error: { proposedCallsError, diamondError, smartContractError },
 
     setConfigValues,
     setProposedCalls,
-    setProcessingCalls,
-    setProcessingError,
+    setProcessingCalls: setProposedCallsLoading,
+    setProcessingError: setProposedCallsError,
     proposeCall,
     refresh,
   };