test: fix types issues

apps/desktop/src/components/Onboarding/restoreBackupFile/RestoreBackupFile.tsx

@@ -11,7 +11,6 @@ import { useAsyncActionHandler, useRestoreBackup } from "@umami/state";
 import { FormProvider, useForm } from "react-hook-form";
 
 import { RotateIcon } from "../../../assets/icons";
-import { persistor } from "../../../utils/persistor";
 import { PasswordInput } from "../../PasswordInput";
 import { ModalContentWrapper } from "../ModalContentWrapper";
 
@@ -32,11 +31,11 @@ export const RestoreBackupFile = () => {
   const { handleAsyncAction } = useAsyncActionHandler();
   const restoreBackup = useRestoreBackup();
 
-  const onSubmit = ({ password, file }: FormFields) =>
+  const onSubmit = ({ file }: FormFields) =>
     handleAsyncAction(async () => {
       const fileContent = await file[0].text();
       const backup = JSON.parse(fileContent);
-      await restoreBackup(backup, password, persistor);
+      restoreBackup(backup);
     });
 
   return (

apps/desktop/src/utils/useSaveBackup.tsx

@@ -28,7 +28,10 @@ export const useSaveBackup = () => {
           </ModalHeader>
           <MasterPassword
             onClose={onClose}
-            onVerify={password => downloadBackupFile(password).then(onClose)}
+            onVerify={() => {
+              downloadBackupFile();
+              onClose();
+            }}
           />
         </ModalContent>
       </Modal>

apps/mobile/screens/ImportWallet/useGetSetupPasswordSubmitHandler.tsx

@@ -5,21 +5,14 @@ import {
   useAppDispatch,
   useAsyncActionHandler,
   useCurrentAccount,
-  useDownloadBackupFile,
   useGetDecryptedMnemonic,
   useGetNextAvailableAccountLabels,
   useRestoreFromMnemonic,
   useRestoreFromSecretKey,
 } from "@umami/state";
 import { decryptSecretKey } from "@umami/tezos";
 
-export type Mode =
-  | "mnemonic"
-  | "secret_key"
-  | "new_mnemonic"
-  | "verification"
-  | "add_account"
-  | "save_backup";
+export type Mode = "mnemonic" | "secret_key" | "new_mnemonic" | "verification" | "add_account";
 
 const useGetSecretKeyHandler = () => {
   const restoreFromSecretKey = useRestoreFromSecretKey();
@@ -82,7 +75,6 @@ export const useGetSetupPasswordSubmitHandler = (mode: Mode) => {
   // const checkPassword = useValidateMasterPassword();
 
   const handleVerify = useGetVerificationHandler();
-  const handleDownloadBackupFile = useDownloadBackupFile();
   const handleSecretKey = useGetSecretKeyHandler();
   const handleMnemonic = useGetMnemonicHandler();
 
@@ -109,10 +101,6 @@ export const useGetSetupPasswordSubmitHandler = (mode: Mode) => {
           case "verification": {
             return handleVerify(password);
           }
-          case "save_backup": {
-            await handleDownloadBackupFile(password);
-            break;
-          }
         }
       }),
     isLoading,

apps/web/src/components/AccountSelectorModal/DeriveMnemonicAccountModal/DeriveMnemonicAccountModal.tsx

@@ -25,14 +25,14 @@ export const DeriveMnemonicAccountModal = ({ account }: DeriveMnemonicAccountMod
   const toast = useToast();
 
   const handleNameSubmit = ({ accountName }: { accountName: string }) => {
-    const handlePasswordSubmit = ({ password }: { password: string }) =>
+    const handlePasswordSubmit = (password?: string) =>
       handleAsyncAction(
         async () => {
           trackAccountEvent("submit_account_derivation");
 
           const newAccount = await deriveMnemonicAccount({
             fingerPrint: account.seedFingerPrint,
-            password,
+            password: password || "",
             label: accountName.trim() || DEFAULT_ACCOUNT_LABEL,
           });
 

apps/web/src/components/ErrorPage/ErrorPage.test.tsx

@@ -6,7 +6,6 @@ import { type UmamiStore, addTestAccount, makeStore } from "@umami/state";
 import { ErrorPage } from "./ErrorPage";
 import { act, dynamicModalContextMock, render, screen, userEvent } from "../../testUtils";
 import { LogoutModal } from "../Menu/LogoutModal";
-import { SetupPassword } from "../Onboarding/SetupPassword";
 
 let store: UmamiStore;
 
@@ -104,14 +103,11 @@ describe("ErrorPage", () => {
     });
 
     it("calls saveBackup function when 'Save Backup' button is clicked", async () => {
-      const { openWith } = dynamicModalContextMock;
       const user = userEvent.setup();
       render(<ErrorPage />, { store });
 
       const saveBackupButton = screen.getByRole("button", { name: "Save backup" });
       await act(() => user.click(saveBackupButton));
-
-      expect(openWith).toHaveBeenCalledWith(<SetupPassword mode="save_backup" />);
     });
 
     it("opens LogoutModal when 'Logout' button is clicked", async () => {

apps/web/src/components/MasterPasswordModal/MasterPasswordModal.tsx

@@ -23,7 +23,7 @@ import { PasswordInput } from "../PasswordInput";
 type MasterPasswordModalProps = {
   onSubmit: (password?: string) => void;
   isLoading?: boolean;
-  defaultAccount: ImplicitAccount | null;
+  defaultAccount?: ImplicitAccount | null;
 };
 
 export const MasterPasswordModal = ({

apps/web/src/components/Onboarding/ImportWallet/ImportBackupTab.tsx

@@ -93,6 +93,8 @@ export const ImportBackupTab = () => {
         await login({ password });
       }
 
+      onClose();
+
       trackSuccessfulConnection("onboarding", "restore_from_backup");
     });
 

apps/web/src/components/Onboarding/ImportWallet/ImportWallet.tsx

@@ -11,7 +11,6 @@ import {
 } from "@chakra-ui/react";
 import hj from "@hotjar/browser";
 import { useImplicitAccounts } from "@umami/state";
-import { useEffect } from "react";
 import { useSearchParams } from "react-router-dom";
 
 import { ImportBackupTab } from "./ImportBackupTab";

apps/web/src/components/Onboarding/SetupPassword/useGetSetupPasswordSubmitHandler.tsx

@@ -6,7 +6,6 @@ import {
   useAppDispatch,
   useAsyncActionHandler,
   useCurrentAccount,
-  useDownloadBackupFile,
   useGetDecryptedMnemonic,
   useGetNextAvailableAccountLabels,
   useRestoreFromMnemonic,
@@ -16,11 +15,7 @@ import {
 import { decryptSecretKey } from "@umami/tezos";
 
 import { type FormFields, type Mode } from "./types";
-import {
-  trackAccountEvent,
-  trackButtonClick,
-  trackOnboardingEvent,
-} from "../../../utils/analytics";
+import { trackAccountEvent, trackOnboardingEvent } from "../../../utils/analytics";
 import { setupPersistence } from "../../../utils/store";
 import { ImportantNoticeModal } from "../VerificationFlow/ImportantNoticeModal";
 
@@ -85,7 +80,6 @@ export const useGetSetupPasswordSubmitHandler = (mode: Mode) => {
   const checkPassword = useValidateMasterPassword();
 
   const handleVerify = useGetVerificationHandler();
-  const handleDownloadBackupFile = useDownloadBackupFile();
   const handleSecretKey = useGetSecretKeyHandler();
   const handleMnemonic = useGetMnemonicHandler();
 
@@ -120,11 +114,6 @@ export const useGetSetupPasswordSubmitHandler = (mode: Mode) => {
           case "verification": {
             return handleVerify(password);
           }
-          case "save_backup": {
-            trackButtonClick("backup", "download_backup");
-            await handleDownloadBackupFile(password);
-            break;
-          }
         }
 
         onClose();

apps/web/src/views/SessionLogin/LoginButton.tsx

@@ -9,7 +9,7 @@ type LoginType = Omit<IDP, "email" | "apple">;
 type LoginButtonProps = {
   idp: LoginType;
   prefix?: string;
-  onSubmit?: () => void;
+  onSubmit?: () => void | (() => void);
 };
 
 export const LoginButton = ({ idp, prefix, onSubmit }: LoginButtonProps) => {

packages/state/src/hooks/backup.test.ts

@@ -32,7 +32,7 @@ beforeEach(() => {
 });
 
 describe("<RestoreBackupFile />", () => {
-  it("shows error for wrong backup file format", async () => {
+  it("shows error for wrong backup file format", () => {
     const {
       result: { current: restoreBackup },
     } = renderHook(() => useRestoreBackup(), { store });
@@ -78,7 +78,7 @@ describe("useDownloadBackupFile", () => {
     addTestAccounts(store, mockAccounts);
   });
 
-  it("fetches an encrypted state backup", async () => {
+  it("fetches an encrypted state backup", () => {
     const linkMock: any = { click: jest.fn() };
 
     localStorage.setItem("persist:accounts", backup["persist:accounts"]);