test: moved logic to Router.tsx

trilitech · Dec 20, 2024 · cc03870 · cc03870
1 parent 52465f6
commit cc03870
Show file tree

Hide file tree

Showing 5 changed files with 73 additions and 10 deletions.
diff --git a/apps/desktop/public/electron.js b/apps/desktop/public/electron.js
@@ -251,7 +251,9 @@ function createWindow() {
   mainWindow.once("ready-to-show", () => {
     mainWindow.show();
 
-    mainWindow.webContents.send("backupData", backupData);
+    if (backupData) {
+      mainWindow.webContents.send("backupData", backupData);
+    }
 
     if (deeplinkURL) {
       mainWindow.webContents.send("deeplinkURL", deeplinkURL);

diff --git a/apps/desktop/src/Router.tsx b/apps/desktop/src/Router.tsx
@@ -1,4 +1,5 @@
 /* istanbul ignore file */
+import { Flex, Spinner } from "@chakra-ui/react";
 import { DynamicModalContext, useDynamicModal } from "@umami/components";
 import { useDataPolling } from "@umami/data-polling";
 import {
@@ -8,12 +9,13 @@ import {
   useResetBeaconConnections,
 } from "@umami/state";
 import { noop } from "lodash";
-import { useEffect } from "react";
+import { useEffect, useState } from "react";
 import { HashRouter, Navigate, Route, Routes } from "react-router-dom";
 
 import { AnnouncementBanner } from "./components/AnnouncementBanner";
 import { SocialLoginWarningModal } from "./components/SocialLoginWarningModal/SocialLoginWarningModal";
 import { BeaconProvider } from "./utils/beacon/BeaconProvider";
+import { persistor } from "./utils/persistor";
 import { useDeeplinkHandler } from "./utils/useDeeplinkHandler";
 import { AddressBookView } from "./views/addressBook/AddressBookView";
 import { BatchPage } from "./views/batch/BatchPage";
@@ -83,12 +85,60 @@ const LoggedOutRouter = () => {
     WalletClient.destroy().then(resetBeaconConnections).catch(noop);
   }, [resetBeaconConnections]);
 
+  const [isDataLoading] = useState(
+    () => !localStorage.getItem("migration_2_3_3_to_2_3_4_completed")
+  );
+
+  useEffect(() => {
+    if (localStorage.getItem("migration_2_3_3_to_2_3_4_completed")) {
+      return;
+    }
+
+    persistor.pause();
+
+    if (window.electronAPI) {
+      window.electronAPI.onBackupData((_, data) => {
+        console.log("1. Received backup data:", data);
+
+        if (data) {
+          setTimeout(() => {
+            localStorage.clear();
+
+            localStorage.setItem("migration_2_3_3_to_2_3_4_completed", "true");
+            localStorage.setItem("persist:accounts", JSON.stringify(data["persist:accounts"]));
+            localStorage.setItem("persist:root", JSON.stringify(data["persist:root"]));
+
+            window.location.reload();
+          }, 3000);
+        }
+      });
+    }
+  }, []);
+
   return (
-    <HashRouter>
-      <Routes>
-        <Route element={<Navigate to="/welcome" />} path="/*" />
-        <Route element={<WelcomeScreen />} path="/welcome" />
-      </Routes>
-    </HashRouter>
+    <>
+      {isDataLoading && (
+        <Flex
+          position="absolute"
+          zIndex="9999"
+          top="0"
+          left="0"
+          alignItems="center"
+          justifyContent="center"
+          width="full"
+          height="100vh"
+          backdropFilter="blur(10px)"
+          backgroundColor="rgba(0, 0, 0, 0.2)"
+        >
+          <Spinner />
+        </Flex>
+      )}
+      <HashRouter>
+        <Routes>
+          <Route element={<Navigate to="/welcome" />} path="/*" />
+          <Route element={<WelcomeScreen />} path="/welcome" />
+        </Routes>
+      </HashRouter>
+    </>
   );
 };
diff --git a/packages/state/src/beacon/WalletClient.ts b/packages/state/src/beacon/WalletClient.ts
@@ -16,7 +16,13 @@ export const logout = (persistor: Persistor) =>
     .catch(() => {})
     .finally(() => {
       persistor.pause();
+      const migrationCompleted = localStorage.getItem("migration_2_3_3_to_2_3_4_completed");
+
       localStorage.clear(); // TODO: fix for react-native
 
+      if (migrationCompleted) {
+        localStorage.setItem("migration_2_3_3_to_2_3_4_completed", "true");
+      }
+
       window.location.replace("/"); // TODO: fix for react-native
     });
diff --git a/packages/state/src/hooks/backup.ts b/packages/state/src/hooks/backup.ts
@@ -78,8 +78,15 @@ export const restoreV2BackupFile = async (
   }
 
   persistor.pause();
+
+  const migrationCompleted = localStorage.getItem("migration_2_3_3_to_2_3_4_completed");
+
   localStorage.clear();
 
+  if (migrationCompleted) {
+    localStorage.setItem("migration_2_3_3_to_2_3_4_completed", "true");
+  }
+
   localStorage.setItem("persist:accounts", accountsInString);
   localStorage.setItem("persist:root", backup["persist:root"]);
 

diff --git a/packages/state/src/reducer.ts b/packages/state/src/reducer.ts
@@ -104,15 +104,13 @@ export const makeReducer = (storage_: Storage | undefined) => {
     version: VERSION,
     storage,
     blacklist: ["accounts"],
-    getStoredState: customGetStoredState,
     migrate: createAsyncMigrate(mainStoreMigrations, { debug: false }),
   };
 
   const accountsPersistConfig = {
     key: "accounts",
     version: VERSION,
     storage,
-    getStoredState: customGetStoredState,
     migrate: createAsyncMigrate(accountsMigrations, { debug: false }),
     blacklist: ["password"],
   };