- {renderExtendedAddress()}
+ {renderExtendedAddress(data)}
{deleted ? (
@@ -333,22 +310,24 @@ const AccountHeader = (props: AccountHeaderProps) => {
{balance}
)}
- {renderBalancesSelector()}
+ {renderBalancesSelector(data)}
- {renderInfo()}
- {renderEscrows()}
- {renderPaymentChannels()}
+ {renderInfo(data)}
+ {renderEscrows(data)}
+ {renderPaymentChannels(data)}
-
{renderSignerList()}
+
{renderSignerList(data)}
)
}
- const { xAddress, hasBridge } = data
+ const xAddress = accountState?.xAddress ?? false
+ const hasBridge = accountState?.hasBridge ?? false
+
return (
@@ -359,23 +338,9 @@ const AccountHeader = (props: AccountHeaderProps) => {
{accountId}
- {loading ? : renderHeaderContent()}
+ {isLoading && }
+ {accountState != null && renderHeaderContent(accountState)}
)
}
-
-export default connect(
- (state: any) => ({
- loading: state.accountHeader.loading,
- data: state.accountHeader.data,
- }),
- (dispatch) => ({
- actions: bindActionCreators(
- {
- loadAccountState,
- },
- dispatch,
- ),
- }),
-)(AccountHeader)
diff --git a/src/containers/Accounts/AccountHeader/reducer.js b/src/containers/Accounts/AccountHeader/reducer.js
deleted file mode 100644
index 5ed1273fb..000000000
--- a/src/containers/Accounts/AccountHeader/reducer.js
+++ /dev/null
@@ -1,33 +0,0 @@
-import * as actionTypes from './actionTypes'
-
-export const initialState = {
- loading: false,
- data: {},
- error: '',
- status: null,
-}
-
-// eslint-disable-next-line default-param-last
-const accountReducer = (state = initialState, action) => {
- switch (action.type) {
- case actionTypes.START_LOADING_ACCOUNT_STATE:
- return { ...state, loading: true }
- case actionTypes.FINISHED_LOADING_ACCOUNT_STATE:
- return { ...state, loading: false }
- case actionTypes.ACCOUNT_STATE_LOAD_SUCCESS:
- return { ...state, error: '', data: action.data }
- case actionTypes.ACCOUNT_STATE_LOAD_FAIL:
- return {
- ...state,
- error: action.error,
- status: action.status,
- data: state.data.length ? state.data : {},
- }
- case 'persist/REHYDRATE':
- return { ...initialState }
- default:
- return state
- }
-}
-
-export default accountReducer
diff --git a/src/containers/Accounts/AccountHeader/test/AccountHeader.test.tsx b/src/containers/Accounts/AccountHeader/test/AccountHeader.test.tsx
new file mode 100644
index 000000000..a5598e5ee
--- /dev/null
+++ b/src/containers/Accounts/AccountHeader/test/AccountHeader.test.tsx
@@ -0,0 +1,282 @@
+import { mount } from 'enzyme'
+import { QueryClientProvider } from 'react-query'
+import { I18nextProvider } from 'react-i18next'
+import { BrowserRouter } from 'react-router-dom'
+import { testQueryClient } from '../../../test/QueryClient'
+import i18n from '../../../../i18n/testConfig'
+import { AccountHeader } from '..'
+import { getAccountState } from '../../../../rippled'
+import Mock = jest.Mock
+import { flushPromises } from '../../../test/utils'
+
+const TEST_ADDRESS = 'rDsbeomae4FXwgQTJp9Rs64Qg9vDiTCdBv'
+const TEST_X_ADDRESS = 'XV3oNHx95sqdCkTDCBCVsVeuBmvh2dz5fTZvfw8UCcMVsfe'
+
+jest.mock('../../../../rippled', () => ({
+ __esModule: true,
+ getAccountState: jest.fn(),
+}))
+
+const mockedGetAccountState = getAccountState as Mock
+
+describe('AccountHeader Actions', () => {
+ const createWrapper = (account = TEST_ADDRESS) =>
+ mount(
+
+
+
+
+
+
+ ,
+ )
+
+ beforeEach(() => {
+ jest.resetModules()
+ })
+
+ it('successful account header', async () => {
+ mockedGetAccountState.mockImplementation(() =>
+ Promise.resolve({
+ account: TEST_ADDRESS,
+ ledger_index: 68990183,
+ info: {
+ sequence: 2148991,
+ ticketCount: undefined,
+ ownerCount: 0,
+ reserve: 10,
+ tick: undefined,
+ rate: undefined,
+ domain: undefined,
+ emailHash: undefined,
+ flags: [],
+ balance: '123456000',
+ nftMinter: undefined,
+ previousTxn:
+ '6B6F2CA1633A22247058E988372BA9EFFFC5BF10212230B67341CA32DC9D4A82',
+ previousLedger: 68990183,
+ },
+ deleted: false,
+ balances: { XRP: 123.456 },
+ signerList: undefined,
+ tokens: [],
+ escrows: undefined,
+ paychannels: null,
+ xAddress: undefined,
+ hasBridge: false,
+ }),
+ )
+
+ const wrapper = createWrapper()
+ await flushPromises()
+ wrapper.update()
+
+ expect(wrapper.find('h1').text()).toBe(TEST_ADDRESS)
+
+ wrapper.unmount()
+ })
+
+ it('account with tokens', async () => {
+ mockedGetAccountState.mockImplementation(() =>
+ Promise.resolve({
+ account: 'rB5TihdPbKgMrkFqrqUC3yLdE8hhv4BdeY',
+ ledger_index: 72338736,
+ info: {
+ sequence: 1227,
+ ticketCount: undefined,
+ ownerCount: 28,
+ reserve: 66,
+ tick: undefined,
+ rate: undefined,
+ domain: undefined,
+ emailHash: undefined,
+ flags: [],
+ balance: '1172875760329',
+ previousTxn:
+ '259A84CE4B3B09D5FBCAA133F62FC767CA2B57B3C64CF065F7546AA63D55E070',
+ previousLedger: 67657581,
+ },
+ balances: {
+ '0158415500000000C1F76FF6ECB0BAC600000000': 3.692385398244198,
+ BTC: 1.075524263886059,
+ CHF: 0.7519685210971255,
+ CNY: 12.328638002,
+ DYM: 95.13258522535791,
+ EUR: 53.426387263174405,
+ GBP: 79.51188949705619,
+ JPY: 4986.30908732758,
+ USD: 936.8290046958887,
+ XAU: 3.419442510305086,
+ XRP: 1172875.760329,
+ },
+ signerList: undefined,
+ tokens: [
+ {
+ amount: 95.13258522535791,
+ currency: 'DYM',
+ issuer: 'rGwUWgN5BEg3QGNY3RX2HfYowjUTZdid3E',
+ },
+ {
+ amount: 20,
+ currency: 'USD',
+ issuer: 'rME7HanzUymzFvETpoLgAy5rvxGcKiLrYL',
+ },
+ {
+ amount: 255.7836054268899,
+ currency: 'USD',
+ issuer: 'rMwjYedjc7qqtKYVLiAccJSmCwih4LnE2q',
+ },
+ {
+ amount: 1.075524263886059,
+ currency: 'BTC',
+ issuer: 'rMwjYedjc7qqtKYVLiAccJSmCwih4LnE2q',
+ },
+ {
+ amount: 12.328638002,
+ currency: 'CNY',
+ issuer: 'rnuF96W4SZoCJmbHYBFoJZpR8eCaxNvekK',
+ },
+ {
+ amount: 3.419442510305086,
+ currency: 'XAU',
+ issuer: 'rrh7rf1gV2pXAoqA8oYbpHd8TKv5ZQeo67',
+ },
+ {
+ amount: 3.692385398244198,
+ currency: '0158415500000000C1F76FF6ECB0BAC600000000',
+ issuer: 'rrh7rf1gV2pXAoqA8oYbpHd8TKv5ZQeo67',
+ },
+ {
+ amount: 0.7519685210971255,
+ currency: 'CHF',
+ issuer: 'rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs59B',
+ },
+ {
+ amount: 78.5098894970562,
+ currency: 'GBP',
+ issuer: 'rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs59B',
+ },
+ {
+ amount: 4986.30908732758,
+ currency: 'JPY',
+ issuer: 'rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs59B',
+ },
+ {
+ amount: 28.42638726317441,
+ currency: 'EUR',
+ issuer: 'rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs59B',
+ },
+ ],
+ escrows: undefined,
+ paychannels: null,
+ xAddress: undefined,
+ hasBridge: false,
+ deleted: false,
+ }),
+ )
+
+ const wrapper = createWrapper()
+ await flushPromises()
+ wrapper.update()
+
+ expect(wrapper.find('h1').text()).toBe(TEST_ADDRESS)
+ expect(wrapper.find('.balance-selector-container')).toExist()
+ expect(wrapper.find('.balance .value').text()).toBe('\uE9001,172,875.76')
+
+ wrapper.unmount()
+ })
+
+ it('X-Address', async () => {
+ mockedGetAccountState.mockImplementation(() =>
+ Promise.resolve({
+ account: TEST_ADDRESS,
+ ledger_index: 68990183,
+ info: {
+ sequence: 2148991,
+ ticketCount: undefined,
+ ownerCount: 0,
+ reserve: 10,
+ tick: undefined,
+ rate: undefined,
+ domain: undefined,
+ emailHash: undefined,
+ flags: [],
+ balance: '123456000',
+ nftMinter: undefined,
+ previousTxn:
+ '6B6F2CA1633A22247058E988372BA9EFFFC5BF10212230B67341CA32DC9D4A82',
+ previousLedger: 68990183,
+ },
+ deleted: false,
+ balances: { XRP: 123.456 },
+ signerList: undefined,
+ tokens: [],
+ escrows: undefined,
+ hasBridge: false,
+ paychannels: null,
+ xAddress: {
+ classicAddress: TEST_ADDRESS,
+ tag: 0,
+ test: false,
+ },
+ }),
+ )
+
+ const wrapper = createWrapper(TEST_X_ADDRESS)
+ await flushPromises()
+ wrapper.update()
+
+ expect(wrapper.find('h1').text()).toBe(TEST_X_ADDRESS)
+
+ wrapper.unmount()
+ })
+
+ it('server error', async () => {
+ mockedGetAccountState.mockImplementation(() => Promise.reject())
+
+ const wrapper = createWrapper()
+ await flushPromises()
+ wrapper.update()
+
+ expect(wrapper.find('h1').text()).toBe(TEST_ADDRESS)
+ expect(wrapper.find('.header-container')).not.toExist()
+
+ wrapper.unmount()
+ })
+
+ it('invalid address', async () => {
+ const wrapper = createWrapper('ZZZ')
+ await flushPromises()
+ wrapper.update()
+
+ expect(wrapper.find('h1').text()).toBe('ZZZ')
+ expect(wrapper.find('.header-container')).not.toExist()
+
+ wrapper.unmount()
+ })
+
+ it('deleted account', async () => {
+ mockedGetAccountState.mockImplementation(() =>
+ Promise.resolve({
+ account: TEST_ADDRESS,
+ deleted: true,
+ xAddress: undefined,
+ }),
+ )
+
+ const wrapper = createWrapper()
+ await flushPromises()
+ wrapper.update()
+
+ expect(wrapper.find('h1').text()).toBe(TEST_ADDRESS)
+ expect(wrapper.find('.warning').find('.account-deleted-text').text()).toBe(
+ 'Account Deleted',
+ )
+
+ wrapper.unmount()
+ })
+})
diff --git a/src/containers/Accounts/AccountHeader/test/actions.test.js b/src/containers/Accounts/AccountHeader/test/actions.test.js
deleted file mode 100644
index 797787a05..000000000
--- a/src/containers/Accounts/AccountHeader/test/actions.test.js
+++ /dev/null
@@ -1,312 +0,0 @@
-import configureMockStore from 'redux-mock-store'
-import thunk from 'redux-thunk'
-import * as actions from '../actions'
-import * as actionTypes from '../actionTypes'
-import { initialState } from '../reducer'
-import { NOT_FOUND, BAD_REQUEST, SERVER_ERROR } from '../../../shared/utils'
-import rippledResponses from './rippledResponses.json'
-import accountDeletedTransactions from './accountDeletedTransactions.json'
-import actNotFound from '../../../Token/TokenHeader/test/actNotFound.json'
-import actWithTokens from './accountWithTokens.json'
-import MockWsClient from '../../../test/mockWsClient'
-
-const TEST_ADDRESS = 'rDsbeomae4FXwgQTJp9Rs64Qg9vDiTCdBv'
-const TEST_X_ADDRESS = 'XV3oNHx95sqdCkTDCBCVsVeuBmvh2dz5fTZvfw8UCcMVsfe'
-
-describe('AccountHeader Actions', () => {
- const middlewares = [thunk]
- const mockStore = configureMockStore(middlewares)
- let client
- beforeEach(() => {
- client = new MockWsClient()
- })
-
- afterEach(() => {
- client.close()
- })
-
- it('should dispatch correct actions on successful loadAccountState', () => {
- client.addResponses(rippledResponses)
- const expectedData = {
- account: 'rDsbeomae4FXwgQTJp9Rs64Qg9vDiTCdBv',
- ledger_index: 68990183,
- info: {
- sequence: 2148991,
- ticketCount: undefined,
- ownerCount: 0,
- reserve: 10,
- tick: undefined,
- rate: undefined,
- domain: undefined,
- emailHash: undefined,
- flags: [],
- balance: '123456000',
- nftMinter: undefined,
- previousTxn:
- '6B6F2CA1633A22247058E988372BA9EFFFC5BF10212230B67341CA32DC9D4A82',
- previousLedger: 68990183,
- },
- deleted: false,
- balances: { XRP: 123.456 },
- signerList: undefined,
- tokens: [],
- escrows: undefined,
- paychannels: null,
- xAddress: undefined,
- hasBridge: false,
- }
- const expectedActions = [
- { type: actionTypes.START_LOADING_ACCOUNT_STATE },
- { type: actionTypes.FINISHED_LOADING_ACCOUNT_STATE },
- { type: actionTypes.ACCOUNT_STATE_LOAD_SUCCESS, data: expectedData },
- ]
- const store = mockStore({ news: initialState })
-
- return store
- .dispatch(actions.loadAccountState(TEST_ADDRESS, client))
- .then(() => {
- expect(store.getActions()).toEqual(expectedActions)
- })
- })
-
- it('should dispatch correct actions on account with tokens', () => {
- client.addResponses(actWithTokens)
- const expectedData = {
- account: 'rB5TihdPbKgMrkFqrqUC3yLdE8hhv4BdeY',
- ledger_index: 72338736,
- info: {
- sequence: 1227,
- ticketCount: undefined,
- ownerCount: 28,
- reserve: 66,
- tick: undefined,
- rate: undefined,
- domain: undefined,
- emailHash: undefined,
- flags: [],
- balance: '1172875760329',
- previousTxn:
- '259A84CE4B3B09D5FBCAA133F62FC767CA2B57B3C64CF065F7546AA63D55E070',
- previousLedger: 67657581,
- },
- balances: {
- '0158415500000000C1F76FF6ECB0BAC600000000': 3.692385398244198,
- BTC: 1.075524263886059,
- CHF: 0.7519685210971255,
- CNY: 12.328638002,
- DYM: 95.13258522535791,
- EUR: 53.426387263174405,
- GBP: 79.51188949705619,
- JPY: 4986.30908732758,
- USD: 936.8290046958887,
- XAU: 3.419442510305086,
- XRP: 1172875.760329,
- },
- signerList: undefined,
- tokens: [
- {
- amount: 95.13258522535791,
- currency: 'DYM',
- issuer: 'rGwUWgN5BEg3QGNY3RX2HfYowjUTZdid3E',
- },
- {
- amount: 20,
- currency: 'USD',
- issuer: 'rME7HanzUymzFvETpoLgAy5rvxGcKiLrYL',
- },
- {
- amount: 255.7836054268899,
- currency: 'USD',
- issuer: 'rMwjYedjc7qqtKYVLiAccJSmCwih4LnE2q',
- },
- {
- amount: 1.075524263886059,
- currency: 'BTC',
- issuer: 'rMwjYedjc7qqtKYVLiAccJSmCwih4LnE2q',
- },
- {
- amount: 12.328638002,
- currency: 'CNY',
- issuer: 'rnuF96W4SZoCJmbHYBFoJZpR8eCaxNvekK',
- },
- {
- amount: 3.419442510305086,
- currency: 'XAU',
- issuer: 'rrh7rf1gV2pXAoqA8oYbpHd8TKv5ZQeo67',
- },
- {
- amount: 3.692385398244198,
- currency: '0158415500000000C1F76FF6ECB0BAC600000000',
- issuer: 'rrh7rf1gV2pXAoqA8oYbpHd8TKv5ZQeo67',
- },
- {
- amount: 0.7519685210971255,
- currency: 'CHF',
- issuer: 'rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs59B',
- },
- {
- amount: 78.5098894970562,
- currency: 'GBP',
- issuer: 'rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs59B',
- },
- {
- amount: 4986.30908732758,
- currency: 'JPY',
- issuer: 'rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs59B',
- },
- {
- amount: 28.42638726317441,
- currency: 'EUR',
- issuer: 'rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs59B',
- },
- ],
- escrows: undefined,
- paychannels: null,
- xAddress: undefined,
- hasBridge: false,
- deleted: false,
- }
- const expectedActions = [
- { type: actionTypes.START_LOADING_ACCOUNT_STATE },
- { type: actionTypes.FINISHED_LOADING_ACCOUNT_STATE },
- { type: actionTypes.ACCOUNT_STATE_LOAD_SUCCESS, data: expectedData },
- ]
- const store = mockStore({ news: initialState })
-
- return store
- .dispatch(actions.loadAccountState(TEST_ADDRESS, client))
- .then(() => {
- expect(store.getActions()).toEqual(expectedActions)
- })
- })
-
- it('should dispatch correct actions on successful loadAccountState for X-Address', () => {
- client.addResponses(rippledResponses)
- const expectedData = {
- account: 'rDsbeomae4FXwgQTJp9Rs64Qg9vDiTCdBv',
- ledger_index: 68990183,
- info: {
- sequence: 2148991,
- ticketCount: undefined,
- ownerCount: 0,
- reserve: 10,
- tick: undefined,
- rate: undefined,
- domain: undefined,
- emailHash: undefined,
- flags: [],
- balance: '123456000',
- nftMinter: undefined,
- previousTxn:
- '6B6F2CA1633A22247058E988372BA9EFFFC5BF10212230B67341CA32DC9D4A82',
- previousLedger: 68990183,
- },
- deleted: false,
- balances: { XRP: 123.456 },
- signerList: undefined,
- tokens: [],
- escrows: undefined,
- hasBridge: false,
- paychannels: null,
- xAddress: {
- classicAddress: 'rDsbeomae4FXwgQTJp9Rs64Qg9vDiTCdBv',
- tag: 0,
- test: false,
- },
- }
- const expectedActions = [
- { type: actionTypes.START_LOADING_ACCOUNT_STATE },
- { type: actionTypes.FINISHED_LOADING_ACCOUNT_STATE },
- { type: actionTypes.ACCOUNT_STATE_LOAD_SUCCESS, data: expectedData },
- ]
- const store = mockStore({ news: initialState })
- return store
- .dispatch(actions.loadAccountState(TEST_X_ADDRESS, client))
- .then(() => {
- expect(store.getActions()).toEqual(expectedActions)
- })
- })
-
- it('should dispatch correct actions on server error', () => {
- client.setReturnError()
- const expectedActions = [
- { type: actionTypes.START_LOADING_ACCOUNT_STATE },
- { type: actionTypes.FINISHED_LOADING_ACCOUNT_STATE },
- {
- type: actionTypes.ACCOUNT_STATE_LOAD_FAIL,
- status: SERVER_ERROR,
- error: 'get_account_state_failed',
- },
- ]
- const store = mockStore({ news: initialState })
-
- return store
- .dispatch(actions.loadAccountState(TEST_ADDRESS, client))
- .then(() => {
- expect(store.getActions()).toEqual(expectedActions)
- })
- })
-
- it('should dispatch correct actions on address not found', () => {
- const expectedActions = [
- { type: actionTypes.START_LOADING_ACCOUNT_STATE },
- { type: actionTypes.FINISHED_LOADING_ACCOUNT_STATE },
- {
- type: actionTypes.ACCOUNT_STATE_LOAD_FAIL,
- status: NOT_FOUND,
- error: '',
- },
- ]
- client.addResponse('account_info', { result: actNotFound })
- client.addResponse('account_tx', { result: actNotFound })
- const store = mockStore({ news: initialState })
- return store
- .dispatch(actions.loadAccountState(TEST_ADDRESS, client))
- .then(() => {
- expect(store.getActions()).toEqual(expectedActions)
- })
- })
-
- it('should dispatch correct actions on invalid address', () => {
- const expectedActions = [
- {
- type: actionTypes.ACCOUNT_STATE_LOAD_FAIL,
- status: BAD_REQUEST,
- error: '',
- },
- ]
- const store = mockStore({ news: initialState })
- store.dispatch(actions.loadAccountState('ZZZ', client)).then(() => {
- expect(store.getActions()).toEqual(expectedActions)
- })
- })
-
- it('should dispatch correct actions on a deleted account', () => {
- client.addResponses(accountDeletedTransactions)
-
- const expectedActions = [
- {
- type: 'START_LOADING_ACCOUNT_STATE',
- },
- {
- type: 'FINISHED_LOADING_ACCOUNT_STATE',
- },
- {
- type: actionTypes.ACCOUNT_STATE_LOAD_SUCCESS,
- data: {
- account: 'r35jYntLwkrbc3edisgavDbEdNRSKgcQE6',
- deleted: true,
- xAddress: undefined,
- },
- },
- ]
- const store = mockStore({ news: initialState })
- store
- .dispatch(
- actions.loadAccountState('r35jYntLwkrbc3edisgavDbEdNRSKgcQE6', client),
- )
- .then(() => {
- expect(store.getActions()).toEqual(expectedActions)
- })
- })
-})
diff --git a/src/containers/Accounts/AccountHeader/test/reducer.test.js b/src/containers/Accounts/AccountHeader/test/reducer.test.js
deleted file mode 100644
index ceecc491f..000000000
--- a/src/containers/Accounts/AccountHeader/test/reducer.test.js
+++ /dev/null
@@ -1,79 +0,0 @@
-import * as actionTypes from '../actionTypes'
-import reducer, { initialState } from '../reducer'
-
-describe('AccountHeader reducers', () => {
- it('should return the initial state', () => {
- expect(reducer(undefined, {})).toEqual(initialState)
- })
-
- it('should handle START_LOADING_ACCOUNT_STATE', () => {
- const nextState = { ...initialState, loading: true }
- expect(
- reducer(initialState, { type: actionTypes.START_LOADING_ACCOUNT_STATE }),
- ).toEqual(nextState)
- })
-
- it('should handle FINISHED_LOADING_ACCOUNT_STATE', () => {
- const nextState = { ...initialState, loading: false }
- expect(
- reducer(initialState, {
- type: actionTypes.FINISHED_LOADING_ACCOUNT_STATE,
- }),
- ).toEqual(nextState)
- })
-
- it('should handle ACCOUNT_STATE_LOAD_SUCCESS', () => {
- const data = [['XRP', 123.456]]
- const nextState = { ...initialState, data }
- expect(
- reducer(initialState, {
- data,
- type: actionTypes.ACCOUNT_STATE_LOAD_SUCCESS,
- }),
- ).toEqual(nextState)
- })
-
- it('should handle ACCOUNT_STATE_LOAD_FAIL', () => {
- const status = 500
- const error = 'error'
- const nextState = { ...initialState, status, error }
- expect(
- reducer(initialState, {
- status,
- error,
- type: actionTypes.ACCOUNT_STATE_LOAD_FAIL,
- }),
- ).toEqual(nextState)
- })
-
- it('will not clear previous data on ACCOUNT_STATE_LOAD_FAIL', () => {
- const data = [['XRP', 123.456]]
- const error = 'error'
- const status = 500
- const stateWithData = { ...initialState, data }
- const nextState = { ...stateWithData, error, status }
- expect(
- reducer(stateWithData, {
- status,
- error,
- type: actionTypes.ACCOUNT_STATE_LOAD_FAIL,
- }),
- ).toEqual(nextState)
- })
-
- it('should clear data on rehydration', () => {
- const error = 'error'
- const status = 500
- const nextState = { ...initialState, error, status }
- expect(
- reducer(initialState, {
- type: actionTypes.ACCOUNT_STATE_LOAD_FAIL,
- error,
- status,
- }),
- ).toEqual(nextState)
- expect(reducer(nextState, { type: 'persist/REHYDRATE' })).toEqual(
- initialState,
- )
- })
-})
diff --git a/src/containers/Accounts/AccountNFTTable/test/AccountNFTtable.test.tsx b/src/containers/Accounts/AccountNFTTable/test/AccountNFTtable.test.tsx
index 1ba9a9609..6b9ed48e0 100644
--- a/src/containers/Accounts/AccountNFTTable/test/AccountNFTtable.test.tsx
+++ b/src/containers/Accounts/AccountNFTTable/test/AccountNFTtable.test.tsx
@@ -52,8 +52,6 @@ describe('AccountNFTTable component', () => {
})
it('should render a table of nfts', async () => {
- mockedGetAccountNFTs.mockReset()
-
mockedGetAccountNFTs.mockImplementation(() => Promise.resolve(data))
const wrapper = createWrapper()
@@ -66,8 +64,6 @@ describe('AccountNFTTable component', () => {
})
it('should handle load more', async () => {
- mockedGetAccountNFTs.mockReset()
-
mockedGetAccountNFTs.mockImplementation(() =>
Promise.resolve({
...data,
@@ -92,8 +88,6 @@ describe('AccountNFTTable component', () => {
})
it(`should handle no results`, async () => {
- mockedGetAccountNFTs.mockReset()
-
mockedGetAccountNFTs.mockImplementation(() =>
Promise.resolve({
account: 'rnuweigWrt8Jp1gBmKJT6VLxrVMSJSuu6G',
diff --git a/src/containers/Accounts/index.tsx b/src/containers/Accounts/index.tsx
index 8f6361d6b..dfdbd539d 100644
--- a/src/containers/Accounts/index.tsx
+++ b/src/containers/Accounts/index.tsx
@@ -1,6 +1,6 @@
import { useEffect, useState } from 'react'
import { Helmet } from 'react-helmet-async'
-import AccountHeader from './AccountHeader'
+import { AccountHeader } from './AccountHeader'
import { AccountTransactionTable } from './AccountTransactionTable'
import './styles.scss'
import { useAnalytics } from '../shared/analytics'
@@ -44,7 +44,7 @@ export const Accounts = () => {
hasTokensColumn={false}
/>
)}
- {tab === 'assets' &&
}
+ {tab === 'assets' &&
}
)}
diff --git a/src/containers/Accounts/test/index.test.tsx b/src/containers/Accounts/test/index.test.tsx
index efd512f38..555cff680 100644
--- a/src/containers/Accounts/test/index.test.tsx
+++ b/src/containers/Accounts/test/index.test.tsx
@@ -1,53 +1,54 @@
import { mount } from 'enzyme'
-import configureMockStore from 'redux-mock-store'
-import thunk from 'redux-thunk'
-import { Provider } from 'react-redux'
import { Route } from 'react-router'
-import { initialState } from '../../../rootReducer'
import i18n from '../../../i18n/testConfig'
import { Accounts } from '../index'
-import AccountHeader from '../AccountHeader'
+import { AccountHeader } from '../AccountHeader'
import { AccountTransactionTable } from '../AccountTransactionTable'
import mockAccountState from './mockAccountState.json'
-import { QuickHarness } from '../../test/utils'
+import { QuickHarness, flushPromises } from '../../test/utils'
import { ACCOUNT_ROUTE } from '../../App/routes'
+import { getAccountState } from '../../../rippled'
+import Mock = jest.Mock
+
+jest.mock('../../../rippled', () => ({
+ __esModule: true,
+ getAccountState: jest.fn(),
+ getAccountTransactions: jest.fn(() => []),
+}))
+
+const mockedGetAccountState = getAccountState as Mock
describe('Account container', () => {
- const TEST_ACCOUNT_ID = 'rTEST_ACCOUNT'
-
- const middlewares = [thunk]
- const mockStore = configureMockStore(middlewares)
- const createWrapper = (state = {}) => {
- const store = mockStore({ ...initialState, ...state })
- return mount(
-