Merge pull request #1260 from Bilb/fix-app-start-with-pw

password_preload.js

@@ -21,19 +21,18 @@ window.getEnvironment = () => config.environment;
 window.getVersion = () => config.version;
 window.getAppInstance = () => config.appInstance;
 
-// So far we're only using this for Signal.Types
-const Signal = require('./js/modules/signal');
 const electron = require('electron');
 
 const ipc = electron.ipcRenderer;
-
+const {
-window.Signal = Signal.setup({
+  SessionPasswordPrompt,
-  Attachments: null,
+} = require('./ts/components/session/SessionPasswordPrompt');
-  userDataPath: null,
+
-  getRegionCode: () => null,
+window.Signal = {
-});
+  Components: {
-
+    SessionPasswordPrompt,
-window.Signal.Logs = require('./js/modules/logs');
+  },
+}
 
 window.CONSTANTS = {
   MAX_LOGIN_TRIES: 3,