diff --git a/src/app/lending/DappOrders/DappOrders.jsx b/src/app/lending/DappOrders/DappOrders.jsx index 153100fe..33f538e7 100755 --- a/src/app/lending/DappOrders/DappOrders.jsx +++ b/src/app/lending/DappOrders/DappOrders.jsx @@ -39,13 +39,13 @@ export default class DappOrders extends React.PureComponent { handleTabsChartChange = (tabId) => this.setState({chartTadId: tabId}) render() { - const { currentPairName } = this.props - if (!isTomoWallet() && !isWeb3()) return + const { currentPair } = this.props + if (!isTomoWallet() && !isWeb3()) return return ( - {currentPairName && } + {currentPair.pair && } ) } diff --git a/src/components/OrdersTableMobile/OrdersTableRendererMobile.jsx b/src/components/OrdersTableMobile/OrdersTableRendererMobile.jsx index e7d119e0..d2883963 100755 --- a/src/components/OrdersTableMobile/OrdersTableRendererMobile.jsx +++ b/src/components/OrdersTableMobile/OrdersTableRendererMobile.jsx @@ -199,7 +199,7 @@ const OpenOrderTable = ({orders, cancelOrder, isHideOtherPairs, handleChangeHide - {order.cancelAble && ( cancelOrder(order.hash)}>Cancel)} + {order.cancelAble && ( cancelOrder(order.hash)}>)} diff --git a/src/components/lending/DappLendingOrdersTable/DappLendingOrdersTableRenderer.jsx b/src/components/lending/DappLendingOrdersTable/DappLendingOrdersTableRenderer.jsx index 6e049327..a3993502 100755 --- a/src/components/lending/DappLendingOrdersTable/DappLendingOrdersTableRenderer.jsx +++ b/src/components/lending/DappLendingOrdersTable/DappLendingOrdersTableRenderer.jsx @@ -195,7 +195,7 @@ const OpenOrderTable = ({orders, cancelOrder, isHideOtherPairs, handleChangeHide - {order.cancelAble && ( cancelOrder(order.hash)}>Cancel)} + {order.cancelAble && ( cancelOrder(order.hash)}>)} diff --git a/src/locales/langs/en.json b/src/locales/langs/en.json index 5b7025d1..f942293e 100644 --- a/src/locales/langs/en.json +++ b/src/locales/langs/en.json @@ -160,6 +160,7 @@ "exchangePage.rejected": "Rejected", "exchangePage.orderPlace.buy": "Buy {baseTokenSymbol}", "exchangePage.orderPlace.sell": "Sell {baseTokenSymbol}", + "exchangePage.cancel": "Cancel", "exchangeLendingPage.orderPlace.day": "day", "exchangeLendingPage.orderPlace.days": "days", "exchangeLendingPage.orderPlace.lend": "Lend {lendingSymbol} for {termByDay} {termUnit}", diff --git a/src/locales/langs/fr.json b/src/locales/langs/fr.json index 3cc9bebc..3251acbf 100644 --- a/src/locales/langs/fr.json +++ b/src/locales/langs/fr.json @@ -160,6 +160,7 @@ "exchangePage.rejected": "Rejeté", "exchangePage.orderPlace.buy": "Acheter {baseTokenSymbol}", "exchangePage.orderPlace.sell": "Vendre {baseTokenSymbol}", + "exchangePage.cancel": "Annuler", "exchangeLendingPage.orderPlace.day": "day", "exchangeLendingPage.orderPlace.days": "days", "exchangeLendingPage.orderPlace.lend": "Prêter {lendingSymbol} pour {termByDay} {termUnit}", diff --git a/src/locales/langs/ja.json b/src/locales/langs/ja.json index a0b40580..d64536aa 100644 --- a/src/locales/langs/ja.json +++ b/src/locales/langs/ja.json @@ -160,6 +160,7 @@ "exchangePage.rejected": "却下", "exchangePage.orderPlace.buy": "{baseTokenSymbol}を購入", "exchangePage.orderPlace.sell": "{baseTokenSymbol}を売却", + "exchangePage.cancel": "キャンセル", "exchangeLendingPage.orderPlace.day": "day", "exchangeLendingPage.orderPlace.days": "days", "exchangeLendingPage.orderPlace.lend": "{termByDay} {termUnit}で{lendingSymbol}を貸す", diff --git a/src/locales/langs/nl.json b/src/locales/langs/nl.json index 65487183..a50f0d61 100644 --- a/src/locales/langs/nl.json +++ b/src/locales/langs/nl.json @@ -160,6 +160,7 @@ "exchangePage.rejected": "Afgewezen", "exchangePage.orderPlace.buy": "Koop {baseTokenSymbol}", "exchangePage.orderPlace.sell": "Verkoop {baseTokenSymbol}", + "exchangePage.cancel": "Annuleren", "exchangeLendingPage.orderPlace.day": "day", "exchangeLendingPage.orderPlace.days": "days", "exchangeLendingPage.orderPlace.lend": "Uitlenen {lendingSymbol} voor {termByDay} {termUnit}", diff --git a/src/locales/langs/tr.json b/src/locales/langs/tr.json index 8298ccca..cd310e6f 100644 --- a/src/locales/langs/tr.json +++ b/src/locales/langs/tr.json @@ -160,6 +160,7 @@ "exchangePage.rejected": "Reddedildi", "exchangePage.orderPlace.buy": "{baseTokenSymbol} Al", "exchangePage.orderPlace.sell": "{baseTokenSymbol} Sat", + "exchangePage.cancel": "İptal", "exchangeLendingPage.orderPlace.day": "gün", "exchangeLendingPage.orderPlace.days": "gün", "exchangeLendingPage.orderPlace.lend": "{termByDay} {termUnit} için {lendingSymbol} borç ver", diff --git a/src/locales/langs/vi.json b/src/locales/langs/vi.json index b4c632f5..3c00327e 100644 --- a/src/locales/langs/vi.json +++ b/src/locales/langs/vi.json @@ -160,6 +160,7 @@ "exchangePage.rejected": "Rejected", "exchangePage.orderPlace.buy": "Mua {baseTokenSymbol}", "exchangePage.orderPlace.sell": "Bán {baseTokenSymbol}", + "exchangePage.cancel": "Hủy", "exchangeLendingPage.orderPlace.day": "ngày", "exchangeLendingPage.orderPlace.days": "ngày", "exchangeLendingPage.orderPlace.lend": "Cho vay {lendingSymbol} trong {termByDay} {termUnit}", diff --git a/src/locales/langs/zh.json b/src/locales/langs/zh.json index 997f6893..28f4dcfc 100644 --- a/src/locales/langs/zh.json +++ b/src/locales/langs/zh.json @@ -160,6 +160,7 @@ "exchangePage.rejected": "被拒绝", "exchangePage.orderPlace.buy": "购买{baseTokenSymbol}", "exchangePage.orderPlace.sell": "售出{baseTokenSymbol}", + "exchangePage.cancel": "取消", "exchangeLendingPage.orderPlace.day": "day", "exchangeLendingPage.orderPlace.days": "days", "exchangeLendingPage.orderPlace.lend": "通过{termByDay} {termUnit}借出{lendingSymbol}",