@riocrypto/common-server 1.0.777 → 1.0.779

package/build/helpers/get-network-fees.js

@@ -16,10 +16,16 @@ const ccxt_client_1 = require("../clients/ccxt-client");
 const getNetworkFees = (crypto, cryptoPrice, conversionRateToUSD) => __awaiter(void 0, void 0, void 0, function* () {
     let withdrawFee;
     const fireblocksClient = yield (0, fireblocks_client_1.buildFireblocksClient)();
-    if (crypto === common_1.Crypto.USDCPolygon || crypto === common_1.Crypto.USDCSolana) {
-        const address = crypto === common_1.Crypto.USDCPolygon
-            ? "0x66ECBd38905CC32249ddd6f4f0B4A3DdDDCbd608"
-            : "HN7cABqLq46Es1jh92dQQisAq662SmxELLLsHHe4YWrH";
+    if ([
+        common_1.Crypto.USDTEthereum,
+        common_1.Crypto.USDCPolygon,
+        common_1.Crypto.USDTPolygon,
+        common_1.Crypto.USDTEthereum,
+        common_1.Crypto.USDTEthereum,
+    ].includes(crypto)) {
+        const address = crypto === common_1.Crypto.USDCSolana
+            ? "HN7cABqLq46Es1jh92dQQisAq662SmxELLLsHHe4YWrH"
+            : "0x66ECBd38905CC32249ddd6f4f0B4A3DdDDCbd608";
         withdrawFee = yield fireblocksClient.estimateWithdrawFee(crypto, address, 100);
         if (!withdrawFee) {
             throw new Error("Withdraw fee not set");

package/build/helpers/get-platform-and-partner-fees.js

@@ -61,6 +61,32 @@ const getPlatformAndPartnerFees = (mongoose, amountFiat, fiat, processor, countr
         platformFeeFiat = amountFiat * netPlatformFee;
         partnerFeeFiat = amountFiat * partner.partnerFee;
     }
+    else if (brokerId) {
+        const User = (0, user_1.buildUser)(mongoose);
+        const brokerCustomer = yield User.findById(brokerId);
+        if (!brokerCustomer) {
+            throw new Error("Broker customer not found");
+        }
+        if (brokerCustomer === null || brokerCustomer === void 0 ? void 0 : brokerCustomer.platformFeeRanges) {
+            for (const range of brokerCustomer.platformFeeRanges) {
+                if (range.min <= Number(amountUSD) && range.max >= Number(amountUSD)) {
+                    if (discount) {
+                        if (discount > range.fee) {
+                            throw new Error("Discount cannot be greater than platform fee");
+                        }
+                        else {
+                            const netFee = range.fee - discount;
+                            platformFeeFiat = amountFiat * netFee;
+                        }
+                    }
+                    else {
+                        platformFeeFiat = amountFiat * range.fee;
+                    }
+                    break;
+                }
+            }
+        }
+    }
     else if (user === null || user === void 0 ? void 0 : user.platformFeeRanges) {
         let volume;
         if ((_a = user === null || user === void 0 ? void 0 : user.attributes) === null || _a === void 0 ? void 0 : _a.includes(common_1.UserAttribute.summedVolumeFees)) {
@@ -105,32 +131,6 @@ const getPlatformAndPartnerFees = (mongoose, amountFiat, fiat, processor, countr
         platformFeeFiat = amountFiat * netPlatformFee;
         partnerFeeFiat = 0;
     }
-    if (brokerId && !platformFeeFiat) {
-        const User = (0, user_1.buildUser)(mongoose);
-        const brokerCustomer = yield User.findById(brokerId);
-        if (!brokerCustomer) {
-            throw new Error("Broker customer not found");
-        }
-        if (brokerCustomer === null || brokerCustomer === void 0 ? void 0 : brokerCustomer.platformFeeRanges) {
-            for (const range of brokerCustomer.platformFeeRanges) {
-                if (range.min <= Number(amountUSD) && range.max >= Number(amountUSD)) {
-                    if (discount) {
-                        if (discount > range.fee) {
-                            throw new Error("Discount cannot be greater than platform fee");
-                        }
-                        else {
-                            const netFee = range.fee - discount;
-                            platformFeeFiat = amountFiat * netFee;
-                        }
-                    }
-                    else {
-                        platformFeeFiat = amountFiat * range.fee;
-                    }
-                    break;
-                }
-            }
-        }
-    }
     if ((fiat === common_1.Fiat.MXN && processor === common_1.Processor.SPEI) ||
         (fiat === common_1.Fiat.USD && processor === common_1.Processor.SPID)) {
         if (country === common_1.Country.Mexico) {
@@ -143,7 +143,7 @@ const getPlatformAndPartnerFees = (mongoose, amountFiat, fiat, processor, countr
         }
     }
     return {
-        platformFeeFiat,
+        platformFeeFiat: platformFeeFiat,
         platformFeeFiatTax,
         partnerFeeFiat,
         feesComped,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@riocrypto/common-server",
-  "version": "1.0.777",
+  "version": "1.0.779",
   "description": "",
   "main": "./build/index.js",
   "types": "./build/index.d.ts",
@@ -24,7 +24,7 @@
     "@aws-sdk/client-s3": "^3.297.0",
     "@everapi/currencyapi-js": "^1.0.6",
     "@google-cloud/storage": "^6.9.5",
-    "@riocrypto/common": "^1.0.685",
+    "@riocrypto/common": "^1.0.687",
     "@types/express": "^4.17.13",
     "axios": "^0.27.2",
     "ccxt": "^3.0.30",