fix(wallet): Update Lightning Setup Steps

synonymdev · Aug 24, 2023 · ca43c6a · ca43c6a
1 parent 572ca23
commit ca43c6a
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 5 deletions.
diff --git a/src/screens/Lightning/CustomConfirm.tsx b/src/screens/Lightning/CustomConfirm.tsx
@@ -74,7 +74,7 @@ const CustomConfirm = ({
 			setLoading(false);
 			return;
 		}
-		setLightningSettingUpStep(0);
+		setLightningSettingUpStep(1);
 		addTodo('lightningSettingUp');
 		navigation.navigate('SettingUp');
 	};

diff --git a/src/screens/Lightning/QuickConfirm.tsx b/src/screens/Lightning/QuickConfirm.tsx
@@ -75,7 +75,7 @@ const QuickConfirm = ({
 			setLoading(false);
 			return;
 		}
-		setLightningSettingUpStep(0);
+		setLightningSettingUpStep(1);
 		addTodo('lightningSettingUp');
 		navigation.navigate('SettingUp');
 	};

diff --git a/src/screens/Settings/Lightning/Channels.tsx b/src/screens/Settings/Lightning/Channels.tsx
@@ -93,8 +93,15 @@ const getPendingBlocktankChannels = (
 	const failedOrders: TChannel[] = [];
 
 	Object.keys(paidOrders).forEach((orderId) => {
-		const order = orders.find((o) => o.id === orderId)!;
-
+		let order = orders.find((o) => o.id === orderId)!;
+		if (!order) {
+			// In the event it was paid for using the old api.
+			// @ts-ignore
+			order = orders.find((o) => o?._id === orderId)!;
+			if (!order) {
+				return;
+			}
+		}
 		const fakeChannel: TChannel = {
 			channel_id: order.id,
 			confirmations: 0,

diff --git a/src/store/actions/blocktank.ts b/src/store/actions/blocktank.ts
@@ -84,10 +84,11 @@ export const refreshOrder = async (
 			order.payment.state === BtPaymentState.PAID &&
 			order.state !== BtOrderState.OPEN
 		) {
-			setLightningSettingUpStep(1);
+			setLightningSettingUpStep(2);
 			const finalizeRes = await openChannel(orderId);
 			if (finalizeRes.isOk()) {
 				removeTodo('lightning');
+				setLightningSettingUpStep(3);
 				const getUpdatedOrderResult = await blocktank.getOrder(orderId);
 				if (getUpdatedOrderResult.isErr()) {
 					return err(getUpdatedOrderResult.error.message);
@@ -299,6 +300,7 @@ export const confirmChannelPurchase = async ({
 	resetSendTransaction({ selectedWallet, selectedNetwork });
 
 	watchOrder(orderId).then();
+	setLightningSettingUpStep(0);
 	removeTodo('lightning');
 	refreshWallet({
 		onchain: true,