Merge branch 'master' into release-v1.0.4

Author: Jasonvdb

__tests__/reselect.ts

@@ -5,7 +5,11 @@ import '../src/utils/i18n';
 import store, { RootState } from '../src/store';
 import { dispatch } from '../src/store/helpers';
 import { updateWallet } from '../src/store/slices/wallet';
-import { TBalance, balanceSelector } from '../src/store/reselect/aggregations';
+import {
+	TBalance,
+	balanceSelector,
+	transferLimitsSelector,
+} from '../src/store/reselect/aggregations';
 import {
 	EChannelClosureReason,
 	EChannelStatus,
@@ -117,4 +121,76 @@ describe('Reselect', () => {
 			assert.deepEqual(balanceSelector(state), balance);
 		});
 	});
+
+	describe('transferLimitsSelector', () => {
+		it('should calculate limits without LN channels', () => {
+			// max value is limited by maxChannelSize / 2
+			const s1 = cloneDeep(s);
+			s1.wallet.wallets.wallet0.balance.bitcoinRegtest = 1000;
+			s1.blocktank.info.options = {
+				...s1.blocktank.info.options,
+				minChannelSizeSat: 10,
+				maxChannelSizeSat: 200,
+				maxClientBalanceSat: 100,
+			};
+
+			const received1 = transferLimitsSelector(s1);
+			const expected1 = {
+				minChannelSize: 11,
+				maxChannelSize: 180,
+				maxClientBalance: 90,
+			};
+
+			expect(received1).toMatchObject(expected1);
+
+			// max value is limited by onchain balance
+			const s2 = cloneDeep(s);
+			s2.wallet.wallets.wallet0.balance.bitcoinRegtest = 50;
+			s2.blocktank.info.options = {
+				...s2.blocktank.info.options,
+				minChannelSizeSat: 10,
+				maxChannelSizeSat: 200,
+				maxClientBalanceSat: 100,
+			};
+
+			const received2 = transferLimitsSelector(s2);
+			const expected2 = {
+				minChannelSize: 11,
+				maxChannelSize: 180,
+				maxClientBalance: 40,
+			};
+
+			expect(received2).toMatchObject(expected2);
+		});
+
+		it('should calculate limits with existing LN channels', () => {
+			// max value is limited by leftover node capacity
+			const s1 = cloneDeep(s);
+			s1.wallet.wallets.wallet0.balance.bitcoinRegtest = 1000;
+			s1.blocktank.info.options = {
+				...s1.blocktank.info.options,
+				minChannelSizeSat: 10,
+				maxChannelSizeSat: 200,
+			};
+			const channel1 = {
+				channel_id: 'channel1',
+				status: EChannelStatus.open,
+				is_channel_ready: true,
+				outbound_capacity_sat: 1,
+				balance_sat: 2,
+				channel_value_satoshis: 100,
+			} as TChannel;
+			const lnWallet = s1.lightning.nodes.wallet0;
+			lnWallet.channels.bitcoinRegtest = { channel1 };
+
+			const received1 = transferLimitsSelector(s1);
+			const expected1 = {
+				minChannelSize: 11,
+				maxChannelSize: 100,
+				maxClientBalance: 50,
+			};
+
+			expect(received1).toMatchObject(expected1);
+		});
+	});
 });

e2e/boost.e2e.js

@@ -52,15 +52,6 @@ d('Boost', () => {
 			return;
 		}
 
-		// switch off RBF mode
-		await element(by.id('Settings')).tap();
-		if (!__DEV__) {
-			await element(by.id('DevOptions')).multiTap(5); // enable dev mode
-		}
-		await element(by.id('DevSettings')).tap();
-		await element(by.id('RBF')).tap();
-		await launchAndWait();
-
 		// fund the wallet
 		await element(by.id('Receive')).tap();
 		let { label: wAddress } = await element(by.id('QRCode')).getAttributes();
@@ -85,10 +76,11 @@ d('Boost', () => {
 		await sleep(500); // wait for keyboard to hide
 		await element(by.id('AddressContinue')).tap();
 		await element(by.id('N1').withAncestor(by.id('SendAmountNumberPad'))).tap();
-		await element(by.id('N0').withAncestor(by.id('SendAmountNumberPad'))).tap();
-		await element(
-			by.id('N000').withAncestor(by.id('SendAmountNumberPad')),
-		).tap();
+		for (let i = 0; i < 4; i++) {
+			await element(
+				by.id('N0').withAncestor(by.id('SendAmountNumberPad')),
+			).tap();
+		}
 		await expect(element(by.text('10 000'))).toBeVisible();
 		await element(by.id('ContinueAmount')).tap();
 		await element(by.id('GRAB')).swipe('right', 'slow', 0.95, 0.5, 0.5); // Swipe to confirm
@@ -172,6 +164,15 @@ d('Boost', () => {
 			return;
 		}
 
+		// switch to RBF mode
+		await element(by.id('Settings')).tap();
+		if (!__DEV__) {
+			await element(by.id('DevOptions')).multiTap(5); // enable dev mode
+		}
+		await element(by.id('DevSettings')).tap();
+		await element(by.id('RBF')).tap();
+		await launchAndWait();
+
 		// fund the wallet
 		await element(by.id('Receive')).tap();
 		let { label: wAddress } = await element(by.id('QRCode')).getAttributes();
@@ -196,10 +197,11 @@ d('Boost', () => {
 		await sleep(500); // wait for keyboard to hide
 		await element(by.id('AddressContinue')).tap();
 		await element(by.id('N1').withAncestor(by.id('SendAmountNumberPad'))).tap();
-		await element(by.id('N0').withAncestor(by.id('SendAmountNumberPad'))).tap();
-		await element(
-			by.id('N000').withAncestor(by.id('SendAmountNumberPad')),
-		).tap();
+		for (let i = 0; i < 4; i++) {
+			await element(
+				by.id('N0').withAncestor(by.id('SendAmountNumberPad')),
+			).tap();
+		}
 		await expect(element(by.text('10 000'))).toBeVisible();
 		await element(by.id('ContinueAmount')).tap();
 		await element(by.id('GRAB')).swipe('right', 'slow', 0.95, 0.5, 0.5); // Swipe to confirm

e2e/channels.e2e.js

@@ -53,7 +53,7 @@ d('LN Channel Onboarding', () => {
 		// Advanced
 		// - can change amount
 
-		it('Can buy a channel via the SpendingAmount and CustomSetup', async () => {
+		it('Can buy a channel with default and custom receive capacity', async () => {
 			if (checkComplete('channels-1')) {
 				return;
 			}
@@ -99,7 +99,7 @@ d('LN Channel Onboarding', () => {
 			await element(by.id('NavigationBack')).tap();
 			await element(by.id('SpendingIntro-button')).tap();
 
-			// NumberPad
+			// can change amount
 			await element(by.id('N2').withAncestor(by.id('SpendingAmount'))).tap();
 			await element(by.id('N0').withAncestor(by.id('SpendingAmount'))).multiTap(
 				5,
@@ -116,7 +116,7 @@ d('LN Channel Onboarding', () => {
 				.toBeVisible()
 				.withTimeout(10000);
 
-			// Advanced
+			// Get another channel with custom receiving capacity
 			await element(by.id('NavigationClose')).tap();
 			await element(by.id('ActivitySavings')).tap();
 			await element(by.id('TransferToSpending')).tap();
@@ -130,23 +130,42 @@ d('LN Channel Onboarding', () => {
 			await element(by.id('SpendingConfirmAdvanced')).tap();
 
 			// Receiving Capacity
-			await element(by.id('SpendingAdvancedDefault')).tap();
-			await expect(element(by.text('100 000'))).toBeVisible();
+			// can continue with min amount
 			await element(by.id('SpendingAdvancedMin')).tap();
-			await expect(element(by.text('2 000'))).toBeVisible();
-			await element(
-				by.id('NRemove').withAncestor(by.id('SpendingAdvanced')),
-			).multiTap(5);
+			await expect(element(by.text('110 000'))).toBeVisible();
+			await element(by.id('SpendingAdvancedContinue')).tap();
+			await element(by.id('SpendingConfirmDefault')).tap();
+			await element(by.id('SpendingConfirmAdvanced')).tap();
+
+			// can continue with default amount
+			await element(by.id('SpendingAdvancedDefault')).tap();
+			await element(by.id('SpendingAdvancedContinue')).tap();
+			await element(by.id('SpendingConfirmDefault')).tap();
+			await element(by.id('SpendingConfirmAdvanced')).tap();
+
+			// can continue with max amount
+			await element(by.id('SpendingAdvancedMax')).tap();
+			await element(by.id('SpendingAdvancedContinue')).tap();
+			await element(by.id('SpendingConfirmDefault')).tap();
+			await element(by.id('SpendingConfirmAdvanced')).tap();
+
+			// can set custom amount
 			await element(by.id('N1').withAncestor(by.id('SpendingAdvanced'))).tap();
 			await element(by.id('N5').withAncestor(by.id('SpendingAdvanced'))).tap();
 			await element(
 				by.id('N0').withAncestor(by.id('SpendingAdvanced')),
 			).multiTap(4);
 			await element(by.id('SpendingAdvancedContinue')).tap();
-			await element(by.id('SpendingAdvancedAmount')).tap();
-			await expect(element(by.text('100 000'))).toBeVisible();
-			// Receiving capacity minus reserve
-			await expect(element(by.text('147 500'))).toBeVisible();
+			await expect(
+				element(
+					by.text('100 000').withAncestor(by.id('SpendingConfirmChannel')),
+				),
+			).toBeVisible();
+			await expect(
+				element(
+					by.text('150 000').withAncestor(by.id('SpendingConfirmChannel')),
+				),
+			).toBeVisible();
 
 			// Swipe to confirm (set x offset to avoid navigating back)
 			await element(by.id('GRAB')).swipe('right', 'slow', 0.95, 0.5, 0.5);

src/assets/tos.tsx

@@ -213,7 +213,7 @@ const TOS = (): ReactElement => (
 		<P>5.3.3 Synonym may implement protective measures to ensure that any User does not breach any transactional limitations imposed thereon. The absence or ineffectiveness of any protective measures shall have no effect on the restrictions of any User pursuant to these Terms.</P>
 		<P>5.4 <U>Closure of Blocktank Connections:</U></P>
 		<P><I>In this section, we discuss how and when we may close Blocktank Connections. It is important to note that, whilst you may choose a minimum duration for your Blocktank Connection, we may keep Blocktank Connections open for longer than the minimum duration, at our discretion. You may request to close a Blocktank Connection as further described in this section. In certain circumstances, we may elect to close a Blocktank Connection, through cooperative or force close, before the Connection Duration expires. This section also sets out your and our rights and obligations, after a Blocktank Connection is closed.</I></P>
-		<P>5.4.1 Upon purchasing a Blocktank Connection, you shall be required to confirm how long you wish the Blocktank Connection to be open (the Connection Duration). The minimum configurable Connection Duration shall be four weeks and maximum configurable Connection Duration shall be 12 weeks, subject to the rights of Synonym to extend or reduce such maximum or minimum Connection Duration at any time, without notice to you and to otherwise close a Blocktank Connection pursuant to these Terms. Irrespective of any Connection Duration, Synonym may opt, in its sole discretion, to extend or reduce the duration of any Blocktank Connection in accordance with these Terms.</P>
+		<P>5.4.1 Upon purchasing a Blocktank Connection, you shall be required to confirm how long you wish the Blocktank Connection to be open (the Connection Duration). The configurable Connection Duration shall be 6 weeks, subject to the rights of Synonym to extend or reduce such maximum or minimum Connection Duration at any time, without notice to you and to otherwise close a Blocktank Connection pursuant to these Terms. Irrespective of any Connection Duration, Synonym may opt, in its sole discretion, to extend or reduce the duration of any Blocktank Connection in accordance with these Terms.</P>
 		<P>5.4.2 Notwithstanding the Connection Duration, you may request to close your Blocktank Connection at any time by utilising your preferred software to request a cooperative closure (a <B>“Closure Request”</B>). Synonym has no obligation to respond to, or cooperate with, any Closure Request. In the event that Synonym does not cooperate with any Closure Request, you may initiate a forced closure of a Blocktank Connection by submitting the latest state onto the Bitcoin on-chain network (a <B>“Force Close”</B>). Upon any request for a Force Close, you may be required to wait for a period of time (being not less than two weeks) before receiving any BTC standing to your credit in the Blocktank Connection. Synonym and its Associates shall have no liability or responsibility for any Losses directly or indirectly arising out of or related to a Force Close and any delays experienced by a User in receiving BTC as a result of any Force Close (including any fluctuations in the price of BTC during such time).</P>
 		<P>5.4.3 Notwithstanding the Connection Duration, Synonym retains the right to close a Blocktank Connection prior to the Connection Duration, through cooperative or Force Close, at its discretion. Synonym may utilise this right: (i) with your written consent (which may take the form of you providing a digital signature to authorise a cooperative settlement transaction); (ii) if Synonym determines or suspects that you have violated, breached, or acted inconsistent with any of these Terms or exposed Synonym or its Associates to civil, criminal, or administrative penalties or to Economic Sanctions or other restrictive trade measures or Losses pursuant to applicable Laws, or in connection with an investigation regarding any of the foregoing; (iii) if Synonym determines or suspects that any representations or warranties provided by you pursuant to these Terms are incorrect or later cease to be correct; (iv) as required under applicable Laws or pursuant to a request or demand by any Government; (v) if your Blocktank Connection has been inactive for fourteen or more days; (vi) to perform software upgrades that are incompatible with your Blocktank Connection as a result of any failure, malfunction, error, data loss or technical issue encountered by your Blocktank Connection, the Bitkit Wallet, or the Lightning Network or otherwise, or (vii) if otherwise permitted pursuant to these Terms.</P>
 		<P>5.4.4 Following expiry of the Connection Duration, Synonym has the right, but not the obligation, to close a Blocktank Connection, through cooperative or Force Close, at its discretion. Synonym retains the right to keep a Blocktank Connection open for an indefinite period, at its sole discretion. In order to request closure of a Blocktank Connection, you may follow the procedure set out in Section 5.4.2.</P>

src/components/LightningChannel.tsx

@@ -18,13 +18,15 @@ const LightningChannel = ({
 	status = 'pending',
 	showLabels = false,
 	style,
+	testID,
 }: {
 	capacity: number;
 	localBalance: number;
 	remoteBalance: number;
 	status?: TStatus;
 	showLabels?: boolean;
 	style?: StyleProp<ViewStyle>;
+	testID?: string;
 }): ReactElement => {
 	const { t } = useTranslation('lightning');
 
@@ -49,7 +51,9 @@ const LightningChannel = ({
 	};
 
 	return (
-		<View style={[status === 'pending' && styles.pending, style]}>
+		<View
+			style={[status === 'pending' && styles.pending, style]}
+			testID={testID}>
 			{showLabels && (
 				<View style={styles.labels}>
 					<Caption13Up color="secondary">{t('spending_label')}</Caption13Up>

src/components/OnboardingScreen.tsx

@@ -16,6 +16,7 @@ const OnboardingScreen = ({
 	buttonText,
 	displayBackButton = true,
 	disableNav = false,
+	mirrorImage = false,
 	testID,
 	onClosePress,
 	onButtonPress,
@@ -28,6 +29,7 @@ const OnboardingScreen = ({
 	buttonText: string;
 	displayBackButton?: boolean;
 	disableNav?: boolean;
+	mirrorImage?: boolean;
 	testID?: string;
 	onClosePress?: () => void;
 	onButtonPress: () => void;
@@ -51,6 +53,7 @@ const OnboardingScreen = ({
 						styles.imageContainer,
 						// eslint-disable-next-line react-native/no-inline-styles
 						{ marginBottom: imagePosition === 'center' ? 'auto' : 48 },
+						mirrorImage ? { transform: [{ rotateY: '180deg' }] } : {},
 					]}>
 					<Image style={styles.image} source={image} />
 				</View>

src/components/SwipeToConfirm.tsx

@@ -55,6 +55,7 @@ const SwipeToConfirm = ({
 	const loadingOpacity = useSharedValue(loading ? 1 : 0);
 
 	const panGesture = Gesture.Pan()
+		.enabled(!loading && !confirmed) // disable so you can't swipe back
 		.onStart(() => {
 			prevPanX.value = panX.value;
 		})
@@ -86,14 +87,28 @@ const SwipeToConfirm = ({
 	});
 
 	const startIconOpacityStyle = useAnimatedStyle(() => {
-		const opacity = 1 - panX.value / (maxPanX / 2);
+		let opacity = 1 - panX.value / (maxPanX / 2) - loadingOpacity.value;
+
+		// FIXME: for some reason, the opacity is sometimes ~500
+		// it happens when maxPanX is 1, so we check for that
+		if (opacity > 2) {
+			opacity = 0;
+		}
+
 		return { opacity };
 	});
 
 	// hide if loading is visible
 	const endIconOpacityStyle = useAnimatedStyle(() => {
-		const opacity =
+		let opacity =
 			(panX.value - maxPanX / 2) / (maxPanX / 2) - loadingOpacity.value;
+
+		// FIXME: for some reason, the opacity is sometimes ~500
+		// it happens when maxPanX is 1, so we check for that
+		if (opacity > 2) {
+			opacity = 0;
+		}
+
 		return { opacity };
 	});
 
@@ -103,7 +118,7 @@ const SwipeToConfirm = ({
 
 	useEffect(() => {
 		loadingOpacity.value = withTiming(loading ? 1 : 0, {
-			duration: 300,
+			duration: 500,
 		});
 	}, [loading, loadingOpacity]);
 
@@ -183,6 +198,7 @@ const styles = StyleSheet.create({
 		borderRadius: CIRCLE_SIZE,
 	},
 	icon: {
+		opacity: 0,
 		position: 'absolute',
 		left: 0,
 		top: 0,

src/components/TabBar.tsx

@@ -14,8 +14,8 @@ import { receiveIcon, sendIcon } from '../assets/icons/tabs';
 import { toggleBottomSheet } from '../store/utils/ui';
 import { resetSendTransaction } from '../store/actions/wallet';
 import { viewControllersSelector } from '../store/reselect/ui';
+import { spendingOnboardingSelector } from '../store/reselect/aggregations';
 import useColors from '../hooks/colors';
-import { useBalance } from '../hooks/wallet';
 import { useAppSelector } from '../hooks/redux';
 import { ScanIcon } from '../styles/icons';
 import { AnimatedView } from '../styles/components';
@@ -30,9 +30,9 @@ const TabBar = ({
 }): ReactElement => {
 	const { white10 } = useColors();
 	const insets = useSafeAreaInsets();
-	const { lightningBalance } = useBalance();
 	const { t } = useTranslation('wallet');
 	const viewControllers = useAppSelector(viewControllersSelector);
+	const isSpendingOnboarding = useAppSelector(spendingOnboardingSelector);
 
 	const shouldHide = useMemo(() => {
 		const activityFilterSheets = ['timeRangePrompt', 'tagsPrompt'];
@@ -42,7 +42,8 @@ const TabBar = ({
 	const onReceivePress = (): void => {
 		const currentRoute = rootNavigation.getCurrenRoute();
 
-		if (currentRoute === 'ActivitySpending' && lightningBalance === 0) {
+		// if we are on the spending screen and the user has not yet received funds
+		if (currentRoute === 'ActivitySpending' && isSpendingOnboarding) {
 			toggleBottomSheet('receiveNavigation', {
 				receiveScreen: 'ReceiveAmount',
 			});