aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabio Berger <me@fabioberger.com>2018-10-26 20:39:05 +0800
committerFabio Berger <me@fabioberger.com>2018-10-26 20:39:05 +0800
commit3e8d9510ec35e0f830a708efa608fd4c77ecfcae (patch)
tree46cc0265e95d46f582edca2d5a374b6b1ddf7e4a
parenta3d4482c4a00a2da485ddb8a0f89df923c7dd089 (diff)
parent1c5745dbd92afaeb9b71e248ce3691af3056d797 (diff)
downloaddexon-sol-tools-3e8d9510ec35e0f830a708efa608fd4c77ecfcae.tar
dexon-sol-tools-3e8d9510ec35e0f830a708efa608fd4c77ecfcae.tar.gz
dexon-sol-tools-3e8d9510ec35e0f830a708efa608fd4c77ecfcae.tar.bz2
dexon-sol-tools-3e8d9510ec35e0f830a708efa608fd4c77ecfcae.tar.lz
dexon-sol-tools-3e8d9510ec35e0f830a708efa608fd4c77ecfcae.tar.xz
dexon-sol-tools-3e8d9510ec35e0f830a708efa608fd4c77ecfcae.tar.zst
dexon-sol-tools-3e8d9510ec35e0f830a708efa608fd4c77ecfcae.zip
Merge branch 'development' of github.com:0xProject/0x-monorepo into development
* 'development' of github.com:0xProject/0x-monorepo: fix(website): round makerAssetToken amount in FillOrder component
-rw-r--r--packages/website/ts/components/fill_order.tsx5
1 files changed, 4 insertions, 1 deletions
diff --git a/packages/website/ts/components/fill_order.tsx b/packages/website/ts/components/fill_order.tsx
index ec73e4199..3d0203573 100644
--- a/packages/website/ts/components/fill_order.tsx
+++ b/packages/website/ts/components/fill_order.tsx
@@ -203,7 +203,10 @@ export class FillOrder extends React.Component<FillOrderProps, FillOrderState> {
.tokenAddress;
const makerToken = this.props.tokenByAddress[makerTokenAddress];
const makerAssetToken = {
- amount: orderMakerAmount.times(takerAssetToken.amount).div(orderTakerAmount),
+ amount: orderMakerAmount
+ .times(takerAssetToken.amount)
+ .div(orderTakerAmount)
+ .floor(),
symbol: makerToken.symbol,
};
const fillAssetToken = {