Merge remote-tracking branch 'upstream/archive' into archive-update-v0.55.0

src/ts/components/shared/action-bar/action-bar.ts

@@ -83,6 +83,13 @@ export class ActionBar {
 			this.closeActions();
 		}
 		else {
+			// if the action menu was opened from the settings dropdown, just do nothing
+			// it means you can't close that menu by clicking on this button, but it's
+			// a minor issue
+			if (document.body.classList.contains('actions-modal-opened')) {
+				return;
+			}
+
 			this.isWaitingForActionsModal = true;
 			this.modalRef = this.modalService.show(this.actionsModal, { ignoreBackdropClick: true });
 		}

src/ts/components/shared/actions-modal/actions-modal.ts

@@ -94,6 +94,7 @@ export class ActionsModal implements OnInit, OnDestroy {
 		this.game.editingActions = false;
 		clearInterval(this.interval);
 		this.subscription && this.subscription.unsubscribe();
+		this.close.emit(); // need to emit in case the menu wasn't closed with the Close button
 		this.notify.emit();
 	}
 	ok() {

src/ts/components/shared/settings-modal/settings-modal.pug

@@ -102,8 +102,8 @@
 				.form-group
 					custom-checkbox(
 						[(checked)]="account.filterCyrillic"
-						help="Hide all messages containing russian alphabet")
-						| Filter russian chat
+						help="Hide all messages containing Russian alphabet")
+						| Filter Russian chat
 				.form-group
 					custom-checkbox(
 						[(checked)]="account.filterSwearWords"