From 531b227ae4a218f5c0b36f9c9e7627361704a52b Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Thu, 19 Nov 2020 09:14:48 +1100
Subject: [PATCH] clean unused files and fix recovery dialog showing

---
 background.html                                   | 13 ++++++++-----
 background_test.html                              | 13 ++++++++-----
 js/modules/signal.js                              |  5 -----
 js/views/session_dropdown_view.js                 |  0
 js/views/session_modal_view.js                    |  0
 test/index.html                                   | 13 +++++++------
 ts/components/session/LeftPaneSettingSection.tsx  |  2 +-
 ts/components/session/SessionRegistrationView.tsx |  2 +-
 8 files changed, 25 insertions(+), 23 deletions(-)
 delete mode 100644 js/views/session_dropdown_view.js
 delete mode 100644 js/views/session_modal_view.js

diff --git a/background.html b/background.html
index fb2122b85..97d968791 100644
--- a/background.html
+++ b/background.html
@@ -160,19 +160,18 @@
 
   <script type='text/javascript' src='js/views/react_wrapper_view.js'></script>
   <script type='text/javascript' src='js/views/whisper_view.js'></script>
-  <script type='text/javascript' src='js/views/session_modal_view.js'></script>
-  <script type='text/javascript' src='js/views/session_dropdown_view.js'></script>
   <script type='text/javascript' src='js/views/session_confirm_view.js'></script>
   <script type='text/javascript' src='js/views/list_view.js'></script>
-  <script type='text/javascript' src='js/views/nickname_dialog_view.js'></script>
-  <script type='text/javascript' src='js/views/password_dialog_view.js'></script>
-  <script type='text/javascript' src='js/views/seed_dialog_view.js'></script>
+
   <script type='text/javascript' src='js/views/session_inbox_view.js'></script>
   <script type='text/javascript' src='js/views/identicon_svg_view.js'></script>
   <script type='text/javascript' src='js/views/banner_view.js'></script>
   <script type='text/javascript' src='js/views/session_registration_view.js'></script>
   <script type='text/javascript' src='js/views/app_view.js'></script>
   <script type='text/javascript' src='js/views/import_view.js'></script>
+
+
+  <!-- DIALOGS-->
   <script type='text/javascript' src='js/views/device_pairing_dialog_view.js'></script>
   <script type='text/javascript' src='js/views/device_pairing_words_dialog_view.js'></script>
   <script type='text/javascript' src='js/views/create_group_dialog_view.js'></script>
@@ -181,7 +180,11 @@
   <script type='text/javascript' src='js/views/moderators_add_dialog_view.js'></script>
   <script type='text/javascript' src='js/views/moderators_remove_dialog_view.js'></script>
   <script type='text/javascript' src='js/views/user_details_dialog_view.js'></script>
+  <script type='text/javascript' src='js/views/nickname_dialog_view.js'></script>
+  <script type='text/javascript' src='js/views/password_dialog_view.js'></script>
+  <script type='text/javascript' src='js/views/seed_dialog_view.js'></script>
 
+  <!-- CRYPTO -->
   <script type='text/javascript' src='js/wall_clock_listener.js'></script>
   <script type='text/javascript' src='js/rotate_signed_prekey_listener.js'></script>
   <script type='text/javascript' src='js/keychange_listener.js'></script>
diff --git a/background_test.html b/background_test.html
index fe1fcf49c..ec617a3d1 100644
--- a/background_test.html
+++ b/background_test.html
@@ -165,19 +165,18 @@
 
   <script type='text/javascript' src='js/views/react_wrapper_view.js'></script>
   <script type='text/javascript' src='js/views/whisper_view.js'></script>
-  <script type='text/javascript' src='js/views/session_modal_view.js'></script>
-  <script type='text/javascript' src='js/views/session_dropdown_view.js'></script>
   <script type='text/javascript' src='js/views/session_confirm_view.js'></script>
   <script type='text/javascript' src='js/views/list_view.js'></script>
-  <script type='text/javascript' src='js/views/nickname_dialog_view.js'></script>
-  <script type='text/javascript' src='js/views/password_dialog_view.js'></script>
-  <script type='text/javascript' src='js/views/seed_dialog_view.js'></script>
+
   <script type='text/javascript' src='js/views/session_inbox_view.js'></script>
   <script type='text/javascript' src='js/views/identicon_svg_view.js'></script>
   <script type='text/javascript' src='js/views/banner_view.js'></script>
   <script type='text/javascript' src='js/views/session_registration_view.js'></script>
   <script type='text/javascript' src='js/views/app_view.js'></script>
   <script type='text/javascript' src='js/views/import_view.js'></script>
+
+
+  <!-- DIALOGS-->
   <script type='text/javascript' src='js/views/device_pairing_dialog_view.js'></script>
   <script type='text/javascript' src='js/views/device_pairing_words_dialog_view.js'></script>
   <script type='text/javascript' src='js/views/create_group_dialog_view.js'></script>
@@ -186,7 +185,11 @@
   <script type='text/javascript' src='js/views/moderators_add_dialog_view.js'></script>
   <script type='text/javascript' src='js/views/moderators_remove_dialog_view.js'></script>
   <script type='text/javascript' src='js/views/user_details_dialog_view.js'></script>
+  <script type='text/javascript' src='js/views/nickname_dialog_view.js'></script>
+  <script type='text/javascript' src='js/views/password_dialog_view.js'></script>
+  <script type='text/javascript' src='js/views/seed_dialog_view.js'></script>
 
+  <!-- CRYPTO -->
   <script type='text/javascript' src='js/wall_clock_listener.js'></script>
   <script type='text/javascript' src='js/rotate_signed_prekey_listener.js'></script>
   <script type='text/javascript' src='js/keychange_listener.js'></script>
diff --git a/js/modules/signal.js b/js/modules/signal.js
index d9cc7c126..c539efa60 100644
--- a/js/modules/signal.js
+++ b/js/modules/signal.js
@@ -63,10 +63,6 @@ const {
   SessionConfirm,
 } = require('../../ts/components/session/SessionConfirm');
 
-const {
-  SessionRegistrationView,
-} = require('../../ts/components/session/SessionRegistrationView');
-
 const {
   UpdateGroupNameDialog,
 } = require('../../ts/components/conversation/UpdateGroupNameDialog');
@@ -248,7 +244,6 @@ exports.setup = (options = {}) => {
     EditProfileDialog,
     UserDetailsDialog,
     DevicePairingDialog,
-    SessionRegistrationView,
     SessionInboxView,
     ConfirmDialog,
     UpdateGroupNameDialog,
diff --git a/js/views/session_dropdown_view.js b/js/views/session_dropdown_view.js
deleted file mode 100644
index e69de29bb..000000000
diff --git a/js/views/session_modal_view.js b/js/views/session_modal_view.js
deleted file mode 100644
index e69de29bb..000000000
diff --git a/test/index.html b/test/index.html
index d81f15be4..eb6196a23 100644
--- a/test/index.html
+++ b/test/index.html
@@ -202,19 +202,18 @@
 
   <script type="text/javascript" src="../js/views/react_wrapper_view.js"></script>
   <script type="text/javascript" src="../js/views/whisper_view.js"></script>
-  <script type="text/javascript" src="../js/views/session_modal_view.js"></script>
-  <script type="text/javascript" src="../js/views/session_dropdown_view.js"></script>
   <script type="text/javascript" src="../js/views/session_confirm_view.js"></script>
   <script type="text/javascript" src="../js/views/list_view.js"></script>
-  <script type="text/javascript" src="../js/views/nickname_dialog_view.js"></script>
-  <script type="text/javascript" src="../js/views/password_dialog_view.js"></script>
-  <script type="text/javascript" src="../js/views/seed_dialog_view.js"></script>
+
   <script type='text/javascript' src='../js/views/session_inbox_view.js'></script>
   <script type="text/javascript" src="../js/views/identicon_svg_view.js"></script>
   <script type="text/javascript" src="../js/views/banner_view.js"></script>
   <script type="text/javascript" src="../js/views/session_registration_view.js"></script>
   <script type="text/javascript" src="../js/views/app_view.js"></script>
   <script type="text/javascript" src="../js/views/import_view.js"></script>
+
+    <!-- DIALOGS-->
+
   <script type="text/javascript" src="../js/views/device_pairing_dialog_view.js"></script>
   <script type="text/javascript" src="../js/views/device_pairing_words_dialog_view.js"></script>
   <script type="text/javascript" src="../js/views/create_group_dialog_view.js"></script>
@@ -223,7 +222,9 @@
   <script type="text/javascript" src="../js/views/moderators_add_dialog_view.js"></script>
   <script type="text/javascript" src="../js/views/moderators_remove_dialog_view.js"></script>
   <script type="text/javascript" src="../js/views/user_details_dialog_view.js"></script>
-
+  <script type="text/javascript" src="../js/views/nickname_dialog_view.js"></script>
+  <script type="text/javascript" src="../js/views/password_dialog_view.js"></script>
+  <script type="text/javascript" src="../js/views/seed_dialog_view.js"></script>
 
   <!-- <script type="text/javascript" src="metadata/SecretSessionCipher_test.js"></script> -->
 
diff --git a/ts/components/session/LeftPaneSettingSection.tsx b/ts/components/session/LeftPaneSettingSection.tsx
index 3442a3411..a15ebd30e 100644
--- a/ts/components/session/LeftPaneSettingSection.tsx
+++ b/ts/components/session/LeftPaneSettingSection.tsx
@@ -158,7 +158,7 @@ export class LeftPaneSettingSection extends React.Component<Props, State> {
             text={showRecoveryPhrase}
             buttonType={SessionButtonType.SquareOutline}
             buttonColor={SessionButtonColor.White}
-            onClick={window.showSeedDialog}
+            onClick={() => window.Whisper.events.trigger('showSeedDialog')}
           />
         )}
       </div>
diff --git a/ts/components/session/SessionRegistrationView.tsx b/ts/components/session/SessionRegistrationView.tsx
index 32347195c..1e35274b5 100644
--- a/ts/components/session/SessionRegistrationView.tsx
+++ b/ts/components/session/SessionRegistrationView.tsx
@@ -5,7 +5,7 @@ import { RegistrationTabs } from './RegistrationTabs';
 import { SessionIconButton, SessionIconSize, SessionIconType } from './icon';
 import { SessionToastContainer } from './SessionToastContainer';
 
-export const SessionRegistrationView: React.FC = () => (
+export const SessionRegistrationView = () => (
   <div className="session-content">
     <SessionToastContainer />
     <div id="error" className="collapse" />