fix: various fixes

__tests__/todos.ts

@@ -32,7 +32,7 @@ describe('Todos selector', () => {
 	let s: RootState;
 
 	beforeAll(async () => {
-		let res = await createNewWallet();
+		const res = await createNewWallet();
 		if (res.isErr()) {
 			throw res.error;
 		}
@@ -67,7 +67,7 @@ describe('Todos selector', () => {
 
 	it('should not return backupSeedPhraseTodo if backup is verified', () => {
 		const state = cloneDeep(s);
-		state.settings.backupVerified = true;
+		state.user.backupVerified = true;
 
 		expect(todosFullSelector(state)).not.toEqual(
 			expect.arrayContaining([backupSeedPhraseTodo]),

e2e/slashtags.e2e.js

@@ -144,6 +144,7 @@ d('Profile and Contacts', () => {
 			await expect(element(by.text('WEBSITE'))).toExist();
 			await expect(element(by.text(satoshi.website))).toExist();
 			await element(by.id('NavigationBack')).tap();
+			await element(by.id('NavigationBack')).tap();
 
 			if (device.getPlatform() === 'ios') {
 				// FIXME: this bottom sheet should not appear

src/assets/tos.tsx

@@ -71,7 +71,7 @@ const BUI = ({ children }: Props): ReactElement => {
 const TOS = (): ReactElement => (
 	<View style={s.root}>
 		<P>
-			<B>Effective date: June 7, 2024</B>
+			<B>Effective date: February 4, 2025</B>
 		</P>
 		<P>
 			<B>
@@ -113,10 +113,9 @@ const TOS = (): ReactElement => (
 		</P>
 		<P>
 			<B>
-				FUNDS TRANSFERRED USING CAVEMAN JUST-IN-TIME CHANNELS BY THIRD PARTIES
-				MAY NOT BE DELIVERED TO YOU BY THE THIRD PARTY. YOU ARE REFERRED TO
-				CLAUSE 9.3 OF THE TERMS AS TO SYNONYM’S LIABILITY FOR THIRD PARTY
-				SERVICES.
+				FUNDS TRANSFERRED USING JUST-IN-TIME CHANNELS BY THIRD PARTIES MAY NOT
+				BE DELIVERED TO YOU BY THE THIRD PARTY. YOU ARE REFERRED TO CLAUSE 9.3
+				OF THE TERMS AS TO SYNONYM’S LIABILITY FOR THIRD PARTY SERVICES.
 			</B>
 		</P>
 		<P>

src/components/widgets/CalculatorWidget.tsx

@@ -1,4 +1,4 @@
-import React, { ReactElement, useState } from 'react';
+import React, { ReactElement, useEffect, useState } from 'react';
 import { StyleProp, StyleSheet, View, ViewStyle } from 'react-native';
 
 import { useCurrency } from '../../hooks/displayValues';
@@ -9,6 +9,8 @@ import { fiatToBitcoinUnit } from '../../utils/conversion';
 import { getDisplayValues } from '../../utils/displayValues';
 import BaseWidget from './BaseWidget';
 
+const MAX_BITCOIN = 2_100_000_000_000_000; // Maximum bitcoin amount in sats
+
 const CalculatorWidget = ({
 	isEditing = false,
 	style,
@@ -30,16 +32,58 @@ const CalculatorWidget = ({
 		return dv.fiatValue.toString();
 	});
 
+	// biome-ignore lint/correctness/useExhaustiveDependencies: update fiat amount when currency changes
+	useEffect(() => {
+		updateFiatAmount(bitcoinAmount);
+	}, [fiatTicker]);
+
 	const updateFiatAmount = (bitcoin: string) => {
-		const amount = Number(bitcoin);
-		const dv = getDisplayValues({ satoshis: amount, shouldRoundUpFiat: true });
+		// Remove leading zeros for positive numbers
+		const sanitizedBitcoin = bitcoin.replace(/^0+(?=\d)/, '');
+		const amount = Number(sanitizedBitcoin);
+		// Cap the amount at maximum bitcoin
+		const cappedAmount = Math.min(amount, MAX_BITCOIN);
+		const dv = getDisplayValues({
+			satoshis: cappedAmount,
+			shouldRoundUpFiat: true,
+		});
 		setFiatAmount(dv.fiatValue.toString());
+		// Update bitcoin amount if it was capped
+		if (cappedAmount !== amount) {
+			setBitcoinAmount(cappedAmount.toString());
+		}
 	};
 
 	const updateBitcoinAmount = (fiat: string) => {
-		const amount = Number(fiat.replace(',', '.'));
+		// Remove leading zeros and handle decimal separator
+		const sanitizedFiat = fiat.replace(/^0+(?=\d)/, '');
+		// Only convert to number if it's not just a decimal point
+		const amount = sanitizedFiat === '.' ? 0 : Number(sanitizedFiat);
 		const sats = fiatToBitcoinUnit({ amount });
-		setBitcoinAmount(sats.toString());
+		// Cap the amount at maximum bitcoin
+		const cappedSats = Math.min(sats, MAX_BITCOIN);
+		setBitcoinAmount(cappedSats.toString());
+		// Update fiat amount if bitcoin was capped
+		if (cappedSats !== sats) {
+			const dv = getDisplayValues({
+				satoshis: cappedSats,
+				shouldRoundUpFiat: true,
+			});
+			setFiatAmount(dv.fiatValue.toString());
+		}
+	};
+
+	const formatNumberWithSeparators = (value: string): string => {
+		const endsWithDecimal = value.endsWith('.');
+		const cleanNumber = value.replace(/[^\d.]/g, '');
+		const [integer, decimal] = cleanNumber.split('.');
+		const formattedInteger = integer.replace(/\B(?=(\d{3})+(?!\d))/g, ' ');
+
+		if (decimal !== undefined) {
+			return `${formattedInteger}.${decimal}`;
+		}
+
+		return endsWithDecimal ? `${formattedInteger}.` : formattedInteger;
 	};
 
 	return (
@@ -56,13 +100,16 @@ const CalculatorWidget = ({
 					<View style={styles.amount}>
 						<TextInput
 							style={styles.input}
-							value={bitcoinAmount}
+							value={formatNumberWithSeparators(bitcoinAmount)}
 							placeholder="0"
 							keyboardType="number-pad"
 							returnKeyType="done"
 							onChangeText={(text) => {
-								setBitcoinAmount(text);
-								updateFiatAmount(text);
+								// Remove any spaces before processing
+								const rawText = text.replace(/\s/g, '');
+								const sanitizedText = rawText.replace(/^0+(?=\d)/, '');
+								setBitcoinAmount(sanitizedText);
+								updateFiatAmount(sanitizedText);
 							}}
 						/>
 					</View>
@@ -75,13 +122,36 @@ const CalculatorWidget = ({
 					<View style={styles.amount}>
 						<TextInput
 							style={styles.input}
-							value={fiatAmount}
+							value={formatNumberWithSeparators(fiatAmount)}
 							placeholder="0"
 							keyboardType="decimal-pad"
 							returnKeyType="done"
 							onChangeText={(text) => {
-								setFiatAmount(text);
-								updateBitcoinAmount(text);
+								// Process the input text
+								const processedText = text
+									.replace(',', '.') // Convert comma to dot
+									.replace(/\s/g, ''); // Remove spaces
+
+								// Split and clean the number parts
+								const [integer, decimal] = processedText.split('.');
+								const cleanInteger = integer.replace(/^0+(?=\d)/, '') || '0';
+
+								// Construct the final number
+								const finalText =
+									decimal !== undefined
+										? `${cleanInteger}.${decimal.slice(0, 2)}`
+										: cleanInteger;
+
+								// Update state if valid
+								if (
+									finalText === '' ||
+									finalText === '.' ||
+									finalText === '0.' ||
+									/^\d*\.?\d{0,2}$/.test(finalText)
+								) {
+									setFiatAmount(finalText);
+									updateBitcoinAmount(finalText);
+								}
 							}}
 						/>
 					</View>

src/components/widgets/WeatherWidget.tsx

@@ -87,7 +87,7 @@ const WeatherWidget = ({
 									</BodySSB>
 								</View>
 								<View style={styles.columnRight}>
-									<BodyMSB numberOfLines={1}>{nextBlockFee} bitcoin/vB</BodyMSB>
+									<BodyMSB numberOfLines={1}>{nextBlockFee} ₿/vByte</BodyMSB>
 								</View>
 							</View>
 						)}

src/screens/Activity/ActivityListShort.tsx

@@ -13,7 +13,7 @@ import Button from '../../components/buttons/Button';
 import { useAppSelector } from '../../hooks/redux';
 import type { RootNavigationProp } from '../../navigation/types';
 import { activityItemsSelector } from '../../store/reselect/activity';
-import { EActivityType, IActivityItem } from '../../store/types/activity';
+import { IActivityItem } from '../../store/types/activity';
 import { showBottomSheet } from '../../store/utils/ui';
 import { Caption13Up } from '../../styles/text';
 import { groupActivityItems } from '../../utils/activity';
@@ -31,13 +31,6 @@ const ActivityListShort = (): ReactElement => {
 		return groupActivityItems(sliced);
 	}, [items]);
 
-	const droppedItems = useMemo(() => {
-		const dropped = items.filter((item) => {
-			return item.activityType === EActivityType.onchain && !item.exists;
-		});
-		return dropped;
-	}, [items]);
-
 	const renderItem = useCallback(
 		({
 			item,
@@ -76,13 +69,6 @@ const ActivityListShort = (): ReactElement => {
 		<View style={styles.content}>
 			<Caption13Up style={styles.title} color="secondary">
 				{t('activity')}
-
-				{droppedItems.length !== 0 && (
-					<Caption13Up color="red">
-						{' '}
-						({droppedItems.length} {t('activity_removed')})
-					</Caption13Up>
-				)}
 			</Caption13Up>
 
 			{groupedItems.length === 0 ? (

src/screens/Contacts/Contact.tsx

@@ -135,10 +135,7 @@ const Contact = ({
 	return (
 		<View style={styles.root}>
 			<SafeAreaInset type="top" />
-			<NavigationHeader
-				title={t('contact')}
-				onBackPress={(): void => navigation.navigate('Contacts')}
-			/>
+			<NavigationHeader title={t('contact')} />
 			<View style={styles.content}>
 				<ProfileCard
 					url={url}

src/screens/Onboarding/RestoreFromSeed.tsx

@@ -26,8 +26,7 @@ import VerticalShadow from '../../components/VerticalShadow';
 import Button from '../../components/buttons/Button';
 import { useAppDispatch } from '../../hooks/redux';
 import { OnboardingStackScreenProps } from '../../navigation/types';
-import { verifyBackup } from '../../store/slices/settings';
-import { updateUser } from '../../store/slices/user';
+import { updateUser, verifyBackup } from '../../store/slices/user';
 import {
 	ScrollView,
 	TextInput,

src/screens/Settings/Backup/BackupPrompt.tsx

@@ -10,8 +10,8 @@ import {
 } from '../../../hooks/bottomSheet';
 import { useAppDispatch, useAppSelector } from '../../../hooks/redux';
 import { useBalance } from '../../../hooks/wallet';
-import { backupVerifiedSelector } from '../../../store/reselect/settings';
 import { viewControllersSelector } from '../../../store/reselect/ui';
+import { backupVerifiedSelector } from '../../../store/reselect/user';
 import { ignoreBackupTimestampSelector } from '../../../store/reselect/user';
 import { closeSheet } from '../../../store/slices/ui';
 import { ignoreBackup } from '../../../store/slices/user';

src/screens/Settings/Backup/Success.tsx

@@ -8,7 +8,7 @@ import SafeAreaInset from '../../../components/SafeAreaInset';
 import Button from '../../../components/buttons/Button';
 import { useAppDispatch } from '../../../hooks/redux';
 import { BackupScreenProps } from '../../../navigation/types';
-import { verifyBackup } from '../../../store/slices/settings';
+import { verifyBackup } from '../../../store/slices/user';
 import { BodyM, BodyMB } from '../../../styles/text';
 
 const imageSrc = require('../../../assets/illustrations/check.png');

src/screens/Widgets/Widget.tsx

@@ -120,14 +120,16 @@ const Widget = ({
 						{renderWidget()}
 
 						<View style={styles.buttonsContainer}>
-							<Button
-								style={styles.button}
-								text={t('common:delete')}
-								size="large"
-								variant="secondary"
-								testID="WidgetDelete"
-								onPress={onDelete}
-							/>
+							{savedWidget && (
+								<Button
+									style={styles.button}
+									text={t('common:delete')}
+									size="large"
+									variant="secondary"
+									testID="WidgetDelete"
+									onPress={onDelete}
+								/>
+							)}
 							<Button
 								style={styles.button}
 								text={t('save')}

src/screens/Widgets/WidgetEdit.tsx

@@ -122,7 +122,7 @@ const WidgetEdit = ({
 		{
 			key: 'showNextBlockFee' as const,
 			title: t('weather.next_block'),
-			value: `${nextBlockFee} bitcoin/vB`,
+			value: `${nextBlockFee} ₿/vByte`,
 		},
 	];
 

src/store/reselect/settings.ts

@@ -19,10 +19,6 @@ export const settingsSelector = (state: RootState): TSettings => state.settings;
 const customElectrumPeersState = (state: RootState): TCustomElectrumPeers => {
 	return state.settings.customElectrumPeers;
 };
-
-export const backupVerifiedSelector = (state: RootState): boolean => {
-	return state.settings.backupVerified;
-};
 export const selectedCurrencySelector = (state: RootState): string => {
 	return state.settings.selectedCurrency;
 };

src/store/reselect/todos.ts

@@ -20,9 +20,12 @@ import { ITodo, TTodosState } from '../types/todos';
 import { ETransferType, TTransferToSavings } from '../types/wallet';
 import { blocktankPaidOrdersFullSelector } from './blocktank';
 import { closedChannelsSelector, openChannelsSelector } from './lightning';
-import { backupVerifiedSelector, pinSelector } from './settings';
+import { pinSelector } from './settings';
 import { onboardingProfileStepSelector } from './slashtags';
-import { startCoopCloseTimestampSelector } from './user';
+import {
+	backupVerifiedSelector,
+	startCoopCloseTimestampSelector,
+} from './user';
 import { createShallowEqualSelector } from './utils';
 import { pendingTransfersSelector } from './wallet';
 

src/store/reselect/user.ts

@@ -4,6 +4,9 @@ import { TUser } from '../slices/user';
 
 const userState = (state: RootState): TUser => state.user;
 
+export const backupVerifiedSelector = (state: RootState): boolean => {
+	return state.user.backupVerified;
+};
 export const isGeoBlockedSelector = createSelector(
 	[userState],
 	(user): boolean => user.isGeoBlocked ?? false,

src/store/shapes/settings.ts

@@ -74,7 +74,6 @@ const defaultReceivePreference = [
 ];
 
 export const initialSettingsState: TSettings = {
-	backupVerified: false,
 	enableAutoReadClipboard: false,
 	enableSendAmountWarning: false,
 	enableSwipeToHideBalance: true,

src/store/slices/settings.ts

@@ -14,7 +14,6 @@ import {
 import { EDenomination, EUnit } from '../types/wallet';
 
 export type TSettings = {
-	backupVerified: boolean;
 	enableAutoReadClipboard: boolean;
 	enableSendAmountWarning: boolean;
 	enableSwipeToHideBalance: boolean;
@@ -88,9 +87,6 @@ export const settingsSlice = createSlice({
 		addOrangeTicket: (state, action: PayloadAction<string>) => {
 			state.orangeTickets.push(action.payload);
 		},
-		verifyBackup: (state) => {
-			state.backupVerified = true;
-		},
 		resetSettingsState: () => initialSettingsState,
 	},
 });
@@ -103,7 +99,6 @@ export const {
 	addTreasureChest,
 	updateTreasureChest,
 	addOrangeTicket,
-	verifyBackup,
 	resetSettingsState,
 } = actions;