Merge pull request #2498 from CityOfZion/CU-864efmq36

CU-864efmq36 - Change NWD to use wallet-connect-sdk-wallet-react

__tests__/actions/authActions.test.js

@@ -1,5 +1,6 @@
 import { wifLoginActions } from '../../app/actions/authActions'
 
+jest.setTimeout(10000)
 describe('authActions', () => {
   describe('wifLoginActions', () => {
     describe('call', () => {

__tests__/actions/blockHeightActions.test.js

@@ -1,4 +1,4 @@
-import { rpc } from '@cityofzion/neon-js'
+import { rpc } from '@cityofzion/neon-js-legacy'
 
 import main, {
   blockHeightActions,

__tests__/actions/claimsActions.test.js

@@ -1,5 +1,5 @@
 /* eslint-disable */
-import { api, u } from '@cityofzion/neon-js'
+import { api, u } from '@cityofzion/neon-js-legacy'
 
 import claimsActions from '../../app/actions/claimsActions'
 import { mockPromiseResolved } from '../testHelpers'

__tests__/actions/nodeStorageActions.test.js

@@ -1,4 +1,4 @@
-import { api } from '@cityofzion/neon-js'
+import { api } from '@cityofzion/neon-js-legacy'
 import nock from 'nock'
 import { ipcRenderer } from 'electron'
 

__tests__/components/Logout.test.js

@@ -2,6 +2,8 @@ import React from 'react'
 import { shallow } from 'enzyme'
 
 import Logout from '../../app/containers/App/Sidebar/Logout/Logout'
+import { WalletConnectWalletProvider } from '@cityofzion/wallet-connect-sdk-wallet-react'
+import { walletConnectOptions } from '../../app/util/walletConnect'
 
 describe('Logout', () => {
   const logout = jest.fn()

__tests__/setupTests.js

@@ -2,7 +2,7 @@ import 'raf/polyfill'
 import { configure } from 'enzyme'
 import Adapter from '@cfaester/enzyme-adapter-react-18'
 import nock from 'nock'
-import { api } from '@cityofzion/neon-js'
+import { api } from '@cityofzion/neon-js-legacy'
 import { TextEncoder, TextDecoder } from 'util'
 
 global.TextEncoder = TextEncoder

app/actions/authActions.js

@@ -1,6 +1,6 @@
 // @flow
-import { wallet } from '@cityofzion/neon-js'
-import { wallet as n3Wallet } from '@cityofzion/neon-js-next'
+import { wallet } from '@cityofzion/neon-js-legacy'
+import { wallet as n3Wallet } from '@cityofzion/neon-js'
 import { noop } from 'lodash-es'
 import { createActions } from 'spunky'
 import dns from 'dns'

app/actions/balancesActions.js

@@ -1,6 +1,6 @@
 // @flow
-import { api, u, rpc, sc, wallet } from '@cityofzion/neon-js'
-import { rpc as n3Rpc } from '@cityofzion/neon-js-next'
+import { api, u, rpc, sc, wallet } from '@cityofzion/neon-js-legacy'
+import { rpc as n3Rpc } from '@cityofzion/neon-js'
 import { extend, isEmpty, get } from 'lodash-es'
 import { createActions } from 'spunky'
 import { Howl } from 'howler'

app/actions/blockHeightActions.js

@@ -1,5 +1,5 @@
 // @flow
-import { rpc } from '@cityofzion/neon-js'
+import { rpc } from '@cityofzion/neon-js-legacy'
 import { createActions } from 'spunky'
 import { isEmpty } from 'lodash-es'
 import { getNode, getRPCEndpoint } from './nodeStorageActions'

app/actions/claimsActions.js

@@ -1,6 +1,6 @@
 // @flow
 import { api } from '@cityofzion/neon-js-legacy-latest'
-import { rpc as n3Rpc, u as n3U } from '@cityofzion/neon-js-next'
+import { rpc as n3Rpc, u as n3U } from '@cityofzion/neon-js'
 import { createActions } from 'spunky'
 
 import { getNode, getRPCEndpoint } from './nodeStorageActions'

app/actions/icoTokensActions.js

@@ -1,5 +1,5 @@
 // @flow
-import { api } from '@cityofzion/neon-js'
+import { api } from '@cityofzion/neon-js-legacy'
 import { createActions } from 'spunky'
 
 import { getNode, getRPCEndpoint } from './nodeStorageActions'

app/actions/nftActions.js

@@ -1,8 +1,8 @@
 // @flow
 import { createActions } from 'spunky'
 import axios from 'axios'
-import { rpc } from '@cityofzion/neon-js'
-import { rpc as n3Rpc } from '@cityofzion/neon-js-next'
+import { rpc } from '@cityofzion/neon-js-legacy'
+import { rpc as n3Rpc } from '@cityofzion/neon-js'
 
 import { getSettings } from './settingsActions'
 import { getNode, getRPCEndpoint } from './nodeStorageActions'

app/actions/nodeNetworkActions.js

@@ -1,5 +1,5 @@
 // @flow
-import { rpc, settings } from '@cityofzion/neon-js'
+import { rpc, settings } from '@cityofzion/neon-js-legacy'
 import { createActions } from 'spunky'
 
 import {

app/actions/nodeStorageActions.js

@@ -1,7 +1,7 @@
 // @flow
 import { createActions } from 'spunky'
 import { random, get, compact } from 'lodash-es'
-import { rpc, api, settings } from '@cityofzion/neon-js'
+import { rpc, api, settings } from '@cityofzion/neon-js-legacy'
 
 import { getStorage, setStorage } from '../core/storage'
 import {

app/actions/pendingTransactionActions.js

@@ -1,6 +1,6 @@
 // @flow
 import { createActions } from 'spunky'
-import Neon, { rpc } from '@cityofzion/neon-js'
+import Neon, { rpc } from '@cityofzion/neon-js-legacy'
 import { isEmpty } from 'lodash-es'
 
 import { toBigNumber } from '../core/math'

app/actions/transactionHistoryActions.js

@@ -1,7 +1,7 @@
 // @flow
 import { NeoLegacyREST, NeoRest } from '@cityofzion/dora-ts/dist/api'
 import { createActions } from 'spunky'
-import { rpc as n3Rpc, sc, u } from '@cityofzion/neon-js-next'
+import { rpc as n3Rpc, sc, u } from '@cityofzion/neon-js'
 import axios from 'axios'
 
 import { TX_TYPES } from '../core/constants'

app/actions/voteActions.js

@@ -1,5 +1,5 @@
 // @flow
-import { api, rpc } from '@cityofzion/neon-js'
+import { api, rpc } from '@cityofzion/neon-js-legacy'
 import { createActions } from 'spunky'
 
 import { getNetworkById } from '../core/deprecated'