From 37cbd3d2c06a1a81fb790ac771db0659353f0a0f Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Wed, 22 Jan 2020 12:58:35 +1100 Subject: [PATCH] fix SessionSettings not found as does not exist --- js/modules/signal.js | 6 +++--- js/views/session_settings_view.js | 2 +- ts/components/session/settings/SessionSettings.tsx | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/js/modules/signal.js b/js/modules/signal.js index 6f48f4704..358463b56 100644 --- a/js/modules/signal.js +++ b/js/modules/signal.js @@ -59,8 +59,8 @@ const { DevicePairingDialog, } = require('../../ts/components/DevicePairingDialog'); const { - SessionSettings, -} = require('../../ts/components/session/SessionSettings'); + SettingsView, +} = 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, diff --git a/js/views/session_settings_view.js b/js/views/session_settings_view.js index 4d5dac9b2..3d6623283 100644 --- a/js/views/session_settings_view.js +++ b/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, }, diff --git a/ts/components/session/settings/SessionSettings.tsx b/ts/components/session/settings/SessionSettings.tsx index f555ed362..a50d0018b 100644 --- a/ts/components/session/settings/SessionSettings.tsx +++ b/ts/components/session/settings/SessionSettings.tsx @@ -156,7 +156,7 @@ export class SettingsView extends React.Component { defaultValue="" placeholder={' '} /> - +
{this.state.pwdLockError && ( @@ -186,7 +186,7 @@ export class SettingsView extends React.Component { this.setState({ pwdLockError: window.i18n('noGivenPassword'), }); - + return false; }