fix(transfer): #2480 transfer limits for classic denomination

Author: pwltr

src/hooks/transfer.ts

@@ -2,8 +2,9 @@ import { useEffect, useState } from 'react';
 
 import { blocktankInfoSelector } from '../store/reselect/blocktank';
 import { blocktankChannelsSizeSelector } from '../store/reselect/lightning';
+import { EConversionUnit } from '../store/types/wallet';
 import { estimateOrderFee } from '../utils/blocktank';
-import { fiatToBitcoinUnit } from '../utils/conversion';
+import { convertToSats } from '../utils/conversion';
 import { useAppSelector } from './redux';
 
 type TTransferValues = {
@@ -17,9 +18,9 @@ const getDefaultLspBalance = (
 	clientBalance: number,
 	maxLspBalance: number,
 ): number => {
-	const threshold1 = fiatToBitcoinUnit({ amount: 225, currency: 'EUR' });
-	const threshold2 = fiatToBitcoinUnit({ amount: 495, currency: 'EUR' });
-	const defaultLspBalance = fiatToBitcoinUnit({ amount: 450, currency: 'EUR' });
+	const threshold1 = convertToSats(225, EConversionUnit.fiat, 'EUR');
+	const threshold2 = convertToSats(495, EConversionUnit.fiat, 'EUR');
+	const defaultLspBalance = convertToSats(450, EConversionUnit.fiat, 'EUR');
 
 	let lspBalance = defaultLspBalance - clientBalance;
 

src/utils/blocktank/index.ts

@@ -387,59 +387,3 @@ export const logToBlocktank = async (
 ): Promise<void> => {
 	return bt.bitkitLog(nodeId, message);
 };
-
-/**
- * Returns Blocktank spending limits in sats, USD & the user's selectedCurrency.
- * CURRENTLY UNUSED
- * @param selectedCurrency
- */
-// export const getSpendingLimits = ({
-// 	selectedCurrency,
-// }: {
-// 	selectedCurrency?: string;
-// }): {
-// 	currentBalance: IDisplayValues;
-// 	spendableBalanceSats: number;
-// 	spendableBalanceFiat: number;
-// 	usdSpendingLimitFiat: number;
-// 	spendingLimitSats: number;
-// 	selectedCurrencySpendingLimitFiat: number;
-// } => {
-// 	if (!selectedCurrency) {
-// 		selectedCurrency = getSettingsStore().selectedCurrency;
-// 	}
-// 	const usdMax = 1000;
-// 	const denominator = 1.2;
-
-// 	const currentBalance = getBalance({ onchain: true });
-// 	const spendableBalanceSats = Math.round(
-// 		currentBalance.satoshis / denominator,
-// 	);
-// 	const spendableBalanceFiat = Math.round(
-// 		currentBalance.fiatValue / denominator,
-// 	);
-// 	const usdSpendingLimitFiat =
-// 		spendableBalanceFiat < usdMax ? spendableBalanceFiat : usdMax;
-// 	const spendingLimitSats = fiatToBitcoinUnit({
-// 		fiatValue: usdSpendingLimitFiat,
-// 		bitcoinUnit: EBitcoinUnit.satoshi,
-// 		currency: 'USD',
-// 	});
-// 	const selectedCurrencySpendingLimitFiat = getFiatDisplayValues({
-// 		satoshis:
-// 			spendableBalanceSats < spendingLimitSats
-// 				? spendableBalanceSats
-// 				: spendingLimitSats,
-// 		bitcoinUnit: EBitcoinUnit.satoshi,
-// 		currency: selectedCurrency,
-// 	});
-// 	return {
-// 		currentBalance,
-// 		spendableBalanceSats,
-// 		spendableBalanceFiat,
-// 		usdSpendingLimitFiat,
-// 		spendingLimitSats,
-// 		selectedCurrencySpendingLimitFiat:
-// 			selectedCurrencySpendingLimitFiat.fiatValue,
-// 	};
-// };

src/utils/conversion.ts

@@ -28,6 +28,7 @@ export const satsToBtc = (balance: number): number => {
 export const convertToSats = (
 	value: number | string,
 	unit: EConversionUnit,
+	currency?: string,
 ): number => {
 	const amount = Number(value);
 
@@ -37,7 +38,7 @@ export const convertToSats = (
 
 	if (unit === EConversionUnit.fiat) {
 		const denomination = getSettingsStore().denomination;
-		const btcUnit = fiatToBitcoinUnit({ amount });
+		const btcUnit = fiatToBitcoinUnit({ amount, currency });
 		return denomination === EDenomination.modern ? btcUnit : btcToSats(btcUnit);
 	}