diff --git a/app/constants.js b/app/constants.js
index 5ece229df9..899b83b669 100644
--- a/app/constants.js
+++ b/app/constants.js
@@ -24,13 +24,14 @@ exports.appViews = [
 ];
 
 exports.defaultEnabledCurrencies = [
+	'BTC',
+	'KMD',
 	'CHIPS',
 	'DOGE',
-	'KMD',
 	'MORTY',
 	'RICK',
 	'SUPERNET',
-
+	'ETH',
 	// These are left out for now.
 	// TODO: Revise this list when HyperDEX is more mature.
 	// 'BCH',
@@ -47,8 +48,8 @@ exports.defaultEnabledCurrencies = [
 ];
 
 exports.alwaysEnabledCurrencies = [
-	'KMD',
-	'CHIPS',
+	'BTC',
+	'KMD'
 ];
 
 exports.ignoreExternalPrice = new Set([
@@ -57,6 +58,8 @@ exports.ignoreExternalPrice = new Set([
 	'REVS',
 	'RICK',
 	'SUPERNET',
+	"BET",
+	"HODL",
 ]);
 
 exports.hiddenCurrencies = [];
diff --git a/app/locales/en-US/swap.json b/app/locales/en-US/swap.json
index 09cee44a04..d6b30deb47 100644
--- a/app/locales/en-US/swap.json
+++ b/app/locales/en-US/swap.json
@@ -5,6 +5,8 @@
 	"title": "Swap",
 	"details": {
 		"broadcast": "Broadcast",
+		"maker": "Maker",
+		"taker": "Taker",
 		"buy": "Buy",
 		"copyDebugData": "Copy Swap Debug Data",
 		"exchanging": "Exchanging",
@@ -55,6 +57,7 @@
 		"reverted": "Reverted",
 		"pending": "Pending",
 		"open": "Open",
+		"active": "Open",
 		"unmatched": "Unmatched",
 		"cancelled": "Cancelled"
 	},
diff --git a/app/marketmaker/index.js b/app/marketmaker/index.js
index c93cd542c6..6bd36e5473 100644
--- a/app/marketmaker/index.js
+++ b/app/marketmaker/index.js
@@ -93,7 +93,11 @@ class Marketmaker {
 			...options,
 			gui: 'hyperdex',
 			userhome: os.homedir(),
+
 			netid: 9999, // TODO: Set this to `0` when mm v2 is production ready
+			// netid: 2323,
+			// seednodes: ['35.173.213.220'],
+
 			rpcport: port,
 			rpccors: is.development ? 'http://localhost:8080' : 'app://-',
 			coins,
diff --git a/app/marketmaker/supported-currencies.js b/app/marketmaker/supported-currencies.js
index b2f920167a..783d5b08f6 100644
--- a/app/marketmaker/supported-currencies.js
+++ b/app/marketmaker/supported-currencies.js
@@ -10,24 +10,6 @@ We use the `name` property only when the currency is not on `coinmarketcap.com`.
 */
 
 const supportedCurrencies = [
-	{
-		coin: '$PAC',
-		rpcport: 7111,
-		pubtype: 55,
-		p2shtype: 10,
-		wiftype: 204,
-		txfee: 10000,
-		electrumServers: [
-			{
-				host: 'electrum.paccoin.io',
-				port: 50001,
-			},
-			{
-				host: 'electro-pac.paccoin.io',
-				port: 50001,
-			},
-		],
-	},
 	{
 		coin: '1ST',
 		name: 'FirstBlood',
@@ -52,12 +34,6 @@ const supportedCurrencies = [
 		contractAddress: '0x4DC3643DbC642b72C158E7F3d2ff232df61cb6CE',
 		rpcport: 80,
 	},
-	{
-		coin: 'ANN',
-		name: 'Agent Not Needed',
-		contractAddress: '0xe0e73E8fc3a0fA161695be1D75E1Bc3E558957c4',
-		rpcport: 80,
-	},
 	{
 		coin: 'ANT',
 		name: 'Aragon',
@@ -76,18 +52,6 @@ const supportedCurrencies = [
 		contractAddress: '0x0D8775F648430679A709E98d2b0Cb6250d2887EF',
 		rpcport: 80,
 	},
-	{
-		coin: 'BBT',
-		name: 'Bitboost',
-		contractAddress: '0x1500205f50bf3FD976466d0662905c9ff254fc9c',
-		rpcport: 80,
-	},
-	{
-		coin: 'BCAP',
-		name: 'Bcap',
-		contractAddress: '0xFf3519eeeEA3e76F1F699CCcE5E23ee0bdDa41aC',
-		rpcport: 80,
-	},
 	{
 		coin: 'BCH',
 		rpcport: 33333,
@@ -111,10 +75,28 @@ const supportedCurrencies = [
 		],
 	},
 	{
-		coin: 'BITSOKO',
-		name: 'Bitsoko',
-		contractAddress: '0xB72627650F1149Ea5e54834b2f468E5d430E67bf',
-		rpcport: 80,
+		coin: 'BET',
+		asset: 'BET',
+		fname: 'BET',
+		name: "BET",
+		rpcport: 14250,
+		txversion: 4,
+		overwintered: 1,
+		required_confirmations: 2,
+		electrumServers: [
+			{
+				host: 'electrum1.cipig.net',
+				port: 10012,
+			},
+			{
+				host: 'electrum2.cipig.net',
+				port: 10012,
+			},
+			{
+				host: 'electrum3.cipig.net',
+				port: 10012,
+			},
+		],
 	},
 	{
 		coin: 'BNB',
@@ -151,12 +133,6 @@ const supportedCurrencies = [
 			},
 		],
 	},
-	{
-		coin: 'BOX',
-		name: 'Beonbox',
-		contractAddress: '0x01E579BE97433f861340268521A7a2ab9829082C',
-		rpcport: 80,
-	},
 	{
 		coin: 'BTC',
 		rpcport: 8332,
@@ -201,12 +177,6 @@ const supportedCurrencies = [
 			},
 		],
 	},
-	{
-		coin: 'BTCL',
-		name: 'BTC Lite',
-		contractAddress: '0x5acD19b9c91e596b1f062f18e3D02da7eD8D1e50',
-		rpcport: 80,
-	},
 	{
 		coin: 'BTG',
 		rpcport: 12332,
@@ -225,18 +195,18 @@ const supportedCurrencies = [
 			},
 		],
 	},
-	{
-		coin: 'BTK',
-		name: 'BitcoinToken',
-		contractAddress: '0xdb8646F5b487B5Dd979FAC618350e85018F557d4',
-		rpcport: 80,
-	},
 	{
 		coin: 'BTM',
 		name: 'Bytom',
 		contractAddress: '0xcB97e65F07DA24D46BcDD078EBebd7C6E6E3d750',
 		rpcport: 80,
 	},
+	{
+		coin: 'BUSD',
+		name: 'Binance USD',
+		contractAddress: '0x4Fabb145d64652a948d72533023f6E7A623C7C53',
+		rpcport: 80,
+	},
 	{
 		coin: 'CDT',
 		name: 'Blox',
@@ -249,12 +219,6 @@ const supportedCurrencies = [
 		contractAddress: '0x1122B6a0E00DCe0563082b6e2953f3A943855c1F',
 		rpcport: 80,
 	},
-	{
-		coin: 'CFI',
-		name: 'Cofound.it',
-		contractAddress: '0x12FEF5e57bF45873Cd9B62E9DBd7BFb99e32D73e',
-		rpcport: 80,
-	},
 	{
 		coin: 'CHAIN',
 		name: 'Chainmakers',
@@ -301,12 +265,6 @@ const supportedCurrencies = [
 			},
 		],
 	},
-	{
-		coin: 'CIX',
-		name: 'Cryptonetix',
-		contractAddress: '0x1175a66a5c3343Bbf06AA818BB482DdEc30858E0',
-		rpcport: 80,
-	},
 	{
 		coin: 'CCL',
 		name: 'CoinCollect',
@@ -330,6 +288,29 @@ const supportedCurrencies = [
 			},
 		],
 	},
+	{
+		coin: 'COMMOD',
+		name: 'COMMOD',
+		asset: 'COMMOD',
+		rpcport: 27048,
+		txversion: 4,
+		overwintered: 1,
+		required_confirmations: 2,
+		electrumServers: [
+			{
+				host: 'electrum1.cipig.net',
+				port: 10022,
+			},
+			{
+				host: 'electrum2.cipig.net',
+				port: 10022,
+			},
+			{
+				host: 'electrum3.cipig.net',
+				port: 10022,
+			},
+		]
+	},
 	{
 		coin: 'COQUI',
 		name: 'Coqui Cash',
@@ -455,15 +436,9 @@ const supportedCurrencies = [
 		contractAddress: '0x08d32b0da63e2C3bcF8019c9c5d849d7a9d791e6',
 		rpcport: 80,
 	},
-	{
-		coin: 'DEC8',
-		name: 'DEC8 [Test]',
-		contractAddress: '0x3aB100442484Dc2414Aa75B2952A0a6f03f8aBFd',
-		rpcport: 80,
-	},
 	{
 		coin: 'DEX',
-		name: 'InstantDEX',
+		name: 'DEX',
 		asset: 'DEX',
 		rpcport: 11890,
 		txversion: 4,
@@ -513,18 +488,6 @@ const supportedCurrencies = [
 		decimals: 9,
 		rpcport: 80,
 	},
-	{
-		coin: 'DGPT',
-		name: 'DigiPulse',
-		contractAddress: '0xf6cFe53d6FEbaEEA051f400ff5fc14F0cBBDacA1',
-		rpcport: 80,
-	},
-	{
-		coin: 'DICE',
-		name: 'Etheroll',
-		contractAddress: '0x2e071D2966Aa7D8dECB1005885bA1977D6038A65',
-		rpcport: 80,
-	},
 	{
 		coin: 'DNT',
 		name: 'District0x',
@@ -553,36 +516,6 @@ const supportedCurrencies = [
 			},
 		],
 	},
-	{
-		coin: 'DRGN',
-		name: 'Dragonchain',
-		contractAddress: '0x419c4dB4B9e25d6Db2AD9691ccb832C8D9fDA05E',
-		rpcport: 80,
-	},
-	{
-		coin: 'DROP',
-		name: 'Dropil',
-		contractAddress: '0x4672bAD527107471cB5067a887f4656D585a8A31',
-		rpcport: 80,
-	},
-	{
-		coin: 'DRT',
-		name: 'DomRaider',
-		contractAddress: '0x9AF4f26941677C706cfEcf6D3379FF01bB85D5Ab',
-		rpcport: 80,
-	},
-	{
-		coin: 'EDG',
-		name: 'Edgeless',
-		contractAddress: '0x08711D3B02C8758F2FB3ab4e80228418a7F8e39c',
-		rpcport: 80,
-	},
-	{
-		coin: 'ELD',
-		name: 'Electrum Dark',
-		contractAddress: '0xaaF7d4CD097317D68174215395eB02c2ccA81E31',
-		rpcport: 80,
-	},
 	{
 		coin: 'ELF',
 		name: 'aelf',
@@ -628,90 +561,18 @@ const supportedCurrencies = [
 		contractAddress: '0x0000000000000000000000000000000000000000',
 		rpcport: 80,
 	},
-	{
-		coin: 'ETA',
-		name: 'Etheera',
-		contractAddress: '0x9195E00402abe385f2D00A32Af40b271F2e87925',
-		rpcport: 80,
-	},
-	{
-		coin: 'ETHOS',
-		name: 'Ethos',
-		contractAddress: '0x5Af2Be193a6ABCa9c8817001F45744777Db30756',
-		rpcport: 80,
-	},
-	{
-		coin: 'FJC',
-		rpcport: 3776,
-		pubtype: 36,
-		p2shtype: 16,
-		wiftype: 164,
-		txfee: 100000,
-		electrumServers: [
-			{
-				host: 'electrumx1.fujicoin.org',
-				port: 50001,
-			},
-			{
-				host: 'electrumx2.fujicoin.org',
-				port: 50001,
-			},
-			{
-				host: 'electrumx3.fujicoin.org',
-				port: 50001,
-			},
-		],
-	},
-	{
-		coin: 'FLLW',
-		name: 'FollowCoin',
-		contractAddress: '0x0200412995f1baFef0D3F97C4E28Ac2515EC1eCE',
-		rpcport: 80,
-	},
 	{
 		coin: 'FSN',
 		name: 'Fusion',
 		contractAddress: '0xD0352a019e9AB9d757776F532377aAEbd36Fd541',
 		rpcport: 80,
 	},
-	{
-		coin: 'FTC',
-		rpcport: 9337,
-		pubtype: 14,
-		p2shtype: 5,
-		wiftype: 142,
-		txfee: 1000000,
-		electrumServers: [
-			{
-				host: 'electrumx-gb-1.feathercoin.network',
-				port: 50001,
-			},
-			{
-				host: 'electrumx-gb-2.feathercoin.network',
-				port: 50001,
-			},
-			{
-				host: 'electrumx-ch-1.feathercoin.ch',
-				port: 50001,
-			},
-			{
-				host: 'electrumx-de-2.feathercoin.ch',
-				port: 50001,
-			},
-		],
-	},
 	{
 		coin: 'FUN',
 		name: 'FunFair',
 		contractAddress: '0x419D0d8BdD9aF5e606Ae2232ed285Aff190E711b',
 		rpcport: 80,
 	},
-	{
-		coin: 'FYN',
-		name: 'FundYourselfNow',
-		contractAddress: '0x88FCFBc22C6d3dBaa25aF478C578978339BDe77a',
-		rpcport: 80,
-	},
 	{
 		coin: 'GAME',
 		rpcport: 40001,
@@ -734,18 +595,28 @@ const supportedCurrencies = [
 			},
 		],
 	},
+	{
+		coin: 'GIN',
+		name: 'Gincoin',
+		fname: 'GINcoin',
+		rpcport: 10211,
+		pubtype: 38,
+		p2shtype: 10,
+		wiftype: 198,
+		txfee: 10000,
+		electrumServers: [
+			{
+				host: 'electrum2.gincoin.io',
+				port: 6001,
+			},
+		]
+	},
 	{
 		coin: 'GNO',
 		name: 'Gnosis',
 		contractAddress: '0x6810e776880C02933D47DB1b9fc05908e5386b96',
 		rpcport: 80,
 	},
-	{
-		coin: 'GPN',
-		name: 'GPN Coin',
-		contractAddress: '0xE2b407160AAd5540eAc0e80338b9a5085C60F25B',
-		rpcport: 80,
-	},
 	{
 		coin: 'GRS',
 		rpcport: 1441,
@@ -778,12 +649,6 @@ const supportedCurrencies = [
 		contractAddress: '0xC5bBaE50781Be1669306b9e001EFF57a2957b09d',
 		rpcport: 80,
 	},
-	{
-		coin: 'GUP',
-		name: 'Matchpool',
-		contractAddress: '0xf7B098298f7C69Fc14610bf71d5e02c60792894C',
-		rpcport: 80,
-	},
 	{
 		coin: 'GUSD',
 		name: 'Gemini dollar',
@@ -791,22 +656,10 @@ const supportedCurrencies = [
 		contractAddress: '0x056Fd409E1d7A124BD7017459dFEa2F387b6d5Cd',
 		rpcport: 80,
 	},
-	{
-		coin: 'HGT',
-		name: 'HelloGold',
-		contractAddress: '0xba2184520A1cC49a6159c57e61E1844E085615B6',
-		rpcport: 80,
-	},
-	{
-		coin: 'HMQ',
-		name: 'Humaniq',
-		contractAddress: '0xcbCC0F036ED4788F63FC0fEE32873d6A7487b908',
-		rpcport: 80,
-	},
-	/* Disabled because of #289
 	{
 		coin: 'HODL',
 		asset: 'HODL',
+		name: 'HODL',
 		rpcport: 14431,
 		txversion: 4,
 		overwintered: 1,
@@ -826,34 +679,15 @@ const supportedCurrencies = [
 			},
 		],
 	},
-	{
-		coin: 'HODLC',
-		name: 'Hodlcoin',
-		rpcport: 11989,
-		pubtype: 40,
-		p2shtype: 5,
-		wiftype: 168,
-		txfee: 5000,
-		electrumServers: [
-			{
-				host: 'hodl.amit.systems',
-				port: 17989,
-			},
-			{
-				host: 'hodl2.amit.systems',
-				port: 17989,
-			},
-		],
-	},
-	*/
 	{
 		coin: 'HUSH',
-		rpcport: 8822,
-		taddr: 28,
-		pubtype: 184,
-		p2shtype: 189,
-		wiftype: 128,
-		txfee: 1000,
+		asset: 'HUSH3',
+		fname: 'Hush',
+		rpcport: 18031,
+		txversion: 4,
+		overwintered: 1,
+		mm2: 1,
+		required_confirmations: 2,
 		electrumServers: [
 			{
 				host: 'electrum1.cipig.net',
@@ -869,42 +703,12 @@ const supportedCurrencies = [
 			},
 		],
 	},
-	{
-		coin: 'HYD',
-		name: 'Hydra',
-		contractAddress: '0xD233495C48EB0143661fFC8458EAfc21b633f97f',
-		rpcport: 80,
-	},
-	{
-		coin: 'ICN',
-		name: 'Iconomi',
-		contractAddress: '0x888666CA69E0f178DED6D75b5726Cee99A87D698',
-		rpcport: 80,
-	},
-	{
-		coin: 'IND',
-		name: 'Indorse Token',
-		contractAddress: '0xf8e386EDa857484f5a12e4B5DAa9984E06E73705',
-		rpcport: 80,
-	},
 	{
 		coin: 'IOST',
 		name: 'IOST',
 		contractAddress: '0xFA1a856Cfa3409CFa145Fa4e20Eb270dF3EB21ab',
 		rpcport: 80,
 	},
-	{
-		coin: 'JOI',
-		name: 'JointEDU',
-		contractAddress: '0x58deD6994124B4FFF298f1416aCa3fC9Cdba37b2',
-		rpcport: 80,
-	},
-	{
-		coin: 'JST',
-		name: 'JST (TESTCOIN)',
-		contractAddress: '0x996a8aE0304680F6A69b8A9d7C6E37D65AB5AB56',
-		rpcport: 80,
-	},
 	{
 		coin: 'JUMBLR',
 		name: 'Jumblr',
@@ -966,39 +770,27 @@ const supportedCurrencies = [
 		rpcport: 80,
 	},
 	{
-		coin: 'KV',
-		name: 'KeyValue',
-		asset: 'KV',
-		rpcport: 8299,
+		coin: 'LABS',
+		name: 'LABS',
+		fname: 'Komodo LABS',
+		rpcport: 40265,
 		txversion: 4,
 		overwintered: 1,
 		required_confirmations: 2,
 		electrumServers: [
 			{
 				host: 'electrum1.cipig.net',
-				port: 10016,
+				port: 10019,
 			},
 			{
 				host: 'electrum2.cipig.net',
-				port: 10016,
+				port: 10019,
 			},
 			{
 				host: 'electrum3.cipig.net',
-				port: 10016,
+				port: 10019,
 			},
-		],
-	},
-	{
-		coin: 'LALA',
-		name: 'LALA World',
-		contractAddress: '0xfD107B473AB90e8Fbd89872144a3DC92C40Fa8C9',
-		rpcport: 80,
-	},
-	{
-		coin: 'LIKE',
-		name: 'LikeCoin',
-		contractAddress: '0x02F61Fd266DA6E8B102D4121f5CE7b992640CF98',
-		rpcport: 80,
+		]
 	},
 	{
 		coin: 'LINK',
@@ -1045,18 +837,6 @@ const supportedCurrencies = [
 			},
 		],
 	},
-	{
-		coin: 'LUN',
-		name: 'Lunyr',
-		contractAddress: '0xfa05A73FfE78ef8f1a739473e462c54bae6567D9',
-		rpcport: 80,
-	},
-	{
-		coin: 'LYS',
-		name: 'Lightyears',
-		contractAddress: '0xdD41fBd1Ae95C5D9B198174A28e04Be6b3d1aa27',
-		rpcport: 80,
-	},
 	{
 		coin: 'MANA',
 		name: 'Decentraland',
@@ -1070,10 +850,27 @@ const supportedCurrencies = [
 		rpcport: 80,
 	},
 	{
-		coin: 'MGO',
-		name: 'MobileGo',
-		contractAddress: '0x40395044Ac3c0C57051906dA938B54BD6557F212',
-		rpcport: 80,
+		coin: 'MGW',
+		name: 'MGW',
+		fname: 'MultiGateway',
+		rpcport: 12386,
+		txversion: 4,
+		overwintered: 1,
+		required_confirmations: 2,
+		electrumServers: [
+			{
+				host: 'electrum1.cipig.net',
+				port: 10015,
+			},
+			{
+				host: 'electrum2.cipig.net',
+				port: 10015,
+			},
+			{
+				host: 'electrum3.cipig.net',
+				port: 10015,
+			},
+		],
 	},
 	{
 		coin: 'MKR',
@@ -1093,24 +890,6 @@ const supportedCurrencies = [
 		contractAddress: '0xe7C33a0E04F2316Bb321C4AD2976873d09538B56',
 		rpcport: 80,
 	},
-	{
-		coin: 'MNX',
-		rpcport: 17786,
-		pubtype: 75,
-		p2shtype: 5,
-		wiftype: 128,
-		txfee: 10000,
-		electrumServers: [
-			{
-				host: 'elex01-ams.turinex.eu',
-				port: 50001,
-			},
-			{
-				host: '95.85.35.152',
-				port: 50001,
-			},
-		],
-	},
 	{
 		coin: 'MONA',
 		rpcport: 9402,
@@ -1189,31 +968,12 @@ const supportedCurrencies = [
 		contractAddress: '0xF433089366899D83a9f26A773D59ec7eCF30355e',
 		rpcport: 80,
 	},
-	{
-		coin: 'MYB',
-		name: 'MyBit Token',
-		contractAddress: '0x5d60d8d7eF6d37E16EBABc324de3bE57f135e0BC',
-		rpcport: 80,
-	},
-	{
-		coin: 'MYTH',
-		name: 'Unicoin',
-		decimals: 18,
-		contractAddress: '0x277AB4b9DDE09A8E710fd755deeB9d0d9532d047',
-		rpcport: 80,
-	},
 	{
 		coin: 'NAS',
 		name: 'Nebulas',
 		contractAddress: '0x5d65D971895Edc438f465c17DB6992698a52318D',
 		rpcport: 80,
 	},
-	{
-		coin: 'NET',
-		name: 'Nimiq',
-		contractAddress: '0xcfb98637bcae43C13323EAa1731cED2B716962fD',
-		rpcport: 80,
-	},
 	{
 		coin: 'NMC',
 		rpcport: 8336,
@@ -1248,30 +1008,12 @@ const supportedCurrencies = [
 		contractAddress: '0x58a4884182d9E835597f405e5F258290E46ae7C2',
 		rpcport: 80,
 	},
-	{
-		coin: 'OCC',
-		name: 'Original Crypto Coin',
-		contractAddress: '0x0235fE624e044A05eeD7A43E16E3083bc8A4287A',
-		rpcport: 80,
-	},
-	{
-		coin: 'OCT',
-		name: 'Octus',
-		contractAddress: '0x7e9d365C0C97Fe5FcAdcc1B513Af974b768C5867',
-		rpcport: 80,
-	},
 	{
 		coin: 'OMG',
 		name: 'OmiseGo',
 		contractAddress: '0xd26114cd6EE289AccF82350c8d8487fedB8A0C07',
 		rpcport: 80,
 	},
-	{
-		coin: 'ONNI',
-		name: 'Misericordae',
-		contractAddress: '0xBd9c6028e1132A6B52F1ca15C0933A2FD342E21f',
-		rpcport: 80,
-	},
 	{
 		coin: 'OOT',
 		name: 'Utrum',
@@ -1312,24 +1054,12 @@ const supportedCurrencies = [
 			},
 		],
 	},
-	{
-		coin: 'PAT',
-		name: 'Pangea Arbitration Token',
-		contractAddress: '0xBB1fA4FdEB3459733bF67EbC6f893003fA976a82',
-		rpcport: 80,
-	},
 	{
 		coin: 'PAY',
 		name: 'TenX',
 		contractAddress: '0xB97048628DB6B661D4C2aA833e95Dbe1A905B280',
 		rpcport: 80,
 	},
-	{
-		coin: 'PCL',
-		name: 'Peculium',
-		contractAddress: '0x3618516F45CD3c913F81F9987AF41077932Bc40d',
-		rpcport: 80,
-	},
 	{
 		coin: 'PUNGO',
 		name: 'Pungo Token',
@@ -1349,12 +1079,6 @@ const supportedCurrencies = [
 			},
 		],
 	},
-	{
-		coin: 'PLU',
-		name: 'Pluton',
-		contractAddress: '0xD8912C10681D8B21Fd3742244f44658dBA12264E',
-		rpcport: 80,
-	},
 	{
 		coin: 'POLY',
 		name: 'Polymath',
@@ -1373,24 +1097,6 @@ const supportedCurrencies = [
 		contractAddress: '0xd4fa1460F537bb9085d22C7bcCB5DD450Ef28e3a',
 		rpcport: 80,
 	},
-	{
-		coin: 'PRL',
-		name: 'Oyster',
-		contractAddress: '0x1844b21593262668B7248d0f57a220CaaBA46ab9',
-		rpcport: 80,
-	},
-	{
-		coin: 'PURC',
-		name: 'Peurcoin',
-		contractAddress: '0x7148B80b38278853Ca8263Cfc0b57d4478ae6A6e',
-		rpcport: 80,
-	},
-	{
-		coin: 'PXT',
-		name: 'Populous XBRL Token',
-		contractAddress: '0xc14830E53aA344E8c14603A91229A0b925b0B262',
-		rpcport: 80,
-	},
 	{
 		coin: 'RICK',
 		name: 'Rick [Test]',
@@ -1543,18 +1249,6 @@ const supportedCurrencies = [
 		contractAddress: '0x607F4C5BB672230e8672085532f7e901544a7375',
 		rpcport: 80,
 	},
-	{
-		coin: 'RLTY',
-		name: 'SMARTRealty',
-		contractAddress: '0xbe99B09709fc753b09BCf557A992F6605D5997B0',
-		rpcport: 80,
-	},
-	{
-		coin: 'RVT',
-		name: 'Rivetz',
-		contractAddress: '0x3d1BA9be9f66B8ee101911bC36D3fB562eaC2244',
-		rpcport: 80,
-	},
 	{
 		coin: 'SALT',
 		name: 'Salt',
@@ -1567,46 +1261,6 @@ const supportedCurrencies = [
 		contractAddress: '0x7C5A0CE9267ED19B22F8cae653F198e3E8daf098',
 		rpcport: 80,
 	},
-	{
-		coin: 'SANC',
-		name: 'Sancoj',
-		contractAddress: '0x03eC7BB59be036870eF696A2abF124f496d6735A',
-		rpcport: 80,
-	},
-	{
-		coin: 'SMART',
-		rpcport: 9679,
-		pubtype: 63,
-		p2shtype: 18,
-		wiftype: 191,
-		txfee: 200000,
-		electrumServers: [
-			{
-				host: 'electrum1.smartcash.cc',
-				port: 50001,
-			},
-			{
-				host: 'electrum2.smartcash.cc',
-				port: 50001,
-			},
-			{
-				host: 'electrum3.smartcash.cc',
-				port: 50001,
-			},
-			{
-				host: 'electrum4.smartcash.cc',
-				port: 50001,
-			},
-			{
-				host: 'electrum5.smartcash.cc',
-				port: 50001,
-			},
-			{
-				host: 'electrum6.smartcash.cc',
-				port: 50001,
-			},
-		],
-	},
 	{
 		coin: 'SNGLS',
 		name: 'SingularDTV',
@@ -1619,18 +1273,6 @@ const supportedCurrencies = [
 		contractAddress: '0x744d70FDBE2Ba4CF95131626614a1763DF805B9E',
 		rpcport: 80,
 	},
-	{
-		coin: 'SPANK',
-		name: 'SpankChain',
-		contractAddress: '0x42d6622deCe394b54999Fbd73D108123806f6a18',
-		rpcport: 80,
-	},
-	{
-		coin: 'SRN',
-		name: 'SIRIN LABS Token',
-		contractAddress: '0x68d57c9a1C35f63E2c83eE8e49A64e9d70528D25',
-		rpcport: 80,
-	},
 	{
 		coin: 'STORJ',
 		name: 'Storj',
@@ -1643,24 +1285,6 @@ const supportedCurrencies = [
 		contractAddress: '0xD0a4b8946Cb52f0661273bfbC6fD0E0C75Fc6433',
 		rpcport: 80,
 	},
-	{
-		coin: 'STRM41',
-		name: 'Stream41',
-		contractAddress: '0xbaD7a7F7bA71CE3659fE6dCaD34aF86b9DE2A4B2',
-		rpcport: 80,
-	},
-	{
-		coin: 'STWY',
-		name: 'StorweeyToken',
-		contractAddress: '0x8A8C71f032362fCA2994f75D854f911Ec381AC5A',
-		rpcport: 80,
-	},
-	{
-		coin: 'SUB',
-		name: 'Substratum',
-		contractAddress: '0x8D75959f1E61EC2571aa72798237101F084DE63a',
-		rpcport: 80,
-	},
 	{
 		coin: 'SUPERNET',
 		name: 'Supernet',
@@ -1684,12 +1308,6 @@ const supportedCurrencies = [
 			},
 		],
 	},
-	{
-		coin: 'SWT',
-		name: 'Swarm City',
-		contractAddress: '0xB9e7F8568e08d5659f5D29C4997173d84CdF2607',
-		rpcport: 80,
-	},
 	{
 		coin: 'TAAS',
 		name: 'TaaS',
@@ -1702,18 +1320,6 @@ const supportedCurrencies = [
 		contractAddress: '0x6531f133e6DeeBe7F2dcE5A0441aA7ef330B4e53',
 		rpcport: 80,
 	},
-	{
-		coin: 'TKN',
-		name: 'TokenCard',
-		contractAddress: '0xaAAf91D9b90dF800Df4F55c205fd6989c977E73a',
-		rpcport: 80,
-	},
-	{
-		coin: 'TRST',
-		name: 'Trust',
-		contractAddress: '0xCb94be6f13A1182E4A4B6140cb7bf2025d28e41B',
-		rpcport: 80,
-	},
 	{
 		coin: 'TUSD',
 		name: 'TrueUSD',
@@ -1721,9 +1327,9 @@ const supportedCurrencies = [
 		rpcport: 80,
 	},
 	{
-		coin: 'UCASH',
-		name: 'U.CASH',
-		contractAddress: '0x92e52a1A235d9A103D970901066CE910AAceFD37',
+		coin: 'USDC',
+		fname: 'USD Coin',
+		contractAddress: '0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48',
 		rpcport: 80,
 	},
 	// Temporarily disabled as it's not working with mm2
@@ -1742,27 +1348,33 @@ const supportedCurrencies = [
 		overwintered: 1,
 		required_confirmations: 2,
 		electrumServers: [
+			// TODO: check in with 0x03 on VRSC discord to replace, use cipi in meantime
+			// {
+			// 	host: 'el0.vrsc.0x03.services',
+			// 	port: 10000,
+			// },
+			// {
+			// 	host: 'el1.vrsc.0x03.services',
+			// 	port: 10000,
+			// },
+			// {
+			// 	host: 'el2.vrsc.0x03.services',
+			// 	port: 10000,
+			// },
 			{
-				host: 'el0.vrsc.0x03.services',
-				port: 10000,
+				host: 'electrum1.cipig.net',
+				port: 10021
 			},
 			{
-				host: 'el1.vrsc.0x03.services',
-				port: 10000,
+				host: 'electrum2.cipig.net',
+				port: 10021
 			},
 			{
-				host: 'el2.vrsc.0x03.services',
-				port: 10000,
+				host: 'electrum3.cipig.net',
+				port: 10021
 			},
 		],
 	},
-	{
-		coin: 'VSL',
-		name: 'vSlice',
-		contractAddress: '0x5c543e7AE0A1104f78406C340E9C64FD9fCE5170',
-		decimals: 18,
-		rpcport: 80,
-	},
 	{
 		coin: 'VTC',
 		rpcport: 5888,
@@ -1789,18 +1401,6 @@ const supportedCurrencies = [
 			},
 		],
 	},
-	{
-		coin: 'WAX',
-		name: 'WAX',
-		contractAddress: '0x39Bb259F66E1C59d5ABEF88375979b4D20D98022',
-		rpcport: 80,
-	},
-	{
-		coin: 'WINGS',
-		name: 'Wings',
-		contractAddress: '0x667088b212ce3d06a1b553a7221E1fD19000d9aF',
-		rpcport: 80,
-	},
 	{
 		coin: 'WLC',
 		name: 'Wireless Coin',
@@ -1830,18 +1430,6 @@ const supportedCurrencies = [
 		contractAddress: '0xb7cB1C96dB6B22b0D3d9536E0108d062BD488F74',
 		rpcport: 80,
 	},
-	{
-		coin: 'XAUR',
-		name: 'Xarum',
-		contractAddress: '0x4DF812F6064def1e5e029f1ca858777CC98D2D81',
-		rpcport: 80,
-	},
-	{
-		coin: 'XOV',
-		name: 'XOVBank',
-		contractAddress: '0x153eD9CC1b792979d2Bde0BBF45CC2A7e436a5F9',
-		rpcport: 80,
-	},
 	{
 		coin: 'XZC',
 		rpcport: 8888,
diff --git a/app/portfolio-util.js b/app/portfolio-util.js
index 830b0e482c..795166e548 100644
--- a/app/portfolio-util.js
+++ b/app/portfolio-util.js
@@ -61,6 +61,7 @@ const removedCurrencies = [
 	'BLK',
 	'FAIR',
 	'SIB',
+	"HODLC",
 ];
 
 const createPortfolio = async ({name, seedPhrase, password}) => {
diff --git a/app/renderer/api.js b/app/renderer/api.js
index 8e8500dda9..50807fb07f 100644
--- a/app/renderer/api.js
+++ b/app/renderer/api.js
@@ -4,7 +4,11 @@ import PQueue from 'p-queue';
 import ow from 'ow';
 import _ from 'lodash';
 import {getCurrency} from '../marketmaker/supported-currencies';
-import {isDevelopment} from '../util-common';
+// import {isDevelopment} from '../util-common';
+
+// NOTE: temporarily turn off this feature
+// enable when we merge code
+const isDevelopment = false;
 
 const symbolPredicate = ow.string.uppercase;
 const uuidPredicate = ow.string.matches(/[a-z\d-]/);
@@ -90,7 +94,9 @@ export default class Api {
 		ow(symbol, 'symbol', symbolPredicate);
 
 		// TODO: Remove `OOT` when https://github.com/KomodoPlatform/atomicDEX-API/issues/492 is fixed
-		if (symbol === 'OOT' || symbol === 'USDT') {
+		// above TODO should be fixed.
+		// if (symbol === 'OOT' || symbol === 'USDT') {
+		if (symbol === 'USDT') {
 			console.error(`Ignoring ${symbol} currency as it's not working with mm2`);
 			return;
 		}
@@ -109,10 +115,12 @@ export default class Api {
 				// protocol: 'SSL',
 			}));
 
+
 			try {
 				const response = await this.request({
 					method: 'electrum',
 					coin: symbol,
+					mm2: currency.mm2,
 					servers,
 				});
 
@@ -153,15 +161,13 @@ export default class Api {
 		}
 	}
 
-	// Mm v2 doesn't currently have an endpoint for disabling a coin, so we do nothing.
-	// https://github.com/artemii235/SuperNET/issues/459
-	async disableCurrency(/** symbol */) {
-		/// ow(symbol, 'symbol', symbolPredicate);
+	async disableCurrency(symbol) {
+		ow(symbol, 'symbol', symbolPredicate);
 
-		// return this.request({
-		// 	method: 'disable',
-		// 	coin: symbol,
-		// });
+		return this.request({
+			method: 'disable_coin',
+			coin: symbol,
+		});
 	}
 
 	// Mm v2
@@ -223,15 +229,30 @@ export default class Api {
 	}
 
 	// Mm v2
-	async orderStatus(uuid) {
+	// Note: new api
+	async cancelAllOrdersByPair(baseCurrency, quoteCurrency) {
+		const {result} = await this.request({
+			method: 'cancel_all_orders',
+			cancel_by: {
+				type: 'Pair',
+				data: {
+					base: baseCurrency,
+					rel: quoteCurrency
+				}
+			}
+		});
+
+		return result;
+	}
+
+	// Mm v2
+	orderStatus(uuid) {
 		ow(uuid, 'uuid', uuidPredicate);
 
-		const {result} = await this.request({
+		return this.request({
 			method: 'order_status',
 			uuid,
 		});
-
-		return result;
 	}
 
 	// Mm v2
@@ -247,13 +268,26 @@ export default class Api {
 	}
 
 	// Mm v2
-	// https://github.com/artemii235/developer-docs/blob/mm/docs/basic-docs/atomicdex/atomicdex-api.md#my_recent_swaps
-	// TODO: Add support for the input arguments it supports.
-	async myRecentSwaps() {
+	// https://developers.atomicdex.io/basic-docs/atomicdex/atomicdex-api.html#my-orders
+	async myOrders() {
 		const {result} = await this.request({
-			method: 'my_recent_swaps',
+			method: 'my_orders',
 		});
 
+		return result;
+	}
+
+	// Mm v2
+	// https://github.com/artemii235/developer-docs/blob/mm/docs/basic-docs/atomicdex/atomicdex-api.md#my_recent_swaps
+	// TODO: Add support for the input arguments it supports.
+	async myRecentSwaps(fromUUID = null) {
+		const query = {
+			method: 'my_recent_swaps'
+		};
+		if(!fromUUID) {
+			query.from_uuid = fromUUID;
+		}
+		const {result} = await this.request(query);
 		return result.swaps;
 	}
 
@@ -267,6 +301,32 @@ export default class Api {
 		return result;
 	}
 
+	// Mm v2
+	// https://developers.atomicdex.io/basic-docs/atomicdex/atomicdex-api.html#cancel-all-orders
+	async cancelAllOrders() {
+		const {result} = await this.request({
+			method: 'cancel_all_orders',
+			cancel_by: {
+				type: 'All'
+			}
+		});
+
+		return result;
+	}
+
+	// Mm v2
+	// https://developers.atomicdex.io/basic-docs/atomicdex/atomicdex-api.html#get-trade-fee
+	async getTradeFee(currency) {
+		ow(currency, 'currency', symbolPredicate);
+
+		const {result} = await this.request({
+			method: 'get_trade_fee',
+			coin: currency,
+		});
+
+		return result;
+	}
+
 	// Mm v2
 	// https://github.com/artemii235/developer-docs/blob/mm/docs/basic-docs/atomicdex/atomicdex-api.md#cancel_order
 	async cancelOrder(uuid) {
diff --git a/app/renderer/components/SwapDetails.js b/app/renderer/components/SwapDetails.js
index 4fab37d618..153d6d8bb5 100644
--- a/app/renderer/components/SwapDetails.js
+++ b/app/renderer/components/SwapDetails.js
@@ -63,28 +63,18 @@ class SwapDetails extends React.Component {
 		config.set('swapModalShowAdvanced', showAdvanced);
 	};
 
-	render() {
-		const {
-			swapId,
-			open,
-			didClose,
-		} = this.props;
-
-		if (!swapId) {
-			return null;
-		}
-
-		const swap = appContainer.state.swapHistory.find(swap => swap.uuid === swapId);
-		const {baseCurrency, quoteCurrency} = swap;
+	showTransaction = swap => {
+		if(!swap) return null;
 
 		const transactions = swap.stages.map(stage => (
-			<React.Fragment key={stage.event.type}>
+			<React.Fragment key={`${swap.uuid}-${stage.event.type}`}>
 				<div className="arrow completed">→</div>
 				{stage.event.data && stage.event.data.tx_hash ? (
 					<ExternalLink url={stage.event.data.tx_hash ? blockExplorer.tx(stage.event.data.coin, stage.event.data.tx_hash) : null}>
 						<div className="item completed">
 							<h6>{t(`swapStages.${stage.event.type}`)}</h6>
-							<p>{stage.event.data.total_amount}<br/>{stage.event.data.coin}</p>
+							{/* <p>{stage.event.data.total_amount}<br/>{stage.event.data.coin}</p> */}
+							{parseFloat(stage.event.data.my_balance_change) !== 0 && (<p>{stage.event.data.my_balance_change}<br/>{stage.event.data.coin}</p>)}
 						</div>
 					</ExternalLink>
 				) : (
@@ -94,14 +84,13 @@ class SwapDetails extends React.Component {
 				)}
 			</React.Fragment>
 		));
-
-		if (swap.status === 'swapping') {
+		if (swap.totalStages) {
 			for (const stageType of swap.totalStages) {
 				const isStageFinished = swap.stages.some(x => x.event.type === stageType);
 
 				if (!isStageFinished) {
 					transactions.push(
-						<React.Fragment key={stageType}>
+						<React.Fragment key={`${swap.uuid}-${stageType}`}>
 							<div className="arrow">→</div>
 							<div className="item">
 								<h6>{t(`swapStages.${stageType}`)}</h6>
@@ -112,8 +101,35 @@ class SwapDetails extends React.Component {
 			}
 		}
 
+		return (
+			<div className="transactions" key={swap.uuid}>
+				{transactions}
+			</div>
+		);
+	}
+
+	render() {
+		const {
+			swapId,
+			open,
+			didClose,
+		} = this.props;
+
+		if (!swapId) {
+			return null;
+		}
+
+		// const swap = appContainer.state.swapHistory.find(swap => swap.uuid === swapId);
+		const order = appContainer.state.ordersHistory.find(order => order.uuid === swapId);
+		// get last swap
+		let swap = null;
+		if(order.swaps.length > 0)
+			swap = order.swaps[order.swaps.length - 1];
+
+		const {baseCurrency, quoteCurrency} = order;
+
 		const prices = ['requested', 'broadcast', 'executed'].map(value => {
-			if (!swap[value].price) {
+			if (!order[value].price) {
 				return null;
 			}
 
@@ -121,23 +137,23 @@ class SwapDetails extends React.Component {
 				<div key={value}>
 					<h6>{t(`details.${value}`)}</h6>
 					<p>
-						<span className="label">{t(`details.${swap.orderType}`)}:</span> {zeroPadFraction(swap[value].baseCurrencyAmount)} {baseCurrency}
+						<span className="label">{t(`details.${order.action}`)}:</span> {zeroPadFraction(order[value].baseCurrencyAmount)} {baseCurrency}
 						<br/>
-						<span className="label">{t('details.for')}:</span> {zeroPadFraction(swap[value].quoteCurrencyAmount)} {quoteCurrency}
+						<span className="label">{t('details.for')}:</span> {zeroPadFraction(order[value].quoteCurrencyAmount)} {quoteCurrency}
 						<br/>
-						<span className="label">{t('details.price')}:</span> {zeroPadFraction(swap[value].price)} {quoteCurrency}
+						<span className="label">{t('details.price')}:</span> {zeroPadFraction(order[value].price)} {quoteCurrency}
 					</p>
 				</div>
 			);
 		});
 
-		const overview = getOverview(swap);
+		const overview = getOverview(order);
 
 		const titleComponent = (
 			<div className="title">
-				<div>{title(swap.statusFormatted)}</div>
-				<div className="title__main">{baseCurrency}/{quoteCurrency} {t(`details.${swap.orderType}`)} {t('details.order')}</div>
-				<div>{formatDate(swap.timeStarted, 'HH:mm DD/MM/YY')}</div>
+				<div>{title(order.statusFormatted)}</div>
+				<div className="title__main">{baseCurrency}/{quoteCurrency} {t(`details.${order.orderType}`)} {t('details.order')}</div>
+				<div>{formatDate(order.timeStarted, 'HH:mm DD/MM/YY')}</div>
 			</div>
 		);
 
@@ -153,16 +169,16 @@ class SwapDetails extends React.Component {
 				>
 					<>
 						<Progress
-							value={swap.progress}
+							value={swap ? swap.progress : 0}
 							color={
-								(swap.status === 'completed' && 'var(--success-color)') ||
-								(swap.status === 'failed' && 'var(--error-color)') ||
+								(swap && swap.status === 'completed' && 'var(--success-color)') ||
+								(swap && swap.status === 'failed' && 'var(--error-color)') ||
 							null
 							}
 						/>
 						<div className="section overview">
 							<div className="from">
-								{swap.isActive && (
+								{order.isOpen && (
 									<div className="currency-animation">
 										<div className="scale-wrapper">
 											<CurrencyIcon className="to" symbol={overview.forCurrency}/>
@@ -174,7 +190,7 @@ class SwapDetails extends React.Component {
 								<p>{overview.fromTitle}</p>
 								<p className="amount">{overview.fromAmount} {overview.fromCurrency}</p>
 							</div>
-							{!swap.isActive && (
+							{!order.isOpen && (
 								<RightArrowIcon className="RightArrow" size="20px"/>
 							)}
 							<div className="to">
@@ -196,11 +212,11 @@ class SwapDetails extends React.Component {
 							<div className="details">
 								<div className="section progress">
 									<p>
-										{(swap.status === 'failed' && swap.error) && (
+										{swap && (swap.status === 'failed' && swap.error) && (
 											swap.error.message
 										)}
 									</p>
-									{swap.statusInformation && (
+									{swap && swap.statusInformation && (
 										<p>{swap.statusInformation}</p>
 									)}
 								</div>
@@ -210,23 +226,25 @@ class SwapDetails extends React.Component {
 										<div className="offer">
 											{prices}
 										</div>
-										{swap.executed.percentCheaperThanRequested > 0 && (
+										{/* {swap && swap.executed && swap.executed.percentCheaperThanRequested > 0 && (
 											<p>
 												{t('details.stats', {
-													percentCheaperThanRequested: swap.executed.percentCheaperThanRequested,
+													percentCheaperThanRequested: swap && swap.executed.percentCheaperThanRequested,
 												})}
 											</p>
-										)}
+										)} */}
 									</div>
-									{(transactions.length > 0) && (
+									{(order.swaps.length > 0) && (
 										<>
 											<h4>{t('details.transactions')}</h4>
-											<div className="transactions">
-												{transactions}
-											</div>
+											{order.swaps.map(this.showTransaction)}
 										</>
 									)}
-									<p>ID: {swap.uuid}</p>
+									<p>
+										ID: {order.uuid}
+										<br />
+										Type: {t(`details.${order.orderType}`)}
+									</p>
 									{isDevelopment &&
 										<Button
 											value={t('details.copyDebugData')}
diff --git a/app/renderer/components/SwapList.js b/app/renderer/components/SwapList.js
index d30d44477b..135c5aff0b 100644
--- a/app/renderer/components/SwapList.js
+++ b/app/renderer/components/SwapList.js
@@ -26,13 +26,14 @@ class CancelButton extends React.Component {
 
 	cancelSwap = async swapUuid => {
 		await tradesContainer.setIsSwapCancelling(swapUuid, true);
-		this.forceUpdate();
-
+		const {swapDB, api} = appContainer;
 		try {
-			await appContainer.api.cancelOrder(swapUuid);
+			await api.cancelOrder(swapUuid);
+			await swapDB.updateOrderStatus(swapUuid, 'cancelled');
 		} catch (error) {
 			unhandled.logError(error);
 		}
+		this.forceUpdate();
 	};
 
 	render() {
@@ -43,7 +44,8 @@ class CancelButton extends React.Component {
 				type="button"
 				className="cancel__button"
 				disabled={
-					swap.status !== 'pending' ||
+					// swap.status !== 'pending' ||
+					swap.status !== 'active' ||
 					tradesContainer.state.isSwapCancelling[swap.uuid]
 				}
 				onClick={event => {
@@ -98,13 +100,13 @@ const SwapHeader = props => (
 
 // eslint-disable-next-line no-unused-vars
 const SwapItem = ({style, swap, showCancel, openSwap}) => (
-	<div className={`row ${swap.orderType}`} style={style} onClick={openSwap}>
+	<div className={`row ${swap.action || swap.orderType}`} style={style} onClick={openSwap}>
 		<div className="timestamp">{formatDate(swap.timeStarted, 'HH:mm DD/MM/YY')}</div>
 		<div className="pairs">{swap.baseCurrency}/{swap.quoteCurrency}</div>
 		<div className="base-amount">{swap.baseCurrencyAmount} {swap.baseCurrency}</div>
 		<div className="quote-amount">{swap.quoteCurrencyAmount} {swap.quoteCurrency}</div>
 		<div className="status">
-			<div className="status__icon" data-status={swap.status}>{swap.statusFormatted}</div>
+			<div className="status__icon" data-status={_.lowerCase(swap.status)}>{swap.statusFormatted}</div>
 		</div>
 		<div className="buttons">
 			{
@@ -115,6 +117,11 @@ const SwapItem = ({style, swap, showCancel, openSwap}) => (
 					</div>
 				)
 				*/
+				showCancel && (
+					<div className="cancel">
+						<CancelButton swap={swap}/>
+					</div>
+				)
 			}
 		</div>
 	</div>
diff --git a/app/renderer/components/SwapList.scss b/app/renderer/components/SwapList.scss
index d3a52681b8..fd401183f7 100644
--- a/app/renderer/components/SwapList.scss
+++ b/app/renderer/components/SwapList.scss
@@ -206,6 +206,7 @@
 		}
 
 		&__icon[data-status='pending'],
+		&__icon[data-status='active'],
 		&__icon[data-status='matched'],
 		&__icon[data-status='swapping'] {
 			background-color: var(--primary-color);
diff --git a/app/renderer/containers/App.js b/app/renderer/containers/App.js
index 9ebb03fd89..d1f1d081b3 100644
--- a/app/renderer/containers/App.js
+++ b/app/renderer/containers/App.js
@@ -29,6 +29,8 @@ class AppContainer extends SuperContainer {
 		enabledCoins: alwaysEnabledCurrencies,
 		currencies: [],
 		swapHistory: [],
+		// NOTE: new api
+		ordersHistory: [],
 	};
 
 	events = new EventEmitter();
@@ -45,24 +47,158 @@ class AppContainer extends SuperContainer {
 	}
 
 	initSwapHistoryListener() {
+
 		const setSwapHistory = async () => {
 			await this.setState({swapHistory: await this.swapDB.getSwaps()});
+			// NOTE: new api
+			await this.setState({ordersHistory: await this.swapDB.getOrders()});
 		};
 
 		setSwapHistory();
 
 		this.swapDB.on('change', setSwapHistory);
 
+		let makerActiveOrders = [];
+		let takerActiveOrders = [];
+
 		// TODO: Change this to `1` second.
 		fireEvery({seconds: 10}, async () => {
+			let activeOrders = this.state.ordersHistory.filter(order => order.isActive || order.status === 'matched').map(order => order.uuid);
+
+			// const orderTypes = this.state.ordersHistory.map(order => order.orderType);
+			// console.log('orderTypes', orderTypes);
+
+			// const orderStatus = this.state.ordersHistory.map(order => order.status);
+			// console.log('orderStatus', orderStatus);
+
+			console.log(`load recent orders`);
+			const myOrders = await this.api.myOrders();
+			const takerOrders = myOrders.taker_orders;
+			const makerOrders = myOrders.maker_orders;
+			const orders = _.merge(takerOrders, makerOrders);
+			const activeOrdersInThisLoops = _.keys(orders);
+			const makerOrdersInThisLoops = _.keys(makerOrders);
+			const takerOrdersInThisLoops = _.keys(takerOrders);
+
+			const ordersJustCompleted = _.differenceWith(activeOrders, activeOrdersInThisLoops, _.isEqual);
+			const newOrders = _.differenceWith(activeOrdersInThisLoops, activeOrders, _.isEqual);
+			const ordersJustChangeToMaker = _.differenceWith(makerOrdersInThisLoops, makerActiveOrders, _.isEqual);
+
+			// Add new order to loop
+			activeOrders = _.concat(activeOrders, newOrders);
+
+			const recentSwaps = await this.api.myRecentSwaps();
+
+			await Promise.all(activeOrders.map(async uuid => {
+			try {
+				const order = this.state.ordersHistory.find(x => x.uuid === uuid);
+				if(!order) {
+					console.error('Could not find order:', uuid);
+					return;
+				}
+				const isOrdersJustCompleted = ordersJustCompleted.indexOf(uuid) !== -1;
+				const isOrdersJustChangeToMaker = ordersJustChangeToMaker.indexOf(uuid) !== -1;
+				let isMakerOrder = order.orderType === "maker";
+				let isTakerOrder = order.orderType === "taker";
+
+				// update order type
+				if(isOrdersJustChangeToMaker) {
+					await this.swapDB.markOrderType(uuid, 'maker');
+					isMakerOrder = true;
+					isTakerOrder = false;
+				}
+
+				// update order swaps
+				const orderInMM2 = orders[uuid];
+				let activeSwaps = order.startedSwaps;
+				if(orderInMM2) {
+					// if order is still active, update new swap
+	 				activeSwaps = _.concat(activeSwaps, orderInMM2.started_swaps);
+				}
+
+				// if(isTakerOrder && isOrdersJustCompleted && order.status !== 'matched') {
+				if(isTakerOrder && order.status === 'matched' && activeSwaps.indexOf(uuid) === -1) {
+					// taker order just matched and filled
+					console.log('isTakerOrder && isOrdersJustCompleted');
+					activeSwaps.push(uuid);
+				}
+
+				// if(isMakerOrder && isOrdersJustCompleted && order.status !== 'matched') {
+				if(isMakerOrder && order.status === 'matched' && order.receivedByMe >= order.requested.baseCurrencyAmount) {
+					// maker order just matched and filled
+					console.log(`isMakerOrder && matched ${uuid}`);
+					// NOTE:
+					// because this issue https://github.com/KomodoPlatform/atomicDEX-API/issues/451
+					// we only allow user to open one order for each coin pair for now
+					// Because there is only one order at a time so all current swaps will be its
+					const { baseCurrency, quoteCurrency, orderType } = order;
+					for(let i = 0; i < recentSwaps.length; i += 1) {
+						const swap = recentSwaps[i];
+						const {
+							events,
+							error_events: errorEvents,
+							success_events: successEvents,
+						} = swap;
+
+						const failedEvent = events.find(event => errorEvents.includes(event.event.type));
+						const isFinished = !failedEvent && events.some(event => event.event.type === 'Finished');
+
+						if(activeSwaps.indexOf(swap.uuid) !== -1) {
+							// found last swap, stop loops
+							break;
+						}
+
+						if(
+							swap.my_info.my_coin === quoteCurrency &&
+							swap.my_info.other_coin === baseCurrency &&
+							swap.type === _.startCase(orderType) &&
+							!isFinished
+						) {
+							activeSwaps.push(swap.uuid);
+						}
+					}
+				}
+
+				if(activeSwaps.length === 0) {
+					activeOrders = _.without(activeOrders, uuid);
+				}
+
+				const swapsData = activeSwaps
+				.map(swapID => recentSwaps.find(x => x.uuid === swapID))
+				.filter(el => el); // remove undefined
+
+				if(swapsData.length > 0) {
+					await this.swapDB.updateSwapData2(uuid, swapsData);
+				}
+
+				// update order status
+				if(order.status === 'matched' && order.receivedByMe >= order.requested.baseCurrencyAmount) {
+					await this.swapDB.updateOrderStatus(uuid, 'completed');
+				}
+
+				if(isOrdersJustCompleted && order.status === 'active') {
+					await this.swapDB.updateOrderStatus(uuid, 'matched');
+				}
+			} catch(err) {
+				console.log(err);
+			}
+			}));
+
+			makerActiveOrders = makerOrdersInThisLoops;
+			takerActiveOrders = takerOrdersInThisLoops;
+		});
+
+		// TODO: Change this to `1` second.
+		fireEvery({seconds: 10}, async () => {
+			console.log(`load recent swaps`);
 			const uuids = this.state.swapHistory.map(swap => swap.uuid);
 			const recentSwaps = await this.api.myRecentSwaps();
-			console.log('recentSwaps', recentSwaps);
+			// console.log('recentSwaps', recentSwaps);
 
 			await Promise.all(uuids.map(async uuid => {
 				const swap = recentSwaps.find(x => x.uuid === uuid);
 				if (!swap) {
-					console.error('Could not find swap:', uuid);
+					// console.error('Could not find swap:', uuid);
 					return;
 				}
 
@@ -71,7 +207,7 @@ class AppContainer extends SuperContainer {
 				// 	swap.errorEvent = errorEvent;
 				// }
 
-				console.log('swap', swap);
+				// console.log('swap', swap);
 
 				// Const status = await this.api.mySwapStatus(uuid);
 				// console.log('update', status);
@@ -275,11 +411,6 @@ class AppContainer extends SuperContainer {
 			const enabledCoins = prevState.enabledCoins.filter(enabledCoin => enabledCoin !== coin);
 			setCurrencies(prevState.portfolio.id, enabledCoins);
 
-			// TODO: Remove this when https://github.com/artemii235/SuperNET/issues/459 is fixed.
-			api.dialog.showMessageBox(activeWindow(), {
-				message: 'Marketmaker v2 cannot currently disable currencies when running, so you need to restart HyperDEX for it to take effect.',
-			});
-
 			return {enabledCoins};
 		}, () => {
 			this.events.emit('enabled-currencies-changed');
diff --git a/app/renderer/containers/Exchange.js b/app/renderer/containers/Exchange.js
index 98e5b1bd83..315d7b8da3 100644
--- a/app/renderer/containers/Exchange.js
+++ b/app/renderer/containers/Exchange.js
@@ -4,12 +4,13 @@ import _ from 'lodash';
 import SuperContainer from 'containers/SuperContainer';
 import appContainer from 'containers/App';
 import fireEvery from '../fire-every';
+import { alwaysEnabledCurrencies } from '../../constants';
 
 class ExchangeContainer extends SuperContainer {
 	getInitialState() {
 		return {
-			baseCurrency: 'CHIPS',
-			quoteCurrency: 'KMD',
+			baseCurrency: alwaysEnabledCurrencies[0],
+			quoteCurrency: alwaysEnabledCurrencies[1],
 			activeSwapsView: 'OpenOrders',
 			orderBook: {
 				bids: [],
@@ -84,15 +85,18 @@ class ExchangeContainer extends SuperContainer {
 		) {
 			return;
 		}
-
 		if (!_.isEqual(this.state.orderBook, orderBook)) {
+			// sort orderbook
+			orderBook.asks = _.orderBy(orderBook.asks, ['price'], ['asc']);
+			orderBook.bids = _.orderBy(orderBook.bids, ['price'], ['desc']);
+
 			this.setState({orderBook});
 		}
 	}
 
 	async watchOrderBook() {
 		if (!this.stopWatchingOrderBook) {
-			this.stopWatchingOrderBook = await fireEvery({seconds: 2}, async () => {
+			this.stopWatchingOrderBook = await fireEvery({seconds: 5}, async () => {
 				await this.fetchOrderBook();
 			});
 		}
diff --git a/app/renderer/format-order-data.js b/app/renderer/format-order-data.js
new file mode 100644
index 0000000000..87dc1846e9
--- /dev/null
+++ b/app/renderer/format-order-data.js
@@ -0,0 +1,195 @@
+import roundTo from 'round-to';
+import {isAfter} from 'date-fns';
+import {appTimeStarted} from '../constants';
+import {translate} from './translate';
+
+const t = translate('swap');
+
+export default function formatOrder(data) {
+	const {
+		uuid,
+		timeStarted,
+		request,
+		response,
+		status,
+		type,
+		swaps,
+    	startedSwaps
+	} = data;
+
+	const {
+		action,
+		base: baseCurrency,
+		rel: quoteCurrency,
+		baseAmount,
+		quoteAmount,
+	} = response;
+
+	const order = {
+		uuid,
+		timeStarted,
+		action: action === 'Buy' ? 'buy' : 'sell', // This is swap type
+		orderType: type,
+		status,
+		statusFormatted: t(`status.${status}`).toLowerCase(),
+		error: false,
+		// NOTE: this is swap field, we should remove this when atomiclabs#615 is solved
+		progress: 0,
+		baseCurrency,
+		quoteCurrency,
+		baseCurrencyAmount: roundTo(baseAmount, 8),
+		quoteCurrencyAmount: roundTo(quoteAmount, 8),
+		price: roundTo(quoteAmount / baseAmount, 8),
+		requested: {
+			baseCurrencyAmount: roundTo(request.amount, 8),
+			quoteCurrencyAmount: roundTo(request.total, 8),
+			price: roundTo(request.price, 8),
+		},
+		broadcast: {
+			baseCurrencyAmount: roundTo(baseAmount, 8),
+			quoteCurrencyAmount: roundTo(quoteAmount, 8),
+			price: roundTo(quoteAmount / baseAmount, 8),
+		},
+		executed: {
+			baseCurrencyAmount: undefined,
+			quoteCurrencyAmount: undefined,
+			price: undefined,
+			percentCheaperThanRequested: undefined,
+		},
+		// totalStages: [],
+		// stages: [],
+		_debug: {
+			request,
+			response,
+			// swapData,
+		},
+		startedSwaps,
+		get isOpen() {
+			return this.status === 'active' || order.status === 'matched';
+		},
+		get receivedByMe() {
+			return this.swaps.reduce((accumulator, currentValue) => {
+				return accumulator + currentValue.receivedByMe;
+			}, 0);
+		},
+		get isActive() {
+			if(this.status === "active") {
+				return true;
+			}
+			const swaps = this.startedSwaps.map(e => formatSwap(this.originSwapsField[e]));
+			const activeSwaps = swaps.filter(e => {
+				if(!e) return true;
+				return ['failed', 'completed'].indexOf(e.status) === -1;
+			});
+			return activeSwaps.length > 0;
+		}
+	};
+
+	order.originSwapsField = swaps
+
+	order.swaps = startedSwaps
+	.map(e => formatSwap(swaps[e]))
+	.filter(el => el); // remove undefined
+
+	return order;
+}
+
+export function formatSwap(data) {
+	if(!data) return null;
+
+	const {
+		uuid,
+		events,
+		error_events: errorEvents,
+		success_events: successEvents,
+	} = data;
+
+	const swap = {
+		uuid,
+		status: 'pending',
+		statusFormatted: t('status.open').toLowerCase(),
+		cacheReceivedByMeAmount: 0,
+		get receivedByMe() {
+			if(this.cacheReceivedByMeAmount > 0) return this.cacheReceivedByMeAmount;
+
+			const finishedStage = this.totalStages.indexOf('TakerFeeSent') !== -1 ? 'MakerPaymentSpent' : 'TakerPaymentSpent';
+			const stage = this.stages.find(({ event }) => {
+				return finishedStage === event.type;
+			});
+			if(!stage) {
+				// if not found
+				return 0;
+			}
+			const {event} = stage;
+			this.cacheReceivedByMeAmount = parseFloat(event.data.received_by_me) + parseFloat(event.data.fee_details.amount);
+			return this.cacheReceivedByMeAmount;
+		}
+	};
+
+	const failedEvent = events.find(event => errorEvents.includes(event.event.type));
+	const nonSwapEvents = ['Started', 'Negotiated', 'Finished'];
+	const totalSwapEvents = successEvents.filter(type => !nonSwapEvents.includes(type));
+	const swapEvents = events.filter(event => (
+		!nonSwapEvents.includes(event.event.type) &&
+		!errorEvents.includes(event.event.type)
+	));
+	const isFinished = !failedEvent && events.some(event => event.event.type === 'Finished');
+	const isSwapping = !failedEvent && !isFinished && swapEvents.length > 0;
+	const maxSwapProgress = 0.8;
+	const newestEvent = events[events.length - 1];
+
+	// Console.log('failedEvent', failedEvent);
+	// console.log('totalSwapEvents', totalSwapEvents);
+	// console.log('swapEvents', swapEvents);
+	// console.log('isFinished', isFinished);
+	// console.log('isSwapping', isSwapping);
+
+	swap.totalStages = totalSwapEvents;
+	swap.stages = swapEvents;
+
+	if (failedEvent) {
+		swap.status = 'failed';
+		swap.progress = 1;
+
+		swap.error = {
+			code: failedEvent.event.type,
+			message: failedEvent.event.data.error,
+		};
+	} else if (isFinished) {
+		swap.status = 'completed';
+		swap.progress = 1;
+	} else if (isSwapping) {
+		swap.status = 'swapping';
+		swap.statusFormatted = `swap ${swapEvents.length}/${totalSwapEvents.length}`;
+		swap.progress = 0.1 + ((swapEvents.length / totalSwapEvents.length) * maxSwapProgress);
+	} else if (newestEvent && newestEvent.event.type === 'Negotiated') {
+		swap.status = 'matched';
+		swap.progress = 0.1;
+	}
+
+	// TODO(sindresorhus): I've tried to preserve the existing behavior when using mm2. We should probably update the events and naming for mm2 conventions though.
+
+	if (!isSwapping) {
+		swap.statusFormatted = t(`status.${swap.status}`).toLowerCase();
+	}
+
+
+	// if (swap.status === 'pending') {
+	// 	swap.statusFormatted = t('status.open').toLowerCase();
+	// }
+
+	// Show open orders from previous session as cancelled
+	const cancelled = swap.status === 'pending' && isAfter(appTimeStarted, swap.timeStarted);
+	if (cancelled) {
+		swap.status = 'failed';
+		swap.error = {
+			code: undefined,
+			message: undefined,
+		};
+		swap.statusFormatted = t('status.cancelled').toLowerCase();
+	}
+
+	// Console.log('progress', swap.progress);
+
+	return swap;
+}
diff --git a/app/renderer/swap-db.js b/app/renderer/swap-db.js
index 08a6eb0944..606edf7202 100644
--- a/app/renderer/swap-db.js
+++ b/app/renderer/swap-db.js
@@ -5,10 +5,12 @@ import cryptoPouch from 'crypto-pouch';
 import Emittery from 'emittery';
 import PQueue from 'p-queue';
 import roundTo from 'round-to';
+import ow from 'ow';
 import {subDays, isAfter} from 'date-fns';
 import appContainer from 'containers/App';
 import {appTimeStarted} from '../constants';
 import {translate} from './translate';
+import formatOrder from './format-order-data';
 
 const t = translate('swap');
 
@@ -18,26 +20,32 @@ PouchDB.plugin(cryptoPouch);
 
 class SwapDB {
 	constructor(portfolioId, seedPhrase) {
-		// Using `2` so it won't conflict with HyperDEX versions using marketmaker v1.
+		// Using `orders2` so it won't conflict with prev db
 		this.db = new PouchDB(`swaps2-${portfolioId}`, {adapter: 'idb'});
 
+		this.db2 = new PouchDB(`orders2-${portfolioId}`, {adapter: 'idb'});
+
 		this.db.crypto(seedPhrase);
 
+		this.db2.crypto(seedPhrase);
+
 		const ee = new Emittery();
 		this.on = ee.on.bind(ee);
 		this.off = ee.off.bind(ee);
 		this.once = ee.once.bind(ee);
 
-		this.db.changes({
+		this.db2.changes({
 			since: 'now',
 			live: true,
 			include_docs: true, // eslint-disable-line camelcase
-		}).on('change', ({doc: swap}) => ee.emit('change', swap));
+		}).on('change', ({doc: order}) => ee.emit('change', order));
 
 		// To be able to sort via timeStarted it MUST be the fist item in the index.
 		// https://github.com/pouchdb/pouchdb/issues/7207
 		this.ready = (async () => {
 			await this.db.createIndex({index: {fields: ['timeStarted', 'uuid']}});
+			// NOTE: new api
+			await this.db2.createIndex({index: {fields: ['timeStarted', 'uuid']}});
 			await this.migrate();
 
 			// We need to regularly check if pending swaps have timed out.
@@ -47,6 +55,12 @@ class SwapDB {
 		})();
 
 		this.pQueue = new PQueue({concurrency: 1});
+
+		// NOTE: this is only for debug
+		// please remove these lines when we merge code
+		if (typeof window !== 'undefined') {
+			window.swapDB = this;
+		}
 	}
 
 	async migrate() {
@@ -69,6 +83,22 @@ class SwapDB {
 		});
 	}
 
+	// NOTE: new api
+	insertOrderData(order, requestOpts) {
+		return this.queue(() => this.db2.post({
+			uuid: order.uuid,
+			timeStarted: Date.now(),
+			request: requestOpts,
+			response: order,
+			messages: [],
+			swaps: {},
+    		startedSwaps:[],
+			// NOTE: taker order will be converted to maker order if it is not matched in 30s
+			type: "taker",
+			status: "active"
+		}));
+	}
+
 	insertSwapData(swap, requestOpts) {
 		return this.queue(() => this.db.post({
 			uuid: swap.uuid,
@@ -90,6 +120,77 @@ class SwapDB {
 		return docs[0];
 	}
 
+	// NOTE: new api
+	async _getOrderData(uuid) {
+		await this.ready;
+
+		const {docs} = await this.db2.find({
+			selector: {uuid},
+			limit: 1,
+		});
+
+		return docs[0];
+	}
+
+	// NOTE: new api
+	updateOrderData = (orderData, /*swapsData*/) => {
+		return this.queue(async () => {
+			const order = await this._getOrderData(orderData.uuid);
+
+			await this.db2.upsert(order._id, doc => {
+				doc.type = orderData.type;
+				// for(let i = 0; i < swapsData.length; i+=1) {
+				// 	const swap = swapsData[i];
+				// 	if(doc.startedSwaps.indexOf(swap.uuid) === -1) {
+				// 		doc.startedSwaps.push(swap.uuid);
+				// 	}
+				// 	doc.swaps[swap.uuid] = swap;
+				// }
+				return doc;
+			});
+		});
+	}
+
+	// NOTE: new api
+	updateOrderStatus = (uuid, status) => {
+		return this.queue(async () => {
+			const order = await this._getOrderData(uuid);
+			await this.db2.upsert(order._id, doc => {
+				doc.status = status;
+				return doc;
+			});
+		});
+	}
+
+	// NOTE: new api
+	markOrderType = (uuid, type) => {
+		return this.queue(async () => {
+			const order = await this._getOrderData(uuid);
+			await this.db2.upsert(order._id, doc => {
+				doc.type = type;
+				return doc;
+			});
+		});
+	}
+
+	// NOTE: new api
+	updateSwapData2 = (uuid, swapsData) => {
+		return this.queue(async () => {
+			const order = await this._getOrderData(uuid);
+
+			await this.db2.upsert(order._id, doc => {
+				for(let i = 0; i < swapsData.length; i+=1) {
+					const swap = swapsData[i];
+					if(doc.startedSwaps.indexOf(swap.uuid) === -1) {
+						doc.startedSwaps.push(swap.uuid);
+					}
+					doc.swaps[swap.uuid] = swap;
+				}
+				return doc;
+			});
+		});
+	}
+
 	updateSwapData = swapData => {
 		return this.queue(async () => {
 			const swap = await this._getSwapData(swapData.uuid);
@@ -103,8 +204,7 @@ class SwapDB {
 
 	// TODO: We should refactor this into a seperate file
 	_formatSwap(data) {
-		console.log('swap data', data);
-
+		// Console.log('swap data', data);
 		const {
 			uuid,
 			timeStarted,
@@ -127,9 +227,6 @@ class SwapDB {
 			orderType: action === 'Buy' ? 'buy' : 'sell',
 			status: 'pending',
 			statusFormatted: t('status.open').toLowerCase(),
-			get isActive() {
-				return !['completed', 'failed'].includes(this.status);
-			},
 			error: false,
 			progress: 0,
 			baseCurrency,
@@ -160,9 +257,12 @@ class SwapDB {
 				response,
 				swapData,
 			},
+			get isActive() {
+				return !['completed', 'failed'].includes(this.status);
+			},
 		};
 
-		console.log('swapData', swapData);
+		// Console.log('swapData', swapData);
 
 		if (swapData) {
 			const {
@@ -171,7 +271,7 @@ class SwapDB {
 				success_events: successEvents,
 			} = swapData;
 
-			console.log('events', events);
+			// Console.log('events', events);
 
 			const failedEvent = events.find(event => errorEvents.includes(event.event.type));
 			const nonSwapEvents = ['Started', 'Negotiated', 'Finished'];
@@ -185,11 +285,11 @@ class SwapDB {
 			const maxSwapProgress = 0.8;
 			const newestEvent = events[events.length - 1];
 
-			console.log('failedEvent', failedEvent);
-			console.log('totalSwapEvents', totalSwapEvents);
-			console.log('swapEvents', swapEvents);
-			console.log('isFinished', isFinished);
-			console.log('isSwapping', isSwapping);
+			// Console.log('failedEvent', failedEvent);
+			// console.log('totalSwapEvents', totalSwapEvents);
+			// console.log('swapEvents', swapEvents);
+			// console.log('isFinished', isFinished);
+			// console.log('isSwapping', isSwapping);
 
 			swap.totalStages = totalSwapEvents;
 			swap.stages = swapEvents;
@@ -236,7 +336,7 @@ class SwapDB {
 			swap.statusFormatted = t('status.cancelled').toLowerCase();
 		}
 
-		console.log('progress', swap.progress);
+		// Console.log('progress', swap.progress);
 
 		return swap;
 	}
@@ -266,6 +366,35 @@ class SwapDB {
 		// We need `timeStarted: {$gt: true}` so PouchDB can sort.
 		// https://github.com/pouchdb/pouchdb/issues/7206
 		const {docs} = await this.db.find(options.query || query);
+		return docs;
+	}
+
+	// NOTE: new api
+	async _getAllOrdersData(options = {}) {
+		await this.ready;
+
+		options = {
+			since: true,
+			sort: 'desc',
+			...options,
+		};
+
+		const query = {
+			selector: {
+				timeStarted: {
+					$gt: options.since,
+				},
+			},
+			sort: [
+				{
+					timeStarted: options.sort,
+				},
+			],
+		};
+
+		// We need `timeStarted: {$gt: true}` so PouchDB can sort.
+		// https://github.com/pouchdb/pouchdb/issues/7206
+		const {docs} = await this.db2.find(options.query || query);
 
 		return docs;
 	}
@@ -275,32 +404,59 @@ class SwapDB {
 		return swapData.map(this._formatSwap);
 	}
 
-	async getSwapCount() {
-		const entries = await this.db.allDocs();
+	// NOTE: new api
+	async getOrders(options) {
+		const ordersData = await this._getAllOrdersData(options);
+		return ordersData.map(formatOrder);
+	}
+
+	// NOTE: new api
+	async getRawOrders(options) {
+		const ordersData = await this._getAllOrdersData(options);
+		return ordersData;
+	}
+
+	async getOrdersCount() {
+		const entries = await this.db2.allDocs();
 		return entries.rows.length - 1; // We don't count the `_design` doc
 	}
 
+	// NOTE: new api
+	// https://pouchdb.com/api.html#delete_document
+	async removeAOrder(uuid) {
+		ow(uuid, 'uuid', ow.string);
+		return this.queue(async () => {
+			const order = await this._getOrderData(uuid);
+			await this.db2.remove(order);
+		});
+	}
+
 	async destroy() {
 		await this.db.destroy();
 	}
 
+	// NOTE: new api
+	async destroy2() {
+		await this.db2.destroy();
+	}
+
 	async statsSince(timestamp) {
-		const swaps = await this.getSwaps({since: timestamp});
-		const successfulSwaps = swaps.filter(swap => swap.status === 'completed');
+		const orders = await this.getOrders({since: timestamp});
+		const successfulOrders = orders.filter(swap => swap.status === 'completed');
 
 		const tradedCurrencies = new Set();
-		for (const swap of successfulSwaps) {
+		for (const swap of successfulOrders) {
 			tradedCurrencies.add(swap.baseCurrency);
 			tradedCurrencies.add(swap.quoteCurrency);
 		}
 
 		let totalSwapsWorthInUsd = 0;
-		for (const swap of successfulSwaps) {
+		for (const swap of successfulOrders) {
 			totalSwapsWorthInUsd += swap.quoteCurrencyAmount * appContainer.getCurrency(swap.quoteCurrency).cmcPriceUsd;
 		}
 
 		return {
-			successfulSwapCount: successfulSwaps.length,
+			successfulSwapCount: successfulOrders.length,
 			currencyCount: tradedCurrencies.size,
 			totalSwapsWorthInUsd,
 		};
diff --git a/app/renderer/swap-db.saved.js b/app/renderer/swap-db.saved.js
new file mode 100644
index 0000000000..33b62cbc80
--- /dev/null
+++ b/app/renderer/swap-db.saved.js
@@ -0,0 +1,314 @@
+import PouchDB from 'pouchdb-browser';
+import pouchDBFind from 'pouchdb-find';
+import pouchDBUpsert from 'pouchdb-upsert';
+import cryptoPouch from 'crypto-pouch';
+import Emittery from 'emittery';
+import PQueue from 'p-queue';
+import roundTo from 'round-to';
+import {subDays, isAfter} from 'date-fns';
+import appContainer from 'containers/App';
+import {appTimeStarted} from '../constants';
+import {translate} from './translate';
+
+const t = translate('swap');
+
+PouchDB.plugin(pouchDBFind);
+PouchDB.plugin(pouchDBUpsert);
+PouchDB.plugin(cryptoPouch);
+
+class SwapDB {
+	constructor(portfolioId, seedPhrase) {
+		// Using `2` so it won't conflict with HyperDEX versions using marketmaker v1.
+		this.db = new PouchDB(`swaps2-${portfolioId}`, {adapter: 'idb'});
+
+		this.db.crypto(seedPhrase);
+
+		const ee = new Emittery();
+		this.on = ee.on.bind(ee);
+		this.off = ee.off.bind(ee);
+		this.once = ee.once.bind(ee);
+
+		this.db.changes({
+			since: 'now',
+			live: true,
+			include_docs: true, // eslint-disable-line camelcase
+		}).on('change', ({doc: swap}) => ee.emit('change', swap));
+
+		// To be able to sort via timeStarted it MUST be the fist item in the index.
+		// https://github.com/pouchdb/pouchdb/issues/7207
+		this.ready = (async () => {
+			await this.db.createIndex({index: {fields: ['timeStarted', 'uuid']}});
+			await this.migrate();
+
+			// We need to regularly check if pending swaps have timed out.
+			// https://github.com/jl777/SuperNET/issues/775
+			const ONE_MINUTE = 1000 * 60;
+			setInterval(() => ee.emit('change'), ONE_MINUTE);
+		})();
+
+		this.pQueue = new PQueue({concurrency: 1});
+	}
+
+	async migrate() {
+		const {docs: swaps} = await this.db.find({
+			selector: {timeStarted: {$gt: true}},
+			sort: [{timeStarted: 'desc'}],
+		});
+
+		swaps.filter(swap => (
+			typeof swap.request.amount === 'string' ||
+			typeof swap.request.price === 'string' ||
+			typeof swap.request.total === 'string'
+		)).forEach(swap => this.db.remove(swap));
+	}
+
+	queue(fn) {
+		this.pQueue.add(async () => {
+			await this.ready;
+			fn();
+		});
+	}
+
+	insertSwapData(swap, requestOpts) {
+		return this.queue(() => this.db.post({
+			uuid: swap.uuid,
+			timeStarted: Date.now(),
+			request: requestOpts,
+			response: swap,
+			messages: [],
+		}));
+	}
+
+	async _getSwapData(uuid) {
+		await this.ready;
+
+		const {docs} = await this.db.find({
+			selector: {uuid},
+			limit: 1,
+		});
+
+		return docs[0];
+	}
+
+	updateSwapData = swapData => {
+		return this.queue(async () => {
+			const swap = await this._getSwapData(swapData.uuid);
+
+			await this.db.upsert(swap._id, doc => {
+				doc.swapData = swapData;
+				return doc;
+			});
+		});
+	}
+
+	// TODO: We should refactor this into a seperate file
+	_formatSwap(data) {
+		// Console.log('swap data', data);
+
+		const {
+			uuid,
+			timeStarted,
+			request,
+			response,
+			swapData,
+		} = data;
+
+		const {
+			action,
+			base: baseCurrency,
+			rel: quoteCurrency,
+			baseAmount,
+			quoteAmount,
+		} = response;
+
+		const swap = {
+			uuid,
+			timeStarted,
+			orderType: action === 'Buy' ? 'buy' : 'sell',
+			status: 'pending',
+			statusFormatted: t('status.open').toLowerCase(),
+			get isActive() {
+				return !['completed', 'failed'].includes(this.status);
+			},
+			error: false,
+			progress: 0,
+			baseCurrency,
+			quoteCurrency,
+			baseCurrencyAmount: roundTo(baseAmount, 8),
+			quoteCurrencyAmount: roundTo(quoteAmount, 8),
+			price: roundTo(quoteAmount / baseAmount, 8),
+			requested: {
+				baseCurrencyAmount: roundTo(request.amount, 8),
+				quoteCurrencyAmount: roundTo(request.total, 8),
+				price: roundTo(request.price, 8),
+			},
+			broadcast: {
+				baseCurrencyAmount: roundTo(baseAmount, 8),
+				quoteCurrencyAmount: roundTo(quoteAmount, 8),
+				price: roundTo(quoteAmount / baseAmount, 8),
+			},
+			executed: {
+				baseCurrencyAmount: undefined,
+				quoteCurrencyAmount: undefined,
+				price: undefined,
+				percentCheaperThanRequested: undefined,
+			},
+			totalStages: [],
+			stages: [],
+			_debug: {
+				request,
+				response,
+				swapData,
+			},
+		};
+
+		// Console.log('swapData', swapData);
+
+		if (swapData) {
+			const {
+				events,
+				error_events: errorEvents,
+				success_events: successEvents,
+			} = swapData;
+
+			// Console.log('events', events);
+
+			const failedEvent = events.find(event => errorEvents.includes(event.event.type));
+			const nonSwapEvents = ['Started', 'Negotiated', 'Finished'];
+			const totalSwapEvents = successEvents.filter(type => !nonSwapEvents.includes(type));
+			const swapEvents = events.filter(event => (
+				!nonSwapEvents.includes(event.event.type) &&
+				!errorEvents.includes(event.event.type)
+			));
+			const isFinished = !failedEvent && events.some(event => event.event.type === 'Finished');
+			const isSwapping = !failedEvent && !isFinished && swapEvents.length > 0;
+			const maxSwapProgress = 0.8;
+			const newestEvent = events[events.length - 1];
+
+			// Console.log('failedEvent', failedEvent);
+			// console.log('totalSwapEvents', totalSwapEvents);
+			// console.log('swapEvents', swapEvents);
+			// console.log('isFinished', isFinished);
+			// console.log('isSwapping', isSwapping);
+
+			swap.totalStages = totalSwapEvents;
+			swap.stages = swapEvents;
+
+			if (failedEvent) {
+				swap.status = 'failed';
+				swap.progress = 1;
+
+				swap.error = {
+					code: failedEvent.event.type,
+					message: failedEvent.event.data.error,
+				};
+			} else if (isFinished) {
+				swap.status = 'completed';
+				swap.progress = 1;
+			} else if (isSwapping) {
+				swap.status = 'swapping';
+				swap.statusFormatted = `swap ${swapEvents.length}/${totalSwapEvents.length}`;
+				swap.progress = 0.1 + ((swapEvents.length / totalSwapEvents.length) * maxSwapProgress);
+			} else if (newestEvent && newestEvent.event.type === 'Negotiated') {
+				swap.status = 'matched';
+				swap.progress = 0.1;
+			}
+
+			// TODO(sindresorhus): I've tried to preserve the existing behavior when using mm2. We should probably update the events and naming for mm2 conventions though.
+
+			if (!isSwapping) {
+				swap.statusFormatted = t(`status.${swap.status}`).toLowerCase();
+			}
+		}
+
+		if (swap.status === 'pending') {
+			swap.statusFormatted = t('status.open').toLowerCase();
+		}
+
+		// Show open orders from previous session as cancelled
+		const cancelled = swap.status === 'pending' && isAfter(appTimeStarted, swap.timeStarted);
+		if (cancelled) {
+			swap.status = 'failed';
+			swap.error = {
+				code: undefined,
+				message: undefined,
+			};
+			swap.statusFormatted = t('status.cancelled').toLowerCase();
+		}
+
+		// Console.log('progress', swap.progress);
+
+		return swap;
+	}
+
+	async _getAllSwapData(options = {}) {
+		await this.ready;
+
+		options = {
+			since: true,
+			sort: 'desc',
+			...options,
+		};
+
+		const query = {
+			selector: {
+				timeStarted: {
+					$gt: options.since,
+				},
+			},
+			sort: [
+				{
+					timeStarted: options.sort,
+				},
+			],
+		};
+
+		// We need `timeStarted: {$gt: true}` so PouchDB can sort.
+		// https://github.com/pouchdb/pouchdb/issues/7206
+		const {docs} = await this.db.find(options.query || query);
+
+		return docs;
+	}
+
+	async getSwaps(options) {
+		const swapData = await this._getAllSwapData(options);
+		return swapData.map(this._formatSwap);
+	}
+
+	async getSwapCount() {
+		const entries = await this.db.allDocs();
+		return entries.rows.length - 1; // We don't count the `_design` doc
+	}
+
+	async destroy() {
+		await this.db.destroy();
+	}
+
+	async statsSince(timestamp) {
+		const swaps = await this.getSwaps({since: timestamp});
+		const successfulSwaps = swaps.filter(swap => swap.status === 'completed');
+
+		const tradedCurrencies = new Set();
+		for (const swap of successfulSwaps) {
+			tradedCurrencies.add(swap.baseCurrency);
+			tradedCurrencies.add(swap.quoteCurrency);
+		}
+
+		let totalSwapsWorthInUsd = 0;
+		for (const swap of successfulSwaps) {
+			totalSwapsWorthInUsd += swap.quoteCurrencyAmount * appContainer.getCurrency(swap.quoteCurrency).cmcPriceUsd;
+		}
+
+		return {
+			successfulSwapCount: successfulSwaps.length,
+			currencyCount: tradedCurrencies.size,
+			totalSwapsWorthInUsd,
+		};
+	}
+
+	statsSinceLastMonth() {
+		return this.statsSince(subDays(Date.now(), 30).getTime());
+	}
+}
+
+export default SwapDB;
diff --git a/app/renderer/views/CreatePortfolio/Step3.js b/app/renderer/views/CreatePortfolio/Step3.js
index 9afc6d936a..c3db720382 100644
--- a/app/renderer/views/CreatePortfolio/Step3.js
+++ b/app/renderer/views/CreatePortfolio/Step3.js
@@ -15,7 +15,8 @@ const CreatePortfolioStep3 = () => {
 		<div className="CreatePortfolio">
 			<LoginBackButton view="CreatePortfolioStep2" progress={0.50}/>
 			<h1>{t('create.confirmSeedPhrase')}</h1>
-			<p>TODO: Put some explanation here on what to do.</p>
+			{/* <p>TODO: Put some explanation here on what to do.</p> */}
+			<p></p>
 			<form style={{marginTop: '20px'}} onSubmit={container.handleStep3Submit}>
 				<div className="form-group" style={{width: '460px'}}>
 					<TextArea
diff --git a/app/renderer/views/Dashboard/Activity.js b/app/renderer/views/Dashboard/Activity.js
index 18417aa32e..3359f245be 100644
--- a/app/renderer/views/Dashboard/Activity.js
+++ b/app/renderer/views/Dashboard/Activity.js
@@ -71,7 +71,7 @@ ActivityList.propTypes = {
 };
 
 const Activity = () => {
-	const successfulSwaps = appContainer.state.swapHistory.filter(x => x.status === 'completed');
+	const successfulSwaps = appContainer.state.ordersHistory.filter(order => order.status === 'completed');
 
 	return (
 		<div className="Dashboard--Activity">
diff --git a/app/renderer/views/Dashboard/WalletActivity.js b/app/renderer/views/Dashboard/WalletActivity.js
index 22f621cfa0..43dc1b4347 100644
--- a/app/renderer/views/Dashboard/WalletActivity.js
+++ b/app/renderer/views/Dashboard/WalletActivity.js
@@ -89,15 +89,25 @@ ActivityList.propTypes = {
 const Activity = () => {
 	const {activeCurrency} = dashboardContainer;
 
-	const swaps = appContainer.state.swapHistory.filter(swap =>
-		!swap.isActive &&
-		[swap.baseCurrency, swap.quoteCurrency].includes(activeCurrency.symbol)
-	);
+	// const swaps = appContainer.state.swapHistory.filter(swap =>
+	// 	!swap.isActive &&
+	// 	[swap.baseCurrency, swap.quoteCurrency].includes(activeCurrency.symbol)
+	// );
+
+	const orders = appContainer.state.ordersHistory.filter(order => {
+		return !order.isOpen &&
+		[order.baseCurrency, order.quoteCurrency].includes(activeCurrency.symbol)
+	});
 
 	return (
-		<div className="Wallet--Activity">
-			<ActivityList items={swaps}/>
-		</div>
+		<>
+			<div className="Wallet--Activity">
+				<ActivityList items={orders}/>
+			</div>
+			{/* <div className="Wallet--Activity">
+				<ActivityList items={swaps}/>
+			</div> */}
+		</>
 	);
 };
 
diff --git a/app/renderer/views/Dashboard/WithdrawModal.js b/app/renderer/views/Dashboard/WithdrawModal.js
index fec2c075f8..f02b92b6a9 100644
--- a/app/renderer/views/Dashboard/WithdrawModal.js
+++ b/app/renderer/views/Dashboard/WithdrawModal.js
@@ -49,10 +49,13 @@ class WithdrawModal extends React.Component {
 	};
 
 	withdrawButtonHandler = async () => {
+
 		this.setState({isWithdrawing: true});
 
 		const {symbol} = dashboardContainer.activeCurrency;
+		const {balance} = appContainer.getCurrency(symbol);
 		const {recipientAddress: address, amount} = this.state;
+		const max = Number(amount) === Number(balance) ? true : false;
 
 		const {
 			fee_details: feeDetails,
@@ -61,11 +64,10 @@ class WithdrawModal extends React.Component {
 			symbol,
 			address,
 			amount: Number(amount),
-			// TODO: Support `max` option
-			max: false,
+			max,
 		});
 
-		const txFee = 'amount' in feeDetails ? feeDetails.amount : feeDetails.total_fee;
+		const txFee = 'amount' in feeDetails ? parseFloat(feeDetails.amount) : parseFloat(feeDetails.total_fee);
 
 		const currency = getCurrency(symbol);
 		const txFeeCurrencySymbol = currency.contractAddress ? 'ETH' : symbol;
diff --git a/app/renderer/views/Exchange/Order.js b/app/renderer/views/Exchange/Order.js
index 51065bf32c..ebf4ba2f22 100644
--- a/app/renderer/views/Exchange/Order.js
+++ b/app/renderer/views/Exchange/Order.js
@@ -9,11 +9,23 @@ import Select from 'components/Select';
 import CurrencySelectOption from 'components/CurrencySelectOption';
 import exchangeContainer from 'containers/Exchange';
 import appContainer from 'containers/App';
+import tradesContainer from 'containers/Trades';
 import CrosshairIcon from 'icons/Crosshair';
+import {getCurrency} from '../../../marketmaker/supported-currencies';
 import {formatCurrency} from '../../util';
 import {translate} from '../../translate';
 import './Order.scss';
 
+// TODO: This should be fixed properly in mm or use more sensible logic here
+// This is just a quick fix to increase match rate
+const percentMoreExpensive = 0.1 / 100;
+
+const isEthBased = symbol => {
+	const currency = getCurrency(symbol);
+
+	return !!currency.contractAddress;
+};
+
 const t = translate('exchange');
 
 class Top extends React.Component {
@@ -65,9 +77,6 @@ const Center = props => {
 	const selectRow = row => {
 		let {price} = row;
 
-		// TODO: This should be fixed properly in mm or use more sensible logic here
-		// This is just a quick fix to increase match rate
-		const percentMoreExpensive = 5 / 100;
 		const pricePercentage = price * percentMoreExpensive;
 		if (props.type === 'buy') {
 			price += pricePercentage;
@@ -134,10 +143,35 @@ class Bottom extends React.Component {
 		this.setState({hasError: false});
 		exchangeContainer.setIsSendingOrder(true);
 
-		const {api} = appContainer;
+		const {api, state: appState, swapDB} = appContainer;
+
 		const {baseCurrency, quoteCurrency} = exchangeContainer.state;
 		const {price, amount, total, type} = this.props;
 
+		const {currencies} = appState;
+		const base = isEthBased(quoteCurrency) ? quoteCurrency : baseCurrency;
+		const isECR20 = isEthBased(quoteCurrency) || isEthBased(baseCurrency);
+		const balanceOfEthereum = currencies.find(o => o && o.coin === 'ETH');
+		const openOrders = appState.ordersHistory
+		.filter(order => order.status === 'active')
+		.filter(order => baseCurrency === order.baseCurrency && quoteCurrency === order.quoteCurrency)
+		.map(order => order.uuid);
+
+		// NOTE: we only allow one order for one pair for now
+		// Cancel prev order in same orderbook
+		for(let i = 0; i < openOrders.length; i++) {
+			try {
+				await tradesContainer.setIsSwapCancelling(openOrders[i], true);
+				await api.cancelOrder(openOrders[i]);
+				await swapDB.updateOrderStatus(openOrders[i], 'cancelled');
+			} catch (error) {
+				// Note: we ignore all error
+				console.log('open new order', error);
+			}
+		}
+
+		this.forceUpdate();
+
 		const orderError = error => {
 			// eslint-disable-next-line no-new
 			new Notification(t('order.failedTrade', {baseCurrency, type}), {body: error});
@@ -155,9 +189,15 @@ class Bottom extends React.Component {
 
 		let swap;
 		try {
+			if(isECR20 && !balanceOfEthereum){
+				throw new Error(`${base} is ECR20 token, please enable ETH coin first.`);
+			}
+			if(isECR20 && balanceOfEthereum.balance < 0.001) {
+				throw new Error(`ETH balance 0 is too low to cover gas fee, required 0.001`);
+			}
 			swap = await api.order(requestOpts);
 		} catch (error) {
-			console.log('a', error);
+			console.log('open new order', error);
 			orderError(error);
 			return;
 		}
@@ -169,7 +209,8 @@ class Bottom extends React.Component {
 		requestOpts.amount = requestOpts.volume;
 		delete requestOpts.volume;
 
-		const {swapDB} = appContainer;
+		// NOTE: new api
+		await swapDB.insertOrderData(swap, requestOpts);
 		await swapDB.insertSwapData(swap, requestOpts);
 		exchangeContainer.setIsSendingOrder(false);
 	};
diff --git a/app/renderer/views/Exchange/Swaps.js b/app/renderer/views/Exchange/Swaps.js
index 892555f895..ad97057df0 100644
--- a/app/renderer/views/Exchange/Swaps.js
+++ b/app/renderer/views/Exchange/Swaps.js
@@ -12,7 +12,8 @@ import './Swaps.scss';
 
 const t = translate('exchange');
 
-const getOpenOrders = () => appContainer.state.swapHistory.filter(swap => swap.isActive);
+// const getOpenOrders = () => appContainer.state.ordersHistory.filter(order => order.status !== 'completed');
+const getOpenOrders = () => appContainer.state.ordersHistory.filter(order => order.isOpen);
 
 const TabView = ({component}) => (
 	<View component={component} activeView={exchangeContainer.state.activeSwapsView}/>
diff --git a/app/renderer/views/ForgotPassword/Step1.js b/app/renderer/views/ForgotPassword/Step1.js
index 5a3b81a039..d10ff443b4 100644
--- a/app/renderer/views/ForgotPassword/Step1.js
+++ b/app/renderer/views/ForgotPassword/Step1.js
@@ -15,7 +15,8 @@ const ForgotPasswordStep1 = () => {
 		<div className="ForgotPassword">
 			<LoginBackButton view="LoginBox" progress={0}/>
 			<h1>{t('enterSeedPhrase')}</h1>
-			<p>TODO: Put some explanation here on what to do.</p>
+			{/* <p>TODO: Put some explanation here on what to do.</p> */}
+			<p></p>
 			<div className="form-group" style={{width: '460px'}}>
 				<TextArea
 					required
diff --git a/app/renderer/views/RestorePortfolio/Step1.js b/app/renderer/views/RestorePortfolio/Step1.js
index eeec745846..520f4ed4d3 100644
--- a/app/renderer/views/RestorePortfolio/Step1.js
+++ b/app/renderer/views/RestorePortfolio/Step1.js
@@ -14,7 +14,8 @@ const RestorePortfolioStep1 = () => {
 		<div className="RestorePortfolio">
 			<LoginBackButton view="NewPortfolio" progress={0}/>
 			<h1>{t('restore.enterSeedPhrase')}</h1>
-			<p>TODO: Put some explanation here on what to do.</p>
+			{/* <p>TODO: Put some explanation here on what to do.</p> */}
+			<p></p>
 			<form style={{marginTop: '20px'}} onSubmit={container.handleStep1Submit}>
 				<div className="form-group" style={{width: '460px'}}>
 					<TextArea
diff --git a/app/renderer/views/Settings/Export.js b/app/renderer/views/Settings/Export.js
index 978bdaa5e2..8fa55d9350 100644
--- a/app/renderer/views/Settings/Export.js
+++ b/app/renderer/views/Settings/Export.js
@@ -79,9 +79,9 @@ class Export extends React.Component {
 
 	render() {
 		/// TODO: Use async rendering here when it's out in React
-		if (this.state.swapCount === undefined) {
+		if (this.state.ordersCount === undefined) {
 			(async () => {
-				this.setState({swapCount: await appContainer.swapDB.getSwapCount()});
+				this.setState({ordersCount: await appContainer.swapDB.getOrdersCount()});
 			})();
 		}
 
@@ -90,7 +90,7 @@ class Export extends React.Component {
 				<label style={{marginBottom: '10px'}}>{t('export.sectionLabel')}</label>
 				<Button
 					value={t('export.exportTradeHistory')}
-					disabled={!(this.state.swapCount > 0)}
+					disabled={!(this.state.ordersCount > 0)}
 					onClick={this.handleClick}
 				/>
 			</div>
diff --git a/app/renderer/views/Trades.js b/app/renderer/views/Trades.js
index ee43003d94..e752bc4ba3 100644
--- a/app/renderer/views/Trades.js
+++ b/app/renderer/views/Trades.js
@@ -26,13 +26,18 @@ TabView.propTypes = {
 
 const OpenOrders = () => {
 	const {state} = appContainer;
-	const filteredData = state.swapHistory.filter(swap => swap.isActive);
+	// const filteredData = state.swapHistory.filter(swap => swap.isActive);
+	// const filteredData = state.ordersHistory.filter(order => order.status !== 'completed');
+	const filteredData = state.ordersHistory.filter(order => order.isOpen);
+
 	return <SwapList showCancel showHeader swaps={filteredData}/>;
 };
 
 const TradeHistory = () => {
 	const {state} = appContainer;
-	const filteredData = state.swapHistory.filter(swap => !swap.isActive);
+	// const filteredData = state.swapHistory.filter(swap => !swap.isActive);
+	// const filteredData = state.ordersHistory.filter(order => order.status === 'completed');
+	const filteredData = state.ordersHistory.filter(order => !order.isOpen);
 
 	return (
 		<SwapFilters swaps={filteredData}>
diff --git a/package.json b/package.json
index 0479ae44b0..e3b21081b5 100644
--- a/package.json
+++ b/package.json
@@ -4,6 +4,7 @@
 		"postinstall": "electron-builder install-app-deps && npm run get-marketmaker",
 		"lint": "xo && stylelint 'app/renderer/**/*.scss'",
 		"test": "yarn lint && ava",
+		"test:unit": "ava",
 		"start:watch": "webpack-dev-server --hot",
 		"start:launch": "wait-for-localhost 8080 && run-electron app",
 		"start": "yarn && run-p --race start:*",
@@ -137,7 +138,10 @@
 			"unicorn/filename-case": "off",
 			"import/exports-last": "error",
 			"react/jsx-fragments": "off"
-		}
+		},
+		"ignores": [
+			"test/renderer/__mocks__/**"
+		]
 	},
 	"stylelint": {
 		"extends": "stylelint-config-xo-scss",
diff --git a/test/renderer/__mocks__/a26144dc-237c-4d32-b34d-e73ce9b34f83.json b/test/renderer/__mocks__/a26144dc-237c-4d32-b34d-e73ce9b34f83.json
new file mode 100644
index 0000000000..415ea6b670
--- /dev/null
+++ b/test/renderer/__mocks__/a26144dc-237c-4d32-b34d-e73ce9b34f83.json
@@ -0,0 +1,116 @@
+{
+	"uuid": "a26144dc-237c-4d32-b34d-e73ce9b34f83",
+	"timeStarted": 1571374940996,
+	"swapData": {
+		"recoverable": false,
+		"type": "Taker",
+		"uuid": "a26144dc-237c-4d32-b34d-e73ce9b34f83",
+		"success_events": ["Started", "Negotiated", "TakerFeeSent", "MakerPaymentReceived", "MakerPaymentWaitConfirmStarted", "MakerPaymentValidatedAndConfirmed", "TakerPaymentSent", "TakerPaymentSpent", "MakerPaymentSpent", "Finished"],
+		"my_info": {
+			"my_amount": "0.101",
+			"my_coin": "RICK",
+			"other_amount": "0.1",
+			"other_coin": "MORTY",
+			"started_at": 1571374942
+		},
+		"events": [{
+			"timestamp": 1571374943340,
+			"event": {
+				"type": "Started",
+				"data": {
+					"lock_duration": 7800,
+					"maker": "7932139a858bb9c65eafdc74fa0798617efc18b81c0c5946c798c7a5a6b95d08",
+					"maker_amount": "0.1",
+					"maker_coin": "MORTY",
+					"maker_coin_start_block": 114678,
+					"maker_payment_confirmations": 1,
+					"maker_payment_wait": 1571377542,
+					"my_persistent_pub": "02471f64357636038d6db76677369f3995bbaf4531bf39a919286ca36f1a680002",
+					"started_at": 1571374942,
+					"taker_amount": "0.101",
+					"taker_coin": "RICK",
+					"taker_coin_start_block": 112702,
+					"taker_payment_confirmations": 1,
+					"taker_payment_lock": 1571382742,
+					"uuid": "a26144dc-237c-4d32-b34d-e73ce9b34f83"
+				}
+			}
+		}, {
+			"timestamp": 1571375004475,
+			"event": {
+				"type": "Negotiated",
+				"data": {
+					"maker_payment_locktime": 1571390541,
+					"maker_pubkey": "027932139a858bb9c65eafdc74fa0798617efc18b81c0c5946c798c7a5a6b95d08",
+					"secret_hash": "493c54d9b4bebd4d522874711543dcc528245056"
+				}
+			}
+		}, {
+			"timestamp": 1571375010539,
+			"event": {
+				"type": "TakerFeeSent",
+				"data": {
+					"block_height": 0,
+					"coin": "RICK",
+					"internal_id": "e28691d4fa793db3fea47510e50ab50160ccbfdaf3193e94b56c2e83ad759fb1",
+					"my_balance_change": "-0.00013998",
+					"received_by_me": "0.899267",
+					"spent_by_me": "0.89940698",
+					"timestamp": 0,
+					"total_amount": "0.89940698",
+					"tx_hash": "e28691d4fa793db3fea47510e50ab50160ccbfdaf3193e94b56c2e83ad759fb1",
+					"tx_hex": "0400008085202f8901c932eb1b75a7c8660fc17aa086eeef64df2509c0f3e2a1a9def1dc2c906d3906010000006a47304402202d518186d84e2de10f75d4f52d5d5d6353312e08ed67657412754fc30d50319102202b76d60f6763bea9270d480b99ab3b3e90fa7370810a37c2c9ecb5ef11cd52f9012102471f64357636038d6db76677369f3995bbaf4531bf39a919286ca36f1a680002ffffffff02c6320000000000001976a914ca1e04745e8ca0c60d8c5881531d51bec470743f88ac2c2c5c05000000001976a914b1cc1a6fe678e98fda7572a76679363dcfad6a8f88ac9c47a95d000000000000000000000000000000",
+					"to": ["RRVJBpA5MoeTo3beA1iP6euWWrWcJdJtXu", "RThtXup6Zo7LZAi8kRWgjAyi1s4u6U9Cpf"],
+					"from": ["RRVJBpA5MoeTo3beA1iP6euWWrWcJdJtXu"],
+					"fee_details": {
+						"amount": "0.00001"
+					}
+				}
+			}
+		}, {
+			"timestamp": 1571375700549,
+			"event": {
+				"type": "MakerPaymentValidateFailed",
+				"data": {
+					"error": "taker_swap:605] Error waiting for 'maker-payment' data: taker_swap:601] timeout (690.0 > 690.0)"
+				}
+			}
+		}, {
+			"timestamp": 1571375700551,
+			"event": {
+				"type": "Finished"
+			}
+		}],
+		"error_events": ["StartFailed", "NegotiateFailed", "TakerFeeSendFailed", "MakerPaymentValidateFailed", "TakerPaymentTransactionFailed", "TakerPaymentDataSendFailed", "TakerPaymentWaitForSpendFailed", "MakerPaymentSpendFailed", "TakerPaymentRefunded", "TakerPaymentRefundFailed"]
+	},
+	"request": {
+		"type": "buy",
+		"baseCurrency": "MORTY",
+		"quoteCurrency": "RICK",
+		"price": 1.0605,
+		"total": 0.10605,
+		"amount": 0.1
+	},
+	"response": {
+		"action": "Buy",
+		"base": "MORTY",
+		"dest_pub_key": "0000000000000000000000000000000000000000000000000000000000000000",
+		"method": "request",
+		"rel": "RICK",
+		"sender_pubkey": "471f64357636038d6db76677369f3995bbaf4531bf39a919286ca36f1a680002",
+		"uuid": "a26144dc-237c-4d32-b34d-e73ce9b34f83",
+		"baseAmount": 0.1,
+		"quoteAmount": 0.10605,
+		"base_amount_rat": [
+			[1, [2764472320, 232830]],
+			[1, [1874919424, 2328306]]
+		],
+		"rel_amount_rat": [
+			[1, [2121]],
+			[1, [20000]]
+		]
+	},
+	"messages": [],
+	"_id": "5197344a-4a44-4009-9e15-997bd40a1dd9",
+	"_rev": "978-ba5f2909d20eff34fd02af21143f540c"
+}
diff --git a/test/renderer/format-order-swap.js b/test/renderer/format-order-swap.js
new file mode 100644
index 0000000000..5539811d3a
--- /dev/null
+++ b/test/renderer/format-order-swap.js
@@ -0,0 +1,16 @@
+import test from 'ava';
+import proxyquire from 'proxyquire';
+import order from './__mocks__/a26144dc-237c-4d32-b34d-e73ce9b34f83.json';
+
+const formatOrder = proxyquire.noCallThru()('../../app/renderer/format-order-data', {
+	'./translate': {
+		translate: namespace => {
+			return () => 'Open';
+		},
+	},
+}).default;
+
+test('format order data', t => {
+	const formatedData = formatOrder(order);
+	t.is(formatedData.uuid, order.uuid);
+});