Skip to content

Corrected minimum order amount display in buy/sell components #84

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 3 commits into from
Dec 30, 2024
Merged

Corrected minimum order amount display in buy/sell components #84

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cf42d62
Update translation.json in locales
Hossein-ab99 Dec 25, 2024
b4fc7cc
Merge pull request #82 from opexdev/80/release/v1.0.4-beta.7
Hossein-ab99 Dec 25, 2024
b23919e
#83 fix: Corrected minimum order amount display in buy/sell components
Hossein-ab99 Dec 30, 2024
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
62 changes: 31 additions & 31 deletions public/assets/locales/fa/translation.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,37 +252,37 @@
"showZeroBalance": "عدم نمایش موجودی صفر",
"estimateAlert": "مبلغ دارایی معادل براساس بالاترین پیشنهاد خرید محاسبه شده"
},
"history": {
"title": "تاریخچه",
"transactions": "تراکنش‌ها",
"transactionsHistory": "تاریخچه تراکنش‌ها",
"deposit": "واریز",
"withdraw": "برداشت",
"swap": "تبدیل",
"withdrawHistory" : "تاریخچه برداشت",
"depositHistory" : "تاریخچه واریز",
"swapHistory" : "تاریخچه تبدیل",
"balance": "موجودی",
"balanceChange": "تغییر موجودی",
"currency" : "ارز",
"category" : "نوع تراکنش",
"size" : "تعداد",
"period" : "بازه زمانی",
"status" : "وضعیت",
"ascendingByTime" : "نمایش براساس جدیدترین",
"page": "صفحه {{page}}",
"description": "توضیحات:",
"type": "نوع",
"sourceAddress": "آدرس مبدا",
"transactionRef": "شناسه تراکنش",
"cancelWithdrawReq": "لغو درخواست برداشت",
"cancelWithdrawReqSuccess": "درخواست برداشت با موفقیت لغو شد",
"fee": "کارمزد",
"appliedFee": "کارمزد اعمال شده",
"destAddress": "آدرس مقصد",
"statusReason": "توضیح وضعیت:",
"lastUpdateDate": "زمان آخرین بررسی درخواست"
},
"history": {
"title": "تاریخچه",
"transactions": "تراکنش‌ها",
"transactionsHistory": "تاریخچه تراکنش‌ها",
"deposit": "واریز",
"withdraw": "برداشت",
"swap": "تبدیل",
"withdrawHistory" : "تاریخچه برداشت",
"depositHistory" : "تاریخچه واریز",
"swapHistory" : "تاریخچه تبدیل",
"balance": "موجودی",
"balanceChange": "تغییر موجودی",
"currency" : "ارز",
"category" : "نوع تراکنش",
"size" : "تعداد",
"period" : "بازه زمانی",
"status" : "وضعیت",
"ascendingByTime" : "نمایش براساس جدیدترین",
"page": "صفحه {{page}}",
"description": "توضیحات:",
"type": "نوع",
"sourceAddress": "آدرس مبدا",
"transactionRef": "شناسه تراکنش",
"cancelWithdrawReq": "لغو درخواست برداشت",
"cancelWithdrawReqSuccess": "درخواست برداشت با موفقیت لغو شد",
"fee": "کارمزد",
"appliedFee": "کارمزد اعمال شده",
"destAddress": "آدرس مقصد",
"statusReason": "توضیح وضعیت:",
"lastUpdateDate": "زمان آخرین بررسی درخواست"
},
"depositStatus": {
"DONE": "انجام شده"
},
Expand Down
8 changes: 4 additions & 4 deletions src/main/Mobile/Pages/EasyTrading/components/EasyOrder/EasyOrder.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ const EasyOrder = () => {
newAlert = <Trans
i18nKey="orders.minOrder"
values={{
min: selected.pair[range].min?.toString(),
min: new BN(selected.pair[range].min).toFormat(),
currency: t("currency." + selected.buy),
}}
/>
Expand All @@ -136,7 +136,7 @@ const EasyOrder = () => {
if (!reqAmount.mod(selected.pair[range].step).isZero()) {
newAlert = <Trans
i18nKey="orders.divisibility"
values={{mod: selected.pair[range].step.toString()}}
values={{mod: new BN(selected.pair[range].step).toFormat()}}
/>
}
setAlert({...alert, reqAmount: newAlert});
Expand All @@ -160,7 +160,7 @@ const EasyOrder = () => {
newAlert = <Trans
i18nKey="orders.minOrder"
values={{
min: selected.pair[range].min?.toString(),
min: new BN(selected.pair[range].min).toFormat(),
currency: t("currency." + selected.sell),
}}
/>
Expand All @@ -178,7 +178,7 @@ const EasyOrder = () => {
if (!totalPrice.mod(selected.pair[range].step).isZero()) {
newAlert = <Trans
i18nKey="orders.divisibility"
values={{mod: selected.pair[range].step.toString()}}
values={{mod: new BN(selected.pair[range].min).toFormat()}}
/>
}
setAlert({...alert, totalPrice: newAlert});
Expand Down
20 changes: 10 additions & 10 deletions src/store/sagas/global.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,16 +185,16 @@ export function* loadConfig(action) {
}

const assetsScope = {
TBTC: {min: 0.0000001, step: 0.0000001},
BTC: {min: 0.0000001, step: 0.0000001},
TETH: {min: 0.0000001, step: 0.0000001},
ETH: {min: 0.0000001, step: 0.0000001},
TBNB: {min: 0.00001, step: 0.00001},
BNB: {min: 0.00001, step: 0.00001},
TBTC: {min: 0.000001, step: 0.000001},
BTC: {min: 0.000001, step: 0.000001},
TETH: {min: 0.000001, step: 0.000001},
ETH: {min: 0.000001, step: 0.000001},
TBNB: {min: 0.0001, step: 0.0001},
BNB: {min: 0.0001, step: 0.0001},
USDT: {min: 0.01, step: 0.01},
IRT: {min: 50000, step: 1000},
TRX: {min: 0.0000001, step: 0.0000001},
SOL: {min: 0.000001, step: 0.000001},
TON: {min: 0.00001, step: 0.00001},
DOGE: {min: 0.00001, step: 0.00001},
TRX: {min: 0.000001, step: 0.000001},
SOL: {min: 0.00001, step: 0.00001},
TON: {min: 0.0001, step: 0.0001},
DOGE: {min: 0.0001, step: 0.0001},
}
Loading