Fix blank screen after scan complete and ensure default values are pr…

…esent in userData file (#22) * Ensure mandatory fields are set in userData.txt * Fix blank screen after scan
GovTechSG · Aug 24, 2023 · e07bf43 · e07bf43
1 parent a8da7b4
commit e07bf43
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 2 deletions.
diff --git a/public/electron/userDataManager.js b/public/electron/userDataManager.js
@@ -37,8 +37,25 @@ const init = async () => {
             exportDir: defaultExportDir
         }; 
         fs.writeFileSync(userDataFilePath, JSON.stringify(defaultSettings));
+    } else {
+        // check if mandatory fields are set 
+        const userData = JSON.parse(fs.readFileSync(userDataFilePath));
+        if (!userData.exportDir) {
+            userData.exportDir = defaultExportDir;
+        }
+        if (!userData.name) {
+            userData.name = "";
+        }
+        if (!userData.email) {
+            userData.email = "";
+        }
+        if (!userData.browser) {
+            userData.browser = proxy ? "edge" : "chrome";
+        }
+        fs.writeFileSync(userDataFilePath, JSON.stringify(userData));
     }
 
+
     ipcMain.handle("getUserData", (_event) => { 
         const data = readUserDataFromFile();
         return data;

diff --git a/src/MainWindow/ResultPage/index.jsx b/src/MainWindow/ResultPage/index.jsx
@@ -24,8 +24,9 @@ const ResultPage = ({ completedScanId: scanId }) => {
   const [showCustomFlowReplayButton, setShowCustomFlowReplayButton] = useState(false);
 
   useEffect(() => {
-    console.log('is custom flow: ', state);
-    setShowCustomFlowReplayButton(state.isCustomScan);
+    if (state && state.isCustomScan) {
+      setShowCustomFlowReplayButton(state.isCustomScan);
+    }
   }, [])
 
   useEffect(() => {