diff --git a/components/groups/components/myGroups.tsx b/components/groups/components/myGroups.tsx
index cc356609..93cd7a3c 100644
--- a/components/groups/components/myGroups.tsx
+++ b/components/groups/components/myGroups.tsx
@@ -18,17 +18,17 @@ import { PiInfo } from 'react-icons/pi';
 import { GroupInfo } from '../modals/groupInfo';
 import { MemberManagementModal } from '../modals/memberManagementModal';
 import { useChain } from '@cosmos-kit/react';
-import { useGroupsByMember } from '@/hooks/useQueries';
-import { MemberSDKType } from '@liftedinit/manifestjs/dist/codegen/cosmos/group/v1/types';
 
 export function YourGroups({
   groups,
   proposals,
   isLoading,
+  refetch,
 }: {
   groups: ExtendedQueryGroupsByMemberResponseSDKType;
   proposals: { [policyAddress: string]: ProposalSDKType[] };
   isLoading: boolean;
+  refetch: () => void;
 }) {
   const [searchTerm, setSearchTerm] = useState('');
   const [selectedGroup, setSelectedGroup] = useState<{
@@ -36,13 +36,9 @@ export function YourGroups({
     name: string;
     threshold: string;
   } | null>(null);
-  const [members, setMembers] = useState<MemberSDKType[]>([]);
-  const [groupId, setGroupId] = useState<string>('');
-  const [groupAdmin, setGroupAdmin] = useState<string>('');
 
   const router = useRouter();
   const { address } = useChain('manifest');
-  const { groupByMemberData } = useGroupsByMember(address ?? '');
 
   const filteredGroups = groups.groups.filter(group =>
     (group.ipfsMetadata?.title || 'Untitled Group').toLowerCase().includes(searchTerm.toLowerCase())
@@ -74,31 +70,6 @@ export function YourGroups({
     }
   }, [selectedGroup]);
 
-  useEffect(() => {
-    if (groupByMemberData && selectedGroup?.policyAddress) {
-      const group = groupByMemberData?.groups?.find(
-        g => g?.policies?.length > 0 && g.policies[0]?.address === selectedGroup.policyAddress
-      );
-      if (group) {
-        setMembers(
-          group.members.map(member => ({
-            ...member.member,
-            address: member?.member?.address || '',
-            weight: member?.member?.weight || '0',
-            metadata: member?.member?.metadata || '',
-            added_at: member?.member?.added_at || new Date(),
-            isCoreMember: true,
-            isActive: true,
-            isAdmin: member?.member?.address === group.admin,
-            isPolicyAdmin: member?.member?.address === group.policies[0]?.admin,
-          }))
-        );
-        setGroupId(group.id.toString());
-        setGroupAdmin(group.admin);
-      }
-    }
-  }, [groupByMemberData, selectedGroup?.policyAddress]);
-
   const handleSelectGroup = (policyAddress: string, groupName: string, threshold: string) => {
     setSelectedGroup({ policyAddress, name: groupName || 'Untitled Group', threshold });
     router.push(`/groups?policyAddress=${policyAddress}`, undefined, { shallow: true });
@@ -253,7 +224,7 @@ export function YourGroups({
             group={group}
             address={address ?? ''}
             policyAddress={group.policies[0]?.address ?? ''}
-            onUpdate={() => {}}
+            onUpdate={refetch}
           />
           <MemberManagementModal
             modalId={`member-management-modal-${group.id}`}
diff --git a/components/groups/modals/groupInfo.tsx b/components/groups/modals/groupInfo.tsx
index b1ab15db..65c17bbb 100644
--- a/components/groups/modals/groupInfo.tsx
+++ b/components/groups/modals/groupInfo.tsx
@@ -1,11 +1,11 @@
 import { TruncatedAddressWithCopy } from '@/components/react/addressCopy';
-import { useBalance } from '@/hooks/useQueries';
-import { shiftDigits } from '@/utils';
 import ProfileAvatar from '@/utils/identicon';
 import { ExtendedGroupType } from '@/hooks/useQueries';
 import { UpdateGroupModal } from './updateGroupModal';
 import { ThresholdDecisionPolicySDKType } from '@liftedinit/manifestjs/dist/codegen/cosmos/group/v1/types';
-
+import { useFeeEstimation, useTx } from '@/hooks';
+import { chainName } from '@/config';
+import { cosmos } from '@liftedinit/manifestjs';
 interface GroupInfoProps {
   modalId: string;
   group: ExtendedGroupType | null;
@@ -15,6 +15,9 @@ interface GroupInfoProps {
 }
 
 export function GroupInfo({ modalId, group, policyAddress, address, onUpdate }: GroupInfoProps) {
+  const { tx, isSigning, setIsSigning } = useTx(chainName);
+  const { leaveGroup } = cosmos.group.v1.MessageComposer.withTypeUrl;
+  const { estimateFee } = useFeeEstimation(chainName);
   if (!group || !group.policies || group.policies.length === 0) return null;
 
   const policy = group.policies[0];
@@ -95,6 +98,32 @@ export function GroupInfo({ modalId, group, policyAddress, address, onUpdate }:
     return <InfoItem label="Author" value="Invalid author information" />;
   }
 
+  const handleLeave = async () => {
+    setIsSigning(true);
+
+    try {
+      const msg = leaveGroup({
+        address: address,
+        groupId: group?.id,
+      });
+
+      const fee = await estimateFee(address, [msg]);
+      await tx([msg], {
+        fee,
+        onSuccess: () => {
+          setIsSigning(false);
+          onUpdate();
+          const modal = document.getElementById(modalId) as HTMLDialogElement;
+          if (modal) modal.close();
+        },
+      });
+    } catch (error) {
+      console.error('Error leaving group:', error);
+    } finally {
+      setIsSigning(false);
+    }
+  };
+
   return (
     <dialog id={modalId} className="modal">
       <div className="modal-box bg-secondary rounded-[24px] max-h-['574px'] max-w-[542px] p-6">
@@ -112,16 +141,27 @@ export function GroupInfo({ modalId, group, policyAddress, address, onUpdate }:
 
         <div className="flex justify-between items-center mb-6">
           <span className="text-xl font-semibold text-secondary-content">Info</span>
-          <button
-            aria-label={'update-btn'}
-            className="btn btn-gradient text-white rounded-[12px] h-[52px] w-[140px]"
-            onClick={() => {
-              const modal = document.getElementById('update-group-modal') as HTMLDialogElement;
-              if (modal) modal.showModal();
-            }}
-          >
-            Update
-          </button>
+          <div className="flex items-center space-x-4">
+            <button
+              aria-label={'leave-btn'}
+              className="btn btn-error text-white disabled:bg-red-900 rounded-[12px] h-[52px] w-[140px]"
+              onClick={handleLeave}
+              disabled={isSigning}
+            >
+              {isSigning ? <span className="animate-pulse">Leaving</span> : 'Leave'}
+            </button>
+
+            <button
+              aria-label={'update-btn'}
+              className="btn btn-gradient text-white rounded-[12px] h-[52px] w-[140px]"
+              onClick={() => {
+                const modal = document.getElementById('update-group-modal') as HTMLDialogElement;
+                if (modal) modal.showModal();
+              }}
+            >
+              Update
+            </button>
+          </div>
         </div>
 
         <div className="space-y-4">
diff --git a/pages/groups/index.tsx b/pages/groups/index.tsx
index 76f1a429..a19d6e2e 100644
--- a/pages/groups/index.tsx
+++ b/pages/groups/index.tsx
@@ -19,7 +19,7 @@ export default function Groups() {
   const groupPolicyAddresses =
     groupByMemberData?.groups?.map(group => group.policies[0].address) ?? [];
 
-  const { proposalsByPolicyAccount, isProposalsError, isProposalsLoading } =
+  const { proposalsByPolicyAccount, isProposalsError, isProposalsLoading, refetchProposals } =
     useProposalsByPolicyAccountAll(groupPolicyAddresses ?? []);
 
   const isLoading = isGroupByMemberLoading || isProposalsLoading;
@@ -82,6 +82,7 @@ export default function Groups() {
               groups={groupByMemberData ?? { groups: [] }}
               proposals={proposalsByPolicyAccount}
               isLoading={isLoading}
+              refetch={refetchGroupByMember}
             />
           ) : isError ? (
             <div className="text-center text-error">Error loading groups or proposals</div>
@@ -93,6 +94,7 @@ export default function Groups() {
                 groups={groupByMemberData ?? { groups: [] }}
                 proposals={proposalsByPolicyAccount}
                 isLoading={isLoading}
+                refetch={refetchGroupByMember}
               />
               {selectedPolicyAddress && (
                 <GroupInfo
@@ -104,7 +106,7 @@ export default function Groups() {
                     ) ?? null
                   }
                   address={address ?? ''}
-                  onUpdate={() => {}}
+                  onUpdate={refetchGroupByMember}
                 />
               )}
             </>