aboutsummaryrefslogtreecommitdiffstats
path: root/packages/website/ts/components
diff options
context:
space:
mode:
authorFabio Berger <me@fabioberger.com>2018-03-26 20:21:26 +0800
committerGitHub <noreply@github.com>2018-03-26 20:21:26 +0800
commitb4f3450d4a3a5b2f80624cd07398958728517344 (patch)
tree57118196a8beb93d01837e662177a71dad4227a4 /packages/website/ts/components
parent109fc41474f5319a27052ab09234cc0426eb22ce (diff)
parent0a8b7cb49402d440df41ea0119f8a75d6f6c7a50 (diff)
downloaddexon-sol-tools-b4f3450d4a3a5b2f80624cd07398958728517344.tar
dexon-sol-tools-b4f3450d4a3a5b2f80624cd07398958728517344.tar.gz
dexon-sol-tools-b4f3450d4a3a5b2f80624cd07398958728517344.tar.bz2
dexon-sol-tools-b4f3450d4a3a5b2f80624cd07398958728517344.tar.lz
dexon-sol-tools-b4f3450d4a3a5b2f80624cd07398958728517344.tar.xz
dexon-sol-tools-b4f3450d4a3a5b2f80624cd07398958728517344.tar.zst
dexon-sol-tools-b4f3450d4a3a5b2f80624cd07398958728517344.zip
Merge pull request #479 from 0xProject/bug/website/portal-fill-mixed-decimals
Portal fill with rounding error/mixed decimals
Diffstat (limited to 'packages/website/ts/components')
-rw-r--r--packages/website/ts/components/fill_order.tsx6
1 files changed, 4 insertions, 2 deletions
diff --git a/packages/website/ts/components/fill_order.tsx b/packages/website/ts/components/fill_order.tsx
index a6144bd6b..ea94e0987 100644
--- a/packages/website/ts/components/fill_order.tsx
+++ b/packages/website/ts/components/fill_order.tsx
@@ -198,11 +198,13 @@ export class FillOrder extends React.Component<FillOrderProps, FillOrderState> {
symbol: takerToken.symbol,
};
const parsedOrderExpiration = new BigNumber(this.state.parsedOrder.signedOrder.expirationUnixTimestampSec);
- const exchangeRate = orderMakerAmount.div(orderTakerAmount);
let orderReceiveAmount = 0;
if (!_.isUndefined(this.props.orderFillAmount)) {
- const orderReceiveAmountBigNumber = exchangeRate.mul(this.props.orderFillAmount);
+ const orderReceiveAmountBigNumber = orderMakerAmount
+ .times(this.props.orderFillAmount)
+ .dividedBy(orderTakerAmount)
+ .floor();
orderReceiveAmount = this._formatCurrencyAmount(orderReceiveAmountBigNumber, makerToken.decimals);
}
const isUserMaker =