From c161a9bbe1ca4438a6aa545463c4cea957c082f6 Mon Sep 17 00:00:00 2001 From: rick23p Date: Mon, 16 Aug 2021 12:02:06 +0430 Subject: [PATCH] #157-amount = bridge fee, disable withdraw/deposit --- .../components/AmountSelector/index.tsx | 2 ++ .../components/AmountSelector/index.tsx | 12 +++++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/app/pages/BridgeDepositPage/components/AmountSelector/index.tsx b/src/app/pages/BridgeDepositPage/components/AmountSelector/index.tsx index 92786e478..562879f67 100644 --- a/src/app/pages/BridgeDepositPage/components/AmountSelector/index.tsx +++ b/src/app/pages/BridgeDepositPage/components/AmountSelector/index.tsx @@ -66,6 +66,7 @@ export function AmountSelector() { bnBalance.greaterThanOrEqualTo(bnAmount) && bnAmount.greaterThan(0) && bnAmount.greaterThanOrEqualTo(limits.returnData.getMinPerToken) && + bnAmount.greaterThan(limits.returnData.getFeePerToken) && bnAmount.lessThanOrEqualTo(limits.returnData.getMaxTokensAllowed) && bignumber(limits.returnData.dailyLimit).greaterThanOrEqualTo( bnAmount.add(limits.returnData.spentToday), @@ -77,6 +78,7 @@ export function AmountSelector() { balance.value, bridgeBalance.value, limits.returnData.dailyLimit, + limits.returnData.getFeePerToken, limits.returnData.getMaxTokensAllowed, limits.returnData.getMinPerToken, limits.returnData.spentToday, diff --git a/src/app/pages/BridgeWithdrawPage/components/AmountSelector/index.tsx b/src/app/pages/BridgeWithdrawPage/components/AmountSelector/index.tsx index be598661e..ec5566648 100644 --- a/src/app/pages/BridgeWithdrawPage/components/AmountSelector/index.tsx +++ b/src/app/pages/BridgeWithdrawPage/components/AmountSelector/index.tsx @@ -81,21 +81,23 @@ export function AmountSelector() { bnAmount.greaterThan(0) && bnAmount.greaterThanOrEqualTo(limits.returnData.getMinPerToken) && bnAmount.lessThanOrEqualTo(limits.returnData.getMaxTokensAllowed) && + bnAmount.greaterThan(limits.returnData.getFeePerToken) && bignumber(limits.returnData.dailyLimit).greaterThanOrEqualTo( bnAmount.add(limits.returnData.spentToday), ) ); }, [ currentAsset, - balance.loading, + value, balance.value, + balance.loading, bridgeBalance.value, - limits.returnData.dailyLimit, - limits.returnData.getMaxTokensAllowed, + limitsLoading, limits.returnData.getMinPerToken, + limits.returnData.getMaxTokensAllowed, + limits.returnData.getFeePerToken, + limits.returnData.dailyLimit, limits.returnData.spentToday, - limitsLoading, - value, ]); return (