@subwallet/extension-base 1.3.3-0 → 1.3.4-0

package/cjs/services/setting-service/constants.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.DEFAULT_UNLOCK_TYPE = exports.DEFAULT_THEME = exports.DEFAULT_SHOW_ZERO_BALANCE = exports.DEFAULT_SHOW_BALANCE = exports.DEFAULT_SETTING = exports.DEFAULT_NOTIFICATION_TYPE = exports.DEFAULT_LANGUAGE = exports.DEFAULT_CURRENCY = exports.DEFAULT_CHAIN_PATROL_ENABLE = exports.DEFAULT_CAMERA_ENABLE = exports.DEFAULT_AUTO_LOCK_TIME = exports.DEFAULT_ALL_LOGO = void 0;
+exports.DEFAULT_UNLOCK_TYPE = exports.DEFAULT_THEME = exports.DEFAULT_SHOW_ZERO_BALANCE = exports.DEFAULT_SHOW_BALANCE = exports.DEFAULT_SETTING = exports.DEFAULT_NOTIFICATION_TYPE = exports.DEFAULT_NOTIFICATION_SETUP = exports.DEFAULT_LANGUAGE = exports.DEFAULT_CURRENCY = exports.DEFAULT_CHAIN_PATROL_ENABLE = exports.DEFAULT_CAMERA_ENABLE = exports.DEFAULT_AUTO_LOCK_TIME = exports.DEFAULT_ALL_LOGO = void 0;
 var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
 var _utils = require("@subwallet/extension-base/utils");
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
@@ -31,6 +31,20 @@ const DEFAULT_ALL_LOGO = '';
 exports.DEFAULT_ALL_LOGO = DEFAULT_ALL_LOGO;
 const DEFAULT_CAMERA_ENABLE = false;
 exports.DEFAULT_CAMERA_ENABLE = DEFAULT_CAMERA_ENABLE;
+const DEFAULT_NOTIFICATION_SETUP = {
+  isEnabled: true,
+  showNotice: {
+    // send: true,
+    // receive: true,
+    earningClaim: true,
+    earningWithdraw: true,
+    availBridgeClaim: true
+    // isHideWithdraw: false, // todo: just for test, remove later
+    // isHideMarketing: false,
+    // isHideAnnouncement: false
+  }
+};
+exports.DEFAULT_NOTIFICATION_SETUP = DEFAULT_NOTIFICATION_SETUP;
 const DEFAULT_SETTING = {
   language: DEFAULT_LANGUAGE,
   currency: DEFAULT_CURRENCY,
@@ -43,6 +57,7 @@ const DEFAULT_SETTING = {
   camera: DEFAULT_CAMERA_ENABLE,
   timeAutoLock: DEFAULT_AUTO_LOCK_TIME,
   enableChainPatrol: DEFAULT_CHAIN_PATROL_ENABLE,
+  notificationSetup: DEFAULT_NOTIFICATION_SETUP,
   walletReference: ''
 };
 exports.DEFAULT_SETTING = DEFAULT_SETTING;

package/cjs/services/storage-service/DatabaseService.js

@@ -10,6 +10,7 @@ var _databases = _interopRequireDefault(require("@subwallet/extension-base/servi
 var _dbStores = require("@subwallet/extension-base/services/storage-service/db-stores");
 var _Campaign = _interopRequireDefault(require("@subwallet/extension-base/services/storage-service/db-stores/Campaign"));
 var _ChainStakingMetadata = _interopRequireDefault(require("@subwallet/extension-base/services/storage-service/db-stores/ChainStakingMetadata"));
+var _InappNotification = _interopRequireDefault(require("@subwallet/extension-base/services/storage-service/db-stores/InappNotification"));
 var _MantaPay = _interopRequireDefault(require("@subwallet/extension-base/services/storage-service/db-stores/MantaPay"));
 var _NominatorMetadata = _interopRequireDefault(require("@subwallet/extension-base/services/storage-service/db-stores/NominatorMetadata"));
 var _YieldPoolStore = _interopRequireDefault(require("@subwallet/extension-base/services/storage-service/db-stores/YieldPoolStore"));
@@ -53,11 +54,13 @@ class DatabaseService {
       chainStakingMetadata: new _ChainStakingMetadata.default(this._db.chainStakingMetadata),
       nominatorMetadata: new _NominatorMetadata.default(this._db.nominatorMetadata),
       mantaPay: new _MantaPay.default(this._db.mantaPay),
-      campaign: new _Campaign.default(this._db.campaign)
+      campaign: new _Campaign.default(this._db.campaign),
       // assetRef: new AssetRefStore(this._db.assetRef)
+
+      // inapp notification
+      inappNotification: new _InappNotification.default(this._db.inappNotification)
     };
   }
-
   async updatePriceStore(priceData) {
     await this.stores.price.table.put(priceData);
   }
@@ -370,7 +373,7 @@ class DatabaseService {
   }
   async resetWallet(resetAll) {
     return new Promise((resolve, reject) => {
-      const stores = [this.stores.balance, this.stores.nft, this.stores.nftCollection, this.stores.crowdloan, this.stores.staking, this.stores.transaction, this.stores.nominatorMetadata];
+      const stores = [this.stores.balance, this.stores.nft, this.stores.nftCollection, this.stores.crowdloan, this.stores.staking, this.stores.transaction, this.stores.nominatorMetadata, this.stores.inappNotification];
       if (resetAll) {
         stores.push(this.stores.chain, this.stores.asset);
       }
@@ -457,6 +460,9 @@ class DatabaseService {
   async updateYieldPositions(data) {
     await this.stores.yieldPosition.bulkUpsert(data);
   }
+  async getYieldPositions() {
+    return this.stores.yieldPosition.getAll();
+  }
   async getYieldPositionByAddress(addresses) {
     return this.stores.yieldPosition.getByAddress(addresses);
   }
@@ -486,6 +492,39 @@ class DatabaseService {
   upsertCampaign(campaign) {
     return this.stores.campaign.upsertCampaign(campaign);
   }
+
+  /* Inapp Notification */
+
+  getNotification(id) {
+    return this.stores.inappNotification.getNotificationInfo(id);
+  }
+  updateNotification(notification) {
+    return this.stores.inappNotification.upsert(notification);
+  }
+  async getNotificationsByParams(params) {
+    return this.stores.inappNotification.getNotificationsByParams(params);
+  }
+  cleanUpOldNotifications(overdueTime) {
+    return this.stores.inappNotification.cleanUpOldNotifications(overdueTime);
+  }
+  subscribeUnreadNotificationsCountMap() {
+    return this.stores.inappNotification.subscribeUnreadNotificationsCount();
+  }
+  getUnreadNotificationsCountMap() {
+    return this.stores.inappNotification.getUnreadNotificationsCountMap();
+  }
+  upsertNotifications(notifications) {
+    return this.stores.inappNotification.bulkUpsert(notifications);
+  }
+  markAllRead(proxyId) {
+    return this.stores.inappNotification.markAllRead(proxyId);
+  }
+  switchReadStatus(params) {
+    return this.stores.inappNotification.switchReadStatus(params);
+  }
+  removeAccountNotifications(proxyId) {
+    return this.stores.inappNotification.removeAccountNotifications(proxyId);
+  }
   async exportDB() {
     const blob = await (0, _dexieExportImport.exportDB)(this._db, {
       filter: (table, value, key) => {

package/cjs/services/storage-service/databases/index.js

@@ -50,6 +50,9 @@ class KoniDatabase extends _dexie.default {
     this.conditionalVersion(6, {
       keyValue: 'key'
     });
+    this.conditionalVersion(7, {
+      inappNotification: 'id, address, proxyId, [proxyId+actionType], actionType'
+    });
   }
   conditionalVersion(version, schema, upgrade) {
     if (this.schemaVersion != null && this.schemaVersion < version) {

package/cjs/services/storage-service/db-stores/InappNotification.js

@@ -0,0 +1,81 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _constants = require("@subwallet/extension-base/constants");
+var _interfaces = require("@subwallet/extension-base/services/inapp-notification-service/interfaces");
+var _utils = require("@subwallet/extension-base/services/inapp-notification-service/utils");
+var _BaseStore = _interopRequireDefault(require("@subwallet/extension-base/services/storage-service/db-stores/BaseStore"));
+var _dexie = require("dexie");
+// Copyright 2019-2022 @subwallet/extension-base authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+class InappNotificationStore extends _BaseStore.default {
+  async getNotificationInfo(id) {
+    return this.table.get(id);
+  }
+  async getAll() {
+    return this.table.toArray();
+  }
+  async getNotificationsByParams(params) {
+    const {
+      notificationTab,
+      proxyId
+    } = params;
+    const isAllAccount = proxyId === _constants.ALL_ACCOUNT_KEY;
+    const isTabAll = notificationTab === _interfaces.NotificationTab.ALL;
+    if (isTabAll && isAllAccount) {
+      return this.getAll();
+    }
+    const filteredTable = this.table.filter(item => {
+      const matchesProxyId = item.proxyId === proxyId;
+      const matchesReadStatus = item.isRead === (0, _utils.getIsTabRead)(notificationTab);
+      if (isTabAll) {
+        return matchesProxyId;
+      }
+      if (isAllAccount) {
+        return matchesReadStatus;
+      }
+      return matchesProxyId && matchesReadStatus;
+    });
+    return filteredTable.toArray();
+  }
+  async cleanUpOldNotifications(overdueTime) {
+    const currentTimestamp = Date.now();
+    return this.table.filter(item => item.time <= currentTimestamp - overdueTime).delete();
+  }
+  subscribeUnreadNotificationsCount() {
+    return (0, _dexie.liveQuery)(async () => {
+      return await this.getUnreadNotificationsCountMap();
+    });
+  }
+  async getUnreadNotificationsCountMap() {
+    const unreadNotifications = await this.table.filter(item => !item.isRead).toArray();
+    return unreadNotifications.reduce((countMap, item) => {
+      countMap[item.proxyId] = (countMap[item.proxyId] || 0) + 1;
+      return countMap;
+    }, {});
+  }
+  markAllRead(proxyId) {
+    if (proxyId === _constants.ALL_ACCOUNT_KEY) {
+      return this.table.toCollection().modify({
+        isRead: true
+      });
+    }
+    return this.table.where('proxyId').equalsIgnoreCase(proxyId).modify({
+      isRead: true
+    });
+  }
+  switchReadStatus(params) {
+    return this.table.where('id').equals(params.id).modify({
+      isRead: !params.isRead
+    });
+  }
+  removeAccountNotifications(proxyId) {
+    return this.table.where('proxyId').equalsIgnoreCase(proxyId).delete();
+  }
+}
+exports.default = InappNotificationStore;

package/cjs/services/transaction-service/index.js

@@ -585,6 +585,19 @@ class TransactionService {
           historyItem.additionalInfo = data;
           break;
         }
+      case _KoniTypes.ExtrinsicType.CLAIM_AVAIL_BRIDGE:
+        {
+          const data = (0, _utils3.parseTransactionData)(transaction.data); // TODO: switch by provider
+          const metadata = data.notification.metadata;
+          const claimAsset = this.state.chainService.getAssetBySlug(metadata.tokenSlug);
+          historyItem.amount = {
+            value: metadata.amount,
+            symbol: (0, _utils2._getAssetSymbol)(claimAsset),
+            decimals: (0, _utils2._getAssetDecimals)(claimAsset)
+          };
+          historyItem.additionalInfo = data;
+          break;
+        }
       case _KoniTypes.ExtrinsicType.UNKNOWN:
         break;
     }

package/cjs/types/avail-bridge/index.js

@@ -0,0 +1 @@
+"use strict";

package/cjs/types/notification/index.js

@@ -0,0 +1 @@
+"use strict";

package/cjs/utils/account/transform.js

@@ -145,23 +145,24 @@ const EARN_QDOT_ACTIONS = [_KoniTypes.ExtrinsicType.MINT_QDOT, _KoniTypes.Extrin
 const EARN_STDOT_ACTIONS = [_KoniTypes.ExtrinsicType.MINT_STDOT, _KoniTypes.ExtrinsicType.REDEEM_STDOT, _KoniTypes.ExtrinsicType.UNSTAKE_STDOT];
 const EARN_VMANTA_ACTIONS = [_KoniTypes.ExtrinsicType.MINT_VMANTA, _KoniTypes.ExtrinsicType.REDEEM_VMANTA, _KoniTypes.ExtrinsicType.UNSTAKE_VMANTA];
 const EVM_ACTIONS = [_KoniTypes.ExtrinsicType.TOKEN_SPENDING_APPROVAL, _KoniTypes.ExtrinsicType.EVM_EXECUTE];
+const CLAIM_AVAIL_BRIDGE = [_KoniTypes.ExtrinsicType.CLAIM_AVAIL_BRIDGE];
 const OTHER_ACTIONS = [_KoniTypes.ExtrinsicType.TRANSFER_XCM, _KoniTypes.ExtrinsicType.SEND_NFT, _KoniTypes.ExtrinsicType.SWAP, _KoniTypes.ExtrinsicType.CROWDLOAN];
 const getAccountTransactionActions = (signMode, networkType, type, _meta, _specialNetwork) => {
   if ([_types2.AccountSignMode.PASSWORD, _types2.AccountSignMode.INJECTED].includes(signMode)) {
     switch (networkType) {
       case _types2.AccountChainType.SUBSTRATE:
-        return [...BASE_TRANSFER_ACTIONS, ...NATIVE_STAKE_ACTIONS, ...POOL_STAKE_ACTIONS, ...EARN_VDOT_ACTIONS, ...EARN_LDOT_ACTIONS, ...EARN_SDOT_ACTIONS, ...EARN_QDOT_ACTIONS, ...EARN_VMANTA_ACTIONS, ...OTHER_ACTIONS];
+        return [...BASE_TRANSFER_ACTIONS, ...NATIVE_STAKE_ACTIONS, ...POOL_STAKE_ACTIONS, ...EARN_VDOT_ACTIONS, ...EARN_LDOT_ACTIONS, ...EARN_SDOT_ACTIONS, ...EARN_QDOT_ACTIONS, ...EARN_VMANTA_ACTIONS, ...CLAIM_AVAIL_BRIDGE, ...OTHER_ACTIONS];
       case _types2.AccountChainType.ETHEREUM:
-        return [...BASE_TRANSFER_ACTIONS, ...NATIVE_STAKE_ACTIONS, ...POOL_STAKE_ACTIONS, ...EARN_STDOT_ACTIONS, ...OTHER_ACTIONS, ...EVM_ACTIONS];
+        return [...BASE_TRANSFER_ACTIONS, ...NATIVE_STAKE_ACTIONS, ...POOL_STAKE_ACTIONS, ...EARN_STDOT_ACTIONS, ...OTHER_ACTIONS, ...CLAIM_AVAIL_BRIDGE, ...EVM_ACTIONS];
       case _types2.AccountChainType.TON:
         return [...BASE_TRANSFER_ACTIONS];
     }
   } else if (signMode === _types2.AccountSignMode.QR) {
     switch (networkType) {
       case _types2.AccountChainType.SUBSTRATE:
-        return [...BASE_TRANSFER_ACTIONS, ...NATIVE_STAKE_ACTIONS, ...POOL_STAKE_ACTIONS, ...EARN_VDOT_ACTIONS, ...EARN_LDOT_ACTIONS, ...EARN_SDOT_ACTIONS, ...EARN_QDOT_ACTIONS, ...EARN_VMANTA_ACTIONS, ...OTHER_ACTIONS];
+        return [...BASE_TRANSFER_ACTIONS, ...NATIVE_STAKE_ACTIONS, ...POOL_STAKE_ACTIONS, ...EARN_VDOT_ACTIONS, ...EARN_LDOT_ACTIONS, ...EARN_SDOT_ACTIONS, ...EARN_QDOT_ACTIONS, ...EARN_VMANTA_ACTIONS, ...CLAIM_AVAIL_BRIDGE, ...OTHER_ACTIONS];
       case _types2.AccountChainType.ETHEREUM:
-        return [...(_constants.isProductionMode ? [] : [...BASE_TRANSFER_ACTIONS, ...NATIVE_STAKE_ACTIONS, ...POOL_STAKE_ACTIONS, ...EARN_STDOT_ACTIONS, ...OTHER_ACTIONS, ...EVM_ACTIONS])];
+        return [...(_constants.isProductionMode ? [] : [...BASE_TRANSFER_ACTIONS, ...NATIVE_STAKE_ACTIONS, ...POOL_STAKE_ACTIONS, ...EARN_STDOT_ACTIONS, ...CLAIM_AVAIL_BRIDGE, ...OTHER_ACTIONS, ...EVM_ACTIONS])];
       case _types2.AccountChainType.TON:
         return [];
     }
@@ -174,7 +175,7 @@ const getAccountTransactionActions = (signMode, networkType, type, _meta, _speci
         // ...EARN_QDOT_ACTIONS,
         ...OTHER_ACTIONS];
       case _types2.AccountChainType.ETHEREUM:
-        return [...BASE_TRANSFER_ACTIONS, ...EARN_STDOT_ACTIONS, ...EVM_ACTIONS, _KoniTypes.ExtrinsicType.STAKING_WITHDRAW,
+        return [...BASE_TRANSFER_ACTIONS, ...EARN_STDOT_ACTIONS, ...EVM_ACTIONS, ...CLAIM_AVAIL_BRIDGE, _KoniTypes.ExtrinsicType.STAKING_WITHDRAW,
         // For liquid staking
         _KoniTypes.ExtrinsicType.SEND_NFT, _KoniTypes.ExtrinsicType.SWAP];
       case _types2.AccountChainType.TON:
@@ -212,6 +213,9 @@ const getAccountTransactionActions = (signMode, networkType, type, _meta, _speci
     if (['polkadot', 'kusama', 'statemint', 'statemine'].includes(specialNetwork)) {
       result.push(_KoniTypes.ExtrinsicType.TRANSFER_XCM);
     }
+    if (['availTuringTest', 'avail_mainnet'].includes(specialNetwork)) {
+      result.push(...CLAIM_AVAIL_BRIDGE);
+    }
     return result;
   }
   return [];

package/cjs/utils/staticData/index.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.termAndCondition = exports.staticData = exports.marketingCampaigns = exports.currencySymbol = exports.crowdloanFunds = exports.buyTokenConfigs = exports.buyServiceInfos = exports.blockedActionsFeatures = exports.StaticKey = void 0;
+exports.termAndCondition = exports.staticData = exports.remindNotificationTime = exports.marketingCampaigns = exports.currencySymbol = exports.crowdloanFunds = exports.buyTokenConfigs = exports.buyServiceInfos = exports.blockedActionsFeatures = exports.StaticKey = void 0;
 var _chainList = require("@subwallet/chain-list");
 // Copyright 2019-2022 @subwallet/extension-base authors & contributors
 // SPDX-License-Identifier: Apache-2.0
@@ -30,7 +30,10 @@ const currencySymbol = require('./currencySymbol.json');
 // eslint-disable-next-line @typescript-eslint/no-var-requires,@typescript-eslint/no-unsafe-assignment
 exports.currencySymbol = currencySymbol;
 const blockedActionsFeatures = require('./blockedActionsFeatures.json');
+// eslint-disable-next-line @typescript-eslint/no-var-requires,@typescript-eslint/no-unsafe-assignment
 exports.blockedActionsFeatures = blockedActionsFeatures;
+const remindNotificationTime = require('./remindNotificationTime.json');
+exports.remindNotificationTime = remindNotificationTime;
 let StaticKey;
 exports.StaticKey = StaticKey;
 (function (StaticKey) {
@@ -42,6 +45,7 @@ exports.StaticKey = StaticKey;
   StaticKey["TERM_AND_CONDITION"] = "term-and-condition";
   StaticKey["BUY_TOKEN_CONFIGS"] = "buy-token-configs";
   StaticKey["BLOCKED_ACTIONS_FEATURES"] = "blocked-actions-features";
+  StaticKey["REMIND_NOTIFICATION_TIME"] = "remind-notification-time";
 })(StaticKey || (exports.StaticKey = StaticKey = {}));
 const staticData = {
   [StaticKey.CHAINS]: Object.values(_chainList.ChainInfoMap),
@@ -51,6 +55,7 @@ const staticData = {
   [StaticKey.MARKETING_CAMPAINGS]: marketingCampaigns,
   [StaticKey.TERM_AND_CONDITION]: termAndCondition.default,
   [StaticKey.BUY_TOKEN_CONFIGS]: buyTokenConfigs,
-  [StaticKey.BLOCKED_ACTIONS_FEATURES]: blockedActionsFeatures
+  [StaticKey.BLOCKED_ACTIONS_FEATURES]: blockedActionsFeatures,
+  [StaticKey.REMIND_NOTIFICATION_TIME]: remindNotificationTime
 };
 exports.staticData = staticData;

package/constants/blocked-actions-list.js

@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { fetchStaticData } from '@subwallet/extension-base/utils';
-const BLOCKED_ACTIONS_AND_FEATURES_PROMISE = fetchStaticData('blocked-actions-features');
 export const fetchLastestBlockedActionsAndFeatures = async () => {
-  return await BLOCKED_ACTIONS_AND_FEATURES_PROMISE;
+  return await fetchStaticData('blocked-actions-features');
 };

package/constants/index.d.ts

@@ -21,6 +21,7 @@ export declare const MANTA_PAY_BALANCE_INTERVAL = 30000;
 export declare const BITTENSOR_REFRESH_STAKE_INFO = 30000;
 export declare const BITTENSOR_REFRESH_STAKE_APY = 300000;
 export declare const CRON_REFRESH_EARNING_REWARD_HISTORY_INTERVAL: number;
+export declare const CRON_LISTEN_AVAIL_BRIDGE_CLAIM = 1800000;
 export declare const ALL_ACCOUNT_KEY = "ALL";
 export declare const ALL_NETWORK_KEY = "all";
 export declare const ALL_GENESIS_HASH: null;
@@ -39,3 +40,4 @@ export * from './environment';
 export * from './signing';
 export * from './staking';
 export * from './storage';
+export * from './remind-notification-time';

package/constants/index.js

@@ -23,6 +23,7 @@ export const MANTA_PAY_BALANCE_INTERVAL = 30000;
 export const BITTENSOR_REFRESH_STAKE_INFO = 30000;
 export const BITTENSOR_REFRESH_STAKE_APY = 300000;
 export const CRON_REFRESH_EARNING_REWARD_HISTORY_INTERVAL = 15 * BASE_MINUTE_INTERVAL;
+export const CRON_LISTEN_AVAIL_BRIDGE_CLAIM = 1800000;
 export const ALL_ACCOUNT_KEY = 'ALL';
 export const ALL_NETWORK_KEY = 'all';
 export const ALL_GENESIS_HASH = null;
@@ -40,4 +41,5 @@ export * from "./blocked-actions-list.js";
 export * from "./environment.js";
 export * from "./signing.js";
 export * from "./staking.js";
-export * from "./storage.js";
+export * from "./storage.js";
+export * from "./remind-notification-time.js";

package/constants/remind-notification-time.d.ts

@@ -0,0 +1,2 @@
+import { NotificationActionType } from '@subwallet/extension-base/services/inapp-notification-service/interfaces';
+export declare const fetchLastestRemindNotificationTime: () => Promise<Record<NotificationActionType, number>>;

package/constants/remind-notification-time.js

@@ -0,0 +1,7 @@
+// Copyright 2019-2022 @subwallet/extension-base authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import { fetchStaticData } from '@subwallet/extension-base/utils';
+export const fetchLastestRemindNotificationTime = async () => {
+  return await fetchStaticData('config/remind-notification-time');
+};

package/core/logic-validation/transfer.js

@@ -342,14 +342,20 @@ export async function estimateFeeForTransaction(validationResponse, transaction,
       } else if (isTonTransaction(transaction)) {
         estimateFee.value = transaction.estimateFee; // todo: might need to update logic estimate fee inside for future actions excluding normal transfer Ton and Jetton
       } else {
-        const gasLimit = await evmApi.api.eth.estimateGas(transaction);
+        const gasLimit = transaction.gas || (await evmApi.api.eth.estimateGas(transaction));
         const priority = await calculateGasFeeParams(evmApi, chainInfo.slug);
-        if (priority.baseGasFee) {
-          const maxFee = priority.maxFeePerGas; // TODO: Need review
-
-          estimateFee.value = maxFee.multipliedBy(gasLimit).toFixed(0);
+        if (transaction.maxFeePerGas) {
+          estimateFee.value = new BigN(transaction.maxFeePerGas.toString()).multipliedBy(gasLimit).toFixed(0);
+        } else if (transaction.gasPrice) {
+          estimateFee.value = new BigN((transaction.gasPrice || 0).toString()).multipliedBy(gasLimit).toFixed(0);
         } else {
-          estimateFee.value = new BigN(priority.gasPrice).multipliedBy(gasLimit).toFixed(0);
+          if (priority.baseGasFee) {
+            const maxFee = priority.maxFeePerGas; // TODO: Need review
+
+            estimateFee.value = maxFee.multipliedBy(gasLimit).toFixed(0);
+          } else {
+            estimateFee.value = new BigN(priority.gasPrice).multipliedBy(gasLimit).toFixed(0);
+          }
         }
         estimateFee.tooHigh = priority.busyNetwork;
       }

package/core/substrate/xcm-parser.d.ts

@@ -51,5 +51,6 @@ export declare function _isXcmTransferUnstable(originChainInfo: _ChainInfo, dest
 export declare function _getXcmUnstableWarning(originChainInfo: _ChainInfo, destChainInfo: _ChainInfo, assetSlug: string): string;
 export declare function _isXcmWithinSameConsensus(originChainInfo: _ChainInfo, destChainInfo: _ChainInfo): boolean;
 export declare function _isSnowBridgeXcm(originChainInfo: _ChainInfo, destChainInfo: _ChainInfo): boolean;
+export declare function _isAvailBridgeXcm(originChainInfo: _ChainInfo, destChainInfo: _ChainInfo): boolean;
 export declare function _isMythosFromHydrationToMythos(originChainInfo: _ChainInfo, destChainInfo: _ChainInfo, assetSlug: string): boolean;
 export declare function _adaptX1Interior(assetIdentifier: Record<string, any>, version: number): Record<string, any>;

package/core/substrate/xcm-parser.js

@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { COMMON_CHAIN_SLUGS } from '@subwallet/chain-list';
+import { isAvailChainBridge } from '@subwallet/extension-base/services/balance-service/transfer/xcm/availBridge';
 import { _getChainSubstrateAddressPrefix, _getEvmChainId, _getSubstrateParaId, _getSubstrateRelayParent, _getXcmAssetMultilocation, _isChainEvmCompatible, _isPureEvmChain, _isSubstrateParaChain } from '@subwallet/extension-base/services/chain-service/utils';
 import { decodeAddress, evmToAddress } from '@polkadot/util-crypto';
 const FOUR_INSTRUCTIONS_WEIGHT = 5000000000;
@@ -72,8 +73,13 @@ function getSnowBridgeUnstableWarning(originChainInfo) {
 function getMythosFromHydrationToMythosWarning() {
   return 'Cross-chain transfer of this token requires a high transaction fee. Do you want to continue?';
 }
+function getAvailBridgeWarning() {
+  return 'Cross-chain transfer of this token may take up to 90 minutes, and you’ll need to manually claim the funds on the destination network to complete the transfer. Do you still want to continue?';
+}
 export function _getXcmUnstableWarning(originChainInfo, destChainInfo, assetSlug) {
-  if (_isSnowBridgeXcm(originChainInfo, destChainInfo)) {
+  if (_isAvailBridgeXcm(originChainInfo, destChainInfo)) {
+    return getAvailBridgeWarning();
+  } else if (_isSnowBridgeXcm(originChainInfo, destChainInfo)) {
     return getSnowBridgeUnstableWarning(originChainInfo);
   } else if (_isMythosFromHydrationToMythos(originChainInfo, destChainInfo, assetSlug)) {
     return getMythosFromHydrationToMythosWarning();
@@ -87,6 +93,11 @@ export function _isXcmWithinSameConsensus(originChainInfo, destChainInfo) {
 export function _isSnowBridgeXcm(originChainInfo, destChainInfo) {
   return !_isXcmWithinSameConsensus(originChainInfo, destChainInfo) && (_isPureEvmChain(originChainInfo) || _isPureEvmChain(destChainInfo));
 }
+export function _isAvailBridgeXcm(originChainInfo, destChainInfo) {
+  const isAvailBridgeFromEvm = _isPureEvmChain(originChainInfo) && isAvailChainBridge(destChainInfo.slug);
+  const isAvailBridgeFromAvail = isAvailChainBridge(originChainInfo.slug) && _isPureEvmChain(destChainInfo);
+  return isAvailBridgeFromEvm || isAvailBridgeFromAvail;
+}
 export function _isMythosFromHydrationToMythos(originChainInfo, destChainInfo, assetSlug) {
   return originChainInfo.slug === 'hydradx_main' && destChainInfo.slug === 'mythos' && assetSlug === 'hydradx_main-LOCAL-MYTH';
 }