synonymdev · pwltr · Feb 28, 2024 · Feb 28, 2024 · Feb 28, 2024 · Feb 28, 2024
diff --git a/src/AppOnboarded.tsx b/src/AppOnboarded.tsx
@@ -116,7 +116,7 @@ const AppOnboarded = (): ReactElement => {
 				dispatch(updateUi({ isOnline: true }));
 			} else {
 				showToast({
-					type: 'error',
+					type: 'warning',
 					title: t('connection_issue'),
 					description: t('connection_issue_explain'),
 				});

diff --git a/src/components/AuthWidget.tsx b/src/components/AuthWidget.tsx
@@ -58,7 +58,7 @@ const AuthWidget = ({
 					: `An error occurred: ${e.message}`;
 
 			showToast({
-				type: 'error',
+				type: 'warning',
 				title: t('auth_error_link'),
 				description: message,
 			});
@@ -67,7 +67,7 @@ const AuthWidget = ({
 		if (magiclink) {
 			Linking.openURL(magiclink.url).catch((e) => {
 				showToast({
-					type: 'error',
+					type: 'warning',
 					title: t('auth_error_link'),
 					description: e.message,
 				});

diff --git a/src/components/BaseFeedWidget.tsx b/src/components/BaseFeedWidget.tsx
@@ -13,6 +13,7 @@ import {
 } from '../styles/icons';
 import { useAppDispatch } from '../hooks/redux';
 import { useSlashfeed } from '../hooks/widgets';
+import { truncate } from '../utils/helpers';
 import { deleteWidget } from '../store/slices/widgets';
 import Dialog from './Dialog';
 import SvgImage from './SvgImage';
@@ -80,7 +81,7 @@ const BaseFeedWidget = ({
 							</View>
 
 							<Text01M style={styles.name} numberOfLines={1}>
-								{widgetName}
+								{truncate(widgetName, 18)}
 							</Text01M>
 						</View>
 

diff --git a/src/components/FactsWidget.tsx b/src/components/FactsWidget.tsx
@@ -47,7 +47,7 @@ const FactsWidget = ({
 				console.error(error);
 				setIsLoading(false);
 				showToast({
-					type: 'error',
+					type: 'warning',
 					title: t('widget_error_drive'),
 					description: `An error occurred: ${error.message}`,
 				});

diff --git a/src/components/HeadlinesWidget.tsx b/src/components/HeadlinesWidget.tsx
@@ -79,7 +79,7 @@ const HeadlinesWidget = ({
 				console.error(error);
 				setIsLoading(false);
 				showToast({
-					type: 'error',
+					type: 'warning',
 					title: t('widget_error_drive'),
 					description: `An error occurred: ${error.message}`,
 				});

diff --git a/src/components/PinPad.tsx b/src/components/PinPad.tsx
@@ -129,7 +129,7 @@ const PinPad = ({
 					vibrate({ type: 'default' });
 					await wipeApp();
 					showToast({
-						type: 'error',
+						type: 'warning',
 						title: t('wiped_title'),
 						description: t('wiped_message'),
 					});

diff --git a/src/components/SlashtagsProvider2.tsx b/src/components/SlashtagsProvider2.tsx
@@ -127,7 +127,7 @@ export const SlashtagsProvider2 = ({
 				(primaryKeyRes.data && primaryKeyRes.data.length === 0)
 			) {
 				showToast({
-					type: 'error',
+					type: 'warning',
 					title: 'Data Connection Issue',
 					description:
 						'An error occurred: Could not load primary key from keychain.',

diff --git a/src/components/Toast.tsx b/src/components/Toast.tsx
@@ -39,11 +39,16 @@ const Toast = ({
 		gradientColor = '#00294e';
 	}
 
-	if (type === 'error') {
+	if (type === 'warning') {
 		titleColor = 'brand';
 		gradientColor = '#411a00';
 	}
 
+	if (type === 'error') {
+		titleColor = 'red';
+		gradientColor = '#2b1215';
+	}
+
 	return (
 		<BlurView style={[{ width: dimensions.width - 16 * 2 }, containerStyles]}>
 			<HorizontalGradient style={styles.gradient} color={gradientColor} />
@@ -73,5 +78,6 @@ const styles = StyleSheet.create({
 export const toastConfig: ToastConfig = {
 	success: (props) => <Toast {...props} />,
 	info: (props) => <Toast {...props} />,
+	warning: (props) => <Toast {...props} />,
 	error: (props) => <Toast {...props} />,
 };
diff --git a/src/navigation/bottom-sheet/ForceTransfer.tsx b/src/navigation/bottom-sheet/ForceTransfer.tsx
@@ -100,7 +100,7 @@ const ForceTransfer = (): ReactElement => {
 		});
 		if (closeResponse.isErr()) {
 			showToast({
-				type: 'error',
+				type: 'warning',
 				title: t('close_error'),
 				description: closeResponse.error.message,
 			});
@@ -118,7 +118,7 @@ const ForceTransfer = (): ReactElement => {
 			} else {
 				console.log('force close failed.');
 				showToast({
-					type: 'error',
+					type: 'warning',
 					title: t('force_failed_title'),
 					description: t('force_failed_msg'),
 				});

diff --git a/src/screens/Activity/ActivityDetail.tsx b/src/screens/Activity/ActivityDetail.tsx
@@ -27,6 +27,7 @@ import {
 import Clipboard from '@react-native-clipboard/clipboard';
 import { useTranslation } from 'react-i18next';
 import { parse } from '@synonymdev/slashtags-url';
+import { EBoostType, EPaymentType } from 'beignet';
 
 import { View as ThemedView } from '../../styles/components';
 import { Caption13Up, Text02M, Title } from '../../styles/text';
@@ -77,7 +78,7 @@ import {
 } from '../../store/slices/metadata';
 import { getTransactions } from '../../utils/wallet/electrum';
 import { ITransaction, ITxHash } from '../../utils/wallet';
-import { openURL } from '../../utils/helpers';
+import { ellipsis, openURL } from '../../utils/helpers';
 import { getBoostedTransactionParents } from '../../utils/boost';
 import { showToast } from '../../utils/notifications';
 import {
@@ -95,7 +96,6 @@ import type {
 import { i18nTime } from '../../utils/i18n';
 import { useSwitchUnit } from '../../hooks/wallet';
 import { contactsSelector } from '../../store/reselect/slashtags';
-import { EBoostType, EPaymentType } from 'beignet';
 
 const Section = memo(
 	({ title, value }: { title: string; value: ReactNode }) => {
@@ -195,7 +195,7 @@ const OnchainActivityDetail = ({
 		getTransactions({ txHashes: [{ tx_hash: id }] }).then((txResponse) => {
 			if (txResponse.isErr()) {
 				showToast({
-					type: 'error',
+					type: 'warning',
 					title: t('activity_error_get'),
 					description: t('activity_error_get_description'),
 				});
@@ -204,7 +204,7 @@ const OnchainActivityDetail = ({
 			const txData = txResponse.value.data;
 			if (txData.length === 0) {
 				showToast({
-					type: 'error',
+					type: 'warning',
 					title: t('activity_error_get'),
 					description: t('activity_error_tx_not_found'),
 				});
@@ -285,14 +285,14 @@ const OnchainActivityDetail = ({
 		await openURL(blockExplorerUrl);
 	}, [blockExplorerUrl]);
 
-	const copyTransactionId = useCallback(() => {
-		Clipboard.setString(id);
+	const onCopy = (text: string): void => {
+		Clipboard.setString(text);
 		showToast({
 			type: 'success',
-			title: t('activity_copied_tx'),
-			description: id,
+			title: t('copied'),
+			description: ellipsis(text, 40),
 		});
-	}, [id, t]);
+	};
 
 	const getOutputAddresses = useCallback(() => {
 		if (txDetails && txDetails.vout.length > 0) {
@@ -552,19 +552,21 @@ const OnchainActivityDetail = ({
 			) : (
 				<>
 					<TouchableOpacity
-						onPress={copyTransactionId}
-						style={styles.sectionContainer}>
+						style={styles.sectionContainer}
+						onPress={(): void => onCopy(id)}>
 						<Section
 							title={t('activity_tx_id')}
 							value={<Text02M>{id}</Text02M>}
 						/>
 					</TouchableOpacity>
-					<View style={styles.sectionContainer}>
+					<TouchableOpacity
+						style={styles.sectionContainer}
+						onPress={(): void => onCopy(address)}>
 						<Section
 							title={t('activity_address')}
 							value={<Text02M>{address}</Text02M>}
 						/>
-					</View>
+					</TouchableOpacity>
 					{txDetails ? (
 						<>
 							<View style={styles.sectionContainer}>
@@ -682,14 +684,14 @@ const LightningActivityDetail = ({
 		});
 	};
 
-	const copyTransactionId = useCallback(() => {
-		Clipboard.setString(id);
+	const onCopy = (text: string): void => {
+		Clipboard.setString(text);
 		showToast({
 			type: 'success',
-			title: t('activity_copied_tx'),
-			description: id,
+			title: t('copied'),
+			description: ellipsis(text, 40),
 		});
-	}, [id, t]);
+	};
 
 	const isSend = txType === EPaymentType.sent;
 	const total = value + (fee ?? 0);
@@ -914,19 +916,21 @@ const LightningActivityDetail = ({
 			) : (
 				<>
 					<TouchableOpacity
-						onPress={copyTransactionId}
-						style={styles.sectionContainer}>
+						style={styles.sectionContainer}
+						onPress={(): void => onCopy(id)}>
 						<Section
 							title={t('activity_payment_hash')}
 							value={<Text02M>{id}</Text02M>}
 						/>
 					</TouchableOpacity>
-					<View style={styles.sectionContainer}>
+					<TouchableOpacity
+						style={styles.sectionContainer}
+						onPress={(): void => onCopy(address)}>
 						<Section
 							title={t('activity_invoice')}
 							value={<Text02M>{address}</Text02M>}
 						/>
-					</View>
+					</TouchableOpacity>
 				</>
 			)}
 		</>

diff --git a/src/screens/Contacts/Contact.tsx b/src/screens/Contacts/Contact.tsx
@@ -95,7 +95,7 @@ const Contact = ({
 		} else {
 			console.log(res.error.message);
 			showToast({
-				type: 'error',
+				type: 'warning',
 				title: t('contact_pay_error'),
 				description: `An error occurred: ${res.error.message}`,
 			});

diff --git a/src/screens/Lightning/CustomConfirm.tsx b/src/screens/Lightning/CustomConfirm.tsx
@@ -53,9 +53,9 @@
 	const fiatTransactionFee = useDisplayValues(transactionFee);
 	const clientBalance = useDisplayValues(order?.clientBalanceSat ?? 0);
 
-	// avoid flashing different price after confirmation
+	// TODO: avoid flashing different price & allocation after confirmation
 	// eslint-disable-next-line react-hooks/exhaustive-deps
-	const txFee = useMemo(() => fiatTransactionFee.fiatValue, [orderId]);
+	const txFee = fiatTransactionFee.fiatValue;
 	const lspFee = purchaseFeeValue.fiatValue - clientBalance.fiatValue;
 
 	const handleConfirm = async (): Promise<void> => {
@@ -83,7 +83,7 @@
 		});
 		if (purchaseResponse.isErr()) {
 			showToast({
-				type: 'error',
+				type: 'warning',
 				title: t('error_channel_purchase'),
 				description: purchaseResponse.error.message,
 			});

diff --git a/src/screens/Lightning/CustomSetup.tsx b/src/screens/Lightning/CustomSetup.tsx
@@ -435,7 +435,7 @@ const CustomSetup = ({
 				});
 			}
 			showToast({
-				type: 'error',
+				type: 'warning',
 				title: t('error_channel_purchase'),
 				description: msg,
 			});

diff --git a/src/screens/Lightning/Introduction.tsx b/src/screens/Lightning/Introduction.tsx
@@ -73,7 +73,7 @@ const Introduction = ({
 								onPress={(): void => {
 									if (accountVersion < 2) {
 										showToast({
-											type: 'error',
+											type: 'warning',
 											title: t('migrating_ldk_title'),
 											description: t('migrating_ldk_description'),
 										});
@@ -93,7 +93,7 @@ const Introduction = ({
 								onPress={(): void => {
 									if (accountVersion < 2) {
 										showToast({
-											type: 'error',
+											type: 'warning',
 											title: t('migrating_ldk_title'),
 											description: t('migrating_ldk_description'),
 										});

diff --git a/src/screens/Lightning/QuickConfirm.tsx b/src/screens/Lightning/QuickConfirm.tsx
@@ -48,9 +48,9 @@
 	const fiatTransactionFee = useDisplayValues(transactionFee);
 	const clientBalance = useDisplayValues(order?.clientBalanceSat ?? 0);
 
-	// avoid flashing different price after confirmation
+	// TODO: avoid flashing different price & allocation after confirmation
 	// eslint-disable-next-line react-hooks/exhaustive-deps
-	const txFee = useMemo(() => fiatTransactionFee.fiatValue, [orderId]);
+	const txFee = fiatTransactionFee.fiatValue;
 	const lspFee = purchaseFeeValue.fiatValue - clientBalance.fiatValue;
 
 	const savingsAmount = onchainBalance - spendingAmount;

diff --git a/src/screens/Lightning/QuickSetup.tsx b/src/screens/Lightning/QuickSetup.tsx
@@ -155,7 +155,7 @@ const QuickSetup = ({
 		setLoading(false);
 		if (purchaseResponse.isErr()) {
 			showToast({
-				type: 'error',
+				type: 'warning',
 				title: t('error_channel_purchase'),
 				description: purchaseResponse.error.message,
 			});

diff --git a/src/screens/Onboarding/RestoreFromSeed.tsx b/src/screens/Onboarding/RestoreFromSeed.tsx
@@ -111,7 +111,7 @@ const RestoreFromSeed = (): ReactElement => {
 		});
 		if (res.isErr()) {
 			showToast({
-				type: 'error',
+				type: 'warning',
 				title: t('restore_error_title'),
 				description: res.error.message,
 			});

diff --git a/src/screens/Onboarding/Restoring.tsx b/src/screens/Onboarding/Restoring.tsx
@@ -59,7 +59,7 @@ const RestoringScreen = (): ReactElement => {
 		if (res.isErr()) {
 			console.log(res.error.message);
 			showToast({
-				type: 'error',
+				type: 'warning',
 				title: t('restore_error_title'),
 				description: t('restore_error_description'),
 			});

diff --git a/src/screens/Onboarding/Slideshow.tsx b/src/screens/Onboarding/Slideshow.tsx
@@ -83,7 +83,7 @@ const Slideshow = ({
 		if (res.isErr()) {
 			setIsCreatingWallet(false);
 			showToast({
-				type: 'error',
+				type: 'warning',
 				title: t('error_create'),
 				description: res.error.message,
 			});