Merge branch 'main' into static-analyzer-suggestions

gnosisguild · Dec 19, 2022 · be8ddf6 · be8ddf6
2 parents 8438a9a + 2167d9f
commit be8ddf6
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/packages/app/src/components/views/Role/targets/ParamConditionInputValue.tsx b/packages/app/src/components/views/Role/targets/ParamConditionInputValue.tsx
@@ -58,7 +58,10 @@ export const ParamConditionInputValue = ({ param, condition, disabled, onChange
     }
     onChange({ ...condition, value: [value] })
   }
-
+  const humanReadableValue =
+    dirty || condition.value[0] == null || condition.value[0] === ""
+      ? condition.value[0]
+      : ethers.utils.defaultAbiCoder.decode([param], condition.value[0])
   return (
     <TextField
       error={!valid && dirty}
@@ -68,7 +71,7 @@ export const ParamConditionInputValue = ({ param, condition, disabled, onChange
         disableUnderline: true,
         className: classNames(classes.input, { [classes.error]: !valid && dirty }),
       }}
-      value={condition.value[0]}
+      value={humanReadableValue}
       placeholder={getPlaceholderForType(param)}
       onChange={(evt) => handleChange(evt.target.value)}
     />

diff --git a/packages/app/src/components/views/Role/targets/TargetFunctionParams.tsx b/packages/app/src/components/views/Role/targets/TargetFunctionParams.tsx
@@ -46,7 +46,6 @@ export const TargetFunctionParams = ({ func, funcConditions, disabled, onChange
     onChange({ ...funcConditions, type, params: newConditions })
   }
 
-  // TODO: we need to prefill the current values (without it being added to the changes, since it's not a change)
   return (
     <>
       {func.inputs.map((param, index) => (

diff --git a/packages/subgraph/src/permissions.mapping.ts b/packages/subgraph/src/permissions.mapping.ts
@@ -195,7 +195,7 @@ export function handleScopeParameter(event: ScopeParameter): void {
   const parameter = new Parameter(parameterId) // will always overwrite the parameter
   const paramType = PARAMETER_TYPE[event.params.paramType]
   const paramComp = PARAMETER_COMPARISON[event.params.paramComp]
-  const compValue = event.params.compValue
+  const compValue = event.params.compValue // Can't be decode here, we do not have the required info (target ABI), must be done in frontend.
   parameter.owningFunction = functionId
   parameter.index = event.params.index.toI32()
   parameter.type = paramType