From 56708df35bbc3adea0886390cd00827acc2c1cf0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B8r=E2=88=82=C2=A1?= <itsbrickpop@gmail.com>
Date: Tue, 30 Jul 2024 14:48:07 +0200
Subject: [PATCH 1/2] Improved copy's

---
 components/proposalActions/proposalActions.tsx        |  2 +-
 plugins/emergency-multisig/hooks/useCreateProposal.ts |  8 ++++----
 plugins/emergency-multisig/hooks/useProposal.tsx      |  2 +-
 plugins/emergency-multisig/pages/new.tsx              |  8 ++++----
 plugins/emergency-multisig/pages/proposal-list.tsx    | 11 ++++-------
 plugins/emergency-multisig/pages/proposal.tsx         |  6 +++---
 plugins/index.ts                                      |  8 ++++----
 .../members/components/DelegateAnnouncementDialog.tsx |  2 +-
 plugins/members/components/DelegateMemberList.tsx     |  9 +++++----
 plugins/members/components/MultisigMemberList.tsx     |  2 +-
 plugins/members/pages/index.tsx                       |  2 +-
 plugins/multisig/hooks/useCreateProposal.ts           |  8 ++++----
 plugins/multisig/hooks/useProposal.tsx                |  2 +-
 plugins/multisig/pages/new.tsx                        |  6 +++---
 plugins/multisig/pages/proposal-list.tsx              |  6 +++---
 plugins/multisig/pages/proposal.tsx                   |  2 +-
 plugins/optimistic-proposals/hooks/useProposal.tsx    |  2 +-
 plugins/optimistic-proposals/pages/proposal-list.tsx  |  3 +--
 plugins/optimistic-proposals/pages/proposal.tsx       |  2 +-
 19 files changed, 44 insertions(+), 47 deletions(-)

diff --git a/components/proposalActions/proposalActions.tsx b/components/proposalActions/proposalActions.tsx
index bb09463..d05dabd 100644
--- a/components/proposalActions/proposalActions.tsx
+++ b/components/proposalActions/proposalActions.tsx
@@ -20,7 +20,7 @@ import { decodeCamelCase } from "@/utils/case";
 import { formatEther } from "viem";
 
 const DEFAULT_DESCRIPTION =
-  "When the proposal passes the community vote, the following actions will be executable on the DAO.";
+  "When the proposal passes the community vote, the following actions will be executable by the DAO.";
 const DEFAULT_EMPTY_LIST_DESCRIPTION = "The proposal has no actions defined, it will behave as a signaling poll.";
 
 interface IProposalActionsProps {
diff --git a/plugins/emergency-multisig/hooks/useCreateProposal.ts b/plugins/emergency-multisig/hooks/useCreateProposal.ts
index 7da64cd..0dc66ca 100644
--- a/plugins/emergency-multisig/hooks/useCreateProposal.ts
+++ b/plugins/emergency-multisig/hooks/useCreateProposal.ts
@@ -74,14 +74,14 @@ export function useCreateProposal() {
     // Check metadata
     if (!title.trim()) {
       return addAlert("Invalid proposal details", {
-        description: "Please, enter a title",
+        description: "Please enter a title",
         type: "error",
       });
     }
 
     if (!summary.trim()) {
       return addAlert("Invalid proposal details", {
-        description: "Please, enter a summary of what the proposal is about",
+        description: "Please enter a summary of what the proposal is about",
         type: "error",
       });
     }
@@ -89,12 +89,12 @@ export function useCreateProposal() {
     for (const item of resources) {
       if (!item.name.trim()) {
         return addAlert("Invalid resource name", {
-          description: "Please, enter a name for all the resources",
+          description: "Please enter a name for all the resources",
           type: "error",
         });
       } else if (!UrlRegex.test(item.url.trim())) {
         return addAlert("Invalid resource URL", {
-          description: "Please, enter valid URL for all the resources",
+          description: "Please enter valid URL for all the resources",
           type: "error",
         });
       }
diff --git a/plugins/emergency-multisig/hooks/useProposal.tsx b/plugins/emergency-multisig/hooks/useProposal.tsx
index 5f8c136..152fe92 100644
--- a/plugins/emergency-multisig/hooks/useProposal.tsx
+++ b/plugins/emergency-multisig/hooks/useProposal.tsx
@@ -34,7 +34,7 @@ export function useProposal(proposalId: string, autoRefresh = false) {
   const [proposalCreationEvent, setProposalCreationEvent] = useState<ProposalCreatedLogResponse["args"]>();
   const { data: blockNumber } = useBlockNumber({ watch: true });
 
-  // Proposal on-chain data
+  // Proposal onchain data
   const {
     data: proposalResult,
     error: proposalError,
diff --git a/plugins/emergency-multisig/pages/new.tsx b/plugins/emergency-multisig/pages/new.tsx
index cf187ce..04892d0 100644
--- a/plugins/emergency-multisig/pages/new.tsx
+++ b/plugins/emergency-multisig/pages/new.tsx
@@ -108,11 +108,11 @@ export default function Create() {
           </div>
           <div className="mb-6">
             <TextAreaRichText
-              label="Description"
+              label="Body"
               className="pt-2"
               value={description}
               onChange={setDescription}
-              placeholder="A description for what the proposal is all about"
+              placeholder="A description of what the proposal is all about"
             />
           </div>
 
@@ -279,7 +279,7 @@ const PlaceHolderOr = ({
       <ElseIf condition={!selfAddress || !isConnected}>
         {/* Not connected */}
         <MissingContentView callToAction="Connect wallet" onClick={() => open()}>
-          Please, connect your Ethereum wallet to continue.
+          Please connect your wallet to continue.
         </MissingContentView>
       </ElseIf>
       <ElseIf condition={selfAddress && !hasPubKeyRegistered}>
@@ -297,7 +297,7 @@ const PlaceHolderOr = ({
       <ElseIf condition={!publicKey}>
         {/* Not signed in */}
         <MissingContentView callToAction="Sign in to continue" onClick={() => requestSignature()}>
-          Please, sign in with your Ethereum wallet to decrypt the private proposal data.
+          Please sign in with your wallet to decrypt the private proposal data.
         </MissingContentView>
       </ElseIf>
       <ElseIf condition={!canCreate}>
diff --git a/plugins/emergency-multisig/pages/proposal-list.tsx b/plugins/emergency-multisig/pages/proposal-list.tsx
index 03c8d69..26449d9 100644
--- a/plugins/emergency-multisig/pages/proposal-list.tsx
+++ b/plugins/emergency-multisig/pages/proposal-list.tsx
@@ -69,22 +69,19 @@ export default function Proposals() {
       <If condition={!isConnected}>
         <Then>
           <MissingContentView callToAction="Connect wallet" onClick={() => open()}>
-            Please, connect your Ethereum wallet to access the emergency proposals section.
+            Please connect your wallet to access the emergency proposals section.
           </MissingContentView>
         </Then>
         <ElseIf condition={!publicKey}>
           <MissingContentView callToAction="Sign in to continue" onClick={() => requestSignature()}>
-            Please, sign in with your Ethereum wallet to decrypt the private proposal data.
+            Please sign in with your wallet to decrypt the private proposal data.
           </MissingContentView>
         </ElseIf>
         <ElseIf condition={!proposalCount}>
           <MissingContentView>
             No proposals have been created yet. <br />
-            Here you will see the proposals created by the Security Council before they can be submitted to the{" "}
-            <Link href="/plugins/community-proposals/#/" className="underline">
-              community voting stage
-            </Link>
-            . <If condition={canCreate}>Create your first proposal.</If>
+            Here you will see the proposals created by the Security Council before a super majority can enact an
+            emergency execution on the DAO. <If condition={canCreate}>Create your first proposal.</If>
           </MissingContentView>
         </ElseIf>
         <Else>
diff --git a/plugins/emergency-multisig/pages/proposal.tsx b/plugins/emergency-multisig/pages/proposal.tsx
index a67c217..c6f95ca 100644
--- a/plugins/emergency-multisig/pages/proposal.tsx
+++ b/plugins/emergency-multisig/pages/proposal.tsx
@@ -91,14 +91,14 @@ export default function ProposalDetail({ id: proposalId }: { id: string }) {
         <Then>
           <div className="mt-12">
             <MissingContentView callToAction="Connect wallet" onClick={() => open()}>
-              Please, connect your Ethereum wallet to access the emergency proposals section.
+              Please connect your wallet to access the emergency proposals section.
             </MissingContentView>
           </div>
         </Then>
         <ElseIf condition={!publicKey}>
           <div className="mt-12">
             <MissingContentView callToAction="Sign in to continue" onClick={() => requestSignature()}>
-              Please, sign in with your Ethereum wallet to decrypt the private proposal data.
+              Please sign in with your wallet to decrypt the private proposal data.
             </MissingContentView>
           </div>
         </ElseIf>
@@ -109,7 +109,7 @@ export default function ProposalDetail({ id: proposalId }: { id: string }) {
                 <BodySection body={proposal.description || "No description was provided"} />
                 <ProposalVoting
                   stages={proposalStage}
-                  description="The on-chain emergency multisig flow allows its members to create proposals that, if approved by a super majority, will be executed directly on the DAO."
+                  description="The onchain emergency multisig flow allows its members to create proposals that, if approved by a super majority, will be executed directly by the DAO."
                 />
                 <ProposalActions actions={proposal.actions} />
               </div>
diff --git a/plugins/index.ts b/plugins/index.ts
index c5b0cd1..a448733 100644
--- a/plugins/index.ts
+++ b/plugins/index.ts
@@ -27,17 +27,17 @@ export const plugins: PluginItem[] = [
     pluginAddress: PUB_DUAL_GOVERNANCE_PLUGIN_ADDRESS,
   },
   {
-    id: "multisig-proposals",
+    id: "taiko-council",
     folderName: "multisig",
-    title: "Security Council Multisig",
+    title: "Taiko Council",
     // icon: IconType.BLOCKCHAIN_BLOCKCHAIN,
     pluginAddress: PUB_MULTISIG_PLUGIN_ADDRESS,
     hiddenIfNotSigner: true,
   },
   {
-    id: "emergency-proposals",
+    id: "security-council",
     folderName: "emergency-multisig",
-    title: "Emergency Multisig",
+    title: "Security Council",
     // icon: IconType.BLOCKCHAIN_BLOCKCHAIN,
     pluginAddress: PUB_EMERGENCY_MULTISIG_PLUGIN_ADDRESS,
     hiddenIfNotSigner: true,
diff --git a/plugins/members/components/DelegateAnnouncementDialog.tsx b/plugins/members/components/DelegateAnnouncementDialog.tsx
index 56c4dd0..6514c5c 100644
--- a/plugins/members/components/DelegateAnnouncementDialog.tsx
+++ b/plugins/members/components/DelegateAnnouncementDialog.tsx
@@ -159,7 +159,7 @@ export const DelegateAnnouncementDialog: React.FC<IDelegateAnnouncementDialogPro
                   <div key={field.id} className="flex flex-col gap-y-3 py-3 md:py-4">
                     <div className="flex items-end gap-x-3">
                       <InputText
-                        label="Description"
+                        label="Body"
                         readOnly={isConfirming}
                         placeholder="GitHub, Twitter, etc."
                         {...register(`${DELEGATE_RESOURCES}.${index}.name` as const)}
diff --git a/plugins/members/components/DelegateMemberList.tsx b/plugins/members/components/DelegateMemberList.tsx
index 8cfd837..1145597 100644
--- a/plugins/members/components/DelegateMemberList.tsx
+++ b/plugins/members/components/DelegateMemberList.tsx
@@ -98,17 +98,18 @@ function NoDelegatesView({ verified, filtered }: { verified?: boolean; filtered?
   if (filtered) {
     if (verified) {
       message =
-        "There are no verified candidates matching the current filter. Please, try entering a different search term.";
+        "There are no verified delegate profiles matching the current filter. Please try entering a different search term.";
     } else {
-      message = "There are no candidates matching the current filter. Please, try entering a different search term.";
+      message =
+        "There are no delegate profiles matching the current filter. Please try entering a different search term.";
     }
   } else {
     if (verified) {
       message =
-        "There are no verified candidates with a public an announcement yet. Here you will see the addresses of members who have posted their candidacy. Be the first to post an announcement.";
+        "There are no verified delegate profiles with a public an announcement yet. Here you will see the addresses of members who have posted their candidacy. Be the first to post an announcement.";
     } else {
       message =
-        "No candidates posted an announcement yet. Here you will see the addresses of members who have posted their candidacy. Be the first to post an announcement.";
+        "No delegate profiles posted an announcement yet. Here you will see the addresses of members who have posted their candidacy. Be the first to post an announcement.";
     }
   }
 
diff --git a/plugins/members/components/MultisigMemberList.tsx b/plugins/members/components/MultisigMemberList.tsx
index a4c601d..4fd0f90 100644
--- a/plugins/members/components/MultisigMemberList.tsx
+++ b/plugins/members/components/MultisigMemberList.tsx
@@ -59,7 +59,7 @@ export const MultisigMemberList: React.FC<IMultisigMemberListProps> = () => {
 function NoMembersView({ filtered }: { filtered?: boolean }) {
   let message: string;
   if (filtered) {
-    message = "There are no members matching the current filter. Please, try entering a different search term.";
+    message = "There are no members matching the current filter. Please try entering a different search term.";
   } else {
     message = "There are no multisig members yet. Here you will see the addresses of members who can create proposals.";
   }
diff --git a/plugins/members/pages/index.tsx b/plugins/members/pages/index.tsx
index 5f2cd6b..c0bf98d 100644
--- a/plugins/members/pages/index.tsx
+++ b/plugins/members/pages/index.tsx
@@ -17,7 +17,7 @@ import { useMultisigMembers } from "../hooks/useMultisigMembers";
 const DELEGATION_DESCRIPTION =
   "Proposals submitted to the community can be vetoed by token holders. Additionally, token holders can opt to delegate their voting power to delegates.";
 const SECURITY_COUNCIL_DESCRIPTION =
-  "Proposals are created by the Security Council. When its members approve one, the proposal is forwarded to the Community Vote phase for ratification.";
+  "Proposals are created by the Security Council. When its members approve one, the proposal is forwarded to the community veto phase for ratification.";
 
 export default function MembersList() {
   const { open } = useWeb3Modal();
diff --git a/plugins/multisig/hooks/useCreateProposal.ts b/plugins/multisig/hooks/useCreateProposal.ts
index 0f5f967..9926f0a 100644
--- a/plugins/multisig/hooks/useCreateProposal.ts
+++ b/plugins/multisig/hooks/useCreateProposal.ts
@@ -71,14 +71,14 @@ export function useCreateProposal() {
     // Check metadata
     if (!title.trim()) {
       return addAlert("Invalid proposal details", {
-        description: "Please, enter a title",
+        description: "Please enter a title",
         type: "error",
       });
     }
 
     if (!summary.trim()) {
       return addAlert("Invalid proposal details", {
-        description: "Please, enter a summary of what the proposal is about",
+        description: "Please enter a summary of what the proposal is about",
         type: "error",
       });
     }
@@ -86,12 +86,12 @@ export function useCreateProposal() {
     for (const item of resources) {
       if (!item.name.trim()) {
         return addAlert("Invalid resource name", {
-          description: "Please, enter a name for all the resources",
+          description: "Please enter a name for all the resources",
           type: "error",
         });
       } else if (!UrlRegex.test(item.url.trim())) {
         return addAlert("Invalid resource URL", {
-          description: "Please, enter valid URL for all the resources",
+          description: "Please enter valid URL for all the resources",
           type: "error",
         });
       }
diff --git a/plugins/multisig/hooks/useProposal.tsx b/plugins/multisig/hooks/useProposal.tsx
index cdb70e1..98eb6d6 100644
--- a/plugins/multisig/hooks/useProposal.tsx
+++ b/plugins/multisig/hooks/useProposal.tsx
@@ -33,7 +33,7 @@ export function useProposal(proposalId: string, autoRefresh = false) {
   const [proposalCreationEvent, setProposalCreationEvent] = useState<ProposalCreatedLogResponse["args"]>();
   const { data: blockNumber } = useBlockNumber({ watch: true });
 
-  // Proposal on-chain data
+  // Proposal onchain data
   const {
     data: proposalResult,
     error: proposalError,
diff --git a/plugins/multisig/pages/new.tsx b/plugins/multisig/pages/new.tsx
index e25db76..4182e54 100644
--- a/plugins/multisig/pages/new.tsx
+++ b/plugins/multisig/pages/new.tsx
@@ -98,11 +98,11 @@ export default function Create() {
           </div>
           <div className="mb-6">
             <TextAreaRichText
-              label="Description"
+              label="Body"
               className="pt-2"
               value={description}
               onChange={setDescription}
-              placeholder="A description for what the proposal is all about"
+              placeholder="A description of what the proposal is all about"
             />
           </div>
 
@@ -247,7 +247,7 @@ const PlaceHolderOr = ({
       <Then>
         {/* Not connected */}
         <MissingContentView callToAction="Connect wallet" onClick={() => open()}>
-          Please, connect your Ethereum wallet to continue.
+          Please connect your wallet to continue.
         </MissingContentView>
       </Then>
       <ElseIf condition={!canCreate}>
diff --git a/plugins/multisig/pages/proposal-list.tsx b/plugins/multisig/pages/proposal-list.tsx
index c332e48..3ee0db7 100644
--- a/plugins/multisig/pages/proposal-list.tsx
+++ b/plugins/multisig/pages/proposal-list.tsx
@@ -69,15 +69,15 @@ export default function Proposals() {
       <If condition={!isConnected}>
         <Then>
           <MissingContentView callToAction="Connect wallet" onClick={() => open()}>
-            Please, connect your Ethereum wallet to access the proposals section.
+            Please connect your wallet to access the proposals section.
           </MissingContentView>
         </Then>
         <ElseIf condition={!proposalCount}>
           <MissingContentView>
             No proposals have been created yet. <br />
-            Here you will see the proposals created by the Security Council before they can be submitted to the{" "}
+            Here you will see the proposals created by the Taiko Council before they can be submitted to the{" "}
             <Link href="/plugins/community-proposals/#/" className="underline">
-              community voting stage
+              community veto stage
             </Link>
             . <If condition={canCreate}>Create your first proposal.</If>
           </MissingContentView>
diff --git a/plugins/multisig/pages/proposal.tsx b/plugins/multisig/pages/proposal.tsx
index 71f0767..39b80c3 100644
--- a/plugins/multisig/pages/proposal.tsx
+++ b/plugins/multisig/pages/proposal.tsx
@@ -87,7 +87,7 @@ export default function ProposalDetail({ id: proposalId }: { id: string }) {
             <BodySection body={proposal.description || "No description was provided"} />
             <ProposalVoting
               stages={proposalStage}
-              description="The on-chain multisig flow allows its members to create proposals that, if approved, will be moved to the Optimistic Proposal stage."
+              description="The onchain multisig flow allows its members to create proposals that, if approved, will be moved to the Optimistic Proposal stage."
             />
             <ProposalActions actions={proposal.actions} />
           </div>
diff --git a/plugins/optimistic-proposals/hooks/useProposal.tsx b/plugins/optimistic-proposals/hooks/useProposal.tsx
index 494f976..2e0fdc1 100644
--- a/plugins/optimistic-proposals/hooks/useProposal.tsx
+++ b/plugins/optimistic-proposals/hooks/useProposal.tsx
@@ -34,7 +34,7 @@ export function useProposal(proposalId?: bigint, autoRefresh = false) {
   const [proposalCreationEvent, setProposalCreationEvent] = useState<ProposalCreatedLogResponse["args"]>();
   const { data: blockNumber } = useBlockNumber({ watch: true });
 
-  // Proposal on-chain data
+  // Proposal onchain data
   const {
     data: proposalResult,
     error: proposalError,
diff --git a/plugins/optimistic-proposals/pages/proposal-list.tsx b/plugins/optimistic-proposals/pages/proposal-list.tsx
index fb8d682..798eb76 100644
--- a/plugins/optimistic-proposals/pages/proposal-list.tsx
+++ b/plugins/optimistic-proposals/pages/proposal-list.tsx
@@ -72,8 +72,7 @@ export default function Proposals() {
           <MissingContentView>
             No proposals have been created yet.
             <br />
-            Here you will see the list of proposals approved by the Security Council which need to be ratified by the
-            community.
+            Here you will see the list of proposals initiated by the Security Council.
           </MissingContentView>
         </Else>
       </If>
diff --git a/plugins/optimistic-proposals/pages/proposal.tsx b/plugins/optimistic-proposals/pages/proposal.tsx
index 5c1694e..5b3c579 100644
--- a/plugins/optimistic-proposals/pages/proposal.tsx
+++ b/plugins/optimistic-proposals/pages/proposal.tsx
@@ -149,7 +149,7 @@ export default function ProposalDetail({ index: proposalIdx }: { index: number }
             </If>
             <ProposalVoting
               stages={proposalStage}
-              description="The optimistic voting flow allows token holders to veto proposals to which they object. If not enough voting power has vetoed for a given period of time, the proposal will become executable on the DAO."
+              description="Proposals approved by the Security Council become eventually executable, unless the community reaches the veto threshold during the community veto stage."
             />
             <ProposalActions actions={proposal.actions} />
           </div>

From 4d2d9cd10256dc883c4ae21b324b250589c88129 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B8r=E2=88=82=C2=A1?= <itsbrickpop@gmail.com>
Date: Tue, 30 Jul 2024 16:05:03 +0200
Subject: [PATCH 2/2] Minor copy and responsive edit

---
 plugins/emergency-multisig/pages/new.tsx |  2 +-
 plugins/members/pages/index.tsx          | 15 ++++++++++-----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/plugins/emergency-multisig/pages/new.tsx b/plugins/emergency-multisig/pages/new.tsx
index 04892d0..1e8d16c 100644
--- a/plugins/emergency-multisig/pages/new.tsx
+++ b/plugins/emergency-multisig/pages/new.tsx
@@ -223,7 +223,7 @@ export default function Create() {
           <div className="mt-6 flex w-full flex-col items-center">
             <div>
               <span className="text-md mb-2 block font-normal text-neutral-700 ">
-                {signersWithPubKey || 0} signer(s) registered the public key
+                {signersWithPubKey || 0} signer(s) registered their public key
               </span>
             </div>
             <Button
diff --git a/plugins/members/pages/index.tsx b/plugins/members/pages/index.tsx
index c0bf98d..408132b 100644
--- a/plugins/members/pages/index.tsx
+++ b/plugins/members/pages/index.tsx
@@ -38,7 +38,7 @@ export default function MembersList() {
     <MainSection>
       <div className="flex w-full max-w-[1280] flex-col gap-x-10 gap-y-8 lg:flex-row">
         <div className="flex flex-1 flex-col gap-y-6">
-          <div className="flex items-center justify-between">
+          <div className="flex items-start justify-between">
             <If condition={toggleValue === "all" || toggleValue === "verified"}>
               <Then>
                 <Heading size="h1">Delegates</Heading>
@@ -48,10 +48,15 @@ export default function MembersList() {
               </Else>
             </If>
 
-            <ToggleGroup isMultiSelect={false} onChange={onToggleChange} value={toggleValue}>
-              <Toggle value="all" label="Registered" />
-              <Toggle value="verified" label="Verified" />
-              <Toggle value="multisig" label="Security council" />
+            <ToggleGroup
+              isMultiSelect={false}
+              onChange={onToggleChange}
+              value={toggleValue}
+              className="flex justify-end"
+            >
+              <Toggle value="all" label="Registered" className="rounded-lg" />
+              <Toggle value="verified" label="Verified" className="rounded-lg" />
+              <Toggle value="multisig" label="Security council" className="rounded-lg" />
             </ToggleGroup>
           </div>
           <If condition={toggleValue === "all" || toggleValue === "verified"}>