From a8348502802c30d2d4a111f45417b238667edeff Mon Sep 17 00:00:00 2001
From: Jaco Greeff <jacogr@gmail.com>
Date: Mon, 14 Jan 2019 13:21:34 +0100
Subject: [PATCH] Remove wrongly introduced toNumber in fees (#599)

---
 packages/ui-signer/src/Fees/Proposal.tsx | 4 +++-
 packages/ui-signer/src/Fees/Transfer.tsx | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/ui-signer/src/Fees/Proposal.tsx b/packages/ui-signer/src/Fees/Proposal.tsx
index f209be65b4..4360f874b8 100644
--- a/packages/ui-signer/src/Fees/Proposal.tsx
+++ b/packages/ui-signer/src/Fees/Proposal.tsx
@@ -37,7 +37,9 @@ class Proposal extends React.PureComponent<Props, State> {
   }
 
   static getDerivedStateFromProps ({ deposit, query_democracy_minimumDeposit = new BN(0), onChange }: Props): State {
-    const extraAmount = new BN(deposit.toNumber());
+    const extraAmount = deposit instanceof Compact
+      ? deposit.toBn()
+      : deposit;
     const isBelowMinimum = extraAmount.lt(query_democracy_minimumDeposit);
 
     const update = {
diff --git a/packages/ui-signer/src/Fees/Transfer.tsx b/packages/ui-signer/src/Fees/Transfer.tsx
index 44c2a19674..a97f7eb174 100644
--- a/packages/ui-signer/src/Fees/Transfer.tsx
+++ b/packages/ui-signer/src/Fees/Transfer.tsx
@@ -48,7 +48,7 @@ class Transfer extends React.PureComponent<Props, State> {
       extraFees = extraFees.add(fees.creationFee);
     }
 
-    const extraAmount = new BN(amount.toNumber());
+    const extraAmount = amount instanceof Compact ? amount.toBn() : new BN(amount);
     const isCreation = derive_balances_votingBalance.votingBalance.isZero() && fees.creationFee.gtn(0);
     const isNoEffect = extraAmount.add(derive_balances_votingBalance.votingBalance).lte(fees.existentialDeposit);
     const extraWarn = isCreation || isNoEffect;