@subwallet/extension-base 0.8.1-wr2x → 0.8.1-wr3

package/koni/background/handlers/Extension.js

@@ -9,7 +9,6 @@ import { createSubscription } from '@subwallet/extension-base/background/handler
 import { AccountExternalErrorCode, BasicTxErrorType, ChainType, ExternalRequestPromiseStatus, ExtrinsicType, TransferTxErrorType } from '@subwallet/extension-base/background/KoniTypes';
 import { ALL_ACCOUNT_KEY, ALL_GENESIS_HASH } from '@subwallet/extension-base/constants';
 import { ALLOWED_PATH } from '@subwallet/extension-base/defaults';
-import { getFreeBalance, subscribeFreeBalance } from '@subwallet/extension-base/koni/api/dotsama/balance';
 import { parseSubstrateTransaction } from '@subwallet/extension-base/koni/api/dotsama/parseTransaction';
 import { checkReferenceCount, checkSupportTransfer, createTransferExtrinsic } from '@subwallet/extension-base/koni/api/dotsama/transfer';
 import { getNftTransferExtrinsic, isRecipientSelf } from '@subwallet/extension-base/koni/api/nft/transfer';
@@ -574,6 +573,14 @@ export default class KoniExtension {
     const transformedAccounts = transformAccounts(storedAccounts);
     return transformedAccounts.filter(a => !a.isReadOnly).map(a => a.address);
   }
+  isAddressValidWithAuthType(address, accountAuthType) {
+    if (accountAuthType === 'substrate') {
+      return !isEthereumAddress(address);
+    } else if (accountAuthType === 'evm') {
+      return isEthereumAddress(address);
+    }
+    return true;
+  }
   filterAccountsByAccountAuthType(accounts, accountAuthType) {
     if (accountAuthType === 'substrate') {
       return accounts.filter(address => !isEthereumAddress(address));
@@ -647,11 +654,15 @@ export default class KoniExtension {
   _changeAuthorizationPerAcc(address, connectValue, url, callBack) {
     this.#koniState.getAuthorize(value => {
       assert(value, 'The source is not known');
-      value[url].isAllowedMap[address] = connectValue;
-      console.log('Devbu: ', value);
-      this.#koniState.setAuthorize(value, () => {
+      if (this.isAddressValidWithAuthType(address, value[url].accountAuthType)) {
+        value[url].isAllowedMap[address] = connectValue;
+        console.log('Devbu: ', value);
+        this.#koniState.setAuthorize(value, () => {
+          callBack && callBack(value);
+        });
+      } else {
         callBack && callBack(value);
-      });
+      }
     });
   }
   _changeAuthorizationBlock(connectValue, id) {
@@ -737,6 +748,12 @@ export default class KoniExtension {
     });
     return true;
   }
+  setCamera({
+    camera
+  }) {
+    this.#koniState.setCamera(camera);
+    return true;
+  }
   saveBrowserConfirmationType(data, id, port) {
     const cb = createSubscription(id, port);
     this.#koniState.setBrowserConfirmationType(data, cb);
@@ -914,7 +931,9 @@ export default class KoniExtension {
     this.#koniState.getAuthorize(value => {
       if (value && Object.keys(value).length) {
         Object.keys(value).forEach(url => {
-          value[url].isAllowedMap[address] = isAllowed;
+          if (this.isAddressValidWithAuthType(address, value[url].accountAuthType)) {
+            value[url].isAllowedMap[address] = isAllowed;
+          }
         });
         this.#koniState.setAuthorize(value);
       }
@@ -1327,7 +1346,6 @@ export default class KoniExtension {
     } = inputData;
     const [errors,,, tokenInfo] = this.validateTransfer(tokenSlug, from, to, value, transferAll);
     const warnings = [];
-    const substrateApiMap = this.#koniState.getSubstrateApiMap();
     const evmApiMap = this.#koniState.getEvmApiMap();
     const chainInfo = this.#koniState.getChainInfo(networkKey);
     const nativeTokenInfo = this.#koniState.getNativeTokenInfo(networkKey);
@@ -1345,10 +1363,10 @@ export default class KoniExtension {
     let transaction;
 
     // Get native token amount
-    const freeBalance = await getFreeBalance(networkKey, from, substrateApiMap, evmApiMap, tokenSlug);
+    const freeBalance = await this.#koniState.balanceService.getTokenFreeBalance(from, networkKey, tokenSlug);
     if (isEthereumAddress(from) && isEthereumAddress(to)) {
       chainType = ChainType.EVM;
-      const txVal = transferAll ? freeBalance : value || '0';
+      const txVal = transferAll ? freeBalance.value : value || '0';
 
       // Estimate with EVM API
       if (_isTokenEvmSmartContract(tokenInfo)) {
@@ -1371,7 +1389,7 @@ export default class KoniExtension {
 
     // Additional validator
     const additionalValidator = swTran => {
-      if (new BN(freeBalance).lt(new BN(transferAmount.value))) {
+      if (new BN(freeBalance.value).lt(new BN(transferAmount.value))) {
         var _swTran$errors;
         (_swTran$errors = swTran.errors) === null || _swTran$errors === void 0 ? void 0 : _swTran$errors.push(new TransactionError(BasicTxErrorType.NOT_ENOUGH_BALANCE));
       }
@@ -1518,17 +1536,25 @@ export default class KoniExtension {
   async validateCustomAsset(data) {
     return await this.#koniState.validateCustomAsset(data);
   }
+  async getAddressFreeBalance({
+    address,
+    networkKey,
+    token
+  }) {
+    return await this.#koniState.balanceService.getTokenFreeBalance(address, networkKey, token);
+  }
   async subscribeAddressFreeBalance({
     address,
     networkKey,
     token
   }, id, port) {
     const cb = createSubscription(id, port);
-    this.createUnsubscriptionHandle(id, await subscribeFreeBalance(networkKey, address, this.#koniState.getSubstrateApiMap(), this.#koniState.getEvmApiMap(), token, cb));
+    const [unsub, currentFreeBalance] = await this.#koniState.balanceService.subscribeTokenFreeBalance(address, networkKey, token, cb);
+    this.createUnsubscriptionHandle(id, unsub);
     port.onDisconnect.addListener(() => {
       this.cancelSubscription(id);
     });
-    return id;
+    return currentFreeBalance;
   }
   async transferCheckReferenceCount({
     address,
@@ -2695,6 +2721,18 @@ export default class KoniExtension {
     });
     return convertRs(transactionsSubject.getValue());
   }
+  subscribeNotifications(id, port) {
+    const cb = createSubscription(id, port);
+    const notificationSubject = this.#koniState.notificationService.getNotificationSubject();
+    const notificationSubscription = notificationSubject.subscribe(rs => {
+      cb(rs);
+    });
+    port.onDisconnect.addListener(() => {
+      notificationSubscription.unsubscribe();
+      this.cancelSubscription(id);
+    });
+    return notificationSubject.value;
+  }
 
   // --------------------------------------------------------------
   // eslint-disable-next-line @typescript-eslint/require-await
@@ -2743,8 +2781,6 @@ export default class KoniExtension {
         return this.seedCreate(request);
       case 'pri(seed.validate)':
         return this.seedValidate(request);
-      case 'pri(settings.notification)':
-        return this.#koniState.setNotification(request);
       case 'pri(signing.approve.signature)':
         return this.signingApproveSignature(request);
       case 'pri(signing.cancel)':
@@ -2821,6 +2857,8 @@ export default class KoniExtension {
         return await this.subscribeSettings(id, port);
       case 'pri(settings.saveAccountAllLogo)':
         return this.saveAccountAllLogo(request, id, port);
+      case 'pri(settings.saveCamera)':
+        return this.setCamera(request);
       case 'pri(settings.saveTheme)':
         return this.saveTheme(request, id, port);
       case 'pri(settings.saveBrowserConfirmationType)':
@@ -2903,6 +2941,8 @@ export default class KoniExtension {
         return await this.transferCheckSupporting(request);
       case 'pri(transfer.getExistentialDeposit)':
         return this.transferGetExistentialDeposit(request);
+      case 'pri(freeBalance.get)':
+        return this.getAddressFreeBalance(request);
       case 'pri(freeBalance.subscribe)':
         return this.subscribeAddressFreeBalance(request, id, port);
       case 'pri(subscription.cancel)':
@@ -3030,6 +3070,10 @@ export default class KoniExtension {
       case 'pri(transactions.subscribe)':
         return this.subscribeTransactions(id, port);
 
+      // Notification
+      case 'pri(notifications.subscribe)':
+        return this.subscribeNotifications(id, port);
+
       // Default
       default:
         throw new Error(`Unable to handle message of type ${type}`);

package/koni/background/handlers/State.d.ts

@@ -5,6 +5,7 @@ import { AccountJson, RequestAuthorizeTab, RequestRpcSend, RequestRpcSubscribe,
 import { BalanceService } from '@subwallet/extension-base/services/balance-service';
 import { _ChainConnectionStatus, _ChainState, _NetworkUpsertParams, _ValidateCustomAssetRequest } from '@subwallet/extension-base/services/chain-service/types';
 import { HistoryService } from '@subwallet/extension-base/services/history-service';
+import NotificationService from '@subwallet/extension-base/services/notification-service/NotificationService';
 import { PriceService } from '@subwallet/extension-base/services/price-service';
 import { AuthUrls, MetaRequest, SignRequest } from '@subwallet/extension-base/services/request-service/types';
 import DatabaseService from '@subwallet/extension-base/services/storage-service/DatabaseService';
@@ -41,6 +42,7 @@ export default class KoniState {
     private stakingRewardSubject;
     private stakingRewardState;
     private lazyMap;
+    readonly notificationService: NotificationService;
     private chainService;
     dbService: DatabaseService;
     private cron;
@@ -65,7 +67,6 @@ export default class KoniState {
     rpcSubscribeConnected(_request: null, cb: ProviderInterfaceCallback, port: chrome.runtime.Port): void;
     rpcUnsubscribe(request: RequestRpcUnsubscribe, port: chrome.runtime.Port): Promise<boolean>;
     saveMetadata(meta: MetadataDef): void;
-    setNotification(notification: string): boolean;
     sign(url: string, request: RequestSign, account: AccountJson): Promise<ResponseSigning>;
     get authSubjectV2(): BehaviorSubject<import("@subwallet/extension-base/background/types").AuthorizeRequest[]>;
     generateDefaultBalanceMap(): Record<string, BalanceItem>;
@@ -137,6 +138,7 @@ export default class KoniState {
     setSettings(settings: UiSettings, callback?: () => void): void;
     setTheme(theme: ThemeNames, callback?: (settingData: UiSettings) => void): void;
     setBrowserConfirmationType(browserConfirmationType: BrowserConfirmationType, callback?: (settingData: UiSettings) => void): void;
+    setCamera(value: boolean): void;
     subscribeSettingsSubject(): Subject<RequestSettingsType>;
     subscribeCurrentAccount(): Subject<CurrentAccountInfo>;
     getAccountAddress(): Promise<string | null | undefined>;

package/koni/background/handlers/State.js

@@ -7,12 +7,12 @@ import { withErrorLog } from '@subwallet/extension-base/background/handlers/help
 import { isSubscriptionRunning, unsubscribe } from '@subwallet/extension-base/background/handlers/subscriptions';
 import { APIItemState, BasicTxErrorType, ChainType, EvmProviderErrorType, ExternalRequestPromiseStatus, ExtrinsicType } from '@subwallet/extension-base/background/KoniTypes';
 import { ALL_ACCOUNT_KEY, ALL_GENESIS_HASH } from '@subwallet/extension-base/constants';
-import { getFreeBalance } from '@subwallet/extension-base/koni/api/dotsama/balance';
 import { BalanceService } from '@subwallet/extension-base/services/balance-service';
 import { ChainService } from '@subwallet/extension-base/services/chain-service';
 import { _PREDEFINED_SINGLE_MODES } from '@subwallet/extension-base/services/chain-service/constants';
 import { _getEvmChainId, _getSubstrateGenesisHash, _isAssetFungibleToken, _isChainEnabled, _isChainTestNet, _isSubstrateParachain, _parseMetadataForSmartContractAsset } from '@subwallet/extension-base/services/chain-service/utils';
 import { HistoryService } from '@subwallet/extension-base/services/history-service';
+import NotificationService from '@subwallet/extension-base/services/notification-service/NotificationService';
 import { PriceService } from '@subwallet/extension-base/services/price-service';
 import RequestService from '@subwallet/extension-base/services/request-service';
 import SettingService from '@subwallet/extension-base/services/setting-service/SettingService';
@@ -86,21 +86,19 @@ export default class KoniState {
     fastInterval: []
   };
   lazyMap = {};
-
-  // TODO: consider making chainService public (or getter) and call function directly
-
   ready = false;
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   constructor(providers = {}) {
     this.providers = providers;
     this.dbService = new DatabaseService();
+    this.notificationService = new NotificationService();
     this.chainService = new ChainService(this.dbService);
     this.settingService = new SettingService();
-    this.requestService = new RequestService(this.chainService);
+    this.requestService = new RequestService(this.chainService, this.settingService);
     this.priceService = new PriceService(this.dbService, this.chainService);
-    this.balanceService = new BalanceService(getFreeBalance);
+    this.balanceService = new BalanceService(this.chainService);
     this.historyService = new HistoryService(this.dbService, this.chainService);
-    this.transactionService = new TransactionService(this.chainService, this.requestService, this.balanceService, this.historyService);
+    this.transactionService = new TransactionService(this.chainService, this.requestService, this.balanceService, this.historyService, this.notificationService);
     this.subscription = new KoniSubscription(this, this.dbService);
     this.cron = new KoniCron(this, this.subscription, this.dbService);
     this.logger = createLogger('State');
@@ -178,10 +176,6 @@ export default class KoniState {
   saveMetadata(meta) {
     this.requestService.saveMetadata(meta);
   }
-  setNotification(notification) {
-    this.requestService.setNotification(notification);
-    return true;
-  }
   sign(url, request, account) {
     return this.requestService.sign(url, request, account);
   }
@@ -667,6 +661,16 @@ export default class KoniState {
       });
     });
   }
+  setCamera(value) {
+    this.settingService.getSettings(settings => {
+      const newSettings = {
+        ...settings,
+        camera: value
+      };
+      console.log(newSettings, value);
+      this.settingService.setSettings(newSettings);
+    });
+  }
   subscribeSettingsSubject() {
     return this.settingService.getSubject();
   }

package/package.json

@@ -17,7 +17,7 @@
     "./cjs/detectPackage.js"
   ],
   "type": "module",
-  "version": "0.8.1-wr2x",
+  "version": "0.8.1-wr3",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",
@@ -29,6 +29,11 @@
       "require": "./cjs/index.js",
       "default": "./index.js"
     },
+    "./background/errors/BalanceError": {
+      "types": "./background/errors/BalanceError.d.ts",
+      "require": "./cjs/background/errors/BalanceError.js",
+      "default": "./background/errors/BalanceError.js"
+    },
     "./background/errors/EvmProviderError": {
       "types": "./background/errors/EvmProviderError.d.ts",
       "require": "./cjs/background/errors/EvmProviderError.js",
@@ -1589,7 +1594,7 @@
     "@polkadot/hw-ledger": "^10.1.9",
     "@polkadot/keyring": "^10.2.1",
     "@polkadot/networks": "^10.2.1",
-    "@polkadot/phishing": "^0.18.12",
+    "@polkadot/phishing": "^0.20.3",
     "@polkadot/react-identicon": "^2.9.14",
     "@polkadot/react-qr": "^2.9.14",
     "@polkadot/rpc-provider": "^9.10.3",
@@ -1606,7 +1611,7 @@
     "@sora-substrate/type-definitions": "^1.12.4",
     "@subsocial/types": "^0.6.8",
     "@substrate/connect": "^0.7.18",
-    "@subwallet/chain-list": "^0.0.13",
+    "@subwallet/chain-list": "^0.0.16",
     "@subwallet/extension-base": "^0.8.1",
     "@subwallet/extension-chains": "^0.8.1",
     "@subwallet/extension-dapp": "^0.8.1",

package/services/balance-service/index.d.ts

@@ -1,7 +1,9 @@
-import { _EvmApi, _SubstrateApi } from '@subwallet/extension-base/services/chain-service/types';
-declare type getFreeBalanceFunc = (chain: string, address: string, substrateApiMap: Record<string, _SubstrateApi>, evmApiMap: Record<string, _EvmApi>, tokenSlug?: string) => Promise<string>;
+import { AmountData, BalanceItem } from '@subwallet/extension-base/background/KoniTypes';
+import { ChainService } from '@subwallet/extension-base/services/chain-service';
 export declare class BalanceService {
-    readonly getFreeBalance: getFreeBalanceFunc;
-    constructor(getFreeBalance: getFreeBalanceFunc);
+    private chainService;
+    constructor(chainService: ChainService);
+    subscribeTokenFreeBalance(address: string, chain: string, tokenSlug: string | undefined, callback?: (rs: AmountData) => void): Promise<[() => void, AmountData]>;
+    getTokenFreeBalance(address: string, chain: string, tokenSlug?: string): Promise<AmountData>;
+    subscribeBalance(addresses: string[], chains: string[] | null, callback: (rs: BalanceItem) => void): () => void;
 }
-export {};

package/services/balance-service/index.js

@@ -1,8 +1,101 @@
 // Copyright 2019-2022 @subwallet/extension-base authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import { BalanceError } from '@subwallet/extension-base/background/errors/BalanceError';
+import { BalanceErrorType } from '@subwallet/extension-base/background/KoniTypes';
+import { subscribeEVMBalance, subscribeSubstrateBalance } from '@subwallet/extension-base/koni/api/dotsama/balance';
+import { state } from '@subwallet/extension-base/koni/background/handlers';
+import { _PURE_EVM_CHAINS } from '@subwallet/extension-base/services/chain-service/constants';
+import { _getChainNativeTokenSlug, _isChainEvmCompatible, _isPureEvmChain } from '@subwallet/extension-base/services/chain-service/utils';
+import { categoryAddresses } from '@subwallet/extension-base/utils';
 export class BalanceService {
-  constructor(getFreeBalance) {
-    this.getFreeBalance = getFreeBalance;
+  constructor(chainService) {
+    this.chainService = chainService;
+
+    // Todo: Load data from db to balanceSubject
+    // Todo: Start  subscribe balance and data
+    // Todo: Listen change and apply to balanceSubject
+    // Todo: Active/Chain
+    // Todo: Add/remove account
+    // Todo: Add new account
+    // Todo: Optimize get balance for single account and chain with cache
+    // Todo: Move everything of fetching balance to this service
+  }
+
+  async subscribeTokenFreeBalance(address, chain, tokenSlug, callback) {
+    const chainInfo = this.chainService.getChainInfoByKey(chain);
+    const chainState = this.chainService.getChainStateByKey(chain);
+    if (!chainInfo || !chainState || !chainState.active) {
+      return Promise.reject(new BalanceError(BalanceErrorType.NETWORK_ERROR, `Chain ${chain} is not active`));
+    }
+    const tSlug = tokenSlug || _getChainNativeTokenSlug(chainInfo);
+    const tokenInfo = this.chainService.getAssetBySlug(tSlug);
+    if (!tokenInfo) {
+      return Promise.reject(new BalanceError(BalanceErrorType.TOKEN_ERROR, `Token ${tSlug} is not supported`));
+    }
+    return new Promise((resolve, reject) => {
+      let hasError = true;
+      const unsub = this.subscribeBalance([address], [chain], rs => {
+        if (rs.tokenSlug === tSlug) {
+          hasError = false;
+          const balance = {
+            value: rs.free,
+            decimals: tokenInfo.decimals || 0,
+            symbol: tokenInfo.symbol
+          };
+          if (callback) {
+            callback(balance);
+          } else {
+            // Auto unsubscribe if no callback
+            unsub();
+          }
+          resolve([unsub, balance]);
+        }
+      });
+      setTimeout(() => {
+        if (hasError) {
+          unsub();
+          reject(new Error('Get Balance Timeout'));
+        }
+      }, 9999);
+    });
+  }
+  async getTokenFreeBalance(address, chain, tokenSlug) {
+    const [, balance] = await this.subscribeTokenFreeBalance(address, chain, tokenSlug);
+    return balance;
+  }
+  subscribeBalance(addresses, chains, callback) {
+    const [substrateAddresses, evmAddresses] = categoryAddresses(addresses);
+    const chainInfoMap = this.chainService.getChainInfoMap();
+    const chainStateMap = this.chainService.getChainStateMap();
+    const substrateApiMap = this.chainService.getSubstrateApiMap();
+    const evmApiMap = this.chainService.getEvmApiMap();
+
+    // Get data from chain or all chains
+    const chainList = chains || Object.keys(chainInfoMap);
+    // Filter active chain only
+    const useChainInfos = chainList.filter(c => chainStateMap[c] && chainStateMap[c].active).map(c => chainInfoMap[c]);
+
+    // Looping over each chain
+    const unsubList = useChainInfos.map(async chainInfo => {
+      const chainSlug = chainInfo.slug;
+      const useAddresses = _isChainEvmCompatible(chainInfo) ? evmAddresses : substrateAddresses;
+      if (_isPureEvmChain(chainInfo)) {
+        const nativeTokenInfo = state.getNativeTokenInfo(chainSlug);
+        return subscribeEVMBalance(chainSlug, useAddresses, evmApiMap, callback, nativeTokenInfo);
+      }
+      if (!useAddresses || useAddresses.length === 0 || _PURE_EVM_CHAINS.indexOf(chainSlug) > -1) {
+        return undefined;
+      }
+      const networkAPI = await substrateApiMap[chainSlug].isReady;
+      return subscribeSubstrateBalance(useAddresses, chainInfo, chainSlug, networkAPI, evmApiMap, callback);
+    });
+    return () => {
+      unsubList.forEach(subProm => {
+        subProm.then(unsub => {
+          unsub && unsub();
+        }).catch(console.error);
+      });
+    };
   }
 }

package/services/chain-service/utils.d.ts

@@ -57,7 +57,7 @@ export declare function _getMultiChainAssetSymbol(multiChainAsset: _MultiChainAs
 export declare function _getAssetOriginChain(assetInfo: _ChainAsset): string;
 export declare function _getChainName(chainInfo: _ChainInfo): string;
 export declare function _getAssetDecimals(assetInfo: _ChainAsset): number;
-export declare function _getBlockExplorerFromChain(chainInfo: _ChainInfo): string;
+export declare function _getBlockExplorerFromChain(chainInfo: _ChainInfo): string | undefined;
 export declare function _parseMetadataForSmartContractAsset(contractAddress: string): Record<string, string>;
 export declare function _isChainTestNet(chainInfo: _ChainInfo): boolean;
 export declare function _isAssetFungibleToken(chainAsset: _ChainAsset): boolean;

package/services/chain-service/utils.js

@@ -273,12 +273,22 @@ export function _getAssetDecimals(assetInfo) {
   return assetInfo.decimals || 0;
 }
 export function _getBlockExplorerFromChain(chainInfo) {
-  var _chainInfo$substrateI12;
+  let blockExplorer;
   if (_isPureEvmChain(chainInfo)) {
     var _chainInfo$evmInfo4;
-    return (chainInfo === null || chainInfo === void 0 ? void 0 : (_chainInfo$evmInfo4 = chainInfo.evmInfo) === null || _chainInfo$evmInfo4 === void 0 ? void 0 : _chainInfo$evmInfo4.blockExplorer) || '';
+    blockExplorer = chainInfo === null || chainInfo === void 0 ? void 0 : (_chainInfo$evmInfo4 = chainInfo.evmInfo) === null || _chainInfo$evmInfo4 === void 0 ? void 0 : _chainInfo$evmInfo4.blockExplorer;
+  } else {
+    var _chainInfo$substrateI12;
+    blockExplorer = chainInfo === null || chainInfo === void 0 ? void 0 : (_chainInfo$substrateI12 = chainInfo.substrateInfo) === null || _chainInfo$substrateI12 === void 0 ? void 0 : _chainInfo$substrateI12.blockExplorer;
+  }
+  if (!blockExplorer) {
+    return undefined;
+  }
+  if (blockExplorer !== '' && !blockExplorer.endsWith('/')) {
+    return `${blockExplorer}/`;
+  } else {
+    return blockExplorer;
   }
-  return (chainInfo === null || chainInfo === void 0 ? void 0 : (_chainInfo$substrateI12 = chainInfo.substrateInfo) === null || _chainInfo$substrateI12 === void 0 ? void 0 : _chainInfo$substrateI12.blockExplorer) || '';
 }
 export function _parseMetadataForSmartContractAsset(contractAddress) {
   return {

package/services/notification-service/NotificationService.d.ts

@@ -1,3 +1,8 @@
+import { Notification, NotificationParams } from '@subwallet/extension-base/background/KoniTypes';
+import { BehaviorSubject } from 'rxjs';
 export default class NotificationService {
-    static createNotification(title: string, message: string, link?: string): void;
+    private notificationSubject;
+    getNotificationSubject(): BehaviorSubject<Notification[]>;
+    notify(notification: NotificationParams): void;
+    static createBrowserNotification(title: string, message: string, link?: string): void;
 }

package/services/notification-service/NotificationService.js

@@ -1,9 +1,31 @@
 // Copyright 2019-2022 @subwallet/extension-base authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import { BehaviorSubject } from 'rxjs';
 export default class NotificationService {
+  notificationSubject = new BehaviorSubject([]);
+  getNotificationSubject() {
+    return this.notificationSubject;
+  }
+  notify(notification) {
+    const now = new Date().getTime();
+    // Get values in last 30 seconds only
+    const notifications = this.notificationSubject.value.filter(n => n.id < now - 30000);
+
+    // Push notification
+    notifications.push({
+      ...notification,
+      id: now
+    });
+    this.notificationSubject.next(notifications);
+    if (notification.notifyViaBrowser) {
+      var _notification$action;
+      NotificationService.createBrowserNotification(notification.title, notification.message, notification === null || notification === void 0 ? void 0 : (_notification$action = notification.action) === null || _notification$action === void 0 ? void 0 : _notification$action.url);
+    }
+  }
+
   // Create a new chrome notification with link
-  static createNotification(title, message, link) {
+  static createBrowserNotification(title, message, link) {
     chrome.notifications.create({
       type: 'basic',
       title,

package/services/request-service/handler/PopupHandler.d.ts

@@ -3,7 +3,6 @@ export default class PopupHandler {
     #private;
     constructor(requestService: RequestService);
     updateIconV2(shouldClose?: boolean): void;
-    setNotification(notification: string): boolean;
     get popup(): number[];
     popupClose(): void;
     popupOpen(): void;

package/services/request-service/handler/PopupHandler.js

@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { withErrorLog } from '@subwallet/extension-base/background/handlers/helpers';
-import settings from '@polkadot/ui-settings';
 const NOTIFICATION_URL = chrome.extension.getURL('notification.html');
 const POPUP_WINDOW_OPTS = {
   focused: true,
@@ -20,10 +19,17 @@ const NORMAL_WINDOW_OPTS = {
 };
 export default class PopupHandler {
   #requestService;
-  #notification = settings.notification;
+  #notification = 'popup';
   #windows = [];
   constructor(requestService) {
     this.#requestService = requestService;
+    const updateNotification = rs => {
+      this.#notification = rs.browserConfirmationType;
+    };
+    requestService.settingService.getSettings(updateNotification);
+    requestService.settingService.getSubject().subscribe({
+      next: updateNotification
+    });
   }
   updateIconV2(shouldClose) {
     const numRequests = this.#requestService.numRequests;
@@ -38,10 +44,6 @@ export default class PopupHandler {
       this.popupClose();
     }
   }
-  setNotification(notification) {
-    this.#notification = notification;
-    return true;
-  }
   get popup() {
     return this.#windows;
   }
@@ -51,19 +53,12 @@ export default class PopupHandler {
   }
   popupOpen() {
     if (this.#notification !== 'extension') {
-      if (this.#notification === 'window') {
-        chrome.windows.create(NORMAL_WINDOW_OPTS, window => {
-          if (window) {
-            this.#windows.push(window.id || 0);
-          }
-        });
-      }
       chrome.windows.getCurrent(win => {
         const popupOptions = {
-          ...POPUP_WINDOW_OPTS
+          ...(this.#notification === 'window' ? NORMAL_WINDOW_OPTS : POPUP_WINDOW_OPTS)
         };
         if (win) {
-          popupOptions.left = (win.left || 0) + (win.width || 0) - (POPUP_WINDOW_OPTS.width || 0) - 20;
+          popupOptions.left = (win.left || 0) + (win.width || 0) - (popupOptions.width || 0) - 20;
           popupOptions.top = (win.top || 0) + 80;
         }
         chrome.windows.create(popupOptions, window => {

package/services/request-service/index.d.ts

@@ -2,16 +2,17 @@ import { AuthRequestV2, ConfirmationDefinitions, ConfirmationsQueue, Confirmatio
 import { AccountJson, AuthorizeRequest, MetadataRequest, RequestAuthorizeTab, RequestSign, ResponseSigning, SigningRequest } from '@subwallet/extension-base/background/types';
 import { ChainService } from '@subwallet/extension-base/services/chain-service';
 import { AuthUrls, MetaRequest } from '@subwallet/extension-base/services/request-service/types';
+import SettingService from '@subwallet/extension-base/services/setting-service/SettingService';
 import { MetadataDef } from '@subwallet/extension-inject/types';
 import { BehaviorSubject, Subject } from 'rxjs';
 import { SignerPayloadJSON } from '@polkadot/types/types/extrinsic';
 export default class RequestService {
     #private;
-    constructor(chainService: ChainService);
+    readonly settingService: SettingService;
+    constructor(chainService: ChainService, settingService: SettingService);
     get numAllRequests(): number;
     updateIconV2(shouldClose?: boolean): void;
     getAddressList(value?: boolean): Record<string, boolean>;
-    setNotification(notification: string): boolean;
     get popup(): number[];
     popupClose(): void;
     popupOpen(): void;

package/services/request-service/index.js

@@ -17,8 +17,9 @@ export default class RequestService {
   #evmRequestHandler;
 
   // Common
-  constructor(chainService) {
+  constructor(chainService, settingService) {
     this.#chainService = chainService;
+    this.settingService = settingService;
     this.#popupHandler = new PopupHandler(this);
     this.#metadataRequestHandler = new MetadataRequestHandler(this);
     this.#authRequestHandler = new AuthRequestHandler(this, this.#chainService);
@@ -43,11 +44,6 @@ export default class RequestService {
   }
 
   // Popup
-
-  setNotification(notification) {
-    this.#popupHandler.setNotification(notification);
-    return true;
-  }
   get popup() {
     return this.#popupHandler.popup;
   }

package/services/setting-service/SettingService.js

@@ -17,7 +17,8 @@ export default class SettingService {
           // isShowZeroBalance: true,
           isShowBalance: false,
           accountAllLogo: '',
-          theme: ThemeNames.DARK
+          theme: ThemeNames.DARK,
+          camera: false
         });
       } else {
         update(value);