diff --git a/packages/atomicdex-app/app/containers/DexPage/components/AmountSection.js b/packages/atomicdex-app/app/containers/DexPage/components/AmountSection.js
index 1512d848..5f275da1 100644
--- a/packages/atomicdex-app/app/containers/DexPage/components/AmountSection.js
+++ b/packages/atomicdex-app/app/containers/DexPage/components/AmountSection.js
@@ -31,7 +31,7 @@ import validate from '../../../components/Form/validate';
 import type { BuyCoinPayload } from '../schema';
 import { calculateDexfee } from '../utils';
 import { STATE_SWAPS, NA, FINISHED_SWAPS_STATE } from '../../../constants';
-import { AUTO_HIDE_SNACKBAR_TIME, DEXFEE } from '../constants';
+import { AUTO_HIDE_SNACKBAR_TIME } from '../constants';
 import {
   loadBuyCoin,
   loadRecentSwaps,
diff --git a/packages/atomicdex-app/app/containers/OrdersPage/__tests__/__snapshots__/actions.spec.js.snap b/packages/atomicdex-app/app/containers/OrdersPage/__tests__/__snapshots__/actions.spec.js.snap
index 9bacd15b..40d7de50 100644
--- a/packages/atomicdex-app/app/containers/OrdersPage/__tests__/__snapshots__/actions.spec.js.snap
+++ b/packages/atomicdex-app/app/containers/OrdersPage/__tests__/__snapshots__/actions.spec.js.snap
@@ -65,7 +65,7 @@ Object {
     "biddepth": 0,
     "bids": Array [
       Object {
-        "address": "RAwv8JhfvmFx2V3QpY7ehiYpBJ1eqxxdxR",
+        "address": "RRVJBpA5MoeTo3beA1iP6euWWrWcJdJtXu",
         "age": 1,
         "avevolume": 0,
         "coin": "KMD",
diff --git a/packages/atomicdex-app/app/containers/OrdersPage/__tests__/reducer.spec.js b/packages/atomicdex-app/app/containers/OrdersPage/__tests__/reducer.spec.js
index c9f38b2e..749ffbe3 100644
--- a/packages/atomicdex-app/app/containers/OrdersPage/__tests__/reducer.spec.js
+++ b/packages/atomicdex-app/app/containers/OrdersPage/__tests__/reducer.spec.js
@@ -93,7 +93,7 @@ describe('containers/OrderPage/reducers/loadOrderbookSuccess', () => {
     expect(buyReducer(initialState, loadOrderbookSuccess(payload))).toEqual(
       fromJS({
         selectCoinModal: { open: false },
-        myorder: { fetchStatus: null, errors: null, list: [] },
+        myorder: { fetchStatus: null, errors: null },
         orders: {
           '12fj3npPKwTNxUgDMN8XcCDcR2Z4DBehj6-KMD-BTC': {
             pubkey:
@@ -106,6 +106,7 @@ describe('containers/OrderPage/reducers/loadOrderbookSuccess', () => {
             rel: 'KMD',
             type: 'ORDER_BOB_SIDE',
             id: '12fj3npPKwTNxUgDMN8XcCDcR2Z4DBehj6-KMD-BTC',
+            uuid: null,
             maxvolume: 0.15931538
           },
           '1JsAjr6d21j9T8EMsYnQ6GXf1mM523JAv1-KMD-BTC': {
@@ -119,19 +120,21 @@ describe('containers/OrderPage/reducers/loadOrderbookSuccess', () => {
             rel: 'KMD',
             type: 'ORDER_BOB_SIDE',
             id: '1JsAjr6d21j9T8EMsYnQ6GXf1mM523JAv1-KMD-BTC',
+            uuid: null,
             maxvolume: 0.10416148
           },
-          'RAwv8JhfvmFx2V3QpY7ehiYpBJ1eqxxdxR-KMD-BTC': {
+          'RRVJBpA5MoeTo3beA1iP6euWWrWcJdJtXu-KMD-BTC': {
             pubkey:
               'dbd8c73e2e80e4f3cf88d2f04a9d2d0df4269496608b14a3e17556fdcb01e0c1',
             meta: { coin: 'KMD', numutxos: 0, depth: 0, age: 1, zcredits: 0 },
             price: 11636.025133814292,
             avevolume: 0,
             base: 'BTC',
-            address: 'RAwv8JhfvmFx2V3QpY7ehiYpBJ1eqxxdxR',
+            address: 'RRVJBpA5MoeTo3beA1iP6euWWrWcJdJtXu',
             rel: 'KMD',
             type: 'ORDER_ALICE_SIDE',
-            id: 'RAwv8JhfvmFx2V3QpY7ehiYpBJ1eqxxdxR-KMD-BTC',
+            id: 'RRVJBpA5MoeTo3beA1iP6euWWrWcJdJtXu-KMD-BTC',
+            uuid: null,
             maxvolume: 570.67205239
           },
           'RT9MpMyucqXiX8bZLimXBnrrn2ofmdGNKd-KMD-BTC': {
@@ -145,6 +148,7 @@ describe('containers/OrderPage/reducers/loadOrderbookSuccess', () => {
             rel: 'KMD',
             type: 'ORDER_ALICE_SIDE',
             id: 'RT9MpMyucqXiX8bZLimXBnrrn2ofmdGNKd-KMD-BTC',
+            uuid: null,
             maxvolume: 19956.77585582
           },
           'RHy2obsEHhAdTag4fDsC4SfCEqm5ZzTUSH-KMD-BTC': {
@@ -158,6 +162,7 @@ describe('containers/OrderPage/reducers/loadOrderbookSuccess', () => {
             rel: 'KMD',
             type: 'ORDER_ALICE_SIDE',
             id: 'RHy2obsEHhAdTag4fDsC4SfCEqm5ZzTUSH-KMD-BTC',
+            uuid: null,
             maxvolume: 208.21649055
           }
         },
@@ -177,7 +182,7 @@ describe('containers/OrderPage/reducers/loadOrderbookSuccess', () => {
           list: [
             '12fj3npPKwTNxUgDMN8XcCDcR2Z4DBehj6-KMD-BTC',
             '1JsAjr6d21j9T8EMsYnQ6GXf1mM523JAv1-KMD-BTC',
-            'RAwv8JhfvmFx2V3QpY7ehiYpBJ1eqxxdxR-KMD-BTC',
+            'RRVJBpA5MoeTo3beA1iP6euWWrWcJdJtXu-KMD-BTC',
             'RT9MpMyucqXiX8bZLimXBnrrn2ofmdGNKd-KMD-BTC',
             'RHy2obsEHhAdTag4fDsC4SfCEqm5ZzTUSH-KMD-BTC'
           ]
@@ -236,7 +241,7 @@ describe('containers/OrderPage/reducers/setNewOrderSuccess', () => {
     expect(buyReducer(initialState, setNewOrderSuccess(result))).toEqual(
       fromJS({
         selectCoinModal: { open: false },
-        myorder: { fetchStatus: null, errors: null, list: ['address'] },
+        myorder: { fetchStatus: null, errors: null },
         orders: {
           address: {
             meta: { matches: {}, started_swaps: [] },
diff --git a/packages/atomicdex-app/app/containers/OrdersPage/__tests__/selectors.spec.js b/packages/atomicdex-app/app/containers/OrdersPage/__tests__/selectors.spec.js
index fc7fd8fc..6109df53 100644
--- a/packages/atomicdex-app/app/containers/OrdersPage/__tests__/selectors.spec.js
+++ b/packages/atomicdex-app/app/containers/OrdersPage/__tests__/selectors.spec.js
@@ -18,7 +18,6 @@ import {
   makeSelectOrderbookFullList,
   makeSelectOrderbookFetchStatus,
   makeSelectMyOrder,
-  makeSelectMyOrderList,
   makeSelectMyOrderFetchStatus,
   makeSelectMyOrderErrors,
   makeSelectConfirmNewOrderModal,
@@ -113,10 +112,10 @@ describe('containers/OrderPage/selectors/makeSelectOrderbook', () => {
     avevolume: 0,
     minvolume: 0,
     base: 'BEER',
-    address: 'RRVJBpA5MoeTo3beA1iP6euWWrWcJdJtXu',
+    address: '12fj3npPKwTNxUgDMN8XcCDcR2Z4DBehj6',
     rel: 'COQUI',
     type: 'ORDER_ALICE_SIDE',
-    id: 'RRVJBpA5MoeTo3beA1iP6euWWrWcJdJtXu',
+    id: '12fj3npPKwTNxUgDMN8XcCDcR2Z4DBehj6',
     createdAt: 1559705142940,
     uuid: '61e7fa64-43ff-4858-a148-62d16d0da0d8',
     maxvolume: 6729.6392886
@@ -175,9 +174,6 @@ describe('containers/OrderPage/selectors/makeSelectMyOrder', () => {
 
     const selectMyOrderFetchStatus = makeSelectMyOrderFetchStatus();
     expect(selectMyOrderFetchStatus(mockedState)).toEqual(null);
-
-    const selectMyOrderList = makeSelectMyOrderList();
-    expect(selectMyOrderList(mockedState)).toEqual(fromJS([]));
   });
 });
 
diff --git a/packages/atomicdex-app/app/containers/OrdersPage/components/Order.js b/packages/atomicdex-app/app/containers/OrdersPage/components/Order.js
index b08d9cb6..d8ff1c4d 100644
--- a/packages/atomicdex-app/app/containers/OrdersPage/components/Order.js
+++ b/packages/atomicdex-app/app/containers/OrdersPage/components/Order.js
@@ -21,7 +21,8 @@ import ExplorerLink from '../../../components/ExplorerLink';
 import { covertSymbolToName } from '../../../utils/coin';
 import {
   makeSelectBalanceFetchStatus,
-  makeSelectBalanceErrors
+  makeSelectBalanceErrors,
+  makeSelectBalanceEntities
 } from '../../App/selectors';
 import {
   makeSelectOrderbookDeposit,
@@ -138,13 +139,11 @@ const styles = theme => ({
   },
 
   root__orderSelected: {
-    // backgroundColor: '#80BB41',
     border: '1px solid #80BB41'
   }
 });
 
 type IOrderProps = {
-  selected: boolean,
   classes: Styles,
   // eslint-disable-next-line flowtype/no-weak-types
   fetchStatus: List<*>,
@@ -180,10 +179,10 @@ class Order extends React.PureComponent<IOrderProps, IOrderState> {
   };
 
   renderActions = () => {
-    const { classes, data, error, fetchStatus, selected } = this.props;
+    const { classes, data, error, fetchStatus } = this.props;
     const loading = fetchStatus === LOADING;
     const id = data.get('id');
-
+    const selected = !!data.get('uuid');
     return error ? (
       <Button
         disabled={loading}
@@ -239,10 +238,11 @@ class Order extends React.PureComponent<IOrderProps, IOrderState> {
   render() {
     debug(`render`);
 
-    const { classes, error, data, deposit, recevie, selected } = this.props;
+    const { classes, error, data, deposit, recevie } = this.props;
     const isError = !!error;
     const symbol =
       data.get('type') === ORDER_BOB_SIDE ? data.get('base') : data.get('rel');
+    const selected = !!data.get('uuid');
 
     return (
       <Card
diff --git a/packages/atomicdex-app/app/containers/OrdersPage/components/OrderItem.js b/packages/atomicdex-app/app/containers/OrdersPage/components/OrderItem.js
index 209efd78..0c69ee5d 100644
--- a/packages/atomicdex-app/app/containers/OrdersPage/components/OrderItem.js
+++ b/packages/atomicdex-app/app/containers/OrdersPage/components/OrderItem.js
@@ -1,46 +1,11 @@
 // @flow
 import React from 'react';
-import List from '@material-ui/core/List';
-import ListItem from '@material-ui/core/ListItem';
-import ListItemText from '@material-ui/core/ListItemText';
 import { makeStyles } from '@material-ui/core/styles';
 import getCoinMemoize from '../../../components/CryptoIcons';
 
 const debug = require('debug')('atomicapp:containers:OrdersPage:OrderItem');
 
-const useStyles = makeStyles(theme => ({
-  transactionRecord__listItem: {
-    paddingLeft: 0
-  },
-
-  transactionRecord__ItemDay: {
-    flex: 'none'
-  },
-
-  transactionRecord__ItemText: {
-    // flex: '5 1 auto'
-  },
-
-  transactionRecord__ItemTextRight: {
-    textAlign: 'right',
-    top: '50%',
-    right: 4,
-    position: 'absolute',
-    transform: 'translateY(-50%)'
-  },
-
-  transactionRecord__linearProgress: {
-    height: 2
-  },
-
-  transactionRecord__success: {
-    color: theme.colors.success
-  },
-
-  transactionRecord__danger: {
-    color: theme.colors.danger
-  }
-}));
+const useStyles = makeStyles(theme => ({}));
 
 type IOrderItemProps = {};
 
@@ -48,23 +13,7 @@ function OrderItem(props: IOrderItemProps) {
   debug(`render`);
   const classes = useStyles();
 
-  return (
-    <List>
-      <ListItem button className={classes.transactionRecord__listItem}>
-        <ListItemText
-          primary="05"
-          secondary="02"
-          className={classes.transactionRecord__ItemDay}
-        />
-        {getCoinMemoize('KMD')}
-        <ListItemText
-          primary="12fj3npPKwTNxUgDMN8XcCDcR2Z4DBehj6"
-          secondary="Bob Side"
-          className={classes.transactionRecord__ItemText}
-        />
-      </ListItem>
-    </List>
-  );
+  return <div>OrderItem</div>;
 }
 
 OrderItem.defaultProps = {};
diff --git a/packages/atomicdex-app/app/containers/OrdersPage/components/OrderItem2.js b/packages/atomicdex-app/app/containers/OrdersPage/components/OrderItem2.js
new file mode 100644
index 00000000..209efd78
--- /dev/null
+++ b/packages/atomicdex-app/app/containers/OrdersPage/components/OrderItem2.js
@@ -0,0 +1,74 @@
+// @flow
+import React from 'react';
+import List from '@material-ui/core/List';
+import ListItem from '@material-ui/core/ListItem';
+import ListItemText from '@material-ui/core/ListItemText';
+import { makeStyles } from '@material-ui/core/styles';
+import getCoinMemoize from '../../../components/CryptoIcons';
+
+const debug = require('debug')('atomicapp:containers:OrdersPage:OrderItem');
+
+const useStyles = makeStyles(theme => ({
+  transactionRecord__listItem: {
+    paddingLeft: 0
+  },
+
+  transactionRecord__ItemDay: {
+    flex: 'none'
+  },
+
+  transactionRecord__ItemText: {
+    // flex: '5 1 auto'
+  },
+
+  transactionRecord__ItemTextRight: {
+    textAlign: 'right',
+    top: '50%',
+    right: 4,
+    position: 'absolute',
+    transform: 'translateY(-50%)'
+  },
+
+  transactionRecord__linearProgress: {
+    height: 2
+  },
+
+  transactionRecord__success: {
+    color: theme.colors.success
+  },
+
+  transactionRecord__danger: {
+    color: theme.colors.danger
+  }
+}));
+
+type IOrderItemProps = {};
+
+function OrderItem(props: IOrderItemProps) {
+  debug(`render`);
+  const classes = useStyles();
+
+  return (
+    <List>
+      <ListItem button className={classes.transactionRecord__listItem}>
+        <ListItemText
+          primary="05"
+          secondary="02"
+          className={classes.transactionRecord__ItemDay}
+        />
+        {getCoinMemoize('KMD')}
+        <ListItemText
+          primary="12fj3npPKwTNxUgDMN8XcCDcR2Z4DBehj6"
+          secondary="Bob Side"
+          className={classes.transactionRecord__ItemText}
+        />
+      </ListItem>
+    </List>
+  );
+}
+
+OrderItem.defaultProps = {};
+
+OrderItem.displayName = 'OrdersPage__OrderItem';
+
+export default OrderItem;
diff --git a/packages/atomicdex-app/app/containers/OrdersPage/components/Orderbook.js b/packages/atomicdex-app/app/containers/OrdersPage/components/Orderbook.js
index 00b26835..f5bdf5d1 100644
--- a/packages/atomicdex-app/app/containers/OrdersPage/components/Orderbook.js
+++ b/packages/atomicdex-app/app/containers/OrdersPage/components/Orderbook.js
@@ -9,10 +9,7 @@ import CloudOff from '@material-ui/icons/CloudOff';
 import WarningPlate from '../../../components/WarningPlate';
 import Order from './Order';
 // import OrderItem from './OrderItem';
-import {
-  makeSelectOrderbookFullList,
-  makeSelectMyOrderList
-} from '../selectors';
+import { makeSelectOrderbookFullList } from '../selectors';
 
 const debug = require('debug')('atomicapp:containers:OrdersPage:Orderbook');
 
@@ -28,15 +25,13 @@ const useStyles = makeStyles(() => ({
 
 type IOrderbookProps = {
   // eslint-disable-next-line flowtype/no-weak-types
-  orderbook: List<*>,
-  // eslint-disable-next-line flowtype/no-weak-types
-  myOrderList: List<*>
+  orderbook: List<*>
 };
 
 function Orderbook(props: IOrderbookProps) {
   debug(`render`);
   const classes = useStyles();
-  const { orderbook, myOrderList } = props;
+  const { orderbook } = props;
 
   if (!orderbook || orderbook.size === 0) {
     return (
@@ -80,11 +75,7 @@ function Orderbook(props: IOrderbookProps) {
       <br />
       {orderbook.map((order, key) => (
         <>
-          <Order
-            key={`orderbook-${key}`}
-            selected={myOrderList.contains(order.get('id'))}
-            data={order}
-          />
+          <Order key={`orderbook-${key}`} data={order} />
           {/* <OrderItem /> */}
           <br />
         </>
@@ -98,8 +89,7 @@ Orderbook.defaultProps = {};
 Orderbook.displayName = 'OrdersPage__Orderbook';
 
 const mapStateToProps = createStructuredSelector({
-  orderbook: makeSelectOrderbookFullList(),
-  myOrderList: makeSelectMyOrderList()
+  orderbook: makeSelectOrderbookFullList()
 });
 
 const withConnect = connect(
diff --git a/packages/atomicdex-app/app/containers/OrdersPage/reducer.js b/packages/atomicdex-app/app/containers/OrdersPage/reducer.js
index 946baeed..cf9c7c8b 100644
--- a/packages/atomicdex-app/app/containers/OrdersPage/reducer.js
+++ b/packages/atomicdex-app/app/containers/OrdersPage/reducer.js
@@ -70,8 +70,7 @@ export const initialState = fromJS({
   // FIXME: Redesign data struct
   myorder: {
     fetchStatus: null,
-    errors: null,
-    list: []
+    errors: null
   },
 
   orderbook: {
@@ -178,6 +177,7 @@ export default handleActions(
           pubkey,
           type,
           id,
+          uuid = null,
           ...meta
         } = v;
         sortedList.push(id);
@@ -194,7 +194,8 @@ export default handleActions(
               price,
               pubkey,
               type,
-              meta
+              meta,
+              uuid
             })
           );
           orders = orders.set(id, entity);
@@ -211,7 +212,8 @@ export default handleActions(
               price,
               pubkey,
               type,
-              meta
+              meta,
+              uuid
             })
           );
         }
@@ -270,7 +272,7 @@ export default handleActions(
     [NEW_ORDER_SET_SUCCESS]: (state, { payload }) => {
       const {
         id,
-        uuid,
+        uuid = null,
         base,
         rel,
         price,
@@ -305,13 +307,6 @@ export default handleActions(
       );
       state = state.set('orders', orders);
 
-      // step two: update myorder list
-      let myorderlist = state.getIn(['myorder', 'list']);
-      if (!myorderlist.contains(id)) {
-        myorderlist = myorderlist.push(id);
-        state = state.setIn(['myorder', 'list'], myorderlist);
-      }
-
       // step three:
       return state;
     },
@@ -350,13 +345,6 @@ export default handleActions(
       const list = state.getIn(['orderbook', 'list']).filter(v => v !== id);
       state = state.setIn(['orderbook', 'list'], list);
 
-      // Step two: remove it from myorder
-      let myorderlist = state.getIn(['myorder', 'list']);
-      if (myorderlist.contains(id)) {
-        myorderlist = myorderlist.filter(v => v !== id);
-        state = state.setIn(['myorder', 'list'], myorderlist);
-      }
-
       // Step three: remove it from orders
       const orders = state.get('orders');
       state = state.set('orders', orders.delete(id));
diff --git a/packages/atomicdex-app/app/containers/OrdersPage/saga/__tests__/orderbook.spec.js b/packages/atomicdex-app/app/containers/OrdersPage/saga/__tests__/orderbook.spec.js
index 539a4444..aff0cb76 100644
--- a/packages/atomicdex-app/app/containers/OrdersPage/saga/__tests__/orderbook.spec.js
+++ b/packages/atomicdex-app/app/containers/OrdersPage/saga/__tests__/orderbook.spec.js
@@ -7,6 +7,7 @@ import api from 'utils/barterdex-api';
 import { loadOrderbook, reloadOrderbook } from '../../actions';
 import data from '../../../__tests__/app-state.json';
 import orderbook from '../../../__tests__/orderbook.json';
+import myOrders from '../../../__tests__/my_orders.json';
 import listenForLoadingOrderbook, {
   listenForReloadingOrderbook
 } from '../orderbook';
@@ -36,6 +37,9 @@ describe('containers/OrderPage/saga/orderbook', () => {
     v.rel = rel;
     v.id = `${v.address}-${rel}-${base}`;
     v.type = ORDER_ALICE_SIDE;
+    if (v.address === 'RRVJBpA5MoeTo3beA1iP6euWWrWcJdJtXu') {
+      v.uuid = 'eb211104-b6d9-46ea-aba9-c645a5570bb4';
+    }
     return v;
   });
   payload.asks.map(v => {
@@ -58,6 +62,8 @@ describe('containers/OrderPage/saga/orderbook', () => {
 
         if (method === 'orderbook') {
           cb(null, orderbook);
+        } else if (method === 'my_orders') {
+          cb(null, myOrders);
         } else {
           cb(new Error('error message'));
         }
@@ -180,6 +186,8 @@ describe('containers/OrderPage/saga/orderbook', () => {
 
         if (method === 'orderbook') {
           cb(null, orderbook);
+        } else if (method === 'my_orders') {
+          cb(null, myOrders);
         } else {
           cb(new Error('error message'));
         }
@@ -196,10 +204,6 @@ describe('containers/OrderPage/saga/orderbook', () => {
     ).done;
 
     expect(dispatched).toEqual([
-      {
-        type: ORDERBOOK_LOAD_SUCCESS,
-        payload
-      },
       {
         type: ORDERBOOK_LOAD_SUCCESS,
         payload
diff --git a/packages/atomicdex-app/app/containers/OrdersPage/saga/orderbook.js b/packages/atomicdex-app/app/containers/OrdersPage/saga/orderbook.js
index a043fb23..662a44de 100644
--- a/packages/atomicdex-app/app/containers/OrdersPage/saga/orderbook.js
+++ b/packages/atomicdex-app/app/containers/OrdersPage/saga/orderbook.js
@@ -1,5 +1,6 @@
 // @flow
 /* eslint no-param-reassign: ["error", { "props": false }] */
+import each from 'lodash/each';
 import { put, call, select, cancelled } from 'redux-saga/effects';
 import { CANCEL, delay } from 'redux-saga';
 import api from 'utils/barterdex-api';
@@ -21,9 +22,84 @@ const debug = require('debug')(
   'atomicapp:containers:OrdersPage:saga:orderbook'
 );
 
+export function* loadingOrderbook(
+  deposit: string,
+  recevie: string,
+  address: string
+) {
+  debug(`loading orderbook`);
+
+  let request = null;
+
+  try {
+    request = api.orderbook({
+      base: recevie,
+      rel: deposit,
+      queueid: undefined
+    });
+
+    const data = yield request;
+
+    request = api.myOrders();
+    const { result } = yield request;
+    const makerOrders = [];
+    const takerOrders = [];
+
+    // orders that are currently active in market maker mode (SELL)
+    each(result.maker_orders, entity => {
+      if (entity.base === deposit && entity.rel === recevie) {
+        entity.id = `${address}-${deposit}-${recevie}`;
+        makerOrders.push(entity);
+      }
+    });
+
+    // orders that are currently active in market taker mode (BUY)
+    each(result.taker_orders, entity => {
+      if (entity.base === deposit && entity.rel === recevie) {
+        entity.id = `${address}-${deposit}-${recevie}`;
+        takerOrders.push(entity);
+      }
+    });
+
+    data.bids.map(v => {
+      v.base = recevie;
+      v.rel = deposit;
+      v.id = `${v.address}-${deposit}-${recevie}`;
+      v.type = ORDER_ALICE_SIDE;
+      const f = makerOrders.find(e => e.id === v.id);
+      if (f) {
+        v.uuid = f.uuid;
+      }
+      return v;
+    });
+
+    data.asks.map(v => {
+      v.base = recevie;
+      v.rel = deposit;
+      v.id = `${v.address}-${deposit}-${recevie}`;
+      v.type = ORDER_BOB_SIDE;
+      const f = takerOrders.find(e => e.id === v.id);
+      if (f) {
+        v.uuid = f.uuid;
+      }
+      return v;
+    });
+    return data;
+  } catch (err) {
+    debug(`loading orderbook error: ${err.message}`);
+    throw err;
+  } finally {
+    if (yield cancelled()) {
+      debug(`loading orderbook cancelled`);
+      if (request && request[CANCEL]) {
+        request[CANCEL]();
+      }
+    }
+  }
+}
+
 export function* listenForReloadingOrderbook(action, timeout = 60) {
   debug(`listen for reloading orderbook`);
-  let request = null;
   try {
     // if not found stop
     const deposit = yield select(makeSelectOrderbookDeposit());
@@ -42,26 +118,9 @@ export function* listenForReloadingOrderbook(action, timeout = 60) {
         debug('stop, timeout');
         break;
       }
-      request = api.orderbook({
-        base: recevie,
-        rel: deposit,
-        queueid: undefined
-      });
-      const result = yield request;
-      result.bids.map(v => {
-        v.base = recevie;
-        v.rel = deposit;
-        v.id = `${v.address}-${deposit}-${recevie}`;
-        v.type = ORDER_ALICE_SIDE;
-        return v;
-      });
-      result.asks.map(v => {
-        v.base = recevie;
-        v.rel = deposit;
-        v.id = `${v.address}-${deposit}-${recevie}`;
-        v.type = ORDER_BOB_SIDE;
-        return v;
-      });
+
+      const result = yield call(loadingOrderbook, deposit, recevie, address);
+
       yield put(loadOrderbookSuccess(result));
       const f = result.bids.find(e => e.address === address);
       if (f && f.maxvolume > 0) {
@@ -85,9 +144,6 @@ export function* listenForReloadingOrderbook(action, timeout = 60) {
   } finally {
     if (yield cancelled()) {
       debug(`reloading orderbook cancelled`);
-      if (request && request[CANCEL]) {
-        request[CANCEL]();
-      }
     }
   }
 }
@@ -95,35 +151,16 @@ export function* listenForReloadingOrderbook(action, timeout = 60) {
 export default function* listenForLoadingOrderbook(action) {
   debug(`listen for loading orderbook`);
 
-  let request = null;
   try {
     const deposit = yield select(makeSelectOrderbookDeposit());
     const recevie = yield select(makeSelectOrderbookRecevie());
-
     if (!deposit || !recevie) {
       return yield put(skipOrderbook());
     }
+    const balance = yield select(makeSelectBalanceEntities());
+    const address = balance.get(deposit).get('address');
+    const result = yield call(loadingOrderbook, deposit, recevie, address);
 
-    request = api.orderbook({
-      base: recevie,
-      rel: deposit,
-      queueid: undefined
-    });
-    const result = yield request;
-    result.bids.map(v => {
-      v.base = recevie;
-      v.rel = deposit;
-      v.id = `${v.address}-${deposit}-${recevie}`;
-      v.type = ORDER_ALICE_SIDE;
-      return v;
-    });
-    result.asks.map(v => {
-      v.base = recevie;
-      v.rel = deposit;
-      v.id = `${v.address}-${deposit}-${recevie}`;
-      v.type = ORDER_BOB_SIDE;
-      return v;
-    });
     return yield put(loadOrderbookSuccess(result));
   } catch (err) {
     debug(`loading orderbook error: ${err.message}`);
@@ -140,9 +177,6 @@ export default function* listenForLoadingOrderbook(action) {
   } finally {
     if (yield cancelled()) {
       debug(`loading orderbook cancelled`);
-      if (request && request[CANCEL]) {
-        request[CANCEL]();
-      }
     }
   }
 }
diff --git a/packages/atomicdex-app/app/containers/OrdersPage/selectors.js b/packages/atomicdex-app/app/containers/OrdersPage/selectors.js
index 8ef24c80..86c67fca 100644
--- a/packages/atomicdex-app/app/containers/OrdersPage/selectors.js
+++ b/packages/atomicdex-app/app/containers/OrdersPage/selectors.js
@@ -142,12 +142,6 @@ const makeSelectMyOrderErrors = () =>
     myorder => myorder.get('errors')
   );
 
-const makeSelectMyOrderList = () =>
-  createSelector(
-    makeSelectMyOrder(),
-    myorder => myorder.get('list')
-  );
-
 const makeSelectConfirmNewOrderModal = () =>
   createSelector(
     selectOrder,
@@ -216,7 +210,6 @@ export {
   makeSelectMyOrder,
   makeSelectMyOrderFetchStatus,
   makeSelectMyOrderErrors,
-  makeSelectMyOrderList,
   makeSelectConfirmNewOrderModal,
   makeSelectCancelingOrderModal,
   makeSelectCancelingOrderModalOpen,
diff --git a/packages/atomicdex-app/app/containers/SettingsPage/components/MM2Dialog.js b/packages/atomicdex-app/app/containers/SettingsPage/components/MM2Dialog.js
index 69ad99e2..8b5167ed 100644
--- a/packages/atomicdex-app/app/containers/SettingsPage/components/MM2Dialog.js
+++ b/packages/atomicdex-app/app/containers/SettingsPage/components/MM2Dialog.js
@@ -10,7 +10,6 @@ import List from '@material-ui/core/List';
 import ListItem from '@material-ui/core/ListItem';
 import ListItemText from '@material-ui/core/ListItemText';
 import ListItemSecondaryAction from '@material-ui/core/ListItemSecondaryAction';
-import api from 'utils/barterdex-api';
 import { closeMM2Dialog } from '../actions';
 import { useSettingsContext } from '../reducer';
 import { selectMM2State, selectMM2Version } from '../selectors';
@@ -21,9 +20,7 @@ const useStyles = makeStyles(() => ({
   }
 }));
 
-type IMM2DialogProps = {};
-
-function MM2Dialog(props: IMM2DialogProps) {
+function MM2Dialog() {
   const classes = useStyles();
 
   const [state, dispatch] = useSettingsContext();
diff --git a/packages/atomicdex-app/app/containers/SettingsPage/index.js b/packages/atomicdex-app/app/containers/SettingsPage/index.js
index bc17dad6..31547adb 100644
--- a/packages/atomicdex-app/app/containers/SettingsPage/index.js
+++ b/packages/atomicdex-app/app/containers/SettingsPage/index.js
@@ -6,7 +6,6 @@ import ErrorBoundary from '../../components/ErrorBoundary';
 import MDCAppBar from '../../components/AppBar';
 import MDCHeader from '../../components/AppBar/Header';
 import MDCTabBar from '../../components/AppBar/TabBar';
-import { TabContainer } from '../../components/Tabs';
 import { NavigationLayout } from '../Layout';
 import HeaderTabs from './components/HeaderTabs';
 import Content from './components/Content';
@@ -16,9 +15,7 @@ import SettingsContext, { initialState, reducer } from './reducer';
 
 const debug = require('debug')('atomicapp:containers:SettingsPage');
 
-type ISettingsPageProps = {};
-
-function SettingsPage(props: ISettingsPageProps) {
+function SettingsPage() {
   debug('render');
 
   const contextValue = React.useReducer(reducer, initialState);
diff --git a/packages/atomicdex-app/app/containers/WalletPage/AssetModal/AssetModalContent.js b/packages/atomicdex-app/app/containers/WalletPage/AssetModal/AssetModalContent.js
index fc1c4ab7..ed0dddca 100644
--- a/packages/atomicdex-app/app/containers/WalletPage/AssetModal/AssetModalContent.js
+++ b/packages/atomicdex-app/app/containers/WalletPage/AssetModal/AssetModalContent.js
@@ -92,7 +92,7 @@ const ValidationAddressInput = validate(TextInput, [required], {
   onChange: true
 });
 
-const styles = theme => ({
+const styles = () => ({
   root__dialogTitle: {
     padding: '20px 24px'
   },
diff --git a/packages/atomicdex-app/app/containers/__tests__/my_orders.json b/packages/atomicdex-app/app/containers/__tests__/my_orders.json
new file mode 100644
index 00000000..f5bf830e
--- /dev/null
+++ b/packages/atomicdex-app/app/containers/__tests__/my_orders.json
@@ -0,0 +1,20 @@
+{
+  "result": {
+    "maker_orders": {
+      "eb211104-b6d9-46ea-aba9-c645a5570bb4": {
+        "available_amount": "0.15931538",
+        "base": "KMD",
+        "cancellable": true,
+        "created_at": 1566967538275,
+        "matches": {},
+        "max_base_vol": "0.15931538",
+        "min_base_vol": "0",
+        "price": "11765.318803369999",
+        "rel": "BTC",
+        "started_swaps": [],
+        "uuid": "eb211104-b6d9-46ea-aba9-c645a5570bb4"
+      }
+    },
+    "taker_orders": {}
+  }
+}
diff --git a/packages/atomicdex-app/app/containers/__tests__/orderbook.json b/packages/atomicdex-app/app/containers/__tests__/orderbook.json
index 0e09c528..16020cd8 100644
--- a/packages/atomicdex-app/app/containers/__tests__/orderbook.json
+++ b/packages/atomicdex-app/app/containers/__tests__/orderbook.json
@@ -31,7 +31,7 @@
   "bids": [
     {
       "coin": "KMD",
-      "address": "RAwv8JhfvmFx2V3QpY7ehiYpBJ1eqxxdxR",
+      "address": "RRVJBpA5MoeTo3beA1iP6euWWrWcJdJtXu",
       "price": 11636.025133814292,
       "numutxos": 0,
       "avevolume": 0.0,
diff --git a/packages/atomicdex-app/app/utils/barterdex-api/index.js b/packages/atomicdex-app/app/utils/barterdex-api/index.js
index 8374029c..293eaba6 100644
--- a/packages/atomicdex-app/app/utils/barterdex-api/index.js
+++ b/packages/atomicdex-app/app/utils/barterdex-api/index.js
@@ -14,6 +14,7 @@ function setup() {
     entrypoint: config.get('barterdex'),
     home: paths.homeDir
   });
+  window.api = api;
   return api;
 }
 
diff --git a/packages/atomicdex-app/package.json b/packages/atomicdex-app/package.json
index 1e376c05..32db3c79 100644
--- a/packages/atomicdex-app/package.json
+++ b/packages/atomicdex-app/package.json
@@ -297,4 +297,4 @@
     "> 1%",
     "IE 10"
   ]
-}
+}
\ No newline at end of file
diff --git a/packages/atomicdex-app/yarn.lock b/packages/atomicdex-app/yarn.lock
index 0641fb5b..567f7bfd 100644
--- a/packages/atomicdex-app/yarn.lock
+++ b/packages/atomicdex-app/yarn.lock
@@ -13396,4 +13396,4 @@ zip-stream@^1.2.0:
     archiver-utils "^1.3.0"
     compress-commons "^1.2.0"
     lodash "^4.8.0"
-    readable-stream "^2.0.0"
+    readable-stream "^2.0.0"
\ No newline at end of file
diff --git a/packages/barterdex-api/package.json b/packages/barterdex-api/package.json
index a2240349..f9ed228b 100644
--- a/packages/barterdex-api/package.json
+++ b/packages/barterdex-api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "barterdex-api",
-  "version": "0.21.0",
+  "version": "0.25.0",
   "description": "Barterdex API for Node",
   "author": "Hoang Nam <particle4dev@gmail.com> (particle4dev)",
   "homepage": "https://github.com/particle4dev/komodo-ui-mono-repository/tree/master/packages/barterdex-api#readme",
diff --git a/packages/barterdex-api/src/__tests__/get-enabled-coins.spec.ts b/packages/barterdex-api/src/__tests__/get-enabled-coins.spec.ts
new file mode 100644
index 00000000..e1778102
--- /dev/null
+++ b/packages/barterdex-api/src/__tests__/get-enabled-coins.spec.ts
@@ -0,0 +1,15 @@
+import getEnabledCoinsFactory from '../get-enabled-coins';
+
+describe('packages/barterdex-api/src/client/getEnabledCoins', () => {
+  it('should handle the getEnabledCoins correctly', () => {
+    const fakeHttpProvider = {
+      privateCall(params) {
+        expect(params).toEqual({
+          method: 'get_enabled_coins'
+        });
+      }
+    };
+    const api = Object.assign({}, fakeHttpProvider, getEnabledCoinsFactory());
+    api.getEnabledCoins();
+  });
+});
\ No newline at end of file
diff --git a/packages/barterdex-api/src/__tests__/index.spec.ts b/packages/barterdex-api/src/__tests__/index.spec.ts
index 63b0dbc7..b567f9fd 100644
--- a/packages/barterdex-api/src/__tests__/index.spec.ts
+++ b/packages/barterdex-api/src/__tests__/index.spec.ts
@@ -16,6 +16,7 @@ describe('packages/barterdex-api/src/index', () => {
     expect(typeof BarterDexAPI.getendpoint).toEqual('function');
     expect(typeof BarterDexAPI.getfee).toEqual('function');
     expect(typeof BarterDexAPI.getTradeFee).toEqual('function');
+    expect(typeof BarterDexAPI.getEnabledCoins).toEqual('function');
     expect(typeof BarterDexAPI.isready).toEqual('function');
     expect(typeof BarterDexAPI.listTransactions).toEqual('function');
     expect(typeof BarterDexAPI.orderbook).toEqual('function');
@@ -26,7 +27,10 @@ describe('packages/barterdex-api/src/index', () => {
     expect(typeof BarterDexAPI.getUserpass).toEqual('function');
     expect(typeof BarterDexAPI.listunspent).toEqual('function');
     expect(typeof BarterDexAPI.myBalance).toEqual('function');
+    expect(typeof BarterDexAPI.myOrders).toEqual('function');
+    expect(typeof BarterDexAPI.myRecentSwaps).toEqual('function');
     expect(typeof BarterDexAPI.sendrawtransaction).toEqual('function');
+    expect(typeof BarterDexAPI.stop).toEqual('function');
     expect(typeof BarterDexAPI.recentswaps).toEqual('function');
     expect(typeof BarterDexAPI.resetUserpass).toEqual('function');
     expect(typeof BarterDexAPI.version).toEqual('function');
diff --git a/packages/barterdex-api/src/__tests__/my-orders.spec.ts b/packages/barterdex-api/src/__tests__/my-orders.spec.ts
new file mode 100644
index 00000000..c9e9f175
--- /dev/null
+++ b/packages/barterdex-api/src/__tests__/my-orders.spec.ts
@@ -0,0 +1,15 @@
+import myOrdersFactory from '../my-orders';
+
+describe('packages/barterdex-api/src/client/myOrders', () => {
+  it('should handle the myOrders correctly', () => {
+    const fakeHttpProvider = {
+      privateCall(params) {
+        expect(params).toEqual({
+          method: 'my_orders'
+        });
+      }
+    };
+    const api = Object.assign({}, fakeHttpProvider, myOrdersFactory());
+    api.myOrders();
+  });
+});
\ No newline at end of file
diff --git a/packages/barterdex-api/src/__tests__/my-recent-swaps.spec.ts b/packages/barterdex-api/src/__tests__/my-recent-swaps.spec.ts
new file mode 100644
index 00000000..ee6ac603
--- /dev/null
+++ b/packages/barterdex-api/src/__tests__/my-recent-swaps.spec.ts
@@ -0,0 +1,17 @@
+import myRecentSwapsFactory from '../my-recent-swaps';
+
+describe('packages/barterdex-api/src/client/myRecentSwaps', () => {
+  it('should handle the myRecentSwaps correctly', () => {
+    const limit = 10;
+    const from_uuid = 'from_uuid';
+    const fakeHttpProvider = {
+      privateCall(params) {
+        expect(params).toEqual({
+          method: 'my_recent_swaps'
+        });
+      }
+    };
+    const api = Object.assign({}, fakeHttpProvider, myRecentSwapsFactory());
+    api.myRecentSwaps();
+  });
+});
\ No newline at end of file
diff --git a/packages/barterdex-api/src/__tests__/stop.spec.ts b/packages/barterdex-api/src/__tests__/stop.spec.ts
new file mode 100644
index 00000000..72587843
--- /dev/null
+++ b/packages/barterdex-api/src/__tests__/stop.spec.ts
@@ -0,0 +1,15 @@
+import stopFactory from '../stop';
+
+describe('packages/barterdex-api/src/client/stop', () => {
+  it('should handle the stop correctly', () => {
+    const fakeHttpProvider = {
+      privateCall(params) {
+        expect(params).toEqual({
+          method: 'stop'
+        });
+      }
+    };
+    const api = Object.assign({}, fakeHttpProvider, stopFactory());
+    api.stop();
+  });
+});
diff --git a/packages/barterdex-api/src/__tests__/version.spec.ts b/packages/barterdex-api/src/__tests__/version.spec.ts
index 3bd2c06d..dd27be38 100644
--- a/packages/barterdex-api/src/__tests__/version.spec.ts
+++ b/packages/barterdex-api/src/__tests__/version.spec.ts
@@ -2,9 +2,6 @@ import version from '../version';
 
 describe('packages/barterdex-api/src/client/version', () => {
   it('should handle the version correctly', () => {
-    const state = {
-      userpass: null
-    };
     const fakeHttpProvider = {
       privateCall(params) {
         expect(params).toEqual({
diff --git a/packages/barterdex-api/src/get-enabled-coins.ts b/packages/barterdex-api/src/get-enabled-coins.ts
new file mode 100644
index 00000000..190f0855
--- /dev/null
+++ b/packages/barterdex-api/src/get-enabled-coins.ts
@@ -0,0 +1,13 @@
+// @doc
+// https://github.com/KomodoPlatform/atomicDEX-API/blob/mm2/mm2src/rpc.rs#L146
+
+export default function getEnabledCoinsFactory() {
+  return {
+    getEnabledCoins() {
+      const serverparams = {
+        method: 'get_enabled_coins'
+      };
+      return this.privateCall(serverparams);
+    }
+  };
+}
diff --git a/packages/barterdex-api/src/index.ts b/packages/barterdex-api/src/index.ts
index 3e2f8c2a..d6f14940 100644
--- a/packages/barterdex-api/src/index.ts
+++ b/packages/barterdex-api/src/index.ts
@@ -8,13 +8,17 @@ import setpriceFactory from './setprice';
 import getendpointFactory from './get-endpoint';
 import getfeeFactory from './getfee';
 import getTradeFeeFactory from './get-trade-fee';
+import getEnabledCoinsFactory from './get-enabled-coins';
 import isReadyFactory from './is-ready';
 import listTransactionsFactory from './list-transactions';
 import listunspentFactory from './listunspent';
 import myBalanceFactory from './my-balance';
+import myOrdersFactory from './my-orders';
+import myRecentSwapsFactory from './my-recent-swaps';
 import orderbookFactory from './orderbook';
 import recentswapsFactory from './recentswaps';
 import sendRawTransactionFactory from './send-raw-transaction';
+import stopFactory from './stop';
 import swapstatusFactory from './swapstatus';
 import myswapstatusFactory from './my-swapstatus';
 import versionFactory from './version';
@@ -44,13 +48,17 @@ export default function setupClient({
     getendpointFactory(),
     getfeeFactory(),
     getTradeFeeFactory(),
+    getEnabledCoinsFactory(),
     isReadyFactory(),
     listTransactionsFactory(),
     listunspentFactory(),
     myBalanceFactory(),
+    myOrdersFactory(),
+    myRecentSwapsFactory(),
     orderbookFactory(),
     recentswapsFactory(),
     sendRawTransactionFactory(),
+    stopFactory(),
     swapstatusFactory(),
     myswapstatusFactory(),
     versionFactory(),
diff --git a/packages/barterdex-api/src/my-orders.ts b/packages/barterdex-api/src/my-orders.ts
new file mode 100644
index 00000000..20420d19
--- /dev/null
+++ b/packages/barterdex-api/src/my-orders.ts
@@ -0,0 +1,13 @@
+// @doc
+// https://github.com/KomodoPlatform/atomicDEX-API/blob/mm2/mm2src/rpc.rs#L151
+
+export default function myOrdersFactory() {
+  return {
+    myOrders() {
+      const serverparams = {
+        method: 'my_orders'
+      };
+      return this.privateCall(serverparams);
+    }
+  };
+}
diff --git a/packages/barterdex-api/src/my-recent-swaps.ts b/packages/barterdex-api/src/my-recent-swaps.ts
new file mode 100644
index 00000000..c13b6205
--- /dev/null
+++ b/packages/barterdex-api/src/my-recent-swaps.ts
@@ -0,0 +1,17 @@
+// @doc
+
+interface MyRecentSwapsType {
+  limit?: Number,
+  from_uuid?: String
+};
+
+export default function myRecentSwapsFactory() {
+  return {
+    myRecentSwaps(params?: MyRecentSwapsType) {
+      const serverparams = Object.assign({}, params, {
+        method: 'my_recent_swaps'
+      });
+      return this.privateCall(serverparams);
+    }
+  };
+}
diff --git a/packages/barterdex-api/src/schema.ts b/packages/barterdex-api/src/schema.ts
index 5a9246a0..5d180cb7 100644
--- a/packages/barterdex-api/src/schema.ts
+++ b/packages/barterdex-api/src/schema.ts
@@ -21,6 +21,7 @@ export interface BarterdexApi {
   getendpoint: Function,
   getfee: Function,
   getTradeFee: Function,
+  getEnabledCoins: Function,
   isready: Function,
   listTransactions: Function,
   orderbook: Function,
@@ -31,10 +32,13 @@ export interface BarterdexApi {
   getUserpass: Function,
   listunspent: Function,
   myBalance: Function,
+  myOrders: Function,
+  myRecentSwaps: Function,
   sendrawtransaction: Function,
   recentswaps: Function,
   resetUserpass: Function,
   version: Function,
+  stop: Function,
   waitUntilReady: Function,
   withdraw: Function
 };
diff --git a/packages/barterdex-api/src/stop.ts b/packages/barterdex-api/src/stop.ts
new file mode 100644
index 00000000..63f8cd6c
--- /dev/null
+++ b/packages/barterdex-api/src/stop.ts
@@ -0,0 +1,13 @@
+// @doc
+// https://github.com/KomodoPlatform/AtomicDEX-docs/blob/master/docs/basic-docs/atomicdex/atomicdex-api.md#stop
+
+export default function stopFactory() {
+  return {
+    stop() {
+      const serverparams = {
+        method: 'stop'
+      };
+      return this.privateCall(serverparams);
+    }
+  };
+}