balanceAfter refactor

Emurgo · Aug 10, 2022 · 52965be · 52965be
1 parent 27cde15
commit 52965be
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 18 deletions.
diff --git a/src/Send/SendScreen/utils.ts b/src/Send/SendScreen/utils.ts
@@ -161,11 +161,12 @@ export const recomputeAll = async ({
             selectedTokenInfo,
           ).toString()
 
-          balanceAfter = Quantities.subtraction([
+          balanceAfter = Quantities.diff(
             defaultAssetAvailableAmount,
-            _fee.getDefault().toString() as Quantity,
-            minAda,
-          ])
+            Quantities.sum(
+              [defaultAssetAvailableAmount, _fee.getDefault().toString() as Quantity, minAda].map(Quantities.negated),
+            ),
+          )
         }
 
         // for sendAll we set the amount so the format is error-free
@@ -190,12 +191,10 @@ export const recomputeAll = async ({
           defaultIdentifier: yoroiUnsignedTx.unsignedTx.fee.defaults.identifier,
         })
 
-        balanceAfter = Quantities.subtraction([
+        balanceAfter = Quantities.diff(
           defaultAssetAvailableAmount,
-          parsedAmount,
-          minAda,
-          _fee.getDefault().toString() as Quantity,
-        ])
+          Quantities.sum([parsedAmount, minAda, _fee.getDefault().toString() as Quantity].map(Quantities.negated)),
+        )
       }
       // now we can update fee as well
       fee = _fee != null ? (_fee.getDefault().toString() as Quantity) : null

diff --git a/src/yoroi-wallets/utils.ts b/src/yoroi-wallets/utils.ts
@@ -69,15 +69,6 @@ export const Quantities = {
   sum: (quantities: Array<Quantity>) => {
     return quantities.reduce((result, current) => result.plus(current), new BigNumber(0)).toString() as Quantity
   },
-  subtraction: (quantities: Array<Quantity>) => {
-    const result = new BigNumber(quantities[0])
-
-    for (let i = 1; i < quantities.length; i++) {
-      result.minus(quantities[i])
-    }
-
-    return result.toString() as Quantity
-  },
   diff: (quantity1: Quantity, quantity2: Quantity) => {
     return new BigNumber(quantity1).minus(new BigNumber(quantity2)).toString() as Quantity
   },