diff --git a/packages/react-app-revamp/components/Share/index.tsx b/packages/react-app-revamp/components/Share/index.tsx
index bc9fbabe6..f37f47a5c 100644
--- a/packages/react-app-revamp/components/Share/index.tsx
+++ b/packages/react-app-revamp/components/Share/index.tsx
@@ -23,6 +23,11 @@ interface ShareDropdownProps {
 
 const ShareDropdown: FC<ShareDropdownProps> = ({ contestName, contestAddress, chain, onMenuStateChange }) => {
   const [isCopied, setIsCopied] = useState(false);
+  const [isOpen, setIsOpen] = useState(false);
+
+  useEffect(() => {
+    onMenuStateChange?.(isOpen);
+  }, [isOpen, onMenuStateChange]);
 
   useEffect(() => {
     if (isCopied) {
@@ -42,8 +47,9 @@ const ShareDropdown: FC<ShareDropdownProps> = ({ contestName, contestAddress, ch
   return (
     <Menu as="div" className="relative inline-block text-left">
       {({ open }) => {
-        onMenuStateChange?.(open);
-
+        if (open !== isOpen) {
+          setIsOpen(open);
+        }
         return (
           <>
             <MediaQuery maxWidth={768}>
diff --git a/packages/react-app-revamp/components/Sort/index.tsx b/packages/react-app-revamp/components/Sort/index.tsx
index c5f921a8c..7eec34de7 100644
--- a/packages/react-app-revamp/components/Sort/index.tsx
+++ b/packages/react-app-revamp/components/Sort/index.tsx
@@ -26,6 +26,11 @@ const Sort: FC<SortProps> = ({ sortOptions, onSortChange, onMenuStateChange }) =
   const pathname = usePathname();
   const router = useRouter();
   const sortByFromQuery = query?.get("sortBy");
+  const [isOpen, setIsOpen] = useState(false);
+
+  useEffect(() => {
+    onMenuStateChange?.(isOpen);
+  }, [isOpen, onMenuStateChange]);
 
   useEffect(() => {
     if (sortByFromQuery) {
@@ -79,7 +84,9 @@ const Sort: FC<SortProps> = ({ sortOptions, onSortChange, onMenuStateChange }) =
   return (
     <Menu as="div" className="relative inline-block text-left w-full md:w-[220px] text-[16px]">
       {({ open }) => {
-        onMenuStateChange?.(open);
+        if (open !== isOpen) {
+          setIsOpen(open);
+        }
 
         return (
           <>
diff --git a/packages/react-app-revamp/components/TokenSearchModal/components/ChainDropdown/index.tsx b/packages/react-app-revamp/components/TokenSearchModal/components/ChainDropdown/index.tsx
index 4f7926a72..d893ba137 100644
--- a/packages/react-app-revamp/components/TokenSearchModal/components/ChainDropdown/index.tsx
+++ b/packages/react-app-revamp/components/TokenSearchModal/components/ChainDropdown/index.tsx
@@ -2,7 +2,7 @@ import { chainsImages } from "@config/wagmi";
 import { Menu, MenuButton, MenuItem, MenuItems, Transition } from "@headlessui/react";
 import { ChevronDownIcon } from "@heroicons/react/24/outline";
 import Image from "next/image";
-import { FC, Fragment, useState } from "react";
+import { FC, Fragment, useEffect, useState } from "react";
 
 export interface Option {
   value: string;
@@ -25,6 +25,11 @@ const TokenSearchModalChainDropdown: FC<ChainDropdownProps> = ({
   onMenuStateChange,
 }) => {
   const [selectedOption, setSelectedOption] = useState<Option>(defaultOption);
+  const [isOpen, setIsOpen] = useState(false);
+
+  useEffect(() => {
+    onMenuStateChange?.(isOpen);
+  }, [isOpen, onMenuStateChange]);
 
   const handleOptionClick = (option: Option) => {
     setSelectedOption(option);
@@ -43,7 +48,9 @@ const TokenSearchModalChainDropdown: FC<ChainDropdownProps> = ({
   return (
     <Menu as="div" className="relative inline-block text-left">
       {({ open }) => {
-        onMenuStateChange?.(open);
+        if (open !== isOpen) {
+          setIsOpen(open);
+        }
 
         return (
           <>
diff --git a/packages/react-app-revamp/components/_pages/Contest/Contest/index.tsx b/packages/react-app-revamp/components/_pages/Contest/Contest/index.tsx
index 80f1ab8a2..7c7b3ae6e 100644
--- a/packages/react-app-revamp/components/_pages/Contest/Contest/index.tsx
+++ b/packages/react-app-revamp/components/_pages/Contest/Contest/index.tsx
@@ -12,9 +12,10 @@ import { useConnectModal } from "@rainbow-me/rainbowkit";
 import { useState } from "react";
 import { useMediaQuery } from "react-responsive";
 import { useAccount } from "wagmi";
+import { useShallow } from "zustand/react/shallow";
 import ContestPrompt from "../components/Prompt";
-import ProposalStatistics from "../components/ProposalStatistics";
 import ContestStickyCards from "../components/StickyCards";
+import ProposalStatistics from "../components/ProposalStatistics";
 
 const ContestTab = () => {
   const contestPrompt = useContestStore(state => state.contestPrompt);
@@ -26,14 +27,32 @@ const ContestTab = () => {
     currentUserQualifiedToSubmit,
     currentUserProposalCount,
     isCurrentUserSubmitQualificationLoading,
-  } = useUserStore(state => state);
-  const { isListProposalsLoading, isListProposalsSuccess } = useProposalStore(state => state);
+  } = useUserStore(
+    useShallow(state => ({
+      contestMaxNumberSubmissionsPerUser: state.contestMaxNumberSubmissionsPerUser,
+      currentUserQualifiedToSubmit: state.currentUserQualifiedToSubmit,
+      currentUserProposalCount: state.currentUserProposalCount,
+      isCurrentUserSubmitQualificationLoading: state.isCurrentUserSubmitQualificationLoading,
+    })),
+  );
+  const { isListProposalsLoading, isListProposalsSuccess } = useProposalStore(
+    useShallow(state => ({
+      isListProposalsLoading: state.isListProposalsLoading,
+      isListProposalsSuccess: state.isListProposalsSuccess,
+    })),
+  );
   const { isLoading: isContestLoading, isSuccess: isContestSuccess } = useContest();
   const {
     isModalOpen: isSubmitProposalModalOpen,
     setIsModalOpen: setIsSubmitProposalModalOpen,
     setIsSuccess: setIsSubmitProposalSuccess,
-  } = useSubmitProposalStore(state => state);
+  } = useSubmitProposalStore(
+    useShallow(state => ({
+      isModalOpen: state.isModalOpen,
+      setIsModalOpen: state.setIsModalOpen,
+      setIsSuccess: state.setIsSuccess,
+    })),
+  );
   const qualifiedToSubmit =
     currentUserQualifiedToSubmit && currentUserProposalCount < contestMaxNumberSubmissionsPerUser;
   const isMobile = useMediaQuery({ maxWidth: 768 });
diff --git a/packages/react-app-revamp/components/_pages/Contest/Parameters/index.tsx b/packages/react-app-revamp/components/_pages/Contest/Parameters/index.tsx
index 54ddf755c..3db815f55 100644
--- a/packages/react-app-revamp/components/_pages/Contest/Parameters/index.tsx
+++ b/packages/react-app-revamp/components/_pages/Contest/Parameters/index.tsx
@@ -53,7 +53,14 @@ const ContestParameters = () => {
     currentUserQualifiedToSubmit,
     currentUserAvailableVotesAmount,
     currentUserTotalVotesAmount,
-  } = useUserStore(state => state);
+  } = useUserStore(
+    useShallow(state => ({
+      contestMaxNumberSubmissionsPerUser: state.contestMaxNumberSubmissionsPerUser,
+      currentUserQualifiedToSubmit: state.currentUserQualifiedToSubmit,
+      currentUserAvailableVotesAmount: state.currentUserAvailableVotesAmount,
+      currentUserTotalVotesAmount: state.currentUserTotalVotesAmount,
+    })),
+  );
   const formattedSubmissionsOpen = moment(submissionsOpen).format("MMMM Do, h:mm a");
   const formattedVotesOpen = moment(votesOpen).format("MMMM Do, h:mm a");
   const formattedVotesClosing = moment(votesClose).format("MMMM Do, h:mm a");
diff --git a/packages/react-app-revamp/components/_pages/Contest/Rewards/components/Create/steps/CreatePool/components/Dropdown/index.tsx b/packages/react-app-revamp/components/_pages/Contest/Rewards/components/Create/steps/CreatePool/components/Dropdown/index.tsx
index ecb519fae..432013889 100644
--- a/packages/react-app-revamp/components/_pages/Contest/Rewards/components/Create/steps/CreatePool/components/Dropdown/index.tsx
+++ b/packages/react-app-revamp/components/_pages/Contest/Rewards/components/Create/steps/CreatePool/components/Dropdown/index.tsx
@@ -20,6 +20,11 @@ const CreateRewardsPoolRecipientsDropdown: FC<CreateRewardsPoolRecipientsDropdow
   onMenuStateChange,
 }) => {
   const [selectedOption, setSelectedOption] = useState<Option>(defaultOption);
+  const [isOpen, setIsOpen] = useState(false);
+
+  useEffect(() => {
+    onMenuStateChange?.(isOpen);
+  }, [isOpen, onMenuStateChange]);
 
   useEffect(() => {
     setSelectedOption(defaultOption);
@@ -33,7 +38,9 @@ const CreateRewardsPoolRecipientsDropdown: FC<CreateRewardsPoolRecipientsDropdow
   return (
     <Menu as="div" className="relative inline-block">
       {({ open }) => {
-        onMenuStateChange?.(open);
+        if (open !== isOpen) {
+          setIsOpen(open);
+        }
 
         return (
           <>
diff --git a/packages/react-app-revamp/components/_pages/Contest/Rewards/index.tsx b/packages/react-app-revamp/components/_pages/Contest/Rewards/index.tsx
index 03ed5bda9..e974239e3 100644
--- a/packages/react-app-revamp/components/_pages/Contest/Rewards/index.tsx
+++ b/packages/react-app-revamp/components/_pages/Contest/Rewards/index.tsx
@@ -52,7 +52,13 @@ const ContestRewards = () => {
   );
   const [isFundRewardsOpen, setIsFundRewardsOpen] = useState(false);
   const [isWithdrawRewardsOpen, setIsWithdrawRewardsOpen] = useState(false);
-  const rewardsStore = useRewardsStore(state => state);
+  const rewardsStore = useRewardsStore(
+    useShallow(state => ({
+      isLoading: state.isLoading,
+      isSuccess: state.isSuccess,
+      rewards: state.rewards,
+    })),
+  );
   const { getContestRewardsModule } = useRewardsModule();
   const { address: accountAddress } = useAccount();
   const creator = contestAuthorEthereumAddress === accountAddress;
diff --git a/packages/react-app-revamp/components/_pages/Contest/components/ProposalStatistics/components/SortDropdown/index.tsx b/packages/react-app-revamp/components/_pages/Contest/components/ProposalStatistics/components/SortDropdown/index.tsx
index 20bb7a001..28f18f943 100644
--- a/packages/react-app-revamp/components/_pages/Contest/components/ProposalStatistics/components/SortDropdown/index.tsx
+++ b/packages/react-app-revamp/components/_pages/Contest/components/ProposalStatistics/components/SortDropdown/index.tsx
@@ -1,6 +1,6 @@
 import { Menu, MenuButton, MenuItem, MenuItems, Transition } from "@headlessui/react";
 import { ChevronDownIcon } from "@heroicons/react/24/outline";
-import { FC, Fragment, useRef, useState } from "react";
+import { FC, Fragment, useEffect, useRef, useState } from "react";
 
 function classNames(...classes: string[]) {
   return classes.filter(Boolean).join(" ");
@@ -22,6 +22,11 @@ interface SortProposalsDropdownProps {
 const SortProposalsDropdown: FC<SortProposalsDropdownProps> = ({ defaultValue, onChange, onMenuStateChange }) => {
   const [selectedValue, setSelectedValue] = useState(defaultValue);
   const menuRef = useRef<HTMLDivElement>(null);
+  const [isOpen, setIsOpen] = useState(false);
+
+  useEffect(() => {
+    onMenuStateChange?.(isOpen);
+  }, [isOpen, onMenuStateChange]);
 
   const handleSelectionChange = (value: string) => {
     setSelectedValue(value);
@@ -33,7 +38,9 @@ const SortProposalsDropdown: FC<SortProposalsDropdownProps> = ({ defaultValue, o
   return (
     <Menu as="div" className="relative inline-block text-left" ref={menuRef}>
       {({ open }) => {
-        onMenuStateChange?.(open);
+        if (open !== isOpen) {
+          setIsOpen(open);
+        }
 
         return (
           <>
diff --git a/packages/react-app-revamp/components/_pages/Contest/components/ProposalStatistics/index.tsx b/packages/react-app-revamp/components/_pages/Contest/components/ProposalStatistics/index.tsx
index 338a1eceb..f54d9f4fc 100644
--- a/packages/react-app-revamp/components/_pages/Contest/components/ProposalStatistics/index.tsx
+++ b/packages/react-app-revamp/components/_pages/Contest/components/ProposalStatistics/index.tsx
@@ -1,14 +1,15 @@
+import { chains } from "@config/wagmi";
+import { extractPathSegments } from "@helpers/extractPath";
+import { useContestStore } from "@hooks/useContest/store";
+import { ContestStateEnum, useContestStateStore } from "@hooks/useContestState/store";
 import { ContestStatus } from "@hooks/useContestStatus/store";
 import useProposal from "@hooks/useProposal";
 import { SortOptions, useProposalStore } from "@hooks/useProposal/store";
+import { usePathname } from "next/navigation";
 import { FC, useMemo } from "react";
+import { useShallow } from "zustand/react/shallow";
 import ProposalStatisticsPanel from "./components/Panel";
 import SortProposalsDropdown from "./components/SortDropdown";
-import { ContestStateEnum, useContestStateStore } from "@hooks/useContestState/store";
-import { useContestStore } from "@hooks/useContest/store";
-import { usePathname } from "next/navigation";
-import { extractPathSegments } from "@helpers/extractPath";
-import { chains } from "@config/wagmi";
 
 interface ProposalStatisticsProps {
   contestStatus: ContestStatus;
@@ -19,9 +20,19 @@ const ProposalStatistics: FC<ProposalStatisticsProps> = ({ contestStatus, onMenu
   const asPath = usePathname();
   const { chainName, address } = extractPathSegments(asPath ?? "");
   const chainId = chains.filter(chain => chain.name.toLowerCase() === chainName.toLowerCase())[0]?.id;
-  const { sortBy, submissionsCount } = useProposalStore(state => state);
+  const { sortBy, submissionsCount } = useProposalStore(
+    useShallow(state => ({
+      sortBy: state.sortBy,
+      submissionsCount: state.submissionsCount,
+    })),
+  );
   const { sortProposalData } = useProposal();
-  const { contestAbi: abi, version } = useContestStore(state => state);
+  const { contestAbi: abi, version } = useContestStore(
+    useShallow(state => ({
+      contestAbi: state.contestAbi,
+      version: state.version,
+    })),
+  );
   const isSubmissionOrVotingOpen =
     contestStatus === ContestStatus.SubmissionOpen || contestStatus === ContestStatus.VotingOpen;
   const contestState = useContestStateStore(state => state.contestState);
diff --git a/packages/react-app-revamp/components/_pages/Contest/components/StickyCards/components/VotingQualifier/index.tsx b/packages/react-app-revamp/components/_pages/Contest/components/StickyCards/components/VotingQualifier/index.tsx
index 37eb2cd5f..fe6852cd6 100644
--- a/packages/react-app-revamp/components/_pages/Contest/components/StickyCards/components/VotingQualifier/index.tsx
+++ b/packages/react-app-revamp/components/_pages/Contest/components/StickyCards/components/VotingQualifier/index.tsx
@@ -1,12 +1,8 @@
 /* eslint-disable react/no-unescaped-entities */
-import ButtonV3, { ButtonSize } from "@components/UI/ButtonV3";
 import { chains } from "@config/wagmi";
 import { extractPathSegments } from "@helpers/extractPath";
-import { useAccountChange } from "@hooks/useAccountChange";
-import { ContractConfig } from "@hooks/useContest";
 import { useContestStore } from "@hooks/useContest/store";
 import { useContestStatusStore } from "@hooks/useContestStatus/store";
-import useUser from "@hooks/useUser";
 import { useUserStore } from "@hooks/useUser/store";
 import { useConnectModal } from "@rainbow-me/rainbowkit";
 import Image from "next/image";
@@ -15,8 +11,8 @@ import Skeleton from "react-loading-skeleton";
 import { useMediaQuery } from "react-responsive";
 import { formatEther } from "viem";
 import { useAccount } from "wagmi";
-import VotingQualifierMessage from "./components/VotingQualifierMessage";
 import { useShallow } from "zustand/react/shallow";
+import VotingQualifierMessage from "./components/VotingQualifierMessage";
 
 const VotingContestQualifier = () => {
   const { anyoneCanVote, charge, isReadOnly } = useContestStore(
@@ -33,7 +29,14 @@ const VotingContestQualifier = () => {
     currentUserTotalVotesAmount,
     isCurrentUserVoteQualificationLoading,
     isCurrentUserVoteQualificationError,
-  } = useUserStore(state => state);
+  } = useUserStore(
+    useShallow(state => ({
+      currentUserAvailableVotesAmount: state.currentUserAvailableVotesAmount,
+      currentUserTotalVotesAmount: state.currentUserTotalVotesAmount,
+      isCurrentUserVoteQualificationLoading: state.isCurrentUserVoteQualificationLoading,
+      isCurrentUserVoteQualificationError: state.isCurrentUserVoteQualificationError,
+    })),
+  );
   const contestStatus = useContestStatusStore(state => state.contestStatus);
   const isMobile = useMediaQuery({ maxWidth: 768 });
   const costToVoteFormatted = formatEther(BigInt(charge?.type.costToVote ?? 0));
diff --git a/packages/react-app-revamp/components/_pages/Create/components/DefaultDropdown/index.tsx b/packages/react-app-revamp/components/_pages/Create/components/DefaultDropdown/index.tsx
index 8a4e6f09a..d01a04627 100644
--- a/packages/react-app-revamp/components/_pages/Create/components/DefaultDropdown/index.tsx
+++ b/packages/react-app-revamp/components/_pages/Create/components/DefaultDropdown/index.tsx
@@ -24,6 +24,11 @@ const CreateDefaultDropdown: FC<CreateDefaultDropdownProps> = ({
   onMenuStateChange,
 }) => {
   const [selectedOption, setSelectedOption] = useState<Option>(defaultOption);
+  const [isOpen, setIsOpen] = useState(false);
+
+  useEffect(() => {
+    onMenuStateChange?.(isOpen);
+  }, [isOpen, onMenuStateChange]);
 
   useEffect(() => {
     setSelectedOption(defaultOption);
@@ -37,7 +42,9 @@ const CreateDefaultDropdown: FC<CreateDefaultDropdownProps> = ({
   return (
     <Menu as="div" className="relative inline-block">
       {({ open }) => {
-        onMenuStateChange?.(open);
+        if (open !== isOpen) {
+          setIsOpen(open);
+        }
 
         return (
           <>
diff --git a/packages/react-app-revamp/components/_pages/Create/components/TemplateDropdown/index.tsx b/packages/react-app-revamp/components/_pages/Create/components/TemplateDropdown/index.tsx
index 8381e4ddc..ed90c47d1 100644
--- a/packages/react-app-revamp/components/_pages/Create/components/TemplateDropdown/index.tsx
+++ b/packages/react-app-revamp/components/_pages/Create/components/TemplateDropdown/index.tsx
@@ -1,4 +1,4 @@
-import React, { FC, useState } from "react";
+import React, { FC, useEffect, useState } from "react";
 import { Menu, MenuButton, MenuItem, MenuItems } from "@headlessui/react";
 import { ChevronDownIcon } from "@heroicons/react/24/outline";
 import { TemplateType } from "../../templates/types";
@@ -23,6 +23,11 @@ const CreateTemplateDropdown: FC<CreateTemplateDropdownProps> = ({
   onMenuStateChange,
 }) => {
   const [selectedOption, setSelectedOption] = useState<TemplateOption | null>(null);
+  const [isOpen, setIsOpen] = useState(false);
+
+  useEffect(() => {
+    onMenuStateChange?.(isOpen);
+  }, [isOpen, onMenuStateChange]);
 
   const handleOptionChange = (option: TemplateOption) => {
     setSelectedOption(option);
@@ -32,7 +37,9 @@ const CreateTemplateDropdown: FC<CreateTemplateDropdownProps> = ({
   return (
     <Menu as="div" className="relative inline-block w-full md:w-[240px]">
       {({ open }) => {
-        onMenuStateChange?.(open);
+        if (open !== isOpen) {
+          setIsOpen(open);
+        }
 
         return (
           <>
diff --git a/packages/react-app-revamp/components/_pages/Create/pages/ContestParams/components/Metadata/components/Dropdown/index.tsx b/packages/react-app-revamp/components/_pages/Create/pages/ContestParams/components/Metadata/components/Dropdown/index.tsx
index a22c10f54..c66d1bb49 100644
--- a/packages/react-app-revamp/components/_pages/Create/pages/ContestParams/components/Metadata/components/Dropdown/index.tsx
+++ b/packages/react-app-revamp/components/_pages/Create/pages/ContestParams/components/Metadata/components/Dropdown/index.tsx
@@ -19,6 +19,11 @@ const ContestParamsMetadataFieldsDropdown: FC<ContestParamsMetadataFieldsDropdow
   onMenuStateChange,
 }) => {
   const [selectedOption, setSelectedOption] = useState<Option>(defaultOption);
+  const [isOpen, setIsOpen] = useState(false);
+
+  useEffect(() => {
+    onMenuStateChange?.(isOpen);
+  }, [isOpen, onMenuStateChange]);
 
   useEffect(() => {
     setSelectedOption(defaultOption);
@@ -32,7 +37,9 @@ const ContestParamsMetadataFieldsDropdown: FC<ContestParamsMetadataFieldsDropdow
   return (
     <Menu as="div" className="relative inline-block">
       {({ open }) => {
-        onMenuStateChange?.(open);
+        if (open !== isOpen) {
+          setIsOpen(open);
+        }
 
         return (
           <>
diff --git a/packages/react-app-revamp/components/_pages/DialogModalProposal/index.tsx b/packages/react-app-revamp/components/_pages/DialogModalProposal/index.tsx
index e1ddff56b..53f5cfc4c 100644
--- a/packages/react-app-revamp/components/_pages/DialogModalProposal/index.tsx
+++ b/packages/react-app-revamp/components/_pages/DialogModalProposal/index.tsx
@@ -17,6 +17,7 @@ import { COMMENTS_VERSION, ProposalData } from "lib/proposal";
 import Image from "next/image";
 import { FC, useEffect } from "react";
 import { useAccount } from "wagmi";
+import { useShallow } from "zustand/react/shallow";
 import ListProposalVotes from "../ListProposalVotes";
 
 interface DialogModalProposalProps {
@@ -58,12 +59,17 @@ const DialogModalProposal: FC<DialogModalProposalProps> = ({
   const contestStatus = useContestStatusStore(state => state.contestStatus);
   const { isConnected } = useAccount();
   const { isSuccess } = useCastVotes();
-  const { listProposalsIds } = useProposalStore(state => state);
+  const listProposalsIds = useProposalStore(state => state.listProposalsIds);
   const stringifiedProposalsIds = listProposalsIds.map(id => id.toString());
   const currentIndex = stringifiedProposalsIds.indexOf(proposalId);
   const totalProposals = listProposalsIds.length;
   const downvotingAllowed = useContestStore(state => state.downvotingAllowed);
-  const { currentUserAvailableVotesAmount, currentUserTotalVotesAmount } = useUserStore(state => state);
+  const { currentUserAvailableVotesAmount, currentUserTotalVotesAmount } = useUserStore(
+    useShallow(state => ({
+      currentUserAvailableVotesAmount: state.currentUserAvailableVotesAmount,
+      currentUserTotalVotesAmount: state.currentUserTotalVotesAmount,
+    })),
+  );
   const outOfVotes = currentUserAvailableVotesAmount === 0 && currentUserTotalVotesAmount > 0;
   const commentsAllowed = compareVersions(contestInfo.version, COMMENTS_VERSION) == -1 ? false : true;
 
diff --git a/packages/react-app-revamp/components/_pages/DialogModalSendProposal/Desktop/index.tsx b/packages/react-app-revamp/components/_pages/DialogModalSendProposal/Desktop/index.tsx
index afa314f81..adf441ed6 100644
--- a/packages/react-app-revamp/components/_pages/DialogModalSendProposal/Desktop/index.tsx
+++ b/packages/react-app-revamp/components/_pages/DialogModalSendProposal/Desktop/index.tsx
@@ -15,6 +15,7 @@ import { useSubmitProposalStore } from "@hooks/useSubmitProposal/store";
 import { Editor, EditorContent } from "@tiptap/react";
 import { type GetBalanceReturnType } from "@wagmi/core";
 import { FC, useState } from "react";
+import { useShallow } from "zustand/react/shallow";
 import DialogModalSendProposalMetadataFields from "../components/MetadataFields";
 import DialogModalSendProposalSuccessLayout from "../components/SuccessLayout";
 
@@ -65,9 +66,19 @@ const DialogModalSendProposalDesktopLayout: FC<DialogModalSendProposalDesktopLay
     emailForSubscription,
     emailAlreadyExists,
     setEmailAlreadyExists,
-  } = useSubmitProposalStore(state => state);
+    proposalId,
+  } = useSubmitProposalStore(
+    useShallow(state => ({
+      wantsSubscription: state.wantsSubscription,
+      setWantsSubscription: state.setWantsSubscription,
+      setEmailForSubscription: state.setEmailForSubscription,
+      emailForSubscription: state.emailForSubscription,
+      emailAlreadyExists: state.emailAlreadyExists,
+      setEmailAlreadyExists: state.setEmailAlreadyExists,
+      proposalId: state.proposalId,
+    })),
+  );
   const { isLoading, isSuccess } = useSubmitProposal();
-  const { proposalId } = useSubmitProposalStore(state => state);
   const [emailError, setEmailError] = useState<string | null>(null);
   const insufficientBalance = (accountData?.value ?? 0) < (charge?.type.costToPropose ?? 0);
   const tosHref = FOOTER_LINKS.find(link => link.label === "Terms")?.href;
diff --git a/packages/react-app-revamp/components/_pages/DialogModalSendProposal/Mobile/components/ConfirmDialog/components/InitialContent/index.tsx b/packages/react-app-revamp/components/_pages/DialogModalSendProposal/Mobile/components/ConfirmDialog/components/InitialContent/index.tsx
index 86c6ae761..1d7a347eb 100644
--- a/packages/react-app-revamp/components/_pages/DialogModalSendProposal/Mobile/components/ConfirmDialog/components/InitialContent/index.tsx
+++ b/packages/react-app-revamp/components/_pages/DialogModalSendProposal/Mobile/components/ConfirmDialog/components/InitialContent/index.tsx
@@ -6,6 +6,7 @@ import { Charge } from "@hooks/useDeployContest/types";
 import { useSubmitProposalStore } from "@hooks/useSubmitProposal/store";
 import { type GetBalanceReturnType } from "@wagmi/core";
 import { FC, useState } from "react";
+import { useShallow } from "zustand/react/shallow";
 
 interface SendProposalMobileLayoutConfirmInitialContentProps {
   charge: Charge | null;
@@ -19,7 +20,14 @@ const SendProposalMobileLayoutConfirmInitialContent: FC<SendProposalMobileLayout
   onConfirm,
 }) => {
   const { wantsSubscription, emailForSubscription, setWantsSubscription, setEmailForSubscription } =
-    useSubmitProposalStore(state => state);
+    useSubmitProposalStore(
+      useShallow(state => ({
+        wantsSubscription: state.wantsSubscription,
+        emailForSubscription: state.emailForSubscription,
+        setWantsSubscription: state.setWantsSubscription,
+        setEmailForSubscription: state.setEmailForSubscription,
+      })),
+    );
   const [emailError, setEmailError] = useState<string | null>(null);
   const insufficientBalance = (accountData?.value ?? 0) < (charge?.type.costToPropose ?? 0);
   const tosHref = FOOTER_LINKS.find(link => link.label === "Terms")?.href;
diff --git a/packages/react-app-revamp/components/_pages/DialogModalSendProposal/Mobile/components/ConfirmDialog/index.tsx b/packages/react-app-revamp/components/_pages/DialogModalSendProposal/Mobile/components/ConfirmDialog/index.tsx
index 45afdb5c3..1768bec79 100644
--- a/packages/react-app-revamp/components/_pages/DialogModalSendProposal/Mobile/components/ConfirmDialog/index.tsx
+++ b/packages/react-app-revamp/components/_pages/DialogModalSendProposal/Mobile/components/ConfirmDialog/index.tsx
@@ -4,6 +4,7 @@ import { useSubmitProposalStore } from "@hooks/useSubmitProposal/store";
 import { type GetBalanceReturnType } from "@wagmi/core";
 import Image from "next/image";
 import { FC } from "react";
+import { useShallow } from "zustand/react/shallow";
 import SendProposalMobileLayoutConfirmInitialContent from "./components/InitialContent";
 import SendProposalMobileLayoutConfirmLoadingContent from "./components/LoadingContent";
 
@@ -26,12 +27,18 @@ const DialogModalSendProposalMobileLayoutConfirm: FC<DialogModalSendProposalMobi
   onConfirm,
   onClose,
 }) => {
-  const { isLoading, isSuccess, proposalId } = useSubmitProposalStore(state => state);
+  const { isLoading, isSuccess, proposalId } = useSubmitProposalStore(
+    useShallow(state => ({
+      isLoading: state.isLoading,
+      isSuccess: state.isSuccess,
+      proposalId: state.proposalId,
+    })),
+  );
   const title = isLoading
     ? "approving transaction..."
     : isSuccess && proposalId
-    ? "your submission is live!"
-    : "confirm submission";
+      ? "your submission is live!"
+      : "confirm submission";
 
   if (!isOpen) return null;
 
diff --git a/packages/react-app-revamp/components/_pages/DialogModalSendProposal/Mobile/index.tsx b/packages/react-app-revamp/components/_pages/DialogModalSendProposal/Mobile/index.tsx
index 6ffdcf174..c20f69c17 100644
--- a/packages/react-app-revamp/components/_pages/DialogModalSendProposal/Mobile/index.tsx
+++ b/packages/react-app-revamp/components/_pages/DialogModalSendProposal/Mobile/index.tsx
@@ -12,6 +12,7 @@ import { useSubmitProposalStore } from "@hooks/useSubmitProposal/store";
 import { Editor, EditorContent } from "@tiptap/react";
 import { type GetBalanceReturnType } from "@wagmi/core";
 import { FC, useEffect } from "react";
+import { useShallow } from "zustand/react/shallow";
 import DialogModalSendProposalMetadataFields from "../components/MetadataFields";
 import DialogModalSendProposalMobileLayoutConfirm from "./components/ConfirmDialog";
 
@@ -48,7 +49,15 @@ const DialogModalSendProposalMobileLayout: FC<DialogModalSendProposalMobileLayou
 }) => {
   const { isLoading, error } = useSubmitProposal();
   const { isMobileConfirmModalOpen, setIsMobileConfirmModalOpen, setIsLoading, setIsSuccess, setProposalId } =
-    useSubmitProposalStore(state => state);
+    useSubmitProposalStore(
+      useShallow(state => ({
+        isMobileConfirmModalOpen: state.isMobileConfirmModalOpen,
+        setIsMobileConfirmModalOpen: state.setIsMobileConfirmModalOpen,
+        setIsLoading: state.setIsLoading,
+        setIsSuccess: state.setIsSuccess,
+        setProposalId: state.setProposalId,
+      })),
+    );
   const contestPrompt = useContestStore(state => state.contestPrompt);
   const isInPwaMode = window.matchMedia("(display-mode: standalone)").matches;
   const { isLoading: isMetadataFieldsLoading, isError: isMetadataFieldsError } = useMetadataFields();
diff --git a/packages/react-app-revamp/components/_pages/DialogModalSendProposal/components/SuccessLayout/index.tsx b/packages/react-app-revamp/components/_pages/DialogModalSendProposal/components/SuccessLayout/index.tsx
index 7e241f8bd..b8e47a591 100644
--- a/packages/react-app-revamp/components/_pages/DialogModalSendProposal/components/SuccessLayout/index.tsx
+++ b/packages/react-app-revamp/components/_pages/DialogModalSendProposal/components/SuccessLayout/index.tsx
@@ -26,7 +26,7 @@ const DialogModalSendProposalSuccessLayout: FC<DialogModalSendProposalSuccessLay
 }) => {
   const contestName = useContestStore(state => state.contestName);
   const isMobile = useMediaQuery({ maxWidth: 768 });
-  const { setIsModalOpen } = useSubmitProposalStore(state => state);
+  const setIsModalOpen = useSubmitProposalStore(state => state.setIsModalOpen);
   const [copyText, setCopyText] = useState("copy");
 
   const handleCopy = async () => {
diff --git a/packages/react-app-revamp/components/_pages/DialogModalSendProposal/index.tsx b/packages/react-app-revamp/components/_pages/DialogModalSendProposal/index.tsx
index e1ba250d5..80192a413 100644
--- a/packages/react-app-revamp/components/_pages/DialogModalSendProposal/index.tsx
+++ b/packages/react-app-revamp/components/_pages/DialogModalSendProposal/index.tsx
@@ -54,7 +54,17 @@ export const DialogModalSendProposal: FC<DialogModalSendProposalProps> = ({ isOp
     setWantsSubscription,
     setEmailForSubscription,
     setEmailAlreadyExists,
-  } = useSubmitProposalStore(state => state);
+  } = useSubmitProposalStore(
+    useShallow(state => ({
+      setProposalId: state.setProposalId,
+      setIsMobileConfirmModalOpen: state.setIsMobileConfirmModalOpen,
+      wantsSubscription: state.wantsSubscription,
+      emailForSubscription: state.emailForSubscription,
+      setWantsSubscription: state.setWantsSubscription,
+      setEmailForSubscription: state.setEmailForSubscription,
+      setEmailAlreadyExists: state.setEmailAlreadyExists,
+    })),
+  );
   const { votesOpen, charge } = useContestStore(
     useShallow(state => ({
       votesOpen: state.votesOpen,
diff --git a/packages/react-app-revamp/components/_pages/DialogModalVoteForProposal/index.tsx b/packages/react-app-revamp/components/_pages/DialogModalVoteForProposal/index.tsx
index 8268d8d88..0e2071b56 100644
--- a/packages/react-app-revamp/components/_pages/DialogModalVoteForProposal/index.tsx
+++ b/packages/react-app-revamp/components/_pages/DialogModalVoteForProposal/index.tsx
@@ -27,7 +27,7 @@ export const DialogModalVoteForProposal: FC<DialogModalVoteForProposalProps> = (
       contestPrompt: state.contestPrompt,
     })),
   );
-  const { currentUserAvailableVotesAmount } = useUserStore(state => state);
+  const currentUserAvailableVotesAmount = useUserStore(state => state.currentUserAvailableVotesAmount);
   const { castVotes, isSuccess } = useCastVotes();
   const [readFullEntry, setReadFullEntry] = useState(false);
 
diff --git a/packages/react-app-revamp/components/_pages/ListProposals/index.tsx b/packages/react-app-revamp/components/_pages/ListProposals/index.tsx
index 6334bfab9..dd649035c 100644
--- a/packages/react-app-revamp/components/_pages/ListProposals/index.tsx
+++ b/packages/react-app-revamp/components/_pages/ListProposals/index.tsx
@@ -43,7 +43,18 @@ export const ListProposals = () => {
     submissionsCount,
     totalPagesPaginationProposals,
     listProposalsData,
-  } = useProposalStore(state => state);
+  } = useProposalStore(
+    useShallow(state => ({
+      listProposalsIds: state.listProposalsIds,
+      isPageProposalsLoading: state.isPageProposalsLoading,
+      initialMappedProposalIds: state.initialMappedProposalIds,
+      currentPagePaginationProposals: state.currentPagePaginationProposals,
+      indexPaginationProposals: state.indexPaginationProposals,
+      submissionsCount: state.submissionsCount,
+      totalPagesPaginationProposals: state.totalPagesPaginationProposals,
+      listProposalsData: state.listProposalsData,
+    })),
+  );
   const {
     contestAuthorEthereumAddress,
     contestAbi: abi,
diff --git a/packages/react-app-revamp/components/_pages/ProposalContent/components/ProposalContentAction/index.tsx b/packages/react-app-revamp/components/_pages/ProposalContent/components/ProposalContentAction/index.tsx
index cb602ed15..33bd6bc85 100644
--- a/packages/react-app-revamp/components/_pages/ProposalContent/components/ProposalContentAction/index.tsx
+++ b/packages/react-app-revamp/components/_pages/ProposalContent/components/ProposalContentAction/index.tsx
@@ -39,7 +39,13 @@ const ProposalContentAction: FC<ProposalActionProps> = ({ proposalId, onVotingMo
   const contestStatus = useContestStatusStore(state => state.contestStatus);
   const setPickProposal = useCastVotesStore(state => state.setPickedProposal);
   const { currentUserAvailableVotesAmount, isCurrentUserVoteQualificationLoading, currentUserTotalVotesAmount } =
-    useUserStore(state => state);
+    useUserStore(
+      useShallow(state => ({
+        currentUserAvailableVotesAmount: state.currentUserAvailableVotesAmount,
+        isCurrentUserVoteQualificationLoading: state.isCurrentUserVoteQualificationLoading,
+        currentUserTotalVotesAmount: state.currentUserTotalVotesAmount,
+      })),
+    );
   const canVote = currentUserAvailableVotesAmount > 0;
   const outOfVotes = currentUserTotalVotesAmount > 0 && !canVote;
   const costToVoteFormatted = formatEther(BigInt(charge?.type.costToVote ?? 0));
diff --git a/packages/react-app-revamp/components/_pages/ProposalContent/index.tsx b/packages/react-app-revamp/components/_pages/ProposalContent/index.tsx
index 91d902d85..b012b4ca1 100644
--- a/packages/react-app-revamp/components/_pages/ProposalContent/index.tsx
+++ b/packages/react-app-revamp/components/_pages/ProposalContent/index.tsx
@@ -68,7 +68,7 @@ const ProposalContent: FC<ProposalContentProps> = ({
   const asPath = usePathname();
   const { chainName, address: contestAddress } = extractPathSegments(asPath ?? "");
   const [isVotingModalOpen, setIsVotingModalOpen] = useState(false);
-  const { currentUserAvailableVotesAmount } = useUserStore(state => state);
+  const currentUserAvailableVotesAmount = useUserStore(state => state.currentUserAvailableVotesAmount);
   const votesOpen = useContestStore(state => state.votesOpen);
   const canVote = currentUserAvailableVotesAmount > 0;
   const isProposalTweet = proposal.tweet.isTweet;
diff --git a/packages/react-app-revamp/components/_pages/Submission/Mobile/index.tsx b/packages/react-app-revamp/components/_pages/Submission/Mobile/index.tsx
index e34fc22df..c5020c3d0 100644
--- a/packages/react-app-revamp/components/_pages/Submission/Mobile/index.tsx
+++ b/packages/react-app-revamp/components/_pages/Submission/Mobile/index.tsx
@@ -20,6 +20,7 @@ import { COMMENTS_VERSION, ProposalData } from "lib/proposal";
 import Image from "next/image";
 import { FC } from "react";
 import { useAccount } from "wagmi";
+import { useShallow } from "zustand/react/shallow";
 
 interface SubmissionPageMobileLayoutProps {
   contestInfo: {
@@ -57,9 +58,14 @@ const SubmissionPageMobileLayout: FC<SubmissionPageMobileLayoutProps> = ({
   const { openConnectModal } = useConnectModal();
   const { openAccountModal } = useAccountModal();
   const contestStatus = useContestStatusStore(state => state.contestStatus);
-  const { currentUserAvailableVotesAmount, currentUserTotalVotesAmount } = useUserStore(state => state);
+  const { currentUserAvailableVotesAmount, currentUserTotalVotesAmount } = useUserStore(
+    useShallow(state => ({
+      currentUserAvailableVotesAmount: state.currentUserAvailableVotesAmount,
+      currentUserTotalVotesAmount: state.currentUserTotalVotesAmount,
+    })),
+  );
   const downvotingAllowed = useContestStore(state => state.downvotingAllowed);
-  const { listProposalsIds } = useProposalStore(state => state);
+  const listProposalsIds = useProposalStore(state => state.listProposalsIds);
   const stringifiedProposalsIds = listProposalsIds.map(id => id.toString());
   const currentIndex = stringifiedProposalsIds.indexOf(proposalId);
   const totalProposals = listProposalsIds.length;
diff --git a/packages/react-app-revamp/components/_pages/Submission/index.tsx b/packages/react-app-revamp/components/_pages/Submission/index.tsx
index 99cd75bcc..f10451726 100644
--- a/packages/react-app-revamp/components/_pages/Submission/index.tsx
+++ b/packages/react-app-revamp/components/_pages/Submission/index.tsx
@@ -32,7 +32,7 @@ const SubmissionPage: FC<SubmissionPageProps> = ({ contestInfo, proposalId }) =>
   const isMobile = useMediaQuery({ maxWidth: "768px" });
   const { openConnectModal } = useConnectModal();
   const { castVotes } = useCastVotes();
-  const { listProposalsIds } = useProposalStore(state => state);
+  const listProposalsIds = useProposalStore(state => state.listProposalsIds);
 
   const handleCastVotes = (amount: number, isUpvote: boolean) => {
     castVotes(amount, isUpvote);
diff --git a/packages/react-app-revamp/hooks/useDeleteProposal/index.tsx b/packages/react-app-revamp/hooks/useDeleteProposal/index.tsx
index 83c155383..1bb8fac83 100644
--- a/packages/react-app-revamp/hooks/useDeleteProposal/index.tsx
+++ b/packages/react-app-revamp/hooks/useDeleteProposal/index.tsx
@@ -21,7 +21,12 @@ export function useDeleteProposal() {
   const asPath = usePathname();
   const { chainName, address } = extractPathSegments(asPath ?? "");
   const { removeProposal } = useProposal();
-  const { submissionsCount, setSubmissionsCount } = useProposalStore(state => state);
+  const { submissionsCount, setSubmissionsCount } = useProposalStore(
+    useShallow(state => ({
+      submissionsCount: state.submissionsCount,
+      setSubmissionsCount: state.setSubmissionsCount,
+    })),
+  );
   const {
     isLoading,
     error,
diff --git a/packages/react-app-revamp/hooks/useDistributeRewards/index.tsx b/packages/react-app-revamp/hooks/useDistributeRewards/index.tsx
index 292f3d87b..f3ae94732 100644
--- a/packages/react-app-revamp/hooks/useDistributeRewards/index.tsx
+++ b/packages/react-app-revamp/hooks/useDistributeRewards/index.tsx
@@ -37,20 +37,20 @@ export const useDistributeRewards = (
 ) => {
   const asPath = usePathname();
   const { chainName, address: contestAddress } = extractPathSegments(asPath ?? "");
-  const rewardsStore = useRewardsStore(state => state);
+  const rankings = useRewardsStore(state => state.rewards.payees);
   const { setIsLoading } = useDistributeRewardStore(state => state);
   const { handleError } = useError();
   const { refetch: refetchReleasableRewards } = useReleasableRewards({
     contractAddress: contractRewardsModuleAddress,
     chainId,
     abi: abiRewardsModule,
-    rankings: rewardsStore.rewards.payees,
+    rankings,
   });
   const { refetch: refetchReleasedRewards } = useReleasedRewards({
     contractAddress: contractRewardsModuleAddress,
     chainId,
     abi: abiRewardsModule,
-    rankings: rewardsStore.rewards.payees,
+    rankings,
   });
 
   const handleDistributeRewards = async () => {
diff --git a/packages/react-app-revamp/hooks/useFundRewards/index.ts b/packages/react-app-revamp/hooks/useFundRewards/index.ts
index 43f996a52..cd9f383c3 100644
--- a/packages/react-app-revamp/hooks/useFundRewards/index.ts
+++ b/packages/react-app-revamp/hooks/useFundRewards/index.ts
@@ -66,12 +66,12 @@ export function useFundRewardsModule() {
     })),
   );
   const { error: errorMessage, handleError } = useError();
-  const rewardsStore = useRewardsStore(state => state);
+  const rankings = useRewardsStore(state => state.rewards.payees);
   const { refetch: refetchReleasableRewards } = useReleasableRewards({
     contractAddress: rewardsModuleAddress,
     chainId,
     abi: rewardsAbi ?? [],
-    rankings: rewardsStore.rewards.payees,
+    rankings,
   });
 
   const sendFundsToRewardsModuleV3 = (rewards: FundPoolToken[]) => {
diff --git a/packages/react-app-revamp/hooks/useProposal/index.ts b/packages/react-app-revamp/hooks/useProposal/index.ts
index 7c4e5a991..18aa34fc3 100644
--- a/packages/react-app-revamp/hooks/useProposal/index.ts
+++ b/packages/react-app-revamp/hooks/useProposal/index.ts
@@ -1,6 +1,5 @@
-import { chains, serverConfig } from "@config/wagmi/server";
+import { serverConfig } from "@config/wagmi/server";
 import arrayToChunks from "@helpers/arrayToChunks";
-import { extractPathSegments } from "@helpers/extractPath";
 import { ContractConfig } from "@hooks/useContest";
 import { useError } from "@hooks/useError";
 import { readContracts } from "@wagmi/core";
@@ -8,8 +7,8 @@ import { compareVersions } from "compare-versions";
 import { Result } from "ethers/lib/utils";
 import { COMMENTS_VERSION } from "lib/proposal";
 import { shuffle, sortBy as sortUnique } from "lodash";
-import { usePathname } from "next/navigation";
 import { formatEther } from "viem";
+import { useShallow } from "zustand/react/shallow";
 import { MappedProposalIds, ProposalCore, SortOptions, useProposalStore } from "./store";
 import {
   formatProposalData,
@@ -39,13 +38,27 @@ export function useProposal() {
     setInitialMappedProposalIds,
     initialMappedProposalIds,
     setSortBy,
-  } = useProposalStore(state => state);
-  const asPath = usePathname();
-  const { chainName, address } = extractPathSegments(asPath ?? "");
+  } = useProposalStore(
+    useShallow(state => ({
+      setCurrentPagePaginationProposals: state.setCurrentPagePaginationProposals,
+      setIsPageProposalsLoading: state.setIsPageProposalsLoading,
+      setIsPageProposalsError: state.setIsPageProposalsError,
+      setHasPaginationProposalsNextPage: state.setHasPaginationProposalsNextPage,
+      setProposalData: state.setProposalData,
+      setIsListProposalsLoading: state.setIsListProposalsLoading,
+      setIsListProposalsSuccess: state.setIsListProposalsSuccess,
+      listProposalsData: state.listProposalsData,
+      setListProposalsIds: state.setListProposalsIds,
+      setSubmissionsCount: state.setSubmissionsCount,
+      submissionsCount: state.submissionsCount,
+      setTotalPagesPaginationProposals: state.setTotalPagesPaginationProposals,
+      setIndexPaginationProposalPerId: state.setIndexPaginationProposalPerId,
+      setInitialMappedProposalIds: state.setInitialMappedProposalIds,
+      initialMappedProposalIds: state.initialMappedProposalIds,
+      setSortBy: state.setSortBy,
+    })),
+  );
   const { error, handleError } = useError();
-  const chainId = chains.filter(
-    (chain: { name: string }) => chain.name.toLowerCase().replace(" ", "") === chainName.toLowerCase(),
-  )?.[0]?.id;
 
   /**
    * Fetch the data of each proposals in page X
diff --git a/packages/react-app-revamp/hooks/useRewards/index.ts b/packages/react-app-revamp/hooks/useRewards/index.ts
index a7d3eda3a..d47bc82be 100644
--- a/packages/react-app-revamp/hooks/useRewards/index.ts
+++ b/packages/react-app-revamp/hooks/useRewards/index.ts
@@ -22,7 +22,14 @@ export function useRewardsModule() {
     })),
   );
   const { chainName: contestChainName, address: contestAddress } = extractPathSegments(asPath ?? "");
-  const { setRewards, setIsLoading, setError, setIsSuccess } = useRewardsStore(state => state);
+  const { setRewards, setIsLoading, setError, setIsSuccess } = useRewardsStore(
+    useShallow(state => ({
+      setRewards: state.setRewards,
+      setIsLoading: state.setIsLoading,
+      setError: state.setError,
+      setIsSuccess: state.setIsSuccess,
+    })),
+  );
   const { error, handleError } = useError();
   const chainId = chains.filter(
     (chain: { name: string }) => chain.name.toLowerCase().replace(" ", "") === contestChainName.toLowerCase(),
diff --git a/packages/react-app-revamp/hooks/useSubmitProposal/index.ts b/packages/react-app-revamp/hooks/useSubmitProposal/index.ts
index 476fd2052..9e835e3e1 100644
--- a/packages/react-app-revamp/hooks/useSubmitProposal/index.ts
+++ b/packages/react-app-revamp/hooks/useSubmitProposal/index.ts
@@ -77,11 +77,26 @@ export function useSubmitProposal() {
   const rankings = useRewardsStore(state => state.rewards.payees);
   const { error: errorMessage, handleError } = useError();
   const { fetchSingleProposal } = useProposal();
-  const { setSubmissionsCount, submissionsCount } = useProposalStore(state => state);
-  const { increaseCurrentUserProposalCount } = useUserStore(state => state);
+  const { setSubmissionsCount, submissionsCount } = useProposalStore(
+    useShallow(state => ({
+      setSubmissionsCount: state.setSubmissionsCount,
+      submissionsCount: state.submissionsCount,
+    })),
+  );
+  const increaseCurrentUserProposalCount = useUserStore(state => state.increaseCurrentUserProposalCount);
   const { getProofs } = useGenerateProof();
   const { isLoading, isSuccess, error, setIsLoading, setIsSuccess, setError, setTransactionData } =
-    useSubmitProposalStore(state => state);
+    useSubmitProposalStore(
+      useShallow(state => ({
+        isLoading: state.isLoading,
+        isSuccess: state.isSuccess,
+        error: state.error,
+        setIsLoading: state.setIsLoading,
+        setIsSuccess: state.setIsSuccess,
+        setError: state.setError,
+        setTransactionData: state.setTransactionData,
+      })),
+    );
   const { fields: metadataFields, setFields: setMetadataFields } = useMetadataStore(
     useShallow(state => ({
       fields: state.fields,
diff --git a/packages/react-app-revamp/hooks/useUser/index.ts b/packages/react-app-revamp/hooks/useUser/index.ts
index c4beec3c0..d5c8a48e5 100644
--- a/packages/react-app-revamp/hooks/useUser/index.ts
+++ b/packages/react-app-revamp/hooks/useUser/index.ts
@@ -9,6 +9,7 @@ import { fetchUserBalance } from "lib/fetchUserBalance";
 import { usePathname } from "next/navigation";
 import { Abi, parseEther } from "viem";
 import { useAccount } from "wagmi";
+import { useShallow } from "zustand/react/shallow";
 import { useUserStore } from "./store";
 
 export const EMPTY_ROOT = "0x0000000000000000000000000000000000000000000000000000000000000000";
@@ -35,14 +36,29 @@ export function useUser() {
     setCurrentUserTotalVotesAmount,
     setCurrentUserProposalCount,
     setCurrentuserTotalVotesCast,
-    currentUserTotalVotesAmount,
     setIsCurrentUserSubmitQualificationLoading,
     setIsCurrentUserSubmitQualificationSuccess,
     setIsCurrentUserSubmitQualificationError,
     setIsCurrentUserVoteQualificationLoading,
     setIsCurrentUserVoteQualificationSuccess,
     setIsCurrentUserVoteQualificationError,
-  } = useUserStore(state => state);
+    currentUserTotalVotesAmount,
+  } = useUserStore(
+    useShallow(state => ({
+      setCurrentUserQualifiedToSubmit: state.setCurrentUserQualifiedToSubmit,
+      setCurrentUserAvailableVotesAmount: state.setCurrentUserAvailableVotesAmount,
+      setCurrentUserTotalVotesAmount: state.setCurrentUserTotalVotesAmount,
+      setCurrentUserProposalCount: state.setCurrentUserProposalCount,
+      setCurrentuserTotalVotesCast: state.setCurrentuserTotalVotesCast,
+      setIsCurrentUserSubmitQualificationLoading: state.setIsCurrentUserSubmitQualificationLoading,
+      setIsCurrentUserSubmitQualificationSuccess: state.setIsCurrentUserSubmitQualificationSuccess,
+      setIsCurrentUserSubmitQualificationError: state.setIsCurrentUserSubmitQualificationError,
+      setIsCurrentUserVoteQualificationLoading: state.setIsCurrentUserVoteQualificationLoading,
+      setIsCurrentUserVoteQualificationSuccess: state.setIsCurrentUserVoteQualificationSuccess,
+      setIsCurrentUserVoteQualificationError: state.setIsCurrentUserVoteQualificationError,
+      currentUserTotalVotesAmount: state.currentUserTotalVotesAmount,
+    })),
+  );
 
   const checkIfCurrentUserQualifyToSubmit = async (contractConfig: ContractConfig, version: string) => {
     setIsCurrentUserSubmitQualificationLoading(true);
diff --git a/packages/react-app-revamp/hooks/useWithdrawRewards/index.tsx b/packages/react-app-revamp/hooks/useWithdrawRewards/index.tsx
index 4b0529691..7a444ec00 100644
--- a/packages/react-app-revamp/hooks/useWithdrawRewards/index.tsx
+++ b/packages/react-app-revamp/hooks/useWithdrawRewards/index.tsx
@@ -32,13 +32,13 @@ export const useWithdrawReward = (
   const { chainName, address: contestAddress } = extractPathSegments(asPath ?? "");
   const chainId = chains.filter(chain => chain.name.toLowerCase().replace(" ", "") === chainName.toLowerCase());
   const { setIsLoading } = useWithdrawRewardStore(state => state);
-  const rewardsStore = useRewardsStore(state => state);
+  const rankings = useRewardsStore(state => state.rewards.payees);
   const { handleError } = useError();
   const { refetch: refetchReleasableRewards } = useReleasableRewards({
     contractAddress: contractRewardsModuleAddress,
     chainId: chainId[0].id,
     abi: abiRewardsModule,
-    rankings: rewardsStore.rewards.payees,
+    rankings,
   });
 
   const handleWithdraw = async () => {
diff --git a/packages/react-app-revamp/layouts/LayoutViewContest/index.tsx b/packages/react-app-revamp/layouts/LayoutViewContest/index.tsx
index 9a4315c41..8a3a7b983 100644
--- a/packages/react-app-revamp/layouts/LayoutViewContest/index.tsx
+++ b/packages/react-app-revamp/layouts/LayoutViewContest/index.tsx
@@ -13,6 +13,7 @@ import ContestTabs, { Tab } from "@components/_pages/Contest/components/Tabs";
 import { useShowRewardsStore } from "@components/_pages/Create/pages/ContestDeploying";
 import { ofacAddresses } from "@config/ofac-addresses/ofac-addresses";
 import { ROUTE_CONTEST_PROPOSAL } from "@config/routes";
+import { chains } from "@config/wagmi";
 import { extractPathSegments } from "@helpers/extractPath";
 import { populateBugReportLink } from "@helpers/githubIssue";
 import { MAX_MS_TIMEOUT } from "@helpers/timeout";
@@ -31,7 +32,9 @@ import { useMediaQuery } from "react-responsive";
 import { useAccount, useAccountEffect } from "wagmi";
 import { useShallow } from "zustand/react/shallow";
 import LayoutViewContestError from "./components/Error";
-import { chains } from "@config/wagmi";
+import { generateUrlContest } from "@helpers/share";
+import Image from "next/image";
+import ShareDropdown from "@components/Share";
 
 const LayoutViewContest = ({ children }: { children: React.ReactNode }) => {
   const pathname = usePathname();
@@ -244,8 +247,7 @@ const LayoutViewContest = ({ children }: { children: React.ReactNode }) => {
                       {!isMobile && rewardsModuleAddress && rewardsAbi ? (
                         <ContestRewardsInfo rewardsModuleAddress={rewardsModuleAddress} rewardsAbi={rewardsAbi} />
                       ) : null}
-                      {/* TODO: Share button */}
-                      {/* {isMobile ? (
+                      {isMobile ? (
                         <div
                           className="w-8 h-8 flex-shrink-0 flex items-center justify-center rounded-[10px] border border-neutral-11 cursor-pointer"
                           onClick={() =>
@@ -263,7 +265,7 @@ const LayoutViewContest = ({ children }: { children: React.ReactNode }) => {
                           contestName={contestName}
                           onMenuStateChange={setFadeBg}
                         />
-                      )} */}
+                      )}
 
                       <div
                         className="standalone-pwa w-8 h-8 items-center rounded-[10px] border border-neutral-11 cursor-pointer"