diff --git a/core/src/apiKeyUtils.js b/core/src/apiKeyUtils.js
index 307ed6cb..e65772b0 100644
--- a/core/src/apiKeyUtils.js
+++ b/core/src/apiKeyUtils.js
@@ -49,8 +49,6 @@ export const testApiKey = async (apiKey) => {
     let testRes = await api.request(testUrl, {
         method: "GET"
     });
-    if (testRes === true) {
-        return true;
-    }
-    return false;
+    return testRes === true;
+
 }
diff --git a/core/src/components/app-view.js b/core/src/components/app-view.js
index 3f2b6877..07a0b84f 100644
--- a/core/src/components/app-view.js
+++ b/core/src/components/app-view.js
@@ -3,7 +3,7 @@ import { connect } from 'pwa-helpers'
 import { store } from '../store.js'
 import { Epml } from '../epml.js'
 import { addTradeBotRoutes } from '../tradebot/addTradeBotRoutes.js'
-import { get, translate } from '../../translate/index.js'
+import { get, translate } from '../../translate'
 import localForage from 'localforage'
 import { decryptData, encryptData } from '../lockScreen.js'
 import { setChatLastSeen } from '../redux/app/app-actions.js'
@@ -560,7 +560,7 @@ class AppView extends connect(store)(LitElement) {
         if(el3) {
             els['checklist'] = el3
         }
-       
+
         return els
     }
 
@@ -965,7 +965,7 @@ class AppView extends connect(store)(LitElement) {
             await appDelay(1000)
 
             if (this.isEmptyArray(this.tradeBotAvailableBtcQortal) === true) {
-                return
+
             } else {
                 const botbtcprice = this.round(parseFloat(this.tradeBotBtcBook[0].botBtcPrice))
                 const changebtcamount = parseFloat(this.tradeBotBtcBook[0].botBtcQortAmount)
@@ -1009,7 +1009,7 @@ class AppView extends connect(store)(LitElement) {
                 }
 
                 if (this.isEmptyArray(this.tradeBotBtcBook) === true) {
-                    return
+
                 } else {
                     const checkBotBtcFunds = this.round(parseFloat(this.tradeBotBtcBook[0].botBtcQortAmount) * parseFloat(this.tradeBotBtcBook[0].botBtcPrice))
                     const myBotBtcFunds = this.round(parseFloat(this.btcWalletBalance))
@@ -1162,7 +1162,7 @@ class AppView extends connect(store)(LitElement) {
             await appDelay(1000)
 
             if (this.isEmptyArray(this.tradeBotAvailableLtcQortal) === true) {
-                return
+
             } else {
                 const botltcprice = this.round(parseFloat(this.tradeBotLtcBook[0].botLtcPrice))
                 const changeltcamount = parseFloat(this.tradeBotLtcBook[0].botLtcQortAmount)
@@ -1206,7 +1206,7 @@ class AppView extends connect(store)(LitElement) {
                 }
 
                 if (this.isEmptyArray(this.tradeBotLtcBook) === true) {
-                    return
+
                 } else {
                     const checkBotLtcFunds = this.round(parseFloat(this.tradeBotLtcBook[0].botLtcQortAmount) * parseFloat(this.tradeBotLtcBook[0].botLtcPrice))
                     const myBotLtcFunds = this.round(parseFloat(this.ltcWalletBalance))
@@ -1348,7 +1348,7 @@ class AppView extends connect(store)(LitElement) {
             await appDelay(1000)
 
             if (this.isEmptyArray(this.tradeBotAvailableDogeQortal) === true) {
-                return
+
             } else {
                 const botdogeprice = this.round(parseFloat(this.tradeBotDogeBook[0].botDogePrice))
                 const changedogeamount = parseFloat(this.tradeBotDogeBook[0].botDogeQortAmount)
@@ -1392,7 +1392,7 @@ class AppView extends connect(store)(LitElement) {
                 }
 
                 if (this.isEmptyArray(this.tradeBotDogeBook) === true) {
-                    return
+
                 } else {
                     const checkBotDogeFunds = this.round(parseFloat(this.tradeBotDogeBook[0].botDogeQortAmount) * parseFloat(this.tradeBotDogeBook[0].botDogePrice))
                     const myBotDogeFunds = this.round(parseFloat(this.dogeWalletBalance))
@@ -1534,7 +1534,7 @@ class AppView extends connect(store)(LitElement) {
             await appDelay(1000)
 
             if (this.isEmptyArray(this.tradeBotAvailableDgbQortal) === true) {
-                return
+
             } else {
                 const botdgbprice = this.round(parseFloat(this.tradeBotDgbBook[0].botDgbPrice))
                 const changedgbamount = parseFloat(this.tradeBotDgbBook[0].botDgbQortAmount)
@@ -1578,7 +1578,7 @@ class AppView extends connect(store)(LitElement) {
                 }
 
                 if (this.isEmptyArray(this.tradeBotDgbBook) === true) {
-                    return
+
                 } else {
                     const checkBotDgbFunds = this.round(parseFloat(this.tradeBotDgbBook[0].botDgbQortAmount) * parseFloat(this.tradeBotDgbBook[0].botDgbPrice))
                     const myBotDgbFunds = this.round(parseFloat(this.dgbWalletBalance))
@@ -1720,7 +1720,7 @@ class AppView extends connect(store)(LitElement) {
             await appDelay(1000)
 
             if (this.isEmptyArray(this.tradeBotAvailableRvnQortal) === true) {
-                return
+
             } else {
                 const botrvnprice = this.round(parseFloat(this.tradeBotRvnBook[0].botRvnPrice))
                 const changervnamount = parseFloat(this.tradeBotRvnBook[0].botRvnQortAmount)
@@ -1764,7 +1764,7 @@ class AppView extends connect(store)(LitElement) {
                 }
 
                 if (this.isEmptyArray(this.tradeBotRvnBook) === true) {
-                    return
+
                 } else {
                     const checkBotRvnFunds = this.round(parseFloat(this.tradeBotRvnBook[0].botRvnQortAmount) * parseFloat(this.tradeBotRvnBook[0].botRvnPrice))
                     const myBotRvnFunds = this.round(parseFloat(this.rvnWalletBalance))
@@ -1906,7 +1906,7 @@ class AppView extends connect(store)(LitElement) {
             await appDelay(1000)
 
             if (this.isEmptyArray(this.tradeBotAvailableArrrQortal) === true) {
-                return
+
             } else {
                 const botarrrprice = this.round(parseFloat(this.tradeBotArrrBook[0].botArrrPrice))
                 const changearrramount = parseFloat(this.tradeBotArrrBook[0].botArrrQortAmount)
@@ -1950,7 +1950,7 @@ class AppView extends connect(store)(LitElement) {
                 }
 
                 if (this.isEmptyArray(this.tradeBotArrrBook) === true) {
-                    return
+
                 } else {
                     const checkBotArrrFunds = this.round(parseFloat(this.tradeBotArrrBook[0].botArrrQortAmount) * parseFloat(this.tradeBotArrrBook[0].botArrrPrice))
                     const myBotArrrFunds = this.round(parseFloat(this.arrrWalletBalance))
@@ -2243,7 +2243,7 @@ class AppView extends connect(store)(LitElement) {
             this.helperMessage = this.renderHelperErr()
             await errDelay(3000)
             this.helperMessage = this.renderHelperPass()
-            return
+
         }
     }
 
@@ -3365,4 +3365,4 @@ class AppView extends connect(store)(LitElement) {
     }
 }
 
-window.customElements.define('app-view', AppView)
\ No newline at end of file
+window.customElements.define('app-view', AppView)
diff --git a/core/src/components/beginner-tour/tour-component.js b/core/src/components/beginner-tour/tour-component.js
index f51ba3d6..5475235a 100644
--- a/core/src/components/beginner-tour/tour-component.js
+++ b/core/src/components/beginner-tour/tour-component.js
@@ -5,7 +5,7 @@ import '@material/mwc-icon';
 import '@polymer/paper-spinner/paper-spinner-lite.js';
 import '@vaadin/tooltip';
 import '@material/mwc-button';
-import { get, translate } from '../../../translate/index.js';
+import { get, translate } from '../../../translate';
 import '@polymer/paper-dialog/paper-dialog.js';
 import { setNewTab } from '../../redux/app/app-actions.js';
 import { store } from '../../store.js';
@@ -116,7 +116,7 @@ class TourComponent extends connect(store)(LitElement) {
 
 	_controlOpenWelcomeModal() {
     this.isSynced = true
-		
+
 		const seenWelcomeSync = JSON.parse(
 			localStorage.getItem('welcome-sync') || 'false'
 		);
@@ -280,7 +280,7 @@ class TourComponent extends connect(store)(LitElement) {
         <span><img src="/img/syncing.png" style="height: 24px; width: 24px; padding-top: 4px;" /></span>
           <p style="margin:0px;padding:0px">${get("tour.tour4")}</p>
           </div>
-           
+
                 `,
 					},
 				});
@@ -397,7 +397,7 @@ class TourComponent extends connect(store)(LitElement) {
 								class="close-button"
 								@click=${()=> {
                   this.onClose()
-				  
+
                 }}
 							>
 								${translate("general.close")}
diff --git a/core/src/components/check-for-update.js b/core/src/components/check-for-update.js
index 10ad8339..26a9a70e 100644
--- a/core/src/components/check-for-update.js
+++ b/core/src/components/check-for-update.js
@@ -1,5 +1,5 @@
 import {css, html, LitElement} from 'lit'
-import {translate} from '../../translate/index.js'
+import {translate} from '../../translate'
 import isElectron from 'is-electron'
 
 import '@polymer/paper-icon-button/paper-icon-button.js'
diff --git a/core/src/components/friends-view/ChatSideNavHeads.js b/core/src/components/friends-view/ChatSideNavHeads.js
index 66c006fb..d2f6ebdd 100644
--- a/core/src/components/friends-view/ChatSideNavHeads.js
+++ b/core/src/components/friends-view/ChatSideNavHeads.js
@@ -1,5 +1,5 @@
 import {css, html, LitElement} from 'lit'
-import {get} from '../../../translate/index.js'
+import {get} from '../../../translate'
 import '@material/mwc-icon'
 import '@vaadin/tooltip';
 
@@ -206,11 +206,9 @@ class ChatSideNavHeads extends LitElement {
         if(changedProperties.has('chatInfo')){
             return true
         }
-        if(changedProperties.has('isImageLoaded')){
-            return true
-        }
+        return !!changedProperties.has('isImageLoaded');
+
 
-        return false
       }
 
     getUrl(chatUrl) {
diff --git a/core/src/components/friends-view/add-friends-modal.js b/core/src/components/friends-view/add-friends-modal.js
index c622e4ef..1c3412c4 100644
--- a/core/src/components/friends-view/add-friends-modal.js
+++ b/core/src/components/friends-view/add-friends-modal.js
@@ -1,5 +1,5 @@
 import {css, html, LitElement} from 'lit';
-import {translate,} from '../../../translate/index.js'
+import {translate,} from '../../../translate'
 import '@material/mwc-button';
 import '@material/mwc-dialog';
 import '@material/mwc-checkbox';
diff --git a/core/src/components/friends-view/avatar.js b/core/src/components/friends-view/avatar.js
index fdee3967..5659478d 100644
--- a/core/src/components/friends-view/avatar.js
+++ b/core/src/components/friends-view/avatar.js
@@ -1,5 +1,5 @@
 import { LitElement, html, css } from 'lit';
-import { get, translate } from '../../../translate/index.js'
+import { get, translate } from '../../../translate'
 import axios from 'axios';
 import '@material/mwc-menu';
 import '@material/mwc-list/mwc-list-item.js';
diff --git a/core/src/components/friends-view/beginner-checklist.js b/core/src/components/friends-view/beginner-checklist.js
index 3501d112..b942c621 100644
--- a/core/src/components/friends-view/beginner-checklist.js
+++ b/core/src/components/friends-view/beginner-checklist.js
@@ -8,7 +8,7 @@ import '@polymer/iron-icons/iron-icons.js';
 import { store } from '../../store.js';
 import { setNewTab } from '../../redux/app/app-actions.js';
 import '@material/mwc-icon';
-import { get, translate } from '../../../translate/index.js';
+import { get, translate } from '../../../translate';
 import { repeat } from 'lit/directives/repeat.js';
 import '../../../../plugins/plugins/core/components/TimeAgo.js';
 import '../notification-view/popover.js';
@@ -94,11 +94,7 @@ class BeginnerChecklist extends connect(store)(LitElement) {
 			const res = await fetch(endpoint);
 			const getNames = await res.json();
 
-			if (Array.isArray(getNames) && getNames.length > 0) {
-				this.hasName = true;
-			} else {
-				this.hasName = false;
-			}
+			this.hasName = Array.isArray(getNames) && getNames.length > 0;
 		} catch (error) {
 			return '';
 		}
@@ -132,7 +128,7 @@ class BeginnerChecklist extends connect(store)(LitElement) {
 			state.app.accountInfo.names.length > 0
 		) {
 			this.hasName = true;
-		} 
+		}
 	}
 
 	handleBlur() {
diff --git a/core/src/components/friends-view/core-sync-status.js b/core/src/components/friends-view/core-sync-status.js
index 733123aa..adef06ac 100644
--- a/core/src/components/friends-view/core-sync-status.js
+++ b/core/src/components/friends-view/core-sync-status.js
@@ -1,7 +1,7 @@
 import {css, html, LitElement} from 'lit'
 import {store} from '../../store'
 import {connect} from 'pwa-helpers'
-import {translate} from '../../../translate/index.js'
+import {translate} from '../../../translate'
 
 class CoreSyncStatus extends connect(store)(LitElement) {
 	static get properties() {
@@ -201,4 +201,4 @@ class CoreSyncStatus extends connect(store)(LitElement) {
 
 }
 
-customElements.define('core-sync-status', CoreSyncStatus)
\ No newline at end of file
+customElements.define('core-sync-status', CoreSyncStatus)
diff --git a/core/src/components/friends-view/feed-item.js b/core/src/components/friends-view/feed-item.js
index 4b344187..84b180c1 100644
--- a/core/src/components/friends-view/feed-item.js
+++ b/core/src/components/friends-view/feed-item.js
@@ -1,5 +1,5 @@
 import {css, html, LitElement} from 'lit';
-import {translate,} from '../../../translate/index.js'
+import {translate,} from '../../../translate'
 import axios from 'axios'
 import '@material/mwc-menu';
 import '@material/mwc-list/mwc-list-item.js'
diff --git a/core/src/components/friends-view/friend-item-actions.js b/core/src/components/friends-view/friend-item-actions.js
index d4a2d2b0..7b5a1139 100644
--- a/core/src/components/friends-view/friend-item-actions.js
+++ b/core/src/components/friends-view/friend-item-actions.js
@@ -2,7 +2,7 @@
 import { css, html, LitElement } from 'lit';
 import { createPopper } from '@popperjs/core';
 import '@material/mwc-icon';
-import { translate } from '../../../translate/index.js'
+import { translate } from '../../../translate'
 import { store } from '../../store';
 import { connect } from 'pwa-helpers';
 import { setNewTab, setSideEffectAction } from '../../redux/app/app-actions';
diff --git a/core/src/components/friends-view/friends-feed.js b/core/src/components/friends-view/friends-feed.js
index 6d265d6b..153fff82 100644
--- a/core/src/components/friends-view/friends-feed.js
+++ b/core/src/components/friends-view/friends-feed.js
@@ -5,7 +5,7 @@ import {friendsViewStyles} from './friends-view-css';
 import {connect} from 'pwa-helpers';
 import {store} from '../../store';
 import './feed-item'
-import {translate} from '../../../translate/index.js'
+import {translate} from '../../../translate'
 
 import '@polymer/paper-spinner/paper-spinner-lite.js'
 
@@ -216,7 +216,7 @@ this.getFeedOnInterval()
 
 	observerHandler(entries) {
 		if (!entries[0].isIntersecting) {
-			return;
+
 		} else {
 			if (this.feedToRender.length < 20) {
 				return;
@@ -375,7 +375,7 @@ this.getFeedOnInterval()
           return false;
         });
       }
-      
+
 
     async  loadAndMergeData() {
         let allData = this.feed
diff --git a/core/src/components/friends-view/friends-side-panel-parent.js b/core/src/components/friends-view/friends-side-panel-parent.js
index f763c4d1..42984e65 100644
--- a/core/src/components/friends-view/friends-side-panel-parent.js
+++ b/core/src/components/friends-view/friends-side-panel-parent.js
@@ -2,7 +2,7 @@ import {css, html, LitElement} from 'lit'
 import '@material/mwc-icon'
 import './friends-side-panel.js'
 import '@vaadin/tooltip'
-import {translate} from '../../../translate/index.js'
+import {translate} from '../../../translate'
 
 class FriendsSidePanelParent extends LitElement {
 	static get properties() {
diff --git a/core/src/components/friends-view/friends-side-panel.js b/core/src/components/friends-view/friends-side-panel.js
index d47cc5e3..3e4a0370 100644
--- a/core/src/components/friends-view/friends-side-panel.js
+++ b/core/src/components/friends-view/friends-side-panel.js
@@ -2,7 +2,7 @@ import {css, html, LitElement} from 'lit';
 import '@material/mwc-icon';
 import './friends-view'
 import './friends-feed'
-import {translate} from '../../../translate/index.js'
+import {translate} from '../../../translate'
 
 class FriendsSidePanel extends LitElement {
     static get properties() {
diff --git a/core/src/components/friends-view/friends-view.js b/core/src/components/friends-view/friends-view.js
index 148422c9..22fb30d6 100644
--- a/core/src/components/friends-view/friends-view.js
+++ b/core/src/components/friends-view/friends-view.js
@@ -13,7 +13,7 @@ import './ChatSideNavHeads';
 import '../../../../plugins/plugins/core/components/ChatSearchResults'
 import './add-friends-modal'
 
-import {translate,} from '../../../translate/index.js'
+import {translate,} from '../../../translate'
 import {store} from '../../store';
 import {friendsViewStyles} from './friends-view-css';
 import {parentEpml} from '../show-plugin';
@@ -125,7 +125,7 @@ class FriendsView extends connect(store)(LitElement) {
 				name
 			};
 		}
-		
+
 		this.isOpenAddFriendsModal = true
 		this.openSidePanel()
 	}
@@ -165,7 +165,7 @@ class FriendsView extends connect(store)(LitElement) {
 
 	observerHandler(entries) {
 		if (!entries[0].isIntersecting) {
-			return;
+
 		} else {
 			if (this.friendList.length < 20) {
 				return;
diff --git a/core/src/components/friends-view/profile-modal-update.js b/core/src/components/friends-view/profile-modal-update.js
index bdf58755..2c6125a1 100644
--- a/core/src/components/friends-view/profile-modal-update.js
+++ b/core/src/components/friends-view/profile-modal-update.js
@@ -1,6 +1,6 @@
 import { LitElement, html, css } from 'lit';
 import { render } from 'lit/html.js';
-import { use, get, translate, translateUnsafeHTML, registerTranslateConfig } from '../../../translate/index.js'
+import { use, get, translate, translateUnsafeHTML, registerTranslateConfig } from '../../../translate'
 import '@material/mwc-button';
 import '@material/mwc-icon';
 import '@vaadin/tooltip';
@@ -274,7 +274,7 @@ class ProfileModalUpdate extends connect(store)(LitElement) {
 			this.requestUpdate();
 		}
 
-		
+
 	}
 
 	async firstUpdated() {
@@ -549,12 +549,12 @@ class ProfileModalUpdate extends connect(store)(LitElement) {
 									<div
 										style="display:flex;justify-content:center;flex-direction:column;gap:25px"
 									>
-										
+
 										<div
 											style="display:flex;gap:15px;align-items:center"
 										>
 										<p
-										
+
 											style="color: var(--black);font-size:16px"
 										>
 											${key}
@@ -592,9 +592,9 @@ class ProfileModalUpdate extends connect(store)(LitElement) {
 						>
 							${translate('general.close')}
 						</button>
-						
+
 						<div style="display:flex;gap:10px;align-items:center">
-						
+
 						<button
 							?disabled="${this.isLoading}"
 							class="modal-button"
@@ -718,7 +718,7 @@ class ProfileModalUpdate extends connect(store)(LitElement) {
 							class="input"
 							.value=${this.newFieldName}
 							@change=${(e) => {
-								this.newFieldName = e.target.value	
+								this.newFieldName = e.target.value
 							}}
 						/>
 						<input
diff --git a/core/src/components/friends-view/profile.js b/core/src/components/friends-view/profile.js
index 6c5d8749..aa73b0f5 100644
--- a/core/src/components/friends-view/profile.js
+++ b/core/src/components/friends-view/profile.js
@@ -6,7 +6,7 @@ import { store } from '../../store.js';
 import WebWorker2 from '../WebWorkerFile.js';
 import '@polymer/paper-spinner/paper-spinner-lite.js';
 import '@vaadin/tooltip';
-import { get, translate } from '../../../translate/index.js'
+import { get, translate } from '../../../translate'
 import ShortUniqueId from 'short-unique-id';
 import '@polymer/paper-dialog/paper-dialog.js';
 
@@ -814,11 +814,7 @@ class ProfileQdn extends connect(store)(LitElement) {
 			const findIndex = friendList.findIndex(
 				(friend) => friend.name === name
 			);
-			if (findIndex !== -1) {
-				this.isFriend = true;
-			} else {
-				this.isFriend = false;
-			}
+			this.isFriend = findIndex !== -1;
 		} catch (error) {}
 	}
 	render() {
diff --git a/core/src/components/friends-view/save-settings-qdn.js b/core/src/components/friends-view/save-settings-qdn.js
index 29ad055f..d9f78df8 100644
--- a/core/src/components/friends-view/save-settings-qdn.js
+++ b/core/src/components/friends-view/save-settings-qdn.js
@@ -6,12 +6,12 @@ import { store } from '../../store.js';
 import WebWorker from '../WebWorkerFile.js';
 import '@polymer/paper-spinner/paper-spinner-lite.js';
 import '@vaadin/tooltip';
-import { get, translate } from '../../../translate/index.js'
+import { get, translate } from '../../../translate'
 import ShortUniqueId from 'short-unique-id';
 
 import {
 	decryptGroupData,
-	
+
 	encryptDataGroup,
 	objectToBase64,
 	uint8ArrayToObject,
@@ -331,7 +331,7 @@ class SaveSettingsQdn extends connect(store)(LitElement) {
 			 nameObject = store.getState().app.accountInfo.names[0];
 
 			} catch (error) {
-				
+
 			}
 			if (!nameObject) {
 				this.name = null;
diff --git a/core/src/components/language-selector.js b/core/src/components/language-selector.js
index f3a42ab2..0cfaf8ef 100644
--- a/core/src/components/language-selector.js
+++ b/core/src/components/language-selector.js
@@ -1,5 +1,5 @@
 import {css, html, LitElement} from 'lit'
-import {registerTranslateConfig, translate, use} from '../../translate/index.js'
+import {registerTranslateConfig, translate, use} from '../../translate'
 
 registerTranslateConfig({
   loader: lang => fetch(`/language/${lang}.json`).then(res => res.json())
diff --git a/core/src/components/login-view/create-account-section.js b/core/src/components/login-view/create-account-section.js
index 822b71df..1915903a 100644
--- a/core/src/components/login-view/create-account-section.js
+++ b/core/src/components/login-view/create-account-section.js
@@ -1,7 +1,7 @@
 import {css, html, LitElement} from 'lit'
 import {connect} from 'pwa-helpers'
 import {store} from '../../store.js'
-import {get, translate} from '../../../translate/index.js'
+import {get, translate} from '../../../translate'
 
 import {createWallet} from '../../../../crypto/api/createWallet.js'
 import {doLogin, doLogout, doSelectAddress} from '../../redux/app/app-actions.js'
diff --git a/core/src/components/login-view/login-section.js b/core/src/components/login-view/login-section.js
index af178f4e..34bb9b47 100644
--- a/core/src/components/login-view/login-section.js
+++ b/core/src/components/login-view/login-section.js
@@ -2,7 +2,7 @@ import {css, html, LitElement} from 'lit'
 import {connect} from 'pwa-helpers'
 import {store} from '../../store.js'
 import {checkApiKey} from '../../apiKeyUtils.js'
-import {translate} from '../../../translate/index.js'
+import {translate} from '../../../translate'
 
 import '@material/mwc-button'
 import '@material/mwc-checkbox'
diff --git a/core/src/components/login-view/login-view.js b/core/src/components/login-view/login-view.js
index 5d576bf1..e8fd22b8 100644
--- a/core/src/components/login-view/login-view.js
+++ b/core/src/components/login-view/login-view.js
@@ -2,7 +2,7 @@ import {css, html, LitElement} from 'lit'
 import {connect} from 'pwa-helpers'
 import {store} from '../../store.js'
 import {stateAwait} from '../../stateAwait.js'
-import {get} from '../../../translate/index.js'
+import {get} from '../../../translate'
 
 import '@material/mwc-button'
 import '@material/mwc-icon'
diff --git a/core/src/components/login-view/particle.js b/core/src/components/login-view/particle.js
index c743719e..601e5301 100644
--- a/core/src/components/login-view/particle.js
+++ b/core/src/components/login-view/particle.js
@@ -1255,11 +1255,11 @@ function hexToRgb(hex) {
         g: parseInt(result[2], 16),
         b: parseInt(result[3], 16)
     } : null
-};
+}
 
 function clamp(number, min, max) {
     return Math.min(Math.max(number, min), max)
-};
+}
 
 function isInArray(value, array) {
     return array.indexOf(value) > -1
diff --git a/core/src/components/login-view/welcome-page.js b/core/src/components/login-view/welcome-page.js
index cf1f08d2..a3f209e3 100644
--- a/core/src/components/login-view/welcome-page.js
+++ b/core/src/components/login-view/welcome-page.js
@@ -1,5 +1,5 @@
 import {css, html, LitElement} from 'lit'
-import {translate} from '../../../translate/index.js'
+import {translate} from '../../../translate'
 
 import '@material/mwc-button'
 
diff --git a/core/src/components/logout-view/logout-view.js b/core/src/components/logout-view/logout-view.js
index 4db72f8c..487aa7c8 100644
--- a/core/src/components/logout-view/logout-view.js
+++ b/core/src/components/logout-view/logout-view.js
@@ -2,7 +2,7 @@ import {css, html, LitElement} from 'lit'
 import {connect} from 'pwa-helpers'
 import {store} from '../../store.js'
 import {doLogout} from '../../redux/app/app-actions.js'
-import {translate} from '../../../translate/index.js'
+import {translate} from '../../../translate'
 
 import '@polymer/paper-dialog/paper-dialog.js'
 import '@material/mwc-button'
diff --git a/core/src/components/new-selector.js b/core/src/components/new-selector.js
index e66c0f59..91a49326 100644
--- a/core/src/components/new-selector.js
+++ b/core/src/components/new-selector.js
@@ -1,5 +1,5 @@
 import {css, html, LitElement} from 'lit'
-import {registerTranslateConfig, translate, use} from '../../translate/index.js'
+import {registerTranslateConfig, translate, use} from '../../translate'
 
 registerTranslateConfig({
   loader: lang => fetch(`/language/${lang}.json`).then(res => res.json())
diff --git a/core/src/components/notification-view/notification-bell-general.js b/core/src/components/notification-view/notification-bell-general.js
index 612fcb21..893cc2a0 100644
--- a/core/src/components/notification-view/notification-bell-general.js
+++ b/core/src/components/notification-view/notification-bell-general.js
@@ -8,7 +8,7 @@ import '@polymer/iron-icons/iron-icons.js';
 import {store} from '../../store.js';
 import {setNewNotification} from '../../redux/app/app-actions.js';
 import '@material/mwc-icon';
-import {get, translate} from '../../../translate/index.js'
+import {get, translate} from '../../../translate'
 import {repeat} from 'lit/directives/repeat.js';
 import '../../../../plugins/plugins/core/components/TimeAgo.js';
 import './popover.js';
@@ -20,7 +20,6 @@ class NotificationBellGeneral extends connect(store)(LitElement) {
 		showNotifications: { type: Boolean },
 		notificationCount: { type: Boolean },
 		theme: { type: String, reflect: true },
-		notifications: { type: Array },
 		currentNotification: { type: Object },
 	};
 
diff --git a/core/src/components/notification-view/notification-bell.js b/core/src/components/notification-view/notification-bell.js
index 0e2efcb9..302ce121 100644
--- a/core/src/components/notification-view/notification-bell.js
+++ b/core/src/components/notification-view/notification-bell.js
@@ -111,11 +111,7 @@ class NotificationBell extends connect(store)(LitElement) {
                     }
                     this.notifications = notificationsToShow
 
-                    if (this.notifications.length === 0) {
-                        this.notificationCount = false
-                    } else {
-                        this.notificationCount = true
-                    }
+                    this.notificationCount = this.notifications.length !== 0;
 
                     if (!this.initialFetch) this.initialFetch = true
                 } catch (error) {
diff --git a/core/src/components/search-modal.js b/core/src/components/search-modal.js
index 281931a6..c8918747 100644
--- a/core/src/components/search-modal.js
+++ b/core/src/components/search-modal.js
@@ -1,5 +1,5 @@
 import {css, html, LitElement} from 'lit'
-import {get, translate} from '../../translate/index.js'
+import {get, translate} from '../../translate'
 import snackbar from '../functional-components/snackbar.js'
 
 import '@polymer/paper-icon-button/paper-icon-button.js'
@@ -118,7 +118,7 @@ class SearchModal extends LitElement {
 				dismiss: true
 			})
 			this.shadowRoot.getElementById('searchContent').value = this.searchContentString
-			return
+
 		} else {
 			let sendInfoAddress = this.shadowRoot.getElementById('searchContent').value
 			const infoDialog = document.getElementById('main-app').shadowRoot.querySelector('app-view').shadowRoot.querySelector('user-info-view')
diff --git a/core/src/components/settings-view/account-view.js b/core/src/components/settings-view/account-view.js
index f0de4330..53716286 100644
--- a/core/src/components/settings-view/account-view.js
+++ b/core/src/components/settings-view/account-view.js
@@ -1,7 +1,7 @@
 import { LitElement, html, css } from 'lit'
 import { connect } from 'pwa-helpers'
 import { store } from '../../store.js'
-import { get, translate } from '../../../translate/index.js'
+import { get, translate } from '../../../translate'
 
 class AccountView extends connect(store)(LitElement) {
     static get properties() {
@@ -136,4 +136,4 @@ class AccountView extends connect(store)(LitElement) {
     }
 }
 
-window.customElements.define('account-view', AccountView)
\ No newline at end of file
+window.customElements.define('account-view', AccountView)
diff --git a/core/src/components/settings-view/export-keys.js b/core/src/components/settings-view/export-keys.js
index c92f683c..ab61ca61 100644
--- a/core/src/components/settings-view/export-keys.js
+++ b/core/src/components/settings-view/export-keys.js
@@ -3,7 +3,7 @@ import {connect} from 'pwa-helpers'
 import {store} from '../../store.js'
 import { Epml } from '../../epml.js'
 import { addTradeBotRoutes } from '../../tradebot/addTradeBotRoutes.js'
-import {get, translate} from '../../../translate/index.js'
+import {get, translate} from '../../../translate'
 import snackbar from '../../functional-components/snackbar.js'
 import FileSaver from 'file-saver'
 
diff --git a/core/src/components/settings-view/notifications-view.js b/core/src/components/settings-view/notifications-view.js
index f8bbb860..1c871349 100644
--- a/core/src/components/settings-view/notifications-view.js
+++ b/core/src/components/settings-view/notifications-view.js
@@ -3,7 +3,7 @@ import {connect} from 'pwa-helpers'
 import {store} from '../../store.js'
 import {allowShowSyncIndicator, removeShowSyncIndicator} from '../../redux/app/app-actions.js'
 import {doSetQChatNotificationConfig} from '../../redux/user/user-actions.js'
-import {translate} from '../../../translate/index.js'
+import {translate} from '../../../translate'
 import isElectron from 'is-electron'
 
 import '@material/mwc-checkbox'
diff --git a/core/src/components/settings-view/qr-login-view.js b/core/src/components/settings-view/qr-login-view.js
index 1816930e..d4f0bc74 100644
--- a/core/src/components/settings-view/qr-login-view.js
+++ b/core/src/components/settings-view/qr-login-view.js
@@ -1,7 +1,7 @@
 import {css, html, LitElement} from 'lit'
 import {connect} from 'pwa-helpers'
 import {store} from '../../store.js'
-import {translate} from '../../../translate/index.js'
+import {translate} from '../../../translate'
 
 import '@material/mwc-textfield'
 import '@material/mwc-icon'
diff --git a/core/src/components/settings-view/security-view.js b/core/src/components/settings-view/security-view.js
index 094eac8c..f8168fd8 100644
--- a/core/src/components/settings-view/security-view.js
+++ b/core/src/components/settings-view/security-view.js
@@ -10,7 +10,7 @@ import {
 	removeQAPPAutoLists,
 	setIsOpenDevDialog
 } from '../../redux/app/app-actions.js'
-import {get, translate} from '../../../translate/index.js'
+import {get, translate} from '../../../translate'
 import snackbar from '../../functional-components/snackbar.js'
 import FileSaver from 'file-saver'
 
diff --git a/core/src/components/settings-view/user-settings.js b/core/src/components/settings-view/user-settings.js
index 84bec854..fc923660 100644
--- a/core/src/components/settings-view/user-settings.js
+++ b/core/src/components/settings-view/user-settings.js
@@ -1,7 +1,7 @@
 import {css, html, LitElement} from 'lit'
 import {connect} from 'pwa-helpers'
 import {store} from '../../store.js'
-import {translate} from '../../../translate/index.js'
+import {translate} from '../../../translate'
 
 import '@polymer/paper-dialog/paper-dialog.js'
 import '@material/mwc-button'
diff --git a/core/src/components/show-plugin.js b/core/src/components/show-plugin.js
index d193db93..3ef924d2 100644
--- a/core/src/components/show-plugin.js
+++ b/core/src/components/show-plugin.js
@@ -8,7 +8,7 @@ import {repeat} from 'lit/directives/repeat.js';
 import ShortUniqueId from 'short-unique-id';
 import {setIsOpenDevDialog, setNewTab} from '../redux/app/app-actions.js'
 import FileSaver from 'file-saver'
-import {get, registerTranslateConfig, translate, use} from '../../translate/index.js'
+import {get, registerTranslateConfig, translate, use} from '../../translate'
 import '@material/mwc-button'
 import '@material/mwc-dialog'
 import '@material/mwc-icon'
@@ -1995,11 +1995,7 @@ class NavBar extends connect(store)(LitElement) {
                     this.myPluginNameRes = res
                 })
 
-                if (this.myPluginNameRes === undefined || this.myPluginNameRes.length == 0) {
-                    myPluginName = false
-                } else {
-                    myPluginName = true
-                }
+                myPluginName = !(this.myPluginNameRes === undefined || this.myPluginNameRes.length == 0);
                 return myPluginName
             }
 
@@ -2060,11 +2056,7 @@ class NavBar extends connect(store)(LitElement) {
                     this.myPluginNameRes = res
                 })
 
-                if (this.myPluginNameRes === undefined || this.myPluginNameRes.length == 0 ) {
-                    myPluginName = false
-                } else {
-                    myPluginName = true
-                }
+                myPluginName = !(this.myPluginNameRes === undefined || this.myPluginNameRes.length == 0);
                 return myPluginName
             }
 
diff --git a/core/src/components/start-minting.js b/core/src/components/start-minting.js
index 7fa706b1..c8132097 100644
--- a/core/src/components/start-minting.js
+++ b/core/src/components/start-minting.js
@@ -1,7 +1,7 @@
 import {css, html, LitElement} from 'lit';
 import {connect} from 'pwa-helpers';
 import {store} from '../store.js';
-import {get, translate} from '../../translate/index.js'
+import {get, translate} from '../../translate'
 import {asyncReplace} from 'lit/directives/async-replace.js';
 
 import '../functional-components/my-button.js';
@@ -293,7 +293,7 @@ const nonce = selectedAddress && selectedAddress.nonce;
 			this.getMintingAcccounts();
 		} catch (error) {
 			this.errorMsg = this.renderErrorMsg3();
-			return;
+
 		}
 	}
 
@@ -426,7 +426,7 @@ const nonce = selectedAddress && selectedAddress.nonce;
 			} catch (error) {
 				console.log({ error })
 				this.errorMsg = (error && error.data && error.data.message) ? error.data.message : this.renderErrorMsg4();
-				return;
+
 			}
 		};
 
diff --git a/core/src/components/theme-toggle.js b/core/src/components/theme-toggle.js
index ab4fc575..5d76cc81 100644
--- a/core/src/components/theme-toggle.js
+++ b/core/src/components/theme-toggle.js
@@ -1,5 +1,5 @@
 import {css, html, LitElement} from 'lit'
-import {translate} from '../../translate/index.js'
+import {translate} from '../../translate'
 import '@polymer/paper-icon-button/paper-icon-button.js'
 import '@polymer/iron-icons/image-icons.js'
 import '@polymer/iron-icons/iron-icons.js'
diff --git a/core/src/components/user-info-view/user-info-view.js b/core/src/components/user-info-view/user-info-view.js
index 5c194401..f0473016 100644
--- a/core/src/components/user-info-view/user-info-view.js
+++ b/core/src/components/user-info-view/user-info-view.js
@@ -2,7 +2,7 @@ import {css, html, LitElement} from 'lit'
 import {render} from 'lit/html.js'
 import {connect} from 'pwa-helpers'
 import {store} from '../../store.js'
-import {get, translate} from '../../../translate/index.js'
+import {get, translate} from '../../../translate'
 
 import '@polymer/paper-dialog/paper-dialog.js'
 import '@material/mwc-button'
diff --git a/core/src/custom-elements/frag-file-input.js b/core/src/custom-elements/frag-file-input.js
index 8e2507a4..a8d94534 100644
--- a/core/src/custom-elements/frag-file-input.js
+++ b/core/src/custom-elements/frag-file-input.js
@@ -3,7 +3,7 @@ import {css, html, LitElement} from 'lit'
 import '@material/mwc-button'
 import '@material/mwc-icon'
 
-import {translate} from '../../translate/index.js'
+import {translate} from '../../translate'
 
 class FragFileInput extends LitElement {
     static get properties () {
diff --git a/core/src/functional-components/confirm-transaction-dialog.js b/core/src/functional-components/confirm-transaction-dialog.js
index 7c51c581..20440e0c 100644
--- a/core/src/functional-components/confirm-transaction-dialog.js
+++ b/core/src/functional-components/confirm-transaction-dialog.js
@@ -1,7 +1,7 @@
 import {css, html, LitElement} from 'lit'
 import {connect} from 'pwa-helpers'
 import {store} from '../store.js'
-import {get, translate} from '../../translate/index.js'
+import {get, translate} from '../../translate'
 
 import {listenForRequest} from '../transactionRequest.js'
 
diff --git a/core/src/functional-components/mykey-page.js b/core/src/functional-components/mykey-page.js
index 7098035a..e8bffbee 100644
--- a/core/src/functional-components/mykey-page.js
+++ b/core/src/functional-components/mykey-page.js
@@ -2,7 +2,7 @@ import {css, html, LitElement} from 'lit'
 import {connect} from 'pwa-helpers'
 import {store} from '../store.js'
 import {testApiKey} from '../apiKeyUtils.js'
-import {get, translate} from '../../translate/index.js'
+import {get, translate} from '../../translate'
 
 import '@material/mwc-dialog'
 import '@material/mwc-button'
diff --git a/core/src/functional-components/settings-page.js b/core/src/functional-components/settings-page.js
index 9ee63bef..5fd9b3bf 100644
--- a/core/src/functional-components/settings-page.js
+++ b/core/src/functional-components/settings-page.js
@@ -2,7 +2,7 @@ import {css, html, LitElement} from 'lit'
 import {connect} from 'pwa-helpers'
 import {store} from '../store.js'
 import {doAddNode, doEditNode, doLoadNodeConfig, doRemoveNode, doSetNode} from '../redux/app/app-actions.js'
-import {get, registerTranslateConfig, translate, use} from '../../translate/index.js'
+import {get, registerTranslateConfig, translate, use} from '../../translate'
 import snackbar from './snackbar.js'
 import '../components/language-selector.js'
 import '../custom-elements/frag-file-input.js'
diff --git a/crypto/api/decryptStoredWallet.js b/crypto/api/decryptStoredWallet.js
index a43537ad..da28325b 100644
--- a/crypto/api/decryptStoredWallet.js
+++ b/crypto/api/decryptStoredWallet.js
@@ -1,7 +1,7 @@
 import Base58 from './deps/Base58.js'
 import {kdf} from './kdf.js'
 import {AES_CBC, HmacSha512} from 'asmcrypto.js'
-import {get, registerTranslateConfig} from '../../core/translate/index.js'
+import {get, registerTranslateConfig} from '../../core/translate'
 
 registerTranslateConfig({
   loader: lang => fetch(`/language/${lang}.json`).then(res => res.json())
diff --git a/crypto/api/kdf.js b/crypto/api/kdf.js
index 423eac42..2c64d5d9 100644
--- a/crypto/api/kdf.js
+++ b/crypto/api/kdf.js
@@ -2,7 +2,7 @@ import {store} from '../api_deps.js'
 import {stateAwait} from './utils/stateAwait.js'
 import {Sha512} from 'asmcrypto.js'
 import utils from '../api/deps/utils.js'
-import {get, registerTranslateConfig} from '../../core/translate/index.js'
+import {get, registerTranslateConfig} from '../../core/translate'
 
 registerTranslateConfig({
   loader: lang => fetch(`/language/${lang}.json`).then(res => res.json())
diff --git a/crypto/api/wallet/validateAddress.js b/crypto/api/wallet/validateAddress.js
index e487a55e..59d016cc 100644
--- a/crypto/api/wallet/validateAddress.js
+++ b/crypto/api/wallet/validateAddress.js
@@ -3,8 +3,6 @@ import Base58 from '../deps/Base58.js'
 export const validateAddress = (address) => {
 	const decodePubKey = Base58.decode(address)
 
-	if (!(decodePubKey instanceof Uint8Array && decodePubKey.length == 25)) {
-		return false
-	}
-	return true
+	return decodePubKey instanceof Uint8Array && decodePubKey.length == 25;
+
 }
diff --git a/electron.js b/electron.js
index 782c59ef..e9365ffa 100644
--- a/electron.js
+++ b/electron.js
@@ -168,11 +168,7 @@ function doesFileExist(urlToJavaFile) {
 	xhr.open('HEAD', urlToJavaFile, true)
 	xhr.send()
 
-	if (xhr.status == "404") {
-		return false
-	} else {
-		return true
-	}
+	return xhr.status != "404";
 }
 
 async function checkWin() {
@@ -197,7 +193,7 @@ async function checkWin() {
 							store.set('askingCore', returnValue.checkboxChecked)
 						} else {
 							store.set('askingCore', returnValue.checkboxChecked)
-							return
+
 						}
 					})
 				}
@@ -215,7 +211,7 @@ async function checkWin() {
 			if (returnValue.response === 0) {
 				downloadWindows()
 			} else {
-				return
+
 			}
 		})
 	}
@@ -227,7 +223,7 @@ async function checkOsPlatform() {
 	} else if (process.platform === 'linux' || process.platform === 'darwin') {
 		startElectronUnix()
 	} else {
-		return
+
 	}
 }
 
@@ -252,7 +248,7 @@ async function startElectronWin() {
 			if (returnValue.response === 0) {
 				downloadWindows()
 			} else {
-				return
+
 			}
 		})
 	}
@@ -279,7 +275,7 @@ function startElectronUnix() {
 			if (returnValue.response === 0) {
 				downloadQortal()
 			} else {
-				return
+
 			}
 		})
 	}
@@ -340,7 +336,7 @@ async function checkPort() {
 
 async function checkResponseStatus(res) {
 	if (res.ok) {
-		return
+
 	} else if (process.platform === 'win32') {
 		await checkWin()
 	} else {
@@ -382,7 +378,7 @@ async function javaversion() {
 	})
 
 	checkJava.stderr.on('end', () => {
-		datres = Buffer.concat(stderrChunks).toString().split('\n')[0]
+		let datres = Buffer.concat(stderrChunks).toString().split('\n')[0]
 		const javaVersion = new RegExp('(java|openjdk) version').test(datres) ? datres.split(' ')[2].replace(/"/g, '') : false;
 		log.info("Java Version", javaVersion)
 		if (javaVersion != false) {
@@ -399,7 +395,7 @@ async function javaversion() {
 				if (returnValue.response === 0) {
 					installJava()
 				} else {
-					return
+
 				}
 			})
 		}
@@ -706,7 +702,7 @@ function checkQortal() {
 							store.set('askingCore', returnValue.checkboxChecked)
 						} else {
 							store.set('askingCore', returnValue.checkboxChecked)
-							return
+
 						}
 					})
 				}
@@ -724,7 +720,7 @@ function checkQortal() {
 			if (returnValue.response === 0) {
 				downloadQortal()
 			} else {
-				return
+
 			}
 		})
 	}
@@ -807,7 +803,7 @@ async function checkAndStart() {
 					store.set('askingCore', returnValue.checkboxChecked)
 				} else {
 					store.set('askingCore', returnValue.checkboxChecked)
-					return
+
 				}
 			})
 		}
@@ -986,7 +982,7 @@ const editMenu = Menu.buildFromTemplate([
 						store.set('askingCore', returnValue.checkboxChecked)
 					} else {
 						store.set('askingCore', returnValue.checkboxChecked)
-						return
+
 					}
 				})
 			}
@@ -1143,7 +1139,7 @@ const createTray = () => {
 						store.set('askingCore', returnValue.checkboxChecked)
 					} else {
 						store.set('askingCore', returnValue.checkboxChecked)
-						return
+
 					}
 				})
 			},
@@ -1243,7 +1239,7 @@ if (!isLock) {
 				store.set('askingCore', returnValue.checkboxChecked)
 			} else {
 				store.set('askingCore', returnValue.checkboxChecked)
-				return
+
 			}
 		})
 	})
@@ -1329,7 +1325,7 @@ if (!isLock) {
 				})
 				dl.show()
 			} else {
-				return
+
 			}
 		})
 	})
@@ -1351,7 +1347,7 @@ if (!isLock) {
 			if (returnValue.response === 0) {
 				autoUpdater.quitAndInstall()
 			} else {
-				return
+
 			}
 		})
 	})
@@ -1372,4 +1368,4 @@ if (!isLock) {
 	process.on('uncaughtException', function (err) {
 		log.info("*** WHOOPS TIME ***" + err)
 	})
-}
\ No newline at end of file
+}
diff --git a/plugins/plugins/core/become-minter/become-minter.src.js b/plugins/plugins/core/become-minter/become-minter.src.js
index 3a526e1e..a2474b53 100644
--- a/plugins/plugins/core/become-minter/become-minter.src.js
+++ b/plugins/plugins/core/become-minter/become-minter.src.js
@@ -1,7 +1,7 @@
 import {html, LitElement} from 'lit'
 import {Epml} from '../../../epml.js'
 import '../components/ButtonIconCopy.js'
-import {registerTranslateConfig, translate, use} from '../../../../core/translate/index.js'
+import {registerTranslateConfig, translate, use} from '../../../../core/translate'
 import {blocksNeed} from '../../utils/blocks-needed.js'
 import isElectron from 'is-electron'
 import '@polymer/paper-spinner/paper-spinner-lite.js'
diff --git a/plugins/plugins/core/become-minter/components/not-sponsored.js b/plugins/plugins/core/become-minter/components/not-sponsored.js
index 37121da2..935391d3 100644
--- a/plugins/plugins/core/become-minter/components/not-sponsored.js
+++ b/plugins/plugins/core/become-minter/components/not-sponsored.js
@@ -1,7 +1,7 @@
 import {html, LitElement} from 'lit'
 import {Epml} from '../../../../epml.js'
 import '../../components/ButtonIconCopy.js'
-import {translate} from '../../../../../core/translate/index.js'
+import {translate} from '../../../../../core/translate'
 
 import '@polymer/paper-spinner/paper-spinner-lite.js'
 import '@material/mwc-button'
diff --git a/plugins/plugins/core/become-minter/components/yes-sponsored.js b/plugins/plugins/core/become-minter/components/yes-sponsored.js
index 291c6fe0..cc6af68f 100644
--- a/plugins/plugins/core/become-minter/components/yes-sponsored.js
+++ b/plugins/plugins/core/become-minter/components/yes-sponsored.js
@@ -1,6 +1,6 @@
 import {html, LitElement} from 'lit'
 import '../../components/ButtonIconCopy.js'
-import {translate} from '../../../../../core/translate/index.js'
+import {translate} from '../../../../../core/translate'
 
 import '@polymer/paper-spinner/paper-spinner-lite.js'
 import '@material/mwc-button'
diff --git a/plugins/plugins/core/components/ChatGifs/ChatGifs.js b/plugins/plugins/core/components/ChatGifs/ChatGifs.js
index afb9f608..f3234791 100644
--- a/plugins/plugins/core/components/ChatGifs/ChatGifs.js
+++ b/plugins/plugins/core/components/ChatGifs/ChatGifs.js
@@ -9,7 +9,7 @@ import {bytesToMegabytes} from '../../../utils/bytesToMegabytes.js';
 import './ChatGifsExplore.js';
 import '../ImageComponent.js';
 import '@vaadin/tooltip';
-import {get, translate} from '../../../../../core/translate/index.js'
+import {get, translate} from '../../../../../core/translate'
 
 const parentEpml = new Epml({type: 'WINDOW', source: window.parent});
 
@@ -150,11 +150,7 @@ setOpenGifModal: { attribute: false }
 			if (changedProperties && changedProperties.has('currentCollection')) {
 				if (this.mode === 'explore') {
 					const subbedCollection = this.mySubscribedCollections.find((collection) => ((collection.name === this.currentCollection.name) && (collection.identifier === this.currentCollection.identifier)));
-					if (subbedCollection) {
-						this.isSubscribed = true;
-					} else {
-						this.isSubscribed = false;
-					}
+					this.isSubscribed = !!subbedCollection;
 				}
 			}
 		}
@@ -440,11 +436,7 @@ setOpenGifModal: { attribute: false }
 						}
 					}
 
-					if (invalidGifs.length > 0) {
-						return false;
-					} else {
-						return true;
-					}
+					return invalidGifs.length <= 0;
 				}
 
 				let validatedSize = validateGifSizes(this.gifsToBeAdded);
diff --git a/plugins/plugins/core/components/ChatGifs/ChatGifsExplore.js b/plugins/plugins/core/components/ChatGifs/ChatGifsExplore.js
index 97c014bc..49b0526a 100644
--- a/plugins/plugins/core/components/ChatGifs/ChatGifsExplore.js
+++ b/plugins/plugins/core/components/ChatGifs/ChatGifsExplore.js
@@ -1,7 +1,7 @@
 import {html, LitElement} from 'lit'
 import {Epml} from '../../../../epml.js'
 import {chatGifsExploreStyles} from './ChatGifsExplore-css.js'
-import {get, translate} from '../../../../../core/translate/index.js'
+import {get, translate} from '../../../../../core/translate'
 import '@material/mwc-icon'
 
 const parentEpml = new Epml({ type: 'WINDOW', source: window.parent });
@@ -52,7 +52,7 @@ class ChatGifsExplore extends LitElement {
 
     observerHandler(entries) {
     	if (!entries[0].isIntersecting) {
-    		return;
+
     	} else {
     		if (this.exploreCollections.length < 20) {
     			return;
diff --git a/plugins/plugins/core/components/ChatGroupInvites.js b/plugins/plugins/core/components/ChatGroupInvites.js
index e3ae490c..9f6a8e53 100644
--- a/plugins/plugins/core/components/ChatGroupInvites.js
+++ b/plugins/plugins/core/components/ChatGroupInvites.js
@@ -5,7 +5,7 @@ import "@material/mwc-dialog"
 import "@polymer/paper-spinner/paper-spinner-lite.js"
 import "@material/mwc-icon"
 import "./WrapperModal"
-import {translate} from '../../../../core/translate/index.js'
+import {translate} from '../../../../core/translate'
 
 const parentEpml = new Epml({ type: "WINDOW", source: window.parent })
 
diff --git a/plugins/plugins/core/components/ChatGroupManager.js b/plugins/plugins/core/components/ChatGroupManager.js
index 49f79de1..165be5cd 100644
--- a/plugins/plugins/core/components/ChatGroupManager.js
+++ b/plugins/plugins/core/components/ChatGroupManager.js
@@ -11,7 +11,7 @@ import './TipUser';
 import './UserInfo/UserInfo';
 import './ChatImage';
 import './ReusableImage';
-import {get} from '../../../../core/translate/index.js'
+import {get} from '../../../../core/translate'
 
 const parentEpml = new Epml({ type: 'WINDOW', source: window.parent });
 
@@ -284,7 +284,7 @@ class ChatGroupsManager extends LitElement {
 
 	observerHandler(entries) {
 		if (!entries[0].isIntersecting) {
-			return;
+
 		} else {
 			if (this.images.length < 20) {
 				return;
@@ -294,19 +294,11 @@ class ChatGroupsManager extends LitElement {
 	}
 
     selectAuto(e) {
-        if (e.target.checked) {
-          this.autoView = false
-        } else {
-            this.autoView = true
-        }
+        this.autoView = !e.target.checked;
     }
 
     selectMyImages(e) {
-        if (e.target.checked) {
-          this.onlyMyImages = false
-        } else {
-            this.onlyMyImages = true
-        }
+        this.onlyMyImages = !e.target.checked;
     }
 
 	render() {
diff --git a/plugins/plugins/core/components/ChatGroupSettings.js b/plugins/plugins/core/components/ChatGroupSettings.js
index d21e7346..2bf04b9a 100644
--- a/plugins/plugins/core/components/ChatGroupSettings.js
+++ b/plugins/plugins/core/components/ChatGroupSettings.js
@@ -5,7 +5,7 @@ import '@material/mwc-dialog'
 import '@polymer/paper-spinner/paper-spinner-lite.js'
 import '@material/mwc-icon'
 import './WrapperModal'
-import {get, translate} from '../../../../core/translate/index.js'
+import {get, translate} from '../../../../core/translate'
 
 const parentEpml = new Epml({ type: 'WINDOW', source: window.parent })
 
diff --git a/plugins/plugins/core/components/ChatGroupsManagement.js b/plugins/plugins/core/components/ChatGroupsManagement.js
index 793ce271..4356f8fa 100644
--- a/plugins/plugins/core/components/ChatGroupsManagement.js
+++ b/plugins/plugins/core/components/ChatGroupsManagement.js
@@ -10,7 +10,7 @@ import '@vaadin/tabs/theme/material/vaadin-tabs.js'
 import '@vaadin/avatar'
 import '@vaadin/grid'
 import '@vaadin/grid/vaadin-grid-filter-column.js'
-import {get, translate} from '../../../../core/translate/index.js'
+import {get, translate} from '../../../../core/translate'
 
 const parentEpml = new Epml({ type: 'WINDOW', source: window.parent })
 
diff --git a/plugins/plugins/core/components/ChatGroupsModal.js b/plugins/plugins/core/components/ChatGroupsModal.js
index b2a6c03f..ad991d89 100644
--- a/plugins/plugins/core/components/ChatGroupsModal.js
+++ b/plugins/plugins/core/components/ChatGroupsModal.js
@@ -1,5 +1,5 @@
 import {css, html, LitElement} from 'lit';
-import {translate,} from '../../../../core/translate/index.js'
+import {translate,} from '../../../../core/translate'
 import '@material/mwc-menu';
 import '@material/mwc-list/mwc-list-item.js';
 import '@material/mwc-dialog'
diff --git a/plugins/plugins/core/components/ChatImage.js b/plugins/plugins/core/components/ChatImage.js
index e8255bc7..436a20fb 100644
--- a/plugins/plugins/core/components/ChatImage.js
+++ b/plugins/plugins/core/components/ChatImage.js
@@ -1,5 +1,5 @@
 import {css, html, LitElement} from 'lit';
-import {get, translate,} from '../../../../core/translate/index.js'
+import {get, translate,} from '../../../../core/translate'
 import axios from 'axios'
 import {RequestQueueWithPromise} from '../../utils/queue';
 import '@material/mwc-menu';
@@ -231,11 +231,9 @@ getMyNode(){
   }
 
   shouldUpdate(changedProperties) {
-		if (changedProperties.has('setOpenDialogImage') && changedProperties.size === 1) {
-			return false;
-		}
+		return !(changedProperties.has('setOpenDialogImage') && changedProperties.size === 1);
+
 
-    return true
   }
 
 
diff --git a/plugins/plugins/core/components/ChatLeaveGroup.js b/plugins/plugins/core/components/ChatLeaveGroup.js
index d85200ce..07c92253 100644
--- a/plugins/plugins/core/components/ChatLeaveGroup.js
+++ b/plugins/plugins/core/components/ChatLeaveGroup.js
@@ -5,7 +5,7 @@ import '@material/mwc-dialog'
 import '@polymer/paper-spinner/paper-spinner-lite.js'
 import '@material/mwc-icon'
 import './WrapperModal'
-import {get, translate} from '../../../../core/translate/index.js'
+import {get, translate} from '../../../../core/translate'
 
 const parentEpml = new Epml({ type: 'WINDOW', source: window.parent })
 
diff --git a/plugins/plugins/core/components/ChatModals.js b/plugins/plugins/core/components/ChatModals.js
index 0847fc12..cadef8ff 100644
--- a/plugins/plugins/core/components/ChatModals.js
+++ b/plugins/plugins/core/components/ChatModals.js
@@ -1,7 +1,7 @@
 import {css, html, LitElement} from 'lit'
 import {Epml} from '../../../epml'
 import snackbar from './snackbar.js'
-import {get, translate} from '../../../../core/translate/index.js'
+import {get, translate} from '../../../../core/translate'
 import '@material/mwc-button'
 import '@material/mwc-dialog'
 
diff --git a/plugins/plugins/core/components/ChatPage.js b/plugins/plugins/core/components/ChatPage.js
index d6b5ee2f..993d7ae9 100644
--- a/plugins/plugins/core/components/ChatPage.js
+++ b/plugins/plugins/core/components/ChatPage.js
@@ -1,7 +1,7 @@
 import {html, LitElement} from 'lit'
 import {animate} from '@lit-labs/motion'
 import {Epml} from '../../../epml.js'
-import {get, translate} from '../../../../core/translate/index.js'
+import {get, translate} from '../../../../core/translate'
 import {Editor, Extension, generateHTML} from '@tiptap/core'
 import {unsafeHTML} from 'lit/directives/unsafe-html.js'
 import {escape} from 'html-escaper'
@@ -263,11 +263,11 @@ class ChatPage extends LitElement {
     }
 
     _toggle(value) {
-        this.shifted = value === (false || true) ? value : !this.shifted
+        this.shifted = value === true ? value : !this.shifted
         this.requestUpdate()
     }
     _toggleResources(value) {
-        this.shiftedResources = value === (false || true) ? value : !this.shiftedResources
+        this.shiftedResources = value === true ? value : !this.shiftedResources
         this.requestUpdate()
     }
 
@@ -1114,7 +1114,7 @@ class ChatPage extends LitElement {
             if (blobFound) {
                 this.insertFile(blobFound)
                 e.preventDefault();
-                return
+
             } else {
                 const item_list = await navigator.clipboard.read()
                 let image_type
@@ -1140,7 +1140,7 @@ class ChatPage extends LitElement {
                         parentEpml.request('showSnackBar', `${errorMsg}`)
                     }
                 } else {
-                    return
+
                 }
             }
         }
@@ -1279,16 +1279,16 @@ class ChatPage extends LitElement {
         if(file.identifier){
             this.imageFile = file
             this.currentEditor = 'newChat'
-            return
+
         }else
         if (file.type.includes('image')) {
             this.imageFile = file
             this.currentEditor = 'newChat'
-            return
+
         } else {
             this.attachment = file
             this.currentEditor = "newAttachmentChat"
-            return
+
         }
     }
 
@@ -1494,11 +1494,9 @@ class ChatPage extends LitElement {
         if (changedProperties.has('setActiveChatHeadUrl')) {
             return false
         }
-        if (changedProperties.has('setOpenPrivateMessage')) {
-            return false
-        }
+        return !changedProperties.has('setOpenPrivateMessage');
+
 
-        return true
 
     }
 
@@ -3125,7 +3123,7 @@ class ChatPage extends LitElement {
         } catch (error) {
             this.isLoading = false
             this.isUploadingImage = false
-            return
+
         }
 
     }
diff --git a/plugins/plugins/core/components/ChatRightPanel.js b/plugins/plugins/core/components/ChatRightPanel.js
index b3fef699..4216bef0 100644
--- a/plugins/plugins/core/components/ChatRightPanel.js
+++ b/plugins/plugins/core/components/ChatRightPanel.js
@@ -217,7 +217,7 @@ class ChatRightPanel extends LitElement {
 
     observerHandler(entries) {
         if (!entries[0].isIntersecting) {
-            return
+
         } else {
             if(this.groupMembers.length < 20){
                 return
diff --git a/plugins/plugins/core/components/ChatRightPanelResources.js b/plugins/plugins/core/components/ChatRightPanelResources.js
index 08e251ed..699f2e02 100644
--- a/plugins/plugins/core/components/ChatRightPanelResources.js
+++ b/plugins/plugins/core/components/ChatRightPanelResources.js
@@ -11,7 +11,7 @@ import './TipUser';
 import './UserInfo/UserInfo';
 import './ChatImage';
 import './ReusableImage';
-import {get, translate,} from '../../../../core/translate/index.js'
+import {get, translate,} from '../../../../core/translate'
 import {generateIdFromAddresses} from '../../utils/id-generation';
 
 const parentEpml = new Epml({ type: 'WINDOW', source: window.parent });
@@ -307,7 +307,7 @@ class ChatRightPanelResources extends LitElement {
 
 	observerHandler(entries) {
 		if (!entries[0].isIntersecting) {
-			return;
+
 		} else {
 			if (this.images.length < 20) {
 				return;
@@ -317,19 +317,11 @@ class ChatRightPanelResources extends LitElement {
 	}
 
     selectAuto(e) {
-        if (e.target.checked) {
-          this.autoView = false
-        } else {
-            this.autoView = true
-        }
+        this.autoView = !e.target.checked;
     }
 
     selectMyImages(e) {
-        if (e.target.checked) {
-          this.onlyMyImages = false
-        } else {
-            this.onlyMyImages = true
-        }
+        this.onlyMyImages = !e.target.checked;
     }
 
 	render() {
diff --git a/plugins/plugins/core/components/ChatScroller.js b/plugins/plugins/core/components/ChatScroller.js
index f7f9663e..8a46bf6b 100644
--- a/plugins/plugins/core/components/ChatScroller.js
+++ b/plugins/plugins/core/components/ChatScroller.js
@@ -1,6 +1,6 @@
 import {html, LitElement,} from 'lit';
 import {repeat} from 'lit/directives/repeat.js';
-import {get, translate,} from '../../../../core/translate/index.js'
+import {get, translate,} from '../../../../core/translate'
 import {unsafeHTML} from 'lit/directives/unsafe-html.js';
 import {chatStyles} from './ChatScroller-css.js';
 import {Epml} from '../../../epml';
@@ -676,13 +676,9 @@ class ChatScroller extends LitElement {
 
 	isLastMessageBeforeUnread(message, formattedMessages) {
 		// if the message is the last one in the older messages list and its timestamp is before the user's last seen timestamp
-		if (
-			message.timestamp < this.lastReadMessageTimestamp &&
-			formattedMessages.indexOf(message) === formattedMessages.length - 21
-		) {
-			return true;
-		}
-		return false;
+		return message.timestamp < this.lastReadMessageTimestamp &&
+			formattedMessages.indexOf(message) === formattedMessages.length - 21;
+
 	}
 
 	render() {
@@ -1097,11 +1093,7 @@ class MessageTemplate extends LitElement {
 	}
 
 	showBlockIconFunc(bool) {
-		if (bool) {
-			this.showBlockAddressIcon = true;
-		} else {
-			this.showBlockAddressIcon = false;
-		}
+		this.showBlockAddressIcon = !!bool;
 	}
 
 	async downloadAttachment(attachment) {
@@ -1206,10 +1198,8 @@ class MessageTemplate extends LitElement {
 		if (changedProperties.has('openDialogGif')) {
 			return true;
 		}
-		if (changedProperties.has('isGifLoaded')) {
-			return true;
-		}
-		return false;
+		return !!changedProperties.has('isGifLoaded');
+
 	}
 
 	clearConsole() {
@@ -2535,4 +2525,4 @@ class ChatMenu extends LitElement {
 	}
 }
 
-window.customElements.define('chat-menu', ChatMenu);
\ No newline at end of file
+window.customElements.define('chat-menu', ChatMenu);
diff --git a/plugins/plugins/core/components/ChatSeachResults.js b/plugins/plugins/core/components/ChatSeachResults.js
index 53fc4c7f..5083dc57 100644
--- a/plugins/plugins/core/components/ChatSeachResults.js
+++ b/plugins/plugins/core/components/ChatSeachResults.js
@@ -1,6 +1,6 @@
 import {html, LitElement} from 'lit';
 import {chatSearchResultsStyles} from './ChatSearchResults-css.js'
-import {translate} from '../../../../core/translate/index.js'
+import {translate} from '../../../../core/translate'
 
 export class ChatSearchResults extends LitElement {
   static get properties() {
diff --git a/plugins/plugins/core/components/ChatSearchResults.js b/plugins/plugins/core/components/ChatSearchResults.js
index 0a3bce40..03e18692 100644
--- a/plugins/plugins/core/components/ChatSearchResults.js
+++ b/plugins/plugins/core/components/ChatSearchResults.js
@@ -1,6 +1,6 @@
 import {html, LitElement} from 'lit'
 import {chatSearchResultsStyles} from './ChatSearchResults-css.js'
-import {translate} from '../../../../core/translate/index.js'
+import {translate} from '../../../../core/translate'
 import '@vaadin/icon'
 import '@vaadin/icons'
 
diff --git a/plugins/plugins/core/components/ChatSelect.js b/plugins/plugins/core/components/ChatSelect.js
index 80d71bbe..cded6988 100644
--- a/plugins/plugins/core/components/ChatSelect.js
+++ b/plugins/plugins/core/components/ChatSelect.js
@@ -210,11 +210,9 @@ class ChatSelect extends LitElement {
         if(changedProperties.has('activeChatHeadUrl')){
             return true
         }
-        if(changedProperties.has('chatInfo')){
-            return true
-        }
+        return !!changedProperties.has('chatInfo');
+
 
-        return false
       }
 
     getUrl(chatUrl) {
diff --git a/plugins/plugins/core/components/ChatSideNavHeads.js b/plugins/plugins/core/components/ChatSideNavHeads.js
index 7f93f720..04814076 100644
--- a/plugins/plugins/core/components/ChatSideNavHeads.js
+++ b/plugins/plugins/core/components/ChatSideNavHeads.js
@@ -185,11 +185,9 @@ class ChatSideNavHeads extends LitElement {
         if(changedProperties.has('chatInfo')){
             return true
         }
-        if(changedProperties.has('isImageLoaded')){
-            return true
-        }
+        return !!changedProperties.has('isImageLoaded');
+
 
-        return false
       }
 
     getUrl(chatUrl) {
diff --git a/plugins/plugins/core/components/ChatTextEditor copy.js b/plugins/plugins/core/components/ChatTextEditor copy.js
index 6ae81431..1c8ba72c 100644
--- a/plugins/plugins/core/components/ChatTextEditor copy.js	
+++ b/plugins/plugins/core/components/ChatTextEditor copy.js	
@@ -3,7 +3,7 @@ import {escape, unescape} from 'html-escaper'
 import {EmojiPicker} from 'emoji-picker-js'
 import {inputKeyCodes} from '../../utils/keyCodes.js'
 import {Epml} from '../../../epml.js'
-import {get} from '../../../../core/translate/index.js'
+import {get} from '../../../../core/translate'
 
 const parentEpml = new Epml({ type: 'WINDOW', source: window.parent })
 
@@ -268,7 +268,7 @@ class ChatTextEditor extends LitElement {
             if (!this.userName) {
                 e.preventDefault();
                 parentEpml.request('showSnackBar', get("chatpage.cchange27"));
-           };
+           }
 	}
 
     initialChat(e) {
@@ -360,15 +360,15 @@ class ChatTextEditor extends LitElement {
 
     shouldUpdate(changedProperties) {
         // Only update element if prop1 changed.
-       if(changedProperties.has('setChatEditor') && changedProperties.size === 1) return false
-        return true
+       return !(changedProperties.has('setChatEditor') && changedProperties.size === 1);
+
       }
 
     sendMessageFunc(props) {
         if (this.chatMessageSize > 1000 ) {
             parentEpml.request('showSnackBar', get("chatpage.cchange29"))
             return
-        };
+        }
         this.chatMessageSize = 0
         this.chatEditor.updateMirror()
         this._sendMessage(props)
diff --git a/plugins/plugins/core/components/ChatTextEditor.js b/plugins/plugins/core/components/ChatTextEditor.js
index 040f5f0a..aa182819 100644
--- a/plugins/plugins/core/components/ChatTextEditor.js
+++ b/plugins/plugins/core/components/ChatTextEditor.js
@@ -3,7 +3,7 @@ import {EmojiPicker} from 'emoji-picker-js'
 import {Epml} from '../../../epml.js'
 import '@material/mwc-icon'
 import '@material/mwc-checkbox'
-import {get, translate} from '../../../../core/translate/index.js'
+import {get, translate} from '../../../../core/translate'
 
 const parentEpml = new Epml({ type: 'WINDOW', source: window.parent })
 
@@ -358,10 +358,9 @@ class ChatTextEditor extends LitElement {
 .hide-styling {
     display: none;
 }
-mwc-checkbox::shadow .mdc-checkbox::after, mwc-checkbox::shadow .mdc-checkbox::before {
-                background-color:var(--mdc-theme-primary)
+mwc-checkbox::shadow, mdc-checkbox::after, mwc-checkbox::shadow, mdc-checkbox::before {
+                background-color: var(--mdc-theme-primary)
             }
-            --mdc-checkbox-unchecked-color
 		`
 	}
 
@@ -665,8 +664,8 @@ mwc-checkbox::shadow .mdc-checkbox::after, mwc-checkbox::shadow .mdc-checkbox::b
 
     shouldUpdate(changedProperties) {
         // Only update element if prop1 changed.
-       if(changedProperties.has('setChatEditor') && changedProperties.size === 1) return false
-        return true
+       return !(changedProperties.has('setChatEditor') && changedProperties.size === 1);
+
       }
 
     sendMessageFunc(props) {
diff --git a/plugins/plugins/core/components/ChatWelcomePage.js b/plugins/plugins/core/components/ChatWelcomePage.js
index 8270afe4..06c3f612 100644
--- a/plugins/plugins/core/components/ChatWelcomePage.js
+++ b/plugins/plugins/core/components/ChatWelcomePage.js
@@ -1,6 +1,6 @@
 import {css, html, LitElement} from 'lit'
 import {Epml} from '../../../epml.js'
-import {get, registerTranslateConfig, translate, use} from '../../../../core/translate/index.js'
+import {get, registerTranslateConfig, translate, use} from '../../../../core/translate'
 import isElectron from 'is-electron'
 
 import '@material/mwc-icon'
@@ -145,7 +145,7 @@ class ChatWelcomePage extends LitElement {
         }
 
         h2, h3, h4, h5 {
-            color:# var(--black);
+            color: var(--black);
             font-weight: 400;
         }
 
@@ -369,7 +369,7 @@ class ChatWelcomePage extends LitElement {
                 myRes = false;
             } else {
                 myRes = myNameRes;
-            };
+            }
             return myRes;
         };
 
@@ -379,7 +379,7 @@ class ChatWelcomePage extends LitElement {
             recipient = _recipient;
         } else {
             recipient = myNameRes.owner;
-        };
+        }
 
         let _reference = new Uint8Array(64);
         window.crypto.getRandomValues(_reference);
@@ -411,7 +411,7 @@ class ChatWelcomePage extends LitElement {
                 isEncrypted = 0;
                 _publicKey = this.selectedAddress.address;
                 sendMessageRequest(isEncrypted, _publicKey);
-            };
+            }
         };
 
         const sendMessageRequest = async (isEncrypted, _publicKey) => {
diff --git a/plugins/plugins/core/components/ImageComponent.js b/plugins/plugins/core/components/ImageComponent.js
index 6cd3b3a3..0d2c396d 100644
--- a/plugins/plugins/core/components/ImageComponent.js
+++ b/plugins/plugins/core/components/ImageComponent.js
@@ -1,5 +1,5 @@
 import {css, html, LitElement} from 'lit';
-import {translate,} from '../../../../core/translate/index.js'
+import {translate,} from '../../../../core/translate'
 
 export class ImageComponent extends LitElement {
   static get properties() {
@@ -78,11 +78,7 @@ export class ImageComponent extends LitElement {
           url: data.src,
         };
         this.requestUpdate();
-      } else if (!data.ok || data.error) {
-        this.error = true;
-      } else {
-        this.error = false;
-      }
+      } else this.error = !data.ok || data.error;
     } catch (error) {
       this.error = true;
       console.error(error);
diff --git a/plugins/plugins/core/components/LevelFounder.js b/plugins/plugins/core/components/LevelFounder.js
index b3a060c9..e8222d6d 100644
--- a/plugins/plugins/core/components/LevelFounder.js
+++ b/plugins/plugins/core/components/LevelFounder.js
@@ -1,6 +1,6 @@
 import {css, html, LitElement} from 'lit'
 import {Epml} from '../../../epml.js'
-import {translate} from '../../../../core/translate/index.js'
+import {translate} from '../../../../core/translate'
 import '@polymer/paper-tooltip/paper-tooltip.js'
 import {RequestQueue} from '../../utils/queue.js'
 
diff --git a/plugins/plugins/core/components/NameMenu.js b/plugins/plugins/core/components/NameMenu.js
index 80c865b0..ab825236 100644
--- a/plugins/plugins/core/components/NameMenu.js
+++ b/plugins/plugins/core/components/NameMenu.js
@@ -1,7 +1,7 @@
 import {css, html, LitElement} from 'lit'
 import {Epml} from '../../../epml.js'
 import snackbar from './snackbar.js'
-import {get, translate} from '../../../../core/translate/index.js'
+import {get, translate} from '../../../../core/translate'
 import '@material/mwc-snackbar'
 import '@material/mwc-button'
 import '@material/mwc-dialog'
@@ -90,7 +90,7 @@ class NameMenu extends LitElement {
             }
 
             h2, h3, h4, h5 {
-                color:# var(--black);
+                color: var(--black);
                 font-weight: 400;
             }
 
diff --git a/plugins/plugins/core/components/QRCode.js b/plugins/plugins/core/components/QRCode.js
index d4a7eff5..a496dbef 100644
--- a/plugins/plugins/core/components/QRCode.js
+++ b/plugins/plugins/core/components/QRCode.js
@@ -207,7 +207,7 @@ var encode = function(ver, mode, data, maxbuflen) {
 			pack(data[i], 8);
 		}
 		break;
-	};
+	}
 
 	pack(MODE_TERMINATOR, 4);
 	if (remaining < 8) buf.push(bits);
@@ -596,4 +596,4 @@ var QRCode = {
 };
 
 export { QRCode };
-export default QRCode;
\ No newline at end of file
+export default QRCode;
diff --git a/plugins/plugins/core/components/ReusableImage.js b/plugins/plugins/core/components/ReusableImage.js
index 1c53f003..b612092d 100644
--- a/plugins/plugins/core/components/ReusableImage.js
+++ b/plugins/plugins/core/components/ReusableImage.js
@@ -1,5 +1,5 @@
 import {css, html, LitElement} from 'lit'
-import {translate,} from '../../../../core/translate/index.js'
+import {translate,} from '../../../../core/translate'
 import axios from 'axios'
 import {RequestQueueWithPromise} from '../../utils/queue'
 import '@material/mwc-menu'
diff --git a/plugins/plugins/core/components/TipUser.js b/plugins/plugins/core/components/TipUser.js
index e2ab7d7e..2b479639 100644
--- a/plugins/plugins/core/components/TipUser.js
+++ b/plugins/plugins/core/components/TipUser.js
@@ -3,7 +3,7 @@ import {tipUserStyles} from './TipUser-css.js'
 import {Epml} from '../../../epml'
 import '@vaadin/button'
 import '@polymer/paper-progress/paper-progress.js'
-import {get, translate} from '../../../../core/translate/index.js'
+import {get, translate} from '../../../../core/translate'
 
 const parentEpml = new Epml({ type: "WINDOW", source: window.parent });
 
@@ -140,7 +140,7 @@ export class TipUser extends LitElement {
         };
 
         const validateAddress = async (receiverAddress) => {
-            return await window.parent.validateAddress(receiverAddress);
+            return window.parent.validateAddress(receiverAddress);
         };
 
         const getName = async (recipient) => {
diff --git a/plugins/plugins/core/components/TradeInfoView.js b/plugins/plugins/core/components/TradeInfoView.js
index 40c08edd..fc87b974 100644
--- a/plugins/plugins/core/components/TradeInfoView.js
+++ b/plugins/plugins/core/components/TradeInfoView.js
@@ -1,7 +1,7 @@
 import {css, html, LitElement} from 'lit'
 import {render} from 'lit/html.js'
 import {Epml} from '../../../epml.js'
-import {get, translate} from '../../../../core/translate/index.js'
+import {get, translate} from '../../../../core/translate'
 import {tradeInfoViewStyle} from './TradeInfoView-css.js'
 import './TraderInfoView.js'
 import '@polymer/paper-dialog/paper-dialog.js'
diff --git a/plugins/plugins/core/components/TraderInfoView.js b/plugins/plugins/core/components/TraderInfoView.js
index 1fe1fce6..ff2ba403 100644
--- a/plugins/plugins/core/components/TraderInfoView.js
+++ b/plugins/plugins/core/components/TraderInfoView.js
@@ -1,7 +1,7 @@
 import {css, html, LitElement} from 'lit'
 import {render} from 'lit/html.js'
 import {Epml} from '../../../epml.js'
-import {get, translate} from '../../../../core/translate/index.js'
+import {get, translate} from '../../../../core/translate'
 
 import '@polymer/paper-dialog/paper-dialog.js'
 import '@material/mwc-button'
diff --git a/plugins/plugins/core/components/UserInfo/UserInfo.js b/plugins/plugins/core/components/UserInfo/UserInfo.js
index c81542b0..5d66c36c 100644
--- a/plugins/plugins/core/components/UserInfo/UserInfo.js
+++ b/plugins/plugins/core/components/UserInfo/UserInfo.js
@@ -1,5 +1,5 @@
 import {html, LitElement} from 'lit'
-import {translate} from '../../../../../core/translate/index.js'
+import {translate} from '../../../../../core/translate'
 import {userInfoStyles} from './UserInfo-css.js'
 import {cropAddress} from '../../../utils/cropAddress.js'
 
@@ -118,13 +118,13 @@ export class UserInfo extends LitElement {
                         this.openProfile()
                     }, 250);
                     this.setOpenUserInfo(false)
-                   
-                    
+
+
                 }}>
                     ${translate("profile.profile18")}
                 </div>
                 ` : ''}
-               
+
             </div>
         `
     }
diff --git a/plugins/plugins/core/components/frag-file-input.js b/plugins/plugins/core/components/frag-file-input.js
index 17744b88..3afa739c 100644
--- a/plugins/plugins/core/components/frag-file-input.js
+++ b/plugins/plugins/core/components/frag-file-input.js
@@ -3,7 +3,7 @@ import {css, html, LitElement} from 'lit'
 import '@material/mwc-button'
 import '@material/mwc-icon'
 
-import {translate} from '../../../../core/translate/index.js'
+import {translate} from '../../../../core/translate'
 
 class FragFileInput extends LitElement {
     static get properties () {
diff --git a/plugins/plugins/core/components/qortal-info-view.js b/plugins/plugins/core/components/qortal-info-view.js
index 9c97050b..99d3ed08 100644
--- a/plugins/plugins/core/components/qortal-info-view.js
+++ b/plugins/plugins/core/components/qortal-info-view.js
@@ -1,6 +1,6 @@
 import {css, html, LitElement} from 'lit'
 import {render} from 'lit/html.js'
-import {get, translate} from '../../../../core/translate/index.js'
+import {get, translate} from '../../../../core/translate'
 import '@polymer/paper-dialog/paper-dialog.js'
 import '@material/mwc-button'
 import '@material/mwc-icon'
diff --git a/plugins/plugins/core/components/time-elements/extended-time-element.js b/plugins/plugins/core/components/time-elements/extended-time-element.js
index fce17b2d..874a1a89 100644
--- a/plugins/plugins/core/components/time-elements/extended-time-element.js
+++ b/plugins/plugins/core/components/time-elements/extended-time-element.js
@@ -75,7 +75,7 @@ export default class ExtendedTimeElement extends HTMLElement {
         }
     }
     getFormattedDate() {
-        return;
+
     }
 }
 const titleFormatter = makeFormatter({
diff --git a/plugins/plugins/core/components/time-elements/index.js b/plugins/plugins/core/components/time-elements/index.js
index 8b3dbe4c..961c29d9 100644
--- a/plugins/plugins/core/components/time-elements/index.js
+++ b/plugins/plugins/core/components/time-elements/index.js
@@ -240,7 +240,7 @@ class ExtendedTimeElement extends HTMLElement {
         }
     }
     getFormattedDate() {
-        return;
+
     }
 }
 const titleFormatter = makeFormatter({
diff --git a/plugins/plugins/core/group-management/group-management.src.js b/plugins/plugins/core/group-management/group-management.src.js
index e1bf5032..9c1f6300 100644
--- a/plugins/plugins/core/group-management/group-management.src.js
+++ b/plugins/plugins/core/group-management/group-management.src.js
@@ -2,7 +2,7 @@ import {css, html, LitElement} from 'lit'
 import {render} from 'lit/html.js'
 import {Epml} from '../../../epml.js'
 import isElectron from 'is-electron'
-import {get, registerTranslateConfig, translate, use} from '../../../../core/translate/index.js'
+import {get, registerTranslateConfig, translate, use} from '../../../../core/translate'
 import '../components/time-elements/index.js'
 import '@material/mwc-button'
 import '@material/mwc-dialog'
@@ -2491,7 +2491,7 @@ class GroupManagement extends LitElement {
         })
 
         if (this.bannedMembers.length === 0) {
-            return
+
         } else {
             this.bannedMembers.map(a => {
                 let callTheBannedMember = a.offender
@@ -2542,7 +2542,7 @@ class GroupManagement extends LitElement {
         })
 
         if (this.groupInviteMembers.length === 0) {
-            return
+
         } else {
             this.groupInviteMembers.map(a => {
                 let callTheInviteMember = a.invitee
@@ -2589,7 +2589,7 @@ class GroupManagement extends LitElement {
         })
 
         if (this.groupJoinMembers.length === 0) {
-            return
+
         } else {
             this.groupJoinMembers.map(a => {
                 let callTheJoinMember = a.joiner
diff --git a/plugins/plugins/core/messaging/q-chat/q-chat.src.js b/plugins/plugins/core/messaging/q-chat/q-chat.src.js
index 86f956d4..506d7a7e 100644
--- a/plugins/plugins/core/messaging/q-chat/q-chat.src.js
+++ b/plugins/plugins/core/messaging/q-chat/q-chat.src.js
@@ -938,7 +938,7 @@ class Chat extends LitElement {
 
 	getChatHeadFromState(chatObj) {
 		if (chatObj === undefined) {
-			return
+
 		} else {
 			this.chatHeadsObj = chatObj
 			this.setChatHeads(chatObj)
@@ -986,4 +986,4 @@ class Chat extends LitElement {
 	}
 }
 
-window.customElements.define('q-chat', Chat)
\ No newline at end of file
+window.customElements.define('q-chat', Chat)
diff --git a/plugins/plugins/core/minting/minting-info.src.js b/plugins/plugins/core/minting/minting-info.src.js
index 9790b268..c392fe06 100644
--- a/plugins/plugins/core/minting/minting-info.src.js
+++ b/plugins/plugins/core/minting/minting-info.src.js
@@ -1,7 +1,7 @@
 import {css, html, LitElement} from 'lit'
 import {Epml} from '../../../epml.js'
 import isElectron from 'is-electron'
-import {registerTranslateConfig, translate, use} from '../../../../core/translate/index.js'
+import {registerTranslateConfig, translate, use} from '../../../../core/translate'
 import '@material/mwc-icon'
 import '@material/mwc-button'
 import '@material/mwc-dialog'
diff --git a/plugins/plugins/core/name-registration/name-registration.src.js b/plugins/plugins/core/name-registration/name-registration.src.js
index 69aac944..b91c8901 100644
--- a/plugins/plugins/core/name-registration/name-registration.src.js
+++ b/plugins/plugins/core/name-registration/name-registration.src.js
@@ -1,7 +1,7 @@
 import {css, html, LitElement} from 'lit'
 import {render} from 'lit/html.js'
 import {Epml} from '../../../epml.js'
-import {get, registerTranslateConfig, translate, use} from '../../../../core/translate/index.js'
+import {get, registerTranslateConfig, translate, use} from '../../../../core/translate'
 import isElectron from 'is-electron'
 import '@material/mwc-button'
 import '@material/mwc-dialog'
diff --git a/plugins/plugins/core/names-market/names-market.src.js b/plugins/plugins/core/names-market/names-market.src.js
index c23f0f9a..dfe7dbfb 100644
--- a/plugins/plugins/core/names-market/names-market.src.js
+++ b/plugins/plugins/core/names-market/names-market.src.js
@@ -1,7 +1,7 @@
 import {css, html, LitElement} from 'lit'
 import {render} from 'lit/html.js'
 import {Epml} from '../../../epml.js'
-import {get, registerTranslateConfig, translate, use} from '../../../../core/translate/index.js'
+import {get, registerTranslateConfig, translate, use} from '../../../../core/translate'
 import isElectron from 'is-electron'
 import '../components/qortal-info-view.js'
 import '@material/mwc-button'
diff --git a/plugins/plugins/core/node-management/node-management.src.js b/plugins/plugins/core/node-management/node-management.src.js
index 3716c024..f1740123 100644
--- a/plugins/plugins/core/node-management/node-management.src.js
+++ b/plugins/plugins/core/node-management/node-management.src.js
@@ -2,7 +2,7 @@ import {css, html, LitElement} from 'lit'
 import {render} from 'lit/html.js'
 import {Epml} from '../../../epml.js'
 import isElectron from 'is-electron'
-import {get, registerTranslateConfig, translate, use} from '../../../../core/translate/index.js'
+import {get, registerTranslateConfig, translate, use} from '../../../../core/translate'
 import '@polymer/paper-spinner/paper-spinner-lite.js'
 import '@material/mwc-icon'
 import '@material/mwc-textfield'
diff --git a/plugins/plugins/core/overview-page/overview-page.src.js b/plugins/plugins/core/overview-page/overview-page.src.js
index 6592a09f..bcb87967 100644
--- a/plugins/plugins/core/overview-page/overview-page.src.js
+++ b/plugins/plugins/core/overview-page/overview-page.src.js
@@ -1,6 +1,6 @@
 import {css, html, LitElement} from 'lit'
 import {Epml} from '../../../epml.js'
-import {get, registerTranslateConfig, translate, use} from '../../../../core/translate/index.js'
+import {get, registerTranslateConfig, translate, use} from '../../../../core/translate'
 import {overviewStyle} from './overview-page-css.js'
 import {asyncReplace} from 'lit/directives/async-replace.js'
 import isElectron from 'is-electron'
@@ -247,17 +247,9 @@ class OverviewPage extends LitElement {
             const findMyMintingRecipient = this.listAccounts.find((myKey) => myKey.recipientAccount === address)
             const findRemovedSponsorsKey = this.listAccounts.filter((my) => my.address)
 
-            if (findMyMintingAccount === undefined) {
-                this.check1 = false
-            } else {
-                this.check1 = true
-            }
+            this.check1 = findMyMintingAccount !== undefined;
 
-            if (findMyMintingRecipient === undefined) {
-                this.check2 = false
-            } else {
-                this.check2 = true
-            }
+            this.check2 = findMyMintingRecipient !== undefined;
 
             if (findRemovedSponsorsKey.length > 0) {
                 this.removeBlankKey(findRemovedSponsorsKey.publicKey)
@@ -611,7 +603,7 @@ class StartMintingNow extends LitElement {
 			this.getMintingAcccounts()
 		} catch (error) {
 			this.errorMsg = this.renderErrorMsg3()
-			return
+
 		}
 	}
 
@@ -732,7 +724,7 @@ class StartMintingNow extends LitElement {
 				this.confirmRelationship(publicAddress)
 			} catch (error) {
 				this.errorMsg = error.data.message || this.renderErrorMsg4()
-				return
+
 			}
 		}
 
diff --git a/plugins/plugins/core/puzzles/puzzles.src.js b/plugins/plugins/core/puzzles/puzzles.src.js
index d979bb0f..160de050 100644
--- a/plugins/plugins/core/puzzles/puzzles.src.js
+++ b/plugins/plugins/core/puzzles/puzzles.src.js
@@ -2,7 +2,7 @@ import {css, html, LitElement} from 'lit'
 import {render} from 'lit/html.js'
 import {Epml} from '../../../epml.js'
 import isElectron from 'is-electron'
-import {registerTranslateConfig, translate, use} from '../../../../core/translate/index.js'
+import {registerTranslateConfig, translate, use} from '../../../../core/translate'
 import nacl from '../../../../crypto/api/deps/nacl-fast.js'
 import Base58 from '../../../../crypto/api/deps/Base58.js'
 import publicKeyToAddress from '../../../../crypto/api/wallet/publicKeyToAddress.js'
diff --git a/plugins/plugins/core/q-app/q-apps.src.js b/plugins/plugins/core/q-app/q-apps.src.js
index 64241b73..594e5523 100644
--- a/plugins/plugins/core/q-app/q-apps.src.js
+++ b/plugins/plugins/core/q-app/q-apps.src.js
@@ -1,7 +1,7 @@
 import {css, html, LitElement} from 'lit'
 import {render} from 'lit/html.js'
 import {Epml} from '../../../epml.js'
-import {get, registerTranslateConfig, translate, use} from '../../../../core/translate/index.js'
+import {get, registerTranslateConfig, translate, use} from '../../../../core/translate'
 import isElectron from 'is-electron'
 import '@polymer/paper-spinner/paper-spinner-lite.js'
 import '@polymer/paper-dialog/paper-dialog.js'
diff --git a/plugins/plugins/core/qdn/browser/browser.src.js b/plugins/plugins/core/qdn/browser/browser.src.js
index c1701d82..319f6958 100644
--- a/plugins/plugins/core/qdn/browser/browser.src.js
+++ b/plugins/plugins/core/qdn/browser/browser.src.js
@@ -1,7 +1,7 @@
 import { css, html, LitElement } from 'lit'
 import { Epml } from '../../../../epml'
 import isElectron from 'is-electron'
-import { get, registerTranslateConfig, translate, use } from '../../../../../core/translate/index.js'
+import { get, registerTranslateConfig, translate, use } from '../../../../../core/translate'
 import ShortUniqueId from 'short-unique-id';
 import FileSaver from 'file-saver'
 import * as actions from '../../components/qdn-action-types'
@@ -1547,7 +1547,6 @@ class WebBrowser extends LitElement {
 									reason: errorMsg,
 									identifier: resource.identifier
 								})
-								continue
 							}
 
 						} catch (error) {
@@ -1555,7 +1554,6 @@ class WebBrowser extends LitElement {
 								reason: "Unknown error",
 								identifier: resource.identifier
 							})
-							continue
 						}
 
 
@@ -4164,7 +4162,7 @@ async function showModalAndWait(type, data) {
 		const modalContent = modal.querySelector('.modal-content')
 		modalContent.addEventListener('click', (e) => {
 			e.stopPropagation()
-			return
+
 		})
 		const backdropClick = document.getElementById('backdrop')
 		backdropClick.addEventListener('click', () => {
diff --git a/plugins/plugins/core/qdn/data-management/data-management.src.js b/plugins/plugins/core/qdn/data-management/data-management.src.js
index 9a9a6f2a..64ea7202 100644
--- a/plugins/plugins/core/qdn/data-management/data-management.src.js
+++ b/plugins/plugins/core/qdn/data-management/data-management.src.js
@@ -2,7 +2,7 @@ import {css, html, LitElement} from 'lit'
 import {render} from 'lit/html.js'
 import {Epml} from '../../../../epml'
 import isElectron from 'is-electron'
-import {get, registerTranslateConfig, translate, use} from '../../../../../core/translate/index.js'
+import {get, registerTranslateConfig, translate, use} from '../../../../../core/translate'
 import '@material/mwc-button'
 import '@material/mwc-dialog'
 import '@material/mwc-icon'
diff --git a/plugins/plugins/core/qdn/publish/publish.src.js b/plugins/plugins/core/qdn/publish/publish.src.js
index fa3fd9c9..3e69cc74 100644
--- a/plugins/plugins/core/qdn/publish/publish.src.js
+++ b/plugins/plugins/core/qdn/publish/publish.src.js
@@ -1,7 +1,7 @@
 import {css, html, LitElement} from 'lit'
 import {Epml} from '../../../../epml'
 import isElectron from 'is-electron'
-import {get, registerTranslateConfig, translate, use} from '../../../../../core/translate/index.js'
+import {get, registerTranslateConfig, translate, use} from '../../../../../core/translate'
 import '@material/mwc-button'
 import '@material/mwc-textfield'
 import '@material/mwc-select'
diff --git a/plugins/plugins/core/qdn/websites.src.js b/plugins/plugins/core/qdn/websites.src.js
index 2881dd63..03c84627 100644
--- a/plugins/plugins/core/qdn/websites.src.js
+++ b/plugins/plugins/core/qdn/websites.src.js
@@ -2,7 +2,7 @@ import {css, html, LitElement} from 'lit'
 import {render} from 'lit/html.js'
 import {Epml} from '../../../epml.js'
 import isElectron from 'is-electron'
-import {get, registerTranslateConfig, translate, use} from '../../../../core/translate/index.js'
+import {get, registerTranslateConfig, translate, use} from '../../../../core/translate'
 import '@material/mwc-dialog'
 import '@material/mwc-icon'
 import '@material/mwc-button'
diff --git a/plugins/plugins/core/qortal-lottery/qortal-lottery.src.js b/plugins/plugins/core/qortal-lottery/qortal-lottery.src.js
index 0859f509..149ffe14 100644
--- a/plugins/plugins/core/qortal-lottery/qortal-lottery.src.js
+++ b/plugins/plugins/core/qortal-lottery/qortal-lottery.src.js
@@ -1,7 +1,7 @@
 import {css, html, LitElement} from 'lit'
 import {render} from 'lit/html.js'
 import {Epml} from '../../../epml.js'
-import {get, registerTranslateConfig, translate, use} from '../../../../core/translate/index.js'
+import {get, registerTranslateConfig, translate, use} from '../../../../core/translate'
 import isElectron from 'is-electron'
 import '@material/mwc-button'
 import '@material/mwc-dialog'
@@ -480,20 +480,20 @@ class QortalLottery extends LitElement {
             })
         })
 
-        await this.openLotteries.map(item => {
-            const aTT = item.ATAddress
-            const endHeight = item.sleepUntilHeight
-            const newObj = {
-                ATAddress: aTT,
-                sleepUntilHeight: endHeight
-            }
-            this.openLotteriesAtArray.push(newObj)
-        })
+        this.openLotteries.map(item => {
+			const aTT = item.ATAddress
+			const endHeight = item.sleepUntilHeight
+			const newObj = {
+				ATAddress: aTT,
+				sleepUntilHeight: endHeight
+			}
+			this.openLotteriesAtArray.push(newObj)
+		})
 
-        await this.closedLotteries.map(item => {
-            const myAT = item.ATAddress
-            this.closedLotteriesAtArray.push(myAT)
-        })
+        this.closedLotteries.map(item => {
+			const myAT = item.ATAddress
+			this.closedLotteriesAtArray.push(myAT)
+		})
 
         const appDelay = ms => new Promise(res => setTimeout(res, ms))
         await appDelay(1000)
@@ -502,37 +502,37 @@ class QortalLottery extends LitElement {
     async getOpenLotteries() {
         let prepareOpenLotteriesArray = []
 
-        await this.openLotteriesAtArray.map(item => {
-            parentEpml.request('apiCall', {
-                url: `/transactions/address/${item.ATAddress}?limit=0&reverse=true`
-            }).then(res => {
-                this.openLotteriesFilterTx1 = []
-                this.openLotteriesFilterTx2 = []
-                this.openLotteriesFilterTx = res.filter(function (da) {
-                    return da.type === "DEPLOY_AT"
-                })
-                this.openLotteriesFilterTx2 = res.filter(function (pm) {
-                    return pm.type === "PAYMENT"
-                })
-                this.openLotteriesFilterTx.map(item2 => {
-                    const sleep = item.sleepUntilHeight
-                    const desc = item2.description
-                    const start = item2.blockHeight
-                    const ata = item2.aTAddress
-                    const amount = item2.tags
-                    const players = this.openLotteriesFilterTx2.length
-                    const obj = {
-                        description: desc,
-                        startBlock: start,
-                        endBlock: sleep,
-                        aTAddress: ata,
-                        joined: players,
-                        enter: amount
-                    }
-                    prepareOpenLotteriesArray.push(obj)
-                })
-            })
-        })
+        this.openLotteriesAtArray.map(item => {
+			parentEpml.request('apiCall', {
+				url: `/transactions/address/${item.ATAddress}?limit=0&reverse=true`
+			}).then(res => {
+				this.openLotteriesFilterTx1 = []
+				this.openLotteriesFilterTx2 = []
+				this.openLotteriesFilterTx = res.filter(function (da) {
+					return da.type === "DEPLOY_AT"
+				})
+				this.openLotteriesFilterTx2 = res.filter(function (pm) {
+					return pm.type === "PAYMENT"
+				})
+				this.openLotteriesFilterTx.map(item2 => {
+					const sleep = item.sleepUntilHeight
+					const desc = item2.description
+					const start = item2.blockHeight
+					const ata = item2.aTAddress
+					const amount = item2.tags
+					const players = this.openLotteriesFilterTx2.length
+					const obj = {
+						description: desc,
+						startBlock: start,
+						endBlock: sleep,
+						aTAddress: ata,
+						joined: players,
+						enter: amount
+					}
+					prepareOpenLotteriesArray.push(obj)
+				})
+			})
+		})
         const appDelay = ms => new Promise(res => setTimeout(res, ms))
         await appDelay(2000)
         this.openLotteriesArray = prepareOpenLotteriesArray
@@ -543,55 +543,55 @@ class QortalLottery extends LitElement {
     async getFinishedLotteries() {
         let prepareClosedLotteriesArray = []
 
-        await this.closedLotteriesAtArray.map(item => {
-            parentEpml.request('apiCall', {
-                url: `/transactions/address/${item}?limit=0&reverse=true`
-            }).then(res => {
-                this.closedLotteriesFilterTx1 = []
-                this.closedLotteriesFilterTx2 = []
-                this.closedLotteriesFilterTx1 = res.filter(function (el) {
-                    return el.type === "DEPLOY_AT"
-                })
-                this.closedLotteriesFilterTx2 = res.filter(function (el) {
-                    return el.type === "AT"
-                })
+        this.closedLotteriesAtArray.map(item => {
+			parentEpml.request('apiCall', {
+				url: `/transactions/address/${item}?limit=0&reverse=true`
+			}).then(res => {
+				this.closedLotteriesFilterTx1 = []
+				this.closedLotteriesFilterTx2 = []
+				this.closedLotteriesFilterTx1 = res.filter(function (el) {
+					return el.type === "DEPLOY_AT"
+				})
+				this.closedLotteriesFilterTx2 = res.filter(function (el) {
+					return el.type === "AT"
+				})
 
-                this.closedLotteriesFilterTx2.map(item1 => {
-                    const twinner = item1.recipient
-                    const tjackpot = item1.amount
-                    const tendblock = item1.blockHeight
-                    this.closedLotteriesFilterTx1.map(item2 => {
-                        const tstartblock = item2.blockHeight
-                        const tdescription = item2.description
-                        parentEpml.request('apiCall', {
-                            url: `/names/address/${twinner}?limit=0&reverse=true`
-                        }).then(res => {
-                            if (res.length) {
-                                const winName = res[0].name
-                                const obj = {
-                                    description: tdescription,
-                                    startblock: tstartblock,
-                                    endblock: tendblock,
-                                    winner:  winName,
-                                    jackpot: tjackpot
-                                }
-                                prepareClosedLotteriesArray.push(obj)
-                            } else {
-                                const winName = twinner
-                                const obj = {
-                                    description: tdescription,
-                                    startblock: tstartblock,
-                                    endblock: tendblock,
-                                    winner:  winName,
-                                    jackpot: tjackpot
-                                }
-                                prepareClosedLotteriesArray.push(obj)
-                            }
-                        })
-                    })
-                })
-            })
-        })
+				this.closedLotteriesFilterTx2.map(item1 => {
+					const twinner = item1.recipient
+					const tjackpot = item1.amount
+					const tendblock = item1.blockHeight
+					this.closedLotteriesFilterTx1.map(item2 => {
+						const tstartblock = item2.blockHeight
+						const tdescription = item2.description
+						parentEpml.request('apiCall', {
+							url: `/names/address/${twinner}?limit=0&reverse=true`
+						}).then(res => {
+							if (res.length) {
+								const winName = res[0].name
+								const obj = {
+									description: tdescription,
+									startblock: tstartblock,
+									endblock: tendblock,
+									winner: winName,
+									jackpot: tjackpot
+								}
+								prepareClosedLotteriesArray.push(obj)
+							} else {
+								const winName = twinner
+								const obj = {
+									description: tdescription,
+									startblock: tstartblock,
+									endblock: tendblock,
+									winner: winName,
+									jackpot: tjackpot
+								}
+								prepareClosedLotteriesArray.push(obj)
+							}
+						})
+					})
+				})
+			})
+		})
         const appDelay = ms => new Promise(res => setTimeout(res, ms))
         await appDelay(5000)
         this.closedLotteriesArray = prepareClosedLotteriesArray
diff --git a/plugins/plugins/core/reward-share/reward-share.src.js b/plugins/plugins/core/reward-share/reward-share.src.js
index c58151b7..8613d5e9 100644
--- a/plugins/plugins/core/reward-share/reward-share.src.js
+++ b/plugins/plugins/core/reward-share/reward-share.src.js
@@ -2,7 +2,7 @@ import {css, html, LitElement} from 'lit'
 import {render} from 'lit/html.js'
 import {Epml} from '../../../epml.js'
 import isElectron from 'is-electron'
-import {get, registerTranslateConfig, translate, use} from '../../../../core/translate/index.js'
+import {get, registerTranslateConfig, translate, use} from '../../../../core/translate'
 import '@material/mwc-icon'
 import '@material/mwc-button'
 import '@material/mwc-textfield'
diff --git a/plugins/plugins/core/sponsorship-list/sponsorship-list.src.js b/plugins/plugins/core/sponsorship-list/sponsorship-list.src.js
index 8c940407..56ba7589 100644
--- a/plugins/plugins/core/sponsorship-list/sponsorship-list.src.js
+++ b/plugins/plugins/core/sponsorship-list/sponsorship-list.src.js
@@ -1,6 +1,6 @@
 import {html, LitElement} from 'lit'
 import {Epml} from '../../../epml.js'
-import {get, registerTranslateConfig, translate, use} from '../../../../core/translate/index.js'
+import {get, registerTranslateConfig, translate, use} from '../../../../core/translate'
 import {blocksNeed} from '../../utils/blocks-needed.js'
 import {asyncReplace} from 'lit/directives/async-replace.js'
 import {pageStyles} from './sponsorship-list-css.src.js'
@@ -721,13 +721,13 @@ class SponsorshipList extends LitElement {
 		}
 
 		const getTxnRequestResponse = (txnResponse) => {
-			
+
 			const extraData = txnResponse && txnResponse.extraData;
 			const data = txnResponse && txnResponse.data;
 			const dataMessage = data && data.message;
 			const extraDataPrivateKey = extraData && extraData.rewardSharePrivateKey;
 			const txnSuccess = txnResponse && txnResponse.success;
-		  
+
 			if (extraDataPrivateKey && typeof dataMessage === 'string' &&
 				(dataMessage.includes('multiple') || dataMessage.includes('SELF_SHARE_EXISTS'))) {
 			  this.privateRewardShareKey = extraDataPrivateKey;
diff --git a/plugins/plugins/core/streams/onNewBlock.js b/plugins/plugins/core/streams/onNewBlock.js
index da3ce393..70b4068d 100644
--- a/plugins/plugins/core/streams/onNewBlock.js
+++ b/plugins/plugins/core/streams/onNewBlock.js
@@ -19,11 +19,7 @@ let blockSocketReconnectInterval = MIN_RECONNECT_INTERVAL;
 let nodeStatusSocketReconnectInterval = MIN_RECONNECT_INTERVAL;
 
 parentEpml.subscribe('logged_in', loggedIn => {
-    if (loggedIn === 'true') {
-        isLoggedIn = true
-    } else {
-        isLoggedIn = false
-    }
+    isLoggedIn = loggedIn === 'true';
 })
 
 
@@ -39,7 +35,7 @@ const setAccountInfo = async (addr) => {
         addressInfo: addressInfo
     }
     if (window.parent._.isEqual(oldAccountInfo, accountInfo) === true) {
-        return
+
     } else {
         parentEpml.request('setAccountInfo', accountInfo)
         oldAccountInfo = accountInfo
@@ -82,7 +78,7 @@ export const startConfigWatcher = () => {
             let _newState = JSON.parse(c)
             let newState = { node: _newState.node, knownNodes: _newState.knownNodes }
             if (window.parent._.isEqual(oldState, newState) === true) {
-                return
+
             } else {
                 oldState = newState
                 nodeStateCall = true
diff --git a/plugins/plugins/core/streams/streams.js b/plugins/plugins/core/streams/streams.js
index 48d91546..fc4d9f71 100644
--- a/plugins/plugins/core/streams/streams.js
+++ b/plugins/plugins/core/streams/streams.js
@@ -36,7 +36,7 @@ const sortActiveChat = (activeChatObject, localChatHeads) => {
     let oldChatHeads = JSON.parse(localChatHeads)
 
     if (window.parent._.isEqual(oldChatHeads, activeChatObject) === true) {
-        return
+
     } else {
 
         let oldActiveChats = objectToArray(oldChatHeads)
diff --git a/plugins/plugins/core/trade-bot/trade-bot-portal.src.js b/plugins/plugins/core/trade-bot/trade-bot-portal.src.js
index e16e50c6..e33c3774 100644
--- a/plugins/plugins/core/trade-bot/trade-bot-portal.src.js
+++ b/plugins/plugins/core/trade-bot/trade-bot-portal.src.js
@@ -2,7 +2,7 @@ import {css, html, LitElement} from 'lit'
 import {render} from 'lit/html.js'
 import {Epml} from '../../../epml.js'
 import isElectron from 'is-electron'
-import {get, registerTranslateConfig, translate, use} from '../../../../core/translate/index.js'
+import {get, registerTranslateConfig, translate, use} from '../../../../core/translate'
 import Base58 from '../../../../crypto/api/deps/Base58.js'
 import {decryptData, encryptData} from '../../../../core/src/lockScreen.js'
 import {tradebotStyles} from './trade-bot-portal-css.js'
@@ -1830,7 +1830,7 @@ class TradeBotPortal extends LitElement {
             this.autoHelperMessage = this.renderAutoHelperErr()
             await errDelay(3000)
             this.autoHelperMessage = this.renderAutoHelperPass()
-            return
+
         }
     }
 
@@ -3314,4 +3314,4 @@ class TradeBotPortal extends LitElement {
     }
 }
 
-window.customElements.define('trade-bot-portal', TradeBotPortal)
\ No newline at end of file
+window.customElements.define('trade-bot-portal', TradeBotPortal)
diff --git a/plugins/plugins/core/trade-portal/charts/arrr-charts.js b/plugins/plugins/core/trade-portal/charts/arrr-charts.js
index 1389cda5..8ee8b7e5 100644
--- a/plugins/plugins/core/trade-portal/charts/arrr-charts.js
+++ b/plugins/plugins/core/trade-portal/charts/arrr-charts.js
@@ -1,6 +1,6 @@
 import {css, html, LitElement} from 'lit'
 import {Epml} from '../../../../epml.js'
-import {get, registerTranslateConfig, translate, use} from '../../../../../core/translate/index.js'
+import {get, registerTranslateConfig, translate, use} from '../../../../../core/translate'
 import '@polymer/paper-dialog/paper-dialog.js'
 import * as Highcharts from 'highcharts'
 import Exporting from 'highcharts/modules/exporting'
diff --git a/plugins/plugins/core/trade-portal/charts/btc-charts.js b/plugins/plugins/core/trade-portal/charts/btc-charts.js
index a72d19b1..1ab350e2 100644
--- a/plugins/plugins/core/trade-portal/charts/btc-charts.js
+++ b/plugins/plugins/core/trade-portal/charts/btc-charts.js
@@ -1,6 +1,6 @@
 import {css, html, LitElement} from 'lit'
 import {Epml} from '../../../../epml.js'
-import {get, registerTranslateConfig, translate, use} from '../../../../../core/translate/index.js'
+import {get, registerTranslateConfig, translate, use} from '../../../../../core/translate'
 import '@polymer/paper-dialog/paper-dialog.js'
 import * as Highcharts from 'highcharts'
 import Exporting from 'highcharts/modules/exporting'
diff --git a/plugins/plugins/core/trade-portal/charts/dgb-charts.js b/plugins/plugins/core/trade-portal/charts/dgb-charts.js
index 42da663a..369887f7 100644
--- a/plugins/plugins/core/trade-portal/charts/dgb-charts.js
+++ b/plugins/plugins/core/trade-portal/charts/dgb-charts.js
@@ -1,6 +1,6 @@
 import {css, html, LitElement} from 'lit'
 import {Epml} from '../../../../epml.js'
-import {get, registerTranslateConfig, translate, use} from '../../../../../core/translate/index.js'
+import {get, registerTranslateConfig, translate, use} from '../../../../../core/translate'
 import '@polymer/paper-dialog/paper-dialog.js'
 import * as Highcharts from 'highcharts'
 import Exporting from 'highcharts/modules/exporting'
diff --git a/plugins/plugins/core/trade-portal/charts/doge-charts.js b/plugins/plugins/core/trade-portal/charts/doge-charts.js
index 54c3cdb2..acd95eb4 100644
--- a/plugins/plugins/core/trade-portal/charts/doge-charts.js
+++ b/plugins/plugins/core/trade-portal/charts/doge-charts.js
@@ -1,6 +1,6 @@
 import {css, html, LitElement} from 'lit'
 import {Epml} from '../../../../epml.js'
-import {get, registerTranslateConfig, translate, use} from '../../../../../core/translate/index.js'
+import {get, registerTranslateConfig, translate, use} from '../../../../../core/translate'
 import '@polymer/paper-dialog/paper-dialog.js'
 import * as Highcharts from 'highcharts'
 import Exporting from 'highcharts/modules/exporting'
diff --git a/plugins/plugins/core/trade-portal/charts/ltc-charts.js b/plugins/plugins/core/trade-portal/charts/ltc-charts.js
index 1d6d9ab3..d4f3ec71 100644
--- a/plugins/plugins/core/trade-portal/charts/ltc-charts.js
+++ b/plugins/plugins/core/trade-portal/charts/ltc-charts.js
@@ -1,6 +1,6 @@
 import {css, html, LitElement} from 'lit'
 import {Epml} from '../../../../epml.js'
-import {get, registerTranslateConfig, translate, use} from '../../../../../core/translate/index.js'
+import {get, registerTranslateConfig, translate, use} from '../../../../../core/translate'
 import '@polymer/paper-dialog/paper-dialog.js'
 import * as Highcharts from 'highcharts'
 import Exporting from 'highcharts/modules/exporting'
diff --git a/plugins/plugins/core/trade-portal/charts/rvn-charts.js b/plugins/plugins/core/trade-portal/charts/rvn-charts.js
index 032de088..8fea7944 100644
--- a/plugins/plugins/core/trade-portal/charts/rvn-charts.js
+++ b/plugins/plugins/core/trade-portal/charts/rvn-charts.js
@@ -1,6 +1,6 @@
 import {css, html, LitElement} from 'lit'
 import {Epml} from '../../../../epml.js'
-import {get, registerTranslateConfig, translate, use} from '../../../../../core/translate/index.js'
+import {get, registerTranslateConfig, translate, use} from '../../../../../core/translate'
 import '@polymer/paper-dialog/paper-dialog.js'
 import * as Highcharts from 'highcharts'
 import Exporting from 'highcharts/modules/exporting'
diff --git a/plugins/plugins/core/trade-portal/trade-portal.src.js b/plugins/plugins/core/trade-portal/trade-portal.src.js
index de0c8980..e8a99668 100644
--- a/plugins/plugins/core/trade-portal/trade-portal.src.js
+++ b/plugins/plugins/core/trade-portal/trade-portal.src.js
@@ -2,7 +2,7 @@ import {css, html, LitElement} from 'lit'
 import {render} from 'lit/html.js'
 import {Epml} from '../../../epml.js'
 import isElectron from 'is-electron'
-import {get, registerTranslateConfig, translate, use} from '../../../../core/translate/index.js'
+import {get, registerTranslateConfig, translate, use} from '../../../../core/translate'
 import Base58 from '../../../../crypto/api/deps/Base58.js'
 import {decryptData, encryptData} from '../../../../core/src/lockScreen.js'
 import {tradeStyles} from './trade-portal-css.js'
@@ -953,11 +953,7 @@ class TradePortal extends LitElement {
         const getSellButtonStatus = () => {
             if (this.nodeInfo.isSynchronizing === true) {
                 this.sellBtnDisable = true
-            } else if (this.nodeInfo.isSynchronizing === false) {
-                this.sellBtnDisable = false
-            } else {
-                this.sellBtnDisable = true
-            }
+            } else this.sellBtnDisable = this.nodeInfo.isSynchronizing !== false;
         }
 
         const getQortBtcPrice = () => {
@@ -1244,7 +1240,7 @@ class TradePortal extends LitElement {
             this.tradeHelperMessage = this.renderTradeHelperErr()
             await errDelay(3000)
             this.tradeHelperMessage = this.renderTradeHelperPass()
-            return
+
         }
     }
 
@@ -2833,4 +2829,4 @@ class TradePortal extends LitElement {
     }
 }
 
-window.customElements.define('trade-portal', TradePortal)
\ No newline at end of file
+window.customElements.define('trade-portal', TradePortal)
diff --git a/plugins/plugins/core/wallet/wallet-app.src.js b/plugins/plugins/core/wallet/wallet-app.src.js
index 78d638fc..0a9916b9 100644
--- a/plugins/plugins/core/wallet/wallet-app.src.js
+++ b/plugins/plugins/core/wallet/wallet-app.src.js
@@ -2,7 +2,7 @@ import {css, html, LitElement} from 'lit'
 import {render} from 'lit/html.js'
 import {Epml} from '../../../epml.js'
 import isElectron from 'is-electron'
-import {get, registerTranslateConfig, translate, use} from '../../../../core/translate/index.js'
+import {get, registerTranslateConfig, translate, use} from '../../../../core/translate'
 import Base58 from '../../../../crypto/api/deps/Base58.js'
 import {decryptData, encryptData} from '../../../../core/src/lockScreen.js'
 import FileSaver from 'file-saver'
@@ -2955,7 +2955,7 @@ class MultiWallet extends LitElement {
             this.walletHelperMessage = this.renderWalletHelperErr()
             await errDelay(3000)
             this.walletHelperMessage = this.renderWalletHelperPass()
-            return
+
         }
     }
 
@@ -4766,7 +4766,7 @@ class MultiWallet extends LitElement {
                     await new Promise(resolve => setTimeout(resolve, 2000))
                     this.showWallet()
                     return
-                } else if (res !== null && res !== "Synchronized") {
+                } else if (res !== "Synchronized") {
                     this.balanceString = res
                     await new Promise(resolve => setTimeout(resolve, 2000))
                     this.showWallet()
diff --git a/plugins/plugins/utils/publish-image.js b/plugins/plugins/utils/publish-image.js
index ed3b2c34..15af8a68 100644
--- a/plugins/plugins/utils/publish-image.js
+++ b/plugins/plugins/utils/publish-image.js
@@ -74,20 +74,20 @@ export const publishData = async ({
 		let nonce = null
 		const computPath =window.parent.location.origin + '/memory-pow/memory-pow.wasm.full'
 			await new Promise((res, rej) => {
-       
+
                 worker.postMessage({convertedBytes, path: computPath});
-            
+
                 worker.onmessage = e => {
-                    
+
                   worker.terminate()
-              
+
                     nonce = e.data.nonce
                     res()
-                 
+
                 }
               })
-     
-  
+
+
         let response = await parentEpml.request("sign_arbitrary", {
             nonce: selectedAddress.nonce,
             arbitraryBytesBase58: transactionBytesBase58,
@@ -113,9 +113,9 @@ export const publishData = async ({
             throw new Error('Error when signing');
         }
 
-	
-     
-  
+
+
+
         let response = await parentEpml.request("sign_arbitrary_with_fee", {
             nonce: selectedAddress.nonce,
             arbitraryBytesBase58: transactionBytesBase58,
@@ -194,11 +194,11 @@ export const publishData = async ({
 				let fileBuffer = new Uint8Array(await file.arrayBuffer())
 				postBody = Buffer.from(fileBuffer).toString("base64")
 				}
-				
+
 			}
-		
+
 			let uploadDataUrl = `/arbitrary/${service}/${registeredName}${urlSuffix}?apiKey=${getApiKey()}`
-			if (identifier != null && identifier.trim().length > 0) {
+			if (identifier.trim().length > 0) {
 				uploadDataUrl = `/arbitrary/${service}/${registeredName}/${identifier}${urlSuffix}?apiKey=${getApiKey()}`
 
 			}
@@ -234,7 +234,7 @@ export const publishData = async ({
 			if(tag5 != null && tag5 != "undefined"){
 				uploadDataUrl = uploadDataUrl + '&tags=' + encodeURIComponent(tag5)
 			}
-			
+
 			let uploadDataRes = await parentEpml.request("apiCall", {
 				type: "api",
 				method: "POST",
@@ -250,5 +250,5 @@ export const publishData = async ({
 	} catch (error) {
 		throw new Error(error.message)
 	}
-   
+
 }
diff --git a/plugins/plugins/utils/publish-modal.js b/plugins/plugins/utils/publish-modal.js
index 54ea0ca4..76c60f67 100644
--- a/plugins/plugins/utils/publish-modal.js
+++ b/plugins/plugins/utils/publish-modal.js
@@ -1,4 +1,4 @@
-import {get} from '../../../core/translate/index.js'
+import {get} from '../../../core/translate'
 
 export class ModalHelper {
     constructor() {
diff --git a/plugins/plugins/utils/warning-modal.js b/plugins/plugins/utils/warning-modal.js
index 45e78210..0399591f 100644
--- a/plugins/plugins/utils/warning-modal.js
+++ b/plugins/plugins/utils/warning-modal.js
@@ -1,4 +1,4 @@
-import {get} from '../../../core/translate/index.js'
+import {get} from '../../../core/translate'
 
 export class WarningModal {
     constructor() {
diff --git a/scripts/afterPack.js b/scripts/afterPack.js
index 747e06db..73bda2a0 100644
--- a/scripts/afterPack.js
+++ b/scripts/afterPack.js
@@ -37,7 +37,7 @@ async function afterPack(context) {
 
     if (electronPlatformName.includes("linux")) {
         await doLinux(context);
-        return;
+
     }
 
 }
diff --git a/splash/download.html b/splash/download.html
index f336d22d..e6608ad9 100644
--- a/splash/download.html
+++ b/splash/download.html
@@ -12,7 +12,7 @@
 			.center {
 				margin-top: 50%;
 				transform: translateY(-50%);
-				width auto;
+				width: auto;
 				height: auto;
 				overflow: hidden;
 			}
@@ -28,8 +28,8 @@
 			}
 
 			@-webkit-keyframes spin {
-				0% { -webkit-transform: rotate(0deg); }
-				100% { -webkit-transform: rotate(360deg); }
+				0% { --webkit-transform: rotate(0deg); }
+				100% { --webkit-transform: rotate(360deg); }
 			}
 
 			@keyframes spin {
@@ -49,4 +49,4 @@
 			</div>
 		</div>
 	</body>
-</html>
\ No newline at end of file
+</html>