Merge pull request #1596 from synonymdev/update-fee-estimates

refactor(wallet): Update Fee Estimates
synonymdev · Mar 7, 2024 · b456386 · b456386
2 parents 098420a + b5b8e30
commit b456386
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 16 deletions.
diff --git a/src/screens/Settings/Fee/index.tsx b/src/screens/Settings/Fee/index.tsx
@@ -16,8 +16,7 @@ import {
 	updateOnchainFees,
 	updateOverrideFees,
 } from '../../../store/slices/fees';
-import { updateOnchainFeeEstimates } from '../../../store/utils/fees';
-import { selectedNetworkSelector } from '../../../store/reselect/wallet';
+import { refreshOnchainFeeEstimates } from '../../../store/utils/fees';
 import { EItemType, IListData } from '../../../components/List';
 import Button from '../../../components/Button';
 import SafeAreaInset from '../../../components/SafeAreaInset';
@@ -78,7 +77,6 @@ const FeeSettings = ({}: SettingsScreenProps<'FeeSettings'>): ReactElement => {
 	const dispatch = useAppDispatch();
 	const fees = useAppSelector(onChainFeesSelector);
 	const override = useAppSelector(overrideFeeSelector);
-	const selectedNetwork = useAppSelector(selectedNetworkSelector);
 	const [loading, setLoading] = useState(false);
 
 	const handleMinus = (title: string): void => {
@@ -140,7 +138,7 @@ const FeeSettings = ({}: SettingsScreenProps<'FeeSettings'>): ReactElement => {
 						value: updated,
 						type: EItemType.textButton,
 						onPress: (): void => {
-							updateOnchainFeeEstimates({ selectedNetwork, forceUpdate: true });
+							refreshOnchainFeeEstimates({ forceUpdate: true });
 						},
 					},
 					{
@@ -154,7 +152,7 @@ const FeeSettings = ({}: SettingsScreenProps<'FeeSettings'>): ReactElement => {
 				],
 			},
 		];
-	}, [override, fees, tTime, selectedNetwork, dispatch]);
+	}, [override, fees, tTime, dispatch]);
 
 	return (
 		<ThemedView style={styles.container}>

diff --git a/src/store/utils/fees.ts b/src/store/utils/fees.ts
@@ -4,7 +4,7 @@ import { dispatch, getFeesStore } from '../helpers';
 import { updateOnchainFees } from '../slices/fees';
 import { getFeeEstimates } from '../../utils/wallet/transactions';
 import { EAvailableNetwork } from '../../utils/networks';
-import { getSelectedNetwork } from '../../utils/wallet';
+import { getOnChainWallet, getSelectedNetwork } from '../../utils/wallet';
 import { IOnchainFees } from 'beignet';
 
 export const REFRESH_INTERVAL = 60 * 30; // in seconds, 30 minutes
@@ -19,18 +19,16 @@ export const updateOnchainFeeEstimates = async ({
 	feeEstimates?: IOnchainFees;
 }): Promise<Result<string>> => {
 	const feesStore = getFeesStore();
-	const timestamp = feesStore.onchain.timestamp;
-	const difference = Math.floor((Date.now() - timestamp) / 1000);
-
 	if (feesStore.override) {
 		return ok('On-chain fee estimates are overridden.');
 	}
 
-	if (!forceUpdate && difference < REFRESH_INTERVAL) {
-		return ok('On-chain fee estimates are up to date.');
-	}
-
 	if (!feeEstimates) {
+		const timestamp = feesStore.onchain.timestamp;
+		const difference = Math.floor((Date.now() - timestamp) / 1000);
+		if (!forceUpdate && difference < REFRESH_INTERVAL) {
+			return ok('On-chain fee estimates are up to date.');
+		}
 		const feeEstimatesRes = await getFeeEstimates(selectedNetwork);
 		if (feeEstimatesRes.isErr()) {
 			return err(feeEstimatesRes.error);
@@ -42,3 +40,12 @@ export const updateOnchainFeeEstimates = async ({
 
 	return ok('Successfully updated on-chain fee estimates.');
 };
+
+export const refreshOnchainFeeEstimates = async ({
+	forceUpdate = false,
+}: {
+	forceUpdate?: boolean;
+}): Promise<Result<IOnchainFees>> => {
+	const wallet = getOnChainWallet();
+	return await wallet.updateFeeEstimates(forceUpdate);
+};
diff --git a/src/utils/lightning/index.ts b/src/utils/lightning/index.ts
@@ -91,7 +91,7 @@ import {
 	TLightningNodeVersion,
 } from '../../store/types/lightning';
 import { getBlocktankInfo, isGeoBlocked } from '../blocktank';
-import { updateOnchainFeeEstimates } from '../../store/utils/fees';
+import { refreshOnchainFeeEstimates } from '../../store/utils/fees';
 import { reportLdkChannelMigrations } from '../checks';
 import {
 	__BACKUPS_SERVER_HOST__,
@@ -1524,8 +1524,8 @@ export const closeAllChannels = async ({
 			return err(refreshRes.error.message);
 		}
 
-		// Update fees before closing channels
-		await updateOnchainFeeEstimates({ selectedNetwork, forceUpdate: true });
+		// Force update fees before closing channels
+		await refreshOnchainFeeEstimates({ forceUpdate: true });
 
 		const channelsUnableToCoopClose: TChannel[] = [];
 		await Promise.all(