fix: do not show SettingUp screen in case of non 0conf BT order

Author: limpbrains

e2e/channels.e2e.js

@@ -131,6 +131,8 @@ d('LN Channel Onboarding', () => {
 				.toBeVisible()
 				.withTimeout(10000);
 
+			await rpc.generateToAddress(1, await rpc.getNewAddress());
+
 			// CustomSetup
 			await launchAndWait();
 			await waitFor(element(by.id('Suggestion-lightningSettingUp')))

src/screens/Lightning/CustomConfirm.tsx

@@ -72,7 +72,8 @@ const CustomConfirm = ({
 			setLoading(false);
 			return;
 		}
-		navigation.navigate('SettingUp');
+		const zeroConf = order.zeroConf && !res.value.useUnconfirmedInputs;
+		navigation.navigate(zeroConf ? 'SettingUp' : 'Success');
 	};
 
 	const updateOrderExpiration = async (): Promise<void> => {

src/screens/Lightning/QuickConfirm.tsx

@@ -73,7 +73,8 @@ const QuickConfirm = ({
 			setLoading(false);
 			return;
 		}
-		navigation.navigate('SettingUp');
+		const zeroConf = order?.zeroConf && !res.value.useUnconfirmedInputs;
+		navigation.navigate(zeroConf ? 'SettingUp' : 'Success');
 	};
 
 	return (

src/store/actions/blocktank.ts

@@ -3,7 +3,7 @@ import { err, ok, Result } from '@synonymdev/result';
 import actions from './actions';
 import { resetSendTransaction, updateSendTransaction } from './wallet';
 import { setLightningSettingUpStep } from './user';
-import { getBlocktankStore, getDispatch } from '../helpers';
+import { getBlocktankStore, getDispatch, getWalletStore } from '../helpers';
 import * as blocktank from '../../utils/blocktank';
 import {
 	createOrder,
@@ -370,7 +370,7 @@ export const confirmChannelPurchase = async ({
 	orderId: string;
 	selectedNetwork?: TAvailableNetworks;
 	selectedWallet?: TWalletName;
-}): Promise<Result<string>> => {
+}): Promise<Result<{ txid: string; useUnconfirmedInputs: boolean }>> => {
 	if (!selectedNetwork) {
 		selectedNetwork = getSelectedNetwork();
 	}
@@ -387,6 +387,11 @@ export const confirmChannelPurchase = async ({
 		});
 		return err(rawTx.error.message);
 	}
+
+	const useUnconfirmedInputs = getWalletStore().wallets[
+		selectedWallet!
+	].transaction[selectedNetwork!].inputs.some(({ height }) => height === 0);
+
 	const broadcastResponse = await broadcastTransaction({
 		rawTx: rawTx.value.hex,
 		subscribeToOutputAddress: false,
@@ -415,7 +420,7 @@ export const confirmChannelPurchase = async ({
 		selectedNetwork,
 	}).then();
 
-	return ok(broadcastResponse.value);
+	return ok({ txid: broadcastResponse.value, useUnconfirmedInputs });
 };
 
 /**