diff --git a/components/ProposalCard.tsx b/components/ProposalCard.tsx
index af44c48b..7b3ef65c 100644
--- a/components/ProposalCard.tsx
+++ b/components/ProposalCard.tsx
@@ -167,7 +167,7 @@ const ProposalCard = ({
Amount
Address
Entrypoint
- Params/Token
+ Params/Tokens
{content.map((v, i) =>
diff --git a/components/RenderProposalContentLambda.tsx b/components/RenderProposalContentLambda.tsx
index 9b41b69d..f57e2a64 100644
--- 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 (
@@ -308,7 +309,7 @@ const RenderProposalContentLambda = ({
!data.params ? "text-zinc-500" : ""
} justify-self-end text-right`}
>
-
Params/Token
+
Params/Tokens
{!!data.params
? `${
diff --git a/components/proposalSignForm.tsx b/components/proposalSignForm.tsx
index 879d842b..d9513e20 100644
--- 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 (
Amount
Address
Entrypoint
- Parameters
+ Params/Tokens
- {proposal.ui.content.map((v, i) => (
-
+ {rows.map((v, i) => (
+
))}
{!!proposal.ui.content.find(