Merge branch 'x' into fix-friends-2

limichange · web-flow · commit b8c63285f745 · 2025-11-14T21:55:40.000+08:00
diff --git a/packages/components/src/forms/Input/index.tsx b/packages/components/src/forms/Input/index.tsx
@@ -92,6 +92,7 @@ export type IInputProps = {
   containerProps?: IGroupProps;
   onPaste?: (event: IPasteEventParams) => void;
   onChangeText?: ((text: string) => string | void) | undefined;
+  onSecureTextEntryChange?: (secureTextEntry: boolean) => void;
 } & Omit<ITMInputProps, 'size' | 'onChangeText' | 'onPaste' | 'readOnly'> & {
     /** Web only */
     onCompositionStart?: CompositionEventHandler<any>;
@@ -271,6 +272,7 @@ function BaseInput(
     autoFocusDelayMs,
     autoScrollTopDelayMs,
     secureTextEntry,
+    onSecureTextEntryChange,
     ...props
   } = useProps(inputProps) as IInputProps;
   const { paddingLeftWithIcon, height, iconLeftPosition } = SIZE_MAPPINGS[size];
@@ -360,6 +362,7 @@ function BaseInput(
       allAddOns.push({
         iconName: secureEntryState ? 'EyeOffOutline' : 'EyeOutline',
         onPress: () => {
+          onSecureTextEntryChange?.(!secureEntryState);
           setSecureEntryState(!secureEntryState);
         },
       });
@@ -379,6 +382,7 @@ function BaseInput(
     clearClipboardOnPaste,
     clearText,
     secureEntryState,
+    onSecureTextEntryChange,
   ]);
 
   useOnWebPaste(inputRef, onPaste);
diff --git a/packages/kit/src/views/Onboardingv2/hooks/useDeviceConnect.tsx b/packages/kit/src/views/Onboardingv2/hooks/useDeviceConnect.tsx
@@ -706,7 +706,11 @@ export function useDeviceConnect() {
       console.log('Current hardware wallet State', deviceState, strategy);
       if (!strategy) {
         await closeDialogAndReturn(device, { skipDelayClose: true });
-        throw new OneKeyLocalError('No wallet creation strategy');
+        throw new OneKeyLocalError({
+          message: intl.formatMessage({
+            id: ETranslations.hardware_user_cancel_error,
+          }),
+        });
       }
 
       await createHwWallet(
@@ -724,6 +728,7 @@ export function useDeviceConnect() {
       determineWalletCreationStrategy,
       createHwWallet,
       closeDialogAndReturn,
+      intl,
     ],
   );
   return useMemo(
diff --git a/packages/kit/src/views/Onboardingv2/pages/CheckAndUpdate.tsx b/packages/kit/src/views/Onboardingv2/pages/CheckAndUpdate.tsx
@@ -72,6 +72,7 @@ function CheckAndUpdatePage({
   console.log('deviceData', deviceData);
   const themeVariant = useThemeVariant();
   const navigation = useAppNavigation();
+  const isFirmwareVerifiedRef = useRef<boolean | undefined>(undefined);
 
   const deviceLabel = useMemo(() => {
     if ((deviceData.device as KnownDevice)?.label) {
@@ -269,7 +270,7 @@ function CheckAndUpdatePage({
           ...deviceData,
           device: (deviceForFinalize ?? deviceData.device) as SearchDevice,
         },
-        isFirmwareVerified: true,
+        isFirmwareVerified: isFirmwareVerifiedRef.current,
       });
     }, 1200);
   }, [
@@ -451,6 +452,7 @@ function CheckAndUpdatePage({
           void checkFirmwareUpdate();
         }, 150);
       }
+      isFirmwareVerifiedRef.current = !!result.verified;
     } catch (error) {
       setSteps((prev) => {
         const newSteps = [...prev];
@@ -988,11 +990,13 @@ function CheckAndUpdatePage({
                               id: ETranslations.global_retry,
                             })}
                           </Button>
-                          <Button onPress={handleSkipCurrentStep}>
-                            {intl.formatMessage({
-                              id: ETranslations.global_skip,
-                            })}
-                          </Button>
+                          {step.id !== ECheckAndUpdateStepId.GenuineCheck ? (
+                            <Button onPress={handleSkipCurrentStep}>
+                              {intl.formatMessage({
+                                id: ETranslations.global_skip,
+                              })}
+                            </Button>
+                          ) : null}
                         </XStack>
                       </XStack>
                     ) : null}
diff --git a/packages/kit/src/views/Onboardingv2/pages/FinalizeWalletSetup.tsx b/packages/kit/src/views/Onboardingv2/pages/FinalizeWalletSetup.tsx
@@ -303,7 +303,7 @@ function FinalizeWalletSetupPage({
           },
         });
         created.current = true;
-      } else if (deviceData && isFirmwareVerified) {
+      } else if (deviceData && isFirmwareVerified !== undefined) {
         await connectDevice(deviceData.device as SearchDevice);
         await createHWWallet({
           device: deviceData.device as SearchDevice,
diff --git a/packages/kit/src/views/Onboardingv2/pages/ImportPhraseOrPrivateKey.tsx b/packages/kit/src/views/Onboardingv2/pages/ImportPhraseOrPrivateKey.tsx
@@ -1,5 +1,5 @@
 import type { ReactNode, RefObject } from 'react';
-import { useCallback, useRef, useState } from 'react';
+import { useCallback, useMemo, useRef, useState } from 'react';
 
 import { useRoute } from '@react-navigation/core';
 import { noop } from 'lodash';
@@ -10,6 +10,7 @@ import Animated, {
   useSharedValue,
 } from 'react-native-reanimated';
 
+import type { IInputRef, ITextAreaInputProps } from '@onekeyhq/components';
 import {
   Button,
   HeightTransition,
@@ -35,14 +36,134 @@ import {
 
 import backgroundApiProxy from '../../../background/instance/backgroundApiProxy';
 import useAppNavigation from '../../../hooks/useAppNavigation';
-import { useAppRoute } from '../../../hooks/useAppRoute';
 import { fixInputImportSingleChain } from '../../Onboarding/pages/ImportWallet/ImportSingleChainBase';
 import useScanQrCode from '../../ScanQrCode/hooks/useScanQrCode';
 import { OnboardingLayout } from '../components/OnboardingLayout';
 import { PhaseInputArea } from '../components/PhaseInputArea';
 
 import type { IPhaseInputAreaInstance } from '../components/PhaseInputArea';
 import type { RouteProp } from '@react-navigation/core';
+import type {
+  NativeSyntheticEvent,
+  TextInput,
+  TextInputSelectionChangeEventData,
+} from 'react-native';
+
+function PrivateKeyInput({ value = '', onChangeText }: ITextAreaInputProps) {
+  const intl = useIntl();
+  const [privateKey, setPrivateKey] = useState(value);
+  const { start: startScanQrCode } = useScanQrCode();
+  const [encrypted, setEncrypted] = useState(true);
+  const inputRef = useRef<IInputRef>(null);
+
+  const privateKeyRef = useRef(privateKey);
+  privateKeyRef.current = privateKey;
+  const selectionRef = useRef({ start: 0, end: 0 });
+
+  const handleSelectionChange = useCallback(
+    (e: NativeSyntheticEvent<TextInputSelectionChangeEventData>) => {
+      const selection = e.nativeEvent.selection;
+      console.log('handleSelectionChange', selection);
+      selectionRef.current = selection;
+    },
+    [],
+  );
+
+  const formattedValue = useMemo(() => {
+    if (encrypted) {
+      return '•'.repeat(privateKey.length);
+    }
+    return privateKey;
+  }, [encrypted, privateKey]);
+
+  const updatePrivateKey = useCallback(
+    (text: string) => {
+      setPrivateKey(text);
+      onChangeText?.(text);
+    },
+    [onChangeText],
+  );
+
+  const handleChangeText = useCallback(
+    (text: string) => {
+      if (encrypted) {
+        // Find non-asterisk characters in text and merge with actual privateKey
+        const selection = selectionRef.current;
+        let newPrivateKey = privateKeyRef.current;
+
+        // Calculate the difference between old and new text
+        const oldLength = privateKeyRef.current.length;
+        const newLength = text.length;
+
+        const selectionRange = selection.end - selection.start;
+
+        if (selectionRange > 0) {
+          // Text was selected and replaced - replace selected characters with new text
+          const selectedText = text
+            .slice(selection.start, selection.end)
+            .replace(/•/g, '');
+          newPrivateKey =
+            privateKeyRef.current.slice(0, selection.start) +
+            selectedText +
+            privateKeyRef.current.slice(selection.end);
+        } else if (newLength > oldLength) {
+          // Text was added - insert new characters at selection position
+          const addedText = text.slice(
+            selection.start,
+            selection.start + (newLength - oldLength),
+          );
+          newPrivateKey =
+            privateKeyRef.current.slice(0, selection.start) +
+            addedText +
+            privateKeyRef.current.slice(selection.start);
+        } else if (newLength < oldLength) {
+          // Text was removed - remove characters from selection position
+          const removedCount = oldLength - newLength;
+          const selectionStart = selection.start - 1;
+          newPrivateKey =
+            privateKeyRef.current.slice(0, selectionStart) +
+            privateKeyRef.current.slice(selectionStart + removedCount);
+        } else {
+          // Text was replaced - replace characters at selection position
+          const replacedText = text.slice(selection.start, selection.end);
+          newPrivateKey =
+            privateKeyRef.current.slice(0, selection.start) +
+            replacedText +
+            privateKeyRef.current.slice(selection.end);
+        }
+
+        updatePrivateKey(newPrivateKey);
+      } else {
+        updatePrivateKey(text);
+      }
+    },
+    [encrypted, updatePrivateKey],
+  );
+
+  return (
+    <TextAreaInput
+      ref={inputRef as RefObject<TextInput>}
+      allowPaste
+      allowClear
+      allowScan
+      allowSecureTextEye // TextAreaInput not support allowSecureTextEye
+      onSelectionChange={handleSelectionChange}
+      clearClipboardOnPaste
+      onSecureTextEntryChange={setEncrypted}
+      startScanQrCode={startScanQrCode}
+      size="large"
+      numberOfLines={5}
+      value={formattedValue}
+      onChangeText={handleChangeText}
+      $platform-native={{
+        minHeight: 160,
+      }}
+      placeholder={intl.formatMessage({
+        id: ETranslations.form_enter_private_key_placeholder,
+      })}
+    />
+  );
+}
 
 export default function ImportPhraseOrPrivateKey() {
   const navigation = useAppNavigation();
@@ -221,23 +342,9 @@ export default function ImportPhraseOrPrivateKey() {
                   }}
                   gap="$5"
                 >
-                  <Input
-                    allowPaste
-                    allowClear
-                    allowScan
-                    allowSecureTextEye // TextAreaInput not support allowSecureTextEye
-                    clearClipboardOnPaste
-                    startScanQrCode={startScanQrCode}
-                    size="large"
-                    numberOfLines={5}
+                  <PrivateKeyInput
                     value={privateKey}
                     onChangeText={setPrivateKey}
-                    $platform-native={{
-                      minHeight: 160,
-                    }}
-                    placeholder={intl.formatMessage({
-                      id: ETranslations.form_enter_private_key_placeholder,
-                    })}
                   />
                 </YStack>
               )}
diff --git a/packages/kit/src/views/Onboardingv2/pages/VerifyRecoveryPhrase.tsx b/packages/kit/src/views/Onboardingv2/pages/VerifyRecoveryPhrase.tsx
diff --git a/packages/kit/src/views/Swap/hooks/useSwapAccount.ts b/packages/kit/src/views/Swap/hooks/useSwapAccount.ts
