Skip to content

Fix ticker in transactions history #190

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Hossein-ab99 merged 1 commit into from
Apr 13, 2024
Merged

Fix ticker in transactions history #190

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 2 additions & 21 deletions ...mponents/TransactionHistory/components/TransactionHistoryTable/TransactionHistoryTable.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,37 +54,27 @@
};

const sideHandler = (category, takerDirection, makerDirection, isTaker, isMaker, ask, bid, num) => {



if (category === "ORDER_CREATE" || category === "ORDER_CANCEL") {
return <span className={``}>{ask && t('sell')} {bid && t('buy')}</span>
}

if (((takerDirection === "ASK") || (makerDirection === "BID")) && isTaker && isMaker) {
return <span className={``}>{t('TransactionHistory.selfTrade')}</span>
}

if (takerDirection === "ASK" && isTaker) {
return <span className={``}>{t('sell')}</span>
}
if (makerDirection === "BID" && isMaker) {
return <span className={``}>{t('buy')}</span>
}


if (makerDirection === "ASK" && isTaker) {
return <span className={``}>{t('buy')}</span>
}
if (takerDirection === "BID" && isMaker) {
return <span className={``}>{t('sell')}</span>
}

else {


}

}


Expand Down Expand Up @@ -114,8 +104,6 @@

const isSelfTrade = (((tr?.additionalData?.takerDirection === "ASK") || ( tr?.additionalData?.makerDirection === "BID")) && isTaker && isMaker)

console.log("isSelfTrade", index , isSelfTrade)

return (

<div className={`column ${classes.striped}`} key={index}>
Expand All @@ -134,8 +122,7 @@
{txCategory(tr.category)}
</span>
<span className={`width-12 ${i18n.language !== "fa" ? 'row-reverse jc-end' : 'row jc-start'} ai-center`}>
<span className={`fs-0-8 text-gray`}>{tr.currency}</span>
<span className={`mx-05`}>{new BN(tr?.amount).toFormat() }</span>
<span className={`${i18n.language !== "fa" ? 'mr-05' : 'ml-05'}`}>{new BN(tr?.amount).toFormat() }</span>

{
( (tr?.category === "TRADE") && isSelfTrade) ? "" : <>
Expand All @@ -160,14 +147,8 @@
tr?.category === "ORDER_FINALIZED" ) ? <>

<div className={`row jc-start`}>


{ (tr?.category === "FEE") ? <span className={`ml-05`}>{t("TransactionHistory.forFee")}</span> : ""}


{
sideHandler(tr?.category, tr?.additionalData?.takerDirection, tr?.additionalData?.makerDirection, isTaker, isMaker, tr?.additionalData?.ask, tr?.additionalData?.bid, (index + offset + 1))
}
{ sideHandler(tr?.category, tr?.additionalData?.takerDirection, tr?.additionalData?.makerDirection, isTaker, isMaker, tr?.additionalData?.ask, tr?.additionalData?.bid, (index + offset + 1))}

<span className={`mr-05`}>{new BN(tr?.additionalData?.origQuantity).toFormat()}</span>
<span className={`mr-05`}>{t("currency." + tr?.additionalData?.pair?.leftSideName )}</span>
Expand Down