isNonEmptyArray => arrayLength

dev/App/User.js

@@ -1,6 +1,6 @@
 import 'External/User/ko';
 
-import { isArray, isNonEmptyArray, pInt, pString } from 'Common/Utils';
+import { isArray, arrayLength, pInt, pString } from 'Common/Utils';
 import { isPosNumeric, delegateRunOnDestroy, mailToHelper } from 'Common/UtilsUser';
 
 import {
@@ -261,7 +261,7 @@ class AppUser extends AbstractApp {
 			setFolderHash(FolderUserStore.currentFolderFullNameRaw(), '');
 			alert(getNotification(iError));
 		} else if (FolderUserStore.currentFolder()) {
-			if (isArray(oData.Result) && 2 === oData.Result.length) {
+			if (2 === arrayLength(oData.Result)) {
 				setFolderHash(oData.Result[0], oData.Result[1]);
 			} else {
 				setFolderHash(FolderUserStore.currentFolderFullNameRaw(), '');
@@ -348,7 +348,7 @@ class AppUser extends AbstractApp {
 	 * @param {boolean=} bCopy = false
 	 */
 	moveMessagesToFolder(sFromFolderFullNameRaw, aUidForMove, sToFolderFullNameRaw, bCopy) {
-		if (sFromFolderFullNameRaw !== sToFolderFullNameRaw && isArray(aUidForMove) && aUidForMove.length) {
+		if (sFromFolderFullNameRaw !== sToFolderFullNameRaw && arrayLength(aUidForMove)) {
 			const oFromFolder = getFolderFromCacheList(sFromFolderFullNameRaw),
 				oToFolder = getFolderFromCacheList(sToFolderFullNameRaw);
 
@@ -519,8 +519,7 @@ class AppUser extends AbstractApp {
 		Remote.quota((iError, data) => {
 			if (
 				!iError &&
-				isArray(data.Result) &&
-				1 < data.Result.length &&
+				1 < arrayLength(data.Result) &&
 				isPosNumeric(data.Result[0], true) &&
 				isPosNumeric(data.Result[1], true)
 			) {
@@ -614,9 +613,9 @@ class AppUser extends AbstractApp {
 	 */
 	folderInformationMultiply(boot = false) {
 		const folders = FolderUserStore.getNextFolderNames(refreshFolders);
-		if (isNonEmptyArray(folders)) {
+		if (arrayLength(folders)) {
 			Remote.folderInformationMultiply((iError, oData) => {
-				if (!iError && isNonEmptyArray(oData.Result.List)) {
+				if (!iError && arrayLength(oData.Result.List)) {
 					const utc = Date.now();
 					oData.Result.List.forEach(item => {
 						const hash = getFolderHash(item.Folder),

dev/Common/Cache.js

@@ -1,5 +1,5 @@
 import { MessageSetAction } from 'Common/EnumsUser';
-import { isNonEmptyArray, pInt } from 'Common/Utils';
+import { arrayLength, pInt } from 'Common/Utils';
 
 let FOLDERS_CACHE = {},
 	FOLDERS_NAME_CACHE = {},
@@ -255,7 +255,7 @@ export class MessageFlagsCache
 	 * @param {Array} flags
 	 */
 	static storeByFolderAndUid(folder, uid, flags) {
-		if (isNonEmptyArray(flags)) {
+		if (arrayLength(flags)) {
 			this.setFor(folder, uid, flags);
 		}
 	}
@@ -269,7 +269,7 @@ export class MessageFlagsCache
 		let unread = 0;
 		const flags = this.getFor(folder, uid);
 
-		if (isNonEmptyArray(flags)) {
+		if (arrayLength(flags)) {
 			if (flags[0]) {
 				unread = 1;
 			}

dev/Common/File.js

@@ -1,7 +1,7 @@
 /* eslint key-spacing: 0 */
 /* eslint quote-props: 0 */
 
-import { isNonEmptyArray } from 'Common/Utils';
+import { arrayLength } from 'Common/Utils';
 
 const
 	cache = {},
@@ -250,7 +250,7 @@ export const FileInfo = {
 	 * @returns {string}
 	 */
 	getCombinedIconClass: data => {
-		if (isNonEmptyArray(data)) {
+		if (arrayLength(data)) {
 			let icons = data
 				.map(item => item ? FileInfo.getIconClass(FileInfo.getExtension(item[0]), item[1]) : '')
 				.validUnique();

dev/Common/Utils.js

@@ -3,7 +3,7 @@ import { doc, elementById } from 'Common/Globals';
 
 export const
 	isArray = Array.isArray,
-	isNonEmptyArray = array => isArray(array) && array.length,
+	arrayLength = array => isArray(array) && array.length,
 	isFunction = v => typeof v === 'function';
 
 /**
@@ -116,7 +116,7 @@ export function changeTheme(value, themeTrigger = ()=>{}) {
 		}
 		rl.fetchJSON(url, init)
 			.then(data => {
-				if (data && isArray(data) && 2 === data.length) {
+				if (2 === arrayLength(data)) {
 					themeStyle.textContent = data[1];
 					themeStyle.dataset.href = url;
 					themeStyle.dataset.theme = data[0];

dev/External/ko.js

@@ -1,7 +1,7 @@
 import { i18nToNodes } from 'Common/Translator';
 import { doc, createElement } from 'Common/Globals';
 import { SaveSettingsStep } from 'Common/Enums';
-import { isNonEmptyArray, isFunction } from 'Common/Utils';
+import { arrayLength, isFunction } from 'Common/Utils';
 
 const
 	koValue = value => !ko.isObservable(value) && isFunction(value) ? value() : ko.unwrap(value);
@@ -136,7 +136,7 @@ ko.extenders.limitedList = (target, limitedList) => {
 					const currentValue = ko.unwrap(target),
 						list = ko.unwrap(limitedList);
 
-					if (isNonEmptyArray(list)) {
+					if (arrayLength(list)) {
 						if (list.includes(newValue)) {
 							target(newValue);
 						} else if (list.includes(currentValue, list)) {

dev/Knoin/AbstractScreen.js

@@ -1,4 +1,4 @@
-import { isArray, isNonEmptyArray } from 'Common/Utils';
+import { isArray, arrayLength } from 'Common/Utils';
 
 export class AbstractScreen {
 	constructor(screenName, viewModels = []) {
@@ -42,7 +42,7 @@ export class AbstractScreen {
 		if (!this.__started) {
 			this.__started = true;
 			const routes = this.routes();
-			if (isNonEmptyArray(routes)) {
+			if (arrayLength(routes)) {
 				let route = new Crossroads(),
 					fMatcher = (this.onRoute || (()=>{})).bind(this);
 

dev/Knoin/Knoin.js

@@ -1,7 +1,7 @@
 import ko from 'ko';
 
 import { doc, $htmlCL } from 'Common/Globals';
-import { isNonEmptyArray, isFunction } from 'Common/Utils';
+import { arrayLength, isFunction } from 'Common/Utils';
 
 let currentScreen = null,
 	defaultScreenName = '';
@@ -227,7 +227,7 @@ function screenOnRoute(screenName, subPart) {
 					currentScreen.onHide && currentScreen.onHide();
 					currentScreen.onHideWithDelay && setTimeout(()=>currentScreen.onHideWithDelay(), 500);
 
-					if (isNonEmptyArray(currentScreen.viewModels)) {
+					if (arrayLength(currentScreen.viewModels)) {
 						currentScreen.viewModels.forEach(ViewModelClass => {
 							if (
 								ViewModelClass.__vm &&
@@ -251,7 +251,7 @@ function screenOnRoute(screenName, subPart) {
 				if (currentScreen && !isSameScreen) {
 					currentScreen.onShow && currentScreen.onShow();
 
-					if (isNonEmptyArray(currentScreen.viewModels)) {
+					if (arrayLength(currentScreen.viewModels)) {
 						currentScreen.viewModels.forEach(ViewModelClass => {
 							if (
 								ViewModelClass.__vm &&

dev/Model/Contact.js

@@ -1,4 +1,4 @@
-import { isNonEmptyArray } from 'Common/Utils';
+import { arrayLength } from 'Common/Utils';
 import { ContactPropertyModel, ContactPropertyType } from 'Model/ContactProperty';
 import { AbstractModel } from 'Knoin/AbstractModel';
 
@@ -26,7 +26,7 @@ export class ContactModel extends AbstractModel {
 		let name = '',
 			email = '';
 
-		if (isNonEmptyArray(this.properties)) {
+		if (arrayLength(this.properties)) {
 			this.properties.forEach(property => {
 				if (property) {
 					if (ContactPropertyType.FirstName === property.type()) {
@@ -52,7 +52,7 @@ export class ContactModel extends AbstractModel {
 		const contact = super.reviveFromJson(json);
 		if (contact) {
 			let list = [];
-			if (isNonEmptyArray(json.properties)) {
+			if (arrayLength(json.properties)) {
 				json.properties.forEach(property => {
 					property = ContactPropertyModel.reviveFromJson(property);
 					property && list.push(property);

dev/Model/Filter.js

@@ -1,6 +1,6 @@
 import ko from 'ko';
 
-import { isNonEmptyArray, pString } from 'Common/Utils';
+import { arrayLength, pString } from 'Common/Utils';
 import { delegateRunOnDestroy } from 'Common/UtilsUser';
 import { i18n } from 'Common/Translator';
 import { getFolderFromCacheList } from 'Common/Cache';
@@ -230,7 +230,7 @@ export class FilterModel extends AbstractModel {
 
 			filter.conditions([]);
 
-			if (isNonEmptyArray(json.Conditions)) {
+			if (arrayLength(json.Conditions)) {
 				filter.conditions(
 					json.Conditions.map(aData => FilterConditionModel.reviveFromJson(aData)).filter(v => v)
 				);

dev/Model/Message.js

@@ -4,7 +4,7 @@ import { MessagePriority } from 'Common/EnumsUser';
 import { i18n } from 'Common/Translator';
 
 import { encodeHtml } from 'Common/Html';
-import { isArray, isNonEmptyArray } from 'Common/Utils';
+import { isArray, arrayLength } from 'Common/Utils';
 
 import { serverRequestRaw } from 'Common/Links';
 
@@ -229,7 +229,7 @@ export class MessageModel extends AbstractModel {
 	 */
 	fromDkimData() {
 		let result = ['none', ''];
-		if (isNonEmptyArray(this.from) && 1 === this.from.length && this.from[0] && this.from[0].dkimStatus) {
+		if (1 === arrayLength(this.from) && this.from[0] && this.from[0].dkimStatus) {
 			result = [this.from[0].dkimStatus, this.from[0].dkimValue || ''];
 		}
 

dev/Model/OpenPgpKey.js

@@ -1,6 +1,6 @@
 import ko from 'ko';
 
-import { isNonEmptyArray } from 'Common/Utils';
+import { arrayLength } from 'Common/Utils';
 import { AbstractModel } from 'Knoin/AbstractModel';
 import { PgpUserStore } from 'Stores/User/Pgp';
 
@@ -21,7 +21,7 @@ export class OpenPgpKeyModel extends AbstractModel {
 
 		this.index = index;
 		this.id = ID;
-		this.ids = isNonEmptyArray(IDs) ? IDs : [ID];
+		this.ids = arrayLength(IDs) ? IDs : [ID];
 		this.guid = guID;
 		this.user = '';
 		this.users = userIDs;

dev/Model/SieveScript.js

@@ -2,7 +2,7 @@ import ko from 'ko';
 
 import { AbstractModel } from 'Knoin/AbstractModel';
 import { FilterModel } from 'Model/Filter';
-import { isNonEmptyArray, pString } from 'Common/Utils';
+import { arrayLength, pString } from 'Common/Utils';
 
 const SIEVE_FILE_NAME = 'rainloop.user';
 
@@ -327,7 +327,7 @@ export class SieveScriptModel extends AbstractModel
 		if (script) {
 			if (script.allowFilters()) {
 				script.filters(
-					isNonEmptyArray(json.filters)
+					arrayLength(json.filters)
 						? json.filters.map(aData => FilterModel.reviveFromJson(aData)).filter(v => v)
 						: sieveScriptToFilters(script.body())
 				);

dev/Remote/User/Fetch.js

@@ -1,4 +1,4 @@
-import { isArray, isNonEmptyArray, pString, pInt } from 'Common/Utils';
+import { isArray, arrayLength, pString, pInt } from 'Common/Utils';
 
 import {
 	getFolderHash,
@@ -371,7 +371,7 @@ class RemoteUserFetch extends AbstractFetchRemote {
 		let request = true;
 		const uids = [];
 
-		if (isNonEmptyArray(list)) {
+		if (arrayLength(list)) {
 			request = false;
 			list.forEach(messageListItem => {
 				if (!MessageFlagsCache.getFor(messageListItem.folder, messageListItem.uid)) {

dev/Settings/User/General.js

@@ -3,7 +3,7 @@ import ko from 'ko';
 import { MESSAGES_PER_PAGE_VALUES } from 'Common/Consts';
 import { SaveSettingsStep } from 'Common/Enums';
 import { EditorDefaultType, Layout } from 'Common/EnumsUser';
-import { SettingsGet } from 'Common/Globals';
+import { Settings, SettingsGet } from 'Common/Globals';
 import { isArray, settingsSaveHelperSimpleFunction, addObservablesTo, addSubscribablesTo } from 'Common/Utils';
 import { i18n, trigger as translatorTrigger, reload as translatorReload, convertLangName } from 'Common/Translator';
 
@@ -119,7 +119,7 @@ export class GeneralUserSettings {
 			enableSoundNotification: value => Remote.saveSetting('SoundNotification', value ? 1 : 0),
 			notificationSound: value => {
 				Remote.saveSetting('NotificationSound', value);
-				rl.settings.set('NotificationSound', value);
+				Settings.set('NotificationSound', value);
 			},
 
 			replySameFolder: value => Remote.saveSetting('ReplySameFolder', value ? 1 : 0),
@@ -138,9 +138,7 @@ export class GeneralUserSettings {
 
 	editMainIdentity() {
 		const identity = this.identityMain();
-		if (identity) {
-			showScreenPopup(IdentityPopupView, [identity]);
-		}
+		identity && showScreenPopup(IdentityPopupView, [identity]);
 	}
 
 	testSoundNotification() {

dev/Stores/User/Message.js

@@ -3,7 +3,7 @@ import ko from 'ko';
 import { Scope, Notification } from 'Common/Enums';
 import { MessageSetAction } from 'Common/EnumsUser';
 import { doc, $htmlCL, createElement, elementById } from 'Common/Globals';
-import { isNonEmptyArray, pInt, pString, addObservablesTo, addSubscribablesTo } from 'Common/Utils';
+import { arrayLength, pInt, pString, addObservablesTo, addSubscribablesTo } from 'Common/Utils';
 import { plainToHtml } from 'Common/UtilsUser';
 
 import {
@@ -237,7 +237,7 @@ export const MessageUserStore = new class {
 
 	initUidNextAndNewMessages(folder, uidNext, newMessages) {
 		if (getFolderInboxName() === folder && uidNext) {
-			if (isNonEmptyArray(newMessages)) {
+			if (arrayLength(newMessages)) {
 				newMessages.forEach(item => addNewMessageCache(folder, item.Uid));
 
 				NotificationUserStore.playSoundNotification();

dev/Stores/User/Pgp.js

@@ -1,7 +1,7 @@
 import ko from 'ko';
 
 import { i18n } from 'Common/Translator';
-import { isArray, isNonEmptyArray, pString } from 'Common/Utils';
+import { isArray, arrayLength, pString } from 'Common/Utils';
 import { createElement } from 'Common/Globals';
 
 import { AccountUserStore } from 'Stores/User/Account';
@@ -54,7 +54,7 @@ function domControlEncryptedClickHelper(store, dom, armoredMessage, recipients)
 								decryptedMessage.getText()
 							);
 						} else if (validPrivateKey) {
-							const keyIds = isNonEmptyArray(signingKeyIds) ? signingKeyIds : null,
+							const keyIds = arrayLength(signingKeyIds) ? signingKeyIds : null,
 								additional = keyIds
 									? keyIds.map(item => (item && item.toHex ? item.toHex() : null)).filter(v => v).join(', ')
 									: '';
@@ -110,7 +110,7 @@ function domControlSignedClickHelper(store, dom, armoredMessage) {
 						message.getText()
 					);
 				} else {
-					const keyIds = isNonEmptyArray(signingKeyIds) ? signingKeyIds : null,
+					const keyIds = arrayLength(signingKeyIds) ? signingKeyIds : null,
 						additional = keyIds
 							? keyIds.map(item => (item && item.toHex ? item.toHex() : null)).filter(v => v).join(', ')
 							: '';
@@ -186,7 +186,7 @@ export const PgpUserStore = new class {
 				}).flat().filter(v => v)
 			: [];
 
-		if (!result.length && isNonEmptyArray(recipients)) {
+		if (!result.length && arrayLength(recipients)) {
 			result = recipients.map(sEmail => {
 				const keys = sEmail ? this.findAllPrivateKeysByEmailNotNative(sEmail) : null;
 				return keys

dev/View/Popup/Compose.js

@@ -12,7 +12,7 @@ import {
 	SetSystemFoldersNotification
 } from 'Common/EnumsUser';
 
-import { inFocus, pInt, isArray, isNonEmptyArray } from 'Common/Utils';
+import { inFocus, pInt, isArray, arrayLength } from 'Common/Utils';
 import { delegateRunOnDestroy } from 'Common/UtilsUser';
 import { encodeHtml, HtmlEditor } from 'Common/Html';
 
@@ -308,7 +308,7 @@ class ComposePopupView extends AbstractViewPopup {
 			},
 
 			attachmentsInProcess: value => {
-				if (this.attachmentsInProcessError() && isNonEmptyArray(value)) {
+				if (this.attachmentsInProcessError() && arrayLength(value)) {
 					this.attachmentsInProcessError(false);
 				}
 			}
@@ -385,8 +385,7 @@ class ComposePopupView extends AbstractViewPopup {
 		if (!this.emptyToError() && !this.attachmentsInErrorError() && !this.attachmentsInProcessError()) {
 			if (SettingsUserStore.replySameFolder()) {
 				if (
-					isArray(this.aDraftInfo) &&
-					3 === this.aDraftInfo.length &&
+					3 === arrayLength(this.aDraftInfo) &&
 					null != this.aDraftInfo[2] &&
 					this.aDraftInfo[2].length
 				) {
@@ -400,7 +399,7 @@ class ComposePopupView extends AbstractViewPopup {
 				this.sendError(false);
 				this.sending(true);
 
-				if (isArray(this.aDraftInfo) && 3 === this.aDraftInfo.length) {
+				if (3 === arrayLength(this.aDraftInfo)) {
 					const flagsCache = MessageFlagsCache.getFor(this.aDraftInfo[2], this.aDraftInfo[1]);
 					if (flagsCache) {
 						if ('forward' === this.aDraftInfo[0]) {
@@ -753,7 +752,7 @@ class ComposePopupView extends AbstractViewPopup {
 	 * @param {Array} emails
 	 */
 	addEmailsTo(fKoValue, emails) {
-		if (isNonEmptyArray(emails)) {
+		if (arrayLength(emails)) {
 			const value = fKoValue().trim(),
 				values = emails.map(item => item ? item.toLine(false) : null)
 					.validUnique();
@@ -806,11 +805,11 @@ class ComposePopupView extends AbstractViewPopup {
 		oMessageOrArray = oMessageOrArray || null;
 		if (oMessageOrArray) {
 			message =
-				isArray(oMessageOrArray) && 1 === oMessageOrArray.length
+				1 === arrayLength(oMessageOrArray)
 					? oMessageOrArray[0]
-					: !isArray(oMessageOrArray)
-					? oMessageOrArray
-					: null;
+					: isArray(oMessageOrArray)
+					? null
+					: oMessageOrArray;
 		}
 
 		this.oLastMessage = message;
@@ -826,15 +825,15 @@ class ComposePopupView extends AbstractViewPopup {
 			excludeEmail[identity.email()] = true;
 		}
 
-		if (isNonEmptyArray(aToEmails)) {
+		if (arrayLength(aToEmails)) {
 			this.to(this.emailArrayToStringLineHelper(aToEmails));
 		}
 
-		if (isNonEmptyArray(aCcEmails)) {
+		if (arrayLength(aCcEmails)) {
 			this.cc(this.emailArrayToStringLineHelper(aCcEmails));
 		}
 
-		if (isNonEmptyArray(aBccEmails)) {
+		if (arrayLength(aBccEmails)) {
 			this.bcc(this.emailArrayToStringLineHelper(aBccEmails));
 		}
 
@@ -899,7 +898,7 @@ class ComposePopupView extends AbstractViewPopup {
 					this.subject(sSubject);
 					this.prepareMessageAttachments(message, lineComposeType);
 
-					this.aDraftInfo = isNonEmptyArray(aDraftInfo) && 3 === aDraftInfo.length ? aDraftInfo : null;
+					this.aDraftInfo = 3 === arrayLength(aDraftInfo) ? aDraftInfo : null;
 					this.sInReplyTo = message.sInReplyTo;
 					this.sReferences = message.sReferences;
 					break;
@@ -913,7 +912,7 @@ class ComposePopupView extends AbstractViewPopup {
 					this.subject(sSubject);
 					this.prepareMessageAttachments(message, lineComposeType);
 
-					this.aDraftInfo = isNonEmptyArray(aDraftInfo) && 3 === aDraftInfo.length ? aDraftInfo : null;
+					this.aDraftInfo = 3 === arrayLength(aDraftInfo) ? aDraftInfo : null;
 					this.sInReplyTo = message.sInReplyTo;
 					this.sReferences = message.sReferences;
 					break;
@@ -1003,7 +1002,7 @@ class ComposePopupView extends AbstractViewPopup {
 
 				this.setFocusInPopup();
 			});
-		} else if (isNonEmptyArray(oMessageOrArray)) {
+		} else if (arrayLength(oMessageOrArray)) {
 			oMessageOrArray.forEach(item => this.addMessageAsAttachment(item));
 
 			this.editor(editor => {
@@ -1024,7 +1023,7 @@ class ComposePopupView extends AbstractViewPopup {
 		}
 
 		const downloads = this.getAttachmentsDownloadsForUpload();
-		if (isNonEmptyArray(downloads)) {
+		if (arrayLength(downloads)) {
 			Remote.messageUploadAttachments((iError, oData) => {
 				if (!iError) {
 					Object.entries(oData.Result).forEach(([tempName, id]) => {

dev/View/Popup/Contacts.js

@@ -7,7 +7,7 @@ import {
 
 import { ComposeType } from 'Common/EnumsUser';
 
-import { isNonEmptyArray, pInt } from 'Common/Utils';
+import { arrayLength, pInt } from 'Common/Utils';
 import { delegateRunOnDestroy, computedPaginatorHelper, showMessageComposer } from 'Common/UtilsUser';
 
 import { Selector } from 'Common/Selector';
@@ -163,7 +163,7 @@ class ContactsPopupView extends AbstractViewPopup {
 			bccEmails = null;
 
 		const aC = this.contactsCheckedOrSelected();
-		if (isNonEmptyArray(aC)) {
+		if (arrayLength(aC)) {
 			aE = aC.map(oItem => {
 				if (oItem) {
 					const data = oItem.getNameAndEmailHelper(),
@@ -180,7 +180,7 @@ class ContactsPopupView extends AbstractViewPopup {
 			aE = aE.filter(value => !!value);
 		}
 
-		if (isNonEmptyArray(aE)) {
+		if (arrayLength(aE)) {
 			this.bBackToCompose = false;
 
 			hideScreenPopup(ContactsPopupView);
@@ -447,7 +447,7 @@ class ContactsPopupView extends AbstractViewPopup {
 				let count = 0,
 					list = [];
 
-				if (!iError && isNonEmptyArray(data.Result.List)) {
+				if (!iError && arrayLength(data.Result.List)) {
 					data.Result.List.forEach(item => {
 						item = ContactModel.reviveFromJson(item);
 						item && list.push(item);

dev/View/Popup/Plugin.js

@@ -2,7 +2,7 @@ import ko from 'ko';
 
 import { Scope } from 'Common/Enums';
 import { getNotification, i18n } from 'Common/Translator';
-import { isNonEmptyArray } from 'Common/Utils';
+import { arrayLength } from 'Common/Utils';
 
 import Remote from 'Remote/Admin/Fetch';
 
@@ -65,7 +65,7 @@ class PluginPopupView extends AbstractViewPopup {
 			this.readme(oPlugin.Readme);
 
 			const config = oPlugin.Config;
-			if (isNonEmptyArray(config)) {
+			if (arrayLength(config)) {
 				this.configures(
 					config.map(item => ({
 						value: ko.observable(item[0]),

dev/View/User/MailBox/MessageView.js

@@ -16,7 +16,7 @@ import {
 
 import { doc, $htmlCL, leftPanelDisabled, keyScopeReal, moveAction, Settings } from 'Common/Globals';
 
-import { isNonEmptyArray, inFocus } from 'Common/Utils';
+import { arrayLength, inFocus } from 'Common/Utils';
 import { mailToHelper, showMessageComposer } from 'Common/UtilsUser';
 
 import { SMAudio } from 'Common/Audio';
@@ -78,7 +78,7 @@ class MessageViewMailBoxUserView extends AbstractViewRight {
 		this.allowMessageListActions = Settings.capa(Capa.MessageListActions);
 
 		const attachmentsActions = Settings.app('attachmentsActions');
-		this.attachmentsActions = ko.observableArray(isNonEmptyArray(attachmentsActions) ? attachmentsActions : []);
+		this.attachmentsActions = ko.observableArray(arrayLength(attachmentsActions) ? attachmentsActions : []);
 
 		this.message = MessageUserStore.message;
 		this.hasCheckedMessages = MessageUserStore.hasCheckedMessages;
@@ -176,10 +176,8 @@ class MessageViewMailBoxUserView extends AbstractViewRight {
 
 			viewFromDkimStatusTitle:() => {
 				const status = this.viewFromDkimData();
-				if (isNonEmptyArray(status)) {
-					if (status[0]) {
-						return status[1] || 'DKIM: ' + status[0];
-					}
+				if (arrayLength(status) && status[0]) {
+					return status[1] || 'DKIM: ' + status[0];
 				}
 
 				return '';