From a3da90af8a12ba4f39b73f699ae79d600576422d Mon Sep 17 00:00:00 2001 From: fabiolalombardim Date: Sun, 1 Oct 2023 17:55:17 +0200 Subject: [PATCH] Change the name of Lambda to Function everywhere it occurs in the UI --- .../explorer/components/CodeCollapse.tsx | 2 +- .../components/ConfigProposalFormLambda.tsx | 18 +++++++++--------- .../components/ProposalActionsDialog.tsx | 12 ++++++------ .../components/ProposalSelectionMenuLambda.tsx | 6 +++--- .../explorer/components/ResponsiveDialog.tsx | 2 +- src/modules/explorer/pages/Config/index.tsx | 12 ++++++------ .../explorer/pages/ProposalDetails/index.tsx | 9 +++------ .../baseDAO/hooks/useLambdaAddPropose.ts | 2 +- 8 files changed, 30 insertions(+), 33 deletions(-) diff --git a/src/modules/explorer/components/CodeCollapse.tsx b/src/modules/explorer/components/CodeCollapse.tsx index 2202dfa9..8642ca01 100644 --- a/src/modules/explorer/components/CodeCollapse.tsx +++ b/src/modules/explorer/components/CodeCollapse.tsx @@ -37,7 +37,7 @@ export const CodeCollapse: React.FC = ({ code }) => { - View Lambda Parameter Code + View Function Parameter Code diff --git a/src/modules/explorer/components/ConfigProposalFormLambda.tsx b/src/modules/explorer/components/ConfigProposalFormLambda.tsx index 92fa29eb..9206a2f2 100644 --- a/src/modules/explorer/components/ConfigProposalFormLambda.tsx +++ b/src/modules/explorer/components/ConfigProposalFormLambda.tsx @@ -85,7 +85,7 @@ enum LambdaProposalState { } const codeEditorPlaceholder = { - addLambda: `Write Michelson Code for Lambda's Implementation + addLambda: `Write Michelson Code for Function's Implementation Eg:- @@ -98,9 +98,9 @@ Eg:- { DROP ; UNIT }) "sample"))) `, - existingLambda: `Choose a Lambda from the Dropdown, the implementation will appear here + existingLambda: `Choose a Function from the Dropdown, the implementation will appear here `, - lambdaExecuteArgumentsCode: `Write Michelson Code for the input Paramerers of your Lambda + lambdaExecuteArgumentsCode: `Write Michelson Code for the input Paramerers of your Function Eg:- @@ -277,7 +277,7 @@ export const ProposalFormLambda: React.FC = ({ open, handleClose, action const renderRemoveProposal = () => { return ( <> - + = ({ open, handleClose, action const renderExecuteProposal = () => { return ( <> - + = ({ open, handleClose, action placeholder={codeEditorPlaceholder.existingLambda} /> = ({ open, handleClose, action {state === LambdaProposalState.write_action ? ( <> - + {action === ProposalAction.new ? renderNewProposal() : null} {action === ProposalAction.remove ? renderRemoveProposal() : null} {action === ProposalAction.execute ? renderExecuteProposal() : null} - + Submit diff --git a/src/modules/explorer/components/ProposalActionsDialog.tsx b/src/modules/explorer/components/ProposalActionsDialog.tsx index 8a995d18..f1d710a6 100644 --- a/src/modules/explorer/components/ProposalActionsDialog.tsx +++ b/src/modules/explorer/components/ProposalActionsDialog.tsx @@ -66,20 +66,20 @@ interface Action { const getActions = (): Action[] => [ { - name: "Add Lambda", - description: "Write Michelson code to add Lambda", + name: "Add Function", + description: "Write Michelson code to add Function", id: ProposalAction.new, isLambda: true }, { - name: "Remove Lambda", - description: "Choose which Lambda to remove", + name: "Remove Function", + description: "Choose which Function to remove", id: ProposalAction.remove, isLambda: true }, { - name: "Execute Lambda", - description: "Execute a Lambda already installed on DAO", + name: "Execute Function", + description: "Execute a Function already installed on DAO", id: ProposalAction.execute, isLambda: true }, diff --git a/src/modules/explorer/components/ProposalSelectionMenuLambda.tsx b/src/modules/explorer/components/ProposalSelectionMenuLambda.tsx index 26e6abf7..16e4292c 100644 --- a/src/modules/explorer/components/ProposalSelectionMenuLambda.tsx +++ b/src/modules/explorer/components/ProposalSelectionMenuLambda.tsx @@ -92,7 +92,7 @@ export const ProposalSelectionMenuLambda: React.FC = ({ open, handleClose handleOpenCustomProposalModal(ProposalAction.new)}> - Add Lambda + Add Function = ({ open, handleClose color="secondary" onClick={() => handleOpenCustomProposalModal(ProposalAction.remove)} > - Remove Lambda + Remove Function - Execute Lambda + Execute Function diff --git a/src/modules/explorer/components/ResponsiveDialog.tsx b/src/modules/explorer/components/ResponsiveDialog.tsx index 7af33113..18b83550 100644 --- a/src/modules/explorer/components/ResponsiveDialog.tsx +++ b/src/modules/explorer/components/ResponsiveDialog.tsx @@ -5,7 +5,7 @@ import CloseButton from "modules/common/CloseButton" import BackButton from "modules/common/BackButton" const Content = styled(Grid)({ - padding: "41px 46px" + padding: "40px 48px" }) const TitleText = styled(Typography)(({ theme }) => ({ diff --git a/src/modules/explorer/pages/Config/index.tsx b/src/modules/explorer/pages/Config/index.tsx index 1e2549b1..00f46d83 100644 --- a/src/modules/explorer/pages/Config/index.tsx +++ b/src/modules/explorer/pages/Config/index.tsx @@ -37,20 +37,20 @@ const getActions = (): Action[] => [ isLambda: true }, { - name: "Add Lambda", - description: "Write Michelson code to add Lambda", + name: "Add Function", + description: "Write Michelson code to add Function", id: ProposalAction.new, isLambda: true }, { - name: "Remove Lambda", - description: "Choose which Lambda to remove", + name: "Remove Function", + description: "Choose which Function to remove", id: ProposalAction.remove, isLambda: true }, { - name: "Execute Lambda", - description: "Execute a Lambda already installed on DAO", + name: "Execute Function", + description: "Execute a Function already installed on DAO", id: ProposalAction.execute, isLambda: true }, diff --git a/src/modules/explorer/pages/ProposalDetails/index.tsx b/src/modules/explorer/pages/ProposalDetails/index.tsx index 965c18c1..76aff9f0 100644 --- a/src/modules/explorer/pages/ProposalDetails/index.tsx +++ b/src/modules/explorer/pages/ProposalDetails/index.tsx @@ -33,9 +33,6 @@ import { CopyButton } from "modules/common/CopyButton" import { ProposalCodeEditorInput } from "modules/explorer/components/ProposalFormInput" import Prism, { highlight } from "prismjs" import { CodeCollapse } from "modules/explorer/components/CodeCollapse" -import { useDAOLambdas } from "services/contracts/baseDAO/hooks/useDAOLambdas" -import { useDAOLambda } from "services/contracts/baseDAO/hooks/useDAOLambda" -import { parseLambdaCode } from "utils" const Container = styled(ContentContainer)({ padding: "36px 45px" @@ -378,7 +375,7 @@ export const ProposalDetails: React.FC = () => { - Execute Lambda{" "} + Execute Function{" "} {_.startCase((proposal as LambdaProposal).metadata.lambdaHandler.handler_name)} {" "} @@ -445,7 +442,7 @@ export const ProposalDetails: React.FC = () => { - Add Lambda{" "} + Add Function{" "} {(proposal as LambdaProposal).metadata.lambdaHandler.name} {" "} @@ -479,7 +476,7 @@ export const ProposalDetails: React.FC = () => { - Remove Lambda{" "} + Remove Function{" "} {_.startCase((proposal as LambdaProposal).metadata.lambdaHandler)} {" "} diff --git a/src/services/contracts/baseDAO/hooks/useLambdaAddPropose.ts b/src/services/contracts/baseDAO/hooks/useLambdaAddPropose.ts index c305cac8..f8e447e3 100644 --- a/src/services/contracts/baseDAO/hooks/useLambdaAddPropose.ts +++ b/src/services/contracts/baseDAO/hooks/useLambdaAddPropose.ts @@ -42,7 +42,7 @@ export const useLambdaAddPropose = () => { // setProposalDone() openNotification({ - message: "Add Lambda proposal transaction confirmed!", + message: "Add Function proposal transaction confirmed!", autoHideDuration: 10000, variant: "success", detailsLink: `https://${networkNameMap[network]}.tzkt.io/` + data.opHash