From 748762161f9a75a81c90256092cb22344c62e6ed Mon Sep 17 00:00:00 2001
From: Nick <ekbatanifard@gmail.com>
Date: Mon, 9 Sep 2024 14:51:30 +0330
Subject: [PATCH 1/3] fix: resolve issue with closing button on the Referanda
 unlock modal

---
 .../src/fullscreen/accountDetails/unlock/Review.tsx         | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/extension-polkagate/src/fullscreen/accountDetails/unlock/Review.tsx b/packages/extension-polkagate/src/fullscreen/accountDetails/unlock/Review.tsx
index cca2b665a..561679db9 100644
--- a/packages/extension-polkagate/src/fullscreen/accountDetails/unlock/Review.tsx
+++ b/packages/extension-polkagate/src/fullscreen/accountDetails/unlock/Review.tsx
@@ -58,7 +58,7 @@ export default function Review ({ address, api, classToUnlock, setDisplayPopup,
   const [txInfo, setTxInfo] = useState<TxInfo | undefined>();
   const [estimatedFee, setEstimatedFee] = useState<Balance>();
   const [params, setParams] = useState<SubmittableExtrinsic<'promise', ISubmittableResult>[]>();
-  const [step, setStep] = useState<number>(STEPS.REVIEW);
+  const [step, setStep] = useState<number>(STEPS.INDEX);
 
   const selectedProxyAddress = selectedProxy?.delegate as unknown as string;
 
@@ -113,7 +113,7 @@ export default function Review ({ address, api, classToUnlock, setDisplayPopup,
     setDisplayPopup(undefined);
   }, [setDisplayPopup]);
 
-  const closeProxy = useCallback(() => setStep(STEPS.REVIEW), []);
+  const closeProxy = useCallback(() => setStep(STEPS.INDEX), []);
 
   return (
     <DraggableModal onClose={onClose} open={show}>
@@ -128,7 +128,7 @@ export default function Review ({ address, api, classToUnlock, setDisplayPopup,
         {isPasswordError &&
           <WrongPasswordAlert />
         }
-        {[STEPS.REVIEW, STEPS.SIGN_QR].includes(step) &&
+        {[STEPS.INDEX, STEPS.SIGN_QR].includes(step) &&
           <>
             <SubTitle label={t('Review')} style={{ paddingTop: isPasswordError ? '10px' : '25px' }} />
             <Container disableGutters sx={{ px: '30px' }}>

From 5703ef00d4975259ad2f1a10d1ffe6389aebb472 Mon Sep 17 00:00:00 2001
From: Amir Ekbatanifard <amiref007@gmail.com>
Date: Wed, 30 Oct 2024 11:49:09 +0330
Subject: [PATCH 2/3] fix: useProxy close button issue (#1617)

---
 .../src/fullscreen/accountDetails/unlock/Review.tsx             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/extension-polkagate/src/fullscreen/accountDetails/unlock/Review.tsx b/packages/extension-polkagate/src/fullscreen/accountDetails/unlock/Review.tsx
index 62b169a93..eee051e7e 100644
--- a/packages/extension-polkagate/src/fullscreen/accountDetails/unlock/Review.tsx
+++ b/packages/extension-polkagate/src/fullscreen/accountDetails/unlock/Review.tsx
@@ -128,7 +128,7 @@ export default function Review ({ address, api, classToUnlock, setDisplayPopup,
         {isPasswordError &&
           <WrongPasswordAlert />
         }
-        {[STEPS.INDEX, STEPS.SIGN_QR].includes(step) &&
+        {[STEPS.INDEX, STEPS.REVIEW, STEPS.SIGN_QR].includes(step) &&
           <>
             <SubTitle label={t('Review')} style={{ paddingTop: isPasswordError ? '10px' : '25px' }} />
             <Container disableGutters sx={{ px: '30px' }}>

From 364dc3cb27b1caafbdea0cf68ec6925cbc6ca442 Mon Sep 17 00:00:00 2001
From: Nick <ekbatanifard@gmail.com>
Date: Sat, 2 Nov 2024 15:23:19 +0330
Subject: [PATCH 3/3] fix: handle close proxy for non input modal

---
 .../fullscreen/accountDetails/unlock/Review.tsx    |  1 +
 .../solo/commonTasks/configurePayee/index.tsx      | 14 +++++++++-----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/packages/extension-polkagate/src/fullscreen/accountDetails/unlock/Review.tsx b/packages/extension-polkagate/src/fullscreen/accountDetails/unlock/Review.tsx
index eee051e7e..d01869e24 100644
--- a/packages/extension-polkagate/src/fullscreen/accountDetails/unlock/Review.tsx
+++ b/packages/extension-polkagate/src/fullscreen/accountDetails/unlock/Review.tsx
@@ -119,6 +119,7 @@ export default function Review ({ address, api, classToUnlock, setDisplayPopup,
     <DraggableModal onClose={onClose} open={show}>
       <Grid alignItems='center' container justifyContent='center' maxHeight='650px' overflow='hidden'>
         <ModalTitle
+          closeProxy={closeProxy}
           icon={step === STEPS.PROXY ? faUserAstronaut : faLockOpen}
           onCancel={step === STEPS.PROXY ? closeProxy : onClose}
           setStep={setStep}
diff --git a/packages/extension-polkagate/src/fullscreen/stake/solo/commonTasks/configurePayee/index.tsx b/packages/extension-polkagate/src/fullscreen/stake/solo/commonTasks/configurePayee/index.tsx
index 5ef8850a0..013e5a30b 100644
--- a/packages/extension-polkagate/src/fullscreen/stake/solo/commonTasks/configurePayee/index.tsx
+++ b/packages/extension-polkagate/src/fullscreen/stake/solo/commonTasks/configurePayee/index.tsx
@@ -31,13 +31,17 @@ interface Props {
   setRefresh: React.Dispatch<React.SetStateAction<boolean>>
 }
 
-export const ModalTitle = ({ icon, onCancel, setStep, step, text }: { text: string, onCancel: () => void, setStep?: React.Dispatch<React.SetStateAction<number>>, icon: IconDefinition, step: number }): React.ReactElement<Props> => {
+export const ModalTitle = ({ closeProxy, icon, onCancel, setStep, step, text }: { closeProxy?: () => void, text: string, onCancel: () => void, setStep?: React.Dispatch<React.SetStateAction<number>>, icon: IconDefinition, step: number }): React.ReactElement<Props> => {
   const theme = useTheme();
   const { t } = useTranslation();
 
-  const closeProxy = useCallback(
-    () => setStep && setStep(STEPS.REVIEW)
-    , [setStep]);
+  const _closeProxy = useCallback(() => {
+    if (closeProxy) {
+      return closeProxy();
+    }
+
+    setStep && setStep(STEPS.REVIEW);
+  }, [closeProxy, setStep]);
 
   const onClose = useCallback(() => {
     setStep && setStep(STEPS.INDEX);
@@ -65,7 +69,7 @@ export const ModalTitle = ({ icon, onCancel, setStep, step, text }: { text: stri
             step === STEPS.INDEX
               ? onCancel
               : step === STEPS.PROXY
-                ? closeProxy
+                ? _closeProxy
                 : onClose
           }
         >