fix:Merge branch 'x' into fix/passcode

packages/components/src/actions/Toast/index.tsx

@@ -8,15 +8,9 @@ import { useMedia } from 'tamagui';
 import { dismissKeyboard } from '@onekeyhq/shared/src/keyboard';
 import platformEnv from '@onekeyhq/shared/src/platformEnv';
 
+import { AnchorSizableText } from '../../content/AnchorSizableText';
 import { Portal } from '../../hocs';
-import {
-  Anchor,
-  Icon,
-  SizableText,
-  View,
-  XStack,
-  YStack,
-} from '../../primitives';
+import { Icon, View, XStack, YStack } from '../../primitives';
 
 import { ShowCustom, ShowToasterClose } from './ShowCustom';
 import { showMessage } from './showMessage';
@@ -48,7 +42,6 @@ const iconMap = {
   warning: <Icon name="ErrorSolid" color="$iconCaution" size="$5" />,
 };
 
-const urlRegex = /<url(?:\s+[^>]*?)?>(.*?)<\/url>/g;
 const RenderLines = ({
   size,
   children: text,
@@ -69,52 +62,18 @@ const RenderLines = ({
 
   return (
     <YStack>
-      {lines.map((line, index) => {
-        const hasUrl = urlRegex.test(line);
-        if (!hasUrl) {
-          return (
-            <SizableText
-              key={index}
-              color={color}
-              textTransform="none"
-              userSelect="none"
-              size={size}
-              wordWrap="break-word"
-            >
-              {line}
-            </SizableText>
-          );
-        }
-        const parts = line.split(urlRegex);
-        const hrefMatch = line.match(/href="(.*?)"/);
-        return (
-          <SizableText
-            key={index}
-            color={color}
-            textTransform="none"
-            userSelect="none"
-            size={size}
-            wordWrap="break-word"
-          >
-            {parts.map((part, partIndex) => {
-              if (partIndex % 2 === 1) {
-                return (
-                  <Anchor
-                    key={partIndex}
-                    href={hrefMatch?.[1]}
-                    target="_blank"
-                    size={size}
-                    color="$textInfo"
-                  >
-                    {part}
-                  </Anchor>
-                );
-              }
-              return part;
-            })}
-          </SizableText>
-        );
-      })}
+      {lines.map((line, index) => (
+        <AnchorSizableText
+          key={index}
+          color={color}
+          textTransform="none"
+          userSelect="none"
+          size={size}
+          wordWrap="break-word"
+        >
+          {line}
+        </AnchorSizableText>
+      ))}
     </YStack>
   );
 };

packages/components/src/content/AnchorSizableText/index.tsx

@@ -0,0 +1,46 @@
+import { Anchor, SizableText } from '../../primitives';
+
+import type { IAnchorProps, ISizableTextProps } from '../../primitives';
+
+export interface IAnchorSizableTextProps extends ISizableTextProps {
+  anchorRegExp?: RegExp;
+  hrefRegExp?: RegExp;
+  anchorProps?: IAnchorProps;
+}
+
+export function AnchorSizableText({
+  anchorRegExp = /<url(?:\s+[^>]*?)?>(.*?)<\/url>/g,
+  hrefRegExp = /href="(.*?)"/,
+  children,
+  anchorProps,
+  ...props
+}: IAnchorSizableTextProps) {
+  const line = children as string;
+  const isAnchor = anchorRegExp.test(line);
+  if (isAnchor) {
+    const parts = line.split(anchorRegExp);
+    const hrefMatch = line.match(/href="(.*?)"/);
+    return (
+      <SizableText {...props}>
+        {parts.map((part, partIndex) => {
+          if (partIndex === 1) {
+            return (
+              <Anchor
+                {...props}
+                target="_blank"
+                color="$textInfo"
+                {...anchorProps}
+                key={partIndex}
+                href={hrefMatch?.[1]}
+              >
+                {part}
+              </Anchor>
+            );
+          }
+          return part;
+        })}
+      </SizableText>
+    );
+  }
+  return <SizableText {...props}>{line}</SizableText>;
+}

packages/components/src/content/index.ts

@@ -1,3 +1,4 @@
+export * from './AnchorSizableText';
 export * from './Badge';
 export * from './HeightTransition';
 export * from './LinearGradient';

packages/components/src/layouts/Navigation/Navigator/TabStackNavigator.tsx

@@ -34,13 +34,13 @@ function TabSubStackNavigator({
             component={component}
             options={({ navigation }: { navigation: any }) => ({
               freezeOnBlur: true,
-              headerShown,
               title: translationId
                 ? intl.formatMessage({
                     id: translationId,
                   })
                 : '',
               ...makeTabScreenOptions({ navigation, bgColor, titleColor }),
+              headerShown,
             })}
           />
         ))}

packages/kit-bg/src/services/ServiceToken.ts

@@ -195,7 +195,7 @@ class ServiceToken extends ServiceBase {
     }
 
     resp.data.data.tokens.data = resp.data.data.tokens.data.map((token) => ({
-      ...this.mergeTokenMetadataWithCustomData({
+      ...this.mergeTokenMetadataWithCustomDataSync({
         token,
         customTokens,
         networkId,
@@ -207,7 +207,7 @@ class ServiceToken extends ServiceBase {
 
     resp.data.data.riskTokens.data = resp.data.data.riskTokens.data.map(
       (token) => ({
-        ...this.mergeTokenMetadataWithCustomData({
+        ...this.mergeTokenMetadataWithCustomDataSync({
           token,
           customTokens,
           networkId,
@@ -220,7 +220,7 @@ class ServiceToken extends ServiceBase {
 
     resp.data.data.smallBalanceTokens.data =
       resp.data.data.smallBalanceTokens.data.map((token) => ({
-        ...this.mergeTokenMetadataWithCustomData({
+        ...this.mergeTokenMetadataWithCustomDataSync({
           token,
           customTokens,
           networkId,
@@ -287,7 +287,16 @@ class ServiceToken extends ServiceBase {
     return resp.data.data;
   }
 
-  private mergeTokenMetadataWithCustomData<T extends IToken>({
+  @backgroundMethod()
+  async mergeTokenMetadataWithCustomData<T extends IToken>(params: {
+    token: T;
+    customTokens: IAccountToken[];
+    networkId: string;
+  }): Promise<T> {
+    return Promise.resolve(this.mergeTokenMetadataWithCustomDataSync(params));
+  }
+
+  private mergeTokenMetadataWithCustomDataSync<T extends IToken>({
     token,
     customTokens,
     networkId,
@@ -521,7 +530,7 @@ class ServiceToken extends ServiceBase {
             networkId,
           });
 
-        tokenInfo = this.mergeTokenMetadataWithCustomData({
+        tokenInfo = this.mergeTokenMetadataWithCustomDataSync({
           token: tokenInfo,
           customTokens,
           networkId,

packages/kit/src/components/Hardware/Hardware.tsx

@@ -21,6 +21,7 @@ import {
   useMedia,
 } from '@onekeyhq/components';
 import { ETranslations } from '@onekeyhq/shared/src/locale';
+import platformEnv from '@onekeyhq/shared/src/platformEnv';
 
 import { SHOW_CLOSE_ACTION_MIN_DURATION } from '../../provider/Container/HardwareUiStateContainer/constants';
 import { isPassphraseValid } from '../../utils/passphraseUtils';
@@ -349,6 +350,42 @@ export function EnterPhase({
   const [secureEntry1, setSecureEntry1] = useState(true);
   const [secureEntry2, setSecureEntry2] = useState(true);
 
+  const handleSubmit = form.handleSubmit(async () => {
+    const values = form.getValues();
+    if (
+      !isSingleInput &&
+      (values.passphrase || '') !== (values.confirmPassphrase || '')
+    ) {
+      Toast.error({
+        title: intl.formatMessage({
+          id: ETranslations.feedback_passphrase_not_matched,
+        }),
+      });
+      return;
+    }
+    const passphrase = values.passphrase || '';
+    onConfirm({ passphrase, save: true });
+  });
+
+  const handleKeyPress = useCallback(
+    async (event: KeyboardEvent) => {
+      if (event.key === 'Enter') {
+        void handleSubmit();
+      }
+    },
+    [handleSubmit],
+  );
+
+  useEffect(() => {
+    if (platformEnv.isRuntimeBrowser && typeof document !== 'undefined') {
+      document.addEventListener('keypress', handleKeyPress);
+      return () => {
+        document.removeEventListener('keypress', handleKeyPress);
+      };
+    }
+    return undefined;
+  }, [handleKeyPress]);
+
   return (
     <Stack>
       <Stack pb="$5">
@@ -443,41 +480,7 @@ export function EnterPhase({
           } as any
         }
         variant="primary"
-        onPress={form.handleSubmit(async () => {
-          const values = form.getValues();
-          if (
-            !isSingleInput &&
-            (values.passphrase || '') !== (values.confirmPassphrase || '')
-          ) {
-            Toast.error({
-              title: intl.formatMessage({
-                id: ETranslations.feedback_passphrase_not_matched,
-              }),
-            });
-            return;
-          }
-          // allow empty passphrase
-          const passphrase = values.passphrase || '';
-          onConfirm({ passphrase, save: true });
-
-          // Dialog.show({
-          //   icon: 'CheckboxSolid',
-          //   title: 'Keep Your Wallet Accessible?',
-          //   description:
-          //     'Save this wallet to your device to maintain access after the app is closed. Unsaved wallets will be removed automatically.',
-          //   onConfirm: () => {
-          //     onConfirm({ passphrase: values.passphrase, save: true });
-          //   },
-          //   onConfirmText: 'Save Wallet',
-          //   confirmButtonProps: {
-          //     variant: 'secondary',
-          //   },
-          //   onCancel: () => {
-          //     onConfirm({ passphrase: values.passphrase, save: false });
-          //   },
-          //   onCancelText: "Don't Save",
-          // });
-        })}
+        onPress={handleSubmit}
       >
         {intl.formatMessage({ id: ETranslations.global_confirm })}
       </Button>

packages/kit/src/components/TradingView/index.tsx

@@ -19,59 +19,27 @@ interface IBaseTradingViewProps {
   identifier: string;
   baseToken: string;
   targetToken: string;
+  onLoadEnd: () => void;
 }
 
 export type ITradingViewProps = IBaseTradingViewProps & IStackStyle;
 
-function Loading() {
-  return (
-    <Stack flex={1} alignContent="center" justifyContent="center">
-      <Spinner size="large" />
-    </Stack>
-  );
-}
-
 export function TradingView(props: ITradingViewProps & WebViewProps) {
   const [restProps, style] = usePropsAndStyle(props);
   const { targetToken, identifier, baseToken, ...otherProps } =
     restProps as IBaseTradingViewProps;
-  const [showLoading, changeShowLoading] = useState(true);
   const tradingViewProps = useTradingViewProps({
     targetToken,
     identifier,
     baseToken,
   });
-  const onLoadEnd = useCallback(() => {
-    changeShowLoading(false);
-  }, []);
   return (
     <Stack bg="$bgApp" style={style as ViewStyle}>
       <WebView
         tradingViewProps={tradingViewProps}
         style={{ flex: 1 }}
-        onLoadEnd={onLoadEnd}
         {...otherProps}
       />
-      <AnimatePresence>
-        {showLoading ? (
-          <Stack
-            bg="$bgApp"
-            position="absolute"
-            top={0}
-            left={0}
-            right={0}
-            bottom={0}
-            opacity={1}
-            flex={1}
-            animation="quick"
-            exitStyle={{
-              opacity: 0,
-            }}
-          >
-            <Loading />
-          </Stack>
-        ) : null}
-      </AnimatePresence>
     </Stack>
   );
 }

packages/kit/src/routes/Tab/Discovery/router.ts

@@ -15,6 +15,7 @@ export const discoveryRouters: ITabSubNavigatorConfig<any, any>[] = [
   {
     name: ETabDiscoveryRoutes.TabDiscovery,
     rewrite: '/',
+    headerShown: !platformEnv.isNative,
     component:
       platformEnv.isNative && !platformEnv.isNativeIOSPad
         ? Browser

packages/kit/src/routes/Tab/Earn/router.ts

@@ -1,4 +1,5 @@
 import type { ITabSubNavigatorConfig } from '@onekeyhq/components';
+import platformEnv from '@onekeyhq/shared/src/platformEnv';
 import { ETabEarnRoutes } from '@onekeyhq/shared/src/routes';
 
 import { LazyLoadRootTabPage } from '../../../components/LazyLoadPage';
@@ -12,5 +13,6 @@ export const earnRouters: ITabSubNavigatorConfig<any, any>[] = [
     rewrite: '/',
     name: ETabEarnRoutes.EarnHome,
     component: EarnHome,
+    headerShown: !platformEnv.isNative,
   },
 ];