fix: remove electron-store from preload

leather-io · Jan 14, 2021 · 40b6194 · 40b6194
1 parent 850aa75
commit 40b6194
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/app/hooks/use-ledger.ts b/app/hooks/use-ledger.ts
@@ -17,6 +17,7 @@ export function useLedger() {
   const transport = useRef<Transport | null>(null);
   const disconnectTimeouts = useRef<number>(0);
   const listeningForAddEvent = useRef(true);
+  // eslint-disable-next-line @typescript-eslint/no-empty-function
   const closeTransport = useRef(() => {});
   const SAFE_ASSUME_REAL_DEVICE_DISCONNECT_TIME = 1000;
   const POLL_LEDGER_INTERVAL = 250;

diff --git a/app/main.dev.ts b/app/main.dev.ts
@@ -189,9 +189,13 @@ const store = new Store();
 ipcMain.handle('store-set', (_e, { key, value }: any) => store.set(key, value));
 ipcMain.handle('store-get', (_e, { key }: any) => store.get(key));
 ipcMain.handle('store-delete', (_e, { key }: any) => store.delete(key));
-ipcMain.handle('store-getEntireStore', () => store.store);
+// ipcMain.handle('store-getEntireStore', () => store.store);
 ipcMain.handle('store-clear', () => store.clear());
 
+ipcMain.on('store-getEntireStore', (event, arg) => {
+  event.returnValue = store.store;
+});
+
 ipcMain.handle('derive-key', async (_e, args) => {
   return deriveKey(args);
 });
diff --git a/app/preload.js b/app/preload.js
@@ -1,7 +1,6 @@
 /* eslint-disable @typescript-eslint/no-var-requires */
 const fs = require('fs');
 const { contextBridge, ipcRenderer, app } = require('electron');
-const Store = require('electron-store');
 
 const TransportNodeHid = require('@ledgerhq/hw-transport-node-hid').default;
 
@@ -29,8 +28,6 @@ contextBridge.exposeInMainWorld('electron', {
 // SECURITY: don't expose entire process obj
 contextBridge.exposeInMainWorld('process', { ...process });
 
-const store = new Store();
-
 contextBridge.exposeInMainWorld('api', {
   // Expose protected methods that allow the renderer process to use
   // the ipcRenderer without exposing the entire object
@@ -39,12 +36,10 @@ contextBridge.exposeInMainWorld('api', {
     get: key => ipcRenderer.invoke('store-get', { key }),
     delete: key => ipcRenderer.invoke('store-delete', { key }),
     clear: () => ipcRenderer.invoke('store-clear'),
-    getEntireStore: () => ipcRenderer.invoke('store-getEntireStore'),
-    initialValue: store.store,
+    initialValue: () => ipcRenderer.sendSync('store-getEntireStore'),
   },
 
   deriveKey: async args => {
-    console.log('deriveKey', args);
     return ipcRenderer.invoke('derive-key', args);
   },
 

diff --git a/app/types/index.ts b/app/types/index.ts
@@ -12,7 +12,7 @@ declare const api: {
     delete(key: string): void;
     clear(): void;
     getEntireStore(): any;
-    initialValue: Record<string, unknown>;
+    initialValue(): Record<string, unknown>;
   };
 
   nodeHid: {

diff --git a/app/utils/disk-store.ts b/app/utils/disk-store.ts
@@ -45,7 +45,7 @@ export const persistWalletType = (walletType: WalletType) => {
 
 export const getInitialStateFromDisk = () => {
   console.log('getting entire disk store', api.store.initialValue);
-  return (api.store.initialValue as unknown) as DiskStore;
+  return (api.store.initialValue() as unknown) as DiskStore;
 };
 
 export const clearDiskStorage = () => api.store.clear();