Whether you can pay takes into account fee deductions

3 files changed, 22 insertions, 23 deletions

diff --git a/routes/bitcoin/send.js b/routes/bitcoin/send.js
index 884c0db1..634b223b 100644
--- a/routes/bitcoin/send.js
+++ b/routes/bitcoin/send.js
@@ -58,14 +58,6 @@ module.exports = ah(async (req, res) => {
         });
       }
 
-      if (total > account.balance) {
-        l.error("amount exceeds balance", amount, fee, account.balance);
-        throw new Error("low balance");
-      } else if (total + conversionFee > account.balance) {
-        l.error("total (after conversion fee) exceeds balance", amount, fee, account.balance);
-        throw new Error("low balance (after conversion fee)");
-      }
-
       // use user's credits to reduce fee, if available
       let conversionFeeDeduction = Math.min(account.btc_credits, conversionFee);
       if (conversionFeeDeduction) {
@@ -74,6 +66,14 @@ module.exports = ah(async (req, res) => {
         conversionFee -= conversionFeeDeduction;
       }
 
+      if (total > account.balance) {
+        l.error("amount exceeds balance", amount, fee, account.balance);
+        throw new Error("low balance");
+      } else if (total + conversionFee > account.balance) {
+        l.error("total (after conversion fee) exceeds balance", amount, fee, account.balance);
+        throw new Error("low balance (after conversion fee)");
+      }
+
       await account.decrement({ balance: (total + conversionFee) }, { transaction });
       await account.reload({ transaction });
 
diff --git a/routes/liquid/send.js b/routes/liquid/send.js
index 5cda8ba5..254972ad 100644
--- a/routes/liquid/send.js
+++ b/routes/liquid/send.js
@@ -105,6 +105,14 @@ sendLiquid = async ({ asset, amount, user, address, memo, tx, limit }) => {
             transaction
           });
 
+          // use user's credits to reduce fee, if available
+          let conversionFeeDeduction = Math.min(account.liquid_credits, conversionFee);
+          if (conversionFeeDeduction) {
+            await account.decrement({ liquid_credits: conversionFeeDeduction }, { transaction });
+            await account.reload({ transaction });
+            conversionFee -= conversionFeeDeduction;
+          }
+
           if (total > account.balance) {
             l.warn("amount exceeds balance", {
               total,
@@ -130,14 +138,6 @@ sendLiquid = async ({ asset, amount, user, address, memo, tx, limit }) => {
             );
           }
 
-          // use user's credits to reduce fee, if available
-          let conversionFeeDeduction = Math.min(account.liquid_credits, conversionFee);
-          if (conversionFeeDeduction) {
-            await account.decrement({ liquid_credits: conversionFeeDeduction }, { transaction });
-            await account.reload({ transaction });
-            conversionFee -= conversionFeeDeduction;
-          }
-
           await account.decrement({ balance: (total + conversionFee)}, { transaction });
           await account.reload({ transaction });
 
diff --git a/routes/lnurl.js b/routes/lnurl.js
index 49212330..93d939f9 100644
--- a/routes/lnurl.js
+++ b/routes/lnurl.js
@@ -420,13 +420,6 @@ lnurlServer.bindToHook(
               transaction
             });
 
-            if (account.balance < amount) {
-              throw new Error("Insufficient funds");
-            } else if (account.balance < amount + conversionFee) {
-              throw new Error("Insufficient funds for conversion fee");
-            }
-
-            // use user's credits to reduce fee, if available
             let conversionFeeDeduction = Math.min(account.lightning_credits, conversionFee);
             if (conversionFeeDeduction) {
               await account.decrement({ lightning_credits: conversionFeeDeduction }, { transaction });
@@ -434,6 +427,12 @@ lnurlServer.bindToHook(
               conversionFee -= conversionFeeDeduction;
             }
 
+            if (account.balance < amount) {
+              throw new Error("Insufficient funds");
+            } else if (account.balance < amount + conversionFee) {
+              throw new Error("Insufficient funds for conversion fee");
+            }
+
             let fee_payment_id = null;
             if (conversionFee) {
               await receiverAccount.increment({ balance: conversionFee }, { transaction });