@oxyhq/services 6.9.5 → 6.9.6

package/src/ui/components/payment/PaymentDetailsStep.tsx

@@ -8,6 +8,7 @@ import { FAIRWalletIcon } from '../icon';
 import { createPaymentStyles } from './paymentStyles';
 import { toast } from '../../../lib/sonner';
 import type { CardDetails, PaymentColors, PaymentStepAnimations } from './types';
+import { useI18n } from '../../hooks/useI18n';
 
 interface PaymentDetailsStepProps {
     paymentMethod: string;
@@ -37,11 +38,12 @@ const PaymentDetailsStep: React.FC<PaymentDetailsStepProps> = ({
     QRCodeComponent,
 }) => {
     const styles = useMemo(() => createPaymentStyles(colors), [colors]);
+    const { t } = useI18n();
     const { fadeAnim, slideAnim, scaleAnim } = animations;
 
     const handleCopyAddress = () => {
         Clipboard.setString(faircoinAddress);
-        toast('Address copied to clipboard!');
+        toast(t('payment.details.addressCopied'));
     };
 
     const handleOpenFairWallet = () => {
@@ -68,22 +70,22 @@ const PaymentDetailsStep: React.FC<PaymentDetailsStepProps> = ({
         >
             <View style={styles.section}>
                 <Text style={styles.sectionTitle}>
-                    {paymentMethod === 'card' ? 'Card Details' :
-                        paymentMethod === 'oxy' ? 'Oxy Pay' :
-                            paymentMethod === 'faircoin' ? 'FairCoin Payment' : 'Payment Details'}
+                    {paymentMethod === 'card' ? t('payment.details.cardDetails') :
+                        paymentMethod === 'oxy' ? t('payment.details.oxyPay') :
+                            paymentMethod === 'faircoin' ? t('payment.details.faircoinPayment') : t('payment.details.paymentDetails')}
                 </Text>
 
                 {paymentMethod === 'card' && (
                     <View style={styles.cardPaymentCard}>
                         <View style={styles.cardPaymentContent}>
                             <Ionicons name="card-outline" size={64} color={colors.primary} style={styles.cardPaymentIcon} />
-                            <Text style={styles.cardPaymentMainTitle}>Credit Card</Text>
-                            <Text style={styles.cardPaymentSubtitle}>Enter your card details securely</Text>
+                            <Text style={styles.cardPaymentMainTitle}>{t('payment.details.creditCard')}</Text>
+                            <Text style={styles.cardPaymentSubtitle}>{t('payment.details.enterCardSecurely')}</Text>
 
                             <View style={styles.cardPaymentFields}>
                                 <View style={styles.cardRowInfo}>
                                     <Ionicons name="card-outline" size={24} color={colors.primary} style={styles.cardRowIcon} />
-                                    <Text style={styles.cardRowText}>We accept Visa, Mastercard, and more</Text>
+                                    <Text style={styles.cardRowText}>{t('payment.details.acceptedCards')}</Text>
                                 </View>
                                 <TextField
                                     value={cardDetails.number}
@@ -131,7 +133,7 @@ const PaymentDetailsStep: React.FC<PaymentDetailsStepProps> = ({
                             </View>
 
                             <View style={{ height: 18 }} />
-                            <Text style={styles.cardPaymentWaiting}>Ready to process payment...</Text>
+                            <Text style={styles.cardPaymentWaiting}>{t('payment.details.readyToProcess')}</Text>
                         </View>
                     </View>
                 )}
@@ -140,13 +142,13 @@ const PaymentDetailsStep: React.FC<PaymentDetailsStepProps> = ({
                     <View style={styles.oxyPayCard}>
                         <View style={styles.oxyPayContent}>
                             <Ionicons name="wallet-outline" size={64} color={colors.primary} style={styles.oxyPayIcon} />
-                            <Text style={styles.oxyPayMainTitle}>Oxy Pay</Text>
-                            <Text style={styles.oxyPaySubtitle}>Pay with your in-app wallet</Text>
+                            <Text style={styles.oxyPayMainTitle}>{t('payment.details.oxyPay')}</Text>
+                            <Text style={styles.oxyPaySubtitle}>{t('payment.details.payWithWallet')}</Text>
                             <View style={styles.oxyPayBalanceBox}>
-                                <Text style={styles.oxyPayBalanceText}>Balance: ⊜ 123.45</Text>
+                                <Text style={styles.oxyPayBalanceText}>{t('payment.details.balance', { balance: '⊜ 123.45' })}</Text>
                             </View>
                             <View style={{ height: 18 }} />
-                            <Text style={styles.oxyPayWaiting}>Ready to process payment...</Text>
+                            <Text style={styles.oxyPayWaiting}>{t('payment.details.readyToProcess')}</Text>
                         </View>
                     </View>
                 )}
@@ -156,10 +158,10 @@ const PaymentDetailsStep: React.FC<PaymentDetailsStepProps> = ({
                         <View style={styles.faircoinContent}>
                             <FAIRWalletIcon size={64} style={styles.faircoinIcon} />
                             <Text style={styles.faircoinMainTitle}>FAIRWallet</Text>
-                            <Text style={styles.faircoinSubtitle}>Pay with FairCoin</Text>
+                            <Text style={styles.faircoinSubtitle}>{t('payment.details.payWithFairCoin')}</Text>
                             {!isMobile && QRCodeComponent ? (
                                 <>
-                                    <Text style={styles.faircoinScanText}>Scan to Pay</Text>
+                                    <Text style={styles.faircoinScanText}>{t('payment.details.scanToPay')}</Text>
                                     <View style={styles.faircoinQRCard}>
                                         <QRCodeComponent value={faircoinAddress} size={qrSize - 32} />
                                         <View style={styles.faircoinQRBadge}>
@@ -169,30 +171,30 @@ const PaymentDetailsStep: React.FC<PaymentDetailsStepProps> = ({
                                 </>
                             ) : (
                                 <>
-                                    <Text style={styles.faircoinTitle}>Use the options below to pay with FAIRWallet</Text>
+                                    <Text style={styles.faircoinTitle}>{t('payment.details.fairWalletInstructions')}</Text>
                                     <Text style={styles.faircoinAddress}>{faircoinAddress}</Text>
                                     <TouchableOpacity
                                         style={[styles.faircoinButton, { backgroundColor: '#9ffb50', borderRadius: 18, marginTop: 12, width: '90%', flexDirection: 'row', alignItems: 'center', justifyContent: 'center' }]}
                                         onPress={handleOpenFairWallet}
                                         accessibilityRole="button"
-                                        accessibilityLabel="Open in FAIRWallet"
+                                        accessibilityLabel={t('payment.details.openInFairWallet')}
                                     >
                                         <FAIRWalletIcon size={20} style={{ marginRight: 8 }} />
-                                        <Text style={[styles.faircoinButtonText, { color: '#1b1f0a', fontWeight: 'bold', fontSize: 16 }]}>Open in FAIRWallet</Text>
+                                        <Text style={[styles.faircoinButtonText, { color: '#1b1f0a', fontWeight: 'bold', fontSize: 16 }]}>{t('payment.details.openInFairWallet')}</Text>
                                     </TouchableOpacity>
                                     <TouchableOpacity
                                         style={[styles.faircoinButton, { backgroundColor: '#9ffb50', borderRadius: 18, marginTop: 10, width: '90%', flexDirection: 'row', alignItems: 'center', justifyContent: 'center' }]}
                                         onPress={handleCopyAddress}
                                         accessibilityRole="button"
-                                        accessibilityLabel="Copy FairCoin address"
+                                        accessibilityLabel={t('payment.details.copyAddress')}
                                     >
                                         <FAIRWalletIcon size={20} style={{ marginRight: 8 }} />
-                                        <Text style={[styles.faircoinButtonText, { color: '#1b1f0a', fontWeight: 'bold', fontSize: 16 }]}>Copy Address</Text>
+                                        <Text style={[styles.faircoinButtonText, { color: '#1b1f0a', fontWeight: 'bold', fontSize: 16 }]}>{t('payment.details.copyAddress')}</Text>
                                     </TouchableOpacity>
                                 </>
                             )}
                             <View style={{ height: 18 }} />
-                            <Text style={styles.faircoinWaiting}>Waiting for payment...</Text>
+                            <Text style={styles.faircoinWaiting}>{t('payment.details.waitingForPayment')}</Text>
                         </View>
                     </View>
                 )}
@@ -201,13 +203,13 @@ const PaymentDetailsStep: React.FC<PaymentDetailsStepProps> = ({
             <GroupedPillButtons
                 buttons={[
                     {
-                        text: 'Back',
+                        text: t('payment.actions.back'),
                         onPress: onBack,
                         icon: 'arrow-back',
                         variant: 'transparent',
                     },
                     {
-                        text: 'Continue',
+                        text: t('payment.actions.continue'),
                         onPress: onNext,
                         icon: 'arrow-forward',
                         variant: 'primary',

package/src/ui/components/payment/PaymentMethodStep.tsx

@@ -6,6 +6,7 @@ import GroupedPillButtons from '../internal/GroupedPillButtons';
 import { FAIRWalletIcon } from '../icon';
 import { createPaymentStyles } from './paymentStyles';
 import type { PaymentMethod, PaymentColors, PaymentStepAnimations } from './types';
+import { useI18n } from '../../hooks/useI18n';
 
 interface PaymentMethodStepProps {
     availablePaymentMethods: PaymentMethod[];
@@ -27,6 +28,7 @@ const PaymentMethodStep: React.FC<PaymentMethodStepProps> = ({
     onNext,
 }) => {
     const styles = useMemo(() => createPaymentStyles(colors), [colors]);
+    const { t } = useI18n();
     const { fadeAnim, slideAnim, scaleAnim } = animations;
 
     return (
@@ -45,7 +47,7 @@ const PaymentMethodStep: React.FC<PaymentMethodStepProps> = ({
             accessibilityLabel="Choose payment method step"
         >
             <View style={styles.section}>
-                <Text style={styles.sectionTitle}>Choose Payment Method</Text>
+                <Text style={styles.sectionTitle}>{t('payment.method.title')}</Text>
 
                 <GroupedSection
                     items={availablePaymentMethods.map(method => ({
@@ -54,8 +56,8 @@ const PaymentMethodStep: React.FC<PaymentMethodStepProps> = ({
                         iconColor: method.key === 'card' ? '#007AFF' :
                             method.key === 'oxy' ? '#32D74B' :
                                 method.key === 'faircoin' ? '#9ffb50' : colors.primary,
-                        title: method.label,
-                        subtitle: method.description,
+                        title: t(`payment.methods.${method.key}.label`),
+                        subtitle: t(`payment.methods.${method.key}.description`),
                         onPress: () => onSelectMethod(method.key),
                         selected: selectedMethod === method.key,
                         showChevron: false,
@@ -69,13 +71,13 @@ const PaymentMethodStep: React.FC<PaymentMethodStepProps> = ({
             <GroupedPillButtons
                 buttons={[
                     {
-                        text: 'Back',
+                        text: t('payment.actions.back'),
                         onPress: onBack,
                         icon: 'arrow-back',
                         variant: 'transparent',
                     },
                     {
-                        text: 'Continue',
+                        text: t('payment.actions.continue'),
                         onPress: onNext,
                         icon: 'arrow-forward',
                         variant: 'primary',

package/src/ui/components/payment/PaymentReviewStep.tsx

@@ -6,6 +6,7 @@ import GroupedPillButtons from '../internal/GroupedPillButtons';
 import { createPaymentStyles } from './paymentStyles';
 import { PAYMENT_METHODS, getCurrencySymbol } from './constants';
 import type { CardDetails, PaymentColors, PaymentStepAnimations } from './types';
+import { useI18n } from '../../hooks/useI18n';
 
 interface PaymentReviewStepProps {
     amount: string | number;
@@ -31,6 +32,7 @@ const PaymentReviewStep: React.FC<PaymentReviewStepProps> = ({
     onPay,
 }) => {
     const styles = useMemo(() => createPaymentStyles(colors), [colors]);
+    const { t } = useI18n();
     const currencySymbol = getCurrencySymbol(currency);
     const { fadeAnim, slideAnim, scaleAnim } = animations;
 
@@ -52,7 +54,7 @@ const PaymentReviewStep: React.FC<PaymentReviewStepProps> = ({
             accessibilityLabel="Review payment step"
         >
             <View style={styles.section}>
-                <Text style={styles.sectionTitle}>Review Payment</Text>
+                <Text style={styles.sectionTitle}>{t('payment.review.title')}</Text>
 
                 <GroupedSection
                     items={[
@@ -60,43 +62,43 @@ const PaymentReviewStep: React.FC<PaymentReviewStepProps> = ({
                             id: 'secure-payment',
                             icon: 'shield-check',
                             iconColor: colors.success || '#4BB543',
-                            title: 'Secure payment',
-                            subtitle: 'Your payment is protected by industry-standard encryption',
+                            title: t('payment.review.securePayment'),
+                            subtitle: t('payment.review.securePaymentDesc'),
                         },
                         {
                             id: 'amount',
                             icon: 'cash',
                             iconColor: colors.primary,
-                            title: 'Amount',
+                            title: t('payment.review.amount'),
                             subtitle: `${currencySymbol} ${amount}`,
                         },
                         {
                             id: 'payment-method',
                             icon: selectedMethod?.icon as any,
                             iconColor: colors.primary,
-                            title: 'Payment Method',
-                            subtitle: selectedMethod?.label,
+                            title: t('payment.review.paymentMethod'),
+                            subtitle: selectedMethod ? t(`payment.methods.${selectedMethod.key}.label`) : undefined,
                         },
                         ...(paymentMethod === 'card' ? [{
                             id: 'card-details',
                             icon: 'card' as const,
                             iconColor: colors.primary,
-                            title: 'Card',
+                            title: t('payment.review.card'),
                             subtitle: cardDetails.number.replace(/.(?=.{4})/g, '*'),
                         }] : []),
                         ...(paymentMethod === 'oxy' ? [{
                             id: 'oxy-balance',
                             icon: 'wallet' as const,
                             iconColor: colors.primary,
-                            title: 'Oxy Pay Account',
-                            subtitle: 'Balance: ⊜ 123.45',
+                            title: t('payment.review.oxyPayAccount'),
+                            subtitle: t('payment.details.balance', { balance: '⊜ 123.45' }),
                         }] : []),
                         ...(paymentMethod === 'faircoin' ? [{
                             id: 'faircoin-wallet',
                             icon: 'qr-code' as const,
                             iconColor: colors.primary,
-                            title: 'FairCoin Wallet',
-                            subtitle: 'Paid via QR',
+                            title: t('payment.review.faircoinWallet'),
+                            subtitle: t('payment.review.paidViaQR'),
                         }] : []),
                     ]}
                 />
@@ -105,13 +107,13 @@ const PaymentReviewStep: React.FC<PaymentReviewStepProps> = ({
             <GroupedPillButtons
                 buttons={[
                     {
-                        text: 'Back',
+                        text: t('payment.actions.back'),
                         onPress: onBack,
                         icon: 'arrow-back',
                         variant: 'transparent',
                     },
                     {
-                        text: isPaying ? 'Processing...' : 'Pay Now',
+                        text: isPaying ? t('payment.review.processing') : t('payment.review.payNow'),
                         onPress: onPay,
                         icon: 'checkmark',
                         variant: 'primary',

package/src/ui/components/payment/PaymentSuccessStep.tsx

@@ -5,6 +5,7 @@ import { Ionicons } from '@expo/vector-icons';
 import GroupedPillButtons from '../internal/GroupedPillButtons';
 import { createPaymentStyles } from './paymentStyles';
 import type { PaymentColors, PaymentStepAnimations } from './types';
+import { useI18n } from '../../hooks/useI18n';
 
 interface PaymentSuccessStepProps {
     colors: PaymentColors;
@@ -18,6 +19,7 @@ const PaymentSuccessStep: React.FC<PaymentSuccessStepProps> = ({
     onDone,
 }) => {
     const styles = useMemo(() => createPaymentStyles(colors), [colors]);
+    const { t } = useI18n();
     const { fadeAnim, slideAnim, scaleAnim } = animations;
 
     return (
@@ -36,7 +38,7 @@ const PaymentSuccessStep: React.FC<PaymentSuccessStepProps> = ({
             accessibilityLabel="Payment complete"
         >
             <View style={styles.section}>
-                <Text style={styles.sectionTitle}>Payment Complete</Text>
+                <Text style={styles.sectionTitle}>{t('payment.success.title')}</Text>
 
                 <View style={styles.successCard}>
                     <View style={styles.successContent}>
@@ -46,10 +48,10 @@ const PaymentSuccessStep: React.FC<PaymentSuccessStepProps> = ({
                             color={colors.success || '#4BB543'}
                             style={styles.successIcon}
                         />
-                        <Text style={styles.successMainTitle}>Payment Successful!</Text>
-                        <Text style={styles.successSubtitle}>Thank you for your payment.</Text>
+                        <Text style={styles.successMainTitle}>{t('payment.success.heading')}</Text>
+                        <Text style={styles.successSubtitle}>{t('payment.success.thanks')}</Text>
                         <View style={{ height: 18 }} />
-                        <Text style={styles.successMessage}>Your transaction has been processed successfully.</Text>
+                        <Text style={styles.successMessage}>{t('payment.success.processed')}</Text>
                     </View>
                 </View>
             </View>
@@ -57,7 +59,7 @@ const PaymentSuccessStep: React.FC<PaymentSuccessStepProps> = ({
             <GroupedPillButtons
                 buttons={[
                     {
-                        text: 'Done',
+                        text: t('payment.actions.done'),
                         onPress: onDone,
                         icon: 'checkmark',
                         variant: 'primary',

package/src/ui/components/payment/PaymentSummaryStep.tsx

@@ -7,6 +7,7 @@ import GroupedPillButtons from '../internal/GroupedPillButtons';
 import { createPaymentStyles } from './paymentStyles';
 import { getCurrencySymbol, CURRENCY_SYMBOLS } from './constants';
 import type { PaymentItem, PaymentColors, PaymentStepAnimations } from './types';
+import { useI18n } from '../../hooks/useI18n';
 
 interface PaymentSummaryStepProps {
     paymentItems: PaymentItem[];
@@ -40,6 +41,7 @@ const PaymentSummaryStep: React.FC<PaymentSummaryStepProps> = ({
     onNext,
 }) => {
     const styles = useMemo(() => createPaymentStyles(colors), [colors]);
+    const { t } = useI18n();
     const currencySymbol = getCurrencySymbol(currency);
     const { fadeAnim, slideAnim, scaleAnim } = animations;
 
@@ -59,7 +61,7 @@ const PaymentSummaryStep: React.FC<PaymentSummaryStepProps> = ({
             accessibilityLabel="Payment summary step"
         >
             <View style={styles.section}>
-                <Text style={styles.sectionTitle}>Payment Summary</Text>
+                <Text style={styles.sectionTitle}>{t('payment.summary.title')}</Text>
 
                 <View style={styles.summaryCard}>
                     <View style={styles.summaryCardContent}>
@@ -70,10 +72,10 @@ const PaymentSummaryStep: React.FC<PaymentSummaryStepProps> = ({
                             style={styles.summaryCardIcon}
                         />
                         <Text style={styles.summaryCardMainTitle}>
-                            {paymentItems.length > 0 ? 'Order Summary' : 'Payment'}
+                            {paymentItems.length > 0 ? t('payment.summary.orderSummary') : t('payment.summary.payment')}
                         </Text>
                         <Text style={styles.summaryCardSubtitle}>
-                            {paymentItems.length > 0 ? 'Review your payment details' : 'Complete your payment'}
+                            {paymentItems.length > 0 ? t('payment.summary.reviewDetails') : t('payment.summary.completePayment')}
                         </Text>
 
                         {paymentItems.length > 0 ? (
@@ -99,15 +101,15 @@ const PaymentSummaryStep: React.FC<PaymentSummaryStepProps> = ({
 
                                 <View style={styles.summaryCardTotalSection}>
                                     <View style={styles.summaryCardTotalRow}>
-                                        <Text style={styles.summaryCardTotalLabel}>Subtotal</Text>
+                                        <Text style={styles.summaryCardTotalLabel}>{t('payment.summary.subtotal')}</Text>
                                         <Text style={styles.summaryCardTotalValue}>{currencySymbol} {amount}</Text>
                                     </View>
                                     <View style={styles.summaryCardTotalRow}>
-                                        <Text style={styles.summaryCardTotalLabel}>Tax</Text>
+                                        <Text style={styles.summaryCardTotalLabel}>{t('payment.summary.tax')}</Text>
                                         <Text style={styles.summaryCardTotalValue}>{currencySymbol} 0.00</Text>
                                     </View>
                                     <View style={styles.summaryCardTotalRow}>
-                                        <Text style={styles.summaryCardTotalLabel}>Total</Text>
+                                        <Text style={styles.summaryCardTotalLabel}>{t('payment.summary.total')}</Text>
                                         <Text style={styles.summaryCardTotalValue}>{currencySymbol} {amount}</Text>
                                     </View>
                                 </View>
@@ -115,7 +117,7 @@ const PaymentSummaryStep: React.FC<PaymentSummaryStepProps> = ({
                         ) : (
                             <>
                                 <View style={styles.summaryCardAmount}>
-                                    <Text style={styles.summaryCardAmountLabel}>Amount to Pay</Text>
+                                    <Text style={styles.summaryCardAmountLabel}>{t('payment.summary.amountToPay')}</Text>
                                     <Text style={styles.summaryCardAmountValue}>{currencySymbol} {amount}</Text>
                                     {description && (
                                         <Text style={styles.summaryCardAmountDescription}>{description}</Text>
@@ -126,7 +128,7 @@ const PaymentSummaryStep: React.FC<PaymentSummaryStepProps> = ({
 
                                 <View style={styles.summaryCardTotalSection}>
                                     <View style={styles.summaryCardTotalRow}>
-                                        <Text style={styles.summaryCardTotalLabel}>Total</Text>
+                                        <Text style={styles.summaryCardTotalLabel}>{t('payment.summary.total')}</Text>
                                         <Text style={styles.summaryCardTotalValue}>{currencySymbol} {amount}</Text>
                                     </View>
                                 </View>
@@ -139,13 +141,13 @@ const PaymentSummaryStep: React.FC<PaymentSummaryStepProps> = ({
             <GroupedPillButtons
                 buttons={[
                     {
-                        text: 'Close',
+                        text: t('payment.actions.close'),
                         onPress: onClose,
                         icon: 'close',
                         variant: 'transparent',
                     },
                     {
-                        text: 'Continue',
+                        text: t('payment.actions.continue'),
                         onPress: onNext,
                         icon: 'arrow-forward',
                         variant: 'primary',

package/src/ui/hooks/useAssets.ts

@@ -84,8 +84,8 @@ export const useAssets = () => {
       }
       
       return null;
-    } catch (error: any) {
-      setUploadError(error.message || 'Upload failed');
+    } catch (error: unknown) {
+      setUploadError((error instanceof Error ? error.message : null) || 'Upload failed');
       throw error;
     } finally {
       setUploading(false);
@@ -133,8 +133,8 @@ export const useAssets = () => {
           createdAt: new Date().toISOString()
         });
       }
-    } catch (error: any) {
-      setLinkError(error.message || 'Link failed');
+    } catch (error: unknown) {
+      setLinkError((error instanceof Error ? error.message : null) || 'Link failed');
       throw error;
     } finally {
       setLinking(false);
@@ -164,8 +164,8 @@ export const useAssets = () => {
         // Update store optimistically
         removeLink(assetId, app, entityType, entityId);
       }
-    } catch (error: any) {
-      setLinkError(error.message || 'Unlink failed');
+    } catch (error: unknown) {
+      setLinkError((error instanceof Error ? error.message : null) || 'Unlink failed');
       throw error;
     } finally {
       setLinking(false);
@@ -213,8 +213,8 @@ export const useAssets = () => {
       
       await oxyInstance.assetDelete(assetId, force);
       removeAsset(assetId);
-    } catch (error: any) {
-      setDeleteError(error.message || 'Delete failed');
+    } catch (error: unknown) {
+      setDeleteError((error instanceof Error ? error.message : null) || 'Delete failed');
       throw error;
     } finally {
       setDeleting(false);

package/src/ui/hooks/useAsyncAction.ts

@@ -75,10 +75,10 @@ export function useAsyncAction<T = void>(
 
             onSuccess?.(result);
             return result;
-        } catch (err: any) {
+        } catch (err: unknown) {
             const message = typeof errorMessage === 'function'
                 ? errorMessage(err)
-                : errorMessage || err?.message || 'An error occurred';
+                : errorMessage || (err instanceof Error ? err.message : null) || 'An error occurred';
 
             toast.error(message);
             setError(err instanceof Error ? err : new Error(message));
@@ -120,8 +120,8 @@ export async function executeWithToast<T>(
             toast.success(successMessage);
         }
         return result;
-    } catch (err: any) {
-        toast.error(errorMessage || err?.message || 'An error occurred');
+    } catch (err: unknown) {
+        toast.error(errorMessage || (err instanceof Error ? err.message : null) || 'An error occurred');
         return undefined;
     }
 }

package/src/ui/hooks/useFollow.ts

@@ -61,7 +61,7 @@ export const useFollow = (userId?: string | string[]) => {
 
     // If either count is not set and we're not already loading counts, trigger a fetch.
     if ((followerCount === null || followingCount === null) && !isLoadingCounts) {
-      fetchUserCounts().catch((err: any) => console.warn('useFollow: fetchUserCounts failed', err));
+      fetchUserCounts().catch((err: unknown) => console.warn('useFollow: fetchUserCounts failed', err));
     }
   }, [isSingleUser, userId, followerCount, followingCount, isLoadingCounts, fetchUserCounts]);
 

package/src/ui/hooks/useProfileEditing.ts

@@ -82,7 +82,7 @@ export const useProfileEditing = () => {
         try {
             await updateProfileMutation.mutateAsync(updateData);
             return true;
-        } catch (error: any) {
+        } catch (error: unknown) {
             // Error toast is handled by the mutation
             return false;
         }

package/src/ui/hooks/useSettingToggle.ts

@@ -72,13 +72,13 @@ export function useSettingToggle(options: UseSettingToggleOptions): UseSettingTo
             if (showSuccessToast && successMessage) {
                 toast.success(successMessage);
             }
-        } catch (err: any) {
+        } catch (err: unknown) {
             // Revert on error
             if (revertOnError) {
                 setValue(previousValue);
             }
 
-            toast.error(errorMessage || err?.message || 'An error occurred');
+            toast.error(errorMessage || (err instanceof Error ? err.message : null) || 'An error occurred');
         } finally {
             setIsSaving(false);
         }
@@ -122,7 +122,7 @@ export function useSettingToggles<T extends { [K in keyof T]: boolean }>(options
 
         try {
             await onSave(key, newValue);
-        } catch (err: any) {
+        } catch (err: unknown) {
             // Revert on error
             if (revertOnError) {
                 setValues(prev => ({ ...prev, [key]: previousValue }));
@@ -131,7 +131,7 @@ export function useSettingToggles<T extends { [K in keyof T]: boolean }>(options
             const message = typeof errorMessage === 'function'
                 ? errorMessage(key)
                 : errorMessage;
-            toast.error(message || err?.message || 'An error occurred');
+            toast.error(message || (err instanceof Error ? err.message : null) || 'An error occurred');
         } finally {
             setSavingKeys(prev => {
                 const next = new Set(prev);

package/src/ui/screens/AccountOverviewScreen.tsx

@@ -246,11 +246,11 @@ const AccountOverviewScreen: React.FC<BaseScreenProps> = ({
                                     // For React Native, you'd need to use a library like expo-file-system
                                     toast.success(t('accountOverview.items.downloadData.success') || 'Data downloaded successfully');
                                 }
-                            } catch (error: any) {
+                            } catch (error: unknown) {
                                 if (__DEV__) {
                                     console.error('Failed to download data:', error);
                                 }
-                                toast.error(error?.message || t('accountOverview.items.downloadData.error') || 'Failed to download data');
+                                toast.error((error instanceof Error ? error.message : null) || t('accountOverview.items.downloadData.error') || 'Failed to download data');
                             }
                         },
                     },
@@ -276,21 +276,21 @@ const AccountOverviewScreen: React.FC<BaseScreenProps> = ({
                                     // For React Native, you'd need to use a library like expo-file-system
                                     toast.success(t('accountOverview.items.downloadData.success') || 'Data downloaded successfully');
                                 }
-                            } catch (error: any) {
+                            } catch (error: unknown) {
                                 if (__DEV__) {
                                     console.error('Failed to download data:', error);
                                 }
-                                toast.error(error?.message || t('accountOverview.items.downloadData.error') || 'Failed to download data');
+                                toast.error((error instanceof Error ? error.message : null) || t('accountOverview.items.downloadData.error') || 'Failed to download data');
                             }
                         },
                     },
                 ]
             );
-        } catch (error: any) {
+        } catch (error: unknown) {
             if (__DEV__) {
                 console.error('Failed to initiate download:', error);
             }
-            toast.error(error?.message || t('accountOverview.items.downloadData.error') || 'Failed to download data');
+            toast.error((error instanceof Error ? error.message : null) || t('accountOverview.items.downloadData.error') || 'Failed to download data');
         }
     }, [oxyServices, user, t]);
 

package/src/ui/screens/AccountVerificationScreen.tsx

@@ -70,12 +70,12 @@ const AccountVerificationScreen: React.FC<BaseScreenProps> = ({
                     },
                 ]
             );
-        } catch (error: any) {
+        } catch (error: unknown) {
             if (__DEV__) {
                 console.error('Failed to submit verification request:', error);
             }
             toast.error(
-                error?.message || t('accountVerification.submitError') || 'Failed to submit verification request'
+                (error instanceof Error ? error.message : null) || t('accountVerification.submitError') || 'Failed to submit verification request'
             );
         } finally {
             setIsSubmitting(false);

package/src/ui/screens/FeedbackScreen.tsx

@@ -137,9 +137,9 @@ const FeedbackScreen: React.FC<BaseScreenProps> = ({
                 setCurrentStep(0);
             }, 3000);
 
-        } catch (error: any) {
-            setFeedbackState({ status: 'error', message: error.message || (t('feedback.toasts.submitFailed') || 'Failed to submit feedback') });
-            toast.error(error.message || (t('feedback.toasts.submitFailed') || 'Failed to submit feedback'));
+        } catch (error: unknown) {
+            setFeedbackState({ status: 'error', message: (error instanceof Error ? error.message : null) || (t('feedback.toasts.submitFailed') || 'Failed to submit feedback') });
+            toast.error((error instanceof Error ? error.message : null) || (t('feedback.toasts.submitFailed') || 'Failed to submit feedback'));
         }
     }, [feedbackData, user, isTypeStepValid, isDetailsStepValid, isContactStepValid, resetForm, setFeedbackState, t]);