@subwallet/extension-base 1.3.23-0 → 1.3.25-0

package/background/KoniTypes.d.ts

@@ -8,14 +8,14 @@ import { CardanoTransactionConfig } from '@subwallet/extension-base/services/bal
 import { TonTransactionConfig } from '@subwallet/extension-base/services/balance-service/transfer/ton-transfer';
 import { _CHAIN_VALIDATION_ERROR } from '@subwallet/extension-base/services/chain-service/handler/types';
 import { _ChainState, _EvmApi, _NetworkUpsertParams, _SubstrateApi, _ValidateCustomAssetRequest, _ValidateCustomAssetResponse, EnableChainParams, EnableMultiChainParams } from '@subwallet/extension-base/services/chain-service/types';
-import { TokenHasBalanceInfo } from '@subwallet/extension-base/services/fee-service/interfaces';
+import { TokenPayFeeInfo } from '@subwallet/extension-base/services/fee-service/interfaces';
 import { _NotificationInfo, NotificationSetup } from '@subwallet/extension-base/services/inapp-notification-service/interfaces';
 import { AppBannerData, AppConfirmationData, AppPopupData } from '@subwallet/extension-base/services/mkt-campaign-service/types';
 import { AuthUrls } from '@subwallet/extension-base/services/request-service/types';
 import { CrowdloanContributionsResponse } from '@subwallet/extension-base/services/subscan-service/types';
 import { SWTransactionResponse, SWTransactionResult } from '@subwallet/extension-base/services/transaction-service/types';
 import { WalletConnectNotSupportRequest, WalletConnectSessionRequest } from '@subwallet/extension-base/services/wallet-connect-service/types';
-import { AccountChainType, AccountJson, AccountsWithCurrentAddress, AddressJson, BalanceJson, BaseRequestSign, BuyServiceInfo, BuyTokenInfo, CommonOptimalPath, CurrentAccountInfo, EarningRewardHistoryItem, EarningRewardJson, EarningStatus, HandleYieldStepParams, InternalRequestSign, LeavePoolAdditionalData, NominationPoolInfo, OptimalSwapPathParams, OptimalYieldPath, OptimalYieldPathParams, RequestAccountBatchExportV2, RequestAccountCreateSuriV2, RequestAccountNameValidate, RequestAccountProxyEdit, RequestAccountProxyForget, RequestBatchJsonGetAccountInfo, RequestBatchRestoreV2, RequestBounceableValidate, RequestChangeAllowOneSign, RequestChangeTonWalletContractVersion, RequestCheckCrossChainTransfer, RequestCheckPublicAndSecretKey, RequestCheckTransfer, RequestCrossChainTransfer, RequestDeriveCreateMultiple, RequestDeriveCreateV3, RequestDeriveValidateV2, RequestEarlyValidateYield, RequestExportAccountProxyMnemonic, RequestGetAllTonWalletContractVersion, RequestGetAmountForPair, RequestGetDeriveAccounts, RequestGetDeriveSuggestion, RequestGetTokensCanPayFee, RequestGetYieldPoolTargets, RequestInputAccountSubscribe, RequestJsonGetAccountInfo, RequestJsonRestoreV2, RequestMetadataHash, RequestMnemonicCreateV2, RequestMnemonicValidateV2, RequestPrivateKeyValidateV2, RequestShortenMetadata, RequestStakeCancelWithdrawal, RequestStakeClaimReward, RequestSubmitProcessTransaction, RequestSubscribeProcessById, RequestTransfer, RequestUnlockDotCheckCanMint, RequestUnlockDotSubscribeMintedData, RequestYieldLeave, RequestYieldStepSubmit, RequestYieldWithdrawal, ResponseAccountBatchExportV2, ResponseAccountCreateSuriV2, ResponseAccountNameValidate, ResponseBatchJsonGetAccountInfo, ResponseCheckPublicAndSecretKey, ResponseDeriveValidateV2, ResponseEarlyValidateYield, ResponseExportAccountProxyMnemonic, ResponseGetAllTonWalletContractVersion, ResponseGetDeriveAccounts, ResponseGetDeriveSuggestion, ResponseGetYieldPoolTargets, ResponseInputAccountSubscribe, ResponseJsonGetAccountInfo, ResponseMetadataHash, ResponseMnemonicCreateV2, ResponseMnemonicValidateV2, ResponsePrivateKeyValidateV2, ResponseShortenMetadata, ResponseSubscribeProcessAlive, ResponseSubscribeProcessById, StorageDataInterface, SubmitYieldStepData, SwapPair, SwapQuoteResponse, SwapRequest, SwapRequestResult, SwapSubmitParams, SwapTxData, TokenSpendingApprovalParams, UnlockDotTransactionNft, UnstakingStatus, ValidateSwapProcessParams, ValidateYieldProcessParams, YieldPoolInfo, YieldPositionInfo } from '@subwallet/extension-base/types';
+import { AccountChainType, AccountJson, AccountsWithCurrentAddress, AddressJson, BalanceJson, BaseRequestSign, BuyServiceInfo, BuyTokenInfo, CommonOptimalPath, CurrentAccountInfo, EarningRewardHistoryItem, EarningRewardJson, EarningStatus, HandleYieldStepParams, InternalRequestSign, LeavePoolAdditionalData, NominationPoolInfo, OptimalSwapPathParams, OptimalYieldPath, OptimalYieldPathParams, RequestAccountBatchExportV2, RequestAccountCreateSuriV2, RequestAccountNameValidate, RequestAccountProxyEdit, RequestAccountProxyForget, RequestBatchJsonGetAccountInfo, RequestBatchRestoreV2, RequestBounceableValidate, RequestChangeAllowOneSign, RequestChangeTonWalletContractVersion, RequestCheckCrossChainTransfer, RequestCheckPublicAndSecretKey, RequestCheckTransfer, RequestCrossChainTransfer, RequestDeriveCreateMultiple, RequestDeriveCreateV3, RequestDeriveValidateV2, RequestEarlyValidateYield, RequestExportAccountProxyMnemonic, RequestGetAllTonWalletContractVersion, RequestGetAmountForPair, RequestGetDeriveAccounts, RequestGetDeriveSuggestion, RequestGetTokensCanPayFee, RequestGetYieldPoolTargets, RequestInputAccountSubscribe, RequestJsonGetAccountInfo, RequestJsonRestoreV2, RequestMetadataHash, RequestMnemonicCreateV2, RequestMnemonicValidateV2, RequestPrivateKeyValidateV2, RequestShortenMetadata, RequestStakeCancelWithdrawal, RequestStakeClaimReward, RequestSubmitProcessTransaction, RequestSubscribeProcessById, RequestTransfer, RequestUnlockDotCheckCanMint, RequestUnlockDotSubscribeMintedData, RequestYieldLeave, RequestYieldStepSubmit, RequestYieldWithdrawal, ResponseAccountBatchExportV2, ResponseAccountCreateSuriV2, ResponseAccountNameValidate, ResponseBatchJsonGetAccountInfo, ResponseCheckPublicAndSecretKey, ResponseDeriveValidateV2, ResponseEarlyValidateYield, ResponseExportAccountProxyMnemonic, ResponseGetAllTonWalletContractVersion, ResponseGetDeriveAccounts, ResponseGetDeriveSuggestion, ResponseGetYieldPoolTargets, ResponseInputAccountSubscribe, ResponseJsonGetAccountInfo, ResponseMetadataHash, ResponseMnemonicCreateV2, ResponseMnemonicValidateV2, ResponsePrivateKeyValidateV2, ResponseShortenMetadata, ResponseSubscribeProcessAlive, ResponseSubscribeProcessById, StorageDataInterface, SubmitYieldStepData, SubnetYieldPositionInfo, SwapPair, SwapQuoteResponse, SwapRequest, SwapRequestResult, SwapSubmitParams, SwapTxData, TokenSpendingApprovalParams, UnlockDotTransactionNft, UnstakingStatus, ValidateSwapProcessParams, ValidateYieldProcessParams, YieldPoolInfo, YieldPositionInfo } from '@subwallet/extension-base/types';
 import { RequestSubmitTransfer, RequestSubscribeTransfer, ResponseSubscribeTransfer } from '@subwallet/extension-base/types/balance/transfer';
 import { RequestClaimBridge } from '@subwallet/extension-base/types/bridge';
 import { GetNotificationParams, RequestIsClaimedPolygonBridge, RequestSwitchStatusParams } from '@subwallet/extension-base/types/notification';
@@ -821,6 +821,7 @@ export declare enum EvmProviderErrorType {
     UNSUPPORTED_METHOD = "UNSUPPORTED_METHOD",
     DISCONNECTED = "DISCONNECTED",
     CHAIN_DISCONNECTED = "CHAIN_DISCONNECTED",
+    NETWORK_NOT_SUPPORTED = "NETWORK_NOT_SUPPORTED",
     INVALID_PARAMS = "INVALID_PARAMS",
     INTERNAL_ERROR = "INTERNAL_ERROR"
 }
@@ -1120,6 +1121,7 @@ export interface NominationInfo {
     hasUnstaking?: boolean;
     validatorMinStake?: string;
     status: EarningStatus;
+    originActiveStake?: string;
 }
 export interface UnstakingInfo {
     chain: string;
@@ -1163,6 +1165,9 @@ export interface BondingSubmitParams extends BaseRequestSign {
     address: string;
     selectedValidators: ValidatorInfo[];
     lockPeriod?: number;
+    poolInfo?: {
+        metadata: SubnetYieldPositionInfo;
+    };
 }
 export declare type RequestBondingSubmit = InternalRequestSign<BondingSubmitParams>;
 export interface UnbondingSubmitParams extends BaseRequestSign {
@@ -1175,6 +1180,9 @@ export interface UnbondingSubmitParams extends BaseRequestSign {
     exchangeRate?: number;
     inputTokenInfo?: _ChainAsset;
     isFastUnbond: boolean;
+    poolInfo?: {
+        metadata: SubnetYieldPositionInfo;
+    };
 }
 export declare type RequestUnbondingSubmit = InternalRequestSign<UnbondingSubmitParams>;
 export interface StakePoolingBondingParams extends BaseRequestSign {
@@ -1692,7 +1700,7 @@ export interface KoniRequestSignatures {
     'pri(accounts.approveSpending)': [TokenSpendingApprovalParams, SWTransactionResponse];
     'pri(accounts.checkCrossChainTransfer)': [RequestCheckCrossChainTransfer, ValidateTransactionResponse];
     'pri(accounts.crossChainTransfer)': [RequestCrossChainTransfer, SWTransactionResponse];
-    'pri(customFee.getTokensCanPayFee)': [RequestGetTokensCanPayFee, TokenHasBalanceInfo[]];
+    'pri(customFee.getTokensCanPayFee)': [RequestGetTokensCanPayFee, TokenPayFeeInfo];
     'pri(customFee.getAmountForPair)': [RequestGetAmountForPair, string];
     'pri(confirmations.subscribe)': [RequestConfirmationsSubscribe, ConfirmationsQueue, ConfirmationsQueue];
     'pri(confirmationsTon.subscribe)': [RequestConfirmationsSubscribeTon, ConfirmationsQueueTon, ConfirmationsQueueTon];

package/background/KoniTypes.js

@@ -181,6 +181,7 @@ export let EvmProviderErrorType;
   EvmProviderErrorType["UNSUPPORTED_METHOD"] = "UNSUPPORTED_METHOD";
   EvmProviderErrorType["DISCONNECTED"] = "DISCONNECTED";
   EvmProviderErrorType["CHAIN_DISCONNECTED"] = "CHAIN_DISCONNECTED";
+  EvmProviderErrorType["NETWORK_NOT_SUPPORTED"] = "NETWORK_NOT_SUPPORTED";
   EvmProviderErrorType["INVALID_PARAMS"] = "INVALID_PARAMS";
   EvmProviderErrorType["INTERNAL_ERROR"] = "INTERNAL_ERROR";
 })(EvmProviderErrorType || (EvmProviderErrorType = {}));

package/background/errors/EvmProviderError.js

@@ -25,6 +25,10 @@ const defaultErrorMap = {
     message: detectTranslate('Network is disconnected'),
     code: 4901
   },
+  NETWORK_NOT_SUPPORTED: {
+    message: detectTranslate('This network is currently not supported'),
+    code: 4902
+  },
   INVALID_PARAMS: {
     message: detectTranslate('Undefined error. Please contact SubWallet support'),
     code: -32602

package/background/errors/ProviderError.d.ts

@@ -2,5 +2,5 @@ import { SWError } from '@subwallet/extension-base/background/errors/SWError';
 import { ProviderErrorType } from '@subwallet/extension-base/background/KoniTypes';
 export declare class ProviderError extends SWError {
     errorType: ProviderErrorType;
-    constructor(errorType: ProviderErrorType, errMessage?: string, data?: unknown);
+    constructor(errorType: ProviderErrorType, errMessage?: string, data?: unknown, errorCode?: number);
 }

package/background/errors/ProviderError.js

@@ -22,12 +22,12 @@ const defaultErrorMap = {
   }
 };
 export class ProviderError extends SWError {
-  constructor(errorType, errMessage, data) {
+  constructor(errorType, errMessage, data, errorCode) {
     const {
       code,
       message
     } = defaultErrorMap[errorType];
-    super(errorType, errMessage || message, code, data);
+    super(errorType, errMessage || message, errorCode || code, data);
     this.errorType = errorType;
   }
 }

package/cjs/background/KoniTypes.js

@@ -195,6 +195,7 @@ exports.EvmProviderErrorType = EvmProviderErrorType;
   EvmProviderErrorType["UNSUPPORTED_METHOD"] = "UNSUPPORTED_METHOD";
   EvmProviderErrorType["DISCONNECTED"] = "DISCONNECTED";
   EvmProviderErrorType["CHAIN_DISCONNECTED"] = "CHAIN_DISCONNECTED";
+  EvmProviderErrorType["NETWORK_NOT_SUPPORTED"] = "NETWORK_NOT_SUPPORTED";
   EvmProviderErrorType["INVALID_PARAMS"] = "INVALID_PARAMS";
   EvmProviderErrorType["INTERNAL_ERROR"] = "INTERNAL_ERROR";
 })(EvmProviderErrorType || (exports.EvmProviderErrorType = EvmProviderErrorType = {}));

package/cjs/background/errors/EvmProviderError.js

@@ -31,6 +31,10 @@ const defaultErrorMap = {
     message: (0, _utils.detectTranslate)('Network is disconnected'),
     code: 4901
   },
+  NETWORK_NOT_SUPPORTED: {
+    message: (0, _utils.detectTranslate)('This network is currently not supported'),
+    code: 4902
+  },
   INVALID_PARAMS: {
     message: (0, _utils.detectTranslate)('Undefined error. Please contact SubWallet support'),
     code: -32602

package/cjs/background/errors/ProviderError.js

@@ -28,12 +28,12 @@ const defaultErrorMap = {
   }
 };
 class ProviderError extends _SWError.SWError {
-  constructor(errorType, errMessage, data) {
+  constructor(errorType, errMessage, data, errorCode) {
     const {
       code,
       message
     } = defaultErrorMap[errorType];
-    super(errorType, errMessage || message, code, data);
+    super(errorType, errMessage || message, errorCode || code, data);
     this.errorType = errorType;
   }
 }

package/cjs/constants/environment.js

@@ -11,5 +11,5 @@ const PRODUCTION_BRANCHES = ['master', 'webapp', 'webapp-dev'];
 const branchName = process.env.BRANCH_NAME || 'subwallet-dev';
 const isProductionMode = PRODUCTION_BRANCHES.indexOf(branchName) > -1;
 exports.isProductionMode = isProductionMode;
-const BACKEND_API_URL = process.env.SUBWALLET_API || (isProductionMode ? 'https://sw-services.subwallet.app/api' : 'https://sw-services.subwallet.app/api'); // TODO: Rollback dev URL
+const BACKEND_API_URL = process.env.SUBWALLET_API || (isProductionMode ? 'https://sw-services.subwallet.app/api' : 'https://be-dev.subwallet.app/api');
 exports.BACKEND_API_URL = BACKEND_API_URL;

package/cjs/constants/index.js

@@ -40,9 +40,11 @@ var _exportNames = {
   ORDINAL_COLLECTION: true,
   ORDINAL_METHODS: true,
   PERMISSIONS_TO_REVOKE: true,
-  ASSET_HUB_CHAIN_SLUGS: true
+  _SUPPORT_TOKEN_PAY_FEE_GROUP: true,
+  getSupportTokenPayFeeChain: true,
+  isChainSupportTokenPayFee: true
 };
-exports.XCM_MIN_AMOUNT_RATIO = exports.XCM_FEE_RATIO = exports.SUB_TOKEN_REFRESH_BALANCE_INTERVAL = exports.PERMISSIONS_TO_REVOKE = exports.ORDINAL_METHODS = exports.ORDINAL_COLLECTION = exports.NETWORK_MULTI_GAS_FEE = exports.MANTA_PAY_BALANCE_INTERVAL = exports.IGNORE_QR_SIGNER = exports.IGNORE_GET_SUBSTRATE_FEATURES_LIST = exports.GAS_PRICE_RATIO = exports.CRON_SYNC_MANTA_PAY = exports.CRON_REFRESH_STAKING_REWARD_INTERVAL = exports.CRON_REFRESH_STAKING_REWARD_FAST_INTERVAL = exports.CRON_REFRESH_PRICE_INTERVAL = exports.CRON_REFRESH_NFT_INTERVAL = exports.CRON_REFRESH_MKT_CAMPAIGN_INTERVAL = exports.CRON_REFRESH_HISTORY_INTERVAL = exports.CRON_REFRESH_EARNING_REWARD_HISTORY_INTERVAL = exports.CRON_REFRESH_CHAIN_STAKING_METADATA = exports.CRON_REFRESH_CHAIN_NOMINATOR_METADATA = exports.CRON_RECOVER_HISTORY_INTERVAL = exports.CRON_LISTEN_AVAIL_BRIDGE_CLAIM = exports.CRON_GET_API_MAP_STATUS = exports.CRON_AUTO_RECOVER_WEB3_INTERVAL = exports.CRON_AUTO_RECOVER_DOTSAMA_INTERVAL = exports.BITTENSOR_REFRESH_STAKE_INFO = exports.BITTENSOR_REFRESH_STAKE_APY = exports.BASE_SECOND_INTERVAL = exports.BASE_MINUTE_INTERVAL = exports.ASTAR_REFRESH_BALANCE_INTERVAL = exports.ASSET_HUB_CHAIN_SLUGS = exports.ALL_NETWORK_KEY = exports.ALL_GENESIS_HASH = exports.ALL_ACCOUNT_KEY = exports.ALL_ACCOUNT_AUTH_TYPES = exports.ACALA_REFRESH_CROWDLOAN_INTERVAL = void 0;
+exports.isChainSupportTokenPayFee = exports.getSupportTokenPayFeeChain = exports._SUPPORT_TOKEN_PAY_FEE_GROUP = exports.XCM_MIN_AMOUNT_RATIO = exports.XCM_FEE_RATIO = exports.SUB_TOKEN_REFRESH_BALANCE_INTERVAL = exports.PERMISSIONS_TO_REVOKE = exports.ORDINAL_METHODS = exports.ORDINAL_COLLECTION = exports.NETWORK_MULTI_GAS_FEE = exports.MANTA_PAY_BALANCE_INTERVAL = exports.IGNORE_QR_SIGNER = exports.IGNORE_GET_SUBSTRATE_FEATURES_LIST = exports.GAS_PRICE_RATIO = exports.CRON_SYNC_MANTA_PAY = exports.CRON_REFRESH_STAKING_REWARD_INTERVAL = exports.CRON_REFRESH_STAKING_REWARD_FAST_INTERVAL = exports.CRON_REFRESH_PRICE_INTERVAL = exports.CRON_REFRESH_NFT_INTERVAL = exports.CRON_REFRESH_MKT_CAMPAIGN_INTERVAL = exports.CRON_REFRESH_HISTORY_INTERVAL = exports.CRON_REFRESH_EARNING_REWARD_HISTORY_INTERVAL = exports.CRON_REFRESH_CHAIN_STAKING_METADATA = exports.CRON_REFRESH_CHAIN_NOMINATOR_METADATA = exports.CRON_RECOVER_HISTORY_INTERVAL = exports.CRON_LISTEN_AVAIL_BRIDGE_CLAIM = exports.CRON_GET_API_MAP_STATUS = exports.CRON_AUTO_RECOVER_WEB3_INTERVAL = exports.CRON_AUTO_RECOVER_DOTSAMA_INTERVAL = exports.BITTENSOR_REFRESH_STAKE_INFO = exports.BITTENSOR_REFRESH_STAKE_APY = exports.BASE_SECOND_INTERVAL = exports.BASE_MINUTE_INTERVAL = exports.ASTAR_REFRESH_BALANCE_INTERVAL = exports.ALL_NETWORK_KEY = exports.ALL_GENESIS_HASH = exports.ALL_ACCOUNT_KEY = exports.ALL_ACCOUNT_AUTH_TYPES = exports.ACALA_REFRESH_CROWDLOAN_INTERVAL = void 0;
 var _blockedActions = require("./blocked-actions");
 Object.keys(_blockedActions).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
@@ -190,5 +192,20 @@ const ORDINAL_METHODS = ['drc-20', 'pol-20'];
 exports.ORDINAL_METHODS = ORDINAL_METHODS;
 const PERMISSIONS_TO_REVOKE = ['eth_accounts'];
 exports.PERMISSIONS_TO_REVOKE = PERMISSIONS_TO_REVOKE;
-const ASSET_HUB_CHAIN_SLUGS = ['paseo_assethub', 'westend_assethub', 'rococo_assethub', 'statemine', 'statemint'];
-exports.ASSET_HUB_CHAIN_SLUGS = ASSET_HUB_CHAIN_SLUGS;
+const _SUPPORT_TOKEN_PAY_FEE_GROUP = {
+  assetHub: ['paseo_assethub', 'westend_assethub', 'rococo_assethub', 'statemine', 'statemint'],
+  hydration: ['hydradx_main', 'hydradx_rococo']
+};
+exports._SUPPORT_TOKEN_PAY_FEE_GROUP = _SUPPORT_TOKEN_PAY_FEE_GROUP;
+const getSupportTokenPayFeeChain = () => {
+  return Object.values(_SUPPORT_TOKEN_PAY_FEE_GROUP).flat();
+};
+exports.getSupportTokenPayFeeChain = getSupportTokenPayFeeChain;
+const isChainSupportTokenPayFee = chainSlug => {
+  if (!chainSlug) {
+    console.error('You must provide chain slug!');
+    return false;
+  }
+  return getSupportTokenPayFeeChain().includes(chainSlug);
+};
+exports.isChainSupportTokenPayFee = isChainSupportTokenPayFee;

package/cjs/core/logic-validation/transfer.js

@@ -348,7 +348,7 @@ function checkSupportForTransaction(validationResponse, transaction) {
     }
   }
 }
-async function estimateFeeForTransaction(validationResponse, transaction, chainInfo, evmApi, substrateApi, feeInfo, nativeTokenInfo, tokenPayFeeInfo, isTransferLocalTokenAndPayThatTokenAsFee) {
+async function estimateFeeForTransaction(validationResponse, transaction, chainInfo, evmApi, substrateApi, priceMap, feeInfo, nativeTokenInfo, nonNativeTokenPayFeeInfo, isTransferLocalTokenAndPayThatTokenAsFee) {
   const estimateFee = {
     symbol: '',
     decimals: 0,
@@ -394,11 +394,25 @@ async function estimateFeeForTransaction(validationResponse, transaction, chainI
       }
     }
   }
-  if (tokenPayFeeInfo) {
+  const isCustomTokenPayFeeAssetHub = !!nonNativeTokenPayFeeInfo && _constants._SUPPORT_TOKEN_PAY_FEE_GROUP.assetHub.includes(nonNativeTokenPayFeeInfo.originChain);
+  const isCustomTokenPayFeeHydration = !!nonNativeTokenPayFeeInfo && _constants._SUPPORT_TOKEN_PAY_FEE_GROUP.hydration.includes(nonNativeTokenPayFeeInfo.originChain);
+  if (isCustomTokenPayFeeAssetHub) {
     const estimatedFeeAmount = isTransferLocalTokenAndPayThatTokenAsFee ? (BigInt(estimateFee.value) * BigInt(_utils4.FEE_COVERAGE_PERCENTAGE_SPECIAL_CASE) / BigInt(100)).toString() : estimateFee.value;
-    estimateFee.decimals = tokenPayFeeInfo.decimals || 0;
-    estimateFee.symbol = tokenPayFeeInfo.symbol;
-    estimateFee.value = await (0, _utils4.calculateToAmountByReservePool)(substrateApi.api, nativeTokenInfo, tokenPayFeeInfo, estimatedFeeAmount);
+    estimateFee.decimals = (0, _utils3._getAssetDecimals)(nonNativeTokenPayFeeInfo);
+    estimateFee.symbol = (0, _utils3._getAssetSymbol)(nonNativeTokenPayFeeInfo);
+    estimateFee.value = await (0, _utils4.calculateToAmountByReservePool)(substrateApi.api, nativeTokenInfo, nonNativeTokenPayFeeInfo, estimatedFeeAmount);
+  }
+  if (isCustomTokenPayFeeHydration) {
+    const nativePriceId = (0, _utils3._getAssetPriceId)(nativeTokenInfo);
+    const nativeDecimals = (0, _utils3._getAssetDecimals)(nativeTokenInfo);
+    const nativePrice = priceMap[nativePriceId];
+    const tokenPriceId = (0, _utils3._getAssetPriceId)(nonNativeTokenPayFeeInfo);
+    const tokenDecimals = (0, _utils3._getAssetDecimals)(nonNativeTokenPayFeeInfo);
+    const tokenPrice = priceMap[tokenPriceId];
+    const rate = new _bignumber.default(nativePrice).div(tokenPrice).multipliedBy(10 ** (tokenDecimals - nativeDecimals)).toFixed();
+    estimateFee.decimals = (0, _utils3._getAssetDecimals)(nonNativeTokenPayFeeInfo);
+    estimateFee.symbol = (0, _utils3._getAssetSymbol)(nonNativeTokenPayFeeInfo);
+    estimateFee.value = new _bignumber.default(estimateFee.value).multipliedBy(rate).toFixed(0);
   }
   return estimateFee;
 }
@@ -438,10 +452,11 @@ function checkBalanceWithTransactionFee(validationResponse, transactionInput, na
     edAsWarning,
     extrinsicType,
     isTransferAll,
-    nonNativeTokenPayFeeSlug,
-    skipFeeValidation
+    skipFeeValidation,
+    tokenPayFeeSlug
   } = transactionInput;
-  if (skipFeeValidation || nonNativeTokenPayFeeSlug) {
+  if (skipFeeValidation || tokenPayFeeSlug && !(0, _utils3._isNativeTokenBySlug)(tokenPayFeeSlug)) {
+    // todo: need improve: input should be balance of fee token and check this again
     return;
   }
   const bnFee = new _bignumber.default(validationResponse.estimateFee.value);