Merge pull request #95 from spacemeshos/fix-92-importing-btn

Fix "Import button get stuck"
spacemeshos · Sep 19, 2024 · 8dff7ba · 8dff7ba
2 parents c1e5287 + 85c253f
commit 8dff7ba
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/components/PasswordAlert.tsx b/src/components/PasswordAlert.tsx
@@ -20,12 +20,12 @@ import usePassword from '../store/usePassword';
 
 import PasswordInput from './PasswordInput';
 
-function PasswordAlert(): JSX.Element {
+function PasswordAlert(): JSX.Element | null {
   const [isLoading, setIsLoading] = useState(false);
   const { form } = usePassword();
   const cancelRef = useRef<HTMLButtonElement>(null);
   if (!form.register.password || !form.register.remember) {
-    throw new Error('PasswordAlert: password or remember is not registered');
+    return null;
   }
 
   const onSubmit = async () => {

diff --git a/src/screens/welcome/ImportScreen.tsx b/src/screens/welcome/ImportScreen.tsx
@@ -85,11 +85,11 @@ function ImportScreen(): JSX.Element {
       () => openWallet(walletFileContent, password),
       1
     );
+    setIsLoading(false);
     if (!success) {
       setError('password', { type: 'value', message: 'Invalid password' });
       return;
     }
-    setIsLoading(false);
     navigate('/wallet');
   });