use pushToast through ToastUtils when it's a static toast content

js/background.js

@@ -203,11 +203,7 @@
     setTimeout(() => {
       localStorage.removeItem('restart-reason');
 
-      window.pushToast({
+      window.libsession.Utils.ToastUtils.pushForceUnlinked();
-        title: window.i18n('successUnlinked'),
-        type: 'info',
-        id: '123',
-      });
     }, 2000);
   }
 
@@ -841,11 +837,7 @@
       // if not undefined, we take the opposite
       const newValue = currentValue !== undefined ? !currentValue : false;
       window.Events.setSpellCheck(newValue);
-      window.pushToast({
+      window.libsession.Utils.ToastUtils.pushSpellCheckDirty();
-        description: window.i18n('spellCheckDirty'),
-        type: 'info',
-        id: 'spellCheckDirty',
-      });
     };
 
     window.toggleLinkPreview = () => {
@@ -979,11 +971,8 @@
         const conversationExists = ConversationController.get(conversationId);
         if (conversationExists) {
           window.log.warn('We are already a member of this public chat');
-          window.pushToast({
+          window.libsession.Utils.ToastUtils.pushAlreadyMemberOpenGroup();
-            description: window.i18n('publicChatExists'),
+
-            type: 'info',
-            id: 'alreadyMemberPublicChat',
-          });
           return;
         }
 
@@ -1066,16 +1055,6 @@
       }
     });
 
-    Whisper.events.on('showToast', options => {
-      if (
-        appView &&
-        appView.inboxView &&
-        appView.inboxView.conversation_stack
-      ) {
-        appView.inboxView.conversation_stack.showToast(options);
-      }
-    });
-
     Whisper.events.on('showConfirmationDialog', options => {
       if (
         appView &&

js/models/conversations.js

@@ -2280,11 +2280,7 @@
     copyPublicKey() {
       clipboard.writeText(this.id);
 
-      window.pushToast({
+      window.libsession.Utils.ToastUtils.pushCopiedToClipBoard();
-        title: i18n('copiedToClipboard'),
-        type: 'success',
-        id: 'copiedToClipboard',
-      });
     },
 
     changeNickname() {

js/models/messages.js

@@ -904,11 +904,7 @@
         clipboard.writeText(this.OUR_NUMBER);
       }
 
-      window.pushToast({
+      window.libsession.Utils.ToastUtils.pushCopiedToClipBoard();
-        title: i18n('copiedToClipboard'),
-        type: 'success',
-        id: 'copiedToClipboard',
-      });
     },
 
     banUser() {
@@ -923,17 +919,9 @@
           const success = await channelAPI.banUser(source);
 
           if (success) {
-            window.pushToast({
+            window.libsession.Utils.ToastUtils.pushUserBanSuccess();
-              title: i18n('userBanned'),
-              type: 'success',
-              id: 'userBanned',
-            });
           } else {
-            window.pushToast({
+            window.libsession.Utils.ToastUtils.pushUserBanFailure();
-              title: i18n('userBanFailed'),
-              type: 'error',
-              id: 'userBanFailed',
-            });
           }
         },
       });
@@ -957,11 +945,7 @@
     copyText() {
       clipboard.writeText(this.get('body'));
 
-      window.pushToast({
+      window.libsession.Utils.ToastUtils.pushCopiedToClipBoard();
-        title: i18n('copiedToClipboard'),
-        type: 'success',
-        id: 'copiedToClipboard',
-      });
     },
 
     /**

js/views/conversation_view.js

@@ -1231,210 +1231,6 @@
       });
     },
 
-    deleteSelectedMessages() {
-      const ourPubkey = textsecure.storage.user.getNumber();
-      const selected = Array.from(this.model.selectedMessages);
-      const isModerator = this.model.isModerator(ourPubkey);
-      const isAllOurs = selected.every(
-        message =>
-          message.propsForMessage.authorPhoneNumber === message.OUR_NUMBER
-      );
-
-      if (!isAllOurs && !isModerator) {
-        window.pushToast({
-          title: i18n('messageDeletionForbidden'),
-          type: 'error',
-          id: 'messageDeletionForbidden',
-        });
-
-        return;
-      }
-
-      this.deleteMessages(selected, () => {
-        this.resetMessageSelection();
-      });
-    },
-
-    deleteMessages(messages, onSuccess) {
-      const multiple = messages.length > 1;
-      const isPublic = this.model.isPublic();
-
-      // In future, we may be able to unsend private messages also
-      // isServerDeletable also defined in ConversationHeader.tsx for
-      // future reference
-      const isServerDeletable = isPublic;
-
-      const warningMessage = (() => {
-        if (isPublic) {
-          return multiple
-            ? i18n('deleteMultiplePublicWarning')
-            : i18n('deletePublicWarning');
-        }
-        return multiple ? i18n('deleteMultipleWarning') : i18n('deleteWarning');
-      })();
-
-      const doDelete = async () => {
-        let toDeleteLocally;
-
-        if (isPublic) {
-          toDeleteLocally = await this.model.deletePublicMessages(messages);
-          if (toDeleteLocally.length === 0) {
-            // Message failed to delete from server, show error?
-            return;
-          }
-        } else {
-          messages.forEach(m => this.model.messageCollection.remove(m.id));
-          toDeleteLocally = messages;
-        }
-
-        await Promise.all(
-          toDeleteLocally.map(async m => {
-            await window.Signal.Data.removeMessage(m.id, {
-              Message: Whisper.Message,
-            });
-            m.trigger('unload');
-          })
-        );
-
-        this.resetPanel();
-        this.updateHeader();
-
-        if (onSuccess) {
-          onSuccess();
-        }
-      };
-
-      // Only show a warning when at least one messages was successfully
-      // saved in on the server
-      if (!messages.some(m => !m.hasErrors())) {
-        doDelete();
-        return;
-      }
-
-      // If removable from server, we "Unsend" - otherwise "Delete"
-      let title;
-      if (isPublic) {
-        title = multiple
-          ? i18n('deleteMessagesForEveryone')
-          : i18n('deleteMessageForEveryone');
-      } else {
-        title = multiple ? i18n('deleteMessages') : i18n('deleteMessage');
-      }
-
-      const okText = isServerDeletable
-        ? i18n('deleteForEveryone')
-        : i18n('delete');
-
-      window.confirmationDialog({
-        title,
-        message: warningMessage,
-        okText,
-        okTheme: 'danger',
-        resolve: doDelete,
-      });
-    },
-
-    deleteMessage(message) {
-      this.deleteMessages([message]);
-    },
-
-    showChannelLightbox({ media, attachment, message }) {
-      const selectedIndex = media.findIndex(
-        mediaMessage => mediaMessage.attachment.path === attachment.path
-      );
-      this.lightboxGalleryView = new Whisper.ReactWrapperView({
-        className: 'lightbox-wrapper',
-        Component: Signal.Components.LightboxGallery,
-        props: {
-          media,
-          onSave: () => this.downloadAttachment({ attachment, message }),
-          selectedIndex,
-        },
-        onClose: () => Signal.Backbone.Views.Lightbox.hide(),
-      });
-      Signal.Backbone.Views.Lightbox.show(this.lightboxGalleryView.el);
-    },
-
-    showLightbox({ attachment, message }) {
-      const { contentType, path } = attachment;
-
-      if (
-        !Signal.Util.GoogleChrome.isImageTypeSupported(contentType) &&
-        !Signal.Util.GoogleChrome.isVideoTypeSupported(contentType)
-      ) {
-        this.downloadAttachment({ attachment, message });
-        return;
-      }
-
-      const attachments = message.get('attachments') || [];
-
-      const media = attachments
-        .filter(item => item.thumbnail && !item.pending && !item.error)
-        .map((item, index) => ({
-          objectURL: getAbsoluteAttachmentPath(item.path),
-          path: item.path,
-          contentType: item.contentType,
-          index,
-          message,
-          attachment: item,
-        }));
-
-      if (media.length === 1) {
-        const props = {
-          objectURL: getAbsoluteAttachmentPath(path),
-          contentType,
-          caption: attachment.caption,
-          onSave: () => this.downloadAttachment({ attachment, message }),
-        };
-        this.lightboxView = new Whisper.ReactWrapperView({
-          className: 'lightbox-wrapper',
-          Component: Signal.Components.Lightbox,
-          props,
-          onClose: () => {
-            Signal.Backbone.Views.Lightbox.hide();
-            this.stopListening(message);
-          },
-        });
-        this.listenTo(message, 'expired', () => this.lightboxView.remove());
-        Signal.Backbone.Views.Lightbox.show(this.lightboxView.el);
-        return;
-      }
-
-      const selectedIndex = _.findIndex(
-        media,
-        item => attachment.path === item.path
-      );
-
-      const onSave = async (options = {}) => {
-        Signal.Types.Attachment.save({
-          attachment: options.attachment,
-          document,
-          index: options.index + 1,
-          getAbsolutePath: getAbsoluteAttachmentPath,
-          timestamp: options.message.get('sent_at'),
-        });
-      };
-
-      const props = {
-        media,
-        selectedIndex: selectedIndex >= 0 ? selectedIndex : 0,
-        onSave,
-      };
-      this.lightboxGalleryView = new Whisper.ReactWrapperView({
-        className: 'lightbox-wrapper',
-        Component: Signal.Components.LightboxGallery,
-        props,
-        onClose: () => {
-          Signal.Backbone.Views.Lightbox.hide();
-          this.stopListening(message);
-        },
-      });
-      this.listenTo(message, 'expired', () =>
-        this.lightboxGalleryView.remove()
-      );
-      Signal.Backbone.Views.Lightbox.show(this.lightboxGalleryView.el);
-    },
-
     async showMessageDetail(message) {
       const onClose = () => {
         this.stopListening(message, 'change', update);

js/views/inbox_view.js

@@ -39,12 +39,6 @@
         $el.remove();
       }
     },
-    showToast({ message }) {
-      window.pushToast({
-        title: message,
-        type: 'success',
-      });
-    },
     showConfirmationDialog({
       title,
       message,

js/views/session_registration_view.js

@@ -38,14 +38,6 @@
         .addClass('in')
         .fadeIn();
     },
-
-    showToast(message) {
-      const toast = new Whisper.MessageToastView({
-        message,
-      });
-      toast.$el.appendTo(this.$el);
-      toast.render();
-    },
   });
 
   class TextScramble {

js/views/toast_view.js

@@ -28,13 +28,4 @@
       setTimeout(this.close.bind(this), 2000);
     },
   });
-
-  Whisper.MessageToastView = Whisper.ToastView.extend({
-    initialize(options) {
-      this.message = options.message || '-';
-    },
-    render_attributes() {
-      return { toastMessage: this.message };
-    },
-  });
 })();

ts/components/EditProfileDialog.tsx

@@ -295,12 +295,7 @@ export class EditProfileDialog extends React.Component<Props, State> {
 
   private copySessionID(sessionID: string) {
     window.clipboard.writeText(sessionID);
-
+    ToastUtils.pushCopiedToClipBoard();
-    ToastUtils.push({
-      title: window.i18n('copiedToClipboard'),
-      type: 'success',
-      id: 'copiedToClipboard',
-    });
   }
 
   private onClickOK() {

ts/components/session/SessionSeedModal.tsx

@@ -210,11 +210,7 @@ export class SessionSeedModal extends React.Component<Props, State> {
   private copyRecoveryPhrase(recoveryPhrase: string) {
     window.clipboard.writeText(recoveryPhrase);
 
-    ToastUtils.push({
+    ToastUtils.pushCopiedToClipBoard();
-      title: window.i18n('copiedToClipboard'),
-      type: 'success',
-      id: 'copyRecoveryPhraseToast',
-    });
   }
 
   private onEnter(event: any) {

ts/components/session/conversation/SessionCompositionBox.tsx

@@ -423,12 +423,7 @@ export class SessionCompositionBox extends React.Component<Props, State> {
       return;
     }
 
-    window.pushToast({
+    ToastUtils.pushAudioPermissionNeeded();
-      id: 'audioPermissionNeeded',
-      title: window.i18n('audioPermissionNeededTitle'),
-      description: window.i18n('audioPermissionNeeded'),
-      type: 'info',
-    });
   }
 
   private onExitVoiceNoteView() {

ts/components/session/conversation/SessionConversation.tsx

@@ -656,7 +656,8 @@ export class SessionConversation extends React.Component<Props, State> {
     const conversationModel = window.ConversationController.getOrThrow(
       conversationKey
     );
-    const selectedMessages = conversationModel.messageCollection.models.filter(message =>
+    const selectedMessages = conversationModel.messageCollection.models.filter(
+      message =>
         this.state.selectedMessages.find(
           selectedMessage => selectedMessage === message.id
         )
@@ -697,17 +698,15 @@ export class SessionConversation extends React.Component<Props, State> {
           await MultiDeviceProtocol.getPrimaryDevice(ourDevicePubkey)
         ).key;
         const isModerator = conversationModel.isModerator(ourPrimaryPubkey);
-        const ourNumbers = (await MultiDeviceProtocol.getOurDevices()).map(m => m.key);
+        const ourNumbers = (await MultiDeviceProtocol.getOurDevices()).map(
-        const isAllOurs = selectedMessages.every(
+          m => m.key
-          message => ourNumbers.includes(message.get('source'))
+        );
+        const isAllOurs = selectedMessages.every(message =>
+          ourNumbers.includes(message.get('source'))
         );
 
         if (!isAllOurs && !isModerator) {
-          window.pushToast({
+          ToastUtils.pushMessageDeleteForbidden();
-            title: window.i18n('messageDeletionForbidden'),
-            type: 'error',
-            id: 'messageDeletionForbidden',
-          });
 
           this.setState({ selectedMessages: [] });
           return;

ts/session/utils/Toast.ts

@@ -73,3 +73,68 @@ export function pushMessageBodyMissing() {
     id: 'messageBodyMissing',
   });
 }
+
+export function pushCopiedToClipBoard() {
+  window.pushToast({
+    title: window.i18n('copiedToClipboard'),
+    type: 'success',
+    id: 'copiedToClipboard',
+  });
+}
+
+export function pushForceUnlinked() {
+  window.pushToast({
+    title: window.i18n('successUnlinked'),
+    type: 'info',
+    id: 'successUnlinked',
+  });
+}
+
+export function pushSpellCheckDirty() {
+  window.pushToast({
+    title: window.i18n('spellCheckDirty'),
+    type: 'info',
+    id: 'spellCheckDirty',
+  });
+}
+
+export function pushAlreadyMemberOpenGroup() {
+  window.pushToast({
+    title: window.i18n('publicChatExists'),
+    type: 'info',
+    id: 'alreadyMemberPublicChat',
+  });
+}
+
+export function pushUserBanSuccess() {
+  window.pushToast({
+    title: window.i18n('userBanned'),
+    type: 'success',
+    id: 'userBanned',
+  });
+}
+
+export function pushUserBanFailure() {
+  window.pushToast({
+    title: window.i18n('userBanFailed'),
+    type: 'error',
+    id: 'userBanFailed',
+  });
+}
+
+export function pushMessageDeleteForbidden() {
+  window.pushToast({
+    title: window.i18n('messageDeletionForbidden'),
+    type: 'error',
+    id: 'messageDeletionForbidden',
+  });
+}
+
+export function pushAudioPermissionNeeded() {
+  window.pushToast({
+    id: 'audioPermissionNeeded',
+    title: window.i18n('audioPermissionNeededTitle'),
+    description: window.i18n('audioPermissionNeeded'),
+    type: 'info',
+  });
+}