Merge pull request #2515 from synonymdev/fix/various-fixes

fix: various fixes

Author: pwltr

src/screens/Onboarding/Passphrase.tsx

@@ -105,7 +105,6 @@ const styles = StyleSheet.create({
 		flexGrow: 1,
 	},
 	scrollContent: {
-		flex: 1,
 		flexGrow: 1,
 	},
 	navigationContainer: {

src/screens/Settings/ElectrumConfig/index.tsx

@@ -53,7 +53,7 @@ const isValidURL = (data: string): boolean => {
 
 		// Allow standard domains, custom TLDs like .local, and IPv4 addresses
 		const isValidDomainOrIP = !!url.hostname.match(
-			/^([a-z\d]([a-z\d-]*[a-z\d])*\.[a-z\d-]+|(\d{1,3}\.){3}\d{1,3})$/i,
+			/^([a-z\d]([a-z\d-]*[a-z\d])*\.)+[a-z\d-]+|(\d{1,3}\.){3}\d{1,3}$/i,
 		);
 
 		// Always allow .local domains

src/screens/Wallets/LNURLPay/Amount.tsx

@@ -6,7 +6,7 @@ import React, {
 	useState,
 } from 'react';
 import { useTranslation } from 'react-i18next';
-import { StyleSheet, View } from 'react-native';
+import { StyleSheet, TouchableOpacity, View } from 'react-native';
 
 import BottomSheetNavigationHeader from '../../../components/BottomSheetNavigationHeader';
 import GradientView from '../../../components/GradientView';
@@ -25,7 +25,6 @@ import {
 	unitSelector,
 } from '../../../store/reselect/settings';
 import { IColors } from '../../../styles/colors';
-import { TouchableOpacity } from '../../../styles/components';
 import { Caption13Up } from '../../../styles/text';
 import { convertToSats } from '../../../utils/conversion';
 import { showToast } from '../../../utils/notifications';
@@ -34,6 +33,7 @@ import {
 	getEstimatedRoutingFee,
 	sendMax,
 } from '../../../utils/wallet/transactions';
+import AssetButton from '../AssetButton';
 import SendNumberPad from '../Send/SendNumberPad';
 import UnitButton from '../UnitButton';
 
@@ -125,6 +125,9 @@ const LNURLAmount = ({
 							/>
 						</TouchableOpacity>
 						<View style={styles.actionButtons}>
+							<View style={styles.actionButtonContainer}>
+								<AssetButton style={styles.actionButton} spending={true} />
+							</View>
 							<View style={styles.actionButtonContainer}>
 								<UnitButton
 									style={styles.actionButton}

src/screens/Wallets/LNURLWithdraw/Amount.tsx

@@ -7,7 +7,7 @@ import React, {
 	useEffect,
 } from 'react';
 import { useTranslation } from 'react-i18next';
-import { StyleSheet, View } from 'react-native';
+import { StyleSheet, TouchableOpacity, View } from 'react-native';
 
 import BottomSheetNavigationHeader from '../../../components/BottomSheetNavigationHeader';
 import GradientView from '../../../components/GradientView';
@@ -25,11 +25,11 @@ import {
 	unitSelector,
 } from '../../../store/reselect/settings';
 import { IColors } from '../../../styles/colors';
-import { TouchableOpacity } from '../../../styles/components';
 import { Caption13Up } from '../../../styles/text';
 import { convertToSats } from '../../../utils/conversion';
 import { getNumberPadText } from '../../../utils/numberpad';
 import { sendMax } from '../../../utils/wallet/transactions';
+import AssetButton from '../AssetButton';
 import SendNumberPad from '../Send/SendNumberPad';
 import UnitButton from '../UnitButton';
 
@@ -103,6 +103,9 @@ const Amount = ({
 							/>
 						</TouchableOpacity>
 						<View style={styles.actionButtons}>
+							<View style={styles.actionButtonContainer}>
+								<AssetButton style={styles.actionButton} spending={true} />
+							</View>
 							<View style={styles.actionButtonContainer}>
 								<UnitButton
 									style={styles.actionButton}

src/screens/Wallets/Send/Amount.tsx

@@ -8,7 +8,7 @@ import React, {
 	useEffect,
 } from 'react';
 import { useTranslation } from 'react-i18next';
-import { StyleSheet, View } from 'react-native';
+import { StyleSheet, TouchableOpacity, View } from 'react-native';
 
 import BottomSheetNavigationHeader from '../../../components/BottomSheetNavigationHeader';
 import ContactImage from '../../../components/ContactImage';
@@ -42,7 +42,6 @@ import {
 	utxosSelector,
 } from '../../../store/reselect/wallet';
 import { IColors } from '../../../styles/colors';
-import { TouchableOpacity } from '../../../styles/components';
 import { Caption13Up } from '../../../styles/text';
 import { convertToSats } from '../../../utils/conversion';
 import { showToast } from '../../../utils/notifications';
@@ -257,7 +256,7 @@ const Amount = ({ navigation }: SendScreenProps<'Amount'>): ReactElement => {
 
 				<View style={styles.numberPad} testID="SendAmountNumberPad">
 					<View style={styles.actions}>
-						<TouchableOpacity color="transparent" onPress={onMaxAmount}>
+						<TouchableOpacity onPress={onMaxAmount}>
 							<Caption13Up style={styles.availableAmountText} color="secondary">
 								{t('send_available')}
 							</Caption13Up>

src/utils/lightning/index.ts

@@ -1664,17 +1664,6 @@ export const recoverOutputsFromForceClose = async (): Promise<
 	return await lm.recoverOutputsFromForceClose();
 };
 
-/**
- * Returns total reserve balance for all open lightning channels.
- * @returns {number}
- */
-export const getLightningReserveBalance = (): number => {
-	const openChannels = getOpenChannels();
-	const result = reduceValue(openChannels, 'unspendable_punishment_reserve');
-	const reserveBalance = result.isOk() ? result.value : 0;
-	return reserveBalance;
-};
-
 /**
  * Returns the claimable balance for all lightning channels.
  * @param {boolean} [ignoreOpenChannels]
@@ -1798,3 +1787,24 @@ export const getLightningBalance = ({
 
 	return { localBalance, remoteBalance };
 };
+
+/**
+ * Returns total reserve balance for all open lightning channels.
+ * @returns {number}
+ */
+export const getLightningReserveBalance = (): number => {
+	const openChannels = getOpenChannels();
+	const result = reduceValue(openChannels, 'unspendable_punishment_reserve');
+	const reserveBalance = result.isOk() ? result.value : 0;
+	return reserveBalance;
+};
+
+/**
+ * Returns total spending balance for all open lightning channels.
+ * @returns {number}
+ */
+export const getSpendingBalance = (): number => {
+	const { localBalance } = getLightningBalance();
+	const reserveBalance = getLightningReserveBalance();
+	return localBalance - reserveBalance;
+};

src/utils/scanner/scanner.ts

@@ -386,7 +386,7 @@ export const processPaymentData = async ({
 	skipLightning?: boolean;
 	showErrors?: boolean;
 }): Promise<Result<TPaymentUri>> => {
-	let { onchainBalance, spendingBalance } = getBalance();
+	let { onchainBalance, spendingBalance } = await getBalance();
 	const isUnified = data.type === EQRDataType.unified;
 	const isOnchain = data.type === EQRDataType.onchain;
 	const isLightning = data.type === EQRDataType.lightning;

src/utils/wallet/index.ts

@@ -1288,27 +1288,27 @@ export const getCurrentAddressIndex = async ({
  * @param {TWalletName} [selectedWallet]
  * @param {EAvailableNetwork} [selectedNetwork]
  */
-export const getBalance = ({
+export const getBalance = async ({
 	selectedWallet = getSelectedWallet(),
 	selectedNetwork = getSelectedNetwork(),
 }: {
 	selectedWallet?: TWalletName;
 	selectedNetwork?: EAvailableNetwork;
-} = {}): {
+} = {}): Promise<{
 	onchainBalance: number; // Total onchain funds
 	// lightningBalance: number; // Total lightning funds (spendable + reserved + claimable)
 	spendingBalance: number; // Share of lightning funds that are spendable
 	reserveBalance: number; // Share of lightning funds that are locked up in channels
 	// claimableBalance: number; // Funds that will be available after a channel opens/closes
 	spendableBalance: number; // Total spendable funds (onchain + spendable lightning)
 	// totalBalance: number; // Total funds (all of the above)
-} => {
+}> => {
 	const { currentWallet } = getCurrentWallet({
 		selectedWallet,
 		selectedNetwork,
 	});
 
-	const wallet = getOnChainWallet();
+	const wallet = await getOnChainWalletAsync();
 	const { localBalance } = getLightningBalance();
 	const reserveBalance = getLightningReserveBalance();
 	const spendingBalance = localBalance - reserveBalance;

src/utils/wallet/transactions.ts

@@ -26,11 +26,11 @@ import { EBackupCategory } from '../../store/types/backup';
 import { ETransactionSpeed } from '../../store/types/settings';
 import { reduceValue } from '../helpers';
 import i18n from '../i18n';
+import { getSpendingBalance } from '../lightning';
 import { EAvailableNetwork } from '../networks';
 import { showToast } from '../notifications';
 import { TRANSACTION_DEFAULTS } from './constants';
 import {
-	getBalance,
 	getOnChainWallet,
 	getOnChainWalletElectrum,
 	getOnChainWalletTransaction,
@@ -294,7 +294,7 @@ export const getMaxSendAmount = ({
 
 		if (method === 'lightning') {
 			// lightning transaction
-			const { spendingBalance } = getBalance();
+			const spendingBalance = getSpendingBalance();
 			const fee = getEstimatedRoutingFee(spendingBalance);
 			const amount = spendingBalance - fee;
 			const maxAmount = { amount, fee };
@@ -351,8 +351,7 @@ export const sendMax = async ({
 		// TODO: Re-work lightning transaction invoices once beignet migration is complete.
 		// Handle max toggle for lightning invoice
 		if (paymentMethod === 'lightning') {
-			const { spendingBalance } = getBalance();
-
+			const spendingBalance = getSpendingBalance();
 			const fee = getEstimatedRoutingFee(spendingBalance);
 			const amount = spendingBalance - fee;
 
@@ -457,7 +456,7 @@ export const updateSendAmount = ({
 
 	if (paymentMethod === 'lightning') {
 		// lightning transaction
-		const { spendingBalance } = getBalance();
+		const spendingBalance = getSpendingBalance();
 
 		if (amount > spendingBalance) {
 			return err(i18n.t('wallet:send_amount_error_balance'));