{txs.map((tr, index) => {
+
+ const isMaker = tr?.additionalData?.makerUuid === id
+ const isTaker = tr?.additionalData?.takerUuid === id
+
return (
setOpenItem(openItem === index ? null : index)}
>
- {index + offset + 1}
+ {index + offset + 1}
, {moment(tr.date).format("HH:mm:ss")}
@@ -57,12 +98,18 @@ const TransactionHistoryTable = ({txs, offset}) => {
-
{txCategory(tr.category)}
+
{txCategory(tr.category)}
{t("volume")}:
- {new BN(tr?.amount).toFormat()}
+
+ {(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()}
+
+
@@ -77,13 +124,58 @@ const TransactionHistoryTable = ({txs, offset}) => {
?
<>
-
{t('TransactionCategory.'+tr.category)}
-
{tr?.additionalData?.ask && t('sell')} {tr?.additionalData?.bid && t('buy')}
+ {/*
{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))
+ }
+
{new BN(tr?.additionalData?.origQuantity).toFormat()}
{t("currency." + tr?.additionalData?.pair?.leftSideName )}
{t("withPrice")}
{new BN(tr?.additionalData?.origPrice).toFormat()}
{t("currency." + tr?.additionalData?.pair?.rightSideName )}
+
+
+ { ((tr?.category === "TRADE") || (tr?.category === "FEE")) &&
+
+
{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 )}
: ""}
+
+
}
+
: "----"
}
diff --git a/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/TransactionHistory/components/TransactionHistoryTable/TransactionHistoryTable.module.css b/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/TransactionHistory/components/TransactionHistoryTable/TransactionHistoryTable.module.css
index ff777ce..bf23a73 100644
--- a/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/TransactionHistory/components/TransactionHistoryTable/TransactionHistoryTable.module.css
+++ b/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/TransactionHistory/components/TransactionHistoryTable/TransactionHistoryTable.module.css
@@ -6,8 +6,14 @@
}
.circle {
- width: 8vw;
- height: 8vw;
- border-radius: 100px;
- background-color: var(--cardBorder);
+ border-left: 1px dotted var(--gray);
+}
+
+:global(.ltr) .circle {
+ border-right: 1px dotted var(--gray);
+ border-left: initial;
+}
+
+.bottomNav {
+ border-top: 1px dotted var(--gray);
}
\ No newline at end of file