fix(lightning): update transfer to spending flow (#1499)

e2e/channels.e2e.js

@@ -129,7 +129,7 @@ d('LN Channel Onboarding', () => {
 
 			// Swipe to confirm (set x offset to avoid navigating back)
 			await element(by.id('GRAB')).swipe('right', 'slow', NaN, 0.8);
-			await waitFor(element(by.id('LightningSuccess')))
+			await waitFor(element(by.id('LightningSettingUp')))
 				.toBeVisible()
 				.withTimeout(10000);
 
@@ -183,7 +183,7 @@ d('LN Channel Onboarding', () => {
 
 			// Swipe to confirm (set x offset to avoid navigating back)
 			await element(by.id('GRAB')).swipe('right', 'slow', NaN, 0.8);
-			await waitFor(element(by.id('LightningSuccess')))
+			await waitFor(element(by.id('LightningSettingUp')))
 				.toBeVisible()
 				.withTimeout(10000);
 

package.json

@@ -49,7 +49,7 @@
     "@sayem314/react-native-keep-awake": "1.2.2",
     "@shopify/react-native-skia": "0.1.230",
     "@synonymdev/blocktank-client": "0.0.50",
-    "@synonymdev/blocktank-lsp-http-client": "^0.10.0",
+    "@synonymdev/blocktank-lsp-http-client": "0.13.1",
     "@synonymdev/feeds": "2.1.1",
     "@synonymdev/react-native-ldk": "0.0.127",
     "@synonymdev/react-native-lnurl": "0.0.7",
@@ -175,6 +175,7 @@
     "nano-staged": "^0.8.0",
     "node-fetch": "^2.6.7",
     "prettier": "^2.8.8",
+    "react-native-bundle-visualizer": "^3.1.3",
     "react-native-flipper": "0.212.0",
     "react-native-mmkv-flipper-plugin": "^1.0.0",
     "react-native-skia-stub": "0.0.1",

src/screens/Lightning/CustomConfirm.tsx

@@ -66,16 +66,15 @@ const CustomConfirm = ({
 			setLoading(false);
 			return;
 		}
-		const zeroConf = order.zeroConf && !res.value.useUnconfirmedInputs;
-		navigation.navigate(zeroConf ? 'SettingUp' : 'Success');
+		navigation.navigate('SettingUp');
 	};
 
 	const updateOrderExpiration = async (): Promise<void> => {
 		const purchaseResponse = await startChannelPurchase({
 			remoteBalance: order.clientBalanceSat,
 			localBalance: order.lspBalanceSat,
 			channelExpiry: Math.max(weeks, 1),
-			turboChannel: order.zeroConf,
+			zeroConfPayment: order.zeroConf,
 			selectedWallet,
 			selectedNetwork,
 		});

src/screens/Lightning/CustomSetup.tsx

@@ -403,7 +403,7 @@ const CustomSetup = ({
 			remoteBalance: spendingAmount!,
 			localBalance: amount,
 			channelExpiry: DEFAULT_CHANNEL_DURATION,
-			turboChannel:
+			zeroConfPayment:
 				spendingAmount! <= blocktankInfo.options.max0ConfClientBalanceSat,
 			selectedWallet,
 			selectedNetwork,

src/screens/Lightning/QuickConfirm.tsx

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

src/screens/Lightning/QuickSetup.tsx

@@ -136,7 +136,7 @@ const QuickSetup = ({
 			localBalance: lspBalance,
 			channelExpiry: DEFAULT_CHANNEL_DURATION,
 			lspNodeId: blocktankInfo.nodes[0].pubkey,
-			turboChannel:
+			zeroConfPayment:
 				spendingAmount <= blocktankInfo.options.max0ConfClientBalanceSat,
 		});
 

src/screens/Lightning/SettingUp.tsx

@@ -1,23 +1,23 @@
 import React, { ReactElement, memo, useCallback } from 'react';
 import { StyleSheet, View } from 'react-native';
-import { useAppSelector } from '../../hooks/redux';
-import { useTranslation } from 'react-i18next';
+import { Trans, useTranslation } from 'react-i18next';
 import { useFocusEffect } from '@react-navigation/native';
 import {
 	activateKeepAwake,
 	deactivateKeepAwake,
 } from '@sayem314/react-native-keep-awake';
 
-import { Display, Text01S } from '../../styles/text';
+import { Display, Text01B, Text01S } from '../../styles/text';
 import SafeAreaInset from '../../components/SafeAreaInset';
 import GlowingBackground from '../../components/GlowingBackground';
 import NavigationHeader from '../../components/NavigationHeader';
 import HourglassSpinner from '../../components/HourglassSpinner';
 import ProgressSteps from '../../components/ProgressSteps';
+import { useAppSelector } from '../../hooks/redux';
 import { lightningSettingUpStepSelector } from '../../store/reselect/user';
 import type { LightningScreenProps } from '../../navigation/types';
 
-const TIMEOUT_DELAY = 2 * 60 * 1000; // 2 minutes
+const TIMEOUT_DELAY = 10 * 60 * 1000; // 10 minutes
 
 const SettingUp = ({
 	navigation,
@@ -63,7 +63,11 @@ const SettingUp = ({
 			<View style={styles.content} testID="LightningSettingUp">
 				<Display color="purple">{t('setting_up_header')}</Display>
 				<Text01S style={styles.text} color="gray1">
-					{t('setting_up_text')}
+					<Trans
+						t={t}
+						i18nKey="setting_up_text"
+						components={{ highlight: <Text01B color="white" /> }}
+					/>
 				</Text01S>
 
 				<HourglassSpinner glowColor="purple" />

src/screens/Lightning/Success.tsx

@@ -1,6 +1,5 @@
 import React, { ReactElement, memo } from 'react';
-import { Trans, useTranslation } from 'react-i18next';
-import { Text01B } from '../../styles/text';
+import { useTranslation } from 'react-i18next';
 import InfoScreen from '../../components/InfoScreen';
 import type { LightningScreenProps } from '../../navigation/types';
 
@@ -22,13 +21,7 @@ const Success = ({
 			navTitle={t('add_instant_payments')}
 			displayBackButton={false}
 			title={t('result_header')}
-			description={
-				<Trans
-					t={t}
-					i18nKey="result_text"
-					components={{ highlight: <Text01B color="white" /> }}
-				/>
-			}
+			description={t('result_text')}
 			image={imageSrc}
 			buttonText={t('awesome')}
 			testID="LightningSuccess"

src/screens/Transfer/Setup.tsx

@@ -135,7 +135,7 @@ const Setup = ({ navigation }: TransferScreenProps<'Setup'>): ReactElement => {
 			selectedWallet,
 			remoteBalance,
 			localBalance,
-			turboChannel:
+			zeroConfPayment:
 				remoteBalance <= blocktankInfo.options.max0ConfClientBalanceSat,
 		});
 

src/store/shapes/blocktank.ts

@@ -30,12 +30,13 @@ export const defaultBlocktankInfoShape: IBtInfo = {
 		btc: '0.0.0',
 		ln2: '0.0.0',
 	},
-	// @ts-ignore
 	onchain: {
+		// @ts-ignore enum not exported from blocktank-lsp-http-client
+		network: 'mainnet',
 		feeRates: {
-			fast: 10,
-			mid: 5,
-			slow: 1,
+			fast: 0,
+			mid: 0,
+			slow: 0,
 			isHigh: false,
 		},
 	},

src/store/utils/blocktank.ts

@@ -221,6 +221,7 @@ export const startChannelPurchase = async ({
 	lspNodeId,
 	couponCode,
 	turboChannel = true,
+	zeroConfPayment = false,
 	selectedWallet,
 	selectedNetwork,
 }: {
@@ -230,6 +231,7 @@ export const startChannelPurchase = async ({
 	lspNodeId?: string;
 	couponCode?: string;
 	turboChannel?: boolean;
+	zeroConfPayment?: boolean;
 	selectedWallet?: TWalletName;
 	selectedNetwork?: EAvailableNetwork;
 }): Promise<
@@ -255,6 +257,7 @@ export const startChannelPurchase = async ({
 			lspNodeId,
 			couponCode,
 			turboChannel,
+			zeroConfPayment,
 		},
 	});
 	if (buyChannelResponse.isErr()) {

src/utils/blocktank/index.ts

@@ -9,6 +9,7 @@ import {
 import { err, ok, Result } from '@synonymdev/result';
 import { CJitStateEnum } from '@synonymdev/blocktank-lsp-http-client/dist/shared/CJitStateEnum';
 import { BtOpenChannelState } from '@synonymdev/blocktank-lsp-http-client/dist/shared/BtOpenChannelState';
+import { IBt0ConfMinTxFeeWindow } from '@synonymdev/blocktank-lsp-http-client/dist/shared/IBt0ConfMinTxFeeWindow';
 
 import { EAvailableNetwork } from '../networks';
 import { addPeers, getNodeId, refreshLdk } from '../lightning';
@@ -29,7 +30,6 @@ import { setGeoBlock } from '../../store/utils/user';
 import { refreshWallet } from '../wallet';
 import { DEFAULT_CHANNEL_DURATION } from '../../screens/Lightning/CustomConfirm';
 import { __BLOCKTANK_HOST__ } from '../../constants/env';
-import { IBt0ConfMinTxFeeWindow } from '@synonymdev/blocktank-lsp-http-client/dist/shared/IBt0ConfMinTxFeeWindow';
 
 const bt = new BlocktankClient();
 

src/utils/i18n/locales/en/lightning.json

@@ -35,13 +35,13 @@
 	"duration_text": "Choose the minimum number of weeks you want your connection to remain open.",
 	"duration_week": "{count, plural, one {week} other {weeks}}",
 	"setting_up_header": "Setting Up.",
-	"setting_up_text": "Please wait and keep Bitkit open while your Lightning connection is being set up. This process takes about a minute.",
-	"setting_up_step1": "Awaiting Payment",
+	"setting_up_text": "Please wait and keep Bitkit open while your Lightning connection is being set up. This process takes about <highlight>±10 minutes.</highlight>",
+	"setting_up_step1": "Processing Payment",
 	"setting_up_step2": "Payment Successful",
 	"setting_up_step3": "Queued For Opening",
 	"setting_up_step4": "Opening Connection",
-	"result_header": "Connecting.",
-	"result_text": "Lightning connection initiated. You will be able to use instant payments in <highlight>±10 minutes.</highlight>",
+	"result_header": "Connected.",
+	"result_text": "Your Lightning connection is ready to use.",
 	"timeout_header": "Please keep Bitkit open.",
 	"timeout_text": "Bitkit will keep trying to open your Lightning connection in the background. Please keep the app open.",
 	"awesome": "Awesome!",
@@ -125,7 +125,7 @@
 	"order_expired_title": "Instant Payments Setup Failed",
 	"order_expired_msg": "The setup process expired. Please try again.",
 	"order_state": {
-		"awaiting_payment": "Awaiting payment",
+		"awaiting_payment": "Processing payment",
 		"paid": "Payment successful",
 		"refunded": "Payment refunded",
 		"queued": "Queued for opening",