diff --git a/background.html b/background.html index 785d40ec2..2e75ea205 100644 --- a/background.html +++ b/background.html @@ -472,6 +472,7 @@ + diff --git a/js/background.js b/js/background.js index 859909b61..98ca62ce3 100644 --- a/js/background.js +++ b/js/background.js @@ -985,9 +985,17 @@ window.toasts.get(finalToastID).fadeToast(); } + const sessionConversation = new Whisper.SessionConversationView({ + el: $('body'), + }); + sessionConversation.render(); + + return toastID; }; + + window.getFriendsFromContacts = contacts => { // To call from TypeScript, input / output are both // of type Array diff --git a/js/modules/signal.js b/js/modules/signal.js index 3b0cb5932..cee645009 100644 --- a/js/modules/signal.js +++ b/js/modules/signal.js @@ -18,7 +18,6 @@ const LinkPreviews = require('./link_previews'); const AttachmentDownloads = require('./attachment_downloads'); // Components -const { SessionConversation } = require('../../ts/components/session/SessionConversation'); const { ConversationLoadingScreen, } = require('../../ts/components/ConversationLoadingScreen'); @@ -59,6 +58,7 @@ const { UserDetailsDialog } = require('../../ts/components/UserDetailsDialog'); const { DevicePairingDialog, } = require('../../ts/components/DevicePairingDialog'); +const { SessionConversation } = require('../../ts/components/session/SessionConversation'); const { SettingsView, } = require('../../ts/components/session/settings/SessionSettings'); @@ -275,7 +275,6 @@ exports.setup = (options = {}) => { }); const Components = { - SessionConversation, ConversationLoadingScreen, AttachmentList, CaptionEditor, @@ -305,6 +304,7 @@ exports.setup = (options = {}) => { RemoveModeratorsDialog, GroupInvitation, BulkEdit, + SessionConversation, SessionToast, SessionToggle, SessionConfirm, diff --git a/ts/components/session/SessionConversation.tsx b/ts/components/session/SessionConversation.tsx index 7366b0c71..380ae9ea3 100644 --- a/ts/components/session/SessionConversation.tsx +++ b/ts/components/session/SessionConversation.tsx @@ -6,15 +6,15 @@ interface State{}; export class SessionConversation extends React.Component { - public constructor(props: Props) { + constructor(props: any) { super(props); this.state = {}; } render() { return ( -
- THIS IS AN INBOX VIEW +
+ THIS IS AN INBOX VIEW THIS IS AN INBOX VIEW THIS IS AN INBOX VIEW THIS IS AN INBOX VIEW THIS IS AN INBOX VIEW THIS IS AN INBOX VIEW THIS IS AN INBOX VIEW THIS IS AN INBOX VIEW THIS IS AN INBOX VIEW THIS IS AN INBOX VIEW THIS IS AN INBOX VIEW THIS IS AN INBOX VIEW THIS IS AN INBOX VIEW THIS IS AN INBOX VIEW THIS IS AN INBOX VIEW THIS IS AN INBOX VIEW THIS IS AN INBOX VIEW THIS IS AN INBOX VIEW THIS IS AN INBOX VIEW THIS IS AN INBOX VIEW THIS IS AN INBOX VIEW THIS IS AN INBOX VIEW THIS IS AN INBOX VIEW THIS IS AN INBOX VIEW THIS IS AN INBOX VIEW THIS IS AN INBOX VIEW THIS IS AN INBOX VIEW THIS IS AN INBOX VIEW THIS IS AN INBOX VIEW THIS IS AN INBOX VIEW THIS IS AN INBOX VIEW THIS IS AN INBOX VIEW
) }