From 32a32bee094e12888019d5aeb50e17853890e549 Mon Sep 17 00:00:00 2001
From: Nick <ekbatanifard@gmail.com>
Date: Fri, 29 Mar 2024 20:06:22 +0330
Subject: [PATCH] postpone password setting popup for the onboarding time

---
 .../extension-polkagate/src/components/Loading.tsx | 14 +++++++++++---
 .../popup/passwordManagement/AskToSetPassword.tsx  |  3 +--
 packages/extension-ui/src/Popup/index.tsx          |  3 +--
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/packages/extension-polkagate/src/components/Loading.tsx b/packages/extension-polkagate/src/components/Loading.tsx
index 1f8b0760c..5d8a2ee70 100644
--- a/packages/extension-polkagate/src/components/Loading.tsx
+++ b/packages/extension-polkagate/src/components/Loading.tsx
@@ -111,7 +111,7 @@ const FlyingLogo = ({ theme }: { theme: Theme }) => (
   />
 );
 
-export default function Loading({ children }: Props): React.ReactElement<Props> {
+export default function Loading ({ children }: Props): React.ReactElement<Props> {
   const theme = useTheme();
   const manifest = useManifest();
   const { isExtensionLocked, setExtensionLock } = useExtensionLockContext();
@@ -140,7 +140,14 @@ export default function Loading({ children }: Props): React.ReactElement<Props>
     const handleInitLoginInfo = async () => {
       const info = await getStorage('loginInfo') as LoginInfo;
 
-      if (!info?.status || info?.status === 'reset') {
+      if (!info?.status) {
+        /** To not asking for password setting for the onboarding time */
+        setStorage('loginInfo', { lastLoginTime: Date.now(), status: 'mayBeLater' }).catch(console.error);
+
+        return setExtensionLock(false);
+      }
+
+      if (info?.status === 'reset') {
         return setStep(STEPS.ASK_TO_SET_PASSWORD);
       }
 
@@ -182,7 +189,8 @@ export default function Loading({ children }: Props): React.ReactElement<Props>
     };
 
     handleInitLoginInfo().catch(console.error);
-  }, [setExtensionLock]);
+  // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
 
   const onPassChange = useCallback((pass: string | null): void => {
     if (!pass) {
diff --git a/packages/extension-polkagate/src/popup/passwordManagement/AskToSetPassword.tsx b/packages/extension-polkagate/src/popup/passwordManagement/AskToSetPassword.tsx
index dc68401ed..84155ad5d 100644
--- a/packages/extension-polkagate/src/popup/passwordManagement/AskToSetPassword.tsx
+++ b/packages/extension-polkagate/src/popup/passwordManagement/AskToSetPassword.tsx
@@ -23,8 +23,7 @@ function AskToSetPassword({ setStep }: Props): React.ReactElement {
   const onMayBeLater = useCallback(() => {
     setExtensionLock(false);
 
-    // eslint-disable-next-line @typescript-eslint/no-floating-promises
-    setStorage('loginInfo', { lastLoginTime: Date.now(), status: 'mayBeLater' });
+    setStorage('loginInfo', { lastLoginTime: Date.now(), status: 'mayBeLater' }).catch(console.error);
   }, [setExtensionLock]);
 
   const onNoPassword = useCallback(() => {
diff --git a/packages/extension-ui/src/Popup/index.tsx b/packages/extension-ui/src/Popup/index.tsx
index 760eee71d..12e10c578 100644
--- a/packages/extension-ui/src/Popup/index.tsx
+++ b/packages/extension-ui/src/Popup/index.tsx
@@ -216,8 +216,7 @@ export default function Popup (): React.ReactElement {
       setLoginInfo(info);
     };
 
-    // eslint-disable-next-line @typescript-eslint/no-floating-promises
-    fetchLoginInfo();
+    fetchLoginInfo().catch(console.error);
   }, []);
 
   useEffect((): void => {