From c08adbda592e3432aac712b6da0570606c4f7e34 Mon Sep 17 00:00:00 2001 From: Hossein Date: Sat, 13 Apr 2024 14:19:36 +0330 Subject: [PATCH] #51: Refactor transactions history --- public/assets/locales/en/translation.json | 5 + public/assets/locales/fa/translation.json | 5 + public/assets/locales/uzb/translation.json | 5 + .../TransactionHistoryTable.js | 93 +++++++------------ 4 files changed, 48 insertions(+), 60 deletions(-) diff --git a/public/assets/locales/en/translation.json b/public/assets/locales/en/translation.json index 84ad3ae..f904ede 100644 --- a/public/assets/locales/en/translation.json +++ b/public/assets/locales/en/translation.json @@ -265,6 +265,7 @@ "increaseWallet" : "Addition", "balanceStatus" : "Balance Status", "selfTrade" : "Self Trade", + "forFee" : "Fee for", "ascendingByTime" : "Ascending By Time" }, "TransactionCategory": { @@ -272,9 +273,13 @@ "FEE": "Fee", "TRADE": "Trade", "WITHDRAW": "Withdraw", + "WITHDRAW_REQUEST" : "Withdraw Request", + "WITHDRAW_ACCEPT" : "Withdraw Accept", + "WITHDRAW_REJECT" : "Withdraw Reject", "ORDER_CANCEL": "Cancel Order", "ORDER_CREATE": "Create Order", "ORDER_FINALIZED": "Refund", + "PURCHASE_FINALIZED" : "Purchase Finalized", "ETC" : "Unknown" }, "DepositWithdraw": { diff --git a/public/assets/locales/fa/translation.json b/public/assets/locales/fa/translation.json index ddf31cb..b5292f0 100644 --- a/public/assets/locales/fa/translation.json +++ b/public/assets/locales/fa/translation.json @@ -265,6 +265,7 @@ "increaseWallet" : "افزایش", "balanceStatus" : "وضعیت موجودی", "selfTrade" : "جیب به جیب", + "forFee" : "کارمزد برای", "ascendingByTime" : "نمایش براساس جدیدترین" }, "TransactionCategory": { @@ -272,9 +273,13 @@ "FEE" : "کارمزد", "TRADE" : "معامله", "WITHDRAW" : "برداشت", + "WITHDRAW_REQUEST" : "درخواست برداشت", + "WITHDRAW_ACCEPT" : "برداشت موفق", + "WITHDRAW_REJECT" : "رد درخواست برداشت", "ORDER_CANCEL" : "لغو سفارش", "ORDER_CREATE" : "ثبت سفارش", "ORDER_FINALIZED" : "بازگشت وجه", + "PURCHASE_FINALIZED" : "انجام معامله", "ETC" : "نامشخص" }, "DepositWithdraw": { diff --git a/public/assets/locales/uzb/translation.json b/public/assets/locales/uzb/translation.json index 52a9ffc..f7428cd 100644 --- a/public/assets/locales/uzb/translation.json +++ b/public/assets/locales/uzb/translation.json @@ -265,6 +265,7 @@ "increaseWallet" : "Inventarning ko'payishi", "balanceStatus" : "Muvozanat holati", "selfTrade" : "O'z-o'zidan savdo", + "forFee" : "Haq uchun", "ascendingByTime" : "Eng so'nggisiga asoslangan ko'rsatish" }, "TransactionCategory": { @@ -272,9 +273,13 @@ "FEE": "haq", "TRADE": "Savdo", "WITHDRAW": "Olib chiqish", + "WITHDRAW_REQUEST" : "Olib chiqish So'rov ", + "WITHDRAW_ACCEPT" : "Olib chiqish Qabul qilish", + "WITHDRAW_REJECT" : "Olib chiqish Rad etish", "ORDER_CANCEL": "Buyurtmani bekor qilish", "ORDER_CREATE": "Buyurtma yaratish", "ORDER_FINALIZED": "Qaytarish", + "PURCHASE_FINALIZED" : "Sotib olish yakunlandi", "ETC" : "Noma'lum" }, "DepositWithdraw": { diff --git a/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/TransactionHistory/components/TransactionHistoryTable/TransactionHistoryTable.js b/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/TransactionHistory/components/TransactionHistoryTable/TransactionHistoryTable.js index 34eb13a..aa65210 100644 --- a/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/TransactionHistory/components/TransactionHistoryTable/TransactionHistoryTable.js +++ b/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/TransactionHistory/components/TransactionHistoryTable/TransactionHistoryTable.js @@ -7,6 +7,7 @@ import {BN} from "../../../../../../../../../../utils/utils"; import {images} from "../../../../../../../../../../assets/images"; import {useSelector} from "react-redux"; import Icon from "../../../../../../../../../../components/Icon/Icon"; +import i18n from "i18next"; const TransactionHistoryTable = ({txs, offset}) => { @@ -25,47 +26,47 @@ const TransactionHistoryTable = ({txs, offset}) => { return t("TransactionCategory.TRADE"); case "WITHDRAW": return t("TransactionCategory.WITHDRAW"); + case "WITHDRAW_REQUEST": + return t("TransactionCategory.WITHDRAW_REQUEST"); + case "WITHDRAW_ACCEPT": + return t("TransactionCategory.WITHDRAW_ACCEPT"); + case "WITHDRAW_REJECT": + return t("TransactionCategory.WITHDRAW_REJECT"); case "ORDER_CANCEL": return t("TransactionCategory.ORDER_CANCEL"); case "ORDER_CREATE": return t("TransactionCategory.ORDER_CREATE"); case "ORDER_FINALIZED": return t("TransactionCategory.ORDER_FINALIZED"); + case "PURCHASE_FINALIZED": + return t("TransactionCategory.PURCHASE_FINALIZED"); default: return t("TransactionCategory.ETC"); } }; const sideHandler = (category, takerDirection, makerDirection, isTaker, isMaker, ask, bid, num) => { - if (category === "ORDER_CREATE" || category === "ORDER_CANCEL") { - return {ask && t('sell')} {bid && t('buy')} + return {ask && t('sell')} {bid && t('buy')} } - if (((takerDirection === "ASK") || (makerDirection === "BID")) && isTaker && isMaker) { - return {t('TransactionHistory.selfTrade')} + return {t('TransactionHistory.selfTrade')} } - if (takerDirection === "ASK" && isTaker) { - return {t('sell')} + return {t('sell')} } if (makerDirection === "BID" && isMaker) { - return {t('buy')} + return {t('buy')} } - - if (makerDirection === "ASK" && isTaker) { - return {t('buy')} + return {t('buy')} } if (takerDirection === "BID" && isMaker) { - return {t('sell')} + return {t('sell')} } - else { - } - } @@ -75,6 +76,8 @@ const TransactionHistoryTable = ({txs, offset}) => { const isMaker = tr?.additionalData?.makerUuid === id const isTaker = tr?.additionalData?.takerUuid === id + const isSelfTrade = (((tr?.additionalData?.takerDirection === "ASK") || ( tr?.additionalData?.makerDirection === "BID")) && isTaker && isMaker) + return (
setOpenItem(openItem === index ? null : index)} @@ -101,14 +104,17 @@ const TransactionHistoryTable = ({txs, offset}) => { {txCategory(tr.category)}
{t("volume")}: -
- - {(tr?.wallet === "main") && (tr?.withdraw === false) && (tr?.category === "TRADE") ? "+ " :""} - {(tr?.wallet === "exchange") && (tr?.withdraw === true) && (tr?.category === "TRADE") ? "- " :""} - {(tr?.category === "FEE") ? "- " :""} - {new BN(tr?.amount).toFormat()} - - +
+ {new BN(tr?.amount).toFormat() } + + { + ( (tr?.category === "TRADE") && isSelfTrade) ? "" : <> + { + (tr?.category !== "WITHDRAW_REQUEST" && tr?.category !== "WITHDRAW_REJECT" && tr?.category !== "WITHDRAW_ACCEPT" && tr?.category !== "ORDER_CREATE" && tr?.category !== "ORDER_CANCEL" ) + &&
{tr?.withdraw ? '-' : '+'}
+ } + + }
@@ -124,30 +130,9 @@ const TransactionHistoryTable = ({txs, offset}) => { ? <> - {/* {t('TransactionCategory.'+tr.category)}*/} - - {/* {tr?.category === "ORDER_CREATE" && - - {tr?.additionalData?.ask && t('sell')} {tr?.additionalData?.bid && t('buy')} - } - - {tr?.additionalData?.takerDirection === "ASK" && isTaker ? {t('sell')} : ""} - {tr?.additionalData?.makerDirection === "BID" && isMaker ? {t('buy')} : ""} -*/} - { (tr?.wallet === "main") && (tr?.withdraw === true) && (tr?.category !== "FEE") ? {t("TransactionHistory.assetBlock")} - : ""} - { (tr?.wallet === "exchange") && (tr?.withdraw === false) ? {t("TransactionHistory.readyToExchange")} - : ""} - { (tr?.wallet === "main") && (tr?.withdraw === false) && (tr?.category === "TRADE") ? {t("TransactionHistory.increaseWallet")} - : ""} - { (tr?.wallet === "exchange") && (tr?.withdraw === true) && (tr?.category === "TRADE") ? {t("TransactionHistory.decreaseWallet")} - : ""} - { (tr?.category === "FEE") ? {t("TransactionHistory.decreaseWallet")} - : ""} - { (tr?.wallet === "main") && (tr?.withdraw === false) && (tr?.category === "ORDER_CANCEL") ? {t("TransactionHistory.assetUnBlocked")} - : ""} - { (tr?.wallet === "exchange") && (tr?.withdraw === true) && (tr?.category === "ORDER_CANCEL") ? {t("TransactionHistory.cancelExchange")} - : ""} - { (tr?.category === "ORDER_FINALIZED") && (tr?.wallet === "main") ? {t("TransactionHistory.refund")} - : ""} - { (tr?.category === "ORDER_FINALIZED") && (tr?.wallet === "exchange") ? {t("TransactionHistory.startRefund")} - : ""} - - { - sideHandler(tr?.category, tr?.additionalData?.takerDirection, tr?.additionalData?.makerDirection, isTaker, isMaker, tr?.additionalData?.ask, tr?.additionalData?.bid, (index + offset + 1)) - } + { (tr?.category === "FEE") ? {t("TransactionHistory.forFee")} : ""} + { sideHandler(tr?.category, tr?.additionalData?.takerDirection, tr?.additionalData?.makerDirection, isTaker, isMaker, tr?.additionalData?.ask, tr?.additionalData?.bid, (index + offset + 1))} {new BN(tr?.additionalData?.origQuantity).toFormat()} {t("currency." + tr?.additionalData?.pair?.leftSideName )} @@ -156,25 +141,13 @@ const TransactionHistoryTable = ({txs, offset}) => { {t("currency." + tr?.additionalData?.pair?.rightSideName )} - { ((tr?.category === "TRADE") || (tr?.category === "FEE")) &&
+ { (tr?.category === "TRADE" && !isSelfTrade) || (tr?.category === "FEE") || (tr?.category === "ORDER_FINALIZED") ?
{t("TransactionHistory.balanceStatus")}: - {/*{ (tr?.wallet === "main") && (tr?.withdraw === true) && (tr?.category !== "FEE") ? {t("TransactionHistory.assetBlock")} : ""} - { (tr?.wallet === "exchange") && (tr?.withdraw === false) ? {t("TransactionHistory.readyToExchange")} : ""} - { (tr?.wallet === "main") && (tr?.withdraw === false) && (tr?.category === "TRADE") ? {t("TransactionHistory.increaseWallet")} : ""} - { (tr?.wallet === "exchange") && (tr?.withdraw === true) && (tr?.category === "TRADE") ? {t("TransactionHistory.decreaseWallet")} : ""} - { (tr?.category === "FEE") ? {t("TransactionHistory.decreaseWallet")} : ""} - { (tr?.wallet === "main") && (tr?.withdraw === false) && (tr?.category === "ORDER_CANCEL") ? {t("TransactionHistory.assetUnBlocked")} : ""} - { (tr?.wallet === "exchange") && (tr?.withdraw === true) && (tr?.category === "ORDER_CANCEL") ? {t("TransactionHistory.cancelExchange")} : ""} - { (tr?.category === "ORDER_FINALIZED") ? {t("TransactionHistory.finished")} : ""}*/} - - - { (tr?.wallet === "main") && (tr?.withdraw === false) && (tr?.category === "TRADE") ?
{t("currency." + tr.currency )}
: ""} - { (tr?.wallet === "exchange") && (tr?.withdraw === true) && (tr?.category === "TRADE") ?
{t("currency." + tr.currency )}
: ""} - { (tr?.category === "FEE") ?
{t("currency." + tr.currency )}
: ""} +
{t("currency." + tr.currency )}
-
} +
: ""} : "----"