From 39c64b9fbfc0f59462613ead05890650150ff93d Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Mon, 18 Jan 2021 17:02:02 +1100
Subject: [PATCH] toast adding moderator to remind that the user needs to be
 registered

---
 _locales/en/messages.json                          | 12 ++++++++++++
 js/views/moderators_add_dialog_view.js             |  7 ++++++-
 js/views/moderators_remove_dialog_view.js          |  5 +++++
 ts/components/DevicePairingDialog.tsx              |  2 --
 ts/components/conversation/ModeratorsAddDialog.tsx |  4 ++--
 ts/session/utils/Toast.tsx                         |  8 ++++++++
 6 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index 47de3b572..9ecd3917c 100644
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -1752,6 +1752,18 @@
     "message": "You cannot remove this user as they are the creator of the group.",
     "description": "Toast description when the user tries to remove the creator from a closed group v2 member list."
   },
+  "userNeedsToHaveJoined": {
+    "message": "User needs to have joined",
+    "description": "Toast title when the user tries to remove the creator from a closed group v2 member list."
+  },
+  "userNeedsToHaveJoinedDesc": {
+    "message": "Remember that this user needs to have already joined the server for this ADD to work.",
+    "description": "Toast description when the user adds a moderator for an open group."
+  },
+  "addToTheListBelow": {
+    "message": "Add to the list below",
+    "description": "Button action to add a moderator by pubkey"
+  },
   "noContactsForGroup": {
     "message": "You don't have any contacts yet",
     "androidKey": "activity_create_closed_group_empty_state_message"
diff --git a/js/views/moderators_add_dialog_view.js b/js/views/moderators_add_dialog_view.js
index f9da33531..5c1887a95 100644
--- a/js/views/moderators_add_dialog_view.js
+++ b/js/views/moderators_add_dialog_view.js
@@ -59,11 +59,16 @@
       this.remove();
     },
     async onSubmit(pubKeys) {
-      log.info(`asked to add ${pubKeys}`);
+      log.info(`asked to add moderators: ${pubKeys}`);
+      window.libsession.Utils.ToastUtils.pushUserNeedsToHaveJoined();
+
       const res = await this.channelAPI.serverAPI.addModerators(pubKeys);
       if (res !== true) {
         // we have errors, deal with them...
         // how?
+        window.log.warn('failed to add moderators:', res);
+      } else {
+        window.log.info(`${pubKeys} added as moderators...`);
       }
     },
   });
diff --git a/js/views/moderators_remove_dialog_view.js b/js/views/moderators_remove_dialog_view.js
index 06120dc77..46974a441 100644
--- a/js/views/moderators_remove_dialog_view.js
+++ b/js/views/moderators_remove_dialog_view.js
@@ -56,10 +56,15 @@
       this.remove();
     },
     async onSubmit(pubKeys) {
+      window.log.info(`asked to remove moderators ${pubKeys}`);
+
       const res = await this.channelAPI.serverAPI.removeModerators(pubKeys);
       if (res !== true) {
         // we have errors, deal with them...
         // how?
+        window.log.warn('failed to remove moderators:', res);
+      } else {
+        window.log.info(`${pubKeys} removed from moderators...`);
       }
     },
   });
diff --git a/ts/components/DevicePairingDialog.tsx b/ts/components/DevicePairingDialog.tsx
index 4befa72fb..17e4dc67c 100644
--- a/ts/components/DevicePairingDialog.tsx
+++ b/ts/components/DevicePairingDialog.tsx
@@ -4,8 +4,6 @@ import { QRCode } from 'react-qr-svg';
 import { SessionModal } from './session/SessionModal';
 import { SessionButton, SessionButtonColor } from './session/SessionButton';
 import { SessionSpinner } from './session/SessionSpinner';
-import { toast } from 'react-toastify';
-import { SessionToast, SessionToastType } from './session/SessionToast';
 import { ToastUtils } from '../session/utils';
 import { DefaultTheme } from 'styled-components';
 import { ConversationController } from '../session/conversations';
diff --git a/ts/components/conversation/ModeratorsAddDialog.tsx b/ts/components/conversation/ModeratorsAddDialog.tsx
index bf4d0c0ec..99b7b21a5 100644
--- a/ts/components/conversation/ModeratorsAddDialog.tsx
+++ b/ts/components/conversation/ModeratorsAddDialog.tsx
@@ -120,7 +120,7 @@ export class AddModeratorsDialog extends React.Component<Props, State> {
   }
 
   public render() {
-    const i18n = window.i18n;
+    const { i18n } = window;
 
     const hasContacts = this.state.contactList.length !== 0;
 
@@ -143,7 +143,7 @@ export class AddModeratorsDialog extends React.Component<Props, State> {
             buttonType={SessionButtonType.Brand}
             buttonColor={SessionButtonColor.Primary}
             onClick={this.add}
-            text={i18n('add')}
+            text={i18n('addToTheListBelow')}
           />
         </div>
         <div className="moderatorList">
diff --git a/ts/session/utils/Toast.tsx b/ts/session/utils/Toast.tsx
index 4ce058f5a..4217f9e11 100644
--- a/ts/session/utils/Toast.tsx
+++ b/ts/session/utils/Toast.tsx
@@ -259,3 +259,11 @@ export function pushCannotRemoveCreatorFromGroup() {
     window.i18n('cannotRemoveCreatorFromGroupDesc')
   );
 }
+
+export function pushUserNeedsToHaveJoined() {
+  pushToastInfo(
+    'userNeedsToHaveJoined',
+    window.i18n('userNeedsToHaveJoined'),
+    window.i18n('userNeedsToHaveJoinedDesc')
+  );
+}