From 3ec1edf723c36903b1951f6f5ae84a3c9fe3f6e9 Mon Sep 17 00:00:00 2001
From: "Felix C. Morency" <1102868+fmorency@users.noreply.github.com>
Date: Mon, 9 Dec 2024 15:46:20 -0500
Subject: [PATCH] chore: cleanup

---
 components/groups/forms/index.tsx             |    1 -
 .../forms/proposals/ConfirmationForm.tsx      |  292 -----
 .../forms/proposals/ProposalDetailsForm.tsx   |  139 --
 .../forms/proposals/ProposalMessages.tsx      | 1130 -----------------
 .../forms/proposals/ProposalMetadataForm.tsx  |  131 --
 .../groups/forms/proposals/SuccessForm.tsx    |  117 --
 .../__tests__/ConfirmationForm.test.tsx       |   80 --
 .../__tests__/ProposalDetailsForm.test.tsx    |  103 --
 .../__tests__/ProposalMessages.test.tsx       |  117 --
 .../__tests__/ProposalMetadataForm.test.tsx   |  124 --
 .../proposals/__tests__/SuccessForm.test.tsx  |   69 -
 components/groups/forms/proposals/index.tsx   |    5 -
 components/groups/forms/proposals/messages.ts |  173 ---
 hooks/useQueries.ts                           |  155 ---
 .../submit-proposal/[policyAddress].tsx       |  169 ---
 15 files changed, 2805 deletions(-)
 delete mode 100644 components/groups/forms/proposals/ConfirmationForm.tsx
 delete mode 100644 components/groups/forms/proposals/ProposalDetailsForm.tsx
 delete mode 100644 components/groups/forms/proposals/ProposalMessages.tsx
 delete mode 100644 components/groups/forms/proposals/ProposalMetadataForm.tsx
 delete mode 100644 components/groups/forms/proposals/SuccessForm.tsx
 delete mode 100644 components/groups/forms/proposals/__tests__/ConfirmationForm.test.tsx
 delete mode 100644 components/groups/forms/proposals/__tests__/ProposalDetailsForm.test.tsx
 delete mode 100644 components/groups/forms/proposals/__tests__/ProposalMessages.test.tsx
 delete mode 100644 components/groups/forms/proposals/__tests__/ProposalMetadataForm.test.tsx
 delete mode 100644 components/groups/forms/proposals/__tests__/SuccessForm.test.tsx
 delete mode 100644 components/groups/forms/proposals/index.tsx
 delete mode 100644 components/groups/forms/proposals/messages.ts
 delete mode 100644 pages/groups/submit-proposal/[policyAddress].tsx

diff --git a/components/groups/forms/index.tsx b/components/groups/forms/index.tsx
index 6a376e2a..d20b7e11 100644
--- a/components/groups/forms/index.tsx
+++ b/components/groups/forms/index.tsx
@@ -1,2 +1 @@
 export * from './groups';
-export * from './proposals';
diff --git a/components/groups/forms/proposals/ConfirmationForm.tsx b/components/groups/forms/proposals/ConfirmationForm.tsx
deleted file mode 100644
index fb39814c..00000000
--- a/components/groups/forms/proposals/ConfirmationForm.tsx
+++ /dev/null
@@ -1,292 +0,0 @@
-import React from 'react';
-import { useFeeEstimation } from '@/hooks/useFeeEstimation';
-import { uploadJsonToIPFS } from '@/hooks/useIpfs';
-import { useTx } from '@/hooks/useTx';
-import { strangelove_ventures, cosmos, liftedinit } from '@liftedinit/manifestjs';
-import { Any } from '@liftedinit/manifestjs/dist/codegen/google/protobuf/any';
-
-import { TruncatedAddressWithCopy } from '@/components/react/addressCopy';
-import { ProposalFormData } from '@/helpers/formReducer';
-import { chainName } from '@/config';
-import { MsgMultiSend, MsgSend } from '@liftedinit/manifestjs/dist/codegen/cosmos/bank/v1beta1/tx';
-import {
-  MsgRemovePending,
-  MsgRemoveValidator,
-  MsgSetPower,
-  MsgUpdateStakingParams,
-} from '@liftedinit/manifestjs/dist/codegen/strangelove_ventures/poa/v1/tx';
-import {
-  MsgCreateGroupWithPolicy,
-  MsgExec,
-  MsgLeaveGroup,
-  MsgSubmitProposal,
-  MsgUpdateGroupAdmin,
-  MsgUpdateGroupMembers,
-  MsgUpdateGroupMetadata,
-  MsgUpdateGroupPolicyAdmin,
-  MsgVote,
-  MsgWithdrawProposal,
-} from '@liftedinit/manifestjs/dist/codegen/cosmos/group/v1/tx';
-import {
-  MsgPayout,
-  MsgBurnHeldBalance,
-} from '@liftedinit/manifestjs/dist/codegen/liftedinit/manifest/v1/tx';
-import {
-  MsgSoftwareUpgrade,
-  MsgCancelUpgrade,
-} from '@liftedinit/manifestjs/dist/codegen/cosmos/upgrade/v1beta1/tx';
-
-export default function ConfirmationForm({
-  policyAddress,
-  nextStep,
-  prevStep,
-  formData,
-  address,
-}: Readonly<{
-  policyAddress: string;
-  nextStep: () => void;
-  prevStep: () => void;
-  formData: ProposalFormData;
-  address: string;
-}>) {
-  type MessageTypeMap = {
-    send: MsgSend;
-    removeValidator: MsgRemoveValidator;
-    removePending: MsgRemovePending;
-    updateStakingParams: MsgUpdateStakingParams;
-    setPower: MsgSetPower;
-
-    payoutStakeholders: MsgPayout;
-    updateGroupAdmin: MsgUpdateGroupAdmin;
-    updateGroupMembers: MsgUpdateGroupMembers;
-    updateGroupMetadata: MsgUpdateGroupMetadata;
-    updateGroupPolicyAdmin: MsgUpdateGroupPolicyAdmin;
-    createGroupWithPolicy: MsgCreateGroupWithPolicy;
-    submitProposal: MsgSubmitProposal;
-    vote: MsgVote;
-    withdrawProposal: MsgWithdrawProposal;
-    exec: MsgExec;
-    leaveGroup: MsgLeaveGroup;
-    multiSend: MsgMultiSend;
-    softwareUpgrade: MsgSoftwareUpgrade;
-    cancelUpgrade: MsgCancelUpgrade;
-    customMessage: any;
-  };
-
-  const messageTypeToComposer: {
-    [K in keyof MessageTypeMap]: (value: MessageTypeMap[K]) => any;
-  } = {
-    send: cosmos.bank.v1beta1.MessageComposer.encoded.send,
-    removeValidator: strangelove_ventures.poa.v1.MessageComposer.encoded.removeValidator,
-    removePending: strangelove_ventures.poa.v1.MessageComposer.encoded.removePending,
-    updateStakingParams: strangelove_ventures.poa.v1.MessageComposer.encoded.updateStakingParams,
-    setPower: strangelove_ventures.poa.v1.MessageComposer.encoded.setPower,
-
-    payoutStakeholders: liftedinit.manifest.v1.MessageComposer.encoded.payout,
-    updateGroupAdmin: cosmos.group.v1.MessageComposer.encoded.updateGroupAdmin,
-    updateGroupMembers: cosmos.group.v1.MessageComposer.encoded.updateGroupMembers,
-    updateGroupMetadata: cosmos.group.v1.MessageComposer.encoded.updateGroupMetadata,
-    updateGroupPolicyAdmin: cosmos.group.v1.MessageComposer.encoded.updateGroupPolicyAdmin,
-    createGroupWithPolicy: cosmos.group.v1.MessageComposer.encoded.createGroupWithPolicy,
-    submitProposal: cosmos.group.v1.MessageComposer.encoded.submitProposal,
-    vote: cosmos.group.v1.MessageComposer.encoded.vote,
-    withdrawProposal: cosmos.group.v1.MessageComposer.encoded.withdrawProposal,
-    customMessage: cosmos.bank.v1beta1.MessageComposer.encoded.send,
-    exec: cosmos.group.v1.MessageComposer.encoded.exec,
-    leaveGroup: cosmos.group.v1.MessageComposer.encoded.leaveGroup,
-    multiSend: cosmos.bank.v1beta1.MessageComposer.encoded.multiSend,
-    softwareUpgrade: cosmos.upgrade.v1beta1.MessageComposer.encoded.softwareUpgrade,
-    cancelUpgrade: cosmos.upgrade.v1beta1.MessageComposer.encoded.cancelUpgrade,
-  };
-  const snakeToCamel = (str: string): string =>
-    str.replace(/([-_][a-z])/gi, $1 => $1.toUpperCase().replace('-', '').replace('_', ''));
-
-  const convertKeysToCamelCase = (obj: any): any => {
-    if (Array.isArray(obj)) {
-      return obj.map(v => convertKeysToCamelCase(v));
-    } else if (obj !== null && typeof obj === 'object') {
-      return Object.keys(obj).reduce(
-        (acc, key) => {
-          acc[snakeToCamel(key)] = convertKeysToCamelCase(obj[key]);
-          return acc;
-        },
-        {} as Record<string, any>
-      );
-    }
-    return obj;
-  };
-
-  const getMessageObject = (message: { type: keyof MessageTypeMap } & Record<string, any>): Any => {
-    const composer = messageTypeToComposer[message.type];
-    if (composer) {
-      let messageData = JSON.parse(JSON.stringify(message));
-
-      delete messageData.type;
-
-      messageData = convertKeysToCamelCase(messageData);
-      if (messageData.amount && !Array.isArray(messageData.amount)) {
-        messageData.amount = [messageData.amount];
-      }
-      const composedMessage = composer(messageData as MessageTypeMap[typeof message.type]);
-      if (!composedMessage || !composedMessage.value) {
-        console.error('Composed message or its value is undefined:', composedMessage);
-        throw new Error(`Failed to compose message for type: ${message.type}`);
-      }
-
-      // Verify composedMessage structure
-      if (!composedMessage.typeUrl || typeof composedMessage.value !== 'object') {
-        console.error('Invalid composedMessage structure:', composedMessage);
-        throw new Error(`Invalid composedMessage structure for type: ${message.type}`);
-      }
-
-      try {
-        const anyMessage = Any.fromPartial({
-          typeUrl: composedMessage.typeUrl,
-          value: composedMessage.value,
-        });
-
-        return anyMessage;
-      } catch (error) {
-        console.error('Error encoding message:', error);
-        console.error('Message type:', message.type);
-        console.error('Composed message:', composedMessage);
-        throw error;
-      }
-    }
-    throw new Error(`Unknown message type: ${message.type}`);
-  };
-
-  const proposalMetadata = {
-    title: formData.metadata.title,
-    authors: formData.metadata.authors,
-    summary: formData.metadata.summary,
-    details: formData.metadata.details,
-    proposalForumURL: '',
-    voteOptionContext: '',
-  };
-
-  const jsonString = JSON.stringify(proposalMetadata);
-
-  const { tx, isSigning, setIsSigning } = useTx(chainName);
-
-  const { estimateFee } = useFeeEstimation('manifest');
-
-  const uploadMetaDataToIPFS = async () => {
-    const CID = await uploadJsonToIPFS(jsonString);
-    return CID;
-  };
-
-  const handleConfirm = async () => {
-    setIsSigning(true);
-    const CID = await uploadMetaDataToIPFS();
-
-    const messages: Any[] = formData.messages.map(message => getMessageObject(message));
-    const msg = cosmos.group.v1.MessageComposer.fromPartial.submitProposal({
-      groupPolicyAddress: policyAddress,
-      messages: messages,
-      metadata: CID,
-      proposers: [formData.proposers],
-      title: formData.title,
-      summary: formData.metadata.summary,
-      exec: 0, // For now
-    });
-    const fee = await estimateFee(address ?? '', [msg]);
-    await tx([msg], {
-      fee,
-      onSuccess: () => {
-        nextStep();
-      },
-    });
-  };
-
-  return (
-    <section>
-      <div className="w-full dark:bg-[#FFFFFF0F] bg-[#FFFFFFCC] p-[24px] rounded-[24px]">
-        <div className="flex justify-center p-4 rounded-[8px] mb-6 w-full dark:bg-[#FAFAFA1F] bg-[#A087FF1F] items-center">
-          <h1 className="text-xl text-primary font-bold">{formData.title}</h1>
-        </div>
-
-        <div className="space-y-6">
-          {/* Proposal Information */}
-          <div>
-            <h2 className="text-xl font-semibold mb-4 dark:text-[#FFFFFF99]">
-              Proposal Information
-            </h2>
-            <div className="grid grid-cols-2 gap-4">
-              <div className="dark:bg-[#2A2A38] bg-[#FFFFFF] p-4 rounded-[12px]">
-                <label className="text-sm dark:text-[#FFFFFF66]">Proposer</label>
-                <TruncatedAddressWithCopy address={formData.proposers} slice={14} />
-              </div>
-              <div className="dark:bg-[#2A2A38] bg-[#FFFFFF] p-4 rounded-[12px]">
-                <label className="text-sm dark:text-[#FFFFFF66]">Summary</label>
-                <div
-                  className="overflow-hidden text-ellipsis whitespace-nowrap dark:text-[#FFFFFF99]"
-                  title={formData.metadata.summary}
-                >
-                  {formData.metadata.summary.length > 100
-                    ? `${formData.metadata.summary.slice(0, 100)}...`
-                    : formData.metadata.summary}
-                </div>
-              </div>
-            </div>
-          </div>
-
-          {/* Messages */}
-          <div className="max-h-32 overflow-y-auto">
-            <h2 className="text-xl font-semibold mb-4 dark:text-[#FFFFFF99]">Messages</h2>
-            <div className="grid grid-cols-4 gap-4">
-              {formData.messages.map((message, index) => (
-                <div key={index} className="dark:bg-[#2A2A38] bg-[#FFFFFF] p-4 rounded-lg">
-                  <div className="text-sm dark:text-[#FFFFFF66]">Type</div>
-                  <div className="dark:text-[#FFFFFF99] truncate" title={message.type}>
-                    {message.type}
-                  </div>
-                  {/* Add more message details here if needed */}
-                </div>
-              ))}
-            </div>
-          </div>
-
-          {/* Metadata */}
-          <div className="max-h-50 overflow-y-auto">
-            <h2 className="text-xl font-semibold mb-4 dark:text-[#FFFFFF99]">Metadata</h2>
-            <div className="grid grid-cols-2 gap-4">
-              <div className="dark:bg-[#2A2A38] bg-[#FFFFFF] p-4 rounded-lg">
-                <div className="text-sm dark:text-[#FFFFFF66]">Authors</div>
-                <div className="dark:text-[#FFFFFF99]">{formData.metadata.authors}</div>
-              </div>
-              <div className="dark:bg-[#2A2A38] bg-[#FFFFFF] p-4 rounded-lg">
-                <div className="text-sm dark:text-[#FFFFFF66]">Title</div>
-                <div className="dark:text-[#FFFFFF99]">{formData.metadata.title}</div>
-              </div>
-            </div>
-            <div className="mt-4 dark:bg-[#2A2A38] bg-[#FFFFFF] p-4 rounded-lg">
-              <div className="text-sm dark:text-[#FFFFFF66]">Details</div>
-              <div className="dark:text-[#FFFFFF99] max-h-20 overflow-y-auto">
-                {formData.metadata.details}
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-
-      {/* Buttons */}
-      <div className="flex gap-6 mt-6 mx-auto w-full">
-        <button onClick={prevStep} className="btn btn-neutral w-[calc(50%-12px)]">
-          Back: Metadata
-        </button>
-        <button
-          onClick={handleConfirm}
-          disabled={isSigning || !address}
-          className="w-[calc(50%-12px)] btn btn-gradient text-white"
-        >
-          {isSigning ? (
-            <span className="loading loading-dots loading-sm"></span>
-          ) : (
-            'Sign Transaction'
-          )}
-        </button>
-      </div>
-    </section>
-  );
-}
diff --git a/components/groups/forms/proposals/ProposalDetailsForm.tsx b/components/groups/forms/proposals/ProposalDetailsForm.tsx
deleted file mode 100644
index 8c789448..00000000
--- a/components/groups/forms/proposals/ProposalDetailsForm.tsx
+++ /dev/null
@@ -1,139 +0,0 @@
-import React, { useState } from 'react';
-import { Formik, Form } from 'formik';
-import Yup from '@/utils/yupExtensions';
-import { ProposalFormData, ProposalAction } from '@/helpers/formReducer';
-import { MdContacts } from 'react-icons/md';
-import { TextInput, TextArea } from '@/components/react/inputs';
-import Link from 'next/link';
-import { useRouter } from 'next/router';
-import { TailwindModal } from '@/components/react';
-import { Contacts } from '@/components/react/views/Contacts';
-
-const ProposalSchema = Yup.object().shape({
-  title: Yup.string()
-    .required('Title is required')
-    .max(50, 'Title must not exceed 50 characters')
-    .noProfanity('Profanity is not allowed'),
-  proposers: Yup.string().manifestAddress().required('Required'),
-  summary: Yup.string()
-    .required('Summary is required')
-    .min(10, 'Summary must be at least 10 characters')
-    .max(500, 'Summary must not exceed 500 characters')
-    .noProfanity('Profanity is not allowed'),
-});
-
-export default function ProposalDetails({
-  nextStep,
-  formData,
-  dispatch,
-  address,
-}: Readonly<{
-  nextStep: () => void;
-  formData: ProposalFormData;
-  dispatch: React.Dispatch<ProposalAction>;
-  address: string;
-}>) {
-  const router = useRouter();
-  const policyAddress = router.query.policyAddress as string;
-  const [isContactsOpen, setIsContactsOpen] = useState(false);
-
-  const updateField = (field: keyof ProposalFormData, value: any) => {
-    dispatch({ type: 'UPDATE_FIELD', field, value });
-  };
-
-  return (
-    <section className="">
-      <Formik
-        initialValues={formData}
-        validationSchema={ProposalSchema}
-        onSubmit={nextStep}
-        validateOnChange={true}
-      >
-        {({ isValid, setFieldValue, handleChange }) => (
-          <>
-            <TailwindModal
-              isOpen={isContactsOpen}
-              setOpen={setIsContactsOpen}
-              showContacts={true}
-              currentAddress={address}
-              onSelect={(selectedAddress: string) => {
-                setFieldValue('proposers', selectedAddress);
-                updateField('proposers', selectedAddress);
-                setIsContactsOpen(false);
-              }}
-            />
-
-            <div className="lg:flex mx-auto">
-              <div className="flex items-center mx-auto w-full dark:bg-[#FFFFFF0F] bg-[#FFFFFFCC] p-[24px] rounded-[24px]">
-                <div className="w-full">
-                  <h1 className="mb-4 text-xl font-extrabold tracking-tight sm:mb-6 leading-tight border-b-[0.5px] dark:text-[#FFFFFF99] dark:border-[#FFFFFF99] border-b-[black] pb-4">
-                    Proposal details
-                  </h1>
-                  <Form className="min-h-[330px] flex flex-col gap-4">
-                    <TextInput
-                      label="Proposal Title"
-                      name="title"
-                      placeholder="Title"
-                      value={formData.title}
-                      onChange={(e: React.ChangeEvent<HTMLInputElement>) => {
-                        updateField('title', e.target.value);
-                        handleChange(e);
-                      }}
-                    />
-                    <TextInput
-                      label="Proposer"
-                      name="proposers"
-                      placeholder="List of authors"
-                      value={formData.proposers}
-                      onChange={(e: React.ChangeEvent<HTMLInputElement>) => {
-                        updateField('proposers', e.target.value);
-                        handleChange(e);
-                      }}
-                      rightElement={
-                        <button
-                          type="button"
-                          aria-label="contacts-btn"
-                          onClick={() => setIsContactsOpen(true)}
-                          className="btn btn-primary btn-sm text-white"
-                        >
-                          <MdContacts className="w-5 h-5" />
-                        </button>
-                      }
-                    />
-                    <TextArea
-                      label="Summary"
-                      name="summary"
-                      placeholder="Short Description"
-                      value={formData.summary}
-                      onChange={(e: React.ChangeEvent<HTMLTextAreaElement>) => {
-                        updateField('summary', e.target.value);
-                        handleChange(e);
-                      }}
-                    />
-                  </Form>
-                </div>
-              </div>
-            </div>
-            <div className="flex flex-row gap-6  mt-6 mx-auto w-full">
-              <Link href={`/groups?policyAddress=${policyAddress}`} legacyBehavior>
-                <button className="btn btn-neutral py-2.5 sm:py-3.5 w-[calc(50%-12px)]">
-                  <span className="hidden sm:inline">Back: Proposals Page</span>
-                  <span className="sm:hidden">Back: Proposals</span>
-                </button>
-              </Link>
-              <button
-                type="submit"
-                className="w-[calc(50%-12px)] btn  py-2.5 sm:py-3.5 btn-gradient text-white disabled:text-black"
-                onClick={nextStep}
-                disabled={!isValid || !formData.proposers}
-              >
-                <span className="hidden sm:inline">Next: Proposal Messages</span>
-                <span className="sm:hidden">Next: Messages</span>
-              </button>
-            </div>
-          </>
-        )}
-      </Formik>
-    </section>
-  );
-}
diff --git a/components/groups/forms/proposals/ProposalMessages.tsx b/components/groups/forms/proposals/ProposalMessages.tsx
deleted file mode 100644
index ea11cbda..00000000
--- a/components/groups/forms/proposals/ProposalMessages.tsx
+++ /dev/null
@@ -1,1130 +0,0 @@
-import React, { useState, useCallback, useEffect, useMemo } from 'react';
-import {
-  ProposalFormData,
-  ProposalAction,
-  Message,
-  MessageFields,
-  SendMessage,
-} from '@/helpers/formReducer';
-import * as initialMessages from './messages';
-
-import { TextInput } from '@/components/react/inputs';
-import { Formik, Form, Field, FieldProps, FormikProps } from 'formik';
-import Yup from '@/utils/yupExtensions';
-import { ArrowRightIcon, MinusIcon, SearchIcon, PlusIcon } from '@/components/icons';
-import { FiEdit } from 'react-icons/fi';
-import { useTokenBalances, useTokenBalancesResolved, useTokenFactoryDenomsMetadata } from '@/hooks';
-import { DenomImage } from '@/components/factory';
-import { PiCaretDownBold } from 'react-icons/pi';
-import { shiftDigits, truncateString } from '@/utils';
-import { CombinedBalanceInfo } from '@/utils/types';
-import Decimal from 'decimal.js';
-import { MFX_TOKEN_DATA } from '@/utils/constants';
-import { MdContacts } from 'react-icons/md';
-import { TailwindModal } from '@/components/react';
-
-// Define the prop types for CustomSendMessageFields
-interface CustomSendMessageFieldsProps {
-  policyAddress: string;
-  address: string;
-  message: SendMessage;
-  index: number;
-  handleChange: (field: string, value: any) => void;
-  updateValidity: (index: number, isValid: boolean) => void;
-  combinedBalances: CombinedBalanceInfo[];
-  isBalancesLoading: boolean;
-  currentAddress?: string;
-}
-
-export default function ProposalMessages({
-  policyAddress,
-  address,
-  formData,
-  dispatch,
-  nextStep,
-  prevStep,
-}: Readonly<{
-  policyAddress: string;
-  address: string;
-  nextStep: () => void;
-  prevStep: () => void;
-  formData: ProposalFormData;
-  dispatch: React.Dispatch<ProposalAction>;
-}>) {
-  const [isFormValid, setIsFormValid] = useState(false);
-  const [visibleMessages, setVisibleMessages] = useState<boolean[]>(
-    formData.messages.map(() => false)
-  );
-  const [editingMessageIndex, setEditingMessageIndex] = useState<number | null>(null);
-
-  const [searchTerm, setSearchTerm] = useState('');
-  const [selectedCategory, setSelectedCategory] = useState('All');
-
-  const messageCategories = [
-    'All',
-    'Admins',
-    'Group Management',
-    'Proposal Actions',
-    'Financial',
-    'System',
-  ];
-
-  const messageTypes = [
-    { name: 'send', category: 'Financial' },
-    { name: 'removeValidator', category: 'Admins' },
-    { name: 'removePendingValidator', category: 'Admins' },
-    { name: 'updateStakingParams', category: 'System' },
-    { name: 'setPower', category: 'Group Management' },
-    { name: 'updateManifestParams', category: 'System' },
-    { name: 'payoutStakeholders', category: 'Financial' },
-    { name: 'updateGroupAdmin', category: 'Group Management' },
-    { name: 'updateGroupMetadata', category: 'Group Management' },
-    { name: 'updateGroupPolicyAdmin', category: 'Group Management' },
-    { name: 'vote', category: 'Proposal Actions' },
-    { name: 'withdrawProposal', category: 'Proposal Actions' },
-    { name: 'exec', category: 'Proposal Actions' },
-    { name: 'leaveGroup', category: 'Group Management' },
-    { name: 'multiSend', category: 'Financial' },
-    { name: 'softwareUpgrade', category: 'System' },
-    { name: 'cancelUpgrade', category: 'System' },
-  ];
-
-  const filteredMessageTypes = messageTypes.filter(
-    type =>
-      (selectedCategory === 'All' || type.category === selectedCategory) &&
-      type.name.toLowerCase().includes(searchTerm.toLowerCase())
-  );
-
-  const [isMessageValidArray, setIsMessageValidArray] = useState<boolean[]>(
-    formData.messages.map(() => false)
-  );
-
-  const updateMessageValidity = (index: number, isValid: boolean) => {
-    setIsMessageValidArray(prevState => {
-      const newState = [...prevState];
-      newState[index] = isValid;
-      return newState;
-    });
-  };
-
-  const checkFormValidity = useCallback(() => {
-    const valid = formData.messages.length > 0 && isMessageValidArray.every(isValid => isValid);
-
-    setIsFormValid(valid);
-  }, [formData.messages.length, isMessageValidArray]);
-
-  useEffect(() => {
-    checkFormValidity();
-  }, [isMessageValidArray, checkFormValidity]);
-
-  const handleAddMessage = () => {
-    // Create a properly initialized send message with all required fields
-    const newMessage: SendMessage = {
-      type: 'send',
-      from_address: policyAddress,
-      to_address: address,
-      amount: {
-        denom: 'umfx',
-        amount: '0',
-      },
-    };
-
-    // Add the new message
-    dispatch({
-      type: 'ADD_MESSAGE',
-      message: newMessage,
-    });
-
-    setVisibleMessages([...visibleMessages, false]);
-    setIsMessageValidArray([...isMessageValidArray, false]);
-  };
-
-  const handleRemoveMessage = (index: number) => {
-    dispatch({ type: 'REMOVE_MESSAGE', index });
-    setVisibleMessages(visibleMessages.filter((_, i) => i !== index));
-    setIsMessageValidArray(isMessageValidArray.filter((_, i) => i !== index));
-    if (editingMessageIndex === index) {
-      setEditingMessageIndex(null);
-    } else if (editingMessageIndex !== null && editingMessageIndex > index) {
-      setEditingMessageIndex(editingMessageIndex - 1);
-    }
-  };
-
-  const handleChangeMessage = (index: number, field: MessageFields | '', value: any) => {
-    if (field === '') {
-      // Handle complete message update
-      dispatch({ type: 'UPDATE_MESSAGE', index, message: value });
-    } else {
-      // Handle individual field updates
-      let updatedMessage = { ...formData.messages[index] };
-
-      if (field === 'type') {
-        switch (value) {
-          case 'send':
-            updatedMessage = {
-              ...initialMessages.initialSendMessage,
-              type: value,
-              amount: {
-                denom: 'umfx',
-                amount: '0',
-              },
-              from_address: policyAddress,
-              to_address: address,
-            };
-            dispatch({ type: 'UPDATE_MESSAGE', index, message: updatedMessage });
-            break;
-          case 'customMessage':
-            updatedMessage = {
-              ...initialMessages.initialCustomMessage,
-              type: value,
-            };
-            break;
-          case 'removeValidator':
-            updatedMessage = {
-              ...initialMessages.initialRemoveValidatorMessage,
-              type: value,
-              sender: policyAddress,
-              validator_address: '',
-            };
-            break;
-          case 'removePendingValidator':
-            updatedMessage = {
-              ...initialMessages.initialRemovePendingMessage,
-              type: value,
-            };
-            break;
-
-          case 'updateStakingParams':
-            updatedMessage = {
-              ...initialMessages.initialUpdateStakingParamsMessage,
-              type: value,
-            };
-            break;
-          case 'setPower':
-            updatedMessage = {
-              ...initialMessages.initialSetPowerMessage,
-              type: value,
-            };
-            break;
-          case 'updateManifestParams':
-            updatedMessage = {
-              ...initialMessages.initialUpdateManifestParamsMessage,
-              type: value,
-            };
-            break;
-          case 'payoutStakeholders':
-            updatedMessage = {
-              ...initialMessages.initialPayoutStakeholdersMessage,
-              type: value,
-            };
-            break;
-          case 'updateGroupAdmin':
-            updatedMessage = {
-              ...initialMessages.initialUpdateGroupAdminMessage,
-              type: value,
-            };
-            break;
-          case 'updateGroupMembers':
-            updatedMessage = {
-              ...initialMessages.initialUpdateGroupMembersMessage,
-              type: value,
-            };
-            break;
-          case 'updateGroupMetadata':
-            updatedMessage = {
-              ...initialMessages.initialUpdateGroupMetadataMessage,
-              type: value,
-            };
-            break;
-          case 'updateGroupPolicyAdmin':
-            updatedMessage = {
-              ...initialMessages.initialUpdateGroupPolicyAdminMessage,
-              type: value,
-            };
-            break;
-          case 'createGroupWithPolicy':
-            updatedMessage = {
-              ...initialMessages.initialCreateGroupWithPolicyMessage,
-              type: value,
-            };
-            break;
-          case 'submitProposal':
-            updatedMessage = {
-              ...initialMessages.initialSubmitProposalMessage,
-              type: value,
-            };
-            break;
-          case 'vote':
-            updatedMessage = {
-              ...initialMessages.initialVoteMessage,
-              type: value,
-            };
-            break;
-          case 'withdrawProposal':
-            updatedMessage = {
-              ...initialMessages.initialWithdrawProposalMessage,
-              type: value,
-            };
-            break;
-          case 'exec':
-            updatedMessage = {
-              ...initialMessages.initialExecMessage,
-              type: value,
-            };
-            break;
-          case 'leaveGroup':
-            updatedMessage = {
-              ...initialMessages.initialLeaveGroupMessage,
-              type: value,
-            };
-            break;
-          case 'multiSend':
-            updatedMessage = {
-              ...initialMessages.initialMultiSendMessage,
-              type: value,
-            };
-            break;
-          case 'softwareUpgrade':
-            updatedMessage = {
-              ...initialMessages.initialSoftwareUpgradeMessage,
-              type: value,
-            };
-            break;
-          case 'cancelUpgrade':
-            updatedMessage = {
-              ...initialMessages.initialCancelUpgradeMessage,
-              type: value,
-            };
-            break;
-          default:
-            updatedMessage = {
-              // @ts-ignore
-              ...initialMessages[`initial${value.charAt(0).toUpperCase() + value.slice(1)}Message`],
-              type: value,
-            };
-            // Set sender/from fields to policyAddress
-            if ('sender' in updatedMessage) {
-              updatedMessage.sender = policyAddress;
-            }
-            if ('from_address' in updatedMessage) {
-              updatedMessage.from_address = policyAddress;
-            }
-            break;
-        }
-      } else {
-        // For field updates, automatically set sender/from fields
-        if (field.includes('sender') || field.includes('from')) {
-          value = policyAddress;
-        }
-        if (updatedMessage.type === 'send') {
-          updatedMessage = {
-            ...updatedMessage,
-            [field]: value,
-            from_address: policyAddress,
-          };
-        } else {
-          (updatedMessage as any)[field] = value;
-        }
-      }
-      dispatch({ type: 'UPDATE_MESSAGE', index, message: updatedMessage });
-    }
-  };
-
-  const renderInputs = (
-    object: Record<string, any>,
-    handleChange: (field: string, value: any) => void,
-    path = '',
-    index: number
-  ) => {
-    const generateValidationSchema = (obj: Record<string, any>): any => {
-      return Yup.object().shape(
-        Object.entries(obj).reduce((schema: Record<string, any>, [key, value]) => {
-          if (key === 'type') return schema;
-
-          if (typeof value === 'object' && value !== null && !Array.isArray(value)) {
-            schema[key] = generateValidationSchema(value);
-          } else {
-            schema[key] = Yup.string().required(
-              `${key.charAt(0).toUpperCase() + key.slice(1)} is required`
-            );
-
-            if (
-              key.includes('address') ||
-              key === 'sender' ||
-              key === 'admin' ||
-              key === 'new_admin'
-            ) {
-              schema[key] = schema[key].manifestAddress().required('Address is required');
-            } else if (key.includes('amount')) {
-              schema[key] = Yup.number()
-                .positive('Amount must be positive')
-                .required('Amount is required');
-            }
-          }
-          return schema;
-        }, {})
-      );
-    };
-
-    const validationSchema = generateValidationSchema(object);
-
-    const renderField = (fieldPath: string, fieldValue: any, formikProps: FormikProps<any>) => {
-      const { setFieldValue } = formikProps;
-      if (typeof fieldValue === 'object' && fieldValue !== null && !Array.isArray(fieldValue)) {
-        return (
-          <div key={fieldPath} className="mb-4">
-            <h3 className="text-lg font-semibold mb-2 text-primary">
-              {fieldPath
-                .split('.')
-                .pop()
-                ?.replace(/_/g, ' ')
-                .split(' ')
-                .map(word => word.charAt(0).toUpperCase() + word.slice(1))
-                .join(' ')}
-            </h3>
-            <div className="pl-4 border-l-2 border-primary">
-              {Object.entries(fieldValue).map(([key, value]) =>
-                renderField(`${fieldPath}.${key}`, value, formikProps)
-              )}
-            </div>
-          </div>
-        );
-      } else if (typeof fieldValue === 'boolean') {
-        return (
-          <Field key={fieldPath} name={fieldPath}>
-            {({ field }: FieldProps) => (
-              <label className="flex items-center mb-2">
-                <input
-                  type="checkbox"
-                  {...field}
-                  checked={field.value}
-                  className="checkbox checkbox-primary checkbox-sm mr-2"
-                  onChange={e => {
-                    field.onChange(e);
-                    handleChange(fieldPath, e.target.checked);
-                    setFieldValue(fieldPath, e.target.checked);
-                  }}
-                />
-                <span className="capitalize">
-                  {fieldPath
-                    .split('.')
-                    .pop()
-                    ?.replace(/_/g, ' ')
-                    .split(' ')
-                    .map(word => word.charAt(0).toUpperCase() + word.slice(1))
-                    .join(' ')}
-                </span>
-              </label>
-            )}
-          </Field>
-        );
-      } else {
-        return (
-          <Field key={fieldPath} name={fieldPath}>
-            {({ field }: FieldProps) => (
-              <div className="mb-4">
-                <TextInput
-                  label={
-                    fieldPath
-                      .split('.')
-                      .pop()
-                      ?.replace(/_/g, ' ')
-                      .split(' ')
-                      .map(word => word.charAt(0).toUpperCase() + word.slice(1))
-                      .join(' ') ?? ''
-                  }
-                  placeholder={`Enter ${fieldPath
-                    .split('.')
-                    .pop()
-                    ?.replace(/_/g, ' ')
-                    .split(' ')
-                    .map(word => word.charAt(0).toUpperCase() + word.slice(1))
-                    .join(' ')}`}
-                  {...field}
-                  onChange={(e: React.ChangeEvent<HTMLInputElement>) => {
-                    field.onChange(e);
-                    handleChange(fieldPath, e.target.value);
-                    setFieldValue(fieldPath, e.target.value);
-                  }}
-                />
-              </div>
-            )}
-          </Field>
-        );
-      }
-    };
-
-    return (
-      <Formik
-        initialValues={object}
-        validationSchema={validationSchema}
-        onSubmit={() => {}}
-        validateOnChange={true}
-        validate={values => {
-          const isValid = validationSchema.isValidSync(values);
-          updateMessageValidity(index, isValid);
-        }}
-      >
-        {(formikProps: FormikProps<typeof object>) => (
-          <Form>
-            {Object.entries(object).map(
-              ([key, value]) => key !== 'type' && renderField(key, value, formikProps)
-            )}
-          </Form>
-        )}
-      </Formik>
-    );
-  };
-
-  const renderMessageFields = (message: Message, index: number) => {
-    const handleChange = (field: string, value: any) => {
-      const fieldPath = field.split('.');
-      let updatedMessage: any = { ...formData.messages[index] };
-
-      let current = updatedMessage;
-      for (let i = 0; i < fieldPath.length - 1; i++) {
-        current = current[fieldPath[i]];
-      }
-      current[fieldPath[fieldPath.length - 1]] = value;
-
-      dispatch({ type: 'UPDATE_MESSAGE', index, message: updatedMessage });
-    };
-
-    if (message.type === 'send') {
-      return (
-        <CustomSendMessageFields
-          policyAddress={policyAddress}
-          address={address}
-          message={message as SendMessage}
-          index={index}
-          handleChange={handleChange}
-          updateValidity={updateMessageValidity}
-          combinedBalances={combinedBalances}
-          isBalancesLoading={isBalancesLoading}
-          currentAddress={address}
-        />
-      );
-    } else {
-      return (
-        <div className="p-1 rounded-lg">
-          {renderInputs(message, (field, value) => handleChange(field, value), '', index)}
-        </div>
-      );
-    }
-  };
-
-  const openMessageTypeModal = (index: number) => {
-    setEditingMessageIndex(index);
-    (document.getElementById('message_type_modal') as HTMLDialogElement)?.showModal();
-  };
-
-  const selectMessageType = (type: string) => {
-    if (editingMessageIndex !== null) {
-      handleChangeMessage(editingMessageIndex, 'type', type);
-    }
-    (document.getElementById('message_type_modal') as HTMLDialogElement)?.close();
-  };
-
-  const openMessageModal = (index: number) => {
-    setEditingMessageIndex(index);
-    (document.getElementById('message_edit_modal') as HTMLDialogElement)?.showModal();
-  };
-
-  const closeMessageModal = () => {
-    setEditingMessageIndex(null);
-    (document.getElementById('message_edit_modal') as HTMLDialogElement)?.close();
-  };
-
-  const isMessageValid = React.useCallback((message: Message): boolean => {
-    if (!message || Object.keys(message).length === 0) return false;
-    if (!message.type) return false;
-
-    const checkFields = (obj: any): boolean => {
-      for (const key in obj) {
-        if (typeof obj[key] === 'object' && obj[key] !== null) {
-          if (!checkFields(obj[key])) return false;
-        } else if (obj[key] === '' || obj[key] === undefined || obj[key] === null) {
-          return false;
-        }
-      }
-      return true;
-    };
-
-    return checkFields(message);
-  }, []);
-
-  // Import necessary hooks and states for token balances and metadata
-  const { balances, isBalancesLoading } = useTokenBalances(policyAddress);
-  const { balances: resolvedBalances } = useTokenBalancesResolved(policyAddress);
-  const { metadatas } = useTokenFactoryDenomsMetadata();
-
-  // Combine balances with metadata
-  const combinedBalances = useMemo(() => {
-    if (!balances || !resolvedBalances || !metadatas) return [];
-
-    // Find 'umfx' balance (mfx token)
-    const mfxCoreBalance = balances.find(b => b.denom === 'umfx');
-    const mfxResolvedBalance = resolvedBalances.find(rb => rb.denom === 'mfx');
-
-    // Create combined balance for 'mfx'
-    const mfxCombinedBalance: CombinedBalanceInfo | null = mfxCoreBalance
-      ? {
-          denom: mfxResolvedBalance?.denom || 'mfx',
-          coreDenom: 'umfx',
-          amount: mfxCoreBalance.amount,
-          metadata: MFX_TOKEN_DATA,
-        }
-      : null;
-
-    // Process other balances
-    const otherBalances = balances
-      .filter(coreBalance => coreBalance.denom !== 'umfx')
-      .map((coreBalance): CombinedBalanceInfo => {
-        const resolvedBalance = resolvedBalances.find(
-          rb => rb.denom === coreBalance.denom || rb.denom === coreBalance.denom.split('/').pop()
-        );
-        const metadata = metadatas.metadatas.find(m => m.base === coreBalance.denom);
-
-        return {
-          denom: resolvedBalance?.denom || coreBalance.denom,
-          coreDenom: coreBalance.denom,
-          amount: coreBalance.amount,
-          metadata: metadata || null,
-        };
-      });
-
-    // Combine 'mfx' with other balances
-    return mfxCombinedBalance ? [mfxCombinedBalance, ...otherBalances] : otherBalances;
-  }, [balances, resolvedBalances, metadatas]);
-
-  return (
-    <section className="">
-      <div className="lg:flex mx-auto">
-        <div className="flex items-center mx-auto w-full dark:bg-[#FFFFFF0F] bg-[#FFFFFFCC] p-[24px] rounded-[24px]">
-          <div className="w-full">
-            <div className="flex justify-between items-center border-b-[0.5px] mb-4 dark:border-[#FFFFFF99] sm:mb-6 border-b-[black] pb-4">
-              <h1 className="text-xl font-extrabold tracking-tight  leading-tight  dark:text-[#FFFFFF99]  ">
-                Proposal Messages
-              </h1>
-              <button
-                type="button"
-                className="btn btn-sm btn-primary text-white"
-                onClick={handleAddMessage}
-                aria-label="add-message-btn"
-              >
-                <PlusIcon className="text-lg" />
-                <span className="ml-1">Add Message</span>
-              </button>
-            </div>
-
-            <div className="min-h-[330px] flex flex-col gap-4">
-              <div className="overflow-y-auto max-h-[550px] ">
-                {formData.messages.map((message, index) => (
-                  <div key={index} className="bg-[#FFFFFF] dark:bg-[#E0E0FF0A] rounded-lg p-4 mb-4">
-                    <div className="flex items-center justify-between">
-                      <div className="flex items-center gap-2">
-                        <span className="text-sm font-bold">#{index + 1}</span>
-                        <button
-                          className="btn btn-sm rounded-[12px] ml-4 border-none dark:bg-[#FFFFFF0F] bg-[#0000000A]"
-                          onClick={() => openMessageTypeModal(index)}
-                        >
-                          {message.type
-                            .replace(/([A-Z])/g, ' $1')
-                            .trim()
-                            .split(' ')
-                            .map(word => word.charAt(0).toUpperCase() + word.slice(1))
-                            .join(' ') || 'Select Type'}
-                          <ArrowRightIcon className="ml-2 text-primary rotate-180" />
-                        </button>
-                      </div>
-                      <div className="flex gap-2">
-                        <button
-                          type="button"
-                          className="btn btn-error btn-sm"
-                          onClick={() => handleRemoveMessage(index)}
-                          aria-label="remove-message-btn"
-                        >
-                          <MinusIcon className="text-lg text-white" />
-                        </button>
-                        <button
-                          type="button"
-                          className="btn btn-primary btn-sm"
-                          onClick={() => openMessageModal(index)}
-                          disabled={!message.type}
-                          aria-label="edit-message-btn"
-                        >
-                          <FiEdit className="text-lg text-white" />
-                        </button>
-                      </div>
-                    </div>
-                  </div>
-                ))}
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-      <div className="flex gap-6 mt-6 mx-auto w-full">
-        <button onClick={prevStep} className="btn btn-neutral py-2.5 sm:py-3.5 w-[calc(50%-12px)]">
-          <span className="hidden sm:inline">Prev: Proposal Details</span>
-          <span className="sm:hidden">Prev: Details</span>
-        </button>
-        <button
-          onClick={nextStep}
-          className="w-[calc(50%-12px)] btn py-2.5 sm:py-3.5 btn-gradient text-white disabled:text-black"
-          disabled={!isFormValid}
-        >
-          Next: Proposal Metadata
-        </button>
-      </div>
-
-      {/* Message Type Selection Modal */}
-      <dialog id="message_type_modal" className="modal">
-        <div className="modal-box bg-[#FFFFFF] dark:bg-[#1D192D] rounded-[24px] max-w-4xl h-full max-h-[700px] p-6">
-          <form method="dialog">
-            <button className="btn btn-sm btn-circle btn-ghost absolute right-2 top-2">✕</button>
-          </form>
-          <h3 className="text-lg font-semibold mb-4">Select Message Type</h3>
-
-          <div className="flex flex-col md:flex-row gap-4 mb-4">
-            <div className="flex-1">
-              <label className="label">
-                <span className="label-text">Search</span>
-              </label>
-              <div className="relative">
-                <SearchIcon className="absolute left-3 top-1/2 transform -translate-y-1/2 text-gray-400" />
-                <input
-                  type="text"
-                  placeholder="Search message types"
-                  className="input dark:text-[#FFFFFF99] text-[#161616] border-[#00000033] dark:border-[#FFFFFF33] bg-[#E0E0FF0A] dark:bg-[#E0E0FF0A] w-full 
-                  autofill:bg-[#E0E0FF0A] autofill:dark:bg-[#E0E0FF0A]
-                  focus:bg-[#E0E0FF0A] focus:dark:bg-[#E0E0FF0A] pl-10"
-                  value={searchTerm}
-                  onChange={e => setSearchTerm(e.target.value)}
-                />
-              </div>
-            </div>
-            <div className="flex-1 md:flex-initial">
-              <label className="label">
-                <span className="label-text">Category</span>
-              </label>
-              <div className="dropdown w-full dropdown-end cursor-pointer">
-                <label
-                  tabIndex={0}
-                  className="btn min-w-[200px] dark:text-[#FFFFFF99] text-[#161616] border-[#00000033] dark:border-[#FFFFFF33] bg-[#E0E0FF0A] dark:bg-[#E0E0FF0A] w-full flex items-center justify-between"
-                >
-                  {selectedCategory}
-                  <ArrowRightIcon className="text-xs dark:text-[#FFFFFF99] text-[#161616] -rotate-90" />
-                </label>
-                <ul
-                  tabIndex={0}
-                  className="dropdown-content z-[1] menu p-2 mt-2 shadow bg-base-300 rounded-box w-full"
-                >
-                  {messageCategories.map(category => (
-                    <li key={category}>
-                      <a onClick={() => setSelectedCategory(category)}>{category}</a>
-                    </li>
-                  ))}
-                </ul>
-              </div>
-            </div>
-          </div>
-
-          <div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-4 mt-4 max-h-[500px] overflow-y-auto">
-            {filteredMessageTypes.map(type => (
-              <div
-                key={type.name}
-                className="bg-[#E0E0FF0A] dark:bg-[#E0E0FF0A] border border-base-300 rounded-lg shadow-sm p-4"
-              >
-                <h4 className="text-lg font-semibold mb-2">
-                  {type.name.replace(/([A-Z])/g, ' $1').trim()}
-                </h4>
-                <p className="text-sm text-base-content opacity-70 mb-4">{type.category}</p>
-                <button
-                  onClick={() => selectMessageType(type.name)}
-                  className="w-full btn btn-primary"
-                >
-                  Select
-                </button>
-              </div>
-            ))}
-          </div>
-        </div>
-        <form method="dialog" className="modal-backdrop">
-          <button>close</button>
-        </form>
-      </dialog>
-
-      {/* Message Edit Modal */}
-      <dialog id="message_edit_modal" className="modal">
-        <div className="modal-box bg-[#FFFFFF] dark:bg-[#1D192D] rounded-[24px] max-w-4xl p-6">
-          <form method="dialog">
-            <button
-              className="btn btn-sm btn-circle btn-ghost absolute right-2 top-2"
-              onClick={closeMessageModal}
-            >
-              ✕
-            </button>
-          </form>
-          <h3 className="text-xl font-extrabold tracking-tight leading-tight border-b-[0.5px] dark:border-[#FFFFFF99] border-b-[black] pb-4 mb-4">
-            Edit{' '}
-            {editingMessageIndex !== null && formData.messages[editingMessageIndex]
-              ? formData.messages[editingMessageIndex].type.charAt(0).toUpperCase() +
-                formData.messages[editingMessageIndex].type.slice(1)
-              : 'Message'}{' '}
-            Message
-          </h3>
-          {editingMessageIndex !== null && formData.messages[editingMessageIndex] && (
-            <div className="overflow-y-auto max-h-[600px]">
-              {renderMessageFields(formData.messages[editingMessageIndex], editingMessageIndex)}
-            </div>
-          )}
-        </div>
-        <form method="dialog" className="modal-backdrop">
-          <button onClick={closeMessageModal}>close</button>
-        </form>
-      </dialog>
-    </section>
-  );
-}
-
-const CustomSendMessageFields: React.FC<CustomSendMessageFieldsProps> = ({
-  policyAddress,
-  address,
-  message,
-  index,
-  handleChange,
-  updateValidity,
-  combinedBalances,
-  isBalancesLoading,
-  currentAddress,
-}) => {
-  const [searchTerm, setSearchTerm] = useState('');
-  const [isContactsOpen, setIsContactsOpen] = useState(false);
-
-  const filteredBalances = combinedBalances?.filter(token => {
-    const displayName = token.metadata?.display ?? token.denom;
-    return displayName.toLowerCase().includes(searchTerm.toLowerCase());
-  });
-
-  const initialSelectedToken = useMemo(() => {
-    return (
-      combinedBalances?.find(token => token.coreDenom === message.amount.denom) ||
-      combinedBalances?.find(token => token.denom === 'umfx') ||
-      combinedBalances?.[0] ||
-      null
-    );
-  }, [combinedBalances, message.amount.denom]);
-
-  const validationSchema = Yup.object().shape({
-    amount: Yup.number()
-      .typeError('Amount must be a number')
-      .required('Amount is required')
-      .positive('Amount must be positive'),
-    to_address: Yup.string().required('Recipient address is required').manifestAddress(),
-    denom: Yup.string().required('Denomination is required'),
-    selectedToken: Yup.object().required('Please select a token'),
-  });
-
-  const formatAmount = (amount: number, decimals: number) => {
-    return amount.toFixed(decimals).replace(/\.?0+$/, '');
-  };
-
-  // Update initial values to include the from and to addresses
-  const initialValues = {
-    amount: message.amount.amount
-      ? new Decimal(message.amount.amount)
-          .div(new Decimal(10).pow(initialSelectedToken?.metadata?.denom_units[1]?.exponent ?? 6))
-          .toString()
-      : '',
-    from_address: policyAddress,
-    to_address: address,
-    selectedToken: initialSelectedToken,
-    denom: message.amount.denom || '',
-  };
-
-  return (
-    <div style={{ borderRadius: '24px' }} className="text-sm w-full h-full p-2">
-      <Formik
-        initialValues={initialValues}
-        validationSchema={validationSchema}
-        onSubmit={() => {}}
-        validateOnChange={true}
-        enableReinitialize={true}
-        validate={values => {
-          const isValid = validationSchema.isValidSync(values);
-          updateValidity(index, isValid);
-
-          // Create complete message object with all required fields
-          const updatedMessage: SendMessage = {
-            type: 'send',
-            from_address: values.from_address,
-            to_address: values.to_address,
-            amount: {
-              denom: values.selectedToken?.coreDenom || 'umfx',
-              amount: values.amount
-                ? new Decimal(values.amount)
-                    .times(
-                      new Decimal(10).pow(
-                        values.selectedToken?.metadata?.denom_units[1]?.exponent ?? 6
-                      )
-                    )
-                    .toFixed(0)
-                : '0',
-            },
-          };
-
-          // Update the entire message object
-          handleChange('', updatedMessage);
-        }}
-      >
-        {({ values, setFieldValue, errors, touched }) => (
-          <Form className="space-y-6 flex flex-col items-center mx-auto">
-            <div className="w-full space-y-4">
-              {/* Amount Input with Token Selector */}
-              <div className="w-full">
-                <label className="label">
-                  <span className="label-text text-md font-medium text-[#00000099] dark:text-[#FFFFFF99]">
-                    Amount
-                  </span>
-                </label>
-                <div className="relative">
-                  <input
-                    className="input input-md border border-[#00000033] dark:border-[#FFFFFF33] bg-[#E0E0FF0A] dark:bg-[#E0E0FF0A] w-full pr-24 dark:text-[#FFFFFF] text-[#161616]"
-                    name="amount"
-                    placeholder="0.00"
-                    style={{ borderRadius: '12px' }}
-                    value={values.amount}
-                    onChange={(e: React.ChangeEvent<HTMLInputElement>) => {
-                      const value = e.target.value;
-                      if (/^\d*\.?\d*$/.test(value) && parseFloat(value) >= 0) {
-                        setFieldValue('amount', value);
-
-                        if (values.selectedToken) {
-                          const exponent =
-                            values.selectedToken.metadata?.denom_units[1]?.exponent ?? 6;
-                          const amountMinimalUnits = new Decimal(value)
-                            .times(new Decimal(10).pow(exponent))
-                            .toFixed(0);
-
-                          handleChange('amount.amount', amountMinimalUnits);
-                        } else {
-                          handleChange('amount.amount', value);
-                        }
-                      }
-                    }}
-                    onKeyPress={(e: React.KeyboardEvent<HTMLInputElement>) => {
-                      if (!/[\d.]/.test(e.key)) {
-                        e.preventDefault();
-                      }
-                    }}
-                  />
-
-                  <div className="absolute inset-y-1 right-1 flex items-center">
-                    <div className="dropdown dropdown-end h-full">
-                      <label
-                        aria-label="token-selector"
-                        tabIndex={0}
-                        className="btn btn-sm h-full px-3 bg-[#FFFFFF] dark:bg-[#FFFFFF0F] border-none hover:bg-transparent"
-                      >
-                        {values.selectedToken?.metadata ? (
-                          <DenomImage denom={values.selectedToken?.metadata} />
-                        ) : null}
-                        {(() => {
-                          const tokenDisplayName =
-                            values.selectedToken?.metadata?.display ??
-                            values.selectedToken?.denom ??
-                            'Select';
-                          return tokenDisplayName.startsWith('factory')
-                            ? tokenDisplayName.split('/').pop()?.toUpperCase()
-                            : truncateString(tokenDisplayName, 10).toUpperCase();
-                        })()}
-                        <PiCaretDownBold className="ml-1" />
-                      </label>
-                      <ul
-                        tabIndex={0}
-                        className="dropdown-content z-20 p-2 shadow bg-base-300 rounded-lg w-full mt-1 max-h-[12.5rem] min-w-44 overflow-y-auto dark:text-[#FFFFFF] text-[#161616]"
-                      >
-                        <li className="bg-base-300 z-30 hover:bg-transparent h-full mb-2">
-                          <div className="px-2 py-1 relative">
-                            <input
-                              type="text"
-                              placeholder="Search tokens..."
-                              className="input input-sm w-full pr-8 focus:outline-none focus:ring-0 border border-[#00000033] dark:border-[#FFFFFF33] bg-[#E0E0FF0A] dark:bg-[#E0E0FF0A]"
-                              onChange={e => setSearchTerm(e.target.value)}
-                              style={{ boxShadow: 'none', borderRadius: '8px' }}
-                            />
-                            <SearchIcon className="h-5 w-5 absolute right-3 top-1/2 transform -translate-y-1/2 text-gray-400" />
-                          </div>
-                        </li>
-                        {isBalancesLoading ? (
-                          <li>
-                            <a className="block px-4 py-2">Loading tokens...</a>
-                          </li>
-                        ) : (
-                          filteredBalances?.map(token => (
-                            <li
-                              key={token.coreDenom}
-                              onClick={() => {
-                                setFieldValue('selectedToken', token);
-                                setFieldValue('denom', token.coreDenom);
-                                handleChange('amount.denom', token.coreDenom);
-                                // Reset amount when token changes
-                                setFieldValue('amount', '');
-                                handleChange('amount.amount', '');
-                              }}
-                              className="hover:bg-[#E0E0FF33] dark:hover:bg-[#FFFFFF0F] cursor-pointer rounded-lg"
-                              aria-label={token.metadata?.display}
-                            >
-                              <a className="flex flex-row items-center gap-2 px-2 py-2">
-                                <DenomImage denom={token?.metadata} />
-                                <span className="truncate">
-                                  {token.metadata?.display.startsWith('factory')
-                                    ? token.metadata?.display.split('/').pop()?.toUpperCase()
-                                    : truncateString(
-                                        token.metadata?.display ?? '',
-                                        10
-                                      ).toUpperCase()}
-                                </span>
-                              </a>
-                            </li>
-                          ))
-                        )}
-                      </ul>
-                    </div>
-                  </div>
-                </div>
-                <div className="text-xs mt-1 flex justify-between text-[#00000099] dark:text-[#FFFFFF99]">
-                  <div className="flex flex-row gap-1 ml-1">
-                    <span>
-                      Balance:{' '}
-                      {values.selectedToken
-                        ? (() => {
-                            const exponent =
-                              values.selectedToken.metadata?.denom_units[1]?.exponent ?? 6;
-                            const amount = Number(
-                              shiftDigits(values.selectedToken.amount, -exponent)
-                            ).toLocaleString(undefined, {
-                              maximumFractionDigits: exponent,
-                            });
-                            return Number(amount) < 0.01 ? '< 0.01' : amount;
-                          })()
-                        : '0'}
-                    </span>
-
-                    <span className="">
-                      {(() => {
-                        const tokenDisplayName =
-                          values.selectedToken?.metadata?.display ??
-                          values.selectedToken?.denom ??
-                          'Select';
-                        return tokenDisplayName.startsWith('factory')
-                          ? tokenDisplayName.split('/').pop()?.toUpperCase()
-                          : truncateString(tokenDisplayName, 10).toUpperCase();
-                      })()}
-                    </span>
-                    <button
-                      type="button"
-                      className="text-xs text-primary"
-                      onClick={() => {
-                        if (!values.selectedToken) return;
-
-                        const exponent =
-                          values.selectedToken.metadata?.denom_units[1]?.exponent ?? 6;
-                        const maxAmount =
-                          Number(values.selectedToken.amount) / Math.pow(10, exponent);
-
-                        let adjustedMaxAmount = maxAmount;
-                        if (values.selectedToken.denom === 'umfx') {
-                          adjustedMaxAmount = Math.max(0, maxAmount - 0.1);
-                        }
-
-                        const decimals =
-                          values.selectedToken.metadata?.denom_units[1]?.exponent ?? 6;
-                        const formattedAmount = formatAmount(adjustedMaxAmount, decimals);
-
-                        setFieldValue('amount', formattedAmount);
-
-                        // Set the amount in minimal units
-                        const amountMinimalUnits = new Decimal(formattedAmount)
-                          .times(new Decimal(10).pow(exponent))
-                          .toFixed(0);
-                        handleChange('amount.amount', amountMinimalUnits);
-                      }}
-                    >
-                      MAX
-                    </button>
-                  </div>
-                  {errors.amount && touched.amount && (
-                    <div className="text-red-500 text-xs">{errors.amount}</div>
-                  )}
-                </div>
-              </div>
-
-              {/* Editable To Address Input */}
-              <TextInput
-                label="Send To"
-                name="to_address"
-                placeholder="Enter recipient address"
-                value={values.to_address}
-                onChange={(e: React.ChangeEvent<HTMLInputElement>) => {
-                  const newAddress = e.target.value;
-                  setFieldValue('to_address', newAddress);
-                  handleChange('to_address', newAddress);
-                }}
-                className="input-md w-full"
-                style={{ borderRadius: '12px' }}
-                rightElement={
-                  <button
-                    type="button"
-                    aria-label="contacts-btn"
-                    onClick={() => {
-                      (document.getElementById('message_edit_modal') as HTMLDialogElement)?.close();
-                      setIsContactsOpen(true);
-                    }}
-                    className="btn btn-primary btn-sm text-white"
-                  >
-                    <MdContacts className="w-5 h-5" />
-                  </button>
-                }
-              />
-              {/* Fixed From Address Input */}
-              <TextInput
-                label="From Address"
-                name="from_address"
-                value={policyAddress}
-                className="input-md w-full"
-                style={{ borderRadius: '12px' }}
-                disabled={true}
-              />
-            </div>
-            {/* Display validation errors */}
-            {Object.keys(errors).map(key => {
-              const errorKey = key as keyof typeof errors;
-              const touchedKey = key as keyof typeof touched;
-              return touched[touchedKey] && errors[errorKey] ? (
-                <div key={key} className="text-red-500 text-xs">
-                  {typeof errors[errorKey] === 'string'
-                    ? (errors[errorKey] as string)
-                    : JSON.stringify(errors[errorKey])}
-                </div>
-              ) : null;
-            })}
-          </Form>
-        )}
-      </Formik>
-      <TailwindModal
-        isOpen={isContactsOpen}
-        setOpen={setIsContactsOpen}
-        showContacts={true}
-        showMessageEditModal={true}
-        onSelect={(selectedAddress: string) => {
-          // Update only the to_address
-          handleChange('to_address', selectedAddress);
-          setIsContactsOpen(false);
-        }}
-        currentAddress={currentAddress}
-      />
-    </div>
-  );
-};
diff --git a/components/groups/forms/proposals/ProposalMetadataForm.tsx b/components/groups/forms/proposals/ProposalMetadataForm.tsx
deleted file mode 100644
index 039d1c97..00000000
--- a/components/groups/forms/proposals/ProposalMetadataForm.tsx
+++ /dev/null
@@ -1,131 +0,0 @@
-import React, { useState } from 'react';
-import { Formik, Form } from 'formik';
-import Yup from '@/utils/yupExtensions';
-import { ProposalFormData, ProposalAction } from '@/helpers/formReducer';
-import { TextInput, TextArea } from '@/components/react/inputs';
-
-const ProposalSchema = Yup.object().shape({
-  title: Yup.string()
-    .required('Title is required')
-    .max(50, 'Title must not exceed 50 characters')
-    .noProfanity('Profanity is not allowed'),
-  authors: Yup.string()
-    .required('Authors are required')
-    .max(200, 'Authors must not exceed 200 characters')
-    .noProfanity('Profanity is not allowed'),
-  summary: Yup.string()
-    .required('Summary is required')
-    .min(10, 'Summary must be at least 10 characters')
-    .max(500, 'Summary must not exceed 500 characters')
-    .noProfanity('Profanity is not allowed'),
-  details: Yup.string()
-    .required('Details are required')
-    .min(10, 'Details must be at least 10 characters')
-    .max(500, 'Summary must not exceed 500 characters')
-    .noProfanity('Profanity is not allowed'),
-});
-
-export default function ProposalMetadataForm({
-  nextStep,
-  prevStep,
-  formData,
-  dispatch,
-}: Readonly<{
-  nextStep: () => void;
-  prevStep: () => void;
-  formData: ProposalFormData;
-  dispatch: React.Dispatch<ProposalAction>;
-}>) {
-  const handleChange = (field: keyof ProposalFormData['metadata'], value: any) => {
-    dispatch({
-      type: 'UPDATE_FIELD',
-      field: 'metadata',
-      value: {
-        ...formData.metadata,
-        [field]: value,
-      },
-    });
-  };
-  const [isValid, setIsValid] = useState(false);
-
-  return (
-    <section className="">
-      <div className="lg:flex mx-auto">
-        <div className="flex items-center mx-auto w-full dark:bg-[#FFFFFF0F] bg-[#FFFFFFCC] p-[24px] rounded-[24px]">
-          <div className="w-full">
-            <h1 className="mb-4 text-xl font-extrabold tracking-tight sm:mb-6 leading-tight border-b-[0.5px] dark:text-[#FFFFFF99] dark:border-[#FFFFFF99] border-b-[black] pb-4">
-              Proposal Metadata
-            </h1>
-            <Formik
-              initialValues={formData.metadata}
-              validationSchema={ProposalSchema}
-              onSubmit={nextStep}
-              validateOnChange={true}
-            >
-              {({ setFieldValue, isValid }) => {
-                setIsValid(isValid);
-
-                return (
-                  <Form className="min-h-[330px] flex flex-col gap-4">
-                    <TextInput
-                      label="Title"
-                      name="title"
-                      placeholder="Type here"
-                      value={formData.metadata.title}
-                      onChange={(e: React.ChangeEvent<HTMLInputElement>) => {
-                        handleChange('title', e.target.value);
-                        setFieldValue('title', e.target.value);
-                      }}
-                    />
-                    <TextInput
-                      label="Authors"
-                      name="authors"
-                      placeholder="Type here"
-                      value={formData.metadata.authors}
-                      onChange={(e: React.ChangeEvent<HTMLInputElement>) => {
-                        handleChange('authors', e.target.value);
-                        setFieldValue('authors', e.target.value);
-                      }}
-                    />
-                    <TextArea
-                      label="Summary"
-                      name="summary"
-                      placeholder="Short Description"
-                      value={formData.metadata.summary}
-                      onChange={(e: React.ChangeEvent<HTMLTextAreaElement>) => {
-                        handleChange('summary', e.target.value);
-                        setFieldValue('summary', e.target.value);
-                      }}
-                    />
-                    <TextArea
-                      label="Details"
-                      name="details"
-                      placeholder="Long Description"
-                      value={formData.metadata.details}
-                      onChange={(e: React.ChangeEvent<HTMLTextAreaElement>) => {
-                        handleChange('details', e.target.value);
-                        setFieldValue('details', e.target.value);
-                      }}
-                    />
-                  </Form>
-                );
-              }}
-            </Formik>
-          </div>
-        </div>
-      </div>
-      <div className="flex gap-6 mt-6 mx-auto w-full">
-        <button onClick={prevStep} className="btn btn-neutral py-2.5 sm:py-3.5 w-[calc(50%-12px)]">
-          <span className="hidden sm:inline">Prev: Messages</span>
-          <span className="sm:hidden">Prev: TXs</span>
-        </button>
-        <button
-          onClick={nextStep}
-          className="w-[calc(50%-12px)] btn py-2.5 sm:py-3.5 btn-gradient text-white disabled:text-black"
-        >
-          Next: Confirmation
-        </button>
-      </div>
-    </section>
-  );
-}
diff --git a/components/groups/forms/proposals/SuccessForm.tsx b/components/groups/forms/proposals/SuccessForm.tsx
deleted file mode 100644
index e0189fd6..00000000
--- a/components/groups/forms/proposals/SuccessForm.tsx
+++ /dev/null
@@ -1,117 +0,0 @@
-import { TruncatedAddressWithCopy } from '@/components/react/addressCopy';
-import { ProposalFormData } from '@/helpers';
-import { useProposalsByPolicyAccount } from '@/hooks';
-import Link from 'next/link';
-import { useRouter } from 'next/router';
-export default function ProposalSuccess({
-  formData,
-}: Readonly<{
-  formData: ProposalFormData;
-}>) {
-  const router = useRouter();
-  const policyAddress = router.query.policyAddress;
-  const renderProposers = () => {
-    if (formData.proposers.startsWith('manifest')) {
-      return <TruncatedAddressWithCopy address={formData.proposers} slice={14} />;
-    } else if (formData.proposers.includes(',')) {
-      return (
-        <div className="grid grid-cols-3 gap-4">
-          {formData.proposers.split(',').map((proposer, index) => (
-            <div
-              key={index}
-              className="dark:bg-[#2A2A38] bg-[#FFFFFF] p-4 rounded-lg flex items-center"
-            >
-              {proposer.trim().startsWith('manifest') ? (
-                <TruncatedAddressWithCopy address={proposer.trim()} slice={14} />
-              ) : (
-                <span>{proposer.trim()}</span>
-              )}
-            </div>
-          ))}
-        </div>
-      );
-    } else {
-      return (
-        <div className="dark:bg-[#2A2A38] bg-[#FFFFFF] p-4 rounded-lg flex items-center">
-          <span>{formData.proposers}</span>
-        </div>
-      );
-    }
-  };
-
-  const { proposals } = useProposalsByPolicyAccount(policyAddress as string);
-  const mostRecentProposalCount = proposals[proposals.length - 1]?.id;
-  return (
-    <section>
-      <div className="w-full dark:bg-[#FFFFFF0F] bg-[#FFFFFFCC] p-[24px] rounded-[24px]">
-        <div className="flex justify-center p-4 rounded-[8px] mb-6 w-full dark:bg-[#FAFAFA1F] bg-[#A087FF1F] items-center">
-          <h1 className="text-xl text-primary font-bold">Proposal Submitted Successfully!</h1>
-        </div>
-
-        <div className="space-y-6">
-          <p className="text-lg mb-2">
-            Your proposal has been successfully submitted to the group.
-          </p>
-          <p className="text-md text-gray-400 mb-6">
-            Group members can now vote on your proposal. The voting period will last for the
-            duration specified in the group&apos;s settings.
-          </p>
-
-          {/* Proposal Details */}
-          <div>
-            <h2 className="text-xl font-semibold mb-4">Proposal Details</h2>
-            <div className="grid grid-cols-2 gap-4">
-              <div className="dark:bg-[#2A2A38] bg-[#FFFFFF] p-4 rounded-lg">
-                <label className="text-sm text-gray-400">TITLE</label>
-                <div>{formData.title}</div>
-              </div>
-              <div className="dark:bg-[#2A2A38] bg-[#FFFFFF] p-4 rounded-lg">
-                <label className="text-sm text-gray-400">SUMMARY</label>
-                <div>{formData.metadata.summary}</div>
-              </div>
-            </div>
-          </div>
-
-          {/* Proposers */}
-          <div className="max-h-28 overflow-y-auto">
-            <h2 className="text-xl font-semibold mb-4">Proposer(s)</h2>
-            {renderProposers()}
-          </div>
-
-          {/* Details */}
-          <div className="max-h-44 overflow-y-auto">
-            <h2 className="text-xl font-semibold mb-4">Details</h2>
-            <div className="dark:bg-[#2A2A38] bg-[#FFFFFF] p-4 rounded-lg">
-              <p>{formData.metadata.details}</p>
-            </div>
-          </div>
-
-          {/* Messages */}
-          <div className="max-h-44 overflow-y-auto">
-            <h2 className="text-xl font-semibold mb-4">Messages</h2>
-            <div className="grid grid-cols-2 gap-4">
-              {formData.messages.map((message, index) => (
-                <div key={index} className="dark:bg-[#2A2A38] bg-[#FFFFFF] p-4 rounded-lg">
-                  <div className="text-sm text-gray-400">Type</div>
-                  <div>{message.type}</div>
-                  {/* You can add more specific message details here if needed */}
-                </div>
-              ))}
-            </div>
-          </div>
-        </div>
-      </div>
-      <div className="flex gap-6 mt-6 mx-auto w-full">
-        <Link href={`/groups?policyAddress=${policyAddress}`} className="w-[calc(50%-12px)]">
-          <button className="btn btn-neutral w-full">Back to Groups Page</button>
-        </Link>
-        <Link
-          href={`/groups?policyAddress=${policyAddress}&proposalId=${mostRecentProposalCount}`}
-          className="w-[calc(50%-12px)]"
-        >
-          <button className="btn btn-gradient w-full text-white">View Proposal</button>
-        </Link>
-      </div>
-    </section>
-  );
-}
diff --git a/components/groups/forms/proposals/__tests__/ConfirmationForm.test.tsx b/components/groups/forms/proposals/__tests__/ConfirmationForm.test.tsx
deleted file mode 100644
index 6244910f..00000000
--- a/components/groups/forms/proposals/__tests__/ConfirmationForm.test.tsx
+++ /dev/null
@@ -1,80 +0,0 @@
-import { afterEach, describe, expect, jest, test, mock, afterAll } from 'bun:test';
-import React from 'react';
-import { cleanup, fireEvent, screen } from '@testing-library/react';
-import ConfirmationModal from '@/components/groups/forms/proposals/ConfirmationForm';
-import matchers from '@testing-library/jest-dom/matchers';
-import { renderWithChainProvider } from '@/tests/render';
-import { mockProposalFormData } from '@/tests/mock';
-
-expect.extend(matchers);
-
-// Mock useFeeEstimation
-mock.module('@/hooks/useFeeEstimation', () => ({
-  useFeeEstimation: jest.fn().mockReturnValue({
-    estimateFee: jest.fn().mockResolvedValue({
-      amount: [{ amount: '5000', denom: 'umfx' }],
-      gas: '200000',
-    }),
-  }),
-}));
-
-mock.module('@/hooks/useIpfs', () => ({
-  useIPFSFetch: jest.fn().mockReturnValue({
-    data: 'mocked data',
-    loading: false,
-    error: null,
-  }),
-  uploadJsonToIPFS: jest.fn(),
-}));
-
-const mockProps = {
-  policyAddress: 'manifest1policy',
-  nextStep: jest.fn(),
-  prevStep: jest.fn(),
-  formData: mockProposalFormData,
-  address: 'cosmos1address',
-};
-
-describe('ConfirmationModal Component', () => {
-  afterEach(cleanup);
-  afterAll(() => {
-    mock.restore();
-  });
-
-  test('renders component with correct details', () => {
-    renderWithChainProvider(<ConfirmationModal {...mockProps} />);
-    expect(screen.getByText(mockProposalFormData.title)).toBeInTheDocument();
-    expect(screen.getByText('manifest1hj5fv...8ws9ct')).toBeInTheDocument();
-
-    expect(screen.getByText('Messages')).toBeInTheDocument();
-    expect(screen.getByText('Type')).toBeInTheDocument();
-    expect(screen.getByText('send')).toBeInTheDocument();
-    expect(screen.getByText('Metadata')).toBeInTheDocument();
-    expect(screen.getByText(mockProposalFormData.metadata.authors)).toBeInTheDocument();
-    expect(screen.getByText(mockProposalFormData.metadata.title)).toBeInTheDocument();
-    expect(screen.getByText(mockProposalFormData.metadata.summary)).toBeInTheDocument();
-    expect(screen.getByText(mockProposalFormData.metadata.details)).toBeInTheDocument();
-  });
-
-  test('calls prevStep when "Prev: Metadata" button is clicked', () => {
-    renderWithChainProvider(<ConfirmationModal {...mockProps} />);
-    const prevButton = screen.getByText('Back: Metadata');
-    fireEvent.click(prevButton);
-    expect(mockProps.prevStep).toHaveBeenCalled();
-  });
-
-  test('disables "Sign Transaction" button when isSigning is true', () => {
-    renderWithChainProvider(<ConfirmationModal {...mockProps} />);
-    const signButton = screen.getByText('Sign Transaction');
-    fireEvent.click(signButton);
-    expect(signButton).toBeDisabled();
-  });
-
-  test('disables "Sign Transaction" button when address is not provided', () => {
-    const propsWithoutAddress = { ...mockProps, address: '' };
-    renderWithChainProvider(<ConfirmationModal {...propsWithoutAddress} />);
-    const signButton = screen.getByText('Sign Transaction');
-    fireEvent.click(signButton);
-    expect(signButton).toBeDisabled();
-  });
-});
diff --git a/components/groups/forms/proposals/__tests__/ProposalDetailsForm.test.tsx b/components/groups/forms/proposals/__tests__/ProposalDetailsForm.test.tsx
deleted file mode 100644
index 1f30161f..00000000
--- a/components/groups/forms/proposals/__tests__/ProposalDetailsForm.test.tsx
+++ /dev/null
@@ -1,103 +0,0 @@
-import { describe, test, afterEach, expect, jest, mock } from 'bun:test';
-import React from 'react';
-import { screen, fireEvent, cleanup, waitFor } from '@testing-library/react';
-import ProposalDetails from '@/components/groups/forms/proposals/ProposalDetailsForm';
-import { renderWithChainProvider } from '@/tests/render';
-import { mockProposalFormData } from '@/tests/mock';
-import matchers from '@testing-library/jest-dom/matchers';
-
-expect.extend(matchers);
-
-// Mock next/router
-const m = jest.fn();
-mock.module('next/router', () => ({
-  useRouter: m.mockReturnValue({
-    query: {},
-    push: jest.fn(),
-  }),
-}));
-
-const mockProps = {
-  nextStep: jest.fn(),
-  formData: mockProposalFormData,
-  dispatch: jest.fn(),
-  address: 'cosmos1address',
-};
-
-describe('ProposalDetails Component', () => {
-  afterEach(() => {
-    cleanup();
-    jest.clearAllMocks();
-  });
-
-  test('renders component with correct details', () => {
-    renderWithChainProvider(<ProposalDetails {...mockProps} />);
-    expect(screen.getByText('Proposal details')).toBeDefined();
-    expect(screen.getByText('Next: Proposal Messages')).toBeDefined();
-  });
-
-  test('updates form fields correctly', async () => {
-    renderWithChainProvider(<ProposalDetails {...mockProps} />);
-    const titleInput = screen.getByLabelText('Proposal Title');
-    fireEvent.change(titleInput, { target: { value: 'New Title' } });
-    await waitFor(() => {
-      expect(mockProps.dispatch).toHaveBeenCalledWith({
-        type: 'UPDATE_FIELD',
-        field: 'title',
-        value: 'New Title',
-      });
-    });
-
-    const proposersInput = screen.getByLabelText('Proposer');
-    fireEvent.change(proposersInput, { target: { value: 'New Proposer' } });
-    await waitFor(() => {
-      expect(mockProps.dispatch).toHaveBeenCalledWith({
-        type: 'UPDATE_FIELD',
-        field: 'proposers',
-        value: 'New Proposer',
-      });
-    });
-
-    const summaryInput = screen.getByLabelText('Summary');
-    fireEvent.change(summaryInput, { target: { value: 'New Summary' } });
-    await waitFor(() => {
-      expect(mockProps.dispatch).toHaveBeenCalledWith({
-        type: 'UPDATE_FIELD',
-        field: 'summary',
-        value: 'New Summary',
-      });
-    });
-  });
-
-  test('next button is enabled when form is valid', () => {
-    renderWithChainProvider(<ProposalDetails {...mockProps} />);
-    const nextButton = screen.getByText('Next: Proposal Messages');
-    expect(nextButton).toBeEnabled();
-  });
-
-  test.skip('next button is disabled when form is invalid', async () => {
-    renderWithChainProvider(<ProposalDetails {...mockProps} />);
-    const titleInput = screen.getByLabelText('Proposers');
-    fireEvent.change(titleInput, { target: { value: '' } });
-    const nextButton = screen.getByText('Next: Proposal Messages');
-    await waitFor(() => expect(nextButton).toBeDisabled());
-  });
-
-  test('next button is enabled when form is valid and dirty', async () => {
-    renderWithChainProvider(<ProposalDetails {...mockProps} />);
-    const titleInput = screen.getByLabelText('Proposal Title');
-    fireEvent.change(titleInput, { target: { value: 'New Title' } });
-    const nextButton = screen.getByText('Next: Proposal Messages');
-    await waitFor(() => expect(nextButton).toBeEnabled());
-  });
-
-  test('calls nextStep when next button is clicked', async () => {
-    renderWithChainProvider(<ProposalDetails {...mockProps} />);
-    const titleInput = screen.getByLabelText('Proposal Title');
-    fireEvent.change(titleInput, { target: { value: 'New Title' } });
-    const nextButton = screen.getByText('Next: Proposal Messages');
-    await waitFor(() => expect(nextButton).toBeEnabled());
-    fireEvent.click(nextButton);
-    expect(mockProps.nextStep).toHaveBeenCalled();
-  });
-});
diff --git a/components/groups/forms/proposals/__tests__/ProposalMessages.test.tsx b/components/groups/forms/proposals/__tests__/ProposalMessages.test.tsx
deleted file mode 100644
index 4968ca73..00000000
--- a/components/groups/forms/proposals/__tests__/ProposalMessages.test.tsx
+++ /dev/null
@@ -1,117 +0,0 @@
-import { describe, test, afterEach, expect, jest, mock } from 'bun:test';
-import React from 'react';
-import { screen, fireEvent, cleanup, waitFor } from '@testing-library/react';
-import ProposalMessages from '@/components/groups/forms/proposals/ProposalMessages';
-import { renderWithChainProvider } from '@/tests/render';
-import { mockProposalFormData } from '@/tests/mock';
-import { SendMessage } from '@/helpers';
-import matchers from '@testing-library/jest-dom/matchers';
-
-expect.extend(matchers);
-
-// Mock next/router
-const m = jest.fn();
-mock.module('next/router', () => ({
-  useRouter: m.mockReturnValue({
-    query: {},
-    push: jest.fn(),
-  }),
-}));
-
-const mockProps = {
-  nextStep: jest.fn(),
-  prevStep: jest.fn(),
-  formData: mockProposalFormData,
-  dispatch: jest.fn(),
-};
-
-describe('ProposalMessages Component', () => {
-  afterEach(() => {
-    cleanup();
-    jest.clearAllMocks();
-  });
-
-  test('renders component with correct details', () => {
-    renderWithChainProvider(<ProposalMessages {...mockProps} />);
-    expect(screen.getByText('Proposal Messages')).toBeDefined();
-    expect(screen.getByText('Next: Proposal Metadata')).toBeDefined();
-    expect(screen.getByText('Prev: Proposal Details')).toBeDefined();
-  });
-
-  test('next button is disabled when form is invalid', () => {
-    const invalidFormData = {
-      ...mockProposalFormData,
-      messages: [
-        {
-          type: 'send',
-          amount: { denom: '', amount: '' },
-          to_address: '',
-          from_address: '',
-        } as SendMessage,
-      ],
-    };
-    renderWithChainProvider(<ProposalMessages {...mockProps} formData={invalidFormData} />);
-    expect(screen.getByText('Next: Proposal Metadata')).toBeDisabled();
-  });
-
-  // TODO: Fix this test
-  // test('next button is enabled when form is valid', async () => {
-  //   renderWithChainProvider(<ProposalMessages {...mockProps} />);
-  //   expect(screen.getByText('Next: Proposal Metadata')).toBeEnabled();
-  // });
-
-  // test('calls nextStep when next button is clicked', () => {
-  //   renderWithChainProvider(<ProposalMessages {...mockProps} />);
-  //   const nextButton = screen.getByText('Next: Proposal Metadata');
-  //   fireEvent.click(nextButton);
-  //   expect(mockProps.nextStep).toHaveBeenCalled();
-  // });
-
-  test('calls prevStep when prev button is clicked', () => {
-    renderWithChainProvider(<ProposalMessages {...mockProps} />);
-    const prevButton = screen.getByText('Prev: Proposal Details');
-    fireEvent.click(prevButton);
-    expect(mockProps.prevStep).toHaveBeenCalled();
-  });
-
-  // TODO: Fix these tests
-  // test('adds and removes messages correctly', async () => {
-  //   renderWithChainProvider(<ProposalMessages {...mockProps} />);
-  //   const addButton = screen.getByLabelText('add-message-btn');
-  //   fireEvent.click(addButton);
-  //   await waitFor(() => {
-  //     expect(mockProps.dispatch).toHaveBeenCalledWith({
-  //       type: 'ADD_MESSAGE',
-  //       message: expect.any(Object),
-  //     });
-  //   });
-  //
-  //   const removeButton = screen.getByLabelText('remove-message-btn');
-  //   fireEvent.click(removeButton);
-  //   await waitFor(() => {
-  //     expect(mockProps.dispatch).toHaveBeenCalledWith({
-  //       type: 'REMOVE_MESSAGE',
-  //       index: expect.any(Number),
-  //     });
-  //   });
-  // });
-  //
-  // test('updates message fields correctly', async () => {
-  //   renderWithChainProvider(<ProposalMessages {...mockProps} />);
-  //   const toggleButton = screen.getByRole('button', {
-  //     name: /toggle message visibility/i,
-  //   });
-  //   fireEvent.click(toggleButton);
-  //   const amountInput = screen.getByLabelText(/amount/i) as HTMLInputElement;
-  //   fireEvent.change(amountInput, { target: { value: '200' } });
-  //   await waitFor(() => {
-  //     expect(mockProps.dispatch).toHaveBeenCalledWith({
-  //       type: 'UPDATE_MESSAGE',
-  //       index: expect.any(Number),
-  //       message: expect.objectContaining({
-  //         amount: expect.objectContaining({ amount: '200' }),
-  //       }),
-  //     });
-  //   });
-  // });
-});
diff --git a/components/groups/forms/proposals/__tests__/ProposalMetadataForm.test.tsx b/components/groups/forms/proposals/__tests__/ProposalMetadataForm.test.tsx
deleted file mode 100644
index fa186965..00000000
--- a/components/groups/forms/proposals/__tests__/ProposalMetadataForm.test.tsx
+++ /dev/null
@@ -1,124 +0,0 @@
-import { describe, test, afterEach, expect, jest } from 'bun:test';
-import React from 'react';
-import { screen, fireEvent, cleanup, waitFor } from '@testing-library/react';
-import ProposalMetadataForm from '@/components/groups/forms/proposals/ProposalMetadataForm';
-import { renderWithChainProvider } from '@/tests/render';
-import { mockProposalFormData } from '@/tests/mock';
-
-const mockProps = {
-  nextStep: jest.fn(),
-  prevStep: jest.fn(),
-  formData: mockProposalFormData,
-  dispatch: jest.fn(),
-};
-
-// TODO: This test suite is throwing
-//    Warning: Cannot update a component (`ProposalMetadataForm`) while rendering a different component (`Formik`). To locate the bad setState() call inside `Formik`, follow the stack trace as described in https://reactjs.org/link/setstate-in-render
-//        at Formik (node_modules/formik/dist/formik.cjs.development.js:1077:19)
-//        at div
-//        at div
-//        at div
-//        at section
-//        at ProposalMetadataForm (components/groups/forms/proposals/ProposalMetadataForm.tsx:31:3)
-//        at ToastProvider (contexts/toastContext.tsx:13:43)
-//        at ChainProvider (node_modules/@cosmos-kit/react-lite/cjs/provider.js:8:26)
-//        at SelectedWalletRepoProvider (node_modules/@cosmos-kit/react/cjs/context/useSelectedWalletContext.js:8:64)
-//        at ChainProvider (node_modules/@cosmos-kit/react/cjs/provider.js:11:26)
-//        at QueryClientProvider (node_modules/@tanstack/react-query/build/modern/QueryClientProvider.js:20:3)
-describe('ProposalMetadataForm Component', () => {
-  afterEach(() => {
-    cleanup();
-    jest.clearAllMocks();
-  });
-
-  test('renders form with correct details', () => {
-    renderWithChainProvider(<ProposalMetadataForm {...mockProps} />);
-    expect(screen.getByText('Proposal Metadata')).toBeDefined();
-    expect(screen.getByLabelText('Title')).toBeDefined();
-    expect(screen.getByLabelText('Authors')).toBeDefined();
-    expect(screen.getByLabelText('Summary')).toBeDefined();
-    expect(screen.getByLabelText('Details')).toBeDefined();
-  });
-
-  test('updates form fields correctly', async () => {
-    renderWithChainProvider(<ProposalMetadataForm {...mockProps} />);
-
-    const titleInput = screen.getByLabelText('Title');
-    fireEvent.change(titleInput, { target: { value: 'New Title' } });
-    await waitFor(() => {
-      expect(mockProps.dispatch).toHaveBeenCalledWith({
-        type: 'UPDATE_FIELD',
-        field: 'metadata',
-        value: expect.objectContaining({ title: 'New Title' }),
-      });
-    });
-
-    const authorsInput = screen.getByLabelText('Authors');
-    fireEvent.change(authorsInput, { target: { value: 'New Author' } });
-    await waitFor(() => {
-      expect(mockProps.dispatch).toHaveBeenCalledWith({
-        type: 'UPDATE_FIELD',
-        field: 'metadata',
-        value: expect.objectContaining({ authors: 'New Author' }),
-      });
-    });
-
-    const summaryInput = screen.getByLabelText('Summary');
-    fireEvent.change(summaryInput, { target: { value: 'New Summary' } });
-    await waitFor(() => {
-      expect(mockProps.dispatch).toHaveBeenCalledWith({
-        type: 'UPDATE_FIELD',
-        field: 'metadata',
-        value: expect.objectContaining({ summary: 'New Summary' }),
-      });
-    });
-
-    const detailsInput = screen.getByLabelText('Details');
-    fireEvent.change(detailsInput, { target: { value: 'New Details' } });
-    await waitFor(() => {
-      expect(mockProps.dispatch).toHaveBeenCalledWith({
-        type: 'UPDATE_FIELD',
-        field: 'metadata',
-        value: expect.objectContaining({ details: 'New Details' }),
-      });
-    });
-  });
-
-  test('next button is disabled when form is invalid', async () => {
-    renderWithChainProvider(<ProposalMetadataForm {...mockProps} />);
-    const titleInput = screen.getByLabelText('Title');
-    fireEvent.change(titleInput, { target: { value: '' } });
-    await waitFor(() => {
-      const nextButton = screen.getByText('Next: Confirmation') as HTMLButtonElement;
-      expect(nextButton.disabled).toBe(false);
-    });
-  });
-
-  test('next button is enabled when form is valid and dirty', async () => {
-    renderWithChainProvider(<ProposalMetadataForm {...mockProps} />);
-    const titleInput = screen.getByLabelText('Title');
-    fireEvent.change(titleInput, { target: { value: 'New Title' } });
-    await waitFor(() => {
-      const nextButton = screen.getByText('Next: Confirmation') as HTMLButtonElement;
-      expect(nextButton.disabled).toBe(false);
-    });
-  });
-
-  test('calls nextStep when next button is clicked', async () => {
-    renderWithChainProvider(<ProposalMetadataForm {...mockProps} />);
-    const titleInput = screen.getByLabelText('Title');
-    fireEvent.change(titleInput, { target: { value: 'New Title' } });
-    await waitFor(() => {
-      const nextButton = screen.getByText('Next: Confirmation');
-      fireEvent.click(nextButton);
-      expect(mockProps.nextStep).toHaveBeenCalled();
-    });
-  });
-
-  test('calls prevStep when prev button is clicked', () => {
-    renderWithChainProvider(<ProposalMetadataForm {...mockProps} />);
-    const prevButton = screen.getByText('Prev: Messages');
-    fireEvent.click(prevButton);
-    expect(mockProps.prevStep).toHaveBeenCalled();
-  });
-});
diff --git a/components/groups/forms/proposals/__tests__/SuccessForm.test.tsx b/components/groups/forms/proposals/__tests__/SuccessForm.test.tsx
deleted file mode 100644
index 917c4dc4..00000000
--- a/components/groups/forms/proposals/__tests__/SuccessForm.test.tsx
+++ /dev/null
@@ -1,69 +0,0 @@
-import { describe, test, afterEach, expect, jest, mock, afterAll } from 'bun:test';
-import React from 'react';
-import { screen, cleanup } from '@testing-library/react';
-import ProposalSuccess from '@/components/groups/forms/proposals/SuccessForm';
-import { renderWithChainProvider } from '@/tests/render';
-import { mockProposalFormData } from '@/tests/mock';
-
-// Mock next/router
-const m = jest.fn();
-mock.module('next/router', () => ({
-  useRouter: m.mockReturnValue({
-    query: {},
-    push: jest.fn(),
-  }),
-}));
-
-const mockProps = {
-  formData: mockProposalFormData,
-  prevStep: jest.fn(),
-};
-
-describe('ProposalSuccess Component', () => {
-  afterEach(cleanup);
-  afterAll(() => {
-    mock.restore();
-  });
-
-  test('renders static text correctly', () => {
-    renderWithChainProvider(<ProposalSuccess {...mockProps} />);
-    expect(screen.getByText('Proposal Submitted Successfully!')).toBeDefined();
-    expect(
-      screen.getByText('Your proposal has been successfully submitted to the group.')
-    ).toBeDefined();
-    expect(screen.getByText(/Group members can now vote on your proposal/)).toBeDefined();
-  });
-
-  test('renders dynamic text correctly', () => {
-    renderWithChainProvider(<ProposalSuccess {...mockProps} />);
-    expect(screen.getByText(mockProps.formData.title)).toBeDefined();
-    expect(screen.getByText(mockProps.formData.metadata.summary)).toBeDefined();
-    expect(screen.getByText(mockProps.formData.metadata.details)).toBeDefined();
-    mockProps.formData.messages.forEach(message => {
-      expect(screen.getByText(`${message.type}`)).toBeDefined();
-    });
-  });
-
-  test('renders proposers correctly for single manifest address', () => {
-    const singleProposerProps = {
-      ...mockProps,
-      formData: { ...mockProps.formData, proposers: 'manifest1abc123def456' },
-    };
-    renderWithChainProvider(<ProposalSuccess {...singleProposerProps} />);
-    expect(screen.getByText('manifest1abc12...def456')).toBeDefined();
-  });
-
-  test('renders proposers correctly for non-manifest address', () => {
-    const nonManifestProposerProps = {
-      ...mockProps,
-      formData: { ...mockProps.formData, proposers: 'John Doe' },
-    };
-    renderWithChainProvider(<ProposalSuccess {...nonManifestProposerProps} />);
-    expect(screen.getByText('John Doe')).toBeDefined();
-  });
-
-  test("renders 'Back to Groups Page' button", () => {
-    renderWithChainProvider(<ProposalSuccess {...mockProps} />);
-    expect(screen.getByText('Back to Groups Page')).toBeDefined();
-  });
-});
diff --git a/components/groups/forms/proposals/index.tsx b/components/groups/forms/proposals/index.tsx
deleted file mode 100644
index 67cd11ab..00000000
--- a/components/groups/forms/proposals/index.tsx
+++ /dev/null
@@ -1,5 +0,0 @@
-export * from './ConfirmationForm';
-export * from './ProposalMessages';
-export * from './ProposalMetadataForm';
-export * from './ProposalDetailsForm';
-export * from './messages';
diff --git a/components/groups/forms/proposals/messages.ts b/components/groups/forms/proposals/messages.ts
deleted file mode 100644
index 299305a1..00000000
--- a/components/groups/forms/proposals/messages.ts
+++ /dev/null
@@ -1,173 +0,0 @@
-import {
-  CustomMessage,
-  RemoveValidatorMessage,
-  SendMessage,
-  UpdatePoaParamsMessage,
-} from '@/helpers';
-
-export const initialSendMessage: SendMessage = {
-  type: 'send',
-  from_address: '',
-  to_address: '',
-  amount: { denom: '', amount: '' },
-};
-
-export const initialCustomMessage: CustomMessage = {
-  type: 'customMessage',
-  custom_field: '',
-};
-
-export const initialUpdatePoaParamsMessage: UpdatePoaParamsMessage = {
-  type: 'updatePoaParams',
-  sender: '',
-  params: {
-    admins: [],
-    allow_validator_self_exit: false,
-  },
-};
-
-export const initialRemoveValidatorMessage: RemoveValidatorMessage = {
-  type: 'removeValidator',
-  sender: '',
-  validator_address: '',
-};
-
-// Poa Messages
-export const initialUpdateStakingParamsMessage = {
-  type: 'updateStakingParams',
-  sender: '',
-  params: {
-    unbonding_time: { seconds: BigInt(0), nanos: 0 },
-    max_validators: 0,
-    max_entries: 0,
-    historical_entries: 0,
-    bond_denom: '',
-    min_commission_rate: '',
-  },
-};
-
-export const initialRemovePendingMessage = {
-  type: 'removePending',
-  sender: '',
-  validator_address: '',
-};
-
-export const initialSetPowerMessage = {
-  type: 'setPower',
-  sender: '',
-  validator_address: '',
-  power: BigInt(0),
-  unsafe: true,
-};
-
-// Manifest Messages
-export const initialUpdateManifestParamsMessage = {
-  type: 'updateManifestParams',
-  authority: '',
-  params: {
-    stake_holders: [{ address: '', percentage: 0 }],
-    inflation: {
-      automatic_enabled: true,
-      mint_denom: 'umfx',
-      yearly_amount: BigInt(1000000000),
-    },
-  },
-};
-
-export const initialPayoutStakeholdersMessage = {
-  type: 'payoutStakeholders',
-  authority: '',
-  payout: { denom: '', amount: '' },
-};
-
-// Group Messages
-export const initialUpdateGroupAdminMessage = {
-  type: 'updateGroupAdmin',
-  new_admin: '',
-  group_id: BigInt(0),
-  admin: '',
-};
-
-export const initialUpdateGroupMembersMessage = {
-  type: 'updateGroupMembers',
-  group_id: BigInt(0),
-  admin: '',
-  member_updates: [{ address: '', weight: '', metadata: '', added_at: {} as Date }],
-};
-
-export const initialUpdateGroupMetadataMessage = {
-  type: 'updateGroupMetadata',
-  group_id: BigInt(0),
-  admin: '',
-  metadata: '',
-};
-
-export const initialUpdateGroupPolicyAdminMessage = {
-  type: 'updateGroupPolicyAdmin',
-  new_admin: '',
-  admin: '',
-  address: '',
-};
-
-export const initialCreateGroupWithPolicyMessage = {
-  type: 'createGroupWithPolicy',
-  admin: '',
-  group_metadata: '',
-  group_policy_as_admin: true,
-  group_policy_metadata: '',
-  members: [{ address: '', weight: '', metadata: '', added_at: {} as Date }],
-};
-
-export const initialSubmitProposalMessage = {
-  type: 'submitProposal',
-  proposers: [''],
-  messages: [],
-  metadata: '',
-  address: '',
-  exec: 0,
-};
-
-export const initialVoteMessage = {
-  type: 'vote',
-  voter: '',
-  proposal_id: BigInt(0),
-  option: 1,
-  metadata: '',
-  exec: 0,
-};
-
-export const initialWithdrawProposalMessage = {
-  type: 'withdrawProposal',
-  proposal_id: BigInt(0),
-  address: '',
-};
-
-export const initialExecMessage = {
-  type: 'exec',
-  proposal_id: BigInt(0),
-  signer: '',
-};
-
-export const initialLeaveGroupMessage = {
-  type: 'leaveGroup',
-  group_id: BigInt(0),
-  address: '',
-};
-
-// Cosmos Messages
-export const initialMultiSendMessage = {
-  type: 'multiSend',
-  inputs: [{ address: '', coins: [{ denom: '', amount: '' }] }],
-  outputs: [{ address: '', coins: [{ denom: '', amount: '' }] }],
-};
-
-export const initialSoftwareUpgradeMessage = {
-  type: 'softwareUpgrade',
-  authority: '',
-  plan: { name: '', time: {} as Date, height: BigInt(0), info: '' },
-};
-
-export const initialCancelUpgradeMessage = {
-  type: 'cancelUpgrade',
-  authority: '',
-};
diff --git a/hooks/useQueries.ts b/hooks/useQueries.ts
index 74073ae1..77016e87 100644
--- a/hooks/useQueries.ts
+++ b/hooks/useQueries.ts
@@ -262,34 +262,6 @@ export const useGroupsByAdmin = (admin: string) => {
     refetchGroupByAdmin: groupQuery.refetch,
   };
 };
-
-export const usePoliciesById = (groupId: bigint) => {
-  const { lcdQueryClient } = useLcdQueryClient();
-
-  const fetchGroupInfo = async () => {
-    if (!lcdQueryClient) {
-      throw new Error('LCD Client not ready');
-    }
-    return await lcdQueryClient.cosmos.group.v1.groupPoliciesByGroup({
-      groupId: groupId,
-    });
-  };
-
-  const policyQuery = useQuery({
-    queryKey: ['policyInfo', groupId],
-    queryFn: fetchGroupInfo,
-    enabled: !!lcdQueryClient && !!groupId,
-    staleTime: Infinity,
-  });
-
-  return {
-    policy: policyQuery.data?.group_policies || [],
-    isPolicyLoading: policyQuery.isLoading,
-    isPolicyError: policyQuery.isError,
-    refetchPolicy: policyQuery.refetch,
-  };
-};
-
 export const useCurrentPlan = () => {
   const { lcdQueryClient } = useLcdQueryClient();
 
@@ -314,34 +286,6 @@ export const useCurrentPlan = () => {
     refetchPlan: currentPlanQuery.refetch,
   };
 };
-
-export const useMembersById = (groupId: bigint) => {
-  const { lcdQueryClient } = useLcdQueryClient();
-
-  const fetchGroupInfo = async () => {
-    if (!lcdQueryClient) {
-      throw new Error('LCD Client not ready');
-    }
-    return await lcdQueryClient.cosmos.group.v1.groupMembers({
-      groupId: groupId,
-    });
-  };
-
-  const memberQuery = useQuery({
-    queryKey: ['memberInfo', groupId],
-    queryFn: fetchGroupInfo,
-    enabled: !!lcdQueryClient && !!groupId,
-    staleTime: Infinity,
-  });
-
-  return {
-    members: memberQuery.data?.members || [],
-    isMembersLoading: memberQuery.isLoading,
-    isMembersError: memberQuery.isError,
-    refetchMembers: memberQuery.refetch,
-  };
-};
-
 export const useProposalsByPolicyAccount = (policyAccount: string) => {
   const { lcdQueryClient } = useLcdQueryClient();
 
@@ -585,59 +529,6 @@ export const usePendingValidators = () => {
     refetchPendingValidators: paramsQuery.refetch,
   };
 };
-
-export const useConsensusPower = (address: string) => {
-  const { lcdQueryClient } = usePoaLcdQueryClient();
-
-  const fetchParams = async () => {
-    if (!lcdQueryClient) {
-      throw new Error('LCD Client not ready');
-    }
-    return await lcdQueryClient.strangelove_ventures.poa.v1.consensusPower({
-      validatorAddress: address,
-    });
-  };
-
-  const paramsQuery = useQuery({
-    queryKey: ['consensusPower', address],
-    queryFn: fetchParams,
-    enabled: !!lcdQueryClient && !!address,
-    staleTime: Infinity,
-  });
-
-  return {
-    consensusPower: paramsQuery.data?.consensus_power,
-    isConsensusLoading: paramsQuery.isLoading,
-    isConsensusError: paramsQuery.isError,
-    refetchConsensusPower: paramsQuery.refetch,
-  };
-};
-
-export const useStakingParams = () => {
-  const { lcdQueryClient } = useLcdQueryClient();
-
-  const fetchParams = async () => {
-    if (!lcdQueryClient) {
-      throw new Error('LCD Client not ready');
-    }
-    return await lcdQueryClient.cosmos.staking.v1beta1.params({});
-  };
-
-  const paramsQuery = useQuery({
-    queryKey: ['stakingParams'],
-    queryFn: fetchParams,
-    enabled: !!lcdQueryClient,
-    staleTime: Infinity,
-  });
-
-  return {
-    stakingParams: paramsQuery.data?.params,
-    isParamsLoading: paramsQuery.isLoading,
-    isParamsError: paramsQuery.isError,
-    refetchParams: paramsQuery.refetch,
-  };
-};
-
 export const useValidators = () => {
   const { lcdQueryClient } = useLcdQueryClient();
   const { lcdQueryClient: poaLcdQueryCLient } = usePoaLcdQueryClient();
@@ -719,38 +610,6 @@ export const useTokenFactoryDenoms = (address: string) => {
     refetchDenoms: denomsQuery.refetch,
   };
 };
-
-export const useTokenFactoryDenomMetadata = (denom: string) => {
-  const { lcdQueryClient } = useLcdQueryClient();
-
-  const fetchDenoms = async () => {
-    if (!lcdQueryClient) {
-      throw new Error('LCD Client not ready');
-    }
-    if (!denom) {
-      throw new Error('Creator address not provided');
-    }
-    return await lcdQueryClient.cosmos.bank.v1beta1.denomMetadataByQueryString({
-      denom: denom,
-    });
-  };
-
-  const denomsQuery = useQuery({
-    queryKey: ['metadata', denom],
-    queryFn: fetchDenoms,
-    enabled: !!lcdQueryClient && !!denom,
-    staleTime: 0,
-    refetchOnMount: true,
-    refetchOnWindowFocus: true,
-  });
-  return {
-    metadata: denomsQuery.data,
-    isMetadataLoading: denomsQuery.isLoading,
-    isMetadataError: denomsQuery.isError,
-    refetchMetadata: denomsQuery.refetch,
-  };
-};
-
 export const useTokenFactoryDenomsMetadata = () => {
   const { lcdQueryClient } = useLcdQueryClient();
 
@@ -837,20 +696,6 @@ interface TransactionAmount {
   amount: string;
   denom: string;
 }
-
-interface TransactionMessage {
-  '@type': string;
-  amount: TransactionAmount[];
-  toAddress: string;
-  fromAddress: string;
-}
-
-interface TransactionResponse {
-  height: string;
-  txhash: string;
-  timestamp: string;
-}
-
 export enum HistoryTxType {
   SEND,
   MINT,
diff --git a/pages/groups/submit-proposal/[policyAddress].tsx b/pages/groups/submit-proposal/[policyAddress].tsx
deleted file mode 100644
index e718ffac..00000000
--- a/pages/groups/submit-proposal/[policyAddress].tsx
+++ /dev/null
@@ -1,169 +0,0 @@
-import React, { useState, useReducer } from 'react';
-import { useRouter } from 'next/router';
-import StepIndicator from '@/components/react/StepIndicator';
-import ConfirmationForm from '@/components/groups/forms/proposals/ConfirmationForm';
-import ProposalDetails from '@/components/groups/forms/proposals/ProposalDetailsForm';
-import ProposalMetadataForm from '@/components/groups/forms/proposals/ProposalMetadataForm';
-import ProposalMessages from '@/components/groups/forms/proposals/ProposalMessages';
-import { ProposalFormData, proposalFormDataReducer } from '@/helpers/formReducer';
-import Head from 'next/head';
-import { chainName } from '@/config';
-import { useChain } from '@cosmos-kit/react';
-import Success from '@/components/groups/forms/proposals/SuccessForm';
-import { WalletNotConnected, WalletSection } from '@/components';
-import { FaVoteYea } from 'react-icons/fa';
-
-export default function SubmitProposal() {
-  const [currentStep, setCurrentStep] = useState(1);
-  const router = useRouter();
-  const { policyAddress } = router.query;
-  const { address, isWalletConnected } = useChain(chainName);
-  const initialProposalFormData: ProposalFormData = {
-    title: '',
-    proposers: '',
-    summary: '',
-    messages: [],
-    metadata: {
-      title: '',
-      authors: '',
-      summary: '',
-      details: '',
-    },
-  };
-
-  const [formData, dispatch] = useReducer(proposalFormDataReducer, initialProposalFormData);
-
-  const nextStep = () => {
-    if (currentStep < 5) {
-      setCurrentStep(currentStep + 1);
-    }
-  };
-
-  const prevStep = () => {
-    if (currentStep > 1) {
-      setCurrentStep(currentStep - 1);
-    }
-  };
-
-  const steps = [
-    { label: 'Info', step: 1 },
-    { label: 'Messages', step: 2 },
-    { label: 'Metadata', step: 3 },
-    {
-      label: (
-        <>
-          <span className="hidden sm:inline">Confirmation</span>
-          <span className="sm:hidden">Confirm</span>
-        </>
-      ),
-      step: 4,
-    },
-  ];
-
-  return (
-    <div className="flex flex-col items-center min-h-screen">
-      <Head>
-        <title>Submit a proposal - Alberto</title>
-        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-        <meta name="description" content="Alberto is the gateway to the Manifest Network" />
-        <meta
-          name="keywords"
-          content="crypto, blockchain, application, Cosmos-SDK, Alberto, Manifest Network"
-        />
-        <meta name="author" content="Chandra Station" />
-        <link rel="icon" href="/favicon.ico" />
-
-        <meta property="og:title" content="Submit a proposal - Alberto" />
-        <meta property="og:description" content="Alberto is the gateway to the Manifest Network" />
-        <meta property="og:url" content="https://" />
-        <meta property="og:image" content="https://" />
-        <meta property="og:type" content="website" />
-        <meta property="og:site_name" content="Alberto" />
-
-        <meta name="twitter:card" content="summary_large_image" />
-        <meta name="twitter:title" content="Submit a proposal - Alberto" />
-        <meta name="twitter:description" content="Alberto is the gateway to the Manifest Network" />
-        <meta name="twitter:image" content="https://" />
-        <meta name="twitter:site" content="@" />
-
-        <script type="application/ld+json">
-          {JSON.stringify({
-            '@context': 'https://schema.org',
-            '@type': 'WebPage',
-            name: 'Submit a proposal - Alberto',
-            description: 'Alberto is the gateway to the Manifest Network',
-            url: 'https://',
-            image: 'https://',
-            publisher: {
-              '@type': 'Organization',
-              name: 'Chandra Station',
-              logo: {
-                '@type': 'ImageObject',
-                url: 'https:///img/logo.png',
-              },
-            },
-          })}
-        </script>
-      </Head>
-      {!isWalletConnected ? (
-        <WalletNotConnected
-          description="Use the button below to connect your wallet and submit a proposal."
-          icon={<FaVoteYea className="h-60 w-60 text-primary" />}
-        />
-      ) : (
-        <div className="w-full justify-between space-y-8 min-h-screen items-center animate-fadeIn mt-4 overflow-hidden">
-          {currentStep != 5 && <StepIndicator steps={steps} currentStep={currentStep} />}
-
-          {currentStep === 1 && (
-            <div className="transition-opacity duration-300 animate-fadeIn w-full">
-              <ProposalDetails
-                formData={formData}
-                dispatch={dispatch}
-                nextStep={nextStep}
-                address={address ?? ''}
-              />
-            </div>
-          )}
-          {currentStep === 2 && (
-            <div className="transition-opacity duration-300 animate-fadeIn">
-              <ProposalMessages
-                policyAddress={policyAddress as string}
-                address={address as string}
-                formData={formData}
-                dispatch={dispatch}
-                nextStep={nextStep}
-                prevStep={prevStep}
-              />
-            </div>
-          )}
-          {currentStep === 3 && (
-            <div className="transition-opacity duration-300 animate-fadeIn">
-              <ProposalMetadataForm
-                formData={formData}
-                dispatch={dispatch}
-                nextStep={nextStep}
-                prevStep={prevStep}
-              />
-            </div>
-          )}
-          {currentStep === 4 && (
-            <div className="transition-opacity duration-300 animate-fadeIn">
-              <ConfirmationForm
-                address={address ?? ''}
-                policyAddress={policyAddress as string}
-                formData={formData}
-                prevStep={prevStep}
-                nextStep={nextStep}
-              />
-            </div>
-          )}
-          {currentStep === 5 && (
-            <div className="transition-opacity duration-300 animate-fadeIn">
-              <Success formData={formData} />
-            </div>
-          )}
-        </div>
-      )}
-    </div>
-  );
-}