Fix/swap limit OK-48308 OK-48314 (#9547)

* fix: swap limit

* fix: aptos detect

* fix: stellar networkPassphrase params lint

Author: ByteZhang1024

packages/core/src/chains/stellar/CoreChainSoftware.ts

@@ -24,7 +24,8 @@ import { hashMessage } from './utils/message';
 import { assembleSignedTransaction } from './utils/signing';
 import { extractTransactionHash } from './utils/transaction';
 
-import type { IEncodedTxStellar, IUnsignedMessageStellar } from './types';
+import type { IEncodedTxStellar } from './types';
+import type { IUnsignedMessageStellar } from '../../types/coreTypesMessage';
 
 const curve: ICurveName = 'ed25519';
 
@@ -105,10 +106,11 @@ export default class CoreChainSoftware extends CoreChainApiBase {
     });
 
     const unsignedMsg = payload.unsignedMsg as IUnsignedMessageStellar;
+
     const messageHash: Buffer = hashMessage({
       messageType: unsignedMsg.type,
       message: unsignedMsg.message,
-      networkPassphrase: unsignedMsg.networkPassphrase ?? '',
+      networkPassphrase: unsignedMsg.payload?.networkPassphrase ?? '',
     });
     const [signature] = await signer.sign(messageHash);
 

packages/core/src/chains/stellar/types.ts

@@ -35,9 +35,3 @@ export type IEncodedTxStellar = {
   // Indicates if transaction is from dApp (should not be modified)
   isFromDapp?: boolean;
 };
-
-export type IUnsignedMessageStellar = {
-  type: EMessageTypesStellar;
-  message: string;
-  networkPassphrase?: string;
-};

packages/kit-bg/src/providers/ProviderApiStellar.ts

@@ -241,12 +241,18 @@ class ProviderApiStellar extends ProviderApiBase {
     // const { accountInfo: { accountId, networkId, address } = {} } = (
     //   await this.getAccountsInfo(request)
     // )[0];
+    // let resolvedNetworkPassphrase = networkPassphrase;
+    // if (!resolvedNetworkPassphrase) {
+    //   resolvedNetworkPassphrase = getNetworkPassphrase(networkId ?? '');
+    // }
     // const result = (await this.backgroundApi.serviceDApp.openSignMessageModal({
     //   request,
     //   unsignedMessage: {
     //     type: EMessageTypesStellar.SIGN_AUTH_ENTRY,
     //     message: authEntry,
-    //     networkPassphrase: networkPassphrase ?? '',
+    //     payload: {
+    //       networkPassphrase: resolvedNetworkPassphrase,
+    //     },
     //   },
     //   accountId: accountId ?? '',
     //   networkId: networkId ?? '',
@@ -264,7 +270,7 @@ class ProviderApiStellar extends ProviderApiBase {
   ): Promise<ISignMessageResult> {
     defaultLogger.discovery.dapp.dappRequest({ request });
 
-    const { message, networkPassphrase } = params;
+    const { message } = params;
 
     if (!message) {
       throw web3Errors.rpc.invalidParams('Message is required');
@@ -279,9 +285,6 @@ class ProviderApiStellar extends ProviderApiBase {
       unsignedMessage: {
         type: EMessageTypesStellar.SIGN_MESSAGE,
         message,
-        payload: {
-          networkPassphrase,
-        },
       },
       accountId: accountId ?? '',
       networkId: networkId ?? '',

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

@@ -5488,12 +5488,18 @@ class ServiceAccount extends ServiceBase {
     accountImpl,
     featuresInfoCache,
     activeNetworkId,
+    limitOptions = {
+      allowWatchingWallet: true,
+    },
   }: {
     accountId?: string;
     walletId?: string;
     accountImpl?: string;
     featuresInfoCache?: IOneKeyDeviceFeatures;
     activeNetworkId: string;
+    limitOptions?: {
+      allowWatchingWallet?: boolean;
+    };
   }): Promise<
     | {
         networkImpl: string;
@@ -5513,15 +5519,21 @@ class ServiceAccount extends ServiceBase {
       finalWalletId = accountUtils.getWalletIdFromAccountId({ accountId });
     }
 
-    // Early returns for watching wallet
-    if (finalWalletId === WALLET_TYPE_WATCHING) {
-      return undefined;
-    }
-
     const { impl: activeNetworkImpl } = networkUtils.parseNetworkId({
       networkId: activeNetworkId ?? '',
     });
 
+    // Early returns for watching wallet
+    if (accountUtils.isWatchingWallet({ walletId: finalWalletId })) {
+      if (limitOptions?.allowWatchingWallet) {
+        return undefined;
+      }
+
+      return {
+        networkImpl: activeNetworkImpl,
+      };
+    }
+
     // other account maybe not have accountId only have walletId
     if (accountId && accountUtils.isOthersAccount({ accountId })) {
       let currentAccountImpl = accountImpl;

packages/kit-bg/src/vaults/impls/stellar/Vault.ts

@@ -2,6 +2,11 @@
 import BigNumber from 'bignumber.js';
 import { md5 } from 'js-md5';
 import { isEmpty, isNaN, orderBy } from 'lodash';
+
+import type {
+  IEncodedTxStellar,
+  IStellarAsset,
+} from '@onekeyhq/core/src/chains/stellar/types';
 import coreChainApi from '@onekeyhq/core/src/instance/coreChainApi';
 import {
   decodeSensitiveTextAsync,
@@ -21,11 +26,6 @@ import { ETranslations } from '@onekeyhq/shared/src/locale';
 import bufferUtils from '@onekeyhq/shared/src/utils/bufferUtils';
 import { memoizee } from '@onekeyhq/shared/src/utils/cacheUtils';
 import timerUtils from '@onekeyhq/shared/src/utils/timerUtils';
-
-import type {
-  IEncodedTxStellar,
-  IStellarAsset,
-} from '@onekeyhq/core/src/chains/stellar/types';
 import type {
   IAddressValidation,
   IFetchServerAccountDetailsParams,
@@ -41,8 +41,8 @@ import type {
   IMeasureRpcStatusResult,
 } from '@onekeyhq/shared/types/customRpc';
 import type {
-  IServerEstimateFeeResponse,
   IFeeInfoUnit,
+  IServerEstimateFeeResponse,
 } from '@onekeyhq/shared/types/fee';
 import type {
   IFetchServerTokenDetailParams,

packages/kit/src/components/AccountSelector/hooks/useAutoSelectAccount.tsx

@@ -10,13 +10,13 @@ import {
   EAccountSelectorSceneName,
 } from '@onekeyhq/shared/types';
 
-import { deferHeavyWorkUntilUIIdle } from '../../../utils/deferHeavyWork';
 import {
   useAccountSelectorActions,
   useAccountSelectorSceneInfo,
   useAccountSelectorStorageReadyAtom,
   useActiveAccount,
 } from '../../../states/jotai/contexts/accountSelector';
+import { deferHeavyWorkUntilUIIdle } from '../../../utils/deferHeavyWork';
 
 export function useAutoSelectAccount({ num }: { num: number }) {
   const {

packages/kit/src/states/jotai/contexts/swap/actions.ts

@@ -1150,6 +1150,30 @@ class ContentJotaiActionsSwap extends ContextJotaiActionsBase {
         return;
       }
 
+      if (
+        fromToken &&
+        !swapFromAddressInfo.address &&
+        !accountUtils.isHdWallet({
+          walletId: swapFromAddressInfo.accountInfo?.wallet?.id,
+        }) &&
+        !accountUtils.isHwWallet({
+          walletId: swapFromAddressInfo.accountInfo?.wallet?.id,
+        }) &&
+        !accountUtils.isQrWallet({
+          walletId: swapFromAddressInfo.accountInfo?.wallet?.id,
+        })
+      ) {
+        alertsRes = [
+          ...alertsRes,
+          {
+            message: appLocale.intl.formatMessage({
+              id: ETranslations.swap_page_alert_account_does_not_support_swap,
+            }),
+            alertLevel: ESwapAlertLevel.ERROR,
+          },
+        ];
+      }
+
       if (fromToken && swapFromAddressInfo.accountInfo?.wallet?.id) {
         const needCheck =
           !swapFromAddressInfo.address ||

packages/kit/src/views/Home/pages/HomePageView.tsx

@@ -1,8 +1,7 @@
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 
-import { useIntl } from 'react-intl';
-
 import { CanceledError } from 'axios';
+import { useIntl } from 'react-intl';
 
 import type { ITabContainerRef } from '@onekeyhq/components';
 import {
@@ -203,17 +202,18 @@ export function HomePageView({
       if (cancelled) return;
 
       try {
-        const resp = await backgroundApiProxy.serviceApproval.fetchAccountApprovals(
-          {
+        const resp =
+          await backgroundApiProxy.serviceApproval.fetchAccountApprovals({
             networkId: network.id,
             accountId: account.id,
             indexedAccountId: indexedAccount?.id,
             accountAddress: account.address,
-          },
-        );
+          });
         if (cancelled) return;
         updateApprovalsInfo({
-          hasRiskApprovals: resp.contractApprovals.some((i) => i.isRiskContract),
+          hasRiskApprovals: resp.contractApprovals.some(
+            (i) => i.isRiskContract,
+          ),
         });
       } catch (error) {
         if (error instanceof CanceledError) {

packages/kit/src/views/Home/pages/TokenListContainer.tsx

@@ -1932,24 +1932,24 @@ function TokenListContainer({
   ]);
 
   return (
-      <TokenListView
-        withHeader
-        withFooter
-        withPrice
-        inTabList
-        hideValue
-        withSwapAction
-        accountId={account?.id ?? ''}
-        networkId={network?.id ?? ''}
-        indexedAccountId={indexedAccount?.id ?? ''}
-        allAggregateTokenMap={allAggregateTokenMap}
-        showNetworkIcon={!!network?.isAllNetworks}
-        hideZeroBalanceTokens={!!network?.isAllNetworks}
-        deferTokenManagement={!!network?.isAllNetworks}
-        onRefresh={onHomePageRefresh}
-        manageTokenEnabled={manageTokenEnabled}
-        onManageToken={handleOnManageToken}
-        onPressToken={handleOnPressToken}
+    <TokenListView
+      withHeader
+      withFooter
+      withPrice
+      inTabList
+      hideValue
+      withSwapAction
+      accountId={account?.id ?? ''}
+      networkId={network?.id ?? ''}
+      indexedAccountId={indexedAccount?.id ?? ''}
+      allAggregateTokenMap={allAggregateTokenMap}
+      showNetworkIcon={!!network?.isAllNetworks}
+      hideZeroBalanceTokens={!!network?.isAllNetworks}
+      deferTokenManagement={!!network?.isAllNetworks}
+      onRefresh={onHomePageRefresh}
+      manageTokenEnabled={manageTokenEnabled}
+      onManageToken={handleOnManageToken}
+      onPressToken={handleOnPressToken}
       isAllNetworks={network?.isAllNetworks}
       homeDefaultTokenMap={homeDefaultTokenMap}
       {...(media.gtLg && {

packages/shared/src/utils/networkDetectUtils.test.ts

@@ -234,6 +234,17 @@ describe('Network Detection by Private Key', () => {
       );
     });
 
+    test('detects Aptos (ed25519-priv-0x-prefixed)', async () => {
+      const privateKey =
+        'ed25519-priv-0x25cb5c737d8bff654fc62a6af4b00224f3a4b5c963a898a7e8ea9f08cbda5b2a';
+      const result = await networkDetectUtils.detectNetworkByPrivateKey({
+        privateKey,
+      });
+      expect(result.networks).toContainEqual(
+        networkDetectUtils.buildDetectedNetwork(presetNetworksMap.aptos),
+      );
+    });
+
     test('detects Sui (0x-prefixed)', async () => {
       const privateKey =
         '0x644fedb8ebfec83d4a1cc983beb499048f8199bf72c8e8e57d5775603b8c5dd1';