From 593ddc6bb5efe7d4dc8ee55af3023fd21ece593d Mon Sep 17 00:00:00 2001
From: Maxwell Lasky <mlasky46@gmail.com>
Date: Fri, 8 Sep 2023 13:53:02 -0600
Subject: [PATCH 1/7] WIP removing neoscan dep

---
 app/actions/balancesActions.js                | 42 ++++-------
 app/actions/nodeStorageActions.js             |  1 +
 app/actions/voteActions.js                    |  6 +-
 .../Blockchain/Transaction/Transaction.jsx    | 13 +---
 app/core/constants.js                         |  1 -
 app/core/explorer.js                          | 11 +--
 app/core/wallet.js                            |  1 +
 app/modules/transactions.js                   | 73 ++++++++++---------
 flow-typed/declarations.js                    |  1 -
 9 files changed, 67 insertions(+), 82 deletions(-)

diff --git a/app/actions/balancesActions.js b/app/actions/balancesActions.js
index 783fc4cb5..518f19e66 100644
--- a/app/actions/balancesActions.js
+++ b/app/actions/balancesActions.js
@@ -279,42 +279,30 @@ async function getBalances({ net, address, isRetry = false, chain }: Props) {
     }
   })
 
-  // asset balances
-  const assetBalances = await api
-    .getBalanceFrom({ net, address }, api.neoscan)
-    .catch(e => console.error(e))
+  const assetBalances = {}
+  const mainnetBalances = await axios.get(
+    `https://dora.coz.io/api/v1/neo2/mainnet/get_balance/${address}`,
+  )
 
+  mainnetBalances.data.balance.forEach(token => {
+    assetBalances[token.asset_symbol || token.symbol] = {
+      balance: token.amount,
+      hash: token.asset_hash,
+    }
+  })
   const testnetBalances = await axios.get(
     `https://dora.coz.io/api/v1/neo2/testnet/get_balance/${address}`,
   )
   const parsedTestNetBalances = {}
-
   testnetBalances.data.balance.forEach(token => {
-    parsedTestNetBalances[token.asset_symbol || token.symbol] = {
+    parsedTestNetBalances[token.asset] = {
       balance: token.amount,
       hash: token.asset_hash,
     }
   })
-
-  const assets =
-    net === 'MainNet'
-      ? get(assetBalances, 'balance.assets', {})
-      : parsedTestNetBalances
-
-  // The API doesn't always return NEO or GAS keys if, for example, the address only has one asset
-  // eslint-disable-next-line
-  const neoBalance = assets.NEO
-    ? net === 'MainNet'
-      ? assets.NEO.balance.toString()
-      : assets.NEO.balance
-    : '0'
-  // eslint-disable-next-line
-  const gasBalance = assets.GAS
-    ? net === 'MainNet'
-      ? assets.GAS.balance.round(COIN_DECIMAL_LENGTH).toString()
-      : assets.GAS.balance
-    : '0'
-
+  const assets = net === 'MainNet' ? assetBalances : parsedTestNetBalances
+  const neoBalance = assets?.NEO?.balance ?? '0'
+  const gasBalance = assets.GAS?.balance ?? '0'
   const parsedAssets = [
     { [ASSETS.NEO]: neoBalance },
     { [ASSETS.GAS]: gasBalance },
@@ -356,6 +344,8 @@ async function getBalances({ net, address, isRetry = false, chain }: Props) {
   resetAudioTrigger()
   inMemoryNetwork = net
   // $FlowFixMe
+
+  console.log(extend({}, ...parsedTokenBalances, ...parsedAssets))
   return extend({}, ...parsedTokenBalances, ...parsedAssets)
 }
 
diff --git a/app/actions/nodeStorageActions.js b/app/actions/nodeStorageActions.js
index 24f1770bc..e9658a690 100644
--- a/app/actions/nodeStorageActions.js
+++ b/app/actions/nodeStorageActions.js
@@ -140,6 +140,7 @@ export const getRPCEndpoint = async (
         error,
       },
     )
+    // TODO: update this fallback, neoscan is deprecated and this will not work
     const endpoint = await api.getRPCEndpointFrom({ net }, api.neoscan)
     return endpoint
   } finally {
diff --git a/app/actions/voteActions.js b/app/actions/voteActions.js
index d26c94c03..937a24247 100644
--- a/app/actions/voteActions.js
+++ b/app/actions/voteActions.js
@@ -3,6 +3,7 @@ import { api, rpc } from '@cityofzion/neon-js-legacy'
 import { createActions } from 'spunky'
 
 import { getNetworkById } from '../core/deprecated'
+import { getNode, getRPCEndpoint } from './nodeStorageActions'
 
 type Props = {
   networkId: string,
@@ -15,7 +16,10 @@ export default createActions(
   ID,
   ({ networkId, address }: Props = {}) => async () => {
     const net = getNetworkById(networkId)
-    const endpoint = await api.getRPCEndpointFrom({ net }, api.neoscan)
+    let endpoint = await getNode(net)
+    if (!endpoint) {
+      endpoint = await getRPCEndpoint(net)
+    }
     const client = new rpc.RPCClient(endpoint)
 
     const validators = await client.getValidators()
diff --git a/app/components/Blockchain/Transaction/Transaction.jsx b/app/components/Blockchain/Transaction/Transaction.jsx
index 6635779ce..5c495e01e 100644
--- a/app/components/Blockchain/Transaction/Transaction.jsx
+++ b/app/components/Blockchain/Transaction/Transaction.jsx
@@ -49,14 +49,7 @@ type Props = {
 }
 
 export default function Transaction(props: Props) {
-  const {
-    tx: { type },
-    chain,
-    className,
-    isPending,
-    renderN2Tx,
-    address,
-  } = props
+  const { tx, chain, className, isPending, renderN2Tx, address } = props
 
   const { contacts } = useContactsContext()
 
@@ -150,7 +143,7 @@ export default function Transaction(props: Props) {
       )
     }
 
-    switch (type) {
+    switch (tx?.type) {
       case TX_TYPES.CLAIM:
         return <ClaimAbstract {...abstractProps} />
       case TX_TYPES.SEND:
@@ -217,7 +210,7 @@ export default function Transaction(props: Props) {
     <div className={classNames(styles.transactionContainer, className)}>
       {chain === 'neo3' && !renderN2Tx
         ? renderAbstractN3()
-        : renderAbstract(type)}
+        : renderAbstract(tx?.type)}
       {!isPending && (
         <Button
           className={styles.transactionHistoryButton}
diff --git a/app/core/constants.js b/app/core/constants.js
index 88e68fdda..c45e861a4 100644
--- a/app/core/constants.js
+++ b/app/core/constants.js
@@ -51,7 +51,6 @@ export const EXPLORERS = {
 
 export const DEPRECATED_EXPLORERS = {
   NEO_TRACKER: 'Neotracker',
-  NEO_SCAN: 'Neoscan',
 }
 
 export const LANGUAGES = {
diff --git a/app/core/explorer.js b/app/core/explorer.js
index 1ee581215..c93114de1 100644
--- a/app/core/explorer.js
+++ b/app/core/explorer.js
@@ -4,7 +4,7 @@ import { EXPLORERS, DEPRECATED_EXPLORERS } from './constants'
 import { isMainNetwork } from './networks'
 
 const { ANT_CHAIN, DORA, NEOTUBE } = EXPLORERS
-const { NEO_SCAN, NEO_TRACKER } = DEPRECATED_EXPLORERS
+const { NEO_TRACKER } = DEPRECATED_EXPLORERS
 
 export const getExplorerBaseURL = (
   networkId: string,
@@ -17,9 +17,6 @@ export const getExplorerBaseURL = (
         ? 'https://neotracker.io'
         : 'https://testnet.neotracker.io'
     }
-    case NEO_SCAN: {
-      return isMainNet ? 'https://neoscan.io' : 'https://neoscan-testnet.io'
-    }
     case ANT_CHAIN: {
       return isMainNet ? 'http://antcha.in' : 'http://testnet.antcha.in'
     }
@@ -45,8 +42,6 @@ export const getExplorerTxLink = (
   switch (explorer) {
     case NEO_TRACKER:
       return `${baseURL}/tx/${txId}`
-    case NEO_SCAN:
-      return `${baseURL}/transaction/${txId}`
     case ANT_CHAIN:
       return `${baseURL}/tx/hash/0x${txId}`
     case NEOTUBE:
@@ -72,8 +67,6 @@ export const getExplorerAddressLink = (
   switch (explorer) {
     case NEO_TRACKER:
       return `${baseURL}/address/${address}`
-    case NEO_SCAN:
-      return `${baseURL}/address/${address}/1`
     case ANT_CHAIN:
       return `${baseURL}/address/info/${address}`
     case NEOTUBE:
@@ -96,8 +89,6 @@ export const getExplorerAssetLink = (
   const baseURL = getExplorerBaseURL(networkId, explorer)
   switch (explorer) {
     case NEO_TRACKER:
-    case NEO_SCAN:
-      return `${baseURL}/asset/${assetId}`
     case ANT_CHAIN:
       return `${baseURL}/assets/hash/${assetId}`
     case DORA:
diff --git a/app/core/wallet.js b/app/core/wallet.js
index f1210cc74..702112d98 100644
--- a/app/core/wallet.js
+++ b/app/core/wallet.js
@@ -88,6 +88,7 @@ export const validateTransactionsBeforeSending = (
 ) => {
   const getValidationError = sendEntry => {
     const balance = obtainBalance(balances, sendEntry.symbol)
+    debugger
     return validateTransactionBeforeSending(balance, sendEntry)
   }
 
diff --git a/app/modules/transactions.js b/app/modules/transactions.js
index 3304b2d3a..b9ef451e1 100644
--- a/app/modules/transactions.js
+++ b/app/modules/transactions.js
@@ -87,7 +87,7 @@ export const buildTransferScript = (
 
     scriptBuilder.emitAppCall(scriptHash, 'transfer', args)
   })
-
+  debugger
   return scriptBuilder.str
 }
 
@@ -100,21 +100,21 @@ const makeRequest = (
   // because neon-js will also mutate this same object by reference
   // eslint-disable-next-line no-param-reassign
   config.intents = buildIntents(sendEntries)
-
+  const provider = new N2.api.neoCli.instance(config.url)
+  config.api = provider
   if (script === '') {
     if (config.net === 'TestNet') {
       // eslint-disable-next-line
-      const provider = new N2.api.neoCli.instance(config.url)
-      config.api = provider
+
       return N2.api.sendAsset(config)
     }
-    return api.sendAsset(config, api.neoscan)
+    return api.sendAsset(config)
   }
   // eslint-disable-next-line no-param-reassign
   config.script = script
   // eslint-disable-next-line no-param-reassign
   config.gas = 0
-  return api.doInvoke(config, api.neoscan)
+  return api.doInvoke(config)
 }
 
 export const generateBalanceInfo = (
@@ -327,6 +327,7 @@ export const sendTransaction = ({
   const publicKey = getPublicKey(state)
   const isHardwareSend = getIsHardwareLogin(state)
   const { tokens } = state.spunky.settings.data
+  debugger
   return chain === 'neo3'
     ? new Promise(async (resolve, reject) => {
         try {
@@ -476,26 +477,35 @@ export const sendTransaction = ({
         }
 
         if (net === 'MainNet') {
-          const balanceResults = await api
-            .getBalanceFrom({ net, address: fromAddress }, api.neoscan)
-            .catch(e => {
-              // indicates that neo scan is down and that api.sendAsset and api.doInvoke
-              // will fail unless balances are supplied
-              console.error(e)
-              config.balance = generateBalanceInfo(
-                tokensBalanceMap,
-                fromAddress,
-                net,
-              )
-            })
-          config.balance = balanceResults.balance
+          const mainnetBalances = await axios.get(
+            `https://dora.coz.io/api/v1/neo2/mainnet/get_balance/${fromAddress}`,
+          )
+          const parsedMainnetBalances = {}
+          mainnetBalances.data.balance.forEach(token => {
+            parsedMainnetBalances[token.asset_symbol || token.symbol] = {
+              name: token.asset_symbol || token.symbol,
+              balance: token.amount,
+              unspent: token.unspent,
+            }
+          })
+          const Balance = new wallet.Balance({ address: fromAddress, net })
+          Object.values(parsedMainnetBalances).forEach(
+            // $FlowFixMe
+            ({ name, balance, unspent }) => {
+              if (name === 'GAS' || name === 'NEO') {
+                Balance.addAsset(name, { balance, unspent })
+              } else {
+                Balance.addToken(name, balance)
+              }
+            },
+          )
+          config.balance = Balance
         }
         if (net === 'TestNet') {
           const testnetBalances = await axios.get(
             `https://dora.coz.io/api/v1/neo2/testnet/get_balance/${fromAddress}`,
           )
           const parsedTestNetBalances = {}
-
           testnetBalances.data.balance.forEach(token => {
             parsedTestNetBalances[token.asset_symbol || token.symbol] = {
               name: token.asset_symbol || token.symbol,
@@ -503,9 +513,7 @@ export const sendTransaction = ({
               unspent: token.unspent,
             }
           })
-
           const Balance = new wallet.Balance({ address: fromAddress, net })
-
           Object.values(parsedTestNetBalances).forEach(
             // $FlowFixMe
             ({ name, balance, unspent }) => {
@@ -516,7 +524,6 @@ export const sendTransaction = ({
               }
             },
           )
-
           config.balance = Balance
         }
 
@@ -573,16 +580,16 @@ export const sendTransaction = ({
           const hash = get(config, 'tx.hash')
 
           if (!isWatchOnly) {
-            dispatch(
-              addPendingTransaction.call({
-                address: config.address,
-                tx: {
-                  hash,
-                  sendEntries,
-                },
-                net,
-              }),
-            )
+            // dispatch(
+            //   addPendingTransaction.call({
+            //     address: config.address,
+            //     tx: {
+            //       hash,
+            //       sendEntries,
+            //     },
+            //     net,
+            //   }),
+            // )
           }
         }
       })
diff --git a/flow-typed/declarations.js b/flow-typed/declarations.js
index 18eed21fb..8f65fb12a 100644
--- a/flow-typed/declarations.js
+++ b/flow-typed/declarations.js
@@ -42,7 +42,6 @@ declare type ExplorerType = $Values<Explorer>
 
 declare type Explorer = {
   NEO_TRACKER: string,
-  NEO_SCAN: string,
   ANT_CHAIN: string,
 }
 

From a95ad42ecfa03b9c6ed8e29ba9d09c8a9092c5b6 Mon Sep 17 00:00:00 2001
From: Maxwell Lasky <mlasky46@gmail.com>
Date: Fri, 8 Sep 2023 14:22:49 -0600
Subject: [PATCH 2/7] Remove more references to neoscan

---
 .../Blockchain/Transaction/Transaction.jsx    |   3 +-
 app/components/Root/Routes.jsx                |  17 -
 app/containers/TokenSale/TokenSale.jsx        | 446 ------------------
 app/containers/TokenSale/TokenSale.scss       |  14 -
 app/containers/TokenSale/index.js             |  59 ---
 app/core/wallet.js                            |   1 -
 app/modules/migration.js                      |   6 +-
 app/modules/sale.js                           | 121 -----
 app/modules/transactions.js                   |  31 +-
 9 files changed, 20 insertions(+), 678 deletions(-)
 delete mode 100644 app/containers/TokenSale/TokenSale.jsx
 delete mode 100644 app/containers/TokenSale/TokenSale.scss
 delete mode 100644 app/containers/TokenSale/index.js
 delete mode 100644 app/modules/sale.js

diff --git a/app/components/Blockchain/Transaction/Transaction.jsx b/app/components/Blockchain/Transaction/Transaction.jsx
index 5c495e01e..16e20b6e4 100644
--- a/app/components/Blockchain/Transaction/Transaction.jsx
+++ b/app/components/Blockchain/Transaction/Transaction.jsx
@@ -103,7 +103,8 @@ export default function Transaction(props: Props) {
 
   function renderAbstract(type: string, isN3?: boolean) {
     const { isPending, address } = props
-    const { time, label, amount, isNetworkFee, to, from, image } = props.tx
+    const { time, label, amount, isNetworkFee, to, from, image } =
+      props.tx || {}
     const contactTo = findContact(to)
     const contactFrom = from && findContact(from)
     const contactToExists = contactTo !== to
diff --git a/app/components/Root/Routes.jsx b/app/components/Root/Routes.jsx
index 8e85ed061..deaa7b697 100644
--- a/app/components/Root/Routes.jsx
+++ b/app/components/Root/Routes.jsx
@@ -18,7 +18,6 @@ import EditWallet from '../../containers/EditWallet'
 import DisplayWalletAccounts from '../../containers/DisplayWalletAccounts'
 import DisplayWalletAccountsQrCodes from '../../containers/DisplayWalletAccounts/DisplayWalletAccountsQrCodes/index'
 import Send from '../../containers/Send'
-import TokenSale from '../../containers/TokenSale'
 import Encrypt from '../../containers/Encrypt'
 import NodeSelect from '../../containers/NodeSelect'
 import News from '../../containers/News'
@@ -96,22 +95,6 @@ export default ({ store }: { store: any }) => (
       <PrivateRoute exact path={ROUTES.ADD_CONTACT} component={AddContact} />
       <PrivateRoute exact path={ROUTES.EDIT_CONTACT} component={AddContact} />
       <PrivateRoute exact path={ROUTES.SEND} component={Send} />
-      <PrivateRoute exact path={ROUTES.TOKEN_SALE} component={TokenSale} />
-      <PrivateRoute
-        exact
-        path={ROUTES.TOKEN_SALE_CONFIRMATION}
-        component={TokenSale}
-      />
-      <PrivateRoute
-        exact
-        path={ROUTES.TOKEN_SALE_SUCCESS}
-        component={TokenSale}
-      />
-      <PrivateRoute
-        exact
-        path={ROUTES.TOKEN_SALE_FAILURE}
-        component={TokenSale}
-      />
       <PrivateRoute exact path={ROUTES.SEND_ADDRESS} component={Send} />
       <PrivateRoute exact path={ROUTES.ENCRYPT} component={Encrypt} />
       <PrivateRoute exact path={ROUTES.NODE_SELECT} component={NodeSelect} />
diff --git a/app/containers/TokenSale/TokenSale.jsx b/app/containers/TokenSale/TokenSale.jsx
deleted file mode 100644
index 5887fd77e..000000000
--- a/app/containers/TokenSale/TokenSale.jsx
+++ /dev/null
@@ -1,446 +0,0 @@
-// @flow
-import React, { Component, Fragment } from 'react'
-import { isEmpty, isEqual } from 'lodash-es'
-import { injectIntl, IntlShape } from 'react-intl'
-
-import {
-  isZero,
-  isNumber,
-  toBigNumber,
-  addNumber,
-  minusNumber,
-  multiplyNumber,
-} from '../../core/math'
-import AmountsPanel from '../../components/AmountsPanel'
-import HeaderBar from '../../components/HeaderBar'
-import ZeroAssets from '../../components/ZeroAssets/ZeroAssets'
-import TokenSalePanel from '../../components/TokenSale/TokenSalePanel/TokenSalePanel'
-import TokenSaleConfirm from '../../components/TokenSale/TokenSaleConfirm/TokenSaleConfirm'
-import TokenSaleSuccess from '../../components/TokenSale/TokenSaleSuccess/TokenSaleSuccess'
-import TokenSaleError from '../../components/TokenSale/TokenSaleError/TokenSaleError'
-import Loader from '../../components/Loader'
-import {
-  TOKEN_SALE_PURCHASE,
-  TOKEN_SALE_CONFIRM,
-  TOKEN_SALE_SUCCESS,
-  TOKEN_SALE_FAILURE,
-  PRICE_UNAVAILABLE,
-  ROUTES,
-} from '../../core/constants'
-import styles from './TokenSale.scss'
-
-type Props = {
-  assetBalances: Object,
-  icoTokens: Array<Object>,
-  prices: Object,
-  address: string,
-  history: Object,
-  showModal: Function,
-  participateInSale: (
-    neoToSend: string,
-    gasToSend: string,
-    scriptHash: string,
-    gasCost: string,
-  ) => Promise<any>,
-  currencyCode: string,
-  intl: IntlShape,
-}
-
-type State = {
-  step: string,
-  assetToPurchaseWith: string,
-  amountToPurchaseFor: number,
-  assetToPurchase: string,
-  conditions: Array<string>,
-  loading: boolean,
-  gasFee: number,
-  acceptedConditions: Array<string>,
-  inputErrorMessage: string,
-  tokenSaleError: Object,
-  hasAssets: boolean,
-  amountsData: Array<Object>,
-}
-
-const INITIAL_STATE = {
-  step: TOKEN_SALE_PURCHASE,
-  amountToPurchaseFor: 0,
-  assetToPurchase: '',
-  loading: false,
-  gasFee: 0,
-  acceptedConditions: [],
-  inputErrorMessage: '',
-  tokenSaleError: {},
-}
-
-// const conditions = [
-//   'I understand that submitting NEO or GAS multiple times may result in a loss of funds or a delayed refund depending on the policy of the ICO company.',
-//   'I understand that some sales may only accept NEO or GAS, and I have verified which is accepted.',
-//   'I understand that if I send NEO or GAS to a token sale that has already ended, I will lose my NEO/GAS and will not be refunded.',
-//   "I understand that City of Zion (CoZ) is not responsible for my usage of this feature, and I have consulted this software's licenses.", // eslint-disable-line
-// ]
-
-class TokenSale extends Component<Props, State> {
-  constructor(props: Props) {
-    super(props)
-
-    this.state = {
-      assetToPurchaseWith: Object.keys(this.props.assetBalances)[0],
-      hasAssets: false,
-      amountsData: [],
-      conditions: [
-        this.props.intl.formatMessage({ id: 'tokenSaleDisclaimer2' }),
-        this.props.intl.formatMessage({ id: 'tokenSaleDisclaimer3' }),
-        this.props.intl.formatMessage({ id: 'tokenSaleDisclaimer4' }),
-        this.props.intl.formatMessage({ id: 'tokenSaleDisclaimer5' }),
-      ],
-      ...INITIAL_STATE,
-    }
-  }
-
-  componentDidUpdate(prevProps: Props) {
-    if (
-      !isEqual(prevProps.assetBalances, this.props.assetBalances) &&
-      !isEmpty(this.props.assetBalances)
-    ) {
-      this.handleUpdatedAssets()
-    }
-  }
-
-  componentDidMount() {
-    this.handleUpdatedAssets()
-  }
-
-  handleUpdatedAssets = () => {
-    const { assetBalances } = this.props
-    const amountsData = this.createAmountsData()
-    const hasAssets = Object.keys(assetBalances).some(asset =>
-      toBigNumber(assetBalances[asset]).greaterThan(0),
-    )
-
-    this.setState({ amountsData, hasAssets })
-  }
-
-  setStep = (step: string) => this.setState({ step })
-
-  getAssetsToPurchaseWith = () => {
-    const { assetBalances } = this.props
-    if (assetBalances && assetBalances.length > 0) {
-      // $FlowFixMe
-      return Object.keys(assetBalances)
-    }
-    return ['NEO', 'GAS']
-  }
-
-  createAmountsData = () => {
-    const { prices, assetBalances } = this.props
-    const { amountToPurchaseFor } = this.state
-    // TODO: Move this logic to AmountsPanel / Centralized place
-    // $FlowFixMe
-    return Object.keys(assetBalances).map((token: string) => {
-      const price = prices[token]
-      const balance = assetBalances[token]
-      const currentBalance = minusNumber(balance, amountToPurchaseFor)
-
-      const amountsObject = {
-        symbol: token,
-        totalBalance: balance,
-        price,
-        currentBalance,
-        totalBalanceWorth: price
-          ? multiplyNumber(balance, price)
-          : PRICE_UNAVAILABLE,
-      }
-
-      return amountsObject
-    })
-  }
-
-  getPurchaseableAssets = () => {
-    const { icoTokens } = this.props
-    if (!icoTokens) return []
-    return icoTokens.map(item => item.token)
-  }
-
-  getTokenToPurchaseInformation = () => {
-    const { icoTokens } = this.props
-    if (!icoTokens) return {}
-    const { assetToPurchase } = this.state
-    return icoTokens.find(tokenObj => tokenObj.token === assetToPurchase)
-  }
-
-  updateField = (item: { name: string, value: string | number }) => {
-    const { name, value } = item
-
-    this.setState({ [name]: value })
-  }
-
-  updateConditions = (condition: string) => {
-    const { acceptedConditions } = this.state
-    const conditionAccepted = acceptedConditions.find(
-      (element: string) => element === condition,
-    )
-
-    if (conditionAccepted) {
-      this.setState({
-        acceptedConditions: [...acceptedConditions].filter(
-          (item: string) => item !== condition,
-        ),
-      })
-    } else {
-      this.setState({ acceptedConditions: [...acceptedConditions, condition] })
-    }
-  }
-
-  isValid = () => {
-    const { amountToPurchaseFor, assetToPurchaseWith, gasFee } = this.state
-    const { assetBalances } = this.props
-
-    const amount = amountToPurchaseFor.toString()
-
-    if (!isNumber(Number(amount))) {
-      this.setState({ inputErrorMessage: 'Amount must be a number.' })
-      return false
-    }
-
-    if (isZero(amount)) {
-      this.setState({ inputErrorMessage: 'Amount must be greater than 0.' })
-      return false
-    }
-
-    if (assetToPurchaseWith === 'NEO' && !toBigNumber(amount).isInteger()) {
-      this.setState({
-        inputErrorMessage: "You can't send fractional amounts of NEO", // eslint-disable-line
-      })
-      return false
-    }
-
-    const assetBalance = toBigNumber(assetBalances[assetToPurchaseWith])
-
-    const gasBalance = toBigNumber(assetBalances.GAS)
-
-    if (gasFee) {
-      if (toBigNumber(gasFee).greaterThan(gasBalance)) {
-        this.setState({
-          inputErrorMessage:
-            'You do not have enough GAS to prioritize this transaction',
-        })
-        return false
-      }
-    }
-
-    if (assetToPurchaseWith === 'GAS') {
-      if (toBigNumber(addNumber(amount, gasFee)).greaterThan(gasBalance)) {
-        this.setState({
-          inputErrorMessage:
-            'You do not have enough GAS to prioritize this transaction',
-        })
-        return false
-      }
-    }
-
-    if (toBigNumber(amount).greaterThan(assetBalance)) {
-      this.setState({
-        inputErrorMessage: `You don't have enough ${assetToPurchaseWith}.`,
-      })
-      return false
-    }
-
-    return true
-  }
-
-  handleAddPriorityFee = (gasFee: number) => this.setState({ gasFee })
-
-  handlePurchase = () => {
-    this.setState({ inputErrorMessage: '' }, () => {
-      const validFields = this.isValid()
-
-      if (validFields) {
-        this.setStep(TOKEN_SALE_CONFIRM)
-        this.props.history.push(ROUTES.TOKEN_SALE_CONFIRMATION)
-      }
-    })
-  }
-
-  setPurchaseStep = () => {
-    this.setState(
-      {
-        assetToPurchaseWith: Object.keys(this.props.assetBalances)[0],
-        hasAssets: true,
-        ...INITIAL_STATE,
-      },
-      () => this.props.history.push(ROUTES.TOKEN_SALE),
-    )
-  }
-
-  handleConfirm = () => {
-    const { participateInSale } = this.props
-    const { assetToPurchaseWith, amountToPurchaseFor, gasFee } = this.state
-
-    this.setState({ loading: true }, async () => {
-      const neoToSend =
-        assetToPurchaseWith === 'NEO' ? amountToPurchaseFor : '0'
-      const gasToSend =
-        assetToPurchaseWith === 'GAS' ? amountToPurchaseFor : '0'
-
-      const token = this.getTokenToPurchaseInformation()
-
-      // $FlowFixMe
-      const { scriptHash } = token
-
-      try {
-        const success = await participateInSale(
-          String(neoToSend),
-          String(gasToSend),
-          String(scriptHash),
-          String(gasFee),
-        )
-
-        if (success) this.setState({ step: TOKEN_SALE_SUCCESS, loading: false })
-        this.props.history.push(ROUTES.TOKEN_SALE_SUCCESS)
-      } catch (err) {
-        this.setState({
-          step: TOKEN_SALE_FAILURE,
-          loading: false,
-          tokenSaleError: err,
-        })
-        this.props.history.push(ROUTES.TOKEN_SALE_FAILURE)
-      }
-    })
-  }
-
-  getOnClickHandler = () => {
-    const { step } = this.state
-    switch (step) {
-      case TOKEN_SALE_PURCHASE:
-        return this.handlePurchase
-      case TOKEN_SALE_CONFIRM:
-        return this.handleConfirm
-      case TOKEN_SALE_SUCCESS:
-        return this.setPurchaseStep
-      case TOKEN_SALE_FAILURE:
-        return this.setPurchaseStep
-      default:
-        return this.handlePurchase
-    }
-  }
-
-  renderPurchase = () => {
-    const {
-      assetToPurchaseWith,
-      assetToPurchase,
-      amountToPurchaseFor,
-      acceptedConditions,
-      conditions,
-      inputErrorMessage,
-      gasFee,
-      amountsData,
-    } = this.state
-
-    const { assetBalances, showModal, currencyCode, intl } = this.props
-    const disabledButton = !(acceptedConditions.length === conditions.length)
-    const availableGas = assetBalances.GAS
-    return (
-      <Fragment>
-        <HeaderBar
-          shouldRenderRefresh
-          label={intl.formatMessage({ id: 'sidebarTokenSale' })}
-        />
-        <section className={styles.purchaseSection}>
-          <AmountsPanel currencyCode={currencyCode} amountsData={amountsData} />
-          <TokenSalePanel
-            showModal={showModal}
-            onClickHandler={this.getOnClickHandler()}
-            getAssetsToPurchaseWith={this.getAssetsToPurchaseWith}
-            assetBalances={assetBalances}
-            assetToPurchaseWith={assetToPurchaseWith}
-            assetToPurchase={assetToPurchase}
-            amountToPurchaseFor={amountToPurchaseFor}
-            updateField={this.updateField}
-            getPurchaseableAssets={this.getPurchaseableAssets}
-            disabledButton={disabledButton}
-            conditions={conditions}
-            updateConditions={this.updateConditions}
-            acceptedConditions={acceptedConditions}
-            inputErrorMessage={inputErrorMessage}
-            handleAddPriorityFee={this.handleAddPriorityFee}
-            gasFee={gasFee}
-            availableGas={availableGas}
-          />
-        </section>
-      </Fragment>
-    )
-  }
-
-  renderConfirm = () => {
-    const { assetToPurchaseWith, amountToPurchaseFor, gasFee } = this.state
-
-    const tokenInformation = this.getTokenToPurchaseInformation()
-    if (!tokenInformation) return null
-
-    return (
-      <TokenSaleConfirm
-        onClickHandler={this.getOnClickHandler()}
-        handleBack={this.setPurchaseStep}
-        tokenInfo={tokenInformation}
-        assetToPurchaseWith={assetToPurchaseWith}
-        amountToPurchaseFor={amountToPurchaseFor}
-        gasFee={gasFee}
-      />
-    )
-  }
-
-  renderSuccess = () => {
-    const tokenInformation = this.getTokenToPurchaseInformation()
-    if (!tokenInformation) return null
-    return (
-      <TokenSaleSuccess
-        onClickHandler={this.getOnClickHandler()}
-        token={tokenInformation.token}
-      />
-    )
-  }
-
-  renderFailure = () => {
-    const { tokenSaleError } = this.state
-    return (
-      <TokenSaleError
-        error={tokenSaleError}
-        retryHandler={this.handlePurchase}
-        backHandler={this.getOnClickHandler()}
-      />
-    )
-  }
-
-  render() {
-    const { step, loading, hasAssets } = this.state
-    const { address } = this.props
-
-    const displayTokenSalePurchase = step === TOKEN_SALE_PURCHASE
-    const displayTokenSaleConfirm = step === TOKEN_SALE_CONFIRM
-    const displayTokenSaleSuccess = step === TOKEN_SALE_SUCCESS
-    const displayTokenSaleFailure = step === TOKEN_SALE_FAILURE
-
-    if (!hasAssets) {
-      return (
-        <Fragment>
-          <HeaderBar shouldRenderRefresh label="Token Sale" />
-          <ZeroAssets address={address} />
-        </Fragment>
-      )
-    }
-
-    return (
-      <section className={styles.tokenSaleContainer}>
-        <div className={styles.tokenSaleContentContainer}>
-          {loading && <Loader />}
-          {!loading && displayTokenSalePurchase && this.renderPurchase()}
-          {!loading && displayTokenSaleConfirm && this.renderConfirm()}
-          {!loading && displayTokenSaleSuccess && this.renderSuccess()}
-          {!loading && displayTokenSaleFailure && this.renderFailure()}
-        </div>
-      </section>
-    )
-  }
-}
-
-export default injectIntl(TokenSale)
diff --git a/app/containers/TokenSale/TokenSale.scss b/app/containers/TokenSale/TokenSale.scss
deleted file mode 100644
index 316c07747..000000000
--- a/app/containers/TokenSale/TokenSale.scss
+++ /dev/null
@@ -1,14 +0,0 @@
-.tokenSaleContainer {
-  height: 100%;
-  display: flex;
-  flex-direction: column;
-
-  .tokenSaleContentContainer {
-    height: 100%;
-    .purchaseSection {
-      height: 100%;
-      display: flex;
-      flex-direction: column;
-    }
-  }
-}
diff --git a/app/containers/TokenSale/index.js b/app/containers/TokenSale/index.js
deleted file mode 100644
index 5e68b7e0b..000000000
--- a/app/containers/TokenSale/index.js
+++ /dev/null
@@ -1,59 +0,0 @@
-// @flow
-import { connect } from 'react-redux'
-import { compose } from 'recompose'
-import { pick } from 'lodash-es'
-import { withData, withCall } from 'spunky'
-import TokenSale from './TokenSale'
-
-import balancesActions from '../../actions/balancesActions'
-import icoTokensActions from '../../actions/icoTokensActions'
-import withAuthData from '../../hocs/withAuthData'
-import withNetworkData from '../../hocs/withNetworkData'
-import withPricesData from '../../hocs/withPricesData'
-import withBalancesData from '../../hocs/withBalancesData'
-import withTokensData from '../../hocs/withTokensData'
-import withCurrencyData from '../../hocs/withCurrencyData'
-import withSuccessNotification from '../../hocs/withSuccessNotification'
-import { showModal } from '../../modules/modal'
-
-import { participateInSale } from '../../modules/sale'
-
-const mapPricesDataToProps = (prices: Object) => ({
-  prices,
-})
-
-const mapDispatchToProps = dispatch => ({
-  participateInSale: (...args) => dispatch(participateInSale(...args)),
-  showModal: (...args) => dispatch(showModal(...args)),
-})
-
-const mapBalancesDataToProps = balances => ({
-  assetBalances: pick(balances, 'NEO', 'GAS'),
-})
-
-const mapIcoTokensToProps = icoTokens => ({ icoTokens })
-
-export default compose(
-  connect(
-    null,
-    mapDispatchToProps,
-  ),
-  withAuthData(),
-  withNetworkData(),
-  withTokensData(),
-  withCurrencyData('currencyCode'),
-  withBalancesData(mapBalancesDataToProps),
-  withPricesData(mapPricesDataToProps),
-  withCall(icoTokensActions),
-  withData(icoTokensActions, mapIcoTokensToProps),
-  withSuccessNotification(
-    balancesActions,
-    'notifications.success.receivedBlockchainInfo',
-    {},
-    true,
-  ),
-  connect(
-    null,
-    mapDispatchToProps,
-  ),
-)(TokenSale)
diff --git a/app/core/wallet.js b/app/core/wallet.js
index 702112d98..f1210cc74 100644
--- a/app/core/wallet.js
+++ b/app/core/wallet.js
@@ -88,7 +88,6 @@ export const validateTransactionsBeforeSending = (
 ) => {
   const getValidationError = sendEntry => {
     const balance = obtainBalance(balances, sendEntry.symbol)
-    debugger
     return validateTransactionBeforeSending(balance, sendEntry)
   }
 
diff --git a/app/modules/migration.js b/app/modules/migration.js
index 0e32cd9dc..c9cc8888b 100644
--- a/app/modules/migration.js
+++ b/app/modules/migration.js
@@ -1,7 +1,5 @@
 // @flow
-import axios from 'axios'
 import { keyBy } from 'lodash-es'
-import { api } from '@cityofzion/neon-js-legacy'
 
 import { getNode, getRPCEndpoint } from '../actions/nodeStorageActions'
 import { addPendingTransaction } from '../actions/pendingTransactionActions'
@@ -209,7 +207,7 @@ export const performMigration = ({
 
       if (isHardwareSend) {
         if (script === '') {
-          c = await api.sendAsset(c, api.neoscan).catch(e => {
+          c = await N2.api.sendAsset(c).catch(e => {
             console.error({ e })
             if (e.message === 'this.str.substr is not a function') {
               return null
@@ -233,7 +231,7 @@ export const performMigration = ({
             return reject()
           })
         } else {
-          c = await api.doInvoke(c, api.neoscan).catch(e => {
+          c = await N2.api.doInvoke(c).catch(e => {
             console.error({ e })
             if (e.message === 'this.str.substr is not a function') {
               return null
diff --git a/app/modules/sale.js b/app/modules/sale.js
deleted file mode 100644
index 095ef9e22..000000000
--- a/app/modules/sale.js
+++ /dev/null
@@ -1,121 +0,0 @@
-// @flow
-import { flatten } from 'lodash-es'
-import { wallet, api } from '@cityofzion/neon-js-legacy'
-
-import { getNode, getRPCEndpoint } from '../actions/nodeStorageActions'
-
-import {
-  showErrorNotification,
-  showInfoNotification,
-  hideNotification,
-} from './notifications'
-import {
-  getNetwork,
-  getWIF,
-  getAddress,
-  getIsHardwareLogin,
-  getSigningFunction,
-  getPublicKey,
-  getNEO,
-  getGAS,
-} from '../core/deprecated'
-import { toNumber } from '../core/math'
-import { ASSETS } from '../core/constants'
-import { validateMintTokensInputs } from '../core/sale'
-
-export const participateInSale = (
-  neoToSend: string,
-  gasToSend: string,
-  scriptHash: string,
-  fees: number = 0,
-) => async (dispatch: DispatchType, getState: GetStateType) => {
-  const state = getState()
-  const wif = getWIF(state)
-  const publicKey = getPublicKey(state)
-  const NEO = toNumber(getNEO(state))
-  const GAS = toNumber(getGAS(state))
-  const net = getNetwork(state)
-  const address = getAddress(state)
-  const isHardwareLogin = getIsHardwareLogin(state)
-  const signingFunction = getSigningFunction(state)
-  let url = await getNode(net)
-  if (!url) {
-    url = await getRPCEndpoint(net)
-  }
-
-  const account = new wallet.Account(wif)
-  const neoToMint = toNumber(neoToSend)
-  const gasToMint = toNumber(gasToSend)
-
-  const [isValid, message] = validateMintTokensInputs(
-    neoToMint,
-    gasToMint,
-    scriptHash,
-    NEO,
-    GAS,
-  )
-
-  if (!isValid) {
-    dispatch(showErrorNotification({ message }))
-    throw new Error(`Invalid parameters: ${message}`)
-  }
-
-  const formattedScriptHash =
-    scriptHash.length === 40
-      ? scriptHash
-      : scriptHash.slice(2, scriptHash.length)
-
-  const notificationId = dispatch(
-    showInfoNotification({
-      message: isHardwareLogin
-        ? 'Please sign the transaction on your hardware device'
-        : 'Sending transaction',
-      autoDismiss: 0,
-    }),
-  )
-
-  const scriptHashAddress = wallet.getAddressFromScriptHash(formattedScriptHash)
-
-  const intents = [[ASSETS.NEO, neoToMint], [ASSETS.GAS, gasToMint]]
-    .filter(([symbol, amount]) => amount > 0) // eslint-disable-line no-unused-vars
-    .map(([symbol, amount]) =>
-      api.makeIntent({ [symbol]: amount }, scriptHashAddress),
-    )
-
-  const script = {
-    scriptHash: formattedScriptHash,
-    operation: 'mintTokens',
-    args: [],
-  }
-  const config = {
-    net,
-    address,
-    privateKey: isHardwareLogin ? null : account.privateKey,
-    intents: flatten(intents),
-    script,
-    gas: 0,
-    publicKey: isHardwareLogin ? publicKey : null,
-    signingFunction: isHardwareLogin ? signingFunction : null,
-    fees,
-    url,
-  }
-
-  try {
-    const response = await api.doInvoke(config, api.neoscan)
-
-    if (!response || !response.response || !response.response.result) {
-      throw new Error('Rejected by RPC server.')
-    }
-  } catch (err) {
-    dispatch(
-      showErrorNotification({
-        message: `Sale participation failed: ${err.message}`,
-      }),
-    )
-    throw new Error(`${err.message}`)
-  }
-
-  // $FlowFixMe
-  dispatch(hideNotification(notificationId))
-  return true
-}
diff --git a/app/modules/transactions.js b/app/modules/transactions.js
index b9ef451e1..720c8935e 100644
--- a/app/modules/transactions.js
+++ b/app/modules/transactions.js
@@ -87,7 +87,6 @@ export const buildTransferScript = (
 
     scriptBuilder.emitAppCall(scriptHash, 'transfer', args)
   })
-  debugger
   return scriptBuilder.str
 }
 
@@ -100,15 +99,15 @@ const makeRequest = (
   // because neon-js will also mutate this same object by reference
   // eslint-disable-next-line no-param-reassign
   config.intents = buildIntents(sendEntries)
-  const provider = new N2.api.neoCli.instance(config.url)
-  config.api = provider
+  const apiProvider = new N2.api.neoCli.instance(config.url)
+  config.api = apiProvider
   if (script === '') {
     if (config.net === 'TestNet') {
       // eslint-disable-next-line
 
       return N2.api.sendAsset(config)
     }
-    return api.sendAsset(config)
+    return N2.api.sendAsset(config)
   }
   // eslint-disable-next-line no-param-reassign
   config.script = script
@@ -327,7 +326,6 @@ export const sendTransaction = ({
   const publicKey = getPublicKey(state)
   const isHardwareSend = getIsHardwareLogin(state)
   const { tokens } = state.spunky.settings.data
-  debugger
   return chain === 'neo3'
     ? new Promise(async (resolve, reject) => {
         try {
@@ -536,6 +534,8 @@ export const sendTransaction = ({
             config.tokensBalanceMap,
           )
 
+          console.log({ script })
+
           if (isWatchOnly) {
             config.intents = buildIntents(sendEntries)
             config.script = script
@@ -552,6 +552,7 @@ export const sendTransaction = ({
 
             return resolve(config)
           }
+
           const { response } = await makeRequest(sendEntries, config, script)
 
           if (!response.result) {
@@ -580,16 +581,16 @@ export const sendTransaction = ({
           const hash = get(config, 'tx.hash')
 
           if (!isWatchOnly) {
-            // dispatch(
-            //   addPendingTransaction.call({
-            //     address: config.address,
-            //     tx: {
-            //       hash,
-            //       sendEntries,
-            //     },
-            //     net,
-            //   }),
-            // )
+            dispatch(
+              addPendingTransaction.call({
+                address: config.address,
+                tx: {
+                  hash,
+                  sendEntries,
+                },
+                net,
+              }),
+            )
           }
         }
       })

From 105df8b334d84d538c72d6c4cad5a1b8c42da2df Mon Sep 17 00:00:00 2001
From: Maxwell Lasky <mlasky46@gmail.com>
Date: Fri, 8 Sep 2023 14:27:05 -0600
Subject: [PATCH 3/7] lint and remove logs

---
 app/actions/balancesActions.js | 2 --
 app/modules/transactions.js    | 2 --
 2 files changed, 4 deletions(-)

diff --git a/app/actions/balancesActions.js b/app/actions/balancesActions.js
index 518f19e66..277fa4412 100644
--- a/app/actions/balancesActions.js
+++ b/app/actions/balancesActions.js
@@ -344,8 +344,6 @@ async function getBalances({ net, address, isRetry = false, chain }: Props) {
   resetAudioTrigger()
   inMemoryNetwork = net
   // $FlowFixMe
-
-  console.log(extend({}, ...parsedTokenBalances, ...parsedAssets))
   return extend({}, ...parsedTokenBalances, ...parsedAssets)
 }
 
diff --git a/app/modules/transactions.js b/app/modules/transactions.js
index 720c8935e..3782dbe74 100644
--- a/app/modules/transactions.js
+++ b/app/modules/transactions.js
@@ -534,8 +534,6 @@ export const sendTransaction = ({
             config.tokensBalanceMap,
           )
 
-          console.log({ script })
-
           if (isWatchOnly) {
             config.intents = buildIntents(sendEntries)
             config.script = script

From a09c8ba975c8c3ff3934224ae9bd8e47a310fe33 Mon Sep 17 00:00:00 2001
From: Maxwell Lasky <mlasky46@gmail.com>
Date: Fri, 8 Sep 2023 14:28:34 -0600
Subject: [PATCH 4/7] lint

---
 app/modules/transactions.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/modules/transactions.js b/app/modules/transactions.js
index 3782dbe74..4e9eeacca 100644
--- a/app/modules/transactions.js
+++ b/app/modules/transactions.js
@@ -99,6 +99,7 @@ const makeRequest = (
   // because neon-js will also mutate this same object by reference
   // eslint-disable-next-line no-param-reassign
   config.intents = buildIntents(sendEntries)
+  // eslint-disable-next-line
   const apiProvider = new N2.api.neoCli.instance(config.url)
   config.api = apiProvider
   if (script === '') {

From 4fdb254749341c2aea0428dac3177614e08e8a96 Mon Sep 17 00:00:00 2001
From: Maxwell Lasky <mlasky46@gmail.com>
Date: Fri, 8 Sep 2023 14:29:31 -0600
Subject: [PATCH 5/7] Bump version to 2.20.0

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 18721d2e7..045424b87 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "Neon",
-  "version": "2.19.2",
+  "version": "2.20.0",
   "main": "./main.js",
   "description": "Light wallet for NEO blockchain",
   "homepage": "https://github.com/CityOfZion/neon-wallet",

From 144a41854550ae4bf8e71dc08441e95c2f8047bf Mon Sep 17 00:00:00 2001
From: Maxwell Lasky <mlasky46@gmail.com>
Date: Fri, 8 Sep 2023 14:52:34 -0600
Subject: [PATCH 6/7] fix tests

---
 .../actions/transactionHistoryActions.test.js | 195 ++++++++++--------
 __tests__/core/explorer.test.js               |  36 ----
 app/core/storage.js                           |   9 +-
 3 files changed, 118 insertions(+), 122 deletions(-)

diff --git a/__tests__/actions/transactionHistoryActions.test.js b/__tests__/actions/transactionHistoryActions.test.js
index da0decafd..698c30de2 100644
--- a/__tests__/actions/transactionHistoryActions.test.js
+++ b/__tests__/actions/transactionHistoryActions.test.js
@@ -1,90 +1,119 @@
 import React from 'react'
 import { computeN3Activity } from '../../app/actions/transactionHistoryActions'
+import { ipcRenderer } from 'electron'
 
 describe('N3ClaimTest', () => {
-    const addr = 'NdFBzZVMUXjdwnaDfeMK4zEVYEzjiVhFBt'
-    const netwrk = 'MainNet'
-    const transactions = {
-        items: [{
+  const addr = 'NdFBzZVMUXjdwnaDfeMK4zEVYEzjiVhFBt'
+  const netwrk = 'MainNet'
+  const transactions = {
+    items: [
+      {
+        block: 3080890,
+        hash:
+          '0xe634006ad06edeab24160c2fb6e42f623a1e3163eea952fdfc0df186f86b50b7',
+        invocations: [
+          {
             block: 3080890,
-            hash: "0xe634006ad06edeab24160c2fb6e42f623a1e3163eea952fdfc0df186f86b50b7",
-            invocations: [{
-                block: 3080890,
-                hash: "0xe634006ad06edeab24160c2fb6e42f623a1e3163eea952fdfc0df186f86b50b7",
-                metadata: {
-                    amount: 0,
-                    contract_name: "NeoToken",
-                    data: "",
-                    from: "NdFBzZVMUXjdwnaDfeMK4zEVYEzjiVhFBt",
-                    image: "http://localhost:3000/dist1ac81dc19335d81d593ebec5757d5a71.png",
-                    scripthash: "0xef4073a0f2b305a38ec4050e4d3d28bc40ea63f5",
-                    summary: "NeoToken transfer to NdFBzZVMUXjdwnaDfeMK4zEVYEzjiVhFBt",
-                    symbol: "NEO",
-                    to: "NdFBzZVMUXjdwnaDfeMK4zEVYEzjiVhFBt"},
-                netfee: "122752",
-                sender: "NdFBzZVMUXjdwnaDfeMK4zEVYEzjiVhFBt",
-                sysfee: "997775",
-                time: "1678191213.077000",
-                type: "nep17_transfer",
-                vmstate: "HALT"}],
-            netfee: "122752",
-            notifications: [{
-                contract: "0xef4073a0f2b305a38ec4050e4d3d28bc40ea63f5",
-                event_name: "Transfer",
-                state: [{
-                    type: "ByteString",
-                    value: "vhy7ee8QtmaZ7MtM2XIJ+vhZg44="
-                }, {
-                    type: "ByteString",
-                    value: "vhy7ee8QtmaZ7MtM2XIJ+vhZg44="
-                }, {
-                    type: "Integer",
-                    value: "0"
-                }]
-                }, {
-                contract: "0xd2a4cff31913016155e38e474a2c06d08be276cf",
-                event_name: "Transfer",
-                state: [{
-                    type: "Any"
-                }, {
-                    type: "ByteString",
-                    value: "vhy7ee8QtmaZ7MtM2XIJ+vhZg44="
-                }, {
-                    type: "Integer",
-                    value: "233475354"
-                }]
-            }],
-            sender: "NdFBzZVMUXjdwnaDfeMK4zEVYEzjiVhFBt",
-            sysfee: "997775",
-            time: "1678191213.077000",
-            transfers: [{
-                amount: "0",
-                block: 3080890,
-                from: "NdFBzZVMUXjdwnaDfeMK4zEVYEzjiVhFBt",
-                scripthash: "0xef4073a0f2b305a38ec4050e4d3d28bc40ea63f5",
-                time: "1678191213.077000",
-                to: "NdFBzZVMUXjdwnaDfeMK4zEVYEzjiVhFBt",
-                transferindex: "3080890.2",
-                txid: "0xe634006ad06edeab24160c2fb6e42f623a1e3163eea952fdfc0df186f86b50b7"
-                }, {
-                amount: "233475354",
-                block: 3080890,
-                from: "mint",
-                scripthash: "0xd2a4cff31913016155e38e474a2c06d08be276cf",
-                time: "1678191213.077000",
-                to: "NdFBzZVMUXjdwnaDfeMK4zEVYEzjiVhFBt",
-                transferindex: "3080890.3",
-                txid: "0xe634006ad06edeab24160c2fb6e42f623a1e3163eea952fdfc0df186f86b50b7"
-            }],
-            vmstate: "HALT"
-        }]
-    }
+            hash:
+              '0xe634006ad06edeab24160c2fb6e42f623a1e3163eea952fdfc0df186f86b50b7',
+            metadata: {
+              amount: 0,
+              contract_name: 'NeoToken',
+              data: '',
+              from: 'NdFBzZVMUXjdwnaDfeMK4zEVYEzjiVhFBt',
+              image:
+                'http://localhost:3000/dist1ac81dc19335d81d593ebec5757d5a71.png',
+              scripthash: '0xef4073a0f2b305a38ec4050e4d3d28bc40ea63f5',
+              summary:
+                'NeoToken transfer to NdFBzZVMUXjdwnaDfeMK4zEVYEzjiVhFBt',
+              symbol: 'NEO',
+              to: 'NdFBzZVMUXjdwnaDfeMK4zEVYEzjiVhFBt',
+            },
+            netfee: '122752',
+            sender: 'NdFBzZVMUXjdwnaDfeMK4zEVYEzjiVhFBt',
+            sysfee: '997775',
+            time: '1678191213.077000',
+            type: 'nep17_transfer',
+            vmstate: 'HALT',
+          },
+        ],
+        netfee: '122752',
+        notifications: [
+          {
+            contract: '0xef4073a0f2b305a38ec4050e4d3d28bc40ea63f5',
+            event_name: 'Transfer',
+            state: [
+              {
+                type: 'ByteString',
+                value: 'vhy7ee8QtmaZ7MtM2XIJ+vhZg44=',
+              },
+              {
+                type: 'ByteString',
+                value: 'vhy7ee8QtmaZ7MtM2XIJ+vhZg44=',
+              },
+              {
+                type: 'Integer',
+                value: '0',
+              },
+            ],
+          },
+          {
+            contract: '0xd2a4cff31913016155e38e474a2c06d08be276cf',
+            event_name: 'Transfer',
+            state: [
+              {
+                type: 'Any',
+              },
+              {
+                type: 'ByteString',
+                value: 'vhy7ee8QtmaZ7MtM2XIJ+vhZg44=',
+              },
+              {
+                type: 'Integer',
+                value: '233475354',
+              },
+            ],
+          },
+        ],
+        sender: 'NdFBzZVMUXjdwnaDfeMK4zEVYEzjiVhFBt',
+        sysfee: '997775',
+        time: '1678191213.077000',
+        transfers: [
+          {
+            amount: '0',
+            block: 3080890,
+            from: 'NdFBzZVMUXjdwnaDfeMK4zEVYEzjiVhFBt',
+            scripthash: '0xef4073a0f2b305a38ec4050e4d3d28bc40ea63f5',
+            time: '1678191213.077000',
+            to: 'NdFBzZVMUXjdwnaDfeMK4zEVYEzjiVhFBt',
+            transferindex: '3080890.2',
+            txid:
+              '0xe634006ad06edeab24160c2fb6e42f623a1e3163eea952fdfc0df186f86b50b7',
+          },
+          {
+            amount: '233475354',
+            block: 3080890,
+            from: 'mint',
+            scripthash: '0xd2a4cff31913016155e38e474a2c06d08be276cf',
+            time: '1678191213.077000',
+            to: 'NdFBzZVMUXjdwnaDfeMK4zEVYEzjiVhFBt',
+            transferindex: '3080890.3',
+            txid:
+              '0xe634006ad06edeab24160c2fb6e42f623a1e3163eea952fdfc0df186f86b50b7',
+          },
+        ],
+        vmstate: 'HALT',
+      },
+    ],
+  }
 
-    test('should update the tx so it appears to be a Gas claim', async () => {
-        const wrapper = await computeN3Activity(transactions, addr, netwrk)
-        expect(wrapper[0].type).toEqual("CLAIM")
-        expect(wrapper[0].metadata.summary).toEqual("GAS Claim to NdFBzZVMUXjdwnaDfeMK4zEVYEzjiVhFBt")
-        expect(wrapper[0].metadata.symbol).toEqual('GAS')
-        expect(wrapper[0].metadata.amount).toEqual(2.33475354)
-    })
+  test('should update the tx so it appears to be a Gas claim', async () => {
+    const wrapper = await computeN3Activity(transactions, addr, netwrk)
+    expect(wrapper[0].type).toEqual('CLAIM')
+    expect(wrapper[0].metadata.summary).toEqual(
+      'GAS Claim to NdFBzZVMUXjdwnaDfeMK4zEVYEzjiVhFBt',
+    )
+    expect(wrapper[0].metadata.symbol).toEqual('GAS')
+    expect(wrapper[0].metadata.amount).toEqual(2.33475354)
+  })
 })
diff --git a/__tests__/core/explorer.test.js b/__tests__/core/explorer.test.js
index 1aa9b8afe..508803151 100644
--- a/__tests__/core/explorer.test.js
+++ b/__tests__/core/explorer.test.js
@@ -46,22 +46,6 @@ describe('explorer tests', () => {
       expect(getExplorerTxLink(networkId, explorer, txId)).toEqual(expectedUrl)
     })
 
-    test('NeoScan mainnet explorer test', () => {
-      const networkId = MAIN_NETWORK_ID
-      const explorer = DEPRECATED_EXPLORERS.NEO_SCAN
-      const expectedUrl = `https://neoscan.io/transaction/${txId}`
-
-      expect(getExplorerTxLink(networkId, explorer, txId)).toEqual(expectedUrl)
-    })
-
-    test('NeoScan testnet explorer test', () => {
-      const networkId = TEST_NETWORK_ID
-      const explorer = DEPRECATED_EXPLORERS.NEO_SCAN
-      const expectedUrl = `https://neoscan-testnet.io/transaction/${txId}`
-
-      expect(getExplorerTxLink(networkId, explorer, txId)).toEqual(expectedUrl)
-    })
-
     test('AntChain mainnet explorer test', () => {
       const networkId = MAIN_NETWORK_ID
       const explorer = EXPLORERS.ANT_CHAIN
@@ -133,26 +117,6 @@ describe('explorer tests', () => {
       )
     })
 
-    test('NeoScan mainnet explorer test', () => {
-      const networkId = MAIN_NETWORK_ID
-      const explorer = DEPRECATED_EXPLORERS.NEO_SCAN
-      const expectedUrl = `https://neoscan.io/address/${address}/1`
-
-      expect(getExplorerAddressLink(networkId, explorer, address)).toEqual(
-        expectedUrl,
-      )
-    })
-
-    test('NeoScan testnet explorer test', () => {
-      const networkId = TEST_NETWORK_ID
-      const explorer = DEPRECATED_EXPLORERS.NEO_SCAN
-      const expectedUrl = `https://neoscan-testnet.io/address/${address}/1`
-
-      expect(getExplorerAddressLink(networkId, explorer, address)).toEqual(
-        expectedUrl,
-      )
-    })
-
     test('AntChain mainnet explorer test', () => {
       const networkId = MAIN_NETWORK_ID
       const explorer = EXPLORERS.ANT_CHAIN
diff --git a/app/core/storage.js b/app/core/storage.js
index b7328f3bd..ff403feb8 100644
--- a/app/core/storage.js
+++ b/app/core/storage.js
@@ -8,7 +8,7 @@ const set = promisify(storage.set, storage)
 const ENCRYPTED_FILES_WHITELIST = ['address']
 
 export const setStorage = async (key, value, encrypt = false) => {
-  const path = await ipcRenderer.invoke('getStoragePath')
+  const path = await ipcRenderer?.invoke('getStoragePath')
   storage.setDataPath(path)
   const encryptedValue = await ipcRenderer.invoke(
     'safeStorageEncrypt',
@@ -18,7 +18,7 @@ export const setStorage = async (key, value, encrypt = false) => {
 }
 
 export const getStorage = async key => {
-  const path = await ipcRenderer.invoke('getStoragePath')
+  const path = await ipcRenderer?.invoke('getStoragePath')
   storage.setDataPath(path)
   const value = await get(key)
   const encryptionIsWhitelisted = !!ENCRYPTED_FILES_WHITELIST.find(fileName =>
@@ -34,7 +34,10 @@ export const getStorage = async key => {
   }
   // Only encrypted values get stored as strings
   if (typeof value === 'string' && encryptionIsWhitelisted) {
-    const decryptedValue = await ipcRenderer.invoke('safeStorageDecrypt', value)
+    const decryptedValue = await ipcRenderer?.invoke(
+      'safeStorageDecrypt',
+      value,
+    )
     return JSON.parse(decryptedValue)
   }
 

From c478ea1502c6d535b1fe684667ef1749c7a3d4c4 Mon Sep 17 00:00:00 2001
From: Maxwell Lasky <mlasky46@gmail.com>
Date: Fri, 8 Sep 2023 14:52:52 -0600
Subject: [PATCH 7/7] Bump version to 2.20.1

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 045424b87..236f8a675 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "Neon",
-  "version": "2.20.0",
+  "version": "2.20.1",
   "main": "./main.js",
   "description": "Light wallet for NEO blockchain",
   "homepage": "https://github.com/CityOfZion/neon-wallet",