From f7b45eb077850f29baa504507c9a12ac772539c4 Mon Sep 17 00:00:00 2001
From: Ilya Vilensky <vilensky.ilya@gmail.com>
Date: Thu, 21 May 2020 12:33:12 +0300
Subject: [PATCH] Fix sending tx (#516)

* Fixed sending tx

* Fixed sending tx

* Fixed sending tx

* Fixed sending tx

* Fixed sending tx

Co-authored-by: Ilya <iliyav@yahoo.com>
---
 app/components/node/Carousel.js               |   4 +-
 app/components/transactions/TransactionRow.js |   4 +-
 app/components/wallet/TxConfirmation.js       |   2 +-
 app/infra/cryptoService/index.js              |   1 -
 app/infra/eventsService/eventsService.js      |  13 +-
 app/infra/utils.js                            | 136 +---
 app/redux/auth/actions.js                     |   2 -
 app/redux/wallet/actions.js                   |  64 +-
 app/screens/auth/CreateWallet.js              |   2 +-
 app/screens/auth/WordsRestore.js              |  11 +-
 app/screens/wallet/SendCoins.js               |   2 +-
 app/vars/ipcConsts.js                         |   2 +-
 configs/webpack.config.base.js                |   4 +-
 desktop/app.html                              |  10 -
 .../cryptoService.js                          |  41 +-
 desktop/main.dev.js                           |  13 +-
 desktop/transactionManager.js                 |  31 +-
 desktop/walletManager.js                      |  80 +-
 package-lock.json                             | 716 +++++++++++-------
 package.json                                  |  11 +-
 20 files changed, 628 insertions(+), 521 deletions(-)
 delete mode 100644 app/infra/cryptoService/index.js
 rename {app/infra/cryptoService => desktop}/cryptoService.js (76%)

diff --git a/app/components/node/Carousel.js b/app/components/node/Carousel.js
index 879529cd5..fb53989cf 100644
--- a/app/components/node/Carousel.js
+++ b/app/components/node/Carousel.js
@@ -3,7 +3,7 @@ import React, { Component } from 'react';
 import styled from 'styled-components';
 import { chevronLeftBlack, chevronRightBlack, chevronLeftGray, chevronRightGray } from '/assets/images';
 import { smColors } from '/vars';
-import { formatNumber } from '/infra/utils';
+import { formatBytes } from '/infra/utils';
 
 const SLIDE_WIDTH = 170;
 const SLIDE_MARGIN = 15;
@@ -160,7 +160,7 @@ class Carousel extends Component<Props, State> {
                     <Text>
                       FREE SPACE...
                       <br />
-                      {formatNumber(element.availableDiskSpace)} GB
+                      {formatBytes(element.availableDiskSpace)}
                     </Text>
                   </TextWrapper>
                 </SlideUpperPart>
diff --git a/app/components/transactions/TransactionRow.js b/app/components/transactions/TransactionRow.js
index 7c0e7ab8c..e0397f784 100644
--- a/app/components/transactions/TransactionRow.js
+++ b/app/components/transactions/TransactionRow.js
@@ -6,7 +6,7 @@ import { updateTransaction } from '/redux/wallet/actions';
 import { chevronLeftBlack, chevronRightBlack, addContact } from '/assets/images';
 import styled from 'styled-components';
 import { Button } from '/basicComponents';
-import { getAbbreviatedText, formatTxId, getFormattedTimestamp, getAddress, formatSmidge } from '/infra/utils';
+import { getAbbreviatedText, getFormattedTimestamp, getAddress, formatSmidge } from '/infra/utils';
 import { smColors } from '/vars';
 import TX_STATUSES from '/vars/enums';
 import type { Tx, Action } from '/types';
@@ -141,6 +141,8 @@ const TextArea = styled.textarea`
   margin-bottom: 10px;
 `;
 
+const formatTxId = (id) => id && `0x${id.substring(0, 6)}`;
+
 type Props = {
   updateTransaction: Action,
   tx: Tx,
diff --git a/app/components/wallet/TxConfirmation.js b/app/components/wallet/TxConfirmation.js
index 9e5729e3f..e5b274465 100644
--- a/app/components/wallet/TxConfirmation.js
+++ b/app/components/wallet/TxConfirmation.js
@@ -154,7 +154,7 @@ class TxConfirmation extends PureComponent<Props> {
             <ComplexButtonText>EDIT TRANSACTION</ComplexButtonText>
           </ComplexButton>
           <Link onClick={this.navigateToGuide} text="SEND SMH GUIDE" />
-          <Button onClick={doneAction} text="SEND" isDisabled={!status.synced} />
+          <Button onClick={doneAction} text="SEND" isDisabled={!status.synced} style={{ marginLeft: 'auto' }} />
           {!status?.synced && <NotSyncedExplanation>Please wait until your app is synced with the mesh</NotSyncedExplanation>}
         </Footer>
       </Wrapper>
diff --git a/app/infra/cryptoService/index.js b/app/infra/cryptoService/index.js
deleted file mode 100644
index 54624c178..000000000
--- a/app/infra/cryptoService/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default as cryptoService } from './cryptoService'; // eslint-disable-line import/prefer-default-export
diff --git a/app/infra/eventsService/eventsService.js b/app/infra/eventsService/eventsService.js
index 56269835e..033735a4f 100644
--- a/app/infra/eventsService/eventsService.js
+++ b/app/infra/eventsService/eventsService.js
@@ -3,15 +3,17 @@ import { ipcRenderer } from 'electron';
 import { ipcConsts } from '/vars';
 
 class EventsService {
-  static createWallet = ({ timestamp, dataToEncrypt, password }: { timestamp: string, dataToEncrypt: Object, password: string }) =>
-    ipcRenderer.invoke(ipcConsts.CREATE_WALLET_FILE, { timestamp, dataToEncrypt, password });
+  static createWallet = ({ password, existingMnemonic }: { password: string, existingMnemonic: string }) =>
+    ipcRenderer.invoke(ipcConsts.CREATE_WALLET_FILE, { password, existingMnemonic });
 
   static readWalletFiles = () => ipcRenderer.invoke(ipcConsts.READ_WALLET_FILES);
 
   static unlockWallet = ({ path, password }: { path: string, password: string }) => ipcRenderer.invoke(ipcConsts.UNLOCK_WALLET_FILE, { path, password });
 
   static updateWallet = ({ fileName, password, data }: { fileName: string, password: string, data: Object }) =>
-    ipcRenderer.invoke(ipcConsts.UPDATE_WALLET_FILE, { fileName, password, data });
+    ipcRenderer.send(ipcConsts.UPDATE_WALLET_FILE, { fileName, password, data });
+
+  static createNewAccount = ({ fileName, password }: { fileName: string, password: string }) => ipcRenderer.invoke(ipcConsts.CREATE_NEW_ACCOUNT, { fileName, password });
 
   static copyFile = ({ filePath, copyToDocuments }: { filePath: string, copyToDocuments?: boolean }) => ipcRenderer.invoke(ipcConsts.COPY_FILE, { filePath, copyToDocuments });
 
@@ -53,10 +55,7 @@ class EventsService {
 
   static getBalance = ({ address }: { address: string }) => ipcRenderer.invoke(ipcConsts.GET_BALANCE, { address });
 
-  static getNonce = ({ address }: { address: string }) => ipcRenderer.invoke(ipcConsts.GET_NONCE, { address });
-
-  static sendTx = ({ tx, accountIndex, txToAdd }: { tx: Uint8Array, accountIndex: number, txToAdd: Object }) =>
-    ipcRenderer.invoke(ipcConsts.SEND_TX, { tx, accountIndex, txToAdd });
+  static sendTx = ({ fullTx, accountIndex }: { fullTx: Object, accountIndex: number }) => ipcRenderer.invoke(ipcConsts.SEND_TX, { fullTx, accountIndex });
 
   static updateTransaction = ({ newData, accountIndex, txId }: { newData: string, accountIndex: number, txId?: string }) =>
     ipcRenderer.invoke(ipcConsts.UPDATE_TX, { newData, accountIndex, txId });
diff --git a/app/infra/utils.js b/app/infra/utils.js
index 2712eb8be..03c001cc2 100644
--- a/app/infra/utils.js
+++ b/app/infra/utils.js
@@ -1,13 +1,3 @@
-const fromHexString = (hexString) => {
-  const bytes = [];
-  for (let i = 0; i < hexString.length; i += 2) {
-    bytes.push(parseInt(hexString.slice(i, i + 2), 16));
-  }
-  return Uint8Array.from(bytes);
-};
-
-const toHexString = (bytes) => bytes.reduce((str, byte) => str + byte.toString(16).padStart(2, '0'), '');
-
 const createError = (message, func) => ({
   message,
   retryFunction: func
@@ -16,9 +6,21 @@ const createError = (message, func) => ({
 const getAbbreviatedText = (address: string, addPrefix: boolean = true, tailSize: number = 4) =>
   `${addPrefix && address.indexOf('0x') === -1 ? '0x' : ''}${address.substring(0, tailSize)}...${address.substring(address.length - tailSize, address.length)}`;
 
-const formatTxId = (id) => id && `0x${id.substring(0, 6)}`;
+const getFormattedTimestamp = (timestamp: string) => {
+  if (timestamp) {
+    const options = { year: 'numeric', month: 'short', day: 'numeric', hour: '2-digit', minute: '2-digit', second: '2-digit' };
+    const dateObj = new Date(timestamp);
+    return dateObj.toLocaleDateString('en-US', options).replace(',', '');
+  }
+  return null;
+};
 
-const formatNumber = (num) => num.toString().replace(/(\d)(?=(\d{3})+(?!\d))/g, '$1,');
+const getAddress = (key: string) => (key ? key.substring(24) : null);
+
+const formatBytes = (bytes) => {
+  if (bytes === 0) return 0;
+  return parseFloat((bytes / 1073741824).toFixed(4));
+};
 
 // Internal helper - returns the value and the unit of a smidge coin amount.
 // Used to format smidge strings
@@ -55,112 +57,4 @@ const formatSmidge = (amount: number, separateResult) => {
   return separateResult ? { value: res.value, unit: res.unit } : `${res.value} ${res.unit}`;
 };
 
-const testGetValueAndUnit = () => {
-  let res = getValueAndUnit(0);
-  if (res.unit !== 'SMH' || res.value !== 0) {
-    console.error(`test failed. expected 0 SMH: ${res.value.toString()} ${res.unit}`); // eslint-disable-line no-console
-  }
-  console.log(`${res.value.toString()} ${res.unit}`); // eslint-disable-line no-console
-
-  res = getValueAndUnit(2.5 * 10 ** 12);
-  if (res.unit !== 'SMH' || res.value !== 2.5) {
-    console.error(`test failed. expected 2.5 SMH: ${res.value.toString()} ${res.unit}`); // eslint-disable-line no-console
-  }
-  console.log(`${res.value.toString()} ${res.unit}`); // eslint-disable-line no-console
-
-  res = getValueAndUnit(10 ** 12);
-  if (res.unit !== 'SMH' || res.value !== 1) {
-    console.error(`test failed. expected 1 SMH${res.value.toString()} ${res.unit}`); // eslint-disable-line no-console
-  }
-  console.log(`${res.value.toString()} ${res.unit}`); // eslint-disable-line no-console
-
-  res = getValueAndUnit(10 ** 11);
-  if (res.unit !== 'SMH' || res.value !== 0.1) {
-    console.error(`test failed. expected 0.1 SMH${res.value.toString()} ${res.unit}`); // eslint-disable-line no-console
-  }
-  console.log(`${res.value.toString()} ${res.unit}`); // eslint-disable-line no-console
-
-  res = getValueAndUnit(10 ** 10);
-  if (res.unit !== 'SMH' || res.value !== 0.01) {
-    console.error(`test failed. expected 0.01 SMH${res.value.toString()} ${res.unit}`); // eslint-disable-line no-console
-  }
-  console.log(`${res.value.toString()} ${res.unit}`); // eslint-disable-line no-console
-
-  res = getValueAndUnit(10 ** 9);
-  if (res.unit !== 'SMH' || res.value !== 0.001) {
-    console.error(`test failed. expected 0.001 SMH. ${res.value.toString()} ${res.unit}`); // eslint-disable-line no-console
-  }
-  console.log(`${res.value.toString()} ${res.unit}`); // eslint-disable-line no-console
-
-  res = getValueAndUnit(10 ** 8);
-  if (res.unit !== 'GSMD' || res.value !== 0.1) {
-    console.error(`test failed. expected 0.1 GSMD. ${res.value.toString()} ${res.unit}`); // eslint-disable-line no-console
-  }
-  console.log(`${res.value.toString()} ${res.unit}`); // eslint-disable-line no-console
-
-  res = getValueAndUnit(10 ** 7);
-  if (res.unit !== 'GSMD' || res.value !== 0.01) {
-    console.error(`test failed. expected 0.01 GSMD ${res.value.toString()} ${res.unit}`); // eslint-disable-line no-console
-  }
-  console.log(`${res.value.toString()} ${res.unit}`); // eslint-disable-line no-console
-
-  res = getValueAndUnit(10 ** 6);
-  if (res.unit !== 'GSMD' || res.value !== 0.001) {
-    console.error(`test failed. expected 0.001 GSMD ${res.value.toString()} ${res.unit}`); // eslint-disable-line no-console
-  }
-  console.log(`${res.value.toString()} ${res.unit}`); // eslint-disable-line no-console
-
-  res = getValueAndUnit(10 ** 5);
-  if (res.unit !== 'MSMD' || res.value !== 0.1) {
-    console.error(`test failed. expected 0.1 MSMD ${res.value.toString()} ${res.unit}`); // eslint-disable-line no-console
-  }
-  console.log(`${res.value.toString()} ${res.unit}`); // eslint-disable-line no-console
-
-  res = getValueAndUnit(10 ** 4);
-  if (res.unit !== 'MSMD' || res.value !== 0.01) {
-    console.error(`test failed. expected 0.01 MSMD ${res.value.toString()} ${res.unit}`); // eslint-disable-line no-console
-  }
-  console.log(`${res.value.toString()} ${res.unit}`); // eslint-disable-line no-console
-
-  res = getValueAndUnit(10 ** 3);
-  if (res.unit !== 'SMD' || res.value !== 1000) {
-    console.error(`test failed. expected 1000 SMD ${res.value.toString()} ${res.unit}`); // eslint-disable-line no-console
-  }
-  console.log(`${res.value.toString()} ${res.unit}`); // eslint-disable-line no-console
-
-  res = getValueAndUnit(10 ** 2);
-  if (res.unit !== 'SMD' || res.value !== 100) {
-    console.error(`test failed. expected 100 SMD ${res.value.toString()} ${res.unit}`); // eslint-disable-line no-console
-  }
-  console.log(`${res.value.toString()} ${res.unit}`); // eslint-disable-line no-console
-
-  res = getValueAndUnit(10);
-  if (res.unit !== 'SMD' || res.value !== 10) {
-    console.error(`test failed. expected 10 SMD ${res.value.toString()} ${res.unit}`); // eslint-disable-line no-console
-  }
-  console.log(`${res.value.toString()} ${res.unit}`); // eslint-disable-line no-console
-
-  res = getValueAndUnit(1);
-  if (res.unit !== 'SMD' || res.value !== 1) {
-    console.error(`test failed. expected 1 SMD ${res.value.toString()} ${res.unit}`); // eslint-disable-line no-console
-  }
-  console.log(`${res.value.toString()} ${res.unit}`); // eslint-disable-line no-console
-};
-
-const getFormattedTimestamp = (timestamp: string) => {
-  if (timestamp) {
-    const options = { year: 'numeric', month: 'short', day: 'numeric', hour: '2-digit', minute: '2-digit', second: '2-digit' };
-    const dateObj = new Date(timestamp);
-    return dateObj.toLocaleDateString('en-US', options).replace(',', '');
-  }
-  return null;
-};
-
-const getAddress = (key: string) => (key ? key.substring(24) : null);
-
-const formatBytes = (bytes) => {
-  if (bytes === 0) return 0;
-  return parseFloat((bytes / 1073741824).toFixed(4));
-};
-
-export { testGetValueAndUnit, formatSmidge, fromHexString, toHexString, createError, getAbbreviatedText, formatNumber, getFormattedTimestamp, getAddress, formatTxId, formatBytes };
+export { formatSmidge, createError, getAbbreviatedText, getFormattedTimestamp, getAddress, formatBytes };
diff --git a/app/redux/auth/actions.js b/app/redux/auth/actions.js
index 3e0dbca65..ff7cdfe2e 100644
--- a/app/redux/auth/actions.js
+++ b/app/redux/auth/actions.js
@@ -1,10 +1,8 @@
 // @flow
 import { Action } from '/types';
-import { cryptoService } from '/infra/cryptoService';
 
 export const LOGOUT: string = 'LOGOUT';
 
 export const logout = (): Action => {
-  cryptoService.stopAndCleanUp();
   return { type: LOGOUT };
 };
diff --git a/app/redux/wallet/actions.js b/app/redux/wallet/actions.js
index e683da0dd..8629e95d8 100644
--- a/app/redux/wallet/actions.js
+++ b/app/redux/wallet/actions.js
@@ -1,6 +1,5 @@
 // @flow
 import { eventsService } from '/infra/eventsService';
-import { cryptoService } from '/infra/cryptoService';
 import { createError, getAddress } from '/infra/utils';
 import { Action, Dispatch, GetState, WalletMeta, Account, AccountTxs, Contact } from '/types';
 import TX_STATUSES from '/vars/enums';
@@ -20,14 +19,6 @@ export const SET_BACKUP_TIME: string = 'SET_BACKUP_TIME';
 
 export const SET_UPDATE_DOWNLOADING: string = 'IS_UPDATE_DOWNLOADING';
 
-const getNewAccountFromTemplate = ({ accountNumber, timestamp, publicKey, secretKey }: { accountNumber: number, timestamp: string, publicKey: string, secretKey: string }) => ({
-  displayName: accountNumber > 0 ? `Account ${accountNumber}` : 'Main Account',
-  created: timestamp,
-  path: `0/0/${accountNumber}`,
-  publicKey,
-  secretKey
-});
-
 export const setWalletMeta = ({ meta }: { meta: WalletMeta }): Action => ({ type: SET_WALLET_META, payload: { meta } });
 
 export const setAccounts = ({ accounts }: { accounts: Account[] }): Action => ({ type: SET_ACCOUNTS, payload: { accounts } });
@@ -40,23 +31,15 @@ export const setTransactions = ({ transactions }: { transactions: AccountTxs }):
 
 export const setContacts = ({ contacts }: { contacts: Contact[] }): Action => ({ type: SET_CONTACTS, payload: { contacts } });
 
-export const createNewWallet = ({ mnemonic, password }: { mnemonic?: string, password: string }): Action => async (dispatch: Dispatch): Dispatch => {
-  const timestamp = new Date().toISOString().replace(/:/g, '-');
-  const resolvedMnemonic = mnemonic || cryptoService.generateMnemonic();
-  const { publicKey, secretKey } = cryptoService.generateKeyPair({ mnemonic: resolvedMnemonic });
-  const dataToEncrypt = {
-    mnemonic: resolvedMnemonic,
-    accounts: [getNewAccountFromTemplate({ accountNumber: 0, timestamp, publicKey, secretKey })]
-  };
-  const { error, meta } = await eventsService.createWallet({ timestamp, dataToEncrypt, password });
+export const createNewWallet = ({ existingMnemonic, password }: { existingMnemonic?: string, password: string }): Action => async (dispatch: Dispatch): Dispatch => {
+  const { error, accounts, mnemonic, meta } = await eventsService.createWallet({ password, existingMnemonic });
   if (error) {
     console.log(error); // eslint-disable-line no-console
-    throw createError('Error creating new wallet!', () => dispatch(createNewWallet({ mnemonic, password })));
+    throw createError('Error creating new wallet!', () => dispatch(createNewWallet({ existingMnemonic, password })));
   } else {
     dispatch(setWalletMeta({ meta }));
-    dispatch(setAccounts({ accounts: dataToEncrypt.accounts }));
-    dispatch(setMnemonic({ mnemonic: resolvedMnemonic }));
-    localStorage.setItem('accountNumber', '1');
+    dispatch(setAccounts({ accounts }));
+    dispatch(setMnemonic({ mnemonic }));
     dispatch(readWalletFiles());
   }
 };
@@ -95,15 +78,14 @@ export const updateWalletName = ({ displayName }: { displayName: string }): Acti
 };
 
 export const createNewAccount = ({ password }: { password: string }): Action => async (dispatch: Dispatch, getState: GetState): Dispatch => {
-  const { walletFiles, mnemonic, accounts } = getState().wallet;
-  const { publicKey, secretKey } = cryptoService.deriveNewKeyPair({ mnemonic, index: accounts.length });
-  const timestamp = new Date().toISOString().replace(/:/, '-');
-  const accountNumber = JSON.parse(localStorage.getItem('accountNumber') || '1');
-  const newAccount = getNewAccountFromTemplate({ accountNumber, timestamp, publicKey, secretKey });
-  const updatedAccounts = [...accounts, newAccount];
-  await eventsService.updateWalletFile({ fileName: walletFiles[0], password, data: { mnemonic, accounts: updatedAccounts } });
-  dispatch(setAccounts({ accounts: updatedAccounts }));
-  localStorage.setItem('accountNumber', `${accountNumber + 1}`);
+  const { walletFiles, accounts } = getState().wallet;
+  const { error, newAccount } = await eventsService.createNewAccount({ fileName: walletFiles[0], password });
+  if (error) {
+    console.log(error); // eslint-disable-line no-console
+    throw createError('Failed to create new account', () => dispatch(createNewAccount({ password })));
+  } else {
+    dispatch(setAccounts({ accounts: [...accounts, newAccount] }));
+  }
 };
 
 export const updateAccountName = ({ accountIndex, name, password }: { accountIndex: number, name: string, password: string }): Action => async (
@@ -157,32 +139,26 @@ export const getBalance = (): Action => async (dispatch: Dispatch, getState: Get
   }
 };
 
-export const sendTransaction = ({ recipient, amount, fee, note }: { recipient: string, amount: number, fee: number, note: string }): Action => async (
+export const sendTransaction = ({ receiver, amount, fee, note }: { receiver: string, amount: number, fee: number, note: string }): Action => async (
   dispatch: Dispatch,
   getState: GetState
 ): Dispatch => {
   const { accounts, currentAccountIndex } = getState().wallet;
-  const { nonce } = await eventsService.getNonce({ address: accounts[currentAccountIndex].publicKey });
-  const { tx } = await cryptoService.signTransaction({
-    accountNonce: nonce,
-    recipient,
-    price: fee,
-    amount,
-    secretKey: accounts[currentAccountIndex].secretKey
-  });
-  const txToAdd = {
+  const fullTx = {
     sender: getAddress(accounts[currentAccountIndex].publicKey),
-    receiver: recipient,
+    receiver,
     amount,
     fee,
     status: TX_STATUSES.PENDING,
     timestamp: new Date().getTime(),
     note
   };
-  const { error, transactions, id } = await eventsService.sendTx({ tx, accountIndex: currentAccountIndex, txToAdd });
+  const { error, transactions, id } = await eventsService.sendTx({ fullTx, accountIndex: currentAccountIndex });
   if (error) {
     console.log(error); // eslint-disable-line no-console
-    throw createError('Error sending transaction!', () => dispatch(sendTransaction({ recipient, amount, fee, note })));
+    throw createError('Error sending transaction!', () => {
+      dispatch(sendTransaction({ receiver, amount, fee, note }));
+    });
   } else {
     dispatch(setTransactions({ transactions }));
     return id;
diff --git a/app/screens/auth/CreateWallet.js b/app/screens/auth/CreateWallet.js
index b9686374d..87304382c 100644
--- a/app/screens/auth/CreateWallet.js
+++ b/app/screens/auth/CreateWallet.js
@@ -206,7 +206,7 @@ class CreateWallet extends Component<Props, State> {
       this.setState({ isLoaderVisible: true });
       try {
         await setTimeout(async () => {
-          createNewWallet({ mnemonic: location?.state?.mnemonic, password });
+          createNewWallet({ existingMnemonic: location?.state?.mnemonic, password });
           this.setState({ isLoaderVisible: false, subMode: 2 });
         }, 500);
       } catch (err) {
diff --git a/app/screens/auth/WordsRestore.js b/app/screens/auth/WordsRestore.js
index 13a43fa7c..bc9694cf3 100644
--- a/app/screens/auth/WordsRestore.js
+++ b/app/screens/auth/WordsRestore.js
@@ -1,10 +1,10 @@
 // @flow
+import * as bip39 from 'bip39';
 import { shell } from 'electron';
 import React, { Component } from 'react';
 import styled from 'styled-components';
 import { BackButton } from '/components/common';
 import { WrapperWith2SideBars, Input, Button, Link, ErrorPopup, SmallHorizontalPanel } from '/basicComponents';
-import { cryptoService } from '/infra/cryptoService';
 import { smColors } from '/vars';
 import type { RouterHistory } from 'react-router-dom';
 
@@ -120,11 +120,18 @@ class WordsRestore extends Component<Props, State> {
     return words.every((word) => !!word && word.trim().length > 0) || hasError;
   };
 
+  validateMnemonic = ({ mnemonic }: { mnemonic: string }) => {
+    if (!mnemonic || !mnemonic.length) {
+      return false;
+    }
+    return bip39.validateMnemonic(mnemonic);
+  };
+
   restoreWith12Words = () => {
     const { history } = this.props;
     const { words } = this.state;
     const mnemonic = Object.values(words).join(' ');
-    if (cryptoService.validateMnemonic({ mnemonic })) {
+    if (this.validateMnemonic({ mnemonic })) {
       history.push('/auth/create', { mnemonic });
     } else {
       this.setState({ hasError: true });
diff --git a/app/screens/wallet/SendCoins.js b/app/screens/wallet/SendCoins.js
index fe6188556..959d57201 100644
--- a/app/screens/wallet/SendCoins.js
+++ b/app/screens/wallet/SendCoins.js
@@ -178,7 +178,7 @@ class SendCoins extends Component<Props, State> {
     const { sendTransaction } = this.props;
     const { address, amount, fee, note } = this.state;
     try {
-      const txId = await sendTransaction({ recipient: address, amount, fee, note });
+      const txId = await sendTransaction({ receiver: address, amount, fee, note });
       this.setState({ mode: 3, txId });
     } catch (error) {
       this.setState(() => {
diff --git a/app/vars/ipcConsts.js b/app/vars/ipcConsts.js
index 78d9c03e2..69d801685 100644
--- a/app/vars/ipcConsts.js
+++ b/app/vars/ipcConsts.js
@@ -3,6 +3,7 @@ const ipcConsts = {
   UNLOCK_WALLET_FILE: 'UNLOCK_WALLET_FILE',
   COPY_FILE: 'COPY_FILE',
   UPDATE_WALLET_FILE: 'UPDATE_WALLET_FILE',
+  CREATE_NEW_ACCOUNT: 'CREATE_NEW_ACCOUNT',
   READ_WALLET_FILES: 'READ_WALLET_FILES',
   SELECT_POST_FOLDER: 'SELECT_POST_FOLDER',
   PRINT: 'PRINT',
@@ -39,7 +40,6 @@ const ipcConsts = {
   QUIT_AND_UPDATE: 'QUIT_AND_UPDATE',
   IS_APP_MINIMIZED: 'IS_APP_MINIMIZED',
   GET_BALANCE: 'GET_BALANCE',
-  GET_NONCE: 'GET_NONCE',
   SEND_TX: 'SEND_TX',
   UPDATE_TX: 'UPDATE_TX',
   GET_ACCOUNT_TXS: 'GET_ACCOUNT_TXS'
diff --git a/configs/webpack.config.base.js b/configs/webpack.config.base.js
index 6329fb90f..a1a755649 100644
--- a/configs/webpack.config.base.js
+++ b/configs/webpack.config.base.js
@@ -42,6 +42,8 @@ export default {
       NODE_ENV: 'production'
     }),
 
-    new webpack.NamedModulesPlugin()
+    new webpack.NamedModulesPlugin(),
+
+    new webpack.IgnorePlugin(/^\.\/wordlists\/(?!english)/, /bip39\/src$/)
   ]
 };
diff --git a/desktop/app.html b/desktop/app.html
index b00e9a59b..abcc3eaea 100644
--- a/desktop/app.html
+++ b/desktop/app.html
@@ -6,16 +6,6 @@
   </head>
   <body>
     <div id="root" style="height: 100%; width: 100%;"></div>
-    <script src="wasm_exec.js"></script>
-    <script>
-      (async function() {
-        const response = await fetch('./ed25519.wasm');
-        const bytes = await response.arrayBuffer();
-        const go = new Go(); // eslint-disable-line no-undef
-        const { instance } = await WebAssembly.instantiate(bytes, go.importObject);
-        await go.run(instance);
-      })();
-    </script>
     <script>
       {
         const scripts = [];
diff --git a/app/infra/cryptoService/cryptoService.js b/desktop/cryptoService.js
similarity index 76%
rename from app/infra/cryptoService/cryptoService.js
rename to desktop/cryptoService.js
index a490a7f87..655813383 100644
--- a/app/infra/cryptoService/cryptoService.js
+++ b/desktop/cryptoService.js
@@ -1,26 +1,27 @@
 import * as bip39 from 'bip39';
 import * as xdr from 'js-xdr';
-import { fromHexString, toHexString } from '/infra/utils';
 
-const DEFAULT_SALT = 'Spacemesh blockmesh';
+const fromHexString = (hexString) => {
+  const bytes = [];
+  for (let i = 0; i < hexString.length; i += 2) {
+    bytes.push(parseInt(hexString.slice(i, i + 2), 16));
+  }
+  return Uint8Array.from(bytes);
+};
 
-const sleep = () => new Promise((resolve) => setTimeout(resolve, 1000));
+const toHexString = (bytes) => bytes.reduce((str, byte) => str + byte.toString(16).padStart(2, '0'), '');
 
-class CryptoService {
-  stopAndCleanUp = () => __stopAndCleanUp(); // eslint-disable-line no-undef
+const DEFAULT_SALT = 'Spacemesh blockmesh';
 
-  generateMnemonic = () => bip39.generateMnemonic();
+class CryptoService {
+  static generateMnemonic = () => bip39.generateMnemonic();
 
   /**
    * Generates new master key pair using as seed 12 words mnemonic (128 bits of entropy) as per BIP39.
    * Inside call to function "generateKeyPair" is made - it's exposed from compiled WASM and generates keys following ed25519 protocol
    * @return {{secretKey: Uint8Array[64], publicKey: Uint8Array[32]}}
    */
-  generateKeyPair = ({ mnemonic }: { mnemonic: string }) => {
-    // eslint-disable-next-line no-undef
-    if (!__generateKeyPair) {
-      sleep();
-    }
+  static generateKeyPair = ({ mnemonic }) => {
     // Generate 64 seed bytes (512 bits) from phrase - this is a wallet's master seed
     const seed = bip39.mnemonicToSeedSync(mnemonic);
     let publicKey = new Uint8Array(32);
@@ -33,7 +34,7 @@ class CryptoService {
       publicKey = pk;
       secretKey = sk;
     };
-    __generateKeyPair(seed, saveKeys); // eslint-disable-line no-undef
+    global.__generateKeyPair(seed, saveKeys); // eslint-disable-line no-undef
     return { publicKey: toHexString(publicKey), secretKey: toHexString(secretKey) };
   };
 
@@ -43,7 +44,7 @@ class CryptoService {
    * @param index {int}
    * @return {{secretKey: Uint8Array[64], publicKey: Uint8Array[32]}}
    */
-  deriveNewKeyPair = ({ mnemonic, index }: { mnemonic: string }) => {
+  static deriveNewKeyPair = ({ mnemonic, index }) => {
     const seed = bip39.mnemonicToSeedSync(mnemonic);
     let publicKey = new Uint8Array(32);
     let secretKey = new Uint8Array(64);
@@ -57,7 +58,7 @@ class CryptoService {
       publicKey = pk;
       secretKey = sk;
     };
-    __deriveNewKeyPair(seed.slice(32), index, saltAsUint8Array, saveKeys); // eslint-disable-line no-undef
+    global.__deriveNewKeyPair(seed.slice(32), index, saltAsUint8Array, saveKeys); // eslint-disable-line no-undef
     return { publicKey: toHexString(publicKey), secretKey: toHexString(secretKey) };
   };
 
@@ -65,12 +66,12 @@ class CryptoService {
    * Signs message to be sent to node.
    * @param secretKey - string
    * @param accountNonce - account's next nonce value
-   * @param recipient - recipient's address
+   * @param receiver - receiver's address
    * @param price - fee in SMC cents
    * @param amount - amount to transfer in SMC cents
    * @return {Promise} when resolved returns signature as Uint8Array(64)
    */
-  signTransaction = ({ accountNonce, recipient, price, amount, secretKey }: { accountNonce: number, recipient: string, price: number, amount: number, secretKey: string }) => {
+  static signTransaction = ({ accountNonce, receiver, price, amount, secretKey }) => {
     const sk = fromHexString(secretKey);
     const types = xdr.config((xdr1) => {
       xdr1.struct('InnerSerializableSignedTransaction', [
@@ -87,7 +88,7 @@ class CryptoService {
     });
     const message = new types.InnerSerializableSignedTransaction({
       AccountNonce: xdr.UnsignedHyper.fromString(accountNonce),
-      Recipient: fromHexString(recipient),
+      Recipient: fromHexString(receiver),
       GasLimit: xdr.UnsignedHyper.fromString('5'), // TODO: change to real number passed from user selection
       Price: xdr.UnsignedHyper.fromString(`${price}`),
       Amount: xdr.UnsignedHyper.fromString(`${amount}`)
@@ -96,7 +97,7 @@ class CryptoService {
     return new Promise((resolve) => {
       const bufMessageAsUint8Array = new Uint8Array(bufMessage);
       // eslint-disable-next-line no-undef
-      __signTransaction(sk, bufMessageAsUint8Array, (sig) => {
+      global.__signTransaction(sk, bufMessageAsUint8Array, (sig) => {
         const tx = new types.SerializableSignedTransaction({
           InnerSerializableSignedTransaction: message,
           Signature: sig
@@ -110,7 +111,7 @@ class CryptoService {
    * @param mnemonic - string to be validated as mnemonic per BIP39 standard.
    * @return {*|boolean} true if string is a valid mnemonic, false else.
    */
-  validateMnemonic = ({ mnemonic }: { mnemonic: string }) => {
+  validateMnemonic = ({ mnemonic }) => {
     if (!mnemonic || !mnemonic.length) {
       return false;
     }
@@ -118,4 +119,4 @@ class CryptoService {
   };
 }
 
-export default new CryptoService();
+export default CryptoService;
diff --git a/desktop/main.dev.js b/desktop/main.dev.js
index 3089909c6..b1faaccc7 100644
--- a/desktop/main.dev.js
+++ b/desktop/main.dev.js
@@ -9,6 +9,7 @@
  * `./desktop/main.prod.js` using webpack. This gives us some performance wins.
  */
 import path from 'path';
+import fs from 'fs';
 import { app, BrowserWindow, ipcMain, Tray, Menu, dialog } from 'electron';
 import installExtension, { REACT_DEVELOPER_TOOLS, REDUX_DEVTOOLS } from 'electron-devtools-installer';
 
@@ -19,8 +20,17 @@ import AutoStartManager from './autoStartManager';
 import StoreService from './storeService';
 import NodeManager from './nodeManager';
 import WalletManager from './walletManager';
+import './wasm_exec';
+
+(async function() {
+  const filePath = path.resolve(app.getAppPath(), process.env.NODE_ENV === 'development' ? './' : 'desktop/', 'ed25519.wasm');
+  const bytes = fs.readFileSync(filePath);
+  // const bytes = await response.arrayBuffer();
+  const go = new Go(); // eslint-disable-line no-undef
+  const { instance } = await WebAssembly.instantiate(bytes, go.importObject);
+  await go.run(instance);
+})();
 
-const debug = require('electron-debug');
 const unhandled = require('electron-unhandled');
 
 unhandled();
@@ -107,7 +117,6 @@ const createWindow = () => {
 
 app.on('ready', async () => {
   if (process.env.NODE_ENV === 'development' || process.env.DEBUG_PROD === 'true') {
-    debug();
     installExtension(REACT_DEVELOPER_TOOLS).catch((err) => console.log('An error occurred: ', err)); // eslint-disable-line no-console
     installExtension(REDUX_DEVTOOLS).catch((err) => console.log('An error occurred: ', err)); // eslint-disable-line no-console
   }
diff --git a/desktop/transactionManager.js b/desktop/transactionManager.js
index ffc3c4ff2..58552d76d 100644
--- a/desktop/transactionManager.js
+++ b/desktop/transactionManager.js
@@ -1,6 +1,7 @@
 import TX_STATUSES from '../app/vars/enums';
 import StoreService from './storeService';
 import netService from './netService';
+import cryptoService from './cryptoService';
 
 const asyncForEach = async (array, callback) => {
   for (let index = 0; index < array.length; index += 1) {
@@ -26,23 +27,41 @@ class TransactionManager {
 
   setAccounts = ({ accounts }) => {
     this.accounts = accounts;
+    if (accounts.length < this.transactions.length) {
+      const diff = accounts.length - this.transactions.length;
+      for (let i = 0; i < diff; i += 1) {
+        this.transactions.push({ layerId: 0, data: [] });
+      }
+    }
   };
 
   addAccount = ({ account }) => {
     this.accounts.push(account);
+    this.transactions.push({ layerId: 0, data: [] });
   };
 
   clearData = () => {
     StoreService.remove({ key: `${this.networkId}-transactions` });
   };
 
-  sendTx = async ({ tx, accountIndex, txToAdd }) => {
+  sendTx = async ({ fullTx, accountIndex }) => {
     try {
-      const { id } = await netService.submitTransaction({ tx });
-      const fullTxToAdd = { ...txToAdd, txId: id };
-      this.transactions[accountIndex].data.push(fullTxToAdd);
-      StoreService.set({ key: `${this.networkId}-transactions`, value: this.transactions });
-      return { error: null, transactions: this.transactions, id };
+      const { error, value } = await netService.getNonce({ address: this.accounts[accountIndex].publicKey });
+      if (!error) {
+        const { receiver, amount, fee } = fullTx;
+        const res = await cryptoService.signTransaction({
+          accountNonce: value,
+          receiver,
+          price: fee,
+          amount,
+          secretKey: this.accounts[accountIndex].secretKey
+        });
+        const { id } = await netService.submitTransaction({ tx: res });
+        this.transactions[accountIndex].data.unshift({ txId: id, ...fullTx });
+        StoreService.set({ key: `${this.networkId}-transactions`, value: this.transactions });
+        return { error: null, transactions: this.transactions, id };
+      }
+      return { error, transactions: [], id: '' };
     } catch (error) {
       return { error, transactions: [], id: '' };
     }
diff --git a/desktop/walletManager.js b/desktop/walletManager.js
index 7618b2d72..2670be5f7 100644
--- a/desktop/walletManager.js
+++ b/desktop/walletManager.js
@@ -7,7 +7,8 @@ import { ipcConsts } from '../app/vars';
 import TransactionManager from './transactionManager';
 import StoreService from './storeService';
 import netService from './netService';
-import FileEncryptionService from './fileEncryptionService';
+import fileEncryptionService from './fileEncryptionService';
+import cryptoService from './cryptoService';
 import encryptionConst from './encryptionConst';
 
 const readFileAsync = util.promisify(fs.readFile);
@@ -30,6 +31,14 @@ class WalletManager {
     this.txManager = new TransactionManager();
   }
 
+  __getNewAccountFromTemplate = ({ accountNumber, timestamp, publicKey, secretKey }) => ({
+    displayName: accountNumber > 0 ? `Account ${accountNumber}` : 'Main Account',
+    created: timestamp,
+    path: `0/0/${accountNumber}`,
+    publicKey,
+    secretKey
+  });
+
   subscribeToEvents = (mainWindow) => {
     ipcMain.handle(ipcConsts.CREATE_WALLET_FILE, async (event, request) => {
       const res = await this.createWalletFile({ ...request });
@@ -46,6 +55,10 @@ class WalletManager {
     ipcMain.on(ipcConsts.UPDATE_WALLET_FILE, async (event, request) => {
       await this.updateWalletFile({ ...request });
     });
+    ipcMain.handle(ipcConsts.CREATE_NEW_ACCOUNT, async (event, request) => {
+      const res = await this.createNewAccount({ ...request });
+      return res;
+    });
     ipcMain.handle(ipcConsts.COPY_FILE, async (event, request) => {
       const res = await this.copyFile({ ...request });
       return res;
@@ -64,10 +77,6 @@ class WalletManager {
       const res = await this.getBalance({ ...request });
       return res;
     });
-    ipcMain.handle(ipcConsts.GET_NONCE, async (event, request) => {
-      const res = await this.getNonce({ ...request });
-      return res;
-    });
     ipcMain.handle(ipcConsts.SEND_TX, async (event, request) => {
       const res = await this.txManager.sendTx({ ...request });
       return res;
@@ -86,8 +95,15 @@ class WalletManager {
     });
   };
 
-  createWalletFile = async ({ timestamp, dataToEncrypt, password }) => {
+  createWalletFile = async ({ password, existingMnemonic }) => {
     try {
+      const timestamp = new Date().toISOString().replace(/:/g, '-');
+      this.mnemonic = existingMnemonic || cryptoService.generateMnemonic();
+      const { publicKey, secretKey } = cryptoService.generateKeyPair({ mnemonic: this.mnemonic });
+      const dataToEncrypt = {
+        mnemonic: this.mnemonic,
+        accounts: [this.__getNewAccountFromTemplate({ accountNumber: 0, timestamp, publicKey, secretKey })]
+      };
       const walletNumber = StoreService.get({ key: 'walletNumber' }) || 0;
       const meta = {
         displayName: walletNumber > 0 ? `Wallet ${walletNumber}` : 'Main Wallet',
@@ -96,8 +112,8 @@ class WalletManager {
         meta: { salt: encryptionConst.DEFAULT_SALT }
       };
       this.txManager.setAccounts({ accounts: dataToEncrypt.accounts });
-      const key = FileEncryptionService.createEncryptionKey({ password });
-      const encryptedAccountsData = FileEncryptionService.encryptData({ data: JSON.stringify(dataToEncrypt), key });
+      const key = fileEncryptionService.createEncryptionKey({ password });
+      const encryptedAccountsData = fileEncryptionService.encryptData({ data: JSON.stringify(dataToEncrypt), key });
       const fileContent = {
         meta,
         crypto: { cipher: 'AES-128-CTR', cipherText: encryptedAccountsData },
@@ -107,7 +123,8 @@ class WalletManager {
       const fileNameWithPath = path.resolve(appFilesDirPath, fileName);
       await writeFileAsync(fileNameWithPath, JSON.stringify(fileContent));
       StoreService.set({ key: 'walletNumber', value: walletNumber + 1 });
-      return { error: null, meta };
+      StoreService.set({ key: 'accountNumber', value: 1 });
+      return { error: null, meta, accounts: dataToEncrypt.accounts, mnemonic: this.mnemonic };
     } catch (error) {
       return { error, meta: null };
     }
@@ -129,8 +146,8 @@ class WalletManager {
     try {
       const fileContent = await readFileAsync(path);
       const { crypto, meta, contacts } = JSON.parse(fileContent);
-      const key = FileEncryptionService.createEncryptionKey({ password });
-      const decryptedDataJSON = FileEncryptionService.decryptData({ data: crypto.cipherText, key });
+      const key = fileEncryptionService.createEncryptionKey({ password });
+      const decryptedDataJSON = fileEncryptionService.decryptData({ data: crypto.cipherText, key });
       const { accounts, mnemonic } = JSON.parse(decryptedDataJSON);
       this.txManager.setAccounts({ accounts });
       return { error: null, accounts, mnemonic, meta, contacts };
@@ -152,15 +169,6 @@ class WalletManager {
     }
   };
 
-  getNonce = async ({ address }) => {
-    try {
-      const { value } = await netService.getNonce({ address });
-      return { error: null, nonce: value };
-    } catch (error) {
-      return { error, nonce: null };
-    }
-  };
-
   updateWalletFile = async ({ fileName, password, data }) => {
     try {
       const rawFileContent = await readFileAsync(fileName);
@@ -169,17 +177,43 @@ class WalletManager {
       let dataToUpdate = data;
       if (password) {
         field = 'crypto';
-        const key = FileEncryptionService.createEncryptionKey({ password });
-        const encryptedAccountsData = FileEncryptionService.encryptData({ data: JSON.stringify(data), key });
+        const key = fileEncryptionService.createEncryptionKey({ password });
+        const encryptedAccountsData = fileEncryptionService.encryptData({ data: JSON.stringify(data), key });
         dataToUpdate = { cipher: 'AES-128-CTR', cipherText: encryptedAccountsData };
         this.txManager.addAccount({ account: data.accounts });
       }
-      await writeFileAsync({ filePath: fileName, fileContent: JSON.stringify({ ...fileContent, [field]: dataToUpdate }) });
+      await writeFileAsync(fileName, JSON.stringify({ ...fileContent, [field]: dataToUpdate }));
     } catch (error) {
       console.log(error); // eslint-disable-line no-console
     }
   };
 
+  createNewAccount = async ({ fileName, password }) => {
+    try {
+      const { publicKey, secretKey } = cryptoService.deriveNewKeyPair({ mnemonic: this.mnemonic, index: this.txManager.accounts.length });
+      const timestamp = new Date().toISOString().replace(/:/, '-');
+      const accountNumber = StoreService.get({ key: 'accountNumber' });
+      const newAccount = this.__getNewAccountFromTemplate({ accountNumber, timestamp, publicKey, secretKey });
+      const dataToEncrypt = {
+        mnemonic: this.mnemonic,
+        accounts: [...this.txManager.accounts, newAccount]
+      };
+      const key = fileEncryptionService.createEncryptionKey({ password });
+      const encryptedAccountsData = fileEncryptionService.encryptData({ data: JSON.stringify(dataToEncrypt), key });
+
+      const rawFileContent = await readFileAsync(fileName);
+      const fileContent = JSON.parse(rawFileContent);
+      await writeFileAsync(fileName, JSON.stringify({ ...fileContent, crypto: { cipher: 'AES-128-CTR', cipherText: encryptedAccountsData } }));
+
+      this.txManager.addAccount({ account: newAccount });
+      StoreService.set({ key: 'accountNumber', value: accountNumber + 1 });
+      return { error: null, newAccount };
+    } catch (error) {
+      console.log(error); // eslint-disable-line no-console
+      return { error };
+    }
+  };
+
   copyFile = async ({ filePath, copyToDocuments }) => {
     const timestamp = new Date().toISOString().replace(/:/g, '-');
     const walletNumber = StoreService.get({ key: 'walletNumber' });
diff --git a/package-lock.json b/package-lock.json
index bde023cb8..df1cdfb51 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1544,9 +1544,9 @@
       "dev": true
     },
     "@types/fs-extra": {
-      "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-8.1.0.tgz",
-      "integrity": "sha512-UoOfVEzAUpeSPmjm7h1uk5MH6KZma2z2O7a75onTGjnNvAvMVrPzPL/vBbT65iIGHWj6rokwfmYcmxmlSf2uwg==",
+      "version": "8.1.1",
+      "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-8.1.1.tgz",
+      "integrity": "sha512-TcUlBem321DFQzBNuz8p0CLLKp0VvF/XH9E4KHNmgwyp4E3AfgI5cjiIVZWlbfThBop2qxFIh4+LeY6hVWWZ2w==",
       "dev": true,
       "requires": {
         "@types/node": "*"
@@ -1589,9 +1589,9 @@
       }
     },
     "@types/yargs": {
-      "version": "15.0.4",
-      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.4.tgz",
-      "integrity": "sha512-9T1auFmbPZoxHz0enUFlUuKRy3it01R+hlggyVUMtnCTQRunsQYifnSGb8hET4Xo8yiC0o0r1paW3ud5+rbURg==",
+      "version": "15.0.5",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.5.tgz",
+      "integrity": "sha512-Dk/IDOPtOgubt/IaevIUbTgV7doaKkoorvOyYM2CMwuDyP89bekI7H4xLIwunNYiK9jhCkmc6pUrJk3cj2AB9w==",
       "dev": true,
       "requires": {
         "@types/yargs-parser": "*"
@@ -1604,178 +1604,177 @@
       "dev": true
     },
     "@webassemblyjs/ast": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.8.5.tgz",
-      "integrity": "sha512-aJMfngIZ65+t71C3y2nBBg5FFG0Okt9m0XEgWZ7Ywgn1oMAT8cNwx00Uv1cQyHtidq0Xn94R4TAywO+LCQ+ZAQ==",
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.9.0.tgz",
+      "integrity": "sha512-C6wW5L+b7ogSDVqymbkkvuW9kruN//YisMED04xzeBBqjHa2FYnmvOlS6Xj68xWQRgWvI9cIglsjFowH/RJyEA==",
       "dev": true,
       "requires": {
-        "@webassemblyjs/helper-module-context": "1.8.5",
-        "@webassemblyjs/helper-wasm-bytecode": "1.8.5",
-        "@webassemblyjs/wast-parser": "1.8.5"
+        "@webassemblyjs/helper-module-context": "1.9.0",
+        "@webassemblyjs/helper-wasm-bytecode": "1.9.0",
+        "@webassemblyjs/wast-parser": "1.9.0"
       }
     },
     "@webassemblyjs/floating-point-hex-parser": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.8.5.tgz",
-      "integrity": "sha512-9p+79WHru1oqBh9ewP9zW95E3XAo+90oth7S5Re3eQnECGq59ly1Ri5tsIipKGpiStHsUYmY3zMLqtk3gTcOtQ==",
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.9.0.tgz",
+      "integrity": "sha512-TG5qcFsS8QB4g4MhrxK5TqfdNe7Ey/7YL/xN+36rRjl/BlGE/NcBvJcqsRgCP6Z92mRE+7N50pRIi8SmKUbcQA==",
       "dev": true
     },
     "@webassemblyjs/helper-api-error": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.8.5.tgz",
-      "integrity": "sha512-Za/tnzsvnqdaSPOUXHyKJ2XI7PDX64kWtURyGiJJZKVEdFOsdKUCPTNEVFZq3zJ2R0G5wc2PZ5gvdTRFgm81zA==",
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.9.0.tgz",
+      "integrity": "sha512-NcMLjoFMXpsASZFxJ5h2HZRcEhDkvnNFOAKneP5RbKRzaWJN36NC4jqQHKwStIhGXu5mUWlUUk7ygdtrO8lbmw==",
       "dev": true
     },
     "@webassemblyjs/helper-buffer": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.8.5.tgz",
-      "integrity": "sha512-Ri2R8nOS0U6G49Q86goFIPNgjyl6+oE1abW1pS84BuhP1Qcr5JqMwRFT3Ah3ADDDYGEgGs1iyb1DGX+kAi/c/Q==",
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.9.0.tgz",
+      "integrity": "sha512-qZol43oqhq6yBPx7YM3m9Bv7WMV9Eevj6kMi6InKOuZxhw+q9hOkvq5e/PpKSiLfyetpaBnogSbNCfBwyB00CA==",
       "dev": true
     },
     "@webassemblyjs/helper-code-frame": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.8.5.tgz",
-      "integrity": "sha512-VQAadSubZIhNpH46IR3yWO4kZZjMxN1opDrzePLdVKAZ+DFjkGD/rf4v1jap744uPVU6yjL/smZbRIIJTOUnKQ==",
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.9.0.tgz",
+      "integrity": "sha512-ERCYdJBkD9Vu4vtjUYe8LZruWuNIToYq/ME22igL+2vj2dQ2OOujIZr3MEFvfEaqKoVqpsFKAGsRdBSBjrIvZA==",
       "dev": true,
       "requires": {
-        "@webassemblyjs/wast-printer": "1.8.5"
+        "@webassemblyjs/wast-printer": "1.9.0"
       }
     },
     "@webassemblyjs/helper-fsm": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-fsm/-/helper-fsm-1.8.5.tgz",
-      "integrity": "sha512-kRuX/saORcg8se/ft6Q2UbRpZwP4y7YrWsLXPbbmtepKr22i8Z4O3V5QE9DbZK908dh5Xya4Un57SDIKwB9eow==",
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-fsm/-/helper-fsm-1.9.0.tgz",
+      "integrity": "sha512-OPRowhGbshCb5PxJ8LocpdX9Kl0uB4XsAjl6jH/dWKlk/mzsANvhwbiULsaiqT5GZGT9qinTICdj6PLuM5gslw==",
       "dev": true
     },
     "@webassemblyjs/helper-module-context": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-module-context/-/helper-module-context-1.8.5.tgz",
-      "integrity": "sha512-/O1B236mN7UNEU4t9X7Pj38i4VoU8CcMHyy3l2cV/kIF4U5KoHXDVqcDuOs1ltkac90IM4vZdHc52t1x8Yfs3g==",
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-module-context/-/helper-module-context-1.9.0.tgz",
+      "integrity": "sha512-MJCW8iGC08tMk2enck1aPW+BE5Cw8/7ph/VGZxwyvGbJwjktKkDK7vy7gAmMDx88D7mhDTCNKAW5tED+gZ0W8g==",
       "dev": true,
       "requires": {
-        "@webassemblyjs/ast": "1.8.5",
-        "mamacro": "^0.0.3"
+        "@webassemblyjs/ast": "1.9.0"
       }
     },
     "@webassemblyjs/helper-wasm-bytecode": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.8.5.tgz",
-      "integrity": "sha512-Cu4YMYG3Ddl72CbmpjU/wbP6SACcOPVbHN1dI4VJNJVgFwaKf1ppeFJrwydOG3NDHxVGuCfPlLZNyEdIYlQ6QQ==",
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.9.0.tgz",
+      "integrity": "sha512-R7FStIzyNcd7xKxCZH5lE0Bqy+hGTwS3LJjuv1ZVxd9O7eHCedSdrId/hMOd20I+v8wDXEn+bjfKDLzTepoaUw==",
       "dev": true
     },
     "@webassemblyjs/helper-wasm-section": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.8.5.tgz",
-      "integrity": "sha512-VV083zwR+VTrIWWtgIUpqfvVdK4ff38loRmrdDBgBT8ADXYsEZ5mPQ4Nde90N3UYatHdYoDIFb7oHzMncI02tA==",
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.9.0.tgz",
+      "integrity": "sha512-XnMB8l3ek4tvrKUUku+IVaXNHz2YsJyOOmz+MMkZvh8h1uSJpSen6vYnw3IoQ7WwEuAhL8Efjms1ZWjqh2agvw==",
       "dev": true,
       "requires": {
-        "@webassemblyjs/ast": "1.8.5",
-        "@webassemblyjs/helper-buffer": "1.8.5",
-        "@webassemblyjs/helper-wasm-bytecode": "1.8.5",
-        "@webassemblyjs/wasm-gen": "1.8.5"
+        "@webassemblyjs/ast": "1.9.0",
+        "@webassemblyjs/helper-buffer": "1.9.0",
+        "@webassemblyjs/helper-wasm-bytecode": "1.9.0",
+        "@webassemblyjs/wasm-gen": "1.9.0"
       }
     },
     "@webassemblyjs/ieee754": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.8.5.tgz",
-      "integrity": "sha512-aaCvQYrvKbY/n6wKHb/ylAJr27GglahUO89CcGXMItrOBqRarUMxWLJgxm9PJNuKULwN5n1csT9bYoMeZOGF3g==",
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.9.0.tgz",
+      "integrity": "sha512-dcX8JuYU/gvymzIHc9DgxTzUUTLexWwt8uCTWP3otys596io0L5aW02Gb1RjYpx2+0Jus1h4ZFqjla7umFniTg==",
       "dev": true,
       "requires": {
         "@xtuc/ieee754": "^1.2.0"
       }
     },
     "@webassemblyjs/leb128": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.8.5.tgz",
-      "integrity": "sha512-plYUuUwleLIziknvlP8VpTgO4kqNaH57Y3JnNa6DLpu/sGcP6hbVdfdX5aHAV716pQBKrfuU26BJK29qY37J7A==",
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.9.0.tgz",
+      "integrity": "sha512-ENVzM5VwV1ojs9jam6vPys97B/S65YQtv/aanqnU7D8aSoHFX8GyhGg0CMfyKNIHBuAVjy3tlzd5QMMINa7wpw==",
       "dev": true,
       "requires": {
         "@xtuc/long": "4.2.2"
       }
     },
     "@webassemblyjs/utf8": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.8.5.tgz",
-      "integrity": "sha512-U7zgftmQriw37tfD934UNInokz6yTmn29inT2cAetAsaU9YeVCveWEwhKL1Mg4yS7q//NGdzy79nlXh3bT8Kjw==",
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.9.0.tgz",
+      "integrity": "sha512-GZbQlWtopBTP0u7cHrEx+73yZKrQoBMpwkGEIqlacljhXCkVM1kMQge/Mf+csMJAjEdSwhOyLAS0AoR3AG5P8w==",
       "dev": true
     },
     "@webassemblyjs/wasm-edit": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.8.5.tgz",
-      "integrity": "sha512-A41EMy8MWw5yvqj7MQzkDjU29K7UJq1VrX2vWLzfpRHt3ISftOXqrtojn7nlPsZ9Ijhp5NwuODuycSvfAO/26Q==",
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.9.0.tgz",
+      "integrity": "sha512-FgHzBm80uwz5M8WKnMTn6j/sVbqilPdQXTWraSjBwFXSYGirpkSWE2R9Qvz9tNiTKQvoKILpCuTjBKzOIm0nxw==",
       "dev": true,
       "requires": {
-        "@webassemblyjs/ast": "1.8.5",
-        "@webassemblyjs/helper-buffer": "1.8.5",
-        "@webassemblyjs/helper-wasm-bytecode": "1.8.5",
-        "@webassemblyjs/helper-wasm-section": "1.8.5",
-        "@webassemblyjs/wasm-gen": "1.8.5",
-        "@webassemblyjs/wasm-opt": "1.8.5",
-        "@webassemblyjs/wasm-parser": "1.8.5",
-        "@webassemblyjs/wast-printer": "1.8.5"
+        "@webassemblyjs/ast": "1.9.0",
+        "@webassemblyjs/helper-buffer": "1.9.0",
+        "@webassemblyjs/helper-wasm-bytecode": "1.9.0",
+        "@webassemblyjs/helper-wasm-section": "1.9.0",
+        "@webassemblyjs/wasm-gen": "1.9.0",
+        "@webassemblyjs/wasm-opt": "1.9.0",
+        "@webassemblyjs/wasm-parser": "1.9.0",
+        "@webassemblyjs/wast-printer": "1.9.0"
       }
     },
     "@webassemblyjs/wasm-gen": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.8.5.tgz",
-      "integrity": "sha512-BCZBT0LURC0CXDzj5FXSc2FPTsxwp3nWcqXQdOZE4U7h7i8FqtFK5Egia6f9raQLpEKT1VL7zr4r3+QX6zArWg==",
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.9.0.tgz",
+      "integrity": "sha512-cPE3o44YzOOHvlsb4+E9qSqjc9Qf9Na1OO/BHFy4OI91XDE14MjFN4lTMezzaIWdPqHnsTodGGNP+iRSYfGkjA==",
       "dev": true,
       "requires": {
-        "@webassemblyjs/ast": "1.8.5",
-        "@webassemblyjs/helper-wasm-bytecode": "1.8.5",
-        "@webassemblyjs/ieee754": "1.8.5",
-        "@webassemblyjs/leb128": "1.8.5",
-        "@webassemblyjs/utf8": "1.8.5"
+        "@webassemblyjs/ast": "1.9.0",
+        "@webassemblyjs/helper-wasm-bytecode": "1.9.0",
+        "@webassemblyjs/ieee754": "1.9.0",
+        "@webassemblyjs/leb128": "1.9.0",
+        "@webassemblyjs/utf8": "1.9.0"
       }
     },
     "@webassemblyjs/wasm-opt": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.8.5.tgz",
-      "integrity": "sha512-HKo2mO/Uh9A6ojzu7cjslGaHaUU14LdLbGEKqTR7PBKwT6LdPtLLh9fPY33rmr5wcOMrsWDbbdCHq4hQUdd37Q==",
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.9.0.tgz",
+      "integrity": "sha512-Qkjgm6Anhm+OMbIL0iokO7meajkzQD71ioelnfPEj6r4eOFuqm4YC3VBPqXjFyyNwowzbMD+hizmprP/Fwkl2A==",
       "dev": true,
       "requires": {
-        "@webassemblyjs/ast": "1.8.5",
-        "@webassemblyjs/helper-buffer": "1.8.5",
-        "@webassemblyjs/wasm-gen": "1.8.5",
-        "@webassemblyjs/wasm-parser": "1.8.5"
+        "@webassemblyjs/ast": "1.9.0",
+        "@webassemblyjs/helper-buffer": "1.9.0",
+        "@webassemblyjs/wasm-gen": "1.9.0",
+        "@webassemblyjs/wasm-parser": "1.9.0"
       }
     },
     "@webassemblyjs/wasm-parser": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.8.5.tgz",
-      "integrity": "sha512-pi0SYE9T6tfcMkthwcgCpL0cM9nRYr6/6fjgDtL6q/ZqKHdMWvxitRi5JcZ7RI4SNJJYnYNaWy5UUrHQy998lw==",
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.9.0.tgz",
+      "integrity": "sha512-9+wkMowR2AmdSWQzsPEjFU7njh8HTO5MqO8vjwEHuM+AMHioNqSBONRdr0NQQ3dVQrzp0s8lTcYqzUdb7YgELA==",
       "dev": true,
       "requires": {
-        "@webassemblyjs/ast": "1.8.5",
-        "@webassemblyjs/helper-api-error": "1.8.5",
-        "@webassemblyjs/helper-wasm-bytecode": "1.8.5",
-        "@webassemblyjs/ieee754": "1.8.5",
-        "@webassemblyjs/leb128": "1.8.5",
-        "@webassemblyjs/utf8": "1.8.5"
+        "@webassemblyjs/ast": "1.9.0",
+        "@webassemblyjs/helper-api-error": "1.9.0",
+        "@webassemblyjs/helper-wasm-bytecode": "1.9.0",
+        "@webassemblyjs/ieee754": "1.9.0",
+        "@webassemblyjs/leb128": "1.9.0",
+        "@webassemblyjs/utf8": "1.9.0"
       }
     },
     "@webassemblyjs/wast-parser": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-parser/-/wast-parser-1.8.5.tgz",
-      "integrity": "sha512-daXC1FyKWHF1i11obK086QRlsMsY4+tIOKgBqI1lxAnkp9xe9YMcgOxm9kLe+ttjs5aWV2KKE1TWJCN57/Btsg==",
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-parser/-/wast-parser-1.9.0.tgz",
+      "integrity": "sha512-qsqSAP3QQ3LyZjNC/0jBJ/ToSxfYJ8kYyuiGvtn/8MK89VrNEfwj7BPQzJVHi0jGTRK2dGdJ5PRqhtjzoww+bw==",
       "dev": true,
       "requires": {
-        "@webassemblyjs/ast": "1.8.5",
-        "@webassemblyjs/floating-point-hex-parser": "1.8.5",
-        "@webassemblyjs/helper-api-error": "1.8.5",
-        "@webassemblyjs/helper-code-frame": "1.8.5",
-        "@webassemblyjs/helper-fsm": "1.8.5",
+        "@webassemblyjs/ast": "1.9.0",
+        "@webassemblyjs/floating-point-hex-parser": "1.9.0",
+        "@webassemblyjs/helper-api-error": "1.9.0",
+        "@webassemblyjs/helper-code-frame": "1.9.0",
+        "@webassemblyjs/helper-fsm": "1.9.0",
         "@xtuc/long": "4.2.2"
       }
     },
     "@webassemblyjs/wast-printer": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.8.5.tgz",
-      "integrity": "sha512-w0U0pD4EhlnvRyeJzBqaVSJAo9w/ce7/WPogeXLzGkO6hzhr4GnQIZ4W4uUt5b9ooAaXPtnXlj0gzsXEOUNYMg==",
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.9.0.tgz",
+      "integrity": "sha512-2J0nE95rHXHyQ24cWjMKJ1tqB/ds8z/cyeOZxJhcb+rW+SQASVjuznUSmdz5GpVJTzU8JkhYut0D3siFDD6wsA==",
       "dev": true,
       "requires": {
-        "@webassemblyjs/ast": "1.8.5",
-        "@webassemblyjs/wast-parser": "1.8.5",
+        "@webassemblyjs/ast": "1.9.0",
+        "@webassemblyjs/wast-parser": "1.9.0",
         "@xtuc/long": "4.2.2"
       }
     },
@@ -1971,27 +1970,27 @@
       }
     },
     "app-builder-bin": {
-      "version": "3.5.8",
-      "resolved": "https://registry.npmjs.org/app-builder-bin/-/app-builder-bin-3.5.8.tgz",
-      "integrity": "sha512-ni3q7QTfQNWHNWuyn5x3FZu6GnQZv+TFnfgk5++svqleKEhHGqS1mIaKsh7x5pBX6NFXU3/+ktk98wA/AW4EXw==",
+      "version": "3.5.9",
+      "resolved": "https://registry.npmjs.org/app-builder-bin/-/app-builder-bin-3.5.9.tgz",
+      "integrity": "sha512-NSjtqZ3x2kYiDp3Qezsgukx/AUzKPr3Xgf9by4cYt05ILWGAptepeeu0Uv+7MO+41o6ujhLixTou8979JGg2Kg==",
       "dev": true
     },
     "app-builder-lib": {
-      "version": "22.6.0",
-      "resolved": "https://registry.npmjs.org/app-builder-lib/-/app-builder-lib-22.6.0.tgz",
-      "integrity": "sha512-ky2aLYy92U+Gh6dKq/e8/bNmCotp6/GMhnX8tDZPv9detLg9WuBnWWi1ktBPlpbl1DREusy+TIh+9rgvfduQoA==",
+      "version": "22.6.1",
+      "resolved": "https://registry.npmjs.org/app-builder-lib/-/app-builder-lib-22.6.1.tgz",
+      "integrity": "sha512-ENL7r+H7IBfDb4faeLASgndsXrAT7AV7m7yJjcpbFDXYma6an7ZWGFIvR0HJrsfiC5TIB8kdLJ/aMSImrrSi/Q==",
       "dev": true,
       "requires": {
         "7zip-bin": "~5.0.3",
         "@develar/schema-utils": "~2.6.5",
         "async-exit-hook": "^2.0.1",
         "bluebird-lst": "^1.0.9",
-        "builder-util": "22.6.0",
+        "builder-util": "22.6.1",
         "builder-util-runtime": "8.7.0",
         "chromium-pickle-js": "^0.2.0",
         "debug": "^4.1.1",
         "ejs": "^3.1.2",
-        "electron-publish": "22.6.0",
+        "electron-publish": "22.6.1",
         "fs-extra": "^9.0.0",
         "hosted-git-info": "^3.0.4",
         "is-ci": "^2.0.0",
@@ -2959,15 +2958,15 @@
       "dev": true
     },
     "builder-util": {
-      "version": "22.6.0",
-      "resolved": "https://registry.npmjs.org/builder-util/-/builder-util-22.6.0.tgz",
-      "integrity": "sha512-jgdES2ExJYkuXC3DEaGAjFctKNA81C4QDy8zdoc+rqdSqheTizuDNtZg02uMFklmUES4V4fggmqds+Y7wraqng==",
+      "version": "22.6.1",
+      "resolved": "https://registry.npmjs.org/builder-util/-/builder-util-22.6.1.tgz",
+      "integrity": "sha512-A9cF+bSHqRTSKIUHEyE92Tl0Uh12N7yZRH9bccIL3gRUwtp6ulF28LsjNIWTSQ1clZo2M895cT5PCrKzjPQFVg==",
       "dev": true,
       "requires": {
         "7zip-bin": "~5.0.3",
         "@types/debug": "^4.1.5",
         "@types/fs-extra": "^8.1.0",
-        "app-builder-bin": "3.5.8",
+        "app-builder-bin": "3.5.9",
         "bluebird-lst": "^1.0.9",
         "builder-util-runtime": "8.7.0",
         "chalk": "^4.0.0",
@@ -3130,29 +3129,45 @@
       "dev": true
     },
     "cacache": {
-      "version": "13.0.1",
-      "resolved": "https://registry.npmjs.org/cacache/-/cacache-13.0.1.tgz",
-      "integrity": "sha512-5ZvAxd05HDDU+y9BVvcqYu2LLXmPnQ0hW62h32g4xBTgL/MppR4/04NHfj/ycM2y6lmTnbw6HVi+1eN0Psba6w==",
+      "version": "15.0.3",
+      "resolved": "https://registry.npmjs.org/cacache/-/cacache-15.0.3.tgz",
+      "integrity": "sha512-bc3jKYjqv7k4pWh7I/ixIjfcjPul4V4jme/WbjvwGS5LzoPL/GzXr4C5EgPNLO/QEZl9Oi61iGitYEdwcrwLCQ==",
       "dev": true,
       "requires": {
-        "chownr": "^1.1.2",
-        "figgy-pudding": "^3.5.1",
+        "chownr": "^2.0.0",
         "fs-minipass": "^2.0.0",
         "glob": "^7.1.4",
-        "graceful-fs": "^4.2.2",
         "infer-owner": "^1.0.4",
         "lru-cache": "^5.1.1",
-        "minipass": "^3.0.0",
+        "minipass": "^3.1.1",
         "minipass-collect": "^1.0.2",
         "minipass-flush": "^1.0.5",
         "minipass-pipeline": "^1.2.2",
-        "mkdirp": "^0.5.1",
-        "move-concurrently": "^1.0.1",
-        "p-map": "^3.0.0",
+        "mkdirp": "^1.0.3",
+        "move-file": "^2.0.0",
+        "p-map": "^4.0.0",
         "promise-inflight": "^1.0.1",
-        "rimraf": "^2.7.1",
-        "ssri": "^7.0.0",
+        "rimraf": "^3.0.2",
+        "ssri": "^8.0.0",
+        "tar": "^6.0.2",
         "unique-filename": "^1.1.1"
+      },
+      "dependencies": {
+        "mkdirp": {
+          "version": "1.0.4",
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
+          "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
+          "dev": true
+        },
+        "rimraf": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
+          "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+          "dev": true,
+          "requires": {
+            "glob": "^7.1.3"
+          }
+        }
       }
     },
     "cache-base": {
@@ -3320,9 +3335,9 @@
       }
     },
     "chownr": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
-      "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz",
+      "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==",
       "dev": true
     },
     "chrome-trace-event": {
@@ -4060,13 +4075,13 @@
       }
     },
     "dmg-builder": {
-      "version": "22.6.0",
-      "resolved": "https://registry.npmjs.org/dmg-builder/-/dmg-builder-22.6.0.tgz",
-      "integrity": "sha512-rJxuGhHIpcuDGBtWZMM8aLxkbZNgYO2MO5dUerDIBXebhX1K8DA23iz/uZ8ahcRNgWEv57b8GDqJbXKEfr5T0A==",
+      "version": "22.6.1",
+      "resolved": "https://registry.npmjs.org/dmg-builder/-/dmg-builder-22.6.1.tgz",
+      "integrity": "sha512-jUTN0acP15puzevtQASj7QEPgUGpedWSuSnOwR/++JbeYRTwU2oro09h/KZnaeMcxgxjdmT3tYLJeY1XUfPbRg==",
       "dev": true,
       "requires": {
-        "app-builder-lib": "22.6.0",
-        "builder-util": "22.6.0",
+        "app-builder-lib": "22.6.1",
+        "builder-util": "22.6.1",
         "fs-extra": "^9.0.0",
         "iconv-lite": "^0.5.1",
         "js-yaml": "^3.13.1",
@@ -4209,9 +4224,9 @@
       "dev": true
     },
     "ejs": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.2.tgz",
-      "integrity": "sha512-zFuywxrAWtX5Mk2KAuoJNkXXbfezpNA0v7i+YC971QORguPekpjpAgeOv99YWSdKXwj7JxI2QAWDeDkE8fWtXw==",
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.3.tgz",
+      "integrity": "sha512-wmtrUGyfSC23GC/B1SMv2ogAUgbQEtDmTIhfqielrG5ExIM9TP4UoYdi90jLF1aTcsWCJNEO0UrgKzP0y3nTSg==",
       "dev": true,
       "requires": {
         "jake": "^10.6.1"
@@ -4229,26 +4244,26 @@
       },
       "dependencies": {
         "@types/node": {
-          "version": "12.12.39",
-          "resolved": "https://registry.npmjs.org/@types/node/-/node-12.12.39.tgz",
-          "integrity": "sha512-pADGfwnDkr6zagDwEiCVE4yQrv7XDkoeVa4OfA9Ju/zRTk6YNDLGtQbkdL4/56mCQQCs4AhNrBIag6jrp7ZuOg==",
+          "version": "12.12.41",
+          "resolved": "https://registry.npmjs.org/@types/node/-/node-12.12.41.tgz",
+          "integrity": "sha512-Q+eSkdYQJ2XK1AJnr4Ji8Gvk3sRDybEwfTvtL9CA25FFUSD2EgZQewN6VCyWYZCXg5MWZdwogdTNBhlWRcWS1w==",
           "dev": true
         }
       }
     },
     "electron-builder": {
-      "version": "22.6.0",
-      "resolved": "https://registry.npmjs.org/electron-builder/-/electron-builder-22.6.0.tgz",
-      "integrity": "sha512-aLHlB6DTfjJ3MI4AUIFeWnwIozNgNlbOk2c2sTHxB10cAKp0dBVSPZ7xF5NK0uwDhElvRzJQubnHtJD6zKg42Q==",
+      "version": "22.6.1",
+      "resolved": "https://registry.npmjs.org/electron-builder/-/electron-builder-22.6.1.tgz",
+      "integrity": "sha512-3/VNg9GfXKHM53TilFtfF1+bsAR8THK1XHgeqCpsiequa02J9jTPc/DhpCUKQPkrs6/EIGxP7uboop7XYoew0Q==",
       "dev": true,
       "requires": {
-        "@types/yargs": "^15.0.4",
-        "app-builder-lib": "22.6.0",
+        "@types/yargs": "^15.0.5",
+        "app-builder-lib": "22.6.1",
         "bluebird-lst": "^1.0.9",
-        "builder-util": "22.6.0",
+        "builder-util": "22.6.1",
         "builder-util-runtime": "8.7.0",
         "chalk": "^4.0.0",
-        "dmg-builder": "22.6.0",
+        "dmg-builder": "22.6.1",
         "fs-extra": "^9.0.0",
         "is-ci": "^2.0.0",
         "lazy-val": "^1.0.4",
@@ -4457,16 +4472,6 @@
         }
       }
     },
-    "electron-debug": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/electron-debug/-/electron-debug-3.0.1.tgz",
-      "integrity": "sha512-fo3mtDM4Bxxm3DW1I+XcJKfQlUlns4QGWyWGs8OrXK1bBZ2X9HeqYMntYBx78MYRcGY5S/ualuG4GhCnPlaZEA==",
-      "dev": true,
-      "requires": {
-        "electron-is-dev": "^1.1.0",
-        "electron-localshortcut": "^3.1.0"
-      }
-    },
     "electron-devtools-installer": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/electron-devtools-installer/-/electron-devtools-installer-3.0.0.tgz",
@@ -4495,47 +4500,12 @@
         }
       }
     },
-    "electron-is-accelerator": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/electron-is-accelerator/-/electron-is-accelerator-0.1.2.tgz",
-      "integrity": "sha1-UJ5RDCala1Xhf4Y6SwThEYRqsns=",
-      "dev": true
-    },
     "electron-is-dev": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/electron-is-dev/-/electron-is-dev-1.2.0.tgz",
       "integrity": "sha512-R1oD5gMBPS7PVU8gJwH6CtT0e6VSoD0+SzSnYpNm+dBkcijgA+K7VAMHDfnRq/lkKPZArpzplTW6jfiMYosdzw==",
       "dev": true
     },
-    "electron-localshortcut": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/electron-localshortcut/-/electron-localshortcut-3.2.1.tgz",
-      "integrity": "sha512-DWvhKv36GsdXKnaFFhEiK8kZZA+24/yFLgtTwJJHc7AFgDjNRIBJZ/jq62Y/dWv9E4ypYwrVWN2bVrCYw1uv7Q==",
-      "dev": true,
-      "requires": {
-        "debug": "^4.0.1",
-        "electron-is-accelerator": "^0.1.0",
-        "keyboardevent-from-electron-accelerator": "^2.0.0",
-        "keyboardevents-areequal": "^0.2.1"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
-          "dev": true,
-          "requires": {
-            "ms": "^2.1.1"
-          }
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
-        }
-      }
-    },
     "electron-notarize": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/electron-notarize/-/electron-notarize-0.3.0.tgz",
@@ -4564,19 +4534,19 @@
       }
     },
     "electron-publish": {
-      "version": "22.6.0",
-      "resolved": "https://registry.npmjs.org/electron-publish/-/electron-publish-22.6.0.tgz",
-      "integrity": "sha512-+v05SBf9qR7Os5au+fifloNHy5QxHQkUGudBj68YaTb43Pn37UkwRxSc49Lf13s4wW32ohM45g8BOVInPJEdnA==",
+      "version": "22.6.1",
+      "resolved": "https://registry.npmjs.org/electron-publish/-/electron-publish-22.6.1.tgz",
+      "integrity": "sha512-/MkS47ospdSfAFW5Jp52OzYou14HhGJpZ51uAc3GJ5rCfACeqpimC/n1ajRLE3hcXxTWfd3t9MCuClq5jrUO5w==",
       "dev": true,
       "requires": {
         "@types/fs-extra": "^8.1.0",
         "bluebird-lst": "^1.0.9",
-        "builder-util": "22.6.0",
+        "builder-util": "22.6.1",
         "builder-util-runtime": "8.7.0",
         "chalk": "^4.0.0",
         "fs-extra": "^9.0.0",
         "lazy-val": "^1.0.4",
-        "mime": "^2.4.4"
+        "mime": "^2.4.5"
       },
       "dependencies": {
         "ansi-styles": {
@@ -4642,6 +4612,12 @@
             "universalify": "^1.0.0"
           }
         },
+        "mime": {
+          "version": "2.4.5",
+          "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.5.tgz",
+          "integrity": "sha512-3hQhEUF027BuxZjQA3s7rIv/7VCQPa27hN9u9g87sEkWaKwQPuXOkVKtOeiyUrnWqTDiOs8Ed2rwg733mB0R5w==",
+          "dev": true
+        },
         "supports-color": {
           "version": "7.1.0",
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
@@ -6239,6 +6215,12 @@
           "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
           "dev": true
         },
+        "prettier": {
+          "version": "1.19.1",
+          "resolved": "https://registry.npmjs.org/prettier/-/prettier-1.19.1.tgz",
+          "integrity": "sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew==",
+          "dev": true
+        },
         "require-main-filename": {
           "version": "1.0.1",
           "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz",
@@ -6326,6 +6308,14 @@
         "shelljs": "^0.8.3",
         "typescript": "^3.4",
         "typescript-compiler": "^1.4.1-2"
+      },
+      "dependencies": {
+        "prettier": {
+          "version": "1.19.1",
+          "resolved": "https://registry.npmjs.org/prettier/-/prettier-1.19.1.tgz",
+          "integrity": "sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew==",
+          "dev": true
+        }
       }
     },
     "flush-write-stream": {
@@ -8563,9 +8553,9 @@
       }
     },
     "jest-worker": {
-      "version": "25.5.0",
-      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-25.5.0.tgz",
-      "integrity": "sha512-/dsSmUkIy5EBGfv/IjjqmFxrNAUpBERfGs1oHROyD7yxjG/w+t0GOJDX8O1k32ySmd7+a5IhnJU2qQFcJ4n1vw==",
+      "version": "26.0.0",
+      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-26.0.0.tgz",
+      "integrity": "sha512-pPaYa2+JnwmiZjK9x7p9BoZht+47ecFCDFA/CJxspHzeDvQcfVBLWzCiWyo+EGrSiQMWZtCFo9iSvMZnAAo8vw==",
       "dev": true,
       "requires": {
         "merge-stream": "^2.0.0",
@@ -8707,18 +8697,6 @@
         "set-immediate-shim": "~1.0.1"
       }
     },
-    "keyboardevent-from-electron-accelerator": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/keyboardevent-from-electron-accelerator/-/keyboardevent-from-electron-accelerator-2.0.0.tgz",
-      "integrity": "sha512-iQcmNA0M4ETMNi0kG/q0h/43wZk7rMeKYrXP7sqKIJbHkTU8Koowgzv+ieR/vWJbOwxx5nDC3UnudZ0aLSu4VA==",
-      "dev": true
-    },
-    "keyboardevents-areequal": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/keyboardevents-areequal/-/keyboardevents-areequal-0.2.2.tgz",
-      "integrity": "sha512-Nv+Kr33T0mEjxR500q+I6IWisOQ0lK1GGOncV0kWE6n4KFmpcu7RUX5/2B0EUtX51Cb0HjZ9VJsSY3u4cBa0kw==",
-      "dev": true
-    },
     "keyv": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/keyv/-/keyv-3.1.0.tgz",
@@ -8962,12 +8940,6 @@
         "semver": "^6.0.0"
       }
     },
-    "mamacro": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/mamacro/-/mamacro-0.0.3.tgz",
-      "integrity": "sha512-qMEwh+UujcQ+kbz3T6V+wAmO2U8veoq2w+3wY8MquqwVA3jChfwY+Tk52GZKDfACEPjuZ7r2oJLejwpt8jtwTA==",
-      "dev": true
-    },
     "map-age-cleaner": {
       "version": "0.1.3",
       "resolved": "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz",
@@ -9186,9 +9158,9 @@
       "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="
     },
     "minipass": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.1.tgz",
-      "integrity": "sha512-UFqVihv6PQgwj8/yTGvl9kPz7xIAY+R5z6XYjRInD3Gk3qx6QGSD6zEcpeG4Dy/lQnv1J6zv8ejV90hyYIKf3w==",
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.3.tgz",
+      "integrity": "sha512-Mgd2GdMVzY+x3IJ+oHnVM+KG3lA5c8tnabyJKmHSaG2kAGpudxuOf8ToDkhumF7UzME7DecbQE9uOZhNm7PuJg==",
       "dev": true,
       "requires": {
         "yallist": "^4.0.0"
@@ -9221,14 +9193,32 @@
       }
     },
     "minipass-pipeline": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.2.tgz",
-      "integrity": "sha512-3JS5A2DKhD2g0Gg8x3yamO0pj7YeKGwVlDS90pF++kxptwx/F+B//roxf9SqYil5tQo65bijy+dAuAFZmYOouA==",
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.3.tgz",
+      "integrity": "sha512-cFOknTvng5vqnwOpDsZTWhNll6Jf8o2x+/diplafmxpuIymAjzoOolZG0VvQf3V2HgqzJNhnuKHYp2BqDgz8IQ==",
       "dev": true,
       "requires": {
         "minipass": "^3.0.0"
       }
     },
+    "minizlib": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.0.tgz",
+      "integrity": "sha512-EzTZN/fjSvifSX0SlqUERCN39o6T40AMarPbv0MrarSFtIITCBh7bi+dU8nxGFHuqs9jdIAeoYoKuQAAASsPPA==",
+      "dev": true,
+      "requires": {
+        "minipass": "^3.0.0",
+        "yallist": "^4.0.0"
+      },
+      "dependencies": {
+        "yallist": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+          "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+          "dev": true
+        }
+      }
+    },
     "mississippi": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/mississippi/-/mississippi-3.0.0.tgz",
@@ -9305,6 +9295,23 @@
         "run-queue": "^1.0.3"
       }
     },
+    "move-file": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/move-file/-/move-file-2.0.0.tgz",
+      "integrity": "sha512-cdkdhNCgbP5dvS4tlGxZbD+nloio9GIimP57EjqFhwLcMjnU+XJKAZzlmg/TN/AK1LuNAdTSvm3CPPP4Xkv0iQ==",
+      "dev": true,
+      "requires": {
+        "path-exists": "^4.0.0"
+      },
+      "dependencies": {
+        "path-exists": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+          "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+          "dev": true
+        }
+      }
+    },
     "ms": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
@@ -9821,9 +9828,9 @@
       }
     },
     "p-map": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/p-map/-/p-map-3.0.0.tgz",
-      "integrity": "sha512-d3qXVTF/s+W+CdJ5A29wywV2n8CQQYahlgz2bFiA+4eVNJbHJodPZ+/gXwPGh0bOqA+j8S+6+ckmvLGPk1QpxQ==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz",
+      "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==",
       "dev": true,
       "requires": {
         "aggregate-error": "^3.0.0"
@@ -10020,6 +10027,13 @@
       "integrity": "sha1-elfrVQpng/kRUzH89GY9XI4AelA=",
       "dev": true
     },
+    "picomatch": {
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz",
+      "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==",
+      "dev": true,
+      "optional": true
+    },
     "pify": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
@@ -11097,9 +11111,9 @@
       }
     },
     "serialize-javascript": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-2.1.2.tgz",
-      "integrity": "sha512-rs9OggEUF0V4jUSecXazOYsLfu7OGK2qIn3c7IPBiffz32XniEp/TX9Xmc9LQfK2nQ2QKHvZ2oygKUGU0lG4jQ==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-3.0.0.tgz",
+      "integrity": "sha512-skZcHYw2vEX4bw90nAr2iTTsz6x2SrHEnfxgKYmZlvJYBEZrvbKtobJWlQ20zczKb3bsHHXXTYt48zBA7ni9cw==",
       "dev": true
     },
     "serve-index": {
@@ -11633,12 +11647,11 @@
       "optional": true
     },
     "ssri": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/ssri/-/ssri-7.1.0.tgz",
-      "integrity": "sha512-77/WrDZUWocK0mvA5NTRQyveUf+wsrIc6vyrxpS8tVvYBcX215QbafrJR3KtkpskIzoFLqqNuuYQvxaMjXJ/0g==",
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.0.tgz",
+      "integrity": "sha512-aq/pz989nxVYwn16Tsbj1TqFpD5LLrQxHf5zaHuieFV+R0Bbr4y8qUsOA45hXT/N4/9UNXTarBjnjVmjSOVaAA==",
       "dev": true,
       "requires": {
-        "figgy-pudding": "^3.5.1",
         "minipass": "^3.1.1"
       }
     },
@@ -11964,6 +11977,34 @@
       "integrity": "sha1-KcNXB8K3DlDQdIK10gLo7URtr9Q=",
       "dev": true
     },
+    "tar": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-6.0.2.tgz",
+      "integrity": "sha512-Glo3jkRtPcvpDlAs/0+hozav78yoXKFr+c4wgw62NNMO3oo4AaJdCo21Uu7lcwr55h39W2XD1LMERc64wtbItg==",
+      "dev": true,
+      "requires": {
+        "chownr": "^2.0.0",
+        "fs-minipass": "^2.0.0",
+        "minipass": "^3.0.0",
+        "minizlib": "^2.1.0",
+        "mkdirp": "^1.0.3",
+        "yallist": "^4.0.0"
+      },
+      "dependencies": {
+        "mkdirp": {
+          "version": "1.0.4",
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
+          "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
+          "dev": true
+        },
+        "yallist": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+          "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+          "dev": true
+        }
+      }
+    },
     "temp-file": {
       "version": "3.3.7",
       "resolved": "https://registry.npmjs.org/temp-file/-/temp-file-3.3.7.tgz",
@@ -11981,9 +12022,9 @@
       "dev": true
     },
     "terser": {
-      "version": "4.6.12",
-      "resolved": "https://registry.npmjs.org/terser/-/terser-4.6.12.tgz",
-      "integrity": "sha512-fnIwuaKjFPANG6MAixC/k1TDtnl1YlPLUlLVIxxGZUn1gfUx2+l3/zGNB72wya+lgsb50QBi2tUV75RiODwnww==",
+      "version": "4.7.0",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-4.7.0.tgz",
+      "integrity": "sha512-Lfb0RiZcjRDXCC3OSHJpEkxJ9Qeqs6mp2v4jf2MHfy8vGERmVDuvjXdd/EnP5Deme5F2yBRBymKmKHCBg2echw==",
       "dev": true,
       "requires": {
         "commander": "^2.20.0",
@@ -12000,19 +12041,19 @@
       }
     },
     "terser-webpack-plugin": {
-      "version": "2.3.5",
-      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-2.3.5.tgz",
-      "integrity": "sha512-WlWksUoq+E4+JlJ+h+U+QUzXpcsMSSNXkDy9lBVkSqDn1w23Gg29L/ary9GeJVYCGiNJJX7LnVc4bwL1N3/g1w==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-3.0.1.tgz",
+      "integrity": "sha512-eFDtq8qPUEa9hXcUzTwKXTnugIVtlqc1Z/ZVhG8LmRT3lgRY13+pQTnFLY2N7ATB6TKCHuW/IGjoAnZz9wOIqw==",
       "dev": true,
       "requires": {
-        "cacache": "^13.0.1",
-        "find-cache-dir": "^3.2.0",
-        "jest-worker": "^25.1.0",
-        "p-limit": "^2.2.2",
-        "schema-utils": "^2.6.4",
-        "serialize-javascript": "^2.1.2",
+        "cacache": "^15.0.3",
+        "find-cache-dir": "^3.3.1",
+        "jest-worker": "^26.0.0",
+        "p-limit": "^2.3.0",
+        "schema-utils": "^2.6.6",
+        "serialize-javascript": "^3.0.0",
         "source-map": "^0.6.1",
-        "terser": "^4.4.3",
+        "terser": "^4.6.13",
         "webpack-sources": "^1.4.3"
       },
       "dependencies": {
@@ -12588,14 +12629,27 @@
       }
     },
     "url-loader": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/url-loader/-/url-loader-3.0.0.tgz",
-      "integrity": "sha512-a84JJbIA5xTFTWyjjcPdnsu+41o/SNE8SpXMdUvXs6Q+LuhCD9E2+0VCiuDWqgo3GGXVlFHzArDmBpj9PgWn4A==",
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/url-loader/-/url-loader-4.1.0.tgz",
+      "integrity": "sha512-IzgAAIC8wRrg6NYkFIJY09vtktQcsvU8V6HhtQj9PTefbYImzLB1hufqo4m+RyM5N3mLx5BqJKccgxJS+W3kqw==",
       "dev": true,
       "requires": {
-        "loader-utils": "^1.2.3",
-        "mime": "^2.4.4",
-        "schema-utils": "^2.5.0"
+        "loader-utils": "^2.0.0",
+        "mime-types": "^2.1.26",
+        "schema-utils": "^2.6.5"
+      },
+      "dependencies": {
+        "loader-utils": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz",
+          "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
+          "dev": true,
+          "requires": {
+            "big.js": "^5.2.2",
+            "emojis-list": "^3.0.0",
+            "json5": "^2.1.2"
+          }
+        }
       }
     },
     "url-parse": {
@@ -12709,14 +12763,126 @@
       "dev": true
     },
     "watchpack": {
-      "version": "1.6.1",
-      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.6.1.tgz",
-      "integrity": "sha512-+IF9hfUFOrYOOaKyfaI7h7dquUIOgyEMoQMLA7OP5FxegKA2+XdXThAZ9TU2kucfhDH7rfMHs1oPYziVGWRnZA==",
+      "version": "1.7.2",
+      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.7.2.tgz",
+      "integrity": "sha512-ymVbbQP40MFTp+cNMvpyBpBtygHnPzPkHqoIwRRj/0B8KhqQwV8LaKjtbaxF2lK4vl8zN9wCxS46IFCU5K4W0g==",
       "dev": true,
       "requires": {
-        "chokidar": "^2.1.8",
+        "chokidar": "^3.4.0",
         "graceful-fs": "^4.1.2",
-        "neo-async": "^2.5.0"
+        "neo-async": "^2.5.0",
+        "watchpack-chokidar2": "^2.0.0"
+      },
+      "dependencies": {
+        "anymatch": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz",
+          "integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "normalize-path": "^3.0.0",
+            "picomatch": "^2.0.4"
+          }
+        },
+        "binary-extensions": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.0.0.tgz",
+          "integrity": "sha512-Phlt0plgpIIBOGTT/ehfFnbNlfsDEiqmzE2KRXoX1bLIlir4X/MR+zSyBEkL05ffWgnRSf/DXv+WrUAVr93/ow==",
+          "dev": true,
+          "optional": true
+        },
+        "braces": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+          "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "fill-range": "^7.0.1"
+          }
+        },
+        "chokidar": {
+          "version": "3.4.0",
+          "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.4.0.tgz",
+          "integrity": "sha512-aXAaho2VJtisB/1fg1+3nlLJqGOuewTzQpd/Tz0yTg2R0e4IGtshYvtjowyEumcBv2z+y4+kc75Mz7j5xJskcQ==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "anymatch": "~3.1.1",
+            "braces": "~3.0.2",
+            "fsevents": "~2.1.2",
+            "glob-parent": "~5.1.0",
+            "is-binary-path": "~2.1.0",
+            "is-glob": "~4.0.1",
+            "normalize-path": "~3.0.0",
+            "readdirp": "~3.4.0"
+          }
+        },
+        "fill-range": {
+          "version": "7.0.1",
+          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+          "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "to-regex-range": "^5.0.1"
+          }
+        },
+        "fsevents": {
+          "version": "2.1.3",
+          "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz",
+          "integrity": "sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==",
+          "dev": true,
+          "optional": true
+        },
+        "is-binary-path": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
+          "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "binary-extensions": "^2.0.0"
+          }
+        },
+        "is-number": {
+          "version": "7.0.0",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+          "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+          "dev": true,
+          "optional": true
+        },
+        "readdirp": {
+          "version": "3.4.0",
+          "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.4.0.tgz",
+          "integrity": "sha512-0xe001vZBnJEK+uKcj8qOhyAKPzIT+gStxWr3LCB0DwcXR5NZJ3IaC+yGnHCYzB/S7ov3m3EEbZI2zeNvX+hGQ==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "picomatch": "^2.2.1"
+          }
+        },
+        "to-regex-range": {
+          "version": "5.0.1",
+          "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+          "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "is-number": "^7.0.0"
+          }
+        }
+      }
+    },
+    "watchpack-chokidar2": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/watchpack-chokidar2/-/watchpack-chokidar2-2.0.0.tgz",
+      "integrity": "sha512-9TyfOyN/zLUbA288wZ8IsMZ+6cbzvsNyEzSBp6e/zkifi6xxbl8SmQ/CxQq32k8NNqrdVEVUVSEf56L4rQ/ZxA==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "chokidar": "^2.1.8"
       }
     },
     "wbuf": {
@@ -12729,16 +12895,16 @@
       }
     },
     "webpack": {
-      "version": "4.41.6",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.41.6.tgz",
-      "integrity": "sha512-yxXfV0Zv9WMGRD+QexkZzmGIh54bsvEs+9aRWxnN8erLWEOehAKUTeNBoUbA6HPEZPlRo7KDi2ZcNveoZgK9MA==",
+      "version": "4.43.0",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.43.0.tgz",
+      "integrity": "sha512-GW1LjnPipFW2Y78OOab8NJlCflB7EFskMih2AHdvjbpKMeDJqEgSx24cXXXiPS65+WSwVyxtDsJH6jGX2czy+g==",
       "dev": true,
       "requires": {
-        "@webassemblyjs/ast": "1.8.5",
-        "@webassemblyjs/helper-module-context": "1.8.5",
-        "@webassemblyjs/wasm-edit": "1.8.5",
-        "@webassemblyjs/wasm-parser": "1.8.5",
-        "acorn": "^6.2.1",
+        "@webassemblyjs/ast": "1.9.0",
+        "@webassemblyjs/helper-module-context": "1.9.0",
+        "@webassemblyjs/wasm-edit": "1.9.0",
+        "@webassemblyjs/wasm-parser": "1.9.0",
+        "acorn": "^6.4.1",
         "ajv": "^6.10.2",
         "ajv-keywords": "^3.4.1",
         "chrome-trace-event": "^1.0.2",
@@ -12749,13 +12915,13 @@
         "loader-utils": "^1.2.3",
         "memory-fs": "^0.4.1",
         "micromatch": "^3.1.10",
-        "mkdirp": "^0.5.1",
+        "mkdirp": "^0.5.3",
         "neo-async": "^2.6.1",
         "node-libs-browser": "^2.2.1",
         "schema-utils": "^1.0.0",
         "tapable": "^1.1.3",
         "terser-webpack-plugin": "^1.4.3",
-        "watchpack": "^1.6.0",
+        "watchpack": "^1.6.1",
         "webpack-sources": "^1.4.1"
       },
       "dependencies": {
@@ -12788,6 +12954,12 @@
             "y18n": "^4.0.0"
           }
         },
+        "chownr": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
+          "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==",
+          "dev": true
+        },
         "enhanced-resolve": {
           "version": "4.1.1",
           "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.1.1.tgz",
@@ -12842,6 +13014,12 @@
             "ajv-keywords": "^3.1.0"
           }
         },
+        "serialize-javascript": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-2.1.2.tgz",
+          "integrity": "sha512-rs9OggEUF0V4jUSecXazOYsLfu7OGK2qIn3c7IPBiffz32XniEp/TX9Xmc9LQfK2nQ2QKHvZ2oygKUGU0lG4jQ==",
+          "dev": true
+        },
         "source-map": {
           "version": "0.6.1",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
@@ -12889,9 +13067,9 @@
       }
     },
     "webpack-bundle-analyzer": {
-      "version": "3.7.0",
-      "resolved": "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-3.7.0.tgz",
-      "integrity": "sha512-mETdjZ30a3Yf+NTB/wqTgACK7rAYQl5uxKK0WVTNmF0sM3Uv8s3R58YZMW7Rhu0Lk2Rmuhdj5dcH5Q76zCDVdA==",
+      "version": "3.8.0",
+      "resolved": "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-3.8.0.tgz",
+      "integrity": "sha512-PODQhAYVEourCcOuU+NiYI7WdR8QyELZGgPvB1y2tjbUpbmcQOt5Q7jEK+ttd5se0KSBKD9SXHCEozS++Wllmw==",
       "dev": true,
       "requires": {
         "acorn": "^7.1.1",
diff --git a/package.json b/package.json
index a2ae68d81..e043068c4 100644
--- a/package.json
+++ b/package.json
@@ -71,8 +71,7 @@
     "detect-port": "1.3.0",
     "dotenv": "8.2.0",
     "electron": "8.2.5",
-    "electron-builder": "22.6.0",
-    "electron-debug": "3.0.1",
+    "electron-builder": "22.6.1",
     "electron-devtools-installer": "3.0.0",
     "electron-notarize": "0.3.0",
     "electron-unhandled": "3.0.2",
@@ -96,10 +95,10 @@
     "hoist-non-react-statics": "3.3.2",
     "prettier": "1.19.1",
     "react-hot-loader": "4.12.21",
-    "terser-webpack-plugin": "2.3.5",
-    "url-loader": "3.0.0",
-    "webpack": "4.41.6",
-    "webpack-bundle-analyzer": "3.7.0",
+    "terser-webpack-plugin": "3.0.1",
+    "url-loader": "4.1.0",
+    "webpack": "4.43.0",
+    "webpack-bundle-analyzer": "3.8.0",
     "webpack-cli": "3.3.11",
     "webpack-dev-server": "3.11.0",
     "webpack-merge": "4.2.2"