diff --git a/.husky/pre-commit b/.husky/pre-commit
new file mode 100755
index 000000000..d24fdfc60
--- /dev/null
+++ b/.husky/pre-commit
@@ -0,0 +1,4 @@
+#!/usr/bin/env sh
+. "$(dirname -- "$0")/_/husky.sh"
+
+npx lint-staged
diff --git a/.husky/pre-push b/.husky/pre-push
new file mode 100755
index 000000000..3e18ca2e4
--- /dev/null
+++ b/.husky/pre-push
@@ -0,0 +1,4 @@
+#!/usr/bin/env sh
+. "$(dirname -- "$0")/_/husky.sh"
+
+npm run test:unit
diff --git a/.prettierignore b/.prettierignore
new file mode 100644
index 000000000..2b786cc94
--- /dev/null
+++ b/.prettierignore
@@ -0,0 +1,3 @@
+compiled
+bundle
+dist
diff --git a/.prettierrc b/.prettierrc
new file mode 100644
index 000000000..570ea7744
--- /dev/null
+++ b/.prettierrc
@@ -0,0 +1,6 @@
+{
+  "printWidth": 120,
+  "singleQuote": true,
+  "jsxSingleQuote": true,
+  "semi": false
+}
diff --git a/@types/@aragon__wrapper/index.d.ts b/@types/@aragon__wrapper/index.d.ts
index fa3ca6b5f..75e8ded98 100644
--- a/@types/@aragon__wrapper/index.d.ts
+++ b/@types/@aragon__wrapper/index.d.ts
@@ -1,19 +1,19 @@
 declare module '@aragon/wrapper' {
   interface WrapperOptions {
-    provider: any,
+    provider: any
     apm?: {
       ipfs?: {
-        gateway: string,
-      },
+        gateway: string
+      }
       ensRegistryAddress?: string
     }
   }
 
   interface App {
-    appId: string,
-    proxyAddress: string,
-    name: string,
-    kernel: string,
+    appId: string
+    proxyAddress: string
+    name: string
+    kernel: string
     agent: string
   }
 
@@ -26,15 +26,20 @@ declare module '@aragon/wrapper' {
   }
 
   export default class Wrapper {
-    constructor (address: string, opts: WrapperOptions)
+    constructor(address: string, opts: WrapperOptions)
     apps: Apps
 
     init(): Promise<void>
-    calculateTransactionPath(from: string, destination: string, action: string, txData: Array<string | undefined>): Promise<Array<TransactionData>>
+    calculateTransactionPath(
+      from: string,
+      destination: string,
+      action: string,
+      txData: Array<string | undefined>
+    ): Promise<Array<TransactionData>>
   }
 
   interface ResolveOptions {
-    provider: any,
+    provider: any
     registryAddress?: string
   }
 
diff --git a/@types/eth-ens-namehash/index.d.ts b/@types/eth-ens-namehash/index.d.ts
index ce3205236..310c196cd 100644
--- a/@types/eth-ens-namehash/index.d.ts
+++ b/@types/eth-ens-namehash/index.d.ts
@@ -1,3 +1,3 @@
 declare module 'eth-ens-namehash' {
-  export function hash (name: string): string
+  export function hash(name: string): string
 }
diff --git a/@types/frame/environment.d.ts b/@types/frame/environment.d.ts
index 1cdd93b49..518086117 100644
--- a/@types/frame/environment.d.ts
+++ b/@types/frame/environment.d.ts
@@ -2,7 +2,7 @@ declare global {
   namespace NodeJS {
     interface ProcessEnv {
       BUNDLE_LOCATION: string
-      NODE_ENV: 'test' | 'development' | 'production',
+      NODE_ENV: 'test' | 'development' | 'production'
       // use this to override the log level in development
       LOG_LEVEL: 'silly' | 'debug' | 'verbose' | 'info' | 'warn' | 'error'
     }
diff --git a/@types/frame/ethProvider.d.ts b/@types/frame/ethProvider.d.ts
index 1ca271e50..f2fb72a56 100644
--- a/@types/frame/ethProvider.d.ts
+++ b/@types/frame/ethProvider.d.ts
@@ -1,14 +1,14 @@
 declare module 'eth-provider' {
   interface ProviderOpts {
-    name?: string,
+    name?: string
     origin?: string
   }
-  
+
   interface RequestPayload {
-    id?: number,
-    jsonrpc?: '2.0',
-    method: string,
-    params?: any[],
+    id?: number
+    jsonrpc?: '2.0'
+    method: string
+    params?: any[]
     chainId?: string
   }
 
@@ -21,5 +21,5 @@ declare module 'eth-provider' {
     setChain(chainId: string)
   }
 
-  export default function provider (targets?: string | string[], opts?: ProviderOpts): EthereumProvider
+  export default function provider(targets?: string | string[], opts?: ProviderOpts): EthereumProvider
 }
diff --git a/@types/frame/restore.d.ts b/@types/frame/restore.d.ts
index 6d761eb7e..99b1ab11a 100644
--- a/@types/frame/restore.d.ts
+++ b/@types/frame/restore.d.ts
@@ -6,16 +6,16 @@ interface Action {
   updates: any[]
 }
 
-declare type CallableStore = (...args: any[]) => any;
+declare type CallableStore = (...args: any[]) => any
 
 interface Store extends CallableStore {
-  observer: (cb: () => void, id?: string) => Observer,
-  [actionName: string]: (...args: any) => void,
+  observer: (cb: () => void, id?: string) => Observer
+  [actionName: string]: (...args: any) => void
   api: {
-    feed: (handler: (state: any, actionBatch: Action[]) => any) => void;
+    feed: (handler: (state: any, actionBatch: Action[]) => any) => void
   }
 }
 
 declare module 'react-restore' {
-  export function create (state: any, actions: any): Store
+  export function create(state: any, actions: any): Store
 }
diff --git a/@types/frame/rpc.d.ts b/@types/frame/rpc.d.ts
index 4a34afcd7..35467ebe3 100644
--- a/@types/frame/rpc.d.ts
+++ b/@types/frame/rpc.d.ts
@@ -11,11 +11,11 @@ enum SubscriptionType {
   ASSETS = 'assetsChanged',
   CHAIN = 'chainChanged',
   CHAINS = 'chainsChanged',
-  NETWORK = 'networkChanged'
+  NETWORK = 'networkChanged',
 }
 
 interface RPCId {
-  id: number,
+  id: number
   jsonrpc: string
 }
 
@@ -24,8 +24,8 @@ interface InternalPayload {
 }
 
 interface JSONRPCRequestPayload extends RPCId {
-  params: any[],
-  method: string,
+  params: any[]
+  method: string
   chainId?: string
 }
 
@@ -38,7 +38,7 @@ interface JSONRPCErrorResponsePayload extends RPCId {
 }
 
 interface EVMError {
-  message: string,
+  message: string
   code?: number
 }
 
@@ -47,27 +47,27 @@ type RPCRequestPayload = JSONRPCRequestPayload & InternalPayload
 declare namespace RPC {
   namespace GetAssets {
     interface Balance {
-      chainId: number,
-      name: string,
-      symbol: string,
-      balance: string,
-      decimals: number,
+      chainId: number
+      name: string
+      symbol: string
+      balance: string
+      decimals: number
       displayBalance: string
     }
 
     interface NativeCurrency extends Balance {
       currencyInfo: Currency
     }
-    
+
     interface Erc20 extends Balance {
       tokenInfo: {
-        lastKnownPrice: { usd: { price: number, change24hr?: number } }
-      },
+        lastKnownPrice: { usd: { price: number; change24hr?: number } }
+      }
       address: Address
     }
 
     interface Assets {
-      erc20?: Erc20[],
+      erc20?: Erc20[]
       nativeCurrency: Balance[]
     }
 
@@ -82,29 +82,29 @@ declare namespace RPC {
 
   namespace SendTransaction {
     interface TxParams {
-      nonce?: string;
-      gasPrice?: string,
-      gas?: string, // deprecated
-      maxPriorityFeePerGas?: string,
-      maxFeePerGas?: string,
-      gasLimit?: string,
-      from?: Address,
-      to?: Address,
-      data?: string,
-      value?: string,
-      chainId: string,
-      type?: string,
+      nonce?: string
+      gasPrice?: string
+      gas?: string // deprecated
+      maxPriorityFeePerGas?: string
+      maxFeePerGas?: string
+      gasLimit?: string
+      from?: Address
+      to?: Address
+      data?: string
+      value?: string
+      chainId: string
+      type?: string
     }
 
     interface Request extends Omit<RPCRequestPayload, 'method'> {
-      method: 'eth_sendTransaction',
+      method: 'eth_sendTransaction'
       params: TxParams[]
     }
   }
 
   namespace Subscribe {
     interface Request extends Omit<RPCRequestPayload, 'method'> {
-      method: 'eth_subscribe',
+      method: 'eth_subscribe'
       params: SubscriptionType[]
     }
   }
diff --git a/@types/frame/state.d.ts b/@types/frame/state.d.ts
index 2002fc105..a80ef4d7c 100644
--- a/@types/frame/state.d.ts
+++ b/@types/frame/state.d.ts
@@ -1,53 +1,53 @@
 interface Connection {
-  on: boolean,
-  connected: boolean,
-  current: string,
-  status: string,
-  network: string,
+  on: boolean
+  connected: boolean
+  current: string
+  status: string
+  network: string
   custom: string
 }
 
 interface Chain {
-  id: number,
+  id: number
   type: 'ethereum'
 }
 
 interface Network {
-  id: number,
-  name: string,
-  symbol: string,
-  layer: string,
-  on: boolean,
+  id: number
+  name: string
+  symbol: string
+  layer: string
+  on: boolean
   connection: {
-    primary: Connection,
+    primary: Connection
     secondary: Connection
   }
 }
 
 interface NetworkMetadata {
-  id: number,
-  name: string,
-  nativeCurrency: NativeCurrency,
-  symbol: string,
+  id: number
+  name: string
+  nativeCurrency: NativeCurrency
+  symbol: string
   gas: GasData
 }
 
 interface Session {
-  requests: number,
-  startedAt: number,
-  endedAt?: number,
+  requests: number
+  startedAt: number
+  endedAt?: number
   lastUpdatedAt: number
 }
 
 interface Origin {
-  chain: Chain,
-  name: string,
+  chain: Chain
+  name: string
   session: Session
 }
 
 interface Permission {
-  origin: string,
-  provider: boolean, // whether or not to grant access
+  origin: string
+  provider: boolean // whether or not to grant access
   handlerId?: string
 }
 
@@ -56,81 +56,81 @@ interface NativeCurrency {
 }
 
 interface GasData {
-  fees: GasFees,
+  fees: GasFees
   price: {
-    selected: string,
+    selected: string
     levels: GasLevels
   }
 }
 
 interface GasFees {
-  nextBaseFee: string,
-  maxBaseFeePerGas: string,
-  maxPriorityFeePerGas: string,
+  nextBaseFee: string
+  maxBaseFeePerGas: string
+  maxPriorityFeePerGas: string
   maxFeePerGas: string
 }
 
 interface GasLevels {
-  slow?: string,
-  standard: string,
-  fast?: string,
-  asap?: string,
+  slow?: string
+  standard: string
+  fast?: string
+  asap?: string
   custom?: string
 }
 
 type HexAmount = string
 
 interface Balance {
-  chainId: number,
-  address: Address,
-  name: string,
-  symbol: string,
-  balance: HexAmount,
-  decimals: number,
+  chainId: number
+  address: Address
+  name: string
+  symbol: string
+  balance: HexAmount
+  decimals: number
   displayBalance: string
 }
 
 interface Rate {
   usd: {
-    price: BigNumber,
+    price: BigNumber
     change24hr: BigNumber
   }
 }
 
 interface Currency {
-  icon: string,
+  icon: string
   name: string
 }
 
 interface Token {
-  chainId: number,
-  name: string,
-  symbol: string,
-  address: string,
-  decimals: number,
+  chainId: number
+  name: string
+  symbol: string
+  address: string
+  decimals: number
   logoURI?: string
 }
 
 interface ViewMetadata {
-  id: string,
-  ready: boolean,
-  dappId: string,
-  ens: string,
+  id: string
+  ready: boolean
+  dappId: string
+  ens: string
   url: string
 }
 
 interface Frame {
-  id: string,
-  currentView: string,
+  id: string
+  currentView: string
   views: Record<string, ViewMetadata>
 }
 
 interface Dapp {
-  id?: string,
-  ens: string,
-  status?: string,
-  config: Record<string, string>,
-  manifest?: any,
+  id?: string
+  ens: string
+  status?: string
+  config: Record<string, string>
+  manifest?: any
   current?: any
 }
 
@@ -138,39 +138,39 @@ type SignerType = 'ring' | 'seed' | 'aragon' | 'trezor' | 'ledger' | 'lattice'
 type AccountStatus = 'ok'
 
 interface Signer {
-  id: string,
-  name: string,
-  model: string,
-  type: SignerType,
-  addresses: Address[],
-  status: string,
+  id: string
+  name: string
+  model: string
+  type: SignerType
+  addresses: Address[]
+  status: string
   createdAt: number
 }
 
 interface Account {
-  id: string,
-  name: string,
-  lastSignerType: SignerType,
-  active: boolean,
-  address: Address,
-  status: AccountStatus,
-  signer: string,
-  smart?: SmartAccount,
-  requests: Record<string, any>,
-  ensName: string,
-  created: string,
+  id: string
+  name: string
+  lastSignerType: SignerType
+  active: boolean
+  address: Address
+  status: AccountStatus
+  signer: string
+  smart?: SmartAccount
+  requests: Record<string, any>
+  ensName: string
+  created: string
   balances: {
     lastUpdated?: number
   }
 }
 
 interface SmartAccount {
-  name: string,
-  chain: Chain,
-  type: string,
-  actor: any, // TODO: is this an address or an object?
-  agent: Address,
-  ens: string,
-  apps: any,
+  name: string
+  chain: Chain
+  type: string
+  actor: any // TODO: is this an address or an object?
+  agent: Address
+  ens: string
+  apps: any
   dao: any
 }
diff --git a/app/App/Badge/index.js b/app/App/Badge/index.js
index 1944e07d7..70ac98abc 100644
--- a/app/App/Badge/index.js
+++ b/app/App/Badge/index.js
@@ -3,23 +3,25 @@ import Restore from 'react-restore'
 import link from '../../../resources/link'
 
 class Bridge extends React.Component {
-  render () {
+  render() {
     if (this.store('view.badge') === 'updateReady') {
       return (
         <div className='badgeWrap'>
           <div className='badge cardShow' style={{ transform: 'translateY(0px)', height: '196px' }}>
             <div className='badgeInner'>
-              <div className='badgeMessage'>
-                Your update is ready, relaunch Frame to switch
-              </div>
+              <div className='badgeMessage'>Your update is ready, relaunch Frame to switch</div>
               <div className='badgeInput'>
                 <div className='badgeInputButton'>
-                  <div className='badgeInputInner' onMouseDown={() => this.store.updateBadge()}>Ok</div>
+                  <div className='badgeInputInner' onMouseDown={() => this.store.updateBadge()}>
+                    Ok
+                  </div>
                 </div>
               </div>
               <div className='badgeInput'>
                 <div className='badgeInputButton'>
-                  <div className='badgeInputInner' onMouseDown={() => link.send('tray:updateRestart')}>Relaunch Now</div>
+                  <div className='badgeInputInner' onMouseDown={() => link.send('tray:updateRestart')}>
+                    Relaunch Now
+                  </div>
                 </div>
               </div>
             </div>
@@ -31,38 +33,42 @@ class Bridge extends React.Component {
         <div className='badgeWrap'>
           <div className='badge cardShow' style={{ transform: 'translateY(0px)', height: '224px' }}>
             <div className='badgeInner'>
-              <div className='badgeMessage'>
-                A new update is available, would you like to install it?
-              </div>
+              <div className='badgeMessage'>A new update is available, would you like to install it?</div>
               <div className='badgeInput'>
                 <div className='badgeInputButton'>
                   <div
-                    className='badgeInputInner' onMouseDown={() => {
+                    className='badgeInputInner'
+                    onMouseDown={() => {
                       link.send('tray:installAvailableUpdate', true, false)
                     }}
                     style={{ color: 'var(--good)' }}
-                  >Install Update
+                  >
+                    Install Update
                   </div>
                 </div>
               </div>
               <div className='badgeInput'>
                 <div className='badgeInputButton'>
                   <div
-                    className='badgeInputInner' onMouseDown={() => {
+                    className='badgeInputInner'
+                    onMouseDown={() => {
                       link.send('tray:installAvailableUpdate', false, false)
                     }}
                     style={{ color: 'var(--moon)' }}
-                  >Remind Me Later
+                  >
+                    Remind Me Later
                   </div>
                 </div>
               </div>
               <div className='badgeInput'>
                 <div className='badgeInputButton'>
                   <div
-                    className='badgeInputInner badgeInputSmall' onMouseDown={() => {
+                    className='badgeInputInner badgeInputSmall'
+                    onMouseDown={() => {
                       link.send('tray:installAvailableUpdate', false, true)
                     }}
-                  >Skip This Version
+                  >
+                    Skip This Version
                   </div>
                 </div>
               </div>
diff --git a/app/App/Main/Account/Activity/index.js b/app/App/Main/Account/Activity/index.js
index f9555aeec..c75f1ea25 100644
--- a/app/App/Main/Account/Activity/index.js
+++ b/app/App/Main/Account/Activity/index.js
@@ -3,31 +3,31 @@ import Restore from 'react-restore'
 import link from '../../../../../resources/link'
 
 class Balances extends React.Component {
-  constructor (...args) {
+  constructor(...args) {
     super(...args)
     this.moduleRef = React.createRef()
     this.resizeObserver = new ResizeObserver(() => {
       if (this.moduleRef && this.moduleRef.current) {
-        link.send('tray:action', 'updateAccountModule', this.props.moduleId, { height: this.moduleRef.current.clientHeight })
+        link.send('tray:action', 'updateAccountModule', this.props.moduleId, {
+          height: this.moduleRef.current.clientHeight,
+        })
       }
     })
     this.state = {
-      expand: false
+      expand: false,
     }
   }
-  componentDidMount () {
+  componentDidMount() {
     this.resizeObserver.observe(this.moduleRef.current)
-  } 
-  render () {
+  }
+  render() {
     return (
       <div ref={this.moduleRef} className='balancesBlock'>
-        <div className='moduleHeader'>{'activity monitor'}</div>  
-        <div className='moduleComingSoon'>
-          {'Coming Soon'}
-        </div>  
+        <div className='moduleHeader'>{'activity monitor'}</div>
+        <div className='moduleComingSoon'>{'Coming Soon'}</div>
       </div>
     )
   }
 }
 
-export default Restore.connect(Balances)
\ No newline at end of file
+export default Restore.connect(Balances)
diff --git a/app/App/Main/Account/Balances/index.js b/app/App/Main/Account/Balances/index.js
index 6dc9cde40..a6f1ca6ff 100644
--- a/app/App/Main/Account/Balances/index.js
+++ b/app/App/Main/Account/Balances/index.js
@@ -14,30 +14,30 @@ import BigNumber from 'bignumber.js'
 const UNKNOWN = '?'
 const NATIVE_CURRENCY = '0x0000000000000000000000000000000000000000'
 
-function isNativeCurrency (address) {
+function isNativeCurrency(address) {
   return address === NATIVE_CURRENCY
 }
 
-function formatBalance (balance, totalValue, decimals = 8) {
+function formatBalance(balance, totalValue, decimals = 8) {
   const isZero = balance.isZero()
   if (!isZero && balance.toNumber() < 0.001 && totalValue.toNumber() < 1) return '<0.001'
 
   return new Intl.NumberFormat('us-US', {
-        minimumFractionDigits: 2,
-        maximumFractionDigits: 8
-      }).format(balance.toFixed(decimals, BigNumber.ROUND_FLOOR))
+    minimumFractionDigits: 2,
+    maximumFractionDigits: 8,
+  }).format(balance.toFixed(decimals, BigNumber.ROUND_FLOOR))
 }
 
-function formatUsdRate (rate, decimals = 2) {
+function formatUsdRate(rate, decimals = 2) {
   return rate.isNaN()
     ? UNKNOWN
     : new Intl.NumberFormat('us-US', {
         minimumFractionDigits: decimals,
-        maximumFractionDigits: decimals
+        maximumFractionDigits: decimals,
       }).format(rate.toFixed(decimals, BigNumber.ROUND_FLOOR))
 }
 
-function balance (rawBalance, quote = {}) {
+function balance(rawBalance, quote = {}) {
   const balance = BigNumber(rawBalance.balance || 0).shiftedBy(-rawBalance.decimals)
   const usdRate = BigNumber(quote.price)
   const totalValue = balance.times(usdRate)
@@ -49,11 +49,10 @@ function balance (rawBalance, quote = {}) {
     price: formatUsdRate(usdRate),
     priceChange: !usdRate.isNaN() && BigNumber(quote['change24hr'] || 0).toFixed(2),
     totalValue: totalValue.isNaN() ? BigNumber(0) : totalValue,
-    displayValue: formatUsdRate(totalValue, 0)
+    displayValue: formatUsdRate(totalValue, 0),
   }
 }
 
-
 class Balance extends React.Component {
   // constructor (...args) {
   //   super(...args)
@@ -68,7 +67,7 @@ class Balance extends React.Component {
   //   }, 200)
   // }
 
-  render () {
+  render() {
     const { symbol, balance, i, scanning, chainId } = this.props
     const change = parseFloat(balance.priceChange)
     const direction = change < 0 ? -1 : change > 0 ? 1 : 0
@@ -86,47 +85,55 @@ class Balance extends React.Component {
     const chainHex = '0x' + chainId.toString(16)
 
     return (
-      <div className={i === 0 ? 'signerBalance signerBalanceBase' : 'signerBalance'} key={symbol} onMouseDown={() => this.setState({ selected: i })}>
+      <div
+        className={i === 0 ? 'signerBalance signerBalanceBase' : 'signerBalance'}
+        key={symbol}
+        onMouseDown={() => this.setState({ selected: i })}
+      >
         <div className='signerBalanceInner' style={{ opacity: !scanning ? 1 : 0 }}>
           <div className='signerBalanceIcon'>
-            <RingIcon 
-              img={balance.logoURI && symbol.toUpperCase() !== 'ETH' && `https://proxy.pylon.link?type=icon&target=${encodeURIComponent(balance.logoURI)}`}
+            <RingIcon
+              img={
+                balance.logoURI &&
+                symbol.toUpperCase() !== 'ETH' &&
+                `https://proxy.pylon.link?type=icon&target=${encodeURIComponent(balance.logoURI)}`
+              }
               alt={symbol.toUpperCase()}
-              color={chainMeta[chainHex] ? chainMeta[chainHex].primaryColor : '' }
+              color={chainMeta[chainHex] ? chainMeta[chainHex].primaryColor : ''}
             />
           </div>
-          <div 
+          <div
             className='signerBalanceChain'
             style={{ color: chainMeta[chainHex] ? chainMeta[chainHex].primaryColor : '' }}
           >
-            {chainMeta[chainHex] ? chainMeta[chainHex].name : '' }
-          </div>
-          <div className='signerBalanceCurrency'>
-            {name}
+            {chainMeta[chainHex] ? chainMeta[chainHex].name : ''}
           </div>
-          <div className='signerBalanceValue' style={(balance.displayBalance || '0').length >= 12 ? { fontSize: '15px', top: '10px' } : {}}>
-            <span 
-              className='signerBalanceSymbol'
-            >
-              {symbol.toUpperCase()}
-            </span>
-            <span
-              style={(balance.displayBalance || '0').length >= 12 ? { marginTop: '-3px' } : {}}
-            >
+          <div className='signerBalanceCurrency'>{name}</div>
+          <div
+            className='signerBalanceValue'
+            style={(balance.displayBalance || '0').length >= 12 ? { fontSize: '15px', top: '10px' } : {}}
+          >
+            <span className='signerBalanceSymbol'>{symbol.toUpperCase()}</span>
+            <span style={(balance.displayBalance || '0').length >= 12 ? { marginTop: '-3px' } : {}}>
               {balance.displayBalance}
             </span>
           </div>
           <div className='signerBalancePrice'>
             <div className='signerBalanceOk'>
               <span className='signerBalanceCurrentPrice'>
-                {svg.usd(10)}{balance.price}
+                {svg.usd(10)}
+                {balance.price}
               </span>
               <span className={priceChangeClass}>
-                <span>({direction === 1 ? '+' : ''}{balance.priceChange ? balance.priceChange + '%' : ''})</span>
+                <span>
+                  ({direction === 1 ? '+' : ''}
+                  {balance.priceChange ? balance.priceChange + '%' : ''})
+                </span>
               </span>
             </div>
             <div className='signerBalanceCurrentValue'>
-              {svg.usd(10)}{balance.displayValue}
+              {svg.usd(10)}
+              {balance.displayValue}
             </div>
           </div>
         </div>
@@ -136,7 +143,7 @@ class Balance extends React.Component {
 }
 
 class Balances extends React.Component {
-  constructor (...args) {
+  constructor(...args) {
     super(...args)
     this.moduleRef = React.createRef()
     if (!this.props.expanded) {
@@ -144,7 +151,9 @@ class Balances extends React.Component {
         if (this.moduleRef && this.moduleRef.current) {
           clearTimeout(this.resizeTimer)
           this.resizeTimer = setTimeout(() => {
-            link.send('tray:action', 'updateAccountModule', this.props.moduleId, { height: this.moduleRef.current.clientHeight })
+            link.send('tray:action', 'updateAccountModule', this.props.moduleId, {
+              height: this.moduleRef.current.clientHeight,
+            })
           }, 100)
         }
       })
@@ -155,26 +164,26 @@ class Balances extends React.Component {
       open: false,
       selected: 0,
       shadowTop: 0,
-      expand: false
+      expand: false,
     }
   }
 
-  componentDidMount () {
+  componentDidMount() {
     if (this.resizeObserver) this.resizeObserver.observe(this.moduleRef.current)
   }
 
-  componentWillUnmount () {
+  componentWillUnmount() {
     if (this.resizeObserver) this.resizeObserver.disconnect()
   }
 
-  getBalances (rawBalances, rates) {
+  getBalances(rawBalances, rates) {
     const networks = this.store('main.networks.ethereum')
     const networksMeta = this.store('main.networksMeta.ethereum')
 
     const balances = rawBalances
       // only show balances from connected networks
-      .filter(rawBalance => isNetworkConnected(networks[rawBalance.chainId]))
-      .map(rawBalance => {
+      .filter((rawBalance) => isNetworkConnected(networks[rawBalance.chainId]))
+      .map((rawBalance) => {
         const isNative = isNativeCurrency(rawBalance.address)
         const nativeCurrencyInfo = networksMeta[rawBalance.chainId].nativeCurrency || {}
 
@@ -195,7 +204,7 @@ class Balances extends React.Component {
     return { balances, totalDisplayValue: formatUsdRate(totalValue, 0), totalValue }
   }
 
-  render () {
+  render() {
     const { address, lastSignerType } = this.store('main.accounts', this.props.id)
     const storedBalances = this.store('main.balances', address) || []
     const rates = this.store('main.rates')
@@ -206,17 +215,21 @@ class Balances extends React.Component {
     const lastBalanceUpdate = this.store('main.accounts', address, 'balances.lastUpdated')
 
     // scan if balances are more than a minute old
-    const scanning = !lastBalanceUpdate || (new Date() - new Date(lastBalanceUpdate)) > (1000 * 60)
+    const scanning = !lastBalanceUpdate || new Date() - new Date(lastBalanceUpdate) > 1000 * 60
     const hotSigner = ['ring', 'seed'].includes(lastSignerType)
 
     return (
-      <div 
+      <div
         ref={this.moduleRef}
         className='balancesBlock'
-        style={this.props.expanded ? {
-          height: '100%',
-          overflowY: 'scroll'
-        }: {}}
+        style={
+          this.props.expanded
+            ? {
+                height: '100%',
+                overflowY: 'scroll',
+              }
+            : {}
+        }
       >
         <div className={'moduleHeader moduleHeaderBorderless'}>
           <span>balances</span>
@@ -236,46 +249,51 @@ class Balances extends React.Component {
             return <Balance chainId={chainId} symbol={symbol} balance={balance} i={i} scanning={scanning} />
           })}
         </div>
-        <div 
-          className='signerBalanceTotal'
-          style={{ opacity: !scanning ? 1 : 0 }}
-        >
+        <div className='signerBalanceTotal' style={{ opacity: !scanning ? 1 : 0 }}>
           {!this.props.expanded ? (
             <div className='signerBalanceButtons'>
-              <div className='signerBalanceButton signerBalanceShowAll' onMouseDown={() => this.props.expandModule(this.props.moduleId)}>
+              <div
+                className='signerBalanceButton signerBalanceShowAll'
+                onMouseDown={() => this.props.expandModule(this.props.moduleId)}
+              >
                 {allBalances.length - 4 > 0 ? `+${allBalances.length - 4} More` : 'More'}
               </div>
             </div>
           ) : (
             <div className='signerBalanceButtons'>
-              <div className='signerBalanceButton signerBalanceAddToken' onMouseDown={() => {
-                link.send('tray:action', 'navDash', { view: 'tokens', data: { notify: 'addToken' }})
-              }}>
+              <div
+                className='signerBalanceButton signerBalanceAddToken'
+                onMouseDown={() => {
+                  link.send('tray:action', 'navDash', {
+                    view: 'tokens',
+                    data: { notify: 'addToken' },
+                  })
+                }}
+              >
                 <span>Add Token</span>
               </div>
             </div>
           )}
           <div className='signerBalanceTotalText'>
-            <div className='signerBalanceTotalLabel'>
-              {'Total: '}
-            </div>
+            <div className='signerBalanceTotalLabel'>{'Total: '}</div>
             <div className='signerBalanceTotalValue'>
-              {svg.usd(11)}{balances.length > 0 ? totalDisplayValue : '---.--'}
+              {svg.usd(11)}
+              {balances.length > 0 ? totalDisplayValue : '---.--'}
             </div>
           </div>
         </div>
         {totalValue.toNumber() > 10000 && hotSigner ? (
-          <div 
+          <div
             className='signerBalanceWarning'
             onClick={() => this.setState({ showHighHotMessage: !this.state.showHighHotMessage })}
             style={scanning ? { opacity: 0 } : { opacity: 1 }}
           >
-            <div className='signerBalanceWarningTitle'>
-              {'high value account is using hot signer'}
-            </div>
-            {this.state.showHighHotMessage ? <div className='signerBalanceWarningMessage'>
-              {'We recommend using one of our supported hardware signers to increase the security of your account'}
-            </div> : null}
+            <div className='signerBalanceWarningTitle'>{'high value account is using hot signer'}</div>
+            {this.state.showHighHotMessage ? (
+              <div className='signerBalanceWarningMessage'>
+                {'We recommend using one of our supported hardware signers to increase the security of your account'}
+              </div>
+            ) : null}
           </div>
         ) : null}
       </div>
diff --git a/app/App/Main/Account/Default/index.js b/app/App/Main/Account/Default/index.js
index e40223c3f..3a8a29b45 100644
--- a/app/App/Main/Account/Default/index.js
+++ b/app/App/Main/Account/Default/index.js
@@ -2,22 +2,24 @@ import React from 'react'
 import Restore from 'react-restore'
 
 class Block extends React.Component {
-  constructor (props, context) {
+  constructor(props, context) {
     super(props, context)
     this.moduleRef = React.createRef()
     this.resizeObserver = new ResizeObserver(() => {
       if (this.moduleRef && this.moduleRef.current) {
-        link.send('tray:action', 'updateAccountModule', props.id, { height: this.moduleRef.current.clientHeight })
+        link.send('tray:action', 'updateAccountModule', props.id, {
+          height: this.moduleRef.current.clientHeight,
+        })
       }
     })
   }
-  componentDidMount () {
+  componentDidMount() {
     this.resizeObserver.observe(this.moduleRef.current)
-  } 
-  componentWillUnmount () {
+  }
+  componentWillUnmount() {
     this.resizeObserver.disconnect()
   }
-  render () {
+  render() {
     return (
       <div ref={this.moduleRef}>
         <div className='moduleHeader'>{this.props.moduleId}</div>
@@ -29,4 +31,4 @@ class Block extends React.Component {
   }
 }
 
-export default Restore.connect(Block)
\ No newline at end of file
+export default Restore.connect(Block)
diff --git a/app/App/Main/Account/Gas/index.js b/app/App/Main/Account/Gas/index.js
index 053dcc8e5..4d20bc1fb 100644
--- a/app/App/Main/Account/Gas/index.js
+++ b/app/App/Main/Account/Gas/index.js
@@ -12,71 +12,105 @@ const gasToSendToken = 65 * 1000
 const gasForDexSwap = 200 * 1000
 
 class Gas extends React.Component {
-  constructor (...args) {
+  constructor(...args) {
     super(...args)
     this.moduleRef = React.createRef()
     this.resizeObserver = new ResizeObserver(() => {
       if (this.moduleRef && this.moduleRef.current) {
-        link.send('tray:action', 'updateAccountModule', this.props.moduleId, { height: this.moduleRef.current.clientHeight })
+        link.send('tray:action', 'updateAccountModule', this.props.moduleId, {
+          height: this.moduleRef.current.clientHeight,
+        })
       }
     })
     this.state = {
-      expand: false
+      expand: false,
     }
   }
-  componentDidMount () {
+  componentDidMount() {
     this.resizeObserver.observe(this.moduleRef.current)
-  } 
-  renderFeeTime (time) {
-    if (!time) return <>?<span className='timeUnit'>?</span></>
-    if (time < 60) return <><span className='timeUnit'>~</span>{time}<span className='timeUnit'>s</span></>
-    if (time < 3600) return <><span className='timeUnit'>~</span>{Math.round(time / 60)}<span className='timeUnit'>m</span></>
-    return <><span className='timeUnit'>~</span>{Math.round(time / 3600)}<span className='timeUnit'>h</span></>
   }
-  toDisplayUSD (bn) {
+  renderFeeTime(time) {
+    if (!time)
+      return (
+        <>
+          ?<span className='timeUnit'>?</span>
+        </>
+      )
+    if (time < 60)
+      return (
+        <>
+          <span className='timeUnit'>~</span>
+          {time}
+          <span className='timeUnit'>s</span>
+        </>
+      )
+    if (time < 3600)
+      return (
+        <>
+          <span className='timeUnit'>~</span>
+          {Math.round(time / 60)}
+          <span className='timeUnit'>m</span>
+        </>
+      )
+    return (
+      <>
+        <span className='timeUnit'>~</span>
+        {Math.round(time / 3600)}
+        <span className='timeUnit'>h</span>
+      </>
+    )
+  }
+  toDisplayUSD(bn) {
     return parseFloat(
-      bn.toNumber() >= 1 ? bn.toFixed(0, BigNumber.ROUND_UP).toString() :
-      bn.toFixed(2, BigNumber.ROUND_UP).toString()     
+      bn.toNumber() >= 1 ? bn.toFixed(0, BigNumber.ROUND_UP).toString() : bn.toFixed(2, BigNumber.ROUND_UP).toString()
     )
   }
-  roundGwei (gwei) {
+  roundGwei(gwei) {
     if (gwei && gwei < 0.001) return '‹0.001'
     return parseFloat(
-      gwei >= 10 ? Math.round(gwei) :
-      gwei >= 5 ? Math.round(gwei * 10) / 10 :
-      gwei >= 1 ? Math.round(gwei * 100) / 100 :
-      Math.round(gwei * 1000) / 1000
+      gwei >= 10
+        ? Math.round(gwei)
+        : gwei >= 5
+        ? Math.round(gwei * 10) / 10
+        : gwei >= 1
+        ? Math.round(gwei * 100) / 100
+        : Math.round(gwei * 1000) / 1000
     )
   }
-  levelDisplay (level) {
-    const gwei = weiToGwei(hexToInt(level)) 
+  levelDisplay(level) {
+    const gwei = weiToGwei(hexToInt(level))
     return this.roundGwei(gwei) || 0
   }
 
-  txEstimate (value, gasLimit, nativeUSD) {
-    return this.toDisplayUSD(BigNumber(value * gasLimit).shiftedBy(-9).multipliedBy(nativeUSD))
+  txEstimate(value, gasLimit, nativeUSD) {
+    return this.toDisplayUSD(
+      BigNumber(value * gasLimit)
+        .shiftedBy(-9)
+        .multipliedBy(nativeUSD)
+    )
   }
 
-  txEstimates (type, id, gasPrice, calculatedFees, currentSymbol) {
-
+  txEstimates(type, id, gasPrice, calculatedFees, currentSymbol) {
     const estimates = [
       {
         label: 'Send ' + currentSymbol,
-        estimatedGas: gasToSendEth
+        estimatedGas: gasToSendEth,
       },
       {
         label: 'Send Tokens',
-        estimatedGas: gasToSendToken
+        estimatedGas: gasToSendToken,
       },
       {
         label: 'Dex Swap',
-        estimatedGas: gasForDexSwap
-      }
+        estimatedGas: gasForDexSwap,
+      },
     ]
 
     const layer = this.store('main.networks', type, id, 'layer')
     const nativeCurrency = this.store('main.networksMeta', type, id, 'nativeCurrency')
-    const nativeUSD = BigNumber(nativeCurrency && nativeCurrency.usd && layer !== 'testnet' ? nativeCurrency.usd.price : 0)
+    const nativeUSD = BigNumber(
+      nativeCurrency && nativeCurrency.usd && layer !== 'testnet' ? nativeCurrency.usd.price : 0
+    )
 
     if (id === 10) {
       // Optimism specific calculations
@@ -93,58 +127,63 @@ class Gas extends React.Component {
         return this.toDisplayUSD(l1Estimate.plus(l2Estimate).shiftedBy(-9).multipliedBy(nativeUSD))
       }
 
-      return estimates.map(({ label, estimatedGas }, i) => (
-        {
-          low: optimismEstimate(l1GasEstimates[i], estimatedGas),
-          high: optimismEstimate(l1GasEstimates[i], estimatedGas),
-          label
-        }
-      ))
+      return estimates.map(({ label, estimatedGas }, i) => ({
+        low: optimismEstimate(l1GasEstimates[i], estimatedGas),
+        high: optimismEstimate(l1GasEstimates[i], estimatedGas),
+        label,
+      }))
     } else {
       const low = calculatedFees ? this.roundGwei(calculatedFees.actualBaseFee + calculatedFees.priorityFee) : gasPrice
 
-      return estimates.map(({ label, estimatedGas }) => (
-        {
-          low: this.txEstimate(low, estimatedGas, nativeUSD),
-          high: this.txEstimate(gasPrice, estimatedGas, nativeUSD),
-          label
-        }
-      ))
+      return estimates.map(({ label, estimatedGas }) => ({
+        low: this.txEstimate(low, estimatedGas, nativeUSD),
+        high: this.txEstimate(gasPrice, estimatedGas, nativeUSD),
+        label,
+      }))
     }
   }
 
-  render () {
+  render() {
     const { type, id } = this.store('main.currentNetwork')
     const levels = this.store('main.networksMeta', type, id, 'gas.price.levels')
     const fees = this.store('main.networksMeta', type, id, 'gas.price.fees')
     const currentSymbol = this.store('main.networks', type, id, 'symbol') || 'ETH'
     const gasPrice = this.levelDisplay(levels.fast)
 
-    const { nextBaseFee, maxPriorityFeePerGas } = (fees || {})
+    const { nextBaseFee, maxPriorityFeePerGas } = fees || {}
 
     const calculatedFees = {
-      actualBaseFee: this.roundGwei((weiToGwei(hexToInt(nextBaseFee)))),
-      priorityFee: this.levelDisplay(maxPriorityFeePerGas)
+      actualBaseFee: this.roundGwei(weiToGwei(hexToInt(nextBaseFee))),
+      priorityFee: this.levelDisplay(maxPriorityFeePerGas),
     }
 
     const feeEstimatesUSD = this.txEstimates(type, id, gasPrice, fees ? calculatedFees : null, currentSymbol)
 
     return (
       <div ref={this.moduleRef}>
-        <div className='moduleHeader'>{'Fee Monitor'}</div>  
+        <div className='moduleHeader'>{'Fee Monitor'}</div>
         <div className='gasBlock'>
-          {this.state.baseHover ? <div className='feeToolTip feeToolTipBase cardShow'>The current base fee is added with a buffer to cover the next 3 blocks, any amount greater than your block's base fee is refunded</div> : null}
-          {this.state.prioHover ? <div className='feeToolTip feeToolTipPriority cardShow'>A priority tip paid to validators is added to incentivize quick inclusion of your transaction into a block</div> : null }
-          <div className='gasItem gasItemSmall' style={ !fees ? { pointerEvents: 'none', opacity: 0 } : {}}>
+          {this.state.baseHover ? (
+            <div className='feeToolTip feeToolTipBase cardShow'>
+              The current base fee is added with a buffer to cover the next 3 blocks, any amount greater than your
+              block's base fee is refunded
+            </div>
+          ) : null}
+          {this.state.prioHover ? (
+            <div className='feeToolTip feeToolTipPriority cardShow'>
+              A priority tip paid to validators is added to incentivize quick inclusion of your transaction into a block
+            </div>
+          ) : null}
+          <div className='gasItem gasItemSmall' style={!fees ? { pointerEvents: 'none', opacity: 0 } : {}}>
             <span className='gasGweiNum'>{calculatedFees.actualBaseFee}</span>
             <span className='gasGweiLabel'>{'GWEI'}</span>
             <span className='gasLevelLabel'>{'Current Base'}</span>
           </div>
           <div className='gasItem gasItemLarge'>
-            <div 
-              className='gasArrow' 
+            <div
+              className='gasArrow'
               onClick={() => this.setState({ baseHover: true })}
-              style={ !fees ? { pointerEvents: 'none', opacity: 0 } : {}}
+              style={!fees ? { pointerEvents: 'none', opacity: 0 } : {}}
               onMouseLeave={() => this.setState({ baseHover: false })}
             >
               <div className='gasArrowNotify'>+</div>
@@ -153,28 +192,32 @@ class Gas extends React.Component {
             <span className='gasGweiNum'>{gasPrice}</span>
             <span className='gasGweiLabel'>{'GWEI'}</span>
             <span className='gasLevelLabel'>{'Recommended'}</span>
-            <div 
+            <div
               className='gasArrow gasArrowRight'
-              style={ !fees ? { pointerEvents: 'none', opacity: 0 } : {}}
+              style={!fees ? { pointerEvents: 'none', opacity: 0 } : {}}
               onClick={() => this.setState({ prioHover: true })}
               onMouseLeave={() => this.setState({ prioHover: false })}
             >
               <div className='gasArrowInner'>{svg.chevron(27)}</div>
             </div>
           </div>
-          <div className='gasItem gasItemSmall' style={ !fees ? { pointerEvents: 'none', opacity: 0 } : {}}>
+          <div className='gasItem gasItemSmall' style={!fees ? { pointerEvents: 'none', opacity: 0 } : {}}>
             <span className='gasGweiNum'>{calculatedFees.priorityFee}</span>
             <span className='gasGweiLabel'>{'GWEI'}</span>
             <span className='gasLevelLabel'>{'Priority Tip'}</span>
           </div>
         </div>
         <div className='gasEstimateBlock'>
-          {feeEstimatesUSD.map((estimate) =>{
+          {feeEstimatesUSD.map((estimate) => {
             return (
               <div className='gasEstimate'>
                 <div className='gasEstimateRange'>
-                  <span style={{ fontSize: '11px', marginRight: '-2px', marginTop: '-1px' }}>{!estimate.low || estimate.low >= 1 ? `$` : '<$'}</span>
-                  <span className='gasEstimateRangeLow'>{`${!estimate.low ? 0 : estimate.low < 1 ? 1 : estimate.low}`}</span>
+                  <span style={{ fontSize: '11px', marginRight: '-2px', marginTop: '-1px' }}>
+                    {!estimate.low || estimate.low >= 1 ? `$` : '<$'}
+                  </span>
+                  <span className='gasEstimateRangeLow'>{`${
+                    !estimate.low ? 0 : estimate.low < 1 ? 1 : estimate.low
+                  }`}</span>
                 </div>
                 <div className='gasEstimateLabel'>{estimate.label}</div>
               </div>
diff --git a/app/App/Main/Account/Inventory/index.js b/app/App/Main/Account/Inventory/index.js
index 76ce49e3e..ad5d13725 100644
--- a/app/App/Main/Account/Inventory/index.js
+++ b/app/App/Main/Account/Inventory/index.js
@@ -4,31 +4,33 @@ import link from '../../../../../resources/link'
 import svg from '../../../../../resources/svg'
 
 class Inventory extends React.Component {
-  constructor (...args) {
+  constructor(...args) {
     super(...args)
     this.moduleRef = React.createRef()
     if (!this.props.expanded) {
       this.resizeObserver = new ResizeObserver(() => {
         if (this.moduleRef && this.moduleRef.current) {
-          link.send('tray:action', 'updateAccountModule', this.props.moduleId, { height: this.moduleRef.current.clientHeight })
+          link.send('tray:action', 'updateAccountModule', this.props.moduleId, {
+            height: this.moduleRef.current.clientHeight,
+          })
         }
       })
     }
     this.state = {
       expand: false,
-      hoverAsset: false
+      hoverAsset: false,
     }
   }
 
-  componentDidMount () {
+  componentDidMount() {
     if (this.resizeObserver) this.resizeObserver.observe(this.moduleRef.current)
   }
 
-  componentWillUnmount () {
+  componentWillUnmount() {
     if (this.resizeObserver) this.resizeObserver.disconnect()
   }
 
-  render () {
+  render() {
     const inventory = this.store('main.inventory', this.props.id)
     const collections = Object.keys(inventory || {})
     return (
@@ -36,105 +38,135 @@ class Inventory extends React.Component {
         <div className='moduleHeader'>
           {'Inventory'}
           {this.props.expanded ? (
-            <div className='moduleHeaderClose' onMouseDown={() => {
-              this.props.expandModule(false)
-            }}>
+            <div
+              className='moduleHeaderClose'
+              onMouseDown={() => {
+                this.props.expandModule(false)
+              }}
+            >
               {svg.close(12)}
             </div>
           ) : null}
-        </div>  
+        </div>
         <div>
-          {collections.length ? collections.filter(k => {
-            if (this.props.expanded) {
-              const expandedData = this.props.expandedData || {}
-              const current = expandedData.currentCollection
-              return current === k
-            } else {
-              return true
-            }
-          }).sort((a, b) => {
-            const assetsLengthA = Object.keys(inventory[a].items).length
-            const assetsLengthB = Object.keys(inventory[b].items).length
-            if (assetsLengthA > assetsLengthB) return -1
-            if (assetsLengthA < assetsLengthB) return 1
-            return 0
-          }).map(k => {
-            return (
-              <div 
-                className='inventoryCollection'
-                onClick={() => {
-                  this.props.expandModule(this.props.moduleId, { currentCollection: k })
-                }}
-                style={this.props.expanded ? {
-                  position: 'absolute',
-                  top: '30px',
-                  right: '0',
-                  bottom: '0',
-                  left: '0'
-                } : {}}
-              >
-                {this.props.expanded ? (
-                  <>
-                    <div className='inventoryPreview'>
-                      {this.state.hoverAsset ? (
-                        <div className='inventoryPreviewMedia'>
-                          {this.state.hoverAsset.img ? <img src={`https://proxy.pylon.link?type=nft&target=${encodeURIComponent(this.state.hoverAsset.img)}`} /> : null}
+          {collections.length ? (
+            collections
+              .filter((k) => {
+                if (this.props.expanded) {
+                  const expandedData = this.props.expandedData || {}
+                  const current = expandedData.currentCollection
+                  return current === k
+                } else {
+                  return true
+                }
+              })
+              .sort((a, b) => {
+                const assetsLengthA = Object.keys(inventory[a].items).length
+                const assetsLengthB = Object.keys(inventory[b].items).length
+                if (assetsLengthA > assetsLengthB) return -1
+                if (assetsLengthA < assetsLengthB) return 1
+                return 0
+              })
+              .map((k) => {
+                return (
+                  <div
+                    className='inventoryCollection'
+                    onClick={() => {
+                      this.props.expandModule(this.props.moduleId, { currentCollection: k })
+                    }}
+                    style={
+                      this.props.expanded
+                        ? {
+                            position: 'absolute',
+                            top: '30px',
+                            right: '0',
+                            bottom: '0',
+                            left: '0',
+                          }
+                        : {}
+                    }
+                  >
+                    {this.props.expanded ? (
+                      <>
+                        <div className='inventoryPreview'>
+                          {this.state.hoverAsset ? (
+                            <div className='inventoryPreviewMedia'>
+                              {this.state.hoverAsset.img ? (
+                                <img
+                                  src={`https://proxy.pylon.link?type=nft&target=${encodeURIComponent(
+                                    this.state.hoverAsset.img
+                                  )}`}
+                                />
+                              ) : null}
+                            </div>
+                          ) : (
+                            <div
+                              className='inventoryPreviewCollection'
+                              style={
+                                inventory[k].meta.image
+                                  ? {
+                                      backgroundImage: `url(https://proxy.pylon.link?type=nft&target=${encodeURIComponent(
+                                        inventory[k].meta.image
+                                      )})`,
+                                    }
+                                  : {}
+                              }
+                            />
+                          )}
+                        </div>
+                        <div className='inventoryPreviewTitle'>
+                          {this.state.hoverAsset ? this.state.hoverAsset.name : inventory[k].meta.name}
+                        </div>
+                        <div className='inventoryCollectionItems'>
+                          {Object.keys(inventory[k].items || {})
+                            .sort((a, b) => {
+                              a = inventory[k].items[a].tokenId
+                              b = inventory[k].items[b].tokenId
+                              return a < b ? -1 : b > a ? 1 : 0
+                            })
+                            .map((id) => {
+                              const { tokenId, name, img, openSeaLink } = inventory[k].items[id]
+                              return (
+                                <div
+                                  className='inventoryCollectionItem'
+                                  onClick={() => {
+                                    this.store.notify('openExternal', { url: openSeaLink })
+                                  }}
+                                  onMouseEnter={() => {
+                                    this.setState({
+                                      hoverAsset: {
+                                        name,
+                                        tokenId,
+                                        img,
+                                      },
+                                    })
+                                  }}
+                                  onMouseLeave={() => {
+                                    this.setState({
+                                      hoverAsset: false,
+                                    })
+                                  }}
+                                >
+                                  {img ? (
+                                    <img src={`https://proxy.pylon.link?type=nft&target=${encodeURIComponent(img)}`} />
+                                  ) : null}
+                                </div>
+                              )
+                            })}
+                          <div className='inventoryCollectionLine' />
                         </div>
-                      ) : (
-                        <div 
-                          className='inventoryPreviewCollection'
-                          style={inventory[k].meta.image ? {
-                            backgroundImage: `url(https://proxy.pylon.link?type=nft&target=${encodeURIComponent(inventory[k].meta.image)})`
-                          } : {}}
-                        />
-                      )}
-                    </div>
-                    <div className='inventoryPreviewTitle'>{this.state.hoverAsset ? this.state.hoverAsset.name : inventory[k].meta.name}</div>
-                    <div className='inventoryCollectionItems'>
-                      {Object.keys(inventory[k].items || {}).sort((a, b) => {
-                        a = inventory[k].items[a].tokenId
-                        b = inventory[k].items[b].tokenId
-                        return a < b ? -1 : b > a ? 1 : 0
-                      }).map(id => {
-                        const { tokenId, name, img, openSeaLink } = inventory[k].items[id]
-                        return (
-                          <div 
-                            className='inventoryCollectionItem'
-                            onClick={() => {
-                              this.store.notify('openExternal', { url: openSeaLink })
-                            }}
-                            onMouseEnter={() => {
-                              this.setState({
-                                hoverAsset: {
-                                  name,
-                                  tokenId,
-                                  img
-                                }
-                              })
-                            }}
-                            onMouseLeave={() => {
-                              this.setState({
-                                hoverAsset: false
-                              })
-                            }}
-                          >
-                            {img ? <img src={`https://proxy.pylon.link?type=nft&target=${encodeURIComponent(img)}`} /> : null}
-                          </div>
-                        )
-                      })}
-                      <div className='inventoryCollectionLine' />
-                    </div>
-                  </>
-                ) : (
-                  <div className='inventoryCollectionTop'>
-                    <div className='inventoryCollectionName'>{inventory[k].meta.name}</div>
-                    <div className='inventoryCollectionCount'>{Object.keys(inventory[k].items).length}</div>
-                    <div className='inventoryCollectionLine' />
+                      </>
+                    ) : (
+                      <div className='inventoryCollectionTop'>
+                        <div className='inventoryCollectionName'>{inventory[k].meta.name}</div>
+                        <div className='inventoryCollectionCount'>{Object.keys(inventory[k].items).length}</div>
+                        <div className='inventoryCollectionLine' />
+                      </div>
+                    )}
                   </div>
-                )}
-              </div>
-            )
-          }) : inventory ? (
+                )
+              })
+          ) : inventory ? (
             <div className='inventoryNotFound'>No Items Found</div>
           ) : (
             <div className='inventoryNotFound'>Loading Items..</div>
diff --git a/app/App/Main/Account/Launcher/index.js b/app/App/Main/Account/Launcher/index.js
index 6b09dc1f4..995d86c2f 100644
--- a/app/App/Main/Account/Launcher/index.js
+++ b/app/App/Main/Account/Launcher/index.js
@@ -7,20 +7,36 @@ import oneInch from './1inch.png'
 import uniswap from './uniswap.png'
 
 class Launcher extends React.Component {
-  constructor (...args) {
+  constructor(...args) {
     super(...args)
     this.moduleRef = React.createRef()
     this.resizeObserver = new ResizeObserver(() => {
       if (this.moduleRef && this.moduleRef.current) {
-        link.send('tray:action', 'updateAccountModule', this.props.moduleId, { height: this.moduleRef.current.clientHeight })
+        link.send('tray:action', 'updateAccountModule', this.props.moduleId, {
+          height: this.moduleRef.current.clientHeight,
+        })
       }
     })
     this.state = {
-      expand: false
+      expand: false,
+    }
+    this.e = {
+      p: [
+        'QXJyb3dVcA==',
+        'QXJyb3dVcA==',
+        'QXJyb3dEb3du',
+        'QXJyb3dEb3du',
+        'QXJyb3dMZWZ0',
+        'QXJyb3dSaWdodA==',
+        'QXJyb3dMZWZ0',
+        'QXJyb3dSaWdodA==',
+        'Yg==',
+        'YQ==',
+      ],
+      i: 0,
     }
-    this.e = { p: ['QXJyb3dVcA==', 'QXJyb3dVcA==', 'QXJyb3dEb3du', 'QXJyb3dEb3du', 'QXJyb3dMZWZ0', 'QXJyb3dSaWdodA==', 'QXJyb3dMZWZ0', 'QXJyb3dSaWdodA==', 'Yg==', 'YQ=='], i: 0 }
   }
-  h (e) {
+  h(e) {
     if (this.e.p.indexOf(btoa(e.key)) < 0 || btoa(e.key) !== this.e.p[this.e.i]) {
       this.e.i = 0
     } else {
@@ -29,34 +45,38 @@ class Launcher extends React.Component {
       if (this.e.p.length === this.e.i) {
         this.e.i = 0
         if (this.state.l === true) {
-          this.setState({l: false})
+          this.setState({ l: false })
         } else {
-          this.setState({l: true})
+          this.setState({ l: true })
         }
       }
     }
   }
-  componentDidMount () {
+  componentDidMount() {
     this.resizeObserver.observe(this.moduleRef.current)
     document.addEventListener('keydown', this.h.bind(this))
   }
-  componentWillUnmount () {
+  componentWillUnmount() {
     link.send('tray:action', 'updateAccountModule', this.props.moduleId, { height: 0 })
     document.removeEventListener('keydown', this.h.bind(this))
   }
-  glitch (el) {
+  glitch(el) {
     return (
       <div className={this.state.glitchOn ? 'glitch glitchOn' : 'glitch'}>
-        {[...Array(10).keys()].map(i => <div key={i + 'hg'} className='line'>{el}</div>)}
-        {!this.state.glitchOn ? <div className='line lastLine'>{el}</div> : null }
+        {[...Array(10).keys()].map((i) => (
+          <div key={i + 'hg'} className='line'>
+            {el}
+          </div>
+        ))}
+        {!this.state.glitchOn ? <div className='line lastLine'>{el}</div> : null}
       </div>
     )
   }
-  render () {
+  render() {
     return (
       <div ref={this.moduleRef} className='launcher'>
         <div className='launcherTiles'>
-          <div 
+          <div
             className='dappTile launchButton'
             onClick={() => {
               this.setState({ glitchOn: false })
@@ -66,14 +86,12 @@ class Launcher extends React.Component {
             onMouseOver={() => this.setState({ glitchOn: true })}
             onMouseLeave={() => this.setState({ glitchOn: false })}
           >
-            {this.glitch(<div className='launchButtonInner'>
-              <div className='dashboradIcon'>
-                {svg.send(13)}
-              </div>
-              <div>
-                {'Send'}
+            {this.glitch(
+              <div className='launchButtonInner'>
+                <div className='dashboradIcon'>{svg.send(13)}</div>
+                <div>{'Send'}</div>
               </div>
-            </div>)}
+            )}
           </div>
         </div>
       </div>
@@ -81,4 +99,4 @@ class Launcher extends React.Component {
   }
 }
 
-export default Restore.connect(Launcher)
\ No newline at end of file
+export default Restore.connect(Launcher)
diff --git a/app/App/Main/Account/Permissions/index.js b/app/App/Main/Account/Permissions/index.js
index a79934832..15359d0d7 100644
--- a/app/App/Main/Account/Permissions/index.js
+++ b/app/App/Main/Account/Permissions/index.js
@@ -4,42 +4,48 @@ import link from '../../../../../resources/link'
 import svg from '../../../../../resources/svg'
 
 class Balances extends React.Component {
-  constructor (...args) {
+  constructor(...args) {
     super(...args)
     this.moduleRef = React.createRef()
     if (!this.props.expanded) {
       this.resizeObserver = new ResizeObserver(() => {
         if (this.moduleRef && this.moduleRef.current) {
-          link.send('tray:action', 'updateAccountModule', this.props.moduleId, { height: this.moduleRef.current.clientHeight })
+          link.send('tray:action', 'updateAccountModule', this.props.moduleId, {
+            height: this.moduleRef.current.clientHeight,
+          })
         }
       })
     }
   }
 
-  componentDidMount () {
+  componentDidMount() {
     if (this.resizeObserver) this.resizeObserver.observe(this.moduleRef.current)
   }
 
-  componentWillUnmount () {
+  componentWillUnmount() {
     if (this.resizeObserver) this.resizeObserver.disconnect()
   }
 
-  render () {
+  render() {
     const i = 0
     // const transform = viewIndex === i ? 'translateX(0)' : viewIndex > i ? 'translateX(-100%)' : 'translateX(100%)'
     // const id = this.store('selected.current')
     // const address = this.store('main.accounts', this.props.id, 'address')
     const permissions = this.store('main.permissions', this.props.id) || {}
-    let permissionList = Object.keys(permissions).sort((a, b) => a.origin < b.origin ? -1 : 1)
+    let permissionList = Object.keys(permissions).sort((a, b) => (a.origin < b.origin ? -1 : 1))
     if (!this.props.expanded) permissionList = permissionList.slice(0, 3)
-    
+
     return (
-      <div 
+      <div
         ref={this.moduleRef}
-        style={this.props.expanded ? {
-          height: '100%',
-          overflowY: 'scroll'
-        }: {}}
+        style={
+          this.props.expanded
+            ? {
+                height: '100%',
+                overflowY: 'scroll',
+              }
+            : {}
+        }
       >
         <div className='moduleHeader'>
           {'Permissions'}
@@ -48,7 +54,7 @@ class Balances extends React.Component {
               {svg.close(12)}
             </div>
           ) : null}
-        </div>  
+        </div>
 
         <div className='moduleMain moduleMainPermissions'>
           {permissionList.length === 0 ? (
@@ -58,14 +64,18 @@ class Balances extends React.Component {
               </div>
             </div>
           ) : (
-            permissionList.map(o => {
+            permissionList.map((o) => {
               return (
                 <div className='signerPermission' key={o}>
                   <div className='signerPermissionControls'>
                     <div className='signerPermissionOrigin'>{permissions[o].origin}</div>
-                    <div 
-                      className={permissions[o].provider ? 'signerPermissionToggle signerPermissionToggleOn' : 'signerPermissionToggle'}
-                      onClick={_ => link.send('tray:action', 'toggleAccess', this.props.id, o)}
+                    <div
+                      className={
+                        permissions[o].provider
+                          ? 'signerPermissionToggle signerPermissionToggleOn'
+                          : 'signerPermissionToggle'
+                      }
+                      onClick={(_) => link.send('tray:action', 'toggleAccess', this.props.id, o)}
                     >
                       <div className='signerPermissionToggleSwitch' />
                     </div>
@@ -76,24 +86,32 @@ class Balances extends React.Component {
           )}
           {this.props.expanded ? (
             <div className='clearPermissionsButton'>
-              <div onClick={() => {
-                link.send('tray:action', 'clearPermissions', this.props.id)
-              }} className='moduleButton'>Clear All Permissions</div>
+              <div
+                onClick={() => {
+                  link.send('tray:action', 'clearPermissions', this.props.id)
+                }}
+                className='moduleButton'
+              >
+                Clear All Permissions
+              </div>
             </div>
           ) : null}
         </div>
         {!this.props.expanded ? (
           <div className='signerBalanceTotal'>
             <div className='signerBalanceButtons'>
-              <div className='signerBalanceButton signerBalanceShowAll' onClick={() => this.props.expandModule(this.props.moduleId)}>
+              <div
+                className='signerBalanceButton signerBalanceShowAll'
+                onClick={() => this.props.expandModule(this.props.moduleId)}
+              >
                 More
               </div>
             </div>
           </div>
-        ) : null }
+        ) : null}
       </div>
     )
   }
 }
 
-export default Restore.connect(Balances)
\ No newline at end of file
+export default Restore.connect(Balances)
diff --git a/app/App/Main/Account/Requests/AddTokenRequest/index.js b/app/App/Main/Account/Requests/AddTokenRequest/index.js
index 52b7ca3be..9492e3f94 100644
--- a/app/App/Main/Account/Requests/AddTokenRequest/index.js
+++ b/app/App/Main/Account/Requests/AddTokenRequest/index.js
@@ -4,7 +4,7 @@ import svg from '../../../../../../resources/svg'
 import link from '../../../../../../resources/link'
 
 class AddTokenRequest extends React.Component {
-  constructor (...args) {
+  constructor(...args) {
     super(...args)
     this.state = { allowInput: false }
     setTimeout(() => {
@@ -12,7 +12,7 @@ class AddTokenRequest extends React.Component {
     }, 200)
   }
 
-  render () {
+  render() {
     const status = this.props.req.status
     const notice = this.props.req.notice
 
@@ -31,15 +31,21 @@ class AddTokenRequest extends React.Component {
     const height = mode === 'monitor' ? '80px' : '340px'
     const token = this.props.req.token
     return (
-      <div key={this.props.req.id || this.props.req.handlerId} className={requestClass} style={{ transform: `translateY(${this.props.pos}px)`, height }}>
+      <div
+        key={this.props.req.id || this.props.req.handlerId}
+        className={requestClass}
+        style={{ transform: `translateY(${this.props.pos}px)`, height }}
+      >
         <div className='approveRequest'>
           {notice ? (
             <div className='requestNotice'>
-              {(_ => {
+              {((_) => {
                 if (status === 'pending') {
                   return (
                     <div className='requestNoticeInner scaleIn'>
-                      <div><div className='loader' /></div>
+                      <div>
+                        <div className='loader' />
+                      </div>
                     </div>
                   )
                 } else if (status === 'success') {
@@ -75,16 +81,20 @@ class AddTokenRequest extends React.Component {
           <div className='requestApprove'>
             <div
               className='requestDecline'
-              style={{ pointerEvents: this.state.allowInput ? 'auto' : 'none'}}
-              onClick={() => { if (this.state.allowInput) link.send('tray:addToken', false, this.props.req)
-            }}>
+              style={{ pointerEvents: this.state.allowInput ? 'auto' : 'none' }}
+              onClick={() => {
+                if (this.state.allowInput) link.send('tray:addToken', false, this.props.req)
+              }}
+            >
               <div className='requestDeclineButton _txButton _txButtonBad'>Decline</div>
             </div>
             <div
               className='requestSign'
-              style={{ pointerEvents: this.state.allowInput ? 'auto' : 'none'}}
-              onClick={() => { if (this.state.allowInput) this.store.notify('addToken', this.props.req)
-            }}>
+              style={{ pointerEvents: this.state.allowInput ? 'auto' : 'none' }}
+              onClick={() => {
+                if (this.state.allowInput) this.store.notify('addToken', this.props.req)
+              }}
+            >
               <div className='requestSignButton _txButton'>Review</div>
             </div>
           </div>
diff --git a/app/App/Main/Account/Requests/ChainRequest/index.js b/app/App/Main/Account/Requests/ChainRequest/index.js
index b01fcf091..c7fc91b07 100644
--- a/app/App/Main/Account/Requests/ChainRequest/index.js
+++ b/app/App/Main/Account/Requests/ChainRequest/index.js
@@ -4,7 +4,7 @@ import svg from '../../../../../../resources/svg'
 import link from '../../../../../../resources/link'
 
 class ChainRequest extends React.Component {
-  constructor (...args) {
+  constructor(...args) {
     super(...args)
     this.state = { allowInput: false }
     setTimeout(() => {
@@ -12,7 +12,7 @@ class ChainRequest extends React.Component {
     }, 200)
   }
 
-  render () {
+  render() {
     const status = this.props.req.status
     const notice = this.props.req.notice
     const type = this.props.req.type
@@ -31,15 +31,21 @@ class ChainRequest extends React.Component {
     const height = mode === 'monitor' ? '80px' : '340px'
     const chain = this.props.req.chain
     return (
-      <div key={this.props.req.id || this.props.req.handlerId} className={requestClass} style={{ transform: `translateY(${this.props.pos}px)`, height }}>
+      <div
+        key={this.props.req.id || this.props.req.handlerId}
+        className={requestClass}
+        style={{ transform: `translateY(${this.props.pos}px)`, height }}
+      >
         <div className='approveRequest'>
           {notice ? (
             <div className='requestNotice'>
-              {(_ => {
+              {((_) => {
                 if (status === 'pending') {
                   return (
                     <div className='requestNoticeInner scaleIn'>
-                      <div><div className='loader' /></div>
+                      <div>
+                        <div className='loader' />
+                      </div>
                     </div>
                   )
                 } else if (status === 'success') {
@@ -51,7 +57,7 @@ class ChainRequest extends React.Component {
             </div>
           ) : (
             <div className='approveTransactionPayload'>
-              {type === 'switchChain' ? ( 
+              {type === 'switchChain' ? (
                 <div className='approveRequestHeader approveTransactionHeader'>
                   <div className='approveRequestHeaderIcon'> {svg.octicon('shield', { height: 20 })}</div>
                   <div className='approveRequestHeaderLabel'> Switch Chain</div>
@@ -65,10 +71,14 @@ class ChainRequest extends React.Component {
               <div className='requestChain scaleIn'>
                 <div className='requestChainInner'>
                   <div className={originClass}>{this.store('main.origins', this.props.req.origin, 'name')}</div>
-                  <div className={'requestChainOriginSub'}>{type === 'switchChain' ? 'wants to switch to chain' : 'wants to add chain'}</div>
-                  <div className='requestChainName'>{type === 'switchChain' ? (
-                    this.store('main.networks', chain.type, parseInt(chain.id), 'name')
-                  ) : chain.name}</div>
+                  <div className={'requestChainOriginSub'}>
+                    {type === 'switchChain' ? 'wants to switch to chain' : 'wants to add chain'}
+                  </div>
+                  <div className='requestChainName'>
+                    {type === 'switchChain'
+                      ? this.store('main.networks', chain.type, parseInt(chain.id), 'name')
+                      : chain.name}
+                  </div>
                 </div>
               </div>
             </div>
@@ -76,35 +86,43 @@ class ChainRequest extends React.Component {
         </div>
         {type === 'switchChain' ? (
           <div className='requestApprove'>
-            <div 
-              className='requestDecline' 
-              style={{ pointerEvents: this.state.allowInput? 'auto' : 'none'}}
-              onClick={() => { if (this.state.allowInput) link.send('tray:switchChain', false, false, this.props.req) 
-            }}>
+            <div
+              className='requestDecline'
+              style={{ pointerEvents: this.state.allowInput ? 'auto' : 'none' }}
+              onClick={() => {
+                if (this.state.allowInput) link.send('tray:switchChain', false, false, this.props.req)
+              }}
+            >
               <div className='requestDeclineButton _txButton _txButtonBad'>Decline</div>
             </div>
-            <div 
-              className='requestSign' 
-              style={{ pointerEvents: this.state.allowInput ? 'auto' : 'none'}}
-              onClick={() => { if (this.state.allowInput) link.send('tray:switchChain', chain.type, parseInt(chain.id), this.props.req)
-            }}>
+            <div
+              className='requestSign'
+              style={{ pointerEvents: this.state.allowInput ? 'auto' : 'none' }}
+              onClick={() => {
+                if (this.state.allowInput) link.send('tray:switchChain', chain.type, parseInt(chain.id), this.props.req)
+              }}
+            >
               <div className='requestSignButton _txButton'>Switch</div>
             </div>
           </div>
         ) : (
           <div className='requestApprove'>
-            <div 
-              className='requestDecline' 
-              style={{ pointerEvents: this.state.allowInput && this.props.onTop ? 'auto' : 'none'}}
-              onClick={() => { if (this.state.allowInput && this.props.onTop) link.send('tray:addChain', false, this.props.req) 
-            }}>
+            <div
+              className='requestDecline'
+              style={{ pointerEvents: this.state.allowInput && this.props.onTop ? 'auto' : 'none' }}
+              onClick={() => {
+                if (this.state.allowInput && this.props.onTop) link.send('tray:addChain', false, this.props.req)
+              }}
+            >
               <div className='requestDeclineButton _txButton _txButtonBad'>Decline</div>
             </div>
-            <div 
-              className='requestSign' 
-              style={{ pointerEvents: this.state.allowInput && this.props.onTop ? 'auto' : 'none'}}
-              onClick={() => { if (this.state.allowInput && this.props.onTop) this.store.notify('addChain', this.props.req) 
-            }}>
+            <div
+              className='requestSign'
+              style={{ pointerEvents: this.state.allowInput && this.props.onTop ? 'auto' : 'none' }}
+              onClick={() => {
+                if (this.state.allowInput && this.props.onTop) this.store.notify('addChain', this.props.req)
+              }}
+            >
               <div className='requestSignButton _txButton'>Review</div>
             </div>
           </div>
diff --git a/app/App/Main/Account/Requests/ProviderRequest/index.js b/app/App/Main/Account/Requests/ProviderRequest/index.js
index 790c1b230..54edaf699 100644
--- a/app/App/Main/Account/Requests/ProviderRequest/index.js
+++ b/app/App/Main/Account/Requests/ProviderRequest/index.js
@@ -4,7 +4,7 @@ import svg from '../../../../../../resources/svg'
 import link from '../../../../../../resources/link'
 
 class ProviderRequest extends React.Component {
-  constructor (...args) {
+  constructor(...args) {
     super(...args)
     this.state = { allowInput: false }
     setTimeout(() => {
@@ -12,7 +12,7 @@ class ProviderRequest extends React.Component {
     }, 200)
   }
 
-  render () {
+  render() {
     const status = this.props.req.status
     const notice = this.props.req.notice
     let requestClass = 'signerRequest'
@@ -36,41 +36,37 @@ class ProviderRequest extends React.Component {
                   </div>
                 </div>
               ) : status === 'success' ? (
-                <div className='requestNoticeInner'>
-                  {svg.octicon('check', { height: 80 })}
-                </div>
+                <div className='requestNoticeInner'>{svg.octicon('check', { height: 80 })}</div>
               ) : status === 'error' || status === 'declined' ? (
-                <div className='requestNoticeInner'>
-                  {svg.octicon('circle-slash', { height: 80 })}
-                </div>
+                <div className='requestNoticeInner'>{svg.octicon('circle-slash', { height: 80 })}</div>
               ) : null}
             </div>
           ) : (
             <div className='approveTransactionPayload'>
               <div className='requestProvider'>
-                <div className={originClass}>
-                  {originName}
-                </div>
-                <div className='requestProviderSub'>
-                  wants to connect
-                </div>
+                <div className={originClass}>{originName}</div>
+                <div className='requestProviderSub'>wants to connect</div>
               </div>
             </div>
           )}
         </div>
         <div className='requestApprove'>
-          <div 
-            className='requestDecline' 
-            style={{ pointerEvents: this.state.allowInput ? 'auto' : 'none'}}
-            onClick={() => { if (this.state.allowInput) link.send('tray:giveAccess', this.props.req, false) 
-          }}>
+          <div
+            className='requestDecline'
+            style={{ pointerEvents: this.state.allowInput ? 'auto' : 'none' }}
+            onClick={() => {
+              if (this.state.allowInput) link.send('tray:giveAccess', this.props.req, false)
+            }}
+          >
             <div className='requestDeclineButton _txButton _txButtonBad'>Decline</div>
           </div>
-          <div 
-            className='requestSign' 
-            style={{ pointerEvents: this.state.allowInput ? 'auto' : 'none'}}
-            onClick={() => { if (this.state.allowInput) link.send('tray:giveAccess', this.props.req, true) 
-          }}>
+          <div
+            className='requestSign'
+            style={{ pointerEvents: this.state.allowInput ? 'auto' : 'none' }}
+            onClick={() => {
+              if (this.state.allowInput) link.send('tray:giveAccess', this.props.req, true)
+            }}
+          >
             <div className='requestSignButton _txButton'>Approve</div>
           </div>
         </div>
diff --git a/app/App/Main/Account/Requests/SignTypedDataRequest/index.js b/app/App/Main/Account/Requests/SignTypedDataRequest/index.js
index e53d2196e..1eb50d332 100644
--- a/app/App/Main/Account/Requests/SignTypedDataRequest/index.js
+++ b/app/App/Main/Account/Requests/SignTypedDataRequest/index.js
@@ -11,11 +11,7 @@ const SimpleJSON = ({ json }) => {
         <div key={key + o} className='simpleJsonChild'>
           <div className='simpleJsonKey'>{key}:</div>
           <div className='simpleJsonValue'>
-            {typeof json[key] === 'object' ? (
-              <SimpleJSON json={json[key]} key={key} />
-            ) : (
-              json[key]
-            )}
+            {typeof json[key] === 'object' ? <SimpleJSON json={json[key]} key={key} /> : json[key]}
           </div>
         </div>
       ))}
@@ -24,7 +20,7 @@ const SimpleJSON = ({ json }) => {
 }
 
 class TransactionRequest extends React.Component {
-  constructor (...args) {
+  constructor(...args) {
     super(...args)
     this.state = { allowInput: false, dataView: false }
 
@@ -35,31 +31,31 @@ class TransactionRequest extends React.Component {
     }, props.signingDelay || 1500)
   }
 
-  copyAddress (e) {
+  copyAddress(e) {
     e.preventDefault()
     e.target.select()
     document.execCommand('Copy')
     this.setState({ copied: true })
-    setTimeout(_ => this.setState({ copied: false }), 1000)
+    setTimeout((_) => this.setState({ copied: false }), 1000)
   }
 
-  approve (reqId, req) {
+  approve(reqId, req) {
     link.rpc('approveRequest', req, () => {}) // Move to link.send
   }
 
-  decline (reqId, req) {
+  decline(reqId, req) {
     link.rpc('declineRequest', req, () => {}) // Move to link.send
   }
 
-  toggleDataView (id) {
+  toggleDataView(id) {
     this.setState({ dataView: !this.state.dataView })
   }
 
-  hexToDisplayValue (hex) {
+  hexToDisplayValue(hex) {
     return (Math.round(parseFloat(utils.fromWei(hex, 'ether')) * 1000000) / 1000000).toFixed(6)
   }
 
-  render () {
+  render() {
     const { req } = this.props
     const type = req.type
     const status = req.status
@@ -74,35 +70,33 @@ class TransactionRequest extends React.Component {
     if (status === 'pending') requestClass += ' signerRequestPending'
     if (status === 'error') requestClass += ' signerRequestError'
 
-    const messageToSign = typedData.domain
-     ? (
-        <div className='signTypedData'>
-          <div className='signTypedDataInner'>
-            <div className='signTypedDataSection'>
-              <div className='signTypedDataTitle'>Domain</div>
-              <SimpleJSON json={typedData.domain} />
-            </div>
-            <div className='signTypedDataSection'>
-              <div className='signTypedDataTitle'>Message</div>
-              <SimpleJSON json={typedData.message} />
-            </div>
+    const messageToSign = typedData.domain ? (
+      <div className='signTypedData'>
+        <div className='signTypedDataInner'>
+          <div className='signTypedDataSection'>
+            <div className='signTypedDataTitle'>Domain</div>
+            <SimpleJSON json={typedData.domain} />
+          </div>
+          <div className='signTypedDataSection'>
+            <div className='signTypedDataTitle'>Message</div>
+            <SimpleJSON json={typedData.message} />
           </div>
         </div>
-        )
-      : (
-        <div className='signTypedData'>
-          <div className='signTypedDataInner'>
-            <div className='signTypedDataSection'>
-            <SimpleJSON json={
-              typedData.reduce((data, elem) => {
+      </div>
+    ) : (
+      <div className='signTypedData'>
+        <div className='signTypedDataInner'>
+          <div className='signTypedDataSection'>
+            <SimpleJSON
+              json={typedData.reduce((data, elem) => {
                 data[elem.name] = elem.value
                 return data
-              }, {})
-            } />
+              }, {})}
+            />
           </div>
         </div>
       </div>
-      )
+    )
     return (
       <div key={this.props.req.id || this.props.req.handlerId} className={requestClass}>
         {type === 'signTypedData' ? (
@@ -110,13 +104,20 @@ class TransactionRequest extends React.Component {
             <div className='approveTransactionPayload'>
               {notice ? (
                 <div className='requestNotice'>
-                  {(_ => {
+                  {((_) => {
                     if (status === 'pending') {
                       return (
                         <div key={status} className='requestNoticeInner cardShow'>
-                          <div style={{ paddingBottom: 20 }}><div className='loader' /></div>
+                          <div style={{ paddingBottom: 20 }}>
+                            <div className='loader' />
+                          </div>
                           <div className='requestNoticeInnerText'>See Signer</div>
-                          <div className='cancelRequest' onMouseDown={() => this.decline(this.props.req.handlerId, this.props.req)}>Cancel</div>
+                          <div
+                            className='cancelRequest'
+                            onMouseDown={() => this.decline(this.props.req.handlerId, this.props.req)}
+                          >
+                            Cancel
+                          </div>
                         </div>
                       )
                     } else if (status === 'success') {
@@ -134,7 +135,11 @@ class TransactionRequest extends React.Component {
                         </div>
                       )
                     } else {
-                      return <div key={notice} className='requestNoticeInner cardShow'>{notice}</div>
+                      return (
+                        <div key={notice} className='requestNoticeInner cardShow'>
+                          {notice}
+                        </div>
+                      )
                     }
                   })()}
                 </div>
@@ -152,18 +157,22 @@ class TransactionRequest extends React.Component {
           <div className='unknownType'>{'Unknown: ' + this.props.req.type}</div>
         )}
         <div className='requestApprove'>
-          <div 
-            className='requestDecline' 
-            style={{ pointerEvents: this.state.allowInput ? 'auto' : 'none'}} 
-            onClick={() => { if (this.state.allowInput) this.decline(this.props.req.handlerId, this.props.req) 
-          }}>
+          <div
+            className='requestDecline'
+            style={{ pointerEvents: this.state.allowInput ? 'auto' : 'none' }}
+            onClick={() => {
+              if (this.state.allowInput) this.decline(this.props.req.handlerId, this.props.req)
+            }}
+          >
             <div className='requestDeclineButton _txButton _txButtonBad'>Decline</div>
           </div>
-          <div 
-            className='requestSign' 
-            style={{ pointerEvents: this.state.allowInput ? 'auto' : 'none'}}
-            onClick={() => { if (this.state.allowInput) this.approve(this.props.req.handlerId, this.props.req) 
-          }}>
+          <div
+            className='requestSign'
+            style={{ pointerEvents: this.state.allowInput ? 'auto' : 'none' }}
+            onClick={() => {
+              if (this.state.allowInput) this.approve(this.props.req.handlerId, this.props.req)
+            }}
+          >
             <div className='requestSignButton _txButton'>Sign</div>
           </div>
         </div>
diff --git a/app/App/Main/Account/Requests/SignatureRequest/index.js b/app/App/Main/Account/Requests/SignatureRequest/index.js
index 27b7c6204..1e66e8844 100644
--- a/app/App/Main/Account/Requests/SignatureRequest/index.js
+++ b/app/App/Main/Account/Requests/SignatureRequest/index.js
@@ -5,7 +5,7 @@ import { stripHexPrefix } from 'ethereumjs-util'
 import svg from '../../../../../../resources/svg'
 import link from '../../../../../../resources/link'
 
-function decodeMessage (rawMessage) {
+function decodeMessage(rawMessage) {
   if (isHex(rawMessage)) {
     const buff = Buffer.from(stripHexPrefix(rawMessage), 'hex')
     return buff.length === 32 ? rawMessage : buff.toString('utf8')
@@ -15,7 +15,7 @@ function decodeMessage (rawMessage) {
 }
 
 class TransactionRequest extends React.Component {
-  constructor (...args) {
+  constructor(...args) {
     super(...args)
     this.state = { allowInput: false, dataView: false }
 
@@ -26,31 +26,31 @@ class TransactionRequest extends React.Component {
     }, props.signingDelay || 1500)
   }
 
-  copyAddress (e) {
+  copyAddress(e) {
     e.preventDefault()
     e.target.select()
     document.execCommand('Copy')
     this.setState({ copied: true })
-    setTimeout(_ => this.setState({ copied: false }), 1000)
+    setTimeout((_) => this.setState({ copied: false }), 1000)
   }
 
-  approve (reqId, req) {
+  approve(reqId, req) {
     link.rpc('approveRequest', req, () => {}) // Move to link.send
   }
 
-  decline (reqId, req) {
+  decline(reqId, req) {
     link.rpc('declineRequest', req, () => {}) // Move to link.send
   }
 
-  toggleDataView (id) {
+  toggleDataView(id) {
     this.setState({ dataView: !this.state.dataView })
   }
 
-  hexToDisplayValue (hex) {
+  hexToDisplayValue(hex) {
     return (Math.round(parseFloat(fromWei(hex, 'ether')) * 1000000) / 1000000).toFixed(6)
   }
 
-  render () {
+  render() {
     const type = this.props.req.type
     const status = this.props.req.status
     const notice = this.props.req.notice
@@ -73,13 +73,20 @@ class TransactionRequest extends React.Component {
             <div className='approveTransactionPayload'>
               {notice ? (
                 <div className='requestCover'>
-                  {(_ => {
+                  {((_) => {
                     if (status === 'pending') {
                       return (
                         <div key={status} className='requestNoticeInner cardShow'>
-                          <div style={{ paddingBottom: 20 }}><div className='loader' /></div>
+                          <div style={{ paddingBottom: 20 }}>
+                            <div className='loader' />
+                          </div>
                           <div className='requestNoticeInnerText'>See Signer</div>
-                          <div className='cancelRequest' onMouseDown={() => this.decline(this.props.req.handlerId, this.props.req)}>Cancel</div>
+                          <div
+                            className='cancelRequest'
+                            onMouseDown={() => this.decline(this.props.req.handlerId, this.props.req)}
+                          >
+                            Cancel
+                          </div>
                         </div>
                       )
                     } else if (status === 'success') {
@@ -97,7 +104,11 @@ class TransactionRequest extends React.Component {
                         </div>
                       )
                     } else {
-                      return <div key={notice} className='requestNoticeInner cardShow'>{notice}</div>
+                      return (
+                        <div key={notice} className='requestNoticeInner cardShow'>
+                          {notice}
+                        </div>
+                      )
                     }
                   })()}
                 </div>
@@ -114,18 +125,22 @@ class TransactionRequest extends React.Component {
           <div className='unknownType'>{'Unknown: ' + this.props.req.type}</div>
         )}
         <div className='requestApprove'>
-          <div 
-            className='requestDecline' 
-            style={{ pointerEvents: this.state.allowInput ? 'auto' : 'none'}}
-            onClick={() => { if (this.state.allowInput) this.decline(this.props.req.handlerId, this.props.req) 
-          }}>
+          <div
+            className='requestDecline'
+            style={{ pointerEvents: this.state.allowInput ? 'auto' : 'none' }}
+            onClick={() => {
+              if (this.state.allowInput) this.decline(this.props.req.handlerId, this.props.req)
+            }}
+          >
             <div className='requestDeclineButton _txButton _txButtonBad'>Decline</div>
           </div>
-          <div 
-            className='requestSign' 
-            style={{ pointerEvents: this.state.allowInput ? 'auto' : 'none'}}
-            onClick={() => { if (this.state.allowInput) this.approve(this.props.req.handlerId, this.props.req) 
-          }}>
+          <div
+            className='requestSign'
+            style={{ pointerEvents: this.state.allowInput ? 'auto' : 'none' }}
+            onClick={() => {
+              if (this.state.allowInput) this.approve(this.props.req.handlerId, this.props.req)
+            }}
+          >
             <div className='requestSignButton _txButton'>Sign</div>
           </div>
         </div>
diff --git a/app/App/Main/Account/Requests/TransactionRequest/TxApproval/approvals/BasicApproval/index.js b/app/App/Main/Account/Requests/TransactionRequest/TxApproval/approvals/BasicApproval/index.js
index 8db7a651a..e4c54a04a 100644
--- a/app/App/Main/Account/Requests/TransactionRequest/TxApproval/approvals/BasicApproval/index.js
+++ b/app/App/Main/Account/Requests/TransactionRequest/TxApproval/approvals/BasicApproval/index.js
@@ -4,23 +4,20 @@ import Restore from 'react-restore'
 import svg from '../../../../../../../../../resources/svg'
 
 class BasicApproval extends React.Component {
-  constructor (...args) {
+  constructor(...args) {
     super(...args)
 
     this.state = {
-      inPreview: false
+      inPreview: false,
     }
   }
 
-  render () {
+  render() {
     const { approval } = this.props
     return (
       <div className='approveTransactionWarning'>
         <div className='approveTransactionWarningOptions'>
-          <div
-            className='approveTransactionWarningReject'
-            onClick={() => this.props.onDecline(this.props.req)}
-          >
+          <div className='approveTransactionWarningReject' onClick={() => this.props.onDecline(this.props.req)}>
             Reject
           </div>
           <div
@@ -44,19 +41,10 @@ class BasicApproval extends React.Component {
             Proceed
           </div>
         </div>
-        <div 
-          className='approveTransactionWarningFill'
-          style={this.state.inPreview ? { opacity: 0 } : { opacity: 1 }}
-        >
-          <div className='approveTransactionWarningIcon approveTransactionWarningIconLeft'>
-            {svg.alert(32)}
-          </div>
-          <div className='approveTransactionWarningIcon approveTransactionWarningIconRight'>
-            {svg.alert(32)}
-          </div>
-          <div className='approveTransactionWarningTitle'>
-            {approval && approval.data && approval.data.title}
-          </div>
+        <div className='approveTransactionWarningFill' style={this.state.inPreview ? { opacity: 0 } : { opacity: 1 }}>
+          <div className='approveTransactionWarningIcon approveTransactionWarningIconLeft'>{svg.alert(32)}</div>
+          <div className='approveTransactionWarningIcon approveTransactionWarningIconRight'>{svg.alert(32)}</div>
+          <div className='approveTransactionWarningTitle'>{approval && approval.data && approval.data.title}</div>
           <div className='approveTransactionWarningMessage'>
             <div className='approveTransactionWarningMessageInner'>
               {approval && approval.data && approval.data.message}
diff --git a/app/App/Main/Account/Requests/TransactionRequest/TxApproval/approvals/TokenSpend/index.js b/app/App/Main/Account/Requests/TransactionRequest/TxApproval/approvals/TokenSpend/index.js
index 0518b8014..87e0c7dcc 100644
--- a/app/App/Main/Account/Requests/TransactionRequest/TxApproval/approvals/TokenSpend/index.js
+++ b/app/App/Main/Account/Requests/TransactionRequest/TxApproval/approvals/TokenSpend/index.js
@@ -16,24 +16,29 @@ const digitsLookup = [
   { value: 1e9, symbol: 'billion' },
   { value: 1e12, symbol: 'trillion' },
   { value: 1e15, symbol: 'quadrillion' },
-  { value: 1e18, symbol: 'quintillion' }
+  { value: 1e18, symbol: 'quintillion' },
 ]
 
-function nFormat (n, digits = 2)  {
+function nFormat(n, digits = 2) {
   const num = Number(n)
-  const item = digitsLookup.slice().reverse().find(item => num >= item.value)
+  const item = digitsLookup
+    .slice()
+    .reverse()
+    .find((item) => num >= item.value)
 
-  return item ? {
-    number: (num / item.value).toFixed(digits).replace(numberRegex, '$1'),
-    symbol: item.symbol
-  } : {
-    number: '0',
-    symbol: ''
-  }
+  return item
+    ? {
+        number: (num / item.value).toFixed(digits).replace(numberRegex, '$1'),
+        symbol: item.symbol,
+      }
+    : {
+        number: '0',
+        symbol: '',
+      }
 }
 
 class TokenSpend extends React.Component {
-  constructor (...args) {
+  constructor(...args) {
     super(...args)
 
     this.decimals = this.props.approval.data.decimals || 0
@@ -43,15 +48,15 @@ class TokenSpend extends React.Component {
       inEditApproval: false,
       mode: 'requested',
       amount: this.requestedAmount,
-      customInput: ''
+      customInput: '',
     }
   }
 
-  setAmount (amount) {
+  setAmount(amount) {
     this.setState({ amount })
   }
 
-  setCustomAmount (value) {
+  setCustomAmount(value) {
     if (value === '') {
       this.setState({ mode: 'custom', amount: '0x0', customInput: value })
     } else {
@@ -64,16 +69,16 @@ class TokenSpend extends React.Component {
       } else {
         amount = '0x' + custom.integerValue().toString(16)
       }
-      
+
       this.setState({ mode: 'custom', amount, customInput: value })
     }
   }
 
-  startEditing () {
+  startEditing() {
     this.setState({ inEditApproval: true })
   }
 
-  doneEditing () {
+  doneEditing() {
     if (this.state.mode === 'custom' && this.state.customInput === '') {
       this.setState({ mode: 'requested', amount: this.requestedAmount })
     }
@@ -84,19 +89,24 @@ class TokenSpend extends React.Component {
     }, 600)
   }
 
-  render () {
+  render() {
     const { req, approval } = this.props
     const { data } = approval
 
     const displayInt = new BigNumber(this.state.amount).shiftedBy(-this.decimals).integerValue()
 
-    const displayAmount = this.state.amount === MAX_HEX ? {
-      number: '',
-      symbol: 'unlimited'
-    } : displayInt > 9e12 ? {
-      number: '',
-      symbol: this.props.approval.data.decimals ? '~unlimited' : 'unknown'
-    } : nFormat(displayInt)
+    const displayAmount =
+      this.state.amount === MAX_HEX
+        ? {
+            number: '',
+            symbol: 'unlimited',
+          }
+        : displayInt > 9e12
+        ? {
+            number: '',
+            symbol: this.props.approval.data.decimals ? '~unlimited' : 'unknown',
+          }
+        : nFormat(displayInt)
 
     const symbol = data.symbol || '???'
     const name = data.name || 'Unknown Token'
@@ -109,16 +119,24 @@ class TokenSpend extends React.Component {
           <div
             className='approveTransactionWarningReject'
             role='button'
-            style={this.state.inEditApproval ? {
-              opacity: 0,
-              pointerEvents: 'none'
-            } : {}}
+            style={
+              this.state.inEditApproval
+                ? {
+                    opacity: 0,
+                    pointerEvents: 'none',
+                  }
+                : {}
+            }
             onClick={() => this.props.onDecline(req)}
           >
             Reject
           </div>
           <div
-            className={this.state.inEditApproval ? 'approveTokenSpendEditButton approveTokenSpendDoneButton' : 'approveTokenSpendEditButton'}
+            className={
+              this.state.inEditApproval
+                ? 'approveTokenSpendEditButton approveTokenSpendDoneButton'
+                : 'approveTokenSpendEditButton'
+            }
             role='button'
             onClick={() => {
               if (this.state.inEditApproval) {
@@ -128,53 +146,51 @@ class TokenSpend extends React.Component {
               }
             }}
           >
-            {this.state.inEditApproval ? 'Done' : 'Edit' }
+            {this.state.inEditApproval ? 'Done' : 'Edit'}
           </div>
           <div
             className='approveTransactionWarningProceed'
             role='button'
-            style={this.state.inEditApproval ? {
-              opacity: 0,
-              pointerEvents: 'none'
-            } : {}}
+            style={
+              this.state.inEditApproval
+                ? {
+                    opacity: 0,
+                    pointerEvents: 'none',
+                  }
+                : {}
+            }
             onClick={() => {
-              this.props.onApprove(
-                this.props.req, 
-                ApprovalType.TokenSpendApproval,
-                { amount: this.state.amount }
-              )
+              this.props.onApprove(this.props.req, ApprovalType.TokenSpendApproval, {
+                amount: this.state.amount,
+              })
             }}
           >
             Proceed
           </div>
         </div>
         <div className='approveTransactionWarningFill'>
-          <div className='approveTransactionWarningIcon approveTransactionWarningIconLeft'>
-            {svg.alert(32)}
-          </div>
-          <div className='approveTransactionWarningIcon approveTransactionWarningIconRight'>
-            {svg.alert(32)}
-          </div>
+          <div className='approveTransactionWarningIcon approveTransactionWarningIconLeft'>{svg.alert(32)}</div>
+          <div className='approveTransactionWarningIcon approveTransactionWarningIconRight'>{svg.alert(32)}</div>
           <div className='approveTransactionWarningTitle'>{'token approval'}</div>
           {this.state.inEditApproval ? (
             <div className={'approveTokenSpend'}>
               {this.state.exiting ? (
                 <div className='approveTokenSpendConfirm'>
-                  {displayAmount.number ? <div className='approveTokenSpendConfirmNumber'>{displayAmount.number}</div> : null}
-                  {displayAmount.symbol ? <div className='approveTokenSpendConfirmNumberText'>{displayAmount.symbol}</div> : null}
+                  {displayAmount.number ? (
+                    <div className='approveTokenSpendConfirmNumber'>{displayAmount.number}</div>
+                  ) : null}
+                  {displayAmount.symbol ? (
+                    <div className='approveTokenSpendConfirmNumberText'>{displayAmount.symbol}</div>
+                  ) : null}
                   <div className='approveTokenSpendConfirmSymbol'>{data.symbol}</div>
                 </div>
               ) : (
                 <div className='approveTokenSpendEdit'>
-                  <div className='approveTokenSpendEditTitle'>
-                    {'Token Spend Limit'}
-                  </div>
+                  <div className='approveTokenSpendEditTitle'>{'Token Spend Limit'}</div>
                   <div className='approveTokenSpendAmount'>
-                    <div className='approveTokenSpendSymbol'>
-                      {symbol}
-                    </div>
+                    <div className='approveTokenSpendSymbol'>{symbol}</div>
                     {this.state.mode === 'custom' ? (
-                      <input 
+                      <input
                         autoFocus
                         type='text'
                         aria-label='Custom Amount'
@@ -190,23 +206,31 @@ class TokenSpend extends React.Component {
                       />
                     ) : (
                       <div>
-                        <div 
+                        <div
                           className='approveTokenSpendAmountNoInput'
                           role='textbox'
                           style={inputLock ? { cursor: 'default' } : null}
-                          onClick={inputLock ? null : () => {
-                            this.setCustomAmount(this.state.customInput)
-                          }}
+                          onClick={
+                            inputLock
+                              ? null
+                              : () => {
+                                  this.setCustomAmount(this.state.customInput)
+                                }
+                          }
                         >
                           <div className='approveTokenSpendAmountNoInputNumber'>{displayAmount.number}</div>
-                          <div className='approveTokenSpendAmountNoInputSymbol'>{displayAmount.symbol}</div> 
+                          <div className='approveTokenSpendAmountNoInputSymbol'>{displayAmount.symbol}</div>
                         </div>
                       </div>
                     )}
                   </div>
                   <div className='approveTokenSpendPresets'>
                     <div
-                      className={this.state.mode === 'requested' ? 'approveTokenSpendPresetButton approveTokenSpendPresetButtonSelected' : 'approveTokenSpendPresetButton'}
+                      className={
+                        this.state.mode === 'requested'
+                          ? 'approveTokenSpendPresetButton approveTokenSpendPresetButtonSelected'
+                          : 'approveTokenSpendPresetButton'
+                      }
                       role='button'
                       onClick={() => {
                         this.setState({ mode: 'requested', amount: this.requestedAmount })
@@ -214,8 +238,12 @@ class TokenSpend extends React.Component {
                     >
                       Requested
                     </div>
-                    <div 
-                      className={this.state.mode === 'unlimited' ? 'approveTokenSpendPresetButton approveTokenSpendPresetButtonSelected' : 'approveTokenSpendPresetButton'}
+                    <div
+                      className={
+                        this.state.mode === 'unlimited'
+                          ? 'approveTokenSpendPresetButton approveTokenSpendPresetButtonSelected'
+                          : 'approveTokenSpendPresetButton'
+                      }
                       role='button'
                       onClick={() => {
                         const amount = MAX_HEX
@@ -225,8 +253,12 @@ class TokenSpend extends React.Component {
                       <span className='approveTokenSpendPresetButtonInfinity'>{'Unlimited'}</span>
                     </div>
                     {!inputLock ? (
-                      <div 
-                        className={this.state.mode === 'custom' ? 'approveTokenSpendPresetButton approveTokenSpendPresetButtonSelected' : 'approveTokenSpendPresetButton'}
+                      <div
+                        className={
+                          this.state.mode === 'custom'
+                            ? 'approveTokenSpendPresetButton approveTokenSpendPresetButtonSelected'
+                            : 'approveTokenSpendPresetButton'
+                        }
                         role='button'
                         onClick={() => {
                           this.setCustomAmount(this.state.customInput)
@@ -249,43 +281,37 @@ class TokenSpend extends React.Component {
                       {svg.octicon('kebab-horizontal', { height: 15 })}
                       {data.spender.substr(data.contract.length - 4)}
                     </div>
-                    <div 
-                      className='approveTokenSpendSpenderAddressFull' 
+                    <div
+                      className='approveTokenSpendSpenderAddressFull'
                       onClick={() => {
                         link.send('tray:clipboardData', data.spender)
                         this.setState({ copyTokenRequester: true })
                         setTimeout(() => {
                           this.setState({ copyTokenRequester: false })
-                        }, 1000) 
+                        }, 1000)
                       }}
                     >
                       {this.state.copyTokenRequester ? 'ADDRESS COPIED' : data.spender}
                     </div>
                   </div>
                 ) : null}
-                <div className='approveTokenSpendSub'>
-                  {'wants approval to spend'}
-                </div>
+                <div className='approveTokenSpendSub'>{'wants approval to spend'}</div>
                 <div className='approveTokenSpendToken'>
-                  <div className='approveTokenSpendTokenSymbol'>
-                    {symbol}
-                  </div>
-                  <div 
+                  <div className='approveTokenSpendTokenSymbol'>{symbol}</div>
+                  <div
                     className='approveTokenSpendTokenContract'
                     onClick={() => {
                       link.send('tray:clipboardData', data.contract)
                       this.setState({ copyTokenContract: true })
                       setTimeout(() => {
                         this.setState({ copyTokenContract: false })
-                      }, 1000) 
+                      }, 1000)
                     }}
                   >
                     {this.state.copyTokenContract ? 'ADDRESS COPIED' : data.contract}
                   </div>
                 </div>
-                <div className='approveTokenSpendTokenName'>
-                  {name}
-                </div>
+                <div className='approveTokenSpendTokenName'>{name}</div>
               </div>
             </div>
           )}
diff --git a/app/App/Main/Account/Requests/TransactionRequest/TxApproval/index.js b/app/App/Main/Account/Requests/TransactionRequest/TxApproval/index.js
index 6fd734213..9c1573d44 100644
--- a/app/App/Main/Account/Requests/TransactionRequest/TxApproval/index.js
+++ b/app/App/Main/Account/Requests/TransactionRequest/TxApproval/index.js
@@ -7,19 +7,21 @@ import { ApprovalType } from '../../../../../../../resources/constants'
 import { BasicApproval, TokenSpend } from './approvals'
 
 const supportedApprovals = [
-  ApprovalType.GasLimitApproval, ApprovalType.OtherChainApproval, ApprovalType.TokenSpendApproval
+  ApprovalType.GasLimitApproval,
+  ApprovalType.OtherChainApproval,
+  ApprovalType.TokenSpendApproval,
 ]
 
 class TxApproval extends React.Component {
-  approve (req, type, data = {}, cb = () => {}) {
-    link.rpc('confirmRequestApproval', req, type, data, cb)    
+  approve(req, type, data = {}, cb = () => {}) {
+    link.rpc('confirmRequestApproval', req, type, data, cb)
   }
 
-  decline (req, cb = () => {}) {
+  decline(req, cb = () => {}) {
     link.rpc('declineRequest', req, cb)
   }
 
-  render () {
+  render() {
     const { req, approval, allowOtherChain } = this.props
 
     if (!supportedApprovals.includes(approval.type)) {
@@ -27,37 +29,17 @@ class TxApproval extends React.Component {
     }
 
     if (approval.type === ApprovalType.GasLimitApproval) {
-      return (
-        <BasicApproval
-          req={req}
-          approval={approval}
-          onApprove={this.approve}
-          onDecline={this.decline}
-        />
-      )
+      return <BasicApproval req={req} approval={approval} onApprove={this.approve} onDecline={this.decline} />
     }
 
     if (approval.type === ApprovalType.OtherChainApproval) {
-      if (!allowOtherChain || typeof allowOtherChain !== 'function') throw new Error('OtherChainApproval needs allowOtherChain')
-      return (
-        <BasicApproval
-          req={req}
-          approval={approval}
-          onApprove={allowOtherChain}
-          onDecline={this.decline}
-        />
-      )
+      if (!allowOtherChain || typeof allowOtherChain !== 'function')
+        throw new Error('OtherChainApproval needs allowOtherChain')
+      return <BasicApproval req={req} approval={approval} onApprove={allowOtherChain} onDecline={this.decline} />
     }
 
     if (approval.type === ApprovalType.TokenSpendApproval) {
-      return (
-        <TokenSpend 
-          req={req}
-          approval={approval}
-          onApprove={this.approve}
-          onDecline={this.decline}
-        />
-      )
+      return <TokenSpend req={req} approval={approval} onApprove={this.approve} onDecline={this.decline} />
     }
   }
 }
diff --git a/app/App/Main/Account/Requests/TransactionRequest/TxBar/index.js b/app/App/Main/Account/Requests/TransactionRequest/TxBar/index.js
index 071bba05f..49add59a5 100644
--- a/app/App/Main/Account/Requests/TransactionRequest/TxBar/index.js
+++ b/app/App/Main/Account/Requests/TransactionRequest/TxBar/index.js
@@ -3,7 +3,7 @@ import Restore from 'react-restore'
 import svg from '../../../../../../../resources/svg'
 
 class TxBar extends React.Component {
-  render () {
+  render() {
     const req = this.props.req
     let position = 0
     let txBarClass = 'txBar'
@@ -31,19 +31,31 @@ class TxBar extends React.Component {
             <div className='txProgressLine' />
             <div className='txProgressSteps'>
               <div className='txProgressStep'>
-                <div className={progressIconClass} style={{ padding: '10px 11px' }}>{svg.sign(22)}</div>
+                <div className={progressIconClass} style={{ padding: '10px 11px' }}>
+                  {svg.sign(22)}
+                </div>
                 <div className='txProgressStepMarker' />
-                <div className={position > 1 ? 'txProgressStepCenter txProgressStepCenterOn' : 'txProgressStepCenter'} />
+                <div
+                  className={position > 1 ? 'txProgressStepCenter txProgressStepCenterOn' : 'txProgressStepCenter'}
+                />
               </div>
               <div className='txProgressStep'>
-                <div className={progressIconClass} style={{ padding: '11px 12px' }}>{svg.send(15)}</div>
+                <div className={progressIconClass} style={{ padding: '11px 12px' }}>
+                  {svg.send(15)}
+                </div>
                 <div className='txProgressStepMarker' />
-                <div className={position > 2 ? 'txProgressStepCenter txProgressStepCenterOn' : 'txProgressStepCenter'} />
+                <div
+                  className={position > 2 ? 'txProgressStepCenter txProgressStepCenterOn' : 'txProgressStepCenter'}
+                />
               </div>
               <div className='txProgressStep'>
-                <div className={progressIconClass} style={{ padding: '7px 12px' }}>{svg.octicon('check', { height: 24 })}</div>
+                <div className={progressIconClass} style={{ padding: '7px 12px' }}>
+                  {svg.octicon('check', { height: 24 })}
+                </div>
                 <div className='txProgressStepMarker' />
-                <div className={position > 3 ? 'txProgressStepCenter txProgressStepCenterOn' : 'txProgressStepCenter'} />
+                <div
+                  className={position > 3 ? 'txProgressStepCenter txProgressStepCenterOn' : 'txProgressStepCenter'}
+                />
               </div>
             </div>
           </div>
diff --git a/app/App/Main/Account/Requests/TransactionRequest/TxData/index.js b/app/App/Main/Account/Requests/TransactionRequest/TxData/index.js
index eaa98bb42..321a797c2 100644
--- a/app/App/Main/Account/Requests/TransactionRequest/TxData/index.js
+++ b/app/App/Main/Account/Requests/TransactionRequest/TxData/index.js
@@ -4,50 +4,57 @@ import link from '../../../../../../../resources/link'
 import svg from '../../../../../../../resources/svg'
 
 class txData extends React.Component {
-  constructor (...args) {
+  constructor(...args) {
     super(...args)
     this.state = {
-      copied: false
+      copied: false,
     }
   }
-  copyAddress (data) {
+  copyAddress(data) {
     link.send('tray:clipboardData', data)
     this.setState({ copied: true })
-    setTimeout(_ => this.setState({ copied: false }), 1000)
+    setTimeout((_) => this.setState({ copied: false }), 1000)
   }
-  render () {
+  render() {
     const req = this.props.req
     return (
       <div className='_txData'>
         <div className='_txDataInner'>
-          <div className='_txDataValue' onClick={() => {
-            this.props.overlayMode('data')
-          }}>
-           {req.data.data && req.data.data !== '0x' && req.data.data !== '0x0' ? (
+          <div
+            className='_txDataValue'
+            onClick={() => {
+              this.props.overlayMode('data')
+            }}
+          >
+            {req.data.data && req.data.data !== '0x' && req.data.data !== '0x0' ? (
               req.decodedData && req.decodedData.method ? (
                 <>
                   <span>{'Sending Data: '}</span>
-                  <span className={'_txDataValueMethod'}>{(() => {
-                    if (req.decodedData.method.length > 17) return `${req.decodedData.method.substr(0, 15)}..`
-                    return req.decodedData.method
-                  })()}</span>
+                  <span className={'_txDataValueMethod'}>
+                    {(() => {
+                      if (req.decodedData.method.length > 17) return `${req.decodedData.method.substr(0, 15)}..`
+                      return req.decodedData.method
+                    })()}
+                  </span>
                 </>
-               ) : (
+              ) : (
                 <span>{'Sending Data!'}</span>
               )
-            ) : 'No Data'}
-          </div>
-          <div className='_txLabel'>
-            Data
+            ) : (
+              'No Data'
+            )}
           </div>
+          <div className='_txLabel'>Data</div>
         </div>
       </div>
     )
   }
 }
 
-{/* <div className='transactionToAddressFull' onMouseDown={this.copyAddress.bind(this, req.data.to)}>
+{
+  /* <div className='transactionToAddressFull' onMouseDown={this.copyAddress.bind(this, req.data.to)}>
 {this.state.copied ? <span>{'Copied'}{svg.octicon('clippy', { height: 14 })}</span> : req.data.to}
-</div> */}
+</div> */
+}
 
 export default Restore.connect(txData)
diff --git a/app/App/Main/Account/Requests/TransactionRequest/TxFeeNew/index.js b/app/App/Main/Account/Requests/TransactionRequest/TxFeeNew/index.js
index afefd7cee..4a76e04b0 100644
--- a/app/App/Main/Account/Requests/TransactionRequest/TxFeeNew/index.js
+++ b/app/App/Main/Account/Requests/TransactionRequest/TxFeeNew/index.js
@@ -7,23 +7,23 @@ import { usesBaseFee } from '../../../../../../../resources/domain/transaction'
 const FEE_WARNING_THRESHOLD_USD = 50
 
 class TxFee extends React.Component {
-  constructor (props, context) {
+  constructor(props, context) {
     super(props, context)
-    this.chain = { 
-      type: 'ethereum', 
-      id: parseInt(props.req.data.chainId, 'hex')
+    this.chain = {
+      type: 'ethereum',
+      id: parseInt(props.req.data.chainId, 'hex'),
     }
   }
-  toDisplayUSD (bn) {
+  toDisplayUSD(bn) {
     return bn.toFixed(2, BigNumber.ROUND_UP).toString()
   }
-  toDisplayEther (bn) {
+  toDisplayEther(bn) {
     return parseFloat(bn.shiftedBy(-18).toFixed(6).toString())
   }
-  toDisplayGwei (bn) {
+  toDisplayGwei(bn) {
     return parseFloat(bn.shiftedBy(-9).toFixed(3).toString())
   }
-  render () {
+  render() {
     const req = this.props.req
 
     const layer = this.store('main.networks', this.chain.type, this.chain.id, 'layer')
@@ -55,52 +55,47 @@ class TxFee extends React.Component {
     const minFeeUSD = minFee.shiftedBy(-18).multipliedBy(nativeUSD)
 
     const currentSymbol = this.store('main.networks', this.props.chain.type, this.props.chain.id, 'symbol') || '?'
-    
+
     return (
       <div className='_txFee'>
         <div className='_txFeeInner'>
           <div className='_txFeeValues'>
-            <div className='_txFeeGwei' onClick={() => {
-              this.props.overlayMode('fee')
-            }}>
+            <div
+              className='_txFeeGwei'
+              onClick={() => {
+                this.props.overlayMode('fee')
+              }}
+            >
               <span className='_txFeeGweiValue'>{this.toDisplayGwei(maxFeePerGas)}</span>
               <span className='_txFeeGweiLabel'>Gwei</span>
             </div>
             {this.toDisplayUSD(maxFeeUSD) === '0.00' ? (
               <div className='_txFeeValue'>
                 <div className='_txFeeValueDefaultWarn'>
-                  <span className='_txFeeETH'>
-                    {currentSymbol || '?'}
-                  </span>
-                  <span className='_txFeeETHValue'>
-                    {this.toDisplayEther(maxFee)}
-                  </span>
-                </div> 
+                  <span className='_txFeeETH'>{currentSymbol || '?'}</span>
+                  <span className='_txFeeETHValue'>{this.toDisplayEther(maxFee)}</span>
+                </div>
               </div>
             ) : (
               <div className='_txFeeValue'>
-                <div className={maxFeeUSD.toNumber() > FEE_WARNING_THRESHOLD_USD || this.toDisplayUSD(maxFeeUSD) === '0.00' ? '_txFeeValueDefault _txFeeValueDefaultWarn' : '_txFeeValueDefault'}>
-                  <span className='_txFeeEq'>
-                    ≈
-                  </span>
-                  <span className='_txFeeUSDSymbol'>
-                    $
-                  </span>
+                <div
+                  className={
+                    maxFeeUSD.toNumber() > FEE_WARNING_THRESHOLD_USD || this.toDisplayUSD(maxFeeUSD) === '0.00'
+                      ? '_txFeeValueDefault _txFeeValueDefaultWarn'
+                      : '_txFeeValueDefault'
+                  }
+                >
+                  <span className='_txFeeEq'>≈</span>
+                  <span className='_txFeeUSDSymbol'>$</span>
                   <span className='_txFeeUSD'>
                     {`${this.toDisplayUSD(minFeeUSD)} - ${this.toDisplayUSD(maxFeeUSD)}`}
                   </span>
-                  <span className='_txFeeUSDDescription'>
-                    {`in ${currentSymbol || '?'}`}
-                  </span>
+                  <span className='_txFeeUSDDescription'>{`in ${currentSymbol || '?'}`}</span>
                 </div>
                 <div className='_txFeeValueHover'>
-                  <span className='_txFeeETH'>
-                    {currentSymbol || '?'}
-                  </span>
-                  <span className='_txFeeETHValue'>
-                    {this.toDisplayEther(maxFee)}
-                  </span>
-                </div> 
+                  <span className='_txFeeETH'>{currentSymbol || '?'}</span>
+                  <span className='_txFeeETHValue'>{this.toDisplayEther(maxFee)}</span>
+                </div>
               </div>
             )}
           </div>
diff --git a/app/App/Main/Account/Requests/TransactionRequest/TxMain/index.js b/app/App/Main/Account/Requests/TransactionRequest/TxMain/index.js
index b21f7d39e..85c2b2f3b 100644
--- a/app/App/Main/Account/Requests/TransactionRequest/TxMain/index.js
+++ b/app/App/Main/Account/Requests/TransactionRequest/TxMain/index.js
@@ -5,21 +5,21 @@ import svg from '../../../../../../../resources/svg'
 import utils from 'web3-utils'
 
 class TxRecipient extends React.Component {
-  constructor (...args) {
+  constructor(...args) {
     super(...args)
     this.state = {
-      copied: false
+      copied: false,
     }
   }
-  copyAddress (data) {
+  copyAddress(data) {
     link.send('tray:clipboardData', data)
     this.setState({ copied: true })
-    setTimeout(_ => this.setState({ copied: false }), 1000)
+    setTimeout((_) => this.setState({ copied: false }), 1000)
   }
-  hexToDisplayValue (hex) {
+  hexToDisplayValue(hex) {
     return (Math.round(parseFloat(utils.fromWei(hex, 'ether')) * 1000000) / 1000000).toFixed(6)
   }
-  render () {
+  render() {
     const req = this.props.req
     const layer = this.store('main.networks', this.props.chain.type, this.props.chain.id, 'layer')
     const nativeCurrency = this.store('main.networksMeta', this.props.chain.type, this.props.chain.id, 'nativeCurrency')
@@ -40,17 +40,17 @@ class TxRecipient extends React.Component {
               <span className='_txMainValueEqAmount'>{(value * etherUSD).toFixed(2)}</span>
             </div>
           </div>
-          <div className='_txLabel'>
-            Sending
-          </div>
+          <div className='_txLabel'>Sending</div>
         </div>
       </div>
     )
   }
 }
 
-{/* <div className='transactionToAddressFull' onMouseDown={this.copyAddress.bind(this, req.data.to)}>
+{
+  /* <div className='transactionToAddressFull' onMouseDown={this.copyAddress.bind(this, req.data.to)}>
 {this.state.copied ? <span>{'Copied'}{svg.octicon('clippy', { height: 14 })}</span> : req.data.to}
-</div> */}
+</div> */
+}
 
 export default Restore.connect(TxRecipient)
diff --git a/app/App/Main/Account/Requests/TransactionRequest/TxOverlay/TxDataOverlay/index.js b/app/App/Main/Account/Requests/TransactionRequest/TxOverlay/TxDataOverlay/index.js
index 78ccf6310..87fc3ddc3 100644
--- a/app/App/Main/Account/Requests/TransactionRequest/TxOverlay/TxDataOverlay/index.js
+++ b/app/App/Main/Account/Requests/TransactionRequest/TxOverlay/TxDataOverlay/index.js
@@ -6,36 +6,38 @@ import link from '../../../../../../../../resources/link'
 
 //  <div className='txModuleTop'>
 // <div className={'txModuleTopData txModuleTopDataExpanded'}>
-  // <div className='transactionDataNotice'>{svg.octicon('issue-opened', { height: 26 })}</div>
-  // <div className='transactionDataLabel'>View Data</div>
-  // <div className='transactionDataIndicator' onMouseDown={() => this.copyData(req.data.data)}>
-    // {svg.octicon('clippy', { height: 20 })}
-  // </div>
-// </div> 
+// <div className='transactionDataNotice'>{svg.octicon('issue-opened', { height: 26 })}</div>
+// <div className='transactionDataLabel'>View Data</div>
+// <div className='transactionDataIndicator' onMouseDown={() => this.copyData(req.data.data)}>
+// {svg.octicon('clippy', { height: 20 })}
+// </div>
+// </div>
 // <div className='txModuleBody'>
 
 class TxDataOverlay extends React.Component {
-  constructor (props, context) {
+  constructor(props, context) {
     super(props, context)
     this.state = {
-      copiedData: false
+      copiedData: false,
     }
   }
 
-  copyData (data) {
+  copyData(data) {
     if (data) {
       link.send('tray:clipboardData', data)
       this.setState({ copiedData: true })
-      setTimeout(_ => this.setState({ copiedData: false }), 1000)
+      setTimeout((_) => this.setState({ copiedData: false }), 1000)
     }
   }
 
-  render () {
+  render() {
     const { req, overlayMode } = this.props
     return (
       <div className='txOverlay cardShow'>
         <div className='txOverlayTitle'>Transaction Data</div>
-        <div className='txOverlayClose' onMouseDown={() => overlayMode()}>{svg.octicon('x', { height: 16 })}</div>
+        <div className='txOverlayClose' onMouseDown={() => overlayMode()}>
+          {svg.octicon('x', { height: 16 })}
+        </div>
         <div className='txDataOverlay'>
           {utils.toAscii(req.data.data || '0x') ? (
             <div className='transactionDataBodyInner'>
@@ -47,20 +49,18 @@ class TxDataOverlay extends React.Component {
                   <div className='decodedDataContractTarget'>
                     <div className='decodedDataSync decodedDataSyncLeft'>{svg.sync(16)}</div>
                     <div className='decodedDataSync decodedDataSyncRight'>{svg.sync(16)}</div>
-                    <div className='decodedDataContractName'>
-                      {req.decodedData.contractName}
-                    </div>
+                    <div className='decodedDataContractName'>{req.decodedData.contractName}</div>
                     <div className='decodedDataContractMethod'>
                       <div>{req.decodedData.method}</div>
                     </div>
                   </div>
                   <div className='decodedDataContractArgHeader'>Inputs</div>
-                  {req.decodedData.args.map(a => {
+                  {req.decodedData.args.map((a) => {
                     return (
                       <div key={a.name} className='decodedDataContractArg'>
                         <div className='overflowBox'>
                           {a.type.indexOf('[]') ? (
-                            a.value.split(',').map(i => <div key={i}>{i}</div>)
+                            a.value.split(',').map((i) => <div key={i}>{i}</div>)
                           ) : (
                             <div>{a.value}</div>
                           )}
@@ -70,7 +70,9 @@ class TxDataOverlay extends React.Component {
                     )
                   })}
                 </div>
-              ) : 'Could not decode data..'}
+              ) : (
+                'Could not decode data..'
+              )}
               <div className='txDataOverlayRaw'>
                 <div className='txDataOverlayRawTitle'>{'Raw Transaction Data'}</div>
                 <div className='txDataOverlayRawData' onClick={() => this.copyData(req.data.data)}>
@@ -86,7 +88,10 @@ class TxDataOverlay extends React.Component {
             </div>
           ) : (
             <div className='txModuleTop'>
-              <div className='txModuleTopData' style={{ display: 'flex', alignItems: 'center', justifyContent: 'center' }}>
+              <div
+                className='txModuleTopData'
+                style={{ display: 'flex', alignItems: 'center', justifyContent: 'center' }}
+              >
                 No Data
               </div>
             </div>
@@ -97,4 +102,4 @@ class TxDataOverlay extends React.Component {
   }
 }
 
-export default Restore.connect(TxDataOverlay)
\ No newline at end of file
+export default Restore.connect(TxDataOverlay)
diff --git a/app/App/Main/Account/Requests/TransactionRequest/TxOverlay/TxFeeOverlay/index.js b/app/App/Main/Account/Requests/TransactionRequest/TxOverlay/TxFeeOverlay/index.js
index 94f2632dc..0463d1355 100644
--- a/app/App/Main/Account/Requests/TransactionRequest/TxOverlay/TxFeeOverlay/index.js
+++ b/app/App/Main/Account/Requests/TransactionRequest/TxOverlay/TxFeeOverlay/index.js
@@ -8,7 +8,7 @@ import { usesBaseFee } from '../../../../../../../../resources/domain/transactio
 
 import BigNumber from 'bignumber.js'
 
-function maxFee (tx = { chainId: '' }) {
+function maxFee(tx = { chainId: '' }) {
   const chainId = parseInt(tx.chainId)
 
   // for ETH-based chains, the max fee should be 2 ETH
@@ -27,22 +27,22 @@ function maxFee (tx = { chainId: '' }) {
 
 //  <div className='txModuleTop'>
 // <div className={'txModuleTopData txModuleTopDataExpanded'}>
-  // <div className='transactionDataNotice'>{svg.octicon('issue-opened', { height: 26 })}</div>
-  // <div className='transactionDataLabel'>View Data</div>
-  // <div className='transactionDataIndicator' onMouseDown={() => this.copyData(req.data.data)}>
-    // {svg.octicon('clippy', { height: 20 })}
-  // </div>
-// </div> 
+// <div className='transactionDataNotice'>{svg.octicon('issue-opened', { height: 26 })}</div>
+// <div className='transactionDataLabel'>View Data</div>
+// <div className='transactionDataIndicator' onMouseDown={() => this.copyData(req.data.data)}>
+// {svg.octicon('clippy', { height: 20 })}
+// </div>
+// </div>
 // <div className='txModuleBody'>
 
 class TxFeeOverlay extends React.Component {
-  constructor (props, context) {
+  constructor(props, context) {
     super(props, context)
 
     this.moduleRef = React.createRef()
 
     this.state = {
-      copiedData: false
+      copiedData: false,
     }
 
     if (usesBaseFee(props.req.data)) {
@@ -61,45 +61,45 @@ class TxFeeOverlay extends React.Component {
     this.state.gasLimit = BigNumber(props.req.data.gasLimit, 16).toString()
   }
 
-  mouseDetect (e) {
+  mouseDetect(e) {
     if (this.moduleRef && this.moduleRef.current && !this.moduleRef.current.contains(e.target)) {
       this.props.overlayMode()
     }
   }
 
-  componentDidMount () {
+  componentDidMount() {
     document.addEventListener('mousedown', this.mouseDetect.bind(this))
   }
 
-  componentWillUnmount () {
+  componentWillUnmount() {
     document.removeEventListener('mousedown', this.mouseDetect.bind(this))
   }
 
-  copyData (data) {
+  copyData(data) {
     if (data) {
       link.send('tray:clipboardData', data)
       this.setState({ copiedData: true })
-      setTimeout(_ => this.setState({ copiedData: false }), 1000)
+      setTimeout((_) => this.setState({ copiedData: false }), 1000)
     }
   }
 
-  toDisplayEther (bn) {
+  toDisplayEther(bn) {
     return parseFloat(bn.shiftedBy(-18).toFixed(6).toString())
   }
 
-  toDisplayFromWei (bn) {
-    return bn.shiftedBy(-9).toFixed(9).toString().replace(/0+$/,'').replace(/\.+$/,'')
+  toDisplayFromWei(bn) {
+    return bn.shiftedBy(-9).toFixed(9).toString().replace(/0+$/, '').replace(/\.+$/, '')
   }
 
-  toDisplayFromGwei (bn) {
-    return bn.toFixed(9).toString().replace(/0+$/,'').replace(/\.+$/,'')
+  toDisplayFromGwei(bn) {
+    return bn.toFixed(9).toString().replace(/0+$/, '').replace(/\.+$/, '')
   }
 
-  trimGwei (gwei) {
+  trimGwei(gwei) {
     return parseFloat(parseFloat(gwei).toFixed(3)).toString()
   }
 
-  setBaseFee (baseFee) {
+  setBaseFee(baseFee) {
     this.setState({ baseFee })
     clearTimeout(this.baseFeeSubmitTimeout)
     this.baseFeeSubmitTimeout = setTimeout(() => {
@@ -109,18 +109,18 @@ class TxFeeOverlay extends React.Component {
       const priorityFee = parseFloat(this.state.priorityFee)
       const gasLimit = parseInt(this.state.gasLimit)
       const maxTotalFee = maxFee(this.props.req.data)
-      
+
       if (gweiToWei(baseFee + priorityFee) * gasLimit > maxTotalFee) {
         baseFee = Math.floor(maxTotalFee / gasLimit / 1e9) - priorityFee
       }
-      link.rpc('setBaseFee', gweiToWeiHex(baseFee), this.props.req.handlerId, e => {
+      link.rpc('setBaseFee', gweiToWeiHex(baseFee), this.props.req.handlerId, (e) => {
         if (e) console.error(e)
       })
       this.setState({ baseFee: this.toDisplayFromGwei(BigNumber(baseFee)) })
     }, 500)
   }
 
-  setPriorityFee (priorityFee) {
+  setPriorityFee(priorityFee) {
     this.setState({ priorityFee })
     clearTimeout(this.priorityFeeSubmitTimeout)
     this.priorityFeeSubmitTimeout = setTimeout(() => {
@@ -134,16 +134,18 @@ class TxFeeOverlay extends React.Component {
       if (gweiToWei(baseFee + priorityFee) * gasLimit > maxTotalFee) {
         priorityFee = Math.floor(maxTotalFee / gasLimit / 1e9) - baseFee
       }
-      link.rpc('setPriorityFee', gweiToWeiHex(priorityFee), this.props.req.handlerId, e => {
+      link.rpc('setPriorityFee', gweiToWeiHex(priorityFee), this.props.req.handlerId, (e) => {
         if (e) console.error(e)
       })
-      if (this.toDisplayFromGwei(BigNumber(priorityFee)) !== this.toDisplayFromGwei(BigNumber(this.state.priorityFee))) {
+      if (
+        this.toDisplayFromGwei(BigNumber(priorityFee)) !== this.toDisplayFromGwei(BigNumber(this.state.priorityFee))
+      ) {
         this.setState({ priorityFee: this.toDisplayFromGwei(BigNumber(priorityFee)) })
       }
     }, 500)
   }
 
-  setGasPrice (gasPrice) {
+  setGasPrice(gasPrice) {
     this.setState({ gasPrice })
     clearTimeout(this.gasPriceSubmitTimeout)
     this.gasPriceSubmitTimeout = setTimeout(() => {
@@ -156,14 +158,14 @@ class TxFeeOverlay extends React.Component {
       if (gweiToWei(gasPrice) * gasLimit > maxTotalFee) {
         gasPrice = Math.floor(maxTotalFee / gasLimit / 1e9)
       }
-      link.rpc('setGasPrice', gweiToWeiHex(gasPrice), this.props.req.handlerId, e => {
+      link.rpc('setGasPrice', gweiToWeiHex(gasPrice), this.props.req.handlerId, (e) => {
         if (e) console.error(e)
       })
       this.setState({ gasPrice: this.toDisplayFromGwei(BigNumber(gasPrice)) })
     }, 500)
   }
 
-  setGasLimit (gasLimit) {
+  setGasLimit(gasLimit) {
     this.setState({ gasLimit })
     clearTimeout(this.gasLimitSubmitTimeout)
     this.gasLimitSubmitTimeout = setTimeout(() => {
@@ -186,20 +188,20 @@ class TxFeeOverlay extends React.Component {
           gasLimit = Math.floor(maxTotalFee / gweiToWei(gasPrice))
         }
       }
-      link.rpc('setGasLimit', '0x' + gasLimit.toString(16), this.props.req.handlerId, e => {
+      link.rpc('setGasLimit', '0x' + gasLimit.toString(16), this.props.req.handlerId, (e) => {
         if (e) console.error(e)
       })
       this.setState({ gasLimit: gasLimit.toString() })
     }, 500)
   }
 
-  limitRange (num, min, max) {
+  limitRange(num, min, max) {
     if (num > max) return max
     if (num < min) return min
     return num
   }
 
-  renderBaseFeeInput () {
+  renderBaseFeeInput() {
     return (
       <div className='txFeeOverlayBaseFee'>
         <div className='txFeeOverlayInput'>
@@ -207,7 +209,7 @@ class TxFeeOverlay extends React.Component {
             tabIndex={0}
             value={this.state.baseFee}
             onChange={(e) => {
-              this.setBaseFee(e.target.value.match('[0-9\.\-]*').toString())
+              this.setBaseFee(e.target.value.match('[0-9.-]*').toString())
             }}
             onKeyDown={(e) => {
               if (e.key === 'Enter') {
@@ -236,15 +238,15 @@ class TxFeeOverlay extends React.Component {
     )
   }
 
-  renderPriorityFeeInput () {
+  renderPriorityFeeInput() {
     return (
       <div className='txFeeOverlayPriorityFee'>
         <div className='txFeeOverlayInput'>
-        <input
+          <input
             tabIndex={1}
             value={this.state.priorityFee}
             onChange={(e) => {
-              this.setPriorityFee(e.target.value.match('[0-9\.\-]*'))
+              this.setPriorityFee(e.target.value.match('[0-9.-]*'))
             }}
             onKeyDown={(e) => {
               if (e.key === 'Enter') {
@@ -273,7 +275,7 @@ class TxFeeOverlay extends React.Component {
     )
   }
 
-  renderGasPriceInput () {
+  renderGasPriceInput() {
     return (
       <div className='txFeeOverlayBaseFee'>
         <div className='txFeeOverlayInput'>
@@ -281,7 +283,7 @@ class TxFeeOverlay extends React.Component {
             tabIndex={0}
             value={this.state.gasPrice}
             onChange={(e) => {
-              this.setGasPrice(e.target.value.match('[0-9\.\-]*').toString())
+              this.setGasPrice(e.target.value.match('[0-9.-]*').toString())
             }}
             onKeyDown={(e) => {
               if (e.key === 'Enter') {
@@ -310,14 +312,14 @@ class TxFeeOverlay extends React.Component {
     )
   }
 
-  renderGasLimitInput () {
+  renderGasLimitInput() {
     return (
       <div className='txFeeOverlayLimit'>
         <div className='txFeeOverlayInput'>
-          <input 
-            tabIndex={3} 
+          <input
+            tabIndex={3}
             value={this.state.gasLimit}
-            className='txFeeOverlayInput' 
+            className='txFeeOverlayInput'
             onChange={(e) => {
               this.setGasLimit(e.target.value.match('[0-9]*'))
             }}
@@ -344,7 +346,7 @@ class TxFeeOverlay extends React.Component {
     )
   }
 
-  render () {
+  render() {
     const { req, overlayMode } = this.props
     if (usesBaseFee(req.data)) {
       // const baseFee = BigNumber(this.state.maxFeePerGas, 16)
@@ -356,7 +358,9 @@ class TxFeeOverlay extends React.Component {
       return (
         <div className='txOverlay cardShow' ref={this.moduleRef}>
           <div className='txOverlayTitle'>Adjust Fee</div>
-          <div className='txOverlayClose' onMouseDown={() => overlayMode()}>{svg.octicon('x', { height: 16 })}</div>
+          <div className='txOverlayClose' onMouseDown={() => overlayMode()}>
+            {svg.octicon('x', { height: 16 })}
+          </div>
           <div className='txFeeOverlay'>
             <div className='txFeeOverlayInset'>
               <div className='txFeeOverlayEstimate'></div>
@@ -375,7 +379,9 @@ class TxFeeOverlay extends React.Component {
       return (
         <div className='txOverlay cardShow' ref={this.moduleRef}>
           <div className='txOverlayTitle'>Adjust Fee</div>
-          <div className='txOverlayClose' onMouseDown={() => overlayMode()}>{svg.octicon('x', { height: 16 })}</div>
+          <div className='txOverlayClose' onMouseDown={() => overlayMode()}>
+            {svg.octicon('x', { height: 16 })}
+          </div>
           <div className='txFeeOverlay'>
             <div className='txFeeOverlayInset'>
               <div className='txFeeOverlayEstimate'></div>
diff --git a/app/App/Main/Account/Requests/TransactionRequest/TxOverlay/index.js b/app/App/Main/Account/Requests/TransactionRequest/TxOverlay/index.js
index 0415a41a2..3eeee22ce 100644
--- a/app/App/Main/Account/Requests/TransactionRequest/TxOverlay/index.js
+++ b/app/App/Main/Account/Requests/TransactionRequest/TxOverlay/index.js
@@ -8,15 +8,14 @@ import TxDataOverlay from './TxDataOverlay'
 import TxFeeOverlay from './TxFeeOverlay'
 
 class TxModule extends React.Component {
-  constructor (props, context) {
+  constructor(props, context) {
     super(props, context)
     this.moduleRef = React.createRef()
     this.state = {
-      active: false
+      active: false,
     }
   }
 
-
   // setActive (active) {
   //   if (!this.props.req || !this.props.req.data || !this.props.req.data.data) return
   //   this.setState({ active })
@@ -32,8 +31,7 @@ class TxModule extends React.Component {
   //   }
   // }
 
-
-  render () {
+  render() {
     const { overlay } = this.props
     if (overlay === 'fee') {
       return <TxFeeOverlay {...this.props} />
diff --git a/app/App/Main/Account/Requests/TransactionRequest/TxRecipient/index.js b/app/App/Main/Account/Requests/TransactionRequest/TxRecipient/index.js
index dff7327f1..f2e0286a5 100644
--- a/app/App/Main/Account/Requests/TransactionRequest/TxRecipient/index.js
+++ b/app/App/Main/Account/Requests/TransactionRequest/TxRecipient/index.js
@@ -6,59 +6,68 @@ import link from '../../../../../../../resources/link'
 import svg from '../../../../../../../resources/svg'
 
 class TxRecipient extends React.Component {
-  constructor (...args) {
+  constructor(...args) {
     super(...args)
     this.state = {
-      copied: false
+      copied: false,
     }
   }
-  copyAddress (data) {
+  copyAddress(data) {
     link.send('tray:clipboardData', data)
     this.setState({ copied: true })
-    setTimeout(_ => this.setState({ copied: false }), 1000)
+    setTimeout((_) => this.setState({ copied: false }), 1000)
   }
-  render () {
+  render() {
     const req = this.props.req
     const address = req.data.to ? getAddress(req.data.to) : ''
-    const ensName = (req.recipient && req.recipient.length < 25) ? req.recipient : ''
+    const ensName = req.recipient && req.recipient.length < 25 ? req.recipient : ''
 
     return (
       <div className='_txRecipient'>
         <div className='_txRecipientInner'>
           {address ? (
             <div className='_txRecipientSlice _txRecipientValue'>
-              {ensName
-                ? <span>{ensName}</span>
-                : <span>{address.substring(0, 6)}{svg.octicon('kebab-horizontal', { height: 15 })}{address.substring(address.length - 4)}</span>
-              }
-              {req.decodedData && req.decodedData.contractName ? ( 
-                <span className={'_txRecipientContract'}>{(() => {
-                  if (req.decodedData.contractName.length > 11) return `${req.decodedData.contractName.substr(0, 9)}..`
-                  return req.decodedData.contractName
-                })()}</span>
+              {ensName ? (
+                <span>{ensName}</span>
+              ) : (
+                <span>
+                  {address.substring(0, 6)}
+                  {svg.octicon('kebab-horizontal', { height: 15 })}
+                  {address.substring(address.length - 4)}
+                </span>
+              )}
+              {req.decodedData && req.decodedData.contractName ? (
+                <span className={'_txRecipientContract'}>
+                  {(() => {
+                    if (req.decodedData.contractName.length > 11)
+                      return `${req.decodedData.contractName.substr(0, 9)}..`
+                    return req.decodedData.contractName
+                  })()}
+                </span>
               ) : null}
-              <div className='_txRecipientFull' onClick={() => {
-                this.copyAddress(address)
-              }}>
+              <div
+                className='_txRecipientFull'
+                onClick={() => {
+                  this.copyAddress(address)
+                }}
+              >
                 {this.state.copied ? 'Address Copied' : address}
               </div>
             </div>
           ) : (
-            <div className='_txRecipientSlice _txRecipientValue'>
-              Deploying Contract
-            </div>
+            <div className='_txRecipientSlice _txRecipientValue'>Deploying Contract</div>
           )}
-          <div className='_txLabel'>
-            Recipient
-          </div>
+          <div className='_txLabel'>Recipient</div>
         </div>
       </div>
     )
   }
 }
 
-{/* <div className='transactionToAddressFull' onMouseDown={this.copyAddress.bind(this, req.data.to)}>
+{
+  /* <div className='transactionToAddressFull' onMouseDown={this.copyAddress.bind(this, req.data.to)}>
 {this.state.copied ? <span>{'Copied'}{svg.octicon('clippy', { height: 14 })}</span> : req.data.to}
-</div> */}
+</div> */
+}
 
 export default Restore.connect(TxRecipient)
diff --git a/app/App/Main/Account/Requests/TransactionRequest/index.js b/app/App/Main/Account/Requests/TransactionRequest/index.js
index 4bb4646d4..c3badcf50 100644
--- a/app/App/Main/Account/Requests/TransactionRequest/index.js
+++ b/app/App/Main/Account/Requests/TransactionRequest/index.js
@@ -25,17 +25,17 @@ import TxApproval from './TxApproval'
 const FEE_WARNING_THRESHOLD_USD = 50
 
 class Time extends React.Component {
-  constructor (...args) {
+  constructor(...args) {
     super(...args)
     this.state = {
-      time: Date.now()
+      time: Date.now(),
     }
     setInterval(() => {
       this.setState({ time: Date.now() })
     }, 1000)
   }
 
-  msToTime (duration) {
+  msToTime(duration) {
     const seconds = Math.floor((duration / 1000) % 60)
     const minutes = Math.floor((duration / (1000 * 60)) % 60)
     const hours = Math.floor((duration / (1000 * 60 * 60)) % 24)
@@ -53,27 +53,23 @@ class Time extends React.Component {
     return { time, label }
   }
 
-  render () {
+  render() {
     const { time, label } = this.msToTime(this.state.time - this.props.time)
     return (
       <div className='txProgressSuccessItem txProgressSuccessItemRight'>
-        <div className='txProgressSuccessItemValue'>
-          {time}
-        </div>
-        <div className='txProgressSuccessItemLabel'>
-          {label}
-        </div>
+        <div className='txProgressSuccessItemValue'>{time}</div>
+        <div className='txProgressSuccessItemLabel'>{label}</div>
       </div>
     )
   }
 }
 
 class TransactionRequest extends React.Component {
-  constructor (props, context) {
+  constructor(props, context) {
     super(props, context)
-    this.chain = { 
-      type: 'ethereum', 
-      id: parseInt(props.req.data.chainId, 'hex')
+    this.chain = {
+      type: 'ethereum',
+      id: parseInt(props.req.data.chainId, 'hex'),
     }
     this.state = { allowInput: false, dataView: false }
 
@@ -82,29 +78,29 @@ class TransactionRequest extends React.Component {
     }, props.signingDelay || 1500)
   }
 
-  copyAddress (data) {
+  copyAddress(data) {
     link.send('tray:clipboardData', data)
     this.setState({ copied: true })
-    setTimeout(_ => this.setState({ copied: false }), 1000)
+    setTimeout((_) => this.setState({ copied: false }), 1000)
   }
 
-  approve (reqId, req) {
+  approve(reqId, req) {
     link.rpc('approveRequest', req, () => {}) // Move to link.send
   }
 
-  decline (req) {
+  decline(req) {
     link.rpc('declineRequest', req, () => {}) // Move to link.send
   }
 
-  toggleDataView (id) {
+  toggleDataView(id) {
     this.setState({ dataView: !this.state.dataView })
   }
 
-  hexToDisplayValue (hex) {
+  hexToDisplayValue(hex) {
     return (Math.round(parseFloat(utils.fromWei(hex, 'ether')) * 1000000) / 1000000).toFixed(6)
   }
 
-  txSectionStyle (index, height) {
+  txSectionStyle(index, height) {
     if (this.state.selectedIndex === index) {
       return {
         transform: `translateY(${0}px)`,
@@ -114,35 +110,35 @@ class TransactionRequest extends React.Component {
         background: 'rgba(237, 242, 253, 1)',
         left: '10px',
         right: '10px',
-        padding: '0px 30px'
+        padding: '0px 30px',
       }
     } else {
       return {
-        transform: `translateY(${(index * -40) - 60}px)`,
-        zIndex: 1
+        transform: `translateY(${index * -40 - 60}px)`,
+        zIndex: 1,
       }
     }
   }
 
-  copyData (data) {
+  copyData(data) {
     link.send('tray:clipboardData', data)
     this.setState({ copiedData: true })
-    setTimeout(_ => this.setState({ copiedData: false }), 1000)
+    setTimeout((_) => this.setState({ copiedData: false }), 1000)
   }
 
-  overlayMode (mode) {
+  overlayMode(mode) {
     this.setState({ overlayMode: mode })
   }
 
-  toDisplayUSD (bn) {
+  toDisplayUSD(bn) {
     return bn.toFixed(2, BigNumber.ROUND_UP).toString()
   }
 
-  allowOtherChain () {
+  allowOtherChain() {
     this.setState({ allowOtherChain: true })
   }
 
-  render () {
+  render() {
     const { accountId, handlerId } = this.props
     const req = this.store('main.accounts', accountId, 'requests', handlerId)
     const originalNotice = (req.notice || '').toLowerCase()
@@ -153,7 +149,7 @@ class TransactionRequest extends React.Component {
     const toAddress = req.data && req.data.to ? getAddress(req.data.to) : ''
     let requestClass = 'signerRequest'
     if (mode === 'monitor') requestClass += ' signerRequestMonitor'
-    const success = (req.status === 'confirming' || req.status === 'confirmed')
+    const success = req.status === 'confirming' || req.status === 'confirmed'
     const error = req.status === 'error' || req.status === 'declined'
     if (success) requestClass += ' signerRequestSuccess'
     if (req.status === 'confirmed') requestClass += ' signerRequestConfirmed'
@@ -197,10 +193,10 @@ class TransactionRequest extends React.Component {
     // }
     if (mode !== 'monitor' && req.data.nonce) {
       const r = this.store('main.accounts', this.props.accountId, 'requests')
-      const requests = Object.keys(r || {}).map(key => r[key])
-      const monitor = requests.filter(req => req.mode === 'monitor')
-      const monitorFilter = monitor.filter(r => r.status !== 'error')
-      const existingNonces = monitorFilter.map(m => m.data.nonce)
+      const requests = Object.keys(r || {}).map((key) => r[key])
+      const monitor = requests.filter((req) => req.mode === 'monitor')
+      const monitorFilter = monitor.filter((r) => r.status !== 'error')
+      const existingNonces = monitorFilter.map((m) => m.data.nonce)
       existingNonces.forEach((nonce, i) => {
         if (req.data.nonce === nonce) {
           txMeta.replacement = true
@@ -214,11 +210,13 @@ class TransactionRequest extends React.Component {
             txMeta.possible = false
             txMeta.notice = 'gas price too low'
           } else if (
-              req.data.maxPriorityFeePerGas &&
-              req.data.maxFeePerGas &&
-              Math.ceil(parseInt(monitorFilter[i].data.maxPriorityFeePerGas, 'hex') * 1.1) > parseInt(req.data.maxPriorityFeePerGas, 'hex') &&
-              Math.ceil(parseInt(monitorFilter[i].data.maxFeePerGas, 'hex') * 1.1) > parseInt(req.data.maxFeePerGas, 'hex')
-            ) {
+            req.data.maxPriorityFeePerGas &&
+            req.data.maxFeePerGas &&
+            Math.ceil(parseInt(monitorFilter[i].data.maxPriorityFeePerGas, 'hex') * 1.1) >
+              parseInt(req.data.maxPriorityFeePerGas, 'hex') &&
+            Math.ceil(parseInt(monitorFilter[i].data.maxFeePerGas, 'hex') * 1.1) >
+              parseInt(req.data.maxFeePerGas, 'hex')
+          ) {
             txMeta.possible = false
             txMeta.notice = 'gas fees too low'
           }
@@ -246,20 +244,21 @@ class TransactionRequest extends React.Component {
     }
 
     const hexId = '0x' + parseInt(this.chain.id).toString('16')
-    const chainName = this.store('main.networks.ethereum', this.chain.id, 'name') 
+    const chainName = this.store('main.networks.ethereum', this.chain.id, 'name')
 
     const showWarning = !status && mode !== 'monitor'
-    const requiredApproval = showWarning && (req.approvals || []).filter(a => !a.approved)[0]
+    const requiredApproval = showWarning && (req.approvals || []).filter((a) => !a.approved)[0]
     return (
       <div key={req.handlerId} className={requestClass}>
-        <TxOverlay {...this.props} overlay={this.state.overlayMode} overlayMode={this.overlayMode.bind(this)}/>
+        <TxOverlay {...this.props} overlay={this.state.overlayMode} overlayMode={this.overlayMode.bind(this)} />
         {req.type === 'transaction' ? (
           <div className='approveTransaction'>
             {!!requiredApproval ? (
               <TxApproval
                 req={this.props.req}
                 approval={requiredApproval}
-                allowOtherChain={this.allowOtherChain.bind(this)} />
+                allowOtherChain={this.allowOtherChain.bind(this)}
+              />
             ) : null}
             <div className='approveTransactionPayload'>
               {notice ? (
@@ -268,9 +267,7 @@ class TransactionRequest extends React.Component {
                     {!error ? (
                       <div className={success || !req.tx ? 'txAugment txAugmentHidden' : 'txAugment'}>
                         {this.state.txHashCopied ? (
-                          <div className={'txDetailsOptions txDetailsOptionsTxHash'}>
-                            Transaction Hash Copied
-                          </div>
+                          <div className={'txDetailsOptions txDetailsOptionsTxHash'}>Transaction Hash Copied</div>
                         ) : this.state.viewDetailsHover ? (
                           <div
                             className={'txDetailsOptions'}
@@ -291,7 +288,10 @@ class TransactionRequest extends React.Component {
                                   if (this.store('main.mute.explorerWarning')) {
                                     link.send('tray:openExplorer', req.tx.hash, this.chain)
                                   } else {
-                                    this.store.notify('openExplorer', { hash: req.tx.hash, chain: this.chain })
+                                    this.store.notify('openExplorer', {
+                                      hash: req.tx.hash,
+                                      chain: this.chain,
+                                    })
                                   }
                                 }
                               }}
@@ -316,7 +316,9 @@ class TransactionRequest extends React.Component {
                         ) : (
                           <>
                             <div
-                              className={req && req.tx && req.tx.hash ? 'txDetails txDetailsShow' : 'txDetails txDetailsHide'}
+                              className={
+                                req && req.tx && req.tx.hash ? 'txDetails txDetailsShow' : 'txDetails txDetailsHide'
+                              }
                               onMouseOver={() => {
                                 clearTimeout(this.viewDetailsHoverTimer)
                                 this.setState({ viewDetailsHover: true })
@@ -329,10 +331,16 @@ class TransactionRequest extends React.Component {
                             >
                               View Details
                             </div>
-                            <div className='txAugmentCancel' onMouseDown={() => link.send('tray:replaceTx', req.handlerId, 'cancel')}>
+                            <div
+                              className='txAugmentCancel'
+                              onMouseDown={() => link.send('tray:replaceTx', req.handlerId, 'cancel')}
+                            >
                               Cancel
                             </div>
-                            <div className='txAugmentSpeedUp' onMouseDown={() => link.send('tray:replaceTx', req.handlerId, 'speed')}>
+                            <div
+                              className='txAugmentSpeedUp'
+                              onMouseDown={() => link.send('tray:replaceTx', req.handlerId, 'speed')}
+                            >
                               Speed Up
                             </div>
                           </>
@@ -348,18 +356,14 @@ class TransactionRequest extends React.Component {
                       {req && req.tx && req.tx.receipt ? (
                         <>
                           <div className='txProgressSuccessItem txProgressSuccessItemLeft'>
-                            <div className='txProgressSuccessItemLabel'>
-                              In Block
-                            </div>
+                            <div className='txProgressSuccessItemLabel'>In Block</div>
                             <div className='txProgressSuccessItemValue'>
                               {parseInt(req.tx.receipt.blockNumber, 'hex')}
                             </div>
                           </div>
                           <Time time={req.completed} />
                           <div className='txProgressSuccessItem txProgressSuccessItemCenter'>
-                            <div className='txProgressSuccessItemLabel'>
-                              Fee
-                            </div>
+                            <div className='txProgressSuccessItemLabel'>Fee</div>
                             <div className='txProgressSuccessItemValue'>
                               <div style={{ margin: '0px 1px 0px 0px', fontSize: '10px' }}>$</div>
                               {feeAtTime || '?.??'}
@@ -368,30 +372,67 @@ class TransactionRequest extends React.Component {
                         </>
                       ) : null}
                     </div>
-                    <div className={statusClass} style={!req.tx && !error && mode === 'monitor' ? { bottom: '60px' } : {}}>
+                    <div
+                      className={statusClass}
+                      style={!req.tx && !error && mode === 'monitor' ? { bottom: '60px' } : {}}
+                    >
                       {success ? <div>Successful</div> : null}
                       <div className='txProgressNotice'>
-                        <div className={success || (mode === 'monitor' && status !== 'verifying') ? 'txProgressNoticeBars txProgressNoticeHidden' : 'txProgressNoticeBars'}>
-                          {[...Array(10).keys()].map(i => {
+                        <div
+                          className={
+                            success || (mode === 'monitor' && status !== 'verifying')
+                              ? 'txProgressNoticeBars txProgressNoticeHidden'
+                              : 'txProgressNoticeBars'
+                          }
+                        >
+                          {[...Array(10).keys()].map((i) => {
                             return <div key={'f' + i} className={`txProgressNoticeBar txProgressNoticeBar-${i}`} />
                           })}
                           <div className='txProgressNoticeBarDeadzone' />
-                          {[...Array(10).keys()].reverse().map(i => {
+                          {[...Array(10).keys()].reverse().map((i) => {
                             return <div key={'r' + i} className={`txProgressNoticeBar txProgressNoticeBar-${i}`} />
                           })}
                         </div>
-                        <div className={success || (mode === 'monitor' && status !== 'verifying') ? 'txProgressNoticeIcon txProgressNoticeHidden' : 'txProgressNoticeIcon'}>
+                        <div
+                          className={
+                            success || (mode === 'monitor' && status !== 'verifying')
+                              ? 'txProgressNoticeIcon txProgressNoticeHidden'
+                              : 'txProgressNoticeIcon'
+                          }
+                        >
                           {status === 'pending' ? svg.sign(23) : null}
                           {status === 'sending' ? svg.send(19) : null}
                           {status === 'verifying' ? svg.octicon('check', { height: 26 }) : null}
                           {status === 'error' ? svg.octicon('circle-slash', { height: 22 }) : null}
                         </div>
-                        <div className={success ? 'txProgressNoticeText txProgressNoticeHidden' : mode === 'monitor' ? 'txProgressNoticeText txProgressNoticeSuccess' : 'txProgressNoticeText'}>
-                          <div className='txProgressDetailError' onMouseDown={() => { if (req && notice && notice.toLowerCase() === 'please enable contract data on the ethereum app settings') this.store.notify('contractData') }}>
+                        <div
+                          className={
+                            success
+                              ? 'txProgressNoticeText txProgressNoticeHidden'
+                              : mode === 'monitor'
+                              ? 'txProgressNoticeText txProgressNoticeSuccess'
+                              : 'txProgressNoticeText'
+                          }
+                        >
+                          <div
+                            className='txProgressDetailError'
+                            onMouseDown={() => {
+                              if (
+                                req &&
+                                notice &&
+                                notice.toLowerCase() === 'please enable contract data on the ethereum app settings'
+                              )
+                                this.store.notify('contractData')
+                            }}
+                          >
                             {status === 'verifying' || status === 'confirming' || status === 'confirmed' ? '' : notice}
                           </div>
                         </div>
-                        {status === 'pending' ? <div className='txProgressCancel' onMouseDown={() => this.decline(this.props.req)}>Cancel</div> : null}
+                        {status === 'pending' ? (
+                          <div className='txProgressCancel' onMouseDown={() => this.decline(this.props.req)}>
+                            Cancel
+                          </div>
+                        ) : null}
                       </div>
                     </div>
                     <TxBar req={req} />
@@ -406,7 +447,7 @@ class TransactionRequest extends React.Component {
                             {toAddress.substring(2, 5)}
                             {svg.octicon('kebab-horizontal', { height: 14 })}
                             {toAddress.substring(toAddress.length - 3)}
-                           </span>
+                          </span>
                           <span className='monitorSub'>{'ON'} </span>
                           <span className='monitorSub monitorSubHighlight'>
                             {}
@@ -418,16 +459,23 @@ class TransactionRequest extends React.Component {
                       )}
                     </div>
                     <div className='monitorConfirms'>
-                      {[...Array(12).keys()].map(i => {
-                        const monitorConfirmsItem = confirmations > i ? 'txProgressConfirmsItem txProgressConfirmsItemGood' : 'txProgressConfirmsItem'
-                        return <div key={i} className={monitorConfirmsItem}>{svg.octicon('chevron-right', { height: 14 })}</div>
+                      {[...Array(12).keys()].map((i) => {
+                        const monitorConfirmsItem =
+                          confirmations > i
+                            ? 'txProgressConfirmsItem txProgressConfirmsItemGood'
+                            : 'txProgressConfirmsItem'
+                        return (
+                          <div key={i} className={monitorConfirmsItem}>
+                            {svg.octicon('chevron-right', { height: 14 })}
+                          </div>
+                        )
                       })}
                     </div>
                   </div>
                 </div>
               ) : (
                 <>
-                  <RequestItem 
+                  <RequestItem
                     req={req}
                     account={accountId}
                     handlerId={req.handlerId}
@@ -439,9 +487,7 @@ class TransactionRequest extends React.Component {
                   />
                   {txMeta.replacement ? (
                     txMeta.possible ? (
-                      <div className='approveRequestHeaderTag'>
-                        valid replacement
-                      </div>
+                      <div className='approveRequestHeaderTag'>valid replacement</div>
                     ) : (
                       <div className='approveRequestHeaderTag approveRequestHeaderTagInvalid'>
                         {txMeta.notice || 'invalid duplicate'}
@@ -450,7 +496,7 @@ class TransactionRequest extends React.Component {
                   ) : null}
                   <div className='_txBody'>
                     <TxRecipient {...this.props} />
-                    <TxMain {...this.props} chain={this.chain}/>
+                    <TxMain {...this.props} chain={this.chain} />
                     <TxData {...this.props} overlayMode={this.overlayMode.bind(this)} />
                     <TxFeeNew {...this.props} chain={this.chain} overlayMode={this.overlayMode.bind(this)} />
                   </div>
@@ -458,25 +504,43 @@ class TransactionRequest extends React.Component {
                     <div className='requestApprove'>
                       {req.automaticFeeUpdateNotice ? (
                         <div className='requestApproveFeeBlock cardShow'>
-                          <div className='requestApproveFeeButton requestApproveFeeReject' onClick={() => {
-                            const { previousFee } = req.automaticFeeUpdateNotice
-                            if (previousFee.type === '0x2') {
-                              link.rpc('setBaseFee', previousFee.baseFee, req.handlerId, e => { if (e) console.error(e) })
-                              link.rpc('setPriorityFee', previousFee.priorityFee, req.handlerId, e => { if (e) console.error(e) })
-                            } else if (previousFee.type === '0x0')  {
-                              link.rpc('setGasPrice', previousFee.gasPrice, req.handlerId, e => { if (e) console.error(e) })
-                            }
-                          }}>{'reject'}</div>
+                          <div
+                            className='requestApproveFeeButton requestApproveFeeReject'
+                            onClick={() => {
+                              const { previousFee } = req.automaticFeeUpdateNotice
+                              if (previousFee.type === '0x2') {
+                                link.rpc('setBaseFee', previousFee.baseFee, req.handlerId, (e) => {
+                                  if (e) console.error(e)
+                                })
+                                link.rpc('setPriorityFee', previousFee.priorityFee, req.handlerId, (e) => {
+                                  if (e) console.error(e)
+                                })
+                              } else if (previousFee.type === '0x0') {
+                                link.rpc('setGasPrice', previousFee.gasPrice, req.handlerId, (e) => {
+                                  if (e) console.error(e)
+                                })
+                              }
+                            }}
+                          >
+                            {'reject'}
+                          </div>
                           <div>{'fee updated'}</div>
-                          <div className='requestApproveFeeButton requestApproveFeeAccept' onClick={() => {
-                            link.rpc('removeFeeUpdateNotice', req.handlerId, e => { if (e) console.error(e) })
-                          }}>{'accept'}</div>
+                          <div
+                            className='requestApproveFeeButton requestApproveFeeAccept'
+                            onClick={() => {
+                              link.rpc('removeFeeUpdateNotice', req.handlerId, (e) => {
+                                if (e) console.error(e)
+                              })
+                            }}
+                          >
+                            {'accept'}
+                          </div>
                         </div>
                       ) : (
                         <>
                           <div
-                            className='requestDecline' 
-                            style={{ pointerEvents: this.state.allowInput ? 'auto' : 'none'}}
+                            className='requestDecline'
+                            style={{ pointerEvents: this.state.allowInput ? 'auto' : 'none' }}
                             onClick={() => {
                               if (this.state.allowInput) this.decline(req)
                             }}
@@ -484,25 +548,40 @@ class TransactionRequest extends React.Component {
                             <div className='requestDeclineButton _txButton _txButtonBad'>Decline</div>
                           </div>
                           <div
-                            className='requestSign' 
-                            style={{ pointerEvents: this.state.allowInput ? 'auto' : 'none'}}
+                            className='requestSign'
+                            style={{ pointerEvents: this.state.allowInput ? 'auto' : 'none' }}
                             onClick={() => {
                               if (this.state.allowInput) {
                                 link.rpc('signerCompatibility', req.handlerId, (e, compatibility) => {
-                                  if (e === 'No signer')  {
+                                  if (e === 'No signer') {
                                     this.store.notify('noSignerWarning', { req })
                                   } else if (e === 'Signer locked') {
                                     this.store.notify('signerLockedWarning', { req })
-                                  } else if (!compatibility.compatible && !this.store('main.mute.signerCompatibilityWarning')) {
-                                    this.store.notify('signerCompatibilityWarning', { req, compatibility, chain: this.chain })
-                                  } else if ((maxFeeUSD.toNumber() > FEE_WARNING_THRESHOLD_USD || this.toDisplayUSD(maxFeeUSD) === '0.00') && !this.store('main.mute.gasFeeWarning')) {
-                                    this.store.notify('gasFeeWarning', { req, feeUSD: this.toDisplayUSD(maxFeeUSD), currentSymbol })
+                                  } else if (
+                                    !compatibility.compatible &&
+                                    !this.store('main.mute.signerCompatibilityWarning')
+                                  ) {
+                                    this.store.notify('signerCompatibilityWarning', {
+                                      req,
+                                      compatibility,
+                                      chain: this.chain,
+                                    })
+                                  } else if (
+                                    (maxFeeUSD.toNumber() > FEE_WARNING_THRESHOLD_USD ||
+                                      this.toDisplayUSD(maxFeeUSD) === '0.00') &&
+                                    !this.store('main.mute.gasFeeWarning')
+                                  ) {
+                                    this.store.notify('gasFeeWarning', {
+                                      req,
+                                      feeUSD: this.toDisplayUSD(maxFeeUSD),
+                                      currentSymbol,
+                                    })
                                   } else {
                                     this.approve(req.handlerId, req)
                                   }
                                 })
-                              }}
-                            }
+                              }
+                            }}
                           >
                             <div className='requestSignButton _txButton'> Sign </div>
                           </div>
diff --git a/app/App/Main/Account/Requests/index.js b/app/App/Main/Account/Requests/index.js
index bcbdd1ccf..d27970ce4 100644
--- a/app/App/Main/Account/Requests/index.js
+++ b/app/App/Main/Account/Requests/index.js
@@ -17,9 +17,8 @@ import chainMeta from '../../../../../resources/chainMeta'
 
 import link from '../../../../../resources/link'
 
-
 class Requests extends React.Component {
-  constructor (props, context) {
+  constructor(props, context) {
     super(props, context)
     this.state = {
       minimized: false,
@@ -29,7 +28,9 @@ class Requests extends React.Component {
     this.moduleRef = React.createRef()
     this.resizeObserver = new ResizeObserver(() => {
       if (this.moduleRef && this.moduleRef.current) {
-        link.send('tray:action', 'updateAccountModule', props._id, { height: this.moduleRef.current.clientHeight })
+        link.send('tray:action', 'updateAccountModule', props._id, {
+          height: this.moduleRef.current.clientHeight,
+        })
       }
     })
   }
@@ -44,7 +45,7 @@ class Requests extends React.Component {
   //   }
   // }
 
-  minimize () {
+  minimize() {
     this.setState({ minimized: true })
   }
 
@@ -68,13 +69,15 @@ class Requests extends React.Component {
   //   }
   // }
 
-  componentDidMount () {
+  componentDidMount() {
     this.resizeObserver.observe(this.moduleRef.current)
     if (this.moduleRef && this.moduleRef.current) {
-      link.send('tray:action', 'updateAccountModule', this.props._id, { height: this.moduleRef.current.clientHeight })
+      link.send('tray:action', 'updateAccountModule', this.props._id, {
+        height: this.moduleRef.current.clientHeight,
+      })
     }
     setTimeout(() => {
-      const current = (this.store('selected.current') === this.props.id) && this.props.status === 'ok'
+      const current = this.store('selected.current') === this.props.id && this.props.status === 'ok'
       const open = current && this.store('selected.open')
       if (open && this.props.signer && this.unlockInput) {
         const signer = this.store('main.signers', this.props.signer)
@@ -84,12 +87,12 @@ class Requests extends React.Component {
   }
 
   // componentDidMount () {
-    
+
   //   // link.send('tray:action', 'updateAccountModule', this.props.id, { height: this.moduleRef.current.clientHeight })
-  // } 
+  // }
 
-  render () {
-    const activeAccount =  this.store('main.accounts', this.props.id)
+  render() {
+    const activeAccount = this.store('main.accounts', this.props.id)
     const requests = Object.values(activeAccount.requests || {})
 
     requests.sort((a, b) => {
@@ -99,8 +102,8 @@ class Requests extends React.Component {
     })
 
     return (
-      <div 
-        ref={this.moduleRef} 
+      <div
+        ref={this.moduleRef}
         className={this.store('selected.view') === 'default' ? 'signerRequests' : 'signerRequests signerRequestsHidden'}
       >
         <div className='requestContainerWrap'>
@@ -109,7 +112,7 @@ class Requests extends React.Component {
               <div key='noReq' className='noRequests'>
                 No Pending Requests
               </div>
-            ): null}
+            ) : null}
             {/* <div className='recentRequests' style={{ opacity: monitor.length > 0 ? 1 : 0, transform: `translateY(${containNormal +  40}px)` }}>
               <span>Recent Transactions</span>
               <span>{monitor.length}</span>
@@ -117,12 +120,12 @@ class Requests extends React.Component {
             {requests.map((req, i) => {
               if (req.type === 'access') {
                 return (
-                  <RequestItem 
-                    req={req} 
+                  <RequestItem
+                    req={req}
                     account={this.props.id}
                     handlerId={req.handlerId}
                     i={i}
-                    title={'Account Access'} 
+                    title={'Account Access'}
                     color={'var(--outerspace)'}
                     svgLookup={{ name: 'accounts', size: 16 }}
                     setAccountView={this.props.setAccountView}
@@ -130,7 +133,7 @@ class Requests extends React.Component {
                 )
               } else if (req.type === 'sign') {
                 return (
-                  <RequestItem 
+                  <RequestItem
                     req={req}
                     account={this.props.id}
                     handlerId={req.handlerId}
@@ -148,20 +151,20 @@ class Requests extends React.Component {
                     account={this.props.id}
                     handlerId={req.handlerId}
                     i={i}
-                    title={'Sign Data'} 
+                    title={'Sign Data'}
                     color={'var(--outerspace)'}
                     svgLookup={{ name: 'sign', size: 16 }}
                     setAccountView={this.props.setAccountView}
                   />
                 )
-              } else if (req.type === 'addChain') { 
+              } else if (req.type === 'addChain') {
                 return (
-                  <RequestItem 
-                    req={req} 
+                  <RequestItem
+                    req={req}
                     account={this.props.id}
                     handlerId={req.handlerId}
-                    i={i} 
-                    title={'Add Chain'} 
+                    i={i}
+                    title={'Add Chain'}
                     color={'var(--outerspace)'}
                     svgLookup={{ name: 'chain', size: 16 }}
                     setAccountView={this.props.setAccountView}
@@ -180,7 +183,7 @@ class Requests extends React.Component {
                     setAccountView={this.props.setAccountView}
                   />
                 )
-              } else if (req.type === 'addToken')  {
+              } else if (req.type === 'addToken') {
                 return (
                   <RequestItem
                     req={req}
@@ -193,14 +196,14 @@ class Requests extends React.Component {
                     setAccountView={this.props.setAccountView}
                   />
                 )
-              } else if (req.type === 'transaction')  {
-                const chainName = this.store('main.networks.ethereum', parseInt(req.data.chainId, 16), 'name') 
+              } else if (req.type === 'transaction') {
+                const chainName = this.store('main.networks.ethereum', parseInt(req.data.chainId, 16), 'name')
                 const hexId = req.data.chainId
                 chainMeta[hexId] ? chainMeta[hexId].primaryColor : ''
                 chainMeta[hexId] ? chainMeta[hexId].icon : ''
-                
+
                 return (
-                  <RequestItem 
+                  <RequestItem
                     req={req}
                     account={this.props.id}
                     handlerId={req.handlerId}
diff --git a/app/App/Main/Account/Settings/index.js b/app/App/Main/Account/Settings/index.js
index c9c513ef6..ef63177b3 100644
--- a/app/App/Main/Account/Settings/index.js
+++ b/app/App/Main/Account/Settings/index.js
@@ -4,23 +4,25 @@ import link from '../../../../../resources/link'
 import svg from '../../../../../resources/svg'
 
 class Settings extends React.Component {
-  constructor (...args) {
+  constructor(...args) {
     super(...args)
     this.moduleRef = React.createRef()
     if (!this.props.expanded) {
       this.resizeObserver = new ResizeObserver(() => {
         if (this.moduleRef && this.moduleRef.current) {
-          link.send('tray:action', 'updateAccountModule', this.props.moduleId, { height: this.moduleRef.current.clientHeight })
+          link.send('tray:action', 'updateAccountModule', this.props.moduleId, {
+            height: this.moduleRef.current.clientHeight,
+          })
         }
       })
     }
     this.state = {
       expand: false,
-      name: ''
+      name: '',
     }
   }
 
-  componentDidMount () {
+  componentDidMount() {
     if (this.resizeObserver) this.resizeObserver.observe(this.moduleRef.current)
     this.nameObs = this.store.observer(() => {
       const name = this.store('main.accounts', this.props.id, 'name')
@@ -28,12 +30,12 @@ class Settings extends React.Component {
     })
   }
 
-  componentWillUnmount () {
+  componentWillUnmount() {
     if (this.resizeObserver) this.resizeObserver.disconnect()
     this.nameObs.remove()
   }
 
-  render () {
+  render() {
     const account = this.store('main.accounts', this.props.id)
     return (
       <div ref={this.moduleRef}>
@@ -43,7 +45,7 @@ class Settings extends React.Component {
             <div className='moduleHeaderClose' onMouseDown={() => this.props.expandModule(false)}>
               {svg.close(12)}
             </div>
-          </div>  
+          </div>
         ) : null}
         <div className='moduleMain moduleMainSettings'>
           {!this.props.expanded ? (
@@ -53,31 +55,35 @@ class Settings extends React.Component {
           ) : (
             <>
               <div className='moduleRow'>
-                Account Tag: 
+                Account Tag:
                 <input
                   type='text'
                   tabIndex='-1'
-                  value={this.state.name} 
+                  value={this.state.name}
                   onChange={(e) => {
                     this.setState({ name: e.target.value })
                     link.send('tray:renameAccount', this.props.id, e.target.value)
                   }}
                 />
               </div>
-              {account.smart
-                ? (<div className='moduleRow'>Chain ID: {account.smart.chain && account.smart.chain.id}</div>)
-                : null
-              }
+              {account.smart ? (
+                <div className='moduleRow'>Chain ID: {account.smart.chain && account.smart.chain.id}</div>
+              ) : null}
               <div className='moduleRow'>Status: {account.status}</div>
-              <div className='moduleRow'>ENS Name: {account.ensName  ? account.ensName : 'none'}</div>
+              <div className='moduleRow'>ENS Name: {account.ensName ? account.ensName : 'none'}</div>
               <div className='moduleRow'>Last Signer Type: {account.lastSignerType}</div>
               <div className='moduleRow'>Signer Connected: {account.signer ? 'yes' : 'no'}</div>
               {/* <div className='moduleRow'>Account Added: {account.created}</div> */}
-              <div className='moduleButton moduleButtonBad' onMouseDown={() => {
-                link.rpc('removeAccount', this.props.id, {}, () => {
-                  // console.log('Removed account ', address)
-                })
-              }}>Remove This Account</div>
+              <div
+                className='moduleButton moduleButtonBad'
+                onMouseDown={() => {
+                  link.rpc('removeAccount', this.props.id, {}, () => {
+                    // console.log('Removed account ', address)
+                  })
+                }}
+              >
+                Remove This Account
+              </div>
             </>
           )}
         </div>
@@ -86,4 +92,4 @@ class Settings extends React.Component {
   }
 }
 
-export default Restore.connect(Settings)
\ No newline at end of file
+export default Restore.connect(Settings)
diff --git a/app/App/Main/Account/Signer/index.js b/app/App/Main/Account/Signer/index.js
index 9e8344143..24c117b9f 100644
--- a/app/App/Main/Account/Signer/index.js
+++ b/app/App/Main/Account/Signer/index.js
@@ -3,32 +3,31 @@ import Restore from 'react-restore'
 import link from '../../../../../resources/link'
 
 class Balances extends React.Component {
-  constructor (...args) {
+  constructor(...args) {
     super(...args)
     this.moduleRef = React.createRef()
     this.resizeObserver = new ResizeObserver(() => {
       if (this.moduleRef && this.moduleRef.current) {
-        link.send('tray:action', 'updateAccountModule', this.props.moduleId, { height: this.moduleRef.current.clientHeight })
+        link.send('tray:action', 'updateAccountModule', this.props.moduleId, {
+          height: this.moduleRef.current.clientHeight,
+        })
       }
     })
     this.state = {
-      expand: false
+      expand: false,
     }
   }
-  componentDidMount () {
+  componentDidMount() {
     this.resizeObserver.observe(this.moduleRef.current)
-  } 
-  render () {
+  }
+  render() {
     return (
       <div ref={this.moduleRef} className='balancesBlock'>
-        <div className='moduleHeader'>{'Signer Status'}</div>  
-        <div style={{ padding: '30px', display: 'flex', justifyContent: 'center' }}>
-          {'Signer Status'}
-        </div>
-        
+        <div className='moduleHeader'>{'Signer Status'}</div>
+        <div style={{ padding: '30px', display: 'flex', justifyContent: 'center' }}>{'Signer Status'}</div>
       </div>
     )
   }
 }
 
-export default Restore.connect(Balances)
\ No newline at end of file
+export default Restore.connect(Balances)
diff --git a/app/App/Main/Account/SignerStatus/index.js b/app/App/Main/Account/SignerStatus/index.js
index 2599a8d61..d40ff93c5 100644
--- a/app/App/Main/Account/SignerStatus/index.js
+++ b/app/App/Main/Account/SignerStatus/index.js
@@ -3,12 +3,12 @@ import Restore from 'react-restore'
 import link from '../../../../../resources/link'
 import svg from '../../../../../resources/svg'
 
-function isHardwareSigner (type = '') {
+function isHardwareSigner(type = '') {
   return ['ledger', 'trezor', 'lattice'].includes(type.toLowerCase())
 }
 
 class SignerStatus extends React.Component {
-  constructor (...args) {
+  constructor(...args) {
     super(...args)
     // this.moduleRef = React.createRef()
     // this.resizeObserver = new ResizeObserver(() => {
@@ -18,48 +18,48 @@ class SignerStatus extends React.Component {
     // })
     this.state = {
       expand: false,
-      shake: false
+      shake: false,
     }
     this.statusRef = React.createRef()
     this.inputRef = React.createRef()
   }
 
-  shake () {
+  shake() {
     this.setState({ shake: true })
     setTimeout(() => {
       this.setState({ shake: false })
     }, 1200)
   }
 
-  unlockChange (e) {
+  unlockChange(e) {
     this.setState({ unlockInput: e.target.value })
   }
 
-  unlockSubmit (e) {
+  unlockSubmit(e) {
     link.rpc('unlockSigner', this.props.signer.id, this.state.unlockInput, (err) => {
       if (err) this.shake()
     })
   }
 
-  trezorPin (num) {
+  trezorPin(num) {
     this.setState({ tPin: this.state.tPin + num.toString() })
   }
 
-  submitPin () {
+  submitPin() {
     link.rpc('trezorPin', this.props.signer.id, this.state.tPin, () => {})
     this.setState({ tPin: '' })
   }
 
-  backspacePin (e) {
+  backspacePin(e) {
     e.stopPropagation()
     this.setState({ tPin: this.state.tPin ? this.state.tPin.slice(0, -1) : '' })
   }
 
-  renderTrezorPin (active) {
+  renderTrezorPin(active) {
     return (
       <div className='trezorPinWrap' style={active ? {} : { height: '0px', padding: '0px 0px 0px 0px' }}>
         <div className='trezorPinInput'>
-          {[1, 2, 3, 4, 5, 6, 7, 8, 9].map(i => (
+          {[1, 2, 3, 4, 5, 6, 7, 8, 9].map((i) => (
             <div key={i} className='trezorPinInputButton' onMouseDown={this.trezorPin.bind(this, i)}>
               {svg.octicon('primitive-dot', { height: 20 })}
             </div>
@@ -69,7 +69,7 @@ class SignerStatus extends React.Component {
     )
   }
 
-  componentDidMount () {
+  componentDidMount() {
     setTimeout(() => {
       document.addEventListener('mousedown', (e) => {
         if (this.props.open && this.statusRef && this.statusRef.current && !this.statusRef.current.contains(e.target)) {
@@ -82,7 +82,7 @@ class SignerStatus extends React.Component {
     }, 100)
   }
 
-  render () {
+  render() {
     const { shake } = this.state
 
     const signer = this.props.signer || {}
@@ -97,13 +97,22 @@ class SignerStatus extends React.Component {
           <div className='signerStatusMain'>
             <div className='signerUnlockWrap'>
               <div className='signerUnlockHeader'>The signer for this account is locked</div>
-              <input ref={this.inputRef} className='signerUnlockInput' type='password' value={this.state.unlockInput} onChange={this.unlockChange.bind(this)} onKeyDown={e => {
-                if (e.key === 'Enter') {
-                  e.preventDefault()
-                  this.unlockSubmit()
-                }
-              }} />
-              <div className='signerUnlockSubmit' onClick={this.unlockSubmit.bind(this)} >{'Unlock'}</div>
+              <input
+                ref={this.inputRef}
+                className='signerUnlockInput'
+                type='password'
+                value={this.state.unlockInput}
+                onChange={this.unlockChange.bind(this)}
+                onKeyDown={(e) => {
+                  if (e.key === 'Enter') {
+                    e.preventDefault()
+                    this.unlockSubmit()
+                  }
+                }}
+              />
+              <div className='signerUnlockSubmit' onClick={this.unlockSubmit.bind(this)}>
+                {'Unlock'}
+              </div>
             </div>
           </div>
         </div>
@@ -112,4 +121,4 @@ class SignerStatus extends React.Component {
   }
 }
 
-export default Restore.connect(SignerStatus)
\ No newline at end of file
+export default Restore.connect(SignerStatus)
diff --git a/app/App/Main/Account/Verify/index.js b/app/App/Main/Account/Verify/index.js
index c25ea4b85..e74c8768a 100644
--- a/app/App/Main/Account/Verify/index.js
+++ b/app/App/Main/Account/Verify/index.js
@@ -3,23 +3,25 @@ import Restore from 'react-restore'
 import link from '../../../../../resources/link'
 
 class Verify extends React.Component {
-  constructor (...args) {
+  constructor(...args) {
     super(...args)
     this.moduleRef = React.createRef()
     this.resizeObserver = new ResizeObserver(() => {
       if (this.moduleRef && this.moduleRef.current) {
-        link.send('tray:action', 'updateAccountModule', this.props.moduleId, { height: this.moduleRef.current.clientHeight })
+        link.send('tray:action', 'updateAccountModule', this.props.moduleId, {
+          height: this.moduleRef.current.clientHeight,
+        })
       }
     })
     this.state = {
       expand: false,
       verifyAddressSuccess: false,
-      verifyAddressResponse: ''
+      verifyAddressResponse: '',
     }
   }
 
-  verifyAddress () {
-    link.rpc('verifyAddress', err => {
+  verifyAddress() {
+    link.rpc('verifyAddress', (err) => {
       if (err) {
         this.setState({ verifyAddressSuccess: false, verifyAddressResponse: err })
       } else {
@@ -31,19 +33,19 @@ class Verify extends React.Component {
     })
   }
 
-  componentDidMount () {
+  componentDidMount() {
     this.resizeObserver.observe(this.moduleRef.current)
-  } 
+  }
 
-  render () {
+  render() {
     const signerType = this.store('main.accounts', this.props.id, 'lastSignerType')
-    const signerKind = (signerType === 'seed' || signerType === 'ring') ? 'hot' : 'device'
+    const signerKind = signerType === 'seed' || signerType === 'ring' ? 'hot' : 'device'
     const account = this.store('main.accounts', this.props.id)
     return (
       <div ref={this.moduleRef} className='balancesBlock'>
         {account.smart ? (
           <>
-            <div className='moduleHeader'>{'Smart Account'}</div>  
+            <div className='moduleHeader'>{'Smart Account'}</div>
             <div className='moduleMain moduleMainSettings'>
               <div>{account.smart.type} Account</div>
               <div>DAO exists on this chain: ?</div>
@@ -55,11 +57,19 @@ class Verify extends React.Component {
           </>
         ) : (
           <>
-            <div className='moduleHeader'>{'Verify Address'}</div>  
+            <div className='moduleHeader'>{'Verify Address'}</div>
             <div className='moduleMain'>
               <div className='signerVerifyText'>Verify that the address displayed in Frame is correct</div>
               {this.state.verifyAddressResponse ? (
-                <div className={this.state.verifyAddressSuccess ? 'signerVerifyResponse signerVerifyResponseSuccess cardShow' : 'signerVerifyResponse'}>{this.state.verifyAddressResponse}</div>
+                <div
+                  className={
+                    this.state.verifyAddressSuccess
+                      ? 'signerVerifyResponse signerVerifyResponseSuccess cardShow'
+                      : 'signerVerifyResponse'
+                  }
+                >
+                  {this.state.verifyAddressResponse}
+                </div>
               ) : null}
               <div className='moduleButton' onMouseDown={() => this.verifyAddress()}>
                 {signerKind === 'hot' ? 'Verify Address' : 'Verify Address on Device'}
diff --git a/app/App/Main/Account/index.js b/app/App/Main/Account/index.js
index d4cd7f634..eb186694b 100644
--- a/app/App/Main/Account/index.js
+++ b/app/App/Main/Account/index.js
@@ -18,8 +18,7 @@ import SignerStatus from './SignerStatus'
 import Verify from './Verify'
 import Settings from './Settings'
 
-
-// move 
+// move
 import ProviderRequest from './Requests/ProviderRequest'
 import TransactionRequest from './Requests/TransactionRequest'
 import SignatureRequest from './Requests/SignatureRequest'
@@ -27,7 +26,6 @@ import ChainRequest from './Requests/ChainRequest'
 import AddTokenRequest from './Requests/AddTokenRequest'
 import SignTypedDataRequest from './Requests/SignTypedDataRequest'
 
-
 // class _Verify extends React.Component {
 //   constructor (props, context) {
 //     super(props, context)
@@ -45,7 +43,7 @@ import SignTypedDataRequest from './Requests/SignTypedDataRequest'
 //   componentDidMount () {
 //     this.resizeObserver.observe(this.moduleRef.current)
 //     link.send('tray:action', 'updateAccountModule', this.props.id, { height: this.moduleRef.current.clientHeight })
-//   } 
+//   }
 //   render () {
 //     // console.log(this.props)
 //     // const { module, index } = this.props
@@ -75,7 +73,6 @@ import SignTypedDataRequest from './Requests/SignTypedDataRequest'
 
 // const Verify = Restore.connect(_Verify)
 
-
 // class Module extends React.Component {
 //   constructor (props, context) {
 //     super(props, context)
@@ -92,7 +89,7 @@ import SignTypedDataRequest from './Requests/SignTypedDataRequest'
 //     //   link.send('tray:action', 'updateAccountModule', this.props.id, { height: this.moduleRef.current.clientHeight })
 //     // }
 //     // link.send('tray:action', 'updateAccountModule', this.props.id, { height: this.moduleRef.current.clientHeight })
-//   } 
+//   }
 //   // componentWillUnmount () {
 //   //   this.props.unregisterModule(this.props.index, this.moduleRef)
 //   // }
@@ -120,28 +117,27 @@ import SignTypedDataRequest from './Requests/SignTypedDataRequest'
 
 // const { SignerModule } = modules
 
-
 // import React from 'react'
 // import Restore from 'react-restore'
 // import link from '../../../../../../../resources/link'
 
-// account module is position absolute and with a translateX 
+// account module is position absolute and with a translateX
 class _AccountMain extends React.Component {
-  constructor (...args) {
+  constructor(...args) {
     super(...args)
     this.state = {
-      expandedModule: ''
+      expandedModule: '',
     }
   }
   // constructor (props, context) {
   //   // console.log(context)
   //   super(props, context)
   //   // this.resizeObserver = new ResizeObserver(() => )
-  //   this.state = { 
+  //   this.state = {
   //     slideHeight: 0
   //   }
   //   // this.moduleRefs = []
-  //   context.store.observer(() => { 
+  //   context.store.observer(() => {
   //     const modules = context.store('views.tray.account.defaultModules') // modules per account in future
   //     // Make refs
   //     if (this.moduleRefs.length < modules.length) {
@@ -149,7 +145,7 @@ class _AccountMain extends React.Component {
   //       this.moduleRefs = modules.map(() => React.createRef())
   //     }
   //   })
-    
+
   // }
   // componentDidMount () {
 
@@ -168,23 +164,23 @@ class _AccountMain extends React.Component {
   //     slideHeight += modulePositions[i].height
   //   })
   // }
-  renderModule (id, module, top, index, expandModule, expanded, expandedData) {
+  renderModule(id, module, top, index, expandModule, expanded, expandedData) {
     // console.log(id, module, top, index)
     let hidden = false
-    let style = { 
-      transform: `translateY(${top}px)`, 
-      zIndex: 10000 - index, 
+    let style = {
+      transform: `translateY(${top}px)`,
+      zIndex: 10000 - index,
       height: module.height,
-      opacity: 1
+      opacity: 1,
     }
     //  && !this.props.signer) hidden = true
     if (hidden) {
-      style = { 
-        transform: `translateY(${top}px)`, 
-        zIndex: 10000 - index, 
+      style = {
+        transform: `translateY(${top}px)`,
+        zIndex: 10000 - index,
         height: 0,
         opacity: 0,
-        overflow: 'hidden'
+        overflow: 'hidden',
       }
     }
 
@@ -193,113 +189,80 @@ class _AccountMain extends React.Component {
 
     return (
       <div className={'accountModule' + moduleClass} style={style}>
-        <div className='accountModuleInner cardShow' style={{ animationDelay: (index * 0.1) + 's'}}>
-          {
-            id === 'gas' ? <Gas 
-              moduleId={id} 
-              id={this.props.id}
-              expandModule={expandModule}
-              expanded={expanded}
-            /> :
-            id === 'requests' ? <Requests 
+        <div className='accountModuleInner cardShow' style={{ animationDelay: index * 0.1 + 's' }}>
+          {id === 'gas' ? (
+            <Gas moduleId={id} id={this.props.id} expandModule={expandModule} expanded={expanded} />
+          ) : id === 'requests' ? (
+            <Requests
               _id={id}
               id={this.props.id}
               setAccountView={this.props.setAccountView}
-              addresses={this.props.addresses} 
-              minimized={this.props.minimized} 
-              status={this.props.status} 
-              signer={this.props.signer} 
+              addresses={this.props.addresses}
+              minimized={this.props.minimized}
+              status={this.props.status}
+              signer={this.props.signer}
               expandModule={expandModule}
               expanded={expanded}
-            /> :
-            id === 'verify' ? <Verify 
-              moduleId={id}
-              id={this.props.id}
-              expandModule={expandModule}
-              expanded={expanded}
-            /> :
-            id === 'activity' ? <Activity 
-              moduleId={id} 
-              id={this.props.id}
-              expandModule={expandModule}
-              expanded={expanded}
-            /> :
-            id === 'launcher' ? <Launcher 
+            />
+          ) : id === 'verify' ? (
+            <Verify moduleId={id} id={this.props.id} expandModule={expandModule} expanded={expanded} />
+          ) : id === 'activity' ? (
+            <Activity moduleId={id} id={this.props.id} expandModule={expandModule} expanded={expanded} />
+          ) : id === 'launcher' ? (
+            <Launcher moduleId={id} id={this.props.id} expandModule={expandModule} expanded={expanded} />
+          ) : id === 'inventory' ? (
+            <Inventory
               moduleId={id}
-              id={this.props.id} 
-              expandModule={expandModule}
-              expanded={expanded}
-            /> :
-            id === 'inventory' ? <Inventory 
-              moduleId={id} 
               id={this.props.id}
               expandModule={expandModule}
               expanded={expanded}
               expandedData={expandedData}
-            /> :
-            id === 'permissions' ? <Permissions
-              moduleId={id}
-              id={this.props.id}
-              expandModule={expandModule}
-              expanded={expanded}
-            /> :
-            id === 'balances' ? <Balances
-              moduleId={id} 
-              {...this.props}
-              expandModule={expandModule}
-              expanded={expanded}
-            /> :
-            id === 'settings' ? <Settings
-              moduleId={id}
-              id={this.props.id}
-              expandModule={expandModule}
-              expanded={expanded}
-            /> :
-            <Default 
-              moduleId={id}
-              expandModule={expandModule}
-              expanded={expanded}
             />
-          }
-        </div>  
+          ) : id === 'permissions' ? (
+            <Permissions moduleId={id} id={this.props.id} expandModule={expandModule} expanded={expanded} />
+          ) : id === 'balances' ? (
+            <Balances moduleId={id} {...this.props} expandModule={expandModule} expanded={expanded} />
+          ) : id === 'settings' ? (
+            <Settings moduleId={id} id={this.props.id} expandModule={expandModule} expanded={expanded} />
+          ) : (
+            <Default moduleId={id} expandModule={expandModule} expanded={expanded} />
+          )}
+        </div>
       </div>
     )
   }
-  expandModule (id, data) {
-    this.setState({ expandedModule: id, expandedModuleData: data || {} }) 
+  expandModule(id, data) {
+    this.setState({ expandedModule: id, expandedModuleData: data || {} })
   }
-  render () {
+  render() {
     const accountModules = this.store('panel.account.modules')
     const accountModuleOrder = this.store('panel.account.moduleOrder')
     let slideHeight = 0
     const modules = accountModuleOrder.map((id, i) => {
       const module = accountModules[id] || { height: 0 }
       slideHeight += module.height + 7
-      return this.renderModule(
-        id, 
-        module, 
-        slideHeight - module.height - 5, 
-        i, 
-        this.expandModule.bind(this)
-      )
+      return this.renderModule(id, module, slideHeight - module.height - 5, i, this.expandModule.bind(this))
     })
     return (
       <div className='accountMain'>
         {this.state.expandedModule ? (
-          <div 
-            className='accountsModuleExpand cardShow' 
+          <div
+            className='accountsModuleExpand cardShow'
             style={{ pointerEvents: this.state.expandedModule ? 'auto' : 'none' }}
             onMouseDown={() => this.setState({ expandedModule: false })}
           >
-            <div className='moduleExpanded' onMouseDown={(e) => {
-              e.stopPropagation()
-            }}>
+            <div
+              className='moduleExpanded'
+              onMouseDown={(e) => {
+                e.stopPropagation()
+              }}
+            >
               {this.renderModule(
-                this.state.expandedModule, 
-                { height: '100%' }, 
-                0, 
-                0, 
-                this.expandModule.bind(this), 
+                this.state.expandedModule,
+                { height: '100%' },
+                0,
+                0,
+                this.expandModule.bind(this),
                 true,
                 this.state.expandedModuleData
               )}
@@ -318,31 +281,21 @@ class _AccountMain extends React.Component {
 
 const AccountMain = Restore.connect(_AccountMain)
 
-
 // AccountView is a reusable template that provides the option to nav back to main
 class _AccountView extends React.Component {
-  render () {
+  render() {
     return (
       <div className='accountView'>
         <div className='accountViewMenu cardShow'>
-          <div 
-            className='accountViewBack'
-            onClick={() => this.props.back()}
-          >
+          <div className='accountViewBack' onClick={() => this.props.back()}>
             {svg.chevronLeft(13)}
           </div>
           <div className='accountViewTitle'>
-            <div className='accountViewIcon'>
-              {this.props.accountViewIcon}
-            </div>
-            <div className='accountViewText'>
-              {this.props.accountViewTitle}
-            </div>
+            <div className='accountViewIcon'>{this.props.accountViewIcon}</div>
+            <div className='accountViewText'>{this.props.accountViewTitle}</div>
           </div>
         </div>
-        <div className='accountViewMain cardShow'>
-          {this.props.children}
-        </div>
+        <div className='accountViewMain cardShow'>{this.props.children}</div>
       </div>
     )
   }
@@ -350,48 +303,41 @@ class _AccountView extends React.Component {
 
 const AccountView = Restore.connect(_AccountView)
 
-function isHardwareSigner (account = {}) {
+function isHardwareSigner(account = {}) {
   return ['ledger', 'lattice', 'trezor'].includes(account.lastSignerType)
 }
 
 class _AccountBody extends React.Component {
-  constructor (...args) {
+  constructor(...args) {
     super(...args)
     this.state = {
-      view: 'request'
+      view: 'request',
     }
-  } 
-  renderRequest (req, i) {
-    const activeAccount =  this.store('main.accounts', this.props.id)
+  }
+  renderRequest(req, i) {
+    const activeAccount = this.store('main.accounts', this.props.id)
     const signingDelay = isHardwareSigner(activeAccount) ? 200 : 1500
 
     if (req.type === 'transaction') {
       return (
-        <TransactionRequest 
+        <TransactionRequest
           key={req.handlerId}
           req={req}
           handlerId={req.handlerId}
           accountId={this.props.id}
-          signingDelay={signingDelay} 
+          signingDelay={signingDelay}
         />
       )
     } else if (req.type === 'access') {
-      return (
-        <ProviderRequest 
-          key={req.handlerId} 
-          handlerId={req.handlerId}
-          accountId={this.props.id}
-          req={req} 
-        />
-      )
+      return <ProviderRequest key={req.handlerId} handlerId={req.handlerId} accountId={this.props.id} req={req} />
     } else if (req.type === 'sign') {
       return (
-        <SignatureRequest 
-          key={req.handlerId} 
-          req={req} 
+        <SignatureRequest
+          key={req.handlerId}
+          req={req}
           handlerId={req.handlerId}
           accountId={this.props.id}
-          signingDelay={signingDelay} 
+          signingDelay={signingDelay}
         />
       )
     } else if (req.type === 'signTypedData') {
@@ -405,28 +351,14 @@ class _AccountBody extends React.Component {
         />
       )
     } else if (req.type === 'addChain' || req.type === 'switchChain') {
-      return (
-        <ChainRequest 
-          key={req.handlerId} 
-          req={req} 
-          handlerId={req.handlerId}
-          accountId={this.props.id}
-        />
-      )
+      return <ChainRequest key={req.handlerId} req={req} handlerId={req.handlerId} accountId={this.props.id} />
     } else if (req.type === 'addToken') {
-      return (
-        <AddTokenRequest
-          key={req.handlerId}
-          req={req} 
-          handlerId={req.handlerId}
-          accountId={this.props.id}
-        />
-      )
+      return <AddTokenRequest key={req.handlerId} req={req} handlerId={req.handlerId} accountId={this.props.id} />
     } else {
       return null
     }
   }
-  render () {
+  render() {
     const { view, data } = this.store('panel.nav')[0] || {}
     if (view === 'requestView') {
       const { req, i } = data
@@ -440,21 +372,21 @@ class _AccountBody extends React.Component {
       } else if (req.type === 'signTypedData') {
         accountViewTitle = 'Sign Data'
         accountViewIcon = svg.sign(17)
-      } else if (req.type === 'addChain') { 
+      } else if (req.type === 'addChain') {
         accountViewTitle = 'Add Chain'
         accountViewIcon = svg.chain(17)
       } else if (req.type === 'switchChain') {
         accountViewTitle = 'Switch Chain'
         accountViewIcon = svg.chain(17)
-      } else if (req.type === 'addToken')  {
+      } else if (req.type === 'addToken') {
         accountViewTitle = 'Add Token'
         accountViewIcon = svg.tokens(17)
-      } else if (req.type === 'transaction')  {
+      } else if (req.type === 'transaction') {
         accountViewTitle = 'Sign Transaction'
         accountViewIcon = svg.broadcast(17)
       }
       return (
-        <AccountView 
+        <AccountView
           back={() => {
             link.send('tray:action', 'backPanel', { view, data })
           }}
@@ -468,20 +400,23 @@ class _AccountBody extends React.Component {
     } else if (view === 'expandedModule') {
       return (
         <AccountView {...props}>
-          <div 
-            className='accountsModuleExpand cardShow' 
+          <div
+            className='accountsModuleExpand cardShow'
             style={{ pointerEvents: this.state.expandedModule ? 'auto' : 'none' }}
             onMouseDown={() => this.setState({ expandedModule: false })}
           >
-            <div className='moduleExpanded' onMouseDown={(e) => {
-              e.stopPropagation()
-            }}>
+            <div
+              className='moduleExpanded'
+              onMouseDown={(e) => {
+                e.stopPropagation()
+              }}
+            >
               {this.renderModule(
-                this.state.expandedModule, 
-                { height: '100%' }, 
-                0, 
-                0, 
-                this.expandModule.bind(this), 
+                this.state.expandedModule,
+                { height: '100%' },
+                0,
+                0,
+                this.expandModule.bind(this),
                 true,
                 this.state.expandedModuleData
               )}
@@ -491,25 +426,24 @@ class _AccountBody extends React.Component {
       )
     } else {
       return (
-        <AccountMain 
+        <AccountMain
           setAccountView={(view, data) => {
             link.send('tray:action', 'navPanel', { view, data })
             // this.setState({ view, data })
-          }} 
-          {...this.props} 
+          }}
+          {...this.props}
         />
       )
     }
   }
 }
 
-
 const AccountBody = Restore.connect(_AccountBody)
 
-// 
+//
 
-
-{/* <Module 
+{
+  /* <Module 
 index={0}
 registerModule={this.registerModule.bind(this)}
 module={this.state.modules[0] || { index: 0, top: 0 }}
@@ -568,8 +502,8 @@ module={this.state.modules[5] || { index: 5, top: 0 }}
 <div className='accountModuleContent'>
   {`Account Module: ${5}`}
 </div>
-</Module> */}
-
+</Module> */
+}
 
 // TODO: Rename Signer component to Account
 
@@ -718,7 +652,7 @@ module={this.state.modules[5] || { index: 5, top: 0 }}
 /// const Balances = Restore.connect(_Balances)
 
 class Account extends React.Component {
-  constructor (...args) {
+  constructor(...args) {
     super(...args)
     this.locked = false
     this.state = {
@@ -728,68 +662,80 @@ class Account extends React.Component {
       unlockInput: '',
       openHover: false,
       addressHover: false,
-      hideSignerStatus: true
+      hideSignerStatus: true,
     }
   }
 
-  componentDidMount () {
+  componentDidMount() {
     if (this.props.index === 0) this.props.resetScroll()
     window.addEventListener('scroll', this.onScroll.bind(this), true)
   }
 
-  componentWillUnmount () {
+  componentWillUnmount() {
     window.removeEventListener('scroll', this.onScroll.bind(this), true)
   }
-  
-  onScroll () {
-    this.setState({ addressHover: false }) 
+
+  onScroll() {
+    this.setState({ addressHover: false })
   }
 
-  copyAddress () {
+  copyAddress() {
     link.send('tray:clipboardData', getAddress(this.props.id))
     this.setState({ copied: true })
-    setTimeout(_ => this.setState({ copied: false }), 1000)
+    setTimeout((_) => this.setState({ copied: false }), 1000)
   }
 
-  unlockChange (e) {
+  unlockChange(e) {
     this.setState({ unlockInput: e.target.value })
   }
 
-  unlockSubmit (e) {
+  unlockSubmit(e) {
     link.rpc('unlockSigner', this.props.id, this.state.unlockInput, () => {})
   }
 
-  trezorPin (num) {
+  trezorPin(num) {
     this.setState({ tPin: this.state.tPin + num.toString() })
   }
 
-  submitPin () {
+  submitPin() {
     link.rpc('trezorPin', this.props.id, this.state.tPin, () => {})
     this.setState({ tPin: '' })
   }
 
-  backspacePin (e) {
+  backspacePin(e) {
     e.stopPropagation()
     this.setState({ tPin: this.state.tPin ? this.state.tPin.slice(0, -1) : '' })
   }
 
-  select () {
+  select() {
     if (this.store('selected.current') === this.props.id) {
-      link.rpc('unsetSigner', this.props.id, (err, status) => { if (err) return console.log(err) })
-      if (this.props.signer && this.store('main.accountCloseLock')) link.rpc('lockSigner', this.props.signer, (err, status) => { if (err) return console.log(err) })
+      link.rpc('unsetSigner', this.props.id, (err, status) => {
+        if (err) return console.log(err)
+      })
+      if (this.props.signer && this.store('main.accountCloseLock'))
+        link.rpc('lockSigner', this.props.signer, (err, status) => {
+          if (err) return console.log(err)
+        })
     } else {
       const bounds = this.signer.getBoundingClientRect()
       this.props.reportScroll()
-      this.store.initialSignerPos({ top: bounds.top - 80, bottom: document.body.clientHeight - bounds.top - this.signer.clientHeight + 3, height: this.signer.clientHeight, index: this.props.index })
-      link.rpc('setSigner', this.props.id, (err, status) => { if (err) return console.log(err) })
+      this.store.initialSignerPos({
+        top: bounds.top - 80,
+        bottom: document.body.clientHeight - bounds.top - this.signer.clientHeight + 3,
+        height: this.signer.clientHeight,
+        index: this.props.index,
+      })
+      link.rpc('setSigner', this.props.id, (err, status) => {
+        if (err) return console.log(err)
+      })
     }
   }
 
-  renderTrezorPin (active) {
+  renderTrezorPin(active) {
     return (
       <div className='trezorPinWrap' style={active ? {} : { height: '0px', padding: '0px 0px 0px 0px' }}>
         <div className='trezorPinInput'>
-          {[1, 2, 3, 4, 5, 6, 7, 8, 9].map(i => (
+          {[1, 2, 3, 4, 5, 6, 7, 8, 9].map((i) => (
             <div key={i} className='trezorPinInputButton' onMouseDown={this.trezorPin.bind(this, i)}>
               {svg.octicon('primitive-dot', { height: 20 })}
             </div>
@@ -799,7 +745,7 @@ class Account extends React.Component {
     )
   }
 
-  typeClick () {
+  typeClick() {
     if (this.props.status === 'ok') {
       this.select()
       this.setState({ typeActive: true })
@@ -811,7 +757,7 @@ class Account extends React.Component {
     }
   }
 
-  renderSignerIndicator () {
+  renderSignerIndicator() {
     let accountIndicatorClass = 'accountIndicator'
     if (this.props.signer) {
       const signer = this.store('main.signers', this.props.signer) || {}
@@ -831,10 +777,10 @@ class Account extends React.Component {
         accountIndicatorClass += ' accountIndicatorGood'
       }
     }
-    return <div className={accountIndicatorClass} />  
+    return <div className={accountIndicatorClass} />
   }
 
-  renderType () {
+  renderType() {
     // let innerClass = 'signerInner'
     // if (this.state.typeActive) innerClass += ' signerInnerActive'
     if (this.state.typeShake) innerClass += ' headShake'
@@ -842,19 +788,23 @@ class Account extends React.Component {
     // if (!this.props.signer || (this.props.signer && this.props.signer.status === 'initial')) innerClass += ' signerInnerDisconnected'
     // const inSettings = this.store('selected.view') === 'settings'
     return (
-      <div className='signerType' onMouseDown={() => {
-        this.hideSignerStatus(!this.state.hideSignerStatus)
-      }}>
+      <div
+        className='signerType'
+        onMouseDown={() => {
+          this.hideSignerStatus(!this.state.hideSignerStatus)
+        }}
+      >
         {/* {!this.props.signer || (this.props.signer && this.props.signer.status === 'initial') ? (
           <div className='signerTypeDisconnected' onMouseDown={this.typeClick.bind(this)} style={inSettings ? { transform: 'translateY(-30px)' } : {}} onMouseEnter={() => this.setState({ openHover: true })} onMouseLeave={() => this.setState({ openHover: false })}>
             <div className='signerTypeDisconnectedImageFront'>{svg.logo(24)}</div>
           </div>
         ) : null} */}
-        {(_ => {
-          const type = this.props.lastSignerType 
+        {((_) => {
+          const type = this.props.lastSignerType
           if (type === 'ledger') return <div className='signerSelectIconWrap signerIconLedger'>{svg.ledger(20)}</div>
           if (type === 'trezor') return <div className='signerSelectIconWrap signerIconTrezor'>{svg.trezor(20)}</div>
-          if (type === 'seed' || type === 'ring') return <div className='signerSelectIconWrap signerIconHot'>{svg.flame(24)}</div>
+          if (type === 'seed' || type === 'ring')
+            return <div className='signerSelectIconWrap signerIconHot'>{svg.flame(24)}</div>
           if (type === 'aragon') return <div className='signerSelectIconWrap signerIconSmart'>{svg.aragon(28)}</div>
           if (type === 'lattice') return <div className='signerSelectIconWrap signerIconSmart'>{svg.lattice(22)}</div>
           return <div className='signerSelectIconWrap'>{svg.logo(20)}</div>
@@ -870,10 +820,10 @@ class Account extends React.Component {
     )
   }
 
-  renderMenu () {
+  renderMenu() {
     let menuClass = 'signerMenu'
     menuClass += this.store('selected.view') === 'settings' ? ' signerMenuSettings' : ' signerMenuDefault'
-    if (this.store('selected.current') === this.props.id & this.store('selected.open')) menuClass += ' signerMenuOpen'
+    if ((this.store('selected.current') === this.props.id) & this.store('selected.open')) menuClass += ' signerMenuOpen'
     return (
       <div className={menuClass}>
         <div className='signerMenuItem signerMenuItemLeft' onMouseDown={() => this.store.setSignerView('default')}>
@@ -892,25 +842,27 @@ class Account extends React.Component {
     )
   }
 
-  setHighlight (mode, index) {
+  setHighlight(mode, index) {
     if (!this.locked) this.setState({ accountHighlight: mode, highlightIndex: index || 0 })
   }
 
-  closeAccounts () {
+  closeAccounts() {
     if (this.store('selected.showAccounts')) this.store.toggleShowAccounts(false)
   }
 
-  setSignerIndex (index) {
+  setSignerIndex(index) {
     this.locked = true
     link.rpc('setSignerIndex', index, (err, summary) => {
       this.setState({ accountHighlight: 'inactive', highlightIndex: 0 })
       this.store.toggleShowAccounts(false)
-      setTimeout(() => { this.locked = false }, 1000)
+      setTimeout(() => {
+        this.locked = false
+      }, 1000)
       if (err) return console.log(err)
     })
   }
 
-  renderSettingsMenu () {
+  renderSettingsMenu() {
     let viewIndex = this.store('selected.settings.viewIndex')
 
     // FIXME: Ugly hack to allow 'Rename Account' view to slide in from right
@@ -918,19 +870,32 @@ class Account extends React.Component {
 
     const views = this.store('selected.settings.views')
     const itemWidth = 35
-    const markLeft = (itemWidth * viewIndex) + 'px'
-    const markRight = (((views.length - viewIndex) - 1) * itemWidth) + 'px'
+    const markLeft = itemWidth * viewIndex + 'px'
+    const markRight = (views.length - viewIndex - 1) * itemWidth + 'px'
     return (
       <div className='settingsMenu'>
         <div className='settingsMenuItems'>
-          <div className={viewIndex === 0 ? 'settingsMenuItem settingsMenuItemSelected' : 'settingsMenuItem'} onMouseDown={() => this.store.setSettingsView(0)}>
-            <div className='settingsMenuItemIcon' style={{ left: '2px', top: '2px' }}>{svg.octicon('key', { height: 18 })}</div>
+          <div
+            className={viewIndex === 0 ? 'settingsMenuItem settingsMenuItemSelected' : 'settingsMenuItem'}
+            onMouseDown={() => this.store.setSettingsView(0)}
+          >
+            <div className='settingsMenuItemIcon' style={{ left: '2px', top: '2px' }}>
+              {svg.octicon('key', { height: 18 })}
+            </div>
           </div>
-          <div className={viewIndex === 1 ? 'settingsMenuItem settingsMenuItemSelected' : 'settingsMenuItem'} onMouseDown={() => this.store.setSettingsView(1)}>
+          <div
+            className={viewIndex === 1 ? 'settingsMenuItem settingsMenuItemSelected' : 'settingsMenuItem'}
+            onMouseDown={() => this.store.setSettingsView(1)}
+          >
             <div className='settingsMenuItemIcon'>{svg.octicon('checklist', { height: 22 })}</div>
           </div>
-          <div className={viewIndex === 2 ? 'settingsMenuItem settingsMenuItemSelected' : 'settingsMenuItem'} onMouseDown={() => this.store.setSettingsView(2)}>
-            <div className='settingsMenuItemIcon' style={{ left: '-1px', top: '0px' }}>{svg.octicon('gear', { height: 20 })}</div>
+          <div
+            className={viewIndex === 2 ? 'settingsMenuItem settingsMenuItemSelected' : 'settingsMenuItem'}
+            onMouseDown={() => this.store.setSettingsView(2)}
+          >
+            <div className='settingsMenuItemIcon' style={{ left: '-1px', top: '0px' }}>
+              {svg.octicon('gear', { height: 20 })}
+            </div>
           </div>
         </div>
         <div className='settingsMenuSelect'>
@@ -989,7 +954,7 @@ class Account extends React.Component {
   //   this.store.accountPage(accountPage)
   // }
 
-  getAddressSize () {
+  getAddressSize() {
     const ensName = this.store('main.accounts', this.props.id, 'ensName')
     if (ensName) {
       if (ensName.length <= 13) {
@@ -1004,7 +969,7 @@ class Account extends React.Component {
     }
   }
 
-  renderStatus () {
+  renderStatus() {
     // let open = current && this.store('selected.open')
     // TODO: Set Signer Name
     // let currentIndex = this.store('main.accounts', this.props.id, 'index')
@@ -1015,7 +980,7 @@ class Account extends React.Component {
     const formattedAddress = getAddress(address)
 
     let requests = this.store('main.accounts', this.props.id, 'requests') || {}
-    requests = Object.keys(requests).filter(r => requests[r].mode === 'normal')
+    requests = Object.keys(requests).filter((r) => requests[r].mode === 'normal')
 
     return this.props.status !== 'ok' ? (
       <div className='signerStatusNotOk'>{status}</div>
@@ -1023,13 +988,14 @@ class Account extends React.Component {
       <>
         {!this.state.addressHover ? (
           <div className='signerName'>
-            <div className={(!ensName || !this.props.name) ? 'signerNameText' : 'signerNameText signerNameTextENS'}>
+            <div className={!ensName || !this.props.name ? 'signerNameText' : 'signerNameText signerNameTextENS'}>
               {this.props.name}
             </div>
           </div>
         ) : null}
         <div className={'signerAddress'}>
-          <div className='transactionToAddress'
+          <div
+            className='transactionToAddress'
             onMouseEnter={() => {
               this.setState({ addressHover: true })
             }}
@@ -1042,14 +1008,38 @@ class Account extends React.Component {
               {this.state.addressHover ? (
                 <div className='transactionToAddressLarge transactionToAddressCopy'>copy address</div>
               ) : ensName ? (
-                <div className='transactionToAddressLarge transactionToAddressENS' style={{ fontSize: this.getAddressSize() + 'px' }}>{ensName}</div>
+                <div
+                  className='transactionToAddressLarge transactionToAddressENS'
+                  style={{ fontSize: this.getAddressSize() + 'px' }}
+                >
+                  {ensName}
+                </div>
               ) : (
-                <div className={this.props.name ? 'transactionToAddressLarge' : 'transactionToAddressLarge transactionToAddressENS'}>{formattedAddress.substring(0, 6)} {svg.octicon('kebab-horizontal', { height: 16 })} {formattedAddress.substr(formattedAddress.length - 5)}</div>
-              )
-              }
+                <div
+                  className={
+                    this.props.name ? 'transactionToAddressLarge' : 'transactionToAddressLarge transactionToAddressENS'
+                  }
+                >
+                  {formattedAddress.substring(0, 6)} {svg.octicon('kebab-horizontal', { height: 16 })}{' '}
+                  {formattedAddress.substr(formattedAddress.length - 5)}
+                </div>
+              )}
             </div>
-            <div className={this.state.addressHover ? 'transactionToAddressFull' : 'transactionToAddressFull transactionToAddressFullHidden'}>
-              {this.state.copied ? <span className='transactionToAddressFullCopied'>{'Address Copied'}{svg.octicon('clippy', { height: 14 })}</span> : formattedAddress}
+            <div
+              className={
+                this.state.addressHover
+                  ? 'transactionToAddressFull'
+                  : 'transactionToAddressFull transactionToAddressFullHidden'
+              }
+            >
+              {this.state.copied ? (
+                <span className='transactionToAddressFullCopied'>
+                  {'Address Copied'}
+                  {svg.octicon('clippy', { height: 14 })}
+                </span>
+              ) : (
+                formattedAddress
+              )}
             </div>
           </div>
         </div>
@@ -1058,11 +1048,7 @@ class Account extends React.Component {
           let requestBadgeClass = 'accountNotificationBadge'
           if (active) requestBadgeClass += ' accountNotificationBadgeReady'
           if (requests.length > 0) requestBadgeClass += ' accountNotificationBadgeActive'
-          return (
-            <div className={requestBadgeClass}>
-              {requests.length}
-            </div>
-          )
+          return <div className={requestBadgeClass}>{requests.length}</div>
         })()}
         {/* <div
           className='addressSelect' onMouseDown={e => {
@@ -1083,12 +1069,12 @@ class Account extends React.Component {
     )
   }
 
-  hideSignerStatus (value) {
+  hideSignerStatus(value) {
     this.setState({ hideSignerStatus: value })
   }
 
-  render () {
-    const current = (this.store('selected.current') === this.props.id) && this.props.status === 'ok'
+  render() {
+    const current = this.store('selected.current') === this.props.id && this.props.status === 'ok'
     const open = current && this.store('selected.open')
     const minimized = this.store('selected.minimized')
     this.selected = current && !minimized
@@ -1120,7 +1106,10 @@ class Account extends React.Component {
       style.transition = '300ms cubic-bezier(.82,0,.12,1) all'
       if (this.store('selected.open')) {
         // Not open, but another signer is
-        style.transform = this.props.index > this.store('selected.position.initial.index') ? 'translate(0px, 100px)' : 'translate(0px, -20px)'
+        style.transform =
+          this.props.index > this.store('selected.position.initial.index')
+            ? 'translate(0px, 100px)'
+            : 'translate(0px, -20px)'
         style.opacity = 0
         style.pointerEvents = 'none'
       } else {
@@ -1144,7 +1133,7 @@ class Account extends React.Component {
 
     if (account.signer) {
       signer = this.store('main.signers', account.signer)
-    } else if (account.smart)  {
+    } else if (account.smart) {
       const actingSigner = this.store('main.accounts', account.smart.actor, 'signer')
       if (actingSigner) signer = this.store('main.signers', actingSigner)
     }
@@ -1155,20 +1144,30 @@ class Account extends React.Component {
     }
 
     return (
-      <div className='signerWrap' style={current ? { height: initial.height + 'px' } : {}} onMouseDown={() => this.closeAccounts()}>
-        <div className={signerClass} style={style} ref={ref => { if (ref) this.signer = ref }}>
+      <div
+        className='signerWrap'
+        style={current ? { height: initial.height + 'px' } : {}}
+        onMouseDown={() => this.closeAccounts()}
+      >
+        <div
+          className={signerClass}
+          style={style}
+          ref={(ref) => {
+            if (ref) this.signer = ref
+          }}
+        >
           <div className='signerContainer' style={current ? { height: '100%' } : {}}>
             {this.store('view.clickGuard') ? <div className='clickGuard' /> : null}
             {!this.state.hideSignerStatus && open ? (
               <SignerStatus open={open} signer={signer} hideSignerStatus={this.hideSignerStatus.bind(this)} />
             ) : null}
-            <div 
-              className={this.props.active ? 'signerTop signerTopActive' : 'signerTop'} 
-              onMouseEnter={() => this.setState({ openHover: true })} 
+            <div
+              className={this.props.active ? 'signerTop signerTopActive' : 'signerTop'}
+              onMouseEnter={() => this.setState({ openHover: true })}
               onMouseLeave={() => this.setState({ openHover: false })}
             >
-              {!this.state.addressHover ? this.renderType() : null} 
-              {!this.state.addressHover ? this.renderSignerIndicator() : null} 
+              {!this.state.addressHover ? this.renderType() : null}
+              {!this.state.addressHover ? this.renderSignerIndicator() : null}
               {!this.state.addressHover ? (
                 <>
                   <div className='accountGrabber' style={open || true ? { opacity: 0, pointerEvents: 'none' } : {}}>
@@ -1188,12 +1187,12 @@ class Account extends React.Component {
             </div>
             {current ? (
               <AccountBody
-                id={this.props.id} 
-                addresses={this.props.addresses} 
-                minimized={minimized} 
-                status={this.props.status} 
-                signer={this.props.signer} 
-              /> 
+                id={this.props.id}
+                addresses={this.props.addresses}
+                minimized={minimized}
+                status={this.props.status}
+                signer={this.props.signer}
+              />
             ) : null}
           </div>
         </div>
diff --git a/app/App/Main/Signer/index.js b/app/App/Main/Signer/index.js
index 395dbc410..eb9a1eadc 100644
--- a/app/App/Main/Signer/index.js
+++ b/app/App/Main/Signer/index.js
@@ -12,25 +12,25 @@ import Settings from './Settings'
 // TODO: Rename Signer component to Account
 
 class _Balances extends React.Component {
-  constructor (...args) {
+  constructor(...args) {
     super(...args)
     this.moduleRef = React.createRef()
     this.state = {
       openActive: false,
       open: false,
       selected: 0,
-      shadowTop: 0
+      shadowTop: 0,
     }
     this.mD = this.mouseDetect.bind(this)
   }
 
-  mouseDetect (e) {
+  mouseDetect(e) {
     if (this.moduleRef && this.moduleRef.current && !this.moduleRef.current.contains(e.target)) {
       this.setActive(false)
     }
   }
 
-  setActive (active) {
+  setActive(active) {
     const { type, id } = this.store('main.currentNetwork')
     if (type !== 'ethereum' || id !== 1) return
     this.setState({ openActive: active })
@@ -44,11 +44,11 @@ class _Balances extends React.Component {
     }
   }
 
-  handleScroll (event) {
+  handleScroll(event) {
     this.setState({ shadowTop: event.target.scrollTop })
   }
 
-  renderBalance (known, k, i) {
+  renderBalance(known, k, i) {
     const currentIndex = this.store('main.accounts', this.props.id, 'index')
     const address = this.store('main.accounts', this.props.id, 'addresses', currentIndex)
     const balance = this.store('balances', address)
@@ -56,27 +56,33 @@ class _Balances extends React.Component {
     return (
       <div className='signerBalance' key={k} onMouseDown={() => this.setState({ selected: i })}>
         <div className='signerBalanceLogo'>
-          <img src={token.logoURI && `https://proxy.pylon.link?type=icon&target=${encodeURIComponent(token.logoURI)}`} />
+          <img
+            src={token.logoURI && `https://proxy.pylon.link?type=icon&target=${encodeURIComponent(token.logoURI)}`}
+          />
         </div>
-        <div className='signerBalanceCurrency'>
-          {token.symbol}
-        </div>
-        <div className='signerBalanceValue' style={(token.displayBalance || '$0').length >= 12 ? { fontSize: '15px', top: '14px' } : {}}>
-          {(balance === undefined ? '-.------' : token.displayBalance)}
+        <div className='signerBalanceCurrency'>{token.symbol}</div>
+        <div
+          className='signerBalanceValue'
+          style={(token.displayBalance || '$0').length >= 12 ? { fontSize: '15px', top: '14px' } : {}}
+        >
+          {balance === undefined ? '-.------' : token.displayBalance}
         </div>
-        <div className='signerBalanceEquivalent' style={(token.usdDisplayValue || '$0').length >= 11 ? { fontSize: '10px', top: '15px' } : {}}>
+        <div
+          className='signerBalanceEquivalent'
+          style={(token.usdDisplayValue || '$0').length >= 11 ? { fontSize: '10px', top: '15px' } : {}}
+        >
           {token.usdDisplayValue}
         </div>
       </div>
     )
   }
 
-  render () {
+  render() {
     const { open, openActive, selected, shadowTop } = this.state
     let currentIndex = this.store('main.accounts', this.props.id, 'index')
     if (this.props.accountHighlight === 'active') currentIndex = this.props.highlightIndex
     const address = this.store('main.accounts', this.props.id, 'addresses', currentIndex)
-    const current = (this.store('selected.current') === this.props.id) && this.props.status === 'ok'
+    const current = this.store('selected.current') === this.props.id && this.props.status === 'ok'
     const { type, id } = this.store('main.currentNetwork')
     const currentSymbol = this.store('main.networks', type, id, 'symbol') || 'ETH'
     if (current) {
@@ -97,57 +103,68 @@ class _Balances extends React.Component {
           floatBalance: parseFloat(balance || 0).toFixed(6),
           usdRate: etherUSD,
           usdValue: Math.floor(parseFloat(balance) * etherUSD),
-          usdDisplayValue: '$' + Math.floor(parseFloat(balance) * etherUSD).toLocaleString()
-        }
+          usdDisplayValue: '$' + Math.floor(parseFloat(balance) * etherUSD).toLocaleString(),
+        },
       })
       const knownList = Object.keys(known).sort((a, b) => {
         if (a === 'default') return -1
         if (b === 'default') return 1
         return known[a].usdValue > known[b].usdValue ? -1 : known[a].usdValue < known[b].usdValue ? 1 : 0
       })
-      const offsetTop = (selected * 47) + 10
+      const offsetTop = selected * 47 + 10
       return (
         <div
-          ref={this.moduleRef} className={openActive ? 'signerBalances signerBalancesOpen' : 'signerBalances'} onMouseDown={() => {
+          ref={this.moduleRef}
+          className={openActive ? 'signerBalances signerBalancesOpen' : 'signerBalances'}
+          onMouseDown={() => {
             clearTimeout(this.openTimer)
             const o = !this.state.open
             this.setActive(o)
           }}
         >
           <div
-            className='signerBalanceSliderInset signerBalanceSliderDisplay' style={openActive && !open ? {
-              transition: '0.16s cubic-bezier(.82,0,.12,1) all',
-              transform: `translateY(-${shadowTop}px)`
-            } : openActive && open ? {
-              transition: '0s cubic-bezier(.82,0,.12,1) all',
-              transform: `translateY(-${shadowTop}px)`
-            } : {
-              transition: '0.16s cubic-bezier(.82,0,.12,1) all',
-              transform: `translateY(-${offsetTop}px)`
-            }}
+            className='signerBalanceSliderInset signerBalanceSliderDisplay'
+            style={
+              openActive && !open
+                ? {
+                    transition: '0.16s cubic-bezier(.82,0,.12,1) all',
+                    transform: `translateY(-${shadowTop}px)`,
+                  }
+                : openActive && open
+                ? {
+                    transition: '0s cubic-bezier(.82,0,.12,1) all',
+                    transform: `translateY(-${shadowTop}px)`,
+                  }
+                : {
+                    transition: '0.16s cubic-bezier(.82,0,.12,1) all',
+                    transform: `translateY(-${offsetTop}px)`,
+                  }
+            }
           >
             {knownList.map((k, i) => this.renderBalance(known, k, i))}
           </div>
-          <div className='signerBalanceSlider' style={!open ? { pointerEvents: 'none' } : {}} onScroll={this.handleScroll.bind(this)}>
+          <div
+            className='signerBalanceSlider'
+            style={!open ? { pointerEvents: 'none' } : {}}
+            onScroll={this.handleScroll.bind(this)}
+          >
             <div className='signerBalanceSliderInset signerBalanceSliderShadow'>
               {knownList.map((k, i) => this.renderBalance(known, k, i))}
             </div>
           </div>
           <div className='signerBalanceTotal' onMouseDown={(e) => e.stopPropagation()}>
             <div className='signerBalanceTotalText'>
-              <div className='signerBalanceTotalTitle'>
-                Total
-              </div>
+              <div className='signerBalanceTotalTitle'>Total</div>
               <div className='signerBalanceTotalValue'>
-                {'$' + knownList.map(k => known[k].usdValue).reduce((a, b) => a + b, 0).toLocaleString()}
+                {'$' +
+                  knownList
+                    .map((k) => known[k].usdValue)
+                    .reduce((a, b) => a + b, 0)
+                    .toLocaleString()}
               </div>
             </div>
           </div>
-          {knownList.length <= 1 ? (
-            <div className='signerBalanceNoTokens'>
-              No other token balances found
-            </div>
-          ) : null}
+          {knownList.length <= 1 ? <div className='signerBalanceNoTokens'>No other token balances found</div> : null}
         </div>
       )
     } else {
@@ -158,7 +175,7 @@ class _Balances extends React.Component {
 const Balances = Restore.connect(_Balances)
 
 class Signer extends React.Component {
-  constructor (...args) {
+  constructor(...args) {
     super(...args)
     this.locked = false
     this.state = {
@@ -166,61 +183,73 @@ class Signer extends React.Component {
       accountHighlight: 'default',
       highlightIndex: 0,
       unlockInput: '',
-      openHover: false
+      openHover: false,
     }
   }
 
-  componentDidMount () {
+  componentDidMount() {
     if (this.props.index === 0) this.props.resetScroll()
   }
 
-  copyAddress (e) {
+  copyAddress(e) {
     e.preventDefault()
     e.target.select()
     document.execCommand('Copy')
     this.setState({ copied: true })
-    setTimeout(_ => this.setState({ copied: false }), 1000)
+    setTimeout((_) => this.setState({ copied: false }), 1000)
   }
 
-  unlockChange (e) {
+  unlockChange(e) {
     this.setState({ unlockInput: e.target.value })
   }
 
-  unlockSubmit (e) {
+  unlockSubmit(e) {
     link.rpc('unlockSigner', this.props.id, this.state.unlockInput, () => {})
   }
 
-  trezorPin (num) {
+  trezorPin(num) {
     this.setState({ tPin: this.state.tPin + num.toString() })
   }
 
-  submitPin () {
+  submitPin() {
     link.rpc('trezorPin', this.props.id, this.state.tPin, () => {})
     this.setState({ tPin: '' })
   }
 
-  backspacePin (e) {
+  backspacePin(e) {
     e.stopPropagation()
     this.setState({ tPin: this.state.tPin ? this.state.tPin.slice(0, -1) : '' })
   }
 
-  select () {
+  select() {
     if (this.store('selected.current') === this.props.id) {
-      link.rpc('unsetSigner', this.props.id, (err, status) => { if (err) return console.log(err) })
-      if (this.props.signer && this.store('main.accountCloseLock')) link.rpc('lockSigner', this.props.signer.id, (err, status) => { if (err) return console.log(err) })
+      link.rpc('unsetSigner', this.props.id, (err, status) => {
+        if (err) return console.log(err)
+      })
+      if (this.props.signer && this.store('main.accountCloseLock'))
+        link.rpc('lockSigner', this.props.signer.id, (err, status) => {
+          if (err) return console.log(err)
+        })
     } else {
       const bounds = this.signer.getBoundingClientRect()
       this.props.reportScroll()
-      this.store.initialSignerPos({ top: bounds.top, bottom: document.body.clientHeight - bounds.top - this.signer.clientHeight + 3, height: this.signer.clientHeight, index: this.props.index })
-      link.rpc('setSigner', this.props.id, (err, status) => { if (err) return console.log(err) })
+      this.store.initialSignerPos({
+        top: bounds.top,
+        bottom: document.body.clientHeight - bounds.top - this.signer.clientHeight + 3,
+        height: this.signer.clientHeight,
+        index: this.props.index,
+      })
+      link.rpc('setSigner', this.props.id, (err, status) => {
+        if (err) return console.log(err)
+      })
     }
   }
 
-  renderTrezorPin (active) {
+  renderTrezorPin(active) {
     return (
       <div className='trezorPinWrap' style={active ? {} : { height: '0px', padding: '0px 0px 0px 0px' }}>
         <div className='trezorPinInput'>
-          {[1, 2, 3, 4, 5, 6, 7, 8, 9].map(i => (
+          {[1, 2, 3, 4, 5, 6, 7, 8, 9].map((i) => (
             <div key={i} className='trezorPinInputButton' onMouseDown={this.trezorPin.bind(this, i)}>
               {svg.octicon('primitive-dot', { height: 20 })}
             </div>
@@ -230,7 +259,7 @@ class Signer extends React.Component {
     )
   }
 
-  renderArrows () {
+  renderArrows() {
     return (
       <>
         <div className='signerSelect signerSelectLeft'>
@@ -251,7 +280,7 @@ class Signer extends React.Component {
     )
   }
 
-  typeClick () {
+  typeClick() {
     if (this.props.status === 'ok') {
       this.select()
       this.setState({ typeActive: true })
@@ -262,17 +291,19 @@ class Signer extends React.Component {
     }
   }
 
-  renderType () {
+  renderType() {
     let innerClass = 'signerInner'
     if (this.state.typeActive) innerClass += ' signerInnerActive'
     if (this.state.typeShake) innerClass += ' headShake'
     if (this.store('selected.view') === 'settings') innerClass += ' signerTypeSettings'
-    if (!this.props.signer || (this.props.signer && this.props.signer.status === 'initial')) innerClass += ' signerInnerDisconnected'
+    if (!this.props.signer || (this.props.signer && this.props.signer.status === 'initial'))
+      innerClass += ' signerInnerDisconnected'
     const inSettings = this.store('selected.view') === 'settings'
     return (
       <div className='signerType'>
         <div
-          className='addressSelect' onMouseDown={e => {
+          className='addressSelect'
+          onMouseDown={(e) => {
             e.stopPropagation()
             this.store.toggleShowAccounts()
           }}
@@ -285,14 +316,25 @@ class Signer extends React.Component {
         </div>
         {this.state.openHover ? this.renderArrows('up') : null}
         {!this.props.signer || (this.props.signer && this.props.signer.status === 'initial') ? (
-          <div className='signerTypeDisconnected' onMouseDown={this.typeClick.bind(this)} style={inSettings ? { transform: 'translateY(-30px)' } : {}} onMouseEnter={() => this.setState({ openHover: true })} onMouseLeave={() => this.setState({ openHover: false })}>
+          <div
+            className='signerTypeDisconnected'
+            onMouseDown={this.typeClick.bind(this)}
+            style={inSettings ? { transform: 'translateY(-30px)' } : {}}
+            onMouseEnter={() => this.setState({ openHover: true })}
+            onMouseLeave={() => this.setState({ openHover: false })}
+          >
             <div className='signerTypeDisconnectedImageFront'>{svg.logo(24)}</div>
           </div>
         ) : null}
-        <div className={innerClass} onMouseDown={this.typeClick.bind(this)} onMouseEnter={() => this.setState({ openHover: true })} onMouseLeave={() => this.setState({ openHover: false })}>
+        <div
+          className={innerClass}
+          onMouseDown={this.typeClick.bind(this)}
+          onMouseEnter={() => this.setState({ openHover: true })}
+          onMouseLeave={() => this.setState({ openHover: false })}
+        >
           <div className='signerInset'>
             <div className={`signerImage signerImage-${this.props.type}`}>
-              {(_ => {
+              {((_) => {
                 if (this.props.signer) {
                   if (this.props.signer.type === 'ledger') return svg.ledger(24)
                   if (this.props.signer.type === 'trezor') return svg.trezor(20)
@@ -305,9 +347,12 @@ class Signer extends React.Component {
                 }
               })()}
             </div>
-            <div className='signerText'>{this.props.signer ? (
-              this.props.signer.type === 'ring' || this.props.signer.type === 'seed' ? 'hot' : this.props.signer.type
-            ) : 'no signer'}
+            <div className='signerText'>
+              {this.props.signer
+                ? this.props.signer.type === 'ring' || this.props.signer.type === 'seed'
+                  ? 'hot'
+                  : this.props.signer.type
+                : 'no signer'}
             </div>
           </div>
         </div>
@@ -315,10 +360,10 @@ class Signer extends React.Component {
     )
   }
 
-  renderMenu () {
+  renderMenu() {
     let menuClass = 'signerMenu'
     menuClass += this.store('selected.view') === 'settings' ? ' signerMenuSettings' : ' signerMenuDefault'
-    if (this.store('selected.current') === this.props.id & this.store('selected.open')) menuClass += ' signerMenuOpen'
+    if ((this.store('selected.current') === this.props.id) & this.store('selected.open')) menuClass += ' signerMenuOpen'
     return (
       <div className={menuClass}>
         <div className='signerMenuItem signerMenuItemLeft' onMouseDown={() => this.store.setSignerView('default')}>
@@ -337,25 +382,27 @@ class Signer extends React.Component {
     )
   }
 
-  setHighlight (mode, index) {
+  setHighlight(mode, index) {
     if (!this.locked) this.setState({ accountHighlight: mode, highlightIndex: index || 0 })
   }
 
-  closeAccounts () {
+  closeAccounts() {
     if (this.store('selected.showAccounts')) this.store.toggleShowAccounts(false)
   }
 
-  setSignerIndex (index) {
+  setSignerIndex(index) {
     this.locked = true
     link.rpc('setSignerIndex', index, (err, summary) => {
       this.setState({ accountHighlight: 'inactive', highlightIndex: 0 })
       this.store.toggleShowAccounts(false)
-      setTimeout(() => { this.locked = false }, 1000)
+      setTimeout(() => {
+        this.locked = false
+      }, 1000)
       if (err) return console.log(err)
     })
   }
 
-  renderSettingsMenu () {
+  renderSettingsMenu() {
     let viewIndex = this.store('selected.settings.viewIndex')
 
     // FIXME: Ugly hack to allow 'Rename Account' view to slide in from right
@@ -363,19 +410,32 @@ class Signer extends React.Component {
 
     const views = this.store('selected.settings.views')
     const itemWidth = 35
-    const markLeft = (itemWidth * viewIndex) + 'px'
-    const markRight = (((views.length - viewIndex) - 1) * itemWidth) + 'px'
+    const markLeft = itemWidth * viewIndex + 'px'
+    const markRight = (views.length - viewIndex - 1) * itemWidth + 'px'
     return (
       <div className='settingsMenu'>
         <div className='settingsMenuItems'>
-          <div className={viewIndex === 0 ? 'settingsMenuItem settingsMenuItemSelected' : 'settingsMenuItem'} onMouseDown={() => this.store.setSettingsView(0)}>
-            <div className='settingsMenuItemIcon' style={{ left: '2px', top: '2px' }}>{svg.octicon('key', { height: 18 })}</div>
+          <div
+            className={viewIndex === 0 ? 'settingsMenuItem settingsMenuItemSelected' : 'settingsMenuItem'}
+            onMouseDown={() => this.store.setSettingsView(0)}
+          >
+            <div className='settingsMenuItemIcon' style={{ left: '2px', top: '2px' }}>
+              {svg.octicon('key', { height: 18 })}
+            </div>
           </div>
-          <div className={viewIndex === 1 ? 'settingsMenuItem settingsMenuItemSelected' : 'settingsMenuItem'} onMouseDown={() => this.store.setSettingsView(1)}>
+          <div
+            className={viewIndex === 1 ? 'settingsMenuItem settingsMenuItemSelected' : 'settingsMenuItem'}
+            onMouseDown={() => this.store.setSettingsView(1)}
+          >
             <div className='settingsMenuItemIcon'>{svg.octicon('checklist', { height: 22 })}</div>
           </div>
-          <div className={viewIndex === 2 ? 'settingsMenuItem settingsMenuItemSelected' : 'settingsMenuItem'} onMouseDown={() => this.store.setSettingsView(2)}>
-            <div className='settingsMenuItemIcon' style={{ left: '-1px', top: '0px' }}>{svg.octicon('gear', { height: 20 })}</div>
+          <div
+            className={viewIndex === 2 ? 'settingsMenuItem settingsMenuItemSelected' : 'settingsMenuItem'}
+            onMouseDown={() => this.store.setSettingsView(2)}
+          >
+            <div className='settingsMenuItemIcon' style={{ left: '-1px', top: '0px' }}>
+              {svg.octicon('gear', { height: 20 })}
+            </div>
           </div>
         </div>
         <div className='settingsMenuSelect'>
@@ -387,38 +447,50 @@ class Signer extends React.Component {
     )
   }
 
-  renderAccountList () {
+  renderAccountList() {
     const index = this.store('main.accounts', this.props.id, 'index')
     const startIndex = this.store('selected.accountPage') * 5
-    const highlight = (this.state.accountHighlight === 'inactive') ? index : this.state.highlightIndex
+    const highlight = this.state.accountHighlight === 'inactive' ? index : this.state.highlightIndex
     const { type, id } = this.store('main.currentNetwork')
     const currentSymbol = this.store('main.networks', type, id, 'symbol') || 'ETH'
     return (
       <div className='accountListWrap'>
-        <div className='accountList' onMouseDown={e => e.stopPropagation()}>
+        <div className='accountList' onMouseDown={(e) => e.stopPropagation()}>
           <div className='accountListItems'>
-            {this.store('main.accounts', this.props.id, 'addresses').slice(startIndex, startIndex + 5).map((a, i) => {
-              i = startIndex + i
-              const balance = this.store('balances', a)
-              return (
-                <div
-                  key={i}
-                  className={i === highlight ? 'accountListItem accountListItemSelected' : 'accountListItem'}
-                  onMouseDown={() => this.setSignerIndex(i)}
-                  onMouseEnter={() => this.setHighlight('active', i)}
-                  onMouseLeave={() => this.setHighlight('inactive', i)}
-                >
-                  <div className='accountListItemCheck'>{svg.octicon('check', { height: 27 })}</div>
-                  <div className='accountListItemAddress'>{a ? a.substring(0, 6) : ''}{svg.octicon('kebab-horizontal', { height: 16 })}{a ? a.substr(a.length - 4) : ''}</div>
-                  <div className='accountListItemBalance'>{currentSymbol + ' ' + (balance === undefined ? '-.------' : parseFloat(balance).toFixed(6))}</div>
-                </div>
-              )
-            })}
+            {this.store('main.accounts', this.props.id, 'addresses')
+              .slice(startIndex, startIndex + 5)
+              .map((a, i) => {
+                i = startIndex + i
+                const balance = this.store('balances', a)
+                return (
+                  <div
+                    key={i}
+                    className={i === highlight ? 'accountListItem accountListItemSelected' : 'accountListItem'}
+                    onMouseDown={() => this.setSignerIndex(i)}
+                    onMouseEnter={() => this.setHighlight('active', i)}
+                    onMouseLeave={() => this.setHighlight('inactive', i)}
+                  >
+                    <div className='accountListItemCheck'>{svg.octicon('check', { height: 27 })}</div>
+                    <div className='accountListItemAddress'>
+                      {a ? a.substring(0, 6) : ''}
+                      {svg.octicon('kebab-horizontal', { height: 16 })}
+                      {a ? a.substr(a.length - 4) : ''}
+                    </div>
+                    <div className='accountListItemBalance'>
+                      {currentSymbol + ' ' + (balance === undefined ? '-.------' : parseFloat(balance).toFixed(6))}
+                    </div>
+                  </div>
+                )
+              })}
           </div>
           <div className='accountPageToggle'>
-            <div className='accountPageButton accountPageButtonLeft' onMouseDown={() => this.updateAccountPage('<')}>{svg.octicon('chevron-left', { height: 18 })}</div>
+            <div className='accountPageButton accountPageButtonLeft' onMouseDown={() => this.updateAccountPage('<')}>
+              {svg.octicon('chevron-left', { height: 18 })}
+            </div>
             <div className='accountPageCurrent'>{this.store('selected.accountPage') + 1}</div>
-            <div className='accountPageButton accountPageButtonRight' onMouseDown={() => this.updateAccountPage('>')}>{svg.octicon('chevron-right', { height: 18 })}</div>
+            <div className='accountPageButton accountPageButtonRight' onMouseDown={() => this.updateAccountPage('>')}>
+              {svg.octicon('chevron-right', { height: 18 })}
+            </div>
           </div>
           {this.renderSettingsMenu()}
         </div>
@@ -426,16 +498,16 @@ class Signer extends React.Component {
     )
   }
 
-  updateAccountPage (d) {
+  updateAccountPage(d) {
     let accountPage = this.store('selected.accountPage')
     accountPage = d === '<' ? accountPage - 1 : accountPage + 1
-    const max = Math.ceil((this.store('main.accounts', this.props.id, 'addresses').length / 5) - 1)
+    const max = Math.ceil(this.store('main.accounts', this.props.id, 'addresses').length / 5 - 1)
     if (accountPage < 0) accountPage = 0
     if (accountPage > max) accountPage = max
     this.store.accountPage(accountPage)
   }
 
-  renderStatus () {
+  renderStatus() {
     // let open = current && this.store('selected.open')
     // TODO: Set Signer Name
     let currentIndex = this.store('main.accounts', this.props.id, 'index')
@@ -458,15 +530,29 @@ class Signer extends React.Component {
               </div>
               <div className='signerAddress'>
                 <div className='transactionToAddress'>
-                  <div className='transactionToAddressLarge'>{address.substring(0, 10)} {svg.octicon('kebab-horizontal', { height: 20 })} {address.substr(address.length - 10)}</div>
+                  <div className='transactionToAddressLarge'>
+                    {address.substring(0, 10)} {svg.octicon('kebab-horizontal', { height: 20 })}{' '}
+                    {address.substr(address.length - 10)}
+                  </div>
                   <div className='transactionToAddressFull'>
-                    {this.state.copied ? <span>{'Copied'}{svg.octicon('clippy', { height: 14 })}</span> : address}
-                    <input tabIndex='-1' onMouseDown={e => this.copyAddress(e)} value={address} readOnly />
+                    {this.state.copied ? (
+                      <span>
+                        {'Copied'}
+                        {svg.octicon('clippy', { height: 14 })}
+                      </span>
+                    ) : (
+                      address
+                    )}
+                    <input tabIndex='-1' onMouseDown={(e) => this.copyAddress(e)} value={address} readOnly />
                   </div>
                 </div>
               </div>
               <div className='signerInfo'>
-                <Balances {...this.props} highlightIndex={this.state.highlightIndex} accountHighlight={this.state.accountHighlight} />
+                <Balances
+                  {...this.props}
+                  highlightIndex={this.state.highlightIndex}
+                  accountHighlight={this.state.accountHighlight}
+                />
               </div>
             </div>
           </div>
@@ -475,8 +561,8 @@ class Signer extends React.Component {
     )
   }
 
-  render () {
-    const current = (this.store('selected.current') === this.props.id) && this.props.status === 'ok'
+  render() {
+    const current = this.store('selected.current') === this.props.id && this.props.status === 'ok'
     const open = current && this.store('selected.open')
     const minimized = this.store('selected.minimized')
     this.selected = current && !minimized
@@ -507,7 +593,10 @@ class Signer extends React.Component {
       style.transition = '0.48s cubic-bezier(.82,0,.12,1) all'
       if (this.store('selected.open')) {
         // Not open, but another signer is
-        style.transform = this.props.index > this.store('selected.position.initial.index') ? 'translate(0px, 100px)' : 'translate(0px, -100px)'
+        style.transform =
+          this.props.index > this.store('selected.position.initial.index')
+            ? 'translate(0px, 100px)'
+            : 'translate(0px, -100px)'
         style.opacity = 0
         style.pointerEvents = 'none'
       } else {
@@ -524,19 +613,38 @@ class Signer extends React.Component {
       }
     }
     return (
-      <div className='signerWrap' style={current ? { height: initial.height + 'px' } : {}} onMouseDown={() => this.closeAccounts()}>
-        <div className={signerClass} style={style} ref={ref => { if (ref) this.signer = ref }}>
+      <div
+        className='signerWrap'
+        style={current ? { height: initial.height + 'px' } : {}}
+        onMouseDown={() => this.closeAccounts()}
+      >
+        <div
+          className={signerClass}
+          style={style}
+          ref={(ref) => {
+            if (ref) this.signer = ref
+          }}
+        >
           <div className='signerContainer' style={current ? { height: '100%' } : {}}>
             {this.store('view.clickGuard') ? <div className='clickGuard' /> : null}
             <div className='signerTop'>
-              <div className='signerNav'> {this.renderMenu()} {this.renderType()} </div>
+              <div className='signerNav'>
+                {' '}
+                {this.renderMenu()} {this.renderType()}{' '}
+              </div>
               {this.renderStatus()}
             </div>
             {current ? this.renderAccountList() : null}
             {current ? (
               <div className='signerMid' style={open ? { top: '170px' } : { pointerEvents: 'none' }}>
                 <Settings id={this.props.id} />
-                <Requests id={this.props.id} addresses={this.props.addresses} minimized={minimized} status={this.props.status} signer={this.props.signer} />
+                <Requests
+                  id={this.props.id}
+                  addresses={this.props.addresses}
+                  minimized={minimized}
+                  status={this.props.status}
+                  signer={this.props.signer}
+                />
               </div>
             ) : null}
             <div className='signerBot' />
diff --git a/app/App/Main/index.js b/app/App/Main/index.js
index 2d02cfa7d..d7e4aee5d 100644
--- a/app/App/Main/index.js
+++ b/app/App/Main/index.js
@@ -12,18 +12,18 @@ import link from '../../../resources/link'
 let firstScroll = true
 
 class Main extends React.Component {
-  constructor (...args) {
+  constructor(...args) {
     super(...args)
     this.state = {
-      filter: ''
+      filter: '',
     }
   }
 
-  reportScroll () {
+  reportScroll() {
     this.store.initialScrollPos(ReactDOM.findDOMNode(this.scroll).scrollTop)
   }
 
-  resetScroll () {
+  resetScroll() {
     setTimeout(() => {
       if (firstScroll) {
         firstScroll = false
@@ -33,21 +33,21 @@ class Main extends React.Component {
     }, 3000)
   }
 
-  accountSort (accounts, a, b) {
+  accountSort(accounts, a, b) {
     try {
       let [aBlock, aLocal] = accounts[a].created.split(':')
       let [bBlock, bLocal] = accounts[b].created.split(':')
-  
+
       aLocal = parseInt(aLocal)
       bLocal = parseInt(bLocal)
-  
+
       if (aBlock === 'new' && bBlock !== 'new') return -1
       if (bBlock !== 'new' && aBlock === 'new') return 1
       if (aBlock === 'new' && bBlock === 'new') return aLocal >= bLocal ? 1 : 0
-  
+
       aBlock = parseInt(aBlock)
       bBlock = parseInt(bBlock)
-  
+
       if (aBlock > bBlock) return -1
       if (aBlock < bBlock) return -1
       if (aBlock === bBlock) return aLocal >= bLocal ? 1 : 0
@@ -59,7 +59,7 @@ class Main extends React.Component {
     }
   }
 
-  render () {
+  render() {
     const accounts = this.store('main.accounts')
     const current = this.store('selected.current')
     const scrollTop = this.store('selected.position.scrollTop')
@@ -76,8 +76,13 @@ class Main extends React.Component {
       <div className={this.store('panel.view') !== 'default' ? 'card cardHide' : 'card cardShow'}>
         <div id='panelScroll' style={panelScrollStyle}>
           <div className='panelScrollOverlay' />
-          <div id='panelSlide' 
-            ref={ref => { if (ref) this.scroll = ref }} style={current ? { overflow: 'visible' } : {}}>
+          <div
+            id='panelSlide'
+            ref={(ref) => {
+              if (ref) this.scroll = ref
+            }}
+            style={current ? { overflow: 'visible' } : {}}
+          >
             <div id='panelWrap' style={current && scrollTop > 0 ? { marginTop: '-' + scrollTop + 'px' } : {}}>
               {/* {untethered.sort().map((id, i) => <PendingSigner key={'signers' + id} {...this.store('main.signers', id)} index={i} />)} */}
               {sortedAccounts.map((id, i) => {
@@ -88,8 +93,17 @@ class Main extends React.Component {
                   !account.name.includes(filter) &&
                   !account.ensName.includes(filter) &&
                   !account.lastSignerType.includes(filter)
-                ) return null
-                return <Account key={id} {...account} index={i} reportScroll={() => this.reportScroll()} resetScroll={() => this.resetScroll()} />
+                )
+                  return null
+                return (
+                  <Account
+                    key={id}
+                    {...account}
+                    index={i}
+                    reportScroll={() => this.reportScroll()}
+                    resetScroll={() => this.resetScroll()}
+                  />
+                )
               })}
               {Object.keys(accounts).length === 0 ? (
                 <div className='noSigners'>
diff --git a/app/App/Menu/index.js b/app/App/Menu/index.js
index 24cfa6183..8913c9cfa 100644
--- a/app/App/Menu/index.js
+++ b/app/App/Menu/index.js
@@ -4,20 +4,36 @@ import link from '../../../resources/link'
 import svg from '../../../resources/svg'
 
 class Launcher extends React.Component {
-  constructor (...args) {
+  constructor(...args) {
     super(...args)
     this.moduleRef = React.createRef()
     this.resizeObserver = new ResizeObserver(() => {
       if (this.moduleRef && this.moduleRef.current) {
-        link.send('tray:action', 'updateAccountModule', this.props.moduleId, { height: this.moduleRef.current.clientHeight })
+        link.send('tray:action', 'updateAccountModule', this.props.moduleId, {
+          height: this.moduleRef.current.clientHeight,
+        })
       }
     })
     this.state = {
-      expand: false
+      expand: false,
+    }
+    this.e = {
+      p: [
+        'QXJyb3dVcA==',
+        'QXJyb3dVcA==',
+        'QXJyb3dEb3du',
+        'QXJyb3dEb3du',
+        'QXJyb3dMZWZ0',
+        'QXJyb3dSaWdodA==',
+        'QXJyb3dMZWZ0',
+        'QXJyb3dSaWdodA==',
+        'Yg==',
+        'YQ==',
+      ],
+      i: 0,
     }
-    this.e = { p: ['QXJyb3dVcA==', 'QXJyb3dVcA==', 'QXJyb3dEb3du', 'QXJyb3dEb3du', 'QXJyb3dMZWZ0', 'QXJyb3dSaWdodA==', 'QXJyb3dMZWZ0', 'QXJyb3dSaWdodA==', 'Yg==', 'YQ=='], i: 0 }
   }
-  h (e) {
+  h(e) {
     if (this.e.p.indexOf(btoa(e.key)) < 0 || btoa(e.key) !== this.e.p[this.e.i]) {
       this.e.i = 0
     } else {
@@ -26,44 +42,50 @@ class Launcher extends React.Component {
       if (this.e.p.length === this.e.i) {
         this.e.i = 0
         if (this.state.l === true) {
-          this.setState({l: false})
+          this.setState({ l: false })
         } else {
-          this.setState({l: true})
+          this.setState({ l: true })
         }
       }
     }
   }
-  componentDidMount () {
+  componentDidMount() {
     this.resizeObserver.observe(this.moduleRef.current)
     document.addEventListener('keydown', this.h.bind(this))
   }
-  componentWillUnmount () {
+  componentWillUnmount() {
     link.send('tray:action', 'updateAccountModule', this.props.moduleId, { height: 0 })
     document.removeEventListener('keydown', this.h.bind(this))
   }
-  glitch (el) {
+  glitch(el) {
     return (
       <div className={this.state.glitchOn ? 'glitch glitchOn' : 'glitch'}>
-        {[...Array(10).keys()].map(i => <div key={i + 'hg'} className='line'>{el}</div>)}
-        {!this.state.glitchOn ? <div className='line lastLine'>{el}</div> : null }
+        {[...Array(10).keys()].map((i) => (
+          <div key={i + 'hg'} className='line'>
+            {el}
+          </div>
+        ))}
+        {!this.state.glitchOn ? <div className='line lastLine'>{el}</div> : null}
       </div>
     )
   }
-  render () {
+  render() {
     return (
       <div ref={this.moduleRef} className='panelMenu'>
-        <div 
+        <div
           className={'panelMenuItem panelMenuItemOpen'}
-          onClick={() => link.send('tray:action', 'setDash', { 
-            showing: !this.store('dash.showing')
-          })}
+          onClick={() =>
+            link.send('tray:action', 'setDash', {
+              showing: !this.store('dash.showing'),
+            })
+          }
           onMouseEnter={() => this.setState({ glitchOn: true })}
           onMouseOver={() => this.setState({ glitchOn: true })}
           onMouseLeave={() => this.setState({ glitchOn: false })}
-        > 
+        >
           {this.glitch(svg.sidebar(15))}
         </div>
-        <div 
+        <div
           className={'panelMenuItem panelMenuItemSend'}
           onClick={() => {
             this.setState({ glitchOn: false })
@@ -81,4 +103,4 @@ class Launcher extends React.Component {
   }
 }
 
-export default Restore.connect(Launcher)
\ No newline at end of file
+export default Restore.connect(Launcher)
diff --git a/app/App/Notify/AddChain/index.js b/app/App/Notify/AddChain/index.js
index 4cd9e9a4a..dfd6dcb4a 100644
--- a/app/App/Notify/AddChain/index.js
+++ b/app/App/Notify/AddChain/index.js
@@ -4,7 +4,7 @@ import svg from '../../../../resources/svg'
 import link from '../../../../resources/link'
 
 class AddChain extends React.Component {
-  constructor (props, context) {
+  constructor(props, context) {
     super(props, context)
     this.newNetworkIdDefault = 'Chain ID'
     this.newNetworkNameDefault = 'Chain Name'
@@ -30,41 +30,43 @@ class AddChain extends React.Component {
       newNetworkSymbol: nativeChainCurrency.symbol || this.newNetworkSymbolDefault,
       newNetworkType: this.chain.type || this.newNetworkType,
       newNetworkLayer: this.chain.layer || 'other',
-      localShake: {}, 
-      resetConfirm: false, 
-      expandNetwork: false 
+      localShake: {},
+      resetConfirm: false,
+      expandNetwork: false,
     }
   }
 
-  render () {
-    const changedNewNetwork = (
+  render() {
+    const changedNewNetwork =
       this.state.newNetworkId !== this.newNetworkIdDefault ||
       this.state.newNetworkName !== this.newNetworkNameDefault ||
       this.state.newNetworkExplorer !== this.newNetworkExplorerDefault ||
       this.state.newNetworkSymbol !== this.newNetworkSymbolDefault ||
       this.state.newNetworkRPCPrimary !== this.newNetworkRPCPrimary ||
       this.state.newNetworkRPCSecondary !== this.newNetworkRPCSecondary
-    )
 
-    const newNetworkReady = (
-      this.state.newNetworkId !== this.newNetworkIdDefault && this.state.newNetworkId !== '' &&
-      this.state.newNetworkName !== this.newNetworkNameDefault && this.state.newNetworkName !== '' &&
-      this.state.newNetworkExplorer !== this.newNetworkExplorerDefault && this.state.newNetworkExplorer !== ''
-    )
+    const newNetworkReady =
+      this.state.newNetworkId !== this.newNetworkIdDefault &&
+      this.state.newNetworkId !== '' &&
+      this.state.newNetworkName !== this.newNetworkNameDefault &&
+      this.state.newNetworkName !== '' &&
+      this.state.newNetworkExplorer !== this.newNetworkExplorerDefault &&
+      this.state.newNetworkExplorer !== ''
 
     return (
-      <div className='notifyBoxWrap' onMouseDown={e => e.stopPropagation()}>
+      <div className='notifyBoxWrap' onMouseDown={(e) => e.stopPropagation()}>
         <div className='notifyBoxSlide'>
-          <div className='addChainTitle'>
-            Add New Chain
-          </div>
+          <div className='addChainTitle'>Add New Chain</div>
           <div className='addChain'>
             <div className='chainRow'>
               <div className='chainName'>
                 <div className='chainInputLabel'>Chain Name</div>
                 <input
-                  className={this.state.newNetworkName === this.newNetworkNameDefault ? 'chainInput chainInputDim' : 'chainInput'}
-                  value={this.state.newNetworkName} spellCheck='false'
+                  className={
+                    this.state.newNetworkName === this.newNetworkNameDefault ? 'chainInput chainInputDim' : 'chainInput'
+                  }
+                  value={this.state.newNetworkName}
+                  spellCheck='false'
                   onChange={(e) => {
                     this.setState({ newNetworkName: e.target.value })
                   }}
@@ -82,8 +84,11 @@ class AddChain extends React.Component {
               <div className='chainId'>
                 <div className='chainInputLabel'>Chain ID</div>
                 <input
-                  className={this.state.newNetworkId === this.newNetworkIdDefault ? 'chainInput chainInputDim' : 'chainInput'}
-                  value={this.state.newNetworkId} spellCheck='false'
+                  className={
+                    this.state.newNetworkId === this.newNetworkIdDefault ? 'chainInput chainInputDim' : 'chainInput'
+                  }
+                  value={this.state.newNetworkId}
+                  spellCheck='false'
                   onChange={(e) => {
                     if (Number(parseInt(e.target.value)) || e.target.value === '') {
                       this.setState({ newNetworkId: e.target.value })
@@ -101,8 +106,13 @@ class AddChain extends React.Component {
               <div className='chainSymbol'>
                 <div className='chainInputLabel'>Native Symbol</div>
                 <input
-                  className={this.state.newNetworkSymbol === this.newNetworkSymbolDefault ? 'chainInput chainInputDim' : 'chainInput'}
-                  value={this.state.newNetworkSymbol} spellCheck='false'
+                  className={
+                    this.state.newNetworkSymbol === this.newNetworkSymbolDefault
+                      ? 'chainInput chainInputDim'
+                      : 'chainInput'
+                  }
+                  value={this.state.newNetworkSymbol}
+                  spellCheck='false'
                   onChange={(e) => {
                     if (e.target.value.length > 8) return e.preventDefault()
                     this.setState({ newNetworkSymbol: e.target.value })
@@ -121,8 +131,13 @@ class AddChain extends React.Component {
               <div className='chainExplorer'>
                 <div className='chainInputLabel'>Block Explorer</div>
                 <input
-                  className={this.state.newNetworkExplorer === this.newNetworkExplorerDefault ? 'chainInput chainInputDim' : 'chainInput'}
-                  value={this.state.newNetworkExplorer} spellCheck='false'
+                  className={
+                    this.state.newNetworkExplorer === this.newNetworkExplorerDefault
+                      ? 'chainInput chainInputDim'
+                      : 'chainInput'
+                  }
+                  value={this.state.newNetworkExplorer}
+                  spellCheck='false'
                   onChange={(e) => {
                     this.setState({ newNetworkExplorer: e.target.value })
                   }}
@@ -140,8 +155,13 @@ class AddChain extends React.Component {
               <div className='chainExplorer'>
                 <div className='chainInputLabel'>Primary RPC</div>
                 <input
-                  className={this.state.newNetworkRPCPrimary === this.newNetworkRPCPrimary ? 'chainInput chainInputDim' : 'chainInput'}
-                  value={this.state.newNetworkRPCPrimary} spellCheck='false'
+                  className={
+                    this.state.newNetworkRPCPrimary === this.newNetworkRPCPrimary
+                      ? 'chainInput chainInputDim'
+                      : 'chainInput'
+                  }
+                  value={this.state.newNetworkRPCPrimary}
+                  spellCheck='false'
                   onChange={(e) => {
                     this.setState({ newNetworkRPCPrimary: e.target.value })
                   }}
@@ -159,8 +179,13 @@ class AddChain extends React.Component {
               <div className='chainExplorer'>
                 <div className='chainInputLabel'>Secondary RPC</div>
                 <input
-                  className={this.state.newNetworkRPCSecondary === this.newNetworkRPCSecondary ? 'chainInput chainInputDim' : 'chainInput'}
-                  value={this.state.newNetworkRPCSecondary} spellCheck='false'
+                  className={
+                    this.state.newNetworkRPCSecondary === this.newNetworkRPCSecondary
+                      ? 'chainInput chainInputDim'
+                      : 'chainInput'
+                  }
+                  value={this.state.newNetworkRPCSecondary}
+                  spellCheck='false'
                   onChange={(e) => {
                     this.setState({ newNetworkRPCSecondary: e.target.value })
                   }}
@@ -168,7 +193,7 @@ class AddChain extends React.Component {
                     if (e.target.value === this.newNetworkRPCSecondary) this.setState({ newNetworkRPCSecondary: '' })
                   }}
                   onBlur={(e) => {
-                    if (e.target.value === '') this.setState({ newNetworkRPCSecondary: this.newNetworkRPCSecondary})
+                    if (e.target.value === '') this.setState({ newNetworkRPCSecondary: this.newNetworkRPCSecondary })
                   }}
                 />
               </div>
@@ -218,30 +243,54 @@ class AddChain extends React.Component {
               <div className='chainLayers'>
                 <div className='chainInputLabel'>Chain Type</div>
                 <div className='chainLayerOptions'>
-                  <div 
-                    className={this.state.newNetworkLayer === 'rollup' ?  'chainLayerOption chainLayerOptionOn' : 'chainLayerOption'}
+                  <div
+                    className={
+                      this.state.newNetworkLayer === 'rollup'
+                        ? 'chainLayerOption chainLayerOptionOn'
+                        : 'chainLayerOption'
+                    }
                     onMouseDown={() => this.setState({ newNetworkLayer: 'rollup' })}
-                  >Rollup</div>
-                  <div 
-                    className={this.state.newNetworkLayer === 'sidechain' ?  'chainLayerOption chainLayerOptionOn' : 'chainLayerOption'}
+                  >
+                    Rollup
+                  </div>
+                  <div
+                    className={
+                      this.state.newNetworkLayer === 'sidechain'
+                        ? 'chainLayerOption chainLayerOptionOn'
+                        : 'chainLayerOption'
+                    }
                     onMouseDown={() => this.setState({ newNetworkLayer: 'sidechain' })}
-                  >Sidechain</div>
-                  <div 
-                    className={this.state.newNetworkLayer === 'testnet' ?  'chainLayerOption chainLayerOptionOn' : 'chainLayerOption'}
+                  >
+                    Sidechain
+                  </div>
+                  <div
+                    className={
+                      this.state.newNetworkLayer === 'testnet'
+                        ? 'chainLayerOption chainLayerOptionOn'
+                        : 'chainLayerOption'
+                    }
                     onMouseDown={() => this.setState({ newNetworkLayer: 'testnet' })}
-                  >Testnet</div>
-                  <div 
-                    className={this.state.newNetworkLayer === 'other' ?  'chainLayerOption chainLayerOptionOn' : 'chainLayerOption'}
+                  >
+                    Testnet
+                  </div>
+                  <div
+                    className={
+                      this.state.newNetworkLayer === 'other'
+                        ? 'chainLayerOption chainLayerOptionOn'
+                        : 'chainLayerOption'
+                    }
                     onMouseDown={() => this.setState({ newNetworkLayer: 'other' })}
-                  >Other</div>
+                  >
+                    Other
+                  </div>
                 </div>
               </div>
             </div>
 
             <div className='chainRow'>
               {changedNewNetwork && newNetworkReady ? (
-                <div 
-                  className='addTokenSubmit addTokenSubmitEnabled' 
+                <div
+                  className='addTokenSubmit addTokenSubmitEnabled'
                   onMouseDown={() => {
                     const net = {
                       id: this.state.newNetworkId,
@@ -262,11 +311,7 @@ class AddChain extends React.Component {
                   Add Chain
                 </div>
               ) : (
-                <div 
-                  className='addTokenSubmit' 
-                >
-                  Fill in Chain
-                </div>
+                <div className='addTokenSubmit'>Fill in Chain</div>
               )}
             </div>
           </div>
@@ -276,4 +321,4 @@ class AddChain extends React.Component {
   }
 }
 
-export default Restore.connect(AddChain)
\ No newline at end of file
+export default Restore.connect(AddChain)
diff --git a/app/App/Notify/AddToken/index.js b/app/App/Notify/AddToken/index.js
index b950b0554..1c298d7ee 100644
--- a/app/App/Notify/AddToken/index.js
+++ b/app/App/Notify/AddToken/index.js
@@ -3,7 +3,7 @@ import Restore from 'react-restore'
 import link from '../../../../resources/link'
 
 class AddToken extends Component {
-  constructor (props, context) {
+  constructor(props, context) {
     super(props, context)
 
     this.nameDefault = 'Token Name'
@@ -25,41 +25,41 @@ class AddToken extends Component {
       chainId: (Number.isInteger(chainId) && chainId) || props.currentNetworkId || this.chainIdDefault,
       address: (this.token.address || '').toLowerCase() || this.addressDefault,
       decimals: (Number.isInteger(decimals) && decimals) || this.decimalsDefault,
-      logoURI: this.token.logoURI || this.logoURIDefault
+      logoURI: this.token.logoURI || this.logoURIDefault,
     }
   }
 
-  async updateTokenData (contractAddress, chainId) {
+  async updateTokenData(contractAddress, chainId) {
     const { name, symbol, decimals } = await link.invoke('tray:getTokenDetails', contractAddress, chainId)
     this.setState({
       name: name || this.nameDefault,
       symbol: symbol || this.symbolDefault,
-      decimals: decimals || this.decimalsDefault
+      decimals: decimals || this.decimalsDefault,
     })
   }
 
-  isDefault (statePropName) {
+  isDefault(statePropName) {
     if (this.state[statePropName] === undefined) {
       return false
     }
     return this.state[statePropName] === this[`${statePropName}Default`]
   }
 
-  render () {
-    const newTokenReady = (
-      this.state.name && this.state.name !== this.nameDefault &&
-      this.state.symbol && this.state.symbol !== this.symbolDefault &&
+  render() {
+    const newTokenReady =
+      this.state.name &&
+      this.state.name !== this.nameDefault &&
+      this.state.symbol &&
+      this.state.symbol !== this.symbolDefault &&
       Number.isInteger(this.state.chainId) &&
-      this.state.address && this.state.address !== this.addressDefault &&
+      this.state.address &&
+      this.state.address !== this.addressDefault &&
       Number.isInteger(this.state.decimals)
-    )
 
     return (
-      <div className='notifyBoxWrap' onMouseDown={e => e.stopPropagation()}>
+      <div className='notifyBoxWrap' onMouseDown={(e) => e.stopPropagation()}>
         <div className='notifyBoxSlide'>
-          <div className='addTokenTitle'>
-            Add New Token
-          </div>
+          <div className='addTokenTitle'>Add New Token</div>
           <div className='addToken'>
             <div className='tokenRow'>
               <div className='tokenName'>
@@ -67,7 +67,8 @@ class AddToken extends Component {
                   Token Name
                   <input
                     className={`tokenInput tokenInputAddress ${this.isDefault('name') ? 'tokenInputDim' : ''}`}
-                    value={this.state.name} spellCheck='false'
+                    value={this.state.name}
+                    spellCheck='false'
                     onChange={(e) => {
                       this.setState({ name: e.target.value })
                     }}
@@ -88,7 +89,8 @@ class AddToken extends Component {
                   Symbol
                   <input
                     className={`tokenInput tokenInputAddress ${this.isDefault('symbol') ? 'tokenInputDim' : ''}`}
-                    value={this.state.symbol} spellCheck='false'
+                    value={this.state.symbol}
+                    spellCheck='false'
                     onChange={(e) => {
                       if (e.target.value.length > 10) return e.preventDefault()
                       this.setState({ symbol: e.target.value })
@@ -101,7 +103,6 @@ class AddToken extends Component {
                     }}
                   />
                 </label>
-
               </div>
 
               <div className='tokenDecimals'>
@@ -109,7 +110,8 @@ class AddToken extends Component {
                   Decimals
                   <input
                     className={`tokenInput tokenInputAddress ${this.isDefault('decimals') ? 'tokenInputDim' : ''}`}
-                    value={this.state.decimals} spellCheck='false'
+                    value={this.state.decimals}
+                    spellCheck='false'
                     onChange={(e) => {
                       if (!e.target.value) return this.setState({ decimals: '' })
                       if (e.target.value.length > 2) return e.preventDefault()
@@ -127,7 +129,6 @@ class AddToken extends Component {
                     }}
                   />
                 </label>
-
               </div>
 
               <div className='tokenChainId'>
@@ -135,7 +136,8 @@ class AddToken extends Component {
                   Chain ID
                   <input
                     className={`tokenInput tokenInputAddress ${this.isDefault('chainId') ? 'tokenInputDim' : ''}`}
-                    value={this.state.chainId} spellCheck='false'
+                    value={this.state.chainId}
+                    spellCheck='false'
                     onChange={(e) => {
                       if (!e.target.value) return this.setState({ chainId: '' })
 
@@ -164,7 +166,8 @@ class AddToken extends Component {
                   Contract Address
                   <input
                     className={`tokenInput tokenInputAddress ${this.isDefault('address') ? 'tokenInputDim' : ''}`}
-                    value={this.state.address} spellCheck='false'
+                    value={this.state.address}
+                    spellCheck='false'
                     onChange={(e) => {
                       if (e.target.value.length > 42) {
                         return e.preventDefault()
@@ -190,7 +193,8 @@ class AddToken extends Component {
                   Logo URI
                   <input
                     className={`tokenInput tokenInputAddress ${this.isDefault('logoURI') ? 'tokenInputDim' : ''}`}
-                    value={this.state.logoURI} spellCheck='false'
+                    value={this.state.logoURI}
+                    spellCheck='false'
                     onChange={(e) => {
                       this.setState({ logoURI: e.target.value })
                     }}
@@ -221,11 +225,7 @@ class AddToken extends Component {
                   Add Token
                 </div>
               ) : (
-                <div
-                  className='addTokenSubmit'
-                >
-                  Fill in Token Details
-                </div>
+                <div className='addTokenSubmit'>Fill in Token Details</div>
               )}
             </div>
           </div>
diff --git a/app/App/Notify/CustomTokens/index.js b/app/App/Notify/CustomTokens/index.js
index aab2dd8a0..f12d90993 100644
--- a/app/App/Notify/CustomTokens/index.js
+++ b/app/App/Notify/CustomTokens/index.js
@@ -4,101 +4,106 @@ import svg from '../../../../resources/svg'
 import link from '../../../../resources/link'
 
 class CustomTokens extends React.Component {
-  constructor (props, context) {
+  constructor(props, context) {
     super(props, context)
     this.state = {}
   }
 
-  render () {
-    const tokens = this.store('main.tokens.custom')    
+  render() {
+    const tokens = this.store('main.tokens.custom')
 
     return (
-      <div className='notifyBoxWrap' onMouseDown={e => e.stopPropagation()}>
+      <div className='notifyBoxWrap' onMouseDown={(e) => e.stopPropagation()}>
         <div className='notifyBoxSlide'>
           <div className='customTokens'>
             <div className='customTokensTitle'>
-              <div
-                className='customTokensTitleText'
-              >
-                Custom Tokens
-              </div>
-              <div
-                className='customTokensAddToken'
-                onClick={() => this.store.notify('addToken', this.props.req)}
-              >
+              <div className='customTokensTitleText'>Custom Tokens</div>
+              <div className='customTokensAddToken' onClick={() => this.store.notify('addToken', this.props.req)}>
                 Add Token
               </div>
             </div>
             <div className='customTokensList'>
-              {tokens.length > 0 ? [].concat(tokens).sort((a, b) => {
-                return a.chainId <= b.chainId
-              }).map((token, i) => {
-                return (
-                  <div className={this.state.tokenExpanded === i ? 'customTokensListItem customTokensListItemExpanded' : 'customTokensListItem'}>
-                    <div className='customTokensListItemTitle'>
-                      <div className='customTokensListItemName'>
-                        <img 
-                          src={token.logoURI && `https://proxy.pylon.link?type=icon&target=${encodeURIComponent(token.logoURI)}`}
-                          value={token.symbol.toUpperCase()}
-                          alt={token.symbol.toUpperCase()}
-                        />
-                        <div className='customTokensListItemText'>
-                          <div className='customTokensListItemSymbol'>{token.symbol}</div>
-                          <div className='customTokensListItemSub'>{token.name}</div>
-                        </div>
-                      </div>
-                      <div className='customTokensListItemChain'>
-                        <div className='customTokensListItemChainLabel'>
-                          {'Chain ID:'}
-                        </div>
-                        <div>
-                          {token.chainId}
+              {tokens.length > 0 ? (
+                []
+                  .concat(tokens)
+                  .sort((a, b) => {
+                    return a.chainId <= b.chainId
+                  })
+                  .map((token, i) => {
+                    return (
+                      <div
+                        className={
+                          this.state.tokenExpanded === i
+                            ? 'customTokensListItem customTokensListItemExpanded'
+                            : 'customTokensListItem'
+                        }
+                      >
+                        <div className='customTokensListItemTitle'>
+                          <div className='customTokensListItemName'>
+                            <img
+                              src={
+                                token.logoURI &&
+                                `https://proxy.pylon.link?type=icon&target=${encodeURIComponent(token.logoURI)}`
+                              }
+                              value={token.symbol.toUpperCase()}
+                              alt={token.symbol.toUpperCase()}
+                            />
+                            <div className='customTokensListItemText'>
+                              <div className='customTokensListItemSymbol'>{token.symbol}</div>
+                              <div className='customTokensListItemSub'>{token.name}</div>
+                            </div>
+                          </div>
+                          <div className='customTokensListItemChain'>
+                            <div className='customTokensListItemChainLabel'>{'Chain ID:'}</div>
+                            <div>{token.chainId}</div>
+                            <div
+                              className={
+                                this.state.tokenExpanded === i
+                                  ? 'customTokensListItemExpand'
+                                  : 'customTokensListItemExpand customTokensListItemExpandActive'
+                              }
+                              onClick={() =>
+                                this.setState({
+                                  tokenExpanded: this.state.tokenExpanded === i ? -1 : i,
+                                })
+                              }
+                            >
+                              {svg.octicon('chevron-down', { height: 16 })}
+                            </div>
+                          </div>
                         </div>
-                        <div 
-                          className={this.state.tokenExpanded === i  ? 'customTokensListItemExpand' : 'customTokensListItemExpand customTokensListItemExpandActive'}
-                          onClick={() => this.setState({ tokenExpanded: this.state.tokenExpanded === i ? -1 : i })}
+                        <div
+                          className='customTokensListItemAddress'
+                          onClick={() => {
+                            link.send('tray:clipboardData', token.address)
+                            this.setState({ copied: true })
+                            setTimeout((_) => this.setState({ copied: false }), 1000)
+                          }}
                         >
-                          {svg.octicon('chevron-down', { height: 16 })}
+                          {this.state.copied ? 'Address Copied' : token.address}
                         </div>
-                      </div>
-                    </div>
-                    <div 
-                      className='customTokensListItemAddress'
-                      onClick={() => {
-                        link.send('tray:clipboardData', token.address)
-                        this.setState({ copied: true })
-                        setTimeout(_ => this.setState({ copied: false }), 1000)
-                      }}
-                    >
-                      {this.state.copied ? 'Address Copied' : token.address}
-                    </div>
-                    <div className='customTokensListItemBottom'>
-                      <div className='customTokensListItemChainDecimal'>
-                        <div className='customTokensListItemChainLabel'>
-                          {'Decimals:'}
-                        </div>
-                        <div>
-                          {token.decimals}
+                        <div className='customTokensListItemBottom'>
+                          <div className='customTokensListItemChainDecimal'>
+                            <div className='customTokensListItemChainLabel'>{'Decimals:'}</div>
+                            <div>{token.decimals}</div>
+                          </div>
+                          <div
+                            className='customTokensListItemRemoveButton'
+                            onClick={() => {
+                              this.setState({ tokenExpanded: false })
+                              setTimeout(() => {
+                                link.send('tray:removeToken', token)
+                              }, 100)
+                            }}
+                          >
+                            {'Remove Token'}
+                          </div>
                         </div>
                       </div>
-                      <div className='customTokensListItemRemoveButton'
-                           onClick={() => {
-                             this.setState({ tokenExpanded: false })
-                             setTimeout(() => {
-                              link.send('tray:removeToken', token)
-                             }, 100)
-                            }
-                          }
-                      >
-                        {'Remove Token'}
-                      </div>
-                    </div>
-                  </div>
-                )
-              }) : (
-                <div className='customTokensListNoTokens'>
-                  {'No Custom Tokens'}
-                </div>
+                    )
+                  })
+              ) : (
+                <div className='customTokensListNoTokens'>{'No Custom Tokens'}</div>
               )}
             </div>
           </div>
diff --git a/app/App/Notify/index.js b/app/App/Notify/index.js
index 07f4c0e69..fa7dda787 100644
--- a/app/App/Notify/index.js
+++ b/app/App/Notify/index.js
@@ -16,27 +16,32 @@ import CustomTokens from './CustomTokens'
 const FEE_WARNING_THRESHOLD_USD = 50
 
 class Notify extends React.Component {
-  mainnet () {
+  mainnet() {
     return (
-      <div className='notifyBoxWrap' onMouseDown={e => e.stopPropagation()}>
+      <div className='notifyBoxWrap' onMouseDown={(e) => e.stopPropagation()}>
         <div className='notifyBox'>
           <div className='notifyFrameIcon'>
             <img src={frameIcon} />
           </div>
-          <div className='notifyTitle'>
-            Welcome to Frame!
-          </div>
-          <div className='notifySubtitle'>
-            System-wide web3
-          </div>
+          <div className='notifyTitle'>Welcome to Frame!</div>
+          <div className='notifySubtitle'>System-wide web3</div>
           <div className='notifyBody'>
             <div className='notifyBodyLine'>
-              Please read <span onMouseDown={() => { link.send('tray:openExternal', 'https://github.com/floating/frame/blob/master/LICENSE') }}>our license</span>, use at your own risk and verify transactions and account details on a signing device whenever possible.
+              Please read{' '}
+              <span
+                onMouseDown={() => {
+                  link.send('tray:openExternal', 'https://github.com/floating/frame/blob/master/LICENSE')
+                }}
+              >
+                our license
+              </span>
+              , use at your own risk and verify transactions and account details on a signing device whenever possible.
             </div>
           </div>
           <div className='notifyInput'>
             <div
-              className='notifyInputOption notifyInputSingleButton' onMouseDown={() => {
+              className='notifyInputOption notifyInputSingleButton'
+              onMouseDown={() => {
                 link.send('tray:action', 'muteWelcomeWarning')
                 this.store.notify()
               }}
@@ -49,17 +54,15 @@ class Notify extends React.Component {
     )
   }
 
-  betaDisclosure () {
+  betaDisclosure() {
     return (
-      <div className='notifyBoxWrap' onMouseDown={e => e.stopPropagation()}>
+      <div className='notifyBoxWrap' onMouseDown={(e) => e.stopPropagation()}>
         <div className='notifyBoxSlide'>
           <div className='notifyBox'>
             <div className='notifyFrameIcon'>
               <img src={frameIcon} />
             </div>
-            <div className='notifyTitle'>
-              Frame v0.5-beta
-            </div>
+            <div className='notifyTitle'>Frame v0.5-beta</div>
             <div className='notifyBody'>
               <div className='notifyBodyBlock notifyBodyBlockBig'>
                 We are excited to welcome you to the next iteration of Frame!
@@ -68,13 +71,16 @@ class Notify extends React.Component {
                 Be advised, this version of Frame is currently in "beta" and will update on a beta track
               </div>
               <div className='notifyBodyBlock'>
-                Use hardware signers for high value accounts and verify all transaction and account details on your signing device
+                Use hardware signers for high value accounts and verify all transaction and account details on your
+                signing device
               </div>
               <div className='notifyBodyBlock'>
                 <span>Read</span>
-                <span 
+                <span
                   className='notifyBodyLink'
-                  onMouseDown={() => { link.send('tray:openExternal', 'https://github.com/floating/frame/blob/0.5/LICENSE') }}
+                  onMouseDown={() => {
+                    link.send('tray:openExternal', 'https://github.com/floating/frame/blob/0.5/LICENSE')
+                  }}
                 >
                   our license
                 </span>
@@ -82,10 +88,12 @@ class Notify extends React.Component {
               </div>
               <div className='notifyBodyBlock notifyBodyBlockBig'>
                 <div>Please give us your feedback!</div>
-                <div 
-                  className='notifyBodyLink' 
-                  style={{marginTop: '20px'}}
-                  onMouseDown={() => { link.send('tray:openExternal', 'https://frame.canny.io') }}
+                <div
+                  className='notifyBodyLink'
+                  style={{ marginTop: '20px' }}
+                  onMouseDown={() => {
+                    link.send('tray:openExternal', 'https://frame.canny.io')
+                  }}
                 >
                   feedback.frame.sh
                 </div>
@@ -93,7 +101,8 @@ class Notify extends React.Component {
             </div>
             <div className='notifyInput'>
               <div
-                className='notifyInputOption notifyInputSingleButton' onMouseDown={() => {
+                className='notifyInputOption notifyInputSingleButton'
+                onMouseDown={() => {
                   link.send('tray:action', 'muteBetaDisclosure')
                   this.store.notify()
                 }}
@@ -107,26 +116,25 @@ class Notify extends React.Component {
     )
   }
 
-  aragonMigrationWarning () {
+  aragonMigrationWarning() {
     return (
-      <div className='notifyBoxWrap' onMouseDown={e => e.stopPropagation()}>
+      <div className='notifyBoxWrap' onMouseDown={(e) => e.stopPropagation()}>
         <div className='notifyBoxSlide'>
           <div className='notifyBox'>
-            <div className='notifyFrameIcon'>
-              {svg.aragon(72)}
-            </div>
-            <div className='notifyTitle'>
-              Notice for Aragon Accounts
-            </div>
+            <div className='notifyFrameIcon'>{svg.aragon(72)}</div>
+            <div className='notifyTitle'>Notice for Aragon Accounts</div>
             <div className='notifyBody'>
               <div className='notifyBodyBlock notifyBodyBlockBig'>
-                Due to a change in the way Frame handles chains in v0.5.0-beta.19, Aragon accounts now need to specify the chain on which they operate.
+                Due to a change in the way Frame handles chains in v0.5.0-beta.19, Aragon accounts now need to specify
+                the chain on which they operate.
               </div>
               <div className='notifyBodyBlock'>
-                Starting with this version, any previously existing Aragon accounts will be automatically switched to use Ethereum mainnet.
+                Starting with this version, any previously existing Aragon accounts will be automatically switched to
+                use Ethereum mainnet.
               </div>
               <div className='notifyBodyBlock'>
-                If this is not the correct chain for your Aragon account, please remove the account and add it again with the correct chain.
+                If this is not the correct chain for your Aragon account, please remove the account and add it again
+                with the correct chain.
               </div>
               <div className='notifyBodyBlock'>
                 You can always verify the chain for your Aragon account under "Account Settings" inside the account.
@@ -134,7 +142,8 @@ class Notify extends React.Component {
             </div>
             <div className='notifyInput'>
               <div
-                className='notifyInputOption notifyInputSingleButton' onMouseDown={() => {
+                className='notifyInputOption notifyInputSingleButton'
+                onMouseDown={() => {
                   link.send('tray:action', 'muteAragonAccountMigrationWarning')
                   this.store.notify()
                 }}
@@ -206,18 +215,17 @@ class Notify extends React.Component {
   //   )
   // }
 
-  nonceWarning () {
+  nonceWarning() {
     return (
-      <div className='notifyBoxWrap' onMouseDown={e => e.stopPropagation()}>
+      <div className='notifyBoxWrap' onMouseDown={(e) => e.stopPropagation()}>
         <div className='notifyBoxSlide'>
           <div className='notifyBox'>
-            <div className='notifyTitle'>
-              Adjustable Nonce
-            </div>
+            <div className='notifyTitle'>Adjustable Nonce</div>
             <div className='notifyBody'>
               <div className='notifyBodyBlock notifyBodyBlockBig'>
                 <div>
-                  Adjusting the nonce of a replacement transaction will cause it to become a new transaction rather than a replacement, use with caution
+                  Adjusting the nonce of a replacement transaction will cause it to become a new transaction rather than
+                  a replacement, use with caution
                 </div>
               </div>
             </div>
@@ -232,13 +240,11 @@ class Notify extends React.Component {
     )
   }
 
-  gasFeeWarning ({ req = {}, feeUSD = '0.00', currentSymbol = 'ETH' }) {
+  gasFeeWarning({ req = {}, feeUSD = '0.00', currentSymbol = 'ETH' }) {
     return (
-      <div className='notifyBoxWrap' onMouseDown={e => e.stopPropagation()}>
+      <div className='notifyBoxWrap' onMouseDown={(e) => e.stopPropagation()}>
         <div className='notifyBox'>
-          <div className='notifyTitle'>
-            Gas Fee Warning
-          </div>
+          <div className='notifyTitle'>Gas Fee Warning</div>
           <div className='notifyBody'>
             {feeUSD !== '0.00' ? (
               <>
@@ -252,14 +258,16 @@ class Notify extends React.Component {
           </div>
           <div className='notifyInput'>
             <div
-              className='notifyInputOption notifyInputDeny' onMouseDown={() => {
+              className='notifyInputOption notifyInputDeny'
+              onMouseDown={() => {
                 this.store.notify()
               }}
             >
               <div className='notifyInputOptionText'>Cancel</div>
             </div>
             <div
-              className='notifyInputOption notifyInputProceed' onMouseDown={() => {
+              className='notifyInputOption notifyInputProceed'
+              onMouseDown={() => {
                 link.rpc('approveRequest', req, () => {})
                 this.store.notify()
               }}
@@ -271,29 +279,28 @@ class Notify extends React.Component {
             <div className='notifyCheckBox'>
               {this.store('main.mute.gasFeeWarning') ? svg.octicon('check', { height: 26 }) : null}
             </div>
-            <div className='notifyCheckText'>
-              {'Don\'t show this warning again'}
-            </div>
+            <div className='notifyCheckText'>{"Don't show this warning again"}</div>
           </div>
         </div>
       </div>
     )
   }
 
-  signerLockedWarning ({ req = {} }) {
+  signerLockedWarning({ req = {} }) {
     return (
-      <div className='notifyBoxWrap' onMouseDown={e => e.stopPropagation()}>
+      <div className='notifyBoxWrap' onMouseDown={(e) => e.stopPropagation()}>
         <div className='notifyBox'>
-          <div className='notifyTitle'>
-            Signer locked!
-          </div>
+          <div className='notifyTitle'>Signer locked!</div>
           <div className='notifyBody'>
-            <div className='notifyBodyQuestion'>
-              Please unlock this signer and try again
-            </div>
+            <div className='notifyBodyQuestion'>Please unlock this signer and try again</div>
           </div>
           <div className='notifyInput'>
-            <div className='notifyInputOption notifyInputSingleButton' onMouseDown={() => { this.store.notify() }}>
+            <div
+              className='notifyInputOption notifyInputSingleButton'
+              onMouseDown={() => {
+                this.store.notify()
+              }}
+            >
               <div className='notifyInputOptionText'>OK</div>
             </div>
           </div>
@@ -302,23 +309,22 @@ class Notify extends React.Component {
     )
   }
 
-  noSignerWarning ({ req = {} }) {
+  noSignerWarning({ req = {} }) {
     return (
-      <div className='notifyBoxWrap' onMouseDown={e => e.stopPropagation()}>
+      <div className='notifyBoxWrap' onMouseDown={(e) => e.stopPropagation()}>
         <div className='notifyBox'>
-          <div className='notifyTitle'>
-            No Signer Attached!
-          </div>
+          <div className='notifyTitle'>No Signer Attached!</div>
           <div className='notifyBody'>
-              <div className='notifyBodyLine'>
-                No signer attached for this account
-              </div>
-            <div className='notifyBodyQuestion'>
-              Please attach a signer that can sign for this account
-            </div>
+            <div className='notifyBodyLine'>No signer attached for this account</div>
+            <div className='notifyBodyQuestion'>Please attach a signer that can sign for this account</div>
           </div>
           <div className='notifyInput'>
-            <div className='notifyInputOption notifyInputSingleButton' onMouseDown={() => { this.store.notify() }}>
+            <div
+              className='notifyInputOption notifyInputSingleButton'
+              onMouseDown={() => {
+                this.store.notify()
+              }}
+            >
               <div className='notifyInputOptionText'>OK</div>
             </div>
           </div>
@@ -327,45 +333,44 @@ class Notify extends React.Component {
     )
   }
 
-  toDisplayUSD (bn) {
+  toDisplayUSD(bn) {
     return bn.toFixed(2, BigNumber.ROUND_UP).toString()
   }
 
-  signerCompatibilityWarning ({ req = {}, compatibility = {}, chain = {} }) {
+  signerCompatibilityWarning({ req = {}, compatibility = {}, chain = {} }) {
     const { signer, tx, compatible } = compatibility
     return (
-      <div className='notifyBoxWrap' onMouseDown={e => e.stopPropagation()}>
+      <div className='notifyBoxWrap' onMouseDown={(e) => e.stopPropagation()}>
         <div className='notifyBox'>
-          <div className='notifyTitle'>
-            Signer Compatibility
-          </div>
+          <div className='notifyTitle'>Signer Compatibility</div>
           <div className='notifyBody'>
             <div className='notifyBodyLine'>
-              {`Your ${capitalize(signer)} is not compatible with ${capitalize(tx)} ${tx === 'london' ? '(EIP-1559) ' : ''}transactions. Your transaction will be converted to a legacy transaction before signing.`}
+              {`Your ${capitalize(signer)} is not compatible with ${capitalize(tx)} ${
+                tx === 'london' ? '(EIP-1559) ' : ''
+              }transactions. Your transaction will be converted to a legacy transaction before signing.`}
             </div>
             {['lattice', 'ledger'].includes(signer) ? (
-              <div className='notifyBodyUpdate'>
-                {`Update your ${capitalize(signer)} to enable compatibility`}
-              </div>
+              <div className='notifyBodyUpdate'>{`Update your ${capitalize(signer)} to enable compatibility`}</div>
             ) : null}
-            <div className='notifyBodyQuestion'>
-              Do you want to proceed?
-            </div>
+            <div className='notifyBodyQuestion'>Do you want to proceed?</div>
           </div>
           <div className='notifyInput'>
             <div
-              className='notifyInputOption notifyInputDeny' onMouseDown={() => {
+              className='notifyInputOption notifyInputDeny'
+              onMouseDown={() => {
                 this.store.notify()
               }}
             >
               <div className='notifyInputOptionText'>Cancel</div>
             </div>
             <div
-              className='notifyInputOption notifyInputProceed' onMouseDown={() => {
+              className='notifyInputOption notifyInputProceed'
+              onMouseDown={() => {
                 // TODO: Transacionns need a better flow to respond to mutiple notifications after hitting sign
                 const layer = this.store('main.networks', chain.type, chain.id, 'layer')
                 const nativeCurrency = this.store('main.networksMeta', chain.type, chain.id, 'nativeCurrency')
-                const nativeUSD = nativeCurrency && nativeCurrency.usd && layer !== 'testnet' ? nativeCurrency.usd.price : 0
+                const nativeUSD =
+                  nativeCurrency && nativeCurrency.usd && layer !== 'testnet' ? nativeCurrency.usd.price : 0
                 const currentSymbol = this.store('main.networks', chain.type, chain.id, 'symbol') || '?'
 
                 let maxFeePerGas, maxFee, maxFeeUSD
@@ -381,9 +386,16 @@ class Notify extends React.Component {
                   maxFee = maxFeePerGas.multipliedBy(gasLimit)
                   maxFeeUSD = maxFee.shiftedBy(-18).multipliedBy(nativeUSD)
                 }
-                
-                if ((maxFeeUSD.toNumber() > FEE_WARNING_THRESHOLD_USD || this.toDisplayUSD(maxFeeUSD) === '0.00') && !this.store('main.mute.gasFeeWarning')) {
-                  this.store.notify('gasFeeWarning', { req, feeUSD: this.toDisplayUSD(maxFeeUSD), currentSymbol })
+
+                if (
+                  (maxFeeUSD.toNumber() > FEE_WARNING_THRESHOLD_USD || this.toDisplayUSD(maxFeeUSD) === '0.00') &&
+                  !this.store('main.mute.gasFeeWarning')
+                ) {
+                  this.store.notify('gasFeeWarning', {
+                    req,
+                    feeUSD: this.toDisplayUSD(maxFeeUSD),
+                    currentSymbol,
+                  })
                 } else {
                   link.rpc('approveRequest', req, () => {})
                   this.store.notify()
@@ -397,19 +409,21 @@ class Notify extends React.Component {
             <div className='notifyCheckBox'>
               {this.store('main.mute.signerCompatibilityWarning') ? svg.octicon('check', { height: 26 }) : null}
             </div>
-            <div className='notifyCheckText'>
-              {'Don\'t show this warning again'}
-            </div>
+            <div className='notifyCheckText'>{"Don't show this warning again"}</div>
           </div>
         </div>
       </div>
     )
   }
 
-  contractData () {
+  contractData() {
     return (
-      <div className='notifyBoxWrap' onMouseDown={e => e.stopPropagation()} style={this.store('view.notify') === 'contractData' ? { transform: 'translateX(calc(-100% - 100px))' } : {}}>
-        <div className='notifyBox' >
+      <div
+        className='notifyBoxWrap'
+        onMouseDown={(e) => e.stopPropagation()}
+        style={this.store('view.notify') === 'contractData' ? { transform: 'translateX(calc(-100% - 100px))' } : {}}
+      >
+        <div className='notifyBox'>
           <div className='notifyTitle'>
             <div>Contract Data</div>
             <div>Not Allowed</div>
@@ -427,7 +441,12 @@ class Notify extends React.Component {
             </div>
           </div>
           <div className='notifyInput'>
-            <div className='notifyInputOption notifyInputSingleButton' onMouseDown={() => { this.store.notify() }}>
+            <div
+              className='notifyInputOption notifyInputSingleButton'
+              onMouseDown={() => {
+                this.store.notify()
+              }}
+            >
               <div className='notifyInputOptionText'>OK</div>
             </div>
           </div>
@@ -436,18 +455,32 @@ class Notify extends React.Component {
     )
   }
 
-  hotAccountWarning () {
+  hotAccountWarning() {
     return (
-      <div className='notifyBoxWrap' onMouseDown={e => e.stopPropagation()} style={this.store('view.notify') === 'hotAccountWarning' ? { transform: 'translateX(calc(-100% - 100px))' } : {}}>
+      <div
+        className='notifyBoxWrap'
+        onMouseDown={(e) => e.stopPropagation()}
+        style={
+          this.store('view.notify') === 'hotAccountWarning' ? { transform: 'translateX(calc(-100% - 100px))' } : {}
+        }
+      >
         <div className='notifyBox'>
           <div className='notifyTitle'>
             <div>Hot Signer Alpha</div>
           </div>
           <div className='notifyBody'>
-            <div className='notifyBodyLine'>Frame hot signers are in alpha! Do not use them with high value accounts and verify your backups are valid. Only proceed if you understand and accept these risks.</div>
+            <div className='notifyBodyLine'>
+              Frame hot signers are in alpha! Do not use them with high value accounts and verify your backups are
+              valid. Only proceed if you understand and accept these risks.
+            </div>
           </div>
           <div className='notifyInput'>
-            <div className='notifyInputOption notifyInputSingleButton' onMouseDown={() => { this.store.notify() }}>
+            <div
+              className='notifyInputOption notifyInputSingleButton'
+              onMouseDown={() => {
+                this.store.notify()
+              }}
+            >
               <div className='notifyInputOptionText'>OK</div>
             </div>
           </div>
@@ -456,18 +489,31 @@ class Notify extends React.Component {
     )
   }
 
-  hotSignerMismatch () {
+  hotSignerMismatch() {
     return (
-      <div className='notifyBoxWrap' onMouseDown={e => e.stopPropagation()} style={this.store('view.notify') === 'hotSignerMismatch' ? { transform: 'translateX(calc(-100% - 100px))' } : {}}>
+      <div
+        className='notifyBoxWrap'
+        onMouseDown={(e) => e.stopPropagation()}
+        style={
+          this.store('view.notify') === 'hotSignerMismatch' ? { transform: 'translateX(calc(-100% - 100px))' } : {}
+        }
+      >
         <div className='notifyBox'>
           <div className='notifyTitle'>
             <div>Hot Signer Address Mismatch</div>
           </div>
           <div className='notifyBody'>
-            <div className='notifyBodyLine'>The unlocked hot signer did not match the address shown in Frame and has been relocked.</div>
+            <div className='notifyBodyLine'>
+              The unlocked hot signer did not match the address shown in Frame and has been relocked.
+            </div>
           </div>
           <div className='notifyInput'>
-            <div className='notifyInputOption notifyInputSingleButton' onMouseDown={() => { this.store.notify() }}>
+            <div
+              className='notifyInputOption notifyInputSingleButton'
+              onMouseDown={() => {
+                this.store.notify()
+              }}
+            >
               <div className='notifyInputOptionText'>OK</div>
             </div>
           </div>
@@ -476,27 +522,27 @@ class Notify extends React.Component {
     )
   }
 
-  openExternal ({ url }) {
+  openExternal({ url }) {
     return (
-      <div className='notifyBoxWrap' onMouseDown={e => e.stopPropagation()}>
+      <div className='notifyBoxWrap' onMouseDown={(e) => e.stopPropagation()}>
         <div className='notifyBox'>
-          <div className='notifyTitle'>
-            Open External Link
-          </div>
+          <div className='notifyTitle'>Open External Link</div>
           <div className='notifyBody'>
             <div className='notifyBodyLineUrl'>{url}</div>
             <div className='notifyBodyLine'>{'Open Link in Browser?'}</div>
           </div>
           <div className='notifyInput'>
             <div
-              className='notifyInputOption notifyInputDeny' onMouseDown={() => {
+              className='notifyInputOption notifyInputDeny'
+              onMouseDown={() => {
                 this.store.notify()
               }}
             >
               <div className='notifyInputOptionText'>Cancel</div>
             </div>
             <div
-              className='notifyInputOption notifyInputProceed' onMouseDown={() => {
+              className='notifyInputOption notifyInputProceed'
+              onMouseDown={() => {
                 link.send('tray:openExternal', url)
                 this.store.notify()
               }}
@@ -509,27 +555,27 @@ class Notify extends React.Component {
     )
   }
 
-  openExplorer ({ hash, chain }) {
+  openExplorer({ hash, chain }) {
     return (
-      <div className='notifyBoxWrap' onMouseDown={e => e.stopPropagation()}>
+      <div className='notifyBoxWrap' onMouseDown={(e) => e.stopPropagation()}>
         <div className='notifyBox'>
-          <div className='notifyTitle'>
-            Open Block Explorer
-          </div>
+          <div className='notifyTitle'>Open Block Explorer</div>
           <div className='notifyBody'>
             <div className='notifyBodyLine'>Frame will open a block explorer in your browser for transaction:</div>
             <div className='notifyBodyHash'>{hash}</div>
           </div>
           <div className='notifyInput'>
             <div
-              className='notifyInputOption notifyInputDeny' onMouseDown={() => {
+              className='notifyInputOption notifyInputDeny'
+              onMouseDown={() => {
                 this.store.notify()
               }}
             >
               <div className='notifyInputOptionText'>Cancel</div>
             </div>
             <div
-              className='notifyInputOption notifyInputProceed' onMouseDown={() => {
+              className='notifyInputOption notifyInputProceed'
+              onMouseDown={() => {
                 link.send('tray:openExplorer', hash, chain)
                 this.store.notify()
               }}
@@ -538,25 +584,22 @@ class Notify extends React.Component {
             </div>
           </div>
           <div
-            className='notifyCheck' onMouseDown={() => {
+            className='notifyCheck'
+            onMouseDown={() => {
               link.send('tray:action', 'toggleExplorerWarning')
             }}
           >
             <div className='notifyCheckBox'>
-              {this.store('main.mute.explorerWarning') ? (
-                svg.octicon('check', { height: 26 })
-              ) : null}
-            </div>
-            <div className='notifyCheckText'>
-              {'Don\'t show this warning again'}
+              {this.store('main.mute.explorerWarning') ? svg.octicon('check', { height: 26 }) : null}
             </div>
+            <div className='notifyCheckText'>{"Don't show this warning again"}</div>
           </div>
         </div>
       </div>
     )
   }
 
-  render () {
+  render() {
     const notify = this.store('view.notify')
     if (notify === 'mainnet') {
       return (
@@ -568,17 +611,9 @@ class Notify extends React.Component {
         </div>
       )
     } else if (notify === 'betaDisclosure') {
-      return (
-        <div className='notify cardShow'>
-          {this.betaDisclosure()}
-        </div>
-      )
+      return <div className='notify cardShow'>{this.betaDisclosure()}</div>
     } else if (notify === 'aragonAccountMigrationWarning') {
-      return (
-        <div className='notify cardShow'>
-          {this.aragonMigrationWarning()}
-        </div>
-      )
+      return <div className='notify cardShow'>{this.aragonMigrationWarning()}</div>
     } else if (notify === 'nonceWarning') {
       return (
         <div className='notify cardShow' onMouseDown={() => this.store.notify()}>
diff --git a/app/App/index.js b/app/App/index.js
index 2f820bb99..8d44aa0ff 100644
--- a/app/App/index.js
+++ b/app/App/index.js
@@ -13,7 +13,7 @@ import Badge from './Badge'
 // <DevTools />
 
 class Panel extends React.Component {
-  indicator (connection) {
+  indicator(connection) {
     const status = [connection.primary.status, connection.secondary.status]
     if (status.indexOf('connected') > -1) {
       if (this.store('selected.current')) {
@@ -25,7 +25,7 @@ class Panel extends React.Component {
       return <div className='panelDetailIndicatorInner panelDetailIndicatorBad' />
     }
   }
-  
+
   // componentDidMount () {
   //   console.log('did mount')
   //   document.addEventListener('keydown', (event) => {
@@ -44,29 +44,29 @@ class Panel extends React.Component {
   //   })
   // }
 
-  selectNetwork (network) {
+  selectNetwork(network) {
     const [type, id] = network.split(':')
     if (network.type !== type || network.id !== id) link.send('tray:action', 'selectNetwork', type, id)
   }
-  
-  hexToDisplayGwei (weiHex) {
+
+  hexToDisplayGwei(weiHex) {
     return parseInt(weiHex, 'hex') / 1e9 < 1 ? '‹1' : Math.round(parseInt(weiHex, 'hex') / 1e9)
   }
-  
-  render () {
+
+  render() {
     const opacity = this.store('tray.initial') ? 0 : 1 // open ? 'translate3d(0px, 0px, 0px)' : 'translate3d(370px, 0px, 0px)'
 
     const networks = this.store('main.networks')
     const networkOptions = []
-    Object.keys(networks).forEach(type => {
-      Object.keys(networks[type]).forEach(id => {
+    Object.keys(networks).forEach((type) => {
+      Object.keys(networks[type]).forEach((id) => {
         const net = networks[type][id]
         const status = [net.connection.primary.status, net.connection.secondary.status]
         if (net.on) {
-          networkOptions.push({ 
-            text: net.name, 
+          networkOptions.push({
+            text: net.name,
             value: type + ':' + id,
-            indicator: net.on && status.indexOf('connected') > -1 ? 'good' : 'bad'
+            indicator: net.on && status.indexOf('connected') > -1 ? 'good' : 'bad',
           })
         }
       })
diff --git a/app/flex/index.js b/app/flex/index.js
index cec938bea..d858dc874 100644
--- a/app/flex/index.js
+++ b/app/flex/index.js
@@ -10,29 +10,29 @@ import Trezor from './trezor'
 // Emitter Transport
 const emit = (eventName, ...args) => {
   // console.log('emit', eventName, ...args)
-  link.send('tray:flex:event', eventName, ...args.map(arg => arg instanceof Error ? wrap(arg.message) : wrap(arg)))
+  link.send('tray:flex:event', eventName, ...args.map((arg) => (arg instanceof Error ? wrap(arg.message) : wrap(arg))))
 }
 
 const flex = {
   // ledger: new Ledger(emit),
-  trezor: new Trezor(emit)
+  trezor: new Trezor(emit),
 }
 
-const unwrap = v => v !== undefined || v !== null ? JSON.parse(v) : v
-const wrap = v => v !== undefined || v !== null ? JSON.stringify(v) : v
+const unwrap = (v) => (v !== undefined || v !== null ? JSON.parse(v) : v)
+const wrap = (v) => (v !== undefined || v !== null ? JSON.stringify(v) : v)
 
 link.on('flex', (id, target, ...args) => {
   id = unwrap(id)
   target = unwrap(target)
   const lib = target.split('.')[0]
   const method = target.split('.')[1]
-  args = args.map(arg => unwrap(arg))
+  args = args.map((arg) => unwrap(arg))
   if (flex[lib] && flex[lib][method]) {
     flex[lib][method](...args, (...args) => {
-      link.send('tray:flex:res', id, ...args.map(arg => arg instanceof Error ? wrap(arg.message) : wrap(arg)))
+      link.send('tray:flex:res', id, ...args.map((arg) => (arg instanceof Error ? wrap(arg.message) : wrap(arg))))
     })
   } else {
     const args = [new Error('Unknown flex lib:method: ' + target)]
-    link.send('tray:flex:res', id, ...args.map(arg => arg instanceof Error ? wrap(arg.message) : wrap(arg)))
+    link.send('tray:flex:res', id, ...args.map((arg) => (arg instanceof Error ? wrap(arg.message) : wrap(arg))))
   }
 })
diff --git a/app/flex/ledger/index.js b/app/flex/ledger/index.js
index 2e7212c60..ac11125ad 100644
--- a/app/flex/ledger/index.js
+++ b/app/flex/ledger/index.js
@@ -6,7 +6,7 @@ import AppEth from '@ledgerhq/hw-app-eth'
 import EthereumTx from 'ethereumjs-tx'
 
 class Device {
-  constructor (device, emit) {
+  constructor(device, emit) {
     this.device = device
     this.id = this.device.id
     this.eth = new AppEth(device)
@@ -14,30 +14,30 @@ class Device {
     this.setup()
   }
 
-  setup () {
+  setup() {
     this.connect()
   }
 
-  summary () {
+  summary() {
     return {
-      id: this.id
+      id: this.id,
     }
   }
 
-  connect () {
+  connect() {
     this.emit('ledger:connect', this.summary())
   }
 
-  disconnect () {
+  disconnect() {
     this.emit('ledger:disconnect', this.summary())
   }
 
-  update (device = this.device) {
+  update(device = this.device) {
     this.device = device
     this.emit('ledger:update', this.summary())
   }
 
-  async ethereumGetAddress (path, display, cb) {
+  async ethereumGetAddress(path, display, cb) {
     try {
       cb(null, await this.eth.getAddress(path, display, true))
     } catch (err) {
@@ -45,40 +45,44 @@ class Device {
     }
   }
 
-  ethereumSignTransaction (path, rawTx, cb) {
+  ethereumSignTransaction(path, rawTx, cb) {
     const tx = new EthereumTx(rawTx)
     tx.raw[6] = Buffer.from([rawTx.chainId]) // v
     tx.raw[7] = Buffer.from([]) // r
     tx.raw[8] = Buffer.from([]) // s
     const rawTxHex = tx.serialize().toString('hex')
-    this.eth.signTransaction(this.getPath(), rawTxHex).then(result => {
-      cb(null, result)
-    }).catch(err => {
-      cb(err.message)
-    })
+    this.eth
+      .signTransaction(this.getPath(), rawTxHex)
+      .then((result) => {
+        cb(null, result)
+      })
+      .catch((err) => {
+        cb(err.message)
+      })
   }
 
-  ethereumSignMessage (path, message, cb) {
+  ethereumSignMessage(path, message, cb) {
     console.log('ethereumSignMessage')
   }
 
-  ethereumVerifyMessage (path, message, cb) {
+  ethereumVerifyMessage(path, message, cb) {
     console.log('ethereumVerifyMessage')
   }
 }
 
 class Ledger {
-  constructor (emit) {
+  constructor(emit) {
     this.emit = emit
     this.devices = {}
-    document.addEventListener('mousedown', e => { // Synthetic input event created by main process for web-ble scan
+    document.addEventListener('mousedown', (e) => {
+      // Synthetic input event created by main process for web-ble scan
       if (e.clientX === -124816 && e.clientX === -124816) this.scan()
     })
     this.emit('ledger:scan') // Request synthetic input
     this.scanner = setInterval(() => this.emit('ledger:scan'), 20000)
   }
 
-  async scan () {
+  async scan() {
     try {
       const device = await TransportWebBLE.create()
       if (!this.devices[device.id]) {
@@ -95,26 +99,26 @@ class Ledger {
     }
   }
 
-  deviceNotFound (id, cb) {
+  deviceNotFound(id, cb) {
     cb(new Error(`Device with id: ${id} not found`))
   }
 
-  ethereumGetAddress (id, path, display, cb) {
+  ethereumGetAddress(id, path, display, cb) {
     if (!this.devices[id]) return this.deviceNotFound(id, cb)
     this.devices[id].ethereumGetAddress(path, display, cb)
   }
 
-  ethereumSignTransaction (id, path, tx, cb) {
+  ethereumSignTransaction(id, path, tx, cb) {
     if (!this.devices[id]) return this.deviceNotFound(id, cb)
     this.devices[id].ethereumSignTransaction(path, tx, cb)
   }
 
-  ethereumSignMessage (id, path, message, cb) {
+  ethereumSignMessage(id, path, message, cb) {
     if (!this.devices[id]) return this.deviceNotFound(id, cb)
     this.devices[id].ethereumSignMessage(path, message, cb)
   }
 
-  ethereumVerifyMessage (id, path, message, cb) {
+  ethereumVerifyMessage(id, path, message, cb) {
     if (!this.devices[id]) return this.deviceNotFound(id, cb)
     this.devices[id].ethereumVerifyMessage(path, message, cb)
   }
diff --git a/app/flex/trezor/index.js b/app/flex/trezor/index.js
index 20122394a..4d8ea61a6 100644
--- a/app/flex/trezor/index.js
+++ b/app/flex/trezor/index.js
@@ -1,18 +1,12 @@
 const EventEmitter = require('events')
-const {
-  default: TrezorConnect,
-  DEVICE_EVENT,
-  DEVICE,
-  UI_EVENT,
-  UI
-} = require('trezor-connect')
+const { default: TrezorConnect, DEVICE_EVENT, DEVICE, UI_EVENT, UI } = require('trezor-connect')
 
 const events = new EventEmitter()
 events.setMaxListeners(128)
 let ready = false
 
 class Device {
-  constructor (device, emit) {
+  constructor(device, emit) {
     this.device = device
     this.id = device.path
     this.emit = emit
@@ -20,106 +14,136 @@ class Device {
     events.once('ready', () => this.setup())
   }
 
-  setup () {
+  setup() {
     this.connect()
   }
 
-  connect () {
+  connect() {
     this.emit('trezor:connect', this.device)
   }
 
-  disconnect () {
+  disconnect() {
     this.emit('trezor:disconnect', this.device)
   }
 
-  update (device = this.device) {
+  update(device = this.device) {
     this.device = device
     this.emit('trezor:update', this.device)
   }
 
-  needPin () {
+  needPin() {
     this.emit('trezor:needPin', this.device)
   }
 
-  needPhrase () {
+  needPhrase() {
     this.emit('trezor:needPhrase', this.device)
   }
 
-  enteringPhrase () {
+  enteringPhrase() {
     this.emit('trezor:enteringPhrase', this.device)
 
     TrezorConnect.uiResponse({
       type: UI.RECEIVE_PASSPHRASE,
-      payload: { value: '', passphraseOnDevice: true }
+      payload: { value: '', passphraseOnDevice: true },
     })
   }
 
-  inputPin (pin, cb) {
+  inputPin(pin, cb) {
     TrezorConnect.uiResponse({ device: this.device, type: UI.RECEIVE_PIN, payload: pin })
     cb()
   }
 
-  inputPhrase (phrase, cb) {
-    TrezorConnect.uiResponse({ device: this.device, type: UI.RECEIVE_PASSPHRASE, payload: { value: phrase } })
+  inputPhrase(phrase, cb) {
+    TrezorConnect.uiResponse({
+      device: this.device,
+      type: UI.RECEIVE_PASSPHRASE,
+      payload: { value: phrase },
+    })
     cb()
   }
 
-  getPublicKey (path, cb) {
-    TrezorConnect.getPublicKey({ device: this.device, path }).then(res => {
-      if (!res.success) return cb(new Error(res.payload.error))
-      cb(null, res.payload)
-    }).catch(err => cb(err))
-  }
-
-  ethereumGetAddress (path, showOnTrezor = false, cb) {
-    TrezorConnect.ethereumGetAddress({ device: this.device, path, showOnTrezor }).then(res => {
-      if (!res.success) return cb(new Error(res.payload.error))
-      cb(null, res.payload)
-    }).catch(err => cb(err))
-  }
-
-  ethereumSignTransaction (path, transaction, cb) {
-    TrezorConnect.ethereumSignTransaction({ device: this.device, path, transaction }).then(res => {
-      if (!res.success) return cb(new Error(res.payload.error))
-      cb(null, res.payload)
-    }).catch(err => cb(err))
-  }
-
-  ethereumSignMessage (path, message, cb) {
-    TrezorConnect.ethereumSignMessage({ device: this.device, path, message, hex: true }).then(res => {
-      if (!res.success) return cb(new Error(res.payload.error))
-      cb(null, res.payload)
-    }).catch(err => cb(err))
-  }
-
-  ethereumSignTypedData (path, data, cb) {
-    TrezorConnect.ethereumSignTypedData({ device: this.device, path, data, metamask_v4_compat: true }).then(res => {
-      if (!res.success) return cb(new Error(res.payload.error))
-      cb(null, res.payload)
-    }).catch(err => cb(err))
-  }
-
-  ethereumSignTypedHash (path, data, domainSeparatorHash, messageHash, cb) {
-    TrezorConnect.ethereumSignTypedData({ device: this.device, path, data, domain_separator_hash: domainSeparatorHash, message_hash: messageHash, metamask_v4_compat: true }).then(res => {
-      if (!res.success) return cb(new Error(res.payload.error))
-      cb(null, res.payload)
-    }).catch(err => cb(err))
+  getPublicKey(path, cb) {
+    TrezorConnect.getPublicKey({ device: this.device, path })
+      .then((res) => {
+        if (!res.success) return cb(new Error(res.payload.error))
+        cb(null, res.payload)
+      })
+      .catch((err) => cb(err))
+  }
+
+  ethereumGetAddress(path, showOnTrezor = false, cb) {
+    TrezorConnect.ethereumGetAddress({ device: this.device, path, showOnTrezor })
+      .then((res) => {
+        if (!res.success) return cb(new Error(res.payload.error))
+        cb(null, res.payload)
+      })
+      .catch((err) => cb(err))
+  }
+
+  ethereumSignTransaction(path, transaction, cb) {
+    TrezorConnect.ethereumSignTransaction({ device: this.device, path, transaction })
+      .then((res) => {
+        if (!res.success) return cb(new Error(res.payload.error))
+        cb(null, res.payload)
+      })
+      .catch((err) => cb(err))
+  }
+
+  ethereumSignMessage(path, message, cb) {
+    TrezorConnect.ethereumSignMessage({ device: this.device, path, message, hex: true })
+      .then((res) => {
+        if (!res.success) return cb(new Error(res.payload.error))
+        cb(null, res.payload)
+      })
+      .catch((err) => cb(err))
+  }
+
+  ethereumSignTypedData(path, data, cb) {
+    TrezorConnect.ethereumSignTypedData({
+      device: this.device,
+      path,
+      data,
+      metamask_v4_compat: true,
+    })
+      .then((res) => {
+        if (!res.success) return cb(new Error(res.payload.error))
+        cb(null, res.payload)
+      })
+      .catch((err) => cb(err))
+  }
+
+  ethereumSignTypedHash(path, data, domainSeparatorHash, messageHash, cb) {
+    TrezorConnect.ethereumSignTypedData({
+      device: this.device,
+      path,
+      data,
+      domain_separator_hash: domainSeparatorHash,
+      message_hash: messageHash,
+      metamask_v4_compat: true,
+    })
+      .then((res) => {
+        if (!res.success) return cb(new Error(res.payload.error))
+        cb(null, res.payload)
+      })
+      .catch((err) => cb(err))
   }
 
-  ethereumVerifyMessage (path, address, message, signature, cb) {
-    TrezorConnect.ethereumVerifyMessage({ device: this.device, path, address, message, signature }).then(res => {
-      if (!res.success) return cb(new Error(res.payload.error))
-      cb(null, res.payload)
-    }).catch(err => cb(err))
+  ethereumVerifyMessage(path, address, message, signature, cb) {
+    TrezorConnect.ethereumVerifyMessage({ device: this.device, path, address, message, signature })
+      .then((res) => {
+        if (!res.success) return cb(new Error(res.payload.error))
+        cb(null, res.payload)
+      })
+      .catch((err) => cb(err))
   }
 }
 
 class Trezor {
-  constructor (emit) {
+  constructor(emit) {
     this.emit = emit
     this.devices = {}
 
-    TrezorConnect.on(DEVICE_EVENT, e => {
+    TrezorConnect.on(DEVICE_EVENT, (e) => {
       if (e.type === DEVICE.CONNECT || e.type === DEVICE.CHANGED) {
         // when plugging in the Trezor, the first event can sometimes be "unacquired" which
         // does not have any information about the firmware, so ignore it and wait
@@ -137,7 +161,7 @@ class Trezor {
       }
     })
 
-    TrezorConnect.on(UI_EVENT, e => {
+    TrezorConnect.on(UI_EVENT, (e) => {
       if (e.type === UI.REQUEST_PIN) {
         const device = this.devices[e.payload.device.path]
         if (device) device.needPin()
@@ -160,62 +184,66 @@ class Trezor {
     const config = { manifest, popup: false, webusb: false, debug: false, lazyLoad: false }
 
     try {
-      TrezorConnect.init(config).then(() => {
-        ready = true
-        events.emit('ready')
-      }).catch(err => console.warn('TrezorConnect Init Error', err))
-    } catch (e) { console.warn(e) }
+      TrezorConnect.init(config)
+        .then(() => {
+          ready = true
+          events.emit('ready')
+        })
+        .catch((err) => console.warn('TrezorConnect Init Error', err))
+    } catch (e) {
+      console.warn(e)
+    }
   }
 
-  scan (cb) {
-    Object.keys(this.devices).forEach(id => this.devices[id].update())
+  scan(cb) {
+    Object.keys(this.devices).forEach((id) => this.devices[id].update())
   }
 
-  deviceNotFound (id, cb) {
+  deviceNotFound(id, cb) {
     cb(new Error(`Device with id: ${id} not found`))
   }
 
-  inputPin (id, pin, cb) {
+  inputPin(id, pin, cb) {
     if (!this.devices[id]) return this.deviceNotFound(id, cb)
     this.devices[id].inputPin(pin, cb)
   }
 
-  inputPhrase (id, phrase, cb) {
+  inputPhrase(id, phrase, cb) {
     if (!this.devices[id]) return this.deviceNotFound(id, cb)
     this.devices[id].inputPhrase(phrase, cb)
   }
 
-  getPublicKey (id, path, cb) {
+  getPublicKey(id, path, cb) {
     if (!this.devices[id]) return this.deviceNotFound(id, cb)
     this.devices[id].getPublicKey(path, cb)
   }
 
-  ethereumGetAddress (id, path, display, cb) {
+  ethereumGetAddress(id, path, display, cb) {
     if (!this.devices[id]) return this.deviceNotFound(id, cb)
     this.devices[id].ethereumGetAddress(path, display, cb)
   }
 
-  ethereumSignTransaction (id, path, tx, cb) {
+  ethereumSignTransaction(id, path, tx, cb) {
     if (!this.devices[id]) return this.deviceNotFound(id, cb)
     this.devices[id].ethereumSignTransaction(path, tx, cb)
   }
 
-  ethereumSignMessage (id, path, message, cb) {
+  ethereumSignMessage(id, path, message, cb) {
     if (!this.devices[id]) return this.deviceNotFound(id, cb)
     this.devices[id].ethereumSignMessage(path, message, cb)
   }
 
-  ethereumSignTypedData (id, path, message, cb) {
+  ethereumSignTypedData(id, path, message, cb) {
     if (!this.devices[id]) return this.deviceNotFound(id, cb)
     this.devices[id].ethereumSignTypedData(path, message, cb)
   }
 
-  ethereumSignTypedHash (id, path, data, domainSeparatorHash, messageHash, cb) {
+  ethereumSignTypedHash(id, path, data, domainSeparatorHash, messageHash, cb) {
     if (!this.devices[id]) return this.deviceNotFound(id, cb)
     this.devices[id].ethereumSignTypedHash(path, data, domainSeparatorHash, messageHash, cb)
   }
 
-  ethereumVerifyMessage (id, path, message, cb) {
+  ethereumVerifyMessage(id, path, message, cb) {
     if (!this.devices[id]) return this.deviceNotFound(id, cb)
     this.devices[id].ethereumVerifyMessage(path, message, cb)
   }
diff --git a/app/index.js b/app/index.js
index 6a00d3e5b..b8cfe0ccd 100644
--- a/app/index.js
+++ b/app/index.js
@@ -14,9 +14,11 @@ Sentry.init({ dsn: 'https://7b09a85b26924609bef5882387e2c4dc@o1204372.ingest.sen
 
 // window.removeAllAccountsAndSigners = () => link.send('tray:removeAllAccountsAndSigners')
 
-document.addEventListener('dragover', e => e.preventDefault())
-document.addEventListener('drop', e => e.preventDefault())
-window.eval = global.eval = () => { throw new Error(`This app does not support window.eval()`) } // eslint-disable-line
+document.addEventListener('dragover', (e) => e.preventDefault())
+document.addEventListener('drop', (e) => e.preventDefault())
+window.eval = global.eval = () => {
+  throw new Error(`This app does not support window.eval()`)
+} // eslint-disable-line
 
 link.rpc('getState', (err, state) => {
   if (err) return console.error('Could not get initial state from main.')
@@ -33,5 +35,7 @@ link.rpc('getState', (err, state) => {
   ReactDOM.render(<Frame />, document.getElementById('frame'))
 })
 // document.addEventListener('mouseover', e => link.send('tray:focus'))
-document.addEventListener('mouseout', e => { if (e.clientX < 0) link.send('tray:mouseout') })
-document.addEventListener('contextmenu', e => link.send('*:contextmenu', e.clientX, e.clientY))
+document.addEventListener('mouseout', (e) => {
+  if (e.clientX < 0) link.send('tray:mouseout')
+})
+document.addEventListener('contextmenu', (e) => link.send('*:contextmenu', e.clientX, e.clientY))
diff --git a/app/store/actions/index.js b/app/store/actions/index.js
index db2f8832a..9e2feeea5 100644
--- a/app/store/actions/index.js
+++ b/app/store/actions/index.js
@@ -11,71 +11,71 @@ export const setSettingsView = (u, index, subindex = 0) => {
 
 export const setAddress = (u, address) => u('address', () => address)
 
-export const togglePanel = u => u('panel.show', show => !show)
+export const togglePanel = (u) => u('panel.show', (show) => !show)
 
 export const panelRequest = (u, request) => {
-  request.host = request.host || (new URL(request.url)).host
-  u('panel.request', v => request)
-  u('panel.show', v => true)
+  request.host = request.host || new URL(request.url).host
+  u('panel.request', (v) => request)
+  u('panel.show', (v) => true)
 }
 
 export const notify = (u, type, data = {}) => {
-  u('view.notify', _ => type)
-  u('view.notifyData', _ => data)
+  u('view.notify', (_) => type)
+  u('view.notifyData', (_) => data)
 }
 
 export const clickGuard = (u, on) => u('view.clickGuard', () => on)
-export const toggleAddAccount = (u) => u('view.addAccount', show => !show)
-export const toggleAddNetwork = (u) => u('view.addNetwork', show => !show)
-export const updateBadge = (u, type) => u('view.badge', _ => type)
+export const toggleAddAccount = (u) => u('view.addAccount', (show) => !show)
+export const toggleAddNetwork = (u) => u('view.addNetwork', (show) => !show)
+export const updateBadge = (u, type) => u('view.badge', (_) => type)
 
-export const toggleSettings = u => {
-  u('panel.view', view => view === 'settings' ? 'default' : 'settings')
+export const toggleSettings = (u) => {
+  u('panel.view', (view) => (view === 'settings' ? 'default' : 'settings'))
 }
 
 export const setPanelView = (u, view) => u('panel.view', () => view)
 
 let trayInitial = true
 export const trayOpen = (u, open) => {
-  u('tray.open', _ => open)
+  u('tray.open', (_) => open)
   if (open && trayInitial) {
     trayInitial = false
     setTimeout(() => {
-      u('tray.initial', _ => false)
+      u('tray.initial', (_) => false)
     }, 30)
   }
 }
 
 export const setSignerView = (u, view) => {
-  u('selected.showAccounts', _ => false)
-  u('selected.view', _ => view)
+  u('selected.showAccounts', (_) => false)
+  u('selected.view', (_) => view)
 }
 
 export const accountPage = (u, page) => {
   u('selected.accountPage', () => page)
 }
 
-export const toggleShowAccounts = u => u('selected.showAccounts', _ => !_)
+export const toggleShowAccounts = (u) => u('selected.showAccounts', (_) => !_)
 
 export const addProviderEvent = (u, payload) => {
-  u('provider.events', events => {
+  u('provider.events', (events) => {
     events.push(payload.method)
     return events
   })
 }
 
-export const setView = (u, view) => u('selected.view', _ => view)
+export const setView = (u, view) => u('selected.view', (_) => view)
 
 export const toggleDataView = (u, id) => {
-  u('selected.requests', id, 'viewData', view => !view)
+  u('selected.requests', id, 'viewData', (view) => !view)
 }
 export const updateExternalRates = (u, rates) => u('main.rates', () => rates)
-export const nodeProvider = (u, connected) => u('node.provider', _ => connected)
-export const setCurrent = (u, id) => u('view.current', _ => id)
+export const nodeProvider = (u, connected) => u('node.provider', (_) => connected)
+export const setCurrent = (u, id) => u('view.current', (_) => id)
 export const updateUrl = (u, id, url) => u('view.data', id, 'url', () => url)
-export const updateTitle = (u, id, title) => u('view.data', id, 'title', _ => title)
+export const updateTitle = (u, id, title) => u('view.data', id, 'title', (_) => title)
 export const reorderTabs = (u, from, to) => {
-  u('view.list', list => {
+  u('view.list', (list) => {
     const _from = list[from]
     list[from] = list[to]
     list[to] = _from
@@ -84,16 +84,16 @@ export const reorderTabs = (u, from, to) => {
 }
 export const newView = (u) => {
   const id = v4()
-  u('view.current', _ => id)
-  u('view.list', list => {
+  u('view.current', (_) => id)
+  u('view.list', (list) => {
     list.push(id)
     return list
   })
-  u('view.data', id, view => ({ url: 'https://www.google.com/', title: 'New Tab' }))
+  u('view.data', id, (view) => ({ url: 'https://www.google.com/', title: 'New Tab' }))
 }
 
 export const removeView = (u, id, isCurrent) => {
-  u('view', view => {
+  u('view', (view) => {
     const index = view.list.indexOf(id)
     if (isCurrent) {
       if (index < view.list.length - 1) {
@@ -108,5 +108,5 @@ export const removeView = (u, id, isCurrent) => {
   })
 }
 
-export const initialSignerPos = (u, pos) => u('selected.position.initial', _ => pos)
-export const initialScrollPos = (u, pos) => u('selected.position.scrollTop', _ => pos)
+export const initialSignerPos = (u, pos) => u('selected.position.initial', (_) => pos)
+export const initialScrollPos = (u, pos) => u('selected.position.scrollTop', (_) => pos)
diff --git a/app/store/index.js b/app/store/index.js
index 4322dbdac..eebb4dc6d 100644
--- a/app/store/index.js
+++ b/app/store/index.js
@@ -22,7 +22,9 @@ export default (state, cb) => {
   //   })
   // })
 
-  link.on('action', (action, ...args) => { if (store[action]) store[action](...args) })
+  link.on('action', (action, ...args) => {
+    if (store[action]) store[action](...args)
+  })
   link.send('tray:ready') // turn on api
 
   link.send('tray:refreshMain')
diff --git a/build/notarize.js b/build/notarize.js
index 7019d3e86..43e472506 100644
--- a/build/notarize.js
+++ b/build/notarize.js
@@ -16,19 +16,11 @@ module.exports = async function (params) {
       appBundleId: appId,
       appPath: appPath,
       appleId: process.env.APPLE_ID,
-      appleIdPassword: process.env.APPLE_ID_PASSWORD
+      appleIdPassword: process.env.APPLE_ID_PASSWORD,
     })
 
     // verify signed and notarized application
-    execFileSync('spctl', [
-      '--assess',
-      '--type',
-      'execute',
-      '--verbose',
-      '--ignore-cache',
-      '--no-cache',
-      appPath
-    ], {})
+    execFileSync('spctl', ['--assess', '--type', 'execute', '--verbose', '--ignore-cache', '--no-cache', appPath], {})
 
     console.log(`Successfully notarized ${appId}`)
   } catch (error) {
diff --git a/dapp/App/DappTile/index.js b/dapp/App/DappTile/index.js
index e87991140..5d74edb92 100644
--- a/dapp/App/DappTile/index.js
+++ b/dapp/App/DappTile/index.js
@@ -3,17 +3,20 @@ import Restore from 'react-restore'
 import link from '../../../resources/link'
 
 class App extends React.Component {
-  constructor (...args) {
+  constructor(...args) {
     super(...args)
     this.state = {}
   }
 
-  render () {
+  render() {
     return (
       <div className='dappTile'>
-        <div className='dappIcon' onClick={() => {
-          link.send('runDapp', this.props.ens)
-        }}>
+        <div
+          className='dappIcon'
+          onClick={() => {
+            link.send('runDapp', this.props.ens)
+          }}
+        >
           {this.props.ens.substr(0, 3)}
         </div>
       </div>
diff --git a/dapp/App/index.js b/dapp/App/index.js
index 137a0b2f3..b615f3258 100644
--- a/dapp/App/index.js
+++ b/dapp/App/index.js
@@ -7,12 +7,12 @@ import svg from '../../resources/svg'
 import link from '../../resources/link'
 
 class App extends React.Component {
-  constructor (...args) {
+  constructor(...args) {
     super(...args)
     this.state = { ready: false }
   }
 
-  render () {
+  render() {
     const dapp = this.store(`main.dapp.details.${this.props.id}`)
     console.log('dapp info is ', dapp)
     let name = dapp ? dapp.domain : null
@@ -20,7 +20,9 @@ class App extends React.Component {
       name = name.split('.')
       name.pop()
       name.reverse()
-      name.forEach((v, i) => { name[i] = v.charAt(0).toUpperCase() + v.slice(1) })
+      name.forEach((v, i) => {
+        name[i] = v.charAt(0).toUpperCase() + v.slice(1)
+      })
       name = name.join(' ')
     }
 
@@ -29,33 +31,37 @@ class App extends React.Component {
     const currentDapp = currentView.dappId ? this.store('main.dapps', currentView.dappId) : ''
 
     // Hard code send dapp status for now
-    const sendDapp = this.store('main.dapps', '0xe8d705c28f65bc3fe10df8b22f9daa265b99d0e1893b2df49fd38120f0410bca') || {}
+    const sendDapp =
+      this.store('main.dapps', '0xe8d705c28f65bc3fe10df8b22f9daa265b99d0e1893b2df49fd38120f0410bca') || {}
 
-    const loaderStyle = currentDapp && currentDapp.colors ? {
-      borderTop: `3px solid ${currentDapp.colors.backgroundShade}`,
-      borderRight: `3px solid ${currentDapp.colors.backgroundShade}`,
-      borderBottom: `3px solid ${currentDapp.colors.backgroundShade}`,
-      borderLeft: `3px solid ${currentDapp.colors.backgroundLight}`
-    } : {}
+    const loaderStyle =
+      currentDapp && currentDapp.colors
+        ? {
+            borderTop: `3px solid ${currentDapp.colors.backgroundShade}`,
+            borderRight: `3px solid ${currentDapp.colors.backgroundShade}`,
+            borderBottom: `3px solid ${currentDapp.colors.backgroundShade}`,
+            borderLeft: `3px solid ${currentDapp.colors.backgroundLight}`,
+          }
+        : {}
 
     return (
       <div className='splash'>
         <Native />
         <div className='overlay' />
         <div className='mainLeft'>
-          <div className='accountTile' onClick={() => {
-            link.send('unsetCurrentView')
-          }}>
-            <div className='accountIcon'>
-            </div>
+          <div
+            className='accountTile'
+            onClick={() => {
+              link.send('unsetCurrentView')
+            }}
+          >
+            <div className='accountIcon'></div>
           </div>
           <div className='dappIcons'>
             <div className='dappIconsScroll'>
               <div className='dappIconsWrap'>
-                {Object.keys(store('main.dapps')).map(id => {
-                  return (
-                    <DappTile ens={store('main.dapps', id, 'ens')} />
-                  )
+                {Object.keys(store('main.dapps')).map((id) => {
+                  return <DappTile ens={store('main.dapps', id, 'ens')} />
                 })}
               </div>
             </div>
@@ -65,9 +71,12 @@ class App extends React.Component {
           <div className='mainTop' />
           {currentDapp ? (
             <>
-              <div className='mainDappBackground' style={{
-                background: currentDapp.colors ? currentDapp.colors.background : 'none'
-              }}>
+              <div
+                className='mainDappBackground'
+                style={{
+                  background: currentDapp.colors ? currentDapp.colors.background : 'none',
+                }}
+              >
                 <div className='mainDappBackgroundTop' />
                 {!currentView.ready ? (
                   <div className='mainDappLoading'>
@@ -85,7 +94,7 @@ class App extends React.Component {
               <div className='mainDappLoading'>
                 <div className='loader' />
               </div>
-            ) 
+            )
           ) : null}
         </div>
       </div>
diff --git a/dapp/index.js b/dapp/index.js
index 64860eeb5..f887803f6 100644
--- a/dapp/index.js
+++ b/dapp/index.js
@@ -21,9 +21,11 @@ import _store from './store'
 
 Sentry.init({ dsn: 'https://7b09a85b26924609bef5882387e2c4dc@o1204372.ingest.sentry.io/6331069' })
 
-document.addEventListener('dragover', e => e.preventDefault())
-document.addEventListener('drop', e => e.preventDefault())
-window.eval = global.eval = () => { throw new Error(`This app does not support window.eval()`) } // eslint-disable-line
+document.addEventListener('dragover', (e) => e.preventDefault())
+document.addEventListener('drop', (e) => e.preventDefault())
+window.eval = global.eval = () => {
+  throw new Error(`This app does not support window.eval()`)
+} // eslint-disable-line
 
 link.rpc('getFrameId', (err, frameId) => {
   if (err) return console.error('Could not get frameId from main', err)
@@ -43,4 +45,4 @@ link.rpc('getFrameId', (err, frameId) => {
   })
 })
 
-document.addEventListener('contextmenu', e => link.send('*:contextmenu', e.clientX, e.clientY))
+document.addEventListener('contextmenu', (e) => link.send('*:contextmenu', e.clientX, e.clientY))
diff --git a/dapp/link/index.js b/dapp/link/index.js
index 362608b4d..9fd52c844 100644
--- a/dapp/link/index.js
+++ b/dapp/link/index.js
@@ -3,8 +3,8 @@ import EventEmitter from 'events'
 
 const source = 'tray:link'
 
-const unwrap = v => v !== undefined || v !== null ? JSON.parse(v) : v
-const wrap = v => v !== undefined || v !== null ? JSON.stringify(v) : v
+const unwrap = (v) => (v !== undefined || v !== null ? JSON.parse(v) : v)
+const wrap = (v) => (v !== undefined || v !== null ? JSON.stringify(v) : v)
 
 const handlers = {}
 
@@ -20,41 +20,45 @@ link.send = (...args) => {
   window.postMessage(wrap({ args, source, method: 'event' }), '*')
 }
 
-window.addEventListener('message', e => {
-  if (e.origin !== 'file://') return
-  const data = unwrap(e.data)
-  const args = data.args || []
-  if (e.origin === 'file://' && data.source !== source) {
-    if (data.method === 'rpc') {
-      if (!handlers[data.id]) return console.log('link.rpc response had no handler')
-      handlers[data.id](...args)
-      delete handlers[data.id]
-    } else if (data.method === 'event') {
-      if (!data.channel) return console.log('link.on event had no channel')
-      link.emit(data.channel, ...args)
-    } else if (data.method === 'reload') {
-      if (data.type === 'css') {
-        document.querySelectorAll('link').forEach(sheet => {
-          if (sheet.visited !== true && sheet.href.indexOf(data.target) > -1) {
-            if (sheet.isLoaded === false || !sheet.href || !(sheet.href.indexOf('.css') > -1)) return
-            sheet.visited = true
-            const clone = sheet.cloneNode()
-            clone.isLoaded = false
-            clone.addEventListener('load', () => {
-              clone.isLoaded = true
-              sheet.remove()
-            })
-            clone.addEventListener('error', () => {
-              clone.isLoaded = true
-              sheet.remove()
-            })
-            clone.href = sheet.href
-            sheet.parentNode.appendChild(clone)
-          }
-        })
+window.addEventListener(
+  'message',
+  (e) => {
+    if (e.origin !== 'file://') return
+    const data = unwrap(e.data)
+    const args = data.args || []
+    if (e.origin === 'file://' && data.source !== source) {
+      if (data.method === 'rpc') {
+        if (!handlers[data.id]) return console.log('link.rpc response had no handler')
+        handlers[data.id](...args)
+        delete handlers[data.id]
+      } else if (data.method === 'event') {
+        if (!data.channel) return console.log('link.on event had no channel')
+        link.emit(data.channel, ...args)
+      } else if (data.method === 'reload') {
+        if (data.type === 'css') {
+          document.querySelectorAll('link').forEach((sheet) => {
+            if (sheet.visited !== true && sheet.href.indexOf(data.target) > -1) {
+              if (sheet.isLoaded === false || !sheet.href || !(sheet.href.indexOf('.css') > -1)) return
+              sheet.visited = true
+              const clone = sheet.cloneNode()
+              clone.isLoaded = false
+              clone.addEventListener('load', () => {
+                clone.isLoaded = true
+                sheet.remove()
+              })
+              clone.addEventListener('error', () => {
+                clone.isLoaded = true
+                sheet.remove()
+              })
+              clone.href = sheet.href
+              sheet.parentNode.appendChild(clone)
+            }
+          })
+        }
       }
     }
-  }
-}, false)
+  },
+  false
+)
 
 export default link
diff --git a/dapp/store/index.js b/dapp/store/index.js
index 7cd583019..efed52550 100644
--- a/dapp/store/index.js
+++ b/dapp/store/index.js
@@ -8,8 +8,9 @@ import * as actions from './actions'
 
 export default (state, cb) => {
   const store = Restore.create(state, actions)
-  link.on('action', (action, ...args) => { if (store[action]) store[action](...args) })
+  link.on('action', (action, ...args) => {
+    if (store[action]) store[action](...args)
+  })
   store.events = new EventEmitter()
   return store
 }
-
diff --git a/dash/App/Accounts/Add/AddAddress/index.js b/dash/App/Accounts/Add/AddAddress/index.js
index b9e53cd1f..afd76ec44 100644
--- a/dash/App/Accounts/Add/AddAddress/index.js
+++ b/dash/App/Accounts/Add/AddAddress/index.js
@@ -6,7 +6,7 @@ import svg from '../../../../../resources/svg'
 import RingIcon from '../../../../../resources/Components/RingIcon'
 
 class AddPhrase extends React.Component {
-  constructor (...args) {
+  constructor(...args) {
     super(...args)
     this.state = {
       index: 0,
@@ -14,15 +14,15 @@ class AddPhrase extends React.Component {
       address: '',
       password: '',
       status: '',
-      error: false
+      error: false,
     }
     this.forms = [React.createRef(), React.createRef()]
   }
 
-  onChange (key, e) {
+  onChange(key, e) {
     e.preventDefault()
     const update = {}
-    const value = (e.target.value || '')
+    const value = e.target.value || ''
     // value = value === ' ' ? '' : value
     // value = value.replace(/[ \t]+/g, '_')
     // value = value.replace(/\W/g, '')
@@ -32,14 +32,14 @@ class AddPhrase extends React.Component {
     this.setState(update)
   }
 
-  onBlur (key, e) {
+  onBlur(key, e) {
     e.preventDefault()
     const update = {}
     update[key] = this.state[key] || ''
     this.setState(update)
   }
 
-  onFocus (key, e) {
+  onFocus(key, e) {
     e.preventDefault()
     if (this.state[key] === '') {
       const update = {}
@@ -48,12 +48,12 @@ class AddPhrase extends React.Component {
     }
   }
 
-  next () {
+  next() {
     this.setState({ index: ++this.state.index })
     this.focusActive()
   }
 
-  create () {
+  create() {
     this.setState({ index: ++this.state.index })
     link.rpc('createFromAddress', this.state.address, (err, signer) => {
       if (err) {
@@ -64,7 +64,7 @@ class AddPhrase extends React.Component {
     })
   }
 
-  restart () {
+  restart() {
     this.setState({ index: 0, adding: false, address: '', password: '', success: false })
     setTimeout(() => {
       this.setState({ status: '', error: false })
@@ -72,7 +72,7 @@ class AddPhrase extends React.Component {
     this.focusActive()
   }
 
-  keyPress (e) {
+  keyPress(e) {
     if (e.key === 'Enter') {
       e.preventDefault()
       const formInput = this.forms[this.state.index]
@@ -82,22 +82,22 @@ class AddPhrase extends React.Component {
     }
   }
 
-  adding () {
+  adding() {
     this.setState({ adding: true })
     this.focusActive()
   }
 
-  focusActive () {
+  focusActive() {
     setTimeout(() => {
       const formInput = this.forms[this.state.index]
       if (formInput) formInput.current.focus()
     }, 500)
   }
 
-  render () {
+  render() {
     let itemClass = 'addAccountItem addAccountItemSmart addAccountItemAdding'
     return (
-      <div className={itemClass} style={{ transitionDelay: (0.64 * this.props.index / 4) + 's' }}>
+      <div className={itemClass} style={{ transitionDelay: (0.64 * this.props.index) / 4 + 's' }}>
         <div className='addAccountItemBar addAccountItemMock' />
         <div className='addAccountItemWrap'>
           <div className='addAccountItemTop'>
@@ -112,7 +112,8 @@ class AddPhrase extends React.Component {
           </div>
           <div className='addAccountItemOption'>
             <div
-              className='addAccountItemOptionIntro' onClick={() => {
+              className='addAccountItemOptionIntro'
+              onClick={() => {
                 this.adding()
               }}
             >
@@ -123,13 +124,27 @@ class AddPhrase extends React.Component {
                 <div className='addAccountItemOptionSetupFrame'>
                   <div className='addAccountItemOptionTitle'>input address</div>
                   <div className='addAccountItemOptionInputPhrase'>
-                    <textarea tabIndex='-1' value={this.state.address} ref={this.forms[0]} onChange={e => this.onChange('address', e)} onFocus={e => this.onFocus('address', e)} onBlur={e => this.onBlur('address', e)} onKeyPress={e => this.keyPress(e)} />
+                    <textarea
+                      tabIndex='-1'
+                      value={this.state.address}
+                      ref={this.forms[0]}
+                      onChange={(e) => this.onChange('address', e)}
+                      onFocus={(e) => this.onFocus('address', e)}
+                      onBlur={(e) => this.onBlur('address', e)}
+                      onKeyPress={(e) => this.keyPress(e)}
+                    />
+                  </div>
+                  <div className='addAccountItemOptionSubmit' onClick={() => this.create()}>
+                    Create
                   </div>
-                  <div className='addAccountItemOptionSubmit' onClick={() => this.create()}>Create</div>
                 </div>
                 <div className='addAccountItemOptionSetupFrame'>
                   <div className='addAccountItemOptionTitle'>{this.state.status}</div>
-                  {this.state.error ? <div className='addAccountItemOptionSubmit' onClick={() => this.restart()}>try again</div> : null}
+                  {this.state.error ? (
+                    <div className='addAccountItemOptionSubmit' onClick={() => this.restart()}>
+                      try again
+                    </div>
+                  ) : null}
                 </div>
               </div>
             </div>
diff --git a/dash/App/Accounts/Add/AddAragon/index.js b/dash/App/Accounts/Add/AddAragon/index.js
index ce8cf7cac..861aa99d5 100644
--- a/dash/App/Accounts/Add/AddAragon/index.js
+++ b/dash/App/Accounts/Add/AddAragon/index.js
@@ -6,7 +6,7 @@ import svg from '../../../../../resources/svg'
 import RingIcon from '../../../../../resources/Components/RingIcon'
 
 class AddAragon extends React.Component {
-  constructor (...args) {
+  constructor(...args) {
     super(...args)
     this.state = {
       adding: false,
@@ -15,26 +15,26 @@ class AddAragon extends React.Component {
       index: 0,
       status: '',
       error: false,
-      name: ''
+      name: '',
     }
     this.forms = [React.createRef(), React.createRef()]
   }
 
-  onChange (key, e) {
+  onChange(key, e) {
     e.preventDefault()
     const update = {}
-    update[key] = (e.target.value || '') // .replace(/\W/g, '')
+    update[key] = e.target.value || '' // .replace(/\W/g, '')
     this.setState(update)
   }
 
-  onBlur (key, e) {
+  onBlur(key, e) {
     e.preventDefault()
     const update = {}
     update[key] = this.state[key] || ''
     this.setState(update)
   }
 
-  onFocus (key, e) {
+  onFocus(key, e) {
     e.preventDefault()
     if (this.state[key] === '') {
       const update = {}
@@ -43,23 +43,23 @@ class AddAragon extends React.Component {
     }
   }
 
-  currentForm () {
+  currentForm() {
     return this.forms[this.state.index]
   }
 
-  blurActive () {
+  blurActive() {
     const formInput = this.currentForm()
     if (formInput) formInput.current.blur()
   }
 
-  focusActive () {
+  focusActive() {
     setTimeout(() => {
       const formInput = this.currentForm()
       if (formInput) formInput.current.focus()
     }, 500)
   }
 
-  next () {
+  next() {
     this.blurActive()
     this.setState({ index: ++this.state.index })
     this.focusActive()
@@ -70,12 +70,12 @@ class AddAragon extends React.Component {
   //   this.next()
   // }
 
-  capitalize (s) {
+  capitalize(s) {
     if (typeof s !== 'string') return ''
     return s.charAt(0).toUpperCase() + s.slice(1)
   }
 
-  actorAccount  (actorAddress) {
+  actorAccount(actorAddress) {
     link.rpc('resolveAragonName', this.state.name, this.state.chainId, (err, dao) => {
       this.next()
       if (err) return this.setState({ status: err, error: true })
@@ -88,8 +88,8 @@ class AddAragon extends React.Component {
           chain: { id: this.state.chainId, type: 'ethereum' },
           actor: actorAddress, // Reference to Frame account that will act on behalf of the agent
           dao: dao.apps.kernel.proxyAddress, // DAO Address
-          agent: dao.apps.agent.proxyAddress // Agent Address
-        }
+          agent: dao.apps.agent.proxyAddress, // Agent Address
+        },
       }
 
       link.rpc('addAragon', aragonAccount, (err) => {
@@ -105,22 +105,22 @@ class AddAragon extends React.Component {
     })
   }
 
-  accountSort (a, b) {
+  accountSort(a, b) {
     const accounts = this.store('main.accounts')
     try {
       let [aBlock, aLocal] = accounts[a].created.split(':')
       let [bBlock, bLocal] = accounts[b].created.split(':')
-  
+
       aLocal = parseInt(aLocal)
       bLocal = parseInt(bLocal)
-  
+
       if (aBlock === 'new' && bBlock !== 'new') return -1
       if (bBlock !== 'new' && aBlock === 'new') return 1
       if (aBlock === 'new' && bBlock === 'new') return aLocal >= bLocal ? 1 : 0
-  
+
       aBlock = parseInt(aBlock)
       bBlock = parseInt(bBlock)
-  
+
       if (aBlock > bBlock) return -1
       if (aBlock < bBlock) return -1
       if (aBlock === bBlock) return aLocal >= bLocal ? 1 : 0
@@ -132,28 +132,33 @@ class AddAragon extends React.Component {
     }
   }
 
-  accountFilter (id) {
+  accountFilter(id) {
     // Need to migrate accounts to use network type
     // const network = this.store('main.currentNetwork.id')
     const account = this.store('main.accounts', id)
     if (account.type === 'aragon') return false
-    return true 
+    return true
   }
 
-  restart () {
-    this.setState({ adding: false, agent: '0x0000000000000000000000000000000000000000', index: 0, name: '' })
+  restart() {
+    this.setState({
+      adding: false,
+      agent: '0x0000000000000000000000000000000000000000',
+      index: 0,
+      name: '',
+    })
     setTimeout(() => {
       this.setState({ status: '', error: false })
     }, 500)
     this.focusActive()
   }
 
-  adding () {
+  adding() {
     this.setState({ adding: true })
     this.focusActive()
   }
 
-  render () {
+  render() {
     let itemClass = 'addAccountItem addAccountItemSmart addAccountItemAdding'
     return (
       <div className={itemClass}>
@@ -167,7 +172,9 @@ class AddAragon extends React.Component {
               <div className='addAccountItemTopTitle'>Aragon DAO</div>
             </div>
             {/* <div className='addAccountItemClose' onMouseDown={() => this.props.close()}>{'Done'}</div> */}
-            <div className='addAccountItemSummary'>An Aragon smart account allows you to use your Aragon DAO with any dapp</div>
+            <div className='addAccountItemSummary'>
+              An Aragon smart account allows you to use your Aragon DAO with any dapp
+            </div>
           </div>
           <div className='addAccountItemOption'>
             <div className='addAccountItemOptionIntro' onMouseDown={() => this.adding()}>
@@ -178,29 +185,63 @@ class AddAragon extends React.Component {
                 <div className='addAccountItemOptionSetupFrame'>
                   <div className='addAccountItemOptionTitle'>enter chain id</div>
                   <div className='addAccountItemOptionInputPhrase'>
-                    <input tabIndex='-1' ref={this.forms[0]} value={this.state.chainId} onChange={e => this.onChange('chainId', e)} onFocus={e => this.onFocus('chainId', e)} onBlur={e => this.onBlur('chainId', e)} onKeyPress={e => { if (e.key === 'Enter') this.next() }} />
+                    <input
+                      tabIndex='-1'
+                      ref={this.forms[0]}
+                      value={this.state.chainId}
+                      onChange={(e) => this.onChange('chainId', e)}
+                      onFocus={(e) => this.onFocus('chainId', e)}
+                      onBlur={(e) => this.onBlur('chainId', e)}
+                      onKeyPress={(e) => {
+                        if (e.key === 'Enter') this.next()
+                      }}
+                    />
+                  </div>
+                  <div className='addAccountItemOptionSubmit' onMouseDown={() => this.next()}>
+                    Next
                   </div>
-                  <div className='addAccountItemOptionSubmit' onMouseDown={() => this.next()}>Next</div>
                 </div>
                 <div className='addAccountItemOptionSetupFrame'>
                   <div className='addAccountItemOptionTitle'>enter dao name</div>
                   <div className='addAccountItemOptionInputPhrase'>
-                    <input tabIndex='-1' ref={this.forms[1]} value={this.state.name} onChange={e => this.onChange('name', e)} onFocus={e => this.onFocus('name', e)} onBlur={e => this.onBlur('name', e)} onKeyPress={e => { if (e.key === 'Enter') this.next() }} />
+                    <input
+                      tabIndex='-1'
+                      ref={this.forms[1]}
+                      value={this.state.name}
+                      onChange={(e) => this.onChange('name', e)}
+                      onFocus={(e) => this.onFocus('name', e)}
+                      onBlur={(e) => this.onBlur('name', e)}
+                      onKeyPress={(e) => {
+                        if (e.key === 'Enter') this.next()
+                      }}
+                    />
+                  </div>
+                  <div className='addAccountItemOptionSubmit' onMouseDown={() => this.next()}>
+                    Next
                   </div>
-                  <div className='addAccountItemOptionSubmit' onMouseDown={() => this.next()}>Next</div>
                 </div>
                 <div className='addAccountItemOptionSetupFrame'>
                   <div className='addAccountItemOptionTitle'>Choose acting account</div>
                   <div className='addAccountItemOptionList'>
                     {Object.keys(this.store('main.accounts'))
-                      .filter(id => this.accountFilter(id))
+                      .filter((id) => this.accountFilter(id))
                       .sort((a, b) => this.accountSort(a, b))
-                      .map(id => {
+                      .map((id) => {
                         const account = this.store('main.accounts', id)
-                        return <div key={id} className='addAccountItemOptionListItem' onMouseDown={e => this.actorAccount(id)}>
-                          <div className='actingAccountAddress'>{id ? id.substring(0, 8) : ''}{svg.octicon('kebab-horizontal', { height: 16 })}{id ? id.substr(id.length - 6) : ''}</div>
-                          <div className='actingAccountTag'>{account.name}</div>
-                        </div>
+                        return (
+                          <div
+                            key={id}
+                            className='addAccountItemOptionListItem'
+                            onMouseDown={(e) => this.actorAccount(id)}
+                          >
+                            <div className='actingAccountAddress'>
+                              {id ? id.substring(0, 8) : ''}
+                              {svg.octicon('kebab-horizontal', { height: 16 })}
+                              {id ? id.substr(id.length - 6) : ''}
+                            </div>
+                            <div className='actingAccountTag'>{account.name}</div>
+                          </div>
+                        )
                       })}
                   </div>
                 </div>
@@ -218,20 +259,30 @@ class AddAragon extends React.Component {
                 </div> */}
                 <div className='addAccountItemOptionSetupFrame'>
                   <div className='addAccountItemOptionTitle'>{this.state.status}</div>
-                  {this.state.error ? <div className='addAccountItemOptionSubmit' onMouseDown={() => this.restart()}>try again</div> : null}
+                  {this.state.error ? (
+                    <div className='addAccountItemOptionSubmit' onMouseDown={() => this.restart()}>
+                      try again
+                    </div>
+                  ) : null}
                 </div>
               </div>
             </div>
           </div>
           <div
-            className='addAccountItemFooter' onMouseDown={() => {
+            className='addAccountItemFooter'
+            onMouseDown={() => {
               const net = this.store('main.currentNetwork.id')
-              const open = url => link.send('tray:action', 'navDash', { view: 'notify', data: { notify: 'openExternal', notifyData: { url }} })
+              const open = (url) =>
+                link.send('tray:action', 'navDash', {
+                  view: 'notify',
+                  data: { notify: 'openExternal', notifyData: { url } },
+                })
               if (net === '1') return open('https://mainnet.aragon.org')
               if (net === '4') return open('https://rinkeby.aragon.org')
               return open('https://aragon.org')
             }}
-          >{''}
+          >
+            {''}
           </div>
         </div>
       </div>
diff --git a/dash/App/Accounts/Add/AddGnosisSafe/index.js b/dash/App/Accounts/Add/AddGnosisSafe/index.js
index 0da33c871..84398d951 100644
--- a/dash/App/Accounts/Add/AddGnosisSafe/index.js
+++ b/dash/App/Accounts/Add/AddGnosisSafe/index.js
@@ -5,7 +5,7 @@ import link from '../../../../../resources/link'
 import svg from '../../../../../resources/svg'
 
 class AddAragon extends React.Component {
-  constructor (...args) {
+  constructor(...args) {
     super(...args)
     this.state = {
       adding: false,
@@ -14,26 +14,26 @@ class AddAragon extends React.Component {
       index: 0,
       status: '',
       error: false,
-      name: ''
+      name: '',
     }
     this.forms = [React.createRef(), React.createRef()]
   }
 
-  onChange (key, e) {
+  onChange(key, e) {
     e.preventDefault()
     const update = {}
-    update[key] = (e.target.value || '') // .replace(/\W/g, '')
+    update[key] = e.target.value || '' // .replace(/\W/g, '')
     this.setState(update)
   }
 
-  onBlur (key, e) {
+  onBlur(key, e) {
     e.preventDefault()
     const update = {}
     update[key] = this.state[key] || ''
     this.setState(update)
   }
 
-  onFocus (key, e) {
+  onFocus(key, e) {
     e.preventDefault()
     if (this.state[key] === '') {
       const update = {}
@@ -42,39 +42,39 @@ class AddAragon extends React.Component {
     }
   }
 
-  currentForm () {
+  currentForm() {
     return this.forms[this.state.index]
   }
 
-  blurActive () {
+  blurActive() {
     const formInput = this.currentForm()
     if (formInput) formInput.current.blur()
   }
 
-  focusActive () {
+  focusActive() {
     setTimeout(() => {
       const formInput = this.currentForm()
       if (formInput) formInput.current.focus()
     }, 500)
   }
 
-  next () {
+  next() {
     this.blurActive()
     this.setState({ index: ++this.state.index })
     this.focusActive()
   }
 
-  actorAccount (actorId) {
+  actorAccount(actorId) {
     this.setState({ actorId })
     this.next()
   }
 
-  capitalize (s) {
+  capitalize(s) {
     if (typeof s !== 'string') return ''
     return s.charAt(0).toUpperCase() + s.slice(1)
   }
 
-  actorAddress (actorAddress, actorIndex) {
+  actorAddress(actorAddress, actorIndex) {
     link.rpc('resolveAragonName', this.state.name, this.state.chainId, (err, dao) => {
       this.next()
       if (err) return this.setState({ status: err, error: true })
@@ -89,14 +89,15 @@ class AddAragon extends React.Component {
         smart: {
           type: 'aragon',
           chain: { id: this.state.chainId, type: 'ethereum' },
-          actor: { // Reference to Frame account that will act on behalf of the agent
+          actor: {
+            // Reference to Frame account that will act on behalf of the agent
             id: this.state.actorId,
             index: actorIndex,
-            address: actorAddress // External Signer
+            address: actorAddress, // External Signer
           },
           dao: dao.apps.kernel.proxyAddress, // DAO Address
-          agent: dao.apps.agent.proxyAddress // Agent Address
-        }
+          agent: dao.apps.agent.proxyAddress, // Agent Address
+        },
       }
       link.rpc('addAragon', aragonAccount, (err) => {
         if (err) {
@@ -111,7 +112,7 @@ class AddAragon extends React.Component {
     })
   }
 
-  accountSort (a, b) {
+  accountSort(a, b) {
     const accounts = this.store('main.accounts')
     a = accounts[a].created
     b = accounts[b].created
@@ -122,7 +123,7 @@ class AddAragon extends React.Component {
     return 0
   }
 
-  accountFilter (id) {
+  accountFilter(id) {
     // Need to migrate accounts to use network type
     const network = this.store('main.currentNetwork.id')
     const account = this.store('main.accounts', id)
@@ -130,35 +131,44 @@ class AddAragon extends React.Component {
     return account.network === network
   }
 
-  restart () {
-    this.setState({ adding: false, agent: '0x0000000000000000000000000000000000000000', index: 0, name: '' })
+  restart() {
+    this.setState({
+      adding: false,
+      agent: '0x0000000000000000000000000000000000000000',
+      index: 0,
+      name: '',
+    })
     setTimeout(() => {
       this.setState({ status: '', error: false })
     }, 500)
     this.focusActive()
   }
 
-  adding () {
+  adding() {
     this.setState({ adding: true })
     this.focusActive()
   }
 
-  render () {
+  render() {
     let itemClass = 'addAccountItem addAccountItemSmart'
     if (this.state.adding) itemClass += ' addAccountItemAdding'
     return (
-      <div className={itemClass} style={{ transitionDelay: (0.64 * this.props.index / 4) + 's' }}>
+      <div className={itemClass} style={{ transitionDelay: (0.64 * this.props.index) / 4 + 's' }}>
         <div className='addAccountItemBar addAccountItemSmart' />
         <div className='addAccountItemWrap'>
           <div className='addAccountItemTop'>
             <div className='addAccountItemIcon'>
-              <div className='addAccountItemIconType addAccountItemIconSmart' style={{ paddingTop: '6px' }}>{svg.aragon(30)}</div>
+              <div className='addAccountItemIconType addAccountItemIconSmart' style={{ paddingTop: '6px' }}>
+                {svg.aragon(30)}
+              </div>
               <div className='addAccountItemIconHex addAccountItemIconHexSmart' />
             </div>
             <div className='addAccountItemTopTitle'>Aragon</div>
             <div className='addAccountItemTopTitle' />
           </div>
-          <div className='addAccountItemSummary'>An Aragon smart account allows you to use your Aragon DAO with any dapp</div>
+          <div className='addAccountItemSummary'>
+            An Aragon smart account allows you to use your Aragon DAO with any dapp
+          </div>
           <div className='addAccountItemOption'>
             <div className='addAccountItemOptionIntro' onMouseDown={() => this.adding()}>
               <div className='addAccountItemDeviceTitle'>Add Aragon Account</div>
@@ -168,26 +178,58 @@ class AddAragon extends React.Component {
                 <div className='addAccountItemOptionSetupFrame'>
                   <div className='addAccountItemOptionTitle'>enter chain id</div>
                   <div className='addAccountItemOptionInputPhrase'>
-                    <input tabIndex='-1' ref={this.forms[0]} value={this.state.chainId} onChange={e => this.onChange('chainId', e)} onFocus={e => this.onFocus('chainId', e)} onBlur={e => this.onBlur('chainId', e)} onKeyPress={e => { if (e.key === 'Enter') this.next() }} />
+                    <input
+                      tabIndex='-1'
+                      ref={this.forms[0]}
+                      value={this.state.chainId}
+                      onChange={(e) => this.onChange('chainId', e)}
+                      onFocus={(e) => this.onFocus('chainId', e)}
+                      onBlur={(e) => this.onBlur('chainId', e)}
+                      onKeyPress={(e) => {
+                        if (e.key === 'Enter') this.next()
+                      }}
+                    />
+                  </div>
+                  <div className='addAccountItemOptionSubmit' onMouseDown={() => this.next()}>
+                    Next
                   </div>
-                  <div className='addAccountItemOptionSubmit' onMouseDown={() => this.next()}>Next</div>
                 </div>
                 <div className='addAccountItemOptionSetupFrame'>
                   <div className='addAccountItemOptionTitle'>enter dao name</div>
                   <div className='addAccountItemOptionInputPhrase'>
-                    <input tabIndex='-1' ref={this.forms[1]} value={this.state.name} onChange={e => this.onChange('name', e)} onFocus={e => this.onFocus('name', e)} onBlur={e => this.onBlur('name', e)} onKeyPress={e => { if (e.key === 'Enter') this.next() }} />
+                    <input
+                      tabIndex='-1'
+                      ref={this.forms[1]}
+                      value={this.state.name}
+                      onChange={(e) => this.onChange('name', e)}
+                      onFocus={(e) => this.onFocus('name', e)}
+                      onBlur={(e) => this.onBlur('name', e)}
+                      onKeyPress={(e) => {
+                        if (e.key === 'Enter') this.next()
+                      }}
+                    />
+                  </div>
+                  <div className='addAccountItemOptionSubmit' onMouseDown={() => this.next()}>
+                    Next
                   </div>
-                  <div className='addAccountItemOptionSubmit' onMouseDown={() => this.next()}>Next</div>
                 </div>
                 <div className='addAccountItemOptionSetupFrame'>
                   <div className='addAccountItemOptionTitle'>Choose acting account</div>
                   <div className='addAccountItemOptionList'>
                     {Object.keys(this.store('main.accounts'))
-                      .filter(id => this.accountFilter(id))
+                      .filter((id) => this.accountFilter(id))
                       .sort((a, b) => this.accountSort(a, b))
-                      .map(id => {
+                      .map((id) => {
                         const account = this.store('main.accounts', id)
-                        return <div key={id} className='addAccountItemOptionListItem' onMouseDown={e => this.actorAccount(id)}>{account.name}</div>
+                        return (
+                          <div
+                            key={id}
+                            className='addAccountItemOptionListItem'
+                            onMouseDown={(e) => this.actorAccount(id)}
+                          >
+                            {account.name}
+                          </div>
+                        )
                       })}
                   </div>
                 </div>
@@ -196,8 +238,14 @@ class AddAragon extends React.Component {
                   <div className='addAccountItemOptionList'>
                     {(this.store('main.accounts', this.state.actorId, 'addresses') || []).map((a, i) => {
                       return (
-                        <div key={a + i} className='addAccountItemOptionListItem fira' onMouseDown={e => this.actorAddress(a, i)}>
-                          {a ? a.substring(0, 10) : ''}{svg.octicon('kebab-horizontal', { height: 16 })}{a ? a.substr(a.length - 10) : ''}
+                        <div
+                          key={a + i}
+                          className='addAccountItemOptionListItem fira'
+                          onMouseDown={(e) => this.actorAddress(a, i)}
+                        >
+                          {a ? a.substring(0, 10) : ''}
+                          {svg.octicon('kebab-horizontal', { height: 16 })}
+                          {a ? a.substr(a.length - 10) : ''}
                         </div>
                       )
                     })}
@@ -205,20 +253,30 @@ class AddAragon extends React.Component {
                 </div>
                 <div className='addAccountItemOptionSetupFrame'>
                   <div className='addAccountItemOptionTitle'>{this.state.status}</div>
-                  {this.state.error ? <div className='addAccountItemOptionSubmit' onMouseDown={() => this.restart()}>try again</div> : null}
+                  {this.state.error ? (
+                    <div className='addAccountItemOptionSubmit' onMouseDown={() => this.restart()}>
+                      try again
+                    </div>
+                  ) : null}
                 </div>
               </div>
             </div>
           </div>
           <div
-            className='addAccountItemSummary' onMouseDown={() => {
+            className='addAccountItemSummary'
+            onMouseDown={() => {
               const net = this.store('main.currentNetwork.id')
-              const open = url => link.send('tray:action', 'navDash', { view: 'notify', data: { notify: 'openExternal', notifyData: { url }} })
+              const open = (url) =>
+                link.send('tray:action', 'navDash', {
+                  view: 'notify',
+                  data: { notify: 'openExternal', notifyData: { url } },
+                })
               if (net === '1') return open('https://mainnet.aragon.org')
               if (net === '4') return open('https://rinkeby.aragon.org')
               return open('https://aragon.org')
             }}
-          >{'Don\'t have a dao? Create one'}
+          >
+            {"Don't have a dao? Create one"}
           </div>
         </div>
       </div>
diff --git a/dash/App/Accounts/Add/AddHardware/index.js b/dash/App/Accounts/Add/AddHardware/index.js
index 7d1446b87..e13407d1e 100644
--- a/dash/App/Accounts/Add/AddHardware/index.js
+++ b/dash/App/Accounts/Add/AddHardware/index.js
@@ -8,16 +8,16 @@ import RingIcon from '../../../../../resources/Components/RingIcon'
 import Signer from '../../Signer'
 
 class AddHardware extends React.Component {
-  constructor (...args) {
+  constructor(...args) {
     super(...args)
     this.state = {}
     this.deviceName = this.props.type // .replace(/\b\w/g, l => l.toUpperCase())
   }
 
-  render () {
+  render() {
     const signers = this.store('main.signers')
-    const isType = id => this.store('main.signers', id, 'type') === this.props.type
-    const toDevice = id => this.store('main.signers', id)
+    const isType = (id) => this.store('main.signers', id, 'type') === this.props.type
+    const toDevice = (id) => this.store('main.signers', id)
 
     const tethered = Object.keys(signers).filter(isType.bind(this)).map(toDevice.bind(this))
     return (
@@ -44,29 +44,37 @@ class AddHardware extends React.Component {
               tethered.map((signer, i) => {
                 return (
                   <div className='addAccountItemOptionSetupFrame'>
-                    {signer ? <Signer key={signer.id} {...signer} inSetup={true} />
-                    : (
+                    {signer ? (
+                      <Signer key={signer.id} {...signer} inSetup={true} />
+                    ) : (
                       <>
                         <div className='addAccountItemOptionTitle'>{this.state.status}</div>
-                        {this.state.error ? <div className='addAccountItemOptionSubmit' onMouseDown={() => this.restart()}>try again</div> : null}
+                        {this.state.error ? (
+                          <div className='addAccountItemOptionSubmit' onMouseDown={() => this.restart()}>
+                            try again
+                          </div>
+                        ) : null}
                       </>
-                    )} 
+                    )}
                   </div>
                 )
               })
             ) : (
               <>
                 <div className='addAccountItemDevice'>
-                  <div className='addAccountItemDeviceTitle'>
-                    No Devices Found
-                  </div>
+                  <div className='addAccountItemDeviceTitle'>No Devices Found</div>
                 </div>
                 {this.deviceName === 'trezor' ? (
                   <div className='addAccountItemTrezorBridgeWarning'>
                     <div>Don't see your Trezor?</div>
                     <div>
                       <span>Make sure you've installed </span>
-                      <span className='openBridgeUrl' onClick={() => link.send('tray:openExternal', 'https://wiki.trezor.io/Trezor_Bridge') }>Trezor bridge</span>
+                      <span
+                        className='openBridgeUrl'
+                        onClick={() => link.send('tray:openExternal', 'https://wiki.trezor.io/Trezor_Bridge')}
+                      >
+                        Trezor bridge
+                      </span>
                     </div>
                   </div>
                 ) : null}
@@ -74,12 +82,19 @@ class AddHardware extends React.Component {
             )}
           </div>
           <div
-            className='addAccountItemFooter' onMouseDown={() => {
-              const open = url => link.send('tray:action', 'navDash', { view: 'notify', data: { notify: 'openExternal', notifyData: { url }} })
-              if (this.deviceName === 'ledger') return open('https://shop.ledger.com/pages/ledger-nano-x?r=1fb484cde64f')
+            className='addAccountItemFooter'
+            onMouseDown={() => {
+              const open = (url) =>
+                link.send('tray:action', 'navDash', {
+                  view: 'notify',
+                  data: { notify: 'openExternal', notifyData: { url } },
+                })
+              if (this.deviceName === 'ledger')
+                return open('https://shop.ledger.com/pages/ledger-nano-x?r=1fb484cde64f')
               if (this.deviceName === 'trezor') return open('https://shop.trezor.io/?offer_id=10&aff_id=3270')
             }}
-          >{``}
+          >
+            {``}
           </div>
         </div>
       </div>
diff --git a/dash/App/Accounts/Add/AddHardwareLattice/index.js b/dash/App/Accounts/Add/AddHardwareLattice/index.js
index 526c18838..2fae04a2b 100644
--- a/dash/App/Accounts/Add/AddHardwareLattice/index.js
+++ b/dash/App/Accounts/Add/AddHardwareLattice/index.js
@@ -7,13 +7,12 @@ import link from '../../../../../resources/link'
 import svg from '../../../../../resources/svg'
 import RingIcon from '../../../../../resources/Components/RingIcon'
 
-
-function parseDeviceName (name) {
+function parseDeviceName(name) {
   return name.replace(/\s+/g, '-').substring(0, 14)
 }
 
 class AddHardwareLattice extends React.Component {
-  constructor (...args) {
+  constructor(...args) {
     super(...args)
     this.state = {
       adding: false,
@@ -22,29 +21,27 @@ class AddHardwareLattice extends React.Component {
       error: false,
       deviceId: '',
       deviceName: 'GridPlus',
-      pairCode: ''
+      pairCode: '',
     }
     this.forms = [React.createRef(), React.createRef()]
   }
 
-  onChange (key, e) {
+  onChange(key, e) {
     e.preventDefault()
 
-    const value = (key === 'deviceName')
-      ? parseDeviceName(e.target.value)
-      : e.target.value
-    
+    const value = key === 'deviceName' ? parseDeviceName(e.target.value) : e.target.value
+
     this.setState({ [key]: value || '' })
   }
 
-  onBlur (key, e) {
+  onBlur(key, e) {
     e.preventDefault()
     const update = {}
     update[key] = this.state[key] || ''
     this.setState(update)
   }
 
-  onFocus (key, e) {
+  onFocus(key, e) {
     e.preventDefault()
     if (this.state[key] === '') {
       const update = {}
@@ -53,29 +50,29 @@ class AddHardwareLattice extends React.Component {
     }
   }
 
-  currentForm () {
+  currentForm() {
     return this.forms[this.state.index]
   }
 
-  blurActive () {
+  blurActive() {
     const formInput = this.currentForm()
     if (formInput && formInput.current) formInput.current.blur()
   }
 
-  focusActive () {
+  focusActive() {
     setTimeout(() => {
       const formInput = this.currentForm()
       if (formInput && formInput.current) formInput.current.focus()
     }, 500)
   }
 
-  next () {
+  next() {
     this.blurActive()
     this.setState({ index: ++this.state.index })
     this.focusActive()
   }
 
-  createLattice () {
+  createLattice() {
     link.rpc('createLattice', this.state.deviceId, this.state.deviceName, (err, signer) => {
       if (err) {
         this.setState({ status: err, error: true })
@@ -85,12 +82,12 @@ class AddHardwareLattice extends React.Component {
     })
   }
 
-  capitalize (s) {
+  capitalize(s) {
     if (typeof s !== 'string') return ''
     return s.charAt(0).toUpperCase() + s.slice(1)
   }
 
-  restart () {
+  restart() {
     this.setState({ adding: false, index: 0, pairCode: '' })
     setTimeout(() => {
       this.setState({ status: '', error: false })
@@ -98,7 +95,7 @@ class AddHardwareLattice extends React.Component {
     this.focusActive()
   }
 
-  render () {
+  render() {
     let itemClass = 'addAccountItem addAccountItemSmart addAccountItemAdding'
 
     let signer
@@ -108,7 +105,7 @@ class AddHardwareLattice extends React.Component {
     }
 
     return (
-      <div className={itemClass} style={{ transitionDelay: (0.64 * this.props.index / 4) + 's' }}>
+      <div className={itemClass} style={{ transitionDelay: (0.64 * this.props.index) / 4 + 's' }}>
         <div className='addAccountItemBar' />
         <div className='addAccountItemWrap'>
           <div className='addAccountItemTop'>
@@ -124,20 +121,19 @@ class AddHardwareLattice extends React.Component {
             <div className='addAccountItemSummary'>GridPlus Lattice1</div>
           </div>
           <div className='addAccountItemOption'>
-            <div
-              className='addAccountItemOptionSetup'
-              style={{ transform: `translateX(-${100 * this.state.index}%)` }}
-            >
+            <div className='addAccountItemOptionSetup' style={{ transform: `translateX(-${100 * this.state.index}%)` }}>
               <div className='addAccountItemOptionSetupFrames'>
                 <div className='addAccountItemOptionSetupFrame'>
                   <div className='addAccountItemOptionTitle'>Device Name</div>
                   <div className='addAccountItemOptionInputPhrase'>
                     <input
-                      tabIndex='-1' ref={this.forms[0]} value={this.state.deviceName}
-                      onChange={e => this.onChange('deviceName', e)}
-                      onFocus={e => this.onFocus('deviceName', e)}
-                      onBlur={e => this.onBlur('deviceName', e)} 
-                      onKeyPress={e => { 
+                      tabIndex='-1'
+                      ref={this.forms[0]}
+                      value={this.state.deviceName}
+                      onChange={(e) => this.onChange('deviceName', e)}
+                      onFocus={(e) => this.onFocus('deviceName', e)}
+                      onBlur={(e) => this.onBlur('deviceName', e)}
+                      onKeyPress={(e) => {
                         if (e.key === 'Enter') {
                           this.next()
                         }
@@ -149,18 +145,21 @@ class AddHardwareLattice extends React.Component {
                     onMouseDown={() => {
                       this.next()
                     }}
-                  >Next
+                  >
+                    Next
                   </div>
                 </div>
                 <div className='addAccountItemOptionSetupFrame'>
                   <div className='addAccountItemOptionTitle'>Enter device id</div>
                   <div className='addAccountItemOptionInputPhrase'>
                     <input
-                      tabIndex='-1' ref={this.forms[1]} value={this.state.deviceId}
-                      onChange={e => this.onChange('deviceId', e)}
-                      onFocus={e => this.onFocus('deviceId', e)}
-                      onBlur={e => this.onBlur('deviceId', e)} 
-                      onKeyPress={e => { 
+                      tabIndex='-1'
+                      ref={this.forms[1]}
+                      value={this.state.deviceId}
+                      onChange={(e) => this.onChange('deviceId', e)}
+                      onFocus={(e) => this.onFocus('deviceId', e)}
+                      onBlur={(e) => this.onBlur('deviceId', e)}
+                      onKeyPress={(e) => {
                         if (e.key === 'Enter') {
                           this.createLattice()
                           this.next()
@@ -174,7 +173,8 @@ class AddHardwareLattice extends React.Component {
                       this.createLattice()
                       this.next()
                     }}
-                  >Create
+                  >
+                    Create
                   </div>
                 </div>
                 <div className='addAccountItemOptionSetupFrame'>
@@ -183,7 +183,11 @@ class AddHardwareLattice extends React.Component {
                   ) : (
                     <>
                       <div className='addAccountItemOptionTitle'>{this.state.status}</div>
-                      {this.state.error ? <div className='addAccountItemOptionSubmit' onMouseDown={() => this.restart()}>try again</div> : null}
+                      {this.state.error ? (
+                        <div className='addAccountItemOptionSubmit' onMouseDown={() => this.restart()}>
+                          try again
+                        </div>
+                      ) : null}
                     </>
                   )}
                 </div>
diff --git a/dash/App/Accounts/Add/AddKeystore/index.js b/dash/App/Accounts/Add/AddKeystore/index.js
index f243a2124..7ef415e29 100644
--- a/dash/App/Accounts/Add/AddKeystore/index.js
+++ b/dash/App/Accounts/Add/AddKeystore/index.js
@@ -6,7 +6,7 @@ import svg from '../../../../../resources/svg'
 import RingIcon from '../../../../../resources/Components/RingIcon'
 
 class AddRing extends React.Component {
-  constructor (...args) {
+  constructor(...args) {
     super(...args)
     this.state = {
       index: 0,
@@ -16,29 +16,29 @@ class AddRing extends React.Component {
       error: false,
       mode: this.props.mode ? this.props.mode : 'manual',
       keystore: '',
-      keystorePassword: ''
+      keystorePassword: '',
     }
     this.forms = {
       keystorePassword: React.createRef(),
-      keystoreCreatePassword: React.createRef()
+      keystoreCreatePassword: React.createRef(),
     }
   }
 
-  onChange (key, e) {
+  onChange(key, e) {
     e.preventDefault()
     const update = {}
     update[key] = e.target.value || ''
     this.setState(update)
   }
 
-  onBlur (key, e) {
+  onBlur(key, e) {
     e.preventDefault()
     const update = {}
     update[key] = this.state[key] || ''
     this.setState(update)
   }
 
-  onFocus (key, e) {
+  onFocus(key, e) {
     e.preventDefault()
     if (this.state[key] === '') {
       const update = {}
@@ -47,24 +47,30 @@ class AddRing extends React.Component {
     }
   }
 
-  next () {
+  next() {
     this.blurActive()
     this.setState({ index: ++this.state.index })
     this.focusActive()
   }
 
-  createKeystore () {
+  createKeystore() {
     this.next()
-    link.rpc('createFromKeystore', this.state.keystore, this.state.keystorePassword, this.state.password, (err, signer) => {
-      if (err) {
-        this.setState({ status: err, error: true })
-      } else {
-        this.setState({ status: 'Successful', error: false })
+    link.rpc(
+      'createFromKeystore',
+      this.state.keystore,
+      this.state.keystorePassword,
+      this.state.password,
+      (err, signer) => {
+        if (err) {
+          this.setState({ status: err, error: true })
+        } else {
+          this.setState({ status: 'Successful', error: false })
+        }
       }
-    })
+    )
   }
 
-  addKeystore () {
+  addKeystore() {
     this.setState({ mode: 'keystore' })
     this.next()
     setTimeout(() => {
@@ -79,48 +85,56 @@ class AddRing extends React.Component {
     }, 640)
   }
 
-  restart () {
-    this.setState({ index: 1, adding: false, password: '', mode: 'manual', privateKey: '', keystore: '', keystorePassword: '' })
+  restart() {
+    this.setState({
+      index: 1,
+      adding: false,
+      password: '',
+      mode: 'manual',
+      privateKey: '',
+      keystore: '',
+      keystorePassword: '',
+    })
     setTimeout(() => {
       this.setState({ status: '', error: false })
     }, 500)
     this.focusActive()
   }
 
-  keyPress (e, next) {
+  keyPress(e, next) {
     if (e.key === 'Enter') {
       e.preventDefault()
       next()
     }
   }
 
-  adding () {
+  adding() {
     this.setState({ adding: true })
   }
 
-  blurActive () {
+  blurActive() {
     const formInput = this.currentForm()
     if (formInput) formInput.current.blur()
   }
 
-  focusActive () {
+  focusActive() {
     setTimeout(() => {
       const formInput = this.currentForm()
       if (formInput) formInput.current.focus()
     }, 500)
   }
 
-  currentForm () {
+  currentForm() {
     let current
     if (this.state.index === 2) current = this.forms.keystorePassword
     if (this.state.index === 3) current = this.forms.keystoreCreatePassword
     return current
   }
 
-  render () {
+  render() {
     let itemClass = 'addAccountItem addAccountItemSmart addAccountItemAdding'
     return (
-      <div className={itemClass} style={{ transitionDelay: (0.64 * this.props.index / 4) + 's' }}>
+      <div className={itemClass} style={{ transitionDelay: (0.64 * this.props.index) / 4 + 's' }}>
         <div className='addAccountItemBar addAccountItemHot' />
         <div className='addAccountItemWrap'>
           <div className='addAccountItemTop'>
@@ -134,14 +148,20 @@ class AddRing extends React.Component {
               <div className='addAccountItemTopTitle'>Keystore</div>
             </div>
             {/* <div className='addAccountItemClose' onMouseDown={() => this.props.close()}>{'Done'}</div> */}
-            <div className='addAccountItemSummary'>A keystore account lets you add accounts from your keystore.json file</div>
+            <div className='addAccountItemSummary'>
+              A keystore account lets you add accounts from your keystore.json file
+            </div>
           </div>
           <div className='addAccountItemOption'>
             <div
-              className='addAccountItemOptionIntro' onMouseDown={() => {
+              className='addAccountItemOptionIntro'
+              onMouseDown={() => {
                 this.adding()
                 setTimeout(() => {
-                  link.send('tray:action', 'navDash', { view: 'notify', data: { notify: 'hotAccountWarning', notifyData: {} } })
+                  link.send('tray:action', 'navDash', {
+                    view: 'notify',
+                    data: { notify: 'hotAccountWarning', notifyData: {} },
+                  })
                 }, 800)
               }}
             >
@@ -151,7 +171,13 @@ class AddRing extends React.Component {
               <div className='addAccountItemOptionSetupFrames'>
                 <div className='addAccountItemOptionSetupFrame'>
                   <div className='addAccountItemOptionTitle'>Add Keystore File</div>
-                  <div className='addAccountItemOptionSubmit' style={{ marginTop: '10px' }} onMouseDown={() => this.addKeystore()}>Locate Keystore File (json)</div>
+                  <div
+                    className='addAccountItemOptionSubmit'
+                    style={{ marginTop: '10px' }}
+                    onMouseDown={() => this.addKeystore()}
+                  >
+                    Locate Keystore File (json)
+                  </div>
                 </div>
                 <div className='addAccountItemOptionSetupFrame'>
                   <div className='addAccountItemOptionTitle'>Locating Keystore</div>
@@ -159,21 +185,47 @@ class AddRing extends React.Component {
                 <div className='addAccountItemOptionSetupFrame'>
                   <div className='addAccountItemOptionTitle'>Enter Keystore Password</div>
                   <div className='addAccountItemOptionInputPhrase'>
-                    <input type='password' tabIndex='-1' ref={this.forms.keystorePassword} value={this.state.keystorePassword} onChange={e => this.onChange('keystorePassword', e)} onFocus={e => this.onFocus('keystorePassword', e)} onBlur={e => this.onBlur('keystorePassword', e)} onKeyPress={e => this.keyPress(e, () => this.next())} />
+                    <input
+                      type='password'
+                      tabIndex='-1'
+                      ref={this.forms.keystorePassword}
+                      value={this.state.keystorePassword}
+                      onChange={(e) => this.onChange('keystorePassword', e)}
+                      onFocus={(e) => this.onFocus('keystorePassword', e)}
+                      onBlur={(e) => this.onBlur('keystorePassword', e)}
+                      onKeyPress={(e) => this.keyPress(e, () => this.next())}
+                    />
+                  </div>
+                  <div className='addAccountItemOptionSubmit' onMouseDown={() => this.next()}>
+                    Next
                   </div>
-                  <div className='addAccountItemOptionSubmit' onMouseDown={() => this.next()}>Next</div>
                 </div>
                 <div className='addAccountItemOptionSetupFrame'>
                   <div className='addAccountItemOptionTitle'>Create Account Password</div>
                   <div className='addAccountItemOptionInputPhrase addAccountItemOptionInputPassword'>
                     <div className='addAccountItemOptionSubtitle'>password must be 12 characters or longer</div>
-                    <input type='password' tabIndex='-1' ref={this.forms.keystoreCreatePassword} value={this.state.password} onChange={e => this.onChange('password', e)} onFocus={e => this.onFocus('password', e)} onBlur={e => this.onBlur('password', e)} onKeyPress={e => this.keyPress(e, () => this.createKeystore())} />
+                    <input
+                      type='password'
+                      tabIndex='-1'
+                      ref={this.forms.keystoreCreatePassword}
+                      value={this.state.password}
+                      onChange={(e) => this.onChange('password', e)}
+                      onFocus={(e) => this.onFocus('password', e)}
+                      onBlur={(e) => this.onBlur('password', e)}
+                      onKeyPress={(e) => this.keyPress(e, () => this.createKeystore())}
+                    />
+                  </div>
+                  <div className='addAccountItemOptionSubmit' onMouseDown={() => this.createKeystore()}>
+                    Create
                   </div>
-                  <div className='addAccountItemOptionSubmit' onMouseDown={() => this.createKeystore()}>Create</div>
                 </div>
                 <div className='addAccountItemOptionSetupFrame'>
                   <div className='addAccountItemOptionTitle'>{this.state.status}</div>
-                  {this.state.error ? <div className='addAccountItemOptionSubmit' onMouseDown={() => this.restart()}>try again</div> : null}
+                  {this.state.error ? (
+                    <div className='addAccountItemOptionSubmit' onMouseDown={() => this.restart()}>
+                      try again
+                    </div>
+                  ) : null}
                 </div>
               </div>
             </div>
diff --git a/dash/App/Accounts/Add/AddPhrase/index.js b/dash/App/Accounts/Add/AddPhrase/index.js
index c1281da87..7f252d891 100644
--- a/dash/App/Accounts/Add/AddPhrase/index.js
+++ b/dash/App/Accounts/Add/AddPhrase/index.js
@@ -8,7 +8,7 @@ import svg from '../../../../../resources/svg'
 import RingIcon from '../../../../../resources/Components/RingIcon'
 
 class AddPhrase extends React.Component {
-  constructor (...args) {
+  constructor(...args) {
     super(...args)
     this.state = {
       index: 0,
@@ -16,15 +16,15 @@ class AddPhrase extends React.Component {
       phrase: '',
       password: '',
       status: '',
-      error: false
+      error: false,
     }
     this.forms = [React.createRef(), React.createRef()]
   }
 
-  onChange (key, e) {
+  onChange(key, e) {
     e.preventDefault()
     const update = {}
-    const value = (e.target.value || '')
+    const value = e.target.value || ''
     // value = value === ' ' ? '' : value
     // value = value.replace(/[ \t]+/g, '_')
     // value = value.replace(/\W/g, '')
@@ -34,14 +34,14 @@ class AddPhrase extends React.Component {
     this.setState(update)
   }
 
-  onBlur (key, e) {
+  onBlur(key, e) {
     e.preventDefault()
     const update = {}
     update[key] = this.state[key] || ''
     this.setState(update)
   }
 
-  onFocus (key, e) {
+  onFocus(key, e) {
     e.preventDefault()
     if (this.state[key] === '') {
       const update = {}
@@ -50,12 +50,12 @@ class AddPhrase extends React.Component {
     }
   }
 
-  next () {
+  next() {
     this.setState({ index: ++this.state.index })
     this.focusActive()
   }
 
-  create () {
+  create() {
     this.setState({ index: ++this.state.index })
     link.rpc('createFromPhrase', this.state.phrase, this.state.password, (err, signer) => {
       if (err) {
@@ -66,7 +66,7 @@ class AddPhrase extends React.Component {
     })
   }
 
-  restart () {
+  restart() {
     this.setState({ index: 0, adding: false, phrase: '', password: '', success: false })
     setTimeout(() => {
       this.setState({ status: '', error: false })
@@ -74,7 +74,7 @@ class AddPhrase extends React.Component {
     this.focusActive()
   }
 
-  keyPress (e) {
+  keyPress(e) {
     if (e.key === 'Enter') {
       e.preventDefault()
       const formInput = this.forms[this.state.index]
@@ -84,19 +84,19 @@ class AddPhrase extends React.Component {
     }
   }
 
-  adding () {
+  adding() {
     this.setState({ adding: true })
     this.focusActive()
   }
 
-  focusActive () {
+  focusActive() {
     setTimeout(() => {
       const formInput = this.forms[this.state.index]
       if (formInput) formInput.current.focus()
     }, 500)
   }
 
-  render () {
+  render() {
     let itemClass = 'addAccountItem addAccountItemSmart addAccountItemAdding'
 
     let signer
@@ -106,7 +106,7 @@ class AddPhrase extends React.Component {
     }
 
     return (
-      <div className={itemClass} style={{ transitionDelay: (0.64 * this.props.index / 4) + 's' }}>
+      <div className={itemClass} style={{ transitionDelay: (0.64 * this.props.index) / 4 + 's' }}>
         <div className='addAccountItemBar addAccountItemHot' />
         <div className='addAccountItemWrap'>
           <div className='addAccountItemTop'>
@@ -120,13 +120,23 @@ class AddPhrase extends React.Component {
               <div className='addAccountItemTopTitle'>Seed Phrase</div>
             </div>
             {/* <div className='addAccountItemClose' onMouseDown={() => this.props.close()}>{'DONE'}</div> */}
-            <div className='addAccountItemSummary'>A phrase account uses a list of words to backup and restore your account</div>
+            <div className='addAccountItemSummary'>
+              A phrase account uses a list of words to backup and restore your account
+            </div>
           </div>
           <div className='addAccountItemOption'>
             <div
-              className='addAccountItemOptionIntro' onMouseDown={() => {
+              className='addAccountItemOptionIntro'
+              onMouseDown={() => {
                 this.adding()
-                setTimeout(() => link.send('tray:action', 'navDash', { view: 'notify', data: { notify: 'hotAccountWarning', notifyData: {} } }), 800)
+                setTimeout(
+                  () =>
+                    link.send('tray:action', 'navDash', {
+                      view: 'notify',
+                      data: { notify: 'hotAccountWarning', notifyData: {} },
+                    }),
+                  800
+                )
               }}
             >
               Add Phrase Account
@@ -136,26 +146,52 @@ class AddPhrase extends React.Component {
                 <div className='addAccountItemOptionSetupFrame'>
                   <div className='addAccountItemOptionTitle'>seed phrase</div>
                   <div className='addAccountItemOptionInputPhrase'>
-                    <textarea tabIndex='-1' value={this.state.phrase} ref={this.forms[0]} onChange={e => this.onChange('phrase', e)} onFocus={e => this.onFocus('phrase', e)} onBlur={e => this.onBlur('phrase', e)} onKeyPress={e => this.keyPress(e)} />
+                    <textarea
+                      tabIndex='-1'
+                      value={this.state.phrase}
+                      ref={this.forms[0]}
+                      onChange={(e) => this.onChange('phrase', e)}
+                      onFocus={(e) => this.onFocus('phrase', e)}
+                      onBlur={(e) => this.onBlur('phrase', e)}
+                      onKeyPress={(e) => this.keyPress(e)}
+                    />
+                  </div>
+                  <div className='addAccountItemOptionSubmit' onMouseDown={() => this.next()}>
+                    Next
                   </div>
-                  <div className='addAccountItemOptionSubmit' onMouseDown={() => this.next()}>Next</div>
                 </div>
                 <div className='addAccountItemOptionSetupFrame'>
                   <div className='addAccountItemOptionTitle'>create password</div>
                   <div className='addAccountItemOptionInputPhrase addAccountItemOptionInputPassword'>
                     <div className='addAccountItemOptionSubtitle'>password must be 12 characters or longer</div>
-                    <input type='password' tabIndex='-1' value={this.state.password} ref={this.forms[1]} onChange={e => this.onChange('password', e)} onFocus={e => this.onFocus('password', e)} onBlur={e => this.onBlur('password', e)} onKeyPress={e => this.keyPress(e)} />
+                    <input
+                      type='password'
+                      tabIndex='-1'
+                      value={this.state.password}
+                      ref={this.forms[1]}
+                      onChange={(e) => this.onChange('password', e)}
+                      onFocus={(e) => this.onFocus('password', e)}
+                      onBlur={(e) => this.onBlur('password', e)}
+                      onKeyPress={(e) => this.keyPress(e)}
+                    />
+                  </div>
+                  <div className='addAccountItemOptionSubmit' onMouseDown={() => this.create()}>
+                    Create
                   </div>
-                  <div className='addAccountItemOptionSubmit' onMouseDown={() => this.create()}>Create</div>
                 </div>
                 <div className='addAccountItemOptionSetupFrame'>
-                  {signer ? <Signer key={signer.id} {...signer} inSetup={true} />
-                  : (
+                  {signer ? (
+                    <Signer key={signer.id} {...signer} inSetup={true} />
+                  ) : (
                     <>
                       <div className='addAccountItemOptionTitle'>{this.state.status}</div>
-                      {this.state.error ? <div className='addAccountItemOptionSubmit' onMouseDown={() => this.restart()}>try again</div> : null}
+                      {this.state.error ? (
+                        <div className='addAccountItemOptionSubmit' onMouseDown={() => this.restart()}>
+                          try again
+                        </div>
+                      ) : null}
                     </>
-                  )} 
+                  )}
                 </div>
               </div>
             </div>
diff --git a/dash/App/Accounts/Add/AddRing/index.js b/dash/App/Accounts/Add/AddRing/index.js
index dce42da8d..eaae240b5 100644
--- a/dash/App/Accounts/Add/AddRing/index.js
+++ b/dash/App/Accounts/Add/AddRing/index.js
@@ -5,9 +5,8 @@ import link from '../../../../../resources/link'
 import svg from '../../../../../resources/svg'
 import RingIcon from '../../../../../resources/Components/RingIcon'
 
-
 class AddRing extends React.Component {
-  constructor (...args) {
+  constructor(...args) {
     super(...args)
     this.state = {
       index: 0,
@@ -16,29 +15,29 @@ class AddRing extends React.Component {
       status: '',
       error: false,
       mode: 'manual',
-      privateKey: ''
+      privateKey: '',
     }
     this.forms = {
       enterPrivateKey: React.createRef(),
-      manualCreatePassword: React.createRef()
+      manualCreatePassword: React.createRef(),
     }
   }
 
-  onChange (key, e) {
+  onChange(key, e) {
     e.preventDefault()
     const update = {}
     update[key] = e.target.value || ''
     this.setState(update)
   }
 
-  onBlur (key, e) {
+  onBlur(key, e) {
     e.preventDefault()
     const update = {}
     update[key] = this.state[key] || ''
     this.setState(update)
   }
 
-  onFocus (key, e) {
+  onFocus(key, e) {
     e.preventDefault()
     if (this.state[key] === '') {
       const update = {}
@@ -47,13 +46,13 @@ class AddRing extends React.Component {
     }
   }
 
-  next () {
+  next() {
     this.blurActive()
     this.setState({ index: ++this.state.index })
     this.focusActive()
   }
 
-  createManual () {
+  createManual() {
     this.next()
     link.rpc('createFromPrivateKey', this.state.privateKey, this.state.password, (err, signer) => {
       if (err) {
@@ -64,7 +63,7 @@ class AddRing extends React.Component {
     })
   }
 
-  restart () {
+  restart() {
     this.setState({ index: 0, adding: false, password: '', mode: 'manual', privateKey: '' })
     setTimeout(() => {
       this.setState({ status: '', error: false })
@@ -72,40 +71,40 @@ class AddRing extends React.Component {
     this.focusActive()
   }
 
-  keyPress (e, next) {
+  keyPress(e, next) {
     if (e.key === 'Enter') {
       e.preventDefault()
       next()
     }
   }
 
-  adding () {
+  adding() {
     this.setState({ adding: true })
   }
 
-  blurActive () {
+  blurActive() {
     const formInput = this.currentForm()
     if (formInput) formInput.current.blur()
   }
 
-  focusActive () {
+  focusActive() {
     setTimeout(() => {
       const formInput = this.currentForm()
       if (formInput) formInput.current.focus()
     }, 500)
   }
 
-  currentForm () {
+  currentForm() {
     let current
     if (this.state.index === 0) current = this.forms.enterPrivateKey
     if (this.state.index === 1) current = this.forms.manualCreatePassword
     return current
   }
 
-  render () {
+  render() {
     let itemClass = 'addAccountItem addAccountItemSmart addAccountItemAdding'
     return (
-      <div className={itemClass} style={{ transitionDelay: (0.64 * this.props.index / 4) + 's' }}>
+      <div className={itemClass} style={{ transitionDelay: (0.64 * this.props.index) / 4 + 's' }}>
         <div className='addAccountItemBar addAccountItemHot' />
         <div className='addAccountItemWrap'>
           <div className='addAccountItemTop'>
@@ -119,14 +118,20 @@ class AddRing extends React.Component {
               <div className='addAccountItemTopTitle'>Private Key</div>
             </div>
             {/* <div className='addAccountItemClose' onClick={() => this.props.close()}>{'DONE'}</div> */}
-            <div className='addAccountItemSummary'>A private key account lets you add accounts from individual private keys</div>
+            <div className='addAccountItemSummary'>
+              A private key account lets you add accounts from individual private keys
+            </div>
           </div>
           <div className='addAccountItemOption'>
             <div
-              className='addAccountItemOptionIntro' onClick={() => {
+              className='addAccountItemOptionIntro'
+              onClick={() => {
                 this.adding()
                 setTimeout(() => {
-                  link.send('tray:action', 'navDash', { view: 'notify', data: { notify: 'hotAccountWarning', notifyData: {} } })
+                  link.send('tray:action', 'navDash', {
+                    view: 'notify',
+                    data: { notify: 'hotAccountWarning', notifyData: {} },
+                  })
                 }, 800)
               }}
             >
@@ -137,21 +142,47 @@ class AddRing extends React.Component {
                 <div className='addAccountItemOptionSetupFrame'>
                   <div className='addAccountItemOptionTitle'>Enter Private Key</div>
                   <div className='addAccountItemOptionInputPhrase'>
-                    <input type='password' tabIndex='-1' ref={this.forms.enterPrivateKey} value={this.state.privateKey} onChange={e => this.onChange('privateKey', e)} onFocus={e => this.onFocus('privateKey', e)} onBlur={e => this.onBlur('privateKey', e)} onKeyPress={e => this.keyPress(e, () => this.next())} />
+                    <input
+                      type='password'
+                      tabIndex='-1'
+                      ref={this.forms.enterPrivateKey}
+                      value={this.state.privateKey}
+                      onChange={(e) => this.onChange('privateKey', e)}
+                      onFocus={(e) => this.onFocus('privateKey', e)}
+                      onBlur={(e) => this.onBlur('privateKey', e)}
+                      onKeyPress={(e) => this.keyPress(e, () => this.next())}
+                    />
+                  </div>
+                  <div className='addAccountItemOptionSubmit' onClick={() => this.next()}>
+                    Next
                   </div>
-                  <div className='addAccountItemOptionSubmit' onClick={() => this.next()}>Next</div>
                 </div>
                 <div className='addAccountItemOptionSetupFrame'>
                   <div className='addAccountItemOptionTitle'>Create Password</div>
                   <div className='addAccountItemOptionInputPhrase addAccountItemOptionInputPassword'>
                     <div className='addAccountItemOptionSubtitle'>password must be 12 characters or longer</div>
-                    <input type='password' tabIndex='-1' ref={this.forms.manualCreatePassword} value={this.state.password} onChange={e => this.onChange('password', e)} onFocus={e => this.onFocus('password', e)} onBlur={e => this.onBlur('password', e)} onKeyPress={e => this.keyPress(e, () => this.createManual())} />
+                    <input
+                      type='password'
+                      tabIndex='-1'
+                      ref={this.forms.manualCreatePassword}
+                      value={this.state.password}
+                      onChange={(e) => this.onChange('password', e)}
+                      onFocus={(e) => this.onFocus('password', e)}
+                      onBlur={(e) => this.onBlur('password', e)}
+                      onKeyPress={(e) => this.keyPress(e, () => this.createManual())}
+                    />
+                  </div>
+                  <div className='addAccountItemOptionSubmit' onClick={() => this.createManual()}>
+                    Create
                   </div>
-                  <div className='addAccountItemOptionSubmit' onClick={() => this.createManual()}>Create</div>
                 </div>
                 <div className='addAccountItemOptionSetupFrame'>
                   <div className='addAccountItemOptionTitle'>{this.state.status}</div>
-                  {this.state.error ? <div className='addAccountItemOptionSubmit' onClick={() => this.restart()}>try again</div> : null}
+                  {this.state.error ? (
+                    <div className='addAccountItemOptionSubmit' onClick={() => this.restart()}>
+                      try again
+                    </div>
+                  ) : null}
                 </div>
               </div>
             </div>
diff --git a/dash/App/Accounts/Add/index.js b/dash/App/Accounts/Add/index.js
index 3c67855de..d8a25fdda 100644
--- a/dash/App/Accounts/Add/index.js
+++ b/dash/App/Accounts/Add/index.js
@@ -15,34 +15,39 @@ import AddAddress from './AddAddress'
 const duration = { appear: 20, enter: 20, exit: 960 }
 
 class Add extends React.Component {
-  constructor (...args) {
+  constructor(...args) {
     super(...args)
     this.particleWorker = new Worker('./particleWorker.js')
   }
 
-  componentDidMount () {
+  componentDidMount() {
     this.canvas = document.getElementById('canvas').transferControlToOffscreen()
     this.canvas.width = window.innerWidth
     this.canvas.height = window.innerHeight
     this.particleWorker.postMessage({ type: 'init', canvas: this.canvas }, [this.canvas])
   }
 
-  start () {
+  start() {
     this.particleWorker.postMessage({ type: 'start' })
   }
 
-  toggleAddAccount (state) {
+  toggleAddAccount(state) {
     if (state === 'entered' || state === 'exited') this.props.close()
   }
 
-  exit () {
+  exit() {
     this.particleWorker.postMessage({ type: 'stop' })
   }
 
-  render () {
+  render() {
     return (
-      <Transition in={Boolean(this.store('view.addAccount'))} timeout={duration} onEnter={() => this.start()} onExit={() => this.exit()}>
-        {state => {
+      <Transition
+        in={Boolean(this.store('view.addAccount'))}
+        timeout={duration}
+        onEnter={() => this.start()}
+        onExit={() => this.exit()}
+      >
+        {(state) => {
           return (
             <>
               {state !== 'exited' ? (
@@ -52,18 +57,32 @@ class Add extends React.Component {
                     <div className='addAccountMainInner'>
                       <div className='addAccountTitle'>Add Account</div>
                       <div className='addAccountBreak' />
-                      <div className='addAccountSubtitle'>Add or create a decentralized account to use with any dapp</div>
+                      <div className='addAccountSubtitle'>
+                        Add or create a decentralized account to use with any dapp
+                      </div>
                       <div className='addAccountBreak' />
-                      <div className='addAccountHeader'><div style={{ marginRight: '10px' }}>{svg.octicon('server', { height: 17 })}</div><div>Hardware Accounts</div></div>
+                      <div className='addAccountHeader'>
+                        <div style={{ marginRight: '10px' }}>{svg.octicon('server', { height: 17 })}</div>
+                        <div>Hardware Accounts</div>
+                      </div>
                       <AddHardware index={1} type='ledger' />
                       <AddHardware index={2} type='trezor' />
                       <AddHardwareLattice index={3} type='lattice' />
-                      <div className='addAccountHeader'><div style={{ marginRight: '10px' }}>{svg.lightbulb(12)}</div><div>Smart Accounts</div></div>
+                      <div className='addAccountHeader'>
+                        <div style={{ marginRight: '10px' }}>{svg.lightbulb(12)}</div>
+                        <div>Smart Accounts</div>
+                      </div>
                       <AddAragon index={3} />
-                      <div className='addAccountHeader'><div style={{ margin: '-1px 10px 0px 0px' }}>{svg.flame(18)}</div><div>Hot Accounts</div></div>
+                      <div className='addAccountHeader'>
+                        <div style={{ margin: '-1px 10px 0px 0px' }}>{svg.flame(18)}</div>
+                        <div>Hot Accounts</div>
+                      </div>
                       <AddPhrase index={4} />
                       <AddRing index={5} />
-                      <div className='addAccountHeader'><div style={{ margin: '-3px 10px 0px 0px' }}>{svg.handshake(23)}</div><div>Nonsigning Accounts</div></div>
+                      <div className='addAccountHeader'>
+                        <div style={{ margin: '-3px 10px 0px 0px' }}>{svg.handshake(23)}</div>
+                        <div>Nonsigning Accounts</div>
+                      </div>
                       <AddAddress index={6} />
                       <div className='addAccountBreak' style={{ margin: '40px 0px 0px 0px' }} />
                       <div className='addAccountFooter'>{svg.logo(32)}</div>
@@ -71,14 +90,28 @@ class Add extends React.Component {
                   </div>
                 </>
               ) : null}
-              <div className={state !== 'exited' && state !== 'entering' ? 'addAccountInterface addAccountInterfaceActive' : 'addAccountInterface'}>
+              <div
+                className={
+                  state !== 'exited' && state !== 'entering'
+                    ? 'addAccountInterface addAccountInterfaceActive'
+                    : 'addAccountInterface'
+                }
+              >
                 <div className='panelBottomMenu'>
-                  <div className={state === 'entered' ? 'addAccountTrigger addAccountTriggerActive' : 'addAccountTrigger'} onMouseDown={() => this.toggleAddAccount(state)}>
+                  <div
+                    className={state === 'entered' ? 'addAccountTrigger addAccountTriggerActive' : 'addAccountTrigger'}
+                    onMouseDown={() => this.toggleAddAccount(state)}
+                  >
                     <div className='addAccountTriggerIcon'>+</div>
                   </div>
                 </div>
               </div>
-              <div style={state === 'exited' ? { display: 'none' } : {}} className={state === 'entered' ? 'addAccountShadeForward addAccountShadeForwardActive' : 'addAccountShadeForward'}>
+              <div
+                style={state === 'exited' ? { display: 'none' } : {}}
+                className={
+                  state === 'entered' ? 'addAccountShadeForward addAccountShadeForwardActive' : 'addAccountShadeForward'
+                }
+              >
                 <canvas id='canvas' />
               </div>
             </>
diff --git a/dash/App/Accounts/Add/particleWorker.js b/dash/App/Accounts/Add/particleWorker.js
index 2c9733642..ab279d73a 100644
--- a/dash/App/Accounts/Add/particleWorker.js
+++ b/dash/App/Accounts/Add/particleWorker.js
@@ -5,14 +5,14 @@ const particles = []
 const particleCount = 56
 
 class Particle {
-  constructor () {
+  constructor() {
     this.x = canvas.width * Math.random()
     this.y = canvas.height * Math.random()
     this.vx = Math.random() - 1
     this.vy = Math.random() - 1
   }
 
-  update () {
+  update() {
     this.x += this.vx
     this.y += this.vy
     if (this.x < 0 || this.x > canvas.width) this.vx = -this.vx
@@ -30,7 +30,7 @@ const loop = () => {
   }, 1000 / 20)
 }
 
-self.onmessage = e => {
+self.onmessage = (e) => {
   if (e.data.type === 'init') {
     canvas = e.data.canvas
     ctx = canvas.getContext('2d')
diff --git a/dash/App/Accounts/Signer/index.js b/dash/App/Accounts/Signer/index.js
index e1181f7db..a0f24193e 100644
--- a/dash/App/Accounts/Signer/index.js
+++ b/dash/App/Accounts/Signer/index.js
@@ -4,56 +4,67 @@ import Restore from 'react-restore'
 import link from '../../../../resources/link'
 import svg from '../../../../resources/svg'
 
-function isHardwareSigner (type = '') {
+function isHardwareSigner(type = '') {
   return ['ledger', 'trezor', 'lattice'].includes(type.toLowerCase())
 }
 
-function isLoading (status = '') {
+function isLoading(status = '') {
   const statusToCheck = status.toLowerCase()
-  return ['loading', 'connecting', 'addresses', 'input', 'pairing'].some(s => statusToCheck.includes(s))
+  return ['loading', 'connecting', 'addresses', 'input', 'pairing'].some((s) => statusToCheck.includes(s))
 }
 
 class Signer extends React.Component {
-  constructor (...args) {
+  constructor(...args) {
     super(...args)
 
     this.state = {
       page: 0,
       addressLimit: 5,
       latticePairCode: '',
-      tPin: ''
+      tPin: '',
     }
   }
 
-  backspacePin (e) {
+  backspacePin(e) {
     e.stopPropagation()
     this.setState({ tPin: this.state.tPin ? this.state.tPin.slice(0, -1) : '' })
   }
 
-  trezorPin (num) {
+  trezorPin(num) {
     this.setState({ tPin: this.state.tPin + num.toString() })
   }
 
-  submitPin () {
+  submitPin() {
     link.rpc('trezorPin', this.props.id, this.state.tPin, () => {})
     this.setState({ tPin: '' })
   }
 
-  submitPhrase () {
+  submitPhrase() {
     link.rpc('trezorPhrase', this.props.id, this.state.tPhrase, () => {})
     this.setState({ tPhrase: '' })
   }
 
-  renderLoadingLive () {
+  renderLoadingLive() {
     if (this.props.type === 'ledger' && this.getStatus() === 'deriving live addresses') {
       const liveAccountLimit = this.store('main.ledger.liveAccountLimit')
       const styleWidth = liveAccountLimit === 20 ? 120 : liveAccountLimit === 40 ? 120 : 60
       const marginTop = liveAccountLimit === 40 ? -8 : 0
       return (
-        <div className='loadingLiveAddresses' style={{ top: `${marginTop}px`, padding: '20px', width: `${styleWidth}px` }}>
-          {[...Array(liveAccountLimit).keys()].map(i => i + 1).map(i => {
-            return <div key={'loadingLiveAddress' + i} className='loadingLiveAddress' style={{ opacity: i <= this.props.liveAddressesFound ? '1' : '0.3' }} />
-          })}
+        <div
+          className='loadingLiveAddresses'
+          style={{ top: `${marginTop}px`, padding: '20px', width: `${styleWidth}px` }}
+        >
+          {[...Array(liveAccountLimit).keys()]
+            .map((i) => i + 1)
+            .map((i) => {
+              return (
+                <div
+                  key={'loadingLiveAddress' + i}
+                  className='loadingLiveAddress'
+                  style={{ opacity: i <= this.props.liveAddressesFound ? '1' : '0.3' }}
+                />
+              )
+            })}
         </div>
       )
     } else {
@@ -61,7 +72,7 @@ class Signer extends React.Component {
     }
   }
 
-  renderTrezorPin (active) {
+  renderTrezorPin(active) {
     return (
       <div className='trezorPinWrap' style={active ? {} : { height: '0px', padding: '0px 0px 0px 0px' }}>
         {active ? (
@@ -75,7 +86,10 @@ class Signer extends React.Component {
                 )
               })}
             </div>
-            <div className='signerPinMessage signerPinSubmit' onMouseDown={this.state.tPin ? () => this.submitPin() : null}>
+            <div
+              className='signerPinMessage signerPinSubmit'
+              onMouseDown={this.state.tPin ? () => this.submitPin() : null}
+            >
               Submit Pin
               {this.state.tPin ? (
                 <div className='signerPinDelete' onMouseDown={this.backspacePin.bind(this)}>
@@ -85,7 +99,7 @@ class Signer extends React.Component {
             </div>
             <div className='trezorPinInputWrap'>
               <div className='trezorPinInput'>
-                {[1, 2, 3, 4, 5, 6, 7, 8, 9].map(i => (
+                {[1, 2, 3, 4, 5, 6, 7, 8, 9].map((i) => (
                   <div key={i} className='trezorPinInputButton' onMouseDown={this.trezorPin.bind(this, i)}>
                     {svg.octicon('primitive-dot', { height: 20 })}
                   </div>
@@ -98,20 +112,25 @@ class Signer extends React.Component {
     )
   }
 
-  phraseKeyPress (e) {
+  phraseKeyPress(e) {
     if (e.key === 'Enter') {
       e.preventDefault()
       this.submitPhrase()
     }
   }
 
-  renderTrezorPhrase (active) {
+  renderTrezorPhrase(active) {
     return (
       <div className='trezorPinWrap' style={active ? {} : { height: '0px', padding: '0px 0px 0px 0px' }}>
         {active ? (
           <>
             <div className='trezorPhraseInput'>
-              <input type='password' onChange={(e) => this.setState({ tPhrase: e.target.value })} onKeyPress={e => this.phraseKeyPress(e)} autoFocus />
+              <input
+                type='password'
+                onChange={(e) => this.setState({ tPhrase: e.target.value })}
+                onKeyPress={(e) => this.phraseKeyPress(e)}
+                autoFocus
+              />
             </div>
             <div className='signerPinMessage signerPinSubmit' onMouseDown={() => this.submitPhrase()}>
               Submit Passphrase
@@ -168,11 +187,11 @@ class Signer extends React.Component {
   //     </div>
   //   )
 
-  getStatus () {
+  getStatus() {
     return (this.props.status || '').toLowerCase()
   }
 
-  status () {
+  status() {
     const status = this.getStatus()
 
     if (status === 'ok') {
@@ -196,37 +215,25 @@ class Signer extends React.Component {
     }
   }
 
-  statusText () {
+  statusText() {
     const status = this.getStatus()
 
     if (status === 'ok') {
-      return (
-        <div className='signerStatusText signerStatusReady'>{'ready to sign'}</div>
-      )
+      return <div className='signerStatusText signerStatusReady'>{'ready to sign'}</div>
     } else if (status === 'locked') {
       const hwSigner = isHardwareSigner(this.props.type)
-      const lockText = hwSigner
-        ? 'Please unlock your ' + this.props.type
-        : 'locked'
-      
-      const classes = hwSigner 
-        ? 'signerStatusText'
-        : 'signerStatusText signerStatusIssue'
-      return (
-        <div className={classes}>{lockText}</div>
-      )
+      const lockText = hwSigner ? 'Please unlock your ' + this.props.type : 'locked'
+
+      const classes = hwSigner ? 'signerStatusText' : 'signerStatusText signerStatusIssue'
+      return <div className={classes}>{lockText}</div>
     } else if (status === 'addresses') {
-      return (
-        <div className='signerStatusText'>{'deriving addresses'}</div>
-      )
+      return <div className='signerStatusText'>{'deriving addresses'}</div>
     } else {
-      return (
-        <div className='signerStatusText'>{this.props.status}</div>
-      )
+      return <div className='signerStatusText'>{this.props.status}</div>
     }
   }
 
-  nextPage (backwards) {
+  nextPage(backwards) {
     let page = backwards ? this.state.page - 1 : this.state.page + 1
     const signer = this.store('main.signers', this.props.id)
     const maxPage = Math.ceil(signer.addresses.length / this.state.addressLimit) - 1
@@ -235,13 +242,13 @@ class Signer extends React.Component {
     this.setState({ page })
   }
 
-  pairToLattice () {
+  pairToLattice() {
     link.rpc('latticePair', this.props.id, this.state.latticePairCode, () => {})
-    
+
     this.setState({ latticePairCode: '' })
   }
 
-  render () {
+  render() {
     const signer = this.store('main.signers', this.props.id)
     const { page, addressLimit } = this.state
     const startIndex = page * addressLimit
@@ -254,9 +261,8 @@ class Signer extends React.Component {
 
     // UI changes for this status only apply to hot signers
     const isLocked = !hwSigner && status === 'locked'
-    const permissionId = (this.props.tag || this.props.tag === '')
-      ? 'Frame' + (this.props.tag ? `-${this.props.tag}` : '')
-      : undefined
+    const permissionId =
+      this.props.tag || this.props.tag === '' ? 'Frame' + (this.props.tag ? `-${this.props.tag}` : '') : undefined
 
     let signerClass = 'signer'
     if (status === 'ok') signerClass += ' signerOk'
@@ -266,22 +272,23 @@ class Signer extends React.Component {
       <div className={signerClass} style={{ zIndex: 1000 - this.props.index }}>
         <div className='signerTop'>
           <div className='signerIcon'>
-          {(_ => {
-            const type = this.props.type
-            if (type === 'ledger') return <div className='signerIconWrap signerIconHardware'>{svg.ledger(20)}</div>
-            if (type === 'trezor') return <div className='signerIconWrap signerIconHardware'>{svg.trezor(20)}</div>
-            if (type === 'seed' || type === 'ring') return <div className='signerIconWrap signerIconHot'>{svg.flame(23)}</div>
-            if (type === 'aragon') return <div className='signerIconWrap signerIconSmart'>{svg.aragon(28)}</div>
-            if (type === 'lattice') return <div className='signerIconWrap signerIconSmart'>{svg.lattice(22)}</div>
-            return <div className='signerIconWrap'>{svg.logo(20)}</div>
-          })()}
+            {((_) => {
+              const type = this.props.type
+              if (type === 'ledger') return <div className='signerIconWrap signerIconHardware'>{svg.ledger(20)}</div>
+              if (type === 'trezor') return <div className='signerIconWrap signerIconHardware'>{svg.trezor(20)}</div>
+              if (type === 'seed' || type === 'ring')
+                return <div className='signerIconWrap signerIconHot'>{svg.flame(23)}</div>
+              if (type === 'aragon') return <div className='signerIconWrap signerIconSmart'>{svg.aragon(28)}</div>
+              if (type === 'lattice') return <div className='signerIconWrap signerIconSmart'>{svg.lattice(22)}</div>
+              return <div className='signerIconWrap'>{svg.logo(20)}</div>
+            })()}
+          </div>
+          <div className='signerType' style={this.props.inSetup ? { top: '21px' } : { top: '24px' }}>
+            {this.props.model}
           </div>
-          <div className='signerType' style={this.props.inSetup ? {top: '21px'} : {top: '24px'}}>{this.props.model}</div>
           <div className='signerName'>
             {this.props.name}
-            <div className='signerNameUpdate'>
-              {svg.save(14)}
-            </div>
+            <div className='signerNameUpdate'>{svg.save(14)}</div>
           </div>
           {this.status()}
         </div>
@@ -292,17 +299,17 @@ class Signer extends React.Component {
             <div className='signerLatticePairInput'>
               <input
                 autoFocus
-                tabIndex='1' value={this.state.latticePairCode}
-                onChange={e => this.setState({ latticePairCode: (e.target.value || '').toUpperCase() })}
-                onKeyPress={e => {
+                tabIndex='1'
+                value={this.state.latticePairCode}
+                onChange={(e) => this.setState({ latticePairCode: (e.target.value || '').toUpperCase() })}
+                onKeyPress={(e) => {
                   if (e.key === 'Enter') this.pairToLattice()
                 }}
               />
             </div>
-            <div
-              onMouseDown={() => this.pairToLattice()}
-              className='signerLatticePairSubmit'
-            >Pair</div>
+            <div onMouseDown={() => this.pairToLattice()} className='signerLatticePairSubmit'>
+              Pair
+            </div>
           </div>
         ) : status === 'ok' || isLocked ? (
           <>
@@ -312,40 +319,57 @@ class Signer extends React.Component {
                 <span className='signerAccountsTitleActiveCount'>{activeAccounts.length}</span> 
               </span>
             </div> */}
-            <div className='signerAccounts'>{signer.addresses.slice(startIndex, startIndex + addressLimit).map((address, index) => {
-              const added = this.store('main.accounts', address.toLowerCase())
-              return (
-                <div key={address} className={!added ?  'signerAccount' : 'signerAccount signerAccountAdded'} onClick={() => {
-                  if (this.store('main.accounts', address.toLowerCase())) {
-                    link.rpc('removeAccount', address, {}, () => { })
-                  } else {
-                    link.rpc('createAccount', address, { type: signer.type }, (e) => {
-                      if (e) console.error(e)
-                    })
-                  }
-                }}>
-                  <div className='signerAccountIndex'>{index + 1 + startIndex}</div>
-                  <div className='signerAccountAddress'>{address.substr(0, 11)} {svg.octicon('kebab-horizontal', { height: 20 })} {address.substr(address.length - 10)}</div>
-                  <div className='signerAccountCheck' />
-                </div>
-              )
-            })}</div>
+            <div className='signerAccounts'>
+              {signer.addresses.slice(startIndex, startIndex + addressLimit).map((address, index) => {
+                const added = this.store('main.accounts', address.toLowerCase())
+                return (
+                  <div
+                    key={address}
+                    className={!added ? 'signerAccount' : 'signerAccount signerAccountAdded'}
+                    onClick={() => {
+                      if (this.store('main.accounts', address.toLowerCase())) {
+                        link.rpc('removeAccount', address, {}, () => {})
+                      } else {
+                        link.rpc('createAccount', address, { type: signer.type }, (e) => {
+                          if (e) console.error(e)
+                        })
+                      }
+                    }}
+                  >
+                    <div className='signerAccountIndex'>{index + 1 + startIndex}</div>
+                    <div className='signerAccountAddress'>
+                      {address.substr(0, 11)} {svg.octicon('kebab-horizontal', { height: 20 })}{' '}
+                      {address.substr(address.length - 10)}
+                    </div>
+                    <div className='signerAccountCheck' />
+                  </div>
+                )
+              })}
+            </div>
             <div className='signerBottom'>
-              <div className='signerBottomPageBack' onMouseDown={() => this.nextPage(true)}>{svg.triangleLeft(20)}</div>
-              <div className='signerBottomPages'>{(page + 1) + ' / ' + Math.ceil(signer.addresses.length / addressLimit)}</div>
-              <div className='signerBottomPageNext' onMouseDown={() => this.nextPage()}>{svg.triangleLeft(20)}</div>
+              <div className='signerBottomPageBack' onMouseDown={() => this.nextPage(true)}>
+                {svg.triangleLeft(20)}
+              </div>
+              <div className='signerBottomPages'>
+                {page + 1 + ' / ' + Math.ceil(signer.addresses.length / addressLimit)}
+              </div>
+              <div className='signerBottomPageNext' onMouseDown={() => this.nextPage()}>
+                {svg.triangleLeft(20)}
+              </div>
             </div>
           </>
         ) : this.props.type === 'trezor' && (status === 'need pin' || status === 'enter passphrase') ? (
           <div className='signerInterface'>
             {this.renderTrezorPin(this.props.type === 'trezor' && status === 'need pin')}
             {this.renderTrezorPhrase(this.props.type === 'trezor' && status === 'enter passphrase')}
-          </div> 
+          </div>
         ) : loading ? (
           <div className='signerLoading'>
             <div className='signerLoadingLoader' />
           </div>
-        ): <></>}
+        ) : (
+          <></>
+        )}
         {disconnected || this.props.inSetup ? null : (
           <div className='signerDrawer'>
             <div className='showControls' onMouseDown={() => this.setState({ showControls: !this.state.showControls })}>
@@ -358,12 +382,8 @@ class Signer extends React.Component {
           <div className='signerControls cardShow'>
             {!!permissionId ? (
               <div className='signerControlDetail'>
-                <div className='signerControlDetailKey'>
-                  {'PERMISSION ID:'}
-                </div>
-                <div className='signerControlDetailValue'>
-                  {permissionId}
-                </div>
+                <div className='signerControlDetailKey'>{'PERMISSION ID:'}</div>
+                <div className='signerControlDetailValue'>{permissionId}</div>
               </div>
             ) : null}
             {/* <div className='signerControlOption'>Hide empty accounts</div>
@@ -371,17 +391,27 @@ class Signer extends React.Component {
             <div className='signerControlOption'>Deactivte all Accounts</div>
             <div className='signerControlOption'>Reload Signer</div>
             <div className='signerControlOption signerControlOptionEffect'>Lock Signer</div> */}
-            <div className='signerControlOption' onMouseDown={() => {
-              link.send('dash:reloadSigner', this.props.id)
-            }}>{hwSigner ? 'Reconnect' : 'Reload Signer'}</div>
-            <div className='signerControlOption signerControlOptionImportant' onMouseDown={() => {
-              link.send('dash:removeSigner', this.props.id)
-            }}>Remove Signer</div>
+            <div
+              className='signerControlOption'
+              onMouseDown={() => {
+                link.send('dash:reloadSigner', this.props.id)
+              }}
+            >
+              {hwSigner ? 'Reconnect' : 'Reload Signer'}
+            </div>
+            <div
+              className='signerControlOption signerControlOptionImportant'
+              onMouseDown={() => {
+                link.send('dash:removeSigner', this.props.id)
+              }}
+            >
+              Remove Signer
             </div>
+          </div>
         ) : null}
       </div>
     )
   }
 }
 
-export default Restore.connect(Signer)
\ No newline at end of file
+export default Restore.connect(Signer)
diff --git a/dash/App/Accounts/index.js b/dash/App/Accounts/index.js
index e955b8745..5008b6241 100644
--- a/dash/App/Accounts/index.js
+++ b/dash/App/Accounts/index.js
@@ -15,79 +15,78 @@ import AddKeystore from './Add/AddKeystore'
 import AddAddress from './Add/AddAddress'
 
 class AddAccounts extends React.Component {
-  constructor (...args) {
+  constructor(...args) {
     super(...args)
     this.state = {
-      view: 'default'
+      view: 'default',
     }
   }
-  renderAddNonsigning () {
+  renderAddNonsigning() {
     return (
       <div className='addAccounts cardShow'>
-       <AddAddress close={this.props.close} />          
+        <AddAddress close={this.props.close} />
       </div>
     )
   }
-  renderAddKeyring () {
+  renderAddKeyring() {
     return (
       <div className='addAccounts cardShow'>
         <AddRing close={this.props.close} />
       </div>
     )
   }
-  renderAddKeystore () {
+  renderAddKeystore() {
     return (
       <div className='addAccounts cardShow'>
         <AddKeystore close={this.props.close} />
       </div>
     )
   }
-  renderAddSeed () {
+  renderAddSeed() {
     return (
       <div className='addAccounts cardShow'>
-       <AddPhrase close={this.props.close} />
+        <AddPhrase close={this.props.close} />
       </div>
     )
   }
-  renderAddTrezor () {
+  renderAddTrezor() {
     return (
       <div className='addAccounts cardShow'>
-       <AddHardware type={'trezor'} close={this.props.close} />
+        <AddHardware type={'trezor'} close={this.props.close} />
       </div>
     )
   }
-  renderAddLedger () {
+  renderAddLedger() {
     return (
       <div className='addAccounts cardShow'>
-       <AddHardware type={'ledger'} close={this.props.close} />
+        <AddHardware type={'ledger'} close={this.props.close} />
       </div>
     )
   }
-  renderAddLattice () {
+  renderAddLattice() {
     return (
       <div className='addAccounts cardShow'>
-       <AddHardwareLattice type={'lattice'} close={this.props.close} />
+        <AddHardwareLattice type={'lattice'} close={this.props.close} />
       </div>
     )
   }
-  renderAddGnosis () {
-    return (
-      <div className='addAccounts cardShow'>
-       {'Add Gnosis'}
-      </div>
-    )
+  renderAddGnosis() {
+    return <div className='addAccounts cardShow'>{'Add Gnosis'}</div>
   }
-  renderAddAragon () {
+  renderAddAragon() {
     return (
       <div className='addAccounts cardShow'>
         <AddAragon close={this.props.close} />
       </div>
     )
   }
-  createNewAccount (type) {
-    link.send('tray:action', 'navDash', { view: 'accounts', data: { showAddAccounts: true, newAccountType: type } })
+  createNewAccount(type) {
+    link.send('tray:action', 'navDash', {
+      view: 'accounts',
+      data: { showAddAccounts: true, newAccountType: type },
+    })
   }
-  renderDefault () {
+  renderDefault() {
     return (
       <div className='addAccounts cardShow'>
         <div className='addAccountsHeader'>
@@ -130,25 +129,25 @@ class AddAccounts extends React.Component {
       </div>
     )
   }
-  render () {
+  render() {
     console.log('this.props', this.props)
     const { newAccountType } = this.props.data
-    
-    if (newAccountType === 'aragon')  {
+
+    if (newAccountType === 'aragon') {
       return this.renderAddAragon()
-    } else if (newAccountType === 'ledger')  {
+    } else if (newAccountType === 'ledger') {
       return this.renderAddLedger()
-    } else if (newAccountType === 'trezor')  {
+    } else if (newAccountType === 'trezor') {
       return this.renderAddTrezor()
-    } else if (newAccountType === 'lattice')  {
+    } else if (newAccountType === 'lattice') {
       return this.renderAddLattice()
-    } else if (newAccountType === 'seed')  {
+    } else if (newAccountType === 'seed') {
       return this.renderAddSeed()
-    } else if (newAccountType === 'keyring')  {
+    } else if (newAccountType === 'keyring') {
       return this.renderAddKeyring()
-    } else if (newAccountType === 'keystore')  {
+    } else if (newAccountType === 'keystore') {
       return this.renderAddKeystore()
-    } else if (newAccountType === 'nonsigning')  {
+    } else if (newAccountType === 'nonsigning') {
       return this.renderAddNonsigning()
     } else {
       return this.renderDefault()
@@ -158,82 +157,82 @@ class AddAccounts extends React.Component {
 
 class Dash extends React.Component {
   constructor(props, context) {
-    super(props, context);
+    super(props, context)
     this.input = React.createRef()
     this.state = {
-      showAddAccounts: false
+      showAddAccounts: false,
     }
   }
-  render () {
-    const hardwareSigners = Object.keys(this.store('main.signers')).map(s => {
-      const signer = this.store('main.signers', s)
-      if (
-        signer.type === 'ledger' || 
-        signer.type === 'trezor' ||
-        signer.type === 'lattice'
-      ) {
-        return signer
-      } else {
-        return false
-      }
-    }).filter(s => s)
-    const hotSigners = Object.keys(this.store('main.signers')).map(s => {
-      const signer = this.store('main.signers', s)
-      if (
-        signer.type === 'seed' || 
-        signer.type === 'ring'
-      ) {
-        return signer
-      } else {
-        return false
-      }
-    }).filter(s => s)
+  render() {
+    const hardwareSigners = Object.keys(this.store('main.signers'))
+      .map((s) => {
+        const signer = this.store('main.signers', s)
+        if (signer.type === 'ledger' || signer.type === 'trezor' || signer.type === 'lattice') {
+          return signer
+        } else {
+          return false
+        }
+      })
+      .filter((s) => s)
+    const hotSigners = Object.keys(this.store('main.signers'))
+      .map((s) => {
+        const signer = this.store('main.signers', s)
+        if (signer.type === 'seed' || signer.type === 'ring') {
+          return signer
+        } else {
+          return false
+        }
+      })
+      .filter((s) => s)
 
     const { showAddAccounts } = this.props.data
-    return (   
-      showAddAccounts ? (
-        <AddAccounts 
-          close={() => link.send('tray:action', 'navDash', { view: 'accounts', data: { showAddAccounts: false } })} 
-          {...this.props}
-        /> 
-       ) : (
-        <div className='cardShow'>
-          <div className='newAccount' onClick={() => link.send('tray:action', 'navDash', { view: 'accounts', data: { showAddAccounts: true } })}>
-            <div className='newAccountIcon'>{svg.plus(16)}</div> 
-            Add New Account
-          </div>
-          <div className='signers'>
-            <div className='signersMid'>
-              <div className='signersHeader'>
-                Your Hardware Signers
-              </div>
-              <div className='signersList'>
-                {hardwareSigners.length ? (
-                  hardwareSigners
-                    .sort((a, b) => (b.createdAt || 0) - (a.createdAt || 0))
-                    .map((signer, index) => <Signer index={index} key={signer.id} {...signer} />)
-                ) : (
-                  <div className='noSigners'>
-                    {'No hardware signers detected'}
-                  </div>
-                )}
-              </div>
-              <div className='signersHeader'>
-                Your Hot Signers
-              </div>
-              <div className='signersList'>
-                {hotSigners.length ? (
-                  hotSigners.map((signer, index) => <Signer index={index} key={signer.id} {...signer} />)
-                ) : (
-                  <div className='noSigners'>
-                    {'No hot signers detected'}
-                  </div>
-                )}
-              </div>
+    return showAddAccounts ? (
+      <AddAccounts
+        close={() =>
+          link.send('tray:action', 'navDash', {
+            view: 'accounts',
+            data: { showAddAccounts: false },
+          })
+        }
+        {...this.props}
+      />
+    ) : (
+      <div className='cardShow'>
+        <div
+          className='newAccount'
+          onClick={() =>
+            link.send('tray:action', 'navDash', {
+              view: 'accounts',
+              data: { showAddAccounts: true },
+            })
+          }
+        >
+          <div className='newAccountIcon'>{svg.plus(16)}</div>
+          Add New Account
+        </div>
+        <div className='signers'>
+          <div className='signersMid'>
+            <div className='signersHeader'>Your Hardware Signers</div>
+            <div className='signersList'>
+              {hardwareSigners.length ? (
+                hardwareSigners
+                  .sort((a, b) => (b.createdAt || 0) - (a.createdAt || 0))
+                  .map((signer, index) => <Signer index={index} key={signer.id} {...signer} />)
+              ) : (
+                <div className='noSigners'>{'No hardware signers detected'}</div>
+              )}
+            </div>
+            <div className='signersHeader'>Your Hot Signers</div>
+            <div className='signersList'>
+              {hotSigners.length ? (
+                hotSigners.map((signer, index) => <Signer index={index} key={signer.id} {...signer} />)
+              ) : (
+                <div className='noSigners'>{'No hot signers detected'}</div>
+              )}
             </div>
           </div>
         </div>
-      )
+      </div>
     )
   }
 }
diff --git a/dash/App/Chains/Connection/index.js b/dash/App/Chains/Connection/index.js
index 686ec2306..a46ed2979 100644
--- a/dash/App/Chains/Connection/index.js
+++ b/dash/App/Chains/Connection/index.js
@@ -25,19 +25,18 @@ const ConnectionIndicator = ({ className, connection }) => {
   return <div className={`${className}${status}`} />
 }
 
-const ConnectionStatus = ({ connection }) => 
+const ConnectionStatus = ({ connection }) => (
   <>
-    <ConnectionIndicator className="sliceTileIndicatorLarge sliceTileIndicator" connection={connection} />
-    <div className="sliceTileConnectionName"> 
-      {connection.current}
-    </div>
+    <ConnectionIndicator className='sliceTileIndicatorLarge sliceTileIndicator' connection={connection} />
+    <div className='sliceTileConnectionName'>{connection.current}</div>
   </>
+)
 
-function isConnected ({ status }) {
+function isConnected({ status }) {
   return status !== 'disconnected'
 }
 
-function getActiveConnection (primary, secondary) {
+function getActiveConnection(primary, secondary) {
   if (secondary.on && (!primary.on || (isConnected(secondary) && !isConnected(primary)))) {
     return secondary
   }
@@ -46,19 +45,20 @@ function getActiveConnection (primary, secondary) {
 }
 
 class ChainModule extends React.Component {
-  constructor (props, context) {
+  constructor(props, context) {
     super(props, context)
 
     this.customMessage = 'Custom Endpoint'
 
     const { id, type } = props
     const primaryCustom = context.store('main.networks', type, id, 'connection.primary.custom') || this.customMessage
-    const secondaryCustom = context.store('main.networks', type, id, 'connection.secondary.custom') || this.customMessage
+    const secondaryCustom =
+      context.store('main.networks', type, id, 'connection.secondary.custom') || this.customMessage
 
     this.state = {
-      expanded: false,      
-      primaryCustom, 
-      secondaryCustom, 
+      expanded: false,
+      primaryCustom,
+      secondaryCustom,
     }
 
     this.ref = createRef()
@@ -78,11 +78,11 @@ class ChainModule extends React.Component {
   //   document.removeEventListener('click', this.clickHandler.bind(this))
   // }
 
-  renderConnection (id, { primary, secondary }, blockHeight) {
+  renderConnection(id, { primary, secondary }, blockHeight) {
     const connection = getActiveConnection(primary, secondary)
 
     return (
-      <div 
+      <div
         className='sliceTile sliceTileClickable'
         onClick={() => {
           this.setState({ expanded: !this.state.expanded })
@@ -99,7 +99,7 @@ class ChainModule extends React.Component {
     )
   }
 
-  status (type, id, layer) {
+  status(type, id, layer) {
     const { status, network, current } = this.store('main.networks', type, id, 'connection', layer)
 
     if (status === 'connected' && !network) return 'loading'
@@ -116,20 +116,20 @@ class ChainModule extends React.Component {
     return status
   }
 
-  renderConnectionStatus (type, id, layer) {
+  renderConnectionStatus(type, id, layer) {
     const status = this.status(type, id, layer)
 
     return (
-      <div className="connectionOptionStatus">
-        <div className="connectionOptionStatusIndicator">
-          <ConnectionIndicator className="connectionOptionStatusIndicator" connection={{ status }} />
+      <div className='connectionOptionStatus'>
+        <div className='connectionOptionStatusIndicator'>
+          <ConnectionIndicator className='connectionOptionStatusIndicator' connection={{ status }} />
         </div>
-        <div className="connectionOptionStatusText">{status}</div>
+        <div className='connectionOptionStatusText'>{status}</div>
       </div>
     )
   }
 
-  render () {
+  render() {
     const { id, type, connection } = this.props
 
     const networkMeta = this.store('main.networksMeta.ethereum', id)
@@ -137,8 +137,8 @@ class ChainModule extends React.Component {
     const renderStatus = this.renderConnectionStatus.bind(this, type, id)
 
     let presets = networkPresets[id] || {}
-    presets = Object.keys(presets).map(i => ({ text: i, value: `${type}:${id}:${i}` }))
-    presets = presets.concat(Object.keys(networkPresets.default).map(i => ({ text: i, value: `${type}:${id}:${i}` })))
+    presets = Object.keys(presets).map((i) => ({ text: i, value: `${type}:${id}:${i}` }))
+    presets = presets.concat(Object.keys(networkPresets.default).map((i) => ({ text: i, value: `${type}:${id}:${i}` })))
     presets.push({ text: 'Custom', value: `${type}:${id}:custom` })
 
     const customFocusHandler = (inputName) => {
@@ -171,7 +171,10 @@ class ChainModule extends React.Component {
       // status can be updated
       if (!value || !isInvalidCustomTarget(value)) {
         const actionName = `set${capitalize(inputName)}Custom`
-        this[timeoutName] = setTimeout(() => link.send('tray:action', actionName, type, id, value === this.customMessage ? '' : value), 1000)
+        this[timeoutName] = setTimeout(
+          () => link.send('tray:action', actionName, type, id, value === this.customMessage ? '' : value),
+          1000
+        )
       }
     }
 
@@ -184,7 +187,14 @@ class ChainModule extends React.Component {
               <div className={connection.primary.on ? 'connectionOption connectionOptionOn' : 'connectionOption'}>
                 <div className='connectionOptionToggle'>
                   <div className='signerPermissionSetting'>Primary</div>
-                  <div className={connection.primary.on ? 'signerPermissionToggleSmall signerPermissionToggleSmallOn' : 'signerPermissionToggleSmall'} onMouseDown={_ => link.send('tray:action', 'toggleConnection', type, id, 'primary')}>
+                  <div
+                    className={
+                      connection.primary.on
+                        ? 'signerPermissionToggleSmall signerPermissionToggleSmallOn'
+                        : 'signerPermissionToggleSmall'
+                    }
+                    onMouseDown={(_) => link.send('tray:action', 'toggleConnection', type, id, 'primary')}
+                  >
                     <div className='signerPermissionToggleSwitch' />
                   </div>
                 </div>
@@ -195,7 +205,7 @@ class ChainModule extends React.Component {
                         {renderStatus('primary')}
                         <Dropdown
                           syncValue={`${type}:${id}:${connection.primary.current}`}
-                          onChange={preset => {
+                          onChange={(preset) => {
                             const [type, id, value] = preset.split(':')
                             link.send('tray:action', 'selectPrimary', type, id, value)
                           }}
@@ -203,14 +213,20 @@ class ChainModule extends React.Component {
                         />
                       </div>
                     </div>
-                    <div className={connection.primary.current === 'custom' && connection.primary.on ? 'connectionCustomInput connectionCustomInputOn cardShow' : 'connectionCustomInput'}>
-                      <input 
+                    <div
+                      className={
+                        connection.primary.current === 'custom' && connection.primary.on
+                          ? 'connectionCustomInput connectionCustomInputOn cardShow'
+                          : 'connectionCustomInput'
+                      }
+                    >
+                      <input
                         className='customInput'
                         tabIndex='-1'
                         value={this.state.primaryCustom}
-                        onFocus={() => customFocusHandler('primary')} 
+                        onFocus={() => customFocusHandler('primary')}
                         onBlur={() => customBlurHandler('primary')}
-                        onChange={e => customChangeHandler(e, 'primary')}
+                        onChange={(e) => customChangeHandler(e, 'primary')}
                       />
                     </div>
                   </>
@@ -221,7 +237,14 @@ class ChainModule extends React.Component {
               <div className={connection.secondary.on ? 'connectionOption connectionOptionOn' : 'connectionOption'}>
                 <div className='connectionOptionToggle'>
                   <div className='signerPermissionSetting'>Secondary</div>
-                  <div className={connection.secondary.on ? 'signerPermissionToggleSmall signerPermissionToggleSmallOn' : 'signerPermissionToggleSmall'} onMouseDown={_ => link.send('tray:action', 'toggleConnection', type, id, 'secondary')}>
+                  <div
+                    className={
+                      connection.secondary.on
+                        ? 'signerPermissionToggleSmall signerPermissionToggleSmallOn'
+                        : 'signerPermissionToggleSmall'
+                    }
+                    onMouseDown={(_) => link.send('tray:action', 'toggleConnection', type, id, 'secondary')}
+                  >
                     <div className='signerPermissionToggleSwitch' />
                   </div>
                 </div>
@@ -232,7 +255,7 @@ class ChainModule extends React.Component {
                         {renderStatus('secondary')}
                         <Dropdown
                           syncValue={`${type}:${id}:${connection.secondary.current}`}
-                          onChange={preset => {
+                          onChange={(preset) => {
                             const [type, id, value] = preset.split(':')
                             link.send('tray:action', 'selectSecondary', type, id, value)
                           }}
@@ -240,20 +263,26 @@ class ChainModule extends React.Component {
                         />
                       </div>
                     </div>
-                    <div className={connection.secondary.current === 'custom' && connection.secondary.on ? 'connectionCustomInput connectionCustomInputOn cardShow' : 'connectionCustomInput'}>
-                      <input 
-                        tabIndex='-1' 
-                        value={this.state.secondaryCustom} 
-                        onFocus={() => customFocusHandler('secondary')} 
-                        onBlur={() => customBlurHandler('secondary')} 
-                        onChange={e => customChangeHandler(e, 'secondary')} 
+                    <div
+                      className={
+                        connection.secondary.current === 'custom' && connection.secondary.on
+                          ? 'connectionCustomInput connectionCustomInputOn cardShow'
+                          : 'connectionCustomInput'
+                      }
+                    >
+                      <input
+                        tabIndex='-1'
+                        value={this.state.secondaryCustom}
+                        onFocus={() => customFocusHandler('secondary')}
+                        onBlur={() => customBlurHandler('secondary')}
+                        onChange={(e) => customChangeHandler(e, 'secondary')}
                       />
                     </div>
                   </>
                 ) : null}
               </div>
             </div>
-          </div>   
+          </div>
         ) : null}
       </div>
     )
diff --git a/dash/App/Chains/Gas/index.js b/dash/App/Chains/Gas/index.js
index a4fe59b18..73f723ebe 100644
--- a/dash/App/Chains/Gas/index.js
+++ b/dash/App/Chains/Gas/index.js
@@ -12,62 +12,94 @@ const gasToSendToken = 65 * 1000
 const gasForDexSwap = 200 * 1000
 
 class Gas extends React.Component {
-  constructor (...args) {
+  constructor(...args) {
     super(...args)
     this.state = {
-      expand: false
+      expand: false,
     }
   }
-  renderFeeTime (time) {
-    if (!time) return <>?<span className='timeUnit'>?</span></>
-    if (time < 60) return <><span className='timeUnit'>~</span>{time}<span className='timeUnit'>s</span></>
-    if (time < 3600) return <><span className='timeUnit'>~</span>{Math.round(time / 60)}<span className='timeUnit'>m</span></>
-    return <><span className='timeUnit'>~</span>{Math.round(time / 3600)}<span className='timeUnit'>h</span></>
+  renderFeeTime(time) {
+    if (!time)
+      return (
+        <>
+          ?<span className='timeUnit'>?</span>
+        </>
+      )
+    if (time < 60)
+      return (
+        <>
+          <span className='timeUnit'>~</span>
+          {time}
+          <span className='timeUnit'>s</span>
+        </>
+      )
+    if (time < 3600)
+      return (
+        <>
+          <span className='timeUnit'>~</span>
+          {Math.round(time / 60)}
+          <span className='timeUnit'>m</span>
+        </>
+      )
+    return (
+      <>
+        <span className='timeUnit'>~</span>
+        {Math.round(time / 3600)}
+        <span className='timeUnit'>h</span>
+      </>
+    )
   }
-  toDisplayUSD (bn) {
+  toDisplayUSD(bn) {
     return parseFloat(
-      bn.toNumber() >= 1 ? bn.toFixed(0, BigNumber.ROUND_UP).toString() :
-      bn.toFixed(2, BigNumber.ROUND_UP).toString()     
+      bn.toNumber() >= 1 ? bn.toFixed(0, BigNumber.ROUND_UP).toString() : bn.toFixed(2, BigNumber.ROUND_UP).toString()
     )
   }
-  roundGwei (gwei) {
+  roundGwei(gwei) {
     if (gwei && gwei < 0.001) return '‹0.001'
     return parseFloat(
-      gwei >= 10 ? Math.round(gwei) :
-      gwei >= 5 ? Math.round(gwei * 10) / 10 :
-      gwei >= 1 ? Math.round(gwei * 100) / 100 :
-      Math.round(gwei * 1000) / 1000
+      gwei >= 10
+        ? Math.round(gwei)
+        : gwei >= 5
+        ? Math.round(gwei * 10) / 10
+        : gwei >= 1
+        ? Math.round(gwei * 100) / 100
+        : Math.round(gwei * 1000) / 1000
     )
   }
-  levelDisplay (level) {
-    const gwei = weiToGwei(hexToInt(level)) 
+  levelDisplay(level) {
+    const gwei = weiToGwei(hexToInt(level))
     return this.roundGwei(gwei) || 0
   }
 
-  txEstimate (value, gasLimit, nativeUSD) {
-    return this.toDisplayUSD(BigNumber(value * gasLimit).shiftedBy(-9).multipliedBy(nativeUSD))
+  txEstimate(value, gasLimit, nativeUSD) {
+    return this.toDisplayUSD(
+      BigNumber(value * gasLimit)
+        .shiftedBy(-9)
+        .multipliedBy(nativeUSD)
+    )
   }
 
-  txEstimates (type, id, gasPrice, calculatedFees, currentSymbol) {
-
+  txEstimates(type, id, gasPrice, calculatedFees, currentSymbol) {
     const estimates = [
       {
         label: 'Send ' + currentSymbol,
-        estimatedGas: gasToSendEth
+        estimatedGas: gasToSendEth,
       },
       {
         label: 'Send Tokens',
-        estimatedGas: gasToSendToken
+        estimatedGas: gasToSendToken,
       },
       {
         label: 'Dex Swap',
-        estimatedGas: gasForDexSwap
-      }
+        estimatedGas: gasForDexSwap,
+      },
     ]
 
     const layer = this.store('main.networks', type, id, 'layer')
     const nativeCurrency = this.store('main.networksMeta', type, id, 'nativeCurrency')
-    const nativeUSD = BigNumber(nativeCurrency && nativeCurrency.usd && layer !== 'testnet' ? nativeCurrency.usd.price : 0)
+    const nativeUSD = BigNumber(
+      nativeCurrency && nativeCurrency.usd && layer !== 'testnet' ? nativeCurrency.usd.price : 0
+    )
 
     if (id === 10) {
       // Optimism specific calculations
@@ -84,27 +116,23 @@ class Gas extends React.Component {
         return this.toDisplayUSD(l1Estimate.plus(l2Estimate).shiftedBy(-9).multipliedBy(nativeUSD))
       }
 
-      return estimates.map(({ label, estimatedGas }, i) => (
-        {
-          low: optimismEstimate(l1GasEstimates[i], estimatedGas),
-          high: optimismEstimate(l1GasEstimates[i], estimatedGas),
-          label
-        }
-      ))
+      return estimates.map(({ label, estimatedGas }, i) => ({
+        low: optimismEstimate(l1GasEstimates[i], estimatedGas),
+        high: optimismEstimate(l1GasEstimates[i], estimatedGas),
+        label,
+      }))
     } else {
       const low = calculatedFees ? this.roundGwei(calculatedFees.actualBaseFee + calculatedFees.priorityFee) : gasPrice
 
-      return estimates.map(({ label, estimatedGas }) => (
-        {
-          low: this.txEstimate(low, estimatedGas, nativeUSD),
-          high: this.txEstimate(gasPrice, estimatedGas, nativeUSD),
-          label
-        }
-      ))
+      return estimates.map(({ label, estimatedGas }) => ({
+        low: this.txEstimate(low, estimatedGas, nativeUSD),
+        high: this.txEstimate(gasPrice, estimatedGas, nativeUSD),
+        label,
+      }))
     }
   }
 
-  renderSummary () {
+  renderSummary() {
     const type = 'ethereum'
     const { id } = this.props
     const levels = this.store('main.networksMeta', type, id, 'gas.price.levels')
@@ -112,34 +140,42 @@ class Gas extends React.Component {
     const currentSymbol = this.store('main.networks', type, id, 'symbol') || 'ETH'
     const gasPrice = this.levelDisplay(levels.fast)
 
-    const { nextBaseFee, maxPriorityFeePerGas } = (fees || {})
+    const { nextBaseFee, maxPriorityFeePerGas } = fees || {}
 
     const calculatedFees = {
-      actualBaseFee: this.roundGwei((weiToGwei(hexToInt(nextBaseFee)))),
-      priorityFee: this.levelDisplay(maxPriorityFeePerGas)
+      actualBaseFee: this.roundGwei(weiToGwei(hexToInt(nextBaseFee))),
+      priorityFee: this.levelDisplay(maxPriorityFeePerGas),
     }
 
     const feeEstimatesUSD = this.txEstimates(type, id, gasPrice, fees ? calculatedFees : null, currentSymbol)
 
     return (
-      <div 
+      <div
         className='sliceTile sliceTileClickable'
         onClick={() => {
           this.setState({ expanded: !this.state.expanded })
         }}
       >
-        <div className='sliceTileGasPrice'> 
+        <div className='sliceTileGasPrice'>
           <div className='sliceTileGasPriceIcon'>{svg.gas(9)}</div>
           <div className='sliceTileGasPriceNumber'>{gasPrice}</div>
           <div className='sliceTileGasPriceUnit'>{'gwei'}</div>
         </div>
         <div className='sliceGasEstimateBlock'>
-          {feeEstimatesUSD.map((estimate) =>{
+          {feeEstimatesUSD.map((estimate) => {
             return (
               <div className='gasEstimate'>
                 <div className='gasEstimateRange'>
                   <span className='gasEstimateSymbol'>{!estimate.low || estimate.low >= 0.01 ? `$` : '<$'}</span>
-                  <span className='gasEstimateRangeLow'>{`${!estimate.low ? 0 : estimate.low < 0.01 ? 0.01 : estimate.low < 1 ? estimate.low.toFixed(2) : estimate.low}`}</span>
+                  <span className='gasEstimateRangeLow'>{`${
+                    !estimate.low
+                      ? 0
+                      : estimate.low < 0.01
+                      ? 0.01
+                      : estimate.low < 1
+                      ? estimate.low.toFixed(2)
+                      : estimate.low
+                  }`}</span>
                 </div>
                 <div className='gasEstimateLabel'>{estimate.label}</div>
               </div>
@@ -150,7 +186,7 @@ class Gas extends React.Component {
     )
   }
 
-  render () {
+  render() {
     // const { type, id } = this.store('main.currentNetwork')
     const type = 'ethereum'
     const { id } = this.props
@@ -159,14 +195,13 @@ class Gas extends React.Component {
     const currentSymbol = this.store('main.networks', type, id, 'symbol') || 'ETH'
     const gasPrice = this.levelDisplay(levels.fast)
 
-    const { nextBaseFee, maxPriorityFeePerGas } = (fees || {})
+    const { nextBaseFee, maxPriorityFeePerGas } = fees || {}
 
     const calculatedFees = {
-      actualBaseFee: this.roundGwei((weiToGwei(hexToInt(nextBaseFee)))),
-      priorityFee: this.levelDisplay(maxPriorityFeePerGas)
+      actualBaseFee: this.roundGwei(weiToGwei(hexToInt(nextBaseFee))),
+      priorityFee: this.levelDisplay(maxPriorityFeePerGas),
     }
 
-
     return (
       <div className='sliceContainer' ref={this.ref}>
         {/* <div className='moduleHeader'>{'Fee Monitor'}</div>   */}
@@ -174,48 +209,52 @@ class Gas extends React.Component {
         {this.renderSummary()}
         {this.state.expanded ? (
           <div className='sliceGasBlock'>
-            {this.state.baseHover ? <div className='feeToolTip feeToolTipBase cardShow'>The current base fee is added with a buffer to cover the next 3 blocks, any amount greater than your block's base fee is refunded</div> : null}
-            {this.state.prioHover ? <div className='feeToolTip feeToolTipPriority cardShow'>A priority tip paid to validators is added to incentivize quick inclusion of your transaction into a block</div> : null }
-            <div className='gasItem gasItemSmall' style={ !fees ? { pointerEvents: 'none', opacity: 0 } : {}}>
-              <div className='gasGweiNum'>
-                {calculatedFees.actualBaseFee}
-              </div >
+            {this.state.baseHover ? (
+              <div className='feeToolTip feeToolTipBase cardShow'>
+                The current base fee is added with a buffer to cover the next 3 blocks, any amount greater than your
+                block's base fee is refunded
+              </div>
+            ) : null}
+            {this.state.prioHover ? (
+              <div className='feeToolTip feeToolTipPriority cardShow'>
+                A priority tip paid to validators is added to incentivize quick inclusion of your transaction into a
+                block
+              </div>
+            ) : null}
+            <div className='gasItem gasItemSmall' style={!fees ? { pointerEvents: 'none', opacity: 0 } : {}}>
+              <div className='gasGweiNum'>{calculatedFees.actualBaseFee}</div>
               <span className='gasGweiLabel'>{'GWEI'}</span>
               <span className='gasLevelLabel'>{'Current Base'}</span>
             </div>
             <div className='gasItem gasItemLarge'>
-              <div 
-                className='gasArrow' 
+              <div
+                className='gasArrow'
                 onClick={() => this.setState({ baseHover: true })}
-                style={ !fees ? { pointerEvents: 'none', opacity: 0 } : {}}
+                style={!fees ? { pointerEvents: 'none', opacity: 0 } : {}}
                 onMouseLeave={() => this.setState({ baseHover: false })}
               >
                 <div className='gasArrowNotify'>+</div>
                 <div className='gasArrowInner'>{svg.chevron(27)}</div>
               </div>
-              <div  className='gasGweiNum'>
-                {gasPrice}
-              </div >
+              <div className='gasGweiNum'>{gasPrice}</div>
               <span className='gasGweiLabel'>{'GWEI'}</span>
               <span className='gasLevelLabel'>{'Recommended'}</span>
-              <div 
+              <div
                 className='gasArrow gasArrowRight'
-                style={ !fees ? { pointerEvents: 'none', opacity: 0 } : {}}
+                style={!fees ? { pointerEvents: 'none', opacity: 0 } : {}}
                 onClick={() => this.setState({ prioHover: true })}
                 onMouseLeave={() => this.setState({ prioHover: false })}
               >
                 <div className='gasArrowInner'>{svg.chevron(27)}</div>
               </div>
             </div>
-            <div className='gasItem gasItemSmall' style={ !fees ? { pointerEvents: 'none', opacity: 0 } : {}}>
-              <div  className='gasGweiNum'>
-                {calculatedFees.priorityFee}
-              </div >
+            <div className='gasItem gasItemSmall' style={!fees ? { pointerEvents: 'none', opacity: 0 } : {}}>
+              <div className='gasGweiNum'>{calculatedFees.priorityFee}</div>
               <span className='gasGweiLabel'>{'GWEI'}</span>
               <span className='gasLevelLabel'>{'Priority Tip'}</span>
             </div>
           </div>
-        ) : null }
+        ) : null}
       </div>
     )
   }
diff --git a/dash/App/Chains/Tokens/index.js b/dash/App/Chains/Tokens/index.js
index da00ff390..671d1af7a 100644
--- a/dash/App/Chains/Tokens/index.js
+++ b/dash/App/Chains/Tokens/index.js
@@ -5,10 +5,10 @@ import link from '../../../../resources/link'
 import svg from '../../../../resources/svg'
 
 class ChainModule extends React.Component {
-  constructor (...args) {
+  constructor(...args) {
     super(...args)
     this.state = {
-      expanded: false
+      expanded: false,
     }
     this.ref = createRef()
   }
@@ -27,22 +27,24 @@ class ChainModule extends React.Component {
   //   document.removeEventListener('click', this.clickHandler.bind(this))
   // }
 
-  renderConnection (origin, id) {
+  renderConnection(origin, id) {
     return (
-      <div 
+      <div
         className='sliceTile sliceTileClickable'
         onClick={() => {
-          link.send('tray:action', 'navDash', { view: 'notify', data: { notify: 'customTokens', notifyData: {} }})
+          link.send('tray:action', 'navDash', {
+            view: 'notify',
+            data: { notify: 'customTokens', notifyData: {} },
+          })
         }}
       >
         <div className='sliceTileTokens'>
           <div>{'Manage Tokens'}</div>
         </div>
-        
       </div>
     )
   }
-  status (type, id, layer) {
+  status(type, id, layer) {
     const connection = this.store('main.networks', type, id, 'connection', layer)
     let status = connection.status
     const current = connection.current
@@ -53,7 +55,11 @@ class ChainModule extends React.Component {
         else if (!this.okPort(this.state.primaryCustom)) status = 'invalid port'
       }
 
-      if (layer === 'secondary' && this.state.secondaryCustom !== '' && this.state.secondaryCustom !== this.customMessage) {
+      if (
+        layer === 'secondary' &&
+        this.state.secondaryCustom !== '' &&
+        this.state.secondaryCustom !== this.customMessage
+      ) {
         if (!this.okProtocol(this.state.secondaryCustom)) status = 'invalid target'
         else if (!this.okPort(this.state.secondaryCustom)) status = 'invalid port'
       }
@@ -68,30 +74,45 @@ class ChainModule extends React.Component {
       </div>
     )
   }
-  indicator (status) {
+  indicator(status) {
     if (status === 'connected') {
-      return <div className='connectionOptionStatusIndicator'><div className='connectionOptionStatusIndicatorGood' /></div>
+      return (
+        <div className='connectionOptionStatusIndicator'>
+          <div className='connectionOptionStatusIndicatorGood' />
+        </div>
+      )
     } else if (status === 'loading' || status === 'syncing' || status === 'pending' || status === 'standby') {
-      return <div className='connectionOptionStatusIndicator'><div className='connectionOptionStatusIndicatorPending' /></div>
+      return (
+        <div className='connectionOptionStatusIndicator'>
+          <div className='connectionOptionStatusIndicatorPending' />
+        </div>
+      )
     } else {
-      return <div className='connectionOptionStatusIndicator'><div className='connectionOptionStatusIndicatorBad' /></div>
+      return (
+        <div className='connectionOptionStatusIndicator'>
+          <div className='connectionOptionStatusIndicatorBad' />
+        </div>
+      )
     }
   }
-  render () {
+  render() {
     const { id, type, connection, changed } = this.props
 
     const networkPresets = this.store('main.networkPresets', type)
     let presets = networkPresets[id] || {}
-    presets = Object.keys(presets).map(i => ({ text: i, value: type + ':' + id + ':' + i }))
-    presets = presets.concat(Object.keys(networkPresets.default).map(i => ({ text: i, value: type + ':' + id + ':' + i })))
+    presets = Object.keys(presets).map((i) => ({ text: i, value: type + ':' + id + ':' + i }))
+    presets = presets.concat(
+      Object.keys(networkPresets.default).map((i) => ({
+        text: i,
+        value: type + ':' + id + ':' + i,
+      }))
+    )
     presets.push({ text: 'Custom', value: type + ':' + id + ':' + 'custom' })
 
     return (
       <div className='sliceContainer' ref={this.ref}>
         {this.renderConnection('connection', id)}
-        {this.state.expanded ? (
-          <div>{'HELLO'}</div>
-        ) : null}
+        {this.state.expanded ? <div>{'HELLO'}</div> : null}
       </div>
     )
   }
diff --git a/dash/App/Chains/Usage/index.js b/dash/App/Chains/Usage/index.js
index 896b065cd..aa19062f1 100644
--- a/dash/App/Chains/Usage/index.js
+++ b/dash/App/Chains/Usage/index.js
@@ -7,25 +7,29 @@ import svg from '../../../../resources/svg'
 const average = (array) => (array.reduce((a, b) => a + b) / array.length).toFixed(2)
 
 class _OriginModule extends React.Component {
-  constructor (...args) {
+  constructor(...args) {
     super(...args)
     this.state = {
       expanded: false,
       active: false,
       activeCount: 0,
       reqsAverage: 0,
-      reqsTimes: [1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1]
+      reqsTimes: [1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1],
     }
     this.ref = createRef()
   }
-  averageReqs () {
+  averageReqs() {
     const reqs = this.state.reqsTimes
     reqs.push(this.state.activeCount)
     reqs.shift()
-    this.setState({ reqsTimes: reqs, activeCount: 0, reqsAverage: (Math.round(average(reqs) * 100) / 100).toFixed(2) })
+    this.setState({
+      reqsTimes: reqs,
+      activeCount: 0,
+      reqsAverage: (Math.round(average(reqs) * 100) / 100).toFixed(2),
+    })
   }
 
-  componentDidMount () {
+  componentDidMount() {
     const setActiveRandom = () => {
       const isActive = Math.round(Math.random() * 1 + 0.3)
       if (isActive) {
@@ -59,49 +63,62 @@ class _OriginModule extends React.Component {
   //   document.removeEventListener('click', this.clickHandler.bind(this))
   // }
 
-  indicator (status) {
+  indicator(status) {
     if (status === 'connected') {
-      return <div className='connectionOptionStatusIndicator'><div className='connectionOptionStatusIndicatorGood' /></div>
+      return (
+        <div className='connectionOptionStatusIndicator'>
+          <div className='connectionOptionStatusIndicatorGood' />
+        </div>
+      )
     } else if (status === 'loading' || status === 'syncing' || status === 'pending' || status === 'standby') {
-      return <div className='connectionOptionStatusIndicator'><div className='connectionOptionStatusIndicatorPending' /></div>
+      return (
+        <div className='connectionOptionStatusIndicator'>
+          <div className='connectionOptionStatusIndicatorPending' />
+        </div>
+      )
     } else {
-      return <div className='connectionOptionStatusIndicator'><div className='connectionOptionStatusIndicatorBad' /></div>
+      return (
+        <div className='connectionOptionStatusIndicator'>
+          <div className='connectionOptionStatusIndicatorBad' />
+        </div>
+      )
     }
   }
-  render () {
+  render() {
     const { id, type, connection, changed, origin } = this.props
     const { active } = this.state
 
     const networkPresets = this.store('main.networkPresets', type)
     let presets = networkPresets[id] || {}
-    presets = Object.keys(presets).map(i => ({ text: i, value: type + ':' + id + ':' + i }))
-    presets = presets.concat(Object.keys(networkPresets.default).map(i => ({ text: i, value: type + ':' + id + ':' + i })))
+    presets = Object.keys(presets).map((i) => ({ text: i, value: type + ':' + id + ':' + i }))
+    presets = presets.concat(
+      Object.keys(networkPresets.default).map((i) => ({
+        text: i,
+        value: type + ':' + id + ':' + i,
+      }))
+    )
     presets.push({ text: 'Custom', value: type + ':' + id + ':' + 'custom' })
 
     return (
-      <>      
-        <div 
+      <>
+        <div
           className='sliceOrigin'
           onClick={() => {
-            link.send('tray:action', 'navDash', { view: 'notify', data: { notify: 'updateOriginChain', notifyData: { origin } }})
+            link.send('tray:action', 'navDash', {
+              view: 'notify',
+              data: { notify: 'updateOriginChain', notifyData: { origin } },
+            })
           }}
         >
-          <div className={active ? 'sliceOriginIndicator sliceOriginIndicatorActive' : 'sliceOriginIndicator' } />
-          <div className='sliceOriginTile'> 
-            {origin}
-          </div>
-          <div className='sliceOriginReqs'> 
-            <div className='sliceOriginReqsNumber'>{this.state.reqsAverage }</div>
+          <div className={active ? 'sliceOriginIndicator sliceOriginIndicatorActive' : 'sliceOriginIndicator'} />
+          <div className='sliceOriginTile'>{origin}</div>
+          <div className='sliceOriginReqs'>
+            <div className='sliceOriginReqsNumber'>{this.state.reqsAverage}</div>
             <div className='sliceOriginReqsLabel'>{'reqs/s'}</div>
           </div>
         </div>
-        {this.state.expanded ? (
-          <div>
-            {'origin quick menu'}
-          </div>
-        ) : null}
+        {this.state.expanded ? <div>{'origin quick menu'}</div> : null}
       </>
-
     )
   }
 }
@@ -109,10 +126,10 @@ class _OriginModule extends React.Component {
 const OriginModule = Restore.connect(_OriginModule)
 
 class ChainModule extends React.Component {
-  constructor (...args) {
+  constructor(...args) {
     super(...args)
     this.state = {
-      expanded: true
+      expanded: true,
     }
     this.ref = createRef()
   }
@@ -131,9 +148,9 @@ class ChainModule extends React.Component {
   //   document.removeEventListener('click', this.clickHandler.bind(this))
   // }
 
-  renderHeader (origin, id) {
+  renderHeader(origin, id) {
     return (
-      <div 
+      <div
         className='sliceTile sliceTileClickable'
         onClick={() => {
           this.setState({ expanded: !this.state.expanded })
@@ -146,22 +163,39 @@ class ChainModule extends React.Component {
       </div>
     )
   }
-  indicator (status) {
+  indicator(status) {
     if (status === 'connected') {
-      return <div className='connectionOptionStatusIndicator'><div className='connectionOptionStatusIndicatorGood' /></div>
+      return (
+        <div className='connectionOptionStatusIndicator'>
+          <div className='connectionOptionStatusIndicatorGood' />
+        </div>
+      )
     } else if (status === 'loading' || status === 'syncing' || status === 'pending' || status === 'standby') {
-      return <div className='connectionOptionStatusIndicator'><div className='connectionOptionStatusIndicatorPending' /></div>
+      return (
+        <div className='connectionOptionStatusIndicator'>
+          <div className='connectionOptionStatusIndicatorPending' />
+        </div>
+      )
     } else {
-      return <div className='connectionOptionStatusIndicator'><div className='connectionOptionStatusIndicatorBad' /></div>
+      return (
+        <div className='connectionOptionStatusIndicator'>
+          <div className='connectionOptionStatusIndicatorBad' />
+        </div>
+      )
     }
   }
-  render () {
+  render() {
     const { id, type, connection, changed } = this.props
 
     const networkPresets = this.store('main.networkPresets', type)
     let presets = networkPresets[id] || {}
-    presets = Object.keys(presets).map(i => ({ text: i, value: type + ':' + id + ':' + i }))
-    presets = presets.concat(Object.keys(networkPresets.default).map(i => ({ text: i, value: type + ':' + id + ':' + i })))
+    presets = Object.keys(presets).map((i) => ({ text: i, value: type + ':' + id + ':' + i }))
+    presets = presets.concat(
+      Object.keys(networkPresets.default).map((i) => ({
+        text: i,
+        value: type + ':' + id + ':' + i,
+      }))
+    )
     presets.push({ text: 'Custom', value: type + ':' + id + ':' + 'custom' })
 
     return (
@@ -172,9 +206,7 @@ class ChainModule extends React.Component {
             <OriginModule origin={'send.frame.eth'} {...this.props} />
             <OriginModule origin={'uniswap.io'} {...this.props} />
             <OriginModule origin={'app.aave.eth'} {...this.props} />
-            <div className='viewAllOrigin'>
-              {'view all'}
-            </div>
+            <div className='viewAllOrigin'>{'view all'}</div>
           </div>
         ) : null}
       </div>
diff --git a/dash/App/Chains/index.js b/dash/App/Chains/index.js
index b642851e8..562f76cd2 100644
--- a/dash/App/Chains/index.js
+++ b/dash/App/Chains/index.js
@@ -16,19 +16,18 @@ import Tokens from './Tokens'
 import chainMeta from '../../../resources/chainMeta'
 
 class _SettingsModule extends React.Component {
-  constructor (props, context) {
+  constructor(props, context) {
     super(props, context)
     this.state = {
-      expanded: false
+      expanded: false,
     }
   }
-  render () {
-    
+  render() {
     const { id, name, type, explorer, symbol, layer, changed } = this.props
     const price = this.store('main.networksMeta.ethereum', id, 'nativeCurrency.usd.price') || '?'
     return (
       <div className='sliceContainer' ref={this.ref}>
-        <div 
+        <div
           className='sliceTile sliceTileClickable'
           onClick={() => {
             this.setState({ expanded: !this.state.expanded })
@@ -45,11 +44,12 @@ class _SettingsModule extends React.Component {
         </div>
         {this.state.expanded ? (
           <>
-            <div className='chainConfig cardShow'>  
-              <div className='chainConfigRow'>  
+            <div className='chainConfig cardShow'>
+              <div className='chainConfigRow'>
                 <input
                   className='chainIdInput'
-                  value={this.state.id} spellCheck='false'
+                  value={this.state.id}
+                  spellCheck='false'
                   onChange={(e) => {
                     if (type === 'ethereum' && id === 1) return
                     this.setState({ id: e.target.value })
@@ -60,7 +60,8 @@ class _SettingsModule extends React.Component {
                 />
                 <input
                   className='chainSymbolInput'
-                  value={this.state.symbol} spellCheck='false'
+                  value={this.state.symbol}
+                  spellCheck='false'
                   onChange={(e) => {
                     if (type === 'ethereum' && id === 1) return
                     if (e.target.value.length > 8) return e.preventDefault()
@@ -72,20 +73,23 @@ class _SettingsModule extends React.Component {
                 />
                 <Dropdown
                   syncValue={this.state.layer}
-                  onChange={layer => this.setState({ layer })}
-                  options={type === 'ethereum' && id === 1 ? [
-                    { text: 'mainnet', value: 'mainnet'}
-                  ] : [
-                    { text: 'rollup', value: 'rollup'}, 
-                    { text: 'sidechain', value: 'sidechain'}, 
-                    { text: 'testnet', value: 'testnet'}, 
-                    { text: 'other', value: 'other'}
-                  ]}
+                  onChange={(layer) => this.setState({ layer })}
+                  options={
+                    type === 'ethereum' && id === 1
+                      ? [{ text: 'mainnet', value: 'mainnet' }]
+                      : [
+                          { text: 'rollup', value: 'rollup' },
+                          { text: 'sidechain', value: 'sidechain' },
+                          { text: 'testnet', value: 'testnet' },
+                          { text: 'other', value: 'other' },
+                        ]
+                  }
                 />
               </div>
               <div className='chainConfigRow'>
                 <input
-                  value={this.state.explorer} spellCheck='false'
+                  value={this.state.explorer}
+                  spellCheck='false'
                   onChange={(e) => {
                     this.setState({ explorer: e.target.value })
                   }}
@@ -98,19 +102,18 @@ class _SettingsModule extends React.Component {
 
             {type === 'ethereum' && id === 1 ? (
               <div className='chainMore cardShow'>
-                <div className='moduleButton moduleButtonLocked'>
-                  {svg.lock(11)}
-                </div>
+                <div className='moduleButton moduleButtonLocked'>{svg.lock(11)}</div>
               </div>
             ) : (
               <div className='chainMore cardShow'>
                 <div
-                  className='moduleButton moduleButtonBad' onMouseDown={() => {
+                  className='moduleButton moduleButtonBad'
+                  onMouseDown={() => {
                     const { id, name, type, explorer } = this.props
                     link.send('tray:action', 'removeNetwork', { id, name, explorer, type })
                   }}
                 >
-                  {svg.trash(13)} 
+                  {svg.trash(13)}
                   <span>remove chain</span>
                 </div>
               </div>
@@ -119,11 +122,26 @@ class _SettingsModule extends React.Component {
             {changed ? (
               <div className='chainConfigSave cardShow'>
                 <div
-                  className='moduleButton moduleButtonGood' onMouseDown={() => {
-                    const net = { id: this.props.id, name: this.props.name, type: this.props.type, symbol: this.props.symbol, explorer: this.props.explorer, layer: this.props.layer }
-                    const newNet = { id: this.state.id, name: this.state.name, type: this.state.type, symbol: this.state.symbol, explorer: this.state.explorer, layer: this.state.layer }
+                  className='moduleButton moduleButtonGood'
+                  onMouseDown={() => {
+                    const net = {
+                      id: this.props.id,
+                      name: this.props.name,
+                      type: this.props.type,
+                      symbol: this.props.symbol,
+                      explorer: this.props.explorer,
+                      layer: this.props.layer,
+                    }
+                    const newNet = {
+                      id: this.state.id,
+                      name: this.state.name,
+                      type: this.state.type,
+                      symbol: this.state.symbol,
+                      explorer: this.state.explorer,
+                      layer: this.state.layer,
+                    }
                     let empty = false
-                    Object.keys(newNet).forEach(k => {
+                    Object.keys(newNet).forEach((k) => {
                       if (typeof newNet[k] === 'string') {
                         newNet[k] = newNet[k].trim()
                       }
@@ -134,18 +152,16 @@ class _SettingsModule extends React.Component {
                     this.setState({ submitted: true })
                     link.send('tray:action', 'updateNetwork', net, newNet)
                     setTimeout(() => this.setState({ submitted: false }), 1600)
-                  }}>
-                    {svg.save(11)} <span> save changes</span>
-                  </div>
-                </div>
-              ) : (this.state.submitted ? (
-                <div className='chainConfigSave'>
-                  <div className='moduleButton'>
-                    {svg.octicon('check', { height: 22 })}
-                  </div>
+                  }}
+                >
+                  {svg.save(11)} <span> save changes</span>
                 </div>
-              ) : null
-            )}
+              </div>
+            ) : this.state.submitted ? (
+              <div className='chainConfigSave'>
+                <div className='moduleButton'>{svg.octicon('check', { height: 22 })}</div>
+              </div>
+            ) : null}
           </>
         ) : null}
       </div>
@@ -155,7 +171,6 @@ class _SettingsModule extends React.Component {
 
 const SettingsModule = Restore.connect(_SettingsModule)
 
-
 // class _FeeModule extends React.Component {
 //   constructor (props, context) {
 //     super(props, context)
@@ -165,7 +180,7 @@ const SettingsModule = Restore.connect(_SettingsModule)
 //   }
 //   renderCloseBars () {
 //     return (
-//       <div 
+//       <div
 //       className='sliceContainerClose'
 //       onClick={() => {
 //         this.setState({ expanded: false })
@@ -190,7 +205,7 @@ const SettingsModule = Restore.connect(_SettingsModule)
 
 //     return (
 //       <div className='sliceContainer' ref={this.ref}>
-//         <div 
+//         <div
 //           className={this.state.expanded ? 'sliceTile sliceTileHighlight' : 'sliceTile'}
 //           onClick={() => {
 //             this.setState({ expanded: !this.state.expanded })
@@ -211,12 +226,11 @@ const SettingsModule = Restore.connect(_SettingsModule)
 
 // const FeeModule = Restore.connect(_FeeModule)
 
-
 class _ChainModule extends React.Component {
-  constructor (...args) {
+  constructor(...args) {
     super(...args)
     this.state = {
-      expanded: false
+      expanded: false,
     }
     this.ref = createRef()
   }
@@ -235,18 +249,18 @@ class _ChainModule extends React.Component {
   //   document.removeEventListener('click', this.clickHandler.bind(this))
   // }
 
-  renderConnection (origin, id) {
+  renderConnection(origin, id) {
     return (
-      <div 
+      <div
         className='sliceTile sliceTileClickable'
         onClick={() => {
           this.setState({ expanded: !this.state.expanded })
         }}
       >
-        <div className={this.props.active ? 'sliceTileIndicatorLarge sliceTileIndicatorActive' : 'sliceTileIndicatorLarge' } />
-        <div className='sliceTileConnectionName'> 
-          {'Pylon'}
-        </div>
+        <div
+          className={this.props.active ? 'sliceTileIndicatorLarge sliceTileIndicatorActive' : 'sliceTileIndicatorLarge'}
+        />
+        <div className='sliceTileConnectionName'>{'Pylon'}</div>
         <div className='sliceTileBlock'>
           <div className='sliceTileBlockIcon'>{svg.chain(16)}</div>
           <div className='sliceTileChainId'>{id}</div>
@@ -256,7 +270,7 @@ class _ChainModule extends React.Component {
       </div>
     )
   }
-  status (type, id, layer) {
+  status(type, id, layer) {
     const connection = this.store('main.networks', type, id, 'connection', layer)
     let status = connection.status
     const current = connection.current
@@ -267,7 +281,11 @@ class _ChainModule extends React.Component {
         else if (!this.okPort(this.state.primaryCustom)) status = 'invalid port'
       }
 
-      if (layer === 'secondary' && this.state.secondaryCustom !== '' && this.state.secondaryCustom !== this.customMessage) {
+      if (
+        layer === 'secondary' &&
+        this.state.secondaryCustom !== '' &&
+        this.state.secondaryCustom !== this.customMessage
+      ) {
         if (!this.okProtocol(this.state.secondaryCustom)) status = 'invalid target'
         else if (!this.okPort(this.state.secondaryCustom)) status = 'invalid port'
       }
@@ -282,22 +300,39 @@ class _ChainModule extends React.Component {
       </div>
     )
   }
-  indicator (status) {
+  indicator(status) {
     if (status === 'connected') {
-      return <div className='connectionOptionStatusIndicator'><div className='connectionOptionStatusIndicatorGood' /></div>
+      return (
+        <div className='connectionOptionStatusIndicator'>
+          <div className='connectionOptionStatusIndicatorGood' />
+        </div>
+      )
     } else if (status === 'loading' || status === 'syncing' || status === 'pending' || status === 'standby') {
-      return <div className='connectionOptionStatusIndicator'><div className='connectionOptionStatusIndicatorPending' /></div>
+      return (
+        <div className='connectionOptionStatusIndicator'>
+          <div className='connectionOptionStatusIndicatorPending' />
+        </div>
+      )
     } else {
-      return <div className='connectionOptionStatusIndicator'><div className='connectionOptionStatusIndicatorBad' /></div>
+      return (
+        <div className='connectionOptionStatusIndicator'>
+          <div className='connectionOptionStatusIndicatorBad' />
+        </div>
+      )
     }
   }
-  render () {
+  render() {
     const { id, type, connection, changed } = this.props
 
     const networkPresets = this.store('main.networkPresets', type)
     let presets = networkPresets[id] || {}
-    presets = Object.keys(presets).map(i => ({ text: i, value: type + ':' + id + ':' + i }))
-    presets = presets.concat(Object.keys(networkPresets.default).map(i => ({ text: i, value: type + ':' + id + ':' + i })))
+    presets = Object.keys(presets).map((i) => ({ text: i, value: type + ':' + id + ':' + i }))
+    presets = presets.concat(
+      Object.keys(networkPresets.default).map((i) => ({
+        text: i,
+        value: type + ':' + id + ':' + i,
+      }))
+    )
     presets.push({ text: 'Custom', value: type + ':' + id + ':' + 'custom' })
 
     return (
@@ -309,7 +344,14 @@ class _ChainModule extends React.Component {
               <div className={connection.primary.on ? 'connectionOption connectionOptionOn' : 'connectionOption'}>
                 <div className='connectionOptionToggle'>
                   <div className='signerPermissionSetting'>Primary</div>
-                  <div className={connection.primary.on ? 'signerPermissionToggleSmall signerPermissionToggleSmallOn' : 'signerPermissionToggleSmall'} onMouseDown={_ => link.send('tray:action', 'toggleConnection', type, id, 'primary')}>
+                  <div
+                    className={
+                      connection.primary.on
+                        ? 'signerPermissionToggleSmall signerPermissionToggleSmallOn'
+                        : 'signerPermissionToggleSmall'
+                    }
+                    onMouseDown={(_) => link.send('tray:action', 'toggleConnection', type, id, 'primary')}
+                  >
                     <div className='signerPermissionToggleSwitch' />
                   </div>
                 </div>
@@ -320,7 +362,7 @@ class _ChainModule extends React.Component {
                         {this.status(type, id, 'primary')}
                         <Dropdown
                           syncValue={type + ':' + id + ':' + connection.primary.current}
-                          onChange={preset => {
+                          onChange={(preset) => {
                             const [type, id, value] = preset.split(':')
                             link.send('tray:action', 'selectPrimary', type, id, value)
                           }}
@@ -328,14 +370,20 @@ class _ChainModule extends React.Component {
                         />
                       </div>
                     </div>
-                    <div className={connection.primary.current === 'custom' && connection.primary.on ? 'connectionCustomInput connectionCustomInputOn cardShow' : 'connectionCustomInput'}>
-                      <input 
+                    <div
+                      className={
+                        connection.primary.current === 'custom' && connection.primary.on
+                          ? 'connectionCustomInput connectionCustomInputOn cardShow'
+                          : 'connectionCustomInput'
+                      }
+                    >
+                      <input
                         className='customInput'
                         tabIndex='-1'
                         value={this.state.primaryCustom}
-                        onFocus={() => this.customPrimaryFocus()} 
+                        onFocus={() => this.customPrimaryFocus()}
                         onBlur={() => this.customPrimaryBlur()}
-                        onChange={e => this.inputPrimaryCustom(e)}
+                        onChange={(e) => this.inputPrimaryCustom(e)}
                       />
                     </div>
                   </>
@@ -346,7 +394,14 @@ class _ChainModule extends React.Component {
               <div className={connection.secondary.on ? 'connectionOption connectionOptionOn' : 'connectionOption'}>
                 <div className='connectionOptionToggle'>
                   <div className='signerPermissionSetting'>Secondary</div>
-                  <div className={connection.secondary.on ? 'signerPermissionToggleSmall signerPermissionToggleSmallOn' : 'signerPermissionToggleSmall'} onMouseDown={_ => link.send('tray:action', 'toggleConnection', type, id, 'secondary')}>
+                  <div
+                    className={
+                      connection.secondary.on
+                        ? 'signerPermissionToggleSmall signerPermissionToggleSmallOn'
+                        : 'signerPermissionToggleSmall'
+                    }
+                    onMouseDown={(_) => link.send('tray:action', 'toggleConnection', type, id, 'secondary')}
+                  >
                     <div className='signerPermissionToggleSwitch' />
                   </div>
                 </div>
@@ -357,7 +412,7 @@ class _ChainModule extends React.Component {
                         {this.status(type, id, 'secondary')}
                         <Dropdown
                           syncValue={type + ':' + id + ':' + connection.secondary.current}
-                          onChange={preset => {
+                          onChange={(preset) => {
                             const [type, id, value] = preset.split(':')
                             link.send('tray:action', 'selectSecondary', type, id, value)
                           }}
@@ -365,14 +420,26 @@ class _ChainModule extends React.Component {
                         />
                       </div>
                     </div>
-                    <div className={connection.secondary.current === 'custom' && connection.secondary.on ? 'connectionCustomInput connectionCustomInputOn cardShow' : 'connectionCustomInput'}>
-                      <input tabIndex='-1' value={this.state.secondaryCustom} onFocus={() => this.customSecondaryFocus()} onBlur={() => this.customSecondaryBlur()} onChange={e => this.inputSecondaryCustom(e)} />
+                    <div
+                      className={
+                        connection.secondary.current === 'custom' && connection.secondary.on
+                          ? 'connectionCustomInput connectionCustomInputOn cardShow'
+                          : 'connectionCustomInput'
+                      }
+                    >
+                      <input
+                        tabIndex='-1'
+                        value={this.state.secondaryCustom}
+                        onFocus={() => this.customSecondaryFocus()}
+                        onBlur={() => this.customSecondaryBlur()}
+                        onChange={(e) => this.inputSecondaryCustom(e)}
+                      />
                     </div>
                   </>
                 ) : null}
               </div>
             </div>
-          </div>   
+          </div>
         ) : null}
       </div>
     )
@@ -381,47 +448,46 @@ class _ChainModule extends React.Component {
 
 const ChainModule = Restore.connect(_ChainModule)
 
-
-
-
-
 class _Network extends React.Component {
-  constructor (props, context) {
+  constructor(props, context) {
     super(props, context)
     this.customMessage = 'Custom Endpoint'
     const { id, name, type, explorer, symbol, layer } = this.props
     this.network = id
     this.networkType = type
-    const primaryCustom = context.store('main.networks', this.networkType, this.network, 'connection.primary.custom') || this.customMessage
-    const secondaryCustom = context.store('main.networks', this.networkType, this.network, 'connection.secondary.custom') || this.customMessage
+    const primaryCustom =
+      context.store('main.networks', this.networkType, this.network, 'connection.primary.custom') || this.customMessage
+    const secondaryCustom =
+      context.store('main.networks', this.networkType, this.network, 'connection.secondary.custom') ||
+      this.customMessage
     this.newNetworkIdDefault = 'ID'
     this.newNetworkNameDefault = 'New Network'
     this.newNetworkExplorerDefault = 'Block Explorer'
     this.newNetworkSymbolDefault = 'ETH'
     this.newNetworkType = 'ethereum'
     this.state = {
-      id, 
-      name, 
-      explorer, 
-      type, 
-      symbol, 
+      id,
+      name,
+      explorer,
+      type,
+      symbol,
       layer,
-      submitted: false, 
+      submitted: false,
       newNetworkId: this.newNetworkIdDefault,
       newNetworkName: this.newNetworkNameDefault,
       newNetworkExplorer: this.newNetworkExplorerDefault,
       newNetworkSymbol: this.newNetworkSymbolDefault,
       newNetworkType: this.newNetworkType,
-      localShake: {}, 
-      primaryCustom, 
-      secondaryCustom, 
-      resetConfirm: false, 
+      localShake: {},
+      primaryCustom,
+      secondaryCustom,
+      resetConfirm: false,
       expandNetwork: false,
       showControls: false,
     }
- }
+  }
 
-  okProtocol (location) {
+  okProtocol(location) {
     if (location === 'injected') return true
     if (location.endsWith('.ipc')) return true
     if (location.startsWith('wss://') || location.startsWith('ws://')) return true
@@ -429,7 +495,7 @@ class _Network extends React.Component {
     return false
   }
 
-  okPort (location) {
+  okPort(location) {
     const match = location.match(/^(?:https?|wss?).*:(?<port>\d{4,})/)
 
     if (match) {
@@ -441,23 +507,29 @@ class _Network extends React.Component {
     return true
   }
 
-  inputPrimaryCustom (e) {
+  inputPrimaryCustom(e) {
     e.preventDefault()
     clearTimeout(this.customPrimaryInputTimeout)
     const value = e.target.value.replace(/\s+/g, '')
     this.setState({ primaryCustom: value })
-    this.customPrimaryInputTimeout = setTimeout(() => link.send('tray:action', 'setPrimaryCustom', this.props.type, this.props.id, this.state.primaryCustom), 1000)
+    this.customPrimaryInputTimeout = setTimeout(
+      () => link.send('tray:action', 'setPrimaryCustom', this.props.type, this.props.id, this.state.primaryCustom),
+      1000
+    )
   }
 
-  inputSecondaryCustom (e) {
+  inputSecondaryCustom(e) {
     e.preventDefault()
     clearTimeout(this.customSecondaryInputTimeout)
     const value = e.target.value.replace(/\s+/g, '')
     this.setState({ secondaryCustom: value })
-    this.customSecondaryInputTimeout = setTimeout(() => link.send('tray:action', 'setSecondaryCustom', this.props.type, this.props.id, this.state.secondaryCustom), 1000)
+    this.customSecondaryInputTimeout = setTimeout(
+      () => link.send('tray:action', 'setSecondaryCustom', this.props.type, this.props.id, this.state.secondaryCustom),
+      1000
+    )
   }
 
-  localShake (key) {
+  localShake(key) {
     const localShake = Object.assign({}, this.state.localShake)
     localShake[key] = true
     this.setState({ localShake })
@@ -505,47 +577,53 @@ class _Network extends React.Component {
   //   }
   // }
 
-  customSecondaryFocus () {
+  customSecondaryFocus() {
     if (this.state.secondaryCustom === this.customMessage) this.setState({ secondaryCustom: '' })
   }
 
-  customSecondaryBlur () {
+  customSecondaryBlur() {
     if (this.state.secondaryCustom === '') this.setState({ secondaryCustom: this.customMessage })
   }
 
-  customPrimaryFocus () {
+  customPrimaryFocus() {
     if (this.state.primaryCustom === this.customMessage) this.setState({ primaryCustom: '' })
   }
 
-  customPrimaryBlur () {
+  customPrimaryBlur() {
     if (this.state.primaryCustom === '') this.setState({ primaryCustom: this.customMessage })
   }
 
-  render () {
-    const changed = (
-      this.state.id && 
-      this.state.name && 
-      this.state.symbol && 
-      this.state.explorer && 
+  render() {
+    const changed =
+      this.state.id &&
+      this.state.name &&
+      this.state.symbol &&
+      this.state.explorer &&
       this.state.type &&
-      this.state.layer && (
-        this.props.id !== this.state.id ||
+      this.state.layer &&
+      (this.props.id !== this.state.id ||
         this.props.name !== this.state.name ||
         this.props.symbol !== this.state.symbol ||
         this.props.explorer !== this.state.explorer ||
-        this.props.type !== this.state.type || 
-        this.props.layer !== this.state.layer
-      )
-    )
+        this.props.type !== this.state.type ||
+        this.props.layer !== this.state.layer)
     const { id, type, connection, filter } = this.props
 
     const networkPresets = this.store('main.networkPresets', type)
     let presets = networkPresets[id] || {}
-    presets = Object.keys(presets).map(i => ({ text: i, value: type + ':' + id + ':' + i }))
-    presets = presets.concat(Object.keys(networkPresets.default).map(i => ({ text: i, value: type + ':' + id + ':' + i })))
+    presets = Object.keys(presets).map((i) => ({ text: i, value: type + ':' + id + ':' + i }))
+    presets = presets.concat(
+      Object.keys(networkPresets.default).map((i) => ({
+        text: i,
+        value: type + ':' + id + ':' + i,
+      }))
+    )
     presets.push({ text: 'Custom', value: type + ':' + id + ':' + 'custom' })
 
-    const gas = Math.round(parseInt(this.store('main.networksMeta.ethereum', this.state.id, 'gas.price.levels.fast'), 'hex') / 1e9) || '---'
+    const gas =
+      Math.round(
+        parseInt(this.store('main.networksMeta.ethereum', this.state.id, 'gas.price.levels.fast'), 'hex') / 1e9
+      ) || '---'
     const price = this.store('main.networksMeta.ethereum', this.state.id, 'nativeCurrency.usd.price') || '?'
     const change24hr = this.store('main.networksMeta.ethereum', this.state.id, 'nativeCurrency.usd.change24hr') || '?'
     const symbol = this.store('main.networks.ethereum', this.state.id, 'symbol') || '?'
@@ -554,21 +632,22 @@ class _Network extends React.Component {
 
     if (
       filter &&
-      !this.state.id.toString().includes(filter) && 
-      !this.state.name.includes(filter) && 
-      !this.state.symbol.includes(filter) && 
-      !this.state.explorer.includes(filter) && 
+      !this.state.id.toString().includes(filter) &&
+      !this.state.name.includes(filter) &&
+      !this.state.symbol.includes(filter) &&
+      !this.state.explorer.includes(filter) &&
       !this.state.type.includes(filter) &&
       !this.state.layer.includes(filter)
-    ) return null
+    )
+      return null
 
     return (
       <div className='network'>
         <div className='networkActive'>
           <div className='chainBadge'>
-            <RingIcon 
-              color={chainMeta[hexId] ? chainMeta[hexId].primaryColor : ''} 
-              img={chainMeta[hexId] ? chainMeta[hexId].icon : ''} 
+            <RingIcon
+              color={chainMeta[hexId] ? chainMeta[hexId].primaryColor : ''}
+              img={chainMeta[hexId] ? chainMeta[hexId].icon : ''}
             />
           </div>
           <div className='networkName'>
@@ -586,16 +665,23 @@ class _Network extends React.Component {
 
           {/* <div className='chainIdBadgeBackground' /> */}
 
-          <div className='chainSettings' onClick={() => {
-            alert('show chain settings')
-          }}>
+          <div
+            className='chainSettings'
+            onClick={() => {
+              alert('show chain settings')
+            }}
+          >
             {svg.gear(11)}
           </div>
-          <div 
-            className={this.props.on ? 'signerPermissionToggle signerPermissionToggleOn' : 'signerPermissionToggle'} 
-            onClick={this.props.id !== 1 ? () => {
-              link.send('tray:action', 'activateNetwork', type, id, !this.props.on)
-            } : null}
+          <div
+            className={this.props.on ? 'signerPermissionToggle signerPermissionToggleOn' : 'signerPermissionToggle'}
+            onClick={
+              this.props.id !== 1
+                ? () => {
+                    link.send('tray:action', 'activateNetwork', type, id, !this.props.on)
+                  }
+                : null
+            }
           >
             {this.props.id === 1 ? (
               <div className='signerPermissionToggleSwitchLocked'>
@@ -610,7 +696,7 @@ class _Network extends React.Component {
         {this.props.on ? (
           <div className='chainModules'>
             <Connection changed={changed} {...this.props} />
-            <Gas id={this.props.id} /> 
+            <Gas id={this.props.id} />
             {/* <Usage changed={changed} {...this.props} />
             <Tokens changed={changed} {...this.props} /> */}
             <div className='chainFooter'>
@@ -629,9 +715,8 @@ class _Network extends React.Component {
 
 const Network = Restore.connect(_Network)
 
-
 class Settings extends React.Component {
-  constructor (props, context) {
+  constructor(props, context) {
     super(props, context)
     this.customMessage = 'Custom Endpoint'
     // context.store.observer(() => {
@@ -656,32 +741,45 @@ class Settings extends React.Component {
       newNetworkSymbol: this.newNetworkSymbolDefault,
       newNetworkType: this.newNetworkType,
       localShake: {},
-      resetConfirm: false, 
+      resetConfirm: false,
       expandNetwork: false,
-      findFocus: false, 
+      findFocus: false,
       findHover: false,
-      findInput: ''
+      findInput: '',
     }
   }
 
-  discord () {
+  discord() {
     return (
-      <div className='discordInvite' onMouseDown={() => link.send('tray:action', 'navDash', { view: 'openExternal', data: { notify: 'hotAccountWarning', notifyData: { url: 'https://discord.gg/UH7NGqY' }}})}>
+      <div
+        className='discordInvite'
+        onMouseDown={() =>
+          link.send('tray:action', 'navDash', {
+            view: 'openExternal',
+            data: {
+              notify: 'hotAccountWarning',
+              notifyData: { url: 'https://discord.gg/UH7NGqY' },
+            },
+          })
+        }
+      >
         <div>Need help?</div>
         <div className='discordLink'>Join our Discord!</div>
       </div>
     )
   }
 
-  quit () {
+  quit() {
     return (
       <div className='quitFrame'>
-        <div onMouseDown={() => link.send('tray:quit')} className='quitFrameButton'>Quit</div>
+        <div onMouseDown={() => link.send('tray:quit')} className='quitFrameButton'>
+          Quit
+        </div>
       </div>
     )
   }
 
-  selectNetwork (network) {
+  selectNetwork(network) {
     const [type, id] = network.split(':')
     if (network.type !== type || network.id !== id) link.send('tray:action', 'selectNetwork', type, id)
   }
@@ -691,59 +789,66 @@ class Settings extends React.Component {
   //   this.setState({ expandNetwork: expand !== undefined ? expand : !this.state.expandNetwork })
   // }
 
-  renderConnections (layer) {
+  renderConnections(layer) {
     const nets = []
     const networks = this.store('main.networks')
 
     const { filter } = this.state
 
-    Object.keys(networks).forEach(type => {
+    Object.keys(networks).forEach((type) => {
       nets.push(
         <div key={type}>
           {Object.keys(networks[type])
-            .map(id => parseInt(id))
+            .map((id) => parseInt(id))
             .sort((a, b) => a - b)
-            .filter(id => {
+            .filter((id) => {
               if (!networks[type][id].layer && layer === 'other') return true
               return networks[type][id].layer === layer
-            }).map(id => {
-              return <Network
-                key={type + id}
-                id={id}
-                name={networks[type][id].name}
-                symbol={networks[type][id].symbol}
-                explorer={networks[type][id].explorer}
-                type={type}
-                connection={networks[type][id].connection}
-                layer={networks[type][id].layer}
-                on={networks[type][id].on}
-                filter={filter}
-              />
             })
-          }
+            .map((id) => {
+              return (
+                <Network
+                  key={type + id}
+                  id={id}
+                  name={networks[type][id].name}
+                  symbol={networks[type][id].symbol}
+                  explorer={networks[type][id].explorer}
+                  type={type}
+                  connection={networks[type][id].connection}
+                  layer={networks[type][id].layer}
+                  on={networks[type][id].on}
+                  filter={filter}
+                />
+              )
+            })}
         </div>
       )
     })
     return nets
   }
 
-  render () {
-    const { type, id } = { type: 'ethereum', id: 1 }// TODO: this.store('main.currentNetwork')
+  render() {
+    const { type, id } = { type: 'ethereum', id: 1 } // TODO: this.store('main.currentNetwork')
     const networks = this.store('main.networks')
     const connection = networks[type][id].connection
     const networkPresets = this.store('main.networkPresets', type)
     let presets = networkPresets[id] || {}
-    presets = Object.keys(presets).map(i => ({ text: i, value: type + ':' + id + ':' + i }))
-    presets = presets.concat(Object.keys(networkPresets.default).map(i => ({ text: i, value: type + ':' + id + ':' + i })))
+    presets = Object.keys(presets).map((i) => ({ text: i, value: type + ':' + id + ':' + i }))
+    presets = presets.concat(
+      Object.keys(networkPresets.default).map((i) => ({
+        text: i,
+        value: type + ':' + id + ':' + i,
+      }))
+    )
     presets.push({ text: 'Custom', value: type + ':' + id + ':' + 'custom' })
     const networkOptions = []
-    Object.keys(networks).forEach(type => {
-      Object.keys(networks[type]).forEach(id => {
+    Object.keys(networks).forEach((type) => {
+      Object.keys(networks[type]).forEach((id) => {
         networkOptions.push({ text: networks[type][id].name, value: type + ':' + id })
       })
     })
     const { findHover, findFocus, findInput } = this.state
-    console.log( findHover, findFocus, findInput )
+    console.log(findHover, findFocus, findInput)
     return (
       <div className={'localSettings cardShow'}>
         {/* <div 
@@ -783,8 +888,11 @@ class Settings extends React.Component {
           </div>
         </div> */}
         <div className='localSettingsWrap'>
-          <div className='newAccount' onClick={() => link.send('tray:action', 'navDash', { view: 'notify', data: { notify: 'addChain' } })}>
-            <div className='newAccountIcon'>{svg.plus(16)}</div> 
+          <div
+            className='newAccount'
+            onClick={() => link.send('tray:action', 'navDash', { view: 'notify', data: { notify: 'addChain' } })}
+          >
+            <div className='newAccountIcon'>{svg.plus(16)}</div>
             Add New Chain
           </div>
           {this.renderConnections('mainnet')}
diff --git a/dash/App/Command/index.js b/dash/App/Command/index.js
index b9fa452f5..cad529710 100644
--- a/dash/App/Command/index.js
+++ b/dash/App/Command/index.js
@@ -4,12 +4,12 @@ import link from '../../../resources/link'
 import svg from '../../../resources/svg'
 
 class Command extends React.Component {
-  render () {
+  render() {
     const { view, data } = this.store('dash.nav')[0] || { view: '', data: {} }
     return (
       <div className='command'>
         {this.store('dash.nav').length ? (
-          <div 
+          <div
             className='commandItem commandItemBack cardShow'
             onClick={() => {
               link.send('tray:action', 'backDash')
@@ -21,14 +21,14 @@ class Command extends React.Component {
         <div key={view} className='commandTitle cardShow'>
           {view}
         </div>
-        
+
         {/* <div 
           className='commandInput'
         >
           <input />
         </div> */}
 
-        <div 
+        <div
           className='commandItem commandItemClose'
           onClick={() => {
             link.send('tray:action', 'closeDash')
@@ -37,7 +37,7 @@ class Command extends React.Component {
           {svg.x(16)}
         </div>
       </div>
-    ) 
+    )
   }
 }
 
diff --git a/dash/App/Dapps/DappDetails/index.js b/dash/App/Dapps/DappDetails/index.js
index 3e8813926..a99bc8de4 100644
--- a/dash/App/Dapps/DappDetails/index.js
+++ b/dash/App/Dapps/DappDetails/index.js
@@ -1,4 +1,4 @@
-import React, {  createRef } from 'react'
+import React, { createRef } from 'react'
 import Restore from 'react-restore'
 import link from '../../../../resources/link'
 // import { isNetworkConnected, isNetworkEnabled } from '../../../../resources/utils/chains'
@@ -6,53 +6,62 @@ import RingIcon from '../../../../resources/Components/RingIcon'
 import chainMeta from '../../../../resources/chainMeta'
 import svg from '../../../../resources/svg'
 
-
 class DappDetails extends React.Component {
-  updateOriginChain () {
+  updateOriginChain() {
     const origin = this.store('main.origins', this.props.originId)
     return (
       <div className='originSwapChainList'>
-        {Object.keys(this.store('main.networks.ethereum')).filter(id => {
-          return this.store('main.networks.ethereum', id, 'on')
-        }).map(id => {
-          const hexId = '0x' + parseInt(id).toString('16')
-          const selected = origin.chain.id === parseInt(id)
-          return (
-            <div 
-              className={'originChainItem'} 
-              style={selected ? {
-                color: 'var(--ghostB)',
-                background: chainMeta[hexId] ? chainMeta[hexId].primaryColor : 'var(--moon)'
-              } : {}}
-              onClick={() => {
-                link.send('tray:action', 'switchOriginChain', this.props.originId, parseInt(id), 'ethereum')
-              }}
-            >
-              <div className='originChainItemIcon'>
-                <RingIcon 
-                  color={chainMeta[hexId] ? chainMeta[hexId].primaryColor : 'var(--moon)'} 
-                  img={chainMeta[hexId] ? chainMeta[hexId].icon : ''} 
-                />
-              </div>
-              
-              {this.store('main.networks.ethereum', id, 'name')}
-
-              <div 
-                className='originChainItemCheck'
-                style={selected ? {
-                  background: chainMeta[hexId] ? chainMeta[hexId].primaryColor : 'var(--moon)'
-                } : {}}
+        {Object.keys(this.store('main.networks.ethereum'))
+          .filter((id) => {
+            return this.store('main.networks.ethereum', id, 'on')
+          })
+          .map((id) => {
+            const hexId = '0x' + parseInt(id).toString('16')
+            const selected = origin.chain.id === parseInt(id)
+            return (
+              <div
+                className={'originChainItem'}
+                style={
+                  selected
+                    ? {
+                        color: 'var(--ghostB)',
+                        background: chainMeta[hexId] ? chainMeta[hexId].primaryColor : 'var(--moon)',
+                      }
+                    : {}
+                }
+                onClick={() => {
+                  link.send('tray:action', 'switchOriginChain', this.props.originId, parseInt(id), 'ethereum')
+                }}
               >
-                {selected ? svg.check(28) : null}
+                <div className='originChainItemIcon'>
+                  <RingIcon
+                    color={chainMeta[hexId] ? chainMeta[hexId].primaryColor : 'var(--moon)'}
+                    img={chainMeta[hexId] ? chainMeta[hexId].icon : ''}
+                  />
+                </div>
+
+                {this.store('main.networks.ethereum', id, 'name')}
+
+                <div
+                  className='originChainItemCheck'
+                  style={
+                    selected
+                      ? {
+                          background: chainMeta[hexId] ? chainMeta[hexId].primaryColor : 'var(--moon)',
+                        }
+                      : {}
+                  }
+                >
+                  {selected ? svg.check(28) : null}
+                </div>
               </div>
-            </div>
-          )
-        })}
+            )
+          })}
       </div>
     )
   }
 
-  render () {
+  render() {
     const origin = this.store('main.origins', this.props.originId)
     return (
       <div className='cardShow'>
@@ -60,19 +69,19 @@ class DappDetails extends React.Component {
           {svg.window(20)}
           <div className='originSwapOriginText'>{origin.name}</div>
         </div>
-        <div className='originSwapTitle'>
-          default chain
-        </div>
+        <div className='originSwapTitle'>default chain</div>
         <div>{this.updateOriginChain()}</div>
-        <div 
+        <div
           className='clearOriginsButton'
           style={{ color: 'var(--good)' }}
           onClick={() => {
             link.send('tray:openExternal', `https://${origin.name}/`)
-          }
-        }>{'launch dapp'}</div>
-        <div 
-          className='clearOriginsButton' 
+          }}
+        >
+          {'launch dapp'}
+        </div>
+        <div
+          className='clearOriginsButton'
           style={{ color: 'var(--bad)', marginTop: '10px' }}
           onClick={() => {
             link.send('tray:action', 'removeOrigin', this.props.originId)
@@ -80,11 +89,10 @@ class DappDetails extends React.Component {
           }}
         >
           Remove Dapp
-        </div>  
+        </div>
       </div>
     )
   }
-  
 }
 
-export default Restore.connect(DappDetails)
\ No newline at end of file
+export default Restore.connect(DappDetails)
diff --git a/dash/App/Dapps/index.js b/dash/App/Dapps/index.js
index 357da6336..5abf3bdbf 100644
--- a/dash/App/Dapps/index.js
+++ b/dash/App/Dapps/index.js
@@ -1,4 +1,4 @@
-import React, {  createRef } from 'react'
+import React, { createRef } from 'react'
 import Restore from 'react-restore'
 import link from '../../../resources/link'
 import { isNetworkConnected, isNetworkEnabled } from '../../../resources/utils/chains'
@@ -9,38 +9,43 @@ import chainMeta from '../../../resources/chainMeta'
 
 import DappDetails from './DappDetails'
 
-function bySessionStartTime (a, b) {
+function bySessionStartTime(a, b) {
   return b.session.startedAt - a.session.startedAt
 }
 
-function byLastUpdated (a, b) {
+function byLastUpdated(a, b) {
   return b.session.lastUpdatedAt - a.session.lastUpdatedAt
 }
 
-function getOriginsForChain (chain, origins) {
-  const { connectedOrigins, disconnectedOrigins } = Object.entries(origins).reduce((acc, [id, origin]) => {
-    if (origin.chain.id === chain.id) {
-      const connected = isNetworkConnected(chain) &&
-        (!origin.session.endedAt || origin.session.startedAt > origin.session.endedAt)
+function getOriginsForChain(chain, origins) {
+  const { connectedOrigins, disconnectedOrigins } = Object.entries(origins).reduce(
+    (acc, [id, origin]) => {
+      if (origin.chain.id === chain.id) {
+        const connected =
+          isNetworkConnected(chain) && (!origin.session.endedAt || origin.session.startedAt > origin.session.endedAt)
 
-      acc[connected ? 'connectedOrigins' : 'disconnectedOrigins'].push({ ...origin, id })
-    }
+        acc[connected ? 'connectedOrigins' : 'disconnectedOrigins'].push({ ...origin, id })
+      }
 
-    return acc
-  }, { connectedOrigins: [], disconnectedOrigins: [] })
+      return acc
+    },
+    { connectedOrigins: [], disconnectedOrigins: [] }
+  )
 
   return {
     connected: connectedOrigins.sort(bySessionStartTime),
-    disconnected: disconnectedOrigins.sort(byLastUpdated).filter(origin => (Date.now() - origin.session.lastUpdatedAt) < 60 * 60 * 1000)
+    disconnected: disconnectedOrigins
+      .sort(byLastUpdated)
+      .filter((origin) => Date.now() - origin.session.lastUpdatedAt < 60 * 60 * 1000),
   }
 }
 
 class Indicator extends React.Component {
-  constructor (props) {
+  constructor(props) {
     super(props)
 
     this.state = {
-      active: false
+      active: false,
     }
 
     setTimeout(() => {
@@ -52,9 +57,13 @@ class Indicator extends React.Component {
     }, 200)
   }
 
-  render () {
+  render() {
     if (this.props.connected) {
-      return <div className={this.state.active ? 'sliceOriginIndicator sliceOriginIndicatorActive' : 'sliceOriginIndicator' } />
+      return (
+        <div
+          className={this.state.active ? 'sliceOriginIndicator sliceOriginIndicatorActive' : 'sliceOriginIndicator'}
+        />
+      )
     } else {
       return <div className='sliceOriginIndicator sliceOriginIndicatorOff' />
     }
@@ -62,18 +71,18 @@ class Indicator extends React.Component {
 }
 
 class _OriginModule extends React.Component {
-  constructor (...args) {
+  constructor(...args) {
     super(...args)
 
     this.state = {
       expanded: false,
-      averageRequests: '0.0'
+      averageRequests: '0.0',
     }
 
     this.ref = createRef()
   }
 
-  componentDidMount () {
+  componentDidMount() {
     this.requestUpdates = setInterval(() => {
       if (this.props.connected) {
         this.updateRequestRate()
@@ -81,11 +90,11 @@ class _OriginModule extends React.Component {
     }, 1000)
   }
 
-  componentWillUnmount () {
+  componentWillUnmount() {
     clearInterval(this.requestUpdates)
   }
 
-  updateRequestRate () {
+  updateRequestRate() {
     const { origin } = this.props
     const now = new Date().getTime()
     const sessionLength = now - origin.session.startedAt
@@ -93,31 +102,25 @@ class _OriginModule extends React.Component {
     this.setState({ averageRequests: (origin.session.requests / sessionLengthSeconds).toFixed(2) })
   }
 
-  render () {
+  render() {
     const { origin, connected } = this.props
 
     return (
-      <div>      
-        <div 
+      <div>
+        <div
           className='sliceOrigin'
           onClick={() => {
-            link.send('tray:action', 'navDash', { view: 'dapps', data: { dappDetails:  origin.id }})
+            link.send('tray:action', 'navDash', { view: 'dapps', data: { dappDetails: origin.id } })
           }}
         >
           <Indicator key={origin.session.lastUpdatedAt} connected={connected} />
-          <div className='sliceOriginTile'>
-            {origin.name}
-          </div> 
+          <div className='sliceOriginTile'>{origin.name}</div>
           <div className='sliceOriginReqs'>
             <div className='sliceOriginReqsNumber'>{this.state.averageRequests}</div>
             <div className='sliceOriginReqsLabel'>{'reqs/min'}</div>
           </div>
         </div>
-        {this.state.expanded ? (
-          <div>
-            {'origin quick menu'}
-          </div>
-        ) : null}
+        {this.state.expanded ? <div>{'origin quick menu'}</div> : null}
       </div>
     )
   }
@@ -131,31 +134,33 @@ const ChainOrigins = ({ chain, origins }) => {
     <>
       <div className='originTitle'>
         <div className='originTitleIcon'>
-          <RingIcon 
+          <RingIcon
             small={true}
-            color={chainMeta[hexId] ? chainMeta[hexId].primaryColor : ''} 
-            img={chainMeta[hexId] ? chainMeta[hexId].icon : ''} 
+            color={chainMeta[hexId] ? chainMeta[hexId].primaryColor : ''}
+            img={chainMeta[hexId] ? chainMeta[hexId].icon : ''}
           />
         </div>
         <div className='originTitleText'>{chain.name}</div>
       </div>
-      {origins.connected.map((origin) => <OriginModule origin={origin} connected={true} />)}
-      {origins.disconnected.map((origin) => <OriginModule origin={origin} connected={false} />)}
+      {origins.connected.map((origin) => (
+        <OriginModule origin={origin} connected={true} />
+      ))}
+      {origins.disconnected.map((origin) => (
+        <OriginModule origin={origin} connected={false} />
+      ))}
       {origins.connected.length === 0 && origins.disconnected.length === 0 ? (
-        <div className='sliceOriginNoDapp'>
-          {'No Dapp Recently Connected'}
-        </div>
+        <div className='sliceOriginNoDapp'>{'No Dapp Recently Connected'}</div>
       ) : null}
     </>
   )
 }
-  
+
 class Dapps extends React.Component {
-  getEnabledChains () {
+  getEnabledChains() {
     return Object.values(this.store('main.networks.ethereum')).filter(isNetworkEnabled)
   }
 
-  render () {
+  render() {
     const enabledChains = this.getEnabledChains()
     const origins = this.store('main.origins')
     const originsCount = Object.values(origins).length
@@ -168,20 +173,16 @@ class Dapps extends React.Component {
     } else {
       return (
         <div className='cardShow'>
-          {
-            enabledChains.map(chain => {
-              const chainOrigins = getOriginsForChain(chain, origins)
-  
-              return chainOrigins.length === 0
-                ? <></>
-                : <ChainOrigins chain={chain} origins={chainOrigins} />
-            })
-          }
-          <div className={'clearOriginsButton'} onClick={clearOriginsClickHandler} >
+          {enabledChains.map((chain) => {
+            const chainOrigins = getOriginsForChain(chain, origins)
+
+            return chainOrigins.length === 0 ? <></> : <ChainOrigins chain={chain} origins={chainOrigins} />
+          })}
+          <div className={'clearOriginsButton'} onClick={clearOriginsClickHandler}>
             Clear All
           </div>
         </div>
-      ) 
+      )
     }
   }
 }
diff --git a/dash/App/Main/index.js b/dash/App/Main/index.js
index 7b69ba4cd..d6f014cce 100644
--- a/dash/App/Main/index.js
+++ b/dash/App/Main/index.js
@@ -5,7 +5,7 @@ import link from '../../../resources/link'
 import svg from '../../../resources/svg'
 
 class Settings extends React.Component {
-  constructor (props, context) {
+  constructor(props, context) {
     super(props, context)
     this.customMessage = 'Custom Endpoint'
     // this.network = context.store('main.currentNetwork.id')
@@ -14,7 +14,13 @@ class Settings extends React.Component {
     // const secondaryCustom = context.store('main.networks', this.networkType, this.network, 'connection.secondary.custom') || this.customMessage
     const latticeEndpoint = context.store('main.latticeSettings.endpointCustom')
     const latticeEndpointMode = context.store('main.latticeSettings.endpointMode')
-    this.state = { localShake: {}, latticeEndpoint, latticeEndpointMode, resetConfirm: false, expandNetwork: false }
+    this.state = {
+      localShake: {},
+      latticeEndpoint,
+      latticeEndpointMode,
+      resetConfirm: false,
+      expandNetwork: false,
+    }
     // context.store.observer(() => {
     //   const { type, id } = context.store('main.currentNetwork')
     //   if (this.network !== id || this.networkType !== type) {
@@ -27,17 +33,26 @@ class Settings extends React.Component {
     // })
   }
 
-  appInfo () {
+  appInfo() {
     return (
       <div className='appInfo'>
         <div className='appInfoLine appInfoLineVersion'>{'v' + require('../../../package.json').version}</div>
         <div className='appInfoLine appInfoLineReset'>
           {this.state.resetConfirm ? (
             <span className='appInfoLineResetConfirm'>
-              Are you sure you want to reset everything? <span className='pointer' onClick={() => link.send('tray:resetAllSettings')}>Yes</span> <span>/</span> <span className='pointer' onClick={() => this.setState({ resetConfirm: false })}>No</span>
+              Are you sure you want to reset everything?{' '}
+              <span className='pointer' onClick={() => link.send('tray:resetAllSettings')}>
+                Yes
+              </span>{' '}
+              <span>/</span>{' '}
+              <span className='pointer' onClick={() => this.setState({ resetConfirm: false })}>
+                No
+              </span>
             </span>
           ) : (
-            <span className='pointer' onClick={() => this.setState({ resetConfirm: true })}>Reset All Settings & Data</span>
+            <span className='pointer' onClick={() => this.setState({ resetConfirm: true })}>
+              Reset All Settings & Data
+            </span>
           )}
         </div>
       </div>
@@ -61,42 +76,51 @@ class Settings extends React.Component {
   //   if (this.state.secondaryCustom === '') this.setState({ secondaryCustom: this.customMessage })
   // }
 
-  customPrimaryFocus () {
+  customPrimaryFocus() {
     if (this.state.primaryCustom === this.customMessage) this.setState({ primaryCustom: '' })
   }
 
-  customPrimaryBlur () {
+  customPrimaryBlur() {
     if (this.state.primaryCustom === '') this.setState({ primaryCustom: this.customMessage })
   }
 
-  inputPrimaryCustom (e) {
+  inputPrimaryCustom(e) {
     e.preventDefault()
     clearTimeout(this.customPrimaryInputTimeout)
     const value = e.target.value.replace(/\s+/g, '')
     this.setState({ primaryCustom: value })
     const { type, id } = this.store('main.currentNetwork')
-    this.customPrimaryInputTimeout = setTimeout(() => link.send('tray:action', 'setPrimaryCustom', type, id, this.state.primaryCustom), 1000)
+    this.customPrimaryInputTimeout = setTimeout(
+      () => link.send('tray:action', 'setPrimaryCustom', type, id, this.state.primaryCustom),
+      1000
+    )
   }
 
-  inputSecondaryCustom (e) {
+  inputSecondaryCustom(e) {
     e.preventDefault()
     clearTimeout(this.customSecondaryInputTimeout)
     const value = e.target.value.replace(/\s+/g, '')
     this.setState({ secondaryCustom: value })
     const { type, id } = this.store('main.currentNetwork')
-    this.customSecondaryInputTimeout = setTimeout(() => link.send('tray:action', 'setSecondaryCustom', type, id, this.state.secondaryCustom), 1000)
+    this.customSecondaryInputTimeout = setTimeout(
+      () => link.send('tray:action', 'setSecondaryCustom', type, id, this.state.secondaryCustom),
+      1000
+    )
   }
 
-  inputLatticeEndpoint (e) {
+  inputLatticeEndpoint(e) {
     e.preventDefault()
     clearTimeout(this.inputLatticeTimeout)
     const value = e.target.value.replace(/\s+/g, '')
     this.setState({ latticeEndpoint: value })
     // TODO: Update to target specific Lattice device rather than global
-    this.inputLatticeTimeout = setTimeout(() => link.send('tray:action', 'setLatticeEndpointCustom', this.state.latticeEndpoint), 1000)
+    this.inputLatticeTimeout = setTimeout(
+      () => link.send('tray:action', 'setLatticeEndpointCustom', this.state.latticeEndpoint),
+      1000
+    )
   }
 
-  localShake (key) {
+  localShake(key) {
     const localShake = Object.assign({}, this.state.localShake)
     localShake[key] = true
     this.setState({ localShake })
@@ -107,7 +131,7 @@ class Settings extends React.Component {
     }, 1010)
   }
 
-  status (layer) {
+  status(layer) {
     const { type, id } = this.store('main.currentNetwork')
     const connection = this.store('main.networks', type, id, 'connection', layer)
     let status = connection.status
@@ -119,7 +143,11 @@ class Settings extends React.Component {
         else if (!okPort(this.state.primaryCustom)) status = 'invalid port'
       }
 
-      if (layer === 'secondary' && this.state.secondaryCustom !== '' && this.state.secondaryCustom !== this.customMessage) {
+      if (
+        layer === 'secondary' &&
+        this.state.secondaryCustom !== '' &&
+        this.state.secondaryCustom !== this.customMessage
+      ) {
         if (!okProtocol(this.state.secondaryCustom)) status = 'invalid target'
         else if (!okPort(this.state.secondaryCustom)) status = 'invalid port'
       }
@@ -133,16 +161,16 @@ class Settings extends React.Component {
     )
   }
 
-  discord () {
+  discord() {
     return (
-      <div className='discordInvite' onClick={() => link.send('tray:openExternal', 'https://discord.gg/UH7NGqY') }>
+      <div className='discordInvite' onClick={() => link.send('tray:openExternal', 'https://discord.gg/UH7NGqY')}>
         <div>Need help?</div>
         <div className='discordLink'>Join our Discord!</div>
       </div>
     )
   }
 
-  quit () {
+  quit() {
     return (
       <div className='addCustomTokenButtonWrap quitFrame' style={{ zIndex: 215 }}>
         <div className='addCustomTokenButton' onClick={() => link.send('tray:quit')}>
@@ -152,46 +180,66 @@ class Settings extends React.Component {
     )
   }
 
-  indicator (status) {
+  indicator(status) {
     if (status === 'connected') {
-      return <div className='connectionOptionStatusIndicator'><div className='connectionOptionStatusIndicatorGood' /></div>
+      return (
+        <div className='connectionOptionStatusIndicator'>
+          <div className='connectionOptionStatusIndicatorGood' />
+        </div>
+      )
     } else if (status === 'loading' || status === 'syncing' || status === 'pending' || status === 'standby') {
-      return <div className='connectionOptionStatusIndicator'><div className='connectionOptionStatusIndicatorPending' /></div>
+      return (
+        <div className='connectionOptionStatusIndicator'>
+          <div className='connectionOptionStatusIndicatorPending' />
+        </div>
+      )
     } else {
-      return <div className='connectionOptionStatusIndicator'><div className='connectionOptionStatusIndicatorBad' /></div>
+      return (
+        <div className='connectionOptionStatusIndicator'>
+          <div className='connectionOptionStatusIndicatorBad' />
+        </div>
+      )
     }
   }
 
-  selectNetwork (network) {
+  selectNetwork(network) {
     const [type, id] = network.split(':')
     if (network.type !== type || network.id !== id) link.send('tray:action', 'selectNetwork', type, id)
   }
 
-  expandNetwork (e, expand) {
+  expandNetwork(e, expand) {
     e.stopPropagation()
     this.setState({ expandNetwork: expand !== undefined ? expand : !this.state.expandNetwork })
   }
 
-  render () {
+  render() {
     const { type, id } = { type: 'ethereum', id: 1 } // TODO
     const networks = this.store('main.networks')
     // const connection = networks[type][id].connection
     const networkPresets = this.store('main.networkPresets', type)
     let presets = networkPresets[id] || {}
-    presets = Object.keys(presets).map(i => ({ text: i, value: type + ':' + id + ':' + i }))
-    presets = presets.concat(Object.keys(networkPresets.default).map(i => ({ text: i, value: type + ':' + id + ':' + i })))
+    presets = Object.keys(presets).map((i) => ({ text: i, value: type + ':' + id + ':' + i }))
+    presets = presets.concat(
+      Object.keys(networkPresets.default).map((i) => ({
+        text: i,
+        value: type + ':' + id + ':' + i,
+      }))
+    )
     presets.push({ text: 'Custom', value: type + ':' + id + ':' + 'custom' })
 
     const networkOptions = []
-    Object.keys(networks).forEach(type => {
-      Object.keys(networks[type]).forEach(id => {
+    Object.keys(networks).forEach((type) => {
+      Object.keys(networks[type]).forEach((id) => {
         networkOptions.push({ text: networks[type][id].name, value: type + ':' + id })
       })
     })
     return (
       <div className={'localSettings cardShow'}>
         <div className='localSettingsWrap'>
-          <div className='dashModule' onClick={() => link.send('tray:action', 'navDash', { view: 'accounts', data: {} })}>
+          <div
+            className='dashModule'
+            onClick={() => link.send('tray:action', 'navDash', { view: 'accounts', data: {} })}
+          >
             <div className='dashModuleIcon'>{svg.accounts(24)}</div>
             <div className='dashModuleTitle'>{'Accounts'}</div>
           </div>
@@ -207,28 +255,61 @@ class Settings extends React.Component {
             <div className='dashModuleIcon'>{svg.tokens(24)}</div>
             <div className='dashModuleTitle'>{'Tokens'}</div>
           </div>
-          <div className='dashModule' onClick={() => link.send('tray:action', 'navDash', { view: 'settings', data: {} })}>
+          <div
+            className='dashModule'
+            onClick={() => link.send('tray:action', 'navDash', { view: 'settings', data: {} })}
+          >
             <div className='dashModuleIcon'>{svg.settings(24)}</div>
             <div className='dashModuleTitle'>{'Settings'}</div>
           </div>
           <div className='snipIt'>
             <div>Using a dapp that doesn't support Frame natively?</div>
             <div className='snipItBrowserExtensionIcons'>
-              <div 
+              <div
                 className='snipItBrowserExtensionIcon snipItBrowserExtensionIconChrome'
-                onClick={() => link.send('tray:action', 'navDash', { view: 'notify', data: { notify: 'openExternal', notifyData: { url: 'https://chrome.google.com/webstore/detail/frame-alpha/ldcoohedfbjoobcadoglnnmmfbdlmmhf' } }})}
+                onClick={() =>
+                  link.send('tray:action', 'navDash', {
+                    view: 'notify',
+                    data: {
+                      notify: 'openExternal',
+                      notifyData: {
+                        url: 'https://chrome.google.com/webstore/detail/frame-alpha/ldcoohedfbjoobcadoglnnmmfbdlmmhf',
+                      },
+                    },
+                  })
+                }
               >
                 {svg.chrome(28)}
               </div>
-              <div 
+              <div
                 className='snipItBrowserExtensionIcon snipItBrowserExtensionIconFirefox'
-                onClick={() => link.send('tray:action', 'navDash', { view: 'notify', data: { notify: 'openExternal', notifyData: { url: 'https://addons.mozilla.org/en-US/firefox/addon/frame-extension' } }})}
+                onClick={() =>
+                  link.send('tray:action', 'navDash', {
+                    view: 'notify',
+                    data: {
+                      notify: 'openExternal',
+                      notifyData: {
+                        url: 'https://addons.mozilla.org/en-US/firefox/addon/frame-extension',
+                      },
+                    },
+                  })
+                }
               >
                 {svg.firefox(28)}
               </div>
-              <div 
+              <div
                 className='snipItBrowserExtensionIcon snipItBrowserExtensionIconSafari'
-                onClick={() => link.send('tray:action', 'navDash', { view: 'notify', data: { notify: 'openExternal', notifyData: { url: 'https://addons.mozilla.org/en-US/firefox/addon/frame-extension' } }})}
+                onClick={() =>
+                  link.send('tray:action', 'navDash', {
+                    view: 'notify',
+                    data: {
+                      notify: 'openExternal',
+                      notifyData: {
+                        url: 'https://addons.mozilla.org/en-US/firefox/addon/frame-extension',
+                      },
+                    },
+                  })
+                }
               >
                 {svg.safari(28)}
               </div>
@@ -236,30 +317,47 @@ class Settings extends React.Component {
             <div>Inject a connection with our browser extension!</div>
           </div>
           <div className='requestFeature'>
-            <div className='requestFeatureButton' onClick={() => {
-              link.send('tray:openExternal', 'https://feedback.frame.sh')
-            }}>
-              Request a Feature 
+            <div
+              className='requestFeatureButton'
+              onClick={() => {
+                link.send('tray:openExternal', 'https://feedback.frame.sh')
+              }}
+            >
+              Request a Feature
             </div>
           </div>
           <div className='requestFeature'>
-            <div className='requestFeatureButton' onClick={() => {
-              link.send('tray:openExternal', 'https://discord.gg/UH7NGqY')
-            }}>
+            <div
+              className='requestFeatureButton'
+              onClick={() => {
+                link.send('tray:openExternal', 'https://discord.gg/UH7NGqY')
+              }}
+            >
               Need help? Join our Discord!
             </div>
           </div>
           <div className='requestFeature'>
-            <div className='requestFeatureButton' onClick={() => {
-              link.send('tray:quit')
-            }}>
+            <div
+              className='requestFeatureButton'
+              onClick={() => {
+                link.send('tray:quit')
+              }}
+            >
               Quit
             </div>
           </div>
-          <div 
-            className='viewLicense' 
-            onClick={() => link.send('tray:action', 'navDash', { view: 'notify', data: { notify: 'openExternal', notifyData: { url: 'https://github.com/floating/frame/blob/master/LICENSE' } }})}
-           >
+          <div
+            className='viewLicense'
+            onClick={() =>
+              link.send('tray:action', 'navDash', {
+                view: 'notify',
+                data: {
+                  notify: 'openExternal',
+                  notifyData: { url: 'https://github.com/floating/frame/blob/master/LICENSE' },
+                },
+              })
+            }
+          >
             View License
           </div>
           {this.appInfo()}
diff --git a/dash/App/Notify/AddChain/index.js b/dash/App/Notify/AddChain/index.js
index e15e99b88..8cb0171a5 100644
--- a/dash/App/Notify/AddChain/index.js
+++ b/dash/App/Notify/AddChain/index.js
@@ -4,7 +4,7 @@ import svg from '../../../../resources/svg'
 import link from '../../../../resources/link'
 
 class AddChain extends React.Component {
-  constructor (props, context) {
+  constructor(props, context) {
     super(props, context)
     this.newNetworkIdDefault = 'Chain ID'
     this.newNetworkNameDefault = 'Chain Name'
@@ -30,41 +30,43 @@ class AddChain extends React.Component {
       newNetworkSymbol: nativeChainCurrency.symbol || this.newNetworkSymbolDefault,
       newNetworkType: this.chain.type || this.newNetworkType,
       newNetworkLayer: this.chain.layer || 'other',
-      localShake: {}, 
-      resetConfirm: false, 
-      expandNetwork: false 
+      localShake: {},
+      resetConfirm: false,
+      expandNetwork: false,
     }
   }
 
-  render () {
-    const changedNewNetwork = (
+  render() {
+    const changedNewNetwork =
       this.state.newNetworkId !== this.newNetworkIdDefault ||
       this.state.newNetworkName !== this.newNetworkNameDefault ||
       this.state.newNetworkExplorer !== this.newNetworkExplorerDefault ||
       this.state.newNetworkSymbol !== this.newNetworkSymbolDefault ||
       this.state.newNetworkRPCPrimary !== this.newNetworkRPCPrimary ||
       this.state.newNetworkRPCSecondary !== this.newNetworkRPCSecondary
-    )
 
-    const newNetworkReady = (
-      this.state.newNetworkId !== this.newNetworkIdDefault && this.state.newNetworkId !== '' &&
-      this.state.newNetworkName !== this.newNetworkNameDefault && this.state.newNetworkName !== '' &&
-      this.state.newNetworkExplorer !== this.newNetworkExplorerDefault && this.state.newNetworkExplorer !== ''
-    )
+    const newNetworkReady =
+      this.state.newNetworkId !== this.newNetworkIdDefault &&
+      this.state.newNetworkId !== '' &&
+      this.state.newNetworkName !== this.newNetworkNameDefault &&
+      this.state.newNetworkName !== '' &&
+      this.state.newNetworkExplorer !== this.newNetworkExplorerDefault &&
+      this.state.newNetworkExplorer !== ''
 
     return (
-      <div className='notifyBoxWrap' onMouseDown={e => e.stopPropagation()}>
+      <div className='notifyBoxWrap' onMouseDown={(e) => e.stopPropagation()}>
         <div className='notifyBoxSlide'>
-          <div className='addChainTitle'>
-            Add New Chain
-          </div>
+          <div className='addChainTitle'>Add New Chain</div>
           <div className='addChain'>
             <div className='chainRow'>
               <div className='chainName'>
                 <div className='chainInputLabel'>Chain Name</div>
                 <input
-                  className={this.state.newNetworkName === this.newNetworkNameDefault ? 'chainInput chainInputDim' : 'chainInput'}
-                  value={this.state.newNetworkName} spellCheck='false'
+                  className={
+                    this.state.newNetworkName === this.newNetworkNameDefault ? 'chainInput chainInputDim' : 'chainInput'
+                  }
+                  value={this.state.newNetworkName}
+                  spellCheck='false'
                   onChange={(e) => {
                     this.setState({ newNetworkName: e.target.value })
                   }}
@@ -82,8 +84,11 @@ class AddChain extends React.Component {
               <div className='chainId'>
                 <div className='chainInputLabel'>Chain ID</div>
                 <input
-                  className={this.state.newNetworkId === this.newNetworkIdDefault ? 'chainInput chainInputDim' : 'chainInput'}
-                  value={this.state.newNetworkId} spellCheck='false'
+                  className={
+                    this.state.newNetworkId === this.newNetworkIdDefault ? 'chainInput chainInputDim' : 'chainInput'
+                  }
+                  value={this.state.newNetworkId}
+                  spellCheck='false'
                   onChange={(e) => {
                     if (Number(parseInt(e.target.value)) || e.target.value === '') {
                       this.setState({ newNetworkId: e.target.value })
@@ -101,8 +106,13 @@ class AddChain extends React.Component {
               <div className='chainSymbol'>
                 <div className='chainInputLabel'>Native Symbol</div>
                 <input
-                  className={this.state.newNetworkSymbol === this.newNetworkSymbolDefault ? 'chainInput chainInputDim' : 'chainInput'}
-                  value={this.state.newNetworkSymbol} spellCheck='false'
+                  className={
+                    this.state.newNetworkSymbol === this.newNetworkSymbolDefault
+                      ? 'chainInput chainInputDim'
+                      : 'chainInput'
+                  }
+                  value={this.state.newNetworkSymbol}
+                  spellCheck='false'
                   onChange={(e) => {
                     if (e.target.value.length > 8) return e.preventDefault()
                     this.setState({ newNetworkSymbol: e.target.value })
@@ -121,8 +131,13 @@ class AddChain extends React.Component {
               <div className='chainExplorer'>
                 <div className='chainInputLabel'>Block Explorer</div>
                 <input
-                  className={this.state.newNetworkExplorer === this.newNetworkExplorerDefault ? 'chainInput chainInputDim' : 'chainInput'}
-                  value={this.state.newNetworkExplorer} spellCheck='false'
+                  className={
+                    this.state.newNetworkExplorer === this.newNetworkExplorerDefault
+                      ? 'chainInput chainInputDim'
+                      : 'chainInput'
+                  }
+                  value={this.state.newNetworkExplorer}
+                  spellCheck='false'
                   onChange={(e) => {
                     this.setState({ newNetworkExplorer: e.target.value })
                   }}
@@ -140,8 +155,13 @@ class AddChain extends React.Component {
               <div className='chainExplorer'>
                 <div className='chainInputLabel'>Primary RPC</div>
                 <input
-                  className={this.state.newNetworkRPCPrimary === this.newNetworkRPCPrimary ? 'chainInput chainInputDim' : 'chainInput'}
-                  value={this.state.newNetworkRPCPrimary} spellCheck='false'
+                  className={
+                    this.state.newNetworkRPCPrimary === this.newNetworkRPCPrimary
+                      ? 'chainInput chainInputDim'
+                      : 'chainInput'
+                  }
+                  value={this.state.newNetworkRPCPrimary}
+                  spellCheck='false'
                   onChange={(e) => {
                     this.setState({ newNetworkRPCPrimary: e.target.value })
                   }}
@@ -159,8 +179,13 @@ class AddChain extends React.Component {
               <div className='chainExplorer'>
                 <div className='chainInputLabel'>Secondary RPC</div>
                 <input
-                  className={this.state.newNetworkRPCSecondary === this.newNetworkRPCSecondary ? 'chainInput chainInputDim' : 'chainInput'}
-                  value={this.state.newNetworkRPCSecondary} spellCheck='false'
+                  className={
+                    this.state.newNetworkRPCSecondary === this.newNetworkRPCSecondary
+                      ? 'chainInput chainInputDim'
+                      : 'chainInput'
+                  }
+                  value={this.state.newNetworkRPCSecondary}
+                  spellCheck='false'
                   onChange={(e) => {
                     this.setState({ newNetworkRPCSecondary: e.target.value })
                   }}
@@ -168,7 +193,7 @@ class AddChain extends React.Component {
                     if (e.target.value === this.newNetworkRPCSecondary) this.setState({ newNetworkRPCSecondary: '' })
                   }}
                   onBlur={(e) => {
-                    if (e.target.value === '') this.setState({ newNetworkRPCSecondary: this.newNetworkRPCSecondary})
+                    if (e.target.value === '') this.setState({ newNetworkRPCSecondary: this.newNetworkRPCSecondary })
                   }}
                 />
               </div>
@@ -218,30 +243,54 @@ class AddChain extends React.Component {
               <div className='chainLayers'>
                 <div className='chainInputLabel'>Chain Type</div>
                 <div className='chainLayerOptions'>
-                  <div 
-                    className={this.state.newNetworkLayer === 'rollup' ?  'chainLayerOption chainLayerOptionOn' : 'chainLayerOption'}
+                  <div
+                    className={
+                      this.state.newNetworkLayer === 'rollup'
+                        ? 'chainLayerOption chainLayerOptionOn'
+                        : 'chainLayerOption'
+                    }
                     onMouseDown={() => this.setState({ newNetworkLayer: 'rollup' })}
-                  >Rollup</div>
-                  <div 
-                    className={this.state.newNetworkLayer === 'sidechain' ?  'chainLayerOption chainLayerOptionOn' : 'chainLayerOption'}
+                  >
+                    Rollup
+                  </div>
+                  <div
+                    className={
+                      this.state.newNetworkLayer === 'sidechain'
+                        ? 'chainLayerOption chainLayerOptionOn'
+                        : 'chainLayerOption'
+                    }
                     onMouseDown={() => this.setState({ newNetworkLayer: 'sidechain' })}
-                  >Sidechain</div>
-                  <div 
-                    className={this.state.newNetworkLayer === 'testnet' ?  'chainLayerOption chainLayerOptionOn' : 'chainLayerOption'}
+                  >
+                    Sidechain
+                  </div>
+                  <div
+                    className={
+                      this.state.newNetworkLayer === 'testnet'
+                        ? 'chainLayerOption chainLayerOptionOn'
+                        : 'chainLayerOption'
+                    }
                     onMouseDown={() => this.setState({ newNetworkLayer: 'testnet' })}
-                  >Testnet</div>
-                  <div 
-                    className={this.state.newNetworkLayer === 'other' ?  'chainLayerOption chainLayerOptionOn' : 'chainLayerOption'}
+                  >
+                    Testnet
+                  </div>
+                  <div
+                    className={
+                      this.state.newNetworkLayer === 'other'
+                        ? 'chainLayerOption chainLayerOptionOn'
+                        : 'chainLayerOption'
+                    }
                     onMouseDown={() => this.setState({ newNetworkLayer: 'other' })}
-                  >Other</div>
+                  >
+                    Other
+                  </div>
                 </div>
               </div>
             </div>
 
             <div className='chainRow'>
               {changedNewNetwork && newNetworkReady ? (
-                <div 
-                  className='addTokenSubmit addTokenSubmitEnabled' 
+                <div
+                  className='addTokenSubmit addTokenSubmitEnabled'
                   onMouseDown={() => {
                     const net = {
                       id: this.state.newNetworkId,
@@ -262,11 +311,7 @@ class AddChain extends React.Component {
                   Add Chain
                 </div>
               ) : (
-                <div 
-                  className='addTokenSubmit' 
-                >
-                  Fill in Chain
-                </div>
+                <div className='addTokenSubmit'>Fill in Chain</div>
               )}
             </div>
           </div>
@@ -276,4 +321,4 @@ class AddChain extends React.Component {
   }
 }
 
-export default Restore.connect(AddChain)
\ No newline at end of file
+export default Restore.connect(AddChain)
diff --git a/dash/App/Notify/index.js b/dash/App/Notify/index.js
index 49fe99777..8bdd46c8d 100644
--- a/dash/App/Notify/index.js
+++ b/dash/App/Notify/index.js
@@ -12,30 +12,35 @@ import AddChain from './AddChain'
 
 const FEE_WARNING_THRESHOLD_USD = 50
 
-const capitalize = s => s[0].toUpperCase() + s.slice(1)
+const capitalize = (s) => s[0].toUpperCase() + s.slice(1)
 
 class Notify extends React.Component {
-  mainnet () {
+  mainnet() {
     return (
-      <div className='notifyBoxWrap' onMouseDown={e => e.stopPropagation()}>
+      <div className='notifyBoxWrap' onMouseDown={(e) => e.stopPropagation()}>
         <div className='notifyBox'>
           <div className='notifyFrameIcon'>
             <img src={frameIcon} />
           </div>
-          <div className='notifyTitle'>
-            Welcome to Frame!
-          </div>
-          <div className='notifySubtitle'>
-            System-wide web3
-          </div>
+          <div className='notifyTitle'>Welcome to Frame!</div>
+          <div className='notifySubtitle'>System-wide web3</div>
           <div className='notifyBody'>
             <div className='notifyBodyLine'>
-              Please read <span onMouseDown={() => { link.send('tray:openExternal', 'https://github.com/floating/frame/blob/master/LICENSE') }}>our license</span>, use at your own risk and verify transactions and account details on a signing device whenever possible.
+              Please read{' '}
+              <span
+                onMouseDown={() => {
+                  link.send('tray:openExternal', 'https://github.com/floating/frame/blob/master/LICENSE')
+                }}
+              >
+                our license
+              </span>
+              , use at your own risk and verify transactions and account details on a signing device whenever possible.
             </div>
           </div>
           <div className='notifyInput'>
             <div
-              className='notifyInputOption notifyInputSingleButton' onMouseDown={() => {
+              className='notifyInputOption notifyInputSingleButton'
+              onMouseDown={() => {
                 link.send('tray:action', 'muteWelcomeWarning')
                 link.send('tray:action', 'backDash')
               }}
@@ -48,17 +53,15 @@ class Notify extends React.Component {
     )
   }
 
-  betaDisclosure () {
+  betaDisclosure() {
     return (
-      <div className='notifyBoxWrap' onMouseDown={e => e.stopPropagation()}>
+      <div className='notifyBoxWrap' onMouseDown={(e) => e.stopPropagation()}>
         <div className='notifyBoxSlide'>
           <div className='notifyBox'>
             <div className='notifyFrameIcon'>
               <img src={frameIcon} />
             </div>
-            <div className='notifyTitle'>
-              Frame v0.5-beta
-            </div>
+            <div className='notifyTitle'>Frame v0.5-beta</div>
             <div className='notifyBody'>
               <div className='notifyBodyBlock notifyBodyBlockBig'>
                 We are excited to welcome you to the next iteration of Frame!
@@ -67,13 +70,16 @@ class Notify extends React.Component {
                 Be advised, this version of Frame is currently in "beta" and will update on a beta track
               </div>
               <div className='notifyBodyBlock'>
-                Use hardware signers for high value accounts and verify all transaction and account details on your signing device
+                Use hardware signers for high value accounts and verify all transaction and account details on your
+                signing device
               </div>
               <div className='notifyBodyBlock'>
                 <span>Read</span>
-                <span 
+                <span
                   className='notifyBodyLink'
-                  onMouseDown={() => { link.send('tray:openExternal', 'https://github.com/floating/frame/blob/0.5/LICENSE') }}
+                  onMouseDown={() => {
+                    link.send('tray:openExternal', 'https://github.com/floating/frame/blob/0.5/LICENSE')
+                  }}
                 >
                   our license
                 </span>
@@ -81,10 +87,12 @@ class Notify extends React.Component {
               </div>
               <div className='notifyBodyBlock notifyBodyBlockBig'>
                 <div>Please give us your feedback!</div>
-                <div 
-                  className='notifyBodyLink' 
-                  style={{marginTop: '20px'}}
-                  onMouseDown={() => { link.send('tray:openExternal', 'https://frame.canny.io') }}
+                <div
+                  className='notifyBodyLink'
+                  style={{ marginTop: '20px' }}
+                  onMouseDown={() => {
+                    link.send('tray:openExternal', 'https://frame.canny.io')
+                  }}
                 >
                   feedback.frame.sh
                 </div>
@@ -92,7 +100,8 @@ class Notify extends React.Component {
             </div>
             <div className='notifyInput'>
               <div
-                className='notifyInputOption notifyInputSingleButton' onMouseDown={() => {
+                className='notifyInputOption notifyInputSingleButton'
+                onMouseDown={() => {
                   link.send('tray:action', 'muteBetaDisclosure')
                   link.send('tray:action', 'backDash')
                 }}
@@ -164,23 +173,25 @@ class Notify extends React.Component {
   //   )
   // }
 
-  nonceWarning () {
+  nonceWarning() {
     return (
-      <div className='notifyBoxWrap' onMouseDown={e => e.stopPropagation()}>
+      <div className='notifyBoxWrap' onMouseDown={(e) => e.stopPropagation()}>
         <div className='notifyBoxSlide'>
           <div className='notifyBox'>
-            <div className='notifyTitle'>
-              Adjustable Nonce
-            </div>
+            <div className='notifyTitle'>Adjustable Nonce</div>
             <div className='notifyBody'>
               <div className='notifyBodyBlock notifyBodyBlockBig'>
                 <div>
-                  Adjusting the nonce of a replacement transaction will cause it to become a new transaction rather than a replacement, use with caution
+                  Adjusting the nonce of a replacement transaction will cause it to become a new transaction rather than
+                  a replacement, use with caution
                 </div>
               </div>
             </div>
             <div className='notifyInput'>
-              <div className='notifyInputOption notifyInputSingleButton' onMouseDown={() => link.send('tray:action', 'backDash')}>
+              <div
+                className='notifyInputOption notifyInputSingleButton'
+                onMouseDown={() => link.send('tray:action', 'backDash')}
+              >
                 <div className='notifyInputOptionText'>Got it!</div>
               </div>
             </div>
@@ -190,13 +201,11 @@ class Notify extends React.Component {
     )
   }
 
-  gasFeeWarning ({ req = {}, feeUSD = '0.00', currentSymbol = 'ETH' }) {
+  gasFeeWarning({ req = {}, feeUSD = '0.00', currentSymbol = 'ETH' }) {
     return (
-      <div className='notifyBoxWrap' onMouseDown={e => e.stopPropagation()}>
+      <div className='notifyBoxWrap' onMouseDown={(e) => e.stopPropagation()}>
         <div className='notifyBox'>
-          <div className='notifyTitle'>
-            Gas Fee Warning
-          </div>
+          <div className='notifyTitle'>Gas Fee Warning</div>
           <div className='notifyBody'>
             {feeUSD !== '0.00' ? (
               <>
@@ -210,14 +219,16 @@ class Notify extends React.Component {
           </div>
           <div className='notifyInput'>
             <div
-              className='notifyInputOption notifyInputDeny' onMouseDown={() => {
+              className='notifyInputOption notifyInputDeny'
+              onMouseDown={() => {
                 link.send('tray:action', 'backDash')
               }}
             >
               <div className='notifyInputOptionText'>Cancel</div>
             </div>
             <div
-              className='notifyInputOption notifyInputProceed' onMouseDown={() => {
+              className='notifyInputOption notifyInputProceed'
+              onMouseDown={() => {
                 link.rpc('approveRequest', req, () => {})
                 link.send('tray:action', 'backDash')
               }}
@@ -229,29 +240,28 @@ class Notify extends React.Component {
             <div className='notifyCheckBox'>
               {this.store('main.mute.gasFeeWarning') ? svg.octicon('check', { height: 26 }) : null}
             </div>
-            <div className='notifyCheckText'>
-              {'Don\'t show this warning again'}
-            </div>
+            <div className='notifyCheckText'>{"Don't show this warning again"}</div>
           </div>
         </div>
       </div>
     )
   }
 
-  signerLockedWarning ({ req = {} }) {
+  signerLockedWarning({ req = {} }) {
     return (
-      <div className='notifyBoxWrap' onMouseDown={e => e.stopPropagation()}>
+      <div className='notifyBoxWrap' onMouseDown={(e) => e.stopPropagation()}>
         <div className='notifyBox'>
-          <div className='notifyTitle'>
-            Signer locked!
-          </div>
+          <div className='notifyTitle'>Signer locked!</div>
           <div className='notifyBody'>
-            <div className='notifyBodyQuestion'>
-              Please unlock this signer and try again
-            </div>
+            <div className='notifyBodyQuestion'>Please unlock this signer and try again</div>
           </div>
           <div className='notifyInput'>
-            <div className='notifyInputOption notifyInputSingleButton' onMouseDown={() => { link.send('tray:action', 'backDash') }}>
+            <div
+              className='notifyInputOption notifyInputSingleButton'
+              onMouseDown={() => {
+                link.send('tray:action', 'backDash')
+              }}
+            >
               <div className='notifyInputOptionText'>OK</div>
             </div>
           </div>
@@ -260,23 +270,22 @@ class Notify extends React.Component {
     )
   }
 
-  noSignerWarning ({ req = {} }) {
+  noSignerWarning({ req = {} }) {
     return (
-      <div className='notifyBoxWrap' onMouseDown={e => e.stopPropagation()}>
+      <div className='notifyBoxWrap' onMouseDown={(e) => e.stopPropagation()}>
         <div className='notifyBox'>
-          <div className='notifyTitle'>
-            No Signer Attached!
-          </div>
+          <div className='notifyTitle'>No Signer Attached!</div>
           <div className='notifyBody'>
-              <div className='notifyBodyLine'>
-                No signer attached for this account
-              </div>
-            <div className='notifyBodyQuestion'>
-              Please attach a signer that can sign for this account
-            </div>
+            <div className='notifyBodyLine'>No signer attached for this account</div>
+            <div className='notifyBodyQuestion'>Please attach a signer that can sign for this account</div>
           </div>
           <div className='notifyInput'>
-            <div className='notifyInputOption notifyInputSingleButton' onMouseDown={() => { link.send('tray:action', 'backDash') }}>
+            <div
+              className='notifyInputOption notifyInputSingleButton'
+              onMouseDown={() => {
+                link.send('tray:action', 'backDash')
+              }}
+            >
               <div className='notifyInputOptionText'>OK</div>
             </div>
           </div>
@@ -285,45 +294,44 @@ class Notify extends React.Component {
     )
   }
 
-  toDisplayUSD (bn) {
+  toDisplayUSD(bn) {
     return bn.toFixed(2, BigNumber.ROUND_UP).toString()
   }
 
-  signerCompatibilityWarning ({ req = {}, compatibility = {}, chain = {} }) {
+  signerCompatibilityWarning({ req = {}, compatibility = {}, chain = {} }) {
     const { signer, tx, compatible } = compatibility
     return (
-      <div className='notifyBoxWrap' onMouseDown={e => e.stopPropagation()}>
+      <div className='notifyBoxWrap' onMouseDown={(e) => e.stopPropagation()}>
         <div className='notifyBox'>
-          <div className='notifyTitle'>
-            Signer Compatibility
-          </div>
+          <div className='notifyTitle'>Signer Compatibility</div>
           <div className='notifyBody'>
             <div className='notifyBodyLine'>
-              {`Your ${capitalize(signer)} is not compatible with ${capitalize(tx)} ${tx === 'london' ? '(EIP-1559) ' : ''}transactions. Your transaction will be converted to a legacy transaction before signing.`}
+              {`Your ${capitalize(signer)} is not compatible with ${capitalize(tx)} ${
+                tx === 'london' ? '(EIP-1559) ' : ''
+              }transactions. Your transaction will be converted to a legacy transaction before signing.`}
             </div>
             {['lattice', 'ledger'].includes(signer) ? (
-              <div className='notifyBodyUpdate'>
-                {`Update your ${capitalize(signer)} to enable compatibility`}
-              </div>
+              <div className='notifyBodyUpdate'>{`Update your ${capitalize(signer)} to enable compatibility`}</div>
             ) : null}
-            <div className='notifyBodyQuestion'>
-              Do you want to proceed?
-            </div>
+            <div className='notifyBodyQuestion'>Do you want to proceed?</div>
           </div>
           <div className='notifyInput'>
             <div
-              className='notifyInputOption notifyInputDeny' onMouseDown={() => {
+              className='notifyInputOption notifyInputDeny'
+              onMouseDown={() => {
                 link.send('tray:action', 'backDash')
               }}
             >
               <div className='notifyInputOptionText'>Cancel</div>
             </div>
             <div
-              className='notifyInputOption notifyInputProceed' onMouseDown={() => {
+              className='notifyInputOption notifyInputProceed'
+              onMouseDown={() => {
                 // TODO: Transacionns need a better flow to respond to mutiple notifications after hitting sign
                 const layer = this.store('main.networks', chain.type, chain.id, 'layer')
                 const nativeCurrency = this.store('main.networksMeta', chain.type, chain.id, 'nativeCurrency')
-                const nativeUSD = nativeCurrency && nativeCurrency.usd && layer !== 'testnet' ? nativeCurrency.usd.price : 0
+                const nativeUSD =
+                  nativeCurrency && nativeCurrency.usd && layer !== 'testnet' ? nativeCurrency.usd.price : 0
                 const currentSymbol = this.store('main.networks', chain.type, chain.id, 'symbol') || '?'
 
                 let maxFeePerGas, maxFee, maxFeeUSD
@@ -339,9 +347,18 @@ class Notify extends React.Component {
                   maxFee = maxFeePerGas.multipliedBy(gasLimit)
                   maxFeeUSD = maxFee.shiftedBy(-18).multipliedBy(nativeUSD)
                 }
-                
-                if ((maxFeeUSD.toNumber() > FEE_WARNING_THRESHOLD_USD || this.toDisplayUSD(maxFeeUSD) === '0.00') && !this.store('main.mute.gasFeeWarning')) {
-                  link.send('tray:action', 'navDash', { view: 'notify', data: { notify: 'gasFeeWarning', notifyData: { req, feeUSD: this.toDisplayUSD(maxFeeUSD), currentSymbol } }})
+
+                if (
+                  (maxFeeUSD.toNumber() > FEE_WARNING_THRESHOLD_USD || this.toDisplayUSD(maxFeeUSD) === '0.00') &&
+                  !this.store('main.mute.gasFeeWarning')
+                ) {
+                  link.send('tray:action', 'navDash', {
+                    view: 'notify',
+                    data: {
+                      notify: 'gasFeeWarning',
+                      notifyData: { req, feeUSD: this.toDisplayUSD(maxFeeUSD), currentSymbol },
+                    },
+                  })
                 } else {
                   link.rpc('approveRequest', req, () => {})
                   link.send('tray:action', 'backDash')
@@ -355,19 +372,21 @@ class Notify extends React.Component {
             <div className='notifyCheckBox'>
               {this.store('main.mute.signerCompatibilityWarning') ? svg.octicon('check', { height: 26 }) : null}
             </div>
-            <div className='notifyCheckText'>
-              {'Don\'t show this warning again'}
-            </div>
+            <div className='notifyCheckText'>{"Don't show this warning again"}</div>
           </div>
         </div>
       </div>
     )
   }
 
-  contractData () {
+  contractData() {
     return (
-      <div className='notifyBoxWrap' onMouseDown={e => e.stopPropagation()} style={this.store('view.notify') === 'contractData' ? { transform: 'translateX(calc(-100% - 100px))' } : {}}>
-        <div className='notifyBox' >
+      <div
+        className='notifyBoxWrap'
+        onMouseDown={(e) => e.stopPropagation()}
+        style={this.store('view.notify') === 'contractData' ? { transform: 'translateX(calc(-100% - 100px))' } : {}}
+      >
+        <div className='notifyBox'>
           <div className='notifyTitle'>
             <div>Contract Data</div>
             <div>Not Allowed</div>
@@ -385,7 +404,12 @@ class Notify extends React.Component {
             </div>
           </div>
           <div className='notifyInput'>
-            <div className='notifyInputOption notifyInputSingleButton' onMouseDown={() => { link.send('tray:action', 'backDash') }}>
+            <div
+              className='notifyInputOption notifyInputSingleButton'
+              onMouseDown={() => {
+                link.send('tray:action', 'backDash')
+              }}
+            >
               <div className='notifyInputOptionText'>OK</div>
             </div>
           </div>
@@ -394,18 +418,32 @@ class Notify extends React.Component {
     )
   }
 
-  hotAccountWarning () {
+  hotAccountWarning() {
     return (
-      <div className='notifyBoxWrap' onMouseDown={e => e.stopPropagation()} style={this.store('view.notify') === 'hotAccountWarning' ? { transform: 'translateX(calc(-100% - 100px))' } : {}}>
+      <div
+        className='notifyBoxWrap'
+        onMouseDown={(e) => e.stopPropagation()}
+        style={
+          this.store('view.notify') === 'hotAccountWarning' ? { transform: 'translateX(calc(-100% - 100px))' } : {}
+        }
+      >
         <div className='notifyBox'>
           <div className='notifyTitle'>
             <div>Hot Signer Alpha</div>
           </div>
           <div className='notifyBody'>
-            <div className='notifyBodyLine'>Frame hot signers are in alpha! Do not use them with high value accounts and verify your backups are valid. Only proceed if you understand and accept these risks.</div>
+            <div className='notifyBodyLine'>
+              Frame hot signers are in alpha! Do not use them with high value accounts and verify your backups are
+              valid. Only proceed if you understand and accept these risks.
+            </div>
           </div>
           <div className='notifyInput'>
-            <div className='notifyInputOption notifyInputSingleButton' onMouseDown={() => { link.send('tray:action', 'backDash') }}>
+            <div
+              className='notifyInputOption notifyInputSingleButton'
+              onMouseDown={() => {
+                link.send('tray:action', 'backDash')
+              }}
+            >
               <div className='notifyInputOptionText'>OK</div>
             </div>
           </div>
@@ -414,18 +452,31 @@ class Notify extends React.Component {
     )
   }
 
-  hotSignerMismatch () {
+  hotSignerMismatch() {
     return (
-      <div className='notifyBoxWrap' onMouseDown={e => e.stopPropagation()} style={this.store('view.notify') === 'hotSignerMismatch' ? { transform: 'translateX(calc(-100% - 100px))' } : {}}>
+      <div
+        className='notifyBoxWrap'
+        onMouseDown={(e) => e.stopPropagation()}
+        style={
+          this.store('view.notify') === 'hotSignerMismatch' ? { transform: 'translateX(calc(-100% - 100px))' } : {}
+        }
+      >
         <div className='notifyBox'>
           <div className='notifyTitle'>
             <div>Hot Signer Address Mismatch</div>
           </div>
           <div className='notifyBody'>
-            <div className='notifyBodyLine'>The unlocked hot signer did not match the address shown in Frame and has been relocked.</div>
+            <div className='notifyBodyLine'>
+              The unlocked hot signer did not match the address shown in Frame and has been relocked.
+            </div>
           </div>
           <div className='notifyInput'>
-            <div className='notifyInputOption notifyInputSingleButton' onMouseDown={() => { link.send('tray:action', 'backDash') }}>
+            <div
+              className='notifyInputOption notifyInputSingleButton'
+              onMouseDown={() => {
+                link.send('tray:action', 'backDash')
+              }}
+            >
               <div className='notifyInputOptionText'>OK</div>
             </div>
           </div>
@@ -434,27 +485,27 @@ class Notify extends React.Component {
     )
   }
 
-  openExternal ({ url }) {
+  openExternal({ url }) {
     return (
-      <div className='notifyBoxWrap' onMouseDown={e => e.stopPropagation()}>
+      <div className='notifyBoxWrap' onMouseDown={(e) => e.stopPropagation()}>
         <div className='notifyBox'>
-          <div className='notifyTitle'>
-            Open External Link
-          </div>
+          <div className='notifyTitle'>Open External Link</div>
           <div className='notifyBody'>
             <div className='notifyBodyLineUrl'>{url}</div>
             <div className='notifyBodyLine'>{'Open Link in Browser?'}</div>
           </div>
           <div className='notifyInput'>
             <div
-              className='notifyInputOption notifyInputDeny' onMouseDown={() => {
+              className='notifyInputOption notifyInputDeny'
+              onMouseDown={() => {
                 link.send('tray:action', 'backDash')
               }}
             >
               <div className='notifyInputOptionText'>Cancel</div>
             </div>
             <div
-              className='notifyInputOption notifyInputProceed' onMouseDown={() => {
+              className='notifyInputOption notifyInputProceed'
+              onMouseDown={() => {
                 link.send('tray:openExternal', url)
                 link.send('tray:action', 'backDash')
               }}
@@ -467,27 +518,27 @@ class Notify extends React.Component {
     )
   }
 
-  openExplorer ({ hash, chain }) {
+  openExplorer({ hash, chain }) {
     return (
-      <div className='notifyBoxWrap' onMouseDown={e => e.stopPropagation()}>
+      <div className='notifyBoxWrap' onMouseDown={(e) => e.stopPropagation()}>
         <div className='notifyBox'>
-          <div className='notifyTitle'>
-            Open Block Explorer
-          </div>
+          <div className='notifyTitle'>Open Block Explorer</div>
           <div className='notifyBody'>
             <div className='notifyBodyLine'>Frame will open a block explorer in your browser for transaction:</div>
             <div className='notifyBodyHash'>{hash}</div>
           </div>
           <div className='notifyInput'>
             <div
-              className='notifyInputOption notifyInputDeny' onMouseDown={() => {
+              className='notifyInputOption notifyInputDeny'
+              onMouseDown={() => {
                 link.send('tray:action', 'backDash')
               }}
             >
               <div className='notifyInputOptionText'>Cancel</div>
             </div>
             <div
-              className='notifyInputOption notifyInputProceed' onMouseDown={() => {
+              className='notifyInputOption notifyInputProceed'
+              onMouseDown={() => {
                 link.send('tray:openExplorer', hash, chain)
                 link.send('tray:action', 'backDash')
               }}
@@ -496,25 +547,22 @@ class Notify extends React.Component {
             </div>
           </div>
           <div
-            className='notifyCheck' onMouseDown={() => {
+            className='notifyCheck'
+            onMouseDown={() => {
               link.send('tray:action', 'toggleExplorerWarning')
             }}
           >
             <div className='notifyCheckBox'>
-              {this.store('main.mute.explorerWarning') ? (
-                svg.octicon('check', { height: 26 })
-              ) : null}
-            </div>
-            <div className='notifyCheckText'>
-              {'Don\'t show this warning again'}
+              {this.store('main.mute.explorerWarning') ? svg.octicon('check', { height: 26 }) : null}
             </div>
+            <div className='notifyCheckText'>{"Don't show this warning again"}</div>
           </div>
         </div>
       </div>
     )
   }
 
-  render () {
+  render() {
     const { notify, notifyData } = this.props.data
     if (notify === 'mainnet') {
       return (
@@ -523,11 +571,7 @@ class Notify extends React.Component {
         </div>
       )
     } else if (notify === 'betaDisclosure') {
-      return (
-        <div className='notify cardShow'>
-          {this.betaDisclosure()}
-        </div>
-      )
+      return <div className='notify cardShow'>{this.betaDisclosure()}</div>
     } else if (notify === 'nonceWarning') {
       return (
         <div className='notify cardShow' onMouseDown={() => link.send('tray:action', 'backDash')}>
@@ -535,59 +579,23 @@ class Notify extends React.Component {
         </div>
       )
     } else if (notify === 'gasFeeWarning') {
-      return (
-        <div className='notify cardShow'>
-          {this.gasFeeWarning(notifyData)}
-        </div>
-      )
+      return <div className='notify cardShow'>{this.gasFeeWarning(notifyData)}</div>
     } else if (notify === 'noSignerWarning') {
-      return (
-        <div className='notify cardShow'>
-          {this.noSignerWarning(notifyData)}
-        </div>
-      )
+      return <div className='notify cardShow'>{this.noSignerWarning(notifyData)}</div>
     } else if (notify === 'signerLockedWarning') {
-      return (
-        <div className='notify cardShow'>
-          {this.signerLockedWarning(notifyData)}
-        </div>
-      )
+      return <div className='notify cardShow'>{this.signerLockedWarning(notifyData)}</div>
     } else if (notify === 'signerCompatibilityWarning') {
-      return (
-        <div className='notify cardShow'>
-          {this.signerCompatibilityWarning(notifyData)}
-        </div>
-      )
+      return <div className='notify cardShow'>{this.signerCompatibilityWarning(notifyData)}</div>
     } else if (notify === 'contractData') {
-      return (
-        <div className='notify cardShow'>
-          {this.contractData()}
-        </div>
-      )
+      return <div className='notify cardShow'>{this.contractData()}</div>
     } else if (notify === 'hotAccountWarning') {
-      return (
-        <div className='notify cardShow'>
-          {this.hotAccountWarning()}
-        </div>
-      )
+      return <div className='notify cardShow'>{this.hotAccountWarning()}</div>
     } else if (notify === 'hotSignerMismatch') {
-      return (
-        <div className='notify cardShow'>
-          {this.hotSignerMismatch()}
-        </div>
-      )
+      return <div className='notify cardShow'>{this.hotSignerMismatch()}</div>
     } else if (notify === 'openExternal') {
-      return (
-        <div className='notify cardShow'>
-          {this.openExternal(notifyData)}
-        </div>
-      )
+      return <div className='notify cardShow'>{this.openExternal(notifyData)}</div>
     } else if (notify === 'openExplorer') {
-      return (
-        <div className='notify cardShow'>
-          {this.openExplorer(notifyData)}
-        </div>
-      )
+      return <div className='notify cardShow'>{this.openExplorer(notifyData)}</div>
     } else if (notify === 'addChain') {
       return (
         <div className='notify cardShow'>
diff --git a/dash/App/Settings/index.js b/dash/App/Settings/index.js
index b82eed416..6e382baf4 100644
--- a/dash/App/Settings/index.js
+++ b/dash/App/Settings/index.js
@@ -6,7 +6,7 @@ import Dropdown from '../../../resources/Components/Dropdown'
 import { okPort, okProtocol } from '../../../resources/connections'
 
 class Settings extends React.Component {
-  constructor (props, context) {
+  constructor(props, context) {
     super(props, context)
     // this.customMessage = 'Custom Endpoint'
     // this.network = context.store('main.currentNetwork.id')
@@ -15,7 +15,13 @@ class Settings extends React.Component {
     // const secondaryCustom = context.store('main.networks', this.networkType, this.network, 'connection.secondary.custom') || this.customMessage
     const latticeEndpoint = context.store('main.latticeSettings.endpointCustom')
     const latticeEndpointMode = context.store('main.latticeSettings.endpointMode')
-    this.state = { localShake: {}, latticeEndpoint, latticeEndpointMode, resetConfirm: false, expandNetwork: false }
+    this.state = {
+      localShake: {},
+      latticeEndpoint,
+      latticeEndpointMode,
+      resetConfirm: false,
+      expandNetwork: false,
+    }
     // context.store.observer(() => {
     //   const { type, id } = context.store('main.currentNetwork')
     //   if (this.network !== id || this.networkType !== type) {
@@ -62,42 +68,51 @@ class Settings extends React.Component {
   //   if (this.state.secondaryCustom === '') this.setState({ secondaryCustom: this.customMessage })
   // }
 
-  customPrimaryFocus () {
+  customPrimaryFocus() {
     if (this.state.primaryCustom === this.customMessage) this.setState({ primaryCustom: '' })
   }
 
-  customPrimaryBlur () {
+  customPrimaryBlur() {
     if (this.state.primaryCustom === '') this.setState({ primaryCustom: this.customMessage })
   }
 
-  inputPrimaryCustom (e) {
+  inputPrimaryCustom(e) {
     e.preventDefault()
     clearTimeout(this.customPrimaryInputTimeout)
     const value = e.target.value.replace(/\s+/g, '')
     this.setState({ primaryCustom: value })
     const { type, id } = this.store('main.currentNetwork')
-    this.customPrimaryInputTimeout = setTimeout(() => link.send('tray:action', 'setPrimaryCustom', type, id, this.state.primaryCustom), 1000)
+    this.customPrimaryInputTimeout = setTimeout(
+      () => link.send('tray:action', 'setPrimaryCustom', type, id, this.state.primaryCustom),
+      1000
+    )
   }
 
-  inputSecondaryCustom (e) {
+  inputSecondaryCustom(e) {
     e.preventDefault()
     clearTimeout(this.customSecondaryInputTimeout)
     const value = e.target.value.replace(/\s+/g, '')
     this.setState({ secondaryCustom: value })
     const { type, id } = this.store('main.currentNetwork')
-    this.customSecondaryInputTimeout = setTimeout(() => link.send('tray:action', 'setSecondaryCustom', type, id, this.state.secondaryCustom), 1000)
+    this.customSecondaryInputTimeout = setTimeout(
+      () => link.send('tray:action', 'setSecondaryCustom', type, id, this.state.secondaryCustom),
+      1000
+    )
   }
 
-  inputLatticeEndpoint (e) {
+  inputLatticeEndpoint(e) {
     e.preventDefault()
     clearTimeout(this.inputLatticeTimeout)
     const value = e.target.value.replace(/\s+/g, '')
     this.setState({ latticeEndpoint: value })
     // TODO: Update to target specific Lattice device rather than global
-    this.inputLatticeTimeout = setTimeout(() => link.send('tray:action', 'setLatticeEndpointCustom', this.state.latticeEndpoint), 1000)
+    this.inputLatticeTimeout = setTimeout(
+      () => link.send('tray:action', 'setLatticeEndpointCustom', this.state.latticeEndpoint),
+      1000
+    )
   }
 
-  localShake (key) {
+  localShake(key) {
     const localShake = Object.assign({}, this.state.localShake)
     localShake[key] = true
     this.setState({ localShake })
@@ -108,7 +123,7 @@ class Settings extends React.Component {
     }, 1010)
   }
 
-  status (layer) {
+  status(layer) {
     const { type, id } = this.store('main.currentNetwork')
     const connection = this.store('main.networks', type, id, 'connection', layer)
     let status = connection.status
@@ -120,7 +135,11 @@ class Settings extends React.Component {
         else if (!okPort(this.state.primaryCustom)) status = 'invalid port'
       }
 
-      if (layer === 'secondary' && this.state.secondaryCustom !== '' && this.state.secondaryCustom !== this.customMessage) {
+      if (
+        layer === 'secondary' &&
+        this.state.secondaryCustom !== '' &&
+        this.state.secondaryCustom !== this.customMessage
+      ) {
         if (!okProtocol(this.state.secondaryCustom)) status = 'invalid target'
         else if (!okPort(this.state.secondaryCustom)) status = 'invalid port'
       }
@@ -134,16 +153,16 @@ class Settings extends React.Component {
     )
   }
 
-  discord () {
+  discord() {
     return (
-      <div className='discordInvite' onClick={() => link.send('tray:openExternal', 'https://discord.gg/UH7NGqY') }>
+      <div className='discordInvite' onClick={() => link.send('tray:openExternal', 'https://discord.gg/UH7NGqY')}>
         <div>Need help?</div>
         <div className='discordLink'>Join our Discord!</div>
       </div>
     )
   }
 
-  quit () {
+  quit() {
     return (
       <div className='addCustomTokenButtonWrap quitFrame' style={{ zIndex: 215 }}>
         <div className='addCustomTokenButton' onClick={() => link.send('tray:quit')}>
@@ -153,27 +172,39 @@ class Settings extends React.Component {
     )
   }
 
-  indicator (status) {
+  indicator(status) {
     if (status === 'connected') {
-      return <div className='connectionOptionStatusIndicator'><div className='connectionOptionStatusIndicatorGood' /></div>
+      return (
+        <div className='connectionOptionStatusIndicator'>
+          <div className='connectionOptionStatusIndicatorGood' />
+        </div>
+      )
     } else if (status === 'loading' || status === 'syncing' || status === 'pending' || status === 'standby') {
-      return <div className='connectionOptionStatusIndicator'><div className='connectionOptionStatusIndicatorPending' /></div>
+      return (
+        <div className='connectionOptionStatusIndicator'>
+          <div className='connectionOptionStatusIndicatorPending' />
+        </div>
+      )
     } else {
-      return <div className='connectionOptionStatusIndicator'><div className='connectionOptionStatusIndicatorBad' /></div>
+      return (
+        <div className='connectionOptionStatusIndicator'>
+          <div className='connectionOptionStatusIndicatorBad' />
+        </div>
+      )
     }
   }
 
-  selectNetwork (network) {
+  selectNetwork(network) {
     const [type, id] = network.split(':')
     if (network.type !== type || network.id !== id) link.send('tray:action', 'selectNetwork', type, id)
   }
 
-  expandNetwork (e, expand) {
+  expandNetwork(e, expand) {
     e.stopPropagation()
     this.setState({ expandNetwork: expand !== undefined ? expand : !this.state.expandNetwork })
   }
 
-  render () {
+  render() {
     return (
       <div className={'localSettings cardShow'}>
         <div className='localSettingsWrap'>
@@ -186,68 +217,100 @@ class Settings extends React.Component {
           <div className='signerPermission localSetting' style={{ zIndex: 214 }}>
             <div className='signerPermissionControls'>
               <div className='signerPermissionSetting'>Summon Shortcut</div>
-              <div className={this.store('main.shortcuts.altSlash') ? 'signerPermissionToggle signerPermissionToggleOn' : 'signerPermissionToggle'} onClick={_ => link.send('tray:action', 'setAltSpace', !this.store('main.shortcuts.altSlash'))}>
+              <div
+                className={
+                  this.store('main.shortcuts.altSlash')
+                    ? 'signerPermissionToggle signerPermissionToggleOn'
+                    : 'signerPermissionToggle'
+                }
+                onClick={(_) => link.send('tray:action', 'setAltSpace', !this.store('main.shortcuts.altSlash'))}
+              >
                 <div className='signerPermissionToggleSwitch' />
               </div>
             </div>
             <div className='signerPermissionDetails'>
               <span>
-                Summon Frame by pressing <span className='keyCommand'>{this.store('platform') === 'darwin' ? 'Option' : 'Alt'}<span style={{ padding: '0px 3px' }}>+</span>/</span>
+                Summon Frame by pressing{' '}
+                <span className='keyCommand'>
+                  {this.store('platform') === 'darwin' ? 'Option' : 'Alt'}
+                  <span style={{ padding: '0px 3px' }}>+</span>/
+                </span>
               </span>
             </div>
           </div>
           <div className='signerPermission localSetting' style={{ zIndex: 213 }}>
             <div className='signerPermissionControls'>
               <div className='signerPermissionSetting'>Auto-hide</div>
-              <div className={this.store('main.autohide') ? 'signerPermissionToggle signerPermissionToggleOn' : 'signerPermissionToggle'} onClick={_ => link.send('tray:action', 'setAutohide', !this.store('main.autohide'))}>
+              <div
+                className={
+                  this.store('main.autohide')
+                    ? 'signerPermissionToggle signerPermissionToggleOn'
+                    : 'signerPermissionToggle'
+                }
+                onClick={(_) => link.send('tray:action', 'setAutohide', !this.store('main.autohide'))}
+              >
                 <div className='signerPermissionToggleSwitch' />
               </div>
             </div>
             <div className='signerPermissionDetails'>
-              <span>
-                Hide Frame on loss of focus
-              </span>
+              <span>Hide Frame on loss of focus</span>
             </div>
           </div>
           <div className='signerPermission localSetting' style={{ zIndex: 212 }}>
             <div className='signerPermissionControls'>
               <div className='signerPermissionSetting'>Run on Startup</div>
-              <div className={this.store('main.launch') ? 'signerPermissionToggle signerPermissionToggleOn' : 'signerPermissionToggle'} onClick={_ => link.send('tray:action', 'toggleLaunch')}>
+              <div
+                className={
+                  this.store('main.launch')
+                    ? 'signerPermissionToggle signerPermissionToggleOn'
+                    : 'signerPermissionToggle'
+                }
+                onClick={(_) => link.send('tray:action', 'toggleLaunch')}
+              >
                 <div className='signerPermissionToggleSwitch' />
               </div>
             </div>
-            <div className='signerPermissionDetails'>
-              Run Frame when your computer starts
-            </div>
+            <div className='signerPermissionDetails'>Run Frame when your computer starts</div>
           </div>
           <div className='signerPermission localSetting' style={{ zIndex: 211 }}>
             <div className='signerPermissionControls'>
               <div className='signerPermissionSetting'>Glide</div>
-              <div className={this.store('main.reveal') ? 'signerPermissionToggle signerPermissionToggleOn' : 'signerPermissionToggle'} onClick={_ => link.send('tray:action', 'toggleReveal')}>
+              <div
+                className={
+                  this.store('main.reveal')
+                    ? 'signerPermissionToggle signerPermissionToggleOn'
+                    : 'signerPermissionToggle'
+                }
+                onClick={(_) => link.send('tray:action', 'toggleReveal')}
+              >
                 <div className='signerPermissionToggleSwitch' />
               </div>
             </div>
-            <div className='signerPermissionDetails'>
-              {'Mouse to display\'s right edge to summon Frame'}
-            </div>
+            <div className='signerPermissionDetails'>{"Mouse to display's right edge to summon Frame"}</div>
           </div>
           <div className='signerPermission localSetting' style={{ zIndex: 210 }}>
             <div className='signerPermissionControls'>
               <div className='signerPermissionSetting'>Adjustable Nonce</div>
               <div
-                className={this.store('main.nonceAdjust') ? 'signerPermissionToggle signerPermissionToggleOn' : 'signerPermissionToggle'} onClick={_ => {
+                className={
+                  this.store('main.nonceAdjust')
+                    ? 'signerPermissionToggle signerPermissionToggleOn'
+                    : 'signerPermissionToggle'
+                }
+                onClick={(_) => {
                   link.send('tray:action', 'toggleNonceAdjust')
                   if (!this.store('main.nonceAdjust')) {
-                    link.send('tray:action', 'navDash', { view: 'notify', data: { notify: 'nonceWarning', notifyData: {}} })
+                    link.send('tray:action', 'navDash', {
+                      view: 'notify',
+                      data: { notify: 'nonceWarning', notifyData: {} },
+                    })
                   }
                 }}
               >
                 <div className='signerPermissionToggleSwitch' />
               </div>
             </div>
-            <div className='signerPermissionDetails'>
-              {'Adds the ability to edit a transaction\'s nonce'}
-            </div>
+            <div className='signerPermissionDetails'>{"Adds the ability to edit a transaction's nonce"}</div>
           </div>
           {/* <div className='signerPermission localSetting' style={{ zIndex: 6 }}>
             <div className='signerPermissionControls'>
@@ -264,13 +327,18 @@ class Settings extends React.Component {
             <div className='signerPermission localSetting' style={{ zIndex: 209 }}>
               <div className='signerPermissionControls'>
                 <div className='signerPermissionSetting'>Display Gas in Menubar</div>
-                <div className={this.store('main.menubarGasPrice') ? 'signerPermissionToggle signerPermissionToggleOn' : 'signerPermissionToggle'} onClick={_ => link.send('tray:action', 'setMenubarGasPrice', !this.store('main.menubarGasPrice'))}>
+                <div
+                  className={
+                    this.store('main.menubarGasPrice')
+                      ? 'signerPermissionToggle signerPermissionToggleOn'
+                      : 'signerPermissionToggle'
+                  }
+                  onClick={(_) => link.send('tray:action', 'setMenubarGasPrice', !this.store('main.menubarGasPrice'))}
+                >
                   <div className='signerPermissionToggleSwitch' />
                 </div>
               </div>
-              <div className='signerPermissionDetails'>
-                Show current gas price (Gwei) in menubar
-              </div>
+              <div className='signerPermissionDetails'>Show current gas price (Gwei) in menubar</div>
             </div>
           ) : null}
           <div className='signerPermission localSetting' style={{ zIndex: 208 }}>
@@ -279,13 +347,14 @@ class Settings extends React.Component {
               <Dropdown
                 syncValue={this.store('main.colorway')}
                 onChange={(value) => link.send('tray:action', 'setColorway', value)}
-                options={[{ text: 'Dark', value: 'dark' }, { text: 'Light', value: 'light' }]}
+                options={[
+                  { text: 'Dark', value: 'dark' },
+                  { text: 'Light', value: 'light' },
+                ]}
               />
             </div>
             <div className='signerPermissionDetails'>
-              <span>
-                Set Frame's visual theme
-              </span>
+              <span>Set Frame's visual theme</span>
             </div>
           </div>
           <div className='signerPermission localSetting' style={{ zIndex: 207 }}>
@@ -294,12 +363,14 @@ class Settings extends React.Component {
               <Dropdown
                 syncValue={this.store('main.trezor.derivation')}
                 onChange={(value) => link.send('tray:action', 'setTrezorDerivation', value)}
-                options={[{ text: 'Standard', value: 'standard' }, { text: 'Legacy', value: 'legacy' }, { text: 'Testnet', value: 'testnet' }]}
+                options={[
+                  { text: 'Standard', value: 'standard' },
+                  { text: 'Legacy', value: 'legacy' },
+                  { text: 'Testnet', value: 'testnet' },
+                ]}
               />
             </div>
-            <div className='signerPermissionDetails'>
-              {'Derivation path for connected Trezor devices'}
-            </div>
+            <div className='signerPermissionDetails'>{'Derivation path for connected Trezor devices'}</div>
           </div>
           <div className='signerPermission localSetting' style={{ zIndex: 206 }}>
             <div className='signerPermissionControls'>
@@ -307,12 +378,15 @@ class Settings extends React.Component {
               <Dropdown
                 syncValue={this.store('main.ledger.derivation')}
                 onChange={(value) => link.send('tray:action', 'setLedgerDerivation', value)}
-                options={[{ text: 'Live', value: 'live' }, { text: 'Legacy', value: 'legacy' }, { text: 'Standard', value: 'standard' }, { text: 'Testnet', value: 'testnet' }]}
+                options={[
+                  { text: 'Live', value: 'live' },
+                  { text: 'Legacy', value: 'legacy' },
+                  { text: 'Standard', value: 'standard' },
+                  { text: 'Testnet', value: 'testnet' },
+                ]}
               />
             </div>
-            <div className='signerPermissionDetails'>
-              {'Derivation path for connected Ledger devices'}
-            </div>
+            <div className='signerPermissionDetails'>{'Derivation path for connected Ledger devices'}</div>
           </div>
           {this.store('main.ledger.derivation') === 'live' ? (
             <div className='signerPermission localSetting' style={{ zIndex: 205 }}>
@@ -325,13 +399,11 @@ class Settings extends React.Component {
                     { text: '5', value: 5 },
                     { text: '10', value: 10 },
                     { text: '20', value: 20 },
-                    { text: '40', value: 40 }
+                    { text: '40', value: 40 },
                   ]}
                 />
               </div>
-              <div className='signerPermissionDetails'>
-                The number of live accounts to derive
-              </div>
+              <div className='signerPermissionDetails'>The number of live accounts to derive</div>
             </div>
           ) : null}
           <div className='signerPermission localSetting' style={{ zIndex: 204 }}>
@@ -340,12 +412,14 @@ class Settings extends React.Component {
               <Dropdown
                 syncValue={this.store('main.latticeSettings.derivation')}
                 onChange={(value) => link.send('tray:action', 'setLatticeDerivation', value)}
-                options={[{ text: 'Standard', value: 'standard' }, { text: 'Legacy', value: 'legacy' }, { text: 'Live', value: 'live' }]}
+                options={[
+                  { text: 'Standard', value: 'standard' },
+                  { text: 'Legacy', value: 'legacy' },
+                  { text: 'Live', value: 'live' },
+                ]}
               />
             </div>
-            <div className='signerPermissionDetails'>
-              {'Derivation path for connected Lattice devices'}
-            </div>
+            <div className='signerPermissionDetails'>{'Derivation path for connected Lattice devices'}</div>
           </div>
           <div className='signerPermission localSetting' style={{ zIndex: 203 }}>
             <div className='signerPermissionControls'>
@@ -361,24 +435,36 @@ class Settings extends React.Component {
                 ]}
               />
             </div>
-            <div className='signerPermissionDetails'>
-              The number of lattice accounts to derive
-            </div>
+            <div className='signerPermissionDetails'>The number of lattice accounts to derive</div>
           </div>
           <div className='signerPermission localSetting' style={{ zIndex: 202 }}>
             <div className='signerPermissionControls'>
               <div className='signerPermissionSetting'>Lattice Relay</div>
               <Dropdown
-                  syncValue={this.store('main.latticeSettings.endpointMode')}
-                  onChange={(value) => {
-                    link.send('tray:action', 'setLatticeEndpointMode', value)
-                    this.setState({ latticeEndpointMode: value })
-                  }}
-                  options={[{ text: 'Default', value: 'default' }, { text: 'Custom', value: 'custom' }]}
+                syncValue={this.store('main.latticeSettings.endpointMode')}
+                onChange={(value) => {
+                  link.send('tray:action', 'setLatticeEndpointMode', value)
+                  this.setState({ latticeEndpointMode: value })
+                }}
+                options={[
+                  { text: 'Default', value: 'default' },
+                  { text: 'Custom', value: 'custom' },
+                ]}
               />
             </div>
-            <div className={this.state.latticeEndpointMode === 'custom' ? 'connectionCustomInput connectionCustomInputOn' : 'connectionCustomInput'}>
-              <input tabIndex='-1' placeholder={'Custom Relay'} value={this.state.latticeEndpoint} onChange={e => this.inputLatticeEndpoint(e)} />
+            <div
+              className={
+                this.state.latticeEndpointMode === 'custom'
+                  ? 'connectionCustomInput connectionCustomInputOn'
+                  : 'connectionCustomInput'
+              }
+            >
+              <input
+                tabIndex='-1'
+                placeholder={'Custom Relay'}
+                value={this.state.latticeEndpoint}
+                onChange={(e) => this.inputLatticeEndpoint(e)}
+              />
             </div>
           </div>
 
@@ -388,12 +474,13 @@ class Settings extends React.Component {
               <Dropdown
                 syncValue={this.store('main.accountCloseLock')}
                 onChange={(value) => link.send('tray:action', 'setAccountCloseLock', value)}
-                options={[{ text: 'Close', value: true }, { text: 'Quit', value: false }]}
+                options={[
+                  { text: 'Close', value: true },
+                  { text: 'Quit', value: false },
+                ]}
               />
             </div>
-            <div className='signerPermissionDetails'>
-              When should Frame relock your hot signers?
-            </div>
+            <div className='signerPermissionDetails'>When should Frame relock your hot signers?</div>
           </div>
         </div>
       </div>
diff --git a/dash/App/Tokens/AddToken/index.js b/dash/App/Tokens/AddToken/index.js
index 2725775ce..0584e833f 100644
--- a/dash/App/Tokens/AddToken/index.js
+++ b/dash/App/Tokens/AddToken/index.js
@@ -4,7 +4,7 @@ import Dropdown from '../../../../resources/Components/Dropdown'
 import link from '../../../../resources/link'
 
 class AddToken extends Component {
-  constructor (props, context) {
+  constructor(props, context) {
     super(props, context)
 
     this.nameDefault = 'Token Name'
@@ -27,56 +27,61 @@ class AddToken extends Component {
       chainId: (Number.isInteger(chainId) && chainId) || this.chainIdDefault,
       address: (this.token.address || '').toLowerCase() || this.addressDefault,
       decimals: (Number.isInteger(decimals) && decimals) || this.decimalsDefault,
-      logoURI: this.token.logoURI || this.logoURIDefault
+      logoURI: this.token.logoURI || this.logoURIDefault,
     }
   }
 
-  async updateTokenData (contractAddress, chainId) {
+  async updateTokenData(contractAddress, chainId) {
     const { name, symbol, decimals } = await link.invoke('tray:getTokenDetails', contractAddress, chainId)
     this.setState({
       name: name || this.nameDefault,
       symbol: symbol || this.symbolDefault,
-      decimals: decimals || this.decimalsDefault
+      decimals: decimals || this.decimalsDefault,
     })
   }
 
-  isConnectedChain () {
+  isConnectedChain() {
     const chain = this.activeChains.find(({ id }) => id === this.state.chainId)
     return chain.connection.primary.connected || chain.connection.secondary.connected
   }
 
-  isDefault (statePropName) {
+  isDefault(statePropName) {
     if (this.state[statePropName] === undefined) {
       return false
     }
     return this.state[statePropName] === this[`${statePropName}Default`]
   }
 
-  render () {
-    const newTokenReady = (
-      this.state.name && this.state.name !== this.nameDefault &&
-      this.state.symbol && this.state.symbol !== this.symbolDefault &&
+  render() {
+    const newTokenReady =
+      this.state.name &&
+      this.state.name !== this.nameDefault &&
+      this.state.symbol &&
+      this.state.symbol !== this.symbolDefault &&
       Number.isInteger(this.state.chainId) &&
-      this.state.address && this.state.address !== this.addressDefault &&
+      this.state.address &&
+      this.state.address !== this.addressDefault &&
       Number.isInteger(this.state.decimals)
-    )
     const showTokenAutofillWarning = !this.isConnectedChain()
 
     return (
-      <div className='notifyBoxWrap cardShow' onMouseDown={e => e.stopPropagation()}>
+      <div className='notifyBoxWrap cardShow' onMouseDown={(e) => e.stopPropagation()}>
         <div className='notifyBoxSlide'>
-          <div className='addTokenTitle'>
-            Add New Token
-          </div>
+          <div className='addTokenTitle'>Add New Token</div>
           <div className='addToken'>
-            {showTokenAutofillWarning && <div className='tokenRow'>The currently selected chain is not connected. Token autofill will not work.</div>}
+            {showTokenAutofillWarning && (
+              <div className='tokenRow'>
+                The currently selected chain is not connected. Token autofill will not work.
+              </div>
+            )}
             <div className='tokenRow'>
               <div className='tokenName'>
                 <label className='tokenInputLabel'>
                   Token Name
                   <input
                     className={`tokenInput tokenInputAddress ${this.isDefault('name') ? 'tokenInputDim' : ''}`}
-                    value={this.state.name} spellCheck='false'
+                    value={this.state.name}
+                    spellCheck='false'
                     onChange={(e) => {
                       this.setState({ name: e.target.value })
                     }}
@@ -97,7 +102,8 @@ class AddToken extends Component {
                   Symbol
                   <input
                     className={`tokenInput tokenInputAddress ${this.isDefault('symbol') ? 'tokenInputDim' : ''}`}
-                    value={this.state.symbol} spellCheck='false'
+                    value={this.state.symbol}
+                    spellCheck='false'
                     onChange={(e) => {
                       if (e.target.value.length > 10) return e.preventDefault()
                       this.setState({ symbol: e.target.value })
@@ -110,7 +116,6 @@ class AddToken extends Component {
                     }}
                   />
                 </label>
-
               </div>
 
               <div className='tokenDecimals'>
@@ -118,7 +123,8 @@ class AddToken extends Component {
                   Decimals
                   <input
                     className={`tokenInput tokenInputAddress ${this.isDefault('decimals') ? 'tokenInputDim' : ''}`}
-                    value={this.state.decimals} spellCheck='false'
+                    value={this.state.decimals}
+                    spellCheck='false'
                     onChange={(e) => {
                       if (!e.target.value) return this.setState({ decimals: '' })
                       if (e.target.value.length > 2) return e.preventDefault()
@@ -136,14 +142,13 @@ class AddToken extends Component {
                     }}
                   />
                 </label>
-
               </div>
 
               <div className='tokenChainId'>
                 <label className='tokenInputLabel'>
                   Chain
                   <Dropdown
-                    className="tokenInput"
+                    className='tokenInput'
                     syncValue={this.state.chainId}
                     onChange={(chainId) => {
                       this.setState({ chainId })
@@ -151,7 +156,10 @@ class AddToken extends Component {
                         this.updateTokenData(this.state.address, chainId)
                       }
                     }}
-                    options={this.activeChains.map((chain) => ({ text: chain.name, value: chain.id }))}
+                    options={this.activeChains.map((chain) => ({
+                      text: chain.name,
+                      value: chain.id,
+                    }))}
                   />
                 </label>
               </div>
@@ -163,7 +171,8 @@ class AddToken extends Component {
                   Contract Address
                   <input
                     className={`tokenInput tokenInputAddress ${this.isDefault('address') ? 'tokenInputDim' : ''}`}
-                    value={this.state.address} spellCheck='false'
+                    value={this.state.address}
+                    spellCheck='false'
                     onChange={(e) => {
                       if (e.target.value.length > 42) {
                         return e.preventDefault()
@@ -191,7 +200,8 @@ class AddToken extends Component {
                   Logo URI
                   <input
                     className={`tokenInput tokenInputAddress ${this.isDefault('logoURI') ? 'tokenInputDim' : ''}`}
-                    value={this.state.logoURI} spellCheck='false'
+                    value={this.state.logoURI}
+                    spellCheck='false'
                     onChange={(e) => {
                       this.setState({ logoURI: e.target.value })
                     }}
@@ -222,11 +232,7 @@ class AddToken extends Component {
                   Add Token
                 </div>
               ) : (
-                <div
-                  className='addTokenSubmit'
-                >
-                  Fill in Token Details
-                </div>
+                <div className='addTokenSubmit'>Fill in Token Details</div>
               )}
             </div>
           </div>
diff --git a/dash/App/Tokens/CustomTokens/index.js b/dash/App/Tokens/CustomTokens/index.js
index 7b03bbda0..32e81770a 100644
--- a/dash/App/Tokens/CustomTokens/index.js
+++ b/dash/App/Tokens/CustomTokens/index.js
@@ -4,91 +4,111 @@ import svg from '../../../../resources/svg'
 import link from '../../../../resources/link'
 
 class CustomTokens extends React.Component {
-  constructor (props, context) {
+  constructor(props, context) {
     super(props, context)
     this.state = {}
   }
 
-  render () {
-    const tokens = this.store('main.tokens.custom')    
+  render() {
+    const tokens = this.store('main.tokens.custom')
 
     return (
-      <div className='cardShow' onMouseDown={e => e.stopPropagation()}>
-        <div className='newAccount' onClick={() => link.send('tray:action', 'navDash', { view: 'tokens', data: { notify: 'addToken', notifyData: this.props.req }})}>
-          <div className='newAccountIcon'>{svg.plus(16)}</div> 
+      <div className='cardShow' onMouseDown={(e) => e.stopPropagation()}>
+        <div
+          className='newAccount'
+          onClick={() =>
+            link.send('tray:action', 'navDash', {
+              view: 'tokens',
+              data: { notify: 'addToken', notifyData: this.props.req },
+            })
+          }
+        >
+          <div className='newAccountIcon'>{svg.plus(16)}</div>
           Add New Token
         </div>
         <div className='customTokens'>
           <div className='customTokensList'>
-            {tokens.length > 0 ? [].concat(tokens).sort((a, b) => {
-              return a.chainId <= b.chainId
-            }).map((token, i) => {
-              return (
-                <div className={this.state.tokenExpanded === i ? 'customTokensListItem customTokensListItemExpanded' : 'customTokensListItem'}>
-                  <div className='customTokensListItemTitle'>
-                    <div className='customTokensListItemName'>
-                      <img 
-                        src={token.logoURI && `https://proxy.pylon.link?type=icon&target=${encodeURIComponent(token.logoURI)}`}
-                        value={token.symbol.toUpperCase()}
-                        alt={token.symbol.toUpperCase()}
-                      />
-                      <div className='customTokensListItemText'>
-                        <div className='customTokensListItemSymbol'>{token.symbol}</div>
-                        <div className='customTokensListItemSub'>{token.name}</div>
-                      </div>
-                    </div>
-                    <div className='customTokensListItemChain'>
-                      <div className='customTokensListItemChainLabel'>
-                        {'Chain ID:'}
-                      </div>
-                      <div>
-                        {token.chainId}
+            {tokens.length > 0 ? (
+              []
+                .concat(tokens)
+                .sort((a, b) => {
+                  return a.chainId <= b.chainId
+                })
+                .map((token, i) => {
+                  return (
+                    <div
+                      className={
+                        this.state.tokenExpanded === i
+                          ? 'customTokensListItem customTokensListItemExpanded'
+                          : 'customTokensListItem'
+                      }
+                    >
+                      <div className='customTokensListItemTitle'>
+                        <div className='customTokensListItemName'>
+                          <img
+                            src={
+                              token.logoURI &&
+                              `https://proxy.pylon.link?type=icon&target=${encodeURIComponent(token.logoURI)}`
+                            }
+                            value={token.symbol.toUpperCase()}
+                            alt={token.symbol.toUpperCase()}
+                          />
+                          <div className='customTokensListItemText'>
+                            <div className='customTokensListItemSymbol'>{token.symbol}</div>
+                            <div className='customTokensListItemSub'>{token.name}</div>
+                          </div>
+                        </div>
+                        <div className='customTokensListItemChain'>
+                          <div className='customTokensListItemChainLabel'>{'Chain ID:'}</div>
+                          <div>{token.chainId}</div>
+                          <div
+                            className={
+                              this.state.tokenExpanded === i
+                                ? 'customTokensListItemExpand'
+                                : 'customTokensListItemExpand customTokensListItemExpandActive'
+                            }
+                            onClick={() =>
+                              this.setState({
+                                tokenExpanded: this.state.tokenExpanded === i ? -1 : i,
+                              })
+                            }
+                          >
+                            {svg.octicon('chevron-down', { height: 16 })}
+                          </div>
+                        </div>
                       </div>
-                      <div 
-                        className={this.state.tokenExpanded === i  ? 'customTokensListItemExpand' : 'customTokensListItemExpand customTokensListItemExpandActive'}
-                        onClick={() => this.setState({ tokenExpanded: this.state.tokenExpanded === i ? -1 : i })}
+                      <div
+                        className='customTokensListItemAddress'
+                        onClick={() => {
+                          link.send('tray:clipboardData', token.address)
+                          this.setState({ copied: true })
+                          setTimeout((_) => this.setState({ copied: false }), 1000)
+                        }}
                       >
-                        {svg.octicon('chevron-down', { height: 16 })}
-                      </div>
-                    </div>
-                  </div>
-                  <div 
-                    className='customTokensListItemAddress'
-                    onClick={() => {
-                      link.send('tray:clipboardData', token.address)
-                      this.setState({ copied: true })
-                      setTimeout(_ => this.setState({ copied: false }), 1000)
-                    }}
-                  >
-                    {this.state.copied ? 'Address Copied' : token.address}
-                  </div>
-                  <div className='customTokensListItemBottom'>
-                    <div className='customTokensListItemChainDecimal'>
-                      <div className='customTokensListItemChainLabel'>
-                        {'Decimals:'}
-                      </div>
-                      <div>
-                        {token.decimals}
+                        {this.state.copied ? 'Address Copied' : token.address}
                       </div>
-                    </div>
-                    <div className='customTokensListItemRemoveButton'
+                      <div className='customTokensListItemBottom'>
+                        <div className='customTokensListItemChainDecimal'>
+                          <div className='customTokensListItemChainLabel'>{'Decimals:'}</div>
+                          <div>{token.decimals}</div>
+                        </div>
+                        <div
+                          className='customTokensListItemRemoveButton'
                           onClick={() => {
                             this.setState({ tokenExpanded: false })
                             setTimeout(() => {
-                            link.send('tray:removeToken', token)
+                              link.send('tray:removeToken', token)
                             }, 100)
-                          }
-                        }
-                    >
-                      {'Remove Token'}
+                          }}
+                        >
+                          {'Remove Token'}
+                        </div>
+                      </div>
                     </div>
-                  </div>
-                </div>
-              )
-            }) : (
-              <div className='customTokensListNoTokens'>
-                {'No Custom Tokens'}
-              </div>
+                  )
+                })
+            ) : (
+              <div className='customTokensListNoTokens'>{'No Custom Tokens'}</div>
             )}
           </div>
         </div>
diff --git a/dash/App/Tokens/index.js b/dash/App/Tokens/index.js
index ccf8b2f0b..ee0397c6e 100644
--- a/dash/App/Tokens/index.js
+++ b/dash/App/Tokens/index.js
@@ -8,19 +8,11 @@ import CustomTokens from './CustomTokens'
 
 const AddTokenForm = ({ store }) => {
   const activeChains = Object.values(store('main.networks.ethereum')).filter((chain) => chain.on)
-  return <AddToken req={store('view.notifyData')} activeChains={activeChains}  />
+  return <AddToken req={store('view.notifyData')} activeChains={activeChains} />
 }
 
-function Tokens ({ data: { notify } }) {
-  return (
-    <div>
-      {notify === 'addToken' ? (
-        <AddTokenForm store={this.store}  />
-      ) : (
-        <CustomTokens />
-      )}
-    </div>
-  )
+function Tokens({ data: { notify } }) {
+  return <div>{notify === 'addToken' ? <AddTokenForm store={this.store} /> : <CustomTokens />}</div>
 }
 
 export default Restore.connect(Tokens)
diff --git a/dash/App/index.js b/dash/App/index.js
index 70b8f305c..21bfbc2ab 100644
--- a/dash/App/index.js
+++ b/dash/App/index.js
@@ -17,17 +17,16 @@ import Dapps from './Dapps'
 import Tokens from './Tokens'
 import Settings from './Settings'
 
-
 class Dash extends React.Component {
   constructor(props, context) {
-    super(props, context);
+    super(props, context)
     this.input = React.createRef()
     this.state = {
       showAddAccounts: false,
-      selected: 'home'
+      selected: 'home',
     }
   }
-  renderPanel () {
+  renderPanel() {
     const { view, data } = this.store('dash.nav')[0] || { view: 'default', data: {} }
     if (view === 'accounts') return <Accounts data={data} />
     if (view === 'chains') return <Chains data={data} />
@@ -37,15 +36,13 @@ class Dash extends React.Component {
     if (view === 'notify') return <Notify data={data} />
     return <Main />
   }
-  render () {
+  render() {
     return (
       <div className='dash'>
         <Command />
         <div className='dashMain'>
           <div className='dashMainOverlay' />
-          <div className='dashMainScroll'>
-            {this.renderPanel()}
-          </div>
+          <div className='dashMainScroll'>{this.renderPanel()}</div>
         </div>
       </div>
     )
diff --git a/dash/PendingSigner/index.js b/dash/PendingSigner/index.js
index f67374209..e76d62346 100644
--- a/dash/PendingSigner/index.js
+++ b/dash/PendingSigner/index.js
@@ -5,40 +5,51 @@ import svg from '../../../../../resources/svg'
 import link from '../../../../../resources/link'
 
 class Pending extends React.Component {
-  constructor (...args) {
+  constructor(...args) {
     super(...args)
     this.state = { tPin: '' }
   }
 
-  backspacePin (e) {
+  backspacePin(e) {
     e.stopPropagation()
     this.setState({ tPin: this.state.tPin ? this.state.tPin.slice(0, -1) : '' })
   }
 
-  trezorPin (num) {
+  trezorPin(num) {
     this.setState({ tPin: this.state.tPin + num.toString() })
   }
 
-  submitPin () {
+  submitPin() {
     link.rpc('trezorPin', this.props.id, this.state.tPin, () => {})
     this.setState({ tPin: '' })
   }
 
-  submitPhrase () {
+  submitPhrase() {
     link.rpc('trezorPhrase', this.props.id, this.state.tPhrase, () => {})
     this.setState({ tPhrase: '' })
   }
 
-  renderLoadingLive () {
+  renderLoadingLive() {
     if (this.props.type === 'ledger' && this.props.status.toLowerCase() === 'deriving live addresses') {
       const liveAccountLimit = this.store('main.ledger.liveAccountLimit')
       const styleWidth = liveAccountLimit === 20 ? 120 : liveAccountLimit === 40 ? 120 : 60
       const marginTop = liveAccountLimit === 40 ? -8 : 0
       return (
-        <div className='loadingLiveAddresses' style={{ top: `${marginTop}px`, padding: '20px', width: `${styleWidth}px` }}>
-          {[...Array(liveAccountLimit).keys()].map(i => i + 1).map(i => {
-            return <div key={'loadingLiveAddress' + i} className='loadingLiveAddress' style={{ opacity: i <= this.props.liveAddressesFound ? '1' : '0.3' }} />
-          })}
+        <div
+          className='loadingLiveAddresses'
+          style={{ top: `${marginTop}px`, padding: '20px', width: `${styleWidth}px` }}
+        >
+          {[...Array(liveAccountLimit).keys()]
+            .map((i) => i + 1)
+            .map((i) => {
+              return (
+                <div
+                  key={'loadingLiveAddress' + i}
+                  className='loadingLiveAddress'
+                  style={{ opacity: i <= this.props.liveAddressesFound ? '1' : '0.3' }}
+                />
+              )
+            })}
         </div>
       )
     } else {
@@ -46,7 +57,7 @@ class Pending extends React.Component {
     }
   }
 
-  renderTrezorPin (active) {
+  renderTrezorPin(active) {
     return (
       <div className='trezorPinWrap' style={active ? {} : { height: '0px', padding: '0px 0px 0px 0px' }}>
         {active ? (
@@ -60,7 +71,10 @@ class Pending extends React.Component {
                 )
               })}
             </div>
-            <div className='signerPinMessage signerPinSubmit' onMouseDown={this.state.tPin ? () => this.submitPin() : null}>
+            <div
+              className='signerPinMessage signerPinSubmit'
+              onMouseDown={this.state.tPin ? () => this.submitPin() : null}
+            >
               Submit Pin
               {this.state.tPin ? (
                 <div className='signerPinDelete' onMouseDown={this.backspacePin.bind(this)}>
@@ -70,7 +84,7 @@ class Pending extends React.Component {
             </div>
             <div className='trezorPinInputWrap'>
               <div className='trezorPinInput'>
-                {[1, 2, 3, 4, 5, 6, 7, 8, 9].map(i => (
+                {[1, 2, 3, 4, 5, 6, 7, 8, 9].map((i) => (
                   <div key={i} className='trezorPinInputButton' onMouseDown={this.trezorPin.bind(this, i)}>
                     {svg.octicon('primitive-dot', { height: 20 })}
                   </div>
@@ -83,20 +97,25 @@ class Pending extends React.Component {
     )
   }
 
-  phraseKeyPress (e) {
+  phraseKeyPress(e) {
     if (e.key === 'Enter') {
       e.preventDefault()
       this.submitPhrase()
     }
   }
 
-  renderTrezorPhrase (active) {
+  renderTrezorPhrase(active) {
     return (
       <div className='trezorPinWrap' style={active ? {} : { height: '0px', padding: '0px 0px 0px 0px' }}>
         {active ? (
           <>
             <div className='trezorPhraseInput'>
-              <input type='password' onChange={(e) => this.setState({ tPhrase: e.target.value })} onKeyPress={e => this.phraseKeyPress(e)} autoFocus />
+              <input
+                type='password'
+                onChange={(e) => this.setState({ tPhrase: e.target.value })}
+                onKeyPress={(e) => this.phraseKeyPress(e)}
+                autoFocus
+              />
             </div>
             <div className='signerPinMessage signerPinSubmit' onMouseDown={() => this.submitPhrase()}>
               Submit Passphrase
@@ -107,7 +126,7 @@ class Pending extends React.Component {
     )
   }
 
-  render () {
+  render() {
     const open = this.store('selected.open')
     const style = {}
     if (open) {
@@ -128,17 +147,9 @@ class Pending extends React.Component {
           <div className='pendingSignerTop'>
             {this.renderLoadingLive()}
             <div className='pendingSignerLogo'>
-              {this.props.type === 'ledger' && (
-                <div style={{ marginTop: '4px' }}>
-                  {svg.ledger(25)}
-                </div>
-              )}
-              {this.props.type === 'trezor' && (
-                svg.trezor(25)
-              )}
-              {this.props.type === 'lattice' && (
-                svg.lattice(25)
-              )}
+              {this.props.type === 'ledger' && <div style={{ marginTop: '4px' }}>{svg.ledger(25)}</div>}
+              {this.props.type === 'trezor' && svg.trezor(25)}
+              {this.props.type === 'lattice' && svg.lattice(25)}
             </div>
             <div className='pendingSignerText'>
               <div className='pendingSignerType'>{this.props.type + ' Found'}</div>
diff --git a/dash/index.js b/dash/index.js
index 691ea98c4..61eecf3a6 100644
--- a/dash/index.js
+++ b/dash/index.js
@@ -10,9 +10,11 @@ import App from './App'
 
 Sentry.init({ dsn: 'https://7b09a85b26924609bef5882387e2c4dc@o1204372.ingest.sentry.io/6331069' })
 
-document.addEventListener('dragover', e => e.preventDefault())
-document.addEventListener('drop', e => e.preventDefault())
-window.eval = global.eval = () => { throw new Error(`This app does not support window.eval()`) } // eslint-disable-line
+document.addEventListener('dragover', (e) => e.preventDefault())
+document.addEventListener('drop', (e) => e.preventDefault())
+window.eval = global.eval = () => {
+  throw new Error(`This app does not support window.eval()`)
+} // eslint-disable-line
 link.rpc('getState', (err, state) => {
   if (err) return console.error('Could not get initial state from main')
   const store = _store(state)
@@ -27,7 +29,7 @@ link.rpc('getState', (err, state) => {
   ReactDOM.render(<Flow />, document.getElementById('flow'))
 })
 
-document.addEventListener('contextmenu', e => link.send('*:contextmenu', e.clientX, e.clientY))
+document.addEventListener('contextmenu', (e) => link.send('*:contextmenu', e.clientX, e.clientY))
 
 // document.addEventListener('mouseout', e => { if (e.clientX < 0) link.send('tray:mouseout') })
 // document.addEventListener('contextmenu', e => link.send('tray:contextmenu', e.clientX, e.clientY))
diff --git a/dash/store/actions/index.js b/dash/store/actions/index.js
index 6944c5bbe..1d35ffa81 100644
--- a/dash/store/actions/index.js
+++ b/dash/store/actions/index.js
@@ -4,6 +4,6 @@
 export const pathSync = (u, path, value) => u(path, () => value)
 
 export const notify = (u, type, data = {}) => {
-  u('view.notify', _ => type)
-  u('view.notifyData', _ => data)
-}
\ No newline at end of file
+  u('view.notify', (_) => type)
+  u('view.notifyData', (_) => data)
+}
diff --git a/dash/store/index.js b/dash/store/index.js
index 8fa6f9015..26b77c4c7 100644
--- a/dash/store/index.js
+++ b/dash/store/index.js
@@ -2,9 +2,6 @@
 // import * as actions from './actions'
 // export default (state) => Restore.create(state, actions)
 
-
-
-
 /* globals fetch */
 
 import EventEmitter from 'events'
@@ -15,12 +12,11 @@ import link from '../../resources/link'
 import * as actions from './actions'
 
 export default (state, cb) => {
-
   // console.log('state...', state)
   const store = Restore.create(state, actions)
   store.events = new EventEmitter()
-  link.on('action', (action, ...args) => { 
-    if (store[action]) store[action](...args) 
+  link.on('action', (action, ...args) => {
+    if (store[action]) store[action](...args)
   })
 
   return store
diff --git a/flow/App/index.js b/flow/App/index.js
index 0af45f005..7d89d3946 100644
--- a/flow/App/index.js
+++ b/flow/App/index.js
@@ -1,4 +1,4 @@
-import { LinkExternal } from '@githubprimer/octicons-react';
+import { LinkExternal } from '@githubprimer/octicons-react'
 import React from 'react'
 import Restore from 'react-restore'
 import link from '../../resources/link'
@@ -14,10 +14,10 @@ import link from '../../resources/link'
 
 class Flow extends React.Component {
   constructor(props, context) {
-    super(props, context);
+    super(props, context)
     this.input = React.createRef()
     this.state = {
-      input: ''
+      input: '',
     }
   }
   // componentDidMount(){
@@ -28,7 +28,7 @@ class Flow extends React.Component {
   //     console.log(err, res)
   //   })
   // }
-  render () {
+  render() {
     return (
       <div className='dapps'>
         <div ref={this.input} className='bar'>
@@ -42,97 +42,71 @@ class Flow extends React.Component {
                 e.target.blur()
                 this.trigger()
               }
-            }} 
+            }}
           />
         </div>
         <div className='dappWrap'>
-          <div className='dapp' onMouseDown={() => link.rpc('openDapp', 'matt.eth', {}, (err) => {
-            console.log('err', err)
-          })}>
-            <div className='dappIcon'>
-            </div>
-            <div className='dappName'>
-              matt.eth
-            </div>
+          <div
+            className='dapp'
+            onMouseDown={() =>
+              link.rpc('openDapp', 'matt.eth', {}, (err) => {
+                console.log('err', err)
+              })
+            }
+          >
+            <div className='dappIcon'></div>
+            <div className='dappName'>matt.eth</div>
           </div>
-          <div className='dapp'  onMouseDown={() => link.rpc('openDapp', 'frame.eth', {}, (err) => {
-            console.log('err', err)
-          })}>
-          <div className='dappIcon'>
-            </div>
-            <div className='dappName'>
-              frame.eth
-            </div>
+          <div
+            className='dapp'
+            onMouseDown={() =>
+              link.rpc('openDapp', 'frame.eth', {}, (err) => {
+                console.log('err', err)
+              })
+            }
+          >
+            <div className='dappIcon'></div>
+            <div className='dappName'>frame.eth</div>
           </div>
           <div className='dapp'>
-          <div className='dappIcon'>
-            </div>
-            <div className='dappName'>
-              Aragon
-            </div>
+            <div className='dappIcon'></div>
+            <div className='dappName'>Aragon</div>
           </div>
           <div className='dapp'>
-          <div className='dappIcon'>
-            </div>
-            <div className='dappName'>
-              Compound
-            </div>
+            <div className='dappIcon'></div>
+            <div className='dappName'>Compound</div>
           </div>
           <div className='dapp'>
-            <div className='dappIcon'>
-            </div>
-            <div className='dappName'>
-              Dapp 1
-            </div>
+            <div className='dappIcon'></div>
+            <div className='dappName'>Dapp 1</div>
           </div>
           <div className='dapp'>
-            <div className='dappIcon'>
-            </div>
-            <div className='dappName'>
-              Dapp 2
-            </div>
+            <div className='dappIcon'></div>
+            <div className='dappName'>Dapp 2</div>
           </div>
           <div className='dapp'>
-            <div className='dappIcon'>
-            </div>
-            <div className='dappName'>
-              Wallet
-            </div>
+            <div className='dappIcon'></div>
+            <div className='dappName'>Wallet</div>
           </div>
           <div className='dapp'>
-            <div className='dappIcon'>
-            </div>
-            <div className='dappName'>
-              Wallet
-            </div>
+            <div className='dappIcon'></div>
+            <div className='dappName'>Wallet</div>
           </div>
           <div className='dapp'>
-            <div className='dappIcon'>
-            </div>
-            <div className='dappName'>
-              Wallet
-            </div>
+            <div className='dappIcon'></div>
+            <div className='dappName'>Wallet</div>
           </div>
           <div className='dapp'>
-            <div className='dappIcon'>
-            </div>
-            <div className='dappName'>
-              Wallet
-            </div>
+            <div className='dappIcon'></div>
+            <div className='dappName'>Wallet</div>
           </div>
           <div className='dapp'>
-            <div className='dappIcon'>
-            </div>
-            <div className='dappName'>
-              Wallet
-            </div>
+            <div className='dappIcon'></div>
+            <div className='dappName'>Wallet</div>
           </div>
           <div className='dapp'>
-            <div className='dappIcon'>
-            </div>
-            <div className='dappName'>
-              Wallet
-            </div>
+            <div className='dappIcon'></div>
+            <div className='dappName'>Wallet</div>
           </div>
         </div>
       </div>
diff --git a/flow/index.js b/flow/index.js
index abfe51c94..5080bb6a2 100644
--- a/flow/index.js
+++ b/flow/index.js
@@ -7,9 +7,11 @@ import link from '../resources/link'
 
 import App from './App'
 
-document.addEventListener('dragover', e => e.preventDefault())
-document.addEventListener('drop', e => e.preventDefault())
-window.eval = global.eval = () => { throw new Error(`This app does not support window.eval()`) } // eslint-disable-line
+document.addEventListener('dragover', (e) => e.preventDefault())
+document.addEventListener('drop', (e) => e.preventDefault())
+window.eval = global.eval = () => {
+  throw new Error(`This app does not support window.eval()`)
+} // eslint-disable-line
 link.rpc('getState', (err, state) => {
   if (err) return console.error('Could not get initial state from main')
   console.log('initial state', state)
diff --git a/flow/store/actions/index.js b/flow/store/actions/index.js
index 12806b45d..500675c74 100644
--- a/flow/store/actions/index.js
+++ b/flow/store/actions/index.js
@@ -1,3 +1,3 @@
-export const syncMain = (u, main) => u('main', _ => main)
+export const syncMain = (u, main) => u('main', (_) => main)
 
-export const setType = (u, type) => u('type', _ => type)
\ No newline at end of file
+export const setType = (u, type) => u('type', (_) => type)
diff --git a/flow/store/index.js b/flow/store/index.js
index 3ca11e57a..1a06c4d79 100644
--- a/flow/store/index.js
+++ b/flow/store/index.js
@@ -2,9 +2,6 @@
 // import * as actions from './actions'
 // export default (state) => Restore.create(state, actions)
 
-
-
-
 /* globals fetch */
 
 import EventEmitter from 'events'
@@ -20,15 +17,17 @@ export default (state, cb) => {
 
   // Feed for relaying state updates
   store.api.feed((state, actions, obscount) => {
-    actions.forEach(action => {
-      action.updates.forEach(update => {
+    actions.forEach((action) => {
+      action.updates.forEach((update) => {
         if (update.path.startsWith('main')) return
         link.send('tray:syncPath', update.path, update.value)
       })
     })
   })
 
-  link.on('action', (action, ...args) => { if (store[action]) store[action](...args) })
+  link.on('action', (action, ...args) => {
+    if (store[action]) store[action](...args)
+  })
 
   return store
 }
diff --git a/flow/svg/index.js b/flow/svg/index.js
index 15f072950..f00923c0d 100644
--- a/flow/svg/index.js
+++ b/flow/svg/index.js
@@ -1,277 +1,377 @@
 import React from 'react'
 import Octicon, { getIconByName } from '@githubprimer/octicons-react'
-import gridPlusLogo from "./grid.png";
+import gridPlusLogo from './grid.png'
 module.exports = {
-  logo: size => {
+  logo: (size) => {
     return (
       <div style={{ width: size + 'px', height: size + 'px' }}>
         <svg viewBox='0 0 153.42 152.94'>
-          <path fill='currentColor' d='M145.15,75.59v-58a9.29,9.29,0,0,0-9.3-9.28H77.65a2.24,2.24,0,0,1-1.56-.64l-7-7A2.24,2.24,0,0,0,67.48,0H9.31A9.29,9.29,0,0,0,0,9.27H0v58a2.16,2.16,0,0,0,.65,1.55l7,7a2.16,2.16,0,0,1,.65,1.55v58a9.29,9.29,0,0,0,9.3,9.28H75.8a2.24,2.24,0,0,1,1.56.64l7,7a2.24,2.24,0,0,0,1.56.64h58.19a9.29,9.29,0,0,0,9.31-9.27h0v-58a2.16,2.16,0,0,0-.65-1.55l-7-7A2.17,2.17,0,0,1,145.15,75.59Zm-39.8,30.69H48.18A1.32,1.32,0,0,1,46.87,105V48a1.35,1.35,0,0,1,1.31-1.33h57.17A1.34,1.34,0,0,1,106.68,48v57a1.33,1.33,0,0,1-1.33,1.32Z' transform='translate(0 0)' />
+          <path
+            fill='currentColor'
+            d='M145.15,75.59v-58a9.29,9.29,0,0,0-9.3-9.28H77.65a2.24,2.24,0,0,1-1.56-.64l-7-7A2.24,2.24,0,0,0,67.48,0H9.31A9.29,9.29,0,0,0,0,9.27H0v58a2.16,2.16,0,0,0,.65,1.55l7,7a2.16,2.16,0,0,1,.65,1.55v58a9.29,9.29,0,0,0,9.3,9.28H75.8a2.24,2.24,0,0,1,1.56.64l7,7a2.24,2.24,0,0,0,1.56.64h58.19a9.29,9.29,0,0,0,9.31-9.27h0v-58a2.16,2.16,0,0,0-.65-1.55l-7-7A2.17,2.17,0,0,1,145.15,75.59Zm-39.8,30.69H48.18A1.32,1.32,0,0,1,46.87,105V48a1.35,1.35,0,0,1,1.31-1.33h57.17A1.34,1.34,0,0,1,106.68,48v57a1.33,1.33,0,0,1-1.33,1.32Z'
+            transform='translate(0 0)'
+          />
         </svg>
       </div>
     )
   },
-  send: size => {
+  send: (size) => {
     return (
       <div style={{ width: size + 'px', height: size + 'px' }}>
         <svg viewBox='0 0 512 512'>
-          <path fill='currentColor' d='M476 3.2L12.5 270.6c-18.1 10.4-15.8 35.6 2.2 43.2L121 358.4l287.3-253.2c5.5-4.9 13.3 2.6 8.6 8.3L176 407v80.5c0 23.6 28.5 32.9 42.5 15.8L282 426l124.6 52.2c14.2 6 30.4-2.9 33-18.2l72-432C515 7.8 493.3-6.8 476 3.2z' />
+          <path
+            fill='currentColor'
+            d='M476 3.2L12.5 270.6c-18.1 10.4-15.8 35.6 2.2 43.2L121 358.4l287.3-253.2c5.5-4.9 13.3 2.6 8.6 8.3L176 407v80.5c0 23.6 28.5 32.9 42.5 15.8L282 426l124.6 52.2c14.2 6 30.4-2.9 33-18.2l72-432C515 7.8 493.3-6.8 476 3.2z'
+          />
         </svg>
       </div>
     )
   },
-  sign: size => {
+  sign: (size) => {
     return (
       <div style={{ width: size + 'px', height: size + 'px' }}>
         <svg viewBox='0 0 640 512'>
-          <path fill='currentColor' d='M623.2 192c-51.8 3.5-125.7 54.7-163.1 71.5-29.1 13.1-54.2 24.4-76.1 24.4-22.6 0-26-16.2-21.3-51.9 1.1-8 11.7-79.2-42.7-76.1-25.1 1.5-64.3 24.8-169.5 126L192 182.2c30.4-75.9-53.2-151.5-129.7-102.8L7.4 116.3C0 121-2.2 130.9 2.5 138.4l17.2 27c4.7 7.5 14.6 9.7 22.1 4.9l58-38.9c18.4-11.7 40.7 7.2 32.7 27.1L34.3 404.1C27.5 421 37 448 64 448c8.3 0 16.5-3.2 22.6-9.4 42.2-42.2 154.7-150.7 211.2-195.8-2.2 28.5-2.1 58.9 20.6 83.8 15.3 16.8 37.3 25.3 65.5 25.3 35.6 0 68-14.6 102.3-30 33-14.8 99-62.6 138.4-65.8 8.5-.7 15.2-7.3 15.2-15.8v-32.1c.2-9.1-7.5-16.8-16.6-16.2z' />
+          <path
+            fill='currentColor'
+            d='M623.2 192c-51.8 3.5-125.7 54.7-163.1 71.5-29.1 13.1-54.2 24.4-76.1 24.4-22.6 0-26-16.2-21.3-51.9 1.1-8 11.7-79.2-42.7-76.1-25.1 1.5-64.3 24.8-169.5 126L192 182.2c30.4-75.9-53.2-151.5-129.7-102.8L7.4 116.3C0 121-2.2 130.9 2.5 138.4l17.2 27c4.7 7.5 14.6 9.7 22.1 4.9l58-38.9c18.4-11.7 40.7 7.2 32.7 27.1L34.3 404.1C27.5 421 37 448 64 448c8.3 0 16.5-3.2 22.6-9.4 42.2-42.2 154.7-150.7 211.2-195.8-2.2 28.5-2.1 58.9 20.6 83.8 15.3 16.8 37.3 25.3 65.5 25.3 35.6 0 68-14.6 102.3-30 33-14.8 99-62.6 138.4-65.8 8.5-.7 15.2-7.3 15.2-15.8v-32.1c.2-9.1-7.5-16.8-16.6-16.2z'
+          />
         </svg>
       </div>
     )
   },
-  include: size => {
+  include: (size) => {
     return (
       <div style={{ width: size + 'px', height: size + 'px' }}>
         <svg viewBox='0 0 512 512'>
-          <path fill='currentColor' d='M12.41 148.02l232.94 105.67c6.8 3.09 14.49 3.09 21.29 0l232.94-105.67c16.55-7.51 16.55-32.52 0-40.03L266.65 2.31a25.607 25.607 0 0 0-21.29 0L12.41 107.98c-16.55 7.51-16.55 32.53 0 40.04zm487.18 88.28l-58.09-26.33-161.64 73.27c-7.56 3.43-15.59 5.17-23.86 5.17s-16.29-1.74-23.86-5.17L70.51 209.97l-58.1 26.33c-16.55 7.5-16.55 32.5 0 40l232.94 105.59c6.8 3.08 14.49 3.08 21.29 0L499.59 276.3c16.55-7.5 16.55-32.5 0-40zm0 127.8l-57.87-26.23-161.86 73.37c-7.56 3.43-15.59 5.17-23.86 5.17s-16.29-1.74-23.86-5.17L70.29 337.87 12.41 364.1c-16.55 7.5-16.55 32.5 0 40l232.94 105.59c6.8 3.08 14.49 3.08 21.29 0L499.59 404.1c16.55-7.5 16.55-32.5 0-40z' />
+          <path
+            fill='currentColor'
+            d='M12.41 148.02l232.94 105.67c6.8 3.09 14.49 3.09 21.29 0l232.94-105.67c16.55-7.51 16.55-32.52 0-40.03L266.65 2.31a25.607 25.607 0 0 0-21.29 0L12.41 107.98c-16.55 7.51-16.55 32.53 0 40.04zm487.18 88.28l-58.09-26.33-161.64 73.27c-7.56 3.43-15.59 5.17-23.86 5.17s-16.29-1.74-23.86-5.17L70.51 209.97l-58.1 26.33c-16.55 7.5-16.55 32.5 0 40l232.94 105.59c6.8 3.08 14.49 3.08 21.29 0L499.59 276.3c16.55-7.5 16.55-32.5 0-40zm0 127.8l-57.87-26.23-161.86 73.37c-7.56 3.43-15.59 5.17-23.86 5.17s-16.29-1.74-23.86-5.17L70.29 337.87 12.41 364.1c-16.55 7.5-16.55 32.5 0 40l232.94 105.59c6.8 3.08 14.49 3.08 21.29 0L499.59 404.1c16.55-7.5 16.55-32.5 0-40z'
+          />
         </svg>
       </div>
     )
   },
-  longArrow: size => {
+  longArrow: (size) => {
     return (
       <div style={{ width: size + 'px', height: size + 'px' }}>
         <svg viewBox='0 0 448 512'>
-          <path fill='currentColor' d='M313.941 216H12c-6.627 0-12 5.373-12 12v56c0 6.627 5.373 12 12 12h301.941v46.059c0 21.382 25.851 32.09 40.971 16.971l86.059-86.059c9.373-9.373 9.373-24.569 0-33.941l-86.059-86.059c-15.119-15.119-40.971-4.411-40.971 16.971V216z' />
+          <path
+            fill='currentColor'
+            d='M313.941 216H12c-6.627 0-12 5.373-12 12v56c0 6.627 5.373 12 12 12h301.941v46.059c0 21.382 25.851 32.09 40.971 16.971l86.059-86.059c9.373-9.373 9.373-24.569 0-33.941l-86.059-86.059c-15.119-15.119-40.971-4.411-40.971 16.971V216z'
+          />
         </svg>
       </div>
     )
   },
-  txSection: size => {
+  txSection: (size) => {
     return (
       <div style={{ width: '410px', height: '50px' }}>
         <svg viewBox='0 0 445.47 54.55'>
-          <path class='a' d='M328.82,353.55H762.58a3.85,3.85,0,0,1,3.57,2.41l6.47,16.18a23.36,23.36,0,0,1,0,17.36l-6.47,16.18a3.86,3.86,0,0,1-3.57,2.41H328.82Z' transform='translate(-328.82 -353.55)' />
+          <path
+            class='a'
+            d='M328.82,353.55H762.58a3.85,3.85,0,0,1,3.57,2.41l6.47,16.18a23.36,23.36,0,0,1,0,17.36l-6.47,16.18a3.86,3.86,0,0,1-3.57,2.41H328.82Z'
+            transform='translate(-328.82 -353.55)'
+          />
         </svg>
       </div>
     )
   },
-  seedling: size => {
+  seedling: (size) => {
     return (
       <div style={{ width: size + 'px', height: size + 'px' }}>
         <svg viewBox='0 0 512 512'>
-          <path fill='currentColor' d='M64 96H0c0 123.7 100.3 224 224 224v144c0 8.8 7.2 16 16 16h32c8.8 0 16-7.2 16-16V320C288 196.3 187.7 96 64 96zm384-64c-84.2 0-157.4 46.5-195.7 115.2 27.7 30.2 48.2 66.9 59 107.6C424 243.1 512 147.9 512 32h-64z' />
+          <path
+            fill='currentColor'
+            d='M64 96H0c0 123.7 100.3 224 224 224v144c0 8.8 7.2 16 16 16h32c8.8 0 16-7.2 16-16V320C288 196.3 187.7 96 64 96zm384-64c-84.2 0-157.4 46.5-195.7 115.2 27.7 30.2 48.2 66.9 59 107.6C424 243.1 512 147.9 512 32h-64z'
+          />
         </svg>
       </div>
     )
   },
-  hex: size => {
+  hex: (size) => {
     return (
       <div style={{ width: size + 'px', height: size + 'px' }}>
         <svg viewBox='0 0 245 245'>
-          <path fill='currentColor' d='M99.5 5.2583302491977a39 39 0 0 1 39 0l69.253175473055 39.983339501605a39 39 0 0 1 19.5 33.774990747593l0 79.966679003209a39 39 0 0 1 -19.5 33.774990747593l-69.253175473055 39.983339501605a39 39 0 0 1 -39 0l-69.253175473055 -39.983339501605a39 39 0 0 1 -19.5 -33.774990747593l1.2735971654952e-13 -79.966679003209a39 39 0 0 1 19.5 -33.774990747593' />
+          <path
+            fill='currentColor'
+            d='M99.5 5.2583302491977a39 39 0 0 1 39 0l69.253175473055 39.983339501605a39 39 0 0 1 19.5 33.774990747593l0 79.966679003209a39 39 0 0 1 -19.5 33.774990747593l-69.253175473055 39.983339501605a39 39 0 0 1 -39 0l-69.253175473055 -39.983339501605a39 39 0 0 1 -19.5 -33.774990747593l1.2735971654952e-13 -79.966679003209a39 39 0 0 1 19.5 -33.774990747593'
+          />
         </svg>
       </div>
     )
   },
-  swoop: size => {
+  swoop: (size) => {
     return (
       <div style={{ width: '120%', height: '1200px' }}>
         <svg viewBox='0 0 121.89 524.31'>
-          <path fill='currentColor' d='M75.82,460C56.2,465.69,13.16,478.35.5,522.65V.5H121.39V411.09C121.39,449.87,97.11,453.81,75.82,460Z' />
+          <path
+            fill='currentColor'
+            d='M75.82,460C56.2,465.69,13.16,478.35.5,522.65V.5H121.39V411.09C121.39,449.87,97.11,453.81,75.82,460Z'
+          />
         </svg>
       </div>
     )
   },
-  lightbulb: size => {
+  lightbulb: (size) => {
     return (
       <div style={{ width: size + 'px', height: size + 'px' }}>
         <svg viewBox='0 0 352 512'>
-          <path fill='currentColor' d='M96.06 454.35c.01 6.29 1.87 12.45 5.36 17.69l17.09 25.69a31.99 31.99 0 0 0 26.64 14.28h61.71a31.99 31.99 0 0 0 26.64-14.28l17.09-25.69a31.989 31.989 0 0 0 5.36-17.69l.04-38.35H96.01l.05 38.35zM0 176c0 44.37 16.45 84.85 43.56 115.78 16.52 18.85 42.36 58.23 52.21 91.45.04.26.07.52.11.78h160.24c.04-.26.07-.51.11-.78 9.85-33.22 35.69-72.6 52.21-91.45C335.55 260.85 352 220.37 352 176 352 78.61 272.91-.3 175.45 0 73.44.31 0 82.97 0 176zm176-80c-44.11 0-80 35.89-80 80 0 8.84-7.16 16-16 16s-16-7.16-16-16c0-61.76 50.24-112 112-112 8.84 0 16 7.16 16 16s-7.16 16-16 16z' />
+          <path
+            fill='currentColor'
+            d='M96.06 454.35c.01 6.29 1.87 12.45 5.36 17.69l17.09 25.69a31.99 31.99 0 0 0 26.64 14.28h61.71a31.99 31.99 0 0 0 26.64-14.28l17.09-25.69a31.989 31.989 0 0 0 5.36-17.69l.04-38.35H96.01l.05 38.35zM0 176c0 44.37 16.45 84.85 43.56 115.78 16.52 18.85 42.36 58.23 52.21 91.45.04.26.07.52.11.78h160.24c.04-.26.07-.51.11-.78 9.85-33.22 35.69-72.6 52.21-91.45C335.55 260.85 352 220.37 352 176 352 78.61 272.91-.3 175.45 0 73.44.31 0 82.97 0 176zm176-80c-44.11 0-80 35.89-80 80 0 8.84-7.16 16-16 16s-16-7.16-16-16c0-61.76 50.24-112 112-112 8.84 0 16 7.16 16 16s-7.16 16-16 16z'
+          />
         </svg>
       </div>
     )
   },
-  flame: size => {
+  flame: (size) => {
     return (
       <div style={{ width: size + 'px', height: size + 'px', paddingBottom: '2px' }}>
         <svg viewBox='0 0 384 512'>
-          <path fill='currentColor' d='M192 0C79.7 101.3 0 220.9 0 300.5 0 425 79 512 192 512s192-87 192-211.5c0-79.9-80.2-199.6-192-300.5zm0 448c-56.5 0-96-39-96-94.8 0-13.5 4.6-61.5 96-161.2 91.4 99.7 96 147.7 96 161.2 0 55.8-39.5 94.8-96 94.8z' />
+          <path
+            fill='currentColor'
+            d='M192 0C79.7 101.3 0 220.9 0 300.5 0 425 79 512 192 512s192-87 192-211.5c0-79.9-80.2-199.6-192-300.5zm0 448c-56.5 0-96-39-96-94.8 0-13.5 4.6-61.5 96-161.2 91.4 99.7 96 147.7 96 161.2 0 55.8-39.5 94.8-96 94.8z'
+          />
         </svg>
       </div>
     )
   },
-  quote: size => {
+  quote: (size) => {
     return (
       <div style={{ width: size + 'px', height: size + 'px', paddingTop: '1px' }}>
         <svg viewBox='0 0 512 512'>
-          <path fill='currentColor' d='M464 256h-80v-64c0-35.3 28.7-64 64-64h8c13.3 0 24-10.7 24-24V56c0-13.3-10.7-24-24-24h-8c-88.4 0-160 71.6-160 160v240c0 26.5 21.5 48 48 48h128c26.5 0 48-21.5 48-48V304c0-26.5-21.5-48-48-48zm-288 0H96v-64c0-35.3 28.7-64 64-64h8c13.3 0 24-10.7 24-24V56c0-13.3-10.7-24-24-24h-8C71.6 32 0 103.6 0 192v240c0 26.5 21.5 48 48 48h128c26.5 0 48-21.5 48-48V304c0-26.5-21.5-48-48-48z' />
+          <path
+            fill='currentColor'
+            d='M464 256h-80v-64c0-35.3 28.7-64 64-64h8c13.3 0 24-10.7 24-24V56c0-13.3-10.7-24-24-24h-8c-88.4 0-160 71.6-160 160v240c0 26.5 21.5 48 48 48h128c26.5 0 48-21.5 48-48V304c0-26.5-21.5-48-48-48zm-288 0H96v-64c0-35.3 28.7-64 64-64h8c13.3 0 24-10.7 24-24V56c0-13.3-10.7-24-24-24h-8C71.6 32 0 103.6 0 192v240c0 26.5 21.5 48 48 48h128c26.5 0 48-21.5 48-48V304c0-26.5-21.5-48-48-48z'
+          />
         </svg>
       </div>
     )
   },
-  ring: size => {
+  ring: (size) => {
     return (
       <div style={{ width: size + 'px', height: size + 'px', paddingTop: '3px' }}>
         <svg viewBox='0 0 512 512'>
-          <path fill='currentColor' d='M256 64C110.06 64 0 125.91 0 208v98.13C0 384.48 114.62 448 256 448s256-63.52 256-141.87V208c0-82.09-110.06-144-256-144zm0 64c106.04 0 192 35.82 192 80 0 9.26-3.97 18.12-10.91 26.39C392.15 208.21 328.23 192 256 192s-136.15 16.21-181.09 42.39C67.97 226.12 64 217.26 64 208c0-44.18 85.96-80 192-80zM120.43 264.64C155.04 249.93 201.64 240 256 240s100.96 9.93 135.57 24.64C356.84 279.07 308.93 288 256 288s-100.84-8.93-135.57-23.36z' />
+          <path
+            fill='currentColor'
+            d='M256 64C110.06 64 0 125.91 0 208v98.13C0 384.48 114.62 448 256 448s256-63.52 256-141.87V208c0-82.09-110.06-144-256-144zm0 64c106.04 0 192 35.82 192 80 0 9.26-3.97 18.12-10.91 26.39C392.15 208.21 328.23 192 256 192s-136.15 16.21-181.09 42.39C67.97 226.12 64 217.26 64 208c0-44.18 85.96-80 192-80zM120.43 264.64C155.04 249.93 201.64 240 256 240s100.96 9.93 135.57 24.64C356.84 279.07 308.93 288 256 288s-100.84-8.93-135.57-23.36z'
+          />
         </svg>
       </div>
     )
   },
-  fingerprint: size => {
+  fingerprint: (size) => {
     return (
       <div style={{ width: size + 'px', height: size + 'px', paddingBottom: '2px' }}>
         <svg viewBox='0 0 512 512'>
-          <path fill='currentColor' d='M256.12 245.96c-13.25 0-24 10.74-24 24 1.14 72.25-8.14 141.9-27.7 211.55-2.73 9.72 2.15 30.49 23.12 30.49 10.48 0 20.11-6.92 23.09-17.52 13.53-47.91 31.04-125.41 29.48-224.52.01-13.25-10.73-24-23.99-24zm-.86-81.73C194 164.16 151.25 211.3 152.1 265.32c.75 47.94-3.75 95.91-13.37 142.55-2.69 12.98 5.67 25.69 18.64 28.36 13.05 2.67 25.67-5.66 28.36-18.64 10.34-50.09 15.17-101.58 14.37-153.02-.41-25.95 19.92-52.49 54.45-52.34 31.31.47 57.15 25.34 57.62 55.47.77 48.05-2.81 96.33-10.61 143.55-2.17 13.06 6.69 25.42 19.76 27.58 19.97 3.33 26.81-15.1 27.58-19.77 8.28-50.03 12.06-101.21 11.27-152.11-.88-55.8-47.94-101.88-104.91-102.72zm-110.69-19.78c-10.3-8.34-25.37-6.8-33.76 3.48-25.62 31.5-39.39 71.28-38.75 112 .59 37.58-2.47 75.27-9.11 112.05-2.34 13.05 6.31 25.53 19.36 27.89 20.11 3.5 27.07-14.81 27.89-19.36 7.19-39.84 10.5-80.66 9.86-121.33-.47-29.88 9.2-57.88 28-80.97 8.35-10.28 6.79-25.39-3.49-33.76zm109.47-62.33c-15.41-.41-30.87 1.44-45.78 4.97-12.89 3.06-20.87 15.98-17.83 28.89 3.06 12.89 16 20.83 28.89 17.83 11.05-2.61 22.47-3.77 34-3.69 75.43 1.13 137.73 61.5 138.88 134.58.59 37.88-1.28 76.11-5.58 113.63-1.5 13.17 7.95 25.08 21.11 26.58 16.72 1.95 25.51-11.88 26.58-21.11a929.06 929.06 0 0 0 5.89-119.85c-1.56-98.75-85.07-180.33-186.16-181.83zm252.07 121.45c-2.86-12.92-15.51-21.2-28.61-18.27-12.94 2.86-21.12 15.66-18.26 28.61 4.71 21.41 4.91 37.41 4.7 61.6-.11 13.27 10.55 24.09 23.8 24.2h.2c13.17 0 23.89-10.61 24-23.8.18-22.18.4-44.11-5.83-72.34zm-40.12-90.72C417.29 43.46 337.6 1.29 252.81.02 183.02-.82 118.47 24.91 70.46 72.94 24.09 119.37-.9 181.04.14 246.65l-.12 21.47c-.39 13.25 10.03 24.31 23.28 24.69.23.02.48.02.72.02 12.92 0 23.59-10.3 23.97-23.3l.16-23.64c-.83-52.5 19.16-101.86 56.28-139 38.76-38.8 91.34-59.67 147.68-58.86 69.45 1.03 134.73 35.56 174.62 92.39 7.61 10.86 22.56 13.45 33.42 5.86 10.84-7.62 13.46-22.59 5.84-33.43z' />
+          <path
+            fill='currentColor'
+            d='M256.12 245.96c-13.25 0-24 10.74-24 24 1.14 72.25-8.14 141.9-27.7 211.55-2.73 9.72 2.15 30.49 23.12 30.49 10.48 0 20.11-6.92 23.09-17.52 13.53-47.91 31.04-125.41 29.48-224.52.01-13.25-10.73-24-23.99-24zm-.86-81.73C194 164.16 151.25 211.3 152.1 265.32c.75 47.94-3.75 95.91-13.37 142.55-2.69 12.98 5.67 25.69 18.64 28.36 13.05 2.67 25.67-5.66 28.36-18.64 10.34-50.09 15.17-101.58 14.37-153.02-.41-25.95 19.92-52.49 54.45-52.34 31.31.47 57.15 25.34 57.62 55.47.77 48.05-2.81 96.33-10.61 143.55-2.17 13.06 6.69 25.42 19.76 27.58 19.97 3.33 26.81-15.1 27.58-19.77 8.28-50.03 12.06-101.21 11.27-152.11-.88-55.8-47.94-101.88-104.91-102.72zm-110.69-19.78c-10.3-8.34-25.37-6.8-33.76 3.48-25.62 31.5-39.39 71.28-38.75 112 .59 37.58-2.47 75.27-9.11 112.05-2.34 13.05 6.31 25.53 19.36 27.89 20.11 3.5 27.07-14.81 27.89-19.36 7.19-39.84 10.5-80.66 9.86-121.33-.47-29.88 9.2-57.88 28-80.97 8.35-10.28 6.79-25.39-3.49-33.76zm109.47-62.33c-15.41-.41-30.87 1.44-45.78 4.97-12.89 3.06-20.87 15.98-17.83 28.89 3.06 12.89 16 20.83 28.89 17.83 11.05-2.61 22.47-3.77 34-3.69 75.43 1.13 137.73 61.5 138.88 134.58.59 37.88-1.28 76.11-5.58 113.63-1.5 13.17 7.95 25.08 21.11 26.58 16.72 1.95 25.51-11.88 26.58-21.11a929.06 929.06 0 0 0 5.89-119.85c-1.56-98.75-85.07-180.33-186.16-181.83zm252.07 121.45c-2.86-12.92-15.51-21.2-28.61-18.27-12.94 2.86-21.12 15.66-18.26 28.61 4.71 21.41 4.91 37.41 4.7 61.6-.11 13.27 10.55 24.09 23.8 24.2h.2c13.17 0 23.89-10.61 24-23.8.18-22.18.4-44.11-5.83-72.34zm-40.12-90.72C417.29 43.46 337.6 1.29 252.81.02 183.02-.82 118.47 24.91 70.46 72.94 24.09 119.37-.9 181.04.14 246.65l-.12 21.47c-.39 13.25 10.03 24.31 23.28 24.69.23.02.48.02.72.02 12.92 0 23.59-10.3 23.97-23.3l.16-23.64c-.83-52.5 19.16-101.86 56.28-139 38.76-38.8 91.34-59.67 147.68-58.86 69.45 1.03 134.73 35.56 174.62 92.39 7.61 10.86 22.56 13.45 33.42 5.86 10.84-7.62 13.46-22.59 5.84-33.43z'
+          />
         </svg>
       </div>
     )
   },
-  trezor: size => {
+  trezor: (size) => {
     return (
-      <div style={{ width: size + 'px', height: (size + 2) + 'px' }}>
+      <div style={{ width: size + 'px', height: size + 2 + 'px' }}>
         <svg viewBox='0 0 522.5 800'>
-          <path fill='currentColor' d='M249 0C149.9 0 69.7 80.2 69.7 179.3v67.2C34.9 252.8 0 261.2 0 272.1v350.7s0 9.7 10.9 14.3c39.5 16 194.9 71 230.6 83.6 4.6 1.7 5.9 1.7 7.1 1.7 1.7 0 2.5 0 7.1-1.7 35.7-12.6 191.5-67.6 231-83.6 10.1-4.2 10.5-13.9 10.5-13.9V272.1c0-10.9-34.4-19.7-69.3-25.6v-67.2C428.4 80.2 347.7 0 249 0zm0 85.7c58.4 0 93.7 35.3 93.7 93.7v58.4c-65.5-4.6-121.4-4.6-187.3 0v-58.4c0-58.5 35.3-93.7 93.6-93.7zm-.4 238.1c81.5 0 149.9 6.3 149.9 17.6v218.8c0 3.4-.4 3.8-3.4 5-2.9 1.3-139 50.4-139 50.4s-5.5 1.7-7.1 1.7c-1.7 0-7.1-2.1-7.1-2.1s-136.1-49.1-139-50.4-3.4-1.7-3.4-5V341c-.8-11.3 67.6-17.2 149.1-17.2z' />
+          <path
+            fill='currentColor'
+            d='M249 0C149.9 0 69.7 80.2 69.7 179.3v67.2C34.9 252.8 0 261.2 0 272.1v350.7s0 9.7 10.9 14.3c39.5 16 194.9 71 230.6 83.6 4.6 1.7 5.9 1.7 7.1 1.7 1.7 0 2.5 0 7.1-1.7 35.7-12.6 191.5-67.6 231-83.6 10.1-4.2 10.5-13.9 10.5-13.9V272.1c0-10.9-34.4-19.7-69.3-25.6v-67.2C428.4 80.2 347.7 0 249 0zm0 85.7c58.4 0 93.7 35.3 93.7 93.7v58.4c-65.5-4.6-121.4-4.6-187.3 0v-58.4c0-58.5 35.3-93.7 93.6-93.7zm-.4 238.1c81.5 0 149.9 6.3 149.9 17.6v218.8c0 3.4-.4 3.8-3.4 5-2.9 1.3-139 50.4-139 50.4s-5.5 1.7-7.1 1.7c-1.7 0-7.1-2.1-7.1-2.1s-136.1-49.1-139-50.4-3.4-1.7-3.4-5V341c-.8-11.3 67.6-17.2 149.1-17.2z'
+          />
         </svg>
       </div>
     )
   },
-  ledger: size => {
+  ledger: (size) => {
     return (
       <div style={{ width: size + 'px', height: size + 'px', padding: '3px 1px 0px 0px' }}>
         <svg viewBox='0 0 400 400'>
-          <path fill='currentColor' d='M1640 397.8c-39.7 0-70.4-12.8-93.4-37.1-21.7-24.3-33.3-58.8-33.3-103.6 0-43.5 10.2-79.3 32-104.9 21.7-26.9 49.9-39.7 87-39.7 32 0 57.6 11.5 76.8 33.3 19.2 23 28.1 53.7 28.1 92.1v20.5h-197c0 37.1 9 66.5 26.9 85.7 16.6 20.5 42.2 29.4 74.2 29.4 15.3 0 29.4-1.3 40.9-3.8 11.5-2.6 26.9-6.4 44.8-14.1v24.3c-15.3 6.4-29.4 11.5-42.2 14.1-14.1 2.6-28.2 3.8-44.8 3.8zm-6.4-262.2c-26.9 0-47.3 9-64 25.6-15.3 17.9-25.6 42.2-28.1 75.5h168.9c0-32-6.4-56.3-20.5-74.2-12.8-18-32-26.9-56.3-26.9zm245.6-21.8c11.5 0 24.3 1.3 37.1 3.8l-5.1 24.3c-11.8-2.6-23.8-3.9-35.8-3.8-23 0-42.2 10.2-57.6 29.4-15.3 20.5-23 44.8-23 75.5v149.7h-25.6V119h21.7l2.6 49.9h1.3c11.5-20.5 23-34.5 35.8-42.2 15.4-9 30.7-12.9 48.6-12.9zM333.9 12.8h-183v245.6h245.6V76.7c.1-34.5-28.1-63.9-62.6-63.9zm-239.2 0H64c-34.5 0-64 28.1-64 64v30.7h94.7V12.8zM0 165h94.7v94.7H0V165zm301.9 245.6h30.7c34.5 0 64-28.1 64-64V316h-94.7v94.6zm-151-94.6h94.7v94.7h-94.7V316zM0 316v30.7c0 34.5 28.1 64 64 64h30.7V316H0z' />
+          <path
+            fill='currentColor'
+            d='M1640 397.8c-39.7 0-70.4-12.8-93.4-37.1-21.7-24.3-33.3-58.8-33.3-103.6 0-43.5 10.2-79.3 32-104.9 21.7-26.9 49.9-39.7 87-39.7 32 0 57.6 11.5 76.8 33.3 19.2 23 28.1 53.7 28.1 92.1v20.5h-197c0 37.1 9 66.5 26.9 85.7 16.6 20.5 42.2 29.4 74.2 29.4 15.3 0 29.4-1.3 40.9-3.8 11.5-2.6 26.9-6.4 44.8-14.1v24.3c-15.3 6.4-29.4 11.5-42.2 14.1-14.1 2.6-28.2 3.8-44.8 3.8zm-6.4-262.2c-26.9 0-47.3 9-64 25.6-15.3 17.9-25.6 42.2-28.1 75.5h168.9c0-32-6.4-56.3-20.5-74.2-12.8-18-32-26.9-56.3-26.9zm245.6-21.8c11.5 0 24.3 1.3 37.1 3.8l-5.1 24.3c-11.8-2.6-23.8-3.9-35.8-3.8-23 0-42.2 10.2-57.6 29.4-15.3 20.5-23 44.8-23 75.5v149.7h-25.6V119h21.7l2.6 49.9h1.3c11.5-20.5 23-34.5 35.8-42.2 15.4-9 30.7-12.9 48.6-12.9zM333.9 12.8h-183v245.6h245.6V76.7c.1-34.5-28.1-63.9-62.6-63.9zm-239.2 0H64c-34.5 0-64 28.1-64 64v30.7h94.7V12.8zM0 165h94.7v94.7H0V165zm301.9 245.6h30.7c34.5 0 64-28.1 64-64V316h-94.7v94.6zm-151-94.6h94.7v94.7h-94.7V316zM0 316v30.7c0 34.5 28.1 64 64 64h30.7V316H0z'
+          />
         </svg>
       </div>
     )
   },
-  aragon: size => {
+  aragon: (size) => {
     return (
       <div style={{ width: size + 'px', height: size + 'px' }}>
         <svg viewBox='0 0 48 95'>
-          <path fill='currentColor' opacity='0.15' d='M5.30013 26.8635L5.77363 28.7535C5.77363 28.7535 11.364 40.2931 23.9499 44.5801C23.9499 44.5801 35.4004 39.6631 40.4867 31.3195L33.4658 25.1579C33.4658 25.1579 30.1054 27.8469 25.1108 27.8469C20.1161 27.8469 13.3344 24.8506 13.3344 18.6736C13.3344 12.4966 20.3605 10.2378 20.3605 10.2378L17.3668 9.50027H9.71437L4.85718 21.2704L5.30013 26.8635Z' />
-          <path fill='currentColor' d='M47.5944 13.8916C47.3805 13.6765 42.9828 8 25.748 1C24.8743 0.657513 24.0568 0.948486 24.0568 0.948486C8.26624 4.99919 0.519287 13.3594 0.519287 13.8916C0.519287 14.4238 2.77987 22.4228 4.24619 25.6803C4.36839 25.9569 6.32348 29.4295 7.77453 31.3195C6.91918 29.4295 5.98745 27.7854 5.98745 24.9581C5.98745 16.9834 12.1277 10.499 19.8106 10.2225C19.9939 10.2225 20.1925 10.2225 20.3758 10.2378L18.5428 8.39394C18.5428 8.39394 25.9203 7.14932 35.3903 12.9114C35.3903 12.9114 35.5278 13.2034 35.3903 14.0639C35.3903 14.0639 39.8504 15.9999 40.2322 19.7645C40.6141 23.5291 38.2466 25.6803 36.3373 25.9876C36.3373 25.9876 37.3301 24.4357 35.8027 23.606C35.4819 23.4216 35.1001 23.3447 34.7182 23.3601C31.8009 23.3601 31.4648 26.7098 31.4648 26.7098C31.4343 26.8788 31.4343 27.0479 31.4343 27.2169C31.4343 27.2169 30.9455 32.1185 39.6213 32.0263C39.6213 32.0263 44.0202 27.0171 45.1811 22.515C45.6087 20.8555 45.9142 19.6109 46.1128 18.6889C46.6016 17.3829 47.0751 15.4589 47.5333 14.0606L47.5944 13.8916Z' />
-          <path fill='currentColor' d='M31.6177 14.4019C31.7399 14.3405 32.137 14.1407 32.5953 13.6644C33.5117 13.7873 34.4129 14.0792 34.4129 14.0792C32.748 13.0651 30.4721 12.4658 27.9519 12.4812C27.9519 12.4812 28.9142 13.8641 31.5872 14.4326C31.5872 14.4326 31.6024 14.4173 31.6177 14.4019Z' />
+          <path
+            fill='currentColor'
+            opacity='0.15'
+            d='M5.30013 26.8635L5.77363 28.7535C5.77363 28.7535 11.364 40.2931 23.9499 44.5801C23.9499 44.5801 35.4004 39.6631 40.4867 31.3195L33.4658 25.1579C33.4658 25.1579 30.1054 27.8469 25.1108 27.8469C20.1161 27.8469 13.3344 24.8506 13.3344 18.6736C13.3344 12.4966 20.3605 10.2378 20.3605 10.2378L17.3668 9.50027H9.71437L4.85718 21.2704L5.30013 26.8635Z'
+          />
+          <path
+            fill='currentColor'
+            d='M47.5944 13.8916C47.3805 13.6765 42.9828 8 25.748 1C24.8743 0.657513 24.0568 0.948486 24.0568 0.948486C8.26624 4.99919 0.519287 13.3594 0.519287 13.8916C0.519287 14.4238 2.77987 22.4228 4.24619 25.6803C4.36839 25.9569 6.32348 29.4295 7.77453 31.3195C6.91918 29.4295 5.98745 27.7854 5.98745 24.9581C5.98745 16.9834 12.1277 10.499 19.8106 10.2225C19.9939 10.2225 20.1925 10.2225 20.3758 10.2378L18.5428 8.39394C18.5428 8.39394 25.9203 7.14932 35.3903 12.9114C35.3903 12.9114 35.5278 13.2034 35.3903 14.0639C35.3903 14.0639 39.8504 15.9999 40.2322 19.7645C40.6141 23.5291 38.2466 25.6803 36.3373 25.9876C36.3373 25.9876 37.3301 24.4357 35.8027 23.606C35.4819 23.4216 35.1001 23.3447 34.7182 23.3601C31.8009 23.3601 31.4648 26.7098 31.4648 26.7098C31.4343 26.8788 31.4343 27.0479 31.4343 27.2169C31.4343 27.2169 30.9455 32.1185 39.6213 32.0263C39.6213 32.0263 44.0202 27.0171 45.1811 22.515C45.6087 20.8555 45.9142 19.6109 46.1128 18.6889C46.6016 17.3829 47.0751 15.4589 47.5333 14.0606L47.5944 13.8916Z'
+          />
+          <path
+            fill='currentColor'
+            d='M31.6177 14.4019C31.7399 14.3405 32.137 14.1407 32.5953 13.6644C33.5117 13.7873 34.4129 14.0792 34.4129 14.0792C32.748 13.0651 30.4721 12.4658 27.9519 12.4812C27.9519 12.4812 28.9142 13.8641 31.5872 14.4326C31.5872 14.4326 31.6024 14.4173 31.6177 14.4019Z'
+          />
         </svg>
       </div>
     )
   },
-  lattice: size => {
+  lattice: (size) => {
     return (
       <div style={{ width: size + 'px', height: size + 'px' }}>
         <img src={gridPlusLogo} height={size} width={size} />
       </div>
     )
   },
-  broadcast: size => {
+  broadcast: (size) => {
     return (
       <div style={{ width: size + 'px', height: size + 'px' }}>
         <svg viewBox='0 0 16 16'>
-          <path fill='currentColor' d='M3.267 1.457c.3.286.312.76.026 1.06A6.475 6.475 0 001.5 7a6.472 6.472 0 001.793 4.483.75.75 0 01-1.086 1.034 8.89 8.89 0 01-.276-.304l.569-.49-.569.49A7.971 7.971 0 010 7c0-2.139.84-4.083 2.207-5.517a.75.75 0 011.06-.026zm9.466 0a.75.75 0 011.06.026A7.975 7.975 0 0116 7c0 2.139-.84 4.083-2.207 5.517a.75.75 0 11-1.086-1.034A6.475 6.475 0 0014.5 7a6.475 6.475 0 00-1.793-4.483.75.75 0 01.026-1.06zM8.75 8.582a1.75 1.75 0 10-1.5 0v5.668a.75.75 0 001.5 0V8.582zM5.331 4.736a.75.75 0 10-1.143-.972A4.983 4.983 0 003 7c0 1.227.443 2.352 1.177 3.222a.75.75 0 001.146-.967A3.483 3.483 0 014.5 7c0-.864.312-1.654.831-2.264zm6.492-.958a.75.75 0 00-1.146.967c.514.61.823 1.395.823 2.255 0 .86-.31 1.646-.823 2.255a.75.75 0 101.146.967A4.983 4.983 0 0013 7a4.983 4.983 0 00-1.177-3.222z' />
+          <path
+            fill='currentColor'
+            d='M3.267 1.457c.3.286.312.76.026 1.06A6.475 6.475 0 001.5 7a6.472 6.472 0 001.793 4.483.75.75 0 01-1.086 1.034 8.89 8.89 0 01-.276-.304l.569-.49-.569.49A7.971 7.971 0 010 7c0-2.139.84-4.083 2.207-5.517a.75.75 0 011.06-.026zm9.466 0a.75.75 0 011.06.026A7.975 7.975 0 0116 7c0 2.139-.84 4.083-2.207 5.517a.75.75 0 11-1.086-1.034A6.475 6.475 0 0014.5 7a6.475 6.475 0 00-1.793-4.483.75.75 0 01.026-1.06zM8.75 8.582a1.75 1.75 0 10-1.5 0v5.668a.75.75 0 001.5 0V8.582zM5.331 4.736a.75.75 0 10-1.143-.972A4.983 4.983 0 003 7c0 1.227.443 2.352 1.177 3.222a.75.75 0 001.146-.967A3.483 3.483 0 014.5 7c0-.864.312-1.654.831-2.264zm6.492-.958a.75.75 0 00-1.146.967c.514.61.823 1.395.823 2.255 0 .86-.31 1.646-.823 2.255a.75.75 0 101.146.967A4.983 4.983 0 0013 7a4.983 4.983 0 00-1.177-3.222z'
+          />
         </svg>
       </div>
     )
   },
-  save: size => {
+  save: (size) => {
     return (
       <div style={{ width: size + 'px', height: size + 'px' }}>
         <svg viewBox='0 0 16 16' width={size + 'px'} height={size + 'px'}>
-          <path fill='currentColor' fillRule='evenodd' d='M0 2.75C0 1.784.784 1 1.75 1H5c.55 0 1.07.26 1.4.7l.9 1.2a.25.25 0 00.2.1h6.75c.966 0 1.75.784 1.75 1.75v8.5A1.75 1.75 0 0114.25 15H1.75A1.75 1.75 0 010 13.25V2.75zm9.42 9.36l2.883-2.677a.25.25 0 000-.366L9.42 6.39a.25.25 0 00-.42.183V8.5H4.75a.75.75 0 100 1.5H9v1.927c0 .218.26.331.42.183z' />
+          <path
+            fill='currentColor'
+            fillRule='evenodd'
+            d='M0 2.75C0 1.784.784 1 1.75 1H5c.55 0 1.07.26 1.4.7l.9 1.2a.25.25 0 00.2.1h6.75c.966 0 1.75.784 1.75 1.75v8.5A1.75 1.75 0 0114.25 15H1.75A1.75 1.75 0 010 13.25V2.75zm9.42 9.36l2.883-2.677a.25.25 0 000-.366L9.42 6.39a.25.25 0 00-.42.183V8.5H4.75a.75.75 0 100 1.5H9v1.927c0 .218.26.331.42.183z'
+          />
         </svg>
       </div>
     )
   },
-  ethereum: size => {
+  ethereum: (size) => {
     return (
       <div style={{ width: size + 'px', height: size + 'px' }}>
         <svg viewBox='0 0 320 512' width={size + 'px'} height={size + 'px'}>
-          <path fill='currentColor' d='M311.9 260.8L160 353.6 8 260.8 160 0l151.9 260.8zM160 383.4L8 290.6 160 512l152-221.4-152 92.8z' />
+          <path
+            fill='currentColor'
+            d='M311.9 260.8L160 353.6 8 260.8 160 0l151.9 260.8zM160 383.4L8 290.6 160 512l152-221.4-152 92.8z'
+          />
         </svg>
       </div>
     )
   },
-  trash: size => {
+  trash: (size) => {
     return (
       <div style={{ width: size + 'px', height: size + 'px' }}>
         <svg viewBox='0 0 16 16' width={size + 'px'} height={size + 'px'}>
-          <path fill='currentColor' d='M6.5 1.75a.25.25 0 01.25-.25h2.5a.25.25 0 01.25.25V3h-3V1.75zm4.5 0V3h2.25a.75.75 0 010 1.5H2.75a.75.75 0 010-1.5H5V1.75C5 .784 5.784 0 6.75 0h2.5C10.216 0 11 .784 11 1.75zM4.496 6.675a.75.75 0 10-1.492.15l.66 6.6A1.75 1.75 0 005.405 15h5.19c.9 0 1.652-.681 1.741-1.576l.66-6.6a.75.75 0 00-1.492-.149l-.66 6.6a.25.25 0 01-.249.225h-5.19a.25.25 0 01-.249-.225l-.66-6.6z' />
+          <path
+            fill='currentColor'
+            d='M6.5 1.75a.25.25 0 01.25-.25h2.5a.25.25 0 01.25.25V3h-3V1.75zm4.5 0V3h2.25a.75.75 0 010 1.5H2.75a.75.75 0 010-1.5H5V1.75C5 .784 5.784 0 6.75 0h2.5C10.216 0 11 .784 11 1.75zM4.496 6.675a.75.75 0 10-1.492.15l.66 6.6A1.75 1.75 0 005.405 15h5.19c.9 0 1.652-.681 1.741-1.576l.66-6.6a.75.75 0 00-1.492-.149l-.66 6.6a.25.25 0 01-.249.225h-5.19a.25.25 0 01-.249-.225l-.66-6.6z'
+          />
         </svg>
       </div>
     )
   },
-  chrome: size => {
+  chrome: (size) => {
     return (
       <div style={{ width: size + 'px', height: size + 'px' }}>
         <svg viewBox='0 0 496 512' width={size + 'px'} height={size + 'px'}>
-          <path fill='currentColor' d='M131.5 217.5L55.1 100.1c47.6-59.2 119-91.8 192-92.1 42.3-.3 85.5 10.5 124.8 33.2 43.4 25.2 76.4 61.4 97.4 103L264 133.4c-58.1-3.4-113.4 29.3-132.5 84.1zm32.9 38.5c0 46.2 37.4 83.6 83.6 83.6s83.6-37.4 83.6-83.6-37.4-83.6-83.6-83.6-83.6 37.3-83.6 83.6zm314.9-89.2L339.6 174c37.9 44.3 38.5 108.2 6.6 157.2L234.1 503.6c46.5 2.5 94.4-7.7 137.8-32.9 107.4-62 150.9-192 107.4-303.9zM133.7 303.6L40.4 120.1C14.9 159.1 0 205.9 0 256c0 124 90.8 226.7 209.5 244.9l63.7-124.8c-57.6 10.8-113.2-20.8-139.5-72.5z' />
+          <path
+            fill='currentColor'
+            d='M131.5 217.5L55.1 100.1c47.6-59.2 119-91.8 192-92.1 42.3-.3 85.5 10.5 124.8 33.2 43.4 25.2 76.4 61.4 97.4 103L264 133.4c-58.1-3.4-113.4 29.3-132.5 84.1zm32.9 38.5c0 46.2 37.4 83.6 83.6 83.6s83.6-37.4 83.6-83.6-37.4-83.6-83.6-83.6-83.6 37.3-83.6 83.6zm314.9-89.2L339.6 174c37.9 44.3 38.5 108.2 6.6 157.2L234.1 503.6c46.5 2.5 94.4-7.7 137.8-32.9 107.4-62 150.9-192 107.4-303.9zM133.7 303.6L40.4 120.1C14.9 159.1 0 205.9 0 256c0 124 90.8 226.7 209.5 244.9l63.7-124.8c-57.6 10.8-113.2-20.8-139.5-72.5z'
+          />
         </svg>
       </div>
     )
   },
-  firefox: size => {
+  firefox: (size) => {
     return (
       <div style={{ width: size + 'px', height: size + 'px' }}>
         <svg viewBox='0 0 480 512' width={size + 'px'} height={size + 'px'}>
-          <path fill='currentColor' d='M478.1 235.3c-.7-4.5-1.4-7.1-1.4-7.1s-1.8 2-4.7 5.9c-.9-10.7-2.8-21.2-5.8-31.6-3.7-12.9-8.5-25.4-14.5-37.4-3.8-8-8.2-15.6-13.3-22.8-1.8-2.7-3.7-5.4-5.6-7.9-8.8-14.4-19-23.3-30.7-40-7.6-12.8-12.9-26.9-15.4-41.6-3.2 8.9-5.7 18-7.4 27.3-12.1-12.2-22.5-20.8-28.9-26.7C319.4 24.2 323 9.1 323 9.1S264.7 74.2 289.9 142c8.7 23 23.8 43.1 43.4 57.9 24.4 20.2 50.8 36 64.7 76.6-11.2-21.3-28.1-39.2-48.8-51.5 6.2 14.7 9.4 30.6 9.3 46.5 0 61-49.6 110.5-110.6 110.4-8.3 0-16.5-.9-24.5-2.8-9.5-1.8-18.7-4.9-27.4-9.3-12.9-7.8-24-18.1-32.8-30.3l-.2-.3 2 .7c4.6 1.6 9.2 2.8 14 3.7 18.7 4 38.3 1.7 55.6-6.6 17.5-9.7 28-16.9 36.6-14h.2c8.4 2.7 15-5.5 9-14-10.4-13.4-27.4-20-44.2-17-17.5 2.5-33.5 15-56.4 2.9-1.5-.8-2.9-1.6-4.3-2.5-1.6-.9 4.9 1.3 3.4.3-5-2.5-9.8-5.4-14.4-8.6-.3-.3 3.5 1.1 3.1.8-5.9-4-11-9.2-15-15.2-4.1-7.4-4.5-16.4-1-24.1 2.1-3.8 5.4-6.9 9.3-8.7 3 1.5 4.8 2.6 4.8 2.6s-1.3-2.5-2.1-3.8c.3-.1.5 0 .8-.2 2.6 1.1 8.3 4 11.4 5.8 2.1 1.1 3.8 2.7 5.2 4.7 0 0 1-.5.3-2.7-1.1-2.7-2.9-5-5.4-6.6h.2c2.3 1.2 4.5 2.6 6.6 4.1 1.9-4.4 2.8-9.2 2.6-14 .2-2.6-.2-5.3-1.1-7.8-.8-1.6.5-2.2 1.9-.5-.2-1.3-.7-2.5-1.2-3.7v-.1s.8-1.1 1.2-1.5c1-1 2.1-1.9 3.4-2.7 7.2-4.5 14.8-8.4 22.7-11.6 6.4-2.8 11.7-4.9 12.8-5.6 1.6-1 3.1-2.2 4.5-3.5 5.3-4.5 9-10.8 10.2-17.7.1-.9.2-1.8.3-2.8v-1.5c-.9-3.5-6.9-6.1-38.4-9.1-11.1-1.8-20-10.1-22.5-21.1v.1c-.4 1.1-.9 2.3-1.3 3.5.4-1.2.8-2.3 1.3-3.5v-.2c6-15.7 16.8-29.1 30.8-38.3.8-.7-3.2.2-2.4-.5 2.7-1.3 5.4-2.5 8.2-3.5 1.4-.6-6-3.4-12.6-2.7-4 .2-8 1.2-11.7 2.8 1.6-1.3 6.2-3.1 5.1-3.1-8.4 1.6-16.5 4.7-23.9 9 0-.8.1-1.5.5-2.2-5.9 2.5-11 6.5-15 11.5.1-.9.2-1.8.2-2.7-2.7 2-5.2 4.3-7.3 6.9l-.1.1c-17.4-6.7-36.3-8.3-54.6-4.7l-.2-.1h.2c-3.8-3.1-7.1-6.7-9.7-10.9l-.2.1-.4-.2c-1.2-1.8-2.4-3.8-3.7-6-.9-1.6-1.8-3.4-2.7-5.2 0-.1-.1-.2-.2-.2-.4 0-.6 1.7-.9 1.3v-.1c-3.2-8.3-4.7-17.2-4.4-26.2l-.2.1c-5.1 3.5-9 8.6-11.1 14.5-.9 2.1-1.6 3.3-2.2 4.5v-.5c.1-1.1.6-3.3.5-3.1-.1.2-.2.3-.3.4-1.5 1.7-2.9 3.7-3.9 5.8-.9 1.9-1.7 3.9-2.3 5.9-.1.3 0-.3 0-1s.1-2 0-1.7l-.3.7c-6.7 14.9-10.9 30.8-12.4 47.1-.4 2.8-.6 5.6-.5 8.3v.2c-4.8 5.2-9 11-12.7 17.1-12.1 20.4-21.1 42.5-26.8 65.6 4-8.8 8.8-17.2 14.3-25.1C5.5 228.5 0 257.4 0 286.6c1.8-8.6 4.2-17 7-25.3-1.7 34.5 4.9 68.9 19.4 100.3 19.4 43.5 51.6 80 92.3 104.7 16.6 11.2 34.7 19.9 53.8 25.8 2.5.9 5.1 1.8 7.7 2.7-.8-.3-1.6-.7-2.4-1 22.6 6.8 46.2 10.3 69.8 10.3 83.7 0 111.3-31.9 113.8-35 4.1-3.7 7.5-8.2 9.9-13.3 1.6-.7 3.2-1.4 4.9-2.1l1-.5 1.9-.9c12.6-5.9 24.5-13.4 35.3-22.1 16.3-11.7 27.9-28.7 32.9-48.1 3-7.1 3.1-15 .4-22.2.9-1.4 1.7-2.8 2.7-4.3 18-28.9 28.2-61.9 29.6-95.9v-2.8c0-7.3-.6-14.5-1.9-21.6z' />
+          <path
+            fill='currentColor'
+            d='M478.1 235.3c-.7-4.5-1.4-7.1-1.4-7.1s-1.8 2-4.7 5.9c-.9-10.7-2.8-21.2-5.8-31.6-3.7-12.9-8.5-25.4-14.5-37.4-3.8-8-8.2-15.6-13.3-22.8-1.8-2.7-3.7-5.4-5.6-7.9-8.8-14.4-19-23.3-30.7-40-7.6-12.8-12.9-26.9-15.4-41.6-3.2 8.9-5.7 18-7.4 27.3-12.1-12.2-22.5-20.8-28.9-26.7C319.4 24.2 323 9.1 323 9.1S264.7 74.2 289.9 142c8.7 23 23.8 43.1 43.4 57.9 24.4 20.2 50.8 36 64.7 76.6-11.2-21.3-28.1-39.2-48.8-51.5 6.2 14.7 9.4 30.6 9.3 46.5 0 61-49.6 110.5-110.6 110.4-8.3 0-16.5-.9-24.5-2.8-9.5-1.8-18.7-4.9-27.4-9.3-12.9-7.8-24-18.1-32.8-30.3l-.2-.3 2 .7c4.6 1.6 9.2 2.8 14 3.7 18.7 4 38.3 1.7 55.6-6.6 17.5-9.7 28-16.9 36.6-14h.2c8.4 2.7 15-5.5 9-14-10.4-13.4-27.4-20-44.2-17-17.5 2.5-33.5 15-56.4 2.9-1.5-.8-2.9-1.6-4.3-2.5-1.6-.9 4.9 1.3 3.4.3-5-2.5-9.8-5.4-14.4-8.6-.3-.3 3.5 1.1 3.1.8-5.9-4-11-9.2-15-15.2-4.1-7.4-4.5-16.4-1-24.1 2.1-3.8 5.4-6.9 9.3-8.7 3 1.5 4.8 2.6 4.8 2.6s-1.3-2.5-2.1-3.8c.3-.1.5 0 .8-.2 2.6 1.1 8.3 4 11.4 5.8 2.1 1.1 3.8 2.7 5.2 4.7 0 0 1-.5.3-2.7-1.1-2.7-2.9-5-5.4-6.6h.2c2.3 1.2 4.5 2.6 6.6 4.1 1.9-4.4 2.8-9.2 2.6-14 .2-2.6-.2-5.3-1.1-7.8-.8-1.6.5-2.2 1.9-.5-.2-1.3-.7-2.5-1.2-3.7v-.1s.8-1.1 1.2-1.5c1-1 2.1-1.9 3.4-2.7 7.2-4.5 14.8-8.4 22.7-11.6 6.4-2.8 11.7-4.9 12.8-5.6 1.6-1 3.1-2.2 4.5-3.5 5.3-4.5 9-10.8 10.2-17.7.1-.9.2-1.8.3-2.8v-1.5c-.9-3.5-6.9-6.1-38.4-9.1-11.1-1.8-20-10.1-22.5-21.1v.1c-.4 1.1-.9 2.3-1.3 3.5.4-1.2.8-2.3 1.3-3.5v-.2c6-15.7 16.8-29.1 30.8-38.3.8-.7-3.2.2-2.4-.5 2.7-1.3 5.4-2.5 8.2-3.5 1.4-.6-6-3.4-12.6-2.7-4 .2-8 1.2-11.7 2.8 1.6-1.3 6.2-3.1 5.1-3.1-8.4 1.6-16.5 4.7-23.9 9 0-.8.1-1.5.5-2.2-5.9 2.5-11 6.5-15 11.5.1-.9.2-1.8.2-2.7-2.7 2-5.2 4.3-7.3 6.9l-.1.1c-17.4-6.7-36.3-8.3-54.6-4.7l-.2-.1h.2c-3.8-3.1-7.1-6.7-9.7-10.9l-.2.1-.4-.2c-1.2-1.8-2.4-3.8-3.7-6-.9-1.6-1.8-3.4-2.7-5.2 0-.1-.1-.2-.2-.2-.4 0-.6 1.7-.9 1.3v-.1c-3.2-8.3-4.7-17.2-4.4-26.2l-.2.1c-5.1 3.5-9 8.6-11.1 14.5-.9 2.1-1.6 3.3-2.2 4.5v-.5c.1-1.1.6-3.3.5-3.1-.1.2-.2.3-.3.4-1.5 1.7-2.9 3.7-3.9 5.8-.9 1.9-1.7 3.9-2.3 5.9-.1.3 0-.3 0-1s.1-2 0-1.7l-.3.7c-6.7 14.9-10.9 30.8-12.4 47.1-.4 2.8-.6 5.6-.5 8.3v.2c-4.8 5.2-9 11-12.7 17.1-12.1 20.4-21.1 42.5-26.8 65.6 4-8.8 8.8-17.2 14.3-25.1C5.5 228.5 0 257.4 0 286.6c1.8-8.6 4.2-17 7-25.3-1.7 34.5 4.9 68.9 19.4 100.3 19.4 43.5 51.6 80 92.3 104.7 16.6 11.2 34.7 19.9 53.8 25.8 2.5.9 5.1 1.8 7.7 2.7-.8-.3-1.6-.7-2.4-1 22.6 6.8 46.2 10.3 69.8 10.3 83.7 0 111.3-31.9 113.8-35 4.1-3.7 7.5-8.2 9.9-13.3 1.6-.7 3.2-1.4 4.9-2.1l1-.5 1.9-.9c12.6-5.9 24.5-13.4 35.3-22.1 16.3-11.7 27.9-28.7 32.9-48.1 3-7.1 3.1-15 .4-22.2.9-1.4 1.7-2.8 2.7-4.3 18-28.9 28.2-61.9 29.6-95.9v-2.8c0-7.3-.6-14.5-1.9-21.6z'
+          />
         </svg>
       </div>
     )
   },
-  mask: size => {
+  mask: (size) => {
     return (
       <div style={{ width: size + 'px', height: size + 'px' }}>
         <svg viewBox='0 0 640 512' width={size + 'px'} height={size + 'px'}>
-          <path fill='currentColor' d='M320.67 64c-442.6 0-357.57 384-158.46 384 39.9 0 77.47-20.69 101.42-55.86l25.73-37.79c15.66-22.99 46.97-22.99 62.63 0l25.73 37.79C401.66 427.31 439.23 448 479.13 448c189.86 0 290.63-384-158.46-384zM184 308.36c-41.06 0-67.76-25.66-80.08-41.05-5.23-6.53-5.23-16.09 0-22.63 12.32-15.4 39.01-41.05 80.08-41.05s67.76 25.66 80.08 41.05c5.23 6.53 5.23 16.09 0 22.63-12.32 15.4-39.02 41.05-80.08 41.05zm272 0c-41.06 0-67.76-25.66-80.08-41.05-5.23-6.53-5.23-16.09 0-22.63 12.32-15.4 39.01-41.05 80.08-41.05s67.76 25.66 80.08 41.05c5.23 6.53 5.23 16.09 0 22.63-12.32 15.4-39.02 41.05-80.08 41.05z' />
+          <path
+            fill='currentColor'
+            d='M320.67 64c-442.6 0-357.57 384-158.46 384 39.9 0 77.47-20.69 101.42-55.86l25.73-37.79c15.66-22.99 46.97-22.99 62.63 0l25.73 37.79C401.66 427.31 439.23 448 479.13 448c189.86 0 290.63-384-158.46-384zM184 308.36c-41.06 0-67.76-25.66-80.08-41.05-5.23-6.53-5.23-16.09 0-22.63 12.32-15.4 39.01-41.05 80.08-41.05s67.76 25.66 80.08 41.05c5.23 6.53 5.23 16.09 0 22.63-12.32 15.4-39.02 41.05-80.08 41.05zm272 0c-41.06 0-67.76-25.66-80.08-41.05-5.23-6.53-5.23-16.09 0-22.63 12.32-15.4 39.01-41.05 80.08-41.05s67.76 25.66 80.08 41.05c5.23 6.53 5.23 16.09 0 22.63-12.32 15.4-39.02 41.05-80.08 41.05z'
+          />
         </svg>
       </div>
     )
   },
-  handshake: size => {
+  handshake: (size) => {
     return (
       <div style={{ width: size + 'px', height: size + 'px' }}>
         <svg viewBox='0 0 640 512' width={size + 'px'} height={size + 'px'}>
-          <path fill='currentColor' d='M434.7 64h-85.9c-8 0-15.7 3-21.6 8.4l-98.3 90c-.1.1-.2.3-.3.4-16.6 15.6-16.3 40.5-2.1 56 12.7 13.9 39.4 17.6 56.1 2.7.1-.1.3-.1.4-.2l79.9-73.2c6.5-5.9 16.7-5.5 22.6 1 6 6.5 5.5 16.6-1 22.6l-26.1 23.9L504 313.8c2.9 2.4 5.5 5 7.9 7.7V128l-54.6-54.6c-5.9-6-14.1-9.4-22.6-9.4zM544 128.2v223.9c0 17.7 14.3 32 32 32h64V128.2h-96zm48 223.9c-8.8 0-16-7.2-16-16s7.2-16 16-16 16 7.2 16 16-7.2 16-16 16zM0 384h64c17.7 0 32-14.3 32-32V128.2H0V384zm48-63.9c8.8 0 16 7.2 16 16s-7.2 16-16 16-16-7.2-16-16c0-8.9 7.2-16 16-16zm435.9 18.6L334.6 217.5l-30 27.5c-29.7 27.1-75.2 24.5-101.7-4.4-26.9-29.4-24.8-74.9 4.4-101.7L289.1 64h-83.8c-8.5 0-16.6 3.4-22.6 9.4L128 128v223.9h18.3l90.5 81.9c27.4 22.3 67.7 18.1 90-9.3l.2-.2 17.9 15.5c15.9 13 39.4 10.5 52.3-5.4l31.4-38.6 5.4 4.4c13.7 11.1 33.9 9.1 45-4.7l9.5-11.7c11.2-13.8 9.1-33.9-4.6-45.1z' />
+          <path
+            fill='currentColor'
+            d='M434.7 64h-85.9c-8 0-15.7 3-21.6 8.4l-98.3 90c-.1.1-.2.3-.3.4-16.6 15.6-16.3 40.5-2.1 56 12.7 13.9 39.4 17.6 56.1 2.7.1-.1.3-.1.4-.2l79.9-73.2c6.5-5.9 16.7-5.5 22.6 1 6 6.5 5.5 16.6-1 22.6l-26.1 23.9L504 313.8c2.9 2.4 5.5 5 7.9 7.7V128l-54.6-54.6c-5.9-6-14.1-9.4-22.6-9.4zM544 128.2v223.9c0 17.7 14.3 32 32 32h64V128.2h-96zm48 223.9c-8.8 0-16-7.2-16-16s7.2-16 16-16 16 7.2 16 16-7.2 16-16 16zM0 384h64c17.7 0 32-14.3 32-32V128.2H0V384zm48-63.9c8.8 0 16 7.2 16 16s-7.2 16-16 16-16-7.2-16-16c0-8.9 7.2-16 16-16zm435.9 18.6L334.6 217.5l-30 27.5c-29.7 27.1-75.2 24.5-101.7-4.4-26.9-29.4-24.8-74.9 4.4-101.7L289.1 64h-83.8c-8.5 0-16.6 3.4-22.6 9.4L128 128v223.9h18.3l90.5 81.9c27.4 22.3 67.7 18.1 90-9.3l.2-.2 17.9 15.5c15.9 13 39.4 10.5 52.3-5.4l31.4-38.6 5.4 4.4c13.7 11.1 33.9 9.1 45-4.7l9.5-11.7c11.2-13.8 9.1-33.9-4.6-45.1z'
+          />
         </svg>
       </div>
     )
   },
-  gas: size => {
+  gas: (size) => {
     return (
       <div style={{ width: size + 'px', height: size + 'px' }}>
         <svg viewBox='0 0 512 512' width={size + 'px'} height={size + 'px'}>
-          <path fill='currentColor' d='M336 448H16c-8.8 0-16 7.2-16 16v32c0 8.8 7.2 16 16 16h320c8.8 0 16-7.2 16-16v-32c0-8.8-7.2-16-16-16zm157.2-340.7l-81-81c-6.2-6.2-16.4-6.2-22.6 0l-11.3 11.3c-6.2 6.2-6.2 16.4 0 22.6L416 97.9V160c0 28.1 20.9 51.3 48 55.2V376c0 13.2-10.8 24-24 24s-24-10.8-24-24v-32c0-48.6-39.4-88-88-88h-8V64c0-35.3-28.7-64-64-64H96C60.7 0 32 28.7 32 64v352h288V304h8c22.1 0 40 17.9 40 40v27.8c0 37.7 27 72 64.5 75.9 43 4.3 79.5-29.5 79.5-71.7V152.6c0-17-6.8-33.3-18.8-45.3zM256 192H96V64h160v128z' />
+          <path
+            fill='currentColor'
+            d='M336 448H16c-8.8 0-16 7.2-16 16v32c0 8.8 7.2 16 16 16h320c8.8 0 16-7.2 16-16v-32c0-8.8-7.2-16-16-16zm157.2-340.7l-81-81c-6.2-6.2-16.4-6.2-22.6 0l-11.3 11.3c-6.2 6.2-6.2 16.4 0 22.6L416 97.9V160c0 28.1 20.9 51.3 48 55.2V376c0 13.2-10.8 24-24 24s-24-10.8-24-24v-32c0-48.6-39.4-88-88-88h-8V64c0-35.3-28.7-64-64-64H96C60.7 0 32 28.7 32 64v352h288V304h8c22.1 0 40 17.9 40 40v27.8c0 37.7 27 72 64.5 75.9 43 4.3 79.5-29.5 79.5-71.7V152.6c0-17-6.8-33.3-18.8-45.3zM256 192H96V64h160v128z'
+          />
         </svg>
       </div>
     )
   },
-  usd: size => {
+  usd: (size) => {
     return (
       <div style={{ width: size + 'px', height: size + 'px' }}>
         <svg viewBox='0 0 288 512' width={size + 'px'} height={size + 'px'}>
-          <path fill='currentColor' d='M209.2 233.4l-108-31.6C88.7 198.2 80 186.5 80 173.5c0-16.3 13.2-29.5 29.5-29.5h66.3c12.2 0 24.2 3.7 34.2 10.5 6.1 4.1 14.3 3.1 19.5-2l34.8-34c7.1-6.9 6.1-18.4-1.8-24.5C238 74.8 207.4 64.1 176 64V16c0-8.8-7.2-16-16-16h-32c-8.8 0-16 7.2-16 16v48h-2.5C45.8 64-5.4 118.7.5 183.6c4.2 46.1 39.4 83.6 83.8 96.6l102.5 30c12.5 3.7 21.2 15.3 21.2 28.3 0 16.3-13.2 29.5-29.5 29.5h-66.3C100 368 88 364.3 78 357.5c-6.1-4.1-14.3-3.1-19.5 2l-34.8 34c-7.1 6.9-6.1 18.4 1.8 24.5 24.5 19.2 55.1 29.9 86.5 30v48c0 8.8 7.2 16 16 16h32c8.8 0 16-7.2 16-16v-48.2c46.6-.9 90.3-28.6 105.7-72.7 21.5-61.6-14.6-124.8-72.5-141.7z' />
+          <path
+            fill='currentColor'
+            d='M209.2 233.4l-108-31.6C88.7 198.2 80 186.5 80 173.5c0-16.3 13.2-29.5 29.5-29.5h66.3c12.2 0 24.2 3.7 34.2 10.5 6.1 4.1 14.3 3.1 19.5-2l34.8-34c7.1-6.9 6.1-18.4-1.8-24.5C238 74.8 207.4 64.1 176 64V16c0-8.8-7.2-16-16-16h-32c-8.8 0-16 7.2-16 16v48h-2.5C45.8 64-5.4 118.7.5 183.6c4.2 46.1 39.4 83.6 83.8 96.6l102.5 30c12.5 3.7 21.2 15.3 21.2 28.3 0 16.3-13.2 29.5-29.5 29.5h-66.3C100 368 88 364.3 78 357.5c-6.1-4.1-14.3-3.1-19.5 2l-34.8 34c-7.1 6.9-6.1 18.4 1.8 24.5 24.5 19.2 55.1 29.9 86.5 30v48c0 8.8 7.2 16 16 16h32c8.8 0 16-7.2 16-16v-48.2c46.6-.9 90.3-28.6 105.7-72.7 21.5-61.6-14.6-124.8-72.5-141.7z'
+          />
         </svg>
       </div>
     )
   },
-  rocket: size => {
+  rocket: (size) => {
     return (
       <div style={{ width: size + 'px', height: size + 'px' }}>
         <svg viewBox='0 0 512 512' width={size + 'px'} height={size + 'px'}>
-          <path fill='rgb(33, 45, 46)' d='M477.64 38.26a4.75 4.75 0 00-3.55-3.66c-58.57-14.32-193.9 36.71-267.22 110a317 317 0 00-35.63 42.1c-22.61-2-45.22-.33-64.49 8.07C52.38 218.7 36.55 281.14 32.14 308a9.64 9.64 0 0010.55 11.2l87.31-9.63a194.1 194.1 0 001.19 19.7 19.53 19.53 0 005.7 12L170.7 375a19.59 19.59 0 0012 5.7 193.53 193.53 0 0019.59 1.19l-9.58 87.2a9.65 9.65 0 0011.2 10.55c26.81-4.3 89.36-20.13 113.15-74.5 8.4-19.27 10.12-41.77 8.18-64.27a317.66 317.66 0 0042.21-35.64C441 232.05 491.74 99.74 477.64 38.26zM294.07 217.93a48 48 0 1167.86 0 47.95 47.95 0 01-67.86 0z' />
-          <path fill='currentColor' d='M168.4 399.43c-5.48 5.49-14.27 7.63-24.85 9.46-23.77 4.05-44.76-16.49-40.49-40.52 1.63-9.11 6.45-21.88 9.45-24.88a4.37 4.37 0 00-3.65-7.45 60 60 0 00-35.13 17.12C50.22 376.69 48 464 48 464s87.36-2.22 110.87-25.75A59.69 59.69 0 00176 403.09c.37-4.18-4.72-6.67-7.6-3.66z' />
+          <path
+            fill='rgb(33, 45, 46)'
+            d='M477.64 38.26a4.75 4.75 0 00-3.55-3.66c-58.57-14.32-193.9 36.71-267.22 110a317 317 0 00-35.63 42.1c-22.61-2-45.22-.33-64.49 8.07C52.38 218.7 36.55 281.14 32.14 308a9.64 9.64 0 0010.55 11.2l87.31-9.63a194.1 194.1 0 001.19 19.7 19.53 19.53 0 005.7 12L170.7 375a19.59 19.59 0 0012 5.7 193.53 193.53 0 0019.59 1.19l-9.58 87.2a9.65 9.65 0 0011.2 10.55c26.81-4.3 89.36-20.13 113.15-74.5 8.4-19.27 10.12-41.77 8.18-64.27a317.66 317.66 0 0042.21-35.64C441 232.05 491.74 99.74 477.64 38.26zM294.07 217.93a48 48 0 1167.86 0 47.95 47.95 0 01-67.86 0z'
+          />
+          <path
+            fill='currentColor'
+            d='M168.4 399.43c-5.48 5.49-14.27 7.63-24.85 9.46-23.77 4.05-44.76-16.49-40.49-40.52 1.63-9.11 6.45-21.88 9.45-24.88a4.37 4.37 0 00-3.65-7.45 60 60 0 00-35.13 17.12C50.22 376.69 48 464 48 464s87.36-2.22 110.87-25.75A59.69 59.69 0 00176 403.09c.37-4.18-4.72-6.67-7.6-3.66z'
+          />
         </svg>
       </div>
     )
   },
-  dai: size => {
+  dai: (size) => {
     return (
       <div style={{ width: size + 'px', height: size + 'px' }}>
         <svg viewBox='0 0 456 387.83' width={size + 'px'} height={size + 'px'}>
-          <path fill='currentColor' d='M233.45,218.6H366c2.83,0,4.16,0,4.37-3.71a254,254,0,0,0,0-40.54c0-2.62-1.31-3.7-4.15-3.7H102.44c-3.26,0-4.14,1.08-4.14,4.14v38.8c0,5,0,5,5.22,5Zm122.09-93.29a4.33,4.33,0,0,0,0-3,87.19,87.19,0,0,0-7.88-13.73,111.7,111.7,0,0,0-16.14-20.28,53.25,53.25,0,0,0-10-9.81,156.67,156.67,0,0,0-65.4-33.13,162.55,162.55,0,0,0-37-3.92H102c-3.27,0-3.71,1.3-3.71,4.14v77.38c0,3.26,0,4.14,4.14,4.14H354s2.18-.44,2.62-1.74h-1Zm0,138.63a50.69,50.69,0,0,0-11.15,0H102.66c-3.26,0-4.36,0-4.36,4.36V344c0,3.49,0,4.37,4.36,4.37H214.27a55.87,55.87,0,0,0,15.9-1.09,165.77,165.77,0,0,0,47.31-10.47,86.37,86.37,0,0,0,15.9-7.4h1.53a141.63,141.63,0,0,0,60.81-61.23s1.53-3.3-.18-4.16Zm-301,123.6V267c0-2.84,0-3.26-3.48-3.26H3.7c-2.62,0-3.7,0-3.7-3.49V218.83H50.57c2.82,0,3.92,0,3.92-3.7v-41c0-2.62,0-3.26-3.48-3.26H3.7c-2.62,0-3.7,0-3.7-3.49V129c0-2.4,0-3,3.48-3H50.35c3.26,0,4.14,0,4.14-4.15V4.36c0-3.48,0-4.36,4.37-4.36H222.33a249,249,0,0,1,35.32,3.92,213.19,213.19,0,0,1,68.22,25.29,192.11,192.11,0,0,1,38.36,29.65,210,210,0,0,1,23.32,29,174.48,174.48,0,0,1,17,33.36,5.68,5.68,0,0,0,6.52,4.58h39c5,0,5,0,5.23,4.8v35.75c0,3.49-1.3,4.37-4.8,4.37H420.45c-3.05,0-3.92,0-3.7,3.92a223.19,223.19,0,0,1,0,39.88c0,3.71,0,4.15,4.15,4.15h34.42c1.53,2,0,3.92,0,5.9a44,44,0,0,1,0,7.61v26.38c0,3.71-1.08,4.8-4.36,4.8h-41.2a5.45,5.45,0,0,0-6.32,4.15,174.32,174.32,0,0,1-45.79,66.7,261.17,261.17,0,0,1-23.32,18.74c-8.72,5-17.22,10.25-26.16,14.39a235.77,235.77,0,0,1-51.45,16.34,268.06,268.06,0,0,1-51,4.14H54.43v-.22Z' />
+          <path
+            fill='currentColor'
+            d='M233.45,218.6H366c2.83,0,4.16,0,4.37-3.71a254,254,0,0,0,0-40.54c0-2.62-1.31-3.7-4.15-3.7H102.44c-3.26,0-4.14,1.08-4.14,4.14v38.8c0,5,0,5,5.22,5Zm122.09-93.29a4.33,4.33,0,0,0,0-3,87.19,87.19,0,0,0-7.88-13.73,111.7,111.7,0,0,0-16.14-20.28,53.25,53.25,0,0,0-10-9.81,156.67,156.67,0,0,0-65.4-33.13,162.55,162.55,0,0,0-37-3.92H102c-3.27,0-3.71,1.3-3.71,4.14v77.38c0,3.26,0,4.14,4.14,4.14H354s2.18-.44,2.62-1.74h-1Zm0,138.63a50.69,50.69,0,0,0-11.15,0H102.66c-3.26,0-4.36,0-4.36,4.36V344c0,3.49,0,4.37,4.36,4.37H214.27a55.87,55.87,0,0,0,15.9-1.09,165.77,165.77,0,0,0,47.31-10.47,86.37,86.37,0,0,0,15.9-7.4h1.53a141.63,141.63,0,0,0,60.81-61.23s1.53-3.3-.18-4.16Zm-301,123.6V267c0-2.84,0-3.26-3.48-3.26H3.7c-2.62,0-3.7,0-3.7-3.49V218.83H50.57c2.82,0,3.92,0,3.92-3.7v-41c0-2.62,0-3.26-3.48-3.26H3.7c-2.62,0-3.7,0-3.7-3.49V129c0-2.4,0-3,3.48-3H50.35c3.26,0,4.14,0,4.14-4.15V4.36c0-3.48,0-4.36,4.37-4.36H222.33a249,249,0,0,1,35.32,3.92,213.19,213.19,0,0,1,68.22,25.29,192.11,192.11,0,0,1,38.36,29.65,210,210,0,0,1,23.32,29,174.48,174.48,0,0,1,17,33.36,5.68,5.68,0,0,0,6.52,4.58h39c5,0,5,0,5.23,4.8v35.75c0,3.49-1.3,4.37-4.8,4.37H420.45c-3.05,0-3.92,0-3.7,3.92a223.19,223.19,0,0,1,0,39.88c0,3.71,0,4.15,4.15,4.15h34.42c1.53,2,0,3.92,0,5.9a44,44,0,0,1,0,7.61v26.38c0,3.71-1.08,4.8-4.36,4.8h-41.2a5.45,5.45,0,0,0-6.32,4.15,174.32,174.32,0,0,1-45.79,66.7,261.17,261.17,0,0,1-23.32,18.74c-8.72,5-17.22,10.25-26.16,14.39a235.77,235.77,0,0,1-51.45,16.34,268.06,268.06,0,0,1-51,4.14H54.43v-.22Z'
+          />
         </svg>
       </div>
     )
   },
-  octicon: (name, settings) => <Octicon icon={getIconByName(name)} height={settings.height} />
+  octicon: (name, settings) => <Octicon icon={getIconByName(name)} height={settings.height} />,
 }
diff --git a/hardhat.config.js b/hardhat.config.js
index 7b8cd6f37..4c6e4a850 100644
--- a/hardhat.config.js
+++ b/hardhat.config.js
@@ -1,9 +1,9 @@
-require("@nomiclabs/hardhat-waffle")
+require('@nomiclabs/hardhat-waffle')
 
 const { ethers, utils } = require('ethers')
 const ethProvider = require('eth-provider')
 
-function taskWithDefaultParams (taskName, taskDescription) {
+function taskWithDefaultParams(taskName, taskDescription) {
   return task(taskName, taskDescription)
     .addOptionalParam('provider', 'eth provider to use for connection')
     .addOptionalParam('chain', 'chain ID of chain for transaction')
@@ -13,67 +13,68 @@ taskWithDefaultParams('send-tx', 'send a test transaction')
   .addOptionalParam('to', 'account to send to')
   .addOptionalParam('amount', 'amount to send, in eth')
   .setAction(async ({ amount, chain = 4, to = '0xf2C1E45B6611bC4378c3502789957A57e0390B79', provider = 'frame' }) => {
-  return new Promise((resolve, reject) => {
-    setTimeout(() => reject(new Error('request timed out!')), 60 * 1000)
+    return new Promise((resolve, reject) => {
+      setTimeout(() => reject(new Error('request timed out!')), 60 * 1000)
 
-    const chainId = '0x' + parseInt(chain).toString(16)
-    const eth = ethProvider(provider === 'hardhat' ? 'http://127.0.0.1:8545' : provider, { origin: 'frame-hardhat-worker' })
-
-    eth.request({ method: 'eth_accounts', params: [], id: 2, chainId, jsonrpc: '2.0' })
-      .then(accounts => ({
-        value: utils.parseEther(amount || '.0002').toHexString(),
-        from: accounts[0],
-        to,
-        data: '0x'
-      }))
-      .then(tx => eth.request({ method: 'eth_sendTransaction', params: [tx], id: 2, chainId }))
-      .then(txHash => {
-        console.log(`success! tx hash: ${txHash}`)
-        return txHash
+      const chainId = '0x' + parseInt(chain).toString(16)
+      const eth = ethProvider(provider === 'hardhat' ? 'http://127.0.0.1:8545' : provider, {
+        origin: 'frame-hardhat-worker',
       })
-      .then(resolve)
-      .catch(reject)
+
+      eth
+        .request({ method: 'eth_accounts', params: [], id: 2, chainId, jsonrpc: '2.0' })
+        .then((accounts) => ({
+          value: utils.parseEther(amount || '.0002').toHexString(),
+          from: accounts[0],
+          to,
+          data: '0x',
+        }))
+        .then((tx) => eth.request({ method: 'eth_sendTransaction', params: [tx], id: 2, chainId }))
+        .then((txHash) => {
+          console.log(`success! tx hash: ${txHash}`)
+          return txHash
+        })
+        .then(resolve)
+        .catch(reject)
     })
-})
+  })
 
 taskWithDefaultParams('send-token-approval', 'approve token contract for spending')
   .addOptionalParam('contract', 'address of token contract')
   .addOptionalParam('amount', 'amount to approve')
   .addOptionalParam('decimals', 'number of decimals to pad amount (default 18)')
-  .setAction(async ({
-    provider = 'frame',
-    chain = 1,
-    amount = 1000,
-    decimals = 18,
-    contract
-  }) => {
-  return new Promise((resolve, reject) => {
-    setTimeout(() => reject(new Error('request timed out!')), 60 * 1000)
+  .setAction(async ({ provider = 'frame', chain = 1, amount = 1000, decimals = 18, contract }) => {
+    return new Promise((resolve, reject) => {
+      setTimeout(() => reject(new Error('request timed out!')), 60 * 1000)
 
-    const chainId = '0x' + parseInt(chain).toString(16)
-    const eth = ethProvider(provider === 'hardhat' ? 'http://127.0.0.1:8545' : provider, { origin: 'frame-hardhat-worker' })
-    const abi = new utils.Interface([
-      'function approve(address spender, uint256 value)'
-    ])
+      const chainId = '0x' + parseInt(chain).toString(16)
+      const eth = ethProvider(provider === 'hardhat' ? 'http://127.0.0.1:8545' : provider, {
+        origin: 'frame-hardhat-worker',
+      })
+      const abi = new utils.Interface(['function approve(address spender, uint256 value)'])
 
-    const bnAmount = ethers.BigNumber.from(amount).mul(ethers.BigNumber.from(10).pow(parseInt(decimals)))
+      const bnAmount = ethers.BigNumber.from(amount).mul(ethers.BigNumber.from(10).pow(parseInt(decimals)))
 
-    eth.request({ method: 'eth_accounts', params: [], id: 2, chainId, jsonrpc: '2.0' })
-      .then(accounts => {
-        const data = abi.encodeFunctionData('approve', [accounts[0], bnAmount])
+      eth
+        .request({ method: 'eth_accounts', params: [], id: 2, chainId, jsonrpc: '2.0' })
+        .then((accounts) => {
+          const data = abi.encodeFunctionData('approve', [accounts[0], bnAmount])
 
-        return {
-          value: '0x0',
-          from: accounts[0],
-          to: contract,
-          data
-        }
-      })
-      .then(tx => { console.log({ tx }); return eth.request({ method: 'eth_sendTransaction', params: [tx], id: 2, chainId }) })
-      .then(resolve)
-      .catch(reject)
+          return {
+            value: '0x0',
+            from: accounts[0],
+            to: contract,
+            data,
+          }
+        })
+        .then((tx) => {
+          console.log({ tx })
+          return eth.request({ method: 'eth_sendTransaction', params: [tx], id: 2, chainId })
+        })
+        .then(resolve)
+        .catch(reject)
     })
-})
+  })
 
 module.exports = {
   defaultNetwork: 'hardhat',
@@ -83,8 +84,8 @@ module.exports = {
       initialBaseFeePerGas: 1_000_000_000,
       forking: {
         url: 'https://eth-rinkeby.alchemyapi.io/v2/NBms1eV9i16RFHpFqQxod56OLdlucIq0',
-        blockNumber: 9161860
-      }
+        blockNumber: 9161860,
+      },
     },
     arbitrum: {
       url: 'http://localhost:1248',
diff --git a/main/accountData/activity/index.js b/main/accountData/activity/index.js
index 1c5c5a8fb..09c9683e6 100644
--- a/main/accountData/activity/index.js
+++ b/main/accountData/activity/index.js
@@ -1,26 +1,21 @@
-
 // or
 
 // https://api.etherscan.io/api?module=account&action=txlistinternal&address=0x2c1ba59d6f58433fb1eaee7d20b26ed83bda51a3&startblock=0&endblock=2702578&page=1&offset=10&sort=asc&apikey=YourApiKeyToken
 // (To get paginated results use page=<page number> and offset=<max records to return>)
 
-
 // Get "Internal Transactions" by Transaction Hash
 // https://api.etherscan.io/api?module=account&action=txlistinternal&txhash=0x40eb908387324f2b575b4879cd9d7188f69c8fc9d87c901b9e2daaea4b442170&apikey=YourApiKeyToken
 // (Returned 'isError' values: 0=Ok, 1=Rejected/Cancelled)
 
 // (Returns a maximum of 10000 records only)
 
-
 // Get "Internal Transactions" by Block Range
 // https://api.etherscan.io/api?module=account&action=txlistinternal&startblock=0&endblock=2702578&page=1&offset=10&sort=asc&apikey=YourApiKeyToken
 // (Returns a maximum of 10000 records only)
 
-
 // Get a list of "ERC20 - Token Transfer Events" by Address
 // [Optional Parameters] startblock: starting blockNo to retrieve results, endblock: ending blockNo to retrieve results
 
-
 // (Returns a maximum of 10000 records only)
 
 // or
@@ -33,7 +28,6 @@
 // https://api.etherscan.io/api?module=account&action=tokentx&contractaddress=0x9f8f72aa9304c8b593d555f12ef6589cc3a579a2&address=0x4e83362442b8d1bec281594cea3050c8eb01311c&page=1&offset=100&sort=asc&apikey=YourApiKeyToken
 // (To get transfer events for a specific token contract, include the contractaddress parameter)
 
-
 // Get a list of "ERC721 - Token Transfer Events" by Address
 // [Optional Parameters] startblock: starting blockNo to retrieve results, endblock: ending blockNo to retrieve results
 
@@ -50,22 +44,28 @@
 // https://api.etherscan.io/api?module=account&action=tokennfttx&contractaddress=0x06012c8cf97bead5deae237070f9587f8e7a266d&address=0x6975be450864c02b4613023c2152ee0743572325&page=1&offset=100&sort=asc&apikey=YourApiKeyToken
 // (To get transfer events for a specific token contract, include the contractaddress parameter)
 
-
 const apiKey = ''
 
 const getNormalTransactions = (address) => {
-  fetch(`https://api.etherscan.io/api?module=account&action=txlist&address=${address}&startblock=0&endblock=99999999&sort=asc&apikey=${apiKey}`)
+  fetch(
+    `https://api.etherscan.io/api?module=account&action=txlist&address=${address}&startblock=0&endblock=99999999&sort=asc&apikey=${apiKey}`
+  )
 }
 
 const getInternalTransactions = (address) => {
-  fetch(`https://api.etherscan.io/api?module=account&action=txlistinternal&address=${address}&startblock=0&endblock=99999999&sort=asc&apikey=${apiKey}`)
+  fetch(
+    `https://api.etherscan.io/api?module=account&action=txlistinternal&address=${address}&startblock=0&endblock=99999999&sort=asc&apikey=${apiKey}`
+  )
 }
 
-
 const getERC20TransferEvents = (address) => {
-  fetch(`https://api.etherscan.io/api?module=account&action=tokentx&address=${address}&startblock=0&endblock=999999999&sort=asc&apikey=${apiKey}`)
+  fetch(
+    `https://api.etherscan.io/api?module=account&action=tokentx&address=${address}&startblock=0&endblock=999999999&sort=asc&apikey=${apiKey}`
+  )
 }
 
 const getERC721TransferEvents = (address) => {
-  fetch(`https://api.etherscan.io/api?module=account&action=tokennfttx&address=${address}&startblock=0&endblock=999999999&sort=asc&apikey=${apiKey}`)
-}
\ No newline at end of file
+  fetch(
+    `https://api.etherscan.io/api?module=account&action=tokennfttx&address=${address}&startblock=0&endblock=999999999&sort=asc&apikey=${apiKey}`
+  )
+}
diff --git a/main/accounts/Account/index.ts b/main/accounts/Account/index.ts
index 49536ca19..b810bfe85 100644
--- a/main/accounts/Account/index.ts
+++ b/main/accounts/Account/index.ts
@@ -23,7 +23,7 @@ const nebula = nebulaApi()
 const storeApi = {
   getPermissions: function (address: Address) {
     return (store('main.permissions', address) || {}) as Record<string, Permission>
-  }
+  },
 }
 
 interface SignerOptions {
@@ -31,13 +31,13 @@ interface SignerOptions {
 }
 
 interface AccountOptions {
-  address?: Address,
-  name?: string,
-  ensName?: string,
-  created?: string,
-  lastSignerType?: SignerType,
-  smart?: SmartAccount,
-  active: boolean,
+  address?: Address
+  name?: string
+  ensName?: string
+  created?: string
+  lastSignerType?: SignerType
+  smart?: SmartAccount
+  active: boolean
   options: SignerOptions
 }
 
@@ -62,8 +62,8 @@ class FrameAccount {
   status = 'ok'
   active = false
 
-  constructor (params: AccountOptions, accounts: Accounts) {
-    const { lastSignerType, name, ensName, created, address, smart, active, options = { } } = params
+  constructor(params: AccountOptions, accounts: Accounts) {
+    const { lastSignerType, name, ensName, created, address, smart, active, options = {} } = params
     this.accounts = accounts // Parent Accounts Module
 
     const formattedAddress = (address && address.toLowerCase()) || '0x'
@@ -89,10 +89,16 @@ class FrameAccount {
     }
 
     const existingPermissions = storeApi.getPermissions(this.address)
-    const currentSendDappPermission = Object.values(existingPermissions).find(p => ((p.origin || '').toLowerCase()).includes('send.frame.eth'))
+    const currentSendDappPermission = Object.values(existingPermissions).find((p) =>
+      (p.origin || '').toLowerCase().includes('send.frame.eth')
+    )
 
     if (!currentSendDappPermission) {
-      store.setPermission(this.address, { handlerId: 'send-dapp-native', origin: 'send.frame.eth', provider: true })
+      store.setPermission(this.address, {
+        handlerId: 'send-dapp-native',
+        origin: 'send.frame.eth',
+        provider: true,
+      })
     }
 
     this.update()
@@ -110,7 +116,7 @@ class FrameAccount {
           this.signerStatus = updatedSigner.status
 
           if (updatedSigner.status === 'ok' && this.id === this.accounts._current) {
-              this.verifyAddress(false, (err, verified) => {
+            this.verifyAddress(false, (err, verified) => {
               if (!err && !verified) this.signer = ''
             })
           }
@@ -126,10 +132,20 @@ class FrameAccount {
 
     if (this.created.split(':')[0] === 'new') {
       provider.on('connect', () => {
-        provider.send({ jsonrpc: '2.0', id: 1, chainId: '0x1', method: 'eth_blockNumber', _origin: 'frame-internal', params: [] }, (response: any) => {
-          if (response.result) this.created = parseInt(response.result, 16) + ':' + this.created.split(':')[1]
-          this.update()
-        })
+        provider.send(
+          {
+            jsonrpc: '2.0',
+            id: 1,
+            chainId: '0x1',
+            method: 'eth_blockNumber',
+            _origin: 'frame-internal',
+            params: [],
+          },
+          (response: any) => {
+            if (response.result) this.created = parseInt(response.result, 16) + ':' + this.created.split(':')[1]
+            this.update()
+          }
+        )
       })
     }
 
@@ -142,7 +158,7 @@ class FrameAccount {
     this.update()
   }
 
-  async lookupAddress () {
+  async lookupAddress() {
     try {
       this.ensName = (await nebula.ens.reverseLookup(this.address))[0]
       this.update()
@@ -153,27 +169,27 @@ class FrameAccount {
     }
   }
 
-  findSigner (address: Address) {
+  findSigner(address: Address) {
     const signers = store('main.signers') as Record<string, Signer>
 
     const signerOrdinal = (signer: Signer) => {
       const isOk = signer.status === 'ok' ? 2 : 1
-      const signerIndex = Object.values(SignerType).findIndex(type => type === signer.type)
+      const signerIndex = Object.values(SignerType).findIndex((type) => type === signer.type)
       const typeIndex = Math.max(signerIndex, 0)
 
       return isOk * typeIndex
     }
 
     const availableSigners = Object.values(signers)
-      .filter(signer => signer.addresses.some(addr => addr.toLowerCase() === address))
+      .filter((signer) => signer.addresses.some((addr) => addr.toLowerCase() === address))
       .sort((a, b) => signerOrdinal(b) - signerOrdinal(a))
 
     return availableSigners[0]
   }
 
-  setAccess (req: AccessRequest, access: boolean) {
+  setAccess(req: AccessRequest, access: boolean) {
     const { handlerId, origin, account } = req
-    if (account.toLowerCase() === this.address)  {
+    if (account.toLowerCase() === this.address) {
       // Permissions do no live inside the account summary
       const { name } = store('main.origins', origin)
       store.setPermission(this.address, { handlerId, origin: name, provider: access })
@@ -182,17 +198,17 @@ class FrameAccount {
     this.resolveRequest(req)
   }
 
-  getRequest <T extends AccountRequest> (id: string) {
+  getRequest<T extends AccountRequest>(id: string) {
     return this.requests[id] as T
   }
 
-  resolveRequest <T> (req: AccountRequest, result?: T) {
+  resolveRequest<T>(req: AccountRequest, result?: T) {
     const knownRequest = this.requests[req.handlerId]
 
     if (knownRequest) {
       if (knownRequest.res) {
         const { id, jsonrpc } = req.payload || {}
-        
+
         knownRequest.res({ id, jsonrpc, result })
       }
       store.backPanelReqView(req.handlerId)
@@ -201,10 +217,15 @@ class FrameAccount {
     }
   }
 
-  addRequiredApproval (req: TransactionRequest, type: ApprovalType, data: any = {}, onApprove: (data: any) => void = () => {}) {
+  addRequiredApproval(
+    req: TransactionRequest,
+    type: ApprovalType,
+    data: any = {},
+    onApprove: (data: any) => void = () => {}
+  ) {
     // TODO: turn TransactionRequest into its own class
     const approve = (data: any) => {
-      const confirmedApproval = req.approvals.find(a => a.type === type)
+      const confirmedApproval = req.approvals.find((a) => a.type === type)
 
       if (confirmedApproval) {
         onApprove(data)
@@ -220,22 +241,20 @@ class FrameAccount {
         type,
         data,
         approved: false,
-        approve
-      }
+        approve,
+      },
     ]
   }
 
-  resError (err: string | Error, payload: RPCResponsePayload, res: RPCErrorCallback) {
-    const error = typeof err === 'string'
-      ? { message: err, code: -1 }
-      : err
+  resError(err: string | Error, payload: RPCResponsePayload, res: RPCErrorCallback) {
+    const error = typeof err === 'string' ? { message: err, code: -1 } : err
 
     log.error(error)
 
     res({ id: payload.id, jsonrpc: payload.jsonrpc, error })
   }
 
-  private async checkForErc20Approve (req: TransactionRequest, calldata: string) {
+  private async checkForErc20Approve(req: TransactionRequest, calldata: string) {
     const contractAddress = req.data.to
     if (!contractAddress) return
 
@@ -256,7 +275,7 @@ class FrameAccount {
           symbol,
           amount,
           contract: contractAddress,
-          spender
+          spender,
         },
         (data: { amount: string }) => {
           // amount is a hex string
@@ -275,7 +294,7 @@ class FrameAccount {
     }
   }
 
-  private async populateRequestCallData (req: TransactionRequest, calldata: string) {
+  private async populateRequestCallData(req: TransactionRequest, calldata: string) {
     try {
       const decodedData = await decodeContractCall(req.data.to || '', calldata)
       const knownTxRequest = this.requests[req.handlerId] as TransactionRequest
@@ -283,13 +302,13 @@ class FrameAccount {
       if (knownTxRequest && decodedData) {
         knownTxRequest.decodedData = decodedData
         this.update()
-      } 
+      }
     } catch (e) {
       log.warn(e)
     }
   }
 
-  private async populateRequestEnsName (req: TransactionRequest) {
+  private async populateRequestEnsName(req: TransactionRequest) {
     const { to } = req.data
 
     try {
@@ -305,7 +324,7 @@ class FrameAccount {
     }
   }
 
-  addRequest (req: AccountRequest, res: RPCCallback<any> = () => {}) {
+  addRequest(req: AccountRequest, res: RPCCallback<any> = () => {}) {
     const add = async (r: AccountRequest) => {
       this.requests[r.handlerId] = req
       this.requests[r.handlerId].mode = RequestMode.Normal
@@ -334,7 +353,7 @@ class FrameAccount {
     if (this.smart) {
       if (this.smart.type === 'aragon') {
         if (req.type === 'transaction') {
-          const txRequest = (req as TransactionRequest)
+          const txRequest = req as TransactionRequest
           if (!this.aragon) return this.resError('Could not resolve Aragon account', txRequest.payload, res)
           const rawTx = txRequest.data
           rawTx.data = rawTx.data || '0x'
@@ -342,7 +361,8 @@ class FrameAccount {
             if (err) return this.resError(err, req.payload, res)
 
             const tx = pathTx as TransactionData
-            Object.keys(tx).forEach(key => { // Number to hex conversion
+            Object.keys(tx).forEach((key) => {
+              // Number to hex conversion
               const k = key as keyof RPC.SendTransaction.TxParams
               if (tx[k] && typeof tx[k] === 'number') tx[k] = addHexPrefix((tx[k] || 0).toString(16))
             })
@@ -360,23 +380,24 @@ class FrameAccount {
     }
   }
 
-  getSigner () {
+  getSigner() {
     if (this.smart) {
       const actingAccount = this.smart.actor && this.accounts.get(this.smart.actor)
       const actingSigner = actingAccount && signers.get(actingAccount.signer)
-      return actingSigner 
+      return actingSigner
     } else {
       return this.signer && signers.get(this.signer)
     }
   }
 
-  verifyAddress (display: boolean, cb: Callback<boolean>) {
+  verifyAddress(display: boolean, cb: Callback<boolean>) {
     if (this.smart && this.smart.actor) {
       const actingAccount = this.accounts.get(this.smart.actor)
       if (!actingAccount) return cb(new Error(`Could not find acting account: ${this.smart.actor}`))
       const actingSigner = signers.get(actingAccount.signer)
-      if (!actingSigner || !actingSigner.verifyAddress) return cb(new Error(`Could not find acting account signer: ${actingAccount.signer}`))
-      const index = actingSigner.addresses.map(a => a.toLowerCase()).indexOf(actingAccount.address)
+      if (!actingSigner || !actingSigner.verifyAddress)
+        return cb(new Error(`Could not find acting account signer: ${actingAccount.signer}`))
+      const index = actingSigner.addresses.map((a) => a.toLowerCase()).indexOf(actingAccount.address)
       if (index > -1) {
         actingSigner.verifyAddress(index, actingAccount.address, display, cb)
       } else {
@@ -387,7 +408,7 @@ class FrameAccount {
       const signer = signers.get(this.signer) || {}
 
       if (signer.verifyAddress && signer.status === 'ok') {
-        const index = signer.addresses.map(a => a.toLowerCase()).indexOf(this.address)
+        const index = signer.addresses.map((a) => a.toLowerCase()).indexOf(this.address)
         if (index > -1) {
           signer.verifyAddress(index, this.address, display, cb)
         } else {
@@ -401,28 +422,30 @@ class FrameAccount {
     }
   }
 
-  getSelectedAddresses () {
+  getSelectedAddresses() {
     return [this.address]
   }
 
-  getSelectedAddress () {
+  getSelectedAddress() {
     return this.address
   }
 
-  summary () {
-    const update = JSON.parse(JSON.stringify({
-      id: this.id,
-      name: this.name,
-      lastSignerType: this.lastSignerType,
-      address: this.address,
-      status: this.status,
-      active: this.active,
-      signer: this.signer,
-      smart: this.smart,
-      requests: this.requests,
-      ensName: this.ensName,
-      created: this.created
-    })) as Account
+  summary() {
+    const update = JSON.parse(
+      JSON.stringify({
+        id: this.id,
+        name: this.name,
+        lastSignerType: this.lastSignerType,
+        address: this.address,
+        status: this.status,
+        active: this.active,
+        signer: this.signer,
+        smart: this.smart,
+        requests: this.requests,
+        ensName: this.ensName,
+        created: this.created,
+      })
+    ) as Account
 
     if (update.smart && update.smart.actor && update.smart.actor.account) {
       update.signer = update.smart.actor.account.signer
@@ -431,35 +454,35 @@ class FrameAccount {
     return update
   }
 
-  update () {
+  update() {
     this.accounts.update(this.summary())
   }
 
-  rename (name: string) {
+  rename(name: string) {
     this.name = name
     this.update()
   }
 
-  getCoinbase (cb: Callback<Array<Address>>) {
+  getCoinbase(cb: Callback<Array<Address>>) {
     cb(null, [this.address])
   }
 
-  getAccounts (cb?: Callback<Array<Address>>) {
+  getAccounts(cb?: Callback<Array<Address>>) {
     const account = this.address
     if (cb) cb(null, account ? [account] : [])
     return account ? [account] : []
   }
 
-  close () {
+  close() {
     this.accountObserver.remove()
   }
 
-  signMessage (message: string, cb: Callback<string>) {
+  signMessage(message: string, cb: Callback<string>) {
     if (!message) return cb(new Error('No message to sign'))
     if (this.signer) {
       const s = signers.get(this.signer)
       if (!s) return cb(new Error(`Cannot find signer for this account`))
-      const index = s.addresses.map(a => a.toLowerCase()).indexOf(this.address)
+      const index = s.addresses.map((a) => a.toLowerCase()).indexOf(this.address)
       if (index === -1) cb(new Error(`Signer cannot sign for this address`))
       s.signMessage(index, message, cb)
     } else if (this.smart) {
@@ -467,8 +490,9 @@ class FrameAccount {
         const actingAccount = this.accounts.get(this.smart.actor)
         if (!actingAccount) return cb(new Error(`Could not find acting account: ${this.smart.actor}`))
         const actingSigner = signers.get(actingAccount.signer)
-        if (!actingSigner || !actingSigner.verifyAddress) return cb(new Error(`Could not find acting account signer: ${actingAccount.signer}`))
-        const index = actingSigner.addresses.map(a => a.toLowerCase()).indexOf(actingAccount.address)
+        if (!actingSigner || !actingSigner.verifyAddress)
+          return cb(new Error(`Could not find acting account signer: ${actingAccount.signer}`))
+        const index = actingSigner.addresses.map((a) => a.toLowerCase()).indexOf(actingAccount.address)
         if (index === -1) cb(new Error('Acting signer cannot sign for this address, could not find address in signer'))
         actingSigner.signMessage(index, message, cb)
       } else {
@@ -479,29 +503,35 @@ class FrameAccount {
     }
   }
 
-  signTypedData (version: Version, typedData: any, cb: Callback<string>) {
+  signTypedData(version: Version, typedData: any, cb: Callback<string>) {
     if (!typedData) return cb(new Error('No data to sign'))
-    if (typeof (typedData) !== 'object') return cb(new Error('Data to sign has the wrong format'))
+    if (typeof typedData !== 'object') return cb(new Error('Data to sign has the wrong format'))
     if (this.signer) {
       const s = signers.get(this.signer)
       if (!s) return cb(new Error(`Cannot find signer for this account`))
-      const index = s.addresses.map(a => a.toLowerCase()).indexOf(this.address)
+      const index = s.addresses.map((a) => a.toLowerCase()).indexOf(this.address)
       if (index === -1) cb(new Error(`Signer cannot sign for this address`))
       s.signTypedData(index, version, typedData, cb)
     } else if (this.smart && this.smart.actor) {
       const actingAccount = this.accounts.get(this.smart.actor)
       if (!actingAccount) return cb(new Error(`Could not find acting account: ${this.smart.actor}`))
       const actingSigner = signers.get(actingAccount.signer)
-      if (!actingSigner || !actingSigner.verifyAddress) return cb(new Error(`Could not find acting account signer: ${actingAccount.signer}`))
-      const index = actingSigner.addresses.map(a => a.toLowerCase()).indexOf(actingAccount.address)
-      if (index === -1) cb(new Error(`Acting signer cannot sign for this address, could not find acting address in signer: ${actingAccount.address}`))
+      if (!actingSigner || !actingSigner.verifyAddress)
+        return cb(new Error(`Could not find acting account signer: ${actingAccount.signer}`))
+      const index = actingSigner.addresses.map((a) => a.toLowerCase()).indexOf(actingAccount.address)
+      if (index === -1)
+        cb(
+          new Error(
+            `Acting signer cannot sign for this address, could not find acting address in signer: ${actingAccount.address}`
+          )
+        )
       actingSigner.signTypedData(index, version, typedData, cb)
     } else {
       cb(new Error('No signer found for this account'))
     }
   }
 
-  signTransaction (rawTx: TransactionData, cb: Callback<string>) {
+  signTransaction(rawTx: TransactionData, cb: Callback<string>) {
     // if(index === typeof 'object' && cb === typeof 'undefined' && typeof rawTx === 'function') cb = rawTx; rawTx = index; index = 0;
     this.validateTransaction(rawTx, (err) => {
       if (err) return cb(err)
@@ -509,16 +539,22 @@ class FrameAccount {
         const s = signers.get(this.signer)
         if (!s) return cb(new Error(`Cannot find signer for this account`))
 
-        const index = s.addresses.map(a => a.toLowerCase()).indexOf(this.address)
+        const index = s.addresses.map((a) => a.toLowerCase()).indexOf(this.address)
         if (index === -1) cb(new Error(`Signer cannot sign for this address`))
         s.signTransaction(index, rawTx, cb)
       } else if (this.smart && this.smart.actor) {
         const actingAccount = this.accounts.get(this.smart.actor)
         if (!actingAccount) return cb(new Error(`Could not find acting account: ${this.smart.actor}`))
         const actingSigner = signers.get(actingAccount.signer)
-        if (!actingSigner || !actingSigner.verifyAddress) return cb(new Error(`Could not find acting account signer: ${actingAccount.signer}`))
-        const index = actingSigner.addresses.map(a => a.toLowerCase()).indexOf(actingAccount.address)
-        if (index === -1) cb(new Error(`Acting signer cannot sign for this address, could not find acting address in signer: ${actingAccount.address}`))
+        if (!actingSigner || !actingSigner.verifyAddress)
+          return cb(new Error(`Could not find acting account signer: ${actingAccount.signer}`))
+        const index = actingSigner.addresses.map((a) => a.toLowerCase()).indexOf(actingAccount.address)
+        if (index === -1)
+          cb(
+            new Error(
+              `Acting signer cannot sign for this address, could not find acting address in signer: ${actingAccount.address}`
+            )
+          )
         actingSigner.signTransaction(index, rawTx, cb)
       } else {
         cb(new Error('No signer found for this account'))
@@ -526,13 +562,22 @@ class FrameAccount {
     })
   }
 
-  private validateTransaction (rawTx: TransactionData, cb: Callback<void>) {
+  private validateTransaction(rawTx: TransactionData, cb: Callback<void>) {
     // Validate 'from' address
-    if (!rawTx.from) return new Error('Missing \'from\' address')
-    if (!isValidAddress(rawTx.from)) return cb(new Error('Invalid \'from\' address'))
+    if (!rawTx.from) return new Error("Missing 'from' address")
+    if (!isValidAddress(rawTx.from)) return cb(new Error("Invalid 'from' address"))
 
     // Ensure that transaction params are valid hex strings
-    const enforcedKeys: Array<keyof TransactionData> = ['value', 'data', 'to', 'from', 'gas', 'gasPrice', 'gasLimit', 'nonce']
+    const enforcedKeys: Array<keyof TransactionData> = [
+      'value',
+      'data',
+      'to',
+      'from',
+      'gas',
+      'gasPrice',
+      'gasLimit',
+      'nonce',
+    ]
     const keys = Object.keys(rawTx) as Array<keyof TransactionData>
 
     for (let i = 0; i < keys.length; i++) {
@@ -546,7 +591,7 @@ class FrameAccount {
     return cb(null)
   }
 
-  private isValidHexString (str: string) {
+  private isValidHexString(str: string) {
     const pattern = /^0x[0-9a-fA-F]*$/
     return pattern.test(str)
   }
diff --git a/main/accounts/aragon/appNames.ts b/main/accounts/aragon/appNames.ts
index 89a89fe07..15d83d3c2 100644
--- a/main/accounts/aragon/appNames.ts
+++ b/main/accounts/aragon/appNames.ts
@@ -13,9 +13,9 @@ const knownApps = [
   'evmreg',
   'apm-registry',
   'apm-repo',
-  'apm-enssub'
+  'apm-enssub',
 ]
 
-const hashes = Object.fromEntries(knownApps.map(app => [namehash.hash(`${app}.aragonpm.eth`), app]))
+const hashes = Object.fromEntries(knownApps.map((app) => [namehash.hash(`${app}.aragonpm.eth`), app]))
 
 export default hashes
diff --git a/main/accounts/aragon/index.ts b/main/accounts/aragon/index.ts
index 7118f1c93..b4ba3a276 100644
--- a/main/accounts/aragon/index.ts
+++ b/main/accounts/aragon/index.ts
@@ -18,15 +18,15 @@ const addresses: Record<number, Address> = {
   74: '0xede729eff031bc9f1a36f4361cd0d9585c9dc5f9',
   100: '0xaafca6b0c89521752e559650206d7c925fd0e530',
   137: '0x3c70a0190d09f34519e6e218364451add21b7d4b',
-  80001: '0x431f0eed904590b176f9ff8c36a1c4ff0ee9b982'
+  80001: '0x431f0eed904590b176f9ff8c36a1c4ff0ee9b982',
 }
 
-function registryAddress (chainId: number) {
+function registryAddress(chainId: number) {
   if (addresses[chainId]) return addresses[chainId]
   throw new Error(`Unable to locate Aragon ENS registry for chain: ${chainId}`)
 }
 
-async function resolveAragon (domain: string, chainId: number, registryAddress: Address) {
+async function resolveAragon(domain: string, chainId: number, registryAddress: Address) {
   return new Promise<string>(async (resolve, reject) => {
     try {
       const provider = new EthereumProvider(proxyConnection)
@@ -44,7 +44,7 @@ async function resolveAragon (domain: string, chainId: number, registryAddress:
   })
 }
 
-async function resolveName (name: string, chainId: number) {
+async function resolveName(name: string, chainId: number) {
   return new Promise(async (resolve, reject) => {
     try {
       // Look up registry address using given chain id
@@ -53,10 +53,10 @@ async function resolveName (name: string, chainId: number) {
         provider: require('../../provider').default,
         apm: {
           ipfs: {
-            gateway: 'https://ipfs.eth.aragon.network/ipfs'
+            gateway: 'https://ipfs.eth.aragon.network/ipfs',
           },
-          ensRegistryAddress: registryAddress(chainId)
-        }
+          ensRegistryAddress: registryAddress(chainId),
+        },
       }
 
       const address = await resolveAragon(domain, chainId, options.apm.ensRegistryAddress)
@@ -64,10 +64,10 @@ async function resolveName (name: string, chainId: number) {
 
       await wrap.init()
 
-      const subscription = wrap.apps.subscribe(apps => {
+      const subscription = wrap.apps.subscribe((apps) => {
         subscription.unsubscribe()
         const appsSummary: Record<string, Record<string, string>> = {}
-        apps.forEach(app => {
+        apps.forEach((app) => {
           const { appId, proxyAddress } = app
           const name = appNames[appId]
           if (name) appsSummary[name] = { proxyAddress }
@@ -75,7 +75,13 @@ async function resolveName (name: string, chainId: number) {
         if (!appsSummary.kernel) return reject(new Error('Unable to locate DAO kernel'))
         if (!appsSummary.agent) return reject(new Error('Unable to locate DAO agent, make sure it is installed'))
 
-        resolve({ name: domain.split('.')[0], domain, apps: appsSummary, ens: address, network: chainId })
+        resolve({
+          name: domain.split('.')[0],
+          domain,
+          apps: appsSummary,
+          ens: address,
+          network: chainId,
+        })
       })
     } catch (e) {
       reject(e)
@@ -84,9 +90,9 @@ async function resolveName (name: string, chainId: number) {
 }
 
 export interface AragonOptions {
-  dao: Address,
-  agent: Address,
-  actor: Address,
+  dao: Address
+  agent: Address
+  actor: Address
   chain: Chain
 }
 
@@ -101,7 +107,7 @@ class Aragon {
 
   inSetup = false
 
-  constructor (opts: AragonOptions) {
+  constructor(opts: AragonOptions) {
     this.dao = opts.dao
     this.agent = opts.agent
     this.actor = opts.actor // Actor is now just the acting accounts address
@@ -110,7 +116,7 @@ class Aragon {
     store.observer(() => this.setup())
   }
 
-  setup () {
+  setup() {
     const connection = store('main.networks', this.chain.type, this.chain.id, 'connection')
     const status = [connection.primary.status, connection.secondary.status]
     if (status.indexOf('connected') > -1 && !this.wrap && !this.inSetup) {
@@ -122,55 +128,69 @@ class Aragon {
         try {
           options = {
             provider: this.provider,
-            apm: { ipfs: { gateway: 'https://ipfs.eth.aragon.network/ipfs' }, ensRegistryAddress: registryAddress(this.chain.id) }
+            apm: {
+              ipfs: { gateway: 'https://ipfs.eth.aragon.network/ipfs' },
+              ensRegistryAddress: registryAddress(this.chain.id),
+            },
           }
         } catch (e) {
           console.log('TODO: If Aragon smart account setup fails disable it for current network', e)
-          return 
+          return
         }
         const wrap = new Wrapper(this.dao, options)
-        wrap.init().then(() => {
-          this.wrap = wrap
-          this.inSetup = false
-        }).catch((err: any) => {
-          log.error(err)
-          this.inSetup = false
-        })
+        wrap
+          .init()
+          .then(() => {
+            this.wrap = wrap
+            this.inSetup = false
+          })
+          .catch((err: any) => {
+            log.error(err)
+            this.inSetup = false
+          })
       }, 50)
     }
   }
 
-  pathTransaction (tx: RPC.SendTransaction.TxParams, cb: Callback<RPC.SendTransaction.TxParams>) {
+  pathTransaction(tx: RPC.SendTransaction.TxParams, cb: Callback<RPC.SendTransaction.TxParams>) {
     if (!this.wrap) {
       this.setup()
       return cb(new Error('Aragon wrapper was not ready or is not on correct network, try again'))
     }
     tx.value = tx.value || '0x'
     tx.data = tx.data || '0x'
-    this.wrap.calculateTransactionPath(this.actor, this.agent, 'execute', [tx.to, tx.value, tx.data]).then(result => {
-      const newTx = result[0]
-      if (!newTx) return cb(new Error('Could not calculate a transaction path for Aragon smart account, make sure your acting account has the necessary permissions'))
-      delete newTx.nonce
-      newTx.chainId = tx.chainId
-
-      if (this.provider) {
-        this.provider.getNonce(newTx, res => {
-          if (res.error) return cb(new Error(res.error.message))
-          newTx.nonce = res.result
-
-          if (this.provider) {
-            this.provider.fillTransaction(newTx, (err, fullTx) => {
-              if (err) return cb(err)
-
-              const filledTx = (fullTx as TransactionMetadata).tx
-
-              const value = filledTx.value !== undefined ? filledTx.value : '0x'
-              cb(null, { ...filledTx, value })
-            })
-          }
-        })
-      }
-    }).catch(cb)
+    this.wrap
+      .calculateTransactionPath(this.actor, this.agent, 'execute', [tx.to, tx.value, tx.data])
+      .then((result) => {
+        const newTx = result[0]
+        if (!newTx)
+          return cb(
+            new Error(
+              'Could not calculate a transaction path for Aragon smart account, make sure your acting account has the necessary permissions'
+            )
+          )
+        delete newTx.nonce
+        newTx.chainId = tx.chainId
+
+        if (this.provider) {
+          this.provider.getNonce(newTx, (res) => {
+            if (res.error) return cb(new Error(res.error.message))
+            newTx.nonce = res.result
+
+            if (this.provider) {
+              this.provider.fillTransaction(newTx, (err, fullTx) => {
+                if (err) return cb(err)
+
+                const filledTx = (fullTx as TransactionMetadata).tx
+
+                const value = filledTx.value !== undefined ? filledTx.value : '0x'
+                cb(null, { ...filledTx, value })
+              })
+            }
+          })
+        }
+      })
+      .catch(cb)
   }
 }
 
diff --git a/main/accounts/index.ts b/main/accounts/index.ts
index ad26f2629..a06c85ed0 100644
--- a/main/accounts/index.ts
+++ b/main/accounts/index.ts
@@ -1,7 +1,7 @@
 import EventEmitter from 'events'
 import log from 'electron-log'
 import { shell, Notification } from 'electron'
-import { addHexPrefix, intToHex} from 'ethereumjs-util'
+import { addHexPrefix, intToHex } from 'ethereumjs-util'
 import { TypedData, Version } from 'eth-sig-util'
 import { v5 as uuidv5 } from 'uuid'
 
@@ -16,12 +16,16 @@ import provider from '../provider'
 import { Chain } from '../chains'
 import { ApprovalType } from '../../resources/constants'
 import {
-  AccountRequest, AccessRequest,
-  TransactionRequest, TransactionReceipt,
-  ReplacementType, RequestStatus, RequestMode
+  AccountRequest,
+  AccessRequest,
+  TransactionRequest,
+  TransactionReceipt,
+  ReplacementType,
+  RequestStatus,
+  RequestMode,
 } from './types'
 
-function notify (title: string, body: string, action: (event: Electron.Event) => void) {
+function notify(title: string, body: string, action: (event: Electron.Event) => void) {
   const notification = new Notification({ title, body })
   notification.on('click', action)
 
@@ -39,7 +43,15 @@ const accountsApi = {
   },
 }
 
-export { RequestMode, AccountRequest, AccessRequest, TransactionRequest, SignTypedDataRequest, AddChainRequest, AddTokenRequest } from './types'
+export {
+  RequestMode,
+  AccountRequest,
+  AccessRequest,
+  TransactionRequest,
+  SignTypedDataRequest,
+  AddChainRequest,
+  AddTokenRequest,
+} from './types'
 
 export class Accounts extends EventEmitter {
   _current: string
@@ -47,7 +59,7 @@ export class Accounts extends EventEmitter {
 
   private readonly dataScanner: DataScanner
 
-  constructor () {
+  constructor() {
     super()
 
     this.accounts = Object.entries(accountsApi.getAccounts()).reduce((accounts, [id, account]) => {
@@ -56,21 +68,21 @@ export class Accounts extends EventEmitter {
       return accounts
     }, {} as Record<string, FrameAccount>)
 
-    this._current = Object.values(this.accounts).find(acct => acct.active)?.id || ''
+    this._current = Object.values(this.accounts).find((acct) => acct.active)?.id || ''
 
     this.dataScanner = ExternalDataScanner()
   }
 
-  get (id: string) {
+  get(id: string) {
     return this.accounts[id] && this.accounts[id].summary()
   }
 
-  private getTransactionRequest (account: FrameAccount, id: string): TransactionRequest {
+  private getTransactionRequest(account: FrameAccount, id: string): TransactionRequest {
     return account.getRequest(id)
   }
 
   // Public
-  addAragon (account: Account, cb: Callback<Account>) {
+  addAragon(account: Account, cb: Callback<Account>) {
     const existing = accountsApi.getAccount(account.address)
     if (existing.id) return cb(null, existing) // Account already exists
 
@@ -79,7 +91,7 @@ export class Accounts extends EventEmitter {
     const accountOpts = {
       ...account,
       lastSignerType: getSignerType(account.lastSignerType),
-      options: { type: 'aragon' }
+      options: { type: 'aragon' },
     }
 
     this.accounts[account.address] = new FrameAccount(accountOpts, this)
@@ -87,7 +99,7 @@ export class Accounts extends EventEmitter {
     cb(null, this.accounts[account.address].summary())
   }
 
-  async add (address: Address, options = {}, cb: Callback<Account> = () => {}) {
+  async add(address: Address, options = {}, cb: Callback<Account> = () => {}) {
     if (!address) return cb(new Error('No address, will not add account'))
     address = address.toLowerCase()
     const account = store('main.accounts', address)
@@ -97,19 +109,19 @@ export class Accounts extends EventEmitter {
     this.accounts[address] = new FrameAccount({ address, created, options, active: false }, this)
   }
 
-  rename (id: string, name: string) {
+  rename(id: string, name: string) {
     this.accounts[id].rename(name)
   }
 
-  update (account: Account) {
+  update(account: Account) {
     store.updateAccount(account)
   }
 
-  current () {
+  current() {
     return this._current ? this.accounts[this._current] : null
   }
 
-  updateNonce (reqId: string, nonce: string) {
+  updateNonce(reqId: string, nonce: string) {
     log.info('Update Nonce: ', reqId, nonce)
 
     const currentAccount = this.current()
@@ -124,14 +136,14 @@ export class Accounts extends EventEmitter {
     }
   }
 
-  confirmRequestApproval (reqId: string, approvalType: ApprovalType, approvalData: any) {
+  confirmRequestApproval(reqId: string, approvalType: ApprovalType, approvalData: any) {
     log.info('confirmRequestApproval', reqId, approvalType)
 
     const currentAccount = this.current()
     if (currentAccount && currentAccount.requests[reqId]) {
       const txRequest = this.getTransactionRequest(currentAccount, reqId)
 
-      const approval = (txRequest.approvals || []).find(a => a.type === approvalType)
+      const approval = (txRequest.approvals || []).find((a) => a.type === approvalType)
 
       if (approval) {
         approval.approve(approvalData)
@@ -139,7 +151,7 @@ export class Accounts extends EventEmitter {
     }
   }
 
-  async replaceTx (id: string, type: ReplacementType) {
+  async replaceTx(id: string, type: ReplacementType) {
     const currentAccount = this.current()
 
     return new Promise<void>((resolve, reject) => {
@@ -149,7 +161,7 @@ export class Accounts extends EventEmitter {
       const txRequest = this.getTransactionRequest(currentAccount, id)
 
       const data = JSON.parse(JSON.stringify(txRequest.data))
-      const targetChain = { type: 'ethereum', id: parseInt(data.chainId, 16)}
+      const targetChain = { type: 'ethereum', id: parseInt(data.chainId, 16) }
       const { levels } = store('main.networksMeta', targetChain.type, targetChain.id, 'gas.price')
 
       // Set the gas default to asap
@@ -160,20 +172,22 @@ export class Accounts extends EventEmitter {
         jsonrpc: '2.0',
         method: 'eth_sendTransaction',
         chainId: addHexPrefix(targetChain.id.toString(16)),
-        params: [] as any[]
+        params: [] as any[],
       }
 
       if (type === ReplacementType.Speed) {
         tx.params = [data]
       } else {
-        tx.params = [{
-          from: currentAccount.getSelectedAddress(),
-          to: currentAccount.getSelectedAddress(),
-          value: '0x0',
-          nonce: data.nonce,
-          chainId: addHexPrefix(targetChain.id.toString(16)),
-          _origin: currentAccount.requests[id].origin
-        }]
+        tx.params = [
+          {
+            from: currentAccount.getSelectedAddress(),
+            to: currentAccount.getSelectedAddress(),
+            value: '0x0',
+            nonce: data.nonce,
+            chainId: addHexPrefix(targetChain.id.toString(16)),
+            _origin: currentAccount.requests[id].origin,
+          },
+        ]
       }
 
       this.sendRequest(tx, (res: RPCResponsePayload) => {
@@ -183,83 +197,100 @@ export class Accounts extends EventEmitter {
     })
   }
 
-  private sendRequest (payload: { method: string, params: any[], chainId: string }, cb: RPCRequestCallback) {
+  private sendRequest(payload: { method: string; params: any[]; chainId: string }, cb: RPCRequestCallback) {
     provider.send({ id: 1, jsonrpc: '2.0', ...payload, _origin: frameOriginId }, cb)
   }
 
-  private async confirmations (account: FrameAccount, id: string, hash: string, targetChain: Chain) {
+  private async confirmations(account: FrameAccount, id: string, hash: string, targetChain: Chain) {
     return new Promise<number>((resolve, reject) => {
       // TODO: Route to account even if it's not current
       if (!account) return reject(new Error('Unable to determine target account'))
-      if (!targetChain || !targetChain.type || !targetChain.id) return reject(new Error('Unable to determine target chain'))
+      if (!targetChain || !targetChain.type || !targetChain.id)
+        return reject(new Error('Unable to determine target chain'))
       const targetChainId = addHexPrefix(targetChain.id.toString(16))
 
       this.sendRequest({ method: 'eth_blockNumber', params: [], chainId: targetChainId }, (res: RPCResponsePayload) => {
         if (res.error) return reject(new Error(JSON.stringify(res.error)))
 
-        this.sendRequest({ method: 'eth_getTransactionReceipt', params: [hash], chainId: targetChainId }, (receiptRes: RPCResponsePayload) => {
-          if (receiptRes.error) return reject(receiptRes.error)
-          if (!this.accounts[account.address]) return reject(new Error('account closed'))
-
-          if (receiptRes.result && account.requests[id]) {
-            const txRequest = this.getTransactionRequest(account, id)
+        this.sendRequest(
+          { method: 'eth_getTransactionReceipt', params: [hash], chainId: targetChainId },
+          (receiptRes: RPCResponsePayload) => {
+            if (receiptRes.error) return reject(receiptRes.error)
+            if (!this.accounts[account.address]) return reject(new Error('account closed'))
 
-            txRequest.tx = { ...txRequest.tx, receipt: receiptRes.result, confirmations: txRequest.tx?.confirmations || 0 }
+            if (receiptRes.result && account.requests[id]) {
+              const txRequest = this.getTransactionRequest(account, id)
 
-            account.update()
-
-            if (!txRequest.feeAtTime) {
-              const network = targetChain
-              if (network.type === 'ethereum' && network.id === 1) {
-                const ethPrice = store('main.networksMeta.ethereum.1.nativeCurrency.usd.price')
+              txRequest.tx = {
+                ...txRequest.tx,
+                receipt: receiptRes.result,
+                confirmations: txRequest.tx?.confirmations || 0,
+              }
 
-                if (ethPrice && txRequest.tx && txRequest.tx.receipt && this.accounts[account.address]) {
-                  const { gasUsed } = txRequest.tx.receipt
+              account.update()
 
-                  txRequest.feeAtTime = (Math.round(weiIntToEthInt((hexToInt(gasUsed) * hexToInt(txRequest.data.gasPrice || '0x0')) * res.result.ethusd) * 100) / 100).toFixed(2)
+              if (!txRequest.feeAtTime) {
+                const network = targetChain
+                if (network.type === 'ethereum' && network.id === 1) {
+                  const ethPrice = store('main.networksMeta.ethereum.1.nativeCurrency.usd.price')
+
+                  if (ethPrice && txRequest.tx && txRequest.tx.receipt && this.accounts[account.address]) {
+                    const { gasUsed } = txRequest.tx.receipt
+
+                    txRequest.feeAtTime = (
+                      Math.round(
+                        weiIntToEthInt(
+                          hexToInt(gasUsed) * hexToInt(txRequest.data.gasPrice || '0x0') * res.result.ethusd
+                        ) * 100
+                      ) / 100
+                    ).toFixed(2)
+                    account.update()
+                  }
+                } else {
+                  txRequest.feeAtTime = '?'
                   account.update()
                 }
-              } else {
-                txRequest.feeAtTime = '?'
-                account.update()
               }
-            }
 
-            if (receiptRes.result.status === '0x1' && txRequest.status === RequestStatus.Verifying) {
-              txRequest.status = RequestStatus.Confirming
-              txRequest.notice = 'Confirming'
-              txRequest.completed = Date.now()
-              const hash = txRequest.tx.hash || ''
-              const h = hash.substring(0, 6) + '...' + hash.substring(hash.length - 4)
-              const body = `Transaction ${h} successful! \n Click for details`
-
-              // Drop any other pending txs with same nonce
-              Object.keys(account.requests).forEach(k => {
-                const txReq = this.getTransactionRequest(account, k)
-                if (txReq.status === RequestStatus.Verifying && txReq.data.nonce === (account.requests[id] as TransactionRequest).data.nonce) {
-                  txReq.status = RequestStatus.Error
-                  txReq.notice = 'Dropped'
-                  setTimeout(() => this.accounts[account.address] && this.removeRequest(account, k), 8000)
-                }
-              })
-
-              // If Frame is hidden, trigger native notification
-              notify('Transaction Successful', body, () => {
-                const { type, id } = targetChain
-                const explorer = store('main.networks', type, id, 'explorer')
-                shell.openExternal(explorer + '/tx/' + hash)
-              })
+              if (receiptRes.result.status === '0x1' && txRequest.status === RequestStatus.Verifying) {
+                txRequest.status = RequestStatus.Confirming
+                txRequest.notice = 'Confirming'
+                txRequest.completed = Date.now()
+                const hash = txRequest.tx.hash || ''
+                const h = hash.substring(0, 6) + '...' + hash.substring(hash.length - 4)
+                const body = `Transaction ${h} successful! \n Click for details`
+
+                // Drop any other pending txs with same nonce
+                Object.keys(account.requests).forEach((k) => {
+                  const txReq = this.getTransactionRequest(account, k)
+                  if (
+                    txReq.status === RequestStatus.Verifying &&
+                    txReq.data.nonce === (account.requests[id] as TransactionRequest).data.nonce
+                  ) {
+                    txReq.status = RequestStatus.Error
+                    txReq.notice = 'Dropped'
+                    setTimeout(() => this.accounts[account.address] && this.removeRequest(account, k), 8000)
+                  }
+                })
+
+                // If Frame is hidden, trigger native notification
+                notify('Transaction Successful', body, () => {
+                  const { type, id } = targetChain
+                  const explorer = store('main.networks', type, id, 'explorer')
+                  shell.openExternal(explorer + '/tx/' + hash)
+                })
+              }
+              const blockHeight = parseInt(res.result, 16)
+              const receiptBlock = parseInt((txRequest.tx.receipt as TransactionReceipt).blockNumber, 16)
+              resolve(blockHeight - receiptBlock)
             }
-            const blockHeight = parseInt(res.result, 16)
-            const receiptBlock = parseInt((txRequest.tx.receipt as TransactionReceipt).blockNumber, 16)
-            resolve(blockHeight - receiptBlock)
           }
-        })
+        )
       })
     })
   }
 
-  private async txMonitor (account: FrameAccount, id: string, hash: string) {
+  private async txMonitor(account: FrameAccount, id: string, hash: string) {
     if (!account) return log.error('txMonitor had no target account')
 
     const txRequest = this.getTransactionRequest(account, id)
@@ -274,93 +305,99 @@ export class Accounts extends EventEmitter {
     } else {
       const targetChain: Chain = {
         type: 'ethereum',
-        id: parseInt(rawTx.chainId, 16)
+        id: parseInt(rawTx.chainId, 16),
       }
 
       const targetChainId = addHexPrefix(targetChain.id.toString(16))
-      this.sendRequest({ method: 'eth_subscribe', params: ['newHeads'], chainId: targetChainId }, (newHeadRes: RPCResponsePayload) => {
-        if (newHeadRes.error) {
-          log.warn(newHeadRes.error)
-          const monitor = async () => {
-            if (!this.accounts[account.address]) {
-              clearTimeout(monitorTimer)
-              return log.error('txMonitor internal monitor had no target account')
-            }
-
-            let confirmations
-            try {
-              confirmations = await this.confirmations(account, id, hash, targetChain)
-              txRequest.tx = { ...txRequest.tx, confirmations }
-
-              account.update()
-
-              if (confirmations > 12) {
-                txRequest.status = RequestStatus.Confirmed
-                txRequest.notice = 'Confirmed'
-                account.update()
-                setTimeout(() => this.accounts[account.address] && this.removeRequest(account, id), 8000)
+      this.sendRequest(
+        { method: 'eth_subscribe', params: ['newHeads'], chainId: targetChainId },
+        (newHeadRes: RPCResponsePayload) => {
+          if (newHeadRes.error) {
+            log.warn(newHeadRes.error)
+            const monitor = async () => {
+              if (!this.accounts[account.address]) {
                 clearTimeout(monitorTimer)
+                return log.error('txMonitor internal monitor had no target account')
               }
-            } catch (e) {
-              log.error('error awaiting confirmations', e)
-              clearTimeout(monitorTimer)
-              setTimeout(() => this.accounts[account.address] && this.removeRequest(account, id), 60 * 1000)
-              return
-            }
-          }
-          setTimeout(() => monitor(), 3000)
-          const monitorTimer = setInterval(monitor, 15000)
-        } else if (newHeadRes.result) {
-          const headSub = newHeadRes.result
-
-          const removeSubscription = async (requestRemoveTimeout: number) => {
-            setTimeout(() => this.accounts[account.address] && this.removeRequest(account, id), requestRemoveTimeout)
-            provider.off(`data:${targetChain.type}:${targetChain.id}`, handler)
-            this.sendRequest({ method: 'eth_unsubscribe', chainId: targetChainId, params: [headSub] }, (res: RPCResponsePayload) => {
-              if (res.error) {
-                log.error('error sending message eth_unsubscribe', res)
-              }
-            })
-          }
 
-          const handler = async (payload: RPCRequestPayload) => {
-            if (payload.method === 'eth_subscription' && (payload.params as any).subscription === headSub) {
-              // const newHead = payload.params.result
               let confirmations
               try {
                 confirmations = await this.confirmations(account, id, hash, targetChain)
-              } catch (e) {
-                log.error(e)
+                txRequest.tx = { ...txRequest.tx, confirmations }
 
-                return removeSubscription(60 * 1000)
+                account.update()
+
+                if (confirmations > 12) {
+                  txRequest.status = RequestStatus.Confirmed
+                  txRequest.notice = 'Confirmed'
+                  account.update()
+                  setTimeout(() => this.accounts[account.address] && this.removeRequest(account, id), 8000)
+                  clearTimeout(monitorTimer)
+                }
+              } catch (e) {
+                log.error('error awaiting confirmations', e)
+                clearTimeout(monitorTimer)
+                setTimeout(() => this.accounts[account.address] && this.removeRequest(account, id), 60 * 1000)
+                return
               }
+            }
+            setTimeout(() => monitor(), 3000)
+            const monitorTimer = setInterval(monitor, 15000)
+          } else if (newHeadRes.result) {
+            const headSub = newHeadRes.result
+
+            const removeSubscription = async (requestRemoveTimeout: number) => {
+              setTimeout(() => this.accounts[account.address] && this.removeRequest(account, id), requestRemoveTimeout)
+              provider.off(`data:${targetChain.type}:${targetChain.id}`, handler)
+              this.sendRequest(
+                { method: 'eth_unsubscribe', chainId: targetChainId, params: [headSub] },
+                (res: RPCResponsePayload) => {
+                  if (res.error) {
+                    log.error('error sending message eth_unsubscribe', res)
+                  }
+                }
+              )
+            }
 
-              txRequest.tx = { ...txRequest.tx, confirmations }
-              account.update()
+            const handler = async (payload: RPCRequestPayload) => {
+              if (payload.method === 'eth_subscription' && (payload.params as any).subscription === headSub) {
+                // const newHead = payload.params.result
+                let confirmations
+                try {
+                  confirmations = await this.confirmations(account, id, hash, targetChain)
+                } catch (e) {
+                  log.error(e)
 
-              if (confirmations > 12) {
-                txRequest.status = RequestStatus.Confirmed
-                txRequest.notice = 'Confirmed'
+                  return removeSubscription(60 * 1000)
+                }
+
+                txRequest.tx = { ...txRequest.tx, confirmations }
                 account.update()
-                
-                removeSubscription(8000)
+
+                if (confirmations > 12) {
+                  txRequest.status = RequestStatus.Confirmed
+                  txRequest.notice = 'Confirmed'
+                  account.update()
+
+                  removeSubscription(8000)
+                }
               }
             }
-          }
 
-          provider.on(`data:${targetChain.type}:${targetChain.id}`, handler)
-          // provider.on('data', ({ type, id }, ...args) => {
-          //   if (id === targetChain.id) {
-          //     handler(args)
-          //   }
-          // })
+            provider.on(`data:${targetChain.type}:${targetChain.id}`, handler)
+            // provider.on('data', ({ type, id }, ...args) => {
+            //   if (id === targetChain.id) {
+            //     handler(args)
+            //   }
+            // })
+          }
         }
-      })
+      )
     }
   }
 
   // Set Current Account
-  setSigner (id: string, cb: Callback<Account>) {
+  setSigner(id: string, cb: Callback<Account>) {
     const previouslyActiveAccount = this.current()
 
     this._current = id
@@ -383,21 +420,22 @@ export class Accounts extends EventEmitter {
       previouslyActiveAccount.active = false
       previouslyActiveAccount.update()
     }
-    
+
     store.setAccount(summary)
 
-    if (currentAccount.status === 'ok') this.verifyAddress(false, (err, verified) => {
-      if (!err && !verified) {
-        currentAccount.signer = ''
-        currentAccount.update()
-      }
-    })
+    if (currentAccount.status === 'ok')
+      this.verifyAddress(false, (err, verified) => {
+        if (!err && !verified) {
+          currentAccount.signer = ''
+          currentAccount.update()
+        }
+      })
 
     // If the account has any current requests, make sure fees are current
     this.updatePendingFees()
   }
 
-  updatePendingFees (chainId?: number) {
+  updatePendingFees(chainId?: number) {
     const currentAccount = this.current()
 
     if (currentAccount) {
@@ -405,7 +443,10 @@ export class Accounts extends EventEmitter {
       const transactions = Object.entries(currentAccount.requests)
         .filter(([_, req]) => req.type === 'transaction')
         .map(([_, req]) => [_, req] as [string, TransactionRequest])
-        .filter(([_, req]) => !req.locked && !req.feesUpdatedByUser && (!chainId || parseInt(req.data.chainId, 16) === chainId))
+        .filter(
+          ([_, req]) =>
+            !req.locked && !req.feesUpdatedByUser && (!chainId || parseInt(req.data.chainId, 16) === chainId)
+        )
 
       transactions.forEach(([id, req]) => {
         const tx = req.data
@@ -414,23 +455,28 @@ export class Accounts extends EventEmitter {
 
         if (usesBaseFee(tx)) {
           const { maxBaseFeePerGas, maxPriorityFeePerGas } = gas.price.fees
-          this.setPriorityFee(maxPriorityFeePerGas, id, false, e => { if (e) log.error(e) })
-          this.setBaseFee(maxBaseFeePerGas, id, false, e => { if (e) log.error(e) })
+          this.setPriorityFee(maxPriorityFeePerGas, id, false, (e) => {
+            if (e) log.error(e)
+          })
+          this.setBaseFee(maxBaseFeePerGas, id, false, (e) => {
+            if (e) log.error(e)
+          })
         } else {
           const gasPrice = gas.price.levels.fast
-          this.setGasPrice(gasPrice, id, false, e => { if (e) log.error(e) })
+          this.setGasPrice(gasPrice, id, false, (e) => {
+            if (e) log.error(e)
+          })
         }
       })
     }
   }
 
-  unsetSigner (cb: Callback<{ id: string, status: string }>) {
+  unsetSigner(cb: Callback<{ id: string; status: string }>) {
     const summary = { id: '', status: '' }
     if (cb) cb(null, summary)
 
     store.unsetAccount()
 
-
     // setTimeout(() => { // Clear signer requests when unset
     //   if (s) {
     //     s.requests = {}
@@ -439,17 +485,17 @@ export class Accounts extends EventEmitter {
     // })
   }
 
-  verifyAddress (display: boolean, cb: Callback<boolean>) {
+  verifyAddress(display: boolean, cb: Callback<boolean>) {
     const currentAccount = this.current()
     if (currentAccount && currentAccount.verifyAddress) currentAccount.verifyAddress(display, cb)
   }
 
-  getSelectedAddresses () {
+  getSelectedAddresses() {
     const currentAccount = this.current()
     return currentAccount ? currentAccount.getSelectedAddresses() : []
   }
 
-  getAccounts (cb?: Callback<Array<string>>) {
+  getAccounts(cb?: Callback<Array<string>>) {
     const currentAccount = this.current()
     if (!currentAccount) {
       if (cb) cb(new Error('No Account Selected'))
@@ -459,7 +505,7 @@ export class Accounts extends EventEmitter {
     return currentAccount.getAccounts(cb)
   }
 
-  getCoinbase (cb: Callback<Array<string>>) {
+  getCoinbase(cb: Callback<Array<string>>) {
     const currentAccount = this.current()
 
     if (!currentAccount) return cb(new Error('No Account Selected'))
@@ -467,32 +513,35 @@ export class Accounts extends EventEmitter {
     currentAccount.getCoinbase(cb)
   }
 
-  signMessage (address: Address, message: string, cb: Callback<string>) {
+  signMessage(address: Address, message: string, cb: Callback<string>) {
     const currentAccount = this.current()
 
     if (!currentAccount) return cb(new Error('No Account Selected'))
-    if (address.toLowerCase() !== currentAccount.getSelectedAddress().toLowerCase()) return cb(new Error('signMessage: Wrong Account Selected'))
+    if (address.toLowerCase() !== currentAccount.getSelectedAddress().toLowerCase())
+      return cb(new Error('signMessage: Wrong Account Selected'))
 
     currentAccount.signMessage(message, cb)
   }
 
-  signTypedData (version: Version, address: Address, typedData: TypedData, cb: Callback<string>) {
+  signTypedData(version: Version, address: Address, typedData: TypedData, cb: Callback<string>) {
     const currentAccount = this.current()
 
     if (!currentAccount) return cb(new Error('No Account Selected'))
-    if (address.toLowerCase() !== currentAccount.getSelectedAddress().toLowerCase()) return cb(new Error('signMessage: Wrong Account Selected'))
+    if (address.toLowerCase() !== currentAccount.getSelectedAddress().toLowerCase())
+      return cb(new Error('signMessage: Wrong Account Selected'))
 
     currentAccount.signTypedData(version, typedData, cb)
   }
 
-  signTransaction (rawTx: TransactionData, cb: Callback<string>) {
+  signTransaction(rawTx: TransactionData, cb: Callback<string>) {
     const currentAccount = this.current()
 
     if (!currentAccount) return cb(new Error('No Account Selected'))
 
     const matchSelected = (rawTx.from || '').toLowerCase() === currentAccount.getSelectedAddress().toLowerCase()
-    const matchActor = (rawTx.from || '').toLowerCase() === (currentAccount.smart ? currentAccount.smart.actor.toLowerCase() : false)
-    
+    const matchActor =
+      (rawTx.from || '').toLowerCase() === (currentAccount.smart ? currentAccount.smart.actor.toLowerCase() : false)
+
     if (matchSelected || matchActor) {
       currentAccount.signTransaction(rawTx, cb)
     } else {
@@ -500,7 +549,7 @@ export class Accounts extends EventEmitter {
     }
   }
 
-  signerCompatibility (handlerId: string, cb: Callback<SignerCompatibility>) {
+  signerCompatibility(handlerId: string, cb: Callback<SignerCompatibility>) {
     const currentAccount = this.current()
     if (!currentAccount) return cb(new Error('Could not locate account'))
 
@@ -516,26 +565,26 @@ export class Accounts extends EventEmitter {
     cb(null, signerCompatibility(data, signer.summary()))
   }
 
-  close () {
+  close() {
     this.dataScanner.close()
     // usbDetect.stopMonitoring()
   }
 
-  setAccess (req: AccessRequest, access: boolean) {
+  setAccess(req: AccessRequest, access: boolean) {
     const currentAccount = this.current()
     if (currentAccount) {
       currentAccount.setAccess(req, access)
     }
   }
 
-  resolveRequest (req: AccountRequest) {
+  resolveRequest(req: AccountRequest) {
     const currentAccount = this.current()
     if (currentAccount && currentAccount.resolveRequest) {
       currentAccount.resolveRequest(req)
     }
   }
 
-  addRequest (req: AccountRequest, res?: RPCCallback<any>) {
+  addRequest(req: AccountRequest, res?: RPCCallback<any>) {
     log.info('addRequest', JSON.stringify(req))
 
     const currentAccount = this.current()
@@ -544,7 +593,7 @@ export class Accounts extends EventEmitter {
     }
   }
 
-  removeRequest (account: FrameAccount, handlerId: string) {
+  removeRequest(account: FrameAccount, handlerId: string) {
     log.info(`removeRequest(${account.id}, ${handlerId})`)
 
     store.backPanelReqView(handlerId)
@@ -553,7 +602,7 @@ export class Accounts extends EventEmitter {
     account.update()
   }
 
-  declineRequest (handlerId: string) {
+  declineRequest(handlerId: string) {
     const currentAccount = this.current()
 
     if (currentAccount && currentAccount.requests[handlerId]) {
@@ -568,10 +617,10 @@ export class Accounts extends EventEmitter {
     }
   }
 
-  setRequestPending (req: AccountRequest) {
+  setRequestPending(req: AccountRequest) {
     const handlerId = req.handlerId
     const currentAccount = this.current()
-    
+
     log.info('setRequestPending', handlerId)
 
     if (currentAccount && currentAccount.requests[handlerId]) {
@@ -581,7 +630,7 @@ export class Accounts extends EventEmitter {
     }
   }
 
-  setRequestError (handlerId: string, err: Error) {
+  setRequestError(handlerId: string, err: Error) {
     log.info('setRequestError', handlerId)
 
     const currentAccount = this.current()
@@ -594,7 +643,12 @@ export class Accounts extends EventEmitter {
       } else if (err.message === 'Ledger device: Condition of use not satisfied (denied by the user?) (0x6985)') {
         currentAccount.requests[handlerId].notice = 'Ledger Signature Declined'
       } else {
-        const notice = err && typeof err === 'string' ? err : err && typeof err === 'object' && err.message && typeof err.message === 'string' ? err.message : 'Unknown Error' // TODO: Update to normalize input type
+        const notice =
+          err && typeof err === 'string'
+            ? err
+            : err && typeof err === 'object' && err.message && typeof err.message === 'string'
+            ? err.message
+            : 'Unknown Error' // TODO: Update to normalize input type
         currentAccount.requests[handlerId].notice = notice
       }
       if (currentAccount.requests[handlerId].type === 'transaction') {
@@ -603,7 +657,7 @@ export class Accounts extends EventEmitter {
           if (activeAccount && activeAccount.requests[handlerId]) {
             activeAccount.requests[handlerId].mode = RequestMode.Monitor
             activeAccount.update()
-            
+
             setTimeout(() => this.accounts[activeAccount.address] && this.removeRequest(activeAccount, handlerId), 8000)
           }
         }, 1500)
@@ -615,14 +669,17 @@ export class Accounts extends EventEmitter {
     }
   }
 
-  setTxSigned (handlerId: string, cb: Callback<void>) {
+  setTxSigned(handlerId: string, cb: Callback<void>) {
     log.info('setTxSigned', handlerId)
 
     const currentAccount = this.current()
     if (!currentAccount) return cb(new Error('No account selected'))
 
     if (currentAccount.requests[handlerId]) {
-      if (currentAccount.requests[handlerId].status === RequestStatus.Declined || currentAccount.requests[handlerId].status === RequestStatus.Error) {
+      if (
+        currentAccount.requests[handlerId].status === RequestStatus.Declined ||
+        currentAccount.requests[handlerId].status === RequestStatus.Error
+      ) {
         cb(new Error('Request already declined'))
       } else {
         currentAccount.requests[handlerId].status = RequestStatus.Sending
@@ -635,7 +692,7 @@ export class Accounts extends EventEmitter {
     }
   }
 
-  setTxSent (handlerId: string, hash: string) {
+  setTxSent(handlerId: string, hash: string) {
     log.info('setTxSent', handlerId, 'Hash', hash)
 
     const currentAccount = this.current()
@@ -649,7 +706,7 @@ export class Accounts extends EventEmitter {
     }
   }
 
-  setRequestSuccess (handlerId: string) {
+  setRequestSuccess(handlerId: string) {
     log.info('setRequestSuccess', handlerId)
 
     const currentAccount = this.current()
@@ -666,14 +723,14 @@ export class Accounts extends EventEmitter {
     }
   }
 
-  remove (address = '') {
+  remove(address = '') {
     address = address.toLowerCase()
 
     const currentAccount = this.current()
     if (currentAccount && currentAccount.address === address) {
       store.unsetAccount()
 
-      const defaultAccount = (Object.values(this.accounts).filter(a => a.address !== address) || [])[0]
+      const defaultAccount = (Object.values(this.accounts).filter((a) => a.address !== address) || [])[0]
       if (defaultAccount) {
         this._current = defaultAccount.id
         defaultAccount.active = true
@@ -687,18 +744,18 @@ export class Accounts extends EventEmitter {
     delete this.accounts[address]
   }
 
-  private invalidValue (fee: string) {
-    return (!fee || isNaN(parseInt(fee, 16)) || parseInt(fee, 16) < 0)
+  private invalidValue(fee: string) {
+    return !fee || isNaN(parseInt(fee, 16)) || parseInt(fee, 16) < 0
   }
 
-  private limitedHexValue (hexValue: string, min: number, max: number) {
+  private limitedHexValue(hexValue: string, min: number, max: number) {
     const value = parseInt(hexValue, 16)
     if (value < min) return intToHex(min)
     if (value > max) return intToHex(max)
     return hexValue
   }
 
-  private txFeeUpdate (inputValue: string, handlerId: string, userUpdate: boolean) {
+  private txFeeUpdate(inputValue: string, handlerId: string, userUpdate: boolean) {
     // Check value
     if (this.invalidValue(inputValue)) throw new Error('txFeeUpdate, invalid input value')
 
@@ -707,7 +764,8 @@ export class Accounts extends EventEmitter {
     if (!currentAccount) throw new Error('No account selected while setting base fee')
 
     const request = this.getTransactionRequest(currentAccount, handlerId)
-    if (!request || request.type !== 'transaction') throw new Error(`Could not find transaction request with handlerId ${handlerId}`)
+    if (!request || request.type !== 'transaction')
+      throw new Error(`Could not find transaction request with handlerId ${handlerId}`)
     if (request.locked) throw new Error('Request has already been approved by the user')
     if (request.feesUpdatedByUser && !userUpdate) throw new Error('Fee has been updated by user')
 
@@ -719,14 +777,38 @@ export class Accounts extends EventEmitter {
       const maxFeePerGas = parseInt(tx.maxFeePerGas || '0x0', 16)
       const maxPriorityFeePerGas = parseInt(tx.maxPriorityFeePerGas || '0x0', 16)
       const currentBaseFee = maxFeePerGas - maxPriorityFeePerGas
-      return { currentAccount, inputValue, maxFeePerGas, maxPriorityFeePerGas, gasLimit, currentBaseFee, txType, gasPrice: 0 }
+      return {
+        currentAccount,
+        inputValue,
+        maxFeePerGas,
+        maxPriorityFeePerGas,
+        gasLimit,
+        currentBaseFee,
+        txType,
+        gasPrice: 0,
+      }
     } else {
       const gasPrice = parseInt(tx.gasPrice || '0x0', 16)
-      return { currentAccount, inputValue, gasPrice, gasLimit, txType, currentBaseFee: 0, maxPriorityFeePerGas: 0, maxFeePerGas: 0 }
+      return {
+        currentAccount,
+        inputValue,
+        gasPrice,
+        gasLimit,
+        txType,
+        currentBaseFee: 0,
+        maxPriorityFeePerGas: 0,
+        maxFeePerGas: 0,
+      }
     }
   }
 
-  private completeTxFeeUpdate (currentAccount: FrameAccount, handlerId: string, userUpdate: boolean, previousFee: any, cb: Callback<void>) {
+  private completeTxFeeUpdate(
+    currentAccount: FrameAccount,
+    handlerId: string,
+    userUpdate: boolean,
+    previousFee: any,
+    cb: Callback<void>
+  ) {
     const txRequest = this.getTransactionRequest(currentAccount, handlerId)
 
     if (userUpdate) {
@@ -743,10 +825,14 @@ export class Accounts extends EventEmitter {
     cb(null)
   }
 
-  setBaseFee (baseFee: string, handlerId: string, userUpdate: boolean, cb: Callback<void>) {
+  setBaseFee(baseFee: string, handlerId: string, userUpdate: boolean, cb: Callback<void>) {
     try {
-      const { currentAccount, maxPriorityFeePerGas, gasLimit, currentBaseFee, txType } = this.txFeeUpdate(baseFee, handlerId, userUpdate)
-      
+      const { currentAccount, maxPriorityFeePerGas, gasLimit, currentBaseFee, txType } = this.txFeeUpdate(
+        baseFee,
+        handlerId,
+        userUpdate
+      )
+
       // New value
       const newBaseFee = parseInt(this.limitedHexValue(baseFee, 0, 9999 * 1e9), 16)
 
@@ -768,7 +854,11 @@ export class Accounts extends EventEmitter {
       }
 
       // Complete update
-      const previousFee = { type: txType, baseFee: intToHex(currentBaseFee), priorityFee: intToHex(maxPriorityFeePerGas) }
+      const previousFee = {
+        type: txType,
+        baseFee: intToHex(currentBaseFee),
+        priorityFee: intToHex(maxPriorityFeePerGas),
+      }
 
       this.completeTxFeeUpdate(currentAccount, handlerId, userUpdate, previousFee, cb)
     } catch (e) {
@@ -776,10 +866,14 @@ export class Accounts extends EventEmitter {
     }
   }
 
-  setPriorityFee (priorityFee: string, handlerId: string, userUpdate: boolean, cb: Callback<void>) {
+  setPriorityFee(priorityFee: string, handlerId: string, userUpdate: boolean, cb: Callback<void>) {
     try {
-      const { currentAccount, maxPriorityFeePerGas, gasLimit, currentBaseFee, txType } = this.txFeeUpdate(priorityFee, handlerId, userUpdate)
-      
+      const { currentAccount, maxPriorityFeePerGas, gasLimit, currentBaseFee, txType } = this.txFeeUpdate(
+        priorityFee,
+        handlerId,
+        userUpdate
+      )
+
       // New values
       const newMaxPriorityFeePerGas = parseInt(this.limitedHexValue(priorityFee, 0, 9999 * 1e9), 16)
 
@@ -791,7 +885,7 @@ export class Accounts extends EventEmitter {
       // New max fee per gas
       const newMaxFeePerGas = currentBaseFee + newMaxPriorityFeePerGas
       const maxTotalFee = maxFee(tx)
-    
+
       // Limit max fee
       if (newMaxFeePerGas * gasLimit > maxTotalFee) {
         const limitedMaxFeePerGas = Math.floor(maxTotalFee / gasLimit)
@@ -802,11 +896,11 @@ export class Accounts extends EventEmitter {
         tx.maxFeePerGas = intToHex(newMaxFeePerGas)
         tx.maxPriorityFeePerGas = intToHex(newMaxPriorityFeePerGas)
       }
-    
-      const previousFee = { 
-        type: txType, 
+
+      const previousFee = {
+        type: txType,
         baseFee: intToHex(currentBaseFee),
-        priorityFee: intToHex(maxPriorityFeePerGas)
+        priorityFee: intToHex(maxPriorityFeePerGas),
       }
 
       // Complete update
@@ -816,7 +910,7 @@ export class Accounts extends EventEmitter {
     }
   }
 
-  setGasPrice (price: string, handlerId: string, userUpdate: boolean, cb: Callback<void>) {
+  setGasPrice(price: string, handlerId: string, userUpdate: boolean, cb: Callback<void>) {
     try {
       const { currentAccount, gasLimit, gasPrice, txType } = this.txFeeUpdate(price, handlerId, userUpdate)
 
@@ -838,8 +932,8 @@ export class Accounts extends EventEmitter {
       }
 
       const previousFee = {
-        type: txType, 
-        gasPrice: intToHex(gasPrice)
+        type: txType,
+        gasPrice: intToHex(gasPrice),
       }
 
       // Complete update
@@ -849,10 +943,10 @@ export class Accounts extends EventEmitter {
     }
   }
 
-  setGasLimit (limit: string, handlerId: string, userUpdate: boolean, cb: Callback<void>) {
+  setGasLimit(limit: string, handlerId: string, userUpdate: boolean, cb: Callback<void>) {
     try {
       const { currentAccount, maxFeePerGas, gasPrice, txType } = this.txFeeUpdate(limit, handlerId, userUpdate)
-      
+
       // New values
       const newGasLimit = parseInt(this.limitedHexValue(limit, 0, 12.5e6), 16)
 
@@ -874,7 +968,7 @@ export class Accounts extends EventEmitter {
     }
   }
 
-  removeFeeUpdateNotice (handlerId: string, cb: Callback<void>) {
+  removeFeeUpdateNotice(handlerId: string, cb: Callback<void>) {
     const currentAccount = this.current()
     if (!currentAccount) return cb(new Error('No account selected while removing fee notice'))
 
@@ -887,7 +981,7 @@ export class Accounts extends EventEmitter {
     cb(null)
   }
 
-  adjustNonce (handlerId: string, nonceAdjust: number) {
+  adjustNonce(handlerId: string, nonceAdjust: number) {
     const currentAccount = this.current()
 
     if (nonceAdjust !== 1 && nonceAdjust !== -1) return log.error('Invalid nonce adjustment', nonceAdjust)
@@ -904,24 +998,27 @@ export class Accounts extends EventEmitter {
       } else {
         const { from, chainId } = txRequest.data
 
-        this.sendRequest({ method: 'eth_getTransactionCount', chainId, params: [from, 'pending'] }, (res: RPCResponsePayload) => {
-          if (res.result) {
-            const newNonce = parseInt(res.result, 16)
-            const adjustedNonce = intToHex(nonceAdjust === 1 ? newNonce : newNonce + nonceAdjust)
+        this.sendRequest(
+          { method: 'eth_getTransactionCount', chainId, params: [from, 'pending'] },
+          (res: RPCResponsePayload) => {
+            if (res.result) {
+              const newNonce = parseInt(res.result, 16)
+              const adjustedNonce = intToHex(nonceAdjust === 1 ? newNonce : newNonce + nonceAdjust)
 
-            txRequest.data.nonce = adjustedNonce
-            currentAccount.update()
+              txRequest.data.nonce = adjustedNonce
+              currentAccount.update()
+            }
           }
-        })
+        )
       }
     }
   }
 
-  lockRequest (handlerId: string) {
+  lockRequest(handlerId: string) {
     // When a request is approved, lock it so that no automatic updates such as fee changes can happen
     const currentAccount = this.current()
     if (currentAccount && currentAccount.requests[handlerId]) {
-      (currentAccount.requests[handlerId] as TransactionRequest).locked = true
+      ;(currentAccount.requests[handlerId] as TransactionRequest).locked = true
     } else {
       log.error('Trying to lock request ' + handlerId + ' but there is no current account')
     }
diff --git a/main/accounts/types.ts b/main/accounts/types.ts
index 31f90e95c..ab730d1b6 100644
--- a/main/accounts/types.ts
+++ b/main/accounts/types.ts
@@ -5,12 +5,12 @@ import type { TransactionData } from '../../resources/domain/transaction'
 
 export enum ReplacementType {
   Speed = 'speed',
-  Cancel = 'cancel'
+  Cancel = 'cancel',
 }
 
 export enum RequestMode {
   Normal = 'normal',
-  Monitor = 'monitor'
+  Monitor = 'monitor',
 }
 
 export enum RequestStatus {
@@ -21,60 +21,60 @@ export enum RequestStatus {
   Confirmed = 'confirmed',
   Declined = 'declined',
   Error = 'error',
-  Success = 'success'
+  Success = 'success',
 }
 
 type RequestType = 'sign' | 'signTypedData' | 'transaction' | 'access' | 'addChain' | 'switchChain' | 'addToken'
 
 export interface AccountRequest {
-  type: RequestType,
-  origin: string,
-  payload: JSONRPCRequestPayload,
-  handlerId: string,
-  account: string,
-  status?: RequestStatus,
-  mode?: RequestMode,
-  notice?: string,
-  created?: number,
+  type: RequestType
+  origin: string
+  payload: JSONRPCRequestPayload
+  handlerId: string
+  account: string
+  status?: RequestStatus
+  mode?: RequestMode
+  notice?: string
+  created?: number
   res?: (response?: RPCResponsePayload) => void
 }
 
 export interface TransactionReceipt {
-  gasUsed: string,
+  gasUsed: string
   blockNumber: string
 }
 
 export interface Approval {
-  type: string,
-  data: any,
-  approved: boolean,
+  type: string
+  data: any
+  approved: boolean
   approve: (data: any) => void
 }
 
 export interface TransactionRequest extends Omit<AccountRequest, 'type'> {
-  type: 'transaction',
-  payload: RPC.SendTransaction.Request,
-  data: TransactionData,
-  decodedData?: DecodedCallData,
+  type: 'transaction'
+  payload: RPC.SendTransaction.Request
+  data: TransactionData
+  decodedData?: DecodedCallData
   tx?: {
-    receipt?: TransactionReceipt,
-    hash?: string,
+    receipt?: TransactionReceipt
+    hash?: string
     confirmations: number
-  },
-  approvals: Approval[],
-  locked?: boolean,
+  }
+  approvals: Approval[]
+  locked?: boolean
   automaticFeeUpdateNotice?: {
-    previousFee: any,
-  },
-  recipient?: string, // ens name
-  updatedFees?: boolean,
-  feeAtTime?: string,
-  completed?: number,
+    previousFee: any
+  }
+  recipient?: string // ens name
+  updatedFees?: boolean
+  feeAtTime?: string
+  completed?: number
   feesUpdatedByUser: boolean
 }
 
 export interface SignTypedDataRequest extends Omit<AccountRequest, 'type'> {
-  type: 'signTypedData',
+  type: 'signTypedData'
   version: Version
 }
 
@@ -83,11 +83,11 @@ export interface AccessRequest extends Omit<AccountRequest, 'type'> {
 }
 
 export interface AddChainRequest extends Omit<AccountRequest, 'type'> {
-  type: 'addChain',
+  type: 'addChain'
   chain: Chain
 }
 
 export interface AddTokenRequest extends Omit<AccountRequest, 'type'> {
-  type: 'addToken',
+  type: 'addToken'
   token: Token
 }
diff --git a/main/api/http.ts b/main/api/http.ts
index bcce86806..cabcf6e47 100644
--- a/main/api/http.ts
+++ b/main/api/http.ts
@@ -12,12 +12,12 @@ import protectedMethods from './protectedMethods'
 const logTraffic = process.env.LOG_TRAFFIC
 
 interface PendingRequest {
-  send: () => void,
+  send: () => void
   timer: NodeJS.Timeout
 }
 
 interface Subscription {
-  id: string,
+  id: string
   origin: string
 }
 
@@ -31,7 +31,7 @@ const pending: Record<string, PendingRequest> = {}
 const cleanupTimers: Record<string, NodeJS.Timeout> = {}
 const connectionMonitors: Record<string, NodeJS.Timeout> = {}
 
-function extendSession (originId: string) {
+function extendSession(originId: string) {
   if (originId) {
     clearTimeout(connectionMonitors[originId])
 
@@ -44,15 +44,21 @@ function extendSession (originId: string) {
 const storeApi = {
   getPermissions: (address: Address) => {
     return store('main.permissions', address) as Record<string, Permission>
-  }
+  },
 }
 
 const cleanup = (id: string) => {
   delete polls[id]
   delete pending[id]
-  Object.keys(pollSubs).forEach(sub => {
+  Object.keys(pollSubs).forEach((sub) => {
     if (pollSubs[sub].id === id) {
-      provider.send({ jsonrpc: '2.0', id: 1, method: 'eth_unsubscribe', params: [sub], _origin: '' })
+      provider.send({
+        jsonrpc: '2.0',
+        id: 1,
+        method: 'eth_unsubscribe',
+        params: [sub],
+        _origin: '',
+      })
       delete pollSubs[sub]
     }
   })
@@ -67,78 +73,91 @@ const handler = (req: IncomingMessage, res: ServerResponse) => {
     res.end()
   } else if (req.method === 'POST') {
     const body: any = []
-    req.on('data', chunk => body.push(chunk)).on('end', async () => {
-      res.on('error', err => console.error('res err', err))
-      const data = Buffer.concat(body).toString()
-      const rawPayload = validPayload<HTTPPollingPayload>(data)
-      if (!rawPayload) return console.warn('Invalid Payload', data)
-
-      if (logTraffic) log.info(`req -> | http | ${req.headers.origin} | ${rawPayload.method} | -> | ${JSON.stringify(rawPayload.params)}`)
-
-      const origin = parseOrigin(req.headers.origin)
-      const { payload, hasSession } = updateOrigin(rawPayload, origin)
-
-      if (hasSession) {
-        extendSession(payload._origin)
-      }
-
-      if (protectedMethods.indexOf(payload.method) > -1 && !(await isTrusted(origin))) {
-        let error = { message: `Permission denied, approve ${origin} in Frame to continue`, code: 4001 }
-        // Review
-        if (!accounts.getSelectedAddresses()[0]) error = { message: 'No Frame account selected', code: 4001 }
-        res.writeHead(401, { 'Content-Type': 'application/json' })
-        res.end(JSON.stringify({ id: payload.id, jsonrpc: payload.jsonrpc, error }))
-      } else {
-        if (payload.method === 'eth_pollSubscriptions') {
-          const id = payload.params[0]
-          const send = (force: boolean) => {
-            const result = polls[id] || []
-            if (result.length || payload.params[1] === 'immediate' || force) {
-              res.writeHead(200, { 'Content-Type': 'application/json' })
-              const response = { id: payload.id, jsonrpc: payload.jsonrpc, result }
-              if (logTraffic) log.info(`<- res | http | ${origin} | ${payload.method} | <- | ${JSON.stringify(response)}`)
-              res.end(JSON.stringify(response))
-              delete polls[id]
-              clearTimeout(cleanupTimers[id])
-              cleanupTimers[id] = setTimeout(cleanup.bind(null, id), 20 * 1000)
-            } else {
-              const sendResponse = () => {
-                const pendingRequest = pending[id]
-                if (pendingRequest && pendingRequest.timer) {
-                  clearTimeout(pendingRequest.timer)
-                }
-              
-                delete pending[id]
+    req
+      .on('data', (chunk) => body.push(chunk))
+      .on('end', async () => {
+        res.on('error', (err) => console.error('res err', err))
+        const data = Buffer.concat(body).toString()
+        const rawPayload = validPayload<HTTPPollingPayload>(data)
+        if (!rawPayload) return console.warn('Invalid Payload', data)
+
+        if (logTraffic)
+          log.info(
+            `req -> | http | ${req.headers.origin} | ${rawPayload.method} | -> | ${JSON.stringify(rawPayload.params)}`
+          )
+
+        const origin = parseOrigin(req.headers.origin)
+        const { payload, hasSession } = updateOrigin(rawPayload, origin)
+
+        if (hasSession) {
+          extendSession(payload._origin)
+        }
 
-                send(true)
-              }
+        if (protectedMethods.indexOf(payload.method) > -1 && !(await isTrusted(origin))) {
+          let error = {
+            message: `Permission denied, approve ${origin} in Frame to continue`,
+            code: 4001,
+          }
+          // Review
+          if (!accounts.getSelectedAddresses()[0]) error = { message: 'No Frame account selected', code: 4001 }
+          res.writeHead(401, { 'Content-Type': 'application/json' })
+          res.end(JSON.stringify({ id: payload.id, jsonrpc: payload.jsonrpc, error }))
+        } else {
+          if (payload.method === 'eth_pollSubscriptions') {
+            const id = payload.params[0]
+            const send = (force: boolean) => {
+              const result = polls[id] || []
+              if (result.length || payload.params[1] === 'immediate' || force) {
+                res.writeHead(200, { 'Content-Type': 'application/json' })
+                const response = { id: payload.id, jsonrpc: payload.jsonrpc, result }
+                if (logTraffic)
+                  log.info(`<- res | http | ${origin} | ${payload.method} | <- | ${JSON.stringify(response)}`)
+                res.end(JSON.stringify(response))
+                delete polls[id]
+                clearTimeout(cleanupTimers[id])
+                cleanupTimers[id] = setTimeout(cleanup.bind(null, id), 20 * 1000)
+              } else {
+                const sendResponse = () => {
+                  const pendingRequest = pending[id]
+                  if (pendingRequest && pendingRequest.timer) {
+                    clearTimeout(pendingRequest.timer)
+                  }
+
+                  delete pending[id]
+
+                  send(true)
+                }
 
-              pending[id] = { 
-                send: sendResponse,
-                timer: setTimeout(sendResponse, 15 * 1000)
+                pending[id] = {
+                  send: sendResponse,
+                  timer: setTimeout(sendResponse, 15 * 1000),
+                }
               }
             }
+            if (typeof id === 'string') return send(false)
+            res.writeHead(401, { 'Content-Type': 'application/json' })
+            res.end(JSON.stringify({ error: 'Invalid Client ID' }))
           }
-          if (typeof id === 'string') return send(false)
-          res.writeHead(401, { 'Content-Type': 'application/json' })
-          res.end(JSON.stringify({ error: 'Invalid Client ID' }))
-        }
 
-        provider.send(payload, response => {
-          if (response && response.result) {
-            if (payload.method === 'eth_subscribe') {
-              pollSubs[response.result] = { id: rawPayload.pollId || '', origin: payload._origin } // Refactor this so you don't need to send a pollId and use the existing subscription id
-            } else if (payload.method === 'eth_unsubscribe') {
-              payload.params.forEach(sub => { if (pollSubs[sub]) delete pollSubs[sub] })
+          provider.send(payload, (response) => {
+            if (response && response.result) {
+              if (payload.method === 'eth_subscribe') {
+                pollSubs[response.result] = { id: rawPayload.pollId || '', origin: payload._origin } // Refactor this so you don't need to send a pollId and use the existing subscription id
+              } else if (payload.method === 'eth_unsubscribe') {
+                payload.params.forEach((sub) => {
+                  if (pollSubs[sub]) delete pollSubs[sub]
+                })
+              }
             }
-          }
 
-          if (logTraffic) log.info(`<- res | http | ${req.headers.origin} | ${payload.method} | <- | ${JSON.stringify(response)}`)
-          res.writeHead(200, { 'Content-Type': 'application/json' })
-          res.end(JSON.stringify(response))
-        })
-      }
-    }).on('error', err => console.error('req err', err))
+            if (logTraffic)
+              log.info(`<- res | http | ${req.headers.origin} | ${payload.method} | <- | ${JSON.stringify(response)}`)
+            res.writeHead(200, { 'Content-Type': 'application/json' })
+            res.end(JSON.stringify(response))
+          })
+        }
+      })
+      .on('error', (err) => console.error('req err', err))
   } else {
     res.writeHead(401, { 'Content-Type': 'application/json' })
     res.end(JSON.stringify({ error: 'Permission Denied' }))
@@ -162,11 +181,14 @@ provider.on('data', (payload: ProviderDataPayload) => {
   }
 })
 
-provider.on('data:address', (account, payload) => { // Make sure the subscription has access based on current account
+provider.on('data:address', (account, payload) => {
+  // Make sure the subscription has access based on current account
   if (pollSubs[payload.params.subscription]) {
     const { id, origin } = pollSubs[payload.params.subscription]
     const permissions = storeApi.getPermissions(account) || {}
-    const permission = Object.values(permissions).find(p => p.origin === origin) || { provider: false }
+    const permission = Object.values(permissions).find((p) => p.origin === origin) || {
+      provider: false,
+    }
 
     if (!permission.provider) payload.params.result = []
     polls[id] = polls[id] || []
diff --git a/main/api/origins.ts b/main/api/origins.ts
index dfc8b000a..e0259e61e 100644
--- a/main/api/origins.ts
+++ b/main/api/origins.ts
@@ -10,33 +10,39 @@ const dev = process.env.NODE_ENV === 'development'
 const protocolRegex = /^(?:ws|http)s?:\/\//
 
 interface OriginUpdateResult {
-  payload: RPCRequestPayload,
+  payload: RPCRequestPayload
   hasSession: boolean
 }
 
-export function parseOrigin (origin?: string) {
+export function parseOrigin(origin?: string) {
   if (!origin) return 'Unknown'
 
   return origin.replace(protocolRegex, '')
 }
 
-function isRealOrigin (origin: string) {
+function isRealOrigin(origin: string) {
   return origin !== 'Unknown'
 }
 
-function invalidOrigin (origin: string) {
+function invalidOrigin(origin: string) {
   return origin !== origin.replace(/[^0-9a-z/:.[\]-]/gi, '')
 }
 
-function addPermissionRequest (address: Address, origin: string) {
+function addPermissionRequest(address: Address, origin: string) {
   return new Promise((resolve, reject) => {
     const handlerId = uuidv5(origin, uuidv5.DNS)
-    const request: AccessRequest = { payload: undefined as any, handlerId, type: 'access', origin: handlerId, account: address }
+    const request: AccessRequest = {
+      payload: undefined as any,
+      handlerId,
+      type: 'access',
+      origin: handlerId,
+      account: address,
+    }
 
     accounts.addRequest(request, () => {
       const permissions = store('main.permissions', address) || {}
-      const perms = Object.keys(permissions).map(id => permissions[id])
-      const permIndex = perms.map(p => p.origin).indexOf(origin)
+      const perms = Object.keys(permissions).map((id) => permissions[id])
+      const permIndex = perms.map((p) => p.origin).indexOf(origin)
       if (perms[permIndex] && perms[permIndex].provider) {
         resolve(true)
       } else {
@@ -46,7 +52,11 @@ function addPermissionRequest (address: Address, origin: string) {
   })
 }
 
-export function updateOrigin (payload: JSONRPCRequestPayload, origin: string, connectionMessage = false): OriginUpdateResult {
+export function updateOrigin(
+  payload: JSONRPCRequestPayload,
+  origin: string,
+  connectionMessage = false
+): OriginUpdateResult {
   let hasSession = false
 
   const originId = uuidv5(origin, uuidv5.DNS)
@@ -66,31 +76,35 @@ export function updateOrigin (payload: JSONRPCRequestPayload, origin: string, co
         name: origin,
         chain: {
           id: 1,
-          type: 'ethereum'
-        }
+          type: 'ethereum',
+        },
       })
     }
   }
 
-  return { 
+  return {
     hasSession,
-    payload: { 
+    payload: {
       ...payload,
       chainId: payload.chainId || `0x${(existingOrigin?.chain.id || 1).toString(16)}`,
-      _origin: originId
-    }
+      _origin: originId,
+    },
   }
 }
 
-export function isFrameExtension (req: IncomingMessage) {
+export function isFrameExtension(req: IncomingMessage) {
   const origin = req.headers.origin
   if (!origin) return false
 
   const query = queryString.parse((req.url || '').replace('/', ''))
-  const mozOrigin = origin.startsWith('moz-extension://') 
-  const extOrigin = origin.startsWith('chrome-extension://') || origin.startsWith('moz-extension://') || origin.startsWith('safari-web-extension://')
-
-  if (origin === 'chrome-extension://ldcoohedfbjoobcadoglnnmmfbdlmmhf') { // Match production chrome
+  const mozOrigin = origin.startsWith('moz-extension://')
+  const extOrigin =
+    origin.startsWith('chrome-extension://') ||
+    origin.startsWith('moz-extension://') ||
+    origin.startsWith('safari-web-extension://')
+
+  if (origin === 'chrome-extension://ldcoohedfbjoobcadoglnnmmfbdlmmhf') {
+    // Match production chrome
     return true
   } else if (mozOrigin || (dev && extOrigin)) {
     // In production, match any Firefox extension origin where query.identity === 'frame-extension'
@@ -101,7 +115,7 @@ export function isFrameExtension (req: IncomingMessage) {
   }
 }
 
-export async function isTrusted (origin?: string) {
+export async function isTrusted(origin?: string) {
   if (!origin || origin === 'null') origin = 'Unknown' // Permission granted to unknown origins only persist until the Frame is closed, they are not permanent
   if (invalidOrigin(origin)) return false
   if (origin === 'frame-extension') return true
@@ -110,8 +124,8 @@ export async function isTrusted (origin?: string) {
   const address = account.address
   if (!address) return
   const permissions = store('main.permissions', address) || {}
-  const perms = Object.keys(permissions).map(id => permissions[id])
-  const permIndex = perms.map(p => p.origin).indexOf(origin)
+  const perms = Object.keys(permissions).map((id) => permissions[id])
+  const permIndex = perms.map((p) => p.origin).indexOf(origin)
   if (permIndex === -1) {
     try {
       return await addPermissionRequest(address, origin)
diff --git a/main/api/protectedMethods.ts b/main/api/protectedMethods.ts
index 0628ba970..87bb72cab 100644
--- a/main/api/protectedMethods.ts
+++ b/main/api/protectedMethods.ts
@@ -12,5 +12,5 @@ export default [
   'eth_signTypedData_v3',
   'eth_signTypedData_v4',
   'wallet_addEthereumChain',
-  'wallet_getAssets'
+  'wallet_getAssets',
 ]
diff --git a/main/api/validPayload.ts b/main/api/validPayload.ts
index b20d38eb9..2f85c3d73 100644
--- a/main/api/validPayload.ts
+++ b/main/api/validPayload.ts
@@ -2,19 +2,21 @@ import log from 'electron-log'
 
 const has = (value: any) => value !== null && value !== undefined
 
-export default function <T extends JSONRPCRequestPayload> (data: string): T | false {
+export default function <T extends JSONRPCRequestPayload>(data: string): T | false {
   try {
-    const payload = JSON.parse(data) as T || {}
+    const payload = (JSON.parse(data) as T) || {}
 
     if (has(payload.id) && has(payload.method)) {
       if (!payload.params) payload.params = []
 
-      return !!(
-        (typeof payload.id === 'number' || typeof payload.id === 'string') &&
-        (typeof payload.jsonrpc === 'string') &&
-        (typeof payload.method === 'string') &&
-        (Array.isArray(payload.params) || typeof payload.params === 'object')
-      ) && payload
+      return (
+        !!(
+          (typeof payload.id === 'number' || typeof payload.id === 'string') &&
+          typeof payload.jsonrpc === 'string' &&
+          typeof payload.method === 'string' &&
+          (Array.isArray(payload.params) || typeof payload.params === 'object')
+        ) && payload
+      )
     }
   } catch (e) {
     log.info('Error parsing payload: ', data, e)
diff --git a/main/api/ws.ts b/main/api/ws.ts
index fb4c6b712..599ee407f 100644
--- a/main/api/ws.ts
+++ b/main/api/ws.ts
@@ -1,6 +1,6 @@
 import WebSocket from 'ws'
 import { v4 as uuid, v5 as uuidv5 } from 'uuid'
-import  log from 'electron-log'
+import log from 'electron-log'
 
 import store from '../store'
 import provider from '../provider'
@@ -18,28 +18,28 @@ const subs: Record<string, Subscription> = {}
 const connectionMonitors: Record<string, NodeJS.Timeout> = {}
 
 interface Subscription {
-  originId: string,
+  originId: string
   socket: FrameWebSocket
 }
 
 interface FrameWebSocket extends WebSocket {
-  id: string,
-  origin?: string,
+  id: string
+  origin?: string
   isFrameExtension: boolean
 }
 
 interface ExtensionPayload extends JSONRPCRequestPayload {
-  __frameOrigin?: string,
+  __frameOrigin?: string
   __extensionConnecting?: boolean
 }
 
 const storeApi = {
   getPermissions: (address: Address) => {
     return store('main.permissions', address) as Record<string, Permission>
-  }
+  },
 }
 
-function extendSession (originId: string) {
+function extendSession(originId: string) {
   if (originId) {
     clearTimeout(connectionMonitors[originId])
 
@@ -56,16 +56,19 @@ const handler = (socket: FrameWebSocket, req: IncomingMessage) => {
 
   const res = (payload: RPCResponsePayload) => {
     if (socket.readyState === WebSocket.OPEN) {
-      socket.send(JSON.stringify(payload), err => { if (err) log.info(err) })
+      socket.send(JSON.stringify(payload), (err) => {
+        if (err) log.info(err)
+      })
     }
   }
 
-  socket.on('message', async data => {
+  socket.on('message', async (data) => {
     const rawPayload = validPayload<ExtensionPayload>(data.toString())
     if (!rawPayload) return console.warn('Invalid Payload', data)
 
     let requestOrigin = socket.origin
-    if (socket.isFrameExtension) { // Request from extension, swap origin
+    if (socket.isFrameExtension) {
+      // Request from extension, swap origin
       if (rawPayload.__frameOrigin) {
         requestOrigin = rawPayload.__frameOrigin
         delete rawPayload.__frameOrigin
@@ -78,7 +81,12 @@ const handler = (socket: FrameWebSocket, req: IncomingMessage) => {
 
     // Extension custom action for summoning Frame
     if (origin === 'frame-extension' && rawPayload.method === 'frame_summon') return windows.toggleTray()
-    if (logTraffic) log.info(`req -> | ${(socket.isFrameExtension ? 'ext' : 'ws')} | ${origin} | ${rawPayload.method} | -> | ${rawPayload.params}`)
+    if (logTraffic)
+      log.info(
+        `req -> | ${socket.isFrameExtension ? 'ext' : 'ws'} | ${origin} | ${rawPayload.method} | -> | ${
+          rawPayload.params
+        }`
+      )
 
     const { payload, hasSession } = updateOrigin(rawPayload, origin, rawPayload.__extensionConnecting)
 
@@ -87,30 +95,46 @@ const handler = (socket: FrameWebSocket, req: IncomingMessage) => {
     }
 
     if (protectedMethods.indexOf(payload.method) > -1 && !(await isTrusted(origin))) {
-      let error = { message: 'Permission denied, approve ' + origin + ' in Frame to continue', code: 4001 }
+      let error = {
+        message: 'Permission denied, approve ' + origin + ' in Frame to continue',
+        code: 4001,
+      }
       // review
       if (!accounts.getSelectedAddresses()[0]) error = { message: 'No Frame account selected', code: 4001 }
       res({ id: payload.id, jsonrpc: payload.jsonrpc, error })
     } else {
-      provider.send(payload, response => {
+      provider.send(payload, (response) => {
         if (response && response.result) {
           if (payload.method === 'eth_subscribe') {
             subs[response.result] = { socket, originId: payload._origin }
           } else if (payload.method === 'eth_unsubscribe') {
-            payload.params.forEach(sub => { if (subs[sub]) delete subs[sub] })
+            payload.params.forEach((sub) => {
+              if (subs[sub]) delete subs[sub]
+            })
           }
         }
-        if (logTraffic) log.info(`<- res | ${(socket.isFrameExtension ? 'ext' : 'ws')} | ${origin} | ${payload.method} | <- | ${JSON.stringify(response.result || response.error)}`)
+        if (logTraffic)
+          log.info(
+            `<- res | ${socket.isFrameExtension ? 'ext' : 'ws'} | ${origin} | ${payload.method} | <- | ${JSON.stringify(
+              response.result || response.error
+            )}`
+          )
 
         res(response)
       })
     }
   })
-  socket.on('error', err => log.error(err))
-  socket.on('close', _ => {
-    Object.keys(subs).forEach(sub => {
+  socket.on('error', (err) => log.error(err))
+  socket.on('close', (_) => {
+    Object.keys(subs).forEach((sub) => {
       if (subs[sub].socket.id === socket.id) {
-        provider.send({ jsonrpc: '2.0', id: 1, method: 'eth_unsubscribe', _origin: subs[sub].originId, params: [sub] })
+        provider.send({
+          jsonrpc: '2.0',
+          id: 1,
+          method: 'eth_unsubscribe',
+          _origin: subs[sub].originId,
+          params: [sub],
+        })
         delete subs[sub]
       }
     })
@@ -121,7 +145,7 @@ export default function (server: Server) {
   const ws = new WebSocket.Server({ server })
   ws.on('connection', handler)
   // Send data to the socket that initiated the subscription
-  provider.on('data', payload => {
+  provider.on('data', (payload) => {
     const subscription = subs[payload.params.subscription]
 
     // if an origin is passed, make sure the subscription is from that origin
@@ -130,7 +154,8 @@ export default function (server: Server) {
     }
   })
 
-  provider.on('data:address', (address, payload) => { // Make sure the subscription has access based on current account
+  provider.on('data:address', (address, payload) => {
+    // Make sure the subscription has access based on current account
     const subscription = subs[payload.params.subscription]
     if (subscription) {
       const permissions = storeApi.getPermissions(address) || {}
diff --git a/main/chains/blocks/index.ts b/main/chains/blocks/index.ts
index 143c05d26..b66c2e006 100644
--- a/main/chains/blocks/index.ts
+++ b/main/chains/blocks/index.ts
@@ -4,38 +4,38 @@ import log from 'electron-log'
 import type { BigNumber } from 'bignumber.js'
 
 interface Connection {
-  send (payload: JSONRPCRequestPayload): Promise<any>,
-  on: (event: string, handler: any) => void,
-  off: (event: string, handler: any) => void,
+  send(payload: JSONRPCRequestPayload): Promise<any>
+  on: (event: string, handler: any) => void
+  off: (event: string, handler: any) => void
   chainId: string
 }
 
 interface SubscriptionMessage {
-  type: 'eth_subscription',
+  type: 'eth_subscription'
   data: {
-    subscription: string,
+    subscription: string
     result: Block
   }
 }
 
 interface Block {
-  number: string,
-  hash: string | null,
-  parentHash: string,
-  nonce: string | null,
-  sha3Uncles: string,
-  logsBloom: string | null,
-  transactionsRoot: string,
-  stateRoot: string,
-  miner: string,
-  difficulty: BigNumber,
-  totalDifficulty: BigNumber,
-  extraData: string,
-  size: number,
-  gasLimit: number,
-  gasUsed: number,
-  timestamp: number,
-  uncles: string[],
+  number: string
+  hash: string | null
+  parentHash: string
+  nonce: string | null
+  sha3Uncles: string
+  logsBloom: string | null
+  transactionsRoot: string
+  stateRoot: string
+  miner: string
+  difficulty: BigNumber
+  totalDifficulty: BigNumber
+  extraData: string
+  size: number
+  gasLimit: number
+  gasUsed: number
+  timestamp: number
+  uncles: string[]
 }
 
 class BlockMonitor extends EventEmitter {
@@ -45,7 +45,7 @@ class BlockMonitor extends EventEmitter {
 
   latestBlock: string
 
-  constructor (connection: Connection) {
+  constructor(connection: Connection) {
     super()
 
     this.start = this.start.bind(this)
@@ -63,23 +63,24 @@ class BlockMonitor extends EventEmitter {
     this.connection.on('close', this.stop)
   }
 
-  start () {
+  start() {
     this.connection.on('message', this.handleMessage)
 
     // load the latest block first on connect, then start checking for new blocks
     this.getLatestBlock()
 
-    this.connection.send({ id: 1, jsonrpc: '2.0', method: 'eth_subscribe', params: ['newHeads'] })
-      .then(subId => this.subscriptionId = subId)
-      .catch(err => {
+    this.connection
+      .send({ id: 1, jsonrpc: '2.0', method: 'eth_subscribe', params: ['newHeads'] })
+      .then((subId) => (this.subscriptionId = subId))
+      .catch((err) => {
         // subscriptions are not supported, poll for block changes instead
         this._clearSubscription()
-        
+
         this.poller = setInterval(this.getLatestBlock, 15 * 1000)
       })
   }
 
-  stop () {
+  stop() {
     if (this.subscriptionId) {
       this._clearSubscription()
     }
@@ -89,32 +90,32 @@ class BlockMonitor extends EventEmitter {
     }
   }
 
-  _clearSubscription () {
+  _clearSubscription() {
     this.connection.off('message', this.handleMessage)
     this.subscriptionId = ''
   }
 
-  _stopPoller () {
+  _stopPoller() {
     clearInterval(<NodeJS.Timeout>this.poller)
     this.poller = undefined
   }
 
-  getLatestBlock () {
+  getLatestBlock() {
     this.connection
       .send({ id: 1, jsonrpc: '2.0', method: 'eth_getBlockByNumber', params: ['latest', false] })
       .then(this.handleBlock)
-      .catch(err => {
+      .catch((err) => {
         log.error(`Could not load block for chain ${this.connection.chainId}`, err)
       })
   }
 
-  handleMessage (message: SubscriptionMessage) {
+  handleMessage(message: SubscriptionMessage) {
     if (message.type === 'eth_subscription' && message.data.subscription === this.subscriptionId) {
       this.handleBlock(message.data.result)
     }
   }
 
-  handleBlock (block: Block) {
+  handleBlock(block: Block) {
     if (!block) return log.error('handleBlock received undefined block')
     if (block.number !== this.latestBlock) {
       this.latestBlock = block.number
diff --git a/main/chains/config/index.ts b/main/chains/config/index.ts
index e784a12f4..e445ef03d 100644
--- a/main/chains/config/index.ts
+++ b/main/chains/config/index.ts
@@ -1,7 +1,7 @@
 import { BN } from 'ethereumjs-util'
 import Common from '@ethereumjs/common'
 
-function chainConfig (chain: number, hardfork: string) {
+function chainConfig(chain: number, hardfork: string) {
   const chainId = new BN(chain)
 
   return Common.isSupportedChainId(chainId)
diff --git a/main/chains/index.d.ts b/main/chains/index.d.ts
index 8a6bb3ea7..899b5597c 100644
--- a/main/chains/index.d.ts
+++ b/main/chains/index.d.ts
@@ -3,7 +3,7 @@ import { chainsType } from '@ethereumjs/common/dist/types'
 import { EventEmitter } from 'stream'
 
 export interface Chain {
-  id: number,
+  id: number
   type: 'ethereum'
 }
 
@@ -12,12 +12,12 @@ declare class Chains extends EventEmitter {
   connections: {
     ethereum: {
       [chainId: string]: {
-        type: string,
-        chainId: string,
-        chainConfig: Common,
+        type: string
+        chainId: string
+        chainConfig: Common
         primary: {
           connected: boolean
-        },
+        }
         secondary: {
           connected: boolean
         }
@@ -25,8 +25,8 @@ declare class Chains extends EventEmitter {
     }
   }
 
-  syncDataEmit (data: any): void;
-  send (payload: JSONRPCRequestPayload, cb: RPCRequestCallback, targetChain?: Chain): void;
+  syncDataEmit(data: any): void
+  send(payload: JSONRPCRequestPayload, cb: RPCRequestCallback, targetChain?: Chain): void
 }
 
 declare const chainConnection: Chains
diff --git a/main/chains/index.js b/main/chains/index.js
index 642ea4d62..3ef20ed2f 100644
--- a/main/chains/index.js
+++ b/main/chains/index.js
@@ -18,14 +18,15 @@ const { capitalize } = require('../../resources/utils')
 // and ethereumjs/common to determine the state of various EIPs
 const legacyChains = [250, 4002]
 
-const resError = (error, payload, res) => res({ 
-  id: payload.id, 
-  jsonrpc: payload.jsonrpc, 
-  error: typeof error === 'string' ? { message: error, code: -1 } : error
-})
+const resError = (error, payload, res) =>
+  res({
+    id: payload.id,
+    jsonrpc: payload.jsonrpc,
+    error: typeof error === 'string' ? { message: error, code: -1 } : error,
+  })
 
 class ChainConnection extends EventEmitter {
-  constructor (type, chainId) {
+  constructor(type, chainId) {
     super()
     this.type = type
     this.chainId = chainId
@@ -39,7 +40,7 @@ class ChainConnection extends EventEmitter {
       network: '',
       type: '',
       currentTarget: '',
-      connected: false
+      connected: false,
     }
 
     this.secondary = {
@@ -47,7 +48,7 @@ class ChainConnection extends EventEmitter {
       network: '',
       type: '',
       currentTarget: '',
-      connected: false
+      connected: false,
     }
 
     this.observer = store.observer(() => {
@@ -56,23 +57,26 @@ class ChainConnection extends EventEmitter {
     })
   }
 
-  _createProvider (target, priority) {
+  _createProvider(target, priority) {
     this.update(priority)
 
-    this[priority].provider = provider(target, { name: priority, infuraId: '786ade30f36244469480aa5c2bf0743b' })
+    this[priority].provider = provider(target, {
+      name: priority,
+      infuraId: '786ade30f36244469480aa5c2bf0743b',
+    })
     this[priority].blockMonitor = this._createBlockMonitor(this[priority].provider, priority)
   }
 
-  _handleConnection (priority) {
+  _handleConnection(priority) {
     this.update(priority)
     this.emit('connect')
   }
 
-  _createBlockMonitor (provider) {
+  _createBlockMonitor(provider) {
     const monitor = new BlockMonitor(provider)
     const allowEip1559 = !legacyChains.includes(parseInt(this.chainId))
 
-    monitor.on('data', async block => {
+    monitor.on('data', async (block) => {
       let feeMarket = null
 
       const gasCalculator = new GasCalculator(provider)
@@ -107,7 +111,7 @@ class ChainConnection extends EventEmitter {
 
           store.setGasPrices(this.type, this.chainId, {
             ...gas,
-            custom: customLevel || gas.fast
+            custom: customLevel || gas.fast,
           })
         }
 
@@ -116,12 +120,16 @@ class ChainConnection extends EventEmitter {
 
         this.emit('update', { type: 'fees', chainId: parseInt(this.chainId) })
       } catch (e) {
-        log.error(`could not update gas prices for chain ${this.chainId}`, { feeMarket, chainConfig: this.chainConfig }, e)
+        log.error(
+          `could not update gas prices for chain ${this.chainId}`,
+          { feeMarket, chainConfig: this.chainConfig },
+          e
+        )
       }
     })
   }
 
-  update (priority) {
+  update(priority) {
     const network = store('main.networks', this.type, this.chainId)
 
     if (!network) {
@@ -143,7 +151,7 @@ class ChainConnection extends EventEmitter {
     }
   }
 
-  getNetwork (provider, cb) {
+  getNetwork(provider, cb) {
     provider.sendAsync({ jsonrpc: '2.0', method: 'eth_chainId', params: [], id: 1 }, (err, response) => {
       try {
         response.result = !err && response && !response.error ? parseInt(response.result, 'hex').toString() : ''
@@ -154,11 +162,11 @@ class ChainConnection extends EventEmitter {
     })
   }
 
-  getNodeType (provider, cb) { 
-    provider.sendAsync({ jsonrpc: '2.0', method: 'web3_clientVersion', params: [], id: 1 }, cb) 
+  getNodeType(provider, cb) {
+    provider.sendAsync({ jsonrpc: '2.0', method: 'web3_clientVersion', params: [], id: 1 }, cb)
   }
 
-  resetConnection (priority /* 'primary' | 'secondary' */, status, target) {
+  resetConnection(priority /* 'primary' | 'secondary' */, status, target) {
     const provider = this[priority].provider
 
     this.killProvider(provider)
@@ -182,17 +190,17 @@ class ChainConnection extends EventEmitter {
     }
   }
 
-  killProvider (provider) {
+  killProvider(provider) {
     if (provider) {
       provider.close()
       provider.removeAllListeners()
     }
   }
 
-  connect (chain) {
+  connect(chain) {
     const connection = chain.connection
 
-    log.info(this.type + ':' + this.chainId + '\'s connection has been updated')
+    log.info(this.type + ':' + this.chainId + "'s connection has been updated")
 
     if (this.network !== connection.network) {
       this.killProvider(this.primary.provider)
@@ -225,7 +233,9 @@ class ChainConnection extends EventEmitter {
         // if no target is provided automatically set state to disconnected
         this.resetConnection('secondary', 'disconnected')
       } else if (!this.secondary.provider || this.secondary.currentTarget !== secondaryTarget) {
-        log.info('Creating secondary connection because it didn\'t exist or the target changed', { secondaryTarget })
+        log.info("Creating secondary connection because it didn't exist or the target changed", {
+          secondaryTarget,
+        })
 
         this.resetConnection('secondary', 'loading', secondaryTarget)
         this._createProvider(secondaryTarget, 'secondary')
@@ -263,7 +273,7 @@ class ChainConnection extends EventEmitter {
           this.update('secondary')
           this.emit('close')
         })
-        this.secondary.provider.on('status', status => {
+        this.secondary.provider.on('status', (status) => {
           if (status === 'connected' && this.secondary.network && this.secondary.network !== this.chainId) {
             this.secondary.connected = false
             this.secondary.type = ''
@@ -274,8 +284,8 @@ class ChainConnection extends EventEmitter {
             this.update('secondary')
           }
         })
-        this.secondary.provider.on('data', data => this.emit('data', data))
-        this.secondary.provider.on('error', err => this.emit('error', err))
+        this.secondary.provider.on('data', (data) => this.emit('data', data))
+        this.secondary.provider.on('error', (err) => this.emit('error', err))
       }
     } else {
       // Secondary connection is set to OFF by the user
@@ -293,7 +303,9 @@ class ChainConnection extends EventEmitter {
         // if no target is provided automatically set state to disconnected
         this.resetConnection('primary', 'disconnected')
       } else if (!this.primary.provider || this.primary.currentTarget !== primaryTarget) {
-        log.info('Creating primary connection because it didn\'t exist or the target changed', { primaryTarget })
+        log.info("Creating primary connection because it didn't exist or the target changed", {
+          primaryTarget,
+        })
 
         this.resetConnection('primary', 'loading', primaryTarget)
         this._createProvider(primaryTarget, 'primary')
@@ -332,7 +344,7 @@ class ChainConnection extends EventEmitter {
           this.update('primary')
           this.emit('close')
         })
-        this.primary.provider.on('status', status => {
+        this.primary.provider.on('status', (status) => {
           if (status === 'connected' && this.primary.network && this.primary.network !== this.chainId) {
             this.primary.connected = false
             this.primary.type = ''
@@ -343,8 +355,8 @@ class ChainConnection extends EventEmitter {
             this.update('primary')
           }
         })
-        this.primary.provider.on('data', data => this.emit('data', data))
-        this.primary.provider.on('error', err => this.emit('error', err))
+        this.primary.provider.on('data', (data) => this.emit('data', data))
+        this.primary.provider.on('error', (err) => this.emit('error', err))
       }
     } else {
       log.info('Primary connection: OFF')
@@ -352,7 +364,7 @@ class ChainConnection extends EventEmitter {
     }
   }
 
-  close (update = true) {
+  close(update = true) {
     if (this.observer) this.observer.remove()
 
     this.killProvider(this.primary.provider)
@@ -369,7 +381,7 @@ class ChainConnection extends EventEmitter {
     }
   }
 
-  send (payload, res) {
+  send(payload, res) {
     if (this.primary.provider && this.primary.connected) {
       this.primary.provider.sendAsync(payload, (err, result) => {
         if (err) return resError(err, payload, res)
@@ -387,15 +399,15 @@ class ChainConnection extends EventEmitter {
 }
 
 class Chains extends EventEmitter {
-  constructor () {
+  constructor() {
     super()
     this.connections = {}
 
     store.observer(() => {
       const networks = store('main.networks')
 
-      Object.keys(this.connections).forEach(type => {
-        Object.keys(this.connections[type]).forEach(chainId => {
+      Object.keys(this.connections).forEach((type) => {
+        Object.keys(this.connections[type]).forEach((chainId) => {
           if (!networks[type][chainId]) {
             this.connections[type][chainId].removeAllListeners()
             this.connections[type][chainId].close(false)
@@ -404,9 +416,9 @@ class Chains extends EventEmitter {
         })
       })
 
-      Object.keys(networks).forEach(type => {
+      Object.keys(networks).forEach((type) => {
         this.connections[type] = this.connections[type] || {}
-        Object.keys(networks[type]).forEach(chainId => {
+        Object.keys(networks[type]).forEach((chainId) => {
           const chainConfig = networks[type][chainId]
           if (chainConfig.on && !this.connections[type][chainId]) {
             this.connections[type][chainId] = new ChainConnection(type, chainId)
@@ -440,19 +452,26 @@ class Chains extends EventEmitter {
     })
   }
 
-  send (payload, res, targetChain) {
+  send(payload, res, targetChain) {
     if (!targetChain) {
       resError({ message: `Target chain did not exist for send`, code: -32601 }, payload, res)
-    }    
+    }
     const { type, id } = targetChain
     if (!this.connections[type] || !this.connections[type][id]) {
-      resError({ message: `Connection for ${type} chain with chainId ${id} did not exist for send`, code: -32601 }, payload, res)
+      resError(
+        {
+          message: `Connection for ${type} chain with chainId ${id} did not exist for send`,
+          code: -32601,
+        },
+        payload,
+        res
+      )
     } else {
       this.connections[type][id].send(payload, res)
     }
   }
 
-  syncDataEmit (emitter) {
+  syncDataEmit(emitter) {
     this.syncDataEmitter = emitter
   }
 
diff --git a/main/contracts/erc20.ts b/main/contracts/erc20.ts
index 43ac2086d..329462daf 100644
--- a/main/contracts/erc20.ts
+++ b/main/contracts/erc20.ts
@@ -5,42 +5,47 @@ import log from 'electron-log'
 import erc20Abi from '../externalData/balances/erc-20-abi'
 import type { Provider } from '../provider'
 
-function createWeb3ProviderWrapper (chainId: string, provider: Provider) {
-  const wrappedSend = (request: { method: string, params?: any[] }, cb: (error: any, response: any) => void) => {
-    provider.sendAsync({
-      method: request.method,
-      params: request.params || [],
-      id: 1,
-      jsonrpc: '2.0',
-      _origin: 'frame-internal',
-      chainId
-    }, cb)
+function createWeb3ProviderWrapper(chainId: string, provider: Provider) {
+  const wrappedSend = (request: { method: string; params?: any[] }, cb: (error: any, response: any) => void) => {
+    provider.sendAsync(
+      {
+        method: request.method,
+        params: request.params || [],
+        id: 1,
+        jsonrpc: '2.0',
+        _origin: 'frame-internal',
+        chainId,
+      },
+      cb
+    )
   }
 
   return {
     sendAsync: wrappedSend,
-    send: wrappedSend
+    send: wrappedSend,
   }
 }
 
 export default class Erc20Contract {
   private contract: Contract
 
-  constructor (address: Address, chainId: string, provider: Provider) {
+  constructor(address: Address, chainId: string, provider: Provider) {
     const web3Provider = new Web3Provider(createWeb3ProviderWrapper(chainId, provider))
     this.contract = new Contract(address, erc20Abi, web3Provider)
   }
 
-  static isApproval (data: TransactionDescription) {
+  static isApproval(data: TransactionDescription) {
     return (
       data.name === 'approve' &&
       data.functionFragment.inputs.length === 2 &&
-      (data.functionFragment.inputs[0].name || '').toLowerCase().endsWith('spender') && data.functionFragment.inputs[0].type === 'address' &&
-      (data.functionFragment.inputs[1].name || '').toLowerCase().endsWith('value') && data.functionFragment.inputs[1].type === 'uint256'
+      (data.functionFragment.inputs[0].name || '').toLowerCase().endsWith('spender') &&
+      data.functionFragment.inputs[0].type === 'address' &&
+      (data.functionFragment.inputs[1].name || '').toLowerCase().endsWith('value') &&
+      data.functionFragment.inputs[1].type === 'uint256'
     )
   }
 
-  decodeCallData (calldata: string) {
+  decodeCallData(calldata: string) {
     try {
       return this.contract.interface.parseTransaction({ data: calldata })
     } catch (e) {
@@ -48,29 +53,25 @@ export default class Erc20Contract {
     }
   }
 
-  encodeCallData (fn: string, params: any[]) {
+  encodeCallData(fn: string, params: any[]) {
     return this.contract.interface.encodeFunctionData(fn, params)
   }
-  
-  async getTokenData () {
+
+  async getTokenData() {
     try {
-      const calls = await Promise.all([
-        this.contract.decimals(),
-        this.contract.name(),
-        this.contract.symbol()
-      ])
+      const calls = await Promise.all([this.contract.decimals(), this.contract.name(), this.contract.symbol()])
 
       return {
         decimals: calls[0],
         name: calls[1],
-        symbol: calls[2]
+        symbol: calls[2],
       }
     } catch (e) {
       log.error(`getTokenData error: ${e}`)
       return {
         decimals: 0,
         name: '',
-        symbol: ''
+        symbol: '',
       }
     }
   }
diff --git a/main/contracts/index.ts b/main/contracts/index.ts
index 4dfdc84d0..69f9d838b 100644
--- a/main/contracts/index.ts
+++ b/main/contracts/index.ts
@@ -6,37 +6,37 @@ import erc20 from '../externalData/balances/erc-20-abi'
 const erc20Abi = JSON.stringify(erc20)
 
 interface EtherscanSourceCodeResponse {
-  status: string,
-  message: string,
+  status: string
+  message: string
   result: ContractSourceCodeResult[]
 }
 
 interface ContractSourceCodeResult {
-  SourceCode: string,
-  ABI: string,
-  ContractName: string,
+  SourceCode: string
+  ABI: string
+  ContractName: string
   Implementation: string
 }
 
 interface ContractSource {
-  abi: string,
-  name: string,
+  abi: string
+  name: string
   source: string
 }
 
 export interface DecodedCallData {
-  contractAddress: string,
-  contractName: string,
-  source: string,
-  method: string,
+  contractAddress: string
+  contractName: string
+  source: string
+  method: string
   args: Array<{
-    name: string,
-    type: string,
+    name: string
+    type: string
     value: string
   }>
 }
 
-function parseAbi (abiData: string): Interface | undefined {
+function parseAbi(abiData: string): Interface | undefined {
   try {
     return new Interface(abiData)
   } catch (e) {
@@ -44,8 +44,10 @@ function parseAbi (abiData: string): Interface | undefined {
   }
 }
 
-async function fetchSourceCode (contractAddress: Address) {
-  const res = await fetch(`https://api.etherscan.io/api?module=contract&action=getsourcecode&address=${contractAddress}&apikey=3SYU5MW5QK8RPCJV1XVICHWKT774993S24`)
+async function fetchSourceCode(contractAddress: Address) {
+  const res = await fetch(
+    `https://api.etherscan.io/api?module=contract&action=getsourcecode&address=${contractAddress}&apikey=3SYU5MW5QK8RPCJV1XVICHWKT774993S24`
+  )
 
   if (res.status === 200 && (res.headers.get('content-type') || '').toLowerCase().includes('json')) {
     const parsedResponse = await (res.json() as Promise<EtherscanSourceCodeResponse>)
@@ -56,8 +58,7 @@ async function fetchSourceCode (contractAddress: Address) {
   return []
 }
 
-
-async function fetchAbi (contractAddress: Address): Promise<ContractSourceCodeResult | undefined> {
+async function fetchAbi(contractAddress: Address): Promise<ContractSourceCodeResult | undefined> {
   try {
     const sources = await fetchSourceCode(contractAddress)
 
@@ -77,7 +78,7 @@ async function fetchAbi (contractAddress: Address): Promise<ContractSourceCodeRe
   }
 }
 
-export function decodeCallData (calldata: string, abi: string) {
+export function decodeCallData(calldata: string, abi: string) {
   const contractInterface = parseAbi(abi)
 
   if (contractInterface) {
@@ -89,7 +90,11 @@ export function decodeCallData (calldata: string, abi: string) {
 
       return {
         method: abiMethod.name,
-        args: abiMethod.inputs.map((input, i) => ({ name: input.name, type: input.type, value: decoded[i].toString() }))
+        args: abiMethod.inputs.map((input, i) => ({
+          name: input.name,
+          type: input.type,
+          value: decoded[i].toString(),
+        })),
       }
     } catch (e) {
       log.warn('unknown ABI method for signature', sighash)
@@ -97,12 +102,19 @@ export function decodeCallData (calldata: string, abi: string) {
   }
 }
 
-export async function decodeContractCall (contractAddress: Address, calldata: string): Promise<DecodedCallData | undefined> {
+export async function decodeContractCall(
+  contractAddress: Address,
+  calldata: string
+): Promise<DecodedCallData | undefined> {
   const contractSources: ContractSource[] = [{ name: 'ERC-20', source: 'erc-20 contract', abi: erc20Abi }]
   const contractSource = await fetchAbi(contractAddress)
 
   if (contractSource) {
-    contractSources.push({ name: contractSource.ContractName, source: 'etherscan', abi: contractSource.ABI })
+    contractSources.push({
+      name: contractSource.ContractName,
+      source: 'etherscan',
+      abi: contractSource.ABI,
+    })
   }
 
   for (const source of contractSources.reverse()) {
@@ -113,7 +125,7 @@ export async function decodeContractCall (contractAddress: Address, calldata: st
         contractAddress: contractAddress.toLowerCase(),
         contractName: source.name,
         source: source.source,
-        ...decodedCall
+        ...decodedCall,
       }
     }
   }
diff --git a/main/crypt/index.js b/main/crypt/index.js
index 2fa327db2..3fe5b4b59 100644
--- a/main/crypt/index.js
+++ b/main/crypt/index.js
@@ -1,6 +1,6 @@
 const crypto = require('crypto')
 
-const stringToKey = pass => {
+const stringToKey = (pass) => {
   const hash = crypto.createHash('sha256').update(pass)
   return Buffer.from(hash.digest('hex').substring(0, 32))
 }
diff --git a/main/crypt/typedDataUtils.js b/main/crypt/typedDataUtils.js
index da32f8f9b..bedcb3e28 100644
--- a/main/crypt/typedDataUtils.js
+++ b/main/crypt/typedDataUtils.js
@@ -9,15 +9,15 @@ const PRIMITIVE_TYPES = [
   /^address$/,
   /^bool$/,
   /^bytes$/,
-  /^string$/
+  /^string$/,
 ]
 
-function isPrimitiveType (type) {
-  return PRIMITIVE_TYPES.some(regex => regex.test(type))
+function isPrimitiveType(type) {
+  return PRIMITIVE_TYPES.some((regex) => regex.test(type))
 }
 
 // Recursively finds all the dependencies of a type
-function dependencies (primaryType, types, found = []) {
+function dependencies(primaryType, types, found = []) {
   if (found.includes(primaryType)) {
     return found
   }
@@ -38,10 +38,10 @@ function dependencies (primaryType, types, found = []) {
   return found
 }
 
-function encodeType (primaryType, types) {
+function encodeType(primaryType, types) {
   // Get dependencies primary first, then alphabetical
   let deps = dependencies(primaryType, types)
-  deps = deps.filter(t => t !== primaryType)
+  deps = deps.filter((t) => t !== primaryType)
   deps = [primaryType].concat(deps.sort())
 
   // Format as a string with fields
@@ -53,11 +53,11 @@ function encodeType (primaryType, types) {
   return Buffer.from(result)
 }
 
-function typeHash (primaryType, types) {
+function typeHash(primaryType, types) {
   return ethUtil.keccak256(encodeType(primaryType, types))
 }
 
-function encodeData (primaryType, types, data) {
+function encodeData(primaryType, types, data) {
   const encTypes = []
   const encValues = []
 
@@ -95,16 +95,16 @@ function encodeData (primaryType, types, data) {
   return abi.rawEncode(encTypes, encValues)
 }
 
-function structHash (primaryType, types, data) {
+function structHash(primaryType, types, data) {
   return ethUtil.keccak256(encodeData(primaryType, types, data))
 }
 
-function hashTypedData (typedData) {
+function hashTypedData(typedData) {
   return ethUtil.keccak256(
     Buffer.concat([
       Buffer.from('1901', 'hex'),
       structHash('EIP712Domain', typedData.types, typedData.domain),
-      structHash(typedData.primaryType, typedData.types, typedData.message)
+      structHash(typedData.primaryType, typedData.types, typedData.message),
     ])
   )
 }
diff --git a/main/dapps/index.ts b/main/dapps/index.ts
index 50a1ffbc7..d16f62732 100644
--- a/main/dapps/index.ts
+++ b/main/dapps/index.ts
@@ -9,11 +9,11 @@ import extractColors from '../windows/extractColors'
 
 const nebula = nebulaApi()
 
-function getDapp (dappId: string): Dapp {
+function getDapp(dappId: string): Dapp {
   return store('main.dapps', dappId)
 }
 
-async function getDappColors (dappId: string) {
+async function getDappColors(dappId: string) {
   const dapp = getDapp(dappId)
   const session = crypto.randomBytes(6).toString('hex')
   server.sessions.add(dapp.ens, session)
@@ -29,19 +29,19 @@ async function getDappColors (dappId: string) {
 }
 
 // TODO: change to correct manifest type one Nebula version with types are published
-async function updateDappContent (dappId: string, contentURI: string, manifest: any) {
+async function updateDappContent(dappId: string, contentURI: string, manifest: any) {
   // TODO: Make sure content is pinned before proceeding
   store.updateDapp(dappId, { content: contentURI, manifest })
 }
 
 let retryTimer: NodeJS.Timeout
-async function checkStatus (dappId: string) {
+async function checkStatus(dappId: string) {
   clearTimeout(retryTimer)
   const dapp = store('main.dapps', dappId)
-  try { 
+  try {
     const resolved = await nebula.resolve(dapp.ens)
 
-    const version = ((resolved.manifest || {}).version) || 'unknown'
+    const version = (resolved.manifest || {}).version || 'unknown'
 
     log.info(`resolved content for ${dapp.ens}, version: ${version}`)
 
@@ -56,7 +56,6 @@ async function checkStatus (dappId: string) {
 
     // The frame id 'dappLauncher' needs to refrence target frame
     if (dapp.openWhenReady) surface.open('dappLauncher', dapp.ens)
-
   } catch (e) {
     log.error('Check status error', e)
     const retry = dapp.checkStatusRetryCount || 0
@@ -71,29 +70,31 @@ async function checkStatus (dappId: string) {
 
   // Takes dapp entry and config
   // Checks if assets are correctly synced
-  // Checks if all assets are up to date with current manifest 
+  // Checks if all assets are up to date with current manifest
   // Installs new assets if changed and config is set to sync
   // Sets status to 'updating' when updating the bundle
   // Sets status to 'ready' when done
 
   // dapp.config // the user's prefrences for installing assets from the manifest
   // dapp.manifest // a copy of the latest manifest we have resolved for the dapp
-  // dapp.meta // meta info about the dapp including name, colors, icons, descriptions, 
+  // dapp.meta // meta info about the dapp including name, colors, icons, descriptions,
   // dapp.ens // ens name for this dapp
   // dapp.storage // local storage values for dapp
 }
 
 store.observer(() => {
   const dapps = store('main.dapps')
-  Object.keys(dapps || {}).filter(id => dapps[id].status === 'initial').forEach(id => {
-    store.updateDapp(id, { status: 'loading' })
-
-    if (nebula.ready()) {
-      checkStatus(id)
-    } else {
-      nebula.once('ready', () => checkStatus(id))
-    }
-  })
+  Object.keys(dapps || {})
+    .filter((id) => dapps[id].status === 'initial')
+    .forEach((id) => {
+      store.updateDapp(id, { status: 'loading' })
+
+      if (nebula.ready()) {
+        checkStatus(id)
+      } else {
+        nebula.once('ready', () => checkStatus(id))
+      }
+    })
 })
 
 let nextId = 0
@@ -118,13 +119,13 @@ const surface = {
     // If ens name has not been installed, start install
     store.appDapp({ id, ens, status, config, manifest: {}, current: {} })
   },
-  addServerSession (namehash: string /* , session */) {
+  addServerSession(namehash: string /* , session */) {
     // server.sessions.add(namehash, session)
   },
-  unsetCurrentView (frameId: string) {
+  unsetCurrentView(frameId: string) {
     store.setCurrentFrameView(frameId, '')
   },
-  open (frameId: string, ens: string) {
+  open(frameId: string, ens: string) {
     const session = crypto.randomBytes(6).toString('hex')
     const dappId = hash(ens)
 
@@ -137,7 +138,7 @@ const surface = {
         ready: false,
         dappId,
         ens,
-        url
+        url,
       }
 
       server.sessions.add(ens, session)
@@ -146,7 +147,7 @@ const surface = {
     } else {
       store.updateDapp(dappId, { ens, status: 'initial', openWhenReady: true })
     }
-  }
+  },
 }
 
 export default surface
diff --git a/main/dapps/server/asset/getType/index.js b/main/dapps/server/asset/getType/index.js
index 8bf398756..f599587eb 100644
--- a/main/dapps/server/asset/getType/index.js
+++ b/main/dapps/server/asset/getType/index.js
@@ -7,7 +7,7 @@ const types = {
   jpeg: 'image/jpeg',
   jpg: 'image/jpeg',
   gif: 'image/gif',
-  png: 'image/png'
+  png: 'image/png',
 }
 
-module.exports = path => types[path.substr(path.lastIndexOf('.') + 1)] || 'text/plain'
+module.exports = (path) => types[path.substr(path.lastIndexOf('.') + 1)] || 'text/plain'
diff --git a/main/dapps/server/asset/index.ts b/main/dapps/server/asset/index.ts
index a0951e0ea..a3504ce34 100644
--- a/main/dapps/server/asset/index.ts
+++ b/main/dapps/server/asset/index.ts
@@ -7,17 +7,18 @@ import { ServerResponse } from 'http'
 
 const nebula = nebulaApi()
 
-function error (res: ServerResponse, code: number, message: string) {
+function error(res: ServerResponse, code: number, message: string) {
   res.writeHead(code || 404)
   res.end(message)
 }
 
-function getCid (namehash: string): string {
+function getCid(namehash: string): string {
   return store(`main.dapps`, namehash, `content`)
 }
 
 export default {
-  stream: async (res: ServerResponse, namehash: string, path: string) => { // Stream assets from IPFS back to the client
+  stream: async (res: ServerResponse, namehash: string, path: string) => {
+    // Stream assets from IPFS back to the client
     let found = false
 
     const cid = getCid(namehash)
@@ -55,7 +56,8 @@ export default {
     // })
     // stream.on('error', err => error(res, err.statusCode, `For security reasons, please launch this app from Frame\n\n(${err.message})`))
   },
-  dapp: async (res: ServerResponse, namehash: string) => { // Resolve dapp via IPFS, inject functionality and send it back to the client
+  dapp: async (res: ServerResponse, namehash: string) => {
+    // Resolve dapp via IPFS, inject functionality and send it back to the client
     // if (!ipfs return error(res, 404, 'IPFS client not running')
     const cid = store('main.dapps', namehash, 'content')
     const index = await nebula.ipfs.getFile(`${cid}/index.html`)
@@ -71,7 +73,7 @@ export default {
     //   </script>
     // `)
     res.end($.html())
-  }
+  },
 }
 
 //   ipfs.get(`${cid}/index.html`, (err, files) => {
diff --git a/main/dapps/server/index.ts b/main/dapps/server/index.ts
index 9c7f6f84a..b9b13c49e 100644
--- a/main/dapps/server/index.ts
+++ b/main/dapps/server/index.ts
@@ -14,7 +14,7 @@ const server = http.createServer((req, res) => {
   const namehash = hash(ens)
   const session = req.headers.cookie ? cookie.parse(req.headers.cookie).__frameSession : ''
 
-  // check if dapp is added before progressing 
+  // check if dapp is added before progressing
   if (!store('main.dapps', namehash)) {
     res.writeHead(404)
     return res.end('Dapp not installed')
diff --git a/main/dapps/server/resolve/index.ts b/main/dapps/server/resolve/index.ts
index a3058715f..7f796d367 100644
--- a/main/dapps/server/resolve/index.ts
+++ b/main/dapps/server/resolve/index.ts
@@ -11,7 +11,7 @@ const resolve = {
     if (cid) return cid
     const resolved = await nebula.resolve(app)
     return resolved.record.content
-  }
+  },
 }
 
 export default resolve
diff --git a/main/dapps/server/sessions/index.ts b/main/dapps/server/sessions/index.ts
index e3d0ab7cb..ecfcc80ec 100644
--- a/main/dapps/server/sessions/index.ts
+++ b/main/dapps/server/sessions/index.ts
@@ -16,5 +16,5 @@ export default {
     app = app.replaceAll('.', '-')
     sessions[app].splice(sessions[app].indexOf(session), 1)
     if (sessions[app].length === 0) delete sessions[app]
-  }
+  },
 }
diff --git a/main/dapps/server/storage/index.js b/main/dapps/server/storage/index.js
index a616fb55b..4bc4d536d 100644
--- a/main/dapps/server/storage/index.js
+++ b/main/dapps/server/storage/index.js
@@ -1,9 +1,13 @@
 const store = require('../../../store').default
 
 module.exports = {
-  get: hash => store(`main.dapp.storage.${hash}`),
+  get: (hash) => store(`main.dapp.storage.${hash}`),
   update: (hash, state) => {
-    try { state = JSON.parse(state) } catch (e) { state = '' }
+    try {
+      state = JSON.parse(state)
+    } catch (e) {
+      state = ''
+    }
     store.setDappStorage(hash, state)
-  }
+  },
 }
diff --git a/main/ens/artifacts/addresses.js b/main/ens/artifacts/addresses.js
index 0601cd9b6..edbb7d09f 100644
--- a/main/ens/artifacts/addresses.js
+++ b/main/ens/artifacts/addresses.js
@@ -6,5 +6,5 @@ module.exports = {
   // Rinkeby
   4: '0x00000000000C2E074eC69A0dFb2997BA6C7d2e1e',
   // Goerli
-  5: '0x00000000000C2E074eC69A0dFb2997BA6C7d2e1e'
+  5: '0x00000000000C2E074eC69A0dFb2997BA6C7d2e1e',
 }
diff --git a/main/ens/artifacts/interfaces.js b/main/ens/artifacts/interfaces.js
index 16f2fd980..719130ae7 100644
--- a/main/ens/artifacts/interfaces.js
+++ b/main/ens/artifacts/interfaces.js
@@ -5,87 +5,87 @@ module.exports = {
       inputs: [
         {
           name: 'node',
-          type: 'bytes32'
-        }
+          type: 'bytes32',
+        },
       ],
       name: 'resolver',
       outputs: [
         {
           name: '',
-          type: 'address'
-        }
+          type: 'address',
+        },
       ],
-      type: 'function'
+      type: 'function',
     },
     {
       constant: true,
       inputs: [
         {
           name: 'node',
-          type: 'bytes32'
-        }
+          type: 'bytes32',
+        },
       ],
       name: 'owner',
       outputs: [
         {
           name: '',
-          type: 'address'
-        }
+          type: 'address',
+        },
       ],
-      type: 'function'
+      type: 'function',
     },
     {
       constant: false,
       inputs: [
         {
           name: 'node',
-          type: 'bytes32'
+          type: 'bytes32',
         },
         {
           name: 'resolver',
-          type: 'address'
-        }
+          type: 'address',
+        },
       ],
       name: 'setResolver',
       outputs: [],
-      type: 'function'
+      type: 'function',
     },
     {
       constant: false,
       inputs: [
         {
           name: 'node',
-          type: 'bytes32'
+          type: 'bytes32',
         },
         {
           name: 'label',
-          type: 'bytes32'
+          type: 'bytes32',
         },
         {
           name: 'owner',
-          type: 'address'
-        }
+          type: 'address',
+        },
       ],
       name: 'setSubnodeOwner',
       outputs: [],
-      type: 'function'
+      type: 'function',
     },
     {
       constant: false,
       inputs: [
         {
           name: 'node',
-          type: 'bytes32'
+          type: 'bytes32',
         },
         {
           name: 'owner',
-          type: 'address'
-        }
+          type: 'address',
+        },
       ],
       name: 'setOwner',
       outputs: [],
-      type: 'function'
-    }
+      type: 'function',
+    },
   ],
   resolver: [
     {
@@ -93,280 +93,280 @@ module.exports = {
       inputs: [
         {
           name: 'interfaceID',
-          type: 'bytes4'
-        }
+          type: 'bytes4',
+        },
       ],
       name: 'supportsInterface',
       outputs: [
         {
           name: '',
-          type: 'bool'
-        }
+          type: 'bool',
+        },
       ],
       payable: false,
       stateMutability: 'pure',
-      type: 'function'
+      type: 'function',
     },
     {
       constant: false,
       inputs: [
         {
           name: 'node',
-          type: 'bytes32'
+          type: 'bytes32',
         },
         {
           name: 'key',
-          type: 'string'
+          type: 'string',
         },
         {
           name: 'value',
-          type: 'string'
-        }
+          type: 'string',
+        },
       ],
       name: 'setText',
       outputs: [],
       payable: false,
       stateMutability: 'nonpayable',
-      type: 'function'
+      type: 'function',
     },
     {
       constant: true,
       inputs: [
         {
           name: 'node',
-          type: 'bytes32'
+          type: 'bytes32',
         },
         {
           name: 'contentTypes',
-          type: 'uint256'
-        }
+          type: 'uint256',
+        },
       ],
       name: 'ABI',
       outputs: [
         {
           name: 'contentType',
-          type: 'uint256'
+          type: 'uint256',
         },
         {
           name: 'data',
-          type: 'bytes'
-        }
+          type: 'bytes',
+        },
       ],
       payable: false,
       stateMutability: 'view',
-      type: 'function'
+      type: 'function',
     },
     {
       constant: false,
       inputs: [
         {
           name: 'node',
-          type: 'bytes32'
+          type: 'bytes32',
         },
         {
           name: 'x',
-          type: 'bytes32'
+          type: 'bytes32',
         },
         {
           name: 'y',
-          type: 'bytes32'
-        }
+          type: 'bytes32',
+        },
       ],
       name: 'setPubkey',
       outputs: [],
       payable: false,
       stateMutability: 'nonpayable',
-      type: 'function'
+      type: 'function',
     },
     {
       constant: false,
       inputs: [
         {
           name: 'node',
-          type: 'bytes32'
+          type: 'bytes32',
         },
         {
           name: 'hash',
-          type: 'bytes'
-        }
+          type: 'bytes',
+        },
       ],
       name: 'setContenthash',
       outputs: [],
       payable: false,
       stateMutability: 'nonpayable',
-      type: 'function'
+      type: 'function',
     },
     {
       constant: true,
       inputs: [
         {
           name: 'node',
-          type: 'bytes32'
-        }
+          type: 'bytes32',
+        },
       ],
       name: 'addr',
       outputs: [
         {
           name: '',
-          type: 'address'
-        }
+          type: 'address',
+        },
       ],
       payable: false,
       stateMutability: 'view',
-      type: 'function'
+      type: 'function',
     },
     {
       constant: true,
       inputs: [
         {
           name: 'node',
-          type: 'bytes32'
+          type: 'bytes32',
         },
         {
           name: 'key',
-          type: 'string'
-        }
+          type: 'string',
+        },
       ],
       name: 'text',
       outputs: [
         {
           name: '',
-          type: 'string'
-        }
+          type: 'string',
+        },
       ],
       payable: false,
       stateMutability: 'view',
-      type: 'function'
+      type: 'function',
     },
     {
       constant: false,
       inputs: [
         {
           name: 'node',
-          type: 'bytes32'
+          type: 'bytes32',
         },
         {
           name: 'contentType',
-          type: 'uint256'
+          type: 'uint256',
         },
         {
           name: 'data',
-          type: 'bytes'
-        }
+          type: 'bytes',
+        },
       ],
       name: 'setABI',
       outputs: [],
       payable: false,
       stateMutability: 'nonpayable',
-      type: 'function'
+      type: 'function',
     },
     {
       constant: true,
       inputs: [
         {
           name: 'node',
-          type: 'bytes32'
-        }
+          type: 'bytes32',
+        },
       ],
       name: 'name',
       outputs: [
         {
           name: '',
-          type: 'string'
-        }
+          type: 'string',
+        },
       ],
       payable: false,
       stateMutability: 'view',
-      type: 'function'
+      type: 'function',
     },
     {
       constant: false,
       inputs: [
         {
           name: 'node',
-          type: 'bytes32'
+          type: 'bytes32',
         },
         {
           name: 'name',
-          type: 'string'
-        }
+          type: 'string',
+        },
       ],
       name: 'setName',
       outputs: [],
       payable: false,
       stateMutability: 'nonpayable',
-      type: 'function'
+      type: 'function',
     },
     {
       constant: true,
       inputs: [
         {
           name: 'node',
-          type: 'bytes32'
-        }
+          type: 'bytes32',
+        },
       ],
       name: 'contenthash',
       outputs: [
         {
           name: '',
-          type: 'bytes'
-        }
+          type: 'bytes',
+        },
       ],
       payable: false,
       stateMutability: 'view',
-      type: 'function'
+      type: 'function',
     },
     {
       constant: true,
       inputs: [
         {
           name: 'node',
-          type: 'bytes32'
-        }
+          type: 'bytes32',
+        },
       ],
       name: 'pubkey',
       outputs: [
         {
           name: 'x',
-          type: 'bytes32'
+          type: 'bytes32',
         },
         {
           name: 'y',
-          type: 'bytes32'
-        }
+          type: 'bytes32',
+        },
       ],
       payable: false,
       stateMutability: 'view',
-      type: 'function'
+      type: 'function',
     },
     {
       constant: false,
       inputs: [
         {
           name: 'node',
-          type: 'bytes32'
+          type: 'bytes32',
         },
         {
           name: 'addr',
-          type: 'address'
-        }
+          type: 'address',
+        },
       ],
       name: 'setAddr',
       outputs: [],
       payable: false,
       stateMutability: 'nonpayable',
-      type: 'function'
+      type: 'function',
     },
     {
       inputs: [
         {
           name: 'ensAddr',
-          type: 'address'
-        }
+          type: 'address',
+        },
       ],
       payable: false,
       stateMutability: 'nonpayable',
-      type: 'constructor'
+      type: 'constructor',
     },
     {
       anonymous: false,
@@ -374,16 +374,16 @@ module.exports = {
         {
           indexed: true,
           name: 'node',
-          type: 'bytes32'
+          type: 'bytes32',
         },
         {
           indexed: false,
           name: 'a',
-          type: 'address'
-        }
+          type: 'address',
+        },
       ],
       name: 'AddrChanged',
-      type: 'event'
+      type: 'event',
     },
     {
       anonymous: false,
@@ -391,16 +391,16 @@ module.exports = {
         {
           indexed: true,
           name: 'node',
-          type: 'bytes32'
+          type: 'bytes32',
         },
         {
           indexed: false,
           name: 'name',
-          type: 'string'
-        }
+          type: 'string',
+        },
       ],
       name: 'NameChanged',
-      type: 'event'
+      type: 'event',
     },
     {
       anonymous: false,
@@ -408,16 +408,16 @@ module.exports = {
         {
           indexed: true,
           name: 'node',
-          type: 'bytes32'
+          type: 'bytes32',
         },
         {
           indexed: true,
           name: 'contentType',
-          type: 'uint256'
-        }
+          type: 'uint256',
+        },
       ],
       name: 'ABIChanged',
-      type: 'event'
+      type: 'event',
     },
     {
       anonymous: false,
@@ -425,21 +425,21 @@ module.exports = {
         {
           indexed: true,
           name: 'node',
-          type: 'bytes32'
+          type: 'bytes32',
         },
         {
           indexed: false,
           name: 'x',
-          type: 'bytes32'
+          type: 'bytes32',
         },
         {
           indexed: false,
           name: 'y',
-          type: 'bytes32'
-        }
+          type: 'bytes32',
+        },
       ],
       name: 'PubkeyChanged',
-      type: 'event'
+      type: 'event',
     },
     {
       anonymous: false,
@@ -447,21 +447,21 @@ module.exports = {
         {
           indexed: true,
           name: 'node',
-          type: 'bytes32'
+          type: 'bytes32',
         },
         {
           indexed: false,
           name: 'indexedKey',
-          type: 'string'
+          type: 'string',
         },
         {
           indexed: false,
           name: 'key',
-          type: 'string'
-        }
+          type: 'string',
+        },
       ],
       name: 'TextChanged',
-      type: 'event'
+      type: 'event',
     },
     {
       anonymous: false,
@@ -469,16 +469,16 @@ module.exports = {
         {
           indexed: true,
           name: 'node',
-          type: 'bytes32'
+          type: 'bytes32',
         },
         {
           indexed: false,
           name: 'hash',
-          type: 'bytes'
-        }
+          type: 'bytes',
+        },
       ],
       name: 'ContenthashChanged',
-      type: 'event'
-    }
-  ]
+      type: 'event',
+    },
+  ],
 }
diff --git a/main/externalData/assets/index.ts b/main/externalData/assets/index.ts
index a0af3a58e..7a1fc66ac 100644
--- a/main/externalData/assets/index.ts
+++ b/main/externalData/assets/index.ts
@@ -4,64 +4,65 @@ import Pylon, { AssetType } from '@framelabs/pylon-client'
 import { AssetId } from '@framelabs/pylon-client/dist/assetId'
 
 interface RateUpdate {
-  id: AssetId,
+  id: AssetId
   data: {
-    usd: number,
+    usd: number
     usd_24h_change: number
   }
 }
 
 interface ChainUpdate {
-  id: number,
+  id: number
   data: {
-    chainId: number,
+    chainId: number
     nativeCurrency: {
-      iconURI: string,
+      iconURI: string
       name: string
     }
   }
 }
 
-export default function rates (pylon: Pylon, store: Store) {
+export default function rates(pylon: Pylon, store: Store) {
   const storeApi = {
     getKnownTokens: (address?: Address) => ((address && store('main.tokens.known', address)) || []) as Token[],
-    setNativeCurrencyData: (chainId: number, currencyData: Currency) => store.setNativeCurrencyData('ethereum', chainId, currencyData),
+    setNativeCurrencyData: (chainId: number, currencyData: Currency) =>
+      store.setNativeCurrencyData('ethereum', chainId, currencyData),
     setNativeCurrencyRate: (chainId: number, rate: Rate) => store.setNativeCurrencyData('ethereum', chainId, rate),
-    setTokenRates: (rates: Record<Address, Rate>) => store.setRates(rates)
+    setTokenRates: (rates: Record<Address, Rate>) => store.setRates(rates),
   }
 
-  function handleRatesUpdates (updates: RateUpdate[]) {
+  function handleRatesUpdates(updates: RateUpdate[]) {
     if (updates.length === 0) return
 
-    const nativeCurrencyUpdates = updates.filter(u => u.id.type === AssetType.NativeCurrency)
+    const nativeCurrencyUpdates = updates.filter((u) => u.id.type === AssetType.NativeCurrency)
 
     if (nativeCurrencyUpdates.length > 0) {
-      log.debug(`got currency rate updates for chains: ${nativeCurrencyUpdates.map(u => u.id.chainId)}`)
-      
-      nativeCurrencyUpdates.forEach(u => {
+      log.debug(`got currency rate updates for chains: ${nativeCurrencyUpdates.map((u) => u.id.chainId)}`)
+
+      nativeCurrencyUpdates.forEach((u) => {
         storeApi.setNativeCurrencyRate(u.id.chainId, {
           usd: {
             price: u.data.usd,
-            change24hr: u.data.usd_24h_change
-          }
+            change24hr: u.data.usd_24h_change,
+          },
         })
       })
     }
 
-    const tokenUpdates = updates.filter(u => u.id.type === AssetType.Token)
+    const tokenUpdates = updates.filter((u) => u.id.type === AssetType.Token)
 
     if (tokenUpdates.length > 0) {
-      log.debug(`got token rate updates for addresses: ${tokenUpdates.map(u => u.id.address)}`)
+      log.debug(`got token rate updates for addresses: ${tokenUpdates.map((u) => u.id.address)}`)
 
       const tokenRates = tokenUpdates.reduce((allRates, update) => {
         // address is always defined for tokens
         const address = update.id.address as string
-        
+
         allRates[address] = {
           usd: {
             price: update.data.usd,
-            change24hr: update.data.usd_24h_change
-          }
+            change24hr: update.data.usd_24h_change,
+          },
         }
 
         return allRates
@@ -71,38 +72,42 @@ export default function rates (pylon: Pylon, store: Store) {
     }
   }
 
-  function handleChainUpdates (updates: ChainUpdate[]) {
+  function handleChainUpdates(updates: ChainUpdate[]) {
     if (updates.length === 0) return
 
-    log.debug(`got chain updates for ${updates.map(u => u.id)}`)
+    log.debug(`got chain updates for ${updates.map((u) => u.id)}`)
 
-    updates.forEach(update => {
+    updates.forEach((update) => {
       storeApi.setNativeCurrencyData(update.data.chainId, {
         icon: update.data.nativeCurrency.iconURI,
-        name: update.data.nativeCurrency.name
+        name: update.data.nativeCurrency.name,
       })
     })
   }
 
-  function updateSubscription (chains: number[], address?: Address) {
-    const subscribedCurrencies = chains.map(chainId => ({ type: AssetType.NativeCurrency, chainId }))
-    const knownTokens = storeApi.getKnownTokens(address).filter(token => chains.includes(token.chainId))
-    const subscribedTokens = knownTokens.map(token => ({ type: AssetType.Token, chainId: token.chainId, address: token.address }))
-
-    setAssets([
-      ...subscribedCurrencies,
-      ...subscribedTokens
-    ])
+  function updateSubscription(chains: number[], address?: Address) {
+    const subscribedCurrencies = chains.map((chainId) => ({
+      type: AssetType.NativeCurrency,
+      chainId,
+    }))
+    const knownTokens = storeApi.getKnownTokens(address).filter((token) => chains.includes(token.chainId))
+    const subscribedTokens = knownTokens.map((token) => ({
+      type: AssetType.Token,
+      chainId: token.chainId,
+      address: token.address,
+    }))
+
+    setAssets([...subscribedCurrencies, ...subscribedTokens])
   }
 
-  function start () {
+  function start() {
     log.verbose('starting asset updates')
 
     pylon.on('rates', handleRatesUpdates)
     pylon.on('chains', handleChainUpdates)
   }
 
-  function stop () {
+  function stop() {
     log.verbose('stopping asset updates')
 
     pylon.off('rates', handleRatesUpdates)
@@ -112,11 +117,17 @@ export default function rates (pylon: Pylon, store: Store) {
     pylon.chains([])
   }
 
-  function setAssets (assetIds: AssetId[]) {
-    const chains = [...new Set(assetIds.map(id => id.chainId))]
-
-    log.verbose('subscribing to rates updates for native currencies on chains:', assetIds.filter(a => a.type === AssetType.NativeCurrency).map(a => a.chainId))
-    log.verbose('subscribing to rates updates for tokens:', assetIds.filter(a => a.type === AssetType.Token).map(a => a.address))
+  function setAssets(assetIds: AssetId[]) {
+    const chains = [...new Set(assetIds.map((id) => id.chainId))]
+
+    log.verbose(
+      'subscribing to rates updates for native currencies on chains:',
+      assetIds.filter((a) => a.type === AssetType.NativeCurrency).map((a) => a.chainId)
+    )
+    log.verbose(
+      'subscribing to rates updates for tokens:',
+      assetIds.filter((a) => a.type === AssetType.Token).map((a) => a.address)
+    )
     log.verbose('subscribing to chain updates for chains:', chains)
 
     pylon.rates(assetIds)
@@ -124,6 +135,9 @@ export default function rates (pylon: Pylon, store: Store) {
   }
 
   return {
-    start, stop, setAssets, updateSubscription
+    start,
+    stop,
+    setAssets,
+    updateSubscription,
   }
 }
diff --git a/main/externalData/balances/controller.ts b/main/externalData/balances/controller.ts
index 064d62b81..af24da190 100644
--- a/main/externalData/balances/controller.ts
+++ b/main/externalData/balances/controller.ts
@@ -10,14 +10,14 @@ interface WorkerMessage {
 }
 
 interface TokenBalanceMessage extends Omit<WorkerMessage, 'type'> {
-  type: 'tokenBalances',
-  address: Address,
+  type: 'tokenBalances'
+  address: Address
   balances: TokenBalance[]
 }
 
 interface ChainBalanceMessage extends Omit<WorkerMessage, 'type'> {
-  type: 'chainBalances',
-  address: Address,
+  type: 'chainBalances'
+  address: Address
   balances: CurrencyBalance[]
 }
 
@@ -26,7 +26,7 @@ export default class BalancesWorkerController extends EventEmitter {
 
   private heartbeat?: NodeJS.Timeout
 
-  constructor () {
+  constructor() {
     super()
 
     const workerArgs = process.env.NODE_ENV === 'development' ? ['--inspect=127.0.0.1:9230'] : []
@@ -46,16 +46,16 @@ export default class BalancesWorkerController extends EventEmitter {
       }
 
       if (message.type === 'chainBalances') {
-        const { address, balances } = (message as ChainBalanceMessage)
+        const { address, balances } = message as ChainBalanceMessage
         this.emit('chainBalances', address, balances)
       }
 
       if (message.type === 'tokenBalances') {
-        const { address, balances } = (message as TokenBalanceMessage)
+        const { address, balances } = message as TokenBalanceMessage
         this.emit('tokenBalances', address, balances)
       }
     })
-  
+
     this.worker.on('close', (code, signal) => {
       // emitted after exit or error and when all stdio streams are closed
       log.warn(`balances worker exited with code ${code}, signal: ${signal}, pid: ${this.worker.pid}`)
@@ -64,42 +64,42 @@ export default class BalancesWorkerController extends EventEmitter {
       this.emit('close')
       this.removeAllListeners()
     })
-  
+
     this.worker.on('disconnect', () => {
       log.warn(`balances worker disconnected`)
       this.stopWorker()
     })
 
-    this.worker.on('error', err => {
+    this.worker.on('error', (err) => {
       log.warn(`balances worker sent error, pid: ${this.worker.pid}`, err)
       this.stopWorker()
     })
   }
 
-  close () {
+  close() {
     log.info(`closing worker controller`)
 
     this.stopWorker()
   }
 
-  isRunning () {
+  isRunning() {
     return !!this.heartbeat
   }
 
-  updateChainBalances (address: Address, chains: number[]) {
+  updateChainBalances(address: Address, chains: number[]) {
     this.sendCommandToWorker('updateChainBalance', [address, chains])
   }
 
-  updateKnownTokenBalances (address: Address, tokens: Token[]) {
+  updateKnownTokenBalances(address: Address, tokens: Token[]) {
     this.sendCommandToWorker('fetchTokenBalances', [address, tokens])
   }
 
-  scanForTokenBalances (address: Address, tokens: Token[], chains: number[]) {
+  scanForTokenBalances(address: Address, tokens: Token[], chains: number[]) {
     this.sendCommandToWorker('tokenBalanceScan', [address, tokens, chains])
   }
 
   // private
-  private stopWorker () {
+  private stopWorker() {
     if (this.heartbeat) {
       clearInterval(this.heartbeat)
       this.heartbeat = undefined
@@ -108,12 +108,12 @@ export default class BalancesWorkerController extends EventEmitter {
     this.worker.kill('SIGTERM')
   }
 
-  private isWorkerReachable () {
+  private isWorkerReachable() {
     return this.worker.connected && this.worker.channel && this.worker.listenerCount('error') > 0
   }
 
   // sending messages
-  private sendCommandToWorker (command: string, args: any[] = []) {
+  private sendCommandToWorker(command: string, args: any[] = []) {
     log.debug(`sending command ${command} to worker`)
 
     try {
@@ -128,7 +128,7 @@ export default class BalancesWorkerController extends EventEmitter {
     }
   }
 
-  private sendHeartbeat () {
+  private sendHeartbeat() {
     this.sendCommandToWorker('heartbeat')
   }
 }
diff --git a/main/externalData/balances/erc-20-abi.js b/main/externalData/balances/erc-20-abi.js
index c6773f5bf..dcc20b94f 100644
--- a/main/externalData/balances/erc-20-abi.js
+++ b/main/externalData/balances/erc-20-abi.js
@@ -1,222 +1,222 @@
 export default [
   {
-      "constant": true,
-      "inputs": [],
-      "name": "name",
-      "outputs": [
-          {
-              "name": "",
-              "type": "string"
-          }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function"
+    constant: true,
+    inputs: [],
+    name: 'name',
+    outputs: [
+      {
+        name: '',
+        type: 'string',
+      },
+    ],
+    payable: false,
+    stateMutability: 'view',
+    type: 'function',
   },
   {
-      "constant": false,
-      "inputs": [
-          {
-              "name": "_spender",
-              "type": "address"
-          },
-          {
-              "name": "_value",
-              "type": "uint256"
-          }
-      ],
-      "name": "approve",
-      "outputs": [
-          {
-              "name": "",
-              "type": "bool"
-          }
-      ],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function"
+    constant: false,
+    inputs: [
+      {
+        name: '_spender',
+        type: 'address',
+      },
+      {
+        name: '_value',
+        type: 'uint256',
+      },
+    ],
+    name: 'approve',
+    outputs: [
+      {
+        name: '',
+        type: 'bool',
+      },
+    ],
+    payable: false,
+    stateMutability: 'nonpayable',
+    type: 'function',
   },
   {
-      "constant": true,
-      "inputs": [],
-      "name": "totalSupply",
-      "outputs": [
-          {
-              "name": "",
-              "type": "uint256"
-          }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function"
+    constant: true,
+    inputs: [],
+    name: 'totalSupply',
+    outputs: [
+      {
+        name: '',
+        type: 'uint256',
+      },
+    ],
+    payable: false,
+    stateMutability: 'view',
+    type: 'function',
   },
   {
-      "constant": false,
-      "inputs": [
-          {
-              "name": "_from",
-              "type": "address"
-          },
-          {
-              "name": "_to",
-              "type": "address"
-          },
-          {
-              "name": "_value",
-              "type": "uint256"
-          }
-      ],
-      "name": "transferFrom",
-      "outputs": [
-          {
-              "name": "",
-              "type": "bool"
-          }
-      ],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function"
+    constant: false,
+    inputs: [
+      {
+        name: '_from',
+        type: 'address',
+      },
+      {
+        name: '_to',
+        type: 'address',
+      },
+      {
+        name: '_value',
+        type: 'uint256',
+      },
+    ],
+    name: 'transferFrom',
+    outputs: [
+      {
+        name: '',
+        type: 'bool',
+      },
+    ],
+    payable: false,
+    stateMutability: 'nonpayable',
+    type: 'function',
   },
   {
-      "constant": true,
-      "inputs": [],
-      "name": "decimals",
-      "outputs": [
-          {
-              "name": "",
-              "type": "uint8"
-          }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function"
+    constant: true,
+    inputs: [],
+    name: 'decimals',
+    outputs: [
+      {
+        name: '',
+        type: 'uint8',
+      },
+    ],
+    payable: false,
+    stateMutability: 'view',
+    type: 'function',
   },
   {
-      "constant": true,
-      "inputs": [
-          {
-              "name": "_owner",
-              "type": "address"
-          }
-      ],
-      "name": "balanceOf",
-      "outputs": [
-          {
-              "name": "balance",
-              "type": "uint256"
-          }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function"
+    constant: true,
+    inputs: [
+      {
+        name: '_owner',
+        type: 'address',
+      },
+    ],
+    name: 'balanceOf',
+    outputs: [
+      {
+        name: 'balance',
+        type: 'uint256',
+      },
+    ],
+    payable: false,
+    stateMutability: 'view',
+    type: 'function',
   },
   {
-      "constant": true,
-      "inputs": [],
-      "name": "symbol",
-      "outputs": [
-          {
-              "name": "",
-              "type": "string"
-          }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function"
+    constant: true,
+    inputs: [],
+    name: 'symbol',
+    outputs: [
+      {
+        name: '',
+        type: 'string',
+      },
+    ],
+    payable: false,
+    stateMutability: 'view',
+    type: 'function',
   },
   {
-      "constant": false,
-      "inputs": [
-          {
-              "name": "_to",
-              "type": "address"
-          },
-          {
-              "name": "_value",
-              "type": "uint256"
-          }
-      ],
-      "name": "transfer",
-      "outputs": [
-          {
-              "name": "",
-              "type": "bool"
-          }
-      ],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function"
+    constant: false,
+    inputs: [
+      {
+        name: '_to',
+        type: 'address',
+      },
+      {
+        name: '_value',
+        type: 'uint256',
+      },
+    ],
+    name: 'transfer',
+    outputs: [
+      {
+        name: '',
+        type: 'bool',
+      },
+    ],
+    payable: false,
+    stateMutability: 'nonpayable',
+    type: 'function',
   },
   {
-      "constant": true,
-      "inputs": [
-          {
-              "name": "_owner",
-              "type": "address"
-          },
-          {
-              "name": "_spender",
-              "type": "address"
-          }
-      ],
-      "name": "allowance",
-      "outputs": [
-          {
-              "name": "",
-              "type": "uint256"
-          }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function"
+    constant: true,
+    inputs: [
+      {
+        name: '_owner',
+        type: 'address',
+      },
+      {
+        name: '_spender',
+        type: 'address',
+      },
+    ],
+    name: 'allowance',
+    outputs: [
+      {
+        name: '',
+        type: 'uint256',
+      },
+    ],
+    payable: false,
+    stateMutability: 'view',
+    type: 'function',
   },
   {
-      "payable": true,
-      "stateMutability": "payable",
-      "type": "fallback"
+    payable: true,
+    stateMutability: 'payable',
+    type: 'fallback',
   },
   {
-      "anonymous": false,
-      "inputs": [
-          {
-              "indexed": true,
-              "name": "owner",
-              "type": "address"
-          },
-          {
-              "indexed": true,
-              "name": "spender",
-              "type": "address"
-          },
-          {
-              "indexed": false,
-              "name": "value",
-              "type": "uint256"
-          }
-      ],
-      "name": "Approval",
-      "type": "event"
+    anonymous: false,
+    inputs: [
+      {
+        indexed: true,
+        name: 'owner',
+        type: 'address',
+      },
+      {
+        indexed: true,
+        name: 'spender',
+        type: 'address',
+      },
+      {
+        indexed: false,
+        name: 'value',
+        type: 'uint256',
+      },
+    ],
+    name: 'Approval',
+    type: 'event',
   },
   {
-      "anonymous": false,
-      "inputs": [
-          {
-              "indexed": true,
-              "name": "from",
-              "type": "address"
-          },
-          {
-              "indexed": true,
-              "name": "to",
-              "type": "address"
-          },
-          {
-              "indexed": false,
-              "name": "value",
-              "type": "uint256"
-          }
-      ],
-      "name": "Transfer",
-      "type": "event"
-  }
+    anonymous: false,
+    inputs: [
+      {
+        indexed: true,
+        name: 'from',
+        type: 'address',
+      },
+      {
+        indexed: true,
+        name: 'to',
+        type: 'address',
+      },
+      {
+        indexed: false,
+        name: 'value',
+        type: 'uint256',
+      },
+    ],
+    name: 'Transfer',
+    type: 'event',
+  },
 ]
diff --git a/main/externalData/balances/index.ts b/main/externalData/balances/index.ts
index 51e2284ff..c496c3716 100644
--- a/main/externalData/balances/index.ts
+++ b/main/externalData/balances/index.ts
@@ -11,38 +11,39 @@ export default function (store: Store) {
     getActiveAddress: () => (store('selected.current') || '') as Address,
     getNetwork: (id: number) => (store('main.networks.ethereum', id) || {}) as Network,
     getConnectedNetworks: () => {
-      const networks = (Object.values(store('main.networks.ethereum') || {})) as Network[]
-      return networks
-        .filter(n => (n.connection.primary || {}).connected || (n.connection.secondary || {}).connected)
+      const networks = Object.values(store('main.networks.ethereum') || {}) as Network[]
+      return networks.filter((n) => (n.connection.primary || {}).connected || (n.connection.secondary || {}).connected)
     },
     getCustomTokens: () => (store('main.tokens.custom') || []) as Token[],
     getKnownTokens: (address?: Address) => ((address && store('main.tokens.known', address)) || []) as Token[],
     getCurrencyBalances: (address: Address) => {
-      return ((store('main.balances', address) || []) as Balance[])
-        .filter(balance => balance.address === NATIVE_CURRENCY)
+      return ((store('main.balances', address) || []) as Balance[]).filter(
+        (balance) => balance.address === NATIVE_CURRENCY
+      )
     },
     getTokenBalances: (address: Address) => {
-      return ((store('main.balances', address) || []) as Balance[])
-        .filter(balance => balance.address !== NATIVE_CURRENCY)
-    }
+      return ((store('main.balances', address) || []) as Balance[]).filter(
+        (balance) => balance.address !== NATIVE_CURRENCY
+      )
+    },
   }
 
   let scan: NodeJS.Timeout | null
   let workerController: BalancesWorkerController | null
 
-  function attemptRestart () {
+  function attemptRestart() {
     log.warn(`balances controller stopped, restarting in ${RESTART_WAIT} seconds`)
     stop()
 
     setTimeout(restart, RESTART_WAIT * 1000)
   }
 
-  function handleClose () {
+  function handleClose() {
     workerController = null
     attemptRestart()
   }
 
-  function runWhenReady (fn: () => any) {
+  function runWhenReady(fn: () => any) {
     if (workerController?.isRunning()) {
       // worker is running, start the scan
       fn()
@@ -56,11 +57,11 @@ export default function (store: Store) {
     }
   }
 
-  function start () {
+  function start() {
     log.verbose('starting balances updates')
 
     workerController = new BalancesWorkerController()
-    
+
     workerController.once('close', handleClose)
     workerController.on('chainBalances', (address, balances) => {
       handleUpdate(address, handleChainBalanceUpdate.bind(null, balances))
@@ -71,12 +72,12 @@ export default function (store: Store) {
     })
   }
 
-  function restart () {
+  function restart() {
     start()
     setAddress(storeApi.getActiveAddress())
   }
 
-  function stop () {
+  function stop() {
     log.verbose('stopping balances updates')
 
     stopScan()
@@ -89,7 +90,7 @@ export default function (store: Store) {
     }
   }
 
-  function startScan (address: Address) {
+  function startScan(address: Address) {
     stopScan()
 
     log.verbose(`starting balances scan for ${address}`)
@@ -108,7 +109,7 @@ export default function (store: Store) {
     runWhenReady(() => scanForAddress())
   }
 
-  function stopScan () {
+  function stopScan() {
     log.debug('stopping balances scan')
 
     if (scan) {
@@ -117,18 +118,18 @@ export default function (store: Store) {
     }
   }
 
-  function updateActiveBalances (address: Address) {
-    const activeNetworkIds = storeApi.getConnectedNetworks().map(network => network.id)
+  function updateActiveBalances(address: Address) {
+    const activeNetworkIds = storeApi.getConnectedNetworks().map((network) => network.id)
     updateBalances(address, activeNetworkIds)
   }
 
-  function updateBalances (address: Address, chains: number[]) {
+  function updateBalances(address: Address, chains: number[]) {
     const customTokens = storeApi.getCustomTokens()
-    const knownTokens = storeApi.getKnownTokens(address).filter(
-      token => !customTokens.some(t => t.address === token.address && t.chainId === token.chainId)
-    )
+    const knownTokens = storeApi
+      .getKnownTokens(address)
+      .filter((token) => !customTokens.some((t) => t.address === token.address && t.chainId === token.chainId))
 
-    const trackedTokens = [...customTokens, ...knownTokens].filter(t => chains.includes(t.chainId))
+    const trackedTokens = [...customTokens, ...knownTokens].filter((t) => chains.includes(t.chainId))
 
     if (trackedTokens.length > 0) {
       workerController?.updateKnownTokenBalances(address, trackedTokens)
@@ -138,7 +139,7 @@ export default function (store: Store) {
     workerController?.scanForTokenBalances(address, trackedTokens, chains)
   }
 
-  function handleUpdate (address: Address, updateFn: (address: Address) => void) {
+  function handleUpdate(address: Address, updateFn: (address: Address) => void) {
     // because updates come from another process its possible to receive updates after an account
     // has been removed but before we stop the scan, so check to make sure the account exists
     if (store('main.accounts', address)) {
@@ -146,27 +147,31 @@ export default function (store: Store) {
     }
   }
 
-  function handleChainBalanceUpdate (balances: CurrencyBalance[], address: Address) {
+  function handleChainBalanceUpdate(balances: CurrencyBalance[], address: Address) {
     const currentChainBalances = storeApi.getCurrencyBalances(address)
 
     // only update balances that have changed
     balances
-      .filter(balance => (currentChainBalances.find(b => b.chainId === balance.chainId) || {}).balance !== balance.balance)
-      .forEach(balance => {
+      .filter(
+        (balance) => (currentChainBalances.find((b) => b.chainId === balance.chainId) || {}).balance !== balance.balance
+      )
+      .forEach((balance) => {
         store.setBalance(address, {
           ...balance,
           symbol: storeApi.getNetwork(balance.chainId).symbol,
-          address: NATIVE_CURRENCY
+          address: NATIVE_CURRENCY,
         })
       })
   }
 
-  function handleTokenBalanceUpdate (balances: TokenBalance[], address: Address) {
+  function handleTokenBalanceUpdate(balances: TokenBalance[], address: Address) {
     // only update balances if any have changed
     const currentTokenBalances = storeApi.getTokenBalances(address)
-    const changedBalances = balances.filter(newBalance => {
-      const currentBalance = currentTokenBalances.find(b => b.address === newBalance.address && b.chainId === newBalance.chainId)
-      return (!currentBalance || currentBalance.balance !== newBalance.balance)
+    const changedBalances = balances.filter((newBalance) => {
+      const currentBalance = currentTokenBalances.find(
+        (b) => b.address === newBalance.address && b.chainId === newBalance.chainId
+      )
+      return !currentBalance || currentBalance.balance !== newBalance.balance
     })
 
     if (changedBalances.length > 0) {
@@ -175,16 +180,18 @@ export default function (store: Store) {
       const knownTokens = storeApi.getKnownTokens(address)
 
       // add any non-zero balances to the list of known tokens
-      const unknownBalances = changedBalances
-        .filter(b => parseInt(b.balance) > 0 && !knownTokens.some(t => t.address === b.address && t.chainId === b.chainId))
+      const unknownBalances = changedBalances.filter(
+        (b) => parseInt(b.balance) > 0 && !knownTokens.some((t) => t.address === b.address && t.chainId === b.chainId)
+      )
 
       if (unknownBalances.length > 0) {
         store.addKnownTokens(address, unknownBalances)
       }
 
       // remove zero balances from the list of known tokens
-      const zeroBalances = changedBalances
-        .filter(b => parseInt(b.balance) === 0 && knownTokens.some(t => t.address === b.address && t.chainId === b.chainId))
+      const zeroBalances = changedBalances.filter(
+        (b) => parseInt(b.balance) === 0 && knownTokens.some((t) => t.address === b.address && t.chainId === b.chainId)
+      )
 
       if (zeroBalances.length > 0) {
         store.removeKnownTokens(address, zeroBalances)
@@ -194,7 +201,7 @@ export default function (store: Store) {
     store.accountTokensUpdated(address)
   }
 
-  function setAddress (address: Address) {
+  function setAddress(address: Address) {
     if (!workerController) {
       log.warn(`tried to set address to ${address} but balances controller is not running`)
       return
@@ -209,7 +216,7 @@ export default function (store: Store) {
     }
   }
 
-  function addNetworks (address: Address, chains: number[]) {
+  function addNetworks(address: Address, chains: number[]) {
     if (!workerController) {
       log.warn('tried to add networks but balances controller is not running')
       return
@@ -219,13 +226,13 @@ export default function (store: Store) {
     runWhenReady(() => updateBalances(address, chains))
   }
 
-  function addTokens (address: Address, tokens: Token[]) {
+  function addTokens(address: Address, tokens: Token[]) {
     if (!workerController) {
       log.warn('tried to add tokens but balances controller is not running')
       return
     }
 
-    log.verbose('adding balances updates', { address, tokens: tokens.map(t => t.address) })
+    log.verbose('adding balances updates', { address, tokens: tokens.map((t) => t.address) })
     runWhenReady(() => workerController?.updateKnownTokenBalances(address, tokens))
   }
 
diff --git a/main/externalData/balances/reducers.ts b/main/externalData/balances/reducers.ts
index 379d1e0d6..ed7d04cfb 100644
--- a/main/externalData/balances/reducers.ts
+++ b/main/externalData/balances/reducers.ts
@@ -2,9 +2,9 @@ export interface TokensByChain {
   [chainId: number]: Token[]
 }
 
-export function groupByChain (grouped: TokensByChain, token: Token) {
+export function groupByChain(grouped: TokensByChain, token: Token) {
   return {
     ...grouped,
-    [token.chainId]: [...(grouped[token.chainId] || []), token]
+    [token.chainId]: [...(grouped[token.chainId] || []), token],
   }
 }
diff --git a/main/externalData/balances/scan.ts b/main/externalData/balances/scan.ts
index 6010a04f2..776749ac1 100644
--- a/main/externalData/balances/scan.ts
+++ b/main/externalData/balances/scan.ts
@@ -14,7 +14,7 @@ let id = 1
 const erc20Interface = new Interface(erc20TokenAbi)
 
 interface ExternalBalance {
-  balance: string,
+  balance: string
   displayBalance: string
 }
 
@@ -22,43 +22,43 @@ export interface TokenDefinition extends Omit<Token, 'logoURI'> {
   logoUri?: string
 }
 
-export interface TokenBalance extends TokenDefinition, ExternalBalance { }
+export interface TokenBalance extends TokenDefinition, ExternalBalance {}
 
 export interface CurrencyBalance extends ExternalBalance {
   chainId: number
 }
 
 export interface BalanceLoader {
-  getCurrencyBalances: (address: Address, chains: number[]) => Promise<CurrencyBalance[]>,
+  getCurrencyBalances: (address: Address, chains: number[]) => Promise<CurrencyBalance[]>
   getTokenBalances: (address: Address, tokens: TokenDefinition[]) => Promise<TokenBalance[]>
 }
 
-function createBalance (rawBalance: string, decimals: number): ExternalBalance {
+function createBalance(rawBalance: string, decimals: number): ExternalBalance {
   return {
     balance: rawBalance,
-    displayBalance: new BigNumber(rawBalance).shiftedBy(-decimals).toString()
+    displayBalance: new BigNumber(rawBalance).shiftedBy(-decimals).toString(),
   }
 }
 
 export default function (eth: EthereumProvider) {
-  function balanceCalls (owner: string, tokens: TokenDefinition[]): Call<EthersBigNumber, ExternalBalance>[] {
-    return tokens.map(token => ({
+  function balanceCalls(owner: string, tokens: TokenDefinition[]): Call<EthersBigNumber, ExternalBalance>[] {
+    return tokens.map((token) => ({
       target: token.address,
       call: ['function balanceOf(address address) returns (uint256 value)', owner],
       returns: [
         (bn: EthersBigNumber) => {
           return createBalance(bn.toHexString(), token.decimals)
-        }
-      ]
+        },
+      ],
     }))
   }
 
-  async function getNativeCurrencyBalance (address: string, chainId: number) {
+  async function getNativeCurrencyBalance(address: string, chainId: number) {
     try {
       const rawBalance = await eth.request({
         method: 'eth_getBalance',
         params: [address, 'latest'],
-        chainId: addHexPrefix(chainId.toString(16))
+        chainId: addHexPrefix(chainId.toString(16)),
       })
 
       // TODO: do all coins have 18 decimals?
@@ -69,16 +69,16 @@ export default function (eth: EthereumProvider) {
     }
   }
 
-  async function getTokenBalance (token: TokenDefinition, owner: string)  {
+  async function getTokenBalance(token: TokenDefinition, owner: string) {
     try {
       const functionData = erc20Interface.encodeFunctionData('balanceOf', [owner])
 
       const response = await eth.request({
         method: 'eth_call',
         jsonrpc: '2.0',
-        id: id += 1,
+        id: (id += 1),
         chainId: addHexPrefix(token.chainId.toString(16)),
-        params: [{ to: token.address, value: '0x0', data: functionData }, 'latest']
+        params: [{ to: token.address, value: '0x0', data: functionData }, 'latest'],
       })
 
       const result = erc20Interface.decodeFunctionResult('balanceOf', response)
@@ -90,20 +90,20 @@ export default function (eth: EthereumProvider) {
     }
   }
 
-  async function getTokenBalancesFromContracts (owner: string, tokens: TokenDefinition[]) {
-    const balances = tokens.map(async token => {
+  async function getTokenBalancesFromContracts(owner: string, tokens: TokenDefinition[]) {
+    const balances = tokens.map(async (token) => {
       const rawBalance = await getTokenBalance(token, owner)
 
       return {
         ...token,
-        ...createBalance(rawBalance, token.decimals)
+        ...createBalance(rawBalance, token.decimals),
       }
     })
 
     return Promise.all(balances)
   }
 
-  async function getTokenBalancesFromMulticall (owner: string, tokens: TokenDefinition[], chainId: number) {
+  async function getTokenBalancesFromMulticall(owner: string, tokens: TokenDefinition[], chainId: number) {
     const calls = balanceCalls(owner, tokens)
 
     const results = await multicall(chainId, eth).batchCall(calls)
@@ -112,7 +112,7 @@ export default function (eth: EthereumProvider) {
       const balance = result.success ? result.returnValues[0] : createBalance('0x0', tokens[i].decimals)
       return {
         ...tokens[i],
-        ...balance
+        ...balance,
       }
     })
   }
@@ -125,18 +125,18 @@ export default function (eth: EthereumProvider) {
     },
     getTokenBalances: async function (owner: string, tokens: TokenDefinition[]) {
       const tokensByChain = tokens.reduce(groupByChain, {} as TokensByChain)
-    
+
       const tokenBalances = await Promise.all(
         Object.entries(tokensByChain).map(([chain, tokens]) => {
           const chainId = parseInt(chain)
-    
+
           return multicallSupportsChain(chainId)
             ? getTokenBalancesFromMulticall(owner, tokens, chainId)
             : getTokenBalancesFromContracts(owner, tokens)
         })
       )
-    
+
       return ([] as TokenBalance[]).concat(...tokenBalances)
-    }
+    },
   } as BalanceLoader
 }
diff --git a/main/externalData/balances/worker.ts b/main/externalData/balances/worker.ts
index 9ff60faee..9d9cc64b3 100644
--- a/main/externalData/balances/worker.ts
+++ b/main/externalData/balances/worker.ts
@@ -11,7 +11,7 @@ import balancesLoader, { BalanceLoader } from './scan'
 import TokenLoader from '../inventory/tokens'
 
 interface ExternalDataWorkerMessage {
-  command: string,
+  command: string
   args: any[]
 }
 
@@ -29,17 +29,17 @@ eth.on('connect', async () => {
   sendToMainProcess({ type: 'ready' })
 })
 
-async function getChains () {
+async function getChains() {
   try {
     const chains: string[] = await eth.request({ method: 'wallet_getChains' })
-    return chains.map(chain => parseInt(chain))
+    return chains.map((chain) => parseInt(chain))
   } catch (e) {
     log.error('could not load chains', e)
     return []
   }
 }
 
-function sendToMainProcess (data: any) {
+function sendToMainProcess(data: any) {
   if (process.send) {
     return process.send(data)
   } else {
@@ -47,20 +47,23 @@ function sendToMainProcess (data: any) {
   }
 }
 
-async function tokenBalanceScan (address: Address, tokensToOmit: Token[] = [], chains?: number[]) {
+async function tokenBalanceScan(address: Address, tokensToOmit: Token[] = [], chains?: number[]) {
   try {
     // for chains that support multicall, we can attempt to load every token that we know about,
     // for all other chains we need to call each contract individually so don't scan every contract
-    const eligibleChains = (chains || await getChains()).filter(chainSupportsScan)
-    const tokenLists = eligibleChains.map(chainId => tokenLoader.getTokens(chainId))
+    const eligibleChains = (chains || (await getChains())).filter(chainSupportsScan)
+    const tokenLists = eligibleChains.map((chainId) => tokenLoader.getTokens(chainId))
     const tokens = tokenLists.reduce((all, tokenList) => {
       return all.concat(
-        tokenList.filter(token => tokensToOmit.every(t => t.chainId !== token.chainId || t.address !== token.address))
+        tokenList.filter((token) =>
+          tokensToOmit.every((t) => t.chainId !== token.chainId || t.address !== token.address)
+        )
       )
     }, [] as Token[])
 
-    const tokenBalances = (await balances.getTokenBalances(address, tokens))
-      .filter(balance => parseInt(balance.balance) > 0)
+    const tokenBalances = (await balances.getTokenBalances(address, tokens)).filter(
+      (balance) => parseInt(balance.balance) > 0
+    )
 
     sendToMainProcess({ type: 'tokenBalances', address, balances: tokenBalances })
   } catch (e) {
@@ -68,7 +71,7 @@ async function tokenBalanceScan (address: Address, tokensToOmit: Token[] = [], c
   }
 }
 
-async function fetchTokenBalances (address: Address, tokens: Token[]) {
+async function fetchTokenBalances(address: Address, tokens: Token[]) {
   try {
     const tokenBalances = await balances.getTokenBalances(address, tokens)
 
@@ -78,7 +81,7 @@ async function fetchTokenBalances (address: Address, tokens: Token[]) {
   }
 }
 
-async function chainBalanceScan (address: string, chains?: number[]) {
+async function chainBalanceScan(address: string, chains?: number[]) {
   try {
     const availableChains = chains || (await getChains())
     const chainBalances = await balances.getCurrencyBalances(address, availableChains)
@@ -89,7 +92,7 @@ async function chainBalanceScan (address: string, chains?: number[]) {
   }
 }
 
-function resetHeartbeat () {
+function resetHeartbeat() {
   clearTimeout(heartbeat)
 
   heartbeat = setTimeout(() => {
@@ -103,7 +106,7 @@ const messageHandler: { [command: string]: (...params: any) => void } = {
   updateChainBalance: chainBalanceScan,
   fetchTokenBalances: fetchTokenBalances,
   tokenBalanceScan: tokenBalanceScan,
-  heartbeat: resetHeartbeat
+  heartbeat: resetHeartbeat,
 }
 
 process.on('message', (message: ExternalDataWorkerMessage) => {
diff --git a/main/externalData/coingecko/__mocks__/index.ts b/main/externalData/coingecko/__mocks__/index.ts
index 9a1242de1..261194b5c 100644
--- a/main/externalData/coingecko/__mocks__/index.ts
+++ b/main/externalData/coingecko/__mocks__/index.ts
@@ -8,7 +8,7 @@ const markets = [
     image: 'https://assets.coingecko.com/coins/images/279/large/ethereum.png?1595348880',
     market_cap: 251086097383,
     current_price: 2157.2,
-    price_change_percentage_24h: -8.85019
+    price_change_percentage_24h: -8.85019,
   },
   {
     id: 'xdai',
@@ -17,7 +17,7 @@ const markets = [
     image: 'https://assets.coingecko.com/coins/images/11062/large/xdai.png?1614727492',
     market_cap: 0.0,
     current_price: 1.0,
-    price_change_percentage_24h: 0.19833
+    price_change_percentage_24h: 0.19833,
   },
   {
     id: 'matic-network',
@@ -26,8 +26,8 @@ const markets = [
     image: 'https://assets.coingecko.com/coins/images/4713/large/matic-token-icon.png?1624446912',
     market_cap: 6775636839,
     current_price: 1.07,
-    price_change_percentage_24h: -7.31834
-  }
+    price_change_percentage_24h: -7.31834,
+  },
 ]
 
 const platforms = [
@@ -35,46 +35,48 @@ const platforms = [
     id: 'ethereum',
     chain_identifier: '1',
     name: 'Ethereum',
-    short_name: ''
+    short_name: '',
   },
   {
     id: 'xdai',
     chain_identifier: '100',
     name: 'xDAI',
-    short_name: ''
-  }
+    short_name: '',
+  },
 ]
 
 const tokenPriceData = {
   ethereum: {
     '0xd3c89cac4a4283edba6927e2910fd1ebc14fe006': new BigNumber(0.184269),
-    '0xe41d2489571d322189246dafa5ebde1f4699f498': new BigNumber(0.797079)
+    '0xe41d2489571d322189246dafa5ebde1f4699f498': new BigNumber(0.797079),
   },
   xdai: {
     '0x71850b7e9ee3f13ab46d67167341e4bdc905eef9': new BigNumber(388.15),
-    '0x1e16aa4df73d29c029d94ceda3e3114ec191e25a': new BigNumber(0.079163)
-  }
+    '0x1e16aa4df73d29c029d94ceda3e3114ec191e25a': new BigNumber(0.079163),
+  },
 }
 
 const customCoins = []
 
 const __clearCustomCoins = () => customCoins.splice(0, customCoins.length)
 
-const __addCoin = coin => {
+const __addCoin = (coin) => {
   customCoins.push(coin)
 }
 
 const listAssetPlatforms = async () => platforms
 const listCoins = async () => {
-  return markets.concat(customCoins).map(mkt => ({
-    id: mkt.id, symbol: mkt.symbol, name: mkt.name
+  return markets.concat(customCoins).map((mkt) => ({
+    id: mkt.id,
+    symbol: mkt.symbol,
+    name: mkt.name,
   }))
 }
 
 const listMarkets = async (ids) => {
   if (!ids) return markets
 
-  return markets.concat(customCoins).filter(mkt => ids.includes(mkt.id))
+  return markets.concat(customCoins).filter((mkt) => ids.includes(mkt.id))
 }
 
 const coinPrices = async () => []
@@ -97,5 +99,5 @@ export default {
   coinPrices,
   tokenPrices,
   __clearCustomCoins,
-  __addCoin
+  __addCoin,
 }
diff --git a/main/externalData/coingecko/index.ts b/main/externalData/coingecko/index.ts
index 218780df0..4f227e0ba 100644
--- a/main/externalData/coingecko/index.ts
+++ b/main/externalData/coingecko/index.ts
@@ -2,7 +2,7 @@ import log from 'electron-log'
 import fetch from 'node-fetch'
 
 interface JsonResponse {
-  status: number,
+  status: number
   json: () => Promise<any>
 }
 
@@ -11,43 +11,43 @@ interface Rates {
 }
 
 interface Quote {
-  usd: number,
+  usd: number
   usd_24h_change: number
 }
 
 export type CoinId = string
 
 export interface Coin {
-  id: CoinId,
-  symbol: string,
-  name: string,
-  asset_platform_id: string,
+  id: CoinId
+  symbol: string
+  name: string
+  asset_platform_id: string
   platforms?: {}
 }
 
 export type PlatformId = string
 
 export interface Platform {
-  id: PlatformId,
-  chain_identifier: string,
-  name: string,
+  id: PlatformId
+  chain_identifier: string
+  name: string
   short_name: string
 }
 
 export interface Market {
-  id: string,
-  symbol: string,
-  name: string,
-  image: string,
-  current_price?: number,
-  market_cap?: number,
+  id: string
+  symbol: string
+  name: string
+  image: string
+  current_price?: number
+  market_cap?: number
   price_change_percentage_24h?: number
 }
 
 const apiVersion = process.env.COIN_GECKO_API_VERSION || 'v3'
 const baseUrl = `https://api.coingecko.com/api/${apiVersion}`
 
-async function handleJsonResponse (response: JsonResponse) {
+async function handleJsonResponse(response: JsonResponse) {
   const body = await response.json()
 
   if (response.status !== 200) throw new Error(JSON.stringify(body))
@@ -55,8 +55,10 @@ async function handleJsonResponse (response: JsonResponse) {
   return body
 }
 
-async function call (path: string, params = {}) {
-  const queryStr = Object.entries(params).map(param => param.join('=')).join('&')
+async function call(path: string, params = {}) {
+  const queryStr = Object.entries(params)
+    .map((param) => param.join('='))
+    .join('&')
   const url = `${path}${queryStr ? '?' + queryStr : ''}`
 
   log.debug(`loading coingecko data from ${url}`)
@@ -64,51 +66,51 @@ async function call (path: string, params = {}) {
   return fetch(url, {}).then(handleJsonResponse)
 }
 
-async function listAssetPlatforms (chainIds: string[] = []): Promise<Array<Platform>> {
-  const chainIdFilter = chainIds.map(id => id.toString())
+async function listAssetPlatforms(chainIds: string[] = []): Promise<Array<Platform>> {
+  const chainIdFilter = chainIds.map((id) => id.toString())
   const allPlatforms: Platform[] = await call(`${baseUrl}/asset_platforms`)
 
   return chainIds.length > 0
-    ? allPlatforms.filter(p => chainIdFilter.includes((p.chain_identifier || "").toString()))
+    ? allPlatforms.filter((p) => chainIdFilter.includes((p.chain_identifier || '').toString()))
     : allPlatforms
 }
 
-async function coinPrices (ids: string[], currencies = ['usd']): Promise<Rates> {
+async function coinPrices(ids: string[], currencies = ['usd']): Promise<Rates> {
   const queryParams = {
     ids: ids.join(','),
     vs_currencies: currencies.join(','),
     include_market_cap: 'true',
     include_24hr_vol: 'true',
-    include_24hr_change: 'true'
+    include_24hr_change: 'true',
   }
 
   return call(`${baseUrl}/simple/price`, queryParams)
 }
 
-async function tokenPrices (addresses: string[], asset_platform: string, currencies = ['usd']): Promise<Rates> {
+async function tokenPrices(addresses: string[], asset_platform: string, currencies = ['usd']): Promise<Rates> {
   const queryParams = {
     contract_addresses: addresses.join(','),
     vs_currencies: currencies.join(','),
     include_market_cap: 'true',
     include_24hr_vol: 'true',
-    include_24hr_change: 'true'
+    include_24hr_change: 'true',
   }
 
   return call(`${baseUrl}/simple/token_price/${asset_platform}`, queryParams)
 }
 
-async function getCoin (id: string): Promise<Coin> {
+async function getCoin(id: string): Promise<Coin> {
   return call(`${baseUrl}/coins/${id}`)
 }
 
-async function listCoins (include_platform = true): Promise<Array<Coin>> {
+async function listCoins(include_platform = true): Promise<Array<Coin>> {
   return call(`${baseUrl}/coins/list?include_platform=${include_platform}`)
 }
 
-async function listMarkets (ids: string[], vsCurrency = 'usd'): Promise<Array<Market>> {
+async function listMarkets(ids: string[], vsCurrency = 'usd'): Promise<Array<Market>> {
   const queryParams = {
     vs_currency: vsCurrency,
-    ids: ids.join(',')
+    ids: ids.join(','),
   }
 
   return call(`${baseUrl}/coins/markets`, queryParams)
@@ -120,5 +122,5 @@ export default {
   tokenPrices,
   getCoin,
   listCoins,
-  listMarkets
+  listMarkets,
 }
diff --git a/main/externalData/index.ts b/main/externalData/index.ts
index f4e173688..80b41e948 100644
--- a/main/externalData/index.ts
+++ b/main/externalData/index.ts
@@ -16,10 +16,9 @@ const storeApi = {
   getCustomTokens: () => (store('main.tokens.custom') || []) as Token[],
   getKnownTokens: (address?: Address) => ((address && store('main.tokens.known', address)) || []) as Token[],
   getConnectedNetworks: () => {
-    const networks = (Object.values(store('main.networks.ethereum') || {})) as Network[]
-    return networks
-      .filter(n => (n.connection.primary || {}).connected || (n.connection.secondary || {}).connected)
-  }
+    const networks = Object.values(store('main.networks.ethereum') || {}) as Network[]
+    return networks.filter((n) => (n.connection.primary || {}).connected || (n.connection.secondary || {}).connected)
+  },
 }
 
 export default function () {
@@ -29,14 +28,18 @@ export default function () {
   const rates = Rates(pylon, store)
   const balances = Balances(store)
 
-  let connectedChains: number[] = [], activeAccount: Address = ''
+  let connectedChains: number[] = [],
+    activeAccount: Address = ''
 
   inventory.start()
   rates.start()
   balances.start()
 
   const handleNetworkUpdate = debounce((newlyConnected: number[]) => {
-    log.verbose('updating external data due to network update(s)', { connectedChains, newlyConnected })
+    log.verbose('updating external data due to network update(s)', {
+      connectedChains,
+      newlyConnected,
+    })
 
     rates.updateSubscription(connectedChains, activeAccount)
 
@@ -64,10 +67,13 @@ export default function () {
   })
 
   const allNetworksObserver = store.observer(() => {
-    const connectedNetworkIds = storeApi.getConnectedNetworks().map(n => n.id).sort()
+    const connectedNetworkIds = storeApi
+      .getConnectedNetworks()
+      .map((n) => n.id)
+      .sort()
 
     if (!arraysMatch(connectedChains, connectedNetworkIds)) {
-      const newlyConnectedNetworks = connectedNetworkIds.filter(c => !connectedChains.includes(c))
+      const newlyConnectedNetworks = connectedNetworkIds.filter((c) => !connectedChains.includes(c))
       connectedChains = connectedNetworkIds
 
       handleNetworkUpdate(newlyConnectedNetworks)
@@ -100,6 +106,6 @@ export default function () {
       inventory.stop()
       rates.stop()
       balances.stop()
-    }
+    },
   } as DataScanner
 }
diff --git a/main/externalData/inventory/index.ts b/main/externalData/inventory/index.ts
index 7aa88bd3d..6be99bdbd 100644
--- a/main/externalData/inventory/index.ts
+++ b/main/externalData/inventory/index.ts
@@ -1,37 +1,39 @@
 import log from 'electron-log'
 import Pylon from '@framelabs/pylon-client'
 
-export default function inventory (pylon: Pylon, store: Store) {
-  function handleUpdates (updates: any[]) {
+export default function inventory(pylon: Pylon, store: Store) {
+  function handleUpdates(updates: any[]) {
     if (updates.length === 0) return
 
-    log.debug(`got inventory updates for ${updates.map(u => u.id)}`)
+    log.debug(`got inventory updates for ${updates.map((u) => u.id)}`)
 
-    updates.forEach(update => {
+    updates.forEach((update) => {
       store.setInventory(update.id, update.data.inventory)
     })
   }
 
-  function start () {
+  function start() {
     log.verbose('starting inventory updates')
 
     pylon.on('inventories', handleUpdates)
   }
 
-  function stop () {
+  function stop() {
     log.verbose('stopping inventory updates')
 
     pylon.inventories([])
     pylon.off('inventories', handleUpdates)
   }
 
-  function setAddresses (addresses: Address[]) {
+  function setAddresses(addresses: Address[]) {
     log.verbose('setting addresses for inventory updates', addresses)
 
     pylon.inventories(addresses)
   }
 
   return {
-    start, stop, setAddresses
+    start,
+    stop,
+    setAddresses,
   }
 }
diff --git a/main/externalData/inventory/tokens.ts b/main/externalData/inventory/tokens.ts
index 91187c2ef..956ebf92a 100644
--- a/main/externalData/inventory/tokens.ts
+++ b/main/externalData/inventory/tokens.ts
@@ -12,11 +12,11 @@ interface TokenSpec extends Token {
   }
 }
 
-function mergeTokens (existingTokens: Token[], updatedTokens: TokenSpec[]) {
+function mergeTokens(existingTokens: Token[], updatedTokens: TokenSpec[]) {
   const omitList: string[] = []
 
   const mergedList = [existingTokens, updatedTokens].reduce((tokens, list) => {
-    list.forEach(token => {
+    list.forEach((token) => {
       const address = token.address.toLowerCase()
       const key = `${token.chainId}:${address}`
       const omitToken = ((token as any).extensions || {}).omit
@@ -42,22 +42,19 @@ export default class TokenLoader {
   private readonly eth = ethProvider('frame', { origin: 'frame-internal', name: 'tokenLoader' })
   private readonly nebula = nebulaApi(this.eth)
 
-  constructor () {
-    this.tokenList = mergeTokens(
-      sushiswapTokenList.tokens as Token[],
-      defaultTokenList.tokens as TokenSpec[]
-    )
+  constructor() {
+    this.tokenList = mergeTokens(sushiswapTokenList.tokens as Token[], defaultTokenList.tokens as TokenSpec[])
   }
 
-  private async loadTokenList () {
+  private async loadTokenList() {
     const updatedTokens = await this.frameTokenList()
-  
+
     this.tokenList = mergeTokens(this.tokenList, updatedTokens)
-  
+
     log.info(`updated token list to contain ${this.tokenList.length} tokens`)
   }
 
-  async frameTokenList () {
+  async frameTokenList() {
     log.debug('loading tokens from tokens.frame.eth')
 
     try {
@@ -76,7 +73,7 @@ export default class TokenLoader {
     return []
   }
 
-  async start () {
+  async start() {
     log.verbose('starting token loader')
 
     return new Promise((resolve, reject) => {
@@ -93,15 +90,15 @@ export default class TokenLoader {
       this.eth.once('connect', startLoading.bind(this))
     })
   }
-  
-  stop () {
+
+  stop() {
     if (this.loader) {
       clearInterval(this.loader)
       this.loader = null
     }
   }
 
-  getTokens (chainId: number) {
-    return this.tokenList.filter(token => token.chainId === chainId)
+  getTokens(chainId: number) {
+    return this.tokenList.filter((token) => token.chainId === chainId)
   }
 }
diff --git a/main/flex/index.js b/main/flex/index.js
index cee3b51d5..30ed37093 100644
--- a/main/flex/index.js
+++ b/main/flex/index.js
@@ -7,20 +7,20 @@ const log = require('electron-log')
 
 const windows = require('../windows')
 
-const defined = value => value !== undefined || value !== null
+const defined = (value) => value !== undefined || value !== null
 
 class Flex extends EventEmitter {
-  setReady () {
+  setReady() {
     this.ready = true
     this.emit('ready')
   }
 
-  rpc (...args) {
+  rpc(...args) {
     const cb = args.pop()
     if (typeof cb !== 'function') throw new Error('Flex methods require a callback')
     const id = uuid()
     handlers[id] = cb
-    args = args.map(arg => defined(arg) ? JSON.stringify(arg) : arg)
+    args = args.map((arg) => (defined(arg) ? JSON.stringify(arg) : arg))
     windows.send('tray', 'main:flex', JSON.stringify(id), ...args)
   }
 }
@@ -33,19 +33,21 @@ const handlers = {}
 
 ipcMain.on('tray:flex:res', (sender, id, ...args) => {
   if (!handlers[id]) return log.warn('Message from main RPC had no handler')
-  args = args.map(arg => defined(arg) ? JSON.parse(arg) : arg)
+  args = args.map((arg) => (defined(arg) ? JSON.parse(arg) : arg))
   handlers[id](...args)
   delete handlers[id]
 })
 
 ipcMain.on('tray:flex:event', (sender, eventName, ...args) => {
-  args = args.map(arg => defined(arg) ? JSON.parse(arg) : arg)
+  args = args.map((arg) => (defined(arg) ? JSON.parse(arg) : arg))
   flex.emit(eventName, ...args)
 })
 
 ipcMain.on('tray:ready', () => flex.setReady())
 
 // If flex is already ready, trigger new 'ready' listeners
-flex.on('newListener', (e, listener) => { if (e === 'ready' && flex.ready) listener() })
+flex.on('newListener', (e, listener) => {
+  if (e === 'ready' && flex.ready) listener()
+})
 
 module.exports = flex
diff --git a/main/index.ts b/main/index.ts
index 5aea552bb..403b7646a 100644
--- a/main/index.ts
+++ b/main/index.ts
@@ -34,7 +34,7 @@ process.env.BUNDLE_LOCATION = process.env.BUNDLE_LOCATION || path.resolve(__dirn
 log.transports.console.level = process.env.LOG_LEVEL || 'info'
 log.transports.file.level = ['development', 'test'].includes(process.env.NODE_ENV) ? false : 'verbose'
 
-function getCrashReportFields () {
+function getCrashReportFields() {
   const fields = ['networks', 'networksMeta', 'tokens']
 
   return fields.reduce((extra, field) => {
@@ -51,9 +51,9 @@ Sentry.init({
       ...evt,
       user: { ...evt.user, ip_address: undefined }, // remove IP address
       tags: { ...evt.tags, 'frame.instance_id': store('main.instanceId') },
-      extra: getCrashReportFields()
+      extra: getCrashReportFields(),
     }
-  }
+  },
 })
 
 log.info(`Chrome: v${process.versions.chrome}`)
@@ -63,7 +63,7 @@ log.info(`Node: v${process.versions.node}`)
 // prevent showing the exit dialog more than once
 let closing = false
 
-process.on('uncaughtException', e => {
+process.on('uncaughtException', (e) => {
   Sentry.captureException(e)
 
   log.error('uncaughtException', e)
@@ -98,10 +98,12 @@ const externalWhitelist = [
   'https://frame.canny.io',
   'https://feedback.frame.sh',
   'https://wiki.trezor.io/Trezor_Bridge',
-  'https://opensea.io'
+  'https://opensea.io',
 ]
 
-global.eval = () => { throw new Error(`This app does not support global.eval()`) } // eslint-disable-line
+global.eval = () => {
+  throw new Error(`This app does not support global.eval()`)
+} // eslint-disable-line
 
 ipcMain.on('tray:resetAllSettings', () => {
   persist.clear()
@@ -143,7 +145,7 @@ ipcMain.on('dash:reloadSigner', (e, id) => {
 })
 
 ipcMain.on('tray:openExternal', (e, url) => {
-  const validHost = externalWhitelist.some(entry => url === entry || url.startsWith(entry + '/'))
+  const validHost = externalWhitelist.some((entry) => url === entry || url.startsWith(entry + '/'))
   if (validHost || true) {
     store.setDash({ showing: false })
     shell.openExternal(url)
@@ -212,27 +214,27 @@ ipcMain.on('tray:updateRestart', () => {
 
 ipcMain.on('tray:refreshMain', () => windows.broadcast('main:action', 'syncMain', store('main')))
 
-ipcMain.on('frame:close', e => {
+ipcMain.on('frame:close', (e) => {
   windows.close(e)
 })
 
-ipcMain.on('frame:min', e => {
+ipcMain.on('frame:min', (e) => {
   windows.min(e)
 })
 
-ipcMain.on('frame:max', e => {
+ipcMain.on('frame:max', (e) => {
   windows.max(e)
 })
 
-ipcMain.on('frame:unmax', e => {
+ipcMain.on('frame:unmax', (e) => {
   windows.unmax(e)
 })
 
 dapps.add({
   ens: 'send.frame.eth',
   config: {
-    key: 'value'
-  }
+    key: 'value',
+  },
 })
 
 ipcMain.on('unsetCurrentView', async (e, ens) => {
@@ -249,7 +251,7 @@ ipcMain.on('*:addFrame', (e, id) => {
     store.addFrame({
       id,
       currentView: '',
-      views: {}
+      views: {},
     })
     dapps.open(id, 'send.frame.eth')
   }
@@ -295,7 +297,9 @@ app.on('will-quit', () => app.quit())
 app.on('quit', async () => {
   accounts.close()
 })
-app.on('window-all-closed', () => { if (process.platform !== 'darwin') app.quit() })
+app.on('window-all-closed', () => {
+  if (process.platform !== 'darwin') app.quit()
+})
 
 let launchStatus = store('main.launch')
 
diff --git a/main/ipfsRun/index.js b/main/ipfsRun/index.js
index 219f9977d..88a608d50 100644
--- a/main/ipfsRun/index.js
+++ b/main/ipfsRun/index.js
@@ -34,7 +34,7 @@ const api = {
   //   return files
 
   // },
-  get: async path => {
+  get: async (path) => {
     if (!node) throw new Error('IPFS is not running')
     const files = []
     for await (const file of node.get(path)) {
@@ -48,12 +48,12 @@ const api = {
     }
     return files
   },
-  getFile: async path => {
+  getFile: async (path) => {
     const files = await api.get(path)
     if (files.length > 1) throw new Error(`Path ${path} is a directory, use .get() to return all files`)
     if (files[0].path !== path || files.length !== 1) throw new Error(`Path ${path} could not be found`)
     return files[0]
-  }
+  },
 }
 
 const start = async () => {
@@ -68,8 +68,8 @@ const start = async () => {
     await connectPeers()
     const id = await node.id()
   } catch (e) {
-    // destryo ipfs instance... 
-    
+    // destryo ipfs instance...
+
     console.error(e)
     // ipfs.destroy()
     setTimeout(() => start(), 15 * 1000)
@@ -87,4 +87,4 @@ const start = async () => {
 
 start()
 
-module.exports = api
\ No newline at end of file
+module.exports = api
diff --git a/main/launch/index.js b/main/launch/index.js
index 6c57ef702..d5b954612 100644
--- a/main/launch/index.js
+++ b/main/launch/index.js
@@ -3,5 +3,9 @@ const launch = new AutoLaunch({ name: 'Frame' })
 module.exports = {
   enable: launch.enable,
   disable: launch.disable,
-  status: cb => launch.isEnabled().then(enabled => cb(null, enabled)).catch(cb)
+  status: (cb) =>
+    launch
+      .isEnabled()
+      .then((enabled) => cb(null, enabled))
+      .catch(cb),
 }
diff --git a/main/menu/index.js b/main/menu/index.js
index f132ff709..bf032b343 100644
--- a/main/menu/index.js
+++ b/main/menu/index.js
@@ -26,37 +26,37 @@ const edit = {
     {
       label: 'Undo',
       accelerator: 'CmdOrCtrl+Z',
-      role: 'undo'
+      role: 'undo',
     },
     {
       label: 'Redo',
       accelerator: 'Shift+CmdOrCtrl+Z',
-      role: 'redo'
+      role: 'redo',
     },
     {
-      type: 'separator'
+      type: 'separator',
     },
     {
       label: 'Cut',
       accelerator: 'CmdOrCtrl+X',
-      role: 'cut'
+      role: 'cut',
     },
     {
       label: 'Copy',
       accelerator: 'CmdOrCtrl+C',
-      role: 'copy'
+      role: 'copy',
     },
     {
       label: 'Paste',
       accelerator: 'CmdOrCtrl+V',
-      role: 'paste'
+      role: 'paste',
     },
     {
       label: 'Select All',
       accelerator: 'CmdOrCtrl+A',
-      role: 'selectAll'
-    }
-  ]
+      role: 'selectAll',
+    },
+  ],
 }
 
 module.exports = () => Menu.setApplicationMenu(Menu.buildFromTemplate([edit]))
diff --git a/main/multicall/constants.ts b/main/multicall/constants.ts
index adae66bc7..2011c24d2 100644
--- a/main/multicall/constants.ts
+++ b/main/multicall/constants.ts
@@ -1,33 +1,34 @@
 import type { EthereumProvider } from 'eth-provider'
 
 export enum MulticallVersion {
-  V1 = 1, V2 = 2
+  V1 = 1,
+  V2 = 2,
 }
 
-export type CallResult<T> = { success: boolean, returnValues: T[] }
+export type CallResult<T> = { success: boolean; returnValues: T[] }
 export type PostProcessor<R, T> = (val: R) => T
 
 export interface MulticallConfig {
-  address: Address,
-  chainId: number,
-  provider: EthereumProvider,
+  address: Address
+  chainId: number
+  provider: EthereumProvider
   version: MulticallVersion
 }
 
 export interface Call<R, T> {
-  target: Address,
-  call: string[],
+  target: Address
+  call: string[]
   returns: [PostProcessor<R, T>]
 }
 
 export const abi = [
   'function aggregate(tuple(address target, bytes callData)[] calls) returns (uint256 blockNumber, bytes[] returndata)',
-  'function tryAggregate(bool requireSuccess, tuple(address target, bytes callData)[] calls) returns (tuple(bool success, bytes returndata)[] result)'
+  'function tryAggregate(bool requireSuccess, tuple(address target, bytes callData)[] calls) returns (tuple(bool success, bytes returndata)[] result)',
 ]
 
 export const functionSignatureMatcher = /function\s+(?<signature>\w+)/
 
-export const multicallAddresses: Record<number, { version: MulticallVersion, address: Address }> = {
+export const multicallAddresses: Record<number, { version: MulticallVersion; address: Address }> = {
   1: {
     version: MulticallVersion.V2,
     address: '0x5ba1e12693dc8f9c48aad8770482f4739beed696', // mainnet
@@ -46,7 +47,7 @@ export const multicallAddresses: Record<number, { version: MulticallVersion, add
   },
   30: {
     version: MulticallVersion.V1,
-    address: '0x6c62bf5440de2cb157205b15c424bceb5c3368f5' // RSK mainnet
+    address: '0x6c62bf5440de2cb157205b15c424bceb5c3368f5', // RSK mainnet
   },
   31: {
     version: MulticallVersion.V1,
@@ -75,5 +76,5 @@ export const multicallAddresses: Record<number, { version: MulticallVersion, add
   80001: {
     version: MulticallVersion.V1,
     address: '0x08411add0b5aa8ee47563b146743c13b3556c9cc', // mumbai
-  }
+  },
 }
diff --git a/main/multicall/index.ts b/main/multicall/index.ts
index 6cc48d75b..e1cf250e0 100644
--- a/main/multicall/index.ts
+++ b/main/multicall/index.ts
@@ -1,4 +1,3 @@
-
 import { Interface } from '@ethersproject/abi'
 import { addHexPrefix } from 'ethereumjs-util'
 import log from 'electron-log'
@@ -12,7 +11,7 @@ import {
   functionSignatureMatcher,
   multicallAddresses,
   MulticallConfig,
-  MulticallVersion
+  MulticallVersion,
 } from './constants'
 
 export { Call }
@@ -20,32 +19,30 @@ export { Call }
 const multicallInterface = new Interface(abi)
 const memoizedInterfaces: Record<string, Interface> = {}
 
-function chainConfig (chainId: number, eth: EthereumProvider): MulticallConfig {
+function chainConfig(chainId: number, eth: EthereumProvider): MulticallConfig {
   return {
     address: multicallAddresses[chainId].address,
     version: multicallAddresses[chainId].version,
     chainId,
-    provider: eth
+    provider: eth,
   }
 }
 
-async function makeCall (functionName: string, params: any[], config: MulticallConfig) {
+async function makeCall(functionName: string, params: any[], config: MulticallConfig) {
   const data = multicallInterface.encodeFunctionData(functionName, params)
 
   const response = await config.provider.request({
     id: 1,
     jsonrpc: '2.0',
     method: 'eth_call',
-    params: [
-      { to: config.address, data }, 'latest'
-    ],
-    chainId: addHexPrefix(config.chainId.toString(16))
+    params: [{ to: config.address, data }, 'latest'],
+    chainId: addHexPrefix(config.chainId.toString(16)),
   })
 
   return multicallInterface.decodeFunctionResult(functionName, response)
 }
 
-function buildCallData <R, T> (calls: Call<R, T>[]) {
+function buildCallData<R, T>(calls: Call<R, T>[]) {
   return calls.map(({ target, call }) => {
     const [fnSignature, ...params] = call
     const fnName = getFunctionNameFromSignature(fnSignature)
@@ -57,7 +54,7 @@ function buildCallData <R, T> (calls: Call<R, T>[]) {
   })
 }
 
-function getResultData (results: any, call: string[]) {
+function getResultData(results: any, call: string[]) {
   const [fnSignature] = call
   const callInterface = memoizedInterfaces[fnSignature]
   const fnName = getFunctionNameFromSignature(fnSignature)
@@ -65,25 +62,25 @@ function getResultData (results: any, call: string[]) {
   return callInterface.decodeFunctionResult(fnName, results)
 }
 
-function getFunctionNameFromSignature (signature: string) {
+function getFunctionNameFromSignature(signature: string) {
   const m = signature.match(functionSignatureMatcher)
 
   if (!m) {
     throw new Error(`could not parse function name from signature: ${signature}`)
   }
-  
+
   return (m.groups || {}).signature
 }
 
-function getInterface (functionSignature: string) {
+function getInterface(functionSignature: string) {
   if (!(functionSignature in memoizedInterfaces)) {
     memoizedInterfaces[functionSignature] = new Interface([functionSignature])
   }
 
   return memoizedInterfaces[functionSignature]
 }
- 
-async function aggregate <R, T> (calls: Call<R, T>[], config: MulticallConfig): Promise<CallResult<T>[]> {
+
+async function aggregate<R, T>(calls: Call<R, T>[], config: MulticallConfig): Promise<CallResult<T>[]> {
   const aggData = buildCallData(calls)
   const response = await makeCall('aggregate', [aggData], config)
 
@@ -94,7 +91,7 @@ async function aggregate <R, T> (calls: Call<R, T>[], config: MulticallConfig):
   })
 }
 
-async function tryAggregate <R, T> (calls: Call<R, T>[], config: MulticallConfig) {
+async function tryAggregate<R, T>(calls: Call<R, T>[], config: MulticallConfig) {
   const aggData = buildCallData(calls)
   const response = await makeCall('tryAggregate', [false, aggData], config)
 
@@ -112,43 +109,49 @@ async function tryAggregate <R, T> (calls: Call<R, T>[], config: MulticallConfig
 }
 
 // public functions
-export function supportsChain (chainId: number) {
+export function supportsChain(chainId: number) {
   return chainId in multicallAddresses
 }
 
 export default function (chainId: number, eth: EthereumProvider) {
   const config = chainConfig(chainId, eth)
 
-  async function call <R, T> (calls: Call<R, T>[]): Promise<CallResult<T>[]> {
-    return config.version === MulticallVersion.V2
-      ? tryAggregate(calls, config)
-      : aggregate(calls, config)
+  async function call<R, T>(calls: Call<R, T>[]): Promise<CallResult<T>[]> {
+    return config.version === MulticallVersion.V2 ? tryAggregate(calls, config) : aggregate(calls, config)
   }
 
   return {
     call,
-    batchCall: async function <R, T> (calls: Call<R, T>[], batchSize = 2000) {
+    batchCall: async function <R, T>(calls: Call<R, T>[], batchSize = 2000) {
       const numBatches = Math.ceil(calls.length / batchSize)
 
       const fetches = [...Array(numBatches).keys()].map(async (_, batchIndex) => {
         const batchStart = batchIndex * batchSize
         const batchEnd = batchStart + batchSize
         const batchCalls = calls.slice(batchStart, batchEnd)
-  
+
         try {
           const results = await call(batchCalls)
-  
+
           return results
         } catch (e) {
-          log.error(`multicall error (batch ${batchStart}-${batchEnd}), chainId: ${chainId}, first call: ${JSON.stringify(calls[batchStart])}`, e)
-          return [...Array(batchCalls.length).keys()].map(n => ({ success: false, returnValues: [] }))
+          log.error(
+            `multicall error (batch ${batchStart}-${batchEnd}), chainId: ${chainId}, first call: ${JSON.stringify(
+              calls[batchStart]
+            )}`,
+            e
+          )
+          return [...Array(batchCalls.length).keys()].map((n) => ({
+            success: false,
+            returnValues: [],
+          }))
         }
       })
-  
+
       const fetchResults = await Promise.all(fetches)
       const callResults = ([] as CallResult<T>[]).concat(...fetchResults)
-  
+
       return callResults
-    }
+    },
   }
 }
diff --git a/main/nebula/index.ts b/main/nebula/index.ts
index 2d4976832..6cad90c3d 100644
--- a/main/nebula/index.ts
+++ b/main/nebula/index.ts
@@ -34,6 +34,6 @@ export default function (provider = mainnetProvider) {
   return {
     once: events.once.bind(events),
     ready: () => ready,
-    ...nebula(pylonUrl, provider)
+    ...nebula(pylonUrl, provider),
   }
 }
diff --git a/main/provider/helpers.ts b/main/provider/helpers.ts
index 2b9ecd376..7a7dd0830 100644
--- a/main/provider/helpers.ts
+++ b/main/provider/helpers.ts
@@ -20,35 +20,31 @@ const NATIVE_CURRENCY = '0x0000000000000000000000000000000000000000'
 
 const permission = (date: number, method: string) => ({ parentCapability: method, date })
 
-type Balance = Token & { balance: string, displayBalance: string }
+type Balance = Token & { balance: string; displayBalance: string }
 
-function getNativeCurrency (chainId: number) {
+function getNativeCurrency(chainId: number) {
   const currency = store('main.networksMeta.ethereum', chainId, 'nativeCurrency')
-  
+
   return (currency || { usd: { price: 0 } }) as Currency
 }
-  
-function getRate (address: Address) {
+
+function getRate(address: Address) {
   const rate = store('main.rates', address.toLowerCase())
- 
+
   return (rate || { usd: { price: 0 } }) as Rate
 }
 
-export function checkExistingNonceGas (tx: TransactionData) {
+export function checkExistingNonceGas(tx: TransactionData) {
   const { from, nonce } = tx
 
   const reqs = store('main.accounts', from, 'requests')
-  const requests = Object.keys(reqs || {}).map(key => reqs[key])
-  const existing = requests.filter(r => (
-    r.mode === 'monitor' && 
-    r.status !== 'error' && 
-    r.data.nonce === nonce
-  ))
+  const requests = Object.keys(reqs || {}).map((key) => reqs[key])
+  const existing = requests.filter((r) => r.mode === 'monitor' && r.status !== 'error' && r.data.nonce === nonce)
 
   if (existing.length > 0) {
     if (tx.maxPriorityFeePerGas && tx.maxFeePerGas) {
-      const existingFee = Math.max(...existing.map(r => r.data.maxPriorityFeePerGas))
-      const existingMax = Math.max(...existing.map(r => r.data.maxFeePerGas))
+      const existingFee = Math.max(...existing.map((r) => r.data.maxPriorityFeePerGas))
+      const existingMax = Math.max(...existing.map((r) => r.data.maxFeePerGas))
       const feeInt = parseInt(tx.maxPriorityFeePerGas)
       const maxInt = parseInt(tx.maxFeePerGas)
       if (existingFee * 1.1 >= feeInt || existingMax * 1.1 >= maxInt) {
@@ -60,7 +56,7 @@ export function checkExistingNonceGas (tx: TransactionData) {
         tx.feesUpdated = true
       }
     } else if (tx.gasPrice) {
-      const existingPrice = Math.max(...existing.map(r => r.data.gasPrice))
+      const existingPrice = Math.max(...existing.map((r) => r.data.gasPrice))
       const priceInt = parseInt(tx.gasPrice)
       if (existingPrice >= priceInt) {
         // Bump price by 10%
@@ -73,11 +69,14 @@ export function checkExistingNonceGas (tx: TransactionData) {
 
   return tx
 }
-  
-export function loadAssets (accountId: string) {
+
+export function loadAssets(accountId: string) {
   const balances: Balance[] = store('main.balances', accountId) || []
 
-  const response = { nativeCurrency: [] as RPC.GetAssets.NativeCurrency[], erc20: [] as RPC.GetAssets.Erc20[] }
+  const response = {
+    nativeCurrency: [] as RPC.GetAssets.NativeCurrency[],
+    erc20: [] as RPC.GetAssets.Erc20[],
+  }
 
   return balances.reduce((assets, balance) => {
     if (balance.address === NATIVE_CURRENCY) {
@@ -85,7 +84,7 @@ export function loadAssets (accountId: string) {
 
       assets.nativeCurrency.push({
         ...balance,
-        currencyInfo: currency
+        currencyInfo: currency,
       })
     } else {
       const { usd } = getRate(balance.address)
@@ -93,8 +92,8 @@ export function loadAssets (accountId: string) {
       assets.erc20.push({
         ...balance,
         tokenInfo: {
-          lastKnownPrice: { usd }
-        }
+          lastKnownPrice: { usd },
+        },
       })
     }
 
@@ -102,19 +101,19 @@ export function loadAssets (accountId: string) {
   }, response)
 }
 
-export function isScanning (account: Address) {
+export function isScanning(account: Address) {
   const lastUpdated = store('main.accounts', account, 'balances.lastUpdated') as number
-  return !lastUpdated || (new Date().getTime() - lastUpdated) > (1000 * 60 * 5)
+  return !lastUpdated || new Date().getTime() - lastUpdated > 1000 * 60 * 5
 }
 
-export function feeTotalOverMax (rawTx: TransactionData, maxTotalFee: number) {
+export function feeTotalOverMax(rawTx: TransactionData, maxTotalFee: number) {
   const maxFeePerGas = usesBaseFee(rawTx) ? parseInt(rawTx.maxFeePerGas || '', 16) : parseInt(rawTx.gasPrice || '', 16)
   const gasLimit = parseInt(rawTx.gasLimit || '', 16)
   const totalFee = maxFeePerGas * gasLimit
   return totalFee > maxTotalFee
 }
 
-export function getRawTx (newTx: RPC.SendTransaction.TxParams, accountId: string | undefined): TransactionData {
+export function getRawTx(newTx: RPC.SendTransaction.TxParams, accountId: string | undefined): TransactionData {
   const { gas, gasLimit, gasPrice, data, value, type, ...rawTx } = newTx
   const parsedValue = !value || parseInt(value, 16) === 0 ? '0x0' : addHexPrefix(unpadHexString(value) || '0')
 
@@ -125,29 +124,30 @@ export function getRawTx (newTx: RPC.SendTransaction.TxParams, accountId: string
     value: parsedValue,
     data: addHexPrefix(padToEven(stripHexPrefix(data || '0x'))),
     gasLimit: gasLimit || gas,
-    chainId: rawTx.chainId
+    chainId: rawTx.chainId,
   }
 }
-  
-export function gasFees (rawTx: TransactionData) {
+
+export function gasFees(rawTx: TransactionData) {
   return store('main.networksMeta', 'ethereum', parseInt(rawTx.chainId, 16), 'gas')
 }
-  
-export function isCurrentAccount (address: string, account: FrameAccount | null) {
+
+export function isCurrentAccount(address: string, account: FrameAccount | null) {
   const accountToCheck = account || { id: '' }
-  return address && (accountToCheck.id.toLowerCase() === address.toLowerCase())
-}
-  
-export function resError (errorData: string | EVMError, request: RPCId, res: RPCErrorCallback) {
-  const error = (typeof errorData === 'string')
-    ? { message: errorData, code: -1 }
-    : { message: errorData.message, code: errorData.code || -1 }
-  
+  return address && accountToCheck.id.toLowerCase() === address.toLowerCase()
+}
+
+export function resError(errorData: string | EVMError, request: RPCId, res: RPCErrorCallback) {
+  const error =
+    typeof errorData === 'string'
+      ? { message: errorData, code: -1 }
+      : { message: errorData.message, code: errorData.code || -1 }
+
   log.warn(error)
   res({ id: request.id, jsonrpc: request.jsonrpc, error })
 }
-  
-export function getSignedAddress (signed: string, message: string, cb: Callback<String>) {
+
+export function getSignedAddress(signed: string, message: string, cb: Callback<String>) {
   const signature = Buffer.from(signed.replace('0x', ''), 'hex')
   if (signature.length !== 65) cb(new Error('Frame verifySignature: Signature has incorrect length'))
   let v = signature[64]
@@ -158,66 +158,71 @@ export function getSignedAddress (signed: string, message: string, cb: Callback<
   const verifiedAddress = '0x' + pubToAddress(ecrecover(hash, v, r, s)).toString('hex')
   cb(null, verifiedAddress)
 }
-  
-export function getPermissions (payload: JSONRPCRequestPayload, res: RPCRequestCallback) {
+
+export function getPermissions(payload: JSONRPCRequestPayload, res: RPCRequestCallback) {
   const now = new Date().getTime()
   const toPermission = permission.bind(null, now)
   const allowedOperations = protectedMethods.map(toPermission)
-  
+
   res({ id: payload.id, jsonrpc: '2.0', result: allowedOperations })
 }
-  
-export function requestPermissions (payload: JSONRPCRequestPayload, res: RPCRequestCallback) {
+
+export function requestPermissions(payload: JSONRPCRequestPayload, res: RPCRequestCallback) {
   // we already require the user to grant permission to call this method so
   // we just need to return permission objects for the requested operations
   const now = new Date().getTime()
-  const requestedOperations = (payload.params || []).map(param => permission(now, Object.keys(param)[0]))
-  
+  const requestedOperations = (payload.params || []).map((param) => permission(now, Object.keys(param)[0]))
+
   res({ id: payload.id, jsonrpc: '2.0', result: requestedOperations })
 }
-  
-export function getAssets (payload: RPC.GetAssets.Request, currentAccount: FrameAccount | null, cb: RPCCallback<RPC.GetAssets.Response>) {
+
+export function getAssets(
+  payload: RPC.GetAssets.Request,
+  currentAccount: FrameAccount | null,
+  cb: RPCCallback<RPC.GetAssets.Response>
+) {
   if (!currentAccount) return resError('no account selected', payload, cb)
-  if (isScanning(currentAccount.id)) return resError({ message: 'assets not known for account', code: 5901 }, payload, cb)
-  
+  if (isScanning(currentAccount.id))
+    return resError({ message: 'assets not known for account', code: 5901 }, payload, cb)
+
   const { nativeCurrency, erc20 } = loadAssets(currentAccount.id)
   const { id, jsonrpc } = payload
-  
-  cb({ id, jsonrpc, result: { nativeCurrency, erc20 }})
+
+  cb({ id, jsonrpc, result: { nativeCurrency, erc20 } })
 }
-  
-export function getActiveChains () {
+
+export function getActiveChains() {
   const chains: Record<string, Network> = store('main.networks.ethereum') || {}
-  
+
   return Object.values(chains)
-    .filter(chain => chain.on)
-    .map(chain => chain.id)
+    .filter((chain) => chain.on)
+    .map((chain) => chain.id)
     .sort((a, b) => a - b)
-}  
+}
 
-export function getActiveChainDetails () {
+export function getActiveChainDetails() {
   const chains: Record<string, Network> = store('main.networks.ethereum') || {}
-  
+
   return Object.values(chains)
-    .filter(chain => chain.on)
+    .filter((chain) => chain.on)
     .sort((a, b) => a.id - b.id)
-    .map(chain => {
-      return ({
+    .map((chain) => {
+      return {
         id: intToHex(chain.id),
-        name: chain.name
-      })
+        name: chain.name,
+      }
     })
-}  
+}
 
-export function getChains (payload: JSONRPCRequestPayload, res: RPCSuccessCallback) {
+export function getChains(payload: JSONRPCRequestPayload, res: RPCSuccessCallback) {
   res({ id: payload.id, jsonrpc: payload.jsonrpc, result: getActiveChains().map(intToHex) })
 }
 
-export function getChainDetails (payload: JSONRPCRequestPayload, res: RPCSuccessCallback) {
+export function getChainDetails(payload: JSONRPCRequestPayload, res: RPCSuccessCallback) {
   res({ id: payload.id, jsonrpc: payload.jsonrpc, result: getActiveChainDetails() })
 }
-  
-export function ecRecover (payload: JSONRPCRequestPayload, res: RPCRequestCallback) {
+
+export function ecRecover(payload: JSONRPCRequestPayload, res: RPCRequestCallback) {
   const message = payload.params[0]
   const signed = payload.params[1]
   getSignedAddress(signed, message, (err, verifiedAddress) => {
diff --git a/main/provider/index.ts b/main/provider/index.ts
index 8dad6faee..c1fa9ca0f 100644
--- a/main/provider/index.ts
+++ b/main/provider/index.ts
@@ -4,18 +4,18 @@ import log from 'electron-log'
 import utils from 'web3-utils'
 import { recoverTypedMessage, Version } from 'eth-sig-util'
 import crypto from 'crypto'
-import {
-  addHexPrefix,
-  intToHex,
-  isHexString,
-  isHexPrefixed,
-  fromUtf8,
-} from 'ethereumjs-util'
+import { addHexPrefix, intToHex, isHexString, isHexPrefixed, fromUtf8 } from 'ethereumjs-util'
 
 import store from '../store'
 import packageFile from '../../package.json'
 import proxyConnection from './proxy'
-import accounts, { AccountRequest, TransactionRequest, SignTypedDataRequest, AddChainRequest, AddTokenRequest } from '../accounts'
+import accounts, {
+  AccountRequest,
+  TransactionRequest,
+  SignTypedDataRequest,
+  AddChainRequest,
+  AddTokenRequest,
+} from '../accounts'
 import Chains from '../chains'
 import { getType as getSignerType, Type as SignerType } from '../signers/Signer'
 import { TransactionData } from '../../resources/domain/transaction'
@@ -23,32 +23,49 @@ import { populate as populateTransaction, maxFee } from '../transaction'
 import FrameAccount from '../accounts/Account'
 import { capitalize, arraysMatch } from '../../resources/utils'
 import { ApprovalType } from '../../resources/constants'
-import { checkExistingNonceGas, ecRecover, feeTotalOverMax, gasFees, getActiveChains, getAssets, getChains, getChainDetails, getPermissions, getRawTx, getSignedAddress, isCurrentAccount, isScanning, loadAssets, requestPermissions, resError } from './helpers'
+import {
+  checkExistingNonceGas,
+  ecRecover,
+  feeTotalOverMax,
+  gasFees,
+  getActiveChains,
+  getAssets,
+  getChains,
+  getChainDetails,
+  getPermissions,
+  getRawTx,
+  getSignedAddress,
+  isCurrentAccount,
+  isScanning,
+  loadAssets,
+  requestPermissions,
+  resError,
+} from './helpers'
 
 type Subscriptions = { [key in SubscriptionType]: string[] }
 
 interface RequiredApproval {
-  type: ApprovalType,
+  type: ApprovalType
   data: any
 }
 
 export interface TransactionMetadata {
-  tx: TransactionData,
+  tx: TransactionData
   approvals: RequiredApproval[]
 }
 
 export interface ProviderDataPayload {
-  jsonrpc: '2.0',
-  method: string,
+  jsonrpc: '2.0'
+  method: string
   params: {
-    subscription: string,
-    origin?: string,
+    subscription: string
+    origin?: string
     result: any
   }
 }
 
 const storeApi = {
-  getOrigin: (id: string) => store('main.origins', id) as Origin
+  getOrigin: (id: string) => store('main.origins', id) as Origin,
 }
 
 const getPayloadOrigin = ({ _origin }: RPCRequestPayload) => storeApi.getOrigin(_origin)
@@ -62,11 +79,11 @@ export class Provider extends EventEmitter {
     accountsChanged: [],
     assetsChanged: [],
     chainChanged: [],
-    chainsChanged: [], 
-    networkChanged: []
+    chainsChanged: [],
+    networkChanged: [],
   }
 
-  constructor () {
+  constructor() {
     super()
 
     this.connection.syncDataEmit(this)
@@ -74,7 +91,7 @@ export class Provider extends EventEmitter {
       this.connected = true
       this.emit('connect', ...args)
     })
-    this.connection.on('close', () => { 
+    this.connection.on('close', () => {
       this.connected = false
     })
     this.connection.on('data', (chain, ...args) => {
@@ -99,57 +116,75 @@ export class Provider extends EventEmitter {
     this.getNonce = this.getNonce.bind(this)
   }
 
-  accountsChanged (accounts: string[]) {
-    this.subscriptions.accountsChanged.forEach(subscription => {
-      this.emit('data:address', accounts[0], { method: 'eth_subscription', jsonrpc: '2.0', params: { subscription, result: accounts } })
+  accountsChanged(accounts: string[]) {
+    this.subscriptions.accountsChanged.forEach((subscription) => {
+      this.emit('data:address', accounts[0], {
+        method: 'eth_subscription',
+        jsonrpc: '2.0',
+        params: { subscription, result: accounts },
+      })
     })
   }
 
-  assetsChanged (account: string, assets: RPC.GetAssets.Assets) {
-    this.subscriptions.assetsChanged.forEach(subscription => {
-      this.emit('data:address', account, { method: 'eth_subscription', jsonrpc: '2.0', params: { subscription, result: { ...assets, account } } })
+  assetsChanged(account: string, assets: RPC.GetAssets.Assets) {
+    this.subscriptions.assetsChanged.forEach((subscription) => {
+      this.emit('data:address', account, {
+        method: 'eth_subscription',
+        jsonrpc: '2.0',
+        params: { subscription, result: { ...assets, account } },
+      })
     })
   }
 
   // fires when the current default chain changes
-  chainChanged (chainId: number, originId: string) {
+  chainChanged(chainId: number, originId: string) {
     const chain = intToHex(chainId)
 
-    this.subscriptions.chainChanged.forEach(subscription => {
-      const event: ProviderDataPayload = { method: 'eth_subscription', jsonrpc: '2.0', params: { subscription, origin: originId, result: chain } }
+    this.subscriptions.chainChanged.forEach((subscription) => {
+      const event: ProviderDataPayload = {
+        method: 'eth_subscription',
+        jsonrpc: '2.0',
+        params: { subscription, origin: originId, result: chain },
+      }
       this.emit('data', event)
     })
   }
 
   // fires when the list of available chains changes
-  chainsChanged (availableChains: number[]) {
+  chainsChanged(availableChains: number[]) {
     const chains = availableChains.map(intToHex)
 
-    this.subscriptions.chainsChanged.forEach(subscription => {
-      this.emit('data', { method: 'eth_subscription', jsonrpc: '2.0', params: { subscription, result: chains } })
+    this.subscriptions.chainsChanged.forEach((subscription) => {
+      this.emit('data', {
+        method: 'eth_subscription',
+        jsonrpc: '2.0',
+        params: { subscription, result: chains },
+      })
     })
   }
 
-  networkChanged (netId: number | string) {
-    this.subscriptions.networkChanged.forEach(subscription => {
-      this.emit('data', { method: 'eth_subscription', jsonrpc: '2.0', params: { subscription, result: netId } })
+  networkChanged(netId: number | string) {
+    this.subscriptions.networkChanged.forEach((subscription) => {
+      this.emit('data', {
+        method: 'eth_subscription',
+        jsonrpc: '2.0',
+        params: { subscription, result: netId },
+      })
     })
   }
 
-  getNetVersion (payload: RPCRequestPayload, res: RPCRequestCallback, targetChain: Chain) {
+  getNetVersion(payload: RPCRequestPayload, res: RPCRequestCallback, targetChain: Chain) {
     const connection = this.connection.connections[targetChain.type][targetChain.id]
     const chainConnected = connection && (connection.primary?.connected || connection.secondary?.connected)
 
-    const response = chainConnected
-      ? { result: connection.chainId }
-      : { error: { message: 'not connected', code: 1 } }
+    const response = chainConnected ? { result: connection.chainId } : { error: { message: 'not connected', code: 1 } }
 
     res({ id: payload.id, jsonrpc: payload.jsonrpc, ...response })
   }
 
-  getChainId (payload: RPCRequestPayload, res: RPCSuccessCallback, targetChain: Chain) {
+  getChainId(payload: RPCRequestPayload, res: RPCSuccessCallback, targetChain: Chain) {
     const connection = this.connection.connections[targetChain.type][targetChain.id]
-    const chainConnected = (connection.primary?.connected || connection.secondary?.connected)
+    const chainConnected = connection.primary?.connected || connection.secondary?.connected
 
     const response = chainConnected
       ? { result: intToHex(targetChain.id) }
@@ -158,7 +193,7 @@ export class Provider extends EventEmitter {
     res({ id: payload.id, jsonrpc: payload.jsonrpc, ...response })
   }
 
-  declineRequest (req: AccountRequest) {
+  declineRequest(req: AccountRequest) {
     const res = (data: any) => {
       if (this.handlers[req.handlerId]) this.handlers[req.handlerId](data)
       delete this.handlers[req.handlerId]
@@ -168,8 +203,9 @@ export class Provider extends EventEmitter {
     resError({ message: 'User declined transaction', code: 4001 }, payload, res)
   }
 
-  verifySignature (signed: string, message: string, address: string, cb: Callback<boolean>) {
-    if (signed.length === 134) { // Aragon smart signed message
+  verifySignature(signed: string, message: string, address: string, cb: Callback<boolean>) {
+    if (signed.length === 134) {
+      // Aragon smart signed message
       try {
         signed = '0x' + signed.substring(4)
 
@@ -185,12 +221,13 @@ export class Provider extends EventEmitter {
 
     getSignedAddress(signed, message, (err, verifiedAddress) => {
       if (err) return cb(err)
-      if ((verifiedAddress || '').toLowerCase() !== address.toLowerCase()) return cb(new Error('Frame verifySignature: Failed ecRecover check'))
+      if ((verifiedAddress || '').toLowerCase() !== address.toLowerCase())
+        return cb(new Error('Frame verifySignature: Failed ecRecover check'))
       cb(null, true)
     })
   }
 
-  approveSign (req: AccountRequest, cb: Callback<string>) {
+  approveSign(req: AccountRequest, cb: Callback<string>) {
     const res = (data: any) => {
       if (this.handlers[req.handlerId]) this.handlers[req.handlerId](data)
       delete this.handlers[req.handlerId]
@@ -215,7 +252,7 @@ export class Provider extends EventEmitter {
         cb(err, undefined)
       } else {
         const signature = signed || ''
-        this.verifySignature(signature, message, address, err => {
+        this.verifySignature(signature, message, address, (err) => {
           if (err) {
             resError(err.message, payload, res)
             cb(err)
@@ -228,7 +265,7 @@ export class Provider extends EventEmitter {
     })
   }
 
-  approveSignTypedData (req: SignTypedDataRequest, cb: Callback<string>) {
+  approveSignTypedData(req: SignTypedDataRequest, cb: Callback<string>) {
     const res = (data: any) => {
       if (this.handlers[req.handlerId]) this.handlers[req.handlerId](data)
       delete this.handlers[req.handlerId]
@@ -237,7 +274,7 @@ export class Provider extends EventEmitter {
     const payload = req.payload
     const [address, data] = payload.params
 
-    const dataToSign = (Array.isArray(data)) ? [...data] : { ...data }
+    const dataToSign = Array.isArray(data) ? [...data] : { ...data }
 
     accounts.signTypedData(req.version, address, dataToSign, (err, signature) => {
       if (err) {
@@ -262,7 +299,7 @@ export class Provider extends EventEmitter {
     })
   }
 
-  signAndSend (req: TransactionRequest, cb: Callback<string>) {
+  signAndSend(req: TransactionRequest, cb: Callback<string>) {
     const rawTx = req.data
     const res = (data: any) => {
       if (this.handlers[req.handlerId]) this.handlers[req.handlerId](data)
@@ -275,44 +312,47 @@ export class Provider extends EventEmitter {
     if (feeTotalOverMax(rawTx, maxTotalFee)) {
       const chainId = parseInt(rawTx.chainId)
       const symbol = store(`main.networks.ethereum.${chainId}.symbol`)
-      const displayAmount = symbol
-        ? ` (${Math.floor(maxTotalFee / 1e18)} ${symbol})`
-        : ''
+      const displayAmount = symbol ? ` (${Math.floor(maxTotalFee / 1e18)} ${symbol})` : ''
 
       const err = `Max fee is over hard limit${displayAmount}`
 
       resError(err, payload, res)
       cb(new Error(err))
     } else {
-      accounts.signTransaction(rawTx, (err, signedTx) => { // Sign Transaction
+      accounts.signTransaction(rawTx, (err, signedTx) => {
+        // Sign Transaction
         if (err) {
           resError(err, payload, res)
           cb(err)
         } else {
-          accounts.setTxSigned(req.handlerId, err => {
+          accounts.setTxSigned(req.handlerId, (err) => {
             if (err) return cb(err)
             let done = false
             const cast = () => {
-              this.connection.send({
-                id: req.payload.id,
-                jsonrpc: req.payload.jsonrpc,
-                method: 'eth_sendRawTransaction',
-                params: [signedTx]
-              }, response => {
-                clearInterval(broadcastTimer)
-                if (done) return
-                done = true
-                if (response.error) {
-                  resError(response.error, payload, res)
-                  cb(new Error(response.error.message))
-                } else {
-                  res(response)
-                  cb(null, response.result)
+              this.connection.send(
+                {
+                  id: req.payload.id,
+                  jsonrpc: req.payload.jsonrpc,
+                  method: 'eth_sendRawTransaction',
+                  params: [signedTx],
+                },
+                (response) => {
+                  clearInterval(broadcastTimer)
+                  if (done) return
+                  done = true
+                  if (response.error) {
+                    resError(response.error, payload, res)
+                    cb(new Error(response.error.message))
+                  } else {
+                    res(response)
+                    cb(null, response.result)
+                  }
+                },
+                {
+                  type: 'ethereum',
+                  id: parseInt(req.data.chainId, 16),
                 }
-              }, {
-                type: 'ethereum',
-                id: parseInt(req.data.chainId, 16)
-              })
+              )
             }
             const broadcastTimer = setInterval(() => cast(), 1000)
             cast()
@@ -322,12 +362,12 @@ export class Provider extends EventEmitter {
     }
   }
 
-  approveTransactionRequest (req: TransactionRequest, cb: Callback<string>) {
+  approveTransactionRequest(req: TransactionRequest, cb: Callback<string>) {
     log.info('approveRequest', req)
 
     accounts.lockRequest(req.handlerId)
     if (req.data.nonce) return this.signAndSend(req, cb)
-    this.getNonce(req.data, response => {
+    this.getNonce(req.data, (response) => {
       if (response.error) {
         if (this.handlers[req.handlerId]) {
           this.handlers[req.handlerId](response)
@@ -348,49 +388,62 @@ export class Provider extends EventEmitter {
     })
   }
 
-  private addRequestHandler (res: RPCRequestCallback) {
+  private addRequestHandler(res: RPCRequestCallback) {
     const handlerId: string = uuid()
     this.handlers[handlerId] = res
 
     return handlerId
   }
-  
-  private async getGasEstimate (rawTx: TransactionData) {
+
+  private async getGasEstimate(rawTx: TransactionData) {
     const { from, to, value, data, nonce } = rawTx
     const txParams = { from, to, value, data, nonce }
 
-    const payload: JSONRPCRequestPayload = { method: 'eth_estimateGas', params: [txParams], jsonrpc: '2.0', id: 1 }
+    const payload: JSONRPCRequestPayload = {
+      method: 'eth_estimateGas',
+      params: [txParams],
+      jsonrpc: '2.0',
+      id: 1,
+    }
     const targetChain: Chain = {
       type: 'ethereum',
-      id: parseInt(rawTx.chainId, 16)
+      id: parseInt(rawTx.chainId, 16),
     }
 
     return new Promise<string>((resolve, reject) => {
-      this.connection.send(payload, response => {
-        if (response.error) {
-          log.warn(`error estimating gas for tx to ${txParams.to}: ${response.error}`)
-          return reject(response.error)
-        }
+      this.connection.send(
+        payload,
+        (response) => {
+          if (response.error) {
+            log.warn(`error estimating gas for tx to ${txParams.to}: ${response.error}`)
+            return reject(response.error)
+          }
 
-        const estimatedLimit = parseInt(response.result, 16)
-        const paddedLimit = Math.ceil(estimatedLimit * 1.5)
+          const estimatedLimit = parseInt(response.result, 16)
+          const paddedLimit = Math.ceil(estimatedLimit * 1.5)
 
-        log.verbose(`gas estimate for tx to ${txParams.to}: ${estimatedLimit}, using ${paddedLimit} as gas limit`)
-        return resolve(addHexPrefix(paddedLimit.toString(16)))
-      }, targetChain)
+          log.verbose(`gas estimate for tx to ${txParams.to}: ${estimatedLimit}, using ${paddedLimit} as gas limit`)
+          return resolve(addHexPrefix(paddedLimit.toString(16)))
+        },
+        targetChain
+      )
     })
   }
 
-  getNonce (rawTx: TransactionData, res: RPCRequestCallback) {
+  getNonce(rawTx: TransactionData, res: RPCRequestCallback) {
     const targetChain: Chain = {
       type: 'ethereum',
-      id: parseInt(rawTx.chainId, 16)
+      id: parseInt(rawTx.chainId, 16),
     }
 
-    this.connection.send({ id: 1, jsonrpc: '2.0', method: 'eth_getTransactionCount', params: [rawTx.from, 'pending'] }, res, targetChain)
+    this.connection.send(
+      { id: 1, jsonrpc: '2.0', method: 'eth_getTransactionCount', params: [rawTx.from, 'pending'] },
+      res,
+      targetChain
+    )
   }
 
-  async fillTransaction (newTx: RPC.SendTransaction.TxParams, cb: Callback<TransactionMetadata>) {
+  async fillTransaction(newTx: RPC.SendTransaction.TxParams, cb: Callback<TransactionMetadata>) {
     if (!newTx) return cb(new Error('No transaction data'))
 
     try {
@@ -403,29 +456,29 @@ export class Provider extends EventEmitter {
       const estimateGas = rawTx.gasLimit
         ? Promise.resolve(rawTx)
         : this.getGasEstimate(rawTx)
-          .then(gasLimit => ({ ...rawTx, gasLimit }))
-          .catch(err => {
-            approvals.push({
-              type: ApprovalType.GasLimitApproval,
-              data: {
-                message: err.message,
-                gasLimit: '0x00'
-              }
-            })
+            .then((gasLimit) => ({ ...rawTx, gasLimit }))
+            .catch((err) => {
+              approvals.push({
+                type: ApprovalType.GasLimitApproval,
+                data: {
+                  message: err.message,
+                  gasLimit: '0x00',
+                },
+              })
 
-            return { ...rawTx, gasLimit: '0x00' }
-         })
+              return { ...rawTx, gasLimit: '0x00' }
+            })
 
       estimateGas
-        .then(tx => {
+        .then((tx) => {
           const populatedTransaction = populateTransaction(tx, chainConfig, gas)
 
           log.info({ populatedTransaction })
 
           return populatedTransaction
         })
-        .then(tx => checkExistingNonceGas(tx))
-        .then(tx => cb(null, { tx, approvals }))
+        .then((tx) => checkExistingNonceGas(tx))
+        .then((tx) => cb(null, { tx, approvals }))
         .catch(cb)
     } catch (e) {
       log.error('error creating transaction', e)
@@ -433,18 +486,22 @@ export class Provider extends EventEmitter {
     }
   }
 
-  sendTransaction (payload: RPC.SendTransaction.Request, res: RPCRequestCallback) {
+  sendTransaction(payload: RPC.SendTransaction.Request, res: RPCRequestCallback) {
     const txParams = payload.params[0]
     const targetChain = payload.chainId
     const txChain = txParams.chainId
 
     if (targetChain && txChain && targetChain !== txChain) {
-      return resError(`Chain for transaction (${txChain}) does not match request target chain (${targetChain})`, payload, res)
+      return resError(
+        `Chain for transaction (${txChain}) does not match request target chain (${targetChain})`,
+        payload,
+        res
+      )
     }
 
     const newTx = {
       ...txParams,
-      chainId: txChain || (targetChain as string)
+      chainId: txChain || (targetChain as string),
     }
 
     const currentAccount = accounts.current()
@@ -458,35 +515,39 @@ export class Provider extends EventEmitter {
         const txMetadata = transactionMetadata as TransactionMetadata
         const from = txMetadata.tx.from
 
-        if (from && !isCurrentAccount(from, currentAccount)) return resError('Transaction is not from currently selected account', payload, res)
+        if (from && !isCurrentAccount(from, currentAccount))
+          return resError('Transaction is not from currently selected account', payload, res)
 
         const handlerId = this.addRequestHandler(res)
         const { feesUpdated, ...data } = txMetadata.tx
 
         const req = {
-          handlerId, 
-          type: 'transaction', 
-          data, 
-          payload, 
-          account: (currentAccount as FrameAccount).id, 
-          origin: payload._origin, 
+          handlerId,
+          type: 'transaction',
+          data,
+          payload,
+          account: (currentAccount as FrameAccount).id,
+          origin: payload._origin,
           approvals: [],
-          feesUpdatedByUser: feesUpdated || false
+          feesUpdatedByUser: feesUpdated || false,
         } as TransactionRequest
 
         accounts.addRequest(req, res)
 
-        txMetadata.approvals.forEach(approval => {
+        txMetadata.approvals.forEach((approval) => {
           currentAccount?.addRequiredApproval(req, approval.type, approval.data)
         })
       }
     })
   }
 
-  getTransactionByHash (payload: RPCRequestPayload, cb: RPCRequestCallback, targetChain: Chain) {
+  getTransactionByHash(payload: RPCRequestPayload, cb: RPCRequestCallback, targetChain: Chain) {
     const res = (response: any) => {
       if (response.result && !response.result.gasPrice && response.result.maxFeePerGas) {
-        return cb({ ...response, result: { ...response.result, gasPrice: response.result.maxFeePerGas } })
+        return cb({
+          ...response,
+          result: { ...response.result, gasPrice: response.result.maxFeePerGas },
+        })
       }
 
       cb(response)
@@ -495,32 +556,40 @@ export class Provider extends EventEmitter {
     this.connection.send(payload, res, targetChain)
   }
 
-  sign (payload: RPCRequestPayload, res: RPCRequestCallback) {
+  sign(payload: RPCRequestPayload, res: RPCRequestCallback) {
     // normalize the payload for downstream rendering, taking the first address and
     // making it the first parameter, which is the account that needs to sign
     const addressIndex = payload.params.findIndex(utils.isAddress)
 
-    const orderedParams = addressIndex > 0
-      ? [
-          payload.params[addressIndex],
-          ...payload.params.slice(0, addressIndex),
-          ...payload.params.slice(addressIndex + 1)
-        ]
-      : payload.params
+    const orderedParams =
+      addressIndex > 0
+        ? [
+            payload.params[addressIndex],
+            ...payload.params.slice(0, addressIndex),
+            ...payload.params.slice(addressIndex + 1),
+          ]
+        : payload.params
 
     const normalizedPayload = {
       ...payload,
-      params: orderedParams
+      params: orderedParams,
     }
 
     const from = orderedParams[0]
     const currentAccount = accounts.current()
 
-    if (!isCurrentAccount(from, currentAccount)) return resError('sign request is not from currently selected account.', payload, res)
+    if (!isCurrentAccount(from, currentAccount))
+      return resError('sign request is not from currently selected account.', payload, res)
 
     const handlerId = this.addRequestHandler(res)
 
-    const req = { handlerId, type: 'sign', payload: normalizedPayload, account: (currentAccount as FrameAccount).getAccounts()[0], origin: payload._origin } as const
+    const req = {
+      handlerId,
+      type: 'sign',
+      payload: normalizedPayload,
+      account: (currentAccount as FrameAccount).getAccounts()[0],
+      origin: payload._origin,
+    } as const
 
     const _res = (data: any) => {
       if (this.handlers[req.handlerId]) this.handlers[req.handlerId](data)
@@ -530,15 +599,16 @@ export class Provider extends EventEmitter {
     accounts.addRequest(req, _res)
   }
 
-  signTypedData (rawPayload: RPCRequestPayload, version: Version, res: RPCRequestCallback) {
+  signTypedData(rawPayload: RPCRequestPayload, version: Version, res: RPCRequestCallback) {
     // v1 has the param order as: [data, address, ...], all other versions have [address, data, ...]
-    const orderedParams = version === 'V1'
-      ? [rawPayload.params[1], rawPayload.params[0], ...rawPayload.params.slice(2)]
-      : [...rawPayload.params]
+    const orderedParams =
+      version === 'V1'
+        ? [rawPayload.params[1], rawPayload.params[0], ...rawPayload.params.slice(2)]
+        : [...rawPayload.params]
 
     const payload = {
       ...rawPayload,
-      params: orderedParams
+      params: orderedParams,
     }
 
     let [from = '', typedData = {}, ...additionalParams] = payload.params
@@ -550,7 +620,7 @@ export class Provider extends EventEmitter {
     }
 
     // HACK: Standards clearly say, that second param is an object but it seems like in the wild it can be a JSON-string.
-    if (typeof (typedData) === 'string') {
+    if (typeof typedData === 'string') {
       try {
         typedData = JSON.parse(typedData)
         payload.params = [from, typedData, ...additionalParams]
@@ -562,49 +632,59 @@ export class Provider extends EventEmitter {
     const signerType = getSignerType(targetAccount.lastSignerType)
 
     // check for signers that only support signing a specific version of typed data
-    if (version !== 'V4' && signerType && [SignerType.Ledger, SignerType.Lattice, SignerType.Trezor].includes(signerType)) {
+    if (
+      version !== 'V4' &&
+      signerType &&
+      [SignerType.Ledger, SignerType.Lattice, SignerType.Trezor].includes(signerType)
+    ) {
       const signerName = capitalize(signerType)
       return resError(`${signerName} only supports eth_signTypedData_v4+`, payload, res)
     }
 
     const handlerId = this.addRequestHandler(res)
 
-    accounts.addRequest({ handlerId, type: 'signTypedData', version, payload, account: targetAccount.address, origin: payload._origin } as SignTypedDataRequest)
+    accounts.addRequest({
+      handlerId,
+      type: 'signTypedData',
+      version,
+      payload,
+      account: targetAccount.address,
+      origin: payload._origin,
+    } as SignTypedDataRequest)
   }
 
-  subscribe (payload: RPC.Subscribe.Request, res: RPCSuccessCallback) {
+  subscribe(payload: RPC.Subscribe.Request, res: RPCSuccessCallback) {
     const subId = addHexPrefix(crypto.randomBytes(16).toString('hex'))
     const subscriptionType = payload.params[0]
-    
+
     this.subscriptions[subscriptionType] = this.subscriptions[subscriptionType] || []
     this.subscriptions[subscriptionType].push(subId)
 
     res({ id: payload.id, jsonrpc: '2.0', result: subId })
   }
 
-  ifSubRemove (id: string) {
-    return Object.keys(this.subscriptions).some(type => {
+  ifSubRemove(id: string) {
+    return Object.keys(this.subscriptions).some((type) => {
       const subscriptionType = type as SubscriptionType
       const index = this.subscriptions[subscriptionType].indexOf(id)
 
-      return (index > -1) && this.subscriptions[subscriptionType].splice(index, 1)
+      return index > -1 && this.subscriptions[subscriptionType].splice(index, 1)
     })
   }
 
-  clientVersion (payload: RPCRequestPayload, res: RPCSuccessCallback) {
+  clientVersion(payload: RPCRequestPayload, res: RPCSuccessCallback) {
     res({ id: payload.id, jsonrpc: '2.0', result: `Frame/v${packageFile.version}` })
   }
 
-  private switchEthereumChain (payload: RPCRequestPayload, res: RPCRequestCallback) {
+  private switchEthereumChain(payload: RPCRequestPayload, res: RPCRequestCallback) {
     try {
       const params = payload.params
       if (!params || !params[0]) throw new Error('Params not supplied')
-      
 
       const chainId = parseInt(params[0].chainId)
       if (!Number.isInteger(chainId)) throw new Error('Invalid chain id')
 
-      // Check if chain exists 
+      // Check if chain exists
       const exists = Boolean(store('main.networks.ethereum', chainId))
       if (exists === false) throw new Error('Chain does not exist')
 
@@ -620,17 +700,17 @@ export class Provider extends EventEmitter {
     }
   }
 
-  addEthereumChain (payload: RPCRequestPayload, res: RPCRequestCallback) {
+  addEthereumChain(payload: RPCRequestPayload, res: RPCRequestCallback) {
     if (!payload.params[0]) return resError('addChain request missing params', payload, res)
 
     const type = 'ethereum'
-    const { 
-      chainId, 
-      chainName, 
-      nativeCurrency, 
-      rpcUrls = [], 
+    const {
+      chainId,
+      chainName,
+      nativeCurrency,
+      rpcUrls = [],
       blockExplorerUrls = [],
-      iconUrls = [] 
+      iconUrls = [],
     } = payload.params[0]
 
     if (!chainId) return resError('addChain request missing chainId', payload, res)
@@ -649,82 +729,94 @@ export class Provider extends EventEmitter {
       this.switchEthereumChain(payload, res)
     } else {
       // Ask user if they want to add this chain
-      accounts.addRequest({
-        handlerId,
-        type: 'addChain',
-        chain: {
-          type,
-          id: chainId,
-          name: chainName,
-          nativeCurrency,
-          rpcUrls,
-          blockExplorerUrls, 
-          iconUrls
-        },
-        account: (accounts.getAccounts() || [])[0],
-        origin: payload._origin,
-        payload
-      } as AddChainRequest, res)
+      accounts.addRequest(
+        {
+          handlerId,
+          type: 'addChain',
+          chain: {
+            type,
+            id: chainId,
+            name: chainName,
+            nativeCurrency,
+            rpcUrls,
+            blockExplorerUrls,
+            iconUrls,
+          },
+          account: (accounts.getAccounts() || [])[0],
+          origin: payload._origin,
+          payload,
+        } as AddChainRequest,
+        res
+      )
     }
   }
 
-  private addCustomToken (payload: RPCRequestPayload, cb: RPCRequestCallback, targetChain: Chain) {
+  private addCustomToken(payload: RPCRequestPayload, cb: RPCRequestCallback, targetChain: Chain) {
     const { type, options: tokenData } = (payload.params || {}) as any
 
     if ((type || '').toLowerCase() !== 'erc20') {
       return resError('only ERC-20 tokens are supported', payload, cb)
     }
 
-    this.getChainId(payload, resp => {
-      const chainId = parseInt(resp.result)
+    this.getChainId(
+      payload,
+      (resp) => {
+        const chainId = parseInt(resp.result)
 
-      const address = (tokenData.address || '').toLowerCase()
-      const symbol = (tokenData.symbol || '').toUpperCase()
-      const decimals = parseInt(tokenData.decimals || '1')
+        const address = (tokenData.address || '').toLowerCase()
+        const symbol = (tokenData.symbol || '').toUpperCase()
+        const decimals = parseInt(tokenData.decimals || '1')
 
-      if (!address) {
-        return resError('tokens must define an address', payload, cb)
-      }
-
-      const res = () => {
-        cb({ id: payload.id, jsonrpc: '2.0', result: true })
-      }
+        if (!address) {
+          return resError('tokens must define an address', payload, cb)
+        }
 
-      // don't attempt to add the token if it's already been added
-      const tokenExists = store('main.tokens.custom').some((token: Token) => token.chainId === chainId && token.address === address)
-      if (tokenExists) {
-        return res()
-      }
+        const res = () => {
+          cb({ id: payload.id, jsonrpc: '2.0', result: true })
+        }
 
-      const token = {
-        chainId,
-        name: tokenData.name || capitalize(symbol),
-        address,
-        symbol,
-        decimals,
-        logoURI: tokenData.image || tokenData.logoURI || ''
-      }
+        // don't attempt to add the token if it's already been added
+        const tokenExists = store('main.tokens.custom').some(
+          (token: Token) => token.chainId === chainId && token.address === address
+        )
+        if (tokenExists) {
+          return res()
+        }
 
-      // const result = {
-      //   suggestedAssetMeta: {
-      //     asset: { token }
-      //   }
-      // }
+        const token = {
+          chainId,
+          name: tokenData.name || capitalize(symbol),
+          address,
+          symbol,
+          decimals,
+          logoURI: tokenData.image || tokenData.logoURI || '',
+        }
 
-      const handlerId = this.addRequestHandler(res)
+        // const result = {
+        //   suggestedAssetMeta: {
+        //     asset: { token }
+        //   }
+        // }
 
-      accounts.addRequest({
-        handlerId,
-        type: 'addToken',
-        token,
-        account: (accounts.current() as FrameAccount).id,
-        origin: payload._origin,
-        payload
-      } as AddTokenRequest, res)
-    }, targetChain)
-  }
+        const handlerId = this.addRequestHandler(res)
 
-  private parseTargetChain (payload: RPCRequestPayload): Chain {
+        accounts.addRequest(
+          {
+            handlerId,
+            type: 'addToken',
+            token,
+            account: (accounts.current() as FrameAccount).id,
+            origin: payload._origin,
+            payload,
+          } as AddTokenRequest,
+          res
+        )
+      },
+      targetChain
+    )
+  }
+
+  private parseTargetChain(payload: RPCRequestPayload): Chain {
     if ('chainId' in payload) {
       const chainId = parseInt(payload.chainId || '', 16)
       const chainConnection = this.connection.connections['ethereum'][chainId] || {}
@@ -737,8 +829,8 @@ export class Provider extends EventEmitter {
     return getPayloadOrigin(payload).chain
   }
 
-  sendAsync (payload: RPCRequestPayload, cb: Callback<RPCResponsePayload>) {
-    this.send(payload, res => {
+  sendAsync(payload: RPCRequestPayload, cb: Callback<RPCResponsePayload>) {
+    this.send(payload, (res) => {
       if (res.error) {
         const errMessage = res.error.message || `sendAsync error did not have message`
         cb(new Error(errMessage))
@@ -748,11 +840,12 @@ export class Provider extends EventEmitter {
     })
   }
 
-  send (payload: RPCRequestPayload, res: RPCRequestCallback = () => {}) {
+  send(payload: RPCRequestPayload, res: RPCRequestCallback = () => {}) {
     const method = payload.method || ''
 
     // method handlers that are not chain-specific can go here, before parsing the target chain
-    if (method === 'eth_unsubscribe' && this.ifSubRemove(payload.params[0])) return res({ id: payload.id, jsonrpc: '2.0', result: true }) // Subscription was ours
+    if (method === 'eth_unsubscribe' && this.ifSubRemove(payload.params[0]))
+      return res({ id: payload.id, jsonrpc: '2.0', result: true }) // Subscription was ours
 
     const targetChain = this.parseTargetChain(payload)
 
@@ -761,11 +854,15 @@ export class Provider extends EventEmitter {
       return resError({ message: `unknown chain: ${payload.chainId}`, code: 4901 }, payload, res)
     }
 
-    function getAccounts (payload: JSONRPCRequestPayload, res: RPCRequestCallback) {
-      res({ id: payload.id, jsonrpc: payload.jsonrpc, result: accounts.getSelectedAddresses().map(a => a.toLowerCase()) })
+    function getAccounts(payload: JSONRPCRequestPayload, res: RPCRequestCallback) {
+      res({
+        id: payload.id,
+        jsonrpc: payload.jsonrpc,
+        result: accounts.getSelectedAddresses().map((a) => a.toLowerCase()),
+      })
     }
 
-    function getCoinbase (payload: RPCRequestPayload, res: RPCRequestCallback) {
+    function getCoinbase(payload: RPCRequestPayload, res: RPCRequestCallback) {
       accounts.getAccounts((err, accounts) => {
         if (err) return resError(`signTransaction Error: ${JSON.stringify(err)}`, payload, res)
         res({ id: payload.id, jsonrpc: payload.jsonrpc, result: (accounts || [])[0] })
@@ -785,12 +882,14 @@ export class Provider extends EventEmitter {
 
     if (method === 'eth_sign' || method === 'personal_sign') return this.sign(payload, res)
 
-    if (['eth_signTypedData', 'eth_signTypedData_v1', 'eth_signTypedData_v3', 'eth_signTypedData_v4'].includes(method)) {
+    if (
+      ['eth_signTypedData', 'eth_signTypedData_v1', 'eth_signTypedData_v3', 'eth_signTypedData_v4'].includes(method)
+    ) {
       const underscoreIndex = method.lastIndexOf('_')
       const version = (underscoreIndex > 3 ? method.substring(underscoreIndex + 1) : 'v1').toUpperCase() as Version
       return this.signTypedData(payload, version, res)
     }
-    
+
     if (method === 'wallet_addEthereumChain') return this.addEthereumChain(payload, res)
     if (method === 'wallet_switchEthereumChain') return this.switchEthereumChain(payload, res)
     if (method === 'wallet_getPermissions') return getPermissions(payload, res)
@@ -798,7 +897,8 @@ export class Provider extends EventEmitter {
     if (method === 'wallet_watchAsset') return this.addCustomToken(payload, res, targetChain)
     if (method === 'wallet_getChains') return getChains(payload, res)
     if (method === 'wallet_getChainDetails') return getChainDetails(payload, res)
-    if (method === 'wallet_getAssets') return getAssets(payload as RPC.GetAssets.Request, accounts.current(), res as RPCCallback<RPC.GetAssets.Response>)
+    if (method === 'wallet_getAssets')
+      return getAssets(payload as RPC.GetAssets.Request, accounts.current(), res as RPCCallback<RPC.GetAssets.Response>)
 
     // Connection dependent methods need to pass targetChain
     if (method === 'net_version') return this.getNetVersion(payload, res, targetChain)
@@ -811,7 +911,7 @@ export class Provider extends EventEmitter {
     this.connection.send(rpcPayload, res, targetChain)
   }
 
-  emit (type: string | symbol, ...args: any[]) {
+  emit(type: string | symbol, ...args: any[]) {
     return super.emit(type, ...args)
   }
 }
diff --git a/main/provider/proxy.ts b/main/provider/proxy.ts
index e167b8f07..4a269a7e9 100644
--- a/main/provider/proxy.ts
+++ b/main/provider/proxy.ts
@@ -1,13 +1,13 @@
 import { EventEmitter } from 'stream'
 
 class ProviderProxyConnection extends EventEmitter {
-  constructor () {
+  constructor() {
     super()
 
     process.nextTick(() => this.emit('connect'))
   }
 
-  async send (payload: RPCRequestPayload) {
+  async send(payload: RPCRequestPayload) {
     this.emit('provider:send', payload)
   }
 }
diff --git a/main/rpc/index.js b/main/rpc/index.js
index 040f803c6..1b2732b4f 100644
--- a/main/rpc/index.js
+++ b/main/rpc/index.js
@@ -12,7 +12,7 @@ const dapps = require('../dapps')
 // const ens = require('../ens')
 // const ipfs = require('../ipfs')
 
-function randomLetters (num) {
+function randomLetters(num) {
   return [...Array(num)].map(() => String.fromCharCode(65 + Math.floor(Math.random() * 26))).join('')
 }
 
@@ -20,10 +20,10 @@ const { resolveName } = require('../accounts/aragon')
 const { arraysEqual } = require('../../resources/utils')
 
 const rpc = {
-  getState: cb => {
+  getState: (cb) => {
     cb(null, store())
   },
-  getFrameId (window, cb) {
+  getFrameId(window, cb) {
     if (window.frameId) {
       cb(null, window.frameId)
     } else {
@@ -93,18 +93,18 @@ const rpc = {
     }
 
     store.updateLattice(deviceId, {
-      deviceId, 
+      deviceId,
       baseUrl: 'https://signing.gridpl.us',
       endpointMode: 'default',
       paired: true,
       deviceName: (deviceName || 'GridPlus').substring(0, 14),
       tag: randomLetters(6),
-      privKey: crypto.randomBytes(32).toString('hex')  
+      privKey: crypto.randomBytes(32).toString('hex'),
     })
 
     cb(null, { id: 'lattice-' + deviceId })
   },
-  async latticePair (id, pin, cb) {
+  async latticePair(id, pin, cb) {
     const signer = signers.get(id)
 
     if (signer && signer.pair) {
@@ -124,20 +124,20 @@ const rpc = {
         status: provider.connection.primary.status,
         network: provider.connection.primary.network,
         type: provider.connection.primary.type,
-        connected: provider.connection.primary.connected
+        connected: provider.connection.primary.connected,
       },
       secondary: {
         status: provider.connection.secondary.status,
         network: provider.connection.secondary.network,
         type: provider.connection.secondary.type,
-        connected: provider.connection.secondary.connected
-      }
+        connected: provider.connection.secondary.connected,
+      },
     })
   },
-  confirmRequestApproval (req, approvalType, approvalData, cb) {
+  confirmRequestApproval(req, approvalType, approvalData, cb) {
     accounts.confirmRequestApproval(req.handlerId, approvalType, approvalData)
   },
-  approveRequest (req, cb) {
+  approveRequest(req, cb) {
     accounts.setRequestPending(req)
     if (req.type === 'transaction') {
       provider.approveTransactionRequest(req, (err, res) => {
@@ -156,104 +156,109 @@ const rpc = {
       })
     }
   },
-  declineRequest (req, cb) {
-    if (
-      req.type === 'transaction' ||
-      req.type === 'sign' ||
-      req.type === 'signTypedData'
-    ) {
+  declineRequest(req, cb) {
+    if (req.type === 'transaction' || req.type === 'sign' || req.type === 'signTypedData') {
       accounts.declineRequest(req.handlerId)
       provider.declineRequest(req)
     }
   },
-  addAragon (account, cb) {
+  addAragon(account, cb) {
     accounts.addAragon(account, cb)
   },
-  createFromAddress (address, cb) {
+  createFromAddress(address, cb) {
     if (!utils.isAddress(address)) return cb(new Error('Invalid Address'))
     accounts.add(address, { type: 'Address' })
     cb()
   },
-  createAccount (address, options, cb) {
+  createAccount(address, options, cb) {
     if (!utils.isAddress(address)) return cb(new Error('Invalid Address'))
     accounts.add(address, options)
     cb()
   },
-  removeAccount (address, options, cb) {
+  removeAccount(address, options, cb) {
     // if (!utils.isAddress(address)) return cb(new Error('Invalid Address'))
     accounts.remove(address)
     cb()
   },
-  createFromPhrase (phrase, password, cb) {
+  createFromPhrase(phrase, password, cb) {
     signers.createFromPhrase(phrase, password, cb)
   },
-  locateKeystore (cb) {
-    dialog.showOpenDialog({ properties: ['openFile'] }).then(file => {
-      const keystore = file || { filePaths: [] }
-      if ((keystore.filePaths || []).length > 0) {
-        fs.readFile(keystore.filePaths[0], 'utf8', (err, data) => {
-          if (err) return cb(err)
-          try { cb(null, JSON.parse(data)) } catch (err) { cb(err) }
-        })
-      } else {
-        cb(new Error('No Keystore Found'))
-      }
-    }).catch(cb)
+  locateKeystore(cb) {
+    dialog
+      .showOpenDialog({ properties: ['openFile'] })
+      .then((file) => {
+        const keystore = file || { filePaths: [] }
+        if ((keystore.filePaths || []).length > 0) {
+          fs.readFile(keystore.filePaths[0], 'utf8', (err, data) => {
+            if (err) return cb(err)
+            try {
+              cb(null, JSON.parse(data))
+            } catch (err) {
+              cb(err)
+            }
+          })
+        } else {
+          cb(new Error('No Keystore Found'))
+        }
+      })
+      .catch(cb)
   },
-  createFromKeystore (keystore, keystorePassword, password, cb) {
+  createFromKeystore(keystore, keystorePassword, password, cb) {
     signers.createFromKeystore(keystore, keystorePassword, password, cb)
   },
-  createFromPrivateKey (privateKey, password, cb) {
+  createFromPrivateKey(privateKey, password, cb) {
     signers.createFromPrivateKey(privateKey, password, cb)
   },
-  addPrivateKey (id, privateKey, password, cb) {
+  addPrivateKey(id, privateKey, password, cb) {
     signers.addPrivateKey(id, privateKey, password, cb)
   },
-  removePrivateKey (id, index, password, cb) {
+  removePrivateKey(id, index, password, cb) {
     signers.removePrivateKey(id, index, password, cb)
   },
-  addKeystore (id, keystore, keystorePassword, password, cb) {
+  addKeystore(id, keystore, keystorePassword, password, cb) {
     signers.addKeystore(id, keystore, keystorePassword, password, cb)
   },
-  unlockSigner (id, password, cb) {
+  unlockSigner(id, password, cb) {
     signers.unlock(id, password, cb)
   },
-  lockSigner (id, cb) {
+  lockSigner(id, cb) {
     signers.lock(id, cb)
   },
-  remove (id) {
+  remove(id) {
     signers.remove(id)
   },
-  resolveAragonName (name, chainId, cb) {
-    resolveName(name, chainId).then(result => cb(null, result)).catch(cb)
+  resolveAragonName(name, chainId, cb) {
+    resolveName(name, chainId)
+      .then((result) => cb(null, result))
+      .catch(cb)
   },
-  verifyAddress (cb) {
+  verifyAddress(cb) {
     const res = (err, data) => cb(err, data || false)
     accounts.verifyAddress(true, res)
   },
-  setBaseFee (fee, handlerId, cb) {
+  setBaseFee(fee, handlerId, cb) {
     accounts.setBaseFee(fee, handlerId, true, cb)
     // store.setGasDefault(netType, netId, level, price)
   },
-  setPriorityFee (fee, handlerId, cb) {
+  setPriorityFee(fee, handlerId, cb) {
     accounts.setPriorityFee(fee, handlerId, true, cb)
     // store.setGasDefault(netType, netId, level, price)
   },
-  setGasPrice (price,handlerId, cb) {
+  setGasPrice(price, handlerId, cb) {
     accounts.setGasPrice(price, handlerId, true, cb)
     // store.setGasDefault(netType, netId, level, price)
   },
-  setGasLimit (limit, handlerId, cb) {
+  setGasLimit(limit, handlerId, cb) {
     accounts.setGasLimit(limit, handlerId, true, cb)
   },
-  removeFeeUpdateNotice (handlerId, cb) {
+  removeFeeUpdateNotice(handlerId, cb) {
     accounts.removeFeeUpdateNotice(handlerId, cb)
   },
-  signerCompatibility (handlerId, cb) {
+  signerCompatibility(handlerId, cb) {
     accounts.signerCompatibility(handlerId, cb)
   },
   // flow
-  async flowCommand (command, cb) {
+  async flowCommand(command, cb) {
     // console.log('flowCommand', command, cb)
     await dapps.add(command.input, {}, (err, res) => {
       if (err || res) console.log(err, res)
@@ -262,49 +267,49 @@ const rpc = {
       if (err || res) console.log(err, res)
     })
   },
-  addDapp (domain, options, cb) {
+  addDapp(domain, options, cb) {
     if (!(domain.endsWith('.eth') || domain.endsWith('.xyz'))) domain += '.eth'
     // console.log('addDapp', domain, options, cb)
     dapps.add(domain, options, cb)
   },
-  removeDapp (domain, cb) {
+  removeDapp(domain, cb) {
     dapps.remove(domain, cb)
   },
-  moveDapp (fromArea, fromIndex, toArea, toIndex, cb) {
+  moveDapp(fromArea, fromIndex, toArea, toIndex, cb) {
     dapps.move(fromArea, fromIndex, toArea, toIndex, cb)
   },
-  launchDapp (domain, cb) {
+  launchDapp(domain, cb) {
     dapps.launch(domain, cb)
   },
-  openDapp (domain, options, cb) {
+  openDapp(domain, options, cb) {
     if (domain.endsWith('.eth')) {
       // console.log(' RPC openDapp ', domain, options, cb)
       dapps.add(domain, options, cb)
     } else {
       console.log('input needs to be ens name')
     }
-  }
+  },
 }
 
-const unwrap = v => v !== undefined || v !== null ? JSON.parse(v) : v
-const wrap = v => v !== undefined || v !== null ? JSON.stringify(v) : v
+const unwrap = (v) => (v !== undefined || v !== null ? JSON.parse(v) : v)
+const wrap = (v) => (v !== undefined || v !== null ? JSON.stringify(v) : v)
 
 ipcMain.on('main:rpc', (event, id, method, ...args) => {
   id = unwrap(id)
   method = unwrap(method)
-  args = args.map(arg => unwrap(arg))
+  args = args.map((arg) => unwrap(arg))
   if (rpc[method]) {
     if (method === 'getFrameId') {
       rpc[method](event.sender.getOwnerBrowserWindow(), ...args, (...args) => {
-        event.sender.send('main:rpc', id, ...args.map(arg => arg instanceof Error ? wrap(arg.message) : wrap(arg)))
+        event.sender.send('main:rpc', id, ...args.map((arg) => (arg instanceof Error ? wrap(arg.message) : wrap(arg))))
       })
     } else {
       rpc[method](...args, (...args) => {
-        event.sender.send('main:rpc', id, ...args.map(arg => arg instanceof Error ? wrap(arg.message) : wrap(arg)))
+        event.sender.send('main:rpc', id, ...args.map((arg) => (arg instanceof Error ? wrap(arg.message) : wrap(arg))))
       })
     }
   } else {
     const args = [new Error('Unknown RPC method: ' + method)]
-    event.sender.send('main:rpc', id, ...args.map(arg => arg instanceof Error ? wrap(arg.message) : wrap(arg)))
+    event.sender.send('main:rpc', id, ...args.map((arg) => (arg instanceof Error ? wrap(arg.message) : wrap(arg))))
   }
 })
diff --git a/main/signers/Signer/derive.ts b/main/signers/Signer/derive.ts
index 0f934d63e..654915e01 100644
--- a/main/signers/Signer/derive.ts
+++ b/main/signers/Signer/derive.ts
@@ -3,10 +3,17 @@ import HDKey from 'hdkey'
 import { publicToAddress, toChecksumAddress } from 'ethereumjs-util'
 
 export enum Derivation {
-  live = 'live', legacy = 'legacy', standard = 'standard', testnet = 'testnet'
+  live = 'live',
+  legacy = 'legacy',
+  standard = 'standard',
+  testnet = 'testnet',
 }
 
-export function deriveHDAccounts (publicKey: string, chainCode: string, cb: (err: any, accounts: string[] | undefined) => void) {
+export function deriveHDAccounts(
+  publicKey: string,
+  chainCode: string,
+  cb: (err: any, accounts: string[] | undefined) => void
+) {
   try {
     const hdk = new HDKey()
     hdk.publicKey = Buffer.from(publicKey, 'hex')
@@ -17,7 +24,9 @@ export function deriveHDAccounts (publicKey: string, chainCode: string, cb: (err
       return toChecksumAddress(`0x${address.toString('hex')}`)
     }
     const accounts = []
-    for (let i = 0; i < 100; i++) { accounts[i] = derive(i) }
+    for (let i = 0; i < 100; i++) {
+      accounts[i] = derive(i)
+    }
 
     cb(null, accounts)
   } catch (e) {
@@ -29,10 +38,10 @@ const derivationPaths: { [key: string]: string } = {
   [Derivation.legacy.valueOf()]: "44'/60'/0'/<index>",
   [Derivation.standard.valueOf()]: "44'/60'/0'/0/<index>",
   [Derivation.testnet.valueOf()]: "44'/1'/0'/0/<index>",
-  [Derivation.live.valueOf()]: "44'/60'/<index>'/0/0"
+  [Derivation.live.valueOf()]: "44'/60'/<index>'/0/0",
 }
 
-export function getDerivationPath (derivation: Derivation, index = -1) {
+export function getDerivationPath(derivation: Derivation, index = -1) {
   const path = derivationPaths[derivation.valueOf()]
 
   return path.replace('<index>', (index > -1 ? index : '').toString())
diff --git a/main/signers/Signer/index.ts b/main/signers/Signer/index.ts
index 2faf37730..a011a07f9 100644
--- a/main/signers/Signer/index.ts
+++ b/main/signers/Signer/index.ts
@@ -8,18 +8,18 @@ import crypt from '../../crypt'
 import { TypedData } from 'eth-sig-util'
 
 export interface SignerSummary {
-  id: string,
-  name: string,
-  model: string,
-  type: string,
-  addresses: string[],
-  status: string,
+  id: string
+  name: string
+  model: string
+  type: string
+  addresses: string[]
+  status: string
   appVersion: AppVersion
 }
 
 export interface AppVersion {
-  major: number,
-  minor: number,
+  major: number
+  minor: number
   patch: number
 }
 
@@ -30,11 +30,11 @@ export enum Type {
   Aragon = 'aragon',
   Trezor = 'trezor',
   Ledger = 'ledger',
-  Lattice = 'lattice'
+  Lattice = 'lattice',
 }
 
-export function getType (typeValue: string) {
-  return Object.values(Type).find(type => type === typeValue)
+export function getType(typeValue: string) {
+  return Object.values(Type).find((type) => type === typeValue)
 }
 
 export default class Signer extends EventEmitter {
@@ -47,69 +47,69 @@ export default class Signer extends EventEmitter {
   appVersion: AppVersion = { major: 0, minor: 0, patch: 0 }
 
   addresses: string[]
-  
-  constructor () {
+
+  constructor() {
     super()
 
     this.addresses = []
   }
 
-  deriveHDAccounts (publicKey: string, chainCode: string, cb: (err: any, accounts: string[] | undefined) => void) {
+  deriveHDAccounts(publicKey: string, chainCode: string, cb: (err: any, accounts: string[] | undefined) => void) {
     deriveHDAccounts(publicKey, chainCode, cb)
   }
 
-  fingerprint () {
+  fingerprint() {
     if (this.addresses && this.addresses.length) return crypt.stringToKey(this.addresses.join()).toString('hex')
   }
 
-  getCoinbase (cb: Callback<string>) {
+  getCoinbase(cb: Callback<string>) {
     cb(null, this.addresses[0].toString())
   }
 
-  verifyAddress (index: number, current: string, display: boolean, cb: Callback<boolean>) {
+  verifyAddress(index: number, current: string, display: boolean, cb: Callback<boolean>) {
     const err = new Error('Signer:' + this.type + ' did not implement verifyAddress method')
     log.error(err)
     cb(err, undefined)
   }
 
-  summary (): SignerSummary {
+  summary(): SignerSummary {
     return {
       id: this.id,
       name: this.name || this.type + ' signer',
       type: this.type,
       model: this.model,
-      addresses: this.addresses.map(addr => addHexPrefix(addr.toString())),
+      addresses: this.addresses.map((addr) => addHexPrefix(addr.toString())),
       status: this.status,
-      appVersion: this.appVersion || { major: 0, minor: 0, patch: 0 }
+      appVersion: this.appVersion || { major: 0, minor: 0, patch: 0 },
     }
   }
 
-  open () {
+  open() {
     // windows.broadcast('main:action', 'addSigner', this.summary())
   }
 
-  close () {
+  close() {
     // windows.broadcast('main:action', 'removeSigner', this.summary())
   }
 
-  delete () {
+  delete() {
     console.warn('Signer:' + this.type + ' did not implement a delete method')
   }
 
-  update (options = {}) {
+  update(options = {}) {
     // if (options.setView) windows.broadcast('main:action', 'setView', options.setView)
     // windows.broadcast('main:action', 'updateSigner', this.summary())
   }
 
-  signMessage (index: number, message: string, cb: Callback<string>) {
+  signMessage(index: number, message: string, cb: Callback<string>) {
     console.warn('Signer:' + this.type + ' did not implement a signMessage method')
   }
 
-  signTransaction (index: number, rawTx: TransactionData, cb: Callback<string>) {
+  signTransaction(index: number, rawTx: TransactionData, cb: Callback<string>) {
     console.warn('Signer:' + this.type + ' did not implement a signTransaction method')
   }
 
-  signTypedData (index: number, version: string, typedData: TypedData, cb: Callback<string>) {
+  signTypedData(index: number, version: string, typedData: TypedData, cb: Callback<string>) {
     return cb(new Error(`Signer: ${this.type} does not support eth_signTypedData`), undefined)
   }
 }
diff --git a/main/signers/adapters.ts b/main/signers/adapters.ts
index 78ff12f88..a820819ae 100644
--- a/main/signers/adapters.ts
+++ b/main/signers/adapters.ts
@@ -2,16 +2,16 @@ import { EventEmitter } from 'stream'
 import Signer from './Signer'
 
 export class SignerAdapter extends EventEmitter {
-  adapterType: string;
+  adapterType: string
 
-  constructor (type: string) {
-    super() 
+  constructor(type: string) {
+    super()
 
     this.adapterType = type
   }
 
-  open () {}
-  close () {}
-  remove (signer: Signer) { }
-  reload (signer: Signer) { }
+  open() {}
+  close() {}
+  remove(signer: Signer) {}
+  reload(signer: Signer) {}
 }
diff --git a/main/signers/hot/HotSigner/index.js b/main/signers/hot/HotSigner/index.js
index 338947908..6c3853345 100644
--- a/main/signers/hot/HotSigner/index.js
+++ b/main/signers/hot/HotSigner/index.js
@@ -15,7 +15,7 @@ const USER_DATA = app ? app.getPath('userData') : path.resolve(path.dirname(requ
 const SIGNERS_PATH = path.resolve(USER_DATA, 'signers')
 
 class HotSigner extends Signer {
-  constructor (signer, workerPath) {
+  constructor(signer, workerPath) {
     super()
     this.status = 'locked'
     this.addresses = signer ? signer.addresses : []
@@ -24,7 +24,7 @@ class HotSigner extends Signer {
     this.ready = false
   }
 
-  save (data) {
+  save(data) {
     // Construct signer
     const { id, addresses, type, network } = this
     const signer = { id, addresses, type, network, ...data }
@@ -33,17 +33,21 @@ class HotSigner extends Signer {
     ensureDirSync(SIGNERS_PATH)
 
     // Write signer to disk
-    fs.writeFileSync(path.resolve(SIGNERS_PATH, `${id}.json`), JSON.stringify(signer), { mode: 0o600 })
+    fs.writeFileSync(path.resolve(SIGNERS_PATH, `${id}.json`), JSON.stringify(signer), {
+      mode: 0o600,
+    })
 
     // Log
     log.debug('Signer saved to disk')
   }
 
-  delete () {
+  delete() {
     const signerPath = path.resolve(SIGNERS_PATH, `${this.id}.json`)
 
     // Overwrite file
-    fs.writeFileSync(signerPath, '00000000000000000000000000000000000000000000000000000000000000000000', { mode: 0o600 })
+    fs.writeFileSync(signerPath, '00000000000000000000000000000000000000000000000000000000000000000000', {
+      mode: 0o600,
+    })
 
     // Remove file
     removeSync(signerPath)
@@ -52,7 +56,7 @@ class HotSigner extends Signer {
     log.info('Signer erased from disk')
   }
 
-  lock (cb) {
+  lock(cb) {
     this._callWorker({ method: 'lock' }, () => {
       this.status = 'locked'
       this.update()
@@ -61,7 +65,7 @@ class HotSigner extends Signer {
     })
   }
 
-  unlock (password, data, cb) {
+  unlock(password, data, cb) {
     const params = { password, ...data }
     this._callWorker({ method: 'unlock', params }, (err, result) => {
       if (err) return cb(err)
@@ -72,14 +76,14 @@ class HotSigner extends Signer {
     })
   }
 
-  close () {
+  close() {
     if (this.ready) this._worker.disconnect()
     else this.once('ready', () => this._worker.disconnect())
     store.removeSigner(this.id)
     log.info('Signer closed')
   }
 
-  update () {
+  update() {
     // Get derived ID
     const derivedId = this.fingerprint()
 
@@ -89,7 +93,8 @@ class HotSigner extends Signer {
       this.id = derivedId
       // Write to disk
       this.save({ encryptedKeys: this.encryptedKeys, encryptedSeed: this.encryptedSeed })
-    } else if (this.id !== derivedId) { // On changed ID
+    } else if (this.id !== derivedId) {
+      // On changed ID
       // Erase from disk
       this.delete(this.id)
       // Remove from store
@@ -104,22 +109,22 @@ class HotSigner extends Signer {
     log.info('Signer updated')
   }
 
-  signMessage (index, message, cb) {
+  signMessage(index, message, cb) {
     const payload = { method: 'signMessage', params: { index, message } }
     this._callWorker(payload, cb)
   }
 
-  signTypedData (index, version, typedData, cb) {
+  signTypedData(index, version, typedData, cb) {
     const payload = { method: 'signTypedData', params: { index, typedData, version } }
     this._callWorker(payload, cb)
   }
 
-  signTransaction (index, rawTx, cb) {
+  signTransaction(index, rawTx, cb) {
     const payload = { method: 'signTransaction', params: { index, rawTx } }
     this._callWorker(payload, cb)
   }
 
-  verifyAddress (index, address, display, cb = () => {}) {
+  verifyAddress(index, address, display, cb = () => {}) {
     const payload = { method: 'verifyAddress', params: { index, address } }
     this._callWorker(payload, (err, verified) => {
       if (err || !verified) {
@@ -143,7 +148,7 @@ class HotSigner extends Signer {
     })
   }
 
-  _getToken () {
+  _getToken() {
     const listener = ({ type, token }) => {
       if (type === 'token') {
         this._token = token
@@ -155,7 +160,7 @@ class HotSigner extends Signer {
     this._worker.addListener('message', listener)
   }
 
-  _callWorker (payload, cb) {
+  _callWorker(payload, cb) {
     if (!this._worker) throw Error('Worker not running')
     // If token not yet received -> retry in 100 ms
     if (!this._token) return setTimeout(() => this._callWorker(payload, cb), 100)
diff --git a/main/signers/hot/HotSigner/worker.js b/main/signers/hot/HotSigner/worker.js
index 229f3f92a..e5ba4c906 100644
--- a/main/signers/hot/HotSigner/worker.js
+++ b/main/signers/hot/HotSigner/worker.js
@@ -3,17 +3,9 @@ const ethSigUtil = require('eth-sig-util')
 const { TransactionFactory } = require('@ethereumjs/tx')
 const Common = require('@ethereumjs/common').default
 
-const {
-  BN,
-  hashPersonalMessage,
-  toBuffer,
-  ecsign,
-  addHexPrefix,
-  pubToAddress,
-  ecrecover
-} = require('ethereumjs-util')
-
-function chainConfig (chain, hardfork) {
+const { BN, hashPersonalMessage, toBuffer, ecsign, addHexPrefix, pubToAddress, ecrecover } = require('ethereumjs-util')
+
+function chainConfig(chain, hardfork) {
   const chainId = new BN(chain)
 
   return Common.isSupportedChainId(chainId)
@@ -22,12 +14,12 @@ function chainConfig (chain, hardfork) {
 }
 
 class HotSignerWorker {
-  constructor () {
+  constructor() {
     this.token = crypto.randomBytes(32).toString('hex')
     process.send({ type: 'token', token: this.token })
   }
 
-  handleMessage ({ id, method, params, token }) {
+  handleMessage({ id, method, params, token }) {
     // Define (pseudo) callback
     const pseudoCallback = (error, result) => {
       // Add correlation id to response
@@ -43,7 +35,7 @@ class HotSignerWorker {
     pseudoCallback(`Invalid method: '${method}'`)
   }
 
-  signMessage (key, message, pseudoCallback) {
+  signMessage(key, message, pseudoCallback) {
     // Hash message
     const hash = hashPersonalMessage(toBuffer(message))
 
@@ -56,7 +48,7 @@ class HotSignerWorker {
     pseudoCallback(null, addHexPrefix(hex))
   }
 
-  signTypedData (key, params, pseudoCallback) {
+  signTypedData(key, params, pseudoCallback) {
     try {
       const signature = ethSigUtil.signTypedMessage(key, { data: params.typedData }, params.version)
       pseudoCallback(null, signature)
@@ -65,7 +57,7 @@ class HotSignerWorker {
     }
   }
 
-  signTransaction (key, rawTx, pseudoCallback) {
+  signTransaction(key, rawTx, pseudoCallback) {
     if (!rawTx.chainId) {
       console.error(`invalid chain id ${rawTx.chainId} for transaction`)
       return pseudoCallback('could not determine chain id for transaction')
@@ -82,7 +74,7 @@ class HotSignerWorker {
     pseudoCallback(null, addHexPrefix(serialized))
   }
 
-  verifyAddress ({ index, address }, pseudoCallback) {
+  verifyAddress({ index, address }, pseudoCallback) {
     const message = '0x' + crypto.randomBytes(32).toString('hex')
     this.signMessage({ index, message }, (err, signedMessage) => {
       // Handle signing errors
@@ -90,7 +82,8 @@ class HotSignerWorker {
       // Signature -> buffer
       const signature = Buffer.from(signedMessage.replace('0x', ''), 'hex')
       // Ensure correct length
-      if (signature.length !== 65) return pseudoCallback(new Error('Frame verifyAddress signature has incorrect length'))
+      if (signature.length !== 65)
+        return pseudoCallback(new Error('Frame verifyAddress signature has incorrect length'))
       // Verify address
       let v = signature[64]
       v = v === 0 || v === 1 ? v + 27 : v
@@ -103,7 +96,7 @@ class HotSignerWorker {
     })
   }
 
-  _encrypt (string, password) {
+  _encrypt(string, password) {
     const salt = crypto.randomBytes(16)
     const iv = crypto.randomBytes(16)
     const cipher = crypto.createCipheriv('aes-256-cbc', this._hashPassword(password, salt), iv)
@@ -111,7 +104,7 @@ class HotSignerWorker {
     return salt.toString('hex') + ':' + iv.toString('hex') + ':' + encrypted.toString('hex')
   }
 
-  _decrypt (string, password) {
+  _decrypt(string, password) {
     const parts = string.split(':')
     const salt = Buffer.from(parts.shift(), 'hex')
     const iv = Buffer.from(parts.shift(), 'hex')
@@ -121,7 +114,7 @@ class HotSignerWorker {
     return decrypted.toString()
   }
 
-  _hashPassword (password, salt) {
+  _hashPassword(password, salt) {
     try {
       return crypto.scryptSync(password, salt, 32, { N: 32768, r: 8, p: 1, maxmem: 36000000 })
     } catch (e) {
diff --git a/main/signers/hot/RingSigner/index.js b/main/signers/hot/RingSigner/index.js
index 531a4455b..9d88387b7 100644
--- a/main/signers/hot/RingSigner/index.js
+++ b/main/signers/hot/RingSigner/index.js
@@ -7,23 +7,23 @@ const HotSigner = require('../HotSigner')
 const WORKER_PATH = path.resolve(__dirname, 'worker.js')
 
 class RingSigner extends HotSigner {
-  constructor (signer) {
+  constructor(signer) {
     super(signer, WORKER_PATH)
     this.type = 'ring'
     this.model = 'keyring'
-    this.encryptedKeys = (signer && signer.encryptedKeys)
+    this.encryptedKeys = signer && signer.encryptedKeys
     if (this.encryptedKeys) this.update()
   }
 
-  save () {
+  save() {
     super.save({ encryptedKeys: this.encryptedKeys })
   }
 
-  unlock (password, cb) {
+  unlock(password, cb) {
     super.unlock(password, { encryptedKeys: this.encryptedKeys }, cb)
   }
 
-  addPrivateKey (key, password, cb) {
+  addPrivateKey(key, password, cb) {
     // Validate private key
     let wallet
     try {
@@ -60,7 +60,7 @@ class RingSigner extends HotSigner {
     })
   }
 
-  removePrivateKey (index, password, cb) {
+  removePrivateKey(index, password, cb) {
     // Call worker
     const params = { encryptedKeys: this.encryptedKeys, index, password }
     this._callWorker({ method: 'removeKey', params }, (err, encryptedKeys) => {
@@ -84,14 +84,16 @@ class RingSigner extends HotSigner {
   }
 
   // TODO: Encrypt all keys together so that they all get the same password
-  async addKeystore (keystore, keystorePassword, password, cb) {
+  async addKeystore(keystore, keystorePassword, password, cb) {
     let wallet
     // Try to generate wallet from keystore
     try {
       if (keystore.version === 1) wallet = await fromV1(keystore, keystorePassword)
       else if (keystore.version === 3) wallet = await fromV3(keystore, keystorePassword)
       else return cb(new Error('Invalid keystore version'))
-    } catch (e) { return cb(e) }
+    } catch (e) {
+      return cb(e)
+    }
     // Add private key
     this.addPrivateKey(wallet.privateKey.toString('hex'), password, cb)
   }
diff --git a/main/signers/hot/RingSigner/worker.js b/main/signers/hot/RingSigner/worker.js
index 689c6326c..4bb0504ab 100644
--- a/main/signers/hot/RingSigner/worker.js
+++ b/main/signers/hot/RingSigner/worker.js
@@ -1,13 +1,13 @@
 const HotSignerWorker = require('../HotSigner/worker')
 
 class RingSignerWorker extends HotSignerWorker {
-  constructor () {
+  constructor() {
     super()
     this.keys = null
     process.on('message', (message) => this.handleMessage(message))
   }
 
-  unlock ({ encryptedKeys, password }, pseudoCallback) {
+  unlock({ encryptedKeys, password }, pseudoCallback) {
     try {
       this.keys = this._decrypt(encryptedKeys, password)
         .split(':')
@@ -18,12 +18,12 @@ class RingSignerWorker extends HotSignerWorker {
     }
   }
 
-  lock (_, pseudoCallback) {
+  lock(_, pseudoCallback) {
     this.keys = null
     pseudoCallback(null)
   }
 
-  addKey ({ encryptedKeys, key, password }, pseudoCallback) {
+  addKey({ encryptedKeys, key, password }, pseudoCallback) {
     let keys
     // If signer already has encrypted keys -> decrypt them and add new key
     if (encryptedKeys) keys = [...this._decryptKeys(encryptedKeys, password), key]
@@ -34,7 +34,7 @@ class RingSignerWorker extends HotSignerWorker {
     pseudoCallback(null, encryptedKeys)
   }
 
-  removeKey ({ encryptedKeys, index, password }, pseudoCallback) {
+  removeKey({ encryptedKeys, index, password }, pseudoCallback) {
     if (!encryptedKeys) return pseudoCallback('Signer does not have any keys')
     // Get list of decrypted keys
     let keys = this._decryptKeys(encryptedKeys, password)
@@ -45,34 +45,34 @@ class RingSignerWorker extends HotSignerWorker {
     pseudoCallback(null, result)
   }
 
-  signMessage ({ index, message }, pseudoCallback) {
+  signMessage({ index, message }, pseudoCallback) {
     // Make sure signer is unlocked
     if (!this.keys) return pseudoCallback('Signer locked')
     // Sign message
     super.signMessage(this.keys[index], message, pseudoCallback)
   }
 
-  signTypedData (params, pseudoCallback) {
+  signTypedData(params, pseudoCallback) {
     // Make sure signer is unlocked
     if (!this.keys) return pseudoCallback('Signer locked')
     // Sign Typed Data
     super.signTypedData(this.keys[params.index], params, pseudoCallback)
   }
 
-  signTransaction ({ index, rawTx }, pseudoCallback) {
+  signTransaction({ index, rawTx }, pseudoCallback) {
     // Make sure signer is unlocked
     if (!this.keys) return pseudoCallback('Signer locked')
     // Sign transaction
     super.signTransaction(this.keys[index], rawTx, pseudoCallback)
   }
 
-  _decryptKeys (encryptedKeys, password) {
+  _decryptKeys(encryptedKeys, password) {
     if (!encryptedKeys) return null
     const keyString = this._decrypt(encryptedKeys, password)
     return keyString.split(':')
   }
 
-  _encryptKeys (keys, password) {
+  _encryptKeys(keys, password) {
     const keyString = keys.join(':')
     return this._encrypt(keyString, password)
   }
diff --git a/main/signers/hot/SeedSigner/index.js b/main/signers/hot/SeedSigner/index.js
index 07f43835e..a7a5aeff7 100644
--- a/main/signers/hot/SeedSigner/index.js
+++ b/main/signers/hot/SeedSigner/index.js
@@ -7,15 +7,15 @@ const publicKeyToAddress = require('ethereum-public-key-to-address')
 const WORKER_PATH = path.resolve(__dirname, 'worker.js')
 
 class SeedSigner extends HotSigner {
-  constructor (signer) {
+  constructor(signer) {
     super(signer, WORKER_PATH)
-    this.encryptedSeed = (signer && signer.encryptedSeed)
+    this.encryptedSeed = signer && signer.encryptedSeed
     this.type = 'seed'
     this.model = 'phrase'
     if (this.encryptedSeed) this.update()
   }
 
-  addSeed (seed, password, cb) {
+  addSeed(seed, password, cb) {
     if (this.encryptedSeed) return cb(new Error('This signer already has a seed'))
 
     this._callWorker({ method: 'encryptSeed', params: { seed, password } }, (err, encryptedSeed) => {
@@ -26,7 +26,7 @@ class SeedSigner extends HotSigner {
 
       const addresses = []
       for (let i = 0; i < 100; i++) {
-        const publicKey = wallet.derive('m/44\'/60\'/0\'/0/' + i).publicKey
+        const publicKey = wallet.derive("m/44'/60'/0'/0/" + i).publicKey
         const address = publicKeyToAddress(publicKey)
         addresses.push(address)
       }
@@ -40,7 +40,7 @@ class SeedSigner extends HotSigner {
     })
   }
 
-  async addPhrase (phrase, password, cb) {
+  async addPhrase(phrase, password, cb) {
     // Validate phrase
     if (!bip39.validateMnemonic(phrase)) return cb(new Error('Invalid mnemonic phrase'))
     // Get seed
@@ -49,11 +49,11 @@ class SeedSigner extends HotSigner {
     this.addSeed(seed.toString('hex'), password, cb)
   }
 
-  save () {
+  save() {
     super.save({ encryptedSeed: this.encryptedSeed })
   }
 
-  unlock (password, cb) {
+  unlock(password, cb) {
     super.unlock(password, { encryptedSeed: this.encryptedSeed }, cb)
   }
 }
diff --git a/main/signers/hot/SeedSigner/worker.js b/main/signers/hot/SeedSigner/worker.js
index 71e473554..f4bb06106 100644
--- a/main/signers/hot/SeedSigner/worker.js
+++ b/main/signers/hot/SeedSigner/worker.js
@@ -2,13 +2,13 @@ const hdKey = require('hdkey')
 const HotSignerWorker = require('../HotSigner/worker')
 
 class SeedSignerWorker extends HotSignerWorker {
-  constructor () {
+  constructor() {
     super()
     this.seed = null
     process.on('message', (message) => this.handleMessage(message))
   }
 
-  unlock ({ encryptedSeed, password }, pseudoCallback) {
+  unlock({ encryptedSeed, password }, pseudoCallback) {
     try {
       this.seed = this._decrypt(encryptedSeed, password)
       pseudoCallback(null)
@@ -17,16 +17,16 @@ class SeedSignerWorker extends HotSignerWorker {
     }
   }
 
-  lock (_, pseudoCallback) {
+  lock(_, pseudoCallback) {
     this.seed = null
     pseudoCallback(null)
   }
 
-  encryptSeed ({ seed, password }, pseudoCallback) {
+  encryptSeed({ seed, password }, pseudoCallback) {
     pseudoCallback(null, this._encrypt(seed.toString('hex'), password))
   }
 
-  signMessage ({ index, message }, pseudoCallback) {
+  signMessage({ index, message }, pseudoCallback) {
     // Make sure signer is unlocked
     if (!this.seed) return pseudoCallback('Signer locked')
     // Derive private key
@@ -35,7 +35,7 @@ class SeedSignerWorker extends HotSignerWorker {
     super.signMessage(key, message, pseudoCallback)
   }
 
-  signTypedData (params, pseudoCallback) {
+  signTypedData(params, pseudoCallback) {
     // Make sure signer is unlocked
     if (!this.seed) return pseudoCallback('Signer locked')
     // Derive private key
@@ -44,7 +44,7 @@ class SeedSignerWorker extends HotSignerWorker {
     super.signTypedData(key, params, pseudoCallback)
   }
 
-  signTransaction ({ index, rawTx }, pseudoCallback) {
+  signTransaction({ index, rawTx }, pseudoCallback) {
     // Make sure signer is unlocked
     if (!this.seed) return pseudoCallback('Signer locked')
     // Derive private key
@@ -53,9 +53,9 @@ class SeedSignerWorker extends HotSignerWorker {
     super.signTransaction(key, rawTx, pseudoCallback)
   }
 
-  _derivePrivateKey (index) {
+  _derivePrivateKey(index) {
     let key = hdKey.fromMasterSeed(Buffer.from(this.seed, 'hex'))
-    key = key.derive('m/44\'/60\'/0\'/0/' + index)
+    key = key.derive("m/44'/60'/0'/0/" + index)
     return key.privateKey
   }
 }
diff --git a/main/signers/hot/index.js b/main/signers/hot/index.js
index 1349f778a..8399d58df 100644
--- a/main/signers/hot/index.js
+++ b/main/signers/hot/index.js
@@ -12,10 +12,10 @@ const SeedSigner = require('./SeedSigner')
 const RingSigner = require('./RingSigner')
 const { stripHexPrefix } = require('ethereumjs-util')
 
-const USER_DATA = app ? app.getPath('userData') : path.resolve(path.dirname(require.main.filename), '../.userData');
+const USER_DATA = app ? app.getPath('userData') : path.resolve(path.dirname(require.main.filename), '../.userData')
 const SIGNERS_PATH = path.resolve(USER_DATA, 'signers')
 
-const wait = async ms => new Promise(resolve => setTimeout(resolve, ms))
+const wait = async (ms) => new Promise((resolve) => setTimeout(resolve, ms))
 
 module.exports = {
   newPhrase: (cb) => {
@@ -42,7 +42,7 @@ module.exports = {
     if (password.length < 12) return cb(new Error('Hot account password is too short'))
     if (zxcvbn(password).score < 3) return cb(new Error('Hot account password is too weak'))
     const signer = new SeedSigner()
-    signer.addPhrase(phrase, password, err => {
+    signer.addPhrase(phrase, password, (err) => {
       if (err) {
         signer.close()
         return cb(err)
@@ -60,7 +60,7 @@ module.exports = {
     if (zxcvbn(password).score < 3) return cb(new Error('Hot account password is too weak'))
     const signer = new RingSigner()
 
-    signer.addPrivateKey(privateKeyHex, password, err => {
+    signer.addPrivateKey(privateKeyHex, password, (err) => {
       if (err) {
         signer.close()
         return cb(err)
@@ -76,7 +76,7 @@ module.exports = {
     if (password.length < 12) return cb(new Error('Hot account password is too short'))
     if (zxcvbn(password).score < 3) return cb(new Error('Hot account password is too weak'))
     const signer = new RingSigner()
-    signer.addKeystore(keystore, keystorePassword, password, err => {
+    signer.addKeystore(keystore, keystorePassword, password, (err) => {
       if (err) {
         signer.close()
         return cb(err)
@@ -97,7 +97,9 @@ module.exports = {
         try {
           const signer = JSON.parse(fs.readFileSync(path.resolve(SIGNERS_PATH, file), 'utf8'))
           storedSigners[signer.id] = signer
-        } catch (e) { log.error(`Corrupt signer file: ${file}`) }
+        } catch (e) {
+          log.error(`Corrupt signer file: ${file}`)
+        }
       })
 
       // Add stored signers
@@ -121,5 +123,5 @@ module.exports = {
     setTimeout(scan, 4000)
 
     return scan
-  }
+  },
 }
diff --git a/main/signers/index.ts b/main/signers/index.ts
index 397571b13..556914f55 100644
--- a/main/signers/index.ts
+++ b/main/signers/index.ts
@@ -5,7 +5,7 @@ import Signer from './Signer'
 import { SignerAdapter } from './adapters'
 
 import LedgerAdapter from './ledger/adapter'
-import TrezorAdapter  from './trezor/adapter'
+import TrezorAdapter from './trezor/adapter'
 import LatticeAdapter from './lattice/adapter'
 
 import hot from './hot'
@@ -14,17 +14,13 @@ import HotSigner from './hot/HotSigner'
 
 import store from '../store'
 
-const registeredAdapters = [
-  new LedgerAdapter(),
-  new TrezorAdapter(),
-  new LatticeAdapter()
-]
+const registeredAdapters = [new LedgerAdapter(), new TrezorAdapter(), new LatticeAdapter()]
 
 interface AdapterSpec {
   [key: string]: {
-    adapter: SignerAdapter,
+    adapter: SignerAdapter
     listeners: {
-      event: string,
+      event: string
       handler: (p: any) => void
     }[]
   }
@@ -33,12 +29,12 @@ interface AdapterSpec {
 type Keystore = string | { version: number }
 
 class Signers extends EventEmitter {
-  private adapters: AdapterSpec;
-  private scans: { [key: string]: any};
+  private adapters: AdapterSpec
+  private scans: { [key: string]: any }
 
-  private signers: { [id: string]: Signer };
+  private signers: { [id: string]: Signer }
 
-  constructor () {
+  constructor() {
     super()
 
     this.signers = {}
@@ -46,13 +42,13 @@ class Signers extends EventEmitter {
 
     // TODO: convert these scans to adapters
     this.scans = {
-      hot: hot.scan(this)
+      hot: hot.scan(this),
     }
 
     registeredAdapters.forEach(this.addAdapter.bind(this))
   }
 
-  addAdapter (adapter: SignerAdapter) {
+  addAdapter(adapter: SignerAdapter) {
     const addFn = this.add.bind(this)
     const removeFn = this.remove.bind(this)
     const updateFn = this.update.bind(this)
@@ -68,35 +64,35 @@ class Signers extends EventEmitter {
       listeners: [
         {
           event: 'add',
-          handler: addFn
+          handler: addFn,
         },
         {
           event: 'remove',
-          handler: removeFn
+          handler: removeFn,
         },
         {
           event: 'update',
-          handler: updateFn
-        }
-      ]
+          handler: updateFn,
+        },
+      ],
     }
   }
 
-  removeAdapter (adapter: SignerAdapter) {
+  removeAdapter(adapter: SignerAdapter) {
     const adapterSpec = this.adapters[adapter.adapterType]
 
-    adapterSpec.listeners.forEach(listener => {
+    adapterSpec.listeners.forEach((listener) => {
       adapter.removeListener(listener.event, listener.handler)
     })
 
     delete this.adapters[adapter.adapterType]
   }
 
-  exists (id: string) {
+  exists(id: string) {
     return id in this.signers
   }
 
-  add (signer: Signer) {
+  add(signer: Signer) {
     const id = signer.id
 
     if (!(id in this.signers)) {
@@ -106,14 +102,14 @@ class Signers extends EventEmitter {
     }
   }
 
-  remove (id: string) {
+  remove(id: string) {
     const signer = this.signers[id]
-    
+
     if (signer) {
       delete this.signers[id]
       store.removeSigner(id)
 
-      const type = (signer.type === 'ring' || signer.type === 'seed') ? 'hot' : signer.type
+      const type = signer.type === 'ring' || signer.type === 'seed' ? 'hot' : signer.type
 
       if (type in this.adapters) {
         this.adapters[type].adapter.remove(signer)
@@ -125,7 +121,7 @@ class Signers extends EventEmitter {
     }
   }
 
-  update (signer: Signer) {
+  update(signer: Signer) {
     const id = signer.id
 
     if (id in this.signers) {
@@ -137,11 +133,11 @@ class Signers extends EventEmitter {
     }
   }
 
-  reload (id: string) {
+  reload(id: string) {
     const signer = this.signers[id]
-    
+
     if (signer) {
-      const type = (signer.type === 'ring' || signer.type === 'seed') ? 'hot' : signer.type
+      const type = signer.type === 'ring' || signer.type === 'seed' ? 'hot' : signer.type
 
       if (this.scans[type] && typeof this.scans[type] === 'function') {
         signer.close()
@@ -154,23 +150,23 @@ class Signers extends EventEmitter {
     }
   }
 
-  get (id: string) {
+  get(id: string) {
     return this.signers[id]
   }
 
-  createFromPhrase (mnemonic: string, password: string, cb: Callback<Signer>) {
+  createFromPhrase(mnemonic: string, password: string, cb: Callback<Signer>) {
     hot.createFromPhrase(this, mnemonic, password, cb)
   }
 
-  createFromPrivateKey (privateKey: string, password: string, cb: Callback<Signer>) {
+  createFromPrivateKey(privateKey: string, password: string, cb: Callback<Signer>) {
     hot.createFromPrivateKey(this, privateKey, password, cb)
   }
 
-  createFromKeystore (keystore: Keystore, keystorePassword: string, password: string, cb: Callback<Signer>) {
+  createFromKeystore(keystore: Keystore, keystorePassword: string, password: string, cb: Callback<Signer>) {
     hot.createFromKeystore(this, keystore, keystorePassword, password, cb)
   }
 
-  addPrivateKey (id: string, privateKey: string, password: string, cb: Callback<Signer>) {
+  addPrivateKey(id: string, privateKey: string, password: string, cb: Callback<Signer>) {
     // Get signer
     const signer = this.get(id)
     // Make sure signer is of type 'ring'
@@ -179,10 +175,10 @@ class Signers extends EventEmitter {
     }
 
     // Add private key
-    (signer as RingSigner).addPrivateKey(privateKey, password, cb)
+    ;(signer as RingSigner).addPrivateKey(privateKey, password, cb)
   }
 
-  removePrivateKey (id: string, index: number, password: string, cb: Callback<Signer>) {
+  removePrivateKey(id: string, index: number, password: string, cb: Callback<Signer>) {
     // Get signer
     const signer = this.get(id)
 
@@ -191,10 +187,10 @@ class Signers extends EventEmitter {
     }
 
     // Add keystore
-    (signer as RingSigner).removePrivateKey(index, password, cb)
+    ;(signer as RingSigner).removePrivateKey(index, password, cb)
   }
 
-  addKeystore (id: string, keystore: Keystore, keystorePassword: string, password: string, cb: Callback<Signer>) {
+  addKeystore(id: string, keystore: Keystore, keystorePassword: string, password: string, cb: Callback<Signer>) {
     // Get signer
     const signer = this.get(id)
 
@@ -202,30 +198,30 @@ class Signers extends EventEmitter {
       return cb(new Error('Keystores can only be used with ring signers'), undefined)
     }
 
-    (signer as RingSigner).addKeystore(keystore, keystorePassword, password, cb)
+    ;(signer as RingSigner).addKeystore(keystore, keystorePassword, password, cb)
   }
 
-  lock (id: string, cb: Callback<Signer>) {
+  lock(id: string, cb: Callback<Signer>) {
     const signer = this.get(id)
 
     // @ts-ignore
     if (signer && signer.lock) {
-      (signer as HotSigner).lock(cb)
+      ;(signer as HotSigner).lock(cb)
     }
   }
 
-  unlock (id: string, password: string, cb: Callback<Signer>) {
+  unlock(id: string, password: string, cb: Callback<Signer>) {
     const signer = this.signers[id]
 
     // @ts-ignore
     if (signer && signer.unlock) {
-      (signer as HotSigner).unlock(password, cb)
+      ;(signer as HotSigner).unlock(password, cb)
     } else {
       log.error('Signer not unlockable via password, no unlock method')
     }
   }
 
-  unsetSigner () {
+  unsetSigner() {
     log.info('unsetSigner')
   }
 }
diff --git a/main/signers/lattice/Lattice/index.ts b/main/signers/lattice/Lattice/index.ts
index 08d40d91c..28bd6afb3 100644
--- a/main/signers/lattice/Lattice/index.ts
+++ b/main/signers/lattice/Lattice/index.ts
@@ -14,13 +14,13 @@ const ADDRESS_LIMIT = 10
 const HARDENED_OFFSET = 0x80000000
 
 interface DeriveOptions {
-  retries?: number,
+  retries?: number
   derivation?: Derivation
 }
 
 interface Signature {
-  r: Buffer,
-  s: Buffer,
+  r: Buffer
+  s: Buffer
   v: Buffer
 }
 
@@ -34,18 +34,18 @@ export const Status = {
   PAIRING_FAILED: 'Pairing Failed',
   UNKNOWN_ERROR: 'Unknown Device Error',
   DISCONNECTED: 'disconnected',
-  NEEDS_RECONNECTION: 'Please reload this Lattice1 device'
+  NEEDS_RECONNECTION: 'Please reload this Lattice1 device',
 }
 
-function devicePermission (tag: string) {
+function devicePermission(tag: string) {
   return tag ? `Frame-${tag}` : 'Frame'
 }
 
-function parseError (err: string) {
+function parseError(err: string) {
   return err.replace(/Error from device: /, '')
 }
 
-function getStatusForError (err: string) {
+function getStatusForError(err: string) {
   const errText = err.toLowerCase()
 
   if (errText.includes('device locked')) {
@@ -67,7 +67,7 @@ export default class Lattice extends Signer {
   accountLimit = 5
   tag = ''
 
-  constructor (deviceId: string, name: string, tag: string) {
+  constructor(deviceId: string, name: string, tag: string) {
     super()
 
     this.id = 'lattice-' + deviceId
@@ -79,7 +79,7 @@ export default class Lattice extends Signer {
     this.model = 'Lattice1'
   }
 
-  async connect (baseUrl: string, privateKey: string) {
+  async connect(baseUrl: string, privateKey: string) {
     this.status = Status.CONNECTING
     this.emit('update')
 
@@ -96,7 +96,9 @@ export default class Lattice extends Signer {
 
       const { fix: patch, minor, major } = this.connection.getFwVersion() || { fix: 0, major: 0, minor: 0 }
 
-      log.info(`Connected to Lattice with deviceId=${this.deviceId} paired=${paired}, firmware v${major}.${minor}.${patch}`)
+      log.info(
+        `Connected to Lattice with deviceId=${this.deviceId} paired=${paired}, firmware v${major}.${minor}.${patch}`
+      )
 
       this.appVersion = { major, minor, patch }
 
@@ -117,7 +119,7 @@ export default class Lattice extends Signer {
     }
   }
 
-  disconnect () {
+  disconnect() {
     if (this.status === Status.OK) {
       this.status = Status.DISCONNECTED
       this.emit('update')
@@ -128,7 +130,7 @@ export default class Lattice extends Signer {
     this.addresses = []
   }
 
-  close () {
+  close() {
     this.emit('close')
     this.removeAllListeners()
 
@@ -137,7 +139,7 @@ export default class Lattice extends Signer {
     super.close()
   }
 
-  async pair (pairingCode: string) {
+  async pair(pairingCode: string) {
     log.info(`pairing to Lattice ${this.deviceId} with code`, pairingCode)
 
     this.status = Status.PAIRING
@@ -161,10 +163,10 @@ export default class Lattice extends Signer {
     }
   }
 
-  async deriveAddresses (opts?: DeriveOptions) {
+  async deriveAddresses(opts?: DeriveOptions) {
     const { derivation, retriesRemaining } = {
       derivation: opts?.derivation || this.derivation,
-      retriesRemaining: ((opts && ('retries' in opts)) ? opts.retries : 2) as number
+      retriesRemaining: (opts && 'retries' in opts ? opts.retries : 2) as number,
     }
 
     try {
@@ -186,9 +188,7 @@ export default class Lattice extends Signer {
         }
 
         const loadedAddresses = await connection.getAddresses(req)
-        this.addresses = [...this.addresses, ...loadedAddresses].map((addr) =>
-           addHexPrefix(addr.toString())
-        )
+        this.addresses = [...this.addresses, ...loadedAddresses].map((addr) => addHexPrefix(addr.toString()))
       }
 
       this.status = 'ok'
@@ -197,7 +197,7 @@ export default class Lattice extends Signer {
       return this.addresses
     } catch (e) {
       if (retriesRemaining > 0) {
-        return new Promise<string[]>(resolve => {
+        return new Promise<string[]>((resolve) => {
           setTimeout(() => {
             resolve(this.deriveAddresses({ retries: retriesRemaining - 1 }))
           }, 3000)
@@ -211,7 +211,7 @@ export default class Lattice extends Signer {
     }
   }
 
-  async verifyAddress (index: number, currentAddress: string, display = true, cb: Callback<boolean>) {
+  async verifyAddress(index: number, currentAddress: string, display = true, cb: Callback<boolean>) {
     const connection = this.connection as Client
 
     log.info(`verifying address ${currentAddress} for Lattice ${connection.getAppName()}`)
@@ -238,7 +238,7 @@ export default class Lattice extends Signer {
     }
   }
 
-  async signMessage (index: number, message: string, cb: Callback<string>) {
+  async signMessage(index: number, message: string, cb: Callback<string>) {
     try {
       const signature = await this.sign(index, 'signPersonal', message)
 
@@ -249,7 +249,7 @@ export default class Lattice extends Signer {
     }
   }
 
-  async signTypedData (index: number, version: string, typedData: TypedData, cb: Callback<string>) {
+  async signTypedData(index: number, version: string, typedData: TypedData, cb: Callback<string>) {
     const versionNum = (version.match(/[Vv](\d+)/) || [])[1]
 
     if ((parseInt(versionNum) || 0) < 4) {
@@ -266,13 +266,13 @@ export default class Lattice extends Signer {
     }
   }
 
-  async signTransaction (index: number, rawTx: TransactionData, cb: Callback<string>) {
+  async signTransaction(index: number, rawTx: TransactionData, cb: Callback<string>) {
     try {
       const connection = this.connection as Client
       const compatibility = signerCompatibility(rawTx, this.summary())
       const latticeTx = compatibility.compatible ? { ...rawTx } : londonToLegacy(rawTx)
 
-      const signedTx = await sign(latticeTx, async tx => {
+      const signedTx = await sign(latticeTx, async (tx) => {
         const unsignedTx = this.createTransaction(index, rawTx.type, latticeTx.chainId, tx)
         const signingOptions = await this.createTransactionSigningOptions(tx, unsignedTx)
 
@@ -282,7 +282,7 @@ export default class Lattice extends Signer {
         return {
           v: sig.v.toString('hex'),
           r: sig.r.toString('hex'),
-          s: sig.s.toString('hex')
+          s: sig.s.toString('hex'),
         }
       })
 
@@ -293,43 +293,39 @@ export default class Lattice extends Signer {
     }
   }
 
-  summary () {
+  summary() {
     const summary = super.summary()
 
     return {
       ...summary,
       tag: this.tag,
-      addresses: this.addresses.slice(0, this.accountLimit || this.addresses.length)
+      addresses: this.addresses.slice(0, this.accountLimit || this.addresses.length),
     }
   }
 
-  private async sign (index: number, protocol: string, payload: string | TypedData) {
+  private async sign(index: number, protocol: string, payload: string | TypedData) {
     const connection = this.connection as Client
 
     const data = {
       protocol,
       payload,
-      signerPath: this.getPath(index)
+      signerPath: this.getPath(index),
     }
 
     const signOpts = {
       currency: 'ETH_MSG',
-      data: data
+      data: data,
     }
 
     const result = await connection.sign(signOpts)
     const sig = result?.sig as Signature
 
-    const signature = [
-      sig.r,
-      sig.s,
-      padToEven(sig.v.toString('hex'))
-    ].join('')
+    const signature = [sig.r, sig.s, padToEven(sig.v.toString('hex'))].join('')
 
     return addHexPrefix(signature)
   }
 
-  private createTransaction (index: number, txType: string, chainId: string, tx: TypedTransaction) {
+  private createTransaction(index: number, txType: string, chainId: string, tx: TypedTransaction) {
     const { value, to, data, ...txJson } = tx.toJSON()
     const type = hexToNumber(txType)
 
@@ -341,7 +337,7 @@ export default class Lattice extends Signer {
       nonce: hexToNumber(txJson.nonce || ''),
       gasLimit: hexToNumber(txJson.gasLimit || ''),
       useEIP155: true,
-      signerPath: this.getPath(index)
+      signerPath: this.getPath(index),
     }
 
     if (type) {
@@ -350,7 +346,7 @@ export default class Lattice extends Signer {
 
     const optionalFields = ['gasPrice', 'maxFeePerGas', 'maxPriorityFeePerGas']
 
-    optionalFields.forEach(field => {
+    optionalFields.forEach((field) => {
       if (field in txJson) {
         // @ts-ignore
         unsignedTx[field] = hexToNumber(txJson[field])
@@ -360,19 +356,15 @@ export default class Lattice extends Signer {
     return unsignedTx
   }
 
-  private async createTransactionSigningOptions (tx: TypedTransaction, unsignedTx: any) {
+  private async createTransactionSigningOptions(tx: TypedTransaction, unsignedTx: any) {
     const fwVersion = (this.connection as Client).getFwVersion()
 
     if (fwVersion && (fwVersion.major > 0 || fwVersion.minor >= 15)) {
-      const payload = tx.type ?
-        tx.getMessageToSign(false) :
-        rlp.encode(tx.getMessageToSign(false))
+      const payload = tx.type ? tx.getMessageToSign(false) : rlp.encode(tx.getMessageToSign(false))
 
       const to = tx.to?.toString() ?? undefined
 
-      const callDataDecoder = to
-        ? await Utils.fetchCalldataDecoder(tx.data, to, unsignedTx.chainId)
-        : undefined
+      const callDataDecoder = to ? await Utils.fetchCalldataDecoder(tx.data, to, unsignedTx.chainId) : undefined
 
       const data = {
         payload,
@@ -380,23 +372,23 @@ export default class Lattice extends Signer {
         hashType: Constants.SIGNING.HASHES.KECCAK256,
         encodingType: Constants.SIGNING.ENCODINGS.EVM,
         signerPath: unsignedTx.signerPath,
-        decoder: callDataDecoder?.def
+        decoder: callDataDecoder?.def,
       }
 
       return { data, currency: unsignedTx.currency }
     }
-      
+
     return { currency: 'ETH', data: unsignedTx }
   }
 
-  private getPath (index: number) {
+  private getPath(index: number) {
     if (!this.derivation) {
       throw new Error('attempted to get base path with unknown derivation!')
     }
 
     const path = getDerivationPath(this.derivation, index)
 
-    return path.split('/').map(element => {
+    return path.split('/').map((element) => {
       if (element.endsWith("'")) {
         return parseInt(element.substring(0, element.length - 1)) + HARDENED_OFFSET
       }
@@ -405,7 +397,7 @@ export default class Lattice extends Signer {
     })
   }
 
-  private handleError (message: string, err: string) {
+  private handleError(message: string, err: string) {
     const status = getStatusForError(err)
     const parsedErrorMessage = parseError(err)
     const fullMessage = message + ': ' + parsedErrorMessage
diff --git a/main/signers/lattice/adapter.ts b/main/signers/lattice/adapter.ts
index 74f32c515..9f3dd94b8 100644
--- a/main/signers/lattice/adapter.ts
+++ b/main/signers/lattice/adapter.ts
@@ -6,56 +6,55 @@ import Lattice from './Lattice'
 import { Derivation } from '../Signer/derive'
 
 interface GlobalLatticeSettings {
-  baseUrl: string,
-  accountLimit: number,
+  baseUrl: string
+  accountLimit: number
   derivation: Derivation
 }
 
 interface LatticeSettings extends GlobalLatticeSettings {
-  deviceName: string,
-  tag: string,
-  privKey: string,
+  deviceName: string
+  tag: string
+  privKey: string
   paired: boolean
 }
 
-function getLatticeSettings (deviceId: string): LatticeSettings {
+function getLatticeSettings(deviceId: string): LatticeSettings {
   const { baseUrl, derivation, accountLimit } = getGlobalLatticeSettings()
   const device = store('main.lattice', deviceId)
 
   return { ...device, baseUrl, derivation, accountLimit }
 }
 
-function getGlobalLatticeSettings (): GlobalLatticeSettings {
+function getGlobalLatticeSettings(): GlobalLatticeSettings {
   const accountLimit = store('main.latticeSettings.accountLimit')
   const derivation = store('main.latticeSettings.derivation')
   const endpointMode = store('main.latticeSettings.endpointMode')
-  const baseUrl = (endpointMode === 'custom')
-    ? store('main.latticeSettings.endpointCustom')
-    : 'https://signing.gridpl.us'
+  const baseUrl = endpointMode === 'custom' ? store('main.latticeSettings.endpointCustom') : 'https://signing.gridpl.us'
 
   return { baseUrl, derivation, accountLimit }
 }
 
 export default class LatticeAdapter extends SignerAdapter {
-  private knownSigners: { [deviceId: string]: Lattice };
+  private knownSigners: { [deviceId: string]: Lattice }
 
-  private signerObserver: any;
-  private settingsObserver: any;
+  private signerObserver: any
+  private settingsObserver: any
 
-  constructor () {
+  constructor() {
     super('lattice')
 
     this.knownSigners = {}
   }
 
-  open () {
+  open() {
     this.settingsObserver = store.observer(() => {
       const { baseUrl, derivation, accountLimit } = getGlobalLatticeSettings()
 
-      Object.values(this.knownSigners).forEach(lattice => {
+      Object.values(this.knownSigners).forEach((lattice) => {
         if (!lattice.connection) return
-        
-        let needsUpdate = false, reloadAddresses = false
+
+        let needsUpdate = false,
+          reloadAddresses = false
 
         if (derivation !== lattice.derivation) {
           lattice.derivation = derivation
@@ -67,7 +66,7 @@ export default class LatticeAdapter extends SignerAdapter {
         if (accountLimit !== lattice.accountLimit) {
           lattice.accountLimit = accountLimit
 
-          reloadAddresses = reloadAddresses || (lattice.addresses.length < lattice.accountLimit)
+          reloadAddresses = reloadAddresses || lattice.addresses.length < lattice.accountLimit
           needsUpdate = true
         }
         if (baseUrl !== lattice.connection.baseUrl) {
@@ -137,7 +136,7 @@ export default class LatticeAdapter extends SignerAdapter {
 
         this.knownSigners[deviceId] = lattice
         this.emit('add', lattice)
-        
+
         if (device.paired) {
           // don't attempt to automatically connect if the Lattice isn't
           // paired as this could happen without the user noticing
@@ -149,12 +148,12 @@ export default class LatticeAdapter extends SignerAdapter {
     }, 'latticeSigners')
   }
 
-  close () {
+  close() {
     if (this.signerObserver) {
       this.signerObserver.remove()
       this.signerObserver = null
     }
-    
+
     if (this.settingsObserver) {
       this.settingsObserver.remove()
       this.settingsObserver = null
@@ -163,7 +162,7 @@ export default class LatticeAdapter extends SignerAdapter {
     this.knownSigners = {}
   }
 
-  remove (lattice: Lattice) {
+  remove(lattice: Lattice) {
     log.info(`removing Lattice ${lattice.deviceId}`)
 
     store.removeLattice(lattice.deviceId)
@@ -173,7 +172,7 @@ export default class LatticeAdapter extends SignerAdapter {
     }
   }
 
-  async reload (lattice: Lattice) {
+  async reload(lattice: Lattice) {
     log.info(`reloading Lattice ${lattice.deviceId}`)
 
     lattice.disconnect()
diff --git a/main/signers/ledger/Ledger/eth.ts b/main/signers/ledger/Ledger/eth.ts
index c5c7a06b7..56815a429 100644
--- a/main/signers/ledger/Ledger/eth.ts
+++ b/main/signers/ledger/Ledger/eth.ts
@@ -10,17 +10,17 @@ import { TransactionData } from '../../../../resources/domain/transaction'
 import { sign } from '../../../transaction'
 
 export default class LedgerEthereumApp {
-  private eth: Eth;
+  private eth: Eth
 
-  constructor (transport: Transport) {
+  constructor(transport: Transport) {
     this.eth = new Eth(transport)
   }
 
-  async close () {
+  async close() {
     return this.eth.transport.close()
   }
 
-  async deriveAddresses (derivation: Derivation) {
+  async deriveAddresses(derivation: Derivation) {
     log.info(`deriving ${derivation} Ledger addresses`)
 
     const path = getDerivationPath(derivation)
@@ -40,16 +40,16 @@ export default class LedgerEthereumApp {
     return new Promise(executor)
   }
 
-  async signMessage (path: string, message: string) {
+  async signMessage(path: string, message: string) {
     const rawMessage = stripHexPrefix(message)
-    
+
     const signature = await this.eth.signPersonalMessage(path, rawMessage)
     const hashedSignature = signature.r + signature.s + padToEven((signature.v - 27).toString(16))
 
     return addHexPrefix(hashedSignature)
   }
 
-  async signTypedData (path: string, typedData: TypedData) {
+  async signTypedData(path: string, typedData: TypedData) {
     let domainSeparatorHex, hashStructMessageHex
 
     try {
@@ -66,8 +66,8 @@ export default class LedgerEthereumApp {
     return addHexPrefix(hashedSignature)
   }
 
-  async signTransaction (path: string, ledgerTx: TransactionData) {
-    const signedTx = await sign(ledgerTx, tx => {
+  async signTransaction(path: string, ledgerTx: TransactionData) {
+    const signedTx = await sign(ledgerTx, (tx) => {
       // legacy transactions aren't RLP encoded before they're returned
       const message = tx.getMessageToSign(false)
       const legacyMessage = message[0] !== tx.type
@@ -79,11 +79,11 @@ export default class LedgerEthereumApp {
     return addHexPrefix(signedTx.serialize().toString('hex'))
   }
 
-  async getAddress (path: string, display: boolean, chainCode: boolean) {
+  async getAddress(path: string, display: boolean, chainCode: boolean) {
     return this.eth.getAddress(path, display, chainCode)
   }
 
-  async getAppConfiguration () {
+  async getAppConfiguration() {
     return this.eth.getAppConfiguration()
   }
 }
diff --git a/main/signers/ledger/Ledger/index.ts b/main/signers/ledger/Ledger/index.ts
index a52acb661..35c8e9643 100644
--- a/main/signers/ledger/Ledger/index.ts
+++ b/main/signers/ledger/Ledger/index.ts
@@ -20,17 +20,17 @@ export const Status = {
   LOCKED: 'locked',
   WRONG_APP: 'Open your Ledger and select the Ethereum application',
   DISCONNECTED: 'Disconnected',
-  NEEDS_RECONNECTION: 'Please reconnect this Ledger device'
+  NEEDS_RECONNECTION: 'Please reconnect this Ledger device',
 }
 
 interface DeviceError {
-  statusCode: number,
+  statusCode: number
   message: string
 }
 
 interface Address {
-  address: string,
-  publicKey: string,
+  address: string
+  publicKey: string
   chainCode?: string | undefined
 }
 
@@ -42,22 +42,22 @@ function isInvalidRequest(err: DeviceError) {
   return [99901].includes(err.statusCode)
 }
 
-function isDeviceAsleep (err: DeviceError) {
+function isDeviceAsleep(err: DeviceError) {
   return [27404, 26628].includes(err.statusCode)
 }
 
-function needToOpenEthApp (err: DeviceError) {
+function needToOpenEthApp(err: DeviceError) {
   return [27904, 27906, 25873, 25871].includes(err.statusCode)
 }
 
 // additional status codes
 //   27264: 'INCORRECT_DATA'
 
-function getStatusForError (err: DeviceError) {
+function getStatusForError(err: DeviceError) {
   if (needToOpenEthApp(err)) {
     return Status.WRONG_APP
   }
-  
+
   if (isDeviceAsleep(err)) {
     return Status.LOCKED
   }
@@ -70,12 +70,12 @@ function getStatusForError (err: DeviceError) {
 }
 
 export default class Ledger extends Signer {
-  private eth: LedgerEthereumApp | undefined;
+  private eth: LedgerEthereumApp | undefined
 
-  devicePath: string;
+  devicePath: string
 
-  derivation: Derivation | undefined;
-  accountLimit = 5;
+  derivation: Derivation | undefined
+  accountLimit = 5
 
   // the Ledger device can only handle one request at a time; the transport will reject
   // all incoming requests while its busy, so we need to make sure requests are only executed
@@ -83,7 +83,7 @@ export default class Ledger extends Signer {
   private requestQueue = new RequestQueue()
   private statusPoller = setTimeout(() => {})
 
-  constructor (devicePath: string, model: string) {
+  constructor(devicePath: string, model: string) {
     super()
 
     this.devicePath = devicePath
@@ -94,7 +94,7 @@ export default class Ledger extends Signer {
     this.status = Status.INITIAL
   }
 
-  async open () {
+  async open() {
     const transport = await TransportNodeHid.open(this.devicePath)
 
     this.eth = new LedgerEthereumApp(transport)
@@ -102,14 +102,14 @@ export default class Ledger extends Signer {
     this.requestQueue.start()
   }
 
-  close () {
+  close() {
     this.emit('close')
     this.removeAllListeners()
-    
+
     super.close()
   }
 
-  async connect () {
+  async connect() {
     try {
       // since the Ledger doesn't provide information about whether the eth app is open or if
       // the device is locked, the order of these checks is important in order to correctly determine
@@ -129,9 +129,9 @@ export default class Ledger extends Signer {
       await this.checkDeviceStatus()
 
       if (this.isReady()) {
-        const [major, minor, patch] = (config.version || '1.6.1').split('.').map(n => parseInt(n))
+        const [major, minor, patch] = (config.version || '1.6.1').split('.').map((n) => parseInt(n))
         const version = { major, minor, patch }
-        
+
         this.appVersion = version
 
         this.deriveAddresses()
@@ -145,7 +145,7 @@ export default class Ledger extends Signer {
     }
   }
 
-  async disconnect () {
+  async disconnect() {
     if (this.status === Status.OK) {
       this.updateStatus(Status.DISCONNECTED)
       this.emit('update')
@@ -161,13 +161,13 @@ export default class Ledger extends Signer {
     }
   }
 
-  private isReady () {
+  private isReady() {
     const readyStatuses = [Status.INITIAL, Status.OK]
 
     return readyStatuses.includes(this.status)
   }
 
-  private handleError (err: DeviceError) {
+  private handleError(err: DeviceError) {
     const errorStatus = getStatusForError(err)
 
     if (errorStatus === Status.LOCKED && this.status !== Status.LOCKED) {
@@ -186,7 +186,7 @@ export default class Ledger extends Signer {
     }
   }
 
-  private isValidStatusTransition (status: string) {
+  private isValidStatusTransition(status: string) {
     // TODO: outline all valid state transitions
     if (status === Status.DERIVING) {
       return [Status.OK, Status.INITIAL].includes(this.status)
@@ -195,7 +195,7 @@ export default class Ledger extends Signer {
     return true
   }
 
-  updateStatus (status: string) {
+  updateStatus(status: string) {
     if (this.isValidStatusTransition(status)) {
       this.status = status
     }
@@ -211,7 +211,7 @@ export default class Ledger extends Signer {
     }
   }
 
-  private async checkDeviceStatus () {
+  private async checkDeviceStatus() {
     const check = new Promise(async (resolve: (err: DeviceError | undefined) => void) => {
       setTimeout(() => resolve({ statusCode: -1, message: 'status check timed out' }), 3000)
 
@@ -224,7 +224,7 @@ export default class Ledger extends Signer {
       }
     })
 
-    return check.then(err => {
+    return check.then((err) => {
       if (!err) {
         // success, handle different status state transitions
 
@@ -243,7 +243,7 @@ export default class Ledger extends Signer {
     })
   }
 
-  private async pollDeviceStatus (frequency: number) {
+  private async pollDeviceStatus(frequency: number) {
     const lastStatus = this.status
 
     this.statusPoller = setTimeout(() => {
@@ -261,7 +261,7 @@ export default class Ledger extends Signer {
             }
 
             return this.checkDeviceStatus()
-          }
+          },
         })
       }
 
@@ -269,21 +269,21 @@ export default class Ledger extends Signer {
     }, frequency)
   }
 
-  private enqueueRequests (...requests: Request[]) {
-    requests.forEach(req => this.requestQueue.add(req))
+  private enqueueRequests(...requests: Request[]) {
+    requests.forEach((req) => this.requestQueue.add(req))
   }
 
-  private getPath (index: number) {
+  private getPath(index: number) {
     if (!this.derivation) {
       throw new Error('attempted to get path with unknown derivation!')
     }
-  
+
     return getDerivationPath(this.derivation, index)
   }
 
   // *** request enqueuing methods *** //
 
-  deriveAddresses () {
+  deriveAddresses() {
     this.requestQueue.clear()
     this.addresses = []
 
@@ -297,7 +297,7 @@ export default class Ledger extends Signer {
     }
   }
 
-  private deriveLiveAddresses () {
+  private deriveLiveAddresses() {
     const requests = []
 
     for (let i = 0; i < this.accountLimit; i++) {
@@ -305,7 +305,7 @@ export default class Ledger extends Signer {
         type: 'deriveAddresses',
         execute: async () => {
           try {
-            if (!this.eth)  throw new Error('attempted to derive Live addresses but Eth app is not connected!')
+            if (!this.eth) throw new Error('attempted to derive Live addresses but Eth app is not connected!')
 
             const path = this.getPath(i)
             const { address } = await this.eth.getAddress(path, false, false)
@@ -325,21 +325,21 @@ export default class Ledger extends Signer {
           } catch (e) {
             this.handleError(e as DeviceError)
           }
-        }
+        },
       })
     }
 
     this.enqueueRequests(...requests)
   }
 
-  private deriveHardwareAddresses () {
+  private deriveHardwareAddresses() {
     const targetDerivation = this.derivation
 
     this.enqueueRequests({
       type: 'deriveAddresses',
       execute: async () => {
         try {
-          if (!this.eth)  throw new Error('attempted to derive hardware addresses but Eth app is not connected!')
+          if (!this.eth) throw new Error('attempted to derive hardware addresses but Eth app is not connected!')
           if (!this.derivation) throw new Error('attempted to derive hardware addresses for unknown derivation!')
 
           const addresses = await this.eth.deriveAddresses(this.derivation)
@@ -357,16 +357,16 @@ export default class Ledger extends Signer {
         } catch (e) {
           this.handleError(e as DeviceError)
         }
-      }
+      },
     })
   }
 
-  verifyAddress (index: number, currentAddress: string, display = false, cb: Callback<boolean>) {
+  verifyAddress(index: number, currentAddress: string, display = false, cb: Callback<boolean>) {
     this.enqueueRequests({
       type: 'verifyAddress',
       execute: async () => {
         try {
-          if (!this.eth)  throw new Error('attempted to verify address but Eth app is not connected!')
+          if (!this.eth) throw new Error('attempted to verify address but Eth app is not connected!')
           if (!this.derivation) throw new Error('attempted to verify address with unknown derivation!')
 
           const path = this.getPath(index)
@@ -396,16 +396,16 @@ export default class Ledger extends Signer {
 
           cb(new Error(message), undefined)
         }
-      }
+      },
     })
   }
 
-  signMessage (index: number, message: string, cb: Callback<string>) {
+  signMessage(index: number, message: string, cb: Callback<string>) {
     this.enqueueRequests({
       type: 'signMessage',
       execute: async () => {
         try {
-          if (!this.eth)  throw new Error('attempted to sign message but Eth app is not connected!')
+          if (!this.eth) throw new Error('attempted to sign message but Eth app is not connected!')
           if (!this.derivation) throw new Error('attempted to sign message with unknown derivation!')
 
           const path = this.getPath(index)
@@ -423,11 +423,11 @@ export default class Ledger extends Signer {
 
           cb(new Error(message), undefined)
         }
-      }
+      },
     })
   }
 
-  signTypedData (index: number, version: string, typedData: TypedData, cb: Callback<string>) {
+  signTypedData(index: number, version: string, typedData: TypedData, cb: Callback<string>) {
     const versionNum = (version.match(/[Vv](\d+)/) || [])[1]
 
     if ((parseInt(versionNum) || 0) < 4) {
@@ -438,7 +438,7 @@ export default class Ledger extends Signer {
       type: 'signTypedData',
       execute: async () => {
         try {
-          if (!this.eth)  throw new Error('attempted to sign typed data but Eth app is not connected!')
+          if (!this.eth) throw new Error('attempted to sign typed data but Eth app is not connected!')
           if (!this.derivation) throw new Error('attempted to sign typed data with unknown derivation!')
 
           const path = this.getPath(index)
@@ -449,18 +449,20 @@ export default class Ledger extends Signer {
           cb(null, signedData)
         } catch (e) {
           const err = e as DeviceError
-          const message = wasRequestRejected(err) ? 'Sign request rejected by user' : `Sign message error: ${err.message}`
+          const message = wasRequestRejected(err)
+            ? 'Sign request rejected by user'
+            : `Sign message error: ${err.message}`
 
           this.handleError(err)
           log.error('error signing typed data on Ledger', message)
 
           cb(new Error(message), undefined)
         }
-      }
+      },
     })
   }
 
-  signTransaction (index: number, rawTx: TransactionData, cb: Callback<string>) {
+  signTransaction(index: number, rawTx: TransactionData, cb: Callback<string>) {
     const compatibility = signerCompatibility(rawTx, this.summary())
     const ledgerTx = compatibility.compatible ? { ...rawTx } : londonToLegacy(rawTx)
 
@@ -468,7 +470,7 @@ export default class Ledger extends Signer {
       type: 'signTransaction',
       execute: async () => {
         try {
-          if (!this.eth)  throw new Error('attempted to sign transaction but Eth app is not connected!')
+          if (!this.eth) throw new Error('attempted to sign transaction but Eth app is not connected!')
           if (!this.derivation) throw new Error('attempted to sign transaction with unknown derivation!')
 
           const path = this.getPath(index)
@@ -486,13 +488,13 @@ export default class Ledger extends Signer {
 
           cb(new Error(message), undefined)
         }
-      }
+      },
     })
   }
 
   // *** direct device access methods *** //
 
-  private async getAddress (path: string, display = false, chainCode = false) {
+  private async getAddress(path: string, display = false, chainCode = false) {
     return new Promise((resolve: (address: Address) => void, reject) => {
       if (!this.eth) {
         return reject(new Error('tried to get address but Eth app is not connected!'))
@@ -505,12 +507,16 @@ export default class Ledger extends Signer {
         fallback = setTimeout(() => reject({ message: 'getAddress timed out', statusCode: -1 }), 3000)
       }
 
-      this.eth.getAddress(path, display, chainCode).then(resolve).catch(reject).finally(() => clearTimeout(fallback))
+      this.eth
+        .getAddress(path, display, chainCode)
+        .then(resolve)
+        .catch(reject)
+        .finally(() => clearTimeout(fallback))
     })
   }
 
-  private async getAppConfiguration () {
-    // if this call blocks and we are not yet connected it means that the Ledger is locked and 
+  private async getAppConfiguration() {
+    // if this call blocks and we are not yet connected it means that the Ledger is locked and
     // the eth app is not open; if the Ledger is locked and eth app IS open, this should return successfully
 
     return new Promise((resolve: (config: { version: string }) => void, reject) => {
@@ -519,11 +525,15 @@ export default class Ledger extends Signer {
       }
 
       const fallback = setTimeout(() => {
-        const statusCode = (this.status === Status.INITIAL) ? 27904 : -1
+        const statusCode = this.status === Status.INITIAL ? 27904 : -1
         reject({ message: 'getAppConfiguration timed out', statusCode })
       }, 1000)
 
-      this.eth.getAppConfiguration().then(resolve).catch(reject).finally(() => clearTimeout(fallback))
+      this.eth
+        .getAppConfiguration()
+        .then(resolve)
+        .catch(reject)
+        .finally(() => clearTimeout(fallback))
     })
   }
 }
diff --git a/main/signers/ledger/Ledger/requestQueue.ts b/main/signers/ledger/Ledger/requestQueue.ts
index 6d8c79f64..5bfa41e55 100644
--- a/main/signers/ledger/Ledger/requestQueue.ts
+++ b/main/signers/ledger/Ledger/requestQueue.ts
@@ -1,32 +1,31 @@
 import log from 'electron-log'
 
 export interface Request {
-  execute: () => Promise<any>,
+  execute: () => Promise<any>
   type: string
 }
 
 const noRequest = {
   type: 'emptyQueue',
-  execute: () => Promise.resolve()
+  execute: () => Promise.resolve(),
 }
 
 export class RequestQueue {
-  private running = false;
+  private running = false
   private requestQueue: Array<Request> = []
   private requestPoller = setTimeout(() => {})
 
-  add (request: Request) {
+  add(request: Request) {
     this.requestQueue.push(request)
   }
 
-  pollRequest () {
+  pollRequest() {
     // each request must return a promise
-    const request = (this.requestQueue.length === 0) 
-      ? noRequest
-      : this.requestQueue.splice(0, 1)[0]
+    const request = this.requestQueue.length === 0 ? noRequest : this.requestQueue.splice(0, 1)[0]
 
-    request.execute()
-      .catch(err => log.warn('Ledger request queue caught unexpected error', err))
+    request
+      .execute()
+      .catch((err) => log.warn('Ledger request queue caught unexpected error', err))
       .finally(() => {
         if (this.running) {
           this.requestPoller = setTimeout(this.pollRequest.bind(this), 200)
@@ -34,26 +33,26 @@ export class RequestQueue {
       })
   }
 
-  start () {
+  start() {
     this.running = true
     this.pollRequest()
   }
-  
-  stop () {
+
+  stop() {
     this.running = false
     clearTimeout(this.requestPoller)
   }
 
-  close () {
+  close() {
     this.stop()
     this.clear()
   }
 
-  clear () {
+  clear() {
     this.requestQueue = []
   }
 
-  peekBack () {
+  peekBack() {
     return this.requestQueue[this.requestQueue.length - 1]
   }
 }
diff --git a/main/signers/ledger/adapter.ts b/main/signers/ledger/adapter.ts
index c5c935661..35f02bfd2 100644
--- a/main/signers/ledger/adapter.ts
+++ b/main/signers/ledger/adapter.ts
@@ -10,7 +10,7 @@ import { SignerAdapter } from '../adapters'
 import Ledger from './Ledger'
 import store from '../../store'
 
-function updateDerivation (ledger: Ledger, derivation = store('main.ledger.derivation'), accountLimit = 0) {
+function updateDerivation(ledger: Ledger, derivation = store('main.ledger.derivation'), accountLimit = 0) {
   const liveAccountLimit = accountLimit || (derivation === Derivation.live ? store('main.ledger.liveAccountLimit') : 0)
 
   ledger.derivation = derivation
@@ -18,34 +18,34 @@ function updateDerivation (ledger: Ledger, derivation = store('main.ledger.deriv
 }
 
 interface Disconnection {
-  device: Ledger,
+  device: Ledger
   timeout: NodeJS.Timeout
 }
 
-type ConnectedDevice = Device & { path: string, product: string }
+type ConnectedDevice = Device & { path: string; product: string }
 
 export default class LedgerSignerAdapter extends SignerAdapter {
-  private knownSigners: { [devicePath: string]: Ledger };
+  private knownSigners: { [devicePath: string]: Ledger }
   private disconnections: Disconnection[]
 
-  private observer: any;
-  private usbListener: Subscription | null = null;
+  private observer: any
+  private usbListener: Subscription | null = null
 
-  constructor () {
+  constructor() {
     super('ledger')
 
     this.knownSigners = {}
     this.disconnections = []
   }
 
-  open () {
+  open() {
     this.observer = store.observer(() => {
       const ledgerDerivation = store('main.ledger.derivation')
       const liveAccountLimit = store('main.ledger.liveAccountLimit')
 
-      Object.values(this.knownSigners).forEach(ledger => {
+      Object.values(this.knownSigners).forEach((ledger) => {
         if (
-          ledger.derivation !== ledgerDerivation || 
+          ledger.derivation !== ledgerDerivation ||
           (ledger.derivation === 'live' && ledger.accountLimit !== liveAccountLimit)
         ) {
           updateDerivation(ledger, ledgerDerivation, liveAccountLimit)
@@ -55,28 +55,28 @@ export default class LedgerSignerAdapter extends SignerAdapter {
     })
 
     this.usbListener = TransportNodeHid.listen({
-      next: evt => {
+      next: (evt) => {
         log.debug(`received ${evt.type} USB event`)
 
         if (!evt.deviceModel) {
           log.warn('received USB event with no Ledger device model', evt)
           return
         }
-        
+
         this.handleDeviceChanges()
       },
       complete: () => {
         log.debug('received USB complete event')
       },
-      error: err => {
+      error: (err) => {
         log.error('USB error', err)
-      }
+      },
     })
 
     super.open()
   }
 
-  close () {
+  close() {
     if (this.observer) {
       this.observer.remove()
       this.observer = null
@@ -90,7 +90,7 @@ export default class LedgerSignerAdapter extends SignerAdapter {
     super.close()
   }
 
-  remove (ledger: Ledger) {
+  remove(ledger: Ledger) {
     if (ledger.devicePath in this.knownSigners) {
       log.info(`removing Ledger ${ledger.model} attached at ${ledger.devicePath}`)
 
@@ -100,34 +100,30 @@ export default class LedgerSignerAdapter extends SignerAdapter {
     }
   }
 
-  reload (ledger: Ledger) {
+  reload(ledger: Ledger) {
     log.info(`reloading  Ledger ${ledger.model} attached at ${ledger.devicePath}`)
 
     const signer = this.knownSigners[ledger.devicePath]
 
     if (signer) {
-      signer.disconnect()
+      signer
+        .disconnect()
         .then(() => signer.open())
         .then(() => signer.connect())
     }
   }
 
-  private handleDeviceChanges () {
-    const {
-      attachedDevices,
-      detachedLedgers,
-      reconnections,
-      pendingDisconnections
-    } = this.detectDeviceChanges()
+  private handleDeviceChanges() {
+    const { attachedDevices, detachedLedgers, reconnections, pendingDisconnections } = this.detectDeviceChanges()
 
     this.disconnections = pendingDisconnections
 
-    detachedLedgers.forEach(ledger => this.handleDisconnectedDevice(ledger))
-    reconnections.forEach(disconnection => this.handleReconnectedDevice(disconnection))
-    attachedDevices.forEach(device => this.handleAttachedDevice(device))
+    detachedLedgers.forEach((ledger) => this.handleDisconnectedDevice(ledger))
+    reconnections.forEach((disconnection) => this.handleReconnectedDevice(disconnection))
+    attachedDevices.forEach((device) => this.handleAttachedDevice(device))
   }
 
-  private async handleAttachedDevice (device: ConnectedDevice) {
+  private async handleAttachedDevice(device: ConnectedDevice) {
     log.info(`Ledger ${device.product} attached at ${device.path}`)
 
     const ledger = new Ledger(device.path, device.product)
@@ -149,18 +145,18 @@ export default class LedgerSignerAdapter extends SignerAdapter {
     this.knownSigners[ledger.devicePath] = ledger
 
     this.emit('add', ledger)
-    
+
     await this.handleConnectedDevice(ledger)
   }
 
-  private async handleConnectedDevice (ledger: Ledger) {
+  private async handleConnectedDevice(ledger: Ledger) {
     updateDerivation(ledger)
 
     await ledger.open()
     await ledger.connect()
   }
 
-  private async handleReconnectedDevice (disconnection: Disconnection) {
+  private async handleReconnectedDevice(disconnection: Disconnection) {
     log.info(`Ledger ${disconnection.device.model} re-connected at ${disconnection.device.devicePath}`)
 
     clearTimeout(disconnection.timeout)
@@ -168,7 +164,7 @@ export default class LedgerSignerAdapter extends SignerAdapter {
     this.handleConnectedDevice(disconnection.device)
   }
 
-  handleDisconnectedDevice (ledger: Ledger) {
+  handleDisconnectedDevice(ledger: Ledger) {
     log.info(`Ledger ${ledger.model} disconnected from ${ledger.devicePath}`)
 
     ledger.disconnect()
@@ -179,72 +175,77 @@ export default class LedgerSignerAdapter extends SignerAdapter {
     this.disconnections.push({
       device: ledger,
       timeout: setTimeout(() => {
-        const index = this.disconnections.findIndex(d => d.device.devicePath === ledger.devicePath)
+        const index = this.disconnections.findIndex((d) => d.device.devicePath === ledger.devicePath)
         this.disconnections.splice(index, 1)
 
         log.info(`Ledger ${ledger.model} detached from ${ledger.devicePath}`)
 
         this.remove(ledger)
-      }, 5000)
+      }, 5000),
     })
   }
 
-  private detectDeviceChanges () {
+  private detectDeviceChanges() {
     // all Ledger devices that are currently connected
     const ledgerDevices = getLedgerDevices()
-      .filter(device => !!device.path)
-      .map(d => ({ ...d, path: d.path as string, product: d.product || '' }))
+      .filter((device) => !!device.path)
+      .map((d) => ({ ...d, path: d.path as string, product: d.product || '' }))
 
     const { pendingDisconnections, reconnections } = this.getReconnectedLedgers(ledgerDevices)
     const detachedLedgers = this.getDetachedLedgers(ledgerDevices)
-    const attachedDevices = this.getAttachedDevices(ledgerDevices).filter(device =>
-      !reconnections.some(r => r.device.devicePath === device.path)
+    const attachedDevices = this.getAttachedDevices(ledgerDevices).filter(
+      (device) => !reconnections.some((r) => r.device.devicePath === device.path)
     )
 
     return {
-      attachedDevices, detachedLedgers, pendingDisconnections, reconnections
+      attachedDevices,
+      detachedLedgers,
+      pendingDisconnections,
+      reconnections,
     }
   }
 
-  private getAttachedDevices (connectedDevices: ConnectedDevice[]) {
+  private getAttachedDevices(connectedDevices: ConnectedDevice[]) {
     // attached devices are ones where a connected device
     // is not yet one of the currently known signers
-    return connectedDevices.filter(device => !(device.path in this.knownSigners))
+    return connectedDevices.filter((device) => !(device.path in this.knownSigners))
   }
 
-  private getDetachedLedgers (connectedDevices: ConnectedDevice[]) {
+  private getDetachedLedgers(connectedDevices: ConnectedDevice[]) {
     // detached Ledgers are previously known signers that are
     // no longer one of the connected Ledger devices
-    return Object.values(this.knownSigners).filter(signer =>
-      !connectedDevices.some(device => device.path === signer.devicePath)
+    return Object.values(this.knownSigners).filter(
+      (signer) => !connectedDevices.some((device) => device.path === signer.devicePath)
     )
   }
 
-  private getReconnectedLedgers (connectedDevices: ConnectedDevice[]) {
+  private getReconnectedLedgers(connectedDevices: ConnectedDevice[]) {
     // group all the disconnections into ones that are either accounted for
     // by the currently connected devices (reconnections) or ones that are still
     // pending (pendingDisconnections)
-    const {
-      pendingDisconnections,
-      reconnections
-    } = this.disconnections.reduce((resolved, disconnection) => {
-      if (connectedDevices.some(device => device.path === disconnection.device.devicePath)) {
-        resolved.reconnections.push(disconnection)
-      } else {
-        resolved.pendingDisconnections.push(disconnection)
-      }
+    const { pendingDisconnections, reconnections } = this.disconnections.reduce(
+      (resolved, disconnection) => {
+        if (connectedDevices.some((device) => device.path === disconnection.device.devicePath)) {
+          resolved.reconnections.push(disconnection)
+        } else {
+          resolved.pendingDisconnections.push(disconnection)
+        }
 
-      return resolved
-    }, { pendingDisconnections: [] as Array<Disconnection>, reconnections: [] as Array<Disconnection> })
+        return resolved
+      },
+      {
+        pendingDisconnections: [] as Array<Disconnection>,
+        reconnections: [] as Array<Disconnection>,
+      }
+    )
 
     // if we are still waiting on reconnections, check if any more devices have been added. if so, assume
     // that these are the reconnection events and allow any newly connected device to take the place
     // of a disconnected one. this mostly happens on Windows because the devices reconnect at a different
     // device path from the one from which they were disconnected
     while (pendingDisconnections.length > 0) {
-      const reconnectedDevice = connectedDevices.find(device => 
-        !reconnections.some(r => r.device.devicePath === device.path) &&
-        !this.knownSigners[device.path]
+      const reconnectedDevice = connectedDevices.find(
+        (device) => !reconnections.some((r) => r.device.devicePath === device.path) && !this.knownSigners[device.path]
       )
 
       if (reconnectedDevice) {
@@ -255,7 +256,7 @@ export default class LedgerSignerAdapter extends SignerAdapter {
         disconnection.device.devicePath = reconnectedDevice.path
 
         reconnections.push(disconnection)
-      } else break;
+      } else break
     }
 
     return { pendingDisconnections, reconnections }
diff --git a/main/signers/trezor/Trezor/index.ts b/main/signers/trezor/Trezor/index.ts
index 63f7128e4..ee6af2eb3 100644
--- a/main/signers/trezor/Trezor/index.ts
+++ b/main/signers/trezor/Trezor/index.ts
@@ -22,17 +22,17 @@ const defaultTrezorOneVersion = { major_version: 1, minor_version: 9, patch_vers
 type FlexCallback<T> = (err: string | null, result: T | undefined) => void
 
 interface PublicKeyResponse {
-  chainCode: string,
-  publicKey: string,
+  chainCode: string
+  publicKey: string
 }
 
 export default class Trezor extends Signer {
-  private closed = false;
-  
-  device: TrezorDevice;
-  derivation: Derivation | undefined;
+  private closed = false
 
-  constructor (device: TrezorDevice) {
+  device: TrezorDevice
+  derivation: Derivation | undefined
+
+  constructor(device: TrezorDevice) {
     super()
 
     this.addresses = []
@@ -50,18 +50,18 @@ export default class Trezor extends Signer {
     this.status = 'loading'
   }
 
-  async open () {
+  async open() {
     this.closed = false
 
     this.reset()
     this.deviceStatus()
-    
+
     setTimeout(() => {
       this.deviceStatus()
     }, 2000)
   }
 
-  close () {
+  close() {
     this.closed = true
 
     this.emit('close')
@@ -70,41 +70,42 @@ export default class Trezor extends Signer {
     super.close()
   }
 
-  update () {
+  update() {
     if (this.closed) return
 
     this.emit('update')
   }
 
-  reset () {
+  reset() {
     this.status = 'loading'
     this.addresses = []
     this.update()
   }
 
-  private getId () {
+  private getId() {
     return uuid('Trezor' + this.device.path, ns)
   }
 
-  private getPath (index: number) {
+  private getPath(index: number) {
     return this.basePath() + '/' + index.toString()
   }
 
-  private basePath () {
+  private basePath() {
     if (!this.derivation) {
       throw new Error('attempted to get base path with unknown derivation!')
     }
 
-    return `m/${getDerivationPath(this.derivation)}`.replace(/\/+$/,'')
+    return `m/${getDerivationPath(this.derivation)}`.replace(/\/+$/, '')
   }
 
-  deviceStatus () {
+  deviceStatus() {
     this.lookupAddresses((err, addresses) => {
       if (err) {
         if (err === 'Device call in progress') return
 
         if (err.toLowerCase() !== 'verify address error') this.status = 'loading'
-        if (err === 'ui-device_firmware_old') this.status = `Update Firmware (v${this.device.firmwareRelease.release.version.join('.')})`
+        if (err === 'ui-device_firmware_old')
+          this.status = `Update Firmware (v${this.device.firmwareRelease.release.version.join('.')})`
         if (err === 'ui-device_bootloader_mode') this.status = 'Device in Bootloader Mode'
         this.addresses = []
         this.update()
@@ -125,7 +126,7 @@ export default class Trezor extends Signer {
     })
   }
 
-  verifyAddress (index: number, currentAddress: string, display = false, cb: Callback<boolean>, attempt = 0) {
+  verifyAddress(index: number, currentAddress: string, display = false, cb: Callback<boolean>, attempt = 0) {
     log.info('Verify Address, attempt: ' + attempt)
     let timeout = false
     const timer = setTimeout(() => {
@@ -145,7 +146,7 @@ export default class Trezor extends Signer {
           setTimeout(() => this.verifyAddress(index, currentAddress, display, cb, ++attempt), 1000 * (attempt + 1))
         } else {
           log.error('Verify address error:', err)
-          
+
           this.status = (err || '').toLowerCase().match(/forbidden key path/)
             ? 'derivation path failed strict safety checks on trezor device'
             : err
@@ -163,7 +164,7 @@ export default class Trezor extends Signer {
         if (address !== current) {
           // TODO: Error Notification
           log.error(new Error('Address does not match device'))
-          
+
           this.close()
 
           cb(new Error('Address does not match device'), undefined)
@@ -177,7 +178,7 @@ export default class Trezor extends Signer {
     flex.rpc('trezor.ethereumGetAddress', this.device.path, this.getPath(index), display, rpcCallback)
   }
 
-  lookupAddresses (cb: FlexCallback<Array<string>>) {
+  lookupAddresses(cb: FlexCallback<Array<string>>) {
     const rpcCallback: FlexCallback<PublicKeyResponse> = (err, result) => {
       if (err) return cb(err, undefined)
 
@@ -187,7 +188,7 @@ export default class Trezor extends Signer {
 
         const accounts = (accs || []) as string[]
         const firstAccount = accounts[0] || ''
-        this.verifyAddress(0, firstAccount, false, err => {
+        this.verifyAddress(0, firstAccount, false, (err) => {
           if (err) return cb(err.message, undefined)
           cb(null, accounts)
         })
@@ -197,8 +198,8 @@ export default class Trezor extends Signer {
     flex.rpc('trezor.getPublicKey', this.device.path, this.basePath(), rpcCallback)
   }
 
-  setPhrase (phrase: string) {
-    const rpcCallback: FlexCallback<void> = err => {
+  setPhrase(phrase: string) {
+    const rpcCallback: FlexCallback<void> = (err) => {
       if (err) log.error(err)
       setTimeout(() => this.deviceStatus(), 1000)
     }
@@ -209,8 +210,8 @@ export default class Trezor extends Signer {
     flex.rpc('trezor.inputPhrase', this.device.path, phrase, rpcCallback)
   }
 
-  setPin (pin: string) {
-    const rpcCallback: FlexCallback<void> = err => {
+  setPin(pin: string) {
+    const rpcCallback: FlexCallback<void> = (err) => {
       if (err) log.error(err)
       setTimeout(() => this.deviceStatus(), 250)
     }
@@ -222,7 +223,7 @@ export default class Trezor extends Signer {
   }
 
   // Standard Methods
-  signMessage (index: number, message: string, cb: Callback<string>) {
+  signMessage(index: number, message: string, cb: Callback<string>) {
     const rpcCallback: FlexCallback<any> = (err, result) => {
       if (err) {
         log.error('signMessage Error')
@@ -239,7 +240,7 @@ export default class Trezor extends Signer {
   }
 
   // Standard Methods
-  signTypedData (index: number, version: string, typedData: TypedData, cb: Callback<string>) {
+  signTypedData(index: number, version: string, typedData: TypedData, cb: Callback<string>) {
     const versionNum = (version.match(/[Vv](\d+)/) || [])[1]
 
     if ((parseInt(versionNum) || 0) < 4) {
@@ -264,17 +265,25 @@ export default class Trezor extends Signer {
       const domainSeparatorHash = TypedDataUtils.hashStruct('EIP712Domain', domain, types, true).toString('hex')
       const messageHash = TypedDataUtils.hashStruct(primaryType as any, message, types, true).toString('hex')
 
-      flex.rpc('trezor.ethereumSignTypedHash', this.device.path, this.getPath(index), typedData, domainSeparatorHash, messageHash, rpcCallback)
+      flex.rpc(
+        'trezor.ethereumSignTypedHash',
+        this.device.path,
+        this.getPath(index),
+        typedData,
+        domainSeparatorHash,
+        messageHash,
+        rpcCallback
+      )
     } else {
       flex.rpc('trezor.ethereumSignTypedData', this.device.path, this.getPath(index), typedData, rpcCallback)
     }
   }
 
-  signTransaction (index: number, rawTx: TransactionData, cb: Callback<string>) {
+  signTransaction(index: number, rawTx: TransactionData, cb: Callback<string>) {
     const compatibility = signerCompatibility(rawTx, this.summary())
     const compatibleTx = compatibility.compatible ? { ...rawTx } : londonToLegacy(rawTx)
 
-    sign(compatibleTx, tx => {
+    sign(compatibleTx, (tx) => {
       return new Promise((resolve, reject) => {
         const trezorTx = this.normalizeTransaction(rawTx.chainId, tx)
         const path = this.getPath(index)
@@ -295,19 +304,19 @@ export default class Trezor extends Signer {
         flex.rpc('trezor.ethereumSignTransaction', this.device.path, path, trezorTx, rpcCallback)
       })
     })
-    .then(signedTx => cb(null, addHexPrefix(signedTx.serialize().toString('hex'))))
-    .catch(err => cb(err.message, undefined))
+      .then((signedTx) => cb(null, addHexPrefix(signedTx.serialize().toString('hex'))))
+      .catch((err) => cb(err.message, undefined))
   }
 
-  private isTrezorOne () {
+  private isTrezorOne() {
     return this.model.toLowerCase().includes('one')
   }
 
-  private normalize (hex: string) {
+  private normalize(hex: string) {
     return (hex && padToEven(stripHexPrefix(hex))) || ''
   }
 
-  private normalizeTransaction (chainId: string, tx: TypedTransaction) {
+  private normalizeTransaction(chainId: string, tx: TypedTransaction) {
     const txJson = tx.toJSON()
 
     const unsignedTx = {
@@ -316,12 +325,12 @@ export default class Trezor extends Signer {
       to: this.normalize(txJson.to || ''),
       value: this.normalize(txJson.value || ''),
       data: this.normalize(txJson.data || ''),
-      chainId: utils.hexToNumber(chainId)
+      chainId: utils.hexToNumber(chainId),
     }
 
     const optionalFields = ['gasPrice', 'maxFeePerGas', 'maxPriorityFeePerGas']
 
-    optionalFields.forEach(field => {
+    optionalFields.forEach((field) => {
       // @ts-ignore
       const val: string = txJson[field]
       if (val) {
diff --git a/main/signers/trezor/adapter.ts b/main/signers/trezor/adapter.ts
index 5a1dfe2e4..aa1f40c30 100644
--- a/main/signers/trezor/adapter.ts
+++ b/main/signers/trezor/adapter.ts
@@ -7,18 +7,18 @@ import Trezor from './Trezor'
 import store from '../../store'
 
 export default class TrezorSignerAdapter extends SignerAdapter {
-  private flexListeners: { [event: string]: (device: TrezorDevice) => void };
-  private knownSigners: { [id: string]: Trezor };
-  private observer: any;
+  private flexListeners: { [event: string]: (device: TrezorDevice) => void }
+  private knownSigners: { [id: string]: Trezor }
+  private observer: any
 
-  constructor () {
+  constructor() {
     super('trezor')
 
     this.flexListeners = {}
     this.knownSigners = {}
   }
 
-  open () {
+  open() {
     const connectListener = (device: TrezorDevice) => {
       const trezor = new Trezor(device)
       trezor.derivation = store('main.trezor.derivation')
@@ -44,7 +44,7 @@ export default class TrezorSignerAdapter extends SignerAdapter {
     const disconnectListener = (device: TrezorDevice) => {
       log.info(`Trezor ${device.id} disconnected`)
 
-      this.withSigner(device, signer => {
+      this.withSigner(device, (signer) => {
         this.remove(signer)
       })
     }
@@ -52,22 +52,21 @@ export default class TrezorSignerAdapter extends SignerAdapter {
     const updateListener = (device: TrezorDevice) => {
       log.debug(`Trezor ${device.id} updated`)
 
-      this.withSigner(device, signer => this.emit('update', signer))
+      this.withSigner(device, (signer) => this.emit('update', signer))
     }
 
     const needPinListener = (device: TrezorDevice) => {
       log.verbose(`Trezor ${device.id} needs pin`)
 
-      this.withSigner(device, signer => {
-        signer.status = 'Need Pin',
-        signer.update()
+      this.withSigner(device, (signer) => {
+        ;(signer.status = 'Need Pin'), signer.update()
       })
     }
 
     const needPhraseListener = (device: TrezorDevice) => {
       log.verbose(`Trezor ${device.id} needs passphrase`)
 
-      this.withSigner(device, signer => {
+      this.withSigner(device, (signer) => {
         signer.status = 'Enter Passphrase'
         signer.update()
       })
@@ -76,7 +75,7 @@ export default class TrezorSignerAdapter extends SignerAdapter {
     const enteringPhraseListener = (device: TrezorDevice) => {
       log.verbose(`Trezor ${device.id} waiting for passphrase entry on device`)
 
-      this.withSigner(device, signer => {
+      this.withSigner(device, (signer) => {
         signer.status = 'waiting for input on device'
         signer.update()
       })
@@ -90,7 +89,7 @@ export default class TrezorSignerAdapter extends SignerAdapter {
       this.observer = store.observer(() => {
         const trezorDerivation = store('main.trezor.derivation')
 
-        Object.values(this.knownSigners).forEach(trezor => {
+        Object.values(this.knownSigners).forEach((trezor) => {
           if (trezor.derivation !== trezorDerivation) {
             trezor.derivation = trezorDerivation
             trezor.reset()
@@ -106,7 +105,7 @@ export default class TrezorSignerAdapter extends SignerAdapter {
         'trezor:needPin': needPinListener,
         'trezor:needPhrase': needPhraseListener,
         'trezor:enteringPhrase': enteringPhraseListener,
-        'trezor:scan': scanListener
+        'trezor:scan': scanListener,
       }
 
       Object.entries(this.flexListeners).forEach(([event, listener]) => flex.on(event, listener))
@@ -119,7 +118,7 @@ export default class TrezorSignerAdapter extends SignerAdapter {
     super.open()
   }
 
-  close () {
+  close() {
     if (this.observer) {
       this.observer.remove()
       this.observer = null
@@ -130,7 +129,7 @@ export default class TrezorSignerAdapter extends SignerAdapter {
     super.close()
   }
 
-  remove (trezor: Trezor) {
+  remove(trezor: Trezor) {
     if (trezor.device.path in this.knownSigners) {
       log.info(`removing Trezor ${trezor.device.id}`)
 
@@ -140,13 +139,13 @@ export default class TrezorSignerAdapter extends SignerAdapter {
     }
   }
 
-  reload (trezor: Trezor) {
+  reload(trezor: Trezor) {
     log.info(`reloading Trezor ${trezor.device.id}`)
 
     trezor.open()
   }
 
-  private withSigner (device: TrezorDevice, fn: (signer: Trezor) => void) {
+  private withSigner(device: TrezorDevice, fn: (signer: Trezor) => void) {
     const signer = this.knownSigners[device.path]
 
     if (signer) fn(signer)
diff --git a/main/store/__mocks__/index.ts b/main/store/__mocks__/index.ts
index 012a442a1..5eee9442b 100644
--- a/main/store/__mocks__/index.ts
+++ b/main/store/__mocks__/index.ts
@@ -1,7 +1,7 @@
 const create = function () {
   const internal = {
     state: {},
-    observers: {}
+    observers: {},
   }
 
   const store = function () {
@@ -9,14 +9,14 @@ const create = function () {
     return get(internal.state, path)
   }
 
-  function get (obj, path) {
+  function get(obj, path) {
     if (!obj) return obj
     if (path.length === 1) return obj[path[0]]
 
     return get(obj[path[0]], path.slice(1))
   }
 
-  function set (obj, path, value) {
+  function set(obj, path, value) {
     if (path.length === 1) {
       return { ...obj, [path[0]]: value }
     }
@@ -28,7 +28,10 @@ const create = function () {
 
   store.set = function () {
     const args = [...arguments]
-    const path = args.slice(0, args.length - 1).join('.').split('.')
+    const path = args
+      .slice(0, args.length - 1)
+      .join('.')
+      .split('.')
     const value = args.slice(-1)[0]
 
     internal.state = set(internal.state, path, value)
@@ -46,7 +49,7 @@ const create = function () {
       },
       remove: () => {
         delete internal.observers[id]
-      }
+      },
     }
 
     internal.observers[id] = observer
@@ -57,7 +60,7 @@ const create = function () {
   store.getObserver = function (id) {
     return internal.observers[id]
   }
-  
+
   return store
 }
 
diff --git a/main/store/actions/index.js b/main/store/actions/index.js
index 827621b39..5dae9fdc9 100644
--- a/main/store/actions/index.js
+++ b/main/store/actions/index.js
@@ -3,15 +3,15 @@ import log from 'electron-log'
 const panelActions = require('./panel')
 const supportedNetworkTypes = ['ethereum']
 
-function validateNetworkSettings (network) {
+function validateNetworkSettings(network) {
   const networkId = parseInt(network.id)
 
   if (
-    (!Number.isInteger(networkId)) ||
-    typeof (network.type) !== 'string' ||
-    typeof (network.name) !== 'string' ||
-    typeof (network.explorer) !== 'string' ||
-    typeof (network.symbol) !== 'string' ||
+    !Number.isInteger(networkId) ||
+    typeof network.type !== 'string' ||
+    typeof network.name !== 'string' ||
+    typeof network.explorer !== 'string' ||
+    typeof network.symbol !== 'string' ||
     !supportedNetworkTypes.includes(network.type)
   ) {
     throw new Error(`Invalid network settings: ${JSON.stringify(network)}`)
@@ -20,11 +20,9 @@ function validateNetworkSettings (network) {
   return networkId
 }
 
-function includesToken (tokens, token) {
+function includesToken(tokens, token) {
   const existingAddress = token.address.toLowerCase()
-  return tokens.some(t => 
-    t.address.toLowerCase() === existingAddress && t.chainId === token.chainId
-  )
+  return tokens.some((t) => t.address.toLowerCase() === existingAddress && t.chainId === token.chainId)
 }
 
 module.exports = {
@@ -53,19 +51,19 @@ module.exports = {
     })
   },
   setPrimary: (u, netType, netId, status) => {
-    u('main.networks', netType, netId, 'connection.primary', primary => {
+    u('main.networks', netType, netId, 'connection.primary', (primary) => {
       return Object.assign({}, primary, status)
     })
   },
   setSecondary: (u, netType, netId, status) => {
-    u('main.networks', netType, netId, 'connection.secondary', secondary => {
+    u('main.networks', netType, netId, 'connection.secondary', (secondary) => {
       return Object.assign({}, secondary, status)
     })
   },
-  setLaunch: (u, launch) => u('main.launch', _ => launch),
-  toggleLaunch: u => u('main.launch', launch => !launch),
-  toggleReveal: u => u('main.reveal', reveal => !reveal),
-  toggleNonceAdjust: u => u('main.nonceAdjust', nonceAdjust => !nonceAdjust),
+  setLaunch: (u, launch) => u('main.launch', (_) => launch),
+  toggleLaunch: (u) => u('main.launch', (launch) => !launch),
+  toggleReveal: (u) => u('main.reveal', (reveal) => !reveal),
+  toggleNonceAdjust: (u) => u('main.nonceAdjust', (nonceAdjust) => !nonceAdjust),
   setPermission: (u, address, permission) => {
     u('main.permissions', address, (permissions = {}) => {
       permissions[permission.handlerId] = permission
@@ -78,7 +76,7 @@ module.exports = {
     })
   },
   toggleAccess: (u, address, handlerId) => {
-    u('main.permissions', address, permissions => {
+    u('main.permissions', address, (permissions) => {
       permissions[handlerId].provider = !permissions[handlerId].provider
       return permissions
     })
@@ -91,18 +89,18 @@ module.exports = {
     u(path, () => value)
   },
   dontRemind: (u, version) => {
-    u('main.updater.dontRemind', dontRemind => {
+    u('main.updater.dontRemind', (dontRemind) => {
       if (dontRemind.indexOf(version) === -1) dontRemind.push(version)
       return dontRemind
     })
   },
   setAccount: (u, account) => {
-    u('selected.current', _ => account.id)
-    u('selected.minimized', _ => false)
-    u('selected.open', _ => true)
+    u('selected.current', (_) => account.id)
+    u('selected.minimized', (_) => false)
+    u('selected.open', (_) => true)
   },
   accountTokensUpdated: (u, address) => {
-    u('main.accounts', address, account => {
+    u('main.accounts', address, (account) => {
       const balances = { ...account.balances, lastUpdated: new Date().getTime() }
       const updated = { ...account, balances }
 
@@ -110,30 +108,30 @@ module.exports = {
     })
   },
   updateAccount: (u, updatedAccount) => {
-    u('main.accounts', updatedAccount.id, account => {
+    u('main.accounts', updatedAccount.id, (account) => {
       // if (account) return updatedAccount // Account exists
       // if (add) return updatedAccount // Account is new and should be added
       return { ...updatedAccount, balances: (account || {}).balances }
     })
   },
   removeAccount: (u, id) => {
-    u('main.accounts', accounts => {
+    u('main.accounts', (accounts) => {
       delete accounts[id]
       return accounts
     })
   },
   removeSigner: (u, id) => {
-    u('main.signers', signers => {
+    u('main.signers', (signers) => {
       delete signers[id]
       return signers
     })
   },
   updateSigner: (u, signer) => {
     if (!signer.id) return
-    u('main.signers', signer.id, prev => ({ ...prev, ...signer }))
+    u('main.signers', signer.id, (prev) => ({ ...prev, ...signer }))
   },
   newSigner: (u, signer) => {
-    u('main.signers', signers => {
+    u('main.signers', (signers) => {
       signers[signer.id] = { ...signer, createdAt: new Date().getTime() }
       return signers
     })
@@ -186,13 +184,13 @@ module.exports = {
     u('main.mute.welcomeWarning', () => true)
   },
   toggleExplorerWarning: (u) => {
-    u('main.mute.explorerWarning', v => !v)
+    u('main.mute.explorerWarning', (v) => !v)
   },
   toggleGasFeeWarning: (u) => {
-    u('main.mute.gasFeeWarning', v => !v)
+    u('main.mute.gasFeeWarning', (v) => !v)
   },
   toggleSignerCompatibilityWarning: (u) => {
-    u('main.mute.signerCompatibilityWarning', v => !v)
+    u('main.mute.signerCompatibilityWarning', (v) => !v)
   },
   setAltSpace: (u, v) => {
     u('main.shortcuts.altSlash', () => v)
@@ -215,7 +213,10 @@ module.exports = {
     }
   },
   setNativeCurrencyData: (u, netType, netId, currency) => {
-    u('main.networksMeta', netType, netId, 'nativeCurrency', existing => ({ ...existing, ...currency }))
+    u('main.networksMeta', netType, netId, 'nativeCurrency', (existing) => ({
+      ...existing,
+      ...currency,
+    }))
   },
   addNetwork: (u, net) => {
     try {
@@ -234,31 +235,31 @@ module.exports = {
         gas: {
           price: {
             selected: 'standard',
-            levels: { slow: '', standard: '', fast: '', asap: '', custom: '' }
-          }
+            levels: { slow: '', standard: '', fast: '', asap: '', custom: '' },
+          },
         },
         connection: {
           presets: { local: 'direct' },
-          primary: { 
-            on: true, 
-            current: 'custom', 
-            status: 'loading', 
-            connected: false, 
-            type: '', 
-            network: '', 
-            custom: primaryRpc
+          primary: {
+            on: true,
+            current: 'custom',
+            status: 'loading',
+            connected: false,
+            type: '',
+            network: '',
+            custom: primaryRpc,
+          },
+          secondary: {
+            on: false,
+            current: 'custom',
+            status: 'loading',
+            connected: false,
+            type: '',
+            network: '',
+            custom: secondaryRpc,
           },
-          secondary: { 
-            on: false, 
-            current: 'custom', 
-            status: 'loading', 
-            connected: false, 
-            type: '', 
-            network: '', 
-            custom: secondaryRpc
-          }
         },
-        on: true
+        on: true,
       }
 
       const defaultMeta = {
@@ -266,12 +267,12 @@ module.exports = {
         gas: {
           price: {
             selected: 'standard',
-            levels: { slow: '', standard: '', fast: '', asap: '', custom: '' }
-          }
-        }
+            levels: { slow: '', standard: '', fast: '', asap: '', custom: '' },
+          },
+        },
       }
 
-      u('main', main => {
+      u('main', (main) => {
         if (!main.networks[net.type]) main.networks[net.type] = {}
         if (main.networks[net.type][net.id]) return main // Network already exists, don't overwrite, notify user
 
@@ -288,16 +289,16 @@ module.exports = {
     try {
       net.id = validateNetworkSettings(net)
       newNet.id = validateNetworkSettings(newNet)
-      
-      u('main', main => {
+
+      u('main', (main) => {
         const updatedNetwork = Object.assign({}, main.networks[net.type][net.id], newNet)
 
-        Object.keys(updatedNetwork).forEach(k => {
+        Object.keys(updatedNetwork).forEach((k) => {
           if (typeof updatedNetwork[k] === 'string') {
             updatedNetwork[k] = updatedNetwork[k].trim()
           }
         })
-        
+
         delete main.networks[net.type][net.id]
         main.networks[updatedNetwork.type][updatedNetwork.id] = updatedNetwork
 
@@ -306,7 +307,7 @@ module.exports = {
             main.origins[origin].chain = updatedNetwork
           }
         })
-        
+
         return main
       })
     } catch (e) {
@@ -320,7 +321,7 @@ module.exports = {
       // Cannot delete mainnet
       if (!Number.isInteger(net.id)) throw new Error('Invalid chain id')
       if (net.type === 'ethereum' && net.id === 1) throw new Error('Cannot remove mainnet')
-      u('main', main => {
+      u('main', (main) => {
         if (Object.keys(main.networks[net.type]).length <= 1) {
           return main // Cannot delete last network without adding a new network of this type first
         }
@@ -346,7 +347,7 @@ module.exports = {
   // Flow
   addDapp: (u, namehash, data, options = { docked: false, added: false }) => {
     u(`main.dapp.details.${namehash}`, () => data)
-    u('main.dapp.map', map => {
+    u('main.dapp.map', (map) => {
       if (options.docked && map.docked.length <= 10) {
         map.docked.push(namehash)
       } else {
@@ -360,7 +361,7 @@ module.exports = {
       if (open) {
         if (dapps.indexOf(ens) === -1) dapps.push(ens)
       } else {
-        dapps = dapps.filter(e => e !== ens)
+        dapps = dapps.filter((e) => e !== ens)
       }
       return dapps
     })
@@ -371,7 +372,7 @@ module.exports = {
       delete dapps[namehash]
       return dapps
     })
-    u('main.dapp.map', map => {
+    u('main.dapp.map', (map) => {
       let index = map.added.indexOf(namehash)
       if (index !== -1) {
         map.added.splice(index, 1)
@@ -383,7 +384,7 @@ module.exports = {
     })
   },
   moveDapp: (u, fromArea, fromIndex, toArea, toIndex) => {
-    u('main.dapp.map', map => {
+    u('main.dapp.map', (map) => {
       const hash = map[fromArea][fromIndex]
       map[fromArea].splice(fromIndex, 1)
       map[toArea].splice(toIndex, 0, hash)
@@ -394,7 +395,7 @@ module.exports = {
     if (state) u(`main.dapp.storage.${hash}`, () => state)
   },
   initOrigin: (u, originId, origin) => {
-    u('main.origins', origins => {
+    u('main.origins', (origins) => {
       const now = new Date().getTime()
 
       const createdOrigin = {
@@ -402,8 +403,8 @@ module.exports = {
         session: {
           requests: 1,
           startedAt: now,
-          lastUpdatedAt: now
-        }
+          lastUpdatedAt: now,
+        },
       }
 
       return { ...origins, [originId]: createdOrigin }
@@ -412,7 +413,7 @@ module.exports = {
   addOriginRequest: (u, originId) => {
     const now = new Date().getTime()
 
-    u('main.origins', originId, origin => {
+    u('main.origins', originId, (origin) => {
       // start a new session if the previous one has already ended
       const isNewSession = origin.session.startedAt < origin.session.endedAt
       const startedAt = isNewSession ? now : origin.session.startedAt
@@ -424,13 +425,13 @@ module.exports = {
           requests,
           startedAt,
           endedAt: undefined,
-          lastUpdatedAt: now
-        }
+          lastUpdatedAt: now,
+        },
       }
     })
   },
   endOriginSession: (u, originId) => {
-    u('main.origins', originId, origin => {
+    u('main.origins', originId, (origin) => {
       const now = new Date().getTime()
 
       return {
@@ -438,21 +439,21 @@ module.exports = {
         session: {
           ...origin.session,
           endedAt: now,
-          lastUpdatedAt: now
-        }
+          lastUpdatedAt: now,
+        },
       }
     })
   },
   switchOriginChain: (u, originId, chainId, type) => {
     if (originId && typeof chainId === 'number' && type === 'ethereum') {
-      u('main.origins', originId, origin => ({ ...origin, chain: { id: chainId, type } }))
+      u('main.origins', originId, (origin) => ({ ...origin, chain: { id: chainId, type } }))
     }
   },
   clearOrigins: (u) => {
     u('main.origins', () => ({}))
   },
   removeOrigin: (u, originId) => {
-    u('main.origins', origins => {
+    u('main.origins', (origins) => {
       delete origins[originId]
       return origins
     })
@@ -464,7 +465,7 @@ module.exports = {
     u('dock.expand', (s) => expand)
   },
   pin: (u) => {
-    u('main.pin', pin => !pin)
+    u('main.pin', (pin) => !pin)
   },
   saveAccount: (u, id) => {
     u('main.save.account', () => id)
@@ -481,7 +482,7 @@ module.exports = {
   },
   setBalance: (u, address, balance) => {
     u('main.balances', address, (balances = []) => {
-      const existingBalances = balances.filter(b => b.address !== balance.address || b.chainId !== balance.chainId)
+      const existingBalances = balances.filter((b) => b.address !== balance.address || b.chainId !== balance.chainId)
 
       return [...existingBalances, balance]
     })
@@ -489,13 +490,13 @@ module.exports = {
   // Tokens
   setBalances: (u, address, newBalances) => {
     u('main.balances', address, (balances = []) => {
-      const existingBalances = balances.filter(b => {
-        return newBalances.every(bal => bal.chainId !== b.chainId || bal.address !== b.address)
+      const existingBalances = balances.filter((b) => {
+        return newBalances.every((bal) => bal.chainId !== b.chainId || bal.address !== b.address)
       })
 
       // TODO: possibly add an option to filter out zero balances
       //const withoutZeroBalances = Object.entries(updatedBalances)
-        //.filter(([address, balanceObj]) => !(new BigNumber(balanceObj.balance)).isZero())
+      //.filter(([address, balanceObj]) => !(new BigNumber(balanceObj.balance)).isZero())
       return [...existingBalances, ...newBalances]
     })
   },
@@ -504,8 +505,9 @@ module.exports = {
       const key = address.toLowerCase()
 
       for (const accountAddress in balances) {
-        const balanceIndex = balances[accountAddress]
-          .findIndex(balance => balance.chainId === chainId && balance.address.toLowerCase() === key)
+        const balanceIndex = balances[accountAddress].findIndex(
+          (balance) => balance.chainId === chainId && balance.address.toLowerCase() === key
+        )
 
         if (balanceIndex > -1) {
           balances[accountAddress].splice(balanceIndex, 1)
@@ -525,38 +527,38 @@ module.exports = {
     }
   },
   omitToken: (u, address, omitToken) => {
-    u('main.accounts', address, 'tokens.omit', omit => {
+    u('main.accounts', address, 'tokens.omit', (omit) => {
       omit = omit || []
       if (omit.indexOf(omitToken) === -1) omit.push(omitToken)
       return omit
     })
   },
   addCustomTokens: (u, tokens) => {
-    u('main.tokens.custom', existing => {
+    u('main.tokens.custom', (existing) => {
       // remove any tokens that have been overwritten by one with
       // the same address and chain ID
-      const existingTokens = existing.filter(token => !includesToken(tokens, token))
-      const tokensToAdd = tokens.map(t => ({ ...t, address: t.address.toLowerCase() }))
+      const existingTokens = existing.filter((token) => !includesToken(tokens, token))
+      const tokensToAdd = tokens.map((t) => ({ ...t, address: t.address.toLowerCase() }))
 
       return [...existingTokens, ...tokensToAdd]
     })
   },
   removeCustomTokens: (u, tokens) => {
-    u('main.tokens.custom', existing => {
-      return existing.filter(token => !includesToken(tokens, token))
+    u('main.tokens.custom', (existing) => {
+      return existing.filter((token) => !includesToken(tokens, token))
     })
   },
   addKnownTokens: (u, address, tokens) => {
     u('main.tokens.known', address, (existing = []) => {
-      const existingTokens = existing.filter(token => !includesToken(tokens, token))
-      const tokensToAdd = tokens.map(t => ({ ...t, address: t.address.toLowerCase() }))
+      const existingTokens = existing.filter((token) => !includesToken(tokens, token))
+      const tokensToAdd = tokens.map((t) => ({ ...t, address: t.address.toLowerCase() }))
 
       return [...existingTokens, ...tokensToAdd]
     })
   },
   removeKnownTokens: (u, address, tokens) => {
     u('main.tokens.known', address, (existing = []) => {
-      return existing.filter(token => !includesToken(tokens, token))
+      return existing.filter((token) => !includesToken(tokens, token))
     })
   },
   setColorway: (u, colorway) => {
@@ -570,17 +572,17 @@ module.exports = {
   //   u('dash.type', () => type)
   // },
   toggleDash: (u, force) => {
-    u('dash.showing', s => force === 'hide' ? false : force === 'show' ? true : !s)
+    u('dash.showing', (s) => (force === 'hide' ? false : force === 'show' ? true : !s))
   },
   closeDash: (u) => {
     u('dash.showing', () => false)
   },
   setDash: (u, update) => {
-    u('dash', dash => Object.assign(dash, update))
+    u('dash', (dash) => Object.assign(dash, update))
   },
   navPanel: (u, navItem) => {
-    u('panel.nav', nav => {
-      if (JSON.stringify(nav[0]) !== JSON.stringify(navItem)) nav.unshift(navItem)      
+    u('panel.nav', (nav) => {
+      if (JSON.stringify(nav[0]) !== JSON.stringify(navItem)) nav.unshift(navItem)
       return nav
     })
     u('panel.showing', () => true)
@@ -589,14 +591,14 @@ module.exports = {
     u('panel.nav', () => [])
   },
   backPanel: (u) => {
-    u('panel.nav', nav => {
+    u('panel.nav', (nav) => {
       nav.shift()
       return nav
     })
   },
   backPanelReqView: (u, handlerId) => {
-    u('panel.nav', nav => {
-      const newNav = nav.filter(navItem => {
+    u('panel.nav', (nav) => {
+      const newNav = nav.filter((navItem) => {
         const item = navItem || {}
         return !item?.data?.req?.handlerId === handlerId
       })
@@ -604,14 +606,14 @@ module.exports = {
     })
   },
   navDash: (u, navItem) => {
-    u('dash.nav', nav => {
-      if (JSON.stringify(nav[0]) !== JSON.stringify(navItem)) nav.unshift(navItem)      
+    u('dash.nav', (nav) => {
+      if (JSON.stringify(nav[0]) !== JSON.stringify(navItem)) nav.unshift(navItem)
       return nav
     })
     u('dash.showing', () => true)
   },
   backDash: (u) => {
-    u('dash.nav', nav => {
+    u('dash.nav', (nav) => {
       nav.shift()
       return nav
     })
@@ -626,7 +628,7 @@ module.exports = {
   },
   // Dapp Frame
   appDapp: (u, dapp) => {
-    u('main.dapps', dapps => {
+    u('main.dapps', (dapps) => {
       if (dapps && !dapps[dapp.id]) {
         dapps[dapp.id] = dapp
       }
@@ -634,7 +636,7 @@ module.exports = {
     })
   },
   updateDapp: (u, dappId, update) => {
-    u('main.dapps', dapps => {
+    u('main.dapps', (dapps) => {
       if (dapps && dapps[dappId]) {
         dapps[dappId] = Object.assign({}, dapps[dappId], update)
       }
@@ -645,10 +647,10 @@ module.exports = {
     u('main.frames', frame.id, () => frame)
   },
   updateFrame: (u, frameId, update) => {
-    u('main.frames', frameId, frame => Object.assign({}, frame, update))
+    u('main.frames', frameId, (frame) => Object.assign({}, frame, update))
   },
   removeFrame: (u, frameId) => {
-    u('main.frames', frames => {
+    u('main.frames', (frames) => {
       delete frames[frameId]
       return frames
     })
@@ -658,9 +660,9 @@ module.exports = {
   },
   addFrameView: (u, frameId, view) => {
     if (frameId && view) {
-      u('main.frames', frameId, frame => {
+      u('main.frames', frameId, (frame) => {
         let existing
-        Object.keys(frame.views).some(viewId => {
+        Object.keys(frame.views).some((viewId) => {
           if (frame.views[viewId].dappId === view.dappId) {
             existing = viewId
             return true
@@ -681,16 +683,16 @@ module.exports = {
   },
   setCurrentFrameView: (u, frameId, viewId) => {
     if (frameId) {
-      u('main.frames', frameId, frame => {
+      u('main.frames', frameId, (frame) => {
         frame.currentView = viewId
         return frame
       })
     }
   },
   updateFrameView: (u, frameId, viewId, update) => {
-    u('main.frames', frameId, 'views', views => {
+    u('main.frames', frameId, 'views', (views) => {
       if ((update.show && views[viewId].ready) || (update.ready && views[viewId].show)) {
-        Object.keys(views).forEach(id => {
+        Object.keys(views).forEach((id) => {
           if (id !== viewId) views[id].show = false
         })
       }
@@ -699,18 +701,18 @@ module.exports = {
     })
   },
   removeFrameView: (u, frameId, viewId) => {
-    u('main.frames', frameId, 'views', views => {
+    u('main.frames', frameId, 'views', (views) => {
       delete views[viewId]
       return views
     })
   },
-  unsetAccount: u => {
-    u('selected.minimized', _ => true)
-    u('selected.open', _ => false)
-    u('selected.view', _ => 'default')
-    u('selected.showAccounts', _ => false)
-    setTimeout(_ => {
-      u('selected', signer => {
+  unsetAccount: (u) => {
+    u('selected.minimized', (_) => true)
+    u('selected.open', (_) => false)
+    u('selected.view', (_) => 'default')
+    u('selected.showAccounts', (_) => false)
+    setTimeout((_) => {
+      u('selected', (signer) => {
         signer.last = signer.current
         signer.current = ''
         signer.requests = {}
@@ -718,7 +720,7 @@ module.exports = {
         return signer
       })
     }, 320)
-  }
+  },
   // toggleUSDValue: (u) => {
   //   u('main.showUSDValue', show => !show)
   // }
diff --git a/main/store/actions/panel.js b/main/store/actions/panel.js
index c665f89cd..48d684b51 100644
--- a/main/store/actions/panel.js
+++ b/main/store/actions/panel.js
@@ -11,12 +11,12 @@ module.exports = {
       return Object.assign(module, update)
     })
   },
-//   pathSync: (u, path, value) => u(path, () => value),
-//   syncPanel: (u, panel) => u('panel', _ => panel),
+  //   pathSync: (u, path, value) => u(path, () => value),
+  //   syncPanel: (u, panel) => u('panel', _ => panel),
   setSigner: (u, signer) => {
-    u('selected.current', _ => signer.id)
-    u('selected.minimized', _ => false)
-    u('selected.open', _ => true)
+    u('selected.current', (_) => signer.id)
+    u('selected.minimized', (_) => false)
+    u('selected.open', (_) => true)
   },
 
   setSettingsView: (u, index, subindex = 0) => {
@@ -24,63 +24,63 @@ module.exports = {
     u('selected.settings.subIndex', () => subindex)
   },
   setAddress: (u, address) => u('address', () => address),
-  togglePanel: u => u('panel.show', show => !show),
+  togglePanel: (u) => u('panel.show', (show) => !show),
   panelRequest: (u, request) => {
-    request.host = request.host || (new URL(request.url)).host
-    u('panel.request', v => request)
-    u('panel.show', v => true)
+    request.host = request.host || new URL(request.url).host
+    u('panel.request', (v) => request)
+    u('panel.show', (v) => true)
   },
-  setBalance: (u, account, balance) => u('balances', account, b => balance),
+  setBalance: (u, account, balance) => u('balances', account, (b) => balance),
   notify: (u, type, data = {}) => {
-    u('view.notify', _ => type)
-    u('view.notifyData', _ => data)
+    u('view.notify', (_) => type)
+    u('view.notifyData', (_) => data)
   },
   clickGuard: (u, on) => u('view.clickGuard', () => on),
-  toggleAddAccount: (u) => u('view.addAccount', show => !show),
-  toggleAddNetwork: (u) => u('view.addNetwork', show => !show),
-  updateBadge: (u, type) => u('view.badge', _ => type),
-  toggleSettings: u => {
-    u('panel.view', view => view === 'settings' ? 'default' : 'settings')
+  toggleAddAccount: (u) => u('view.addAccount', (show) => !show),
+  toggleAddNetwork: (u) => u('view.addNetwork', (show) => !show),
+  updateBadge: (u, type) => u('view.badge', (_) => type),
+  toggleSettings: (u) => {
+    u('panel.view', (view) => (view === 'settings' ? 'default' : 'settings'))
   },
   setPanelView: (u, view) => u('panel.view', () => view),
   trayOpen: (u, open) => {
-    u('tray.open', _ => open)
+    u('tray.open', (_) => open)
     if (open && trayInitial) {
       trayInitial = false
       setTimeout(() => {
-        u('tray.initial', _ => false)
+        u('tray.initial', (_) => false)
       }, 30)
     }
   },
   setSignerView: (u, view) => {
-    u('selected.showAccounts', _ => false)
-    u('selected.view', _ => view)
+    u('selected.showAccounts', (_) => false)
+    u('selected.view', (_) => view)
   },
   accountPage: (u, page) => {
     u('selected.accountPage', () => page)
   },
-  toggleShowAccounts: u => u('selected.showAccounts', _ => !_),
+  toggleShowAccounts: (u) => u('selected.showAccounts', (_) => !_),
   addProviderEvent: (u, payload) => {
-    u('provider.events', events => {
+    u('provider.events', (events) => {
       events.push(payload.method)
       return events
     })
   },
-  setView: (u, view) => u('selected.view', _ => view),
+  setView: (u, view) => u('selected.view', (_) => view),
   toggleDataView: (u, id) => {
-    u('selected.requests', id, 'viewData', view => !view)
+    u('selected.requests', id, 'viewData', (view) => !view)
   },
   updateExternalRates: (u, rates) => u('main.rates', () => rates),
-  resetSigner: u => {
-    u('selected.view', _ => 'default')
-    u('selected.showAccounts', _ => false)
+  resetSigner: (u) => {
+    u('selected.view', (_) => 'default')
+    u('selected.showAccounts', (_) => false)
   },
-  unsetSigner: u => {
-    u('selected.minimized', _ => true)
-    u('selected.open', _ => false)
+  unsetSigner: (u) => {
+    u('selected.minimized', (_) => true)
+    u('selected.open', (_) => false)
     resetSigner(u)
-    setTimeout(_ => {
-      u('selected', signer => {
+    setTimeout((_) => {
+      u('selected', (signer) => {
         signer.last = signer.current
         signer.current = ''
         signer.requests = {}
@@ -89,12 +89,12 @@ module.exports = {
       })
     }, 520)
   },
-  nodeProvider: (u, connected) => u('node.provider', _ => connected),
-  setCurrent: (u, id) => u('view.current', _ => id),
+  nodeProvider: (u, connected) => u('node.provider', (_) => connected),
+  setCurrent: (u, id) => u('view.current', (_) => id),
   updateUrl: (u, id, url) => u('view.data', id, 'url', () => url),
-  updateTitle: (u, id, title) => u('view.data', id, 'title', _ => title),
+  updateTitle: (u, id, title) => u('view.data', id, 'title', (_) => title),
   reorderTabs: (u, from, to) => {
-    u('view.list', list => {
+    u('view.list', (list) => {
       const _from = list[from]
       list[from] = list[to]
       list[to] = _from
@@ -103,15 +103,15 @@ module.exports = {
   },
   newView: (u) => {
     const id = v4()
-    u('view.current', _ => id)
-    u('view.list', list => {
+    u('view.current', (_) => id)
+    u('view.list', (list) => {
       list.push(id)
       return list
     })
-    u('view.data', id, view => ({ url: 'https://www.google.com/', title: 'New Tab' }))
+    u('view.data', id, (view) => ({ url: 'https://www.google.com/', title: 'New Tab' }))
   },
   removeView: (u, id, isCurrent) => {
-    u('view', view => {
+    u('view', (view) => {
       const index = view.list.indexOf(id)
       if (isCurrent) {
         if (index < view.list.length - 1) {
@@ -125,7 +125,6 @@ module.exports = {
       return view
     })
   },
-  initialSignerPos: (u, pos) => u('selected.position.initial', _ => pos),
-  initialScrollPos: (u, pos) => u('selected.position.scrollTop', _ => pos)
-
-}
\ No newline at end of file
+  initialSignerPos: (u, pos) => u('selected.position.initial', (_) => pos),
+  initialScrollPos: (u, pos) => u('selected.position.scrollTop', (_) => pos),
+}
diff --git a/main/store/index.ts b/main/store/index.ts
index f33fcdfeb..d733d0316 100644
--- a/main/store/index.ts
+++ b/main/store/index.ts
@@ -27,8 +27,8 @@ persist.set('main', store('main'))
 
 // Apply updates to persisted state
 store.api.feed((state, actionBatch) => {
-  actionBatch.forEach(action => {
-    action.updates.forEach(update => {
+  actionBatch.forEach((action) => {
+    action.updates.forEach((update) => {
       persist.queue(update.path, update.value)
     })
   })
diff --git a/main/store/migrations/index.js b/main/store/migrations/index.js
index 649b3c32e..25f7df985 100644
--- a/main/store/migrations/index.js
+++ b/main/store/migrations/index.js
@@ -1,12 +1,12 @@
 import log from 'electron-log'
 
 const migrations = {
-  4: initial => {
+  4: (initial) => {
     // If persisted state still has main.gasPrice, move gas settings into networks
     const gasPrice = initial.main.gasPrice // ('gasPrice', false)
 
     if (gasPrice) {
-      Object.keys(gasPrice).forEach(network => {
+      Object.keys(gasPrice).forEach((network) => {
         // Prerelease versions of 0.3.2 used 'normal' instead of 'standard'
         if (gasPrice[network].default === 'normal') gasPrice[network].default = 'standard'
         // For each network with gasPrices, copy over default and custom level
@@ -22,10 +22,16 @@ const migrations = {
     if (connection) {
       // Copy all local connection settings to new connection object
       if (connection.local && connection.local.settings) {
-        Object.keys(connection.local.settings).forEach(id => {
-          if (connection.secondary.settings[id] && initial.main.networks.ethereum[id] && initial.main.networks.ethereum[id].connection) {
+        Object.keys(connection.local.settings).forEach((id) => {
+          if (
+            connection.secondary.settings[id] &&
+            initial.main.networks.ethereum[id] &&
+            initial.main.networks.ethereum[id].connection
+          ) {
             // Copy local custom endpoint to new connection object
-            if (connection.local.settings[id].options) initial.main.networks.ethereum[id].connection.primary.custom = connection.local.settings[id].options.custom
+            if (connection.local.settings[id].options)
+              initial.main.networks.ethereum[id].connection.primary.custom =
+                connection.local.settings[id].options.custom
             // Copy local current selection to new connection object
             let current = connection.local.settings[id].current
             if (current === 'direct') current = 'local'
@@ -35,10 +41,16 @@ const migrations = {
       }
       // Copy all secondary connection settings to new connection object
       if (connection.secondary && connection.secondary.settings) {
-        Object.keys(connection.secondary.settings).forEach(id => {
-          if (connection.secondary.settings[id] && initial.main.networks.ethereum[id] && initial.main.networks.ethereum[id].connection) {
+        Object.keys(connection.secondary.settings).forEach((id) => {
+          if (
+            connection.secondary.settings[id] &&
+            initial.main.networks.ethereum[id] &&
+            initial.main.networks.ethereum[id].connection
+          ) {
             // Copy all secondary connection settings to new connection object
-            if (connection.secondary.settings[id].options) initial.main.networks.ethereum[id].connection.secondary.custom = connection.secondary.settings[id].options.custom
+            if (connection.secondary.settings[id].options)
+              initial.main.networks.ethereum[id].connection.secondary.custom =
+                connection.secondary.settings[id].options.custom
             // Copy local current selection to new connection object
             let current = connection.secondary.settings[id].current
             if (current === 'direct') current = 'local'
@@ -47,14 +59,14 @@ const migrations = {
         })
       }
       // Copy primary/secondary on/off
-      Object.keys(initial.main.networks.ethereum).forEach(id => {
+      Object.keys(initial.main.networks.ethereum).forEach((id) => {
         initial.main.networks.ethereum[id].connection.primary.on = connection.local.on
         initial.main.networks.ethereum[id].connection.secondary.on = connection.secondary.on
       })
       initial.main.currentNetwork.id = connection.network || initial.main.currentNetwork.id || 1
     }
 
-    Object.keys(initial.main.networks.ethereum).forEach(id => {
+    Object.keys(initial.main.networks.ethereum).forEach((id) => {
       // Earlier versions of v0.3.3 did not include symbols
       if (!initial.main.networks.ethereum[id].symbol) {
         if (id === 74) {
@@ -67,9 +79,13 @@ const migrations = {
       }
       if (initial.main.networks.ethereum[id].symbol === 'Ξ') initial.main.networks.ethereum[id].symbol = 'ETH'
       // Update safelow -> slow and trader -> asap
-      if (initial.main.networks.ethereum[id].gas.price.selected === 'safelow') initial.main.networks.ethereum[id].gas.price.selected = 'slow'
-      if (initial.main.networks.ethereum[id].gas.price.selected === 'trader') initial.main.networks.ethereum[id].gas.price.selected = 'asap'
-      if (initial.main.networks.ethereum[id].gas.price.selected === 'custom') initial.main.networks.ethereum[id].gas.price.selected = initial.main.networks.ethereum[id].gas.price.lastLevel || 'standard'
+      if (initial.main.networks.ethereum[id].gas.price.selected === 'safelow')
+        initial.main.networks.ethereum[id].gas.price.selected = 'slow'
+      if (initial.main.networks.ethereum[id].gas.price.selected === 'trader')
+        initial.main.networks.ethereum[id].gas.price.selected = 'asap'
+      if (initial.main.networks.ethereum[id].gas.price.selected === 'custom')
+        initial.main.networks.ethereum[id].gas.price.selected =
+          initial.main.networks.ethereum[id].gas.price.lastLevel || 'standard'
     })
 
     // If migrating from before this was a setting make it 'true' to grandfather behavior
@@ -77,7 +93,8 @@ const migrations = {
 
     return initial
   },
-  5: initial => { // Add Polygon to persisted networks
+  5: (initial) => {
+    // Add Polygon to persisted networks
     initial.main.networks.ethereum[137] = {
       id: 137,
       type: 'ethereum',
@@ -87,70 +104,100 @@ const migrations = {
       gas: {
         price: {
           selected: 'standard',
-          levels: { slow: '', standard: '', fast: '', asap: '', custom: '' }
-        }
+          levels: { slow: '', standard: '', fast: '', asap: '', custom: '' },
+        },
       },
       connection: {
-        primary: { on: true, current: 'matic', status: 'loading', connected: false, type: '', network: '', custom: '' },
-        secondary: { on: false, current: 'custom', status: 'loading', connected: false, type: '', network: '', custom: '' }
-      }
+        primary: {
+          on: true,
+          current: 'matic',
+          status: 'loading',
+          connected: false,
+          type: '',
+          network: '',
+          custom: '',
+        },
+        secondary: {
+          on: false,
+          current: 'custom',
+          status: 'loading',
+          connected: false,
+          type: '',
+          network: '',
+          custom: '',
+        },
+      },
     }
     return initial
   },
-  6: initial => { // If previous hardwareDerivation is testnet, set that for split ledger/trezor derevation
+  6: (initial) => {
+    // If previous hardwareDerivation is testnet, set that for split ledger/trezor derevation
     if (initial.main.hardwareDerivation === 'testnet') {
       initial.main.ledger.derivation = 'testnet'
       initial.main.trezor.derivation = 'testnet'
     }
     return initial
   },
-  7: initial => { // Move account to become cross chain accounts
+  7: (initial) => {
+    // Move account to become cross chain accounts
     const moveOldAccountsToNewAddresses = () => {
       const addressesToMove = {}
       const accounts = JSON.parse(JSON.stringify(initial.main.accounts))
-      Object.keys(accounts).forEach(id => {
+      Object.keys(accounts).forEach((id) => {
         if (id.startsWith('0x')) {
           addressesToMove[id] = accounts[id]
           delete accounts[id]
         }
       })
       initial.main.accounts = accounts
-      Object.keys(addressesToMove).forEach(id => {
+      Object.keys(addressesToMove).forEach((id) => {
         initial.main.addresses[id] = addressesToMove[id]
       })
     }
-    
+
     // Before the v6 state migration
     // If users have very old state they will first need to do an older account migration
     moveOldAccountsToNewAddresses()
-  
+
     // Once this is complete they can now do the current account migration
     const newAccounts = {}
     // const nameCount = {}
     let { accounts, addresses } = initial.main
     accounts = JSON.parse(JSON.stringify(accounts))
     addresses = JSON.parse(JSON.stringify(addresses))
-    Object.keys(addresses).forEach(address => {
+    Object.keys(addresses).forEach((address) => {
       // Normalize address case
       addresses[address.toLowerCase()] = addresses[address]
       address = address.toLowerCase()
-  
-      const hasPermissions = addresses[address] && addresses[address].permissions && Object.keys(addresses[address].permissions).length > 0
+
+      const hasPermissions =
+        addresses[address] && addresses[address].permissions && Object.keys(addresses[address].permissions).length > 0
       // const hasTokens = addresses[address] && addresses[address].tokens && Object.keys(addresses[address].tokens).length > 0
       if (!hasPermissions) return log.info(`Address ${address} did not have any permissions or tokens`)
-  
+
       // Copy Account permissions
-      initial.main.permissions[address] = addresses[address] && addresses[address].permissions ? Object.assign({}, addresses[address].permissions) : {}
-  
+      initial.main.permissions[address] =
+        addresses[address] && addresses[address].permissions ? Object.assign({}, addresses[address].permissions) : {}
+
       const matchingAccounts = []
-      Object.keys(accounts).sort((a, b) => accounts[a].created > accounts[b].created ? 1 : -1).forEach(id => {
-        if (accounts[id].addresses && accounts[id].addresses.map && accounts[id].addresses.map(a => a.toLowerCase()).indexOf(address) > -1) {
-          matchingAccounts.push(id)
-        }
-      })
+      Object.keys(accounts)
+        .sort((a, b) => (accounts[a].created > accounts[b].created ? 1 : -1))
+        .forEach((id) => {
+          if (
+            accounts[id].addresses &&
+            accounts[id].addresses.map &&
+            accounts[id].addresses.map((a) => a.toLowerCase()).indexOf(address) > -1
+          ) {
+            matchingAccounts.push(id)
+          }
+        })
       if (matchingAccounts.length > 0) {
         const primaryAccount = matchingAccounts.sort((a, b) => {
-          return accounts[a].addresses.length === accounts[b].addresses.length ? 0 : accounts[a].addresses.length > accounts[b].addresses.length ? -1 : 1
+          return accounts[a].addresses.length === accounts[b].addresses.length
+            ? 0
+            : accounts[a].addresses.length > accounts[b].addresses.length
+            ? -1
+            : 1
         })
         newAccounts[address] = Object.assign({}, accounts[primaryAccount[0]])
         // nameCount[newAccounts[address].name] = nameCount[newAccounts[address].name] || 0
@@ -167,7 +214,6 @@ const migrations = {
         newAccounts[address].tokens = addresses[address] && addresses[address].tokens ? addresses[address].tokens : {}
         newAccounts[address] = Object.assign({}, newAccounts[address])
       }
-  
     })
     initial.main.backup = initial.main.backup || {}
     initial.main.backup.accounts = Object.assign({}, initial.main.accounts)
@@ -177,15 +223,17 @@ const migrations = {
 
     return initial
   },
-  8: initial => { // Add on/off value to chains
-    Object.keys(initial.main.networks.ethereum).forEach(chainId => {
-      initial.main.networks.ethereum[chainId].on = chainId === '1' || chainId === initial.main.currentNetwork.id ? true : false
+  8: (initial) => {
+    // Add on/off value to chains
+    Object.keys(initial.main.networks.ethereum).forEach((chainId) => {
+      initial.main.networks.ethereum[chainId].on =
+        chainId === '1' || chainId === initial.main.currentNetwork.id ? true : false
     })
-  
+
     return initial
   },
-  9: initial => {
-    Object.keys(initial.main.networks.ethereum).forEach(chainId => {
+  9: (initial) => {
+    Object.keys(initial.main.networks.ethereum).forEach((chainId) => {
       if (chainId === '1') {
         initial.main.networks.ethereum[chainId].layer = 'mainnet'
       } else if (chainId === '10') {
@@ -201,7 +249,8 @@ const migrations = {
 
     return initial
   },
-  10: initial => {  // Add Optimism to persisted networks
+  10: (initial) => {
+    // Add Optimism to persisted networks
     initial.main.networks.ethereum[10] = {
       id: 10,
       type: 'ethereum',
@@ -212,26 +261,42 @@ const migrations = {
       gas: {
         price: {
           selected: 'standard',
-          levels: { slow: '', standard: '', fast: '', asap: '', custom: '' }
-        }
+          levels: { slow: '', standard: '', fast: '', asap: '', custom: '' },
+        },
       },
       connection: {
-        primary: { on: true, current: 'optimism', status: 'loading', connected: false, type: '', network: '', custom: '' },
-        secondary: { on: false, current: 'custom', status: 'loading', connected: false, type: '', network: '', custom: '' }
+        primary: {
+          on: true,
+          current: 'optimism',
+          status: 'loading',
+          connected: false,
+          type: '',
+          network: '',
+          custom: '',
+        },
+        secondary: {
+          on: false,
+          current: 'custom',
+          status: 'loading',
+          connected: false,
+          type: '',
+          network: '',
+          custom: '',
+        },
       },
-      on: false
+      on: false,
     }
     return initial
   },
-  11: initial => { 
+  11: (initial) => {
     // Convert all Ξ symbols to ETH
-    Object.keys(initial.main.networks.ethereum).forEach(chain => {
+    Object.keys(initial.main.networks.ethereum).forEach((chain) => {
       if (initial.main.networks.ethereum[chain].symbol === 'Ξ') {
         initial.main.networks.ethereum[chain].symbol = 'ETH'
       }
     })
     // Convert all accounts to new creation type system
-    Object.keys(initial.main.accounts).forEach(account => {
+    Object.keys(initial.main.accounts).forEach((account) => {
       try {
         if (!initial.main.accounts[account].created || initial.main.accounts[account].created === -1) {
           initial.main.accounts[account].created = 'new:' + Date.now()
@@ -244,11 +309,11 @@ const migrations = {
             initial.main.accounts[account].created = block + ':' + Date.now()
           }
         }
-  
+
         let [block, localTime] = initial.main.accounts[account].created.split(':')
         if (block.startsWith('0x')) block = parseInt(block, 'hex')
         if (block > 12726312) block = 12726312
-        initial.main.accounts[account].created = block + ':' + localTime 
+        initial.main.accounts[account].created = block + ':' + localTime
       } catch (e) {
         log.error('Migration error', e)
         delete initial.main.accounts[account]
@@ -259,7 +324,7 @@ const migrations = {
   },
   12: (initial) => {
     // Update old smart accounts
-    Object.keys(initial.main.accounts).forEach(id => {
+    Object.keys(initial.main.accounts).forEach((id) => {
       if (initial.main.accounts[id].smart) {
         initial.main.accounts[id].smart.actor = initial.main.accounts[id].smart.actor.address
       }
@@ -267,18 +332,18 @@ const migrations = {
 
     return initial
   },
-  13: initial => {
+  13: (initial) => {
     const defaultMeta = {
       gas: {
         price: {
           selected: 'standard',
-          levels: { slow: '', standard: '', fast: '', asap: '', custom: '' }
-        }
-      }
+          levels: { slow: '', standard: '', fast: '', asap: '', custom: '' },
+        },
+      },
     }
 
     // ensure all network configurations have corresponding network meta
-    Object.keys(initial.main.networks.ethereum).forEach(networkId => {
+    Object.keys(initial.main.networks.ethereum).forEach((networkId) => {
       if (initial.main.networksMeta.ethereum[networkId]) {
         const gasSettings = initial.main.networksMeta.ethereum[networkId].gas || { price: {} }
 
@@ -286,7 +351,7 @@ const migrations = {
           price: {
             selected: gasSettings.price.selected || defaultMeta.gas.price.selected,
             levels: gasSettings.price.levels || defaultMeta.gas.price.levels,
-          }
+          },
         }
       } else {
         initial.main.networksMeta.ethereum[networkId] = { ...defaultMeta }
@@ -295,13 +360,13 @@ const migrations = {
 
     return initial
   },
-  14: initial => {
+  14: (initial) => {
     if (initial.main.networks.ethereum[137] && initial.main.networks.ethereum[137].connection) {
       const { primary, secondary } = initial.main.networks.ethereum[137].connection || {}
       if (primary.current === 'matic') primary.current = 'infura'
       if (secondary.current === 'matic') secondary.current = 'infura'
     }
-  
+
     // add arbitrum network information
     if (!initial.main.networks.ethereum[42161]) {
       initial.main.networks.ethereum[42161] = {
@@ -314,14 +379,30 @@ const migrations = {
         gas: {
           price: {
             selected: 'standard',
-            levels: { slow: '', standard: '', fast: '', asap: '', custom: '' }
-          }
+            levels: { slow: '', standard: '', fast: '', asap: '', custom: '' },
+          },
         },
         connection: {
-          primary: { on: true, current: 'infura', status: 'loading', connected: false, type: '', network: '', custom: '' },
-          secondary: { on: false, current: 'custom', status: 'loading', connected: false, type: '', network: '', custom: '' }
+          primary: {
+            on: true,
+            current: 'infura',
+            status: 'loading',
+            connected: false,
+            type: '',
+            network: '',
+            custom: '',
+          },
+          secondary: {
+            on: false,
+            current: 'custom',
+            status: 'loading',
+            connected: false,
+            type: '',
+            network: '',
+            custom: '',
+          },
         },
-        on: false
+        on: false,
       }
     }
 
@@ -331,15 +412,15 @@ const migrations = {
           fees: {},
           price: {
             selected: 'standard',
-            levels: { slow: '', standard: '', fast: '', asap: '', custom: '' }
-          }
-        }
+            levels: { slow: '', standard: '', fast: '', asap: '', custom: '' },
+          },
+        },
       }
     }
 
     return initial
   },
-  15: initial => {
+  15: (initial) => {
     // Polygon
     if (initial.main.networks.ethereum['137']) {
       const oldExplorer = initial.main.networks.ethereum['137'].explorer
@@ -352,11 +433,11 @@ const migrations = {
 
     return initial
   },
-  16: initial => {
+  16: (initial) => {
     if (initial.main.currentNetwork?.id) {
       initial.main.currentNetwork.id = parseInt(initial.main.currentNetwork.id)
     }
-    Object.keys(initial.main.networks.ethereum).forEach(chain => {
+    Object.keys(initial.main.networks.ethereum).forEach((chain) => {
       try {
         initial.main.networks.ethereum[chain].id = parseInt(initial.main.networks.ethereum[chain].id)
       } catch (e) {
@@ -365,12 +446,12 @@ const migrations = {
     })
     return initial
   },
-  17: initial => {
+  17: (initial) => {
     // update Lattice settings
     const lattices = initial.main.lattice || {}
     const oldSuffix = initial.main.latticeSettings?.suffix || ''
 
-    Object.values(lattices).forEach(lattice => {
+    Object.values(lattices).forEach((lattice) => {
       lattice.paired = true
       lattice.tag = oldSuffix
       lattice.deviceName = 'GridPlus'
@@ -378,28 +459,28 @@ const migrations = {
 
     return initial
   },
-  18: initial => {
+  18: (initial) => {
     // move custom tokens to new location
     let existingCustomTokens = []
 
     if (Array.isArray(initial.main.tokens)) {
       existingCustomTokens = [...initial.main.tokens]
     }
-    
+
     initial.main.tokens = { custom: existingCustomTokens }
 
     return initial
   },
-  19: initial => {
+  19: (initial) => {
     // delete main.currentNetwork and main.clients
     delete initial.main.currentNetwork
     delete initial.main.clients
 
     return initial
   },
-  20: initial => {
+  20: (initial) => {
     // move all Aragon accounts to mainnet and add a warning if we did
-    Object.values(initial.main.accounts).forEach(account => {
+    Object.values(initial.main.accounts).forEach((account) => {
       if (account.smart?.type === 'aragon' && !account.smart.chain) {
         account.smart.chain = { type: 'ethereum', id: 1 }
         initial.main.mute.aragonAccountMigrationWarning = false
@@ -407,7 +488,7 @@ const migrations = {
     })
 
     return initial
-  }
+  },
 }
 
 // Version number of latest known migration
@@ -417,15 +498,17 @@ module.exports = {
   // Apply migrations to current state
   apply: (state, migrateToVersion = latest) => {
     state.main._version = state.main._version || 0
-    Object.keys(migrations).sort((a, b) => a - b).forEach(version => {
-      if (parseInt(state.main._version) < version && version <= migrateToVersion) {
-        log.info(`Applying state migration: ${version}`)
-        state = migrations[version](state)
-        state.main._version = version
-      }
-    })
+    Object.keys(migrations)
+      .sort((a, b) => a - b)
+      .forEach((version) => {
+        if (parseInt(state.main._version) < version && version <= migrateToVersion) {
+          log.info(`Applying state migration: ${version}`)
+          state = migrations[version](state)
+          state.main._version = version
+        }
+      })
 
     return state
   },
-  latest
+  latest,
 }
diff --git a/main/store/persist/__mocks__/index.js b/main/store/persist/__mocks__/index.js
index 3a3762aae..8b2852340 100644
--- a/main/store/persist/__mocks__/index.js
+++ b/main/store/persist/__mocks__/index.js
@@ -1,5 +1,5 @@
 module.exports = {
   get: jest.fn(),
   set: jest.fn(),
-  queue: jest.fn()
+  queue: jest.fn(),
 }
diff --git a/main/store/persist/index.js b/main/store/persist/index.js
index 42a66a3cb..f8e2c09eb 100644
--- a/main/store/persist/index.js
+++ b/main/store/persist/index.js
@@ -5,7 +5,7 @@ const Conf = require('conf')
 const migrations = require('../migrations')
 
 class PersistStore extends Conf {
-  constructor (options) {
+  constructor(options) {
     options = { configFileMode: 0o600, configName: 'config', ...options }
     let defaultCwd = __dirname
     if (electron && electron.app) defaultCwd = electron.app.getPath('userData')
@@ -19,7 +19,7 @@ class PersistStore extends Conf {
     setInterval(() => this.writeUpdates(), 30 * 1000)
   }
 
-  writeUpdates () {
+  writeUpdates() {
     if (this.blockUpdates) return
 
     const updates = { ...this.updates }
@@ -27,20 +27,20 @@ class PersistStore extends Conf {
     if (Object.keys(updates || {}).length > 0) super.set(updates)
   }
 
-  queue (path, value) {
+  queue(path, value) {
     path = `main.__.${migrations.latest}.${path}`
     this.updates = this.updates || {}
     delete this.updates[path] // maintain entry order
     this.updates[path] = JSON.parse(JSON.stringify(value))
   }
 
-  set (path, value) {
+  set(path, value) {
     if (this.blockUpdates) return
     path = `main.__.${migrations.latest}.${path}`
     super.set(path, value)
   }
 
-  clear () {
+  clear() {
     this.blockUpdates = true
     super.clear()
   }
diff --git a/main/store/state/index.js b/main/store/state/index.js
index b33406bbf..7581ca171 100644
--- a/main/store/state/index.js
+++ b/main/store/state/index.js
@@ -7,11 +7,13 @@ const latestStateVersion = () => {
   const state = persist.get('main')
   if (!state || !state.__) {
     // log.info('Persisted state: returning base state')
-    return state 
+    return state
   }
 
-  // valid states are less than or equal to the latest migration we know about 
-  const versions = Object.keys(state.__).filter(v => v <= migrations.latest).sort((a, b) => a - b)
+  // valid states are less than or equal to the latest migration we know about
+  const versions = Object.keys(state.__)
+    .filter((v) => v <= migrations.latest)
+    .sort((a, b) => a - b)
 
   if (versions.length === 0) {
     // log.info('Persisted state: returning base state')
@@ -25,7 +27,11 @@ const latestStateVersion = () => {
 
 const get = (path, obj = latestStateVersion()) => {
   path.split('.').some((key, i) => {
-    if (typeof obj !== 'object') { obj = undefined } else { obj = obj[key] }
+    if (typeof obj !== 'object') {
+      obj = undefined
+    } else {
+      obj = obj[key]
+    }
     return obj === undefined // Stop navigating the path if we get to undefined value
   })
   return obj
@@ -38,7 +44,8 @@ const main = (path, def) => {
 }
 
 const initial = {
-  panel: { // Panel view
+  panel: {
+    // Panel view
     showing: false,
     nav: [],
     show: false,
@@ -54,39 +61,40 @@ const initial = {
         'inventory',
         'permissions',
         'verify',
-        'settings'
+        'settings',
       ],
       modules: {
         requests: {
-          height: 0
+          height: 0,
         },
         activity: {
-          height: 0
+          height: 0,
         },
         balances: {
-          height: 0
+          height: 0,
         },
         inventory: {
-          height: 0
+          height: 0,
         },
         permissions: {
-          height: 0
+          height: 0,
         },
         verify: {
-          height: 0
+          height: 0,
         },
         launcher: {
-          height: 0
+          height: 0,
         },
         gas: {
-          height: 100
-        }
-      }
-    }
+          height: 100,
+        },
+      },
+    },
   },
-  dash: { // Dash view
+  dash: {
+    // Dash view
     showing: false,
-    nav: []
+    nav: [],
   },
   flow: {},
   dapps: {},
@@ -99,12 +107,12 @@ const initial = {
     badge: '',
     addAccount: '', // Add view (needs to be merged into Phase)
     addNetwork: false, // Phase view (needs to be merged with Add)
-    clickGuard: false
+    clickGuard: false,
   },
   signers: {},
   tray: {
     open: false,
-    initial: true
+    initial: true,
   },
   balances: {},
   selected: {
@@ -115,7 +123,7 @@ const initial = {
     settings: {
       viewIndex: 0,
       views: ['permissions', 'verify', 'control'],
-      subIndex: 0
+      subIndex: 0,
     },
     addresses: [],
     showAccounts: false,
@@ -128,21 +136,21 @@ const initial = {
         right: 5,
         bottom: 5,
         height: 5,
-        index: 0
-      }
-    }
+        index: 0,
+      },
+    },
   },
   frame: {
-    type: 'tray'
+    type: 'tray',
   },
   node: {
-    provider: false
+    provider: false,
   },
   provider: {
-    events: []
+    events: [],
   },
   external: {
-    rates: {}
+    rates: {},
   },
   platform: process.platform,
   main: {
@@ -152,12 +160,12 @@ const initial = {
     colorwayPrimary: {
       dark: {
         background: '#1c1c1b',
-        text: '#ecf1ff'
+        text: '#ecf1ff',
       },
       light: {
         background: '#cdcde5',
-        text: '#1e3250'
-      }
+        text: '#1e3250',
+      },
     },
     mute: {
       alphaWarning: main('mute.alphaWarning', false),
@@ -168,10 +176,10 @@ const initial = {
       gasFeeWarning: main('mute.gasFeeWarning', false),
       betaDisclosure: main('mute.betaDisclosure', false),
       signerCompatibilityWarning: main('mute.signerCompatibilityWarning', false),
-      aragonAccountMigrationWarning: main('mute.aragonAccountMigrationWarning', true)
+      aragonAccountMigrationWarning: main('mute.aragonAccountMigrationWarning', true),
     },
     shortcuts: {
-      altSlash: main('shortcuts.altSlash', true)
+      altSlash: main('shortcuts.altSlash', true),
     },
     // showUSDValue: main('showUSDValue', true),
     launch: main('launch', false),
@@ -186,14 +194,14 @@ const initial = {
       accountLimit: main('latticeSettings.accountLimit', 5),
       derivation: main('latticeSettings.derivation', 'standard'),
       endpointMode: main('latticeSettings.endpointMode', 'default'),
-      endpointCustom: main('latticeSettings.endpointCustom', '')
+      endpointCustom: main('latticeSettings.endpointCustom', ''),
     },
     ledger: {
       derivation: main('ledger.derivation', 'live'),
-      liveAccountLimit: main('ledger.liveAccountLimit', 5)
+      liveAccountLimit: main('ledger.liveAccountLimit', 5),
     },
     trezor: {
-      derivation: main('trezor.derivation', 'standard')
+      derivation: main('trezor.derivation', 'standard'),
     },
     origins: main('origins', {}),
     accounts: main('accounts', {}),
@@ -206,51 +214,57 @@ const initial = {
     signers: {},
     savedSigners: {},
     updater: {
-      dontRemind: main('updater.dontRemind', [])
+      dontRemind: main('updater.dontRemind', []),
     },
     networkPresets: {
       ethereum: {
         default: {
-          local: 'direct'
+          local: 'direct',
         },
         1: {
-          alchemy: ['wss://eth-mainnet.ws.alchemyapi.io/v2/NBms1eV9i16RFHpFqQxod56OLdlucIq0', 'https://eth-mainnet.alchemyapi.io/v2/NBms1eV9i16RFHpFqQxod56OLdlucIq0'],
-          infura: 'infura'
+          alchemy: [
+            'wss://eth-mainnet.ws.alchemyapi.io/v2/NBms1eV9i16RFHpFqQxod56OLdlucIq0',
+            'https://eth-mainnet.alchemyapi.io/v2/NBms1eV9i16RFHpFqQxod56OLdlucIq0',
+          ],
+          infura: 'infura',
         },
         3: {
-          infura: 'infuraRopsten'
+          infura: 'infuraRopsten',
         },
         4: {
-          infura: 'infuraRinkeby'
+          infura: 'infuraRinkeby',
         },
         5: {
-          infura: ['wss://goerli.infura.io/ws/v3/786ade30f36244469480aa5c2bf0743b', 'https://goerli.infura.io/ws/v3/786ade30f36244469480aa5c2bf0743b'],
+          infura: [
+            'wss://goerli.infura.io/ws/v3/786ade30f36244469480aa5c2bf0743b',
+            'https://goerli.infura.io/ws/v3/786ade30f36244469480aa5c2bf0743b',
+          ],
           mudit: 'https://rpc.goerli.mudit.blog',
           slockit: 'https://rpc.slock.it/goerli',
-          prylabs: 'https://goerli.prylabs.net'
+          prylabs: 'https://goerli.prylabs.net',
         },
         10: {
           optimism: 'https://mainnet.optimism.io',
-          infura: 'https://optimism-mainnet.infura.io/v3/786ade30f36244469480aa5c2bf0743b'
+          infura: 'https://optimism-mainnet.infura.io/v3/786ade30f36244469480aa5c2bf0743b',
         },
         42: {
-          infura: 'infuraKovan'
+          infura: 'infuraKovan',
         },
         74: {
-          idchain: 'wss://idchain.one/ws/'
+          idchain: 'wss://idchain.one/ws/',
         },
         100: {
-          poa: 'https://dai.poa.network'
+          poa: 'https://dai.poa.network',
         },
         137: {
-          infura: 'https://polygon-mainnet.infura.io/v3/786ade30f36244469480aa5c2bf0743b'
+          infura: 'https://polygon-mainnet.infura.io/v3/786ade30f36244469480aa5c2bf0743b',
         },
         42161: {
-          infura: 'https://arbitrum-mainnet.infura.io/v3/786ade30f36244469480aa5c2bf0743b'
-        }
-      }
+          infura: 'https://arbitrum-mainnet.infura.io/v3/786ade30f36244469480aa5c2bf0743b',
+        },
+      },
     },
-    networks: main('networks', { 
+    networks: main('networks', {
       ethereum: {
         1: {
           id: 1,
@@ -262,14 +276,30 @@ const initial = {
           gas: {
             price: {
               selected: 'standard',
-              levels: { slow: '', standard: '', fast: '', asap: '', custom: '' }
-            }
+              levels: { slow: '', standard: '', fast: '', asap: '', custom: '' },
+            },
           },
           connection: {
-            primary: { on: true, current: 'infura', status: 'loading', connected: false, type: '', network: '', custom: '' },
-            secondary: { on: false, current: 'custom', status: 'loading', connected: false, type: '', network: '', custom: '' }
+            primary: {
+              on: true,
+              current: 'infura',
+              status: 'loading',
+              connected: false,
+              type: '',
+              network: '',
+              custom: '',
+            },
+            secondary: {
+              on: false,
+              current: 'custom',
+              status: 'loading',
+              connected: false,
+              type: '',
+              network: '',
+              custom: '',
+            },
           },
-          on: true
+          on: true,
         },
         3: {
           id: 3,
@@ -281,14 +311,30 @@ const initial = {
           gas: {
             price: {
               selected: 'standard',
-              levels: { slow: '', standard: '', fast: '', asap: '', custom: '' }
-            }
+              levels: { slow: '', standard: '', fast: '', asap: '', custom: '' },
+            },
           },
           connection: {
-            primary: { on: true, current: 'infura', status: 'loading', connected: false, type: '', network: '', custom: '' },
-            secondary: { on: false, current: 'custom', status: 'loading', connected: false, type: '', network: '', custom: '' }
+            primary: {
+              on: true,
+              current: 'infura',
+              status: 'loading',
+              connected: false,
+              type: '',
+              network: '',
+              custom: '',
+            },
+            secondary: {
+              on: false,
+              current: 'custom',
+              status: 'loading',
+              connected: false,
+              type: '',
+              network: '',
+              custom: '',
+            },
           },
-          on: false
+          on: false,
         },
         4: {
           id: 4,
@@ -300,14 +346,30 @@ const initial = {
           gas: {
             price: {
               selected: 'standard',
-              levels: { slow: '', standard: '', fast: '', asap: '', custom: '' }
-            }
+              levels: { slow: '', standard: '', fast: '', asap: '', custom: '' },
+            },
           },
           connection: {
-            primary: { on: true, current: 'infura', status: 'loading', connected: false, type: '', network: '', custom: '' },
-            secondary: { on: false, current: 'custom', status: 'loading', connected: false, type: '', network: '', custom: '' }
+            primary: {
+              on: true,
+              current: 'infura',
+              status: 'loading',
+              connected: false,
+              type: '',
+              network: '',
+              custom: '',
+            },
+            secondary: {
+              on: false,
+              current: 'custom',
+              status: 'loading',
+              connected: false,
+              type: '',
+              network: '',
+              custom: '',
+            },
           },
-          on: false
+          on: false,
         },
         5: {
           id: 5,
@@ -319,14 +381,30 @@ const initial = {
           gas: {
             price: {
               selected: 'standard',
-              levels: { slow: '', standard: '', fast: '', asap: '', custom: '' }
-            }
+              levels: { slow: '', standard: '', fast: '', asap: '', custom: '' },
+            },
           },
           connection: {
-            primary: { on: true, current: 'infura', status: 'loading', connected: false, type: '', network: '', custom: '' },
-            secondary: { on: false, current: 'custom', status: 'loading', connected: false, type: '', network: '', custom: '' }
+            primary: {
+              on: true,
+              current: 'infura',
+              status: 'loading',
+              connected: false,
+              type: '',
+              network: '',
+              custom: '',
+            },
+            secondary: {
+              on: false,
+              current: 'custom',
+              status: 'loading',
+              connected: false,
+              type: '',
+              network: '',
+              custom: '',
+            },
           },
-          on: false
+          on: false,
         },
         10: {
           id: 10,
@@ -338,14 +416,30 @@ const initial = {
           gas: {
             price: {
               selected: 'standard',
-              levels: { slow: '', standard: '', fast: '', asap: '', custom: '' }
-            }
+              levels: { slow: '', standard: '', fast: '', asap: '', custom: '' },
+            },
           },
           connection: {
-            primary: { on: true, current: 'optimism', status: 'loading', connected: false, type: '', network: '', custom: '' },
-            secondary: { on: false, current: 'custom', status: 'loading', connected: false, type: '', network: '', custom: '' }
+            primary: {
+              on: true,
+              current: 'optimism',
+              status: 'loading',
+              connected: false,
+              type: '',
+              network: '',
+              custom: '',
+            },
+            secondary: {
+              on: false,
+              current: 'custom',
+              status: 'loading',
+              connected: false,
+              type: '',
+              network: '',
+              custom: '',
+            },
           },
-          on: false
+          on: false,
         },
         42: {
           id: 42,
@@ -357,14 +451,30 @@ const initial = {
           gas: {
             price: {
               selected: 'standard',
-              levels: { slow: '', standard: '', fast: '', asap: '', custom: '' }
-            }
+              levels: { slow: '', standard: '', fast: '', asap: '', custom: '' },
+            },
           },
           connection: {
-            primary: { on: true, current: 'infura', status: 'loading', connected: false, type: '', network: '', custom: '' },
-            secondary: { on: false, current: 'custom', status: 'loading', connected: false, type: '', network: '', custom: '' }
+            primary: {
+              on: true,
+              current: 'infura',
+              status: 'loading',
+              connected: false,
+              type: '',
+              network: '',
+              custom: '',
+            },
+            secondary: {
+              on: false,
+              current: 'custom',
+              status: 'loading',
+              connected: false,
+              type: '',
+              network: '',
+              custom: '',
+            },
           },
-          on: false
+          on: false,
         },
         // 74: {
         //   id: 74,
@@ -393,14 +503,30 @@ const initial = {
           gas: {
             price: {
               selected: 'standard',
-              levels: { slow: '', standard: '', fast: '', asap: '', custom: '' }
-            }
+              levels: { slow: '', standard: '', fast: '', asap: '', custom: '' },
+            },
           },
           connection: {
-            primary: { on: true, current: 'poa', status: 'loading', connected: false, type: '', network: '', custom: '' },
-            secondary: { on: false, current: 'custom', status: 'loading', connected: false, type: '', network: '', custom: '' }
+            primary: {
+              on: true,
+              current: 'poa',
+              status: 'loading',
+              connected: false,
+              type: '',
+              network: '',
+              custom: '',
+            },
+            secondary: {
+              on: false,
+              current: 'custom',
+              status: 'loading',
+              connected: false,
+              type: '',
+              network: '',
+              custom: '',
+            },
           },
-          on: false
+          on: false,
         },
         137: {
           id: 137,
@@ -412,14 +538,30 @@ const initial = {
           gas: {
             price: {
               selected: 'standard',
-              levels: { slow: '', standard: '', fast: '', asap: '', custom: '' }
-            }
+              levels: { slow: '', standard: '', fast: '', asap: '', custom: '' },
+            },
           },
           connection: {
-            primary: { on: true, current: 'infura', status: 'loading', connected: false, type: '', network: '', custom: '' },
-            secondary: { on: false, current: 'custom', status: 'loading', connected: false, type: '', network: '', custom: '' }
+            primary: {
+              on: true,
+              current: 'infura',
+              status: 'loading',
+              connected: false,
+              type: '',
+              network: '',
+              custom: '',
+            },
+            secondary: {
+              on: false,
+              current: 'custom',
+              status: 'loading',
+              connected: false,
+              type: '',
+              network: '',
+              custom: '',
+            },
           },
-          on: false
+          on: false,
         },
         42161: {
           id: 42161,
@@ -431,16 +573,32 @@ const initial = {
           gas: {
             price: {
               selected: 'standard',
-              levels: { slow: '', standard: '', fast: '', asap: '', custom: '' }
-            }
+              levels: { slow: '', standard: '', fast: '', asap: '', custom: '' },
+            },
           },
           connection: {
-            primary: { on: true, current: 'infura', status: 'loading', connected: false, type: '', network: '', custom: '' },
-            secondary: { on: false, current: 'custom', status: 'loading', connected: false, type: '', network: '', custom: '' }
+            primary: {
+              on: true,
+              current: 'infura',
+              status: 'loading',
+              connected: false,
+              type: '',
+              network: '',
+              custom: '',
+            },
+            secondary: {
+              on: false,
+              current: 'custom',
+              status: 'loading',
+              connected: false,
+              type: '',
+              network: '',
+              custom: '',
+            },
           },
-          on: false
-        }
-      }
+          on: false,
+        },
+      },
     }),
     networksMeta: main('networksMeta', {
       ethereum: {
@@ -450,9 +608,9 @@ const initial = {
             fees: {},
             price: {
               selected: 'standard',
-              levels: { slow: '', standard: '', fast: '', asap: '', custom: '' }
-            }
-          }
+              levels: { slow: '', standard: '', fast: '', asap: '', custom: '' },
+            },
+          },
         },
         3: {
           blockHeight: 0,
@@ -460,9 +618,9 @@ const initial = {
             fees: {},
             price: {
               selected: 'standard',
-              levels: { slow: '', standard: '', fast: '', asap: '', custom: '' }
-            }
-          }
+              levels: { slow: '', standard: '', fast: '', asap: '', custom: '' },
+            },
+          },
         },
         4: {
           blockHeight: 0,
@@ -470,9 +628,9 @@ const initial = {
             fees: {},
             price: {
               selected: 'standard',
-              levels: { slow: '', standard: '', fast: '', asap: '', custom: '' }
-            }
-          }
+              levels: { slow: '', standard: '', fast: '', asap: '', custom: '' },
+            },
+          },
         },
         5: {
           blockHeight: 0,
@@ -480,9 +638,9 @@ const initial = {
             fees: {},
             price: {
               selected: 'standard',
-              levels: { slow: '', standard: '', fast: '', asap: '', custom: '' }
-            }
-          }
+              levels: { slow: '', standard: '', fast: '', asap: '', custom: '' },
+            },
+          },
         },
         10: {
           blockHeight: 0,
@@ -490,9 +648,9 @@ const initial = {
             fees: {},
             price: {
               selected: 'standard',
-              levels: { slow: '', standard: '', fast: '', asap: '', custom: '' }
-            }
-          }
+              levels: { slow: '', standard: '', fast: '', asap: '', custom: '' },
+            },
+          },
         },
         42: {
           blockHeight: 0,
@@ -500,9 +658,9 @@ const initial = {
             fees: {},
             price: {
               selected: 'standard',
-              levels: { slow: '', standard: '', fast: '', asap: '', custom: '' }
-            }
-          }
+              levels: { slow: '', standard: '', fast: '', asap: '', custom: '' },
+            },
+          },
         },
         100: {
           blockHeight: 0,
@@ -510,9 +668,9 @@ const initial = {
             fees: {},
             price: {
               selected: 'standard',
-              levels: { slow: '', standard: '', fast: '', asap: '', custom: '' }
-            }
-          }
+              levels: { slow: '', standard: '', fast: '', asap: '', custom: '' },
+            },
+          },
         },
         137: {
           blockHeight: 0,
@@ -520,9 +678,9 @@ const initial = {
             fees: {},
             price: {
               selected: 'standard',
-              levels: { slow: '', standard: '', fast: '', asap: '', custom: '' }
-            }
-          }
+              levels: { slow: '', standard: '', fast: '', asap: '', custom: '' },
+            },
+          },
         },
         42161: {
           blockHeight: 0,
@@ -530,11 +688,11 @@ const initial = {
             fees: {},
             price: {
               selected: 'standard',
-              levels: { slow: '', standard: '', fast: '', asap: '', custom: '' }
-            }
-          }
-        }
-      }
+              levels: { slow: '', standard: '', fast: '', asap: '', custom: '' },
+            },
+          },
+        },
+      },
     }),
     ipfs: {},
     dapps: {},
@@ -544,17 +702,17 @@ const initial = {
       details: {},
       map: {
         added: [],
-        docked: []
+        docked: [],
       },
       storage: {},
-      removed: []
-    }
-  }
+      removed: [],
+    },
+  },
 }
 
 // --- remove state that should not persist from session to session
 
-Object.keys(initial.main.accounts).forEach(id => {
+Object.keys(initial.main.accounts).forEach((id) => {
   // Remove permissions granted to unknown origins
   const permissions = initial.main.permissions[id]
   if (permissions) delete permissions[uuidv5('Unknown', uuidv5.DNS)]
@@ -563,8 +721,8 @@ Object.keys(initial.main.accounts).forEach(id => {
   initial.main.accounts[id].balances = { lastUpdated: undefined }
 })
 
-Object.values(initial.main.networksMeta).forEach(chains => {
-  Object.values(chains).forEach(chainMeta => {
+Object.values(initial.main.networksMeta).forEach((chains) => {
+  Object.values(chains).forEach((chainMeta) => {
     // remove stale price data
     chainMeta.nativeCurrency = { ...chainMeta.nativeCurrency, usd: { price: 0, change24hr: 0 } }
   })
@@ -577,8 +735,8 @@ initial.main.origins = Object.entries(initial.main.origins).reduce((origins, [id
       ...origin,
       session: {
         ...origin.session,
-        endedAt: origin.session.lastUpdatedAt
-      }
+        endedAt: origin.session.lastUpdatedAt,
+      },
     }
   }
 
diff --git a/main/time/index.js b/main/time/index.js
index ae655db70..c2ada0af0 100644
--- a/main/time/index.js
+++ b/main/time/index.js
@@ -3,7 +3,7 @@
 const counts = {}
 
 module.exports = async (blockNumber) => {
-  if (!blockNumber) blockNumber = await provider.request({ method: 'eth_blockNumbr'})
+  if (!blockNumber) blockNumber = await provider.request({ method: 'eth_blockNumbr' })
   counts[blockNumber] = counts[blockNumber] || 0
   return blockNumber + ':' + counts[blockNumber]
-}
\ No newline at end of file
+}
diff --git a/main/transaction/gasCalculator.ts b/main/transaction/gasCalculator.ts
index b63d9a1f3..2445bd421 100644
--- a/main/transaction/gasCalculator.ts
+++ b/main/transaction/gasCalculator.ts
@@ -4,45 +4,45 @@ const oneGwei = 1e9
 
 // TODO: move these to a declaration file?
 interface FeeHistoryResponse {
-  baseFeePerGas: string[],
-  gasUsedRatio: number[],
-  reward: Array<string[]>,
+  baseFeePerGas: string[]
+  gasUsedRatio: number[]
+  reward: Array<string[]>
   oldestBlock: string
 }
 
 interface ProviderRequest {
-  method: string,
-  params: any[],
-  id: number,
+  method: string
+  params: any[]
+  id: number
   jsonrpc: '2.0'
 }
 
 interface Block {
-  baseFee: number,
-  rewards: number[],
+  baseFee: number
+  rewards: number[]
   gasUsedRatio: number
 }
 
 interface GasPrices {
-  slow: string,
-  standard: string,
-  fast: string,
+  slow: string
+  standard: string
+  fast: string
   asap: string
 }
 
-function rpcPayload (method: string, params: any[] = [], id = 1): ProviderRequest {
+function rpcPayload(method: string, params: any[] = [], id = 1): ProviderRequest {
   return {
     method,
     params,
     id,
-    jsonrpc: '2.0'
+    jsonrpc: '2.0',
   }
 }
 
 export default class GasCalculator {
   private connection
 
-  constructor (connection: any  /* Chains */) {
+  constructor(connection: any /* Chains */) {
     this.connection = connection
   }
 
@@ -56,14 +56,14 @@ export default class GasCalculator {
       return {
         baseFee: parseInt(baseFee, 16),
         gasUsedRatio: feeHistory.gasUsedRatio[i],
-        rewards: (feeHistory.reward[i] || []).map(reward => parseInt(reward, 16))
+        rewards: (feeHistory.reward[i] || []).map((reward) => parseInt(reward, 16)),
       }
     })
 
     return feeHistoryBlocks
   }
 
-  async getGasPrices (): Promise<GasPrices> {
+  async getGasPrices(): Promise<GasPrices> {
     const gasPrice = await this.connection.send(rpcPayload('eth_gasPrice'))
 
     // in the future we may want to have specific calculators to calculate variations
@@ -72,27 +72,29 @@ export default class GasCalculator {
       slow: gasPrice,
       standard: gasPrice,
       fast: gasPrice,
-      asap: gasPrice
+      asap: gasPrice,
     }
   }
-  
-  async getFeePerGas (): Promise<GasFees> {
+
+  async getFeePerGas(): Promise<GasFees> {
     // fetch the last 10 blocks and the bottom 10% of priority fees paid for each block
     const blocks = await this._getFeeHistory(10, [10])
-    
+
     // plan for max fee of 2 full blocks, each one increasing the fee by 12.5%
     const nextBlockFee = blocks[blocks.length - 1].baseFee // base fee for next block
     const calculatedFee = Math.ceil(nextBlockFee * 1.125 * 1.125)
 
     // only consider priority fees from blocks that aren't almost empty or almost full
-    const eligibleRewardsBlocks = blocks.filter(block => block.gasUsedRatio >= 0.1 && block.gasUsedRatio <= 0.9).map(block => block.rewards[0])
+    const eligibleRewardsBlocks = blocks
+      .filter((block) => block.gasUsedRatio >= 0.1 && block.gasUsedRatio <= 0.9)
+      .map((block) => block.rewards[0])
     const medianReward = eligibleRewardsBlocks.sort()[Math.floor(eligibleRewardsBlocks.length / 2)] || oneGwei
 
     return {
       nextBaseFee: intToHex(nextBlockFee),
       maxBaseFeePerGas: intToHex(calculatedFee),
       maxPriorityFeePerGas: intToHex(medianReward),
-      maxFeePerGas: intToHex(calculatedFee + medianReward)
+      maxFeePerGas: intToHex(calculatedFee + medianReward),
     }
   }
 }
diff --git a/main/transaction/index.ts b/main/transaction/index.ts
index 428fec7ce..6b310dc5a 100644
--- a/main/transaction/index.ts
+++ b/main/transaction/index.ts
@@ -9,23 +9,23 @@ import { TransactionData, typeSupportsBaseFee } from '../../resources/domain/tra
 const londonHardforkSigners: SignerCompatibilityByVersion = {
   seed: () => true,
   ring: () => true,
-  ledger: version => version.major >= 2 || (version.major >= 1 && version.minor >= 9),
+  ledger: (version) => version.major >= 2 || (version.major >= 1 && version.minor >= 9),
   trezor: (version, model) => {
     if ((model || '').toLowerCase() === 'trezor one') {
-      return version.major >= 2 ||
-        (
-          version.major >= 1 &&
-            (
-              version.minor > 10 ||
-              (version.minor === 10 && version.patch >= 4)
-            )
-        )
+      return (
+        version.major >= 2 ||
+        (version.major >= 1 && (version.minor > 10 || (version.minor === 10 && version.patch >= 4)))
+      )
     }
 
     // 3.x+, 2.5.x+, or 2.4.2+
-    return version.major >= 3 || (version.major === 2 && version.minor >= 5) || (version.major === 2 && version.minor === 4 && version.patch >= 2)
+    return (
+      version.major >= 3 ||
+      (version.major === 2 && version.minor >= 5) ||
+      (version.major === 2 && version.minor === 4 && version.patch >= 2)
+    )
   },
-  lattice: version =>  version.major >= 1 || version.minor >= 11
+  lattice: (version) => version.major >= 1 || version.minor >= 11,
 }
 
 type SignerCompatibilityByVersion = {
@@ -33,33 +33,36 @@ type SignerCompatibilityByVersion = {
 }
 
 export interface Signature {
-  v: string,
-  r: string,
+  v: string
+  r: string
   s: string
 }
 
-export interface SignerCompatibility  {
-  signer: string,
-  tx: string,
+export interface SignerCompatibility {
+  signer: string
+  tx: string
   compatible: boolean
 }
 
-function toBN (hexStr: string) {
+function toBN(hexStr: string) {
   return new BN(stripHexPrefix(hexStr), 'hex')
 }
 
-function signerCompatibility (txData: TransactionData, signer: SignerSummary): SignerCompatibility {
+function signerCompatibility(txData: TransactionData, signer: SignerSummary): SignerCompatibility {
   if (typeSupportsBaseFee(txData.type)) {
-    const compatible = (signer.type in londonHardforkSigners) && londonHardforkSigners[signer.type](signer.appVersion, signer.model)
+    const compatible =
+      signer.type in londonHardforkSigners && londonHardforkSigners[signer.type](signer.appVersion, signer.model)
     return { signer: signer.type, tx: 'london', compatible }
   }
 
   return {
-    signer: signer.type, tx: 'legacy', compatible: true
+    signer: signer.type,
+    tx: 'legacy',
+    compatible: true,
   }
 }
 
-function londonToLegacy (txData: TransactionData): TransactionData {
+function londonToLegacy(txData: TransactionData): TransactionData {
   if (txData.type === '0x2') {
     const { type, maxFeePerGas, maxPriorityFeePerGas, ...tx } = txData
 
@@ -69,7 +72,7 @@ function londonToLegacy (txData: TransactionData): TransactionData {
   return txData
 }
 
-function maxFee (rawTx: TransactionData) {
+function maxFee(rawTx: TransactionData) {
   const chainId = parseInt(rawTx.chainId)
 
   // for ETH-based chains, the max fee should be 2 ETH
@@ -86,7 +89,7 @@ function maxFee (rawTx: TransactionData) {
   return 50 * 1e18
 }
 
-function populate (rawTx: TransactionData, chainConfig: Common, gas: any): TransactionData {
+function populate(rawTx: TransactionData, chainConfig: Common, gas: any): TransactionData {
   const txData: TransactionData = { ...rawTx }
 
   if (chainConfig.isActivatedEIP(1559) && gas.price.fees) {
@@ -109,36 +112,30 @@ function populate (rawTx: TransactionData, chainConfig: Common, gas: any): Trans
   return txData
 }
 
-function hexifySignature ({ v, r, s }: Signature) {
+function hexifySignature({ v, r, s }: Signature) {
   return {
     v: addHexPrefix(v),
     r: addHexPrefix(r),
-    s: addHexPrefix(s)
+    s: addHexPrefix(s),
   }
 }
 
-async function sign (rawTx: TransactionData, signingFn: (tx: TypedTransaction) => Promise<Signature>) {
+async function sign(rawTx: TransactionData, signingFn: (tx: TypedTransaction) => Promise<Signature>) {
   const common = chainConfig(parseInt(rawTx.chainId), parseInt(rawTx.type) === 2 ? 'london' : 'berlin')
 
   const tx = TransactionFactory.fromTxData(rawTx, { common })
 
-  return signingFn(tx).then(sig => {
+  return signingFn(tx).then((sig) => {
     const signature = hexifySignature(sig)
 
     return TransactionFactory.fromTxData(
       {
-      ...rawTx,
-      ...signature
+        ...rawTx,
+        ...signature,
       },
       { common }
     )
   })
 }
 
-export {
-  maxFee,
-  populate,
-  sign,
-  signerCompatibility,
-  londonToLegacy
-}
+export { maxFee, populate, sign, signerCompatibility, londonToLegacy }
diff --git a/main/updater/index.js b/main/updater/index.js
index 89a08193a..76fd38e34 100644
--- a/main/updater/index.js
+++ b/main/updater/index.js
@@ -16,20 +16,25 @@ const compareVersions = (a, b) => {
 }
 
 const checkErr = (err) => log.error('Error checking latest version:', err)
-const options = { host: 'api.github.com', path: '/repos/floating/frame/releases', headers: { 'User-Agent': 'request' } }
+const options = {
+  host: 'api.github.com',
+  path: '/repos/floating/frame/releases',
+  headers: { 'User-Agent': 'request' },
+}
 
 const prereleaseTrack = true
 
 autoUpdater.allowPrerelease = prereleaseTrack
 autoUpdater.autoDownload = false
 
-autoUpdater.on('error', err => {
+autoUpdater.on('error', (err) => {
   // TODO: Error Notification
   log.error(' > Auto Update Error: ' + err.message)
   updater.checkManualUpdate()
 })
 
-autoUpdater.on('update-available', (r) => { //  Ask if they want to download it
+autoUpdater.on('update-available', (r) => {
+  //  Ask if they want to download it
   log.info(' > autoUpdated found that an update is available...')
   updater.updateAvailable(r.version, 'auto')
 })
@@ -39,7 +44,7 @@ autoUpdater.on('update-not-available', () => {
   updater.checkManualUpdate()
 })
 
-autoUpdater.on('update-downloaded', res => {
+autoUpdater.on('update-downloaded', (res) => {
   if (!updater.updatePending) updater.updateReady()
   updater.updatePending = true
 })
@@ -48,14 +53,16 @@ const updater = {
   updatePending: false,
   availableUpdate: '',
   availableVersion: '',
-  updateAvailable: (version, location) => { // An update is available
+  updateAvailable: (version, location) => {
+    // An update is available
     this.availableVersion = version
     this.availableUpdate = location
     const remindOk = store('main.updater.dontRemind').indexOf(version) === -1
     if (!updater.notified[version] && remindOk) windows.broadcast('main:action', 'updateBadge', 'updateAvailable')
     updater.notified[version] = true
   },
-  updateReady: () => { // An update is ready
+  updateReady: () => {
+    // An update is ready
     windows.broadcast('main:action', 'updateBadge', 'updateReady')
   },
   installAvailableUpdate: (install, dontRemind) => {
@@ -75,25 +82,32 @@ const updater = {
   },
   notified: {},
   checkManualUpdate: () => {
-    https.get(options, res => {
-      let rawData = ''
-      res.on('data', chunk => { rawData += chunk })
-      res.on('end', () => {
-        try {
-          const releases = JSON.parse(rawData).filter(r => (!r.prerelease || prereleaseTrack))
-          if (releases && releases[0] && releases[0].tag_name && !updater.notified[releases[0].tag_name]) {
-            const newVersion = releases[0].tag_name.charAt(0) === 'v' ? releases[0].tag_name.substr(1) : releases[0].tag_name
-            if (compareVersions(newVersion, version) === 1) {
-              log.info('Updater: Current version is behind latest')
-              log.info('Updater: User has not been notified of this version yet')
-              log.info('Updater: Notify user')
-              updater.updateAvailable(releases[0].tag_name, releases[0].html_url)
+    https
+      .get(options, (res) => {
+        let rawData = ''
+        res.on('data', (chunk) => {
+          rawData += chunk
+        })
+        res.on('end', () => {
+          try {
+            const releases = JSON.parse(rawData).filter((r) => !r.prerelease || prereleaseTrack)
+            if (releases && releases[0] && releases[0].tag_name && !updater.notified[releases[0].tag_name]) {
+              const newVersion =
+                releases[0].tag_name.charAt(0) === 'v' ? releases[0].tag_name.substr(1) : releases[0].tag_name
+              if (compareVersions(newVersion, version) === 1) {
+                log.info('Updater: Current version is behind latest')
+                log.info('Updater: User has not been notified of this version yet')
+                log.info('Updater: Notify user')
+                updater.updateAvailable(releases[0].tag_name, releases[0].html_url)
+              }
             }
+          } catch (err) {
+            checkErr(err)
           }
-        } catch (err) { checkErr(err) }
+        })
       })
-    }).on('error', checkErr)
-  }
+      .on('error', checkErr)
+  },
 }
 
 if (!dev) {
diff --git a/main/windows/dialog/unhandledException.ts b/main/windows/dialog/unhandledException.ts
index 64840074b..90b3d0484 100644
--- a/main/windows/dialog/unhandledException.ts
+++ b/main/windows/dialog/unhandledException.ts
@@ -1,12 +1,18 @@
 const { app, dialog } = require('electron')
 
-enum ExitAction { OK, Quit }
+enum ExitAction {
+  OK,
+  Quit,
+}
 
 export default function (message: string, code?: string) {
   let exitAction = ExitAction.Quit
 
   if (code === 'EADDRINUSE') {
-    dialog.showErrorBox('Frame is already running', 'Frame is already running or another application is using port 1248.')
+    dialog.showErrorBox(
+      'Frame is already running',
+      'Frame is already running or another application is using port 1248.'
+    )
   } else {
     exitAction = dialog.showMessageBoxSync(undefined as any, {
       title: 'Unhandled Exception',
@@ -15,7 +21,7 @@ export default function (message: string, code?: string) {
       type: 'error',
       buttons: Object.keys(ExitAction).slice(Object.keys(ExitAction).length / 2),
       defaultId: ExitAction.OK,
-      cancelId: ExitAction.OK
+      cancelId: ExitAction.OK,
     })
   }
 
diff --git a/main/windows/extractColors/index.ts b/main/windows/extractColors/index.ts
index 94c63328a..52e58de11 100644
--- a/main/windows/extractColors/index.ts
+++ b/main/windows/extractColors/index.ts
@@ -5,10 +5,11 @@ import { BrowserWindow, BrowserView } from 'electron'
 
 import webPreferences from '../webPreferences'
 
-function mode (array: string[]) {
+function mode(array: string[]) {
   if (array.length === 0) return ''
   const modeMap: Record<string, number> = {}
-  let maxEl = array[0]; let maxCount = 1
+  let maxEl = array[0]
+  let maxCount = 1
   for (let i = 0; i < array.length; i++) {
     const el = array[i]
     if (!modeMap[el]) {
@@ -24,7 +25,7 @@ function mode (array: string[]) {
   return maxEl
 }
 
-async function pixelColor (image: Electron.NativeImage) {
+async function pixelColor(image: Electron.NativeImage) {
   return new Promise((resolve, reject) => {
     pixels(image.toPNG(), 'image/png', (err, pixels) => {
       if (err) return reject(err)
@@ -44,10 +45,10 @@ async function pixelColor (image: Electron.NativeImage) {
       const colorArray = selectedColor.split(', ')
 
       const color = {
-        background: `rgb(${colorArray.join(', ')})`, 
-        backgroundShade: `rgb(${colorArray.map(v => Math.max(parseInt(v) - 5, 0)).join(', ')})`,
-        backgroundLight: `rgb(${colorArray.map(v => Math.min(parseInt(v) + 50, 255)).join(', ')})`,
-        text: textColor(...(colorArray.map(a => parseInt(a)) as [number, number, number]))
+        background: `rgb(${colorArray.join(', ')})`,
+        backgroundShade: `rgb(${colorArray.map((v) => Math.max(parseInt(v) - 5, 0)).join(', ')})`,
+        backgroundLight: `rgb(${colorArray.map((v) => Math.min(parseInt(v) + 50, 255)).join(', ')})`,
+        text: textColor(...(colorArray.map((a) => parseInt(a)) as [number, number, number])),
       }
 
       resolve(color)
@@ -55,23 +56,24 @@ async function pixelColor (image: Electron.NativeImage) {
   })
 }
 
-async function getColor (view: BrowserView) {
+async function getColor(view: BrowserView) {
   const image = await view.webContents.capturePage()
   return pixelColor(image)
 }
 
-function textColor (r: number, g: number, b: number) { // http://alienryderflex.com/hsp.html
+function textColor(r: number, g: number, b: number) {
+  // http://alienryderflex.com/hsp.html
   return Math.sqrt(0.299 * (r * r) + 0.587 * (g * g) + 0.114 * (b * b)) > 127.5 ? 'black' : 'white'
 }
 
-function extractSession (l: string) {
+function extractSession(l: string) {
   const url = new URL(l)
   const session = url.searchParams.get('session') || ''
   const ens = url.port === '8421' ? url.hostname.replace('.localhost', '') || '' : ''
   return { session, ens }
 }
 
-async function extractColors (url: string, ens: string) {
+async function extractColors(url: string, ens: string) {
   let window: BrowserWindow | null = new BrowserWindow({
     x: 0,
     y: 0,
@@ -90,28 +92,31 @@ async function extractColors (url: string, ens: string) {
       sandbox: true,
       disableBlinkFeatures: 'Auxclick',
       // enableRemoteModule: false,
-      offscreen: true
-    }
+      offscreen: true,
+    },
   })
 
-  let view: BrowserView | null = new BrowserView({ 
-    webPreferences: Object.assign({ 
-      preload: path.resolve('./main/windows/viewPreload.js') ,
-      partition: 'persist:' + ens,
-      offscreen: true
-    }, webPreferences)
+  let view: BrowserView | null = new BrowserView({
+    webPreferences: Object.assign(
+      {
+        preload: path.resolve('./main/windows/viewPreload.js'),
+        partition: 'persist:' + ens,
+        offscreen: true,
+      },
+      webPreferences
+    ),
   })
 
-  view.webContents.on('will-navigate', e => e.preventDefault())
-  view.webContents.on('will-attach-webview', e => e.preventDefault())
-  view.webContents.on('new-window', e => e.preventDefault())
+  view.webContents.on('will-navigate', (e) => e.preventDefault())
+  view.webContents.on('will-attach-webview', (e) => e.preventDefault())
+  view.webContents.on('new-window', (e) => e.preventDefault())
 
   view.webContents.session.webRequest.onBeforeSendHeaders((details, cb) => {
     if (!details || !details.frame) return cb({ cancel: true }) // Reject the request
 
     // Block any dapp requests to Frame during color extraction
     if (details.url.includes('127.0.0.1:1248') || details.url.includes('localhost:1248')) {
-      return cb({ cancel: true }) 
+      return cb({ cancel: true })
     }
 
     return cb({ requestHeaders: details.requestHeaders }) // Leave untouched
@@ -124,9 +129,9 @@ async function extractColors (url: string, ens: string) {
 
   try {
     await view.webContents.session.cookies.set({
-      url: url, 
-      name: '__frameSession', 
-      value: session
+      url: url,
+      name: '__frameSession',
+      value: session,
     })
 
     await view.webContents.loadURL(url)
@@ -138,7 +143,7 @@ async function extractColors (url: string, ens: string) {
     log.error(`error extracting colors for ${ens}`, e)
   } finally {
     if (view) {
-      const webcontents = (view.webContents as any)
+      const webcontents = view.webContents as any
       webcontents.destroy()
 
       view = null
diff --git a/main/windows/frames/frameInstances.ts b/main/windows/frames/frameInstances.ts
index 0e429b4c0..da303649b 100644
--- a/main/windows/frames/frameInstances.ts
+++ b/main/windows/frames/frameInstances.ts
@@ -1,4 +1,4 @@
-import electron, { BrowserView, BrowserWindow }  from 'electron'
+import electron, { BrowserView, BrowserWindow } from 'electron'
 import path from 'path'
 
 import store from '../../store'
@@ -7,8 +7,8 @@ import webPrefrences from '../webPreferences'
 import topRight from './topRight'
 
 export interface FrameInstance extends BrowserWindow {
-  frameId?: string,
-  views?: Record<string, BrowserView>,
+  frameId?: string
+  views?: Record<string, BrowserView>
   showingView?: string
 }
 
@@ -20,7 +20,7 @@ const place = (frameInstance: FrameInstance) => {
   const width = targetWidth > maxWidth ? maxWidth : targetWidth
   frameInstance.setMinimumSize(400, 300)
   frameInstance.setSize(width, height)
-  const pos = topRight(frameInstance) 
+  const pos = topRight(frameInstance)
   frameInstance.setPosition(pos.x - 400, pos.y + 80)
 }
 
@@ -28,9 +28,9 @@ export default {
   reposition: (frameInstance: FrameInstance) => {
     place(frameInstance)
   },
-  create: (frame: Frame) => {  
+  create: (frame: Frame) => {
     const preload = path.resolve(__dirname, process.env.BUNDLE_LOCATION, 'bridge.js')
-  
+
     const frameInstance: FrameInstance = new BrowserWindow({
       x: 0,
       y: 0,
@@ -44,15 +44,15 @@ export default {
       trafficLightPosition: { x: 10, y: 9 },
       backgroundColor: store('main.colorwayPrimary', store('main.colorway'), 'background'),
       icon: path.join(__dirname, './AppIcon.png'),
-      webPreferences: { ...webPrefrences, preload }
+      webPreferences: { ...webPrefrences, preload },
     })
 
     frameInstance.loadURL(`file://${process.env.BUNDLE_LOCATION}/dapp.html`)
-  
+
     frameInstance.on('ready-to-show', () => {
       frameInstance.show()
     })
-    
+
     frameInstance.showingView = ''
     frameInstance.frameId = frame.id
     frameInstance.views = {}
@@ -75,5 +75,5 @@ export default {
     // frameInstance.webContents.openDevTools({ mode: 'detach' })
 
     return frameInstance
-  }
+  },
 }
diff --git a/main/windows/frames/index.ts b/main/windows/frames/index.ts
index 8a49852b9..1f011c673 100644
--- a/main/windows/frames/index.ts
+++ b/main/windows/frames/index.ts
@@ -8,14 +8,14 @@ import store from '../../store'
 import frameInstances, { FrameInstance } from './frameInstances.js'
 import viewInstances from './viewInstances'
 
-function getFrames (): Record<string, Frame> {
+function getFrames(): Record<string, Frame> {
   return store('main.frames')
 }
 
 export default class FrameManager {
   private frameInstances: Record<string, FrameInstance> = {}
 
-  start () {
+  start() {
     store.observer(() => {
       const inFocus = store('main.focusedFrame')
 
@@ -27,14 +27,14 @@ export default class FrameManager {
     })
   }
 
-  manageFrames (frames: Record<string, Frame>, inFocus: string) {
+  manageFrames(frames: Record<string, Frame>, inFocus: string) {
     const frameIds = Object.keys(frames)
     const instanceIds = Object.keys(this.frameInstances)
-  
+
     // create an instance for each new frame in the store
     frameIds
-      .filter(frameId => !instanceIds.includes(frameId))
-      .forEach(frameId => {
+      .filter((frameId) => !instanceIds.includes(frameId))
+      .forEach((frameId) => {
         const frameInstance = frameInstances.create(frames[frameId])
 
         this.frameInstances[frameId] = frameInstance
@@ -55,7 +55,7 @@ export default class FrameManager {
         frameInstance.on('enter-full-screen', () => {
           store.updateFrame(frameId, { fullscreen: true })
         })
-        
+
         frameInstance.on('leave-full-screen', () => {
           const platform = store('platform')
           // Handle broken linux window events
@@ -81,14 +81,14 @@ export default class FrameManager {
           if (currentView && frameInstance) {
             frameInstance.views = frameInstance.views || {}
             frameInstance.views[currentView].webContents.focus()
-          } 
+          }
         })
       })
 
     // destroy each frame instance that is no longer in the store
     instanceIds
-      .filter(instanceId => !frameIds.includes(instanceId))
-      .forEach(instanceId => {
+      .filter((instanceId) => !frameIds.includes(instanceId))
+      .forEach((instanceId) => {
         const frameInstance = this.removeFrameInstance(instanceId)
 
         if (frameInstance) {
@@ -106,30 +106,30 @@ export default class FrameManager {
     }
   }
 
-  manageViews (frames: Record<string, Frame>) {
+  manageViews(frames: Record<string, Frame>) {
     const frameIds = Object.keys(frames)
-  
-    frameIds.forEach(frameId => {
+
+    frameIds.forEach((frameId) => {
       const frameInstance = this.frameInstances[frameId]
       if (!frameInstance) return log.error('Instance not found when managing views')
-  
+
       const frame = frames[frameId]
       const frameInstanceViews = frameInstance.views || {}
       const frameViewIds = Object.keys(frame.views)
       const instanceViewIds = Object.keys(frameInstanceViews)
-    
+
       instanceViewIds
-        .filter(instanceViewId => !frameViewIds.includes(instanceViewId))
-        .forEach(instanceViewId => viewInstances.destroy(frameInstance, instanceViewId))
-  
+        .filter((instanceViewId) => !frameViewIds.includes(instanceViewId))
+        .forEach((instanceViewId) => viewInstances.destroy(frameInstance, instanceViewId))
+
       // For each view in the store that belongs to this frame
-      frameViewIds.forEach(frameViewId => {
+      frameViewIds.forEach((frameViewId) => {
         const viewData = frame.views[frameViewId] || {}
         const viewInstance = frameInstanceViews[frameViewId] || {}
 
         // Create them
         if (!instanceViewIds.includes(frameViewId)) viewInstances.create(frameInstance, viewData)
-        
+
         // Show the correct one
         if (frame.currentView === frameViewId && viewData.ready && frameInstance.showingView !== frameViewId) {
           frameInstance.addBrowserView(viewInstance)
@@ -146,10 +146,10 @@ export default class FrameManager {
     })
   }
 
-  removeFrameInstance (frameId: string) {
+  removeFrameInstance(frameId: string) {
     const frameInstance = this.frameInstances[frameId]
 
-    Object.keys(frameInstance.views || {}).forEach(viewId => {
+    Object.keys(frameInstance.views || {}).forEach((viewId) => {
       viewInstances.destroy(frameInstance, viewId)
     })
 
@@ -162,34 +162,36 @@ export default class FrameManager {
     return frameInstance
   }
 
-  private sendMessageToFrame (frameId: string, channel: string, ...args: any) {
+  private sendMessageToFrame(frameId: string, channel: string, ...args: any) {
     const frameInstance = this.frameInstances[frameId]
 
     if (frameInstance && !frameInstance.isDestroyed()) {
       const webContents = frameInstance.webContents
       webContents.send(channel, ...args)
     } else {
-      log.error(new Error(`Tried to send a message to frame with id ${frameId} but it does not exist or has been destroyed`))
+      log.error(
+        new Error(`Tried to send a message to frame with id ${frameId} but it does not exist or has been destroyed`)
+      )
     }
   }
 
-  broadcast (channel: string, args: any[]) {
-    Object.keys(this.frameInstances).forEach(id => this.sendMessageToFrame(id, channel, ...args))
+  broadcast(channel: string, args: any[]) {
+    Object.keys(this.frameInstances).forEach((id) => this.sendMessageToFrame(id, channel, ...args))
   }
 
-  reloadFrames (style?: string) {
+  reloadFrames(style?: string) {
     if (style) {
-      Object.keys(this.frameInstances).forEach(win => {
+      Object.keys(this.frameInstances).forEach((win) => {
         this.frameInstances[win].webContents.send('main:reload:style', style)
       })
     } else {
-      Object.keys(this.frameInstances).forEach(win => {
+      Object.keys(this.frameInstances).forEach((win) => {
         this.frameInstances[win].webContents.reload()
       })
     }
   }
 
-  refocus (id: string) {
+  refocus(id: string) {
     const frameInstance = this.frameInstances[id]
     if (frameInstance) {
       const { x, y } = frameInstance.getBounds()
@@ -203,7 +205,7 @@ export default class FrameManager {
     }
   }
 
-  isFrameShowing () {
-    return Object.keys(this.frameInstances).some(win => this.frameInstances[win].isVisible())
+  isFrameShowing() {
+    return Object.keys(this.frameInstances).some((win) => this.frameInstances[win].isVisible())
   }
 }
diff --git a/main/windows/frames/topRight.ts b/main/windows/frames/topRight.ts
index 152d9b285..92393389e 100644
--- a/main/windows/frames/topRight.ts
+++ b/main/windows/frames/topRight.ts
@@ -7,6 +7,6 @@ export default (window: FrameInstance) => {
   const windowSize = window.getSize()
   return {
     x: Math.floor(screenSize.x + screenSize.width - windowSize[0]),
-    y: screenSize.y
+    y: screenSize.y,
   }
 }
diff --git a/main/windows/frames/viewInstances.ts b/main/windows/frames/viewInstances.ts
index 206267aed..f41498ce1 100644
--- a/main/windows/frames/viewInstances.ts
+++ b/main/windows/frames/viewInstances.ts
@@ -1,4 +1,4 @@
-import { BrowserView }  from 'electron'
+import { BrowserView } from 'electron'
 import path from 'path'
 import { URL } from 'url'
 import log from 'electron-log'
@@ -11,11 +11,11 @@ import webPreferences from '../webPreferences'
 import server from '../../dapps/server'
 
 interface extract {
-  session: string, 
+  session: string
   ens: string
 }
 
-const extract = (l: string) : extract => {
+const extract = (l: string): extract => {
   const url = new URL(l)
   const session = url.searchParams.get('session') || ''
   const ens = url.port === '8421' ? url.hostname.replace('.localhost', '') || '' : ''
@@ -25,37 +25,41 @@ const extract = (l: string) : extract => {
 export default {
   // Create a view instance on a frame
   create: (frameInstance: FrameInstance, view: ViewMetadata) => {
-    const viewInstance = new BrowserView({ 
-      webPreferences: Object.assign({ 
-        preload: path.resolve('./main/windows/viewPreload.js'),
-        partition: 'persist:' + view.ens
-      }, webPreferences)
+    const viewInstance = new BrowserView({
+      webPreferences: Object.assign(
+        {
+          preload: path.resolve('./main/windows/viewPreload.js'),
+          partition: 'persist:' + view.ens,
+        },
+        webPreferences
+      ),
     })
-  
-    viewInstance.webContents.on('will-navigate', e => e.preventDefault())
-    viewInstance.webContents.on('will-attach-webview', e => e.preventDefault())
-    viewInstance.webContents.on('new-window', e => e.preventDefault())
+
+    viewInstance.webContents.on('will-navigate', (e) => e.preventDefault())
+    viewInstance.webContents.on('will-attach-webview', (e) => e.preventDefault())
+    viewInstance.webContents.on('new-window', (e) => e.preventDefault())
 
     const { session } = extract(view.url)
 
     viewInstance.webContents.session.webRequest.onBeforeSendHeaders((details, cb) => {
       if (!details || !details.frame) return cb({ cancel: true }) // Reject the request\
 
-      const appUrl = details.frame.url   
-      
-      if ( // Initial request for app
-        details.resourceType === 'mainFrame' && 
-        details.url === view.url && 
+      const appUrl = details.frame.url
+
+      if (
+        // Initial request for app
+        details.resourceType === 'mainFrame' &&
+        details.url === view.url &&
         !appUrl
       ) {
         return cb({ requestHeaders: details.requestHeaders }) // Leave untouched
-      } 
-      else if ( // devtools:// request
+      } else if (
+        // devtools:// request
         details.url.startsWith('devtools://')
       ) {
         return cb({ requestHeaders: details.requestHeaders }) // Leave untouched
-      } 
-      else if ( // Reqest from app
+      } else if (
+        // Reqest from app
         appUrl === view.url
       ) {
         const { ens, session } = extract(appUrl)
@@ -65,8 +69,7 @@ export default {
           details.requestHeaders['Origin'] = view.ens
           return cb({ requestHeaders: details.requestHeaders })
         }
-      } 
-      else {
+      } else {
         return cb({ cancel: true }) // Reject the request
       }
     })
@@ -77,28 +80,38 @@ export default {
 
     frameInstance.addBrowserView(viewInstance)
 
-    viewInstance.setBounds({ x: 0, y: fullscreen ? 0 : 32, width: width, height: fullscreen ? height : height - 32})
+    viewInstance.setBounds({
+      x: 0,
+      y: fullscreen ? 0 : 32,
+      width: width,
+      height: fullscreen ? height : height - 32,
+    })
 
     viewInstance.setAutoResize({ width: true, height: true })
-  
+
     viewInstance.webContents.setVisualZoomLevelLimits(1, 3)
-  
+
     frameInstance.removeBrowserView(viewInstance)
 
     // viewInstance.webContents.openDevTools({ mode: 'detach' })
 
-    viewInstance.webContents.session.cookies.set({
-      url: view.url,
-      name: '__frameSession', 
-      value: session
-    }).then(() => {
-      viewInstance.webContents.loadURL(view.url)
-    }, error => log.error(error))
+    viewInstance.webContents.session.cookies
+      .set({
+        url: view.url,
+        name: '__frameSession',
+        value: session,
+      })
+      .then(
+        () => {
+          viewInstance.webContents.loadURL(view.url)
+        },
+        (error) => log.error(error)
+      )
 
     viewInstance.webContents.on('did-finish-load', () => {
       store.updateFrameView(frameInstance.frameId, view.id, { ready: true })
     })
-  
+
     // Keep reference to view on frame instance
     frameInstance.views = { ...(frameInstance.views || {}), [view.id]: viewInstance }
   },
@@ -113,7 +126,7 @@ export default {
 
     if (frameInstance && !frameInstance.isDestroyed()) frameInstance.removeBrowserView(views[viewId])
 
-    const webcontents = (views[viewId].webContents as any)
+    const webcontents = views[viewId].webContents as any
     webcontents.destroy()
 
     delete views[viewId]
@@ -124,9 +137,14 @@ export default {
     const viewInstance = (frameInstance.views || {})[viewId]
     if (viewInstance) {
       const { width, height } = frameInstance.getBounds()
-      viewInstance.setBounds({ x: 0, y: fullscreen ? 0 : 32, width: width, height: fullscreen ? height : height - 32})
+      viewInstance.setBounds({
+        x: 0,
+        y: fullscreen ? 0 : 32,
+        width: width,
+        height: fullscreen ? height : height - 32,
+      })
       // viewInstance.setBounds({ x: 73, y: 16, width: width - 73, height: height - 16 })
       viewInstance.setAutoResize({ width: true, height: true })
     }
-  }
+  },
 }
diff --git a/main/windows/index.ts b/main/windows/index.ts
index 684b88ccd..e8eafa31d 100644
--- a/main/windows/index.ts
+++ b/main/windows/index.ts
@@ -1,4 +1,14 @@
-import { app, BrowserWindow, ipcMain, screen, Tray as ElectronTray, Menu, globalShortcut, IpcMainEvent, WebContents } from 'electron'
+import {
+  app,
+  BrowserWindow,
+  ipcMain,
+  screen,
+  Tray as ElectronTray,
+  Menu,
+  globalShortcut,
+  IpcMainEvent,
+  WebContents,
+} from 'electron'
 import path from 'path'
 import log from 'electron-log'
 import EventEmitter from 'events'
@@ -29,7 +39,7 @@ const topRight = (window: BrowserWindow) => {
   const windowSize = window.getSize()
   return {
     x: Math.floor(screenSize.x + screenSize.width - windowSize[0]),
-    y: screenSize.y
+    y: screenSize.y,
   }
 }
 
@@ -38,9 +48,9 @@ const detectMouse = () => {
   const display = screen.getDisplayNearestPoint(m1)
   const area = display.workArea
   const bounds = display.bounds
-  const minX = (area.width + area.x) - 2
+  const minX = area.width + area.x - 2
   const center = (area.height + (area.y - bounds.y)) / 2
-  const margin = ((area.height + (area.y - bounds.y)) / 2) - 5
+  const margin = (area.height + (area.y - bounds.y)) / 2 - 5
   m1.y = m1.y - area.y
   const minY = center - margin
   const maxY = center + margin
@@ -61,7 +71,7 @@ const detectMouse = () => {
   }, 50)
 }
 
-function initDashWindow () {
+function initDashWindow() {
   windows.dash = new BrowserWindow({
     width: trayWidth,
     frame: false,
@@ -75,15 +85,15 @@ function initDashWindow () {
       sandbox: true,
       disableBlinkFeatures: 'Auxclick',
       preload: path.resolve(process.env.BUNDLE_LOCATION, 'bridge.js'),
-      backgroundThrottling: false // Allows repaint when window is hidden
-    }
+      backgroundThrottling: false, // Allows repaint when window is hidden
+    },
   })
 
   const dashUrl = new URL(path.join(process.env.BUNDLE_LOCATION, 'dash.html'), 'file:')
   windows.dash.loadURL(dashUrl.toString())
 }
 
-function initTrayWindow () {
+function initTrayWindow() {
   windows.tray = new BrowserWindow({
     width: trayWidth,
     frame: false,
@@ -98,17 +108,17 @@ function initTrayWindow () {
       sandbox: true,
       disableBlinkFeatures: 'Auxclick',
       preload: path.resolve(process.env.BUNDLE_LOCATION, 'bridge.js'),
-      backgroundThrottling: false // Allows repaint when window is hidden
-    }
+      backgroundThrottling: false, // Allows repaint when window is hidden
+    },
   })
 
   const trayUrl = new URL(path.join(process.env.BUNDLE_LOCATION, 'tray.html'), 'file:')
   windows.tray.loadURL(trayUrl.toString())
 
   windows.tray.on('closed', () => delete windows.tray)
-  windows.tray.webContents.on('will-navigate', e => e.preventDefault()) // Prevent navigation
-  windows.tray.webContents.on('will-attach-webview', e => e.preventDefault()) // Prevent attaching <webview>
-  windows.tray.webContents.on('new-window', e => e.preventDefault()) // Prevent new windows
+  windows.tray.webContents.on('will-navigate', (e) => e.preventDefault()) // Prevent navigation
+  windows.tray.webContents.on('will-attach-webview', (e) => e.preventDefault()) // Prevent attaching <webview>
+  windows.tray.webContents.on('new-window', (e) => e.preventDefault()) // Prevent new windows
   windows.tray.webContents.session.setPermissionRequestHandler((webContents, permission, res) => res(false))
   windows.tray.setResizable(false)
   windows.tray.setMovable(false)
@@ -116,7 +126,7 @@ function initTrayWindow () {
 
   const { width, height, x, y } = screen.getDisplayNearestPoint(screen.getCursorScreenPoint()).workArea
   windows.tray.setPosition(width + x, height + y)
-  
+
   if (process.platform === 'linux') {
     const quitMenuItem = { label: 'Quit', click: () => app.quit() }
     const menuShow = Menu.buildFromTemplate([{ label: 'Show', click: () => tray.show() }, quitMenuItem])
@@ -131,11 +141,11 @@ function initTrayWindow () {
       windows.tray.on('focus', () => tray.show())
     }, 2000)
   }
-  
+
   if (isDev) {
     windows.tray.webContents.openDevTools()
   }
-  
+
   setTimeout(() => {
     windows.tray.on('blur', () => {
       const frameShowing = frameManager.isFrameShowing()
@@ -168,8 +178,10 @@ class Tray {
   private electronTray: ElectronTray
   private readyHandler: () => void
 
-  constructor () {
-    this.electronTray = new ElectronTray(path.join(__dirname, process.platform === 'darwin' ? './IconTemplate.png' : './Icon.png'))
+  constructor() {
+    this.electronTray = new ElectronTray(
+      path.join(__dirname, process.platform === 'darwin' ? './IconTemplate.png' : './Icon.png')
+    )
     this.ready = false
     this.gasObserver = store.observer(() => {
       let title = ''
@@ -197,36 +209,36 @@ class Tray {
     initTrayWindow()
   }
 
-  isReady () {
+  isReady() {
     return this.ready
   }
 
-  setContextMenu (menu: Menu) {
+  setContextMenu(menu: Menu) {
     return this.electronTray.setContextMenu(menu)
   }
 
-  hide (autohide: boolean = false) {
-    store.toggleDash('hide');
+  hide(autohide: boolean = false) {
+    store.toggleDash('hide')
     if (autohide) {
-        this.recentAutohide = true;
-        clearTimeout(this.recentAutoHideTimeout);
-        this.recentAutoHideTimeout = setTimeout(() => {
-            this.recentAutohide = false;
-        }, 50);
+      this.recentAutohide = true
+      clearTimeout(this.recentAutoHideTimeout)
+      this.recentAutoHideTimeout = setTimeout(() => {
+        this.recentAutohide = false
+      }, 50)
     }
 
     if (windows && windows.tray) {
-        store.trayOpen(false)
-        if (store('main.reveal')) {
-          detectMouse()
-        }
-        windows.tray.emit('hide')
-        windows.tray.hide()
-        events.emit('tray:hide')
+      store.trayOpen(false)
+      if (store('main.reveal')) {
+        detectMouse()
+      }
+      windows.tray.emit('hide')
+      windows.tray.hide()
+      events.emit('tray:hide')
     }
   }
 
-  public show () {
+  public show() {
     clearTimeout(mouseTimeout)
     if (!windows.tray) {
       return init()
@@ -253,30 +265,30 @@ class Tray {
     windows.tray.setVisibleOnAllWorkspaces(false, { visibleOnFullScreen: true })
   }
 
-  toggle () {
+  toggle() {
     if (this.recentAutohide) return
     const showing = (windows.tray as BrowserWindow).isVisible()
     showing ? this.hide() : this.show()
   }
 
-  destroy () {
+  destroy() {
     this.gasObserver.remove()
     ipcMain.off('tray:ready', this.readyHandler)
   }
 }
 
 class Dash {
-  constructor () {
+  constructor() {
     initDashWindow()
   }
 
-  public hide () {
+  public hide() {
     if (windows.dash && windows.dash.isVisible()) {
       windows.dash.hide()
     }
   }
 
-  public show () {
+  public show() {
     if (!tray.isReady()) {
       return
     }
@@ -286,7 +298,7 @@ class Dash {
       windows.dash.setResizable(false) // Keeps height consistent
       const area = screen.getDisplayNearestPoint(screen.getCursorScreenPoint()).workArea
       windows.dash.setSize(trayWidth, isDev && !fullheight ? 740 : area.height)
-      const {x, y} = topRight(windows.dash)
+      const { x, y } = topRight(windows.dash)
       windows.dash.setPosition(x - trayWidth - 5, y)
       windows.dash.show()
       windows.dash.focus()
@@ -307,9 +319,9 @@ ipcMain.on('tray:mouseout', () => {
 })
 
 app.on('web-contents-created', (_e, contents) => {
-  contents.on('will-navigate', e => e.preventDefault())
-  contents.on('will-attach-webview', e => e.preventDefault())
-  contents.on('new-window', e => e.preventDefault())
+  contents.on('will-navigate', (e) => e.preventDefault())
+  contents.on('will-attach-webview', (e) => e.preventDefault())
+  contents.on('new-window', (e) => e.preventDefault())
 })
 
 app.on('ready', () => {
@@ -317,9 +329,9 @@ app.on('ready', () => {
 })
 
 if (isDev) {
-    app.on('ready', () => {
+  app.on('ready', () => {
     globalShortcut.register('CommandOrControl+R', () => {
-      Object.keys(windows).forEach(win => {
+      Object.keys(windows).forEach((win) => {
         windows[win].reload()
       })
 
@@ -329,8 +341,8 @@ if (isDev) {
   if (process.env.BUNDLE_LOCATION) {
     const watch = require('node-watch')
     watch(path.resolve(process.env.BUNDLE_LOCATION), { recursive: true }, (_evt: Event, name: string) => {
-    if (name.indexOf('css') > -1) {
-        Object.keys(windows).forEach(win => {
+      if (name.indexOf('css') > -1) {
+        Object.keys(windows).forEach((win) => {
           windows[win].webContents.send('main:reload:style', name)
         })
         frameManager.reloadFrames(name)
@@ -365,15 +377,15 @@ const send = (id: string, channel: string, ...args: string[]) => {
 }
 
 const broadcast = (channel: string, ...args: string[]) => {
-  Object.keys(windows).forEach(id => send(id, channel, ...args))
+  Object.keys(windows).forEach((id) => send(id, channel, ...args))
   frameManager.broadcast(channel, args)
 }
 
 // Data Change Events
 store.observer(() => broadcast('permissions', JSON.stringify(store('permissions'))))
 store.api.feed((_state, actions) => {
-  actions.forEach(action => {
-    action.updates.forEach(update => {
+  actions.forEach((action) => {
+    action.updates.forEach((update) => {
       broadcast('main:action', 'pathSync', update.path, update.value)
     })
   })
@@ -383,31 +395,31 @@ export default {
   toggleTray: () => {
     tray.toggle()
   },
-  showTray () {
+  showTray() {
     tray.show()
   },
-  showDash () {
+  showDash() {
     dash.show()
   },
-  hideDash () {
+  hideDash() {
     dash.hide()
   },
-  refocusFrame (frameId: string) {
+  refocusFrame(frameId: string) {
     frameManager.refocus(frameId)
   },
-  close (e: IpcMainEvent) {
+  close(e: IpcMainEvent) {
     windowFromWebContents(e.sender).close()
   },
-  max (e: IpcMainEvent) {
+  max(e: IpcMainEvent) {
     windowFromWebContents(e.sender).maximize()
   },
-  unmax (e: IpcMainEvent) {
+  unmax(e: IpcMainEvent) {
     windowFromWebContents(e.sender).unmaximize()
   },
-  min (e: IpcMainEvent) {
+  min(e: IpcMainEvent) {
     windowFromWebContents(e.sender).minimize()
   },
   send,
   broadcast,
-  init
+  init,
 }
diff --git a/main/windows/viewPreload.ts b/main/windows/viewPreload.ts
index 693d02cd9..b393fc521 100644
--- a/main/windows/viewPreload.ts
+++ b/main/windows/viewPreload.ts
@@ -1,10 +1,14 @@
-document.addEventListener('DOMContentLoaded', () => {
-  document.body.style.opacity = '0'
-  const bg = document.body.style.backgroundColor
-  document.body.style.backgroundColor = 'transparent'
-  document.documentElement.style.backgroundColor = 'transparent'
-  requestAnimationFrame(() => {
-    document.body.style.backgroundColor = bg
-    document.body.style.opacity = '1'
-  })
-}, false)
+document.addEventListener(
+  'DOMContentLoaded',
+  () => {
+    document.body.style.opacity = '0'
+    const bg = document.body.style.backgroundColor
+    document.body.style.backgroundColor = 'transparent'
+    document.documentElement.style.backgroundColor = 'transparent'
+    requestAnimationFrame(() => {
+      document.body.style.backgroundColor = bg
+      document.body.style.opacity = '1'
+    })
+  },
+  false
+)
diff --git a/main/windows/webPreferences.ts b/main/windows/webPreferences.ts
index 8042bd559..6ce9b9a47 100644
--- a/main/windows/webPreferences.ts
+++ b/main/windows/webPreferences.ts
@@ -9,5 +9,5 @@ export default {
   navigateOnDragDrop: false,
   enableRemoteModule: false,
   disableBlinkFeatures: 'Auxclick',
-  paintWhenInitiallyHidden: true
+  paintWhenInitiallyHidden: true,
 }
diff --git a/package-lock.json b/package-lock.json
index 541c08efd..44ccbc802 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -92,16 +92,18 @@
         "electron-builder": "23.0.3",
         "electron-notarize": "1.2.1",
         "hardhat": "2.9.9",
+        "husky": "8.0.1",
         "jest": "28.1.1",
         "jest-environment-jsdom": "28.1.1",
+        "lint-staged": "^13.0.3",
         "node-abi": "3.22.0",
         "node-gyp": "9.0.0",
         "node-watch": "0.7.3",
         "parcel-bundler": "1.12.3",
         "prebuild-install": "7.1.1",
+        "prettier": "2.7.1",
         "rimraf": "3.0.2",
         "shx": "0.3.4",
-        "standardx": "7.0.0",
         "stylus": "0.58.1",
         "ts-jest": "28.0.5",
         "typescript": "4.7.3"
@@ -2934,6 +2936,7 @@
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.3.0.tgz",
       "integrity": "sha512-1JTKgrOKAHVivSvOYw+sJOunkBjUOvjqWk1DPja7ZFhIS2mX/4EgTT8M7eTK9jrKhL/FvXXEbQwIs3pg1xp3dg==",
+      "peer": true,
       "dependencies": {
         "ajv": "^6.12.4",
         "debug": "^4.1.1",
@@ -2954,6 +2957,7 @@
       "version": "6.12.6",
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
       "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+      "peer": true,
       "dependencies": {
         "fast-deep-equal": "^3.1.1",
         "fast-json-stable-stringify": "^2.0.0",
@@ -2969,6 +2973,7 @@
       "version": "1.0.10",
       "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
       "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+      "peer": true,
       "dependencies": {
         "sprintf-js": "~1.0.2"
       }
@@ -2977,6 +2982,7 @@
       "version": "12.4.0",
       "resolved": "https://registry.npmjs.org/globals/-/globals-12.4.0.tgz",
       "integrity": "sha512-BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg==",
+      "peer": true,
       "dependencies": {
         "type-fest": "^0.8.1"
       },
@@ -2991,6 +2997,7 @@
       "version": "3.14.1",
       "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
       "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
+      "peer": true,
       "dependencies": {
         "argparse": "^1.0.7",
         "esprima": "^4.0.0"
@@ -3002,17 +3009,20 @@
     "node_modules/@eslint/eslintrc/node_modules/json-schema-traverse": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+      "peer": true
     },
     "node_modules/@eslint/eslintrc/node_modules/sprintf-js": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
-      "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g=="
+      "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==",
+      "peer": true
     },
     "node_modules/@eslint/eslintrc/node_modules/type-fest": {
       "version": "0.8.1",
       "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
       "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
+      "peer": true,
       "engines": {
         "node": ">=8"
       }
@@ -6792,12 +6802,6 @@
         "@types/tough-cookie": "*"
       }
     },
-    "node_modules/@types/json5": {
-      "version": "0.0.29",
-      "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",
-      "integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==",
-      "dev": true
-    },
     "node_modules/@types/level-errors": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/@types/level-errors/-/level-errors-3.0.0.tgz",
@@ -7370,6 +7374,7 @@
       "version": "5.3.2",
       "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
       "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
+      "peer": true,
       "peerDependencies": {
         "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
       }
@@ -7746,25 +7751,6 @@
       "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
       "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg=="
     },
-    "node_modules/array-includes": {
-      "version": "3.1.5",
-      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.5.tgz",
-      "integrity": "sha512-iSDYZMMyTPkiFasVqfuAQnWAYcvO/SeBSCGKePoEthjp4LEMTe4uLc7b025o4jAZpHhihh8xPo99TNWUWWkGDQ==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.19.5",
-        "get-intrinsic": "^1.1.1",
-        "is-string": "^1.0.7"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
     "node_modules/array-unique": {
       "version": "0.3.2",
       "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
@@ -7774,42 +7760,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/array.prototype.flat": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.0.tgz",
-      "integrity": "sha512-12IUEkHsAhA4DY5s0FPgNXIdc8VRSqD9Zp78a5au9abH/SOBrsp082JOWFNTjkMozh8mqcdiKuaLGhPeYztxSw==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.2",
-        "es-shim-unscopables": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/array.prototype.flatmap": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.0.tgz",
-      "integrity": "sha512-PZC9/8TKAIxcWKdyeb77EzULHPrIX/tIZebLJUQOMR1OwYosT8yggdfWScfTBCDj5utONvOuPQQumYsU2ULbkg==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.2",
-        "es-shim-unscopables": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
     "node_modules/array.prototype.reduce": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/array.prototype.reduce/-/array.prototype.reduce-1.0.4.tgz",
@@ -10063,7 +10013,6 @@
       "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-2.1.0.tgz",
       "integrity": "sha512-n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg==",
       "dev": true,
-      "optional": true,
       "dependencies": {
         "slice-ansi": "^3.0.0",
         "string-width": "^4.2.0"
@@ -10218,6 +10167,12 @@
         "color-support": "bin.js"
       }
     },
+    "node_modules/colorette": {
+      "version": "2.0.19",
+      "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.19.tgz",
+      "integrity": "sha512-3tlv/dIP7FWvj3BsbHrGLJ6l/oKh1O3TcgBqMn+yyCagOxc23fyzDS6HypQbgxWbkpDnf52p1LuR4eWDQ/K9WQ==",
+      "dev": true
+    },
     "node_modules/colors": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/colors/-/colors-1.0.3.tgz",
@@ -11904,6 +11859,7 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
       "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
+      "peer": true,
       "dependencies": {
         "esutils": "^2.0.2"
       },
@@ -12044,6 +12000,12 @@
       "resolved": "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz",
       "integrity": "sha512-CEj8FwwNA4cVH2uFCoHUrmojhYh1vmCdOaneKJXwkeY1i9jnlslVo9dx+hQ5Hl9GnH/Bwy/IjxAyOePyPKYnzA=="
     },
+    "node_modules/eastasianwidth": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz",
+      "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==",
+      "dev": true
+    },
     "node_modules/ecc-jsbn": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
@@ -12665,15 +12627,6 @@
       "integrity": "sha512-wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA==",
       "dev": true
     },
-    "node_modules/es-shim-unscopables": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz",
-      "integrity": "sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w==",
-      "dev": true,
-      "dependencies": {
-        "has": "^1.0.3"
-      }
-    },
     "node_modules/es-to-primitive": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
@@ -12837,6 +12790,7 @@
       "version": "7.18.0",
       "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.18.0.tgz",
       "integrity": "sha512-fbgTiE8BfUJZuBeq2Yi7J3RB3WGUQ9PNuNbmgi6jt9Iv8qrkxfy19Ds3OpL1Pm7zg3BtTVhvcUZbIRQ0wmSjAQ==",
+      "peer": true,
       "dependencies": {
         "@babel/code-frame": "^7.0.0",
         "@eslint/eslintrc": "^0.3.0",
@@ -12886,290 +12840,11 @@
         "url": "https://opencollective.com/eslint"
       }
     },
-    "node_modules/eslint-config-standard": {
-      "version": "16.0.3",
-      "resolved": "https://registry.npmjs.org/eslint-config-standard/-/eslint-config-standard-16.0.3.tgz",
-      "integrity": "sha512-x4fmJL5hGqNJKGHSjnLdgA6U6h1YW/G2dW9fA+cyVur4SK6lyue8+UgNKWlZtUDTXvgKDD/Oa3GQjmB5kjtVvg==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ],
-      "peerDependencies": {
-        "eslint": "^7.12.1",
-        "eslint-plugin-import": "^2.22.1",
-        "eslint-plugin-node": "^11.1.0",
-        "eslint-plugin-promise": "^4.2.1 || ^5.0.0"
-      }
-    },
-    "node_modules/eslint-config-standard-jsx": {
-      "version": "10.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-config-standard-jsx/-/eslint-config-standard-jsx-10.0.0.tgz",
-      "integrity": "sha512-hLeA2f5e06W1xyr/93/QJulN/rLbUVUmqTlexv9PRKHFwEC9ffJcH2LvJhMoEqYQBEYafedgGZXH2W8NUpt5lA==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ],
-      "peerDependencies": {
-        "eslint": "^7.12.1",
-        "eslint-plugin-react": "^7.21.5"
-      }
-    },
-    "node_modules/eslint-import-resolver-node": {
-      "version": "0.3.6",
-      "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.6.tgz",
-      "integrity": "sha512-0En0w03NRVMn9Uiyn8YRPDKvWjxCWkslUEhGNTdGx15RvPJYQ+lbOlqrlNI2vEAs4pDYK4f/HN2TbDmk5TP0iw==",
-      "dev": true,
-      "dependencies": {
-        "debug": "^3.2.7",
-        "resolve": "^1.20.0"
-      }
-    },
-    "node_modules/eslint-import-resolver-node/node_modules/debug": {
-      "version": "3.2.7",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
-      "dev": true,
-      "dependencies": {
-        "ms": "^2.1.1"
-      }
-    },
-    "node_modules/eslint-module-utils": {
-      "version": "2.7.3",
-      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.7.3.tgz",
-      "integrity": "sha512-088JEC7O3lDZM9xGe0RerkOMd0EjFl+Yvd1jPWIkMT5u3H9+HC34mWWPnqPrN13gieT9pBOO+Qt07Nb/6TresQ==",
-      "dev": true,
-      "dependencies": {
-        "debug": "^3.2.7",
-        "find-up": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/eslint-module-utils/node_modules/debug": {
-      "version": "3.2.7",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
-      "dev": true,
-      "dependencies": {
-        "ms": "^2.1.1"
-      }
-    },
-    "node_modules/eslint-plugin-es": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-es/-/eslint-plugin-es-3.0.1.tgz",
-      "integrity": "sha512-GUmAsJaN4Fc7Gbtl8uOBlayo2DqhwWvEzykMHSCZHU3XdJ+NSzzZcVhXh3VxX5icqQ+oQdIEawXX8xkR3mIFmQ==",
-      "dev": true,
-      "dependencies": {
-        "eslint-utils": "^2.0.0",
-        "regexpp": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8.10.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/mysticatea"
-      },
-      "peerDependencies": {
-        "eslint": ">=4.19.1"
-      }
-    },
-    "node_modules/eslint-plugin-import": {
-      "version": "2.24.2",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.24.2.tgz",
-      "integrity": "sha512-hNVtyhiEtZmpsabL4neEj+6M5DCLgpYyG9nzJY8lZQeQXEn5UPW1DpUdsMHMXsq98dbNm7nt1w9ZMSVpfJdi8Q==",
-      "dev": true,
-      "dependencies": {
-        "array-includes": "^3.1.3",
-        "array.prototype.flat": "^1.2.4",
-        "debug": "^2.6.9",
-        "doctrine": "^2.1.0",
-        "eslint-import-resolver-node": "^0.3.6",
-        "eslint-module-utils": "^2.6.2",
-        "find-up": "^2.0.0",
-        "has": "^1.0.3",
-        "is-core-module": "^2.6.0",
-        "minimatch": "^3.0.4",
-        "object.values": "^1.1.4",
-        "pkg-up": "^2.0.0",
-        "read-pkg-up": "^3.0.0",
-        "resolve": "^1.20.0",
-        "tsconfig-paths": "^3.11.0"
-      },
-      "engines": {
-        "node": ">=4"
-      },
-      "peerDependencies": {
-        "eslint": "^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0"
-      }
-    },
-    "node_modules/eslint-plugin-import/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
-    "node_modules/eslint-plugin-import/node_modules/doctrine": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
-      "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
-      "dev": true,
-      "dependencies": {
-        "esutils": "^2.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/eslint-plugin-import/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-      "dev": true
-    },
-    "node_modules/eslint-plugin-import/node_modules/pkg-up": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/pkg-up/-/pkg-up-2.0.0.tgz",
-      "integrity": "sha512-fjAPuiws93rm7mPUu21RdBnkeZNrbfCFCwfAhPWY+rR3zG0ubpe5cEReHOw5fIbfmsxEV/g2kSxGTATY3Bpnwg==",
-      "dev": true,
-      "dependencies": {
-        "find-up": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/eslint-plugin-node": {
-      "version": "11.1.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-node/-/eslint-plugin-node-11.1.0.tgz",
-      "integrity": "sha512-oUwtPJ1W0SKD0Tr+wqu92c5xuCeQqB3hSCHasn/ZgjFdA9iDGNkNf2Zi9ztY7X+hNuMib23LNGRm6+uN+KLE3g==",
-      "dev": true,
-      "dependencies": {
-        "eslint-plugin-es": "^3.0.0",
-        "eslint-utils": "^2.0.0",
-        "ignore": "^5.1.1",
-        "minimatch": "^3.0.4",
-        "resolve": "^1.10.1",
-        "semver": "^6.1.0"
-      },
-      "engines": {
-        "node": ">=8.10.0"
-      },
-      "peerDependencies": {
-        "eslint": ">=5.16.0"
-      }
-    },
-    "node_modules/eslint-plugin-node/node_modules/ignore": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz",
-      "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==",
-      "dev": true,
-      "engines": {
-        "node": ">= 4"
-      }
-    },
-    "node_modules/eslint-plugin-node/node_modules/semver": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver.js"
-      }
-    },
-    "node_modules/eslint-plugin-promise": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-promise/-/eslint-plugin-promise-5.1.1.tgz",
-      "integrity": "sha512-XgdcdyNzHfmlQyweOPTxmc7pIsS6dE4MvwhXWMQ2Dxs1XAL2GJDilUsjWen6TWik0aSI+zD/PqocZBblcm9rdA==",
-      "dev": true,
-      "engines": {
-        "node": "^10.12.0 || >=12.0.0"
-      },
-      "peerDependencies": {
-        "eslint": "^7.0.0"
-      }
-    },
-    "node_modules/eslint-plugin-react": {
-      "version": "7.25.3",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.25.3.tgz",
-      "integrity": "sha512-ZMbFvZ1WAYSZKY662MBVEWR45VaBT6KSJCiupjrNlcdakB90juaZeDCbJq19e73JZQubqFtgETohwgAt8u5P6w==",
-      "dev": true,
-      "dependencies": {
-        "array-includes": "^3.1.3",
-        "array.prototype.flatmap": "^1.2.4",
-        "doctrine": "^2.1.0",
-        "estraverse": "^5.2.0",
-        "jsx-ast-utils": "^2.4.1 || ^3.0.0",
-        "minimatch": "^3.0.4",
-        "object.entries": "^1.1.4",
-        "object.fromentries": "^2.0.4",
-        "object.hasown": "^1.0.0",
-        "object.values": "^1.1.4",
-        "prop-types": "^15.7.2",
-        "resolve": "^2.0.0-next.3",
-        "string.prototype.matchall": "^4.0.5"
-      },
-      "engines": {
-        "node": ">=4"
-      },
-      "peerDependencies": {
-        "eslint": "^3 || ^4 || ^5 || ^6 || ^7"
-      }
-    },
-    "node_modules/eslint-plugin-react/node_modules/doctrine": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
-      "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
-      "dev": true,
-      "dependencies": {
-        "esutils": "^2.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/eslint-plugin-react/node_modules/resolve": {
-      "version": "2.0.0-next.3",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.3.tgz",
-      "integrity": "sha512-W8LucSynKUIDu9ylraa7ueVZ7hc0uAgJBxVsQSKOXOyle8a93qXhcz+XAXZ8bIq2d6i4Ehddn6Evt+0/UwKk6Q==",
-      "dev": true,
-      "dependencies": {
-        "is-core-module": "^2.2.0",
-        "path-parse": "^1.0.6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
     "node_modules/eslint-scope": {
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
       "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
+      "peer": true,
       "dependencies": {
         "esrecurse": "^4.3.0",
         "estraverse": "^4.1.1"
@@ -13182,6 +12857,7 @@
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
       "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
+      "peer": true,
       "engines": {
         "node": ">=4.0"
       }
@@ -13190,6 +12866,7 @@
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz",
       "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==",
+      "peer": true,
       "dependencies": {
         "eslint-visitor-keys": "^1.1.0"
       },
@@ -13212,6 +12889,7 @@
       "version": "6.12.6",
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
       "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+      "peer": true,
       "dependencies": {
         "fast-deep-equal": "^3.1.1",
         "fast-json-stable-stringify": "^2.0.0",
@@ -13227,6 +12905,7 @@
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "peer": true,
       "dependencies": {
         "color-convert": "^2.0.1"
       },
@@ -13241,6 +12920,7 @@
       "version": "1.0.10",
       "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
       "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+      "peer": true,
       "dependencies": {
         "sprintf-js": "~1.0.2"
       }
@@ -13249,6 +12929,7 @@
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
       "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "peer": true,
       "dependencies": {
         "ansi-styles": "^4.1.0",
         "supports-color": "^7.1.0"
@@ -13264,6 +12945,7 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "peer": true,
       "dependencies": {
         "color-name": "~1.1.4"
       },
@@ -13274,12 +12956,14 @@
     "node_modules/eslint/node_modules/color-name": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "peer": true
     },
     "node_modules/eslint/node_modules/eslint-visitor-keys": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
       "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",
+      "peer": true,
       "engines": {
         "node": ">=10"
       }
@@ -13288,6 +12972,7 @@
       "version": "12.4.0",
       "resolved": "https://registry.npmjs.org/globals/-/globals-12.4.0.tgz",
       "integrity": "sha512-BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg==",
+      "peer": true,
       "dependencies": {
         "type-fest": "^0.8.1"
       },
@@ -13302,6 +12987,7 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "peer": true,
       "engines": {
         "node": ">=8"
       }
@@ -13310,6 +12996,7 @@
       "version": "3.14.1",
       "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
       "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
+      "peer": true,
       "dependencies": {
         "argparse": "^1.0.7",
         "esprima": "^4.0.0"
@@ -13321,17 +13008,20 @@
     "node_modules/eslint/node_modules/json-schema-traverse": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+      "peer": true
     },
     "node_modules/eslint/node_modules/sprintf-js": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
-      "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g=="
+      "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==",
+      "peer": true
     },
     "node_modules/eslint/node_modules/supports-color": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
       "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "peer": true,
       "dependencies": {
         "has-flag": "^4.0.0"
       },
@@ -13343,6 +13033,7 @@
       "version": "0.8.1",
       "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
       "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
+      "peer": true,
       "engines": {
         "node": ">=8"
       }
@@ -13351,6 +13042,7 @@
       "version": "7.3.1",
       "resolved": "https://registry.npmjs.org/espree/-/espree-7.3.1.tgz",
       "integrity": "sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g==",
+      "peer": true,
       "dependencies": {
         "acorn": "^7.4.0",
         "acorn-jsx": "^5.3.1",
@@ -13364,6 +13056,7 @@
       "version": "7.4.1",
       "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
       "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
+      "peer": true,
       "bin": {
         "acorn": "bin/acorn"
       },
@@ -13387,6 +13080,7 @@
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz",
       "integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==",
+      "peer": true,
       "dependencies": {
         "estraverse": "^5.1.0"
       },
@@ -13398,6 +13092,7 @@
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
       "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
+      "peer": true,
       "dependencies": {
         "estraverse": "^5.2.0"
       },
@@ -15017,6 +14712,7 @@
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
       "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
+      "peer": true,
       "dependencies": {
         "flat-cache": "^3.0.4"
       },
@@ -15201,6 +14897,7 @@
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz",
       "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==",
+      "peer": true,
       "dependencies": {
         "flatted": "^3.1.0",
         "rimraf": "^3.0.2"
@@ -15212,7 +14909,8 @@
     "node_modules/flatted": {
       "version": "3.2.5",
       "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.5.tgz",
-      "integrity": "sha512-WIWGi2L3DyTUvUrwRKgGi9TwxQMUEqPOPQBVi71R96jZXJdFskXEmf54BoZaS1kknGODoIGASGEzBUYdyMCBJg=="
+      "integrity": "sha512-WIWGi2L3DyTUvUrwRKgGi9TwxQMUEqPOPQBVi71R96jZXJdFskXEmf54BoZaS1kknGODoIGASGEzBUYdyMCBJg==",
+      "peer": true
     },
     "node_modules/follow-redirects": {
       "version": "1.5.10",
@@ -25573,18 +25271,6 @@
         "node": ">=4"
       }
     },
-    "node_modules/get-stdin": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-8.0.0.tgz",
-      "integrity": "sha512-sY22aA6xchAzprjyqmSEQv4UbAAzRN0L2dQB0NlN5acTTK9Don6nhoc3eAbUnpZiCANAMfd/+40kVdKfFygohg==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/get-stream": {
       "version": "5.2.0",
       "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
@@ -26960,6 +26646,21 @@
         "ms": "^2.0.0"
       }
     },
+    "node_modules/husky": {
+      "version": "8.0.1",
+      "resolved": "https://registry.npmjs.org/husky/-/husky-8.0.1.tgz",
+      "integrity": "sha512-xs7/chUH/CKdOCs7Zy0Aev9e/dKOMZf3K1Az1nar3tzlv0jfqnYtu235bstsWTmXOR0EfINrPa97yy4Lz6RiKw==",
+      "dev": true,
+      "bin": {
+        "husky": "lib/bin.js"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/typicode"
+      }
+    },
     "node_modules/iconv-corefoundation": {
       "version": "1.1.7",
       "resolved": "https://registry.npmjs.org/iconv-corefoundation/-/iconv-corefoundation-1.1.7.tgz",
@@ -27039,6 +26740,7 @@
       "version": "4.0.6",
       "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
       "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
+      "peer": true,
       "engines": {
         "node": ">= 4"
       }
@@ -27058,6 +26760,7 @@
       "version": "3.3.0",
       "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
       "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
+      "peer": true,
       "dependencies": {
         "parent-module": "^1.0.0",
         "resolve-from": "^4.0.0"
@@ -30650,7 +30353,8 @@
     "node_modules/json-stable-stringify-without-jsonify": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
-      "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw=="
+      "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==",
+      "peer": true
     },
     "node_modules/json-stringify-safe": {
       "version": "5.0.1",
@@ -30727,19 +30431,6 @@
         "extsprintf": "^1.2.0"
       }
     },
-    "node_modules/jsx-ast-utils": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.3.0.tgz",
-      "integrity": "sha512-XzO9luP6L0xkxwhIJMTJQpZo/eeN60K08jHdexfD569AGxeNug6UketeHXEhROoM8aR7EcUoOQmIhcJQjcuq8Q==",
-      "dev": true,
-      "dependencies": {
-        "array-includes": "^3.1.4",
-        "object.assign": "^4.1.2"
-      },
-      "engines": {
-        "node": ">=4.0"
-      }
-    },
     "node_modules/keccak": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/keccak/-/keccak-3.0.2.tgz",
@@ -31053,6 +30744,7 @@
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
       "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
+      "peer": true,
       "dependencies": {
         "prelude-ls": "^1.2.1",
         "type-check": "~0.4.0"
@@ -31074,12 +30766,324 @@
       "resolved": "https://registry.npmjs.org/immediate/-/immediate-3.0.6.tgz",
       "integrity": "sha512-XXOFtyqDjNDAQxVfYxuF7g9Il/IbWmmlQg2MYKOH8ExIT1qg6xc4zyS3HaEEATgs1btfzxq15ciUiY7gjSXRGQ=="
     },
+    "node_modules/lilconfig": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-2.0.5.tgz",
+      "integrity": "sha512-xaYmXZtTHPAw5m+xLN8ab9C+3a8YmV3asNSPOATITbtwrfbwaLJj8h66H1WMIpALCkqsIzK3h7oQ+PdX+LQ9Eg==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "node_modules/lines-and-columns": {
       "version": "1.2.4",
       "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
       "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==",
       "dev": true
     },
+    "node_modules/lint-staged": {
+      "version": "13.0.3",
+      "resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-13.0.3.tgz",
+      "integrity": "sha512-9hmrwSCFroTSYLjflGI8Uk+GWAwMB4OlpU4bMJEAT5d/llQwtYKoim4bLOyLCuWFAhWEupE0vkIFqtw/WIsPug==",
+      "dev": true,
+      "dependencies": {
+        "cli-truncate": "^3.1.0",
+        "colorette": "^2.0.17",
+        "commander": "^9.3.0",
+        "debug": "^4.3.4",
+        "execa": "^6.1.0",
+        "lilconfig": "2.0.5",
+        "listr2": "^4.0.5",
+        "micromatch": "^4.0.5",
+        "normalize-path": "^3.0.0",
+        "object-inspect": "^1.12.2",
+        "pidtree": "^0.6.0",
+        "string-argv": "^0.3.1",
+        "yaml": "^2.1.1"
+      },
+      "bin": {
+        "lint-staged": "bin/lint-staged.js"
+      },
+      "engines": {
+        "node": "^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/lint-staged"
+      }
+    },
+    "node_modules/lint-staged/node_modules/ansi-regex": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
+      "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
+      }
+    },
+    "node_modules/lint-staged/node_modules/ansi-styles": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.1.0.tgz",
+      "integrity": "sha512-VbqNsoz55SYGczauuup0MFUyXNQviSpFTj1RQtFzmQLk18qbVSpTFFGMT293rmDaQuKCT6InmbuEyUne4mTuxQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/lint-staged/node_modules/cli-truncate": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-3.1.0.tgz",
+      "integrity": "sha512-wfOBkjXteqSnI59oPcJkcPl/ZmwvMMOj340qUIY1SKZCv0B9Cf4D4fAucRkIKQmsIuYK3x1rrgU7MeGRruiuiA==",
+      "dev": true,
+      "dependencies": {
+        "slice-ansi": "^5.0.0",
+        "string-width": "^5.0.0"
+      },
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/lint-staged/node_modules/commander": {
+      "version": "9.3.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-9.3.0.tgz",
+      "integrity": "sha512-hv95iU5uXPbK83mjrJKuZyFM/LBAoCV/XhVGkS5Je6tl7sxr6A0ITMw5WoRV46/UaJ46Nllm3Xt7IaJhXTIkzw==",
+      "dev": true,
+      "engines": {
+        "node": "^12.20.0 || >=14"
+      }
+    },
+    "node_modules/lint-staged/node_modules/emoji-regex": {
+      "version": "9.2.2",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
+      "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
+      "dev": true
+    },
+    "node_modules/lint-staged/node_modules/execa": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/execa/-/execa-6.1.0.tgz",
+      "integrity": "sha512-QVWlX2e50heYJcCPG0iWtf8r0xjEYfz/OYLGDYH+IyjWezzPNxz63qNFOu0l4YftGWuizFVZHHs8PrLU5p2IDA==",
+      "dev": true,
+      "dependencies": {
+        "cross-spawn": "^7.0.3",
+        "get-stream": "^6.0.1",
+        "human-signals": "^3.0.1",
+        "is-stream": "^3.0.0",
+        "merge-stream": "^2.0.0",
+        "npm-run-path": "^5.1.0",
+        "onetime": "^6.0.0",
+        "signal-exit": "^3.0.7",
+        "strip-final-newline": "^3.0.0"
+      },
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sindresorhus/execa?sponsor=1"
+      }
+    },
+    "node_modules/lint-staged/node_modules/get-stream": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
+      "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/lint-staged/node_modules/human-signals": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-3.0.1.tgz",
+      "integrity": "sha512-rQLskxnM/5OCldHo+wNXbpVgDn5A17CUoKX+7Sokwaknlq7CdSnphy0W39GU8dw59XiCXmFXDg4fRuckQRKewQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=12.20.0"
+      }
+    },
+    "node_modules/lint-staged/node_modules/is-fullwidth-code-point": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-4.0.0.tgz",
+      "integrity": "sha512-O4L094N2/dZ7xqVdrXhh9r1KODPJpFms8B5sGdJLPy664AgvXsreZUyCQQNItZRDlYug4xStLjNp/sz3HvBowQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/lint-staged/node_modules/is-stream": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-3.0.0.tgz",
+      "integrity": "sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA==",
+      "dev": true,
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/lint-staged/node_modules/mimic-fn": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-4.0.0.tgz",
+      "integrity": "sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/lint-staged/node_modules/npm-run-path": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-5.1.0.tgz",
+      "integrity": "sha512-sJOdmRGrY2sjNTRMbSvluQqg+8X7ZK61yvzBEIDhz4f8z1TZFYABsqjjCBd/0PUNE9M6QDgHJXQkGUEm7Q+l9Q==",
+      "dev": true,
+      "dependencies": {
+        "path-key": "^4.0.0"
+      },
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/lint-staged/node_modules/onetime": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/onetime/-/onetime-6.0.0.tgz",
+      "integrity": "sha512-1FlR+gjXK7X+AsAHso35MnyN5KqGwJRi/31ft6x0M194ht7S+rWAvd7PHss9xSKMzE0asv1pyIHaJYq+BbacAQ==",
+      "dev": true,
+      "dependencies": {
+        "mimic-fn": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/lint-staged/node_modules/path-key": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-4.0.0.tgz",
+      "integrity": "sha512-haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/lint-staged/node_modules/slice-ansi": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-5.0.0.tgz",
+      "integrity": "sha512-FC+lgizVPfie0kkhqUScwRu1O/lF6NOgJmlCgK+/LYxDCTk8sGelYaHDhFcDN+Sn3Cv+3VSa4Byeo+IMCzpMgQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^6.0.0",
+        "is-fullwidth-code-point": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/slice-ansi?sponsor=1"
+      }
+    },
+    "node_modules/lint-staged/node_modules/string-width": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz",
+      "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==",
+      "dev": true,
+      "dependencies": {
+        "eastasianwidth": "^0.2.0",
+        "emoji-regex": "^9.2.2",
+        "strip-ansi": "^7.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/lint-staged/node_modules/strip-ansi": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.0.1.tgz",
+      "integrity": "sha512-cXNxvT8dFNRVfhVME3JAe98mkXDYN2O1l7jmcwMnOslDeESg1rF/OZMtK0nRAhiari1unG5cD4jG3rapUAkLbw==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
+      }
+    },
+    "node_modules/lint-staged/node_modules/strip-final-newline": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-3.0.0.tgz",
+      "integrity": "sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/listr2": {
+      "version": "4.0.5",
+      "resolved": "https://registry.npmjs.org/listr2/-/listr2-4.0.5.tgz",
+      "integrity": "sha512-juGHV1doQdpNT3GSTs9IUN43QJb7KHdF9uqg7Vufs/tG9VTzpFphqF4pm/ICdAABGQxsyNn9CiYA3StkI6jpwA==",
+      "dev": true,
+      "dependencies": {
+        "cli-truncate": "^2.1.0",
+        "colorette": "^2.0.16",
+        "log-update": "^4.0.0",
+        "p-map": "^4.0.0",
+        "rfdc": "^1.3.0",
+        "rxjs": "^7.5.5",
+        "through": "^2.3.8",
+        "wrap-ansi": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "peerDependencies": {
+        "enquirer": ">= 2.3.0 < 3"
+      },
+      "peerDependenciesMeta": {
+        "enquirer": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/listr2/node_modules/rxjs": {
+      "version": "7.5.5",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.5.5.tgz",
+      "integrity": "sha512-sy+H0pQofO95VDmFLzyaw9xNJU4KTRSwQIGM6+iG3SypAtCiLDzpeG8sJrNCWn2Up9km+KhkvTdbkrdy+yzZdw==",
+      "dev": true,
+      "dependencies": {
+        "tslib": "^2.1.0"
+      }
+    },
     "node_modules/load-json-file": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz",
@@ -31195,7 +31199,8 @@
     "node_modules/lodash.truncate": {
       "version": "4.4.2",
       "resolved": "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz",
-      "integrity": "sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw=="
+      "integrity": "sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==",
+      "peer": true
     },
     "node_modules/lodash.uniq": {
       "version": "4.5.0",
@@ -31289,6 +31294,113 @@
         "node": ">=8"
       }
     },
+    "node_modules/log-update": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/log-update/-/log-update-4.0.0.tgz",
+      "integrity": "sha512-9fkkDevMefjg0mmzWFBW8YkFP91OrizzkW3diF7CpG+S2EYdy4+TVfGwz1zeF8x7hCx1ovSPTOE9Ngib74qqUg==",
+      "dev": true,
+      "dependencies": {
+        "ansi-escapes": "^4.3.0",
+        "cli-cursor": "^3.1.0",
+        "slice-ansi": "^4.0.0",
+        "wrap-ansi": "^6.2.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/log-update/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/log-update/node_modules/cli-cursor": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz",
+      "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==",
+      "dev": true,
+      "dependencies": {
+        "restore-cursor": "^3.1.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/log-update/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/log-update/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/log-update/node_modules/restore-cursor": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz",
+      "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==",
+      "dev": true,
+      "dependencies": {
+        "onetime": "^5.1.0",
+        "signal-exit": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/log-update/node_modules/slice-ansi": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz",
+      "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "astral-regex": "^2.0.0",
+        "is-fullwidth-code-point": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/slice-ansi?sponsor=1"
+      }
+    },
+    "node_modules/log-update/node_modules/wrap-ansi": {
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
+      "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/long": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/long/-/long-4.0.0.tgz",
@@ -34143,37 +34255,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/object.entries": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.5.tgz",
-      "integrity": "sha512-TyxmjUoZggd4OrrU1W66FMDG6CuqJxsFvymeyXI51+vQLN67zYfZseptRge703kKQdo4uccgAKebXFcRCzk4+g==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/object.fromentries": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.5.tgz",
-      "integrity": "sha512-CAyG5mWQRRiBU57Re4FKoTBjXfDoNwdFVH2Y1tS9PqCsfUTymAohOkEMSG3aRNKmv4lV3O7p1et7c187q6bynw==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
     "node_modules/object.getownpropertydescriptors": {
       "version": "2.1.4",
       "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.4.tgz",
@@ -34192,19 +34273,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/object.hasown": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/object.hasown/-/object.hasown-1.1.1.tgz",
-      "integrity": "sha512-LYLe4tivNQzq4JdaWW6WO3HMZZJWzkkH8fnI6EebWl0VZth2wL2Lovm74ep2/gZzlaTdV62JZHEqHQ2yVn8Q/A==",
-      "dev": true,
-      "dependencies": {
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.19.5"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
     "node_modules/object.pick": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz",
@@ -34340,6 +34408,7 @@
       "version": "0.9.1",
       "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz",
       "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==",
+      "peer": true,
       "dependencies": {
         "deep-is": "^0.1.3",
         "fast-levenshtein": "^2.0.6",
@@ -35153,6 +35222,7 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
       "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
+      "peer": true,
       "dependencies": {
         "callsites": "^3.0.0"
       },
@@ -35535,6 +35605,18 @@
         "url": "https://github.com/sponsors/jonschlinkert"
       }
     },
+    "node_modules/pidtree": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/pidtree/-/pidtree-0.6.0.tgz",
+      "integrity": "sha512-eG2dWTVw5bzqGRztnHExczNxt5VGsE6OwTeCG3fdUf9KBsZzO3R5OIIIzWR+iZA0NtZ+RDVdaoE2dK1cn6jH4g==",
+      "dev": true,
+      "bin": {
+        "pidtree": "bin/pidtree.js"
+      },
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
     "node_modules/pify": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
@@ -35571,136 +35653,6 @@
         "node": ">= 6"
       }
     },
-    "node_modules/pkg-conf": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/pkg-conf/-/pkg-conf-3.1.0.tgz",
-      "integrity": "sha512-m0OTbR/5VPNPqO1ph6Fqbj7Hv6QU7gR/tQW40ZqrL1rjgCU85W6C1bJn0BItuJqnR98PWzw7Z8hHeChD1WrgdQ==",
-      "dev": true,
-      "dependencies": {
-        "find-up": "^3.0.0",
-        "load-json-file": "^5.2.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/pkg-conf/node_modules/find-up": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
-      "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
-      "dev": true,
-      "dependencies": {
-        "locate-path": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/pkg-conf/node_modules/load-json-file": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-5.3.0.tgz",
-      "integrity": "sha512-cJGP40Jc/VXUsp8/OrnyKyTZ1y6v/dphm3bioS+RrKXjK2BB6wHUd6JptZEFDGgGahMT+InnZO5i1Ei9mpC8Bw==",
-      "dev": true,
-      "dependencies": {
-        "graceful-fs": "^4.1.15",
-        "parse-json": "^4.0.0",
-        "pify": "^4.0.1",
-        "strip-bom": "^3.0.0",
-        "type-fest": "^0.3.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/pkg-conf/node_modules/locate-path": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
-      "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
-      "dev": true,
-      "dependencies": {
-        "p-locate": "^3.0.0",
-        "path-exists": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/pkg-conf/node_modules/p-limit": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-      "dev": true,
-      "dependencies": {
-        "p-try": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/pkg-conf/node_modules/p-locate": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
-      "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
-      "dev": true,
-      "dependencies": {
-        "p-limit": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/pkg-conf/node_modules/p-try": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/pkg-conf/node_modules/parse-json": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
-      "integrity": "sha512-aOIos8bujGN93/8Ox/jPLh7RwVnPEysynVFE+fQZyg6jKELEHwzgKdLRFHUgXJL6kylijVSBC4BvN9OmsB48Rw==",
-      "dev": true,
-      "dependencies": {
-        "error-ex": "^1.3.1",
-        "json-parse-better-errors": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/pkg-conf/node_modules/pify": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
-      "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/pkg-conf/node_modules/strip-bom": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
-      "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/pkg-conf/node_modules/type-fest": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.3.1.tgz",
-      "integrity": "sha512-cUGJnCdr4STbePCgqNFbpVNCepa+kAVohJs1sLhxzdH+gnEoOd8VhbYa7pD3zZYGiURWM2xzEII3fQcRizDkYQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/pkg-dir": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz",
@@ -36652,6 +36604,7 @@
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
       "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
+      "peer": true,
       "engines": {
         "node": ">= 0.8.0"
       }
@@ -36665,11 +36618,10 @@
       }
     },
     "node_modules/prettier": {
-      "version": "2.7.0",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.7.0.tgz",
-      "integrity": "sha512-nwoX4GMFgxoPC6diHvSwmK/4yU8FFH3V8XWtLQrbj4IBsK2pkYhG4kf/ljF/haaZ/aii+wNJqISrCDPgxGWDVQ==",
+      "version": "2.7.1",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.7.1.tgz",
+      "integrity": "sha512-ujppO+MkdPqoVINuDFDRLClm7D78qbDt0/NR+wp5FqEZOoTNAjPHWj17QRhu7geIHJfcNhRk1XVQmF8Bp3ye+g==",
       "dev": true,
-      "peer": true,
       "bin": {
         "prettier": "bin-prettier.js"
       },
@@ -37443,6 +37395,7 @@
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz",
       "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==",
+      "peer": true,
       "engines": {
         "node": ">=8"
       },
@@ -37763,6 +37716,7 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
       "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
+      "peer": true,
       "engines": {
         "node": ">=4"
       }
@@ -37848,6 +37802,12 @@
         "node": ">= 4"
       }
     },
+    "node_modules/rfdc": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.3.0.tgz",
+      "integrity": "sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA==",
+      "dev": true
+    },
     "node_modules/rgb-regex": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/rgb-regex/-/rgb-regex-1.0.1.tgz",
@@ -38554,7 +38514,6 @@
       "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-3.0.0.tgz",
       "integrity": "sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==",
       "dev": true,
-      "optional": true,
       "dependencies": {
         "ansi-styles": "^4.0.0",
         "astral-regex": "^2.0.0",
@@ -38569,7 +38528,6 @@
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
-      "optional": true,
       "dependencies": {
         "color-convert": "^2.0.1"
       },
@@ -38585,7 +38543,6 @@
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dev": true,
-      "optional": true,
       "dependencies": {
         "color-name": "~1.1.4"
       },
@@ -38597,8 +38554,7 @@
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "node_modules/smart-buffer": {
       "version": "4.2.0",
@@ -39078,98 +39034,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/standard": {
-      "version": "16.0.4",
-      "resolved": "https://registry.npmjs.org/standard/-/standard-16.0.4.tgz",
-      "integrity": "sha512-2AGI874RNClW4xUdM+bg1LRXVlYLzTNEkHmTG5mhyn45OhbgwA+6znowkOGYy+WMb5HRyELvtNy39kcdMQMcYQ==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ],
-      "dependencies": {
-        "eslint": "~7.18.0",
-        "eslint-config-standard": "16.0.3",
-        "eslint-config-standard-jsx": "10.0.0",
-        "eslint-plugin-import": "~2.24.2",
-        "eslint-plugin-node": "~11.1.0",
-        "eslint-plugin-promise": "~5.1.0",
-        "eslint-plugin-react": "~7.25.1",
-        "standard-engine": "^14.0.1"
-      },
-      "bin": {
-        "standard": "bin/cmd.js"
-      },
-      "engines": {
-        "node": ">=10.12.0"
-      }
-    },
-    "node_modules/standard-engine": {
-      "version": "14.0.1",
-      "resolved": "https://registry.npmjs.org/standard-engine/-/standard-engine-14.0.1.tgz",
-      "integrity": "sha512-7FEzDwmHDOGva7r9ifOzD3BGdTbA7ujJ50afLVdW/tK14zQEptJjbFuUfn50irqdHDcTbNh0DTIoMPynMCXb0Q==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ],
-      "dependencies": {
-        "get-stdin": "^8.0.0",
-        "minimist": "^1.2.5",
-        "pkg-conf": "^3.1.0",
-        "xdg-basedir": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8.10"
-      }
-    },
-    "node_modules/standardx": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/standardx/-/standardx-7.0.0.tgz",
-      "integrity": "sha512-Uh2LIWyMD0pMFn+zoAS52dforkE8MUWP6hK48iQhiohTC5DRqBgTdXdJbhSGyjamRxCfETBdfvJ7hvtme2M3jg==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ],
-      "dependencies": {
-        "standard": "^16.0.1",
-        "standard-engine": "^14.0.1"
-      },
-      "bin": {
-        "standardx": "bin/cmd.js"
-      }
-    },
     "node_modules/stat-mode": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/stat-mode/-/stat-mode-1.0.0.tgz",
@@ -39489,6 +39353,15 @@
         }
       ]
     },
+    "node_modules/string-argv": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/string-argv/-/string-argv-0.3.1.tgz",
+      "integrity": "sha512-a1uQGz7IyVy9YwhqjZIZu1c8JO8dNIe20xBmSS6qu9kv++k3JGzCVmprbNN5Kn+BgzD5E7YYwg1CcjuJMRNsvg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.6.19"
+      }
+    },
     "node_modules/string-length": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz",
@@ -39515,25 +39388,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/string.prototype.matchall": {
-      "version": "4.0.7",
-      "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.7.tgz",
-      "integrity": "sha512-f48okCX7JiwVi1NXCVWcFnZgADDC/n2vePlQ/KUCNqCikLLilQvwjMO8+BHVKvgzH0JB0J9LEPgxOGT02RoETg==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.1",
-        "get-intrinsic": "^1.1.1",
-        "has-symbols": "^1.0.3",
-        "internal-slot": "^1.0.3",
-        "regexp.prototype.flags": "^1.4.1",
-        "side-channel": "^1.0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
     "node_modules/string.prototype.trimend": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz",
@@ -40138,6 +39992,7 @@
       "version": "6.8.0",
       "resolved": "https://registry.npmjs.org/table/-/table-6.8.0.tgz",
       "integrity": "sha512-s/fitrbVeEyHKFa7mFdkuQMWlH1Wgw/yEXMt5xACT4ZpzWFluehAxRtUUQKPuWhaLAWhFcVx6w3oC8VKaUfPGA==",
+      "peer": true,
       "dependencies": {
         "ajv": "^8.0.1",
         "lodash.truncate": "^4.4.2",
@@ -40153,6 +40008,7 @@
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "peer": true,
       "dependencies": {
         "color-convert": "^2.0.1"
       },
@@ -40167,6 +40023,7 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "peer": true,
       "dependencies": {
         "color-name": "~1.1.4"
       },
@@ -40177,12 +40034,14 @@
     "node_modules/table/node_modules/color-name": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "peer": true
     },
     "node_modules/table/node_modules/slice-ansi": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz",
       "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==",
+      "peer": true,
       "dependencies": {
         "ansi-styles": "^4.0.0",
         "astral-regex": "^2.0.0",
@@ -40375,7 +40234,8 @@
     "node_modules/text-table": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
-      "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw=="
+      "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==",
+      "peer": true
     },
     "node_modules/throat": {
       "version": "6.0.1",
@@ -40894,39 +40754,6 @@
         "node": ">=12"
       }
     },
-    "node_modules/tsconfig-paths": {
-      "version": "3.14.1",
-      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz",
-      "integrity": "sha512-fxDhWnFSLt3VuTwtvJt5fpwxBHg5AdKWMsgcPOOIilyjymcYVZoCQF8fvFRezCNfblEXmi+PcM1eYHeOAgXCOQ==",
-      "dev": true,
-      "dependencies": {
-        "@types/json5": "^0.0.29",
-        "json5": "^1.0.1",
-        "minimist": "^1.2.6",
-        "strip-bom": "^3.0.0"
-      }
-    },
-    "node_modules/tsconfig-paths/node_modules/json5": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
-      "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
-      "dev": true,
-      "dependencies": {
-        "minimist": "^1.2.0"
-      },
-      "bin": {
-        "json5": "lib/cli.js"
-      }
-    },
-    "node_modules/tsconfig-paths/node_modules/strip-bom": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
-      "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/tslib": {
       "version": "2.4.0",
       "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz",
@@ -40983,6 +40810,7 @@
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
       "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
+      "peer": true,
       "dependencies": {
         "prelude-ls": "^1.2.1"
       },
@@ -44237,6 +44065,15 @@
       "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
       "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g=="
     },
+    "node_modules/yaml": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.1.1.tgz",
+      "integrity": "sha512-o96x3OPo8GjWeSLF+wOAbrPfhFOGY0W00GNaxCDv+9hkcDJEnev1yh8S7pgHF0ik6zc8sQLuL8hjHjJULZp8bw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 14"
+      }
+    },
     "node_modules/yargs": {
       "version": "16.2.0",
       "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
@@ -46418,6 +46255,7 @@
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.3.0.tgz",
       "integrity": "sha512-1JTKgrOKAHVivSvOYw+sJOunkBjUOvjqWk1DPja7ZFhIS2mX/4EgTT8M7eTK9jrKhL/FvXXEbQwIs3pg1xp3dg==",
+      "peer": true,
       "requires": {
         "ajv": "^6.12.4",
         "debug": "^4.1.1",
@@ -46435,6 +46273,7 @@
           "version": "6.12.6",
           "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
           "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+          "peer": true,
           "requires": {
             "fast-deep-equal": "^3.1.1",
             "fast-json-stable-stringify": "^2.0.0",
@@ -46446,6 +46285,7 @@
           "version": "1.0.10",
           "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
           "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+          "peer": true,
           "requires": {
             "sprintf-js": "~1.0.2"
           }
@@ -46454,6 +46294,7 @@
           "version": "12.4.0",
           "resolved": "https://registry.npmjs.org/globals/-/globals-12.4.0.tgz",
           "integrity": "sha512-BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg==",
+          "peer": true,
           "requires": {
             "type-fest": "^0.8.1"
           }
@@ -46462,6 +46303,7 @@
           "version": "3.14.1",
           "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
           "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
+          "peer": true,
           "requires": {
             "argparse": "^1.0.7",
             "esprima": "^4.0.0"
@@ -46470,17 +46312,20 @@
         "json-schema-traverse": {
           "version": "0.4.1",
           "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
+          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+          "peer": true
         },
         "sprintf-js": {
           "version": "1.0.3",
           "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
-          "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g=="
+          "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==",
+          "peer": true
         },
         "type-fest": {
           "version": "0.8.1",
           "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
-          "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA=="
+          "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
+          "peer": true
         }
       }
     },
@@ -49496,12 +49341,6 @@
         "@types/tough-cookie": "*"
       }
     },
-    "@types/json5": {
-      "version": "0.0.29",
-      "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",
-      "integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==",
-      "dev": true
-    },
     "@types/level-errors": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/@types/level-errors/-/level-errors-3.0.0.tgz",
@@ -50048,6 +49887,7 @@
       "version": "5.3.2",
       "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
       "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
+      "peer": true,
       "requires": {}
     },
     "acorn-walk": {
@@ -50344,49 +50184,12 @@
       "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
       "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg=="
     },
-    "array-includes": {
-      "version": "3.1.5",
-      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.5.tgz",
-      "integrity": "sha512-iSDYZMMyTPkiFasVqfuAQnWAYcvO/SeBSCGKePoEthjp4LEMTe4uLc7b025o4jAZpHhihh8xPo99TNWUWWkGDQ==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.19.5",
-        "get-intrinsic": "^1.1.1",
-        "is-string": "^1.0.7"
-      }
-    },
     "array-unique": {
       "version": "0.3.2",
       "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
       "integrity": "sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ==",
       "dev": true
     },
-    "array.prototype.flat": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.0.tgz",
-      "integrity": "sha512-12IUEkHsAhA4DY5s0FPgNXIdc8VRSqD9Zp78a5au9abH/SOBrsp082JOWFNTjkMozh8mqcdiKuaLGhPeYztxSw==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.2",
-        "es-shim-unscopables": "^1.0.0"
-      }
-    },
-    "array.prototype.flatmap": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.0.tgz",
-      "integrity": "sha512-PZC9/8TKAIxcWKdyeb77EzULHPrIX/tIZebLJUQOMR1OwYosT8yggdfWScfTBCDj5utONvOuPQQumYsU2ULbkg==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.2",
-        "es-shim-unscopables": "^1.0.0"
-      }
-    },
     "array.prototype.reduce": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/array.prototype.reduce/-/array.prototype.reduce-1.0.4.tgz",
@@ -52198,7 +52001,6 @@
       "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-2.1.0.tgz",
       "integrity": "sha512-n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg==",
       "dev": true,
-      "optional": true,
       "requires": {
         "slice-ansi": "^3.0.0",
         "string-width": "^4.2.0"
@@ -52322,6 +52124,12 @@
       "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==",
       "dev": true
     },
+    "colorette": {
+      "version": "2.0.19",
+      "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.19.tgz",
+      "integrity": "sha512-3tlv/dIP7FWvj3BsbHrGLJ6l/oKh1O3TcgBqMn+yyCagOxc23fyzDS6HypQbgxWbkpDnf52p1LuR4eWDQ/K9WQ==",
+      "dev": true
+    },
     "colors": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/colors/-/colors-1.0.3.tgz",
@@ -53660,6 +53468,7 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
       "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
+      "peer": true,
       "requires": {
         "esutils": "^2.0.2"
       }
@@ -53766,6 +53575,12 @@
       "resolved": "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz",
       "integrity": "sha512-CEj8FwwNA4cVH2uFCoHUrmojhYh1vmCdOaneKJXwkeY1i9jnlslVo9dx+hQ5Hl9GnH/Bwy/IjxAyOePyPKYnzA=="
     },
+    "eastasianwidth": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz",
+      "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==",
+      "dev": true
+    },
     "ecc-jsbn": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
@@ -54272,15 +54087,6 @@
       "integrity": "sha512-wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA==",
       "dev": true
     },
-    "es-shim-unscopables": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz",
-      "integrity": "sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w==",
-      "dev": true,
-      "requires": {
-        "has": "^1.0.3"
-      }
-    },
     "es-to-primitive": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
@@ -54406,6 +54212,7 @@
       "version": "7.18.0",
       "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.18.0.tgz",
       "integrity": "sha512-fbgTiE8BfUJZuBeq2Yi7J3RB3WGUQ9PNuNbmgi6jt9Iv8qrkxfy19Ds3OpL1Pm7zg3BtTVhvcUZbIRQ0wmSjAQ==",
+      "peer": true,
       "requires": {
         "@babel/code-frame": "^7.0.0",
         "@eslint/eslintrc": "^0.3.0",
@@ -54450,6 +54257,7 @@
           "version": "6.12.6",
           "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
           "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+          "peer": true,
           "requires": {
             "fast-deep-equal": "^3.1.1",
             "fast-json-stable-stringify": "^2.0.0",
@@ -54461,6 +54269,7 @@
           "version": "4.3.0",
           "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
           "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "peer": true,
           "requires": {
             "color-convert": "^2.0.1"
           }
@@ -54469,6 +54278,7 @@
           "version": "1.0.10",
           "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
           "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+          "peer": true,
           "requires": {
             "sprintf-js": "~1.0.2"
           }
@@ -54477,6 +54287,7 @@
           "version": "4.1.2",
           "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
           "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+          "peer": true,
           "requires": {
             "ansi-styles": "^4.1.0",
             "supports-color": "^7.1.0"
@@ -54486,6 +54297,7 @@
           "version": "2.0.1",
           "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
           "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "peer": true,
           "requires": {
             "color-name": "~1.1.4"
           }
@@ -54493,17 +54305,20 @@
         "color-name": {
           "version": "1.1.4",
           "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "peer": true
         },
         "eslint-visitor-keys": {
           "version": "2.1.0",
           "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
-          "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw=="
+          "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",
+          "peer": true
         },
         "globals": {
           "version": "12.4.0",
           "resolved": "https://registry.npmjs.org/globals/-/globals-12.4.0.tgz",
           "integrity": "sha512-BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg==",
+          "peer": true,
           "requires": {
             "type-fest": "^0.8.1"
           }
@@ -54511,12 +54326,14 @@
         "has-flag": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "peer": true
         },
         "js-yaml": {
           "version": "3.14.1",
           "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
           "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
+          "peer": true,
           "requires": {
             "argparse": "^1.0.7",
             "esprima": "^4.0.0"
@@ -54525,17 +54342,20 @@
         "json-schema-traverse": {
           "version": "0.4.1",
           "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
+          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+          "peer": true
         },
         "sprintf-js": {
           "version": "1.0.3",
           "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
-          "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g=="
+          "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==",
+          "peer": true
         },
         "supports-color": {
           "version": "7.2.0",
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
           "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "peer": true,
           "requires": {
             "has-flag": "^4.0.0"
           }
@@ -54543,208 +54363,8 @@
         "type-fest": {
           "version": "0.8.1",
           "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
-          "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA=="
-        }
-      }
-    },
-    "eslint-config-standard": {
-      "version": "16.0.3",
-      "resolved": "https://registry.npmjs.org/eslint-config-standard/-/eslint-config-standard-16.0.3.tgz",
-      "integrity": "sha512-x4fmJL5hGqNJKGHSjnLdgA6U6h1YW/G2dW9fA+cyVur4SK6lyue8+UgNKWlZtUDTXvgKDD/Oa3GQjmB5kjtVvg==",
-      "dev": true,
-      "requires": {}
-    },
-    "eslint-config-standard-jsx": {
-      "version": "10.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-config-standard-jsx/-/eslint-config-standard-jsx-10.0.0.tgz",
-      "integrity": "sha512-hLeA2f5e06W1xyr/93/QJulN/rLbUVUmqTlexv9PRKHFwEC9ffJcH2LvJhMoEqYQBEYafedgGZXH2W8NUpt5lA==",
-      "dev": true,
-      "requires": {}
-    },
-    "eslint-import-resolver-node": {
-      "version": "0.3.6",
-      "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.6.tgz",
-      "integrity": "sha512-0En0w03NRVMn9Uiyn8YRPDKvWjxCWkslUEhGNTdGx15RvPJYQ+lbOlqrlNI2vEAs4pDYK4f/HN2TbDmk5TP0iw==",
-      "dev": true,
-      "requires": {
-        "debug": "^3.2.7",
-        "resolve": "^1.20.0"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "3.2.7",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-          "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
-          "dev": true,
-          "requires": {
-            "ms": "^2.1.1"
-          }
-        }
-      }
-    },
-    "eslint-module-utils": {
-      "version": "2.7.3",
-      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.7.3.tgz",
-      "integrity": "sha512-088JEC7O3lDZM9xGe0RerkOMd0EjFl+Yvd1jPWIkMT5u3H9+HC34mWWPnqPrN13gieT9pBOO+Qt07Nb/6TresQ==",
-      "dev": true,
-      "requires": {
-        "debug": "^3.2.7",
-        "find-up": "^2.1.0"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "3.2.7",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-          "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
-          "dev": true,
-          "requires": {
-            "ms": "^2.1.1"
-          }
-        }
-      }
-    },
-    "eslint-plugin-es": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-es/-/eslint-plugin-es-3.0.1.tgz",
-      "integrity": "sha512-GUmAsJaN4Fc7Gbtl8uOBlayo2DqhwWvEzykMHSCZHU3XdJ+NSzzZcVhXh3VxX5icqQ+oQdIEawXX8xkR3mIFmQ==",
-      "dev": true,
-      "requires": {
-        "eslint-utils": "^2.0.0",
-        "regexpp": "^3.0.0"
-      }
-    },
-    "eslint-plugin-import": {
-      "version": "2.24.2",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.24.2.tgz",
-      "integrity": "sha512-hNVtyhiEtZmpsabL4neEj+6M5DCLgpYyG9nzJY8lZQeQXEn5UPW1DpUdsMHMXsq98dbNm7nt1w9ZMSVpfJdi8Q==",
-      "dev": true,
-      "requires": {
-        "array-includes": "^3.1.3",
-        "array.prototype.flat": "^1.2.4",
-        "debug": "^2.6.9",
-        "doctrine": "^2.1.0",
-        "eslint-import-resolver-node": "^0.3.6",
-        "eslint-module-utils": "^2.6.2",
-        "find-up": "^2.0.0",
-        "has": "^1.0.3",
-        "is-core-module": "^2.6.0",
-        "minimatch": "^3.0.4",
-        "object.values": "^1.1.4",
-        "pkg-up": "^2.0.0",
-        "read-pkg-up": "^3.0.0",
-        "resolve": "^1.20.0",
-        "tsconfig-paths": "^3.11.0"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "doctrine": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
-          "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
-          "dev": true,
-          "requires": {
-            "esutils": "^2.0.2"
-          }
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-          "dev": true
-        },
-        "pkg-up": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/pkg-up/-/pkg-up-2.0.0.tgz",
-          "integrity": "sha512-fjAPuiws93rm7mPUu21RdBnkeZNrbfCFCwfAhPWY+rR3zG0ubpe5cEReHOw5fIbfmsxEV/g2kSxGTATY3Bpnwg==",
-          "dev": true,
-          "requires": {
-            "find-up": "^2.1.0"
-          }
-        }
-      }
-    },
-    "eslint-plugin-node": {
-      "version": "11.1.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-node/-/eslint-plugin-node-11.1.0.tgz",
-      "integrity": "sha512-oUwtPJ1W0SKD0Tr+wqu92c5xuCeQqB3hSCHasn/ZgjFdA9iDGNkNf2Zi9ztY7X+hNuMib23LNGRm6+uN+KLE3g==",
-      "dev": true,
-      "requires": {
-        "eslint-plugin-es": "^3.0.0",
-        "eslint-utils": "^2.0.0",
-        "ignore": "^5.1.1",
-        "minimatch": "^3.0.4",
-        "resolve": "^1.10.1",
-        "semver": "^6.1.0"
-      },
-      "dependencies": {
-        "ignore": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz",
-          "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==",
-          "dev": true
-        },
-        "semver": {
-          "version": "6.3.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-          "dev": true
-        }
-      }
-    },
-    "eslint-plugin-promise": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-promise/-/eslint-plugin-promise-5.1.1.tgz",
-      "integrity": "sha512-XgdcdyNzHfmlQyweOPTxmc7pIsS6dE4MvwhXWMQ2Dxs1XAL2GJDilUsjWen6TWik0aSI+zD/PqocZBblcm9rdA==",
-      "dev": true,
-      "requires": {}
-    },
-    "eslint-plugin-react": {
-      "version": "7.25.3",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.25.3.tgz",
-      "integrity": "sha512-ZMbFvZ1WAYSZKY662MBVEWR45VaBT6KSJCiupjrNlcdakB90juaZeDCbJq19e73JZQubqFtgETohwgAt8u5P6w==",
-      "dev": true,
-      "requires": {
-        "array-includes": "^3.1.3",
-        "array.prototype.flatmap": "^1.2.4",
-        "doctrine": "^2.1.0",
-        "estraverse": "^5.2.0",
-        "jsx-ast-utils": "^2.4.1 || ^3.0.0",
-        "minimatch": "^3.0.4",
-        "object.entries": "^1.1.4",
-        "object.fromentries": "^2.0.4",
-        "object.hasown": "^1.0.0",
-        "object.values": "^1.1.4",
-        "prop-types": "^15.7.2",
-        "resolve": "^2.0.0-next.3",
-        "string.prototype.matchall": "^4.0.5"
-      },
-      "dependencies": {
-        "doctrine": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
-          "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
-          "dev": true,
-          "requires": {
-            "esutils": "^2.0.2"
-          }
-        },
-        "resolve": {
-          "version": "2.0.0-next.3",
-          "resolved": "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.3.tgz",
-          "integrity": "sha512-W8LucSynKUIDu9ylraa7ueVZ7hc0uAgJBxVsQSKOXOyle8a93qXhcz+XAXZ8bIq2d6i4Ehddn6Evt+0/UwKk6Q==",
-          "dev": true,
-          "requires": {
-            "is-core-module": "^2.2.0",
-            "path-parse": "^1.0.6"
-          }
+          "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
+          "peer": true
         }
       }
     },
@@ -54752,6 +54372,7 @@
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
       "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
+      "peer": true,
       "requires": {
         "esrecurse": "^4.3.0",
         "estraverse": "^4.1.1"
@@ -54760,7 +54381,8 @@
         "estraverse": {
           "version": "4.3.0",
           "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
-          "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw=="
+          "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
+          "peer": true
         }
       }
     },
@@ -54768,6 +54390,7 @@
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz",
       "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==",
+      "peer": true,
       "requires": {
         "eslint-visitor-keys": "^1.1.0"
       }
@@ -54781,6 +54404,7 @@
       "version": "7.3.1",
       "resolved": "https://registry.npmjs.org/espree/-/espree-7.3.1.tgz",
       "integrity": "sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g==",
+      "peer": true,
       "requires": {
         "acorn": "^7.4.0",
         "acorn-jsx": "^5.3.1",
@@ -54790,7 +54414,8 @@
         "acorn": {
           "version": "7.4.1",
           "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
-          "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A=="
+          "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
+          "peer": true
         }
       }
     },
@@ -54803,6 +54428,7 @@
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz",
       "integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==",
+      "peer": true,
       "requires": {
         "estraverse": "^5.1.0"
       }
@@ -54811,6 +54437,7 @@
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
       "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
+      "peer": true,
       "requires": {
         "estraverse": "^5.2.0"
       }
@@ -56196,6 +55823,7 @@
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
       "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
+      "peer": true,
       "requires": {
         "flat-cache": "^3.0.4"
       }
@@ -56350,6 +55978,7 @@
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz",
       "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==",
+      "peer": true,
       "requires": {
         "flatted": "^3.1.0",
         "rimraf": "^3.0.2"
@@ -56358,7 +55987,8 @@
     "flatted": {
       "version": "3.2.5",
       "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.5.tgz",
-      "integrity": "sha512-WIWGi2L3DyTUvUrwRKgGi9TwxQMUEqPOPQBVi71R96jZXJdFskXEmf54BoZaS1kknGODoIGASGEzBUYdyMCBJg=="
+      "integrity": "sha512-WIWGi2L3DyTUvUrwRKgGi9TwxQMUEqPOPQBVi71R96jZXJdFskXEmf54BoZaS1kknGODoIGASGEzBUYdyMCBJg==",
+      "peer": true
     },
     "follow-redirects": {
       "version": "1.5.10",
@@ -64529,12 +64159,6 @@
       "integrity": "sha512-x5UJKlgeUiNT8nyo/AcnwLnZuZNcSjSw0kogRB+Whd1fjjFq4B1hySFxSFWWSn4mIBzg3sRNUDFYc4g5gjPoLg==",
       "dev": true
     },
-    "get-stdin": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-8.0.0.tgz",
-      "integrity": "sha512-sY22aA6xchAzprjyqmSEQv4UbAAzRN0L2dQB0NlN5acTTK9Don6nhoc3eAbUnpZiCANAMfd/+40kVdKfFygohg==",
-      "dev": true
-    },
     "get-stream": {
       "version": "5.2.0",
       "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
@@ -65603,6 +65227,12 @@
         "ms": "^2.0.0"
       }
     },
+    "husky": {
+      "version": "8.0.1",
+      "resolved": "https://registry.npmjs.org/husky/-/husky-8.0.1.tgz",
+      "integrity": "sha512-xs7/chUH/CKdOCs7Zy0Aev9e/dKOMZf3K1Az1nar3tzlv0jfqnYtu235bstsWTmXOR0EfINrPa97yy4Lz6RiKw==",
+      "dev": true
+    },
     "iconv-corefoundation": {
       "version": "1.1.7",
       "resolved": "https://registry.npmjs.org/iconv-corefoundation/-/iconv-corefoundation-1.1.7.tgz",
@@ -65652,7 +65282,8 @@
     "ignore": {
       "version": "4.0.6",
       "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
-      "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg=="
+      "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
+      "peer": true
     },
     "immediate": {
       "version": "3.3.0",
@@ -65669,6 +65300,7 @@
       "version": "3.3.0",
       "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
       "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
+      "peer": true,
       "requires": {
         "parent-module": "^1.0.0",
         "resolve-from": "^4.0.0"
@@ -68376,7 +68008,8 @@
     "json-stable-stringify-without-jsonify": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
-      "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw=="
+      "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==",
+      "peer": true
     },
     "json-stringify-safe": {
       "version": "5.0.1",
@@ -68438,16 +68071,6 @@
         }
       }
     },
-    "jsx-ast-utils": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.3.0.tgz",
-      "integrity": "sha512-XzO9luP6L0xkxwhIJMTJQpZo/eeN60K08jHdexfD569AGxeNug6UketeHXEhROoM8aR7EcUoOQmIhcJQjcuq8Q==",
-      "dev": true,
-      "requires": {
-        "array-includes": "^3.1.4",
-        "object.assign": "^4.1.2"
-      }
-    },
     "keccak": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/keccak/-/keccak-3.0.2.tgz",
@@ -68703,6 +68326,7 @@
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
       "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
+      "peer": true,
       "requires": {
         "prelude-ls": "^1.2.1",
         "type-check": "~0.4.0"
@@ -68723,12 +68347,209 @@
         }
       }
     },
+    "lilconfig": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-2.0.5.tgz",
+      "integrity": "sha512-xaYmXZtTHPAw5m+xLN8ab9C+3a8YmV3asNSPOATITbtwrfbwaLJj8h66H1WMIpALCkqsIzK3h7oQ+PdX+LQ9Eg==",
+      "dev": true
+    },
     "lines-and-columns": {
       "version": "1.2.4",
       "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
       "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==",
       "dev": true
     },
+    "lint-staged": {
+      "version": "13.0.3",
+      "resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-13.0.3.tgz",
+      "integrity": "sha512-9hmrwSCFroTSYLjflGI8Uk+GWAwMB4OlpU4bMJEAT5d/llQwtYKoim4bLOyLCuWFAhWEupE0vkIFqtw/WIsPug==",
+      "dev": true,
+      "requires": {
+        "cli-truncate": "^3.1.0",
+        "colorette": "^2.0.17",
+        "commander": "^9.3.0",
+        "debug": "^4.3.4",
+        "execa": "^6.1.0",
+        "lilconfig": "2.0.5",
+        "listr2": "^4.0.5",
+        "micromatch": "^4.0.5",
+        "normalize-path": "^3.0.0",
+        "object-inspect": "^1.12.2",
+        "pidtree": "^0.6.0",
+        "string-argv": "^0.3.1",
+        "yaml": "^2.1.1"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "6.0.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
+          "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==",
+          "dev": true
+        },
+        "ansi-styles": {
+          "version": "6.1.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.1.0.tgz",
+          "integrity": "sha512-VbqNsoz55SYGczauuup0MFUyXNQviSpFTj1RQtFzmQLk18qbVSpTFFGMT293rmDaQuKCT6InmbuEyUne4mTuxQ==",
+          "dev": true
+        },
+        "cli-truncate": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-3.1.0.tgz",
+          "integrity": "sha512-wfOBkjXteqSnI59oPcJkcPl/ZmwvMMOj340qUIY1SKZCv0B9Cf4D4fAucRkIKQmsIuYK3x1rrgU7MeGRruiuiA==",
+          "dev": true,
+          "requires": {
+            "slice-ansi": "^5.0.0",
+            "string-width": "^5.0.0"
+          }
+        },
+        "commander": {
+          "version": "9.3.0",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-9.3.0.tgz",
+          "integrity": "sha512-hv95iU5uXPbK83mjrJKuZyFM/LBAoCV/XhVGkS5Je6tl7sxr6A0ITMw5WoRV46/UaJ46Nllm3Xt7IaJhXTIkzw==",
+          "dev": true
+        },
+        "emoji-regex": {
+          "version": "9.2.2",
+          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
+          "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
+          "dev": true
+        },
+        "execa": {
+          "version": "6.1.0",
+          "resolved": "https://registry.npmjs.org/execa/-/execa-6.1.0.tgz",
+          "integrity": "sha512-QVWlX2e50heYJcCPG0iWtf8r0xjEYfz/OYLGDYH+IyjWezzPNxz63qNFOu0l4YftGWuizFVZHHs8PrLU5p2IDA==",
+          "dev": true,
+          "requires": {
+            "cross-spawn": "^7.0.3",
+            "get-stream": "^6.0.1",
+            "human-signals": "^3.0.1",
+            "is-stream": "^3.0.0",
+            "merge-stream": "^2.0.0",
+            "npm-run-path": "^5.1.0",
+            "onetime": "^6.0.0",
+            "signal-exit": "^3.0.7",
+            "strip-final-newline": "^3.0.0"
+          }
+        },
+        "get-stream": {
+          "version": "6.0.1",
+          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
+          "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
+          "dev": true
+        },
+        "human-signals": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-3.0.1.tgz",
+          "integrity": "sha512-rQLskxnM/5OCldHo+wNXbpVgDn5A17CUoKX+7Sokwaknlq7CdSnphy0W39GU8dw59XiCXmFXDg4fRuckQRKewQ==",
+          "dev": true
+        },
+        "is-fullwidth-code-point": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-4.0.0.tgz",
+          "integrity": "sha512-O4L094N2/dZ7xqVdrXhh9r1KODPJpFms8B5sGdJLPy664AgvXsreZUyCQQNItZRDlYug4xStLjNp/sz3HvBowQ==",
+          "dev": true
+        },
+        "is-stream": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-3.0.0.tgz",
+          "integrity": "sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA==",
+          "dev": true
+        },
+        "mimic-fn": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-4.0.0.tgz",
+          "integrity": "sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw==",
+          "dev": true
+        },
+        "npm-run-path": {
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-5.1.0.tgz",
+          "integrity": "sha512-sJOdmRGrY2sjNTRMbSvluQqg+8X7ZK61yvzBEIDhz4f8z1TZFYABsqjjCBd/0PUNE9M6QDgHJXQkGUEm7Q+l9Q==",
+          "dev": true,
+          "requires": {
+            "path-key": "^4.0.0"
+          }
+        },
+        "onetime": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/onetime/-/onetime-6.0.0.tgz",
+          "integrity": "sha512-1FlR+gjXK7X+AsAHso35MnyN5KqGwJRi/31ft6x0M194ht7S+rWAvd7PHss9xSKMzE0asv1pyIHaJYq+BbacAQ==",
+          "dev": true,
+          "requires": {
+            "mimic-fn": "^4.0.0"
+          }
+        },
+        "path-key": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/path-key/-/path-key-4.0.0.tgz",
+          "integrity": "sha512-haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ==",
+          "dev": true
+        },
+        "slice-ansi": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-5.0.0.tgz",
+          "integrity": "sha512-FC+lgizVPfie0kkhqUScwRu1O/lF6NOgJmlCgK+/LYxDCTk8sGelYaHDhFcDN+Sn3Cv+3VSa4Byeo+IMCzpMgQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^6.0.0",
+            "is-fullwidth-code-point": "^4.0.0"
+          }
+        },
+        "string-width": {
+          "version": "5.1.2",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz",
+          "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==",
+          "dev": true,
+          "requires": {
+            "eastasianwidth": "^0.2.0",
+            "emoji-regex": "^9.2.2",
+            "strip-ansi": "^7.0.1"
+          }
+        },
+        "strip-ansi": {
+          "version": "7.0.1",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.0.1.tgz",
+          "integrity": "sha512-cXNxvT8dFNRVfhVME3JAe98mkXDYN2O1l7jmcwMnOslDeESg1rF/OZMtK0nRAhiari1unG5cD4jG3rapUAkLbw==",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^6.0.1"
+          }
+        },
+        "strip-final-newline": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-3.0.0.tgz",
+          "integrity": "sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw==",
+          "dev": true
+        }
+      }
+    },
+    "listr2": {
+      "version": "4.0.5",
+      "resolved": "https://registry.npmjs.org/listr2/-/listr2-4.0.5.tgz",
+      "integrity": "sha512-juGHV1doQdpNT3GSTs9IUN43QJb7KHdF9uqg7Vufs/tG9VTzpFphqF4pm/ICdAABGQxsyNn9CiYA3StkI6jpwA==",
+      "dev": true,
+      "requires": {
+        "cli-truncate": "^2.1.0",
+        "colorette": "^2.0.16",
+        "log-update": "^4.0.0",
+        "p-map": "^4.0.0",
+        "rfdc": "^1.3.0",
+        "rxjs": "^7.5.5",
+        "through": "^2.3.8",
+        "wrap-ansi": "^7.0.0"
+      },
+      "dependencies": {
+        "rxjs": {
+          "version": "7.5.5",
+          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.5.5.tgz",
+          "integrity": "sha512-sy+H0pQofO95VDmFLzyaw9xNJU4KTRSwQIGM6+iG3SypAtCiLDzpeG8sJrNCWn2Up9km+KhkvTdbkrdy+yzZdw==",
+          "dev": true,
+          "requires": {
+            "tslib": "^2.1.0"
+          }
+        }
+      }
+    },
     "load-json-file": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz",
@@ -68834,7 +68655,8 @@
     "lodash.truncate": {
       "version": "4.4.2",
       "resolved": "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz",
-      "integrity": "sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw=="
+      "integrity": "sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==",
+      "peer": true
     },
     "lodash.uniq": {
       "version": "4.5.0",
@@ -68903,6 +68725,85 @@
         }
       }
     },
+    "log-update": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/log-update/-/log-update-4.0.0.tgz",
+      "integrity": "sha512-9fkkDevMefjg0mmzWFBW8YkFP91OrizzkW3diF7CpG+S2EYdy4+TVfGwz1zeF8x7hCx1ovSPTOE9Ngib74qqUg==",
+      "dev": true,
+      "requires": {
+        "ansi-escapes": "^4.3.0",
+        "cli-cursor": "^3.1.0",
+        "slice-ansi": "^4.0.0",
+        "wrap-ansi": "^6.2.0"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "cli-cursor": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz",
+          "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==",
+          "dev": true,
+          "requires": {
+            "restore-cursor": "^3.1.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
+        },
+        "restore-cursor": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz",
+          "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==",
+          "dev": true,
+          "requires": {
+            "onetime": "^5.1.0",
+            "signal-exit": "^3.0.2"
+          }
+        },
+        "slice-ansi": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz",
+          "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.0.0",
+            "astral-regex": "^2.0.0",
+            "is-fullwidth-code-point": "^3.0.0"
+          }
+        },
+        "wrap-ansi": {
+          "version": "6.2.0",
+          "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
+          "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.0.0",
+            "string-width": "^4.1.0",
+            "strip-ansi": "^6.0.0"
+          }
+        }
+      }
+    },
     "long": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/long/-/long-4.0.0.tgz",
@@ -71022,28 +70923,6 @@
         "object-keys": "^1.1.1"
       }
     },
-    "object.entries": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.5.tgz",
-      "integrity": "sha512-TyxmjUoZggd4OrrU1W66FMDG6CuqJxsFvymeyXI51+vQLN67zYfZseptRge703kKQdo4uccgAKebXFcRCzk4+g==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.1"
-      }
-    },
-    "object.fromentries": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.5.tgz",
-      "integrity": "sha512-CAyG5mWQRRiBU57Re4FKoTBjXfDoNwdFVH2Y1tS9PqCsfUTymAohOkEMSG3aRNKmv4lV3O7p1et7c187q6bynw==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.1"
-      }
-    },
     "object.getownpropertydescriptors": {
       "version": "2.1.4",
       "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.4.tgz",
@@ -71056,16 +70935,6 @@
         "es-abstract": "^1.20.1"
       }
     },
-    "object.hasown": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/object.hasown/-/object.hasown-1.1.1.tgz",
-      "integrity": "sha512-LYLe4tivNQzq4JdaWW6WO3HMZZJWzkkH8fnI6EebWl0VZth2wL2Lovm74ep2/gZzlaTdV62JZHEqHQ2yVn8Q/A==",
-      "dev": true,
-      "requires": {
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.19.5"
-      }
-    },
     "object.pick": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz",
@@ -71172,6 +71041,7 @@
       "version": "0.9.1",
       "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz",
       "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==",
+      "peer": true,
       "requires": {
         "deep-is": "^0.1.3",
         "fast-levenshtein": "^2.0.6",
@@ -71844,6 +71714,7 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
       "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
+      "peer": true,
       "requires": {
         "callsites": "^3.0.0"
       }
@@ -72144,6 +72015,12 @@
       "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
       "dev": true
     },
+    "pidtree": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/pidtree/-/pidtree-0.6.0.tgz",
+      "integrity": "sha512-eG2dWTVw5bzqGRztnHExczNxt5VGsE6OwTeCG3fdUf9KBsZzO3R5OIIIzWR+iZA0NtZ+RDVdaoE2dK1cn6jH4g==",
+      "dev": true
+    },
     "pify": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
@@ -72168,102 +72045,6 @@
       "integrity": "sha512-8V9+HQPupnaXMA23c5hvl69zXvTwTzyAYasnkb0Tts4XvO4CliqONMOnvlq26rkhLC3nWDFBJf73LU1e1VZLaQ==",
       "dev": true
     },
-    "pkg-conf": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/pkg-conf/-/pkg-conf-3.1.0.tgz",
-      "integrity": "sha512-m0OTbR/5VPNPqO1ph6Fqbj7Hv6QU7gR/tQW40ZqrL1rjgCU85W6C1bJn0BItuJqnR98PWzw7Z8hHeChD1WrgdQ==",
-      "dev": true,
-      "requires": {
-        "find-up": "^3.0.0",
-        "load-json-file": "^5.2.0"
-      },
-      "dependencies": {
-        "find-up": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
-          "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
-          "dev": true,
-          "requires": {
-            "locate-path": "^3.0.0"
-          }
-        },
-        "load-json-file": {
-          "version": "5.3.0",
-          "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-5.3.0.tgz",
-          "integrity": "sha512-cJGP40Jc/VXUsp8/OrnyKyTZ1y6v/dphm3bioS+RrKXjK2BB6wHUd6JptZEFDGgGahMT+InnZO5i1Ei9mpC8Bw==",
-          "dev": true,
-          "requires": {
-            "graceful-fs": "^4.1.15",
-            "parse-json": "^4.0.0",
-            "pify": "^4.0.1",
-            "strip-bom": "^3.0.0",
-            "type-fest": "^0.3.0"
-          }
-        },
-        "locate-path": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
-          "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
-          "dev": true,
-          "requires": {
-            "p-locate": "^3.0.0",
-            "path-exists": "^3.0.0"
-          }
-        },
-        "p-limit": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-          "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-          "dev": true,
-          "requires": {
-            "p-try": "^2.0.0"
-          }
-        },
-        "p-locate": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
-          "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
-          "dev": true,
-          "requires": {
-            "p-limit": "^2.0.0"
-          }
-        },
-        "p-try": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-          "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
-          "dev": true
-        },
-        "parse-json": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
-          "integrity": "sha512-aOIos8bujGN93/8Ox/jPLh7RwVnPEysynVFE+fQZyg6jKELEHwzgKdLRFHUgXJL6kylijVSBC4BvN9OmsB48Rw==",
-          "dev": true,
-          "requires": {
-            "error-ex": "^1.3.1",
-            "json-parse-better-errors": "^1.0.1"
-          }
-        },
-        "pify": {
-          "version": "4.0.1",
-          "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
-          "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
-          "dev": true
-        },
-        "strip-bom": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
-          "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==",
-          "dev": true
-        },
-        "type-fest": {
-          "version": "0.3.1",
-          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.3.1.tgz",
-          "integrity": "sha512-cUGJnCdr4STbePCgqNFbpVNCepa+kAVohJs1sLhxzdH+gnEoOd8VhbYa7pD3zZYGiURWM2xzEII3fQcRizDkYQ==",
-          "dev": true
-        }
-      }
-    },
     "pkg-dir": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz",
@@ -73039,7 +72820,8 @@
     "prelude-ls": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
-      "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g=="
+      "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
+      "peer": true
     },
     "prepend-http": {
       "version": "2.0.0",
@@ -73047,11 +72829,10 @@
       "integrity": "sha512-ravE6m9Atw9Z/jjttRUZ+clIXogdghyZAuWJ3qEzjT+jI/dL1ifAqhZeC5VHzQp1MSt1+jxKkFNemj/iO7tVUA=="
     },
     "prettier": {
-      "version": "2.7.0",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.7.0.tgz",
-      "integrity": "sha512-nwoX4GMFgxoPC6diHvSwmK/4yU8FFH3V8XWtLQrbj4IBsK2pkYhG4kf/ljF/haaZ/aii+wNJqISrCDPgxGWDVQ==",
-      "dev": true,
-      "peer": true
+      "version": "2.7.1",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.7.1.tgz",
+      "integrity": "sha512-ujppO+MkdPqoVINuDFDRLClm7D78qbDt0/NR+wp5FqEZOoTNAjPHWj17QRhu7geIHJfcNhRk1XVQmF8Bp3ye+g==",
+      "dev": true
     },
     "pretty-format": {
       "version": "27.5.1",
@@ -73679,7 +73460,8 @@
     "regexpp": {
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz",
-      "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg=="
+      "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==",
+      "peer": true
     },
     "regexpu-core": {
       "version": "5.0.1",
@@ -73917,7 +73699,8 @@
     "resolve-from": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
-      "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g=="
+      "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
+      "peer": true
     },
     "resolve-url": {
       "version": "0.2.1",
@@ -73983,6 +73766,12 @@
       "integrity": "sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow==",
       "dev": true
     },
+    "rfdc": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.3.0.tgz",
+      "integrity": "sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA==",
+      "dev": true
+    },
     "rgb-regex": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/rgb-regex/-/rgb-regex-1.0.1.tgz",
@@ -74534,7 +74323,6 @@
       "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-3.0.0.tgz",
       "integrity": "sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==",
       "dev": true,
-      "optional": true,
       "requires": {
         "ansi-styles": "^4.0.0",
         "astral-regex": "^2.0.0",
@@ -74546,7 +74334,6 @@
           "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
           "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
           "dev": true,
-          "optional": true,
           "requires": {
             "color-convert": "^2.0.1"
           }
@@ -74556,7 +74343,6 @@
           "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
           "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
           "dev": true,
-          "optional": true,
           "requires": {
             "color-name": "~1.1.4"
           }
@@ -74565,8 +74351,7 @@
           "version": "1.1.4",
           "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
           "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true,
-          "optional": true
+          "dev": true
         }
       }
     },
@@ -74967,44 +74752,6 @@
         }
       }
     },
-    "standard": {
-      "version": "16.0.4",
-      "resolved": "https://registry.npmjs.org/standard/-/standard-16.0.4.tgz",
-      "integrity": "sha512-2AGI874RNClW4xUdM+bg1LRXVlYLzTNEkHmTG5mhyn45OhbgwA+6znowkOGYy+WMb5HRyELvtNy39kcdMQMcYQ==",
-      "dev": true,
-      "requires": {
-        "eslint": "~7.18.0",
-        "eslint-config-standard": "16.0.3",
-        "eslint-config-standard-jsx": "10.0.0",
-        "eslint-plugin-import": "~2.24.2",
-        "eslint-plugin-node": "~11.1.0",
-        "eslint-plugin-promise": "~5.1.0",
-        "eslint-plugin-react": "~7.25.1",
-        "standard-engine": "^14.0.1"
-      }
-    },
-    "standard-engine": {
-      "version": "14.0.1",
-      "resolved": "https://registry.npmjs.org/standard-engine/-/standard-engine-14.0.1.tgz",
-      "integrity": "sha512-7FEzDwmHDOGva7r9ifOzD3BGdTbA7ujJ50afLVdW/tK14zQEptJjbFuUfn50irqdHDcTbNh0DTIoMPynMCXb0Q==",
-      "dev": true,
-      "requires": {
-        "get-stdin": "^8.0.0",
-        "minimist": "^1.2.5",
-        "pkg-conf": "^3.1.0",
-        "xdg-basedir": "^4.0.0"
-      }
-    },
-    "standardx": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/standardx/-/standardx-7.0.0.tgz",
-      "integrity": "sha512-Uh2LIWyMD0pMFn+zoAS52dforkE8MUWP6hK48iQhiohTC5DRqBgTdXdJbhSGyjamRxCfETBdfvJ7hvtme2M3jg==",
-      "dev": true,
-      "requires": {
-        "standard": "^16.0.1",
-        "standard-engine": "^14.0.1"
-      }
-    },
     "stat-mode": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/stat-mode/-/stat-mode-1.0.0.tgz",
@@ -75246,6 +74993,12 @@
         }
       }
     },
+    "string-argv": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/string-argv/-/string-argv-0.3.1.tgz",
+      "integrity": "sha512-a1uQGz7IyVy9YwhqjZIZu1c8JO8dNIe20xBmSS6qu9kv++k3JGzCVmprbNN5Kn+BgzD5E7YYwg1CcjuJMRNsvg==",
+      "dev": true
+    },
     "string-length": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz",
@@ -75266,22 +75019,6 @@
         "strip-ansi": "^6.0.1"
       }
     },
-    "string.prototype.matchall": {
-      "version": "4.0.7",
-      "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.7.tgz",
-      "integrity": "sha512-f48okCX7JiwVi1NXCVWcFnZgADDC/n2vePlQ/KUCNqCikLLilQvwjMO8+BHVKvgzH0JB0J9LEPgxOGT02RoETg==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.1",
-        "get-intrinsic": "^1.1.1",
-        "has-symbols": "^1.0.3",
-        "internal-slot": "^1.0.3",
-        "regexp.prototype.flags": "^1.4.1",
-        "side-channel": "^1.0.4"
-      }
-    },
     "string.prototype.trimend": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz",
@@ -75760,6 +75497,7 @@
       "version": "6.8.0",
       "resolved": "https://registry.npmjs.org/table/-/table-6.8.0.tgz",
       "integrity": "sha512-s/fitrbVeEyHKFa7mFdkuQMWlH1Wgw/yEXMt5xACT4ZpzWFluehAxRtUUQKPuWhaLAWhFcVx6w3oC8VKaUfPGA==",
+      "peer": true,
       "requires": {
         "ajv": "^8.0.1",
         "lodash.truncate": "^4.4.2",
@@ -75772,6 +75510,7 @@
           "version": "4.3.0",
           "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
           "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "peer": true,
           "requires": {
             "color-convert": "^2.0.1"
           }
@@ -75780,6 +75519,7 @@
           "version": "2.0.1",
           "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
           "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "peer": true,
           "requires": {
             "color-name": "~1.1.4"
           }
@@ -75787,12 +75527,14 @@
         "color-name": {
           "version": "1.1.4",
           "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "peer": true
         },
         "slice-ansi": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz",
           "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==",
+          "peer": true,
           "requires": {
             "ansi-styles": "^4.0.0",
             "astral-regex": "^2.0.0",
@@ -75954,7 +75696,8 @@
     "text-table": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
-      "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw=="
+      "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==",
+      "peer": true
     },
     "throat": {
       "version": "6.0.1",
@@ -76379,35 +76122,6 @@
         }
       }
     },
-    "tsconfig-paths": {
-      "version": "3.14.1",
-      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz",
-      "integrity": "sha512-fxDhWnFSLt3VuTwtvJt5fpwxBHg5AdKWMsgcPOOIilyjymcYVZoCQF8fvFRezCNfblEXmi+PcM1eYHeOAgXCOQ==",
-      "dev": true,
-      "requires": {
-        "@types/json5": "^0.0.29",
-        "json5": "^1.0.1",
-        "minimist": "^1.2.6",
-        "strip-bom": "^3.0.0"
-      },
-      "dependencies": {
-        "json5": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
-          "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
-          "dev": true,
-          "requires": {
-            "minimist": "^1.2.0"
-          }
-        },
-        "strip-bom": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
-          "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==",
-          "dev": true
-        }
-      }
-    },
     "tslib": {
       "version": "2.4.0",
       "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz",
@@ -76458,6 +76172,7 @@
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
       "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
+      "peer": true,
       "requires": {
         "prelude-ls": "^1.2.1"
       }
@@ -79204,6 +78919,12 @@
       "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
       "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g=="
     },
+    "yaml": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.1.1.tgz",
+      "integrity": "sha512-o96x3OPo8GjWeSLF+wOAbrPfhFOGY0W00GNaxCDv+9hkcDJEnev1yh8S7pgHF0ik6zc8sQLuL8hjHjJULZp8bw==",
+      "dev": true
+    },
     "yargs": {
       "version": "16.2.0",
       "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
diff --git a/package.json b/package.json
index 7ba2d1b4a..a4f22ab1f 100644
--- a/package.json
+++ b/package.json
@@ -4,6 +4,7 @@
   "description": "System-wide web3",
   "main": "compiled/main",
   "scripts": {
+    "prepare": "husky install",
     "clean": "npx rimraf dist bundle compiled .cache node_modules",
     "setup:full": "npm run clean && npm cache clean --force && npm install --cache /tmp/empty-cache --ignore-scripts && allow-scripts && npm audit fix",
     "setup:clean": "npm run clean && npm run setup",
@@ -33,6 +34,8 @@
     "launch:dev:worker": "cross-env NODE_ENV=development LOG_WORKER=true electron ./compiled/main",
     "launch:dev:rinkeby": "cross-env NODE_ENV=development RINKEBY=true electron ./compiled/main",
     "launch:inspect": "cross-env NODE_ENV=production LOG_LEVEL=verbose electron --inspect ./compiled/main",
+    "format": "prettier --write '**/*.{j,t}s'",
+    "format:check": "prettier --check '**/*.{j,t}s'",
     "prod": "npm run compile && npm run bundle && npm run launch",
     "hot": "npm run compile && npm run bundle && npm run launch:hot",
     "watch:compile": "shx mkdir -p ./compiled/main/windows && npm run copy-assets && tsc -w",
@@ -49,7 +52,6 @@
     "test:unit:components": "npm run test:exec -- --env=jsdom --testTimeout=500 ./test/app",
     "test:e2e": "npm run test:exec -- --env=node ./test/e2e",
     "test:usbAdapters": "ELECTRON_RUN_AS_NODE=true ./node_modules/.bin/electron ./node_modules/jest/bin/jest.js ./test/main/signers/ledger/adapter.test.js --testPathIgnorePatterns=''",
-    "standard": "standardx --fix --verbose",
     "local:rpc": "ganache-cli --account=\"0x2d6945dbddb8dcf5492004e6f720f8e971196ff61a61c4be99714ebc71e06c00,  5000000000000000000000\" --account=\"0xaef6a68a47c1628081e4e6df195f5f712ae4eb7da332a6d74dca06ae32a3e7ae,5000\""
   },
   "author": {
@@ -141,33 +143,27 @@
     "electron-builder": "23.0.3",
     "electron-notarize": "1.2.1",
     "hardhat": "2.9.9",
+    "husky": "8.0.1",
     "jest": "28.1.1",
     "jest-environment-jsdom": "28.1.1",
+    "lint-staged": "13.0.3",
     "node-abi": "3.22.0",
     "node-gyp": "9.0.0",
     "node-watch": "0.7.3",
     "parcel-bundler": "1.12.3",
     "prebuild-install": "7.1.1",
+    "prettier": "2.7.1",
     "rimraf": "3.0.2",
     "shx": "0.3.4",
-    "standardx": "7.0.0",
     "stylus": "0.58.1",
     "ts-jest": "28.0.5",
     "typescript": "4.7.3"
   },
-  "standardx": {
-    "parser": "babel-eslint",
-    "env": [
-      "jest"
+  "lint-staged": {
+    "**/*.{yml,json,md,ts,js}": [
+      "prettier --write"
     ]
   },
-  "eslintConfig": {
-    "rules": {
-      "multiline-ternary": 0,
-      "react/no-direct-mutation-state": 0,
-      "react/no-find-dom-node": 0
-    }
-  },
   "browserslist": [
     "last 1 Electron major version"
   ],
diff --git a/resources/Components/Dropdown/index.js b/resources/Components/Dropdown/index.js
index 7be93697c..2c413d6fd 100644
--- a/resources/Components/Dropdown/index.js
+++ b/resources/Components/Dropdown/index.js
@@ -1,6 +1,6 @@
 import React, { useState, useEffect, createRef } from 'react'
 
-function findIndex (options, value) {
+function findIndex(options, value) {
   const index = options.findIndex((option) => option.value === value)
   return index >= 0 ? index : undefined
 }
@@ -49,21 +49,28 @@ const Dropdown = ({ options, syncValue, initialValue, style, className = '', onC
   const marginTop = `${-28 * selectedIndex}px`
 
   return (
-    <div className="dropdownWrap" ref={ref}>
+    <div className='dropdownWrap' ref={ref}>
       <div
         className={expanded ? `dropdown dropdownExpanded ${className}` : `dropdown ${className}`}
         style={expanded ? { ...style, height } : { ...style }}
         onClick={(e) => setExpanded(!expanded)}
       >
-        <div className="dropdownItems" role="listbox" style={expanded ? {} : { marginTop }}>
+        <div className='dropdownItems' role='listbox' style={expanded ? {} : { marginTop }}>
           {options.map((option, index) => {
             const words = option.text.split(' ').slice(0, 3)
             const length = words.length === 3 ? 1 : words.length === 2 ? 3 : 10
-            const text = words.map(w => w.substr(0, length)).join(' ')
+            const text = words.map((w) => w.substr(0, length)).join(' ')
             const ariaSelected = index === selectedIndex ? 'true' : 'false'
-            
+
             return (
-              <div key={option.text + index} className="dropdownItem" role="option" aria-selected={ariaSelected} value={option.value} onMouseDown={() => handleSelect(option, index)}>
+              <div
+                key={option.text + index}
+                className='dropdownItem'
+                role='option'
+                aria-selected={ariaSelected}
+                value={option.value}
+                onMouseDown={() => handleSelect(option, index)}
+              >
                 {text}
                 {indicator(option)}
               </div>
diff --git a/resources/Components/Filter/index.js b/resources/Components/Filter/index.js
index a8e1fc98c..913a657ef 100644
--- a/resources/Components/Filter/index.js
+++ b/resources/Components/Filter/index.js
@@ -4,10 +4,10 @@ import link from '../../../resources/link'
 import svg from '../../../resources/svg'
 
 class Filter extends React.Component {
-  constructor (...args) {
+  constructor(...args) {
     super(...args)
     this.state = {
-      expand: false
+      expand: false,
     }
     // this.e = { p: ['QXJyb3dVcA==', 'QXJyb3dVcA==', 'QXJyb3dEb3du', 'QXJyb3dEb3du', 'QXJyb3dMZWZ0', 'QXJyb3dSaWdodA==', 'QXJyb3dMZWZ0', 'QXJyb3dSaWdodA==', 'Yg==', 'YQ=='], i: 0 }
   }
@@ -33,49 +33,52 @@ class Filter extends React.Component {
   // componentWillUnmount () {
   //   document.removeEventListener('keydown', this.h.bind(this))
   // }
-  glitch (el) {
+  glitch(el) {
     return (
       <div className={this.state.glitchOn ? 'glitch glitchOn' : 'glitch'}>
-        {[...Array(10).keys()].map(i => <div key={i + 'hg'} className='line'>{el}</div>)}
-        {!this.state.glitchOn ? <div className='line lastLine'>{el}</div> : null }
+        {[...Array(10).keys()].map((i) => (
+          <div key={i + 'hg'} className='line'>
+            {el}
+          </div>
+        ))}
+        {!this.state.glitchOn ? <div className='line lastLine'>{el}</div> : null}
       </div>
     )
   }
-  render () {
+  render() {
     const { buttonActionName, buttonAction } = this.props
     return (
       <div className='filter'>
         <div className='filterWrap'>
-          <div className='filterIcon'>
-            {svg.search(18)}
-          </div>
-          <input 
+          <div className='filterIcon'>{svg.search(18)}</div>
+          <input
             className='filterInput'
-            spellCheck={false} 
-            tabIndex={-1} 
+            spellCheck={false}
+            tabIndex={-1}
             onChange={(e) => this.props.onInput(e.target.value)}
           />
         </div>
         {buttonActionName ? (
-          <div 
+          <div
             className='filterButton'
-            onClick={() => { 
-              this.setState({ glitchOn: false }) 
+            onClick={() => {
+              this.setState({ glitchOn: false })
               if (buttonAction) buttonAction()
             }}
             onMouseEnter={() => this.setState({ glitchOn: true })}
             onMouseOver={() => this.setState({ glitchOn: true })}
             onMouseLeave={() => this.setState({ glitchOn: false })}
           >
-            {this.glitch(<div className='filterButtonInner'>
-              {'+'}
-              {svg.chain(14)}
-            </div>)}
+            {this.glitch(
+              <div className='filterButtonInner'>
+                {'+'}
+                {svg.chain(14)}
+              </div>
+            )}
           </div>
         ) : null}
       </div>
     )
-    
   }
 }
 
diff --git a/resources/Components/FooterAux/index.js b/resources/Components/FooterAux/index.js
index 8415fdde9..135ca7dde 100644
--- a/resources/Components/FooterAux/index.js
+++ b/resources/Components/FooterAux/index.js
@@ -4,9 +4,9 @@ import Restore from 'react-restore'
 import Gas from '../Gas'
 
 class _Aux extends React.Component {
-  render () {
+  render() {
     const { data } = this.store('panel.nav')[0] || {}
-    const aux = data && data.aux || {}
+    const aux = (data && data.aux) || {}
     if (aux.type === 'gas') {
       return (
         <div className='auxWrap cardShow'>
diff --git a/resources/Components/Gas/index.js b/resources/Components/Gas/index.js
index 51bdff6d5..7fee4a499 100644
--- a/resources/Components/Gas/index.js
+++ b/resources/Components/Gas/index.js
@@ -12,62 +12,94 @@ const gasToSendToken = 65 * 1000
 const gasForDexSwap = 200 * 1000
 
 class Gas extends React.Component {
-  constructor (...args) {
+  constructor(...args) {
     super(...args)
     this.state = {
-      expand: false
+      expand: false,
     }
   }
-  renderFeeTime (time) {
-    if (!time) return <>?<span className='timeUnit'>?</span></>
-    if (time < 60) return <><span className='timeUnit'>~</span>{time}<span className='timeUnit'>s</span></>
-    if (time < 3600) return <><span className='timeUnit'>~</span>{Math.round(time / 60)}<span className='timeUnit'>m</span></>
-    return <><span className='timeUnit'>~</span>{Math.round(time / 3600)}<span className='timeUnit'>h</span></>
+  renderFeeTime(time) {
+    if (!time)
+      return (
+        <>
+          ?<span className='timeUnit'>?</span>
+        </>
+      )
+    if (time < 60)
+      return (
+        <>
+          <span className='timeUnit'>~</span>
+          {time}
+          <span className='timeUnit'>s</span>
+        </>
+      )
+    if (time < 3600)
+      return (
+        <>
+          <span className='timeUnit'>~</span>
+          {Math.round(time / 60)}
+          <span className='timeUnit'>m</span>
+        </>
+      )
+    return (
+      <>
+        <span className='timeUnit'>~</span>
+        {Math.round(time / 3600)}
+        <span className='timeUnit'>h</span>
+      </>
+    )
   }
-  toDisplayUSD (bn) {
+  toDisplayUSD(bn) {
     return parseFloat(
-      bn.toNumber() >= 1 ? bn.toFixed(0, BigNumber.ROUND_UP).toString() :
-      bn.toFixed(2, BigNumber.ROUND_UP).toString()     
+      bn.toNumber() >= 1 ? bn.toFixed(0, BigNumber.ROUND_UP).toString() : bn.toFixed(2, BigNumber.ROUND_UP).toString()
     )
   }
-  roundGwei (gwei) {
+  roundGwei(gwei) {
     if (gwei && gwei < 0.001) return '‹0.001'
     return parseFloat(
-      gwei >= 10 ? Math.round(gwei) :
-      gwei >= 5 ? Math.round(gwei * 10) / 10 :
-      gwei >= 1 ? Math.round(gwei * 100) / 100 :
-      Math.round(gwei * 1000) / 1000
+      gwei >= 10
+        ? Math.round(gwei)
+        : gwei >= 5
+        ? Math.round(gwei * 10) / 10
+        : gwei >= 1
+        ? Math.round(gwei * 100) / 100
+        : Math.round(gwei * 1000) / 1000
     )
   }
-  levelDisplay (level) {
-    const gwei = weiToGwei(hexToInt(level)) 
+  levelDisplay(level) {
+    const gwei = weiToGwei(hexToInt(level))
     return this.roundGwei(gwei) || 0
   }
 
-  txEstimate (value, gasLimit, nativeUSD) {
-    return this.toDisplayUSD(BigNumber(value * gasLimit).shiftedBy(-9).multipliedBy(nativeUSD))
+  txEstimate(value, gasLimit, nativeUSD) {
+    return this.toDisplayUSD(
+      BigNumber(value * gasLimit)
+        .shiftedBy(-9)
+        .multipliedBy(nativeUSD)
+    )
   }
 
-  txEstimates (type, id, gasPrice, calculatedFees, currentSymbol) {
-
+  txEstimates(type, id, gasPrice, calculatedFees, currentSymbol) {
     const estimates = [
       {
         label: 'Send ' + currentSymbol,
-        estimatedGas: gasToSendEth
+        estimatedGas: gasToSendEth,
       },
       {
         label: 'Send Tokens',
-        estimatedGas: gasToSendToken
+        estimatedGas: gasToSendToken,
       },
       {
         label: 'Dex Swap',
-        estimatedGas: gasForDexSwap
-      }
+        estimatedGas: gasForDexSwap,
+      },
     ]
 
     const layer = this.store('main.networks', type, id, 'layer')
     const nativeCurrency = this.store('main.networksMeta', type, id, 'nativeCurrency')
-    const nativeUSD = BigNumber(nativeCurrency && nativeCurrency.usd && layer !== 'testnet' ? nativeCurrency.usd.price : 0)
+    const nativeUSD = BigNumber(
+      nativeCurrency && nativeCurrency.usd && layer !== 'testnet' ? nativeCurrency.usd.price : 0
+    )
 
     if (id === 10) {
       // Optimism specific calculations
@@ -84,27 +116,23 @@ class Gas extends React.Component {
         return this.toDisplayUSD(l1Estimate.plus(l2Estimate).shiftedBy(-9).multipliedBy(nativeUSD))
       }
 
-      return estimates.map(({ label, estimatedGas }, i) => (
-        {
-          low: optimismEstimate(l1GasEstimates[i], estimatedGas),
-          high: optimismEstimate(l1GasEstimates[i], estimatedGas),
-          label
-        }
-      ))
+      return estimates.map(({ label, estimatedGas }, i) => ({
+        low: optimismEstimate(l1GasEstimates[i], estimatedGas),
+        high: optimismEstimate(l1GasEstimates[i], estimatedGas),
+        label,
+      }))
     } else {
       const low = calculatedFees ? this.roundGwei(calculatedFees.actualBaseFee + calculatedFees.priorityFee) : gasPrice
 
-      return estimates.map(({ label, estimatedGas }) => (
-        {
-          low: this.txEstimate(low, estimatedGas, nativeUSD),
-          high: this.txEstimate(gasPrice, estimatedGas, nativeUSD),
-          label
-        }
-      ))
+      return estimates.map(({ label, estimatedGas }) => ({
+        low: this.txEstimate(low, estimatedGas, nativeUSD),
+        high: this.txEstimate(gasPrice, estimatedGas, nativeUSD),
+        label,
+      }))
     }
   }
 
-  renderSummary () {
+  renderSummary() {
     const type = 'ethereum'
     const { id } = this.props
     const levels = this.store('main.networksMeta', type, id, 'gas.price.levels')
@@ -112,34 +140,42 @@ class Gas extends React.Component {
     const currentSymbol = this.store('main.networks', type, id, 'symbol') || 'ETH'
     const gasPrice = this.levelDisplay(levels.fast)
 
-    const { nextBaseFee, maxPriorityFeePerGas } = (fees || {})
+    const { nextBaseFee, maxPriorityFeePerGas } = fees || {}
 
     const calculatedFees = {
-      actualBaseFee: this.roundGwei((weiToGwei(hexToInt(nextBaseFee)))),
-      priorityFee: this.levelDisplay(maxPriorityFeePerGas)
+      actualBaseFee: this.roundGwei(weiToGwei(hexToInt(nextBaseFee))),
+      priorityFee: this.levelDisplay(maxPriorityFeePerGas),
     }
 
     const feeEstimatesUSD = this.txEstimates(type, id, gasPrice, fees ? calculatedFees : null, currentSymbol)
 
     return (
-      <div 
+      <div
         className='sliceTile sliceTileClickable'
         onClick={() => {
           this.setState({ expanded: !this.state.expanded })
         }}
       >
-        <div className='sliceTileGasPrice'> 
+        <div className='sliceTileGasPrice'>
           <div className='sliceTileGasPriceIcon'>{svg.gas(9)}</div>
           <div className='sliceTileGasPriceNumber'>{gasPrice}</div>
           <div className='sliceTileGasPriceUnit'>{'gwei'}</div>
         </div>
         <div className='sliceGasEstimateBlock'>
-          {feeEstimatesUSD.map((estimate) =>{
+          {feeEstimatesUSD.map((estimate) => {
             return (
               <div className='gasEstimate'>
                 <div className='gasEstimateRange'>
                   <span className='gasEstimateSymbol'>{!estimate.low || estimate.low >= 0.01 ? `$` : '<$'}</span>
-                  <span className='gasEstimateRangeLow'>{`${!estimate.low ? 0 : estimate.low < 0.01 ? 0.01 : estimate.low < 1 ? estimate.low.toFixed(2) : estimate.low}`}</span>
+                  <span className='gasEstimateRangeLow'>{`${
+                    !estimate.low
+                      ? 0
+                      : estimate.low < 0.01
+                      ? 0.01
+                      : estimate.low < 1
+                      ? estimate.low.toFixed(2)
+                      : estimate.low
+                  }`}</span>
                 </div>
                 <div className='gasEstimateLabel'>{estimate.label}</div>
               </div>
@@ -150,7 +186,7 @@ class Gas extends React.Component {
     )
   }
 
-  render () {
+  render() {
     // const { type, id } = this.store('main.currentNetwork')
     const type = 'ethereum'
     const { id } = this.props
@@ -159,14 +195,13 @@ class Gas extends React.Component {
     const currentSymbol = this.store('main.networks', type, id, 'symbol') || 'ETH'
     const gasPrice = this.levelDisplay(levels.fast)
 
-    const { nextBaseFee, maxPriorityFeePerGas } = (fees || {})
+    const { nextBaseFee, maxPriorityFeePerGas } = fees || {}
 
     const calculatedFees = {
-      actualBaseFee: this.roundGwei((weiToGwei(hexToInt(nextBaseFee)))),
-      priorityFee: this.levelDisplay(maxPriorityFeePerGas)
+      actualBaseFee: this.roundGwei(weiToGwei(hexToInt(nextBaseFee))),
+      priorityFee: this.levelDisplay(maxPriorityFeePerGas),
     }
 
-
     return (
       <div className='sliceContainer' ref={this.ref}>
         {/* <div className='moduleHeader'>{'Fee Monitor'}</div>   */}
@@ -174,48 +209,52 @@ class Gas extends React.Component {
         {this.renderSummary()}
         {this.state.expanded ? (
           <div className='sliceGasBlock'>
-            {this.state.baseHover ? <div className='feeToolTip feeToolTipBase cardShow'>The current base fee is added with a buffer to cover the next 3 blocks, any amount greater than your block's base fee is refunded</div> : null}
-            {this.state.prioHover ? <div className='feeToolTip feeToolTipPriority cardShow'>A priority tip paid to validators is added to incentivize quick inclusion of your transaction into a block</div> : null }
-            <div className='gasItem gasItemSmall' style={ !fees ? { pointerEvents: 'none', opacity: 0 } : {}}>
-              <div className='gasGweiNum'>
-                {calculatedFees.actualBaseFee}
-              </div >
+            {this.state.baseHover ? (
+              <div className='feeToolTip feeToolTipBase cardShow'>
+                The current base fee is added with a buffer to cover the next 3 blocks, any amount greater than your
+                block's base fee is refunded
+              </div>
+            ) : null}
+            {this.state.prioHover ? (
+              <div className='feeToolTip feeToolTipPriority cardShow'>
+                A priority tip paid to validators is added to incentivize quick inclusion of your transaction into a
+                block
+              </div>
+            ) : null}
+            <div className='gasItem gasItemSmall' style={!fees ? { pointerEvents: 'none', opacity: 0 } : {}}>
+              <div className='gasGweiNum'>{calculatedFees.actualBaseFee}</div>
               <span className='gasGweiLabel'>{'GWEI'}</span>
               <span className='gasLevelLabel'>{'Current Base'}</span>
             </div>
             <div className='gasItem gasItemLarge'>
-              <div 
-                className='gasArrow' 
+              <div
+                className='gasArrow'
                 onClick={() => this.setState({ baseHover: true })}
-                style={ !fees ? { pointerEvents: 'none', opacity: 0 } : {}}
+                style={!fees ? { pointerEvents: 'none', opacity: 0 } : {}}
                 onMouseLeave={() => this.setState({ baseHover: false })}
               >
                 <div className='gasArrowNotify'>+</div>
                 <div className='gasArrowInner'>{svg.chevron(27)}</div>
               </div>
-              <div  className='gasGweiNum'>
-                {gasPrice}
-              </div >
+              <div className='gasGweiNum'>{gasPrice}</div>
               <span className='gasGweiLabel'>{'GWEI'}</span>
               <span className='gasLevelLabel'>{'Recommended'}</span>
-              <div 
+              <div
                 className='gasArrow gasArrowRight'
-                style={ !fees ? { pointerEvents: 'none', opacity: 0 } : {}}
+                style={!fees ? { pointerEvents: 'none', opacity: 0 } : {}}
                 onClick={() => this.setState({ prioHover: true })}
                 onMouseLeave={() => this.setState({ prioHover: false })}
               >
                 <div className='gasArrowInner'>{svg.chevron(27)}</div>
               </div>
             </div>
-            <div className='gasItem gasItemSmall' style={ !fees ? { pointerEvents: 'none', opacity: 0 } : {}}>
-              <div  className='gasGweiNum'>
-                {calculatedFees.priorityFee}
-              </div >
+            <div className='gasItem gasItemSmall' style={!fees ? { pointerEvents: 'none', opacity: 0 } : {}}>
+              <div className='gasGweiNum'>{calculatedFees.priorityFee}</div>
               <span className='gasGweiLabel'>{'GWEI'}</span>
               <span className='gasLevelLabel'>{'Priority Tip'}</span>
             </div>
           </div>
-        ) : null }
+        ) : null}
       </div>
     )
   }
diff --git a/resources/Components/RequestItem/index.js b/resources/Components/RequestItem/index.js
index 4c6726676..213a1091d 100644
--- a/resources/Components/RequestItem/index.js
+++ b/resources/Components/RequestItem/index.js
@@ -8,14 +8,14 @@ import RingIcon from '../../../resources/Components/RingIcon'
 import svg from '../../../resources/svg'
 
 class _RequestItem extends React.Component {
-  constructor (props, context) {
+  constructor(props, context) {
     super(props, context)
     this.state = {
-      ago: this.getElapsedTime() + ' ago'
+      ago: this.getElapsedTime() + ' ago',
     }
   }
-  getElapsedTime () {
-    const elapsed = Date.now() - (this.props.req && this.props.req.created || 0)
+  getElapsedTime() {
+    const elapsed = Date.now() - ((this.props.req && this.props.req.created) || 0)
     const secs = elapsed / 1000
     const mins = secs / 60
     const hrs = mins / 60
@@ -26,21 +26,21 @@ class _RequestItem extends React.Component {
     if (secs >= 1) return Math.round(secs) + 's'
     return '0s'
   }
-  componentDidMount () {
+  componentDidMount() {
     this.timer = setInterval(() => {
       this.setState({ ago: this.getElapsedTime() + ' ago' })
     }, 1000)
   }
-  componentWillUnmount () {
+  componentWillUnmount() {
     clearInterval(this.timer)
   }
-  render () {
+  render() {
     const { account, handlerId, i, title, svgLookup, img, color, headerMode, txNonce } = this.props
     const req = this.store('main.accounts', account, 'requests', handlerId)
     return (
-      <div 
+      <div
         key={req.handlerId}
-        className={headerMode ? 'requestItem requestItemHeader' : 'requestItem cardShow' }
+        className={headerMode ? 'requestItem requestItemHeader' : 'requestItem cardShow'}
         onClick={() => {
           console.log('req', req)
           if (req.type === 'transaction') {
@@ -48,8 +48,8 @@ class _RequestItem extends React.Component {
               type: 'gas',
               height: 100,
               data: {
-                chain: req.data.chainId
-              }
+                chain: req.data.chainId,
+              },
             }
             this.props.setAccountView('requestView', { account, req, i, aux })
           } else {
@@ -59,52 +59,45 @@ class _RequestItem extends React.Component {
       >
         <div className='requestItemTitle'>
           <div className='requestItemIcon'>
-            <RingIcon 
-              color={color}
-              svgLookup={svgLookup}
-              img={img}
-            />
+            <RingIcon color={color} svgLookup={svgLookup} img={img} />
           </div>
           <div className='requestItemMain'>
-            <div className='requestItemTitleMain'>
-              {title}
-            </div>
+            <div className='requestItemTitleMain'>{title}</div>
             <div className='requestItemTitleSub'>
-              <div 
-                className='requestItemTitleSubIcon'
-              >
-                {svg.window(10)}
-              </div>
-              <div className='requestItemTitleSubText'>
-                {this.store('main.origins', req.origin, 'name')}
-              </div>
+              <div className='requestItemTitleSubIcon'>{svg.window(10)}</div>
+              <div className='requestItemTitleSubText'>{this.store('main.origins', req.origin, 'name')}</div>
             </div>
           </div>
           {txNonce ? (
-            <div 
-              className='requestMetaNonce' 
-              style={!this.store('main.nonceAdjust') || error || status || mode === 'monitor' ? { pointerEvents: 'none' } : {}}
+            <div
+              className='requestMetaNonce'
+              style={
+                !this.store('main.nonceAdjust') || error || status || mode === 'monitor'
+                  ? { pointerEvents: 'none' }
+                  : {}
+              }
             >
               <div className='txNonceControl'>
-                <div className='txNonceButton txNonceButtonLower' onMouseDown={() => link.send('tray:adjustNonce', req.handlerId, -1)}>
+                <div
+                  className='txNonceButton txNonceButtonLower'
+                  onMouseDown={() => link.send('tray:adjustNonce', req.handlerId, -1)}
+                >
                   {svg.octicon('chevron-down', { height: 14 })}
                 </div>
-                <div className='txNonceButton txNonceButtonRaise' onMouseDown={() => link.send('tray:adjustNonce', req.handlerId, 1)}>
+                <div
+                  className='txNonceButton txNonceButtonRaise'
+                  onMouseDown={() => link.send('tray:adjustNonce', req.handlerId, 1)}
+                >
                   {svg.octicon('chevron-up', { height: 14 })}
                 </div>
-                
               </div>
               <div className='txNonceLabel'>Nonce</div>
-              <div className={nonce === 'TBD' || error ? 'txNonceNumber' : 'txNonceNumber'}>
-                {nonce}
-              </div>
+              <div className={nonce === 'TBD' || error ? 'txNonceNumber' : 'txNonceNumber'}>{nonce}</div>
               {nonce === 'TBD' || error ? <div className='txNonceMarker' /> : null}
             </div>
           ) : (
             <div className='requestItemTitleTime'>
-              <div className='requestItemTitleTimeItem'>
-                {this.state.ago}
-              </div>
+              <div className='requestItemTitleTimeItem'>{this.state.ago}</div>
             </div>
           )}
         </div>
diff --git a/resources/Components/RingIcon/index.js b/resources/Components/RingIcon/index.js
index 4f5454ee2..8bda58de4 100644
--- a/resources/Components/RingIcon/index.js
+++ b/resources/Components/RingIcon/index.js
@@ -4,7 +4,7 @@ import link from '../../../resources/link'
 import svg from '../../../resources/svg'
 
 class RingIcon extends React.Component {
-  constructor (...args) {
+  constructor(...args) {
     super(...args)
     this.state = {}
   }
@@ -16,18 +16,20 @@ class RingIcon extends React.Component {
   //     </div>
   //   )
   // }
-  render () {
+  render() {
     const { color, svgLookup, img, small } = this.props
     return (
-      <div 
+      <div
         className={small ? 'ringIcon ringIconSmall' : 'ringIcon'}
         style={{
-          borderColor: color
+          borderColor: color,
         }}
       >
         <div className='ringIconInner' style={{ background: color }}>
           {svgLookup ? (
-            svg[svgLookup.name] ? svg[svgLookup.name](svgLookup.size) : null
+            svg[svgLookup.name] ? (
+              svg[svgLookup.name](svgLookup.size)
+            ) : null
           ) : img ? (
             <img src={img} />
           ) : (
@@ -39,4 +41,4 @@ class RingIcon extends React.Component {
   }
 }
 
-export default Restore.connect(RingIcon)
\ No newline at end of file
+export default Restore.connect(RingIcon)
diff --git a/resources/Native/index.js b/resources/Native/index.js
index 90c00eb49..130cf1957 100644
--- a/resources/Native/index.js
+++ b/resources/Native/index.js
@@ -3,31 +3,31 @@ import Restore from 'react-restore'
 import link from '../link'
 
 class Title extends React.Component {
-  handleClose () {
+  handleClose() {
     link.send('frame:close')
   }
 
-  handleMin () {
+  handleMin() {
     link.send('frame:min')
   }
 
-  handleMax () {
+  handleMax() {
     link.send('frame:max')
   }
 
-  handleUnmax () {
+  handleUnmax() {
     link.send('frame:unmax')
   }
 
-  handleFull () {
+  handleFull() {
     link.send('frame:full')
   }
 
-  handleUnfull () {
+  handleUnfull() {
     link.send('frame:unfull')
   }
 
-  render () {
+  render() {
     const platform = this.store('platform')
     const { fullscreen, maximized } = this.store('main.frames', window.frameId)
     return (
@@ -35,44 +35,31 @@ class Title extends React.Component {
         {platform === 'darwin' ? (
           <>
             <div className='macGrab' />
-            <div className='macControls'>
-            </div>
+            <div className='macControls'></div>
           </>
         ) : platform === 'win32' ? (
           <>
             <div className='windowsGrab' />
             <div className='windowsControls'>
-              <div 
-                className='windowsControlsButton'
-                onClick={this.handleMin}
-              >
+              <div className='windowsControlsButton' onClick={this.handleMin}>
                 <svg width='11' height='1' viewBox='0 0 11 1'>
                   <path d='m11 0v1h-11v-1z' />
                 </svg>
               </div>
               {maximized || fullscreen ? (
-                <div 
-                  className='windowsControlsButton'
-                  onClick={this.handleUnmax}
-                >
+                <div className='windowsControlsButton' onClick={this.handleUnmax}>
                   <svg width='11' height='11' viewBox='0 0 11 11'>
                     <path d='m11 8.7978h-2.2021v2.2022h-8.7979v-8.7978h2.2021v-2.2022h8.7979zm-3.2979-5.5h-6.6012v6.6011h6.6012zm2.1968-2.1968h-6.6012v1.1011h5.5v5.5h1.1011z' />
                   </svg>
                 </div>
               ) : (
-                <div 
-                  className='windowsControlsButton'
-                  onClick={this.handleMax}
-                >
+                <div className='windowsControlsButton' onClick={this.handleMax}>
                   <svg width='10' height='10' viewBox='0 0 10 10'>
                     <path d='m10-1.6667e-6v10h-10v-10zm-1.001 1.001h-7.998v7.998h7.998z' />
                   </svg>
                 </div>
               )}
-              <div 
-                className='windowsControlsButton'
-                onClick={this.handleClose}
-              >
+              <div className='windowsControlsButton' onClick={this.handleClose}>
                 <svg width='12' height='12' viewBox='0 0 12 12'>
                   <path d='m6.8496 6 5.1504 5.1504-0.84961 0.84961-5.1504-5.1504-5.1504 5.1504-0.84961-0.84961 5.1504-5.1504-5.1504-5.1504 0.84961-0.84961 5.1504 5.1504 5.1504-5.1504 0.84961 0.84961z' />
                 </svg>
@@ -83,37 +70,25 @@ class Title extends React.Component {
           <>
             <div className='linuxGrab' />
             <div className='linuxControls'>
-              <div 
-                className='linuxControlsButton'
-                onClick={this.handleMin}
-              >
+              <div className='linuxControlsButton' onClick={this.handleMin}>
                 <svg className='linuxControlsMin' width='11' height='1' viewBox='0 0 11 1'>
                   <path d='m11 0v1h-11v-1z' />
                 </svg>
               </div>
               {maximized || fullscreen ? (
-                <div 
-                  className='linuxControlsButton'
-                  onClick={this.handleUnmax}
-                >
+                <div className='linuxControlsButton' onClick={this.handleUnmax}>
                   <svg className='linuxControlsMax' width='11' height='11' viewBox='0 0 11 11'>
                     <path d='m11 8.7978h-2.2021v2.2022h-8.7979v-8.7978h2.2021v-2.2022h8.7979zm-3.2979-5.5h-6.6012v6.6011h6.6012zm2.1968-2.1968h-6.6012v1.1011h5.5v5.5h1.1011z' />
                   </svg>
                 </div>
               ) : (
-                <div 
-                  className='linuxControlsButton'
-                  onClick={this.handleMax}
-                >
+                <div className='linuxControlsButton' onClick={this.handleMax}>
                   <svg className='linuxControlsMax' width='10' height='10' viewBox='0 0 10 10'>
                     <path d='m10-1.6667e-6v10h-10v-10zm-1.001 1.001h-7.998v7.998h7.998z' />
                   </svg>
                 </div>
               )}
-              <div 
-                className='linuxControlsButton'
-                onClick={this.handleClose}
-              >
+              <div className='linuxControlsButton' onClick={this.handleClose}>
                 <svg className='linuxControlsClose' width='12' height='12' viewBox='0 0 12 12'>
                   <path d='m6.8496 6 5.1504 5.1504-0.84961 0.84961-5.1504-5.1504-5.1504 5.1504-0.84961-0.84961 5.1504-5.1504-5.1504-5.1504 0.84961-0.84961 5.1504 5.1504 5.1504-5.1504 0.84961 0.84961z' />
                 </svg>
diff --git a/resources/bridge/index.js b/resources/bridge/index.js
index a36376517..9ab572502 100644
--- a/resources/bridge/index.js
+++ b/resources/bridge/index.js
@@ -6,24 +6,31 @@ import rpc from './rpc'
 // process.once('loaded', () => { global.setImmediate = _setImmediate })
 // webFrame.executeJavaScript(`window.__initialState = ${JSON.stringify(state())}`)
 
-const unwrap = v => v !== undefined || v !== null ? JSON.parse(v) : v
-const wrap = v => v !== undefined || v !== null ? JSON.stringify(v) : v
+const unwrap = (v) => (v !== undefined || v !== null ? JSON.parse(v) : v)
+const wrap = (v) => (v !== undefined || v !== null ? JSON.stringify(v) : v)
 const source = 'bridge:link'
 
-window.addEventListener('message', e => {
-  if (e.origin !== 'file://') return
-  const data = unwrap(e.data)
-  if (e.origin === 'file://' && data.source !== source) {
-    if (data.method === 'rpc') return rpc(...data.args, (...args) => e.source.postMessage(wrap({ method: 'rpc', id: data.id, args, source }), e.origin))
-    if (data.method === 'event') return ipcRenderer.send(...data.args)
-    if (data.method === 'invoke') {
-      (async () => {
-        const args = await ipcRenderer.invoke(...data.args)
-        window.postMessage(wrap({ method: 'invoke', channel: 'action', id: data.id, args, source }), '*')
-      })()
+window.addEventListener(
+  'message',
+  (e) => {
+    if (e.origin !== 'file://') return
+    const data = unwrap(e.data)
+    if (e.origin === 'file://' && data.source !== source) {
+      if (data.method === 'rpc')
+        return rpc(...data.args, (...args) =>
+          e.source.postMessage(wrap({ method: 'rpc', id: data.id, args, source }), e.origin)
+        )
+      if (data.method === 'event') return ipcRenderer.send(...data.args)
+      if (data.method === 'invoke') {
+        ;(async () => {
+          const args = await ipcRenderer.invoke(...data.args)
+          window.postMessage(wrap({ method: 'invoke', channel: 'action', id: data.id, args, source }), '*')
+        })()
+      }
     }
-  }
-}, false)
+  },
+  false
+)
 
 ipcRenderer.on('main:action', (...args) => {
   args.shift()
diff --git a/resources/bridge/rpc/index.js b/resources/bridge/rpc/index.js
index 26fb4eeb1..09e977447 100644
--- a/resources/bridge/rpc/index.js
+++ b/resources/bridge/rpc/index.js
@@ -2,13 +2,13 @@ import { ipcRenderer } from 'electron'
 let i = 0
 const newId = () => ++i
 
-const defined = value => value !== undefined || value !== null
+const defined = (value) => value !== undefined || value !== null
 
 const handlers = {}
 
 ipcRenderer.on('main:rpc', (sender, id, ...args) => {
   if (!handlers[id]) return console.log('Message from main RPC had no handler:', args)
-  args = args.map(arg => defined(arg) ? JSON.parse(arg) : arg)
+  args = args.map((arg) => (defined(arg) ? JSON.parse(arg) : arg))
   handlers[id](...args)
   delete handlers[id]
 })
@@ -18,6 +18,6 @@ export default (...args) => {
   if (typeof cb !== 'function') throw new Error('Main RPC requires a callback')
   const id = newId()
   handlers[id] = cb
-  args = args.map(arg => defined(arg) ? JSON.stringify(arg) : arg)
+  args = args.map((arg) => (defined(arg) ? JSON.stringify(arg) : arg))
   ipcRenderer.send('main:rpc', JSON.stringify(id), ...args)
 }
diff --git a/resources/chainMeta/index.js b/resources/chainMeta/index.js
index c1e2a4fcc..b4348b866 100644
--- a/resources/chainMeta/index.js
+++ b/resources/chainMeta/index.js
@@ -10,36 +10,36 @@ export default {
     chainId: 1,
     name: 'mainnet',
     icon: '',
-    primaryColor: 'var(--good)'
+    primaryColor: 'var(--good)',
   },
   '0xa': {
     chainId: 10,
     name: 'optimism',
     icon: optimism,
-    primaryColor: 'rgb(246, 36, 35)'
+    primaryColor: 'rgb(246, 36, 35)',
   },
   '0x64': {
     chainId: 100,
     name: 'xdai',
     icon: xdai,
-    primaryColor: 'rgb(90, 181, 178)'
+    primaryColor: 'rgb(90, 181, 178)',
   },
   '0x89': {
     chainId: 137,
     name: 'polygon',
     icon: polygon,
-    primaryColor: 'rgb(140, 97, 232)'
+    primaryColor: 'rgb(140, 97, 232)',
   },
   '0xfa': {
     chainId: 250,
     name: 'fantom',
     icon: fantom,
-    primaryColor: 'rgb(51, 103, 246)'
+    primaryColor: 'rgb(51, 103, 246)',
   },
   '0xa4b1': {
     chainId: 42161,
     name: 'arbitrum',
     icon: arbitrum,
-    primaryColor: 'rgb(62, 173, 241)'
-  }
+    primaryColor: 'rgb(62, 173, 241)',
+  },
 }
diff --git a/resources/connections/index.ts b/resources/connections/index.ts
index e3f5945aa..0118e5d16 100644
--- a/resources/connections/index.ts
+++ b/resources/connections/index.ts
@@ -1,23 +1,21 @@
 const validProtocols = ['ws://', 'wss://', 'http://', 'https://']
 
-export function okProtocol (location: string) {
+export function okProtocol(location: string) {
   if (location === 'injected') return true
   if (location.endsWith('.ipc')) return true
 
-  const validProtocol = validProtocols.find(p => location.startsWith(p))
+  const validProtocol = validProtocols.find((p) => location.startsWith(p))
   if (validProtocol) {
     const target = location.substring(validProtocol.length)
 
     // dont allow connections back to Frame
-    return !!target &&
-      target !== 'localhost:1248' &&
-      target !== '127.0.0.1:1248'
+    return !!target && target !== 'localhost:1248' && target !== '127.0.0.1:1248'
   }
 
   return false
 }
 
-export function okPort (location: string) {
+export function okPort(location: string) {
   const match = location.match(/^(?:https?|wss?).*:(?<port>\d{4,})/)
 
   if (match) {
@@ -30,7 +28,7 @@ export function okPort (location: string) {
 }
 
 // returns a (truthy) error message if invalid, otherwise will return false
-export function isInvalidCustomTarget (target: string) {
+export function isInvalidCustomTarget(target: string) {
   if (!okProtocol(target)) return 'invalid target'
   if (!okPort(target)) return 'invalid port'
 
diff --git a/resources/constants/index.ts b/resources/constants/index.ts
index 1e5be7ac5..4417d1629 100644
--- a/resources/constants/index.ts
+++ b/resources/constants/index.ts
@@ -1,5 +1,5 @@
 export enum ApprovalType {
   OtherChainApproval = 'approveOtherChain',
   GasLimitApproval = 'approveGasLimit',
-  TokenSpendApproval = 'approveTokenSpend'
+  TokenSpendApproval = 'approveTokenSpend',
 }
diff --git a/resources/domain/transaction/index.ts b/resources/domain/transaction/index.ts
index 1a2dd0851..9d674cd23 100644
--- a/resources/domain/transaction/index.ts
+++ b/resources/domain/transaction/index.ts
@@ -1,18 +1,18 @@
 import { JsonTx } from '@ethereumjs/tx'
 
 export interface TransactionData extends Omit<JsonTx, 'chainId' | 'type'> {
-  warning?: string,
-  gas?: string,
-  from?: string,
-  feesUpdated?: boolean,
-  chainId: string,
+  warning?: string
+  gas?: string
+  from?: string
+  feesUpdated?: boolean
+  chainId: string
   type: string
 }
 
-export function typeSupportsBaseFee (type: string) {
+export function typeSupportsBaseFee(type: string) {
   return parseInt(type || '0') === 2
 }
 
-export function usesBaseFee (rawTx: TransactionData) {
+export function usesBaseFee(rawTx: TransactionData) {
   return typeSupportsBaseFee(rawTx.type)
 }
diff --git a/resources/link/index.js b/resources/link/index.js
index 7fe13a4ee..edd5cb1ac 100644
--- a/resources/link/index.js
+++ b/resources/link/index.js
@@ -3,8 +3,8 @@ import EventEmitter from 'events'
 
 const source = 'tray:link'
 
-const unwrap = v => v !== undefined || v !== null ? JSON.parse(v) : v
-const wrap = v => v !== undefined || v !== null ? JSON.stringify(v) : v
+const unwrap = (v) => (v !== undefined || v !== null ? JSON.parse(v) : v)
+const wrap = (v) => (v !== undefined || v !== null ? JSON.stringify(v) : v)
 
 const handlers = {}
 
@@ -27,45 +27,49 @@ link.invoke = (...args) => {
   })
 }
 
-window.addEventListener('message', e => {
-  if (e.origin !== 'file://') return
-  const data = unwrap(e.data)
-  const args = data.args || []
-  if (e.origin === 'file://' && data.source !== source) {
-    if (data.method === 'rpc') {
-      if (!handlers[data.id]) return console.log('link.rpc response had no handler')
-      handlers[data.id](...args)
-      delete handlers[data.id]
-    } else if (data.method === 'invoke') {
-      if (!handlers[data.id]) return console.log('link.invoke response had no handler')
-      handlers[data.id](args)
-      delete handlers[data.id]
-    } else if (data.method === 'event') {
-      if (!data.channel) return console.log('link.on event had no channel')
-      link.emit(data.channel, ...args)
-    } else if (data.method === 'reload') {
-      if (data.type === 'css') {
-        document.querySelectorAll('link').forEach(sheet => {
-          if (sheet.visited !== true && sheet.href.indexOf(data.target) > -1) {
-            if (sheet.isLoaded === false || !sheet.href || !(sheet.href.indexOf('.css') > -1)) return
-            sheet.visited = true
-            const clone = sheet.cloneNode()
-            clone.isLoaded = false
-            clone.addEventListener('load', () => {
-              clone.isLoaded = true
-              sheet.remove()
-            })
-            clone.addEventListener('error', () => {
-              clone.isLoaded = true
-              sheet.remove()
-            })
-            clone.href = sheet.href
-            sheet.parentNode.appendChild(clone)
-          }
-        })
+window.addEventListener(
+  'message',
+  (e) => {
+    if (e.origin !== 'file://') return
+    const data = unwrap(e.data)
+    const args = data.args || []
+    if (e.origin === 'file://' && data.source !== source) {
+      if (data.method === 'rpc') {
+        if (!handlers[data.id]) return console.log('link.rpc response had no handler')
+        handlers[data.id](...args)
+        delete handlers[data.id]
+      } else if (data.method === 'invoke') {
+        if (!handlers[data.id]) return console.log('link.invoke response had no handler')
+        handlers[data.id](args)
+        delete handlers[data.id]
+      } else if (data.method === 'event') {
+        if (!data.channel) return console.log('link.on event had no channel')
+        link.emit(data.channel, ...args)
+      } else if (data.method === 'reload') {
+        if (data.type === 'css') {
+          document.querySelectorAll('link').forEach((sheet) => {
+            if (sheet.visited !== true && sheet.href.indexOf(data.target) > -1) {
+              if (sheet.isLoaded === false || !sheet.href || !(sheet.href.indexOf('.css') > -1)) return
+              sheet.visited = true
+              const clone = sheet.cloneNode()
+              clone.isLoaded = false
+              clone.addEventListener('load', () => {
+                clone.isLoaded = true
+                sheet.remove()
+              })
+              clone.addEventListener('error', () => {
+                clone.isLoaded = true
+                sheet.remove()
+              })
+              clone.href = sheet.href
+              sheet.parentNode.appendChild(clone)
+            }
+          })
+        }
       }
     }
-  }
-}, false)
+  },
+  false
+)
 
 export default link
diff --git a/resources/svg/index.js b/resources/svg/index.js
index d3bebce2d..8d3025037 100644
--- a/resources/svg/index.js
+++ b/resources/svg/index.js
@@ -2,92 +2,124 @@ import React from 'react'
 import Octicon, { getIconByName } from '@githubprimer/octicons-react'
 
 export default {
-  logo: size => {
+  logo: (size) => {
     return (
       <div style={{ width: size + 'px', height: size + 'px' }}>
         <svg viewBox='0 0 153.42 152.94'>
-          <path fill='currentColor' d='M145.15,75.59v-58a9.29,9.29,0,0,0-9.3-9.28H77.65a2.24,2.24,0,0,1-1.56-.64l-7-7A2.24,2.24,0,0,0,67.48,0H9.31A9.29,9.29,0,0,0,0,9.27H0v58a2.16,2.16,0,0,0,.65,1.55l7,7a2.16,2.16,0,0,1,.65,1.55v58a9.29,9.29,0,0,0,9.3,9.28H75.8a2.24,2.24,0,0,1,1.56.64l7,7a2.24,2.24,0,0,0,1.56.64h58.19a9.29,9.29,0,0,0,9.31-9.27h0v-58a2.16,2.16,0,0,0-.65-1.55l-7-7A2.17,2.17,0,0,1,145.15,75.59Zm-39.8,30.69H48.18A1.32,1.32,0,0,1,46.87,105V48a1.35,1.35,0,0,1,1.31-1.33h57.17A1.34,1.34,0,0,1,106.68,48v57a1.33,1.33,0,0,1-1.33,1.32Z' transform='translate(0 0)' />
+          <path
+            fill='currentColor'
+            d='M145.15,75.59v-58a9.29,9.29,0,0,0-9.3-9.28H77.65a2.24,2.24,0,0,1-1.56-.64l-7-7A2.24,2.24,0,0,0,67.48,0H9.31A9.29,9.29,0,0,0,0,9.27H0v58a2.16,2.16,0,0,0,.65,1.55l7,7a2.16,2.16,0,0,1,.65,1.55v58a9.29,9.29,0,0,0,9.3,9.28H75.8a2.24,2.24,0,0,1,1.56.64l7,7a2.24,2.24,0,0,0,1.56.64h58.19a9.29,9.29,0,0,0,9.31-9.27h0v-58a2.16,2.16,0,0,0-.65-1.55l-7-7A2.17,2.17,0,0,1,145.15,75.59Zm-39.8,30.69H48.18A1.32,1.32,0,0,1,46.87,105V48a1.35,1.35,0,0,1,1.31-1.33h57.17A1.34,1.34,0,0,1,106.68,48v57a1.33,1.33,0,0,1-1.33,1.32Z'
+            transform='translate(0 0)'
+          />
         </svg>
       </div>
     )
   },
-  send: size => {
+  send: (size) => {
     return (
       <div style={{ width: size + 'px', height: size + 'px' }}>
         <svg viewBox='0 0 512 512'>
-          <path fill='currentColor' d='M476 3.2L12.5 270.6c-18.1 10.4-15.8 35.6 2.2 43.2L121 358.4l287.3-253.2c5.5-4.9 13.3 2.6 8.6 8.3L176 407v80.5c0 23.6 28.5 32.9 42.5 15.8L282 426l124.6 52.2c14.2 6 30.4-2.9 33-18.2l72-432C515 7.8 493.3-6.8 476 3.2z' />
+          <path
+            fill='currentColor'
+            d='M476 3.2L12.5 270.6c-18.1 10.4-15.8 35.6 2.2 43.2L121 358.4l287.3-253.2c5.5-4.9 13.3 2.6 8.6 8.3L176 407v80.5c0 23.6 28.5 32.9 42.5 15.8L282 426l124.6 52.2c14.2 6 30.4-2.9 33-18.2l72-432C515 7.8 493.3-6.8 476 3.2z'
+          />
         </svg>
       </div>
     )
   },
-  sign: size => {
+  sign: (size) => {
     return (
       <div style={{ width: size + 'px', height: size + 'px' }}>
         <svg viewBox='0 0 640 512'>
-          <path fill='currentColor' d='M623.2 192c-51.8 3.5-125.7 54.7-163.1 71.5-29.1 13.1-54.2 24.4-76.1 24.4-22.6 0-26-16.2-21.3-51.9 1.1-8 11.7-79.2-42.7-76.1-25.1 1.5-64.3 24.8-169.5 126L192 182.2c30.4-75.9-53.2-151.5-129.7-102.8L7.4 116.3C0 121-2.2 130.9 2.5 138.4l17.2 27c4.7 7.5 14.6 9.7 22.1 4.9l58-38.9c18.4-11.7 40.7 7.2 32.7 27.1L34.3 404.1C27.5 421 37 448 64 448c8.3 0 16.5-3.2 22.6-9.4 42.2-42.2 154.7-150.7 211.2-195.8-2.2 28.5-2.1 58.9 20.6 83.8 15.3 16.8 37.3 25.3 65.5 25.3 35.6 0 68-14.6 102.3-30 33-14.8 99-62.6 138.4-65.8 8.5-.7 15.2-7.3 15.2-15.8v-32.1c.2-9.1-7.5-16.8-16.6-16.2z' />
+          <path
+            fill='currentColor'
+            d='M623.2 192c-51.8 3.5-125.7 54.7-163.1 71.5-29.1 13.1-54.2 24.4-76.1 24.4-22.6 0-26-16.2-21.3-51.9 1.1-8 11.7-79.2-42.7-76.1-25.1 1.5-64.3 24.8-169.5 126L192 182.2c30.4-75.9-53.2-151.5-129.7-102.8L7.4 116.3C0 121-2.2 130.9 2.5 138.4l17.2 27c4.7 7.5 14.6 9.7 22.1 4.9l58-38.9c18.4-11.7 40.7 7.2 32.7 27.1L34.3 404.1C27.5 421 37 448 64 448c8.3 0 16.5-3.2 22.6-9.4 42.2-42.2 154.7-150.7 211.2-195.8-2.2 28.5-2.1 58.9 20.6 83.8 15.3 16.8 37.3 25.3 65.5 25.3 35.6 0 68-14.6 102.3-30 33-14.8 99-62.6 138.4-65.8 8.5-.7 15.2-7.3 15.2-15.8v-32.1c.2-9.1-7.5-16.8-16.6-16.2z'
+          />
         </svg>
       </div>
     )
   },
-  include: size => {
+  include: (size) => {
     return (
       <div style={{ width: size + 'px', height: size + 'px' }}>
         <svg viewBox='0 0 512 512'>
-          <path fill='currentColor' d='M12.41 148.02l232.94 105.67c6.8 3.09 14.49 3.09 21.29 0l232.94-105.67c16.55-7.51 16.55-32.52 0-40.03L266.65 2.31a25.607 25.607 0 0 0-21.29 0L12.41 107.98c-16.55 7.51-16.55 32.53 0 40.04zm487.18 88.28l-58.09-26.33-161.64 73.27c-7.56 3.43-15.59 5.17-23.86 5.17s-16.29-1.74-23.86-5.17L70.51 209.97l-58.1 26.33c-16.55 7.5-16.55 32.5 0 40l232.94 105.59c6.8 3.08 14.49 3.08 21.29 0L499.59 276.3c16.55-7.5 16.55-32.5 0-40zm0 127.8l-57.87-26.23-161.86 73.37c-7.56 3.43-15.59 5.17-23.86 5.17s-16.29-1.74-23.86-5.17L70.29 337.87 12.41 364.1c-16.55 7.5-16.55 32.5 0 40l232.94 105.59c6.8 3.08 14.49 3.08 21.29 0L499.59 404.1c16.55-7.5 16.55-32.5 0-40z' />
+          <path
+            fill='currentColor'
+            d='M12.41 148.02l232.94 105.67c6.8 3.09 14.49 3.09 21.29 0l232.94-105.67c16.55-7.51 16.55-32.52 0-40.03L266.65 2.31a25.607 25.607 0 0 0-21.29 0L12.41 107.98c-16.55 7.51-16.55 32.53 0 40.04zm487.18 88.28l-58.09-26.33-161.64 73.27c-7.56 3.43-15.59 5.17-23.86 5.17s-16.29-1.74-23.86-5.17L70.51 209.97l-58.1 26.33c-16.55 7.5-16.55 32.5 0 40l232.94 105.59c6.8 3.08 14.49 3.08 21.29 0L499.59 276.3c16.55-7.5 16.55-32.5 0-40zm0 127.8l-57.87-26.23-161.86 73.37c-7.56 3.43-15.59 5.17-23.86 5.17s-16.29-1.74-23.86-5.17L70.29 337.87 12.41 364.1c-16.55 7.5-16.55 32.5 0 40l232.94 105.59c6.8 3.08 14.49 3.08 21.29 0L499.59 404.1c16.55-7.5 16.55-32.5 0-40z'
+          />
         </svg>
       </div>
     )
   },
-  longArrow: size => {
+  longArrow: (size) => {
     return (
       <div style={{ width: size + 'px', height: size + 'px' }}>
         <svg viewBox='0 0 448 512'>
-          <path fill='currentColor' d='M313.941 216H12c-6.627 0-12 5.373-12 12v56c0 6.627 5.373 12 12 12h301.941v46.059c0 21.382 25.851 32.09 40.971 16.971l86.059-86.059c9.373-9.373 9.373-24.569 0-33.941l-86.059-86.059c-15.119-15.119-40.971-4.411-40.971 16.971V216z' />
+          <path
+            fill='currentColor'
+            d='M313.941 216H12c-6.627 0-12 5.373-12 12v56c0 6.627 5.373 12 12 12h301.941v46.059c0 21.382 25.851 32.09 40.971 16.971l86.059-86.059c9.373-9.373 9.373-24.569 0-33.941l-86.059-86.059c-15.119-15.119-40.971-4.411-40.971 16.971V216z'
+          />
         </svg>
       </div>
     )
   },
-  txSection: size => {
+  txSection: (size) => {
     return (
       <div style={{ width: '410px', height: '50px' }}>
         <svg viewBox='0 0 445.47 54.55'>
-          <path class='a' d='M328.82,353.55H762.58a3.85,3.85,0,0,1,3.57,2.41l6.47,16.18a23.36,23.36,0,0,1,0,17.36l-6.47,16.18a3.86,3.86,0,0,1-3.57,2.41H328.82Z' transform='translate(-328.82 -353.55)' />
+          <path
+            class='a'
+            d='M328.82,353.55H762.58a3.85,3.85,0,0,1,3.57,2.41l6.47,16.18a23.36,23.36,0,0,1,0,17.36l-6.47,16.18a3.86,3.86,0,0,1-3.57,2.41H328.82Z'
+            transform='translate(-328.82 -353.55)'
+          />
         </svg>
       </div>
     )
   },
-  seedling: size => {
+  seedling: (size) => {
     return (
       <div style={{ width: size + 'px', height: size + 'px' }}>
         <svg viewBox='0 0 512 512'>
-          <path fill='currentColor' d='M64 96H0c0 123.7 100.3 224 224 224v144c0 8.8 7.2 16 16 16h32c8.8 0 16-7.2 16-16V320C288 196.3 187.7 96 64 96zm384-64c-84.2 0-157.4 46.5-195.7 115.2 27.7 30.2 48.2 66.9 59 107.6C424 243.1 512 147.9 512 32h-64z' />
+          <path
+            fill='currentColor'
+            d='M64 96H0c0 123.7 100.3 224 224 224v144c0 8.8 7.2 16 16 16h32c8.8 0 16-7.2 16-16V320C288 196.3 187.7 96 64 96zm384-64c-84.2 0-157.4 46.5-195.7 115.2 27.7 30.2 48.2 66.9 59 107.6C424 243.1 512 147.9 512 32h-64z'
+          />
         </svg>
       </div>
     )
   },
-  hex: size => {
+  hex: (size) => {
     return (
       <div style={{ width: size + 'px', height: size + 'px' }}>
         <svg viewBox='0 0 245 245'>
-          <path fill='currentColor' d='M99.5 5.2583302491977a39 39 0 0 1 39 0l69.253175473055 39.983339501605a39 39 0 0 1 19.5 33.774990747593l0 79.966679003209a39 39 0 0 1 -19.5 33.774990747593l-69.253175473055 39.983339501605a39 39 0 0 1 -39 0l-69.253175473055 -39.983339501605a39 39 0 0 1 -19.5 -33.774990747593l1.2735971654952e-13 -79.966679003209a39 39 0 0 1 19.5 -33.774990747593' />
+          <path
+            fill='currentColor'
+            d='M99.5 5.2583302491977a39 39 0 0 1 39 0l69.253175473055 39.983339501605a39 39 0 0 1 19.5 33.774990747593l0 79.966679003209a39 39 0 0 1 -19.5 33.774990747593l-69.253175473055 39.983339501605a39 39 0 0 1 -39 0l-69.253175473055 -39.983339501605a39 39 0 0 1 -19.5 -33.774990747593l1.2735971654952e-13 -79.966679003209a39 39 0 0 1 19.5 -33.774990747593'
+          />
         </svg>
       </div>
     )
   },
-  swoop: size => {
+  swoop: (size) => {
     return (
       <div style={{ width: '120%', height: '1200px' }}>
         <svg viewBox='0 0 121.89 524.31'>
-          <path fill='currentColor' d='M75.82,460C56.2,465.69,13.16,478.35.5,522.65V.5H121.39V411.09C121.39,449.87,97.11,453.81,75.82,460Z' />
+          <path
+            fill='currentColor'
+            d='M75.82,460C56.2,465.69,13.16,478.35.5,522.65V.5H121.39V411.09C121.39,449.87,97.11,453.81,75.82,460Z'
+          />
         </svg>
       </div>
     )
   },
-  lightbulb: size => {
+  lightbulb: (size) => {
     return (
       <div style={{ width: size + 'px', height: size + 'px' }}>
         <svg viewBox='0 0 352 512'>
-          <path fill='currentColor' d='M96.06 454.35c.01 6.29 1.87 12.45 5.36 17.69l17.09 25.69a31.99 31.99 0 0 0 26.64 14.28h61.71a31.99 31.99 0 0 0 26.64-14.28l17.09-25.69a31.989 31.989 0 0 0 5.36-17.69l.04-38.35H96.01l.05 38.35zM0 176c0 44.37 16.45 84.85 43.56 115.78 16.52 18.85 42.36 58.23 52.21 91.45.04.26.07.52.11.78h160.24c.04-.26.07-.51.11-.78 9.85-33.22 35.69-72.6 52.21-91.45C335.55 260.85 352 220.37 352 176 352 78.61 272.91-.3 175.45 0 73.44.31 0 82.97 0 176zm176-80c-44.11 0-80 35.89-80 80 0 8.84-7.16 16-16 16s-16-7.16-16-16c0-61.76 50.24-112 112-112 8.84 0 16 7.16 16 16s-7.16 16-16 16z' />
+          <path
+            fill='currentColor'
+            d='M96.06 454.35c.01 6.29 1.87 12.45 5.36 17.69l17.09 25.69a31.99 31.99 0 0 0 26.64 14.28h61.71a31.99 31.99 0 0 0 26.64-14.28l17.09-25.69a31.989 31.989 0 0 0 5.36-17.69l.04-38.35H96.01l.05 38.35zM0 176c0 44.37 16.45 84.85 43.56 115.78 16.52 18.85 42.36 58.23 52.21 91.45.04.26.07.52.11.78h160.24c.04-.26.07-.51.11-.78 9.85-33.22 35.69-72.6 52.21-91.45C335.55 260.85 352 220.37 352 176 352 78.61 272.91-.3 175.45 0 73.44.31 0 82.97 0 176zm176-80c-44.11 0-80 35.89-80 80 0 8.84-7.16 16-16 16s-16-7.16-16-16c0-61.76 50.24-112 112-112 8.84 0 16 7.16 16 16s-7.16 16-16 16z'
+          />
         </svg>
       </div>
     )
@@ -101,242 +133,340 @@ export default {
   //     </div>
   //   )
   // },
-  flame: size => {
+  flame: (size) => {
     return (
       <div style={{ width: size + 'px', height: size + 'px' }}>
         <svg viewBox='0 0 24 24'>
-          <path fill='currentColor' d='M12.185 21.5c4.059 0 7.065-2.84 7.065-6.75 0-2.337-1.093-3.489-2.678-5.158l-.021-.023c-1.44-1.517-3.139-3.351-3.649-6.557a6.14 6.14 0 00-1.911 1.76c-.787 1.144-1.147 2.633-.216 4.495.603 1.205.777 2.74-.277 3.794-.657.657-1.762 1.1-2.956.586-.752-.324-1.353-.955-1.838-1.79-.567.706-.954 1.74-.954 2.893 0 3.847 3.288 6.75 7.435 6.75zm2.08-19.873c-.017-.345-.296-.625-.632-.543-2.337.575-6.605 4.042-4.2 8.854.474.946.392 1.675.004 2.062-.64.64-1.874.684-2.875-1.815-.131-.327-.498-.509-.803-.334-1.547.888-2.509 2.86-2.509 4.899 0 4.829 4.122 8.25 8.935 8.25 4.812 0 8.565-3.438 8.565-8.25 0-2.939-1.466-4.482-3.006-6.102-1.61-1.694-3.479-3.476-3.479-7.021z' />
+          <path
+            fill='currentColor'
+            d='M12.185 21.5c4.059 0 7.065-2.84 7.065-6.75 0-2.337-1.093-3.489-2.678-5.158l-.021-.023c-1.44-1.517-3.139-3.351-3.649-6.557a6.14 6.14 0 00-1.911 1.76c-.787 1.144-1.147 2.633-.216 4.495.603 1.205.777 2.74-.277 3.794-.657.657-1.762 1.1-2.956.586-.752-.324-1.353-.955-1.838-1.79-.567.706-.954 1.74-.954 2.893 0 3.847 3.288 6.75 7.435 6.75zm2.08-19.873c-.017-.345-.296-.625-.632-.543-2.337.575-6.605 4.042-4.2 8.854.474.946.392 1.675.004 2.062-.64.64-1.874.684-2.875-1.815-.131-.327-.498-.509-.803-.334-1.547.888-2.509 2.86-2.509 4.899 0 4.829 4.122 8.25 8.935 8.25 4.812 0 8.565-3.438 8.565-8.25 0-2.939-1.466-4.482-3.006-6.102-1.61-1.694-3.479-3.476-3.479-7.021z'
+          />
         </svg>
       </div>
     )
   },
-  quote: size => {
+  quote: (size) => {
     return (
       <div style={{ width: size + 'px', height: size + 'px', paddingTop: '1px' }}>
         <svg viewBox='0 0 512 512'>
-          <path fill='currentColor' d='M464 256h-80v-64c0-35.3 28.7-64 64-64h8c13.3 0 24-10.7 24-24V56c0-13.3-10.7-24-24-24h-8c-88.4 0-160 71.6-160 160v240c0 26.5 21.5 48 48 48h128c26.5 0 48-21.5 48-48V304c0-26.5-21.5-48-48-48zm-288 0H96v-64c0-35.3 28.7-64 64-64h8c13.3 0 24-10.7 24-24V56c0-13.3-10.7-24-24-24h-8C71.6 32 0 103.6 0 192v240c0 26.5 21.5 48 48 48h128c26.5 0 48-21.5 48-48V304c0-26.5-21.5-48-48-48z' />
+          <path
+            fill='currentColor'
+            d='M464 256h-80v-64c0-35.3 28.7-64 64-64h8c13.3 0 24-10.7 24-24V56c0-13.3-10.7-24-24-24h-8c-88.4 0-160 71.6-160 160v240c0 26.5 21.5 48 48 48h128c26.5 0 48-21.5 48-48V304c0-26.5-21.5-48-48-48zm-288 0H96v-64c0-35.3 28.7-64 64-64h8c13.3 0 24-10.7 24-24V56c0-13.3-10.7-24-24-24h-8C71.6 32 0 103.6 0 192v240c0 26.5 21.5 48 48 48h128c26.5 0 48-21.5 48-48V304c0-26.5-21.5-48-48-48z'
+          />
         </svg>
       </div>
     )
   },
-  ring: size => {
+  ring: (size) => {
     return (
       <div style={{ width: size + 'px', height: size + 'px', paddingTop: '3px' }}>
         <svg viewBox='0 0 512 512'>
-          <path fill='currentColor' d='M256 64C110.06 64 0 125.91 0 208v98.13C0 384.48 114.62 448 256 448s256-63.52 256-141.87V208c0-82.09-110.06-144-256-144zm0 64c106.04 0 192 35.82 192 80 0 9.26-3.97 18.12-10.91 26.39C392.15 208.21 328.23 192 256 192s-136.15 16.21-181.09 42.39C67.97 226.12 64 217.26 64 208c0-44.18 85.96-80 192-80zM120.43 264.64C155.04 249.93 201.64 240 256 240s100.96 9.93 135.57 24.64C356.84 279.07 308.93 288 256 288s-100.84-8.93-135.57-23.36z' />
+          <path
+            fill='currentColor'
+            d='M256 64C110.06 64 0 125.91 0 208v98.13C0 384.48 114.62 448 256 448s256-63.52 256-141.87V208c0-82.09-110.06-144-256-144zm0 64c106.04 0 192 35.82 192 80 0 9.26-3.97 18.12-10.91 26.39C392.15 208.21 328.23 192 256 192s-136.15 16.21-181.09 42.39C67.97 226.12 64 217.26 64 208c0-44.18 85.96-80 192-80zM120.43 264.64C155.04 249.93 201.64 240 256 240s100.96 9.93 135.57 24.64C356.84 279.07 308.93 288 256 288s-100.84-8.93-135.57-23.36z'
+          />
         </svg>
       </div>
     )
   },
-  fingerprint: size => {
+  fingerprint: (size) => {
     return (
       <div style={{ width: size + 'px', height: size + 'px', paddingBottom: '2px' }}>
         <svg viewBox='0 0 512 512'>
-          <path fill='currentColor' d='M256.12 245.96c-13.25 0-24 10.74-24 24 1.14 72.25-8.14 141.9-27.7 211.55-2.73 9.72 2.15 30.49 23.12 30.49 10.48 0 20.11-6.92 23.09-17.52 13.53-47.91 31.04-125.41 29.48-224.52.01-13.25-10.73-24-23.99-24zm-.86-81.73C194 164.16 151.25 211.3 152.1 265.32c.75 47.94-3.75 95.91-13.37 142.55-2.69 12.98 5.67 25.69 18.64 28.36 13.05 2.67 25.67-5.66 28.36-18.64 10.34-50.09 15.17-101.58 14.37-153.02-.41-25.95 19.92-52.49 54.45-52.34 31.31.47 57.15 25.34 57.62 55.47.77 48.05-2.81 96.33-10.61 143.55-2.17 13.06 6.69 25.42 19.76 27.58 19.97 3.33 26.81-15.1 27.58-19.77 8.28-50.03 12.06-101.21 11.27-152.11-.88-55.8-47.94-101.88-104.91-102.72zm-110.69-19.78c-10.3-8.34-25.37-6.8-33.76 3.48-25.62 31.5-39.39 71.28-38.75 112 .59 37.58-2.47 75.27-9.11 112.05-2.34 13.05 6.31 25.53 19.36 27.89 20.11 3.5 27.07-14.81 27.89-19.36 7.19-39.84 10.5-80.66 9.86-121.33-.47-29.88 9.2-57.88 28-80.97 8.35-10.28 6.79-25.39-3.49-33.76zm109.47-62.33c-15.41-.41-30.87 1.44-45.78 4.97-12.89 3.06-20.87 15.98-17.83 28.89 3.06 12.89 16 20.83 28.89 17.83 11.05-2.61 22.47-3.77 34-3.69 75.43 1.13 137.73 61.5 138.88 134.58.59 37.88-1.28 76.11-5.58 113.63-1.5 13.17 7.95 25.08 21.11 26.58 16.72 1.95 25.51-11.88 26.58-21.11a929.06 929.06 0 0 0 5.89-119.85c-1.56-98.75-85.07-180.33-186.16-181.83zm252.07 121.45c-2.86-12.92-15.51-21.2-28.61-18.27-12.94 2.86-21.12 15.66-18.26 28.61 4.71 21.41 4.91 37.41 4.7 61.6-.11 13.27 10.55 24.09 23.8 24.2h.2c13.17 0 23.89-10.61 24-23.8.18-22.18.4-44.11-5.83-72.34zm-40.12-90.72C417.29 43.46 337.6 1.29 252.81.02 183.02-.82 118.47 24.91 70.46 72.94 24.09 119.37-.9 181.04.14 246.65l-.12 21.47c-.39 13.25 10.03 24.31 23.28 24.69.23.02.48.02.72.02 12.92 0 23.59-10.3 23.97-23.3l.16-23.64c-.83-52.5 19.16-101.86 56.28-139 38.76-38.8 91.34-59.67 147.68-58.86 69.45 1.03 134.73 35.56 174.62 92.39 7.61 10.86 22.56 13.45 33.42 5.86 10.84-7.62 13.46-22.59 5.84-33.43z' />
+          <path
+            fill='currentColor'
+            d='M256.12 245.96c-13.25 0-24 10.74-24 24 1.14 72.25-8.14 141.9-27.7 211.55-2.73 9.72 2.15 30.49 23.12 30.49 10.48 0 20.11-6.92 23.09-17.52 13.53-47.91 31.04-125.41 29.48-224.52.01-13.25-10.73-24-23.99-24zm-.86-81.73C194 164.16 151.25 211.3 152.1 265.32c.75 47.94-3.75 95.91-13.37 142.55-2.69 12.98 5.67 25.69 18.64 28.36 13.05 2.67 25.67-5.66 28.36-18.64 10.34-50.09 15.17-101.58 14.37-153.02-.41-25.95 19.92-52.49 54.45-52.34 31.31.47 57.15 25.34 57.62 55.47.77 48.05-2.81 96.33-10.61 143.55-2.17 13.06 6.69 25.42 19.76 27.58 19.97 3.33 26.81-15.1 27.58-19.77 8.28-50.03 12.06-101.21 11.27-152.11-.88-55.8-47.94-101.88-104.91-102.72zm-110.69-19.78c-10.3-8.34-25.37-6.8-33.76 3.48-25.62 31.5-39.39 71.28-38.75 112 .59 37.58-2.47 75.27-9.11 112.05-2.34 13.05 6.31 25.53 19.36 27.89 20.11 3.5 27.07-14.81 27.89-19.36 7.19-39.84 10.5-80.66 9.86-121.33-.47-29.88 9.2-57.88 28-80.97 8.35-10.28 6.79-25.39-3.49-33.76zm109.47-62.33c-15.41-.41-30.87 1.44-45.78 4.97-12.89 3.06-20.87 15.98-17.83 28.89 3.06 12.89 16 20.83 28.89 17.83 11.05-2.61 22.47-3.77 34-3.69 75.43 1.13 137.73 61.5 138.88 134.58.59 37.88-1.28 76.11-5.58 113.63-1.5 13.17 7.95 25.08 21.11 26.58 16.72 1.95 25.51-11.88 26.58-21.11a929.06 929.06 0 0 0 5.89-119.85c-1.56-98.75-85.07-180.33-186.16-181.83zm252.07 121.45c-2.86-12.92-15.51-21.2-28.61-18.27-12.94 2.86-21.12 15.66-18.26 28.61 4.71 21.41 4.91 37.41 4.7 61.6-.11 13.27 10.55 24.09 23.8 24.2h.2c13.17 0 23.89-10.61 24-23.8.18-22.18.4-44.11-5.83-72.34zm-40.12-90.72C417.29 43.46 337.6 1.29 252.81.02 183.02-.82 118.47 24.91 70.46 72.94 24.09 119.37-.9 181.04.14 246.65l-.12 21.47c-.39 13.25 10.03 24.31 23.28 24.69.23.02.48.02.72.02 12.92 0 23.59-10.3 23.97-23.3l.16-23.64c-.83-52.5 19.16-101.86 56.28-139 38.76-38.8 91.34-59.67 147.68-58.86 69.45 1.03 134.73 35.56 174.62 92.39 7.61 10.86 22.56 13.45 33.42 5.86 10.84-7.62 13.46-22.59 5.84-33.43z'
+          />
         </svg>
       </div>
     )
   },
-  trezor: size => {
+  trezor: (size) => {
     return (
-      <div style={{ width: size + 'px', height: (size + 2) + 'px' }}>
+      <div style={{ width: size + 'px', height: size + 2 + 'px' }}>
         <svg viewBox='0 0 522.5 800' transform='translate(1, -3)'>
-          <path fill='currentColor' d='M249 0C149.9 0 69.7 80.2 69.7 179.3v67.2C34.9 252.8 0 261.2 0 272.1v350.7s0 9.7 10.9 14.3c39.5 16 194.9 71 230.6 83.6 4.6 1.7 5.9 1.7 7.1 1.7 1.7 0 2.5 0 7.1-1.7 35.7-12.6 191.5-67.6 231-83.6 10.1-4.2 10.5-13.9 10.5-13.9V272.1c0-10.9-34.4-19.7-69.3-25.6v-67.2C428.4 80.2 347.7 0 249 0zm0 85.7c58.4 0 93.7 35.3 93.7 93.7v58.4c-65.5-4.6-121.4-4.6-187.3 0v-58.4c0-58.5 35.3-93.7 93.6-93.7zm-.4 238.1c81.5 0 149.9 6.3 149.9 17.6v218.8c0 3.4-.4 3.8-3.4 5-2.9 1.3-139 50.4-139 50.4s-5.5 1.7-7.1 1.7c-1.7 0-7.1-2.1-7.1-2.1s-136.1-49.1-139-50.4-3.4-1.7-3.4-5V341c-.8-11.3 67.6-17.2 149.1-17.2z' />
+          <path
+            fill='currentColor'
+            d='M249 0C149.9 0 69.7 80.2 69.7 179.3v67.2C34.9 252.8 0 261.2 0 272.1v350.7s0 9.7 10.9 14.3c39.5 16 194.9 71 230.6 83.6 4.6 1.7 5.9 1.7 7.1 1.7 1.7 0 2.5 0 7.1-1.7 35.7-12.6 191.5-67.6 231-83.6 10.1-4.2 10.5-13.9 10.5-13.9V272.1c0-10.9-34.4-19.7-69.3-25.6v-67.2C428.4 80.2 347.7 0 249 0zm0 85.7c58.4 0 93.7 35.3 93.7 93.7v58.4c-65.5-4.6-121.4-4.6-187.3 0v-58.4c0-58.5 35.3-93.7 93.6-93.7zm-.4 238.1c81.5 0 149.9 6.3 149.9 17.6v218.8c0 3.4-.4 3.8-3.4 5-2.9 1.3-139 50.4-139 50.4s-5.5 1.7-7.1 1.7c-1.7 0-7.1-2.1-7.1-2.1s-136.1-49.1-139-50.4-3.4-1.7-3.4-5V341c-.8-11.3 67.6-17.2 149.1-17.2z'
+          />
         </svg>
       </div>
     )
   },
-  ledger: size => {
+  ledger: (size) => {
     return (
       <div style={{ width: size + 'px', height: size + 'px', padding: '3px 1px 0px 0px' }}>
         <svg viewBox='0 0 400 400' transform='translate(0, -2)'>
-          <path fill='currentColor' d='M1640 397.8c-39.7 0-70.4-12.8-93.4-37.1-21.7-24.3-33.3-58.8-33.3-103.6 0-43.5 10.2-79.3 32-104.9 21.7-26.9 49.9-39.7 87-39.7 32 0 57.6 11.5 76.8 33.3 19.2 23 28.1 53.7 28.1 92.1v20.5h-197c0 37.1 9 66.5 26.9 85.7 16.6 20.5 42.2 29.4 74.2 29.4 15.3 0 29.4-1.3 40.9-3.8 11.5-2.6 26.9-6.4 44.8-14.1v24.3c-15.3 6.4-29.4 11.5-42.2 14.1-14.1 2.6-28.2 3.8-44.8 3.8zm-6.4-262.2c-26.9 0-47.3 9-64 25.6-15.3 17.9-25.6 42.2-28.1 75.5h168.9c0-32-6.4-56.3-20.5-74.2-12.8-18-32-26.9-56.3-26.9zm245.6-21.8c11.5 0 24.3 1.3 37.1 3.8l-5.1 24.3c-11.8-2.6-23.8-3.9-35.8-3.8-23 0-42.2 10.2-57.6 29.4-15.3 20.5-23 44.8-23 75.5v149.7h-25.6V119h21.7l2.6 49.9h1.3c11.5-20.5 23-34.5 35.8-42.2 15.4-9 30.7-12.9 48.6-12.9zM333.9 12.8h-183v245.6h245.6V76.7c.1-34.5-28.1-63.9-62.6-63.9zm-239.2 0H64c-34.5 0-64 28.1-64 64v30.7h94.7V12.8zM0 165h94.7v94.7H0V165zm301.9 245.6h30.7c34.5 0 64-28.1 64-64V316h-94.7v94.6zm-151-94.6h94.7v94.7h-94.7V316zM0 316v30.7c0 34.5 28.1 64 64 64h30.7V316H0z' />
+          <path
+            fill='currentColor'
+            d='M1640 397.8c-39.7 0-70.4-12.8-93.4-37.1-21.7-24.3-33.3-58.8-33.3-103.6 0-43.5 10.2-79.3 32-104.9 21.7-26.9 49.9-39.7 87-39.7 32 0 57.6 11.5 76.8 33.3 19.2 23 28.1 53.7 28.1 92.1v20.5h-197c0 37.1 9 66.5 26.9 85.7 16.6 20.5 42.2 29.4 74.2 29.4 15.3 0 29.4-1.3 40.9-3.8 11.5-2.6 26.9-6.4 44.8-14.1v24.3c-15.3 6.4-29.4 11.5-42.2 14.1-14.1 2.6-28.2 3.8-44.8 3.8zm-6.4-262.2c-26.9 0-47.3 9-64 25.6-15.3 17.9-25.6 42.2-28.1 75.5h168.9c0-32-6.4-56.3-20.5-74.2-12.8-18-32-26.9-56.3-26.9zm245.6-21.8c11.5 0 24.3 1.3 37.1 3.8l-5.1 24.3c-11.8-2.6-23.8-3.9-35.8-3.8-23 0-42.2 10.2-57.6 29.4-15.3 20.5-23 44.8-23 75.5v149.7h-25.6V119h21.7l2.6 49.9h1.3c11.5-20.5 23-34.5 35.8-42.2 15.4-9 30.7-12.9 48.6-12.9zM333.9 12.8h-183v245.6h245.6V76.7c.1-34.5-28.1-63.9-62.6-63.9zm-239.2 0H64c-34.5 0-64 28.1-64 64v30.7h94.7V12.8zM0 165h94.7v94.7H0V165zm301.9 245.6h30.7c34.5 0 64-28.1 64-64V316h-94.7v94.6zm-151-94.6h94.7v94.7h-94.7V316zM0 316v30.7c0 34.5 28.1 64 64 64h30.7V316H0z'
+          />
         </svg>
       </div>
     )
   },
-  aragon: size => {
+  aragon: (size) => {
     return (
       <div style={{ width: size + 'px', height: size + 'px' }}>
         <svg viewBox='0 0 48 95'>
-          <path fill='currentColor' opacity='0.15' d='M5.30013 26.8635L5.77363 28.7535C5.77363 28.7535 11.364 40.2931 23.9499 44.5801C23.9499 44.5801 35.4004 39.6631 40.4867 31.3195L33.4658 25.1579C33.4658 25.1579 30.1054 27.8469 25.1108 27.8469C20.1161 27.8469 13.3344 24.8506 13.3344 18.6736C13.3344 12.4966 20.3605 10.2378 20.3605 10.2378L17.3668 9.50027H9.71437L4.85718 21.2704L5.30013 26.8635Z' />
-          <path fill='currentColor' d='M47.5944 13.8916C47.3805 13.6765 42.9828 8 25.748 1C24.8743 0.657513 24.0568 0.948486 24.0568 0.948486C8.26624 4.99919 0.519287 13.3594 0.519287 13.8916C0.519287 14.4238 2.77987 22.4228 4.24619 25.6803C4.36839 25.9569 6.32348 29.4295 7.77453 31.3195C6.91918 29.4295 5.98745 27.7854 5.98745 24.9581C5.98745 16.9834 12.1277 10.499 19.8106 10.2225C19.9939 10.2225 20.1925 10.2225 20.3758 10.2378L18.5428 8.39394C18.5428 8.39394 25.9203 7.14932 35.3903 12.9114C35.3903 12.9114 35.5278 13.2034 35.3903 14.0639C35.3903 14.0639 39.8504 15.9999 40.2322 19.7645C40.6141 23.5291 38.2466 25.6803 36.3373 25.9876C36.3373 25.9876 37.3301 24.4357 35.8027 23.606C35.4819 23.4216 35.1001 23.3447 34.7182 23.3601C31.8009 23.3601 31.4648 26.7098 31.4648 26.7098C31.4343 26.8788 31.4343 27.0479 31.4343 27.2169C31.4343 27.2169 30.9455 32.1185 39.6213 32.0263C39.6213 32.0263 44.0202 27.0171 45.1811 22.515C45.6087 20.8555 45.9142 19.6109 46.1128 18.6889C46.6016 17.3829 47.0751 15.4589 47.5333 14.0606L47.5944 13.8916Z' />
-          <path fill='currentColor' d='M31.6177 14.4019C31.7399 14.3405 32.137 14.1407 32.5953 13.6644C33.5117 13.7873 34.4129 14.0792 34.4129 14.0792C32.748 13.0651 30.4721 12.4658 27.9519 12.4812C27.9519 12.4812 28.9142 13.8641 31.5872 14.4326C31.5872 14.4326 31.6024 14.4173 31.6177 14.4019Z' />
+          <path
+            fill='currentColor'
+            opacity='0.15'
+            d='M5.30013 26.8635L5.77363 28.7535C5.77363 28.7535 11.364 40.2931 23.9499 44.5801C23.9499 44.5801 35.4004 39.6631 40.4867 31.3195L33.4658 25.1579C33.4658 25.1579 30.1054 27.8469 25.1108 27.8469C20.1161 27.8469 13.3344 24.8506 13.3344 18.6736C13.3344 12.4966 20.3605 10.2378 20.3605 10.2378L17.3668 9.50027H9.71437L4.85718 21.2704L5.30013 26.8635Z'
+          />
+          <path
+            fill='currentColor'
+            d='M47.5944 13.8916C47.3805 13.6765 42.9828 8 25.748 1C24.8743 0.657513 24.0568 0.948486 24.0568 0.948486C8.26624 4.99919 0.519287 13.3594 0.519287 13.8916C0.519287 14.4238 2.77987 22.4228 4.24619 25.6803C4.36839 25.9569 6.32348 29.4295 7.77453 31.3195C6.91918 29.4295 5.98745 27.7854 5.98745 24.9581C5.98745 16.9834 12.1277 10.499 19.8106 10.2225C19.9939 10.2225 20.1925 10.2225 20.3758 10.2378L18.5428 8.39394C18.5428 8.39394 25.9203 7.14932 35.3903 12.9114C35.3903 12.9114 35.5278 13.2034 35.3903 14.0639C35.3903 14.0639 39.8504 15.9999 40.2322 19.7645C40.6141 23.5291 38.2466 25.6803 36.3373 25.9876C36.3373 25.9876 37.3301 24.4357 35.8027 23.606C35.4819 23.4216 35.1001 23.3447 34.7182 23.3601C31.8009 23.3601 31.4648 26.7098 31.4648 26.7098C31.4343 26.8788 31.4343 27.0479 31.4343 27.2169C31.4343 27.2169 30.9455 32.1185 39.6213 32.0263C39.6213 32.0263 44.0202 27.0171 45.1811 22.515C45.6087 20.8555 45.9142 19.6109 46.1128 18.6889C46.6016 17.3829 47.0751 15.4589 47.5333 14.0606L47.5944 13.8916Z'
+          />
+          <path
+            fill='currentColor'
+            d='M31.6177 14.4019C31.7399 14.3405 32.137 14.1407 32.5953 13.6644C33.5117 13.7873 34.4129 14.0792 34.4129 14.0792C32.748 13.0651 30.4721 12.4658 27.9519 12.4812C27.9519 12.4812 28.9142 13.8641 31.5872 14.4326C31.5872 14.4326 31.6024 14.4173 31.6177 14.4019Z'
+          />
         </svg>
       </div>
     )
   },
-  broadcast: size => {
+  broadcast: (size) => {
     return (
       <div style={{ width: size + 'px', height: size + 'px' }}>
         <svg viewBox='0 0 576 512'>
-          <path fill='currentColor' d='M160.9 59.01C149.3 52.6 134.7 56.76 128.3 68.39C117.6 87.6 112 109.4 112 131.4c0 19.03 4.031 37.44 11.98 54.62c4.047 8.777 12.73 13.93 21.8 13.93c3.375 0 6.797-.7187 10.05-2.219C167.9 192.2 173.1 177.1 167.5 165.9C162.5 155.1 160 143.5 160 131.4c0-13.93 3.547-27.69 10.25-39.81C176.7 80.04 172.5 65.42 160.9 59.01zM62.61 2.363C46.17-4.32 27.58 3.676 20.95 20.02C7.047 54.36 0 90.69 0 127.1C0 165.3 7.047 201.7 20.95 236C25.98 248.5 37.97 256 50.63 256C54.61 256 58.69 255.3 62.61 253.7C79 247 86.91 228.4 80.27 212C69.47 185.3 64 157.1 64 128c0-29.06 5.469-57.3 16.27-83.99C86.91 27.64 79 8.988 62.61 2.363zM555 20.02c-6.609-16.41-25.23-24.31-41.66-17.66c-16.39 6.625-24.3 25.28-17.66 41.65C506.5 70.7 512 98.95 512 128c0 29.06-5.469 57.31-16.27 83.1C489.1 228.4 497 247 513.4 253.7C517.3 255.3 521.4 256 525.4 256c12.66 0 24.64-7.562 29.67-20C568.1 201.7 576 165.3 576 127.1C576 90.69 568.1 54.36 555 20.02zM420.2 58.23c-12.03 5.562-17.28 19.81-11.72 31.84C413.5 100.9 416 112.5 416 124.6c0 13.94-3.547 27.69-10.25 39.81c-6.422 11.59-2.219 26.22 9.375 32.62c3.688 2.031 7.672 3 11.61 3c8.438 0 16.64-4.47 21.02-12.37C458.4 168.4 464 146.6 464 124.6c0-19.03-4.031-37.43-11.98-54.62C446.5 57.89 432.1 52.7 420.2 58.23zM301.8 65.45C260.5 56.78 224 88.13 224 128c0 23.63 12.95 44.04 32 55.12v296.9c0 17.67 14.33 32 32 32s32-14.33 32-32V183.1c23.25-13.54 37.42-40.96 30.03-71.18C344.4 88.91 325 70.31 301.8 65.45z' />
+          <path
+            fill='currentColor'
+            d='M160.9 59.01C149.3 52.6 134.7 56.76 128.3 68.39C117.6 87.6 112 109.4 112 131.4c0 19.03 4.031 37.44 11.98 54.62c4.047 8.777 12.73 13.93 21.8 13.93c3.375 0 6.797-.7187 10.05-2.219C167.9 192.2 173.1 177.1 167.5 165.9C162.5 155.1 160 143.5 160 131.4c0-13.93 3.547-27.69 10.25-39.81C176.7 80.04 172.5 65.42 160.9 59.01zM62.61 2.363C46.17-4.32 27.58 3.676 20.95 20.02C7.047 54.36 0 90.69 0 127.1C0 165.3 7.047 201.7 20.95 236C25.98 248.5 37.97 256 50.63 256C54.61 256 58.69 255.3 62.61 253.7C79 247 86.91 228.4 80.27 212C69.47 185.3 64 157.1 64 128c0-29.06 5.469-57.3 16.27-83.99C86.91 27.64 79 8.988 62.61 2.363zM555 20.02c-6.609-16.41-25.23-24.31-41.66-17.66c-16.39 6.625-24.3 25.28-17.66 41.65C506.5 70.7 512 98.95 512 128c0 29.06-5.469 57.31-16.27 83.1C489.1 228.4 497 247 513.4 253.7C517.3 255.3 521.4 256 525.4 256c12.66 0 24.64-7.562 29.67-20C568.1 201.7 576 165.3 576 127.1C576 90.69 568.1 54.36 555 20.02zM420.2 58.23c-12.03 5.562-17.28 19.81-11.72 31.84C413.5 100.9 416 112.5 416 124.6c0 13.94-3.547 27.69-10.25 39.81c-6.422 11.59-2.219 26.22 9.375 32.62c3.688 2.031 7.672 3 11.61 3c8.438 0 16.64-4.47 21.02-12.37C458.4 168.4 464 146.6 464 124.6c0-19.03-4.031-37.43-11.98-54.62C446.5 57.89 432.1 52.7 420.2 58.23zM301.8 65.45C260.5 56.78 224 88.13 224 128c0 23.63 12.95 44.04 32 55.12v296.9c0 17.67 14.33 32 32 32s32-14.33 32-32V183.1c23.25-13.54 37.42-40.96 30.03-71.18C344.4 88.91 325 70.31 301.8 65.45z'
+          />
         </svg>
       </div>
     )
   },
-  save: size => {
+  save: (size) => {
     return (
       <div style={{ width: size + 'px', height: size + 'px' }}>
         <svg viewBox='0 0 16 16' width={size + 'px'} height={size + 'px'}>
-          <path fill='currentColor' fillRule='evenodd' d='M0 2.75C0 1.784.784 1 1.75 1H5c.55 0 1.07.26 1.4.7l.9 1.2a.25.25 0 00.2.1h6.75c.966 0 1.75.784 1.75 1.75v8.5A1.75 1.75 0 0114.25 15H1.75A1.75 1.75 0 010 13.25V2.75zm9.42 9.36l2.883-2.677a.25.25 0 000-.366L9.42 6.39a.25.25 0 00-.42.183V8.5H4.75a.75.75 0 100 1.5H9v1.927c0 .218.26.331.42.183z' />
+          <path
+            fill='currentColor'
+            fillRule='evenodd'
+            d='M0 2.75C0 1.784.784 1 1.75 1H5c.55 0 1.07.26 1.4.7l.9 1.2a.25.25 0 00.2.1h6.75c.966 0 1.75.784 1.75 1.75v8.5A1.75 1.75 0 0114.25 15H1.75A1.75 1.75 0 010 13.25V2.75zm9.42 9.36l2.883-2.677a.25.25 0 000-.366L9.42 6.39a.25.25 0 00-.42.183V8.5H4.75a.75.75 0 100 1.5H9v1.927c0 .218.26.331.42.183z'
+          />
         </svg>
       </div>
     )
   },
-  ethereum: size => {
+  ethereum: (size) => {
     return (
       <div style={{ width: size + 'px', height: size + 'px' }}>
         <svg viewBox='0 0 320 512' width={size + 'px'} height={size + 'px'}>
-          <path fill='currentColor' d='M311.9 260.8L160 353.6 8 260.8 160 0l151.9 260.8zM160 383.4L8 290.6 160 512l152-221.4-152 92.8z' />
+          <path
+            fill='currentColor'
+            d='M311.9 260.8L160 353.6 8 260.8 160 0l151.9 260.8zM160 383.4L8 290.6 160 512l152-221.4-152 92.8z'
+          />
         </svg>
       </div>
     )
   },
-  eth: size => {
+  eth: (size) => {
     return (
       <div style={{ width: size + 'px', height: size + 'px' }}>
         <svg viewBox='0 0 84 84' width={size + 'px'} height={size + 'px'}>
-          <path fill='currentColor' d='M69.7,37.4L43.2,1.6c-0.4-0.8-1.3-1.1-2.1-0.7c-0.3,0.1-0.5,0.4-0.7,0.7L13.8,37.4c-0.5,0.7-0.2,1.7,0.5,2.1c0,0,0,0,0.1,0L41,53.1c0.5,0.3,1.2,0.3,1.7,0l26.6-13.6C70,39.1,70.2,38.2,69.7,37.4C69.8,37.4,69.8,37.4,69.7,37.4z M67.6,50.2L42.8,64.4c-0.6,0.4-1.4,0.4-1.9,0L16,50.2c-0.3-0.2-0.7-0.2-0.9,0.1c-0.2,0.3-0.2,0.7,0.1,0.9l0,0l25.1,31.1c0.6,0.9,1.7,1.1,2.6,0.6c0.2-0.1,0.4-0.3,0.6-0.6l25-31.1c0.3-0.2,0.3-0.6,0.1-0.9C68.3,50,67.8,50,67.6,50.2L67.6,50.2z' />
+          <path
+            fill='currentColor'
+            d='M69.7,37.4L43.2,1.6c-0.4-0.8-1.3-1.1-2.1-0.7c-0.3,0.1-0.5,0.4-0.7,0.7L13.8,37.4c-0.5,0.7-0.2,1.7,0.5,2.1c0,0,0,0,0.1,0L41,53.1c0.5,0.3,1.2,0.3,1.7,0l26.6-13.6C70,39.1,70.2,38.2,69.7,37.4C69.8,37.4,69.8,37.4,69.7,37.4z M67.6,50.2L42.8,64.4c-0.6,0.4-1.4,0.4-1.9,0L16,50.2c-0.3-0.2-0.7-0.2-0.9,0.1c-0.2,0.3-0.2,0.7,0.1,0.9l0,0l25.1,31.1c0.6,0.9,1.7,1.1,2.6,0.6c0.2-0.1,0.4-0.3,0.6-0.6l25-31.1c0.3-0.2,0.3-0.6,0.1-0.9C68.3,50,67.8,50,67.6,50.2L67.6,50.2z'
+          />
         </svg>
       </div>
     )
   },
-  trash: size => {
+  trash: (size) => {
     return (
       <div style={{ width: size + 'px', height: size + 'px' }}>
         <svg viewBox='0 0 16 16' width={size + 'px'} height={size + 'px'}>
-          <path fill='currentColor' d='M6.5 1.75a.25.25 0 01.25-.25h2.5a.25.25 0 01.25.25V3h-3V1.75zm4.5 0V3h2.25a.75.75 0 010 1.5H2.75a.75.75 0 010-1.5H5V1.75C5 .784 5.784 0 6.75 0h2.5C10.216 0 11 .784 11 1.75zM4.496 6.675a.75.75 0 10-1.492.15l.66 6.6A1.75 1.75 0 005.405 15h5.19c.9 0 1.652-.681 1.741-1.576l.66-6.6a.75.75 0 00-1.492-.149l-.66 6.6a.25.25 0 01-.249.225h-5.19a.25.25 0 01-.249-.225l-.66-6.6z' />
+          <path
+            fill='currentColor'
+            d='M6.5 1.75a.25.25 0 01.25-.25h2.5a.25.25 0 01.25.25V3h-3V1.75zm4.5 0V3h2.25a.75.75 0 010 1.5H2.75a.75.75 0 010-1.5H5V1.75C5 .784 5.784 0 6.75 0h2.5C10.216 0 11 .784 11 1.75zM4.496 6.675a.75.75 0 10-1.492.15l.66 6.6A1.75 1.75 0 005.405 15h5.19c.9 0 1.652-.681 1.741-1.576l.66-6.6a.75.75 0 00-1.492-.149l-.66 6.6a.25.25 0 01-.249.225h-5.19a.25.25 0 01-.249-.225l-.66-6.6z'
+          />
         </svg>
       </div>
     )
   },
-  chrome: size => {
+  chrome: (size) => {
     return (
       <div style={{ width: size + 'px', height: size + 'px' }}>
         <svg viewBox='0 0 496 512' width={size + 'px'} height={size + 'px'}>
-          <path fill='currentColor' d='M131.5 217.5L55.1 100.1c47.6-59.2 119-91.8 192-92.1 42.3-.3 85.5 10.5 124.8 33.2 43.4 25.2 76.4 61.4 97.4 103L264 133.4c-58.1-3.4-113.4 29.3-132.5 84.1zm32.9 38.5c0 46.2 37.4 83.6 83.6 83.6s83.6-37.4 83.6-83.6-37.4-83.6-83.6-83.6-83.6 37.3-83.6 83.6zm314.9-89.2L339.6 174c37.9 44.3 38.5 108.2 6.6 157.2L234.1 503.6c46.5 2.5 94.4-7.7 137.8-32.9 107.4-62 150.9-192 107.4-303.9zM133.7 303.6L40.4 120.1C14.9 159.1 0 205.9 0 256c0 124 90.8 226.7 209.5 244.9l63.7-124.8c-57.6 10.8-113.2-20.8-139.5-72.5z' />
+          <path
+            fill='currentColor'
+            d='M131.5 217.5L55.1 100.1c47.6-59.2 119-91.8 192-92.1 42.3-.3 85.5 10.5 124.8 33.2 43.4 25.2 76.4 61.4 97.4 103L264 133.4c-58.1-3.4-113.4 29.3-132.5 84.1zm32.9 38.5c0 46.2 37.4 83.6 83.6 83.6s83.6-37.4 83.6-83.6-37.4-83.6-83.6-83.6-83.6 37.3-83.6 83.6zm314.9-89.2L339.6 174c37.9 44.3 38.5 108.2 6.6 157.2L234.1 503.6c46.5 2.5 94.4-7.7 137.8-32.9 107.4-62 150.9-192 107.4-303.9zM133.7 303.6L40.4 120.1C14.9 159.1 0 205.9 0 256c0 124 90.8 226.7 209.5 244.9l63.7-124.8c-57.6 10.8-113.2-20.8-139.5-72.5z'
+          />
         </svg>
       </div>
     )
   },
-  firefox: size => {
+  firefox: (size) => {
     return (
       <div style={{ width: size + 'px', height: size + 'px' }}>
         <svg viewBox='0 0 480 512' width={size + 'px'} height={size + 'px'}>
-          <path fill='currentColor' d='M478.1 235.3c-.7-4.5-1.4-7.1-1.4-7.1s-1.8 2-4.7 5.9c-.9-10.7-2.8-21.2-5.8-31.6-3.7-12.9-8.5-25.4-14.5-37.4-3.8-8-8.2-15.6-13.3-22.8-1.8-2.7-3.7-5.4-5.6-7.9-8.8-14.4-19-23.3-30.7-40-7.6-12.8-12.9-26.9-15.4-41.6-3.2 8.9-5.7 18-7.4 27.3-12.1-12.2-22.5-20.8-28.9-26.7C319.4 24.2 323 9.1 323 9.1S264.7 74.2 289.9 142c8.7 23 23.8 43.1 43.4 57.9 24.4 20.2 50.8 36 64.7 76.6-11.2-21.3-28.1-39.2-48.8-51.5 6.2 14.7 9.4 30.6 9.3 46.5 0 61-49.6 110.5-110.6 110.4-8.3 0-16.5-.9-24.5-2.8-9.5-1.8-18.7-4.9-27.4-9.3-12.9-7.8-24-18.1-32.8-30.3l-.2-.3 2 .7c4.6 1.6 9.2 2.8 14 3.7 18.7 4 38.3 1.7 55.6-6.6 17.5-9.7 28-16.9 36.6-14h.2c8.4 2.7 15-5.5 9-14-10.4-13.4-27.4-20-44.2-17-17.5 2.5-33.5 15-56.4 2.9-1.5-.8-2.9-1.6-4.3-2.5-1.6-.9 4.9 1.3 3.4.3-5-2.5-9.8-5.4-14.4-8.6-.3-.3 3.5 1.1 3.1.8-5.9-4-11-9.2-15-15.2-4.1-7.4-4.5-16.4-1-24.1 2.1-3.8 5.4-6.9 9.3-8.7 3 1.5 4.8 2.6 4.8 2.6s-1.3-2.5-2.1-3.8c.3-.1.5 0 .8-.2 2.6 1.1 8.3 4 11.4 5.8 2.1 1.1 3.8 2.7 5.2 4.7 0 0 1-.5.3-2.7-1.1-2.7-2.9-5-5.4-6.6h.2c2.3 1.2 4.5 2.6 6.6 4.1 1.9-4.4 2.8-9.2 2.6-14 .2-2.6-.2-5.3-1.1-7.8-.8-1.6.5-2.2 1.9-.5-.2-1.3-.7-2.5-1.2-3.7v-.1s.8-1.1 1.2-1.5c1-1 2.1-1.9 3.4-2.7 7.2-4.5 14.8-8.4 22.7-11.6 6.4-2.8 11.7-4.9 12.8-5.6 1.6-1 3.1-2.2 4.5-3.5 5.3-4.5 9-10.8 10.2-17.7.1-.9.2-1.8.3-2.8v-1.5c-.9-3.5-6.9-6.1-38.4-9.1-11.1-1.8-20-10.1-22.5-21.1v.1c-.4 1.1-.9 2.3-1.3 3.5.4-1.2.8-2.3 1.3-3.5v-.2c6-15.7 16.8-29.1 30.8-38.3.8-.7-3.2.2-2.4-.5 2.7-1.3 5.4-2.5 8.2-3.5 1.4-.6-6-3.4-12.6-2.7-4 .2-8 1.2-11.7 2.8 1.6-1.3 6.2-3.1 5.1-3.1-8.4 1.6-16.5 4.7-23.9 9 0-.8.1-1.5.5-2.2-5.9 2.5-11 6.5-15 11.5.1-.9.2-1.8.2-2.7-2.7 2-5.2 4.3-7.3 6.9l-.1.1c-17.4-6.7-36.3-8.3-54.6-4.7l-.2-.1h.2c-3.8-3.1-7.1-6.7-9.7-10.9l-.2.1-.4-.2c-1.2-1.8-2.4-3.8-3.7-6-.9-1.6-1.8-3.4-2.7-5.2 0-.1-.1-.2-.2-.2-.4 0-.6 1.7-.9 1.3v-.1c-3.2-8.3-4.7-17.2-4.4-26.2l-.2.1c-5.1 3.5-9 8.6-11.1 14.5-.9 2.1-1.6 3.3-2.2 4.5v-.5c.1-1.1.6-3.3.5-3.1-.1.2-.2.3-.3.4-1.5 1.7-2.9 3.7-3.9 5.8-.9 1.9-1.7 3.9-2.3 5.9-.1.3 0-.3 0-1s.1-2 0-1.7l-.3.7c-6.7 14.9-10.9 30.8-12.4 47.1-.4 2.8-.6 5.6-.5 8.3v.2c-4.8 5.2-9 11-12.7 17.1-12.1 20.4-21.1 42.5-26.8 65.6 4-8.8 8.8-17.2 14.3-25.1C5.5 228.5 0 257.4 0 286.6c1.8-8.6 4.2-17 7-25.3-1.7 34.5 4.9 68.9 19.4 100.3 19.4 43.5 51.6 80 92.3 104.7 16.6 11.2 34.7 19.9 53.8 25.8 2.5.9 5.1 1.8 7.7 2.7-.8-.3-1.6-.7-2.4-1 22.6 6.8 46.2 10.3 69.8 10.3 83.7 0 111.3-31.9 113.8-35 4.1-3.7 7.5-8.2 9.9-13.3 1.6-.7 3.2-1.4 4.9-2.1l1-.5 1.9-.9c12.6-5.9 24.5-13.4 35.3-22.1 16.3-11.7 27.9-28.7 32.9-48.1 3-7.1 3.1-15 .4-22.2.9-1.4 1.7-2.8 2.7-4.3 18-28.9 28.2-61.9 29.6-95.9v-2.8c0-7.3-.6-14.5-1.9-21.6z' />
+          <path
+            fill='currentColor'
+            d='M478.1 235.3c-.7-4.5-1.4-7.1-1.4-7.1s-1.8 2-4.7 5.9c-.9-10.7-2.8-21.2-5.8-31.6-3.7-12.9-8.5-25.4-14.5-37.4-3.8-8-8.2-15.6-13.3-22.8-1.8-2.7-3.7-5.4-5.6-7.9-8.8-14.4-19-23.3-30.7-40-7.6-12.8-12.9-26.9-15.4-41.6-3.2 8.9-5.7 18-7.4 27.3-12.1-12.2-22.5-20.8-28.9-26.7C319.4 24.2 323 9.1 323 9.1S264.7 74.2 289.9 142c8.7 23 23.8 43.1 43.4 57.9 24.4 20.2 50.8 36 64.7 76.6-11.2-21.3-28.1-39.2-48.8-51.5 6.2 14.7 9.4 30.6 9.3 46.5 0 61-49.6 110.5-110.6 110.4-8.3 0-16.5-.9-24.5-2.8-9.5-1.8-18.7-4.9-27.4-9.3-12.9-7.8-24-18.1-32.8-30.3l-.2-.3 2 .7c4.6 1.6 9.2 2.8 14 3.7 18.7 4 38.3 1.7 55.6-6.6 17.5-9.7 28-16.9 36.6-14h.2c8.4 2.7 15-5.5 9-14-10.4-13.4-27.4-20-44.2-17-17.5 2.5-33.5 15-56.4 2.9-1.5-.8-2.9-1.6-4.3-2.5-1.6-.9 4.9 1.3 3.4.3-5-2.5-9.8-5.4-14.4-8.6-.3-.3 3.5 1.1 3.1.8-5.9-4-11-9.2-15-15.2-4.1-7.4-4.5-16.4-1-24.1 2.1-3.8 5.4-6.9 9.3-8.7 3 1.5 4.8 2.6 4.8 2.6s-1.3-2.5-2.1-3.8c.3-.1.5 0 .8-.2 2.6 1.1 8.3 4 11.4 5.8 2.1 1.1 3.8 2.7 5.2 4.7 0 0 1-.5.3-2.7-1.1-2.7-2.9-5-5.4-6.6h.2c2.3 1.2 4.5 2.6 6.6 4.1 1.9-4.4 2.8-9.2 2.6-14 .2-2.6-.2-5.3-1.1-7.8-.8-1.6.5-2.2 1.9-.5-.2-1.3-.7-2.5-1.2-3.7v-.1s.8-1.1 1.2-1.5c1-1 2.1-1.9 3.4-2.7 7.2-4.5 14.8-8.4 22.7-11.6 6.4-2.8 11.7-4.9 12.8-5.6 1.6-1 3.1-2.2 4.5-3.5 5.3-4.5 9-10.8 10.2-17.7.1-.9.2-1.8.3-2.8v-1.5c-.9-3.5-6.9-6.1-38.4-9.1-11.1-1.8-20-10.1-22.5-21.1v.1c-.4 1.1-.9 2.3-1.3 3.5.4-1.2.8-2.3 1.3-3.5v-.2c6-15.7 16.8-29.1 30.8-38.3.8-.7-3.2.2-2.4-.5 2.7-1.3 5.4-2.5 8.2-3.5 1.4-.6-6-3.4-12.6-2.7-4 .2-8 1.2-11.7 2.8 1.6-1.3 6.2-3.1 5.1-3.1-8.4 1.6-16.5 4.7-23.9 9 0-.8.1-1.5.5-2.2-5.9 2.5-11 6.5-15 11.5.1-.9.2-1.8.2-2.7-2.7 2-5.2 4.3-7.3 6.9l-.1.1c-17.4-6.7-36.3-8.3-54.6-4.7l-.2-.1h.2c-3.8-3.1-7.1-6.7-9.7-10.9l-.2.1-.4-.2c-1.2-1.8-2.4-3.8-3.7-6-.9-1.6-1.8-3.4-2.7-5.2 0-.1-.1-.2-.2-.2-.4 0-.6 1.7-.9 1.3v-.1c-3.2-8.3-4.7-17.2-4.4-26.2l-.2.1c-5.1 3.5-9 8.6-11.1 14.5-.9 2.1-1.6 3.3-2.2 4.5v-.5c.1-1.1.6-3.3.5-3.1-.1.2-.2.3-.3.4-1.5 1.7-2.9 3.7-3.9 5.8-.9 1.9-1.7 3.9-2.3 5.9-.1.3 0-.3 0-1s.1-2 0-1.7l-.3.7c-6.7 14.9-10.9 30.8-12.4 47.1-.4 2.8-.6 5.6-.5 8.3v.2c-4.8 5.2-9 11-12.7 17.1-12.1 20.4-21.1 42.5-26.8 65.6 4-8.8 8.8-17.2 14.3-25.1C5.5 228.5 0 257.4 0 286.6c1.8-8.6 4.2-17 7-25.3-1.7 34.5 4.9 68.9 19.4 100.3 19.4 43.5 51.6 80 92.3 104.7 16.6 11.2 34.7 19.9 53.8 25.8 2.5.9 5.1 1.8 7.7 2.7-.8-.3-1.6-.7-2.4-1 22.6 6.8 46.2 10.3 69.8 10.3 83.7 0 111.3-31.9 113.8-35 4.1-3.7 7.5-8.2 9.9-13.3 1.6-.7 3.2-1.4 4.9-2.1l1-.5 1.9-.9c12.6-5.9 24.5-13.4 35.3-22.1 16.3-11.7 27.9-28.7 32.9-48.1 3-7.1 3.1-15 .4-22.2.9-1.4 1.7-2.8 2.7-4.3 18-28.9 28.2-61.9 29.6-95.9v-2.8c0-7.3-.6-14.5-1.9-21.6z'
+          />
         </svg>
       </div>
     )
   },
-  safari: size => {
+  safari: (size) => {
     return (
       <div style={{ width: size + 'px', height: size + 'px' }}>
         <svg viewBox='0 0 512 512' width={size + 'px'} height={size + 'px'}>
-          <path fill='currentColor' d='M274.69,274.69l-37.38-37.38L166,346ZM256,8C119,8,8,119,8,256S119,504,256,504,504,393,504,256,393,8,256,8ZM411.85,182.79l14.78-6.13A8,8,0,0,1,437.08,181h0a8,8,0,0,1-4.33,10.46L418,197.57a8,8,0,0,1-10.45-4.33h0A8,8,0,0,1,411.85,182.79ZM314.43,94l6.12-14.78A8,8,0,0,1,331,74.92h0a8,8,0,0,1,4.33,10.45l-6.13,14.78a8,8,0,0,1-10.45,4.33h0A8,8,0,0,1,314.43,94ZM256,60h0a8,8,0,0,1,8,8V84a8,8,0,0,1-8,8h0a8,8,0,0,1-8-8V68A8,8,0,0,1,256,60ZM181,74.92a8,8,0,0,1,10.46,4.33L197.57,94a8,8,0,1,1-14.78,6.12l-6.13-14.78A8,8,0,0,1,181,74.92Zm-63.58,42.49h0a8,8,0,0,1,11.31,0L140,128.72A8,8,0,0,1,140,140h0a8,8,0,0,1-11.31,0l-11.31-11.31A8,8,0,0,1,117.41,117.41ZM60,256h0a8,8,0,0,1,8-8H84a8,8,0,0,1,8,8h0a8,8,0,0,1-8,8H68A8,8,0,0,1,60,256Zm40.15,73.21-14.78,6.13A8,8,0,0,1,74.92,331h0a8,8,0,0,1,4.33-10.46L94,314.43a8,8,0,0,1,10.45,4.33h0A8,8,0,0,1,100.15,329.21Zm4.33-136h0A8,8,0,0,1,94,197.57l-14.78-6.12A8,8,0,0,1,74.92,181h0a8,8,0,0,1,10.45-4.33l14.78,6.13A8,8,0,0,1,104.48,193.24ZM197.57,418l-6.12,14.78a8,8,0,0,1-14.79-6.12l6.13-14.78A8,8,0,1,1,197.57,418ZM264,444a8,8,0,0,1-8,8h0a8,8,0,0,1-8-8V428a8,8,0,0,1,8-8h0a8,8,0,0,1,8,8Zm67-6.92h0a8,8,0,0,1-10.46-4.33L314.43,418a8,8,0,0,1,4.33-10.45h0a8,8,0,0,1,10.45,4.33l6.13,14.78A8,8,0,0,1,331,437.08Zm63.58-42.49h0a8,8,0,0,1-11.31,0L372,383.28A8,8,0,0,1,372,372h0a8,8,0,0,1,11.31,0l11.31,11.31A8,8,0,0,1,394.59,394.59ZM286.25,286.25,110.34,401.66,225.75,225.75,401.66,110.34ZM437.08,331h0a8,8,0,0,1-10.45,4.33l-14.78-6.13a8,8,0,0,1-4.33-10.45h0A8,8,0,0,1,418,314.43l14.78,6.12A8,8,0,0,1,437.08,331ZM444,264H428a8,8,0,0,1-8-8h0a8,8,0,0,1,8-8h16a8,8,0,0,1,8,8h0A8,8,0,0,1,444,264Z' />
+          <path
+            fill='currentColor'
+            d='M274.69,274.69l-37.38-37.38L166,346ZM256,8C119,8,8,119,8,256S119,504,256,504,504,393,504,256,393,8,256,8ZM411.85,182.79l14.78-6.13A8,8,0,0,1,437.08,181h0a8,8,0,0,1-4.33,10.46L418,197.57a8,8,0,0,1-10.45-4.33h0A8,8,0,0,1,411.85,182.79ZM314.43,94l6.12-14.78A8,8,0,0,1,331,74.92h0a8,8,0,0,1,4.33,10.45l-6.13,14.78a8,8,0,0,1-10.45,4.33h0A8,8,0,0,1,314.43,94ZM256,60h0a8,8,0,0,1,8,8V84a8,8,0,0,1-8,8h0a8,8,0,0,1-8-8V68A8,8,0,0,1,256,60ZM181,74.92a8,8,0,0,1,10.46,4.33L197.57,94a8,8,0,1,1-14.78,6.12l-6.13-14.78A8,8,0,0,1,181,74.92Zm-63.58,42.49h0a8,8,0,0,1,11.31,0L140,128.72A8,8,0,0,1,140,140h0a8,8,0,0,1-11.31,0l-11.31-11.31A8,8,0,0,1,117.41,117.41ZM60,256h0a8,8,0,0,1,8-8H84a8,8,0,0,1,8,8h0a8,8,0,0,1-8,8H68A8,8,0,0,1,60,256Zm40.15,73.21-14.78,6.13A8,8,0,0,1,74.92,331h0a8,8,0,0,1,4.33-10.46L94,314.43a8,8,0,0,1,10.45,4.33h0A8,8,0,0,1,100.15,329.21Zm4.33-136h0A8,8,0,0,1,94,197.57l-14.78-6.12A8,8,0,0,1,74.92,181h0a8,8,0,0,1,10.45-4.33l14.78,6.13A8,8,0,0,1,104.48,193.24ZM197.57,418l-6.12,14.78a8,8,0,0,1-14.79-6.12l6.13-14.78A8,8,0,1,1,197.57,418ZM264,444a8,8,0,0,1-8,8h0a8,8,0,0,1-8-8V428a8,8,0,0,1,8-8h0a8,8,0,0,1,8,8Zm67-6.92h0a8,8,0,0,1-10.46-4.33L314.43,418a8,8,0,0,1,4.33-10.45h0a8,8,0,0,1,10.45,4.33l6.13,14.78A8,8,0,0,1,331,437.08Zm63.58-42.49h0a8,8,0,0,1-11.31,0L372,383.28A8,8,0,0,1,372,372h0a8,8,0,0,1,11.31,0l11.31,11.31A8,8,0,0,1,394.59,394.59ZM286.25,286.25,110.34,401.66,225.75,225.75,401.66,110.34ZM437.08,331h0a8,8,0,0,1-10.45,4.33l-14.78-6.13a8,8,0,0,1-4.33-10.45h0A8,8,0,0,1,418,314.43l14.78,6.12A8,8,0,0,1,437.08,331ZM444,264H428a8,8,0,0,1-8-8h0a8,8,0,0,1,8-8h16a8,8,0,0,1,8,8h0A8,8,0,0,1,444,264Z'
+          />
         </svg>
       </div>
     )
   },
-  mask: size => {
+  mask: (size) => {
     return (
       <div style={{ width: size + 'px', height: size + 'px' }}>
         <svg viewBox='0 0 640 512' width={size + 'px'} height={size + 'px'}>
-          <path fill='currentColor' d='M320.67 64c-442.6 0-357.57 384-158.46 384 39.9 0 77.47-20.69 101.42-55.86l25.73-37.79c15.66-22.99 46.97-22.99 62.63 0l25.73 37.79C401.66 427.31 439.23 448 479.13 448c189.86 0 290.63-384-158.46-384zM184 308.36c-41.06 0-67.76-25.66-80.08-41.05-5.23-6.53-5.23-16.09 0-22.63 12.32-15.4 39.01-41.05 80.08-41.05s67.76 25.66 80.08 41.05c5.23 6.53 5.23 16.09 0 22.63-12.32 15.4-39.02 41.05-80.08 41.05zm272 0c-41.06 0-67.76-25.66-80.08-41.05-5.23-6.53-5.23-16.09 0-22.63 12.32-15.4 39.01-41.05 80.08-41.05s67.76 25.66 80.08 41.05c5.23 6.53 5.23 16.09 0 22.63-12.32 15.4-39.02 41.05-80.08 41.05z' />
+          <path
+            fill='currentColor'
+            d='M320.67 64c-442.6 0-357.57 384-158.46 384 39.9 0 77.47-20.69 101.42-55.86l25.73-37.79c15.66-22.99 46.97-22.99 62.63 0l25.73 37.79C401.66 427.31 439.23 448 479.13 448c189.86 0 290.63-384-158.46-384zM184 308.36c-41.06 0-67.76-25.66-80.08-41.05-5.23-6.53-5.23-16.09 0-22.63 12.32-15.4 39.01-41.05 80.08-41.05s67.76 25.66 80.08 41.05c5.23 6.53 5.23 16.09 0 22.63-12.32 15.4-39.02 41.05-80.08 41.05zm272 0c-41.06 0-67.76-25.66-80.08-41.05-5.23-6.53-5.23-16.09 0-22.63 12.32-15.4 39.01-41.05 80.08-41.05s67.76 25.66 80.08 41.05c5.23 6.53 5.23 16.09 0 22.63-12.32 15.4-39.02 41.05-80.08 41.05z'
+          />
         </svg>
       </div>
     )
   },
-  handshake: size => {
+  handshake: (size) => {
     return (
       <div style={{ width: size + 'px', height: size + 'px' }}>
         <svg viewBox='0 0 640 512' width={size + 'px'} height={size + 'px'}>
-          <path fill='currentColor' d='M434.7 64h-85.9c-8 0-15.7 3-21.6 8.4l-98.3 90c-.1.1-.2.3-.3.4-16.6 15.6-16.3 40.5-2.1 56 12.7 13.9 39.4 17.6 56.1 2.7.1-.1.3-.1.4-.2l79.9-73.2c6.5-5.9 16.7-5.5 22.6 1 6 6.5 5.5 16.6-1 22.6l-26.1 23.9L504 313.8c2.9 2.4 5.5 5 7.9 7.7V128l-54.6-54.6c-5.9-6-14.1-9.4-22.6-9.4zM544 128.2v223.9c0 17.7 14.3 32 32 32h64V128.2h-96zm48 223.9c-8.8 0-16-7.2-16-16s7.2-16 16-16 16 7.2 16 16-7.2 16-16 16zM0 384h64c17.7 0 32-14.3 32-32V128.2H0V384zm48-63.9c8.8 0 16 7.2 16 16s-7.2 16-16 16-16-7.2-16-16c0-8.9 7.2-16 16-16zm435.9 18.6L334.6 217.5l-30 27.5c-29.7 27.1-75.2 24.5-101.7-4.4-26.9-29.4-24.8-74.9 4.4-101.7L289.1 64h-83.8c-8.5 0-16.6 3.4-22.6 9.4L128 128v223.9h18.3l90.5 81.9c27.4 22.3 67.7 18.1 90-9.3l.2-.2 17.9 15.5c15.9 13 39.4 10.5 52.3-5.4l31.4-38.6 5.4 4.4c13.7 11.1 33.9 9.1 45-4.7l9.5-11.7c11.2-13.8 9.1-33.9-4.6-45.1z' />
+          <path
+            fill='currentColor'
+            d='M434.7 64h-85.9c-8 0-15.7 3-21.6 8.4l-98.3 90c-.1.1-.2.3-.3.4-16.6 15.6-16.3 40.5-2.1 56 12.7 13.9 39.4 17.6 56.1 2.7.1-.1.3-.1.4-.2l79.9-73.2c6.5-5.9 16.7-5.5 22.6 1 6 6.5 5.5 16.6-1 22.6l-26.1 23.9L504 313.8c2.9 2.4 5.5 5 7.9 7.7V128l-54.6-54.6c-5.9-6-14.1-9.4-22.6-9.4zM544 128.2v223.9c0 17.7 14.3 32 32 32h64V128.2h-96zm48 223.9c-8.8 0-16-7.2-16-16s7.2-16 16-16 16 7.2 16 16-7.2 16-16 16zM0 384h64c17.7 0 32-14.3 32-32V128.2H0V384zm48-63.9c8.8 0 16 7.2 16 16s-7.2 16-16 16-16-7.2-16-16c0-8.9 7.2-16 16-16zm435.9 18.6L334.6 217.5l-30 27.5c-29.7 27.1-75.2 24.5-101.7-4.4-26.9-29.4-24.8-74.9 4.4-101.7L289.1 64h-83.8c-8.5 0-16.6 3.4-22.6 9.4L128 128v223.9h18.3l90.5 81.9c27.4 22.3 67.7 18.1 90-9.3l.2-.2 17.9 15.5c15.9 13 39.4 10.5 52.3-5.4l31.4-38.6 5.4 4.4c13.7 11.1 33.9 9.1 45-4.7l9.5-11.7c11.2-13.8 9.1-33.9-4.6-45.1z'
+          />
         </svg>
       </div>
     )
   },
-  gas: size => {
+  gas: (size) => {
     return (
       <div style={{ width: size + 'px', height: size + 'px' }}>
         <svg viewBox='0 0 512 512' width={size + 'px'} height={size + 'px'}>
-          <path fill='currentColor' d='M336 448H16c-8.8 0-16 7.2-16 16v32c0 8.8 7.2 16 16 16h320c8.8 0 16-7.2 16-16v-32c0-8.8-7.2-16-16-16zm157.2-340.7l-81-81c-6.2-6.2-16.4-6.2-22.6 0l-11.3 11.3c-6.2 6.2-6.2 16.4 0 22.6L416 97.9V160c0 28.1 20.9 51.3 48 55.2V376c0 13.2-10.8 24-24 24s-24-10.8-24-24v-32c0-48.6-39.4-88-88-88h-8V64c0-35.3-28.7-64-64-64H96C60.7 0 32 28.7 32 64v352h288V304h8c22.1 0 40 17.9 40 40v27.8c0 37.7 27 72 64.5 75.9 43 4.3 79.5-29.5 79.5-71.7V152.6c0-17-6.8-33.3-18.8-45.3zM256 192H96V64h160v128z' />
+          <path
+            fill='currentColor'
+            d='M336 448H16c-8.8 0-16 7.2-16 16v32c0 8.8 7.2 16 16 16h320c8.8 0 16-7.2 16-16v-32c0-8.8-7.2-16-16-16zm157.2-340.7l-81-81c-6.2-6.2-16.4-6.2-22.6 0l-11.3 11.3c-6.2 6.2-6.2 16.4 0 22.6L416 97.9V160c0 28.1 20.9 51.3 48 55.2V376c0 13.2-10.8 24-24 24s-24-10.8-24-24v-32c0-48.6-39.4-88-88-88h-8V64c0-35.3-28.7-64-64-64H96C60.7 0 32 28.7 32 64v352h288V304h8c22.1 0 40 17.9 40 40v27.8c0 37.7 27 72 64.5 75.9 43 4.3 79.5-29.5 79.5-71.7V152.6c0-17-6.8-33.3-18.8-45.3zM256 192H96V64h160v128z'
+          />
         </svg>
       </div>
     )
   },
-  usd: size => {
+  usd: (size) => {
     return (
       <div style={{ width: size + 'px', height: size + 'px' }}>
         <svg viewBox='0 0 288 512' width={size + 'px'} height={size + 'px'}>
-          <path fill='currentColor' d='M209.2 233.4l-108-31.6C88.7 198.2 80 186.5 80 173.5c0-16.3 13.2-29.5 29.5-29.5h66.3c12.2 0 24.2 3.7 34.2 10.5 6.1 4.1 14.3 3.1 19.5-2l34.8-34c7.1-6.9 6.1-18.4-1.8-24.5C238 74.8 207.4 64.1 176 64V16c0-8.8-7.2-16-16-16h-32c-8.8 0-16 7.2-16 16v48h-2.5C45.8 64-5.4 118.7.5 183.6c4.2 46.1 39.4 83.6 83.8 96.6l102.5 30c12.5 3.7 21.2 15.3 21.2 28.3 0 16.3-13.2 29.5-29.5 29.5h-66.3C100 368 88 364.3 78 357.5c-6.1-4.1-14.3-3.1-19.5 2l-34.8 34c-7.1 6.9-6.1 18.4 1.8 24.5 24.5 19.2 55.1 29.9 86.5 30v48c0 8.8 7.2 16 16 16h32c8.8 0 16-7.2 16-16v-48.2c46.6-.9 90.3-28.6 105.7-72.7 21.5-61.6-14.6-124.8-72.5-141.7z' />
+          <path
+            fill='currentColor'
+            d='M209.2 233.4l-108-31.6C88.7 198.2 80 186.5 80 173.5c0-16.3 13.2-29.5 29.5-29.5h66.3c12.2 0 24.2 3.7 34.2 10.5 6.1 4.1 14.3 3.1 19.5-2l34.8-34c7.1-6.9 6.1-18.4-1.8-24.5C238 74.8 207.4 64.1 176 64V16c0-8.8-7.2-16-16-16h-32c-8.8 0-16 7.2-16 16v48h-2.5C45.8 64-5.4 118.7.5 183.6c4.2 46.1 39.4 83.6 83.8 96.6l102.5 30c12.5 3.7 21.2 15.3 21.2 28.3 0 16.3-13.2 29.5-29.5 29.5h-66.3C100 368 88 364.3 78 357.5c-6.1-4.1-14.3-3.1-19.5 2l-34.8 34c-7.1 6.9-6.1 18.4 1.8 24.5 24.5 19.2 55.1 29.9 86.5 30v48c0 8.8 7.2 16 16 16h32c8.8 0 16-7.2 16-16v-48.2c46.6-.9 90.3-28.6 105.7-72.7 21.5-61.6-14.6-124.8-72.5-141.7z'
+          />
         </svg>
       </div>
     )
   },
-  rocket: size => {
+  rocket: (size) => {
     return (
       <div style={{ width: size + 'px', height: size + 'px' }}>
         <svg viewBox='0 0 512 512' width={size + 'px'} height={size + 'px'}>
-          <path fill='currentColor' d='M477.64 38.26a4.75 4.75 0 00-3.55-3.66c-58.57-14.32-193.9 36.71-267.22 110a317 317 0 00-35.63 42.1c-22.61-2-45.22-.33-64.49 8.07C52.38 218.7 36.55 281.14 32.14 308a9.64 9.64 0 0010.55 11.2l87.31-9.63a194.1 194.1 0 001.19 19.7 19.53 19.53 0 005.7 12L170.7 375a19.59 19.59 0 0012 5.7 193.53 193.53 0 0019.59 1.19l-9.58 87.2a9.65 9.65 0 0011.2 10.55c26.81-4.3 89.36-20.13 113.15-74.5 8.4-19.27 10.12-41.77 8.18-64.27a317.66 317.66 0 0042.21-35.64C441 232.05 491.74 99.74 477.64 38.26zM294.07 217.93a48 48 0 1167.86 0 47.95 47.95 0 01-67.86 0z' />
-          <path fill='rgb(250, 100, 155)' d='M168.4 399.43c-5.48 5.49-14.27 7.63-24.85 9.46-23.77 4.05-44.76-16.49-40.49-40.52 1.63-9.11 6.45-21.88 9.45-24.88a4.37 4.37 0 00-3.65-7.45 60 60 0 00-35.13 17.12C50.22 376.69 48 464 48 464s87.36-2.22 110.87-25.75A59.69 59.69 0 00176 403.09c.37-4.18-4.72-6.67-7.6-3.66z' />
+          <path
+            fill='currentColor'
+            d='M477.64 38.26a4.75 4.75 0 00-3.55-3.66c-58.57-14.32-193.9 36.71-267.22 110a317 317 0 00-35.63 42.1c-22.61-2-45.22-.33-64.49 8.07C52.38 218.7 36.55 281.14 32.14 308a9.64 9.64 0 0010.55 11.2l87.31-9.63a194.1 194.1 0 001.19 19.7 19.53 19.53 0 005.7 12L170.7 375a19.59 19.59 0 0012 5.7 193.53 193.53 0 0019.59 1.19l-9.58 87.2a9.65 9.65 0 0011.2 10.55c26.81-4.3 89.36-20.13 113.15-74.5 8.4-19.27 10.12-41.77 8.18-64.27a317.66 317.66 0 0042.21-35.64C441 232.05 491.74 99.74 477.64 38.26zM294.07 217.93a48 48 0 1167.86 0 47.95 47.95 0 01-67.86 0z'
+          />
+          <path
+            fill='rgb(250, 100, 155)'
+            d='M168.4 399.43c-5.48 5.49-14.27 7.63-24.85 9.46-23.77 4.05-44.76-16.49-40.49-40.52 1.63-9.11 6.45-21.88 9.45-24.88a4.37 4.37 0 00-3.65-7.45 60 60 0 00-35.13 17.12C50.22 376.69 48 464 48 464s87.36-2.22 110.87-25.75A59.69 59.69 0 00176 403.09c.37-4.18-4.72-6.67-7.6-3.66z'
+          />
         </svg>
       </div>
     )
   },
-  dai: size => {
+  dai: (size) => {
     return (
       <div style={{ width: size + 'px', height: size + 'px' }}>
         <svg viewBox='0 0 456 387.83' width={size + 'px'} height={size + 'px'}>
-          <path fill='currentColor' d='M233.45,218.6H366c2.83,0,4.16,0,4.37-3.71a254,254,0,0,0,0-40.54c0-2.62-1.31-3.7-4.15-3.7H102.44c-3.26,0-4.14,1.08-4.14,4.14v38.8c0,5,0,5,5.22,5Zm122.09-93.29a4.33,4.33,0,0,0,0-3,87.19,87.19,0,0,0-7.88-13.73,111.7,111.7,0,0,0-16.14-20.28,53.25,53.25,0,0,0-10-9.81,156.67,156.67,0,0,0-65.4-33.13,162.55,162.55,0,0,0-37-3.92H102c-3.27,0-3.71,1.3-3.71,4.14v77.38c0,3.26,0,4.14,4.14,4.14H354s2.18-.44,2.62-1.74h-1Zm0,138.63a50.69,50.69,0,0,0-11.15,0H102.66c-3.26,0-4.36,0-4.36,4.36V344c0,3.49,0,4.37,4.36,4.37H214.27a55.87,55.87,0,0,0,15.9-1.09,165.77,165.77,0,0,0,47.31-10.47,86.37,86.37,0,0,0,15.9-7.4h1.53a141.63,141.63,0,0,0,60.81-61.23s1.53-3.3-.18-4.16Zm-301,123.6V267c0-2.84,0-3.26-3.48-3.26H3.7c-2.62,0-3.7,0-3.7-3.49V218.83H50.57c2.82,0,3.92,0,3.92-3.7v-41c0-2.62,0-3.26-3.48-3.26H3.7c-2.62,0-3.7,0-3.7-3.49V129c0-2.4,0-3,3.48-3H50.35c3.26,0,4.14,0,4.14-4.15V4.36c0-3.48,0-4.36,4.37-4.36H222.33a249,249,0,0,1,35.32,3.92,213.19,213.19,0,0,1,68.22,25.29,192.11,192.11,0,0,1,38.36,29.65,210,210,0,0,1,23.32,29,174.48,174.48,0,0,1,17,33.36,5.68,5.68,0,0,0,6.52,4.58h39c5,0,5,0,5.23,4.8v35.75c0,3.49-1.3,4.37-4.8,4.37H420.45c-3.05,0-3.92,0-3.7,3.92a223.19,223.19,0,0,1,0,39.88c0,3.71,0,4.15,4.15,4.15h34.42c1.53,2,0,3.92,0,5.9a44,44,0,0,1,0,7.61v26.38c0,3.71-1.08,4.8-4.36,4.8h-41.2a5.45,5.45,0,0,0-6.32,4.15,174.32,174.32,0,0,1-45.79,66.7,261.17,261.17,0,0,1-23.32,18.74c-8.72,5-17.22,10.25-26.16,14.39a235.77,235.77,0,0,1-51.45,16.34,268.06,268.06,0,0,1-51,4.14H54.43v-.22Z' />
+          <path
+            fill='currentColor'
+            d='M233.45,218.6H366c2.83,0,4.16,0,4.37-3.71a254,254,0,0,0,0-40.54c0-2.62-1.31-3.7-4.15-3.7H102.44c-3.26,0-4.14,1.08-4.14,4.14v38.8c0,5,0,5,5.22,5Zm122.09-93.29a4.33,4.33,0,0,0,0-3,87.19,87.19,0,0,0-7.88-13.73,111.7,111.7,0,0,0-16.14-20.28,53.25,53.25,0,0,0-10-9.81,156.67,156.67,0,0,0-65.4-33.13,162.55,162.55,0,0,0-37-3.92H102c-3.27,0-3.71,1.3-3.71,4.14v77.38c0,3.26,0,4.14,4.14,4.14H354s2.18-.44,2.62-1.74h-1Zm0,138.63a50.69,50.69,0,0,0-11.15,0H102.66c-3.26,0-4.36,0-4.36,4.36V344c0,3.49,0,4.37,4.36,4.37H214.27a55.87,55.87,0,0,0,15.9-1.09,165.77,165.77,0,0,0,47.31-10.47,86.37,86.37,0,0,0,15.9-7.4h1.53a141.63,141.63,0,0,0,60.81-61.23s1.53-3.3-.18-4.16Zm-301,123.6V267c0-2.84,0-3.26-3.48-3.26H3.7c-2.62,0-3.7,0-3.7-3.49V218.83H50.57c2.82,0,3.92,0,3.92-3.7v-41c0-2.62,0-3.26-3.48-3.26H3.7c-2.62,0-3.7,0-3.7-3.49V129c0-2.4,0-3,3.48-3H50.35c3.26,0,4.14,0,4.14-4.15V4.36c0-3.48,0-4.36,4.37-4.36H222.33a249,249,0,0,1,35.32,3.92,213.19,213.19,0,0,1,68.22,25.29,192.11,192.11,0,0,1,38.36,29.65,210,210,0,0,1,23.32,29,174.48,174.48,0,0,1,17,33.36,5.68,5.68,0,0,0,6.52,4.58h39c5,0,5,0,5.23,4.8v35.75c0,3.49-1.3,4.37-4.8,4.37H420.45c-3.05,0-3.92,0-3.7,3.92a223.19,223.19,0,0,1,0,39.88c0,3.71,0,4.15,4.15,4.15h34.42c1.53,2,0,3.92,0,5.9a44,44,0,0,1,0,7.61v26.38c0,3.71-1.08,4.8-4.36,4.8h-41.2a5.45,5.45,0,0,0-6.32,4.15,174.32,174.32,0,0,1-45.79,66.7,261.17,261.17,0,0,1-23.32,18.74c-8.72,5-17.22,10.25-26.16,14.39a235.77,235.77,0,0,1-51.45,16.34,268.06,268.06,0,0,1-51,4.14H54.43v-.22Z'
+          />
         </svg>
       </div>
     )
   },
-  sync: size => {
+  sync: (size) => {
     return (
       <div style={{ width: size + 'px', height: size + 'px' }}>
         <svg viewBox='0 0 512 512' width={size + 'px'} height={size + 'px'}>
-          <path fill='currentColor' d='M370.72 133.28C339.458 104.008 298.888 87.962 255.848 88c-77.458.068-144.328 53.178-162.791 126.85-1.344 5.363-6.122 9.15-11.651 9.15H24.103c-7.498 0-13.194-6.807-11.807-14.176C33.933 94.924 134.813 8 256 8c66.448 0 126.791 26.136 171.315 68.685L463.03 40.97C478.149 25.851 504 36.559 504 57.941V192c0 13.255-10.745 24-24 24H345.941c-21.382 0-32.09-25.851-16.971-40.971l41.75-41.749zM32 296h134.059c21.382 0 32.09 25.851 16.971 40.971l-41.75 41.75c31.262 29.273 71.835 45.319 114.876 45.28 77.418-.07 144.315-53.144 162.787-126.849 1.344-5.363 6.122-9.15 11.651-9.15h57.304c7.498 0 13.194 6.807 11.807 14.176C478.067 417.076 377.187 504 256 504c-66.448 0-126.791-26.136-171.315-68.685L48.97 471.03C33.851 486.149 8 475.441 8 454.059V320c0-13.255 10.745-24 24-24z' />
+          <path
+            fill='currentColor'
+            d='M370.72 133.28C339.458 104.008 298.888 87.962 255.848 88c-77.458.068-144.328 53.178-162.791 126.85-1.344 5.363-6.122 9.15-11.651 9.15H24.103c-7.498 0-13.194-6.807-11.807-14.176C33.933 94.924 134.813 8 256 8c66.448 0 126.791 26.136 171.315 68.685L463.03 40.97C478.149 25.851 504 36.559 504 57.941V192c0 13.255-10.745 24-24 24H345.941c-21.382 0-32.09-25.851-16.971-40.971l41.75-41.749zM32 296h134.059c21.382 0 32.09 25.851 16.971 40.971l-41.75 41.75c31.262 29.273 71.835 45.319 114.876 45.28 77.418-.07 144.315-53.144 162.787-126.849 1.344-5.363 6.122-9.15 11.651-9.15h57.304c7.498 0 13.194 6.807 11.807 14.176C478.067 417.076 377.187 504 256 504c-66.448 0-126.791-26.136-171.315-68.685L48.97 471.03C33.851 486.149 8 475.441 8 454.059V320c0-13.255 10.745-24 24-24z'
+          />
         </svg>
       </div>
     )
   },
-  alert: size => {
+  alert: (size) => {
     return (
       <div style={{ width: size + 'px', height: size + 'px' }}>
         <svg viewBox='0 0 24 24' width={size + 'px'} height={size + 'px'}>
-          <path fill='currentColor' d='M13 17.5a1 1 0 11-2 0 1 1 0 012 0zm-.25-8.25a.75.75 0 00-1.5 0v4.5a.75.75 0 001.5 0v-4.5z' />
-          <path fill='currentColor' d='M9.836 3.244c.963-1.665 3.365-1.665 4.328 0l8.967 15.504c.963 1.667-.24 3.752-2.165 3.752H3.034c-1.926 0-3.128-2.085-2.165-3.752L9.836 3.244zm3.03.751a1 1 0 00-1.732 0L2.168 19.499A1 1 0 003.034 21h17.932a1 1 0 00.866-1.5L12.866 3.994z' />
+          <path
+            fill='currentColor'
+            d='M13 17.5a1 1 0 11-2 0 1 1 0 012 0zm-.25-8.25a.75.75 0 00-1.5 0v4.5a.75.75 0 001.5 0v-4.5z'
+          />
+          <path
+            fill='currentColor'
+            d='M9.836 3.244c.963-1.665 3.365-1.665 4.328 0l8.967 15.504c.963 1.667-.24 3.752-2.165 3.752H3.034c-1.926 0-3.128-2.085-2.165-3.752L9.836 3.244zm3.03.751a1 1 0 00-1.732 0L2.168 19.499A1 1 0 003.034 21h17.932a1 1 0 00.866-1.5L12.866 3.994z'
+          />
         </svg>
       </div>
     )
   },
-  chevron: size => {
+  chevron: (size) => {
     return (
       <div style={{ width: size + 'px', height: size + 'px' }}>
         <svg viewBox='0 0 24 24' width={size + 'px'} height={size + 'px'}>
-          <path fill='currentColor' d='M18.78 15.28a.75.75 0 000-1.06l-6.25-6.25a.75.75 0 00-1.06 0l-6.25 6.25a.75.75 0 101.06 1.06L12 9.56l5.72 5.72a.75.75 0 001.06 0z' />
+          <path
+            fill='currentColor'
+            d='M18.78 15.28a.75.75 0 000-1.06l-6.25-6.25a.75.75 0 00-1.06 0l-6.25 6.25a.75.75 0 101.06 1.06L12 9.56l5.72 5.72a.75.75 0 001.06 0z'
+          />
         </svg>
       </div>
     )
   },
-  cpu: size => {
+  cpu: (size) => {
     return (
       <div style={{ width: size + 'px', height: size + 'px' }}>
         <svg viewBox='0 0 24 24' width={size + 'px'} height={size + 'px'}>
-          <path fill='currentColor' d='M8.75 8a.75.75 0 00-.75.75v6.5c0 .414.336.75.75.75h6.5a.75.75 0 00.75-.75v-6.5a.75.75 0 00-.75-.75h-6.5zm.75 6.5v-5h5v5h-5z' />
-          <path fill='currentColor' d='M15.25 1a.75.75 0 01.75.75V4h2.25c.966 0 1.75.784 1.75 1.75V8h2.25a.75.75 0 010 1.5H20v5h2.25a.75.75 0 010 1.5H20v2.25A1.75 1.75 0 0118.25 20H16v2.25a.75.75 0 01-1.5 0V20h-5v2.25a.75.75 0 01-1.5 0V20H5.75A1.75 1.75 0 014 18.25V16H1.75a.75.75 0 010-1.5H4v-5H1.75a.75.75 0 010-1.5H4V5.75C4 4.784 4.784 4 5.75 4H8V1.75a.75.75 0 011.5 0V4h5V1.75a.75.75 0 01.75-.75zm3 17.5a.25.25 0 00.25-.25V5.75a.25.25 0 00-.25-.25H5.75a.25.25 0 00-.25.25v12.5c0 .138.112.25.25.25h12.5z' />
+          <path
+            fill='currentColor'
+            d='M8.75 8a.75.75 0 00-.75.75v6.5c0 .414.336.75.75.75h6.5a.75.75 0 00.75-.75v-6.5a.75.75 0 00-.75-.75h-6.5zm.75 6.5v-5h5v5h-5z'
+          />
+          <path
+            fill='currentColor'
+            d='M15.25 1a.75.75 0 01.75.75V4h2.25c.966 0 1.75.784 1.75 1.75V8h2.25a.75.75 0 010 1.5H20v5h2.25a.75.75 0 010 1.5H20v2.25A1.75 1.75 0 0118.25 20H16v2.25a.75.75 0 01-1.5 0V20h-5v2.25a.75.75 0 01-1.5 0V20H5.75A1.75 1.75 0 014 18.25V16H1.75a.75.75 0 010-1.5H4v-5H1.75a.75.75 0 010-1.5H4V5.75C4 4.784 4.784 4 5.75 4H8V1.75a.75.75 0 011.5 0V4h5V1.75a.75.75 0 01.75-.75zm3 17.5a.25.25 0 00.25-.25V5.75a.25.25 0 00-.25-.25H5.75a.25.25 0 00-.25.25v12.5c0 .138.112.25.25.25h12.5z'
+          />
         </svg>
       </div>
     )
   },
-  checklist: size => {
+  checklist: (size) => {
     return (
       <div style={{ width: size + 'px', height: size + 'px' }}>
         <svg viewBox='0 0 24 24' width={size + 'px'} height={size + 'px'}>
-          <path fill='currentColor' d='M3.5 3.75a.25.25 0 01.25-.25h13.5a.25.25 0 01.25.25v10a.75.75 0 001.5 0v-10A1.75 1.75 0 0017.25 2H3.75A1.75 1.75 0 002 3.75v16.5c0 .966.784 1.75 1.75 1.75h7a.75.75 0 000-1.5h-7a.25.25 0 01-.25-.25V3.75z' />
-          <path fill='currentColor' d='M6.25 7a.75.75 0 000 1.5h8.5a.75.75 0 000-1.5h-8.5zm-.75 4.75a.75.75 0 01.75-.75h4.5a.75.75 0 010 1.5h-4.5a.75.75 0 01-.75-.75zm16.28 4.53a.75.75 0 10-1.06-1.06l-4.97 4.97-1.97-1.97a.75.75 0 10-1.06 1.06l2.5 2.5a.75.75 0 001.06 0l5.5-5.5z' />
+          <path
+            fill='currentColor'
+            d='M3.5 3.75a.25.25 0 01.25-.25h13.5a.25.25 0 01.25.25v10a.75.75 0 001.5 0v-10A1.75 1.75 0 0017.25 2H3.75A1.75 1.75 0 002 3.75v16.5c0 .966.784 1.75 1.75 1.75h7a.75.75 0 000-1.5h-7a.25.25 0 01-.25-.25V3.75z'
+          />
+          <path
+            fill='currentColor'
+            d='M6.25 7a.75.75 0 000 1.5h8.5a.75.75 0 000-1.5h-8.5zm-.75 4.75a.75.75 0 01.75-.75h4.5a.75.75 0 010 1.5h-4.5a.75.75 0 01-.75-.75zm16.28 4.53a.75.75 0 10-1.06-1.06l-4.97 4.97-1.97-1.97a.75.75 0 10-1.06 1.06l2.5 2.5a.75.75 0 001.06 0l5.5-5.5z'
+          />
         </svg>
       </div>
     )
@@ -351,86 +481,122 @@ export default {
   //     </div>
   //   )
   // },
-  gear: size => {
+  gear: (size) => {
     return (
       <div style={{ width: size + 'px', height: size + 'px' }}>
         <svg viewBox='0 0 512 512' width={size + 'px'} height={size + 'px'}>
-          <path fill='currentColor' d='M495.9 166.6C499.2 175.2 496.4 184.9 489.6 191.2L446.3 230.6C447.4 238.9 448 247.4 448 256C448 264.6 447.4 273.1 446.3 281.4L489.6 320.8C496.4 327.1 499.2 336.8 495.9 345.4C491.5 357.3 486.2 368.8 480.2 379.7L475.5 387.8C468.9 398.8 461.5 409.2 453.4 419.1C447.4 426.2 437.7 428.7 428.9 425.9L373.2 408.1C359.8 418.4 344.1 427 329.2 433.6L316.7 490.7C314.7 499.7 307.7 506.1 298.5 508.5C284.7 510.8 270.5 512 255.1 512C241.5 512 227.3 510.8 213.5 508.5C204.3 506.1 197.3 499.7 195.3 490.7L182.8 433.6C167 427 152.2 418.4 138.8 408.1L83.14 425.9C74.3 428.7 64.55 426.2 58.63 419.1C50.52 409.2 43.12 398.8 36.52 387.8L31.84 379.7C25.77 368.8 20.49 357.3 16.06 345.4C12.82 336.8 15.55 327.1 22.41 320.8L65.67 281.4C64.57 273.1 64 264.6 64 256C64 247.4 64.57 238.9 65.67 230.6L22.41 191.2C15.55 184.9 12.82 175.3 16.06 166.6C20.49 154.7 25.78 143.2 31.84 132.3L36.51 124.2C43.12 113.2 50.52 102.8 58.63 92.95C64.55 85.8 74.3 83.32 83.14 86.14L138.8 103.9C152.2 93.56 167 84.96 182.8 78.43L195.3 21.33C197.3 12.25 204.3 5.04 213.5 3.51C227.3 1.201 241.5 0 256 0C270.5 0 284.7 1.201 298.5 3.51C307.7 5.04 314.7 12.25 316.7 21.33L329.2 78.43C344.1 84.96 359.8 93.56 373.2 103.9L428.9 86.14C437.7 83.32 447.4 85.8 453.4 92.95C461.5 102.8 468.9 113.2 475.5 124.2L480.2 132.3C486.2 143.2 491.5 154.7 495.9 166.6V166.6zM256 336C300.2 336 336 300.2 336 255.1C336 211.8 300.2 175.1 256 175.1C211.8 175.1 176 211.8 176 255.1C176 300.2 211.8 336 256 336z' />
+          <path
+            fill='currentColor'
+            d='M495.9 166.6C499.2 175.2 496.4 184.9 489.6 191.2L446.3 230.6C447.4 238.9 448 247.4 448 256C448 264.6 447.4 273.1 446.3 281.4L489.6 320.8C496.4 327.1 499.2 336.8 495.9 345.4C491.5 357.3 486.2 368.8 480.2 379.7L475.5 387.8C468.9 398.8 461.5 409.2 453.4 419.1C447.4 426.2 437.7 428.7 428.9 425.9L373.2 408.1C359.8 418.4 344.1 427 329.2 433.6L316.7 490.7C314.7 499.7 307.7 506.1 298.5 508.5C284.7 510.8 270.5 512 255.1 512C241.5 512 227.3 510.8 213.5 508.5C204.3 506.1 197.3 499.7 195.3 490.7L182.8 433.6C167 427 152.2 418.4 138.8 408.1L83.14 425.9C74.3 428.7 64.55 426.2 58.63 419.1C50.52 409.2 43.12 398.8 36.52 387.8L31.84 379.7C25.77 368.8 20.49 357.3 16.06 345.4C12.82 336.8 15.55 327.1 22.41 320.8L65.67 281.4C64.57 273.1 64 264.6 64 256C64 247.4 64.57 238.9 65.67 230.6L22.41 191.2C15.55 184.9 12.82 175.3 16.06 166.6C20.49 154.7 25.78 143.2 31.84 132.3L36.51 124.2C43.12 113.2 50.52 102.8 58.63 92.95C64.55 85.8 74.3 83.32 83.14 86.14L138.8 103.9C152.2 93.56 167 84.96 182.8 78.43L195.3 21.33C197.3 12.25 204.3 5.04 213.5 3.51C227.3 1.201 241.5 0 256 0C270.5 0 284.7 1.201 298.5 3.51C307.7 5.04 314.7 12.25 316.7 21.33L329.2 78.43C344.1 84.96 359.8 93.56 373.2 103.9L428.9 86.14C437.7 83.32 447.4 85.8 453.4 92.95C461.5 102.8 468.9 113.2 475.5 124.2L480.2 132.3C486.2 143.2 491.5 154.7 495.9 166.6V166.6zM256 336C300.2 336 336 300.2 336 255.1C336 211.8 300.2 175.1 256 175.1C211.8 175.1 176 211.8 176 255.1C176 300.2 211.8 336 256 336z'
+          />
         </svg>
       </div>
     )
   },
-  inventory: size => {
+  inventory: (size) => {
     return (
       <div style={{ width: size + 'px', height: size + 'px' }}>
         <svg viewBox='0 0 24 24' width={size + 'px'} height={size + 'px'}>
-          <path fill='currentColor' d='M2.75 2A1.75 1.75 0 001 3.75v3.5C1 8.216 1.784 9 2.75 9h18.5A1.75 1.75 0 0023 7.25v-3.5A1.75 1.75 0 0021.25 2H2.75zm18.5 1.5H2.75a.25.25 0 00-.25.25v3.5c0 .138.112.25.25.25h18.5a.25.25 0 00.25-.25v-3.5a.25.25 0 00-.25-.25z' />
-          <path fill='currentColor' d='M2.75 10a.75.75 0 01.75.75v9.5c0 .138.112.25.25.25h16.5a.25.25 0 00.25-.25v-9.5a.75.75 0 011.5 0v9.5A1.75 1.75 0 0120.25 22H3.75A1.75 1.75 0 012 20.25v-9.5a.75.75 0 01.75-.75z' />
+          <path
+            fill='currentColor'
+            d='M2.75 2A1.75 1.75 0 001 3.75v3.5C1 8.216 1.784 9 2.75 9h18.5A1.75 1.75 0 0023 7.25v-3.5A1.75 1.75 0 0021.25 2H2.75zm18.5 1.5H2.75a.25.25 0 00-.25.25v3.5c0 .138.112.25.25.25h18.5a.25.25 0 00.25-.25v-3.5a.25.25 0 00-.25-.25z'
+          />
+          <path
+            fill='currentColor'
+            d='M2.75 10a.75.75 0 01.75.75v9.5c0 .138.112.25.25.25h16.5a.25.25 0 00.25-.25v-9.5a.75.75 0 011.5 0v9.5A1.75 1.75 0 0120.25 22H3.75A1.75 1.75 0 012 20.25v-9.5a.75.75 0 01.75-.75z'
+          />
           <path fill='currentColor' d='M9.75 11.5a.75.75 0 000 1.5h4.5a.75.75 0 000-1.5h-4.5z' />
         </svg>
       </div>
     )
   },
-  ruby: size => {
+  ruby: (size) => {
     return (
       <div style={{ width: size + 'px', height: size + 'px' }}>
         <svg viewBox='0 0 24 24' width={size + 'px'} height={size + 'px'}>
-          <path fill='currentColor' d='M5.873 3.26A.75.75 0 016.44 3h11.31a.75.75 0 01.576.27l5 6a.75.75 0 01-.028.992l-10.75 11.5a.75.75 0 01-1.096 0l-10.75-11.5a.75.75 0 01-.02-1.003l5.19-6zm.91 1.24L2.258 9.73 12 20.153l9.75-10.43L17.399 4.5H6.783z' />
+          <path
+            fill='currentColor'
+            d='M5.873 3.26A.75.75 0 016.44 3h11.31a.75.75 0 01.576.27l5 6a.75.75 0 01-.028.992l-10.75 11.5a.75.75 0 01-1.096 0l-10.75-11.5a.75.75 0 01-.02-1.003l5.19-6zm.91 1.24L2.258 9.73 12 20.153l9.75-10.43L17.399 4.5H6.783z'
+          />
         </svg>
       </div>
     )
   },
-  grab: size => {
+  grab: (size) => {
     return (
       <div style={{ width: size + 'px', height: size + 'px' }}>
         <svg viewBox='0 0 24 24' width={size + 'px'} height={size + 'px'}>
-          <path fill='currentColor' d='M15 18a1 1 0 100-2 1 1 0 000 2zm1-6a1 1 0 11-2 0 1 1 0 012 0zm-7 6a1 1 0 100-2 1 1 0 000 2zm0-5a1 1 0 100-2 1 1 0 000 2zm7-6a1 1 0 11-2 0 1 1 0 012 0zM9 8a1 1 0 100-2 1 1 0 000 2z' />
+          <path
+            fill='currentColor'
+            d='M15 18a1 1 0 100-2 1 1 0 000 2zm1-6a1 1 0 11-2 0 1 1 0 012 0zm-7 6a1 1 0 100-2 1 1 0 000 2zm0-5a1 1 0 100-2 1 1 0 000 2zm7-6a1 1 0 11-2 0 1 1 0 012 0zM9 8a1 1 0 100-2 1 1 0 000 2z'
+          />
         </svg>
       </div>
     )
   },
-  diff: size => {
+  diff: (size) => {
     return (
       <div style={{ width: size + 'px', height: size + 'px' }}>
         <svg viewBox='0 0 24 24' width={size + 'px'} height={size + 'px'}>
-          <path fill='currentColor' fillRule='evenodd' d='M12.25 3.5a.75.75 0 01.75.75V8.5h4.25a.75.75 0 010 1.5H13v4.25a.75.75 0 01-1.5 0V10H7.25a.75.75 0 010-1.5h4.25V4.25a.75.75 0 01.75-.75zM6.562 19.25a.75.75 0 01.75-.75h9.938a.75.75 0 010 1.5H7.312a.75.75 0 01-.75-.75z' />
+          <path
+            fill='currentColor'
+            fillRule='evenodd'
+            d='M12.25 3.5a.75.75 0 01.75.75V8.5h4.25a.75.75 0 010 1.5H13v4.25a.75.75 0 01-1.5 0V10H7.25a.75.75 0 010-1.5h4.25V4.25a.75.75 0 01.75-.75zM6.562 19.25a.75.75 0 01.75-.75h9.938a.75.75 0 010 1.5H7.312a.75.75 0 01-.75-.75z'
+          />
         </svg>
       </div>
     )
   },
-  people: size => {
+  people: (size) => {
     return (
       <div style={{ width: size + 'px', height: size + 'px' }}>
         <svg viewBox='0 0 24 24' width={size + 'px'} height={size + 'px'}>
-          <path fill='currentColor' fillRule='evenodd' d='M3.5 8a5.5 5.5 0 118.596 4.547 9.005 9.005 0 015.9 8.18.75.75 0 01-1.5.045 7.5 7.5 0 00-14.993 0 .75.75 0 01-1.499-.044 9.005 9.005 0 015.9-8.181A5.494 5.494 0 013.5 8zM9 4a4 4 0 100 8 4 4 0 000-8z' />
-          <path fill='currentColor' d='M17.29 8c-.148 0-.292.01-.434.03a.75.75 0 11-.212-1.484 4.53 4.53 0 013.38 8.097 6.69 6.69 0 013.956 6.107.75.75 0 01-1.5 0 5.193 5.193 0 00-3.696-4.972l-.534-.16v-1.676l.41-.209A3.03 3.03 0 0017.29 8z' />
+          <path
+            fill='currentColor'
+            fillRule='evenodd'
+            d='M3.5 8a5.5 5.5 0 118.596 4.547 9.005 9.005 0 015.9 8.18.75.75 0 01-1.5.045 7.5 7.5 0 00-14.993 0 .75.75 0 01-1.499-.044 9.005 9.005 0 015.9-8.181A5.494 5.494 0 013.5 8zM9 4a4 4 0 100 8 4 4 0 000-8z'
+          />
+          <path
+            fill='currentColor'
+            d='M17.29 8c-.148 0-.292.01-.434.03a.75.75 0 11-.212-1.484 4.53 4.53 0 013.38 8.097 6.69 6.69 0 013.956 6.107.75.75 0 01-1.5 0 5.193 5.193 0 00-3.696-4.972l-.534-.16v-1.676l.41-.209A3.03 3.03 0 0017.29 8z'
+          />
         </svg>
       </div>
     )
   },
-  check: size => {
+  check: (size) => {
     return (
       <div style={{ width: size + 'px', height: size + 'px' }}>
         <svg viewBox='0 0 448 512' width={size + 'px'} height={size + 'px'}>
-          <path fill='currentColor' d='M438.6 105.4C451.1 117.9 451.1 138.1 438.6 150.6L182.6 406.6C170.1 419.1 149.9 419.1 137.4 406.6L9.372 278.6C-3.124 266.1-3.124 245.9 9.372 233.4C21.87 220.9 42.13 220.9 54.63 233.4L159.1 338.7L393.4 105.4C405.9 92.88 426.1 92.88 438.6 105.4H438.6z' />
+          <path
+            fill='currentColor'
+            d='M438.6 105.4C451.1 117.9 451.1 138.1 438.6 150.6L182.6 406.6C170.1 419.1 149.9 419.1 137.4 406.6L9.372 278.6C-3.124 266.1-3.124 245.9 9.372 233.4C21.87 220.9 42.13 220.9 54.63 233.4L159.1 338.7L393.4 105.4C405.9 92.88 426.1 92.88 438.6 105.4H438.6z'
+          />
         </svg>
       </div>
     )
   },
-  triangleLeft: size => {
+  triangleLeft: (size) => {
     return (
       <div style={{ width: size + 'px', height: size + 'px' }}>
         <svg viewBox='0 0 24 24' width={size + 'px'} height={size + 'px'}>
-          <path fill='currentColor' fillRule='evenodd' d='M8.854 11.646l5.792-5.792a.5.5 0 01.854.353v11.586a.5.5 0 01-.854.353l-5.792-5.792a.5.5 0 010-.708z' />
+          <path
+            fill='currentColor'
+            fillRule='evenodd'
+            d='M8.854 11.646l5.792-5.792a.5.5 0 01.854.353v11.586a.5.5 0 01-.854.353l-5.792-5.792a.5.5 0 010-.708z'
+          />
         </svg>
       </div>
     )
   },
-  lattice: size => {
+  lattice: (size) => {
     return (
       <div style={{ width: size + 'px', height: size + 'px' }}>
         <svg viewBox='0 0 448 512' width={size + 'px'} height={size + 'px'}>
-          <path fill='currentColor' d='M416 32H32A32 32 0 0 0 0 64v384a32 32 0 0 0 32 32h384a32 32 0 0 0 32-32V64a32 32 0 0 0-32-32zm-32 64v128H256V96zm-192 0v128H64V96zM64 416V288h128v128zm192 0V288h128v128z' />
+          <path
+            fill='currentColor'
+            d='M416 32H32A32 32 0 0 0 0 64v384a32 32 0 0 0 32 32h384a32 32 0 0 0 32-32V64a32 32 0 0 0-32-32zm-32 64v128H256V96zm-192 0v128H64V96zM64 416V288h128v128zm192 0V288h128v128z'
+          />
         </svg>
       </div>
     )
@@ -444,107 +610,157 @@ export default {
   //     </div>
   //   )
   // },
-  close: size => {
+  close: (size) => {
     return (
       <div style={{ width: size + 'px', height: size + 'px' }}>
         <svg viewBox='0 0 352 512' width={size + 'px'} height={size + 'px'}>
-          <path fill='currentColor' fillRule='evenodd' d='M242.72 256l100.07-100.07c12.28-12.28 12.28-32.19 0-44.48l-22.24-22.24c-12.28-12.28-32.19-12.28-44.48 0L176 189.28 75.93 89.21c-12.28-12.28-32.19-12.28-44.48 0L9.21 111.45c-12.28 12.28-12.28 32.19 0 44.48L109.28 256 9.21 356.07c-12.28 12.28-12.28 32.19 0 44.48l22.24 22.24c12.28 12.28 32.2 12.28 44.48 0L176 322.72l100.07 100.07c12.28 12.28 32.2 12.28 44.48 0l22.24-22.24c12.28-12.28 12.28-32.19 0-44.48L242.72 256z' />
+          <path
+            fill='currentColor'
+            fillRule='evenodd'
+            d='M242.72 256l100.07-100.07c12.28-12.28 12.28-32.19 0-44.48l-22.24-22.24c-12.28-12.28-32.19-12.28-44.48 0L176 189.28 75.93 89.21c-12.28-12.28-32.19-12.28-44.48 0L9.21 111.45c-12.28 12.28-12.28 32.19 0 44.48L109.28 256 9.21 356.07c-12.28 12.28-12.28 32.19 0 44.48l22.24 22.24c12.28 12.28 32.2 12.28 44.48 0L176 322.72l100.07 100.07c12.28 12.28 32.2 12.28 44.48 0l22.24-22.24c12.28-12.28 12.28-32.19 0-44.48L242.72 256z'
+          />
         </svg>
       </div>
     )
   },
-  wallet: size => {
+  wallet: (size) => {
     return (
       <div style={{ width: size + 'px', height: size + 'px' }}>
         <svg viewBox='0 0 512 512' width={size + 'px'} height={size + 'px'}>
-          <path fill='currentColor' d='M461.2 128H80c-8.84 0-16-7.16-16-16s7.16-16 16-16h384c8.84 0 16-7.16 16-16 0-26.51-21.49-48-48-48H64C28.65 32 0 60.65 0 96v320c0 35.35 28.65 64 64 64h397.2c28.02 0 50.8-21.53 50.8-48V176c0-26.47-22.78-48-50.8-48zM416 336c-17.67 0-32-14.33-32-32s14.33-32 32-32 32 14.33 32 32-14.33 32-32 32' />
+          <path
+            fill='currentColor'
+            d='M461.2 128H80c-8.84 0-16-7.16-16-16s7.16-16 16-16h384c8.84 0 16-7.16 16-16 0-26.51-21.49-48-48-48H64C28.65 32 0 60.65 0 96v320c0 35.35 28.65 64 64 64h397.2c28.02 0 50.8-21.53 50.8-48V176c0-26.47-22.78-48-50.8-48zM416 336c-17.67 0-32-14.33-32-32s14.33-32 32-32 32 14.33 32 32-14.33 32-32 32'
+          />
         </svg>
       </div>
     )
   },
-  plug: size => {
+  plug: (size) => {
     return (
       <div style={{ width: size + 'px', height: size + 'px' }}>
         <svg viewBox='0 0 384 512' width={size + 'px'} height={size + 'px'}>
-          <path fill='currentColor' fillRule='evenodd' d='M320,32a32,32,0,0,0-64,0v96h64Zm48,128H16A16,16,0,0,0,0,176v32a16,16,0,0,0,16,16H32v32A160.07,160.07,0,0,0,160,412.8V512h64V412.8A160.07,160.07,0,0,0,352,256V224h16a16,16,0,0,0,16-16V176A16,16,0,0,0,368,160ZM128,32a32,32,0,0,0-64,0v96h64Z' />
+          <path
+            fill='currentColor'
+            fillRule='evenodd'
+            d='M320,32a32,32,0,0,0-64,0v96h64Zm48,128H16A16,16,0,0,0,0,176v32a16,16,0,0,0,16,16H32v32A160.07,160.07,0,0,0,160,412.8V512h64V412.8A160.07,160.07,0,0,0,352,256V224h16a16,16,0,0,0,16-16V176A16,16,0,0,0,368,160ZM128,32a32,32,0,0,0-64,0v96h64Z'
+          />
         </svg>
       </div>
     )
   },
-  lock: size => {
+  lock: (size) => {
     return (
       <div style={{ width: size + 'px', height: size + 'px' }}>
         <svg viewBox='0 0 448 512' width={size + 'px'} height={size + 'px'}>
-          <path fill='currentColor' fillRule='evenodd'  d='M400 224h-24v-72C376 68.2 307.8 0 224 0S72 68.2 72 152v72H48c-26.5 0-48 21.5-48 48v192c0 26.5 21.5 48 48 48h352c26.5 0 48-21.5 48-48V272c0-26.5-21.5-48-48-48zm-104 0H152v-72c0-39.7 32.3-72 72-72s72 32.3 72 72v72z' />
+          <path
+            fill='currentColor'
+            fillRule='evenodd'
+            d='M400 224h-24v-72C376 68.2 307.8 0 224 0S72 68.2 72 152v72H48c-26.5 0-48 21.5-48 48v192c0 26.5 21.5 48 48 48h352c26.5 0 48-21.5 48-48V272c0-26.5-21.5-48-48-48zm-104 0H152v-72c0-39.7 32.3-72 72-72s72 32.3 72 72v72z'
+          />
         </svg>
       </div>
     )
   },
-  key: size => {
+  key: (size) => {
     return (
       <div style={{ width: size + 'px', height: size + 'px' }}>
         <svg viewBox='0 0 448 512' width={size + 'px'} height={size + 'px'}>
-          <path fill='currentColor' d='M227.3 265.9L141.3 352L182.6 393.4C195.1 405.9 195.1 426.1 182.6 438.6C170.1 451.1 149.9 451.1 137.4 438.6L96 397.3L77.25 416L118.6 457.4C131.1 469.9 131.1 490.1 118.6 502.6C106.1 515.1 85.87 515.1 73.37 502.6L9.372 438.6C-3.124 426.1-3.124 405.9 9.372 393.4L182.1 220.7C168.1 198.5 159.1 172.2 159.1 144C159.1 64.47 224.5 0 304 0C383.5 0 448 64.47 448 144C448 223.5 383.5 288 304 288C275.8 288 249.5 279.9 227.3 265.9H227.3zM304 224C348.2 224 384 188.2 384 144C384 99.82 348.2 64 304 64C259.8 64 224 99.82 224 144C224 188.2 259.8 224 304 224z' />
+          <path
+            fill='currentColor'
+            d='M227.3 265.9L141.3 352L182.6 393.4C195.1 405.9 195.1 426.1 182.6 438.6C170.1 451.1 149.9 451.1 137.4 438.6L96 397.3L77.25 416L118.6 457.4C131.1 469.9 131.1 490.1 118.6 502.6C106.1 515.1 85.87 515.1 73.37 502.6L9.372 438.6C-3.124 426.1-3.124 405.9 9.372 393.4L182.1 220.7C168.1 198.5 159.1 172.2 159.1 144C159.1 64.47 224.5 0 304 0C383.5 0 448 64.47 448 144C448 223.5 383.5 288 304 288C275.8 288 249.5 279.9 227.3 265.9H227.3zM304 224C348.2 224 384 188.2 384 144C384 99.82 348.2 64 304 64C259.8 64 224 99.82 224 144C224 188.2 259.8 224 304 224z'
+          />
         </svg>
       </div>
     )
   },
-  expand: size => {
+  expand: (size) => {
     return (
       <div style={{ width: size + 'px', height: size + 'px' }}>
         <svg viewBox='0 0 448 512' width={size + 'px'} height={size + 'px'}>
-          <path fill='currentColor' fillRule='evenodd'  d='M0 180V56c0-13.3 10.7-24 24-24h124c6.6 0 12 5.4 12 12v40c0 6.6-5.4 12-12 12H64v84c0 6.6-5.4 12-12 12H12c-6.6 0-12-5.4-12-12zM288 44v40c0 6.6 5.4 12 12 12h84v84c0 6.6 5.4 12 12 12h40c6.6 0 12-5.4 12-12V56c0-13.3-10.7-24-24-24H300c-6.6 0-12 5.4-12 12zm148 276h-40c-6.6 0-12 5.4-12 12v84h-84c-6.6 0-12 5.4-12 12v40c0 6.6 5.4 12 12 12h124c13.3 0 24-10.7 24-24V332c0-6.6-5.4-12-12-12zM160 468v-40c0-6.6-5.4-12-12-12H64v-84c0-6.6-5.4-12-12-12H12c-6.6 0-12 5.4-12 12v124c0 13.3 10.7 24 24 24h124c6.6 0 12-5.4 12-12z' />
+          <path
+            fill='currentColor'
+            fillRule='evenodd'
+            d='M0 180V56c0-13.3 10.7-24 24-24h124c6.6 0 12 5.4 12 12v40c0 6.6-5.4 12-12 12H64v84c0 6.6-5.4 12-12 12H12c-6.6 0-12-5.4-12-12zM288 44v40c0 6.6 5.4 12 12 12h84v84c0 6.6 5.4 12 12 12h40c6.6 0 12-5.4 12-12V56c0-13.3-10.7-24-24-24H300c-6.6 0-12 5.4-12 12zm148 276h-40c-6.6 0-12 5.4-12 12v84h-84c-6.6 0-12 5.4-12 12v40c0 6.6 5.4 12 12 12h124c13.3 0 24-10.7 24-24V332c0-6.6-5.4-12-12-12zM160 468v-40c0-6.6-5.4-12-12-12H64v-84c0-6.6-5.4-12-12-12H12c-6.6 0-12 5.4-12 12v124c0 13.3 10.7 24 24 24h124c6.6 0 12-5.4 12-12z'
+          />
         </svg>
       </div>
     )
   },
-  gridplus: size => {
+  gridplus: (size) => {
     return (
       <div style={{ width: size + 'px', height: size + 'px' }}>
         <svg viewBox='0 0 170 170' width={size + 'px'} height={size + 'px'}>
-          <polygon class='cls-1' points='148.36 68.2 140.59 68.2 140.59 60.57 140.46 60.57 134.7 60.57 134.11 60.57 134.11 68.2 126.35 68.2 126.35 74.31 134.11 74.31 134.11 81.95 140.59 81.95 140.59 74.31 148.36 74.31 148.36 68.2' />
-          <path class='cls-1' d='M47.47,96a14.52,14.52,0,0,1-6.32,1.31c-6.46,0-11.7-4.66-11.7-11.46s5-11.27,11.75-11.27a15.07,15.07,0,0,1,8.45,2.33l3-5.34c-1.27-.83-4.86-3.25-11.71-3.25C30.13,68.32,22.5,76,22.5,85.85s7.63,17.48,18.26,17.48c7.14,0,11.17-2.57,13-4V85.9H47.47Z' />
-          <path class='cls-1' d='M87.41,80.89c0-7.84-5.69-12.69-14.24-12.69H60.63v35.13h6.89v-10h6l6.85,10h8.14l-8-11.59A11.48,11.48,0,0,0,87.41,80.89ZM72.57,87.24h-5v-13h5.1c4.55,0,7.65,2.44,7.65,6.64C80.27,84.74,77.22,87.24,72.57,87.24Z' />
+          <polygon
+            class='cls-1'
+            points='148.36 68.2 140.59 68.2 140.59 60.57 140.46 60.57 134.7 60.57 134.11 60.57 134.11 68.2 126.35 68.2 126.35 74.31 134.11 74.31 134.11 81.95 140.59 81.95 140.59 74.31 148.36 74.31 148.36 68.2'
+          />
+          <path
+            class='cls-1'
+            d='M47.47,96a14.52,14.52,0,0,1-6.32,1.31c-6.46,0-11.7-4.66-11.7-11.46s5-11.27,11.75-11.27a15.07,15.07,0,0,1,8.45,2.33l3-5.34c-1.27-.83-4.86-3.25-11.71-3.25C30.13,68.32,22.5,76,22.5,85.85s7.63,17.48,18.26,17.48c7.14,0,11.17-2.57,13-4V85.9H47.47Z'
+          />
+          <path
+            class='cls-1'
+            d='M87.41,80.89c0-7.84-5.69-12.69-14.24-12.69H60.63v35.13h6.89v-10h6l6.85,10h8.14l-8-11.59A11.48,11.48,0,0,0,87.41,80.89ZM72.57,87.24h-5v-13h5.1c4.55,0,7.65,2.44,7.65,6.64C80.27,84.74,77.22,87.24,72.57,87.24Z'
+          />
           <rect class='cls-1' x='94.59' y='68.2' width='6.9' height='35.13' />
-          <path class='cls-1' d='M140.56,86.06h0V85h-6.43v1.06s-.07,2.56-.18,3.4c-.66,4.91-5.33,7.78-11.29,7.78h-6.34V74.3h6.38V68.2H109.42v35.13H123c9.74,0,16.83-5.32,17.6-13.87C140.64,88.61,140.56,86.06,140.56,86.06Z' />
+          <path
+            class='cls-1'
+            d='M140.56,86.06h0V85h-6.43v1.06s-.07,2.56-.18,3.4c-.66,4.91-5.33,7.78-11.29,7.78h-6.34V74.3h6.38V68.2H109.42v35.13H123c9.74,0,16.83-5.32,17.6-13.87C140.64,88.61,140.56,86.06,140.56,86.06Z'
+          />
           <circle class='cls-2' cx='85' cy='85' r='82.81' />
         </svg>
       </div>
     )
   },
-  window: size => {
+  window: (size) => {
     return (
       <div style={{ width: size + 'px', height: size + 'px' }}>
         <svg viewBox='0 0 512 512' width={size + 'px'} height={size + 'px'}>
-          <path fill='currentColor' d='M464 32H48C21.5 32 0 53.5 0 80v352c0 26.5 21.5 48 48 48h416c26.5 0 48-21.5 48-48V80c0-26.5-21.5-48-48-48zm0 394c0 3.3-2.7 6-6 6H54c-3.3 0-6-2.7-6-6V192h416v234z' />
+          <path
+            fill='currentColor'
+            d='M464 32H48C21.5 32 0 53.5 0 80v352c0 26.5 21.5 48 48 48h416c26.5 0 48-21.5 48-48V80c0-26.5-21.5-48-48-48zm0 394c0 3.3-2.7 6-6 6H54c-3.3 0-6-2.7-6-6V192h416v234z'
+          />
         </svg>
       </div>
     )
   },
-  select: size => {
+  select: (size) => {
     return (
       <div style={{ width: size + 'px', height: size + 'px' }}>
         <svg viewBox='0 0 24 24' width={size + 'px'} height={size + 'px'}>
-          <path fill='currentColor' d='M3.75 5.5a.75.75 0 000 1.5h10a.75.75 0 000-1.5h-10zm5 6a.75.75 0 000 1.5h11.5a.75.75 0 000-1.5H8.75zm0 6a.75.75 0 000 1.5h11.5a.75.75 0 000-1.5H8.75zM5 12a1 1 0 11-2 0 1 1 0 012 0zm-1 7a1 1 0 100-2 1 1 0 000 2z' />
-          <path fill='currentColor' d='M19.309 7.918l-2.245-2.501A.25.25 0 0117.25 5h4.49a.25.25 0 01.185.417l-2.244 2.5a.25.25 0 01-.372 0z' />
+          <path
+            fill='currentColor'
+            d='M3.75 5.5a.75.75 0 000 1.5h10a.75.75 0 000-1.5h-10zm5 6a.75.75 0 000 1.5h11.5a.75.75 0 000-1.5H8.75zm0 6a.75.75 0 000 1.5h11.5a.75.75 0 000-1.5H8.75zM5 12a1 1 0 11-2 0 1 1 0 012 0zm-1 7a1 1 0 100-2 1 1 0 000 2z'
+          />
+          <path
+            fill='currentColor'
+            d='M19.309 7.918l-2.245-2.501A.25.25 0 0117.25 5h4.49a.25.25 0 01.185.417l-2.244 2.5a.25.25 0 01-.372 0z'
+          />
         </svg>
       </div>
     )
   },
-  cube: size => {
+  cube: (size) => {
     return (
       <div style={{ width: size + 'px', height: size + 'px' }}>
         <svg viewBox='0 0 16 16' width={size + 'px'} height={size + 'px'}>
-          <path fillRule='evenodd' fill='currentColor' d='M8.878.392a1.75 1.75 0 00-1.756 0l-5.25 3.045A1.75 1.75 0 001 4.951v6.098c0 .624.332 1.2.872 1.514l5.25 3.045a1.75 1.75 0 001.756 0l5.25-3.045c.54-.313.872-.89.872-1.514V4.951c0-.624-.332-1.2-.872-1.514L8.878.392zM7.875 1.69a.25.25 0 01.25 0l4.63 2.685L8 7.133 3.245 4.375l4.63-2.685zM2.5 5.677v5.372c0 .09.047.171.125.216l4.625 2.683V8.432L2.5 5.677zm6.25 8.271l4.625-2.683a.25.25 0 00.125-.216V5.677L8.75 8.432v5.516z' />
+          <path
+            fillRule='evenodd'
+            fill='currentColor'
+            d='M8.878.392a1.75 1.75 0 00-1.756 0l-5.25 3.045A1.75 1.75 0 001 4.951v6.098c0 .624.332 1.2.872 1.514l5.25 3.045a1.75 1.75 0 001.756 0l5.25-3.045c.54-.313.872-.89.872-1.514V4.951c0-.624-.332-1.2-.872-1.514L8.878.392zM7.875 1.69a.25.25 0 01.25 0l4.63 2.685L8 7.133 3.245 4.375l4.63-2.685zM2.5 5.677v5.372c0 .09.047.171.125.216l4.625 2.683V8.432L2.5 5.677zm6.25 8.271l4.625-2.683a.25.25 0 00.125-.216V5.677L8.75 8.432v5.516z'
+          />
         </svg>
       </div>
     )
   },
-  chain: size => {
+  chain: (size) => {
     return (
       <div style={{ width: size + 'px', height: size + 'px' }}>
         <svg viewBox='0 0 640 512' width={size + 'px'} height={size + 'px'}>
-          <path fill='currentColor' d='M172.5 131.1C228.1 75.51 320.5 75.51 376.1 131.1C426.1 181.1 433.5 260.8 392.4 318.3L391.3 319.9C381 334.2 361 337.6 346.7 327.3C332.3 317 328.9 297 339.2 282.7L340.3 281.1C363.2 249 359.6 205.1 331.7 177.2C300.3 145.8 249.2 145.8 217.7 177.2L105.5 289.5C73.99 320.1 73.99 372 105.5 403.5C133.3 431.4 177.3 435 209.3 412.1L210.9 410.1C225.3 400.7 245.3 404 255.5 418.4C265.8 432.8 262.5 452.8 248.1 463.1L246.5 464.2C188.1 505.3 110.2 498.7 60.21 448.8C3.741 392.3 3.741 300.7 60.21 244.3L172.5 131.1zM467.5 380C411 436.5 319.5 436.5 263 380C213 330 206.5 251.2 247.6 193.7L248.7 192.1C258.1 177.8 278.1 174.4 293.3 184.7C307.7 194.1 311.1 214.1 300.8 229.3L299.7 230.9C276.8 262.1 280.4 306.9 308.3 334.8C339.7 366.2 390.8 366.2 422.3 334.8L534.5 222.5C566 191 566 139.1 534.5 108.5C506.7 80.63 462.7 76.99 430.7 99.9L429.1 101C414.7 111.3 394.7 107.1 384.5 93.58C374.2 79.2 377.5 59.21 391.9 48.94L393.5 47.82C451 6.731 529.8 13.25 579.8 63.24C636.3 119.7 636.3 211.3 579.8 267.7L467.5 380z' />
+          <path
+            fill='currentColor'
+            d='M172.5 131.1C228.1 75.51 320.5 75.51 376.1 131.1C426.1 181.1 433.5 260.8 392.4 318.3L391.3 319.9C381 334.2 361 337.6 346.7 327.3C332.3 317 328.9 297 339.2 282.7L340.3 281.1C363.2 249 359.6 205.1 331.7 177.2C300.3 145.8 249.2 145.8 217.7 177.2L105.5 289.5C73.99 320.1 73.99 372 105.5 403.5C133.3 431.4 177.3 435 209.3 412.1L210.9 410.1C225.3 400.7 245.3 404 255.5 418.4C265.8 432.8 262.5 452.8 248.1 463.1L246.5 464.2C188.1 505.3 110.2 498.7 60.21 448.8C3.741 392.3 3.741 300.7 60.21 244.3L172.5 131.1zM467.5 380C411 436.5 319.5 436.5 263 380C213 330 206.5 251.2 247.6 193.7L248.7 192.1C258.1 177.8 278.1 174.4 293.3 184.7C307.7 194.1 311.1 214.1 300.8 229.3L299.7 230.9C276.8 262.1 280.4 306.9 308.3 334.8C339.7 366.2 390.8 366.2 422.3 334.8L534.5 222.5C566 191 566 139.1 534.5 108.5C506.7 80.63 462.7 76.99 430.7 99.9L429.1 101C414.7 111.3 394.7 107.1 384.5 93.58C374.2 79.2 377.5 59.21 391.9 48.94L393.5 47.82C451 6.731 529.8 13.25 579.8 63.24C636.3 119.7 636.3 211.3 579.8 267.7L467.5 380z'
+          />
         </svg>
       </div>
     )
@@ -570,15 +786,15 @@ export default {
   // accounts: size => {
   //   return (
   //     <div style={{ width: size + 'px', height: size + 'px' }}>
-  //       <svg 
+  //       <svg
   //         viewBox='0 0 24 24'
-  //         width={size + 'px'} 
+  //         width={size + 'px'}
   //         height={size + 'px'}
-  //         fill='none' 
-  //         stroke='currentColor' 
-  //         stroke-width='3' 
-  //         stroke-linecap='round' 
-  //         stroke-linejoin='round' 
+  //         fill='none'
+  //         stroke='currentColor'
+  //         stroke-width='3'
+  //         stroke-linecap='round'
+  //         stroke-linejoin='round'
   //       >
   //         <path d='M17 21v-2a4 4 0 0 0-4-4H5a4 4 0 0 0-4 4v2' />
   //         <circle cx='9' cy='7' r='4' />
@@ -588,140 +804,185 @@ export default {
   //     </div>
   //   )
   // },
-  accounts: size => {
+  accounts: (size) => {
     return (
       <div style={{ width: size + 'px', height: size + 'px' }}>
         <svg viewBox='0 0 448 512' width={size + 'px'} height={size + 'px'}>
-          <path fill='currentColor' d='M176 448C167.3 448 160 455.3 160 464V512h32v-48C192 455.3 184.8 448 176 448zM272 448c-8.75 0-16 7.25-16 16s7.25 16 16 16s16-7.25 16-16S280.8 448 272 448zM164 172l8.205 24.62c1.215 3.645 6.375 3.645 7.59 0L188 172l24.62-8.203c3.646-1.219 3.646-6.375 0-7.594L188 148L179.8 123.4c-1.215-3.648-6.375-3.648-7.59 0L164 148L139.4 156.2c-3.646 1.219-3.646 6.375 0 7.594L164 172zM336.1 315.4C304 338.6 265.1 352 224 352s-80.03-13.43-112.1-36.59C46.55 340.2 0 403.3 0 477.3C0 496.5 15.52 512 34.66 512H128v-64c0-17.75 14.25-32 32-32h128c17.75 0 32 14.25 32 32v64h93.34C432.5 512 448 496.5 448 477.3C448 403.3 401.5 340.2 336.1 315.4zM64 224h13.5C102.3 280.5 158.4 320 224 320s121.8-39.5 146.5-96H384c8.75 0 16-7.25 16-16v-96C400 103.3 392.8 96 384 96h-13.5C345.8 39.5 289.6 0 224 0S102.3 39.5 77.5 96H64C55.25 96 48 103.3 48 112v96C48 216.8 55.25 224 64 224zM104 136C104 113.9 125.5 96 152 96h144c26.5 0 48 17.88 48 40V160c0 53-43 96-96 96h-48c-53 0-96-43-96-96V136z' />
+          <path
+            fill='currentColor'
+            d='M176 448C167.3 448 160 455.3 160 464V512h32v-48C192 455.3 184.8 448 176 448zM272 448c-8.75 0-16 7.25-16 16s7.25 16 16 16s16-7.25 16-16S280.8 448 272 448zM164 172l8.205 24.62c1.215 3.645 6.375 3.645 7.59 0L188 172l24.62-8.203c3.646-1.219 3.646-6.375 0-7.594L188 148L179.8 123.4c-1.215-3.648-6.375-3.648-7.59 0L164 148L139.4 156.2c-3.646 1.219-3.646 6.375 0 7.594L164 172zM336.1 315.4C304 338.6 265.1 352 224 352s-80.03-13.43-112.1-36.59C46.55 340.2 0 403.3 0 477.3C0 496.5 15.52 512 34.66 512H128v-64c0-17.75 14.25-32 32-32h128c17.75 0 32 14.25 32 32v64h93.34C432.5 512 448 496.5 448 477.3C448 403.3 401.5 340.2 336.1 315.4zM64 224h13.5C102.3 280.5 158.4 320 224 320s121.8-39.5 146.5-96H384c8.75 0 16-7.25 16-16v-96C400 103.3 392.8 96 384 96h-13.5C345.8 39.5 289.6 0 224 0S102.3 39.5 77.5 96H64C55.25 96 48 103.3 48 112v96C48 216.8 55.25 224 64 224zM104 136C104 113.9 125.5 96 152 96h144c26.5 0 48 17.88 48 40V160c0 53-43 96-96 96h-48c-53 0-96-43-96-96V136z'
+          />
         </svg>
       </div>
     )
   },
-  search: size => {
+  search: (size) => {
     return (
       <div style={{ width: size + 'px', height: size + 'px' }}>
         <svg viewBox='0 0 512 512' width={size + 'px'} height={size + 'px'}>
-          <path fill='currentColor' d='M500.3 443.7l-119.7-119.7c27.22-40.41 40.65-90.9 33.46-144.7C401.8 87.79 326.8 13.32 235.2 1.723C99.01-15.51-15.51 99.01 1.724 235.2c11.6 91.64 86.08 166.7 177.6 178.9c53.8 7.189 104.3-6.236 144.7-33.46l119.7 119.7c15.62 15.62 40.95 15.62 56.57 0C515.9 484.7 515.9 459.3 500.3 443.7zM79.1 208c0-70.58 57.42-128 128-128s128 57.42 128 128c0 70.58-57.42 128-128 128S79.1 278.6 79.1 208z' />
+          <path
+            fill='currentColor'
+            d='M500.3 443.7l-119.7-119.7c27.22-40.41 40.65-90.9 33.46-144.7C401.8 87.79 326.8 13.32 235.2 1.723C99.01-15.51-15.51 99.01 1.724 235.2c11.6 91.64 86.08 166.7 177.6 178.9c53.8 7.189 104.3-6.236 144.7-33.46l119.7 119.7c15.62 15.62 40.95 15.62 56.57 0C515.9 484.7 515.9 459.3 500.3 443.7zM79.1 208c0-70.58 57.42-128 128-128s128 57.42 128 128c0 70.58-57.42 128-128 128S79.1 278.6 79.1 208z'
+          />
         </svg>
       </div>
     )
   },
-  window: size => {
+  window: (size) => {
     return (
       <div style={{ width: size + 'px', height: size + 'px' }}>
         <svg viewBox='0 0 512 512' width={size + 'px'} height={size + 'px'}>
-          <path fill='currentColor' d='M448 32C483.3 32 512 60.65 512 96V416C512 451.3 483.3 480 448 480H64C28.65 480 0 451.3 0 416V96C0 60.65 28.65 32 64 32H448zM96 96C78.33 96 64 110.3 64 128C64 145.7 78.33 160 96 160H416C433.7 160 448 145.7 448 128C448 110.3 433.7 96 416 96H96z' />
+          <path
+            fill='currentColor'
+            d='M448 32C483.3 32 512 60.65 512 96V416C512 451.3 483.3 480 448 480H64C28.65 480 0 451.3 0 416V96C0 60.65 28.65 32 64 32H448zM96 96C78.33 96 64 110.3 64 128C64 145.7 78.33 160 96 160H416C433.7 160 448 145.7 448 128C448 110.3 433.7 96 416 96H96z'
+          />
         </svg>
       </div>
     )
   },
-  settings: size => {
+  settings: (size) => {
     return (
       <div style={{ width: size + 'px', height: size + 'px' }}>
         <svg viewBox='0 0 512 512' width={size + 'px'} height={size + 'px'}>
-          <path fill='currentColor' d='M0 416C0 398.3 14.33 384 32 384H86.66C99 355.7 127.2 336 160 336C192.8 336 220.1 355.7 233.3 384H480C497.7 384 512 398.3 512 416C512 433.7 497.7 448 480 448H233.3C220.1 476.3 192.8 496 160 496C127.2 496 99 476.3 86.66 448H32C14.33 448 0 433.7 0 416V416zM192 416C192 398.3 177.7 384 160 384C142.3 384 128 398.3 128 416C128 433.7 142.3 448 160 448C177.7 448 192 433.7 192 416zM352 176C384.8 176 412.1 195.7 425.3 224H480C497.7 224 512 238.3 512 256C512 273.7 497.7 288 480 288H425.3C412.1 316.3 384.8 336 352 336C319.2 336 291 316.3 278.7 288H32C14.33 288 0 273.7 0 256C0 238.3 14.33 224 32 224H278.7C291 195.7 319.2 176 352 176zM384 256C384 238.3 369.7 224 352 224C334.3 224 320 238.3 320 256C320 273.7 334.3 288 352 288C369.7 288 384 273.7 384 256zM480 64C497.7 64 512 78.33 512 96C512 113.7 497.7 128 480 128H265.3C252.1 156.3 224.8 176 192 176C159.2 176 131 156.3 118.7 128H32C14.33 128 0 113.7 0 96C0 78.33 14.33 64 32 64H118.7C131 35.75 159.2 16 192 16C224.8 16 252.1 35.75 265.3 64H480zM160 96C160 113.7 174.3 128 192 128C209.7 128 224 113.7 224 96C224 78.33 209.7 64 192 64C174.3 64 160 78.33 160 96z' />
+          <path
+            fill='currentColor'
+            d='M0 416C0 398.3 14.33 384 32 384H86.66C99 355.7 127.2 336 160 336C192.8 336 220.1 355.7 233.3 384H480C497.7 384 512 398.3 512 416C512 433.7 497.7 448 480 448H233.3C220.1 476.3 192.8 496 160 496C127.2 496 99 476.3 86.66 448H32C14.33 448 0 433.7 0 416V416zM192 416C192 398.3 177.7 384 160 384C142.3 384 128 398.3 128 416C128 433.7 142.3 448 160 448C177.7 448 192 433.7 192 416zM352 176C384.8 176 412.1 195.7 425.3 224H480C497.7 224 512 238.3 512 256C512 273.7 497.7 288 480 288H425.3C412.1 316.3 384.8 336 352 336C319.2 336 291 316.3 278.7 288H32C14.33 288 0 273.7 0 256C0 238.3 14.33 224 32 224H278.7C291 195.7 319.2 176 352 176zM384 256C384 238.3 369.7 224 352 224C334.3 224 320 238.3 320 256C320 273.7 334.3 288 352 288C369.7 288 384 273.7 384 256zM480 64C497.7 64 512 78.33 512 96C512 113.7 497.7 128 480 128H265.3C252.1 156.3 224.8 176 192 176C159.2 176 131 156.3 118.7 128H32C14.33 128 0 113.7 0 96C0 78.33 14.33 64 32 64H118.7C131 35.75 159.2 16 192 16C224.8 16 252.1 35.75 265.3 64H480zM160 96C160 113.7 174.3 128 192 128C209.7 128 224 113.7 224 96C224 78.33 209.7 64 192 64C174.3 64 160 78.33 160 96z'
+          />
         </svg>
       </div>
     )
   },
-  chevronLeft: size => {
+  chevronLeft: (size) => {
     return (
       <div style={{ width: size + 'px', height: size + 'px' }}>
         <svg viewBox='0 0 320 512' width={size + 'px'} height={size + 'px'}>
-          <path fill='currentColor' d='M224 480c-8.188 0-16.38-3.125-22.62-9.375l-192-192c-12.5-12.5-12.5-32.75 0-45.25l192-192c12.5-12.5 32.75-12.5 45.25 0s12.5 32.75 0 45.25L77.25 256l169.4 169.4c12.5 12.5 12.5 32.75 0 45.25C240.4 476.9 232.2 480 224 480z' />
+          <path
+            fill='currentColor'
+            d='M224 480c-8.188 0-16.38-3.125-22.62-9.375l-192-192c-12.5-12.5-12.5-32.75 0-45.25l192-192c12.5-12.5 32.75-12.5 45.25 0s12.5 32.75 0 45.25L77.25 256l169.4 169.4c12.5 12.5 12.5 32.75 0 45.25C240.4 476.9 232.2 480 224 480z'
+          />
         </svg>
       </div>
     )
   },
-  x: size => {
+  x: (size) => {
     return (
       <div style={{ width: size + 'px', height: size + 'px' }}>
         <svg viewBox='0 0 320 512' width={size + 'px'} height={size + 'px'}>
-          <path fill='currentColor' d='M310.6 361.4c12.5 12.5 12.5 32.75 0 45.25C304.4 412.9 296.2 416 288 416s-16.38-3.125-22.62-9.375L160 301.3L54.63 406.6C48.38 412.9 40.19 416 32 416S15.63 412.9 9.375 406.6c-12.5-12.5-12.5-32.75 0-45.25l105.4-105.4L9.375 150.6c-12.5-12.5-12.5-32.75 0-45.25s32.75-12.5 45.25 0L160 210.8l105.4-105.4c12.5-12.5 32.75-12.5 45.25 0s12.5 32.75 0 45.25l-105.4 105.4L310.6 361.4z' />
+          <path
+            fill='currentColor'
+            d='M310.6 361.4c12.5 12.5 12.5 32.75 0 45.25C304.4 412.9 296.2 416 288 416s-16.38-3.125-22.62-9.375L160 301.3L54.63 406.6C48.38 412.9 40.19 416 32 416S15.63 412.9 9.375 406.6c-12.5-12.5-12.5-32.75 0-45.25l105.4-105.4L9.375 150.6c-12.5-12.5-12.5-32.75 0-45.25s32.75-12.5 45.25 0L160 210.8l105.4-105.4c12.5-12.5 32.75-12.5 45.25 0s12.5 32.75 0 45.25l-105.4 105.4L310.6 361.4z'
+          />
         </svg>
       </div>
     )
   },
-  tokens: size => {
+  tokens: (size) => {
     return (
       <div style={{ width: size + 'px', height: size + 'px' }}>
         <svg viewBox='0 0 512 512' width={size + 'px'} height={size + 'px'}>
-          <path fill='currentColor' d='M512 80C512 98.01 497.7 114.6 473.6 128C444.5 144.1 401.2 155.5 351.3 158.9C347.7 157.2 343.9 155.5 340.1 153.9C300.6 137.4 248.2 128 192 128C183.7 128 175.6 128.2 167.5 128.6L166.4 128C142.3 114.6 128 98.01 128 80C128 35.82 213.1 0 320 0C426 0 512 35.82 512 80V80zM160.7 161.1C170.9 160.4 181.3 160 192 160C254.2 160 309.4 172.3 344.5 191.4C369.3 204.9 384 221.7 384 240C384 243.1 383.3 247.9 381.9 251.7C377.3 264.9 364.1 277 346.9 287.3C346.9 287.3 346.9 287.3 346.9 287.3C346.8 287.3 346.6 287.4 346.5 287.5L346.5 287.5C346.2 287.7 345.9 287.8 345.6 288C310.6 307.4 254.8 320 192 320C132.4 320 79.06 308.7 43.84 290.9C41.97 289.9 40.15 288.1 38.39 288C14.28 274.6 0 258 0 240C0 205.2 53.43 175.5 128 164.6C138.5 163 149.4 161.8 160.7 161.1L160.7 161.1zM391.9 186.6C420.2 182.2 446.1 175.2 468.1 166.1C484.4 159.3 499.5 150.9 512 140.6V176C512 195.3 495.5 213.1 468.2 226.9C453.5 234.3 435.8 240.5 415.8 245.3C415.9 243.6 416 241.8 416 240C416 218.1 405.4 200.1 391.9 186.6V186.6zM384 336C384 354 369.7 370.6 345.6 384C343.8 384.1 342 385.9 340.2 386.9C304.9 404.7 251.6 416 192 416C129.2 416 73.42 403.4 38.39 384C14.28 370.6 .0003 354 .0003 336V300.6C12.45 310.9 27.62 319.3 43.93 326.1C83.44 342.6 135.8 352 192 352C248.2 352 300.6 342.6 340.1 326.1C347.9 322.9 355.4 319.2 362.5 315.2C368.6 311.8 374.3 308 379.7 304C381.2 302.9 382.6 301.7 384 300.6L384 336zM416 278.1C434.1 273.1 452.5 268.6 468.1 262.1C484.4 255.3 499.5 246.9 512 236.6V272C512 282.5 507 293 497.1 302.9C480.8 319.2 452.1 332.6 415.8 341.3C415.9 339.6 416 337.8 416 336V278.1zM192 448C248.2 448 300.6 438.6 340.1 422.1C356.4 415.3 371.5 406.9 384 396.6V432C384 476.2 298 512 192 512C85.96 512 .0003 476.2 .0003 432V396.6C12.45 406.9 27.62 415.3 43.93 422.1C83.44 438.6 135.8 448 192 448z' />
+          <path
+            fill='currentColor'
+            d='M512 80C512 98.01 497.7 114.6 473.6 128C444.5 144.1 401.2 155.5 351.3 158.9C347.7 157.2 343.9 155.5 340.1 153.9C300.6 137.4 248.2 128 192 128C183.7 128 175.6 128.2 167.5 128.6L166.4 128C142.3 114.6 128 98.01 128 80C128 35.82 213.1 0 320 0C426 0 512 35.82 512 80V80zM160.7 161.1C170.9 160.4 181.3 160 192 160C254.2 160 309.4 172.3 344.5 191.4C369.3 204.9 384 221.7 384 240C384 243.1 383.3 247.9 381.9 251.7C377.3 264.9 364.1 277 346.9 287.3C346.9 287.3 346.9 287.3 346.9 287.3C346.8 287.3 346.6 287.4 346.5 287.5L346.5 287.5C346.2 287.7 345.9 287.8 345.6 288C310.6 307.4 254.8 320 192 320C132.4 320 79.06 308.7 43.84 290.9C41.97 289.9 40.15 288.1 38.39 288C14.28 274.6 0 258 0 240C0 205.2 53.43 175.5 128 164.6C138.5 163 149.4 161.8 160.7 161.1L160.7 161.1zM391.9 186.6C420.2 182.2 446.1 175.2 468.1 166.1C484.4 159.3 499.5 150.9 512 140.6V176C512 195.3 495.5 213.1 468.2 226.9C453.5 234.3 435.8 240.5 415.8 245.3C415.9 243.6 416 241.8 416 240C416 218.1 405.4 200.1 391.9 186.6V186.6zM384 336C384 354 369.7 370.6 345.6 384C343.8 384.1 342 385.9 340.2 386.9C304.9 404.7 251.6 416 192 416C129.2 416 73.42 403.4 38.39 384C14.28 370.6 .0003 354 .0003 336V300.6C12.45 310.9 27.62 319.3 43.93 326.1C83.44 342.6 135.8 352 192 352C248.2 352 300.6 342.6 340.1 326.1C347.9 322.9 355.4 319.2 362.5 315.2C368.6 311.8 374.3 308 379.7 304C381.2 302.9 382.6 301.7 384 300.6L384 336zM416 278.1C434.1 273.1 452.5 268.6 468.1 262.1C484.4 255.3 499.5 246.9 512 236.6V272C512 282.5 507 293 497.1 302.9C480.8 319.2 452.1 332.6 415.8 341.3C415.9 339.6 416 337.8 416 336V278.1zM192 448C248.2 448 300.6 438.6 340.1 422.1C356.4 415.3 371.5 406.9 384 396.6V432C384 476.2 298 512 192 512C85.96 512 .0003 476.2 .0003 432V396.6C12.45 406.9 27.62 415.3 43.93 422.1C83.44 438.6 135.8 448 192 448z'
+          />
         </svg>
       </div>
     )
   },
-  sidebar: size => {
+  sidebar: (size) => {
     return (
       <div style={{ width: size + 'px', height: size + 'px' }}>
         <svg viewBox='0 0 512 512' width={size + 'px'} height={size + 'px'}>
-          <path fill='currentColor' d='M0 96C0 60.65 28.65 32 64 32H448C483.3 32 512 60.65 512 96V416C512 451.3 483.3 480 448 480H64C28.65 480 0 451.3 0 416V96zM224 416H448V96H224V416zM88 96C74.75 96 64 106.7 64 120C64 133.3 74.75 144 88 144H136C149.3 144 160 133.3 160 120C160 106.7 149.3 96 136 96H88zM88 240H136C149.3 240 160 229.3 160 216C160 202.7 149.3 192 136 192H88C74.75 192 64 202.7 64 216C64 229.3 74.75 240 88 240zM88 288C74.75 288 64 298.7 64 312C64 325.3 74.75 336 88 336H136C149.3 336 160 325.3 160 312C160 298.7 149.3 288 136 288H88z' />
+          <path
+            fill='currentColor'
+            d='M0 96C0 60.65 28.65 32 64 32H448C483.3 32 512 60.65 512 96V416C512 451.3 483.3 480 448 480H64C28.65 480 0 451.3 0 416V96zM224 416H448V96H224V416zM88 96C74.75 96 64 106.7 64 120C64 133.3 74.75 144 88 144H136C149.3 144 160 133.3 160 120C160 106.7 149.3 96 136 96H88zM88 240H136C149.3 240 160 229.3 160 216C160 202.7 149.3 192 136 192H88C74.75 192 64 202.7 64 216C64 229.3 74.75 240 88 240zM88 288C74.75 288 64 298.7 64 312C64 325.3 74.75 336 88 336H136C149.3 336 160 325.3 160 312C160 298.7 149.3 288 136 288H88z'
+          />
         </svg>
       </div>
     )
   },
-  plus: size => {
+  plus: (size) => {
     return (
       <div style={{ width: size + 'px', height: size + 'px' }}>
         <svg viewBox='0 0 448 512' width={size + 'px'} height={size + 'px'}>
-          <path fill='currentColor' d='M432 256c0 17.69-14.33 32.01-32 32.01H256v144c0 17.69-14.33 31.99-32 31.99s-32-14.3-32-31.99v-144H48c-17.67 0-32-14.32-32-32.01s14.33-31.99 32-31.99H192v-144c0-17.69 14.33-32.01 32-32.01s32 14.32 32 32.01v144h144C417.7 224 432 238.3 432 256z' />
+          <path
+            fill='currentColor'
+            d='M432 256c0 17.69-14.33 32.01-32 32.01H256v144c0 17.69-14.33 31.99-32 31.99s-32-14.3-32-31.99v-144H48c-17.67 0-32-14.32-32-32.01s14.33-31.99 32-31.99H192v-144c0-17.69 14.33-32.01 32-32.01s32 14.32 32 32.01v144h144C417.7 224 432 238.3 432 256z'
+          />
         </svg>
       </div>
     )
   },
-  infinity: size => {
+  infinity: (size) => {
     return (
       <div style={{ width: size + 'px', height: size + 'px' }}>
         <svg viewBox='0 0 256 256' width={size + 'px'} height={size + 'px'}>
-          <path fill='currentColor' d='M252,128a59.99981,59.99981,0,0,1-102.42627,42.42627q-.25709-.25708-.49805-.5293L89.21533,102.30615a36,36,0,1,0,0,51.3877L92.30078,150.21a12,12,0,0,1,17.9668,15.91211l-3.34326,3.7749q-.241.27173-.498.5293a60,60,0,1,1,0-84.85254q.25709.25709.498.5293l59.86035,67.59082a36,36,0,1,0,0-51.3877L163.69922,105.79a12,12,0,0,1-17.9668-15.91211l3.34326-3.7749q.241-.27174.49805-.5293A60,60,0,0,1,252,128Z' />
+          <path
+            fill='currentColor'
+            d='M252,128a59.99981,59.99981,0,0,1-102.42627,42.42627q-.25709-.25708-.49805-.5293L89.21533,102.30615a36,36,0,1,0,0,51.3877L92.30078,150.21a12,12,0,0,1,17.9668,15.91211l-3.34326,3.7749q-.241.27173-.498.5293a60,60,0,1,1,0-84.85254q.25709.25709.498.5293l59.86035,67.59082a36,36,0,1,0,0-51.3877L163.69922,105.79a12,12,0,0,1-17.9668-15.91211l3.34326-3.7749q.241-.27174.49805-.5293A60,60,0,0,1,252,128Z'
+          />
         </svg>
       </div>
     )
   },
-  seedling: size => {
+  seedling: (size) => {
     return (
       <div style={{ width: size + 'px', height: size + 'px' }}>
         <svg viewBox='0 0 512 512' width={size + 'px'} height={size + 'px'}>
-          <path fill='currentColor' d='M64 95.1H0c0 123.8 100.3 224 224 224v128C224 465.6 238.4 480 255.1 480S288 465.6 288 448V320C288 196.3 187.7 95.1 64 95.1zM448 32c-84.25 0-157.4 46.5-195.8 115.3c27.75 30.12 48.25 66.88 59 107.5C424 243.1 512 147.9 512 32H448z' />
+          <path
+            fill='currentColor'
+            d='M64 95.1H0c0 123.8 100.3 224 224 224v128C224 465.6 238.4 480 255.1 480S288 465.6 288 448V320C288 196.3 187.7 95.1 64 95.1zM448 32c-84.25 0-157.4 46.5-195.8 115.3c27.75 30.12 48.25 66.88 59 107.5C424 243.1 512 147.9 512 32H448z'
+          />
         </svg>
       </div>
     )
   },
-  file: size => {
+  file: (size) => {
     return (
       <div style={{ width: size + 'px', height: size + 'px' }}>
         <svg viewBox='0 0 384 512' width={size + 'px'} height={size + 'px'}>
-          <path fill='currentColor' d='M0 64C0 28.65 28.65 0 64 0H224V128C224 145.7 238.3 160 256 160H384V448C384 483.3 355.3 512 320 512H64C28.65 512 0 483.3 0 448V64zM256 128V0L384 128H256z' />
+          <path
+            fill='currentColor'
+            d='M0 64C0 28.65 28.65 0 64 0H224V128C224 145.7 238.3 160 256 160H384V448C384 483.3 355.3 512 320 512H64C28.65 512 0 483.3 0 448V64zM256 128V0L384 128H256z'
+          />
         </svg>
       </div>
     )
   },
-  nested: size => {
+  nested: (size) => {
     return (
       <div style={{ width: size + 'px', height: size + 'px' }}>
         <svg viewBox='0 0 448 512' width={size + 'px'} height={size + 'px'}>
-          <path fill='currentColor' d='M0 80C0 53.49 21.49 32 48 32H144C170.5 32 192 53.49 192 80V176C192 202.5 170.5 224 144 224H128V320C128 337.7 142.3 352 160 352H256V336C256 309.5 277.5 288 304 288H400C426.5 288 448 309.5 448 336V432C448 458.5 426.5 480 400 480H304C277.5 480 256 458.5 256 432V416H160C106.1 416 64 373 64 320V224H48C21.49 224 0 202.5 0 176V80z' />
+          <path
+            fill='currentColor'
+            d='M0 80C0 53.49 21.49 32 48 32H144C170.5 32 192 53.49 192 80V176C192 202.5 170.5 224 144 224H128V320C128 337.7 142.3 352 160 352H256V336C256 309.5 277.5 288 304 288H400C426.5 288 448 309.5 448 336V432C448 458.5 426.5 480 400 480H304C277.5 480 256 458.5 256 432V416H160C106.1 416 64 373 64 320V224H48C21.49 224 0 202.5 0 176V80z'
+          />
         </svg>
       </div>
     )
   },
-  pin: size => {
+  pin: (size) => {
     return (
       <div style={{ width: size + 'px', height: size + 'px' }}>
         <svg viewBox='0 0 320 512' width={size + 'px'} height={size + 'px'}>
-          <path fill='currentColor' d='M320 144C320 223.5 255.5 288 176 288C96.47 288 32 223.5 32 144C32 64.47 96.47 0 176 0C255.5 0 320 64.47 320 144zM192 64C192 55.16 184.8 48 176 48C122.1 48 80 90.98 80 144C80 152.8 87.16 160 96 160C104.8 160 112 152.8 112 144C112 108.7 140.7 80 176 80C184.8 80 192 72.84 192 64zM144 480V317.1C154.4 319 165.1 319.1 176 319.1C186.9 319.1 197.6 319 208 317.1V480C208 497.7 193.7 512 176 512C158.3 512 144 497.7 144 480z' />
+          <path
+            fill='currentColor'
+            d='M320 144C320 223.5 255.5 288 176 288C96.47 288 32 223.5 32 144C32 64.47 96.47 0 176 0C255.5 0 320 64.47 320 144zM192 64C192 55.16 184.8 48 176 48C122.1 48 80 90.98 80 144C80 152.8 87.16 160 96 160C104.8 160 112 152.8 112 144C112 108.7 140.7 80 176 80C184.8 80 192 72.84 192 64zM144 480V317.1C154.4 319 165.1 319.1 176 319.1C186.9 319.1 197.6 319 208 317.1V480C208 497.7 193.7 512 176 512C158.3 512 144 497.7 144 480z'
+          />
         </svg>
       </div>
     )
   },
-  position: size => {
+  position: (size) => {
     return (
       <div style={{ width: size + 'px', height: size + 'px' }}>
         <svg viewBox='0 0 512 512' width={size + 'px'} height={size + 'px'}>
-          <path fill='currentColor' d='M320 64C320 99.35 291.3 128 256 128C220.7 128 192 99.35 192 64C192 28.65 220.7 0 256 0C291.3 0 320 28.65 320 64zM288 160C323.3 160 352 188.7 352 224V272C352 289.7 337.7 304 320 304H318.2L307.2 403.5C305.4 419.7 291.7 432 275.4 432H236.6C220.3 432 206.6 419.7 204.8 403.5L193.8 304H192C174.3 304 160 289.7 160 272V224C160 188.7 188.7 160 224 160H288zM63.27 414.7C60.09 416.3 57.47 417.8 55.33 419.2C51.7 421.6 51.72 426.4 55.34 428.8C64.15 434.6 78.48 440.6 98.33 446.1C137.7 456.1 193.5 464 256 464C318.5 464 374.3 456.1 413.7 446.1C433.5 440.6 447.9 434.6 456.7 428.8C460.3 426.4 460.3 421.6 456.7 419.2C454.5 417.8 451.9 416.3 448.7 414.7C433.4 406.1 409.9 399.8 379.7 394.2C366.6 391.8 358 379.3 360.4 366.3C362.8 353.3 375.3 344.6 388.3 347C420.8 352.9 449.2 361.2 470.3 371.8C480.8 377.1 490.6 383.5 498 391.4C505.6 399.5 512 410.5 512 424C512 445.4 496.5 460.1 482.9 469C468.2 478.6 448.6 486.3 426.4 492.4C381.8 504.7 321.6 512 256 512C190.4 512 130.2 504.7 85.57 492.4C63.44 486.3 43.79 478.6 29.12 469C15.46 460.1 0 445.4 0 424C0 410.5 6.376 399.5 13.96 391.4C21.44 383.5 31.24 377.1 41.72 371.8C62.75 361.2 91.24 352.9 123.7 347C136.7 344.6 149.2 353.3 151.6 366.3C153.1 379.3 145.4 391.8 132.3 394.2C102.1 399.8 78.57 406.1 63.27 414.7H63.27z' />
+          <path
+            fill='currentColor'
+            d='M320 64C320 99.35 291.3 128 256 128C220.7 128 192 99.35 192 64C192 28.65 220.7 0 256 0C291.3 0 320 28.65 320 64zM288 160C323.3 160 352 188.7 352 224V272C352 289.7 337.7 304 320 304H318.2L307.2 403.5C305.4 419.7 291.7 432 275.4 432H236.6C220.3 432 206.6 419.7 204.8 403.5L193.8 304H192C174.3 304 160 289.7 160 272V224C160 188.7 188.7 160 224 160H288zM63.27 414.7C60.09 416.3 57.47 417.8 55.33 419.2C51.7 421.6 51.72 426.4 55.34 428.8C64.15 434.6 78.48 440.6 98.33 446.1C137.7 456.1 193.5 464 256 464C318.5 464 374.3 456.1 413.7 446.1C433.5 440.6 447.9 434.6 456.7 428.8C460.3 426.4 460.3 421.6 456.7 419.2C454.5 417.8 451.9 416.3 448.7 414.7C433.4 406.1 409.9 399.8 379.7 394.2C366.6 391.8 358 379.3 360.4 366.3C362.8 353.3 375.3 344.6 388.3 347C420.8 352.9 449.2 361.2 470.3 371.8C480.8 377.1 490.6 383.5 498 391.4C505.6 399.5 512 410.5 512 424C512 445.4 496.5 460.1 482.9 469C468.2 478.6 448.6 486.3 426.4 492.4C381.8 504.7 321.6 512 256 512C190.4 512 130.2 504.7 85.57 492.4C63.44 486.3 43.79 478.6 29.12 469C15.46 460.1 0 445.4 0 424C0 410.5 6.376 399.5 13.96 391.4C21.44 383.5 31.24 377.1 41.72 371.8C62.75 361.2 91.24 352.9 123.7 347C136.7 344.6 149.2 353.3 151.6 366.3C153.1 379.3 145.4 391.8 132.3 394.2C102.1 399.8 78.57 406.1 63.27 414.7H63.27z'
+          />
         </svg>
       </div>
     )
   },
-  octicon: (name, settings) => <Octicon icon={getIconByName(name)} height={settings.height} />
+  octicon: (name, settings) => <Octicon icon={getIconByName(name)} height={settings.height} />,
 }
diff --git a/resources/utils/chains.ts b/resources/utils/chains.ts
index 532ad0b14..2c831ef7d 100644
--- a/resources/utils/chains.ts
+++ b/resources/utils/chains.ts
@@ -1,10 +1,10 @@
-export function isNetworkConnected (network: Network) {
+export function isNetworkConnected(network: Network) {
   return (
     (network.connection.primary && network.connection.primary.connected) ||
     (network.connection.secondary && network.connection.secondary.connected)
   )
 }
 
-export function isNetworkEnabled (network: Network) {
+export function isNetworkEnabled(network: Network) {
   return network.on
 }
diff --git a/resources/utils/index.ts b/resources/utils/index.ts
index 1a4a249a7..2c96ea557 100644
--- a/resources/utils/index.ts
+++ b/resources/utils/index.ts
@@ -9,28 +9,25 @@ const weiHexToGweiInt = (weiHex: string) => hexToInt(weiHex) / 1e9
 const weiIntToEthInt = (wei: number) => wei / 1e18
 const gweiToWeiHex = (gwei: number) => intToHex(gweiToWei(gwei))
 
-function randomLetters (num: number) {
+function randomLetters(num: number) {
   return [...Array(num)].map(() => String.fromCharCode(65 + Math.floor(Math.random() * 26))).join('')
 }
 
-function capitalize (s: string) {
+function capitalize(s: string) {
   return s[0].toUpperCase() + s.substring(1).toLowerCase()
 }
 
-function arraysEqual <T> (a: T[] = [], b: T[] = []) {
+function arraysEqual<T>(a: T[] = [], b: T[] = []) {
   if (a.length !== b.length) return false
 
   return arraysMatch(a.sort(), b.sort())
 }
 
-function arraysMatch <T> (a: T[] = [], b: T[] = []) {
-  return (
-    a.length === b.length &&
-    a.every((elem, i) => b[i] === elem)
-  )
+function arraysMatch<T>(a: T[] = [], b: T[] = []) {
+  return a.length === b.length && a.every((elem, i) => b[i] === elem)
 }
 
-function debounce (func: (...args: any) => any, timeout = 300) {
+function debounce(func: (...args: any) => any, timeout = 300) {
   let timer: NodeJS.Timeout
 
   return (...args: any) => {
@@ -41,14 +38,14 @@ function debounce (func: (...args: any) => any, timeout = 300) {
   }
 }
 
-function instanceOfNodeError<T extends ErrorConstructor> (
+function instanceOfNodeError<T extends ErrorConstructor>(
   value: Error,
   errorType: T
 ): value is InstanceType<T> & NodeJS.ErrnoException {
-  return value instanceof errorType;
+  return value instanceof errorType
 }
 
-function getErrorCode (e: Error) {
+function getErrorCode(e: Error) {
   if (!instanceOfNodeError(e, Error)) {
     return undefined
   }
@@ -71,5 +68,5 @@ export {
   hexToInt,
   weiHexToGweiInt,
   weiIntToEthInt,
-  gweiToWeiHex
+  gweiToWeiHex,
 }
diff --git a/test/app/App/Panel/AddToken/index.test.js b/test/app/App/Panel/AddToken/index.test.js
index 396076ea7..8389aacc0 100644
--- a/test/app/App/Panel/AddToken/index.test.js
+++ b/test/app/App/Panel/AddToken/index.test.js
@@ -15,7 +15,12 @@ const user = userEvent.setup()
 
 it('should display the expected chain ID', async () => {
   const { getByRole } = render(
-    <AddToken activeChains={[{ id: 1, name: 'Mainnet', connection: { primary: { connected: true } } }, { id: 137, name: 'Polygon', connection: { primary: { connected: true } } }]} />
+    <AddToken
+      activeChains={[
+        { id: 1, name: 'Mainnet', connection: { primary: { connected: true } } },
+        { id: 137, name: 'Polygon', connection: { primary: { connected: true } } },
+      ]}
+    />
   )
 
   const tokenChainName = getByRole('option', { selected: true }).textContent
@@ -24,7 +29,12 @@ it('should display the expected chain ID', async () => {
 
 it('should generate the expected HTML', async () => {
   const { asFragment } = render(
-    <AddToken activeChains={[{ id: 1, name: 'Mainnet', connection: { primary: { connected: true } } }, { id: 137, name: 'Polygon', connection: { primary: { connected: true } } }]} />
+    <AddToken
+      activeChains={[
+        { id: 1, name: 'Mainnet', connection: { primary: { connected: true } } },
+        { id: 137, name: 'Polygon', connection: { primary: { connected: true } } },
+      ]}
+    />
   )
 
   expect(asFragment()).toMatchSnapshot()
@@ -33,14 +43,22 @@ it('should generate the expected HTML', async () => {
 describe('token metadata lookup', () => {
   beforeEach(() => {
     link.invoke.mockImplementation((channel, contractAddress, chainId) => {
-      const tokenData = chainId === 1 ? { name: 'Frame Test', symbol: 'FRT', decimals: '18' } : { name: 'Frame Test on Polygon', symbol: 'mFRT', decimals: '18' }
+      const tokenData =
+        chainId === 1
+          ? { name: 'Frame Test', symbol: 'FRT', decimals: '18' }
+          : { name: 'Frame Test on Polygon', symbol: 'mFRT', decimals: '18' }
       return Promise.resolve(tokenData)
     })
   })
 
   it('should perform a lookup on a contract address and display the expected token data', async () => {
     const { getByLabelText, getByRole } = render(
-      <AddToken activeChains={[{ id: 1, name: 'Mainnet', connection: { primary: { connected: true } } }, { id: 137, name: 'Polygon', connection: { primary: { connected: true } } }]} />
+      <AddToken
+        activeChains={[
+          { id: 1, name: 'Mainnet', connection: { primary: { connected: true } } },
+          { id: 137, name: 'Polygon', connection: { primary: { connected: true } } },
+        ]}
+      />
     )
 
     const contractAddressInput = getByLabelText('Contract Address')
@@ -58,12 +76,17 @@ describe('token metadata lookup', () => {
       expect(tokenDecimalsInput.value).toEqual('18')
       expect(tokenChainSelect.textContent).toEqual('Mainnet')
     })
-  }, 1000)
+  }, 2000)
 
   describe('when the chain id is changed', () => {
     it('should perform a lookup and display the expected token data', async () => {
       const { getByLabelText, getByRole } = render(
-        <AddToken activeChains={[{ id: 1, name: 'Mainnet', connection: { primary: { connected: true } } }, { id: 137, name: 'Polygon', connection: { primary: { connected: true } } }]} />
+        <AddToken
+          activeChains={[
+            { id: 1, name: 'Mainnet', connection: { primary: { connected: true } } },
+            { id: 137, name: 'Polygon', connection: { primary: { connected: true } } },
+          ]}
+        />
       )
 
       const tokenContractAddressInput = getByLabelText('Contract Address')
@@ -76,10 +99,7 @@ describe('token metadata lookup', () => {
 
       expect(tokenChainSelect.textContent).toEqual('Mainnet')
 
-      await userEvent.selectOptions(
-        getByRole('listbox'),
-        getByRole('option', { name: 'Polygon' }),
-      )
+      await userEvent.selectOptions(getByRole('listbox'), getByRole('option', { name: 'Polygon' }))
       tokenChainSelect = getByRole('option', { selected: true })
 
       await waitFor(() => {
@@ -89,6 +109,6 @@ describe('token metadata lookup', () => {
         expect(tokenDecimalsInput.value).toEqual('18')
         expect(tokenChainSelect.textContent).toEqual('Polygon')
       })
-    }, 1000)
+    }, 2000)
   })
 })
diff --git a/test/app/App/Panel/Main/Account/Requests/TransactionRequest/TxApproval/approvals/TokenSpend/index.test.js b/test/app/App/Panel/Main/Account/Requests/TransactionRequest/TxApproval/approvals/TokenSpend/index.test.js
index bcf835015..95e5f64fe 100644
--- a/test/app/App/Panel/Main/Account/Requests/TransactionRequest/TxApproval/approvals/TokenSpend/index.test.js
+++ b/test/app/App/Panel/Main/Account/Requests/TransactionRequest/TxApproval/approvals/TokenSpend/index.test.js
@@ -12,14 +12,14 @@ jest.mock('../../../../../../../../../../../main/store/persist')
 const TokenSpend = Restore.connect(ApproveTokenSpendComponent, store)
 
 describe('changing approval amounts', () => {
-  it('allows the user to reject an approval', done => {
+  it('allows the user to reject an approval', (done) => {
     const onApprove = () => done('should not have approved!')
 
     const { queryByRole } = render(
       <TokenSpend
         onApprove={onApprove}
         onDecline={done}
-        approval={{ data: { decimals: 6, amount: addHexPrefix(100e6.toString(16)) } }}
+        approval={{ data: { decimals: 6, amount: addHexPrefix((100e6).toString(16)) } }}
       />
     )
 
@@ -27,7 +27,7 @@ describe('changing approval amounts', () => {
     fireEvent.click(reject)
   })
 
-  it('allows the user to proceed without editing', done => {
+  it('allows the user to proceed without editing', (done) => {
     const onApprove = function (req, approvalType, data) {
       try {
         expect(approvalType).toBe(ApprovalType.TokenSpendApproval)
@@ -35,10 +35,17 @@ describe('changing approval amounts', () => {
         // 100 * 1e6 to account for decimals
         expect(data.amount).toBe('0x5f5e100')
         done()
-      } catch (e) { done(e) }
+      } catch (e) {
+        done(e)
+      }
     }
 
-    const { queryByRole } = render(<TokenSpend onApprove={onApprove} approval={{ data: { decimals: 6, amount: addHexPrefix(100e6.toString(16)) } }} />)
+    const { queryByRole } = render(
+      <TokenSpend
+        onApprove={onApprove}
+        approval={{ data: { decimals: 6, amount: addHexPrefix((100e6).toString(16)) } }}
+      />
+    )
 
     const proceed = queryByRole('button', { name: 'Proceed' })
     fireEvent.click(proceed)
@@ -53,7 +60,9 @@ describe('changing approval amounts', () => {
           // 50 * 1e6 to account for decimals
           expect(data.amount).toBe('0x2faf080')
           resolve()
-        } catch (e) { reject(e) }
+        } catch (e) {
+          reject(e)
+        }
       }
 
       const { queryByRole } = render(
@@ -64,9 +73,9 @@ describe('changing approval amounts', () => {
               symbol: 'aUSDC',
               name: 'Aave USDC',
               decimals: 6,
-              amount: addHexPrefix(100e6.toString(16))
-            }
-          }} 
+              amount: addHexPrefix((100e6).toString(16)),
+            },
+          }}
         />
       )
 
@@ -93,7 +102,9 @@ describe('changing approval amounts', () => {
           // 50 * 1e6 to account for decimals
           expect(data.amount).toBe('0x2faf080')
           resolve()
-        } catch (e) { reject(e) }
+        } catch (e) {
+          reject(e)
+        }
       }
 
       const { queryByRole } = render(
@@ -104,9 +115,9 @@ describe('changing approval amounts', () => {
               symbol: 'aUSDC',
               name: 'Aave USDC',
               decimals: 6,
-              amount: addHexPrefix(100e6.toString(16))
-            }
-          }} 
+              amount: addHexPrefix((100e6).toString(16)),
+            },
+          }}
         />
       )
 
@@ -124,16 +135,20 @@ describe('changing approval amounts', () => {
     })
   })
 
-  it('allows the user to set the token approval to unlimited', done => {
+  it('allows the user to set the token approval to unlimited', (done) => {
     const onApprove = function (req, approvalType, data) {
       try {
         expect(approvalType).toBe(ApprovalType.TokenSpendApproval)
         expect(data.amount).toBe('0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff')
         done()
-      } catch (e) { done(e) }
+      } catch (e) {
+        done(e)
+      }
     }
 
-    const { queryByRole } = render(<TokenSpend onApprove={onApprove} approval={{ data: { amount: addHexPrefix(100e6.toString(16)) } }} />)
+    const { queryByRole } = render(
+      <TokenSpend onApprove={onApprove} approval={{ data: { amount: addHexPrefix((100e6).toString(16)) } }} />
+    )
 
     const edit = queryByRole('button', { name: 'Edit' })
     fireEvent.click(edit)
@@ -145,7 +160,7 @@ describe('changing approval amounts', () => {
     fireEvent.click(proceed)
   })
 
-  it('allows the user to revert the token approval back to the original amount when no decimal data is present', done => {
+  it('allows the user to revert the token approval back to the original amount when no decimal data is present', (done) => {
     const onApprove = function (req, approvalType, data) {
       try {
         expect(approvalType).toBe(ApprovalType.TokenSpendApproval)
@@ -153,10 +168,14 @@ describe('changing approval amounts', () => {
         // 50 * 1e6 to account for decimals
         expect(data.amount).toBe('0x2faf080')
         done()
-      } catch (e) { done(e) }
+      } catch (e) {
+        done(e)
+      }
     }
 
-    const { queryByRole } = render(<TokenSpend onApprove={onApprove} approval={{ data: { amount: addHexPrefix(50e6.toString(16)) } }} />)
+    const { queryByRole } = render(
+      <TokenSpend onApprove={onApprove} approval={{ data: { amount: addHexPrefix((50e6).toString(16)) } }} />
+    )
 
     const edit = queryByRole('button', { name: 'Edit' })
     fireEvent.click(edit)
@@ -171,7 +190,7 @@ describe('changing approval amounts', () => {
     fireEvent.click(proceed)
   })
 
-  it('allows the user to revert the token approval back to the original request', done => {
+  it('allows the user to revert the token approval back to the original request', (done) => {
     const onApprove = function (req, approvalType, data) {
       try {
         expect(approvalType).toBe(ApprovalType.TokenSpendApproval)
@@ -179,7 +198,9 @@ describe('changing approval amounts', () => {
         // 100 * 1e6 to account for decimals
         expect(data.amount).toBe('0x5f5e100')
         done()
-      } catch (e) { done(e) }
+      } catch (e) {
+        done(e)
+      }
     }
 
     const { queryByRole } = render(
@@ -190,8 +211,8 @@ describe('changing approval amounts', () => {
             symbol: 'aUSDC',
             name: 'Aave USDC',
             decimals: 6,
-            amount: addHexPrefix(100e6.toString(16))
-          }
+            amount: addHexPrefix((100e6).toString(16)),
+          },
         }}
       />
     )
@@ -214,13 +235,13 @@ describe('changing approval amounts', () => {
 
   const requiredApprovalData = ['decimals', 'symbol', 'name']
 
-  requiredApprovalData.forEach(field => {
+  requiredApprovalData.forEach((field) => {
     it(`does not allow the user to edit the amount if ${field} is not present in approval data`, () => {
       const data = {
         symbol: 'aUSDC',
         name: 'Aave USDC',
         decimals: 6,
-        amount: addHexPrefix(100e6.toString(16))
+        amount: addHexPrefix((100e6).toString(16)),
       }
 
       delete data[field]
@@ -235,7 +256,10 @@ describe('changing approval amounts', () => {
 
       const requestedAmount = queryByRole('textbox')
       const children = requestedAmount.querySelectorAll('div')
-      const displayedContent = [...children].map(c => c.textContent).join(' ').trim()
+      const displayedContent = [...children]
+        .map((c) => c.textContent)
+        .join(' ')
+        .trim()
 
       expect(displayedContent).toBe(data.decimals ? '100' : '100 million')
 
@@ -252,10 +276,10 @@ describe('formatting amounts', () => {
     { amount: 92e5, formatted: '9.2 million' },
     { amount: 100e9, formatted: '100 billion' },
     { amount: 2e12, formatted: '2 trillion' },
-    { amount: 1e13, formatted: '~unlimited' }
+    { amount: 1e13, formatted: '~unlimited' },
   ]
 
-  formattedAmounts.forEach(spec => {
+  formattedAmounts.forEach((spec) => {
     it(`formats a requested amount of ${spec.amount} as ${spec.formatted}`, () => {
       const { queryByRole } = render(
         <TokenSpend
@@ -264,8 +288,8 @@ describe('formatting amounts', () => {
               symbol: 'aUSDC',
               name: 'Aave USDC',
               decimals: 6,
-              amount: addHexPrefix((spec.amount * 1e6).toString(16))
-            }
+              amount: addHexPrefix((spec.amount * 1e6).toString(16)),
+            },
           }}
         />
       )
@@ -275,7 +299,10 @@ describe('formatting amounts', () => {
 
       const requestedAmount = queryByRole('textbox')
       const children = requestedAmount.querySelectorAll('div')
-      const displayedContent = [...children].map(c => c.textContent).join(' ').trim()
+      const displayedContent = [...children]
+        .map((c) => c.textContent)
+        .join(' ')
+        .trim()
 
       expect(displayedContent).toBe(spec.formatted)
     })
diff --git a/test/e2e/deploy.test.js b/test/e2e/deploy.test.js
index 6ea7a3dd3..09d92a97a 100644
--- a/test/e2e/deploy.test.js
+++ b/test/e2e/deploy.test.js
@@ -1,17 +1,26 @@
 const Web3 = require('web3')
 const web3 = new Web3(new Web3.providers.WebsocketProvider('ws://localhost:1248'))
 
-test('Deploy Contract', done => {
-  web3.eth.getAccounts().then(accounts => {
-    web3.eth.sendTransaction({
-      from: accounts[0],
-      data: '0x6080604052348015600f57600080fd5b50603580601d6000396000f3006080604052600080fd00a165627a7a72305820f50314badc96cf2df848b358f976e52facd1986d2f3eb5bd7b41071ac667ae480029',
-      gas: '0x10cba'
-    }).on('transactionHash', hash => {
-      expect(hash).toBeTruthy()
-      done()
-    })
-  }).catch(err => {
-    console.log(err)
-  })
-}, 30 * 1000)
\ No newline at end of file
+test(
+  'Deploy Contract',
+  (done) => {
+    web3.eth
+      .getAccounts()
+      .then((accounts) => {
+        web3.eth
+          .sendTransaction({
+            from: accounts[0],
+            data: '0x6080604052348015600f57600080fd5b50603580601d6000396000f3006080604052600080fd00a165627a7a72305820f50314badc96cf2df848b358f976e52facd1986d2f3eb5bd7b41071ac667ae480029',
+            gas: '0x10cba',
+          })
+          .on('transactionHash', (hash) => {
+            expect(hash).toBeTruthy()
+            done()
+          })
+      })
+      .catch((err) => {
+        console.log(err)
+      })
+  },
+  30 * 1000
+)
diff --git a/test/e2e/index.test.js b/test/e2e/index.test.js
index b94a1f36e..12b55e4ac 100644
--- a/test/e2e/index.test.js
+++ b/test/e2e/index.test.js
@@ -3,51 +3,80 @@
 const Web3 = require('web3')
 const web3 = new Web3(new Web3.providers.WebsocketProvider('ws://localhost:1248'))
 
-test('Send Transaction', done => {
-  web3.eth.getAccounts().then(accounts => {
-    web3.eth.sendTransaction({
-      value: Web3.utils.toHex(Math.round(1000000000000000 * Math.random())),
-      to: '0x030e6af4985f111c265ee3a279e5a9f6aa124fd5',
-      from: accounts[0]
-    }).on('transactionHash', hash => {
-      expect(hash).toBeTruthy()
-      done()
-    })
-  }).catch(err => {
-    console.log(err)
-  })
-}, 30 * 1000)
-
-test('sign_personal and ecRecover', done => {
-  const message = 'Frame Test'
-  web3.eth.getAccounts().then(accounts => {
-    web3.eth.personal.sign(message, accounts[0]).then(signed => {
-      web3.eth.personal.ecRecover(message, signed).then(result => {
-        expect(result.toLowerCase()).toBe(accounts[0].toLowerCase())
-        console.log(JSON.stringify({ address: accounts[0], msg: message, sig: signed, version: '2' }))
-        done()
-      }).catch(err => {
+test(
+  'Send Transaction',
+  (done) => {
+    web3.eth
+      .getAccounts()
+      .then((accounts) => {
+        web3.eth
+          .sendTransaction({
+            value: Web3.utils.toHex(Math.round(1000000000000000 * Math.random())),
+            to: '0x030e6af4985f111c265ee3a279e5a9f6aa124fd5',
+            from: accounts[0],
+          })
+          .on('transactionHash', (hash) => {
+            expect(hash).toBeTruthy()
+            done()
+          })
+      })
+      .catch((err) => {
         console.log(err)
       })
-    }).catch(err => {
-      console.log(err)
+  },
+  30 * 1000
+)
+
+test(
+  'sign_personal and ecRecover',
+  (done) => {
+    const message = 'Frame Test'
+    web3.eth.getAccounts().then((accounts) => {
+      web3.eth.personal
+        .sign(message, accounts[0])
+        .then((signed) => {
+          web3.eth.personal
+            .ecRecover(message, signed)
+            .then((result) => {
+              expect(result.toLowerCase()).toBe(accounts[0].toLowerCase())
+              console.log(JSON.stringify({ address: accounts[0], msg: message, sig: signed, version: '2' }))
+              done()
+            })
+            .catch((err) => {
+              console.log(err)
+            })
+        })
+        .catch((err) => {
+          console.log(err)
+        })
     })
-  })
-}, 30 * 1000)
+  },
+  30 * 1000
+)
 
-test('eth_sign and ecRecover', done => {
-  const message = 'Frame Test'
-  web3.eth.getAccounts().then(accounts => {
-    web3.eth.sign(message, accounts[0]).then(signed => {
-      web3.eth.personal.ecRecover(message, signed).then(result => {
-        expect(result.toLowerCase()).toBe(accounts[0].toLowerCase())
-        console.log(JSON.stringify({ address: accounts[0], msg: message, sig: signed, version: '2' }))
-        done()
-      }).catch(err => {
-        console.log(err)
-      })
-    }).catch(err => {
-      console.log(err)
+test(
+  'eth_sign and ecRecover',
+  (done) => {
+    const message = 'Frame Test'
+    web3.eth.getAccounts().then((accounts) => {
+      web3.eth
+        .sign(message, accounts[0])
+        .then((signed) => {
+          web3.eth.personal
+            .ecRecover(message, signed)
+            .then((result) => {
+              expect(result.toLowerCase()).toBe(accounts[0].toLowerCase())
+              console.log(JSON.stringify({ address: accounts[0], msg: message, sig: signed, version: '2' }))
+              done()
+            })
+            .catch((err) => {
+              console.log(err)
+            })
+        })
+        .catch((err) => {
+          console.log(err)
+        })
     })
-  })
-}, 30 * 1000)
+  },
+  30 * 1000
+)
diff --git a/test/e2e/origins.test.js b/test/e2e/origins.test.js
index 32b404a8c..0faa1fd17 100644
--- a/test/e2e/origins.test.js
+++ b/test/e2e/origins.test.js
@@ -4,7 +4,7 @@ jest.mock('../../main/store/persist')
 
 let frame
 
-beforeEach(done => {
+beforeEach((done) => {
   frame = provider('frame', { origin: 'frame.test' })
   frame.once('connect', () => {
     frame.request({ method: 'eth_accounts', params: [] }).then(() => done())
@@ -16,30 +16,36 @@ afterEach(() => {
   frame.close()
 })
 
-it('should be able to change the chain for a given origin', async () => {
-  const [chains, currentChain] = await Promise.all([
-    frame.request({ method: 'wallet_getChains' }),
-    frame.request({ method: 'eth_chainId' })
-  ])
-
-  const targetChain = chains.find(c => c !== currentChain)
-
-  if (!targetChain) throw new Error('no available chains to switch to!')
-
-  return new Promise((resolve, reject) => {
-    frame.on('chainChanged', async updatedChainId => {
-      try {
-        expect(updatedChainId).toBe(targetChain)
-
-        const chainId = await frame.request({ method: 'eth_chainId' })
-        expect(chainId).toBe(targetChain)
-        resolve()
-      } catch (e) { reject(e) }
-    })
-    
-    frame.request({
-      method: 'wallet_switchEthereumChain',
-      params: [{ chainId: targetChain }]
+it(
+  'should be able to change the chain for a given origin',
+  async () => {
+    const [chains, currentChain] = await Promise.all([
+      frame.request({ method: 'wallet_getChains' }),
+      frame.request({ method: 'eth_chainId' }),
+    ])
+
+    const targetChain = chains.find((c) => c !== currentChain)
+
+    if (!targetChain) throw new Error('no available chains to switch to!')
+
+    return new Promise((resolve, reject) => {
+      frame.on('chainChanged', async (updatedChainId) => {
+        try {
+          expect(updatedChainId).toBe(targetChain)
+
+          const chainId = await frame.request({ method: 'eth_chainId' })
+          expect(chainId).toBe(targetChain)
+          resolve()
+        } catch (e) {
+          reject(e)
+        }
+      })
+
+      frame.request({
+        method: 'wallet_switchEthereumChain',
+        params: [{ chainId: targetChain }],
+      })
     })
-  })
-}, 5 * 1000)
+  },
+  5 * 1000
+)
diff --git a/test/e2e/signTypedData.js b/test/e2e/signTypedData.js
index 58c9a5fdb..fa248d7a8 100644
--- a/test/e2e/signTypedData.js
+++ b/test/e2e/signTypedData.js
@@ -6,36 +6,36 @@ const TYPED_DATA = {
       { name: 'name', type: 'string' },
       { name: 'version', type: 'string' },
       { name: 'chainId', type: 'uint256' },
-      { name: 'verifyingContract', type: 'address' }
+      { name: 'verifyingContract', type: 'address' },
     ],
     Person: [
       { name: 'name', type: 'string' },
-      { name: 'wallet', type: 'address' }
+      { name: 'wallet', type: 'address' },
     ],
     Mail: [
       { name: 'from', type: 'Person' },
       { name: 'to', type: 'Person' },
-      { name: 'contents', type: 'string' }
-    ]
+      { name: 'contents', type: 'string' },
+    ],
   },
   primaryType: 'Mail',
   domain: {
     name: 'Ether Mail',
     version: '1',
     chainId: 1,
-    verifyingContract: '0xCcCCccccCCCCcCCCCCCcCcCccCcCCCcCcccccccC'
+    verifyingContract: '0xCcCCccccCCCCcCCCCCCcCcCccCcCCCcCcccccccC',
   },
   message: {
     from: {
       name: 'Cow',
-      wallet: '0xCD2a3d9F938E13CD947Ec05AbC7FE734Df8DD826'
+      wallet: '0xCD2a3d9F938E13CD947Ec05AbC7FE734Df8DD826',
     },
     to: {
       name: 'Bob',
-      wallet: '0xbBbBBBBbbBBBbbbBbbBbbbbBBbBbbbbBbBbbBBbB'
+      wallet: '0xbBbBBBBbbBBBbbbBbbBbbbbBBbBbbbbBbBbbBBbB',
     },
-    contents: 'Hello, Bob!'
-  }
+    contents: 'Hello, Bob!',
+  },
 }
 
 const main = async () => {
@@ -45,7 +45,10 @@ const main = async () => {
     const accounts = await ethereum.send('eth_accounts')
     console.log({ accounts })
 
-    const signedTypedDataStringified = await ethereum.send('eth_signTypedData_v3', [accounts[0], JSON.stringify(TYPED_DATA)])
+    const signedTypedDataStringified = await ethereum.send('eth_signTypedData_v3', [
+      accounts[0],
+      JSON.stringify(TYPED_DATA),
+    ])
     console.log({ signedTypedDataStringified })
 
     const signedTypedDataAsObject = await ethereum.send('eth_signTypedData', [accounts[0], TYPED_DATA])
@@ -59,4 +62,6 @@ const main = async () => {
   }
 }
 
-main().catch(error => console.error(error)).finally(() => process.exit())
+main()
+  .catch((error) => console.error(error))
+  .finally(() => process.exit())
diff --git a/test/e2e/txWarnings.test.js b/test/e2e/txWarnings.test.js
index ee341dcb4..69f50c698 100644
--- a/test/e2e/txWarnings.test.js
+++ b/test/e2e/txWarnings.test.js
@@ -3,26 +3,32 @@
 const provider = require('eth-provider')
 const frame = provider('frame')
 
-test('Failing Transaction (Mainnet)', async () => {
-  try {
-    await frame.request({
-      method: 'eth_sendTransaction',
-      params: [{
-        value: '0x341a0691d617740',
-        from: (await frame.request({ method: 'eth_requestAccounts' }))[0],
-        to: '0x7a250d5630b4cf539739df2c5dacb4c659f2488d',
-        data: '0xfb3bdb41000000000000000000000000000000000000000000000001158e460913d000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000b120c885f1527394c78d50e7c7da57defb24f612000000000000000000000000000000000000000000000000000000006020d2560000000000000000000000000000000000000000000000000000000000000003000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc20000000000000000000000006b175474e89094c44da98b954eedeac495271d0f0000000000000000000000001f9840a85d5af5bf1d1762f925bdaddc4201f984',
-        chainId: '0x1',
-        gasPrice: '0x2a9ba66600'
-      }]
-    })
-    frame.close()
-    return false
-  } catch (e) {
-    frame.close()
-    return Boolean(e)
-  }
-}, 30 * 1000)
+test(
+  'Failing Transaction (Mainnet)',
+  async () => {
+    try {
+      await frame.request({
+        method: 'eth_sendTransaction',
+        params: [
+          {
+            value: '0x341a0691d617740',
+            from: (await frame.request({ method: 'eth_requestAccounts' }))[0],
+            to: '0x7a250d5630b4cf539739df2c5dacb4c659f2488d',
+            data: '0xfb3bdb41000000000000000000000000000000000000000000000001158e460913d000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000b120c885f1527394c78d50e7c7da57defb24f612000000000000000000000000000000000000000000000000000000006020d2560000000000000000000000000000000000000000000000000000000000000003000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc20000000000000000000000006b175474e89094c44da98b954eedeac495271d0f0000000000000000000000001f9840a85d5af5bf1d1762f925bdaddc4201f984',
+            chainId: '0x1',
+            gasPrice: '0x2a9ba66600',
+          },
+        ],
+      })
+      frame.close()
+      return false
+    } catch (e) {
+      frame.close()
+      return Boolean(e)
+    }
+  },
+  30 * 1000
+)
 
 // test('Failing Transaction (Goerli)', async done => {
 //   try {
diff --git a/test/main/accounts/index.test.js b/test/main/accounts/index.test.js
index 671bd0818..89ee12092 100644
--- a/test/main/accounts/index.test.js
+++ b/test/main/accounts/index.test.js
@@ -12,8 +12,8 @@ jest.mock('../../../main/store/persist')
 
 jest.mock('../../../main/nebula', () => jest.fn(() => ({ ready: () => true, ens: { lookupAddress: jest.fn() } })))
 
-const weiToHex = wei => addHexPrefix(wei.toString(16))
-const gweiToHex = gwei => weiToHex(gwei * 1e9)
+const weiToHex = (wei) => addHexPrefix(wei.toString(16))
+const gweiToHex = (gwei) => weiToHex(gwei * 1e9)
 
 const account = {
   id: '0x22dd63c3619818fdbc262c78baee43cb61e9cccf',
@@ -25,7 +25,7 @@ const account = {
   requests: {},
   ensName: null,
   tokens: {},
-  created: '12819530:1626189153547'
+  created: '12819530:1626189153547',
 }
 
 let Accounts, request
@@ -52,20 +52,20 @@ beforeEach(() => {
     handlerId: 1,
     type: 'transaction',
     data: {
-      from : '0x22dd63c3619818fdbc262c78baee43cb61e9cccf',
+      from: '0x22dd63c3619818fdbc262c78baee43cb61e9cccf',
       chainId: '0x1',
       gasLimit: weiToHex(21000),
       gasPrice: gweiToHex(30),
       type: '0x2',
       maxPriorityFeePerGas: gweiToHex(1),
       maxFeePerGas: gweiToHex(9),
-      nonce: '0xa'
+      nonce: '0xa',
     },
     payload: {
       jsonrpc: '2.0',
       id: 7,
-      method: 'eth_signTransaction'
-    }
+      method: 'eth_signTransaction',
+    },
   }
 
   Accounts.setSigner(account.address, jest.fn())
@@ -75,8 +75,8 @@ beforeEach(() => {
 })
 
 afterEach(() => {
-  Object.values(Accounts.accounts).forEach(account => {
-    Object.keys(account.requests).forEach(id => {
+  Object.values(Accounts.accounts).forEach((account) => {
+    Object.keys(account.requests).forEach((id) => {
       Accounts.removeRequest(account, id)
     })
   })
@@ -91,130 +91,153 @@ describe('#setBaseFee', () => {
     Accounts.addRequest(request, jest.fn())
   })
 
-  const setBaseFee = (baseFee, cb, requestId = 1, userUpdate = false) => Accounts.setBaseFee(baseFee, requestId, userUpdate, cb)
+  const setBaseFee = (baseFee, cb, requestId = 1, userUpdate = false) =>
+    Accounts.setBaseFee(baseFee, requestId, userUpdate, cb)
 
-  it('does not set an undefined base fee', done => {
-    setBaseFee(undefined, err => {
+  it('does not set an undefined base fee', (done) => {
+    setBaseFee(undefined, (err) => {
       expect(err.message).toBeTruthy()
       done()
     })
   })
 
-  it('does not set an invalid base fee', done => {
-    setBaseFee('wrong', err => {
+  it('does not set an invalid base fee', (done) => {
+    setBaseFee('wrong', (err) => {
       expect(err.message).toBeTruthy()
       done()
     })
   })
 
-  it('does not set a negative base fee', done => {
-    setBaseFee('-0x12a05f200', err => {
+  it('does not set a negative base fee', (done) => {
+    setBaseFee('-0x12a05f200', (err) => {
       expect(err.message).toBeTruthy()
       done()
     })
   })
 
-  it('does not set a base fee if no account is active', done => {
+  it('does not set a base fee if no account is active', (done) => {
     Accounts.unsetSigner(jest.fn())
 
-    setBaseFee('0x1dcd65000', err => {
+    setBaseFee('0x1dcd65000', (err) => {
       expect(err.message).toBeTruthy()
       done()
     })
   })
 
-  it('fails to find the request', done => {
-    setBaseFee('0x1dcd65000', err => {
-      expect(err.message).toBeTruthy()
-      done()
-    }, 2)
+  it('fails to find the request', (done) => {
+    setBaseFee(
+      '0x1dcd65000',
+      (err) => {
+        expect(err.message).toBeTruthy()
+        done()
+      },
+      2
+    )
   })
 
-  it('does not set a base fee on a non-transaction request', done => {
+  it('does not set a base fee on a non-transaction request', (done) => {
     request.type = 'message'
 
-    setBaseFee('0x1dcd65000', err => {
+    setBaseFee('0x1dcd65000', (err) => {
       expect(err.message).toBeTruthy()
       done()
     })
   })
 
-  it('does not set a base fee on a locked request', done => {
+  it('does not set a base fee on a locked request', (done) => {
     request.locked = true
 
-    setBaseFee('0x1dcd65000', err => {
+    setBaseFee('0x1dcd65000', (err) => {
       expect(err.message).toBeTruthy()
       expect(Accounts.current().requests[1].data.maxFeePerGas).toBe(request.data.maxFeePerGas)
       done()
     })
   })
 
-  it('does not set a base fee on an automatic update if fees were manually set by the user', done => {
+  it('does not set a base fee on an automatic update if fees were manually set by the user', (done) => {
     request.feesUpdatedByUser = true
 
-    setBaseFee('0x1dcd65000', err => {
-      expect(err.message).toBeTruthy()
-      expect(Accounts.current().requests[1].data.maxFeePerGas).toBe(request.data.maxFeePerGas)
-      done()
-    }, 1, false)
+    setBaseFee(
+      '0x1dcd65000',
+      (err) => {
+        expect(err.message).toBeTruthy()
+        expect(Accounts.current().requests[1].data.maxFeePerGas).toBe(request.data.maxFeePerGas)
+        done()
+      },
+      1,
+      false
+    )
   })
 
-  it('applies automatic base fee update', done => {
+  it('applies automatic base fee update', (done) => {
     request.data.maxFeePerGas = gweiToHex(10)
     request.data.maxPriorityFeePerGas = gweiToHex(2)
 
     const updatedBaseFee = 6 // gwei
 
-    setBaseFee(gweiToHex(updatedBaseFee), err => {
+    setBaseFee(gweiToHex(updatedBaseFee), (err) => {
       try {
         expect(err).toBeFalsy()
-        expect(Accounts.current().requests[1].data.maxFeePerGas).toBe(weiToHex(2e9 + (updatedBaseFee * 1e9)))
+        expect(Accounts.current().requests[1].data.maxFeePerGas).toBe(weiToHex(2e9 + updatedBaseFee * 1e9))
         done()
-      } catch (e) { done(e) }
+      } catch (e) {
+        done(e)
+      }
     })
   })
 
-  it('applies user-initiated base fee update', done => {
+  it('applies user-initiated base fee update', (done) => {
     request.data.maxFeePerGas = gweiToHex(10)
     request.data.maxPriorityFeePerGas = gweiToHex(2)
 
-    setBaseFee(gweiToHex(6), err => {
-      try {
-        expect(err).toBeFalsy()
-        expect(Accounts.current().requests[1].data.maxFeePerGas).toBe(gweiToHex(8))
-        done()
-      } catch (e) { done(e) }
-    }, 1, true)
-  })
-
-  it('does not update if the base fee has not changed', done => {
+    setBaseFee(
+      gweiToHex(6),
+      (err) => {
+        try {
+          expect(err).toBeFalsy()
+          expect(Accounts.current().requests[1].data.maxFeePerGas).toBe(gweiToHex(8))
+          done()
+        } catch (e) {
+          done(e)
+        }
+      },
+      1,
+      true
+    )
+  })
+
+  it('does not update if the base fee has not changed', (done) => {
     request.data.maxFeePerGas = gweiToHex(10)
     request.data.maxPriorityFeePerGas = gweiToHex(2)
 
-    setBaseFee(gweiToHex(8), err => {
+    setBaseFee(gweiToHex(8), (err) => {
       try {
         expect(err).toBeFalsy()
         expect(Accounts.current().requests[1].data.maxFeePerGas).toBe(gweiToHex(10))
         done()
-      } catch (e) { done(e) }
+      } catch (e) {
+        done(e)
+      }
     })
   })
 
-  it('caps the base fee at 9999 gwei', done => {
+  it('caps the base fee at 9999 gwei', (done) => {
     const highBaseFee = gweiToHex(10200)
     const maxBaseFee = 9999e9
     const expectedMaxFee = weiToHex(maxBaseFee + parseInt(request.data.maxPriorityFeePerGas))
 
-    setBaseFee(highBaseFee, err => {
+    setBaseFee(highBaseFee, (err) => {
       try {
         expect(err).toBeFalsy()
         expect(Accounts.current().requests[1].data.maxFeePerGas).toBe(expectedMaxFee)
         done()
-      } catch (e) { done(e) }
+      } catch (e) {
+        done(e)
+      }
     })
   })
 
-  it('does not exceed the max allowable fee', done => {
+  it('does not exceed the max allowable fee', (done) => {
     const maxTotal = 2e18 // 2 ETH
     const gasLimit = 1e7
     const maxFee = maxTotal / gasLimit
@@ -222,26 +245,35 @@ describe('#setBaseFee', () => {
 
     request.data.gasLimit = weiToHex(gasLimit)
 
-    setBaseFee(highBaseFee, err => {
+    setBaseFee(highBaseFee, (err) => {
       try {
         expect(err).toBeFalsy()
         expect(Accounts.current().requests[1].data.maxFeePerGas).toBe(weiToHex(maxFee))
         done()
-      } catch (e) { done(e) }
+      } catch (e) {
+        done(e)
+      }
     })
   })
 
-  it('updates the feesUpdatedByUser flag', done => {
+  it('updates the feesUpdatedByUser flag', (done) => {
     request.data.maxFeePerGas = gweiToHex(10)
     request.data.maxPriorityFeePerGas = gweiToHex(2)
 
-    setBaseFee(gweiToHex(10), err => {
-      try {
-        expect(err).toBeFalsy()
-        expect(Accounts.current().requests[1].feesUpdatedByUser).toBe(true)
-        done()
-      } catch (e) { done(e) }
-    }, 1, true)
+    setBaseFee(
+      gweiToHex(10),
+      (err) => {
+        try {
+          expect(err).toBeFalsy()
+          expect(Accounts.current().requests[1].feesUpdatedByUser).toBe(true)
+          done()
+        } catch (e) {
+          done(e)
+        }
+      },
+      1,
+      true
+    )
   })
 })
 
@@ -250,121 +282,136 @@ describe('#setPriorityFee', () => {
     Accounts.addRequest(request, jest.fn())
   })
 
-  const setPriorityFee = (fee, cb, requestId = 1, userUpdate = false) => Accounts.setPriorityFee(fee, requestId, userUpdate, cb)
+  const setPriorityFee = (fee, cb, requestId = 1, userUpdate = false) =>
+    Accounts.setPriorityFee(fee, requestId, userUpdate, cb)
 
-  it('does not set an undefined priority fee', done => {
-    setPriorityFee(undefined, err => {
+  it('does not set an undefined priority fee', (done) => {
+    setPriorityFee(undefined, (err) => {
       expect(err.message).toBeTruthy()
       done()
     })
   })
 
-  it('does not set an invalid priority fee', done => {
-    setPriorityFee('incorrect', err => {
+  it('does not set an invalid priority fee', (done) => {
+    setPriorityFee('incorrect', (err) => {
       expect(err.message).toBeTruthy()
       done()
     })
   })
 
-  it('does not set a negative priority fee', done => {
-    setPriorityFee('-0x12a05f200', err => {
+  it('does not set a negative priority fee', (done) => {
+    setPriorityFee('-0x12a05f200', (err) => {
       expect(err.message).toBeTruthy()
       done()
     })
   })
 
-  it('does not set a priority fee if no account is active', done => {
+  it('does not set a priority fee if no account is active', (done) => {
     Accounts.unsetSigner(jest.fn())
 
-    setPriorityFee('0x12a05f200', err => {
+    setPriorityFee('0x12a05f200', (err) => {
       expect(err.message).toBeTruthy()
       done()
     })
   })
 
-  it('fails to find the request', done => {
-    setPriorityFee('0x12a05f200', err => {
-      expect(err.message).toBeTruthy()
-      done()
-    }, 2)
+  it('fails to find the request', (done) => {
+    setPriorityFee(
+      '0x12a05f200',
+      (err) => {
+        expect(err.message).toBeTruthy()
+        done()
+      },
+      2
+    )
   })
 
-  it('does not set a priority fee on a non-transaction request', done => {
+  it('does not set a priority fee on a non-transaction request', (done) => {
     request.type = 'message'
 
-    setPriorityFee('0x12a05f200', err => {
+    setPriorityFee('0x12a05f200', (err) => {
       expect(err.message).toBeTruthy()
       done()
     })
   })
 
-  it('does not set a priority fee on a locked request', done => {
+  it('does not set a priority fee on a locked request', (done) => {
     request.locked = true
 
-    setPriorityFee('0x12a05f200', err => {
+    setPriorityFee('0x12a05f200', (err) => {
       expect(err.message).toBeTruthy()
       expect(Accounts.current().requests[1].data.maxFeePerGas).toBe(request.data.maxFeePerGas)
       done()
     })
   })
 
-  it('does not set a priority fee on an automatic update if fees were manually set by the user', done => {
+  it('does not set a priority fee on an automatic update if fees were manually set by the user', (done) => {
     request.feesUpdatedByUser = true
 
-    setPriorityFee('0x12a05f200', err => {
-      expect(err.message).toBeTruthy()
-      expect(Accounts.current().requests[1].data.maxFeePerGas).toBe(request.data.maxFeePerGas)
-      done()
-    }, 1, false)
+    setPriorityFee(
+      '0x12a05f200',
+      (err) => {
+        expect(err.message).toBeTruthy()
+        expect(Accounts.current().requests[1].data.maxFeePerGas).toBe(request.data.maxFeePerGas)
+        done()
+      },
+      1,
+      false
+    )
   })
 
-
-  it('sets a valid priority fee', done => {
+  it('sets a valid priority fee', (done) => {
     const priorityFee = 2e9 // 2 gwei
     const priorityFeeChange = priorityFee - parseInt(request.data.maxPriorityFeePerGas)
     const expectedMaxFee = weiToHex(priorityFeeChange + parseInt(request.data.maxFeePerGas))
 
-    setPriorityFee(weiToHex(priorityFee), err => {
+    setPriorityFee(weiToHex(priorityFee), (err) => {
       try {
         expect(err).toBeFalsy()
         expect(Accounts.current().requests[1].data.maxPriorityFeePerGas).toBe(weiToHex(priorityFee))
         expect(Accounts.current().requests[1].data.maxFeePerGas).toBe(expectedMaxFee)
         done()
-      } catch (e) { done(e) }
+      } catch (e) {
+        done(e)
+      }
     })
   })
 
-  it('does not update if the priority fee has not changed', done => {
+  it('does not update if the priority fee has not changed', (done) => {
     request.data.maxFeePerGas = gweiToHex(10)
     request.data.maxPriorityFeePerGas = gweiToHex(2)
 
-    setPriorityFee(gweiToHex(2), err => {
+    setPriorityFee(gweiToHex(2), (err) => {
       try {
         expect(err).toBeFalsy()
         expect(Accounts.current().requests[1].data.maxFeePerGas).toBe(gweiToHex(10))
         expect(Accounts.current().requests[1].data.maxPriorityFeePerGas).toBe(gweiToHex(2))
         done()
-      } catch (e) { done(e) }
+      } catch (e) {
+        done(e)
+      }
     })
   })
 
-  it('caps the priority fee at 9999 gwei', done => {
+  it('caps the priority fee at 9999 gwei', (done) => {
     const highPriorityFee = gweiToHex(10200)
     const maxPriorityFee = 9999e9
     const priorityFeeChange = maxPriorityFee - parseInt(request.data.maxPriorityFeePerGas)
     const expectedMaxFee = weiToHex(priorityFeeChange + parseInt(request.data.maxFeePerGas))
 
-    setPriorityFee(highPriorityFee, err => {
+    setPriorityFee(highPriorityFee, (err) => {
       try {
         expect(err).toBeFalsy()
         expect(Accounts.current().requests[1].data.maxPriorityFeePerGas).toBe(weiToHex(maxPriorityFee))
         expect(Accounts.current().requests[1].data.maxFeePerGas).toBe(expectedMaxFee)
         done()
-      } catch (e) { done(e) }
+      } catch (e) {
+        done(e)
+      }
     })
   })
 
-  it('does not exceed the max allowable fee', done => {
+  it('does not exceed the max allowable fee', (done) => {
     const maxTotal = 2e18 // 2 ETH
     const gasLimit = 1e7
     const maxFee = maxTotal / gasLimit
@@ -374,26 +421,36 @@ describe('#setPriorityFee', () => {
     request.data.maxPriorityFeePerGas = gweiToHex(40)
 
     const highPriorityFee = 60e9 // add 20 gwei to the above to exceed the maximum limit
-    const expectedPriorityFee = maxFee - (parseInt(request.data.maxFeePerGas) - parseInt(request.data.maxPriorityFeePerGas))
+    const expectedPriorityFee =
+      maxFee - (parseInt(request.data.maxFeePerGas) - parseInt(request.data.maxPriorityFeePerGas))
 
-    setPriorityFee(highPriorityFee, err => {
+    setPriorityFee(highPriorityFee, (err) => {
       try {
         expect(err).toBeFalsy()
         expect(Accounts.current().requests[1].data.maxPriorityFeePerGas).toBe(weiToHex(expectedPriorityFee))
         expect(Accounts.current().requests[1].data.maxFeePerGas).toBe(weiToHex(maxFee))
         done()
-      } catch (e) { done(e) }
-    })
-  })
-
-  it('updates the feesUpdatedByUser flag', done => {
-    setPriorityFee('0x12a05f200', err => {
-      try {
-        expect(err).toBeFalsy()
-        expect(Accounts.current().requests[1].feesUpdatedByUser).toBe(true)
-        done()
-      } catch (e) { done(e) }
-    }, 1, true)
+      } catch (e) {
+        done(e)
+      }
+    })
+  })
+
+  it('updates the feesUpdatedByUser flag', (done) => {
+    setPriorityFee(
+      '0x12a05f200',
+      (err) => {
+        try {
+          expect(err).toBeFalsy()
+          expect(Accounts.current().requests[1].feesUpdatedByUser).toBe(true)
+          done()
+        } catch (e) {
+          done(e)
+        }
+      },
+      1,
+      true
+    )
   })
 })
 
@@ -403,97 +460,111 @@ describe('#setGasPrice', () => {
     request.data.type = '0x0'
   })
 
-  const setGasPrice = (price, cb, requestId = 1, userUpdate = false) => Accounts.setGasPrice(price, requestId, userUpdate, cb)
+  const setGasPrice = (price, cb, requestId = 1, userUpdate = false) =>
+    Accounts.setGasPrice(price, requestId, userUpdate, cb)
 
-  it('does not set an undefined gas price', done => {
-    setGasPrice(undefined, err => {
+  it('does not set an undefined gas price', (done) => {
+    setGasPrice(undefined, (err) => {
       expect(err.message).toBeTruthy()
       done()
     })
   })
 
-  it('does not set an invalid gas price', done => {
-    setGasPrice(Number.NaN, err => {
+  it('does not set an invalid gas price', (done) => {
+    setGasPrice(Number.NaN, (err) => {
       expect(err.message).toBeTruthy()
       done()
     })
   })
 
-  it('does not set a negative gas price', done => {
-    setGasPrice('-0x23', err => {
+  it('does not set a negative gas price', (done) => {
+    setGasPrice('-0x23', (err) => {
       expect(err.message).toBeTruthy()
       done()
     })
   })
 
-  it('does not set a gas price if no account is active', done => {
+  it('does not set a gas price if no account is active', (done) => {
     Accounts.unsetSigner(jest.fn())
 
-    setGasPrice('0x23', err => {
+    setGasPrice('0x23', (err) => {
       expect(err.message).toBeTruthy()
       done()
     })
   })
 
-  it('fails to find the request', done => {
-    setGasPrice('0x23', err => {
-      expect(err.message).toBeTruthy()
-      done()
-    }, 2)
+  it('fails to find the request', (done) => {
+    setGasPrice(
+      '0x23',
+      (err) => {
+        expect(err.message).toBeTruthy()
+        done()
+      },
+      2
+    )
   })
 
-  it('does not set a gas price on a non-transaction request', done => {
+  it('does not set a gas price on a non-transaction request', (done) => {
     request.type = 'message'
 
-    setGasPrice('0x23', err => {
+    setGasPrice('0x23', (err) => {
       expect(err.message).toBeTruthy()
       done()
     })
   })
 
-  it('does not set a gas price on a locked request', done => {
+  it('does not set a gas price on a locked request', (done) => {
     request.locked = true
 
-    setGasPrice('0x23', err => {
+    setGasPrice('0x23', (err) => {
       expect(err.message).toBeTruthy()
       expect(Accounts.current().requests[1].data.gasPrice).toBe(request.data.gasPrice)
       done()
     })
   })
 
-  it('does not set a gas price on an automatic update if fees were manually set by the user', done => {
+  it('does not set a gas price on an automatic update if fees were manually set by the user', (done) => {
     request.feesUpdatedByUser = true
 
-    setGasPrice('0x23', err => {
-      expect(err.message).toBeTruthy()
-      expect(Accounts.current().requests[1].data.gasPrice).toBe(request.data.gasPrice)
-      done()
-    }, 1, false)
+    setGasPrice(
+      '0x23',
+      (err) => {
+        expect(err.message).toBeTruthy()
+        expect(Accounts.current().requests[1].data.gasPrice).toBe(request.data.gasPrice)
+        done()
+      },
+      1,
+      false
+    )
   })
 
-  it('sets a valid gas price', done => {
-    setGasPrice('0x23', err => {
+  it('sets a valid gas price', (done) => {
+    setGasPrice('0x23', (err) => {
       try {
         expect(err).toBeFalsy()
         expect(Accounts.current().requests[1].data.gasPrice).toBe('0x23')
         done()
-      } catch (e) { done(e) }
+      } catch (e) {
+        done(e)
+      }
     })
   })
 
-  it('does not update if the gas price has not changed', done => {
+  it('does not update if the gas price has not changed', (done) => {
     request.data.gasPrice = gweiToHex(10)
 
-    setGasPrice(gweiToHex(10), err => {
+    setGasPrice(gweiToHex(10), (err) => {
       try {
         expect(err).toBeFalsy()
         expect(Accounts.current().requests[1].data.gasPrice).toBe(gweiToHex(10))
         done()
-      } catch (e) { done(e) }
+      } catch (e) {
+        done(e)
+      }
     })
   })
 
-  it('does not exceed the max gas price', done => {
+  it('does not exceed the max gas price', (done) => {
     const maxTotal = 2e18 // 2 ETH
     const gasLimit = 1e7
     const maxFee = maxTotal / gasLimit
@@ -501,38 +572,49 @@ describe('#setGasPrice', () => {
 
     request.data.gasLimit = weiToHex(gasLimit)
 
-    setGasPrice(highPrice, err => {
+    setGasPrice(highPrice, (err) => {
       try {
         expect(err).toBeFalsy()
         expect(Accounts.current().requests[1].data.gasPrice).toBe(weiToHex(maxFee))
         done()
-      } catch (e) { done(e) }
+      } catch (e) {
+        done(e)
+      }
     })
   })
 
-  it('caps the gas price at 9999 gwei', done => {
+  it('caps the gas price at 9999 gwei', (done) => {
     const maxPrice = gweiToHex(9999)
     const highPrice = gweiToHex(10200)
 
-    setGasPrice(highPrice, err => {
+    setGasPrice(highPrice, (err) => {
       try {
         expect(err).toBeFalsy()
         expect(Accounts.current().requests[1].data.gasPrice).toBe(maxPrice)
         done()
-      } catch (e) { done(e) }
+      } catch (e) {
+        done(e)
+      }
     })
   })
 
-  it('updates the feesUpdatedByUser flag', done => {
+  it('updates the feesUpdatedByUser flag', (done) => {
     request.data.gasPrice = gweiToHex(30)
-    
-    setGasPrice(gweiToHex(45), err => {
-      try {
-        expect(err).toBeFalsy()
-        expect(Accounts.current().requests[1].feesUpdatedByUser).toBe(true)
-        done()
-      } catch (e) { done(e) }
-    }, 1, true)
+
+    setGasPrice(
+      gweiToHex(45),
+      (err) => {
+        try {
+          expect(err).toBeFalsy()
+          expect(Accounts.current().requests[1].feesUpdatedByUser).toBe(true)
+          done()
+        } catch (e) {
+          done(e)
+        }
+      },
+      1,
+      true
+    )
   })
 })
 
@@ -541,85 +623,97 @@ describe('#setGasLimit', () => {
     Accounts.addRequest(request, jest.fn())
   })
 
-  const setGasLimit = (limit, cb, requestId = 1, userUpdate = false) => Accounts.setGasLimit(limit, requestId, userUpdate, cb)
+  const setGasLimit = (limit, cb, requestId = 1, userUpdate = false) =>
+    Accounts.setGasLimit(limit, requestId, userUpdate, cb)
 
-  it('does not set an undefined gas limit', done => {
-    setGasLimit(undefined, err => {
+  it('does not set an undefined gas limit', (done) => {
+    setGasLimit(undefined, (err) => {
       expect(err.message).toBeTruthy()
       done()
     })
   })
 
-  it('does not set an invalid gas limit', done => {
-    setGasLimit(Number.NaN, err => {
+  it('does not set an invalid gas limit', (done) => {
+    setGasLimit(Number.NaN, (err) => {
       expect(err.message).toBeTruthy()
       done()
     })
   })
 
-  it('does not set a negative gas limit', done => {
-    setGasLimit('-0x61a8', err => {
+  it('does not set a negative gas limit', (done) => {
+    setGasLimit('-0x61a8', (err) => {
       expect(err.message).toBeTruthy()
       done()
     })
   })
 
-  it('does not set a gas limit if no account is active', done => {
+  it('does not set a gas limit if no account is active', (done) => {
     Accounts.unsetSigner(jest.fn())
 
-    setGasLimit('0x61a8', err => {
+    setGasLimit('0x61a8', (err) => {
       expect(err.message).toBeTruthy()
       done()
     })
   })
 
-  it('fails to find the request', done => {
-    setGasLimit('0x61a8', err => {
-      expect(err.message).toBeTruthy()
-      done()
-    }, 2)
+  it('fails to find the request', (done) => {
+    setGasLimit(
+      '0x61a8',
+      (err) => {
+        expect(err.message).toBeTruthy()
+        done()
+      },
+      2
+    )
   })
 
-  it('does not set a gas limit on a non-transaction request', done => {
+  it('does not set a gas limit on a non-transaction request', (done) => {
     request.type = 'message'
 
-    setGasLimit('0x61a8', err => {
+    setGasLimit('0x61a8', (err) => {
       expect(err.message).toBeTruthy()
       done()
     })
   })
 
-  it('does not set a gas limit on a locked request', done => {
+  it('does not set a gas limit on a locked request', (done) => {
     request.locked = true
 
-    setGasLimit('0x61a8', err => {
+    setGasLimit('0x61a8', (err) => {
       expect(err.message).toBeTruthy()
       expect(Accounts.current().requests[1].data.gasLimit).toBe(request.data.gasLimit)
       done()
     })
   })
 
-  it('does not set a gas limit on an automatic update if fees were manually set by the user', done => {
+  it('does not set a gas limit on an automatic update if fees were manually set by the user', (done) => {
     request.feesUpdatedByUser = true
 
-    setGasLimit('0x61a8', err => {
-      expect(err.message).toBeTruthy()
-      expect(Accounts.current().requests[1].data.gasLimit).toBe(request.data.gasLimit)
-      done()
-    }, 1, false)
+    setGasLimit(
+      '0x61a8',
+      (err) => {
+        expect(err.message).toBeTruthy()
+        expect(Accounts.current().requests[1].data.gasLimit).toBe(request.data.gasLimit)
+        done()
+      },
+      1,
+      false
+    )
   })
 
-  it('sets a valid gas limit', done => {
-    setGasLimit('0x61a8', err => {
+  it('sets a valid gas limit', (done) => {
+    setGasLimit('0x61a8', (err) => {
       try {
         expect(err).toBeFalsy()
         expect(Accounts.current().requests[1].data.gasLimit).toBe('0x61a8')
         done()
-      } catch (e) { done(e) }
+      } catch (e) {
+        done(e)
+      }
     })
   })
 
-  it('does not exceed the max fee for pre-EIP-1559 transactions', done => {
+  it('does not exceed the max fee for pre-EIP-1559 transactions', (done) => {
     const maxFee = 2e18 // 2 ETH
     const gasPrice = 400e9 // 400 gwei
     const maxLimit = maxFee / gasPrice
@@ -628,16 +722,18 @@ describe('#setGasLimit', () => {
     request.data.type = '0x0'
     request.data.gasPrice = weiToHex(gasPrice)
 
-    setGasLimit(gasLimit, err => {
+    setGasLimit(gasLimit, (err) => {
       try {
         expect(err).toBeFalsy()
         expect(Accounts.current().requests[1].data.gasLimit).toBe(weiToHex(maxLimit))
         done()
-      } catch (e) { done(e) }
+      } catch (e) {
+        done(e)
+      }
     })
   })
 
-  it('does not exceed the max fee for post-EIP-1559 transactions', done => {
+  it('does not exceed the max fee for post-EIP-1559 transactions', (done) => {
     const maxFee = 2e18 // 2 ETH
     const maxFeePerGas = 400e9 // 400 gwei
     const maxLimit = maxFee / maxFeePerGas
@@ -646,36 +742,47 @@ describe('#setGasLimit', () => {
     request.data.type = '0x2'
     request.data.maxFeePerGas = weiToHex(maxFeePerGas)
 
-    setGasLimit(gasLimit, err => {
+    setGasLimit(gasLimit, (err) => {
       try {
         expect(err).toBeFalsy()
         expect(Accounts.current().requests[1].data.gasLimit).toBe(weiToHex(maxLimit))
         done()
-      } catch (e) { done(e) }
+      } catch (e) {
+        done(e)
+      }
     })
   })
 
-  it('caps the gas limit at 12.5e6', done => {
+  it('caps the gas limit at 12.5e6', (done) => {
     const maxLimit = weiToHex(12.5e6)
     const highLimit = weiToHex(13e6)
 
-    setGasLimit(highLimit, err => {
+    setGasLimit(highLimit, (err) => {
       try {
         expect(err).toBeFalsy()
         expect(Accounts.current().requests[1].data.gasLimit).toBe(maxLimit)
         done()
-      } catch (e) { done(e) }
-    })
-  })
-
-  it('updates the feesUpdatedByUser flag', done => {
-    setGasLimit('0x61a8', err => {
-      try {
-        expect(err).toBeFalsy()
-        expect(Accounts.current().requests[1].feesUpdatedByUser).toBe(true)
-        done()
-      } catch (e) { done(e) }
-    }, 1, true)
+      } catch (e) {
+        done(e)
+      }
+    })
+  })
+
+  it('updates the feesUpdatedByUser flag', (done) => {
+    setGasLimit(
+      '0x61a8',
+      (err) => {
+        try {
+          expect(err).toBeFalsy()
+          expect(Accounts.current().requests[1].feesUpdatedByUser).toBe(true)
+          done()
+        } catch (e) {
+          done(e)
+        }
+      },
+      1,
+      true
+    )
   })
 })
 
@@ -684,12 +791,14 @@ describe('#adjustNonce', () => {
 
   beforeEach(() => {
     provider.send.mockImplementation((payload, cb) => {
-      expect(payload).toEqual(expect.objectContaining({
-        id: 1,
-        jsonrpc: '2.0',
-        method: 'eth_getTransactionCount',
-        params: ['0x22dd63c3619818fdbc262c78baee43cb61e9cccf', 'pending']
-      }))
+      expect(payload).toEqual(
+        expect.objectContaining({
+          id: 1,
+          jsonrpc: '2.0',
+          method: 'eth_getTransactionCount',
+          params: ['0x22dd63c3619818fdbc262c78baee43cb61e9cccf', 'pending'],
+        })
+      )
 
       cb({ result: onChainNonce })
     })
@@ -751,7 +860,7 @@ describe('#adjustNonce', () => {
 })
 
 describe('#resolveRequest', () => {
-  it ('does nothing with an unknown request', () => {
+  it('does nothing with an unknown request', () => {
     Accounts.addRequest(request, () => {
       throw new Error('unexpected callback!')
     })
@@ -761,17 +870,19 @@ describe('#resolveRequest', () => {
     expect(Object.keys(Accounts.current().requests)).toHaveLength(1)
   })
 
-  it ('resolves a request with a callback', done => {
+  it('resolves a request with a callback', (done) => {
     Accounts.addRequest(request, () => done())
 
     Accounts.resolveRequest(request)
 
     try {
       expect(Object.keys(Accounts.current().requests)).toHaveLength(0)
-    } catch (e) { done(e) }
+    } catch (e) {
+      done(e)
+    }
   })
 
-  it ('resolves a request with no callback', () => {
+  it('resolves a request with no callback', () => {
     Accounts.addRequest(request)
 
     Accounts.resolveRequest(request)
diff --git a/test/main/api/origins.test.js b/test/main/api/origins.test.js
index 1fbafe80e..984abb848 100644
--- a/test/main/api/origins.test.js
+++ b/test/main/api/origins.test.js
@@ -26,16 +26,13 @@ describe('#updateOrigin', () => {
     it('adds a new origin to the store', () => {
       updateOrigin({}, 'frame.test')
 
-      expect(store.initOrigin).toHaveBeenCalledWith(
-        uuidv5('frame.test', uuidv5.DNS),
-        {
-          name: 'frame.test',
-          chain: {
-            type: 'ethereum',
-            id: 1
-          }
-        }
-      )
+      expect(store.initOrigin).toHaveBeenCalledWith(uuidv5('frame.test', uuidv5.DNS), {
+        name: 'frame.test',
+        chain: {
+          type: 'ethereum',
+          id: 1,
+        },
+      })
     })
 
     it('assigns a session to a new origin', () => {
diff --git a/test/main/api/validPayload.test.js b/test/main/api/validPayload.test.js
index abfb54d00..603d02305 100644
--- a/test/main/api/validPayload.test.js
+++ b/test/main/api/validPayload.test.js
@@ -18,9 +18,7 @@ beforeEach(() => {
     id: 7,
     jsonrpc: '2.0',
     method: 'eth_getBalance',
-    params: [
-      '0xc93452A74e596e81E4f73Ca1AcFF532089AD4c62'
-    ]
+    params: ['0xc93452A74e596e81E4f73Ca1AcFF532089AD4c62'],
   }
 })
 
@@ -38,7 +36,7 @@ it('returns a valid payload with array params', () => {
 })
 
 it('returns a valid payload with object params', () => {
-  payload.params = { asset: { address: '0x912a' }}
+  payload.params = { asset: { address: '0x912a' } }
   const result = validatePayload(JSON.stringify(payload))
 
   expect(result).toStrictEqual(payload)
@@ -50,7 +48,7 @@ it('changes missing params to an empty array', () => {
 
   expect(result).toStrictEqual({
     ...payload,
-    params: []
+    params: [],
   })
 })
 
diff --git a/test/main/chains/config/index.test.js b/test/main/chains/config/index.test.js
index 271c588ef..315e9b2e4 100644
--- a/test/main/chains/config/index.test.js
+++ b/test/main/chains/config/index.test.js
@@ -12,4 +12,4 @@ describe('polygon', () => {
 
     expect(config.gteHardfork('london')).toBe(false)
   })
-})
\ No newline at end of file
+})
diff --git a/test/main/chains/index.test.js b/test/main/chains/index.test.js
index 6c1699728..9c5685cb1 100644
--- a/test/main/chains/index.test.js
+++ b/test/main/chains/index.test.js
@@ -8,7 +8,7 @@ import { gweiToHex, weiToHex } from '../../util'
 log.transports.console.level = false
 
 class MockConnection extends EventEmitter {
-  constructor (chainId) {
+  constructor(chainId) {
     super()
 
     this.connected = false
@@ -27,7 +27,7 @@ class MockConnection extends EventEmitter {
       }
     }
 
-    this.send = payload => {
+    this.send = (payload) => {
       return new Promise((resolve, reject) => {
         if (payload.method === 'eth_getBlockByNumber') {
           return resolve(block)
@@ -37,9 +37,7 @@ class MockConnection extends EventEmitter {
           return resolve({
             baseFeePerGas: [gweiToHex(15), gweiToHex(8), gweiToHex(9), gweiToHex(8), gweiToHex(7)],
             gasUsedRatio: [0.11, 0.8, 0.2, 0.5],
-            reward: [
-              [gweiToHex(1), gweiToHex(1), gweiToHex(1), gweiToHex(1),]
-            ]
+            reward: [[gweiToHex(1), gweiToHex(1), gweiToHex(1), gweiToHex(1)]],
           })
         }
 
@@ -60,44 +58,76 @@ const state = {
   main: {
     currentNetwork: {
       type: 'ethereum',
-      id: '4'
+      id: '4',
     },
     networkPresets: {
       ethereum: {
         default: {
-          local: 'direct'
+          local: 'direct',
         },
         4: {
-          infura: 'infuraRinkeby'
+          infura: 'infuraRinkeby',
         },
         137: {
-          infura: 'infuraPolygon'
-        }
-      }
+          infura: 'infuraPolygon',
+        },
+      },
     },
-    networks: { 
+    networks: {
       ethereum: {
         4: {
           id: 4,
           type: 'ethereum',
           name: 'Rinkeby',
           connection: {
-            primary: { on: false, current: 'infura', status: 'loading', connected: false, type: '', network: '', custom: '' },
-            secondary: { on: false, current: 'custom', status: 'loading', connected: false, type: '', network: '', custom: '' }
+            primary: {
+              on: false,
+              current: 'infura',
+              status: 'loading',
+              connected: false,
+              type: '',
+              network: '',
+              custom: '',
+            },
+            secondary: {
+              on: false,
+              current: 'custom',
+              status: 'loading',
+              connected: false,
+              type: '',
+              network: '',
+              custom: '',
+            },
           },
-          on: true
+          on: true,
         },
         137: {
           id: 137,
           type: 'ethereum',
           name: 'Polygon',
           connection: {
-            primary: { on: false, current: 'infura', status: 'loading', connected: false, type: '', network: '', custom: '' },
-            secondary: { on: false, current: 'custom', status: 'loading', connected: false, type: '', network: '', custom: '' }
+            primary: {
+              on: false,
+              current: 'infura',
+              status: 'loading',
+              connected: false,
+              type: '',
+              network: '',
+              custom: '',
+            },
+            secondary: {
+              on: false,
+              current: 'custom',
+              status: 'loading',
+              connected: false,
+              type: '',
+              network: '',
+              custom: '',
+            },
           },
-          on: true
-        }
-      }
+          on: true,
+        },
+      },
     },
     networksMeta: {
       ethereum: {
@@ -105,39 +135,39 @@ const state = {
           gas: {
             price: {
               selected: 'standard',
-              levels: { slow: '', standard: '', fast: '', asap: '', custom: '' }
-            }
-          }
+              levels: { slow: '', standard: '', fast: '', asap: '', custom: '' },
+            },
+          },
         },
         137: {
           gas: {
             price: {
               selected: 'standard',
-              levels: { slow: '', standard: '', fast: '', asap: '', custom: '' }
-            }
-          }
-        }
-      }
-    }
-  }
+              levels: { slow: '', standard: '', fast: '', asap: '', custom: '' },
+            },
+          },
+        },
+      },
+    },
+  },
 }
 
-jest.mock('eth-provider', () => target => mockConnections[target].connection)
+jest.mock('eth-provider', () => (target) => mockConnections[target].connection)
 jest.mock('../../../main/store/state', () => () => state)
 jest.mock('../../../main/accounts', () => ({ updatePendingFees: jest.fn() }))
 jest.mock('../../../main/store/persist')
 
 const mockConnections = {
-  'infuraRinkeby': {
+  infuraRinkeby: {
     id: '4',
     name: 'rinkeby',
-    connection: new MockConnection(4)
+    connection: new MockConnection(4),
   },
-  'infuraPolygon': {
+  infuraPolygon: {
     id: '137',
     name: 'polygon',
-    connection: new MockConnection(137)
-  }
+    connection: new MockConnection(137),
+  },
 }
 
 let chains
@@ -150,7 +180,7 @@ beforeEach(() => {
   block = {}
 
   connectionObserver = store.observer(() => {
-    Object.values(mockConnections).forEach(chain => {
+    Object.values(mockConnections).forEach((chain) => {
       const primary = store(`main.networks.ethereum.${chain.id}.connection.primary`)
 
       if (primary.on) {
@@ -159,13 +189,13 @@ beforeEach(() => {
     })
   })
 
-  Object.values(mockConnections).forEach(chain => {
+  Object.values(mockConnections).forEach((chain) => {
     store.setGasPrices('ethereum', chain.id, {})
     store.setGasFees('ethereum', chain.id, {})
   })
 })
 
-afterEach(done => {
+afterEach((done) => {
   if (observer) {
     observer.remove()
   }
@@ -174,42 +204,42 @@ afterEach(done => {
     connectionObserver.remove()
   }
 
-  const activeConnection = Object.values(mockConnections).find(conn => conn.connection.connected)
+  const activeConnection = Object.values(mockConnections).find((conn) => conn.connection.connected)
 
   chains.once('close', ({ id }) => {
     if (id === activeConnection.id) {
-      done();
+      done()
     } else {
       done.fail('connection error')
     }
   })
   store.toggleConnection('ethereum', activeConnection.id, 'primary', false)
 })
-  
-Object.values(mockConnections).forEach(chain => {
-  it(`sets legacy gas prices on a new non-London block on ${chain.name}`, done => {
+
+Object.values(mockConnections).forEach((chain) => {
+  it(`sets legacy gas prices on a new non-London block on ${chain.name}`, (done) => {
     gasPrice = gweiToHex(6)
     block = {
-      number: addHexPrefix((8897988 - 20).toString(16))
+      number: addHexPrefix((8897988 - 20).toString(16)),
     }
-  
+
     observer = store.observer(() => {
       const gas = store(`main.networksMeta.ethereum.${chain.id}.gas.price.levels`)
-  
+
       if (gas.fast) {
         expect(gas.fast).toBe(gweiToHex(6))
-  
+
         done()
       }
     })
-    
+
     store.toggleConnection('ethereum', chain.id, 'primary', true)
   })
 
-  it(`sets fee market prices on a new London block on ${chain.name}`, done => {
+  it(`sets fee market prices on a new London block on ${chain.name}`, (done) => {
     block = {
       number: addHexPrefix((12965200).toString(16)),
-      baseFeePerGas: gweiToHex(9)
+      baseFeePerGas: gweiToHex(9),
     }
 
     const expectedBaseFee = 7e9 * 1.125 * 1.125
@@ -229,7 +259,7 @@ Object.values(mockConnections).forEach(chain => {
         done()
       }
     })
-    
+
     store.toggleConnection('ethereum', chain.id, 'primary', true)
-  })
+  }, 500)
 })
diff --git a/test/main/externalData/balances/reducers.test.js b/test/main/externalData/balances/reducers.test.js
index ea5f14bc4..00fb344c9 100644
--- a/test/main/externalData/balances/reducers.test.js
+++ b/test/main/externalData/balances/reducers.test.js
@@ -7,15 +7,21 @@ describe('#groupByChain', () => {
       { chainId: 4, symbol: 'ZRX' },
       { chainId: 137, symbol: 'AAVE' },
       { chainId: 4, symbol: 'BADGER' },
-      { chainId: 1, symbol: 'AUSDC' }
+      { chainId: 1, symbol: 'AUSDC' },
     ]
 
     const grouped = tokens.reduce(groupByChain, {})
 
     expect(grouped).toEqual({
-      1: [{ chainId: 1, symbol: 'OHM' }, { chainId: 1, symbol: 'AUSDC' }],
-      4: [{ chainId: 4, symbol: 'ZRX' }, { chainId: 4, symbol: 'BADGER' }],
-      137: [{ chainId: 137, symbol: 'AAVE' }]
+      1: [
+        { chainId: 1, symbol: 'OHM' },
+        { chainId: 1, symbol: 'AUSDC' },
+      ],
+      4: [
+        { chainId: 4, symbol: 'ZRX' },
+        { chainId: 4, symbol: 'BADGER' },
+      ],
+      137: [{ chainId: 137, symbol: 'AAVE' }],
     })
   })
 })
diff --git a/test/main/externalData/balances/scan.test.js b/test/main/externalData/balances/scan.test.js
index f96e876de..5e40af65b 100644
--- a/test/main/externalData/balances/scan.test.js
+++ b/test/main/externalData/balances/scan.test.js
@@ -11,8 +11,9 @@ jest.mock('../../../../main/multicall')
 jest.mock('eth-provider', () =>
   jest.fn(() => ({
     request: jest.fn(),
-    setChain: jest.fn()
-  })))
+    setChain: jest.fn(),
+  }))
+)
 
 const callResponse = '0x0000000000000000000000000000000000000000000000000000000000000000'
 const ownerAddress = '0xbfa641051ba0a0ad1b0acf549a89536a0d76472e'
@@ -21,28 +22,28 @@ const aaveUsdcToken = {
   chainId: 1,
   address: '0xbcca60bb61934080951369a648fb03df4f96263c',
   symbol: 'aUSDC',
-  decimals: 6
+  decimals: 6,
 }
 
 const zrxToken = {
   chainId: 1,
   address: '0xe41d2489571d322189246dafa5ebde1f4699f498',
   symbol: 'ZRX',
-  decimals: 18
+  decimals: 18,
 }
 
 const olympusDaoToken = {
   chainId: 1,
   address: '0x383518188c0c6d7730d91b2c03a03c837814a899',
   symbol: 'OHM',
-  decimals: 9
+  decimals: 9,
 }
 
 const badgerDaoToken = {
   chainId: 42161,
   address: '0xbfa641051ba0a0ad1b0acf549a89536a0d76472e',
   symbol: 'BADGER',
-  decimals: 18
+  decimals: 18,
 }
 
 let eth, balancesLoader, onChainBalances
@@ -65,7 +66,7 @@ describe('#getTokenBalances', () => {
       [aaveUsdcToken.address]: new BigNumber('6245100000'),
       [zrxToken.address]: new BigNumber('756578458984500000000'),
       [olympusDaoToken.address]: new BigNumber('557830302000'),
-      [badgerDaoToken.address]: new BigNumber('17893000000000000000')
+      [badgerDaoToken.address]: new BigNumber('17893000000000000000'),
     }
   })
 
@@ -73,29 +74,27 @@ describe('#getTokenBalances', () => {
     beforeEach(() => {
       supportsChain.mockReturnValue(true)
 
-      multicall.mockImplementation(chainId => {
+      multicall.mockImplementation((chainId) => {
         return {
           batchCall: async function (tokenCalls) {
-            return tokenCalls.map(tc => {
+            return tokenCalls.map((tc) => {
               expect(tc.call[0]).toBe('function balanceOf(address address) returns (uint256 value)')
               expect(tc.call[1]).toBe(ownerAddress)
 
               const token = knownTokens.find(
-                token => token.address === tc.target && token.chainId === parseInt(chainId)
+                (token) => token.address === tc.target && token.chainId === parseInt(chainId)
               )
 
               if (token) {
                 return {
                   success: true,
-                  returnValues: [
-                    tc.returns[0](ethers.BigNumber.from(onChainBalances[token.address].toString()))
-                  ]
+                  returnValues: [tc.returns[0](ethers.BigNumber.from(onChainBalances[token.address].toString()))],
                 }
               }
-              
+
               return '0x0'
             })
-          }
+          },
         }
       })
     })
@@ -103,7 +102,7 @@ describe('#getTokenBalances', () => {
     afterEach(() => {
       multicall.mockReset()
     })
-    
+
     it('loads token balances for multiple chains', async () => {
       const tokenBalances = await balancesLoader.getTokenBalances(ownerAddress, knownTokens)
 
@@ -111,18 +110,18 @@ describe('#getTokenBalances', () => {
         {
           ...aaveUsdcToken,
           balance: addHexPrefix(padToEven(new BigNumber('6245100000').toString(16))),
-          displayBalance: '6245.1'
+          displayBalance: '6245.1',
         },
         {
           ...zrxToken,
           balance: addHexPrefix(padToEven(new BigNumber('756578458984500000000').toString(16))),
-          displayBalance: '756.5784589845'
+          displayBalance: '756.5784589845',
         },
         {
           ...badgerDaoToken,
           balance: addHexPrefix(padToEven(new BigNumber('17893000000000000000').toString(16))),
-          displayBalance: '17.893'
-        }
+          displayBalance: '17.893',
+        },
       ])
     })
   })
@@ -133,7 +132,7 @@ describe('#getTokenBalances', () => {
     beforeEach(() => {
       supportsChain.mockReturnValue(false)
 
-      eth.request.mockImplementation(async payload => {
+      eth.request.mockImplementation(async (payload) => {
         verifyBasePayload(payload)
 
         return callHandler(payload)
@@ -143,7 +142,7 @@ describe('#getTokenBalances', () => {
     afterEach(() => {
       expect(multicall).not.toHaveBeenCalled()
     })
-    
+
     it('loads token balances for multiple chains', async () => {
       const tokenBalances = await balancesLoader.getTokenBalances(ownerAddress, knownTokens)
 
@@ -151,48 +150,48 @@ describe('#getTokenBalances', () => {
         {
           ...aaveUsdcToken,
           balance: addHexPrefix(padToEven(new BigNumber('6245100000').toString(16))),
-          displayBalance: '6245.1'
+          displayBalance: '6245.1',
         },
         {
           ...zrxToken,
           balance: addHexPrefix(padToEven(new BigNumber('756578458984500000000').toString(16))),
-          displayBalance: '756.5784589845'
+          displayBalance: '756.5784589845',
         },
         {
           ...badgerDaoToken,
           balance: addHexPrefix(padToEven(new BigNumber('17893000000000000000').toString(16))),
-          displayBalance: '17.893'
-        }
+          displayBalance: '17.893',
+        },
       ])
     })
-    
+
     it('handles an error retrieving one balance', async () => {
-      callHandler.mockImplementation(payload => {
+      callHandler.mockImplementation((payload) => {
         if (payload.params[0].to === zrxToken.address) {
           throw new Error('invalid token contract!')
         }
 
         return respondToTokenCall(payload)
       })
-  
+
       const tokenBalances = await balancesLoader.getTokenBalances(ownerAddress, knownTokens)
 
       expect(tokenBalances).toEqual([
         {
           ...aaveUsdcToken,
           balance: addHexPrefix(padToEven(new BigNumber('6245100000').toString(16))),
-          displayBalance: '6245.1'
+          displayBalance: '6245.1',
         },
         {
           ...zrxToken,
           balance: '0x0',
-          displayBalance: '0'
+          displayBalance: '0',
         },
         {
           ...badgerDaoToken,
           balance: addHexPrefix(padToEven(new BigNumber('17893000000000000000').toString(16))),
-          displayBalance: '17.893'
-        }
+          displayBalance: '17.893',
+        },
       ])
     })
   })
@@ -200,19 +199,19 @@ describe('#getTokenBalances', () => {
 
 // helper functions //
 
-function verifyBasePayload (payload) {
+function verifyBasePayload(payload) {
   expect(payload.jsonrpc).toBe('2.0')
   expect(Number.isInteger(payload.id)).toBe(true)
   expect(payload.method).toBe('eth_call')
 }
 
-function respondToTokenCall (payload) {
+function respondToTokenCall(payload) {
   expect(payload.params[0].value).toBe('0x0')
   expect(payload.params[0].data).toBe('0x70a08231000000000000000000000000bfa641051ba0a0ad1b0acf549a89536a0d76472e')
   expect(payload.params[1]).toBe('latest')
 
   const token = knownTokens.find(
-    token => token.address === payload.params[0].to && token.chainId === parseInt(payload.chainId)
+    (token) => token.address === payload.params[0].to && token.chainId === parseInt(payload.chainId)
   )
 
   const balance = onChainBalances[token.address]
@@ -224,4 +223,4 @@ function respondToTokenCall (payload) {
   }
 
   return callResponse
-}
\ No newline at end of file
+}
diff --git a/test/main/externalData/inventory/tokens.test.js b/test/main/externalData/inventory/tokens.test.js
index 7096fa3e6..06733247c 100644
--- a/test/main/externalData/inventory/tokens.test.js
+++ b/test/main/externalData/inventory/tokens.test.js
@@ -3,14 +3,16 @@ import log from 'electron-log'
 
 jest.mock('eth-provider', () => () => ({ connected: true }))
 
-jest.mock('../../../../main/nebula', () => jest.fn(() => ({
-  resolve: async () => ({ record: {} }),
-  ipfs: {
-    getJson: async () => ({
-      tokens: [{ name: 'another-token', chainId: 299, address: '0x9999' }]
-    })
-  }
-})))
+jest.mock('../../../../main/nebula', () =>
+  jest.fn(() => ({
+    resolve: async () => ({ record: {} }),
+    ipfs: {
+      getJson: async () => ({
+        tokens: [{ name: 'another-token', chainId: 299, address: '0x9999' }],
+      }),
+    },
+  }))
+)
 
 beforeAll(() => {
   log.transports.console.level = false
diff --git a/test/main/multicall/index.test.js b/test/main/multicall/index.test.js
index 571bc3d1f..1664db92f 100644
--- a/test/main/multicall/index.test.js
+++ b/test/main/multicall/index.test.js
@@ -25,7 +25,9 @@ it('encodes aggregated calls correctly', async () => {
     expect(payload.method).toBe('eth_call')
     expect(payload.chainId).toBe('0x89')
     expect(payload.params[0].to).toBe('0x11ce4b23bd875d7f5c6a31084f55fde1e9a87507')
-    expect(payload.params[0].data).toBe('0x252dba4200000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000e00000000000000000000000000b3f868e0be5597d5db7feb59e1cadbb0fdda50a0000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000002470a082310000000000000000000000001ad91ee08f21be3de0ba2ba6918e714da6b4583600000000000000000000000000000000000000000000000000000000000000000000000000000000e94d89243a7aeaf88857461ce555caeb344765fc0000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000002470a082310000000000000000000000001ad91ee08f21be3de0ba2ba6918e714da6b4583600000000000000000000000000000000000000000000000000000000')
+    expect(payload.params[0].data).toBe(
+      '0x252dba4200000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000e00000000000000000000000000b3f868e0be5597d5db7feb59e1cadbb0fdda50a0000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000002470a082310000000000000000000000001ad91ee08f21be3de0ba2ba6918e714da6b4583600000000000000000000000000000000000000000000000000000000000000000000000000000000e94d89243a7aeaf88857461ce555caeb344765fc0000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000002470a082310000000000000000000000001ad91ee08f21be3de0ba2ba6918e714da6b4583600000000000000000000000000000000000000000000000000000000'
+    )
 
     return '0x000000000000000000000000000000000000000000000000000000000181013800000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000017c7aa0a3000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000feca4525'
   })
@@ -36,25 +38,27 @@ it('encodes aggregated calls correctly', async () => {
   const calls = [
     {
       target: '0x0b3F868E0BE5597D5DB7fEB59E1CADBb0fdDa50a',
-      call: ['function balanceOf(address address) returns (uint256 value)', '0x1ad91ee08f21be3de0ba2ba6918e714da6b45836'],
-      returns: [
-        bn => bn.toHexString()
-      ]
+      call: [
+        'function balanceOf(address address) returns (uint256 value)',
+        '0x1ad91ee08f21be3de0ba2ba6918e714da6b45836',
+      ],
+      returns: [(bn) => bn.toHexString()],
     },
     {
       target: '0xe94D89243a7Aeaf88857461ce555caEB344765Fc',
-      call: ['function balanceOf(address address) returns (uint256 value)', '0x1ad91ee08f21be3de0ba2ba6918e714da6b45836'],
-      returns: [
-        bn => bn.toHexString()
-      ]
-    }
+      call: [
+        'function balanceOf(address address) returns (uint256 value)',
+        '0x1ad91ee08f21be3de0ba2ba6918e714da6b45836',
+      ],
+      returns: [(bn) => bn.toHexString()],
+    },
   ]
 
   const result = await caller.batchCall(calls)
 
   expect(result).toEqual([
     { success: true, returnValues: ['0x017c7aa0a3'] },
-    { success: true, returnValues: ['0xfeca4525'] }
+    { success: true, returnValues: ['0xfeca4525'] },
   ])
 })
 
@@ -63,7 +67,9 @@ it('handles an error when using tryAggregate', async () => {
     expect(payload.method).toBe('eth_call')
     expect(payload.chainId).toBe('0x1')
     expect(payload.params[0].to).toBe('0x5ba1e12693dc8f9c48aad8770482f4739beed696')
-    expect(payload.params[0].data).toBe('0xbce38bd7000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000e0000000000000000000000000bcca60bb61934080951369a648fb03df4f96263c0000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000002470a082310000000000000000000000001ad91ee08f21be3de0ba2ba6918e714da6b4583600000000000000000000000000000000000000000000000000000000000000000000000000000000089a502032166e07ae83eb434c16790ca2fa46610000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000002470a082310000000000000000000000001ad91ee08f21be3de0ba2ba6918e714da6b4583600000000000000000000000000000000000000000000000000000000')
+    expect(payload.params[0].data).toBe(
+      '0xbce38bd7000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000e0000000000000000000000000bcca60bb61934080951369a648fb03df4f96263c0000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000002470a082310000000000000000000000001ad91ee08f21be3de0ba2ba6918e714da6b4583600000000000000000000000000000000000000000000000000000000000000000000000000000000089a502032166e07ae83eb434c16790ca2fa46610000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000002470a082310000000000000000000000001ad91ee08f21be3de0ba2ba6918e714da6b4583600000000000000000000000000000000000000000000000000000000'
+    )
 
     return '0x00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000017c7aa4bb000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000'
   })
@@ -74,32 +80,36 @@ it('handles an error when using tryAggregate', async () => {
   const calls = [
     {
       target: '0xBcca60bB61934080951369a648Fb03DF4F96263C',
-      call: ['function balanceOf(address address) returns (uint256 value)', '0x1aD91ee08f21bE3dE0BA2ba6918E714dA6B45836'],
-      returns: [
-        bn => bn.toHexString()
-      ]
+      call: [
+        'function balanceOf(address address) returns (uint256 value)',
+        '0x1aD91ee08f21bE3dE0BA2ba6918E714dA6B45836',
+      ],
+      returns: [(bn) => bn.toHexString()],
     },
     {
       target: '0x089a502032166e07ae83eb434c16790ca2fa4661',
-      call: ['function balanceOf(address address) returns (uint256 value)', '0x1aD91ee08f21bE3dE0BA2ba6918E714dA6B45836'],
-      returns: [
-        bn => bn.toHexString()
-      ]
-    }
+      call: [
+        'function balanceOf(address address) returns (uint256 value)',
+        '0x1aD91ee08f21bE3dE0BA2ba6918E714dA6B45836',
+      ],
+      returns: [(bn) => bn.toHexString()],
+    },
   ]
 
   const result = await caller.batchCall(calls)
 
   expect(result).toEqual([
     { success: true, returnValues: ['0x017c7aa4bb'] },
-    { success: false, returnValues: [] }
+    { success: false, returnValues: [] },
   ])
 })
 
 it('returns one batch if another errors', async () => {
   eth.request
     .mockRejectedValueOnce('multicall failed!')
-    .mockResolvedValueOnce('0x00000000000000000000000000000000000000000000000000000000018100e8000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000feca4525')
+    .mockResolvedValueOnce(
+      '0x00000000000000000000000000000000000000000000000000000000018100e8000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000feca4525'
+    )
 
   // Polygon uses Multicall1 and aggregate
   const caller = multicall(137, eth)
@@ -107,24 +117,26 @@ it('returns one batch if another errors', async () => {
   const calls = [
     {
       target: '0xBcca60bB61934080951369a648Fb03DF4F96263C',
-      call: ['function balanceOf(address address) returns (uint256 value)', '0x1aD91ee08f21bE3dE0BA2ba6918E714dA6B45836'],
-      returns: [
-        bn => bn.toHexString()
-      ]
+      call: [
+        'function balanceOf(address address) returns (uint256 value)',
+        '0x1aD91ee08f21bE3dE0BA2ba6918E714dA6B45836',
+      ],
+      returns: [(bn) => bn.toHexString()],
     },
     {
       target: '0xe94D89243a7Aeaf88857461ce555caEB344765Fc',
-      call: ['function balanceOf(address address) returns (uint256 value)', '0x1aD91ee08f21bE3dE0BA2ba6918E714dA6B45836'],
-      returns: [
-        bn => bn.toHexString()
-      ]
-    }
+      call: [
+        'function balanceOf(address address) returns (uint256 value)',
+        '0x1aD91ee08f21bE3dE0BA2ba6918E714dA6B45836',
+      ],
+      returns: [(bn) => bn.toHexString()],
+    },
   ]
 
   const result = await caller.batchCall(calls, 1)
 
   expect(result).toEqual([
     { success: false, returnValues: [] },
-    { success: true, returnValues: ['0xfeca4525'] }
+    { success: true, returnValues: ['0xfeca4525'] },
   ])
 })
diff --git a/test/main/provider/helpers.test.js b/test/main/provider/helpers.test.js
index 9db8a8972..2c02b96d9 100644
--- a/test/main/provider/helpers.test.js
+++ b/test/main/provider/helpers.test.js
@@ -6,7 +6,7 @@ jest.mock('../../../main/store')
 beforeAll(async () => {
   log.transports.console.level = false
 })
-  
+
 afterAll(() => {
   log.transports.console.level = 'debug'
 })
diff --git a/test/main/provider/index.test.js b/test/main/provider/index.test.js
index 1aeb39458..bc2f7d2b8 100644
--- a/test/main/provider/index.test.js
+++ b/test/main/provider/index.test.js
@@ -16,7 +16,11 @@ const address = '0x22dd63c3619818fdbc262c78baee43cb61e9cccf'
 let accountRequests = []
 
 jest.mock('../../../main/store')
-jest.mock('../../../main/chains', () => ({ send: jest.fn(), syncDataEmit: jest.fn(), on: jest.fn() }))
+jest.mock('../../../main/chains', () => ({
+  send: jest.fn(),
+  syncDataEmit: jest.fn(),
+  on: jest.fn(),
+}))
 jest.mock('../../../main/accounts', () => ({}))
 
 beforeAll(async () => {
@@ -40,43 +44,52 @@ afterAll(() => {
 beforeEach(() => {
   store.set('main.accounts', {})
   store.set('main.origins', {})
-  
+
   provider.handlers = {}
 
   const eventTypes = ['accountsChanged', 'chainChanged', 'chainsChanged', 'assetsChanged', 'networkChanged']
-  eventTypes.forEach(eventType => provider.subscriptions[eventType] = [])
+  eventTypes.forEach((eventType) => (provider.subscriptions[eventType] = []))
 
   accountRequests = []
 
   connection.send = jest.fn()
   connection.connections = {
     ethereum: {
-      1: { chainConfig: chainConfig(1, 'london'), primary: { connected: true }},
-      4: { chainConfig: chainConfig(4, 'london'), primary: { connected: true }}
-    }
+      1: { chainConfig: chainConfig(1, 'london'), primary: { connected: true } },
+      4: { chainConfig: chainConfig(4, 'london'), primary: { connected: true } },
+    },
   }
 
   accounts.current = jest.fn(() => ({ id: address, getAccounts: () => [address] }))
-  accounts.get = jest.fn(addr => addr === address ? { address, lastSignerType: 'ring' } : undefined)
+  accounts.get = jest.fn((addr) => (addr === address ? { address, lastSignerType: 'ring' } : undefined))
   accounts.signTransaction = jest.fn()
   accounts.setTxSigned = jest.fn()
 })
 
 describe('#send', () => {
   beforeEach(() => {
-    store.set('main.origins', '8073729a-5e59-53b7-9e69-5d9bcff94087', { chain: { id: 1, type: 'ethereum' }})
+    store.set('main.origins', '8073729a-5e59-53b7-9e69-5d9bcff94087', {
+      chain: { id: 1, type: 'ethereum' },
+    })
   })
 
-  const send = (request, cb = jest.fn()) => provider.send({ ...request, _origin: '8073729a-5e59-53b7-9e69-5d9bcff94087' }, cb)
+  const send = (request, cb = jest.fn()) =>
+    provider.send({ ...request, _origin: '8073729a-5e59-53b7-9e69-5d9bcff94087' }, cb)
 
   it('passes the given target chain to the connection', () => {
-    connection.connections.ethereum[10] = { chainConfig: { hardfork: 'london', chainId: 10 }, primary: { connected: true } }
+    connection.connections.ethereum[10] = {
+      chainConfig: { hardfork: 'london', chainId: 10 },
+      primary: { connected: true },
+    }
 
-    const request = { method: 'eth_testFrame'  }
+    const request = { method: 'eth_testFrame' }
 
     send({ ...request, chainId: '0xa' })
 
-    expect(connection.send).toHaveBeenCalledWith(request, expect.any(Function), { type: 'ethereum', id: 10 })
+    expect(connection.send).toHaveBeenCalledWith(request, expect.any(Function), {
+      type: 'ethereum',
+      id: 10,
+    })
   })
 
   it('passes the default target chain to the connection when none is given', () => {
@@ -84,13 +97,16 @@ describe('#send', () => {
 
     send(request)
 
-    expect(connection.send).toHaveBeenCalledWith(request, expect.any(Function), { type: 'ethereum', id: 1 })
+    expect(connection.send).toHaveBeenCalledWith(request, expect.any(Function), {
+      type: 'ethereum',
+      id: 1,
+    })
   })
 
   it('returns an error when an unknown chain is given', () => {
     const request = { method: 'eth_testFrame', chainId: '0x63' }
 
-    send(request, response => {
+    send(request, (response) => {
       expect(connection.send).not.toHaveBeenCalled()
       expect(response.error.message).toMatch(/unknown chain/)
       expect(response.result).toBe(undefined)
@@ -100,7 +116,7 @@ describe('#send', () => {
   it('returns an error when an invalid chain is given', () => {
     const request = { method: 'eth_testFrame', chainId: 'test' }
 
-    send(request, response => {
+    send(request, (response) => {
       expect(connection.send).not.toHaveBeenCalled()
       expect(response.error.message).toMatch(/unknown chain/)
       expect(response.result).toBe(undefined)
@@ -111,7 +127,7 @@ describe('#send', () => {
     it('returns the current chain id from the store', () => {
       store.set('main.networks.ethereum', 1, { id: 1 })
 
-      send({ method: 'eth_chainId', chainId: '0x1' }, response => {
+      send({ method: 'eth_chainId', chainId: '0x1' }, (response) => {
         expect(response.result).toBe('0x1')
       })
     })
@@ -119,15 +135,18 @@ describe('#send', () => {
     it('returns a chain id from the target chain', () => {
       store.set('main.networks.ethereum', 4, { id: 4 })
 
-      send({ method: 'eth_chainId', chainId: '0x4' }, response => {
+      send({ method: 'eth_chainId', chainId: '0x4' }, (response) => {
         expect(response.result).toBe('0x4')
       })
     })
 
     it('returns an error for a disconnected chain', () => {
-      connection.connections.ethereum[11] = { chainConfig: chainConfig(11, 'london'), primary: { connected: false } }
+      connection.connections.ethereum[11] = {
+        chainConfig: chainConfig(11, 'london'),
+        primary: { connected: false },
+      }
 
-      send({ method: 'eth_chainId', chainId: '0xb' }, response => {
+      send({ method: 'eth_chainId', chainId: '0xb' }, (response) => {
         expect(response.error.message).toBe('not connected')
         expect(response.result).toBeUndefined()
       })
@@ -135,114 +154,134 @@ describe('#send', () => {
   })
 
   describe('#wallet_addEthereumChain', () => {
-    it('should create an addChain request', done => {
-      send({ 
-        method: 'wallet_addEthereumChain', 
-        params: [
-          {
-            chainId: '0x1234', // A 0x-prefixed hexadecimal string
-            chainName: 'New Chain',
-            nativeCurrency: {
-              name: 'New',
-              symbol: 'NEW', // 2-6 characters long
-              decimals: 18
+    it('should create an addChain request', (done) => {
+      send(
+        {
+          method: 'wallet_addEthereumChain',
+          params: [
+            {
+              chainId: '0x1234', // A 0x-prefixed hexadecimal string
+              chainName: 'New Chain',
+              nativeCurrency: {
+                name: 'New',
+                symbol: 'NEW', // 2-6 characters long
+                decimals: 18,
+              },
+              rpcUrls: ['https://pylon.link'],
+              blockExplorerUrls: ['https://pylon.link'],
+              iconUrls: [''], // Currently ignored
             },
-            rpcUrls: ['https://pylon.link'],
-            blockExplorerUrls: ['https://pylon.link'],
-            iconUrls: [''] // Currently ignored
+          ],
+        },
+        () => {
+          try {
+            expect(accountRequests).toHaveLength(1)
+            expect(accountRequests[0].handlerId).toBeTruthy()
+            expect(accountRequests[0].type).toBe('addChain')
+            done()
+          } catch (e) {
+            done(e)
           }
-        ]
-      }, () => {
-        try {
-          expect(accountRequests).toHaveLength(1)
-          expect(accountRequests[0].handlerId).toBeTruthy()
-          expect(accountRequests[0].type).toBe('addChain')
-          done()
-        } catch (e) { 
-          done(e) 
         }
-      })
+      )
     })
 
-    it('should switch to a chain and notify listeners if it exists in the store', done => {
+    it('should switch to a chain and notify listeners if it exists in the store', (done) => {
       store.set('main.networks.ethereum', 1, { id: 1 })
-      store.set('main.origins', '8073729a-5e59-53b7-9e69-5d9bcff94087', { chain: { id: 137, type: 'ethereum' }})
+      store.set('main.origins', '8073729a-5e59-53b7-9e69-5d9bcff94087', {
+        chain: { id: 137, type: 'ethereum' },
+      })
       store.switchOriginChain = jest.fn()
 
-      send({ 
-        method: 'wallet_addEthereumChain', 
-        params: [
-          {
-            chainId: '0x1', // A 0x-prefixed hexadecimal string
-            chainName: 'Mainnet',
-            nativeCurrency: {
-              name: 'Ether',
-              symbol: 'ETH', // 2-6 characters long
-              decimals: 18
+      send(
+        {
+          method: 'wallet_addEthereumChain',
+          params: [
+            {
+              chainId: '0x1', // A 0x-prefixed hexadecimal string
+              chainName: 'Mainnet',
+              nativeCurrency: {
+                name: 'Ether',
+                symbol: 'ETH', // 2-6 characters long
+                decimals: 18,
+              },
+              rpcUrls: ['https://pylon.link'],
+              blockExplorerUrls: ['https://pylon.link'],
+              iconUrls: [''], // Currently ignored
             },
-            rpcUrls: ['https://pylon.link'],
-            blockExplorerUrls: ['https://pylon.link'],
-            iconUrls: [''] // Currently ignored
-          }
-        ]
-      }, () => {
-        expect(store.switchOriginChain).toHaveBeenCalledWith('8073729a-5e59-53b7-9e69-5d9bcff94087', 1, 'ethereum')
-        done()
-      })
+          ],
+        },
+        () => {
+          expect(store.switchOriginChain).toHaveBeenCalledWith('8073729a-5e59-53b7-9e69-5d9bcff94087', 1, 'ethereum')
+          done()
+        }
+      )
     })
   })
 
   describe('#wallet_switchEthereumChain', () => {
-    it('should switch to a chain and notify listeners if it exists in the store', done => {
+    it('should switch to a chain and notify listeners if it exists in the store', (done) => {
       store.set('main.networks.ethereum', 1, { id: 1 })
-      store.set('main.origins', { '8073729a-5e59-53b7-9e69-5d9bcff94087': { chain: { id:42161, type: 'ethereum' }}})
+      store.set('main.origins', {
+        '8073729a-5e59-53b7-9e69-5d9bcff94087': { chain: { id: 42161, type: 'ethereum' } },
+      })
       store.switchOriginChain = jest.fn()
 
-      send({ 
-        method: 'wallet_switchEthereumChain', 
-        params: [{
-          chainId: '0x1',
-        }],
-        _origin: '8073729a-5e59-53b7-9e69-5d9bcff94087'
-      }, () => {
-        expect(store.switchOriginChain).toHaveBeenCalledWith('8073729a-5e59-53b7-9e69-5d9bcff94087', 1, 'ethereum')
-        done()
-      })
+      send(
+        {
+          method: 'wallet_switchEthereumChain',
+          params: [
+            {
+              chainId: '0x1',
+            },
+          ],
+          _origin: '8073729a-5e59-53b7-9e69-5d9bcff94087',
+        },
+        () => {
+          expect(store.switchOriginChain).toHaveBeenCalledWith('8073729a-5e59-53b7-9e69-5d9bcff94087', 1, 'ethereum')
+          done()
+        }
+      )
     })
 
-    it('should reject if the chain does not exist in the store', done => {
-      send({
-        method: 'wallet_switchEthereumChain', 
-        params: [{
-          chainId: '0x1234'
-        }],
-        _origin: '8073729a-5e59-53b7-9e69-5d9bcff94087'
-      }, () => {
-        try {
-          expect(accountRequests).toHaveLength(0)
-          done()
-        } catch (e) { 
-          done(e) 
+    it('should reject if the chain does not exist in the store', (done) => {
+      send(
+        {
+          method: 'wallet_switchEthereumChain',
+          params: [
+            {
+              chainId: '0x1234',
+            },
+          ],
+          _origin: '8073729a-5e59-53b7-9e69-5d9bcff94087',
+        },
+        () => {
+          try {
+            expect(accountRequests).toHaveLength(0)
+            done()
+          } catch (e) {
+            done(e)
+          }
         }
-      })
+      )
     })
   })
-  
+
   describe('#wallet_getPermissions', () => {
-    it('returns all allowed permissions', done => {
+    it('returns all allowed permissions', (done) => {
       const request = {
         method: 'wallet_getPermissions',
-        _origin: '8073729a-5e59-53b7-9e69-5d9bcff94087'
+        _origin: '8073729a-5e59-53b7-9e69-5d9bcff94087',
       }
 
-      send(request, response => {
+      send(request, (response) => {
         try {
           expect(response.error).toBe(undefined)
 
           const permissions = response.result
           expect(permissions).toHaveLength(14)
-          expect(permissions.map(p => p.parentCapability)).toEqual(expect.arrayContaining(
-            [
+          expect(permissions.map((p) => p.parentCapability)).toEqual(
+            expect.arrayContaining([
               'eth_coinbase',
               'eth_accounts',
               'eth_requestAccounts',
@@ -256,28 +295,27 @@ describe('#send', () => {
               'eth_signTypedData_v3',
               'eth_signTypedData_v4',
               'wallet_addEthereumChain',
-              'wallet_getAssets'
-            ]
-          ))
+              'wallet_getAssets',
+            ])
+          )
 
           done()
-        } catch (e) { done(e) }
+        } catch (e) {
+          done(e)
+        }
       })
     })
   })
 
   describe('#wallet_requestPermissions', () => {
-    it('returns the requested permissions', done => {
+    it('returns the requested permissions', (done) => {
       const request = {
         method: 'wallet_requestPermissions',
-        params: [
-          { eth_accounts: {} },
-          { eth_signTransaction: {} }
-        ],
-        _origin: '8073729a-5e59-53b7-9e69-5d9bcff94087'
+        params: [{ eth_accounts: {} }, { eth_signTransaction: {} }],
+        _origin: '8073729a-5e59-53b7-9e69-5d9bcff94087',
       }
 
-      send(request, response => {
+      send(request, (response) => {
         try {
           expect(response.error).toBe(undefined)
 
@@ -288,14 +326,16 @@ describe('#send', () => {
           expect(permissions[1].parentCapability).toBe('eth_signTransaction')
           expect(Number.isInteger(permissions[1].date)).toBe(true)
           done()
-        } catch (e) { done(e) }
+        } catch (e) {
+          done(e)
+        }
       })
     })
   })
 
   describe('#wallet_watchAsset', () => {
     let request
-    
+
     beforeEach(() => {
       store.set('main.tokens.custom', [])
 
@@ -309,10 +349,10 @@ describe('#send', () => {
             symbol: 'BADGER',
             name: 'BadgerDAO Token',
             decimals: 18,
-            image: 'https://badgerdao.io/icon.jpg'
-          }
+            image: 'https://badgerdao.io/icon.jpg',
+          },
         },
-        _origin: '8073729a-5e59-53b7-9e69-5d9bcff94087'
+        _origin: '8073729a-5e59-53b7-9e69-5d9bcff94087',
       }
     })
 
@@ -330,9 +370,9 @@ describe('#send', () => {
               symbol: 'BADGER',
               name: 'BadgerDAO Token',
               decimals: 18,
-              logoURI: 'https://badgerdao.io/icon.jpg'
+              logoURI: 'https://badgerdao.io/icon.jpg',
             },
-            payload: request
+            payload: request,
           })
         )
       })
@@ -383,9 +423,9 @@ describe('#send', () => {
       store.set('main.networks.ethereum', {
         137: { name: 'polygon', id: 137, on: true },
         4: { name: 'rinkeby', id: 4, on: false },
-        1: { name: 'mainnet', id: 1, on: true }
+        1: { name: 'mainnet', id: 1, on: true },
       })
-      send({ method: 'wallet_getChains', id: 14, jsonrpc: '2.0' }, response => {
+      send({ method: 'wallet_getChains', id: 14, jsonrpc: '2.0' }, (response) => {
         expect(response.error).toBe(undefined)
         expect(response.id).toBe(14)
         expect(response.jsonrpc).toBe('2.0')
@@ -399,9 +439,9 @@ describe('#send', () => {
       store.set('main.networks.ethereum', {
         137: { name: 'polygon', id: 137, on: true },
         4: { name: 'rinkeby', id: 4, on: false },
-        1: { name: 'mainnet', id: 1, on: true }
+        1: { name: 'mainnet', id: 1, on: true },
       })
-      send({ method: 'wallet_getChainDetails', id: 14, jsonrpc: '2.0' }, response => {
+      send({ method: 'wallet_getChainDetails', id: 14, jsonrpc: '2.0' }, (response) => {
         expect(response.error).toBe(undefined)
         expect(response.id).toBe(14)
         expect(response.jsonrpc).toBe('2.0')
@@ -422,7 +462,7 @@ describe('#send', () => {
         symbol: 'BADGER',
         balance: '0x1605d9ee98627100000',
         decimals: 18,
-        displayBalance: '6500'
+        displayBalance: '6500',
       },
       {
         address: '0x383518188c0c6d7730d91b2c03a03c837814a899',
@@ -431,7 +471,7 @@ describe('#send', () => {
         symbol: 'OHM',
         balance: '0xd14d13208',
         decimals: 9,
-        displayBalance: '56.183829'
+        displayBalance: '56.183829',
       },
       {
         address: '0x0000000000000000000000000000000000000000',
@@ -440,8 +480,8 @@ describe('#send', () => {
         symbol: 'AETH',
         balance: '0xd8f8753a603f70000',
         decimals: 18,
-        displayBalance: '250.15'
-      }
+        displayBalance: '250.15',
+      },
     ]
 
     beforeEach(() => {
@@ -449,10 +489,10 @@ describe('#send', () => {
       store.set('main.balances', address, balances)
     })
 
-    it('returns an error if no account is selected', done => {
+    it('returns an error if no account is selected', (done) => {
       accounts.current.mockReturnValueOnce(undefined)
 
-      send({ method: 'wallet_getAssets', id: 21, jsonrpc: '2.0' }, response => {
+      send({ method: 'wallet_getAssets', id: 21, jsonrpc: '2.0' }, (response) => {
         expect(response.id).toBe(21)
         expect(response.jsonrpc).toBe('2.0')
         expect(response.result).toBe(undefined)
@@ -461,8 +501,8 @@ describe('#send', () => {
       })
     })
 
-    it('returns native currencies from all chains', done => {
-      send({ method: 'wallet_getAssets' }, response => {
+    it('returns native currencies from all chains', (done) => {
+      send({ method: 'wallet_getAssets' }, (response) => {
         expect(response.error).toBe(undefined)
         expect(response.result.nativeCurrency).toHaveLength(1)
 
@@ -472,8 +512,8 @@ describe('#send', () => {
       })
     })
 
-    it('returns erc20 tokens from all chains', done => {
-      send({ method: 'wallet_getAssets' }, response => {
+    it('returns erc20 tokens from all chains', (done) => {
+      send({ method: 'wallet_getAssets' }, (response) => {
         expect(response.error).toBe(undefined)
         expect(response.result.erc20).toHaveLength(2)
 
@@ -484,13 +524,13 @@ describe('#send', () => {
       })
     })
 
-    it('returns an error while scanning', done => {
+    it('returns an error while scanning', (done) => {
       const yesterday = new Date()
       yesterday.setDate(yesterday.getDate() - 1)
 
       store.set('main.accounts', address, 'balances.lastUpdated', yesterday)
 
-      send({ method: 'wallet_getAssets', id: 51, jsonrpc: '2.0' }, response => {
+      send({ method: 'wallet_getAssets', id: 51, jsonrpc: '2.0' }, (response) => {
         expect(response.id).toBe(51)
         expect(response.jsonrpc).toBe('2.0')
         expect(response.result).toBe(undefined)
@@ -503,7 +543,11 @@ describe('#send', () => {
   describe('#eth_getTransactionByHash', () => {
     const chain = 4
     const txHash = '0x06c1c968d4bd20c0ebfed34f6f34d8a5d189d9d2ce801f2ee8dd45dac32628d5'
-    const request = { method: 'eth_getTransactionByHash', params: [txHash], chainId: '0x' + chain.toString(16) }
+    const request = {
+      method: 'eth_getTransactionByHash',
+      params: [txHash],
+      chainId: '0x' + chain.toString(16),
+    }
 
     let blockResult
 
@@ -516,53 +560,53 @@ describe('#send', () => {
       })
     })
 
-    it('returns the response from the connection', done => {
+    it('returns the response from the connection', (done) => {
       blockResult = {
         blockHash: '0xc1b0227f0721a05357b2b417e3872c5f6f01da209422013fe66ee291527fb123',
-        blockNumber: '0xc80d08'
+        blockNumber: '0xc80d08',
       }
 
-      send(request, response => {
+      send(request, (response) => {
         expect(response.result.blockHash).toBe('0xc1b0227f0721a05357b2b417e3872c5f6f01da209422013fe66ee291527fb123')
         expect(response.result.blockNumber).toBe('0xc80d08')
         done()
       })
     })
 
-    it('uses maxFeePerGas as the gasPrice if one is not defined', done => {
+    it('uses maxFeePerGas as the gasPrice if one is not defined', (done) => {
       const fee = `0x${(10e9).toString(16)}`
 
       blockResult = {
-        maxFeePerGas: fee
+        maxFeePerGas: fee,
       }
 
-      send(request, response => {
+      send(request, (response) => {
         expect(response.result.gasPrice).toBe(fee)
         expect(response.result.maxFeePerGas).toBe(fee)
         done()
       })
     })
 
-    it('maintains the gasPrice if maxFeePerGas exists', done => {
+    it('maintains the gasPrice if maxFeePerGas exists', (done) => {
       const gasPrice = `0x${(8e9).toString(16)}`
       const maxFeePerGas = `0x${(10e9).toString(16)}`
 
       blockResult = {
         gasPrice,
-        maxFeePerGas
+        maxFeePerGas,
       }
 
-      send(request, response => {
+      send(request, (response) => {
         expect(response.result.gasPrice).toBe(gasPrice)
         expect(response.result.maxFeePerGas).toBe(maxFeePerGas)
         done()
       })
     })
 
-    it('returns a response with no result attribute', done => {
+    it('returns a response with no result attribute', (done) => {
       mockConnectionError('no transaction!')
 
-      send(request, response => {
+      send(request, (response) => {
         expect(response.error.message).toBe('no transaction!')
         done()
       })
@@ -577,7 +621,7 @@ describe('#send', () => {
         jsonrpc: '2.0',
         id: 7,
         method: 'eth_sendTransaction',
-        params: [tx]
+        params: [tx],
       }
 
       if (chainId) payload.chainId = chainId
@@ -592,40 +636,42 @@ describe('#send', () => {
         chainId: '0x1',
         gasLimit: weiToHex(21000),
         type: '0x1',
-        nonce: '0xa'
+        nonce: '0xa',
       }
 
       const chainIds = [1, 137]
 
-      chainIds.forEach(chainId => {
+      chainIds.forEach((chainId) => {
         store.set('main.networksMeta.ethereum', chainId, 'gas', {
           price: {
             selected: 'standard',
             levels: { slow: '', standard: '', fast: gweiToHex(30), asap: '', custom: '' },
             fees: {
               maxPriorityFeePerGas: gweiToHex(1),
-              maxBaseFeePerGas: gweiToHex(8)
-            }
-          }
+              maxBaseFeePerGas: gweiToHex(8),
+            },
+          },
         })
 
         connection.connections.ethereum[chainId] = {
-          chainConfig: chainConfig(chainId, chainId === 1 ? 'london' : 'istanbul')
+          chainConfig: chainConfig(chainId, chainId === 1 ? 'london' : 'istanbul'),
         }
       })
     })
 
-    it('rejects a transaction with a mismatched chain id', done => {
-      sendTransaction(response => {
+    it('rejects a transaction with a mismatched chain id', (done) => {
+      sendTransaction((response) => {
         try {
           expect(response.result).toBe(undefined)
           expect(response.error.message.toLowerCase()).toMatch(/does not match/)
           done()
-        } catch (e) { done(e) }
+        } catch (e) {
+          done(e)
+        }
       }, '0x4')
     })
 
-    it('populates the transaction with the request chain id if not provided in the transaction', done => {
+    it('populates the transaction with the request chain id if not provided in the transaction', (done) => {
       delete tx.chainId
 
       sendTransaction(() => {
@@ -633,11 +679,13 @@ describe('#send', () => {
           const initialRequest = accountRequests[0]
           expect(initialRequest.data.chainId).toBe('0x89')
           done()
-        } catch (e) { done(e) }
+        } catch (e) {
+          done(e)
+        }
       }, '0x89')
     })
 
-    it('maintains transaction chain id if no target chain provided with the request', done => {
+    it('maintains transaction chain id if no target chain provided with the request', (done) => {
       tx.chainId = '0x89'
 
       sendTransaction(() => {
@@ -645,11 +693,13 @@ describe('#send', () => {
           const initialRequest = accountRequests[0]
           expect(initialRequest.data.chainId).toBe('0x89')
           done()
-        } catch (e) { done(e) }
+        } catch (e) {
+          done(e)
+        }
       })
     })
 
-    it('pads the gas estimate from the network by 50 percent', done => {
+    it('pads the gas estimate from the network by 50 percent', (done) => {
       connection.send.mockImplementationOnce((payload, cb) => {
         expect(payload.method).toBe('eth_estimateGas')
         cb({ result: addHexPrefix((150000).toString(16)) })
@@ -662,7 +712,9 @@ describe('#send', () => {
           const initialRequest = accountRequests[0]
           expect(initialRequest.data.gasLimit).toBe(addHexPrefix((225000).toString(16)))
           done()
-        } catch (e) { done(e) }
+        } catch (e) {
+          done(e)
+        }
       })
     })
 
@@ -670,25 +722,25 @@ describe('#send', () => {
       beforeEach(() => {
         const chainIds = [1, 137]
 
-        chainIds.forEach(chainId => {
+        chainIds.forEach((chainId) => {
           store.set('main.networksMeta.ethereum', chainId, 'gas', {
             price: {
               selected: 'standard',
               levels: { slow: '', standard: '', fast: gweiToHex(30), asap: '', custom: '' },
               fees: {
                 maxPriorityFeePerGas: gweiToHex(1),
-                maxBaseFeePerGas: gweiToHex(8)
-              }
-            }
+                maxBaseFeePerGas: gweiToHex(8),
+              },
+            },
           })
 
           connection.connections.ethereum[chainId] = {
-            chainConfig: chainConfig(chainId, chainId === 1 ? 'london' : 'istanbul')
+            chainConfig: chainConfig(chainId, chainId === 1 ? 'london' : 'istanbul'),
           }
         })
       })
-      
-      it('adds a 10% gas buffer when replacing a legacy transaction', done => {
+
+      it('adds a 10% gas buffer when replacing a legacy transaction', (done) => {
         tx.type = '0x0'
         tx.chainId = addHexPrefix((137).toString(16))
 
@@ -696,12 +748,12 @@ describe('#send', () => {
           sendTransaction(() => {
             const initialRequest = accountRequests[0]
             const initialPrice = initialRequest.data.gasPrice
-    
+
             expect(initialPrice).toBe(gweiToHex(30))
             expect(initialRequest.feesUpdatedByUser).toBeFalsy()
-    
+
             initialRequest.mode = 'monitor'
-    
+
             sendTransaction(() => {
               const replacementRequest = accountRequests[1]
               const bumpedPrice = Math.ceil(initialPrice * 1.1)
@@ -711,11 +763,11 @@ describe('#send', () => {
             })
           })
         } catch (e) {
-         done(e) 
+          done(e)
         }
       })
-      
-      it('does not add a buffer to replacement legacy transactions if the current gas price is already higher', done => {
+
+      it('does not add a buffer to replacement legacy transactions if the current gas price is already higher', (done) => {
         tx.type = '0x0'
         tx.chainId = addHexPrefix((137).toString(16))
 
@@ -723,23 +775,23 @@ describe('#send', () => {
           sendTransaction(() => {
             const initialRequest = accountRequests[0]
             const initialPrice = initialRequest.data.gasPrice
-    
+
             expect(initialPrice).toBe(gweiToHex(30))
             expect(initialRequest.feesUpdatedByUser).toBeFalsy()
-    
+
             initialRequest.mode = 'monitor'
-    
+
             store.set('main.networksMeta.ethereum', 137, 'gas', {
               price: {
                 selected: 'standard',
                 levels: { slow: '', standard: '', fast: gweiToHex(40), asap: '', custom: '' },
                 fees: {
                   maxPriorityFeePerGas: gweiToHex(1),
-                  maxBaseFeePerGas: gweiToHex(8)
-                }
-              }
+                  maxBaseFeePerGas: gweiToHex(8),
+                },
+              },
             })
-            
+
             sendTransaction(() => {
               const replacementRequest = accountRequests[1]
               expect(replacementRequest.data.gasPrice).toBe(gweiToHex(40))
@@ -748,11 +800,11 @@ describe('#send', () => {
             })
           })
         } catch (e) {
-         done(e)
+          done(e)
         }
       })
-  
-      it('adds a 10% gas buffer when replacing an EIP-1559 transaction', done => {
+
+      it('adds a 10% gas buffer when replacing an EIP-1559 transaction', (done) => {
         tx.type = '0x2'
         tx.chainId = addHexPrefix((1).toString(16))
 
@@ -761,7 +813,7 @@ describe('#send', () => {
             const initialRequest = accountRequests[0]
             const initialTip = initialRequest.data.maxPriorityFeePerGas
             const initialMax = initialRequest.data.maxFeePerGas
-    
+
             expect(initialTip).toBe(gweiToHex(1))
             expect(initialMax).toBe(gweiToHex(9))
             expect(initialRequest.feesUpdatedByUser).toBeFalsy()
@@ -773,7 +825,7 @@ describe('#send', () => {
               const bumpedFee = Math.ceil(initialTip * 1.1)
               const bumpedBase = Math.ceil((initialMax - initialTip) * 1.1)
               const bumpedMax = bumpedFee + bumpedBase
-    
+
               expect(replacementRequest.data.maxPriorityFeePerGas).toBe(weiToHex(bumpedFee))
               expect(replacementRequest.data.maxFeePerGas).toBe(weiToHex(bumpedMax))
               expect(replacementRequest.feesUpdatedByUser).toBe(true)
@@ -781,11 +833,11 @@ describe('#send', () => {
             })
           })
         } catch (e) {
-         done(e) 
+          done(e)
         }
       })
-      
-      it('buffers only the priority fee for replacement EIP-1559 transactions if the current base price is high enough for replacement', done => {
+
+      it('buffers only the priority fee for replacement EIP-1559 transactions if the current base price is high enough for replacement', (done) => {
         tx.type = '0x2'
         tx.chainId = addHexPrefix((1).toString(16))
 
@@ -794,11 +846,11 @@ describe('#send', () => {
             const initialRequest = accountRequests[0]
             const initialTip = initialRequest.data.maxPriorityFeePerGas
             const initialMax = initialRequest.data.maxFeePerGas
-    
+
             expect(initialTip).toBe(gweiToHex(1))
             expect(initialMax).toBe(gweiToHex(9))
             expect(initialRequest.feesUpdatedByUser).toBeFalsy()
-    
+
             initialRequest.mode = 'monitor'
 
             store.set('main.networksMeta.ethereum', 1, 'gas', {
@@ -807,26 +859,26 @@ describe('#send', () => {
                 levels: { slow: '', standard: '', fast: gweiToHex(40), asap: '', custom: '' },
                 fees: {
                   maxPriorityFeePerGas: gweiToHex(1),
-                  maxBaseFeePerGas: gweiToHex(20)
-                }
-              }
+                  maxBaseFeePerGas: gweiToHex(20),
+                },
+              },
             })
-    
+
             sendTransaction(() => {
               const replacementRequest = accountRequests[1]
               const bumpedFee = Math.ceil(initialTip * 1.1)
               expect(replacementRequest.data.maxPriorityFeePerGas).toBe(weiToHex(bumpedFee))
-              expect(replacementRequest.data.maxFeePerGas).toBe(weiToHex((20 * 1e9) + bumpedFee))
+              expect(replacementRequest.data.maxFeePerGas).toBe(weiToHex(20 * 1e9 + bumpedFee))
               expect(replacementRequest.feesUpdatedByUser).toBe(true)
               done()
             })
           })
         } catch (e) {
-         done(e)
+          done(e)
         }
       })
-      
-      it('does not add a buffer to replacement EIP-1559 transactions if the current gas price is already higher', done => {
+
+      it('does not add a buffer to replacement EIP-1559 transactions if the current gas price is already higher', (done) => {
         tx.type = '0x2'
         tx.chainId = addHexPrefix((1).toString(16))
 
@@ -835,11 +887,11 @@ describe('#send', () => {
             const initialRequest = accountRequests[0]
             const initialTip = initialRequest.data.maxPriorityFeePerGas
             const initialMax = initialRequest.data.maxFeePerGas
-    
+
             expect(initialTip).toBe(gweiToHex(1))
             expect(initialMax).toBe(gweiToHex(9))
             expect(initialRequest.feesUpdatedByUser).toBeFalsy()
-    
+
             initialRequest.mode = 'monitor'
             store.set('main.networksMeta.ethereum', 1, 'gas', {
               price: {
@@ -847,14 +899,14 @@ describe('#send', () => {
                 levels: { slow: '', standard: '', fast: gweiToHex(40), asap: '', custom: '' },
                 fees: {
                   maxPriorityFeePerGas: gweiToHex(2),
-                  maxBaseFeePerGas: gweiToHex(14)
-                }
-              }
+                  maxBaseFeePerGas: gweiToHex(14),
+                },
+              },
             })
-    
+
             sendTransaction(() => {
               const replacementRequest = accountRequests[1]
-    
+
               expect(replacementRequest.data.maxPriorityFeePerGas).toBe(gweiToHex(2))
               expect(replacementRequest.data.maxFeePerGas).toBe(gweiToHex(16))
               expect(replacementRequest.feesUpdatedByUser).toBeFalsy()
@@ -862,7 +914,7 @@ describe('#send', () => {
             })
           })
         } catch (e) {
-         done(e)
+          done(e)
         }
       })
     })
@@ -880,10 +932,10 @@ describe('#send', () => {
       expect(accountRequests[0].payload.params[1]).toEqual(message)
     })
 
-    it('does not submit a request from an account other than the current one', done => {
+    it('does not submit a request from an account other than the current one', (done) => {
       const params = ['0xa4581bfe76201f3aa147cce8e360140582260441', message]
 
-      send({ method: 'eth_sign', params }, err => {
+      send({ method: 'eth_sign', params }, (err) => {
         expect(err.error).toBeTruthy()
         done()
       })
@@ -911,10 +963,10 @@ describe('#send', () => {
       expect(accountRequests[0].payload.params[1]).toEqual(message)
     })
 
-    it('does not submit a request from an account other than the current one', done => {
+    it('does not submit a request from an account other than the current one', (done) => {
       const params = [message, '0xa4581bfe76201f3aa147cce8e360140582260441']
 
-      send({ method: 'personal_sign', params }, err => {
+      send({ method: 'personal_sign', params }, (err) => {
         expect(err.error).toBeTruthy()
         done()
       })
@@ -924,13 +976,13 @@ describe('#send', () => {
   describe('#eth_signTypedData', () => {
     const typedData = {
       types: {
-          EIP712Domain: 'domain',
-          Bid: 'bid',
-          Identity: 'identity',
+        EIP712Domain: 'domain',
+        Bid: 'bid',
+        Identity: 'identity',
       },
       domain: 'domainData',
       primaryType: 'Bid',
-      message: 'message'
+      message: 'message',
     }
 
     const validRequests = [
@@ -938,21 +990,21 @@ describe('#send', () => {
       { method: 'eth_signTypedData', params: [typedData, address], version: 'V1' },
       { method: 'eth_signTypedData_v1', params: [typedData, address], version: 'V1' },
       { method: 'eth_signTypedData_v3', params: [address, typedData], version: 'V3' },
-      { method: 'eth_signTypedData_v4', params: [address, typedData], version: 'V4' }
+      { method: 'eth_signTypedData_v4', params: [address, typedData], version: 'V4' },
     ]
 
-    function verifyRequest (version) {
+    function verifyRequest(version) {
       expect(accountRequests).toHaveLength(1)
       expect(accountRequests[0].handlerId).toBeTruthy()
       expect(accountRequests[0].payload.params[0]).toBe(address)
       expect(accountRequests[0].payload.params[1]).toEqual(typedData)
       expect(accountRequests[0].version).toBe(version)
     }
-    
+
     validRequests.forEach(({ method, params, version }) => {
       it(`submits a ${method} request to sign typed data`, () => {
         send({ method, params })
-  
+
         verifyRequest(version)
       })
     })
@@ -965,20 +1017,20 @@ describe('#send', () => {
       verifyRequest('V1')
     })
 
-    it('does not submit a request from an unknown account', done => {
+    it('does not submit a request from an unknown account', (done) => {
       const params = ['0xa4581bfe76201f3aa147cce8e360140582260441', typedData]
 
-      send({ method: 'eth_signTypedData_v3', params }, err => {
+      send({ method: 'eth_signTypedData_v3', params }, (err) => {
         expect(err.error.message).toBeTruthy()
         expect(err.error.code).toBe(-1)
         done()
       })
     })
 
-    it('does not submit a request with malformed type data', done => {
+    it('does not submit a request with malformed type data', (done) => {
       const params = [address, 'test']
 
-      send({ method: 'eth_signTypedData_v3', params }, err => {
+      send({ method: 'eth_signTypedData_v3', params }, (err) => {
         expect(err.error.message).toBeTruthy()
         expect(err.error.code).toBe(-1)
         done()
@@ -988,15 +1040,15 @@ describe('#send', () => {
     // these signers only support V4+
     const hardwareSigners = [SignerType.Ledger, SignerType.Lattice, SignerType.Trezor]
 
-    hardwareSigners.forEach(signerType => {
-      it(`does not submit a V3 request to a ${signerType}`, done => {
-        accounts.get.mockImplementationOnce(addr => {
+    hardwareSigners.forEach((signerType) => {
+      it(`does not submit a V3 request to a ${signerType}`, (done) => {
+        accounts.get.mockImplementationOnce((addr) => {
           return addr === address ? { address, lastSignerType: signerType } : {}
         })
 
         const params = [address, typedData]
 
-        send({ method: 'eth_signTypedData_v3', params }, err => {
+        send({ method: 'eth_signTypedData_v3', params }, (err) => {
           expect(err.error.message).toMatch(new RegExp(signerType, 'i'))
           expect(err.error.code).toBe(-1)
           done()
@@ -1006,13 +1058,13 @@ describe('#send', () => {
 
     const unknownVersions = ['_v5', '_v1.1', 'v3']
 
-    unknownVersions.forEach(versionExtension => {
-      it(`passes a request with unhandled method eth_signTypedData${versionExtension} through to the connection`, done => {
+    unknownVersions.forEach((versionExtension) => {
+      it(`passes a request with unhandled method eth_signTypedData${versionExtension} through to the connection`, (done) => {
         mockConnectionError('received unhandled request')
-  
+
         const params = [address, 'test']
-  
-        send({ method: `eth_signTypedData${versionExtension}`, params }, err => {
+
+        send({ method: `eth_signTypedData${versionExtension}`, params }, (err) => {
           expect(err.error.message).toBe('received unhandled request')
           done()
         })
@@ -1024,11 +1076,12 @@ describe('#send', () => {
     const eventTypes = ['accountsChanged', 'chainChanged', 'chainsChanged', 'networkChanged']
 
     describe('#eth_subscribe', () => {
-      const subscribe = (eventType, cb) => send({ id: 9, jsonrpc: '2.0', method: 'eth_subscribe', params: [eventType] }, cb)
+      const subscribe = (eventType, cb) =>
+        send({ id: 9, jsonrpc: '2.0', method: 'eth_subscribe', params: [eventType] }, cb)
 
-      eventTypes.forEach(eventType => {
+      eventTypes.forEach((eventType) => {
         it(`subscribes to ${eventType} events`, () => {
-          subscribe(eventType, response => {
+          subscribe(eventType, (response) => {
             expect(response.id).toBe(9)
             expect(response.jsonrpc).toBe('2.0')
             expect(response.error).toBe(undefined)
@@ -1041,8 +1094,8 @@ describe('#send', () => {
 
       it('returns an error from the node if attempting to unsubscribe to an unknown event', () => {
         mockConnectionError('unknown event!')
-  
-        subscribe('everythingChanged', response => {
+
+        subscribe('everythingChanged', (response) => {
           expect(response.id).toBe(9)
           expect(response.jsonrpc).toBe('2.0')
           expect(response.error.message).toBe('unknown event!')
@@ -1053,13 +1106,13 @@ describe('#send', () => {
 
     describe('#eth_unsubscribe', () => {
       const unsubscribe = (id, cb) => send({ id: 8, jsonrpc: '2.0', method: 'eth_unsubscribe', params: [id] }, cb)
-  
-      eventTypes.forEach(eventType => {
+
+      eventTypes.forEach((eventType) => {
         it(`unsubscribes from ${eventType} events`, () => {
           const subId = '0x1acc2933618a0ff548f03b1c99420366'
           provider.subscriptions[eventType] = [subId]
-  
-          unsubscribe(subId, response => {
+
+          unsubscribe(subId, (response) => {
             expect(response.id).toBe(8)
             expect(response.jsonrpc).toBe('2.0')
             expect(response.error).toBe(undefined)
@@ -1068,22 +1121,22 @@ describe('#send', () => {
           })
         })
       })
-  
+
       it('returns an error from the node if attempting to unsubscribe from an unknown subscription', () => {
         mockConnectionError('unknown subscription!')
-  
+
         provider.subscriptions.accountsChanged = ['0xtest1']
         provider.subscriptions.chainChanged = ['0xtest2']
         provider.subscriptions.chainsChanged = ['0xtest2']
         provider.subscriptions.networkChanged = ['0xtest3']
-  
-        unsubscribe('0xanothersub', response => {
+
+        unsubscribe('0xanothersub', (response) => {
           expect(response.id).toBe(8)
           expect(response.jsonrpc).toBe('2.0')
           expect(response.error.message).toBe('unknown subscription!')
           expect(response.result).toBe(undefined)
 
-          eventTypes.forEach(eventType => {
+          eventTypes.forEach((eventType) => {
             expect(provider.subscriptions[eventType]).toHaveLength(1)
           })
         })
@@ -1093,7 +1146,8 @@ describe('#send', () => {
 })
 
 describe('#signAndSend', () => {
-  let tx = {}, request = {}
+  let tx = {},
+    request = {}
 
   const signAndSend = (cb = jest.fn()) => provider.signAndSend(request, cb)
 
@@ -1103,11 +1157,11 @@ describe('#signAndSend', () => {
     request = {
       handlerId: 99,
       payload: { jsonrpc: '2.0', id: 2, method: 'eth_sendTransaction' },
-      data: tx
+      data: tx,
     }
   })
 
-  it('allows a Fantom transaction with fees over the mainnet hard limit', done => {
+  it('allows a Fantom transaction with fees over the mainnet hard limit', (done) => {
     // 200 gwei * 10M gas = 2 FTM
     tx.chainId = '0xfa'
     tx.type = '0x0'
@@ -1118,34 +1172,38 @@ describe('#signAndSend', () => {
 
     signAndSend(done)
   })
-  
-  it('does not allow a pre-EIP-1559 transaction with fees that exceeds the hard limit', done => {
+
+  it('does not allow a pre-EIP-1559 transaction with fees that exceeds the hard limit', (done) => {
     // 200 gwei * 10M gas = 2 ETH
     tx.chainId = '0x1'
     tx.type = '0x0'
     tx.gasPrice = utils.parseUnits('210', 'gwei').toHexString()
     tx.gasLimit = addHexPrefix((1e7).toString(16))
 
-    signAndSend(err => {
+    signAndSend((err) => {
       try {
         expect(err.message).toMatch(/over hard limit/)
         done()
-      } catch (e) { done(e) }
+      } catch (e) {
+        done(e)
+      }
     })
   })
-  
-  it('does not allow a post-EIP-1559 transaction with fees that exceed the hard limit', done => {
+
+  it('does not allow a post-EIP-1559 transaction with fees that exceed the hard limit', (done) => {
     // 200 gwei * 10M gas = 2 ETH
     tx.chainId = '0x1'
     tx.type = '0x2'
     tx.maxFeePerGas = utils.parseUnits('210', 'gwei').toHexString()
     tx.gasLimit = addHexPrefix((1e7).toString(16))
 
-    signAndSend(err => {
+    signAndSend((err) => {
       try {
         expect(err.message).toMatch(/over hard limit/)
         done()
-      } catch (e) { done(e) }
+      } catch (e) {
+        done(e)
+      }
     })
   })
 
@@ -1164,32 +1222,38 @@ describe('#signAndSend', () => {
     describe('success', () => {
       beforeEach(() => {
         connection.send.mockImplementation((payload, cb) => {
-          expect(payload).toEqual(expect.objectContaining({
-            id: request.payload.id,
-            method: 'eth_sendRawTransaction',
-            params: [signedTx]
-          }))
-          
+          expect(payload).toEqual(
+            expect.objectContaining({
+              id: request.payload.id,
+              method: 'eth_sendRawTransaction',
+              params: [signedTx],
+            })
+          )
+
           cb({ result: txHash })
         })
       })
 
-      it('sends a successfully signed transaction', done => {
+      it('sends a successfully signed transaction', (done) => {
         signAndSend((err, result) => {
           try {
             expect(err).toBe(null)
             expect(result).toBe(txHash)
             done()
-          } catch (e) { done(e) }
+          } catch (e) {
+            done(e)
+          }
         })
       })
 
-      it('responds to a successful transaction request with the transaction hash result', done => {
-        provider.handlers[request.handlerId] = response => {
+      it('responds to a successful transaction request with the transaction hash result', (done) => {
+        provider.handlers[request.handlerId] = (response) => {
           try {
             expect(response.result).toBe(txHash)
             done()
-          } catch (e) { done(e) }
+          } catch (e) {
+            done(e)
+          }
         }
 
         signAndSend()
@@ -1203,15 +1267,15 @@ describe('#signAndSend', () => {
         mockConnectionError(errorMessage)
       })
 
-      it('handles a transaction send failure', done => {
-        signAndSend(err => {
+      it('handles a transaction send failure', (done) => {
+        signAndSend((err) => {
           expect(err.message).toBe(errorMessage)
           done()
         })
       })
 
-      it('responds to a failed transaction request with the payload', done => {
-        provider.handlers[request.handlerId] = err => {
+      it('responds to a failed transaction request with the payload', (done) => {
+        provider.handlers[request.handlerId] = (err) => {
           expect(err.id).toBe(request.payload.id)
           expect(err.jsonrpc).toBe(request.payload.jsonrpc)
           expect(err.error.message).toBe(errorMessage)
@@ -1226,7 +1290,9 @@ describe('#signAndSend', () => {
 
 describe('state change events', () => {
   beforeEach(() => {
-    store.set('main.origins', '8073729a-5e59-53b7-9e69-5d9bcff94087', { chain: { id: 1, type: 'ethereum' }})
+    store.set('main.origins', '8073729a-5e59-53b7-9e69-5d9bcff94087', {
+      chain: { id: 1, type: 'ethereum' },
+    })
     store.getObserver('provider:chains').fire()
   })
 
@@ -1235,9 +1301,9 @@ describe('state change events', () => {
       provider.subscriptions.chainChanged = []
     })
 
-    it('fires a chainChanged event to subscribers', done => {
+    it('fires a chainChanged event to subscribers', (done) => {
       const subscriptionId = '0x9509a964a8d24a17fcfc7b77fc575b71'
-      provider.once('data', event => {
+      provider.once('data', (event) => {
         expect(event.method).toBe('eth_subscription')
         expect(event.jsonrpc).toBe('2.0')
         expect(event.params.subscription).toBe(subscriptionId)
@@ -1247,7 +1313,9 @@ describe('state change events', () => {
 
       provider.subscriptions.chainChanged.push(subscriptionId)
 
-      store.set('main.origins', '8073729a-5e59-53b7-9e69-5d9bcff94087', { chain: { id: 137, type: 'ethereum' }})
+      store.set('main.origins', '8073729a-5e59-53b7-9e69-5d9bcff94087', {
+        chain: { id: 137, type: 'ethereum' },
+      })
       store.getObserver('provider:chains').fire()
     })
   })
@@ -1257,18 +1325,18 @@ describe('state change events', () => {
       1: {
         name: 'test',
         id: 1,
-        on: true
+        on: true,
       },
       4: {
         name: 'rinkeby',
         id: 4,
-        on: true
+        on: true,
       },
       10: {
         name: 'optimism',
         id: 10,
-        on: false
-      }
+        on: false,
+      },
     }
 
     beforeEach(() => {
@@ -1278,10 +1346,10 @@ describe('state change events', () => {
       store.getObserver('provider:chains').fire()
     })
 
-    it('fires a chainsChanged event when a chain is added', done => {
+    it('fires a chainsChanged event when a chain is added', (done) => {
       const subscriptionId = '0x9509a964a8d24a17fcfc7b77fc575b71'
 
-      provider.once('data', event => {
+      provider.once('data', (event) => {
         expect(event.method).toBe('eth_subscription')
         expect(event.jsonrpc).toBe('2.0')
         expect(event.params.subscription).toBe(subscriptionId)
@@ -1292,7 +1360,7 @@ describe('state change events', () => {
       const polygon = {
         name: 'polygon',
         id: 137,
-        on: true
+        on: true,
       }
 
       provider.subscriptions.chainsChanged.push(subscriptionId)
@@ -1301,10 +1369,10 @@ describe('state change events', () => {
       store.getObserver('provider:chains').fire()
     })
 
-    it('fires a chainsChanged event when a chain is removed', done => {
+    it('fires a chainsChanged event when a chain is removed', (done) => {
       const subscriptionId = '0x9509a964a8d24a17fcfc7b77fc575b71'
 
-      provider.once('data', event => {
+      provider.once('data', (event) => {
         expect(event.method).toBe('eth_subscription')
         expect(event.jsonrpc).toBe('2.0')
         expect(event.params.subscription).toBe(subscriptionId)
@@ -1318,10 +1386,10 @@ describe('state change events', () => {
       store.getObserver('provider:chains').fire()
     })
 
-    it('fires a chainsChanged event when a chain connection is turned off', done => {
+    it('fires a chainsChanged event when a chain connection is turned off', (done) => {
       const subscriptionId = '0x9509a964a8d24a17fcfc7b77fc575b71'
 
-      provider.once('data', event => {
+      provider.once('data', (event) => {
         expect(event.method).toBe('eth_subscription')
         expect(event.jsonrpc).toBe('2.0')
         expect(event.params.subscription).toBe(subscriptionId)
@@ -1336,10 +1404,10 @@ describe('state change events', () => {
       store.getObserver('provider:chains').fire()
     })
 
-    it('fires a chainsChanged event when a chain connection is turned off', done => {
+    it('fires a chainsChanged event when a chain connection is turned off', (done) => {
       const subscriptionId = '0x9509a964a8d24a17fcfc7b77fc575b71'
 
-      provider.once('data', event => {
+      provider.once('data', (event) => {
         expect(event.method).toBe('eth_subscription')
         expect(event.jsonrpc).toBe('2.0')
         expect(event.params.subscription).toBe(subscriptionId)
@@ -1367,12 +1435,12 @@ describe('state change events', () => {
       provider.removeAllListeners('data:address')
     })
 
-    it('fires an assetsChanged event when native currency assets are present', done => {
+    it('fires an assetsChanged event when native currency assets are present', (done) => {
       const balance = {
         symbol: 'ETH',
         balance: '0xe7',
         address: '0x0000000000000000000000000000000000000000',
-        chainId: 1
+        chainId: 1,
       }
 
       store.set('main.balances', account, [balance])
@@ -1380,7 +1448,7 @@ describe('state change events', () => {
       const priceData = { usd: { price: 3815.91 } }
       store.set('main.networksMeta.ethereum.1.nativeCurrency', priceData)
 
-      provider.once('data:address', ((accountId, event) => {
+      provider.once('data:address', (accountId, event) => {
         expect(accountId).toBe(account)
         expect(event.method).toBe('eth_subscription')
         expect(event.jsonrpc).toBe('2.0')
@@ -1388,22 +1456,22 @@ describe('state change events', () => {
         expect(event.params.result).toEqual({
           account,
           nativeCurrency: [{ ...balance, currencyInfo: priceData }],
-          erc20: []
+          erc20: [],
         })
 
         done()
-      }))
+      })
 
       store.set('selected.current', account)
       store.getObserver('provider:account').fire()
       jest.advanceTimersByTime(800)
     })
 
-    it('fires an assetsChanged event when erc20 assets are present', done => {
+    it('fires an assetsChanged event when erc20 assets are present', (done) => {
       const balance = {
         symbol: 'OHM',
         balance: '0x606401fc9',
-        address: '0x383518188c0c6d7730d91b2c03a03c837814a899'
+        address: '0x383518188c0c6d7730d91b2c03a03c837814a899',
       }
 
       store.set('main.balances', account, [balance])
@@ -1411,7 +1479,7 @@ describe('state change events', () => {
       const priceData = { usd: { price: 225.35 } }
       store.set('main.rates', balance.address, priceData)
 
-      provider.once('data:address', ((accountId, event) => {
+      provider.once('data:address', (accountId, event) => {
         expect(accountId).toBe(account)
         expect(event.method).toBe('eth_subscription')
         expect(event.jsonrpc).toBe('2.0')
@@ -1419,11 +1487,11 @@ describe('state change events', () => {
         expect(event.params.result).toEqual({
           account,
           nativeCurrency: [],
-          erc20: [{ ...balance, tokenInfo: { lastKnownPrice: { ...priceData } } }]
+          erc20: [{ ...balance, tokenInfo: { lastKnownPrice: { ...priceData } } }],
         })
 
         done()
-      }))
+      })
 
       store.set('selected.current', account)
       store.getObserver('provider:account').fire()
@@ -1431,7 +1499,9 @@ describe('state change events', () => {
     })
 
     it('does not fire an assetsChanged event when no account is selected', () => {
-      provider.once('data:address', () => { throw new Error('event fired when no account selected!') })
+      provider.once('data:address', () => {
+        throw new Error('event fired when no account selected!')
+      })
 
       store.set('main.balances', account, [{ address: '0xany' }])
       store.set('selected.current', undefined)
@@ -1440,7 +1510,9 @@ describe('state change events', () => {
     })
 
     it('does not fire an assetsChanged event when no assets are present', () => {
-      provider.once('data:address', () => { throw new Error('event fired when account has no assets!') })
+      provider.once('data:address', () => {
+        throw new Error('event fired when account has no assets!')
+      })
 
       store.set('main.balances', account, [])
       store.set('selected.current', account)
@@ -1470,6 +1542,6 @@ describe('state change events', () => {
 
 // utility functions //
 
-function mockConnectionError (message) {
+function mockConnectionError(message) {
   connection.send.mockImplementation((p, cb) => cb({ id: p.id, jsonrpc: p.jsonrpc, error: { message, code: -1 } }))
 }
diff --git a/test/main/signers/Signer/derive.test.js b/test/main/signers/Signer/derive.test.js
index 4f838cdb8..3f697e4fa 100644
--- a/test/main/signers/Signer/derive.test.js
+++ b/test/main/signers/Signer/derive.test.js
@@ -18,7 +18,7 @@ describe('#getDerivationPath', () => {
 
     expect(path).toBe("44'/60'/0'/0")
   })
-  
+
   it('provides a standard derivation path with no index', () => {
     const path = getDerivationPath(Derivation.standard)
 
@@ -71,6 +71,5 @@ describe('#getDerivationPath', () => {
     const path = getDerivationPath(Derivation.live, 0)
 
     expect(path).toBe("44'/60'/0'/0/0")
-    
   })
 })
diff --git a/test/main/signers/hot/HotSigner/worker.test.js b/test/main/signers/hot/HotSigner/worker.test.js
index a10ad2077..9826fca8c 100644
--- a/test/main/signers/hot/HotSigner/worker.test.js
+++ b/test/main/signers/hot/HotSigner/worker.test.js
@@ -27,23 +27,68 @@ describe('#signTransaction', () => {
     data: '0x',
     gasLimit: '0x5208',
     type: '0x0',
-    gasPrice: '0xb2d05e00'
+    gasPrice: '0xb2d05e00',
   }
 
   const chains = [
-    { name: 'mainnet', chainId: 1, expectedSignature: '0xf8698084b2d05e0082520894be188d6641e8b680743a4815dfa0f6208038960f86b5e620f480008025a0c8ca5f76f568578bebbdfc257be09d8e8a4512d0ffd45e991da86be8141d97e0a037179047d9810e211657d9dd60d4bac66ed576fd65ef65a55f007314587036ec' },
-    { name: 'rinkeby', chainId: 4, expectedSignature: '0xf8698084b2d05e0082520894be188d6641e8b680743a4815dfa0f6208038960f86b5e620f48000802ca0c711e0a0f6881bb8a4b8fff57f2ddd7539a1f72acd59706b2e2765c16dc05155a0698f6af80657857a0e8ba47632995fbec987bc427abf88d1c1c65c80dd67c8b9' },
-    { name: 'goerli', chainId: 5, expectedSignature: '0xf8698084b2d05e0082520894be188d6641e8b680743a4815dfa0f6208038960f86b5e620f48000802da074c3b69fa979e92253c7f66d323f91f7f11eb16dd2b4838a274b584ddb708895a03e76e91351b2be3fd4a065195a0c71a4359d0fe4230f5f3ae457b2cb5a30bf03' },
-    { name: 'optimism', chainId: 10, expectedSignature: '0xf8698084b2d05e0082520894be188d6641e8b680743a4815dfa0f6208038960f86b5e620f480008024a0ac95e29896e43248e2e91cbedb4fb367c3a4bf3100ac55ebf914ed8582f4e189a0240abc49b1178721a08cba8c95aea43f2a6daf2da34f7c9641fc1de253edada8' },
-    { name: 'optimistic kovan', chainId: 69, expectedSignature: '0xf8698084b2d05e0082520894be188d6641e8b680743a4815dfa0f6208038960f86b5e620f48000807ea08e096de4291afc19b88e46fa0bfb4e9d5a1073fb9e9534f7c0cb89ff81641a1ba05b357d98228466f265b4e782b80d78baba244af2fb335b77754a82fff471a0a4' },
-    { name: 'xdai', chainId: 100, expectedSignature: '0xf86a8084b2d05e0082520894be188d6641e8b680743a4815dfa0f6208038960f86b5e620f480008081a3a0de2c8b5a1ecccdb10fe7e524ff751cd15c8f93284c7cbb7de2a13a0e481bac83a01260a408c58b7d783be08fe6d073b5390581225ec48e8b9fafe97ce096870c89' },
-    { name: 'polygon', chainId: 137, expectedSignature: '0xf86a8084b2d05e0082520894be188d6641e8b680743a4815dfa0f6208038960f86b5e620f480008081d5a0d62d318003814f6ba963495353111d6923207ba972b539c49d89ad06a9062f2da00ff0ec849d44a6768262fafb040e343e2d2472c4eee8c833eacb2321038c7737' },
-    { name: 'arbitrum', chainId: 42161, expectedSignature: '0xf8698084b2d05e0082520894be188d6641e8b680743a4815dfa0f6208038960f86b5e620f480008024a0ac95e29896e43248e2e91cbedb4fb367c3a4bf3100ac55ebf914ed8582f4e189a0240abc49b1178721a08cba8c95aea43f2a6daf2da34f7c9641fc1de253edada8' },
-    { name: 'polygon-mumbai', chainId: 80001, expectedSignature: '0xf86b8084b2d05e0082520894be188d6641e8b680743a4815dfa0f6208038960f86b5e620f4800080826c95a0202d3b445db101e46ed9f91c6849117efa00a98fb52da4612d2790de1e1f6749a01a050bcb2819efe1bfd1276aa1fcc7ee66cd700a52f261cabb376f4e75d660be' }
+    {
+      name: 'mainnet',
+      chainId: 1,
+      expectedSignature:
+        '0xf8698084b2d05e0082520894be188d6641e8b680743a4815dfa0f6208038960f86b5e620f480008025a0c8ca5f76f568578bebbdfc257be09d8e8a4512d0ffd45e991da86be8141d97e0a037179047d9810e211657d9dd60d4bac66ed576fd65ef65a55f007314587036ec',
+    },
+    {
+      name: 'rinkeby',
+      chainId: 4,
+      expectedSignature:
+        '0xf8698084b2d05e0082520894be188d6641e8b680743a4815dfa0f6208038960f86b5e620f48000802ca0c711e0a0f6881bb8a4b8fff57f2ddd7539a1f72acd59706b2e2765c16dc05155a0698f6af80657857a0e8ba47632995fbec987bc427abf88d1c1c65c80dd67c8b9',
+    },
+    {
+      name: 'goerli',
+      chainId: 5,
+      expectedSignature:
+        '0xf8698084b2d05e0082520894be188d6641e8b680743a4815dfa0f6208038960f86b5e620f48000802da074c3b69fa979e92253c7f66d323f91f7f11eb16dd2b4838a274b584ddb708895a03e76e91351b2be3fd4a065195a0c71a4359d0fe4230f5f3ae457b2cb5a30bf03',
+    },
+    {
+      name: 'optimism',
+      chainId: 10,
+      expectedSignature:
+        '0xf8698084b2d05e0082520894be188d6641e8b680743a4815dfa0f6208038960f86b5e620f480008024a0ac95e29896e43248e2e91cbedb4fb367c3a4bf3100ac55ebf914ed8582f4e189a0240abc49b1178721a08cba8c95aea43f2a6daf2da34f7c9641fc1de253edada8',
+    },
+    {
+      name: 'optimistic kovan',
+      chainId: 69,
+      expectedSignature:
+        '0xf8698084b2d05e0082520894be188d6641e8b680743a4815dfa0f6208038960f86b5e620f48000807ea08e096de4291afc19b88e46fa0bfb4e9d5a1073fb9e9534f7c0cb89ff81641a1ba05b357d98228466f265b4e782b80d78baba244af2fb335b77754a82fff471a0a4',
+    },
+    {
+      name: 'xdai',
+      chainId: 100,
+      expectedSignature:
+        '0xf86a8084b2d05e0082520894be188d6641e8b680743a4815dfa0f6208038960f86b5e620f480008081a3a0de2c8b5a1ecccdb10fe7e524ff751cd15c8f93284c7cbb7de2a13a0e481bac83a01260a408c58b7d783be08fe6d073b5390581225ec48e8b9fafe97ce096870c89',
+    },
+    {
+      name: 'polygon',
+      chainId: 137,
+      expectedSignature:
+        '0xf86a8084b2d05e0082520894be188d6641e8b680743a4815dfa0f6208038960f86b5e620f480008081d5a0d62d318003814f6ba963495353111d6923207ba972b539c49d89ad06a9062f2da00ff0ec849d44a6768262fafb040e343e2d2472c4eee8c833eacb2321038c7737',
+    },
+    {
+      name: 'arbitrum',
+      chainId: 42161,
+      expectedSignature:
+        '0xf8698084b2d05e0082520894be188d6641e8b680743a4815dfa0f6208038960f86b5e620f480008024a0ac95e29896e43248e2e91cbedb4fb367c3a4bf3100ac55ebf914ed8582f4e189a0240abc49b1178721a08cba8c95aea43f2a6daf2da34f7c9641fc1de253edada8',
+    },
+    {
+      name: 'polygon-mumbai',
+      chainId: 80001,
+      expectedSignature:
+        '0xf86b8084b2d05e0082520894be188d6641e8b680743a4815dfa0f6208038960f86b5e620f4800080826c95a0202d3b445db101e46ed9f91c6849117efa00a98fb52da4612d2790de1e1f6749a01a050bcb2819efe1bfd1276aa1fcc7ee66cd700a52f261cabb376f4e75d660be',
+    },
   ]
 
-  chains.forEach(chain => {
-    it(`signs a transaction on ${chain.name}`, done => {
+  chains.forEach((chain) => {
+    it(`signs a transaction on ${chain.name}`, (done) => {
       const tx = { ...rawTx, chainId: chain.chainId.toString(16) }
 
       worker.signTransaction(key, tx, (err, signature) => {
@@ -51,19 +96,23 @@ describe('#signTransaction', () => {
           expect(err).toBe(null)
           expect(signature).toBe(chain.expectedSignature)
           done()
-        } catch (e) { done(e) }
+        } catch (e) {
+          done(e)
+        }
       })
     }, 200)
   })
 
-  it('rejects a transaction with an unknown chain id', done => {
+  it('rejects a transaction with an unknown chain id', (done) => {
     const { chainId, ...tx } = rawTx
 
-    worker.signTransaction(key, tx, err => {
+    worker.signTransaction(key, tx, (err) => {
       try {
         expect(err).toBe('could not determine chain id for transaction')
         done()
-      } catch (e) { done(e) }
+      } catch (e) {
+        done(e)
+      }
     })
   }, 200)
 })
diff --git a/test/main/signers/hot/RingSigner/index.test.js b/test/main/signers/hot/RingSigner/index.test.js
index 17e233dda..4a676d8f3 100644
--- a/test/main/signers/hot/RingSigner/index.test.js
+++ b/test/main/signers/hot/RingSigner/index.test.js
@@ -11,7 +11,11 @@ const SIGNER_PATH = path.resolve(__dirname, '../.userData/signers')
 const FILE_PATH = path.resolve(__dirname, 'keystore.json')
 
 jest.mock('electron')
-jest.mock('../../../../../compiled/main/store/persist', () => ({ get: jest.fn(), set: jest.fn(), queue: jest.fn() }))
+jest.mock('../../../../../compiled/main/store/persist', () => ({
+  get: jest.fn(),
+  set: jest.fn(),
+  queue: jest.fn(),
+}))
 jest.mock('../../../../../main/store/persist')
 
 // Stubs
@@ -43,31 +47,35 @@ describe('Ring signer', () => {
     log.transports.console.level = 'debug'
   })
 
-  test('Create from invalid private key', done => {
+  test('Create from invalid private key', (done) => {
     const privateKey = 'invalid key'
 
     try {
-      hot.createFromPrivateKey(signers, privateKey, PASSWORD, err => {
+      hot.createFromPrivateKey(signers, privateKey, PASSWORD, (err) => {
         expect(err).toBeTruthy()
         expect(store('main.signers')).toEqual({})
         done()
       })
-    } catch (e) { done(e) }
+    } catch (e) {
+      done(e)
+    }
   }, 1000)
 
-  test('Create from invalid keystore key', done => {
+  test('Create from invalid keystore key', (done) => {
     const keystore = { invalid: 'keystore' }
 
     try {
-      hot.createFromKeystore(signers, keystore, 'test', PASSWORD, err => {
+      hot.createFromKeystore(signers, keystore, 'test', PASSWORD, (err) => {
         expect(err).toBeTruthy()
         expect(store('main.signers')).toEqual({})
         done()
       })
-    } catch (e) { done(e) }
+    } catch (e) {
+      done(e)
+    }
   }, 2000)
 
-  test('Create from private key', done => {
+  test('Create from private key', (done) => {
     try {
       const privateKey = '0x' + crypto.randomBytes(32).toString('hex')
       hot.createFromPrivateKey(signers, privateKey, PASSWORD, (err, result) => {
@@ -79,10 +87,12 @@ describe('Ring signer', () => {
         expect(store(`main.signers.${signer.id}.id`)).toBe(signer.id)
         done()
       })
-    } catch (e) { done(e) }
+    } catch (e) {
+      done(e)
+    }
   }, 2000)
 
-  test('Scan for signers', done => {
+  test('Scan for signers', (done) => {
     jest.useFakeTimers()
 
     let count = 0
@@ -93,25 +103,29 @@ describe('Ring signer', () => {
           if (signer.type === 'ring') count++
           expect(count).toBe(1)
           done()
-        } catch (e) { done(e) }
+        } catch (e) {
+          done(e)
+        }
       },
-      exists: () => false
+      exists: () => false,
     }
 
     hot.scan(signers)
 
     jest.runAllTimers()
-  }, 800)
+  }, 1000)
 
-  test('Close signer', done => {
+  test('Close signer', (done) => {
     try {
       signer.close()
       expect(store(`main.signers.${signer.id}`)).toBe(undefined)
       done()
-    } catch (e) { done(e) }
+    } catch (e) {
+      done(e)
+    }
   })
 
-  test('Create from keystore', done => {
+  test('Create from keystore', (done) => {
     try {
       const file = fs.readFileSync(FILE_PATH, 'utf8')
       const keystore = JSON.parse(file)
@@ -127,71 +141,83 @@ describe('Ring signer', () => {
     }
   }, 2000)
 
-  test('Add private key', done => {
+  test('Add private key', (done) => {
     try {
       const privateKey = crypto.randomBytes(32).toString('hex')
-      signer.addPrivateKey(privateKey, PASSWORD, err => {
+      signer.addPrivateKey(privateKey, PASSWORD, (err) => {
         expect(err).toBe(null)
         expect(signer.addresses.length).toBe(2)
         done()
       })
-    } catch (e) { done(e) }
+    } catch (e) {
+      done(e)
+    }
   }, 2000)
 
-  test('Remove private key', done => {
+  test('Remove private key', (done) => {
     try {
       const secondAddress = signer.addresses[1]
-      signer.removePrivateKey(0, PASSWORD, err => {
+      signer.removePrivateKey(0, PASSWORD, (err) => {
         expect(err).toBe(null)
         expect(signer.addresses.length).toBe(1)
         expect(signer.addresses[0]).toEqual(secondAddress)
         done()
       })
-    } catch (e) { done(e) }
+    } catch (e) {
+      done(e)
+    }
   }, 2000)
 
-  test('Remove last private key', done => {
+  test('Remove last private key', (done) => {
     try {
-      signer.removePrivateKey(0, PASSWORD, err => {
+      signer.removePrivateKey(0, PASSWORD, (err) => {
         expect(err).toBe(null)
         done()
       })
-    } catch (e) { done(e) }
+    } catch (e) {
+      done(e)
+    }
   }, 1000)
 
-  test('Add private key from keystore', done => {
+  test('Add private key from keystore', (done) => {
     try {
       const file = fs.readFileSync(FILE_PATH, 'utf8')
       const keystore = JSON.parse(file)
       const previousLength = signer.addresses.length
 
-      signer.addKeystore(keystore, 'test', PASSWORD, err => {
+      signer.addKeystore(keystore, 'test', PASSWORD, (err) => {
         expect(err).toBe(null)
         expect(signer.addresses.length).toBe(previousLength + 1)
         done()
       })
-    } catch (e) { done(e) }
+    } catch (e) {
+      done(e)
+    }
   }, 2000)
 
-  test('Unlock with wrong password', done => {
+  test('Unlock with wrong password', (done) => {
     try {
-      signer.unlock('Wrong password', err => {
+      signer.unlock('Wrong password', (err) => {
         expect(err).toBeTruthy()
         done()
       })
-    } catch (e) { done(e) }
-  }, 500)
+    } catch (e) {
+      done(e)
+    }
+  }, 1000)
 
-  test('Unlock', done => {
+  test('Unlock', (done) => {
     try {
-      signer.unlock(PASSWORD, err => {
+      signer.unlock(PASSWORD, (err) => {
         expect(err).toBe(null)
         done()
       })
-    } catch (e) { done(e) }
-  }, 500)
+    } catch (e) {
+      done(e)
+    }
+  }, 2000)
 
-  test('Sign message', done => {
+  test('Sign message', (done) => {
     try {
       const message = '0x' + Buffer.from('test').toString('hex')
 
@@ -200,17 +226,19 @@ describe('Ring signer', () => {
         expect(result.length).toBe(132)
         done()
       })
-    } catch (e) { done(e) }
+    } catch (e) {
+      done(e)
+    }
   }, 500)
 
-  test('Sign transaction', done => {
+  test('Sign transaction', (done) => {
     const rawTx = {
       nonce: '0x6',
       gasPrice: '0x09184e72a000',
       gasLimit: '0x30000',
       to: '0xfa3caabc8eefec2b5e2895e5afbf79379e7268a7',
       value: '0x0',
-      chainId: '0x1'
+      chainId: '0x1',
     }
 
     try {
@@ -220,52 +248,64 @@ describe('Ring signer', () => {
         expect(result.slice(0, 2)).toBe('0x')
         done()
       })
-    } catch (e) { done(e) }
+    } catch (e) {
+      done(e)
+    }
   }, 500)
 
-  test('Verify address', done => {
+  test('Verify address', (done) => {
     try {
       signer.verifyAddress(0, signer.addresses[0], false, (err, result) => {
         expect(err).toBe(null)
         expect(result).toBe(true)
         done()
       })
-    } catch (e) { done(e) }
+    } catch (e) {
+      done(e)
+    }
   }, 500)
 
-  test('Verify wrong address', done => {
+  test('Verify wrong address', (done) => {
     try {
       signer.verifyAddress(0, '0xabcdef', false, (err, result) => {
         expect(err.message).toBe('Unable to verify address')
         expect(result).toBe(undefined)
         done()
       })
-    } catch (e) { done(e) }
+    } catch (e) {
+      done(e)
+    }
   }, 500)
 
-  test('Lock', done => {
+  test('Lock', (done) => {
     try {
-      signer.lock(err => {
+      signer.lock((err) => {
         expect(err).toBe(null)
         expect(signer.status).toBe('locked')
         done()
       })
-    } catch (e) { done(e) }
+    } catch (e) {
+      done(e)
+    }
   }, 2000)
 
-  test('Sign message when locked', done => {
+  test('Sign message when locked', (done) => {
     try {
-      signer.signMessage(0, 'test', err => {
+      signer.signMessage(0, 'test', (err) => {
         expect(err.message).toBe('Signer locked')
         done()
       })
-    } catch (e) { done(e) }
+    } catch (e) {
+      done(e)
+    }
   })
 
-  test('Close signer', done => {
+  test('Close signer', (done) => {
     try {
       signer.close()
       done()
-    } catch (e) { done(e) }
+    } catch (e) {
+      done(e)
+    }
   })
 })
diff --git a/test/main/signers/hot/SeedSigner/index.test.js b/test/main/signers/hot/SeedSigner/index.test.js
index 25769ad46..8ef1afb08 100644
--- a/test/main/signers/hot/SeedSigner/index.test.js
+++ b/test/main/signers/hot/SeedSigner/index.test.js
@@ -9,7 +9,11 @@ const PASSWORD = 'fr@///3_password'
 const SIGNER_PATH = path.resolve(__dirname, '../.userData/signers')
 
 jest.mock('electron')
-jest.mock('../../../../../compiled/main/store/persist', () => ({ get: jest.fn(), set: jest.fn(), queue: jest.fn() }))
+jest.mock('../../../../../compiled/main/store/persist', () => ({
+  get: jest.fn(),
+  set: jest.fn(),
+  queue: jest.fn(),
+}))
 jest.mock('../../../../../main/store/persist')
 
 // Stubs
@@ -45,12 +49,14 @@ describe('Seed signer', () => {
     const mnemonic = 'invalid mnemonic'
 
     try {
-      hot.createFromPhrase(signers, mnemonic, PASSWORD, err => {
+      hot.createFromPhrase(signers, mnemonic, PASSWORD, (err) => {
         expect(err).toBeTruthy()
         expect(store('main.signers')).toEqual({})
         done()
       })
-    } catch (e) { done(e) }
+    } catch (e) {
+      done(e)
+    }
   }, 1000)
 
   test('Create from phrase', (done) => {
@@ -64,8 +70,10 @@ describe('Seed signer', () => {
         expect(store(`main.signers.${signer.id}.id`)).toBe(signer.id)
         done()
       })
-    } catch (e) { done(e) }
-  }, 2000)
+    } catch (e) {
+      done(e)
+    }
+  }, 2500)
 
   test('Scan for signers', (done) => {
     jest.useFakeTimers()
@@ -78,32 +86,36 @@ describe('Seed signer', () => {
         expect(count).toBe(1)
         done()
       },
-      exists: () => false
+      exists: () => false,
     }
 
     hot.scan(signers)
 
     jest.runAllTimers()
-  }, 800)
+  }, 1000)
 
   test('Unlock with wrong password', (done) => {
     try {
-      signer.unlock('Wrong password', err => {
+      signer.unlock('Wrong password', (err) => {
         expect(err).toBeTruthy()
         expect(signer.status).toBe('locked')
         done()
       })
-    } catch (e) { done (e) }
+    } catch (e) {
+      done(e)
+    }
   }, 2000)
 
   test('Unlock', (done) => {
     try {
-      signer.unlock(PASSWORD, err => {
+      signer.unlock(PASSWORD, (err) => {
         expect(err).toBe(null)
         done()
       })
-    } catch (e) { done (e) }
-  }, 400)
+    } catch (e) {
+      done(e)
+    }
+  }, 500)
 
   test('Sign message', (done) => {
     try {
@@ -114,8 +126,10 @@ describe('Seed signer', () => {
         expect(result.length).toBe(132)
         done()
       })
-    } catch (e) { done(e) }
-  })
+    } catch (e) {
+      done(e)
+    }
+  }, 400)
 
   test('Sign transaction', (done) => {
     const rawTx = {
@@ -124,7 +138,7 @@ describe('Seed signer', () => {
       gasLimit: '0x30000',
       to: '0xfa3caabc8eefec2b5e2895e5afbf79379e7268a7',
       value: '0x0',
-      chainId: '0x1'
+      chainId: '0x1',
     }
 
     try {
@@ -134,7 +148,9 @@ describe('Seed signer', () => {
         expect(result.slice(0, 2)).toBe('0x')
         done()
       })
-    } catch (e) { done(e) }
+    } catch (e) {
+      done(e)
+    }
   }, 500)
 
   test('Verify address', (done) => {
@@ -144,7 +160,9 @@ describe('Seed signer', () => {
         expect(result).toBe(true)
         done()
       })
-    } catch (e) { done(e) }
+    } catch (e) {
+      done(e)
+    }
   }, 500)
 
   test('Verify wrong address', (done) => {
@@ -154,26 +172,32 @@ describe('Seed signer', () => {
         expect(result).toBe(undefined)
         done()
       })
-    } catch (e) { done(e) }
+    } catch (e) {
+      done(e)
+    }
   }, 500)
 
   test('Lock', (done) => {
     try {
-      signer.lock(err => {
+      signer.lock((err) => {
         expect(err).toBe(null)
         expect(signer.status).toBe('locked')
         done()
       })
-    } catch (e) { done(e) }
+    } catch (e) {
+      done(e)
+    }
   }, 2000)
 
   test('Sign message when locked', (done) => {
     try {
-      signer.signMessage(0, 'test', err => {
+      signer.signMessage(0, 'test', (err) => {
         expect(err.message).toBe('Signer locked')
         done()
       })
-    } catch (e) { done(e) }
+    } catch (e) {
+      done(e)
+    }
   })
 
   test('Close signer', (done) => {
@@ -181,6 +205,8 @@ describe('Seed signer', () => {
       signer.close()
       expect(store(`main.signers.${signer.id}`)).toBe(undefined)
       done()
-    } catch (e) { done(e) }
+    } catch (e) {
+      done(e)
+    }
   })
 })
diff --git a/test/main/signers/lattice/Lattice/index.test.js b/test/main/signers/lattice/Lattice/index.test.js
index efd772b38..a5f1e2f87 100644
--- a/test/main/signers/lattice/Lattice/index.test.js
+++ b/test/main/signers/lattice/Lattice/index.test.js
@@ -23,7 +23,7 @@ beforeEach(() => {
   lattice.on('error', jest.fn())
 })
 
-async function waitForNextPromise (fn, numPromisesInQueue = 1) {
+async function waitForNextPromise(fn, numPromisesInQueue = 1) {
   while (numPromisesInQueue > 0) {
     await Promise.resolve()
     numPromisesInQueue -= 1
@@ -35,7 +35,8 @@ async function waitForNextPromise (fn, numPromisesInQueue = 1) {
 }
 
 describe('#connect', () => {
-  const baseUrl = 'https://gridplus.io', privateKey = 'supersecretkey'
+  const baseUrl = 'https://gridplus.io',
+    privateKey = 'supersecretkey'
 
   let connectFn, pairingStatus
 
@@ -43,7 +44,7 @@ describe('#connect', () => {
     pairingStatus = false
     connectFn = jest.fn()
 
-    Client.mockImplementation(opts => {
+    Client.mockImplementation((opts) => {
       expect(opts.name).toBe('Frame-ABCXYZ')
       expect(opts.baseUrl).toBe('https://gridplus.io')
       expect(opts.privKey).toBe('supersecretkey')
@@ -51,11 +52,11 @@ describe('#connect', () => {
       return {
         connect: connectFn,
         getFwVersion: () => ({ major: 0, minor: 13, fix: 4 }),
-        getAppName: () => 'frame-test'
+        getAppName: () => 'frame-test',
       }
     })
 
-    connectFn.mockImplementation(async deviceId => {
+    connectFn.mockImplementation(async (deviceId) => {
       if (deviceId === 'L8geF2') {
         return pairingStatus
       }
@@ -64,12 +65,14 @@ describe('#connect', () => {
     })
   })
 
-  it('emits an update with connecting status', done => {
+  it('emits an update with connecting status', (done) => {
     lattice.once('update', () => {
       try {
         expect(lattice.status).toBe('connecting')
         done()
-      } catch (e) { done(e) }
+      } catch (e) {
+        done(e)
+      }
     })
 
     lattice.connect(baseUrl, privateKey)
@@ -83,7 +86,7 @@ describe('#connect', () => {
     expect(paired).toBe(false)
   })
 
-  it('emits an update if not yet paired', done => {
+  it('emits an update if not yet paired', (done) => {
     pairingStatus = false
 
     const stateFlow = []
@@ -95,26 +98,30 @@ describe('#connect', () => {
           expect(stateFlow[0]).toBe('connecting')
           expect(stateFlow[1]).toBe('pair')
           done()
-        } catch (e) { done(e) }
+        } catch (e) {
+          done(e)
+        }
       }
     })
 
     lattice.connect(baseUrl, privateKey)
   })
 
-  it('emits a connect event', done => {
+  it('emits a connect event', (done) => {
     pairingStatus = true
 
-    lattice.once('connect', paired => {
+    lattice.once('connect', (paired) => {
       try {
         expect(paired).toBe(true)
         done()
-      } catch (e) { done(e) }
+      } catch (e) {
+        done(e)
+      }
     })
 
     lattice.connect(baseUrl, privateKey)
   })
-  
+
   it('emits an error event when device is locked', async () => {
     connectFn.mockRejectedValue('Error from device: Device Locked')
 
@@ -125,10 +132,12 @@ describe('#connect', () => {
         try {
           expect(lattice.status).toBe('locked')
           resolve()
-        } catch (e) { reject(e) }
+        } catch (e) {
+          reject(e)
+        }
       })
     })
-    
+
     try {
       await lattice.connect(baseUrl, privateKey)
       throw 'should have failed to connect!'
@@ -138,7 +147,7 @@ describe('#connect', () => {
 
     return handler
   })
-  
+
   it('emits an error event when device returns invalid request', async () => {
     connectFn.mockRejectedValue('Error from device: Invalid Request')
 
@@ -149,10 +158,12 @@ describe('#connect', () => {
         try {
           expect(lattice.status.toLowerCase()).toMatch(/unknown device error/)
           resolve()
-        } catch (e) { reject(e) }
+        } catch (e) {
+          reject(e)
+        }
       })
     })
-      
+
     try {
       await lattice.connect(baseUrl, privateKey)
       throw 'should have failed to connect!'
@@ -169,7 +180,7 @@ describe('#connect', () => {
     expect(lattice.appVersion).toStrictEqual({
       major: 0,
       minor: 13,
-      patch: 4
+      patch: 4,
     })
   })
 })
@@ -179,30 +190,34 @@ describe('#pair', () => {
 
   beforeEach(() => {
     lattice.connection = {
-      pair: jest.fn(async code => {
+      pair: jest.fn(async (code) => {
         if (code === pairingCode) return true
         throw 'Error from device: Pairing failed'
-      })
+      }),
     }
   })
 
-  it('emits an update with pairing status', done => {
+  it('emits an update with pairing status', (done) => {
     lattice.once('update', () => {
       try {
         expect(lattice.status).toBe('Pairing')
         done()
-      } catch (e) { done(e) }
+      } catch (e) {
+        done(e)
+      }
     })
 
     lattice.pair(pairingCode)
   })
 
-  it('emits a paired event', done => {
-    lattice.once('paired', hasActiveWallet => {
+  it('emits a paired event', (done) => {
+    lattice.once('paired', (hasActiveWallet) => {
       try {
         expect(hasActiveWallet).toBe(true)
         done()
-      } catch (e) { done(e) }
+      } catch (e) {
+        done(e)
+      }
     })
 
     lattice.pair(pairingCode)
@@ -215,7 +230,7 @@ describe('#pair', () => {
 
     expect(hasActiveWallet).toBe(false)
   })
-  
+
   it('emits an error event on failure', async () => {
     const handler = new Promise((resolve, reject) => {
       lattice.once('paired', () => reject('should not be paired!'))
@@ -224,10 +239,12 @@ describe('#pair', () => {
         try {
           expect(lattice.status.toLowerCase()).toBe('pairing failed')
           resolve()
-        } catch (e) { reject(e) }
+        } catch (e) {
+          reject(e)
+        }
       })
     })
-      
+
     try {
       await lattice.pair('SDFJOSJD')
       throw 'should have failed to connect!'
@@ -246,9 +263,11 @@ describe('#deriveAddresses', () => {
 
     lattice.connection = {
       getAppName: () => 'frame-test',
-      getAddresses: jest.fn(async opts => {
-        return Array(opts.n).fill().map((_, i) => `addr${opts.startPath[4] + i}`)
-      })
+      getAddresses: jest.fn(async (opts) => {
+        return Array(opts.n)
+          .fill()
+          .map((_, i) => `addr${opts.startPath[4] + i}`)
+      }),
     }
   })
 
@@ -260,7 +279,7 @@ describe('#deriveAddresses', () => {
 
     expect(lattice.connection.getAddresses).toHaveBeenCalledWith(
       expect.objectContaining({
-        startPath: [0x80000000 + 44, 0x80000000 + 60, 0x80000000, 0, 0]
+        startPath: [0x80000000 + 44, 0x80000000 + 60, 0x80000000, 0, 0],
       })
     )
   })
@@ -275,7 +294,7 @@ describe('#deriveAddresses', () => {
 
     expect(lattice.connection.getAddresses).toHaveBeenCalledWith(
       expect.objectContaining({
-        startPath: [0x80000000 + 44, 0x80000000 + 60, 0x80000000, 5]
+        startPath: [0x80000000 + 44, 0x80000000 + 60, 0x80000000, 5],
       })
     )
   })
@@ -290,21 +309,24 @@ describe('#deriveAddresses', () => {
 
     expect(lattice.connection.getAddresses).toHaveBeenCalledTimes(expectedIndexes.length)
 
-    expectedIndexes.forEach(n => {
-      expect(lattice.connection.getAddresses).toHaveBeenNthCalledWith(n + 1,
+    expectedIndexes.forEach((n) => {
+      expect(lattice.connection.getAddresses).toHaveBeenNthCalledWith(
+        n + 1,
         expect.objectContaining({
-          startPath: [0x80000000 + 44, 0x80000000 + 60, 0x80000000 + n, 0, 0]
+          startPath: [0x80000000 + 44, 0x80000000 + 60, 0x80000000 + n, 0, 0],
         })
       )
     })
   })
 
-  it('emits an update with deriving status', done => {
+  it('emits an update with deriving status', (done) => {
     lattice.once('update', () => {
       try {
         expect(lattice.status).toBe('addresses')
         done()
-      } catch (e) { done(e) }
+      } catch (e) {
+        done(e)
+      }
     })
 
     lattice.deriveAddresses()
@@ -314,25 +336,34 @@ describe('#deriveAddresses', () => {
     await lattice.deriveAddresses()
 
     expect(lattice.status).toBe('ok')
-    expect(lattice.addresses).toStrictEqual(
-      ['0xaddr0', '0xaddr1', '0xaddr2', '0xaddr3', '0xaddr4']
-    )
+    expect(lattice.addresses).toStrictEqual(['0xaddr0', '0xaddr1', '0xaddr2', '0xaddr3', '0xaddr4'])
   })
 
   it('derives addresses when the limit has increased', async () => {
-    lattice.addresses = [0, 1, 2, 3, 4].map(l => `addr${l}`)
+    lattice.addresses = [0, 1, 2, 3, 4].map((l) => `addr${l}`)
     lattice.accountLimit = 10
 
     await lattice.deriveAddresses()
 
     expect(lattice.status).toBe('ok')
-    expect(lattice.addresses).toStrictEqual(
-      ['0xaddr0', '0xaddr1', '0xaddr2', '0xaddr3', '0xaddr4', '0xaddr5', '0xaddr6', '0xaddr7', '0xaddr8', '0xaddr9']
-    )
+    expect(lattice.addresses).toStrictEqual([
+      '0xaddr0',
+      '0xaddr1',
+      '0xaddr2',
+      '0xaddr3',
+      '0xaddr4',
+      '0xaddr5',
+      '0xaddr6',
+      '0xaddr7',
+      '0xaddr8',
+      '0xaddr9',
+    ])
   })
 
   it('derives no addresses when enough have already been derived', async () => {
-    lattice.addresses = Array(10).fill().map((_, i) => `addr${i + 10}`)
+    lattice.addresses = Array(10)
+      .fill()
+      .map((_, i) => `addr${i + 10}`)
     lattice.accountLimit = 5
 
     await lattice.deriveAddresses()
@@ -340,11 +371,11 @@ describe('#deriveAddresses', () => {
     expect(lattice.connection.getAddresses).not.toHaveBeenCalled()
     expect(lattice.addresses.length).toBe(10)
   })
-  
-  it('retries on failure', done => {
+
+  it('retries on failure', (done) => {
     let requestNum = 0
 
-    lattice.connection.getAddresses.mockImplementation(async opts => {
+    lattice.connection.getAddresses.mockImplementation(async (opts) => {
       if ((requestNum += 1) === 1) {
         throw 'Error from device: Getting addresses failed'
       }
@@ -357,19 +388,21 @@ describe('#deriveAddresses', () => {
         try {
           expect(lattice.addresses).toHaveLength(5)
           done()
-        } catch (e) { done(e) }
+        } catch (e) {
+          done(e)
+        }
       }
     })
-      
+
     lattice.deriveAddresses()
 
     waitForNextPromise(() => jest.advanceTimersByTime(3000), 3)
   })
-  
-  it('emits an error event on failure', done => {
-    lattice.connection.getAddresses.mockImplementation(async opts => {
+
+  it('emits an error event on failure', (done) => {
+    lattice.connection.getAddresses.mockImplementation(async (opts) => {
       throw 'Error from device: Getting addresses failed'
-  })
+    })
 
     lattice.on('update', () => {
       if (lattice.status === 'ok') done('should not have derived!')
@@ -380,10 +413,12 @@ describe('#deriveAddresses', () => {
         expect(lattice.addresses).toHaveLength(0)
         expect(lattice.status.toLowerCase()).toMatch(/error/)
         done()
-      } catch (e) { done(e) }
+      } catch (e) {
+        done(e)
+      }
     })
-      
-    lattice.deriveAddresses({ retries: 0 }).catch(err => expect(err).toBeTruthy())
+
+    lattice.deriveAddresses({ retries: 0 }).catch((err) => expect(err).toBeTruthy())
   })
 })
 
@@ -394,36 +429,44 @@ describe('#verifyAddress', () => {
     lattice.connection = { getAddresses: jest.fn(), getAppName: () => 'frame-test' }
   })
 
-  it('verifies a matching address', done => {
+  it('verifies a matching address', (done) => {
     lattice.verifyAddress(2, 'addr3', false, (err, result) => {
       try {
         expect(err).toBe(null)
         expect(result).toBe(true)
         done()
-      } catch (e) { done(e) }
+      } catch (e) {
+        done(e)
+      }
     })
   })
 
-  it('identifies a non-matching address', done => {
+  it('identifies a non-matching address', (done) => {
     lattice.verifyAddress(2, 'addrX', false, (err, result) => {
       try {
         expect(err.message.toLowerCase()).toBe('address does not match device')
         expect(result).toBe(undefined)
         done()
-      } catch (e) { done(e) }
+      } catch (e) {
+        done(e)
+      }
     })
   })
 
-  it('fails if deriving addresses fails', done => {
+  it('fails if deriving addresses fails', (done) => {
     lattice.addresses = []
-    lattice.connection.getAddresses = async () => { throw 'error!' }
+    lattice.connection.getAddresses = async () => {
+      throw 'error!'
+    }
 
     lattice.verifyAddress(2, 'addr3', false, (err, result) => {
       try {
         expect(err.message.toLowerCase()).toBe('verify address error')
         expect(result).toBe(undefined)
         done()
-      } catch (e) { done(e) }
+      } catch (e) {
+        done(e)
+      }
     })
   })
 })
@@ -431,44 +474,49 @@ describe('#verifyAddress', () => {
 describe('#signMessage', () => {
   beforeEach(() => {
     lattice.connection = {
-      sign: jest.fn(async opts => {
+      sign: jest.fn(async (opts) => {
         if (
           opts.currency === 'ETH_MSG' &&
           opts.data.protocol === 'signPersonal' &&
           opts.data.payload &&
-          opts.data.signerPath[4] === 4) {
+          opts.data.signerPath[4] === 4
+        ) {
           return {
             sig: {
               r: '9af6cb',
               s: 'abcd04',
-              v: Buffer.from('01', 'hex')
-            }
+              v: Buffer.from('01', 'hex'),
+            },
           }
         }
 
         throw 'invalid message!'
-      })
+      }),
     }
   })
 
-  it('signs a valid message', done => {
+  it('signs a valid message', (done) => {
     lattice.signMessage(4, 'sign this please', (err, res) => {
       try {
         expect(err).toBe(null)
         expect(res).toBe('0x9af6cbabcd0401')
         done()
-      } catch (e) { done(e) }
+      } catch (e) {
+        done(e)
+      }
     })
   })
 
-  it('returns an error on failure', done => {
+  it('returns an error on failure', (done) => {
     // wrong index, mock function expects 4, not 3
     lattice.signMessage(3, 'sign this please', (err, res) => {
       try {
         expect(err).toBeTruthy()
         expect(res).toBe(undefined)
         done()
-      } catch (e) { done(e) }
+      } catch (e) {
+        done(e)
+      }
     })
   })
 })
@@ -476,82 +524,92 @@ describe('#signMessage', () => {
 describe('#signTypedData', () => {
   beforeEach(() => {
     lattice.connection = {
-      sign: jest.fn(async opts => {
+      sign: jest.fn(async (opts) => {
         if (
           opts.currency === 'ETH_MSG' &&
           opts.data.protocol === 'eip712' &&
           opts.data.payload &&
-          opts.data.signerPath[4] === 2) {
+          opts.data.signerPath[4] === 2
+        ) {
           return {
             sig: {
               r: '3ea8cd',
               s: 'abcd04',
-              v: Buffer.from('01', 'hex')
-            }
+              v: Buffer.from('01', 'hex'),
+            },
           }
         }
 
         throw 'invalid message!'
-      })
+      }),
     }
   })
 
-  it('signs a valid typed data message', done => {
+  it('signs a valid typed data message', (done) => {
     lattice.signTypedData(2, 'V4', 'sign this please', (err, res) => {
       try {
         expect(err).toBe(null)
         expect(res).toBe('0x3ea8cdabcd0401')
         done()
-      } catch (e) { done(e) }
+      } catch (e) {
+        done(e)
+      }
     })
   })
 
-  it('is not able to sign typed data less than V4', done => {
+  it('is not able to sign typed data less than V4', (done) => {
     lattice.signTypedData(2, 'V3', 'sign this please', (err, res) => {
       try {
         expect(err.message.toLowerCase()).toMatch(/invalid version/)
         expect(res).toBe(undefined)
         done()
-      } catch (e) { done(e) }
+      } catch (e) {
+        done(e)
+      }
     })
   })
 
-  it('returns an error on failure', done => {
+  it('returns an error on failure', (done) => {
     // wrong index, mock function expects 2, not 3
     lattice.signTypedData(3, 'V4', 'sign this please', (err, res) => {
       try {
         expect(err).toBeTruthy()
         expect(res).toBe(undefined)
         done()
-      } catch (e) { done(e) }
+      } catch (e) {
+        done(e)
+      }
     })
   })
 })
 
 describe('#signTransaction', () => {
   const tx = {
-    chainId: '0x89'
+    chainId: '0x89',
   }
 
   const expectedSignature = {
     sig: {
       r: Buffer.from('3ea8cd', 'hex'),
       s: Buffer.from('96f7a0', 'hex'),
-      v: Buffer.from('00', 'hex')
-    }
+      v: Buffer.from('00', 'hex'),
+    },
   }
 
   beforeEach(() => {
     lattice.appVersion = { major: 1, minor: 1, patch: 0 }
-    lattice.connection = { sign: jest.fn(), getFwVersion: async () => ({ major: 1, minor: 3, fix: 5 }) }
+    lattice.connection = {
+      sign: jest.fn(),
+      getFwVersion: async () => ({ major: 1, minor: 3, fix: 5 }),
+    }
   })
 
-  it('signs a legacy transaction', done => {
+  it('signs a legacy transaction', (done) => {
     // Lattice expects the type to be undefined for legacy transactions,
     // sending a type of zero if EIP-1559 is enabled will cause an error
     const txToSign = { ...tx, type: '0x0' }
 
-    lattice.connection.sign.mockImplementation(async opts => {
+    lattice.connection.sign.mockImplementation(async (opts) => {
       try {
         expect(opts.currency).toBe('ETH')
         expect(opts.data.type).toBe(undefined)
@@ -559,7 +617,9 @@ describe('#signTransaction', () => {
         expect(parseInt(opts.data.chainId)).toBe(137)
 
         return expectedSignature
-      } catch (e) { done(e) }
+      } catch (e) {
+        done(e)
+      }
     })
 
     lattice.signTransaction(4, txToSign, (err, res) => {
@@ -567,14 +627,16 @@ describe('#signTransaction', () => {
         expect(err).toBe(null)
         expect(res).toBe('0xcf80808080808080833ea8cd8396f7a0')
         done()
-      } catch (e) { done(e) }
+      } catch (e) {
+        done(e)
+      }
     })
   })
 
-  it('signs a post eip-1559 transaction', done => {
+  it('signs a post eip-1559 transaction', (done) => {
     const txToSign = { ...tx, type: '0x2' }
 
-    lattice.connection.sign.mockImplementation(async opts => {
+    lattice.connection.sign.mockImplementation(async (opts) => {
       try {
         expect(opts.currency).toBe('ETH')
         expect(opts.data.type).toBe(2)
@@ -582,7 +644,9 @@ describe('#signTransaction', () => {
         expect(parseInt(opts.data.chainId)).toBe(137)
 
         return expectedSignature
-      } catch (e) { done(e) }
+      } catch (e) {
+        done(e)
+      }
     })
 
     lattice.signTransaction(4, txToSign, (err, res) => {
@@ -590,7 +654,9 @@ describe('#signTransaction', () => {
         expect(err).toBe(null)
         expect(res).toBe('0x02d3818980808080808080c080833ea8cd8396f7a0')
         done()
-      } catch (e) { done(e) }
+      } catch (e) {
+        done(e)
+      }
     })
   })
 })
@@ -659,7 +725,7 @@ describe('#close', () => {
     lattice.connection = 'a connection'
 
     lattice.close()
-    
+
     expect(lattice.connection).toBeFalsy()
   })
 })
diff --git a/test/main/signers/lattice/adapter.test.js b/test/main/signers/lattice/adapter.test.js
index a79ceb8cb..8bb07982f 100644
--- a/test/main/signers/lattice/adapter.test.js
+++ b/test/main/signers/lattice/adapter.test.js
@@ -23,11 +23,11 @@ beforeEach(() => {
   store.set('main.lattice', 'NBaJ8e', {
     deviceName: 'Frame-testlattice',
     privKey: 'supersecretkey',
-    paired: true
+    paired: true,
   })
 
   store.set('main.latticeSettings', {
-    derivation: 'legacy'
+    derivation: 'legacy',
   })
 
   adapter = new LatticeSignerAdapter()
@@ -83,7 +83,7 @@ describe('#remove', () => {
     store.removeLattice = jest.fn()
     latticeSigner.close = jest.fn()
   })
-  
+
   it('removes a Lattice device from the store', () => {
     adapter.remove(latticeSigner)
 
@@ -92,7 +92,7 @@ describe('#remove', () => {
 
   it('closes a known Lattice signer', () => {
     adapter.knownSigners['M8jl93'] = { deviceName: 'existing-frame-lattice' }
-    
+
     adapter.remove(latticeSigner)
 
     expect(latticeSigner.close).toHaveBeenCalled()
@@ -129,7 +129,7 @@ describe('#reload', () => {
 
 describe('settings changes', () => {
   const latticeSigner = {
-    deviceId: 'NBaJ8e'
+    deviceId: 'NBaJ8e',
   }
 
   let settingsObserver
@@ -142,7 +142,7 @@ describe('settings changes', () => {
 
     latticeSigner.addresses = Array(5).fill('addr')
     latticeSigner.connection = {
-      baseUrl: 'https://signing.gridpl.us'
+      baseUrl: 'https://signing.gridpl.us',
     }
 
     adapter.knownSigners['NBaJ8e'] = latticeSigner
@@ -154,7 +154,10 @@ describe('settings changes', () => {
   it('does not attempt to reload a Lattice with no connection', () => {
     delete latticeSigner.connection
 
-    store.set('main.latticeSettings', { endpointMode: 'custom', endpointCustom: 'https://myendpoint.io' })
+    store.set('main.latticeSettings', {
+      endpointMode: 'custom',
+      endpointCustom: 'https://myendpoint.io',
+    })
 
     settingsObserver.fire()
 
@@ -163,7 +166,10 @@ describe('settings changes', () => {
   })
 
   it('does not attempt to reload a Lattice if the relay URL has not changed', () => {
-    store.set('main.latticeSettings', { endpointMode: 'custom', endpointCustom: 'https://signing.gridpl.us' })
+    store.set('main.latticeSettings', {
+      endpointMode: 'custom',
+      endpointCustom: 'https://signing.gridpl.us',
+    })
 
     settingsObserver.fire()
 
@@ -172,7 +178,10 @@ describe('settings changes', () => {
   })
 
   it('reloads a connected Lattice if the relay URL is changed to custom', () => {
-    store.set('main.latticeSettings', { endpointMode: 'custom', endpointCustom: 'https://myendpoint.io' })
+    store.set('main.latticeSettings', {
+      endpointMode: 'custom',
+      endpointCustom: 'https://myendpoint.io',
+    })
 
     settingsObserver.fire()
 
@@ -182,10 +191,13 @@ describe('settings changes', () => {
 
   it('reloads a connected Lattice if the relay URL is changed back to the default', () => {
     latticeSigner.connection = {
-      baseUrl: 'https://customendpoint.io'
+      baseUrl: 'https://customendpoint.io',
     }
 
-    store.set('main.latticeSettings', { endpointMode: 'standard', endpointCustom: 'https://customendpoint.io' })
+    store.set('main.latticeSettings', {
+      endpointMode: 'standard',
+      endpointCustom: 'https://customendpoint.io',
+    })
 
     settingsObserver.fire()
 
@@ -249,15 +261,17 @@ describe('signer device changes', () => {
   })
 
   describe('detecting a new Lattice', () => {
-    it('creates a new signer', done => {
-      adapter.once('add', lattice => {
+    it('creates a new signer', (done) => {
+      adapter.once('add', (lattice) => {
         try {
           expect(Object.keys(adapter.knownSigners)).toHaveLength(1)
           expect(adapter.knownSigners['NBaJ8e']).toBeTruthy()
           expect(lattice.deviceId).toBe('NBaJ8e')
           expect(lattice.deviceName).toBe('Frame-testlattice')
           done()
-        } catch (e) { done(e) }
+        } catch (e) {
+          done(e)
+        }
       })
 
       signerObserver.fire()
@@ -265,7 +279,9 @@ describe('signer device changes', () => {
 
     it('does not create a new signer from one that is already known', () => {
       adapter.knownSigners['NBaJ8e'] = { deviceName: 'existing-frame-lattice' }
-      Lattice.mockImplementation(() => { throw new Error('attempted to create duplicate signer!') })
+      Lattice.mockImplementation(() => {
+        throw new Error('attempted to create duplicate signer!')
+      })
 
       signerObserver.fire()
 
@@ -289,14 +305,16 @@ describe('signer device changes', () => {
     it('does not attempt to connect to an unpaired signer', () => {
       store.set('main.lattice', 'NBaJ8e', 'paired', false)
 
-      latticeSigner.connect.mockImplementation(() => { throw new Error('should not attempt to connect!') })
+      latticeSigner.connect.mockImplementation(() => {
+        throw new Error('should not attempt to connect!')
+      })
 
       signerObserver.fire()
 
       expect(adapter.knownSigners['NBaJ8e']).toBeTruthy()
     })
 
-    it('sets the device to unpaired if connecting fails', done => {
+    it('sets the device to unpaired if connecting fails', (done) => {
       latticeSigner.connect.mockImplementation(() => Promise.reject())
 
       store.updateLattice = (deviceId, { paired }) => {
@@ -304,7 +322,9 @@ describe('signer device changes', () => {
           expect(deviceId).toBe('NBaJ8e')
           expect(paired).toBe(false)
           done()
-        } catch (e) { done (e) }
+        } catch (e) {
+          done(e)
+        }
       }
 
       signerObserver.fire()
@@ -365,7 +385,7 @@ describe('signer device changes', () => {
 
     it('updates the Lattice to unpaired after an error connecting', () => {
       latticeSigner.connection = { isPaired: false }
-      
+
       latticeSigner.emit('error')
 
       expect(store.updateLattice).toHaveBeenCalledWith('NBaJ8e', expect.objectContaining({ paired: false }))
@@ -373,7 +393,7 @@ describe('signer device changes', () => {
 
     it('disconnects after an error', () => {
       latticeSigner.emit('error')
-      
+
       expect(latticeSigner.disconnect).toHaveBeenCalled()
     })
 
@@ -382,7 +402,7 @@ describe('signer device changes', () => {
       adapter.once('update', updateHandler)
 
       latticeSigner.emit('error')
-      
+
       expect(updateHandler).toHaveBeenCalledWith(
         expect.objectContaining({ deviceId: 'NBaJ8e', deviceName: 'Frame-testlattice' })
       )
@@ -390,7 +410,7 @@ describe('signer device changes', () => {
 
     it('removes a known signer on close', () => {
       latticeSigner.emit('close')
-      
+
       expect(adapter.knownSigners).toEqual({})
     })
 
@@ -399,7 +419,7 @@ describe('signer device changes', () => {
       adapter.once('remove', updateHandler)
 
       latticeSigner.emit('close')
-      
+
       expect(updateHandler).toHaveBeenCalledWith('lattice-NBaJ8e')
     })
   })
diff --git a/test/main/signers/ledger/Ledger/eth.test.js b/test/main/signers/ledger/Ledger/eth.test.js
index 9b6d3d3f5..ec8974cc2 100644
--- a/test/main/signers/ledger/Ledger/eth.test.js
+++ b/test/main/signers/ledger/Ledger/eth.test.js
@@ -2,10 +2,7 @@ import LedgerEthereumApp from '../../../../../main/signers/ledger/Ledger/eth'
 import { Derivation } from '../../../../../main/signers/Signer/derive'
 import log from 'electron-log'
 
-import {
-  openTransportReplayer,
-  RecordStore,
-} from '@ledgerhq/hw-transport-mocker'
+import { openTransportReplayer, RecordStore } from '@ledgerhq/hw-transport-mocker'
 
 // -------------------
 // uncomment this version of eth app creation to record interactions with the Ledger so they can be replayed.
@@ -34,7 +31,7 @@ afterAll(() => {
   log.transports.console.level = 'debug'
 })
 
-async function createEthApp (replayCodes = '') {
+async function createEthApp(replayCodes = '') {
   const record = RecordStore.fromString(replayCodes)
   const transport = await openTransportReplayer(record)
 
@@ -100,10 +97,12 @@ describe('#signMessage', () => {
       <= 1b5dfbee187e688cddacd854f3ed514c5a0a84ae972fe9ddeafb06436c92d7b1421ad9b725c7270d2c5b32ef824e0700ae354471a644d9cd06cb9f3422feba21319000
     `
 
-    const ethApp = await createEthApp(replayData)                 
+    const ethApp = await createEthApp(replayData)
     const signature = await ethApp.signMessage("44'/60'/0'/0/2", '0x68656c6c6f2c204672616d6521')
 
-    expect(signature).toBe('0x5dfbee187e688cddacd854f3ed514c5a0a84ae972fe9ddeafb06436c92d7b1421ad9b725c7270d2c5b32ef824e0700ae354471a644d9cd06cb9f3422feba213100')
+    expect(signature).toBe(
+      '0x5dfbee187e688cddacd854f3ed514c5a0a84ae972fe9ddeafb06436c92d7b1421ad9b725c7270d2c5b32ef824e0700ae354471a644d9cd06cb9f3422feba213100'
+    )
   }, 100)
 
   it('signs a message with no hex prefix', async () => {
@@ -115,7 +114,9 @@ describe('#signMessage', () => {
     const ethApp = await createEthApp(replayData)
     const signature = await ethApp.signMessage("44'/1'/0'/0/6", '68656c6c6f2c204672616d6521')
 
-    expect(signature).toBe('0xe5d40722e7df2660b8f7b68367ea885ddc68d4da701bb04565f60252909127e72cfe480f7227a2a3f6e8753d4ac9f4e3526f65d78fa3fbcc1ec3b3148bd85e3201')
+    expect(signature).toBe(
+      '0xe5d40722e7df2660b8f7b68367ea885ddc68d4da701bb04565f60252909127e72cfe480f7227a2a3f6e8753d4ac9f4e3526f65d78fa3fbcc1ec3b3148bd85e3201'
+    )
   }, 100)
 
   it('fails to sign a message with an invalid BIP 32 path', async () => {
@@ -157,16 +158,13 @@ describe('#signTypedData', () => {
       chainId: '4',
       name: 'Ether Mail',
       verifyingContract: '0xCcCCccccCCCCcCCCCCCcCcCccCcCCCcCcccccccC',
-      version: '1'
+      version: '1',
     },
     message: {
       contents: 'Hello, Bob!',
       from: {
         name: 'Cow',
-        wallets: [
-          '0xCD2a3d9F938E13CD947Ec05AbC7FE734Df8DD826',
-          '0xDeaDbeefdEAdbeefdEadbEEFdeadbeEFdEaDbeeF'
-        ]
+        wallets: ['0xCD2a3d9F938E13CD947Ec05AbC7FE734Df8DD826', '0xDeaDbeefdEAdbeefdEadbEEFdeadbeEFdEaDbeeF'],
       },
       to: [
         {
@@ -174,10 +172,10 @@ describe('#signTypedData', () => {
           wallets: [
             '0xbBbBBBBbbBBBbbbBbbBbbbbBBbBbbbbBbBbbBBbB',
             '0xB0BdaBea57B0BDABeA57b0bdABEA57b0BDabEa57',
-            '0xB0B0b0b0b0b0B000000000000000000000000000'
-          ]
-        }
-       ]
+            '0xB0B0b0b0b0b0B000000000000000000000000000',
+          ],
+        },
+      ],
     },
     primaryType: 'Mail',
     types: {
@@ -185,22 +183,22 @@ describe('#signTypedData', () => {
         { name: 'name', type: 'string' },
         { name: 'version', type: 'string' },
         { name: 'chainId', type: 'uint256' },
-        { name: 'verifyingContract', type: 'address' }
+        { name: 'verifyingContract', type: 'address' },
       ],
       Group: [
         { name: 'name', type: 'string' },
-        { name: 'members', type: 'Person[]' }
+        { name: 'members', type: 'Person[]' },
       ],
       Mail: [
         { name: 'from', type: 'Person' },
         { name: 'to', type: 'Person[]' },
-        { name: 'contents', type: 'string' }
+        { name: 'contents', type: 'string' },
       ],
       Person: [
         { name: 'name', type: 'string' },
-        { name: 'wallets', type: 'address[]' }
-      ]
-    }
+        { name: 'wallets', type: 'address[]' },
+      ],
+    },
   }
 
   it('signs valid v4 typed data', async () => {
@@ -212,7 +210,9 @@ describe('#signTypedData', () => {
     const ethApp = await createEthApp(replayData)
     const signature = await ethApp.signTypedData("44'/60'/0'/0", typedData)
 
-    expect(signature).toBe('0xee800a5a7e4e1668a8ebab2a5bce4c96424e0f80b7ba08fc48e063393196e0851c0f9dab8909655368974e8aec6dba5c15772d575189e31b894fb7f8286c63b900')
+    expect(signature).toBe(
+      '0xee800a5a7e4e1668a8ebab2a5bce4c96424e0f80b7ba08fc48e063393196e0851c0f9dab8909655368974e8aec6dba5c15772d575189e31b894fb7f8286c63b900'
+    )
   }, 100)
 
   it('fails to sign typed data with an invalid BIP 32 path', async () => {
@@ -258,7 +258,7 @@ describe('#signTransaction', () => {
     gasPrice: '0x1dcd65000',
     chainId: '0x4',
     type: '0x0',
-    nonce: '0x5'
+    nonce: '0x5',
   }
 
   const eip1559Tx = {
@@ -271,7 +271,7 @@ describe('#signTransaction', () => {
     type: '0x2',
     maxPriorityFeePerGas: '0x3b9aca00',
     maxFeePerGas: '0x3b9aca0b',
-    nonce: '0x6'
+    nonce: '0x6',
   }
 
   it('signs a pre-EIP-1193 transaction', async () => {
@@ -282,7 +282,9 @@ describe('#signTransaction', () => {
     const ethApp = await createEthApp(replayData)
     const signature = await ethApp.signTransaction("44'/60'/0'/0", legacyTx)
 
-    expect(signature).toBe('0xf86a058501dcd65000825208942f318c334780961fb129d2a6c30d0763d9a5c970865af3107a4000802ba087cdd3a45082a1d86c4dab5a1944360a69543dba2acacea01f19133a7ddef115a078365690e4bdcf1bb58242bb673d53f94d525bee4217b0f191048eaca8cade73')
+    expect(signature).toBe(
+      '0xf86a058501dcd65000825208942f318c334780961fb129d2a6c30d0763d9a5c970865af3107a4000802ba087cdd3a45082a1d86c4dab5a1944360a69543dba2acacea01f19133a7ddef115a078365690e4bdcf1bb58242bb673d53f94d525bee4217b0f191048eaca8cade73'
+    )
   }, 100)
 
   it('signs an EIP-1193 transaction', async () => {
@@ -294,7 +296,9 @@ describe('#signTransaction', () => {
     const ethApp = await createEthApp(replayData)
     const signature = await ethApp.signTransaction("44'/60'/0'/0", eip1559Tx)
 
-    expect(signature).toBe('0x02f8700406843b9aca00843b9aca0b825208942f318c334780961fb129d2a6c30d0763d9a5c970865af3107a400080c001a0ebefc9f798b04e3952310d6b82c48fda245df9edef77507d06025cdc5af4efa1a0570784cbcf84a0f03cac7771fbfeee4f4759034baf42ca735065554afa600ee3')
+    expect(signature).toBe(
+      '0x02f8700406843b9aca00843b9aca0b825208942f318c334780961fb129d2a6c30d0763d9a5c970865af3107a400080c001a0ebefc9f798b04e3952310d6b82c48fda245df9edef77507d06025cdc5af4efa1a0570784cbcf84a0f03cac7771fbfeee4f4759034baf42ca735065554afa600ee3'
+    )
   }, 100)
 
   it('fails to sign a transaction with an invalid BIP 32 path', async () => {
diff --git a/test/main/signers/ledger/Ledger/index.test.js b/test/main/signers/ledger/Ledger/index.test.js
index 681278f6b..90cf5849e 100644
--- a/test/main/signers/ledger/Ledger/index.test.js
+++ b/test/main/signers/ledger/Ledger/index.test.js
@@ -6,15 +6,15 @@ import log from 'electron-log'
 jest.mock('../../../../../main/signers/ledger/Ledger/eth')
 jest.mock('@ledgerhq/hw-transport-node-hid-noevents')
 
-function runNextRequest () {
+function runNextRequest() {
   // move forward in time to allow the queue to process one request
   jest.advanceTimersByTime(200)
 }
 
-async function connectEthApp () {
+async function connectEthApp() {
   Eth.mock.instances[0].getAppConfiguration.mockResolvedValue({ version: '2.0.1' })
 
-  return new Promise(resolve => {
+  return new Promise((resolve) => {
     ledger.on('update', () => {
       if (ledger.status === Status.OK) resolve()
     })
@@ -29,23 +29,24 @@ function verifyDone(done, expectations) {
 }
 
 function verify(done, expectations, complete = false) {
-  try { 
+  try {
     expectations()
     if (complete) done()
-  } catch (e) { done(e) }
+  } catch (e) {
+    done(e)
+  }
 }
 
 function verifyPromise(resolve, reject, expectations) {
-  try { 
+  try {
     expectations()
     resolve()
-  } catch (e) { reject(e) }
+  } catch (e) {
+    reject(e)
+  }
 }
 
-const addresses = [
-  '0xf10326c1c6884b094e03d616cc8c7b920e3f73e0',
-  '0xa16002db5438b5862270a9e404346e3c3b059eeb'
-]
+const addresses = ['0xf10326c1c6884b094e03d616cc8c7b920e3f73e0', '0xa16002db5438b5862270a9e404346e3c3b059eeb']
 
 let ledger
 
@@ -56,12 +57,12 @@ beforeAll(() => {
 
 beforeEach(async () => {
   Eth.mockClear()
-  
+
   ledger = new Ledger('usb-path')
   ledger.derivation = Derivation.legacy
 
   await ledger.open()
-  
+
   Eth.mock.instances[0].deriveAddresses.mockImplementation(() => Promise.resolve(addresses))
 })
 
@@ -83,15 +84,17 @@ describe('#connect', () => {
 
     it('sets the version', async () => {
       await ledger.connect()
-  
+
       expect(ledger.appVersion).toEqual({
-        major: 1, minor: 9, patch: 2
+        major: 1,
+        minor: 9,
+        patch: 2,
       })
     })
 
-    it('detects that the app is locked', done => {
+    it('detects that the app is locked', (done) => {
       const stateFlow = []
-      
+
       Eth.mock.instances[0].getAddress.mockRejectedValue({ statusCode: 27404 })
 
       ledger.on('update', () => {
@@ -113,7 +116,7 @@ describe('#connect', () => {
       ledger.connect()
     })
 
-    it('derives addresses after connecting', done => {
+    it('derives addresses after connecting', (done) => {
       const stateFlow = []
 
       ledger.on('update', () => {
@@ -135,16 +138,16 @@ describe('#connect', () => {
     // these status codes all represent a different app or the Ledger main menu being open
     const statusCodes = [27904, 27906, 25873, 25871]
 
-    statusCodes.forEach(code => {
+    statusCodes.forEach((code) => {
       it(`sets the status to wrong application and disconnects the signer when the status code is ${code}`, async () => {
         Eth.mock.instances[0].getAppConfiguration.mockRejectedValue({ statusCode: code })
-  
+
         ledger.on('update', () => {
           expect(ledger.status).toEqual(Status.WRONG_APP)
         })
-  
+
         await ledger.connect()
-        
+
         expect(ledger.eth).not.toBeDefined()
       })
     })
@@ -156,9 +159,9 @@ describe('#deriveAddress', () => {
     await connectEthApp()
   })
 
-  it('derives hardware addresses', done => {
+  it('derives hardware addresses', (done) => {
     const stateFlow = []
-  
+
     ledger.on('update', () => {
       stateFlow.push(ledger.status)
 
@@ -179,8 +182,8 @@ describe('#deriveAddress', () => {
     runNextRequest()
   })
 
-  it('derives live addresses', done => {
-    Eth.mock.instances[0].getAddress.mockImplementation(path => {
+  it('derives live addresses', (done) => {
+    Eth.mock.instances[0].getAddress.mockImplementation((path) => {
       if (path === "44'/60'/0'/0/0") return Promise.resolve({ address: addresses[0] })
       if (path === "44'/60'/1'/0/0") return Promise.resolve({ address: addresses[1] })
 
@@ -189,14 +192,14 @@ describe('#deriveAddress', () => {
 
     const stateFlow = []
 
-    const firstUpdateDone = new Promise(resolve => {
+    const firstUpdateDone = new Promise((resolve) => {
       ledger.on('update', () => {
         stateFlow.push(ledger.status)
-  
+
         if (ledger.status === Status.DERIVING) {
           verify(done, () => expect(ledger.addresses).toHaveLength(0))
         }
-  
+
         if (ledger.status === Status.OK) {
           if (ledger.addresses.length === 2) {
             verifyDone(done, () => {
@@ -209,17 +212,20 @@ describe('#deriveAddress', () => {
           }
         }
       })
-  
+
       ledger.accountLimit = 2
       ledger.derivation = Derivation.live
       ledger.deriveAddresses()
-      
+
       runNextRequest()
     })
 
     // all this craziness is necessary to simulate the queue running multiple
     // requests, resolving their promsies, and advancing the timer to run the next request
-    firstUpdateDone.then(() => { }).then(() => { }).then(runNextRequest)
+    firstUpdateDone
+      .then(() => {})
+      .then(() => {})
+      .then(runNextRequest)
   })
 })
 
@@ -227,16 +233,20 @@ describe('#verifyAddress', () => {
   beforeEach(async () => {
     await connectEthApp()
 
-    Eth.mock.instances[0].getAddress.mockImplementation(path => new Promise(resolve => {
-      resolve({
-        address: (path === "44'/60'/0'/9")
-          ? '0xe9d6f5779cf6936de03c0bec631f3bb3e336d98d'
-          : '0xCd37a15BdfEc87D0e383E628da2399053D5948ca'
-      })
-    }))
+    Eth.mock.instances[0].getAddress.mockImplementation(
+      (path) =>
+        new Promise((resolve) => {
+          resolve({
+            address:
+              path === "44'/60'/0'/9"
+                ? '0xe9d6f5779cf6936de03c0bec631f3bb3e336d98d'
+                : '0xCd37a15BdfEc87D0e383E628da2399053D5948ca',
+          })
+        })
+    )
   })
 
-  it('verifies an address', done => {
+  it('verifies an address', (done) => {
     ledger.once('update', () => done('status updated unexpectedly!'))
 
     ledger.verifyAddress(9, '0xe9d6f5779cf6936de03c0bec631f3bb3e336d98d', false, (err, verified) => {
@@ -257,20 +267,20 @@ describe('#verifyAddress', () => {
     {
       testCase: 'the verification request is rejected by the user',
       expectedError: 'Verify request rejected by user',
-      setup: () => Eth.mock.instances[0].getAddress.mockRejectedValue({ statusCode: 27013 })
+      setup: () => Eth.mock.instances[0].getAddress.mockRejectedValue({ statusCode: 27013 }),
     },
     {
       testCase: 'there is a communication error',
-      setup: () => Eth.mock.instances[0].getAddress.mockRejectedValue({ statusCode: -1 })
+      setup: () => Eth.mock.instances[0].getAddress.mockRejectedValue({ statusCode: -1 }),
     },
     {
       testCase: 'the eth app is not initialized',
-      setup: () => ledger.eth = undefined
+      setup: () => (ledger.eth = undefined),
     },
     {
       testCase: 'the derivation type is not initialized',
-      setup: () => ledger.derivation = undefined
-    }
+      setup: () => (ledger.derivation = undefined),
+    },
   ]
 
   errorCases.forEach(({ testCase, setup = () => {}, expectedError = 'Verify address error' }) => {
@@ -301,7 +311,7 @@ describe('#verifyAddress', () => {
 
 const signingMethods = ['signMessage', 'signTransaction']
 
-signingMethods.forEach(signingMethod => {
+signingMethods.forEach((signingMethod) => {
   const signType = signingMethod.substring(4).toLowerCase()
 
   describe(`#${signingMethod}`, () => {
@@ -309,13 +319,17 @@ signingMethods.forEach(signingMethod => {
       await connectEthApp()
     })
 
-    it(`signs a ${signType}`, done => {
-      Eth.mock.instances[0][signingMethod].mockImplementation(path => new Promise(resolve => {
-        resolve((path === "44'/60'/0'/3")
-          ? '0x724e7dfa6ee0fd0dd84c5d8a84eb57be29ff20ed253b3249de2e3d6b119d7b1e6a211ce0c48f93c5e399ac8cd7c6fe56e36fa960b6da92de2c435814928f2f8c1b'
-          : '0xf257b7f96ad7cbf11b80c2085dc76d10ede662fb2c77dc7fbd9f574d78d9da6d08cb1a99c7d97ac87b9d7f5a4e3ae052ba3a11888fdfeefe6a169a0547c1b2e01b'
-        )
-      }))
+    it(`signs a ${signType}`, (done) => {
+      Eth.mock.instances[0][signingMethod].mockImplementation(
+        (path) =>
+          new Promise((resolve) => {
+            resolve(
+              path === "44'/60'/0'/3"
+                ? '0x724e7dfa6ee0fd0dd84c5d8a84eb57be29ff20ed253b3249de2e3d6b119d7b1e6a211ce0c48f93c5e399ac8cd7c6fe56e36fa960b6da92de2c435814928f2f8c1b'
+                : '0xf257b7f96ad7cbf11b80c2085dc76d10ede662fb2c77dc7fbd9f574d78d9da6d08cb1a99c7d97ac87b9d7f5a4e3ae052ba3a11888fdfeefe6a169a0547c1b2e01b'
+            )
+          })
+      )
 
       ledger.once('update', () => done('Ledger unexpectedly updated!'))
 
@@ -323,14 +337,16 @@ signingMethods.forEach(signingMethod => {
         verifyDone(done, () => {
           expect(ledger.status).toBe(Status.OK)
           expect(err).toBeFalsy()
-          expect(signature).toBe('0x724e7dfa6ee0fd0dd84c5d8a84eb57be29ff20ed253b3249de2e3d6b119d7b1e6a211ce0c48f93c5e399ac8cd7c6fe56e36fa960b6da92de2c435814928f2f8c1b')
+          expect(signature).toBe(
+            '0x724e7dfa6ee0fd0dd84c5d8a84eb57be29ff20ed253b3249de2e3d6b119d7b1e6a211ce0c48f93c5e399ac8cd7c6fe56e36fa960b6da92de2c435814928f2f8c1b'
+          )
         })
       })
 
       runNextRequest()
     })
 
-    it('fails if the signing request is rejected by the user', done => {
+    it('fails if the signing request is rejected by the user', (done) => {
       Eth.mock.instances[0][signingMethod].mockRejectedValue({ statusCode: 27013 })
 
       ledger.once('update', () => done('Ledger unexpectedly updated!'))
@@ -350,16 +366,16 @@ signingMethods.forEach(signingMethod => {
     const errorCases = [
       {
         testCase: 'there is a communication error',
-        setup: () => Eth.mock.instances[0][signingMethod].mockRejectedValue({ statusCode: -1 })
+        setup: () => Eth.mock.instances[0][signingMethod].mockRejectedValue({ statusCode: -1 }),
       },
       {
         testCase: 'the eth app is not initialized',
-        setup: () => ledger.eth = undefined
+        setup: () => (ledger.eth = undefined),
       },
       {
         testCase: 'the derivation type is not initialized',
-        setup: () => ledger.derivation = undefined
-      }
+        setup: () => (ledger.derivation = undefined),
+      },
     ]
 
     errorCases.forEach(({ testCase, setup = () => {} }) => {
@@ -394,13 +410,17 @@ describe('#signTypedData', () => {
     await connectEthApp()
   })
 
-  it('signs v4 typed data', done => {
-    Eth.mock.instances[0].signTypedData.mockImplementation(path => new Promise(resolve => {
-      resolve((path === "44'/60'/0'/5")
-        ? '0x724e7dfa6ee0fd0dd84c5d8a84eb57be29ff20ed253b3249de2e3d6b119d7b1e6a211ce0c48f93c5e399ac8cd7c6fe56e36fa960b6da92de2c435814928f2f8c1b'
-        : '0xf257b7f96ad7cbf11b80c2085dc76d10ede662fb2c77dc7fbd9f574d78d9da6d08cb1a99c7d97ac87b9d7f5a4e3ae052ba3a11888fdfeefe6a169a0547c1b2e01b'
-      )
-    }))
+  it('signs v4 typed data', (done) => {
+    Eth.mock.instances[0].signTypedData.mockImplementation(
+      (path) =>
+        new Promise((resolve) => {
+          resolve(
+            path === "44'/60'/0'/5"
+              ? '0x724e7dfa6ee0fd0dd84c5d8a84eb57be29ff20ed253b3249de2e3d6b119d7b1e6a211ce0c48f93c5e399ac8cd7c6fe56e36fa960b6da92de2c435814928f2f8c1b'
+              : '0xf257b7f96ad7cbf11b80c2085dc76d10ede662fb2c77dc7fbd9f574d78d9da6d08cb1a99c7d97ac87b9d7f5a4e3ae052ba3a11888fdfeefe6a169a0547c1b2e01b'
+          )
+        })
+    )
 
     ledger.once('update', () => done('Ledger unexpectedly updated!'))
 
@@ -408,14 +428,16 @@ describe('#signTypedData', () => {
       verifyDone(done, () => {
         expect(ledger.status).toBe(Status.OK)
         expect(err).toBeFalsy()
-        expect(signature).toBe('0x724e7dfa6ee0fd0dd84c5d8a84eb57be29ff20ed253b3249de2e3d6b119d7b1e6a211ce0c48f93c5e399ac8cd7c6fe56e36fa960b6da92de2c435814928f2f8c1b')
+        expect(signature).toBe(
+          '0x724e7dfa6ee0fd0dd84c5d8a84eb57be29ff20ed253b3249de2e3d6b119d7b1e6a211ce0c48f93c5e399ac8cd7c6fe56e36fa960b6da92de2c435814928f2f8c1b'
+        )
       })
     })
 
     runNextRequest()
   })
 
-  it('fails to sign pre-v4 typed data', done => {
+  it('fails to sign pre-v4 typed data', (done) => {
     ledger.once('update', () => done('Ledger unexpectedly updated!'))
 
     ledger.signTypedData(5, 'V3', 'all sorts of typed data', (err, signature) => {
@@ -427,7 +449,7 @@ describe('#signTypedData', () => {
     })
   })
 
-  it('fails if the signing request is rejected by the user', done => {
+  it('fails if the signing request is rejected by the user', (done) => {
     Eth.mock.instances[0].signTypedData.mockRejectedValue({ statusCode: 27013 })
 
     ledger.once('update', () => done('Ledger unexpectedly updated!'))
@@ -444,8 +466,11 @@ describe('#signTypedData', () => {
     runNextRequest()
   })
 
-  it('fails if the signing request is invalid', done => {
-    Eth.mock.instances[0].signTypedData.mockRejectedValue({ statusCode: 99901, message: 'Invalid typed data' })
+  it('fails if the signing request is invalid', (done) => {
+    Eth.mock.instances[0].signTypedData.mockRejectedValue({
+      statusCode: 99901,
+      message: 'Invalid typed data',
+    })
 
     ledger.once('update', () => done('Ledger unexpectedly updated!'))
     ledger.once('close', () => done('Ledger unexpectedly closed!'))
@@ -464,16 +489,16 @@ describe('#signTypedData', () => {
   const errorCases = [
     {
       testCase: 'there is a communication error',
-      setup: () => Eth.mock.instances[0].signTypedData.mockRejectedValue({ statusCode: -1 })
+      setup: () => Eth.mock.instances[0].signTypedData.mockRejectedValue({ statusCode: -1 }),
     },
     {
       testCase: 'the eth app is not initialized',
-      setup: () => ledger.eth = undefined
+      setup: () => (ledger.eth = undefined),
     },
     {
       testCase: 'the derivation type is not initialized',
-      setup: () => ledger.derivation = undefined
-    }
+      setup: () => (ledger.derivation = undefined),
+    },
   ]
 
   errorCases.forEach(({ testCase, setup = () => {} }) => {
diff --git a/test/main/signers/ledger/adapter.test.js b/test/main/signers/ledger/adapter.test.js
index 18b1892de..8da3bef4b 100644
--- a/test/main/signers/ledger/adapter.test.js
+++ b/test/main/signers/ledger/adapter.test.js
@@ -15,7 +15,7 @@ jest.mock('../../../../main/signers/ledger/Ledger', () => {
 
   const constructor = function (devicePath, model) {
     const ledger = new L.default(devicePath, model)
-    ledger.open = async function () { }
+    ledger.open = async function () {}
 
     ledger.connect = async function () {
       this.status = L.Status.OK
@@ -27,7 +27,9 @@ jest.mock('../../../../main/signers/ledger/Ledger', () => {
       this.emit('update')
     }
 
-    ledger.close = async function () { this.emit('close') }
+    ledger.close = async function () {
+      this.emit('close')
+    }
 
     return ledger
   }
@@ -35,12 +37,12 @@ jest.mock('../../../../main/signers/ledger/Ledger', () => {
   return { __esModule: true, default: constructor, Status: L.Status }
 })
 
-function simulateLedgerConnection (path) {
+function simulateLedgerConnection(path) {
   connectedHids.push({ interface: 0, product: 'Nano S', usagePage: 0xffa0, path })
 }
 
-function simulateLedgerDisconnection (path) {
-  const hidIndex = connectedHids.findIndex(hid => hid.path === path)
+function simulateLedgerDisconnection(path) {
+  const hidIndex = connectedHids.findIndex((hid) => hid.path === path)
   connectedHids.splice(hidIndex, 1)
 }
 
@@ -74,22 +76,24 @@ afterAll(() => {
   log.transports.console.level = 'debug'
 })
 
-it('recognizes a connected Ledger', done => {
-  adapter.once('add', ledger => {
+it('recognizes a connected Ledger', (done) => {
+  adapter.once('add', (ledger) => {
     try {
       expect(ledger.devicePath).toBe('nano-s-path')
       done()
-    } catch (e) { done(e) }
+    } catch (e) {
+      done(e)
+    }
   })
 
   simulateLedgerConnection('nano-s-path')
   adapter.handleDeviceChanges()
 })
 
-it('creates a new Ledger when one is already attached', done => {
+it('creates a new Ledger when one is already attached', (done) => {
   const addedLedgers = []
-  
-  adapter.on('add', ledger => {
+
+  adapter.on('add', (ledger) => {
     addedLedgers.push(ledger)
 
     if (addedLedgers.length === 2) {
@@ -97,7 +101,9 @@ it('creates a new Ledger when one is already attached', done => {
         expect(addedLedgers[0].devicePath).toBe('connected-nano-s-path')
         expect(addedLedgers[1].devicePath).toBe('new-nano-s-path')
         done()
-      } catch (e) { done(e) }
+      } catch (e) {
+        done(e)
+      }
     }
   })
 
@@ -108,25 +114,29 @@ it('creates a new Ledger when one is already attached', done => {
   adapter.handleDeviceChanges()
 })
 
-it('handles a disconnected Ledger', done => {
-  adapter.once('update', ledger => {
+it('handles a disconnected Ledger', (done) => {
+  adapter.once('update', (ledger) => {
     if (ledger.status === Status.OK) {
       // ensure no Ledgers are added after the initial connection
       adapter.once('add', () => done('new Ledger should not be added!'))
 
-      adapter.once('remove', id => {
+      adapter.once('remove', (id) => {
         try {
           expect(id).toBe('88da20f4-2d91-5a86-b7ec-c86603d02ad8')
           expect(adapter.disconnections).toHaveLength(0)
           expect(Object.keys(adapter.knownSigners)).toHaveLength(0)
           done()
-        } catch (e) { done(e) }
+        } catch (e) {
+          done(e)
+        }
       })
 
       adapter.on('update', () => {
         try {
           expect(ledger.status).toBe(Status.DISCONNECTED)
-        } catch (e) { done(e) }
+        } catch (e) {
+          done(e)
+        }
       })
 
       simulateLedgerDisconnection('nano-x-discon-path')
@@ -140,18 +150,20 @@ it('handles a disconnected Ledger', done => {
   adapter.handleDeviceChanges()
 }, 200)
 
-it('recognizes two newly connected Ledgers', done => {
+it('recognizes two newly connected Ledgers', (done) => {
   // this can happen on startup
   const ledgers = []
 
-  adapter.on('add', ledger => {
+  adapter.on('add', (ledger) => {
     ledgers.push(ledger)
 
     if (ledgers.length === 2) {
       try {
         expect(ledgers[0].devicePath).toBe('nano-s-path')
         expect(ledgers[1].devicePath).toBe('nano-x-path')
-      } catch (e) { done(e) }
+      } catch (e) {
+        done(e)
+      }
     }
   })
 
@@ -171,22 +183,22 @@ it('recognizes two newly connected Ledgers', done => {
 
 const platforms = ['Linux', 'Windows']
 
-platforms.forEach(platform => {
-  // on Linux and Mac, the Ledger will re-connect using the same path as the one 
+platforms.forEach((platform) => {
+  // on Linux and Mac, the Ledger will re-connect using the same path as the one
   // that was disconnected. on Windows, it will have a different path
   const expectedReconnectionPath = platform === 'Linux' ? 'nano-x-eth-app-path' : 'nano-x2-eth-app-path'
 
-  it(`updates an existing Ledger when the eth app is exited on ${platform}`, done => {
+  it(`updates an existing Ledger when the eth app is exited on ${platform}`, (done) => {
     let receivedDisconnect = false
 
-    adapter.once('update', ledger => {
+    adapter.once('update', (ledger) => {
       if (ledger.status === Status.OK) {
         // ensure no Ledgers are added or removed
         adapter.once('add', () => done('new Ledger should not be added!'))
         adapter.once('remove', () => done('new Ledger should not be removed!'))
-        adapter.on('update', ledger => {
+        adapter.on('update', (ledger) => {
           if (!receivedDisconnect && ledger.status === Status.DISCONNECTED) {
-            return receivedDisconnect = true
+            return (receivedDisconnect = true)
           }
 
           try {
@@ -197,7 +209,9 @@ platforms.forEach(platform => {
             expect(Object.keys(adapter.knownSigners)).toHaveLength(1)
             expect(adapter.knownSigners[expectedReconnectionPath]).toBeDefined()
             done()
-          } catch (e) { done(e) }
+          } catch (e) {
+            done(e)
+          }
         })
 
         simulateLedgerDisconnection('nano-x-eth-app-path')
diff --git a/test/main/store/actions/index.test.js b/test/main/store/actions/index.test.js
index 75841138c..3d1dbc44b 100644
--- a/test/main/store/actions/index.test.js
+++ b/test/main/store/actions/index.test.js
@@ -17,7 +17,7 @@ import {
   switchOriginChain as switchOriginChainAction,
   removeNetwork as removeNetworkAction,
   updateNetwork as updateNetworkAction,
-  setBlockHeight as setBlockHeightAction
+  setBlockHeight as setBlockHeightAction,
 } from '../../../../main/store/actions'
 
 beforeAll(() => {
@@ -35,14 +35,14 @@ const testTokens = {
     chainId: 1,
     address: '0xe41d2489571d322189246dafa5ebde1f4699f498',
     symbol: 'ZRX',
-    decimals: 18
+    decimals: 18,
   },
   badger: {
     chainId: 42161,
     address: '0xbfa641051ba0a0ad1b0acf549a89536a0d76472e',
     symbol: 'BADGER',
-    decimals: 18
-  }
+    decimals: 18,
+  },
 }
 
 describe('#addNetwork', () => {
@@ -52,7 +52,7 @@ describe('#addNetwork', () => {
     type: 'ethereum',
     layer: 'sidechain',
     explorer: 'https://polygonscan.com',
-    symbol: 'MATIC'
+    symbol: 'MATIC',
   }
 
   let networks, networksMeta
@@ -62,7 +62,7 @@ describe('#addNetwork', () => {
     update({ networks, networksMeta })
   }
 
-  const addNetwork = network => addNetworkAction(updaterFn, network)
+  const addNetwork = (network) => addNetworkAction(updaterFn, network)
 
   beforeEach(() => {
     networks = { ethereum: {} }
@@ -126,7 +126,7 @@ describe('#addNetwork', () => {
     addNetwork(polygonNetwork)
 
     expect(networks.ethereum['137'].secondaryRpc).toBeUndefined()
-    expect(networks.ethereum['137'].connection.secondary.custom).toBe( 'https://rpc-mainnet.matic.network')
+    expect(networks.ethereum['137'].connection.secondary.custom).toBe('https://rpc-mainnet.matic.network')
   })
 
   it('adds a network with the correct default connection presets', () => {
@@ -138,28 +138,28 @@ describe('#addNetwork', () => {
   it('adds a network with the correct default primary connection settings', () => {
     addNetwork(polygonNetwork)
 
-    expect(networks.ethereum['137'].connection.primary).toEqual({ 
-      on: true, 
-      current: 'custom', 
-      status: 'loading', 
-      connected: false, 
-      type: '', 
-      network: '', 
-      custom: ''
+    expect(networks.ethereum['137'].connection.primary).toEqual({
+      on: true,
+      current: 'custom',
+      status: 'loading',
+      connected: false,
+      type: '',
+      network: '',
+      custom: '',
     })
   })
 
   it('adds a network with the correct default secondary connection settings', () => {
     addNetwork(polygonNetwork)
 
-    expect(networks.ethereum['137'].connection.secondary).toEqual({ 
-      on: false, 
-      current: 'custom', 
-      status: 'loading', 
-      connected: false, 
-      type: '', 
-      network: '', 
-      custom: ''
+    expect(networks.ethereum['137'].connection.secondary).toEqual({
+      on: false,
+      current: 'custom',
+      status: 'loading',
+      connected: false,
+      type: '',
+      network: '',
+      custom: '',
     })
   })
 
@@ -169,8 +169,8 @@ describe('#addNetwork', () => {
     expect(networks.ethereum['137'].gas).toEqual({
       price: {
         selected: 'standard',
-        levels: { slow: '', standard: '', fast: '', asap: '', custom: '' }
-      }
+        levels: { slow: '', standard: '', fast: '', asap: '', custom: '' },
+      },
     })
   })
 
@@ -182,9 +182,9 @@ describe('#addNetwork', () => {
       gas: {
         price: {
           selected: 'standard',
-          levels: { slow: '', standard: '', fast: '', asap: '', custom: '' }
-        }
-      }
+          levels: { slow: '', standard: '', fast: '', asap: '', custom: '' },
+        },
+      },
     })
   })
 
@@ -232,13 +232,13 @@ describe('#addNetwork', () => {
 
   it('does not add the network if the networks already exists', () => {
     networks.ethereum['137'] = { ...polygonNetwork }
-  
+
     addNetwork({
       id: 137,
       type: 'ethereum',
       name: 'Matic v1',
       explorer: 'https://rpc-mainnet.maticvigil.com',
-      symbol: 'MATIC'
+      symbol: 'MATIC',
     })
 
     expect(networks.ethereum['137'].name).toBe('Polygon')
@@ -254,79 +254,94 @@ describe('#setBalances', () => {
     balances = update(balances)
   }
 
-  const setBalances = updatedBalances => setBalancesAction(updaterFn, owner, updatedBalances)
+  const setBalances = (updatedBalances) => setBalancesAction(updaterFn, owner, updatedBalances)
 
   let balances
 
   beforeEach(() => {
-    balances = [{
-      ...testTokens.badger,
-      balance: addHexPrefix(new BigNumber(30.5).toString(16))
-    }]
+    balances = [
+      {
+        ...testTokens.badger,
+        balance: addHexPrefix(new BigNumber(30.5).toString(16)),
+      },
+    ]
   })
 
   it('adds a new balance', () => {
-    setBalances([{
-      ...testTokens.zrx,
-      balance: addHexPrefix(new BigNumber(7983.2332).toString(16))
-    }])
-    
+    setBalances([
+      {
+        ...testTokens.zrx,
+        balance: addHexPrefix(new BigNumber(7983.2332).toString(16)),
+      },
+    ])
+
     expect(balances).toEqual([
       {
         ...testTokens.badger,
-        balance: addHexPrefix(new BigNumber(30.5).toString(16))
+        balance: addHexPrefix(new BigNumber(30.5).toString(16)),
       },
       {
         ...testTokens.zrx,
-        balance: addHexPrefix(new BigNumber(7983.2332).toString(16))
-      }
+        balance: addHexPrefix(new BigNumber(7983.2332).toString(16)),
+      },
     ])
   })
 
   it('updates an existing balance to a positive amount', () => {
-    setBalances([{
-      ...testTokens.badger,
-      balance: addHexPrefix(new BigNumber(41.9).toString(16))
-    }])
-    
-    expect(balances).toEqual([{
-      ...testTokens.badger,
-      balance: addHexPrefix(new BigNumber(41.9).toString(16))
-    }])
+    setBalances([
+      {
+        ...testTokens.badger,
+        balance: addHexPrefix(new BigNumber(41.9).toString(16)),
+      },
+    ])
+
+    expect(balances).toEqual([
+      {
+        ...testTokens.badger,
+        balance: addHexPrefix(new BigNumber(41.9).toString(16)),
+      },
+    ])
   })
 
   it('updates an existing balance to zero', () => {
-    setBalances([{
-      ...testTokens.badger,
-      balance: '0x0'
-    }])
-    
-    expect(balances).toEqual([{
-      ...testTokens.badger,
-      balance: '0x0'
-    }])
+    setBalances([
+      {
+        ...testTokens.badger,
+        balance: '0x0',
+      },
+    ])
+
+    expect(balances).toEqual([
+      {
+        ...testTokens.badger,
+        balance: '0x0',
+      },
+    ])
   })
 })
 
 describe('#removeBalance', () => {
   let balances = {
-    [owner]: [{
+    [owner]: [
+      {
         ...testTokens.zrx,
-        balance: addHexPrefix(BigNumber('798.564').toString(16))
+        balance: addHexPrefix(BigNumber('798.564').toString(16)),
       },
       {
         ...testTokens.badger,
-        balance: addHexPrefix(BigNumber('15.543').toString(16))
-      }
+        balance: addHexPrefix(BigNumber('15.543').toString(16)),
+      },
+    ],
+    '0xd0e3872f5fa8ecb49f1911f605c0da90689a484e': [
+      {
+        ...testTokens.zrx,
+        balance: addHexPrefix(BigNumber('8201.343').toString(16)),
+      },
+      {
+        ...testTokens.badger,
+        balance: addHexPrefix(BigNumber('101.988').toString(16)),
+      },
     ],
-    '0xd0e3872f5fa8ecb49f1911f605c0da90689a484e': [{
-      ...testTokens.zrx,
-      balance: addHexPrefix(BigNumber('8201.343').toString(16))
-    },
-    {
-      ...testTokens.badger,
-      balance: addHexPrefix(BigNumber('101.988').toString(16))
-    }]
   }
 
   const updaterFn = (node, update) => {
@@ -335,14 +350,16 @@ describe('#removeBalance', () => {
     balances = update(balances)
   }
 
-  const removeBalance = key => removeBalanceAction(updaterFn, 1, key)
+  const removeBalance = (key) => removeBalanceAction(updaterFn, 1, key)
 
   it('removes a balance from all accounts', () => {
     removeBalance(testTokens.zrx.address)
 
     expect(balances[owner]).not.toContainEqual(expect.objectContaining({ address: testTokens.zrx.address }))
     expect(balances[owner]).toHaveLength(1)
-    expect(balances['0xd0e3872f5fa8ecb49f1911f605c0da90689a484e']).not.toContainEqual(expect.objectContaining({ address: testTokens.zrx.address }))
+    expect(balances['0xd0e3872f5fa8ecb49f1911f605c0da90689a484e']).not.toContainEqual(
+      expect.objectContaining({ address: testTokens.zrx.address })
+    )
     expect(balances['0xd0e3872f5fa8ecb49f1911f605c0da90689a484e']).toHaveLength(1)
   })
 })
@@ -356,7 +373,7 @@ describe('#addCustomTokens', () => {
     tokens = update(tokens)
   }
 
-  const addTokens = tokensToAdd => addCustomTokensAction(updaterFn, tokensToAdd)
+  const addTokens = (tokensToAdd) => addCustomTokensAction(updaterFn, tokensToAdd)
 
   it('adds a token', () => {
     tokens = [testTokens.zrx]
@@ -371,7 +388,7 @@ describe('#addCustomTokens', () => {
 
     const updatedBadgerToken = {
       ...testTokens.badger,
-      symbol: 'BAD'
+      symbol: 'BAD',
     }
 
     addTokens([updatedBadgerToken])
@@ -391,11 +408,11 @@ describe('#removeCustomTokens', () => {
     tokens = update(tokens)
   }
 
-  const removeTokens = tokensToRemove => removeTokensAction(updaterFn, tokensToRemove)
+  const removeTokens = (tokensToRemove) => removeTokensAction(updaterFn, tokensToRemove)
 
   it('removes a token', () => {
     tokens = [testTokens.zrx, testTokens.badger]
-    
+
     const tokenToRemove = { ...testTokens.zrx }
 
     removeTokens([tokenToRemove])
@@ -409,7 +426,7 @@ describe('#removeCustomTokens', () => {
     const tokenToRemove = {
       chainId: 1,
       address: '0x383518188c0c6d7730d91b2c03a03c837814a899',
-      symbol: 'OHM'
+      symbol: 'OHM',
     }
 
     removeTokens([tokenToRemove])
@@ -420,7 +437,7 @@ describe('#removeCustomTokens', () => {
   it('does not remove a token with the same address but different chain id', () => {
     const tokenToRemove = {
       ...testTokens.badger,
-      chainId: 1
+      chainId: 1,
     }
 
     tokens = [testTokens.zrx, testTokens.badger, tokenToRemove]
@@ -433,7 +450,7 @@ describe('#removeCustomTokens', () => {
   it('does not remove a token with the same chain id but different address', () => {
     const tokenToRemove = {
       ...testTokens.zrx,
-      address: '0xa7a82dd06901f29ab14af63faf3358ad101724a8'
+      address: '0xa7a82dd06901f29ab14af63faf3358ad101724a8',
     }
 
     tokens = [testTokens.zrx, testTokens.badger, tokenToRemove]
@@ -455,7 +472,7 @@ describe('#addKnownTokens', () => {
     tokens = update(tokens)
   }
 
-  const addTokens = tokensToAdd => addKnownTokensAction(updaterFn, account, tokensToAdd)
+  const addTokens = (tokensToAdd) => addKnownTokensAction(updaterFn, account, tokensToAdd)
 
   it('adds a token', () => {
     tokens = [testTokens.zrx]
@@ -470,7 +487,7 @@ describe('#addKnownTokens', () => {
 
     const updatedBadgerToken = {
       ...testTokens.badger,
-      symbol: 'BAD'
+      symbol: 'BAD',
     }
 
     addTokens([updatedBadgerToken])
@@ -500,7 +517,7 @@ describe('#setScanning', () => {
     isScanning = update()
   }
 
-  const setScanning = scanning => setScanningAction(updaterFn, owner, scanning)
+  const setScanning = (scanning) => setScanningAction(updaterFn, owner, scanning)
 
   it('immediately sets the state to scanning', () => {
     setScanning(true)
@@ -540,7 +557,7 @@ describe('#initOrigin', () => {
   })
 
   it('creates a new origin', () => {
-    const origin = { name: 'frame.test', chain: { id: 137, type: 'ethereum' }}
+    const origin = { name: 'frame.test', chain: { id: 137, type: 'ethereum' } }
 
     initOrigin('91f6971d-ba85-52d7-a27e-6af206eb2433', origin)
 
@@ -548,13 +565,13 @@ describe('#initOrigin', () => {
       name: 'frame.test',
       chain: {
         id: 137,
-        type: 'ethereum'
+        type: 'ethereum',
       },
       session: {
         requests: 1,
         startedAt: creationDate.getTime(),
-        lastUpdatedAt: creationDate.getTime()
-      }
+        lastUpdatedAt: creationDate.getTime(),
+      },
     })
   })
 })
@@ -616,15 +633,15 @@ describe('#addOriginRequest', () => {
   let origins
 
   const creationTime = new Date('2022-05-24').getTime()
-  const updateTime = creationTime + (1000 * 60 * 60 * 24 * 2) // 2 days
-  const endTime = creationTime + (1000 * 60 * 60 * 24 * 1) // 1 day
+  const updateTime = creationTime + 1000 * 60 * 60 * 24 * 2 // 2 days
+  const endTime = creationTime + 1000 * 60 * 60 * 24 * 1 // 1 day
 
   const updaterFn = (node, id, update) => {
     expect(node).toBe('main.origins')
     origins[id] = update(origins[id])
   }
 
-  const addOriginRequest = id => addOriginRequestAction(updaterFn, id)
+  const addOriginRequest = (id) => addOriginRequestAction(updaterFn, id)
 
   beforeEach(() => {
     jest.useFakeTimers().setSystemTime(updateTime)
@@ -635,8 +652,8 @@ describe('#addOriginRequest', () => {
         session: {
           requests: 3,
           startedAt: creationTime,
-          lastUpdatedAt: creationTime
-        }
+          lastUpdatedAt: creationTime,
+        },
       },
       staleOrigin: {
         chain: { id: 42161, type: 'ethereum' },
@@ -644,9 +661,9 @@ describe('#addOriginRequest', () => {
           requests: 14,
           startedAt: creationTime,
           endedAt: endTime,
-          lastUpdatedAt: endTime
-        }
-      }
+          lastUpdatedAt: endTime,
+        },
+      },
     }
   })
 
@@ -685,7 +702,7 @@ describe('#addOriginRequest', () => {
 })
 
 describe('#switchOriginChain', () => {
-  let origins = { }
+  let origins = {}
 
   const updaterFn = (node, origin, update) => {
     const nodePath = [node, origin].join('.')
@@ -697,17 +714,21 @@ describe('#switchOriginChain', () => {
   beforeEach(() => {
     origins = {
       '91f6971d-ba85-52d7-a27e-6af206eb2433': {
-        chain: { id: 1, type: 'ethereum' }
-      }
+        chain: { id: 1, type: 'ethereum' },
+      },
     }
   })
 
-  const switchChain = (chainId, type) => switchOriginChainAction(updaterFn, '91f6971d-ba85-52d7-a27e-6af206eb2433', chainId, type)
+  const switchChain = (chainId, type) =>
+    switchOriginChainAction(updaterFn, '91f6971d-ba85-52d7-a27e-6af206eb2433', chainId, type)
 
   it('should switch the chain for an origin', () => {
     switchChain(50, 'ethereum')
 
-    expect(origins['91f6971d-ba85-52d7-a27e-6af206eb2433'].chain).toStrictEqual({ id: 50, type: 'ethereum' })
+    expect(origins['91f6971d-ba85-52d7-a27e-6af206eb2433'].chain).toStrictEqual({
+      id: 50,
+      type: 'ethereum',
+    })
   })
 })
 
@@ -723,42 +744,43 @@ describe('#removeNetwork', () => {
     main = {
       origins: {
         '91f6971d-ba85-52d7-a27e-6af206eb2433': {
-          chain: { id: 1, type: 'ethereum' }
+          chain: { id: 1, type: 'ethereum' },
         },
         '8073729a-5e59-53b7-9e69-5d9bcff94087': {
-          chain: { id: 4, type: 'ethereum' }
+          chain: { id: 4, type: 'ethereum' },
         },
         'd7acc008-6411-5486-bb2d-0c0cfcddbb92': {
-          chain: { id: 50, type: 'cosmos' }
+          chain: { id: 50, type: 'cosmos' },
         },
         '695112ec-43e2-52a8-8f69-5c36837d6d13': {
-          chain: { id: 4, type: 'ethereum' }
-        }
+          chain: { id: 4, type: 'ethereum' },
+        },
       },
       networks: {
-        'ethereum': {
+        ethereum: {
           1: {},
           4: {},
-          137: {}
+          137: {},
+        },
+        cosmos: {
+          50: {},
         },
-        'cosmos': {
-          50: {}
-        }
       },
       networksMeta: {
-        'ethereum': {
+        ethereum: {
           1: {},
           4: {},
-          137: {}
+          137: {},
         },
-        'cosmos': {
-          50: {}
-        }
-      }
+        cosmos: {
+          50: {},
+        },
+      },
     }
   })
 
-  const removeNetwork = (networkId, networkType = 'ethereum') => removeNetworkAction(updaterFn, { id: networkId, type: networkType })
+  const removeNetwork = (networkId, networkType = 'ethereum') =>
+    removeNetworkAction(updaterFn, { id: networkId, type: networkType })
 
   it('should delete the network and meta', () => {
     removeNetwork(4)
@@ -772,44 +794,44 @@ describe('#removeNetwork', () => {
 
     expect(main.origins).toStrictEqual({
       '91f6971d-ba85-52d7-a27e-6af206eb2433': {
-        chain: { id: 1, type: 'ethereum' }
+        chain: { id: 1, type: 'ethereum' },
       },
       '8073729a-5e59-53b7-9e69-5d9bcff94087': {
-        chain: { id: 1, type: 'ethereum' }
+        chain: { id: 1, type: 'ethereum' },
       },
       'd7acc008-6411-5486-bb2d-0c0cfcddbb92': {
-        chain: { id: 50, type: 'cosmos' }
+        chain: { id: 50, type: 'cosmos' },
       },
       '695112ec-43e2-52a8-8f69-5c36837d6d13': {
-        chain: { id: 1, type: 'ethereum' }
-      }
+        chain: { id: 1, type: 'ethereum' },
+      },
     })
   })
 
   describe('when passed the last network of a given type', () => {
     it('should not delete the last network of a given type', () => {
       removeNetwork(50, 'cosmos')
-  
+
       expect(main.networks.cosmos[50]).toStrictEqual({})
       expect(main.networksMeta.cosmos[50]).toStrictEqual({})
     })
 
     it('should not update its origins', () => {
       removeNetwork(50, 'cosmos')
-  
+
       expect(main.origins).toStrictEqual({
         '91f6971d-ba85-52d7-a27e-6af206eb2433': {
-          chain: { id: 1, type: 'ethereum' }
+          chain: { id: 1, type: 'ethereum' },
         },
         '8073729a-5e59-53b7-9e69-5d9bcff94087': {
-          chain: { id: 4, type: 'ethereum' }
+          chain: { id: 4, type: 'ethereum' },
         },
         'd7acc008-6411-5486-bb2d-0c0cfcddbb92': {
-          chain: { id: 50, type: 'cosmos' }
+          chain: { id: 50, type: 'cosmos' },
         },
         '695112ec-43e2-52a8-8f69-5c36837d6d13': {
-          chain: { id: 4, type: 'ethereum' }
-        }
+          chain: { id: 4, type: 'ethereum' },
+        },
       })
     })
   })
@@ -827,71 +849,94 @@ describe('#updateNetwork', () => {
     main = {
       origins: {
         '91f6971d-ba85-52d7-a27e-6af206eb2433': {
-          chain: { id: 1, type: 'ethereum' }
+          chain: { id: 1, type: 'ethereum' },
         },
         '8073729a-5e59-53b7-9e69-5d9bcff94087': {
-          chain: { id: 4, type: 'ethereum' }
+          chain: { id: 4, type: 'ethereum' },
         },
         'd7acc008-6411-5486-bb2d-0c0cfcddbb92': {
-          chain: { id: 50, type: 'ethereum' }
+          chain: { id: 50, type: 'ethereum' },
         },
         '695112ec-43e2-52a8-8f69-5c36837d6d13': {
-          chain: { id: 4, type: 'ethereum' }
-        }
+          chain: { id: 4, type: 'ethereum' },
+        },
       },
       networks: {
-        'ethereum': {
+        ethereum: {
           1: {},
           4: {},
-          137: {}
+          137: {},
+        },
+        cosmos: {
+          50: {},
         },
-        'cosmos': {
-          50: {}
-        }
       },
       networksMeta: {
-        'ethereum': {
+        ethereum: {
           1: {},
           4: {},
-          137: {}
+          137: {},
         },
-        'cosmos': {
-          50: {}
-        }
-      }
+        cosmos: {
+          50: {},
+        },
+      },
     }
   })
 
   const updateNetwork = (existingNetwork, newNetwork) => updateNetworkAction(updaterFn, existingNetwork, newNetwork)
 
   it('should update the network', () => {
-    updateNetwork({ id: '0x4', type: 'ethereum', name: '', explorer: '', symbol: '' }, { id: '0x42', type: 'ethereum', name: 'test', explorer: 'explorer.test', symbol: 'TEST' })
-
-    expect(main.networks.ethereum).toStrictEqual({ 1: {}, 66: { id: 66, type: 'ethereum', name: 'test', explorer: 'explorer.test', symbol: 'TEST' }, 137: {} })
+    updateNetwork(
+      { id: '0x4', type: 'ethereum', name: '', explorer: '', symbol: '' },
+      { id: '0x42', type: 'ethereum', name: 'test', explorer: 'explorer.test', symbol: 'TEST' }
+    )
+
+    expect(main.networks.ethereum).toStrictEqual({
+      1: {},
+      66: { id: 66, type: 'ethereum', name: 'test', explorer: 'explorer.test', symbol: 'TEST' },
+      137: {},
+    })
   })
 
   it('should trim string properties', () => {
-    updateNetwork({ id: '0x4', type: 'ethereum', name: '', explorer: '', symbol: '' }, { id: '0x42', type: 'ethereum', name: 'test     ', explorer: '   explorer.test    ', symbol: 'TEST  ' })
+    updateNetwork(
+      { id: '0x4', type: 'ethereum', name: '', explorer: '', symbol: '' },
+      {
+        id: '0x42',
+        type: 'ethereum',
+        name: 'test     ',
+        explorer: '   explorer.test    ',
+        symbol: 'TEST  ',
+      }
+    )
 
-    expect(main.networks.ethereum).toStrictEqual({ 1: {}, 66: { id: 66, type: 'ethereum', name: 'test', explorer: 'explorer.test', symbol: 'TEST' }, 137: {} })
+    expect(main.networks.ethereum).toStrictEqual({
+      1: {},
+      66: { id: 66, type: 'ethereum', name: 'test', explorer: 'explorer.test', symbol: 'TEST' },
+      137: {},
+    })
   })
 
   it('should update the chainId for origins using the updated network', () => {
-    updateNetwork({ id: '0x4', type: 'ethereum', name: '', explorer: '', symbol: '' }, { id: '0x42', type: 'ethereum', name: 'test', explorer: 'explorer.test', symbol: 'TEST' })
+    updateNetwork(
+      { id: '0x4', type: 'ethereum', name: '', explorer: '', symbol: '' },
+      { id: '0x42', type: 'ethereum', name: 'test', explorer: 'explorer.test', symbol: 'TEST' }
+    )
 
     expect(main.origins).toStrictEqual({
       '91f6971d-ba85-52d7-a27e-6af206eb2433': {
-        chain: expect.objectContaining({ id: 1, type: 'ethereum' })
+        chain: expect.objectContaining({ id: 1, type: 'ethereum' }),
       },
       '8073729a-5e59-53b7-9e69-5d9bcff94087': {
-        chain: expect.objectContaining({ id: 66, type: 'ethereum' })
+        chain: expect.objectContaining({ id: 66, type: 'ethereum' }),
       },
       'd7acc008-6411-5486-bb2d-0c0cfcddbb92': {
-        chain: expect.objectContaining({ id: 50, type: 'ethereum' })
+        chain: expect.objectContaining({ id: 50, type: 'ethereum' }),
       },
       '695112ec-43e2-52a8-8f69-5c36837d6d13': {
-        chain: expect.objectContaining({ id: 66, type: 'ethereum' })
-      }
+        chain: expect.objectContaining({ id: 66, type: 'ethereum' }),
+      },
     })
   })
 })
@@ -909,14 +954,14 @@ describe('#setBlockHeight', () => {
       networksMeta: {
         ethereum: {
           1: {
-            blockHeight: 0
+            blockHeight: 0,
           },
           4: {
-            blockHeight: 0
+            blockHeight: 0,
           },
           137: {
-            blockHeight: 0
-          }
+            blockHeight: 0,
+          },
         },
       },
     }
@@ -927,6 +972,10 @@ describe('#setBlockHeight', () => {
   it('should update the block height for the expected chain', () => {
     setBlockHeight(4, 500)
 
-    expect(main.networksMeta.ethereum).toStrictEqual({ 1: { blockHeight: 0 }, 4: { blockHeight: 500 }, 137: { blockHeight: 0 } })
+    expect(main.networksMeta.ethereum).toStrictEqual({
+      1: { blockHeight: 0 },
+      4: { blockHeight: 500 },
+      137: { blockHeight: 0 },
+    })
   })
 })
diff --git a/test/main/store/migrations/index.test.js b/test/main/store/migrations/index.test.js
index bdd217e17..885bcc31c 100644
--- a/test/main/store/migrations/index.test.js
+++ b/test/main/store/migrations/index.test.js
@@ -23,7 +23,7 @@ describe('migration 13', () => {
               type: 'ethereum',
               layer: 'mainnet',
               symbol: 'ETH',
-              name: 'Mainnet'
+              name: 'Mainnet',
             },
             137: {
               id: 1,
@@ -34,20 +34,20 @@ describe('migration 13', () => {
               connection: {
                 primary: {
                   on: true,
-                  current: 'matic'
+                  current: 'matic',
                 },
                 secondary: {
                   on: false,
-                  current: 'local'
-                }
-              }
-            }
-          }
+                  current: 'local',
+                },
+              },
+            },
+          },
         },
         networksMeta: {
-          ethereum: { }
-        }
-      }
+          ethereum: {},
+        },
+      },
     }
   })
 
@@ -60,7 +60,7 @@ describe('migration 13', () => {
 
   it('adds default gas price info', () => {
     state.main.networksMeta.ethereum = {
-      1: { }
+      1: {},
     }
 
     const updatedState = migrations.apply(state, 13)
@@ -74,10 +74,10 @@ describe('migration 13', () => {
       1: {
         gas: {
           price: {
-            levels: { slow: '', standard: '', fast: '', asap: '', custom: '' }
-          }
-        }
-      }
+            levels: { slow: '', standard: '', fast: '', asap: '', custom: '' },
+          },
+        },
+      },
     }
 
     const updatedState = migrations.apply(state, 13)
@@ -90,15 +90,15 @@ describe('migration 13', () => {
       1: {
         gas: {
           price: {
-            selected: 'standard'
-          }
-        }
-      }
+            selected: 'standard',
+          },
+        },
+      },
     }
 
-    const updatedState = migrations.apply(state, 13);
+    const updatedState = migrations.apply(state, 13)
 
-    ['slow', 'standard', 'fast', 'asap', 'custom'].forEach(level => {
+    ;['slow', 'standard', 'fast', 'asap', 'custom'].forEach((level) => {
       expect(updatedState.main.networksMeta.ethereum[1].gas.price).toHaveProperty(`levels.${level}`)
     })
   })
@@ -110,11 +110,11 @@ describe('migration 13', () => {
           price: {
             selected: 'asap',
             levels: {
-              slow: '0x0a93'
-            }
-          }
-        }
-      }
+              slow: '0x0a93',
+            },
+          },
+        },
+      },
     }
 
     const updatedState = migrations.apply(state, 13)
@@ -140,48 +140,50 @@ describe('migration 14', () => {
               connection: {
                 primary: {
                   on: true,
-                  current: 'matic'
+                  current: 'matic',
                 },
                 secondary: {
                   on: false,
-                  current: 'local'
-                }
-              }
-            }
-          }
+                  current: 'local',
+                },
+              },
+            },
+          },
         },
         networksMeta: {
-          ethereum: { }
-        }
-      }
+          ethereum: {},
+        },
+      },
     }
   })
 
   const connectionPriorities = ['primary', 'secondary']
 
-  connectionPriorities.forEach(priority => {
+  connectionPriorities.forEach((priority) => {
     it(`updates the ${priority} polygon connection from matic to infura`, () => {
       state.main.networks.ethereum[137].connection[priority].current = 'matic'
-  
+
       const updatedState = migrations.apply(state, 14)
-  
+
       expect(updatedState.main.networks.ethereum[137].connection[priority].current).toBe('infura')
 
       // ensure other settings weren't changed
-      expect(updatedState.main.networks.ethereum[137].connection[priority].on)
-        .toBe(state.main.networks.ethereum[137].connection[priority].on)
+      expect(updatedState.main.networks.ethereum[137].connection[priority].on).toBe(
+        state.main.networks.ethereum[137].connection[priority].on
+      )
     })
-  
+
     it(`does not update the ${priority} polygon connection if not matic`, () => {
       state.main.networks.ethereum[137].connection[priority].current = 'local'
-  
+
       const updatedState = migrations.apply(state, 14)
-  
+
       expect(updatedState.main.networks.ethereum[137].connection[priority].current).toBe('local')
 
       // ensure other settings weren't changed
-      expect(updatedState.main.networks.ethereum[137].connection[priority].on)
-        .toBe(state.main.networks.ethereum[137].connection[priority].on)
+      expect(updatedState.main.networks.ethereum[137].connection[priority].on).toBe(
+        state.main.networks.ethereum[137].connection[priority].on
+      )
     })
   })
 
@@ -199,7 +201,7 @@ describe('migration 14', () => {
       symbol: 'ETH',
       name: 'Arbitrum',
       explorer: 'https://explorer.arbitrum.io',
-      gas: { price: { selected: 'standard', levels: {} } }
+      gas: { price: { selected: 'standard', levels: {} } },
     })
 
     expect(arbitrum.connection.primary.on).toBe(true)
@@ -213,8 +215,8 @@ describe('migration 14', () => {
     state.main.networks.ethereum[42161] = {
       explorer: 'https://custom-explorer.arbitrum.io',
       connection: {
-        primary: { on: true, current: 'local' }
-      }
+        primary: { on: true, current: 'local' },
+      },
     }
 
     const updatedState = migrations.apply(state, 14)
@@ -235,7 +237,7 @@ describe('migration 14', () => {
 
     expect(arbitrum.gas.fees.maxFeePerGas).toBe(undefined)
     expect(arbitrum).toMatchObject({
-      gas: { fees: {} , price: { selected: 'standard', levels: {} } }
+      gas: { fees: {}, price: { selected: 'standard', levels: {} } },
     })
   })
 
@@ -243,9 +245,9 @@ describe('migration 14', () => {
     state.main.networksMeta.ethereum[42161] = {
       gas: {
         fees: {
-          maxFeePerGas: '0xf'
-        }
-      }
+          maxFeePerGas: '0xf',
+        },
+      },
     }
 
     const updatedState = migrations.apply(state, 14)
@@ -273,20 +275,20 @@ describe('migration 15', () => {
               connection: {
                 primary: {
                   on: true,
-                  current: 'matic'
+                  current: 'matic',
                 },
                 secondary: {
                   on: false,
-                  current: 'local'
-                }
-              }
-            }
-          }
+                  current: 'local',
+                },
+              },
+            },
+          },
         },
         networksMeta: {
-          ethereum: { }
-        }
-      }
+          ethereum: {},
+        },
+      },
     }
   })
 
@@ -299,7 +301,7 @@ describe('migration 15', () => {
 
   it('adds the Polygon explorer if one does not exist', () => {
     delete state.main.networks.ethereum['137'].explorer
-    
+
     const updatedState = migrations.apply(state, 15)
     const polygon = updatedState.main.networks.ethereum['137']
 
@@ -322,8 +324,8 @@ describe('migration 16', () => {
       main: {
         _version: 15,
         currentNetwork: {
-          type: 'ethereum', 
-          id: '1'
+          type: 'ethereum',
+          id: '1',
         },
         networks: {
           ethereum: {
@@ -337,20 +339,20 @@ describe('migration 16', () => {
               connection: {
                 primary: {
                   on: true,
-                  current: 'matic'
+                  current: 'matic',
                 },
                 secondary: {
                   on: false,
-                  current: 'local'
-                }
-              }
-            }
-          }
+                  current: 'local',
+                },
+              },
+            },
+          },
         },
         networksMeta: {
-          ethereum: {}
-        }
-      }
+          ethereum: {},
+        },
+      },
     }
   })
 
@@ -374,13 +376,13 @@ describe('migration 17', () => {
         _version: 16,
         lattice: {
           McBbS7: {
-            deviceId: 'McBbS7'
-          }
+            deviceId: 'McBbS7',
+          },
         },
         latticeSettings: {
-          suffix: 'my-laptop'
-        }
-      }
+          suffix: 'my-laptop',
+        },
+      },
     }
   })
 
@@ -427,8 +429,8 @@ describe('migration 18', () => {
     state = {
       main: {
         _version: 17,
-        tokens: ['AVAX', 'OHM']
-      }
+        tokens: ['AVAX', 'OHM'],
+      },
     }
   })
 
@@ -444,7 +446,7 @@ describe('migration 18', () => {
 
     const updatedState = migrations.apply(state, 18)
 
-    expect(updatedState.main.tokens).toEqual({ custom: []})
+    expect(updatedState.main.tokens).toEqual({ custom: [] })
   })
 
   it('migrates missing custom tokens to an empty array', () => {
@@ -452,7 +454,7 @@ describe('migration 18', () => {
 
     const updatedState = migrations.apply(state, 18)
 
-    expect(updatedState.main.tokens).toEqual({ custom: []})
+    expect(updatedState.main.tokens).toEqual({ custom: [] })
   })
 })
 
@@ -463,14 +465,14 @@ describe('migration 19', () => {
         _version: 18,
         currentNetwork: {
           id: 1,
-          type: 'ethereum'
+          type: 'ethereum',
         },
         clients: {
           ipfs: {},
           geth: {},
-          parity: {}
-        }
-      }
+          parity: {},
+        },
+      },
     }
   })
 
@@ -491,16 +493,16 @@ describe('migration 20', () => {
       main: {
         _version: 19,
         mute: {
-          aragonAccountMigrationWarning: true
+          aragonAccountMigrationWarning: true,
         },
         accounts: {
-          'test': {
+          test: {
             smart: {
-              type: 'aragon'
-            }
-          }
-        }
-      }
+              type: 'aragon',
+            },
+          },
+        },
+      },
     }
   })
 
diff --git a/test/main/transaction/gasCalculator.test.js b/test/main/transaction/gasCalculator.test.js
index 923eb8508..ea45c350e 100644
--- a/test/main/transaction/gasCalculator.test.js
+++ b/test/main/transaction/gasCalculator.test.js
@@ -2,13 +2,13 @@ import GasCalculator from '../../../main/transaction/gasCalculator'
 
 let requestHandlers
 let testConnection = {
-  send: jest.fn(payload => {
+  send: jest.fn((payload) => {
     if (payload.method in requestHandlers) {
       return Promise.resolve(requestHandlers[payload.method](payload.params))
     }
 
     return Promise.reject('unsupported method: ' + payload.method)
-  })
+  }),
 }
 
 describe('#getGasPrices', () => {
@@ -16,7 +16,7 @@ describe('#getGasPrices', () => {
 
   beforeEach(() => {
     requestHandlers = {
-      eth_gasPrice: () => gasPrice
+      eth_gasPrice: () => gasPrice,
     }
   })
 
@@ -54,9 +54,9 @@ describe('#getGasPrices', () => {
 })
 
 describe('#getFeePerGas', () => {
-  let baseFeeHistory = [ '0x8', '0x8', '0x8', '0x8', '0x8', '0x8', '0x8', '0x8', '0x8', '0x8', '0xb6' ]
-  let gasUsedRatios = [ 0.12024061496050893 ]
-  let blockRewards = [ [ '0x3b9aca00' ] ]
+  let baseFeeHistory = ['0x8', '0x8', '0x8', '0x8', '0x8', '0x8', '0x8', '0x8', '0x8', '0x8', '0xb6']
+  let gasUsedRatios = [0.12024061496050893]
+  let blockRewards = [['0x3b9aca00']]
 
   beforeEach(() => {
     requestHandlers = {
@@ -67,64 +67,68 @@ describe('#getFeePerGas', () => {
           baseFeePerGas: baseFeeHistory.slice(-numBlocks),
           gasUsedRatio: gasUsedRatios,
           oldestBlock: '0x89502f',
-          reward: blockRewards
+          reward: blockRewards,
         }
-      }
+      },
     }
   })
 
   it('calculates the base fee for the next couple blocks', async () => {
     const gas = new GasCalculator(testConnection)
-  
+
     const fees = await gas.getFeePerGas()
-  
+
     expect(fees.maxBaseFeePerGas).toBe('0xe7')
   })
-  
+
   it('calculates the priority fee for the next block based on normal blocks', async () => {
     // all blocks with gas ratios between 0.1 and 0.9 will be considered for calculating the median priority fee
-    gasUsedRatios = [ 0.12024061496050893, 0.17942918604838942, 0.23114498292513627, 0.1801134637893198 ]
-    blockRewards = [ [ '0xee6b2800' ], [ '0x3b9aca00' ], [ '0x77359400' ], [ '0x3b9aca00' ] ]
-  
+    gasUsedRatios = [0.12024061496050893, 0.17942918604838942, 0.23114498292513627, 0.1801134637893198]
+    blockRewards = [['0xee6b2800'], ['0x3b9aca00'], ['0x77359400'], ['0x3b9aca00']]
+
     const gas = new GasCalculator(testConnection)
-  
+
     const fees = await gas.getFeePerGas()
-  
+
     expect(fees.maxPriorityFeePerGas).toBe('0x77359400')
   })
-  
+
   it('excludes full blocks from the priority fee calculation', async () => {
     // all full blocks (gas ratios above 0.9) will be excluded from calculating the median priority fee
-    gasUsedRatios = [ 0.91024061496050893, 0.17942918604838942, 0.23114498292513627, 1, 0.1801134637893198 ]
-    blockRewards = [ [ '0xee6b2800' ], [ '0x3b9aca00' ], [ '0x77359400' ], [ '0x77359400' ], [ '0x3b9aca00' ] ]
-  
+    gasUsedRatios = [0.91024061496050893, 0.17942918604838942, 0.23114498292513627, 1, 0.1801134637893198]
+    blockRewards = [['0xee6b2800'], ['0x3b9aca00'], ['0x77359400'], ['0x77359400'], ['0x3b9aca00']]
+
     const gas = new GasCalculator(testConnection)
-  
+
     const fees = await gas.getFeePerGas()
-  
+
     expect(fees.maxPriorityFeePerGas).toBe('0x3b9aca00')
   })
-  
+
   it('excludes "empty" blocks from the priority fee calculation', async () => {
     // all empty blocks (gas ratios below 0.9) will be excluded from calculating the median priority fee
-    gasUsedRatios = [ 0.01024061496050893, 0.17942918604838942, 0.23114498292513627, 0.0801134637893198, 0.1801134637893198 ]
-    blockRewards = [ [ '0xee6b2800' ], [ '0x3b9aca00' ], [ '0x77359400' ], [ '0x77359400' ], [ '0x3b9aca00' ] ]
-  
+    gasUsedRatios = [
+      0.01024061496050893, 0.17942918604838942, 0.23114498292513627, 0.0801134637893198, 0.1801134637893198,
+    ]
+    blockRewards = [['0xee6b2800'], ['0x3b9aca00'], ['0x77359400'], ['0x77359400'], ['0x3b9aca00']]
+
     const gas = new GasCalculator(testConnection)
-  
+
     const fees = await gas.getFeePerGas()
-  
+
     expect(fees.maxPriorityFeePerGas).toBe('0x3b9aca00')
   })
-  
+
   it('uses a default priority fee of one gwei when no eligible blocks are available', async () => {
-    gasUsedRatios = [ 0.01024061496050893, 0.07942918604838942, 1.23114498292513627, 0.0801134637893198, 1.1801134637893198 ]
-    blockRewards = [ [ '0xee6b2800' ], [ '0x3b9aca00' ], [ '0x77359400' ], [ '0x77359400' ], [ '0x3b9aca00' ] ]
-  
+    gasUsedRatios = [
+      0.01024061496050893, 0.07942918604838942, 1.23114498292513627, 0.0801134637893198, 1.1801134637893198,
+    ]
+    blockRewards = [['0xee6b2800'], ['0x3b9aca00'], ['0x77359400'], ['0x77359400'], ['0x3b9aca00']]
+
     const gas = new GasCalculator(testConnection)
-  
+
     const fees = await gas.getFeePerGas()
-    
+
     expect(fees.maxBaseFeePerGas).toBe('0xe7')
     expect(fees.maxPriorityFeePerGas).toBe('0x3b9aca00')
   })
diff --git a/test/main/transaction/index.test.js b/test/main/transaction/index.test.js
index 910c46856..e8e84be9f 100644
--- a/test/main/transaction/index.test.js
+++ b/test/main/transaction/index.test.js
@@ -6,7 +6,7 @@ import { maxFee, londonToLegacy, signerCompatibility, populate, sign } from '../
 describe('#signerCompatibility', () => {
   it('is always compatible with legacy transactions', () => {
     const tx = {
-      type: '0x0'
+      type: '0x0',
     }
 
     const compatibility = signerCompatibility(tx, { type: 'anysigner' })
@@ -18,7 +18,7 @@ describe('#signerCompatibility', () => {
 
   it('is always compatible with eip-1559 transactions for seed signers', () => {
     const tx = {
-      type: '0x2'
+      type: '0x2',
     }
 
     const compatibility = signerCompatibility(tx, { type: 'seed' })
@@ -30,7 +30,7 @@ describe('#signerCompatibility', () => {
 
   it('is always compatible with eip-1559 transactions for ring signers', () => {
     const tx = {
-      type: '0x2'
+      type: '0x2',
     }
 
     const compatibility = signerCompatibility(tx, { type: 'ring' })
@@ -43,7 +43,7 @@ describe('#signerCompatibility', () => {
   it('is not compatible for eip-1559 transactions on Ledger signers using eth app prior to 1.9.x', () => {
     const appVersion = { major: 1, minor: 7, patch: 4 }
     const tx = {
-      type: '0x2'
+      type: '0x2',
     }
 
     const compatibility = signerCompatibility(tx, { type: 'ledger', appVersion })
@@ -56,7 +56,7 @@ describe('#signerCompatibility', () => {
   it('is compatible for eip-1559 transactions on Ledger signers using eth app 1.9.x', () => {
     const appVersion = { major: 1, minor: 9, patch: 0 }
     const tx = {
-      type: '0x2'
+      type: '0x2',
     }
 
     const compatibility = signerCompatibility(tx, { type: 'ledger', appVersion })
@@ -69,7 +69,7 @@ describe('#signerCompatibility', () => {
   it('is compatible for eip-1559 transactions on Ledger signers using eth app 2.x', () => {
     const appVersion = { major: 2, minor: 1, patch: 3 }
     const tx = {
-      type: '0x2'
+      type: '0x2',
     }
 
     const compatibility = signerCompatibility(tx, { type: 'ledger', appVersion })
@@ -82,7 +82,7 @@ describe('#signerCompatibility', () => {
   it('is not compatible for eip-1559 transactions on Lattice signers using firmware prior to 0.11.x', () => {
     const appVersion = { major: 0, minor: 10, patch: 0 }
     const tx = {
-      type: '0x2'
+      type: '0x2',
     }
 
     const compatibility = signerCompatibility(tx, { type: 'lattice', appVersion })
@@ -95,7 +95,7 @@ describe('#signerCompatibility', () => {
   it('is compatible for eip-1559 transactions on Lattice signers using firmware 0.11.x', () => {
     const appVersion = { major: 0, minor: 11, patch: 2 }
     const tx = {
-      type: '0x2'
+      type: '0x2',
     }
 
     const compatibility = signerCompatibility(tx, { type: 'lattice', appVersion })
@@ -108,7 +108,7 @@ describe('#signerCompatibility', () => {
   it('is compatible for eip-1559 transactions on Lattice signers using firmware 1.x', () => {
     const appVersion = { major: 1, minor: 0, patch: 2 }
     const tx = {
-      type: '0x2'
+      type: '0x2',
     }
 
     const compatibility = signerCompatibility(tx, { type: 'lattice', appVersion })
@@ -121,10 +121,14 @@ describe('#signerCompatibility', () => {
   it('is not compatible for eip-1559 transactions on Trezor One signers using firmware prior to 1.10.4', () => {
     const appVersion = { major: 1, minor: 10, patch: 0 }
     const tx = {
-      type: '0x2'
+      type: '0x2',
     }
 
-    const compatibility = signerCompatibility(tx, { type: 'trezor', appVersion, model: 'Trezor One' })
+    const compatibility = signerCompatibility(tx, {
+      type: 'trezor',
+      appVersion,
+      model: 'Trezor One',
+    })
 
     expect(compatibility.signer).toBe('trezor')
     expect(compatibility.tx).toBe('london')
@@ -134,7 +138,7 @@ describe('#signerCompatibility', () => {
   it('is not compatible for eip-1559 transactions on Trezor T signers using firmware prior to 2.4.2', () => {
     const appVersion = { major: 2, minor: 4, patch: 0 }
     const tx = {
-      type: '0x2'
+      type: '0x2',
     }
 
     const compatibility = signerCompatibility(tx, { type: 'trezor', appVersion, model: 'Trezor T' })
@@ -147,10 +151,14 @@ describe('#signerCompatibility', () => {
   it('is compatible for eip-1559 transactions on Trezor One signers using firmware 1.10.4+', () => {
     const appVersion = { major: 1, minor: 11, patch: 0 }
     const tx = {
-      type: '0x2'
+      type: '0x2',
     }
 
-    const compatibility = signerCompatibility(tx, { type: 'trezor', appVersion, model: 'Trezor One' })
+    const compatibility = signerCompatibility(tx, {
+      type: 'trezor',
+      appVersion,
+      model: 'Trezor One',
+    })
 
     expect(compatibility.signer).toBe('trezor')
     expect(compatibility.tx).toBe('london')
@@ -160,7 +168,7 @@ describe('#signerCompatibility', () => {
   it('is compatible for eip-1559 transactions on Trezor T signers using firmware 2.4.2+', () => {
     const appVersion = { major: 2, minor: 5, patch: 1 }
     const tx = {
-      type: '0x2'
+      type: '0x2',
     }
 
     const compatibility = signerCompatibility(tx, { type: 'trezor', appVersion, model: 'Trezor T' })
@@ -173,7 +181,7 @@ describe('#signerCompatibility', () => {
   it('is compatible for eip-1559 transactions on Trezor signers using firmware 3.x', () => {
     const appVersion = { major: 3, minor: 2, patch: 4 }
     const tx = {
-      type: '0x2'
+      type: '0x2',
     }
 
     const compatibility = signerCompatibility(tx, { type: 'trezor', appVersion, model: 'Trezor T' })
@@ -192,7 +200,7 @@ describe('#londonToLegacy', () => {
       gasLimit: '0x61a8',
       value: '0x6f05b59d3b20000',
       to: '0x6635f83421bf059cd8111f180f0727128685bae4',
-      data: '0x0000000000000000000006635f83421bf059cd8111f180f0726635f83421bf059cd8111f180f072'
+      data: '0x0000000000000000000006635f83421bf059cd8111f180f0726635f83421bf059cd8111f180f072',
     }
 
     const tx = londonToLegacy(rawTx)
@@ -210,18 +218,18 @@ describe('#londonToLegacy', () => {
   it('converts a London transaction to a legacy transaction', () => {
     const rawTx = {
       type: '0x2',
-      maxFeePerGas: addHexPrefix(7e9.toString(16)),
-      maxPriorityFeePerGas: addHexPrefix(2e9.toString(16)),
+      maxFeePerGas: addHexPrefix((7e9).toString(16)),
+      maxPriorityFeePerGas: addHexPrefix((2e9).toString(16)),
       gasLimit: '0x61a8',
       value: '0x6f05b59d3b20000',
       to: '0x6635f83421bf059cd8111f180f0727128685bae4',
-      data: '0x0000000000000000000006635f83421bf059cd8111f180f0726635f83421bf059cd8111f180f072'
+      data: '0x0000000000000000000006635f83421bf059cd8111f180f0726635f83421bf059cd8111f180f072',
     }
 
     const tx = londonToLegacy(rawTx)
 
     expect(parseInt(tx.type)).toBe(0)
-    expect(tx.gasPrice).toBe(addHexPrefix(7e9.toString(16)))
+    expect(tx.gasPrice).toBe(addHexPrefix((7e9).toString(16)))
     expect(tx.gasLimit).toBe(rawTx.gasLimit)
     expect(tx.maxFeePerGas).toBe(undefined)
     expect(tx.maxPriorityFeePerGas).toBe(undefined)
@@ -234,7 +242,7 @@ describe('#londonToLegacy', () => {
 describe('#maxFee', () => {
   it('sets the max fee as 2 ETH on mainnet', () => {
     const tx = {
-      chainId: addHexPrefix((1).toString(16))
+      chainId: addHexPrefix((1).toString(16)),
     }
 
     expect(maxFee(tx)).toBe(2e18)
@@ -242,7 +250,7 @@ describe('#maxFee', () => {
 
   it('sets the max fee as 250 FTM on Fantom', () => {
     const tx = {
-      chainId: addHexPrefix((250).toString(16))
+      chainId: addHexPrefix((250).toString(16)),
     }
 
     expect(maxFee(tx)).toBe(250e18)
@@ -250,7 +258,7 @@ describe('#maxFee', () => {
 
   it('sets the max fee as 50 on other chains', () => {
     const tx = {
-      chainId: addHexPrefix((255).toString(16))
+      chainId: addHexPrefix((255).toString(16)),
     }
 
     expect(maxFee(tx)).toBe(5e19)
@@ -263,16 +271,16 @@ describe('#populate', () => {
     gasLimit: '0x61a8',
     value: '0x6f05b59d3b20000',
     to: '0x6635f83421bf059cd8111f180f0727128685bae4',
-    data: '0x0000000000000000000006635f83421bf059cd8111f180f0726635f83421bf059cd8111f180f072'
+    data: '0x0000000000000000000006635f83421bf059cd8111f180f0726635f83421bf059cd8111f180f072',
   }
 
   beforeEach(() => {
     gas = {
       price: {
         levels: {
-          fast: ''
-        }
-      }
+          fast: '',
+        },
+      },
     }
   })
 
@@ -286,7 +294,7 @@ describe('#populate', () => {
     })
 
     it('sets gas price', () => {
-      gas.price.levels.fast = addHexPrefix(7e9.toString(16))
+      gas.price.levels.fast = addHexPrefix((7e9).toString(16))
       const tx = populate(rawTx, chainConfig, gas)
 
       expect(tx.gasPrice).toBe(gas.price.levels.fast)
@@ -301,9 +309,9 @@ describe('#populate', () => {
         price: {
           fees: {
             maxPriorityFeePerGas: '',
-            maxBaseFeePerGas: ''
-          }
-        }
+            maxBaseFeePerGas: '',
+          },
+        },
       }
     })
 
@@ -314,15 +322,15 @@ describe('#populate', () => {
     })
 
     it('sets the max priority fee', () => {
-      gas.price.fees.maxPriorityFeePerGas = addHexPrefix(2e9.toString(16))
+      gas.price.fees.maxPriorityFeePerGas = addHexPrefix((2e9).toString(16))
       const tx = populate(rawTx, chainConfig, gas)
 
       expect(tx.maxPriorityFeePerGas).toBe(gas.price.fees.maxPriorityFeePerGas)
     })
 
     it('sets the max total fee', () => {
-      gas.price.fees.maxPriorityFeePerGas = addHexPrefix(2e9.toString(16))
-      gas.price.fees.maxBaseFeePerGas = addHexPrefix(8e9.toString(16))
+      gas.price.fees.maxPriorityFeePerGas = addHexPrefix((2e9).toString(16))
+      gas.price.fees.maxBaseFeePerGas = addHexPrefix((8e9).toString(16))
 
       const tx = populate(rawTx, chainConfig, gas)
 
@@ -347,20 +355,20 @@ describe('#sign', () => {
     gasLimit: '0x61a8',
     value: '0x6f05b59d3b20000',
     to: '0x6635f83421bf059cd8111f180f0727128685bae4',
-    data: '0x00000000000000000000006635f83421bf059cd8111f180f0726635f83421bf059cd8111f180f072'
+    data: '0x00000000000000000000006635f83421bf059cd8111f180f0726635f83421bf059cd8111f180f072',
   }
 
   const signature = {
     v: '0x00',
     r: '0xd693b532a80fed6392b428604171fb32fdbf953728a3a7ecc7d4062b1652c042',
-    s: '0x24e9c602ac800b983b035700a14b23f78a253ab762deab5dc27e3555a750b354'
+    s: '0x24e9c602ac800b983b035700a14b23f78a253ab762deab5dc27e3555a750b354',
   }
 
   it('generates a signed legacy transaction', async () => {
-    const rawTx = { 
+    const rawTx = {
       ...baseTx,
       type: '0x0',
-      gasPrice: '0x737be7600'
+      gasPrice: '0x737be7600',
     }
 
     const { type, ...expectedFields } = rawTx
@@ -369,16 +377,16 @@ describe('#sign', () => {
     expect(signedTx.toJSON()).toMatchObject({
       ...expectedFields,
       ...signature,
-      v: '0x0' // additional zeroes are stripped
+      v: '0x0', // additional zeroes are stripped
     })
   })
 
   it('generates a signed eip-1559 transaction', async () => {
-    const rawTx = { 
+    const rawTx = {
       ...baseTx,
       type: '0x2',
       maxFeePerGas: '0x737be7600',
-      maxPriorityFeePerGas: '0x3'
+      maxPriorityFeePerGas: '0x3',
     }
 
     const { type, ...expectedFields } = rawTx
@@ -387,20 +395,23 @@ describe('#sign', () => {
     expect(signedTx.toJSON()).toMatchObject({
       ...expectedFields,
       ...signature,
-      v: '0x0' // additional zeroes are stripped
+      v: '0x0', // additional zeroes are stripped
     })
   })
 
   it('adds hex prefixes to the signature', async () => {
-    const signedTx = await sign(baseTx, jest.fn().mockResolvedValueOnce({
-      v: stripHexPrefix(signature.v),
-      r: stripHexPrefix(signature.r),
-      s: stripHexPrefix(signature.s)
-    }))
-    
+    const signedTx = await sign(
+      baseTx,
+      jest.fn().mockResolvedValueOnce({
+        v: stripHexPrefix(signature.v),
+        r: stripHexPrefix(signature.r),
+        s: stripHexPrefix(signature.s),
+      })
+    )
+
     expect(signedTx.toJSON()).toMatchObject({
       ...signature,
-      v: '0x0' // additional zeroes are stripped
+      v: '0x0', // additional zeroes are stripped
     })
   })
 })
diff --git a/test/main/windows/dialog/unhandledException.test.js b/test/main/windows/dialog/unhandledException.test.js
index f89fd74f1..94ba4cd30 100644
--- a/test/main/windows/dialog/unhandledException.test.js
+++ b/test/main/windows/dialog/unhandledException.test.js
@@ -4,20 +4,21 @@ import { app, dialog } from 'electron'
 jest.mock('electron', () => ({
   dialog: {
     showMessageBoxSync: jest.fn(),
-    showErrorBox: jest.fn()
+    showErrorBox: jest.fn(),
   },
   app: {
     quit: jest.fn(),
-    relaunch: jest.fn()
-  }
+    relaunch: jest.fn(),
+  },
 }))
 
 it('displays the error message to the user', () => {
   showUnhandledExceptionDialog('something bad happened')
 
-  expect(dialog.showMessageBoxSync).toHaveBeenCalledWith(undefined,
+  expect(dialog.showMessageBoxSync).toHaveBeenCalledWith(
+    undefined,
     expect.objectContaining({
-      detail: 'something bad happened'
+      detail: 'something bad happened',
     })
   )
 })
@@ -25,16 +26,17 @@ it('displays the error message to the user', () => {
 it('gives the user an option to accept the error or quit Frame', () => {
   showUnhandledExceptionDialog('something bad happened')
 
-  expect(dialog.showMessageBoxSync).toHaveBeenCalledWith(undefined,
+  expect(dialog.showMessageBoxSync).toHaveBeenCalledWith(
+    undefined,
     expect.objectContaining({
-      buttons: ['OK', 'Quit']
+      buttons: ['OK', 'Quit'],
     })
   )
 })
 
 it('will relaunch the app when the user clicks OK', () => {
   dialog.showMessageBoxSync.mockImplementation(() => 0)
-  
+
   showUnhandledExceptionDialog('something bad happened')
 
   expect(app.relaunch).toHaveBeenCalled()
@@ -43,7 +45,7 @@ it('will relaunch the app when the user clicks OK', () => {
 
 it('will not relaunch the app when the user clicks quit', () => {
   dialog.showMessageBoxSync.mockImplementation(() => 1)
-  
+
   showUnhandledExceptionDialog('something bad happened')
 
   expect(app.relaunch).not.toHaveBeenCalled()
@@ -52,7 +54,7 @@ it('will not relaunch the app when the user clicks quit', () => {
 
 it('shows a simple error box and quits for an EADDRINUSE error', () => {
   showUnhandledExceptionDialog('Frame is already running', 'EADDRINUSE')
-  
+
   expect(dialog.showErrorBox).toHaveBeenCalled()
   expect(dialog.showMessageBoxSync).not.toHaveBeenCalled()
   expect(app.relaunch).not.toHaveBeenCalled()
diff --git a/test/resources/connections/index.test.js b/test/resources/connections/index.test.js
index 45b0bb275..605217528 100644
--- a/test/resources/connections/index.test.js
+++ b/test/resources/connections/index.test.js
@@ -41,7 +41,6 @@ describe('#okProtocol', () => {
     expect(okProtocol('frame')).toBe(false)
   })
 
-
   it('does not allow an unknown protocol', () => {
     expect(okProtocol('tcp://127.0.0.1')).toBe(false)
   })
diff --git a/test/resources/domain/transaction/index.test.js b/test/resources/domain/transaction/index.test.js
index d96cbe412..ae4301ebb 100644
--- a/test/resources/domain/transaction/index.test.js
+++ b/test/resources/domain/transaction/index.test.js
@@ -17,7 +17,7 @@ describe('#typeSupportsBaseFee', () => {
 describe('#usesBaseFee', () => {
   it('does not use a base fee for transaction type 0', () => {
     const tx = {
-      type: '0x0'
+      type: '0x0',
     }
 
     expect(usesBaseFee(tx)).toBe(false)
@@ -25,7 +25,7 @@ describe('#usesBaseFee', () => {
 
   it('does not use a base fee for transaction type 1', () => {
     const tx = {
-      type: '0x1'
+      type: '0x1',
     }
 
     expect(usesBaseFee(tx)).toBe(false)
@@ -33,7 +33,7 @@ describe('#usesBaseFee', () => {
 
   it('uses a base fee for transaction type 2', () => {
     const tx = {
-      type: '0x2'
+      type: '0x2',
     }
 
     expect(usesBaseFee(tx)).toBe(true)
diff --git a/test/util.js b/test/util.js
index 885c61c55..6e1bacc1e 100644
--- a/test/util.js
+++ b/test/util.js
@@ -4,22 +4,22 @@ const EventEmitter = require('events')
 const store = require('../main/store')
 const { addHexPrefix } = require('ethereumjs-util')
 
-const weiToHex = wei => addHexPrefix(wei.toString(16))
-const gweiToHex = gwei => weiToHex(gwei * 1e9)
+const weiToHex = (wei) => addHexPrefix(wei.toString(16))
+const gweiToHex = (gwei) => weiToHex(gwei * 1e9)
 
 class Observer extends EventEmitter {
-  constructor (root, keys) {
+  constructor(root, keys) {
     super()
 
     // Setup observer for root
-    store.observer(_ => {
+    store.observer((_) => {
       const value = store(root)
       this.emit('root', value)
     })
 
     // Setup observers for each key
     keys.forEach((key) => {
-      store.observer(_ => {
+      store.observer((_) => {
         const value = store(`${root}.${key}`)
         this.emit(key, value)
       })
@@ -28,13 +28,13 @@ class Observer extends EventEmitter {
 }
 
 class Counter {
-  constructor (max, done) {
+  constructor(max, done) {
     this.count = 0
     this.max = max
     this.done = done
   }
 
-  expect (value) {
+  expect(value) {
     this.count++
     setTimeout(() => {
       if (this.count === this.max) this.done()