Merge pull request #1741 from Bilb/rm-unused-submodule

remove unused submodule

_locales/en/messages.json

@@ -263,9 +263,9 @@
   "leaveGroupConfirmationAdmin": "As you are the admin of this group, if you leave it it will be removed for every current members. Are you sure you want to leave this group?",
   "cannotRemoveCreatorFromGroup": "Cannot remove this user",
   "cannotRemoveCreatorFromGroupDesc": "You cannot remove this user as they are the creator of the group.",
-  "userNeedsToHaveJoined": "User needs to have joined",
-  "userNeedsToHaveJoinedDesc": "An error happened. The user needs to have already joined the server for this ADD to work.",
   "noContactsForGroup": "You don't have any contacts yet",
+  "failedToAddAsModerator": "Failed to add user as moderator",
+  "failedToRemoveFromModerator": "Failed to remove user from the moderator list",
   "copyMessage": "Copy message text",
   "selectMessage": "Select message",
   "editGroup": "Edit group",
@@ -381,8 +381,6 @@
   "noBlockedContacts": "No blocked contacts",
   "userAddedToModerators": "User added to moderator list",
   "userRemovedFromModerators": "User removed from moderator list",
-  "errorHappenedWhileRemovingModerator": "An error happened",
-  "errorHappenedWhileRemovingModeratorDesc": "An error happened while removing this user from the moderator list.",
   "orJoinOneOfThese": "Or join one of these...",
   "helpUsTranslateSession": "Help us Translate Session",
   "translation": "Translation",

session-file-server

@@ -1 +0,0 @@
-Subproject commit 5173163fe18ac575676020e2f8621cf7a2956df3

ts/components/conversation/ModeratorsAddDialog.tsx

@@ -47,7 +47,7 @@ export const AddModeratorsDialog = (props: Props) => {
       if (!isAdded) {
         window?.log?.warn('failed to add moderators:', isAdded);
 
-        ToastUtils.pushUserNeedsToHaveJoined();
+        ToastUtils.pushFailedToAddAsModerator();
       } else {
         window?.log?.info(`${pubkey.key} added as moderator...`);
         ToastUtils.pushUserAddedToModerators();

ts/components/conversation/ModeratorsRemoveDialog.tsx

@@ -205,7 +205,7 @@ export class RemoveModeratorsDialog extends React.Component<Props, State> {
       if (!res) {
         window?.log?.warn('failed to remove moderators:', res);
 
-        ToastUtils.pushUserNeedsToHaveJoined();
+        ToastUtils.pushFailedToRemoveFromModerator();
       } else {
         window?.log?.info(`${removedMods} removed from moderators...`);
         ToastUtils.pushUserRemovedFromModerators();

ts/components/session/conversation/SessionCompositionBox.tsx

@@ -802,12 +802,6 @@ export class SessionCompositionBox extends React.Component<Props, State> {
 
     const { isBlocked, isPrivate, left, isKickedFromGroup } = this.props;
 
-    // deny sending of message if our app version is expired
-    if (window.extension.expiredStatus() === true) {
-      ToastUtils.pushToastError('expiredWarning', window.i18n('expiredWarning'));
-      return;
-    }
-
     if (isBlocked && isPrivate) {
       ToastUtils.pushUnblockToSend();
       return;

ts/interactions/messageInteractions.ts

@@ -134,7 +134,7 @@ export async function removeSenderFromModerator(sender: string, convoId: string)
     if (!res) {
       window?.log?.warn('failed to remove moderator:', res);
 
-      ToastUtils.pushErrorHappenedWhileRemovingModerator();
+      ToastUtils.pushFailedToRemoveFromModerator();
     } else {
       window?.log?.info(`${pubKeyToRemove.key} removed from moderators...`);
       ToastUtils.pushUserRemovedFromModerators();
@@ -154,7 +154,7 @@ export async function addSenderAsModerator(sender: string, convoId: string) {
     if (!res) {
       window?.log?.warn('failed to add moderator:', res);
 
-      ToastUtils.pushUserNeedsToHaveJoined();
+      ToastUtils.pushFailedToAddAsModerator();
     } else {
       window?.log?.info(`${pubKeyToAdd.key} added to moderators...`);
       ToastUtils.pushUserAddedToModerators();

ts/session/utils/Toast.tsx

@@ -191,12 +191,12 @@ export function pushOnlyAdminCanRemove() {
   );
 }
 
-export function pushUserNeedsToHaveJoined() {
-  pushToastWarning(
-    'userNeedsToHaveJoined',
-    window.i18n('userNeedsToHaveJoined'),
-    window.i18n('userNeedsToHaveJoinedDesc')
-  );
+export function pushFailedToAddAsModerator() {
+  pushToastWarning('failedToAddAsModerator', window.i18n('failedToAddAsModerator'));
+}
+
+export function pushFailedToRemoveFromModerator() {
+  pushToastWarning('failedToRemoveFromModerator', window.i18n('failedToRemoveFromModerator'));
 }
 
 export function pushUserAddedToModerators() {
@@ -210,11 +210,3 @@ export function pushUserRemovedFromModerators() {
 export function pushInvalidPubKey() {
   pushToastSuccess('invalidPubKey', window.i18n('invalidPubkeyFormat'));
 }
-
-export function pushErrorHappenedWhileRemovingModerator() {
-  pushToastError(
-    'errorHappenedWhileRemovingModerator',
-    window.i18n('errorHappenedWhileRemovingModerator'),
-    window.i18n('errorHappenedWhileRemovingModeratorDesc')
-  );
-}