diff --git a/app/locales/en-US/exchange.json b/app/locales/en-US/exchange.json index af3aad4618..2ef7b39e9d 100644 --- a/app/locales/en-US/exchange.json +++ b/app/locales/en-US/exchange.json @@ -29,7 +29,7 @@ "quit": "Quit", "swaps": { "all": "All", - "title": "Recent Swaps", + "title": "Open Orders", "viewAllSwaps": "View all swaps" } } diff --git a/app/renderer/containers/Exchange.js b/app/renderer/containers/Exchange.js index a1d5b726da..c55c9d3caf 100644 --- a/app/renderer/containers/Exchange.js +++ b/app/renderer/containers/Exchange.js @@ -15,7 +15,7 @@ class ExchangeContainer extends SuperContainer { return { baseCurrency: 'CHIPS', quoteCurrency: 'KMD', - activeSwapsView: 'All', + activeSwapsView: 'OpenOrders', swapHistory: [], orderBook: { bids: [], diff --git a/app/renderer/views/Exchange/Swaps.js b/app/renderer/views/Exchange/Swaps.js index d37f43db84..f6be38ee8c 100644 --- a/app/renderer/views/Exchange/Swaps.js +++ b/app/renderer/views/Exchange/Swaps.js @@ -10,6 +10,8 @@ const t = translate('exchange'); const swapLimit = 50; +const getOpenOrders = () => exchangeContainer.state.swapHistory.filter(swap => !['completed', 'failed'].includes(swap.status)); + const TabButton = props => ( ( ); -const All = () => ( - -); +const OpenOrders = () => { + const openOrders = getOpenOrders(); + + return ( + + ); +}; -const Split = () => { +const CurrentPairOpenOrders = () => { const {state} = exchangeContainer; - const filteredData = state.swapHistory.filter(x => - x.baseCurrency === state.baseCurrency && - x.quoteCurrency === state.quoteCurrency + const filteredData = getOpenOrders().filter(swap => + swap.baseCurrency === state.baseCurrency && + swap.quoteCurrency === state.quoteCurrency ); return ( @@ -59,17 +65,17 @@ const Swaps = () => {
- - + +
);