bug: undefined

marigold-dev · Jul 6, 2023 · 0da4420 · 0da4420
1 parent f70265b
commit 0da4420
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 19 deletions.
diff --git a/components/ProposalCard.tsx b/components/ProposalCard.tsx
@@ -167,7 +167,7 @@ const ProposalCard = ({
             <span className="justify-self-center">Amount</span>
             <span className="justify-self-center">Address</span>
             <span className="justify-self-end">Entrypoint</span>
-            <span className="justify-self-end">Params/Token</span>
+            <span className="justify-self-end">Params/Tokens</span>
           </div>
           <div className="mt-2 space-y-4 font-light lg:space-y-2">
             {content.map((v, i) =>

diff --git a/components/RenderProposalContentLambda.tsx b/components/RenderProposalContentLambda.tsx
@@ -19,15 +19,10 @@ type data = {
   params: undefined | string;
 };
 
-const RenderProposalContentLambda = ({
-  content,
-  walletTokens,
-}: {
-  content: proposalContent;
-  walletTokens: walletToken[];
-}) => {
-  const [hasParam, setHasParam] = useState(false);
-
+export const contentToData = (
+  content: proposalContent,
+  walletTokens: walletToken[]
+): data => {
   let data: data = {
     label: undefined,
     metadata: undefined,
@@ -233,6 +228,12 @@ const RenderProposalContentLambda = ({
       };
     }
   }
+  return data;
+};
+
+const RenderProposalContentLambda = ({ data }: { data: data }) => {
+  const [hasParam, setHasParam] = useState(false);
+  console.log("data", data);
 
   return (
     <div className="after:content[''] relative w-full text-xs after:absolute after:-bottom-2 after:left-0 after:right-0 after:h-px after:bg-zinc-500 md:text-base lg:after:hidden">
@@ -308,7 +309,7 @@ const RenderProposalContentLambda = ({
             !data.params ? "text-zinc-500" : ""
           } justify-self-end text-right`}
         >
-          <p className="font-medium text-zinc-500 lg:hidden">Params/Token</p>
+          <p className="font-medium text-zinc-500 lg:hidden">Params/Tokens</p>
           <div>
             {!!data.params
               ? `${

diff --git a/components/proposalSignForm.tsx b/components/proposalSignForm.tsx
@@ -10,7 +10,9 @@ import { canExecute, canReject } from "../utils/proposals";
 import { walletToken } from "../utils/useWalletTokens";
 import { VersionedApi, signers } from "../versioned/apis";
 import ErrorMessage from "./ErrorMessage";
-import RenderProposalContentLambda from "./RenderProposalContentLambda";
+import RenderProposalContentLambda, {
+  contentToData,
+} from "./RenderProposalContentLambda";
 import Tooltip from "./Tooltip";
 import ContractLoader from "./contractLoader";
 
@@ -158,6 +160,7 @@ function ProposalSignForm({
     threshold,
     signers(state.contracts[currentContract]).length
   );
+  const rows = proposal.ui.content.map(v => contentToData(v, walletTokens));
 
   return (
     <Formik
@@ -205,15 +208,11 @@ function ProposalSignForm({
               <span className="justify-self-center">Amount</span>
               <span className="justify-self-center">Address</span>
               <span className="justify-self-end">Entrypoint</span>
-              <span className="justify-self-end">Parameters</span>
+              <span className="justify-self-end">Params/Tokens</span>
             </div>
             <div className="mt-2 space-y-4 font-light lg:space-y-2">
-              {proposal.ui.content.map((v, i) => (
-                <RenderProposalContentLambda
-                  content={v}
-                  key={i}
-                  walletTokens={walletTokens}
-                />
+              {rows.map((v, i) => (
+                <RenderProposalContentLambda data={v} key={i} />
               ))}
             </div>
             {!!proposal.ui.content.find(