Merge branch 'brand-redesign' of https://github.com/vincentbavitz/loki-messenger into brand-redesign

js/modules/signal.js

@@ -59,8 +59,8 @@ const {
   DevicePairingDialog,
 } = require('../../ts/components/DevicePairingDialog');
 const {
-  SessionSettings,
+  SettingsView,
-} = require('../../ts/components/session/SessionSettings');
+} = require('../../ts/components/session/settings/SessionSettings');
 const { SessionToast } = require('../../ts/components/session/SessionToast');
 const { SessionToggle } = require('../../ts/components/session/SessionToggle');
 const { SessionModal } = require('../../ts/components/session/SessionModal');
@@ -265,7 +265,7 @@ exports.setup = (options = {}) => {
     ContactName,
     ConversationHeader,
     SessionChannelSettings,
-    SessionSettings,
+    SettingsView,
     EmbeddedContact,
     Emojify,
     FriendRequest,

js/views/session_settings_view.js

@@ -13,7 +13,7 @@
     render() {
       this.settingsView = new Whisper.ReactWrapperView({
         className: 'session-settings',
-        Component: window.Signal.Components.SessionSettings,
+        Component: window.Signal.Components.SettingsView,
         props: {
           i18n,
         },