diff --git a/src/components/RowOrderLimit/index.tsx b/src/components/RowOrderLimit/index.tsx
new file mode 100644
index 000000000..02a145cd2
--- /dev/null
+++ b/src/components/RowOrderLimit/index.tsx
@@ -0,0 +1,113 @@
+import { Currency } from '@tangoswapcash/sdk'
+import React, { Key, useCallback, useState } from 'react'
+import CurrencyLogo from '../CurrencyLogo'
+import { InformationCircleIcon } from '@heroicons/react/solid'
+import { Popover } from '@headlessui/react'
+import { ClipboardCopyIcon } from '@heroicons/react/solid'
+import useCopyClipboard from '../../hooks/useCopyClipboard'
+import Button from '../Button'
+import { i18n } from '@lingui/core'
+import { t } from '@lingui/macro'
+import useGetOrdersLocal from '../../hooks/useGetOrdersLocal'
+
+function RowOrderLimit({order, deleteOrderLocal}){
+  const [isCopied, setCopied] = useCopyClipboard(1000)
+
+  const cancelOrder = (order) => {
+    deleteOrderLocal(order.id) //esto solo lo borra del localstorage, no cancela la orden realmente
+
+    //TODO cancel Order
+
+  }
+
+  return (
+    <div className="block rounded text-high-emphesis bg-dark-800">
+      <div className="grid items-center grid-flow-col grid-cols-3 gap-4 px-4 py-3 text-sm md:grid-cols-4 align-center text-primary">
+        <div className="flex flex-col">
+          <div className="flex items-center gap-4 font-bold">
+            <div className="min-w-[32px] flex items-center">
+              <CurrencyLogo size={32} currency={order.output.currency} />
+            </div>
+            <div className="flex flex-col text-left ">
+              <div>{order.output.value}</div>
+              <div className="flex text-xs text-left text-secondary">
+                {order.output.currency.symbol}
+                <Popover className="relative hidden md:block">
+                  <Popover.Button>
+                    <InformationCircleIcon width={15} height={15} className='ml-2'/>
+                  </Popover.Button>
+                  <Popover.Panel className="absolute z-50">
+                  {({ close }) => {
+                    isCopied && close()
+                    return (
+                      <div 
+                        className="text-primary flex px-2 py-1 font-medium bg-dark-700 border border-gray-600 rounded text-sm cursor-pointer"
+                        onClick={() => setCopied(order.output.currency.address)}
+                      >
+                        {order.output.currency.address} <ClipboardCopyIcon  width={16} height={16} className='ml-2'/>
+                      </div>
+                    )}
+                  }
+                  </Popover.Panel>
+                </Popover>
+              </div>
+            </div>
+          </div>
+          
+        </div>
+        <div className="flex items-center gap-4 font-bold text-left">
+          <div className="min-w-[32px] flex items-center">
+            <CurrencyLogo size={32} currency={order.input.currency} />
+          </div>
+          <div className="flex flex-col">
+            <div>{order.input.value}</div>
+            <div className="flex text-xs text-left text-secondary">
+              {order.input.currency.symbol}
+              <Popover className="relative hidden md:block">
+                <Popover.Button>
+                  <InformationCircleIcon width={15} height={15} className='ml-2'/>
+                </Popover.Button>
+                <Popover.Panel className="absolute z-50">
+                {({ close }) => {
+                  isCopied && close()
+                  return (
+                    <div 
+                      className="text-primary flex px-2 py-1 font-medium bg-dark-700 border border-gray-600 rounded text-sm cursor-pointer"
+                      onClick={() => setCopied(order.input.currency.address)}
+                    >
+                      {order.input.currency.address} <ClipboardCopyIcon  width={16} height={16} className='ml-2'/>
+                    </div>
+                  )}
+                }
+                </Popover.Panel>
+              </Popover>
+            </div>
+          </div>
+        </div>
+        <div className="hidden font-bold text-left md:block">
+          <div>{order.rate}</div>
+          <div className="text-xs text-secondary">
+          {order.output.currency.symbol ? order.output.currency.symbol : order.output.currency.tokenInfo.symbol} per {order.input.currency.symbol}
+          </div>
+        </div>
+        <div className="font-bold text-right">
+          {/* <div className="mb-1">
+            {order.filledPercent}% {i18n._(t`Filled`)}
+          </div> */}
+          <div>
+            <Button
+              color="pink"
+              variant="outlined"
+              size="xs"
+              onClick={() => cancelOrder(order)}
+            >
+              {i18n._(t`Cancel Order`)}
+            </Button>
+          </div>
+        </div>
+      </div>
+    </div>
+  )
+}
+
+export default RowOrderLimit
\ No newline at end of file
diff --git a/src/features/exchange-v1/limit-order/LimitOrderButton.tsx b/src/features/exchange-v1/limit-order/LimitOrderButton.tsx
index 224a96047..ef020ced6 100644
--- a/src/features/exchange-v1/limit-order/LimitOrderButton.tsx
+++ b/src/features/exchange-v1/limit-order/LimitOrderButton.tsx
@@ -36,6 +36,7 @@ import { faTelegram } from '@fortawesome/free-brands-svg-icons';
 import axios from 'axios'
 import { faCheck } from '@fortawesome/free-solid-svg-icons'
 import CashAddressInput from '../../../components/Input/Cashaddress'
+import useGetOrdersLocal from '../../../hooks/useGetOrdersLocal'
 
 interface LimitOrderButtonProps extends ButtonProps {
   currency: Currency
@@ -90,7 +91,6 @@ const LimitOrderButton: FC<LimitOrderButtonProps> = ({ currency, color, ...rest
   const dispatch = useDispatch<AppDispatch>()
   const addPopup = useAddPopup()
   const toggleWalletModal = useWalletModalToggle()
-
   const [openConfirmationModal, setOpenConfirmationModal] = useState(false)
   const [takeOrderURL, setTakeOrderURL] = useState<string>(null)
 
@@ -98,8 +98,10 @@ const LimitOrderButton: FC<LimitOrderButtonProps> = ({ currency, color, ...rest
   const [clicked, wasClicked] = useState(false)
   const [endTimeState, setEndTimeState] = useState<string>(null)
 
+  const orders = useGetOrdersLocal()
+
   const { orderExpiration, recipient } = useLimitOrderState()
-  const { parsedAmounts, inputError } = useDerivedLimitOrderInfo()
+  const { parsedAmounts, inputError, currencies } = useDerivedLimitOrderInfo()
 
   const { mutate } = useLimitOrders()
 
@@ -115,6 +117,10 @@ const LimitOrderButton: FC<LimitOrderButtonProps> = ({ currency, color, ...rest
     (tokenApprovalState === ApprovalState.NOT_APPROVED || tokenApprovalState === ApprovalState.PENDING)
 
   const disabled = !!inputError || tokenApprovalState === ApprovalState.PENDING
+  
+  const postOrderLocal = (newOrder) => {
+    localStorage.setItem('orders', JSON.stringify([...orders, newOrder]))
+  }
 
   const handler = useCallback(async () => {
     const signer = library.getSigner()
@@ -188,6 +194,18 @@ const LimitOrderButton: FC<LimitOrderButtonProps> = ({ currency, color, ...rest
     }
 
     try {
+      let outputValue = parsedAmounts[Field.OUTPUT]?.toSignificant(6)
+      let inputValue = parsedAmounts[Field.INPUT]?.toSignificant(6)
+      let openOrderToLocalStorage = {
+        id: Date.now(),
+        status: 'open',
+        account,
+        input: {value: inputValue, currency: {...currencies[Field.INPUT], address: currencies[Field.INPUT]?.wrapped.address}},
+        output: {value: outputValue, currency: currencies[Field.OUTPUT]?.tokenInfo ? currencies[Field.OUTPUT]?.tokenInfo : currencies[Field.OUTPUT]},
+        orderExpiration: orderExpiration.label,
+        rate: Number((parseFloat(outputValue) / parseFloat(inputValue))?.toFixed(2))
+      }
+
       const sig = await signer._signTypedData(Domain, Types, msg)
       // o=ver8,coinsToMaker256,coinsToTaker256,dueTime80,r256,s256,v8
       const order = '01'
@@ -197,19 +215,19 @@ const LimitOrderButton: FC<LimitOrderButtonProps> = ({ currency, color, ...rest
         + sig.substr(2)
 
       const url = 'https://orders.cash/take?o=' + base64EncArr(hexToArr(order))
-      console.log('url: ', url)
-      setTakeOrderURL(url)
 
+      setTakeOrderURL(url)
       setOpenConfirmationModal(false)
-
+      
       if (true) {
+        console.log('openOrderToLocalStorage: ',openOrderToLocalStorage)
+        postOrderLocal(openOrderToLocalStorage)
         addPopup({
           txn: { hash: null, summary: 'Limit order created', success: true },
         })
         await mutate()
       }
     } catch (e) {
-      console.log('error: ', e)
       addPopup({
         txn: {
           hash: null,
@@ -337,7 +355,6 @@ const LimitOrderButton: FC<LimitOrderButtonProps> = ({ currency, color, ...rest
           </Button>
         </div>
       }
-
       {button}
 
       <style jsx>{`
diff --git a/src/features/exchange-v1/open-order/CompletedOrders.tsx b/src/features/exchange-v1/open-order/CompletedOrders.tsx
index 94335d40c..48d155f79 100644
--- a/src/features/exchange-v1/open-order/CompletedOrders.tsx
+++ b/src/features/exchange-v1/open-order/CompletedOrders.tsx
@@ -1,110 +1,165 @@
-import React, { FC } from 'react'
+import React, { FC, useState } from 'react'
 
-// import Badge from '../../../components/Badge'
-// import CurrencyLogo from '../../../components/CurrencyLogo'
-// import Lottie from 'lottie-react'
-// import { OrderStatus } from '@tangoswapcash/sdk'
-// import Pagination from './Pagination'
-// import loadingCircle from '../../../animation/loading-circle.json'
-// import { t } from '@lingui/macro'
-// import useLimitOrders from '../../../hooks/useLimitOrders'
-// import { useLingui } from '@lingui/react'
+import Badge from '../../../components/Badge'
+import CurrencyLogo from '../../../components/CurrencyLogo'
+import Lottie from 'lottie-react'
+import { OrderStatus } from '@tangoswapcash/sdk'
+import Pagination from './Pagination'
+import loadingCircle from '../../../animation/loading-circle.json'
+import { t } from '@lingui/macro'
+import useLimitOrders from '../../../hooks/useLimitOrders'
+import { useLingui } from '@lingui/react'
+import { i18n } from '@lingui/core'
+import useGetOrdersLocal from '../../../hooks/useGetOrdersLocal'
+import { Popover } from '@headlessui/react'
+import { ClipboardCopyIcon, InformationCircleIcon } from '@heroicons/react/solid'
+import useCopyClipboard from '../../../hooks/useCopyClipboard'
 
-// const CompletedOrders: FC = () => {
-//   const { i18n } = useLingui()
-//   const { completed } = useLimitOrders()
+const CompletedOrders = ({orders, setOrders}) => {
+  const { i18n } = useLingui()
+  const totalCompleted = orders.reduce((a,b) => b.status !== 'open' && a + 1, 0)
 
-//   return (
-//     <>
-//       <div className="flex items-center gap-2 pb-4 text-xl border-b text-high-emphesis border-dark-800">
-//         {i18n._(t`Order History`)}{' '}
-//         <span className="inline-flex">
-//           <Badge color="pink" size="medium">
-//             {completed.totalOrders}
-//           </Badge>
-//         </span>
-//       </div>
-//       <div className="text-center text-secondary">
-//         {completed.loading ? (
-//           <div className="w-8 m-auto">
-//             <Lottie animationData={loadingCircle} autoplay loop />
-//           </div>
-//         ) : completed.data.length > 0 ? (
-//           <>
-//             <div className="grid grid-flow-col grid-cols-3 gap-4 px-4 pb-4 text-sm font-bold md:grid-cols-4 text-secondary">
-//               <div className="flex items-center cursor-pointer hover:text-primary">{i18n._(t`Receive`)}</div>
-//               <div className="flex items-center cursor-pointer hover:text-primary">{i18n._(t`Pay`)}</div>
-//               <div className="flex items-center hidden text-left cursor-pointer hover:text-primary md:block">
-//                 {i18n._(t`Rate`)}
-//               </div>
-//               <div className="flex items-center justify-end cursor-pointer hover:text-primary">{i18n._(t`Filled`)}</div>
-//             </div>
-//             <div className="flex flex-col gap-2 md:gap-5">
-//               {completed.data.map((order, index) => (
-//                 <div
-//                   key={index}
-//                   className="block overflow-hidden rounded text-high-emphesis bg-dark-800"
-//                   style={{
-//                     background:
-//                       order.status === OrderStatus.FILLED
-//                         ? 'linear-gradient(90deg, rgba(0, 255, 79, 0.075) 0%, rgba(0, 255, 79, 0) 50%), #202231'
-//                         : order.status === OrderStatus.CANCELLED
-//                         ? 'linear-gradient(90deg, rgba(200, 200, 200, 0.075) 0%, rgba(200, 200, 200, 0) 50%), #202231'
-//                         : 'linear-gradient(90deg, rgba(255, 56, 56, 0.15) 0%, rgba(255, 56, 56, 0) 50%), #202231',
-//                   }}
-//                 >
-//                   <div className="grid items-center grid-flow-col grid-cols-3 gap-4 px-4 py-3 text-sm md:grid-cols-4 align-center text-primary">
-//                     <div className="flex flex-col">
-//                       <div className="flex items-center gap-4 font-bold">
-//                         <div className="min-w-[32px] flex items-center">
-//                           <CurrencyLogo size={32} currency={order.tokenOut} />
-//                         </div>
-//                         <div className="flex flex-col">
-//                           <div>{order.limitOrder.amountOut.toSignificant(6)} </div>
-//                           <div className="text-xs text-left text-secondary">{order.tokenOut.symbol}</div>
-//                         </div>
-//                       </div>
-//                     </div>
-//                     <div className="font-bold text-left">
-//                       <div className="flex flex-col">
-//                         <div>{order.limitOrder.amountIn.toSignificant(6)} </div>
-//                         <div className="text-xs text-left text-secondary">{order.tokenIn.symbol}</div>
-//                       </div>
-//                     </div>
-//                     <div className="hidden font-bold text-left md:block">
-//                       <div>{order.rate}</div>
-//                       <div className="text-xs text-secondary">
-//                         {order.tokenOut.symbol} per {order.tokenIn.symbol}
-//                       </div>
-//                     </div>
-//                     <div className="text-right">
-//                       <div className="mb-1">
-//                         {order.status === OrderStatus.FILLED ? (
-//                           <span className="text-green">{i18n._(t`Filled`)}</span>
-//                         ) : order.status === OrderStatus.CANCELLED ? (
-//                           <span className="text-secondary">{i18n._(t`Cancelled`)}</span>
-//                         ) : (
-//                           <span className="text-red">{i18n._(t`Expired`)}</span>
-//                         )}
-//                       </div>
-//                     </div>
-//                   </div>
-//                 </div>
-//               ))}
-//             </div>
-//             <Pagination
-//               onChange={completed.setPage}
-//               totalPages={completed.maxPages}
-//               currentPage={completed.page}
-//               pageNeighbours={2}
-//             />
-//           </>
-//         ) : (
-//           <span>{i18n._(t`No order history`)}</span>
-//         )}
-//       </div>
-//     </>
-//   )
-// }
+  return (
+    <>
+      <div className="flex items-center gap-2 pb-4 text-xl border-b text-high-emphesis border-dark-800">
+        {i18n._(t`Order History`)}{' '}
+        <span className="inline-flex">
+          <Badge color="pink" size="medium">
+            {totalCompleted}
+          </Badge>
+        </span>
+      </div>
+      <div className="text-center text-secondary">
+        {/* {completed.loading ? (
+          <div className="w-8 m-auto">
+            <Lottie animationData={loadingCircle} autoplay loop />
+          </div>
+        ) :  */}
+        {totalCompleted > 0 ? (
+          <>
+            <div className="grid grid-flow-col grid-cols-3 gap-4 px-4 pb-4 text-sm font-bold md:grid-cols-4 text-secondary">
+              <div className="flex items-center cursor-pointer hover:text-primary">{i18n._(t`Receive`)}</div>
+              <div className="flex items-center cursor-pointer hover:text-primary">{i18n._(t`Pay`)}</div>
+              <div className="flex items-center hidden text-left cursor-pointer hover:text-primary md:block">
+                {i18n._(t`Rate`)}
+              </div>
+              <div className="flex items-center justify-end cursor-pointer hover:text-primary">{i18n._(t`Filled`)}</div>
+            </div>
+            <div className="flex flex-col gap-2 md:gap-5">
+              {orders.map((order, index) => (
+                order && order?.status !== 'open' && <RowOrderHistory key={index} order={order}/>
+              ))}
+            </div>
+            {/* <Pagination
+              onChange={completed.setPage}
+              totalPages={completed.maxPages}
+              currentPage={completed.page}
+              pageNeighbours={2}
+            /> */}
+          </>
+        ) : (
+          <span>{i18n._(t`No order history`)}</span>
+        )}
+      </div>
+    </>
+  )
+}
 
-// export default CompletedOrders
+const RowOrderHistory = ({order}) => {
+  const [isCopied, setCopied] = useCopyClipboard(1000)
+  return(
+    <div
+      className="block overflow-hidden rounded text-high-emphesis bg-dark-800"
+      style={{
+        background:
+          order.status == 'filled'
+            ? 'linear-gradient(90deg, rgba(0, 255, 79, 0.075) 0%, rgba(0, 255, 79, 0) 50%), #202231'
+            : order.status == 'cancelled'
+            ? 'linear-gradient(90deg, rgba(200, 200, 200, 0.075) 0%, rgba(200, 200, 200, 0) 50%), #202231'
+            : 'linear-gradient(90deg, rgba(255, 56, 56, 0.15) 0%, rgba(255, 56, 56, 0) 50%), #202231',
+      }}
+    >
+      <div className="grid items-center grid-flow-col grid-cols-3 gap-4 px-4 py-3 text-sm md:grid-cols-4 align-center text-primary">
+        <div className="flex flex-col">
+          <div className="flex items-center gap-4 font-bold">
+            <div className="min-w-[32px] flex items-center">
+              <CurrencyLogo size={32} currency={order.output.currency} />
+            </div>
+            <div className="flex flex-col">
+              <div>{order.output.value} </div>
+              <div className="flex text-xs text-left text-secondary">
+                {order.output.currency.symbol}
+                <Popover className="relative hidden md:block">
+                  <Popover.Button>
+                    <InformationCircleIcon width={15} height={15} className='ml-2'/>
+                  </Popover.Button>
+                  <Popover.Panel className="absolute z-50">
+                  {({ close }) => {
+                    isCopied && close()
+                    return (
+                      <div 
+                        className="text-primary flex px-2 py-1 font-medium bg-dark-700 border border-gray-600 rounded text-sm cursor-pointer"
+                        onClick={() => setCopied(order.input.currency.address)}
+                      >
+                        {order.input.currency.address} <ClipboardCopyIcon  width={16} height={16} className='ml-2'/>
+                      </div>
+                    )}
+                  }
+                  </Popover.Panel>
+                </Popover>
+              </div>
+            </div>
+          </div>
+        </div>
+        <div className="flex gap-4 font-bold text-left">
+          <div className="min-w-[32px] flex items-center">
+            <CurrencyLogo size={32} currency={order.input.currency} />
+          </div>
+          <div className="flex flex-col">
+            <div>{order.input.value} </div>
+            <div className="flex text-xs text-left text-secondary">
+              {order.input.currency.symbol}
+              <Popover className="relative hidden md:block">
+                <Popover.Button>
+                  <InformationCircleIcon width={15} height={15} className='ml-2'/>
+                </Popover.Button>
+                <Popover.Panel className="absolute z-50">
+                {({ close }) => {
+                  isCopied && close()
+                  return (
+                    <div 
+                      className="text-primary flex px-2 py-1 font-medium bg-dark-700 border border-gray-600 rounded text-sm cursor-pointer"
+                      onClick={() => setCopied(order.input.currency.address)}
+                    >
+                      {order.input.currency.address} <ClipboardCopyIcon  width={16} height={16} className='ml-2'/>
+                    </div>
+                  )}
+                }
+                </Popover.Panel>
+              </Popover>
+            </div>
+          </div>
+        </div>
+        <div className="hidden font-bold text-left md:block">
+          <div>{order.rate}</div>
+          <div className="text-xs text-secondary">
+            {order.output.currency.symbol} per {order.input.currency.symbol}
+          </div>
+        </div>
+        <div className="text-right">
+          <div className="mb-1">
+            {order.status == 'filled' ? (
+              <span className="text-green">{i18n._(t`Filled`)}</span>
+            ) :  order.status == 'cancelled' ? (
+              <span className="text-secondary">{i18n._(t`Cancelled`)}</span>
+            ) : (
+              <span className="text-red">{i18n._(t`Expired`)}</span>
+            )}
+          </div>
+        </div>
+      </div>
+    </div>
+  )
+}
+
+export default CompletedOrders
diff --git a/src/features/exchange-v1/open-order/OpenOrders.tsx b/src/features/exchange-v1/open-order/OpenOrders.tsx
index b88ff92b2..01228265e 100644
--- a/src/features/exchange-v1/open-order/OpenOrders.tsx
+++ b/src/features/exchange-v1/open-order/OpenOrders.tsx
@@ -1,136 +1,110 @@
-import React, { FC, useState } from 'react'
+import React, { FC, useEffect, useState } from 'react'
 
-// import Badge from '../../../components/Badge'
-// import Button from '../../../components/Button'
-// import CurrencyLogo from '../../../components/CurrencyLogo'
-// import { LimitOrder } from '@tangoswapcash/sdk'
-// import Lottie from 'lottie-react'
-// import NavLink from '../../../components/NavLink'
-// import Pagination from './Pagination'
-// import TransactionConfirmationModal from '../../../modals/TransactionConfirmationModal'
-// import loadingCircle from '../../../animation/loading-circle.json'
-// import { t } from '@lingui/macro'
-// import { useLimitOrderContract } from '../../../hooks'
-// import useLimitOrders from '../../../hooks/useLimitOrders'
-// import { useLingui } from '@lingui/react'
-// import { useTransactionAdder } from '../../../state/transactions/hooks'
+import Badge from '../../../components/Badge'
+import Button from '../../../components/Button'
+import CurrencyLogo from '../../../components/CurrencyLogo'
+import { LimitOrder } from '@tangoswapcash/sdk'
+import Lottie from 'lottie-react'
+import NavLink from '../../../components/NavLink'
+import Pagination from './Pagination'
+import TransactionConfirmationModal from '../../../modals/TransactionConfirmationModal'
+import loadingCircle from '../../../animation/loading-circle.json'
+import { t } from '@lingui/macro'
+import { useActiveWeb3React, useLimitOrderContract } from '../../../hooks'
+import useLimitOrders from '../../../hooks/useLimitOrders'
+import { useLingui } from '@lingui/react'
+import { useTransactionAdder } from '../../../state/transactions/hooks'
+import useGetOrdersLocal from '../../../hooks/useGetOrdersLocal'
+import RowOrderLimit from '../../../components/RowOrderLimit'
 
-// const OpenOrders: FC = () => {
-//   const { i18n } = useLingui()
-//   const { pending, mutate } = useLimitOrders()
-//   const limitOrderContract = useLimitOrderContract(true)
-//   const addTransaction = useTransactionAdder()
-//   const [hash, setHash] = useState('')
+const OpenOrders = ({orders, setOrders}) => {
+  const { i18n } = useLingui()
+  const [hash, setHash] = useState('')
+  const totalCompleted = orders.reduce((a,b) => b.status == 'open' ? a + 1 : a, 0)
 
-//   const cancelOrder = async (limitOrder: LimitOrder, summary: string) => {
-//     const tx = await limitOrderContract.cancelOrder(limitOrder.getTypeHash())
-//     addTransaction(tx, {
-//       summary,
-//     })
+  const deleteOrderLocal = (id) => {
+    const ordersFilter = orders.map(or => or.id == id ? {...or, status: 'cancelled'} : or)
+    setOrders(ordersFilter)
+    localStorage.setItem('orders', JSON.stringify(ordersFilter))
+  }
 
-//     setHash(tx.hash)
+  useEffect(() => {
+  }, [orders])
 
-//     await tx.wait()
-//     await mutate((data) => ({ ...data }))
-//   }
+  // const cancelOrder = async (limitOrder: LimitOrder, summary: string) => {
+  //   const tx = await limitOrderContract.cancelOrder(limitOrder.getTypeHash())
+  //   addTransaction(tx, {
+  //     summary,
+  //   })
 
-//   return (
-//     <>
-//       <TransactionConfirmationModal
-//         isOpen={!!hash}
-//         onDismiss={() => setHash('')}
-//         hash={hash}
-//         content={() => <div />}
-//         attemptingTxn={false}
-//         pendingText={''}
-//       />
-//       <div className="flex items-center gap-2 pb-4 text-xl border-b text-high-emphesis border-dark-800">
-//         {i18n._(t`Open Orders`)}{' '}
-//         <span className="inline-flex">
-//           <Badge color="blue" size="medium">
-//             {pending.totalOrders}
-//           </Badge>
-//         </span>
-//       </div>
-//       <div className="text-center text-secondary">
-//         {pending.loading ? (
-//           <div className="w-8 m-auto">
-//             <Lottie animationData={loadingCircle} autoplay loop />
-//           </div>
-//         ) : pending.data.length > 0 ? (
-//           <>
-//             <div className="grid grid-flow-col grid-cols-3 gap-4 px-4 pb-4 text-sm font-bold md:grid-cols-4 text-secondary">
-//               <div className="flex items-center cursor-pointer hover:text-primary">{i18n._(t`Receive`)}</div>
-//               <div className="flex items-center cursor-pointer hover:text-primary">{i18n._(t`Pay`)}</div>
-//               <div className="flex items-center hidden text-left cursor-pointer hover:text-primary md:block">
-//                 {i18n._(t`Rate`)}
-//               </div>
-//               <div className="flex items-center justify-end cursor-pointer hover:text-primary" />
-//             </div>
-//             <div className="flex flex-col gap-2 md:gap-5">
-//               {pending.data.map((order, index) => (
-//                 <div key={index} className="block overflow-hidden rounded text-high-emphesis bg-dark-800">
-//                   <div className="grid items-center grid-flow-col grid-cols-3 gap-4 px-4 py-3 text-sm md:grid-cols-4 align-center text-primary">
-//                     <div className="flex flex-col">
-//                       <div className="flex items-center gap-4 font-bold">
-//                         <div className="min-w-[32px] flex items-center">
-//                           <CurrencyLogo size={32} currency={order.tokenOut} />
-//                         </div>
-//                         <div className="flex flex-col">
-//                           <div>{order.limitOrder.amountOut.toSignificant(6)} </div>
-//                           <div className="text-xs text-left text-secondary">{order.tokenOut.symbol}</div>
-//                         </div>
-//                       </div>
-//                     </div>
-//                     <div className="font-bold text-left">
-//                       <div className="flex flex-col">
-//                         <div>{order.limitOrder.amountIn.toSignificant(6)} </div>
-//                         <div className="text-xs text-left text-secondary">{order.tokenIn.symbol}</div>
-//                       </div>
-//                     </div>
-//                     <div className="hidden font-bold text-left md:block">
-//                       <div>{order.rate}</div>
-//                       <div className="text-xs text-secondary">
-//                         {order.tokenOut.symbol} per {order.tokenIn.symbol}
-//                       </div>
-//                     </div>
-//                     <div className="font-bold text-right">
-//                       <div className="mb-1">
-//                         {order.filledPercent}% {i18n._(t`Filled`)}
-//                       </div>
-//                       <div>
-//                         <Button
-//                           color="pink"
-//                           variant="outlined"
-//                           size="xs"
-//                           onClick={() => cancelOrder(order.limitOrder, `Cancel order`)}
-//                         >
-//                           {i18n._(t`Cancel Order`)}
-//                         </Button>
-//                       </div>
-//                     </div>
-//                   </div>
-//                 </div>
-//               ))}
-//             </div>
-//             <Pagination
-//               onChange={pending.setPage}
-//               totalPages={pending.maxPages}
-//               currentPage={pending.page}
-//               pageNeighbours={2}
-//             />
-//           </>
-//         ) : (
-//           <span>
-//             No open limit orders. Why not{' '}
-//             <NavLink href="/limit-order">
-//               <a className="text-sm underline cursor-pointer text-blue">place one?</a>
-//             </NavLink>
-//           </span>
-//         )}
-//       </div>
-//     </>
-//   )
-// }
+  //   setHash(tx.hash)
 
-// export default OpenOrders
+  //   await tx.wait()
+  //   await mutate((data) => ({ ...data }))
+  // }
+
+  const cancelOrder = (order) => {
+    console.log('TODO cancel order', order) //TODO cancel Order
+  }
+
+  return (
+    <>
+      <TransactionConfirmationModal
+        isOpen={!!hash}
+        onDismiss={() => setHash('')}
+        hash={hash}
+        content={() => <div />}
+        attemptingTxn={false}
+        pendingText={''}
+      />
+      <div className="flex items-center gap-2 pb-4 text-xl border-b text-high-emphesis border-dark-800">
+        {i18n._(t`Open Orders`)}{' '}
+        <span className="inline-flex">
+          <Badge color="blue" size="medium">
+            {totalCompleted}
+          </Badge>
+        </span>
+      </div>
+      <div className="text-center text-secondary">
+        {/* {orders.loading ? (
+          <div className="w-8 m-auto">
+            <Lottie animationData={loadingCircle} autoplay loop />
+          </div>
+        ) :  */}
+        {totalCompleted > 0 ? (
+          <>
+            <div className="grid grid-flow-col grid-cols-3 gap-4 px-4 pb-4 text-sm font-bold md:grid-cols-4 text-secondary">
+              <div className="flex items-center cursor-pointer hover:text-primary">{i18n._(t`Receive`)}</div>
+              <div className="flex items-center cursor-pointer hover:text-primary">{i18n._(t`Pay`)}</div>
+              <div className="flex items-center hidden text-left cursor-pointer hover:text-primary md:block">
+                {i18n._(t`Rate`)}
+              </div>
+              <div className="flex items-center justify-end cursor-pointer hover:text-primary" />
+            </div>
+            <div className="flex flex-col gap-2 md:gap-5">
+              {orders?.map((order, index) => (
+                order && order?.status == 'open' &&
+                  <RowOrderLimit key={index} order={order} deleteOrderLocal={deleteOrderLocal}/>
+              ))}
+            </div>
+            {/* <Pagination
+              onChange={pending.setPage}
+              totalPages={pending.maxPages}
+              currentPage={pending.page}
+              pageNeighbours={2}
+            /> */}
+          </>
+        ) : (
+          <span>
+            No open limit orders. Why not{' '}
+            <NavLink href="/limit-order">
+              <a className="text-sm underline cursor-pointer text-blue">place one?</a>
+            </NavLink>
+          </span>
+        )}
+      </div>
+    </>
+  )
+}
+
+export default OpenOrders
diff --git a/src/hooks/useGetOrdersLocal.ts b/src/hooks/useGetOrdersLocal.ts
new file mode 100644
index 000000000..4fd5c849a
--- /dev/null
+++ b/src/hooks/useGetOrdersLocal.ts
@@ -0,0 +1,14 @@
+import { useEffect, useRef, useState } from 'react'
+
+export default function useGetOrdersLocal() {
+  const orders = useRef([]);
+  
+  let storageOrders = localStorage.getItem('orders');
+  if(storageOrders){
+    orders.current = [...JSON.parse(storageOrders)]
+  }else{
+    orders.current = []
+  }
+  
+  return orders.current;
+}
\ No newline at end of file
diff --git a/src/pages/exchange/open-order/index.tsx b/src/pages/exchange/open-order/index.tsx
index c4b5fc23f..773d9f65a 100644
--- a/src/pages/exchange/open-order/index.tsx
+++ b/src/pages/exchange/open-order/index.tsx
@@ -3,22 +3,23 @@
 import Alert from '../../../components/Alert'
 import { ArrowLeftIcon } from '@heroicons/react/solid'
 import { ChainId } from '@tangoswapcash/sdk'
-// import CompletedOrders from '../../../features/exchange-v1/open-order/CompletedOrders'
+import CompletedOrders from '../../../features/exchange-v1/open-order/CompletedOrders'
 import Container from '../../../components/Container'
 import DoubleGlowShadow from '../../../components/DoubleGlowShadow'
 import Head from 'next/head'
 import NavLink from '../../../components/NavLink'
 import NetworkGuard from '../../../guards/Network'
-// import OpenOrders from '../../../features/exchange-v1/open-order/OpenOrders'
-import React from 'react'
+import OpenOrders from '../../../features/exchange-v1/open-order/OpenOrders'
+import React, { useState } from 'react'
 import { t } from '@lingui/macro'
-// import useLimitOrders from '../../../hooks/useLimitOrders'
+import useLimitOrders from '../../../hooks/useLimitOrders'
 import { useLingui } from '@lingui/react'
+import { useLimitOrderApproveCallback } from '../../../hooks/useLimitOrderApproveCallback'
+import useGetOrdersLocal from '../../../hooks/useGetOrdersLocal'
 
 function OpenOrdersPage() {
-  /*
+  const [orders, setOrders] = useState(useGetOrdersLocal())
   const { i18n } = useLingui()
-  const [approvalState] = useLimitOrderApproveCallback()
   const { pending } = useLimitOrders()
 
   return (
@@ -36,7 +37,7 @@ function OpenOrdersPage() {
             </a>
           </NavLink>
         </div>
-        {pending.totalOrders > 0 && approvalState === BentoApprovalState.NOT_APPROVED && (
+        {pending.totalOrders > 0  && ( //&& approvalState === BentoApprovalState.NOT_APPROVED
           <div className="flex pb-6">
             <Alert
               type="error"
@@ -49,14 +50,14 @@ function OpenOrdersPage() {
         )}
         <DoubleGlowShadow>
           <div id="limit-order-page" className="flex flex-col w-full gap-4 p-3 rounded md:p-5 bg-dark-900">
-            <OpenOrders />
-            <CompletedOrders />
+            <OpenOrders orders={orders} setOrders={setOrders}/>
+            <CompletedOrders orders={orders} setOrders={setOrders}/>
           </div>
         </DoubleGlowShadow>
       </div>
     </Container>
   )
-  */
+  
   return (
     <Container id="open-order-page" className="py-4 md:py-8 lg:py-12" maxWidth="2xl">
     </Container>
diff --git a/src/pages/index.tsx b/src/pages/index.tsx
index 301442ca6..1e32bd0fd 100644
--- a/src/pages/index.tsx
+++ b/src/pages/index.tsx
@@ -2,9 +2,10 @@ import Container from '../components/Container'
 import Head from 'next/head'
 // import Swap from './exchange/smart-swap/[[...tokens]]'
 import LimitOrder from './exchange/limit-order/[[...tokens]]'
+import OpenOrdersPage from './exchange/open-order'
 
 export default function Dashboard() {
-  return LimitOrder()
+   return LimitOrder()
   // return (
   //   <Container id="dashboard-page" className="py-4 md:py-8 lg:py-12" maxWidth="2xl">
   //     <Head>
diff --git a/src/state/limit-order/hooks.ts b/src/state/limit-order/hooks.ts
index 901eaa80e..11a9339e2 100644
--- a/src/state/limit-order/hooks.ts
+++ b/src/state/limit-order/hooks.ts
@@ -283,8 +283,6 @@ export function useLimitOrderInfoSmartSwap(): {
   const rate = trade?.executionPrice
   console.log(rate?.toSignificant(6));
 
-  console.log(trade?.outputAmount?.toSignificant(6))
-
   const bentoBoxBalances = useBentoBalances()
   const balance = useMemo(
     () => bentoBoxBalances?.find((el) => el.address === inputCurrency?.wrapped.address),