Merge branch 'master' into notio

afilini · Oct 11, 2024 · ed0edb9 · ed0edb9
2 parents 6dc7930 + 7d14170
commit ed0edb9
Show file tree

Hide file tree

Showing 8 changed files with 86 additions and 98 deletions.
diff --git a/components/ListItem.tsx b/components/ListItem.tsx
@@ -98,6 +98,8 @@ const ListItem: React.FC<ListItemProps> = React.memo(
         writingDirection: I18nManager.isRTL ? 'rtl' : 'ltr',
         color: colors.alternativeTextColor,
         fontWeight: '400',
+        paddingVertical: switchProps ? 8 : 0,
+        lineHeight: 20,
         fontSize: 14,
       },
 
@@ -130,7 +132,7 @@ const ListItem: React.FC<ListItemProps> = React.memo(
           </RNElementsListItem.Title>
           {subtitle && (
             <RNElementsListItem.Subtitle
-              numberOfLines={subtitleNumberOfLines ?? 1}
+              numberOfLines={switchProps ? 0 : (subtitleNumberOfLines ?? 1)}
               accessible={switchProps === undefined}
               style={stylesHook.subtitle}
             >
@@ -152,7 +154,9 @@ const ListItem: React.FC<ListItemProps> = React.memo(
           <>
             {chevron && <RNElementsListItem.Chevron iconStyle={{ transform: [{ scaleX: I18nManager.isRTL ? -1 : 1 }] }} />}
             {rightIcon && <Avatar icon={rightIcon} />}
-            {switchProps && <Switch {...memoizedSwitchProps} accessibilityLabel={title} accessible accessibilityRole="switch" />}
+            {switchProps && (
+              <Switch {...memoizedSwitchProps} accessibilityLabel={title} style={styles.margin16} accessible accessibilityRole="switch" />
+            )}
             {checkmark && (
               <RNElementsListItem.CheckBox
                 iconRight
@@ -216,5 +220,8 @@ const styles = StyleSheet.create({
   margin8: {
     margin: 8,
   },
+  margin16: {
+    marginLeft: 16,
+  },
   width16: { width: 16 },
 });
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -111,7 +111,7 @@
     "coinselect": "3.1.13",
     "crypto-js": "4.2.0",
     "dayjs": "1.11.13",
-    "detox": "20.27.2",
+    "detox": "20.27.3",
     "ecpair": "2.0.1",
     "ecurve": "1.0.6",
     "electrum-client": "github:BlueWallet/rn-electrum-client#1bfe3cc",

diff --git a/screen/settings/DefaultView.tsx b/screen/settings/DefaultView.tsx
@@ -2,7 +2,6 @@ import { useNavigation } from '@react-navigation/native';
 import { NativeStackNavigationProp } from '@react-navigation/native-stack';
 import React, { useEffect, useReducer } from 'react';
 import { ScrollView, TouchableWithoutFeedback, View } from 'react-native';
-import { BlueCard, BlueText } from '../../BlueComponents';
 import { TWallet } from '../../class/wallets/types';
 import ListItem from '../../components/ListItem';
 import useOnAppLaunch from '../../hooks/useOnAppLaunch';
@@ -105,10 +104,9 @@ const DefaultView: React.FC = () => {
             value: state.isViewAllWalletsSwitchEnabled,
             disabled: wallets.length <= 0,
           }}
+          subtitle={loc.settings.default_desc}
         />
-        <BlueCard>
-          <BlueText>{loc.settings.default_desc}</BlueText>
-        </BlueCard>
+
         {!state.isViewAllWalletsSwitchEnabled && (
           <ListItem
             title={loc.settings.default_info}

diff --git a/screen/settings/EncryptStorage.tsx b/screen/settings/EncryptStorage.tsx
@@ -1,7 +1,5 @@
 import React, { useCallback, useEffect, useReducer, useRef } from 'react';
 import { Alert, Platform, ScrollView, StyleSheet, Text, TouchableWithoutFeedback, View } from 'react-native';
-import { BlueCard, BlueSpacing20, BlueText } from '../../BlueComponents';
-import presentAlert from '../../components/Alert';
 import ListItem, { TouchableOpacityWrapper } from '../../components/ListItem';
 import { useTheme } from '../../components/themes';
 import { unlockWithBiometrics, useBiometrics } from '../../hooks/useBiometrics';
@@ -13,6 +11,9 @@ import PromptPasswordConfirmationModal, {
   PromptPasswordConfirmationModalHandle,
 } from '../../components/PromptPasswordConfirmationModal';
 import { popToTop } from '../../NavigationService';
+import presentAlert from '../../components/Alert';
+import { Header } from '../../components/Header';
+import { BlueSpacing20 } from '../../BlueComponents';
 
 enum ActionType {
   SetLoading = 'SET_LOADING',
@@ -72,9 +73,6 @@ const EncryptStorage = () => {
     root: {
       backgroundColor: colors.background,
     },
-    headerText: {
-      color: colors.foregroundColor,
-    },
   });
 
   const initializeState = useCallback(async () => {
@@ -139,15 +137,6 @@ const EncryptStorage = () => {
     navigate('PlausibleDeniability');
   };
 
-  const renderPasscodeExplanation = () => {
-    return Platform.OS === 'android' && Platform.Version >= 30 ? (
-      <>
-        <BlueText />
-        <BlueText>{loc.formatString(loc.settings.biometrics_fail, { type: deviceBiometricType! })}</BlueText>
-      </>
-    ) : null;
-  };
-
   return (
     <ScrollView
       contentContainerStyle={[styles.root, styleHooks.root]}
@@ -157,26 +146,30 @@ const EncryptStorage = () => {
       <View style={styles.paddingTop} />
       {state.deviceBiometricCapable && (
         <>
-          <Text adjustsFontSizeToFit style={[styles.headerText, styleHooks.headerText]}>
-            {loc.settings.biometrics}
-          </Text>
+          <Header leftText={loc.settings.biometrics} />
           <ListItem
             title={loc.formatString(loc.settings.encrypt_use, { type: deviceBiometricType! })}
             Component={TouchableWithoutFeedback}
-            switch={{ value: biometricEnabled, onValueChange: onUseBiometricSwitch, disabled: state.currentLoadingSwitch !== null }}
+            switch={{
+              value: biometricEnabled,
+              onValueChange: onUseBiometricSwitch,
+              disabled: state.currentLoadingSwitch !== null,
+            }}
             isLoading={state.currentLoadingSwitch === 'biometric' && state.isLoading}
             containerStyle={[styles.row, styleHooks.root]}
+            subtitle={
+              <>
+                <Text style={styles.subtitleText}>{loc.formatString(loc.settings.encrypt_use_expl, { type: deviceBiometricType! })}</Text>
+                {Platform.OS === 'android' && Platform.Version >= 30 && (
+                  <Text style={styles.subtitleText}>{loc.formatString(loc.settings.biometrics_fail, { type: deviceBiometricType! })}</Text>
+                )}
+              </>
+            }
           />
-          <BlueCard>
-            <BlueText>{loc.formatString(loc.settings.encrypt_use_expl, { type: deviceBiometricType! })}</BlueText>
-            {renderPasscodeExplanation()}
-          </BlueCard>
-          <BlueSpacing20 />
         </>
       )}
-      <Text adjustsFontSizeToFit style={[styles.headerText, styleHooks.headerText]}>
-        {loc.settings.encrypt_tstorage}
-      </Text>
+      <BlueSpacing20 />
+      <Header leftText={loc.settings.encrypt_tstorage} />
       <ListItem
         testID="EncyptedAndPasswordProtected"
         title={loc.settings.encrypt_enc_and_pass}
@@ -211,7 +204,7 @@ const EncryptStorage = () => {
               dispatch({ type: ActionType.SetModalType, payload: MODAL_TYPES.SUCCESS });
               success = true;
             } catch (error) {
-              presentAlert({ title: loc.errors.error, message: (error as Error).message });
+              presentAlert({ message: (error as Error).message });
               success = false;
             }
           } else if (state.modalType === MODAL_TYPES.ENTER_PASSWORD) {
@@ -243,12 +236,11 @@ const styles = StyleSheet.create({
     flex: 1,
   },
   paddingTop: { paddingTop: 19 },
-  headerText: {
-    fontWeight: 'bold',
-    fontSize: 30,
-    marginLeft: 17,
-  },
   row: { minHeight: 60 },
+  subtitleText: {
+    fontSize: 14,
+    marginTop: 5,
+  },
 });
 
 export default EncryptStorage;
diff --git a/screen/settings/GeneralSettings.tsx b/screen/settings/GeneralSettings.tsx
@@ -1,7 +1,7 @@
 import { useNavigation } from '@react-navigation/native';
 import React from 'react';
 import { Platform, ScrollView, StyleSheet } from 'react-native';
-import { BlueCard, BlueSpacing20, BlueText } from '../../BlueComponents';
+import { BlueSpacing20 } from '../../BlueComponents';
 import ListItem, { PressableWrapper } from '../../components/ListItem';
 import { useTheme } from '../../components/themes';
 import loc from '../../loc';
@@ -50,14 +50,10 @@ const GeneralSettings: React.FC = () => {
             title={loc.settings.general_continuity}
             Component={PressableWrapper}
             switch={{ onValueChange: onHandOffUseEnabledChange, value: isHandOffUseEnabled }}
+            subtitle={loc.settings.general_continuity_e}
           />
-          <BlueCard>
-            <BlueText>{loc.settings.general_continuity_e}</BlueText>
-          </BlueCard>
-          <BlueSpacing20 />
         </>
       ) : null}
-      <BlueSpacing20 />
       <ListItem
         Component={PressableWrapper}
         title="Legacy URv1 QR"